diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 2402d43b9f8d..7bd550051dd4 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -5,3 +5,14 @@
 9c7dd3bf34dfbb2f4fa9eb79a0294c2cc759c836
 b2a528f2945cee26667b22b867ccef143b7c430c
 4273f1cde06f3622f50c2846078398c1977a49c4
+# Hibernate Tools merging
+05a9a8742e1684419ca4bcabcca060dc31048053
+3710fc0e8332992d7b87f66839dc489c4f46a8c8
+09f4af10843fc1d1e1dcd01d1f4856991fa8989d
+c7cc700acfe372cf6e67d7e60b021a8bf08360c6
+6acfbba01701d767065ed87207269d96adbdc52f
+bede74dc6f816065c78e31cd62ef16981dd90497
+75f4ce5d156e7987579eb32834667975d2d81ad4
+c448b6ba40c93c648b8d645d59ccf4bba55df567
+c57ae64b723fc6c7cb23a06a6b871869dca6ff3f
+9580fd1af50a637431a7a51242cdcb35aa3c0fe8
diff --git a/.github/ci-prerequisites.sh b/.github/ci-prerequisites.sh
index 4902f78ef2bc..23ed879416de 100755
--- a/.github/ci-prerequisites.sh
+++ b/.github/ci-prerequisites.sh
@@ -1,8 +1,14 @@
 # Reclaim disk space, otherwise we only have 13 GB free at the start of a job
 
+echo 'Before the cleanup:'
+df -h
 # Remove the container images for node:
-docker rmi node:10 node:12 mcr.microsoft.com/azure-pipelines/node8-typescript:latest
+echo 'Docker images (available for possible removal):'
+docker images
 # That is 18 GB
 sudo rm -rf /usr/share/dotnet
 # That is 1.2 GB
-sudo rm -rf /usr/share/swift
\ No newline at end of file
+sudo rm -rf /usr/share/swift
+
+echo 'After the cleanup:'
+df -h
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 16bf812c5d25..1e8c53ec7ac9 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,6 +17,8 @@ updates:
     allow:
       - dependency-name: "actions/*"
       - dependency-name: "redhat-actions/*"
+      - dependency-name: "graalvm/setup-graalvm"
+      - dependency-name: "oracle-actions/setup-testpilot"
   - package-ecosystem: "gradle"
     directory: "/"
     registries:
diff --git a/.github/hibernate-github-bot.yml b/.github/hibernate-github-bot.yml
index 26a48092d408..a0a954c885a0 100644
--- a/.github/hibernate-github-bot.yml
+++ b/.github/hibernate-github-bot.yml
@@ -81,3 +81,27 @@ branches:
   ignore:
     - user: dependabot[bot]
       titlePattern: ".*"
+pullRequestTasks:
+  # Make the bot add list of tasks to the pull requests and enable the check that makes sure all tasks are completed:
+  enabled: true
+  tasks:
+    # List of tasks for commits without a Jira ID
+    # or for those with Jira ID but that don't have a specific configuration for a corresponding issue type:
+    default:
+      - Add test **OR** check there is no need for a test
+      - "Update documentation as relevant: javadoc for changed API, `documentation/src/main/asciidoc/userguide` for all features, `documentation/src/main/asciidoc/introduction` for main features, links from existing documentation"
+      - "Add entries as relevant to `migration-guide.adoc` (breaking changes) and `whats-new.adoc` (new features/improvements)"
+    # Tasks specific to the bug issue type:
+    bug:
+      - Add test reproducing the bug
+      - "Add entries as relevant to `migration-guide.adoc` **OR** check there are no breaking changes"
+    # Tasks specific to the improvement issue type:
+    improvement:
+      - Add tests for feature/improvement
+      - "Update documentation as relevant: javadoc for changed API, `documentation/src/main/asciidoc/userguide` for all features, `documentation/src/main/asciidoc/introduction` for main features, links from existing documentation"
+      - "Add entries as relevant to `migration-guide.adoc` (breaking changes) and `whats-new.adoc` (new features/improvements)"
+    # Tasks specific to the "new feature" issue type (same as improvement):
+    new feature:
+      - Add tests for feature/improvement
+      - "Update documentation as relevant: javadoc for changed API, `documentation/src/main/asciidoc/userguide` for all features, `documentation/src/main/asciidoc/introduction` for main features, links from existing documentation"
+      - "Add entries as relevant to `migration-guide.adoc` (breaking changes) and `whats-new.adoc` (new features/improvements)"
\ No newline at end of file
diff --git a/.github/workflows/ci-report.yml b/.github/workflows/ci-report.yml
index 5a56b1c3d9e7..81f538cc1369 100644
--- a/.github/workflows/ci-report.yml
+++ b/.github/workflows/ci-report.yml
@@ -17,12 +17,12 @@ jobs:
     steps:
       # Checkout target branch which has trusted code
       - name: Check out target branch
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           ref: ${{ github.ref }}
       - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '25'
@@ -38,7 +38,7 @@ jobs:
           echo "buildtool-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
           echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
       - name: Restore Maven/Gradle Dependency/Dist Caches
-        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ~/.m2/repository/
@@ -52,7 +52,7 @@ jobs:
 
       - name: Download GitHub Actions artifacts for the Develocity build scans
         id: downloadBuildScan
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           pattern: build-scan-data-*
           github-token: ${{ github.token }}
@@ -76,3 +76,116 @@ jobs:
           exit $status
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY_PR }}
+
+  publish-sonar-scans:
+    name: Publish Sonar scan
+    if: github.repository == 'hibernate/hibernate-orm' && github.event.workflow_run.conclusion != 'cancelled'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Determine the Branch Reference for which the original action was triggered
+        id: determine_branch_ref
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          if [ "${{ github.event.workflow_run.event }}" == "pull_request" ]; then
+            echo "::notice::Triggering workflow was executed for a pull request"
+
+            FORK_OWNER="${{ github.event.workflow_run.head_repository.owner.login }}"
+            BRANCH_NAME="${{ github.event.workflow_run.head_branch }}"
+            if [ "${{ github.event.workflow_run.head_repository.owner.login }}" != "${{ github.event.workflow_run.repository.owner.login }}" ]; then
+              BRANCH_NAME="$FORK_OWNER:$BRANCH_NAME"
+            fi
+            GH_RESPONSE=$(gh pr view "$BRANCH_NAME" --repo ${{ github.event.workflow_run.repository.full_name }} --json number,baseRefName)
+            TARGET_BRANCH=$(echo $GH_RESPONSE | jq -r '.baseRefName')
+            PR_ID=$(echo $GH_RESPONSE | jq -r '.number')
+
+            echo "::notice::PR found. Target branch is: $TARGET_BRANCH"
+            echo "::notice::          Pull Request number is: $PR_ID"
+            echo "::notice::          Branch to merge is: $BRANCH_NAME"
+            echo "original_branch_ref=$TARGET_BRANCH" >> "$GITHUB_OUTPUT"
+            echo "pr_id=$PR_ID" >> "$GITHUB_OUTPUT"
+            echo "branch_to_merge=$BRANCH_NAME" >> "$GITHUB_OUTPUT"
+          else
+            echo "::notice::Triggering workflow was executed for a push event? Using the head_branch value."
+            echo "original_branch_ref=${{ github.event.workflow_run.head_branch }}" >> "$GITHUB_OUTPUT"
+          fi
+      # Checkout target branch (from the main repository)
+      - name: Check out target branch
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+          # By default, a workflow that is triggered with on workflow_run would run on the main (default) branch.
+          #  Different branches might have different versions of Develocity, and we want to make sure
+          #  that we publish with the one that we built the scan with in the first place.
+          ref: ${{ steps.determine_branch_ref.outputs.original_branch_ref }}
+          fetch-depth: 0
+
+        # Note: we need to check out the code with all the changes so that we have the sources,
+        #  matching our compiled classes we'll pull from the build artifacts.
+        #  We won't be running any builds from the checked out code,
+        #  but we'll use the code to run the sonar scanner tool.
+        #
+        #  Only needed if we are analysing the PR,
+        #  as otherwise the previous checkout already did the work.
+      - name: Check out merged code (if PR)
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          if [ "${{ github.event.workflow_run.event }}" == "pull_request" ]; then
+            gh pr checkout ${{steps.determine_branch_ref.outputs.pr_id}}
+          fi
+
+          # so we aren't tempted to run a Gradle command!
+          rm -rf gradlew*
+
+      - name: Set up Java 25
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        with:
+          java-version: 25
+          distribution: temurin
+
+      - name: Download coverage reports
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # 7.0.0
+        with:
+          pattern: build-results-data
+          github-token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          run-id: ${{ github.event.workflow_run.id }}
+          path: .
+          merge-multiple: 'true'
+        # Don't fail the build if there are no matching artifacts
+        continue-on-error: true
+
+      - name: Install Sonar CLI
+        run: |
+          SONAR_HASH=8fbfb1eb546b734a60fc3e537108f06e389a8ca124fbab3a16236a8a51edcc15
+          SONAR_SCANNER_VERSION=8.0.1.6346
+          export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION
+          curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION.zip
+          DOWNLOADED_HASH=$(sha256sum $HOME/.sonar/sonar-scanner.zip | awk '{print $1}')
+          if [ "$DOWNLOADED_HASH" == "$SONAR_HASH" ]; then
+            echo "Successfully verified the file checksum"
+          else
+            echo "Error: Failed the file checksum verification. Expected: $SONAR_HASH but got $DOWNLOADED_HASH instead"
+            exit 1
+          fi
+          unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
+          mv "$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION"/* "$HOME/.sonar/" 
+
+      - name: Sonar Analysis
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          find . -name "*.exec" -type f
+          EXTRA_ARGS=""
+          if [ "${{ github.event.workflow_run.event }}" == "pull_request" ]; then
+            echo "::notice::Triggering workflow was executed for a pull request"
+  
+            EXTRA_ARGS="-Dsonar.pullrequest.branch=${{steps.determine_branch_ref.outputs.branch_to_merge}} -Dsonar.pullrequest.key=${{steps.determine_branch_ref.outputs.pr_id}} -Dsonar.pullrequest.base=${{steps.determine_branch_ref.outputs.original_branch_ref}} -Dsonar.pullrequest.provider=GitHub -Dsonar.pullrequest.github.repository=hibernate/hibernate-orm"
+          else
+            EXTRA_ARGS="-Dsonar.branch.name=${{github.event.workflow_run.head_branch}}"
+          fi
+
+          $HOME/.sonar/bin/sonar-scanner $EXTRA_ARGS \
+              -Dsonar.java.libraries="$(pwd)/target/sonar-dependencies/*.jar" \
+              -Dsonar.coverage.jacoco.xmlReportPaths="$(pwd)/reporting/target/reports/jacoco/mergeCodeCoverageReport/mergeCodeCoverageReport.xml"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cfa18d3f560f..bda4e0797569 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
     # Running with HANA requires at least 8GB memory just for the database, which we don't have on GH Actions runners
     #          - rdbms: hana
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - name: Reclaim Disk Space
@@ -64,7 +64,7 @@ jobs:
           RDBMS: ${{ matrix.rdbms }}
         run: ci/database-start.sh
       - name: Set up Java 25
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '25'
@@ -81,16 +81,17 @@ jobs:
           echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
       - name: Cache Maven/Gradle Dependency/Dist Caches
         id: cache-maven
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         # if it's not a pull request, we restore and save the cache
         if: github.event_name != 'pull_request'
         with:
           path: |
             ~/.m2/repository/
             ~/.m2/wrapper/
-            ~/.gradle/caches/modules-2
+            ~/.gradle/caches/
+            !~/.gradle/caches/build-cache-*
             ~/.gradle/wrapper/
-          # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
+          # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable, but it's not a problem.
           # The whole cache is dropped monthly to prevent unlimited growth.
           # The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch.
           key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
@@ -98,14 +99,15 @@ jobs:
             ${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
             ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
       - name: Restore Maven/Gradle Dependency/Dist Caches
-        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-        # if it a pull request, we restore the cache but we don't save it
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        # if it is a pull request, we restore the cache, but we don't save it
         if: github.event_name == 'pull_request'
         with:
           path: |
             ~/.m2/repository/
             ~/.m2/wrapper/
-            ~/.gradle/caches/modules-2
+            ~/.gradle/caches/
+            !~/.gradle/caches/build-cache-*
             ~/.gradle/wrapper/
           key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
           restore-keys: |
@@ -126,14 +128,31 @@ jobs:
       # The actual publishing must be done in a separate job (see ci-report.yml).
       # We don't write to the remote cache as that would be unsafe.
       - name: Upload GitHub Actions artifact for the Develocity build scan
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
         with:
           name: build-scan-data-${{ matrix.rdbms }}
           path: ~/.gradle/build-scan-data
-
+      - name: Store coverage report
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: build-coverage-data-${{ matrix.rdbms }}
+          retention-days: 1
+          path: |
+            ./**/target/jacoco/*.exec
+      - name: Store build results
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: "${{ matrix.rdbms == 'h2' }}"
+        with:
+          name: build-compilation-data
+          retention-days: 1
+          path: |
+            ./**/target/resources/
+            ./**/target/classes/
+            ./**/target/generated/
+            .gradle/caches/build-cache-*
       - name: Upload test reports (if Gradle failed)
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: failure()
         with:
           name: test-reports-java11-${{ matrix.rdbms }}
@@ -149,20 +168,22 @@ jobs:
       contents: read
     name: GraalVM 25 - ${{matrix.rdbms}}
     runs-on: [ self-hosted, Linux, X64, OracleTestPilot ]
+    if: github.repository == 'hibernate/hibernate-orm'
     strategy:
       fail-fast: false
       matrix:
         include:
-          #- rdbms: autonomous-transaction-processing-serverless
+          #- rdbms: autonomous-transaction-processing-serverless-26ai
+          #- rdbms: autonomous-transaction-processing-serverless-19c
           - rdbms: base-database-service-19c
           - rdbms: base-database-service-21c
-          - rdbms: base-database-service-23ai
+          - rdbms: base-database-service-26ai
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - name: Set up Java 25
-        uses: graalvm/setup-graalvm@aafbedb8d382ed0ca6167d3a051415f20c859274 # v1.2.8
+        uses: graalvm/setup-graalvm@f744c72a42b1995d7b0cbc314bde4bace7ac1fe1 # v1.5.0
         with:
           distribution: 'graalvm'
           java-version: '25'
@@ -172,22 +193,23 @@ jobs:
           CURRENT_BRANCH="${{ github.repository != 'hibernate/hibernate-orm' && 'fork' || github.base_ref || github.ref_name }}"
           CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
           CURRENT_DAY=$(/bin/date -u "+%d")
-          ROOT_CACHE_KEY="buildtool-cache-atlas"
+          ROOT_CACHE_KEY="buildtool-cache-oracle-test-pilot"
           echo "buildtool-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
           echo "buildtool-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
           echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
       - name: Cache Maven/Gradle Dependency/Dist Caches
         id: cache-maven
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         # if it's not a pull request, we restore and save the cache
         if: github.event_name != 'pull_request'
         with:
           path: |
             ~/.m2/repository/
             ~/.m2/wrapper/
-            ~/.gradle/caches/modules-2
+            ~/.gradle/caches/
+            !~/.gradle/caches/build-cache-*
             ~/.gradle/wrapper/
-          # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
+          # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable, but it's not a problem.
           # The whole cache is dropped monthly to prevent unlimited growth.
           # The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch.
           key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
@@ -195,14 +217,15 @@ jobs:
             ${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
             ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
       - name: Restore Maven/Gradle Dependency/Dist Caches
-        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-        # if it is a pull request, we restore the cache but we don't save it
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        # if it is a pull request, we restore the cache, but we don't save it
         if: github.event_name == 'pull_request'
         with:
           path: |
             ~/.m2/repository/
             ~/.m2/wrapper/
-            ~/.gradle/caches/modules-2
+            ~/.gradle/caches/
+            !~/.gradle/caches/build-cache-*
             ~/.gradle/wrapper/
           key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
           restore-keys: |
@@ -210,11 +233,11 @@ jobs:
             ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
 
       - id: create_database
-        uses: loiclefevre/test@ce2f5049188a384c17ffcfcb8c8d04cf118e2cd7 # v1.0.20
+        uses: oracle-actions/setup-testpilot@f620f11f9f26dacfe80ba1823342e3e92604c55f # v1.0.23
         with:
           oci-service: ${{ matrix.rdbms }}
           action: create
-          user: hibernate_orm_test_1,hibernate_orm_test_2,hibernate_orm_test_3,hibernate_orm_test_4
+          user: hibernate_orm_test_1,hibernate_orm_test_2,hibernate_orm_test_3,hibernate_orm_test_4,hibernate_orm_test_5,hibernate_orm_test_6,hibernate_orm_test_7,hibernate_orm_test_8
 
       - name: Run build script
         env:
@@ -228,28 +251,44 @@ jobs:
           # Needed for TFO (TCP fast open)
           LD_PRELOAD: /home/ubuntu/libtfojdbc1.so
           LD_LIBRARY_PATH: /home/ubuntu
+          # maximum number of worker (upper limit to maxParallelForks property, otherwise number of available CPUs)
+          GRADLE_OPTS: "-Dorg.gradle.workers.max=8"
+          # Better control of RAM for Gradle, must be aligned with gradle.properties
+          # Daemon:
+          ORG_GRADLE_JVMARGS: "-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8"
+          # Java compiler:
+          ORG_GRADLE_PROJECT_toolchain.compiler.jvmargs: "-Dlog4j2.disableJmx=true -Xmx4g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8"
+          # Gradle workers (Tests...)
+          ORG_GRADLE_PROJECT_toolchain.launcher.jvmargs: "-Dlog4j2.disableJmx=true -Xmx3g -XX:MaxMetaspaceSize=448m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8"
         run: ./ci/build-github.sh
         shell: bash
 
-      - uses: loiclefevre/test@ce2f5049188a384c17ffcfcb8c8d04cf118e2cd7 # v1.0.20
+      - uses: oracle-actions/setup-testpilot@f620f11f9f26dacfe80ba1823342e3e92604c55f # v1.0.23
         if: always()
         with:
           oci-service: ${{ matrix.rdbms }}
           action: delete
-          user: hibernate_orm_test_1,hibernate_orm_test_2,hibernate_orm_test_3,hibernate_orm_test_4
+          user: hibernate_orm_test_1,hibernate_orm_test_2,hibernate_orm_test_3,hibernate_orm_test_4,hibernate_orm_test_5,hibernate_orm_test_6,hibernate_orm_test_7,hibernate_orm_test_8
 
       # Upload build scan data.
       # The actual publishing must be done in a separate job (see ci-report.yml).
       # We don't write to the remote cache as that would be unsafe.
-      # That's even on push, because we do not trust Atlas runners to hold secrets: they are shared infrastructure.
+      # That's even on push, because we do not trust Oracle Test Pilot runners to hold secrets: they are shared infrastructure.
       - name: Upload GitHub Actions artifact for the Develocity build scan
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: "${{ !cancelled() }}"
         with:
           name: build-scan-data-${{ matrix.rdbms }}
           path: ~/.gradle/build-scan-data
+      - name: Store coverage report
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: build-coverage-data-${{ matrix.rdbms }}
+          retention-days: 1
+          path: |
+            ./**/target/jacoco/*.exec
       - name: Upload test reports (if Gradle failed)
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: failure()
         with:
           name: test-reports-java11-${{ matrix.rdbms }}
@@ -265,13 +304,13 @@ jobs:
     name: Static code analysis
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
       - name: Reclaim disk space and sanitize user home
         run: .github/ci-prerequisites-atlas.sh
       - name: Set up Java 25
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           distribution: 'temurin'
           java-version: '25'
@@ -282,22 +321,23 @@ jobs:
           CURRENT_BRANCH="${{ github.repository != 'hibernate/hibernate-orm' && 'fork' || github.base_ref || github.ref_name }}"
           CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
           CURRENT_DAY=$(/bin/date -u "+%d")
-          ROOT_CACHE_KEY="buildtool-cache-atlas"
+          ROOT_CACHE_KEY="buildtool-cache"
           echo "buildtool-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
           echo "buildtool-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
           echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
       - name: Cache Maven/Gradle Dependency/Dist Caches
         id: cache-maven
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         # if it's not a pull request, we restore and save the cache
         if: github.event_name != 'pull_request'
         with:
           path: |
             ~/.m2/repository/
             ~/.m2/wrapper/
-            ~/.gradle/caches/modules-2
+            ~/.gradle/caches/
+            !~/.gradle/caches/build-cache-*
             ~/.gradle/wrapper/
-          # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
+          # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable, but it's not a problem.
           # The whole cache is dropped monthly to prevent unlimited growth.
           # The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch.
           key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
@@ -305,14 +345,15 @@ jobs:
             ${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
             ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
       - name: Restore Maven/Gradle Dependency/Dist Caches
-        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-        # if it a pull request, we restore the cache but we don't save it
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        # if it is a pull request, we restore the cache, but we don't save it
         if: github.event_name == 'pull_request'
         with:
           path: |
             ~/.m2/repository/
             ~/.m2/wrapper/
-            ~/.gradle/caches/modules-2
+            ~/.gradle/caches/
+            !~/.gradle/caches/build-cache-*
             ~/.gradle/wrapper/
           key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
           restore-keys: |
@@ -331,14 +372,14 @@ jobs:
       # The actual publishing must be done in a separate job (see ci-report.yml).
       # We don't write to the remote cache as that would be unsafe.
       - name: Upload GitHub Actions artifact for the Develocity build scan
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
         with:
           name: build-scan-data-sca
           path: ~/.gradle/build-scan-data
 
       - name: Upload test reports (if Gradle failed)
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: failure()
         with:
           name: test-reports-java11-sca
@@ -346,3 +387,80 @@ jobs:
             ./**/target/reports/tests/
       - name: Omit produced artifacts from build cache
         run: ./ci/before-cache.sh
+
+  prepare-sonar-bundle:
+    name: Prepare build bundle for Sonar scanner
+    needs:
+      - build
+      - otp
+    if: |
+      always() && !cancelled()
+      && needs.build.result != 'cancelled' && needs.otp.result != 'cancelled'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Set up JDK 25
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+
+      - name: Generate cache key
+        id: cache-key
+        run: |
+          CURRENT_BRANCH="${{ github.repository != 'hibernate/hibernate-orm' && 'fork' || github.base_ref || github.ref_name }}"
+          CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
+          CURRENT_DAY=$(/bin/date -u "+%d")
+          ROOT_CACHE_KEY="buildtool-cache"
+          echo "buildtool-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
+          echo "buildtool-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
+          echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
+      - name: Restore Maven/Gradle Dependency/Dist Caches
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        with:
+          path: |
+            ~/.m2/repository/
+            ~/.m2/wrapper/
+            ~/.gradle/caches/
+            !~/.gradle/caches/build-cache-*
+            ~/.gradle/wrapper/
+          key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
+          restore-keys: |
+            ${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
+            ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
+
+      - name: Download compilation results
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # 7.0.0
+        with:
+          name: build-compilation-data
+          path: .
+        # Don't fail the build if there are no matching artifacts (the build will re-compile things then)
+        continue-on-error: true
+
+      - name: Download coverage reports
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # 7.0.0
+        with:
+          pattern: build-coverage-data*
+          path: .
+          merge-multiple: 'true'
+        # Don't fail the build if there are no matching artifacts
+        continue-on-error: true
+
+      - name: Merge Jacoco Reports
+        run: ./gradlew mergeCodeCoverageReport copyDependenciesSonar --no-parallel
+
+      - name: Store build info for Sonar scanning
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: build-results-data
+          retention-days: 1
+          path: |
+            ./**/target/jacoco/*.exec
+            ./**/target/classes/
+            ./**/target/generated/
+            ./**/target/resources/
+            ./**/target/reports/
+            ./**/target/sonar-dependencies/
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
deleted file mode 100644
index ee4e0e81c9f0..000000000000
--- a/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ 'main' ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ 'main' ]
-  schedule:
-    - cron: '34 11 * * 4'
-
-# See https://github.com/hibernate/hibernate-orm/pull/4615 for a description of the behavior we're getting.
-concurrency:
-  # Consider that two builds are in the same concurrency group (cannot run concurrently)
-  # if they use the same workflow and are about the same branch ("ref") or pull request.
-  group: "workflow = ${{ github.workflow }}, ref = ${{ github.event.ref }}, pr = ${{ github.event.pull_request.id }}"
-  # Cancel previous builds in the same concurrency group even if they are in process
-  # for pull requests or pushes to forks (not the upstream repository).
-  cancel-in-progress: ${{ github.event_name == 'pull_request' || github.repository != 'hibernate/hibernate-orm' }}
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-
-      - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
-        with:
-          distribution: 'temurin'
-          java-version: '25'
-
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@7e3036b9cd87fc26dd06747b7aa4b96c27aaef3a # v3.28.4
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-          queries: +security-and-quality
-
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@7e3036b9cd87fc26dd06747b7aa4b96c27aaef3a # v3.28.4
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-      #   If the Autobuild fails above, remove it and uncomment the following three lines.
-      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-      # - run: |
-      #   echo "Run, Build Application using script"
-      #   ./location_of_script_within_repo/buildscript.sh
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7e3036b9cd87fc26dd06747b7aa4b96c27aaef3a # v3.28.4
-        with:
-          category: "/language:${{matrix.language}}"
diff --git a/.gitignore b/.gitignore
index 38f13ef5aa12..8fa78041fb50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,6 @@ ObjectStore
 
 # SDKman, used by some module maintainers
 .sdkmanrc
+
+# Sonar CLI local scan files:
+.scannerwork
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9c7dbfd0c264..4baddffc1c65 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,10 @@ While we try to keep requirements for contributing to a minimum, there are a few
 we ask that you mind.
 
 For code contributions, these guidelines include:
-* Respect the project code style - find templates for [IntelliJ IDEA](https://hibernate.org/community/contribute/intellij-idea/) or [Eclipse](https://hibernate.org/community/contribute/eclipse-ide/)
+* Respect the project code style: make sure to run spotless and checkstyle checks before commiting your changes, e.g. `./gradlew formatChecks`.
+Project contains the basic set of formatting styles for IntelliJ IDEA in the [.idea](.idea) directory.
+You can also refer to more generic [IntelliJ IDEA](https://hibernate.org/community/contribute/intellij-idea/) or [Eclipse](https://hibernate.org/community/contribute/eclipse-ide/)
+guides for additional details.
 * Have a corresponding JIRA [issue](https://hibernate.atlassian.net/browse/HHH) and be sure to include the key for this JIRA issue in your commit messages.
 * Have a set of appropriate tests.  
   	For your convenience, a [set of test templates](https://github.com/hibernate/hibernate-test-case-templates/tree/main/orm) have been made available.
diff --git a/Jenkinsfile b/Jenkinsfile
index a09447ed07b6..ed042d2694f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,12 +48,13 @@ stage('Configure') {
 		// We want to enable preview features when testing newer builds of OpenJDK:
 		// even if we don't use these features, just enabling them can cause side effects
 		// and it's useful to test that.
-		new BuildEnvironment( testJdkVersion: '25', testJdkLauncherArgs: '--enable-preview', additionalOptions: '-PskipJacoco=true' ),
+		new BuildEnvironment( testJdkVersion: '25', testJdkLauncherArgs: '--enable-preview' ),
+		new BuildEnvironment( testJdkVersion: '26', testJdkLauncherArgs: '--enable-preview' ),
 		// The following JDKs aren't supported by Hibernate ORM out-of-the box yet:
 		// they require the use of -Dnet.bytebuddy.experimental=true.
 		// Make sure to remove that argument as soon as possible
 		// -- generally that requires upgrading bytebuddy after the JDK goes GA.
-		new BuildEnvironment( testJdkVersion: '26', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true', additionalOptions: '-PskipJacoco=true' )
+		new BuildEnvironment( testJdkVersion: '27', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true', additionalOptions: '-PskipJacoco=true' )
 	];
 
 	if ( env.CHANGE_ID ) {
@@ -69,6 +70,9 @@ stage('Configure') {
 		if ( pullRequest.labels.contains( 'tidb' ) ) {
 			this.environments.add( new BuildEnvironment( dbName: 'tidb', node: 'tidb', notificationRecipients: 'tidb_hibernate@pingcap.com' ) )
 		}
+		if ( pullRequest.labels.contains( 'informix' ) ) {
+			this.environments.add( new BuildEnvironment( dbName: 'informix' ) )
+		}
 	}
 
 	helper.configure {
@@ -167,6 +171,13 @@ stage('Build') {
 									sh "./docker_db.sh cockroachdb"
 									state[buildEnv.tag]['containerName'] = "cockroach"
 									break;
+								case "informix":
+									sh "./docker_db.sh informix"
+									state[buildEnv.tag]['containerName'] = "informix"
+									// Disable parallel testing
+									state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
+											" -Ptest.threads=1"
+									break;
 							}
 						}
 						stage('Test') {
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 8a20f527688e..1f0ecd81860c 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -84,7 +84,7 @@ In any case, before the release:
   * Check there are no resolved/closed issues in the corresponding "work-in-progress version"
     (e.g. `6.6`, `6.6-next`, ... naming convention may vary);
     if there are, you might want to assign them to your release.
-* Pull all upstream changes and perform `./gradlew preVerifyRelease` locally.
+* Pull all upstream changes and perform `./gradlew releasePrepare` locally.
 
 **If it's the first `Alpha`/`Beta` of a new major or minor release**, before the release:
 
@@ -163,3 +163,29 @@ In any case:
 
 * Reset the migration guide on the `main` branch if you forgot about it when preparing the release.
 * Create a maintenance branch for the previous series, if necessary; see [branching](branching.adoc).
+
+
+### Setting up the maintenance branch
+
+Once the release series (e.g. 7.3) is branched out and goes into maintenance mode make sure to:
+* Enable automated releases (for that branch)
+  - Update [Jenkinsfile](ci/release/Jenkinsfile) and switch `RELEASE_ON_SCHEDULE` to `true`
+* Remove the nightly Jenkins job from that branch ([nightly.Jenkinsfile](nightly.Jenkinsfile))
+* Update GitHub workflows:
+  - For [ci.yml](.github/workflows/ci.yml)
+    + remove the branch push triggers (`on.pushbranches`)
+    + update branch in the pull request triggers
+* Enable Quarkus testing job (if the update to this version was already merged(test against main Quarkus branch)/released(test the corresponding version branch))
+  - In [quarkus.Jenkinsfile](ci/quarkus.Jenkinsfile) switch `ENABLE_QUARKUS_BUILDS` to true and update `QUARKUS_BRANCH_TO_TEST` as necessary.
+* Enable Hibernate Search dependency update job
+  - In [Jenkinsfile](Jenkinsfile) add an execution just before the `parallel(executions)`:
+  ```groovy
+    executions.put('Hibernate Search Update Dependency', {
+        build job: '/hibernate-search-dependency-update/{HIBERNATE_SEARCH_VERSION}', propagate: true, parameters: [string(name: 'UPDATE_JOB', value: 'orm{HIBERNATE_ORM_VERSION}'), string(name: 'ORM_REPOSITORY', value: helper.scmSource.remoteUrl), string(name: 'ORM_PULL_REQUEST_ID', value: helper.scmSource.pullRequest.id)]
+    })
+  ```
+  - In this example above, replace `{HIBERNATE_SEARCH_VERSION}` and `{HIBERNATE_ORM_VERSION}` with actual release series, e.g. `8.3`/`7.3` 
+* Update main build [Jenkinsfile](Jenkinsfile) (for the branch)
+  - Enable JDK testing in the build by removing the conditions under `Don't build environments for newer JDKs`
+  - Stop running this build for pushes to the branch
+* Update TCK job [jpa-3.2-tck.Jenkinsfile](ci/jpa-3.2-tck.Jenkinsfile) to always run for PRs and not for the pushes to the branch
diff --git a/README.adoc b/README.adoc
index cc38a7d3069a..442112065ee1 100644
--- a/README.adoc
+++ b/README.adoc
@@ -18,7 +18,7 @@ See link:MAINTAINERS.md#ci[MAINTAINERS.md] for information about CI.
 
 == Building from sources
 
-The build requires at least JDK 21, and produces Java 17 bytecode.
+The build requires at least JDK 25, and produces Java 17 bytecode.
 
 Hibernate uses https://gradle.org[Gradle] as its build tool. See the _Gradle Primer_ section below if you are new to
 Gradle.
@@ -87,40 +87,19 @@ a JVM system prop (`-D`) or as a Gradle project property (`-P`). Examples below
 project property approach.
 
 ----
-gradle clean build -Pdb=pgsql
+gradle clean build -Pdb=pgsql_ci
 ----
 
 To run a test from your IDE, you need to ensure the property expansions happen.
 Use the following command:
 
 ----
-gradle clean compile -Pdb=pgsql
+gradle clean compile -Pdb=pgsql_ci
 ----
 
 __NOTE: If you are running tests against a JDBC driver that is not available via Maven central be sure to
 add these drivers to your local Maven repo cache (~/.m2/repository) or (better) add it to a personal Maven repo server__
 
-=== Running database-specific tests from the IDE using "profiles"
-
-You can run any test on any particular database that is configured in a `databases.gradle` profile.
-
-All you have to do is run the following command:
-
-----
-./gradlew setDataBase -Pdb=pgsql
-----
-
-or you can use the shortcut version: 
-
-----
-./gradlew sDB -Pdb=pgsql
-----
-
-You can do this from the module which you are interested in testing or from the `hibernate-orm` root folder.
-
-Afterward, just pick any test from the IDE and run it as usual. Hibernate will pick the database configuration from the `hibernate.properties`
-file that was set up by the `setDataBase` Gradle task.
-
 === Starting test databases locally as docker containers
 
 You don't have to install all databases locally to be able to test against them in case you have docker available.
diff --git a/build.gradle b/build.gradle
index 9f5600731a06..b6422ba614fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,18 +19,18 @@ buildscript {
 plugins {
 	id "local.module"
 
-	id "org.hibernate.build.version-injection" version "2.2.0" apply false
+	id "org.hibernate.build.version-injection" version "2.3.0" apply false
 	id 'org.hibernate.orm.database-service' apply false
-	id 'biz.aQute.bnd' version '7.1.0' apply false
+	id 'biz.aQute.bnd' version '7.2.1' apply false
 
-	id "com.diffplug.spotless" version "7.0.4"
-	id 'org.checkerframework' version '0.6.61'
+	id "com.diffplug.spotless" version "8.3.0"
+	id 'org.checkerframework' version '1.0.2'
 	id 'org.hibernate.orm.build.jdks'
 
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 
 	id 'idea'
-	id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.10'
+	id 'org.jetbrains.gradle.plugin.idea-ext' version '1.4.1'
 	id 'eclipse'
 	id "com.dorongold.task-tree" version "4.0.1"
 }
@@ -40,8 +40,8 @@ plugins {
 // Releasing
 
 tasks.register( 'releasePrepare' ) {
-	group "release-prepare"
-	description "Scripted release 'Release Prepare' stage.  " +
+	group = "release-prepare"
+	description = "Scripted release 'Release Prepare' stage.  " +
 			"Includes various checks as to the publish-ability of the project: testing, generation, etc.  " +
 			"Sub-projects register their own `releasePrepare` to hook into this stage."
 	// See `:release:releasePrepare` which does a lot of heavy lifting here
@@ -77,3 +77,21 @@ idea {
 		name = "hibernate-orm"
 	}
 }
+
+tasks.register('copyDependenciesSonar', Copy) {
+    description = "Aggregates all runtime dependencies for Sonar CLI analysis."
+
+    def targetProjects = subprojects.findAll { it.name != 'reporting' }
+
+    targetProjects.each { sub ->
+        evaluationDependsOn(sub.path)
+
+        if (sub.plugins.hasPlugin('java')) {
+            from(sub.configurations.runtimeClasspath)
+        }
+    }
+
+    into(layout.buildDirectory.dir("sonar-dependencies"))
+
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
diff --git a/changelog.txt b/changelog.txt
index 5335460b4196..9fb6cfb476cb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,153 @@
 Hibernate 7 Changelog
 =======================
 
+Changes in 7.3.0.CR2 (February 03, 2026)
+------------------------------------------------------------------------------------------------------------------------
+
+https://hibernate.atlassian.net/projects/HHH/versions/37404
+
+
+** Bug
+    * HHH-20121 NPE when logging loaded values in follow-on locking post action
+    * HHH-20118 Vector operator SQL templates miss parenthesis around
+    * HHH-20107 SparseFloatVector and SparseDoubleVector accept invalid size <= 0
+    * HHH-20103 @ElementCollection mapping should respect @JoinColumn(foreignKey)
+    * HHH-20102 spec says LockTimeoutException + QueryTimeoutException should not be thrown on PostgreSQL
+    * HHH-20101 Error persisting child entity of abstract generic entity
+    * HHH-19715 read-only mode and collections
+
+** Improvement
+    * HHH-20127 Avoid initializing the BigDecimal class when not strictly necessary
+    * HHH-19902 PostgreSQL failed statements mark tx for rollback
+    * HHH-19610 Make GraphParser support treatedSubGraph from root
+
+** New Feature
+    * HHH-19045 Bytecode enhancer should add a default constructor if it's missing
+
+** Sub-task
+    * HHH-20112 Skip concurrent modification related tests
+    * HHH-20111 Avoid harcoded column definition in tests
+    * HHH-20110 Handle TIMESTAMP and NUMERIC column types in Spanner PG
+    * HHH-20109 Handle Column types for Spanner PG
+    * HHH-20108 Fix connection URL in Spanner PG
+    * HHH-20100 Fix Foreign key issue
+    * HHH-20099 Handle ON CONFLICT clause for Spanner
+    * HHH-20098 Support FORWARD_ONLY scrollable resultset
+
+Changes in 7.3.0.CR1 (January 23, 2026)
+------------------------------------------------------------------------------------------------------------------------
+
+https://hibernate.atlassian.net/projects/HHH/versions/35980
+
+
+** Bug
+    * HHH-20095 New SchemaValidator nullability check should only consider explicitly declared nullability
+    * HHH-20088 HbmXmlTransform does not consider the <set >, <map>, <list>, <bag> and <array> outer-join value to determine the fetch mode. 
+    * HHH-20087 NPE with StatelessSession + Bean Validation
+    * HHH-20079 HbmXmlTransform does not create <sql-join-table-restriction> for ManyToMany attributes
+    * HHH-20072 Javadoc cannot be generated without Jackson 3 dependencies
+    * HHH-20069 `DB2iDialect.rowId` causes an error in merge queries
+    * HHH-20055 <synchronize> is ignored in orm.xml
+    * HHH-20041 DB2 for z IN tuple list predicate performs badly
+    * HHH-20037 MappedSuperClasses can be enhanced more than once resulting in Duplicate annotation interface org...EnhancementInfo Exception
+    * HHH-20032 SubSequence.subSequence violates CharSequence contract for start == end == length()
+    * HHH-20027 Fix failing parsing of PostgreSQL canonical lock_timeout formats (0, ms, s, min, h)
+    * HHH-20021 Binding GregorianCalendar parameter fails with "Type registration was corrupted"
+    * HHH-20015 Hibernate Maven Plugin 7.x does not include maven project dependencies in the enhancement classpath
+    * HHH-20006 Outcome of getSingleResult changed since 6.0
+    * HHH-20002 Ensure physical JDBC connection is released when closing LogicalConnectionManagedImpl
+    * HHH-19999 Caching APIs use Comparator<?> for version comparison in Hibernate ORM 7.2.0.Final
+    * HHH-19932 NullPointerException in SqmInterpretationsKey::toString
+    * HHH-19929 DB2iDialect problem with supportsRowValueConstructorSyntaxInInSubQuery
+    * HHH-19861 EntityNotFoundException when using @Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED) on FK fields
+    * HHH-19390 obsolete documentation for bytecode enhancer
+    * HHH-19192 Bulk delete of owner with soft-delete element-collection physically deletes the collection rows
+    * HHH-18835 AssertionError when executing insert-select
+    * HHH-18040 MySQL update/delete statement issue with subqueries
+    * HHH-12678 PersistentClass.checkColumnDuplication fails for columns with same name from distinct tables
+    * HHH-12100 Misleading exception message in JTASessionContext
+    * HHH-9035 Globally quoted identifiers and id class not working properly with quoted join columns error Unable to find logical column name from physical name JobPositon+id in table JOB+Position
+    * HHH-7287 Problem in caching proper natural-id-values when obtaining result by naturalIdQuery
+
+** Deprecation
+    * HHH-20073 deprecate ByteArrayJavaType and CharacterArrayJavaType
+
+** Improvement
+    * HHH-20076 @Version columns should be NOT NULL
+    * HHH-20059 TiDB: don't propagate readonly to server
+    * HHH-20058 TiDB: Enable shared lock promotion
+    * HHH-20054 Optimize BasicTypeImpl allocation
+    * HHH-20030 FilterImpl: cache validate() results and harden deserialization restore
+    * HHH-20026 Stop hibernate-maven-plugin execution on errors
+    * HHH-20025 Align Generator with UserType
+    * HHH-20017 Refactor AnnotationBasedGenerator to align with AnnotationBasedUserType
+    * HHH-20013 remove dependency to Classmate
+    * HHH-20012 Update the TiDBDialect
+    * HHH-20011 Upgrade minmum version supported for cockroach and upgrade db testing to 25
+    * HHH-20009 docker_db.sh fails to start PostgreSQL 17 and 18 on Apple Silicon (ARM64)
+    * HHH-19997 Update TiDB testing environment
+    * HHH-19992 auto-generate check constraint on @OrderColumn
+    * HHH-19950 Alternative to pre-set parameters offered for deprecated DynamicParameterizedType
+    * HHH-19919 Indexed collection initializers should resolveInstance instead of resolveKey
+    * HHH-19897 Hibernate Envers audited associations mapped-by non-audited ones
+    * HHH-19890 Support a FormatMapper for Jackson3
+    * HHH-19867 Add support for Oracle 26ai in OTP
+    * HHH-19804 Documentation should recommend `annotationProcessorPathsUseDepMgmt` in maven-compiler-plugin when using hibernate-processor
+    * HHH-18984 Remove deprecated Gradle API usage in Hibernate Gradle Plugin
+    * HHH-18461 Improve dialects to generate sql contains offset clause if first result of native query is explicit 0
+    * HHH-14584 Allow PhysicalNamingStrategy implementations to detect when a name is implicit or explicit
+    * HHH-7202 Early detection of bad targetEntity
+    * HHH-6882 Expose CollectionPersister from AbstractCollectionEvent
+    * HHH-6598 Immutable entities should not have up-to-date checks performed on a flush
+
+** New Feature
+    * HHH-20060 TenantCredentialsMapper
+    * HHH-20029 hibernate.connection.login_timeout
+    * HHH-19993 Introduce UserTypeCreationContext and AnnotationBasedUserType
+    * HHH-19989 RemovalsMode.EXCLUDE
+    * HHH-19978 Support type variable members also in abstract entities
+    * HHH-19880 Move Hibernate Tools' `hibernate-assistant` module to Hibernate ORM
+    * HHH-19826 Add array_reverse and array_sort functions
+    * HHH-19541 "exists" queries
+    * HHH-18998 Supply UserType and UserCollectionType with type-safe config via annotation
+    * HHH-17657 Support named enum types on h2
+    * HHH-16383 NaturalIdClass
+
+** Sub-task
+    * HHH-20091 Fix CTE Rendering Syntax for Spanner
+    * HHH-20086 Handle no escape character in Spanner PG dialect
+    * HHH-20066 Support only JSON Aggregation for Spanner PG Dialect
+    * HHH-20050 Create Spanner PostgreSQL dialect
+    * HHH-20045 Add support to create unique index when unique column is not supported
+    * HHH-20038 Fixes for SpannerDialect-3
+    * HHH-20034 Fixes for SpannerDialect-2
+    * HHH-20033 Introduce Dialect#getSetOperatorSqlString to support Spanner's explicit DISTINCT requirement
+    * HHH-20003 Spanner temporary table exporter
+    * HHH-19991 Fixes for SpannerDialect 
+    * HHH-19983 Config for running tests on Spanner emualtor 
+
+Changes in 7.2.0.CR4 (December 10, 2025)
+------------------------------------------------------------------------------------------------------------------------
+
+https://hibernate.atlassian.net/projects/HHH/versions/36476
+
+
+** Bug
+    * HHH-19980 In JTA after-completion callbacks may get ignored
+    * HHH-19979 processor should handle @NamedEntityGraph with defaulted name
+    * HHH-19975 Calling entityManager.find(clazz, id) with null id throws NullPointerException
+    * HHH-19972 OptionalTableUpdateOperation can fail on PostgreSQL < 15 and CockroachDB
+    * HHH-19963 Wrong references in entity fields with circular associations
+    * HHH-19958 `<generated>` tag in orm.xml is not implemented
+    * HHH-19955 Thread-safety issue in EntityEntryContext resulting in NullPointerException for Session.contains() calls.
+    * HHH-19843 Bean Validation may fail on operations with stateless session
+    * HHH-18871 Nested NativeQuery mappings causing 'Could not locate TableGroup' exception after migration
+    * HHH-18217 StatelessSession.upsert() for entity with all-null non-id fields, or no non-id field
+
+** Improvement
+    * HHH-19943 Comparison of generic nested EmbeddedId's fails for JPQL and Criteria API
+    * HHH-19215 Extends Dialect#addQueryHints to support straight_join syntax
+
 Changes in 7.2.0.CR3 (November 25, 2025)
 ------------------------------------------------------------------------------------------------------------------------
 
diff --git a/ci/build.sh b/ci/build.sh
index ef52ed93dd94..d4da98efa8f8 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -3,28 +3,40 @@
 goal=
 if [ "$RDBMS" == "h2" ] || [ "$RDBMS" == "" ]; then
   # This is the default.
-  #   - special check for Jenkins CI jobs where we don't want to run preVerifyRelease
-  if [[ -n "$CI_SYSTEM" && "$CI_SYSTEM" != "jenkins" ]]; then
-    goal="preVerifyRelease"
-    # Settings needed for `preVerifyRelease` execution - for asciidoctor doc rendering
-	  export GRADLE_OPTS=-Dorg.gradle.jvmargs='-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8'
-	fi
-elif [ "$RDBMS" == "hsqldb" ] || [ "$RDBMS" == "hsqldb_2_6" ]; then
+  #   - special check for Jenkins CI jobs where we don't want to run releasePrepare
+  if [[ "$CI_SYSTEM" != "jenkins" ]]; then
+    goal="releasePrepare"
+    # Settings needed for `releasePrepare` execution - for asciidoctor doc rendering
+    export GRADLE_OPTS=-Dorg.gradle.jvmargs='-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8'
+  fi
+elif [ "$RDBMS" == "hsqldb" ]; then
   goal="-Pdb=hsqldb"
-elif [ "$RDBMS" == "mysql" ] || [ "$RDBMS" == "mysql_8_0" ]; then
+elif [ "$RDBMS" == "hsqldb_2_6" ]; then
+  goal="-Pdb=hsqldb -PdbVersion=2.6"
+elif [ "$RDBMS" == "mysql" ]; then
   goal="-Pdb=mysql_ci"
-elif [ "$RDBMS" == "mariadb" ] || [ "$RDBMS" == "mariadb_10_6" ]; then
+elif [ "$RDBMS" == "mysql_8_0" ]; then
+  goal="-Pdb=mysql_ci -PdbVersion=8.0"
+elif [ "$RDBMS" == "mariadb" ]; then
   goal="-Pdb=mariadb_ci"
-elif [ "$RDBMS" == "postgresql" ] || [ "$RDBMS" == "postgresql_13" ]; then
+elif [ "$RDBMS" == "mariadb_10_6" ]; then
+  goal="-Pdb=mariadb_ci -PdbVersion=10.6"
+elif [ "$RDBMS" == "postgresql" ]; then
   goal="-Pdb=pgsql_ci"
+elif [ "$RDBMS" == "postgresql_14" ]; then
+  goal="-Pdb=pgsql_ci -PdbVersion=14"
 elif [ "$RDBMS" == "gaussdb"  ]; then
   goal="-Pdb=gaussdb -DdbHost=localhost:8000"
-elif [ "$RDBMS" == "edb" ] || [ "$RDBMS" == "edb_13" ]; then
+elif [ "$RDBMS" == "edb" ]; then
   goal="-Pdb=edb_ci -DdbHost=localhost:5444"
+elif [ "$RDBMS" == "edb_14" ]; then
+  goal="-Pdb=edb_ci -DdbHost=localhost:5444 -PdbVersion=14"
 elif [ "$RDBMS" == "oracle" ]; then
   goal="-Pdb=oracle_ci"
-elif [ "$RDBMS" == "oracle_xe" ] || [ "$RDBMS" == "oracle_21" ]; then
-  goal="-Pdb=oracle_xe_ci"
+elif [ "$RDBMS" == "oracle_xe" ]; then
+  goal="-Pdb=oracle_xe_ci -PdbVersion=18"
+elif [ "$RDBMS" == "oracle_21" ]; then
+  goal="-Pdb=oracle_xe_ci -PdbVersion=21"
 elif [ "$RDBMS" == "oracle_atps_tls" ]; then
   echo "Managing Oracle Autonomous Database..."
   export INFO=$(curl -s -k -L -X GET "https://api.atlas-controller.oraclecloud.com/ords/atlas/admin/database?type=autonomous&hostname=`hostname`" -H 'accept: application/json')
@@ -56,15 +68,32 @@ elif [ "$RDBMS" == "oracle_db23c" ]; then
   export SERVICE=$(echo $INFO | jq -r '.database' | jq -r '.service')
   goal="-Pdb=oracle_cloud_db23c -DrunID=$RUNID -DdbHost=$HOST -DdbService=$SERVICE"
 # OTP
-elif [ "$RDBMS" == "autonomous-transaction-processing-serverless" ] || [ "$RDBMS" == "base-database-service-19c" ] || [ "$RDBMS" == "base-database-service-21c" ] || [ "$RDBMS" == "base-database-service-23ai" ]; then
+elif [ "$RDBMS" == "autonomous-transaction-processing-serverless-19c" ]; then
   echo "Managing OTP Database..."
-  goal="-Pdb=oracle_test_pilot_database -DrunID=$RUNID -DdbPassword=$TESTPILOT_PASSWORD -DdbConnectionStringSuffix=$TESTPILOT_CONNECTION_STRING_SUFFIX"
+  goal="-Pdb=oracle_test_pilot_database -PdbVersion=atps-19 -DrunID=$RUNID -DdbPassword=$TESTPILOT_PASSWORD -DdbConnectionStringSuffix=$TESTPILOT_CONNECTION_STRING_SUFFIX"
+elif [ "$RDBMS" == "autonomous-transaction-processing-serverless-26ai" ]; then
+  echo "Managing OTP Database..."
+  goal="-Pdb=oracle_test_pilot_database -PdbVersion=atps-26 -DrunID=$RUNID -DdbPassword=$TESTPILOT_PASSWORD -DdbConnectionStringSuffix=$TESTPILOT_CONNECTION_STRING_SUFFIX"
+elif [ "$RDBMS" == "autonomous-transaction-processing-serverless" ]; then
+  echo "Managing OTP Database..."
+  goal="-Pdb=oracle_test_pilot_database -PdbVersion=atps -DrunID=$RUNID -DdbPassword=$TESTPILOT_PASSWORD -DdbConnectionStringSuffix=$TESTPILOT_CONNECTION_STRING_SUFFIX"
+elif [ "$RDBMS" == "base-database-service-19c" ]; then
+  echo "Managing OTP Database..."
+  goal="-Pdb=oracle_test_pilot_database -PdbVersion=19 -DrunID=$RUNID -DdbPassword=$TESTPILOT_PASSWORD -DdbConnectionStringSuffix=$TESTPILOT_CONNECTION_STRING_SUFFIX"
+elif [ "$RDBMS" == "base-database-service-21c" ]; then
+  echo "Managing OTP Database..."
+  goal="-Pdb=oracle_test_pilot_database -PdbVersion=21 -DrunID=$RUNID -DdbPassword=$TESTPILOT_PASSWORD -DdbConnectionStringSuffix=$TESTPILOT_CONNECTION_STRING_SUFFIX"
+elif [ "$RDBMS" == "base-database-service-26ai" ]; then
+  echo "Managing OTP Database..."
+  goal="-Pdb=oracle_test_pilot_database -PdbVersion=26 -DrunID=$RUNID -DdbPassword=$TESTPILOT_PASSWORD -DdbConnectionStringSuffix=$TESTPILOT_CONNECTION_STRING_SUFFIX"
 elif [ "$RDBMS" == "db2" ]; then
   goal="-Pdb=db2_ci"
 elif [ "$RDBMS" == "db2_11_5" ]; then
   goal="-Pdb=db2_old_ci"
-elif [ "$RDBMS" == "mssql" ] || [ "$RDBMS" == "mssql_2017" ]; then
+elif [ "$RDBMS" == "mssql" ]; then
   goal="-Pdb=mssql_ci"
+elif [ "$RDBMS" == "mssql_2017" ]; then
+  goal="-Pdb=mssql_ci -PdbVersion=2017"
 # Exclude some Sybase tests on CI because they use `xmltable` function which has a memory leak on the DB version in CI
 elif [ "$RDBMS" == "sybase" ]; then
   goal="-Pdb=sybase_ci -PexcludeTests=**.GenerateSeriesTest*"
diff --git a/ci/jpa-3.2-tck.Jenkinsfile b/ci/jpa-3.2-tck.Jenkinsfile
index c617e8337618..4f7cf120c68a 100644
--- a/ci/jpa-3.2-tck.Jenkinsfile
+++ b/ci/jpa-3.2-tck.Jenkinsfile
@@ -31,9 +31,9 @@ pipeline {
     }
     parameters {
         choice(name: 'IMAGE_JDK', choices: ['jdk17', 'jdk25'], description: 'The JDK base image version to use for the TCK image.')
-        string(name: 'TCK_VERSION', defaultValue: '3.2.0', description: 'The version of the Jakarta JPA TCK i.e. `2.2.0` or `3.0.1`')
-        string(name: 'TCK_SHA', defaultValue: '', description: 'The SHA256 of the Jakarta JPA TCK that is distributed under https://download.eclipse.org/jakartaee/persistence/3.1/jakarta-persistence-tck-${TCK_VERSION}.zip.sha256')
-		string(name: 'TCK_URL', defaultValue: 'https://www.eclipse.org/downloads/download.php?file=/ee4j/jakartaee-tck/jakartaee11/staged/eftl/jakarta-persistence-tck-3.2.0.zip&mirror_id=1', description: 'The URL from which to download the TCK ZIP file. Only needed for testing staged builds. Ensure the TCK_VERSION variable matches the ZIP file name suffix.')
+        string(name: 'TCK_VERSION', defaultValue: '3.2.1', description: 'The version of the Jakarta JPA TCK i.e. `2.2.0` or `3.0.1`')
+        string(name: 'TCK_SHA', defaultValue: '1d282675f43fa13cf8ab2537d6dbfb1e1c95f7b838ab7cdd053e185c363a6519', description: 'The SHA256 of the Jakarta JPA TCK that is distributed under https://download.eclipse.org/jakartaee/persistence/3.1/jakarta-persistence-tck-${TCK_VERSION}.zip.sha256')
+		string(name: 'TCK_URL', defaultValue: 'https://download.eclipse.org/jakartaee/persistence/3.2/jakarta-persistence-tck-3.2.1.zip', description: 'The URL from which to download the TCK ZIP file. Only needed for testing staged builds. Ensure the TCK_VERSION variable matches the ZIP file name suffix.')
         choice(name: 'RDBMS', choices: ['postgresql','mysql','mssql','oracle','db2','sybase'], description: 'The JDK base image version to use for the TCK image.')
 	}
     stages {
diff --git a/ci/quarkus.Jenkinsfile b/ci/quarkus.Jenkinsfile
new file mode 100644
index 000000000000..ebb51d32fb49
--- /dev/null
+++ b/ci/quarkus.Jenkinsfile
@@ -0,0 +1,207 @@
+import groovy.transform.Field
+
+@Library('hibernate-jenkins-pipeline-helpers') _
+
+@Field final String ORM_JDK_VERSION = '25'
+@Field final String QUARKUS_JDK_VERSION = '17'
+@Field final String ORM_JDK_TOOL = "OpenJDK ${ORM_JDK_VERSION} Latest"
+@Field final String QUARKUS_JDK_TOOL = "OpenJDK ${QUARKUS_JDK_VERSION} Latest"
+@Field final String QUARKUS_BRANCH_TO_TEST = 'main'
+
+// When enabling Quarkus builds make sure to check the version/branch to test. See `QUARKUS_BRANCH_TO_TEST`.
+def ENABLE_QUARKUS_BUILDS = false
+
+// Avoid running the pipeline on branch indexing
+if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
+    print "INFO: Build skipped due to trigger being Branch Indexing"
+    currentBuild.result = 'NOT_BUILT'
+    return
+}
+// This is a limited maintenance branch, so don't run this on pushes to the branch, only on PRs
+if ( !env.CHANGE_ID ) {
+    print "INFO: Build skipped because this job should only run for pull request, not for branch pushes"
+    currentBuild.result = 'NOT_BUILT'
+    return
+}
+
+def manuallyTriggered = currentBuild.getBuildCauses().toString().contains( 'UserIdCause' )
+
+// allow to bypass the check if the build is triggered manually:
+if (!manuallyTriggered && !ENABLE_QUARKUS_BUILDS) {
+    print "INFO: Build skipped because we are not yet testing a next LTS version of Quarkus."
+    currentBuild.result = 'NOT_BUILT'
+    return
+}
+
+void runBuildOnNode(String label, Closure body) {
+    node( label ) {
+        pruneDockerContainers()
+        tryFinally(body, {
+            cleanWs()
+            pruneDockerContainers()
+        })
+    }
+}
+
+// try-finally construct that properly suppresses exceptions thrown in the finally block.
+def tryFinally(Closure main, Closure ... finallies) {
+    def mainFailure = null
+    try {
+        main()
+    }
+    catch (Throwable t) {
+        mainFailure = t
+        throw t
+    }
+    finally {
+        finallies.each {it ->
+            try {
+                it()
+            }
+            catch (Throwable t) {
+                if ( mainFailure ) {
+                    mainFailure.addSuppressed( t )
+                }
+                else {
+                    mainFailure = t
+                }
+            }
+        }
+    }
+    if ( mainFailure ) { // We may reach here if only the "finally" failed
+        throw mainFailure
+    }
+}
+
+class BuildConfiguration {
+    String name
+    String projects
+    boolean nativeProfile = false
+}
+
+// See data category from https://github.com/quarkusio/quarkus/blob/main/.github/native-tests.json
+def configurations = [
+        new BuildConfiguration( name: "JVM test", projects: "!integration-tests/kafka-oauth-keycloak,!integration-tests/kafka-sasl-elytron,!integration-tests/hibernate-search-orm-opensearch,!integration-tests/hibernate-search-orm-elasticsearch-outbox-polling,!integration-tests/hibernate-search-orm-elasticsearch-tenancy,!integration-tests/maven,!integration-tests/quartz,!integration-tests/reactive-messaging-kafka,!integration-tests/resteasy-reactive-kotlin/standard,!integration-tests/opentelemetry-reactive-messaging,!integration-tests/virtual-threads/kafka-virtual-threads,!integration-tests/smallrye-jwt-oidc-webapp,!extensions/oidc-db-token-state-manager/deployment,!docs"),
+        new BuildConfiguration( name: "Data1", nativeProfile: true, projects: "jpa-h2, jpa-h2-embedded, jpa-mariadb, jpa-mssql, jpa-without-entity, hibernate-orm-tenancy/datasource, hibernate-orm-tenancy/connection-resolver, hibernate-orm-tenancy/connection-resolver-legacy-qualifiers"),
+        new BuildConfiguration( name: "Data2", nativeProfile: true, projects: "jpa, jpa-mapping-xml/legacy-app, jpa-mapping-xml/modern-app, jpa-mysql, jpa-db2, jpa-oracle"),
+        new BuildConfiguration( name: "Data3", nativeProfile: true, projects: "hibernate-orm-panache, hibernate-orm-panache-kotlin, hibernate-orm-envers, hibernate-orm-rest-data-panache"),
+        // Skipped because we only care about one project, which we added to Data3
+        //new BuildConfiguration( name: "Data4", nativeProfile: true, projects: "hibernate-orm-rest-data-panache"),
+        new BuildConfiguration( name: "Data5", nativeProfile: true, projects: "jpa-postgresql, jpa-postgresql-withxml, hibernate-reactive-postgresql, hibernate-orm-tenancy/schema, hibernate-orm-tenancy/schema-mariadb"),
+        // Ignoring, because they don't bring much here: hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-standalone-elasticsearch, hibernate-search-standalone-opensearch
+        new BuildConfiguration( name: "Data6", nativeProfile: true, projects: "hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-outbox-polling"),
+        new BuildConfiguration( name: "Data7", nativeProfile: true, projects: "hibernate-reactive-db2, hibernate-reactive-mariadb, hibernate-reactive-mssql, hibernate-reactive-mysql, hibernate-reactive-mysql-agroal-flyway, hibernate-reactive-panache, hibernate-reactive-panache-kotlin, hibernate-reactive-oracle")
+]
+
+pipeline {
+    agent none
+    options {
+        buildDiscarder(logRotator(numToKeepStr: '3', artifactNumToKeepStr: '3'))
+        disableConcurrentBuilds(abortPrevious: true)
+        skipDefaultCheckout()
+    }
+    stages {
+        stage('Checks') {
+            steps {
+                requireApprovalForPullRequest 'hibernate'
+            }
+        }
+        stage('Build Hibernate ORM') {
+            agent {
+                label 'LongDuration'
+            }
+            tools {
+                jdk ORM_JDK_TOOL
+            }
+            steps {
+                script {
+                    dir('hibernate') {
+                        checkout scm
+                        sh "./gradlew clean publishToMavenLocal -x test --no-scan --no-daemon --no-build-cache --stacktrace -PmavenMirror=nexus-load-balancer-c4cf05fd92f43ef8.elb.us-east-1.amazonaws.com -Dmaven.repo.local=${env.WORKSPACE_TMP}/.m2repository"
+                        script {
+                            env.HIBERNATE_VERSION = sh (
+                                    script: "grep hibernateVersion gradle/version.properties|cut -d'=' -f2",
+                                    returnStdout: true
+                            ).trim()
+                        }
+                    }
+                    dir(env.WORKSPACE_TMP) {
+                        stash name: 'repository', includes: ".m2repository/"
+                    }
+                }
+            }
+        }
+        stage('Build Quarkus') {
+            agent {
+                label 'LongDuration'
+            }
+            tools {
+                jdk QUARKUS_JDK_TOOL
+                maven 'Apache Maven 3.9'
+            }
+            steps {
+                script {
+                    Map<String, Closure> executions = [:]
+
+                    configurations.each { BuildConfiguration configuration ->
+                        executions.put(configuration.name, {
+                            node( 'LongDuration' ) {
+                                dir(env.WORKSPACE_TMP) {
+                                    unstash "repository"
+                                }
+                                // Workaround issues when path contains @ character
+                                dir(env.WORKSPACE) {
+                                    // Remove previous soft-link if it is around
+                                    sh "rm .m2 || true"
+                                    sh "ln -s ${env.WORKSPACE_TMP}/.m2repository .m2"
+                                }
+                                dir('quarkus') {
+                                    sh "git clone -b ${QUARKUS_BRANCH_TO_TEST} --single-branch https://github.com/quarkusio/quarkus.git . || git reset --hard && git clean -fx && git pull"
+                                    script {
+                                        def sedStatus = sh (script: "sed -i 's@<hibernate-orm.version>.*</hibernate-orm.version>@<hibernate-orm.version>${env.HIBERNATE_VERSION}</hibernate-orm.version>@' pom.xml", returnStatus: true)
+                                        if ( sedStatus != 0 ) {
+                                            throw new IllegalArgumentException( "Unable to replace hibernate version in Quarkus pom. Got exit code $sedStatus" )
+                                        }
+                                    }
+                                    // Need to override the default maven configuration this way, because there is no other way to do it
+                                    sh "sed -i 's/-Xmx5g/-Xmx2048m/' ./.mvn/jvm.config"
+                                    sh "echo -e '\\n-XX:MaxMetaspaceSize=1024m'>>./.mvn/jvm.config"
+                                    withMaven(mavenLocalRepo: env.WORKSPACE + '/.m2', publisherStrategy: 'EXPLICIT') {
+                                        def javaHome = tool(name: QUARKUS_JDK_TOOL, type: 'jdk')
+                                        // to account for script-only maven wrapper use in Quarkus:
+                                        withEnv(["JAVA_HOME=${javaHome}", "PATH+JAVA=${javaHome}/bin", "MAVEN_ARGS=${env.MAVEN_ARGS?:""} ${env.MAVEN_CONFIG}"]) {
+                                            sh "./mvnw -pl !docs -Dquickly install"
+                                            // Need to kill the gradle daemons started during the Maven install run
+                                            sh "sudo pkill -f '.*GradleDaemon.*' || true"
+                                            // Need to override the default maven configuration this way, because there is no other way to do it
+                                            sh "sed -i 's/-Xmx2048m/-Xmx1340m/' ./.mvn/jvm.config"
+                                            sh "sed -i 's/MaxMetaspaceSize=1024m/MaxMetaspaceSize=512m/' ./.mvn/jvm.config"
+                                            def projects = configuration.projects
+                                            def additionalArguments
+                                            def additionalOptions
+                                            if ( configuration.nativeProfile ) {
+                                                additionalArguments = "-f integration-tests"
+                                                additionalOptions = "-Dquarkus.native.native-image-xmx=6g -Dnative -Dnative.surefire.skip -Dno-descriptor-tests"
+                                            }
+                                            else {
+                                                additionalArguments = "-pl :quarkus-hibernate-orm -amd"
+                                                additionalOptions = ""
+                                            }
+                                            sh "TESTCONTAINERS_RYUK_CONTAINER_PRIVILEGED=true ./mvnw -Dinsecure.repositories=WARN ${additionalArguments} -pl '${projects}' verify -Dstart-containers -Dtest-containers -Dskip.gradle.build ${additionalOptions}"
+                                        }
+                                    }
+                                }
+                            }
+                        })
+                    }
+                    parallel executions
+                }
+            }
+        }
+    }
+    post {
+        always {
+            notifyBuildResult maintainers: "andrea@hibernate.org steve@hibernate.org christian.beikov@gmail.com mbellade@redhat.com"
+        }
+    }
+}
diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index 5278d3463e4d..dc3d0f0bd9b1 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -222,15 +222,9 @@ pipeline {
 								withEnv([
 										"DISABLE_REMOTE_GRADLE_CACHE=true"
 								]) {
-                                    def notesFiles = findFiles(glob: 'release_notes.md')
-                                    if ( notesFiles.length < 1 ) {
-                                        throw new IllegalStateException( "Could not locate `release_notes.md`" )
-                                    }
-                                    if ( notesFiles.length > 1 ) {
-                                        throw new IllegalStateException( "Located more than 1 `release_notes.md`" )
-                                    }
+                                    def ghReleaseNote = sh(script: 'realpath -e release_notes.md 2>/dev/null || true', returnStdout: true).trim()
 
-									sh ".release/scripts/publish.sh -j --notes=${notesFiles[0].path} ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH} "
+                                    sh ".release/scripts/publish.sh -j ${ghReleaseNote != '' ? '--notes=' + ghReleaseNote : ''} ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH} "
 								}
 							}
 						}
diff --git a/design/logger_id_ranges.adoc b/design/logger_id_ranges.adoc
index 6ef47008a7ed..cfaaecd4dcb5 100644
--- a/design/logger_id_ranges.adoc
+++ b/design/logger_id_ranges.adoc
@@ -56,7 +56,7 @@ well as some helper info such as whether DEBUG or TRACE are enabled.  E.g.:
 public interface MappingModelCreationLogger extends BasicLogger {
 	String LOGGER_NAME = "org.hibernate.orm.model.mapping.creation";
 
-	MappingModelCreationLogger LOGGER = Logger.getMessageLogger( MappingModelCreationLogger.class, LOGGER_NAME );
+	MappingModelCreationLogger LOGGER = Logger.getMessageLogger( MappingModelCreationLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	boolean TRACE_ENABLED = LOGGER.isTraceEnabled();
 	boolean DEBUG_ENABLED = LOGGER.isDebugEnabled();
diff --git a/docker_db.sh b/docker_db.sh
index bf8d8b088076..ddbaad2d1685 100755
--- a/docker_db.sh
+++ b/docker_db.sh
@@ -33,7 +33,7 @@ else
 fi
 
 mysql() {
-    mysql_9_4
+    mysql_9_6
 }
 
 mysql_8_0() {
@@ -61,6 +61,16 @@ mysql_9_4() {
     mysql_setup "9.4" "$init_connect"
 }
 
+mysql_9_5() {
+    local init_connect="--init-connect=SET character_set_client='utf8mb4';SET character_set_results='utf8mb4';SET character_set_connection='utf8mb4';SET collation_connection='utf8mb4_0900_as_cs';"
+    mysql_setup "9.5" "$init_connect"
+}
+
+mysql_9_6() {
+    local init_connect="--init-connect=SET character_set_client='utf8mb4';SET character_set_results='utf8mb4';SET character_set_connection='utf8mb4';SET collation_connection='utf8mb4_0900_as_cs';"
+    mysql_setup "9.6" "$init_connect"
+}
+
 # Generic MySQL function that handles all versions
 mysql_setup() {
     local version=$1
@@ -130,6 +140,10 @@ mysql_setup() {
         echo "MySQL is ready"
     fi
 
+    # Install components
+    # file://component_classic_hashing - This is for legacy hashing algorithms on MySQL 9.6: SHA1 and MD5.
+    $CONTAINER_CLI exec mysql bash -c "mysql -u root -phibernate_orm_test -e \"INSTALL COMPONENT 'file://component_classic_hashing'\"" 2>/dev/null
+
     databases=()
     for n in $(seq 1 $DB_COUNT)
     do
@@ -144,7 +158,7 @@ mysql_setup() {
 }
 
 mariadb() {
-  mariadb_12_0
+  mariadb_12_2
 }
 
 mariadb_wait_until_start()
@@ -196,6 +210,18 @@ mariadb_12_0() {
     mariadb_setup
 }
 
+mariadb_12_1() {
+    $CONTAINER_CLI rm -f mariadb || true
+    $CONTAINER_CLI run --name mariadb -e MARIADB_USER=hibernate_orm_test -e MARIADB_PASSWORD=hibernate_orm_test -e MARIADB_DATABASE=hibernate_orm_test -e MARIADB_ROOT_PASSWORD=hibernate_orm_test -p3306:3306 --tmpfs /var/lib/mysql -d ${DB_IMAGE_MARIADB_12_1:-docker.io/mariadb:12.1.2} --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --skip-character-set-client-handshake --lower_case_table_names=2
+    mariadb_setup
+}
+
+mariadb_12_2() {
+    $CONTAINER_CLI rm -f mariadb || true
+    $CONTAINER_CLI run --name mariadb -e MARIADB_USER=hibernate_orm_test -e MARIADB_PASSWORD=hibernate_orm_test -e MARIADB_DATABASE=hibernate_orm_test -e MARIADB_ROOT_PASSWORD=hibernate_orm_test -p3306:3306 --tmpfs /var/lib/mysql -d ${DB_IMAGE_MARIADB_12_2:-docker.io/mariadb:12.2.2} --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --skip-character-set-client-handshake --lower_case_table_names=2
+    mariadb_setup
+}
+
 mariadb_verylatest() {
     $CONTAINER_CLI rm -f mariadb || true
     $CONTAINER_CLI run --name mariadb -e MARIADB_USER=hibernate_orm_test -e MARIADB_PASSWORD=hibernate_orm_test -e MARIADB_DATABASE=hibernate_orm_test -e MARIADB_ROOT_PASSWORD=hibernate_orm_test -p3306:3306 --tmpfs /var/lib/mysql -d ${DB_IMAGE_MARIADB_VERYLATEST:-quay.io/mariadb-foundation/mariadb-devel:verylatest} --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --skip-character-set-client-handshake --lower_case_table_names=2
@@ -215,24 +241,22 @@ mariadb_setup() {
       create_cmd+="create database ${databases[i]}; grant all privileges on ${databases[i]}.* to 'hibernate_orm_test'@'%';"
     done
     $CONTAINER_CLI exec mariadb bash -c "mariadb -u root -phibernate_orm_test -e \"${create_cmd}\"" 2>/dev/null
-    echo "MySQL databases were successfully setup"
+    echo "MariaDB databases were successfully setup"
 }
 
+POSTGRESQL_PLATFORM_OPTION=""
+if [[ "$IS_OSX" == "true" ]]; then
+  # PostGIS images only support amd64, so we force emulation on macOS
+  POSTGRESQL_PLATFORM_OPTION="--platform linux/amd64"
+fi
+
 postgresql() {
   postgresql_18
 }
 
-postgresql_13() {
-    $CONTAINER_CLI rm -f postgres || true
-    $CONTAINER_CLI run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql/data -d ${DB_IMAGE_POSTGRESQL_13:-docker.io/postgis/postgis:13-3.1} \
-       -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c shared_buffers=256MB -c maintenance_work_mem=256MB -c max_wal_size=1GB -c checkpoint_timeout=1d
-    $CONTAINER_CLI exec postgres bash -c '/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && apt install -y postgresql-13-pgvector'
-    postgresql_setup
-}
-
 postgresql_14() {
     $CONTAINER_CLI rm -f postgres || true
-    $CONTAINER_CLI run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql/data -d ${DB_IMAGE_POSTGRESQL_14:-docker.io/postgis/postgis:14-3.3} \
+    $CONTAINER_CLI run --name postgres ${POSTGRESQL_PLATFORM_OPTION} -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql/data -d ${DB_IMAGE_POSTGRESQL_14:-docker.io/postgis/postgis:14-3.3} \
        -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c shared_buffers=256MB -c maintenance_work_mem=256MB -c max_wal_size=1GB -c checkpoint_timeout=1d
     $CONTAINER_CLI exec postgres bash -c '/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && apt install -y postgresql-14-pgvector'
     postgresql_setup
@@ -240,7 +264,7 @@ postgresql_14() {
 
 postgresql_15() {
     $CONTAINER_CLI rm -f postgres || true
-    $CONTAINER_CLI run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql/data -d ${DB_IMAGE_POSTGRESQL_15:-docker.io/postgis/postgis:15-3.3} \
+    $CONTAINER_CLI run --name postgres ${POSTGRESQL_PLATFORM_OPTION} -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql/data -d ${DB_IMAGE_POSTGRESQL_15:-docker.io/postgis/postgis:15-3.3} \
       -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c shared_buffers=256MB -c maintenance_work_mem=256MB -c max_wal_size=1GB -c checkpoint_timeout=1d
     $CONTAINER_CLI exec postgres bash -c '/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && apt install -y postgresql-15-pgvector'
     postgresql_setup
@@ -248,7 +272,7 @@ postgresql_15() {
 
 postgresql_16() {
     $CONTAINER_CLI rm -f postgres || true
-    $CONTAINER_CLI run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql/data -d ${DB_IMAGE_POSTGRESQL_16:-docker.io/postgis/postgis:16-3.4} \
+    $CONTAINER_CLI run --name postgres ${POSTGRESQL_PLATFORM_OPTION} -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql/data -d ${DB_IMAGE_POSTGRESQL_16:-docker.io/postgis/postgis:16-3.4} \
       -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c shared_buffers=256MB -c maintenance_work_mem=256MB -c max_wal_size=1GB -c checkpoint_timeout=1d
     $CONTAINER_CLI exec postgres bash -c '/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && apt install -y postgresql-16-pgvector'
     postgresql_setup
@@ -256,7 +280,7 @@ postgresql_16() {
 
 postgresql_17() {
     $CONTAINER_CLI rm -f postgres || true
-    $CONTAINER_CLI run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql/data -d ${DB_IMAGE_POSTGRESQL_17:-docker.io/postgis/postgis:17-3.5} \
+    $CONTAINER_CLI run --name postgres ${POSTGRESQL_PLATFORM_OPTION} -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql/data -d ${DB_IMAGE_POSTGRESQL_17:-docker.io/postgis/postgis:17-3.5} \
       -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c shared_buffers=256MB -c maintenance_work_mem=256MB -c max_wal_size=1GB -c checkpoint_timeout=1d
     $CONTAINER_CLI exec postgres bash -c '/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && apt install -y postgresql-17-pgvector'
     postgresql_setup
@@ -264,7 +288,7 @@ postgresql_17() {
 
 postgresql_18() {
     $CONTAINER_CLI rm -f postgres || true
-    $CONTAINER_CLI run --name postgres -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql -d ${DB_IMAGE_POSTGRESQL_17:-docker.io/postgis/postgis:18-3.6} \
+    $CONTAINER_CLI run --name postgres ${POSTGRESQL_PLATFORM_OPTION} -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p5432:5432 --tmpfs /var/lib/postgresql -d ${DB_IMAGE_POSTGRESQL_18:-docker.io/postgis/postgis:18-3.6} \
       -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c shared_buffers=256MB -c maintenance_work_mem=256MB -c max_wal_size=1GB -c checkpoint_timeout=1d
     $CONTAINER_CLI exec postgres bash -c '/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && apt install -y postgresql-18-pgvector'
     postgresql_setup
@@ -331,17 +355,6 @@ edb() {
     edb_17
 }
 
-edb_13() {
-    $CONTAINER_CLI rm -f edb || true
-    if [[ -z "${DB_IMAGE_EDB}" ]]; then
-      DB_IMAGE_EDB="edb-test:13"
-      # We need to build a derived image because the existing image is mainly made for use by a kubernetes operator
-      (cd edb; $CONTAINER_CLI build -t edb-test:13 -f edb13.Dockerfile .)
-    fi
-    $CONTAINER_CLI run --name edb -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p 5444:5444 -d $DB_IMAGE_EDB
-    edb_setup
-}
-
 edb_14() {
     $CONTAINER_CLI rm -f edb || true
     if [[ -z "${DB_IMAGE_EDB}" ]]; then
@@ -813,6 +826,7 @@ oracle_setup() {
     for i in "${!users[@]}";do
       create_cmd+="
 create user ${users[i]} identified by hibernate_orm_test quota unlimited on users;
+grant create session to ${users[i]};
 grant all privileges to ${users[i]};"
     done
     
@@ -876,6 +890,7 @@ alter tablespace SYSTEM nologging;
 alter tablespace SYSAUX nologging;
 
 create user hibernate_orm_test identified by hibernate_orm_test quota unlimited on users;
+grant create session to hibernate_orm_test;
 grant all privileges to hibernate_orm_test;
 ${create_cmd}
 EOF\""
@@ -907,7 +922,9 @@ oracle_free_setup() {
     for i in "${!users[@]}";do
       create_cmd+="
 create user ${users[i]} identified by hibernate_orm_test quota unlimited on users;
-grant all privileges to ${users[i]};"
+grant create session to ${users[i]};
+grant create domain to ${users[i]};
+grant all privileges on schema ${users[i]} to ${users[i]};"
     done
 
     # We increase file sizes to avoid online resizes as that requires lots of CPU which is restricted in XE
@@ -969,7 +986,9 @@ alter tablespace SYSTEM nologging;
 alter tablespace SYSAUX nologging;
 
 create user hibernate_orm_test identified by hibernate_orm_test quota unlimited on users;
-grant all privileges to hibernate_orm_test;
+grant create session to hibernate_orm_test;
+grant create domain to hibernate_orm_test;
+grant all privileges on schema hibernate_orm_test to hibernate_orm_test;
 ${create_cmd}
 EOF\""
 }
@@ -1081,7 +1100,7 @@ oracle_18() {
        --health-interval 5s \
        --health-timeout 5s \
        --health-retries 10 \
-       ${DB_IMAGE_ORACLE_21:-docker.io/gvenzl/oracle-xe:18.4.0}
+       ${DB_IMAGE_ORACLE_18:-docker.io/gvenzl/oracle-xe:18.4.0}
     oracle_setup
 }
 
@@ -1137,11 +1156,71 @@ hana() {
         sleep 10
         OUTPUT=$($PRIVILEGED_CLI $CONTAINER_CLI logs hana 2>&1)
     done
+    hana_setup
     echo "HANA successfully started"
 }
 
+hana_setup() {
+  databases=()
+  for n in $(seq 1 $DB_COUNT)
+  do
+    databases+=("hibernate_orm_test_${n}")
+  done
+  create_cmd=
+  for i in "${!databases[@]}";do
+    create_cmd+="
+create user ${databases[i]} password H1bernate_test NO FORCE_FIRST_PASSWORD_CHANGE;
+grant create schema to ${databases[i]};"
+  done
+  # The first command seems to be ignored?! So let's just run something useless
+  $CONTAINER_CLI exec hana bash -c "cat <<EOF | /usr/sap/HXE/HDB90/exe/hdbsql -n localhost:39017 -u SYSTEM -p H1bernate_test -stdin
+select 1;
+$create_cmd
+\q
+EOF
+"
+}
+
 cockroachdb() {
-  cockroachdb_24_3
+  cockroachdb_25_4
+}
+
+cockroachdb_25_4() {
+  $CONTAINER_CLI rm -f cockroach || true
+  LOG_CONFIG="
+sinks:
+  stderr:
+    channels: all
+    filter: ERROR
+    redact: false
+    exit-on-error: true
+"
+  $CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_25_4:-cockroachdb/cockroach:v25.4.2} start-single-node \
+    --insecure --store=type=mem,size=0.25 --advertise-addr=localhost --log="$LOG_CONFIG"
+  OUTPUT=
+  while [[ $OUTPUT != *"CockroachDB node starting"* ]]; do
+        echo "Waiting for CockroachDB to start..."
+        sleep 10
+        # Note we need to redirect stderr to stdout to capture the logs
+        OUTPUT=$($CONTAINER_CLI logs cockroach 2>&1)
+  done
+  echo "Enabling experimental box2d operators and some optimized settings for running the tests"
+  #settings documented in https://www.cockroachlabs.com/docs/v24.1/local-testing#use-a-local-single-node-cluster-with-in-memory-storage
+  $CONTAINER_CLI exec cockroach bash -c "cat <<EOF | ./cockroach sql --insecure
+SET CLUSTER SETTING sql.spatial.experimental_box2d_comparison_operators.enabled = on;
+SET CLUSTER SETTING kv.range_merge.queue_interval = '50ms';
+SET CLUSTER SETTING jobs.registry.interval.gc = '30s';
+SET CLUSTER SETTING jobs.registry.interval.cancel = '180s';
+SET CLUSTER SETTING jobs.retention_time = '5s';
+SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false;
+ALTER RANGE default CONFIGURE ZONE USING "gc.ttlseconds" = 300;
+ALTER DATABASE system CONFIGURE ZONE USING "gc.ttlseconds" = 300;
+
+quit
+EOF
+"
+  cockroachdb_setup
+  echo "Cockroachdb successfully started"
 }
 
 cockroachdb_24_3() {
@@ -1221,7 +1300,7 @@ EOF
 }
 
 
-cockroachdb_23_1() {
+cockroachdb_23_2() {
   $CONTAINER_CLI rm -f cockroach || true
   LOG_CONFIG="
 sinks:
@@ -1231,7 +1310,7 @@ sinks:
     redact: false
     exit-on-error: true
 "
-  $CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_23_1:-docker.io/cockroachdb/cockroach:v23.1.28} start-single-node \
+  $CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_23_2:-docker.io/cockroachdb/cockroach:v23.2.28} start-single-node \
     --insecure --store=type=mem,size=0.25 --advertise-addr=localhost --log="$LOG_CONFIG"
   OUTPUT=
   while [[ $OUTPUT != *"CockroachDB node starting"* ]]; do
@@ -1282,7 +1361,77 @@ EOF
 }
 
 tidb() {
-  tidb_5_4
+  tidb_8_5
+}
+
+tidb_8_5() {
+    $CONTAINER_CLI rm -f tidb || true
+    $CONTAINER_CLI run --name tidb -p4000:4000 -d ${DB_IMAGE_TIDB_8_5:-docker.io/pingcap/tidb:v8.5.5}
+
+    # Wait for TiDB to start
+    OUTPUT=
+    n=0
+    until [ "$n" -gt 15 ]; do
+        OUTPUT=$($CONTAINER_CLI logs tidb 2>&1)
+        if [[ $OUTPUT == *"server is running"* ]]; then
+            break;
+        fi
+        n=$((n+1))
+        echo "Waiting for TiDB to start..."
+        sleep 5
+    done
+
+    if [ "$n" -gt 15 ]; then
+        echo "TiDB failed to start after 75 seconds"
+        exit 1
+    else
+        echo "TiDB successfully started"
+    fi
+
+    # Wait for TiDB to accept connections
+    n=0
+    until [ "$n" -gt 10 ]; do
+        if $CONTAINER_CLI run --rm --network container:tidb docker.io/mysql:8.0 \
+            mysqladmin -h 127.0.0.1 -P 4000 -uroot ping >/dev/null 2>&1; then
+            break;
+        fi
+        n=$((n+1))
+        echo "Waiting for TiDB to be ready..."
+        sleep 3
+    done
+
+    if [ "$n" -gt 10 ]; then
+        echo "TiDB failed to become ready after 30 seconds"
+        exit 1
+    else
+        echo "TiDB is ready"
+    fi
+
+    # Create databases
+    databases=()
+    for n in $(seq 1 $DB_COUNT)
+    do
+      databases+=("hibernate_orm_test_${n}")
+    done
+    create_cmd=
+
+    # Since v7.2
+    # https://docs.pingcap.com/tidb/stable/system-variables/#tidb_enable_check_constraint-new-in-v720
+    create_cmd+="SET GLOBAL tidb_enable_check_constraint=ON;"
+
+    # Since v8.3
+    # https://docs.pingcap.com/tidb/stable/system-variables/#tidb_enable_shared_lock_promotion-new-in-v830
+    create_cmd+="SET GLOBAL tidb_enable_shared_lock_promotion=ON;"
+
+    create_cmd+="CREATE DATABASE IF NOT EXISTS hibernate_orm_test;"
+    create_cmd+="CREATE USER IF NOT EXISTS 'hibernate_orm_test'@'%' IDENTIFIED BY 'hibernate_orm_test';"
+    create_cmd+="GRANT ALL ON hibernate_orm_test.* TO 'hibernate_orm_test'@'%';"
+    for i in "${!databases[@]}";do
+      create_cmd+="CREATE DATABASE IF NOT EXISTS ${databases[i]}; GRANT ALL ON ${databases[i]}.* TO 'hibernate_orm_test'@'%';"
+    done
+    $CONTAINER_CLI run --rm --network container:tidb docker.io/mysql:8.0 \
+        mysql -h 127.0.0.1 -P 4000 -uroot -e "${create_cmd}" 2>/dev/null
+    echo "TiDB databases were successfully setup"
 }
 
 tidb_5_4() {
@@ -1312,12 +1461,43 @@ tidb_5_4() {
 }
 
 informix() {
-  informix_14_10
+  informix_15
+}
+
+informix_15() {
+    temp_dir=$(mktemp -d)
+    echo "ALLOW_NEWLINE 1
+USEOSTIME 1" >$temp_dir/onconfig.mod
+    chmod 777 -R $temp_dir
+    $PRIVILEGED_CLI $CONTAINER_CLI rm -f informix || true
+    $PRIVILEGED_CLI $CONTAINER_CLI run --name informix --privileged -p 9088:9088 -v $temp_dir:/opt/ibm/config -e LICENSE=accept -e GL_USEGLU=1 -d ${DB_IMAGE_INFORMIX_15:-icr.io/informix/informix-developer-edition-database:15.0.0.0}
+    echo "Starting Informix. This can take a few minutes"
+    # Give the container some time to start
+    OUTPUT=
+    n=0
+    until [ "$n" -ge 5 ]
+    do
+        OUTPUT=$($PRIVILEGED_CLI $CONTAINER_CLI logs informix 2>&1)
+        if [[ $OUTPUT == *"Server Started"* ]]; then
+          sleep 15
+          $PRIVILEGED_CLI $CONTAINER_CLI exec informix bash -l -c "export DB_LOCALE=en_US.utf8;export CLIENT_LOCALE=en_US.utf8;echo \"execute function task('create dbspace from storagepool', 'datadbs', '100 MB', '4');execute function task('create sbspace from storagepool', 'sbspace', '20 M', '0');create database dev in datadbs with log;\" > post_init.sql;dbaccess sysadmin post_init.sql"
+          break;
+        fi
+        n=$((n+1))
+        echo "Waiting for Informix to start..."
+        sleep 30
+    done
+    if [ "$n" -ge 5 ]; then
+      echo "Informix failed to start and configure after 5 minutes"
+    else
+      echo "Informix successfully started"
+    fi
 }
 
 informix_14_10() {
     temp_dir=$(mktemp -d)
-    echo "ALLOW_NEWLINE 1" >$temp_dir/onconfig.mod
+    echo "ALLOW_NEWLINE 1
+USEOSTIME 1" >$temp_dir/onconfig.mod
     chmod 777 -R $temp_dir
     $PRIVILEGED_CLI $CONTAINER_CLI rm -f informix || true
     $PRIVILEGED_CLI $CONTAINER_CLI run --name informix --privileged -p 9088:9088 -v $temp_dir:/opt/ibm/config -e LICENSE=accept -e GL_USEGLU=1 -d ${DB_IMAGE_INFORMIX_14_10:-icr.io/informix/informix-developer-database:14.10.FC9W1DE}
@@ -1370,13 +1550,122 @@ informix_12_10() {
     fi
 }
 
+spanner() {
+  spanner_emulator GOOGLE_STANDARD_SQL
+}
+
+spanner_pg() {
+  spanner_emulator POSTGRESQL
+}
+
+spanner_emulator() {
+  local dialect=${1:-GOOGLE_STANDARD_SQL}
+  local emulator_image=${SPANNER_EMULATOR:-gcr.io/cloud-spanner-emulator/emulator:1.5.52}
+  if [[ $DB_COUNT -gt 8 ]]; then
+    DB_COUNT=4
+  else
+    DB_COUNT=$(( DB_COUNT / 2 ))
+  fi
+  # Start all emulator containers first
+  for n in $(seq 1 ${DB_COUNT}); do
+    local container_name="spanner_${n}"
+    local port=$((9010 + n))
+    local rest_port=$((9020 + n))
+
+    echo "Starting Spanner emulator instance ${n} on port ${port}..."
+    $CONTAINER_CLI rm -f ${container_name} || true
+
+    $CONTAINER_CLI run --name ${container_name} -d \
+      -p ${port}:9010 \
+      -p ${rest_port}:9020 \
+      ${emulator_image}
+  done
+
+  # Wait for all emulators to be ready
+  for n in $(seq 1 ${DB_COUNT}); do
+    local container_name="spanner_${n}"
+    local port=$((9010 + n))
+    
+    local retries=0
+    until [ "$retries" -ge 20 ]; do
+      local logs="$($CONTAINER_CLI logs ${container_name} 2>&1 || true)"
+      if [[ "$logs" == *"gRPC server listening"* ]] || [[ "$logs" == *"Cloud Spanner emulator running"* ]]; then
+        echo "Cloud Spanner emulator (${container_name}) started on port ${port}."
+        break
+      fi
+      echo "Waiting for Cloud Spanner emulator (${container_name}) to start..."
+      retries=$((retries+1))
+      sleep 3
+    done
+    
+    if [ "$retries" -ge 20 ]; then
+       echo "Cloud Spanner emulator (${container_name}) failed to start"
+       exit 1
+    fi
+  done
+
+  # Configure Instance
+  for n in $(seq 1 ${DB_COUNT}); do
+    local rest_port=$((9020 + n))
+    echo "Configuring Spanner emulator instance ${n} on port ${rest_port}..."
+    local host="localhost:${rest_port}"
+    local create_statement
+    
+    # Create Instance
+    curl -s -X POST "http://${host}/v1/projects/orm-test-project/instances" \
+      -H "Content-Type: application/json" \
+      -d '{
+            "instanceId": "orm-test-instance",
+            "instance": {
+              "config": "emulator-config",
+              "displayName": "Test Instance",
+              "nodeCount": 1
+            }
+          }' >/dev/null || true
+
+    # Determine Create Database statement based on dialect
+    if [[ "$dialect" == "POSTGRESQL" ]]; then
+       create_statement="CREATE DATABASE \"orm-test-db\""
+    else
+       create_statement="CREATE DATABASE \`orm-test-db\`"
+    fi
+
+    # Create Database
+    curl -s -X POST "http://${host}/v1/projects/orm-test-project/instances/orm-test-instance/databases" \
+      -H "Content-Type: application/json" \
+      -d "{
+            \"createStatement\": \"${create_statement//\"/\\\"}\",
+            \"databaseDialect\": \"${dialect}\"
+          }" >/dev/null
+
+    # Update DDL (for Timezone)
+    local update_statements=""
+    if [[ "$dialect" == "POSTGRESQL" ]]; then
+      update_statements='"ALTER DATABASE \"orm-test-db\" SET \"spanner.default_time_zone\" = '"'UTC'"'", "ALTER DATABASE \"orm-test-db\" SET \"spanner.version_retention_period\" = '"'10s'"'"'
+    else
+      update_statements='"ALTER DATABASE `orm-test-db` SET OPTIONS ( default_time_zone = '"'UTC'"', version_retention_period = '"'10s'"' )"'
+    fi
+
+    curl -s -X PATCH "http://${host}/v1/projects/orm-test-project/instances/orm-test-instance/databases/orm-test-db/ddl" \
+      -H "Content-Type: application/json" \
+      -d '{
+            "statements": [
+              '"${update_statements}"'
+            ]
+          }' >/dev/null || true
+  done
+}
+
 if [ -z ${1} ]; then
     echo "No db name provided"
     echo "Provide one of:"
     echo -e "\tcockroachdb"
+    echo -e "\tcockroachdb_25_4"
+    echo -e "\tcockroachdb_24_3"
     echo -e "\tcockroachdb_24_1"
-    echo -e "\tcockroachdb_23_1"
+    echo -e "\tcockroachdb_23_2"
     echo -e "\tdb2"
+    echo -e "\tdb2_12_1"
     echo -e "\tdb2_11_5"
     echo -e "\tdb2_spatial"
     echo -e "\tedb"
@@ -1384,18 +1673,23 @@ if [ -z ${1} ]; then
     echo -e "\tedb_16"
     echo -e "\tedb_15"
     echo -e "\tedb_14"
-    echo -e "\tedb_13"
     echo -e "\thana"
     echo -e "\tmariadb"
     echo -e "\tmariadb_verylatest"
+    echo -e "\tmariadb_12_2"
+    echo -e "\tmariadb_12_1"
+    echo -e "\tmariadb_12_0"
     echo -e "\tmariadb_11_8"
     echo -e "\tmariadb_11_4"
     echo -e "\tmariadb_10_11"
     echo -e "\tmariadb_10_6"
     echo -e "\tmssql"
+    echo -e "\tmssql_2025"
     echo -e "\tmssql_2022"
     echo -e "\tmssql_2017"
     echo -e "\tmysql"
+    echo -e "\tmysql_9_6"
+    echo -e "\tmysql_9_5"
     echo -e "\tmysql_9_4"
     echo -e "\tmysql_9_2"
     echo -e "\tmysql_8_2"
@@ -1404,19 +1698,30 @@ if [ -z ${1} ]; then
     echo -e "\toracle"
     echo -e "\toracle_23"
     echo -e "\toracle_21"
+    echo -e "\toracle_18"
+    echo -e "\toracle_atps"
+    echo -e "\toracle_atps_tls"
+    echo -e "\toracle_db19c"
+    echo -e "\toracle_db21c"
+    echo -e "\toracle_db23c"
     echo -e "\tgaussdb"
     echo -e "\tpostgresql"
+    echo -e "\tpostgresql_18"
     echo -e "\tpostgresql_17"
     echo -e "\tpostgresql_16"
     echo -e "\tpostgresql_15"
     echo -e "\tpostgresql_14"
-    echo -e "\tpostgresql_13"
     echo -e "\tsybase"
     echo -e "\ttidb"
+    echo -e "\ttidb_8_5"
     echo -e "\ttidb_5_4"
-    echo -e "\informix"
-    echo -e "\informix_14_10"
-    echo -e "\informix_12_10"
+    echo -e "\tinformix"
+    echo -e "\tinformix_15"
+    echo -e "\tinformix_14_10"
+    echo -e "\tinformix_12_10"
+    echo -e "\tspanner"
+    echo -e "\tspanner_pg"
+    echo -e "\tspanner_emulator"
 else
     ${1}
 fi
diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
index 0501ba2172b4..2609d1e5a959 100644
--- a/documentation/documentation.gradle
+++ b/documentation/documentation.gradle
@@ -39,6 +39,13 @@ def jpaVersion = ormBuildDetails.jpaVersion
 defaultTasks 'buildDocs'
 
 configurations {
+	// hibernate-ant -> hibernate-reveng -> google-java-format -> guava
+	// guava publishes JRE/Android variants that Gradle's reportAggregation
+	// configuration cannot resolve; guava is not needed for report aggregation
+	reportAggregation {
+		exclude group: 'com.google.guava', module: 'guava'
+	}
+
 	core
 
 	testing
@@ -168,8 +175,10 @@ dependencies {
 	javadocClasspath jdbcLibs.postgresql
 	javadocClasspath jdbcLibs.edb
 	javadocClasspath libs.jackson
+	javadocClasspath libs.jackson3
 	javadocClasspath gradleApi()
 	javadocClasspath libs.jacksonXml
+	javadocClasspath libs.jackson3Xml
 	javadocClasspath jdbcLibs.oracle
 	javadocClasspath jdbcLibs.oracleJdbcJacksonOsonExtension
 }
diff --git a/documentation/src/main/asciidoc/introduction/Advanced.adoc b/documentation/src/main/asciidoc/introduction/Advanced.adoc
index e874f867d68d..02a43e0b5556 100644
--- a/documentation/src/main/asciidoc/introduction/Advanced.adoc
+++ b/documentation/src/main/asciidoc/introduction/Advanced.adoc
@@ -277,6 +277,7 @@ To make use of multi-tenancy, we'll usually need to set at least one of these co
 
 | link:{doc-javadoc-url}org/hibernate/cfg/MultiTenancySettings.html#MULTI_TENANT_IDENTIFIER_RESOLVER[`hibernate.tenant_identifier_resolver`]  | Specifies the `CurrentTenantIdentifierResolver`
 | link:{doc-javadoc-url}org/hibernate/cfg/MultiTenancySettings.html#MULTI_TENANT_SCHEMA_MAPPER[`hibernate.multi_tenant.schema_mapper`]  | Specifies the `TenantSchemaMapper` for schema-based multi-tenancy
+| link:{doc-javadoc-url}org/hibernate/cfg/MultiTenancySettings.html#MULTI_TENANT_CREDENTIALS_MAPPER[`hibernate.multi_tenant.credentials_mapper`]  | Specifies the `TenantCredentialsMapper` for schema-based or discriminator-based multi-tenancy
 | link:{doc-javadoc-url}org/hibernate/cfg/MultiTenancySettings.html#MULTI_TENANT_CONNECTION_PROVIDER[`hibernate.multi_tenant_connection_provider`]  | Specifies the `MultiTenantConnectionProvider` for database-based multi-tenancy
 |===
 
@@ -311,7 +312,10 @@ If your source of JDBC connections is a set of JNDI-bound ``DataSource``s, you m
 
 The second option is to keep all the data for different tenants in the same database, giving each tenant a different named database schema with its own set of tables.
 
-In this case we must supply a link:{doc-javadoc-url}org/hibernate/context/spi/TenantSchemaMapper.html[`TenantSchemaMapper`] which is responsible for mapping from tenant ids to schema names.
+- If all tenants connect to the database using the same credentials, we must supply a link:{doc-javadoc-url}org/hibernate/context/spi/TenantSchemaMapper.html[`TenantSchemaMapper`] which is responsible for mapping tenant ids to schema names.
+
+- If each tenant should use distinct credentials to connect to the database, and if your JDBC `DataSource` supports this (not all do!) then we can use a link:{doc-javadoc-url}org/hibernate/context/spi/TenantCredentialsMapper.html[`TenantCredentialsMapper`] to supply the username and password of each tenant.
+If each database user has a different default schema, we might not need a `TenantSchemaMapper`.
 
 [discrete]
 ==== Discriminator-based multi-tenancy
@@ -886,6 +890,17 @@ On the other hand, the following annotations specify how a collection should be
 
 Under the covers, Hibernate uses a `TreeSet` or `TreeMap` to maintain the collection in sorted order.
 
+[CAUTION]
+====
+The unowned (`mappedBy`) side of a bidirectional association is not responsible for specifying column mappings.
+So it's wrong in principle to use `@OrderColumn` or `@MapKeyColumn` on the unowned side of an association mapping.
+But for unowned collections, we may use `@OrderBy` or `@MapKey` instead.
+That is:
+
+- You can use `@OrderColumn` or `@MapKeyColumn` with an `@ElementCollection`, owned `@ManyToMany`, or owned `@OneToMany`.
+- But use `@OrderBy` or `@MapKey` when it's an _unowned_ `@ManyToMany` or `@OneToMany`.
+====
+
 [[any]]
 === Any mappings
 
@@ -954,22 +969,9 @@ There are a number of annotations which are useful to express this sort of compl
 | `@JoinColumn` | Specifies the foreign key column
 |===
 
-Of course, `@Any` mappings are disfavored, except in extremely special cases, since it's much more difficult to enforce referential integrity at the database level.
-
-There's also currently some limitations around querying `@Any` associations in HQL.
-This is allowed:
+As a general principle, an `@Any` association shares the semantics of `@ManyToAny`, and, since Hibernate 7.4, may be used just like a  `@ManyToOne` in HQL and so on.
 
-[source,hql]
-----
-from Order ord
-    join CashPayment cash
-        on id(ord.payment) = cash.id
-----
-
-[CAUTION]
-====
-Polymorphic association joins for `@Any` mappings are not currently implemented.
-====
+Of course, `@Any` mappings are disfavored, except in extremely special cases, since it's much more difficult to enforce referential integrity at the database level.
 
 Further information may be found in the {any-doc}[User Guide].
 
@@ -1039,6 +1041,9 @@ Hibernate's {enhancer}[bytecode enhancer] enables the following features:
 - _attribute-level lazy fetching_ for basic attributes annotated `@Basic(fetch=LAZY)` and for lazy non-polymorphic associations,
 - _interception-based_—instead of the usual _snapshot-based_—detection of modifications.
 
+In addition, use of the bytecode enhancer relaxes the usual requirement that entity and embeddable classes have default constructors.
+If a class annotated `@Entity`, `@MappedSuperclass`, or `@Embeddable` has no default constructor, the bytecode enhancer will add it.
+
 To use the bytecode enhancer, we must add the Hibernate plugin to our gradle build:
 
 [source,groovy,subs="attributes+"]
diff --git a/documentation/src/main/asciidoc/introduction/Configuration.adoc b/documentation/src/main/asciidoc/introduction/Configuration.adoc
index 26af305533cd..e9a412b316e0 100644
--- a/documentation/src/main/asciidoc/introduction/Configuration.adoc
+++ b/documentation/src/main/asciidoc/introduction/Configuration.adoc
@@ -116,8 +116,8 @@ and `org.ehcache:ehcache`
 and `com.github.ben-manes.caffeine:jcache`
 | Distributed second-level cache support via {infinispan}[Infinispan] | `org.infinispan:infinispan-hibernate-cache-v60`
 // | SCRAM authentication support for PostgreSQL | `com.ongres.scram:client:2.1`
-| A JSON serialization library for working with JSON datatypes, for example, {jackson}[Jackson] or {yasson}[Yasson] |
-`com.fasterxml.jackson.core:jackson-databind` +
+| A JSON serialization library for working with JSON datatypes, for example, {jackson}[Jackson 2], {jackson3}[Jackson 3] or {yasson}[Yasson] |
+`com.fasterxml.jackson.core:jackson-databind`, `tools.jackson.core:jackson-databind` +
 or `org.eclipse:yasson`
 | <<spatial,Hibernate Spatial>> | `org.hibernate.orm:hibernate-spatial`
 | <<envers,Envers>>, for auditing historical data | `org.hibernate.orm:hibernate-envers`
diff --git a/documentation/src/main/asciidoc/introduction/Entities.adoc b/documentation/src/main/asciidoc/introduction/Entities.adoc
index 8ad97a494825..f972c41b63f6 100644
--- a/documentation/src/main/asciidoc/introduction/Entities.adoc
+++ b/documentation/src/main/asciidoc/introduction/Entities.adoc
@@ -39,6 +39,11 @@ On the other hand, the entity class may be either concrete or `abstract`, and it
 An entity class may be a `static` inner class.
 ====
 
+[TIP]
+====
+The requirement for a default constructor is relaxed when the <<bytecode-enhancer,bytecode enhancer>> is used.
+====
+
 Every entity class must be annotated `@Entity`.
 
 [source,java]
@@ -526,6 +531,21 @@ Hibernate automatically generates a `UNIQUE` constraint on the columns mapped by
 Consider using the natural id attributes to implement <<equals-and-hash>>.
 ====
 
+In cases where the natural id is defined by multiple attributes, Hibernate also offers the link:{doc-javadoc-url}org/hibernate/annotations/NaturalIdClass.html[`@NaturalIdClass`] annotation which acts similarly to the Jakarta Persistence `@IdClass` annotation for <<load-by-natural-id,find operations>> -
+
+[source,java]
+----
+record BookKey(String isbn, int printing) {}
+
+@Entity
+@NaturalIdClass(BookKey.class)
+class Book {
+    ...
+}
+----
+
+See the link:{doc-user-guide-url}#naturalid[User Guide] for more details about natural ids.
+
 The payoff for doing this extra work, as we will see <<natural-id-cache,much later>>, is that we can take advantage of optimized natural id lookups that make use of the second-level cache.
 
 Note that even when you've identified a natural key, we still recommend the use of a generated surrogate key in foreign keys, since this makes your data model _much_ easier to change.
@@ -586,6 +606,7 @@ Hibernate slightly extends this list with the following types:
 | Additional date/time types | `java.time` | `Duration`, `ZoneId`, `ZoneOffset`, and even `ZonedDateTime`
 | JDBC LOB types | `java.sql` | `Blob`, `Clob`, `NClob`
 | Java class object | `java.lang` | `Class`
+| Internet addresses | `java.net` | `InetAddress`
 | Miscellaneous types | `java.util` | `Currency`, `Locale`, `URL`, `TimeZone`
 |====
 
@@ -1235,14 +1256,6 @@ For example, if the collection `Publisher.books` was stored in the second-level
 
 That said, it's _not_ a hard requirement to update the unowned side, at least if you're sure you know what you're doing.
 
-[TIP]
-// .Unidirectional `@OneToMany`?
-====
-In principle Hibernate _does_ allow you to have a unidirectional one-to-many, that is, a `@OneToMany` with no matching `@ManyToOne` on the other side.
-In practice, this mapping is unnatural, and just doesn't work very well.
-Avoid it.
-====
-
 Here we've used `Set` as the type of the collection, but Hibernate also allows the use of `List` or `Collection` here, with almost no difference in semantics.
 In particular, the `List` may not contain duplicate elements, and its order will not be persistent.
 
@@ -1385,7 +1398,7 @@ If the association is bidirectional, we annotate the unowned side `@OneToOne(map
 === Many-to-many
 
 A unidirectional many-to-many association is represented as a collection-valued attribute.
-It always maps to a separate _association table_ in the database.
+It always maps to a separate <<join-table-mappings,_association join table_>> in the database.
 
 It tends to happen that a many-to-many association eventually turns out to be an entity in disguise.
 
@@ -1459,6 +1472,34 @@ We don't much employ the word "never" when it comes to object/relational mapping
 **never** write `@ManyToMany(fetch=EAGER)` unless you're deliberately looking for trouble.
 ====
 
+[[unidirectional-one-to-many]]
+=== Unidirectional one-to-many
+
+Finally, Hibernate allows a unidirectional one-to-many association, that is, a `@OneToMany` with no matching `@ManyToOne` on the other side.
+
+[source,java]
+----
+@OneToMany // no matching @ManyToOne
+Set<Book> books;
+----
+
+By default, a unidirectional one-to-many association maps to a separate <<join-table-mappings,association join table>>.
+It therefore more closely resembles a many-to-many association than a many-to-one association.
+
+[CAUTION]
+====
+If you're new to Hibernate, this is not the association mapping strategy you're looking for.
+Use a <<many-to-one,bidirectional many-to-one>> instead.
+Previous versions of this Guide advised against the use of these mappings completely.
+====
+
+Unidirectional one-to-many association mappings are only useful in one very specific circumstance.
+Suppose we have a `Comment` entity, which has many different "parents" -- there can be comments on ``Document``s, comments on ``Issue``s, comments on ``Request``s, and so on.
+These aren't many-to-many associations; each given `Comment` belongs to exactly one parent.
+But on the other hand, it doesn't make sense to add a field for each kind of parent entity to the `Comment` class.
+Nor does it make sense to add a foreign key column for each parent entity to the `COMMENTS` table.
+This is the only scenario in which we can imagine ourselves using a unidirectional one-to-many.
+
 [[collections]]
 === Collections of basic values and embeddable objects
 
@@ -1521,7 +1562,7 @@ Almost every many-valued relationship should map to a foreign key association be
 And almost every table should be mapped by an entity class.
 
 The features we're about to meet in the next two subsections are used much more often by beginners than they're used by experts.
-So if you're a beginner, you'll save yourself same hassle by staying away from these features for now.
+So if you're a beginner, you'll save yourself some hassle by staying away from these features for now.
 ====
 
 We'll talk about `@Array` mappings first.
@@ -1642,11 +1683,51 @@ The code above results in a table with three columns:
 
 Instead of a surrogate primary key, it has a composite key comprising the foreign key of `Event` and the order column.
 
-When—inevitably—we find that we need to add a fourth column to that table, our Java code must change completely.
+When--inevitably--we find that we need to add a fourth column to that table, our Java code must change completely.
 Most likely, we'll realize that we need to add a separate entity after all.
 So this mapping isn't very robust in the face of minor changes to our data model.
 ====
 
+[CAUTION]
+====
+Consider the following very simple mapping:
+[source,java]
+----
+@ElementCollection
+Set<String> topics;
+----
+Hibernate would generate the following DDL:
+[source,sql]
+----
+create table Book_topics (
+    Book_isbn varchar(255) not null,
+    topics varchar(255)
+)
+----
+Here, there's no `not null` constraint on one of the columns.
+As a result, Hibernate cannot add a primary key to the table.
+This is not a great data model.
+
+We can fix this problem with a `@Column` annotation:
+[source,java]
+----
+@ElementCollection
+@Column(nullable=false)
+Set<String> topics;
+----
+Now the generated DDL looks a lot better:
+[source,sql]
+----
+create table Book_topics (
+    Book_isbn varchar(255) not null,
+    topics varchar(255) not null,
+    primary key (Book_isbn, topics)
+)
+----
+Of course, with this mapping we can't have `null` as an element of our `Set`.
+But we can't think of a good reason why you might want that or what it would even mean for a set to contain null.
+====
+
 There's much more we could say about "element collections", but we won't say it, because we don't want to hand you the gun you'll shoot your foot with.
 
 [[entities-summary]]
diff --git a/documentation/src/main/asciidoc/introduction/Interacting.adoc b/documentation/src/main/asciidoc/introduction/Interacting.adoc
index f6ac49148954..68eb7284528f 100644
--- a/documentation/src/main/asciidoc/introduction/Interacting.adoc
+++ b/documentation/src/main/asciidoc/introduction/Interacting.adoc
@@ -276,6 +276,7 @@ Modifications are automatically detected when the session is <<flush,flushed>>.
 
 On the other hand, except for `getReference()`, the following operations all result in immediate access to the database:
 
+[[methods-for-reading]]
 .Methods for reading and locking data
 [%breakable,cols="30,~"]
 |===
@@ -368,9 +369,30 @@ The following code results in a single SQL `select` statement:
 List<Book> books = session.findMultiple(Book.class, bookIds);
 ----
 
+[[load-by-natural-id]]
+As discussed <<natural-id-attributes,earlier>>, Hibernate offers the ability to map a natural id and perform load operations using that natural id.
+This is accomplished using the `KeyType#NATURAL` `FindOption` -
+
+[source,java]
+----
+var bookKey = new BookKey(...);
+var book = session.find(Book.class, bookKey, NATURAL);
+var books = session.findMultiple(Book.class, List.of(bookKey), NATURAL);
+----
+
+When loading by natural id, the type of value accepted depends on the type of natural id.
+For single-attribute natural ids, whether defined by a basic or embedded type, the attribute type should be used.
+For multi-attribute natural ids, Hibernate will accept a number of forms:
+
+* If a link:{doc-javadoc-url}org/hibernate/annotations/NaturalIdClass.html[`@NaturalIdClass`] is defined, an instance of the natural id class may be used.
+* An array of the individual attribute values, ordered alphabetically by name, may be used.
+* A `Map` of the individual attribute values, keyed by the attribute name, may be used.
+
 Each of the operations we've seen so far affects a single entity instance passed as an argument.
 But there's a way to set things up so that an operation will propagate to associated entities.
 
+See the link:{doc-user-guide-url}#find-by-natural-id[User Guide] for more details about loading by natural ids.
+
 [[cascade]]
 === Cascading persistence operations
 
@@ -595,7 +617,8 @@ Therefore, Hibernate has some APIs that streamline certain more complicated look
 
 [NOTE]
 ====
-Since the introduction of `FindOption` in JPA 3.2, `byId()` is now much less useful.
+Since the introduction of `FindOption` in JPA 3.2, `byId()` is now much less useful and deprecated.
+Instead, use `find()` and `findMultiple()` as discussed <<methods-for-reading,earlier>>.
 ====
 
 Batch loading is very useful when we need to retrieve multiple instances of the same entity class by id:
@@ -627,6 +650,8 @@ We also have some operations for working with lookups by <<natural-identifiers,
 | `byMultipleNaturalId()` | Lets us load a _batch_ of natural ids at the same time
 |===
 
+Again, see the link:{doc-user-guide-url}#find-by-natural-id[User Guide] for more details about loading by natural ids.
+
 Here's how we can retrieve an entity by its composite natural id:
 
 [source,java]
diff --git a/documentation/src/main/asciidoc/introduction/Mapping.adoc b/documentation/src/main/asciidoc/introduction/Mapping.adoc
index 15541c2bf723..33a0605b26c8 100644
--- a/documentation/src/main/asciidoc/introduction/Mapping.adoc
+++ b/documentation/src/main/asciidoc/introduction/Mapping.adoc
@@ -289,6 +289,17 @@ class Book {
 }
 ----
 
+.Show DDL
+[%collapsible%closed]
+====
+[source,sql]
+create table BooksAuthors (
+    Book_isbn varchar(255) not null,
+    authors_ssn varchar(255) not null,
+    primary key (Book_isbn, authors_ssn)
+)
+====
+
 But it's even possible to use it to map a `@ManyToOne` or `@OneToOne` association to an association table.
 
 [source,java]
@@ -305,7 +316,18 @@ class Book {
 }
 ----
 
-Here, there should be a `UNIQUE` constraint on one of the columns of the association table.
+.Show DDL
+[%collapsible%closed]
+====
+[source,sql]
+create table BookPublisher (
+    publisher_id bigint not null,
+    isbn varchar(255) not null,
+    primary key (isbn)
+)
+====
+
+Here, there should be a `UNIQUE` constraint or `PRIMARY KEY` on one of the columns of the association table.
 
 [source,java]
 ----
@@ -321,7 +343,40 @@ class Author {
 }
 ----
 
-Here, there should be a `UNIQUE` constraint on _both_ columns of the association table.
+.Show DDL
+[%collapsible%closed]
+====
+[source,sql]
+create table AuthorPerson (
+    author_ssn varchar(255) not null unique,
+    ssn varchar(255) not null,
+    primary key (ssn)
+)
+====
+
+Here, there should be a `UNIQUE` constraint or `PRIMARY KEY` on _both_ columns of the association table.
+
+Finally, `@JoinTable` may also be used with a <<unidirectional-one-to-many,unidirectional `@OneToMany` association>>.
+
+[source,java]
+----
+@OneToMany // no matching @ManyToOne
+@JoinTable(name="PublishedBooks")
+Set<Book> books;
+----
+
+.Show DDL
+[%collapsible%closed]
+====
+[source,sql]
+create table PublishedBooks (
+    Publisher_id bigint not null,
+    books_isbn varchar(255) not null,
+    primary key (books_isbn)
+)
+====
+
+Here there is a `UNIQUE` or `PRIMARY KEY` constraint on the foreign key of the `Book` table in the join table `PublishedBooks`.
 
 .`@JoinTable` annotation members
 [%breakable,cols="20,~"]
@@ -402,7 +457,8 @@ Here we see four different ways to use the `@Column` annotation:
 ----
 @Entity
 @Table(name="Books")
-@SecondaryTable(name="Editions")
+@SecondaryTable(name="Editions",
+        foreignKey = @ForeignKey(name="BooksToEditionsById"))
 class Book {
     @Id @GeneratedValue
     @Column(name="bookId") // customize column name
@@ -419,6 +475,29 @@ class Book {
 }
 ----
 
+.Show DDL
+[%collapsible%closed]
+====
+[source,sql]
+create table Books (
+    bookId bigint not null,
+    isbn varchar(17) not null unique,
+    title varchar(100) not null,
+    primary key (bookId)
+)
+create table Editions (
+    edition integer,
+    bookId bigint not null,
+    primary key (bookId)
+)
+alter table if exists Editions
+   add constraint BooksToEditionsById
+   foreign key (bookId)
+   references Books
+====
+
+Note that we have used the `@ForeignKey` annotation to assign a name to the foreign key constraint.
+
 We don't use `@Column` to map associations.
 
 [[join-column-mappings]]
@@ -465,6 +544,21 @@ class Item {
 }
 ----
 
+.Show DDL
+[%collapsible%closed]
+====
+[source,sql]
+create table Items (
+    id bigint not null,
+    bookIsbn varchar(17) not null,
+    primary key (id)
+)
+alter table if exists Items
+   add constraint ItemsToBooksBySsn
+   foreign key (bookIsbn)
+   references Books (isbn)
+====
+
 In case this is confusing:
 
 - `bookIsbn` is the name of the foreign key column in the `Items` table,
@@ -749,8 +843,7 @@ There's a couple of alternative ways to represent an embeddable type on the data
 ==== Embeddables as UDTs
 
 First, a really nice option, at least in the case of Java record types, and for databases which support _user-defined types_ (UDTs), is to define a UDT which represents the record type.
-Hibernate 6 makes this really easy.
-Just annotate the record type, or the attribute which holds a reference to it, with the new `@Struct` annotation:
+This is easy: just annotate the record type, or the attribute which holds a reference to it, with the new `@Struct` annotation:
 
 [source,java]
 ----
@@ -809,13 +902,20 @@ class Person {
 ----
 
 We also need to add Jackson or an implementation of JSONB—for example, Yasson—to our runtime classpath.
-To use Jackson we could add this line to our Gradle build:
+To use Jackson 2 we could add this line to our Gradle build:
 
 [source,groovy]
 ----
 runtimeOnly 'com.fasterxml.jackson.core:jackson-databind:{jacksonVersion}'
 ----
 
+To use Jackson 3 we could add this line to our Gradle build:
+
+[source,groovy]
+----
+runtimeOnly 'tools.jackson.core:jackson-databind:{jackson3Version}'
+----
+
 Now the `name` column of the `Author` table will have the type `jsonb`, and Hibernate will automatically use Jackson to serialize a `Name` to and from JSON format.
 
 [[miscellaneous-mappings]]
diff --git a/documentation/src/main/asciidoc/querylanguage/Concepts.adoc b/documentation/src/main/asciidoc/querylanguage/Concepts.adoc
index 7626703e883c..68d3799a829b 100644
--- a/documentation/src/main/asciidoc/querylanguage/Concepts.adoc
+++ b/documentation/src/main/asciidoc/querylanguage/Concepts.adoc
@@ -500,13 +500,6 @@ For example, the simplest query in HQL has no `select` clause at all:
 from Book
 ----
 
-But we don't necessarily _recommend_ leaving off the `select` list.
-
-[NOTE]
-====
-HQL doesn't require a `select` clause, but JPQL _does_.
-====
-
 Naturally, the previous query may be written with a `select` clause:
 
 [source, hql]
@@ -533,7 +526,7 @@ for (Book book: books) {
 ----
 // result type Object[], both Book and Author selected
 List<Object[]> booksWithAuthors =
-       session.createQuery("from Book join authors", Book.class, Object[].class)
+       session.createQuery("from Book join authors", Object[].class)
             .getResultList();
 for (var bookWithAuthor: booksWithAuthors) {
     Book book = (Book) bookWithAuthor[0];
@@ -787,5 +780,3 @@ alias
 ----
 
 Where the list of ``selection``s in an `instantiation` is essentially a nested projection list.
-
-
diff --git a/documentation/src/main/asciidoc/repositories/Configuration.adoc b/documentation/src/main/asciidoc/repositories/Configuration.adoc
index c2219ccb9aa4..bd67a6ae6804 100644
--- a/documentation/src/main/asciidoc/repositories/Configuration.adoc
+++ b/documentation/src/main/asciidoc/repositories/Configuration.adoc
@@ -50,12 +50,19 @@ and `org.glassfish.expressly:expressly` | Hibernate Validator
 | `org.jboss.weld:weld-core-impl` | Weld CDI
 |===
 
-You'll need to configure the annotation processor to run when your project is compiled.
-In Gradle, for example, you'll need to use `annotationProcessor`.
+You'll need to configure the annotation processor to run when your project is compiled:
 
-[source,groovy]
+* In Gradle, you'll need to use `annotationProcessor`.
++
+[source,groovy,subs="attributes+"]
 ----
-annotationProcessor 'org.hibernate.orm:hibernate-processor:7.0.0.Final'
+annotationProcessor 'org.hibernate.orm:hibernate-processor:{fullVersion}'
+----
+* In Maven, you will need to configure the `maven-compiler-plugin`.
++
+[source,xml,subs="attributes+"]
+----
+include::../userguide/chapters/tooling/extras/maven-example-metamodel.pom[]
 ----
 
 === Excluding classes from processing
diff --git a/documentation/src/main/asciidoc/repositories/Reactive.adoc b/documentation/src/main/asciidoc/repositories/Reactive.adoc
index 687ceeda4c92..6493a2c99ff4 100644
--- a/documentation/src/main/asciidoc/repositories/Reactive.adoc
+++ b/documentation/src/main/asciidoc/repositories/Reactive.adoc
@@ -48,7 +48,7 @@ interface Library {
     Uni<Void> add(Book book);
 
     @Find
-    Uni<List<Book>> books(@By("isbn") String[] ibsns);
+    Uni<List<Book>> books(@By(_Book.ISBN) String[] ibsns);
 }
 ----
 
diff --git a/documentation/src/main/asciidoc/repositories/Repositories.adoc b/documentation/src/main/asciidoc/repositories/Repositories.adoc
index 7f3df2040ffa..5e6e9a2bd871 100644
--- a/documentation/src/main/asciidoc/repositories/Repositories.adoc
+++ b/documentation/src/main/asciidoc/repositories/Repositories.adoc
@@ -562,7 +562,7 @@ The `@By` annotation lets us work around this problem:
 [source,java]
 ----
 @Find
-List<Book> books(@By("isbn") String[] ibsns);
+List<Book> books(@By(_Book.ISBN) String[] ibsns);
 ----
 
 Naturally, the name and type of the parameter are still checked at compile time; there's no loss of typesafety here, despite the string.
diff --git a/documentation/src/main/asciidoc/shared/url-attributes.adoc b/documentation/src/main/asciidoc/shared/url-attributes.adoc
index e636c20277b9..84740696d094 100644
--- a/documentation/src/main/asciidoc/shared/url-attributes.adoc
+++ b/documentation/src/main/asciidoc/shared/url-attributes.adoc
@@ -6,12 +6,12 @@ include::./common-attributes.adoc[]
 
 :doc-base-url: https://docs.hibernate.org/orm
 :doc-version-base-url: {doc-base-url}/{majorMinorVersion}
-:doc-migration-guide-url: {doc-version-base-url}/migration-guide/migration-guide.html
+:doc-migration-guide-url: {doc-version-base-url}/migration-guide/
 :doc-quick-start-url: {doc-version-base-url}/quickstart/html_single/
-:doc-query-language-url: {doc-version-base-url}/querylanguage/html_single/Hibernate_Query_Language.html
-:doc-introduction-url: {doc-version-base-url}/introduction/html_single/Hibernate_Introduction.html
-:doc-data-repositories-url: {doc-version-base-url}/repositories/html_single/Hibernate_Data_Repositories.html
-:doc-user-guide-url: {doc-version-base-url}/userguide/html_single/Hibernate_User_Guide.html
+:doc-query-language-url: {doc-version-base-url}/querylanguage/html_single/
+:doc-introduction-url: {doc-version-base-url}/introduction/html_single/
+:doc-data-repositories-url: {doc-version-base-url}/repositories/html_single/
+:doc-user-guide-url: {doc-version-base-url}/userguide/html_single/
 :doc-javadoc-url: {doc-version-base-url}/javadocs/
 :doc-topical-url: {doc-version-base-url}/topical/html_single/
 :doc-dialect-url: {doc-version-base-url}/dialect/
diff --git a/documentation/src/main/asciidoc/userguide/chapters/assistant/Assistant.adoc b/documentation/src/main/asciidoc/userguide/chapters/assistant/Assistant.adoc
new file mode 100644
index 000000000000..84635c4b3029
--- /dev/null
+++ b/documentation/src/main/asciidoc/userguide/chapters/assistant/Assistant.adoc
@@ -0,0 +1,31 @@
+[[hibernate-assistant]]
+== Hibernate Assistant
+:assistant-project-dir: {root-project-dir}/tooling/hibernate-assistant
+
+[WARNING]
+====
+This entire module is currently incubating and may experience breaking changes at any time, including in a micro (patch) release.
+====
+
+[[assistant-overview]]
+=== Overview
+
+The Hibernate Assistant module serves as a bridge between your existing Hibernate ORM application and generative AI services. It provides the foundational components needed to expose your domain model and database operations to Large Language Models (LLMs), enabling natural language interactions with your data layer. Rather than prescribing a specific AI provider or implementation, this module focuses on providing flexible, reusable building blocks that can be integrated with any LLM service or framework.
+
+This module contains:
+
+1. The `HibernateAssistant` interface: to provide a simple, provider-agnostic, natural-language focused API to Hibernate ORM's persistence capabilities.
+2. Serialization utilities: to ease the use of Hibernate ORM in the context of generative AI, for example when implementing the above.
+
+No implementation is included, but the above provides the building blocks for integration with generative AI services/APIs.
+
+[[assistant-serialization]]
+=== Serialization Components
+
+To facilitate communication between Hibernate and LLM providers, the module includes two key Service Provider Interfaces (SPIs):
+
+`MetamodelSerializer`:: Generates a structured textual representation of your Hibernate mapping model, including entity classes, relationships, properties, and constraints. This allows the LLM to understand your domain model's structure and semantics.
+
+`ResultsSerializer`:: Converts query results and data into a structured textual format suitable for LLM consumption and interpretation. This enables the AI to reason about actual data from your database.
+
+Default JSON-based implementations of both serializers are provided, offering a ready-to-use foundation for most integration scenarios.
\ No newline at end of file
diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc
index c59f24821898..6ab1267c5c6e 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc
@@ -683,7 +683,9 @@ include::{extrasdir}/collections-unidirectional-ordered-list-order-column-select
 ----
 ====
 
-With the `order_id` column in place, Hibernate can order the list in-memory after it's being fetched from the database.
+With the `order_id` column in place, Hibernate can order the list in-memory after it's fetched from the database.
+
+The <<collection-list-indexbase-ex,`@ListIndexBase` annotation>> may be used to choose between 0-based and 1-based indexing on the database side.
 
 [[collections-bidirectional-ordered-list]]
 ===== Bidirectional ordered lists
@@ -701,54 +703,6 @@ include::{example-dir-collection}/BidirectionalOrderByListTest.java[tags=collect
 
 Just like with the unidirectional `@OrderBy` list, the `number` column is used to order the statement on the SQL level.
 
-When using the `@OrderColumn` annotation, the `order_id` column is going to be embedded in the child table:
-
-[[collections-bidirectional-ordered-list-order-column-example]]
-.Bidirectional `@OrderColumn` list
-====
-[source,java]
-----
-include::{example-dir-collection}/BidirectionalOrderColumnListTest.java[tags=collections-bidirectional-ordered-list-order-column-example,indent=0]
-----
-
-[source,sql]
-----
-include::{extrasdir}/collections-bidirectional-ordered-list-order-column-example.sql[]
-----
-====
-
-When fetching the collection, Hibernate will use the fetched ordered columns to sort the elements according to the `@OrderColumn` mapping.
-
-[[collections-customizing-ordered-list-ordinal]]
-===== Customizing ordered list ordinal
-
-You can customize the ordinal of the underlying ordered list by using the https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/ListIndexBase.html[`@ListIndexBase`] annotation.
-
-[[collections-customizing-ordered-list-ordinal-mapping-example]]
-.`@ListIndexBase` mapping example
-====
-[source,java]
-----
-include::{example-dir-collection}/OrderColumnListIndexBaseTest.java[tags=collections-customizing-ordered-list-ordinal-mapping-example,indent=0]
-----
-====
-
-When inserting two `Phone` records, Hibernate is going to start the List index from 100 this time.
-
-[[collections-customizing-ordered-list-ordinal-persist-example]]
-.`@ListIndexBase` persist example
-====
-[source,java]
-----
-include::{example-dir-collection}/OrderColumnListIndexBaseTest.java[tags=collections-customizing-ordered-list-ordinal-persist-example,indent=0]
-----
-
-[source,sql]
-----
-include::{extrasdir}/collections-customizing-ordered-list-ordinal-persist-example.sql[]
-----
-====
-
 [[collections-customizing-ordered-by-sql-clause]]
 ===== Customizing ORDER BY SQL clause
 
diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/identifiers.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/identifiers.adoc
index f7f101e83858..9a564aff8839 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/domain/identifiers.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/domain/identifiers.adoc
@@ -701,45 +701,6 @@ attribute, etc.
 for identifier generators.
 
 
-
-[[identifiers-generators-GenericGenerator]]
-==== Using `@GenericGenerator`
-
-[TIP]
-====
-`@GenericGenerator` is generally considered deprecated in favor of <<identifiers-generators-IdGeneratorType,@IdGeneratorType>>
-====
-
-`@GenericGenerator` allows integration of any Hibernate `org.hibernate.id.IdentifierGenerator` implementation, including any of the specific ones discussed here and any custom ones.
-
-[[identifiers-generators-pooled-lo-optimizer-mapping-example]]
-.Pooled-lo optimizer mapping using `@GenericGenerator` mapping
-====
-[source, java, indent=0]
-----
-include::{example-dir-identifier}/PooledOptimizerTest.java[tag=identifiers-generators-pooled-lo-optimizer-mapping-example]
-----
-====
-
-Now, when saving 5 `Person` entities and flushing the Persistence Context after every 3 entities:
-
-[[identifiers-generators-pooled-lo-optimizer-persist-example]]
-.Pooled-lo optimizer mapping using `@GenericGenerator` mapping
-====
-[source, java, indent=0]
-----
-include::{example-dir-identifier}/PooledOptimizerTest.java[tag=identifiers-generators-pooled-lo-optimizer-persist-example]
-----
-
-[source, sql, indent=0]
-----
-include::{extrasdir}/id/identifiers-generators-pooled-lo-optimizer-persist-example.sql[]
-----
-====
-
-As you can see from the list of generated SQL statements, you can insert 3 entities with just one database sequence call.
-This way, the pooled and the pooled-lo optimizers allow you to reduce the number of database round trips, therefore reducing the overall transaction response time.
-
 [[identifiers-derived]]
 ==== Derived Identifiers
 
diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/natural_id.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/natural_id.adoc
index 5641caec6619..142ea62774b1 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/domain/natural_id.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/domain/natural_id.adoc
@@ -1,22 +1,15 @@
 [[naturalid]]
 === Natural Ids
 :core-project-dir: {root-project-dir}/hibernate-core
-:example-dir-naturalid: {core-project-dir}/src/test/java/org/hibernate/orm/test/mapping/identifier
+:core-test-base-dir: {core-project-dir}/src/test/java/org/hibernate/orm/test
+:example-dir-naturalid: {core-test-base-dir}/mapping/identifier
 :jcache-project-dir: {root-project-dir}/hibernate-jcache
 :example-dir-caching: {jcache-project-dir}/src/test/java/org/hibernate/orm/test/caching
 :extrasdir: extras
 
-Natural ids represent domain model unique identifiers that have a meaning in the real world too.
+Natural ids are unique identifiers in the domain model that have a meaning in the real world too.
 Even if a natural id does not make a good primary key (surrogate keys being usually preferred), it's still useful to tell Hibernate about it.
-As we will see later, Hibernate provides a dedicated, efficient API for loading an entity by its natural id much like it offers for loading by identifier (PK).
-
-[IMPORTANT]
-====
-All values used in a natural id must be non-nullable.
-
-For natural id mappings using a to-one association, this precludes the use of not-found
-mappings which effectively define a nullable mapping.
-====
+As we will see <<find-by-natural-id,later>>, Hibernate provides an efficient means for loading an entity by its natural id much like it offers for loading by identifier (PK).
 
 [[naturalid-mapping]]
 ==== Natural Id Mapping
@@ -50,104 +43,97 @@ include::{example-dir-naturalid}/MultipleNaturalIdTest.java[tags=naturalid-multi
 ----
 ====
 
-[[naturalid-api]]
-==== Natural Id API
-
-As stated before, Hibernate provides an API for loading entities by their associated natural id.
-This is represented by the `org.hibernate.NaturalIdLoadAccess` contract obtained via Session#byNaturalId.
+Natural ids defined using multiple persistent attributes may also define a link:{doc-javadoc-url}org/hibernate/annotations/NaturalIdClass.html[`@NaturalIdClass`] which can be used for <<find-by-natural-id,find operations>>.
 
-[NOTE]
-====
-If the entity does not define a natural id, trying to load an entity by its natural id will throw an exception.
-====
-
-[[naturalid-load-access-example]]
-.Using NaturalIdLoadAccess
+[[naturalidclass-example]]
+.Natural id with @NaturalIdClass
 ====
 [source,java]
 ----
-include::{example-dir-naturalid}/SimpleNaturalIdTest.java[tags=naturalid-load-access-example,indent=0]
+include::{core-test-base-dir}/mapping/naturalid/idclass/SimpleNaturalIdClassTests.java[tags=naturalidclass-mapping-example,indent=0]
 ----
+====
 
-[source,java]
-----
-include::{example-dir-naturalid}/CompositeNaturalIdTest.java[tags=naturalid-load-access-example,indent=0]
-----
 
+[[natural-id-mutability]]
+==== Natural id mutability
+
+A natural id may be mutable or immutable. By default, the `@NaturalId` annotation marks the attribute as immutable.
+An immutable natural id is expected to never change its value.
+In fact, Hibernate will check at flush-time to ensure that the value has not been altered.
+
+If the value(s) of the natural id attribute(s) may change, `@NaturalId(mutable = true)` should be used instead.
+
+[[naturalid-mutable-mapping-example]]
+.Mutable natural id mapping
+====
 [source,java]
 ----
-include::{example-dir-naturalid}/MultipleNaturalIdTest.java[tags=naturalid-load-access-example,indent=0]
+include::{example-dir-naturalid}/MutableNaturalIdTest.java[tags=naturalid-mutable-mapping-example,indent=0]
 ----
 ====
 
-NaturalIdLoadAccess offers 2 distinct methods for obtaining the entity:
-
-`load()`:: obtains a reference to the entity, making sure that the entity state is initialized.
-`getReference()`:: obtains a reference to the entity. The state may or may not be initialized.
-If the entity is already associated with the current running Session, that reference (loaded or not) is returned.
-If the entity is not loaded in the current Session and the entity supports proxy generation, an uninitialized proxy is generated and returned, otherwise the entity is loaded from the database and returned.
-
-`NaturalIdLoadAccess` allows loading an entity by natural id and at the same time applies a pessimistic lock.
-For additional details on locking, see the <<chapters/locking/Locking.adoc#locking,Locking>> chapter.
 
-We will discuss the last method available on NaturalIdLoadAccess ( `setSynchronizationEnabled()` ) in <<naturalid-mutability-caching>>.
+[[natural-id-caching]]
+==== Natural id resolution caching
 
-Because the `Book` entities in the first two examples define "simple" natural ids, we can load them as follows:
+Within the Session, Hibernate maintains a cross reference of the resolutions from natural id values to entity identifier (PK) values.
+We can also have this value resolution cached in the second level cache if second level caching is enabled.
 
-[[naturalid-simple-load-access-example]]
-.Loading by simple natural id
+[[naturalid-caching]]
+.Natural id caching
 ====
 [source,java]
 ----
-include::{example-dir-naturalid}/SimpleNaturalIdTest.java[tags=naturalid-simple-load-access-example,indent=0]
+include::{example-dir-caching}/CacheableNaturalIdTest.java[tags=naturalid-cacheable-mapping-example,indent=0]
 ----
+====
 
-[source,java]
-----
-include::{example-dir-naturalid}/CompositeNaturalIdTest.java[tags=naturalid-simple-load-access-example,indent=0]
-----
+[IMPORTANT]
+====
+Think carefully before caching resolutions for natural ids which are partially or fully <<natural-id-mutability,mutable>> in the second level cache as this will often have a negative impact on performance.
 ====
 
-Here we see the use of the `org.hibernate.SimpleNaturalIdLoadAccess` contract,
-obtained via `Session#bySimpleNaturalId()`.
 
-`SimpleNaturalIdLoadAccess` is similar to `NaturalIdLoadAccess` except that it does not define the using method.
-Instead, because these _simple_ natural ids are defined based on just one attribute we can directly pass
-the corresponding natural id attribute value directly to the `load()` and `getReference()` methods.
+
+[[find-by-natural-id]]
+[[naturalid-api]]
+==== Loading by natural id
+
+Hibernate provides a means to load one or more entities by natural id using the `KeyType.NATURAL` `FindOption` passed to `find()` or `findMultiple()`.
 
 [NOTE]
 ====
-If the entity does not define a natural id, or if the natural id is not of a "simple" type, an exception will be thrown there.
+Hibernate historically offered the dedicated `byNaturalId()`, `bySimpleNaturalId()` and `byMultipleNaturalId()` APIs for loading one or more entities by natural id using its legacy "load access" approach.  However, with JPA 3.2 and the introduction of `FindOption`, etc., these "load access" approaches are considered deprecated and are not discussed here.
 ====
 
-[[naturalid-mutability-caching]]
-==== Natural Id - Mutability and Caching
-
-A natural id may be mutable or immutable. By default the `@NaturalId` annotation marks an immutable natural id attribute.
-An immutable natural id is expected to never change its value.
 
-If the value(s) of the natural id attribute(s) change, `@NaturalId(mutable = true)` should be used instead.
-
-[[naturalid-mutable-mapping-example]]
-.Mutable natural id mapping
+[[find-by-natural-id-example]]
+.Loading by natural id
 ====
 [source,java]
 ----
-include::{example-dir-naturalid}/MutableNaturalIdTest.java[tags=naturalid-mutable-mapping-example,indent=0]
+include::{example-dir-naturalid}/SimpleNaturalIdTest.java[tags=naturalid-loading-example,indent=0]
 ----
 ====
 
-Within the Session, Hibernate maintains a mapping from natural id values to entity identifiers (PK) values.
-If natural ids values changed, it is possible for this mapping to become out of date until a flush occurs.
+When loading by natural id, the type of value accepted depends on the definition of the natural id.
 
-To work around this condition, Hibernate will attempt to discover any such pending changes and adjust them when the `load()` or `getReference()` methods are executed.
-To be clear: this is only pertinent for mutable natural ids.
+* For single-attribute natural ids, whether defined by a basic or embedded type, the attribute type should be used.
+* For multi-attribute natural ids, Hibernate will accept a number of forms:
+
+** If a link:{doc-javadoc-url}org/hibernate/annotations/NaturalIdClass.html[`@NaturalIdClass`] is defined, an instance of the natural id class may be used.
+** An array of the individual attribute values, ordered alphabetically by name, may be used.
+** A `Map` of the individual attribute values, keyed by the attribute name, may be used.
+
+There are a few differences to be aware of when loading by natural id compared to loading by primary key.  Most importantly, if the natural id is mutable and its values have changed, it is possible for the resolution caching to become out of date until a flush occurs resulting in incorrect results.
+To work around this condition, Hibernate will attempt to discover any such pending changes and adjust them prior to performing the load.
 
 [IMPORTANT]
 ====
-This _discovery and adjustment_ have a performance impact.
-If you are certain that none of the mutable natural ids already associated with the current `Session` have changed, you can disable this checking by calling `setSynchronizationEnabled(false)` (the default is `true`).
-This will force Hibernate to circumvent the checking of mutable natural ids.
+This _discovery and adjustment_ (synchronization) has a performance impact.
+If you are certain that none of the mutable natural ids already associated with the current `Session` have changed, you can disable this using the `NaturalIdSynchronization.DISABLED` option which will force Hibernate to skip the checking of mutable natural ids.
+To be clear: this is only pertinent for mutable natural ids.
 ====
 
 [[naturalid-mutable-synchronized-example]]
@@ -159,13 +145,3 @@ include::{example-dir-naturalid}/MutableNaturalIdTest.java[tags=naturalid-mutabl
 ----
 ====
 
-Not only can this NaturalId-to-PK resolution be cached in the Session, but we can also have it cached in the second-level cache if second level caching is enabled.
-
-[[naturalid-caching]]
-.Natural id caching
-====
-[source,java]
-----
-include::{example-dir-caching}/CacheableNaturalIdTest.java[tags=naturalid-cacheable-mapping-example,indent=0]
-----
-====
diff --git a/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc b/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc
index e9ca78b19744..7e2d515895b4 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc
@@ -285,7 +285,7 @@ Hibernate allows the creation of Jakarta Persistence fetch/load graphs by parsin
 of the graph.  Generally speaking, the textual representation of a graph is a comma-separated
 list of attribute names, optionally including any subgraph specifications.
 The starting point for such parsing operations is either `org.hibernate.graph.GraphParser`
-or `SessionFactory#parseEntityGraph`
+or `SessionFactory#parseEntityGraph`.
 
 [NOTE]
 ====
@@ -294,6 +294,21 @@ syntax described here is specific to Hibernate. We do hope to eventually make th
 the Jakarta Persistence specification proper.
 ====
 
+===== Graph parser mode configuration
+
+Since Hibernate 7.3, a new configuration setting controls which syntax the `LegacyGraphParser` uses:
+
+`hibernate.graph_parser_mode`::
+Determines which parsing syntax is active.
++
+* `legacy` — The historical syntax used before Hibernate 7.3.
+* `modern` — Enables the new syntax that supports root-subtype subgraphs and improved readability.
+
+.Default value
+[source,properties]
+----
+hibernate.graph_parser_mode = legacy
+----
 
 .Parsing a simple graph
 ====
@@ -318,10 +333,14 @@ include::{example-dir-fetching}/GraphParsingTest.java[tags=fetching-strategies-d
 ----
 ====
 
+===== Subtype-specific subgraphs (examples showing both supported forms)
+
 Parsing can also handle subtype specific subgraphs.  For example, given an entity hierarchy of
 `LegalEntity` <- (`Corporation` | `Person` | `NonProfit`) and an attribute named `responsibleParty` whose
 type is the `LegalEntity` base type we might have:
 
+* **Legacy form (hibernate.graph_parser_mode = legacy)**
+
 ====
 [source, java, indent=0]
 ----
@@ -329,8 +348,21 @@ responsibleParty(Corporation: ceo)
 ----
 ====
 
+* **Modern form (hibernate.graph_parser_mode = modern)**
+
+====
+[source, java, indent=0]
+----
+responsibleParty:Corporation(ceo)
+----
+====
+
+Both forms produce the same runtime EntityGraph structure.
+
 We can even duplicate the attribute names to apply different subtype subgraphs:
 
+* **Legacy form (hibernate.graph_parser_mode = legacy)**
+
 ====
 [source, java, indent=0]
 ----
@@ -338,6 +370,15 @@ responsibleParty(taxIdNumber), responsibleParty(Corporation: ceo), responsiblePa
 ----
 ====
 
+* **Modern form (hibernate.graph_parser_mode = modern)**
+
+====
+[source, java, indent=0]
+----
+responsibleParty(taxIdNumber), responsibleParty:Corporation(ceo), responsibleParty:NonProfit(sector)
+----
+====
+
 The duplicated attribute names are handled according to the Jakarta Persistence specification which says that duplicate
 specification of the attribute node results in the originally registered AttributeNode to be re-used
 effectively merging the 2 AttributeNode specifications together.  In other words, the above specification
@@ -355,6 +396,20 @@ invoiceGraph.addSubgraph( "responsibleParty", NonProfit.class ).addAttributeNode
 ----
 ====
 
+===== Root-subtype subgraphs (modern-only feature)
+
+The modern parser mode also supports defining subgraphs that originate at a subtype of the **root entity**.
+This feature is **only available** when `hibernate.graph_parser_mode=modern`.
+Given an entity hierarchy of `LegalEntity` <- (`Corporation` | `Person` | `NonProfit`) with an attribute `ceo` that exists only on `Corporation`
+and an attribute `sector` that exists only on `NonProfit`, you can define such subgraphs directly in a `LegalEntity` graph definition:
+
+====
+[source,java,indent=0]
+----
+:Corporation(ceo), :NonProfit(sector)
+----
+====
+
 [[fetching-strategies-dynamic-fetching-entity-graph-merging]]
 ==== Combining multiple Jakarta Persistence entity graphs into one
 
@@ -391,6 +446,29 @@ class Book {
 ----
 ====
 
+Since Hibernate 7.3 a `root` attribute is available on the Hibernate-specific `@NamedEntityGraph` annotation
+to explicitly indicate the entity type that is the root of the graph.
+
+When `@NamedEntityGraph` is placed on a package, the `root` attribute **must** be specified.
+If the annotation is placed on a package and the `root` is omitted:
+* In `legacy` parser mode a deprecation warning will be emitted.
+* In `modern` parser mode the omission is **not allowed** and results in an error.
+
+.Package-level @NamedEntityGraph example
+====
+[source, java, indent=0]
+----
+@org.hibernate.annotations.NamedEntityGraph(
+    name = "Book.graph",
+    root = Book.class,
+    graph = "title,isbn,author(name,phoneNumber)"
+)
+package com.example.model;
+----
+====
+
+This annotation works in conjunction with the `LegacyGraphParser` and respects the syntax
+defined by `hibernate.graph_parser_mode`.
 
 [[fetching-strategies-dynamic-fetching-profile]]
 === Dynamic fetching via Hibernate profiles
diff --git a/documentation/src/main/asciidoc/userguide/chapters/query/hql/QueryLanguage.adoc b/documentation/src/main/asciidoc/userguide/chapters/query/hql/QueryLanguage.adoc
index ae6daa913311..e311d2211d6b 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/query/hql/QueryLanguage.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/query/hql/QueryLanguage.adoc
@@ -117,12 +117,6 @@ include::{example-dir-hql}/HQLTest.java[tags=hql-select-simplest-example]
 ----
 ====
 
-We don't necessarily _recommend_ leaving off the `select` list.
-
-[NOTE]
-====
-HQL doesn't require a `select` clause, but JPQL _does_.
-
 Naturally, the previous query may be written with a `select` clause:
 
 [source, java, indent=0]
@@ -138,7 +132,6 @@ include::{example-dir-hql}/HQLTest.java[tags=hql-select-no-from]
 ----
 
 For complicated queries, it's probably best to explicitly specify a `select` list.
-====
 
 An alternative "simplest" query has _only_ a `select` list:
 
@@ -188,7 +181,7 @@ For example:
 ====
 [source, java, indent=0]
 ----
-include::{example-dir-hql}/HQLTest.java[tags=hql-update-example]
+include::{example-dir-hql}/HQLInsertAndUpdateTest.java[tags=hql-update-example]
 ----
 ====
 
@@ -328,7 +321,7 @@ For example:
 ====
 [source, sql, indent=0]
 ----
-include::{example-dir-hql}/HQLTest.java[tags=hql-insert-example]
+include::{example-dir-hql}/HQLInsertAndUpdateTest.java[tags=hql-insert-example]
 ----
 
 [source, sql, indent=0]
@@ -1220,6 +1213,8 @@ The following functions deal with SQL array types, which are not supported on ev
 | <<hql-array-slice-functions,`array_slice()`>> | Creates a sub-array of the based on lower and upper index
 | <<hql-array-replace-functions,`array_replace()`>> | Creates array copy replacing a given element with another
 | <<hql-array-trim-functions,`array_trim()`>> | Creates array copy trimming the last _N_ elements
+| <<hql-array-reverse-functions,`array_reverse()`>> | Returns a copy of the array with elements in reverse order
+| <<hql-array-sort-functions,`array_sort()`>> | Returns a sorted copy of the array
 | <<hql-array-fill-functions,`array_fill()`>> | Creates array filled with the same element _N_ times
 | <<hql-array-fill-functions,`array_fill_list()`>> | Like `array_fill`, but returns the result as `List<?>`
 | <<hql-array-to-string-functions,`array_to_string()`>> | String representation of array
@@ -1596,6 +1591,46 @@ include::{array-example-dir-hql}/ArrayTrimTest.java[tags=hql-array-trim-example]
 ----
 ====
 
+[[hql-array-reverse-functions]]
+===== `array_reverse()`
+
+Returns a copy of the array with elements in reverse order. Returns `null` if the argument is `null`.
+
+[[hql-array-reverse-example]]
+====
+[source, java, indent=0]
+----
+include::{array-example-dir-hql}/ArrayReverseTest.java[tags=hql-array-reverse-example]
+----
+====
+
+[[hql-array-sort-functions]]
+===== `array_sort()`
+
+Returns a sorted copy of the array. When called with no optional arguments, elements are sorted in ascending order with `null` elements placed last.
+The optional second argument allows specifying descending order, and the optional third argument controls the position of `null` elements.
+Returns `null` if the first argument is `null`.
+
+[[hql-array-sort-example]]
+====
+[source, java, indent=0]
+----
+include::{array-example-dir-hql}/ArraySortTest.java[tags=hql-array-sort-example]
+----
+====
+
+The second argument controls sort direction: `false` for ascending (default), `true` for descending.
+The third argument controls `null` placement: `false` for nulls last, `true` for nulls first.
+When the third argument is omitted, it defaults to the value of the second argument.
+
+[[hql-array-sort-descending-nulls-last-example]]
+====
+[source, java, indent=0]
+----
+include::{array-example-dir-hql}/ArraySortTest.java[tags=hql-array-sort-descending-nulls-last-example]
+----
+====
+
 [[hql-array-fill-functions]]
 ===== `array_fill()` and `array_fill_list()`
 
@@ -1766,11 +1801,11 @@ Extracts a scalar value by https://www.ietf.org/archive/id/draft-goessner-dispat
 include::{extrasdir}/json_value_bnf.txt[]
 ----
 
-The first argument is an expression to a JSON document. The second argument is a JSON path as String expression.
+The first argument is an expression to a JSON document. The second argument is a JSON path as a string expression.
 
 WARNING: Some databases might also allow extracting non-scalar values. Beware that this behavior is not portable.
 
-NOTE: It is recommended to only us the dot notation for JSON paths instead of the bracket notation,
+NOTE: It is recommended to use the dot notation for JSON paths instead of the bracket notation,
 since most databases support only that.
 
 [[hql-json-value-example]]
diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/Tooling.adoc b/documentation/src/main/asciidoc/userguide/chapters/tooling/Tooling.adoc
index 8f312cbd7f45..c4d0fbe50866 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/tooling/Tooling.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/Tooling.adoc
@@ -14,10 +14,12 @@ These services include
 * <<tooling-enhancement,Bytecode enhancement>>
 * <<tooling-modelgen,Static Metamodel generation>>
 * <<tooling-schema,Schema management>>
+* <<tooling-reveng,Reverse engineering>>
 
 include::enhancement.adoc[]
 include::modelgen.adoc[]
 include::schema.adoc[]
+include::reveng.adoc[]
 
 include::gradle.adoc[]
 include::maven.adoc[]
diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/ant.adoc b/documentation/src/main/asciidoc/userguide/chapters/tooling/ant.adoc
index c9e4c2823018..570b15e8fc84 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/tooling/ant.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/ant.adoc
@@ -4,7 +4,8 @@
 Hibernate provides https://ant.apache.org/[Ant] support.
 Everything Ant related is available from the
 https://central.sonatype.com/artifact/org.hibernate.orm/hibernate-ant[hibernate-ant]
-library.
+library.  The Ant integration supports <<tooling-ant-enhancement,bytecode enhancement>>,
+<<tooling-ant-modelgen,metamodel generation>>, and <<tooling-ant-reveng,reverse engineering>>.
 
 [[tooling-ant-enhancement]]
 ==== Bytecode Enhancement ====
@@ -25,7 +26,7 @@ of the enhancement task.
 [[enhance-task-example]]
 .Enhance Task Example
 ====
-[source, xml]]
+[source, xml,subs="attributes+"]
 ----
 include::extras/ant-enhance-example.xml[]
 ----
@@ -176,7 +177,7 @@ Ant's https://ant.apache.org/manual/Tasks/javac.html[javac] task.
 [[javac-task-example]]
 .Javac task configuration
 ====
-[source, xml]
+[source,xml,subs="attributes+"]
 ----
 <javac srcdir="${src.dir}"
         destdir="${target.dir}"
@@ -184,7 +185,7 @@ Ant's https://ant.apache.org/manual/Tasks/javac.html[javac] task.
         fork="true"
         classpath="${classpath}">
     <compilerarg value="-processorpath" />
-    <compilerarg value="/path/to/metamodel-generator.jar"/>
+    <compilerarg value="/path/to/hibernate-processor-{fullVersion}.jar"/>
     <compilerarg value="-proc:only"/>
 </javac>
 ----
@@ -192,6 +193,134 @@ Ant's https://ant.apache.org/manual/Tasks/javac.html[javac] task.
 ====
 
 
+[[tooling-ant-reveng]]
+==== Reverse Engineering
+
+Hibernate provides an Ant task for <<tooling-reveng,reverse engineering>> an existing database
+into Java entities, mapping files, DAOs, configuration files, and DDL scripts.
+
+
+[[tooling-ant-reveng-task]]
+===== Task Definition
+
+The reverse engineering task is implemented by `org.hibernate.tool.ant.HibernateToolTask`.
+Define it in your `build.xml` using a `taskdef`:
+
+[source,xml,subs="attributes+"]
+----
+<taskdef name="hibernatetool"
+         classname="org.hibernate.tool.ant.HibernateToolTask"
+         classpathref="toolslib"/>
+----
+
+The `toolslib` classpath must include the
+https://central.sonatype.com/artifact/org.hibernate.orm/hibernate-ant[hibernate-ant]
+artifact and its dependencies, as well as the JDBC driver for your database.
+
+
+[[tooling-ant-reveng-hibernatetool]]
+===== The `<hibernatetool>` Task
+
+The `<hibernatetool>` task is the main entry point. It accepts the following attributes:
+
+`destdir`:: The base output directory for generated files. Required (can be set on the task or on individual exporters).
+`templatepath`:: Path to a directory containing custom FreeMarker templates.
+
+It also accepts `<property>` child elements for passing additional properties, and
+a `<classpath>` element for configuring the classpath.
+
+
+[[tooling-ant-reveng-configurations]]
+===== Configuration Elements
+
+A `<hibernatetool>` task requires exactly one configuration element that defines how metadata is obtained.
+For reverse engineering from a database, use `<jdbcconfiguration>`:
+
+`<jdbcconfiguration>`:: Reads database metadata via JDBC for reverse engineering. Attributes:
++
+--
+`propertyfile`;; Path to a properties file containing JDBC connection settings.
+`configurationfile`;; Path to a `hibernate.cfg.xml` file.
+`packagename`;; The default Java package name for generated classes.
+`reversestrategy`;; Fully qualified class name of a custom reverse engineering strategy.
+`revengfile`;; Path containing reverse engineering configuration XML file(s) for customizing schema selection and type mappings.
+`detectmanytomany`;; Whether to detect many-to-many link tables. Default: `true`.
+`detectonetoone`;; Whether to detect one-to-one associations. Default: `true`.
+`detectoptimisticlock`;; Whether to detect `VERSION`/`TIMESTAMP` columns for optimistic locking. Default: `true`.
+--
+
+Other configuration elements are also available for non-JDBC scenarios:
+
+`<configuration>`:: Uses a `hibernate.cfg.xml` and/or HBM mapping files as input.
+`<jpaconfiguration>`:: Uses a JPA `persistence.xml` as input.
+
+
+[[tooling-ant-reveng-exporters]]
+===== Exporter Elements
+
+One or more exporter elements can be nested inside `<hibernatetool>` to specify what artifacts to generate.
+Each exporter supports a `destdir` attribute to override the output directory.
+
+`<hbm2java>`:: Generates Java entity classes.
+`<hbm2hbmxml>`:: Generates `hbm.xml` mapping files.
+`<hbm2dao>`:: Generates Data Access Object (DAO) classes.
+`<hbm2ddl>`:: Generates DDL scripts (schema creation/drop).
+`<hbm2cfgxml>`:: Generates a `hibernate.cfg.xml` configuration file.
+`<hbm2doc>`:: Generates HTML documentation of the database schema.
+`<hbmtemplate>`:: Runs a custom FreeMarker template for user-defined code generation.
+`<query>`:: Executes HQL queries against the configured metadata.
+
+
+[[tooling-ant-reveng-example]]
+===== Example
+
+The following `build.xml` generates JPA entity classes from a database:
+
+[source,xml,subs="attributes+"]
+----
+<project name="reveng-example" default="generate">
+
+    <path id="toolslib">
+        <fileset dir="${lib.dir}">
+            <include name="**/*.jar"/>
+        </fileset>
+    </path>
+
+    <taskdef name="hibernatetool"
+             classname="org.hibernate.tool.ant.HibernateToolTask"
+             classpathref="toolslib"/>
+
+    <target name="generate">
+        <hibernatetool destdir="${build.dir}/generated-sources">
+            <classpath>
+                <path refid="toolslib"/>
+            </classpath>
+            <jdbcconfiguration
+                propertyfile="src/main/resources/hibernate.properties"
+                packagename="com.example.model"
+                detectmanytomany="true"/>
+            <hbm2java/>
+        </hibernatetool>
+    </target>
+
+</project>
+----
+
+To generate multiple artifact types in a single run, add additional exporter elements:
+
+[source,xml]
+----
+<hibernatetool destdir="${build.dir}/generated-sources">
+    <jdbcconfiguration
+        propertyfile="src/main/resources/hibernate.properties"
+        packagename="com.example.model"/>
+    <hbm2java/>
+    <hbm2dao/>
+    <hbm2ddl/>
+</hibernatetool>
+----
+
+
 [[tooling-ant-schema]]
 ==== Schema Management
 
diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/ant-enhance-example.xml b/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/ant-enhance-example.xml
index 2e9f378f09c2..8066d2aabf41 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/ant-enhance-example.xml
+++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/ant-enhance-example.xml
@@ -3,7 +3,7 @@
     <ivy:cachepath
             organisation="org.hibernate.orm"
             module="hibernate-ant"
-            revision="${hibernate.version}"
+            revision="{fullVersion}}"
             pathid="hibernate-ant.path"
             inline="true"/>
     [...]
diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example-metamodel.pom b/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example-metamodel.pom
index 73a4c40dd408..8be8568b167e 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example-metamodel.pom
+++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example-metamodel.pom
@@ -10,16 +10,14 @@
                     <path>
                         <groupId>org.hibernate.orm</groupId>
                         <artifactId>hibernate-processor</artifactId>
-                        <version>$currentHibernateVersion</version>
-                        <!-- Optionally exclude transitive dependencies -->
-                        <exclusions>
-                            <exclusion>
-                                <groupId>org.sample</groupId>
-                                <artifactId>sample-dependency</artifactId>
-                            </exclusion>
-                        </exclusions>
+                        <version>{fullVersion}</version>
                     </path>
                 </annotationProcessorPaths>
+                <!-- This setting is required for the hibernate-processor dependencies to
+                     also be managed by <dependencyManagement> rules, if any.
+                     More information is available in Maven compiler plugin documentation:
+                     https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#annotationProcessorPathsUseDepMgmt -->
+                <annotationProcessorPathsUseDepMgmt>true</annotationProcessorPathsUseDepMgmt>
             </configuration>
         </plugin>
         [...]
diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example.pom b/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example.pom
index b14aaef670be..4b84e8fe230a 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example.pom
+++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example.pom
@@ -4,7 +4,7 @@
         <plugin>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-maven-plugin</artifactId>
-            <version>$currentHibernateVersion</version>
+            <version>{fullVersion}</version>
             <executions>
                 <execution>
                     <goals>
diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/gradle.adoc b/documentation/src/main/asciidoc/userguide/chapters/tooling/gradle.adoc
index 0033759d9e3e..4934016d3579 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/tooling/gradle.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/gradle.adoc
@@ -1,8 +1,9 @@
 [[tooling-gradle]]
 === Gradle
 
-Hibernate provides the ability to integrate both
-<<tooling-gradle-enhancement,bytecode enhancement>> and <<tooling-gradle-modelgen,metamodel generation>> capabilities into Gradle builds.
+Hibernate provides the ability to integrate
+<<tooling-gradle-enhancement,bytecode enhancement>>, <<tooling-gradle-modelgen,metamodel generation>>,
+and <<tooling-gradle-reveng,reverse engineering>> capabilities into Gradle builds.
 
 [[tooling-gradle-enhancement]]
 ==== Bytecode Enhancement
@@ -14,7 +15,7 @@ To apply the plugin, use Gradle's `plugins {}` block:
 [source,gradle]
 ----
 plugins {
-    id "org.hibernate.orm" version "<version-to-use>"
+    id("org.hibernate.orm") version "<version-to-use>"
 }
 ----
 
@@ -29,16 +30,16 @@ hibernate {
 
 Enhancement is configured through the `enhancement` extension.
 
-NOTE: `hibernate {}` and `enhancement {}` are separate to allow for schema tooling capabilities to be added later.
+NOTE: `enhancement {}` and `reveng {}` are nested inside `hibernate {}` to configure different capabilities of the plugin.
 
 [source,gradle]
 ----
 hibernate {
     enhancement {
         // for illustration, enable them all
-        lazyInitialization true
-        dirtyTracking true
-        associationManagement true
+        enableLazyInitialization = true
+        enableDirtyTracking = true
+        enableAssociationManagement = true
     }
 }
 ----
@@ -47,26 +48,123 @@ The extension is of type `EnhancementSpec` which exposes the following propertie
 
 enableLazyInitialization:: Whether to incorporate lazy loading support into the enhanced bytecode. Defaults to `true`. This setting is deprecated for removal without a replacement.  See <<BytecodeEnhancement-lazy-loading>>
 enableDirtyTracking:: Whether to incorporate dirty tracking into the enhanced bytecode. Defaults to `true`. This setting is deprecated for removal without a replacement.  See <<BytecodeEnhancement-dirty-tracking>>.
-enableAssociationManagement:: Whether to add bidirectional association management into the enhanced bytecode.  See <<BytecodeEnhancement-dirty-tracking-bidirectional>>.
+enableAssociationManagement:: Whether to add bidirectional association management into the enhanced bytecode. Defaults to `false`. See <<BytecodeEnhancement-dirty-tracking-bidirectional>>.
 
-It also exposes the following method forms:
-
-* lazyInitialization(boolean)
-* dirtyTracking(boolean)
-* associationManagement(boolean)
+All options are deprecated for removal.
 
 
 [[tooling-gradle-modelgen]]
-==== Static Metamodel Generation
+==== Annotation processor for static metamodel and repositories
 
-Static metamodel generation can be incorporated into Gradle builds via the
+<<tooling-modelgen,Static metamodel and repository>> generation can be incorporated into Gradle builds via the
 annotation processor provided by the `org.hibernate.orm:hibernate-processor` artifact.  Applying
-an annotation processor in Gradle is super easy -
+an annotation processor in Gradle is as easy as:
+
+
+[source,gradle,subs="attributes+"]
+----
+dependencies {
+    annotationProcessor "org.hibernate.orm:hibernate-processor:{fullVersion}"
+}
+----
+
+
+[[tooling-gradle-reveng]]
+==== Reverse Engineering
+
+The <<tooling-gradle-enhancement,Hibernate ORM Gradle plugin>> also provides
+<<tooling-reveng,reverse engineering>> capabilities to generate Java entities, mapping files,
+DAOs, configuration files, and DDL scripts from an existing database.
+
+NOTE: The Gradle configuration cache must be disabled when using reverse engineering tasks.
+Add `org.gradle.configuration-cache=false` to your `gradle.properties` file.
 
 
+[[tooling-gradle-reveng-tasks]]
+===== Available Tasks
+
+The plugin registers the following tasks:
+
+`generateJava`:: Generates Java entity classes from the database schema.
+`generateDao`:: Generates Data Access Object (DAO) classes.
+`generateHbm`:: Generates `hbm.xml` mapping files.
+`generateCfg`:: Generates a `hibernate.cfg.xml` configuration file.
+`runSql`:: Executes the SQL statement specified by the `sqlToRun` extension property against the database.
+
+
+[[tooling-gradle-reveng-configuration]]
+===== Extension Configuration
+
+Reverse engineering is configured through the `reveng` block inside the `hibernate` extension:
+
 [source,gradle]
 ----
+hibernate {
+    reveng {
+        hibernateProperties = 'hibernate.properties'
+        outputFolder = 'generated-sources'
+        packageName = 'com.example.model'
+        generateAnnotations = true
+        useGenerics = true
+    }
+}
+----
+
+The extension supports the following properties:
+
+`hibernateProperties`:: Name of the properties file containing JDBC connection settings. The file is looked up from the project's main resource set. Default: `hibernate.properties`.
+`outputFolder`:: Relative path (from the project directory) where generated files are written. Default: `generated-sources`.
+`packageName`:: The default Java package name for generated classes. Default: empty (default package).
+`generateAnnotations`:: Whether to generate Jakarta Persistence annotations on entity classes. Default: `true`.
+`useGenerics`:: Whether to use Java generics in generated code. Default: `true`.
+`revengStrategy`:: Fully qualified class name of a custom reverse engineering strategy. Default: `null` (uses the default strategy).
+`revengFile`:: Name of a reverse engineering configuration XML file (looked up from the main resource set). Default: `null`.
+`templatePath`:: Path to a directory containing custom FreeMarker templates for code generation. Default: `null`.
+`sqlToRun`:: The SQL statement to execute when running the `runSql` task. Default: empty string.
+
+
+[[tooling-gradle-reveng-properties]]
+===== Hibernate Properties
+
+Create a `hibernate.properties` file in `src/main/resources/` with your JDBC connection settings:
+
+[source,properties]
+----
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:tcp://localhost/./mydb
+hibernate.connection.username=sa
+hibernate.default_catalog=MY_CATALOG
+hibernate.default_schema=PUBLIC
+----
+
+The JDBC driver must be declared as a project dependency.
+
+
+[[tooling-gradle-reveng-example]]
+===== Example
+
+The following `build.gradle` generates JPA entity classes from an H2 database:
+
+[source,gradle,subs="attributes+"]
+----
+plugins {
+    id 'java'
+    id 'org.hibernate.orm' version '{fullVersion}'
+}
+
+repositories {
+    mavenCentral()
+}
+
 dependencies {
-    annotationProcessor "org.hibernate.orm:hibernate-processor:${hibernateVersion}"
+    implementation 'com.h2database:h2:2.2.224'
+}
+
+hibernate {
+    reveng {
+        hibernateProperties = 'hibernate.properties'
+        packageName = 'com.example.model'
+        outputFolder = 'generated-sources'
+    }
 }
 ----
diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/maven.adoc b/documentation/src/main/asciidoc/userguide/chapters/tooling/maven.adoc
index 1ffb78032caa..e12a8473cc1a 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/tooling/maven.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/maven.adoc
@@ -1,7 +1,10 @@
 [[tooling-maven]]
 === Maven
 
-The following sections illustrate how both <<tooling-maven-enhancement,bytecode enhancement>> and <<tooling-maven-modelgen,metamodel generation>> capabilities can be integrated into Maven builds.
+The following sections illustrate how <<tooling-maven-enhancement,bytecode enhancement>>,
+<<tooling-maven-modelgen,metamodel generation>>, <<tooling-maven-reveng,reverse engineering>>,
+and <<tooling-maven-transformhbm,HBM XML transformation>>
+capabilities can be integrated into Maven builds.
 
 [[tooling-maven-enhancement]]
 ==== Bytecode Enhancement
@@ -20,7 +23,7 @@ for more details on the available parameters.
 
 .Apply the Bytecode Enhancement plugin
 ====
-[source,xml]
+[source,xml,subs="attributes+"]
 ----
 include::extras/maven-example.pom[]
 ----
@@ -159,15 +162,172 @@ even when accessing entity fields directly..
 
 
 [[tooling-maven-modelgen]]
-==== Static Metamodel Generation
+==== Annotation processor for static metamodel and repositories
 
-Static metamodel generation should be integrated into a maven project through the annotation processor
+<<tooling-modelgen,Static metamodel and repository>> generation should be integrated into a maven project through the annotation processor
 paths of the maven compiler plugin.
 
 .Integrate the metamodel generator
 ====
-[source,xml]
+[source,xml,subs="attributes+"]
 ----
 include::extras/maven-example-metamodel.pom[]
 ----
 ====
+
+
+[[tooling-maven-reveng]]
+==== Reverse Engineering
+
+Hibernate provides a Maven plugin for <<tooling-reveng,reverse engineering>> an existing database
+into Java entities, mapping files, DAOs, and DDL scripts.
+
+
+[[tooling-maven-reveng-plugin]]
+===== Plugin Declaration
+
+Add the `hibernate-maven-plugin` to your POM:
+
+[source,xml,subs="attributes+"]
+----
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-maven-plugin</artifactId>
+            <version>{fullVersion}</version>
+            <executions>
+                <execution>
+                    <id>generate-entities</id>
+                    <phase>generate-sources</phase>
+                    <goals>
+                        <goal>hbm2java</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+</build>
+----
+
+
+[[tooling-maven-reveng-goals]]
+===== Available Goals
+
+The plugin provides the following goals:
+
+`hbm2java`:: Generates Java entity classes from the database schema. Binds to the `generate-sources` phase by default.
+`hbm2ddl`:: Generates DDL scripts from the database schema. Binds to the `generate-resources` phase by default.
+`hbm2dao`:: Generates Data Access Object (DAO) classes. Binds to the `generate-sources` phase by default.
+`generateHbm`:: Generates `hbm.xml` mapping files from the database schema. Binds to the `generate-sources` phase by default.
+
+
+[[tooling-maven-reveng-common-params]]
+===== Common Configuration Parameters
+
+The following parameters are shared by the `hbm2java`, `hbm2ddl`, `hbm2dao`, and `generateHbm` goals:
+
+`propertyFile`:: Path to a properties file containing JDBC connection settings. Default: `${project.basedir}/src/main/resources/hibernate.properties`.
+`packageName`:: The default Java package name for generated classes.
+`revengFile`:: Path to a reverse engineering configuration XML file for customizing schema selection, type mappings, and filters.
+`revengStrategy`:: Fully qualified class name of a custom reverse engineering strategy. Extend `DefaultReverseEngineeringStrategy` and override methods to customize class names, type mappings, etc.
+`detectManyToMany`:: If `true`, pure many-to-many link tables (tables whose primary key consists of exactly two foreign keys and no other columns) are mapped as many-to-many associations. Default: `true`.
+`detectOneToOne`:: If `true`, a one-to-one association is created for each foreign key found. Default: `true`.
+`detectOptimisticLock`:: If `true`, columns named `VERSION` or `TIMESTAMP` with appropriate types are mapped as `@Version` properties. Default: `true`.
+`createCollectionForForeignKey`:: If `true`, a collection mapping is generated for each foreign key. Default: `true`.
+`createManyToOneForForeignKey`:: If `true`, a many-to-one association is created for each foreign key found. Default: `true`.
+
+
+[[tooling-maven-reveng-hbm2java-params]]
+===== hbm2java Parameters
+
+`outputDirectory`:: The directory into which entity classes are generated. Default: `${project.build.directory}/generated-sources/`.
+`ejb3`:: Whether to generate Jakarta Persistence annotations. Default: `true`.
+`jdk5`:: Whether to use JDK 5+ constructs such as generics and static imports. Default: `true`.
+`templatePath`:: Path to a directory containing custom FreeMarker templates.
+
+
+[[tooling-maven-reveng-hbm2ddl-params]]
+===== hbm2ddl Parameters
+
+`outputDirectory`:: The directory into which DDL scripts are generated. Default: `${project.build.directory}/generated-resources/`.
+`outputFileName`:: The filename of the generated DDL script. Default: `schema.ddl`.
+`targetTypes`:: The type of output to produce: `DATABASE` (export to the database), `SCRIPT` (write to a script file), or `STDOUT` (write to standard output). Default: `SCRIPT`.
+`schemaExportAction`:: The DDL statements to create: `NONE`, `CREATE`, `DROP`, or `BOTH` (drop then create). Default: `CREATE`.
+`delimiter`:: The end-of-statement delimiter. Default: `;`.
+`format`:: Whether to format the SQL output. Default: `true`.
+`haltOnError`:: Whether to stop on the first error. Default: `true`.
+
+
+[[tooling-maven-reveng-hbm2dao-params]]
+===== hbm2dao Parameters
+
+`outputDirectory`:: The directory into which DAO classes are generated. Default: `${project.build.directory}/generated-sources/`.
+`ejb3`:: Whether to use Jakarta Persistence features. Default: `false`.
+`jdk5`:: Whether to use JDK 5+ constructs. Default: `false`.
+`templatePath`:: Path to a directory containing custom FreeMarker templates.
+
+
+[[tooling-maven-reveng-example]]
+===== Example
+
+The following POM generates JPA entity classes from an H2 database:
+
+[source,xml,subs="attributes+"]
+----
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.example</groupId>
+    <artifactId>my-project</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>2.2.224</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>{fullVersion}</version>
+                <executions>
+                    <execution>
+                        <id>generate-entities</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>hbm2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+----
+
+By default, the plugin reads JDBC connection settings from `src/main/resources/hibernate.properties`.
+Run the generation with:
+
+[source,bash]
+----
+mvn generate-sources
+----
+
+
+[[tooling-maven-transformhbm]]
+==== HBM XML Transformation
+
+The `hibernate-maven-plugin` provides a `transformHbm` goal that transforms legacy `hbm.xml` mapping files
+into ORM `mapping.xml` files. This goal does not connect to a database -- it converts existing HBM mappings.
+
+
+[[tooling-maven-transformhbm-params]]
+===== transformHbm Parameters
+
+`inputFolder`:: The folder containing `hbm.xml` files to transform. Files are discovered recursively. Default: `${project.basedir}/src/main/resources`.
+`format`:: Whether to format the output XML. Default: `true`.
diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/modelgen.adoc b/documentation/src/main/asciidoc/userguide/chapters/tooling/modelgen.adoc
index 2c760773c7a3..8aba41d569b9 100644
--- a/documentation/src/main/asciidoc/userguide/chapters/tooling/modelgen.adoc
+++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/modelgen.adoc
@@ -1,5 +1,5 @@
 [[tooling-modelgen]]
-=== Static Metamodel Generator
+=== Static metamodel and repositories
 :testing-project-dir: {root-project-dir}/hibernate-testing
 :example-dir-model: {testing-project-dir}/src/main/java/org/hibernate/testing/orm/domain/userguide
 :example-dir-metamodelgen-generated: {testing-project-dir}/target/generated/sources/annotationProcessor/java/main/org/hibernate/testing/orm/domain/userguide
@@ -8,7 +8,6 @@
 :ann-proc: https://docs.oracle.com/en/java/javase/11/tools/javac.html#GUID-082C33A5-CBCA-471A-845E-E77F79B7B049__GUID-3FA757C8-B67B-46BC-AEF9-7C3FFB126A93
 :ann-proc-path: https://docs.oracle.com/en/java/javase/11/tools/javac.html#GUID-AEEC9F07-CB49-4E96-8BC7-BCC2C7F725C9__GUID-214E175F-0F06-4CDC-B511-5BA469955F5A
 :ann-proc-options: https://docs.oracle.com/en/java/javase/11/tools/javac.html#GUID-AEEC9F07-CB49-4E96-8BC7-BCC2C7F725C9__GUID-6CC814A4-8A29-434A-B7E1-DF8234784E7C
-:intg-guide: https://docs.hibernate.org/orm/{majorMinorVersion}/introduction/html_single/#generator
 
 Jakarta Persistence defines a typesafe Criteria API which allows <<criteria,`Criteria`>>
 queries to be constructed in a strongly-typed manner, utilizing so-called static metamodel
@@ -19,8 +18,9 @@ used to generate these static metamodel classes.
 [NOTE]
 ====
 The Hibernate Static Metamodel Generator has many additional capabilities beyond static metamodel
-class generation.  See the link:{intg-guide}[Introduction Guide] for a complete discussion of its
-capabilities.  The rest of the discussion here is limited to the Jakarta Persistence static metamodel.
+class generation.  See the link:{doc-introduction-url}#generator[Introduction Guide] for a complete discussion of its
+capabilities, and link:{doc-data-repositories-url}[Repositories Guide] for the specifics of Jakarta Data and repositories.
+The rest of the discussion here is limited to the Jakarta Persistence static metamodel.
 
 The generator is expected to be run using the `javac` link:{ann-proc-path}[-processorpath] option.
 See the tool-specific discussions (<<tooling-gradle-modelgen,Gradle>>, <<tooling-maven-modelgen,Maven>>
@@ -38,7 +38,7 @@ a static metamodel class based on the following rules:
 * For each managed class `X` in package `p`, a metamodel class `X_` is created in package `p`.
 * The name of the metamodel class is derived from the name of the managed class by appending "_" to the managed class name.
 * The metamodel class `X_` must be annotated with the `jakarta.persistence.StaticMetamodel` annotation.  The generation
-can also be configured to add the `javax.annotation.processing.Generated` annotation.
+also adds the `jakarta.annotation.Generated` annotation (this can be disabled with a <<tooling-modelgen-options,configuration option>>).
 * If class `X` extends another class `S`, where `S` is the most derived managed class extended by `X`, then
 class `X_` must extend class `S_`, where `S_` is the metamodel class created for `S`.
 * For every persistent singular attribute `y` declared by class `X`, where the type of `y` is `Y`,
@@ -112,12 +112,16 @@ include::{toolingTestsDir}/modelgen/ModelGenTests.java[tags=tooling-modelgen-usa
 The Hibernate Static Metamodel Generator accepts a number of configuration options, which are specified as
 part of the `javac` execution using standard link:{ann-proc-options}[-A] options -
 
-`-Adebug=[true|false]`:: Enables debug logging from the generator.
-`-AfullyAnnotationConfigured=[true|false]`:: Controls whether `orm.xml` mapping should be considered.
+`-Adebug=[true|false]`:: Enables debug logging from the generator. (Default: `false`)
+`-AfullyAnnotationConfigured=[true|false]`:: Controls whether `orm.xml` mapping should be considered. (Default: `false`)
 `-ApersistenceXml=[path]`:: Specifies the path to the `persistence.xml` file.
 `-AormXml=[path]`:: Specifies the path to an `orm.xml` file.
-`-AlazyXmlParsing=[true|false]`:: Controls whether the processor should attempt to determine whether any `orm.xml` files have changed.
-`-AaddGeneratedAnnotation=[true|false]`:: Controls whether the processor should add `@jakarta.annotation.Generated` to the generated classes.
-`-addGenerationDate=[true|false]`:: Controls whether the processor should add `@jakarta.annotation.Generated#date`.
-`-addSuppressWarningsAnnotation=[warning[,warning]*|true]`:: A comma-separated list of warnings to suppress, or simply `true` if `@SuppressWarnings({"deprecation","rawtypes"})` should be added to the generated classes.
-
+`-AlazyXmlParsing=[true|false]`:: Controls whether the processor should attempt to determine whether any `orm.xml` files have changed. (Default: `false`)
+`-AaddGeneratedAnnotation=[true|false]`:: Controls whether the processor should add `@jakarta.annotation.Generated` to the generated classes. (Default: `true`)
+`-AaddGenerationDate=[true|false]`:: Controls whether the processor should add `@jakarta.annotation.Generated#date`. (Default: `false`)
+`-AaddSuppressWarningsAnnotation=[warning[,warning]*|true]`:: A comma-separated list of warnings to suppress, or simply `true` if `@SuppressWarnings({"deprecation","rawtypes"})` should be added to the generated classes. (Default: No suppression)
+`-AsuppressJakartaDataMetamodel=[true|false]`:: Controls whether the processor should suppress Jakarta Data Metamodel even if Jakarta Data is available on the build path. (Default: `false`)
+`-Ainclude=[pattern[,pattern]*]`:: A comma-separated list of type patterns that should be included with `*` as wildcard. (Default: `*`)
+`-Aexclude=[pattern[,pattern]*]`:: A comma-separated list of type patterns that should be excluded with `*` as wildcard. (Default: empty)
+`-Aindex=[true|false]`:: Controls whether the processor should use a filesystem-based index of entity types and enums for use by the query validator to speed up query validation and thus compilation. (Default: `true`)
+`-AjakartaDataSortCompliance=[true|false]`:: Controls whether the processor should allow Jakarta Data repository interfaces that use `jakarta.data.Sort` types with a null type argument, which the Jakarta Data specification allows. (Default: `false`)
diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/reveng.adoc b/documentation/src/main/asciidoc/userguide/chapters/tooling/reveng.adoc
new file mode 100644
index 000000000000..632954f2fde8
--- /dev/null
+++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/reveng.adoc
@@ -0,0 +1,261 @@
+[[tooling-reveng]]
+=== Reverse Engineering
+
+Reverse engineering reads an existing database schema via JDBC and generates various artifacts
+from it.  This is useful for bootstrapping a Hibernate project from a legacy database, or for
+keeping generated code in sync as a schema evolves.
+
+See the tool-specific discussions (<<tooling-gradle-reveng,Gradle>>, <<tooling-maven-reveng,Maven>>
+and <<tooling-ant-reveng,Ant>>) for details on integrating reverse engineering into those environments.
+
+
+[[tooling-reveng-exporters]]
+==== Available Exporters
+
+The following artifacts can be generated from a database schema:
+
+Java entity classes:: Annotated Jakarta Persistence entity classes.
+Data Access Objects (DAOs):: DAO classes providing basic CRUD operations.
+`hbm.xml` mapping files:: Hibernate XML mapping files.
+`hibernate.cfg.xml`:: A configuration file listing the generated mappings.
+DDL scripts:: SQL schema creation and drop scripts.
+HTML documentation:: An HTML report describing the database schema.
+Custom FreeMarker templates:: User-defined templates for arbitrary code generation.
+
+Which exporters are available and how they are configured depends on the build tool.
+See <<tooling-gradle-reveng-tasks,Gradle tasks>>, <<tooling-maven-reveng-goals,Maven goals>>,
+or <<tooling-ant-reveng-exporters,Ant exporters>> for specifics.
+
+
+[[tooling-reveng-connection]]
+==== JDBC Connection Settings
+
+Reverse engineering connects to the database using settings from a `hibernate.properties` file:
+
+[source,properties]
+----
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:tcp://localhost/./mydb
+hibernate.connection.username=sa
+hibernate.connection.password=
+hibernate.default_catalog=MY_CATALOG
+hibernate.default_schema=PUBLIC
+----
+
+The JDBC driver must be available on the classpath (typically declared as a project dependency).
+The location of the properties file is configured in the build tool plugin -- see
+<<tooling-gradle-reveng-properties,Gradle>>, <<tooling-maven-reveng-common-params,Maven>>,
+or <<tooling-ant-reveng-configurations,Ant>> for details.
+
+
+[[tooling-reveng-config]]
+==== Reverse Engineering Configuration File
+
+An optional XML configuration file can be used to customize how the database schema is interpreted.
+The file uses the `hibernate-reverse-engineering` document type:
+
+[source,xml]
+----
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-reverse-engineering SYSTEM
+    "https://hibernate.org/dtd/hibernate-reverse-engineering-3.0.dtd">
+
+<hibernate-reverse-engineering>
+    <!-- configuration elements go here -->
+</hibernate-reverse-engineering>
+----
+
+The path to this file is configured via the build tool plugin (e.g. `revengFile` in Gradle and Maven,
+`revengfile` attribute on `<jdbcconfiguration>` in Ant).
+
+
+[[tooling-reveng-schema-selection]]
+===== Schema Selection
+
+By default, reverse engineering reads all tables visible to the JDBC connection.
+Use `<schema-selection>` elements to restrict which catalogs, schemas, or tables are processed:
+
+[source,xml]
+----
+<hibernate-reverse-engineering>
+    <!-- Only process tables in the PUBLIC schema -->
+    <schema-selection match-schema="PUBLIC"/>
+
+    <!-- Only process a specific table -->
+    <schema-selection match-schema="PUBLIC" match-table="CUSTOMER"/>
+</hibernate-reverse-engineering>
+----
+
+The `match-catalog`, `match-schema`, and `match-table` attributes accept SQL `LIKE` patterns
+(e.g. `match-table="PROD_%"`).
+
+
+[[tooling-reveng-type-mapping]]
+===== Type Mappings
+
+The `<type-mapping>` element overrides how SQL types are mapped to Hibernate types:
+
+[source,xml]
+----
+<type-mapping>
+    <!-- Map single-character VARCHAR columns to yes_no type -->
+    <sql-type jdbc-type="VARCHAR" length="1" hibernate-type="yes_no"/>
+
+    <!-- Map NUMERIC(10,2) to BigDecimal -->
+    <sql-type jdbc-type="NUMERIC" precision="10" scale="2"
+              hibernate-type="big_decimal"/>
+</type-mapping>
+----
+
+Each `<sql-type>` element supports the following attributes:
+
+`jdbc-type`:: The JDBC type name (e.g. `VARCHAR`, `INTEGER`, `NUMERIC`). Required.
+`hibernate-type`:: The Hibernate type to use. Required.
+`length`:: Match only columns with this length.
+`precision`:: Match only columns with this precision.
+`scale`:: Match only columns with this scale.
+`not-null`:: Match only columns with this nullability (`true` or `false`).
+
+More specific mappings (those with more attributes) take precedence over less specific ones.
+
+
+[[tooling-reveng-table-filter]]
+===== Table Filters
+
+`<table-filter>` elements control which tables are included or excluded, and can assign
+a package name to the generated classes:
+
+[source,xml]
+----
+<!-- Assign a package to tables matching a pattern -->
+<table-filter match-name="PROD_.*" package="com.example.product"/>
+
+<!-- Exclude audit tables -->
+<table-filter match-name=".*_AUD" exclude="true"/>
+----
+
+The `match-catalog`, `match-schema`, and `match-name` attributes accept regular expression patterns.
+
+
+[[tooling-reveng-table]]
+===== Per-Table Configuration
+
+The `<table>` element provides fine-grained control over individual tables:
+
+[source,xml]
+----
+<table name="CUSTOMER" class="Customer">
+
+    <!-- Primary key configuration -->
+    <primary-key property="id">
+        <generator class="sequence">
+            <param name="sequence_name">CUST_SEQ</param>
+        </generator>
+    </primary-key>
+
+    <!-- Column overrides -->
+    <column name="CUST_NAME" property="name" type="string"/>
+    <column name="INTERNAL_CODE" exclude="true"/>
+
+    <!-- Foreign key overrides -->
+    <foreign-key constraint-name="FK_CUST_ADDR">
+        <many-to-one property="address"/>
+        <set property="customers" exclude="false"/>
+    </foreign-key>
+
+</table>
+----
+
+The `<table>` element supports the following attributes:
+
+`name`:: The table name. Required.
+`catalog`:: The catalog name.
+`schema`:: The schema name.
+`class`:: The Java class name to use instead of the default derived name.
+
+The `<primary-key>` child element controls identifier generation. It accepts a `property` attribute
+for the property name, and nested `<key-column>` and `<generator>` elements.
+
+The `<column>` child element overrides individual column mappings. It accepts `name` (required),
+`property`, `type`, and `exclude` attributes.
+
+The `<foreign-key>` child element customizes association mappings for a specific foreign key
+constraint. It accepts `constraint-name` and `foreign-table` attributes, and can contain
+`<many-to-one>`, `<set>`, `<one-to-one>`, and `<inverse-one-to-one>` child elements to control
+the generated association properties.
+
+
+[[tooling-reveng-detection]]
+==== Detection Settings
+
+The build tool plugins expose several boolean settings that control how relationships and special
+columns are detected:
+
+`detectManyToMany`:: When `true`, pure link tables (tables whose primary key consists entirely of
+two foreign keys and no other columns) are mapped as `@ManyToMany` associations instead of generating
+an entity for the link table. Default: `true`.
+
+`detectOneToOne`:: When `true`, foreign keys that are also the primary key of their table are mapped
+as `@OneToOne` associations. Default: `true`.
+
+`detectOptimisticLock`:: When `true`, columns named `VERSION`, `TIMESTAMP`, or `DBTIMESTAMP` with
+appropriate types are mapped as `@Version` properties. Default: `true`.
+
+These settings are configured in the build tool plugin.  See
+<<tooling-maven-reveng-common-params,Maven>> or <<tooling-ant-reveng-configurations,Ant>> for details.
+
+
+[[tooling-reveng-custom-strategy]]
+==== Custom Strategies
+
+For programmatic control over reverse engineering, implement the
+`org.hibernate.tool.reveng.api.core.RevengStrategy` interface. This interface provides callbacks
+for customizing class names, property names, type mappings, association handling, and more.
+
+The simplest approach is to extend `DelegatingStrategy`, which wraps another strategy and
+delegates all methods to it. Override only the methods you need to customize:
+
+[source,java]
+----
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.DelegatingStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+
+public class MyStrategy extends DelegatingStrategy {
+
+    public MyStrategy(RevengStrategy delegate) {
+        super(delegate);
+    }
+
+    @Override
+    public String tableToClassName(TableIdentifier tableIdentifier) {
+        String className = super.tableToClassName(tableIdentifier);
+        // Add "Entity" suffix to all generated class names
+        return className + "Entity";
+    }
+
+    @Override
+    public boolean excludeTable(TableIdentifier ti) {
+        // Skip tables starting with "TMP_"
+        return ti.getName().startsWith("TMP_")
+            || super.excludeTable(ti);
+    }
+}
+----
+
+The custom strategy class must provide either a no-argument constructor or a constructor that
+accepts a `RevengStrategy` parameter (used as the delegate). It is specified via the
+`revengStrategy` configuration property in the build tool plugin.
+
+Key methods available for override:
+
+`tableToClassName`:: Controls the entity class name for a given table.
+`columnToPropertyName`:: Controls the property name for a given column.
+`columnToHibernateTypeName`:: Controls the Hibernate type mapping for a column.
+`excludeTable`:: Returns `true` to skip a table entirely.
+`excludeColumn`:: Returns `true` to skip a specific column.
+`isManyToManyTable`:: Returns `true` if a table should be treated as a many-to-many link table.
+`isOneToOne`:: Returns `true` if a foreign key represents a one-to-one relationship.
+`getTableIdentifierStrategyName`:: Controls the identifier generation strategy for a table.
+`foreignKeyToCollectionName`:: Controls the property name for a collection association.
+`foreignKeyToEntityName`:: Controls the property name for a many-to-one association.
diff --git a/documentation/src/main/asciidoc/userguide/index.adoc b/documentation/src/main/asciidoc/userguide/index.adoc
index b438b52ab2c4..c5144accff72 100644
--- a/documentation/src/main/asciidoc/userguide/index.adoc
+++ b/documentation/src/main/asciidoc/userguide/index.adoc
@@ -45,6 +45,7 @@ include::chapters/beans/Beans.adoc[]
 include::chapters/portability/Portability.adoc[]
 include::chapters/statistics/Statistics.adoc[]
 include::chapters/tooling/Tooling.adoc[]
+include::chapters/assistant/Assistant.adoc[]
 include::appendices/BestPractices.adoc[]
 
 include::Credits.adoc[]
diff --git a/edb/edb13.Dockerfile b/edb/edb13.Dockerfile
deleted file mode 100644
index 3467d71715bc..000000000000
--- a/edb/edb13.Dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-FROM quay.io/enterprisedb/edb-postgres-advanced:13.20-3.5-postgis
-USER root
-# this 777 will be replaced by 700 at runtime (allows semi-arbitrary "--user" values)
-RUN chown -R postgres:postgres /var/lib/edb && chmod 777 /var/lib/edb && rm /docker-entrypoint-initdb.d/10_postgis.sh
-
-USER postgres
-ENV LANG en_US.utf8
-ENV PG_MAJOR 13
-ENV PG_VERSION 13
-ENV PGPORT 5444
-ENV PGDATA /var/lib/edb/as$PG_MAJOR/data/
-VOLUME /var/lib/edb/as$PG_MAJOR/data/
-
-COPY docker-entrypoint.sh /usr/local/bin/
-ENTRYPOINT ["docker-entrypoint.sh"]
-
-# We set the default STOPSIGNAL to SIGINT, which corresponds to what PostgreSQL
-# calls "Fast Shutdown mode" wherein new connections are disallowed and any
-# in-progress transactions are aborted, allowing PostgreSQL to stop cleanly and
-# flush tables to disk, which is the best compromise available to avoid data
-# corruption.
-#
-# Users who know their applications do not keep open long-lived idle connections
-# may way to use a value of SIGTERM instead, which corresponds to "Smart
-# Shutdown mode" in which any existing sessions are allowed to finish and the
-# server stops when all sessions are terminated.
-#
-# See https://www.postgresql.org/docs/12/server-shutdown.html for more details
-# about available PostgreSQL server shutdown signals.
-#
-# See also https://www.postgresql.org/docs/12/server-start.html for further
-# justification of this as the default value, namely that the example (and
-# shipped) systemd service files use the "Fast Shutdown mode" for service
-# termination.
-#
-STOPSIGNAL SIGINT
-#
-# An additional setting that is recommended for all users regardless of this
-# value is the runtime "--stop-timeout" (or your orchestrator/runtime's
-# equivalent) for controlling how long to wait between sending the defined
-# STOPSIGNAL and sending SIGKILL (which is likely to cause data corruption).
-#
-# The default in most runtimes (such as Docker) is 10 seconds, and the
-# documentation at https://www.postgresql.org/docs/12/server-start.html notes
-# that even 90 seconds may not be long enough in many instances.
-
-EXPOSE 5444
-CMD ["postgres"]
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 55e1337400f0..308945c3e852 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,5 @@
 db=h2
+dbVersion=latest
 
 # Keep all these properties in sync unless you know what you are doing!
 # We set '-Dlog4j2.disableJmx=true' to prevent classloader leaks triggered by the logger.
diff --git a/gradle/version.properties b/gradle/version.properties
index 8f31599e762f..55648eea5b12 100644
--- a/gradle/version.properties
+++ b/gradle/version.properties
@@ -1 +1 @@
-hibernateVersion=7.2.0-SNAPSHOT
\ No newline at end of file
+hibernateVersion=7.4.0-SNAPSHOT
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8bdaf60c75ab..61285a659d17 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e1113280ef1..dbc3ce4a040f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index ef07e0162b18..adff685a0348 100755
--- a/gradlew
+++ b/gradlew
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
diff --git a/gradlew.bat b/gradlew.bat
index 5eed7ee84528..e509b2dd8fe5 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java b/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java
index ddbc596fdd0b..32773385011b 100644
--- a/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java
+++ b/hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java
@@ -7,6 +7,7 @@
 import java.io.Serial;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.time.Duration;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -17,7 +18,6 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.JdbcSettings;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
 import org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProviderConfigurationException;
@@ -36,6 +36,7 @@
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.toMap;
 import static org.hibernate.cfg.AgroalSettings.AGROAL_CONFIG_PREFIX;
+import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.extractIsolation;
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getCatalog;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getDriverName;
@@ -82,7 +83,7 @@ public class AgroalConnectionProvider implements ConnectionProvider, Configurabl
 	// --- Configurable
 
 	private static String extractIsolationAsString(Map<String, Object> properties) {
-		final Integer isolation = ConnectionProviderInitiator.extractIsolation( properties );
+		final Integer isolation = extractIsolation( properties );
 		return isolation != null
 				// Agroal resolves transaction isolation from the 'nice' name
 				? toIsolationNiceName( isolation )
@@ -115,7 +116,8 @@ public void configure(Map<String, Object> properties) throws HibernateException
 								: String.valueOf( 10 );
 				config.put( AgroalSettings.AGROAL_MAX_SIZE, maxSize );
 			}
-			final var agroalProperties = new AgroalPropertiesReader( CONFIG_PREFIX ).readProperties( config );
+			final var agroalProperties =
+					new AgroalPropertiesReader( CONFIG_PREFIX ).readProperties( config );
 			agroalProperties.modify()
 					.connectionPoolConfiguration( cp -> cp.connectionFactoryConfiguration( cf -> {
 				copyProperty( properties, JdbcSettings.DRIVER, cf::connectionProviderClassName, identity() );
@@ -123,6 +125,8 @@ public void configure(Map<String, Object> properties) throws HibernateException
 				copyProperty( properties, JdbcSettings.USER, cf::principal, NamePrincipal::new );
 				copyProperty( properties, JdbcSettings.PASS, cf::credential, SimplePassword::new );
 				copyProperty( properties, JdbcSettings.AUTOCOMMIT, cf::autoCommit, Boolean::valueOf );
+				copyProperty( properties, JdbcSettings.LOGIN_TIMEOUT, cf::loginTimeout,
+						value -> Duration.ofSeconds( Integer.parseInt( value ) ) );
 				resolveIsolationSetting( properties, cf );
 				return cf;
 			} ) );
diff --git a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java
index 6d85d2adc478..2cd5ef65ea0d 100644
--- a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java
+++ b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java
@@ -39,6 +39,7 @@
 import static org.hibernate.cfg.C3p0Settings.C3P0_MAX_STATEMENTS;
 import static org.hibernate.cfg.C3p0Settings.C3P0_MIN_SIZE;
 import static org.hibernate.cfg.C3p0Settings.C3P0_TIMEOUT;
+import static org.hibernate.cfg.JdbcSettings.LOGIN_TIMEOUT;
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.extractIsolation;
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.extractSetting;
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.getConnectionProperties;
@@ -98,14 +99,25 @@ public class C3P0ConnectionProvider
 
 	@Override
 	public Connection getConnection() throws SQLException {
-		final Connection connection = dataSource.getConnection();
+		final var connection = dataSource.getConnection();
+		prepareConnection( connection );
+		return connection;
+	}
+
+	@Override
+	public Connection getConnection(String user, String password) throws SQLException {
+		final var connection = dataSource.getConnection( user, password );
+		prepareConnection( connection );
+		return connection;
+	}
+
+	private void prepareConnection(Connection connection) throws SQLException {
 		if ( isolation != null && isolation != connection.getTransactionIsolation() ) {
 			connection.setTransactionIsolation( isolation );
 		}
 		if ( connection.getAutoCommit() != autocommit ) {
 			connection.setAutoCommit( autocommit );
 		}
-		return connection;
 	}
 
 	@Override
@@ -159,10 +171,20 @@ public void configure(Map<String, Object> properties) {
 		autocommit = getBoolean( JdbcSettings.AUTOCOMMIT, properties ); // defaults to false
 		isolation = extractIsolation( properties );
 
-		final Properties connectionProps = getConnectionProperties( properties );
+		final var connectionProps = getConnectionProperties( properties );
 		final var poolSettings = poolSettings( properties );
 		dataSource = createDataSource( jdbcUrl, connectionProps, poolSettings );
 
+		final Integer loginTimeout = getInteger( LOGIN_TIMEOUT, properties );
+		if ( loginTimeout != null ) {
+			try {
+				dataSource.setLoginTimeout( loginTimeout );
+			}
+			catch (SQLException e) {
+				CONNECTION_INFO_LOGGER.couldNotSetLoginTimeout( e );
+			}
+		}
+
 		try ( var connection = dataSource.getConnection() ) {
 			final Integer fetchSize = getFetchSize( connection );
 			final boolean hasSchema = hasSchema( connection );
diff --git a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java
index fde5cf50a2db..dd10aa428eac 100644
--- a/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java
+++ b/hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java
@@ -14,6 +14,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.WARN;
 
@@ -32,7 +33,7 @@
 public interface C3P0MessageLogger extends ConnectionInfoLogger {
 	String NAME = ConnectionInfoLogger.LOGGER_NAME + ".c3p0";
 
-	C3P0MessageLogger C3P0_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), C3P0MessageLogger.class, NAME );
+	C3P0MessageLogger C3P0_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), C3P0MessageLogger.class, NAME, Locale.ROOT );
 
 	/**
 	 * Log a message (WARN) about conflicting {@code hibernate.c3p0.XYZ} and {@code c3p0.XYZ} settings
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java
index 83b691ec7557..07832acc1339 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CockroachLegacyDialect.java
@@ -141,6 +141,7 @@
  * A {@linkplain Dialect SQL dialect} for CockroachDB.
  *
  * @author Gavin King
+ * @author Yoobin Yoon
  */
 public class CockroachLegacyDialect extends Dialect {
 
@@ -272,6 +273,11 @@ public JdbcType resolveSqlTypeDescriptor(
 			int scale,
 			JdbcTypeRegistry jdbcTypeRegistry) {
 		switch ( jdbcTypeCode ) {
+			case VARCHAR:
+				if ( "text".equals( columnTypeName ) && precision == Integer.MAX_VALUE ) {
+					jdbcTypeCode = LONG32VARCHAR;
+				}
+				break;
 			case OTHER:
 				switch ( columnTypeName ) {
 					case "uuid":
@@ -322,6 +328,20 @@ public JdbcType resolveSqlTypeDescriptor(
 		return jdbcTypeRegistry.getDescriptor( jdbcTypeCode );
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		switch ( typeCode1 ) {
+			// On CockroachDB, we use the same DDL type, so treat the types as equivalent
+			case LONG32VARCHAR, LONG32NVARCHAR, CLOB, NCLOB:
+				switch ( typeCode2 ) {
+					case LONG32VARCHAR, LONG32NVARCHAR, CLOB, NCLOB:
+						return true;
+				}
+			default:
+				return super.equivalentTypes( typeCode1, typeCode2 );
+		}
+	}
+
 	@Override
 	protected Integer resolveSqlTypeCode(String columnTypeName, TypeConfiguration typeConfiguration) {
 		return switch ( columnTypeName ) {
@@ -405,7 +425,7 @@ protected void contributeCockroachTypes(TypeContributions typeContributions, Ser
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 
@@ -485,6 +505,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arraySlice_operator();
 		functionFactory.arrayReplace();
 		functionFactory.arrayTrim_unnest();
+		functionFactory.arrayReverse_unnest();
+		functionFactory.arraySort_unnest();
 		functionFactory.arrayFill_cockroachdb();
 		functionFactory.arrayToString_postgresql();
 
@@ -517,6 +539,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionContributions.getFunctionRegistry().register(
 				"trunc",
 				new PostgreSQLTruncFunction(
+						true,
 						getVersion().isSameOrAfter( 22, 2 ),
 						functionContributions.getTypeConfiguration()
 				)
@@ -560,6 +583,11 @@ public String getCurrentTimestampSelectString() {
 		return "select now()";
 	}
 
+	@Override
+	public boolean isCurrentTimestampStable() {
+		return true;
+	}
+
 	@Override
 	public boolean supportsDistinctFromPredicate() {
 		return true;
@@ -590,6 +618,17 @@ public IdentityColumnSupport getIdentityColumnSupport() {
 		return CockroachDBIdentityColumnSupport.INSTANCE;
 	}
 
+	@Override
+	public String getAlterColumnTypeString(String columnName, String columnType, String columnDefinition) {
+		// would need multiple statements to 'set not null'/'drop not null', 'set default'/'drop default', 'set generated', etc
+		return "alter column " + columnName + " set data type " + columnType;
+	}
+
+	@Override
+	public boolean supportsAlterColumnType() {
+		return true;
+	}
+
 	@Override
 	public boolean supportsValuesList() {
 		return true;
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDatabase.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDatabase.java
index 38704ad505ff..f6445fa271d2 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDatabase.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CommunityDatabase.java
@@ -228,6 +228,22 @@ public String getDriverClassName(String jdbcUrl) {
 		}
 	},
 
+	SPANNER_PG {
+		@Override
+		public Dialect createDialect(DialectResolutionInfo info) {
+			return new SpannerPostgreSQLDialect( info );
+		}
+		@Override
+		public boolean productNameMatches(String databaseName) {
+			return databaseName.equals( "Google Cloud Spanner PostgreSQL" );
+		}
+		@Override
+		public String getDriverClassName(String jdbcUrl) {
+			return "com.google.cloud.spanner.jdbc.JdbcDriver";
+		}
+	},
+
+
 	DERBY {
 		@Override
 		public Dialect createDialect(DialectResolutionInfo info) {
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java
index 82810235d43e..04270bd3699b 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java
@@ -1135,7 +1135,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullResolvingJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacySqlAstTranslator.java
index 0b317ad48713..957fff784fa9 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacySqlAstTranslator.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacySqlAstTranslator.java
@@ -4,12 +4,15 @@
  */
 package org.hibernate.community.dialect;
 
+import java.util.List;
+
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
+import org.hibernate.sql.ast.tree.expression.SqlTupleContainer;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 
@@ -56,6 +59,20 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 		renderComparisonStandard( lhs, operator, rhs );
 	}
 
+	@Override
+	protected void renderExpressionsAsValuesSubquery(int tupleSize, List<Expression> listExpressions) {
+		// DB2 for i supports type-inference in this special VALUES expression, but not if it's wrapped as SELECT
+		appendSql( "values" );
+		char separator = ' ';
+		for ( Expression expression : listExpressions ) {
+			appendSql( separator );
+			appendSql( OPEN_PARENTHESIS );
+			renderCommaSeparated( SqlTupleContainer.getSqlTuple( expression ).getExpressions() );
+			appendSql( CLOSE_PARENTHESIS );
+			separator = ',';
+		}
+	}
+
 	@Override
 	public DatabaseVersion getDB2Version() {
 		return DB2_LUW_VERSION9;
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacySqlAstTranslator.java
index 7bbd45a1cc84..b218e7ad8e18 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacySqlAstTranslator.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacySqlAstTranslator.java
@@ -66,6 +66,12 @@ protected String getNewTableChangeModifier() {
 		return "final";
 	}
 
+	@Override
+	protected boolean preferUnionQueryForTupleInListPredicate() {
+		// DB2 z/OS can't use an index when rendering a union query
+		return false;
+	}
+
 	@Override
 	public DatabaseVersion getDB2Version() {
 		return DB2_LUW_VERSION9;
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java
index 5cb7bc92015d..ab10429cd830 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java
@@ -671,7 +671,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullResolvingJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java
index 38c77c1a2b65..2d31d2f6b2bf 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java
@@ -666,7 +666,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullResolvingJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBArrayJdbcType.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBArrayJdbcType.java
index 0f8f03695b30..f40daa2aa0d9 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBArrayJdbcType.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBArrayJdbcType.java
@@ -10,7 +10,6 @@
 import java.sql.Types;
 
 import org.hibernate.HibernateException;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.BasicPluralJavaType;
@@ -35,63 +34,68 @@ public GaussDBArrayJdbcType(JdbcType elementJdbcType) {
 
 	@Override
 	public <X> ValueBinder<X> getBinder(final JavaType<X> javaTypeDescriptor) {
-		@SuppressWarnings("unchecked")
-		final BasicPluralJavaType<X> pluralJavaType = (BasicPluralJavaType<X>) javaTypeDescriptor;
-		final ValueBinder<X> elementBinder = getElementJdbcType().getBinder( pluralJavaType.getElementJavaType() );
-		return new BasicBinder<>( javaTypeDescriptor, this ) {
+		return new Binder<>( javaTypeDescriptor,
+				(BasicPluralJavaType<?>) javaTypeDescriptor );
+	}
 
-			@Override
-			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-				st.setArray( index, getArray( value, options ) );
-			}
+	private class Binder<X,E> extends BasicBinder<X> {
+		private final BasicPluralJavaType<E> pluralJavaType;
 
-			@Override
-			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
-					throws SQLException {
-				final java.sql.Array arr = getArray( value, options );
-				try {
-					st.setObject( name, arr, java.sql.Types.ARRAY );
-				}
-				catch (SQLException ex) {
-					throw new HibernateException( "JDBC driver does not support named parameters for setArray. Use positional.", ex );
-				}
-			}
+		private Binder(JavaType<X> javaType, BasicPluralJavaType<E> pluralJavaType) {
+			super( javaType, GaussDBArrayJdbcType.this );
+			this.pluralJavaType = pluralJavaType;
+		}
+
+		@Override
+		protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
+				throws SQLException {
+			st.setArray( index, getArray( value, options ) );
+		}
 
-			@Override
-			public Object getBindValue(X value, WrapperOptions options) throws SQLException {
-				return ( (GaussDBArrayJdbcType) getJdbcType() ).getArray( this, elementBinder, value, options );
+		@Override
+		protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+				throws SQLException {
+			final java.sql.Array arr = getArray( value, options );
+			try {
+				st.setObject( name, arr, Types.ARRAY );
 			}
+			catch (SQLException ex) {
+				throw new HibernateException(
+						"JDBC driver does not support named parameters for setArray. Use positional.", ex );
+			}
+		}
+
+		@Override
+		public Object[] getBindValue(X value, WrapperOptions options) throws SQLException {
+			final var elementBinder = getElementJdbcType().getBinder( pluralJavaType.getElementJavaType() );
+			return convertToArray( this, elementBinder, pluralJavaType, value, options );
+		}
 
-			private java.sql.Array getArray(X value, WrapperOptions options) throws SQLException {
-				final GaussDBArrayJdbcType arrayJdbcType = (GaussDBArrayJdbcType) getJdbcType();
-				final Object[] objects;
+		private java.sql.Array getArray(X value, WrapperOptions options) throws SQLException {
+			final var session = options.getSession();
+			return session.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection()
+					.createArrayOf( getElementTypeName( getJavaType(), session ),
+							elements( value, options, GaussDBArrayJdbcType.this ) );
+		}
 
-				final JdbcType elementJdbcType = arrayJdbcType.getElementJdbcType();
-				if ( elementJdbcType instanceof AggregateJdbcType ) {
-					// The GaussDB JDBC driver does not support arrays of structs, which contain byte[]
-					final AggregateJdbcType aggregateJdbcType = (AggregateJdbcType) elementJdbcType;
-					final Object[] domainObjects = getJavaType().unwrap(
-							value,
-							Object[].class,
-							options
-					);
-					objects = new Object[domainObjects.length];
-					for ( int i = 0; i < domainObjects.length; i++ ) {
-						if ( domainObjects[i] != null ) {
-							objects[i] = aggregateJdbcType.createJdbcValue( domainObjects[i], options );
-						}
+		private Object[] elements(X value, WrapperOptions options, GaussDBArrayJdbcType arrayJdbcType)
+				throws SQLException {
+			final var elementJdbcType = arrayJdbcType.getElementJdbcType();
+			if ( elementJdbcType instanceof AggregateJdbcType aggregateJdbcType ) {
+				// The GaussDB JDBC driver does not support arrays of structs, which contain byte[]
+				final var domainObjects = getJavaType().unwrap( value, Object[].class, options );
+				final var objects = new Object[domainObjects.length];
+				for ( int i = 0; i < domainObjects.length; i++ ) {
+					if ( domainObjects[i] != null ) {
+						objects[i] = aggregateJdbcType.createJdbcValue( domainObjects[i], options );
 					}
 				}
-				else {
-					objects = arrayJdbcType.getArray( this, elementBinder, value, options );
-				}
-
-				final SharedSessionContractImplementor session = options.getSession();
-				final String typeName = arrayJdbcType.getElementTypeName( getJavaType(), session );
-				return session.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection()
-						.createArrayOf( typeName, objects );
+				return objects;
+			}
+			else {
+				return getBindValue( value, options );
 			}
-		};
+		}
 	}
 
 	@Override
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java
index ec1882995618..c4abd86b5dc1 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java
@@ -1270,7 +1270,7 @@ protected void contributeGaussDBTypes(TypeContributions typeContributions) {
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java
index 8df31e5d4d5d..115595f6683a 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java
@@ -128,6 +128,7 @@
  *
  * @author Thomas Mueller
  * @author Jürgen Kreitler
+ * @author Yoobin Yoon
  */
 public class H2LegacyDialect extends Dialect {
 
@@ -409,6 +410,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 				functionFactory.arraySlice();
 				functionFactory.arrayReplace_h2( getMaximumArraySize() );
 				functionFactory.arrayTrim_trim_array();
+				functionFactory.arrayReverse_h2( getMaximumArraySize() );
+				functionFactory.arraySort_h2( getMaximumArraySize() );
 				functionFactory.arrayFill_h2();
 				functionFactory.arrayToString_h2( getMaximumArraySize() );
 
@@ -888,6 +891,11 @@ public String getCurrentTimestampSelectString() {
 		return "call current_timestamp()";
 	}
 
+	@Override
+	public boolean isCurrentTimestampStable() {
+		return true;
+	}
+
 
 	// Overridden informational metadata ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java
index 2f93f805a350..c531111832c9 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacyDialect.java
@@ -935,6 +935,11 @@ public Identifier toIdentifier(String text, boolean quoted) {
 				return normalizeQuoting( Identifier.toIdentifier( text, quoted ) );
 			}
 
+			@Override
+			public Identifier toIdentifier(String text, boolean quoted, boolean isExplicit) {
+				return normalizeQuoting( Identifier.toIdentifier( text, quoted, false, isExplicit ) );
+			}
+
 			@Override
 			public Identifier normalizeQuoting(Identifier identifier) {
 				Identifier normalizedIdentifier = this.helper.normalizeQuoting( identifier );
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java
index 6b53fe514060..c55d6f81a2d0 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacyDialect.java
@@ -95,6 +95,7 @@
  * @author Christoph Sturm
  * @author Phillip Baird
  * @author Fred Toussi
+ * @author Yoobin Yoon
  */
 public class HSQLLegacyDialect extends Dialect {
 
@@ -269,6 +270,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arraySlice_unnest();
 		functionFactory.arrayReplace_unnest();
 		functionFactory.arrayTrim_trim_array();
+		functionFactory.arrayReverse_unnest();
+		functionFactory.arraySort_hsql();
 		functionFactory.arrayFill_hsql();
 		functionFactory.arrayToString_hsql();
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java
index 18b4ba25d4a7..6a1239f0cf0b 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java
@@ -29,7 +29,9 @@
 import org.hibernate.dialect.NullOrdering;
 import org.hibernate.dialect.Replacer;
 import org.hibernate.dialect.SelectItemReferenceStrategy;
+import org.hibernate.dialect.function.CountFunction;
 import org.hibernate.dialect.function.InsertSubstringOverlayEmulation;
+import org.hibernate.dialect.function.TruncFunction;
 import org.hibernate.dialect.function.TrimFunction;
 import org.hibernate.community.dialect.temptable.InformixLocalTemporaryTableStrategy;
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
@@ -45,7 +47,6 @@
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
 import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
 import org.hibernate.type.BasicType;
-import org.hibernate.dialect.lock.internal.LockingSupportSimple;
 import org.hibernate.dialect.lock.spi.LockingSupport;
 import org.hibernate.type.descriptor.jdbc.VarcharUUIDJdbcType;
 import org.hibernate.dialect.function.CaseLeastGreatestEmulation;
@@ -341,7 +342,6 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.instr();
 		functionFactory.substr();
 		functionFactory.substringFromFor();
-		functionFactory.trunc();
 		functionFactory.trim2();
 		functionFactory.space();
 		functionFactory.reverse();
@@ -396,7 +396,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 
 		if ( supportsWindowFunctions() ) {
 			functionFactory.windowFunctions();
-			functionFactory.hypotheticalOrderedSetAggregates();
+			functionFactory.hypotheticalOrderedSetAggregates_windowEmulation();
 		}
 
 		functionRegistry.register( "overlay",
@@ -415,6 +415,35 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 				new TrimFunction( this, typeConfiguration, SqlAstNodeRenderingMode.NO_UNTYPED ) );
 
 		functionRegistry.register( "regexp_like", new InformixRegexpLikeFunction( typeConfiguration ) );
+
+		functionRegistry.register(
+				"trunc",
+				new TruncFunction(
+						"trunc(?1)",
+						"trunc(?1*pow(10,?2))/pow(10,?2)",
+						null,
+						null,
+						typeConfiguration
+				)
+		);
+		functionRegistry.registerAlternateKey( "truncate", "trunc" );
+
+		// For the count distinct emulation distinct
+		functionContributions.getFunctionRegistry().register(
+				"count",
+				new CountFunction(
+						this,
+						functionContributions.getTypeConfiguration(),
+						SqlAstNodeRenderingMode.DEFAULT,
+						"count",
+						"||",
+						null,
+						false,
+						null,
+						// Use chr(1), because chr(0) produces NULL
+						1
+				)
+		);
 	}
 
 	@Override
@@ -473,7 +502,9 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 	@Override
 	public String extractPattern(TemporalUnit unit) {
 		return switch ( unit ) {
-			case SECOND -> getVersion().isBefore( 11, 70 ) ?	"to_number(to_char(?2,'%S%F3'))" : "to_number(to_char(?2,'%S.%F3'))";
+			case SECOND -> getVersion().isBefore( 11, 70 )
+					? "to_number(to_char(?2,'%S%F3'))"
+					: "to_number(to_char(?2,'%S.%F3'))";
 			case MINUTE -> "to_number(to_char(?2,'%M'))";
 			case HOUR -> "to_number(to_char(?2,'%H'))";
 			case DAY_OF_WEEK -> "(weekday(?2)+1)";
@@ -541,10 +572,21 @@ public String getAddPrimaryKeyConstraintString(String constraintName) {
 		return " add constraint primary key constraint " + constraintName + " ";
 	}
 
+	@Override
+	public String getAlterColumnTypeString(String columnName, String columnType, String columnDefinition) {
+		return "modify (" + columnName + " " + columnDefinition + ")";
+	}
+
+	@Override
+	public boolean supportsAlterColumnType() {
+		return true;
+	}
+
 	@Override
 	public String getTruncateTableStatement(String tableName) {
-		return super.getTruncateTableStatement( tableName ) + " reuse storage"
-				+ ( getVersion().isSameOrAfter( 12, 10 ) ? " keep statistics" : "" );
+		// Use delete instead of truncate, because truncate will fail if another connection still holds a lock
+		// https://www.ibm.com/docs/en/informix-servers/12.10.0?topic=statement-restrictions-truncate
+		return "delete from " + tableName;
 	}
 
 	@Override
@@ -579,16 +621,7 @@ public LimitHandler getLimitHandler() {
 
 	@Override
 	public LockingSupport getLockingSupport() {
-		// TODO: need a custom impl, because:
-		//       1. Informix does not support 'skip locked'
-		//       2. Informix does not allow 'for update' with joins
-		return LockingSupportSimple.STANDARD_SUPPORT;
-	}
-
-	// TODO: remove once we have a custom LockingSupport impl
-	@Override @Deprecated(forRemoval = true)
-	public boolean supportsSkipLocked() {
-		return false;
+		return InformixLockingSupport.LOCKING_SUPPORT;
 	}
 
 	@Override
@@ -778,7 +811,9 @@ public boolean isCurrentTimestampSelectStringCallable() {
 
 	@Override
 	public String getCurrentTimestampSelectString() {
-		return "select sysdate" + (getVersion().isBefore( 12, 10 ) ? " from informix.systables where tabid=1" : "");
+		return getVersion().isBefore( 12, 10 )
+				? "select sysdate from informix.systables where tabid=1"
+				: "select sysdate";
 	}
 
 	@Override @SuppressWarnings("deprecation")
@@ -968,11 +1003,17 @@ public String currentDate() {
 
 	@Override
 	public String currentTime() {
+		// means 'current hour to fraction(3)'
+		// but note that subsecond precision
+		// requires USEOSTIME config parameter
 		return "current hour to fraction";
 	}
 
 	@Override
 	public String currentTimestamp() {
+		// means 'current year to fraction(3)'
+		// but note that subsecond precision
+		// requires USEOSTIME config parameter
 		return "current";
 	}
 
@@ -1128,7 +1169,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 	}
@@ -1173,6 +1214,11 @@ public boolean supportsRowValueConstructorSyntaxInInList() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsTupleDistinctCounts() {
+		return false;
+	}
+
 	@Override
 	public boolean supportsWithClause() {
 		return getVersion().isSameOrAfter( 14,10 );
@@ -1194,6 +1240,8 @@ public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, @
 
 	@Override
 	public DmlTargetColumnQualifierSupport getDmlTargetColumnQualifierSupport() {
-		return getVersion().isSameOrAfter( 12,10 ) ? DmlTargetColumnQualifierSupport.TABLE_ALIAS : DmlTargetColumnQualifierSupport.NONE;
+		return getVersion().isSameOrAfter( 12,10 )
+				? DmlTargetColumnQualifierSupport.TABLE_ALIAS
+				: DmlTargetColumnQualifierSupport.NONE;
 	}
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixLockingSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixLockingSupport.java
new file mode 100644
index 000000000000..6aaafa0a9ecf
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixLockingSupport.java
@@ -0,0 +1,110 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect;
+
+import jakarta.persistence.Timeout;
+import org.hibernate.HibernateException;
+import org.hibernate.Timeouts;
+import org.hibernate.dialect.RowLockStrategy;
+import org.hibernate.dialect.lock.internal.Helper;
+import org.hibernate.dialect.lock.spi.ConnectionLockTimeoutStrategy;
+import org.hibernate.dialect.lock.spi.LockTimeoutType;
+import org.hibernate.dialect.lock.spi.LockingSupport;
+import org.hibernate.dialect.lock.spi.OuterJoinLockingType;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+
+import java.sql.Connection;
+
+import static org.hibernate.Timeouts.NO_WAIT_MILLI;
+import static org.hibernate.Timeouts.SKIP_LOCKED_MILLI;
+import static org.hibernate.Timeouts.WAIT_FOREVER_MILLI;
+
+public class InformixLockingSupport implements LockingSupport, LockingSupport.Metadata, ConnectionLockTimeoutStrategy {
+	public static final LockingSupport LOCKING_SUPPORT = new InformixLockingSupport();
+
+	public InformixLockingSupport() {
+	}
+
+	@Override
+	public Metadata getMetadata() {
+		return this;
+	}
+
+	@Override
+	public RowLockStrategy getWriteRowLockStrategy() {
+		return RowLockStrategy.COLUMN;
+	}
+
+	@Override
+	public LockTimeoutType getLockTimeoutType(Timeout timeout) {
+		return switch ( timeout.milliseconds() ) {
+			case SKIP_LOCKED_MILLI -> LockTimeoutType.NONE;
+			// we can apply a timeout via the connection
+			default -> LockTimeoutType.CONNECTION;
+		};
+	}
+
+	@Override
+	public OuterJoinLockingType getOuterJoinLockingType() {
+		return OuterJoinLockingType.UNSUPPORTED;
+	}
+
+	@Override
+	public ConnectionLockTimeoutStrategy getConnectionLockTimeoutStrategy() {
+		return this;
+	}
+
+	@Override
+	public Level getSupportedLevel() {
+		return Level.SUPPORTED;
+	}
+
+	@Override
+	public Timeout getLockTimeout(Connection connection, SessionFactoryImplementor factory) {
+		return Helper.getLockTimeout(
+				"select scs_lockmode from sysmaster:syssqlcurses where scs_sessionid = dbinfo('sessionid')",
+				(resultSet) -> {
+					final int seconds = resultSet.getInt( 1 );
+					return switch ( seconds ) {
+						case -1 -> Timeouts.WAIT_FOREVER;
+						case 0 -> Timeouts.NO_WAIT;
+						default -> Timeout.seconds( seconds );
+					};
+				},
+				connection,
+				factory
+		);
+	}
+
+	@Override
+	public void setLockTimeout(Timeout timeout, Connection connection, SessionFactoryImplementor factory) {
+		final int milliseconds = timeout.milliseconds();
+		if ( milliseconds == SKIP_LOCKED_MILLI ) {
+			throw new HibernateException( "Connection lock-timeout does not accept skip-locked" );
+		}
+		if ( milliseconds == WAIT_FOREVER_MILLI ) {
+			Helper.setLockTimeout(
+					"set lock mode to wait",
+					connection,
+					factory
+			);
+		}
+		else if ( milliseconds == NO_WAIT_MILLI ) {
+			Helper.setLockTimeout(
+					"set lock mode to not wait",
+					connection,
+					factory
+			);
+		}
+		else {
+			Helper.setLockTimeout(
+					(int) Math.ceil( (double) milliseconds / 1000),
+					"set lock mode to wait %s",
+					connection,
+					factory
+			);
+		}
+	}
+}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java
index 1ae2b05df9f3..01f16e93487b 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java
@@ -6,11 +6,13 @@
 
 import java.util.List;
 
+import org.hibernate.Locking;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.IllegalQueryOperationException;
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.query.sqm.sql.internal.SqmParameterInterpretation;
 import org.hibernate.sql.ast.Clause;
+import org.hibernate.sql.ast.spi.LockingClauseStrategy;
 import org.hibernate.sql.ast.spi.SqlAstTranslatorWithMerge;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.Statement;
@@ -338,4 +340,25 @@ protected void visitUpdateStatementOnly(UpdateStatement statement) {
 			super.visitUpdateStatementOnly( statement );
 		}
 	}
+
+	@Override
+	protected LockStrategy determineLockingStrategy(QuerySpec querySpec, Locking.FollowOn followOnStrategy) {
+		final LockStrategy lockStrategy = super.determineLockingStrategy( querySpec, followOnStrategy );
+		final LockingClauseStrategy lockingClauseStrategy = getLockingClauseStrategy();
+		if ( lockingClauseStrategy != null && lockingClauseStrategy.containsJoins() ) {
+			// Informix does not allow FOR UPDATE when the query also contains joins
+			if ( followOnStrategy == Locking.FollowOn.DISALLOW ) {
+				throw new IllegalQueryOperationException( "Locking with joins is not supported" );
+			}
+			else if ( followOnStrategy == Locking.FollowOn.IGNORE ) {
+				return LockStrategy.NONE;
+			}
+			else {
+				return LockStrategy.FOLLOW_ON;
+			}
+		}
+		else {
+			return lockStrategy;
+		}
+	}
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InterSystemsIRISDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InterSystemsIRISDialect.java
new file mode 100644
index 000000000000..304ce6f4c02c
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InterSystemsIRISDialect.java
@@ -0,0 +1,914 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect;
+
+import jakarta.persistence.TemporalType;
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.ScrollMode;
+import org.hibernate.boot.model.FunctionContributions;
+import org.hibernate.boot.model.TypeContributions;
+import org.hibernate.cfg.Environment;
+import org.hibernate.community.dialect.function.InterSystemsIRISLogFunction;
+import org.hibernate.community.dialect.identity.InterSystemsIRISIdentityColumnSupport;
+import org.hibernate.community.dialect.pagination.InterSystemsIRISLimitHandler;
+import org.hibernate.dialect.DatabaseVersion;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
+import org.hibernate.dialect.NationalizationSupport;
+import org.hibernate.dialect.Replacer;
+import org.hibernate.dialect.function.CommonFunctionFactory;
+import org.hibernate.dialect.function.ExtractFunction;
+import org.hibernate.dialect.function.LengthFunction;
+import org.hibernate.dialect.function.TruncFunction;
+import org.hibernate.dialect.identity.IdentityColumnSupport;
+import org.hibernate.dialect.lock.LockingStrategy;
+import org.hibernate.dialect.lock.OptimisticForceIncrementLockingStrategy;
+import org.hibernate.dialect.lock.OptimisticLockingStrategy;
+import org.hibernate.dialect.lock.PessimisticForceIncrementLockingStrategy;
+import org.hibernate.dialect.lock.PessimisticReadSelectLockingStrategy;
+import org.hibernate.dialect.lock.PessimisticReadUpdateLockingStrategy;
+import org.hibernate.dialect.lock.PessimisticWriteSelectLockingStrategy;
+import org.hibernate.dialect.lock.PessimisticWriteUpdateLockingStrategy;
+import org.hibernate.dialect.lock.SelectLockingStrategy;
+import org.hibernate.dialect.lock.UpdateLockingStrategy;
+import org.hibernate.dialect.lock.internal.NoLockingSupport;
+import org.hibernate.dialect.lock.spi.LockingSupport;
+import org.hibernate.dialect.pagination.LimitHandler;
+import org.hibernate.dialect.temptable.TemporaryTableKind;
+import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
+import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.exception.ConstraintViolationException;
+import org.hibernate.exception.DataException;
+import org.hibernate.exception.LockAcquisitionException;
+import org.hibernate.exception.LockTimeoutException;
+import org.hibernate.exception.SQLGrammarException;
+import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
+import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
+import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
+import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.query.common.FetchClauseType;
+import org.hibernate.query.common.TemporalUnit;
+import org.hibernate.query.sqm.IntervalType;
+import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableInsertStrategy;
+import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy;
+import org.hibernate.query.sqm.mutation.spi.AfterUseAction;
+import org.hibernate.query.sqm.mutation.spi.BeforeUseAction;
+import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
+import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.SqlAstTranslatorFactory;
+import org.hibernate.sql.ast.spi.LockingClauseStrategy;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory;
+import org.hibernate.sql.ast.tree.Statement;
+import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.sql.exec.spi.JdbcOperation;
+import org.hibernate.type.StandardBasicTypes;
+import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
+import org.hibernate.type.descriptor.jdbc.ClobJdbcType;
+import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
+
+import java.sql.CallableStatement;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.time.temporal.TemporalAccessor;
+import java.util.TimeZone;
+
+import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
+import static org.hibernate.sql.ast.internal.NonLockingClauseStrategy.NON_CLAUSE_STRATEGY;
+import static org.hibernate.type.SqlTypes.BIT;
+import static org.hibernate.type.SqlTypes.BLOB;
+import static org.hibernate.type.SqlTypes.CLOB;
+import static org.hibernate.type.SqlTypes.BOOLEAN;
+import static org.hibernate.type.SqlTypes.LONG32VARBINARY;
+import static org.hibernate.type.SqlTypes.LONG32VARCHAR;
+import static org.hibernate.type.SqlTypes.NCLOB;
+import static org.hibernate.type.SqlTypes.TIMESTAMP;
+import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC;
+import static org.hibernate.type.descriptor.DateTimeUtils.appendAsDate;
+import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTime;
+import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithNanos;
+
+
+/**
+ * A Hibernate dialect for InterSystems IRIS
+ * intended for  Hibernate 7.1+  and jdk 1.8+
+ */
+public class InterSystemsIRISDialect extends Dialect {
+
+	private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 2025, 3 );
+
+	public InterSystemsIRISDialect() {
+		this( MINIMUM_VERSION );
+	}
+
+	public InterSystemsIRISDialect(DatabaseVersion version) {
+		super( version );
+	}
+
+	public InterSystemsIRISDialect(DialectResolutionInfo info) {
+		super( info );
+	}
+
+	@Override
+	protected DatabaseVersion getMinimumSupportedVersion() {
+		return MINIMUM_VERSION;
+	}
+
+	/**
+	 * Register SQL Functions
+	 */
+	@Override
+	public void initializeFunctionRegistry(FunctionContributions functionContributions) {
+		super.initializeFunctionRegistry( functionContributions );
+		final var typeConfiguration = functionContributions.getTypeConfiguration();
+		final var functionRegistry = functionContributions.getFunctionRegistry();
+		final var functionFactory = new CommonFunctionFactory( functionContributions );
+		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
+		final var doubleType = basicTypeRegistry.resolve( StandardBasicTypes.DOUBLE );
+
+		functionFactory.ascii();
+		functionFactory.bitLength_pattern( "length(?1)*8" );
+		functionFactory.char_chr();
+		functionFactory.chr_char();
+		functionFactory.cot();
+		functionFactory.concat_pipeOperator();
+		functionFactory.datepartDatename();
+		functionFactory.dayofweekmonthyear();
+
+		functionRegistry.patternDescriptorBuilder( "log10", "log10(?1)" )
+				.setInvariantType( doubleType )
+				.setExactArgumentCount( 1 )
+				.register();
+
+		functionFactory.lowerUpper();
+		functionFactory.nullif();
+		functionFactory.round_round();
+
+		functionRegistry.register(
+				"trunc",
+				new TruncFunction( "truncate(?1,0)", "truncate(?1,?2)",
+						TruncFunction.DatetimeTrunc.FORMAT, "to_timestamp", typeConfiguration )
+		);
+
+		functionRegistry.registerAlternateKey( "truncate", "trunc" );
+		functionContributions.getFunctionRegistry().register(
+				"extract",
+				new ExtractFunction( this, typeConfiguration )
+		);
+
+		functionFactory.locate_positionSubstring();
+		functionContributions.getFunctionRegistry()
+				.register( "log", new InterSystemsIRISLogFunction( typeConfiguration ) );
+		functionRegistry.registerAlternateKey( "ln", "log" );
+		functionFactory.characterLength_len();
+		functionFactory.hourMinuteSecond();
+		functionFactory.yearMonthDay();
+		functionFactory.daynameMonthname();
+		functionFactory.nowCurdateCurtime();
+		functionFactory.substr();
+		functionFactory.sysdate();
+		functionFactory.weekQuarter();
+		functionFactory.position();
+		functionFactory.repeat_replicate();
+		functionFactory.trim1();
+		functionFactory.pi();
+		functionFactory.space();
+		functionFactory.degrees();
+		functionFactory.radians();
+		functionFactory.concat_pipeOperator( "SUBSTRING(?1,1) || SUBSTRING(?2,1)" );
+		functionRegistry.register(
+				"bit_length",
+				new LengthFunction( "bit_length", "LENGTH(?1)*8", "(CHARACTER_LENGTH(?1) * 8)", typeConfiguration )
+		);
+		functionFactory.characterLength_length( "character_length(?1)" );
+		functionFactory.octetLength_pattern( "length(?1)", "character_length(?1)" );
+
+	}
+
+
+	@Override
+	protected void initDefaultProperties() {
+		getDefaultProperties().setProperty( Environment.USE_SQL_COMMENTS, "false" );
+	}
+
+	@Override
+	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+		super.contributeTypes( typeContributions, serviceRegistry );
+		JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
+		jdbcTypeRegistry.addDescriptor( BLOB, BlobJdbcType.MATERIALIZED );
+		jdbcTypeRegistry.addDescriptor( CLOB, ClobJdbcType.MATERIALIZED );
+	}
+
+	//sql type to column type mapping
+	@Override
+	protected String columnType(int sqlTypeCode) {
+		switch (sqlTypeCode) {
+			case BOOLEAN:
+			case BIT:
+				return "bit";
+			case LONG32VARBINARY:
+				return "longvarbinary";
+			case LONG32VARCHAR:
+				return "longvarchar";
+			case NCLOB:
+				return "clob";
+			case TIMESTAMP:
+				return "timestamp2";
+			case TIMESTAMP_UTC:
+				return "timestamp";
+		}
+		return super.columnType( sqlTypeCode );
+	}
+
+
+	@Override
+	public boolean supportsSubselectAsInPredicateLHS() {
+		return false;
+	}
+
+	public boolean supportsSubqueryOnMutatingTable() {
+		return false;
+	}
+
+	@Override
+	public NationalizationSupport getNationalizationSupport() {
+		return NationalizationSupport.IMPLICIT;
+	}
+
+
+	@Override
+	public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
+		return new StandardSqlAstTranslatorFactory() {
+			@Override
+			protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
+					SessionFactoryImplementor sessionFactory, Statement statement) {
+				return new InterSystemsIRISSqlAstTranslator<>( sessionFactory, statement );
+			}
+		};
+	}
+
+
+	@Override
+	protected void registerDefaultKeywords() {
+		super.registerDefaultKeywords();
+		String[] irisExtraKeywords = {
+				"ASSERTION","AVG","BIT","BIT_LENGTH","CHARACTER_LENGTH",
+				"CHAR_LENGTH","COALESCE","CONNECTION","CONSTRAINTS","CONVERT","COUNT","DEFERRABLE","DEFERRED","DESCRIPTOR","DIAGNOSTICS",
+				"DOMAIN","ENDEXEC","EXCEPTION","EXTRACT","FOUND","INITIALLY","ISOLATION",
+				"LEVEL","LOWER","MAX","MIN","NAMES","NULLIF","OCTET_LENGTH","OPTION","PAD","PARTIAL","PRIOR","PRIVILEGES","PUBLIC","READ","RELATIVE",
+				"RESTRICT","SCHEMA","SESSION_USER","SHARD",
+				"SPACE","SQLERROR","STATISTICS","SUBSTRING","SUM","SYSDATE",
+				"TEMPORARY","TOP","TRIM",
+				"UPPER","WORK","WRITE"
+		};
+
+		for ( String kw : irisExtraKeywords ) {
+			registerKeyword( kw );
+		}
+	}
+
+	// DDL support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+	@Override
+	public boolean hasAlterTable() {
+		// Does this dialect support the ALTER TABLE syntax?
+		return true;
+	}
+
+	@Override
+	public boolean qualifyIndexName() {
+		return false;
+	}
+
+	@Override
+	public boolean dropConstraints() {
+		return true;
+	}
+
+	@Override
+	public boolean supportsCascadeDelete() {
+		return true;
+	}
+
+	@Override
+	public boolean hasSelfReferentialForeignKeyBug() {
+		return true;
+	}
+
+	@Override
+	public SqmMultiTableMutationStrategy getFallbackSqmMutationStrategy(
+			EntityMappingType rootEntityDescriptor,
+			RuntimeModelCreationContext runtimeModelCreationContext) {
+
+		return new GlobalTemporaryTableMutationStrategy( rootEntityDescriptor, runtimeModelCreationContext );
+	}
+
+
+	@Override
+	public boolean canCreateSchema() {
+		return false;
+	}
+
+	@Override
+	public SqmMultiTableInsertStrategy getFallbackSqmInsertStrategy(
+			EntityMappingType rootEntityDescriptor,
+			RuntimeModelCreationContext runtimeModelCreationContext) {
+
+		return new GlobalTemporaryTableInsertStrategy( rootEntityDescriptor, runtimeModelCreationContext );
+	}
+
+
+	@Override
+	public TemporaryTableKind getSupportedTemporaryTableKind() {
+		return TemporaryTableKind.GLOBAL;
+	}
+
+	@Override
+	public String getTemporaryTableCreateCommand() {
+		return "create global temporary table if not exists";
+	}
+
+	@Override
+	public String getTemporaryTableDropCommand() {
+		return "drop table";
+	}
+
+	@Override
+	public AfterUseAction getTemporaryTableAfterUseAction() {
+		return AfterUseAction.CLEAN;
+	}
+
+
+	@Override
+	public BeforeUseAction getTemporaryTableBeforeUseAction() {
+		return BeforeUseAction.CREATE;
+	}
+
+
+	// IDENTITY support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	@Override
+	public IdentityColumnSupport getIdentityColumnSupport() {
+		return new InterSystemsIRISIdentityColumnSupport();
+	}
+
+
+	@Override
+	public boolean supportsOuterJoinForUpdate() {
+		return false;
+	}
+
+	@Override
+	public LockingStrategy getLockingStrategy(EntityPersister lockable, LockMode lockMode) {
+
+		// Just to make some tests happy, but InterSystems IRIS doesn't really support this.
+		// need to use READ_COMMITTED as isolation level
+
+		//InterSystemsIRIS does not current support "SELECT ... FOR UPDATE" syntax...
+		// Set your transaction mode to READ_COMMITTED before using
+		if ( lockMode == LockMode.PESSIMISTIC_FORCE_INCREMENT ) {
+			return new PessimisticForceIncrementLockingStrategy( lockable, lockMode );
+		}
+		else if ( lockMode == LockMode.PESSIMISTIC_WRITE ) {
+			return lockable.isVersioned()
+					? new PessimisticWriteUpdateLockingStrategy( lockable, lockMode )
+					: new PessimisticWriteSelectLockingStrategy( lockable, lockMode );
+		}
+		else if ( lockMode == LockMode.PESSIMISTIC_READ ) {
+			return lockable.isVersioned()
+					? new PessimisticReadUpdateLockingStrategy( lockable, lockMode )
+					: new PessimisticReadSelectLockingStrategy( lockable, lockMode );
+		}
+		else if ( lockMode == LockMode.OPTIMISTIC ) {
+			return new OptimisticLockingStrategy( lockable, lockMode );
+		}
+		else if ( lockMode == LockMode.OPTIMISTIC_FORCE_INCREMENT ) {
+			return new OptimisticForceIncrementLockingStrategy( lockable, lockMode );
+		}
+		else if ( lockMode.greaterThan( LockMode.READ ) ) {
+			return new UpdateLockingStrategy( lockable, lockMode );
+		}
+		else {
+			return new SelectLockingStrategy( lockable, lockMode );
+		}
+	}
+
+
+	// The syntax used to add a foreign key constraint to a table.
+	@Override
+	public String getAddForeignKeyConstraintString(
+			String constraintName,
+			String[] foreignKey,
+			String referencedTable,
+			String[] primaryKey,
+			boolean referencesPrimaryKey) {
+		final String cols = String.join( ", ", foreignKey );
+		final String referencedCols = String.join( ", ", primaryKey );
+		return String.format(
+				" add constraint %s foreign key (%s) references %s (%s)",
+				constraintName,
+				cols,
+				referencedTable,
+				referencedCols
+		);
+	}
+
+
+	// LIMIT support (also TOP) ~~~~~~~~~~~~~~~~~~~
+
+	@Override
+	public LimitHandler getLimitHandler() {
+		return InterSystemsIRISLimitHandler.INSTANCE;
+	}
+
+
+	// callable statement support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+	@Override
+	public int registerResultSetOutParameter(CallableStatement statement, int col) throws SQLException {
+		return col;
+	}
+
+	@Override
+	public ResultSet getResultSet(CallableStatement ps) throws SQLException {
+		boolean isResultSet = ps.execute();
+		while ( !isResultSet && ps.getUpdateCount() != -1 ) {
+			isResultSet = ps.getMoreResults();
+		}
+		return ps.getResultSet();
+	}
+
+
+	// miscellaneous support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+	@Override
+	public String getNoColumnsInsertString() {
+		// The keyword used to insert a row without specifying
+		// any column values
+		return " default values";
+	}
+
+	@Override
+	public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
+		return (sqlException, message, sql) -> {
+			switch ( sqlException.getErrorCode() ) {
+				case 110:
+					return new LockTimeoutException( message, sqlException, sql );
+				case 114:
+					return new LockAcquisitionException( message, sqlException, sql );
+				case 30: // Table or view not found
+					return new SQLGrammarException( message, sqlException, sql );
+				case 119, 120, 125:
+					// Unique constraint violation
+					return new ConstraintViolationException( message, sqlException, sql, ConstraintViolationException.ConstraintKind.UNIQUE,
+							getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
+				case 108:
+					// Null constraint violation
+					return new ConstraintViolationException( message, sqlException, sql, ConstraintViolationException.ConstraintKind.NOT_NULL,
+							getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
+				case 121, 122, 123, 124, 126,127:
+					// Foreign key constraint violation
+					return new ConstraintViolationException( message, sqlException, sql, ConstraintViolationException.ConstraintKind.FOREIGN_KEY,
+							getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
+				case 3819:
+					// Check constraint violation
+					return new ConstraintViolationException( message, sqlException, sql, ConstraintViolationException.ConstraintKind.CHECK,
+							getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
+				case 02, 21, 22:
+					return new DataException( message, sqlException, sql );
+			}
+			return null;
+		};
+	}
+
+	@Override
+	public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
+		return EXTRACTOR;
+	}
+
+	/**
+	 * The InterSystemsIRIS ViolatedConstraintNameExtracter.
+	 */
+
+	private static final ViolatedConstraintNameExtractor EXTRACTOR =
+			new TemplatedViolatedConstraintNameExtractor( sqle -> extractUsingTemplate( "(", ")", sqle.getMessage() ) );
+
+	@Override
+	public boolean supportsColumnCheck() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsTupleDistinctCounts() {
+		return false;
+	}
+
+	@Override
+	public ScrollMode defaultScrollMode() {
+		return super.defaultScrollMode();
+	}
+
+	@Override
+	public boolean supportsExistsInSelect() {
+		return false;
+	}
+
+	@Override
+	public IdentifierHelper buildIdentifierHelper(
+			IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData) throws SQLException {
+		if ( dbMetaData == null ) {
+			builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.MIXED );
+			builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
+		}
+		else {
+			builder.applyIdentifierCasing( dbMetaData );
+		}
+
+		builder.applyReservedWords( getKeywords() );
+		builder.setNameQualifierSupport( getNameQualifierSupport() );
+		builder.setAutoQuoteKeywords( true );
+		return super.buildIdentifierHelper( builder, dbMetaData );
+	}
+
+
+	@Override
+	public boolean supportsNullPrecedence() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsLockTimeouts() {
+		return false;
+	}
+
+
+	@Override
+	public boolean supportsFetchClause(FetchClauseType type) {
+		return type == FetchClauseType.ROWS_ONLY;
+	}
+
+	@Override
+	public boolean supportsLobValueChangePropagation() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsCurrentTimestampSelection() {
+		return true;
+	}
+
+	@Override
+	public String getCurrentTimestampSelectString() {
+		return "SELECT CURRENT_TIMESTAMP";
+	}
+
+	@Override
+	public boolean isCurrentTimestampSelectStringCallable() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsValuesListForInsert() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsRowValueConstructorSyntax() {
+		return false;
+	}
+
+
+	@Override
+	public boolean supportsRowValueConstructorSyntaxInInList() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsRowValueConstructorSyntaxInQuantifiedPredicates() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsRowValueConstructorGtLtSyntax() {
+		return false;
+	}
+
+	@Override
+	public int getMaxVarcharLength() {
+		return 32767;
+	}
+
+	@Override
+	public boolean supportsOrderByInSubquery() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsLateral() {
+		return true;
+	}
+
+	@Override
+	public String getForUpdateString() {
+		return "";
+	}
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType, IntervalType intervalType) {
+		switch (unit) {
+			case YEAR:      return "{fn TIMESTAMPADD(SQL_TSI_YEAR, ?2, ?3)}";
+			case QUARTER:   return "{fn TIMESTAMPADD(SQL_TSI_QUARTER, ?2, ?3)}";
+			case MONTH:     return "{fn TIMESTAMPADD(SQL_TSI_MONTH, ?2, ?3)}";
+			case WEEK:      return "{fn TIMESTAMPADD(SQL_TSI_WEEK, ?2, ?3)}";
+			case DAY:
+			case DAY_OF_MONTH:
+				return "{fn TIMESTAMPADD(SQL_TSI_DAY, ?2, ?3)}";
+			case HOUR:      return "{fn TIMESTAMPADD(SQL_TSI_HOUR, ?2, ?3)}";
+			case MINUTE:    return "{fn TIMESTAMPADD(SQL_TSI_MINUTE, ?2, ?3)}";
+			case SECOND:    return "dateadd(second, ?2, ?3)";
+			case NANOSECOND:
+				return "{fn TIMESTAMPADD(SQL_TSI_FRAC_SECOND, (?2)/1000000, ?3)}";
+			case NATIVE:
+				return "dateadd(microsecond, ?2, ?3)";
+			default:
+				throw new UnsupportedOperationException( "Unsupported unit for TIMESTAMPADD: " + unit );
+		}
+	}
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public String timestampdiffPattern(TemporalUnit unit,
+									TemporalType fromTemporalType,
+									TemporalType toTemporalType) {
+		if ( unit == null ) {
+			return "{fn TIMESTAMPDIFF(SQL_TSI_SECOND, ?2, ?3)}";
+		}
+		switch (unit) {
+			case YEAR:
+				return "{fn TIMESTAMPDIFF(SQL_TSI_YEAR, ?2, ?3)}";
+			case QUARTER:
+				return "({fn TIMESTAMPDIFF(SQL_TSI_MONTH, ?2, ?3)}/3)";
+			case MONTH:
+				return "{fn TIMESTAMPDIFF(SQL_TSI_MONTH, ?2, ?3)}";
+			case WEEK:
+				return "{fn TIMESTAMPDIFF(SQL_TSI_WEEK, ?2, ?3)}";
+			case DAY:
+			case DAY_OF_MONTH:
+				return "{fn TIMESTAMPDIFF(SQL_TSI_DAY, ?2, ?3)}";
+			case HOUR:
+				return "{fn TIMESTAMPDIFF(SQL_TSI_HOUR, ?2, ?3)}";
+			case MINUTE:
+				return "{fn TIMESTAMPDIFF(SQL_TSI_MINUTE, ?2, ?3)}";
+			case SECOND:
+				return "{fn TIMESTAMPDIFF(SQL_TSI_SECOND, ?2, ?3)}";
+			case NANOSECOND:
+				return "({fn TIMESTAMPDIFF(SQL_TSI_FRAC_SECOND, ?2, ?3)}*1000000)";
+			case NATIVE:
+				return "({fn TIMESTAMPDIFF(SQL_TSI_FRAC_SECOND, ?2, ?3)}*1000)";
+			default:
+				throw new UnsupportedOperationException( "Unsupported TemporalUnit for TIMESTAMPDIFF: " + unit );
+		}
+	}
+	@Override
+	public long getFractionalSecondPrecisionInNanos() {
+		return 1_000L; //default to nanoseconds for now
+	}
+
+	@Override
+	public boolean supportsTableCheck() {
+		return false;
+	}
+
+	@Override
+	public LockingClauseStrategy getLockingClauseStrategy(QuerySpec querySpec, LockOptions lockOptions) {
+		return NON_CLAUSE_STRATEGY;
+	}
+
+	@Override
+	public LockingSupport getLockingSupport() {
+		return NoLockingSupport.NO_LOCKING_SUPPORT;
+	}
+
+
+	@Override
+	public void appendDateTimeLiteral(
+			SqlAppender appender,
+			TemporalAccessor temporalAccessor,
+			TemporalType precision,
+			TimeZone jdbcTimeZone) {
+		switch ( precision ) {
+			case DATE:
+				appender.appendSql( "'" );
+				appendAsDate( appender, temporalAccessor );
+				appender.appendSql( "'" );
+				break;
+			case TIME:
+				appender.appendSql( "'" );
+				appendAsTime( appender, temporalAccessor, supportsTemporalLiteralOffset(), jdbcTimeZone );
+				appender.appendSql( "'" );
+				break;
+			case TIMESTAMP:
+				appender.appendSql( "'" );
+				appendAsTimestampWithNanos( appender, temporalAccessor, supportsTemporalLiteralOffset(), jdbcTimeZone );
+				appender.appendSql( "'" );
+				break;
+			default:
+				throw new IllegalArgumentException();
+		}
+	}
+
+	@Override
+	public void appendDatetimeFormat(SqlAppender appender, String format) {
+		appender.appendSql( datetimeFormat( format ).result() );
+	}
+
+	public static Replacer datetimeFormat(String format) {
+		return new Replacer( format, "'", "" )
+				//era
+				.replace("GG", "AD")
+				.replace("G", "AD")
+
+				//year
+				.replace("yyyy", "YYYY")
+				.replace("yyy", "YYYY")
+				.replace("yy", "YY")
+				.replace("y", "YYYY")
+
+				//month of year
+				.replace("MMMM",  "Month")
+				.replace("MMM", "Mon")
+				.replace("MM", "MM")
+				.replace("M", "MM")
+
+				//week of year
+				.replace("ww", "IW")
+				.replace("w", "IW")
+				//year for week
+				.replace("YYYY", "IYYY")
+				.replace("YYY", "IYYY")
+				.replace("YY", "IY")
+				.replace("Y", "IYYY")
+
+				//week of month
+				.replace("W", "W")
+
+				//day of week
+				.replace("EEEE", "Day")
+				.replace("EEE", "Dy")
+				.replace("ee", "D")
+				.replace("e",  "D")
+
+				//day of month
+				.replace("dd", "DD")
+				.replace("d", "DD")
+
+				//day of year
+				.replace("DDD", "DDD")
+				.replace("DD", "DDD")
+				.replace("D", "DDD")
+
+				//am pm
+				.replace("a", "AM")
+
+				//hour
+				.replace("hh", "HH12")
+				.replace("HH", "HH24")
+				.replace("h", "HH12")
+				.replace("H",  "HH24")
+
+				//minute
+				.replace("mm", "MI")
+				.replace("m", "MI")
+
+				//second
+				.replace("ss", "SS")
+				.replace("s", "SS")
+
+				//fractional seconds
+				.replace("SSSSSS", "FF6")
+				.replace("SSSSS", "FF5")
+				.replace("SSSS", "FF4")
+				.replace("SSS", "FF3")
+				.replace("SS", "FF2")
+				.replace("S", "FF1")
+
+				//timezones
+				.replace("zzz", "TZR")
+				.replace("zz", "TZR")
+				.replace("z", "TZR")
+				.replace("ZZZ", "TZHTZM")
+				.replace("ZZ", "TZHTZM")
+				.replace("Z", "TZHTZM")
+				.replace("xxx", "TZH:TZM")
+				.replace("xx", "TZHTZM")
+				.replace("x", "TZH");
+	}
+
+	@Override
+	public String extractPattern(TemporalUnit unit) {
+		switch (unit) {
+			case DAY_OF_YEAR:
+				return "dayofyear(?2)";
+			case DAY_OF_MONTH:
+				return "dayofmonth(?2)";
+			case DAY_OF_WEEK:
+				return "dayofweek(?2)";
+			case WEEK:
+			case WEEK_OF_YEAR:
+				return "week(?2)";
+			case DAY:
+				return "day(?2)";
+			case MONTH:
+				return "month(?2)";
+			case YEAR:
+				return "year(?2)";
+			case QUARTER:
+				return "quarter(?2)";
+			case HOUR:
+				return "hour(?2)";
+			case MINUTE:
+				return "minute(?2)";
+			case SECOND:
+				return "second(?2)";
+			case WEEK_OF_MONTH:
+				return "ceiling( (dayofmonth(?2) + dayofweek(dateadd('day', 1 - dayofmonth(?2), ?2)) - 1) / 7 )";
+			case OFFSET:
+			case TIMEZONE_HOUR:
+			case TIMEZONE_MINUTE:
+				return null;
+			default:
+				return super.extractPattern( unit );
+		}
+	}
+
+
+	@Override
+	public boolean requiresFloatCastingOfIntegerDivision() {
+		return true;
+	}
+
+	@Override
+	public boolean supportsWithClauseInSubquery() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsWindowFunctions() {
+		return true;
+	}
+
+	@Override
+	public boolean useInputStreamToInsertBlob() {
+		return false;
+	}
+
+	@Override
+	public String translateExtractField(TemporalUnit unit) {
+		return switch (unit) {
+			case DAY_OF_MONTH -> "DAYOFMONTH";
+			case DAY_OF_YEAR -> "DAYOFYEAR ";
+			case DAY_OF_WEEK -> "DAYOFWEEK ";
+			case EPOCH -> "TO_POSIXTIME";
+			case DATE -> "DATE";
+			default -> super.translateExtractField( unit );
+		};
+	}
+
+	@Override
+	public int getPreferredSqlTypeCodeForBoolean() {
+		return Types.BIT;
+	}
+
+
+	@Override
+	public String getDual() {
+		return "(select 1)";
+	}
+
+	@Override
+	public int getInExpressionCountLimit() {
+		return 900;
+	}
+
+	@Override
+	public boolean supportsFromClauseInUpdate() {
+		return true;
+	}
+
+	@Override
+	public DmlTargetColumnQualifierSupport getDmlTargetColumnQualifierSupport() {
+		return DmlTargetColumnQualifierSupport.TABLE_ALIAS;
+	}
+}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InterSystemsIRISSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InterSystemsIRISSqlAstTranslator.java
new file mode 100644
index 000000000000..b0b1065100fe
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InterSystemsIRISSqlAstTranslator.java
@@ -0,0 +1,204 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect;
+
+import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.internal.util.collections.Stack;
+import org.hibernate.query.sqm.ComparisonOperator;
+import org.hibernate.sql.ast.Clause;
+import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlSelection;
+import org.hibernate.sql.ast.tree.MutationStatement;
+import org.hibernate.sql.ast.tree.Statement;
+import org.hibernate.sql.ast.tree.delete.DeleteStatement;
+import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.sql.ast.tree.expression.SqlTuple;
+import org.hibernate.sql.ast.tree.from.DerivedTableReference;
+import org.hibernate.sql.ast.tree.from.QueryPartTableReference;
+import org.hibernate.sql.ast.tree.from.ValuesTableReference;
+import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
+import org.hibernate.sql.ast.tree.select.QueryGroup;
+import org.hibernate.sql.ast.tree.select.QueryPart;
+import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.sql.ast.tree.update.UpdateStatement;
+import org.hibernate.sql.exec.spi.JdbcOperation;
+
+import java.util.List;
+
+public class InterSystemsIRISSqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAstTranslator<T> {
+
+	protected InterSystemsIRISSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
+		super( sessionFactory, statement );
+	}
+
+
+	@Override
+	protected void renderDeleteClause(DeleteStatement statement) {
+		appendSql( "delete" );
+		final Stack<Clause> clauseStack = getClauseStack();
+		try {
+			clauseStack.push( Clause.DELETE );
+			appendSql( " from " );
+			renderDmlTargetTableExpression( statement.getTargetTable() );
+			renderTableReferenceIdentificationVariable( statement.getTargetTable() );
+		}
+		finally {
+			clauseStack.pop();
+		}
+	}
+
+
+	@Override
+	protected void renderTupleComparisonStandard(
+			List<SqlSelection> lhsSelections,
+			SqlTuple rhsTuple,
+			ComparisonOperator operator
+	) {
+
+		if ( operator == ComparisonOperator.EQUAL || operator == ComparisonOperator.NOT_EQUAL ) {
+			emulateTupleComparisonSelections( lhsSelections, rhsTuple, operator );
+		}
+		else {
+
+			super.renderTupleComparisonStandard( lhsSelections, rhsTuple, operator );
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	protected void emulateTupleComparisonSelections(
+			List<SqlSelection> lhsSelections,
+			SqlTuple rhsTuple,
+			ComparisonOperator operator
+	) {
+		final List<Expression> rhsExpressions = (List<Expression>) rhsTuple.getExpressions();
+
+		if ( lhsSelections.size() != rhsExpressions.size() ) {
+			throw new IllegalArgumentException( "Tuple size mismatch" );
+		}
+
+		final String joiner = ( operator == ComparisonOperator.EQUAL ) ? " and " : " or ";
+
+		appendSql( OPEN_PARENTHESIS );
+		for ( int i = 0; i < lhsSelections.size(); i++ ) {
+			if ( i > 0 ) {
+				appendSql( joiner );
+			}
+
+			lhsSelections.get( i ).getExpression().accept( this );
+			appendSql( operator.sqlText() );
+			rhsExpressions.get( i ).accept( this );
+		}
+		appendSql( CLOSE_PARENTHESIS );
+	}
+
+	@Override
+	public void visitValuesTableReference(ValuesTableReference tableReference) {
+		emulateValuesTableReferenceColumnAliasing( tableReference );
+	}
+
+	@Override
+	protected void renderUpdateClause(UpdateStatement updateStatement) {
+		appendSql( "update" );
+		final Stack<Clause> clauseStack = getClauseStack();
+		try {
+			clauseStack.push( Clause.UPDATE );
+			append( WHITESPACE );
+			renderDmlTargetTableExpression( updateStatement.getTargetTable() );
+			renderTableReferenceIdentificationVariable( updateStatement.getTargetTable() );
+		}
+		finally {
+			clauseStack.pop();
+		}
+	}
+
+
+	@Override
+	protected String determineColumnReferenceQualifier(ColumnReference columnReference) {
+		final DmlTargetColumnQualifierSupport qualifierSupport = getDialect().getDmlTargetColumnQualifierSupport();
+		final MutationStatement currentDmlStatement;
+		final String dmlAlias;
+
+		if ( getClauseStack().getCurrent() != Clause.SET
+			|| !( ( currentDmlStatement = getCurrentDmlStatement() ) instanceof InsertSelectStatement )
+			|| ( dmlAlias = currentDmlStatement.getTargetTable().getIdentificationVariable() ) == null
+			|| !dmlAlias.equals( columnReference.getQualifier() ) ) {
+			return columnReference.getQualifier();
+		}
+		// Qualify the column reference with the table expression also when in subqueries
+		else if ( qualifierSupport != DmlTargetColumnQualifierSupport.NONE || !getQueryPartStack().isEmpty() ) {
+			return getCurrentDmlStatement().getTargetTable().getTableExpression();
+		}
+		else {
+			return null;
+		}
+	}
+
+	@Override
+	public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
+		if ( isIntegerDivisionEmulationRequired( arithmeticExpression ) ) {
+			visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
+			appendSql( " \\ " );
+			visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
+		}
+		else {
+			super.visitBinaryArithmeticExpression( arithmeticExpression );
+		}
+	}
+
+	@Override
+	public void visitQueryGroup(QueryGroup queryGroup) {
+		if ( shouldEmulateFetchClause( queryGroup ) ) {
+			emulateFetchOffsetWithWindowFunctions( queryGroup, true );
+		}
+		else {
+			super.visitQueryGroup( queryGroup );
+		}
+	}
+
+	@Override
+	public void visitQuerySpec(QuerySpec querySpec) {
+		if ( shouldEmulateFetchClause( querySpec ) ) {
+			emulateFetchOffsetWithWindowFunctions( querySpec, true );
+		}
+		else {
+			super.visitQuerySpec( querySpec );
+		}
+	}
+
+	protected boolean shouldEmulateFetchClause(QueryPart queryPart) {
+		// Check if current query part is already row numbering to avoid infinite recursion
+		if ( getQueryPartForRowNumbering() == queryPart || isRowsOnlyFetchClauseType( queryPart ) ) {
+			return false;
+		}
+		return !getDialect().supportsFetchClause( queryPart.getFetchClauseType() );
+	}
+
+
+	@Override
+	protected void renderDerivedTableReferenceIdentificationVariable(DerivedTableReference tableReference) {
+		renderTableReferenceIdentificationVariable( tableReference );
+	}
+
+	@Override
+	public void visitQueryPartTableReference(QueryPartTableReference tableReference) {
+		emulateQueryPartTableReferenceColumnAliasing( tableReference );
+	}
+
+	@Override
+	protected void renderFromClauseAfterUpdateSet(UpdateStatement statement) {
+		if ( statement.getFromClause().getRoots().isEmpty() ) {
+			appendSql( " from " );
+			renderDmlTargetTableExpression( statement.getTargetTable() );
+			renderTableReferenceIdentificationVariable( statement.getTargetTable() );
+		}
+		else {
+			visitFromClause( statement.getFromClause() );
+		}
+	}
+
+}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java
index 96e57dc4ef63..bcdad37a6c9b 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java
@@ -8,17 +8,17 @@
 import java.util.List;
 
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
-import org.hibernate.dialect.sql.ast.MySQLSqlAstTranslator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
+import org.hibernate.sql.ast.spi.NestedOrTargetTableCorrelationVisitor;
+import org.hibernate.sql.ast.tree.AbstractUpdateOrDeleteStatement;
 import org.hibernate.sql.ast.tree.MutationStatement;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
-import org.hibernate.sql.ast.tree.expression.CastTarget;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
@@ -43,6 +43,7 @@
  * A SQL AST translator for MariaDB.
  *
  * @author Christian Beikov
+ * @author Yoobin Yoon
  */
 public class MariaDBLegacySqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAstTranslator<T> {
 
@@ -100,17 +101,24 @@ public void visitColumnReference(ColumnReference columnReference) {
 
 	@Override
 	protected void renderDeleteClause(DeleteStatement statement) {
-		appendSql( "delete" );
 		final Stack<Clause> clauseStack = getClauseStack();
 		try {
 			clauseStack.push( Clause.DELETE );
-			renderTableReferenceIdentificationVariable( statement.getTargetTable() );
-			if ( statement.getFromClause().getRoots().isEmpty() ) {
-				appendSql( " from " );
-				renderDmlTargetTableExpression( statement.getTargetTable() );
+			if ( usesSingleTableDml( statement ) ) {
+				appendSql( "delete from " );
+				appendSql( statement.getTargetTable().getTableExpression() );
+				registerAffectedTable( statement.getTargetTable() );
 			}
 			else {
-				visitFromClause( statement.getFromClause() );
+				appendSql( "delete" );
+				renderTableReferenceIdentificationVariable( statement.getTargetTable() );
+				if ( statement.getFromClause().getRoots().isEmpty() ) {
+					appendSql( " from " );
+					renderDmlTargetTableExpression( statement.getTargetTable() );
+				}
+				else {
+					visitFromClause( statement.getFromClause() );
+				}
 			}
 		}
 		finally {
@@ -120,7 +128,12 @@ protected void renderDeleteClause(DeleteStatement statement) {
 
 	@Override
 	protected void renderUpdateClause(UpdateStatement updateStatement) {
-		if ( updateStatement.getFromClause().getRoots().isEmpty() ) {
+		if ( usesSingleTableDml( updateStatement ) ) {
+			appendSql( "update " );
+			appendSql( updateStatement.getTargetTable().getTableExpression() );
+			registerAffectedTable( updateStatement.getTargetTable() );
+		}
+		else if ( updateStatement.getFromClause().getRoots().isEmpty() ) {
 			super.renderUpdateClause( updateStatement );
 		}
 		else {
@@ -132,7 +145,7 @@ protected void renderUpdateClause(UpdateStatement updateStatement) {
 	@Override
 	protected void renderDmlTargetTableExpression(NamedTableReference tableReference) {
 		super.renderDmlTargetTableExpression( tableReference );
-		if ( getClauseStack().getCurrent() != Clause.INSERT ) {
+		if ( getClauseStack().getCurrent() != Clause.INSERT && !usesSingleTableDml( getCurrentDmlStatement() ) ) {
 			renderTableReferenceIdentificationVariable( tableReference );
 		}
 	}
@@ -157,15 +170,24 @@ protected void visitConflictClause(ConflictClause conflictClause) {
 	@Override
 	protected String determineColumnReferenceQualifier(ColumnReference columnReference) {
 		final DmlTargetColumnQualifierSupport qualifierSupport = getDialect().getDmlTargetColumnQualifierSupport();
-		final MutationStatement currentDmlStatement;
 		final String dmlAlias;
 		// Since MariaDB does not support aliasing the insert target table,
 		// we must detect column reference that are used in the conflict clause
 		// and use the table expression as qualifier instead
 		if ( getClauseStack().getCurrent() != Clause.SET
-				|| !( ( currentDmlStatement = getCurrentDmlStatement() ) instanceof InsertSelectStatement )
-				|| ( dmlAlias = currentDmlStatement.getTargetTable().getIdentificationVariable() ) == null
+				|| !( getCurrentDmlStatement() instanceof InsertSelectStatement insertSelectStatement )
+				|| ( dmlAlias = insertSelectStatement.getTargetTable().getIdentificationVariable() ) == null
 				|| !dmlAlias.equals( columnReference.getQualifier() ) ) {
+			final MutationStatement currentStatement = getCurrentDmlStatement();
+			if ( currentStatement != null && usesSingleTableDml( currentStatement ) && columnReference.getQualifier() != null ) {
+				final NamedTableReference targetTable = currentStatement.getTargetTable();
+				final String targetTableName = targetTable.getTableExpression();
+				final String qualifier = columnReference.getQualifier();
+				final String targetAlias = targetTable.getIdentificationVariable();
+				if ( ( targetAlias != null && qualifier.equals( targetAlias ) ) || qualifier.equals( targetTableName ) ) {
+					return !getQueryPartStack().isEmpty() ? targetTableName : null;
+				}
+			}
 			return columnReference.getQualifier();
 		}
 		// Qualify the column reference with the table expression also when in subqueries
@@ -375,17 +397,6 @@ private boolean supportsWindowFunctions() {
 		return dialect.getVersion().isSameOrAfter( 10, 2 );
 	}
 
-	@Override
-	public void visitCastTarget(CastTarget castTarget) {
-		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );
-		if ( sqlType != null ) {
-			appendSql( sqlType );
-		}
-		else {
-			super.visitCastTarget( castTarget );
-		}
-	}
-
 	@Override
 	protected void renderStringContainsExactlyPredicate(Expression haystack, Expression needle) {
 		// MariaDB can't cope with NUL characters in the position function, so we use a like predicate instead
@@ -403,4 +414,72 @@ protected void appendAssignmentColumn(ColumnReference column) {
 						? determineColumnReferenceQualifier( column )
 						: null );
 	}
+
+	private boolean usesSingleTableDml(MutationStatement statement) {
+		// As of MariaDB 11.1, the self-join rewrite optimization can handle this, so no need force single table DML
+		return getDialect().getVersion().isBefore( 11, 1 ) && hasTargetTableCorrelation( statement );
+	}
+
+	private boolean needsDmlSubqueryWrapper() {
+		final Statement statement = getStatement();
+		// As of MariaDB 11.1, the self-join rewrite optimization can handle this, so no need for the wrapper
+		return getDialect().getVersion().isBefore( 11, 1 )
+				&& statement instanceof AbstractUpdateOrDeleteStatement updateOrDeleteStatement
+				&& !NestedOrTargetTableCorrelationVisitor.hasCorrelation( updateOrDeleteStatement );
+	}
+
+	@Override
+	public void visitSelectStatement(SelectStatement statement) {
+		final boolean needsParenthesis = !statement.getQueryPart().isRoot();
+		if ( needsParenthesis && needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.visitSelectStatement( statement );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.visitSelectStatement( statement );
+		}
+	}
+
+	@Override
+	protected <X extends Expression> void renderRelationalEmulationSubQuery(
+			QuerySpec subQuery,
+			X lhsTuple,
+			SubQueryRelationalRestrictionEmulationRenderer<X> renderer,
+			ComparisonOperator tupleComparisonOperator) {
+		if ( needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.renderRelationalEmulationSubQuery( subQuery, lhsTuple, renderer, tupleComparisonOperator );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.renderRelationalEmulationSubQuery( subQuery, lhsTuple, renderer, tupleComparisonOperator );
+		}
+	}
+
+	@Override
+	protected void renderQuantifiedEmulationSubQuery(
+			QuerySpec subQuery,
+			ComparisonOperator tupleComparisonOperator) {
+		if ( needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.renderQuantifiedEmulationSubQuery( subQuery, tupleComparisonOperator );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.renderQuantifiedEmulationSubQuery( subQuery, tupleComparisonOperator );
+		}
+	}
+
+	@Override
+	protected void renderFetchFirstRow() {
+		appendSql( " limit 1" );
+	}
+
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java
index 0e9fadbb6f8c..66e67c1ac372 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java
@@ -756,7 +756,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						NullJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java
index 7326c6868df3..df385e80dab6 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java
@@ -8,7 +8,6 @@
 import java.util.List;
 
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
-import org.hibernate.dialect.sql.ast.MySQLSqlAstTranslator;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.query.sqm.ComparisonOperator;
@@ -17,7 +16,6 @@
 import org.hibernate.sql.ast.tree.MutationStatement;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
-import org.hibernate.sql.ast.tree.expression.CastTarget;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
@@ -44,6 +42,7 @@
  * A SQL AST translator for MySQL.
  *
  * @author Christian Beikov
+ * @author Yoobin Yoon
  */
 public class MySQLLegacySqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAstTranslator<T> {
 
@@ -366,17 +365,6 @@ public MySQLLegacyDialect getDialect() {
 		return dialect;
 	}
 
-	@Override
-	public void visitCastTarget(CastTarget castTarget) {
-		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );
-		if ( sqlType != null ) {
-			appendSql( sqlType );
-		}
-		else {
-			super.visitCastTarget( castTarget );
-		}
-	}
-
 	@Override
 	protected void renderStringContainsExactlyPredicate(Expression haystack, Expression needle) {
 		// MySQL can't cope with NUL characters in the position function, so we use a like predicate instead
@@ -394,4 +382,63 @@ protected void appendAssignmentColumn(ColumnReference column) {
 						? determineColumnReferenceQualifier( column )
 						: null );
 	}
+
+	private boolean needsDmlSubqueryWrapper() {
+		final Statement statement = getStatement();
+		return statement instanceof DeleteStatement || statement instanceof UpdateStatement;
+	}
+
+	@Override
+	public void visitSelectStatement(SelectStatement statement) {
+		final boolean needsParenthesis = !statement.getQueryPart().isRoot();
+		if ( needsParenthesis && needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.visitSelectStatement( statement );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.visitSelectStatement( statement );
+		}
+	}
+
+	@Override
+	protected <X extends Expression> void renderRelationalEmulationSubQuery(
+			QuerySpec subQuery,
+			X lhsTuple,
+			SubQueryRelationalRestrictionEmulationRenderer<X> renderer,
+			ComparisonOperator tupleComparisonOperator) {
+		if ( needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.renderRelationalEmulationSubQuery( subQuery, lhsTuple, renderer, tupleComparisonOperator );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.renderRelationalEmulationSubQuery( subQuery, lhsTuple, renderer, tupleComparisonOperator );
+		}
+	}
+
+	@Override
+	protected void renderQuantifiedEmulationSubQuery(
+			QuerySpec subQuery,
+			ComparisonOperator tupleComparisonOperator) {
+		if ( needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.renderQuantifiedEmulationSubQuery( subQuery, tupleComparisonOperator );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.renderQuantifiedEmulationSubQuery( subQuery, tupleComparisonOperator );
+		}
+	}
+
+	@Override
+	protected void renderFetchFirstRow() {
+		appendSql( " limit 1" );
+	}
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java
index c7a0a2d09167..8e3b9472d232 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java
@@ -170,6 +170,7 @@
  * @author Steve Ebersole
  * @author Gavin King
  * @author Loïc Lefèvre
+ * @author Yoobin Yoon
  */
 public class OracleLegacyDialect extends Dialect {
 
@@ -384,6 +385,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arraySlice_oracle();
 		functionFactory.arrayReplace_oracle();
 		functionFactory.arrayTrim_oracle();
+		functionFactory.arrayReverse_oracle();
+		functionFactory.arraySort_oracle();
 		functionFactory.arrayFill_oracle();
 		functionFactory.arrayToString_oracle();
 
@@ -415,7 +418,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.xmlagg();
 		functionFactory.xmltable_oracle();
 
-		functionFactory.unnest_oracle();
+		functionFactory.unnest_oracle( getVersion().isSameOrAfter( 21 ) );
 		functionFactory.generateSeries_recursive( getMaximumSeriesSize(), true, false );
 		functionFactory.regexpLike_predicateFunction();
 	}
@@ -1029,7 +1032,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						NullJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 		typeContributions.contributeType(
@@ -1037,7 +1040,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullAsNullTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 						)
 		);
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java
index 9d29ba01e9c3..9060257fc620 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacyDialect.java
@@ -171,6 +171,7 @@
  * A {@linkplain Dialect SQL dialect} for PostgreSQL 8 and above.
  *
  * @author Gavin King
+ * @author Yoobin Yoon
  */
 public class PostgreSQLLegacyDialect extends Dialect {
 
@@ -668,6 +669,14 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		else {
 			functionFactory.arrayTrim_unnest();
 		}
+		if ( getVersion().isSameOrAfter( 18 ) ) {
+			functionFactory.arrayReverse();
+			functionFactory.arraySort();
+		}
+		else {
+			functionFactory.arrayReverse_unnest();
+			functionFactory.arraySort_unnest();
+		}
 		functionFactory.arrayFill_postgresql();
 		functionFactory.arrayToString_postgresql();
 
@@ -979,6 +988,11 @@ public String getCurrentTimestampSelectString() {
 		return "select now()";
 	}
 
+	@Override
+	public boolean isCurrentTimestampStable() {
+		return true;
+	}
+
 	@Override
 	public boolean supportsTupleCounts() {
 		return true;
@@ -1558,7 +1572,7 @@ protected void contributePostgreSQLTypes(TypeContributions typeContributions, Se
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java
index e1c3870663b6..d3d6a8507f95 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/PostgresPlusLegacyDialect.java
@@ -53,6 +53,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		super.initializeFunctionRegistry(functionContributions);
 
 		CommonFunctionFactory functionFactory = new CommonFunctionFactory(functionContributions);
+		functionFactory.arrayGet_bracket( false );
 		functionFactory.soundex();
 		functionFactory.rownumRowid();
 		functionFactory.sysdate();
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java
index 76d2f97ecce8..f33e9d4cefa4 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java
@@ -665,7 +665,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 				NullJdbcType.INSTANCE,
 				typeContributions.getTypeConfiguration()
 						.getJavaTypeRegistry()
-						.getDescriptor( Object.class )
+						.resolveDescriptor( Object.class )
 		) );
 
 		jdbcTypeRegistry.addDescriptor( EnumJdbcType.INSTANCE );
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java
index 188840b1491c..9cc4e5c30b8c 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java
@@ -10,6 +10,7 @@
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
+import org.hibernate.dialect.function.array.DdlTypeHelper;
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
@@ -404,7 +405,7 @@ private boolean supportsWindowFunctions() {
 	}
 
 	public static String getSqlType(CastTarget castTarget, SessionFactoryImplementor factory) {
-		final String sqlType = getCastTypeName( castTarget, factory.getTypeConfiguration() );
+		final String sqlType = DdlTypeHelper.getCastTypeName( castTarget, factory.getTypeConfiguration() );
 		return getSqlType( castTarget, sqlType, factory.getJdbcServices().getDialect() );
 	}
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SpannerPostgreSQLDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SpannerPostgreSQLDialect.java
new file mode 100644
index 000000000000..c283f1575411
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SpannerPostgreSQLDialect.java
@@ -0,0 +1,1116 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect;
+
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Timeout;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.LockOptions;
+import org.hibernate.JDBCException;
+import org.hibernate.ScrollMode;
+import org.hibernate.Timeouts;
+import org.hibernate.boot.model.FunctionContributions;
+import org.hibernate.boot.model.TypeContributions;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.community.dialect.aggregate.SpannerPostgreSQLAggregateSupport;
+import org.hibernate.community.dialect.sequence.SpannerPostgreSQLSequenceSupport;
+import org.hibernate.community.dialect.sql.ast.SpannerPostgreSQLSqlAstTranslator;
+import org.hibernate.dialect.DatabaseVersion;
+import org.hibernate.dialect.function.CountFunction;
+import org.hibernate.dialect.function.InsertSubstringOverlayEmulation;
+import org.hibernate.dialect.function.array.ArrayContainsOperatorFunction;
+import org.hibernate.dialect.function.array.ArrayIncludesOperatorFunction;
+import org.hibernate.dialect.function.json.SpannerPostgreSQLJsonArrayFunction;
+import org.hibernate.dialect.function.json.SpannerPostgreSQLJsonObjectFunction;
+import org.hibernate.persister.entity.mutation.EntityMutationTarget;
+import org.hibernate.query.sqm.CastType;
+import org.hibernate.dialect.FunctionalDependencyAnalysisSupport;
+import org.hibernate.dialect.FunctionalDependencyAnalysisSupportImpl;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.aggregate.AggregateSupport;
+import org.hibernate.dialect.function.CommonFunctionFactory;
+import org.hibernate.dialect.function.SpannerConcatFunction;
+import org.hibernate.dialect.function.array.SpannerPostgreSQLArrayConcatElementFunction;
+import org.hibernate.dialect.function.array.SpannerPostgreSQLArrayTrimEmulation;
+import org.hibernate.dialect.function.array.SpannerPostgreSQLArrayReplaceFunction;
+import org.hibernate.dialect.function.array.SpannerPostgreSQLArrayRemoveFunction;
+import org.hibernate.dialect.function.array.SpannerPostgreSQLArrayRemoveIndexFunction;
+import org.hibernate.dialect.Replacer;
+import org.hibernate.dialect.function.SpannerPostgreSQLRegexpLikeFunction;
+import org.hibernate.dialect.function.SpannerPostgreSQLTruncFunction;
+import org.hibernate.dialect.RowLockStrategy;
+import org.hibernate.dialect.lock.PessimisticLockStyle;
+import org.hibernate.dialect.lock.internal.NoLockingSupport;
+import org.hibernate.dialect.lock.internal.LockingSupportSimple;
+import org.hibernate.dialect.lock.spi.ConnectionLockTimeoutStrategy;
+import org.hibernate.dialect.lock.spi.LockTimeoutType;
+import org.hibernate.dialect.lock.spi.LockingSupport;
+import org.hibernate.dialect.lock.spi.OuterJoinLockingType;
+import org.hibernate.dialect.pagination.LimitHandler;
+import org.hibernate.dialect.pagination.LimitOffsetLimitHandler;
+import org.hibernate.dialect.sequence.SequenceSupport;
+import org.hibernate.dialect.temptable.PersistentTemporaryTableStrategy;
+import org.hibernate.dialect.temptable.TemporaryTableStrategy;
+import org.hibernate.dialect.type.PostgreSQLArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.PostgreSQLCastingJsonArrayJdbcTypeConstructor;
+import org.hibernate.dialect.type.PostgreSQLCastingJsonJdbcType;
+import org.hibernate.dialect.type.PostgreSQLUUIDJdbcType;
+import org.hibernate.dialect.unique.AlterTableUniqueIndexDelegate;
+import org.hibernate.dialect.unique.UniqueDelegate;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.model.MutationOperation;
+import org.hibernate.sql.model.internal.OptionalTableUpdate;
+import org.hibernate.sql.model.jdbc.OptionalTableUpdateWithOptionalRowCount;
+import org.hibernate.sql.model.jdbc.OptionalTableUpdateWithUpsertOperation;
+
+import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.engine.config.spi.StandardConverters;
+import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.exception.SQLGrammarException;
+import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
+import org.hibernate.exception.ConstraintViolationException;
+import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
+import org.hibernate.procedure.internal.StandardCallableStatementSupport;
+import org.hibernate.procedure.spi.CallableStatementSupport;
+import org.hibernate.query.common.FetchClauseType;
+import org.hibernate.query.common.TemporalUnit;
+import org.hibernate.query.sqm.IntervalType;
+import org.hibernate.query.sqm.mutation.internal.temptable.PersistentTableInsertStrategy;
+import org.hibernate.query.sqm.mutation.internal.temptable.PersistentTableMutationStrategy;
+import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
+import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.SqlAstTranslatorFactory;
+import org.hibernate.sql.ast.spi.LockingClauseStrategy;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory;
+import org.hibernate.sql.ast.tree.Statement;
+import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.sql.exec.spi.JdbcOperation;
+import org.hibernate.tool.schema.extract.internal.InformationExtractorJdbcDatabaseMetaDataImpl;
+import org.hibernate.tool.schema.extract.spi.ExtractionContext;
+import org.hibernate.tool.schema.extract.spi.InformationExtractor;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
+import org.hibernate.type.StandardBasicTypes;
+import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
+import org.hibernate.type.descriptor.jdbc.ClobJdbcType;
+import org.hibernate.type.descriptor.jdbc.SpannerLocalDateTimeJdbcType;
+import org.hibernate.type.descriptor.jdbc.SpannerLocalTimeJdbcType;
+import org.hibernate.type.descriptor.jdbc.SpannerTimeJdbcType;
+import org.hibernate.type.descriptor.sql.internal.ArrayDdlTypeImpl;
+import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType;
+import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import java.sql.SQLException;
+import java.sql.Types;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetTime;
+import java.time.ZoneOffset;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.regex.Pattern;
+
+import static org.hibernate.sql.ast.internal.NonLockingClauseStrategy.NON_CLAUSE_STRATEGY;
+import static org.hibernate.type.SqlTypes.BIGINT;
+import static org.hibernate.type.SqlTypes.BLOB;
+import static org.hibernate.type.SqlTypes.CHAR;
+import static org.hibernate.type.SqlTypes.CLOB;
+import static org.hibernate.type.SqlTypes.DECIMAL;
+import static org.hibernate.type.SqlTypes.FLOAT;
+import static org.hibernate.type.SqlTypes.INTEGER;
+import static org.hibernate.type.SqlTypes.JSON;
+import static org.hibernate.type.SqlTypes.NCLOB;
+import static org.hibernate.type.SqlTypes.NUMERIC;
+import static org.hibernate.type.SqlTypes.SMALLINT;
+import static org.hibernate.type.SqlTypes.TIME;
+import static org.hibernate.type.SqlTypes.TIMESTAMP;
+import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC;
+import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
+import static org.hibernate.type.SqlTypes.TIME_UTC;
+import static org.hibernate.type.SqlTypes.TINYINT;
+import static org.hibernate.type.SqlTypes.UUID;
+import static org.hibernate.type.SqlTypes.VARCHAR;
+
+public class SpannerPostgreSQLDialect extends PostgreSQLDialect {
+
+	private final UniqueDelegate SPANNER_UNIQUE_DELEGATE = new AlterTableUniqueIndexDelegate( this );
+	private final StandardTableExporter SPANNER_TABLE_EXPORTER = new SpannerPostgreSQLTableExporter( this );
+	private final SequenceSupport SPANNER_SEQUENCE_SUPPORT = new SpannerPostgreSQLSequenceSupport(this);
+
+	// This will use a monotonically increasing value that is within the range of a 32-bit integer
+	// as the primary key value. Since Spanner only supports bit-reversed sequences, this option
+	// range of a 32-bit integer.
+	// This workaround that is only intended for testing, and should not be used for primary key
+	// values in production.
+	private static final String USE_INTEGER_FOR_PRIMARY_KEY = "hibernate.dialect.spanner.use_integer_for_primary_key";
+	private static final String USE_EMULATOR = "hibernate.dialect.spanner.use_emulator";
+
+	private boolean useIntegerForPrimaryKey;
+	private boolean useEmulator;
+
+	private final LockingSupport SPANNER_LOCKING_SUPPORT = new LockingSupportSimple(
+			PessimisticLockStyle.CLAUSE,
+			RowLockStrategy.NONE,
+			LockTimeoutType.NONE,
+			OuterJoinLockingType.FULL,
+			ConnectionLockTimeoutStrategy.NONE
+	);
+
+	protected final static DatabaseVersion MINIMUM_POSTGRES_VERSION = DatabaseVersion.make( 15 );
+
+	private static final Pattern NOT_NULL_CONSTRAINT_PATTERN = Pattern.compile( ".*(must not be NULL in table|does not specify a non-null value for NOT NULL column|Cannot specify a null value for column).*" );
+	private static final Pattern FOREIGN_KEY_CONSTRAINT_PATTERN = Pattern.compile( ".*Foreign key.*(constraint violation on table|constraint violation when deleting or updating referenced key|violated on table).*" );
+	private static final Pattern CHECK_CONSTRAINT_PATTERN = Pattern.compile( ".*Check constraint.*" );
+	private static final Pattern TABLE_DOES_NOT_EXIST_PATTERN = Pattern.compile( ".*relation.*does not exist.*" );
+
+	public SpannerPostgreSQLDialect() {
+		super();
+	}
+
+	public SpannerPostgreSQLDialect(DialectResolutionInfo info) {
+		super( info );
+	}
+
+	public SpannerPostgreSQLDialect(DatabaseVersion version) {
+		super( MINIMUM_POSTGRES_VERSION );
+	}
+
+	@Override
+	public void initializeFunctionRegistry(FunctionContributions functionContributions) {
+		super.initializeFunctionRegistry( functionContributions );
+
+		final var functionFactory = new CommonFunctionFactory( functionContributions );
+		final var functionRegistry = functionContributions.getFunctionRegistry();
+
+		functionFactory.leftRight_substr();
+		functionFactory.pi_acos();
+		functionFactory.log_ln();
+		functionFactory.degrees_acos();
+		functionFactory.radians_acos();
+		functionFactory.bitandorxornot_operator();
+		functionFactory.characterLength_length( SqlAstNodeRenderingMode.DEFAULT);
+		functionFactory.dateTrunc();
+		functionRegistry.registerAlternateKey("log10", "log");
+		functionFactory.power_spanner();
+		functionFactory.sqrt_spanner();
+		functionFactory.substr();
+		functionFactory.position_locate_spanner();
+		functionFactory.round_spanner();
+		functionFactory.log_spanner();
+		functionFactory.sinh_exp();
+		functionFactory.cosh_exp();
+		functionFactory.tanh_exp();
+		functionRegistry.register(
+				"count",
+				new CountFunction(
+						this,
+						functionContributions.getTypeConfiguration(),
+						SqlAstNodeRenderingMode.DEFAULT,
+						"||",
+						"varchar",
+						true
+				)
+		);
+		functionRegistry.registerPattern(
+				"chr",
+				"'~'",
+				functionContributions.getTypeConfiguration().getBasicTypeRegistry().resolve( StandardBasicTypes.STRING )
+		);
+		functionRegistry.registerPattern(
+				"var_pop",
+				"(avg(?1 * ?1)-power(cast(avg(?1) as float8),cast(2 as float8)))" );
+		functionRegistry.registerPattern(
+				"stddev_pop",
+				"sqrt(avg(?1 * ?1)-power(cast(avg(?1) as float8),cast(2 as float8)))" );
+
+		functionFactory.varSamp_sumCount_spanner();
+		functionFactory.stddevSamp_sumCount_spanner();
+
+		functionFactory.octetLength_pattern("length(?1)");
+		functionFactory.bitLength_pattern("length(?1)*8");
+		functionFactory.sha("sha256(?1)");
+
+		functionRegistry.register( "concat",
+				new SpannerConcatFunction( functionContributions.getTypeConfiguration()) );
+		functionRegistry.register( "regexp_like",
+				new SpannerPostgreSQLRegexpLikeFunction(functionContributions.getTypeConfiguration()));
+		functionRegistry.register( "trunc",
+				new SpannerPostgreSQLTruncFunction(functionContributions.getTypeConfiguration()));
+		functionRegistry.registerAlternateKey("truncate", "trunc");
+		functionRegistry.register( "overlay",
+				new InsertSubstringOverlayEmulation(functionContributions.getTypeConfiguration(), false));
+
+		// Postgres uses # instead of ^ for XOR
+		functionRegistry.patternDescriptorBuilder( "bitxor", "(?1#?2)" )
+				.setExactArgumentCount( 2 )
+				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.register();
+
+		functionRegistry.register( "json_array",
+				new SpannerPostgreSQLJsonArrayFunction( functionContributions.getTypeConfiguration() ) );
+		functionRegistry.register( "json_object",
+				new SpannerPostgreSQLJsonObjectFunction( functionContributions.getTypeConfiguration() ) );
+
+		functionFactory.unnest_postgresql( false );
+		functionFactory.arrayLength_spannerpg();
+
+		functionRegistry.register( "array_prepend", new SpannerPostgreSQLArrayConcatElementFunction( true ) );
+		functionRegistry.register( "array_append", new SpannerPostgreSQLArrayConcatElementFunction( false ) );
+		functionRegistry.register( "array_trim", new SpannerPostgreSQLArrayTrimEmulation() );
+		functionRegistry.register( "array_replace", new SpannerPostgreSQLArrayReplaceFunction() );
+		functionRegistry.register( "array_remove", new SpannerPostgreSQLArrayRemoveFunction() );
+		functionRegistry.register( "array_remove_index", new SpannerPostgreSQLArrayRemoveIndexFunction( true ) );
+		functionRegistry.register( "array_contains", new ArrayContainsOperatorFunction( false, functionContributions.getTypeConfiguration() ) );
+		functionRegistry.register( "array_includes", new ArrayIncludesOperatorFunction( false, functionContributions.getTypeConfiguration() ) );
+		functionRegistry.register( "array_includes_nullable", new ArrayIncludesOperatorFunction( true, functionContributions.getTypeConfiguration() ) );
+	}
+
+	@Override
+	protected void registerJsonFunction(CommonFunctionFactory functionFactory) {
+		functionFactory.jsonObject_postgresql();
+		functionFactory.jsonArray_postgresql();
+		functionFactory.jsonSet_postgresql();
+		functionFactory.jsonRemove_postgresql();
+		functionFactory.jsonReplace_postgresql();
+		functionFactory.jsonArrayInsert_postgresql();
+	}
+
+	@Override
+	protected void registerArrayFunctions(CommonFunctionFactory functionFactory) {
+		functionFactory.array_postgresql();
+		functionFactory.arrayAggregate();
+		functionFactory.arrayConcat_postgresql();
+		functionFactory.arrayPrepend_postgresql();
+		functionFactory.arrayAppend_postgresql();
+		functionFactory.arrayIntersects_postgresql();
+		functionFactory.arrayGet_bracket();
+		functionFactory.arraySlice_operator();
+		functionFactory.arrayReplace();
+		functionFactory.arrayReverse_unnest();
+		functionFactory.arraySort_unnest();
+		functionFactory.arrayToString_postgresql();
+	}
+
+	@Override
+	protected void registerXmlFunctions(CommonFunctionFactory functionFactory) {
+	}
+
+	@Override
+	protected void registerUtilityFunctions(FunctionContributions functionContributions) {
+	}
+
+	@Override
+	protected void initDefaultProperties() {
+		super.initDefaultProperties();
+		getDefaultProperties().setProperty( AvailableSettings.PREFERRED_POOLED_OPTIMIZER, "none" );
+	}
+
+	@Override
+	public String getArrayTypeName(String javaElementTypeName, String elementTypeName, Integer maxLength) {
+		if ( elementTypeName != null && elementTypeName.equals( "varchar" ) ) {
+			elementTypeName = "text";
+		}
+		return super.getArrayTypeName( javaElementTypeName, elementTypeName, maxLength );
+	}
+
+	@Override
+	public StandardTableExporter getTableExporter() {
+		return SPANNER_TABLE_EXPORTER;
+	}
+
+	@Override
+	public UniqueDelegate getUniqueDelegate() {
+		return SPANNER_UNIQUE_DELEGATE;
+	}
+
+	@Override
+	public SequenceSupport getSequenceSupport() {
+		return SPANNER_SEQUENCE_SUPPORT;
+	}
+
+	@Override
+	public LimitHandler getLimitHandler() {
+		return LimitOffsetLimitHandler.INSTANCE;
+	}
+
+	@Override
+	public String getCheckCondition(String columnName, String[] values) {
+		final StringBuilder check = new StringBuilder();
+		check.append("(");
+		String separator = "";
+		boolean nullIsValid = false;
+		for (String value : values) {
+			if (value == null) {
+				nullIsValid = true;
+				continue;
+			}
+			check.append(separator).append(columnName).append("='").append(value).append("'");
+			separator = " or ";
+		}
+		check.append(")");
+		if (nullIsValid) {
+			check.append(" or ").append(columnName).append(" is null");
+		}
+		return check.toString();
+	}
+
+	@Override
+	public String getCheckCondition(String columnName, Long[] values) {
+		final StringBuilder check = new StringBuilder();
+		check.append("(");
+		String separator = "";
+		boolean nullIsValid = false;
+		for (Long value : values) {
+			if (value == null) {
+				nullIsValid = true;
+				continue;
+			}
+			check.append(separator).append(columnName).append("=").append(value);
+			separator = " or ";
+		}
+		check.append(")");
+		if (nullIsValid) {
+			check.append(" or ").append(columnName).append(" is null");
+		}
+		return check.toString();
+	}
+
+	@Override
+	public String getCheckCondition(String columnName, java.util.Collection<?> valueSet,
+			org.hibernate.type.descriptor.jdbc.JdbcType jdbcType) {
+		final boolean isCharacterJdbcType = org.hibernate.type.SqlTypes.isCharacterType(jdbcType.getJdbcTypeCode());
+
+		final StringBuilder check = new StringBuilder();
+		check.append("(");
+		String separator = "";
+		boolean nullIsValid = false;
+		for (Object value : valueSet) {
+			if (value == null) {
+				nullIsValid = true;
+				continue;
+			}
+			check.append(separator).append(columnName).append("=");
+			if (isCharacterJdbcType) {
+				check.append("'").append(String.valueOf(value).replace("'", "''")).append("'");
+			}
+			else {
+				check.append(value);
+			}
+			separator = " or ";
+		}
+		check.append(")");
+		if (nullIsValid) {
+			check.append(" or ").append(columnName).append(" is null");
+		}
+		return check.toString();
+	}
+
+	// @Override
+	// public String getCheckCondition(String columnName, long[] values) {
+	// final Long[] boxedValues = new Long[values.length];
+	// for (int i = 0; i < values.length; i++) {
+	// boxedValues[i] = values[i];
+	// }
+	// return getCheckCondition(columnName, boxedValues);
+	// }
+
+	@Override
+	public AggregateSupport getAggregateSupport() {
+		return SpannerPostgreSQLAggregateSupport.INSTANCE;
+	}
+
+	@Override
+	public LockingSupport getLockingSupport() {
+		return useEmulator ? NoLockingSupport.NO_LOCKING_SUPPORT : SPANNER_LOCKING_SUPPORT;
+	}
+
+	@Override
+	protected Integer resolveSqlTypeCode(String columnTypeName, TypeConfiguration typeConfiguration) {
+		return switch (columnTypeName) {
+			case "character varying" -> Types.VARCHAR;
+			case "timestamp with time zone" -> Types.TIMESTAMP_WITH_TIMEZONE;
+			case "bigint" -> Types.BIGINT;
+			case "real" -> Types.REAL; // Use REAL instead of FLOAT to get Float as recommended Java type
+			default -> super.resolveSqlTypeCode( columnTypeName, typeConfiguration );
+		};
+	}
+
+	@Override
+	public boolean supportsFetchClause(FetchClauseType type) {
+		return false;
+	}
+
+	@Override
+	public String getForUpdateString() {
+		return " for update";
+	}
+
+	@Override
+	public String getForUpdateString(String aliases) {
+		return getForUpdateString();
+	}
+
+	@Override
+	public String getWriteLockString(int timeout) {
+		validateSpannerLockTimeout( timeout );
+		return getForUpdateString();
+	}
+
+	@Override
+	public String getWriteLockString(String aliases, int timeout) {
+		return getWriteLockString( timeout );
+	}
+
+	@Override
+	public String getWriteLockString(Timeout timeout) {
+		return getWriteLockString( timeout.milliseconds() );
+	}
+
+	@Override
+	public String getWriteLockString(String aliases, Timeout timeout) {
+		return getWriteLockString( aliases, timeout.milliseconds() );
+	}
+
+	@Override
+	public String getReadLockString(int timeout) {
+		validateSpannerLockTimeout( timeout );
+		return getForUpdateString();
+	}
+
+	@Override
+	public String getReadLockString(Timeout timeout) {
+		return getWriteLockString( timeout.milliseconds() );
+	}
+
+	@Override
+	public String getReadLockString(String aliases, Timeout timeout) {
+		return getWriteLockString( timeout.milliseconds() );
+	}
+
+	@Override
+	public String getReadLockString(String aliases, int timeout) {
+		return getWriteLockString( timeout );
+	}
+
+	@Override
+	public String getForUpdateNowaitString() {
+		throw new UnsupportedOperationException(
+				"Spanner doesn't support for-update with no-wait timeout" );
+	}
+
+	@Override
+	public String getForUpdateNowaitString(String aliases) {
+		return getForUpdateNowaitString();
+	}
+
+	@Override
+	public String getForUpdateSkipLockedString() {
+		throw new UnsupportedOperationException(
+				"Spanner doesn't support for-update with skip locked timeout" );
+	}
+
+	@Override
+	public String getForUpdateSkipLockedString(String aliases) {
+		return getForUpdateSkipLockedString();
+	}
+
+	@Override
+	public LockingClauseStrategy getLockingClauseStrategy(
+			QuerySpec querySpec, LockOptions lockOptions) {
+		if ( lockOptions == null ) {
+			return NON_CLAUSE_STRATEGY;
+		}
+		validateSpannerLockTimeout( lockOptions.getTimeOut() );
+		return super.getLockingClauseStrategy( querySpec, lockOptions );
+	}
+
+	private static void validateSpannerLockTimeout(int millis) {
+		if ( Timeouts.isRealTimeout( millis ) ) {
+			throw new UnsupportedOperationException( "Spanner does not support lock timeout." );
+		}
+		if ( millis == Timeouts.SKIP_LOCKED_MILLI ) {
+			throw new UnsupportedOperationException( "Spanner does not support skip locked." );
+		}
+		if ( millis == Timeouts.NO_WAIT_MILLI ) {
+			throw new UnsupportedOperationException( "Spanner does not support no wait." );
+		}
+	}
+
+	@Override
+	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+		super.contributeTypes( typeContributions, serviceRegistry );
+
+		final var configurationService = serviceRegistry.requireService( ConfigurationService.class );
+
+		this.useIntegerForPrimaryKey = configurationService.getSetting(
+				USE_INTEGER_FOR_PRIMARY_KEY,
+				StandardConverters.BOOLEAN,
+				false
+		);
+
+		this.useEmulator = configurationService.getSetting(
+				USE_EMULATOR,
+				StandardConverters.BOOLEAN,
+				false
+		);
+	}
+
+	@Override
+	public FunctionalDependencyAnalysisSupport getFunctionalDependencyAnalysisSupport() {
+		return FunctionalDependencyAnalysisSupportImpl.NONE;
+	}
+
+	@Override
+	protected void contributePostgreSQLTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+		final var jdbcTypeRegistry = typeContributions.getTypeConfiguration()
+				.getJdbcTypeRegistry();
+
+		jdbcTypeRegistry.addDescriptor( SpannerLocalDateTimeJdbcType.INSTANCE );
+		jdbcTypeRegistry.addDescriptor( SpannerLocalTimeJdbcType.INSTANCE );
+		jdbcTypeRegistry.addDescriptor( SpannerTimeJdbcType.INSTANCE );
+		jdbcTypeRegistry.addDescriptor( Types.BLOB, BlobJdbcType.BLOB_BINDING );
+		jdbcTypeRegistry.addDescriptor( Types.CLOB, ClobJdbcType.CLOB_BINDING );
+		jdbcTypeRegistry.addDescriptor( PostgreSQLUUIDJdbcType.INSTANCE );
+
+		// Replace the standard array constructor
+		jdbcTypeRegistry.addTypeConstructor( PostgreSQLArrayJdbcTypeConstructor.INSTANCE );
+
+		jdbcTypeRegistry.addDescriptorIfAbsent( PostgreSQLCastingJsonJdbcType.JSONB_INSTANCE );
+		jdbcTypeRegistry.addTypeConstructorIfAbsent( PostgreSQLCastingJsonArrayJdbcTypeConstructor.JSONB_INSTANCE );
+	}
+
+	@Override
+	public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
+		return new StandardSqlAstTranslatorFactory() {
+			@Override
+			protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
+				return new SpannerPostgreSQLSqlAstTranslator<T>( sessionFactory, statement );
+			}
+		};
+	}
+
+	@Override
+	protected void registerPostgreSQLColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+
+		// We need to configure that the array type uses the raw element type for casts
+		ddlTypeRegistry.addDescriptor( new ArrayDdlTypeImpl( this, true ) );
+		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( UUID, "uuid", this ) );
+		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( JSON, "jsonb", this ) );
+
+		ddlTypeRegistry.addDescriptor(
+				CapacityDependentDdlType.builder( FLOAT, columnType( FLOAT ), castType( FLOAT ), this )
+						.withTypeCapacity( 24, "real" )
+						.withTypeCapacity( 53, "double precision" )
+						.build()
+		);
+	}
+
+	@Override
+	public void appendDateTimeLiteral(
+			SqlAppender appender,
+			TemporalAccessor temporalAccessor,
+			@SuppressWarnings("deprecation")
+			TemporalType precision,
+			TimeZone jdbcTimeZone) {
+		if ( precision == TemporalType.TIME || (precision == TemporalType.TIMESTAMP && !temporalAccessor.isSupported( ChronoField.OFFSET_SECONDS ))) {
+			precision = TemporalType.TIMESTAMP;
+			if ( temporalAccessor instanceof LocalTime localTime) {
+				temporalAccessor = localTime.atDate( LocalDate.of( 1970, 1, 1 ) )
+						.atOffset( ZoneOffset.UTC );
+			}
+			else if ( temporalAccessor instanceof OffsetTime offsetTime ) {
+				temporalAccessor = offsetTime.atDate( LocalDate.of( 1970, 1, 1 ) );
+			}
+			else if ( temporalAccessor instanceof LocalDateTime localDateTime) {
+				temporalAccessor = localDateTime.atOffset(  ZoneOffset.UTC );
+			}
+			else if ( temporalAccessor instanceof Instant instant) {
+				temporalAccessor = instant.atOffset(  ZoneOffset.UTC );
+			}
+			else {
+				throw new UnsupportedOperationException( "Unsupported temporal type: " + temporalAccessor.getClass().getName() );
+			}
+		}
+
+		super.appendDateTimeLiteral(  appender, temporalAccessor, precision, jdbcTimeZone );
+	}
+
+	@Override
+	public void appendDateTimeLiteral(
+			SqlAppender appender,
+			Date date,
+			@SuppressWarnings("deprecation")
+			TemporalType precision,
+			TimeZone jdbcTimeZone) {
+		if ( precision == TemporalType.TIME ) {
+			precision = TemporalType.TIMESTAMP;
+		}
+		super.appendDateTimeLiteral( appender, date, precision, jdbcTimeZone );
+	}
+
+	public void appendDateTimeLiteral(
+			SqlAppender appender,
+			Calendar calendar,
+			@SuppressWarnings("deprecation")
+			TemporalType precision,
+			TimeZone jdbcTimeZone) {
+		if ( precision == TemporalType.TIME ) {
+			precision = TemporalType.TIMESTAMP;
+		}
+
+		super.appendDateTimeLiteral( appender, calendar, precision, jdbcTimeZone );
+	}
+
+	@Override
+	protected String castType(int sqlTypeCode) {
+		return switch (sqlTypeCode) {
+			case TIME, TIME_UTC, TIMESTAMP, TIMESTAMP_UTC -> columnType(TIMESTAMP_WITH_TIMEZONE);
+			default -> super.castType(sqlTypeCode);
+		};
+	}
+
+	@Override
+	public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType, IntervalType intervalType) {
+		final String temporal = temporalType == TemporalType.DATE ? "cast(?3 as " + castType(TIMESTAMP) + ")" : "?3";
+		return intervalType != null
+				? "(?2+" + temporal + ")"
+				: "cast(" + temporal + "+" + intervalPattern(unit) + " as " + castTemporalType(temporalType) + ")";
+	}
+
+	@Override
+	public String timestampdiffPattern(TemporalUnit unit, TemporalType fromTemporalType, TemporalType toTemporalType) {
+		final String pattern = switch (unit) {
+			case YEAR -> "extract(year from ?3)-extract(year from ?2)";
+			// For month, we also need to account for years
+			case MONTH -> "(extract(year from ?3)-extract(year from ?2))*12+(extract(month from ?3)-extract(month from ?2))";
+			// Quarter is month diff / 3
+			case QUARTER ->
+				"((extract(year from ?3)-extract(year from ?2))*12+(extract(month from ?3)-extract(month from ?2)))/3";
+			case WEEK -> "(extract(epoch from ?3)-extract(epoch from ?2))/604800";
+			case DAY -> "(extract(epoch from ?3)-extract(epoch from ?2))/86400";
+			case HOUR -> "(extract(epoch from ?3)-extract(epoch from ?2))/3600";
+			case MINUTE -> "(extract(epoch from ?3)-extract(epoch from ?2))/60";
+			case SECOND -> "extract(epoch from ?3)-extract(epoch from ?2)";
+			case NANOSECOND -> "(extract(epoch from ?3)-extract(epoch from ?2))*1e9";
+			case NATIVE -> "extract(epoch from ?3)-extract(epoch from ?2)";
+			default -> "extract(epoch from ?3)-extract(epoch from ?2)";
+		};
+
+		return "cast(" + pattern + " as bigint)";
+	}
+
+	@Override
+	public String castPattern(CastType from, CastType to) {
+		if (from == CastType.STRING && to == CastType.TIME) {
+			return "cast('1970-01-01 ' || ?1 as timestamp with time zone)";
+		}
+		if (from == CastType.TIME && to == CastType.STRING) {
+			return "to_char(?1, 'HH24:MI:SS.MS')";
+		}
+		return super.castPattern(from, to);
+	}
+
+	private static String intervalPattern(TemporalUnit unit) {
+		return switch (unit) {
+			case NANOSECOND -> "cast(concat(cast((?2)/1e3 as text), ' microsecond') as interval)";
+			case NATIVE -> "cast(concat(cast((?2) as text), ' second') as interval)";
+			case QUARTER -> "cast(concat(cast((?2)*3 as text), ' month') as interval)";
+			case WEEK -> "cast(concat(cast((?2) as text), ' week') as interval)";
+			default -> "cast(concat(cast((?2) as text), ' " + unit + "') as interval)";
+		};
+	}
+
+	private String castTemporalType(TemporalType temporalType) {
+		return switch (temporalType) {
+			case TIME, TIMESTAMP -> castType( TIMESTAMP );
+			default -> temporalType.name().toLowerCase();
+		};
+	}
+
+	@Override
+	protected String columnType(int sqlTypeCode) {
+		return switch (sqlTypeCode) {
+			// Spanner doesn't support precision with the timestamp
+			case TIME, TIME_UTC, TIMESTAMP, TIMESTAMP_UTC, TIMESTAMP_WITH_TIMEZONE -> "timestamp with time zone";
+			case BLOB -> "bytea";
+			case CLOB, NCLOB -> "character varying";
+			// Spanner doesn't support NUMERIC with precision and scale
+			case NUMERIC ->  "numeric";
+			case DECIMAL ->  "decimal";
+			// Spanner doesn't support CHAR so we should use VARCHAR
+			case CHAR -> columnType( VARCHAR );
+			case SMALLINT, INTEGER, TINYINT ->  columnType( BIGINT );
+			default -> super.columnType(sqlTypeCode);
+		};
+	}
+
+	@Override
+	public ScrollMode defaultScrollMode() {
+		return ScrollMode.FORWARD_ONLY;
+	}
+
+	@Override
+	public boolean supportsTupleCounts() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsUserDefinedTypes() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsFilterClause() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsRecursiveCycleUsingClause() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsRecursiveSearchClause() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsUniqueConstraints() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsRowValueConstructorGtLtSyntax() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsRowValueConstructorSyntax() {
+		return false;
+	}
+
+	// ALL subqueries with operators other than <>/!= are not supported
+	@Override
+	public boolean supportsRowValueConstructorSyntaxInQuantifiedPredicates() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsValuesList() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsRowValueConstructorSyntaxInInSubQuery() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsCaseInsensitiveLike() {
+		return false;
+	}
+
+	@Override
+	public String currentTimestamp() {
+		return currentTimestampWithTimeZone();
+	}
+
+	@Override
+	public String currentTime() {
+		return currentTimestampWithTimeZone();
+	}
+
+	@Override
+	public String currentLocalTimestamp() {
+		return currentTimestampWithTimeZone();
+	}
+
+	@Override
+	public String currentLocalTime() {
+		return currentTimestampWithTimeZone();
+	}
+
+	@Override
+	public boolean supportsLateral() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsFromClauseInUpdate() {
+		return false;
+	}
+
+	@Override
+	public int getMaxVarcharLength() {
+		return 2_621_440;
+	}
+
+	@Override
+	public int getMaxVarbinaryLength() {
+		//max is equivalent 10 MiB
+		return 10_485_760;
+	}
+
+	@Override
+	public String getCurrentSchemaCommand() {
+		return "";
+	}
+
+	@Override
+	public boolean supportsCommentOn() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsWindowFunctions() {
+		return false;
+	}
+
+	@Override
+	public int getInExpressionCountLimit() {
+		return 100;
+	}
+
+	@Override
+	public String getAddForeignKeyConstraintString(
+			String constraintName,
+			String[] foreignKey,
+			String referencedTable,
+			String[] primaryKey,
+			boolean referencesPrimaryKey) {
+		// Cloud Spanner requires the referenced columns to specified in all cases, including
+		// if the foreign key is referencing the primary key of the referenced table. Setting referencesPrimaryKey to
+		// false will add all the referenced columns.
+		return super.getAddForeignKeyConstraintString( constraintName, foreignKey, referencedTable, primaryKey, false );
+	}
+
+	@Override
+	public boolean canBatchTruncate() {
+		return false;
+	}
+
+	@Override
+	public String rowId(String rowId) {
+		return null;
+	}
+
+	@Override
+	public boolean supportsRowConstructor() {
+		return false;
+	}
+
+	@Override
+	public String getTruncateTableStatement(String tableName) {
+		return "delete from " + tableName;
+	}
+
+	@Override
+	public String getBeforeDropStatement() {
+		return null;
+	}
+
+	@Override
+	public String getCascadeConstraintsString() {
+		return "";
+	}
+
+	@Override
+	public boolean supportsIfExistsBeforeConstraintName() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsIfExistsAfterAlterTable() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsDistinctFromPredicate() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsPartitionBy() {
+		return false;
+	}
+
+	@Override
+	public boolean addPartitionKeyToPrimaryKey() {
+		return false;
+	}
+
+	@Override
+	public String getDual() {
+		return "unnest(ARRAY[1])";
+	}
+
+	@Override
+	public String getFromDualForSelectOnly() {
+		return " from " + getDual() + " dual";
+	}
+
+	public Replacer datetimeFormat(String format) {
+		return org.hibernate.dialect.OracleDialect.datetimeFormat(format, true, false)
+				.replace("SSSSSS", "US")
+				.replace("SSSSS", "US")
+				.replace("SSSS", "US")
+				.replace("SSS", "MS")
+				.replace("SS", "MS")
+				.replace("S", "MS")
+				// use ISO day in week, as per DateTimeFormatter
+				.replace("ee", "ID")
+				.replace("e", "fmID")
+				// TZR is TZ in Postgres
+				.replace("zzz", "TZ")
+				.replace("zz", "TZ")
+				.replace("z", "TZ")
+				.replace("ZZZ", "OF")
+				.replace("ZZ", "OF")
+				.replace("Z", "OF")
+				.replace("xxx", "OF")
+				.replace("xx", "OF")
+				.replace("x", "OF")
+				.replace("a", "AM")
+				// Spanner-specific overrides
+				.replace("hh", "HH12")
+				.replace("h", "HH12");
+	}
+
+	@Override
+	public boolean supportsRecursiveCTE() {
+		return false;
+	}
+
+	public boolean supportsWithClauseInSubquery() {
+		return false;
+	}
+
+	public boolean supportsNestedWithClause() {
+		return false;
+	}
+
+	public boolean supportsCteHeaderColumnList() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsTupleDistinctCounts() {
+		return false;
+	}
+
+	@Override
+	public InformationExtractor getInformationExtractor(ExtractionContext extractionContext) {
+		return new InformationExtractorJdbcDatabaseMetaDataImpl( extractionContext );
+	}
+
+	@Override
+	public SqmMultiTableMutationStrategy getFallbackSqmMutationStrategy(
+			EntityMappingType rootEntityDescriptor,
+			RuntimeModelCreationContext runtimeModelCreationContext) {
+		return new PersistentTableMutationStrategy( rootEntityDescriptor, runtimeModelCreationContext );
+	}
+
+	@Override
+	public SqmMultiTableInsertStrategy getFallbackSqmInsertStrategy(
+			EntityMappingType rootEntityDescriptor,
+			RuntimeModelCreationContext runtimeModelCreationContext) {
+		return new PersistentTableInsertStrategy( rootEntityDescriptor, runtimeModelCreationContext );
+	}
+
+	@Override
+	public TemporaryTableStrategy getLocalTemporaryTableStrategy() {
+		return null;
+	}
+
+	@Override
+	public @Nullable TemporaryTableStrategy getGlobalTemporaryTableStrategy() {
+		return null;
+	}
+
+	@Override
+	public TemporaryTableStrategy getPersistentTemporaryTableStrategy() {
+		return new PersistentTemporaryTableStrategy( this );
+	}
+
+	@Override
+	public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
+		return this::handleConstraintViolatedException;
+	}
+
+	private @Nullable JDBCException handleConstraintViolatedException(SQLException sqlException, String message, String sql) {
+		if (sqlException.getErrorCode() == 6) {
+			return new ConstraintViolationException( message, sqlException, ConstraintViolationException.ConstraintKind.UNIQUE, null );
+		}
+		else if (sqlException.getErrorCode() == 5 || matches( TABLE_DOES_NOT_EXIST_PATTERN, message )) {
+			return new SQLGrammarException( message, sqlException );
+		}
+		else if (matches( NOT_NULL_CONSTRAINT_PATTERN, message )) {
+			return new ConstraintViolationException( message, sqlException, ConstraintViolationException.ConstraintKind.NOT_NULL, null );
+		}
+		else if (matches( CHECK_CONSTRAINT_PATTERN, message )) {
+			return new ConstraintViolationException( message, sqlException, ConstraintViolationException.ConstraintKind.CHECK, null );
+		}
+		else if(matches( FOREIGN_KEY_CONSTRAINT_PATTERN, message )) {
+			return new ConstraintViolationException( message, sqlException, ConstraintViolationException.ConstraintKind.FOREIGN_KEY, null );
+		}
+		else {
+			return null;
+		}
+	}
+
+	private boolean matches(Pattern pattern, String message) {
+		return pattern.matcher( message ).matches();
+	}
+
+	@Override
+	public CallableStatementSupport getCallableStatementSupport() {
+		return StandardCallableStatementSupport.NO_REF_CURSOR_INSTANCE;
+	}
+
+	public boolean useIntegerForPrimaryKey() {
+		return useIntegerForPrimaryKey;
+	}
+
+	@Override
+	public MutationOperation createOptionalTableUpdateOperation(
+			EntityMutationTarget mutationTarget,
+			OptionalTableUpdate optionalTableUpdate,
+			SessionFactoryImplementor factory) {
+		// Spanner returns 0 affected rows for ON CONFLICT DO NOTHING upsert operations
+		// when the row already exists, while Hibernate's default expectation expects 1
+		// affected row.
+		// However, we only want to apply this for truly optional tables.
+		// For non-optional tables, we want to keep the default expectation
+		// (expecting 1 row) so it correctly throws StaleStateException on conflict
+		// after a failed update (e.g. due to version mismatch).
+		// However, for unversioned entities, a no-op on conflict is fine even for
+		// non-optional tables, so we allow 0 rows affected for them as well.
+		boolean isOptional = optionalTableUpdate.getMutatingTable().getTableMapping().isOptional();
+		boolean isVersioned = mutationTarget.getTargetPart().getVersionMapping() != null;
+		if (isOptional || !isVersioned) {
+			return new OptionalTableUpdateWithUpsertOperation(
+					mutationTarget,
+					new OptionalTableUpdateWithOptionalRowCount(optionalTableUpdate),
+					factory);
+		}
+		else {
+			return super.createOptionalTableUpdateOperation( mutationTarget, optionalTableUpdate, factory );
+		}
+	}
+}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SpannerPostgreSQLTableExporter.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SpannerPostgreSQLTableExporter.java
new file mode 100644
index 000000000000..b009f82832cf
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SpannerPostgreSQLTableExporter.java
@@ -0,0 +1,101 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.model.relational.SqlStringGenerationContext;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.tool.schema.internal.ColumnValue;
+import org.hibernate.mapping.Index;
+import org.hibernate.mapping.PrimaryKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.mapping.UniqueKey;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
+
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class SpannerPostgreSQLTableExporter extends StandardTableExporter {
+
+	public SpannerPostgreSQLTableExporter(Dialect dialect) {
+		super( dialect );
+	}
+
+	@Override
+	public String[] getSqlCreateStrings(Table table, Metadata metadata, SqlStringGenerationContext context) {
+		// Spanner mandates that primary key should be present in all the tables. For element collection tables or
+		// sequence tables, there will be no primary key. In order to fix the problem, we randomly generate
+		// the ID column with BIT_REVERSED_POSITIVE sequence
+		if ( !table.hasPrimaryKey() && (isElementCollectionTable(table, metadata) || isHistoryOrAuditedTable(table, metadata) || isSequenceTable(table, context))) {
+			Column column = getAutoGeneratedPrimaryKeyColumn( table, metadata );
+			table.addColumn( column );
+
+			PrimaryKey primaryKey = new PrimaryKey( table );
+			primaryKey.addColumn( column );
+
+			table.setPrimaryKey( primaryKey );
+		}
+
+		return super.getSqlCreateStrings( table, metadata, context );
+	}
+
+	private boolean isSequenceTable(Table table, SqlStringGenerationContext context) {
+		return table.getColumnSpan() == 1 && table.getInitCommands( context ).size() == 1;
+	}
+
+	private boolean isHistoryOrAuditedTable(Table targetTable, Metadata metadata) {
+		return metadata.getCollectionBindings().stream()
+					.anyMatch( collection -> collection.getAuxiliaryTable() == targetTable )
+			|| metadata.getEntityBindings().stream()
+					.filter( entity -> entity instanceof RootClass )
+					.anyMatch( entity -> ((RootClass) entity).getAuxiliaryTable() == targetTable );
+	}
+
+	public boolean isElementCollectionTable(Table targetTable, Metadata metadata) {
+		return metadata.getCollectionBindings().stream()
+				.filter( collection -> collection.getCollectionTable() == targetTable )
+				.anyMatch( collection -> !collection.isOneToMany() );
+	}
+
+	@Override
+	public String[] getSqlDropStrings(Table table, Metadata metadata, SqlStringGenerationContext context) {
+		// Spanner requires the indexes to be dropped before dropping the table
+		List<String> sqlDropIndexStrings = new ArrayList<>();
+		for ( Index index : table.getIndexes().values() ) {
+			sqlDropIndexStrings.add( sqlDropIndexString(index.getName()) );
+		}
+		// Spanner requires all the unique indexes to be dropped before dropping the tables
+		for ( UniqueKey uniqueKey : table.getUniqueKeys().values() ) {
+			sqlDropIndexStrings.add( sqlDropIndexString(uniqueKey.getName()) );
+		}
+		for ( Column column : table.getColumns() ) {
+			if ( column.isUnique() ) {
+				sqlDropIndexStrings.add( sqlDropIndexString(column.getUniqueKeyName()) );
+			}
+		}
+		String[] sqlDropStrings = super.getSqlDropStrings( table, metadata, context );
+		return Stream.concat( sqlDropIndexStrings.stream(), Stream.of( sqlDropStrings ) )
+				.toArray( String[]::new );
+	}
+
+	private String sqlDropIndexString(String indexName) {
+		return "drop index if exists " + indexName;
+	}
+
+	private Column getAutoGeneratedPrimaryKeyColumn(Table table, Metadata metadata) {
+		Column column = new Column( "rowid" );
+		column.setSqlTypeCode( Types.BIGINT );
+		column.setNullable( false );
+		column.setSqlType( "bigint" );
+		column.setOptions( "hidden" );
+		column.setIdentity( true );
+		column.setValue( new ColumnValue( metadata.getDatabase(), table, column, metadata.getDatabase().getTypeConfiguration().getBasicTypeForJavaType( Long.class ) ) );
+		return column;
+	}
+}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java
index d025598c4c15..b47549c67373 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacyDialect.java
@@ -12,6 +12,14 @@
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.dialect.NationalizationSupport;
 import org.hibernate.dialect.SybaseDriverKind;
+import org.hibernate.dialect.SybaseJtdsJsonAsStringArrayJdbcTypeConstructor;
+import org.hibernate.dialect.SybaseJtdsJsonAsStringJdbcType;
+import org.hibernate.dialect.SybaseJtdsLongNVarcharJdbcType;
+import org.hibernate.dialect.SybaseJtdsNCharJdbcType;
+import org.hibernate.dialect.SybaseJtdsNClobJdbcType;
+import org.hibernate.dialect.SybaseJtdsNVarcharJdbcType;
+import org.hibernate.dialect.SybaseJtdsXmlAsStringArrayJdbcTypeConstructor;
+import org.hibernate.dialect.SybaseJtdsXmlAsStringJdbcType;
 import org.hibernate.dialect.function.CommonFunctionFactory;
 import org.hibernate.dialect.function.CountFunction;
 import org.hibernate.dialect.function.IntegralTimestampaddFunction;
@@ -57,6 +65,7 @@
 import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
 import org.hibernate.type.descriptor.jdbc.ClobJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.NClobJdbcType;
 import org.hibernate.type.descriptor.jdbc.ObjectNullAsBinaryTypeJdbcType;
 import org.hibernate.type.descriptor.jdbc.TinyIntAsSmallIntJdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
@@ -237,21 +246,32 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration()
 				.getJdbcTypeRegistry();
 		if ( driverKind == SybaseDriverKind.JTDS ) {
-			jdbcTypeRegistry.addDescriptor( Types.TINYINT, TinyIntAsSmallIntJdbcType.INSTANCE );
+			jdbcTypeRegistry.addDescriptor( TinyIntAsSmallIntJdbcType.INSTANCE );
 
 			// The jTDS driver doesn't support the JDBC4 signatures using 'long length' for stream bindings
-			jdbcTypeRegistry.addDescriptor( Types.CLOB, ClobJdbcType.CLOB_BINDING );
-
-			// The jTDS driver doesn't support nationalized types
-			jdbcTypeRegistry.addDescriptor( Types.NCLOB, ClobJdbcType.CLOB_BINDING );
-			jdbcTypeRegistry.addDescriptor( Types.NVARCHAR, ClobJdbcType.CLOB_BINDING );
+			jdbcTypeRegistry.addDescriptor( ClobJdbcType.CLOB_BINDING );
+
+			// Need to register specialized JdbcType instances for jTDS because it throws an AbstractMethodError
+			// when invoking nationalized methods and requires binding through UTF-16LE bytes
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsNClobJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsNCharJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsNVarcharJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsLongNVarcharJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsJsonAsStringJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsXmlAsStringJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addTypeConstructor( SybaseJtdsJsonAsStringArrayJdbcTypeConstructor.INSTANCE );
+			jdbcTypeRegistry.addTypeConstructor( SybaseJtdsXmlAsStringArrayJdbcTypeConstructor.INSTANCE );
 		}
 		else {
-			// Some Sybase drivers cannot support getClob.  See HHH-7889
-			jdbcTypeRegistry.addDescriptor( Types.CLOB, ClobJdbcType.STREAM_BINDING_EXTRACTING );
+			// jConnect driver only conditionally supports getClob/getNClob depending on a server setting. See
+			//		- https://help.sap.com/doc/e3cb6844decf441e85e4670e1cf48c9b/16.0.3.6/en-US/SAP_jConnect_Programmers_Reference_en.pdf
+			// 		- https://infocenter.sybase.com/help/index.jsp?topic=/com.sybase.infocenter.dc20155.1570/html/OS_SDK_nf/CIHJFDDH.htm
+			//		- HHH-7889
+			jdbcTypeRegistry.addDescriptor( ClobJdbcType.STREAM_BINDING_EXTRACTING );
+			jdbcTypeRegistry.addDescriptor( NClobJdbcType.STREAM_BINDING_EXTRACTING );
 		}
 
-		jdbcTypeRegistry.addDescriptor( Types.BLOB, BlobJdbcType.PRIMITIVE_ARRAY_BINDING );
+		jdbcTypeRegistry.addDescriptor( BlobJdbcType.PRIMITIVE_ARRAY_BINDING );
 
 		// Sybase requires a custom binder for binding untyped nulls with the NULL type
 		typeContributions.contributeJdbcType( ObjectNullAsBinaryTypeJdbcType.INSTANCE );
@@ -262,7 +282,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 		typeContributions.contributeType(
@@ -270,7 +290,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
 						typeContributions.getTypeConfiguration()
 								.getJavaTypeRegistry()
-								.getDescriptor( Object.class )
+								.resolveDescriptor( Object.class )
 				)
 		);
 	}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java
index 2e7dfda78dff..72a4f9018851 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java
@@ -644,7 +644,7 @@ public boolean supportsRowValueConstructorSyntax() {
 	}
 
 	/**
-	 * Teradata uses the syntax DELETE FROM <tablename> ALL instead of TRUNCATE <tablename>
+	 * Teradata uses the syntax {@code DELETE FROM <tablename> ALL instead of TRUNCATE <tablename>}
 	 * @param tableName the name of the table
 	 */
 	public String getTruncateTableStatement(String tableName) {
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBDialect.java
index c176699b7f11..a1fc17e6d338 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBDialect.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBDialect.java
@@ -21,6 +21,7 @@
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.persister.entity.mutation.EntityMutationTarget;
 import org.hibernate.query.common.TemporalUnit;
 import org.hibernate.query.sqm.IntervalType;
 import org.hibernate.sql.ast.SqlAstTranslator;
@@ -28,6 +29,8 @@
 import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
+import org.hibernate.sql.model.internal.OptionalTableUpdate;
+import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 
 import static org.hibernate.community.dialect.lock.internal.TiDBLockingSupport.TIDB_LOCKING_SUPPORT;
@@ -39,8 +42,12 @@
  */
 public class TiDBDialect extends MySQLDialect {
 
-	private static final DatabaseVersion VERSION57 = DatabaseVersion.make( 5, 7 );
+	// 8.0.11 is the first MySQL 8.0 GA release.
+	// See also: https://docs.pingcap.com/tidb/stable/mysql-compatibility/
+	private static final DatabaseVersion VERSION80 = DatabaseVersion.make( 8, 0, 11 );
 
+	// See also: https://www.pingcap.com/tidb-release-support-policy/
+	// v5.4 EOL date: 15 Feb 2026
 	private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 5, 4 );
 
 	public TiDBDialect() {
@@ -58,8 +65,8 @@ public TiDBDialect(DialectResolutionInfo info) {
 
 	@Override
 	public DatabaseVersion getMySQLVersion() {
-		// For simplicity’s sake, configure MySQL 5.7 compatibility
-		return VERSION57;
+		// For simplicity’s sake, configure MySQL 8.0 compatibility
+		return VERSION80;
 	}
 
 	@Override
@@ -132,11 +139,6 @@ public LockingSupport getLockingSupport() {
 		return TIDB_LOCKING_SUPPORT;
 	}
 
-	@Override
-	protected boolean supportsForShare() {
-		return false;
-	}
-
 	@Override
 	protected boolean supportsAliasLocks() {
 		return false;
@@ -233,4 +235,19 @@ public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType,
 	public String getDual() {
 		return "dual";
 	}
+
+	@Override
+	public MutationOperation createOptionalTableUpdateOperation(EntityMutationTarget mutationTarget, OptionalTableUpdate optionalTableUpdate, SessionFactoryImplementor factory) {
+		if ( optionalTableUpdate.getNumberOfOptimisticLockBindings() == 0 ) {
+			final TiDBSqlAstTranslator<?> translator = new TiDBSqlAstTranslator<>( factory, optionalTableUpdate, TiDBDialect.this );
+			return translator.createMergeOperation( optionalTableUpdate );
+		}
+		return super.createOptionalTableUpdateOperation( mutationTarget, optionalTableUpdate, factory );
+	}
+
+	// https://github.com/pingcap/tidb/issues/66392
+	@Override
+	public boolean supportsExceptAll() {
+		return false;
+	}
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBSqlAstTranslator.java
index 77789b6ae34b..f007613e99fc 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBSqlAstTranslator.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBSqlAstTranslator.java
@@ -5,17 +5,16 @@
 package org.hibernate.community.dialect;
 
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
-import org.hibernate.dialect.sql.ast.MySQLSqlAstTranslator;
+import org.hibernate.dialect.sql.ast.SqlAstTranslatorWithOnDuplicateKeyUpdate;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.sql.ast.Clause;
-import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
+import org.hibernate.sql.ast.spi.FullJoinEmulation;
 import org.hibernate.sql.ast.tree.MutationStatement;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
 import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression;
-import org.hibernate.sql.ast.tree.expression.CastTarget;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
@@ -36,7 +35,9 @@
 import org.hibernate.sql.exec.internal.JdbcOperationQueryInsertImpl;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert;
+import org.hibernate.sql.model.ast.ColumnValueBinding;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,13 +47,19 @@
  * @author Christian Beikov
  * @author Cong Wang
  */
-public class TiDBSqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAstTranslator<T> {
+public class TiDBSqlAstTranslator<T extends JdbcOperation> extends SqlAstTranslatorWithOnDuplicateKeyUpdate<T> {
 
 	private final TiDBDialect dialect;
+	private final ArrayDeque<FullJoinEmulation> fullJoinEmulations = new ArrayDeque<>();
 
 	public TiDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, TiDBDialect dialect) {
 		super( sessionFactory, statement );
 		this.dialect = dialect;
+		this.fullJoinEmulations.push( new FullJoinEmulation( this ) );
+	}
+
+	private FullJoinEmulation currentFullJoinEmulationHelper() {
+		return fullJoinEmulations.getFirst();
 	}
 
 	@Override
@@ -228,11 +235,29 @@ public void visitQueryGroup(QueryGroup queryGroup) {
 
 	@Override
 	public void visitQuerySpec(QuerySpec querySpec) {
-		if ( shouldEmulateFetchClause( querySpec ) ) {
-			emulateFetchOffsetWithWindowFunctions( querySpec, true );
+		final var helper = currentFullJoinEmulationHelper();
+		final boolean needsNestedHelper =
+				helper.hasActiveFullJoinEmulation()
+						&& !helper.isFullJoinEmulationQueryPart( querySpec );
+		if ( needsNestedHelper ) {
+			fullJoinEmulations.push( new FullJoinEmulation( this ) );
 		}
-		else {
-			super.visitQuerySpec( querySpec );
+		try {
+			final var currentHelper = currentFullJoinEmulationHelper();
+			if ( !currentHelper.renderFullJoinEmulationBranchIfNeeded( querySpec, super::visitQuerySpec )
+					&& !currentHelper.emulateFullJoinWithUnionIfNeeded( querySpec ) ) {
+				if ( shouldEmulateFetchClause( querySpec ) ) {
+					emulateFetchOffsetWithWindowFunctions( querySpec, true );
+				}
+				else {
+					super.visitQuerySpec( querySpec );
+				}
+			}
+		}
+		finally {
+			if ( needsNestedHelper ) {
+				fullJoinEmulations.pop();
+			}
 		}
 	}
 
@@ -321,17 +346,6 @@ public TiDBDialect getDialect() {
 		return dialect;
 	}
 
-	@Override
-	public void visitCastTarget(CastTarget castTarget) {
-		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );
-		if ( sqlType != null ) {
-			appendSql( sqlType );
-		}
-		else {
-			super.visitCastTarget( castTarget );
-		}
-	}
-
 	@Override
 	protected void renderStringContainsExactlyPredicate(Expression haystack, Expression needle) {
 		// TiDB can't cope with NUL characters in the position function, so we use a like predicate instead
@@ -340,4 +354,15 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express
 		needle.accept( this );
 		appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );
 	}
+
+	@Override
+	protected void renderNewRowAlias() {
+	}
+
+	@Override
+	protected void renderUpdateValue(ColumnValueBinding columnValueBinding) {
+		appendSql( "values(" );
+		appendSql( columnValueBinding.getColumnReference().getColumnExpression() );
+		appendSql( ")" );
+	}
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/aggregate/SpannerPostgreSQLAggregateSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/aggregate/SpannerPostgreSQLAggregateSupport.java
new file mode 100644
index 000000000000..0e7332e6d214
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/aggregate/SpannerPostgreSQLAggregateSupport.java
@@ -0,0 +1,63 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect.aggregate;
+
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+import org.hibernate.dialect.aggregate.AggregateSupport;
+import org.hibernate.dialect.aggregate.PostgreSQLAggregateSupport;
+import org.hibernate.mapping.Column;
+import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.metamodel.mapping.SqlTypedMapping;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import static org.hibernate.type.SqlTypes.JSON;
+import static org.hibernate.type.SqlTypes.JSON_ARRAY;
+
+/***
+ * Spanner supports only JSON aggregation. It doesn't support XML or STRUCT aggregation
+ */
+public class SpannerPostgreSQLAggregateSupport extends PostgreSQLAggregateSupport {
+
+	public static final AggregateSupport INSTANCE = new SpannerPostgreSQLAggregateSupport();
+
+	@Override
+	public String aggregateComponentCustomReadExpression(String template, String placeholder, String aggregateParentReadExpression, String columnExpression, int aggregateColumnTypeCode, SqlTypedMapping column, TypeConfiguration typeConfiguration) {
+		return switch ( aggregateColumnTypeCode ) {
+			case JSON_ARRAY, JSON ->
+					super.aggregateComponentCustomReadExpression( template, placeholder, aggregateParentReadExpression,
+							columnExpression, aggregateColumnTypeCode, column, typeConfiguration );
+			default ->
+					throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
+		};
+	}
+
+	@Override
+	public String aggregateComponentAssignmentExpression(String aggregateParentAssignmentExpression, String columnExpression, int aggregateColumnTypeCode, Column column) {
+		return switch ( aggregateColumnTypeCode ) {
+			case JSON, JSON_ARRAY ->
+					super.aggregateComponentAssignmentExpression( aggregateParentAssignmentExpression, columnExpression,
+							aggregateColumnTypeCode, column );
+			default ->
+					throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateColumnTypeCode );
+		};
+	}
+
+	@Override
+	public boolean requiresAggregateCustomWriteExpressionRenderer(int aggregateSqlTypeCode) {
+		return aggregateSqlTypeCode == JSON;
+	}
+
+	@Override
+	public WriteExpressionRenderer aggregateCustomWriteExpressionRenderer(SelectableMapping aggregateColumn, SelectableMapping[] columnsToUpdate, TypeConfiguration typeConfiguration) {
+		final int aggregateSqlTypeCode = aggregateColumn.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode();
+		if ( aggregateSqlTypeCode == JSON ) {
+			return super.aggregateCustomWriteExpressionRenderer( aggregateColumn, columnsToUpdate, typeConfiguration );
+		}
+		throw new IllegalArgumentException( "Unsupported aggregate SQL type: " + aggregateSqlTypeCode );
+	}
+}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/GaussDBTruncRoundFunction.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/GaussDBTruncRoundFunction.java
index 458480ccec2b..1838455737b1 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/GaussDBTruncRoundFunction.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/GaussDBTruncRoundFunction.java
@@ -36,8 +36,7 @@
  * This custom function falls back to using {@code floor} as a workaround only when necessary,
  * e.g. when there are 2 arguments to the function and either:
  * <ul>
- *     <li>The first argument is not of type {@code numeric}</li>
- *     or
+ *     <li>The first argument is not of type {@code numeric}, or</li>
  *     <li>The dialect doesn't support the two-argument {@code trunc} function</li>
  * </ul>
  *
@@ -80,23 +79,26 @@ public void render(
 		}
 		else {
 			// workaround using floor
+			final SqlAstNode secondArg = arguments.get( 1 );
 			if ( getName().equals( "trunc" ) ) {
 				sqlAppender.appendSql( "sign(" );
 				firstArg.accept( walker );
 				sqlAppender.appendSql( ")*floor(abs(" );
 				firstArg.accept( walker );
-				sqlAppender.appendSql( ")*1e" );
-				arguments.get( 1 ).accept( walker );
+				sqlAppender.appendSql( ")*power(10," );
+				secondArg.accept( walker );
+				sqlAppender.appendSql( "))" );
 			}
 			else {
 				sqlAppender.appendSql( "floor(" );
 				firstArg.accept( walker );
-				sqlAppender.appendSql( "*1e" );
-				arguments.get( 1 ).accept( walker );
-				sqlAppender.appendSql( "+0.5" );
+				sqlAppender.appendSql( "*power(10," );
+				secondArg.accept( walker );
+				sqlAppender.appendSql( ")+0.5)" );
 			}
-			sqlAppender.appendSql( ")/1e" );
-			arguments.get( 1 ).accept( walker );
+			sqlAppender.appendSql( "/power(10," );
+			secondArg.accept( walker );
+			sqlAppender.appendSql( ")" );
 		}
 	}
 
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/InterSystemsIRISLogFunction.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/InterSystemsIRISLogFunction.java
new file mode 100644
index 000000000000..092c61083a97
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/InterSystemsIRISLogFunction.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect.function;
+
+import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
+import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
+import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.type.StandardBasicTypes;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import java.util.List;
+
+public class InterSystemsIRISLogFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
+
+	public InterSystemsIRISLogFunction(TypeConfiguration typeConfiguration) {
+		super(
+				"log",
+				StandardArgumentsValidators.between( 1, 2 ),
+				StandardFunctionReturnTypeResolvers.invariant(
+						typeConfiguration.getBasicTypeRegistry()
+								.resolve( StandardBasicTypes.DOUBLE )
+				),
+				null
+		);
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> arguments,
+			SqlAstTranslator<?> walker) {
+
+		if ( arguments.size() == 1 ) {
+			// LOG(x) → log(x)
+			sqlAppender.appendSql( "log(" );
+			arguments.get( 0 ).accept( walker );
+			sqlAppender.appendSql( ")" );
+		}
+		else if ( arguments.size() == 2 ) {
+			// LOG(base, value) → (log(value) / log(base))
+			sqlAppender.appendSql( "(log(" );
+			arguments.get( 1 ).accept( walker );
+			sqlAppender.appendSql( ")/log(" );
+			arguments.get( 0 ).accept( walker );
+			sqlAppender.appendSql( "))" );
+		}
+	}
+}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/InterSystemsIRISIdentityColumnSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/InterSystemsIRISIdentityColumnSupport.java
new file mode 100644
index 000000000000..b1264cb0855d
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/identity/InterSystemsIRISIdentityColumnSupport.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect.identity;
+
+import org.hibernate.MappingException;
+import org.hibernate.dialect.identity.IdentityColumnSupportImpl;
+
+public class InterSystemsIRISIdentityColumnSupport extends IdentityColumnSupportImpl {
+
+	@Override
+	public boolean supportsIdentityColumns() {
+		return true;
+	}
+
+	@Override
+	public boolean hasDataTypeInIdentityColumn() {
+		return true;
+	}
+
+	@Override
+	public String getIdentityColumnString(int type) throws MappingException {
+		return "IDENTITY";
+	}
+
+	@Override
+	public String getIdentitySelectString(String table, String column, int type) {
+		return "SELECT LAST_IDENTITY() FROM %TSQL_sys.snf";
+	}
+
+	@Override
+	public String getIdentityInsertString() {
+		return null;
+	}
+
+	@Override
+	public boolean supportsInsertSelectIdentity() {
+		return false;
+	}
+
+}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/lock/internal/TiDBLockingSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/lock/internal/TiDBLockingSupport.java
index 97c93ae7b17e..afcdfd2b7e6e 100644
--- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/lock/internal/TiDBLockingSupport.java
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/lock/internal/TiDBLockingSupport.java
@@ -10,6 +10,7 @@
 import org.hibernate.dialect.lock.spi.LockTimeoutType;
 import org.hibernate.dialect.lock.spi.LockingSupport;
 import org.hibernate.dialect.lock.spi.OuterJoinLockingType;
+import org.hibernate.dialect.lock.internal.MySQLLockingSupport.ConnectionLockTimeoutStrategyImpl;
 
 import static org.hibernate.dialect.lock.internal.MySQLLockingSupport.MYSQL_CONN_LOCK_TIMEOUT_STRATEGY;
 
@@ -17,6 +18,8 @@
  * @author Steve Ebersole
  */
 public class TiDBLockingSupport implements LockingSupport, LockingSupport.Metadata {
+	// Max innodb_lock_wait_timeout in TiDB v8.5.5 is 3600
+	public static final ConnectionLockTimeoutStrategy MYSQL_CONN_LOCK_TIMEOUT_STRATEGY = new ConnectionLockTimeoutStrategyImpl(3600);
 	public static final TiDBLockingSupport TIDB_LOCKING_SUPPORT = new TiDBLockingSupport();
 
 	@Override
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/InterSystemsIRISLimitHandler.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/InterSystemsIRISLimitHandler.java
new file mode 100644
index 000000000000..f4817f944a85
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/pagination/InterSystemsIRISLimitHandler.java
@@ -0,0 +1,88 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect.pagination;
+
+import org.hibernate.dialect.pagination.AbstractLimitHandler;
+import org.hibernate.query.spi.Limit;
+
+import java.util.Locale;
+
+public class InterSystemsIRISLimitHandler extends AbstractLimitHandler {
+	public static final InterSystemsIRISLimitHandler INSTANCE = new InterSystemsIRISLimitHandler(true);
+
+	private final boolean variableLimit;
+
+	public InterSystemsIRISLimitHandler(boolean variableLimit) {
+		this.variableLimit = variableLimit;
+	}
+
+	@Override
+	public String processSql(String sql, Limit limit) {
+
+		boolean hasFirstRow = hasFirstRow( limit );
+		boolean hasMaxRows = hasMaxRows( limit );
+
+		if ( !hasFirstRow && !hasMaxRows ) {
+			return sql;
+		}
+
+		String lowersql = sql.toLowerCase( Locale.ROOT );
+		int selectIndex = lowersql.indexOf( "select" );
+		if ( hasFirstRow && hasMaxRows ) {
+			return new StringBuilder( sql.length() + 27 )
+					.append( sql )
+					.insert( selectIndex + 6, " %ROWOFFSET ? %ROWLIMIT ? " )
+					.toString();
+
+		}
+		else if ( hasFirstRow ) {
+			return new StringBuilder( sql.length() + 15 )
+					.append( sql )
+					.insert( selectIndex + 6, " %ROWOFFSET ? " )
+					.toString();
+		}
+		else {
+			final int selectDistinctIndex = lowersql.indexOf( "select distinct" );
+			final int insertionPoint = selectIndex + ( selectDistinctIndex == selectIndex ? 15 : 6 );
+
+			return new StringBuilder( sql.length() + 8 )
+					.append( sql )
+					.insert( insertionPoint, " TOP ? " )
+					.toString();
+		}
+	}
+
+
+	@Override
+	public final boolean supportsLimit() {
+		return true;
+	}
+
+	@Override
+	public final boolean supportsOffset() {
+		return true;
+	}
+
+	@Override
+	public boolean supportsLimitOffset() {
+		return true;
+	}
+
+	@Override
+	public final boolean supportsVariableLimit() {
+		return true;
+	}
+
+	@Override
+	public boolean useMaxForLimit() {
+		return false;
+	}
+
+	@Override
+	public boolean bindLimitParametersFirst() {
+		return true;
+	}
+
+}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SpannerPostgreSQLSequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SpannerPostgreSQLSequenceSupport.java
new file mode 100644
index 000000000000..121665a9b566
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/SpannerPostgreSQLSequenceSupport.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect.sequence;
+
+import org.hibernate.MappingException;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.sequence.PostgreSQLSequenceSupport;
+
+public class SpannerPostgreSQLSequenceSupport extends PostgreSQLSequenceSupport {
+
+	private final SpannerPostgreSQLDialect dialect;
+
+	public SpannerPostgreSQLSequenceSupport(SpannerPostgreSQLDialect dialect) {
+		super();
+		this.dialect = dialect;
+	}
+
+	@Override
+	public boolean supportsPooledSequences() {
+		return false;
+	}
+
+	@Override
+	public String getCreateSequenceString(String sequenceName, int initialValue, int incrementSize) throws MappingException {
+		if ( incrementSize == 0 ) {
+			throw new MappingException( "Unable to create the sequence [" + sequenceName + "]: the increment size must not be 0" );
+		}
+		return getCreateSequenceString( sequenceName )
+			+ startingValue( initialValue, incrementSize )
+			+ " start counter with " + initialValue;
+	}
+
+	@Override
+	public String getRestartSequenceString(String sequenceName, long startWith) {
+		return "alter sequence " + sequenceName + " restart counter with " + startWith;
+	}
+
+	@Override
+	public String getSelectSequenceNextValString(String sequenceName) {
+		var nextValString = super.getSelectSequenceNextValString( sequenceName );
+		if (dialect.useIntegerForPrimaryKey()) {
+			nextValString = "spanner.bit_reverse(" + nextValString + ", true)";
+		}
+		return nextValString;
+	}
+
+	@Override
+	public String getSelectSequencePreviousValString(String sequenceName) throws MappingException {
+		throw new UnsupportedOperationException( "No support for retrieving previous value" );
+	}
+}
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sql/ast/SpannerPostgreSQLSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sql/ast/SpannerPostgreSQLSqlAstTranslator.java
new file mode 100644
index 000000000000..adb3146775a2
--- /dev/null
+++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sql/ast/SpannerPostgreSQLSqlAstTranslator.java
@@ -0,0 +1,178 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect.sql.ast;
+
+import org.hibernate.dialect.sql.ast.PostgreSQLSqlAstTranslator;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.sql.ast.Clause;
+import org.hibernate.sql.ast.tree.Statement;
+import org.hibernate.sql.ast.tree.cte.CteMaterialization;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.sql.ast.tree.expression.Literal;
+import org.hibernate.sql.ast.tree.expression.Summarization;
+import org.hibernate.sql.ast.tree.from.NamedTableReference;
+import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
+import org.hibernate.sql.ast.tree.predicate.LikePredicate;
+import org.hibernate.query.sqm.UnaryArithmeticOperator;
+import org.hibernate.sql.ast.tree.expression.UnaryOperation;
+import org.hibernate.sql.ast.tree.expression.Every;
+import org.hibernate.sql.ast.tree.expression.Any;
+import org.hibernate.sql.ast.tree.expression.ModifiedSubQueryExpression;
+import org.hibernate.sql.ast.tree.select.SelectStatement;
+import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.query.sqm.ComparisonOperator;
+import org.hibernate.sql.exec.spi.JdbcOperation;
+
+public class SpannerPostgreSQLSqlAstTranslator<T extends JdbcOperation> extends PostgreSQLSqlAstTranslator<T> {
+
+	public SpannerPostgreSQLSqlAstTranslator(
+			SessionFactoryImplementor sessionFactory, Statement statement) {
+		super(sessionFactory, statement);
+	}
+
+	@Override
+	protected void renderMaterializationHint(CteMaterialization materialization) {
+		// NO-OP
+	}
+
+	@Override
+	protected void renderDmlTargetTableExpression(NamedTableReference tableReference) {
+		appendSql(tableReference.getTableExpression());
+		registerAffectedTable(tableReference);
+		// ALWAYS render the alias for the target table since Spanner doesn't support
+		// FROM in UPDATE
+		final Clause currentClause = getClauseStack().getCurrent();
+		if ( currentClause == Clause.UPDATE || currentClause == Clause.DELETE) {
+			renderTableReferenceIdentificationVariable(tableReference);
+		}
+	}
+
+	@Override
+	protected void renderPartitionItem(Expression expression) {
+		if ( expression instanceof Literal ) {
+			appendSql( "'0' || '0'" );
+		}
+		else if ( expression instanceof Summarization ) {
+			// This could theoretically be emulated by rendering all grouping variations of the query and
+			// connect them via union all but that's probably pretty inefficient and would have to happen
+			// on the query spec level
+			throw new UnsupportedOperationException( "Summarization is not supported by DBMS" );
+		}
+		else {
+			expression.accept( this );
+		}
+	}
+
+	@Override
+	protected void renderLikePredicate(LikePredicate likePredicate) {
+		// We need a custom implementation here because Spanner
+		// uses the backslash character as default escape character
+		if (likePredicate.getEscapeCharacter() == null) {
+			renderBackslashEscapedLikePattern( likePredicate.getPattern(), likePredicate.getEscapeCharacter(), true );
+		}
+		else {
+			renderLikePattern( likePredicate.getPattern(), likePredicate.getEscapeCharacter() );
+		}
+	}
+
+	@Override
+	protected void renderLikePattern(Expression pattern, Expression escapeCharacter) {
+		if (escapeCharacter == null) {
+			super.renderLikePattern( pattern, escapeCharacter );
+		}
+		else {
+			appendSql( "replace(replace(replace(" );
+			pattern.accept( this );
+			appendSql( ", " );
+			escapeCharacter.accept( this );
+			appendSql( "||" );
+			escapeCharacter.accept( this );
+			appendSql( ", '\\\\'), " );
+			escapeCharacter.accept( this );
+			appendSql( "||'%', '\\%'), " );
+			escapeCharacter.accept( this );
+			appendSql( "||'_', '\\_')" );
+		}
+	}
+
+	@Override
+	protected void renderEscapeCharacter(Expression escapeCharacter) {
+		// Spanner doesn't support passing escape character other than "\"
+	}
+
+	@Override
+	protected void renderSelectExpression(Expression expression) {
+		if (getStatement() instanceof InsertSelectStatement
+				&& expression instanceof Literal) {
+			renderCasted(expression);
+		}
+		else {
+			super.renderSelectExpression(expression);
+		}
+	}
+
+	@Override
+	protected void renderComparison(Expression lhs, ComparisonOperator operator, Expression rhs) {
+		if ( operator == ComparisonOperator.DISTINCT_FROM || operator == ComparisonOperator.NOT_DISTINCT_FROM ) {
+			renderComparisonEmulateCase( lhs, operator, rhs );
+			return;
+		}
+		if ( rhs instanceof Every every ) {
+			SelectStatement subquery = every.getSubquery();
+			if ( subquery.getQueryPart() instanceof QuerySpec querySpec ) {
+				// Emulate ALL
+				if ( operator != ComparisonOperator.NOT_EQUAL && operator != ComparisonOperator.NOT_DISTINCT_FROM ) {
+					lhs.accept( this );
+					appendSql( operator.sqlText() );
+					renderQuantifiedEmulationSubQuery( querySpec, operator );
+					return;
+				}
+			}
+		}
+		else if ( rhs instanceof ModifiedSubQueryExpression expression ) {
+			SelectStatement subquery = expression.getSubQuery();
+			if ( subquery.getQueryPart() instanceof QuerySpec querySpec ) {
+				if ( operator != ComparisonOperator.NOT_EQUAL && operator != ComparisonOperator.NOT_DISTINCT_FROM ) {
+					if ( expression.getModifier() == ModifiedSubQueryExpression.Modifier.ALL ) {
+						// Emulate ALL
+						lhs.accept( this );
+						appendSql( operator.sqlText() );
+						renderQuantifiedEmulationSubQuery( querySpec, operator );
+						return;
+					}
+					else if ( expression.getModifier() == ModifiedSubQueryExpression.Modifier.ANY || expression.getModifier() == ModifiedSubQueryExpression.Modifier.SOME ) {
+						// Emulate ANY
+						lhs.accept( this );
+						appendSql( operator.sqlText() );
+						renderQuantifiedEmulationSubQuery( querySpec, operator.invert() );
+						return;
+					}
+				}
+			}
+		}
+		else if ( rhs instanceof Any any ) {
+			SelectStatement subquery = any.getSubquery();
+			if ( subquery.getQueryPart() instanceof QuerySpec querySpec ) {
+				// Emulate ANY
+				if ( operator != ComparisonOperator.NOT_EQUAL && operator != ComparisonOperator.NOT_DISTINCT_FROM ) {
+					lhs.accept( this );
+					appendSql( operator.sqlText() );
+					renderQuantifiedEmulationSubQuery( querySpec, operator.invert() );
+					return;
+				}
+			}
+		}
+		super.renderComparison(lhs, operator, rhs);
+	}
+
+	@Override
+	public void visitUnaryOperationExpression(UnaryOperation unaryOperationExpression) {
+		// Spanner PostgreSQL doesn't support unary plus, so we just render the operand
+		if ( unaryOperationExpression.getOperator() == UnaryArithmeticOperator.UNARY_MINUS ) {
+			appendSql( UnaryArithmeticOperator.UNARY_MINUS.getOperatorChar() );
+		}
+		unaryOperationExpression.getOperand().accept( this );
+	}
+}
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseDialectTestCase.java
index 3361af7c0c1f..0f15d183cc47 100644
--- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseDialectTestCase.java
+++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseDialectTestCase.java
@@ -45,7 +45,7 @@ public void testSupportLimits() {
 	@Test
 	public void testSelectWithLimitOnly() {
 		assertThat( withLimit( "select c1, c2 from t1 order by c1, c2 desc",
-				toRowSelection( 0, 15 ) ).toLowerCase( Locale.ROOT ) )
+				toRowSelection( null, 15 ) ).toLowerCase( Locale.ROOT ) )
 				.isEqualTo( "select c1, c2 from t1 order by c1, c2 desc limit ?" );
 	}
 
@@ -66,7 +66,7 @@ private String withLimit(String sql, Limit limit) {
 		return dialect.getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDialectTestCase.java
index aa8e9ac6e35d..4f564d654511 100644
--- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDialectTestCase.java
+++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDialectTestCase.java
@@ -37,7 +37,7 @@ public void testInsertLimitClause(SessionFactoryScope scope) {
 		final String input = "select * from tablename t where t.cat = 5";
 		final String expected = "select * from tablename t where t.cat = 5 fetch first ? rows only";
 
-		final String actual = withLimit( input, toRowSelection( 0, limit ) );
+		final String actual = withLimit( input, toRowSelection( null, limit ) );
 		assertThat( actual ).isEqualTo( expected );
 	}
 
@@ -105,7 +105,7 @@ private String withLimit(String sql, Limit limit) {
 		return new DerbyDialect().getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java
index 8bd7f9ef800e..51b870d0bb8a 100644
--- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java
+++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java
@@ -28,7 +28,7 @@ public void testInsertLimitClause() {
 		final String input = "select * from tablename t where t.cat = 5";
 		final String expected = "select * from tablename t where t.cat = 5 fetch first " + limit + " rows only";
 
-		final String actual = withLimit( input, toRowSelection( 0, limit ) );
+		final String actual = withLimit( input, toRowSelection( null, limit ) );
 		assertThat( actual ).isEqualTo( expected );
 	}
 
@@ -88,7 +88,7 @@ private String withLimit(String sql, Limit limit) {
 				.processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/FirebirdDialectTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/FirebirdDialectTest.java
index 36f9e19d93b0..05cae5a22098 100644
--- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/FirebirdDialectTest.java
+++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/FirebirdDialectTest.java
@@ -19,15 +19,15 @@ class FirebirdDialectTest {
 	@ParameterizedTest
 	@CsvSource(useHeadersInDisplayName = true, value = {
 			"major, minor, offset, limit, expectedSQL",
-			"2,     5,     0,      10,    select first ? * from tablename t where t.cat = 5",
+			"2,     5,     ,       10,    select first ? * from tablename t where t.cat = 5",
 			"2,     5,     10,     0,     select skip ? * from tablename t where t.cat = 5",
 			"2,     5,     5,      10,    select first ? skip ? * from tablename t where t.cat = 5",
-			"3,     0,     0,      10,    select * from tablename t where t.cat = 5 fetch first ? rows only",
+			"3,     0,     ,       10,    select * from tablename t where t.cat = 5 fetch first ? rows only",
 			"3,     0,     10,     0,     select * from tablename t where t.cat = 5 offset ? rows",
 			"3,     0,     5,      10,    select * from tablename t where t.cat = 5 offset ? rows fetch next ? rows only"
 	})
 	@JiraKey( "HHH-18213" )
-	void insertOffsetLimitClause(int major, int minor, int offset, int limit, String expectedSql) {
+	void insertOffsetLimitClause(int major, int minor, Integer offset, Integer limit, String expectedSql) {
 		String input = "select * from tablename t where t.cat = 5";
 		FirebirdDialect dialect = new FirebirdDialect( DatabaseVersion.make( major, minor ) );
 		String actual = dialect.getLimitHandler().processSql( input, -1, null, new LimitQueryOptions( new Limit( offset, limit ) ) );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java
index 92ddeb7e65a0..52349f2e01a4 100644
--- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java
+++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java
@@ -153,7 +153,7 @@ public void testGetLimitStringWithSelectDistinctSubselect() {
 		String expected = "select top(?) col0_.CONTENTID as CONTENT1_12_ " +
 						"where col0_.CONTENTTYPE='PAGE' and (col0_.CONTENTID in " +
 						"(select distinct col2_.PREVVER from CONTENT col2_ where (col2_.PREVVER is not null)))";
-		assertThat( withLimit( selectDistinctSubselectSQL, toRowSelection( 0, 5 ) ) ).isEqualTo( expected );
+		assertThat( withLimit( selectDistinctSubselectSQL, toRowSelection( null, 5 ) ) ).isEqualTo( expected );
 	}
 
 	@Test
@@ -227,14 +227,14 @@ public void testGetLimitStringWithMaxOnly() {
 
 		String expected = "select top(?) product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 						"from Product2 product2x0_ order by product2x0_.id";
-		assertThat( withLimit( query, toRowSelection( 0, 1 ) )).isEqualTo( expected );
+		assertThat( withLimit( query, toRowSelection( null, 1 ) )).isEqualTo( expected );
 
 		final String distinctQuery = "select distinct product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 									"from Product2 product2x0_ order by product2x0_.id";
 
 		expected = "select distinct top(?) product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 				"from Product2 product2x0_ order by product2x0_.id";
-		assertThat( withLimit( distinctQuery, toRowSelection( 0, 5 ) )).isEqualTo( expected );
+		assertThat( withLimit( distinctQuery, toRowSelection( null, 5 ) )).isEqualTo( expected );
 	}
 
 	@Test
@@ -358,13 +358,13 @@ public void testGetLimitStringWithSelectClauseNestedQueryUsingParenthesisOnlyTop
 		final String query = "select t1.c1 as col_0_0, (select case when count(t2.c1)>0 then 'ADDED' else 'UNMODIFIED' end from table2 t2 WHERE (t2.c1 in (?))) as col_1_0 from table1 t1 WHERE 1=1 ORDER BY t1.c1 ASC";
 
 		String expected = "select top(?) t1.c1 as col_0_0, (select case when count(t2.c1)>0 then 'ADDED' else 'UNMODIFIED' end from table2 t2 WHERE (t2.c1 in (?))) as col_1_0 from table1 t1 WHERE 1=1 ORDER BY t1.c1 ASC";
-		assertThat( withLimit( query, toRowSelection( 0, 5 ) ) ).isEqualTo( expected );
+		assertThat( withLimit( query, toRowSelection( null, 5 ) ) ).isEqualTo( expected );
 	}
 
 	@Test
 	@JiraKey(value = "HHH-8916")
 	public void testGetLimitStringUsingCTEQueryNoOffset() {
-		Limit selection = toRowSelection( 0, 5 );
+		Limit selection = toRowSelection( null, 5 );
 
 		// test top-based CTE with single CTE query_ definition with no odd formatting
 		final String query1 = "WITH a (c1, c2) AS (SELECT c1, c2 FROM t) SELECT c1, c2 FROM a";
@@ -574,7 +574,7 @@ private String withLimit(String sql, Limit limit) {
 		return dialect.getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2008DialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2008DialectTestCase.java
index 8ca256220a18..a680f25a26a2 100644
--- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2008DialectTestCase.java
+++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2008DialectTestCase.java
@@ -153,7 +153,7 @@ public void testGetLimitStringWithSelectDistinctSubselect() {
 		String expected = "select top(?) col0_.CONTENTID as CONTENT1_12_ " +
 						"where col0_.CONTENTTYPE='PAGE' and (col0_.CONTENTID in " +
 						"(select distinct col2_.PREVVER from CONTENT col2_ where (col2_.PREVVER is not null)))";
-		assertThat( withLimit( selectDistinctSubselectSQL, toRowSelection( 0, 5 ) ) ).isEqualTo( expected );
+		assertThat( withLimit( selectDistinctSubselectSQL, toRowSelection( null, 5 ) ) ).isEqualTo( expected );
 	}
 
 	@Test
@@ -227,14 +227,14 @@ public void testGetLimitStringWithMaxOnly() {
 
 		String expected = "select top(?) product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 						"from Product2 product2x0_ order by product2x0_.id";
-		assertThat( withLimit( query, toRowSelection( 0, 1 ) ) ).isEqualTo( expected );
+		assertThat( withLimit( query, toRowSelection( null, 1 ) ) ).isEqualTo( expected );
 
 		final String distinctQuery = "select distinct product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 									"from Product2 product2x0_ order by product2x0_.id";
 
 		expected = "select distinct top(?) product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 				"from Product2 product2x0_ order by product2x0_.id";
-		assertThat( withLimit( distinctQuery, toRowSelection( 0, 5 ) ) ).isEqualTo( expected );
+		assertThat( withLimit( distinctQuery, toRowSelection( null, 5 ) ) ).isEqualTo( expected );
 	}
 
 	@Test
@@ -358,13 +358,13 @@ public void testGetLimitStringWithSelectClauseNestedQueryUsingParenthesisOnlyTop
 		final String query = "select t1.c1 as col_0_0, (select case when count(t2.c1)>0 then 'ADDED' else 'UNMODIFIED' end from table2 t2 WHERE (t2.c1 in (?))) as col_1_0 from table1 t1 WHERE 1=1 ORDER BY t1.c1 ASC";
 
 		String expected = "select top(?) t1.c1 as col_0_0, (select case when count(t2.c1)>0 then 'ADDED' else 'UNMODIFIED' end from table2 t2 WHERE (t2.c1 in (?))) as col_1_0 from table1 t1 WHERE 1=1 ORDER BY t1.c1 ASC";
-		assertThat( withLimit( query, toRowSelection( 0, 5 ) ) ).isEqualTo( expected );
+		assertThat( withLimit( query, toRowSelection( null, 5 ) ) ).isEqualTo( expected );
 	}
 
 	@Test
 	@JiraKey("HHH-8916")
 	public void testGetLimitStringUsingCTEQueryNoOffset() {
-		Limit selection = toRowSelection( 0, 5 );
+		Limit selection = toRowSelection( null, 5 );
 
 		// test top-based CTE with single CTE query_ definition with no odd formatting
 		final String query1 = "WITH a (c1, c2) AS (SELECT c1, c2 FROM t) SELECT c1, c2 FROM a";
@@ -574,7 +574,7 @@ private String withLimit(String sql, Limit limit) {
 		return dialect.getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2012DialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2012DialectTestCase.java
index 4c7b14d1c166..299b661403f8 100644
--- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2012DialectTestCase.java
+++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2012DialectTestCase.java
@@ -41,7 +41,7 @@ public void tearDown() {
 	@JiraKey(value = "HHH-8768")
 	public void testGetLimitStringMaxRowsOnly() {
 		final String input = "select distinct f1 as f53245 from table846752 order by f234, f67 desc";
-		assertThat( withLimit( input, toRowSelection( 0, 10 ) ).toLowerCase( Locale.ROOT ) )
+		assertThat( withLimit( input, toRowSelection( null, 10 ) ).toLowerCase( Locale.ROOT ) )
 				.isEqualTo( input + " offset 0 rows fetch first ? rows only" );
 	}
 
@@ -57,7 +57,7 @@ public void testGetLimitStringWithOffsetAndMaxRows() {
 	@JiraKey(value = "HHH-8768")
 	public void testGetLimitStringMaxRowsOnlyNoOrderBy() {
 		final String input = "select f1 from table";
-		assertThat( withLimit( input, toRowSelection( 0, 10 ) ).toLowerCase( Locale.ROOT ) )
+		assertThat( withLimit( input, toRowSelection( null, 10 ) ).toLowerCase( Locale.ROOT ) )
 				.isEqualTo( "select f1 from table order by @@version offset 0 rows fetch first ? rows only" );
 	}
 
@@ -73,7 +73,7 @@ private String withLimit(String sql, Limit limit) {
 		return dialect.getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		final Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/SpannerPostgreSQLDisableIntPKTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/SpannerPostgreSQLDisableIntPKTest.java
new file mode 100644
index 000000000000..7528317ec342
--- /dev/null
+++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/SpannerPostgreSQLDisableIntPKTest.java
@@ -0,0 +1,97 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.community.dialect.functional;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.FailureExpected;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+@RequiresDialect(SpannerPostgreSQLDialect.class)
+@RequiresDialect(SpannerDialect.class)
+@DomainModel(annotatedClasses = {
+		SpannerPostgreSQLDisableIntPKTest.IntegerIdEntity.class,
+		SpannerPostgreSQLDisableIntPKTest.LongIdEntity.class
+})
+@SessionFactory
+@ServiceRegistry(settings = {
+		@Setting(name = "hibernate.dialect.spanner.use_integer_for_primary_key", value = "false"),
+})
+public class SpannerPostgreSQLDisableIntPKTest {
+
+	@Test
+	@FailureExpected(reason = "Spanner bit-reversed sequences return very large Long values. "
+							+ "When these are cast to Integer values, the produced Integers are non-unique, "
+							+ "causing a NonUniqueObjectException to be thrown.")
+	public void testIntegerPooledSequences(SessionFactoryScope scope) {
+		scope.inTransaction(session -> {
+			for (int i = 0; i < 55; i++) {
+				var intEntity = new IntegerIdEntity();
+				session.persist(intEntity);
+			}
+		});
+	}
+
+	@Test
+	public void testLongPooledSequences(SessionFactoryScope scope) {
+		scope.inTransaction(session -> {
+			for (int i = 0; i < 55; i++) {
+				var longEntity = new LongIdEntity();
+				session.persist(longEntity);
+			}
+		});
+
+		scope.inTransaction(session -> {
+			var entities = session.createQuery( "FROM LongIdEntity order by id", LongIdEntity.class ).getResultList();
+			for ( var entity : entities ) {
+				assertThat(entity.getId()).isBetween( Long.MIN_VALUE, Long.MAX_VALUE );
+			}
+		});
+	}
+
+	@Entity(name = "IntegerIdEntity")
+	public static class IntegerIdEntity {
+		@Id
+		@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "int_seq")
+		private Integer id;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Entity(name = "LongIdEntity")
+	public static class LongIdEntity {
+		@Id
+		@GeneratedValue(strategy = jakarta.persistence.GenerationType.SEQUENCE, generator = "long_seq")
+		private Long id;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+	}
+}
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index a9bd5791df96..44c1fb700bf9 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -27,7 +27,6 @@ dependencies {
     api jakartaLibs.jta
 
     implementation libs.hibernateModels
-    implementation libs.classmate
     implementation libs.byteBuddy
 
     implementation jakartaLibs.jaxbApi
@@ -42,6 +41,8 @@ dependencies {
     compileOnly jakartaLibs.jsonbApi
     compileOnly libs.jackson
     compileOnly libs.jacksonXml
+    compileOnly libs.jackson3
+    compileOnly libs.jackson3Xml
     compileOnly jdbcLibs.postgresql
     compileOnly jdbcLibs.edb
 
@@ -79,6 +80,8 @@ dependencies {
     testImplementation libs.jackson
     testRuntimeOnly libs.jacksonXml
     testRuntimeOnly libs.jacksonJsr310
+    testImplementation libs.jackson3
+    testImplementation libs.jackson3Xml
 
     testAnnotationProcessor project( ':hibernate-processor' )
 
@@ -99,7 +102,7 @@ jar {
 }
 
 ext {
-    jaxbTargetDir = project.file( "${buildDir}/generated/sources/xjc/main" )
+    jaxbTargetDir = project.layout.buildDirectory.dir("generated/sources/xjc/main").get().asFile
 }
 
 sourceSets {
@@ -141,11 +144,11 @@ versionInjection {
     into( 'org.hibernate.Version', 'initVersion' )
 }
 
-task copyBundleResourcesXml (type: Copy) {
+tasks.register('copyBundleResourcesXml', Copy) {
     inputs.property( "db", db )
     inputs.property( "dbHost", dbHost )
     ext {
-        bundlesTargetDir = file( "${buildDir}/bundles" )
+        bundlesTargetDir = layout.buildDirectory.dir("bundles").get().asFile
         // Escape
         bundleTokens = [
                 'db.dialect' : dbBundle[db]['db.dialect'].replace("&", "&amp;"),
@@ -156,7 +159,7 @@ task copyBundleResourcesXml (type: Copy) {
                 'jdbc.datasource' : dbBundle[db]['jdbc.datasource'].replace("&", "&amp;"),
                 'connection.init_sql' : dbBundle[db]['connection.init_sql'].replace("&", "&amp;")
         ]
-        ext.bundleTokens['buildDirName'] = project.relativePath( buildDir )
+        ext.bundleTokens['buildDirName'] = project.relativePath( layout.buildDirectory.asFile.get() )
     }
 
     from('src/test/bundles/templates') {
@@ -170,13 +173,13 @@ task copyBundleResourcesXml (type: Copy) {
     }
 }
 
-task copyBundleResourcesNonXml (type: Copy) {
+tasks.register('copyBundleResourcesNonXml', Copy) {
     inputs.property( "db", db )
     ext {
-        bundlesTargetDir = file( "${buildDir}/bundles" )
+        bundlesTargetDir = layout.buildDirectory.dir("bundles").get().asFile
         // Escape
         bundleTokens = dbBundle[db]
-        ext.bundleTokens['buildDirName'] = project.relativePath( buildDir )
+        ext.bundleTokens['buildDirName'] = project.relativePath(layout.buildDirectory.asFile.get())
     }
 
     from('src/test/bundles/templates') {
@@ -190,7 +193,7 @@ task copyBundleResourcesNonXml (type: Copy) {
     }
 }
 
-task copyBundleResources (type: Copy) {
+tasks.register('copyBundleResources', Copy) {
     inputs.property( "db", db )
     dependsOn tasks.copyBundleResourcesXml
     dependsOn tasks.copyBundleResourcesNonXml
@@ -205,7 +208,8 @@ sourcesJar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
-task testJar(type: Jar, dependsOn: testClasses) {
+tasks.register('testJar', Jar) {
+    dependsOn testClasses
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     archiveClassifier.set( 'test' )
     from sourceSets.test.output
@@ -231,9 +235,9 @@ tasks.register( "generateAnnotationClasses", JavaCompile ) {
     destinationDirectory.set( project.layout.buildDirectory.dir( "generated/sources/annotations/" ) )
 }
 
-task generateEnversStaticMetamodel(
-        type: JavaCompile,
-        description: "Generate the Hibernate Envers revision entity static metamodel classes." ) {
+tasks.register('generateEnversStaticMetamodel', JavaCompile) {
+    description = "Generate the Hibernate Envers revision entity static metamodel classes."
+
     source = sourceSets.main.java
     // we only want to include these specific classes for metamodel generation.
     // if envers adds any additional revision entity classes, they must be listed here.
@@ -250,10 +254,10 @@ task generateEnversStaticMetamodel(
     ]
 
     // put static metamodel classes back out to the source tree since they're version controlled.
-    destinationDirectory = new File( "${projectDir}/src/main/java" )
+    destinationDirectory = layout.projectDirectory.dir("src/main/java").asFile
 }
 
-tasks.withType( Test.class ).each { test ->
+tasks.withType( Test.class ).configureEach { test ->
     test.systemProperty 'file.encoding', 'utf-8'
     // Allow creating a function in HSQLDB for this Java method
     test.systemProperty 'hsqldb.method_class_names', 'org.hibernate.orm.test.jpa.transaction.TransactionTimeoutTest.sleep'
@@ -270,11 +274,12 @@ tasks.withType( Test.class ).each { test ->
     // see GradleParallelTestingResolver for how the test worker id is resolved in JDBC configs
     if ( project.db == "h2" || project.db == "hsqldb" || project.db == "pgsql_ci" || project.db == "edb_ci"
             || project.db == "oracle_ci" || project.db == "oracle_xe_ci" || project.db == "mysql_ci" || project.db == "mariadb_ci"
-            || project.db == "db2_ci" || project.db == "mssql_ci" || project.db == "cockroachdb" ) {
+            || project.db == "db2_ci" || project.db == "mssql_ci" || project.db == "cockroachdb" || project.db == "hana_ci"
+            || project.db == "tidb" ) {
         // Most systems have multi-threading and maxing out a core on both threads will hurt performance
         // Also, as soon as we hit 16+ threads, the returns are diminishing, so divide by 4
         def threadCount = Runtime.runtime.availableProcessors()
-        def testThreads = project.getProperties().get( "test.threads" )
+        def testThreads = project.findProperty( "test.threads" )
         if ( testThreads == null ) {
             testThreads = threadCount >= 16 ? threadCount.intdiv( 4 ) : (threadCount.intdiv( 2 ) ?: 1)
         }
@@ -286,19 +291,42 @@ tasks.withType( Test.class ).each { test ->
     }
     else if ( project.db == "oracle_test_pilot_database" ) {
         // Since Oracle TestPilot databases run on separate machines, use all threads for testing
+        test.maxParallelForks = Runtime.runtime.availableProcessors() * 2
+        test.systemProperty 'maxParallelForks', test.maxParallelForks
+    }
+    else if ( project.db == "hana_cloud" ) {
+        // Since HANA Cloud databases run on separate machines, use all threads for testing
         test.maxParallelForks = Runtime.runtime.availableProcessors()
         test.systemProperty 'maxParallelForks', test.maxParallelForks
     }
+    else if ( project.db == "spannerpgsql" || project.db == "spanner" ) {
+        def threadCount = Runtime.runtime.availableProcessors()
+        def testThreads = project.findProperty( "test.threads" )
+        if ( testThreads == null ) {
+            def dbCount = threadCount.intdiv( 2 ) ?: 1
+            if ( dbCount > 8 ) {
+                testThreads = 4
+            } else {
+                testThreads = dbCount.intdiv( 2 ) ?: 1
+            }
+        }
+        else {
+            testThreads = Integer.parseInt( testThreads.toString() )
+        }
+        test.maxParallelForks = Math.min( testThreads, 4 )
+        test.systemProperty 'maxParallelForks', test.maxParallelForks
+    }
 }
 
 tasks.named( "javadoc", Javadoc ) {
     configure(options) {
         overview = rootProject.file( "shared/javadoc/overview.html" )
-        exclude( "**/internal/**", "org/hibernate/boot/jaxb/**", "org/hibernate/tuple/**" )
+        exclude( "**/internal/**", "org/hibernate/boot/jaxb/**", "org/hibernate/tuple/**", "org/hibernate/grammars/hql/**" )
     }
 }
 
 tasks.sourcesJar.dependsOn ':hibernate-core:generateGraphParser'
+tasks.sourcesJar.dependsOn ':hibernate-core:generateDeprecated-graphParser'
 tasks.sourcesJar.dependsOn ':hibernate-core:generateHqlParser'
 tasks.sourcesJar.dependsOn ':hibernate-core:generateSqlScriptParser'
 tasks.sourcesJar.dependsOn ':hibernate-core:generateOrderingParser'
diff --git a/hibernate-core/src/main/antlr/org/hibernate/grammars/graph/GraphLanguageParser.g4 b/hibernate-core/src/main/antlr/org/hibernate/grammars/graph/GraphLanguageParser.g4
index a0e6c33b9974..ad3fdb779aab 100644
--- a/hibernate-core/src/main/antlr/org/hibernate/grammars/graph/GraphLanguageParser.g4
+++ b/hibernate-core/src/main/antlr/org/hibernate/grammars/graph/GraphLanguageParser.g4
@@ -21,15 +21,32 @@ package org.hibernate.grammars.graph;
  */
 }
 
-
 graph
-    : typeIndicator? attributeList
- 	;
+    : graphElementList
+    ;
+
+graphElementList
+    : graphElement (COMMA graphElement)*
+    ;
+
+
+graphElement
+    : subGraph
+    | attributeNode
+    ;
+
+subGraph
+    : subTypeIndicator? LPAREN attributeList RPAREN
+    ;
 
 typeIndicator
     : TYPE_NAME COLON
     ;
 
+subTypeIndicator
+    : COLON TYPE_NAME
+    ;
+
 attributeList
 	: attributeNode (COMMA attributeNode)*
     ;
@@ -44,9 +61,4 @@ attributePath
 
 attributeQualifier
 	: DOT ATTR_NAME
-	;
-
-subGraph
-	: LPAREN typeIndicator? attributeList RPAREN
-	;
-
+	;
\ No newline at end of file
diff --git a/hibernate-core/src/main/antlr/org/hibernate/grammars/graph/LegacyGraphLanguageParser.g4 b/hibernate-core/src/main/antlr/org/hibernate/grammars/graph/LegacyGraphLanguageParser.g4
new file mode 100644
index 000000000000..df697a42d6d6
--- /dev/null
+++ b/hibernate-core/src/main/antlr/org/hibernate/grammars/graph/LegacyGraphLanguageParser.g4
@@ -0,0 +1,50 @@
+parser grammar LegacyGraphLanguageParser;
+
+options {
+	tokenVocab=GraphLanguageLexer;
+}
+
+@header {
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.grammars.graph;
+}
+
+@members {
+/*
+ * Antlr grammar describing the Hibernate EntityGraph Language - for parsing a structured
+ * textual representation of an entity graph
+ *
+ * `LegacyGraphLanguageParser.g4`
+ */
+}
+
+graph
+    : typeIndicator? attributeList
+ 	;
+
+typeIndicator
+    : TYPE_NAME COLON
+    ;
+
+attributeList
+	: attributeNode (COMMA attributeNode)*
+    ;
+
+attributeNode
+	: attributePath subGraph?
+	;
+
+attributePath
+	: ATTR_NAME attributeQualifier?
+	;
+
+attributeQualifier
+	: DOT ATTR_NAME
+	;
+
+subGraph
+	: LPAREN typeIndicator? attributeList RPAREN
+	;
\ No newline at end of file
diff --git a/hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4 b/hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4
index 17716d416a3c..f11eea189548 100644
--- a/hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4
+++ b/hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4
@@ -1833,7 +1833,7 @@ xmltableDefaultClause
  * This parser rule helps with that.  Here we expect that the caller already understands their
  * context enough to know that keywords-as-identifiers are allowed.
  */
- // All except the possible optional following keywords LEFT, RIGHT, INNER, FULL, OUTER
+ // All except the possible optional following keywords LEFT, RIGHT, INNER, FULL, OUTER, NOT
  nakedIdentifier
 	: IDENTIFIER
 	| QUOTED_IDENTIFIER
@@ -1962,7 +1962,7 @@ xmltableDefaultClause
 	| NEW
 	| NEXT
 	| NO
-	| NOT
+//	| NOT
 	| NOTHING
 	| NULLS
 	| OBJECT
@@ -2054,4 +2054,5 @@ identifier
 	| LEFT
 	| OUTER
 	| RIGHT
+	| NOT
 	;
diff --git a/hibernate-core/src/main/java/org/hibernate/BatchSize.java b/hibernate-core/src/main/java/org/hibernate/BatchSize.java
index 15b98e7eade7..c47caa5be0e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/BatchSize.java
+++ b/hibernate-core/src/main/java/org/hibernate/BatchSize.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 /**
- * Specify a batch size, that is, how many entities should be
+ * Specifies a batch size, that is, how many entities should be
  * fetched in each request to the database, for an invocation of
  * {@link Session#findMultiple(Class, List, FindOption...)}.
  * <ul>
@@ -33,7 +33,7 @@
  * <li>on the other hand, for databases with no SQL array type, a
  *     large batch size results in long SQL statements with many JDBC
  *     parameters.
- * <p>
+ * </ul>
  * A batch size is considered a hint. This option has no effect
  * on {@link Session#find(Class, Object, FindOption...)}.
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/DetachedObjectException.java b/hibernate-core/src/main/java/org/hibernate/DetachedObjectException.java
new file mode 100644
index 000000000000..c177ade998c0
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/DetachedObjectException.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate;
+
+/**
+ * Thrown if a detached instance of an entity class is passed to
+ * a {@link Session} method that expects a managed instance.
+ *
+ * @author Gavin King
+ *
+ * @since 7.0
+ */
+@Incubating
+public class DetachedObjectException extends HibernateException {
+	public DetachedObjectException(String message) {
+		super( message );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/GraphParserMode.java b/hibernate-core/src/main/java/org/hibernate/GraphParserMode.java
new file mode 100644
index 000000000000..d6b801b946a4
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/GraphParserMode.java
@@ -0,0 +1,62 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate;
+
+/**
+ * Enumeration of available graph parser syntax modes.
+ *
+ */
+public enum GraphParserMode {
+	/**
+	 * Legacy syntax: attribute(SubType: attributes)
+	 * This is the legacy syntax.
+	 */
+	LEGACY( "legacy" ),
+
+	/**
+	 * Modern syntax: attribute:SubType(attributes)
+	 * This is the preferred new syntax.
+	 */
+	MODERN( "modern" );
+
+	private final String configValue;
+
+	GraphParserMode(String configValue) {
+		this.configValue = configValue;
+	}
+
+	public String getConfigValue() {
+		return configValue;
+	}
+
+	/**
+	 * Interpret the configured valueHandlingMode value.
+	 * Valid values are either a {@link GraphParserMode} object or its String representation.
+	 * For string values, the matching is case insensitive, so you can use either {@code MODERN} or {@code modern}.
+	 *
+	 * @param graphParserMode configured {@link GraphParserMode} representation
+	 *
+	 * @return associated {@link GraphParserMode} object
+	 */
+	public static GraphParserMode interpret(Object graphParserMode) {
+		if ( graphParserMode == null ) {
+			return LEGACY;
+		}
+		else if ( graphParserMode instanceof GraphParserMode mode ) {
+			return mode;
+		}
+		else if ( graphParserMode instanceof String string ) {
+			for ( GraphParserMode value : values() ) {
+				if ( value.name().equalsIgnoreCase( string ) ) {
+					return value;
+				}
+			}
+		}
+		throw new HibernateException(
+				"Unrecognized graph_parser_mode value : " + graphParserMode
+						+ ".  Supported values include 'modern' and 'legacy'."
+		);
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/Hibernate.java b/hibernate-core/src/main/java/org/hibernate/Hibernate.java
index 183ae3054cdb..5a4cb11b3f78 100644
--- a/hibernate-core/src/main/java/org/hibernate/Hibernate.java
+++ b/hibernate-core/src/main/java/org/hibernate/Hibernate.java
@@ -272,7 +272,7 @@ public static <T> Class<? extends T> getClass(T proxy) {
 
 	/**
 	 * Get the true, underlying class of a proxied entity.
-	 * <p/>
+	 * <p>
 	 * Like {@link #getClass}, this operation might initialize a proxy by side effect.
 	 * However, here the initialization is avoided if possible.  If the entity type is
 	 * defined with subclasses, the proxy will need to be initialized to properly
diff --git a/hibernate-core/src/main/java/org/hibernate/KeyType.java b/hibernate-core/src/main/java/org/hibernate/KeyType.java
new file mode 100644
index 000000000000..72c3270c6650
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/KeyType.java
@@ -0,0 +1,34 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate;
+
+import jakarta.persistence.FindOption;
+
+/// FindOption allowing to load based on either id (default) or natural-id.
+///
+/// @see jakarta.persistence.EntityManager#find
+/// @see Session#findMultiple
+///
+/// @since 7.3
+///
+/// @author Steve Ebersole
+/// @author Gavin King
+public enum KeyType implements FindOption {
+	/// Indicates to find by the entity's identifier.  The default.
+	///
+	/// @see jakarta.persistence.Id
+	/// @see jakarta.persistence.EmbeddedId
+	/// @see jakarta.persistence.IdClass
+	IDENTIFIER,
+
+	/// Indicates to find based on the entity's natural-id, if one.
+	///
+	/// @see org.hibernate.annotations.NaturalId
+	/// @see org.hibernate.annotations.NaturalIdClass
+	///
+	/// @implSpec Will trigger an [IllegalArgumentException] if the entity does
+	/// not define a natural-id.
+	NATURAL
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/Length.java b/hibernate-core/src/main/java/org/hibernate/Length.java
index 9de8cb04653b..6fed4b7931c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/Length.java
+++ b/hibernate-core/src/main/java/org/hibernate/Length.java
@@ -42,6 +42,8 @@ public final class Length {
 	 * For example, {@code @Column(length=LONG)} results
 	 * in the column type:
 	 * <table>
+	 * <caption>Column type per database</caption>
+	 * <tr><td><b>Column type</b></td><td><b>Database</b></td></tr>
 	 * <tr><td>{@code varchar(32600)}</td><td>on h2, Db2, and PostgreSQL</td>
 	 * <tr><td>{@code text}</td><td>on MySQL</td>
 	 * <tr><td>{@code clob}</td><td>on Oracle</td>
@@ -63,6 +65,8 @@ public final class Length {
 	 * For example, {@code @Column(length=LONG16)} results
 	 * in the column type:
 	 * <table>
+	 * <caption>Column type per database</caption>
+	 * <tr><td><b>Column type</b></td><td><b>Database</b></td></tr>
 	 * <tr><td>{@code varchar(32767)}</td><td>on h2 and PostgreSQL</td>
 	 * <tr><td>{@code text}</td><td>on MySQL</td>
 	 * <tr><td>{@code clob}</td><td>on Oracle and Db2</td>
@@ -85,6 +89,8 @@ public final class Length {
 	 * For example, {@code @Column(length=LONG32)} results
 	 * in the column type:
 	 * <table>
+	 * <caption>Column type per database</caption>
+	 * <tr><td><b>Column type</b></td><td><b>Database</b></td></tr>
 	 * <tr><td>{@code text}</td><td>on PostgreSQL</td>
 	 * <tr><td>{@code longtext}</td><td>on MySQL</td>
 	 * <tr><td>{@code clob}</td><td>on h2, Oracle, and Db2</td>
diff --git a/hibernate-core/src/main/java/org/hibernate/LockOptions.java b/hibernate-core/src/main/java/org/hibernate/LockOptions.java
index 572ea9f7c18e..e8748ba3b0f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/LockOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/LockOptions.java
@@ -241,7 +241,7 @@ public LockOptions setTimeout(Timeout timeout) {
 	/**
 	 * The {@linkplain #getTimeout() timeout}, in milliseconds, associated
 	 * with {@code this} options.
-	 * <p/>
+	 * <p>
 	 * {@link #NO_WAIT}, {@link #WAIT_FOREVER}, or {@link #SKIP_LOCKED}
 	 * represent 3 "magic" values.
 	 *
@@ -255,7 +255,7 @@ public int getTimeOut() {
 	/**
 	 * Set the {@linkplain #getTimeout() timeout}, in milliseconds, associated
 	 * with {@code this} options.
-	 * <p/>
+	 * <p>
 	 * {@link #NO_WAIT}, {@link #WAIT_FOREVER}, or {@link #SKIP_LOCKED}
 	 * represent 3 "magic" values.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/Locking.java b/hibernate-core/src/main/java/org/hibernate/Locking.java
index 5bf3cb2886b1..acb0ecd8dca8 100644
--- a/hibernate-core/src/main/java/org/hibernate/Locking.java
+++ b/hibernate-core/src/main/java/org/hibernate/Locking.java
@@ -47,7 +47,7 @@ enum Scope implements FindOption, LockOption, RefreshOption {
 		 * rows for collection tables ({@linkplain jakarta.persistence.ElementCollection},
 		 * {@linkplain jakarta.persistence.OneToMany} and {@linkplain jakarta.persistence.ManyToMany})
 		 * will also be locked.
-		 * <p/>
+		 * <p>
 		 * Hibernate will only lock these collection rows when they are joined.  The alternatives
 		 * would be to either:<ul>
 		 *     <li>
diff --git a/hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java
index 2b5f850ff4b3..cc06f179edf2 100644
--- a/hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/MultiIdentifierLoadAccess.java
@@ -16,7 +16,6 @@
  * Loads multiple instances of a given entity type at once, by
  * specifying a list of identifier values. This allows the entities
  * to be fetched from the database in batches.
- * <p>
  * <pre>
  * var graph = session.createEntityGraph(Book.class);
  * graph.addSubgraph(Book_.publisher);
diff --git a/hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java
index d60e404cfc9b..6e8a5cc599a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/NaturalIdLoadAccess.java
@@ -5,7 +5,6 @@
 package org.hibernate;
 
 import jakarta.persistence.EntityGraph;
-
 import jakarta.persistence.PessimisticLockScope;
 import jakarta.persistence.Timeout;
 import jakarta.persistence.metamodel.SingularAttribute;
@@ -20,14 +19,13 @@
  * entity. If the entity has exactly one attribute annotated
  * {@link org.hibernate.annotations.NaturalId @NaturalId},
  * then {@link SimpleNaturalIdLoadAccess} may be used instead.
- * <p>
- * <pre>
+ * <pre>{@code
  * Book book =
  *         session.byNaturalId(Book.class)
  *             .using(Book_.isbn, isbn)
  *             .using(Book_.printing, printing)
  *             .load();
- * </pre>
+ * }</pre>
  *
  * @author Eric Dalquist
  * @author Steve Ebersole
@@ -35,7 +33,10 @@
  * @see Session#byNaturalId(Class)
  * @see org.hibernate.annotations.NaturalId
  * @see SimpleNaturalIdLoadAccess
+ *
+ * @deprecated (since 7.3) Use {@linkplain Session#find} with {@link KeyType#NATURAL} instead.
  */
+@Deprecated
 public interface NaturalIdLoadAccess<T> {
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java
index 29c21475af44..9ee6c7edd7be 100644
--- a/hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/NaturalIdMultiLoadAccess.java
@@ -6,6 +6,7 @@
 
 import jakarta.persistence.EntityGraph;
 
+import jakarta.persistence.FindOption;
 import jakarta.persistence.PessimisticLockScope;
 import jakarta.persistence.Timeout;
 import org.hibernate.graph.GraphSemantic;
@@ -16,13 +17,13 @@
  * Loads multiple instances of a given entity type at once, by
  * specifying a list of natural id values. This allows the entities
  * to be fetched from the database in batches.
- * <p>
- * <pre>
+ *
+ * <pre>{@code
  * List&lt;Book&gt; books =
  *         session.byMultipleNaturalId(Book.class)
  *             .withBatchSize(10)
  *             .multiLoad(isbnList);
- * </pre>
+ * }</pre>
  * <p>
  * Composite natural ids may be accommodated by passing a list of
  * maps of type {@code Map<String,Object>}  to {@link #multiLoad}.
@@ -36,7 +37,10 @@
  *
  * @see Session#byMultipleNaturalId(Class)
  * @see org.hibernate.annotations.NaturalId
+ *
+ * @deprecated (since 7.3) Use {@linkplain Session#findMultiple(Class, List, FindOption...)} with {@link KeyType#NATURAL} instead.
  */
+@Deprecated
 public interface NaturalIdMultiLoadAccess<T> {
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/NaturalIdSynchronization.java b/hibernate-core/src/main/java/org/hibernate/NaturalIdSynchronization.java
new file mode 100644
index 000000000000..4aee7d7deb36
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/NaturalIdSynchronization.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate;
+
+import jakarta.persistence.FindOption;
+
+/// Indicates whether to perform synchronization (a sort of flush)
+/// before a [find by natural-id][KeyType#NATURAL].
+///
+/// @author Steve Ebersole
+public enum NaturalIdSynchronization implements FindOption {
+	/// Perform the synchronization.
+	ENABLED,
+
+	///  Do not perform the synchronization.
+	DISABLED;
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/OrderingMode.java b/hibernate-core/src/main/java/org/hibernate/OrderingMode.java
index 4e9e21d44759..0f119c7b9be8 100644
--- a/hibernate-core/src/main/java/org/hibernate/OrderingMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/OrderingMode.java
@@ -28,7 +28,7 @@
  * The default is {@link #ORDERED}.
  *
  * @see org.hibernate.Session#findMultiple(Class, List, FindOption...)
- * @see org.hibernate.Session#findMultiple(EntityGraph, List , FindOption...)
+ * @see org.hibernate.Session#findMultiple(EntityGraph, List, FindOption...)
  *
  * @since 7.2
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/RemovalsMode.java b/hibernate-core/src/main/java/org/hibernate/RemovalsMode.java
index 21a62d511ef0..018419386de5 100644
--- a/hibernate-core/src/main/java/org/hibernate/RemovalsMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/RemovalsMode.java
@@ -18,7 +18,7 @@
  * The default is {@link #REPLACE}.
  *
  * @see org.hibernate.Session#findMultiple(Class, List, FindOption...)
- * @see org.hibernate.Session#findMultiple(EntityGraph, List , FindOption...)
+ * @see org.hibernate.Session#findMultiple(EntityGraph, List, FindOption...)
  *
  * @since 7.2
  */
@@ -31,5 +31,15 @@ public enum RemovalsMode implements FindMultipleOption {
 	/**
 	 * The default.  Removed entities are replaced with {@code null} in the load result.
 	 */
-	REPLACE
+	REPLACE,
+	/**
+	 * Removed entities are excluded from the load result.
+	 * <p>
+	 * This option is incompatible with {@link OrderingMode#ORDERED}.
+	 * It must be used in conjunction with {@link OrderingMode#UNORDERED}
+	 * and {@link SessionCheckMode#ENABLED}.
+	 *
+	 * @since 7.3
+	 */
+	EXCLUDE
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/Session.java b/hibernate-core/src/main/java/org/hibernate/Session.java
index cd4109bc9a24..79996816cb1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/Session.java
+++ b/hibernate-core/src/main/java/org/hibernate/Session.java
@@ -4,1518 +4,1365 @@
  */
 package org.hibernate;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Consumer;
-
-import jakarta.persistence.FindOption;
-import jakarta.persistence.LockOption;
-import jakarta.persistence.RefreshOption;
-import jakarta.persistence.metamodel.EntityType;
-import org.hibernate.graph.RootGraph;
-import org.hibernate.jdbc.Work;
-import org.hibernate.query.Query;
-import org.hibernate.stat.SessionStatistics;
-
 import jakarta.persistence.CacheRetrieveMode;
 import jakarta.persistence.CacheStoreMode;
 import jakarta.persistence.EntityGraph;
 import jakarta.persistence.EntityManager;
+import jakarta.persistence.FindOption;
 import jakarta.persistence.FlushModeType;
 import jakarta.persistence.LockModeType;
+import jakarta.persistence.LockOption;
+import jakarta.persistence.RefreshOption;
 import jakarta.persistence.TypedQueryReference;
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.metamodel.EntityType;
+import org.hibernate.graph.RootGraph;
+import org.hibernate.query.NativeQuery;
+import org.hibernate.query.Query;
+import org.hibernate.stat.SessionStatistics;
 
-/**
- * The main runtime interface between a Java application and Hibernate. Represents the
- * notion of a <em>persistence context</em>, a set of managed entity instances associated
- * with a logical transaction.
- * <p>
- * The lifecycle of a {@code Session} is bounded by the beginning and end of the logical
- * transaction. But a long logical transaction might span several database transactions.
- * <p>
- * The primary purpose of the {@code Session} is to offer create, read, and delete
- * operations for instances of mapped entity classes. An instance may be in one of three
- * states with respect to a given open session:
- * <ul>
- * <li><em>transient:</em> never persistent, and not associated with the {@code Session},
- * <li><em>persistent:</em> currently associated with the {@code Session}, or
- * <li><em>detached:</em> previously persistent, but not currently associated with the
- *     {@code Session}.
- * </ul>
- * <p>
- * Each persistent instance has a <em>persistent identity</em> determined by its type
- * and identifier value. There may be at most one persistent instance with a given
- * persistent identity associated with a given session. A persistent identity is
- * assigned when an {@linkplain #persist(Object) instance is made persistent}.
- * <p>
- * An instance of an entity class may be associated with at most one open session.
- * Distinct sessions represent state with the same persistent identity using distinct
- * persistent instances of the mapped entity class.
- * <p>
- * Any instance returned by {@link #get(Class, Object)}, {@link #find(Class, Object)},
- * or by a query is persistent. A persistent instance might hold references to other
- * entity instances, and sometimes these references are <em>proxied</em> by an
- * intermediate object. When an associated entity has not yet been fetched from the
- * database, references to the unfetched entity are represented by uninitialized
- * proxies. The state of an unfetched entity is automatically fetched from the
- * database when a method of its proxy is invoked, if and only if the proxy is
- * associated with an open session. Otherwise, {@link #getReference(Object)} may be
- * used to trade a proxy belonging to a closed session for a new proxy associated
- * with the current session.
- * <p>
- * A transient instance may be made persistent by calling {@link #persist(Object)}.
- * A persistent instance may be made detached by calling {@link #detach(Object)}.
- * A persistent instance may be marked for removal, and eventually made transient,
- * by calling {@link #remove(Object)}.
- * <p>
- * Persistent instances are held in a managed state by the persistence context. Any
- * change to the state of a persistent instance is automatically detected and eventually
- * flushed to the database. This process of automatic change detection is called
- * <em>dirty checking</em> and can be expensive in some circumstances. Dirty checking
- * may be disabled by marking an entity as read-only using
- * {@link #setReadOnly(Object, boolean)} or simply by {@linkplain #detach(Object) evicting}
- * it from the persistence context. A session may be set to load entities as read-only
- * {@linkplain #setDefaultReadOnly(boolean) by default}, or this may be controlled at the
- * {@linkplain Query#setReadOnly(boolean) query level}.
- * <p>
- * The state of a transient or detached instance may be made persistent by copying it to
- * a persistent instance using {@link #merge(Object)}. All older operations which moved a
- * detached instance to the persistent state are now deprecated, and clients should now
- * migrate to the use of {@code merge()}.
- * <p>
- * The persistent state of a managed entity may be refreshed from the database, discarding
- * all modifications to the object held in memory, by calling {@link #refresh(Object)}.
- * <p>
- * From {@linkplain FlushMode time to time}, a {@linkplain #flush() flush operation} is
- * triggered, and the session synchronizes state held in memory with persistent state
- * held in the database by executing SQL {@code insert}, {@code update}, and {@code delete}
- * statements. Note that SQL statements are often not executed synchronously by the methods
- * of the {@code Session} interface. If synchronous execution of SQL is desired, the
- * {@link StatelessSession} allows this.
- * <p>
- * Each managed instance has an associated {@link LockMode}. By default, the session
- * obtains only {@link LockMode#READ} on an entity instance it reads from the database
- * and {@link LockMode#WRITE} on an entity instance it writes to the database. This
- * behavior is appropriate for programs which use optimistic locking.
- * <ul>
- * <li>A different lock level may be obtained by explicitly specifying the mode using
- *     {@link #find(Class,Object,LockModeType)}, {@link #find(Class,Object,FindOption...)},
- *     {@link #refresh(Object,LockModeType)}, {@link #refresh(Object,RefreshOption...)},
- *     or {@link org.hibernate.query.SelectionQuery#setLockMode(LockModeType)}.
- * <li>The lock level of a managed instance already held by the session may be upgraded
- *     to a more restrictive lock level by calling {@link #lock(Object, LockMode)} or
- *     {@link #lock(Object, LockModeType)}.
- * </ul>
- * <p>
- * A persistence context holds hard references to all its entities and prevents them
- * from being garbage collected. Therefore, a {@code Session} is a short-lived object,
- * and must be discarded as soon as a logical transaction ends. In extreme cases,
- * {@link #clear()} and {@link #detach(Object)} may be used to control memory usage.
- * However, for processes which read many entities, a {@link StatelessSession} should
- * be used.
- * <p>
- * A session might be associated with a container-managed JTA transaction, or it might be
- * in control of its own <em>resource-local</em> database transaction. In the case of a
- * resource-local transaction, the client must demarcate the beginning and end of the
- * transaction using a {@link Transaction}. A typical resource-local transaction should
- * use the following idiom:
- * <pre>
- * Session session = factory.openSession();
- * Transaction tx = null;
- * try {
- *     tx = session.beginTransaction();
- *     //do some work
- *     ...
- *     tx.commit();
- * }
- * catch (Exception e) {
- *     if (tx!=null) tx.rollback();
- *     throw e;
- * }
- * finally {
- *     session.close();
- * }
- * </pre>
- * <p>
- * It's crucially important to appreciate the following restrictions and why they exist:
- * <ul>
- * <li>If the {@code Session} throws an exception, the current transaction must be rolled
- *     back and the session must be discarded. The internal state of the {@code Session}
- *     cannot be expected to be consistent with the database after the exception occurs.
- * <li>At the end of a logical transaction, the session must be explicitly {@linkplain
- *     #close() destroyed}, so that all JDBC resources may be released.
- * <li>If a transaction is rolled back, the state of the persistence context and of its
- *     associated entities must be assumed inconsistent with the database, and the
- *     session must be discarded.
- * <li>A {@code Session} is never thread-safe. It contains various different sorts of
- *     fragile mutable state. Each thread or transaction must obtain its own dedicated
- *     instance from the {@link SessionFactory}.
- * </ul>
- * <p>
- * An easy way to be sure that session and transaction management is being done correctly
- * is to {@linkplain SessionFactory#inTransaction(Consumer) let the factory do it}:
- * <pre>
- * sessionFactory.inTransaction(session -&gt; {
- *     //do the work
- *     ...
- * });
- * </pre>
- * <p>
- * A session may be used to {@linkplain #doWork(Work) execute JDBC work} using its JDBC
- * connection and transaction:
- * <pre>
- * session.doWork(connection -&gt; {
- *     try ( PreparedStatement ps = connection.prepareStatement( " ... " ) ) {
- *         ps.execute();
- *     }
- * });
- * </pre>
- * <p>
- * A {@code Session} instance is serializable if its entities are serializable.
- * <p>
- * Every {@code Session} is a JPA {@link EntityManager}. Furthermore, when Hibernate is
- * acting as the JPA persistence provider, the method {@link EntityManager#unwrap(Class)}
- * may be used to obtain the underlying {@code Session}.
- * <p>
- * Hibernate, unlike JPA, allows a persistence unit where an entity class is mapped multiple
- * times, with different entity names, usually to different tables. In this case, the session
- * needs a way to identify the entity name of a given instance of the entity class. Therefore,
- * some operations of this interface, including operations inherited from {@code EntityManager},
- * are overloaded with a form that accepts an explicit entity name along with the instance. An
- * alternative solution to this problem is to provide an {@link EntityNameResolver}.
- *
- * @see SessionFactory
- *
- * @author Gavin King
- * @author Steve Ebersole
- */
+import java.util.Collection;
+import java.util.List;
+
+/// The main runtime interface between a Java application and Hibernate. Represents the
+/// notion of a _persistence context_, a set of managed entity instances associated
+/// with a logical transaction.
+///
+/// The lifecycle of a `Session` is bounded by the beginning and end of the logical
+/// transaction. But a long logical transaction might span several database transactions.
+///
+/// The primary purpose of the `Session` is to offer create, read, and delete
+/// operations for instances of mapped entity classes. An instance may be in one of three
+/// states with respect to a given open session:
+///
+///   - _transient:_ never persistent, and not associated with the `Session`,
+///   - _persistent:_ currently associated with the `Session`, or
+///   - _detached:_ previously persistent, but not currently associated with the
+///     `Session`.
+///
+/// Each persistent instance has a _persistent identity_ determined by its type
+/// and identifier value. There may be at most one persistent instance with a given
+/// persistent identity associated with a given session. A persistent identity is
+/// assigned when an {@linkplain #persist(Object) instance is made persistent}.
+///
+/// An instance of an entity class may be associated with at most one open session.
+/// Distinct sessions represent state with the same persistent identity using distinct
+/// persistent instances of the mapped entity class.
+///
+/// Any instance returned by [#get(Class,Object)], [#find(Class,Object)],
+/// or by a query is persistent. A persistent instance might hold references to other
+/// entity instances, and sometimes these references are _proxied_ by an
+/// intermediate object. When an associated entity has not yet been fetched from the
+/// database, references to the unfetched entity are represented by uninitialized
+/// proxies. The state of an unfetched entity is automatically fetched from the
+/// database when a method of its proxy is invoked, if and only if the proxy is
+/// associated with an open session. Otherwise, [#getReference(Object)] may be
+/// used to trade a proxy belonging to a closed session for a new proxy associated
+/// with the current session.
+///
+/// A transient instance may be made persistent by calling [#persist(Object)].
+/// A persistent instance may be made detached by calling [#detach(Object)].
+/// A persistent instance may be marked for removal, and eventually made transient,
+/// by calling [#remove(Object)].
+///
+/// Persistent instances are held in a managed state by the persistence context. Any
+/// change to the state of a persistent instance is automatically detected and eventually
+/// flushed to the database. This process of automatic change detection is called
+/// _dirty checking_ and can be expensive in some circumstances. Dirty checking
+/// may be disabled by marking an entity as read-only using
+/// [#setReadOnly(Object,boolean)] or simply by [evicting][#detach(Object)]
+/// it from the persistence context. A session may be set to load entities as read-only
+/// [by default][#setDefaultReadOnly(boolean)], or this may be controlled at the
+/// [query level][Query#setReadOnly(boolean)].
+///
+/// The state of a transient or detached instance may be made persistent by copying it to
+/// a persistent instance using [#merge(Object)]. Since version 7, all older operations
+/// which moved a detached instance to the persistent state have been completely removed,
+/// and clients must now migrate to the use of `merge()`.
+///
+/// The persistent state of a managed entity may be refreshed from the database, discarding
+/// all modifications to the object held in memory, by calling [#refresh(Object)].
+///
+/// From {@linkplain FlushMode time to time}, a {@linkplain #flush() flush operation} is
+/// triggered, and the session synchronizes state held in memory with persistent state
+/// held in the database by executing SQL `insert`, `update`, and `delete`
+/// statements. Note that SQL statements are often not executed synchronously by the methods
+/// of the `Session` interface. If synchronous execution of SQL is desired, the
+/// [StatelessSession] allows this.
+///
+/// Each managed instance has an associated [LockMode]. By default, the session
+/// obtains only [LockMode#READ] on an entity instance it reads from the database
+/// and [LockMode#WRITE] on an entity instance it writes to the database. This
+/// behavior is appropriate for programs which use optimistic locking.
+///
+///   - A different lock level may be obtained by explicitly specifying the mode using
+///     [#find(Class,Object,LockModeType)], [#find(Class,Object,FindOption...)],
+///     [#refresh(Object,LockModeType)], [#refresh(Object,RefreshOption...)],
+///     or [org.hibernate.query.SelectionQuery#setLockMode(LockModeType)].
+///   - The lock level of a managed instance already held by the session may be upgraded
+///     to a more restrictive lock level by calling [#lock(Object,LockMode)] or
+///     [#lock(Object,LockModeType)].
+///
+/// A persistence context holds hard references to all its entities and prevents them
+/// from being garbage collected. Therefore, a `Session` is a short-lived object,
+/// and must be discarded as soon as a logical transaction ends. In extreme cases,
+/// [#clear()] and [#detach(Object)] may be used to control memory usage.
+/// However, for processes which read many entities, a [StatelessSession] should
+/// be used.
+///
+/// A session might be associated with a container-managed JTA transaction, or it might be
+/// in control of its own _resource-local_ database transaction. In the case of a
+/// resource-local transaction, the client must demarcate the beginning and end of the
+/// transaction using a [Transaction]. A typical resource-local transaction should
+/// use the following idiom:
+///
+/// ```java
+/// try (var session = factory.openSession()) {
+/// 	Transaction tx = null;
+/// 	try {
+///     	tx = session.beginTransaction();
+///			//do some work
+///     	...
+///     	tx.commit();
+/// 	}
+/// 	catch (Exception e) {
+///     	if (tx!=null) tx.rollback();
+///     	throw e;
+/// 	}
+/// }
+/// ```
+///
+/// It's crucially important to appreciate the following restrictions and why they exist:
+///
+///   - If the `Session` throws an exception, the current transaction must be rolled
+///     back and the session must be discarded. The internal state of the `Session`
+///     cannot be expected to be consistent with the database after the exception occurs.
+///   - At the end of a logical transaction, the session must be explicitly
+///     [destroyed][#close()], so that all JDBC resources may be released.
+///   - If a transaction is rolled back, the state of the persistence context and of its
+///     associated entities must be assumed inconsistent with the database, and the
+///     session must be discarded.
+///   - A `Session` is never thread-safe. It contains various different sorts of
+///     fragile mutable state. Each thread or transaction must obtain its own dedicated
+///     instance from the [SessionFactory].
+///
+/// An easy way to be sure that session and transaction management is being done correctly
+/// is to [let the factory do it][SessionFactory#inTransaction(java.util.function.Consumer)]:
+///
+/// ```java
+/// sessionFactory.inTransaction(session -> {
+///     //do the work
+///     ...
+/// });
+/// ```
+///
+/// A session may be used to [execute JDBC work][#doWork] using its JDBC
+/// connection and transaction:
+///
+/// ```java
+/// session.doWork(connection -> {
+/// 	try (var statement = connection.prepareStatement(...)) {
+/// 		statement.execute();
+/// 	}
+/// });
+/// ```
+///
+/// A `Session` instance is serializable if its entities are serializable.
+///
+/// Every `Session` is a JPA [EntityManager]. Furthermore, when Hibernate is
+/// acting as the JPA persistence provider, the method [#unwrap(Class)]
+/// may be used to obtain the underlying `Session`.
+///
+/// Hibernate, unlike JPA, allows a persistence unit where an entity class is mapped multiple
+/// times, with different entity names, usually to different tables. In this case, the session
+/// needs a way to identify the entity name of a given instance of the entity class. Therefore,
+/// some operations of this interface, including operations inherited from `EntityManager`,
+/// are overloaded with a form that accepts an explicit entity name along with the instance. An
+/// alternative solution to this problem is to provide an [EntityNameResolver].
+///
+/// @see SessionFactory
+///
+/// @author Gavin King
+/// @author Steve Ebersole
 public interface Session extends SharedSessionContract, EntityManager {
 
-	/**
-	 * Force this session to flush. Must be called at the end of a unit of work,
-	 * before the transaction is committed. Depending on the current
-	 * {@linkplain #setHibernateFlushMode(FlushMode) flush mode}, the session might
-	 * automatically flush when {@link Transaction#commit()} is called, and it is not
-	 * necessary to call this method directly.
-	 * <p>
-	 * <em>Flushing</em> is the process of synchronizing the underlying persistent
-	 * store with persistable state held in memory.
-	 *
-	 * @throws HibernateException if changes could not be synchronized with the database
-	 */
+	/// Force this session to flush. Must be called at the end of a unit of work,
+	/// before the transaction is committed. Depending on the current
+	/// [flush mode][#getHibernateFlushMode()], the session might
+	/// automatically flush when [Transaction#commit()] is called, and it is not
+	/// necessary to call this method directly.
+	///
+	/// _Flushing_ is the process of synchronizing the underlying persistent
+	/// store with persistable state held in memory.
+	///
+	/// @throws HibernateException if changes could not be synchronized with the database
 	@Override
 	void flush();
 
-	/**
-	 * Set the current {@linkplain FlushModeType JPA flush mode} for this session.
-	 * <p>
-	 * <em>Flushing</em> is the process of synchronizing the underlying persistent
-	 * store with persistable state held in memory. The current flush mode determines
-	 * when the session is automatically flushed.
-	 *
-	 * @param flushMode the new {@link FlushModeType}
-	 *
-	 * @see #setHibernateFlushMode(FlushMode)
-	 */
+	/// Set the current [JPA flush mode][FlushModeType] for this session.
+	///
+	/// _Flushing_ is the process of synchronizing the underlying persistent
+	/// store with persistable state held in memory. The current flush mode determines
+	/// when the session is automatically flushed.
+	///
+	/// @param flushMode the new [FlushModeType]
+	///
+	/// @see #setHibernateFlushMode(FlushMode)
 	@Override
 	void setFlushMode(FlushModeType flushMode);
 
-	/**
-	 * Set the current {@linkplain FlushMode flush mode} for this session.
-	 * <p>
-	 * <em>Flushing</em> is the process of synchronizing the underlying persistent
-	 * store with persistable state held in memory. The current flush mode determines
-	 * when the session is automatically flushed.
-	 * <p>
-	 * The {@linkplain FlushMode#AUTO default flush mode} is sometimes unnecessarily
-	 * aggressive. For a logically "read only" session, it's reasonable to set the
-	 * session's flush mode to {@link FlushMode#MANUAL} at the start of the session
-	 * in order to avoid some unnecessary work.
-	 * <p>
-	 * Note that {@link FlushMode} defines more options than {@link FlushModeType}.
-	 *
-	 * @param flushMode the new {@link FlushMode}
-	 */
+	/// Set the current [flush mode][FlushMode] for this session.
+	///
+	/// _Flushing_ is the process of synchronizing the underlying persistent
+	/// store with persistable state held in memory. The current flush mode determines
+	/// when the session is automatically flushed.
+	///
+	/// The [default flush mode][FlushMode#AUTO] is sometimes unnecessarily
+	/// aggressive. For a logically "read only" session, it's reasonable to set the
+	/// session's flush mode to [FlushMode#MANUAL] at the start of the session
+	/// in order to avoid some unnecessary work.
+	///
+	/// Note that [FlushMode] defines more options than [FlushModeType].
+	///
+	/// @param flushMode the new [FlushMode]
 	void setHibernateFlushMode(FlushMode flushMode);
 
-	/**
-	 * Get the current {@linkplain FlushModeType JPA flush mode} for this session.
-	 *
-	 * @return the {@link FlushModeType} currently in effect
-	 *
-	 * @see #getHibernateFlushMode()
-	 */
+	/// Get the current [JPA flush mode][FlushModeType] for this session.
+	///
+	/// @return the [FlushModeType] currently in effect
+	///
+	/// @see #getHibernateFlushMode()
 	@Override
 	FlushModeType getFlushMode();
 
-	/**
-	 * Get the current {@linkplain FlushMode flush mode} for this session.
-	 *
-	 * @return the {@link FlushMode} currently in effect
-	 */
+	/// Get the current [flush mode][FlushMode] for this session.
+	///
+	/// @return the [FlushMode] currently in effect
 	FlushMode getHibernateFlushMode();
 
-	/**
-	 * Set the current {@linkplain CacheMode cache mode} for this session.
-	 * <p>
-	 * The cache mode determines the manner in which this session can interact with
-	 * the second level cache.
-	 *
-	 * @param cacheMode the new cache mode
-	 */
+	/// Set the current [cache mode][CacheMode] for this session.
+	///
+	/// The cache mode determines the manner in which this session can interact with
+	/// the second level cache.
+	///
+	/// @param cacheMode the new cache mode
 	void setCacheMode(CacheMode cacheMode);
 
-	/**
-	 * Get the current {@linkplain CacheMode cache mode} for this session.
-	 *
-	 * @return the current cache mode
-	 */
+	/// Get the current [cache mode][CacheMode] for this session.
+	///
+	/// @return the current cache mode
 	CacheMode getCacheMode();
 
-	/**
-	 * The JPA-defined {@link CacheStoreMode}.
-	 *
-	 * @see #getCacheMode()
-	 *
-	 * @since 6.2
-	 */
+	/// The JPA-defined [CacheStoreMode].
+	///
+	/// @see #getCacheMode()
+	///
+	/// @since 6.2
 	@Override
 	CacheStoreMode getCacheStoreMode();
 
-	/**
-	 * The JPA-defined {@link CacheRetrieveMode}.
-	 *
-	 * @see #getCacheMode()
-	 *
-	 * @since 6.2
-	 */
+	/// The JPA-defined [CacheRetrieveMode].
+	///
+	/// @see #getCacheMode()
+	///
+	/// @since 6.2
 	@Override
 	CacheRetrieveMode getCacheRetrieveMode();
 
-	/**
-	 * Enable or disable writes to the second-level cache.
-	 *
-	 * @param cacheStoreMode a JPA-defined {@link CacheStoreMode}
-	 *
-	 * @see #setCacheMode(CacheMode)
-	 *
-	 * @since 6.2
-	 */
+	/// Enable or disable writes to the second-level cache.
+	///
+	/// @param cacheStoreMode a JPA-defined [CacheStoreMode]
+	///
+	/// @see #setCacheMode(CacheMode)
+	///
+	/// @since 6.2
 	@Override
 	void setCacheStoreMode(CacheStoreMode cacheStoreMode);
 
-	/**
-	 * Enable or disable reads from the second-level cache.
-	 *
-	 * @param cacheRetrieveMode a JPA-defined {@link CacheRetrieveMode}
-	 *
-	 * @see #setCacheMode(CacheMode)
-	 *
-	 * @since 6.2
-	 */
+	/// Enable or disable reads from the second-level cache.
+	///
+	/// @param cacheRetrieveMode a JPA-defined [CacheRetrieveMode]
+	///
+	/// @see #setCacheMode(CacheMode)
+	///
+	/// @since 6.2
 	@Override
 	void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode);
 
-	/**
-	 * Get the maximum batch size for batch fetching associations by
-	 * id in this session.
-	 *
-	 * @since 6.3
-	 */
+	/// Get the maximum batch size for batch fetching associations by
+	/// id in this session.
+	///
+	/// @since 6.3
 	int getFetchBatchSize();
 
-	/**
-	 * Set the maximum batch size for batch fetching associations by
-	 * id in this session. Override the
-	 * {@linkplain org.hibernate.boot.spi.SessionFactoryOptions#getDefaultBatchFetchSize()
-	 * factory-level} default controlled by the configuration property
-	 * {@value org.hibernate.cfg.AvailableSettings#DEFAULT_BATCH_FETCH_SIZE}.
-	 * <p>
-	 * <ul>
-	 * <li>If {@code batchSize>1}, then batch fetching is enabled.
-	 * <li>If {@code batchSize<0}, the batch size is inherited from
-	 *     the factory-level setting.
-	 * <li>Otherwise, batch fetching is disabled.
-	 * </ul>
-	 *
-	 * @param batchSize the maximum batch size for batch fetching
-	 *
-	 * @since 6.3
-	 *
-	 * @see org.hibernate.cfg.AvailableSettings#DEFAULT_BATCH_FETCH_SIZE
-	 */
+	/// Set the maximum batch size for batch fetching associations by
+	/// id in this session. Override the
+	/// [factory-level][org.hibernate.boot.spi.SessionFactoryOptions#getDefaultBatchFetchSize()]
+	/// default controlled by the configuration property
+	/// {@value org.hibernate.cfg.AvailableSettings#DEFAULT_BATCH_FETCH_SIZE}.
+	///
+	///   - If `batchSize>1`, then batch fetching is enabled.
+	///   - If `batchSize<0`, the batch size is inherited from
+	///     the factory-level setting.
+	///   - Otherwise, batch fetching is disabled.
+	///
+	/// @param batchSize the maximum batch size for batch fetching
+	///
+	/// @since 6.3
+	///
+	/// @see org.hibernate.cfg.AvailableSettings#DEFAULT_BATCH_FETCH_SIZE
 	void setFetchBatchSize(int batchSize);
 
-	/**
-	 * Determine if subselect fetching is enabled in this session.
-	 *
-	 * @return {@code true} is subselect fetching is enabled
-	 *
-	 * @since 6.3
-	 */
+	/// Determine if subselect fetching is enabled in this session.
+	///
+	/// @return `true` is subselect fetching is enabled
+	///
+	/// @since 6.3
 	boolean isSubselectFetchingEnabled();
 
-	/**
-	 * Enable or disable subselect fetching in this session. Override the
-	 * {@linkplain org.hibernate.boot.spi.SessionFactoryOptions#isSubselectFetchEnabled()
-	 * factory-level} default controlled by the configuration property
-	 * {@value org.hibernate.cfg.AvailableSettings#USE_SUBSELECT_FETCH}.
-	 *
-	 * @param enabled {@code true} to enable subselect fetching
-	 *
-	 * @since 6.3
-	 *
-	 * @see org.hibernate.cfg.AvailableSettings#USE_SUBSELECT_FETCH
-	 */
+	/// Enable or disable subselect fetching in this session. Override the
+	/// [factory-level][org.hibernate.boot.spi.SessionFactoryOptions#isSubselectFetchEnabled()]
+	/// default controlled by the configuration property
+	/// {@value org.hibernate.cfg.AvailableSettings#USE_SUBSELECT_FETCH}.
+	///
+	/// @param enabled `true` to enable subselect fetching
+	///
+	/// @since 6.3
+	///
+	/// @see org.hibernate.cfg.AvailableSettings#USE_SUBSELECT_FETCH
 	void setSubselectFetchingEnabled(boolean enabled);
 
-	/**
-	 * Get the session factory which created this session.
-	 *
-	 * @return the session factory
-	 *
-	 * @see SessionFactory
-	 */
+	/// Get the session factory which created this session.
+	///
+	/// @return the session factory
+	///
+	/// @see SessionFactory
 	SessionFactory getSessionFactory();
 
-	/**
-	 * Cancel the execution of the current query.
-	 * <p>
-	 * This is the sole method on session which may be safely called from
-	 * another thread.
-	 *
-	 * @throws HibernateException if there was a problem cancelling the query
-	 */
+	/// Cancel the execution of the current query.
+	///
+	/// This is the sole method on session which may be safely called from
+	/// another thread.
+	///
+	/// @throws HibernateException if there was a problem cancelling the query
 	void cancelQuery();
 
-	/**
-	 * Does this session contain any changes which must be synchronized with
-	 * the database?  In other words, would any DML operations be executed if
-	 * we flushed this session?
-	 *
-	 * @return {@code true} if the session contains pending changes;
-	 *         {@code false} otherwise.
-	 */
+	/// Whether this session contains any changes which must be synchronized with
+	/// the database.  In other words, would any DML operations be executed if
+	/// we flushed this session?
+	///
+	/// @return `true` if the session contains pending changes; `false` otherwise.
 	boolean isDirty();
 
-	/**
-	 * Will entities and proxies that are loaded into this session be made
-	 * read-only by default?
-	 * <p>
-	 * To determine the read-only/modifiable setting for a particular entity
-	 * or proxy use {@link #isReadOnly(Object)}.
-	 *
-	 * @see #isReadOnly(Object)
-	 *
-	 * @return {@code true}, loaded entities/proxies will be made read-only by default;
-	 *		 {@code false}, loaded entities/proxies will be made modifiable by default.
-	 */
+	/// Will entities and proxies that are loaded into this session be made
+	/// read-only by default?
+	///
+	/// To determine the read-only/modifiable setting for a particular entity
+	/// or proxy use [#isReadOnly(Object)].
+	///
+	/// @see #isReadOnly(Object)
+	///
+	/// @return `true`, loaded entities/proxies will be made read-only by default;
+	///		 `false`, loaded entities/proxies will be made modifiable by default.
 	boolean isDefaultReadOnly();
 
-	/**
-	 * Change the default for entities and proxies loaded into this session
-	 * from modifiable to read-only mode, or from read-only to modifiable mode.
-	 * <p>
-	 * Read-only entities are not dirty-checked, and snapshots of persistent
-	 * state are not maintained. Read-only entities can be modified, but a
-	 * modification to a field of a read-only entity is not made persistent.
-	 * <p>
-	 * When a proxy is initialized, the loaded entity will have the same
-	 * read-only/modifiable setting as the uninitialized proxy, regardless of
-	 * the {@linkplain #isDefaultReadOnly current default read-only mode}
-	 * of the session.
-	 * <p>
-	 * To change the read-only/modifiable setting for a particular entity
-	 * or proxy that already belongs to this session, use
-	 * {@link #setReadOnly(Object, boolean)}.
-	 * <p>
-	 * To override the default read-only mode of the current session for
-	 * all entities and proxies returned by a given {@code Query}, use
-	 * {@link Query#setReadOnly(boolean)}.
-	 * <p>
-	 * Every instance of an {@linkplain org.hibernate.annotations.Immutable
-	 * immutable} entity is loaded in read-only mode.
-	 *
-	 * @see #setReadOnly(Object,boolean)
-	 * @see Query#setReadOnly(boolean)
-	 *
-	 * @param readOnly {@code true}, the default for loaded entities/proxies is read-only;
-	 *				 {@code false}, the default for loaded entities/proxies is modifiable
-	 * @throws SessionException if the session was originally
-	 *         {@linkplain SessionBuilder#readOnly created in read-only mode}
-	 */
+	/// Change the default for entities and proxies loaded into this session
+	/// from modifiable to read-only mode, or from read-only to modifiable mode.
+	///
+	/// Read-only entities are not dirty-checked, and snapshots of persistent
+	/// state are not maintained. Read-only entities can be modified, but a
+	/// modification to a field of a read-only entity is not made persistent.
+	///
+	/// When a proxy is initialized, the loaded entity will have the same
+	/// read-only/modifiable setting as the uninitialized proxy, regardless of
+	/// the [current default read-only mode][#isDefaultReadOnly]
+	/// of the session.
+	///
+	/// To change the read-only/modifiable setting for a particular entity
+	/// or proxy that already belongs to this session, use
+	/// [#setReadOnly(Object,boolean)].
+	///
+	/// To override the default read-only mode of the current session for
+	/// all entities and proxies returned by a given `Query`, use
+	/// [Query#setReadOnly(boolean)].
+	///
+	/// Every instance of an [immutable][org.hibernate.annotations.Immutable]
+	/// entity is loaded in read-only mode.
+	///
+	/// @see #setReadOnly(Object,boolean)
+	/// @see Query#setReadOnly(boolean)
+	///
+	/// @param readOnly `true`, the default for loaded entities/proxies is read-only;
+	///				 `false`, the default for loaded entities/proxies is modifiable
+	/// @throws SessionException if the session was originally
+	///         {@linkplain SessionBuilder#readOnly created in read-only mode}
 	void setDefaultReadOnly(boolean readOnly);
 
-	/**
-	 * Return the identifier value of the given entity associated with this session.
-	 * An exception is thrown if the given entity instance is transient or detached
-	 * in relation to this session.
-	 *
-	 * @param object a persistent instance associated with this session
-	 *
-	 * @return the identifier
-	 *
-	 * @throws TransientObjectException if the instance is transient or associated with
-	 * a different session
-	 */
+	/// Return the identifier value of the given entity associated with this session.
+	/// An exception is thrown if the given entity instance is transient or detached
+	/// in relation to this session.
+	///
+	/// @param object a persistent instance associated with this session
+	///
+	/// @return the identifier
+	///
+	/// @throws TransientObjectException if the instance is transient or associated with
+	/// a different session
 	Object getIdentifier(Object object);
 
-	/**
-	 * Determine if the given entity is associated with this session.
-	 *
-	 * @param entityName the entity name
-	 * @param object an instance of a persistent class
-	 *
-	 * @return {@code true} if the given instance is associated with this {@code Session}
-	 *
-	 * @deprecated Use {@link #contains(Object)} instead.
-	 */
+	/// Determine if the given entity is associated with this session.
+	///
+	/// @param entityName the entity name
+	/// @param object an instance of a persistent class
+	///
+	/// @return `true` if the given instance is associated with this `Session`
+	///
+	/// @deprecated Use [#contains(Object)] instead.
 	@Deprecated(since = "7.2", forRemoval = true)
 	boolean contains(String entityName, Object object);
 
-	/**
-	 * Remove this instance from the session cache. Changes to the instance will
-	 * not be synchronized with the database. This operation cascades to associated
-	 * instances if the association is mapped with
-	 * {@link jakarta.persistence.CascadeType#DETACH}.
-	 *
-	 * @param object the managed instance to detach
-	 */
+	/// Remove this instance from the session cache. Changes to the instance will
+	/// not be synchronized with the database. This operation cascades to associated
+	/// instances if the association is mapped with [jakarta.persistence.CascadeType#DETACH].
+	///
+	/// @param object the managed instance to detach
 	@Override
 	void detach(Object object);
 
-	/**
-	 * Remove this instance from the session cache. Changes to the instance will
-	 * not be synchronized with the database. This operation cascades to associated
-	 * instances if the association is mapped with
-	 * {@link jakarta.persistence.CascadeType#DETACH}.
-	 * <p>
-	 * This operation is a synonym for {@link #detach(Object)}.
-	 *
-	 * @param object the managed entity to evict
-	 *
-	 * @throws IllegalArgumentException if the given object is not an entity
-	 */
+	/// Remove this instance from the session cache. Changes to the instance will
+	/// not be synchronized with the database. This operation cascades to associated
+	/// instances if the association is mapped with [jakarta.persistence.CascadeType#DETACH].
+	///
+	/// This operation is a synonym for [#detach(Object)].
+	///
+	/// @param object the managed entity to evict
+	///
+	/// @throws IllegalArgumentException if the given object is not an entity
 	void evict(Object object);
 
-	/**
-	 * Return the persistent instance of the given entity class with the given identifier,
-	 * or null if there is no such persistent instance. If the instance is already associated
-	 * with the session, return that instance. This method never returns an uninitialized
-	 * instance.
-	 * <p>
-	 * The object returned by {@code get()} or {@code find()} is either an unproxied instance
-	 * of the given entity class, or a fully-fetched proxy object.
-	 * <p>
-	 * This operation requests {@link LockMode#NONE}, that is, no lock, allowing the object
-	 * to be retrieved from the cache without the cost of database access. However, if it is
-	 * necessary to read the state from the database, the object will be returned with the
-	 * lock mode {@link LockMode#READ}.
-	 * <p>
-	 * To bypass the {@linkplain Cache second-level cache}, and ensure that the state of the
-	 * requested instance is read directly from the database, either:
-	 * <ul>
-	 * <li>call {@link #find(Class, Object, FindOption...)}, passing
-	 *     {@link CacheRetrieveMode#BYPASS} as an option,
-	 * <li>call {@link #find(Class, Object, FindOption...)} with the explicit lock mode
-	 *     {@link LockMode#READ}, or
-	 * <li>{@linkplain #setCacheRetrieveMode set the cache mode} to
-	 *     {@link CacheRetrieveMode#BYPASS} before calling this method.
-	 * </ul>
-	 *
-	 * @apiNote This operation is very similar to {@link #get(Class, Object)}.
-	 *
-	 * @param entityType the entity type
-	 * @param id an identifier
-	 *
-	 * @return a fully-fetched persistent instance or null
-	 */
+	/// Return the persistent instance of the given entity class with the given identifier,
+	/// or null if there is no such persistent instance. If the instance is already associated
+	/// with the session, return that instance. This method never returns an uninitialized
+	/// instance.
+	///
+	/// The object returned by `get()` or `find()` is either an unproxied instance
+	/// of the given entity class, or a fully-fetched proxy object.
+	///
+	/// This operation requests [LockMode#NONE], that is, no lock, allowing the object
+	/// to be retrieved from the cache without the cost of database access. However, if it is
+	/// necessary to read the state from the database, the object will be returned with the
+	/// lock mode [LockMode#READ].
+	///
+	/// To bypass the [second-level cache][Cache], and ensure that the state of the
+	/// requested instance is read directly from the database, either:
+	///
+	///   - call [#find(Class,Object,FindOption...)], passing
+	///     [CacheRetrieveMode#BYPASS] as an option,
+	///   - call [#find(Class,Object,FindOption...)] with the explicit lock mode
+	///     [LockMode#READ], or
+	///   - {@linkplain #setCacheRetrieveMode set the cache mode} to
+	///     [CacheRetrieveMode#BYPASS] before calling this method.
+	///
+	/// @apiNote This operation is very similar to [#get(Class,Object)].
+	///
+	/// @param entityType the entity type
+	/// @param id an identifier
+	///
+	/// @return a fully-fetched persistent instance or null
 	@Override
 	<T> T find(Class<T> entityType, Object id);
 
-	/**
-	 * Return the persistent instance of the named entity type with the given identifier,
-	 * or null if there is no such persistent instance.
-	 * <p/>
-	 * Differs from {@linkplain #find(Class, Object)} in that this form accepts
-	 * the entity name of a {@linkplain org.hibernate.metamodel.RepresentationMode#MAP dynamic entity}.
-	 *
-	 * @see #find(Class, Object)
-	 */
+	/// {@inheritDoc}
+	///
+	/// @implNote Note that Hibernate's implementation of this method can
+	/// also be used for loading an entity by its [natural-id][org.hibernate.annotations.NaturalId]
+	/// by passing [KeyType#NATURAL] as a [FindOption] and the natural-id value as the `key` to load.
+	///
+	/// @param entityType the entity type
+	/// @param id an identifier
+	/// @param options options controlling the behavior of the operation
+	@Override
+	<T> T find(Class<T> entityType, Object id, FindOption... options);
+
+	/// Return the persistent instance of the named entity type with the given identifier,
+	/// or null if there is no such persistent instance.
+	///
+	/// Differs from {@linkplain #find(Class, Object)} in that this form accepts
+	/// the entity name of a [dynamic entity][org.hibernate.metamodel.RepresentationMode#MAP].
+	///
+	/// @see #find(Class, Object)
 	Object find(String entityName, Object primaryKey);
 
-	/**
-	 * Return the persistent instance of the named entity type with the given identifier
-	 * using the specified options, or null if there is no such persistent instance.
-	 * <p/>
-	 * Differs from {@linkplain #find(Class, Object, FindOption...)} in that this form accepts
-	 * the entity name of a {@linkplain org.hibernate.metamodel.RepresentationMode#MAP dynamic entity}.
-	 *
-	 * @see #find(Class, Object, FindOption...)
-	 */
+	/// Return the persistent instance of the named entity type with the given identifier
+	/// using the specified options, or null if there is no such persistent instance.
+	///
+	/// Differs from [#find(Class, Object, FindOption...)] in that this form accepts
+	/// the entity name of a [dynamic entity][org.hibernate.metamodel.RepresentationMode#MAP].
+	///
+	/// @see #find(Class, Object, FindOption...)
 	Object find(String entityName, Object primaryKey, FindOption... options);
 
-	/**
-	 * Return the persistent instances of the given entity class with the given identifiers
-	 * as a list. The position of an instance in the returned list matches the position of its
-	 * identifier in the given list of identifiers, and the returned list contains a null value
-	 * if there is no persistent instance matching a given identifier. If an instance is already
-	 * associated with the session, that instance is returned. This method never returns an
-	 * uninitialized instance.
-	 * <p>
-	 * Every object returned by {@code findMultiple()} is either an unproxied instance of the
-	 * given entity class, or a fully-fetched proxy object.
-	 * <p>
-	 * This method accepts {@link BatchSize} as an option, allowing control over the number of
-	 * records retrieved in a single database request. The performance impact of setting a batch
-	 * size depends on whether a SQL array may be used to pass the list of identifiers to the
-	 * database:
-	 * <ul>
-	 * <li>for databases which {@linkplain org.hibernate.dialect.Dialect#supportsStandardArrays
-	 *     support standard SQL arrays}, a smaller batch size might be extremely inefficient
-	 *     compared to a very large batch size or no batching at all, but
-	 * <li>on the other hand, for databases with no SQL array type, a large batch size results
-	 *     in long SQL statements with many JDBC parameters.
-	 * </ul>
-	 *
-	 * @param entityType the entity type
-	 * @param ids the list of identifiers
-	 * @param options options, if any
-	 *
-	 * @return an ordered list of persistent instances, with null elements representing missing
-	 *         entities, whose positions in the list match the positions of their ids in the
-	 *         given list of identifiers
-	 *
-	 * @see FindMultipleOption
-	 *
-	 * @since 7.0
-	 */
+	/// Return the persistent instances of the given entity class with the given identifiers
+	/// as a list. The position of an instance in the returned list matches the position of its
+	/// identifier in the given list of identifiers, and the returned list contains a null value
+	/// if there is no persistent instance matching a given identifier. If an instance is already
+	/// associated with the session, that instance is returned. This method never returns an
+	/// uninitialized instance.
+	///
+	/// Every object returned by `findMultiple()` is either an unproxied instance of the
+	/// given entity class, or a fully-fetched proxy object.
+	///
+	/// This method accepts [BatchSize] as an option, allowing control over the number of
+	/// records retrieved in a single database request. The performance impact of setting a batch
+	/// size depends on whether a SQL array may be used to pass the list of identifiers to the
+	/// database:
+	///
+	///   - for databases which [support standard SQL arrays][org.hibernate.dialect.Dialect#supportsStandardArrays],
+	/// 	a smaller batch size might be extremely inefficient compared to a very large batch size or
+	/// 	no batching at all, but
+	///   - on the other hand, for databases with no SQL array type, a large batch size results
+	///     in long SQL statements with many JDBC parameters.
+	///
+	/// @param entityType the entity type
+	/// @param ids the list of identifiers
+	/// @param options options, if any
+	///
+	/// @return an ordered list of persistent instances, with null elements representing missing
+	///         entities, whose positions in the list match the positions of their ids in the
+	///         given list of identifiers
+	///
+	/// @see FindMultipleOption
+	///
+	/// @since 7.0
 	<E> List<E> findMultiple(Class<E> entityType, List<?> ids, FindOption... options);
 
-	/**
-	 * Return the persistent instances of the root entity of the given {@link EntityGraph}
-	 * with the given identifiers as a list, fetching the associations specified by the
-	 * graph, which is interpreted as a {@linkplain org.hibernate.graph.GraphSemantic#LOAD
-	 * load graph}. The position of an instance in the returned list matches the position of
-	 * its identifier in the given list of identifiers, and the returned list contains a null
-	 * value if there is no persistent instance matching a given identifier. If an instance
-	 * is already associated with the session, that instance is returned. This method never
-	 * returns an uninitialized instance.
-	 * <p>
-	 * Every object returned by {@code findMultiple()} is either an unproxied instance of the
-	 * given entity class, or a fully-fetched proxy object.
-	 * <p>
-	 * This method accepts {@link BatchSize} as an option, allowing control over the number of
-	 * records retrieved in a single database request. The performance impact of setting a batch
-	 * size depends on whether a SQL array may be used to pass the list of identifiers to the
-	 * database:
-	 * <ul>
-	 * <li>for databases which {@linkplain org.hibernate.dialect.Dialect#supportsStandardArrays
-	 *     support standard SQL arrays}, a smaller batch size might be extremely inefficient
-	 *     compared to a very large batch size or no batching at all, but
-	 * <li>on the other hand, for databases with no SQL array type, a large batch size results
-	 *     in long SQL statements with many JDBC parameters.
-	 * </ul>
-	 *
-	 * @param entityGraph the entity graph interpreted as a load graph
-	 * @param ids the list of identifiers
-	 * @param options options, if any
-	 *
-	 * @return an ordered list of persistent instances, with null elements representing missing
-	 *         entities, whose positions in the list match the positions of their ids in the
-	 *         given list of identifiers
-	 *
-	 * @see FindMultipleOption
-	 *
-	 * @since 7.0
-	 */
+	/// Return the persistent instances of the root entity of the given [EntityGraph]
+	/// with the given identifiers as a list, fetching the associations specified by the
+	/// graph, which is interpreted as a [load graph][org.hibernate.graph.GraphSemantic#LOAD].
+	/// The position of an instance in the returned list matches the position of
+	/// its identifier in the given list of identifiers, and the returned list contains a null
+	/// value if there is no persistent instance matching a given identifier. If an instance
+	/// is already associated with the session, that instance is returned. This method never
+	/// returns an uninitialized instance.
+	///
+	/// Every object returned by `findMultiple()` is either an unproxied instance of the
+	/// given entity class, or a fully-fetched proxy object.
+	///
+	/// This method accepts [BatchSize] as an option, allowing control over the number of
+	/// records retrieved in a single database request. The performance impact of setting a batch
+	/// size depends on whether a SQL array may be used to pass the list of identifiers to the
+	/// database:
+	///
+	///   - for databases which [support standard SQL arrays][org.hibernate.dialect.Dialect#supportsStandardArrays]
+	///     a smaller batch size might be extremely inefficient
+	///     compared to a very large batch size or no batching at all, but
+	///   - on the other hand, for databases with no SQL array type, a large batch size results
+	///     in long SQL statements with many JDBC parameters.
+	///
+	/// @param entityGraph the entity graph interpreted as a load graph
+	/// @param ids the list of identifiers
+	/// @param options options, if any
+	///
+	/// @return an ordered list of persistent instances, with null elements representing missing
+	///         entities, whose positions in the list match the positions of their ids in the
+	///         given list of identifiers
+	///
+	/// @see FindMultipleOption
+	///
+	/// @since 7.0
 	<E> List<E> findMultiple(EntityGraph<E> entityGraph, List<?> ids, FindOption... options);
 
-	/**
-	 * Read the persistent state associated with the given identifier into the given
-	 * transient instance.
-	 *
-	 * @param object a transient instance of an entity class
-	 * @param id an identifier
-	 */
+	/// Read the persistent state associated with the given identifier into the given
+	/// transient instance.
+	///
+	/// @param object a transient instance of an entity class
+	/// @param id an identifier
 	void load(Object object, Object id);
 
-	/**
-	 * Persist the state of the given detached instance, reusing the current
-	 * identifier value.  This operation cascades to associated instances if
-	 * the association is mapped with
-	 * {@link org.hibernate.annotations.CascadeType#REPLICATE}.
-	 *
-	 * @param object a detached instance of a persistent class
-	 * @param replicationMode the replication mode to use
-	 *
-	 * @deprecated With no real replacement. For some use cases try
-	 *             {@link StatelessSession#upsert(Object)}.
-	 */
+	/// Persist the state of the given detached instance, reusing the current
+	/// identifier value.  This operation cascades to associated instances if
+	/// the association is mapped with [org.hibernate.annotations.CascadeType#REPLICATE].
+	///
+	/// @param object a detached instance of a persistent class
+	/// @param replicationMode the replication mode to use
+	///
+	/// @deprecated With no real replacement. For some use cases try [StatelessSession#upsert(Object)].
 	@Deprecated( since = "6.0" )
 	void replicate(Object object, ReplicationMode replicationMode);
 
-	/**
-	 * Persist the state of the given detached instance, reusing the current
-	 * identifier value.  This operation cascades to associated instances if
-	 * the association is mapped with
-	 * {@link org.hibernate.annotations.CascadeType#REPLICATE}.
-	 *
-	 * @param entityName the entity name
-	 * @param object a detached instance of a persistent class
-	 * @param replicationMode the replication mode to use
-	 *
-	 * @deprecated With no real replacement. For some use cases try
-	 *             {@link StatelessSession#upsert(Object)}.
-	 */
+	/// Persist the state of the given detached instance, reusing the current
+	/// identifier value.  This operation cascades to associated instances if
+	/// the association is mapped with [org.hibernate.annotations.CascadeType#REPLICATE].
+	///
+	/// @param entityName the entity name
+	/// @param object a detached instance of a persistent class
+	/// @param replicationMode the replication mode to use
+	///
+	/// @deprecated With no real replacement. For some use cases try [StatelessSession#upsert(Object)].
 	@Deprecated( since = "6.0" )
 	void replicate(String entityName, Object object, ReplicationMode replicationMode) ;
 
-	/**
-	 * Copy the state of the given object onto the persistent object with the same
-	 * identifier. If there is no persistent instance currently associated with
-	 * the session, it will be loaded. Return the persistent instance. If the
-	 * given instance is unsaved, save a copy and return it as a newly persistent
-	 * instance. The given instance does not become associated with the session.
-	 * This operation cascades to associated instances if the association is mapped
-	 * with {@link jakarta.persistence.CascadeType#MERGE}.
-	 *
-	 * @param object a detached instance with state to be copied
-	 *
-	 * @return an updated persistent instance
-	 */
+	/// Copy the state of the given object onto the persistent object with the same
+	/// identifier. If there is no persistent instance currently associated with
+	/// the session, it will be loaded. Return the persistent instance. If the
+	/// given instance is unsaved, save a copy and return it as a newly persistent
+	/// instance. The given instance does not become associated with the session.
+	/// This operation cascades to associated instances if the association is mapped
+	/// with [jakarta.persistence.CascadeType#MERGE].
+	///
+	/// @param object a detached instance with state to be copied
+	///
+	/// @return an updated persistent instance
 	@Override
 	<T> T merge(T object);
 
-	/**
-	 * Copy the state of the given object onto the persistent object with the same
-	 * identifier. If there is no persistent instance currently associated with
-	 * the session, it will be loaded. Return the persistent instance. If the
-	 * given instance is unsaved, save a copy and return it as a newly persistent
-	 * instance. The given instance does not become associated with the session.
-	 * This operation cascades to associated instances if the association is mapped
-	 * with {@link jakarta.persistence.CascadeType#MERGE}.
-	 *
-	 * @param entityName the entity name
-	 * @param object a detached instance with state to be copied
-	 *
-	 * @return an updated persistent instance
-	 */
+	/// Copy the state of the given object onto the persistent object with the same
+	/// identifier. If there is no persistent instance currently associated with
+	/// the session, it will be loaded. Return the persistent instance. If the
+	/// given instance is unsaved, save a copy and return it as a newly persistent
+	/// instance. The given instance does not become associated with the session.
+	/// This operation cascades to associated instances if the association is mapped
+	/// with [jakarta.persistence.CascadeType#MERGE].
+	///
+	/// @param entityName the entity name
+	/// @param object a detached instance with state to be copied
+	///
+	/// @return an updated persistent instance
 	<T> T merge(String entityName, T object);
 
-	/**
-	 * Copy the state of the given object onto the persistent object with the same
-	 * identifier. If there is no persistent instance currently associated with
-	 * the session, it is loaded using the given {@link EntityGraph}, which is
-	 * interpreted as a load graph. Return the persistent instance. If the given
-	 * instance is unsaved, save a copy and return it as a newly persistent instance.
-	 * The given instance does not become associated with the session. This operation
-	 * cascades to associated instances if the association is mapped with
-	 * {@link jakarta.persistence.CascadeType#MERGE}.
-	 *
-	 * @param object a detached instance with state to be copied
-	 * @param loadGraph an entity graph interpreted as a load graph
-	 *
-	 * @return an updated persistent instance
-	 *
-	 * @since 7.0
-	 */
+	/// Copy the state of the given object onto the persistent object with the same
+	/// identifier. If there is no persistent instance currently associated with
+	/// the session, it is loaded using the given [EntityGraph], which is
+	/// interpreted as a load graph. Return the persistent instance. If the given
+	/// instance is unsaved, save a copy and return it as a newly persistent instance.
+	/// The given instance does not become associated with the session. This operation
+	/// cascades to associated instances if the association is mapped with
+	/// [jakarta.persistence.CascadeType#MERGE].
+	///
+	/// @param object a detached instance with state to be copied
+	/// @param loadGraph an entity graph interpreted as a load graph
+	///
+	/// @return an updated persistent instance
+	///
+	/// @since 7.0
 	<T> T merge(T object, EntityGraph<? super T> loadGraph);
 
-	/**
-	 * Make a transient instance persistent and mark it for later insertion in the
-	 * database. This operation cascades to associated instances if the association
-	 * is mapped with {@link jakarta.persistence.CascadeType#PERSIST}.
-	 * <p>
-	 * For an entity with a {@linkplain jakarta.persistence.GeneratedValue generated}
-	 * id, {@code persist()} ultimately results in generation of an identifier for
-	 * the given instance. But this may happen asynchronously, when the session is
-	 * {@linkplain #flush() flushed}, depending on the identifier generation strategy.
-	 *
-	 * @param object a transient instance to be made persistent
-	 */
+	/// Make a transient instance persistent and mark it for later insertion in the
+	/// database. This operation cascades to associated instances if the association
+	/// is mapped with [jakarta.persistence.CascadeType#PERSIST].
+	///
+	/// For entities with a [generated id][jakarta.persistence.GeneratedValue],
+	/// `persist()` ultimately results in generation of an identifier for the
+	/// given instance. But this may happen asynchronously, when the session is
+	/// [flushed][#flush()], depending on the identifier generation strategy.
+	///
+	/// @param object a transient instance to be made persistent
 	@Override
 	void persist(Object object);
 
-	/**
-	 * Make a transient instance persistent and mark it for later insertion in the
-	 * database. This operation cascades to associated instances if the association
-	 * is mapped with {@link jakarta.persistence.CascadeType#PERSIST}.
-	 * <p>
-	 * For entities with a {@link jakarta.persistence.GeneratedValue generated id},
-	 * {@code persist()} ultimately results in generation of an identifier for the
-	 * given instance. But this may happen asynchronously, when the session is
-	 * {@linkplain #flush() flushed}, depending on the identifier generation strategy.
-	 *
-	 * @param entityName the entity name
-	 * @param object a transient instance to be made persistent
-	 */
+	/// Make a transient instance persistent and mark it for later insertion in the
+	/// database. This operation cascades to associated instances if the association
+	/// is mapped with [jakarta.persistence.CascadeType#PERSIST].
+	///
+	/// For entities with a [generated id][jakarta.persistence.GeneratedValue],
+	/// `persist()` ultimately results in generation of an identifier for the
+	/// given instance. But this may happen asynchronously, when the session is
+	/// [flushed][#flush()], depending on the identifier generation strategy.
+	///
+	/// @param entityName the entity name
+	/// @param object a transient instance to be made persistent
 	void persist(String entityName, Object object);
 
-	/**
-	 * Obtain the specified lock level on the given managed instance associated
-	 * with this session. This operation may be used to:
-	 * <ul>
-	 * <li>perform a version check on an entity read from the second-level cache
-	 *     by requesting {@link LockMode#READ},
-	 * <li>schedule a version check at transaction commit by requesting
-	 *     {@link LockMode#OPTIMISTIC},
-	 * <li>schedule a version increment at transaction commit by requesting
-	 *     {@link LockMode#OPTIMISTIC_FORCE_INCREMENT}
-	 * <li>upgrade to a pessimistic lock with {@link LockMode#PESSIMISTIC_READ}
-	 *     or {@link LockMode#PESSIMISTIC_WRITE}, or
-	 * <li>immediately increment the version of the given instance by requesting
-	 *     {@link LockMode#PESSIMISTIC_FORCE_INCREMENT}.
-	 * </ul>
-	 * <p>
-	 * If the requested lock mode is already held on the given entity, this
-	 * operation has no effect.
-	 * <p>
-	 * This operation cascades to associated instances if the association is
-	 * mapped with {@link org.hibernate.annotations.CascadeType#LOCK}.
-	 * <p>
-	 * The modes {@link LockMode#WRITE} and {@link LockMode#UPGRADE_SKIPLOCKED}
-	 * are not legal arguments to {@code lock()}.
-	 *
-	 * @param object a persistent instance associated with this session
-	 * @param lockMode the lock level
-	 *
-	 * @see #lock(Object, LockModeType)
-	 */
+	/// Obtain the specified lock level on the given managed instance associated
+	/// with this session. This operation may be used to:
+	///
+	///   - perform a version check on an entity read from the second-level cache
+	///     by requesting [LockMode#READ],
+	///   - schedule a version check at transaction commit by requesting
+	///     [LockMode#OPTIMISTIC],
+	///   - schedule a version increment at transaction commit by requesting
+	///     [LockMode#OPTIMISTIC_FORCE_INCREMENT]
+	///   - upgrade to a pessimistic lock with [LockMode#PESSIMISTIC_READ]
+	///     or [LockMode#PESSIMISTIC_WRITE], or
+	///   - immediately increment the version of the given instance by requesting
+	///     [LockMode#PESSIMISTIC_FORCE_INCREMENT].
+	///
+	/// If the requested lock mode is already held on the given entity, this
+	/// operation has no effect.
+	///
+	/// This operation cascades to associated instances if the association is
+	/// mapped with [org.hibernate.annotations.CascadeType#LOCK].
+	///
+	/// The modes [LockMode#WRITE] and [LockMode#UPGRADE_SKIPLOCKED]
+	/// are not legal arguments to `lock()`.
+	///
+	/// @param object a persistent instance associated with this session
+	/// @param lockMode the lock level
+	///
+	/// @see #lock(Object, LockModeType)
 	void lock(Object object, LockMode lockMode);
 
-	/**
-	 * Obtain the specified lock level on the given managed instance associated
-	 * with this session, applying any other specified options. This operation may
-	 * be used to:
-	 * <ul>
-	 * <li>perform a version check on an entity read from the second-level cache
-	 *     by requesting {@link LockMode#READ},
-	 * <li>schedule a version check at transaction commit by requesting
-	 *     {@link LockMode#OPTIMISTIC},
-	 * <li>schedule a version increment at transaction commit by requesting
-	 *     {@link LockMode#OPTIMISTIC_FORCE_INCREMENT}
-	 * <li>upgrade to a pessimistic lock with {@link LockMode#PESSIMISTIC_READ}
-	 *     or {@link LockMode#PESSIMISTIC_WRITE}, or
-	 * <li>immediately increment the version of the given instance by requesting
-	 *     {@link LockMode#PESSIMISTIC_FORCE_INCREMENT}.
-	 * </ul>
-	 * <p>
-	 * If the requested lock mode is already held on the given entity, this
-	 * operation has no effect.
-	 * <p>
-	 * This operation cascades to associated instances if the association is
-	 * mapped with {@link org.hibernate.annotations.CascadeType#LOCK}.
-	 * <p>
-	 * The modes {@link LockMode#WRITE} and {@link LockMode#UPGRADE_SKIPLOCKED}
-	 * are not legal arguments to {@code lock()}.
-	 *
-	 * @param object a persistent instance associated with this session
-	 * @param lockMode the lock level
-	 *
-	 * @see #lock(Object, LockModeType, LockOption...)
-	 */
+	/// Obtain the specified lock level on the given managed instance associated
+	/// with this session, applying any other specified options. This operation may
+	/// be used to:
+	///
+	///   - perform a version check on an entity read from the second-level cache
+	///     by requesting [LockMode#READ],
+	///   - schedule a version check at transaction commit by requesting
+	///     [LockMode#OPTIMISTIC],
+	///   - schedule a version increment at transaction commit by requesting
+	///     [LockMode#OPTIMISTIC_FORCE_INCREMENT]
+	///   - upgrade to a pessimistic lock with [LockMode#PESSIMISTIC_READ]
+	///     or [LockMode#PESSIMISTIC_WRITE], or
+	///   - immediately increment the version of the given instance by requesting
+	///     [LockMode#PESSIMISTIC_FORCE_INCREMENT].
+	///
+	/// If the requested lock mode is already held on the given entity, this
+	/// operation has no effect.
+	///
+	/// This operation cascades to associated instances if the association is
+	/// mapped with [org.hibernate.annotations.CascadeType#LOCK].
+	///
+	/// The modes [LockMode#WRITE] and [LockMode#UPGRADE_SKIPLOCKED]
+	/// are not legal arguments to `lock()`.
+	///
+	/// @param object a persistent instance associated with this session
+	/// @param lockMode the lock level
+	///
+	/// @see #lock(Object, LockModeType, LockOption...)
 	void lock(Object object, LockMode lockMode, LockOption... lockOptions);
 
-	/**
-	 * Reread the state of the given managed instance associated with this session
-	 * from the underlying database. This may be useful:
-	 * <ul>
-	 * <li>when a database trigger alters the object state upon insert or update,
-	 * <li>after {@linkplain #createMutationQuery(String) executing} any HQL update
-	 *     or delete statement,
-	 * <li>after {@linkplain #createNativeMutationQuery(String) executing} a native
-	 *     SQL statement, or
-	 * <li>after inserting a {@link java.sql.Blob} or {@link java.sql.Clob}.
-	 * </ul>
-	 * <p>
-	 * This operation cascades to associated instances if the association is mapped
-	 * with {@link jakarta.persistence.CascadeType#REFRESH}.
-	 * <p>
-	 * This operation requests {@link LockMode#READ}. To obtain a stronger lock,
-	 * call {@link #refresh(Object, RefreshOption...)}, passing the appropriate
-	 * {@link LockMode} as an option.
-	 *
-	 * @param object a persistent instance associated with this session
-	 */
+	/// Reread the state of the given managed instance associated with this session
+	/// from the underlying database. This may be useful:
+	///
+	///   - when a database trigger alters the object state upon insert or update,
+	///   - after {@linkplain #createMutationQuery(String) executing} any HQL update
+	///     or delete statement,
+	///   - after {@linkplain #createNativeMutationQuery(String) executing} a native
+	///     SQL statement, or
+	///   - after inserting a [java.sql.Blob] or [java.sql.Clob].
+	///
+	/// This operation cascades to associated instances if the association is mapped
+	/// with [jakarta.persistence.CascadeType#REFRESH].
+	///
+	/// This operation requests [LockMode#READ]. To obtain a stronger lock,
+	/// call [#refresh(Object,RefreshOption...)], passing the appropriate
+	/// [LockMode] as an option.
+	///
+	/// @param object a persistent instance associated with this session
 	@Override
 	void refresh(Object object);
 
-	/**
-	 * Mark a persistence instance associated with this session for removal from
-	 * the underlying database. Ths operation cascades to associated instances if
-	 * the association is mapped {@link jakarta.persistence.CascadeType#REMOVE}.
-	 * <p>
-	 * Except when operating in fully JPA-compliant mode, this operation does,
-	 * contrary to the JPA specification, accept a detached entity instance.
-	 *
-	 * @param object the managed persistent instance to remove, or a detached
-	 *               instance unless operating in fully JPA-compliant mode
-	 */
+	/// {@inheritDoc}
+	///
+	/// @param object a persistent instance associated with this session
+	/// @param options options controlling the behavior of the operation
+	@Override
+	void refresh(Object object, RefreshOption... options);
+
+	/// Mark a persistence instance associated with this session for removal from
+	/// the underlying database. This operation cascades to associated instances
+	/// if the association is mapped [jakarta.persistence.CascadeType#REMOVE].
+	///
+	/// Except when operating in fully JPA-compliant mode, this operation does,
+	/// contrary to the JPA specification, accept a detached entity instance.
+	///
+	/// @param object the managed persistent instance to remove, or a detached
+	///               instance unless operating in fully JPA-compliant mode
 	@Override
 	void remove(Object object);
 
-	/**
-	 * Determine the current {@linkplain LockMode lock mode} held on the given
-	 * managed instance associated with this session.
-	 * <p>
-	 * Unlike the JPA-standard {@link #getLockMode}, this operation may be
-	 * called when no transaction is active, in which case it should return
-	 * {@link LockMode#NONE}, indicating that no pessimistic lock is held on
-	 * the given entity.
-	 *
-	 * @param object a persistent instance associated with this session
-	 *
-	 * @return the lock mode currently held on the given entity
-	 *
-	 * @throws IllegalStateException if the given instance is not associated
-	 *                               with this persistence context
-	 * @throws ObjectDeletedException if the given instance was already
-	 *                                {@linkplain #remove removed}
-	 */
+	/// Determine the current [lock mode][LockMode] held on the given
+	/// managed instance associated with this session.
+	///
+	/// Unlike the JPA-standard [#getLockMode], this operation may be
+	/// called when no transaction is active, in which case it should return
+	/// [LockMode#NONE], indicating that no pessimistic lock is held on
+	/// the given entity.
+	///
+	/// @param object a persistent instance associated with this session
+	///
+	/// @return the lock mode currently held on the given entity
+	///
+	/// @throws IllegalStateException if the given instance is not associated
+	///                               with this persistence context
+	/// @throws ObjectDeletedException if the given instance was already
+	///                                {@linkplain #remove removed}
 	LockMode getCurrentLockMode(Object object);
 
-	/**
-	 * Completely clear the persistence context. Evict all loaded instances,
-	 * causing every managed entity currently associated with this session to
-	 * transition to the detached state, and cancel all pending insertions,
-	 * updates, and deletions.
-	 * <p>
-	 * Does not close open iterators or instances of {@link ScrollableResults}.
-	 */
+	/// Completely clear the persistence context. Evict all loaded instances,
+	/// causing every managed entity currently associated with this session to
+	/// transition to the detached state, and cancel all pending insertions,
+	/// updates, and deletions.
+	///
+	/// Does not close open iterators or instances of [ScrollableResults].
 	@Override
 	void clear();
 
-	/**
-	 * Return the persistent instance of the given entity class with the given identifier,
-	 * or null if there is no such persistent instance. If the instance is already associated
-	 * with the session, return that instance. This method never returns an uninitialized
-	 * instance.
-	 * <p>
-	 * The object returned by {@code get()} or {@code find()} is either an unproxied instance
-	 * of the given entity class, or a fully-fetched proxy object.
-	 * <p>
-	 * This operation requests {@link LockMode#NONE}, that is, no lock, allowing the object
-	 * to be retrieved from the cache without the cost of database access. However, if it is
-	 * necessary to read the state from the database, the object will be returned with the
-	 * lock mode {@link LockMode#READ}.
-	 * <p>
-	 * To bypass the second-level cache, and ensure that the state is read from the database,
-	 * either:
-	 * <ul>
-	 * <li>call {@link #get(Class, Object, LockMode)} with the explicit lock mode
-	 *     {@link LockMode#READ}, or
-	 * <li>{@linkplain #setCacheMode set the cache mode} to {@link CacheMode#IGNORE}
-	 *     before calling this method.
-	 * </ul>
-	 *
-	 * @apiNote This operation is very similar to {@link #find(Class, Object)}.
-	 *
-	 * @param entityType the entity type
-	 * @param id an identifier
-	 *
-	 * @return a persistent instance or null
-	 *
-	 * @deprecated Because the semantics of this method may change in a future release.
-	 *             Use {@link #find(Class, Object)} instead.
-	 */
+	/// Return the persistent instance of the given entity class with the given identifier,
+	/// or null if there is no such persistent instance. If the instance is already associated
+	/// with the session, return that instance. This method never returns an uninitialized
+	/// instance.
+	///
+	/// The object returned by `get()` or `find()` is either an unproxied instance
+	/// of the given entity class, or a fully-fetched proxy object.
+	///
+	/// This operation requests [LockMode#NONE], that is, no lock, allowing the object
+	/// to be retrieved from the cache without the cost of database access. However, if it is
+	/// necessary to read the state from the database, the object will be returned with the
+	/// lock mode [LockMode#READ].
+	///
+	/// To bypass the second-level cache, and ensure that the state is read from the database,
+	/// either:
+	///
+	///   - call [#get(Class,Object,LockMode)] with the explicit lock mode
+	///     [LockMode#READ], or
+	///   - {@linkplain #setCacheMode set the cache mode} to [CacheMode#IGNORE]
+	///     before calling this method.
+	///
+	/// @apiNote This operation is very similar to [#find(Class,Object)].
+	///
+	/// @param entityType the entity type
+	/// @param id an identifier
+	///
+	/// @return a persistent instance or null
+	///
+	/// @deprecated Because the semantics of this method may change in a future release.
+	///             Use [#find(Class,Object)] instead.
 	@Deprecated(since = "7.0", forRemoval = true)
 	<T> T get(Class<T> entityType, Object id);
 
-	/**
-	 * Return the persistent instance of the given entity class with the given identifier,
-	 * or null if there is no such persistent instance. If the instance is already associated
-	 * with the session, return that instance. This method never returns an uninitialized
-	 * instance. Obtain the specified lock mode if the instance exists.
-	 *
-	 * @apiNote This operation is very similar to {@link #find(Class, Object, LockModeType)}.
-	 *
-	 * @param entityType the entity type
-	 * @param id an identifier
-	 * @param lockMode the lock mode
-	 *
-	 * @return a persistent instance or null
-	 *
-	 * @deprecated Use {@link #find(Class, Object, FindOption...)} instead.
-	 */
+	/// Return the persistent instance of the given entity class with the given identifier,
+	/// or null if there is no such persistent instance. If the instance is already associated
+	/// with the session, return that instance. This method never returns an uninitialized
+	/// instance. Obtain the specified lock mode if the instance exists.
+	///
+	/// @apiNote This operation is very similar to [#find(Class,Object,LockModeType)].
+	///
+	/// @param entityType the entity type
+	/// @param id an identifier
+	/// @param lockMode the lock mode
+	///
+	/// @return a persistent instance or null
+	///
+	/// @deprecated Use [#find(Class,Object,FindOption...)] instead.
 	@Deprecated(since = "7.0", forRemoval = true)
 	<T> T get(Class<T> entityType, Object id, LockMode lockMode);
 
-	/**
-	 * Return the persistent instance of the given named entity with the given identifier,
-	 * or null if there is no such persistent instance. If the instance is already associated
-	 * with the session, return that instance. This method never returns an uninitialized
-	 * instance.
-	 *
-	 * @param entityName the entity name
-	 * @param id an identifier
-	 *
-	 * @return a persistent instance or null
-	 *
-	 * @deprecated The semantics of this method may change in a future release.
-	 *             Use {@link SessionFactory#createGraphForDynamicEntity(String)}
-	 *             together with {@link #find(EntityGraph, Object, FindOption...)}
-	 *             to load {@link org.hibernate.metamodel.RepresentationMode#MAP
-	 *             dynamic entities}.
-	 *
-	 * @see SessionFactory#createGraphForDynamicEntity(String)
-	 * @see #find(EntityGraph, Object, FindOption...)
-	 */
+	/// Return the persistent instance of the given named entity with the given identifier,
+	/// or null if there is no such persistent instance. If the instance is already associated
+	/// with the session, return that instance. This method never returns an uninitialized
+	/// instance.
+	///
+	/// @param entityName the entity name
+	/// @param id an identifier
+	///
+	/// @return a persistent instance or null
+	///
+	/// @deprecated The semantics of this method may change in a future release.
+	///             Use [SessionFactory#createGraphForDynamicEntity(String)]
+	///             together with [#find(EntityGraph,Object,FindOption...)]
+	///             to load [dynamic entities][org.hibernate.metamodel.RepresentationMode#MAP].
+	///
+	/// @see SessionFactory#createGraphForDynamicEntity(String)
+	/// @see #find(EntityGraph, Object, FindOption...)
 	@Deprecated(since = "7", forRemoval = true)
 	Object get(String entityName, Object id);
 
-	/**
-	 * Return the persistent instance of the given entity class with the given identifier,
-	 * or null if there is no such persistent instance. If the instance is already associated
-	 * with the session, return that instance. This method never returns an uninitialized
-	 * instance. Obtain the specified lock mode if the instance exists.
-	 *
-	 * @param entityName the entity name
-	 * @param id an identifier
-	 * @param lockMode the lock mode
-	 *
-	 * @return a persistent instance or null
-	 *
-	 * @see #get(String, Object, LockOptions)
-	 *
-	 * @deprecated The semantics of this method may change in a future release.
-	 */
+	/// Return the persistent instance of the given entity class with the given identifier,
+	/// or null if there is no such persistent instance. If the instance is already associated
+	/// with the session, return that instance. This method never returns an uninitialized
+	/// instance. Obtain the specified lock mode if the instance exists.
+	///
+	/// @param entityName the entity name
+	/// @param id an identifier
+	/// @param lockMode the lock mode
+	///
+	/// @return a persistent instance or null
+	///
+	/// @see #get(String, Object, LockOptions)
+	///
+	/// @deprecated The semantics of this method may change in a future release.
 	@Deprecated(since = "7.0", forRemoval = true)
 	Object get(String entityName, Object id, LockMode lockMode);
 
-	/**
-	 * Return the persistent instance of the given entity class with the given identifier,
-	 * or null if there is no such persistent instance. If the instance is already associated
-	 * with the session, return that instance. This method never returns an uninitialized
-	 * instance. Obtain the specified lock mode if the instance exists.
-	 *
-	 * @param entityType the entity type
-	 * @param id an identifier
-	 * @param lockOptions the lock mode
-	 *
-	 * @return a persistent instance or null
-	 *
-	 * @deprecated This method will be removed.
-	 *             Use {@link #find(Class, Object, FindOption...)} instead.
-	 */
+	/// Return the persistent instance of the given entity class with the given identifier,
+	/// or null if there is no such persistent instance. If the instance is already associated
+	/// with the session, return that instance. This method never returns an uninitialized
+	/// instance. Obtain the specified lock mode if the instance exists.
+	///
+	/// @param entityType the entity type
+	/// @param id an identifier
+	/// @param lockOptions the lock mode
+	///
+	/// @return a persistent instance or null
+	///
+	/// @deprecated This method will be removed.
+	///             Use [#find(Class,Object,FindOption...)] instead.
 	@Deprecated(since = "7.0", forRemoval = true)
 	<T> T get(Class<T> entityType, Object id, LockOptions lockOptions);
 
-	/**
-	 * Return the persistent instance of the given entity class with the given identifier,
-	 * or null if there is no such persistent instance. If the instance is already associated
-	 * with the session, return that instance. This method never returns an uninitialized
-	 * instance. Obtain the specified lock mode if the instance exists.
-	 *
-	 * @param entityName the entity name
-	 * @param id an identifier
-	 * @param lockOptions contains the lock mode
-	 *
-	 * @return a persistent instance or null
-	 *
-	 * @deprecated This method will be removed.
-	 *             Use {@link SessionFactory#createGraphForDynamicEntity(String)}
-	 *             together with {@link #find(EntityGraph, Object, FindOption...)}
-	 *             to load {@link org.hibernate.metamodel.RepresentationMode#MAP
-	 *             dynamic entities}.
-	 */
+	/// Return the persistent instance of the given entity class with the given identifier,
+	/// or null if there is no such persistent instance. If the instance is already associated
+	/// with the session, return that instance. This method never returns an uninitialized
+	/// instance. Obtain the specified lock mode if the instance exists.
+	///
+	/// @param entityName the entity name
+	/// @param id an identifier
+	/// @param lockOptions contains the lock mode
+	///
+	/// @return a persistent instance or null
+	///
+	/// @deprecated This method will be removed.
+	///             Use [SessionFactory#createGraphForDynamicEntity(String)]
+	///             together with [#find(EntityGraph,Object,FindOption...)]
+	///             to load [dynamic entities][org.hibernate.metamodel.RepresentationMode#MAP].
 	@Deprecated(since = "7.0", forRemoval = true)
 	Object get(String entityName, Object id, LockOptions lockOptions);
 
-	/**
-	 * Obtain a lock on the given managed instance associated with this session,
-	 * using the given {@linkplain LockOptions lock options}.
-	 * <p>
-	 * This operation cascades to associated instances if the association is
-	 * mapped with {@link org.hibernate.annotations.CascadeType#LOCK}.
-	 *
-	 * @param object a persistent instance associated with this session
-	 * @param lockOptions the lock options
-	 *
-	 * @since 6.2
-	 *
-	 * @deprecated This method will be removed.
-	 *             Use {@linkplain #lock(Object, LockModeType, LockOption...)} instead
-	 */
+	/// Obtain a lock on the given managed instance associated with this session,
+	/// using the given [lock options][LockOptions].
+	///
+	/// This operation cascades to associated instances if the association is
+	/// mapped with [org.hibernate.annotations.CascadeType#LOCK].
+	///
+	/// @param object a persistent instance associated with this session
+	/// @param lockOptions the lock options
+	///
+	/// @since 6.2
+	///
+	/// @deprecated This method will be removed.
+	///             Use [#lock(Object, LockModeType, LockOption...)] instead
 	@Deprecated(since = "7.0", forRemoval = true)
 	void lock(Object object, LockOptions lockOptions);
 
-	/**
-	 * Reread the state of the given managed instance from the underlying database,
-	 * obtaining the given {@link LockMode}.
-	 *
-	 * @param object a persistent instance associated with this session
-	 * @param lockOptions contains the lock mode to use
-	 *
-	 * @deprecated This method will be removed.
-	 *             Use {@linkplain #refresh(Object, RefreshOption...)} instead
-	 */
+	/// Reread the state of the given managed instance from the underlying database,
+	/// obtaining the given [LockMode].
+	///
+	/// @param object a persistent instance associated with this session
+	/// @param lockOptions contains the lock mode to use
+	///
+	/// @deprecated This method will be removed.
+	///             Use [#refresh(Object, RefreshOption...)] instead
 	@Deprecated(since = "7.0", forRemoval = true)
 	void refresh(Object object, LockOptions lockOptions);
 
-	/**
-	 * Return the entity name for the given persistent entity.
-	 * <p>
-	 * If the given entity is an uninitialized proxy, the proxy is initialized by
-	 * side effect.
-	 *
-	 * @param object a persistent entity associated with this session
-	 *
-	 * @return the entity name
-	 */
+	/// Return the entity name for the given persistent entity.
+	///
+	/// If the given entity is an uninitialized proxy, the proxy is initialized by
+	/// side effect.
+	///
+	/// @param object a persistent entity associated with this session
+	///
+	/// @return the entity name
 	String getEntityName(Object object);
 
-	/**
-	 * Return a reference to the persistent instance with the given class and identifier,
-	 * making the assumption that the instance is still persistent in the database. This
-	 * method never results in access to the underlying data store, and thus might return
-	 * a proxy that is initialized on-demand, when a non-identifier method is accessed.
-	 * <p>
-	 * Note that {@link Hibernate#createDetachedProxy(SessionFactory, Class, Object)}
-	 * may be used to obtain a <em>detached</em> reference.
-	 * <p>
-	 * It's sometimes necessary to narrow a reference returned by {@code getReference()}
-	 * to a subtype of the given entity type. A direct Java typecast should never be used
-	 * in this situation. Instead, the method {@link Hibernate#unproxy(Object, Class)} is
-	 * the recommended way to narrow the type of a proxy object. Alternatively, a new
-	 * reference may be obtained by simply calling {@code getReference()} again, passing
-	 * the subtype. Either way, the narrowed reference will usually not be identical to
-	 * the original reference, when the references are compared using the {@code ==}
-	 * operator.
-	 *
-	 * @param entityType the entity type
-	 * @param id the identifier of a persistent instance that exists in the database
-	 *
-	 * @return the persistent instance or proxy
-	 */
+	/// Return a reference to the persistent instance with the given class and identifier,
+	/// making the assumption that the instance is still persistent in the database. This
+	/// method never results in access to the underlying data store, and thus might return
+	/// a proxy that is initialized on-demand, when a non-identifier method is accessed.
+	///
+	/// Note that [Hibernate#createDetachedProxy(SessionFactory,Class,Object)]
+	/// may be used to obtain a _detached_ reference.
+	///
+	/// It's sometimes necessary to narrow a reference returned by `getReference()`
+	/// to a subtype of the given entity type. A direct Java typecast should never be used
+	/// in this situation. Instead, the method [Hibernate#unproxy(Object,Class)] is
+	/// the recommended way to narrow the type of a proxy object. Alternatively, a new
+	/// reference may be obtained by simply calling `getReference()` again, passing
+	/// the subtype. Either way, the narrowed reference will usually not be identical to
+	/// the original reference, when the references are compared using the `==`
+	/// operator.
+	///
+	/// @param entityType the entity type
+	/// @param id the identifier of a persistent instance that exists in the database
+	///
+	/// @return the persistent instance or proxy
 	@Override
 	<T> T getReference(Class<T> entityType, Object id);
 
-	/**
-	 * Return a reference to the persistent instance of the given named entity with the
-	 * given identifier, making the assumption that the instance is still persistent in
-	 * the database. This method never results in access to the underlying data store,
-	 * and thus might return a proxy that is initialized on-demand, when a non-identifier
-	 * method is accessed.
-	 *
-	 * @param entityName the entity name
-	 * @param id the identifier of a persistent instance that exists in the database
-	 *
-	 * @return the persistent instance or proxy
-	 */
+	/// Return a reference to the persistent instance of the given named entity with the
+	/// given identifier, making the assumption that the instance is still persistent in
+	/// the database. This method never results in access to the underlying data store,
+	/// and thus might return a proxy that is initialized on-demand, when a non-identifier
+	/// method is accessed.
+	///
+	/// @param entityName the entity name
+	/// @param id the identifier of a persistent instance that exists in the database
+	///
+	/// @return the persistent instance or proxy
 	Object getReference(String entityName, Object id);
 
-	/**
-	 * Return a reference to the persistent instance with the same identity as the given
-	 * instance, which might be detached, making the assumption that the instance is still
-	 * persistent in the database. This method never results in access to the underlying
-	 * data store, and thus might return a proxy that is initialized on-demand, when a
-	 * non-identifier method is accessed.
-	 *
-	 * @param object a detached persistent instance
-	 *
-	 * @return the persistent instance or proxy
-	 *
-	 * @since 6.0
-	 */
+	/// Return a reference to the persistent instance with the same identity as the given
+	/// instance, which might be detached, making the assumption that the instance is still
+	/// persistent in the database. This method never results in access to the underlying
+	/// data store, and thus might return a proxy that is initialized on-demand, when a
+	/// non-identifier method is accessed.
+	///
+	/// @param object a detached persistent instance
+	///
+	/// @return the persistent instance or proxy
+	///
+	/// @since 6.0
 	@Override
 	<T> T getReference(T object);
 
-	/**
-	 * Create an {@link IdentifierLoadAccess} instance to retrieve an instance of the given
-	 * entity type by its primary key.
-	 *
-	 * @param entityClass the entity type to be retrieved
-	 *
-	 * @return an instance of {@link IdentifierLoadAccess} for executing the lookup
-	 *
-	 * @throws HibernateException If the given class does not resolve as a mapped entity
-	 *
-	 * @deprecated This method will be removed.
-	 *             Use {@link #find(Class, Object, FindOption...)} instead.
-	 *             See {@link FindOption}.
-	 */
+	/// Create an [IdentifierLoadAccess] instance to retrieve an instance of the given
+	/// entity type by its primary key.
+	///
+	/// @param entityClass the entity type to be retrieved
+	///
+	/// @return an instance of [IdentifierLoadAccess] for executing the lookup
+	///
+	/// @throws HibernateException If the given class does not resolve as a mapped entity
+	///
+	/// @deprecated This method will be removed.
+	///             Use [#find(Class,Object,FindOption...)] instead.
+	///             See [FindOption].
 	@Deprecated(since = "7.1", forRemoval = true)
 	<T> IdentifierLoadAccess<T> byId(Class<T> entityClass);
 
-	/**
-	 * Create an {@link IdentifierLoadAccess} instance to retrieve an instance of the named
-	 * entity type by its primary key.
-	 *
-	 * @param entityName the entity name of the entity type to be retrieved
-	 *
-	 * @return an instance of {@link IdentifierLoadAccess} for executing the lookup
-	 *
-	 * @throws HibernateException If the given name does not resolve to a mapped entity
-	 *
-	 * @deprecated This method will be removed.
-	 *             Use {@link #find(String, Object, FindOption...)} instead.
-	 *             See {@link FindOption}.
-	 */
+	/// Create an [IdentifierLoadAccess] instance to retrieve an instance of the named
+	/// entity type by its primary key.
+	///
+	/// @param entityName the entity name of the entity type to be retrieved
+	///
+	/// @return an instance of [IdentifierLoadAccess] for executing the lookup
+	///
+	/// @throws HibernateException If the given name does not resolve to a mapped entity
+	///
+	/// @deprecated This method will be removed.
+	///             Use [#find(String,Object,FindOption...)] instead.
+	///             See [FindOption].
 	@Deprecated(since = "7.1", forRemoval = true)
 	<T> IdentifierLoadAccess<T> byId(String entityName);
 
-	/**
-	 * Create a {@link MultiIdentifierLoadAccess} instance to retrieve multiple instances
-	 * of the given entity type by their primary key values, using batching.
-	 *
-	 * @param entityClass the entity type to be retrieved
-	 *
-	 * @return an instance of {@link MultiIdentifierLoadAccess} for executing the lookup
-	 *
-	 * @throws HibernateException If the given class does not resolve as a mapped entity
-	 *
-	 * @see #findMultiple(Class, List, FindOption...)
-	 *
-	 * @deprecated Use {@link #findMultiple(Class, List, FindOption...)} instead.
-	 */
+	/// Create a [MultiIdentifierLoadAccess] instance to retrieve multiple instances
+	/// of the given entity type by their primary key values, using batching.
+	///
+	/// @param entityClass the entity type to be retrieved
+	///
+	/// @return an instance of [MultiIdentifierLoadAccess] for executing the lookup
+	///
+	/// @throws HibernateException If the given class does not resolve as a mapped entity
+	///
+	/// @see #findMultiple(Class, List, FindOption...)
+	///
+	/// @deprecated Use [#findMultiple(Class,List,FindOption...)] instead.
 	@Deprecated(since = "7.2", forRemoval = true)
 	<T> MultiIdentifierLoadAccess<T> byMultipleIds(Class<T> entityClass);
 
-	/**
-	 * Create a {@link MultiIdentifierLoadAccess} instance to retrieve multiple instances
-	 * of the named entity type by their primary key values, using batching.
-	 *
-	 * @param entityName the entity name of the entity type to be retrieved
-	 *
-	 * @return an instance of {@link MultiIdentifierLoadAccess} for executing the lookup
-	 *
-	 * @throws HibernateException If the given name does not resolve to a mapped entity
-	 *
-	 * @deprecated Use {@link #findMultiple(EntityGraph, List, FindOption...)} instead,
-	 * 		with {@linkplain SessionFactory#createGraphForDynamicEntity(String)}.
-	 */
+	/// Create a [MultiIdentifierLoadAccess] instance to retrieve multiple instances
+	/// of the named entity type by their primary key values, using batching.
+	///
+	/// @param entityName the entity name of the entity type to be retrieved
+	///
+	/// @return an instance of [MultiIdentifierLoadAccess] for executing the lookup
+	///
+	/// @throws HibernateException If the given name does not resolve to a mapped entity
+	///
+	/// @deprecated Use [#findMultiple(EntityGraph,List,FindOption...)] instead,
+	/// 		with {@linkplain SessionFactory#createGraphForDynamicEntity(String)}.
 	@Deprecated(since = "7.2", forRemoval = true)
 	<T> MultiIdentifierLoadAccess<T> byMultipleIds(String entityName);
 
-	/**
-	 * Create a {@link NaturalIdLoadAccess} instance to retrieve an instance of the given
-	 * entity type by its {@linkplain org.hibernate.annotations.NaturalId natural id},
-	 * which may be a composite natural id. The entity must have at least one attribute
-	 * annotated {@link org.hibernate.annotations.NaturalId}.
-	 *
-	 * @param entityClass the entity type to be retrieved
-	 *
-	 * @return an instance of {@link NaturalIdLoadAccess} for executing the lookup
-	 *
-	 * @throws HibernateException If the given class does not resolve as a mapped entity,
-	 *                            or if the entity does not declare a natural id
-	 */
+	/// Create a [NaturalIdLoadAccess] instance to retrieve an instance of the given
+	/// entity type by its {@linkplain org.hibernate.annotations.NaturalId natural id},
+	/// which may be a composite natural id. The entity must have at least one attribute
+	/// annotated [org.hibernate.annotations.NaturalId].
+	///
+	/// @param entityClass the entity type to be retrieved
+	///
+	/// @return an instance of [NaturalIdLoadAccess] for executing the lookup
+	///
+	/// @throws HibernateException If the given class does not resolve as a mapped entity,
+	///                            or if the entity does not declare a natural id
+	///
+	/// @deprecated (since 7.3) : Use {@linkplain #find} with [KeyType#NATURAL] instead.
+	@Deprecated
 	<T> NaturalIdLoadAccess<T> byNaturalId(Class<T> entityClass);
 
-	/**
-	 * Create a {@link NaturalIdLoadAccess} instance to retrieve an instance of the named
-	 * entity type by its {@linkplain org.hibernate.annotations.NaturalId natural id},
-	 * which may be a composite natural id. The entity must have at least one attribute
-	 * annotated {@link org.hibernate.annotations.NaturalId}.
-	 *
-	 * @param entityName the entity name of the entity type to be retrieved
-	 *
-	 * @return an instance of {@link NaturalIdLoadAccess} for executing the lookup
-	 *
-	 * @throws HibernateException If the given name does not resolve to a mapped entity,
-	 *                            or if the entity does not declare a natural id
-	 */
+	/// Create a [NaturalIdLoadAccess] instance to retrieve an instance of the named
+	/// entity type by its {@linkplain org.hibernate.annotations.NaturalId natural id},
+	/// which may be a composite natural id. The entity must have at least one attribute
+	/// annotated [org.hibernate.annotations.NaturalId].
+	///
+	/// @param entityName the entity name of the entity type to be retrieved
+	///
+	/// @return an instance of [NaturalIdLoadAccess] for executing the lookup
+	///
+	/// @throws HibernateException If the given name does not resolve to a mapped entity,
+	///                            or if the entity does not declare a natural id
+	///
+	/// @deprecated (since 7.3) : Use {@linkplain #find} with [KeyType#NATURAL] instead.
+	@Deprecated
 	<T> NaturalIdLoadAccess<T> byNaturalId(String entityName);
 
-	/**
-	 * Create a {@link SimpleNaturalIdLoadAccess} instance to retrieve an instance of the
-	 * given entity type by its {@linkplain org.hibernate.annotations.NaturalId natural id},
-	 * which must be a simple (non-composite) value. The entity must have exactly one
-	 * attribute annotated {@link org.hibernate.annotations.NaturalId}.
-	 *
-	 * @param entityClass the entity type to be retrieved
-	 *
-	 * @return an instance of {@link SimpleNaturalIdLoadAccess} for executing the lookup
-	 *
-	 * @throws HibernateException If the given class does not resolve as a mapped entity,
-	 *                            or if the entity does not declare a natural id
-	 */
+	/// Create a [SimpleNaturalIdLoadAccess] instance to retrieve an instance of the
+	/// given entity type by its {@linkplain org.hibernate.annotations.NaturalId natural id},
+	/// which must be a simple (non-composite) value. The entity must have exactly one
+	/// attribute annotated [org.hibernate.annotations.NaturalId].
+	///
+	/// @param entityClass the entity type to be retrieved
+	///
+	/// @return an instance of [SimpleNaturalIdLoadAccess] for executing the lookup
+	///
+	/// @throws HibernateException If the given class does not resolve as a mapped entity,
+	///                            or if the entity does not declare a natural id
+	///
+	/// @deprecated (since 7.3) : Use {@linkplain #find} with [KeyType#NATURAL] instead.
+	@Deprecated
 	<T> SimpleNaturalIdLoadAccess<T> bySimpleNaturalId(Class<T> entityClass);
 
-	/**
-	 * Create a {@link SimpleNaturalIdLoadAccess} instance to retrieve an instance of the
-	 * named entity type by its {@linkplain org.hibernate.annotations.NaturalId natural id},
-	 * which must be a simple (non-composite) value. The entity must have exactly one
-	 * attribute annotated {@link org.hibernate.annotations.NaturalId}.
-	 *
-	 * @param entityName the entity name of the entity type to be retrieved
-	 *
-	 * @return an instance of {@link SimpleNaturalIdLoadAccess} for executing the lookup
-	 *
-	 * @throws HibernateException If the given name does not resolve to a mapped entity,
-	 *                            or if the entity does not declare a natural id
-	 */
+	/// Create a [SimpleNaturalIdLoadAccess] instance to retrieve an instance of the
+	/// named entity type by its {@linkplain org.hibernate.annotations.NaturalId natural id},
+	/// which must be a simple (non-composite) value. The entity must have exactly one
+	/// attribute annotated [org.hibernate.annotations.NaturalId].
+	///
+	/// @param entityName the entity name of the entity type to be retrieved
+	///
+	/// @return an instance of [SimpleNaturalIdLoadAccess] for executing the lookup
+	///
+	/// @throws HibernateException If the given name does not resolve to a mapped entity,
+	///                            or if the entity does not declare a natural id
+	///
+	/// @deprecated (since 7.3) : Use {@linkplain #find} with [KeyType#NATURAL] instead.
+	@Deprecated
 	<T> SimpleNaturalIdLoadAccess<T> bySimpleNaturalId(String entityName);
 
-	/**
-	 * Create a {@link MultiIdentifierLoadAccess} instance to retrieve multiple instances
-	 * of the given entity type by their by {@linkplain org.hibernate.annotations.NaturalId
-	 * natural id} values, using batching.
-	 *
-	 * @param entityClass the entity type to be retrieved
-	 *
-	 * @return an instance of {@link NaturalIdMultiLoadAccess} for executing the lookup
-	 *
-	 * @throws HibernateException If the given class does not resolve as a mapped entity,
-	 *                            or if the entity does not declare a natural id
-	 */
+	/// Create a [MultiIdentifierLoadAccess] instance to retrieve multiple instances
+	/// of the given entity type by their by {@linkplain org.hibernate.annotations.NaturalId
+	///  natural id} values, using batching.
+	///
+	/// @param entityClass the entity type to be retrieved
+	///
+	/// @return an instance of [NaturalIdMultiLoadAccess] for executing the lookup
+	///
+	/// @throws HibernateException If the given class does not resolve as a mapped entity,
+	///                            or if the entity does not declare a natural id
+	///
+	/// @deprecated (since 7.3) : Use {@linkplain #findMultiple} with [KeyType#NATURAL] instead.
+	///
+	@Deprecated
 	<T> NaturalIdMultiLoadAccess<T> byMultipleNaturalId(Class<T> entityClass);
 
-	/**
-	 * Create a {@link MultiIdentifierLoadAccess} instance to retrieve multiple instances
-	 * of the named entity type by their by {@linkplain org.hibernate.annotations.NaturalId
-	 * natural id} values, using batching.
-	 *
-	 * @param entityName the entity name of the entity type to be retrieved
-	 *
-	 * @return an instance of {@link NaturalIdMultiLoadAccess} for executing the lookup
-	 *
-	 * @throws HibernateException If the given name does not resolve to a mapped entity,
-	 *                            or if the entity does not declare a natural id
-	 */
+	/// Create a [MultiIdentifierLoadAccess] instance to retrieve multiple instances
+	/// of the named entity type by their by {@linkplain org.hibernate.annotations.NaturalId
+	///  natural id} values, using batching.
+	///
+	/// @param entityName the entity name of the entity type to be retrieved
+	///
+	/// @return an instance of [NaturalIdMultiLoadAccess] for executing the lookup
+	///
+	/// @throws HibernateException If the given name does not resolve to a mapped entity,
+	///                            or if the entity does not declare a natural id
+	///
+	/// @deprecated (since 7.3) : Use {@linkplain #findMultiple} with [KeyType#NATURAL] instead.
+	@Deprecated
 	<T> NaturalIdMultiLoadAccess<T> byMultipleNaturalId(String entityName);
 
-	/**
-	 * Get the {@linkplain SessionStatistics statistics} for this session.
-	 *
-	 * @return the session statistics being collected for this session
-	 */
+	/// Get the [statistics][SessionStatistics] for this session.
+	///
+	/// @return the session statistics being collected for this session
 	SessionStatistics getStatistics();
 
-	/**
-	 * Is the specified entity or proxy read-only?
-	 * <p>
-	 * To get the default read-only/modifiable setting used for
-	 * entities and proxies that are loaded into the session use
-	 * {@link #isDefaultReadOnly()}
-	 *
-	 * @see #isDefaultReadOnly()
-	 *
-	 * @param entityOrProxy an entity or proxy
-	 * @return {@code true} if the entity or proxy is read-only,
-	 *         {@code false} if the entity or proxy is modifiable.
-	 */
+	/// Is the specified entity or proxy read-only?
+	///
+	/// To get the default read-only/modifiable setting used for
+	/// entities and proxies that are loaded into the session use
+	/// [#isDefaultReadOnly()]
+	///
+	/// @see #isDefaultReadOnly()
+	///
+	/// @param entityOrProxy an entity or proxy
+	/// @return `true` if the entity or proxy is read-only,
+	///         `false` if the entity or proxy is modifiable.
 	boolean isReadOnly(Object entityOrProxy);
 
-	/**
-	 * Set an unmodified persistent object to read-only mode, or a read-only
-	 * object to modifiable mode. In read-only mode, no snapshot is maintained,
-	 * the instance is never dirty-checked, and mutations to the fields of the
-	 * entity are not made persistent.
-	 * <p>
-	 * If the entity or proxy already has the specified read-only/modifiable
-	 * setting, then this method does nothing.
-	 * <p>
-	 * To set the default read-only/modifiable setting used for all entities
-	 * and proxies that are loaded into the session use
-	 * {@link #setDefaultReadOnly(boolean)}.
-	 * <p>
-	 * To override the default read-only mode of the current session for
-	 * all entities and proxies returned by a given {@code Query}, use
-	 * {@link Query#setReadOnly(boolean)}.
-	 * <p>
-	 * Every instance of an {@linkplain org.hibernate.annotations.Immutable
-	 * immutable} entity is loaded in read-only mode. An immutable entity may
-	 * not be set to modifiable.
-	 *
-	 * @see #setDefaultReadOnly(boolean)
-	 * @see Query#setReadOnly(boolean)
-	 * @see IdentifierLoadAccess#withReadOnly(boolean)
-	 * @see org.hibernate.annotations.Immutable
-	 *
-	 * @param entityOrProxy an entity or proxy
-	 * @param readOnly {@code true} if the entity or proxy should be made read-only;
-	 *				   {@code false} if the entity or proxy should be made modifiable
-	 *
-	 * @throws IllegalStateException if an immutable entity is set to modifiable
-	 */
+	/// Set an unmodified persistent object to read-only mode, or a read-only
+	/// object to modifiable mode. In read-only mode, no snapshot is maintained,
+	/// the instance is never dirty-checked, and mutations to the fields of the
+	/// entity are not made persistent.
+	///
+	/// If the entity or proxy already has the specified read-only/modifiable
+	/// setting, then this method does nothing.
+	///
+	/// To set the default read-only/modifiable setting used for all entities
+	/// and proxies that are loaded into the session use
+	/// [#setDefaultReadOnly(boolean)].
+	///
+	/// To override the default read-only mode of the current session for
+	/// all entities and proxies returned by a given `Query`, use
+	/// [Query#setReadOnly(boolean)].
+	///
+	/// Every instance of an [immutable][org.hibernate.annotations.Immutable]
+	/// entity is loaded in read-only mode. An immutable entity may
+	/// not be set to modifiable.
+	///
+	/// @see #setDefaultReadOnly(boolean)
+	/// @see Query#setReadOnly(boolean)
+	/// @see IdentifierLoadAccess#withReadOnly(boolean)
+	/// @see org.hibernate.annotations.Immutable
+	///
+	/// @param entityOrProxy an entity or proxy
+	/// @param readOnly `true` if the entity or proxy should be made read-only;
+	///				   `false` if the entity or proxy should be made modifiable
+	///
+	/// @throws IllegalStateException if an immutable entity is set to modifiable
 	void setReadOnly(Object entityOrProxy, boolean readOnly);
 
-	/**
-	 * Is the {@link org.hibernate.annotations.FetchProfile fetch profile}
-	 * with the given name enabled in this session?
-	 *
-	 * @param name the name of the profile
-	 * @return True if fetch profile is enabled; false if not.
-	 *
-	 * @throws UnknownProfileException Indicates that the given name does not
-	 *                                 match any known fetch profile names
-	 *
-	 * @see org.hibernate.annotations.FetchProfile
-	 */
+	/// Is the [fetch profile][org.hibernate.annotations.FetchProfile]
+	/// with the given name enabled in this session?
+	///
+	/// @param name the name of the profile
+	/// @return True if fetch profile is enabled; false if not.
+	///
+	/// @throws UnknownProfileException Indicates that the given name does not
+	///                                 match any known fetch profile names
+	///
+	/// @see org.hibernate.annotations.FetchProfile
 	boolean isFetchProfileEnabled(String name) throws UnknownProfileException;
 
-	/**
-	 * Enable the {@link org.hibernate.annotations.FetchProfile fetch profile}
-	 * with the given name in this session. If the requested fetch profile is
-	 * already enabled, the call has no effect.
-	 *
-	 * @param name the name of the fetch profile to be enabled
-	 *
-	 * @throws UnknownProfileException Indicates that the given name does not
-	 *                                 match any known fetch profile names
-	 *
-	 * @see org.hibernate.annotations.FetchProfile
-	 */
+	/// Enable the [fetch profile][org.hibernate.annotations.FetchProfile]
+	/// with the given name in this session. If the requested fetch profile is
+	/// already enabled, the call has no effect.
+	///
+	/// @param name the name of the fetch profile to be enabled
+	///
+	/// @throws UnknownProfileException Indicates that the given name does not
+	///                                 match any known fetch profile names
+	///
+	/// @see org.hibernate.annotations.FetchProfile
 	void enableFetchProfile(String name) throws UnknownProfileException;
 
-	/**
-	 * Disable the {@link org.hibernate.annotations.FetchProfile fetch profile}
-	 * with the given name in this session. If the requested fetch profile is
-	 * not currently enabled, the call has no effect.
-	 *
-	 * @param name the name of the fetch profile to be disabled
-	 *
-	 * @throws UnknownProfileException Indicates that the given name does not
-	 *                                 match any known fetch profile names
-	 *
-	 * @see org.hibernate.annotations.FetchProfile
-	 */
+	/// Disable the [fetch profile][org.hibernate.annotations.FetchProfile]
+	/// with the given name in this session. If the requested fetch profile is
+	/// not currently enabled, the call has no effect.
+	///
+	/// @param name the name of the fetch profile to be disabled
+	///
+	/// @throws UnknownProfileException Indicates that the given name does not
+	///                                 match any known fetch profile names
+	///
+	/// @see org.hibernate.annotations.FetchProfile
 	void disableFetchProfile(String name) throws UnknownProfileException;
 
-	/**
-	 * Obtain a {@linkplain LobHelper} for instances of {@link java.sql.Blob}
-	 * and {@link java.sql.Clob}.
-	 *
-	 * @return an instance of {@link LobHelper}
-	 *
-	 * @deprecated Use {@link Hibernate#getLobHelper()} instead.
-	 */
+	/// Obtain a {@linkplain LobHelper} for instances of [java.sql.Blob]
+	/// and [java.sql.Clob].
+	///
+	/// @return an instance of [LobHelper]
+	///
+	/// @deprecated Use [#getLobHelper()] instead.
 	@Deprecated(since="7.0", forRemoval = true)
 	LobHelper getLobHelper();
 
-	/**
-	 * Obtain the collection of all managed entities which belong to this
-	 * persistence context.
-	 *
-	 * @since 7.0
-	 */
+	/// Obtain the collection of all managed entities which belong to this
+	/// persistence context.
+	///
+	/// @since 7.0
 	@Incubating
 	Collection<?> getManagedEntities();
 
-	/**
-	 * Obtain a collection of all managed instances of the entity type with the
-	 * given entity name which belong to this persistence context.
-	 *
-	 * @since 7.0
-	 */
+	/// Obtain a collection of all managed instances of the entity type with the
+	/// given entity name which belong to this persistence context.
+	///
+	/// @since 7.0
 	@Incubating
 	Collection<?> getManagedEntities(String entityName);
 
-	/**
-	 * Obtain a collection of all managed entities of the given type which belong
-	 * to this persistence context. This operation is not polymorphic, and does
-	 * not return instances of subtypes of the given entity type.
-	 *
-	 * @since 7.0
-	 */
+	/// Obtain a collection of all managed entities of the given type which belong
+	/// to this persistence context. This operation is not polymorphic, and does
+	/// not return instances of subtypes of the given entity type.
+	///
+	/// @since 7.0
 	@Incubating
 	<E> Collection<E> getManagedEntities(Class<E> entityType);
 
-	/**
-	 * Obtain a collection of all managed entities of the given type which belong
-	 * to this persistence context. This operation is not polymorphic, and does
-	 * not return instances of subtypes of the given entity type.
-	 *
-	 * @since 7.0
-	 */
+	/// Obtain a collection of all managed entities of the given type which belong
+	/// to this persistence context. This operation is not polymorphic, and does
+	/// not return instances of subtypes of the given entity type.
+	///
+	/// @since 7.0
 	@Incubating
 	<E> Collection<E> getManagedEntities(EntityType<E> entityType);
 
-	/**
-	 * Add one or more listeners to the Session
-	 *
-	 * @param listeners the listener(s) to add
-	 */
+	/// Add one or more listeners to the Session
+	///
+	/// @param listeners the listener(s) to add
 	void addEventListeners(SessionEventListener... listeners);
 
-	/**
-	 * Set a hint. The hints understood by Hibernate are enumerated by
-	 * {@link org.hibernate.jpa.AvailableHints}.
-	 *
-	 * @see org.hibernate.jpa.HibernateHints
-	 * @see org.hibernate.jpa.SpecHints
-	 *
-	 * @apiNote Hints are a
-	 * {@linkplain jakarta.persistence.EntityManager#setProperty
-	 * JPA-standard way} to control provider-specific behavior of the
-	 * {@code EntityManager}. Clients of the native API defined by
-	 * Hibernate should make use of type-safe operations of this
-	 * interface. For example, {@link #enableFetchProfile(String)}
-	 * should be used in preference to the hint
-	 * {@link org.hibernate.jpa.HibernateHints#HINT_FETCH_PROFILE}.
-	 */
+	/// Set a hint. The hints understood by Hibernate are enumerated by
+	/// [org.hibernate.jpa.AvailableHints].
+	///
+	/// @see org.hibernate.jpa.HibernateHints
+	/// @see org.hibernate.jpa.SpecHints
+	///
+	/// @apiNote Hints are a [JPA-standard way][jakarta.persistence.EntityManager#setProperty]
+	///  to control provider-specific behavior of the
+	/// [EntityManager]. Clients of the native API defined by
+	/// Hibernate should make use of type-safe operations of this
+	/// interface. For example, [#enableFetchProfile(String)]
+	/// should be used in preference to the hint [org.hibernate.jpa.HibernateHints#HINT_FETCH_PROFILE].
 	@Override
 	void setProperty(String propertyName, Object value);
 
-	/**
-	 * Create a new mutable instance of {@link EntityGraph}, with only
-	 * a root node, allowing programmatic definition of the graph from
-	 * scratch.
-	 *
-	 * @param rootType The root entity of the graph
-	 *
-	 * @see #find(EntityGraph, Object, FindOption...)
-	 * @see org.hibernate.query.SelectionQuery#setEntityGraph(EntityGraph, org.hibernate.graph.GraphSemantic)
-	 * @see org.hibernate.graph.EntityGraphs#createGraph(jakarta.persistence.metamodel.EntityType)
-	 */
+	/// Create a new mutable instance of [EntityGraph], with only
+	/// a root node, allowing programmatic definition of the graph from
+	/// scratch.
+	///
+	/// @param rootType The root entity of the graph
+	///
+	/// @see #find(EntityGraph, Object, FindOption...)
+	/// @see org.hibernate.query.SelectionQuery#setEntityGraph(EntityGraph, org.hibernate.graph.GraphSemantic)
+	/// @see org.hibernate.graph.EntityGraphs#createGraph(jakarta.persistence.metamodel.EntityType)
 	@Override
 	<T> RootGraph<T> createEntityGraph(Class<T> rootType);
 
-	/**
-	 * Create a new mutable instance of {@link EntityGraph}, based on
-	 * a predefined {@linkplain jakarta.persistence.NamedEntityGraph
-	 * named entity graph}, allowing customization of the graph, or
-	 * return {@code null} if there is no predefined graph with the
-	 * given name.
-	 *
-	 * @param graphName The name of the predefined named entity graph
-	 *
-	 * @apiNote This method returns {@code RootGraph<?>}, requiring an
-	 * unchecked typecast before use. It's cleaner to obtain a graph using
-	 * {@link #createEntityGraph(Class, String)} instead.
-	 *
-	 * @see #find(EntityGraph, Object, FindOption...)
-	 * @see org.hibernate.query.SelectionQuery#setEntityGraph(EntityGraph, org.hibernate.graph.GraphSemantic)
-	 * @see jakarta.persistence.EntityManagerFactory#addNamedEntityGraph(String, EntityGraph)
-	 */
+	/// Create a new mutable instance of [EntityGraph], based on
+	/// a predefined [named entity graph][jakarta.persistence.NamedEntityGraph],
+	/// allowing customization of the graph, or return `null` if there is no
+	/// predefined graph with the given name.
+	///
+	/// @param graphName The name of the predefined named entity graph
+	///
+	/// @apiNote This method returns `RootGraph<?>`, requiring an
+	/// unchecked typecast before use. It's cleaner to obtain a graph using
+	/// [#createEntityGraph(Class,String)] instead.
+	///
+	/// @see #find(EntityGraph, Object, FindOption...)
+	/// @see org.hibernate.query.SelectionQuery#setEntityGraph(EntityGraph, org.hibernate.graph.GraphSemantic)
+	/// @see jakarta.persistence.EntityManagerFactory#addNamedEntityGraph(String, EntityGraph)
 	@Override
 	RootGraph<?> createEntityGraph(String graphName);
 
-	/**
-	 * Obtain an immutable reference to a predefined
-	 * {@linkplain jakarta.persistence.NamedEntityGraph named entity graph}
-	 * or return {@code null} if there is no predefined graph with the given
-	 * name.
-	 *
-	 * @param graphName The name of the predefined named entity graph
-	 *
-	 * @apiNote This method returns {@code RootGraph<?>}, requiring an
-	 * unchecked typecast before use. It's cleaner to obtain a graph using
-	 * the static metamodel for the class which defines the graph, or by
-	 * calling {@link SessionFactory#getNamedEntityGraphs(Class)} instead.
-	 *
-	 * @see #find(EntityGraph, Object, FindOption...)
-	 * @see org.hibernate.query.SelectionQuery#setEntityGraph(EntityGraph, org.hibernate.graph.GraphSemantic)
-	 * @see jakarta.persistence.EntityManagerFactory#addNamedEntityGraph(String, EntityGraph)
-	 */
+	/// Obtain an immutable reference to a predefined
+	/// [named entity graph][jakarta.persistence.NamedEntityGraph]
+	/// or return `null` if there is no predefined graph with the given
+	/// name.
+	///
+	/// @param graphName The name of the predefined named entity graph
+	///
+	/// @apiNote This method returns `RootGraph<?>`, requiring an
+	/// unchecked typecast before use. It's cleaner to obtain a graph using
+	/// the static metamodel for the class which defines the graph, or by
+	/// calling [SessionFactory#getNamedEntityGraphs(Class)] instead.
+	///
+	/// @see #find(EntityGraph, Object, FindOption...)
+	/// @see org.hibernate.query.SelectionQuery#setEntityGraph(EntityGraph, org.hibernate.graph.GraphSemantic)
+	/// @see jakarta.persistence.EntityManagerFactory#addNamedEntityGraph(String, EntityGraph)
 	@Override
 	RootGraph<?> getEntityGraph(String graphName);
 
-	/**
-	 * Retrieve all named {@link EntityGraph}s with the given root entity type.
-	 *
-	 * @see jakarta.persistence.EntityManagerFactory#getNamedEntityGraphs(Class)
-	 * @see jakarta.persistence.EntityManagerFactory#addNamedEntityGraph(String, EntityGraph)
-	 */
+	/// Retrieve all named [EntityGraph]s with the given root entity type.
+	///
+	/// @see jakarta.persistence.EntityManagerFactory#getNamedEntityGraphs(Class)
+	/// @see jakarta.persistence.EntityManagerFactory#addNamedEntityGraph(String, EntityGraph)
 	@Override
 	<T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass);
 
-	// The following overrides should not be necessary,
+	// The following overrides should not be necessary
 	// and are only needed to work around a bug in IntelliJ
 
 	@Override
@@ -1527,6 +1374,9 @@ public interface Session extends SharedSessionContract, EntityManager {
 	@Override @Deprecated @SuppressWarnings("rawtypes")
 	Query createQuery(String queryString);
 
+	@Override @Deprecated @SuppressWarnings("rawtypes")
+	NativeQuery createNativeQuery(String queryString);
+
 	@Override
 	<R> Query<R> createNamedQuery(String name, Class<R> resultClass);
 
@@ -1536,19 +1386,15 @@ public interface Session extends SharedSessionContract, EntityManager {
 	@Override
 	<R> Query<R> createQuery(CriteriaQuery<R> criteriaQuery);
 
-	/**
-	 * Create a {@link Query} for the given JPA {@link CriteriaDelete}.
-	 *
-	 * @deprecated use {@link #createMutationQuery(CriteriaDelete)}
-	 */
+	/// Create a [Query] for the given JPA [CriteriaDelete].
+	///
+	/// @deprecated use [#createMutationQuery(CriteriaDelete)]
 	@Override @Deprecated(since = "6.0") @SuppressWarnings("rawtypes")
 	Query createQuery(CriteriaDelete deleteQuery);
 
-	/**
-	 * Create a {@link Query} for the given JPA {@link CriteriaUpdate}.
-	 *
-	 * @deprecated use {@link #createMutationQuery(CriteriaUpdate)}
-	 */
+	/// Create a [Query] for the given JPA [CriteriaUpdate].
+	///
+	/// @deprecated use [#createMutationQuery(CriteriaUpdate)]
 	@Override @Deprecated(since = "6.0") @SuppressWarnings("rawtypes")
 	Query createQuery(CriteriaUpdate updateQuery);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java
index 87037bb8b111..d38401690fb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java
@@ -5,9 +5,11 @@
 package org.hibernate;
 
 import java.sql.Connection;
+import java.time.Instant;
 import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
+import org.hibernate.cfg.StateManagementSettings;
 import org.hibernate.engine.creation.CommonBuilder;
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
@@ -244,4 +246,21 @@ default Session open() {
 	 * @since 7.2
 	 */
 	SessionBuilder subselectFetchEnabled(boolean subselectFetchEnabled);
+
+	/**
+	 * Specify the instant for reading
+	 * {@linkplain org.hibernate.annotations.Temporal temporal} entity data.
+	 * Instances of temporal entities retrieved in the session represent the
+	 * revisions effective at the given instant.
+	 */
+	SessionBuilder asOf(Instant instant);
+
+	/**
+	 * Specify the
+	 * {@linkplain StateManagementSettings#TRANSACTION_ID_SUPPLIER
+	 * transaction id} for reading {@linkplain org.hibernate.annotations.Temporal
+	 * temporal} entity data. Instances of temporal entities retrieved in the
+	 * session represent revisions effective at the end of the given transaction.
+	 */
+	SessionBuilder atTransaction(Object transactionId);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/SessionCheckMode.java b/hibernate-core/src/main/java/org/hibernate/SessionCheckMode.java
index 4e9b21337cdd..22ab1ac0e393 100644
--- a/hibernate-core/src/main/java/org/hibernate/SessionCheckMode.java
+++ b/hibernate-core/src/main/java/org/hibernate/SessionCheckMode.java
@@ -13,16 +13,16 @@
 /**
  * Indicates whether the persistence context should be checked for entities
  * matching the identifiers to be loaded - <ul>
- *     <li>Entities which are in a managed state are not re-loaded from the database.
- *     		those identifiers are removed from the SQL restriction sent to the database.
- *     <li>Entities which are in a removed state are {@linkplain RemovalsMode#REPLACE excluded}
+ *     <li>Entities which are in a managed state are not reloaded from the database.
+ *     		Those identifiers are removed from the SQL restriction sent to the database.
+ *     <li>Entities which are in a removed state are {@linkplain RemovalsMode#REPLACE replaced with null}
  *     		from the result by default, but can be {@linkplain RemovalsMode#INCLUDE included} if desired.
  * </ul>
- * <p/>
- * The default is {@link #DISABLED}
+ * <p>
+ * The default is {@link #DISABLED}.
  *
- * @see org.hibernate.Session#findMultiple(Class, List , FindOption...)
- * @see org.hibernate.Session#findMultiple(EntityGraph, List , FindOption...)
+ * @see org.hibernate.Session#findMultiple(Class, List, FindOption...)
+ * @see org.hibernate.Session#findMultiple(EntityGraph, List, FindOption...)
  *
  * @since 7.2
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/SessionFactory.java b/hibernate-core/src/main/java/org/hibernate/SessionFactory.java
index c03e63bd2ad7..2991a8b956ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/SessionFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/SessionFactory.java
@@ -13,7 +13,6 @@
 import jakarta.persistence.TypedQueryReference;
 import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.engine.spi.FilterDefinition;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.graph.GraphParser;
 import org.hibernate.graph.InvalidGraphException;
 import org.hibernate.graph.RootGraph;
@@ -46,7 +45,8 @@
  * Typically, a program has a single {@link SessionFactory} instance, and must
  * obtain a new {@link Session} instance from the factory each time it services
  * a client request. It is then also responsible for {@linkplain Session#close()
- * destroying} the session at the end of the client request.
+ * destroying} the session at the end of the client request. An instance of
+ * {@code Session} must never be shared between multiple threads.
  * <p>
  * The {@link #inSession} and {@link #inTransaction} methods provide a convenient
  * way to obtain a session, with or without starting a transaction, and have it
@@ -108,7 +108,7 @@
  *     SingularAttribute&lt;Book,String&gt;}.
  * </ul>
  * <p>
- * Use of these statically-typed metamodel references is the preferred way of
+ * Use of these statically typed metamodel references is the preferred way of
  * working with the {@linkplain jakarta.persistence.criteria.CriteriaBuilder
  * criteria query API}, and with {@linkplain EntityGraph}s.
  * <p>
@@ -266,7 +266,7 @@ default void inSession(Consumer<? super Session> action) {
 	 * @since 6.3
 	 */
 	default void inStatelessSession(Consumer<? super StatelessSession> action) {
-		try ( StatelessSession session = openStatelessSession() ) {
+		try ( var session = openStatelessSession() ) {
 			action.accept( session );
 		}
 	}
@@ -308,7 +308,7 @@ default void inStatelessTransaction(Consumer<? super StatelessSession> action) {
 	 * @see #fromTransaction(Function)
 	 */
 	default <R> R fromSession(Function<? super Session,R> action) {
-		try ( Session session = openSession() ) {
+		try ( var session = openSession() ) {
 			return action.apply( session );
 		}
 	}
@@ -331,7 +331,7 @@ default <R> R fromSession(Function<? super Session,R> action) {
 	 * @since 6.3
 	 */
 	default <R> R fromStatelessSession(Function<? super StatelessSession,R> action) {
-		try ( StatelessSession session = openStatelessSession() ) {
+		try ( var session = openStatelessSession() ) {
 			return action.apply( session );
 		}
 	}
@@ -522,9 +522,7 @@ default <T> RootGraph<T> createEntityGraph(Class<T> entityType) {
 	 *
 	 * @since 7.0
 	 */
-	default <T> RootGraph<T> parseEntityGraph(Class<T> rootEntityClass, CharSequence graphText) {
-		return GraphParser.parse( rootEntityClass, graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
-	}
+	<T> RootGraph<T> parseEntityGraph(Class<T> rootEntityClass, CharSequence graphText);
 
 	/**
 	 * Creates a {@link RootGraph} for the given {@code rootEntityName} and parses the graph
@@ -543,9 +541,8 @@ default <T> RootGraph<T> parseEntityGraph(Class<T> rootEntityClass, CharSequence
 	 *
 	 * @since 7.0
 	 */
-	default <T> RootGraph<T> parseEntityGraph(String rootEntityName, CharSequence graphText) {
-		return GraphParser.parse( rootEntityName, graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
-	}
+	@Incubating
+	<T> RootGraph<T> parseEntityGraph(String rootEntityName, CharSequence graphText);
 
 	/**
 	 * Creates a {@link RootGraph} based on the passed string representation.  Here, the
@@ -560,9 +557,8 @@ default <T> RootGraph<T> parseEntityGraph(String rootEntityName, CharSequence gr
 	 *
 	 * @since 7.0
 	 */
-	default <T> RootGraph<T> parseEntityGraph(CharSequence graphText) {
-		return GraphParser.parse( graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
-	}
+	@Incubating
+	<T> RootGraph<T> parseEntityGraph(CharSequence graphText);
 
 	/**
 	 * Obtain the set of names of all {@linkplain org.hibernate.annotations.FilterDef
diff --git a/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java
index 523ee1226649..6b0cc6d2024f 100644
--- a/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java
@@ -9,6 +9,7 @@
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 
 import java.sql.Connection;
+import java.time.Instant;
 import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
@@ -26,7 +27,6 @@
  *     and therefore also the JDBC transaction, should be shared from parent
  *     to child.
  * </ul>
- * <p>
  * <pre>
  * try (var childSession
  *          = session.sessionWithOptions()
@@ -36,7 +36,6 @@
  *     ...
  * }
  * </pre>
- * <p>
  * On the other hand, when JTA transaction management is used, all sessions
  * execute within the same transaction. Typically, connection sharing is
  * handled automatically by the JTA-enabled {@link javax.sql.DataSource}.
@@ -48,6 +47,11 @@
  * @see SessionBuilder
  */
 public interface SharedSessionBuilder extends SessionBuilder, CommonSharedBuilder {
+	/**
+	 * Open the session.
+	 */
+	@Override
+	Session open();
 
 	@Override
 	SharedSessionBuilder connection();
@@ -93,6 +97,12 @@ public interface SharedSessionBuilder extends SessionBuilder, CommonSharedBuilde
 	 */
 	SharedSessionBuilder autoClose();
 
+	@Override
+	SharedSessionBuilder asOf(Instant instant);
+
+	@Override
+	SharedSessionBuilder atTransaction(Object transactionId);
+
 	@Override @Deprecated
 	SharedSessionBuilder statementInspector(StatementInspector statementInspector);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/SharedStatelessSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SharedStatelessSessionBuilder.java
index 703a748e07cf..2268703011aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/SharedStatelessSessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/SharedStatelessSessionBuilder.java
@@ -22,8 +22,7 @@
  *     and therefore also the JDBC transaction, should be shared from parent
  *     to child.
  * </ul>
- * <p>
- * <pre>
+ * <pre>{@code
  * try (var statelessSession
  *          = session.statelessWithOptions()
  *                  .connection() // share the JDBC connection
@@ -31,8 +30,8 @@
  *                  .openStatelessSession()) {
  *     ...
  * }
- * </pre>
- * <p>
+ * }</pre>
+ *
  * On the other hand, when JTA transaction management is used, all sessions
  * execute within the same transaction. Typically, connection sharing is
  * handled automatically by the JTA-enabled {@link javax.sql.DataSource}.
@@ -50,6 +49,7 @@ public interface SharedStatelessSessionBuilder extends StatelessSessionBuilder,
 	/**
 	 * Open the stateless session.
 	 */
+	@Override
 	StatelessSession open();
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java
index 13130fd7c18e..d5583d08c018 100644
--- a/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java
@@ -18,10 +18,9 @@
  * {@link org.hibernate.annotations.NaturalId @NaturalId}. If an
  * entity has multiple attributes annotated {@code @NaturalId}, then
  * {@link NaturalIdLoadAccess} should be used instead.
- * <p>
- * <pre>
+ * <pre>{@code
  * Book book = session.bySimpleNaturalId(Book.class).load(isbn);
- * </pre>
+ * }</pre>
  *
  * @author Eric Dalquist
  * @author Steve Ebersole
@@ -29,7 +28,10 @@
  * @see Session#bySimpleNaturalId(Class)
  * @see org.hibernate.annotations.NaturalId
  * @see NaturalIdLoadAccess
+ *
+ * @deprecated (since 7.3) Use {@linkplain Session#find} with {@link KeyType#NATURAL} instead.
  */
+@Deprecated
 public interface SimpleNaturalIdLoadAccess<T> {
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSession.java b/hibernate-core/src/main/java/org/hibernate/StatelessSession.java
index 17a968aea794..d3b320a814e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/StatelessSession.java
+++ b/hibernate-core/src/main/java/org/hibernate/StatelessSession.java
@@ -31,8 +31,8 @@
  * <p>
  * Furthermore, the basic operations of a stateless session do not have
  * corresponding {@linkplain jakarta.persistence.CascadeType cascade types},
- * and so an operation performed via a stateless session never cascades to
- * associated instances.
+ * and so an operation performed on one entity via a stateless session never
+ * cascades to associated entities.
  * <p>
  * The basic operations of a stateless session are {@link #get(Class, Object)},
  * {@link #insert(Object)}, {@link #update(Object)}, {@link #delete(Object)},
@@ -97,7 +97,9 @@ public interface StatelessSession extends SharedSessionContract {
 	Object insert(Object entity);
 
 	/**
-	 * Insert multiple records.
+	 * Insert multiple records in the same order as the entity
+	 * instances representing the new records occur in the given
+	 * list.
 	 *
 	 * @param entities a list of transient instances to be inserted
 	 *
@@ -130,7 +132,9 @@ public interface StatelessSession extends SharedSessionContract {
 	void update(Object entity);
 
 	/**
-	 * Update multiple records.
+	 * Update multiple records in the same order as the entity
+	 * instances representing the records occur in the given
+	 * list.
 	 *
 	 * @param entities a list of detached instances to be updated
 	 *
@@ -161,7 +165,9 @@ public interface StatelessSession extends SharedSessionContract {
 	void delete(Object entity);
 
 	/**
-	 * Delete multiple records.
+	 * Delete multiple records in the same order as the entity
+	 * instances representing the records occur in the given
+	 * list.
 	 *
 	 * @param entities a list of detached instances to be deleted
 	 *
@@ -206,9 +212,11 @@ public interface StatelessSession extends SharedSessionContract {
 	void upsert(Object entity);
 
 	/**
-	 * Perform an upsert, that is, to insert the record if it does
-	 * not exist, or update the record if it already exists, for
-	 * each given record.
+	 * Upsert multiple records, that is, for a given record,
+	 * insert the record if it does not exist or update the
+	 * record if it already exists, in the same order as the
+	 * entity instances representing the records occur in
+	 * the given list.
 	 *
 	 * @param entities a list of detached instances and new
 	 *                 instances with assigned identifiers
diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java
index 0e21fa9a74e2..cbbb8026b156 100644
--- a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java
@@ -5,9 +5,11 @@
 package org.hibernate;
 
 import java.sql.Connection;
+import java.time.Instant;
 import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
+import org.hibernate.cfg.StateManagementSettings;
 import org.hibernate.engine.creation.CommonBuilder;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 
@@ -23,11 +25,13 @@
 public interface StatelessSessionBuilder extends CommonBuilder {
 	/**
 	 * Opens a session with the specified options.
-	 *
-	 * @return The session
+	 * @see #open()
 	 */
 	StatelessSession openStatelessSession();
 
+	@Override
+	StatelessSession open();
+
 	@Override
 	StatelessSessionBuilder connection(Connection connection);
 
@@ -73,4 +77,24 @@ public interface StatelessSessionBuilder extends CommonBuilder {
 	 */
 	@Deprecated(since = "7.0")
 	StatelessSessionBuilder statementInspector(StatementInspector statementInspector);
+
+	/**
+	 * Specify the instant for reading
+	 * {@linkplain org.hibernate.annotations.Temporal temporal} entity data.
+	 * Instances of temporal entities retrieved in the session will represent
+	 * the revisions effective at the given instant.
+	 */
+	StatelessSessionBuilder asOf(Instant instant);
+
+	/**
+	 * Specify the
+	 * {@linkplain StateManagementSettings#TRANSACTION_ID_SUPPLIER
+	 * transaction id} for reading {@linkplain org.hibernate.annotations.Temporal
+	 * temporal} entity data. Instances of temporal entities retrieved in the
+	 * session will represent the revisions effective at the end of the given
+	 * transaction.
+	 * The given value should match the type returned by the configured
+	 * transaction id supplier.
+	 */
+	StatelessSessionBuilder atTransaction(Object transactionId);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/Timeouts.java b/hibernate-core/src/main/java/org/hibernate/Timeouts.java
index ddeae2940271..c96315975244 100644
--- a/hibernate-core/src/main/java/org/hibernate/Timeouts.java
+++ b/hibernate-core/src/main/java/org/hibernate/Timeouts.java
@@ -146,4 +146,17 @@ static int fromHint(Object factoryHint) {
 		}
 		return Integer.parseInt( factoryHint.toString() );
 	}
+
+	static Timeout fromHintTimeout(Object factoryHint) {
+		if ( factoryHint == null ) {
+			return WAIT_FOREVER;
+		}
+		if ( factoryHint instanceof Timeout timeout ) {
+			return timeout;
+		}
+		if ( factoryHint instanceof Integer number ) {
+			return Timeout.milliseconds( number );
+		}
+		return Timeout.milliseconds( Integer.parseInt( factoryHint.toString() ) );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/ActionLogging.java b/hibernate-core/src/main/java/org/hibernate/action/internal/ActionLogging.java
index c305ea79a3f9..c7bbab5ce95f 100644
--- a/hibernate-core/src/main/java/org/hibernate/action/internal/ActionLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/action/internal/ActionLogging.java
@@ -5,6 +5,7 @@
 package org.hibernate.action.internal;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 import java.util.Set;
 
 import org.hibernate.Internal;
@@ -34,7 +35,7 @@ public interface ActionLogging extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".action";
 
 	ActionLogging ACTION_LOGGER = Logger.getMessageLogger(
-			MethodHandles.lookup(), ActionLogging.class, NAME
+			MethodHandles.lookup(), ActionLogging.class, NAME, Locale.ROOT
 	);
 
 	int NAMESPACE = 90032000;
diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java
index cc2b6e5fc4cd..e68e637944e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java
@@ -14,9 +14,11 @@
 import org.hibernate.event.spi.PostInsertEventListener;
 import org.hibernate.event.spi.PreInsertEvent;
 import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.metamodel.mapping.CompositeIdentifierMapping;
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
+import org.hibernate.metamodel.spi.EmbeddableInstantiator;
 import org.hibernate.persister.entity.EntityPersister;
 
-import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 
 /**
  * The action for performing entity insertions when entity is using {@code IDENTITY} column identifier generation
@@ -83,7 +85,10 @@ public void execute() throws HibernateException {
 			final GeneratedValues generatedValues;
 			try {
 				generatedValues = persister.getInsertCoordinator().insert( instance, state, session );
-				generatedId = castNonNull( generatedValues ).getGeneratedValue( persister.getIdentifierMapping() );
+				generatedId =
+						generatedValues == null
+								? null
+								: generatedValues.getGeneratedValue( persister.getIdentifierMapping() );
 				success = true;
 			}
 			finally {
@@ -96,9 +101,19 @@ public void execute() throws HibernateException {
 					persistenceContext.replaceEntityEntryRowId( getInstance(), rowId );
 				}
 			}
+			if ( generatedId == null && generatedValues != null ) {
+				final Object compositeId =
+						compositeGeneratedId( persister, instance, generatedValues, session );
+				if ( compositeId != null ) {
+					generatedId = compositeId;
+				}
+			}
 			if ( persister.hasInsertGeneratedProperties() ) {
 				persister.processInsertGeneratedProperties( generatedId, instance, state, generatedValues, session );
 			}
+			if ( generatedId == null ) {
+				generatedId = persister.getIdentifier( instance, session );
+			}
 			//need to do that here rather than in the save event listener to let
 			//the post insert events to have an id-filled entity when IDENTITY is used (EJB3)
 			persister.setIdentifier( instance, generatedId, session );
@@ -161,6 +176,83 @@ protected void postInsert() {
 				.fireLazyEventOnEachListener( this::newPostInsertEvent, PostInsertEventListener::onPostInsert );
 	}
 
+	private static Object compositeGeneratedId(
+			EntityPersister persister,
+			Object entity,
+			GeneratedValues generatedValues,
+			SharedSessionContractImplementor session) {
+		if ( persister.getIdentifierMapping() instanceof CompositeIdentifierMapping compositeIdentifier ) {
+			final var idMapping = compositeIdentifier.getMappedIdEmbeddableTypeDescriptor();
+			final var generatedMapping = compositeIdentifier.getEmbeddableTypeDescriptor();
+			final Object currentId = persister.getIdentifier( entity, session );
+			if ( currentId == null ) {
+				final var values = defaultedPrimitiveIds( generatedMapping, idMapping );
+				if ( unpackGeneratedValues( generatedValues, generatedMapping, values ) ) {
+					return idMapping.getRepresentationStrategy()
+							.getInstantiator().instantiate( () -> values );
+				}
+				else {
+					return null;
+				}
+			}
+			else {
+				final var values = idMapping.getValues( currentId );
+				if ( unpackGeneratedValues( generatedValues, generatedMapping, values ) ) {
+					idMapping.setValues( currentId, values );
+					return currentId;
+				}
+				else {
+					return null;
+				}
+			}
+		}
+		else {
+			return null;
+		}
+	}
+
+	/**
+	 * To instantiate a composite id class with primitive fields,
+	 * via an {@link EmbeddableInstantiator}, we need to assign
+	 * their Java default values.
+	 */
+	public static Object[] defaultedPrimitiveIds(
+			EmbeddableMappingType generatedMapping,
+			EmbeddableMappingType idMapping) {
+		final int attributeCount = generatedMapping.getNumberOfAttributeMappings();
+		final var values = new Object[attributeCount];
+		for ( int i = 0; i < attributeCount; i++ ) {
+			final var attribute = idMapping.getAttributeMapping( i );
+			if ( attribute.getPropertyAccess().getGetter().getReturnTypeClass().isPrimitive() ) {
+				values[i] = attribute.getJavaType().getDefaultValue();
+			}
+		}
+		return values;
+	}
+
+	private static boolean unpackGeneratedValues(
+			GeneratedValues generatedValues,
+			EmbeddableMappingType generatedMapping,
+			Object[] values) {
+		final int attributeCount =
+				generatedMapping.getNumberOfAttributeMappings();
+		boolean updated = false;
+		for ( int i = 0; i < attributeCount; i++ ) {
+			final var basicPart =
+					generatedMapping.getAttributeMapping( i )
+							.asBasicValuedModelPart();
+			if ( basicPart != null ) {
+				final Object generatedValue =
+						generatedValues.getGeneratedValue( basicPart );
+				if ( generatedValue != null ) {
+					values[i] = generatedValue;
+					updated = true;
+				}
+			}
+		}
+		return updated;
+	}
+
 	PostInsertEvent newPostInsertEvent() {
 		return new PostInsertEvent( getInstance(), generatedId, getState(), getPersister(), eventSource() );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Any.java b/hibernate-core/src/main/java/org/hibernate/annotations/Any.java
index 82d6efac52a9..40b142484eb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/Any.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/Any.java
@@ -7,6 +7,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.FetchType;
 
 import static java.lang.annotation.ElementType.FIELD;
@@ -98,6 +99,13 @@
 	 */
 	FetchType fetch() default FetchType.EAGER;
 
+	/**
+	 * The operations that should be cascaded to the associated entities.
+	 * <p>By default, no operations are cascaded.
+	 * @since 7.4
+	 */
+	CascadeType[] cascade() default {};
+
 	/**
 	 * Whether the association is optional.
 	 * <p>
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Audited.java b/hibernate-core/src/main/java/org/hibernate/annotations/Audited.java
new file mode 100644
index 000000000000..8580257a0cbf
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/Audited.java
@@ -0,0 +1,99 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.annotations;
+
+import org.hibernate.Incubating;
+import org.hibernate.cfg.StateManagementSettings;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Specifies that the annotated entity class is an audited entity
+ * or audited collection. An audited entity or collection keeps
+ * a historical record of changes over time. Unlike a
+ * {@linkplain Temporal temporal} entity, it explicitly records
+ * the nature of each change, such as creation, modification, or
+ * deletion. An audited entity or collection maps to two tables,
+ * a table holding the current state of the entity or collection,
+ * and an <em>audit log</em> table with a record of each change.
+ * <p>
+ * The audit log contains the following columns:
+ * <ul>
+ * <li>columns holding the state of the entity or collection at
+ *     the moment of creation, modification, or deletion, except
+ *     for state held by {@linkplain Excluded excluded attributes},
+ * <li>a {@linkplain StateManagementSettings#TRANSACTION_ID_SUPPLIER
+ *     transaction id} recording the unit of work in which the
+ *     change occurred, and
+ * <li>a column indicating the type of change, encoded as 0 for
+ *     creation, 1 for modification, and 2 for deletion.
+ * </ul>
+ * <p>
+ * Audited entities are typically used when a supplier of
+ * transaction identifiers is available to Hibernate. A supplier
+ * may be specified via the configuration property
+ * {@value StateManagementSettings#TRANSACTION_ID_SUPPLIER}.
+ * Transactions ids must be unique and comparable and must
+ * increase monotonically. Typically, such an id is obtained by
+ * persisting an instance of an application-defined entity class
+ * with a generated id which represents the current unit of work.
+ * This entity associates the transaction id with other information
+ * about the work being performed, such as the current timestamp,
+ * current application user, and so on. If no supplier is provided,
+ * the {@linkplain java.time.Instant#now() current JVM instant} is
+ * used as the transaction identifier, but relying on this default
+ * behavior is not recommended.
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+@Documented
+@Target({PACKAGE, TYPE, FIELD, METHOD, ANNOTATION_TYPE})
+@Retention(RUNTIME)
+@Incubating
+public @interface Audited {
+	/**
+	 * The name of the audit log table. Defaults to the
+	 * name of the main table holding currently effective
+	 * data, with the suffix {@code _aud}.
+	 */
+	String tableName() default "";
+
+	/**
+	 * The name of the column holding the transaction identifier.
+	 * @see org.hibernate.engine.spi.SharedSessionContractImplementor#getCurrentTransactionIdentifier()
+	 */
+	String transactionId() default "REV";
+
+	/**
+	 * The name of the column holding the modification type,
+	 * encoded as 0 for creation, 1 for modification, and 2
+	 * for deletion
+	 */
+	String modificationType() default "REVTYPE";
+
+	/**
+	 * Excludes the annotated attribute from auditing.
+	 * Updates to an excluded attribute modify the current
+	 * row directly without creating a new revision of the
+	 * entity instance. The audit log table does not contain
+	 * columns mapped by excluded attributes.
+	 */
+	@Documented
+	@Target({FIELD, METHOD})
+	@Retention(RUNTIME)
+	@interface Excluded {
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java b/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java
index 735679b38fd3..6b91bfa65d63 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java
@@ -61,7 +61,7 @@
 public @interface BatchSize {
 	/**
 	 * The maximum batch size, a strictly positive integer.
-	 * <p/>
+	 * <p>
 	 * Default is defined by {@link org.hibernate.cfg.FetchSettings#DEFAULT_BATCH_FETCH_SIZE}
 	 */
 	int size();
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java b/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java
index 77e5e99b2906..b294f06bb1bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java
@@ -108,6 +108,10 @@ public enum CacheConcurrencyStrategy {
 	 *     version.
 	 * </ul>
 	 * <p>
+	 * This concurrency strategy should only be used with
+	 * {@linkplain jakarta.persistence.Version versioned}
+	 * entities.
+	 * <p>
 	 * This concurrency strategy is not compatible with
 	 * serializable transaction isolation.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java b/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java
deleted file mode 100644
index 55dc7f02ad26..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import jakarta.persistence.Column;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Support an array of columns. Useful for component user types mappings
- *
- * @author Emmanuel Bernard
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-public @interface Columns {
-	/**
-	 * The aggregated columns.
-	 */
-	Column[] columns();
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java b/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java
index 6c2502aa42a7..dfd6e2a6643a 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java
@@ -47,7 +47,6 @@
  *     <li>{@link Formula#before() before} specifies that the override applies
  *         to all versions earlier than the given version.
  * </ul>
- * <p>
  *
  * @since 6.0
  * @author Gavin King
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DynamicUpdate.java b/hibernate-core/src/main/java/org/hibernate/annotations/DynamicUpdate.java
index a4d2b511719c..192dd9d14527 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/DynamicUpdate.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/DynamicUpdate.java
@@ -18,7 +18,6 @@
  * This might result in improved performance if it is common to change
  * only some of the attributes of the entity. However, there is a cost
  * associated with generating the SQL at runtime.
- * <p>
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddedColumnNaming.java b/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddedColumnNaming.java
index 3c5029e67897..b06e2f8a4aaa 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddedColumnNaming.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/EmbeddedColumnNaming.java
@@ -19,7 +19,7 @@
  * For example, given a typical embeddable named {@code Address} and
  * {@code @EmbeddedColumnNaming("home_%s)}, we will get columns named
  * {@code home_street}, {@code home_city}, etc.
- * <p/>
+ * <p>
  * Explicit {@linkplain jakarta.persistence.Column @Column(name)} mappings are incorporated
  * into the result.  When embeddables are nested, the affect will be cumulative.  Given the following model:
  *
@@ -72,7 +72,7 @@
 	/**
 	 * The naming pattern.  It is expected to contain a single pattern marker ({@code %})
 	 * into which the "raw" column name will be injected.
-	 * <p/>
+	 * <p>
 	 * The {@code value} may be omitted which will indicate to use the pattern
 	 * {@code "{ATTRIBUTE_NAME}_%s"} where {@code {ATTRIBUTE_NAME}} is the name of the attribute
 	 * where the annotation is placed - e.g. {@code @Embedded @EmbeddedColumnNaming Address homeAddress}
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java b/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java
index f281109d79a0..99d6ca4cc80e 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java
@@ -41,6 +41,12 @@
  * BigDecimal totalWithTax;
  * </pre>
  * <p>
+ * The placeholder {@code {alias}} is resolved to the alias of the entity:
+ * <pre>
+ * &#64;Formula("balance/(select sum(a.balance) from customer a where a.gender={alias}.gender)")
+ * private BigDecimal percentage;
+ * </pre>
+ * <p>
  * For an entity with {@linkplain jakarta.persistence.SecondaryTable secondary tables},
  * a formula may involve columns of the primary table, or columns of any one of the
  * secondary tables. But it may not involve columns of more than one table.
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/IdGeneratorType.java b/hibernate-core/src/main/java/org/hibernate/annotations/IdGeneratorType.java
index 318fdfe1509d..d3b5e0833efb 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/IdGeneratorType.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/IdGeneratorType.java
@@ -22,7 +22,7 @@
  * For example, if we have a custom identifier generator:
  * <pre>
  * public class CustomSequenceGenerator implements BeforeExecutionGenerator {
- *     public CustomSequenceGenerator(CustomSequence config, Member annotatedMember,
+ *     public CustomSequenceGenerator(CustomSequence config,
  *                                    GeneratorCreationContext context) {
  *         ...
  *     }
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java b/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java
index a48a5bb9e03c..22d0613b6c8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java
@@ -14,8 +14,8 @@
  * Marks an entity, collection, or attribute of an entity as immutable. The absence of this
  * annotation means the element is mutable.
  *
- * <h3>Immutable entities</h3>
- * <p>
+ * <h2>Immutable entities</h2>
+ *
  * Changes made in memory to the state of an immutable entity are never synchronized to
  * the database. The changes are ignored, with no exception thrown.
  * <p>
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java b/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java
index dd9377fbb137..c9f76b73ac16 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java
@@ -7,6 +7,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.FetchType;
 
 import static java.lang.annotation.ElementType.FIELD;
@@ -79,4 +80,11 @@
 	 * </ul>
 	 */
 	FetchType fetch() default FetchType.EAGER;
+
+	/**
+	 * The operations that should be cascaded to the associated entities.
+	 * <p>By default, no operations are cascaded.
+	 * @since 7.4
+	 */
+	CascadeType[] cascade() default {};
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Mutability.java b/hibernate-core/src/main/java/org/hibernate/annotations/Mutability.java
index 9cebc7c04708..e7b96022fe68 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/Mutability.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/Mutability.java
@@ -19,7 +19,7 @@
 
 /**
  * Specifies a {@link MutabilityPlan} for a basic value mapping.
- *
+ * <p>
  * Mutability refers to whether the internal state of a value can change.
  * For example, {@linkplain java.util.Date Date} is considered mutable because its
  * internal state can be changed using {@link java.util.Date#setTime} whereas
@@ -31,10 +31,8 @@
  * {@linkplain java.util.Date Date}, {@linkplain java.lang.String String}, etc.
  * {@linkplain Mutability} and friends allow plugging in specific strategies.
  *
+ * <h2>Mutability for basic-typed attributes</h2>
  *
- *
- * <h3>Mutability for basic-typed attributes</h3>
- * <p>
  * For basic-valued attributes, {@code @Mutability} specifies the mutability
  * of the basic value type.
  * <p>
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedEntityGraph.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedEntityGraph.java
index aa5aed0ac291..1d20c907f407 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedEntityGraph.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedEntityGraph.java
@@ -20,9 +20,9 @@
 /**
  * Defines a named {@linkplain EntityGraph entity graph}
  * based on Hibernate's {@linkplain org.hibernate.graph.GraphParser entity graph language}.
- * <p/>
+ * <p>
  * When applied to a root entity class, the root entity name is implied - e.g. {@code "title, isbn, author(name, books)"}
- * <p/>
+ * <p>
  * When applied to a package, the root entity name must be specified - e.g. {@code "Book: title, isbn, author(name, books)"}
  *
  * @see EntityManager#getEntityGraph(String)
@@ -39,23 +39,31 @@
 @Retention(RUNTIME)
 @Repeatable(NamedEntityGraphs.class)
 public @interface NamedEntityGraph {
+
+	/**
+	 * The entity that is the root of the {@linkplain #graph graph}.
+	 * When the annotation is applied to a class, the class itself is assumed.
+	 * When applied to a package, this attribute is required.
+	 */
+	Class<?> root() default void.class;
+
 	/**
 	 * The name used to identify the entity graph in calls to
 	 * {@linkplain org.hibernate.Session#getEntityGraph(String)}.
 	 * Entity graph names must be unique within the persistence unit.
-	 * <p/>
+	 * <p>
 	 * When applied to a root entity class, the name is optional and
-	 * defaults to the entity-name of that entity.
+	 * defaults to the JPA entity name of that entity.
 	 */
 	String name() default "";
 
 	/**
 	 * The textual representation of the graph.
-	 * <p/>
+	 * <p>
 	 * When applied to a package, the syntax requires the entity name - e.g., {@code "Book: title, isbn, author(name, books)"}.
-	 * <p/>
+	 * <p>
 	 * When applied to an entity, the entity name should be omitted - e.g., {@code "title, isbn, author(name, books)"}.
-	 * <p/>
+	 * <p>
 	 * See {@linkplain org.hibernate.graph.GraphParser} for details about the syntax.
 	 */
 	String graph();
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java
index 4eca9fc13bab..0d5325aa9a91 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.annotations;
 
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -11,80 +12,107 @@
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-/**
- * Specifies that a field or property of an entity class is part of
- * the natural id of the entity. This annotation is very useful when
- * the primary key of an entity class is a surrogate key, that is,
- * a {@linkplain jakarta.persistence.GeneratedValue system-generated}
- * synthetic identifier, with no domain-model semantics. There should
- * always be some other field or combination of fields which uniquely
- * identifies an instance of the entity from the point of view of the
- * user of the system. This is the <em>natural id</em> of the entity.
- * <p>
- * A natural id may be a single field or property of the entity:
- * <pre>
- * &#64;Entity
- * &#64;Cache &#64;NaturalIdCache
- * class Person {
- *
- *     //synthetic id
- *     &#64;GeneratedValue @Id
- *     Long id;
- *
- *     &#64;NotNull
- *     String name;
- *
- *     //simple natural id
- *     &#64;NotNull @NaturalId
- *     String ssn;
- *
- *     ...
- * }
- * </pre>
- * <p>
- * or it may be a composite value:
- * <pre>
- * &#64;Entity
- * &#64;Cache &#64;NaturalIdCache
- * class Vehicle {
- *
- *     //synthetic id
- *     &#64;GeneratedValue @Id
- *     Long id;
- *
- *     //composite natural id
- *
- *     &#64;Enumerated
- *     &#64;NotNull &#64;NaturalId
- *     Region region;
- *
- *     &#64;NotNull &#64;NaturalId
- *     String registration;
- *
- *     ...
- * }
- * </pre>
- * <p>
- * Unlike the {@linkplain jakarta.persistence.Id primary identifier}
- * of an entity, a natural id may be {@linkplain #mutable}.
- * <p>
- * On the other hand, a field or property which forms part of a natural
- * id may never be null, and so it's a good idea to use {@code @NaturalId}
- * in conjunction with the Bean Validation {@code @NotNull} annotation
- * or {@link jakarta.persistence.Basic#optional @Basic(optional=false)}.
- * <p>
- * The {@link org.hibernate.Session} interface offers several methods
- * that allow an entity instance to be retrieved by its
- * {@linkplain org.hibernate.Session#bySimpleNaturalId(Class) simple}
- * or {@linkplain org.hibernate.Session#byNaturalId(Class) composite}
- * natural id value. If the entity is also marked for {@linkplain
- * NaturalIdCache natural id caching}, then these methods may be able
- * to avoid a database round trip.
- *
- * @author Nicolás Lichtmaier
- *
- * @see NaturalIdCache
- */
+/// Specifies that a field or property of an entity class is part of
+/// the natural id of the entity. This annotation is very useful when
+/// the primary key of an entity class is a surrogate key, that is,
+/// a {@linkplain jakarta.persistence.GeneratedValue system-generated}
+/// synthetic identifier, with no domain-model semantics. There should
+/// always be some other field or combination of fields that uniquely
+/// identifies an instance of the entity from the point of view of the
+/// user of the system. This is the _natural id_ of the entity.
+///
+/// A natural id may be a single (basic or embedded) attribute of the entity:
+/// ````java
+/// @Entity
+/// class Person {
+///
+///     //synthetic id
+///     @GeneratedValue @Id
+///     Long id;
+///
+///     @NotNull
+///     String name;
+///
+///     //simple natural id
+///     @NotNull @NaturalId
+///     String ssn;
+///
+///     ...
+/// }
+/// ```
+///
+/// or it may be a non-aggregated composite value:
+/// ```java
+/// @Entity
+/// class Vehicle {
+///
+///     //synthetic id
+///     @GeneratedValue @Id
+///     Long id;
+///
+///     //composite natural id
+///
+///     @Enumerated
+///     @NotNull
+///	    @NaturalId
+///     Region region;
+///
+///     @NotNull
+///     @NaturalId
+///     String registration;
+///
+///     ...
+/// }
+/// ```
+///
+/// Unlike the {@linkplain jakarta.persistence.Id primary identifier}
+/// of an entity, a natural id may be {@linkplain #mutable}.
+///
+/// On the other hand, a field or property which forms part of a natural
+/// id may never be null, and so it's a good idea to use `@NaturalId`
+/// in conjunction with the Bean Validation `@NotNull` annotation
+/// or [@Basic(optional=false)][jakarta.persistence.Basic#optional()].
+///
+/// The [org.hibernate.Session] interface offers several methods
+/// that allow retrieval of one or more entity references by natural-id
+/// allow an entity instance to be retrieved by its natural-id:
+/// * [org.hibernate.Session#find(Class, Object, jakarta.persistence.FindOption...)]
+///     allows loading a single entity instance by natural-id.
+/// * [org.hibernate.Session#findMultiple(Class, java.util.List, jakarta.persistence.FindOption...)]
+///     allows loading multiple entity instances by natural-id.
+///
+/// ```
+/// Person person = session.find(Person.class, ssn, KeyType.NATURAL);
+/// ```
+/// ```
+/// Vehicle vehicle =
+///         session.find(Vehicle.class,
+///                 Map.of(Vehicle_.REGION, region,
+///                        Vehicle_.REGISTRATION, registration),
+///                 KeyType.NATURAL);
+/// ```
+/// ```
+/// List<Person> people = session.findMultiple(Person.class, ssns, KeyType.NATURAL);
+/// ```
+///
+/// If the entity is also marked for [natural id caching][NaturalIdCache],
+/// then these methods may be able to avoid a database round trip.
+///
+/// @see org.hibernate.Session#find(Class, Object, jakarta.persistence.FindOption...)
+/// @see org.hibernate.Session#findMultiple(Class, java.util.List, jakarta.persistence.FindOption...)
+/// @see NaturalIdClass
+/// @see NaturalIdCache
+///
+/// @apiNote For non-aggregated composite natural-id cases, it is recommended to
+/// leverage [@NaturalIdClass][NaturalIdClass] for loading.
+/// ```
+/// Vehicle vehicle =
+///         session.find(Vehicle.class,
+///                 VehicleKey(region, registration),
+///                 KeyType.NATURAL);
+/// ```
+///
+/// @author Nicolás Lichtmaier
 @Target({METHOD, FIELD})
 @Retention(RUNTIME)
 public @interface NaturalId {
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalIdClass.java b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalIdClass.java
new file mode 100644
index 000000000000..eafb1a61fc86
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalIdClass.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+
+/// Models a non-aggregated composite natural-id for the purpose of loading.
+/// The non-aggregated form uses multiple [@NaturalId][NaturalId] as opposed
+/// to the aggregated form which uses a single [@NaturalId][NaturalId] combined
+/// with [@Embedded][jakarta.persistence.Embedded].
+/// Functions in a similar fashion as [@IdClass][jakarta.persistence.IdClass] for
+/// non-aggregated composite identifiers.
+///
+/// ```java
+/// @Entity
+/// @NaturalIdClass(OrderNaturalId.class)
+/// class Order {
+///     @Id
+/// 	Integer id;
+/// 	@NaturalId @ManyToOne
+/// 	Customer customer;
+/// 	@NaturalId
+/// 	Integer orderNumber;
+///     ...
+/// }
+///
+/// class OrderNaturalId {
+/// 	Customer customer;
+/// 	Integer orderNumber;
+/// 	...
+/// }
+/// ```
+///
+/// @see NaturalId
+/// @see jakarta.persistence.IdClass
+///
+/// @since 7.3
+///
+/// @author Steve Ebersole
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface NaturalIdClass {
+	/// The class to use for loading the associated entity by natural-id.
+	Class<?> value();
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/PartitionKey.java b/hibernate-core/src/main/java/org/hibernate/annotations/PartitionKey.java
index baaddf26aac3..0ccfb6970039 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/PartitionKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/PartitionKey.java
@@ -25,7 +25,6 @@
  * part of the identifier, use of this annotation
  * may improve the performance of SQL {@code update}
  * and {@code delete} statements.
- * <p>
  * <pre>
  * &#064;Entity
  * &#064;Table(name  = "partitioned_table",
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SoftDelete.java b/hibernate-core/src/main/java/org/hibernate/annotations/SoftDelete.java
index 11f8b4f19e9f..d34d26258e65 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/SoftDelete.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/SoftDelete.java
@@ -24,10 +24,10 @@
 
 /**
  * Describes a soft-delete indicator mapping.
- * <p/>
+ * <p>
  * Soft deletes handle "deletions" from a database table by setting a column in
  * the table to indicate deletion.
- * <p/>
+ * <p>
  * May be defined at various levels<ul>
  *     <li>
  *         {@linkplain ElementType#PACKAGE PACKAGE}, where it applies to all
@@ -60,7 +60,7 @@
 public @interface SoftDelete {
 	/**
 	 * (Optional) The name of the column.
-	 * <p/>
+	 * <p>
 	 * Default depends on the {@linkplain #strategy() strategy} being used.
 	 *
 	 * @see SoftDeleteType#getDefaultColumnName()
@@ -87,7 +87,7 @@
 
 	/**
 	 * The strategy to use for storing/reading values to/from the database.
-	 * <p/>
+	 * <p>
 	 * The strategy also affects the default {@linkplain #columnName() column name} - see
 	 * {@linkplain SoftDeleteType#getDefaultColumnName}.
 	 */
@@ -102,7 +102,7 @@
 	 *     <dt>{@code false}</dt>
 	 *     <dd>Indicates that the row is considered NOT deleted</dd>
 	 * </dl>
-	 * <p/>
+	 * <p>
 	 * By default, values are stored as booleans in the database according to
 	 * the {@linkplain Dialect#getPreferredSqlTypeCodeForBoolean() dialect}
 	 * and {@linkplain org.hibernate.cfg.MappingSettings#PREFERRED_BOOLEAN_JDBC_TYPE settings}
@@ -116,7 +116,7 @@
 	Class<? extends AttributeConverter<Boolean,?>> converter() default UnspecifiedConversion.class;
 
 	/**
-	 * Used as the default for {@linkplain SoftDelete#converter()}, indicating that
+	 * Used as the default for {@linkplain SoftDelete#converter}, indicating that
 	 * {@linkplain Dialect#getPreferredSqlTypeCodeForBoolean() dialect} and
 	 * {@linkplain org.hibernate.cfg.MappingSettings#PREFERRED_BOOLEAN_JDBC_TYPE settings}
 	 * resolution should be used.
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SoftDeleteType.java b/hibernate-core/src/main/java/org/hibernate/annotations/SoftDeleteType.java
index dc6511549994..faa1fd539c29 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/SoftDeleteType.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/SoftDeleteType.java
@@ -4,8 +4,6 @@
  */
 package org.hibernate.annotations;
 
-import java.util.Locale;
-
 /**
  * Enumeration of defines styles of soft-delete
  *
@@ -42,19 +40,16 @@ public enum SoftDeleteType {
 	 *     <dd>indicates that the row is deleted, at the given timestamp</dd>
 	 * </dl>
 	 */
-	TIMESTAMP( "deleted" );
-
-	private final String defaultColumnName;
-
-	SoftDeleteType() {
-		this.defaultColumnName = name().toLowerCase( Locale.ROOT );
-	}
-
-	SoftDeleteType(String defaultColumnName) {
-		this.defaultColumnName = defaultColumnName;
-	}
+	TIMESTAMP;
 
+	/**
+	 * The default column name used with this strategy.
+	 * @see SoftDelete#columnName
+	 */
 	public String getDefaultColumnName() {
-		return defaultColumnName;
+		return switch ( this ) {
+			case ACTIVE -> "active";
+			case DELETED, TIMESTAMP -> "deleted";
+		};
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Temporal.java b/hibernate-core/src/main/java/org/hibernate/annotations/Temporal.java
new file mode 100644
index 000000000000..e0dbc50985c1
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/Temporal.java
@@ -0,0 +1,220 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.annotations;
+
+import org.hibernate.Incubating;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.temporal.TemporalTableStrategy;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.time.Instant;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Specifies that the annotated entity class is a temporal entity
+ * or temporal collection. A temporal entity or collection keeps a
+ * historical record of changes over time. Each row of the mapped
+ * table or tables represents a single revision of a single instance
+ * of the entity, or an element of the collection whose existence is
+ * bounded in time, with:
+ * <ul>
+ * <li>a {@link #rowStart} timestamp representing the instant at
+ *     which the revision became effective, and
+ * <li>a {@link #rowEnd} timestamp representing the instant at
+ *     which the revision was superseded by a newer revision.
+ * </ul>
+ * The revision which is currently effective has a null value for
+ * its {@linkplain #rowEnd} timestamp.
+ * <p>
+ * Given the identifier of an instance of a temporal entity, along
+ * with an instant, which may be represented by an instance of
+ * {@link java.time.Instant}, the <em>effective</em> revision of the
+ * temporal entity with the given identifier at the given instant is
+ * the revision with:
+ * <ul>
+ * <li>{@link #rowStart} timestamp less than or equal to the given
+ *     instant, and
+ * <li>{@link #rowEnd} timestamp null or greater than the given
+ *     instant.
+ * </ul>
+ * <p>
+ * There are three {@linkplain TemporalTableStrategy strategies}
+ * for mapping a temporal entity or collection to a table or tables.
+ * <ul>
+ *     <li>In the {@linkplain TemporalTableStrategy#SINGLE_TABLE
+ *         single table} strategy, current and historical data
+ *         is stored together in the same table. Foreign keys
+ *         referencing this table have no constraints, and so
+ *         the database cannot enforce referential integrity.
+ *         The table may be {@linkplain HistoryPartitioning
+ *         partitioned} into current and historical partitions.
+ *     <li>In the {@linkplain TemporalTableStrategy#HISTORY_TABLE
+ *         separate history table} strategy, current data is stored
+ *         in one table, and historical data is stored in a second
+ *         table. Referential integrity may be enforced for current
+ *         data, but not for historical data. The {@code rowStart}
+ *         and {@code rowEnd} columns belong to the history table.
+ *     <li>In the {@linkplain TemporalTableStrategy#NATIVE native}
+ *         strategy, temporal data is stored in a temporal table
+ *         when temporal tables are supported natively by the
+ *         database. The {@code rowStart} and {@code rowEnd} columns
+ *         are managed by the database itself. Depending on the
+ *         capabilities of the database, referential integrity might
+ *         be enforced.
+ * </ul>
+ * <p>
+ * The configuration property
+ * {@value StateManagementSettings#TEMPORAL_TABLE_STRATEGY}
+ * controls the temporal table mapping strategy.
+ * <p>
+ * By default, a session or stateless session reads revisions of
+ * temporal data which are currently effective. To read historical
+ * revisions effective at a given {@linkplain Instant instant}, set
+ * {@linkplain org.hibernate.engine.creation.CommonBuilder#asOf
+ * the temporal data instant} when creating the session or stateless
+ * session.
+ * <p>
+ * The following recommendations do not apply to the native mapping
+ * strategy:
+ * <ul>
+ * <li>It is recommended that every temporal entity declare a
+ *     {@linkplain jakarta.persistence.Version version} attribute.
+ *     The primary key of a table mapped by a temporal entity
+ *     includes the columns mapped by the identifier of the entity,
+ *     along with the version column, if there is one, or the
+ *     {@link #rowStart} column if there is no version.
+ * <li>When working with temporal entities, it is important to
+ *     ensure that referential integrity is maintained by the
+ *     application and validated by triggers or offline processes.
+ * </ul>
+ * <p>
+ * By default, timestamps for the {@code rowStart} and
+ * {@code rowEnd} columns are generated in Java, unless native
+ * temporal tables are used. If timestamps should be generated on
+ * the database server, enable the configuration property
+ * {@value StateManagementSettings#USE_SERVER_TRANSACTION_TIMESTAMPS}.
+ * <p>
+ * An alternative approach, which is not compatible with the
+ * {@linkplain TemporalTableStrategy#NATIVE native} mapping strategy,
+ * is to provide a custom {@link java.util.function.Supplier} of
+ * transaction ids by specifying the configuration property
+ * {@value StateManagementSettings#TRANSACTION_ID_SUPPLIER}.
+ * Transaction ids must be unique and comparable and must increase
+ * monotonically. Typically, such an id is obtained by persisting
+ * an instance of an application-defined entity class with a
+ * generated id which represents the current unit of work. This
+ * entity associates the transaction id with other information about
+ * the work being performed, such as the current timestamp, current
+ * application user, and so on.
+ *
+ * @apiNote
+ * {@linkplain jakarta.persistence.SecondaryTable Secondary tables} and
+ * {@linkplain org.hibernate.boot.model.source.spi.InheritanceType#JOINED
+ * joined inheritance mappings} are not supported for temporal entities.
+ *
+ * @see org.hibernate.engine.creation.CommonBuilder#asOf(Instant)
+ * @see org.hibernate.engine.creation.CommonBuilder#atTransaction(Object)
+ * @see StateManagementSettings#TEMPORAL_TABLE_STRATEGY
+ * @see StateManagementSettings#TRANSACTION_ID_SUPPLIER
+ * @see StateManagementSettings#USE_SERVER_TRANSACTION_TIMESTAMPS
+ *
+ * @author Gavin King
+ *
+ */
+@Documented
+@Target({PACKAGE, TYPE, FIELD, METHOD, ANNOTATION_TYPE})
+@Retention(RUNTIME)
+@Incubating
+public @interface Temporal {
+	/**
+	 * The name of the column holding the starting timestamp
+	 * or transaction id of a revision; the timestamp or id
+	 * representing the moment the revision became effective;
+	 * that is, the "effective from" timestamp.
+	 */
+	String rowStart() default "effective";
+	/**
+	 * The name of the column holding the ending timestamp
+	 * or transaction id of a revision; the timestamp or id
+	 * representing the moment the revision was superseded;
+	 * that is, the "effective to" timestamp.
+	 */
+	String rowEnd() default "superseded";
+
+	/**
+	 * The fractional seconds precision for both temporal columns.
+	 *
+	 * @see jakarta.persistence.Column#secondPrecision()
+	 */
+	int secondPrecision() default -1;
+
+	/**
+	 * Enables partitioning for a temporal table mapped by
+	 * a {@linkplain Temporal temporal entity or collection}
+	 * in the {@linkplain TemporalTableStrategy#SINGLE_TABLE
+	 * single table} temporal mapping strategy. In other
+	 * mapping strategies this annotation has no effect.
+	 */
+	@Documented
+	@Target({TYPE, FIELD, METHOD})
+	@Retention(RUNTIME)
+	@interface HistoryPartitioning {
+		/**
+		 * The name of the partition holding currently
+		 * effective data. Defaults to the temporal table
+		 * name with the suffix {@code _current}.
+		 */
+		String currentPartition() default "";
+		/**
+		 * The name of the partition holding historical
+		 * data. Defaults to the temporal table name with
+		 * the suffix {@code _history}.
+		 */
+		String historyPartition() default "";
+	}
+
+	/**
+	 * Specifies the name of the separate history table for
+	 * a {@linkplain Temporal temporal entity or collection}
+	 * when the history table strategy is used.
+	 *
+	 * @see TemporalTableStrategy#HISTORY_TABLE
+	 */
+	@Documented
+	@Target({TYPE, FIELD, METHOD})
+	@Retention(RUNTIME)
+	@interface HistoryTable {
+		/**
+		 * The name of the history table. Defaults to the
+		 * name of the main table holding currently effective
+		 * data, with the suffix {@code _history}.
+		 */
+		String name() default "";
+	}
+
+	/**
+	 * Excludes the annotated attribute from temporal
+	 * versioning. Updates to an excluded attribute
+	 * modify the current row directly without creating
+	 * a new revision of the entity instance.
+	 * <p>For {@linkplain TemporalTableStrategy#NATIVE
+	 * native temporal tables}, this is only supported
+	 * if the database itself provides a way to exclude
+	 * a column from temporal versioning.
+	 */
+	@Documented
+	@Target({FIELD, METHOD})
+	@Retention(RUNTIME)
+	@interface Excluded {
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Type.java b/hibernate-core/src/main/java/org/hibernate/annotations/Type.java
index 9b5724aee625..bb216e05f9f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/Type.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/Type.java
@@ -8,6 +8,7 @@
 import java.lang.annotation.Target;
 
 import org.hibernate.usertype.UserType;
+import org.hibernate.usertype.UserTypeCreationContext;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.FIELD;
@@ -31,7 +32,7 @@
  * BigDecimal amount;
  * </pre>
  * <p>
- * we may define an annotation type:
+ * we may define a custom annotation type:
  * <pre>
  * &#64;Retention(RUNTIME)
  * &#64;Target({METHOD,FIELD})
@@ -47,6 +48,27 @@
  * <p>
  * which is much cleaner.
  * <p>
+ * An implementation of {@link UserType} applied via a custom annotation
+ * may declare a constructor which accepts the annotation instance,
+ * allowing the annotation to be used to configure the type.
+ * <pre>
+ * &#64;Retention(RUNTIME)
+ * &#64;Target({METHOD,FIELD})
+ * &#64;Type(MonetaryAmountUserType.class)
+ * public @interface MonetaryAmount {
+ *     public Currency currency();
+ * }
+ * </pre>
+ * <pre>
+ * public class MonetaryAmountUserType implements UserType&lt;Amount&gt; {
+ *     private final Currency currency;
+ *     public MonetaryAmountUserType(MonetaryAmount annotation) {
+ *         currency = annotation.currency();
+ *     }
+ *     ...
+ * }
+ * </pre>
+ * <p>
  * The use of a {@code UserType} is usually mutually exclusive with the
  * compositional approach of {@link JavaType} and {@link JdbcType}.
  *
@@ -64,9 +86,14 @@
 
 	/**
 	 * Parameters to be injected into the custom type after it is
-	 * instantiated. The {@link UserType} implementation must implement
+	 * instantiated. The {@link UserType} implementation may implement
 	 * {@link org.hibernate.usertype.ParameterizedType} to receive the
-	 * parameters.
+	 * parameters, or it may obtain them via
+	 * {@link UserTypeCreationContext#getParameters()}.
+	 *
+	 * @apiNote A better approach is to declare a custom annotation type,
+	 * as described {@linkplain Type above}, and specify parameters in a
+	 * type safe way as members of the custom annotation.
 	 */
 	Parameter[] parameters() default {};
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ValueGenerationType.java b/hibernate-core/src/main/java/org/hibernate/annotations/ValueGenerationType.java
index 802833f1006f..36cb3e2c37cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/ValueGenerationType.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/ValueGenerationType.java
@@ -26,8 +26,7 @@
  * <pre>
  * public class SKUGeneration
  *         implements BeforeExecutionGenerator {
- *     public SKUGeneration(SKU sku, Member annotatedMember,
- *                          GeneratorCreationContext context) {
+ *     public SKUGeneration(SKU sku, GeneratorCreationContext context) {
  *         ...
  *     }
  *     ...
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/package-info.java b/hibernate-core/src/main/java/org/hibernate/annotations/package-info.java
index 069cf2952cc2..c8da00bdc57f 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/package-info.java
@@ -9,14 +9,15 @@
  * The JPA specification perfectly nails many aspects of the O/R persistence problem, but
  * here we address some areas where it falls short.
  *
- * <h3 id="basic-value-mapping">Basic types in JPA</h3>
- * <p>
+ * <h2 id="basic-types">Basic types in JPA</h2>
+ *
  * A <em>basic type</em> handles the persistence of an attribute of an entity or embeddable
  * object that is stored in exactly one database column.
  * <p>
  * JPA supports a very limited set of built-in {@linkplain jakarta.persistence.Basic basic}
  * types.
  * <table style="border-spacing: 10px">
+ * <caption>Supported basic types</caption>
  * <thead style="font-weight:bold">
  * <tr>
  * <td>Category</td><td>Package</td><td>Types</td>
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/Find.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/Find.java
index 9bd9176ed068..fabccf3b274d 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/Find.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/Find.java
@@ -106,12 +106,12 @@
  * <p>
  * This is reminiscent of traditional DAO-style repositories.
  * <p>
- * The return type of an annotated method must be an entity type {@code E},
+ * The return type of the annotated method must be an entity type {@code E}
  * or one of the following types:
  * <ul>
- * <li>{@link java.util.List java.util.List&lt;E&gt;},
- * <li>{@link java.util.stream.Stream java.util.stream.Stream&lt;E&gt;},
- * <li>{@link java.util.Optional java.util.Optional&lt;E&gt;},
+ * <li>{@link java.util.List List&lt;E&gt;} or
+ *     {@link java.util.stream.Stream Stream&lt;E&gt;},
+ * <li>{@link java.util.Optional Optional&lt;E&gt;},
  * <li>{@code io.smallrye.mutiny.Uni<E>}, when used with Hibernate Reactive,
  * <li>{@link org.hibernate.query.Query org.hibernate.query.Query&lt;E&gt;},
  * <li>{@link org.hibernate.query.SelectionQuery org.hibernate.query.SelectionQuery&lt;E&gt;},
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/HQL.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/HQL.java
index 9d5ea189569e..53860e55cdb4 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/HQL.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/HQL.java
@@ -76,14 +76,13 @@
  * <p>
  * This is reminiscent of traditional DAO-style repositories.
  * <p>
- * For a {@code select} query, the return type of an annotated method
- * must be:
+ * For a {@code select} query, the return type of the annotated method
+ * must be the query result type {@code R} or one of the following
+ * types:
  * <ul>
- * <li>an entity type, or {@link java.util.Optional Optional&lt;E&gt;}
- *     where {@code E} is an entity type,
- * <li>{@link java.util.List List&lt;E&gt;} or
- *     {@link java.util.stream.Stream Stream&lt;E&gt;}
- *     where {@code E} is an entity type,
+ * <li>{@link java.util.List List&lt;R&gt;} or
+ *     {@link java.util.stream.Stream Stream&lt;R&gt;},
+ * <li>{@link java.util.Optional Optional&lt;R&gt;},
  * <li>{@link java.util.List List&lt;Object[]&gt;} or
  *     {@link java.util.stream.Stream Stream&lt;Object[]&gt;}
  * <li>a record type or JavaBean class with a constructor signature
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java b/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java
index d827eeeafec8..bfb96c9ef7e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/BootLogging.java
@@ -10,6 +10,7 @@
 import org.hibernate.internal.log.SubSystemLogging;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
@@ -39,13 +40,12 @@
 @Internal
 public interface BootLogging extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".boot";
-	BootLogging BOOT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BootLogging.class, NAME );
+	BootLogging BOOT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BootLogging.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = WARN)
 	@Message(id = 160101, value = "Duplicate generator name: '%s'")
 	void duplicateGeneratorName(String name);
 
-
 	@LogMessage(level = DEBUG)
 	@Message(id = 160111, value = "Package not found or no package-info.java: %s")
 	void packageNotFound(String packageName);
@@ -84,7 +84,6 @@ public interface BootLogging extends BasicLogger {
 					@ManyToOne and @OneToOne associations mapped with @NotFound are forced to EAGER fetching""")
 	void ignoreNotFoundWithFetchTypeLazy(String entity, String association);
 
-	// --- New typed TRACE/DEBUG messages for boot internals ---
 	@LogMessage(level = TRACE)
 	@Message(id = 160140, value = "Binding formula: %s")
 	void bindingFormula(String formula);
@@ -444,9 +443,17 @@ public interface BootLogging extends BasicLogger {
 
 	@LogMessage(level = TRACE)
 	@Message(id = 160243, value = "Checking auto-apply AttributeConverter [%s] (domain-type=%s) for match against %s : %s.%s (type=%s)")
-	void checkingAutoApplyAttributeConverter(String converterClass, String domainTypeSignature, String siteDescriptor, String declaringType, String memberName, String memberTypeName);
+	void checkingAutoApplyAttributeConverter(String converterClass, String domainType, String siteDescriptor, String declaringType, String memberName, String memberTypeName);
 
 	@LogMessage(level = DEBUG)
 	@Message(id = 160244, value = "Skipping HBM processing of entity hierarchy [%s], as at least one entity [%s] has been processed")
 	void skippingHbmProcessingOfEntityHierarchy(String rootEntityName, String processedEntity);
+
+	@LogMessage(level = WARN)
+	@Message(id = 160245, value = "Association '%s' is 'mappedBy' another entity and should not specify a '@MapKeyColumn' (use '@MapKey' instead)")
+	void mappedByShouldNotSpecifyMapKeyColumn(String associationPath);
+
+	@LogMessage(level = WARN)
+	@Message(id = 160246, value = "Association '%s' is 'mappedBy' another entity and should not specify an '@OrderColumn' (use '@OrderBy' instead)")
+	void mappedByShouldNotSpecifyOrderColumn(String associationPath);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java
index ef46107b6dda..bf6d02c9cd53 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java
@@ -105,9 +105,7 @@ public MetadataSources(ServiceRegistry serviceRegistry, XmlMappingBinderAccess x
 		// service registry really should be either BootstrapServiceRegistry or StandardServiceRegistry type...
 		if ( !isExpectedServiceRegistryType( serviceRegistry ) ) {
 			if ( BOOT_LOGGER.isDebugEnabled() ) {
-				BOOT_LOGGER.unexpectedServiceRegistryType(
-						serviceRegistry.getClass().getName()
-				);
+				BOOT_LOGGER.unexpectedServiceRegistryType( serviceRegistry.getClass().getName() );
 			}
 		}
 		this.serviceRegistry = serviceRegistry;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
index 0d86037ae7f4..7f224d366708 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
@@ -14,7 +14,10 @@
 import org.hibernate.SessionFactoryObserver;
 import org.hibernate.annotations.CacheLayout;
 import org.hibernate.cache.spi.TimestampsCacheFactory;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.temporal.TemporalTableStrategy;
 import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
+import org.hibernate.context.spi.TenantCredentialsMapper;
 import org.hibernate.context.spi.TenantSchemaMapper;
 import org.hibernate.jpa.spi.JpaCompliance;
 import org.hibernate.proxy.EntityNotFoundDelegate;
@@ -400,6 +403,20 @@ public interface SessionFactoryBuilder {
 	 */
 	SessionFactoryBuilder applyTenantSchemaMapper(TenantSchemaMapper<?> mapper);
 
+	/**
+	 * Specifies a {@link TenantCredentialsMapper} that is responsible for
+	 * mapping the current tenant identifier to the database user and password.
+	 *
+	 * @param mapper The mapping strategy to use.
+	 *
+	 * @return {@code this}, for method chaining
+	 *
+	 * @see org.hibernate.cfg.AvailableSettings#MULTI_TENANT_CREDENTIALS_MAPPER
+	 *
+	 * @since 7.3
+	 */
+	SessionFactoryBuilder applyTenantCredentialsMapper(TenantCredentialsMapper<?> mapper);
+
 	/**
 	 * If using the built-in JTA-based
 	 * {@link org.hibernate.resource.transaction.spi.TransactionCoordinator} or
@@ -678,6 +695,11 @@ public interface SessionFactoryBuilder {
 	 */
 	SessionFactoryBuilder applyCollectionsInDefaultFetchGroup(boolean enabled);
 
+	/**
+	 * @see StateManagementSettings#TEMPORAL_TABLE_STRATEGY
+	 */
+	SessionFactoryBuilder applyTemporalTableStrategy(TemporalTableStrategy strategy);
+
 	/**
 	 * @see org.hibernate.cfg.AvailableSettings#ALLOW_UPDATE_OUTSIDE_TRANSACTION
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java
index 89b2b6cc0ebc..de96e3aad1ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java
@@ -14,6 +14,8 @@
 
 import org.hibernate.boot.archive.spi.ArchiveException;
 
+import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
+
 
 /**
  * Helper for dealing with archives
@@ -89,7 +91,7 @@ else if ( "zip".equals( protocol )
 					"Unable to determine JAR Url from " + url + ". Cause: " + e.getMessage()
 			);
 		}
-		org.hibernate.boot.BootLogging.BOOT_LOGGER.jarUrlFromUrlEntry( String.valueOf(url), String.valueOf(jarUrl) );
+		BOOT_LOGGER.jarUrlFromUrlEntry( String.valueOf(url), String.valueOf(jarUrl) );
 		return jarUrl;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScannerLogger.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScannerLogger.java
index 3cac3e83bf6a..f404ba38202f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScannerLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScannerLogger.java
@@ -15,6 +15,7 @@
 
 import java.lang.invoke.MethodHandles;
 import java.net.URL;
+import java.util.Locale;
 
 /**
  * Logging related to {@linkplain org.hibernate.boot.archive.scan.spi.Scanner scanning}.
@@ -30,7 +31,7 @@
 public interface ScannerLogger extends BasicLogger {
 	String NAME = BootLogging.NAME + ".scan";
 
-	ScannerLogger SCANNER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ScannerLogger.class, NAME );
+	ScannerLogger SCANNER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ScannerLogger.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = Logger.Level.WARN)
 	@Message(id = 60001, value = "Multiple ScannerFactory services available; using '%s'")
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java
index 04bf58a0e805..47ddd563df9d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java
@@ -23,7 +23,6 @@
 import org.hibernate.event.spi.PreUpdateEventListener;
 import org.hibernate.event.spi.PreUpsertEvent;
 import org.hibernate.event.spi.PreUpsertEventListener;
-import org.hibernate.metamodel.RepresentationMode;
 import org.hibernate.persister.entity.EntityPersister;
 
 import jakarta.validation.ConstraintViolation;
@@ -32,8 +31,8 @@
 import jakarta.validation.ValidatorFactory;
 
 import static org.hibernate.boot.beanvalidation.BeanValidationLogger.BEAN_VALIDATION_LOGGER;
-import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 import static org.hibernate.internal.util.collections.CollectionHelper.setOfSize;
+import static org.hibernate.metamodel.RepresentationMode.POJO;
 
 /**
  * Event listener used to enable Bean Validation for insert/update/delete events.
@@ -51,6 +50,8 @@ public class BeanValidationEventListener
 	private final Validator validator;
 	private final GroupsPerOperation groupsPerOperation;
 
+	private SessionFactoryImplementor sessionFactory;
+
 	public BeanValidationEventListener(
 			ValidatorFactory factory, Map<String, Object> settings, ClassLoaderService classLoaderService) {
 		traversableResolver = new HibernateTraversableResolver();
@@ -58,14 +59,17 @@ public BeanValidationEventListener(
 				factory.usingContext()
 						.traversableResolver( traversableResolver )
 						.getValidator();
-		groupsPerOperation = GroupsPerOperation.from( settings, new ClassLoaderAccessImpl( classLoaderService ) );
+		groupsPerOperation =
+				GroupsPerOperation.from( settings,
+						new ClassLoaderAccessImpl( classLoaderService ) );
 	}
 
 	@Override
 	public void sessionFactoryCreated(SessionFactory factory) {
-		var implementor = factory.unwrap( SessionFactoryImplementor.class );
-		implementor.getMappingMetamodel()
-				.forEachEntityDescriptor( entityPersister -> traversableResolver.addPersister( entityPersister, implementor ) );
+		sessionFactory = factory.unwrap( SessionFactoryImplementor.class );
+		sessionFactory.getMappingMetamodel()
+				.forEachEntityDescriptor( entityPersister ->
+						traversableResolver.addPersister( entityPersister, sessionFactory ) );
 	}
 
 	public boolean onPreInsert(PreInsertEvent event) {
@@ -107,56 +111,57 @@ public boolean onPreUpsert(PreUpsertEvent event) {
 
 	@Override
 	public void onPreUpdateCollection(PreCollectionUpdateEvent event) {
-		final Object entity = castNonNull( event.getCollection().getOwner() );
 		validate(
-				entity,
-				event.getSession().getEntityPersister( event.getAffectedOwnerEntityName(), entity ),
+				event.getAffectedOwnerOrNull(),
+				event.getCollectionPersister().getOwnerEntityPersister(),
 				GroupsPerOperation.Operation.UPDATE
 		);
 	}
 
-	private <T> void validate(
-			T object,
-			EntityPersister persister,
-			GroupsPerOperation.Operation operation) {
+	private <T> void validate(T object, EntityPersister persister, GroupsPerOperation.Operation operation) {
 		if ( object != null
-				&& persister.getRepresentationStrategy().getMode() == RepresentationMode.POJO ) {
-			final Class<?>[] groups = groupsPerOperation.get( operation );
+				&& persister.getRepresentationStrategy().getMode() == POJO ) {
+			final var groups = groupsPerOperation.get( operation );
 			if ( groups.length > 0 ) {
 				final var constraintViolations = validator.validate( object, groups );
 				if ( !constraintViolations.isEmpty() ) {
-					final Set<ConstraintViolation<?>> propagatedViolations = setOfSize( constraintViolations.size() );
+					final Set<ConstraintViolation<?>> propagatedViolations =
+							setOfSize( constraintViolations.size() );
 					final Set<String> classNames = new HashSet<>();
 					for ( var violation : constraintViolations ) {
 						BEAN_VALIDATION_LOGGER.trace( violation );
 						propagatedViolations.add( violation );
 						classNames.add( violation.getLeafBean().getClass().getName() );
 					}
-					final var builder =
-							new StringBuilder()
-									.append( "Validation failed for classes " )
-									.append( classNames )
-									.append( " during " )
-									.append( operation.getName() )
-									.append( " time for groups " )
-									.append( toString( groups ) )
-									.append( "\nList of constraint violations:[\n" );
-					for ( var violation : constraintViolations ) {
-						builder.append( "\t" ).append( violation.toString() ).append( "\n" );
-					}
-					builder.append( "]" );
-					throw new ConstraintViolationException( builder.toString(), propagatedViolations );
+					throw new ConstraintViolationException(
+							message( operation, classNames, groups, constraintViolations ),
+							propagatedViolations );
 				}
 			}
 		}
 	}
 
-	private String toString(Class<?>[] groups) {
-		final var string = new StringBuilder( "[" );
+	private <T> String message(
+			GroupsPerOperation.Operation operation,
+			Set<String> classNames,
+			Class<?>[] groups,
+			Set<ConstraintViolation<T>> constraintViolations) {
+		final var builder = new StringBuilder();
+		builder.append( "Validation failed for classes " )
+				.append( classNames )
+				.append( " during " )
+				.append( operation.getName() )
+				.append( " time for groups [" );
 		for ( var group : groups ) {
-			string.append( group.getName() ).append( ", " );
+			builder.append( group.getName() ).append( ", " );
+		}
+		builder.append( "]\nList of constraint violations:[\n" );
+		for ( var violation : constraintViolations ) {
+			builder.append( "\t" )
+					.append( violation.toString() )
+					.append( "\n" );
 		}
-		string.append( "]" );
-		return string.toString();
+		builder.append( "]" );
+		return builder.toString();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationLogger.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationLogger.java
index aa3ac5b03886..2c8d60ab929e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationLogger.java
@@ -16,6 +16,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.hibernate.cfg.ValidationSettings.JAKARTA_VALIDATION_MODE;
 import static org.jboss.logging.Logger.Level.DEBUG;
@@ -35,7 +36,7 @@
 public interface BeanValidationLogger extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".beanvalidation";
 
-	BeanValidationLogger BEAN_VALIDATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BeanValidationLogger.class, NAME );
+	BeanValidationLogger BEAN_VALIDATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BeanValidationLogger.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = DEBUG)
 	@Message(id = 101001, value = "Unable to acquire Jakarta Validation ValidatorFactory, skipping activation")
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java
index 674181d97bee..bf42c928f7c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java
@@ -106,7 +106,6 @@ else if ( validationModes.contains( ValidationMode.DDL ) ) {
 					// There is a Jakarta Validation provider, but it failed to bootstrap the factory for some reason,
 					// we should fail and let the user deal with it:
 					throw exception;
-
 				}
 			}
 		}
@@ -148,10 +147,10 @@ private static void setupListener(
 			ValidatorFactory validatorFactory,
 			SessionFactoryServiceRegistry serviceRegistry,
 			SessionFactoryImplementor sessionFactory) {
-		final var classLoaderService = serviceRegistry.requireService( ClassLoaderService.class );
-		final var cfgService = serviceRegistry.requireService( ConfigurationService.class );
 		final var listener =
-				new BeanValidationEventListener( validatorFactory, cfgService.getSettings(), classLoaderService );
+				new BeanValidationEventListener( validatorFactory,
+						serviceRegistry.requireService( ConfigurationService.class ).getSettings(),
+						serviceRegistry.requireService( ClassLoaderService.class ) );
 		final var listenerRegistry = sessionFactory.getEventListenerRegistry();
 		listenerRegistry.addDuplicationStrategy( DuplicationStrategyImpl.INSTANCE );
 		listenerRegistry.appendListeners( EventType.PRE_INSERT, listener );
@@ -183,7 +182,8 @@ private static void applyRelationalConstraints(ValidatorFactory factory, Activat
 					context.getMetadata().getEntityBindings(),
 					serviceRegistry.requireService( ConfigurationService.class ).getSettings(),
 					serviceRegistry.requireService( JdbcServices.class ).getDialect(),
-					new ClassLoaderAccessImpl( null, serviceRegistry.getService( ClassLoaderService.class ) )
+					new ClassLoaderAccessImpl( null,
+							serviceRegistry.getService( ClassLoaderService.class ) )
 			);
 		}
 	}
@@ -418,17 +418,16 @@ private static boolean isNotNullDescriptor(ConstraintDescriptor<?> descriptor) {
 
 	private static void markNotNull(Property property) {
 		// single table inheritance should not be forced to null due to shared state
-		if ( !( property.getPersistentClass() instanceof SingleTableSubclass ) ) {
-			// composite should not add not-null on all columns
-			if ( !property.isComposite() ) {
-				property.setOptional( false );
-				for ( var selectable : property.getSelectables() ) {
-					if ( selectable instanceof Column column ) {
-						column.setNullable( false );
-					}
-					else {
-						BEAN_VALIDATION_LOGGER.notNullOnFormulaPortion( property.getName() );
-					}
+		if ( !( property.getPersistentClass() instanceof SingleTableSubclass )
+				// composite should not add not-null on all columns
+				&& !property.isComposite() ) {
+			property.setOptional( false );
+			for ( var selectable : property.getSelectables() ) {
+				if ( selectable instanceof Column column ) {
+					column.setNullable( false );
+				}
+				else {
+					BEAN_VALIDATION_LOGGER.notNullOnFormulaPortion( property.getName() );
 				}
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java
index 76cceb50d599..e8a0e862ee35 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/ConfigLoader.java
@@ -71,10 +71,9 @@ public LoadedConfig loadConfigXmlResource(String cfgXmlResourceName) {
 	}
 
 	public LoadedConfig loadConfigXmlFile(File cfgXmlFile) {
-		try {
-
+		try ( FileInputStream cfgFileStream = new FileInputStream( cfgXmlFile ) ) {
 			return LoadedConfig.consume( jaxbProcessorHolder.getValue()
-					.unmarshal( new FileInputStream( cfgXmlFile ),
+					.unmarshal( cfgFileStream,
 							new Origin( FILE, cfgXmlFile.getAbsolutePath() ) ) );
 		}
 		catch (FileNotFoundException e) {
@@ -82,6 +81,11 @@ public LoadedConfig loadConfigXmlFile(File cfgXmlFile) {
 					"Specified cfg.xml file [" + cfgXmlFile.getAbsolutePath() + "] does not exist"
 			);
 		}
+		catch (IOException e) {
+			BOOT_LOGGER.unableToCloseCfgXmlUrlStream( e );
+		}
+
+		return null;
 	}
 
 	public LoadedConfig loadConfigXmlUrl(URL url) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
index be806d5b7dbb..11b36bd57e78 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
@@ -100,12 +100,11 @@ public static LoadedConfig consume(JaxbCfgHibernateConfiguration jaxbCfg) {
 					final String eventTypeName = listenerGroup.getType().value();
 					final var eventType = EventType.resolveEventTypeByName( eventTypeName );
 					for ( var listener : listenerGroup.getListener() ) {
-					if ( listener.getType() != null ) {
-						BOOT_LOGGER.listenerDefinedAlsoDefinedEventType(
-								listener.getClazz()
-						);
-					}
-						cfg.addEventListener( eventType, listener.getClazz() );
+						final String listenerClassName = listener.getClazz();
+						if ( listener.getType() != null ) {
+							BOOT_LOGGER.listenerDefinedAlsoDefinedEventType( listenerClassName );
+						}
+						cfg.addEventListener( eventType, listenerClassName );
 					}
 				}
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
index e51dab58de82..7f098c8336c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
@@ -20,7 +20,6 @@
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.ClassLoaderAccess;
-import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.cfg.PersistenceSettings;
 import org.hibernate.engine.config.spi.ConfigurationService;
@@ -35,6 +34,9 @@
 import org.hibernate.resource.beans.spi.BeanInstanceProducer;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.type.BasicType;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.internal.BasicTypeImpl;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import java.util.ArrayList;
@@ -67,8 +69,6 @@ public class BootstrapContextImpl implements BootstrapContext {
 
 	private boolean isJpaBootstrap;
 
-	private final ClassmateContext classmateContext;
-
 	private ScanOptions scanOptions;
 	private ScanEnvironment scanEnvironment;
 	private Object scannerSetting;
@@ -89,7 +89,6 @@ public BootstrapContextImpl(
 		this.serviceRegistry = serviceRegistry;
 		this.metadataBuildingOptions = metadataBuildingOptions;
 
-		classmateContext = new ClassmateContext();
 		classLoaderService = serviceRegistry.requireService( ClassLoaderService.class );
 		classLoaderAccess = new ClassLoaderAccessImpl( classLoaderService );
 
@@ -191,11 +190,6 @@ public ClassLoaderAccess getClassLoaderAccess() {
 		return classLoaderAccess;
 	}
 
-	@Override
-	public ClassmateContext getClassmateContext() {
-		return classmateContext;
-	}
-
 	@Override
 	public ArchiveDescriptorFactory getArchiveDescriptorFactory() {
 		return archiveDescriptorFactory;
@@ -256,9 +250,22 @@ public <T> BasicType<T> resolveAdHocBasicType(String key) {
 		return (BasicType<T>) adHocBasicTypeRegistrations.get( key );
 	}
 
+	@Override
+	public <T> BasicType<T> findAdHocBasicType(JavaType<T> javaType, JdbcType jdbcType) {
+		for ( BasicType<?> basicType : adHocBasicTypeRegistrations.values() ) {
+			if ( basicType.getClass() == BasicTypeImpl.class
+				&& basicType.getJavaTypeDescriptor() == javaType
+				&& basicType.getJdbcType() == jdbcType ) {
+				//noinspection unchecked
+				return (BasicType<T>) basicType;
+			}
+		}
+
+		return null;
+	}
+
 	@Override
 	public void release() {
-		classmateContext.release();
 		classLoaderAccess.release();
 
 		scanOptions = null;
@@ -318,7 +325,7 @@ void injectJpaTempClassLoader(ClassLoader classLoader) {
 
 	void injectScanOptions(ScanOptions scanOptions) {
 		if ( scanOptions != this.scanOptions ) {
-			BOOT_LOGGER.injectingScanOptions(scanOptions, this.scanOptions);
+			BOOT_LOGGER.injectingScanOptions( scanOptions, this.scanOptions );
 		}
 		this.scanOptions = scanOptions;
 	}
@@ -332,7 +339,7 @@ void injectScanEnvironment(ScanEnvironment scanEnvironment) {
 
 	void injectScanner(Scanner scanner) {
 		if ( scanner != this.scannerSetting ) {
-			BOOT_LOGGER.injectingScanner( scanner, scannerSetting );
+			BOOT_LOGGER.injectingScanner( scanner, this.scannerSetting );
 		}
 		this.scannerSetting = scanner;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
index 186fbb1da563..880c6cbb16b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
@@ -5,8 +5,6 @@
 package org.hibernate.boot.internal;
 
 import jakarta.persistence.AttributeConverter;
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.Entity;
 import jakarta.persistence.MapsId;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
@@ -55,7 +53,6 @@
 import org.hibernate.boot.query.NamedProcedureCallDefinition;
 import org.hibernate.boot.query.NamedResultSetMappingDescriptor;
 import org.hibernate.boot.spi.BootstrapContext;
-import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
@@ -113,6 +110,9 @@
 
 import static java.util.Collections.emptyList;
 import static org.hibernate.boot.model.internal.AnnotationBinder.extractParameters;
+import static org.hibernate.boot.model.internal.EmbeddableBinder.isEmbeddable;
+import static org.hibernate.boot.model.internal.EntityBinder.isEntity;
+import static org.hibernate.boot.model.internal.EntityBinder.isMappedSuperclass;
 import static org.hibernate.boot.model.naming.Identifier.toIdentifier;
 import static org.hibernate.boot.model.relational.internal.SqlStringGenerationContextImpl.fromExplicit;
 import static org.hibernate.cfg.MappingSettings.DEFAULT_CATALOG;
@@ -323,7 +323,7 @@ public void registerEmbeddableSubclass(ClassDetails superclass, ClassDetails sub
 
 	@Override
 	public List<ClassDetails> getEmbeddableSubclasses(ClassDetails superclass) {
-		final List<ClassDetails> subclasses = embeddableSubtypes.get( superclass );
+		final var subclasses = embeddableSubtypes.get( superclass );
 		return subclasses != null ? subclasses : emptyList();
 	}
 
@@ -543,20 +543,16 @@ public AttributeConverterManager getAttributeConverterManager() {
 		return attributeConverterManager;
 	}
 
-	private ClassmateContext getClassmateContext() {
-		return getBootstrapContext().getClassmateContext();
-	}
-
 	@Override
 	public void addAttributeConverter(Class<? extends AttributeConverter<?, ?>> converterClass) {
 		attributeConverterManager.addConverter(
-				ConverterDescriptors.of( converterClass, null, false, getClassmateContext() ) );
+				ConverterDescriptors.of( converterClass, null, false ) );
 	}
 
 	@Override
 	public void addOverridableConverter(Class<? extends AttributeConverter<?, ?>> converterClass) {
 		attributeConverterManager.addConverter(
-				ConverterDescriptors.of( converterClass, null, true, getClassmateContext() ) );
+				ConverterDescriptors.of( converterClass, null, true ) );
 	}
 
 	@Override
@@ -566,7 +562,7 @@ public void addAttributeConverter(ConverterDescriptor<?,?> descriptor) {
 
 	@Override
 	public void addRegisteredConversion(RegisteredConversion conversion) {
-		attributeConverterManager.addRegistration( conversion, bootstrapContext );
+		attributeConverterManager.addRegistration( conversion );
 	}
 
 	@Override
@@ -801,7 +797,7 @@ public void addNamedProcedureCallDefinition(NamedProcedureCallDefinition definit
 		else {
 			final String name = definition.getRegistrationName();
 			if ( !defaultNamedProcedureNames.contains( name ) ) {
-				final NamedProcedureCallDefinition previous = namedProcedureCallMap.put( name, definition );
+				final var previous = namedProcedureCallMap.put( name, definition );
 				if ( previous != null ) {
 					throw new DuplicateMappingException( DuplicateMappingException.Type.PROCEDURE, name );
 				}
@@ -900,20 +896,19 @@ public Table addTable(
 			String name,
 			String subselectFragment,
 			boolean isAbstract,
-			MetadataBuildingContext buildingContext) {
-		final Namespace namespace = getDatabase().locateNamespace(
-				getDatabase().toIdentifier( catalogName ),
-				getDatabase().toIdentifier( schemaName )
-		);
+			MetadataBuildingContext buildingContext,
+			boolean isExplicit) {
+		final var database = getDatabase();
+		final var namespace = locateNamespace( schemaName, catalogName, database );
 		// annotation binding depends on the "table name" for @Subselect bindings
 		// being set into the generated table (mainly to avoid later NPE), but for now we need to keep that :(
-		final Identifier logicalName = name != null ? getDatabase().toIdentifier( name ) : null;
+		final Identifier logicalName = name == null ? null : database.toIdentifier( name, isExplicit );
 		if ( subselectFragment != null ) {
 			return new Table( buildingContext.getCurrentContributorName(),
 					namespace, logicalName, subselectFragment, isAbstract );
 		}
 		else {
-			final Table existing = namespace.locateTable( logicalName );
+			final var existing = namespace.locateTable( logicalName );
 			if ( existing != null ) {
 				if ( !isAbstract ) {
 					existing.setAbstract( false );
@@ -923,7 +918,7 @@ public Table addTable(
 			else {
 				return namespace.createTable(
 						logicalName,
-						(physicalName) ->
+						physicalName ->
 								new Table( buildingContext.getCurrentContributorName(),
 										namespace, physicalName, isAbstract )
 				);
@@ -931,6 +926,10 @@ public Table addTable(
 		}
 	}
 
+	private static Namespace locateNamespace(String schemaName, String catalogName, Database database) {
+		return database.locateNamespace( database.toIdentifier( catalogName ), database.toIdentifier( schemaName ) );
+	}
+
 	@Override
 	public Table addDenormalizedTable(
 			String schemaName,
@@ -941,15 +940,14 @@ public Table addDenormalizedTable(
 			Table includedTable,
 			MetadataBuildingContext buildingContext) throws DuplicateMappingException {
 		final var database = getDatabase();
-		final Namespace namespace =
-				database.locateNamespace( database.toIdentifier( catalogName ), database.toIdentifier( schemaName ) );
+		final var namespace = locateNamespace( schemaName, catalogName, database );
 		// annotation binding depends on the "table name" for @Subselect bindings
 		// being set into the generated table (mainly to avoid later NPE), but for now we need to keep that :(
 		final Identifier logicalName = name != null ? database.toIdentifier( name ) : null;
 		if ( subselectFragment != null ) {
 			return namespace.createDenormalizedTable(
 					logicalName,
-					(physicalName) -> new DenormalizedTable(
+					physicalName -> new DenormalizedTable(
 							buildingContext.getCurrentContributorName(),
 							namespace,
 							logicalName,
@@ -967,7 +965,7 @@ public Table addDenormalizedTable(
 			else {
 				return namespace.createDenormalizedTable(
 						logicalName,
-						(physicalTableName) -> new DenormalizedTable(
+						physicalTableName -> new DenormalizedTable(
 								buildingContext.getCurrentContributorName(),
 								namespace,
 								physicalTableName,
@@ -1009,11 +1007,11 @@ public org.hibernate.type.Type getReferencedPropertyType(String entityName, Stri
 		if ( persistentClass == null ) {
 			throw new MappingException( "Persistent class not known: " + entityName );
 		}
-		final var prop = persistentClass.getReferencedProperty( propertyName );
-		if ( prop == null ) {
+		final var referencedProperty = persistentClass.getReferencedProperty( propertyName );
+		if ( referencedProperty == null ) {
 			throw new MappingException( "Property not known: " + entityName + '.' + propertyName );
 		}
-		return prop.getType();
+		return referencedProperty.getType();
 	}
 
 
@@ -1241,22 +1239,22 @@ public AnnotatedClassType addClassType(ClassDetails clazz) {
 	}
 
 	private static AnnotatedClassType getAnnotatedClassType(ClassDetails clazz) {
-		if ( clazz.hasDirectAnnotationUsage( Entity.class ) ) {
-			if ( clazz.hasDirectAnnotationUsage( Embeddable.class ) ) {
+		if ( isEntity( clazz) ) {
+			if ( isEmbeddable( clazz ) ) {
 				throw new AnnotationException( "Invalid class annotated both '@Entity' and '@Embeddable': '" + clazz.getName() + "'" );
 			}
-			else if ( clazz.hasDirectAnnotationUsage( jakarta.persistence.MappedSuperclass.class ) ) {
+			else if ( isMappedSuperclass( clazz ) ) {
 				throw new AnnotationException( "Invalid class annotated both '@Entity' and '@MappedSuperclass': '" + clazz.getName() + "'" );
 			}
 			return AnnotatedClassType.ENTITY;
 		}
-		else if ( clazz.hasDirectAnnotationUsage( Embeddable.class ) ) {
-			if ( clazz.hasDirectAnnotationUsage( jakarta.persistence.MappedSuperclass.class ) ) {
+		else if ( isEmbeddable( clazz ) ) {
+			if ( isMappedSuperclass( clazz ) ) {
 				throw new AnnotationException( "Invalid class annotated both '@Embeddable' and '@MappedSuperclass': '" + clazz.getName() + "'" );
 			}
 			return AnnotatedClassType.EMBEDDABLE;
 		}
-		else if ( clazz.hasDirectAnnotationUsage( jakarta.persistence.MappedSuperclass.class ) ) {
+		else if ( isMappedSuperclass( clazz ) ) {
 			return AnnotatedClassType.MAPPED_SUPERCLASS;
 		}
 		else if ( clazz.hasDirectAnnotationUsage( Imported.class ) ) {
@@ -1417,7 +1415,7 @@ public EntityTableXref addEntityTableXref(
 
 	@Override
 	public Map<String, Join> getJoins(String entityName) {
-		final EntityTableXrefImpl xrefEntry = entityTableXrefMap.get( entityName );
+		final var xrefEntry = entityTableXrefMap.get( entityName );
 		return xrefEntry == null ? null : xrefEntry.secondaryTableJoinMap;
 	}
 
@@ -1767,7 +1765,7 @@ private void processValueResolvers(MetadataBuildingContext buildingContext) {
 
 	private void processSecondPasses(ArrayList<? extends SecondPass> secondPasses) {
 		if ( secondPasses != null ) {
-			for ( SecondPass secondPass : secondPasses ) {
+			for ( var secondPass : secondPasses ) {
 				secondPass.doSecondPass( getEntityBindingMap() );
 			}
 			secondPasses.clear();
@@ -1809,7 +1807,7 @@ private void processFkSecondPassesInOrder() {
 			}
 
 			// process the ordered FkSecondPasses
-			for ( FkSecondPass sp : orderedFkSecondPasses ) {
+			for ( var sp : orderedFkSecondPasses ) {
 				sp.doSecondPass( getEntityBindingMap() );
 			}
 
@@ -1863,7 +1861,7 @@ private void processEndOfQueue(List<FkSecondPass> endOfQueueFkSecondPasses) {
 		RuntimeException originalException = null;
 		while ( !stopProcess ) {
 			List<FkSecondPass> failingSecondPasses = new ArrayList<>();
-			for ( FkSecondPass pass : endOfQueueFkSecondPasses ) {
+			for ( var pass : endOfQueueFkSecondPasses ) {
 				try {
 					pass.doSecondPass( getEntityBindingMap() );
 				}
@@ -1887,7 +1885,7 @@ private void processEndOfQueue(List<FkSecondPass> endOfQueueFkSecondPasses) {
 	private void secondPassCompileForeignKeys(MetadataBuildingContext buildingContext) {
 		int uniqueInteger = 0;
 		final Set<ForeignKey> done = new HashSet<>();
-		for ( Table table : collectTableMappings() ) {
+		for ( var table : collectTableMappings() ) {
 			table.setUniqueInteger( uniqueInteger++ );
 			secondPassCompileForeignKeys( table, done, buildingContext );
 		}
@@ -1902,7 +1900,7 @@ protected void secondPassCompileForeignKeys(Table table, Set<ForeignKey> done, M
 				done.add( foreignKey );
 				final var referencedClass = foreignKey.resolveReferencedClass(this);
 				if ( referencedClass.isJoinedSubclass() ) {
-					secondPassCompileForeignKeys( referencedClass.getSuperclass().getTable(), done, buildingContext);
+					secondPassCompileForeignKeys( referencedClass.getSuperclass().getTable(), done, buildingContext );
 				}
 				// the ForeignKeys created in the first pass did not have their referenced table initialized
 				if ( foreignKey.getReferencedTable() == null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
index 26f030267935..5faeb3f59634 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
@@ -10,10 +10,8 @@
 
 import org.hibernate.AnnotationException;
 import org.hibernate.HibernateException;
-import org.hibernate.cfg.CacheSettings;
+import org.hibernate.cache.spi.RegionFactory;
 import org.hibernate.cfg.JpaComplianceSettings;
-import org.hibernate.cfg.ManagedBeanSettings;
-import org.hibernate.cfg.SchemaToolingSettings;
 import org.hibernate.context.spi.MultiTenancy;
 import org.hibernate.type.TimeZoneStorageStrategy;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -26,14 +24,8 @@
 import org.hibernate.boot.archive.scan.spi.Scanner;
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
 import org.hibernate.boot.cfgxml.spi.CfgXmlAccessService;
-import org.hibernate.boot.cfgxml.spi.LoadedConfig;
-import org.hibernate.boot.cfgxml.spi.MappingReference;
-import org.hibernate.boot.jaxb.Origin;
-import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
 import org.hibernate.boot.jaxb.hbm.transform.HbmXmlTransformer;
 import org.hibernate.boot.jaxb.hbm.transform.UnsupportedFeatureHandling;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
-import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.FunctionContributor;
 import org.hibernate.boot.model.TypeContributions;
@@ -63,14 +55,12 @@
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.boot.spi.MetadataSourcesContributor;
-import org.hibernate.cache.spi.RegionFactory;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cfg.MappingSettings;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.TimeZoneSupport;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.internal.log.DeprecationLogger;
 import org.hibernate.metamodel.CollectionClassification;
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
@@ -88,9 +78,29 @@
 import jakarta.persistence.ConstraintMode;
 import jakarta.persistence.SharedCacheMode;
 
+import static org.hibernate.cfg.CacheSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY;
+import static org.hibernate.cfg.CacheSettings.JAKARTA_SHARED_CACHE_MODE;
+import static org.hibernate.cfg.CacheSettings.JPA_SHARED_CACHE_MODE;
+import static org.hibernate.cfg.ManagedBeanSettings.ALLOW_EXTENSIONS_IN_CDI;
+import static org.hibernate.cfg.MappingSettings.COLUMN_ORDERING_STRATEGY;
+import static org.hibernate.cfg.MappingSettings.DEFAULT_LIST_SEMANTICS;
+import static org.hibernate.cfg.MappingSettings.FORCE_DISCRIMINATOR_IN_SELECTS_BY_DEFAULT;
+import static org.hibernate.cfg.MappingSettings.GLOBALLY_QUOTED_IDENTIFIERS;
+import static org.hibernate.cfg.MappingSettings.IGNORE_EXPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS;
+import static org.hibernate.cfg.MappingSettings.IMPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS;
+import static org.hibernate.cfg.MappingSettings.IMPLICIT_NAMING_STRATEGY;
+import static org.hibernate.cfg.MappingSettings.PHYSICAL_NAMING_STRATEGY;
+import static org.hibernate.cfg.MappingSettings.TRANSFORM_HBM_XML;
+import static org.hibernate.cfg.MappingSettings.TRANSFORM_HBM_XML_FEATURE_HANDLING;
+import static org.hibernate.cfg.MappingSettings.USE_NATIONALIZED_CHARACTER_DATA;
+import static org.hibernate.cfg.MappingSettings.XML_FORMAT_MAPPER_LEGACY_FORMAT;
+import static org.hibernate.cfg.MappingSettings.XML_MAPPING_ENABLED;
+import static org.hibernate.cfg.SchemaToolingSettings.HBM2DDL_CHARSET_NAME;
+import static org.hibernate.cfg.SchemaToolingSettings.HBM2DDL_DEFAULT_CONSTRAINT_MODE;
 import static org.hibernate.engine.config.spi.StandardConverters.BOOLEAN;
 import static org.hibernate.engine.config.spi.StandardConverters.STRING;
 import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
+import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
 import static org.hibernate.internal.util.NullnessHelper.coalesceSuppliedValues;
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
 import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
@@ -147,7 +157,7 @@ public MetadataBuilderImpl(MetadataSources sources, StandardServiceRegistry serv
 		//		these should be set during the StandardServiceRegistryBuilder.configure call
 		applyCfgXmlValues( serviceRegistry.requireService( CfgXmlAccessService.class ) );
 
-		for ( MetadataBuilderInitializer contributor :
+		for ( var contributor :
 				serviceRegistry.requireService( ClassLoaderService.class )
 						.loadJavaServices( MetadataBuilderInitializer.class ) ) {
 			contributor.contribute( this, serviceRegistry );
@@ -155,9 +165,9 @@ public MetadataBuilderImpl(MetadataSources sources, StandardServiceRegistry serv
 	}
 
 	private void applyCfgXmlValues(CfgXmlAccessService service) {
-		final LoadedConfig aggregatedConfig = service.getAggregatedConfig();
+		final var aggregatedConfig = service.getAggregatedConfig();
 		if ( aggregatedConfig != null ) {
-			for ( CacheRegionDefinition cacheRegionDefinition : aggregatedConfig.getCacheRegionDefinitions() ) {
+			for ( var cacheRegionDefinition : aggregatedConfig.getCacheRegionDefinitions() ) {
 				applyCacheRegionDefinition( cacheRegionDefinition );
 			}
 		}
@@ -321,7 +331,7 @@ public TypeConfiguration getTypeConfiguration() {
 	@Override
 	public void contributeAttributeConverter(Class<? extends AttributeConverter<?,?>> converterClass) {
 		bootstrapContext.addAttributeConverterDescriptor(
-				ConverterDescriptors.of( converterClass, bootstrapContext.getClassmateContext() )
+				ConverterDescriptors.of( converterClass )
 		);
 	}
 
@@ -384,7 +394,7 @@ public MetadataBuilder applyAttributeConverter(ConverterDescriptor<?,?> descript
 	@Override
 	public <O,R> MetadataBuilder applyAttributeConverter(Class<? extends AttributeConverter<O,R>> attributeConverterClass) {
 		bootstrapContext.addAttributeConverterDescriptor(
-				ConverterDescriptors.of( attributeConverterClass, bootstrapContext.getClassmateContext() )
+				ConverterDescriptors.of( attributeConverterClass )
 		);
 		return this;
 	}
@@ -392,8 +402,7 @@ public <O,R> MetadataBuilder applyAttributeConverter(Class<? extends AttributeCo
 	@Override
 	public <O,R> MetadataBuilder applyAttributeConverter(Class<? extends AttributeConverter<O,R>> attributeConverterClass, boolean autoApply) {
 		bootstrapContext.addAttributeConverterDescriptor(
-				ConverterDescriptors.of( attributeConverterClass, autoApply, false,
-						bootstrapContext.getClassmateContext() )
+				ConverterDescriptors.of( attributeConverterClass, autoApply, false )
 		);
 		return this;
 	}
@@ -401,7 +410,7 @@ public <O,R> MetadataBuilder applyAttributeConverter(Class<? extends AttributeCo
 	@Override
 	public <O,R> MetadataBuilder applyAttributeConverter(AttributeConverter<O,R> attributeConverter) {
 		bootstrapContext.addAttributeConverterDescriptor(
-				ConverterDescriptors.of( attributeConverter, bootstrapContext.getClassmateContext() )
+				ConverterDescriptors.of( attributeConverter )
 		);
 		return this;
 	}
@@ -409,46 +418,49 @@ public <O,R> MetadataBuilder applyAttributeConverter(AttributeConverter<O,R> att
 	@Override
 	public MetadataBuilder applyAttributeConverter(AttributeConverter<?,?> attributeConverter, boolean autoApply) {
 		bootstrapContext.addAttributeConverterDescriptor(
-				ConverterDescriptors.of( attributeConverter, autoApply, bootstrapContext.getClassmateContext() )
+				ConverterDescriptors.of( attributeConverter, autoApply )
 		);
 		return this;
 	}
 
 	@Override
 	public MetadataImplementor build() {
-		final CfgXmlAccessService cfgXmlAccessService = options.serviceRegistry.requireService( CfgXmlAccessService.class );
-		if ( cfgXmlAccessService.getAggregatedConfig() != null ) {
-			if ( cfgXmlAccessService.getAggregatedConfig().getMappingReferences() != null ) {
-				for ( MappingReference mappingReference : cfgXmlAccessService.getAggregatedConfig().getMappingReferences() ) {
+		final var aggregatedConfig =
+				options.serviceRegistry.requireService( CfgXmlAccessService.class )
+						.getAggregatedConfig();
+		if ( aggregatedConfig != null ) {
+			final var mappingReferences = aggregatedConfig.getMappingReferences();
+			if ( mappingReferences != null ) {
+				for ( var mappingReference : mappingReferences ) {
 					mappingReference.apply( sources );
 				}
 			}
 		}
 
-		final MetadataImplementor bootModel = MetadataBuildingProcess.build( sources, bootstrapContext, options );
+		final var bootModel = MetadataBuildingProcess.build( sources, bootstrapContext, options );
 
 		if ( isNotEmpty( sources.getHbmXmlBindings() ) ) {
-			final ConfigurationService configurationService = bootstrapContext.getConfigurationService();
+			final var configurationService = bootstrapContext.getConfigurationService();
 			final boolean transformHbm = configurationService != null
-					&& configurationService.getSetting( MappingSettings.TRANSFORM_HBM_XML, BOOLEAN,false );
+					&& configurationService.getSetting( TRANSFORM_HBM_XML, BOOLEAN,false );
 
 			if ( !transformHbm ) {
-				for ( Binding<JaxbHbmHibernateMapping> hbmXmlBinding : sources.getHbmXmlBindings() ) {
-					final Origin origin = hbmXmlBinding.getOrigin();
-					DeprecationLogger.DEPRECATION_LOGGER.logDeprecatedHbmXmlProcessing( origin.getType(), origin.getName() );
+				for ( var hbmXmlBinding : sources.getHbmXmlBindings() ) {
+					final var origin = hbmXmlBinding.getOrigin();
+					DEPRECATION_LOGGER.logDeprecatedHbmXmlProcessing( origin.getType(), origin.getName() );
 				}
 			}
 			else {
-				final List<Binding<JaxbEntityMappingsImpl>> transformed = HbmXmlTransformer.transform(
+				final var transformed = HbmXmlTransformer.transform(
 						sources.getHbmXmlBindings(),
 						bootModel,
 						UnsupportedFeatureHandling.fromSetting(
-								configurationService.getSettings().get( MappingSettings.TRANSFORM_HBM_XML_FEATURE_HANDLING ),
+								configurationService.getSettings().get( TRANSFORM_HBM_XML_FEATURE_HANDLING ),
 								UnsupportedFeatureHandling.ERROR
 						)
 				);
 
-				final MetadataSources newSources = new MetadataSources( bootstrapContext.getServiceRegistry() );
+				final var newSources = new MetadataSources( bootstrapContext.getServiceRegistry() );
 				if ( sources.getAnnotatedClasses() != null ) {
 					sources.getAnnotatedClasses().forEach( newSources::addAnnotatedClass );
 				}
@@ -461,7 +473,7 @@ public MetadataImplementor build() {
 				if ( sources.getExtraQueryImports() != null ) {
 					sources.getExtraQueryImports().forEach( newSources::addQueryImport );
 				}
-				for ( Binding<JaxbEntityMappingsImpl> mappingXmlBinding : transformed ) {
+				for ( var mappingXmlBinding : transformed ) {
 					newSources.addMappingXmlBinding( mappingXmlBinding );
 				}
 
@@ -491,7 +503,7 @@ public static class MappingDefaultsImpl implements MappingDefaults {
 		private CollectionClassification implicitListClassification;
 
 		public MappingDefaultsImpl(StandardServiceRegistry serviceRegistry) {
-			final ConfigurationService configService = serviceRegistry.requireService( ConfigurationService.class );
+			final var configService = serviceRegistry.requireService( ConfigurationService.class );
 
 			// AvailableSettings.DEFAULT_SCHEMA and AvailableSettings.DEFAULT_CATALOG
 			// are taken into account later, at runtime, when rendering table/sequence names.
@@ -501,26 +513,27 @@ public MappingDefaultsImpl(StandardServiceRegistry serviceRegistry) {
 			implicitCatalogName = null;
 
 			implicitlyQuoteIdentifiers = configService.getSetting(
-					MappingSettings.GLOBALLY_QUOTED_IDENTIFIERS,
+					GLOBALLY_QUOTED_IDENTIFIERS,
 					BOOLEAN,
 					false
 			);
 
 			implicitCacheAccessType = configService.getSetting(
-					CacheSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY,
+					DEFAULT_CACHE_CONCURRENCY_STRATEGY,
 					value -> AccessType.fromExternalName( value.toString() )
 			);
 
 			implicitListClassification = configService.getSetting(
-					MappingSettings.DEFAULT_LIST_SEMANTICS,
+					DEFAULT_LIST_SEMANTICS,
 					value -> {
-						final CollectionClassification classification = CollectionClassification.interpretSetting( value );
-						if ( classification != CollectionClassification.LIST && classification != CollectionClassification.BAG ) {
+						final var classification = CollectionClassification.interpretSetting( value );
+						if ( classification != CollectionClassification.LIST
+							&& classification != CollectionClassification.BAG ) {
 							throw new AnnotationException(
 									String.format(
 											Locale.ROOT,
 											"'%s' should specify either '%s' or '%s' (was '%s')",
-											MappingSettings.DEFAULT_LIST_SEMANTICS,
+											DEFAULT_LIST_SEMANTICS,
 											java.util.List.class.getName(),
 											java.util.Collection.class.getName(),
 											classification.name()
@@ -640,8 +653,8 @@ public static class MetadataBuildingOptionsImpl
 		public MetadataBuildingOptionsImpl(StandardServiceRegistry serviceRegistry) {
 			this.serviceRegistry = serviceRegistry;
 
-			final StrategySelector strategySelector = serviceRegistry.requireService( StrategySelector.class );
-			final ConfigurationService configService = serviceRegistry.requireService( ConfigurationService.class );
+			final var strategySelector = serviceRegistry.requireService( StrategySelector.class );
+			final var configService = serviceRegistry.requireService( ConfigurationService.class );
 
 			mappingDefaults = new MappingDefaultsImpl( serviceRegistry );
 
@@ -650,131 +663,153 @@ public MetadataBuildingOptionsImpl(StandardServiceRegistry serviceRegistry) {
 			multiTenancyEnabled = MultiTenancy.isMultiTenancyEnabled( serviceRegistry );
 
 			xmlMappingEnabled = configService.getSetting(
-					MappingSettings.XML_MAPPING_ENABLED,
+					XML_MAPPING_ENABLED,
 					BOOLEAN,
 					true
 			);
 			xmlFormatMapperLegacyFormat = configService.getSetting(
-					MappingSettings.XML_FORMAT_MAPPER_LEGACY_FORMAT,
+					XML_FORMAT_MAPPER_LEGACY_FORMAT,
 					BOOLEAN,
 					false
 			);
 
 			implicitDiscriminatorsForJoinedInheritanceSupported = configService.getSetting(
-					MappingSettings.IMPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS,
+					IMPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS,
 					BOOLEAN,
 					false
 			);
 
 			explicitDiscriminatorsForJoinedInheritanceSupported = !configService.getSetting(
-					MappingSettings.IGNORE_EXPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS,
+					IGNORE_EXPLICIT_DISCRIMINATOR_COLUMNS_FOR_JOINED_SUBCLASS,
 					BOOLEAN,
 					false
 			);
 
 			implicitlyForceDiscriminatorInSelect = configService.getSetting(
-					MappingSettings.FORCE_DISCRIMINATOR_IN_SELECTS_BY_DEFAULT,
+					FORCE_DISCRIMINATOR_IN_SELECTS_BY_DEFAULT,
 					BOOLEAN,
 					false
 			);
 
-			sharedCacheMode = configService.getSetting(
-					CacheSettings.JAKARTA_SHARED_CACHE_MODE,
-					value -> value instanceof SharedCacheMode cacheMode
-							? cacheMode
-							: SharedCacheMode.valueOf( value.toString() ),
-					configService.getSetting(
-							CacheSettings.JPA_SHARED_CACHE_MODE,
-							value -> {
-								if ( value == null ) {
-									return null;
-								}
+			sharedCacheMode = getSharedCacheMode( configService );
 
-								DeprecationLogger.DEPRECATION_LOGGER.deprecatedSetting(
-										CacheSettings.JPA_SHARED_CACHE_MODE,
-										CacheSettings.JAKARTA_SHARED_CACHE_MODE
-								);
+			defaultCacheAccessType = getDefaultCacheAccessType( configService );
 
-								return value instanceof SharedCacheMode cacheMode
-										? cacheMode
-										: SharedCacheMode.valueOf( value.toString() );
-							},
-							SharedCacheMode.UNSPECIFIED
-					)
-			);
+			noConstraintByDefault = isNoConstraintByDefault( configService );
 
-			final RegionFactory regionFactory =  serviceRegistry.getService( RegionFactory.class );
-			defaultCacheAccessType = configService.getSetting(
-					CacheSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY,
-					value -> {
-						if ( value == null ) {
-							return null;
-						}
-						else if ( value instanceof CacheConcurrencyStrategy cacheConcurrencyStrategy ) {
-							return cacheConcurrencyStrategy.toAccessType();
-						}
-						else if ( value instanceof AccessType accessType ) {
-							return accessType;
-						}
-						else {
-							return AccessType.fromExternalName( value.toString() );
-						}
-					},
-					// by default, see if the defined RegionFactory (if one) defines a default
-					regionFactory == null ? null : regionFactory.getDefaultAccessType()
+			implicitNamingStrategy = getImplicitNamingStrategy( strategySelector, configService );
+			physicalNamingStrategy = getPhysicalNamingStrategy( strategySelector, configService );
+
+			columnOrderingStrategy = getColumnOrderingStrategy( strategySelector, configService );
+
+			useNationalizedCharacterData = configService.getSetting(
+					USE_NATIONALIZED_CHARACTER_DATA,
+					BOOLEAN,
+					false
 			);
 
-			final String defaultConstraintMode = configService.getSetting(
-					SchemaToolingSettings.HBM2DDL_DEFAULT_CONSTRAINT_MODE,
+			schemaCharset = configService.getSetting(
+					HBM2DDL_CHARSET_NAME,
 					STRING,
 					null
 			);
-			noConstraintByDefault =
-					ConstraintMode.NO_CONSTRAINT.name()
-							.equalsIgnoreCase( defaultConstraintMode );
 
-			implicitNamingStrategy = strategySelector.<ImplicitNamingStrategy>resolveDefaultableStrategy(
-					ImplicitNamingStrategy.class,
-					configService.getSettings().get( MappingSettings.IMPLICIT_NAMING_STRATEGY ),
+			allowExtensionsInCdi = configService.getSetting(
+					ALLOW_EXTENSIONS_IN_CDI,
+					BOOLEAN,
+					false
+			);
+		}
+
+		private static boolean isNoConstraintByDefault(ConfigurationService configService) {
+			return ConstraintMode.NO_CONSTRAINT.name()
+					.equalsIgnoreCase( configService.getSetting(
+							HBM2DDL_DEFAULT_CONSTRAINT_MODE,
+							STRING,
+							null
+					) );
+		}
+
+		private static ColumnOrderingStrategy getColumnOrderingStrategy(
+				StrategySelector strategySelector, ConfigurationService configService) {
+			return strategySelector.<ColumnOrderingStrategy>resolveDefaultableStrategy(
+					ColumnOrderingStrategy.class,
+					configService.getSettings().get( COLUMN_ORDERING_STRATEGY ),
 					() -> strategySelector.resolveDefaultableStrategy(
-							ImplicitNamingStrategy.class,
+							ColumnOrderingStrategy.class,
 							"default",
-							ImplicitNamingStrategyJpaCompliantImpl.INSTANCE
+							ColumnOrderingStrategyStandard.INSTANCE
 					)
 			);
+		}
 
-			physicalNamingStrategy = strategySelector.resolveDefaultableStrategy(
+		private static PhysicalNamingStrategy getPhysicalNamingStrategy(
+				StrategySelector strategySelector, ConfigurationService configService) {
+			return strategySelector.resolveDefaultableStrategy(
 					PhysicalNamingStrategy.class,
-					configService.getSettings().get( MappingSettings.PHYSICAL_NAMING_STRATEGY ),
+					configService.getSettings().get( PHYSICAL_NAMING_STRATEGY ),
 					PhysicalNamingStrategyStandardImpl.INSTANCE
 			);
+		}
 
-			columnOrderingStrategy = strategySelector.<ColumnOrderingStrategy>resolveDefaultableStrategy(
-					ColumnOrderingStrategy.class,
-					configService.getSettings().get( MappingSettings.COLUMN_ORDERING_STRATEGY ),
+		private static ImplicitNamingStrategy getImplicitNamingStrategy(
+				StrategySelector strategySelector, ConfigurationService configService) {
+			return strategySelector.<ImplicitNamingStrategy>resolveDefaultableStrategy(
+					ImplicitNamingStrategy.class,
+					configService.getSettings().get( IMPLICIT_NAMING_STRATEGY ),
 					() -> strategySelector.resolveDefaultableStrategy(
-							ColumnOrderingStrategy.class,
+							ImplicitNamingStrategy.class,
 							"default",
-							ColumnOrderingStrategyStandard.INSTANCE
+							ImplicitNamingStrategyJpaCompliantImpl.INSTANCE
 					)
 			);
+		}
 
-			useNationalizedCharacterData = configService.getSetting(
-					MappingSettings.USE_NATIONALIZED_CHARACTER_DATA,
-					BOOLEAN,
-					false
-			);
-
-			schemaCharset = configService.getSetting(
-					SchemaToolingSettings.HBM2DDL_CHARSET_NAME,
-					STRING,
-					null
+		private AccessType getDefaultCacheAccessType(ConfigurationService configService) {
+			final var regionFactory = serviceRegistry.getService( RegionFactory.class );
+			return configService.getSetting(
+					DEFAULT_CACHE_CONCURRENCY_STRATEGY,
+					value -> {
+						if ( value == null ) {
+							return null;
+						}
+						else if ( value instanceof CacheConcurrencyStrategy cacheConcurrencyStrategy ) {
+							return cacheConcurrencyStrategy.toAccessType();
+						}
+						else if ( value instanceof AccessType accessType ) {
+							return accessType;
+						}
+						else {
+							return AccessType.fromExternalName( value.toString() );
+						}
+					},
+					// by default, see if the defined RegionFactory (if one) defines a default
+					regionFactory == null ? null : regionFactory.getDefaultAccessType()
 			);
+		}
 
-			allowExtensionsInCdi = configService.getSetting(
-					ManagedBeanSettings.ALLOW_EXTENSIONS_IN_CDI,
-					BOOLEAN,
-					false
+		private static SharedCacheMode getSharedCacheMode(ConfigurationService configService) {
+			return configService.getSetting(
+					JAKARTA_SHARED_CACHE_MODE,
+					value -> value instanceof SharedCacheMode cacheMode
+							? cacheMode
+							: SharedCacheMode.valueOf( value.toString() ),
+					configService.getSetting(
+							JPA_SHARED_CACHE_MODE,
+							value -> {
+								if ( value == null ) {
+									return null;
+								}
+								DEPRECATION_LOGGER.deprecatedSetting(
+										JPA_SHARED_CACHE_MODE,
+										JAKARTA_SHARED_CACHE_MODE
+								);
+								return value instanceof SharedCacheMode cacheMode
+										? cacheMode
+										: SharedCacheMode.valueOf( value.toString() );
+							},
+							SharedCacheMode.UNSPECIFIED
+					)
 			);
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingContextRootImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingContextRootImpl.java
index 9f7d33f01b0c..400362b9dc28 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingContextRootImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingContextRootImpl.java
@@ -4,11 +4,14 @@
  */
 package org.hibernate.boot.internal;
 
+import org.hibernate.boot.model.internal.TemporalHelper;
 import org.hibernate.boot.model.naming.ObjectNameNormalizer;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.engine.config.spi.ConfigurationService;
 
 /**
  * Root {@link MetadataBuildingContext}.
@@ -21,6 +24,7 @@ public class MetadataBuildingContextRootImpl implements MetadataBuildingContext
 	private final InFlightMetadataCollector metadataCollector;
 	private final ObjectNameNormalizer objectNameNormalizer;
 	private final TypeDefinitionRegistryStandardImpl typeDefinitionRegistry;
+	private final TemporalTableStrategy temporalTableStrategy;
 
 	public MetadataBuildingContextRootImpl(
 			String contributor,
@@ -35,6 +39,15 @@ public MetadataBuildingContextRootImpl(
 		this.metadataCollector = metadataCollector;
 		this.objectNameNormalizer = new ObjectNameNormalizer(this);
 		this.typeDefinitionRegistry = new TypeDefinitionRegistryStandardImpl();
+		this.temporalTableStrategy = temporalTableStrategy( bootstrapContext );
+	}
+
+	private TemporalTableStrategy temporalTableStrategy(BootstrapContext bootstrapContext) {
+		final var settings =
+				bootstrapContext.getServiceRegistry()
+						.requireService( ConfigurationService.class )
+						.getSettings();
+		return TemporalHelper.determineTemporalTableStrategy( settings );
 	}
 
 	@Override
@@ -71,4 +84,17 @@ public TypeDefinitionRegistryStandardImpl getTypeDefinitionRegistry() {
 	public String getCurrentContributorName() {
 		return contributor;
 	}
+
+	@Override
+	public TemporalTableStrategy getTemporalTableStrategy() {
+		final var dialect = getMetadataCollector().getDatabase().getDialect();
+		return switch ( temporalTableStrategy ) {
+			case AUTO -> dialect.getTemporalTableSupport().getDefaultTemporalTableStrategy();
+			case SINGLE_TABLE, HISTORY_TABLE -> temporalTableStrategy;
+			case NATIVE ->
+					dialect.getTemporalTableSupport().supportsNativeTemporalTables()
+							? TemporalTableStrategy.NATIVE
+							: TemporalTableStrategy.HISTORY_TABLE;
+		};
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java
index 22389a3b558a..ec02695b70aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java
@@ -501,13 +501,13 @@ private <T> void appendListeners(
 			EventType<T> eventType) {
 		final var eventListenerGroup = eventListenerRegistry.getEventListenerGroup( eventType );
 		for ( String listenerImpl : splitAtCommas( listeners ) ) {
-			@SuppressWarnings("unchecked")
-			T listener = (T) instantiate( listenerImpl, classLoaderService );
-			if ( !eventType.baseListenerInterface().isInstance( listener ) ) {
+			final var listener = instantiate( listenerImpl, classLoaderService );
+			final var baseListenerInterface = eventType.baseListenerInterface();
+			if ( !baseListenerInterface.isInstance( listener ) ) {
 				throw new HibernateException( "Event listener '" + listenerImpl
-						+ "' must implement '" + eventType.baseListenerInterface().getName() + "'");
+						+ "' must implement '" + baseListenerInterface.getName() + "'");
 			}
-			eventListenerGroup.appendListener( listener );
+			eventListenerGroup.appendListener( baseListenerInterface.cast( listener ) );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java
index 8cc3c7e380c6..a0eb40699f28 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java
@@ -20,7 +20,6 @@
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.procedure.internal.NamedCallableQueryMementoImpl;
-import org.hibernate.procedure.internal.Util;
 import org.hibernate.procedure.spi.NamedCallableQueryMemento;
 import org.hibernate.procedure.spi.ParameterStrategy;
 import org.hibernate.query.results.ResultSetMapping;
@@ -29,6 +28,8 @@
 import jakarta.persistence.ParameterMode;
 import jakarta.persistence.StoredProcedureParameter;
 
+import static org.hibernate.procedure.internal.Util.resolveResultSetMappingClasses;
+import static org.hibernate.procedure.internal.Util.resolveResultSetMappingNames;
 import static org.hibernate.procedure.spi.NamedCallableQueryMemento.ParameterMemento;
 
 /**
@@ -96,7 +97,7 @@ public NamedCallableQueryMemento resolve(SessionFactoryImplementor sessionFactor
 		final ResultSetMapping resultSetMapping = buildResultSetMapping( registeredName, sessionFactory );
 
 		if ( specifiesResultClasses ) {
-			Util.resolveResultSetMappingClasses(
+			resolveResultSetMappingClasses(
 					resultClasses,
 					resultSetMapping,
 					collectedQuerySpaces::add,
@@ -104,7 +105,7 @@ public NamedCallableQueryMemento resolve(SessionFactoryImplementor sessionFactor
 			);
 		}
 		else if ( specifiesResultSetMappings ) {
-			Util.resolveResultSetMappingNames(
+			resolveResultSetMappingNames(
 					resultSetMappings,
 					resultSetMapping,
 					collectedQuerySpaces::add,
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java
index b187819a79a3..1058bf2be098 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java
@@ -21,7 +21,9 @@
 import org.hibernate.bytecode.internal.SessionFactoryObserverForBytecodeEnhancer;
 import org.hibernate.bytecode.spi.BytecodeProvider;
 import org.hibernate.cache.spi.TimestampsCacheFactory;
+import org.hibernate.temporal.TemporalTableStrategy;
 import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
+import org.hibernate.context.spi.TenantCredentialsMapper;
 import org.hibernate.context.spi.TenantSchemaMapper;
 import org.hibernate.proxy.EntityNotFoundDelegate;
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
@@ -259,6 +261,12 @@ public SessionFactoryBuilder applyTenantSchemaMapper(TenantSchemaMapper<?> mappe
 		return this;
 	}
 
+	@Override
+	public SessionFactoryBuilder applyTenantCredentialsMapper(TenantCredentialsMapper<?> mapper) {
+		optionsBuilder.applyTenantCredentialsMapper( mapper );
+		return this;
+	}
+
 	@Override
 	public SessionFactoryBuilder applyNamedQueryCheckingOnStartup(boolean enabled) {
 		optionsBuilder.enableNamedQueryCheckingOnStartup( enabled );
@@ -373,6 +381,12 @@ public SessionFactoryBuilder applyCollectionsInDefaultFetchGroup(boolean enabled
 		return this;
 	}
 
+	@Override
+	public SessionFactoryBuilder applyTemporalTableStrategy(TemporalTableStrategy strategy) {
+		optionsBuilder.applyTemporalTableStrategy( strategy );
+		return this;
+	}
+
 	@Override
 	public SessionFactoryBuilder allowOutOfTransactionUpdateOperations(boolean allow) {
 		optionsBuilder.allowOutOfTransactionUpdateOperations( allow );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
index 7a54f65f4167..c6800b2f28cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
@@ -24,12 +24,17 @@
 import org.hibernate.CustomEntityDirtinessStrategy;
 import org.hibernate.EntityNameResolver;
 import org.hibernate.FlushMode;
+import org.hibernate.GraphParserMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
 import org.hibernate.LockOptions;
 import org.hibernate.SessionEventListener;
 import org.hibernate.SessionFactoryObserver;
+import org.hibernate.boot.model.internal.TemporalHelper;
+import org.hibernate.temporal.TemporalTableStrategy;
 import org.hibernate.context.spi.MultiTenancy;
+import org.hibernate.cfg.GraphParserSettings;
+import org.hibernate.context.spi.TenantCredentialsMapper;
 import org.hibernate.context.spi.TenantSchemaMapper;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
@@ -79,7 +84,6 @@
 import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
 import org.hibernate.type.format.FormatMapper;
 import org.hibernate.type.format.FormatMapperCreationContext;
-import org.hibernate.type.format.jaxb.JaxbXmlFormatMapper;
 
 import jakarta.persistence.criteria.Nulls;
 
@@ -101,11 +105,14 @@
 import static org.hibernate.jpa.internal.util.CacheModeHelper.interpretCacheMode;
 import static org.hibernate.jpa.internal.util.ConfigurationHelper.getFlushMode;
 import static org.hibernate.stat.Statistics.DEFAULT_QUERY_STATISTICS_MAX_SIZE;
+import static org.hibernate.type.format.jackson.JacksonIntegration.getJsonJackson3FormatMapperOrNull;
 import static org.hibernate.type.format.jackson.JacksonIntegration.getJsonJacksonFormatMapperOrNull;
 import static org.hibernate.type.format.jackson.JacksonIntegration.getOsonJacksonFormatMapperOrNull;
+import static org.hibernate.type.format.jackson.JacksonIntegration.getXMLJackson3FormatMapperOrNull;
 import static org.hibernate.type.format.jackson.JacksonIntegration.getXMLJacksonFormatMapperOrNull;
-import static org.hibernate.type.format.jackson.JacksonIntegration.isJacksonOsonExtensionAvailable;
 import static org.hibernate.type.format.jakartajson.JakartaJsonIntegration.getJakartaJsonBFormatMapperOrNull;
+import static org.hibernate.type.format.jaxb.JaxbIntegration.getJaxbLegacyXmlFormatMapperOrNull;
+import static org.hibernate.type.format.jaxb.JaxbIntegration.getJaxbXmlFormatMapperOrNull;
 
 /**
  * In-flight state of {@link SessionFactoryOptions} during {@link org.hibernate.boot.SessionFactoryBuilder}
@@ -158,6 +165,7 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
 	private boolean identifierRollbackEnabled;
 	private boolean checkNullability;
 	private boolean initializeLazyStateOutsideTransactions;
+	private TemporalTableStrategy temporalTableStrategy;
 	private int defaultBatchFetchSize;
 	private Integer maximumFetchDepth;
 	private boolean subselectFetchEnabled;
@@ -176,6 +184,7 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
 	private boolean multiTenancyEnabled;
 	private CurrentTenantIdentifierResolver<Object> currentTenantIdentifierResolver;
 	private TenantSchemaMapper<Object> tenantSchemaMapper;
+	private TenantCredentialsMapper<Object> tenantCredentialsMapper;
 
 	// Queries
 	private SqmFunctionRegistry sqmFunctionRegistry;
@@ -260,6 +269,9 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
 	private boolean delayBatchFetchLoaderCreations;
 	@Deprecated(forRemoval = true)
 	private boolean releaseResourcesOnCloseEnabled;
+	@Deprecated(forRemoval = true)
+	private final GraphParserMode graphParserMode;
+
 
 	public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, BootstrapContext context) {
 		this.serviceRegistry = serviceRegistry;
@@ -274,7 +286,7 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
 
 		final var dialect = jdbcServices.getJdbcEnvironment().getDialect();
 
-		final Map<String,Object> settings = new HashMap<>();
+		final Map<String, Object> settings = new HashMap<>();
 		settings.putAll( map( dialect.getDefaultProperties() ) );
 		settings.putAll( configurationService.getSettings() );
 
@@ -283,8 +295,10 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
 				() -> {
 					final Object value = settings.get( CDI_BEAN_MANAGER );
 					if ( value != null ) {
-						DEPRECATION_LOGGER.deprecatedSetting( CDI_BEAN_MANAGER,
-								JAKARTA_CDI_BEAN_MANAGER );
+						DEPRECATION_LOGGER.deprecatedSetting(
+								CDI_BEAN_MANAGER,
+								JAKARTA_CDI_BEAN_MANAGER
+						);
 					}
 					return value;
 				}
@@ -303,7 +317,7 @@ public BootstrapContext getBootstrapContext() {
 		};
 		jsonFormatMapper = jsonFormatMapper(
 				settings.get( JSON_FORMAT_MAPPER ),
-				!getBoolean( ORACLE_OSON_DISABLED, settings),
+				!getBoolean( ORACLE_OSON_DISABLED, settings ),
 				strategySelector,
 				formatMapperCreationContext
 		);
@@ -335,17 +349,21 @@ public BootstrapContext getBootstrapContext() {
 		statelessInterceptorSupplier = determineStatelessInterceptor( settings, strategySelector );
 
 		statementInspector =
-				strategySelector.resolveStrategy( StatementInspector.class,
-						settings.get( STATEMENT_INSPECTOR ) );
+				strategySelector.resolveStrategy(
+						StatementInspector.class,
+						settings.get( STATEMENT_INSPECTOR )
+				);
 
 
 		baselineSessionEventsListenerBuilder =
 				new BaselineSessionEventsListenerBuilder( getAutoSessionEventsListener( settings, strategySelector ) );
 
 		customEntityDirtinessStrategy =
-				strategySelector.resolveDefaultableStrategy( CustomEntityDirtinessStrategy.class,
+				strategySelector.resolveDefaultableStrategy(
+						CustomEntityDirtinessStrategy.class,
 						settings.get( CUSTOM_ENTITY_DIRTINESS_STRATEGY ),
-						DefaultCustomEntityDirtinessStrategy.INSTANCE );
+						DefaultCustomEntityDirtinessStrategy.INSTANCE
+				);
 
 		entityNotFoundDelegate = StandardEntityNotFoundDelegate.INSTANCE;
 
@@ -356,9 +374,15 @@ public BootstrapContext getBootstrapContext() {
 		initializeLazyStateOutsideTransactions =
 				configurationService.getSetting( ENABLE_LAZY_LOAD_NO_TRANS, BOOLEAN, false );
 
+		temporalTableStrategy = TemporalHelper.determineTemporalTableStrategy( settings );
+		if ( temporalTableStrategy == TemporalTableStrategy.AUTO ) {
+			temporalTableStrategy = dialect.getTemporalTableSupport().getDefaultTemporalTableStrategy();
+		}
+
 		multiTenancyEnabled = MultiTenancy.isMultiTenancyEnabled( serviceRegistry );
 		currentTenantIdentifierResolver = MultiTenancy.getTenantIdentifierResolver( settings, serviceRegistry );
 		tenantSchemaMapper = MultiTenancy.getTenantSchemaMapper( settings, serviceRegistry );
+		tenantCredentialsMapper = MultiTenancy.getTenantCredentialsMapper( settings, serviceRegistry );
 
 		delayBatchFetchLoaderCreations =
 				configurationService.getSetting( DELAY_ENTITY_LOADER_CREATIONS, BOOLEAN, true );
@@ -421,15 +445,22 @@ public BootstrapContext getBootstrapContext() {
 					configurationService.getSetting( USE_QUERY_CACHE, BOOLEAN, false );
 			cacheRegionPrefix = extractPropertyValue( CACHE_REGION_PREFIX, settings );
 			queryCacheLayout =
-					configurationService.getSetting( QUERY_CACHE_LAYOUT,
+					configurationService.getSetting(
+							QUERY_CACHE_LAYOUT,
 							value -> CacheLayout.valueOf( value.toString().toUpperCase( Locale.ROOT ) ),
-							CacheLayout.FULL );
+							CacheLayout.FULL
+					);
 			timestampsCacheFactory =
-					strategySelector.resolveDefaultableStrategy( TimestampsCacheFactory.class,
-							settings.get( QUERY_CACHE_FACTORY ), StandardTimestampsCacheFactory.INSTANCE );
+					strategySelector.resolveDefaultableStrategy(
+							TimestampsCacheFactory.class,
+							settings.get( QUERY_CACHE_FACTORY ), StandardTimestampsCacheFactory.INSTANCE
+					);
 			minimalPutsEnabled =
-					configurationService.getSetting( USE_MINIMAL_PUTS, BOOLEAN,
-							regionFactory.isMinimalPutsEnabledByDefault() );
+					configurationService.getSetting(
+							USE_MINIMAL_PUTS,
+							BOOLEAN,
+							regionFactory.isMinimalPutsEnabledByDefault()
+					);
 			structuredCacheEntriesEnabled =
 					configurationService.getSetting( USE_STRUCTURED_CACHE, BOOLEAN, false );
 			directReferenceCacheEntriesEnabled =
@@ -479,12 +510,12 @@ public BootstrapContext getBootstrapContext() {
 
 		commentsEnabled = getBoolean( USE_SQL_COMMENTS, settings );
 
-		preferUserTransaction = getBoolean( PREFER_USER_TRANSACTION, settings  );
+		preferUserTransaction = getBoolean( PREFER_USER_TRANSACTION, settings );
 
 		allowOutOfTransactionUpdateOperations = getBoolean( ALLOW_UPDATE_OUTSIDE_TRANSACTION, settings );
 
 		releaseResourcesOnCloseEnabled = getBoolean( DISCARD_PC_ON_CLOSE, settings );
-		if ( releaseResourcesOnCloseEnabled) {
+		if ( releaseResourcesOnCloseEnabled ) {
 			DEPRECATION_LOGGER.deprecatedSetting( DISCARD_PC_ON_CLOSE );
 		}
 
@@ -533,6 +564,14 @@ public BootstrapContext getBootstrapContext() {
 
 		defaultLockOptions = defaultLockOptions( defaultSessionProperties );
 		initialSessionFlushMode = defaultFlushMode( defaultSessionProperties );
+
+		var graphParserModeSetting = settings.get( GraphParserSettings.GRAPH_PARSER_MODE );
+
+		if ( graphParserModeSetting != null ) {
+			DEPRECATION_LOGGER.deprecatedSetting( GraphParserSettings.GRAPH_PARSER_MODE );
+		}
+
+		graphParserMode = GraphParserMode.interpret( graphParserModeSetting );
 	}
 
 	@Deprecated(forRemoval = true)
@@ -578,14 +617,16 @@ else if ( defaultNullPrecedence instanceof String string ) {
 		}
 		else if ( defaultNullPrecedence != null ) {
 			throw new IllegalArgumentException( "Configuration property " + DEFAULT_NULL_ORDERING
-					+ " value [" + defaultNullPrecedence + "] is not supported" );
+												+ " value [" + defaultNullPrecedence + "] is not supported" );
 		}
 		else {
 			return null;
 		}
 	}
 
-	private static Class<? extends SessionEventListener> getAutoSessionEventsListener(Map<String, Object> configurationSettings, StrategySelector strategySelector) {
+	private static Class<? extends SessionEventListener> getAutoSessionEventsListener(
+			Map<String, Object> configurationSettings,
+			StrategySelector strategySelector) {
 		// todo : expose this from builder?
 		final String name = (String) configurationSettings.get( AUTO_SESSION_EVENTS_LISTENER );
 		return name == null ? null : strategySelector.selectStrategyImplementor( SessionEventListener.class, name );
@@ -730,7 +771,7 @@ else if ( emptyConstructor != null ) {
 						catch (Exception e) {
 							throw new StrategySelectionException(
 									"Could not instantiate named strategy class [" +
-											strategyClass.getName() + "]",
+									strategyClass.getName() + "]",
 									e
 							);
 						}
@@ -791,7 +832,7 @@ private SqmTranslatorFactory resolveSqmTranslator(
 	}
 
 	private static Interceptor determineInterceptor(
-			Map<String,Object> configurationSettings,
+			Map<String, Object> configurationSettings,
 			StrategySelector strategySelector) {
 		return strategySelector.resolveStrategy(
 				Interceptor.class,
@@ -801,7 +842,7 @@ private static Interceptor determineInterceptor(
 
 	@SuppressWarnings("unchecked")
 	private static Supplier<? extends Interceptor> determineStatelessInterceptor(
-			Map<String,Object> configurationSettings,
+			Map<String, Object> configurationSettings,
 			StrategySelector strategySelector) {
 		final Object setting = configurationSettings.get( SESSION_SCOPED_INTERCEPTOR );
 		if ( setting == null ) {
@@ -823,20 +864,23 @@ else if ( setting instanceof Class ) {
 		}
 	}
 
-
 	private static Supplier<? extends Interceptor> interceptorSupplier(Class<? extends Interceptor> clazz) {
 		return () -> {
 			try {
 				return clazz.newInstance();
 			}
 			catch (InstantiationException | IllegalAccessException e) {
-				throw new org.hibernate.InstantiationException( "Could not instantiate session-scoped Interceptor", clazz, e );
+				throw new org.hibernate.InstantiationException(
+						"Could not instantiate session-scoped Interceptor",
+						clazz,
+						e
+				);
 			}
 		};
 	}
 
 	private PhysicalConnectionHandlingMode interpretConnectionHandlingMode(
-			Map<String,Object> configurationSettings,
+			Map<String, Object> configurationSettings,
 			StandardServiceRegistry serviceRegistry) {
 		final var specifiedHandlingMode =
 				PhysicalConnectionHandlingMode.interpret( configurationSettings.get( CONNECTION_HANDLING ) );
@@ -846,19 +890,33 @@ private PhysicalConnectionHandlingMode interpretConnectionHandlingMode(
 						.getDefaultConnectionHandlingMode();
 	}
 
-	private static FormatMapper jsonFormatMapper(Object setting, boolean osonExtensionEnabled, StrategySelector selector, FormatMapperCreationContext creationContext) {
+	private static FormatMapper jsonFormatMapper(
+			Object setting,
+			boolean osonExtensionEnabled,
+			StrategySelector selector, FormatMapperCreationContext creationContext) {
 		return formatMapper(
 				setting,
 				selector,
 				() -> {
 					// Prefer the OSON Jackson FormatMapper by default if available
-					final FormatMapper jsonJacksonFormatMapper =
-							osonExtensionEnabled && isJacksonOsonExtensionAvailable()
-									? getOsonJacksonFormatMapperOrNull( creationContext )
-									: getJsonJacksonFormatMapperOrNull( creationContext );
-					return jsonJacksonFormatMapper != null
-							? jsonJacksonFormatMapper
-							: getJakartaJsonBFormatMapperOrNull();
+					final var jacksonOsonFormatMapper = osonExtensionEnabled
+							? getOsonJacksonFormatMapperOrNull( creationContext )
+							: null;
+					if ( jacksonOsonFormatMapper != null ) {
+						return jacksonOsonFormatMapper;
+					}
+
+					final var jacksonFormatMapper = getJsonJacksonFormatMapperOrNull( creationContext );
+					if ( jacksonFormatMapper != null ) {
+						return jacksonFormatMapper;
+					}
+
+					final var jackson3FormatMapper = getJsonJackson3FormatMapperOrNull( creationContext );
+					if ( jackson3FormatMapper != null ) {
+						return jackson3FormatMapper;
+					}
+
+					return getJakartaJsonBFormatMapperOrNull();
 				},
 				creationContext
 		);
@@ -869,21 +927,32 @@ private static FormatMapper xmlFormatMapper(Object setting, StrategySelector sel
 				setting,
 				selector,
 				() -> {
-					final FormatMapper jacksonFormatMapper = getXMLJacksonFormatMapperOrNull( creationContext );
-					return jacksonFormatMapper != null
-							? jacksonFormatMapper
-							: new JaxbXmlFormatMapper( legacyFormat );
+					final var jacksonFormatMapper = getXMLJacksonFormatMapperOrNull( creationContext );
+					if ( jacksonFormatMapper != null ) {
+						return jacksonFormatMapper;
+					}
+
+					final var jackson3FormatMapper = getXMLJackson3FormatMapperOrNull( creationContext );
+					if ( jackson3FormatMapper != null ) {
+						return jackson3FormatMapper;
+					}
+
+					return legacyFormat
+							? getJaxbLegacyXmlFormatMapperOrNull()
+							: getJaxbXmlFormatMapperOrNull();
 				},
 				creationContext
 		);
 	}
 
-	private static FormatMapper formatMapper(Object setting, StrategySelector selector, Callable<FormatMapper> defaultResolver, FormatMapperCreationContext creationContext) {
+	private static FormatMapper formatMapper(
+			Object setting,
+			StrategySelector selector,
+			Callable<FormatMapper> defaultResolver, FormatMapperCreationContext creationContext) {
 		return selector.resolveStrategy( FormatMapper.class, setting, defaultResolver, strategyClass -> {
 			try {
-				final Constructor<? extends FormatMapper> creationContextConstructor =
-						strategyClass.getDeclaredConstructor( FormatMapperCreationContext.class );
-				return creationContextConstructor.newInstance( creationContext );
+				return strategyClass.getDeclaredConstructor( FormatMapperCreationContext.class )
+						.newInstance( creationContext );
 			}
 			catch (NoSuchMethodException e) {
 				// Ignore
@@ -1007,15 +1076,19 @@ public SqmMultiTableInsertStrategy getCustomSqmMultiTableInsertStrategy() {
 	}
 
 	@Override
-	public SqmMultiTableMutationStrategy resolveCustomSqmMultiTableMutationStrategy(EntityMappingType rootEntityDescriptor, RuntimeModelCreationContext creationContext) {
+	public SqmMultiTableMutationStrategy resolveCustomSqmMultiTableMutationStrategy(
+			EntityMappingType rootEntityDescriptor,
+			RuntimeModelCreationContext creationContext) {
 		if ( sqmMultiTableMutationStrategyConstructor != null ) {
 			try {
 				return sqmMultiTableMutationStrategyConstructor.newInstance( rootEntityDescriptor, creationContext );
 			}
 			catch (Exception e) {
 				throw new StrategySelectionException(
-						String.format( "Could not instantiate named strategy class [%s]",
-								sqmMultiTableMutationStrategyConstructor.getDeclaringClass().getName() ),
+						String.format(
+								"Could not instantiate named strategy class [%s]",
+								sqmMultiTableMutationStrategyConstructor.getDeclaringClass().getName()
+						),
 						e
 				);
 			}
@@ -1024,15 +1097,19 @@ public SqmMultiTableMutationStrategy resolveCustomSqmMultiTableMutationStrategy(
 	}
 
 	@Override
-	public SqmMultiTableInsertStrategy resolveCustomSqmMultiTableInsertStrategy(EntityMappingType rootEntityDescriptor, RuntimeModelCreationContext creationContext) {
+	public SqmMultiTableInsertStrategy resolveCustomSqmMultiTableInsertStrategy(
+			EntityMappingType rootEntityDescriptor,
+			RuntimeModelCreationContext creationContext) {
 		if ( sqmMultiTableInsertStrategyConstructor != null ) {
 			try {
 				return sqmMultiTableInsertStrategyConstructor.newInstance( rootEntityDescriptor, creationContext );
 			}
 			catch (Exception e) {
 				throw new StrategySelectionException(
-						String.format( "Could not instantiate named strategy class [%s]",
-								sqmMultiTableInsertStrategyConstructor.getDeclaringClass().getName() ),
+						String.format(
+								"Could not instantiate named strategy class [%s]",
+								sqmMultiTableInsertStrategyConstructor.getDeclaringClass().getName()
+						),
 						e
 				);
 			}
@@ -1057,7 +1134,7 @@ public StatementInspector getStatementInspector() {
 
 	@Override
 	public SessionFactoryObserver[] getSessionFactoryObservers() {
-		return sessionFactoryObserverList.toArray(new SessionFactoryObserver[0]);
+		return sessionFactoryObserverList.toArray( new SessionFactoryObserver[0] );
 	}
 
 	@Override
@@ -1080,12 +1157,18 @@ public boolean isInitializeLazyStateOutsideTransactionsEnabled() {
 		return initializeLazyStateOutsideTransactions;
 	}
 
+	@Override
+	public TemporalTableStrategy getTemporalTableStrategy() {
+		return temporalTableStrategy;
+	}
+
 	@Override @Deprecated
 	public TempTableDdlTransactionHandling getTempTableDdlTransactionHandling() {
 		return tempTableDdlTransactionHandling;
 	}
 
-	@Override @Deprecated(forRemoval = true)
+	@Override
+	@Deprecated(forRemoval = true)
 	public boolean isDelayBatchFetchLoaderCreationsEnabled() {
 		return delayBatchFetchLoaderCreations;
 	}
@@ -1130,6 +1213,11 @@ public TenantSchemaMapper<Object> getTenantSchemaMapper() {
 		return tenantSchemaMapper;
 	}
 
+	@Override
+	public TenantCredentialsMapper<Object> getTenantCredentialsMapper() {
+		return tenantCredentialsMapper;
+	}
+
 	@Override
 	public CurrentTenantIdentifierResolver<Object> getCurrentTenantIdentifierResolver() {
 		return currentTenantIdentifierResolver;
@@ -1190,7 +1278,8 @@ public boolean isAutoEvictCollectionCache() {
 		return autoEvictCollectionCache;
 	}
 
-	@Override @Deprecated
+	@Override
+	@Deprecated
 	public SchemaAutoTooling getSchemaAutoTooling() {
 		return schemaAutoTooling;
 	}
@@ -1242,7 +1331,7 @@ public CustomEntityDirtinessStrategy getCustomEntityDirtinessStrategy() {
 
 	@Override
 	public EntityNameResolver[] getEntityNameResolvers() {
-		return entityNameResolvers.toArray(new EntityNameResolver[0]);
+		return entityNameResolvers.toArray( new EntityNameResolver[0] );
 	}
 
 	@Override
@@ -1497,8 +1586,10 @@ public void applyStatelessInterceptor(Class<? extends Interceptor> statelessInte
 						return statelessInterceptorClass.newInstance();
 					}
 					catch (InstantiationException | IllegalAccessException e) {
-						throw new HibernateException( "Could not supply stateless Interceptor of class '"
-								+ statelessInterceptorClass.getName() + "'", e );
+						throw new HibernateException(
+								"Could not supply stateless Interceptor of class '"
+								+ statelessInterceptorClass.getName() + "'", e
+						);
 					}
 				}
 		);
@@ -1540,6 +1631,10 @@ public void allowLazyInitializationOutsideTransaction(boolean enabled) {
 		this.initializeLazyStateOutsideTransactions = enabled;
 	}
 
+	public void applyTemporalTableStrategy(TemporalTableStrategy strategy) {
+		this.temporalTableStrategy = strategy;
+	}
+
 	@Deprecated(forRemoval = true)
 	public void applyTempTableDdlTransactionHandling(TempTableDdlTransactionHandling handling) {
 		this.tempTableDdlTransactionHandling = handling;
@@ -1587,12 +1682,17 @@ public void applyTenantSchemaMapper(TenantSchemaMapper<?> mapper) {
 		this.tenantSchemaMapper = (TenantSchemaMapper<Object>) mapper;
 	}
 
+	public void applyTenantCredentialsMapper(TenantCredentialsMapper<?> mapper) {
+		//noinspection unchecked
+		this.tenantCredentialsMapper = (TenantCredentialsMapper<Object>) mapper;
+	}
+
 	public void enableNamedQueryCheckingOnStartup(boolean enabled) {
 		this.namedQueryStartupCheckingEnabled = enabled;
 	}
 
 	public void enableSecondLevelCacheSupport(boolean enabled) {
-		this.secondLevelCacheEnabled =  enabled;
+		this.secondLevelCacheEnabled = enabled;
 	}
 
 	public void enableQueryCacheSupport(boolean enabled) {
@@ -1782,8 +1882,13 @@ public Map<String, Object> getDefaultSessionProperties() {
 		return defaultSessionProperties;
 	}
 
+	@Override
+	public GraphParserMode getGraphParserMode() {
+		return graphParserMode;
+	}
+
 	private Map<String, Object> initializeDefaultSessionProperties(ConfigurationService configurationService) {
-		final HashMap<String,Object> settings = new HashMap<>();
+		final HashMap<String, Object> settings = new HashMap<>();
 
 		//Static defaults:
 		settings.putIfAbsent( HibernateHints.HINT_FLUSH_MODE, FlushMode.AUTO );
@@ -1821,4 +1926,5 @@ private Map<String, Object> initializeDefaultSessionProperties(ConfigurationServ
 		}
 		return unmodifiableMap( settings );
 	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/Target.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/Target.java
index 3e787a31d546..6f9661536954 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/Target.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/Target.java
@@ -17,7 +17,7 @@
  * Can also be useful for {@linkplain org.hibernate.annotations.Any any} and
  * {@linkplain org.hibernate.annotations.ManyToAny many-to-any} attributes to
  * specify a base type.
- * <p/>
+ * <p>
  * Other attribute classifications have spec-defined ways to specify the target<ul>
  *     <li>{@linkplain jakarta.persistence.ManyToOne#targetEntity()}</li>
  *     <li>{@linkplain jakarta.persistence.OneToOne#targetEntity()}</li>
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java
index 8426c4f9b8b6..e2326b1a0e22 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/JaxbLogger.java
@@ -19,7 +19,9 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -38,7 +40,7 @@
 @Internal
 public interface JaxbLogger extends BasicLogger {
 	String LOGGER_NAME = BootLogging.NAME + ".jaxb";
-	JaxbLogger JAXB_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JaxbLogger.class, LOGGER_NAME );
+	JaxbLogger JAXB_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JaxbLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage(level = DEBUG)
 	@Message(id = 90005501, value = "Unable to close StAX reader")
@@ -112,4 +114,16 @@ public interface JaxbLogger extends BasicLogger {
 	@LogMessage(level = TRACE)
 	@Message(id = 90005518, value = "Resolved [%s] on classpath")
 	void resolvedOnClasspath(String systemID);
+
+	@LogMessage(level = TRACE)
+	@Message(id = 90005519, value = "Reading mappings from InputStream access")
+	void readingMappingsFromInputStreamAccess();
+
+	@LogMessage(level = TRACE)
+	@Message(id = 90005520, value = "Reading mappings from InputStream")
+	void readingMappingsFromInputStream();
+
+	@LogMessage(level = TRACE)
+	@Message(id = 90005521, value = "Unable to close InputStream")
+	void unableToCloseInputStream(@Cause IOException ioe);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/Origin.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/Origin.java
index bf100f28bf56..a7ba0bcc3a2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/Origin.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/Origin.java
@@ -15,7 +15,7 @@
  * @author Steve Ebersole
  */
 public class Origin implements Serializable {
-	public static final String UNKNOWN_FILE_PATH = "<unknown>";
+	// cannot be a record class because it is extended in Gradle plugin
 
 	private final SourceType type;
 	private final String name;
@@ -45,15 +45,17 @@ public String getName() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( !(o instanceof Origin other) ) {
+		else if ( !(object instanceof Origin that) ) {
 			return false;
 		}
-		return type == other.type
-			&& Objects.equals( name, other.name );
+		else {
+			return this.type == that.type
+				&& Objects.equals( this.name, that.name );
+		}
 
 	}
 
@@ -64,6 +66,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		return String.format( Locale.ENGLISH, "Origin(name=%s,type=%s)", name, type );
+		return String.format( Locale.ENGLISH,
+				"Origin(name=%s,type=%s)", name, type );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmXmlTransformer.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmXmlTransformer.java
index 559b94e6a50e..f656154d4aed 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmXmlTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/HbmXmlTransformer.java
@@ -166,6 +166,10 @@
 import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.Value;
+import org.hibernate.property.access.internal.PropertyAccessStrategyEmbeddedImpl;
+import org.hibernate.property.access.internal.PropertyAccessStrategyMapImpl;
+import org.hibernate.property.access.internal.PropertyAccessStrategyMixedImpl;
+import org.hibernate.property.access.internal.PropertyAccessStrategyNoopImpl;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.ConvertedBasicType;
 import org.hibernate.type.CustomType;
@@ -713,7 +717,7 @@ private void transferImports() {
 		if ( !hbmImports.isEmpty() ) {
 			final var ormRoot = mappingXmlBinding.getRoot();
 			for ( var hbmImport : hbmImports ) {
-				final JaxbHqlImportImpl ormImport = new JaxbHqlImportImpl();
+				final var ormImport = new JaxbHqlImportImpl();
 				ormRoot.getHqlImports().add( ormImport );
 				ormImport.setClazz( hbmImport.getClazz() );
 				ormImport.setRename( hbmImport.getRename() );
@@ -890,7 +894,8 @@ private static JaxbNamedHqlQueryImpl transformNamedQuery(JaxbHbmNamedQueryType h
 				query.setQuery( qryString );
 			}
 			else {
-				@SuppressWarnings("unchecked") final var element = (JAXBElement<JaxbHbmQueryParamType>) content;
+				@SuppressWarnings("unchecked")
+				final var element = (JAXBElement<JaxbHbmQueryParamType>) content;
 				final var hbmQueryParam = element.getValue();
 				final var queryParam = new JaxbQueryParamTypeImpl();
 				query.getQueryParam().add( queryParam );
@@ -1419,7 +1424,11 @@ private void transferBasicAttribute(
 		basic.setName( hbmProp.getName() );
 		basic.setOptional( propertyInfo.bootModelProperty().isOptional() );
 		basic.setFetch( FetchType.EAGER );
-		basic.setAttributeAccessor( hbmProp.getAccess() );
+		transferAccess(
+				hbmProp.getAccess() ,
+				basic::setAccess,
+				basic::setAttributeAccessor
+		);
 		basic.setOptimisticLock( hbmProp.isOptimisticLock() );
 
 		applyBasicTypeMapping(
@@ -1614,14 +1623,22 @@ private JaxbEmbeddedImpl transformEmbedded(
 			JaxbHbmCompositeAttributeType hbmComponent) {
 		final var embedded = new JaxbEmbeddedImpl();
 		embedded.setName( hbmComponent.getName() );
-		embedded.setAttributeAccessor( hbmComponent.getAccess() );
+		transferAccess(
+				hbmComponent.getAccess(),
+				embedded::setAccess,
+				embedded::setAttributeAccessor
+		);
 		embedded.setTarget( jaxbEmbeddable.getName() );
 		return embedded;
 	}
 
 	private void transferOneToOne(JaxbHbmOneToOneType hbmOneToOne, PropertyInfo propertyInfo, JaxbAttributesContainer attributes) {
 		final var oneToOne = new JaxbOneToOneImpl();
-		oneToOne.setAttributeAccessor( hbmOneToOne.getAccess() );
+		transferAccess(
+				hbmOneToOne.getAccess(),
+				oneToOne::setAccess,
+				oneToOne::setAttributeAccessor
+		);
 		oneToOne.setOptional( propertyInfo.bootModelProperty().isOptional() );
 		oneToOne.setCascade( convertCascadeType( hbmOneToOne.getCascade() ) );
 		oneToOne.setOrphanRemoval( isOrphanRemoval( hbmOneToOne.getCascade() ) );
@@ -1668,7 +1685,11 @@ private JaxbManyToOneImpl transformManyToOne(JaxbHbmManyToOneType hbmNode, Prope
 		}
 		transferFetchable( hbmNode.getLazy(), hbmNode.getFetch(), hbmNode.getOuterJoin(), null, jaxbManyToOne );
 
-		jaxbManyToOne.setAttributeAccessor( hbmNode.getAccess() );
+		transferAccess(
+				hbmNode.getAccess(),
+				jaxbManyToOne::setAccess,
+				jaxbManyToOne::setAttributeAccessor
+		);
 		jaxbManyToOne.setCascade( convertCascadeType( hbmNode.getCascade() ) );
 
 		if ( isNotEmpty( hbmNode.getPropertyRef() ) ) {
@@ -1722,7 +1743,11 @@ private JaxbAnyMappingImpl transformAnyAttribute(JaxbHbmAnyAssociationType sourc
 		final var target = new JaxbAnyMappingImpl();
 
 		target.setName( source.getName() );
-		target.setAttributeAccessor( source.getAccess() );
+		transferAccess(
+				source.getAccess(),
+				target::setAccess,
+				target::setAttributeAccessor
+		);
 		target.setOptimisticLock( source.isOptimisticLock() );
 		target.setOptional( propertyInfo.bootModelProperty().isOptional() );
 
@@ -1759,6 +1784,10 @@ private JaxbElementCollectionImpl transformElementCollection(
 			transferElementInfo( roleBase, source, source.getCompositeElement(), target );
 		}
 
+		if ( isNotEmpty( source.getWhere() ) ) {
+			target.setSqlRestriction( source.getWhere() );
+		}
+
 		return target;
 	}
 
@@ -1836,8 +1865,12 @@ public void addFormula(String formula) {
 
 	private void transferCollectionCommonInfo(PluralAttributeInfo source, JaxbPluralAttribute target) {
 		target.setName( source.getName() );
-		target.setAttributeAccessor( source.getAccess() );
-		target.setFetchMode( convert( source.getFetch() ) );
+		transferAccess(
+				source.getAccess(),
+				target::setAccess,
+				target::setAttributeAccessor
+		);
+		target.setFetchMode( convert( source.getFetch(), source.getOuterJoin() ) );
 		target.setFetch( convert( source.getLazy() ) );
 
 		if ( isNotEmpty( source.getCollectionType() ) ) {
@@ -1999,8 +2032,11 @@ private Boolean invert(Boolean value) {
 		return value == null ? null : !value;
 	}
 
-	private JaxbPluralFetchModeImpl convert(JaxbHbmFetchStyleWithSubselectEnum fetch) {
+	private JaxbPluralFetchModeImpl convert(JaxbHbmFetchStyleWithSubselectEnum fetch,JaxbHbmOuterJoinEnum outerJoin) {
 		if ( fetch == null ) {
+			if ( outerJoin == JaxbHbmOuterJoinEnum.TRUE ) {
+				return JaxbPluralFetchModeImpl.JOIN;
+			}
 			return null;
 		}
 		else {
@@ -2442,8 +2478,11 @@ public void addFormula(String formula) {
 			target.getFilters().add( convert( hbmFilter ) );
 		}
 
+		if ( isNotEmpty( manyToMany.getWhere() ) ) {
+			target.setSqlRestriction( manyToMany.getWhere() );
+		}
 		if ( isNotEmpty( hbmCollection.getWhere() ) ) {
-			target.setSqlRestriction( hbmCollection.getWhere() );
+			target.setSqlJoinTableRestriction( hbmCollection.getWhere() );
 		}
 		if ( hbmCollection.getSqlInsert() != null ) {
 			final var jaxbCustomSql = new JaxbCustomSqlImpl();
@@ -2519,7 +2558,11 @@ private void transferSimpleId(
 			Property identifierProperty,
 			BasicValue basicValue) {
 		target.setName( source.getName() );
-		target.setAttributeAccessor( source.getAccess() );
+		transferAccess(
+				source.getAccess(),
+				target::setAccess,
+				target::setAttributeAccessor
+		);
 
 		applyBasicTypeMapping( basicValue, target, source.getTypeAttribute(), source.getType(), null,null );
 
@@ -2575,15 +2618,31 @@ private void transferAccess(
 			String hbmAccess,
 			Consumer<AccessType> accessTypeConsumer,
 			Consumer<String> propertyAccessConsumer) {
-		if ( AccessType.PROPERTY.name().equalsIgnoreCase( hbmAccess ) ) {
-			accessTypeConsumer.accept( AccessType.PROPERTY );
-		}
-		else if ( AccessType.FIELD.name().equals( hbmAccess ) ) {
-			accessTypeConsumer.accept( AccessType.FIELD );
+		if( hbmAccess == null ) {
+			return;
 		}
-		else {
-			if ( propertyAccessConsumer != null ) {
-				propertyAccessConsumer.accept( hbmAccess );
+		switch ( hbmAccess.toLowerCase( Locale.ROOT )) {
+			case "field" -> accessTypeConsumer.accept( AccessType.FIELD );
+			case "property" -> accessTypeConsumer.accept( AccessType.PROPERTY );
+			case "mixed" -> {
+				if ( propertyAccessConsumer != null ) {
+					propertyAccessConsumer.accept( PropertyAccessStrategyMixedImpl.class.getName() );
+				}
+			}
+			case "noop" -> {
+				if ( propertyAccessConsumer != null ) {
+					propertyAccessConsumer.accept( PropertyAccessStrategyNoopImpl.class.getName() );
+				}
+			}
+			case "map" -> {
+				if ( propertyAccessConsumer != null ) {
+					propertyAccessConsumer.accept( PropertyAccessStrategyMapImpl.class.getName() );
+				}
+			}
+			case "embedded" -> {
+				if ( propertyAccessConsumer != null ) {
+					propertyAccessConsumer.accept( PropertyAccessStrategyEmbeddedImpl.class.getName() );
+				}
 			}
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/XmlPreprocessor.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/XmlPreprocessor.java
index 82b400616de4..63deeae1d4b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/XmlPreprocessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/transform/XmlPreprocessor.java
@@ -23,11 +23,14 @@
  * @author Steve Ebersole
  */
 public class XmlPreprocessor {
+
 	public static List<Binding<JaxbEntityMappingsImpl>> preprocessHbmXml(
 			List<Binding<JaxbHbmHibernateMapping>> hbmXmlBindings,
 			TransformationState transformationState) {
-		final List<Binding<JaxbEntityMappingsImpl>> mappingBindings = arrayList( hbmXmlBindings.size() );
-		hbmXmlBindings.forEach( (hbmXmlBinding) -> preProcessHbmXml( hbmXmlBinding, mappingBindings, transformationState ) );
+		final List<Binding<JaxbEntityMappingsImpl>> mappingBindings =
+				arrayList( hbmXmlBindings.size() );
+		hbmXmlBindings.forEach( hbmXmlBinding ->
+				preProcessHbmXml( hbmXmlBinding, mappingBindings, transformationState ) );
 		return mappingBindings;
 	}
 
@@ -35,37 +38,33 @@ private static void preProcessHbmXml(
 			Binding<JaxbHbmHibernateMapping> hbmXmlBinding,
 			List<Binding<JaxbEntityMappingsImpl>> mappingBindings,
 			TransformationState transformationState) {
-		final JaxbHbmHibernateMapping hbmRoot = hbmXmlBinding.getRoot();
-		final JaxbEntityMappingsImpl mappingRoot = new JaxbEntityMappingsImpl();
+		final var hbmRoot = hbmXmlBinding.getRoot();
+		final var mappingRoot = new JaxbEntityMappingsImpl();
 		transformationState.getJaxbRootMap().put( hbmRoot, mappingRoot );
 
+		final var origin = hbmXmlBinding.getOrigin();
 		mappingRoot.setDescription( String.format(
 				Locale.ROOT,
 				"Generated by Hibernate HbmXmlTransformer from %s (%s)",
-				hbmXmlBinding.getOrigin().getName(),
-				hbmXmlBinding.getOrigin().getType()
+				origin.getName(),
+				origin.getType()
 		) );
-		mappingBindings.add( new Binding<>( mappingRoot, hbmXmlBinding.getOrigin() ) );
+		mappingBindings.add( new Binding<>( mappingRoot, origin ) );
 
-		hbmRoot.getTypedef().forEach( hbmTypeDef -> {
-			transformationState.getTypeDefMap().put( hbmTypeDef.getName(), hbmTypeDef );
-		} );
+		hbmRoot.getTypedef().forEach( hbmTypeDef ->
+				transformationState.getTypeDefMap().put( hbmTypeDef.getName(), hbmTypeDef ) );
 
-		hbmRoot.getClazz().forEach( (hbmRootEntity) -> {
-			preProcessRooEntity( hbmRootEntity, hbmRoot, mappingRoot, transformationState );
-		} );
+		hbmRoot.getClazz().forEach( hbmRootEntity ->
+				preProcessRooEntity( hbmRootEntity, hbmRoot, mappingRoot, transformationState ) );
 
-		hbmRoot.getSubclass().forEach( (hbmSubclass) -> {
-			preProcessSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState );
-		} );
+		hbmRoot.getSubclass().forEach( hbmSubclass ->
+				preProcessSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState ) );
 
-		hbmRoot.getJoinedSubclass().forEach( (hbmSubclass) -> {
-			preProcessJoinedSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState );
-		} );
+		hbmRoot.getJoinedSubclass().forEach( hbmSubclass ->
+				preProcessJoinedSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState ) );
 
-		hbmRoot.getUnionSubclass().forEach( (hbmSubclass) -> {
-			preProcessUnionSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState );
-		} );
+		hbmRoot.getUnionSubclass().forEach( hbmSubclass ->
+				preProcessUnionSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState ) );
 	}
 
 	private static void preProcessRooEntity(
@@ -73,22 +72,18 @@ private static void preProcessRooEntity(
 			JaxbHbmHibernateMapping hbmRoot,
 			JaxbEntityMappingsImpl mappingRoot,
 			TransformationState transformationState) {
-		final JaxbEntityImpl mappingEntity = new JaxbEntityImpl();
+		final var mappingEntity = new JaxbEntityImpl();
 		mappingRoot.getEntities().add( mappingEntity );
-
 		commonEntityPreprocessing( hbmRootEntity, hbmRoot, mappingRoot, transformationState, mappingEntity );
 
-		hbmRootEntity.getSubclass().forEach( (hbmSubclass) -> {
-			preProcessSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState );
-		} );
+		hbmRootEntity.getSubclass().forEach( hbmSubclass ->
+				preProcessSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState ) );
 
-		hbmRootEntity.getJoinedSubclass().forEach( (hbmSubclass) -> {
-			preProcessJoinedSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState );
-		} );
+		hbmRootEntity.getJoinedSubclass().forEach( hbmSubclass ->
+				preProcessJoinedSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState ) );
 
-		hbmRootEntity.getUnionSubclass().forEach( (hbmSubclass) -> {
-			preProcessUnionSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState );
-		} );
+		hbmRootEntity.getUnionSubclass().forEach( hbmSubclass ->
+				preProcessUnionSubclass( hbmSubclass, hbmRoot, mappingRoot, transformationState ) );
 	}
 
 	private static void commonEntityPreprocessing(
@@ -115,14 +110,11 @@ private static void preProcessSubclass(
 			JaxbHbmHibernateMapping hbmRoot,
 			JaxbEntityMappingsImpl mappingRoot,
 			TransformationState transformationState) {
-		final JaxbEntityImpl mappingEntity = new JaxbEntityImpl();
+		final var mappingEntity = new JaxbEntityImpl();
 		mappingRoot.getEntities().add( mappingEntity );
-
 		commonEntityPreprocessing( hbmSubclass, hbmRoot, mappingRoot, transformationState, mappingEntity );
-
-		hbmSubclass.getSubclass().forEach( (hbmSubclassSubclass) -> {
-			preProcessSubclass( hbmSubclassSubclass, hbmRoot, mappingRoot, transformationState );
-		} );
+		hbmSubclass.getSubclass().forEach( hbmSubclassSubclass ->
+				preProcessSubclass( hbmSubclassSubclass, hbmRoot, mappingRoot, transformationState ) );
 	}
 
 	private static void preProcessJoinedSubclass(
@@ -130,14 +122,11 @@ private static void preProcessJoinedSubclass(
 			JaxbHbmHibernateMapping hbmRoot,
 			JaxbEntityMappingsImpl mappingRoot,
 			TransformationState transformationState) {
-		final JaxbEntityImpl mappingEntity = new JaxbEntityImpl();
+		final var mappingEntity = new JaxbEntityImpl();
 		mappingRoot.getEntities().add( mappingEntity );
-
 		commonEntityPreprocessing( hbmSubclass, hbmRoot, mappingRoot, transformationState, mappingEntity );
-
-		hbmSubclass.getJoinedSubclass().forEach( (hbmSubclassSubclass) -> {
-			preProcessJoinedSubclass( hbmSubclassSubclass, hbmRoot, mappingRoot, transformationState );
-		} );
+		hbmSubclass.getJoinedSubclass().forEach( hbmSubclassSubclass ->
+				preProcessJoinedSubclass( hbmSubclassSubclass, hbmRoot, mappingRoot, transformationState ) );
 	}
 
 	private static void preProcessUnionSubclass(
@@ -145,13 +134,10 @@ private static void preProcessUnionSubclass(
 			JaxbHbmHibernateMapping hbmRoot,
 			JaxbEntityMappingsImpl mappingRoot,
 			TransformationState transformationState) {
-		final JaxbEntityImpl mappingEntity = new JaxbEntityImpl();
+		final var mappingEntity = new JaxbEntityImpl();
 		mappingRoot.getEntities().add( mappingEntity );
-
 		commonEntityPreprocessing( hbmSubclass, hbmRoot, mappingRoot, transformationState, mappingEntity );
-
-		hbmSubclass.getUnionSubclass().forEach( (hbmSubclassSubclass) -> {
-			preProcessUnionSubclass( hbmSubclassSubclass, hbmRoot, mappingRoot, transformationState );
-		} );
+		hbmSubclass.getUnionSubclass().forEach( hbmSubclassSubclass ->
+				preProcessUnionSubclass( hbmSubclassSubclass, hbmRoot, mappingRoot, transformationState ) );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
index 0891dbca723d..e250e19b46c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
@@ -17,11 +17,12 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 
+import static java.lang.System.currentTimeMillis;
 import static org.hibernate.boot.jaxb.JaxbLogger.JAXB_LOGGER;
 
 /**
  * Support for creating a mapping {@linkplain Binding binding} from "cached" XML files.
- * <p/>
+ * <p>
  * This is a legacy feature, caching a serialized form of the {@linkplain JaxbBindableMappingDescriptor JAXB model}
  * into a file for later use.  While not deprecated per se, its use is discouraged.
  *
@@ -36,7 +37,7 @@ public static Binding<? extends JaxbBindableMappingDescriptor> fromCacheableFile
 			File serLocation,
 			boolean strict,
 			MappingBinder binder) {
-		final Origin origin = new Origin( SourceType.FILE, xmlFile.getAbsolutePath() );
+		final var origin = new Origin( SourceType.FILE, xmlFile.getAbsolutePath() );
 		return fromCacheableFile( xmlFile, serLocation, origin, strict, binder );
 	}
 
@@ -46,7 +47,7 @@ public static Binding<? extends JaxbBindableMappingDescriptor> fromCacheableFile
 			Origin origin,
 			boolean strict,
 			MappingBinder binder) {
-		final File serFile = resolveSerFile( xmlFile, serLocation );
+		final var serFile = resolveSerFile( xmlFile, serLocation );
 
 		if ( strict ) {
 			try {
@@ -84,10 +85,8 @@ public static Binding<? extends JaxbBindableMappingDescriptor> fromCacheableFile
 			}
 
 			JAXB_LOGGER.readingMappingsFromFile( xmlFile.getPath() );
-			final Binding<? extends JaxbBindableMappingDescriptor> binding = FileXmlSource.fromFile( xmlFile, binder );
-
+			final var binding = FileXmlSource.fromFile( xmlFile, binder );
 			writeSerFile( binding.getRoot(), xmlFile, serFile );
-
 			return binding;
 		}
 	}
@@ -108,11 +107,13 @@ public static File resolveSerFile(File xmlFile, File serLocation) {
 		if ( serLocation == null ) {
 			return determineCachedFile( xmlFile );
 		}
-		if ( serLocation.isDirectory() ) {
+		else if ( serLocation.isDirectory() ) {
 			return determineCachedFile( xmlFile, serLocation );
 		}
-		assert serLocation.isFile();
-		return serLocation;
+		else {
+			assert serLocation.isFile();
+			return serLocation;
+		}
 	}
 
 	public static File determineCachedFile(File xmlFile) {
@@ -123,7 +124,8 @@ public static File determineCachedFile(File xmlFile, File serDirectory) {
 		return new File( serDirectory, xmlFile.getName() + ".bin" );
 	}
 
-	private static <T extends JaxbBindableMappingDescriptor> T readSerFile(File serFile) throws SerializationException, FileNotFoundException {
+	private static <T extends JaxbBindableMappingDescriptor> T readSerFile(File serFile)
+			throws SerializationException, FileNotFoundException {
 		JAXB_LOGGER.readingCachedMappings( serFile );
 		return SerializationHelper.deserialize( new FileInputStream( serFile ) );
 	}
@@ -137,7 +139,7 @@ private static <T extends JaxbBindableMappingDescriptor> void writeSerFile(
 				JAXB_LOGGER.writingCacheFile( xmlFile.getAbsolutePath(), serFile.getAbsolutePath() );
 			}
 			SerializationHelper.serialize( jaxbModel, fileOutputStream );
-			final boolean success = serFile.setLastModified( System.currentTimeMillis() );
+			final boolean success = serFile.setLastModified( currentTimeMillis() );
 			if ( !success ) {
 				JAXB_LOGGER.unableToUpdateCachedFileTimestamp( serFile.getAbsolutePath() );
 			}
@@ -152,8 +154,7 @@ public static void createSerFile(File xmlFile, MappingBinder binder) {
 	}
 
 	public static void createSerFile(File xmlFile, File outputFile, MappingBinder binder) {
-		final var binding = FileXmlSource.fromFile( xmlFile, binder );
-		writeSerFile( binding.getRoot(), xmlFile, outputFile );
+		writeSerFile( FileXmlSource.fromFile( xmlFile, binder ).getRoot(), xmlFile, outputFile );
 	}
 
 	public static boolean isSerfileObsolete(File xmlFile, File serFile) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java
index 2a4fc09328c5..3c940e0a2d18 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java
@@ -33,7 +33,7 @@ public static Binding<? extends JaxbBindableMappingDescriptor> fromFile(
 		final String filePath = file.getPath();
 		JAXB_LOGGER.tracef( "Reading mappings from file: %s", filePath );
 
-		final Origin origin = new Origin( SourceType.FILE, filePath );
+		final var origin = new Origin( SourceType.FILE, filePath );
 
 		if ( !file.exists() ) {
 			throw new MappingNotFoundException( origin );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java
index 408044409a1b..0edfc82dd93c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java
@@ -44,10 +44,8 @@ public static Binding<? extends JaxbBindableMappingDescriptor> fromStreamAccess(
 			InputStreamAccess inputStreamAccess,
 			Origin origin,
 			MappingBinder mappingBinder) {
-		JAXB_LOGGER.trace( "reading mappings from InputStreamAccess" );
-
-		return inputStreamAccess.fromStream( (stream) ->
-				InputStreamXmlSource.fromStream( stream, origin, false, mappingBinder )
-		);
+		JAXB_LOGGER.readingMappingsFromInputStreamAccess();
+		return inputStreamAccess.fromStream( stream ->
+				InputStreamXmlSource.fromStream( stream, origin, false, mappingBinder ) );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java
index cc3a711b1da6..905d6a9bfdde 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java
@@ -31,10 +31,13 @@ public class InputStreamXmlSource {
 	public static Binding<? extends JaxbBindableMappingDescriptor> fromStream(
 			InputStream inputStream,
 			MappingBinder mappingBinder) {
-		JAXB_LOGGER.trace( "reading mappings from InputStream" );
-
-		final Origin origin = new Origin( SourceType.INPUT_STREAM, null );
-		return fromStream( inputStream, origin, false, mappingBinder );
+		JAXB_LOGGER.readingMappingsFromInputStream();
+		return fromStream(
+				inputStream,
+				new Origin( SourceType.INPUT_STREAM, null ),
+				false,
+				mappingBinder
+		);
 	}
 
 	/**
@@ -61,8 +64,8 @@ public static Binding<? extends JaxbBindableMappingDescriptor> fromStream(
 				try {
 					stream.close();
 				}
-				catch ( IOException ignore ) {
-					JAXB_LOGGER.trace( "Was unable to close input stream" );
+				catch ( IOException ioe ) {
+					JAXB_LOGGER.unableToCloseInputStream( ioe );
 				}
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java
index 47e0140dc870..912f2d19e1eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java
@@ -14,9 +14,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Enumeration;
 import java.util.function.Consumer;
-import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
@@ -44,13 +42,11 @@ public static void fromJar(
 			MappingBinder mappingBinder,
 			Consumer<Binding<? extends JaxbBindableMappingDescriptor>> consumer) {
 		JAXB_LOGGER.tracef( "Seeking mapping documents in jar file: %s", jar.getName() );
-
-		final Origin origin = new Origin( SourceType.JAR, jar.getAbsolutePath() );
-
-		try ( JarFile jarFile = new JarFile(jar) ) {
-			final Enumeration<JarEntry> entries = jarFile.entries();
+		final var origin = new Origin( SourceType.JAR, jar.getAbsolutePath() );
+		try ( var jarFile = new JarFile( jar ) ) {
+			final var entries = jarFile.entries();
 			while ( entries.hasMoreElements() ) {
-				final JarEntry jarEntry = entries.nextElement();
+				final var jarEntry = entries.nextElement();
 				if ( jarEntry.getName().endsWith(".hbm.xml") ) {
 					JAXB_LOGGER.tracef( "Found 'hbm.xml' mapping in jar: %s", jarEntry.getName() );
 					consumer.accept( fromJarEntry( jarFile, jarEntry, origin, mappingBinder ) );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java
index cdfb97aefc28..aa668c18896b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java
@@ -13,7 +13,6 @@
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 import java.net.UnknownHostException;
 
@@ -37,13 +36,11 @@ public static Binding<? extends JaxbBindableMappingDescriptor> fromResource(
 			ClassLoaderService classLoaderService,
 			MappingBinder mappingBinder) {
 		JAXB_LOGGER.tracef( "Reading mappings from resource: %s", resourceName );
-
-		final Origin origin = new Origin( SourceType.RESOURCE, resourceName );
-		final URL url = classLoaderService.locateResource( resourceName );
+		final var origin = new Origin( SourceType.RESOURCE, resourceName );
+		final var url = classLoaderService.locateResource( resourceName );
 		if ( url == null ) {
 			throw new MappingNotFoundException( origin );
 		}
-
 		return fromUrl( url, origin, mappingBinder );
 	}
 
@@ -55,8 +52,7 @@ public static Binding<? extends JaxbBindableMappingDescriptor> fromResource(
 	public static Binding<? extends JaxbBindableMappingDescriptor> fromUrl(
 			URL url,
 			MappingBinder mappingBinder) {
-		final Origin origin = new Origin( SourceType.URL, url.toExternalForm() );
-		return fromUrl( url, origin, mappingBinder );
+		return fromUrl( url, new Origin( SourceType.URL, url.toExternalForm() ), mappingBinder );
 	}
 
 	/**
@@ -71,10 +67,8 @@ public static Binding<? extends JaxbBindableMappingDescriptor> fromUrl(
 			Origin origin,
 			MappingBinder binder) {
 		JAXB_LOGGER.tracef( "Reading mapping document from URL: %s", origin.getName() );
-
 		try {
-			InputStream stream = url.openStream();
-			return InputStreamXmlSource.fromStream( stream, origin, true, binder );
+			return InputStreamXmlSource.fromStream( url.openStream(), origin, true, binder );
 		}
 		catch (UnknownHostException e) {
 			throw new MappingNotFoundException( "Invalid URL", e, origin );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/NamedGraphCreator.java b/hibernate-core/src/main/java/org/hibernate/boot/model/NamedGraphCreator.java
index 026af3d8f896..fd0e743b23d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/NamedGraphCreator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/NamedGraphCreator.java
@@ -4,17 +4,18 @@
  */
 package org.hibernate.boot.model;
 
+import org.hibernate.graph.spi.GraphParserEntityClassResolver;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.spi.RootGraphImplementor;
-import org.hibernate.metamodel.model.domain.EntityDomainType;
-
-import java.util.function.Function;
+import org.hibernate.service.ServiceRegistry;
 
 /**
  * @author Steve Ebersole
  */
 @FunctionalInterface
 public interface NamedGraphCreator {
-	<T> RootGraphImplementor<T> createEntityGraph(
-			Function<Class<T>, EntityDomainType<?>> entityDomainClassResolver,
-			Function<String, EntityDomainType<?>> entityDomainNameResolver);
+	RootGraphImplementor<?> createEntityGraph(
+			GraphParserEntityClassResolver entityDomainClassResolver,
+			GraphParserEntityNameResolver entityDomainNameResolver,
+			ServiceRegistry serviceRegistry);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributor.java
index 4b4991bef9e0..cc4f8aaae12c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributor.java
@@ -39,4 +39,21 @@ public interface TypeContributor {
 	 * @param serviceRegistry The service registry
 	 */
 	void contribute(TypeContributions typeContributions, ServiceRegistry serviceRegistry);
+
+	/**
+	 * Determines order in which the contributions will be applied
+	 * (lowest ordinal first).
+	 * <p>
+	 * The range 0-500 is reserved for Hibernate, range 500-1000 for libraries and
+	 * 1000-Integer.MAX_VALUE for user-defined TypeContributors.
+	 * <p>
+	 * Contributions from higher precedence contributors (higher numbers) effectively override
+	 * contributions from lower precedence.  E.g. if a contributor with precedence 2000 contributes
+	 * some type, that will override Hibernate's standard type of that name.
+	 *
+	 * @return the ordinal for this TypeContributor
+	 */
+	default int ordinal(){
+		return 1000;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
index 227c78dc08d4..00b0bc74b4d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
@@ -108,7 +108,7 @@ public BasicValue.Resolution<?> resolve(
 			MetadataBuildingContext context,
 			JdbcTypeIndicators indicators) {
 		if ( isEmpty( localConfigParameters ) ) {
-			// we can use the re-usable resolution...
+			// we can use the reusable resolution...
 			if ( reusableResolution == null ) {
 				reusableResolution = createResolution( this.name, emptyMap(), indicators, context );
 			}
@@ -144,16 +144,15 @@ private static <T> BasicValue.Resolution<T> createResolution(
 			MetadataBuildingContext context) {
 		final var bootstrapContext = context.getBootstrapContext();
 		final var typeConfiguration = bootstrapContext.getTypeConfiguration();
-		final var instanceProducer = bootstrapContext.getCustomTypeProducer();
+
 		final boolean isKnownType =
 				Type.class.isAssignableFrom( typeImplementorClass )
 				|| UserType.class.isAssignableFrom( typeImplementorClass );
-
 		// support for AttributeConverter would be nice too
 		if ( isKnownType ) {
 			final T typeInstance =
 					instantiateType( bootstrapContext.getServiceRegistry(), context.getBuildingOptions(),
-							name, typeImplementorClass, instanceProducer );
+							name, typeImplementorClass, bootstrapContext.getCustomTypeProducer() );
 
 			if ( typeInstance instanceof TypeConfigurationAware configurationAware ) {
 				configurationAware.setTypeConfiguration( typeConfiguration );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java
index 29da7fa7bccc..fefd22d1953f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
-import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.AutoApplicableConverterDescriptor;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext;
@@ -12,11 +11,13 @@
 import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter;
 import org.hibernate.resource.beans.spi.ManagedBean;
 
-import com.fasterxml.classmate.ResolvedType;
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
 
-import static org.hibernate.boot.model.convert.internal.ConverterHelper.resolveConverterClassParamTypes;
+import java.lang.reflect.Type;
+
+import static org.hibernate.internal.util.GenericsHelper.erasedType;
+import static org.hibernate.internal.util.GenericsHelper.typeArguments;
 
 /**
  * @author Steve Ebersole
@@ -24,19 +25,18 @@
 abstract class AbstractConverterDescriptor<X,Y> implements ConverterDescriptor<X,Y> {
 	private final Class<? extends AttributeConverter<X,Y>> converterClass;
 
-	private final ResolvedType domainType;
-	private final ResolvedType jdbcType;
+	private final Type domainType;
+	private final Type jdbcType;
 
 	private final AutoApplicableConverterDescriptor autoApplicableDescriptor;
 
 	AbstractConverterDescriptor(
 			Class<? extends AttributeConverter<X, Y>> converterClass,
-			Boolean forceAutoApply,
-			ClassmateContext classmateContext) {
+			Boolean forceAutoApply) {
 		this.converterClass = converterClass;
-		final var converterParamTypes = resolveConverterClassParamTypes( converterClass, classmateContext );
-		domainType = converterParamTypes.get( 0 );
-		jdbcType = converterParamTypes.get( 1 );
+		final var converterParamTypes = typeArguments( AttributeConverter.class, converterClass );
+		domainType = converterParamTypes[0];
+		jdbcType = converterParamTypes[1];
 		autoApplicableDescriptor = resolveAutoApplicableDescriptor( converterClass, forceAutoApply );
 	}
 
@@ -55,7 +55,7 @@ private static boolean isAutoApply(Class<? extends AttributeConverter<?, ?>> con
 		}
 		else {
 			// otherwise, look at the converter's @Converter annotation
-			final Converter annotation = converterClass.getAnnotation( Converter.class );
+			final var annotation = converterClass.getAnnotation( Converter.class );
 			return annotation != null && annotation.autoApply();
 		}
 	}
@@ -66,12 +66,12 @@ public Class<? extends AttributeConverter<X,Y>> getAttributeConverterClass() {
 	}
 
 	@Override
-	public ResolvedType getDomainValueResolvedType() {
+	public Type getDomainValueResolvedType() {
 		return domainType;
 	}
 
 	@Override
-	public ResolvedType getRelationalValueResolvedType() {
+	public Type getRelationalValueResolvedType() {
 		return jdbcType;
 	}
 
@@ -93,12 +93,12 @@ public JpaAttributeConverter<X,Y> createJpaAttributeConverter(JpaAttributeConver
 
 	@SuppressWarnings("unchecked")
 	private Class<Y> getRelationalClass() {
-		return (Class<Y>) getRelationalValueResolvedType().getErasedType();
+		return (Class<Y>) erasedType( getRelationalValueResolvedType() );
 	}
 
 	@SuppressWarnings("unchecked")
 	private Class<X> getDomainClass() {
-		return (Class<X>) getDomainValueResolvedType().getErasedType();
+		return (Class<X>) erasedType( getDomainValueResolvedType() );
 	}
 
 	protected abstract ManagedBean<? extends AttributeConverter<X,Y>>
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
index 7b83063a49b2..9764e36bfcc8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -12,13 +13,13 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
+import jakarta.persistence.AttributeConverter;
 import org.hibernate.AnnotationException;
 import org.hibernate.HibernateException;
 import org.hibernate.boot.model.convert.spi.AutoApplicableConverterDescriptor;
 import org.hibernate.boot.model.convert.spi.ConverterAutoApplyHandler;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.convert.spi.RegisteredConversion;
-import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.models.spi.MemberDetails;
 
@@ -26,8 +27,8 @@
 
 import static java.util.Collections.emptyList;
 import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
-import static org.hibernate.boot.model.convert.internal.ConverterHelper.resolveAttributeType;
-import static org.hibernate.boot.model.convert.internal.ConverterHelper.resolveConverterClassParamTypes;
+import static org.hibernate.internal.util.GenericsHelper.typeArguments;
+import static org.hibernate.internal.util.GenericsHelper.actualMemberType;
 import static org.hibernate.internal.util.StringHelper.join;
 
 /**
@@ -39,7 +40,7 @@
 public class AttributeConverterManager implements ConverterAutoApplyHandler {
 
 	private Map<Class<?>, ConverterDescriptor<?,?>> attributeConverterDescriptorsByClass;
-	private Map<Class<?>, RegisteredConversion> registeredConversionsByDomainType;
+	private Map<Type, RegisteredConversion> registeredConversionsByDomainType;
 
 	public RegisteredConversion findRegisteredConversion(Class<?> domainType) {
 		return registeredConversionsByDomainType == null ? null : registeredConversionsByDomainType.get( domainType );
@@ -52,7 +53,7 @@ public void addConverter(ConverterDescriptor<?,?> descriptor) {
 		}
 
 		if ( registeredConversionsByDomainType != null ) {
-			final Class<?> domainType = descriptor.getDomainValueResolvedType().getErasedType();
+			final var domainType = descriptor.getDomainValueResolvedType();
 			final var registeredConversion = registeredConversionsByDomainType.get( domainType );
 			if ( registeredConversion != null ) {
 				// we can skip registering the converter, the RegisteredConversion will always take precedence
@@ -79,12 +80,12 @@ public void addConverter(ConverterDescriptor<?,?> descriptor) {
 		}
 	}
 
-	public void addRegistration(RegisteredConversion conversion, BootstrapContext context) {
+	public void addRegistration(RegisteredConversion conversion) {
 		if ( registeredConversionsByDomainType == null ) {
 			registeredConversionsByDomainType = new ConcurrentHashMap<>();
 		}
 
-		final Class<?> domainType = getDomainType( conversion, context );
+		final var domainType = getDomainType( conversion );
 		checkNotOverriding( conversion, domainType );
 		// See if we have a matching entry in attributeConverterDescriptorsByClass.
 		// If so, remove it. The conversion being registered will always take precedence.
@@ -98,7 +99,7 @@ public void addRegistration(RegisteredConversion conversion, BootstrapContext co
 		registeredConversionsByDomainType.put( domainType, conversion );
 	}
 
-	private void checkNotOverriding(RegisteredConversion conversion, Class<?> domainType) {
+	private void checkNotOverriding(RegisteredConversion conversion, Type domainType) {
 		// make sure we are not overriding a previous conversion registration
 		final var existingRegistration = registeredConversionsByDomainType.get( domainType );
 		if ( existingRegistration != null ) {
@@ -113,11 +114,10 @@ private void checkNotOverriding(RegisteredConversion conversion, Class<?> domain
 		}
 	}
 
-	private static Class<?> getDomainType(RegisteredConversion conversion, BootstrapContext context) {
+	private static Type getDomainType(RegisteredConversion conversion) {
 		// the registration did not define an explicit domain-type, so inspect the converter
 		return conversion.getExplicitDomainType().equals( void.class )
-				? resolveConverterClassParamTypes( conversion.getConverterType(), context.getClassmateContext() )
-						.get( 0 ).getErasedType()
+				? typeArguments( AttributeConverter.class, conversion.getConverterType() )[0]
 				: conversion.getExplicitDomainType();
 	}
 
@@ -149,21 +149,19 @@ public ConverterDescriptor<?,?> findAutoApplyConverterForAttribute(
 				attributeMember,
 				ConversionSite.ATTRIBUTE,
 				(autoApplyDescriptor) ->
-						autoApplyDescriptor.getAutoAppliedConverterDescriptorForAttribute( attributeMember, context ),
-				context
+						autoApplyDescriptor.getAutoAppliedConverterDescriptorForAttribute( attributeMember, context )
 		);
 	}
 
 	private ConverterDescriptor<?,?> locateMatchingConverter(
 			MemberDetails memberDetails,
 			ConversionSite conversionSite,
-			Function<AutoApplicableConverterDescriptor, ConverterDescriptor<?,?>> matcher,
-			MetadataBuildingContext context) {
+			Function<AutoApplicableConverterDescriptor, ConverterDescriptor<?,?>> matcher) {
 		if ( registeredConversionsByDomainType != null ) {
 			// we had registered conversions - see if any of them match and, if so, use that conversion
-			final var resolveAttributeType = resolveAttributeType( memberDetails, context );
+			final var resolveAttributeType = actualMemberType( memberDetails );
 			final var registrationForDomainType =
-					registeredConversionsByDomainType.get( resolveAttributeType.getErasedType() );
+					registeredConversionsByDomainType.get( resolveAttributeType );
 			if ( registrationForDomainType != null ) {
 				return registrationForDomainType.isAutoApply()
 						? registrationForDomainType.getConverterDescriptor()
@@ -217,7 +215,7 @@ private List<ConverterDescriptor<?,?>> getMatches(
 			if ( BOOT_LOGGER.isTraceEnabled() ) {
 				BOOT_LOGGER.checkingAutoApplyAttributeConverter(
 						descriptor.getAttributeConverterClass().getName(),
-						descriptor.getDomainValueResolvedType().getSignature(),
+						descriptor.getDomainValueResolvedType().getTypeName(),
 						conversionSite.getSiteDescriptor(),
 						memberDetails.getDeclaringType().getName(),
 						memberDetails.getName(),
@@ -240,8 +238,7 @@ public ConverterDescriptor<?,?> findAutoApplyConverterForCollectionElement(
 				attributeMember,
 				ConversionSite.COLLECTION_ELEMENT,
 				(autoApplyDescriptor) ->
-						autoApplyDescriptor.getAutoAppliedConverterDescriptorForCollectionElement( attributeMember, context ),
-				context
+						autoApplyDescriptor.getAutoAppliedConverterDescriptorForCollectionElement( attributeMember, context )
 		);
 	}
 
@@ -253,8 +250,7 @@ public ConverterDescriptor<?,?> findAutoApplyConverterForMapKey(
 				attributeMember,
 				ConversionSite.MAP_KEY,
 				(autoApplyDescriptor) ->
-						autoApplyDescriptor.getAutoAppliedConverterDescriptorForMapKey( attributeMember, context ),
-				context
+						autoApplyDescriptor.getAutoAppliedConverterDescriptorForMapKey( attributeMember, context )
 		);
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorStandardImpl.java
index eecde3d91663..eea404d5fa1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorStandardImpl.java
@@ -4,8 +4,8 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
+import java.lang.reflect.Type;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 import org.hibernate.HibernateException;
@@ -14,12 +14,11 @@
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.models.spi.MemberDetails;
 
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.members.ResolvedMember;
-
-import static org.hibernate.boot.model.convert.internal.ConverterHelper.resolveAttributeType;
-import static org.hibernate.boot.model.convert.internal.ConverterHelper.resolveMember;
-import static org.hibernate.boot.model.convert.internal.ConverterHelper.typesMatch;
+import static org.hibernate.internal.util.GenericsHelper.erasedType;
+import static org.hibernate.internal.util.GenericsHelper.typeArguments;
+import static org.hibernate.internal.util.GenericsHelper.actualMemberType;
+import static org.hibernate.internal.util.GenericAssignability.isAssignableFrom;
+import static org.hibernate.internal.util.type.PrimitiveWrappers.canonicalize;
 
 /**
  * Standard implementation of AutoApplicableConverterDescriptor
@@ -42,44 +41,52 @@ public boolean isAutoApplicable() {
 	public ConverterDescriptor<?,?> getAutoAppliedConverterDescriptorForAttribute(
 			MemberDetails memberDetails,
 			MetadataBuildingContext context) {
-		final ResolvedType attributeType = resolveAttributeType( memberDetails, context );
-
-		return typesMatch( linkedConverterDescriptor.getDomainValueResolvedType(), attributeType )
+		// TODO: arrays, etc
+		final var attributeType = actualMemberType( memberDetails );
+		return isAssignableFrom( linkedConverterDescriptor.getDomainValueResolvedType(),
+						canonicalizePrimitive( attributeType ) )
 				? linkedConverterDescriptor
 				: null;
 	}
 
+	private static Type canonicalizePrimitive(Type attributeType) {
+		return attributeType instanceof Class<?> cl
+				? canonicalize( cl )
+				: attributeType;
+	}
+
 	@Override
 	public ConverterDescriptor<?,?> getAutoAppliedConverterDescriptorForCollectionElement(
 			MemberDetails memberDetails,
 			MetadataBuildingContext context) {
-		final ResolvedMember<?> collectionMember = resolveMember( memberDetails, context );
-
-		final ResolvedType elementType;
-		final ResolvedType type = collectionMember.getType();
-		final Class<?> erasedType = type.getErasedType();
+		final var collectionMemberType = actualMemberType( memberDetails );
+		final var erasedType = erasedType( collectionMemberType );
+		final Type elementType;
 		if ( Map.class.isAssignableFrom( erasedType ) ) {
-			final List<ResolvedType> typeArguments = type.typeParametersFor(Map.class);
-			if ( typeArguments.size() < 2 ) {
+			final var typeArguments =
+					typeArguments( Map.class, collectionMemberType );
+			if ( typeArguments.length < 2 ) {
 				return null;
 			}
-			elementType = typeArguments.get( 1 );
+			elementType = typeArguments[1];
 		}
 		else if ( Collection.class.isAssignableFrom( erasedType ) ) {
-			final List<ResolvedType> typeArguments = type.typeParametersFor(Collection.class);
-			if ( typeArguments.isEmpty() ) {
+			final var typeArguments =
+					typeArguments( Collection.class, collectionMemberType );
+			if ( typeArguments.length == 0 ) {
 				return null;
 			}
-			elementType = typeArguments.get( 0 );
+			elementType = typeArguments[0];
 		}
 		else if ( erasedType.isArray() ) {
-			elementType = type.getArrayElementType();
+			elementType = erasedType.componentType();
 		}
 		else {
 			throw new HibernateException( "Attribute was neither a Collection nor a Map : " + erasedType);
 		}
 
-		return typesMatch( linkedConverterDescriptor.getDomainValueResolvedType(), elementType )
+		return isAssignableFrom( linkedConverterDescriptor.getDomainValueResolvedType(),
+						canonicalizePrimitive( elementType ) )
 				? linkedConverterDescriptor
 				: null;
 	}
@@ -89,21 +96,22 @@ public ConverterDescriptor<?,?> getAutoAppliedConverterDescriptorForMapKey(
 			MemberDetails memberDetails,
 			MetadataBuildingContext context) {
 
-		final ResolvedMember<?> collectionMember = resolveMember( memberDetails, context );
-		final ResolvedType keyType;
-		final ResolvedType type = collectionMember.getType();
-		if ( Map.class.isAssignableFrom( type.getErasedType() ) ) {
-			final List<ResolvedType> typeArguments = type.typeParametersFor(Map.class);
-			if ( typeArguments.isEmpty() ) {
+		final var collectionMemberType = actualMemberType( memberDetails );
+		final Type keyType;
+		if ( Map.class.isAssignableFrom( erasedType( collectionMemberType ) ) ) {
+			final var typeArguments =
+					typeArguments( Map.class, collectionMemberType );
+			if ( typeArguments.length == 0 ) {
 				return null;
 			}
-			keyType = typeArguments.get(0);
+			keyType = typeArguments[0];
 		}
 		else {
-			throw new HibernateException( "Attribute was not a Map : " + type.getErasedType() );
+			throw new HibernateException( "Attribute was not a Map : " + collectionMemberType );
 		}
 
-		return typesMatch( linkedConverterDescriptor.getDomainValueResolvedType(), keyType )
+		return isAssignableFrom( linkedConverterDescriptor.getDomainValueResolvedType(),
+						canonicalizePrimitive( keyType ) )
 				? linkedConverterDescriptor
 				: null;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java
index 2e9a633b9494..0cc304a9495a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
-import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext;
 import org.hibernate.resource.beans.spi.ManagedBean;
 
@@ -23,9 +22,8 @@ class ClassBasedConverterDescriptor<X,Y> extends AbstractConverterDescriptor<X,Y
 	ClassBasedConverterDescriptor(
 			Class<? extends AttributeConverter<X,Y>> converterClass,
 			Boolean forceAutoApply,
-			ClassmateContext classmateContext,
 			boolean overrideable) {
-		super( converterClass, forceAutoApply, classmateContext );
+		super( converterClass, forceAutoApply );
 		this.overrideable = overrideable;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterDescriptorImpl.java
index 3bbfc8d3c8cd..8d221d3d3dcd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterDescriptorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterDescriptorImpl.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
-import com.fasterxml.classmate.ResolvedType;
 import jakarta.persistence.AttributeConverter;
 import org.hibernate.boot.model.convert.spi.AutoApplicableConverterDescriptor;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
@@ -12,17 +11,19 @@
 import org.hibernate.type.descriptor.converter.internal.AttributeConverterBean;
 import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter;
 
+import java.lang.reflect.Type;
+
 
 class ConverterDescriptorImpl<X, Y> implements ConverterDescriptor<X, Y> {
 	private final Class<? extends AttributeConverter<X, Y>> converterType;
-	private final ResolvedType domainTypeToMatch;
-	private final ResolvedType relationalType;
+	private final Type domainTypeToMatch;
+	private final Type relationalType;
 	private final AutoApplicableConverterDescriptor autoApplyDescriptor;
 
 	ConverterDescriptorImpl(
 			Class<? extends AttributeConverter<X, Y>> converterType,
-			ResolvedType domainTypeToMatch,
-			ResolvedType relationalType,
+			Type domainTypeToMatch,
+			Type relationalType,
 			boolean autoApply) {
 		this.converterType = converterType;
 		this.domainTypeToMatch = domainTypeToMatch;
@@ -38,12 +39,12 @@ public Class<? extends AttributeConverter<X, Y>> getAttributeConverterClass() {
 	}
 
 	@Override
-	public ResolvedType getDomainValueResolvedType() {
+	public Type getDomainValueResolvedType() {
 		return domainTypeToMatch;
 	}
 
 	@Override
-	public ResolvedType getRelationalValueResolvedType() {
+	public Type getRelationalValueResolvedType() {
 		return relationalType;
 	}
 
@@ -59,8 +60,8 @@ public JpaAttributeConverter<X, Y> createJpaAttributeConverter(JpaAttributeConve
 		return new AttributeConverterBean<>(
 				converterBean,
 				javaTypeRegistry.resolveDescriptor( converterBean.getBeanClass() ),
-				javaTypeRegistry.getDescriptor( domainTypeToMatch.getErasedType() ),
-				javaTypeRegistry.getDescriptor( relationalType.getErasedType() )
+				javaTypeRegistry.getDescriptor( domainTypeToMatch ),
+				javaTypeRegistry.getDescriptor( relationalType)
 		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterDescriptors.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterDescriptors.java
index 047635bd09d5..c6172194d18a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterDescriptors.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterDescriptors.java
@@ -4,10 +4,10 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
-import com.fasterxml.classmate.ResolvedType;
 import jakarta.persistence.AttributeConverter;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
-import org.hibernate.boot.spi.ClassmateContext;
+
+import java.lang.reflect.Type;
 
 /**
  * Factory for {@link org.hibernate.boot.model.convert.spi.ConverterDescriptor}.
@@ -17,39 +17,35 @@
 public class ConverterDescriptors {
 
 	public static <X,Y> ConverterDescriptor<X,Y> of(
-			AttributeConverter<X,Y> converterInstance, ClassmateContext classmateContext) {
-		return new InstanceBasedConverterDescriptor<>( converterInstance, null, classmateContext );
+			AttributeConverter<X,Y> converterInstance) {
+		return new InstanceBasedConverterDescriptor<>( converterInstance, null );
 	}
 
 	public static <X,Y> ConverterDescriptor<X,Y> of(
-			AttributeConverter<X,Y> converterInstance, boolean autoApply, ClassmateContext classmateContext) {
-		return new InstanceBasedConverterDescriptor<>( converterInstance, autoApply, classmateContext );
+			AttributeConverter<X,Y> converterInstance, boolean autoApply) {
+		return new InstanceBasedConverterDescriptor<>( converterInstance, autoApply );
 	}
 
 	public static <X,Y> ConverterDescriptor<X,Y> of(
 			Class<? extends AttributeConverter<? extends X, ? extends Y>> converterClass,
-			Boolean autoApply, boolean overrideable, ClassmateContext classmateContext) {
+			Boolean autoApply, boolean overrideable) {
 		@SuppressWarnings("unchecked") // work around weird fussiness in wildcard capture
-		final Class<? extends AttributeConverter<X, Y>> converterType =
-				(Class<? extends AttributeConverter<X, Y>>) converterClass;
-		return new ClassBasedConverterDescriptor<>( converterType, autoApply, classmateContext, overrideable );
+		final var converterType = (Class<? extends AttributeConverter<X, Y>>) converterClass;
+		return new ClassBasedConverterDescriptor<>( converterType, autoApply, overrideable );
 	}
 
 	public static <X,Y> ConverterDescriptor<X,Y> of(
-			Class<? extends AttributeConverter<? extends X, ? extends Y>> converterClass,
-			ClassmateContext classmateContext) {
+			Class<? extends AttributeConverter<? extends X, ? extends Y>> converterClass) {
 		@SuppressWarnings("unchecked") // work around weird fussiness in wildcard capture
-		final Class<? extends AttributeConverter<X, Y>> converterType =
-				(Class<? extends AttributeConverter<X, Y>>) converterClass;
-		return new ClassBasedConverterDescriptor<>( converterType, null, classmateContext, false );
+		final var converterType = (Class<? extends AttributeConverter<X, Y>>) converterClass;
+		return new ClassBasedConverterDescriptor<>( converterType, null, false );
 	}
 
 	public static <X,Y> ConverterDescriptor<X,Y> of(
 			Class<? extends AttributeConverter<? extends X, ? extends Y>> converterType,
-			ResolvedType domainTypeToMatch, ResolvedType relationalType, boolean autoApply) {
+			Type domainTypeToMatch, Type relationalType, boolean autoApply) {
 		@SuppressWarnings("unchecked") // work around weird fussiness in wildcard capture
-		final Class<? extends AttributeConverter<X, Y>> converterClass =
-				(Class<? extends AttributeConverter<X, Y>>) converterType;
+		final var converterClass = (Class<? extends AttributeConverter<X, Y>>) converterType;
 		return new ConverterDescriptorImpl<>( converterClass, domainTypeToMatch, relationalType, autoApply );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java
deleted file mode 100644
index d56ce6bfca52..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.boot.model.convert.internal;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.util.List;
-
-import org.hibernate.AnnotationException;
-import org.hibernate.HibernateException;
-import org.hibernate.boot.spi.ClassmateContext;
-import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.internal.util.GenericsHelper;
-import org.hibernate.internal.util.type.PrimitiveWrapperHelper;
-import org.hibernate.models.spi.MemberDetails;
-
-import com.fasterxml.classmate.ResolvedType;
-import com.fasterxml.classmate.members.ResolvedField;
-import com.fasterxml.classmate.members.ResolvedMember;
-import com.fasterxml.classmate.members.ResolvedMethod;
-import jakarta.persistence.AttributeConverter;
-
-/**
- * Helpers related to handling converters
- */
-public class ConverterHelper {
-	public static ParameterizedType extractAttributeConverterParameterizedType(Class<? extends AttributeConverter<?,?>> base) {
-		return GenericsHelper.extractParameterizedType( base, AttributeConverter.class );
-	}
-
-	public static ResolvedType resolveAttributeType(MemberDetails memberDetails, MetadataBuildingContext context) {
-		return resolveMember( memberDetails, context ).getType();
-	}
-
-	public static ResolvedMember<? extends Member> resolveMember(MemberDetails memberDetails, MetadataBuildingContext buildingContext) {
-		final var classmateContext = buildingContext.getBootstrapContext().getClassmateContext();
-		final var declaringClassType =
-				classmateContext.getTypeResolver()
-						.resolve( memberDetails.getDeclaringType().toJavaClass() );
-		final var declaringClassWithMembers =
-				classmateContext.getMemberResolver()
-						.resolve( declaringClassType, null, null );
-
-		final var member = memberDetails.toJavaMember();
-		if ( member instanceof Method ) {
-			for ( ResolvedMethod resolvedMember : declaringClassWithMembers.getMemberMethods() ) {
-				if ( resolvedMember.getName().equals( member.getName() ) ) {
-					return resolvedMember;
-				}
-			}
-		}
-		else if ( member instanceof Field ) {
-			for ( ResolvedField resolvedMember : declaringClassWithMembers.getMemberFields() ) {
-				if ( resolvedMember.getName().equals( member.getName() ) ) {
-					return resolvedMember;
-				}
-			}
-		}
-		else {
-			throw new HibernateException( "Unexpected java.lang.reflect.Member type from org.hibernate.models.spi.MemberDetails : " + member );
-		}
-
-		throw new HibernateException(
-				"Could not locate resolved type information for attribute [" + member.getName() + "] from Classmate"
-		);
-	}
-
-	public static List<ResolvedType> resolveConverterClassParamTypes(
-			Class<? extends AttributeConverter<?, ?>> converterClass,
-			ClassmateContext context) {
-		final var converterType = context.getTypeResolver().resolve( converterClass );
-		final var converterParamTypes = converterType.typeParametersFor( AttributeConverter.class );
-		if ( converterParamTypes == null ) {
-			throw new AnnotationException(
-					"Could not extract type argument from attribute converter class '"
-							+ converterClass.getName() + "'"
-			);
-		}
-		else if ( converterParamTypes.size() != 2 ) {
-			throw new AnnotationException(
-					"Unexpected type argument for attribute converter class '"
-							+ converterClass.getName()
-							+ "' (expected 2 type arguments, but found " + converterParamTypes.size() + ")"
-			);
-		}
-		return converterParamTypes;
-	}
-
-	/**
-	 * Determine whether 2 types match.  Intended for determining whether to auto applying a converter
-	 *
-	 * @param converterDefinedType The type defined via the converter's parameterized type signature.
-	 * 		E.g. {@code O} in {@code implements AttributeConverter<O,R>}
-	 * @param checkType The type from the domain model (basic attribute type, Map key type, Collection element type)
-	 *
-	 * @return {@code true} if they match, otherwise {@code false}.
-	 */
-	public static boolean typesMatch(ResolvedType converterDefinedType, ResolvedType checkType) {
-		Class<?> erasedCheckType = checkType.getErasedType();
-		if ( erasedCheckType.isPrimitive() ) {
-			erasedCheckType = PrimitiveWrapperHelper.getDescriptorByPrimitiveType( erasedCheckType ).getWrapperClass();
-		}
-		else if ( erasedCheckType.isArray() ) {
-			// converterDefinedType have type parameters if it extends super generic class
-			// but checkType doesn't have any type parameters
-			// comparing erased type is enough
-			// see https://hibernate.atlassian.net/browse/HHH-18012
-			return converterDefinedType.getErasedType() == erasedCheckType;
-		}
-
-		return converterDefinedType.getErasedType().isAssignableFrom( erasedCheckType )
-			&& checkTypeParametersMatch( converterDefinedType, checkType );
-	}
-
-	private static boolean checkTypeParametersMatch(ResolvedType converterDefinedType, ResolvedType checkType) {
-		final var converterTypeParameters = converterDefinedType.getTypeParameters();
-		// if the converter did not define any nested type parameters,
-		// then the checks already done above are enough for a match
-		if ( converterTypeParameters.isEmpty() ) {
-			return true;
-		}
-		else {
-			// However, here the converter *did* define nested type parameters,
-			// so we'd have a converter defined using something like, for example,
-			// List<String> for its domain type, and so we need to check those
-			// nested types as well
-			final var checkTypeParameters = checkType.getTypeParameters();
-			if ( checkTypeParameters.isEmpty() ) {
-				// the domain type did not define nested type params.  a List<String> would not auto-match a List(<Object>)
-				return false;
-			}
-			else if ( converterTypeParameters.size() != checkTypeParameters.size() ) {
-				// they had different number of type params somehow.
-				return false;
-			}
-			else {
-				for ( int i = 0; i < converterTypeParameters.size(); i++ ) {
-					if ( !typesMatch( converterTypeParameters.get( i ), checkTypeParameters.get( i ) ) ) {
-						return false;
-					}
-				}
-				return true;
-			}
-		}
-	}
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java
index 2849e697c2aa..d5f8ad831b48 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
-import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.resource.beans.spi.ManagedBean;
@@ -23,9 +22,8 @@ class InstanceBasedConverterDescriptor<X,Y> extends AbstractConverterDescriptor<
 
 	InstanceBasedConverterDescriptor(
 			AttributeConverter<X,Y> converterInstance,
-			Boolean forceAutoApply,
-			ClassmateContext classmateContext) {
-		super( ReflectHelper.getClass( converterInstance ), forceAutoApply, classmateContext );
+			Boolean forceAutoApply) {
+		super( ReflectHelper.getClass( converterInstance ), forceAutoApply );
 		this.converterInstance = converterInstance;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java
index bd9f806a7508..2c24fd2ecc8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java
@@ -6,9 +6,10 @@
 
 import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter;
 
-import com.fasterxml.classmate.ResolvedType;
 import jakarta.persistence.AttributeConverter;
 
+import java.lang.reflect.Type;
+
 /**
  * Boot-time descriptor of a JPA {@linkplain AttributeConverter converter}.
  *
@@ -31,12 +32,12 @@ public interface ConverterDescriptor<X,Y> {
 	/**
 	 * The resolved Classmate type descriptor for the conversion's domain type
 	 */
-	ResolvedType getDomainValueResolvedType();
+	Type getDomainValueResolvedType();
 
 	/**
 	 * The resolved Classmate type descriptor for the conversion's relational type
 	 */
-	ResolvedType getRelationalValueResolvedType();
+	Type getRelationalValueResolvedType();
 
 	/**
 	 * Get the auto-apply checker for this converter.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java
index e2a0ef353f78..31c05d60a46e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java
@@ -7,13 +7,10 @@
 import java.util.Objects;
 
 import org.hibernate.boot.model.convert.internal.ConverterDescriptors;
-import org.hibernate.boot.spi.ClassmateContext;
-import org.hibernate.boot.spi.MetadataBuildingContext;
 
-import com.fasterxml.classmate.ResolvedType;
 import jakarta.persistence.AttributeConverter;
 
-import static org.hibernate.boot.model.convert.internal.ConverterHelper.resolveConverterClassParamTypes;
+import static org.hibernate.internal.util.GenericsHelper.typeArguments;
 
 /**
  * A registered conversion.
@@ -35,10 +32,9 @@ public record RegisteredConversion(
 	public RegisteredConversion(
 			Class<?> explicitDomainType,
 			Class<? extends AttributeConverter<?,?>> converterType,
-			boolean autoApply,
-			MetadataBuildingContext context) {
+			boolean autoApply) {
 		this( explicitDomainType, converterType, autoApply,
-				determineConverterDescriptor( explicitDomainType, converterType, autoApply, context ) );
+				determineConverterDescriptor( explicitDomainType, converterType, autoApply ) );
 	}
 
 	@Override
@@ -62,15 +58,14 @@ public int hashCode() {
 	private static ConverterDescriptor<?,?> determineConverterDescriptor(
 			Class<?> explicitDomainType,
 			Class<? extends AttributeConverter<?, ?>> converterType,
-			boolean autoApply,
-			MetadataBuildingContext context) {
-		final ClassmateContext classmateContext = context.getBootstrapContext().getClassmateContext();
-		final var resolvedParamTypes = resolveConverterClassParamTypes( converterType, classmateContext );
-		final ResolvedType relationalType = resolvedParamTypes.get( 1 );
-		final ResolvedType domainTypeToMatch =
+			boolean autoApply) {
+		final var resolvedParamTypes =
+				typeArguments( AttributeConverter.class, converterType );
+		final var relationalType = resolvedParamTypes[1];
+		final var domainTypeToMatch =
 				void.class.equals( explicitDomainType )
-						? resolvedParamTypes.get( 0 )
-						: classmateContext.getTypeResolver().resolve( explicitDomainType );
+						? resolvedParamTypes[0]
+						: explicitDomainType;
 		return ConverterDescriptors.of( converterType, domainTypeToMatch, relationalType, autoApply );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java
index 473e2775e364..fb698a465422 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
+import jakarta.persistence.AttributeConverter;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.ColumnTransformer;
@@ -19,7 +20,6 @@
 import org.hibernate.boot.model.naming.ImplicitBasicColumnNameSource;
 import org.hibernate.boot.model.source.spi.AttributePath;
 import org.hibernate.boot.models.JpaAnnotations;
-import org.hibernate.boot.models.annotations.internal.ColumnJpaAnnotation;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.models.spi.AnnotationTarget;
@@ -32,13 +32,11 @@
 import jakarta.persistence.AssociationOverride;
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.Entity;
 import jakarta.persistence.ForeignKey;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinTable;
-import jakarta.persistence.MappedSuperclass;
 
+import static java.util.Collections.emptyMap;
 import static org.hibernate.boot.model.internal.TimeZoneStorageHelper.isOffsetTimeClass;
 import static org.hibernate.boot.model.internal.TimeZoneStorageHelper.useColumnForTimeZoneStorage;
 import static org.hibernate.internal.util.StringHelper.isNotBlank;
@@ -103,19 +101,23 @@ public ConverterDescriptor<?,?> resolveAttributeConverterDescriptor(MemberDetail
 		}
 		else {
 			return autoApply
-					? context.getMetadataCollector().getConverterRegistry()
-							.getAttributeConverterAutoApplyHandler()
-							.findAutoApplyConverterForAttribute( attributeMember, context )
+					? autoApplyConverterForAttribute( attributeMember )
 					: null;
 		}
 	}
 
+	private ConverterDescriptor<?, ?> autoApplyConverterForAttribute(MemberDetails attributeMember) {
+		return context.getMetadataCollector().getConverterRegistry()
+				.getAttributeConverterAutoApplyHandler()
+				.findAutoApplyConverterForAttribute( attributeMember, context );
+	}
+
 	protected IllegalStateException buildExceptionFromInstantiationError(AttributeConversionInfo info, Exception e) {
-		if ( void.class.equals( info.getConverterClass() ) ) {
+		if ( AttributeConverter.class.equals( info.getConverterClass() ) ) {
 			// the user forgot to set @Convert.converter
 			// we already know it's not a @Convert.disableConversion
 			return new IllegalStateException(
-					"Unable to instantiate AttributeConverter: you left @Convert.converter to its default value void.",
+					"Unable to instantiate AttributeConverter because the 'converter' member of '@Convert' was not specified",
 					e
 			);
 
@@ -133,9 +135,7 @@ protected IllegalStateException buildExceptionFromInstantiationError(AttributeCo
 
 	protected ConverterDescriptor<?,?> makeAttributeConverterDescriptor(AttributeConversionInfo conversion) {
 		try {
-			return ConverterDescriptors.of( conversion.getConverterClass(),
-					null, false,
-					context.getBootstrapContext().getClassmateContext() );
+			return ConverterDescriptors.of( conversion.getConverterClass(), null, false );
 		}
 		catch (Exception e) {
 			throw new AnnotationException( "Unable to create AttributeConverter instance", e );
@@ -238,20 +238,28 @@ public Column[] getOverriddenColumn(String propertyName) {
 
 	@Override
 	public ColumnTransformer getOverriddenColumnTransformer(String logicalColumnName) {
-		ColumnTransformer result = null;
 		if ( parent != null ) {
-			result = parent.getOverriddenColumnTransformer( logicalColumnName );
+			final var result = parent.getOverriddenColumnTransformer( logicalColumnName );
+			if ( result != null ) {
+				return result;
+			}
 		}
 
-		if ( result == null && currentPropertyColumnTransformerOverride != null ) {
-			result = currentPropertyColumnTransformerOverride.get( logicalColumnName );
+		if ( currentPropertyColumnTransformerOverride != null ) {
+			final var result = currentPropertyColumnTransformerOverride.get( logicalColumnName );
+			if ( result != null ) {
+				return result;
+			}
 		}
 
-		if ( result == null && holderColumnTransformerOverride != null ) {
-			result = holderColumnTransformerOverride.get( logicalColumnName );
+		if ( holderColumnTransformerOverride != null ) {
+			final var result = holderColumnTransformerOverride.get( logicalColumnName );
+			if ( result != null ) {
+				return result;
+			}
 		}
 
-		return result;
+		return null;
 	}
 
 	/**
@@ -259,20 +267,28 @@ public ColumnTransformer getOverriddenColumnTransformer(String logicalColumnName
 	 * find the overridden rules from the exact property name.
 	 */
 	private Column[] getExactOverriddenColumn(String propertyName) {
-		Column[] result = null;
 		if ( parent != null ) {
-			result = parent.getExactOverriddenColumn( propertyName );
+			final var result = parent.getExactOverriddenColumn( propertyName );
+			if ( result != null ) {
+				return result;
+			}
 		}
 
-		if ( result == null && currentPropertyColumnOverride != null ) {
-			result = currentPropertyColumnOverride.get( propertyName );
+		if ( currentPropertyColumnOverride != null ) {
+			final var result = currentPropertyColumnOverride.get( propertyName );
+			if ( result != null ) {
+				return result;
+			}
 		}
 
-		if ( result == null && holderColumnOverride != null ) {
-			result = holderColumnOverride.get( propertyName );
+		if ( holderColumnOverride != null ) {
+			final var result = holderColumnOverride.get( propertyName );
+			if ( result != null ) {
+				return result;
+			}
 		}
 
-		return result;
+		return null;
 	}
 
 	/**
@@ -283,7 +299,7 @@ private Column[] getExactOverriddenColumn(String propertyName) {
 	 */
 	@Override
 	public JoinColumn[] getOverriddenJoinColumn(String propertyName) {
-		final JoinColumn[] result = getExactOverriddenJoinColumn( propertyName );
+		final var result = getExactOverriddenJoinColumn( propertyName );
 		if ( result == null && propertyName.contains( ".{element}." ) ) {
 			//support for non map collections where no prefix is needed
 			//TODO cache the underlying regexp
@@ -298,45 +314,63 @@ public JoinColumn[] getOverriddenJoinColumn(String propertyName) {
 	 * Get column overriding, property first, then parent, then holder
 	 */
 	private JoinColumn[] getExactOverriddenJoinColumn(String propertyName) {
-		JoinColumn[] result = null;
 		if ( parent != null ) {
-			result = parent.getExactOverriddenJoinColumn( propertyName );
+			final var result = parent.getExactOverriddenJoinColumn( propertyName );
+			if ( result != null ) {
+				return result;
+			}
 		}
 
-		if ( result == null && currentPropertyJoinColumnOverride != null ) {
-			result = currentPropertyJoinColumnOverride.get( propertyName );
+		if ( currentPropertyJoinColumnOverride != null ) {
+			final var result = currentPropertyJoinColumnOverride.get( propertyName );
+			if ( result != null ) {
+				return result;
+			}
 		}
 
-		if ( result == null && holderJoinColumnOverride != null ) {
-			result = holderJoinColumnOverride.get( propertyName );
+		if ( holderJoinColumnOverride != null ) {
+			final var result = holderJoinColumnOverride.get( propertyName );
+			if ( result != null ) {
+				return result;
+			}
 		}
 
-		return result;
+		return null;
 	}
 
 	@Override
 	public ForeignKey getOverriddenForeignKey(String propertyName) {
-		final ForeignKey result = getExactOverriddenForeignKey( propertyName );
+		final var result = getExactOverriddenForeignKey( propertyName );
 		if ( result == null && propertyName.contains( ".{element}." ) ) {
 			//support for non map collections where no prefix is needed
 			//TODO cache the underlying regexp
 			return getExactOverriddenForeignKey( propertyName.replace( ".{element}.", "." ) );
 		}
-		return result;
+		else {
+			return result;
+		}
 	}
 
 	private ForeignKey getExactOverriddenForeignKey(String propertyName) {
-		ForeignKey result = null;
 		if ( parent != null ) {
-			result = parent.getExactOverriddenForeignKey( propertyName );
+			final var result = parent.getExactOverriddenForeignKey( propertyName );
+			if ( result != null ) {
+				return result;
+			}
 		}
-		if ( result == null && currentPropertyForeignKeyOverride != null ) {
-			result = currentPropertyForeignKeyOverride.get( propertyName );
+		if ( currentPropertyForeignKeyOverride != null ) {
+			final var result = currentPropertyForeignKeyOverride.get( propertyName );
+			if ( result != null ) {
+				return result;
+			}
 		}
-		if ( result == null && holderForeignKeyOverride != null ) {
-			result = holderForeignKeyOverride.get( propertyName );
+		if ( holderForeignKeyOverride != null ) {
+			final var result = holderForeignKeyOverride.get( propertyName );
+			if ( result != null ) {
+				return result;
+			}
 		}
-		return result;
+		return null;
 	}
 
 	/**
@@ -348,7 +382,7 @@ private ForeignKey getExactOverriddenForeignKey(String propertyName) {
 	@Override
 	public JoinTable getJoinTable(MemberDetails attributeMember) {
 		final String propertyName = qualify( getPath(), attributeMember.getName() );
-		final JoinTable result = getOverriddenJoinTable( propertyName );
+		final var result = getOverriddenJoinTable( propertyName );
 		return result == null
 				? attributeMember.getDirectAnnotationUsage( JoinTable.class )
 				: result;
@@ -361,7 +395,7 @@ public JoinTable getJoinTable(MemberDetails attributeMember) {
 	 * These rules are here to support both JPA 2 and legacy overriding rules.
 	 */
 	public JoinTable getOverriddenJoinTable(String propertyName) {
-		final JoinTable result = getExactOverriddenJoinTable( propertyName );
+		final var result = getExactOverriddenJoinTable( propertyName );
 		if ( result == null && propertyName.contains( ".{element}." ) ) {
 			//support for non map collections where no prefix is needed
 			//TODO cache the underlying regexp
@@ -376,17 +410,25 @@ public JoinTable getOverriddenJoinTable(String propertyName) {
 	 * Get column overriding, property first, then parent, then holder
 	 */
 	private JoinTable getExactOverriddenJoinTable(String propertyName) {
-		JoinTable override = null;
 		if ( parent != null ) {
-			override = parent.getExactOverriddenJoinTable( propertyName );
+			final var override = parent.getExactOverriddenJoinTable( propertyName );
+			if ( override != null ) {
+				return override;
+			}
 		}
-		if ( override == null && currentPropertyJoinTableOverride != null ) {
-			override = currentPropertyJoinTableOverride.get( propertyName );
+		if ( currentPropertyJoinTableOverride != null ) {
+			final var override = currentPropertyJoinTableOverride.get( propertyName );
+			if ( override != null ) {
+				return override;
+			}
 		}
-		if ( override == null && holderJoinTableOverride != null ) {
-			override = holderJoinTableOverride.get( propertyName );
+		if ( holderJoinTableOverride != null ) {
+			final var override = holderJoinTableOverride.get( propertyName );
+			if ( override != null ) {
+				return override;
+			}
 		}
-		return override;
+		return null;
 	}
 
 	private void buildHierarchyColumnOverride(ClassDetails element) {
@@ -397,15 +439,13 @@ private void buildHierarchyColumnOverride(ClassDetails element) {
 		Map<String, JoinTable> joinTableOverride = new HashMap<>();
 		Map<String, ForeignKey> foreignKeyOverride = new HashMap<>();
 		while ( current != null && !ClassDetails.OBJECT_CLASS_DETAILS.equals( current ) ) {
-			if ( current.hasDirectAnnotationUsage( Entity.class )
-					|| current.hasDirectAnnotationUsage( MappedSuperclass.class )
-					|| current.hasDirectAnnotationUsage( Embeddable.class ) ) {
+			if ( isManagedType( current ) ) {
 				//FIXME is embeddable override?
-				Map<String, Column[]> currentOverride = buildColumnOverride( current, getPath(), context );
-				Map<String, ColumnTransformer> currentTransformerOverride = buildColumnTransformerOverride( current, context );
-				Map<String, JoinColumn[]> currentJoinOverride = buildJoinColumnOverride( current, getPath(), context );
-				Map<String, JoinTable> currentJoinTableOverride = buildJoinTableOverride( current, getPath(), context );
-				Map<String, ForeignKey> currentForeignKeyOverride = buildForeignKeyOverride( current, getPath(), context );
+				final var currentOverride = buildColumnOverride( current, path, context );
+				var currentTransformerOverride = buildColumnTransformerOverride( current, context );
+				final var currentJoinOverride = buildJoinColumnOverride( current, path, context );
+				final var currentJoinTableOverride = buildJoinTableOverride( current, path, context );
+				final var currentForeignKeyOverride = buildForeignKeyOverride( current, path, context );
 				currentOverride.putAll( columnOverride ); //subclasses have precedence over superclasses
 				currentTransformerOverride.putAll( columnTransformerOverride ); //subclasses have precedence over superclasses
 				currentJoinOverride.putAll( joinColumnOverride ); //subclasses have precedence over superclasses
@@ -420,11 +460,17 @@ private void buildHierarchyColumnOverride(ClassDetails element) {
 			current = current.getSuperClass();
 		}
 
-		holderColumnOverride = !columnOverride.isEmpty() ? columnOverride : null;
-		holderColumnTransformerOverride = !columnTransformerOverride.isEmpty() ? columnTransformerOverride : null;
-		holderJoinColumnOverride = !joinColumnOverride.isEmpty() ? joinColumnOverride : null;
-		holderJoinTableOverride = !joinTableOverride.isEmpty() ? joinTableOverride : null;
-		holderForeignKeyOverride = !foreignKeyOverride.isEmpty() ? foreignKeyOverride : null;
+		holderColumnOverride = columnOverride.isEmpty() ? null : columnOverride;
+		holderColumnTransformerOverride = columnTransformerOverride.isEmpty() ? null : columnTransformerOverride;
+		holderJoinColumnOverride = joinColumnOverride.isEmpty() ? null : joinColumnOverride;
+		holderJoinTableOverride = joinTableOverride.isEmpty() ? null : joinTableOverride;
+		holderForeignKeyOverride = foreignKeyOverride.isEmpty() ? null : foreignKeyOverride;
+	}
+
+	private static boolean isManagedType(ClassDetails current) {
+		return EntityBinder.isEntity( current )
+			|| EntityBinder.isMappedSuperclass( current )
+			|| EmbeddableBinder.isEmbeddable( current );
 	}
 
 	private static Map<String, Column[]> buildColumnOverride(
@@ -436,25 +482,17 @@ private static Map<String, Column[]> buildColumnOverride(
 			return result;
 		}
 
-		final var modelContext = context.getBootstrapContext().getModelsContext();
+		final var overrides =
+				element.getRepeatedAnnotationUsages( AttributeOverride.class,
+						context.getBootstrapContext().getModelsContext() );
 		final Map<String, List<Column>> columnOverrideMap = new HashMap<>();
-
-		final var overrides = element.getRepeatedAnnotationUsages( AttributeOverride.class, modelContext );
 		if ( isNotEmpty( overrides ) ) {
-			for ( AttributeOverride depAttr : overrides ) {
+			for ( var depAttr : overrides ) {
 				final String qualifiedName = qualify( path, depAttr.name() );
-				final Column column = depAttr.column();
-
-				if ( columnOverrideMap.containsKey( qualifiedName ) ) {
-					// already an entry, just add to that List
-					columnOverrideMap.get( qualifiedName ).add( column );
-				}
-				else {
-					// not yet an entry, create the list and add
-					final List<Column> list = new ArrayList<>();
-					list.add( column );
-					columnOverrideMap.put( qualifiedName, list );
+				if ( !columnOverrideMap.containsKey( qualifiedName ) ) {
+					columnOverrideMap.put( qualifiedName, new ArrayList<>() );
 				}
+				columnOverrideMap.get( qualifiedName ).add( depAttr.column() );
 			}
 		}
 		else if ( useColumnForTimeZoneStorage( element, context ) ) {
@@ -489,7 +527,7 @@ private static Column createTimeZoneColumn(
 			Column column,
 			MetadataBuildingContext context) {
 		final var timeZoneColumn = element.getDirectAnnotationUsage( TimeZoneColumn.class );
-		final ColumnJpaAnnotation created =
+		final var created =
 				JpaAnnotations.COLUMN.createUsage( context.getBootstrapContext().getModelsContext() );
 		final String columnName =
 				timeZoneColumn != null
@@ -561,7 +599,7 @@ public MetadataBuildingContext getBuildingContext() {
 				)
 		);
 
-		final ColumnJpaAnnotation created =
+		final var created =
 				JpaAnnotations.COLUMN.createUsage( context.getBootstrapContext().getModelsContext() );
 		if ( StringHelper.isNotEmpty( implicitName.getText() ) ) {
 			created.name( implicitName.getText() );
@@ -572,50 +610,61 @@ public MetadataBuildingContext getBuildingContext() {
 	}
 
 	private static Map<String, ColumnTransformer> buildColumnTransformerOverride(AnnotationTarget element, MetadataBuildingContext context) {
-		final var sourceModelContext = context.getBootstrapContext().getModelsContext();
-		final Map<String, ColumnTransformer> columnOverride = new HashMap<>();
-		if ( element != null ) {
-			element.forEachAnnotationUsage( ColumnTransformer.class, sourceModelContext, (usage) -> {
-				columnOverride.put( usage.forColumn(), usage );
-			} );
+		if ( element == null ) {
+			return emptyMap();
+		}
+		else {
+			final Map<String, ColumnTransformer> columnOverride = new HashMap<>();
+			final var sourceModelContext = context.getBootstrapContext().getModelsContext();
+			element.forEachAnnotationUsage( ColumnTransformer.class, sourceModelContext,
+					usage -> columnOverride.put( usage.forColumn(), usage ) );
+			return columnOverride;
 		}
-		return columnOverride;
 	}
 
 	private static Map<String, JoinColumn[]> buildJoinColumnOverride(AnnotationTarget element, String path, MetadataBuildingContext context) {
-		final Map<String, JoinColumn[]> columnOverride = new HashMap<>();
-		if ( element != null ) {
-			for ( var override : buildAssociationOverrides( element, path, context ) ) {
+		if ( element == null ) {
+			return emptyMap();
+		}
+		else {
+			final Map<String, JoinColumn[]> columnOverride = new HashMap<>();
+			for ( var override : buildAssociationOverrides( element, context ) ) {
 				columnOverride.put( qualify( path, override.name() ), override.joinColumns() );
 			}
+			return columnOverride;
 		}
-		return columnOverride;
 	}
 
 	private static Map<String, ForeignKey> buildForeignKeyOverride(AnnotationTarget element, String path, MetadataBuildingContext context) {
-		final Map<String, ForeignKey> foreignKeyOverride = new HashMap<>();
-		if ( element != null ) {
-			for ( var override : buildAssociationOverrides( element, path, context ) ) {
+		if ( element == null ) {
+			return emptyMap();
+		}
+		else {
+			final Map<String, ForeignKey> foreignKeyOverride = new HashMap<>();
+			for ( var override : buildAssociationOverrides( element, context ) ) {
 				foreignKeyOverride.put( qualify( path, override.name() ), override.foreignKey() );
 			}
+			return foreignKeyOverride;
 		}
-		return foreignKeyOverride;
 	}
 
-	private static AssociationOverride[] buildAssociationOverrides(AnnotationTarget element, String path, MetadataBuildingContext context) {
+	private static AssociationOverride[] buildAssociationOverrides(AnnotationTarget element, MetadataBuildingContext context) {
 		return element.getRepeatedAnnotationUsages( AssociationOverride.class, context.getBootstrapContext().getModelsContext() );
 	}
 
 	private static Map<String, JoinTable> buildJoinTableOverride(AnnotationTarget element, String path, MetadataBuildingContext context) {
-		final Map<String, JoinTable> result = new HashMap<>();
-		if ( element != null ) {
-			for ( var override : buildAssociationOverrides( element, path, context ) ) {
+		if ( element == null ) {
+			return emptyMap();
+		}
+		else {
+			final Map<String, JoinTable> result = new HashMap<>();
+			for ( var override : buildAssociationOverrides( element, context ) ) {
 				if ( isEmpty( override.joinColumns() ) ) {
 					result.put( qualify( path, override.name() ), override.joinTable() );
 				}
 			}
+			return result;
 		}
-		return result;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java
index 5ff06ffcb345..979d8ee01c5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java
@@ -33,7 +33,6 @@
 import org.hibernate.mapping.Formula;
 import org.hibernate.mapping.Join;
 import org.hibernate.mapping.SimpleValue;
-import org.hibernate.mapping.Table;
 import org.hibernate.models.spi.ModelsContext;
 
 import static org.hibernate.boot.model.internal.BinderHelper.getPath;
@@ -235,11 +234,8 @@ public AnnotatedColumn() {
 
 	public void bind() {
 		if ( isNotEmpty( formulaString ) ) {
-if ( BOOT_LOGGER.isTraceEnabled() ) {
-				BOOT_LOGGER.bindingFormula( formulaString );
-			}
-			formula = new Formula();
-			formula.setFormula( formulaString );
+			BOOT_LOGGER.bindingFormula( formulaString );
+			initMappingFormula();
 		}
 		else {
 			initMappingColumn(
@@ -258,7 +254,7 @@ public void bind() {
 			if ( defaultValue != null ) {
 				mappingColumn.setDefaultValue( defaultValue );
 			}
-			for ( CheckConstraint constraint : checkConstraints ) {
+			for ( var constraint : checkConstraints ) {
 				mappingColumn.addCheckConstraint( constraint );
 			}
 			mappingColumn.setOptions( options );
@@ -269,12 +265,17 @@ public void bind() {
 			if ( generatedAs != null ) {
 				mappingColumn.setGeneratedAs( generatedAs );
 			}
-if ( BOOT_LOGGER.isDebugEnabled() && logicalColumnName != null ) {
+			if ( logicalColumnName != null ) {
 				BOOT_LOGGER.bindingColumn( logicalColumnName );
 			}
 		}
 	}
 
+	void initMappingFormula() {
+		formula = new Formula();
+		formula.setFormula( formulaString );
+	}
+
 	protected void initMappingColumn(
 			String columnName,
 			String propertyName,
@@ -287,55 +288,49 @@ protected void initMappingColumn(
 			String sqlType,
 			boolean unique,
 			boolean applyNamingStrategy) {
-		if ( isNotEmpty( formulaString ) ) {
-			formula = new Formula();
-			formula.setFormula( formulaString );
+		mappingColumn = new Column();
+		mappingColumn.setExplicit( !isImplicit );
+		final boolean nameDetermined =
+				inferColumnNameIfPossible( columnName, propertyName, applyNamingStrategy );
+		mappingColumn.setLength( length );
+		if ( precision != null && precision > 0 ) {  //relevant precision
+			mappingColumn.setPrecision( precision );
+			mappingColumn.setScale( scale );
 		}
-		else {
-			mappingColumn = new Column();
-			mappingColumn.setExplicit( !isImplicit );
-			final boolean nameDetermined =
-					inferColumnNameIfPossible( columnName, propertyName, applyNamingStrategy );
-			mappingColumn.setLength( length );
-			if ( precision != null && precision > 0 ) {  //relevant precision
-				mappingColumn.setPrecision( precision );
-				mappingColumn.setScale( scale );
-			}
-			if ( temporalPrecision != null ) {
-				mappingColumn.setTemporalPrecision( temporalPrecision );
-			}
-			mappingColumn.setArrayLength( arrayLength );
-			mappingColumn.setNullable( nullable );
-			mappingColumn.setSqlType( sqlType );
-			mappingColumn.setUnique( unique );
-			// if the column name is not determined, we will assign the
-			// name to the unique key later this method gets called again
-			// from linkValueUsingDefaultColumnNaming() in second pass
-			if ( unique && nameDetermined ) {
-				// assign a unique key name to the column
-				getParent().getTable().createUniqueKey( mappingColumn, getBuildingContext() );
-			}
-			for ( CheckConstraint constraint : checkConstraints ) {
-				mappingColumn.addCheckConstraint( constraint );
-			}
-			mappingColumn.setDefaultValue( defaultValue );
-			mappingColumn.setOptions( options );
-			mappingColumn.setComment( comment );
-
-			if ( writeExpression != null ) {
-				final int numberOfJdbcParams = StringHelper.count( writeExpression, '?' );
-				if ( numberOfJdbcParams != 1 ) {
-					throw new AnnotationException(
-							"Write expression in '@ColumnTransformer' for property '" + propertyName
-							+ "' and column '" + logicalColumnName + "'"
-							+ " must contain exactly one placeholder character ('?')"
-					);
-				}
+		if ( temporalPrecision != null ) {
+			mappingColumn.setTemporalPrecision( temporalPrecision );
+		}
+		mappingColumn.setArrayLength( arrayLength );
+		mappingColumn.setNullable( nullable );
+		mappingColumn.setSqlType( sqlType );
+		mappingColumn.setUnique( unique );
+		// if the column name is not determined, we will assign the
+		// name to the unique key later this method gets called again
+		// from linkValueUsingDefaultColumnNaming() in second pass
+		if ( unique && nameDetermined ) {
+			// assign a unique key name to the column
+			getParent().getTable().createUniqueKey( mappingColumn, getBuildingContext() );
+		}
+		for ( var constraint : checkConstraints ) {
+			mappingColumn.addCheckConstraint( constraint );
+		}
+		mappingColumn.setDefaultValue( defaultValue );
+		mappingColumn.setOptions( options );
+		mappingColumn.setComment( comment );
+
+		if ( writeExpression != null ) {
+			final int numberOfJdbcParams = StringHelper.count( writeExpression, '?' );
+			if ( numberOfJdbcParams != 1 ) {
+				throw new AnnotationException(
+						"Write expression in '@ColumnTransformer' for property '" + propertyName
+						+ "' and column '" + logicalColumnName + "'"
+						+ " must contain exactly one placeholder character ('?')"
+				);
 			}
-
-			mappingColumn.setResolvedCustomRead( readExpression );
-			mappingColumn.setCustomWrite( writeExpression );
 		}
+
+		mappingColumn.setResolvedCustomRead( readExpression );
+		mappingColumn.setCustomWrite( writeExpression );
 	}
 
 	public boolean isNameDeferred() {
@@ -353,9 +348,10 @@ public boolean isNameDeferred() {
 	 * @return {@code true} if a name could be inferred
 	 */
 	boolean inferColumnNameIfPossible(String columnName, String propertyName, boolean applyNamingStrategy) {
-		if ( !isEmpty( columnName ) || !isEmpty( propertyName ) ) {
-			final String logicalColumnName = resolveLogicalColumnName( columnName, propertyName );
-			mappingColumn.setName( processColumnName( logicalColumnName, applyNamingStrategy ) );
+		if ( isNotEmpty( columnName ) || isNotEmpty( propertyName ) ) {
+			mappingColumn.setName(
+					processColumnName( resolveLogicalColumnName( columnName, propertyName ),
+							applyNamingStrategy, isNotEmpty( columnName ) ) );
 			return true;
 		}
 		else {
@@ -365,9 +361,10 @@ boolean inferColumnNameIfPossible(String columnName, String propertyName, boolea
 
 	private String resolveLogicalColumnName(String columnName, String propertyName) {
 		final String baseColumnName = isNotEmpty( columnName ) ? columnName : inferColumnName( propertyName );
-		return parent.getPropertyHolder() != null && parent.getPropertyHolder().isComponent()
+		final var propertyHolder = parent.getPropertyHolder();
+		return propertyHolder != null && propertyHolder.isComponent()
 				// see if we need to apply one-or-more @EmbeddedColumnNaming patterns
-				? applyEmbeddedColumnNaming( baseColumnName, (ComponentPropertyHolder) parent.getPropertyHolder() )
+				? applyEmbeddedColumnNaming( baseColumnName, (ComponentPropertyHolder) propertyHolder )
 				: baseColumnName;
 	}
 
@@ -403,11 +400,12 @@ private String applyEmbeddedColumnNaming(String inferredColumnName, ComponentPro
 		return result;
 	}
 
-	protected String processColumnName(String columnName, boolean applyNamingStrategy) {
+	protected String processColumnName(String columnName, boolean applyNamingStrategy, boolean isExplicit) {
 		if ( applyNamingStrategy ) {
 			final var database = getDatabase();
 			return getPhysicalNamingStrategy()
-					.toPhysicalColumnName( database.toIdentifier( columnName ), database.getJdbcEnvironment() )
+					.toPhysicalColumnName( database.toIdentifier( columnName, isExplicit ),
+							database.getJdbcEnvironment() )
 					.render( database.getDialect() );
 		}
 		else {
@@ -508,7 +506,7 @@ public void linkWithValue(SimpleValue value) {
 			value.addFormula( formula );
 		}
 		else {
-			final Table table = value.getTable();
+			final var table = value.getTable();
 			parent.setTable( table );
 			mappingColumn.setValue( value );
 			value.addColumn( mappingColumn, insertable, updatable );
@@ -770,7 +768,7 @@ private static jakarta.persistence.Column[] overrideColumns(
 						+ " columns (every column must have exactly one '@AttributeOverride')" );
 			}
 			if ( BOOT_LOGGER.isTraceEnabled() ) {
-	BOOT_LOGGER.columnMappingOverridden( inferredData.getPropertyName() );
+				BOOT_LOGGER.columnMappingOverridden( inferredData.getPropertyName() );
 			}
 			return isEmpty( overriddenCols ) ? null : overriddenCols;
 		}
@@ -930,7 +928,7 @@ void applyColumnDefault(PropertyData inferredData, int length) {
 			}
 		}
 		else {
-BOOT_LOGGER.couldNotPerformColumnDefaultLookup();
+			BOOT_LOGGER.couldNotPerformColumnDefaultLookup();
 		}
 	}
 
@@ -951,7 +949,7 @@ void applyGeneratedAs(PropertyData inferredData, int length) {
 			}
 		}
 		else {
-BOOT_LOGGER.couldNotPerformGeneratedColumnLookup();
+			BOOT_LOGGER.couldNotPerformGeneratedColumnLookup();
 		}
 }
 
@@ -994,9 +992,9 @@ void applyCheckConstraint(PropertyData inferredData, int length) {
 			}
 		}
 		else {
-BOOT_LOGGER.couldNotPerformCheckLookup();
+			BOOT_LOGGER.couldNotPerformCheckLookup();
 		}
-}
+	}
 
 	//must only be called after all setters are defined and before binding
 	private void extractDataFromPropertyData(
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java
index 09e63210370f..c577af43f172 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java
@@ -21,10 +21,8 @@
 /**
  * A list of columns that are mapped to a single Java property
  * or field. This is a slightly uncomfortable abstraction here,
- * because this concept is arguably missing from JPA (where
- * there's no equivalent of the Hibernate-defined
- * {@link org.hibernate.annotations.Columns} annotation) and
- * so JPA lets each {@link jakarta.persistence.Column} specify
+ * because this concept is arguably missing from JPA and so
+ * JPA lets each {@link jakarta.persistence.Column} specify
  * its own {@link jakarta.persistence.Column#table table}.
  * That leaves us having to enforce the requirement that every
  * column mapped to a given property must belong to the same
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumn.java
index e5c57d18d96e..ca5165674fcc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumn.java
@@ -11,7 +11,9 @@
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.PropertyData;
 import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Formula;
 import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Value;
 
@@ -73,7 +75,7 @@ static AnnotatedJoinColumn buildJoinColumn(
 			PropertyHolder propertyHolder,
 			PropertyData inferredData) {
 		final String path = qualify( propertyHolder.getPath(), inferredData.getPropertyName() );
-		final JoinColumn[] overrides = propertyHolder.getOverriddenJoinColumn( path );
+		final var overrides = propertyHolder.getOverriddenJoinColumn( path );
 		if ( overrides != null ) {
 			//TODO: relax this restriction
 			throw new AnnotationException( "Property '" + path
@@ -334,7 +336,7 @@ public void linkValueUsingDefaultColumnNaming(
 		setLogicalColumnName( columnName );
 		setImplicit( true );
 		setReferencedColumn( logicalReferencedColumn );
-		final Column mappingColumn = getMappingColumn();
+		final var mappingColumn = getMappingColumn();
 		initMappingColumn(
 				columnName,
 				null,
@@ -363,7 +365,7 @@ private String defaultColumnName(int columnIndex, PersistentClass referencedEnti
 			// the name of the @MapsId annotation, but
 			// it's better than just having two different
 			// column names which disagree
-			final Column column = parent.resolveMapsId().getValue().getColumns().get( columnIndex );
+			final var column = parent.resolveMapsId().getValue().getColumns().get( columnIndex );
 //			return column.getQuotedName();
 			if ( column.isExplicit() ) {
 				throw new AnnotationException( "Association '" + parent.getPropertyName()
@@ -380,21 +382,27 @@ private String defaultColumnName(int columnIndex, PersistentClass referencedEnti
 	/**
 	 * Used for {@code mappedBy} cases.
 	 */
-	public void linkValueUsingAColumnCopy(Column column, SimpleValue value) {
-		initMappingColumn(
-				//column.getName(),
-				column.getQuotedName(),
-				null,
-				column.getLength(),
-				column.getPrecision(),
-				column.getScale(),
-				column.getTemporalPrecision(),
-				column.getArrayLength(),
-				getMappingColumn().isNullable(),
-				column.getSqlType(),
-				getMappingColumn().isUnique(),
-				false //We do copy no strategy here
-		);
+	public void linkValueUsingCopy(Selectable selectable, SimpleValue value) {
+		if ( selectable instanceof  Column column ) {
+			initMappingColumn(
+					//column.getName(),
+					column.getQuotedName(),
+					null,
+					column.getLength(),
+					column.getPrecision(),
+					column.getScale(),
+					column.getTemporalPrecision(),
+					column.getArrayLength(),
+					getMappingColumn().isNullable(),
+					column.getSqlType(),
+					getMappingColumn().isUnique(),
+					false //We do copy no strategy here
+			);
+		}
+		else if ( selectable instanceof Formula formula ) {
+			setFormula( formula.getFormula() );
+			initMappingFormula();
+		}
 		linkWithValue( value );
 	}
 
@@ -429,7 +437,7 @@ protected void addColumnBinding(SimpleValue value) {
 	 * @param column the referenced column.
 	 */
 	public void overrideFromReferencedColumnIfNecessary(Column column) {
-		final Column mappingColumn = getMappingColumn();
+		final var mappingColumn = getMappingColumn();
 		if ( mappingColumn != null ) {
 			// columnDefinition can also be specified using @JoinColumn, hence we have to check
 			// whether it is set or not
@@ -458,7 +466,8 @@ public void overrideFromReferencedColumnIfNecessary(Column column) {
 	@Override
 	boolean inferColumnNameIfPossible(String columnName, String propertyName, boolean applyNamingStrategy) {
 		if ( isNotEmpty( columnName ) ) {
-			getMappingColumn().setName( processColumnName( columnName, applyNamingStrategy ) );
+			getMappingColumn().setName(
+					processColumnName( columnName, applyNamingStrategy, isNotEmpty( columnName ) ) );
 			return true;
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumns.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumns.java
index db72632a4cd2..cd2f6859df8d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumns.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumns.java
@@ -40,6 +40,7 @@
 import static org.hibernate.boot.model.internal.AnnotatedJoinColumn.buildExplicitJoinTableJoinColumn;
 import static org.hibernate.boot.model.internal.AnnotatedJoinColumn.buildImplicitJoinTableJoinColumn;
 import static org.hibernate.boot.model.internal.AnnotatedJoinColumn.buildJoinColumn;
+import static org.hibernate.boot.model.internal.AnnotatedJoinColumn.buildJoinFormula;
 import static org.hibernate.boot.model.internal.BinderHelper.findReferencedColumnOwner;
 import static org.hibernate.boot.model.internal.BinderHelper.getRelativePath;
 import static org.hibernate.boot.model.internal.ForeignKeyType.EXPLICIT_PRIMARY_KEY_REFERENCE;
@@ -99,7 +100,7 @@ public static AnnotatedJoinColumns buildJoinColumnsOrFormulas(
 			final var column = columnOrFormula.column();
 			final String annotationString = formula.value();
 			if ( isNotBlank( annotationString ) ) {
-				AnnotatedJoinColumn.buildJoinFormula( formula, parent );
+				buildJoinFormula( formula, parent );
 			}
 			else {
 				buildJoinColumn( column, mappedBy, parent, propertyHolder, inferredData );
@@ -134,7 +135,7 @@ static AnnotatedJoinColumns buildJoinColumnsWithFormula(
 		joinColumns.setJoins( secondaryTables );
 		joinColumns.setPropertyHolder( propertyHolder );
 		joinColumns.setPropertyName( getRelativePath( propertyHolder, inferredData.getPropertyName() ) );
-		AnnotatedJoinColumn.buildJoinFormula( joinFormula, joinColumns );
+		buildJoinFormula( joinFormula, joinColumns );
 		handlePropertyRef( inferredData.getAttributeMember(), joinColumns );
 		return joinColumns;
 	}
@@ -168,15 +169,15 @@ public static AnnotatedJoinColumns buildJoinColumnsWithDefaultColumnSuffix(
 		assert mappedBy == null || !mappedBy.isBlank();
 		final String propertyName = inferredData.getPropertyName();
 		final String path = qualify( propertyHolder.getPath(), propertyName );
-		final JoinColumn[] overrides = propertyHolder.getOverriddenJoinColumn( path );
-		final JoinColumn[] actualColumns = overrides == null ? joinColumns : overrides;
+		final var overriddenJoinColumns = propertyHolder.getOverriddenJoinColumn( path );
+		final var actualJoinColumns = overriddenJoinColumns == null ? joinColumns : overriddenJoinColumns;
 		final var parent = new AnnotatedJoinColumns();
 		parent.setBuildingContext( context );
 		parent.setJoins( joins );
 		parent.setPropertyHolder( propertyHolder );
 		parent.setPropertyName( getRelativePath( propertyHolder, propertyName ) );
 		parent.setMappedBy( mappedBy );
-		if ( isEmpty( actualColumns ) ) {
+		if ( isEmpty( actualJoinColumns ) ) {
 			buildJoinColumn(
 					null,
 					mappedBy,
@@ -188,7 +189,7 @@ public static AnnotatedJoinColumns buildJoinColumnsWithDefaultColumnSuffix(
 		}
 		else {
 			parent.setMappedBy( mappedBy );
-			for ( var actualColumn : actualColumns ) {
+			for ( var actualColumn : actualJoinColumns ) {
 				buildJoinColumn(
 						actualColumn,
 						mappedBy,
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java
index bb89b313fea6..60269290209a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java
@@ -4,10 +4,8 @@
  */
 package org.hibernate.boot.model.internal;
 
-import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Inheritance;
-import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.Table;
 import org.hibernate.AnnotationException;
 import org.hibernate.MappingException;
@@ -45,6 +43,8 @@
 import static org.hibernate.boot.model.internal.AnnotatedClassType.EMBEDDABLE;
 import static org.hibernate.boot.model.internal.AnnotatedClassType.ENTITY;
 import static org.hibernate.boot.model.internal.EntityBinder.bindEntityClass;
+import static org.hibernate.boot.model.internal.EntityBinder.isEntity;
+import static org.hibernate.boot.model.internal.EntityBinder.isMappedSuperclass;
 import static org.hibernate.boot.model.internal.FilterDefBinder.bindFilterDefs;
 import static org.hibernate.boot.model.internal.GeneratorBinder.registerGlobalGenerators;
 import static org.hibernate.boot.model.internal.GeneratorParameters.interpretSequenceGenerator;
@@ -258,9 +258,9 @@ private static void handleImport(ClassDetails annotatedClass, MetadataBuildingCo
 	}
 
 	private static void detectMappedSuperclassProblems(ClassDetails annotatedClass) {
-		if ( annotatedClass.hasDirectAnnotationUsage( MappedSuperclass.class ) ) {
+		if ( isMappedSuperclass( annotatedClass ) ) {
 			// @Entity and @MappedSuperclass on the same class leads to NPE down the road
-			if ( annotatedClass.hasDirectAnnotationUsage( Entity.class ) ) {
+			if ( isEntity( annotatedClass ) ) {
 				throw new AnnotationException( "Type '" + annotatedClass.getName()
 						+ "' is annotated both '@Entity' and '@MappedSuperclass'" );
 			}
@@ -430,8 +430,7 @@ private static void handleConverterRegistration(ConverterRegistration registrati
 				.addRegisteredConversion( new RegisteredConversion(
 						registration.domainType(),
 						registration.converter(),
-						registration.autoApply(),
-						context
+						registration.autoApply()
 				) );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationHelper.java
index b6cf53a618be..10f300375a5f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationHelper.java
@@ -41,7 +41,7 @@ public static HashMap<String, String> extractParameterMap(Parameter[] parameters
 
 	public static JdbcMapping resolveUserType(Class<UserType<?>> userTypeClass, MetadataBuildingContext context) {
 		final var bootstrapContext = context.getBootstrapContext();
-		final UserType<?> userType =
+		final var userType =
 				context.getBuildingOptions().isAllowExtensionsInCdi()
 						? bootstrapContext.getManagedBeanRegistry().getBean( userTypeClass ).getBeanInstance()
 						: FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( userTypeClass );
@@ -74,7 +74,7 @@ public static <X,Y> JdbcMapping resolveAttributeConverter(
 
 	public static BasicType<?> resolveBasicType(Class<?> type, MetadataBuildingContext context) {
 		final var typeConfiguration = context.getBootstrapContext().getTypeConfiguration();
-		final JavaType<?> jtd = typeConfiguration.getJavaTypeRegistry().findDescriptor( type );
+		final var jtd = typeConfiguration.getJavaTypeRegistry().findDescriptor( type );
 		if ( jtd != null ) {
 			final JdbcType jdbcType = jtd.getRecommendedJdbcType(
 					new JdbcTypeIndicators() {
@@ -132,7 +132,7 @@ private static JavaType<?> getJavaType(
 			Class<JavaType<?>> javaTypeClass,
 			MetadataBuildingContext context,
 			TypeConfiguration typeConfiguration) {
-		final JavaType<?> registeredJtd =
+		final var registeredJtd =
 				typeConfiguration.getJavaTypeRegistry()
 						.findDescriptor( javaTypeClass );
 		if ( registeredJtd != null ) {
@@ -143,8 +143,7 @@ else if ( !context.getBuildingOptions().isAllowExtensionsInCdi() ) {
 		}
 		else {
 			return context.getBootstrapContext().getManagedBeanRegistry()
-					.getBean( javaTypeClass )
-					.getBeanInstance();
+					.getBean( javaTypeClass ).getBeanInstance();
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnyBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnyBinder.java
index 86fdc4371061..31a894d8fe6c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnyBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnyBinder.java
@@ -5,22 +5,15 @@
 package org.hibernate.boot.model.internal;
 
 import java.util.EnumSet;
-import java.util.Locale;
 
-import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.AnyDiscriminatorImplicitValues;
-import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
-import org.hibernate.annotations.Columns;
 import org.hibernate.annotations.Formula;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.PropertyData;
-import org.hibernate.mapping.Any;
-import org.hibernate.mapping.Join;
-import org.hibernate.mapping.Property;
 import org.hibernate.metamodel.internal.FullNameImplicitDiscriminatorStrategy;
 import org.hibernate.metamodel.internal.ShortNameImplicitDiscriminatorStrategy;
 import org.hibernate.metamodel.spi.ImplicitDiscriminatorStrategy;
@@ -44,30 +37,17 @@ static void bindAny(
 			AnnotatedJoinColumns joinColumns) {
 		final var memberDetails = inferredData.getAttributeMember();
 
-		//check validity
-		if ( memberDetails.hasDirectAnnotationUsage( Columns.class ) ) {
-			throw new AnnotationException(
-					String.format(
-							Locale.ROOT,
-							"Property '%s' is annotated '@Any' and may not have a '@Columns' annotation "
-									+ "(a single '@Column' or '@Formula' must be used to map the discriminator, and '@JoinColumn's must be used to map the foreign key) ",
-							getPath( propertyHolder, inferredData )
-					)
-			);
-		}
-
-		final var hibernateCascade = memberDetails.getDirectAnnotationUsage( Cascade.class );
 		final var onDeleteAnn = memberDetails.getDirectAnnotationUsage( OnDelete.class );
 		final var assocTable = propertyHolder.getJoinTable( memberDetails );
 		if ( assocTable != null ) {
-			final Join join = propertyHolder.addJoin( assocTable, false );
-			for ( AnnotatedJoinColumn joinColumn : joinColumns.getJoinColumns() ) {
+			final var join = propertyHolder.addJoin( assocTable, false );
+			for ( var joinColumn : joinColumns.getJoinColumns() ) {
 				joinColumn.setExplicitTableName( join.getTable().getName() );
 			}
 		}
+		final var any = memberDetails.getDirectAnnotationUsage( org.hibernate.annotations.Any.class );
 		bindAny(
-				aggregateCascadeTypes( null, hibernateCascade, false, context ),
-				//@Any has no cascade attribute
+				aggregateCascadeTypes( any.cascade(), memberDetails, false, context ),
 				joinColumns,
 				onDeleteAnn == null ? null : onDeleteAnn.action(),
 				nullability,
@@ -97,7 +77,7 @@ private static void bindAny(
 
 		final boolean lazy = any.fetch() == FetchType.LAZY;
 		final boolean optional = any.optional();
-		final Any value = BinderHelper.buildAnyValue(
+		final var anyValue = BinderHelper.buildAnyValue(
 				memberDetails.getDirectAnnotationUsage( Column.class ),
 				getOverridableAnnotation( memberDetails, Formula.class, context ),
 				columns,
@@ -114,13 +94,13 @@ private static void bindAny(
 		final var anyDiscriminatorImplicitValues =
 				memberDetails.getDirectAnnotationUsage( AnyDiscriminatorImplicitValues.class );
 		if ( anyDiscriminatorImplicitValues != null ) {
-			value.setImplicitDiscriminatorValueStrategy(
+			anyValue.setImplicitDiscriminatorValueStrategy(
 					resolveImplicitDiscriminatorStrategy( anyDiscriminatorImplicitValues, context ) );
 		}
 
 		final var binder = new PropertyBinder();
 		binder.setName( inferredData.getPropertyName() );
-		binder.setValue( value );
+		binder.setValue( anyValue );
 		binder.setLazy( lazy );
 		//binder.setCascade(cascadeStrategy);
 		if ( isIdentifierMapper ) {
@@ -133,8 +113,8 @@ private static void bindAny(
 		binder.setHolder( propertyHolder );
 		binder.setMemberDetails( memberDetails );
 		binder.setEntityBinder( entityBinder );
-		Property prop = binder.makeProperty();
-		prop.setOptional( optional && value.isNullable() );
+		final var prop = binder.makeProperty();
+		prop.setOptional( optional && anyValue.isNullable() );
 		//composite FK columns are in the same table, so it's OK
 		propertyHolder.addProperty( prop, inferredData.getAttributeMember(), columns, inferredData.getDeclaringClass() );
 		binder.callAttributeBindersInSecondPass( prop );
@@ -146,22 +126,25 @@ public static ImplicitDiscriminatorStrategy resolveImplicitDiscriminatorStrategy
 		return switch ( anyDiscriminatorImplicitValues.value() ) {
 			case FULL_NAME -> FullNameImplicitDiscriminatorStrategy.FULL_NAME_STRATEGY;
 			case SHORT_NAME -> ShortNameImplicitDiscriminatorStrategy.SHORT_NAME_STRATEGY;
-			case CUSTOM -> {
-				final var customStrategy = anyDiscriminatorImplicitValues.implementation();
-				if ( ImplicitDiscriminatorStrategy.class.equals( customStrategy ) ) {
-					yield null;
-				}
-				else if ( FullNameImplicitDiscriminatorStrategy.class.equals( customStrategy ) ) {
-					yield FullNameImplicitDiscriminatorStrategy.FULL_NAME_STRATEGY;
-				}
-				else if ( ShortNameImplicitDiscriminatorStrategy.class.equals( customStrategy ) ) {
-					yield ShortNameImplicitDiscriminatorStrategy.SHORT_NAME_STRATEGY;
-				}
-				else {
-					yield context.getBootstrapContext().getCustomTypeProducer()
-							.produceBeanInstance( customStrategy );
-				}
-			}
+			case CUSTOM -> customStrategy( anyDiscriminatorImplicitValues, context );
 		};
 	}
+
+	private static ImplicitDiscriminatorStrategy customStrategy(
+			AnyDiscriminatorImplicitValues anyDiscriminatorImplicitValues, MetadataBuildingContext context) {
+		final var customStrategy = anyDiscriminatorImplicitValues.implementation();
+		if ( ImplicitDiscriminatorStrategy.class.equals( customStrategy ) ) {
+			return null;
+		}
+		else if ( FullNameImplicitDiscriminatorStrategy.class.equals( customStrategy ) ) {
+			return FullNameImplicitDiscriminatorStrategy.FULL_NAME_STRATEGY;
+		}
+		else if ( ShortNameImplicitDiscriminatorStrategy.class.equals( customStrategy ) ) {
+			return ShortNameImplicitDiscriminatorStrategy.SHORT_NAME_STRATEGY;
+		}
+		else {
+			return context.getBootstrapContext().getCustomTypeProducer()
+					.produceBeanInstance( customStrategy );
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AuditHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AuditHelper.java
new file mode 100644
index 000000000000..1c720a3e8afa
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AuditHelper.java
@@ -0,0 +1,172 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.model.internal;
+
+import java.time.Instant;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.hibernate.annotations.Audited;
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
+import org.hibernate.boot.model.relational.Database;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.mapping.BasicValue;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Stateful;
+import org.hibernate.mapping.Table;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+import org.hibernate.temporal.spi.TransactionIdentifierService;
+
+import static org.hibernate.internal.util.StringHelper.isBlank;
+
+/**
+ * Helper for building audit log tables in the boot model.
+ */
+public final class AuditHelper {
+	public static final String TRANSACTION_ID = "transactionId";
+	public static final String MODIFICATION_TYPE = "modificationType";
+
+	// defaults for backward compatibility with envers
+
+	private static final String DEFAULT_TABLE_SUFFIX = "_aud";
+
+	private AuditHelper() {
+	}
+
+	static void bindAuditTable(
+			Audited audited,
+			RootClass rootClass,
+			MetadataBuildingContext context) {
+		bindAuditTable( audited, rootClass, context,
+				resolveExcludedColumns( rootClass ) );
+	}
+
+	static void bindAuditTable(
+			Audited audited,
+			Collection collection,
+			MetadataBuildingContext context) {
+		bindAuditTable( audited, collection, context, Set.of() );
+	}
+
+	private static void bindAuditTable(
+			Audited audited,
+			Stateful auditable,
+			MetadataBuildingContext context,
+			Set<String> excludedColumns) {
+		final var collector = context.getMetadataCollector();
+		final var table = auditable.getMainTable();
+		final String explicitAuditTableName = audited.tableName();
+		final boolean hasExplicitAuditTableName = !isBlank( explicitAuditTableName );
+		final var auditTable = collector.addTable(
+				table.getSchema(),
+				table.getCatalog(),
+				hasExplicitAuditTableName
+						? explicitAuditTableName
+						: collector.getLogicalTableName( table )
+								+ DEFAULT_TABLE_SUFFIX,
+				table.getSubselect(),
+				table.isAbstract(),
+				context,
+				hasExplicitAuditTableName
+						|| table.getNameIdentifier().isExplicit()
+		);
+		collector.addTableNameBinding( table.getNameIdentifier(), auditTable );
+		copyTableColumns( table, auditTable, excludedColumns );
+		final var transactionIdColumn =
+				createAuditColumn( audited.transactionId(),
+						getTransactionIdType( context ), auditTable, context );
+		final var modificationTypeColumn =
+				createAuditColumn( audited.modificationType(),
+						Byte.class, auditTable, context );
+		auditTable.addColumn( transactionIdColumn );
+		auditTable.addColumn( modificationTypeColumn );
+		enableAudit( auditable, auditTable, transactionIdColumn, modificationTypeColumn );
+
+		collector.addSecondPass( (OptionalDeterminationSecondPass) ignored ->
+				copyTableColumns( table, auditTable, excludedColumns ) );
+	}
+
+	static void enableAudit(
+			Stateful model, Table auditTable,
+			Column transactionIdColumn, Column modificationTypeColumn) {
+		model.setAuxiliaryTable( auditTable );
+		model.addAuxiliaryColumn( TRANSACTION_ID, transactionIdColumn );
+		model.addAuxiliaryColumn( MODIFICATION_TYPE, modificationTypeColumn );
+		model.setStateManagementType( AuditStateManagement.class );
+	}
+
+	private static Class<?> getTransactionIdType(MetadataBuildingContext context) {
+		return context.getBootstrapContext().getServiceRegistry()
+				.requireService( TransactionIdentifierService.class )
+				.getIdentifierType();
+	}
+
+	private static void copyTableColumns(Table sourceTable, Table targetTable, Set<String> excludedColumns) {
+		for ( var column : sourceTable.getColumns() ) {
+			if ( !excludedColumns.contains( column.getCanonicalName() ) ) {
+				targetTable.addColumn( column.clone() );
+			}
+		}
+	}
+
+	private static Column createAuditColumn(
+			String columnName,
+			Class<?> javaType,
+			Table table,
+			MetadataBuildingContext context) {
+		final var basicValue = new BasicValue( context, table );
+		basicValue.setImplicitJavaTypeAccess( typeConfiguration -> javaType );
+		final var column = new Column();
+		column.setNullable( false );
+		column.setValue( basicValue );
+		basicValue.addColumn( column );
+
+		final var database = context.getMetadataCollector().getDatabase();
+		setColumnName( columnName, column, database, context.getBuildingOptions().getPhysicalNamingStrategy() );
+		setTemporalColumnType( column, database, javaType );
+
+		return column;
+	}
+
+	private static void setTemporalColumnType(
+			Column column,
+			Database database,
+			Class<?> javaType) {
+		if ( Instant.class.equals( javaType ) ) {
+			final var temporalTableSupport = database.getDialect().getTemporalTableSupport();
+			column.setTemporalPrecision( temporalTableSupport.getTemporalColumnPrecision() );
+			column.setSqlTypeCode( temporalTableSupport.getTemporalColumnType() );
+		}
+	}
+
+	private static void setColumnName(
+			String name,
+			Column column,
+			Database database,
+			PhysicalNamingStrategy physicalNamingStrategy) {
+		final Identifier physicalColumnName =
+				physicalNamingStrategy.toPhysicalColumnName(
+					database.toIdentifier( name ),
+					database.getJdbcEnvironment()
+				);
+		column.setName( physicalColumnName.render( database.getDialect() ) );
+	}
+
+	private static Set<String> resolveExcludedColumns(RootClass rootClass) {
+		final Set<String> excluded = new HashSet<>();
+		final var properties = rootClass.getProperties();
+		for ( var property : properties ) {
+			if ( property.isAuditedExcluded() ) {
+				for ( var column : property.getColumns() ) {
+					excluded.add( column.getCanonicalName() );
+				}
+			}
+		}
+		return excluded;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java
index 6658fc70de8e..adbd6ef9f39e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java
@@ -102,7 +102,8 @@ public enum Kind {
 	// in-flight info
 
 	private Class<? extends UserType<?>> explicitCustomType;
-	private Map<String,String> explicitLocalTypeParams;
+	private Map<String,String> explicitLocalCustomTypeParams;
+	private Annotation explicitCustomTypeAnnotation;
 
 	private Function<TypeConfiguration, JdbcType> explicitJdbcTypeAccess;
 	private Function<TypeConfiguration, BasicJavaType<?>> explicitJavaTypeAccess;
@@ -338,8 +339,9 @@ private boolean applyCustomType(MemberDetails memberDetails, TypeDetails typeDet
 		final var modelContext = getSourceModelContext();
 		final var userTypeImpl = kind.mappingAccess.customType( memberDetails, modelContext );
 		if ( userTypeImpl != null ) {
-			applyExplicitType( userTypeImpl,
-					kind.mappingAccess.customTypeParameters( memberDetails, modelContext ) );
+			this.explicitCustomType = userTypeImpl;
+			this.explicitLocalCustomTypeParams = kind.mappingAccess.customTypeParameters( memberDetails, modelContext );
+			this.explicitCustomTypeAnnotation = kind.mappingAccess.customTypeAnnotation( memberDetails, modelContext );
 			// An explicit custom UserType has top precedence when we get to BasicValue resolution.
 			return true;
 		}
@@ -349,7 +351,8 @@ private boolean applyCustomType(MemberDetails memberDetails, TypeDetails typeDet
 			final var registeredUserTypeImpl =
 					getMetadataCollector().findRegisteredUserType( basicClass );
 			if ( registeredUserTypeImpl != null ) {
-				applyExplicitType( registeredUserTypeImpl, emptyMap() );
+				this.explicitCustomType = registeredUserTypeImpl;
+				this.explicitLocalCustomTypeParams = emptyMap();
 				return true;
 			}
 		}
@@ -384,11 +387,6 @@ private void prepareValue(MemberDetails value, TypeDetails typeDetails, @Nullabl
 		}
 	}
 
-	private void applyExplicitType(Class<? extends UserType<?>> userTypeImpl, Map<String,String> parameters) {
-		explicitCustomType = userTypeImpl;
-		explicitLocalTypeParams = parameters;
-	}
-
 	private void prepareCollectionId(MemberDetails attribute) {
 		final var collectionId = attribute.getDirectAnnotationUsage( CollectionId.class );
 		if ( collectionId == null ) {
@@ -831,7 +829,7 @@ private void prepareAnyDiscriminator(MemberDetails memberDetails) {
 			return originalResolution != null
 					? originalResolution
 					: typeConfiguration.getJavaTypeRegistry()
-							.getDescriptor( implicitJavaTypeAccess.apply( typeConfiguration ) )
+							.resolveDescriptor( implicitJavaTypeAccess.apply( typeConfiguration ) )
 							.getRecommendedJdbcType( typeConfiguration.getCurrentBaseSqlTypeIndicators() );
 		};
 	}
@@ -1188,14 +1186,17 @@ else if ( aggregateComponent != null ) {
 			firstColumn.linkWithAggregateValue( basicValue, aggregateComponent );
 		}
 		else {
-			for ( AnnotatedColumn column : columns.getColumns() ) {
+			for ( var column : columns.getColumns() ) {
 				column.linkWithValue( basicValue );
 			}
 		}
 	}
 
 	public void fillSimpleValue() {
-		basicValue.setExplicitTypeParams( explicitLocalTypeParams );
+
+		basicValue.setMemberDetails( memberDetails );
+
+		basicValue.setExplicitTypeParams( explicitLocalCustomTypeParams );
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// todo (6.0) : we are dropping support for @Type and @TypeDef from annotations
@@ -1211,6 +1212,10 @@ public void fillSimpleValue() {
 			basicValue.setTypeParameters( createDynamicParameterizedTypeParameters() );
 		}
 
+		if ( explicitCustomType != null ) {
+			basicValue.setTypeAnnotation( explicitCustomTypeAnnotation );
+		}
+
 		if ( converterDescriptor != null ) {
 			basicValue.setJpaAttributeConverterDescriptor( converterDescriptor );
 		}
@@ -1282,8 +1287,8 @@ private Map<String, Object> createDynamicParameterizedTypeParameters() {
 			parameters.put( DynamicParameterizedType.ACCESS_TYPE, accessType.getType() );
 		}
 
-		if ( explicitLocalTypeParams != null ) {
-			parameters.putAll( explicitLocalTypeParams );
+		if ( explicitLocalCustomTypeParams != null ) {
+			parameters.putAll( explicitLocalCustomTypeParams );
 		}
 
 		return parameters;
@@ -1295,6 +1300,7 @@ private Map<String, Object> createDynamicParameterizedTypeParameters() {
 	private interface BasicMappingAccess {
 		Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsContext context);
 		Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context);
+		Annotation customTypeAnnotation(MemberDetails attribute, ModelsContext context);
 	}
 
 	private static class ValueMappingAccess implements BasicMappingAccess {
@@ -1311,6 +1317,12 @@ public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsCo
 			final var customType = attribute.locateAnnotationUsage( Type.class, context );
 			return customType == null ? null : extractParameterMap( customType.parameters() );
 		}
+
+		@Override
+		public Annotation customTypeAnnotation(MemberDetails attribute, ModelsContext context) {
+			final var annotations = attribute.getMetaAnnotated( Type.class, context );
+			return annotations == null || annotations.isEmpty() ? null : annotations.get( 0 );
+		}
 	}
 
 	private static class AnyDiscriminatorMappingAccess implements BasicMappingAccess {
@@ -1325,6 +1337,11 @@ public Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsCo
 		public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context) {
 			return emptyMap();
 		}
+
+		@Override
+		public Annotation customTypeAnnotation(MemberDetails attribute, ModelsContext context) {
+			return null;
+		}
 	}
 
 	private static class AnyKeyMappingAccess implements BasicMappingAccess {
@@ -1339,6 +1356,11 @@ public Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsCo
 		public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context) {
 			return emptyMap();
 		}
+
+		@Override
+		public Annotation customTypeAnnotation(MemberDetails attribute, ModelsContext context) {
+			return null;
+		}
 	}
 
 	private static class MapKeyMappingAccess implements BasicMappingAccess {
@@ -1357,6 +1379,12 @@ public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsCo
 			return customType == null ? null : extractParameterMap( customType.parameters() );
 
 		}
+
+		@Override
+		public Annotation customTypeAnnotation(MemberDetails attribute, ModelsContext context) {
+			final var annotations = attribute.getMetaAnnotated( MapKeyType.class, context );
+			return annotations == null || annotations.isEmpty() ? null : annotations.get( 0 );
+		}
 	}
 
 	private static class CollectionIdMappingAccess implements BasicMappingAccess {
@@ -1373,7 +1401,12 @@ public Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsCo
 		public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context) {
 			final var customType = attribute.locateAnnotationUsage( CollectionIdType.class, context );
 			return customType == null ? null : extractParameterMap( customType.parameters() );
+		}
 
+		@Override
+		public Annotation customTypeAnnotation(MemberDetails attribute, ModelsContext context) {
+			final var annotations = attribute.getMetaAnnotated( CollectionIdType.class, context );
+			return annotations == null || annotations.isEmpty() ? null : annotations.get( 0 );
 		}
 	}
 
@@ -1389,6 +1422,11 @@ public Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsCo
 		public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context) {
 			return emptyMap();
 		}
+
+		@Override
+		public Annotation customTypeAnnotation(MemberDetails attribute, ModelsContext context) {
+			return null;
+		}
 	}
 
 	private static AnnotatedJoinColumns convertToJoinColumns(AnnotatedColumns columns, MetadataBuildingContext context) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java
index 0b980091f048..3c3c759dc512 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java
@@ -39,6 +39,7 @@
 import org.hibernate.mapping.SyntheticProperty;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.Value;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.models.spi.AnnotationTarget;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.MemberDetails;
@@ -410,6 +411,8 @@ public static Property shallowCopy(Property property) {
 		clone.setName( property.getName() );
 		clone.setNaturalIdentifier( property.isNaturalIdentifier() );
 		clone.setOptimisticLocked( property.isOptimisticLocked() );
+		clone.setTemporalExcluded( property.isTemporalExcluded() );
+		clone.setAuditedExcluded( property.isAuditedExcluded() );
 		clone.setOptional( property.isOptional() );
 		clone.setPersistentClass( property.getPersistentClass() );
 		clone.setPropertyAccessorName( property.getPropertyAccessorName() );
@@ -764,11 +767,11 @@ public static Any buildAnyValue(
 
 		final var discriminatorJavaType = discriminator.resolve().getRelationalJavaType();
 
-		final Map<Object,Class<?>> discriminatorValueMappings = new HashMap<>();
+		final Map<DiscriminatorValue,Class<?>> discriminatorValueMappings = new HashMap<>();
 		processAnyDiscriminatorValues(
 				inferredData.getAttributeMember(),
 				valueMapping -> discriminatorValueMappings.put(
-						discriminatorJavaType.wrap( valueMapping.discriminator(), null ),
+						new DiscriminatorValue.Literal( discriminatorJavaType.wrap( valueMapping.discriminator(), null ) ),
 						valueMapping.entity()
 				),
 				context.getBootstrapContext().getModelsContext()
@@ -794,7 +797,7 @@ public static Any buildAnyValue(
 			}
 		}
 		keyValueBinder.setType( memberDetails, memberDetails.getType() );
-		final BasicValue keyDescriptor = keyValueBinder.make();
+		final var keyDescriptor = keyValueBinder.make();
 		any.setKey( keyDescriptor );
 		keyValueBinder.fillSimpleValue();
 		keyColumns.checkPropertyConsistency();
@@ -879,9 +882,10 @@ public static FetchMode getFetchMode(FetchType fetch) {
 
 	public static EnumSet<CascadeType> aggregateCascadeTypes(
 			jakarta.persistence.CascadeType[] cascadeTypes,
-			Cascade cascadeAnnotation,
+			MemberDetails memberDetails,
 			boolean orphanRemoval,
 			MetadataBuildingContext context) {
+		final var cascadeAnnotation = memberDetails.getDirectAnnotationUsage( Cascade.class );
 		final var cascades = convertToHibernateCascadeType( cascadeTypes );
 		final var hibernateCascades = cascadeAnnotation == null ? null : cascadeAnnotation.value();
 		if ( !isEmpty( hibernateCascades ) ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/Binders.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/Binders.java
new file mode 100644
index 000000000000..8b17dbbed4db
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/Binders.java
@@ -0,0 +1,112 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.model.internal;
+
+import org.hibernate.AnnotationException;
+import org.hibernate.annotations.AttributeBinderType;
+import org.hibernate.annotations.TypeBinderType;
+import org.hibernate.binder.AttributeBinder;
+import org.hibernate.binder.TypeBinder;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+
+import java.lang.annotation.Annotation;
+
+import static org.hibernate.internal.util.GenericsHelper.typeArguments;
+
+/**
+ * @author Gavin King
+ * @since 7.3
+ */
+public class Binders {
+	static <A extends Annotation> void callTypeBinder(
+			Annotation annotation, Class<A> annotationType,
+			Component embeddable,
+			MetadataBuildingContext context) {
+		try {
+			typeBinder( annotationType )
+					.bind( annotationType.cast( annotation ),
+							context, embeddable );
+		}
+		catch (Exception e) {
+			throw new AnnotationException(
+					"Error processing @TypeBinderType annotation '%s' for embeddable type '%s'"
+							.formatted( annotation, embeddable.getComponentClassName() ), e );
+		}
+	}
+
+	static <A extends Annotation> void callTypeBinder(
+			Annotation annotation, Class<A> annotationType,
+			PersistentClass entity,
+			MetadataBuildingContext context) {
+		try {
+			typeBinder( annotationType )
+					.bind( annotationType.cast( annotation ),
+							context, entity );
+		}
+		catch (Exception e) {
+			throw new AnnotationException(
+					"Error processing @TypeBinderType annotation '%s' for entity type '%s'"
+							.formatted( annotation, entity.getClassName() ), e );
+		}
+	}
+
+	static <A extends Annotation> void callPropertyBinder(
+			Annotation annotation, Class<A> annotationType,
+			PersistentClass entity, Property property,
+			MetadataBuildingContext context) {
+		try {
+			propertyBinder( annotationType )
+					.bind( annotationType.cast( annotation ),
+							context, entity, property );
+		}
+		catch (Exception e) {
+			throw new AnnotationException(
+					"error processing @AttributeBinderType annotation '%s' for attribute '%s' of entity type '%s'"
+							.formatted( annotation, property.getName(), entity.getClassName() ), e );
+		}
+	}
+
+	private static <A extends Annotation> TypeBinder<A> typeBinder(Class<A> annotationType)
+			throws Exception {
+		final var binderType =
+				annotationType.getAnnotation( TypeBinderType.class )
+						.binder();
+		checkImplementedTypeArgument( annotationType, binderType, TypeBinder.class );
+		@SuppressWarnings("unchecked") // Safe, we just checked
+		final var castBinderType = (Class<? extends TypeBinder<A>>) binderType;
+		return castBinderType.getDeclaredConstructor().newInstance();
+	}
+
+	private static <A extends Annotation> AttributeBinder<A> propertyBinder(Class<A> annotationType)
+					throws Exception {
+		final var binderType =
+				annotationType.getAnnotation( AttributeBinderType.class )
+						.binder();
+		checkImplementedTypeArgument( annotationType, binderType, PropertyBinder.class );
+		@SuppressWarnings("unchecked") // Safe, we just checked
+		final var castBinderType = (Class<? extends AttributeBinder<A>>) binderType;
+		return castBinderType.getDeclaredConstructor().newInstance();
+	}
+
+	private static void checkImplementedTypeArgument(
+			Class<? extends Annotation> annotationType,
+			Class<?> binderType, Class<?> implementedType) {
+		final var args = typeArguments( implementedType, binderType );
+		if ( args.length == 1 ) {
+			final var requiredAnnotationType = args[0];
+			if ( annotationType != requiredAnnotationType ) {
+				throw new AnnotationException(
+						"Wrong kind of binder for annotation type:"
+						+ " '%s' does not accept an annotation of type '%s'"
+								.formatted( binderType.getTypeName(),
+										annotationType.getTypeName() )
+				);
+			}
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java
index 2ec9461d3656..46445e8ba7d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java
@@ -12,7 +12,7 @@
 import org.hibernate.AssertionFailure;
 import org.hibernate.PropertyNotFoundException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.boot.spi.SecondPass;
+import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.IndexedCollection;
@@ -29,6 +29,8 @@
 
 import jakarta.persistence.Convert;
 import jakarta.persistence.JoinTable;
+import org.hibernate.models.spi.TypeDetails;
+import org.hibernate.type.internal.ParameterizedTypeImpl;
 
 import static org.hibernate.internal.util.StringHelper.isEmpty;
 import static org.hibernate.internal.util.collections.CollectionHelper.mapOfSize;
@@ -312,29 +314,25 @@ static void prepareActualProperty(
 			if ( !allowCollections ) {
 				throw new AssertionFailure( "Collections are not allowed as identifier properties" );
 			}
-			// The owner is a MappedSuperclass which is not a PersistentClass, so set it to null
-//						collection.setOwner( null );
+			// The owner is a MappedSuperclass, not a PersistentClass,
+			// so set it to null collection.setOwner( null );
 			collection.setRole( memberDetails.getDeclaringType().getName() + "." + property.getName() );
 			// To copy the element and key values, we need to defer setting the type name until the CollectionBinder ran
 			final var originalValue = property.getValue();
-			context.getMetadataCollector().addSecondPass(
-					new SecondPass() {
-						@Override
-						public void doSecondPass(Map<String, PersistentClass> persistentClasses) {
-							final var initializedCollection = (Collection) originalValue;
-							final var element = initializedCollection.getElement().copy();
-							setTypeName( element, memberDetails.getElementType().getName() );
-							if ( initializedCollection instanceof IndexedCollection indexedCollection ) {
-								final var index = indexedCollection.getIndex().copy();
-								if ( memberDetails.getMapKeyType() != null ) {
-									setTypeName( index, memberDetails.getMapKeyType().getName() );
-								}
-								( (IndexedCollection) collection ).setIndex( index );
-							}
-							collection.setElement( element );
-						}
+			context.getMetadataCollector().addSecondPass( persistentClasses -> {
+				final var initializedCollection = (Collection) originalValue;
+				final var element = initializedCollection.getElement().copy();
+				setTypeName( element, memberDetails.getElementType().getName() );
+				if ( initializedCollection instanceof IndexedCollection indexedCollection ) {
+					final var index = indexedCollection.getIndex().copy();
+					final var mapKeyType = memberDetails.getMapKeyType();
+					if ( mapKeyType != null ) {
+						setTypeName( index, mapKeyType.getName() );
 					}
-			);
+					( (IndexedCollection) collection ).setIndex( index );
+				}
+				collection.setElement( element );
+			} );
 		}
 		else {
 			setTypeName( value, memberDetails.getType().getName() );
@@ -419,6 +417,34 @@ else if ( value instanceof SimpleValue simpleValue ) {
 		}
 	}
 
+	static void setType(Value value, TypeDetails type) {
+		final var typeName = type.getName();
+		if ( value instanceof ToOne toOne ) {
+			toOne.setReferencedEntityName( typeName );
+			toOne.setTypeName( typeName );
+		}
+		else if ( value instanceof Component component ) {
+			// Avoid setting type name for generic components
+			if ( !component.isGeneric() ) {
+				component.setComponentClassName( typeName );
+			}
+			if ( component.getTypeName() != null ) {
+				component.setTypeName( typeName );
+			}
+		}
+		else if ( value instanceof SimpleValue simpleValue ) {
+			if ( value instanceof BasicValue basicValue ) {
+				basicValue.setImplicitJavaTypeAccess( typeConfiguration ->
+						type.getTypeKind() == TypeDetails.Kind.PARAMETERIZED_TYPE
+						? ParameterizedTypeImpl.from( type.asParameterizedType() )
+						: type.determineRawClass().toJavaClass() );
+			}
+			else {
+				simpleValue.setTypeName( typeName );
+			}
+		}
+	}
+
 	private void addPropertyToJoin(Property property, MemberDetails memberDetails, ClassDetails declaringClass, Join join) {
 		if ( declaringClass != null ) {
 			final var inheritanceState = inheritanceStatePerClass.get( declaringClass );
@@ -447,7 +473,7 @@ private void addPropertyToJoin(Property property, MemberDetails memberDetails, C
 	private Map<String, Join> getJoinsPerRealTableName() {
 		if ( joinsPerRealTableName == null ) {
 			joinsPerRealTableName = mapOfSize( joins.size() );
-			for ( Join join : joins.values() ) {
+			for ( var join : joins.values() ) {
 				joinsPerRealTableName.put( join.getTable().getName(), join );
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
index f60ab5e44969..ae42f0d4758a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
@@ -35,11 +35,11 @@
 import org.hibernate.mapping.Backref;
 import org.hibernate.mapping.CheckConstraint;
 import org.hibernate.mapping.Collection;
-import org.hibernate.mapping.Column;
 import org.hibernate.mapping.DependantValue;
 import org.hibernate.mapping.KeyValue;
 import org.hibernate.mapping.ManyToOne;
 import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.PrimaryKey;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SimpleValue;
@@ -65,7 +65,6 @@
 import jakarta.persistence.ConstraintMode;
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Embedded;
-import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ForeignKey;
 import jakarta.persistence.Index;
@@ -91,7 +90,6 @@
 import static org.hibernate.boot.model.internal.AnnotatedColumn.buildColumnFromAnnotation;
 import static org.hibernate.boot.model.internal.AnnotatedColumn.buildColumnFromAnnotations;
 import static org.hibernate.boot.model.internal.AnnotatedColumn.buildColumnFromNoAnnotation;
-import static org.hibernate.boot.model.internal.AnnotatedColumn.buildColumnsFromAnnotations;
 import static org.hibernate.boot.model.internal.AnnotatedColumn.buildFormulaFromAnnotation;
 import static org.hibernate.boot.model.internal.AnnotatedJoinColumns.buildJoinColumnsWithDefaultColumnSuffix;
 import static org.hibernate.boot.model.internal.AnnotatedJoinColumns.buildJoinTableJoinColumns;
@@ -107,6 +105,7 @@
 import static org.hibernate.boot.model.internal.BinderHelper.isPrimitive;
 import static org.hibernate.boot.model.internal.DialectOverridesAnnotationHelper.getOverridableAnnotation;
 import static org.hibernate.boot.model.internal.EmbeddableBinder.fillEmbeddable;
+import static org.hibernate.boot.model.internal.EntityBinder.isEntity;
 import static org.hibernate.boot.model.internal.GeneratorBinder.visitIdGeneratorDefinitions;
 import static org.hibernate.boot.model.internal.PropertyHolderBuilder.buildPropertyHolder;
 import static org.hibernate.boot.model.internal.QueryBinder.bindNativeQuery;
@@ -243,8 +242,6 @@ public static void bindCollection(
 		collectionBinder.setInheritanceStatePerClass( inheritanceStatePerClass );
 		collectionBinder.setDeclaringClass( inferredData.getDeclaringClass() );
 
-		final var hibernateCascade = memberDetails.getAnnotationUsage( Cascade.class, modelsContext );
-
 		collectionBinder.setElementColumns( elementColumns(
 				propertyHolder,
 				nullability,
@@ -287,8 +284,7 @@ public static void bindCollection(
 						oneToManyAnn,
 						manyToManyAnn,
 						elementCollectionAnn,
-						collectionBinder,
-						hibernateCascade
+						collectionBinder
 				)
 		);
 
@@ -302,20 +298,12 @@ public static void bindCollection(
 			final HashMap<String, IdentifierGeneratorDefinition> availableGenerators = new HashMap<>();
 			visitIdGeneratorDefinitions(
 					memberDetails.getDeclaringType(),
-					definition -> {
-						if ( !definition.getName().isEmpty() ) {
-							availableGenerators.put( definition.getName(), definition );
-						}
-					},
+					definition -> addDefinition( definition, availableGenerators ),
 					context
 			);
 			visitIdGeneratorDefinitions(
 					memberDetails,
-					definition -> {
-						if ( !definition.getName().isEmpty() ) {
-							availableGenerators.put( definition.getName(), definition );
-						}
-					},
+					definition -> addDefinition( definition, availableGenerators ),
 					context
 			);
 			collectionBinder.setLocalGenerators( availableGenerators );
@@ -324,6 +312,15 @@ public static void bindCollection(
 		collectionBinder.bind();
 	}
 
+	private static void addDefinition(
+			IdentifierGeneratorDefinition definition,
+			Map<String, IdentifierGeneratorDefinition> availableGenerators) {
+		final String definitionName = definition.getName();
+		if ( !definitionName.isEmpty() ) {
+			availableGenerators.put( definitionName, definition );
+		}
+	}
+
 	private static NotFoundAction notFoundAction(
 			PropertyHolder propertyHolder,
 			PropertyData inferredData,
@@ -443,8 +440,7 @@ private static String handleTargetEntity(
 			OneToMany oneToManyAnn,
 			ManyToMany manyToManyAnn,
 			ElementCollection elementCollectionAnn,
-			CollectionBinder collectionBinder,
-			Cascade hibernateCascade) {
+			CollectionBinder collectionBinder) {
 
 		//TODO enhance exception with @ManyToAny and @CollectionOfElements
 		if ( oneToManyAnn != null && manyToManyAnn != null ) {
@@ -461,7 +457,7 @@ private static String handleTargetEntity(
 			mappedBy = nullIfEmpty( oneToManyAnn.mappedBy() );
 			collectionBinder.setTargetEntity( oneToManyAnn.targetEntity() );
 			collectionBinder.setCascadeStrategy(
-					aggregateCascadeTypes( oneToManyAnn.cascade(), hibernateCascade,
+					aggregateCascadeTypes( oneToManyAnn.cascade(), property,
 							oneToManyAnn.orphanRemoval(), context ) );
 			collectionBinder.setOneToMany( true );
 		}
@@ -479,14 +475,14 @@ else if ( manyToManyAnn != null ) {
 			mappedBy = nullIfEmpty( manyToManyAnn.mappedBy() );
 			collectionBinder.setTargetEntity( manyToManyAnn.targetEntity() );
 			collectionBinder.setCascadeStrategy(
-					aggregateCascadeTypes( manyToManyAnn.cascade(), hibernateCascade, false, context ) );
+					aggregateCascadeTypes( manyToManyAnn.cascade(), property, false, context ) );
 			collectionBinder.setOneToMany( false );
 		}
 		else if ( property.hasDirectAnnotationUsage( ManyToAny.class ) ) {
 			mappedBy = null;
 			collectionBinder.setTargetEntity( ClassDetails.VOID_CLASS_DETAILS );
 			collectionBinder.setCascadeStrategy(
-					aggregateCascadeTypes( null, hibernateCascade, false, context ) );
+					aggregateCascadeTypes( property.getDirectAnnotationUsage( ManyToAny.class ).cascade(), property, false, context ) );
 			collectionBinder.setOneToMany( false );
 		}
 		else {
@@ -533,18 +529,6 @@ private static AnnotatedColumns elementColumns(
 		else if ( property.hasDirectAnnotationUsage( Formula.class ) ) {
 			return buildFormulaFromAnnotation(
 					getOverridableAnnotation(property, Formula.class, context),
-//					comment,
-					nullability,
-					propertyHolder,
-					virtualProperty,
-					entityBinder.getSecondaryTables(),
-					context
-			);
-		}
-		else if ( property.hasDirectAnnotationUsage( Columns.class ) ) {
-			return buildColumnsFromAnnotations(
-					property.getDirectAnnotationUsage( Columns.class ).columns(),
-					null,
 //					comment,
 					nullability,
 					propertyHolder,
@@ -1062,9 +1046,7 @@ private void bind() {
 		}
 		collection = createCollection( propertyHolder.getPersistentClass() );
 		final String role = qualify( propertyHolder.getPath(), propertyName );
-		if ( BOOT_LOGGER.isTraceEnabled() ) {
-			BOOT_LOGGER.bindingCollectionRole( role );
-		}
+		BOOT_LOGGER.bindingCollectionRole( role );
 		collection.setRole( role );
 		collection.setMappedByProperty( mappedBy );
 
@@ -1145,16 +1127,14 @@ private void detectMappedByProblem(boolean isMappedBy) {
 			}
 			if ( oneToMany ) {
 				if ( property.hasDirectAnnotationUsage( MapKeyColumn.class ) ) {
-					BOOT_LOGGER.warn( "Association '"
-									+ qualify( propertyHolder.getPath(), propertyName )
-									+ "' is 'mappedBy' another entity and should not specify a '@MapKeyColumn'"
-									+ " (use '@MapKey' instead)" );
+					BOOT_LOGGER.mappedByShouldNotSpecifyMapKeyColumn(
+							qualify( propertyHolder.getPath(), propertyName )
+					);
 				}
 				if ( property.hasDirectAnnotationUsage( OrderColumn.class ) ) {
-					BOOT_LOGGER.warn( "Association '"
-									+ qualify( propertyHolder.getPath(), propertyName )
-									+ "' is 'mappedBy' another entity and should not specify an '@OrderColumn'"
-									+ " (use '@OrderBy' instead)" );
+					BOOT_LOGGER.mappedByShouldNotSpecifyOrderColumn(
+							qualify( propertyHolder.getPath(), propertyName )
+					);
 				}
 			}
 			else {
@@ -1391,14 +1371,14 @@ private ModelsContext modelsContext() {
 	}
 
 	private void handleFetchProfileOverrides() {
-		property.forEachAnnotationUsage( FetchProfileOverride.class, modelsContext(), (usage) -> {
-			getMetadataCollector().addSecondPass( new FetchSecondPass(
-					usage,
-					propertyHolder,
-					propertyName,
-					buildingContext
-			) );
-		} );
+		property.forEachAnnotationUsage( FetchProfileOverride.class, modelsContext(),
+				usage -> getMetadataCollector()
+						.addSecondPass( new FetchSecondPass(
+								usage,
+								propertyHolder,
+								propertyName,
+								buildingContext
+						) ) );
 	}
 
 	private void handleFetch() {
@@ -1606,11 +1586,8 @@ private void createOneToManyBackref(org.hibernate.mapping.OneToMany oneToMany) {
 		// for non-inverse one-to-many, with a not-null fk, add a backref!
 		final String entityName = oneToMany.getReferencedEntityName();
 		final var referencedEntity = collector.getEntityBinding( entityName );
-		final Backref backref = new Backref();
-		final String backrefName = '_' + foreignJoinColumns.getPropertyName()
-				+ '_' + foreignJoinColumns.getColumns().get(0).getLogicalColumnName()
-				+ "Backref";
-		backref.setName( backrefName );
+		final var backref = new Backref();
+		backref.setName( backrefName() );
 		backref.setOptional( true );
 		backref.setUpdatable( false);
 		backref.setSelectable( false );
@@ -1620,6 +1597,12 @@ private void createOneToManyBackref(org.hibernate.mapping.OneToMany oneToMany) {
 		referencedEntity.addProperty( backref );
 	}
 
+	private String backrefName() {
+		return '_' + foreignJoinColumns.getPropertyName()
+			+ '_' + foreignJoinColumns.getColumns().get( 0 ).getLogicalColumnName()
+			+ "Backref";
+	}
+
 	private void handleJpaOrderBy(Collection collection, PersistentClass associatedClass) {
 		final String hqlOrderBy = extractHqlOrderBy( jpaOrderBy );
 		if ( hqlOrderBy != null ) {
@@ -1915,88 +1898,43 @@ private DependantValue buildCollectionKey(AnnotatedJoinColumns joinColumns, OnDe
 		final var key = new DependantValue( buildingContext, collection.getCollectionTable(), keyValue );
 		key.setTypeName( null );
 		joinColumns.checkPropertyConsistency();
-		final var columns = joinColumns.getColumns();
-		key.setNullable( columns.isEmpty() || columns.get(0).isNullable() );
-		key.setUpdateable( columns.isEmpty() || columns.get(0).isUpdatable() );
+		setCollectionKeyNullableUpdatable( joinColumns, key );
 		key.setOnDeleteAction( onDeleteAction );
 		collection.setKey( key );
 
 		if ( property != null ) {
-			final var collectionTable = property.getDirectAnnotationUsage( CollectionTable.class );
-			if ( collectionTable != null ) {
+			if ( property.hasDirectAnnotationUsage( CollectionTable.class ) ) {
+				final var collectionTable = property.getDirectAnnotationUsage( CollectionTable.class );
 				final var foreignKey = collectionTable.foreignKey();
-				final var constraintMode = foreignKey.value();
-				if ( constraintMode == NO_CONSTRAINT
-						|| constraintMode == PROVIDER_DEFAULT && noConstraintByDefault ) {
-					key.disableForeignKey();
-				}
-				else {
-					key.setForeignKeyName( nullIfEmpty( foreignKey.name() ) );
-					key.setForeignKeyDefinition( nullIfEmpty( foreignKey.foreignKeyDefinition() ) );
-					key.setForeignKeyOptions( foreignKey.options() );
-					if ( key.getForeignKeyName() == null
-							&& key.getForeignKeyDefinition() == null
-							&& collectionTable.joinColumns().length == 1 ) {
-						final var joinColumn = collectionTable.joinColumns()[0];
-						final var nestedForeignKey = joinColumn.foreignKey();
-						key.setForeignKeyName( nullIfEmpty( nestedForeignKey.name() ) );
-						key.setForeignKeyDefinition( nullIfEmpty( nestedForeignKey.foreignKeyDefinition() ) );
-						key.setForeignKeyOptions( nestedForeignKey.options() );
-					}
-				}
+				handleForeignKey( collectionTable.joinColumns(), foreignKey.name(), foreignKey.foreignKeyDefinition(),
+						foreignKey.options(), foreignKey.value(), noConstraintByDefault, key );
 			}
-			else {
+			else if ( property.hasDirectAnnotationUsage( JoinTable.class ) ) {
 				final var joinTable = property.getDirectAnnotationUsage( JoinTable.class );
-				if ( joinTable != null ) {
-					final var foreignKey = joinTable.foreignKey();
-					String foreignKeyName = foreignKey.name();
-					String foreignKeyDefinition = foreignKey.foreignKeyDefinition();
-					String foreignKeyOptions = foreignKey.options();
-					ConstraintMode foreignKeyValue = foreignKey.value();
-					final var joinColumnAnnotations = joinTable.joinColumns();
-					if ( !ArrayHelper.isEmpty( joinColumnAnnotations ) ) {
-						final var joinColumnAnn = joinColumnAnnotations[0];
-						final var joinColumnForeignKey = joinColumnAnn.foreignKey();
-						if ( foreignKeyName.isBlank() ) {
-							foreignKeyName = joinColumnForeignKey.name();
-							foreignKeyDefinition = joinColumnForeignKey.foreignKeyDefinition();
-							foreignKeyOptions = joinColumnForeignKey.options();
-						}
-						if ( foreignKeyValue != NO_CONSTRAINT ) {
-							foreignKeyValue = joinColumnForeignKey.value();
-						}
-					}
-					if ( foreignKeyValue == NO_CONSTRAINT
-							|| foreignKeyValue == PROVIDER_DEFAULT && noConstraintByDefault ) {
-						key.disableForeignKey();
-					}
-					else {
-						key.setForeignKeyName( nullIfEmpty( foreignKeyName ) );
-						key.setForeignKeyDefinition( nullIfEmpty( foreignKeyDefinition ) );
-						key.setForeignKeyOptions( foreignKeyOptions );
-					}
+				final var foreignKey = joinTable.foreignKey();
+				handleForeignKey( joinTable.joinColumns(), foreignKey.name(), foreignKey.foreignKeyDefinition(),
+						foreignKey.options(), foreignKey.value(), noConstraintByDefault, key );
+			}
+			else {
+				final String propertyPath = qualify( propertyHolder.getPath(), property.getName() );
+				final var foreignKey = propertyHolder.getOverriddenForeignKey( propertyPath );
+				if ( foreignKey != null ) {
+					handleForeignKeyConstraint( noConstraintByDefault, key, foreignKey );
 				}
 				else {
-					final String propertyPath = qualify( propertyHolder.getPath(), property.getName() );
-					final var foreignKey = propertyHolder.getOverriddenForeignKey( propertyPath );
-					if ( foreignKey != null ) {
-						handleForeignKeyConstraint( noConstraintByDefault, key, foreignKey );
+					final var oneToMany = property.getDirectAnnotationUsage( OneToMany.class );
+					final var onDelete = property.getDirectAnnotationUsage( OnDelete.class );
+					if ( oneToMany != null
+							&& !oneToMany.mappedBy().isBlank()
+							&& ( onDelete == null || onDelete.action() != OnDeleteAction.CASCADE ) ) {
+						// foreign key should be up to @ManyToOne side
+						// @OnDelete generate "on delete cascade" foreign key
+						key.disableForeignKey();
 					}
 					else {
-						final var oneToMany = property.getDirectAnnotationUsage( OneToMany.class );
-						final var onDelete = property.getDirectAnnotationUsage( OnDelete.class );
-						if ( oneToMany != null
-								&& !oneToMany.mappedBy().isBlank()
-								&& ( onDelete == null || onDelete.action() != OnDeleteAction.CASCADE ) ) {
-							// foreign key should be up to @ManyToOne side
-							// @OnDelete generate "on delete cascade" foreign key
-							key.disableForeignKey();
-						}
-						else {
-							final var joinColumn = property.getDirectAnnotationUsage( JoinColumn.class );
-							if ( joinColumn != null ) {
-								handleForeignKeyConstraint( noConstraintByDefault, key, joinColumn.foreignKey() );
-							}
+						final var joinColumn = property.getDirectAnnotationUsage( JoinColumn.class );
+						if ( joinColumn != null ) {
+							handleForeignKeyConstraint( noConstraintByDefault, key, joinColumn.foreignKey() );
 						}
 					}
 				}
@@ -2006,6 +1944,56 @@ private DependantValue buildCollectionKey(AnnotatedJoinColumns joinColumns, OnDe
 		return key;
 	}
 
+	private static void setCollectionKeyNullableUpdatable(AnnotatedJoinColumns joinColumns, DependantValue key) {
+		final var columns = joinColumns.getColumns();
+		if ( columns.isEmpty() ) {
+			key.setNullable( true );
+			key.setUpdateable( true );
+		}
+		else {
+			for ( var column : columns ) {
+				if ( !column.isFormula() ) {
+					key.setNullable( column.isNullable() );
+					key.setUpdateable( column.isUpdatable() );
+					return;
+				}
+			}
+			key.setNullable( true );
+			key.setUpdateable( false );
+		}
+	}
+
+	private static void handleForeignKey(
+			JoinColumn[] joinColumnAnnotations,
+			String foreignKeyName,
+			String foreignKeyDefinition,
+			String foreignKeyOptions,
+			ConstraintMode foreignKeyValue,
+			boolean noConstraintByDefault,
+			DependantValue key) {
+		if ( !ArrayHelper.isEmpty( joinColumnAnnotations ) ) {
+			final var joinColumn = joinColumnAnnotations[0];
+			final var nestedForeignKey = joinColumn.foreignKey();
+			if ( foreignKeyName.isBlank() ) {
+				foreignKeyName = nestedForeignKey.name();
+				foreignKeyDefinition = nestedForeignKey.foreignKeyDefinition();
+				foreignKeyOptions = nestedForeignKey.options();
+			}
+			if ( foreignKeyValue != NO_CONSTRAINT ) {
+				foreignKeyValue = nestedForeignKey.value();
+			}
+		}
+		if ( foreignKeyValue == NO_CONSTRAINT
+			|| foreignKeyValue == PROVIDER_DEFAULT && noConstraintByDefault ) {
+			key.disableForeignKey();
+		}
+		else {
+			key.setForeignKeyName( nullIfEmpty( foreignKeyName ) );
+			key.setForeignKeyDefinition( nullIfEmpty( foreignKeyDefinition ) );
+			key.setForeignKeyOptions( foreignKeyOptions );
+		}
+	}
+
 	private static void handleForeignKeyConstraint(
 			boolean noConstraintByDefault,
 			DependantValue key,
@@ -2071,7 +2059,7 @@ private void bindManyToManySecondPass(Map<String, PersistentClass> persistentCla
 		bindCollectionSecondPass( targetEntity, joinColumns );
 
 		if ( isCollectionOfEntities ) {
-			final ManyToOne element = handleCollectionOfEntities( elementTypeDetails, targetEntity, hqlOrderBy );
+			final var element = handleCollectionOfEntities( elementTypeDetails, targetEntity, hqlOrderBy );
 			bindManyToManyInverseForeignKey( targetEntity, inverseJoinColumns, element, oneToMany );
 		}
 		else if ( isManyToAny ) {
@@ -2399,6 +2387,8 @@ private void handleOwnedManyToMany(PersistentClass collectionEntity, boolean isC
 		collection.setCollectionTable( collectionTable );
 		handleCheckConstraints( collectionTable );
 		processSoftDeletes();
+		processTemporal();
+		processAudited();
 	}
 
 	private void handleCheckConstraints(Table collectionTable) {
@@ -2421,7 +2411,7 @@ private static void addCheckToCollection(Table collectionTable, Check check) {
 
 	private void processSoftDeletes() {
 		assert collection.getCollectionTable() != null;
-		final var softDelete = extractSoftDelete( property, buildingContext );
+		final var softDelete = extract( SoftDelete.class, property, buildingContext );
 		if ( softDelete != null ) {
 			SoftDeleteHelper.bindSoftDeleteIndicator(
 					softDelete,
@@ -2432,10 +2422,34 @@ private void processSoftDeletes() {
 		}
 	}
 
-	private static SoftDelete extractSoftDelete(MemberDetails property, MetadataBuildingContext context) {
-		final var fromProperty = property.getDirectAnnotationUsage( SoftDelete.class );
+	private void processTemporal() {
+		assert collection.getCollectionTable() != null;
+		final var temporal = extract( Temporal.class, property, buildingContext );
+		if ( temporal != null ) {
+			TemporalHelper.bindTemporalColumns(
+					temporal,
+					collection,
+					collection.getCollectionTable(),
+					property.getDirectAnnotationUsage( Temporal.HistoryTable.class ),
+					property.getDirectAnnotationUsage( Temporal.HistoryPartitioning.class ),
+					buildingContext
+			);
+		}
+	}
+
+	private void processAudited() {
+		assert collection.getCollectionTable() != null;
+		final var audited = extract( Audited.class, property, buildingContext );
+		if ( audited != null ) {
+			AuditHelper.bindAuditTable( audited, collection, buildingContext );
+		}
+	}
+
+	private static <T extends Annotation> T extract(
+			Class<T> annotationClass, MemberDetails property, MetadataBuildingContext context) {
+		final var fromProperty = property.getDirectAnnotationUsage( annotationClass );
 		return fromProperty == null
-				? extractFromPackage( SoftDelete.class, property.getDeclaringType(), context )
+				? extractFromPackage( annotationClass, property.getDeclaringType(), context )
 				: fromProperty;
 	}
 
@@ -2461,6 +2475,8 @@ private void handleUnownedManyToMany(
 		collection.setCollectionTable( table );
 
 		processSoftDeletes();
+		processTemporal();
+		processAudited();
 		checkCheckAnnotation();
 	}
 
@@ -2502,7 +2518,7 @@ else if (isManyToAny) {
 
 	static String targetEntityMessage(TypeDetails elementType) {
 		final String problem =
-				elementType.determineRawClass().hasDirectAnnotationUsage( Entity.class )
+				isEntity( elementType.determineRawClass() )
 						? " which does not belong to the same persistence unit"
 						: " which is not an '@Entity' type";
 		return " targets the type '" + elementType.getName() + "'" + problem;
@@ -2679,14 +2695,21 @@ private void bindOwnedManyToManyForeignKeyMappedBy(
 		if ( notFoundAction == NotFoundAction.IGNORE ) {
 			value.disableForeignKey();
 		}
+		final boolean createPrimaryKey = unique && oneToMany && collection.isSet();
 		TableBinder.bindForeignKey(
 				targetEntity,
 				collection.getOwner(),
 				joinColumns,
 				value,
-				unique,
+				unique && !createPrimaryKey,
 				buildingContext
 		);
+		if ( createPrimaryKey ) {
+			final var table = value.getTable();
+			final var primaryKey = new PrimaryKey( table );
+			primaryKey.addColumns( value );
+			table.setPrimaryKey( primaryKey );
+		}
 	}
 
 	private void bindUnownedManyToManyInverseForeignKey(
@@ -2696,7 +2719,7 @@ private void bindUnownedManyToManyInverseForeignKey(
 		final var mappedByProperty = targetEntity.getRecursiveProperty( mappedBy );
 		final var firstColumn = joinColumns.getJoinColumns().get(0);
 		for ( var selectable: mappedByColumns( targetEntity, mappedByProperty ) ) {
-			firstColumn.linkValueUsingAColumnCopy( (Column) selectable, value);
+			firstColumn.linkValueUsingCopy( selectable, value );
 		}
 		final var manyToOne = (ManyToOne) value;
 		setReferencedProperty( targetEntity.getEntityName(), mappedBy, manyToOne );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java
index 9a41d20566fd..6a9f183f8797 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java
@@ -6,7 +6,6 @@
 
 import org.hibernate.AnnotationException;
 import org.hibernate.annotations.Any;
-import org.hibernate.annotations.Columns;
 import org.hibernate.annotations.Formula;
 import org.hibernate.annotations.FractionalSeconds;
 import org.hibernate.annotations.JoinColumnOrFormula;
@@ -29,7 +28,6 @@
 
 import static org.hibernate.boot.model.internal.AnnotatedColumn.buildColumnFromAnnotation;
 import static org.hibernate.boot.model.internal.AnnotatedColumn.buildColumnFromNoAnnotation;
-import static org.hibernate.boot.model.internal.AnnotatedColumn.buildColumnsFromAnnotations;
 import static org.hibernate.boot.model.internal.AnnotatedColumn.buildFormulaFromAnnotation;
 import static org.hibernate.boot.model.internal.BinderHelper.getPath;
 import static org.hibernate.boot.model.internal.DialectOverridesAnnotationHelper.getOverridableAnnotation;
@@ -102,17 +100,6 @@ else if ( property.hasDirectAnnotationUsage( Formula.class) ) {
 					buildingContext
 			);
 		}
-		else if ( property.hasDirectAnnotationUsage( Columns.class ) ) {
-			columns = buildColumnsFromAnnotations(
-					property.getDirectAnnotationUsage( Columns.class ).columns(),
-					null,
-					nullability,
-					propertyHolder,
-					inferredData,
-					entityBinder.getSecondaryTables(),
-					buildingContext
-			);
-		}
 
 		//set default values if needed
 		if ( joinColumns == null
@@ -164,12 +151,13 @@ private AnnotatedJoinColumns buildDefaultJoinColumnsForToOne(
 			PropertyData inferredData) {
 		final var joinTable = propertyHolder.getJoinTable( property );
 		if ( joinTable != null ) {
-			return AnnotatedJoinColumns.buildJoinColumns(
-					joinTable.inverseJoinColumns(),
-					null,
+			final var inverseJoinColumns = joinTable.inverseJoinColumns();
+			return AnnotatedJoinColumns.buildJoinTableJoinColumns(
+					inverseJoinColumns.length == 0 ? null : inverseJoinColumns,
 					entityBinder.getSecondaryTables(),
 					propertyHolder,
 					inferredData,
+					null,
 					buildingContext
 			);
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java
index c59f88942003..1991f1b1b6bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java
@@ -12,7 +12,6 @@
 import org.hibernate.annotations.EmbeddedTable;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.models.AnnotationPlacementException;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.PropertyData;
 import org.hibernate.mapping.AggregateColumn;
@@ -118,40 +117,30 @@ public static void applyExplicitTableName(
 			PropertyHolder container,
 			MetadataBuildingContext buildingContext) {
 		Table tableToUse = container.getTable();
-		boolean wasExplicit = false;
-		if ( container instanceof ComponentPropertyHolder componentPropertyHolder ) {
-			wasExplicit = componentPropertyHolder.getComponent().wasTableExplicitlyDefined();
-		}
+		boolean wasExplicit =
+				container instanceof ComponentPropertyHolder componentPropertyHolder
+						&& componentPropertyHolder.getComponent().wasTableExplicitlyDefined();
 
-		if ( propertyData.getAttributeMember() != null ) {
-			final EmbeddedTable embeddedTableAnn = propertyData.getAttributeMember()
-					.getDirectAnnotationUsage( EmbeddedTable.class );
+		final var attributeMember = propertyData.getAttributeMember();
+		if ( attributeMember != null ) {
+			final var embeddedTableAnn = attributeMember.getDirectAnnotationUsage( EmbeddedTable.class );
 			// we only allow this when done for an embedded on an entity or mapped-superclass
 			if ( container instanceof ClassPropertyHolder ) {
 				if ( embeddedTableAnn != null ) {
-					final Identifier tableNameIdentifier = buildingContext.getObjectNameNormalizer().normalizeIdentifierQuoting( embeddedTableAnn.value() );
-					final InFlightMetadataCollector.EntityTableXref entityTableXref = buildingContext
-							.getMetadataCollector()
-							.getEntityTableXref( container.getEntityName() );
-					tableToUse =  entityTableXref.resolveTable( tableNameIdentifier );
+					tableToUse = resolveEmbeddedTable( container, buildingContext, embeddedTableAnn );
 					wasExplicit = true;
 				}
 			}
-			else {
-				if ( embeddedTableAnn != null ) {
-					// not allowed
-					throw new AnnotationPlacementException( "@EmbeddedTable only supported for use on entity or mapped-superclass" );
-				}
+			else if ( embeddedTableAnn != null ) {
+				// not allowed
+				throw new AnnotationPlacementException(
+						"@EmbeddedTable only supported for use on entity or mapped-superclass" );
 			}
 		}
-		if ( propertyData.getAttributeMember() != null && container instanceof ClassPropertyHolder ) {
-			final EmbeddedTable embeddedTableAnn = propertyData.getAttributeMember().getDirectAnnotationUsage( EmbeddedTable.class );
+		if ( attributeMember != null && container instanceof ClassPropertyHolder ) {
+			final var embeddedTableAnn = attributeMember.getDirectAnnotationUsage( EmbeddedTable.class );
 			if ( embeddedTableAnn != null ) {
-				final Identifier tableNameIdentifier = buildingContext.getObjectNameNormalizer().normalizeIdentifierQuoting( embeddedTableAnn.value() );
-				final InFlightMetadataCollector.EntityTableXref entityTableXref = buildingContext
-						.getMetadataCollector()
-						.getEntityTableXref( container.getEntityName() );
-				tableToUse =  entityTableXref.resolveTable( tableNameIdentifier );
+				tableToUse = resolveEmbeddedTable( container, buildingContext, embeddedTableAnn );
 				wasExplicit = true;
 			}
 		}
@@ -159,6 +148,17 @@ public static void applyExplicitTableName(
 		component.setTable( tableToUse, wasExplicit );
 	}
 
+	private static Table resolveEmbeddedTable(
+			PropertyHolder container, MetadataBuildingContext buildingContext, EmbeddedTable embeddedTableAnn) {
+		final Identifier tableNameIdentifier =
+				buildingContext.getObjectNameNormalizer()
+						.normalizeIdentifierQuoting( embeddedTableAnn.value() );
+		final var entityTableXref =
+				buildingContext.getMetadataCollector()
+						.getEntityTableXref( container.getEntityName() );
+		return entityTableXref.resolveTable( tableNameIdentifier );
+	}
+
 	/**
 	 * Access to the underlying component
 	 */
@@ -235,21 +235,19 @@ protected String normalizeCompositePathForLogging(String attributeName) {
 	public void startingProperty(MemberDetails propertyMemberDetails) {
 		if ( propertyMemberDetails != null ) {
 			// again: the property coming in here *should* be the property on the embeddable (Address#city in the example),
-			// so we just ignore it if there is already an existing conversion info for that path since they would have
+			// so we just ignore it if there is already an existing ConversionInfo for that path since they would have
 			// precedence
 
 			// technically we should only do this for properties of "basic type"
 
 			final String attributeName = propertyMemberDetails.resolveAttributeName();
 			final String path = embeddedAttributeName + '.' + attributeName;
-			if ( attributeConversionInfoMap.containsKey( path ) ) {
-				return;
+			if ( !attributeConversionInfoMap.containsKey( path ) ) {
+				propertyMemberDetails.forEachAnnotationUsage( Convert.class, getSourceModelContext(), (usage) -> {
+					final var info = new AttributeConversionInfo( usage, propertyMemberDetails );
+					attributeConversionInfoMap.put( attributeName, info );
+				} );
 			}
-
-			propertyMemberDetails.forEachAnnotationUsage( Convert.class, getSourceModelContext(), (usage) -> {
-				final AttributeConversionInfo info = new AttributeConversionInfo( usage, propertyMemberDetails );
-				attributeConversionInfoMap.put( attributeName, info );
-			} );
 		}
 	}
 
@@ -403,7 +401,7 @@ public void setParentProperty(String parentProperty) {
 	@Override
 	public Column[] getOverriddenColumn(String propertyName) {
 		//FIXME this is yukky
-		Column[] result = super.getOverriddenColumn( propertyName );
+		var result = super.getOverriddenColumn( propertyName );
 		if ( result == null ) {
 			final String userPropertyName = extractUserPropertyName( "id", propertyName );
 			if ( userPropertyName != null ) {
@@ -434,6 +432,7 @@ private String extractUserPropertyName(String redundantString, String propertyNa
 
 	@Override
 	public String toString() {
-		return getClass().getSimpleName() + "(" + parent.normalizeCompositePathForLogging( embeddedAttributeName ) + ")";
+		return getClass().getSimpleName()
+			+ "(" + parent.normalizeCompositePathForLogging( embeddedAttributeName ) + ")";
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/Constructors.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/Constructors.java
new file mode 100644
index 000000000000..94df5163f107
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/Constructors.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.model.internal;
+
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+
+/**
+ * @author Gavin King
+ * @since 7.3
+ */
+public class Constructors {
+
+	public static <C> C construct(
+			Class<? extends C> construction,
+			TypedArgument<?>... arguments)
+					throws InstantiationException, IllegalAccessException, InvocationTargetException {
+		try {
+			final var types = Arrays.stream( arguments ).map( TypedArgument::type ).toArray( Class<?>[]::new );
+			final var values = Arrays.stream( arguments ).map( TypedArgument::argument ).toArray();
+			final var constructor = construction.getDeclaredConstructor( types );
+			constructor.setAccessible( true );
+			return constructor.newInstance( values );
+		}
+		catch (NoSuchMethodException ignore) {
+			return null;
+		}
+	}
+
+	public static <C,U> C construct(
+			Class<? extends C> construction,
+			Class<U> type, U argument)
+					throws InstantiationException, IllegalAccessException, InvocationTargetException {
+		return construct( construction, TypedArgument.of( type, argument ) );
+	}
+
+	public static <C,U,V> C construct(
+			Class<? extends C> construction,
+			Class<U> type1, U argument1,
+			Class<V> type2, V argument2)
+					throws InstantiationException, IllegalAccessException, InvocationTargetException {
+		return construct( construction,
+				TypedArgument.of( type1, argument1 ),
+				TypedArgument.of( type2, argument2 ) );
+	}
+
+	public static <C,U,V,W> C construct(
+			Class<? extends C> construction,
+			Class<U> type1, U argument1,
+			Class<V> type2, V argument2,
+			Class<W> type3, W argument3)
+					throws InstantiationException, IllegalAccessException, InvocationTargetException {
+		return construct( construction,
+				TypedArgument.of( type1, argument1 ),
+				TypedArgument.of( type2, argument2 ),
+				TypedArgument.of( type3, argument3 ) );
+	}
+
+	public record TypedArgument<T>(Class<T> type, T argument) {
+		public static <T> TypedArgument<T> of(Class<T> type, T argument) {
+			return new TypedArgument<>(type, argument);
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java
index 030253640cf6..3c62dedd0207 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java
@@ -15,7 +15,6 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToMany;
 import jakarta.persistence.ManyToOne;
-import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import org.hibernate.AnnotationException;
@@ -25,7 +24,7 @@
 import org.hibernate.annotations.EmbeddedColumnNaming;
 import org.hibernate.annotations.Instantiator;
 import org.hibernate.annotations.TypeBinderType;
-import org.hibernate.binder.TypeBinder;
+import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.spi.AccessType;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.PropertyData;
@@ -65,10 +64,13 @@
 import static org.hibernate.boot.model.internal.BinderHelper.getPath;
 import static org.hibernate.boot.model.internal.BinderHelper.getRelativePath;
 import static org.hibernate.boot.model.internal.BinderHelper.hasToOneAnnotation;
+import static org.hibernate.boot.model.internal.Binders.callTypeBinder;
 import static org.hibernate.boot.model.internal.ComponentPropertyHolder.applyExplicitTableName;
 import static org.hibernate.boot.model.internal.DialectOverridesAnnotationHelper.getOverridableAnnotation;
+import static org.hibernate.boot.model.internal.EntityBinder.isMappedSuperclass;
 import static org.hibernate.boot.model.internal.GeneratorBinder.createIdGeneratorsFromGeneratorAnnotations;
 import static org.hibernate.boot.model.internal.PropertyBinder.addElementsOfClass;
+import static org.hibernate.boot.model.internal.PropertyBinder.isEmbeddedId;
 import static org.hibernate.boot.model.internal.PropertyBinder.processElementAnnotations;
 import static org.hibernate.boot.model.internal.PropertyHolderBuilder.buildPropertyHolder;
 import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
@@ -78,6 +80,7 @@
 import static org.hibernate.internal.util.StringHelper.qualify;
 import static org.hibernate.internal.util.StringHelper.unqualify;
 import static org.hibernate.internal.util.collections.CollectionHelper.mapOfSize;
+import static org.hibernate.spi.NavigablePath.IDENTIFIER_MAPPER_PROPERTY;
 
 /**
  * A binder responsible for interpreting {@link Embeddable} classes and producing
@@ -237,6 +240,15 @@ static boolean isEmbedded(MemberDetails memberDetails, TypeDetails returnedClass
 		}
 	}
 
+	static boolean isEmbedded(MemberDetails memberDetails) {
+		final var elementType = memberDetails.getElementType();
+		return elementType != null && isEmbedded( memberDetails, elementType );
+	}
+
+	public static boolean isEmbeddable(ClassDetails type) {
+		return type.hasDirectAnnotationUsage( Embeddable.class );
+	}
+
 	private static Component bindOverriddenEmbeddable(
 			PropertyData inferredData,
 			PropertyHolder propertyHolder,
@@ -316,17 +328,7 @@ private static void callTypeBinders(Component embeddable, MetadataBuildingContex
 						.getMetaAnnotated( TypeBinderType.class,
 								context.getBootstrapContext().getModelsContext() );
 		for ( var metaAnnotated : metaAnnotatedAnnotations ) {
-			final var binderType = metaAnnotated.annotationType().getAnnotation( TypeBinderType.class );
-			try {
-				//noinspection rawtypes
-				final TypeBinder binder = binderType.binder().getDeclaredConstructor().newInstance();
-				//noinspection unchecked
-				binder.bind( metaAnnotated, context, embeddable );
-			}
-			catch (Exception e) {
-				throw new AnnotationException(
-						"error processing @TypeBinderType annotation '" + metaAnnotated + "'", e );
-			}
+			callTypeBinder( metaAnnotated, metaAnnotated.annotationType(), embeddable, context );
 		}
 	}
 
@@ -822,7 +824,7 @@ private static boolean isValidSuperclass(ClassDetails superClass, boolean isIdCl
 		if ( superClass == null ) {
 			return false;
 		}
-		else if ( superClass.hasDirectAnnotationUsage( MappedSuperclass.class ) ) {
+		else if ( isMappedSuperclass( superClass ) ) {
 			return true;
 		}
 		else if ( isIdClass ) {
@@ -963,7 +965,7 @@ private static boolean deferIdProperty(PropertyData entityPropertyData, Property
 			&& !entityPropertyData.getClassOrElementType().equals( idClassPropertyData.getClassOrElementType() );
 	}
 
-	private static boolean hasCompatibleType(String typeNameInIdClass, String typeNameInEntityClass) {
+	static boolean hasCompatibleType(String typeNameInIdClass, String typeNameInEntityClass) {
 		return typeNameInIdClass.equals( typeNameInEntityClass )
 			|| canonicalize( typeNameInIdClass ).equals( typeNameInEntityClass )
 			|| typeNameInIdClass.equals( canonicalize( typeNameInEntityClass ) );
@@ -994,7 +996,7 @@ static Component createEmbeddable(
 		embeddable.setEmbedded( isNonAggregated );
 		applyExplicitTableName( embeddable, inferredData, propertyHolder, context );
 
-		if ( isIdentifierMapper
+		if ( isIdentifierMapper( inferredData, isIdentifierMapper )
 				|| isNonAggregated && inferredData.getPropertyName() == null ) {
 			embeddable.setComponentClassName( embeddable.getOwner().getClassName() );
 		}
@@ -1016,6 +1018,10 @@ static Component createEmbeddable(
 		return embeddable;
 	}
 
+	private static boolean isIdentifierMapper(PropertyData inferredData, boolean isIdentifierMapper) {
+		return isIdentifierMapper && IDENTIFIER_MAPPER_PROPERTY.equals( inferredData.getPropertyName() );
+	}
+
 	private static void checkEmbeddableRecursiveHierarchy(
 			TypeDetails type,
 			PropertyData propertyData,
@@ -1101,7 +1107,7 @@ public static Class<? extends EmbeddableInstantiator> determineCustomInstantiato
 			MemberDetails property,
 			ClassDetails returnedClass,
 			MetadataBuildingContext context) {
-		if ( property.hasDirectAnnotationUsage( EmbeddedId.class ) ) {
+		if ( isEmbeddedId( property ) ) {
 			// we don't allow custom instantiators for composite ids
 			return null;
 		}
@@ -1167,12 +1173,11 @@ public void doSecondPass(Map<String, PersistentClass> persistentClasses) throws
 
 			//prepare column name structure
 			boolean isExplicitReference = true;
-			final List<AnnotatedJoinColumn> columns = joinColumns.getJoinColumns();
+			final var columns = joinColumns.getJoinColumns();
 			final Map<String, AnnotatedJoinColumn> columnByReferencedName = mapOfSize( columns.size() );
 			for ( var joinColumn : columns ) {
 				if ( !joinColumn.isReferenceImplicit() ) {
-					//JPA 2 requires referencedColumnNames to be case-insensitive
-					columnByReferencedName.put( joinColumn.getReferencedColumn().toLowerCase( Locale.ROOT), joinColumn );
+					columnByReferencedName.put( normalizedColumnName( joinColumn ), joinColumn );
 				}
 			}
 			//try default column orientation
@@ -1185,25 +1190,38 @@ public void doSecondPass(Map<String, PersistentClass> persistentClasses) throws
 
 			final var index = new MutableInteger();
 			for ( var referencedProperty : referencedComponent.getProperties() ) {
-				final Property property;
-				if ( referencedProperty.isComposite() ) {
-					property = createComponentProperty(
-							isExplicitReference,
-							columnByReferencedName,
-							index,
-							referencedProperty
-					);
-				}
-				else {
-					property = createSimpleProperty(
-							referencedPersistentClass,
-							isExplicitReference,
-							columnByReferencedName,
-							index,
-							referencedProperty
-					);
-				}
-				embeddable.addProperty( property );
+				embeddable.addProperty( createProperty(
+						referencedProperty,
+						isExplicitReference,
+						columnByReferencedName,
+						index,
+						referencedPersistentClass
+				) );
+			}
+		}
+
+		private Property createProperty(
+				Property referencedProperty,
+				boolean isExplicitReference,
+				Map<String, AnnotatedJoinColumn> columnByReferencedName,
+				MutableInteger index,
+				PersistentClass referencedPersistentClass) {
+			if ( referencedProperty.isComposite() ) {
+				return createComponentProperty(
+						isExplicitReference,
+						columnByReferencedName,
+						index,
+						referencedProperty
+				);
+			}
+			else {
+				return createSimpleProperty(
+						referencedPersistentClass,
+						isExplicitReference,
+						columnByReferencedName,
+						index,
+						referencedProperty
+				);
 			}
 		}
 
@@ -1308,16 +1326,17 @@ private Property createSimpleProperty(
 					if ( selectable instanceof org.hibernate.mapping.Column column ) {
 						final AnnotatedJoinColumn joinColumn;
 						final String logicalColumnName;
+						final String referenceName;
 						if ( isExplicitReference ) {
 							logicalColumnName = column.getName();
-							//JPA 2 requires referencedColumnNames to be case-insensitive
-							joinColumn = columnByReferencedName.get( logicalColumnName.toLowerCase( Locale.ROOT ) );
+							referenceName = normalizedColumnName( column );
 						}
 						else {
 							logicalColumnName = null;
-							joinColumn = columnByReferencedName.get( String.valueOf( index.get() ) );
+							referenceName = String.valueOf( index.get() );
 							index.getAndIncrement();
 						}
+						joinColumn = columnByReferencedName.get( referenceName );
 						if ( joinColumn == null && !firstColumn.isNameDeferred() ) {
 							throw new AnnotationException(
 									"Property '" + propertyName
@@ -1360,4 +1379,26 @@ private void applyComponentColumnSizeValueToJoinColumn(
 			mappingColumn.setArrayLength( column.getArrayLength() );
 		}
 	}
+
+	private static String normalizedColumnName(AnnotatedJoinColumn joinColumn) {
+		final Identifier referencedColumn =
+				joinColumn.getBuildingContext().getObjectNameNormalizer()
+						.normalizeIdentifierQuoting( joinColumn.getReferencedColumn() );
+		return referencedColumn.isQuoted()
+				? referencedColumn.getText()
+				//CLAIM: "JPA 2 requires referencedColumnNames to be case-insensitive"
+				//FACT: In fact, the spec doesn't say anything of the sort anywhere!
+				//      But changing this would not be backward compatible (2026)
+				: referencedColumn.getText().toLowerCase( Locale.ROOT );
+	}
+
+	private static String normalizedColumnName(org.hibernate.mapping.Column column) {
+		final String logicalColumnName = column.getName();
+		return column.isQuoted()
+				? logicalColumnName
+				//CLAIM: "JPA 2 requires referencedColumnNames to be case-insensitive"
+				//FACT: In fact, the spec doesn't say anything of the sort anywhere!
+				//      But changing this would not be backward compatible (2026)
+				: logicalColumnName.toLowerCase( Locale.ROOT );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java
index e553f89e1c2b..deb23b12721b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java
@@ -29,8 +29,42 @@
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
-import org.hibernate.annotations.*;
-import org.hibernate.binder.TypeBinder;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.CacheLayout;
+import org.hibernate.annotations.Check;
+import org.hibernate.annotations.Checks;
+import org.hibernate.annotations.ConcreteProxy;
+import org.hibernate.annotations.DiscriminatorFormula;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Filter;
+import org.hibernate.annotations.Filters;
+import org.hibernate.annotations.HQLSelect;
+import org.hibernate.annotations.Immutable;
+import org.hibernate.annotations.Mutability;
+import org.hibernate.annotations.NaturalIdCache;
+import org.hibernate.annotations.NaturalIdClass;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OptimisticLockType;
+import org.hibernate.annotations.OptimisticLocking;
+import org.hibernate.annotations.QueryCacheLayout;
+import org.hibernate.annotations.RowId;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.SQLDeleteAll;
+import org.hibernate.annotations.SQLInsert;
+import org.hibernate.annotations.SQLRestriction;
+import org.hibernate.annotations.SQLSelect;
+import org.hibernate.annotations.SQLUpdate;
+import org.hibernate.annotations.SecondaryRow;
+import org.hibernate.annotations.SecondaryRows;
+import org.hibernate.annotations.Audited;
+import org.hibernate.annotations.SoftDelete;
+import org.hibernate.annotations.Temporal;
+import org.hibernate.annotations.Subselect;
+import org.hibernate.annotations.Synchronize;
+import org.hibernate.annotations.TypeBinderType;
+import org.hibernate.annotations.View;
 import org.hibernate.boot.model.NamedEntityGraphDefinition;
 import org.hibernate.boot.model.internal.InheritanceState.ElementsToProcess;
 import org.hibernate.boot.model.naming.EntityNaming;
@@ -59,6 +93,7 @@
 import org.hibernate.mapping.Join;
 import org.hibernate.mapping.JoinedSubclass;
 import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
 import org.hibernate.mapping.RootClass;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.SingleTableSubclass;
@@ -71,6 +106,7 @@
 import org.hibernate.models.internal.ClassTypeDetailsImpl;
 import org.hibernate.models.spi.AnnotationTarget;
 import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.MemberDetails;
 import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.spi.NavigablePath;
@@ -86,6 +122,7 @@
 
 import static jakarta.persistence.InheritanceType.SINGLE_TABLE;
 import static java.util.Collections.addAll;
+import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
 import static org.hibernate.boot.model.internal.AnnotatedClassType.MAPPED_SUPERCLASS;
 import static org.hibernate.boot.model.internal.AnnotatedDiscriminatorColumn.DEFAULT_DISCRIMINATOR_COLUMN_NAME;
 import static org.hibernate.boot.model.internal.AnnotatedDiscriminatorColumn.buildDiscriminatorColumn;
@@ -97,12 +134,15 @@
 import static org.hibernate.boot.model.internal.BinderHelper.hasToOneAnnotation;
 import static org.hibernate.boot.model.internal.BinderHelper.toAliasEntityMap;
 import static org.hibernate.boot.model.internal.BinderHelper.toAliasTableMap;
+import static org.hibernate.boot.model.internal.Binders.callTypeBinder;
+import static org.hibernate.boot.model.internal.ClassPropertyHolder.setType;
 import static org.hibernate.boot.model.internal.DialectOverridesAnnotationHelper.getOverridableAnnotation;
 import static org.hibernate.boot.model.internal.DialectOverridesAnnotationHelper.getOverrideAnnotation;
 import static org.hibernate.boot.model.internal.EmbeddableBinder.fillEmbeddable;
 import static org.hibernate.boot.model.internal.InheritanceState.getInheritanceStateOfSuperEntity;
 import static org.hibernate.boot.model.internal.PropertyBinder.addElementsOfClass;
 import static org.hibernate.boot.model.internal.PropertyBinder.hasIdAnnotation;
+import static org.hibernate.boot.model.internal.PropertyBinder.isVersion;
 import static org.hibernate.boot.model.internal.PropertyBinder.processElementAnnotations;
 import static org.hibernate.boot.model.internal.PropertyHolderBuilder.buildPropertyHolder;
 import static org.hibernate.boot.model.internal.QueryBinder.bindNativeQuery;
@@ -112,7 +152,6 @@
 import static org.hibernate.boot.spi.AccessType.getAccessStrategy;
 import static org.hibernate.engine.OptimisticLockStyle.fromLockType;
 import static org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle.fromResultCheckStyle;
-import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
 import static org.hibernate.internal.util.ReflectHelper.getDefaultSupplier;
 import static org.hibernate.internal.util.StringHelper.isBlank;
 import static org.hibernate.internal.util.StringHelper.isNotBlank;
@@ -122,6 +161,7 @@
 import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty;
 import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
 import static org.hibernate.jpa.event.internal.CallbackDefinitionResolver.resolveLifecycleCallbacks;
+import static org.hibernate.models.spi.TypeDetailsHelper.resolveRelativeType;
 import static org.hibernate.property.access.spi.BuiltInPropertyAccessStrategies.EMBEDDED;
 
 
@@ -144,9 +184,9 @@ public class EntityBinder {
 	// todo : we should defer to InFlightMetadataCollector.EntityTableXref for secondary table tracking;
 	//		atm we use both from here; HBM binding solely uses InFlightMetadataCollector.EntityTableXref
 	private final java.util.Map<String, Join> secondaryTables = new HashMap<>();
-	private final java.util.Map<String, Object> secondaryTableJoins = new HashMap<>();
+	private final java.util.Map<String, Annotation[]> secondaryTableJoins = new HashMap<>();
 	private final java.util.Map<String, Join> secondaryTablesFromAnnotation = new HashMap<>();
-	private final java.util.Map<String, Object> secondaryTableFromAnnotationJoins = new HashMap<>();
+	private final java.util.Map<String, Annotation[]> secondaryTableFromAnnotationJoins = new HashMap<>();
 
 	private final List<Filter> filters = new ArrayList<>();
 	private boolean ignoreIdAnnotations;
@@ -159,6 +199,7 @@ public class EntityBinder {
 	private String cacheRegion;
 	private boolean cacheLazyProperty;
 	private String naturalIdCacheRegion;
+	private ClassDetails naturalIdClass;
 	private CacheLayout queryCacheLayout;
 
 	private ModelsContext modelsContext() {
@@ -219,6 +260,8 @@ public static void bindEntityClass(
 		if ( persistentClass instanceof RootClass rootClass ) {
 			collector.addSecondPass( new CreateKeySecondPass( rootClass ) );
 			bindSoftDelete( clazzToProcess, rootClass, context );
+			bindTemporal( clazzToProcess, rootClass, context );
+			bindAudited( clazzToProcess, rootClass, context );
 		}
 		if ( persistentClass instanceof Subclass subclass ) {
 			assert superEntity != null;
@@ -283,7 +326,7 @@ private static void bindSoftDelete(
 		// todo (soft-delete) : do we assume all package-level registrations are already available?
 		//		or should this be a "second pass"?
 
-		final var softDelete = extractSoftDelete( classDetails, context );
+		final var softDelete = extract( SoftDelete.class, classDetails, context );
 		if ( softDelete != null ) {
 			SoftDeleteHelper.bindSoftDeleteIndicator(
 					softDelete,
@@ -294,16 +337,44 @@ private static void bindSoftDelete(
 		}
 	}
 
-	private static SoftDelete extractSoftDelete(ClassDetails classDetails, MetadataBuildingContext context) {
+	private static void bindTemporal(
+			ClassDetails classDetails,
+			RootClass rootClass,
+			MetadataBuildingContext context) {
+		final var temporal = extract( Temporal.class, classDetails, context );
+		if ( temporal != null ) {
+			TemporalHelper.bindTemporalColumns(
+					temporal,
+					rootClass,
+					rootClass.getRootTable(),
+					classDetails.getDirectAnnotationUsage( Temporal.HistoryTable.class ),
+					classDetails.getDirectAnnotationUsage( Temporal.HistoryPartitioning.class ),
+					context
+			);
+		}
+	}
+
+	private static void bindAudited(
+			ClassDetails classDetails,
+			RootClass rootClass,
+			MetadataBuildingContext context) {
+		final var audited = extract( Audited.class, classDetails, context );
+		if ( audited != null ) {
+			AuditHelper.bindAuditTable( audited, rootClass, context );
+		}
+	}
+
+	private static <T extends Annotation> T extract(
+			Class<T> annotationClass, ClassDetails classDetails, MetadataBuildingContext context) {
 		final var modelsContext = context.getBootstrapContext().getModelsContext();
-		final var fromClass = classDetails.getAnnotationUsage( SoftDelete.class, modelsContext );
+		final var fromClass = classDetails.getAnnotationUsage( annotationClass, modelsContext );
 		if ( fromClass != null ) {
 			return fromClass;
 		}
 
 		ClassDetails classToCheck = classDetails.getSuperClass();
 		while ( classToCheck != null ) {
-			final var fromSuper = classToCheck.getAnnotationUsage( SoftDelete.class, modelsContext );
+			final var fromSuper = classToCheck.getAnnotationUsage( annotationClass, modelsContext );
 			if ( fromSuper != null
 					&& classToCheck.hasAnnotationUsage( MappedSuperclass.class, modelsContext ) ) {
 				return fromSuper;
@@ -311,7 +382,7 @@ private static SoftDelete extractSoftDelete(ClassDetails classDetails, MetadataB
 			classToCheck = classToCheck.getSuperClass();
 		}
 
-		return extractFromPackage( SoftDelete.class, classDetails, context );
+		return extractFromPackage( annotationClass, classDetails, context );
 	}
 
 	private void handleCheckConstraints() {
@@ -344,23 +415,7 @@ private void addCheckToEntity(Check check) {
 
 	private void callTypeBinders(PersistentClass persistentClass) {
 		for ( var metaAnnotated : annotatedClass.getMetaAnnotated( TypeBinderType.class, modelsContext() ) ) {
-			applyTypeBinder( metaAnnotated, persistentClass );
-		}
-	}
-
-	private void applyTypeBinder(Annotation containingAnnotation, PersistentClass persistentClass) {
-		final var binderClass =
-				containingAnnotation.annotationType()
-						.getAnnotation( TypeBinderType.class )
-						.binder();
-		try {
-			//noinspection rawtypes
-			final TypeBinder binder = binderClass.getConstructor().newInstance();
-			//noinspection unchecked
-			binder.bind( containingAnnotation, context, persistentClass );
-		}
-		catch ( Exception e ) {
-			throw new AnnotationException( "error processing @TypeBinderType annotation '" + containingAnnotation + "'", e );
+			callTypeBinder( metaAnnotated, metaAnnotated.annotationType(), persistentClass, context );
 		}
 	}
 
@@ -469,7 +524,7 @@ private boolean mapAsIdClass(
 		final var accessType = getPropertyAccessType();
 		final var inferredData = new PropertyPreloadedData( accessType, "id", compositeType );
 		final var baseInferredData = new PropertyPreloadedData( accessType, "id", classWithIdType );
-		final AccessType propertyAccessor = getPropertyAccessor( compositeClass );
+		final var propertyAccessor = getPropertyAccessor( compositeClass );
 
 		// In JPA 2, there is a shortcut if the IdClass is the PK of the associated class pointed to by the id
 		// it ought to be treated as an embedded and not a real IdClass (at least in our internal language)
@@ -1062,18 +1117,13 @@ private void processIdPropertiesIfNotAlready(
 					missingEntityProperties.add( propertyName );
 				}
 				else {
-					final boolean subclassAndSingleTableStrategy =
-							inheritanceState.getType() == SINGLE_TABLE
-									&& inheritanceState.hasParents();
 					if ( !hasIdAnnotation && memberDetails.hasAnnotationUsage( GeneratedValue.class, modelsContext() ) ) {
 						throw new AnnotationException( "Property '" + getPath( propertyHolder, propertyAnnotatedElement )
 												+ "' is annotated '@GeneratedValue' but is not part of an identifier" );
 					}
 					processElementAnnotations(
 							propertyHolder,
-							subclassAndSingleTableStrategy
-									? Nullability.FORCED_NULL
-									: Nullability.NO_CONSTRAINT,
+							getNullability( inheritanceState, memberDetails ),
 							propertyAnnotatedElement,
 							this,
 							false,
@@ -1088,6 +1138,7 @@ private void processIdPropertiesIfNotAlready(
 				missingIdProperties.remove( propertyName );
 			}
 		}
+		addGenericProperties( persistentClass, inheritanceState, inheritanceStates );
 
 		if ( !missingIdProperties.isEmpty() ) {
 			throw new AnnotationException( "Entity '" + persistentClass.getEntityName()
@@ -1101,6 +1152,101 @@ else if ( !missingEntityProperties.isEmpty() ) {
 		}
 	}
 
+	private static Nullability getNullability(InheritanceState inheritanceState, MemberDetails memberDetails) {
+		if ( isVersion( memberDetails ) ) {
+			return Nullability.FORCED_NOT_NULL;
+		}
+		else {
+			return inheritanceState.getType() == SINGLE_TABLE
+				&& inheritanceState.hasParents()
+					? Nullability.FORCED_NULL
+					: Nullability.NO_CONSTRAINT;
+		}
+	}
+
+	private void addGenericProperties(
+			PersistentClass persistentClass,
+			InheritanceState inheritanceState,
+			Map<ClassDetails, InheritanceState> inheritanceStates) {
+		if ( persistentClass.isAbstract() == null || !persistentClass.isAbstract() ) {
+			var superclass = persistentClass.getSuperPersistentClass();
+			while ( superclass != null ) {
+				for ( var declaredProperty : superclass.getDeclaredProperties() ) {
+					if ( declaredProperty.isGeneric() ) {
+						final var memberDetails = getMemberDetails( inheritanceState, inheritanceStates, declaredProperty, superclass );
+						final var typeDetails = resolveRelativeType( memberDetails.getType(), inheritanceState.getClassDetails() );
+						final var returnedClassName = typeDetails.getName();
+						final var actualProperty = declaredProperty.copy();
+						actualProperty.setGeneric( false );
+						actualProperty.setGenericSpecialization( true );
+						actualProperty.setReturnedClassName( returnedClassName );
+						final var value = actualProperty.getValue().copy();
+						setType( value, typeDetails );
+						actualProperty.setValue( value );
+						persistentClass.addProperty( actualProperty );
+						if ( value instanceof BasicValue basicValue ) {
+							final var metadataCollector = context.getMetadataCollector();
+							final var originalBasicValue = (BasicValue) declaredProperty.getValue();
+							metadataCollector.addSecondPass( persistentClasses -> {
+								basicValue.setExplicitTypeParams( originalBasicValue.getExplicitTypeParams() );
+								basicValue.setTypeParameters( originalBasicValue.getTypeParameters() );
+								basicValue.setJpaAttributeConverterDescriptor( originalBasicValue.getJpaAttributeConverterDescriptor() );
+								// Don't copy over the implicit java type access, since we figure that out in ClassPropertyHolder#setType
+								// basicValue.setImplicitJavaTypeAccess( originalBasicValue.getImplicitJavaTypeAccess() );
+								basicValue.setExplicitJavaTypeAccess( originalBasicValue.getExplicitJavaTypeAccess() );
+								final var explicitJdbcTypeAccess = originalBasicValue.getExplicitJdbcTypeAccess();
+								// Always override the JDBC type with the parent's one, to correctly bind/extract values to/from the db
+								if ( explicitJdbcTypeAccess != null ) {
+									final var explicitJdbcType = explicitJdbcTypeAccess.apply( metadataCollector.getTypeConfiguration() );
+									basicValue.setExplicitJdbcTypeAccess( typeConfiguration -> explicitJdbcType == null ?
+											originalBasicValue.resolve().getJdbcType() :
+											explicitJdbcType
+									);
+								}
+								else {
+									basicValue.setExplicitJdbcTypeAccess( typeConfiguration -> originalBasicValue.resolve().getJdbcType() );
+								}
+								basicValue.setExplicitMutabilityPlanAccess( originalBasicValue.getExplicitMutabilityPlanAccess() );
+								basicValue.setEnumerationStyle( originalBasicValue.getEnumeratedType() );
+								basicValue.setTimeZoneStorageType( originalBasicValue.getTimeZoneStorageType() );
+								basicValue.setTemporalPrecision( originalBasicValue.getTemporalPrecision() );
+								if ( originalBasicValue.isLob() ) {
+									basicValue.makeLob();
+								}
+								if ( originalBasicValue.isNationalized() ) {
+									basicValue.makeNationalized();
+								}
+							} );
+							metadataCollector.registerValueMappingResolver( basicValue::resolve );
+						}
+					}
+				}
+
+				superclass = superclass.getSuperPersistentClass();
+			}
+		}
+	}
+
+	private static MemberDetails getMemberDetails(
+			InheritanceState inheritanceState,
+			Map<ClassDetails, InheritanceState> inheritanceStates,
+			Property declaredProperty,
+			PersistentClass superclass) {
+		var superclassDetails = inheritanceState.getClassDetails().getSuperClass();
+		while ( !superclass.getClassName().equals( superclassDetails.getClassName()) ) {
+			superclassDetails = superclassDetails.getSuperClass();
+		}
+		final var superclassInheritanceState = inheritanceStates.get( superclassDetails );
+		final var elementsToProcess = superclassInheritanceState.getElementsToProcess();
+		for ( var element : elementsToProcess.getElements() ) {
+			if ( declaredProperty.getName().equals( element.getPropertyName() ) ) {
+				return element.getAttributeMember();
+			}
+		}
+		throw new IllegalArgumentException( "Couldn't find PropertyData for [" + declaredProperty.getName()
+						+ "] in class: " + declaredProperty.getPersistentClass().getClassName() );
+	}
+
 	private static String getMissingPropertiesString(Set<String> propertyNames) {
 		final var missingProperties = new StringBuilder();
 		for ( String propertyName : propertyNames ) {
@@ -1264,6 +1410,7 @@ private void bindEntity() {
 		bindSqlRestriction();
 		bindCache();
 		bindNaturalIdCache();
+		bindNaturalIdClass();
 		bindFiltersInHierarchy();
 
 		persistentClass.setAbstract( annotatedClass.isAbstract() );
@@ -1338,6 +1485,7 @@ private void bindRootEntity() {
 			rootClass.setLazyPropertiesCacheable( cacheLazyProperty );
 		}
 		rootClass.setNaturalIdCacheRegionName( naturalIdCacheRegion );
+		rootClass.setNaturalIdClass( naturalIdClass );
 	}
 
 	private void bindCustomSql() {
@@ -1613,6 +1761,19 @@ private SQLRestriction extractSQLRestriction(ClassDetails classDetails) {
 		return null;
 	}
 
+	private void bindNaturalIdClass() {
+		final var ann = annotatedClass.getAnnotationUsage( NaturalIdClass.class, modelsContext() );
+		if ( ann != null ) {
+			if ( ann.value() == void.class ) {
+				throw new IllegalStateException( "NaturalIdClass#value must not be void.class" );
+			}
+			naturalIdClass =
+					context.getBootstrapContext().getModelsContext()
+							.getClassDetailsRegistry()
+							.resolveClassDetails( ann.value().getName() );
+		}
+	}
+
 	private void bindNaturalIdCache() {
 		final var naturalIdCache = annotatedClass.getAnnotationUsage( NaturalIdCache.class, modelsContext() );
 		if ( naturalIdCache != null ) {
@@ -1760,7 +1921,8 @@ public MetadataBuildingContext getBuildingContext() {
 
 		@Override
 		public Identifier handleExplicitName(String explicitName, MetadataBuildingContext buildingContext) {
-			return jdbcEnvironment( buildingContext ).getIdentifierHelper().toIdentifier( explicitName );
+			return jdbcEnvironment( buildingContext ).getIdentifierHelper()
+					.toIdentifier( explicitName, false, true );
 		}
 
 		@Override
@@ -1864,11 +2026,10 @@ public void finalSecondaryTableFromAnnotationBinding(PropertyHolder propertyHold
 	}
 
 	private void createPrimaryColumnsToSecondaryTable(
-			Object incoming,
+			Annotation[] joinColumnSource,
 			PropertyHolder propertyHolder,
 			Join join) {
 		// `incoming` will be an array of some sort of annotation
-		final var joinColumnSource = (Annotation[]) incoming;
 		final var annotatedJoinColumns = secondaryTableJoinColumns( propertyHolder, joinColumnSource );
 		for ( var joinColumn : annotatedJoinColumns.getJoinColumns() ) {
 			joinColumn.forceNotNull();
@@ -2075,7 +2236,7 @@ private Join addJoin(
 			String name,
 			String schema,
 			String catalog,
-			Object joinColumns,
+			Annotation[] joinColumns,
 			UniqueConstraint[] uniqueConstraints) {
 		final var logicalName = logicalTableName( name, schema, catalog );
 		return createJoin(
@@ -2107,10 +2268,10 @@ Join createJoin(
 			PropertyHolder propertyHolder,
 			boolean noDelayInPkColumnCreation,
 			boolean secondaryTable,
-			Object joinColumns,
+			Annotation[] joinColumns,
 			QualifiedTableName logicalName,
 			Table table) {
-		final Join join = new Join();
+		final var join = new Join();
 		persistentClass.addJoin( join );
 
 		final String entityName = persistentClass.getEntityName();
@@ -2243,6 +2404,14 @@ private AccessType getExplicitAccessType(AnnotationTarget element) {
 		return null;
 	}
 
+	public static boolean isEntity(ClassDetails type) {
+		return type.hasDirectAnnotationUsage( Entity.class );
+	}
+
+	public static boolean isMappedSuperclass(ClassDetails type) {
+		return type.hasDirectAnnotationUsage( MappedSuperclass.class );
+	}
+
 	/**
 	 * Process the filters defined on the given class, as well as all filters
 	 * defined on the MappedSuperclass(es) in the inheritance hierarchy
@@ -2253,7 +2422,7 @@ private void bindFiltersInHierarchy() {
 
 		ClassDetails classToProcess = annotatedClass.getSuperClass();
 		while ( classToProcess != null ) {
-			final AnnotatedClassType classType = getMetadataCollector().getClassType( classToProcess );
+			final var classType = getMetadataCollector().getClassType( classToProcess );
 			if ( classType == MAPPED_SUPERCLASS ) {
 				bindFilters( classToProcess );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java
index d0e51cb34de8..068f2f301f3e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java
@@ -7,6 +7,8 @@
 import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.TableGenerator;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.AnnotationException;
+import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.IdGeneratorType;
 import org.hibernate.boot.model.IdentifierGeneratorDefinition;
@@ -33,6 +35,7 @@
 import org.hibernate.models.spi.ModelsContext;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -278,29 +281,11 @@ public static <A extends Annotation> void prepareForUse(
 			Consumer<Properties> configBaseline,
 			BiConsumer<A,Properties> configExtractor,
 			GeneratorCreationContext creationContext) {
-		if ( generator instanceof AnnotationBasedGenerator ) {
-			@SuppressWarnings("unchecked")
-			final var generation = (AnnotationBasedGenerator<A>) generator;
-			generation.initialize( annotation, idMember.toJavaMember(), creationContext );
+		if ( generator instanceof AnnotationBasedGenerator<?> annotationBasedGenerator ) {
+			initializeGenerator( annotationBasedGenerator, annotation, creationContext );
 		}
 		if ( generator instanceof Configurable configurable ) {
-			final var properties = new Properties();
-			if ( configBaseline != null ) {
-				configBaseline.accept( properties );
-			}
-			collectBaselineProperties(
-					creationContext.getProperty() != null
-							? creationContext.getProperty().getValue()
-							: creationContext.getPersistentClass().getIdentifierProperty().getValue(),
-					creationContext.getDatabase().getDialect(),
-					creationContext.getRootClass(),
-					properties::setProperty,
-					creationContext.getServiceRegistry().requireService( ConfigurationService.class )
-			);
-			if ( configExtractor != null ) {
-				configExtractor.accept( annotation, properties );
-			}
-			configurable.configure( creationContext, properties );
+			configureGenerator( annotation, configBaseline, configExtractor, creationContext, configurable );
 		}
 		if ( generator instanceof ExportableProducer exportableProducer ) {
 			exportableProducer.registerExportables( creationContext.getDatabase() );
@@ -310,6 +295,61 @@ public static <A extends Annotation> void prepareForUse(
 		}
 	}
 
+	private static <A extends Annotation> void configureGenerator(
+			A annotation,
+			Consumer<Properties> configBaseline,
+			BiConsumer<A, Properties> configExtractor,
+			GeneratorCreationContext creationContext,
+			Configurable configurable) {
+		final var properties = new Properties( creationContext.getDatabase().getDialect().getDefaultProperties() );
+		if ( configBaseline != null ) {
+			configBaseline.accept( properties );
+		}
+		collectBaselineProperties(
+				creationContext.getProperty() != null
+						? creationContext.getProperty().getValue()
+						: creationContext.getPersistentClass().getIdentifierProperty().getValue(),
+				creationContext.getDatabase().getDialect(),
+				creationContext.getRootClass(),
+				properties::setProperty,
+				creationContext.getServiceRegistry().requireService( ConfigurationService.class )
+		);
+		if ( configExtractor != null ) {
+			configExtractor.accept( annotation, properties );
+		}
+		configurable.configure( creationContext, properties );
+	}
+
+	public static <A extends Annotation> void initializeGenerator(
+			AnnotationBasedGenerator<A> generator,
+			Annotation annotation,
+			GeneratorCreationContext creationContext) {
+		generator.initialize( castAnnotationType( annotation, generator), creationContext );
+	}
+
+	private static <A extends Annotation> A castAnnotationType(
+			Annotation typeAnnotation,
+			AnnotationBasedGenerator<A> annotationBased) {
+		final var annotationType = annotationBased.getClass();
+		for ( var iface: annotationType.getGenericInterfaces() ) {
+			if ( iface instanceof ParameterizedType parameterizedType
+					&& parameterizedType.getRawType() == AnnotationBasedGenerator.class ) {
+				final var typeArguments = parameterizedType.getActualTypeArguments();
+				if ( typeArguments.length > 0
+						&& typeArguments[0] instanceof Class<?> annotationClass ) {
+					if ( !annotationClass.isInstance( typeAnnotation ) ) {
+						throw new AnnotationException( String.format( "Annotation '%s' is not assignable to '%s'",
+								annotationType.getName(), iface.getTypeName() ) );
+					}
+					@SuppressWarnings("unchecked") // safe, we just checked it
+					final var castAnnotation = (A) typeAnnotation;
+					return castAnnotation;
+				}
+			}
+		}
+		throw new AssertionFailure( "Could not find implementing interface" );
+	}
+
 	public static void handleUuidStrategy(
 			SimpleValue idValue,
 			MemberDetails idMember,
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java
index 201abc49b146..a0d01340626f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java
@@ -8,7 +8,6 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.TableGenerator;
-import jakarta.persistence.Version;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
@@ -21,33 +20,46 @@
 import org.hibernate.boot.models.spi.GlobalRegistrar;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.PropertyData;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.generator.AnnotationBasedGenerator;
 import org.hibernate.generator.Assigned;
 import org.hibernate.generator.BeforeExecutionGenerator;
+import org.hibernate.generator.EventType;
 import org.hibernate.generator.Generator;
 import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.generator.OnExecutionGenerator;
+import org.hibernate.id.CompositeNestedGeneratedValueGenerator;
+import org.hibernate.id.CompositeNestedGeneratedValueGenerator.GenerationPlan;
 import org.hibernate.id.Configurable;
+import org.hibernate.id.IdentifierGenerationException;
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.id.IdentityGenerator;
 import org.hibernate.id.PersistentIdentifierGenerator;
 import org.hibernate.id.enhanced.SequenceStyleGenerator;
 import org.hibernate.id.uuid.UuidValueGenerator;
+import org.hibernate.mapping.Component;
 import org.hibernate.mapping.GeneratorCreator;
+import org.hibernate.mapping.GeneratorSettings;
 import org.hibernate.mapping.KeyValue;
 import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.RootClass;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Value;
 import org.hibernate.models.spi.AnnotationTarget;
 import org.hibernate.models.spi.MemberDetails;
+import org.hibernate.property.access.spi.Setter;
 import org.hibernate.resource.beans.container.spi.BeanContainer;
 import org.hibernate.resource.beans.internal.Helper;
+import org.hibernate.type.ComponentType;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Member;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
@@ -59,10 +71,13 @@
 import static org.hibernate.boot.model.internal.AnnotationHelper.extractParameterMap;
 import static org.hibernate.boot.model.internal.BinderHelper.getPath;
 import static org.hibernate.boot.model.internal.BinderHelper.isGlobalGeneratorNameGlobal;
+import static org.hibernate.boot.model.internal.Constructors.construct;
+import static org.hibernate.boot.model.internal.GeneratorAnnotationHelper.initializeGenerator;
 import static org.hibernate.boot.model.internal.GeneratorParameters.collectParameters;
 import static org.hibernate.boot.model.internal.GeneratorParameters.interpretSequenceGenerator;
 import static org.hibernate.boot.model.internal.GeneratorParameters.interpretTableGenerator;
 import static org.hibernate.boot.model.internal.GeneratorStrategies.generatorClass;
+import static org.hibernate.boot.model.internal.PropertyBinder.isVersion;
 import static org.hibernate.id.IdentifierGenerator.GENERATOR_NAME;
 import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
@@ -135,7 +150,7 @@ else if ( generatorName.isBlank() ) {
 	}
 
 	/**
-	 * Called if {@link @GeneratedValue} specified no name.
+	 * Called if {@link GeneratedValue @GeneratedValue} specified no name.
 	 * This is a new special case added in JPA 3.2.
 	 * We look for an appropriate matching "default generator recipe"
 	 * based on the {@link GenerationType}.
@@ -183,21 +198,20 @@ private static IdentifierGeneratorDefinition determineImpliedGenerator(
 			// NOTE: a little bit of a special rule here for the case of just one -
 			// 		 consider it a match, based on strategy, if the strategy is AUTO or matches
 			if ( strategy == AUTO
-					|| isImpliedGenerator( strategy, strategyGeneratorClassName, generatorDefinition ) ) {
+					|| isImpliedGenerator( strategyGeneratorClassName, generatorDefinition ) ) {
 				return generatorDefinition;
 			}
 		}
 
-		return matchingLocalGenerator( strategy, strategyGeneratorClassName, localGenerators );
+		return matchingLocalGenerator( strategyGeneratorClassName, localGenerators );
 	}
 
 	private static IdentifierGeneratorDefinition matchingLocalGenerator(
-			GenerationType strategy,
 			String strategyGeneratorClassName,
 			Map<String, ? extends IdentifierGeneratorDefinition> localGenerators) {
 		IdentifierGeneratorDefinition matching = null;
 		for ( var localGenerator : localGenerators.values() ) {
-			if ( isImpliedGenerator( strategy, strategyGeneratorClassName, localGenerator ) ) {
+			if ( isImpliedGenerator( strategyGeneratorClassName, localGenerator ) ) {
 				if ( matching != null ) {
 					// we found multiple matching generators
 					return null;
@@ -209,7 +223,6 @@ private static IdentifierGeneratorDefinition matchingLocalGenerator(
 	}
 
 	private static boolean isImpliedGenerator(
-			GenerationType strategy,
 			String strategyGeneratorClassName,
 			IdentifierGeneratorDefinition generatorDefinition) {
 		return generatorDefinition.getStrategy().equals( strategyGeneratorClassName );
@@ -240,7 +253,8 @@ private static String determineStrategy(
 					+ " (define a named generator using '@SequenceGenerator', '@TableGenerator', or '@GenericGenerator')" );
 		}
 		configuration.putAll( definition.getParameters() );
-		// This is quite vague in the spec, but a generator could override the generator choice
+		// This is quite vague in the spec,
+		// but a generator could override the generator choice
 		return generatorStrategy( generatorType, definition );
 	}
 
@@ -380,12 +394,13 @@ private static void checkGeneratorInterfaces(Class<? extends Generator> generato
 	 * Return a {@link GeneratorCreator} for an attribute annotated
 	 * with a {@linkplain ValueGenerationType generator annotation}.
 	 */
-	private static GeneratorCreator generatorCreator(
+	private static <A extends Annotation> GeneratorCreator generatorCreator(
 			MemberDetails memberDetails,
 			Value value,
-			Annotation annotation,
+			A annotation,
 			BeanContainer beanContainer) {
-		final var annotationType = annotation.annotationType();
+		@SuppressWarnings("unchecked") // totally fine
+		final var annotationType = (Class<A>) annotation.annotationType();
 		final var generatorAnnotation = annotationType.getAnnotation( ValueGenerationType.class );
 		assert generatorAnnotation != null;
 		final var generatorClass = generatorAnnotation.generatedBy();
@@ -407,14 +422,14 @@ private static GeneratorCreator generatorCreator(
 		};
 	}
 
-	private static Generator instantiateAndInitializeGenerator(
+	private static <A extends Annotation> Generator instantiateAndInitializeGenerator(
 			Value value,
-			Annotation annotation,
+			A annotation,
 			BeanContainer beanContainer,
 			GeneratorCreationContext creationContext,
 			Class<? extends Generator> generatorClass,
 			MemberDetails memberDetails,
-			Class<? extends Annotation> annotationType) {
+			Class<A> annotationType) {
 		final var generator = instantiateGenerator(
 				annotation,
 				beanContainer,
@@ -423,7 +438,7 @@ private static Generator instantiateAndInitializeGenerator(
 				memberDetails,
 				annotationType
 		);
-		callInitialize( annotation, memberDetails, creationContext, generator );
+		callInitialize( annotation, creationContext, generator );
 		callConfigure( creationContext, generator, emptyMap(), value );
 		return generator;
 	}
@@ -432,18 +447,19 @@ private static Generator instantiateAndInitializeGenerator(
 	 * Return a {@link GeneratorCreator} for an id attribute annotated
 	 * with an {@linkplain IdGeneratorType id generator annotation}.
 	 */
-	private static GeneratorCreator identifierGeneratorCreator(
+	private static <A extends Annotation> GeneratorCreator identifierGeneratorCreator(
 			MemberDetails idAttributeMember,
-			Annotation annotation,
+			A annotation,
 			SimpleValue identifierValue,
 			BeanContainer beanContainer) {
-		final var annotationType = annotation.annotationType();
+		@SuppressWarnings("unchecked") // totally fine
+		final var annotationType = (Class<A>) annotation.annotationType();
 		final var idGeneratorAnnotation = annotationType.getAnnotation( IdGeneratorType.class );
 		assert idGeneratorAnnotation != null;
 		final var generatorClass = idGeneratorAnnotation.value();
 		checkGeneratorClass( generatorClass );
 		return creationContext -> {
-			final Generator generator =
+			final var generator =
 					instantiateAndInitializeGenerator(
 							identifierValue,
 							annotation,
@@ -466,13 +482,13 @@ private static GeneratorCreator identifierGeneratorCreator(
 	 * @param beanContainer an optional {@code BeanContainer}
 	 * @param generatorClass a class which implements {@code Generator}
 	 */
-	private static Generator instantiateGenerator(
-			Annotation annotation,
+	private static <A extends Annotation> Generator instantiateGenerator(
+			A annotation,
 			BeanContainer beanContainer,
 			GeneratorCreationContext creationContext,
 			Class<? extends Generator> generatorClass,
 			MemberDetails memberDetails,
-			Class<? extends Annotation> annotationType) {
+			Class<A> annotationType) {
 		if ( beanContainer != null ) {
 			return instantiateGeneratorAsBean(
 					annotation,
@@ -502,13 +518,13 @@ private static Generator instantiateGenerator(
 	 * @param beanContainer an optional {@code BeanContainer}
 	 * @param generatorClass a class which implements {@code Generator}
 	 */
-	private static <T extends Generator> Generator instantiateGeneratorAsBean(
-			Annotation annotation,
+	private static <T extends Generator, A extends Annotation> Generator instantiateGeneratorAsBean(
+			A annotation,
 			BeanContainer beanContainer,
 			GeneratorCreationContext creationContext,
 			Class<T> generatorClass,
 			MemberDetails memberDetails,
-			Class<? extends Annotation> annotationType) {
+			Class<A> annotationType) {
 		return getBean(
 			beanContainer,
 			generatorClass,
@@ -557,26 +573,38 @@ private static <T extends Generator> T instantiateGeneratorAsBean(
 	 * @param annotation the generator annotation
 	 * @param generatorClass a class which implements {@code Generator}
 	 */
-	private static <G extends Generator> G instantiateGenerator(
-			Annotation annotation,
+	private static <G extends Generator, A extends Annotation> G instantiateGenerator(
+			A annotation,
 			MemberDetails memberDetails,
-			Class<? extends Annotation> annotationType,
+			Class<A> annotationType,
 			GeneratorCreationContext creationContext,
 			Class<? extends G> generatorClass) {
 		try {
-			try {
-				return generatorClass.getConstructor( annotationType, Member.class, GeneratorCreationContext.class )
-						.newInstance( annotation, memberDetails.toJavaMember(), creationContext);
+			G generator =
+					// support for deprecated signature (eventually remove)
+					construct( generatorClass,
+							annotationType, annotation,
+							Member.class, memberDetails.toJavaMember(),
+							GeneratorCreationContext.class, creationContext );
+			if ( generator != null ) {
+				return generator;
 			}
-			catch (NoSuchMethodException ignore) {
-				try {
-					return generatorClass.getConstructor( annotationType )
-							.newInstance( annotation );
-				}
-				catch (NoSuchMethodException i) {
-					return instantiateGeneratorViaDefaultConstructor( generatorClass );
-				}
+			generator =
+					construct( generatorClass,
+							annotationType, annotation,
+							GeneratorCreationContext.class, creationContext );
+			if ( generator != null ) {
+				return generator;
 			}
+			generator = construct( generatorClass, annotationType, annotation );
+			if ( generator != null ) {
+				return generator;
+			}
+			generator = construct( generatorClass, GeneratorCreationContext.class, creationContext );
+			if ( generator != null ) {
+				return generator;
+			}
+			return instantiateGeneratorViaDefaultConstructor( generatorClass );
 		}
 		catch (InvocationTargetException | InstantiationException | IllegalAccessException | IllegalArgumentException e) {
 			throw new org.hibernate.InstantiationException( "Could not instantiate id generator", generatorClass, e );
@@ -601,7 +629,9 @@ public static <T extends Generator> T instantiateGenerator(BeanContainer beanCon
 	 */
 	private static <G extends Generator> G instantiateGeneratorViaDefaultConstructor(Class<? extends G> generatorClass) {
 		try {
-			return generatorClass.getDeclaredConstructor().newInstance();
+			final var constructor = generatorClass.getDeclaredConstructor();
+			constructor.setAccessible( true );
+			return constructor.newInstance();
 		}
 		catch (NoSuchMethodException e) {
 			throw new org.hibernate.InstantiationException( "No appropriate constructor for id generator class", generatorClass);
@@ -611,23 +641,17 @@ private static <G extends Generator> G instantiateGeneratorViaDefaultConstructor
 		}
 	}
 
-	public static <A extends Annotation> void callInitialize(
+	private static <A extends Annotation> void callInitialize(
 			A annotation,
-			MemberDetails memberDetails,
 			GeneratorCreationContext creationContext,
 			Generator generator) {
-		if ( generator instanceof AnnotationBasedGenerator ) {
-			// This will cause a CCE in case the generation type doesn't match the annotation type; As this would be
-			// a programming error of the generation type developer and thus should show up during testing, we don't
-			// check this explicitly; If required, this could be done e.g. using ClassMate
-			@SuppressWarnings("unchecked")
-			final var generation = (AnnotationBasedGenerator<A>) generator;
-			generation.initialize( annotation, memberDetails.toJavaMember(), creationContext );
+		if ( generator instanceof AnnotationBasedGenerator<?> annotationBasedGenerator ) {
+			initializeGenerator( annotationBasedGenerator, annotation, creationContext );
 		}
 	}
 
 	private static void checkVersionGenerationAlways(MemberDetails property, Generator generator) {
-		if ( property.hasDirectAnnotationUsage( Version.class ) ) {
+		if ( isVersion( property ) ) {
 			if ( !generator.generatesOnInsert() ) {
 				throw new AnnotationException("Property '" + property.getName()
 						+ "' is annotated '@Version' but has a 'Generator' which does not generate on inserts"
@@ -646,7 +670,7 @@ private static void checkVersionGenerationAlways(MemberDetails property, Generat
 	 * call its {@link Configurable#configure(GeneratorCreationContext, Properties)
 	 * configure()} method.
 	 */
-	public static void callConfigure(
+	private static void callConfigure(
 			GeneratorCreationContext creationContext,
 			Generator generator,
 			Map<String, Object> configuration,
@@ -689,7 +713,7 @@ private static void createIdGenerator(
 			SimpleValue idValue,
 			PersistentClass persistentClass,
 			MetadataBuildingContext context) {
-		// NOTE: `generatedValue` is never null here
+		// NOTE: generatedValue is never null here
 		final var generatedValue = castNonNull( idMember.getDirectAnnotationUsage( GeneratedValue.class ) );
 		final var metadataCollector = context.getMetadataCollector();
 		if ( isGlobalGeneratorNameGlobal( context ) ) {
@@ -892,4 +916,161 @@ public static void applyIfNotEmpty(String name, String value, BiConsumer<String,
 			consumer.accept( name, value );
 		}
 	}
+
+	private static Setter injector(Property property, Class<?> attributeDeclarer) {
+		return property.getPropertyAccessStrategy( attributeDeclarer )
+				.buildPropertyAccess( attributeDeclarer, property.getName(), true )
+				.getSetter();
+	}
+
+	/**
+	 * Return the class that declares the composite pk attributes,
+	 * which might be an {@code @IdClass}, an {@code @EmbeddedId},
+	 * of the entity class itself.
+	 */
+	private static Class<?> getAttributeDeclarer(RootClass rootClass, Component component) {
+		// See the javadoc discussion on CompositeNestedGeneratedValueGenerator
+		// for the various scenarios we need to account for here
+		if ( rootClass.getIdentifierMapper() != null ) {
+			// we have the @IdClass / <composite-id mapped="true"/> case
+			return resolveComponentClass( component );
+		}
+		else if ( rootClass.getIdentifierProperty() != null ) {
+			// we have the "@EmbeddedId" / <composite-id name="idName"/> case
+			return resolveComponentClass( component );
+		}
+		else {
+			// we have the "straight up" embedded (again the Hibernate term)
+			// component identifier: the entity class itself is the id class
+			return rootClass.getMappedClass();
+		}
+	}
+
+	private static Class<?> resolveComponentClass(Component component) {
+		try {
+			return component.getComponentClass();
+		}
+		catch ( Exception e ) {
+			return null;
+		}
+	}
+
+	public static Generator buildIdentifierGenerator(
+			Component component,
+			Dialect dialect,
+			RootClass rootClass,
+			GeneratorSettings defaults) {
+		final var properties = component.getProperties();
+		final List<Generator> generators = new ArrayList<>( properties.size() );
+		final int columnSpan = component.getColumnSpan();
+		String[] columnValues = null;
+		boolean[] columnInclusions = null;
+		boolean[] generatedOnExecutionColumns = null;
+		int columnIndex = 0;
+		final List<GenerationPlan> generationPlans = new ArrayList<>();
+		for ( int i = 0; i < properties.size(); i++ ) {
+			final var property = properties.get( i );
+			final var propertyGenerator =
+					propertyGenerator( component, dialect, rootClass, defaults, property, generationPlans, i );
+			generators.add( propertyGenerator );
+
+			final int span = property.getColumnSpan();
+			if ( propertyGenerator instanceof OnExecutionGenerator onExecutionGenerator
+					&& propertyGenerator.generatedOnExecution() ) {
+				if ( columnValues == null ) {
+					columnValues = new String[columnSpan];
+					columnInclusions = new boolean[columnSpan];
+					generatedOnExecutionColumns = new boolean[columnSpan];
+					for ( int j = 0; j < columnSpan; j++ ) {
+						columnValues[j] = "?";
+						columnInclusions[j] = true;
+					}
+				}
+				for ( int j = 0; j < span; j++ ) {
+					generatedOnExecutionColumns[columnIndex + j] = true;
+				}
+				if ( onExecutionGenerator.generatesOnInsert() ) {
+					if ( !onExecutionGenerator.referenceColumnsInSql( dialect, EventType.INSERT ) ) {
+						for ( int j = 0; j < span; j++ ) {
+							columnInclusions[columnIndex + j] = false;
+						}
+					}
+					else if ( onExecutionGenerator.writePropertyValue( EventType.INSERT ) ) {
+						// leave default parameter markers in place
+					}
+					else {
+						final String[] referencedColumnValues =
+								onExecutionGenerator.getReferencedColumnValues( dialect, EventType.INSERT );
+						if ( referencedColumnValues == null ) {
+							throw new IdentifierGenerationException(
+									"Generated column values were not provided for composite id property: "
+											+ property.getName()
+							);
+						}
+						if ( referencedColumnValues.length != span ) {
+							throw new IdentifierGenerationException(
+									"Mismatch between generated column values and column count for composite id property: "
+											+ property.getName()
+							);
+						}
+						System.arraycopy( referencedColumnValues, 0, columnValues, columnIndex, span );
+					}
+				}
+				else if ( !onExecutionGenerator.allowMutation() ) {
+					for ( int j = 0; j < span; j++ ) {
+						columnInclusions[columnIndex + j] = false;
+					}
+				}
+			}
+			columnIndex += span;
+		}
+
+		final var generator =
+				new CompositeNestedGeneratedValueGenerator(
+						new Component.StandardGenerationContextLocator( rootClass.getEntityName() ),
+						(ComponentType) component.getType(),
+						generators,
+						columnValues,
+						columnInclusions,
+						generatedOnExecutionColumns
+				);
+		for ( var plan : generationPlans ) {
+			generator.addGeneratedValuePlan( plan );
+		}
+		return generator;
+	}
+
+	private static Generator propertyGenerator(
+			Component component,
+			Dialect dialect,
+			RootClass rootClass,
+			GeneratorSettings defaults,
+			Property property,
+			List<GenerationPlan> generationPlans,
+			int propertyIndex) {
+		final var value = property.getValue();
+		if ( value instanceof SimpleValue simpleValue ) {
+			if ( !simpleValue.getCustomIdGeneratorCreator().isAssigned() ) {
+				// skip any 'assigned' generators, they would have been
+				// handled by the StandardGenerationContextLocator
+				final var propertyGenerator = simpleValue.createGenerator( dialect, rootClass, property, defaults );
+				if ( propertyGenerator instanceof BeforeExecutionGenerator beforeExecutionGenerator ) {
+					generationPlans.add( new Component.ValueGenerationPlan(
+							beforeExecutionGenerator,
+							component.getType().isMutable()
+									? injector( property, getAttributeDeclarer( rootClass, component ) )
+									: null,
+							propertyIndex
+					) );
+				}
+				return propertyGenerator;
+			}
+			else {
+				return null;
+			}
+		}
+		else {
+			return null;
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java
index ed6d73a50f53..cbe779bce923 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorParameters.java
@@ -75,7 +75,7 @@ public static Properties collectParameters(
 			RootClass rootClass,
 			Map<String, Object> configuration,
 			ConfigurationService configService) {
-		final var params = new Properties();
+		final var params = new Properties( dialect.getDefaultProperties() );
 		collectParameters( identifierValue, dialect, rootClass, params::put, configService );
 		if ( configuration != null ) {
 			params.putAll( configuration );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexBinder.java
index 879d8d1ca51d..b6ec60b7a5a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexBinder.java
@@ -170,8 +170,9 @@ private void createIndexOrUniqueKey(
 				hasFormula = true;
 			}
 		}
-		if ( unique && !hasFormula ) {
-			final String keyName = getImplicitNamingStrategy().determineUniqueKeyName( source ).render( getDialect() );
+		final var dialect = getDialect();
+		if ( unique && !hasFormula && dialect.supportsUniqueConstraints() ) {
+			final String keyName = getImplicitNamingStrategy().determineUniqueKeyName( source ).render( dialect );
 			final UniqueKey uniqueKey = table.getOrCreateUniqueKey( keyName );
 			uniqueKey.setExplicit( true );
 			uniqueKey.setNameExplicit( nameExplicit );
@@ -186,7 +187,7 @@ private void createIndexOrUniqueKey(
 			}
 		}
 		else {
-			final String keyName = getImplicitNamingStrategy().determineIndexName( source ).render( getDialect() );
+			final String keyName = getImplicitNamingStrategy().determineIndexName( source ).render( dialect );
 			final Index index = table.getOrCreateIndex( keyName );
 			index.setUnique( unique );
 			index.setOptions( options );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexColumn.java
index a9b5588bbadd..de9dd83f41ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexColumn.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/IndexColumn.java
@@ -9,6 +9,8 @@
 import org.hibernate.annotations.ListIndexBase;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.PropertyData;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.mapping.CheckConstraint;
 import org.hibernate.mapping.Join;
 
 import jakarta.persistence.OrderColumn;
@@ -53,13 +55,20 @@ public static IndexColumn fromAnnotations(
 		if ( listIndexBase != null ) {
 			column.setBase( listIndexBase.value() );
 		}
-
+		column.addIndexCheckConstraint( context.getMetadataCollector().getDatabase().getDialect() );
 		return column;
 	}
 
+	private void addIndexCheckConstraint(Dialect dialect) {
+		getMappingColumn()
+				.addCheckConstraint( new CheckConstraint( null,
+						getMappingColumn().getQuotedName( dialect )
+								+ ">=" + getBase() ) );
+	}
+
 	private static void createParent(
 			PropertyHolder propertyHolder,
-			Map<String,Join> secondaryTables,
+			Map<String, Join> secondaryTables,
 			IndexColumn column,
 			MetadataBuildingContext context) {
 		final var parent = new AnnotatedColumns();
@@ -84,15 +93,9 @@ public void setBase(int base) {
 	 * @param propertyHolder Information about the property
 	 * @param inferredData Yeah, right.  Uh...
 	 * @param secondaryTables Any secondary tables available.
-	 *
 	 * @return The index column
 	 */
-	public static IndexColumn buildColumnFromOrderColumn(
-			OrderColumn orderColumn,
-			PropertyHolder propertyHolder,
-			PropertyData inferredData,
-			Map<String, Join> secondaryTables,
-			MetadataBuildingContext context) {
+	public static IndexColumn buildColumnFromOrderColumn(OrderColumn orderColumn, PropertyHolder propertyHolder, PropertyData inferredData, Map<String, Join> secondaryTables, MetadataBuildingContext context) {
 		if ( orderColumn != null ) {
 			final String sqlType = nullIfEmpty( orderColumn.columnDefinition() );
 			final String explicitName = orderColumn.name();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java
index 4ed35b871378..1c15ddefbdac 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import org.hibernate.AnnotationException;
@@ -17,22 +18,23 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
 import org.hibernate.models.spi.ClassDetails;
-import org.hibernate.models.spi.FieldDetails;
+import org.hibernate.models.spi.MemberDetails;
 import org.hibernate.models.spi.MethodDetails;
-
 import jakarta.persistence.Access;
-import jakarta.persistence.EmbeddedId;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;
 import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Transient;
 
 import static jakarta.persistence.InheritanceType.SINGLE_TABLE;
 import static jakarta.persistence.InheritanceType.TABLE_PER_CLASS;
+import static org.hibernate.boot.model.internal.EntityBinder.isEntity;
+import static org.hibernate.boot.model.internal.EntityBinder.isMappedSuperclass;
 import static org.hibernate.boot.model.internal.PropertyBinder.addElementsOfClass;
 import static org.hibernate.boot.model.internal.PropertyBinder.hasIdAnnotation;
+import static org.hibernate.boot.model.internal.PropertyBinder.isEmbeddedId;
+import static org.hibernate.boot.spi.AccessType.getAccessStrategy;
 import static org.hibernate.internal.util.ReflectHelper.OBJECT_CLASS_NAME;
 
 /**
@@ -72,15 +74,11 @@ public InheritanceState(
 	}
 
 	private void extractInheritanceType(ClassDetails classDetails) {
+		final boolean isMappedSuperclass = classDetails.hasDirectAnnotationUsage( MappedSuperclass.class );
+		setEmbeddableSuperclass( isMappedSuperclass );
+		final var defaultInheritanceType = isMappedSuperclass ? null : SINGLE_TABLE;
 		final var inheritance = classDetails.getDirectAnnotationUsage( Inheritance.class );
-		final var mappedSuperclass = classDetails.getDirectAnnotationUsage( MappedSuperclass.class );
-		if ( mappedSuperclass != null ) {
-			setEmbeddableSuperclass( true );
-			setType( inheritance == null ? null : inheritance.strategy() );
-		}
-		else {
-			setType( inheritance == null ? SINGLE_TABLE : inheritance.strategy() );
-		}
+		setType( inheritance != null ? inheritance.strategy() : defaultInheritanceType );
 	}
 
 	public boolean hasTable() {
@@ -102,7 +100,7 @@ public static InheritanceState getInheritanceStateOfSuperEntity(
 				return currentState;
 			}
 		}
-		while ( candidate != null && !OBJECT_CLASS_NAME.equals( candidate.getName() ) );
+		while ( candidate != null && !isObjectClass( candidate ) );
 		return null;
 	}
 
@@ -117,7 +115,7 @@ public static InheritanceState getSuperclassInheritanceState(
 				return currentState;
 			}
 		}
-		while ( superclass != null && !OBJECT_CLASS_NAME.equals( superclass.getName() ) );
+		while ( superclass != null && !isObjectClass( superclass ) );
 		return null;
 	}
 
@@ -188,7 +186,7 @@ else if ( classDetails.hasDirectAnnotationUsage( IdClass.class ) ) {
 		else {
 			final long count =
 					Stream.concat( classDetails.getFields().stream(), classDetails.getMethods().stream() )
-							.filter( member -> member.hasDirectAnnotationUsage( Id.class ) )
+							.filter( PropertyBinder::isSimpleId )
 							.count();
 			if ( count > 1 ) {
 				return classDetails;
@@ -207,8 +205,8 @@ public Boolean hasIdClassOrEmbeddedId() {
 				hasIdClassOrEmbeddedId = true;
 			}
 			else {
-				for ( PropertyData property : getElementsToProcess().getElements() ) {
-					if ( property.getAttributeMember().hasDirectAnnotationUsage( EmbeddedId.class ) ) {
+				for ( var property : getElementsToProcess().getElements() ) {
+					if ( isEmbeddedId( property.getAttributeMember() ) ) {
 						hasIdClassOrEmbeddedId = true;
 						break;
 					}
@@ -223,7 +221,7 @@ public Boolean hasIdClassOrEmbeddedId() {
 	 * guessing from @Id or @EmbeddedId presence if not specified.
 	 * Change EntityBinder by side effect
 	 */
-	private ElementsToProcess getElementsToProcess() {
+	ElementsToProcess getElementsToProcess() {
 		if ( elementsToProcess == null ) {
 			final var inheritanceState = inheritanceStatePerClass.get( classDetails );
 			assert !inheritanceState.isEmbeddableSuperclass();
@@ -234,7 +232,7 @@ private ElementsToProcess getElementsToProcess() {
 
 			final ArrayList<PropertyData> elements = new ArrayList<>();
 			int idPropertyCount = 0;
-			for ( ClassDetails classToProcessForMappedSuperclass : classesToProcessForMappedSuperclass ) {
+			for ( var classToProcessForMappedSuperclass : classesToProcessForMappedSuperclass ) {
 				final var container =
 						new PropertyContainer( classToProcessForMappedSuperclass, classDetails, accessType );
 				idPropertyCount = addElementsOfClass( elements, container, buildingContext, idPropertyCount );
@@ -250,38 +248,160 @@ private ElementsToProcess getElementsToProcess() {
 	}
 
 	private AccessType determineDefaultAccessType() {
-		for ( ClassDetails candidate = classDetails; candidate != null; candidate = candidate.getSuperClass() ) {
-			if ( ( candidate.getSuperClass() == null || OBJECT_CLASS_NAME.equals( candidate.getSuperClass().getName() ) )
-					&& ( candidate.hasDirectAnnotationUsage( Entity.class ) || candidate.hasDirectAnnotationUsage( MappedSuperclass.class ) )
-					&& candidate.hasDirectAnnotationUsage( Access.class ) ) {
-				return AccessType.getAccessStrategy( candidate.getDirectAnnotationUsage( Access.class ).value() );
+
+		// first consider cases very well-defined in the spec
+
+		if ( classDetails != null && classDetails.hasDirectAnnotationUsage( Access.class ) ) {
+			return getAccessStrategy( classDetails.getDirectAnnotationUsage( Access.class ).value() );
+		}
+
+		final var idAccessType = determineAccessTypeFromId( classDetails );
+		if ( idAccessType != null ) {
+			return idAccessType;
+		}
+
+		// next consider the current class
+
+		final var memberAccessType = determineAccessTypeFromMembers( classDetails );
+		if ( memberAccessType != null ) {
+			return memberAccessType;
+		}
+
+		// next consider the root class of the hierarchy
+
+		final var rootEntity = getRootEntity();
+		if ( rootEntity != null ) {
+			if ( rootEntity.hasDirectAnnotationUsage( Access.class ) ) {
+				return getAccessStrategy( rootEntity.getDirectAnnotationUsage( Access.class ).value() );
+			}
+
+			final var rootMemberAccessType = determineAccessTypeFromMembers( rootEntity );
+			if ( rootMemberAccessType != null ) {
+				return rootMemberAccessType;
 			}
 		}
-		// Guess from identifier.
-		// FIX: Shouldn't this be determined by the first attribute (i.e., field or property) with annotations,
-		// but without an explicit Access annotation, according to JPA 2.0 spec 2.3.1: Default Access Type?
-		for ( ClassDetails candidate = classDetails;
-				candidate != null && !OBJECT_CLASS_NAME.equals( candidate.getName() );
+
+		// as an absolute last resort, fall back to looking at mapped superclasses
+
+		for ( var candidate = classDetails.getSuperClass();
+				candidate != null && !isObjectClass( candidate );
 				candidate = candidate.getSuperClass() ) {
-			if ( candidate.hasDirectAnnotationUsage( Entity.class )
-				|| candidate.hasDirectAnnotationUsage( MappedSuperclass.class ) ) {
-				for ( MethodDetails method : candidate.getMethods() ) {
+			if ( isMappedSuperclass( candidate ) ) {
+				if ( candidate.hasDirectAnnotationUsage( Access.class ) ) {
+					return getAccessStrategy( candidate.getDirectAnnotationUsage( Access.class ).value() );
+				}
+				final var accessType = determineAccessTypeFromMembers( candidate );
+				if ( accessType != null ) {
+					return accessType;
+				}
+			}
+		}
+
+		throw new AnnotationException(
+				"Entity '" + classDetails.getName() + "' has no identifier"
+						+ " (every '@Entity' class must declare or inherit at least one '@Id' or '@EmbeddedId' property)"
+		);
+	}
+
+	private static AccessType determineAccessTypeFromId(ClassDetails accessTypeSource) {
+		for ( var candidate = accessTypeSource; !noSuperclass( candidate );
+			candidate = candidate.getSuperClass() ) {
+			if ( isEntityOrMappedSuperclass( candidate )
+					&& !candidate.hasDirectAnnotationUsage( Access.class ) ) {
+				for ( var method : candidate.getMethods() ) {
 					if ( method.getMethodKind() == MethodDetails.MethodKind.GETTER
-							&& hasIdAnnotation( method ) ) {
+							&& hasIdAnnotation( method )
+							&& canBeUsedToInferAccessType( method )	) {
 						return AccessType.PROPERTY;
 					}
 				}
-				for ( FieldDetails field : candidate.getFields() ) {
-					if ( hasIdAnnotation( field ) ) {
+				for ( var field : candidate.getFields() ) {
+					if ( hasIdAnnotation( field )
+							&& canBeUsedToInferAccessType( field )	 ) {
 						return AccessType.FIELD;
 					}
 				}
 			}
 		}
-		throw new AnnotationException(
-				"Entity '" + classDetails.getName() + "' has no identifier"
-						+ " (every '@Entity' class must declare or inherit at least one '@Id' or '@EmbeddedId' property)"
-		);
+		return null;
+	}
+
+	private ClassDetails getRootEntity() {
+		ClassDetails rootEntity = null;
+		for ( var candidate = classDetails; candidate != null && !isObjectClass( candidate );
+				candidate = candidate.getSuperClass() ) {
+			if ( isEntity( candidate ) ) {
+				rootEntity = candidate;
+			}
+		}
+		return rootEntity;
+	}
+
+	private static AccessType determineAccessTypeFromMembers(ClassDetails classDetails) {
+		for ( var field : classDetails.getFields() ) {
+			if ( canBeUsedToInferAccessType( field )
+					&& hasMappingAnnotation( field ) ) {
+				return AccessType.FIELD;
+			}
+		}
+
+		for ( var method : classDetails.getMethods() ) {
+			if ( method.getMethodKind() == MethodDetails.MethodKind.GETTER
+					&& canBeUsedToInferAccessType( method )
+					&& hasMappingAnnotation( method ) ) {
+				return AccessType.PROPERTY;
+			}
+		}
+
+		return null;
+	}
+
+	private static boolean canBeUsedToInferAccessType(MemberDetails memberDetails) {
+		return memberDetails.isPersistable()
+			&& !memberDetails.hasDirectAnnotationUsage( Access.class )
+			&& !memberDetails.hasDirectAnnotationUsage( Transient.class );
+	}
+
+	private static boolean hasMappingAnnotation(MemberDetails memberDetails) {
+		final var annotations = memberDetails.getDirectAnnotationUsages();
+		if ( annotations == null || annotations.isEmpty() ) {
+			return false;
+		}
+
+		for ( var annotation : annotations ) {
+			final var annotationType = annotation.annotationType();
+			final var annotationName = annotationType.getName();
+			if ( annotationName.startsWith( "jakarta.persistence." )
+					&& !IGNORED_PERSISTENCE_ANNOTATIONS.contains( annotationName ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private static final Set<String> IGNORED_PERSISTENCE_ANNOTATIONS = Set.of(
+			"jakarta.persistence.PostLoad",
+			"jakarta.persistence.PostPersist",
+			"jakarta.persistence.PostRemove",
+			"jakarta.persistence.PostUpdate",
+			"jakarta.persistence.PrePersist",
+			"jakarta.persistence.PreRemove",
+			"jakarta.persistence.PreUpdate",
+			"jakarta.persistence.Transient",
+			"jakarta.persistence.Access"
+	);
+
+	private static boolean noSuperclass(ClassDetails candidate) {
+		return candidate == null || isObjectClass( candidate );
+	}
+
+	private static boolean isEntityOrMappedSuperclass(ClassDetails candidate) {
+		return isEntity( candidate ) || isMappedSuperclass( candidate );
+	}
+
+	private static boolean isObjectClass(ClassDetails candidate) {
+		return OBJECT_CLASS_NAME.equals( candidate.getName() );
 	}
 
 	private void getMappedSuperclassesTillNextEntityOrdered() {
@@ -322,7 +442,7 @@ private org.hibernate.mapping.MappedSuperclass processMappedSuperclass(Table imp
 		// classes from 0 to n-1 are @MappedSuperclass and should be linked
 		final var metadataCollector = buildingContext.getMetadataCollector();
 		final var superEntityState = getInheritanceStateOfSuperEntity( classDetails, inheritanceStatePerClass );
-		final PersistentClass superEntity =
+		final var superEntity =
 				superEntityState != null
 						? metadataCollector.getEntityBinding( superEntityState.getClassDetails().getName() )
 						: null;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InvalidNamedEntityGraphParameterException.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InvalidNamedEntityGraphParameterException.java
new file mode 100644
index 000000000000..8432276aca0e
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InvalidNamedEntityGraphParameterException.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.model.internal;
+
+
+import org.hibernate.AnnotationException;
+
+/**
+ * Thrown by {@link NamedGraphCreatorParsed} to indicate an issue with the parameters provided
+ * to a {@code @NamedEntityGraph} annotation.
+ *
+ */
+public class InvalidNamedEntityGraphParameterException extends AnnotationException {
+	private static final long serialVersionUID = 1L;
+
+	public InvalidNamedEntityGraphParameterException(String message) {
+		super( message );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java
index 5e51ff06fcbb..5eab9384daf2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorJpa.java
@@ -6,17 +6,18 @@
 
 import jakarta.persistence.NamedAttributeNode;
 import jakarta.persistence.NamedEntityGraph;
-import jakarta.persistence.NamedSubgraph;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.model.NamedGraphCreator;
 import org.hibernate.graph.internal.RootGraphImpl;
 import org.hibernate.graph.spi.AttributeNodeImplementor;
+import org.hibernate.graph.spi.GraphParserEntityClassResolver;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.spi.GraphImplementor;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.graph.spi.SubGraphImplementor;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
-
-import java.util.function.Function;
+import org.hibernate.service.ServiceRegistry;
 
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
@@ -37,34 +38,33 @@ class NamedGraphCreatorJpa implements NamedGraphCreator {
 	}
 
 	@Override
-	public <T> RootGraphImplementor<T> createEntityGraph(
-			Function<Class<T>, EntityDomainType<?>> entityDomainClassResolver,
-			Function<String, EntityDomainType<?>> entityDomainNameResolver) {
-		//noinspection unchecked
-		final EntityDomainType<T> rootEntityType =
-				(EntityDomainType<T>) entityDomainNameResolver.apply( jpaEntityName );
-		final RootGraphImplementor<T> entityGraph =
-				createRootGraph( name, rootEntityType, annotation.includeAllAttributes() );
+	public RootGraphImplementor<?> createEntityGraph(
+			GraphParserEntityClassResolver entityDomainClassResolver,
+			GraphParserEntityNameResolver entityDomainNameResolver,
+			ServiceRegistry serviceRegistry) {
+		return createGraph( (EntityDomainType<?>)
+				entityDomainNameResolver.resolveEntityName( jpaEntityName ) );
+	}
 
-		if ( annotation.subclassSubgraphs() != null ) {
-			for ( NamedSubgraph subclassSubgraph : annotation.subclassSubgraphs() ) {
-				final Class<?> subgraphType = subclassSubgraph.type();
-				final Class<T> graphJavaType = entityGraph.getGraphedType().getJavaType();
+	private <T> @NonNull RootGraphImplementor<T> createGraph(EntityDomainType<T> rootEntityType) {
+		final var entityGraph =
+				createRootGraph( name, rootEntityType, annotation.includeAllAttributes() );
+		final var subclassSubgraphs = annotation.subclassSubgraphs();
+		if ( subclassSubgraphs != null ) {
+			for ( var subclassSubgraph : subclassSubgraphs ) {
+				final var subgraphType = subclassSubgraph.type();
+				final var graphJavaType = entityGraph.getGraphedType().getJavaType();
 				if ( !graphJavaType.isAssignableFrom( subgraphType ) ) {
 					throw new AnnotationException( "Named subgraph type '" + subgraphType.getName()
-												+ "' is not a subtype of the graph type '" + graphJavaType.getName() + "'" );
+								+ "' is not a subtype of the graph type '" + graphJavaType.getName() + "'" );
 				}
-				@SuppressWarnings("unchecked") // Safe, because we just checked
-				final Class<? extends T> subtype = (Class<? extends T>) subgraphType;
-				final GraphImplementor<? extends T> subgraph = entityGraph.addTreatedSubgraph( subtype );
-				applyNamedAttributeNodes( subclassSubgraph.attributeNodes(), annotation, subgraph );
+				applyNamedAttributeNodes( subclassSubgraph.attributeNodes(), annotation,
+						entityGraph.addTreatedSubgraph( subgraphType.asSubclass( graphJavaType ) ) );
 			}
 		}
-
 		if ( annotation.attributeNodes() != null ) {
 			applyNamedAttributeNodes( annotation.attributeNodes(), annotation, entityGraph );
 		}
-
 		return entityGraph;
 	}
 
@@ -72,7 +72,7 @@ private static <T> RootGraphImplementor<T> createRootGraph(
 			String name,
 			EntityDomainType<T> rootEntityType,
 			boolean includeAllAttributes) {
-		final RootGraphImpl<T> entityGraph = new RootGraphImpl<>( name, rootEntityType );
+		final var entityGraph = new RootGraphImpl<>( name, rootEntityType );
 		if ( includeAllAttributes ) {
 			for ( var attribute : rootEntityType.getAttributes() ) {
 				entityGraph.addAttributeNodes( attribute );
@@ -85,7 +85,7 @@ private void applyNamedAttributeNodes(
 			NamedAttributeNode[] namedAttributeNodes,
 			NamedEntityGraph namedEntityGraph,
 			GraphImplementor<?> graphNode) {
-		for ( NamedAttributeNode namedAttributeNode : namedAttributeNodes ) {
+		for ( var namedAttributeNode : namedAttributeNodes ) {
 			final var attributeNode =
 					(AttributeNodeImplementor<?,?,?>)
 							graphNode.addAttributeNode( namedAttributeNode.value() );
@@ -105,7 +105,7 @@ private <T,E,K> void applyNamedSubgraphs(
 			String subgraphName,
 			AttributeNodeImplementor<T,E,K> attributeNode,
 			boolean isKeySubGraph) {
-		for ( NamedSubgraph namedSubgraph : namedEntityGraph.subgraphs() ) {
+		for ( var namedSubgraph : namedEntityGraph.subgraphs() ) {
 			if ( subgraphName.equals( namedSubgraph.name() ) ) {
 				applyNamedAttributeNodes( namedSubgraph.attributeNodes(), namedEntityGraph,
 						createSubgraph( attributeNode, isKeySubGraph, namedSubgraph.type() ) );
@@ -128,27 +128,27 @@ private static SubGraphImplementor<?> createSubgraph(
 
 	private static <T, E, K> SubGraphImplementor<?> makeAttributeNodeValueSubgraph(
 			AttributeNodeImplementor<T, E, K> attributeNode, Class<?> subgraphType) {
-		final Class<?> attributeValueType =
-				attributeNode.getAttributeDescriptor().getValueGraphType().getJavaType();
+		final var attributeValueType =
+				attributeNode.getAttributeDescriptor()
+						.getValueGraphType().getJavaType();
 		if ( !attributeValueType.isAssignableFrom( subgraphType ) ) {
 			throw new AnnotationException( "Named subgraph type '" + subgraphType.getName()
-										+ "' is not a subtype of the value type '" + attributeValueType.getName() + "'" );
+						+ "' is not a subtype of the value type '" + attributeValueType.getName() + "'" );
 		}
-		@SuppressWarnings("unchecked") // Safe, because we just checked
-		final Class<? extends E> castType = (Class<? extends E>) subgraphType;
-		return attributeNode.addValueSubgraph().addTreatedSubgraph( castType );
+		return attributeNode.addValueSubgraph().addTreatedSubgraph(
+				subgraphType.asSubclass( attributeNode.getValueSubgraph().getClassType() ) );
 	}
 
 	private static <T, E, K> SubGraphImplementor<?> makeAttributeNodeKeySubgraph(
 			AttributeNodeImplementor<T, E, K> attributeNode, Class<?> subgraphType) {
-		final Class<?> attributeKeyType =
-				attributeNode.getAttributeDescriptor().getKeyGraphType().getJavaType();
+		final var attributeKeyType =
+				attributeNode.getAttributeDescriptor()
+						.getKeyGraphType().getJavaType();
 		if ( !attributeKeyType.isAssignableFrom( subgraphType ) ) {
 			throw new AnnotationException( "Named subgraph type '" + subgraphType.getName()
-										+ "' is not a subtype of the key type '" + attributeKeyType.getName() + "'" );
+						+ "' is not a subtype of the key type '" + attributeKeyType.getName() + "'" );
 		}
-		@SuppressWarnings("unchecked") // Safe, because we just checked
-		final Class<? extends K> castType = (Class<? extends K>) subgraphType;
-		return attributeNode.addKeySubgraph().addTreatedSubgraph( castType );
+		return attributeNode.addKeySubgraph().addTreatedSubgraph(
+				subgraphType.asSubclass( attributeNode.getKeySubgraph().getClassType() ) );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorParsed.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorParsed.java
index a264f3521fd2..3edc2863f117 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorParsed.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NamedGraphCreatorParsed.java
@@ -4,22 +4,26 @@
  */
 package org.hibernate.boot.model.internal;
 
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
+
+import org.hibernate.GraphParserMode;
 import org.hibernate.UnknownEntityTypeException;
 import org.hibernate.annotations.NamedEntityGraph;
 import org.hibernate.boot.model.NamedGraphCreator;
-import org.hibernate.grammars.graph.GraphLanguageLexer;
-import org.hibernate.grammars.graph.GraphLanguageParser;
+import org.hibernate.cfg.GraphParserSettings;
+import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.graph.InvalidGraphException;
-import org.hibernate.graph.internal.parse.EntityNameResolver;
+import org.hibernate.graph.spi.GraphParserEntityClassResolver;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.internal.parse.GraphParsing;
 import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.internal.log.DeprecationLogger;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
+import org.hibernate.service.ServiceRegistry;
 
-import java.util.function.Function;
-
+import static org.hibernate.graph.internal.parse.GraphParsing.parseLegacyGraphText;
+import static org.hibernate.graph.internal.parse.GraphParsing.parseText;
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
 
 /**
@@ -41,43 +45,119 @@ class NamedGraphCreatorParsed implements NamedGraphCreator {
 	}
 
 	@Override
-	public <T> RootGraphImplementor<T> createEntityGraph(
-			Function<Class<T>, EntityDomainType<?>> entityDomainClassResolver,
-			Function<String, EntityDomainType<?>> entityDomainNameResolver) {
-		final GraphLanguageLexer lexer = new GraphLanguageLexer( CharStreams.fromString( annotation.graph() ) );
-		final GraphLanguageParser parser = new GraphLanguageParser( new CommonTokenStream( lexer ) );
-		final GraphLanguageParser.GraphContext graphContext = parser.graph();
-
-		final EntityNameResolver entityNameResolver = new EntityNameResolver() {
-			@Override
-			public <T> EntityDomainType<T> resolveEntityName(String entityName) {
-				//noinspection unchecked
-				final EntityDomainType<T> entityDomainType = (EntityDomainType<T>) entityDomainNameResolver.apply( entityName );
-				if ( entityDomainType != null ) {
-					return entityDomainType;
-				}
-				throw new UnknownEntityTypeException( entityName );
+	public RootGraphImplementor<?> createEntityGraph(
+			GraphParserEntityClassResolver entityDomainClassResolver,
+			GraphParserEntityNameResolver entityDomainNameResolver,
+			ServiceRegistry serviceRegistry) {
+
+		final ConfigurationService configurationService = serviceRegistry.getService( ConfigurationService.class );
+
+		final GraphParserMode graphParserMode = configurationService == null ? null : configurationService.getSetting(
+				GraphParserSettings.GRAPH_PARSER_MODE,
+				GraphParserMode::interpret,
+				GraphParserMode.LEGACY
+		);
+
+		if ( graphParserMode != null && graphParserMode.equals( GraphParserMode.MODERN ) ) {
+			return parseGraph( entityDomainClassResolver, entityDomainNameResolver );
+		}
+
+		return parseGraphForLegacyParsingMode( entityDomainClassResolver, entityDomainNameResolver );
+	}
+
+	private static @NonNull EntityDomainType<?> resolve(
+			String entityName, GraphParserEntityNameResolver entityDomainNameResolver) {
+		final var entityDomainType =
+				(EntityDomainType<?>)
+						entityDomainNameResolver.resolveEntityName( entityName );
+		if ( entityDomainType == null ) {
+			throw new UnknownEntityTypeException( entityName );
+		}
+		else {
+			return entityDomainType;
+		}
+	}
+
+	private <T> RootGraphImplementor<T> parseGraph(
+			GraphParserEntityClassResolver entityDomainClassResolver,
+			GraphParserEntityNameResolver entityDomainNameResolver) {
+		final EntityDomainType<T> entityDomainType = resolveEntityDomainTypeFromAnnotation(
+				entityDomainClassResolver
+		);
+
+		final var graphContext = parseText( annotation.graph() );
+
+		final String graphName = this.name == null ? entityDomainType.getName() : this.name;
+
+		return GraphParsing.visit( graphName, entityDomainType, graphContext.graphElementList(),
+				entityName -> resolve( entityName, entityDomainNameResolver ) );
+	}
+
+
+	private <T> RootGraphImplementor<T> parseGraphForLegacyParsingMode(
+			GraphParserEntityClassResolver entityDomainClassResolver,
+			GraphParserEntityNameResolver entityDomainNameResolver) {
+
+		final var graphContext = parseLegacyGraphText( annotation.graph() );
+
+
+		EntityDomainType<T> entityDomainType;
+
+		final var typeIndicator = graphContext.typeIndicator();
+
+		if ( typeIndicator != null ) {
+			if ( entityType != null ) {
+				throw new InvalidGraphException(
+						"Expecting graph text to not include an entity name : " + annotation.graph() );
 			}
-		};
+
+			DeprecationLogger.DEPRECATION_LOGGER.deprecatedNamedEntityGraphTextThatContainTypeIndicator();
+
+			entityDomainType = (EntityDomainType<T>) resolve( typeIndicator.TYPE_NAME().toString(), entityDomainNameResolver );
+		}
+		else {
+			entityDomainType = resolveEntityDomainTypeFromAnnotation( entityDomainClassResolver );
+		}
+
+
+		final String graphName = this.name == null ? entityDomainType.getName() : this.name;
+
+		return GraphParsing.visit( graphName, entityDomainType, graphContext.attributeList(),
+				entityName -> resolve( entityName, entityDomainNameResolver ) );
+	}
+
+
+	private <T> EntityDomainType<T> resolveEntityDomainTypeFromAnnotation(GraphParserEntityClassResolver entityDomainClassResolver) {
+		final Class<?> annotationRootAttribute = annotation.root();
+		final boolean isAnnotationRootAttributeVoid = void.class.equals( annotationRootAttribute );
 
 		if ( entityType == null ) {
-			if ( graphContext.typeIndicator() == null ) {
-				throw new InvalidGraphException( "Expecting graph text to include an entity name : " + annotation.graph() );
+			if ( isAnnotationRootAttributeVoid ) {
+				throw new InvalidNamedEntityGraphParameterException(
+						"The 'root' parameter of the @NamedEntityGraph should be passed. Graph : " + annotation.name()
+				);
 			}
-			final String jpaEntityName = graphContext.typeIndicator().TYPE_NAME().toString();
+
 			//noinspection unchecked
-			final EntityDomainType<T> entityDomainType = (EntityDomainType<T>) entityDomainNameResolver.apply( jpaEntityName );
-			final String name = this.name == null ? jpaEntityName : this.name;
-			return GraphParsing.parse( name, entityDomainType, graphContext.attributeList(), entityNameResolver );
+			return (EntityDomainType<T>) entityDomainClassResolver.resolveEntityClass( annotationRootAttribute );
 		}
-		else {
-			if ( graphContext.typeIndicator() != null ) {
-				throw new InvalidGraphException( "Expecting graph text to not include an entity name : " + annotation.graph() );
+
+		if ( !isAnnotationRootAttributeVoid ) {
+			if ( !annotationRootAttribute.equals( entityType ) ) {
+				throw new InvalidNamedEntityGraphParameterException(
+						"The 'root' parameter of the @NamedEntityGraph annotation must reference the entity '"
+						+ entityType.getName()
+						+ "', but '" + annotationRootAttribute.getName() + "' was provided."
+						+ " Graph :" + annotation.name()
+				);
 			}
+
 			//noinspection unchecked
-			final EntityDomainType<T> entityDomainType = (EntityDomainType<T>) entityDomainClassResolver.apply( (Class<T>) entityType );
-			final String name = this.name == null ? entityDomainType.getName() : this.name;
-			return GraphParsing.parse( name, entityDomainType, graphContext.attributeList(), entityNameResolver );
+			return (EntityDomainType<T>) entityDomainClassResolver.resolveEntityClass( annotationRootAttribute );
 		}
+
+		//noinspection unchecked
+		return (EntityDomainType<T>) entityDomainClassResolver.resolveEntityClass( entityType );
 	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NaturalIdBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NaturalIdBinder.java
index 626c1d6d4081..98d5f8a5d6ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NaturalIdBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/NaturalIdBinder.java
@@ -53,7 +53,7 @@ private static Identifier uniqueKeyName(MetadataBuildingContext context, Annotat
 
 	private static void addColumnsToUniqueKey(AnnotatedColumns columns, Identifier name) {
 		final var collector = columns.getBuildingContext().getMetadataCollector();
-		final Table table = columns.getTable();
+		final var table = columns.getTable();
 		final var uniqueKey = table.getOrCreateUniqueKey( name.render( collector.getDatabase().getDialect() ) );
 		final var property = columns.resolveProperty();
 		if ( property.isComposite() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java
index e9c32b3564cc..74a1fb728e1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java
@@ -30,6 +30,7 @@
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
+import org.hibernate.annotations.Audited;
 import org.hibernate.annotations.Any;
 import org.hibernate.annotations.AttributeBinderType;
 import org.hibernate.annotations.CascadeType;
@@ -41,18 +42,19 @@
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.OptimisticLock;
 import org.hibernate.annotations.Parent;
-import org.hibernate.binder.AttributeBinder;
+import org.hibernate.annotations.Temporal.Excluded;
 import org.hibernate.boot.spi.AccessType;
+import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.PropertyData;
+import org.hibernate.temporal.TemporalTableStrategy;
 import org.hibernate.engine.OptimisticLockStyle;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.BeforeExecutionGenerator;
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.EventTypeSets;
-import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Component;
-import org.hibernate.mapping.Join;
 import org.hibernate.mapping.KeyValue;
 import org.hibernate.mapping.MappedSuperclass;
 import org.hibernate.mapping.PersistentClass;
@@ -81,6 +83,7 @@
 import static org.hibernate.boot.model.internal.BinderHelper.getMappedSuperclassOrNull;
 import static org.hibernate.boot.model.internal.BinderHelper.getPath;
 import static org.hibernate.boot.model.internal.BinderHelper.hasToOneAnnotation;
+import static org.hibernate.boot.model.internal.Binders.callPropertyBinder;
 import static org.hibernate.boot.model.internal.ClassPropertyHolder.handleGenericComponentProperty;
 import static org.hibernate.boot.model.internal.ClassPropertyHolder.prepareActualProperty;
 import static org.hibernate.boot.model.internal.CollectionBinder.bindCollection;
@@ -88,6 +91,7 @@
 import static org.hibernate.boot.model.internal.EmbeddableBinder.createCompositeBinder;
 import static org.hibernate.boot.model.internal.EmbeddableBinder.createEmbeddable;
 import static org.hibernate.boot.model.internal.EmbeddableBinder.determineCustomInstantiator;
+import static org.hibernate.boot.model.internal.EmbeddableBinder.hasCompatibleType;
 import static org.hibernate.boot.model.internal.EmbeddableBinder.isEmbedded;
 import static org.hibernate.boot.model.internal.GeneratorBinder.createIdGeneratorsFromGeneratorAnnotations;
 import static org.hibernate.boot.model.internal.GeneratorBinder.createValueGeneratorFromAnnotations;
@@ -96,6 +100,8 @@
 import static org.hibernate.boot.model.internal.ToOneBinder.bindManyToOne;
 import static org.hibernate.boot.model.internal.ToOneBinder.bindOneToOne;
 import static org.hibernate.id.IdentifierGeneratorHelper.getForeignId;
+import static org.hibernate.internal.util.StringHelper.isEmpty;
+import static org.hibernate.internal.util.StringHelper.isBlank;
 import static org.hibernate.internal.util.StringHelper.qualify;
 
 /**
@@ -109,6 +115,8 @@ public class PropertyBinder {
 
 	private String name;
 	private String returnedClassName;
+	private boolean generic;
+	private boolean genericSpecialization;
 	private boolean lazy;
 	private String lazyGroup;
 	private AccessType accessType;
@@ -166,6 +174,14 @@ private void setReturnedClassName(String returnedClassName) {
 		this.returnedClassName = returnedClassName;
 	}
 
+	public void setGeneric(boolean generic) {
+		this.generic = generic;
+	}
+
+	public void setGenericSpecialization(boolean genericSpecialization) {
+		this.genericSpecialization = genericSpecialization;
+	}
+
 	public void setLazy(boolean lazy) {
 		this.lazy = lazy;
 	}
@@ -270,7 +286,7 @@ private Property makePropertyAndValue() {
 		basicValueBinder.setAccessType( accessType );
 
 		if ( holder instanceof ComponentPropertyHolder embeddableTypedContainer ) {
-			final Component component = embeddableTypedContainer.getComponent();
+			final var component = embeddableTypedContainer.getComponent();
 			if ( component.wasTableExplicitlyDefined() ) {
 				basicValueBinder.setTable( component.getTable() );
 			}
@@ -293,30 +309,16 @@ private boolean autoApplyConverters() {
 			&& !memberDetails.hasDirectAnnotationUsage( Temporal.class );
 	}
 
-	@SuppressWarnings({"rawtypes", "unchecked"})
 	private void callAttributeBinders(Property property, Map<String, PersistentClass> persistentClasses) {
 		final var metaAnnotatedTargets =
 				memberDetails.getMetaAnnotated( AttributeBinderType.class, getSourceModelContext() );
-		final var descriptorRegistry = getSourceModelContext().getAnnotationDescriptorRegistry();
-		for ( int i = 0; i < metaAnnotatedTargets.size(); i++ ) {
-			final Annotation metaAnnotatedTarget = metaAnnotatedTargets.get( i );
-			final var metaAnnotatedDescriptor =
-					descriptorRegistry.getDescriptor( metaAnnotatedTarget.annotationType() );
-			final var binderTypeAnn =
-					metaAnnotatedDescriptor.getDirectAnnotationUsage( AttributeBinderType.class );
-			try {
-				final AttributeBinder binder = binderTypeAnn.binder().getConstructor().newInstance();
-				final var persistentClass =
-						entityBinder != null
-								? entityBinder.getPersistentClass()
-								: persistentClasses.get( holder.getEntityName() );
-				binder.bind( metaAnnotatedTarget, buildingContext, persistentClass, property );
-			}
-			catch ( Exception e ) {
-				throw new AnnotationException( "error processing @AttributeBinderType annotation '"
-						+ metaAnnotatedDescriptor.getAnnotationType().getName() + "' for property '"
-						+ qualify( holder.getPath(), name ) + "'", e );
-			}
+		for ( final var metaAnnotatedTarget : metaAnnotatedTargets ) {
+			final var annotationType = metaAnnotatedTarget.annotationType();
+			final var persistentClass =
+					entityBinder != null
+							? entityBinder.getPersistentClass()
+							: persistentClasses.get( holder.getEntityName() );
+			callPropertyBinder( metaAnnotatedTarget, annotationType, persistentClass, property, buildingContext );
 		}
 	}
 
@@ -441,6 +443,8 @@ public Property makeProperty() {
 		property.setCascade( cascadeTypes );
 		property.setPropertyAccessorName( accessType.getType() );
 		property.setReturnedClassName( returnedClassName );
+		property.setGeneric( generic );
+		property.setGenericSpecialization( genericSpecialization );
 //		property.setPropertyAccessStrategy( propertyAccessStrategy );
 		handleValueGeneration( property );
 		handleNaturalId( property );
@@ -448,6 +452,8 @@ public Property makeProperty() {
 		handleMutability( property );
 		handleOptional( property );
 		inferOptimisticLocking( property );
+		handleTemporalExcluded( property );
+		handleAuditedExcluded( property );
 		return property;
 	}
 
@@ -469,8 +475,8 @@ private void handleMutability(Property property) {
 		if ( memberDetails != null && memberDetails.hasDirectAnnotationUsage( Immutable.class ) ) {
 			updatable = false;
 		}
-		property.setInsertable( insertable );
-		property.setUpdatable( updatable );
+		property.resetInsertable( insertable );
+		property.resetUpdateable( updatable );
 	}
 
 	private void handleOptional(Property property) {
@@ -481,7 +487,7 @@ private void handleOptional(Property property) {
 					// Defer determining whether a property and its columns are nullable,
 					// as handleOptional might be called when the value is not yet fully initialized
 					if ( property.getPersistentClass() != null ) {
-						for ( Join join : property.getPersistentClass().getJoins() ) {
+						for ( var join : property.getPersistentClass().getJoins() ) {
 							if ( join.getProperties().contains( property ) ) {
 								// If this property is part of a join it is inherently optional
 								return;
@@ -536,6 +542,40 @@ else if ( memberDetails != null && memberDetails.hasDirectAnnotationUsage( Optim
 		}
 	}
 
+	private void handleTemporalExcluded(Property property) {
+		if ( memberDetails != null && memberDetails.hasDirectAnnotationUsage( Excluded.class ) ) {
+			property.setTemporalExcluded( true );
+			property.setOptimisticLocked( false );
+			addTemporalExcludedColumnOptions( property );
+		}
+	}
+
+	private void handleAuditedExcluded(Property property) {
+		if ( memberDetails != null && memberDetails.hasDirectAnnotationUsage( Audited.Excluded.class ) ) {
+			property.setAuditedExcluded( true );
+			property.setOptimisticLocked( false );
+		}
+	}
+
+	private void addTemporalExcludedColumnOptions(Property property) {
+		if ( buildingContext.getTemporalTableStrategy() == TemporalTableStrategy.NATIVE ) {
+			for ( var selectable : property.getSelectables() ) {
+				if ( selectable instanceof Column column ) {
+					final String existing = column.getOptions();
+					final String exclusion =
+							buildingContext.getMetadataCollector()
+									.getDatabase().getDialect().getTemporalTableSupport()
+									.getTemporalExclusionColumnOption();
+					final String options =
+							isBlank( existing )
+									? exclusion
+									: existing + " " + exclusion;
+					column.setOptions( options );
+				}
+			}
+		}
+	}
+
 	private void validateAnnotationsAgainstType() {
 		if ( memberDetails != null ) {
 			final var type = memberDetails.getType();
@@ -570,15 +610,15 @@ private void checkAnnotation(Class<? extends Annotation> annotationClass, Class<
 
 	private void validateOptimisticLock(boolean excluded) {
 		if ( excluded ) {
-			if ( memberDetails.hasDirectAnnotationUsage( Version.class ) ) {
+			if ( isVersion( memberDetails ) ) {
 				throw new AnnotationException("Property '" + qualify( holder.getPath(), name )
 						+ "' is annotated '@OptimisticLock(excluded=true)' and '@Version'" );
 			}
-			if ( memberDetails.hasDirectAnnotationUsage( Id.class ) ) {
+			if ( isSimpleId( memberDetails ) ) {
 				throw new AnnotationException("Property '" + qualify( holder.getPath(), name )
 						+ "' is annotated '@OptimisticLock(excluded=true)' and '@Id'" );
 			}
-			if ( memberDetails.hasDirectAnnotationUsage( EmbeddedId.class ) ) {
+			if ( isEmbeddedId( memberDetails ) ) {
 				throw new AnnotationException( "Property '" + qualify( holder.getPath(), name )
 						+ "' is annotated '@OptimisticLock(excluded=true)' and '@EmbeddedId'" );
 			}
@@ -687,8 +727,7 @@ private static void checkIdProperty(MemberDetails property, PropertyData propert
 	}
 
 	static boolean hasIdAnnotation(MemberDetails element) {
-		return element.hasDirectAnnotationUsage( Id.class )
-			|| element.hasDirectAnnotationUsage( EmbeddedId.class );
+		return isSimpleId( element ) || isEmbeddedId( element );
 	}
 
 	/**
@@ -760,14 +799,14 @@ private static void buildProperty(
 		final var memberDetails = inferredData.getAttributeMember();
 
 		if ( isPropertyOfRegularEmbeddable( propertyHolder, isComponentEmbedded )
-				&& memberDetails.hasDirectAnnotationUsage( Id.class ) ) {
+				&& isSimpleId( memberDetails ) ) {
 			throw new AnnotationException("Member '" + memberDetails.getName()
-					+ "' of embeddable class " + propertyHolder.getClassName() + " is annotated '@Id'");
+					+ "' of embeddable class '" + propertyHolder.getClassName() + "' is annotated '@Id'");
 		}
 
 		final var attributeTypeDetails =
-				inferredData.getAttributeMember().isPlural()
-						? inferredData.getAttributeMember().getType()
+				memberDetails.isPlural()
+						? memberDetails.getType()
 						: inferredData.getClassOrElementType();
 
 		final var propertyBinder = propertyBinder(
@@ -921,15 +960,23 @@ else if ( !isId() || !entityBinder.isIgnoreIdAnnotations() ) {
 		return columnsBuilder.getColumns();
 	}
 
-	private static boolean isVersion(MemberDetails property) {
+	static boolean isEmbeddedId(MemberDetails property) {
+		return property.hasDirectAnnotationUsage( EmbeddedId.class );
+	}
+
+	static boolean isSimpleId(MemberDetails property) {
+		return property.hasDirectAnnotationUsage( Id.class );
+	}
+
+	static boolean isVersion(MemberDetails property) {
 		return property.hasDirectAnnotationUsage( Version.class );
 	}
 
-	private static boolean isOneToOne(MemberDetails property) {
+	static boolean isOneToOne(MemberDetails property) {
 		return property.hasDirectAnnotationUsage( OneToOne.class );
 	}
 
-	private static boolean isManyToOne(MemberDetails property) {
+	static boolean isManyToOne(MemberDetails property) {
 		return property.hasDirectAnnotationUsage( ManyToOne.class );
 	}
 
@@ -954,12 +1001,14 @@ private void bindVersionProperty(
 		setColumns( columns );
 		final var property = makePropertyValueAndBind();
 		getBasicValueBinder().setVersion( true );
+		property.setOptional( false );
 		rootClass.setVersion( property );
 
 		//If version is on a mapped superclass, update the mapping
 		final var declaringClass = inferredData.getDeclaringClass();
 		final var mappedSuperclass =
-				getMappedSuperclassOrNull( declaringClass, inheritanceStatePerClass, buildingContext );
+				getMappedSuperclassOrNull( declaringClass,
+						inheritanceStatePerClass, buildingContext );
 		if ( mappedSuperclass != null ) {
 			// Don't overwrite an existing version property
 			if ( mappedSuperclass.getDeclaredVersion() == null ) {
@@ -1002,8 +1051,13 @@ private AnnotatedColumns bindBasicOrComposite(
 			ClassDetails returnedClass) {
 		final var memberDetails = inferredData.getAttributeMember();
 
+		if ( propertyHolder.isEntity() && propertyHolder.getPersistentClass().isAbstract() ) {
+			// When the type of the member is a type variable, we mark it as generic for abstract classes
+			setGeneric( inferredData.getClassOrElementType().getTypeKind() == TypeDetails.Kind.TYPE_VARIABLE );
+		}
+
 		// overrides from @MapsId or @IdClass if needed
-		final PropertyData overridingProperty =
+		final var overridingProperty =
 				overridingProperty( propertyHolder, isIdentifierMapper, memberDetails );
 		final AnnotatedColumns actualColumns;
 		final boolean isComposite;
@@ -1049,12 +1103,7 @@ private PropertyData overridingProperty(
 				|| propertyHolder.isOrWithinEmbeddedId()
 				|| propertyHolder.isInIdClass() ) {
 			// the associated entity could be using an @IdClass making the overridden property a component
-			return getPropertyOverriddenByMapperOrMapsId(
-					isId,
-					propertyHolder,
-					property.resolveAttributeName(),
-					buildingContext
-			);
+			return getPropertyOverriddenByMapperOrMapsId( propertyHolder, property );
 		}
 		else {
 			return null;
@@ -1078,8 +1127,7 @@ private PropertyBinder propertyBinder(
 
 		final var memberDetails = inferredData.getAttributeMember();
 		if ( isComposite || compositeUserType != null ) {
-			if ( memberDetails.isArray() && memberDetails.getElementType() != null
-					&& isEmbedded( memberDetails, memberDetails.getElementType() ) ) {
+			if ( memberDetails.isArray() && isEmbedded( memberDetails ) ) {
 				// This is a special kind of basic aggregate component array type
 				aggregateBinder(
 						propertyHolder,
@@ -1113,8 +1161,7 @@ && isEmbedded( memberDetails, memberDetails.getElementType() ) ) {
 				);
 			}
 		}
-		else if ( memberDetails.isPlural() && memberDetails.getElementType() != null
-					&& isEmbedded( memberDetails, memberDetails.getElementType() ) ) {
+		else if ( memberDetails.isPlural() && isEmbedded( memberDetails ) ) {
 			// This is a special kind of basic aggregate component array type
 			aggregateBinder(
 					propertyHolder,
@@ -1152,7 +1199,7 @@ private void handleGenerators(
 		}
 		else if ( isId() ) {
 			if ( isIdentifierMapper ) {
-				throw new AnnotationException( "Property '"+ getPath( propertyHolder, inferredData )
+				throw new AnnotationException( "Property '" + getPath( propertyHolder, inferredData )
 						+ "' belongs to an '@IdClass' and may not be annotated '@Id' or '@EmbeddedId'" );
 			}
 			//components and regular basic types create SimpleValue objects
@@ -1341,32 +1388,85 @@ private static Class<? extends CompositeUserType<?>> resolveCompositeUserType(
 		return null;
 	}
 
-	private static PropertyData getPropertyOverriddenByMapperOrMapsId(
-			boolean isId,
+	private PropertyData getPropertyOverriddenByMapperOrMapsId(
 			PropertyHolder propertyHolder,
-			String propertyName,
-			MetadataBuildingContext buildingContext) {
-		final var classDetailsRegistry =
-				buildingContext.getBootstrapContext().getModelsContext().getClassDetailsRegistry();
-		final PersistentClass persistentClass = propertyHolder.getPersistentClass();
+			MemberDetails property) {
+		final var persistentClass = propertyHolder.getPersistentClass();
 		final String name =
-				StringHelper.isEmpty( persistentClass.getClassName() )
+				isEmpty( persistentClass.getClassName() )
 						? persistentClass.getEntityName()
 						: persistentClass.getClassName();
-		final var classDetails = classDetailsRegistry.resolveClassDetails( name );
-		final var metadataCollector = buildingContext.getMetadataCollector();
+		final var classDetails =
+				buildingContext.getBootstrapContext().getModelsContext()
+						.getClassDetailsRegistry().resolveClassDetails( name );
+		final var collector = buildingContext.getMetadataCollector();
+		final String propertyName = property.resolveAttributeName();
 		if ( propertyHolder.isInIdClass() ) {
-			final PropertyData data =
-					metadataCollector.getPropertyAnnotatedWithIdAndToOne( classDetails, propertyName );
-			if ( data != null ) {
-				return data;
+			final var toOnePropertyData =
+					collector.getPropertyAnnotatedWithIdAndToOne( classDetails, propertyName );
+			if ( toOnePropertyData != null ) {
+				return toOnePropertyData;
 			}
-			// TODO: is this branch even necessary?
-			else  {
-				return metadataCollector.getPropertyAnnotatedWithMapsId( classDetails, propertyName );
+			else {
+				final var mapsIdProperty = collector.getPropertyAnnotatedWithMapsId( classDetails, propertyName );
+				if ( mapsIdProperty != null ) {
+					checkMappedId( propertyHolder, property, propertyName, mapsIdProperty, collector );
+				}
+				return mapsIdProperty;
 			}
 		}
-		return metadataCollector.getPropertyAnnotatedWithMapsId( classDetails, isId ? "" : propertyName );
+		else {
+			return collector.getPropertyAnnotatedWithMapsId( classDetails, isId ? "" : propertyName );
+		}
 	}
 
+	private static void checkMappedId(
+			PropertyHolder propertyHolder,
+			MemberDetails property,
+			String propertyName, PropertyData mapsIdProperty,
+			InFlightMetadataCollector collector) {
+		final var referencedEntityName = mapsIdProperty.getClassOrElementName();
+		final var referencedEntityBinding = collector.getEntityBinding( referencedEntityName );
+		if ( referencedEntityBinding != null ) {
+			if ( referencedEntityBinding.getIdentifier() instanceof Component compositeId ) {
+				if ( !isEmbeddedId( property ) ) {
+					throw new AnnotationException(
+							"Attribute '%s' of entity '%s' is mapped by association '%s' but is not annotated '@EmbeddedId'"
+									.formatted(
+											propertyName,
+											propertyHolder.getPersistentClass().getEntityName(),
+											mapsIdProperty.getPropertyName()
+									)
+					);
+				}
+				final String expectedTypeName = compositeId.getComponentClassName();
+				final String actualTypeName = property.getType().getName();
+				if ( !hasCompatibleType( actualTypeName, expectedTypeName ) ) {
+					throw new AnnotationException(
+							"Identifier attribute '%s' of entity '%s' has type '%s' but is mapped by association '%s' to entity '%s' with composite identifier type '%s'"
+									.formatted(
+											propertyName,
+											propertyHolder.getPersistentClass().getEntityName(),
+											actualTypeName,
+											mapsIdProperty.getPropertyName(),
+											referencedEntityName,
+											expectedTypeName
+									)
+					);
+				}
+			}
+			else {
+				if ( !isSimpleId( property ) ) {
+					throw new AnnotationException(
+							"Attribute '%s' of entity '%s' is mapped by association '%s' but is not annotated '@Id'"
+									.formatted(
+											propertyName,
+											propertyHolder.getPersistentClass().getEntityName(),
+											mapsIdProperty.getPropertyName()
+									)
+					);
+				}
+			}
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java
index 3c7618404c11..16f2075e8463 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyContainer.java
@@ -77,11 +77,13 @@ public PropertyContainer(ClassDetails classDetails, TypeVariableScope typeAtStak
 		AccessType localClassLevelAccessType = determineLocalClassDefinedAccessStrategy();
 		assert localClassLevelAccessType != null;
 
-		this.classLevelAccessType = localClassLevelAccessType != AccessType.DEFAULT
-				? localClassLevelAccessType
-				: defaultClassLevelAccessType;
-		assert classLevelAccessType == AccessType.FIELD || classLevelAccessType == AccessType.PROPERTY
-				|| classLevelAccessType == AccessType.RECORD;
+		classLevelAccessType =
+				localClassLevelAccessType != AccessType.DEFAULT
+						? localClassLevelAccessType
+						: defaultClassLevelAccessType;
+		assert classLevelAccessType == AccessType.FIELD
+			|| classLevelAccessType == AccessType.PROPERTY
+			|| classLevelAccessType == AccessType.RECORD;
 
 		attributeMembers = resolveAttributeMembers( classDetails, typeAtStake, classLevelAccessType );
 	}
@@ -126,17 +128,15 @@ private static Map<String, MemberDetails> buildAttributeMemberMap(
 			List<RecordComponentDetails> recordComponents,
 			List<FieldDetails> fields,
 			List<MethodDetails> getters) {
-		final Map<String, MemberDetails> attributeMemberMap;
 		// If the record class has only record components which match up with fields and no additional getters,
 		// we must retain the property order, to match up with the record component order
 		if ( !recordComponents.isEmpty() && recordComponents.size() == fields.size() ) {
-			attributeMemberMap = new LinkedHashMap<>();
+			return new LinkedHashMap<>();
 		}
 		//otherwise we sort them in alphabetical order, since this is at least deterministic
 		else {
-			attributeMemberMap = new TreeMap<>();
+			return new TreeMap<>();
 		}
-		return attributeMemberMap;
 	}
 
 	private static <E extends MemberDetails> List<E> collectPotentialAttributeMembers(List<E> source) {
@@ -230,22 +230,20 @@ private static void collectPersistentAttributesUsingClassLevelAccessType(
 			List<RecordComponentDetails> recordComponents) {
 		if ( classLevelAccessType == AccessType.FIELD ) {
 			for ( int i = 0; i < fields.size(); i++ ) {
-				final FieldDetails field = fields.get( i );
+				final var field = fields.get( i );
 				final String name = field.getName();
-				if ( persistentAttributeMap.containsKey( name ) ) {
-					continue;
+				if ( !persistentAttributeMap.containsKey( name ) ) {
+					persistentAttributeMap.put( name, field );
 				}
-
-				persistentAttributeMap.put( name, field );
 			}
 		}
 		else {
 			for ( int i = 0; i < getters.size(); i++ ) {
-				final MethodDetails getterDetails = getters.get( i );
+				final var getterDetails = getters.get( i );
 				final String name = getterDetails.resolveAttributeName();
 
 				// HHH-10242 detect registration of the same property getter twice - eg boolean isId() + UUID getId()
-				final MethodDetails previous = persistentAttributesFromGetters.get( name );
+				final var previous = persistentAttributesFromGetters.get( name );
 				if ( previous != null && getterDetails != previous ) {
 					throwAmbiguousPropertyException( classDetails, previous, getterDetails );
 				}
@@ -260,14 +258,13 @@ private static void collectPersistentAttributesUsingClassLevelAccessType(
 			// we also have to add the attributes for record components,
 			// because record classes usually don't have getters, but just the record component accessors
 			for ( int i = 0; i < recordComponents.size(); i++ ) {
-				final RecordComponentDetails componentDetails = recordComponents.get( i );
+				final var componentDetails = recordComponents.get( i );
 				final String name = componentDetails.getName();
-				if ( persistentAttributeMap.containsKey( name ) ) {
-					continue;
+				if ( !persistentAttributeMap.containsKey( name ) ) {
+					persistentAttributeMap.put( name, componentDetails );
+					persistentAttributesFromComponents.put( name, componentDetails );
 				}
 
-				persistentAttributeMap.put( name, componentDetails );
-				persistentAttributesFromComponents.put( name, componentDetails );
 			}
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java
index 877648c46934..9c701c96e5eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java
@@ -61,12 +61,14 @@ public interface PropertyHolder {
 	String getPath();
 
 	/**
-	 * return null if the column is not overridden, or an array of column if true
+	 * return null if the column is not overridden,
+	 * or an array of columns if it is
 	 */
 	Column[] getOverriddenColumn(String propertyName);
 
 	/**
-	 * return null if the column is not overridden, or an array of column if true
+	 * return null if the column is not overridden,
+	 * or an array of columns if it is
 	 */
 	JoinColumn[] getOverriddenJoinColumn(String propertyName);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java
index 9072e3528c4e..fa4130e45c7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java
@@ -130,7 +130,12 @@ private static TargetEmbeddable getTargetEmbeddableAnnotation(MemberDetails memb
 		// then, look on the member's type
 		// 		NOTE: this is not supported for collections-of-embeddables
 		// 		for the same reason stated above
-		return memberDetails.getAssociatedType().determineRawClass().getDirectAnnotationUsage( TargetEmbeddable.class );
+		ClassDetails memberRawClass = memberDetails.getAssociatedType().determineRawClass();
+		if (memberRawClass.isJdkClass()) {
+			return null;
+		}
+
+		return memberRawClass.getDirectAnnotationUsage( TargetEmbeddable.class );
 	}
 
 	private static ClassTypeDetailsImpl resolveTargetEmbeddableAnnotation(
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SoftDeleteHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SoftDeleteHelper.java
index 9a67d40f0bff..71ac40b83b19 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SoftDeleteHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/SoftDeleteHelper.java
@@ -44,7 +44,7 @@ public static void bindSoftDeleteIndicator(
 			Table table,
 			MetadataBuildingContext context) {
 		assert softDeleteConfig != null;
-		final Column softDeleteIndicatorColumn = createSoftDeleteIndicatorColumn(
+		final var softDeleteIndicatorColumn = createSoftDeleteIndicatorColumn(
 				softDeleteConfig,
 				createSoftDeleteIndicatorValue( softDeleteConfig, table, context ),
 				context
@@ -70,11 +70,10 @@ private static BasicValue createSoftDeleteIndicatorValue(
 		}
 		else {
 			final ConverterDescriptor<Boolean,?> converterDescriptor =
-					ConverterDescriptors.of( softDeleteConfig.converter(),
-							context.getBootstrapContext().getClassmateContext() );
+					ConverterDescriptors.of( softDeleteConfig.converter() );
 			softDeleteIndicatorValue.setJpaAttributeConverterDescriptor( converterDescriptor );
 			softDeleteIndicatorValue.setImplicitJavaTypeAccess(
-					typeConfiguration -> converterDescriptor.getRelationalValueResolvedType().getErasedType()
+					typeConfiguration -> converterDescriptor.getRelationalValueResolvedType()
 			);
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java
index b62c3d5e4542..bf74e587d73c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TableBinder.java
@@ -13,7 +13,6 @@
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.naming.ImplicitCollectionTableNameSource;
 import org.hibernate.boot.model.naming.ImplicitJoinTableNameSource;
-import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
 import org.hibernate.boot.model.naming.NamingStrategyHelper;
 import org.hibernate.boot.model.source.spi.AttributePath;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
@@ -25,11 +24,11 @@
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.DependantValue;
-import org.hibernate.mapping.Join;
 import org.hibernate.mapping.JoinedSubclass;
 import org.hibernate.mapping.KeyValue;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.SortableValue;
 import org.hibernate.mapping.Table;
@@ -148,7 +147,7 @@ public Table bind() {
 		final var namingStrategyHelper = new NamingStrategyHelper() {
 			@Override
 			public Identifier determineImplicitName(final MetadataBuildingContext buildingContext) {
-				final ImplicitNamingStrategy namingStrategy = buildingContext.getBuildingOptions().getImplicitNamingStrategy();
+				final var namingStrategy = buildingContext.getBuildingOptions().getImplicitNamingStrategy();
 
 				Identifier name;
 				if ( isJPA2ElementCollection ) {
@@ -314,9 +313,12 @@ private ObjectNameSource buildNameContext() {
 			return new AssociationTableNameSource( name, null );
 		}
 
+		final var implicitNamingStrategy =
+				buildingContext.getBuildingOptions()
+						.getImplicitNamingStrategy();
 		final Identifier logicalName;
 		if ( isJPA2ElementCollection ) {
-			logicalName = buildingContext.getBuildingOptions().getImplicitNamingStrategy().determineCollectionTableName(
+			logicalName = implicitNamingStrategy.determineCollectionTableName(
 					new ImplicitCollectionTableNameSource() {
 						private final EntityNaming owningEntityNaming = new EntityNaming() {
 							@Override
@@ -359,7 +361,7 @@ public MetadataBuildingContext getBuildingContext() {
 			);
 		}
 		else {
-			logicalName = buildingContext.getBuildingOptions().getImplicitNamingStrategy().determineJoinTableName(
+			logicalName = implicitNamingStrategy.determineJoinTableName(
 					new ImplicitJoinTableNameSource() {
 						private final EntityNaming owningEntityNaming = new EntityNaming() {
 							@Override
@@ -488,7 +490,7 @@ private static Table buildAndFillTable(
 			InFlightMetadataCollector.EntityTableXref denormalizedSuperTableXref) {
 		final var metadataCollector = buildingContext.getMetadataCollector();
 
-		final Table table = addTable(
+		final var table = addTable(
 				nullIfBlank( schema ),
 				nullIfBlank( catalog ),
 				logicalName,
@@ -542,7 +544,8 @@ private static Table addTable(
 					logicalName.render(),
 					subselect,
 					isAbstract,
-					buildingContext
+					buildingContext,
+					logicalName.isExplicit()
 			);
 		}
 	}
@@ -642,13 +645,13 @@ private static void bindPrimaryKeyReference(
 			MetadataBuildingContext buildingContext) {
 		// ensure the composite key is sorted so that we can simply
 		// set sorted to true on the ToOne (below)
-		final KeyValue key = referencedEntity.getKey();
+		final var key = referencedEntity.getKey();
 		if ( key instanceof Component component ) {
 			component.sortProperties();
 		}
 		// works because the pk has to be on the primary table
 		final var metadataCollector = buildingContext.getMetadataCollector();
-		final Dialect dialect = metadataCollector.getDatabase().getJdbcEnvironment().getDialect();
+		final var dialect = metadataCollector.getDatabase().getJdbcEnvironment().getDialect();
 		for ( int j = 0; j < key.getColumnSpan(); j++ ) {
 			if ( !matchUpJoinColumnsWithKeyColumns( referencedEntity, joinColumns, value, metadataCollector, dialect, j ) ) {
 				// we can only get here if there's a dupe PK column in the @JoinColumns
@@ -681,19 +684,19 @@ private static boolean matchUpJoinColumnsWithKeyColumns(
 			Dialect dialect,
 			int index) {
 		// for each PK column, find the associated FK column.
-		for ( AnnotatedJoinColumn joinColumn : joinColumns.getJoinColumns() ) {
+		for ( var joinColumn : joinColumns.getJoinColumns() ) {
 			final String referencedNamed = joinColumn.getReferencedColumn();
 			String referencedColumn = null;
 			List<Column> columns = null;
 			try {
-				final Table referencedTable = referencedEntity.getTable();
+				final var referencedTable = referencedEntity.getTable();
 				referencedColumn = metadataCollector.getPhysicalColumnName( referencedTable, referencedNamed );
 				columns = referencedEntity.getKey().getColumns();
 			}
 			catch ( MappingException me ) {
-				for ( Join join : referencedEntity.getJoins() ) {
+				for ( var join : referencedEntity.getJoins() ) {
 					try {
-						final Table referencedTable = join.getTable();
+						final var referencedTable = join.getTable();
 						referencedColumn = metadataCollector.getPhysicalColumnName( referencedTable, referencedNamed );
 						columns = referencedTable.getPrimaryKey().getColumns();
 						break;
@@ -705,7 +708,7 @@ private static boolean matchUpJoinColumnsWithKeyColumns(
 					throw me;
 				}
 			}
-			final Column column = columns.get( index );
+			final var column = columns.get( index );
 			final String quotedName = column.getQuotedName( dialect );
 			// in JPA 2 referencedColumnName is case-insensitive
 			if ( referencedColumn.equalsIgnoreCase( quotedName ) ) {
@@ -734,7 +737,9 @@ private static void bindNonPrimaryKeyReference(
 		else if ( value instanceof DependantValue ) {
 			final String propertyName = joinColumns.getPropertyName();
 			if ( propertyName != null ) {
-				final var collection = (Collection) referencedEntity.getRecursiveProperty( propertyName ).getValue();
+				final var collection = (Collection)
+						referencedEntity.getRecursiveProperty( propertyName )
+								.getValue();
 				referencedPropertyName = collection.getReferencedPropertyName();
 			}
 			else {
@@ -748,7 +753,7 @@ else if ( value instanceof DependantValue ) {
 			throw new AssertionFailure( "No property ref found" );
 		}
 
-		final Property synthProp = referencedEntity.getReferencedProperty( referencedPropertyName );
+		final var synthProp = referencedEntity.getReferencedProperty( referencedPropertyName );
 		if ( synthProp == null ) {
 			throw new AssertionFailure( "Cannot find synthetic property: "
 					+ referencedEntity.getEntityName() + "." + referencedPropertyName );
@@ -761,10 +766,10 @@ else if ( value instanceof DependantValue ) {
 	// This code is good but unnecessary, because BinderHelper.referencedProperty()
 	// automatically marks the referenced property unique (but is this actually good?)
 	private static void checkReferenceToUniqueKey(SimpleValue value, Property synthProp) {
-		final Table table = synthProp.getValue().getTable();
-		final List<Column> columns = synthProp.getValue().getConstraintColumns();
+		final var table = synthProp.getValue().getTable();
+		final var columns = synthProp.getValue().getConstraintColumns();
 		if ( columns.size() == 1 ) {
-			final Column column = columns.get( 0 );
+			final var column = columns.get( 0 );
 			assert column.isUnique();
 //			if ( !column.isUnique() ) {
 //				throw new MappingException( "Referenced column '" + column.getName()
@@ -773,8 +778,8 @@ private static void checkReferenceToUniqueKey(SimpleValue value, Property synthP
 //			}
 		}
 		else {
-			final UniqueKey uniqueKey = new UniqueKey( table );
-			for ( Column column : columns ) {
+			final var uniqueKey = new UniqueKey( table );
+			for ( var column : columns ) {
 				uniqueKey.addColumn( column );
 			}
 			assert table.isRedundantUniqueKey( uniqueKey );
@@ -795,16 +800,16 @@ private static void bindImplicitColumns(
 						: referencedEntity.getIdentifier();
 		final List<Column> referencedKeyColumns = keyValue.getColumns();
 		for ( int i = 0; i < referencedKeyColumns.size(); i++ ) {
-			final Column column = referencedKeyColumns.get(i);
-			final AnnotatedJoinColumn firstColumn = joinColumns.getJoinColumns().get(0);
+			final var column = referencedKeyColumns.get(i);
+			final var firstColumn = joinColumns.getJoinColumns().get(0);
 			firstColumn.linkValueUsingDefaultColumnNaming( i, column, referencedEntity, value );
 			firstColumn.overrideFromReferencedColumnIfNecessary( column );
-			final Column createdColumn = firstColumn.getMappingColumn();
+			final var createdColumn = firstColumn.getMappingColumn();
 			if ( createdColumn != null ) {
 				final String logicalColumnName = createdColumn.getQuotedName();
 				if ( logicalColumnName != null && joinColumns.hasMapsId() ) {
-					final Value idValue = joinColumns.resolveMapsId().getValue();
-					final Column idColumn = idValue.getColumns().get(i);
+					final var idValue = joinColumns.resolveMapsId().getValue();
+					final var idColumn = idValue.getColumns().get(i);
 					// infer the names of the primary key column
 					// from the join column of the association
 					// as (sorta) required by the JPA spec
@@ -827,28 +832,30 @@ private static void bindUnownedAssociation(
 			SimpleValue value,
 			PersistentClass associatedClass,
 			String mappedByProperty) {
-		final AnnotatedJoinColumn firstColumn = joinColumns.getJoinColumns().get(0);
-		for ( Column column: mappedByColumns( associatedClass, mappedByProperty ) ) {
-			firstColumn.overrideFromReferencedColumnIfNecessary( column );
-			firstColumn.linkValueUsingAColumnCopy( column, value);
+		final var firstColumn = joinColumns.getJoinColumns().get(0);
+		for ( var selectable: mappedByColumns( associatedClass, mappedByProperty ) ) {
+			if ( selectable instanceof Column column ) {
+				firstColumn.overrideFromReferencedColumnIfNecessary( column );
+			}
+			firstColumn.linkValueUsingCopy( selectable, value );
 		}
 	}
 
-	private static List<Column> mappedByColumns(PersistentClass associatedClass, String mappedByProperty) {
-		final Value value = associatedClass.getRecursiveProperty( mappedByProperty ).getValue();
+	private static List<Selectable> mappedByColumns(PersistentClass associatedClass, String mappedByProperty) {
+		final var value = associatedClass.getRecursiveProperty( mappedByProperty ).getValue();
 		if ( value instanceof Collection collection ) {
-			final Value element = collection.getElement();
+			final var element = collection.getElement();
 			if ( element == null ) {
 				throw new AnnotationException( "Both sides of the bidirectional association '"
 						+ associatedClass.getEntityName() + "." + mappedByProperty + "' specify 'mappedBy'" );
 			}
-			return element.getColumns();
+			return element.getSelectables();
 		}
 		else if ( value instanceof Any any ) {
-			return any.getKeyDescriptor().getColumns();
+			return any.getKeyDescriptor().getSelectables();
 		}
 		else {
-			return value.getColumns();
+			return value.getSelectables();
 		}
 	}
 
@@ -857,24 +864,24 @@ public static void linkJoinColumnWithValueOverridingNameIfImplicit(
 			Value value,
 			AnnotatedJoinColumns joinColumns,
 			SimpleValue simpleValue) {
-		final List<Column> valueColumns = value.getColumns();
-		final List<AnnotatedJoinColumn> columns = joinColumns.getJoinColumns();
+		final var valueColumns = value.getColumns();
+		final var columns = joinColumns.getJoinColumns();
 		final boolean mapsId = joinColumns.hasMapsId();
-		final List<Column> idColumns = mapsId ? joinColumns.resolveMapsId().getColumns() : null;
+		final var idColumns = mapsId ? joinColumns.resolveMapsId().getColumns() : null;
 		for ( int i = 0; i < columns.size(); i++ ) {
-			final AnnotatedJoinColumn joinColumn = columns.get(i);
+			final var joinColumn = columns.get(i);
 			if ( mapsId ) {
 				// infer the names of the primary key column
 				// from the join column of the association
 				// as (sorta) required by the JPA spec
-				final Column column = idColumns.get(i);
+				final var column = idColumns.get(i);
 				final String logicalColumnName = joinColumn.getLogicalColumnName();
 				if ( logicalColumnName != null ) {
 					column.setName( logicalColumnName );
 					simpleValue.getTable().columnRenamed( column);
 				}
 			}
-			final Column synthCol = valueColumns.get(i);
+			final var synthCol = valueColumns.get(i);
 			if ( joinColumn.isNameDeferred() ) {
 				//this has to be the default value
 				joinColumn.linkValueUsingDefaultColumnNaming( synthCol, referencedEntity, simpleValue );
@@ -894,7 +901,7 @@ static void addTableCheck(
 			Table table,
 			jakarta.persistence.CheckConstraint[] checkConstraintAnnotationUsages) {
 		if ( isNotEmpty( checkConstraintAnnotationUsages ) ) {
-			for ( jakarta.persistence.CheckConstraint checkConstraintAnnotationUsage : checkConstraintAnnotationUsages ) {
+			for ( var checkConstraintAnnotationUsage : checkConstraintAnnotationUsages ) {
 				table.addCheck(
 						new CheckConstraint(
 								nullIfEmpty( checkConstraintAnnotationUsage.name() ),
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TemporalHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TemporalHelper.java
new file mode 100644
index 000000000000..3f766dd0ec0c
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/TemporalHelper.java
@@ -0,0 +1,391 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.model.internal;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+
+import org.hibernate.annotations.Temporal;
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
+import org.hibernate.boot.model.relational.Database;
+import org.hibernate.boot.spi.InFlightMetadataCollector;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.mapping.BasicValue;
+import org.hibernate.mapping.CheckConstraint;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.PrimaryKey;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Stateful;
+import org.hibernate.mapping.Table;
+import org.hibernate.persister.state.internal.HistoryStateManagement;
+import org.hibernate.persister.state.internal.NativeTemporalStateManagement;
+import org.hibernate.persister.state.internal.TemporalStateManagement;
+import org.hibernate.temporal.spi.TransactionIdentifierService;
+
+import static org.hibernate.cfg.StateManagementSettings.TEMPORAL_TABLE_STRATEGY;
+import static org.hibernate.temporal.TemporalTableStrategy.AUTO;
+import static org.hibernate.temporal.TemporalTableStrategy.NATIVE;
+import static org.hibernate.temporal.TemporalTableStrategy.SINGLE_TABLE;
+import static org.hibernate.internal.util.StringHelper.isBlank;
+
+/**
+ * Helper for dealing with {@link org.hibernate.annotations.Temporal}.
+ */
+public class TemporalHelper {
+
+	public static final String ROW_START = "rowStart";
+	public static final String ROW_END = "rowEnd";
+
+	public static void bindTemporalColumns(
+			Temporal temporal,
+			Stateful target,
+			Table table,
+			Temporal.HistoryTable historyTable,
+			Temporal.HistoryPartitioning historyPartitioning,
+			MetadataBuildingContext context) {
+		final var collector = context.getMetadataCollector();
+		final boolean partitioned = historyPartitioning != null;
+		final String currentPartitionName =
+				partitioned
+						? inferredPartitionName( historyPartitioning.currentPartition(),
+								"current", table, collector )
+						: null;
+		final String historyPartitionName =
+				partitioned
+						? inferredPartitionName( historyPartitioning.historyPartition(),
+								"history", table, collector )
+						: null;
+
+		final int secondPrecision = temporal.secondPrecision();
+		final Integer precision = secondPrecision == -1 ? null : secondPrecision;
+		final var transactionIdType = getTransactionIdType( context );
+		final var rowStartColumn =
+				createTemporalColumn( temporal.rowStart(),
+						table, false, precision, transactionIdType, context );
+		final var rowEndColumn =
+				createTemporalColumn( temporal.rowEnd(),
+						table, true, precision, transactionIdType, context );
+		handleTemporalColumnGeneration( rowStartColumn, rowEndColumn, context );
+
+		final var temporalTable =
+				context.getTemporalTableStrategy() == TemporalTableStrategy.HISTORY_TABLE
+						? createHistoryTable( table, historyTable, context )
+						: table;
+		temporalTable.addColumn( rowStartColumn );
+		temporalTable.addColumn( rowEndColumn );
+		enableTemporal( target, context.getTemporalTableStrategy(),
+				rowStartColumn, rowEndColumn, temporalTable, partitioned,
+				collector.getDatabase().getDialect() );
+
+		addExtraDeclarationsAndOptions(
+				temporalTable,
+				rowStartColumn,
+				rowEndColumn,
+				partitioned,
+				currentPartitionName,
+				historyPartitionName,
+				context
+		);
+		addTemporalCheckConstraint( temporalTable, rowStartColumn, rowEndColumn, context );
+		addAuxiliaryObjects( temporalTable, partitioned, currentPartitionName, historyPartitionName, context );
+		addSecondPass( target, context );
+	}
+
+	static void enableTemporal(
+			Stateful model,
+			TemporalTableStrategy temporalTableStrategy,
+			Column rowStartColumn, Column rowEndColumn,
+			Table temporalTable, boolean partitioned,
+			Dialect dialect) {
+		model.addAuxiliaryColumn( ROW_START, rowStartColumn );
+		model.addAuxiliaryColumn( ROW_END, rowEndColumn );
+		model.setAuxiliaryTable( temporalTable );
+		model.setMainTablePartitioned( partitioned );
+		model.setStateManagementType( switch ( temporalTableStrategy ) {
+			case NATIVE -> NativeTemporalStateManagement.class;
+			case SINGLE_TABLE -> TemporalStateManagement.class;
+			case HISTORY_TABLE -> HistoryStateManagement.class;
+			case AUTO -> throw new IllegalArgumentException();
+		} );
+		if ( temporalTableStrategy == SINGLE_TABLE ) {
+			model.setAuxiliaryColumnInPrimaryKey( ROW_START );
+		}
+		model.setPrimaryKeyDisabled( dialect.getTemporalTableSupport()
+				.suppressesTemporalTablePrimaryKeys( partitioned ) );
+	}
+
+	private static Class<?> getTransactionIdType(MetadataBuildingContext context) {
+		return context.getBootstrapContext().getServiceRegistry()
+				.requireService( TransactionIdentifierService.class )
+				.getIdentifierType();
+	}
+
+	private static String inferredPartitionName(
+			String partitionName, String suffix, Table table, InFlightMetadataCollector collector) {
+		return partitionName == null || partitionName.isBlank()
+				? collector.getLogicalTableName( table ) + '_' + suffix
+				: partitionName;
+	}
+
+	private static void addSecondPass(Stateful target, MetadataBuildingContext context) {
+		if ( context.getTemporalTableStrategy() == TemporalTableStrategy.HISTORY_TABLE ) {
+			context.getMetadataCollector().addSecondPass( (OptionalDeterminationSecondPass) ignored -> {
+				copyTableColumns( target.getMainTable(), target.getAuxiliaryTable() );
+				createHistoryTablePrimaryKey( target,
+						context.getMetadataCollector().getDatabase().getDialect() );
+			} );
+		}
+	}
+
+	private static Table createHistoryTable(
+			Table table,
+			Temporal.HistoryTable temporalHistoryTable,
+			MetadataBuildingContext context) {
+		final var collector = context.getMetadataCollector();
+		final String explicitHistoryTableName =
+				temporalHistoryTable == null ? null : temporalHistoryTable.name();
+		final boolean hasExplicitHistoryTableName = !isBlank( explicitHistoryTableName );
+		final String historyTableName =
+				hasExplicitHistoryTableName
+						? explicitHistoryTableName
+						: collector.getLogicalTableName( table )
+								+ "_history";
+		final boolean explicitHistoryName =
+				hasExplicitHistoryTableName
+						|| table.getNameIdentifier().isExplicit();
+		final var historyTable = collector.addTable(
+				table.getSchema(),
+				table.getCatalog(),
+				historyTableName,
+				table.getSubselect(),
+				table.isAbstract(),
+				context,
+				explicitHistoryName
+		);
+		collector.addTableNameBinding( table.getNameIdentifier(), historyTable );
+		copyTableColumns( table, historyTable );
+		return historyTable;
+	}
+
+	private static void copyTableColumns(Table sourceTable, Table targetTable) {
+		for ( var column : sourceTable.getColumns() ) {
+			targetTable.addColumn( column.clone() );
+		}
+	}
+
+	private static void createHistoryTablePrimaryKey(
+			Stateful target,
+			Dialect dialect) {
+		final var historyTable = target.getAuxiliaryTable();
+		final var startingColumn = target.getAuxiliaryColumn( ROW_START );
+		if ( target instanceof RootClass rootClass ) {
+			final var primaryKey = new PrimaryKey( historyTable );
+			addColumnsByName( primaryKey, historyTable,
+					rootClass.getKey().getColumns() );
+			if ( dialect.addPartitionKeyToPrimaryKey() ) {
+				for ( var property : rootClass.getProperties() ) {
+					if ( property.getValue().isPartitionKey() ) {
+						addColumnsByName( primaryKey, historyTable,
+								property.getValue().getColumns() );
+					}
+				}
+			}
+			if ( primaryKey.getColumnSpan() > 0 ) {
+				if ( rootClass.isVersioned() ) {
+					final var versionProperty = rootClass.getVersion();
+					if ( versionProperty != null ) {
+						addColumnsByName( primaryKey, historyTable,
+								versionProperty.getValue().getColumns() );
+					}
+				}
+				else {
+					primaryKey.addColumn( startingColumn );
+				}
+				historyTable.setPrimaryKey( primaryKey );
+			}
+		}
+		else if ( target instanceof Collection collection ) {
+			final var table = collection.getCollectionTable();
+			final var sourcePrimaryKey = table == null ? null : table.getPrimaryKey();
+			if ( sourcePrimaryKey != null ) {
+				final var primaryKey = new PrimaryKey( historyTable );
+				addColumnsByName( primaryKey, historyTable,
+						sourcePrimaryKey.getColumns() );
+				if ( primaryKey.getColumnSpan() > 0 ) {
+					if ( !primaryKey.containsColumn( startingColumn ) ) {
+						primaryKey.addColumn( startingColumn );
+					}
+					historyTable.setPrimaryKey( primaryKey );
+				}
+			}
+		}
+	}
+
+	private static void addColumnsByName(PrimaryKey primaryKey, Table table, List<Column> columns) {
+		for ( var column : columns ) {
+			final var historyColumn = table.getColumn( column );
+			if ( historyColumn != null
+					&& !primaryKey.containsColumn( historyColumn ) ) {
+				primaryKey.addColumn( historyColumn );
+			}
+		}
+	}
+
+	private static void addExtraDeclarationsAndOptions(
+			Table table,
+			Column startingColumn, Column rowEndColumn,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName,
+			MetadataBuildingContext context) {
+		final var dialect = context.getMetadataCollector().getDatabase().getDialect();
+		final var strategy = context.getTemporalTableStrategy();
+		final var temporalTableSupport = dialect.getTemporalTableSupport();
+		table.setExtraDeclarations( temporalTableSupport.getExtraTemporalTableDeclarations(
+				strategy,
+				startingColumn.getQuotedName( dialect ),
+				rowEndColumn.getQuotedName( dialect ),
+				partitioned
+		) );
+		String rowEndColumnName = rowEndColumn.getQuotedName( dialect );
+		table.setOptions( appendOption( table.getOptions(),
+				temporalTableSupport.getTemporalTableOptions(
+						strategy,
+						rowEndColumnName,
+						partitioned,
+						currentPartitionName,
+						historyPartitionName
+				) ) );
+	}
+
+	private static void addAuxiliaryObjects(
+			Table table,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName,
+			MetadataBuildingContext context) {
+		final var database = context.getMetadataCollector().getDatabase();
+		database.getDialect().getTemporalTableSupport()
+				.addTemporalTableAuxiliaryObjects(
+						context.getTemporalTableStrategy(),
+						table, database,
+						partitioned,
+						currentPartitionName,
+						historyPartitionName
+				);
+	}
+
+	private static Column createTemporalColumn(
+			String columnName,
+			Table table,
+			boolean nullable,
+			Integer temporalPrecision,
+			Class<?> transactionIdJavaType,
+			MetadataBuildingContext context) {
+		final var database = context.getMetadataCollector().getDatabase();
+		final var basicValue = new BasicValue( context, table );
+		basicValue.setImplicitJavaTypeAccess( typeConfiguration -> transactionIdJavaType );
+		if ( Instant.class.equals( transactionIdJavaType ) ) {
+			final var temporalColumnType = database.getDialect().getTemporalTableSupport().getTemporalColumnType();
+			basicValue.setExplicitJdbcTypeAccess( typeConfiguration ->
+					typeConfiguration.getJdbcTypeRegistry().findDescriptor( temporalColumnType ) );
+		}
+		final var column = new Column();
+		column.setNullable( nullable );
+		column.setValue( basicValue );
+		basicValue.addColumn( column );
+		setTemporalColumnName( columnName, column, database,
+				context.getBuildingOptions().getPhysicalNamingStrategy() );
+		setTemporalColumnType( temporalPrecision, column, database, transactionIdJavaType );
+		return column;
+	}
+
+	private static void setTemporalColumnType(
+			Integer temporalPrecision,
+			Column column,
+			Database database,
+			Class<?> transactionIdJavaType) {
+		if ( temporalPrecision != null ) {
+			column.setTemporalPrecision( temporalPrecision );
+		}
+		else if ( Instant.class.equals( transactionIdJavaType ) ) {
+			final var temporalTableSupport = database.getDialect().getTemporalTableSupport();
+			column.setTemporalPrecision( temporalTableSupport.getTemporalColumnPrecision() );
+			column.setSqlTypeCode( temporalTableSupport.getTemporalColumnType() );
+		}
+	}
+
+	private static void setTemporalColumnName(
+			String name,
+			Column column,
+			Database database,
+			PhysicalNamingStrategy physicalNamingStrategy) {
+		final Identifier physicalColumnName =
+				physicalNamingStrategy.toPhysicalColumnName(
+						database.toIdentifier( name ),
+						database.getJdbcEnvironment()
+				);
+		column.setName( physicalColumnName.render( database.getDialect() ) );
+	}
+
+	private static void addTemporalCheckConstraint(
+			Table table,
+			Column rowStartColumn,
+			Column rowEndColumn,
+			MetadataBuildingContext context) {
+		final var dialect = context.getMetadataCollector().getDatabase().getDialect();
+		if ( dialect.getTemporalTableSupport()
+				.createTemporalTableCheckConstraint( context.getTemporalTableStrategy() ) ) {
+			final String rowStartName = rowStartColumn.getQuotedName( dialect );
+			final String rowEndName = rowEndColumn.getQuotedName( dialect );
+			table.addCheck( new CheckConstraint( rowEndName + " is null or " + rowEndName + " > " + rowStartName ) );
+		}
+	}
+
+	private static void handleTemporalColumnGeneration(
+			Column rowStartColumn, Column rowEndColumn,
+			MetadataBuildingContext context) {
+		if ( context.getTemporalTableStrategy() == NATIVE ) {
+			rowStartColumn.setGeneratedAs( "row start" );
+			rowEndColumn.setGeneratedAs( "row end" );
+		}
+	}
+
+	private static String appendOption(String existing, String option) {
+		if ( existing == null || existing.isBlank() ) {
+			return option;
+		}
+		if ( option == null || option.isBlank() ) {
+			return existing;
+		}
+		else {
+			return existing + " " + option;
+		}
+	}
+
+	public static TemporalTableStrategy determineTemporalTableStrategy(
+			Map<String, Object> configurationSettings) {
+		final Object setting = configurationSettings.get( TEMPORAL_TABLE_STRATEGY );
+		if ( setting instanceof TemporalTableStrategy temporalTableStrategy ) {
+			return temporalTableStrategy;
+		}
+		else if ( setting instanceof String string ) {
+			for ( var strategy : TemporalTableStrategy.values() ) {
+				if ( strategy.name().equalsIgnoreCase( string ) ) {
+					return strategy;
+				}
+			}
+			return AUTO;
+		}
+		else {
+			return AUTO;
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java
index 86352cdafc7b..d7bb2e73f71a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java
@@ -9,9 +9,7 @@
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.FetchMode;
-import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
-import org.hibernate.annotations.Columns;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchProfileOverride;
 import org.hibernate.annotations.LazyGroup;
@@ -21,16 +19,12 @@
 import org.hibernate.annotations.OnDeleteAction;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.PropertyData;
-import org.hibernate.mapping.Join;
-import org.hibernate.mapping.KeyValue;
-import org.hibernate.mapping.Property;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.MemberDetails;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ForeignKey;
 import jakarta.persistence.Id;
@@ -51,6 +45,7 @@
 import static org.hibernate.boot.model.internal.BinderHelper.isDefault;
 import static org.hibernate.boot.model.internal.BinderHelper.handleForeignKeyConstraint;
 import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
+import static org.hibernate.boot.model.internal.EntityBinder.isEntity;
 import static org.hibernate.internal.util.StringHelper.isBlank;
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
 import static org.hibernate.internal.util.StringHelper.qualify;
@@ -81,8 +76,7 @@ static void bindManyToOne(
 		final var manyToOne = memberDetails.getDirectAnnotationUsage( ManyToOne.class );
 
 		//check validity
-		if ( memberDetails.hasDirectAnnotationUsage( Column.class )
-				|| memberDetails.hasDirectAnnotationUsage( Columns.class ) ) {
+		if ( memberDetails.hasDirectAnnotationUsage( Column.class ) ) {
 			throw new AnnotationException(
 					"Property '" + getPath( propertyHolder, inferredData )
 							+ "' is a '@ManyToOne' association and may not use '@Column' to specify column mappings (use '@JoinColumn' instead)"
@@ -97,9 +91,8 @@ && isIdentifier( propertyHolder, propertyBinder, isIdentifierMapper ) ) {
 			);
 		}
 
-		final var hibernateCascade = memberDetails.getDirectAnnotationUsage( Cascade.class );
 		bindManyToOne(
-				aggregateCascadeTypes( manyToOne.cascade(), hibernateCascade, false, context ),
+				aggregateCascadeTypes( manyToOne.cascade(), memberDetails, false, context ),
 				joinColumns,
 				propertyHolder,
 				nullability,
@@ -175,19 +168,12 @@ private static void bindManyToOne(
 		manyToOne.setOnDeleteAction( onDeleteAction );
 		//value.setLazy( fetchMode != FetchMode.JOIN );
 		if ( !optional && nullability != Nullability.FORCED_NULL ) {
-			for ( AnnotatedJoinColumn column : joinColumns.getJoinColumns() ) {
+			for ( var column : joinColumns.getJoinColumns() ) {
 				column.setNullable( false );
 			}
 		}
 
-		if ( memberDetails.hasDirectAnnotationUsage( MapsId.class ) ) {
-			// read-only
-			for ( AnnotatedJoinColumn column : joinColumns.getJoinColumns() ) {
-				column.setInsertable( false );
-				column.setUpdatable( false );
-			}
-			joinColumns.setMapsId( memberDetails.getDirectAnnotationUsage( MapsId.class ).value() );
-		}
+		handleMapsId( joinColumns, memberDetails );
 
 		manyToOne.setTypeName( inferredData.getClassOrElementName() );
 		final String propertyName = inferredData.getPropertyName();
@@ -197,7 +183,7 @@ private static void bindManyToOne(
 
 		bindForeignKeyNameAndDefinition( manyToOne, memberDetails, propertyHolder.getOverriddenForeignKey( fullPath ), context );
 
-		final FkSecondPass secondPass = new ToOneFkSecondPass(
+		final var secondPass = new ToOneFkSecondPass(
 				manyToOne,
 				joinColumns,
 				unique,
@@ -226,6 +212,17 @@ private static void bindManyToOne(
 		);
 	}
 
+	private static void handleMapsId(AnnotatedJoinColumns joinColumns, MemberDetails memberDetails) {
+		if ( memberDetails.hasDirectAnnotationUsage( MapsId.class ) ) {
+			// read-only
+			for ( var column : joinColumns.getJoinColumns() ) {
+				column.setInsertable( false );
+				column.setUpdatable( false );
+			}
+			joinColumns.setMapsId( memberDetails.getDirectAnnotationUsage( MapsId.class ).value() );
+		}
+	}
+
 	private static OnDeleteAction onDeleteAction(MemberDetails property) {
 		final var onDelete = property.getDirectAnnotationUsage( OnDelete.class );
 		return onDelete == null ? null : onDelete.action();
@@ -233,7 +230,7 @@ private static OnDeleteAction onDeleteAction(MemberDetails property) {
 
 	private static NotFoundAction notFoundAction(PropertyHolder propertyHolder, MemberDetails property, FetchType fetchType) {
 		final var notFound = property.getDirectAnnotationUsage( NotFound.class );
-		final NotFoundAction notFoundAction = notFound == null ? null : notFound.action();
+		final var notFoundAction = notFound == null ? null : notFound.action();
 		if ( notFoundAction != null && fetchType == LAZY ) {
 			BOOT_LOGGER.ignoreNotFoundWithFetchTypeLazy( propertyHolder.getEntityName(), property.getName() );
 		}
@@ -264,7 +261,7 @@ private static org.hibernate.mapping.ManyToOne handleJoinTable(
 			return value;
 		}
 		else {
-			final Join join = propertyHolder.addJoin( joinTable, false );
+			final var join = propertyHolder.addJoin( joinTable, false );
 			for ( var joinColumn : joinColumns.getJoinColumns() ) {
 				joinColumn.setExplicitTableName( join.getTable().getName() );
 			}
@@ -277,8 +274,11 @@ private static org.hibernate.mapping.ManyToOne handleJoinTable(
 	}
 
 	static boolean isTargetAnnotatedEntity(ClassDetails targetEntity, MemberDetails property) {
-		final var target = isDefault( targetEntity ) ? property.getType().determineRawClass() : targetEntity;
-		return target.hasDirectAnnotationUsage( Entity.class );
+		final var target =
+				isDefault( targetEntity )
+						? property.getType().determineRawClass()
+						: targetEntity;
+		return isEntity( target );
 	}
 
 	private static void processManyToOneProperty(
@@ -363,11 +363,12 @@ private static void handleFetchProfileOverrides(
 		final var collector = context.getMetadataCollector();
 		final var modelsContext = context.getBootstrapContext().getModelsContext();
 		property.forEachAnnotationUsage( FetchProfileOverride.class, modelsContext,
-				usage -> collector.addSecondPass( new FetchSecondPass( usage, propertyHolder, inferredData.getPropertyName(), context ) ));
+				usage -> collector.addSecondPass( new FetchSecondPass( usage,
+						propertyHolder, inferredData.getPropertyName(), context ) ));
 	}
 
 	private static void handleFetch(ToOne toOne, MemberDetails property) {
-		final Fetch fetchAnnotationUsage = property.getDirectAnnotationUsage( Fetch.class );
+		final var fetchAnnotationUsage = property.getDirectAnnotationUsage( Fetch.class );
 		if ( fetchAnnotationUsage != null ) {
 			// Hibernate @Fetch annotation takes precedence
 			setHibernateFetchMode( toOne, property, fetchAnnotationUsage.value() );
@@ -426,8 +427,7 @@ static void bindOneToOne(
 		final var oneToOne = memberDetails.getDirectAnnotationUsage( OneToOne.class );
 
 		//check validity
-		if ( memberDetails.hasDirectAnnotationUsage( Column.class )
-				|| memberDetails.hasDirectAnnotationUsage( Columns.class ) ) {
+		if ( memberDetails.hasDirectAnnotationUsage( Column.class ) ) {
 			throw new AnnotationException(
 					"Property '" + getPath( propertyHolder, inferredData )
 							+ "' is a '@OneToOne' association and may not use '@Column' to specify column mappings"
@@ -445,9 +445,8 @@ static void bindOneToOne(
 		//FIXME support a proper PKJCs
 		final boolean trueOneToOne = memberDetails.hasDirectAnnotationUsage( PrimaryKeyJoinColumn.class )
 				|| memberDetails.hasDirectAnnotationUsage( PrimaryKeyJoinColumns.class );
-		final var hibernateCascade = memberDetails.getDirectAnnotationUsage( Cascade.class );
 		bindOneToOne(
-				aggregateCascadeTypes( oneToOne.cascade(), hibernateCascade, oneToOne.orphanRemoval(), context ),
+				aggregateCascadeTypes( oneToOne.cascade(), memberDetails, oneToOne.orphanRemoval(), context ),
 				joinColumns,
 				oneToOne.optional(),
 				oneToOne.fetch(),
@@ -558,7 +557,7 @@ private static void bindTrueOneToOne(
 			binder.setLazyGroup( lazyGroupAnnotation.value() );
 		}
 
-		final Property property = binder.makeProperty();
+		final var property = binder.makeProperty();
 		property.setOptional( optional );
 		propertyHolder.addProperty( property, inferredData.getAttributeMember(), inferredData.getDeclaringClass() );
 
@@ -592,7 +591,7 @@ private static boolean isMappedToPrimaryKey(
 		}
 		else {
 			// Try to find a hidden true one-to-one (FK == PK columns)
-			final KeyValue identifier = propertyHolder.getIdentifier();
+			final var identifier = propertyHolder.getIdentifier();
 			if ( identifier == null ) {
 				// This is a @OneToOne in an @EmbeddedId
 				// (the persistentClass.identifier is not yet set, it's being built)
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java
index c4d105c34f5f..4c753d9ce1b1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java
@@ -23,6 +23,7 @@
 public class Identifier implements Comparable<Identifier> {
 	private final String text;
 	private final boolean isQuoted;
+	private final boolean isExplicit;
 
 	/**
 	 * Means to generate an {@link Identifier} instance from its simple text form.
@@ -62,7 +63,7 @@ public static Identifier toIdentifier(String text) {
 	 * @return The identifier form, or {@code null} if text was {@code null}
 	 */
 	public static Identifier toIdentifier(String text, boolean quote) {
-		return toIdentifier( text, quote, true );
+		return toIdentifier( text, quote, true, false );
 	}
 
 	/**
@@ -81,6 +82,25 @@ public static Identifier toIdentifier(String text, boolean quote) {
 	 * @return The identifier form, or {@code null} if text was {@code null}
 	 */
 	public static Identifier toIdentifier(String text, boolean quote, boolean autoquote) {
+		return toIdentifier( text, quote, autoquote, false );
+	}
+
+	/**
+	 * Means to generate an {@link Identifier} instance from its simple text form.
+	 * <p>
+	 * If passed {@code text} is {@code null}, {@code null} is returned.
+	 * <p>
+	 * If passed {@code text} is surrounded in quote markers, the returned Identifier
+	 * is considered quoted. Quote markers include back-ticks (`), double-quotes ("),
+	 * and brackets ([ and ]).
+	 *
+	 * @param text The text form
+	 * @param quote Whether to quote unquoted text forms
+	 * @param autoquote Whether to quote the result if it contains special characters
+	 * @param isExplicit Whether the name is explicitly set
+	 * @return The identifier form, or {@code null} if text was {@code null}
+	 */
+	public static Identifier toIdentifier(String text, boolean quote, boolean autoquote, boolean isExplicit) {
 		if ( isBlank( text ) ) {
 			return null;
 		}
@@ -106,7 +126,7 @@ public static Identifier toIdentifier(String text, boolean quote, boolean autoqu
 		else if ( autoquote && !quote ) {
 			quote = autoquote( text, start, end );
 		}
-		return new Identifier( text.substring( start, end ), quote );
+		return new Identifier( text.substring( start, end ), quote, isExplicit );
 	}
 
 	private static boolean autoquote(String text, int start, int end) {
@@ -184,6 +204,17 @@ public static String unQuote(String name) {
 	 * @param quoted Is this a quoted identifier?
 	 */
 	public Identifier(String text, boolean quoted) {
+		this( text, quoted, false );
+	}
+
+	/**
+	 * Constructs an identifier instance.
+	 *
+	 * @param text The identifier text.
+	 * @param quoted Is this a quoted identifier?
+	 * @param isExplicit Whether the name is explicitly set
+	 */
+	public Identifier(String text, boolean quoted, boolean isExplicit) {
 		if ( isEmpty( text ) ) {
 			throw new IllegalIdentifierException( "Identifier text cannot be null" );
 		}
@@ -192,6 +223,7 @@ public Identifier(String text, boolean quoted) {
 		}
 		this.text = text;
 		this.isQuoted = quoted;
+		this.isExplicit = isExplicit;
 	}
 
 	/**
@@ -202,6 +234,7 @@ public Identifier(String text, boolean quoted) {
 	protected Identifier(String text) {
 		this.text = text;
 		this.isQuoted = false;
+		this.isExplicit = false;
 	}
 
 	/**
@@ -295,4 +328,8 @@ public static boolean areEqual(Identifier id1, Identifier id2) {
 	public static Identifier quote(Identifier identifier) {
 		return identifier.quoted();
 	}
+
+	public boolean isExplicit() {
+		return isExplicit;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java
index 888fc2257d02..301f1380bd1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java
@@ -16,7 +16,7 @@
  * has no {@link jakarta.persistence.Table @Table} annotation, then
  * {@link #determinePrimaryTableName(ImplicitEntityNameSource) determinePrimaryTableName}
  * is called with an {@link ImplicitEntityNameSource} providing access to information
- * about the Java class and its {@link jakarta.persistence.Entity#name() entity name}.
+ * about the Java class and its {@linkplain jakarta.persistence.Entity#name entity name}.
  * <p>
  * On the other hand, when a logical name <em>is</em> explicitly specified, for example,
  * using {@link jakarta.persistence.Table#name() @Table} to specify the table name,
@@ -34,7 +34,7 @@
  * implementation of {@code ImplicitNamingStrategy}.
  * <p>
  * An {@code ImplicitNamingStrategy} may be selected using the configuration property
- * {@value org.hibernate.cfg.AvailableSettings#IMPLICIT_NAMING_STRATEGY}.
+ * {@value org.hibernate.cfg.MappingSettings#IMPLICIT_NAMING_STRATEGY}.
  *
  * @apiNote The method names here mostly favor the JPA terminology,
  *          for example, "secondary table" rather than "join".
@@ -42,7 +42,7 @@
  * @see PhysicalNamingStrategy
  * @see org.hibernate.cfg.Configuration#setImplicitNamingStrategy(ImplicitNamingStrategy)
  * @see org.hibernate.boot.MetadataBuilder#applyImplicitNamingStrategy(ImplicitNamingStrategy)
- * @see org.hibernate.cfg.AvailableSettings#IMPLICIT_NAMING_STRATEGY
+ * @see org.hibernate.cfg.MappingSettings#IMPLICIT_NAMING_STRATEGY
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java
index 14953031b616..f4c8273bce83 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java
@@ -93,7 +93,7 @@ public Identifier determineIdentifierColumnName(ImplicitIdentifierColumnNameSour
 
 	@Override
 	public Identifier determineDiscriminatorColumnName(ImplicitDiscriminatorColumnNameSource source) {
-		final MetadataBuildingContext context = source.getBuildingContext();
+		final var context = source.getBuildingContext();
 		return toIdentifier(
 				context.getEffectiveDefaults().getDefaultDiscriminatorColumnName(),
 				context
@@ -102,7 +102,7 @@ public Identifier determineDiscriminatorColumnName(ImplicitDiscriminatorColumnNa
 
 	@Override
 	public Identifier determineTenantIdColumnName(ImplicitTenantIdColumnNameSource source) {
-		final MetadataBuildingContext context = source.getBuildingContext();
+		final var context = source.getBuildingContext();
 		return toIdentifier(
 				context.getEffectiveDefaults().getDefaultTenantIdColumnName(),
 				context
@@ -274,7 +274,7 @@ protected Identifier generateConstraintName(ImplicitConstraintNameSource source)
 	 * @return The name as a string
 	 */
 	protected String generateConstraintNameString(ImplicitConstraintNameSource source) {
-		final NamingHelper namingHelper = namingHelper( source.getBuildingContext() );
+		final var namingHelper = namingHelper( source.getBuildingContext() );
 		final String prefix = constraintNamePrefix( source.kind() );
 		return source instanceof ImplicitForeignKeyNameSource foreignKeySource
 				? namingHelper.generateHashedFkName(
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyHbmImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyHbmImpl.java
index 70f190be3866..01eb2c6fd761 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyHbmImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyHbmImpl.java
@@ -31,23 +31,19 @@ public Identifier determineBasicColumnName(ImplicitBasicColumnNameSource source)
 
 	@Override
 	public Identifier determineJoinColumnName(ImplicitJoinColumnNameSource source) {
-		if ( source.getAttributePath() != null ) {
-			return toIdentifier(
-					transformAttributePath( source.getAttributePath() ),
-					source.getBuildingContext()
-			);
-		}
-		else {
-			return super.determineJoinColumnName( source );
-		}
+		final var attributePath = source.getAttributePath();
+		return attributePath != null
+				? toIdentifier( transformAttributePath( attributePath ), source.getBuildingContext() )
+				: super.determineJoinColumnName( source );
 	}
 
 	@Override
 	public Identifier determineJoinTableName(ImplicitJoinTableNameSource source) {
-		if ( source.getAssociationOwningAttributePath() != null ) {
+		final var associationOwningAttributePath = source.getAssociationOwningAttributePath();
+		if ( associationOwningAttributePath != null ) {
 			final String name = source.getOwningPhysicalTableName()
 					+ '_'
-					+ transformAttributePath( source.getAssociationOwningAttributePath() );
+					+ transformAttributePath( associationOwningAttributePath );
 			return toIdentifier( name, source.getBuildingContext() );
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java
index 052711ac7bb1..e5d60e3b94fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java
@@ -50,14 +50,14 @@ public Identifier determineJoinColumnName(ImplicitJoinColumnNameSource source) {
 		// where JPA was later clarified to prefer {EntityName}_{ReferencedColumnName}.
 		//
 		// The spec-compliant one implements the clarified {EntityName}_{ReferencedColumnName}
-		// naming.  Here we implement the older {TableName}_{ReferencedColumnName} naming
+		// naming. Here we implement the older {TableName}_{ReferencedColumnName} naming
 //		final String name;
 //		if ( source.getNature() == Nature.ENTITY && source.getAttributePath() != null ) {
-//			// many-to-one /  one-to-one
+//			// many-to-one / one-to-one
 //			//
 //			// legacy naming used the attribute name here, following suit with legacy hbm naming
 //			//
-//			// NOTE : attribute path being null here would be an error, so for now don't bother checking
+//			// NOTE: attribute path being null here would be an error, so for now don't bother checking
 //			name = transformAttributePath( source.getAttributePath() );
 //		}
 //		else if ( source.getNature() == Nature.ELEMENT_COLLECTION
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategy.java
index 1f9073f5ccb1..f9a9bdfd3b88 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategy.java
@@ -29,12 +29,12 @@
  * names, so the abstraction here is in some sense "incomplete".
  * <p>
  * A {@code PhysicalNamingStrategy} may be selected using the configuration property
- * {@value org.hibernate.cfg.AvailableSettings#PHYSICAL_NAMING_STRATEGY}.
+ * {@value org.hibernate.cfg.MappingSettings#PHYSICAL_NAMING_STRATEGY}.
  *
  * @see ImplicitNamingStrategy
  * @see org.hibernate.cfg.Configuration#setPhysicalNamingStrategy(PhysicalNamingStrategy)
  * @see org.hibernate.boot.MetadataBuilder#applyPhysicalNamingStrategy(PhysicalNamingStrategy)
- * @see org.hibernate.cfg.AvailableSettings#PHYSICAL_NAMING_STRATEGY
+ * @see org.hibernate.cfg.MappingSettings#PHYSICAL_NAMING_STRATEGY
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategySnakeCaseImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategySnakeCaseImpl.java
index e6904a72726b..6b1ea9d4a534 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategySnakeCaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/PhysicalNamingStrategySnakeCaseImpl.java
@@ -14,9 +14,23 @@
 
 /**
  * Converts {@code camelCase} or {@code MixedCase} logical names to {@code snake_case}.
+ * <p>
+ * This strategy leaves quoted identifiers alone. If quoted identifiers should also be
+ * processed, then this class may be extended the implement the required behavior. For
+ * example:
+ * <pre>
+ * public class AlwaysSnakeEverythingStrategy extends PhysicalNamingStrategySnakeCaseImpl {
+ *     &#64;Override
+ *     protected Identifier quotedIdentifier(Identifier quotedName) {
+ *         return super.unquotedIdentifier( quotedName ).quoted();
+ *     }
+ * }
+ * </pre>
  *
  * @author Phillip Webb
  * @author Madhura Bhave
+ *
+ * @since 7.0
  */
 // Originally copied from Spring's SpringPhysicalNamingStrategy as this strategy is popular there.
 public class PhysicalNamingStrategySnakeCaseImpl implements PhysicalNamingStrategy {
@@ -59,7 +73,7 @@ else if ( name.isQuoted() ) {
 	}
 
 	private String camelCaseToSnakeCase(String name) {
-		final StringBuilder builder = new StringBuilder( name.replace( '.', '_' ) );
+		final var builder = new StringBuilder( name.replace( '.', '_' ) );
 		for ( int i = 1; i < builder.length() - 1; i++ ) {
 			if ( isUnderscoreRequired( builder.charAt( i - 1 ), builder.charAt( i ), builder.charAt( i + 1 ) ) ) {
 				builder.insert( i++, '_' );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java
index 11bc77e5d211..4eb081da0e0b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java
@@ -11,6 +11,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.MappingException;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.MetadataBuildingContext;
@@ -45,6 +46,7 @@
 
 import static org.hibernate.type.SqlTypes.SMALLINT;
 import static org.hibernate.type.descriptor.java.JavaTypeHelper.isTemporal;
+import static org.hibernate.type.descriptor.java.TemporalJavaType.resolveJdbcTypeCode;
 
 /**
  * BasicValue.Resolution resolver for cases where no explicit
@@ -68,7 +70,7 @@ public static <T> BasicValue.Resolution<T> from(
 		final var typeConfiguration = bootstrapContext.getTypeConfiguration();
 		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
 
-		final var reflectedJtd = reflectedJtdResolver.get();
+		final JavaType<T> reflectedJtd;
 
 		// NOTE: the distinction that is made below wrt `explicitJavaType` and `reflectedJtd`
 		//       is needed temporarily to trigger "legacy resolution" versus "ORM6 resolution.
@@ -110,7 +112,7 @@ else if ( explicitJdbcType != null ) {
 				}
 			}
 		}
-		else if ( reflectedJtd != null ) {
+		else if ( ( reflectedJtd = reflectedJtdResolver.get() ) != null ) {
 			// we were able to determine the "reflected java-type"
 			// Use JTD if we know it to apply any specialized resolutions
 			if ( reflectedJtd instanceof EnumJavaType enumJavaType ) {
@@ -150,29 +152,14 @@ else if ( explicitJdbcType != null ) {
 
 				if ( registeredType != null ) {
 					// so here is the legacy resolution
-					jdbcMapping = resolveSqlTypeIndicators( stdIndicators, registeredType, reflectedJtd );
+					jdbcMapping = resolveSqlTypeIndicators( stdIndicators, registeredType, registeredType.getJavaTypeDescriptor() );
 				}
 				else {
 					// there was not a "legacy" BasicType registration,
 					// so use `JavaType#getRecommendedJdbcType`, if one,
 					// to create a mapping
-					final JdbcType recommendedJdbcType;
-					try {
-						recommendedJdbcType = reflectedJtd.getRecommendedJdbcType( stdIndicators );
-					}
-					catch (JdbcTypeRecommendationException jtre) {
-						if ( buildingContext.getMetadataCollector()
-								.getEntityBindingMap().values().stream()
-								.anyMatch( pc -> pc.getMappedClass().equals(resolvedJavaType) ) ) {
-							throw new MappingException( "Incorrect use of entity type '"
-									+ resolvedJavaType.getTypeName()
-									+  "' (possibly due to missing association mapping annotation)",
-									jtre );
-						}
-						else {
-							throw jtre;
-						}
-					}
+					final JdbcType recommendedJdbcType =
+							recommendedJdbcType( resolvedJavaType, stdIndicators, buildingContext, reflectedJtd );
 					if ( recommendedJdbcType != null ) {
 						jdbcMapping = resolveSqlTypeIndicators(
 								stdIndicators,
@@ -194,7 +181,7 @@ else if ( reflectedJtd instanceof SerializableJavaType
 		else {
 			if ( explicitJdbcType != null ) {
 				// we have an explicit STD, but no JTD - infer JTD
-				// NOTE : yes it's an odd case, but easy to implement here, so...
+				// NOTE: yes it's an odd case, but easy to implement here, so...
 				Integer length = null;
 				Integer scale = null;
 				if ( selectable instanceof Column column ) {
@@ -212,8 +199,10 @@ else if ( column.getLength() != null ) {
 					}
 				}
 
-				final JavaType<T> recommendedJtd =
-						explicitJdbcType.getJdbcRecommendedJavaTypeMapping( length, scale, typeConfiguration );
+				final var recommendedJavaType =
+						explicitJdbcType.getRecommendedJavaType( length, scale, typeConfiguration );
+				// TODO: check this type cast
+				final var recommendedJtd = (JavaType<T>) recommendedJavaType;
 				jdbcMapping = resolveSqlTypeIndicators(
 						stdIndicators,
 						basicTypeRegistry.resolve( recommendedJtd, explicitJdbcType ),
@@ -252,6 +241,27 @@ else if ( column.getLength() != null ) {
 		);
 	}
 
+	private static <T> JdbcType recommendedJdbcType(
+			Type resolvedJavaType,
+			JdbcTypeIndicators stdIndicators,
+			MetadataBuildingContext buildingContext,
+			JavaType<T> reflectedJtd) {
+		try {
+			return reflectedJtd.getRecommendedJdbcType( stdIndicators );
+		}
+		catch (JdbcTypeRecommendationException jtre) {
+			if ( buildingContext.getMetadataCollector()
+					.getEntityBindingMap().values().stream()
+					.anyMatch( pc -> pc.getMappedClass().equals( resolvedJavaType ) ) ) {
+				throw new MappingException( "Incorrect use of entity type '" + resolvedJavaType.getTypeName()
+							+ "' (possibly due to missing association mapping annotation)", jtre );
+			}
+			else {
+				throw jtre;
+			}
+		}
+	}
+
 	private static <T> BasicType<T> registeredType(
 			JdbcType explicitJdbcType,
 			Function<TypeConfiguration, MutabilityPlan<?>> explicitMutabilityPlanAccess,
@@ -309,7 +319,11 @@ private static <T,E> BasicType<T> pluralBasicType(
 					pluralJavaType.resolveType(
 							bootstrapContext.getTypeConfiguration(),
 							dialect,
-							resolveSqlTypeIndicators( stdIndicators, registeredElementType, elementJavaType ),
+							resolveSqlTypeIndicators(
+									stdIndicators,
+									registeredElementType,
+									registeredElementType.getJavaTypeDescriptor()
+							),
 							selectable instanceof ColumnTypeInformation information ? information : null,
 							stdIndicators
 					);
@@ -483,43 +497,16 @@ public static <T> BasicValue.Resolution<T> fromTemporal(
 			JdbcType explicitJdbcType,
 			Function<TypeConfiguration, MutabilityPlan<?>> explicitMutabilityPlanAccess,
 			JdbcTypeIndicators stdIndicators) {
-		final var typeConfiguration = stdIndicators.getTypeConfiguration();
-		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
-		final var requestedTemporalPrecision = stdIndicators.getTemporalPrecision();
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// Case #1 - explicit JavaType
 
 		if ( explicitJavaType != null ) {
-			if ( !isTemporal( explicitJavaType ) ) {
-				throw new MappingException(
-						"Explicit JavaType [" + explicitJavaType +
-								"] defined for temporal value must implement TemporalJavaType"
-				);
-			}
-
-			@SuppressWarnings("unchecked")
-			final var explicitTemporalJtd = (TemporalJavaType<T>) explicitJavaType;
-			if ( requestedTemporalPrecision != null && explicitTemporalJtd.getPrecision() != requestedTemporalPrecision ) {
-				throw new MappingException(
-						"Temporal precision (`jakarta.persistence.TemporalType`) mismatch... requested precision = " + requestedTemporalPrecision +
-								"; explicit JavaType (`" + explicitTemporalJtd + "`) precision = " + explicitTemporalJtd.getPrecision()
-
-				);
-			}
-
-			final var jdbcType =
-					explicitJdbcType != null
-							? explicitJdbcType
-							: explicitTemporalJtd.getRecommendedJdbcType( stdIndicators );
-			final var jdbcMapping = basicTypeRegistry.resolve( explicitTemporalJtd, jdbcType );
-			return new InferredBasicValueResolution<>(
-					jdbcMapping,
-					explicitTemporalJtd,
-					explicitTemporalJtd,
-					jdbcType,
-					jdbcMapping,
-					determineMutabilityPlan( explicitMutabilityPlanAccess, explicitTemporalJtd, typeConfiguration )
+			return fromTemporalExplicitJavaType(
+					explicitJavaType,
+					explicitJdbcType,
+					explicitMutabilityPlanAccess,
+					stdIndicators
 			);
 		}
 
@@ -530,19 +517,10 @@ public static <T> BasicValue.Resolution<T> fromTemporal(
 		// 		due to the new annotations being used
 
 		if ( explicitJdbcType != null ) {
-			final TemporalJavaType<T> temporalJavaType =
-					requestedTemporalPrecision != null
-							? reflectedJtd.resolveTypeForPrecision( requestedTemporalPrecision, typeConfiguration )
-							// Avoid using the DateJavaType and prefer the JdbcTimestampJavaType
-							: reflectedJtd.resolveTypeForPrecision( reflectedJtd.getPrecision(), typeConfiguration );
-			final BasicType<T> jdbcMapping = basicTypeRegistry.resolve( temporalJavaType, explicitJdbcType );
-			return new InferredBasicValueResolution<>(
-					jdbcMapping,
-					temporalJavaType,
-					temporalJavaType,
+			return fromTemporalExplicitJdbcType(
+					reflectedJtd,
 					explicitJdbcType,
-					jdbcMapping,
-					temporalJavaType.getMutabilityPlan()
+					stdIndicators
 			);
 		}
 
@@ -552,17 +530,31 @@ public static <T> BasicValue.Resolution<T> fromTemporal(
 		// 		- for the moment continue to use the legacy resolution to registered
 		// 		BasicType
 
+		return fromTemporalImplicit(
+				reflectedJtd,
+				explicitMutabilityPlanAccess,
+				stdIndicators
+		);
+	}
+
+	private static <T> @NonNull InferredBasicValueResolution<T, T> fromTemporalImplicit(
+			TemporalJavaType<T> reflectedJtd,
+			Function<TypeConfiguration, MutabilityPlan<?>> explicitMutabilityPlanAccess,
+			JdbcTypeIndicators stdIndicators) {
+		final var typeConfiguration = stdIndicators.getTypeConfiguration();
+		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
+		final var requestedTemporalPrecision = stdIndicators.getTemporalPrecision();
+
 		final BasicType<T> basicType;
 		if ( requestedTemporalPrecision != null
 				&& requestedTemporalPrecision != reflectedJtd.getPrecision() ) {
 			basicType = basicTypeRegistry.resolve(
 					reflectedJtd.resolveTypeForPrecision( requestedTemporalPrecision, typeConfiguration ),
-					TemporalJavaType.resolveJdbcTypeCode( requestedTemporalPrecision )
+					resolveJdbcTypeCode( requestedTemporalPrecision )
 			);
 		}
 		else {
 			basicType = basicTypeRegistry.resolve(
-					// Avoid using the DateJavaType and prefer the JdbcTimestampJavaType
 					reflectedJtd.resolveTypeForPrecision( reflectedJtd.getPrecision(), typeConfiguration ),
 					reflectedJtd.getRecommendedJdbcType( stdIndicators )
 			);
@@ -578,6 +570,69 @@ public static <T> BasicValue.Resolution<T> fromTemporal(
 		);
 	}
 
+	private static <T> @NonNull InferredBasicValueResolution<T, T> fromTemporalExplicitJdbcType(
+			TemporalJavaType<T> reflectedJtd,
+			JdbcType explicitJdbcType,
+			JdbcTypeIndicators stdIndicators) {
+		final var typeConfiguration = stdIndicators.getTypeConfiguration();
+		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
+		final var requestedTemporalPrecision = stdIndicators.getTemporalPrecision();
+
+		final var temporalJavaType =
+				requestedTemporalPrecision != null
+						? reflectedJtd.resolveTypeForPrecision( requestedTemporalPrecision, typeConfiguration )
+						: reflectedJtd.resolveTypeForPrecision( reflectedJtd.getPrecision(), typeConfiguration );
+		final var jdbcMapping = basicTypeRegistry.resolve( temporalJavaType, explicitJdbcType );
+		return new InferredBasicValueResolution<>(
+				jdbcMapping,
+				temporalJavaType,
+				temporalJavaType,
+				explicitJdbcType,
+				jdbcMapping,
+				temporalJavaType.getMutabilityPlan()
+		);
+	}
+
+	private static <T> @NonNull InferredBasicValueResolution<T, T> fromTemporalExplicitJavaType(
+			BasicJavaType<?> explicitJavaType,
+			JdbcType explicitJdbcType,
+			Function<TypeConfiguration, MutabilityPlan<?>> explicitMutabilityPlanAccess,
+			JdbcTypeIndicators stdIndicators) {
+		final var typeConfiguration = stdIndicators.getTypeConfiguration();
+		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
+		final var requestedTemporalPrecision = stdIndicators.getTemporalPrecision();
+
+		if ( !isTemporal( explicitJavaType ) ) {
+			throw new MappingException( "Explicit JavaType [" + explicitJavaType +
+					"] defined for temporal value must implement TemporalJavaType" );
+		}
+
+		@SuppressWarnings("unchecked")
+		final var explicitTemporalJtd = (TemporalJavaType<T>) explicitJavaType;
+		if ( requestedTemporalPrecision != null
+				&& explicitTemporalJtd.getPrecision() != requestedTemporalPrecision ) {
+			throw new MappingException(
+					"Temporal precision (TemporalType) mismatch; requested precision = %s; explicit JavaType (%s) precision = %s"
+							.formatted( requestedTemporalPrecision, explicitTemporalJtd, explicitTemporalJtd.getPrecision() )
+
+			);
+		}
+
+		final var jdbcType =
+				explicitJdbcType != null
+						? explicitJdbcType
+						: explicitTemporalJtd.getRecommendedJdbcType( stdIndicators );
+		final var jdbcMapping = basicTypeRegistry.resolve( explicitTemporalJtd, jdbcType );
+		return new InferredBasicValueResolution<>(
+				jdbcMapping,
+				explicitTemporalJtd,
+				explicitTemporalJtd,
+				jdbcType,
+				jdbcMapping,
+				determineMutabilityPlan( explicitMutabilityPlanAccess, explicitTemporalJtd, typeConfiguration )
+		);
+	}
+
 	private static <T> MutabilityPlan<T> determineMutabilityPlan(
 			Function<TypeConfiguration, MutabilityPlan<?>> explicitMutabilityPlanAccess,
 			JavaType<T> javaType,
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java
index 26c66cb294c7..e3ca8e8acb93 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java
@@ -124,7 +124,7 @@ public void addAnnotatedPackageName(String annotatedPackageName) {
 	}
 
 	@Internal
-	public void addXmlBinding(Binding<JaxbBindableMappingDescriptor> binding) {
+	public void addXmlBinding(Binding<? extends JaxbBindableMappingDescriptor> binding) {
 		mappingFileBindings.add( binding );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java
index 9884e6441f40..b48be9cb9bf2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java
@@ -66,13 +66,10 @@ public static <T> NamedConverterResolution<T> from(
 			MetadataBuildingContext context) {
 		assert name.startsWith( ConverterDescriptor.TYPE_NAME_PREFIX );
 		final String converterClassName = name.substring( ConverterDescriptor.TYPE_NAME_PREFIX.length() );
-
 		final var bootstrapContext = context.getBootstrapContext();
 		final Class<? extends AttributeConverter<T, ?>> converterClass =
 				bootstrapContext.getClassLoaderService().classForName( converterClassName );
-		final ConverterDescriptor<T,?> converterDescriptor =
-				ConverterDescriptors.of( converterClass, bootstrapContext.getClassmateContext() );
-
+		final var converterDescriptor = ConverterDescriptors.of( converterClass );
 		return fromInternal(
 				explicitJtdAccess,
 				explicitStdAccess,
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java
index a6bc6eae4043..f3b0e9a52a7d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java
@@ -10,9 +10,6 @@
 import org.hibernate.boot.archive.scan.internal.DisabledScanner;
 import org.hibernate.boot.archive.scan.internal.StandardScanParameters;
 import org.hibernate.boot.archive.scan.spi.ClassDescriptor;
-import org.hibernate.boot.archive.scan.spi.MappingFileDescriptor;
-import org.hibernate.boot.archive.scan.spi.PackageDescriptor;
-import org.hibernate.boot.archive.scan.spi.ScanEnvironment;
 import org.hibernate.boot.archive.scan.spi.ScanResult;
 import org.hibernate.boot.archive.scan.spi.Scanner;
 import org.hibernate.boot.archive.scan.spi.ScannerFactory;
@@ -21,15 +18,12 @@
 import org.hibernate.boot.jaxb.Origin;
 import org.hibernate.boot.jaxb.SourceType;
 import org.hibernate.boot.jaxb.internal.InputStreamAccessXmlSource;
-import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.model.convert.internal.ConverterDescriptors;
-import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.ClassLoaderAccess;
 import org.hibernate.boot.spi.XmlMappingBinderAccess;
 
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -57,23 +51,26 @@ public void coordinateScan(
 			ManagedResourcesImpl managedResources,
 			BootstrapContext bootstrapContext,
 			XmlMappingBinderAccess xmlMappingBinderAccess) {
-		if ( bootstrapContext.getScanEnvironment() != null ) {
-			// NOTE: the idea with JandexInitializer/JandexInitManager was to allow adding classes
-			// to the index as we discovered them via scanning and .  Currently
-			final Scanner scanner = buildScanner( bootstrapContext );
-			final ScanResult scanResult = scanner.scan(
-					bootstrapContext.getScanEnvironment(),
-					bootstrapContext.getScanOptions(),
-					StandardScanParameters.INSTANCE
+		final var scanEnvironment = bootstrapContext.getScanEnvironment();
+		if ( scanEnvironment != null ) {
+			// NOTE: the idea with JandexInitializer/JandexInitManager was to allow
+			//       adding classes to the index as we discovered them via scanning
+			applyScanResultsToManagedResources(
+					managedResources,
+					buildScanner( bootstrapContext ).scan(
+							scanEnvironment,
+							bootstrapContext.getScanOptions(),
+							StandardScanParameters.INSTANCE
+					),
+					bootstrapContext,
+					xmlMappingBinderAccess
 			);
-
-			applyScanResultsToManagedResources( managedResources, scanResult, bootstrapContext, xmlMappingBinderAccess );
 		}
 	}
 
 	private static Scanner buildScanner(BootstrapContext bootstrapContext) {
 		final Object scannerSetting = bootstrapContext.getScanner();
-		final ArchiveDescriptorFactory archiveDescriptorFactory = bootstrapContext.getArchiveDescriptorFactory();
+		final var archiveDescriptorFactory = bootstrapContext.getArchiveDescriptorFactory();
 		if ( scannerSetting == null ) {
 			return getStandardScanner( bootstrapContext, archiveDescriptorFactory );
 		}
@@ -82,10 +79,10 @@ private static Scanner buildScanner(BootstrapContext bootstrapContext) {
 				if ( archiveDescriptorFactory != null ) {
 					throw new IllegalStateException(
 							"A Scanner instance and an ArchiveDescriptorFactory were both specified; please " +
-									"specify one or the other, or if you need to supply both, Scanner class to use " +
-									"(assuming it has a constructor accepting a ArchiveDescriptorFactory).  " +
-									"Alternatively, just pass the ArchiveDescriptorFactory during your own " +
-									"Scanner constructor assuming it is statically known."
+							"specify one or the other, or if you need to supply both, Scanner class to use " +
+							"(assuming it has a constructor accepting a ArchiveDescriptorFactory).  " +
+							"Alternatively, just pass the ArchiveDescriptorFactory during your own " +
+							"Scanner constructor assuming it is statically known."
 					);
 				}
 				return scanner;
@@ -103,17 +100,18 @@ private static Class<? extends Scanner> scannerClass(
 			if ( !Scanner.class.isAssignableFrom( scannerSettingClass ) ) {
 				throw new IllegalArgumentException(
 						"Configuration provided a custom scanner class '" +
-								scannerSettingClass.getName() +
-								"' which does not implement 'Scanner'"
+						scannerSettingClass.getName() +
+						"' which does not implement 'Scanner'"
 				);
 			}
 			return scannerSettingClass.asSubclass( Scanner.class );
 		}
 		else {
-			final ClassLoaderAccess classLoaderAccess = new ClassLoaderAccessImpl(
-					bootstrapContext.getJpaTempClassLoader(),
-					bootstrapContext.getClassLoaderService()
-			);
+			final ClassLoaderAccess classLoaderAccess =
+					new ClassLoaderAccessImpl(
+							bootstrapContext.getJpaTempClassLoader(),
+							bootstrapContext.getClassLoaderService()
+					);
 			return classLoaderAccess.classForName( scannerSetting.toString() );
 		}
 	}
@@ -122,7 +120,7 @@ private static Scanner createScanner(
 			ArchiveDescriptorFactory archiveDescriptorFactory,
 			Class<? extends Scanner> scannerImplClass) {
 
-		final var SINGLE_ARG = new Class[] { ArchiveDescriptorFactory.class };
+		final var SINGLE_ARG = new Class[] {ArchiveDescriptorFactory.class};
 
 		if ( archiveDescriptorFactory != null ) {
 			// find the single-arg constructor - it's an error if none exists
@@ -142,7 +140,7 @@ private static Scanner createScanner(
 			catch (NoSuchMethodException e) {
 				throw new IllegalArgumentException(
 						"Configuration specified a custom scanner class and a custom ArchiveDescriptorFactory, but " +
-								"Scanner implementation does not have a constructor accepting ArchiveDescriptorFactory"
+						"Scanner implementation does not have a constructor accepting ArchiveDescriptorFactory"
 				);
 			}
 		}
@@ -192,10 +190,10 @@ private static Scanner getStandardScanner(
 		final var scannerFactories =
 				bootstrapContext.getClassLoaderService()
 						.loadJavaServices( ScannerFactory.class );
-		for ( ScannerFactory scannerFactory : scannerFactories ) {
-			final Scanner scanner = scannerFactory.getScanner( archiveDescriptorFactory );
+		for ( var scannerFactory : scannerFactories ) {
+			final var scanner = scannerFactory.getScanner( archiveDescriptorFactory );
 			if ( scannerFactories.size() > 1 ) {
-				SCANNER_LOGGER.multipleScannerFactoriesAvailable(scanner.getClass().getName());
+				SCANNER_LOGGER.multipleScannerFactoriesAvailable( scanner.getClass().getName() );
 			}
 			return scanner;
 		}
@@ -210,59 +208,58 @@ public void applyScanResultsToManagedResources(
 			BootstrapContext bootstrapContext,
 			XmlMappingBinderAccess xmlMappingBinderAccess) {
 
-		final ScanEnvironment scanEnvironment = bootstrapContext.getScanEnvironment();
-		final ClassLoaderService classLoaderService = bootstrapContext.getClassLoaderService();
-
+		final var scanEnvironment = bootstrapContext.getScanEnvironment();
+		final var classLoaderService = bootstrapContext.getClassLoaderService();
 
 		// mapping files ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 		final Set<String> nonLocatedMappingFileNames = new HashSet<>();
-		final List<String> explicitMappingFileNames = scanEnvironment.getExplicitlyListedMappingFiles();
+		final var explicitMappingFileNames = scanEnvironment.getExplicitlyListedMappingFiles();
 		if ( explicitMappingFileNames != null ) {
 			nonLocatedMappingFileNames.addAll( explicitMappingFileNames );
 		}
 
 		if ( xmlMappingBinderAccess != null ) { // xml mapping is not disabled
-			for ( MappingFileDescriptor mappingFileDescriptor : scanResult.getLocatedMappingFiles() ) {
-				//noinspection unchecked,rawtypes
-				managedResources.addXmlBinding( (Binding) InputStreamAccessXmlSource.fromStreamAccess(
-						mappingFileDescriptor.getStreamAccess(),
-						xmlMappingBinderAccess.getMappingBinder()
-				) );
+			for ( var mappingFileDescriptor : scanResult.getLocatedMappingFiles() ) {
+				managedResources.addXmlBinding(
+						InputStreamAccessXmlSource.fromStreamAccess(
+								mappingFileDescriptor.getStreamAccess(),
+								xmlMappingBinderAccess.getMappingBinder()
+						)
+				);
 				nonLocatedMappingFileNames.remove( mappingFileDescriptor.getName() );
 			}
 
 			for ( String name : nonLocatedMappingFileNames ) {
-				final Origin origin = new Origin( SourceType.RESOURCE, name );
-				final URL url = classLoaderService.locateResource( name );
+				final var origin = new Origin( SourceType.RESOURCE, name );
+				final var url = classLoaderService.locateResource( name );
 				if ( url == null ) {
 					throw new MappingException( "Unable to resolve explicitly named mapping file: " + name, origin );
 				}
-				final UrlInputStreamAccess urlInputStreamAccess = new UrlInputStreamAccess( url );
-				//noinspection unchecked,rawtypes
-				managedResources.addXmlBinding( (Binding) InputStreamAccessXmlSource.fromStreamAccess(
-						urlInputStreamAccess,
-						origin,
-						xmlMappingBinderAccess.getMappingBinder()
-				) );
+				managedResources.addXmlBinding(
+						InputStreamAccessXmlSource.fromStreamAccess(
+								new UrlInputStreamAccess( url ),
+								origin,
+								xmlMappingBinderAccess.getMappingBinder()
+						)
+				);
 			}
 		}
 
 		// classes and packages ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-		final List<String> explicitlyListedClassNames = scanEnvironment.getExplicitlyListedClassNames();
+		final var explicitlyListedClassNames = scanEnvironment.getExplicitlyListedClassNames();
 		final List<String> unresolvedListedClassNames =
 				explicitlyListedClassNames == null
 						? new ArrayList<>()
 						: new ArrayList<>( explicitlyListedClassNames );
 
-		for ( ClassDescriptor classDescriptor : scanResult.getLocatedClasses() ) {
+		for ( var classDescriptor : scanResult.getLocatedClasses() ) {
 			if ( classDescriptor.getCategorization() == ClassDescriptor.Categorization.CONVERTER ) {
 				// converter classes are safe to load because we never enhance them,
 				// and notice we use the ClassLoaderService specifically, not the temp ClassLoader (if any)
 				managedResources.addAttributeConverterDefinition(
-						ConverterDescriptors.of( classLoaderService.classForName( classDescriptor.getName() ),
-								bootstrapContext.getClassmateContext() )
+						ConverterDescriptors.of( classLoaderService.classForName( classDescriptor.getName() ) )
 				);
 			}
 			else if ( classDescriptor.getCategorization() == ClassDescriptor.Categorization.MODEL ) {
@@ -272,7 +269,7 @@ else if ( classDescriptor.getCategorization() == ClassDescriptor.Categorization.
 		}
 
 		// IMPL NOTE: 'explicitlyListedClassNames' can contain both class and package names
-		for ( PackageDescriptor packageDescriptor : scanResult.getLocatedPackages() ) {
+		for ( var packageDescriptor : scanResult.getLocatedPackages() ) {
 			managedResources.addAnnotatedPackageName( packageDescriptor.getName() );
 			unresolvedListedClassNames.remove( packageDescriptor.getName() );
 		}
@@ -282,14 +279,14 @@ else if ( classDescriptor.getCategorization() == ClassDescriptor.Categorization.
 			// we need to check for both possibilities here
 
 			// First, try it as a class name
-			final URL classFileUrl =
+			final var classFileUrl =
 					classLoaderService.locateResource( classFileName( unresolvedListedClassName ) );
 			if ( classFileUrl != null ) {
 				managedResources.addAnnotatedClassName( unresolvedListedClassName );
 			}
 			else {
 				// Then, try it as a package name
-				final URL packageInfoFileUrl =
+				final var packageInfoFileUrl =
 						classLoaderService.locateResource( packageInfoFileName( unresolvedListedClassName ) );
 				if ( packageInfoFileUrl != null ) {
 					managedResources.addAnnotatedPackageName( unresolvedListedClassName );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java
index d4250858d261..66cd05b562d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java
@@ -28,21 +28,21 @@
  */
 public class VersionResolution<E> implements BasicValue.Resolution<E> {
 
-	// todo (6.0) : support explicit JTD?
-	// todo (6.0) : support explicit STD?
-
-	public static <E> VersionResolution<E> from(
+	public static VersionResolution<?> from(
 			Function<TypeConfiguration, java.lang.reflect.Type> implicitJavaTypeAccess,
 			TimeZoneStorageType timeZoneStorageType,
 			MetadataBuildingContext context) {
-
-		// todo (6.0) : add support for Dialect-specific interpretation?
-
 		final var typeConfiguration = context.getBootstrapContext().getTypeConfiguration();
 		final var implicitJavaType = implicitJavaTypeAccess.apply( typeConfiguration );
-		final JavaType<E> registered = typeConfiguration.getJavaTypeRegistry().getDescriptor( implicitJavaType );
-		final var basicJavaType = (BasicJavaType<E>) registered;
+		final var registered = typeConfiguration.getJavaTypeRegistry().resolveDescriptor( implicitJavaType );
+		return resolve( timeZoneStorageType, context, (BasicJavaType<?>) registered );
+	}
 
+	private static <E> VersionResolution<E> resolve(
+			TimeZoneStorageType timeZoneStorageType,
+			MetadataBuildingContext context,
+			BasicJavaType<E> basicJavaType) {
+		final var typeConfiguration = context.getBootstrapContext().getTypeConfiguration();
 		final var recommendedJdbcType = basicJavaType.getRecommendedJdbcType(
 				new JdbcTypeIndicators() {
 					@Override
@@ -50,7 +50,7 @@ public TypeConfiguration getTypeConfiguration() {
 						return typeConfiguration;
 					}
 
-					@Override
+					@Override @SuppressWarnings("deprecation")
 					public TemporalType getTemporalPrecision() {
 						// if it is a temporal version, it needs to be a TIMESTAMP
 						return TemporalType.TIMESTAMP;
@@ -106,7 +106,6 @@ public Dialect getDialect() {
 		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
 		final var basicType = basicTypeRegistry.resolve( basicJavaType, recommendedJdbcType );
 		final var legacyType = basicTypeRegistry.getRegisteredType( basicJavaType.getJavaTypeClass() );
-
 		assert legacyType.getJdbcType().getDefaultSqlTypeCode() == recommendedJdbcType.getDefaultSqlTypeCode();
 
 		return new VersionResolution<>( basicJavaType, recommendedJdbcType, basicType, legacyType );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java
index af8a90295a7a..c4508b01381d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java
@@ -13,11 +13,12 @@
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.Internal;
@@ -32,10 +33,11 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.boot.model.TypeContributor;
+import org.hibernate.boot.model.convert.internal.ConverterDescriptors;
+import org.hibernate.boot.model.convert.spi.RegisteredConversion;
 import org.hibernate.boot.model.process.internal.ManagedResourcesImpl;
 import org.hibernate.boot.model.process.internal.ScanningCoordinator;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
-import org.hibernate.boot.model.relational.Namespace;
 import org.hibernate.boot.model.relational.Sequence;
 import org.hibernate.boot.model.source.internal.annotations.AnnotationMetadataSourceProcessorImpl;
 import org.hibernate.boot.model.source.internal.annotations.DomainModelSource;
@@ -59,13 +61,11 @@
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.mapping.Table;
 import org.hibernate.models.internal.MutableClassDetailsRegistry;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
-import org.hibernate.type.BasicType;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.WrapperArrayHandling;
@@ -100,10 +100,10 @@
  * Represents the process of transforming a {@link MetadataSources}
  * reference into a {@link org.hibernate.boot.Metadata} reference.  Allows for 2 different process paradigms:<ul>
  *     <li>
- *         Single step : as defined by the {@link #build} method; internally leverages the 2-step paradigm
+ *         Single step: as defined by the {@link #build} method; internally leverages the 2-step paradigm
  *     </li>
  *     <li>
- *         Two step : a first step coordinates resource scanning and some other preparation work; a second step
+ *         Two step: a first step coordinates resource scanning and some other preparation work; a second step
  *         builds the {@link org.hibernate.boot.Metadata}. A hugely important distinction in the need for the
  *         steps is that the first phase should strive to not load user entity/component classes so that we can still
  *         perform enhancement on them later. This approach caters to the 2-phase bootstrap we use in regard to
@@ -116,6 +116,10 @@
  */
 public class MetadataBuildingProcess {
 
+	private static final Comparator<TypeContributor> TYPE_CONTRIBUTOR_COMPARATOR = Comparator.comparingInt(
+					TypeContributor::ordinal )
+			.thenComparing( a -> a.getClass().getCanonicalName() );
+
 	/**
 	 * Unified single phase for MetadataSources to Metadata process
 	 *
@@ -132,28 +136,34 @@ public static MetadataImplementor build(
 	}
 
 	/**
-	 * First step of two-phase for MetadataSources to Metadata process
+	 * First step of two-phase for {@link MetadataSources} to
+	 * {@link org.hibernate.boot.Metadata} process
 	 *
 	 * @param sources The MetadataSources
 	 * @param bootstrapContext The bootstrapContext
 	 *
-	 * @return Token/memento representing all known users resources (classes, packages, mapping files, etc).
+	 * @return Token/memento representing all known users resources
+	 *         (classes, packages, mapping files, and so on).
 	 */
 	public static ManagedResources prepare(
 			final MetadataSources sources,
 			final BootstrapContext bootstrapContext) {
 		final var managedResources = ManagedResourcesImpl.baseline( sources, bootstrapContext );
-		final boolean xmlMappingEnabled =
-				bootstrapContext.getConfigurationService()
-						.getSetting( XML_MAPPING_ENABLED, StandardConverters.BOOLEAN, true );
 		ScanningCoordinator.INSTANCE.coordinateScan(
 				managedResources,
 				bootstrapContext,
-				xmlMappingEnabled ? sources.getXmlMappingBinderAccess() : null
+				isXmlMappingEnabled( bootstrapContext )
+						? sources.getXmlMappingBinderAccess()
+						: null
 		);
 		return managedResources;
 	}
 
+	private static Boolean isXmlMappingEnabled(BootstrapContext bootstrapContext) {
+		return bootstrapContext.getConfigurationService()
+				.getSetting( XML_MAPPING_ENABLED, StandardConverters.BOOLEAN, true );
+	}
+
 	/**
 	 * Second step of two-phase for MetadataSources to Metadata process
 	 *
@@ -204,8 +214,8 @@ public static MetadataImplementor complete(
 				metadataCollector
 		);
 
-		final var classLoaderService = bootstrapContext.getClassLoaderService();
-		processAdditionalMappingContributions( metadataCollector, options, classLoaderService, rootMetadataBuildingContext );
+		processAdditionalMappingContributions( metadataCollector, options,
+				bootstrapContext.getClassLoaderService(), rootMetadataBuildingContext );
 
 		applyExtraQueryImports( managedResources, metadataCollector );
 
@@ -219,17 +229,39 @@ public static void coordinateProcessors(
 			MetadataBuildingContextRootImpl rootMetadataBuildingContext,
 			DomainModelSource domainModelSource,
 			InFlightMetadataCollectorImpl metadataCollector) {
-		final var processor = new MetadataSourceProcessor() {
-			private final MetadataSourceProcessor hbmProcessor = options.isXmlMappingEnabled()
-					? new HbmMetadataSourceProcessorImpl( managedResources, rootMetadataBuildingContext )
-					: new NoOpMetadataSourceProcessorImpl();
+		final MetadataSourceProcessor hbmProcessor = options.isXmlMappingEnabled()
+				? new HbmMetadataSourceProcessorImpl( managedResources, rootMetadataBuildingContext )
+				: new NoOpMetadataSourceProcessorImpl();
+
+		final AnnotationMetadataSourceProcessorImpl annotationProcessor = new AnnotationMetadataSourceProcessorImpl(
+				managedResources,
+				domainModelSource,
+				rootMetadataBuildingContext
+		);
 
-			private final AnnotationMetadataSourceProcessorImpl annotationProcessor =
-					new AnnotationMetadataSourceProcessorImpl(
-							managedResources,
-							domainModelSource,
-							rootMetadataBuildingContext
-					);
+		final var bootstrapContext = rootMetadataBuildingContext.getBootstrapContext();
+		final var classLoaderService = bootstrapContext.getClassLoaderService();
+		assert classLoaderService != null;
+
+		final var converterRegistry =
+				rootMetadataBuildingContext.getMetadataCollector().getConverterRegistry();
+		domainModelSource.getConversionRegistrations().forEach( registration -> {
+			final var explicitDomainType = registration.getExplicitDomainType();
+			converterRegistry.addRegisteredConversion( new RegisteredConversion(
+					explicitDomainType == void.class || explicitDomainType == Void.class
+							? void.class
+							: explicitDomainType,
+					registration.getConverterType(),
+					registration.isAutoApply()
+			) );
+		} );
+		domainModelSource.getConverterRegistrations().forEach( registration ->
+				converterRegistry.addAttributeConverter( ConverterDescriptors.of(
+						classLoaderService.classForName( registration.converterClass().getClassName() ),
+						registration.autoApply(), false
+				) ) );
+
+		final var processor = new MetadataSourceProcessor() {
 
 			@Override
 			public void prepare() {
@@ -320,16 +352,16 @@ public void finishUp() {
 		processor.processFilterDefinitions();
 		processor.processFetchProfiles();
 
-		final Set<String> processedEntityNames = new HashSet<>();
 		processor.prepareForEntityHierarchyProcessing();
-		processor.processEntityHierarchies( processedEntityNames );
+		processor.processEntityHierarchies( new HashSet<>() );
 		processor.postProcessEntityHierarchies();
 
 		processor.processResultSetMappings();
 
 		metadataCollector.processSecondPasses( rootMetadataBuildingContext );
 
-		// Make sure collections are fully bound before processing named queries as hbm result set mappings require it
+		// Make sure collections are fully bound before processing
+		// named queries as hbm result set mappings require it
 		processor.processNamedQueries();
 
 		processor.finishUp();
@@ -359,26 +391,30 @@ public static DomainModelSource processManagedResources(
 
 		final var aggregatedPersistenceUnitMetadata = metadataCollector.getPersistenceUnitMetadata();
 		final var modelsContext = bootstrapContext.getModelsContext();
-		final var xmlPreProcessingResult = XmlPreProcessor.preProcessXmlResources(
-				managedResources,
-				aggregatedPersistenceUnitMetadata
-		);
+		final var xmlPreProcessingResult =
+				XmlPreProcessor.preProcessXmlResources( managedResources,
+						aggregatedPersistenceUnitMetadata );
 
-		final List<String> allKnownClassNames = mutableJoin(
-				managedResources.getAnnotatedClassReferences().stream().map( Class::getName ).collect( Collectors.toList() ),
+		final var allKnownClassNames = mutableJoin(
+				managedResources.getAnnotatedClassReferences().stream()
+						.map( Class::getName ).toList(),
 				managedResources.getAnnotatedClassNames(),
 				xmlPreProcessingResult.getMappedClasses()
 		);
-		managedResources.getAnnotatedPackageNames().forEach( (packageName) -> {
-			try {
-				final var packageInfoClass = modelsContext.getClassLoading().classForName( packageName + ".package-info" );
-				allKnownClassNames.add( packageInfoClass.getName() );
-			}
-			catch (ClassLoadingException classLoadingException) {
-				// no package-info, so there can be no annotations... just skip it
-			}
-		} );
-		managedResources.getAnnotatedClassReferences().forEach( (clazz) -> allKnownClassNames.add( clazz.getName() ) );
+		managedResources.getAnnotatedPackageNames()
+				.forEach( packageName -> {
+					try {
+						final Class<?> packageInfoClass =
+								modelsContext.getClassLoading()
+										.classForName( packageName + ".package-info" );
+						allKnownClassNames.add( packageInfoClass.getName() );
+					}
+					catch (ClassLoadingException classLoadingException) {
+						// no package-info, so there can be no annotations... just skip it
+					}
+				} );
+		managedResources.getAnnotatedClassReferences()
+				.forEach( clazz -> allKnownClassNames.add( clazz.getName() ) );
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// 	- process metadata-complete XML
@@ -397,15 +433,15 @@ public static DomainModelSource processManagedResources(
 		//  	- embeddables
 
 		final var classDetailsRegistry = modelsContext.getClassDetailsRegistry();
-		final var modelCategorizationCollector = new DomainModelCategorizationCollector(
-				metadataCollector.getGlobalRegistrations(),
-				modelsContext
-		);
+		final var modelCategorizationCollector =
+				new DomainModelCategorizationCollector(
+						metadataCollector.getGlobalRegistrations(),
+						modelsContext
+				);
 
-		final var rootMappingDefaults = new RootMappingDefaults(
-				optionDefaults,
-				aggregatedPersistenceUnitMetadata
-		);
+		final var rootMappingDefaults =
+				new RootMappingDefaults( optionDefaults,
+						aggregatedPersistenceUnitMetadata );
 		final var xmlProcessingResult = XmlProcessor.processXml(
 				xmlPreProcessingResult,
 				aggregatedPersistenceUnitMetadata,
@@ -417,19 +453,19 @@ public static DomainModelSource processManagedResources(
 
 		final HashSet<String> categorizedClassNames = new HashSet<>();
 		// apply known classes
-		allKnownClassNames.forEach( (className) -> {
+		allKnownClassNames.forEach( className -> {
 			if ( categorizedClassNames.add( className ) ) {
 				// not known yet
-				final ClassDetails classDetails = classDetailsRegistry.resolveClassDetails( className );
-				applyKnownClass( classDetails, categorizedClassNames, classDetailsRegistry, modelCategorizationCollector );
+				applyKnownClass( classDetailsRegistry.resolveClassDetails( className ),
+						categorizedClassNames, classDetailsRegistry, modelCategorizationCollector );
 			}
 		} );
 		// apply known "names" - generally this handles dynamic models
 		xmlPreProcessingResult.getMappedNames().forEach( (mappedName) -> {
 			if ( categorizedClassNames.add( mappedName ) ) {
 				// not known yet
-				final ClassDetails classDetails = classDetailsRegistry.resolveClassDetails( mappedName );
-				applyKnownClass( classDetails, categorizedClassNames, classDetailsRegistry, modelCategorizationCollector );
+				applyKnownClass( classDetailsRegistry.resolveClassDetails( mappedName ),
+						categorizedClassNames, classDetailsRegistry, modelCategorizationCollector );
 			}
 		} );
 
@@ -437,24 +473,14 @@ public static DomainModelSource processManagedResources(
 
 		return new DomainModelSource(
 				classDetailsRegistry,
-				CollectionHelper.mutableJoin( allKnownClassNames, xmlPreProcessingResult.getMappedNames() ),
+				mutableJoin( allKnownClassNames,
+						xmlPreProcessingResult.getMappedNames() ),
 				modelCategorizationCollector.getGlobalRegistrations(),
 				rootMappingDefaults,
 				aggregatedPersistenceUnitMetadata
 		);
 	}
 
-	private static void applyKnownClass(
-			String className,
-			HashSet<String> categorizedClassNames,
-			ClassDetailsRegistry classDetailsRegistry,
-			DomainModelCategorizationCollector modelCategorizationCollector) {
-		if ( categorizedClassNames.add( className ) ) {
-			final ClassDetails classDetails = classDetailsRegistry.resolveClassDetails( className );
-			applyKnownClass( classDetails, categorizedClassNames,classDetailsRegistry, modelCategorizationCollector );
-		}
-	}
-
 	private static void applyKnownClass(
 			ClassDetails classDetails,
 			HashSet<String> categorizedClassNames,
@@ -475,16 +501,19 @@ private static void processAdditionalMappingContributions(
 			ClassLoaderService classLoaderService,
 			MetadataBuildingContextRootImpl rootMetadataBuildingContext) {
 
-		final var contributions = new AdditionalMappingContributionsImpl(
-				metadataCollector,
-				options,
-				options.isXmlMappingEnabled() ? new MappingBinder( classLoaderService, () -> false ) : null,
-				rootMetadataBuildingContext
-		);
+		final var contributions =
+				new AdditionalMappingContributionsImpl(
+						metadataCollector,
+						options,
+						options.isXmlMappingEnabled()
+								? new MappingBinder( classLoaderService, () -> false )
+								: null,
+						rootMetadataBuildingContext
+				);
 
 		final var additionalMappingContributors =
 				classLoaderService.loadJavaServices( AdditionalMappingContributor.class );
-		additionalMappingContributors.forEach( (contributor) -> {
+		additionalMappingContributors.forEach( contributor -> {
 			contributions.setCurrentContributor( contributor.getContributorName() );
 			try {
 				contributor.contribute(
@@ -554,9 +583,8 @@ public void contributeManagedClass(ClassDetails classDetails) {
 
 		@Override
 		public void contributeBinding(InputStream xmlStream) {
-			final Origin origin = new Origin( SourceType.INPUT_STREAM, null );
-			final var binding = mappingBinder.bind( xmlStream, origin );
-			final var bindingRoot = binding.getRoot();
+			final var origin = new Origin( SourceType.INPUT_STREAM, null );
+			final var bindingRoot = mappingBinder.bind( xmlStream, origin ).getRoot();
 			if ( bindingRoot instanceof JaxbHbmHibernateMapping hibernateMapping ) {
 				contributeBinding( hibernateMapping );
 			}
@@ -593,21 +621,18 @@ public void contributeBinding(JaxbHbmHibernateMapping hbmJaxbBinding) {
 
 		@Override
 		public void contributeTable(Table table) {
-			final Namespace namespace = metadataCollector.getDatabase().locateNamespace(
-					table.getCatalogIdentifier(),
-					table.getSchemaIdentifier()
-			);
-			namespace.registerTable( table.getNameIdentifier(), table );
+			metadataCollector.getDatabase()
+					.locateNamespace( table.getCatalogIdentifier(), table.getSchemaIdentifier() )
+					.registerTable( table.getNameIdentifier(), table );
 			metadataCollector.addTableNameBinding( table.getNameIdentifier(), table );
 		}
 
 		@Override
 		public void contributeSequence(Sequence sequence) {
-			final Namespace namespace = metadataCollector.getDatabase().locateNamespace(
-					sequence.getName().getCatalogName(),
-					sequence.getName().getSchemaName()
-			);
-			namespace.registerSequence( sequence.getName().getSequenceName(), sequence );
+			final var sequenceName = sequence.getName();
+			metadataCollector.getDatabase()
+					.locateNamespace( sequenceName.getCatalogName(), sequenceName.getSchemaName() )
+					.registerSequence( sequenceName.getSequenceName(), sequence );
 		}
 
 		@Override
@@ -708,11 +733,14 @@ public void contributeType(CompositeUserType<?> type) {
 		}
 
 		// add Dialect contributed types
-		final var dialect = options.getServiceRegistry().requireService( JdbcServices.class ).getDialect();
+		final var dialect =
+				options.getServiceRegistry()
+						.requireService( JdbcServices.class )
+						.getDialect();
 		dialect.contribute( typeContributions, options.getServiceRegistry() );
 
 		// add TypeContributor contributed types.
-		for ( var typeContributor : classLoaderService.loadJavaServices( TypeContributor.class ) ) {
+		for ( var typeContributor : sortedTypeContributors( classLoaderService ) ) {
 			typeContributor.contribute( typeContributions, options.getServiceRegistry() );
 		}
 
@@ -762,7 +790,7 @@ public void contributeType(CompositeUserType<?> type) {
 		}
 
 		final int preferredSqlTypeCodeForDuration = getPreferredSqlTypeCodeForDuration( serviceRegistry );
-		if ( preferredSqlTypeCodeForDuration != SqlTypes.INTERVAL_SECOND ) {
+		if ( preferredSqlTypeCodeForDuration != SqlTypes.DURATION ) {
 			adaptToPreferredSqlTypeCode(
 					typeConfiguration,
 					jdbcTypeRegistry,
@@ -772,9 +800,6 @@ public void contributeType(CompositeUserType<?> type) {
 					"org.hibernate.type.DurationType"
 			);
 		}
-		else {
-			addFallbackIfNecessary( jdbcTypeRegistry, SqlTypes.INTERVAL_SECOND, SqlTypes.DURATION );
-		}
 
 		addFallbackIfNecessary( jdbcTypeRegistry, SqlTypes.INET, SqlTypes.VARBINARY );
 		addFallbackIfNecessary( jdbcTypeRegistry, SqlTypes.GEOMETRY, SqlTypes.VARBINARY );
@@ -827,18 +852,26 @@ public void contributeType(CompositeUserType<?> type) {
 		}
 	}
 
-	private static void adaptToPreferredSqlTypeCode(
-			JdbcTypeRegistry jdbcTypeRegistry,
-			JdbcType dialectUuidDescriptor,
-			int defaultSqlTypeCode,
-			int preferredSqlTypeCode) {
-		if ( jdbcTypeRegistry.findDescriptor( defaultSqlTypeCode ) == dialectUuidDescriptor ) {
-			jdbcTypeRegistry.addDescriptor(
-					defaultSqlTypeCode,
-					jdbcTypeRegistry.getDescriptor( preferredSqlTypeCode )
-			);
-		}
-		// else warning?
+//	private static void adaptToPreferredSqlTypeCode(
+//			JdbcTypeRegistry jdbcTypeRegistry,
+//			JdbcType dialectUuidDescriptor,
+//			int defaultSqlTypeCode,
+//			int preferredSqlTypeCode) {
+//		if ( jdbcTypeRegistry.findDescriptor( defaultSqlTypeCode ) == dialectUuidDescriptor ) {
+//			jdbcTypeRegistry.addDescriptor(
+//					defaultSqlTypeCode,
+//					jdbcTypeRegistry.getDescriptor( preferredSqlTypeCode )
+//			);
+//		}
+//		// else warning?
+//	}
+
+	private static List<TypeContributor> sortedTypeContributors(
+			ClassLoaderService classLoaderService) {
+		Collection<TypeContributor> typeContributors = classLoaderService.loadJavaServices( TypeContributor.class );
+		List<TypeContributor> contributors = new ArrayList<>( typeContributors );
+		contributors.sort( TYPE_CONTRIBUTOR_COMPARATOR );
+		return contributors;
 	}
 
 	private static void adaptToPreferredSqlTypeCode(
@@ -850,12 +883,12 @@ private static void adaptToPreferredSqlTypeCode(
 			String... additionalKeys) {
 		final var javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
 		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
-		final BasicType<?> basicType = new NamedBasicTypeImpl<>(
+		final var basicType = new NamedBasicTypeImpl<>(
 				javaTypeRegistry.resolveDescriptor( javaType ),
 				jdbcTypeRegistry.getDescriptor( preferredSqlTypeCode ),
 				name
 		);
-		final String[] keys = Arrays.copyOf( additionalKeys, additionalKeys.length + 2 );
+		final var keys = Arrays.copyOf( additionalKeys, additionalKeys.length + 2 );
 		keys[additionalKeys.length] = javaType.getSimpleName();
 		keys[additionalKeys.length + 1] = javaType.getName();
 		basicTypeRegistry.register( basicType, keys );
@@ -866,13 +899,12 @@ private static void adaptTimeTypesToDefaultTimeZoneStorage(
 			JdbcType timestampWithTimeZoneOverride) {
 		final var javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
 		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
-		final BasicType<OffsetTime> offsetDateTimeType = new NamedBasicTypeImpl<>(
-				javaTypeRegistry.resolveDescriptor( OffsetTime.class ),
-				timestampWithTimeZoneOverride,
-				"OffsetTime"
-		);
 		basicTypeRegistry.register(
-				offsetDateTimeType,
+				new NamedBasicTypeImpl<>(
+						javaTypeRegistry.resolveDescriptor( OffsetTime.class ),
+						timestampWithTimeZoneOverride,
+						"OffsetTime"
+				),
 				"org.hibernate.type.OffsetTimeType",
 				OffsetTime.class.getSimpleName(),
 				OffsetTime.class.getName()
@@ -884,24 +916,22 @@ private static void adaptTimestampTypesToDefaultTimeZoneStorage(
 			JdbcType timestampWithTimeZoneOverride) {
 		final var javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
 		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
-		final BasicType<OffsetDateTime> offsetDateTimeType = new NamedBasicTypeImpl<>(
-				javaTypeRegistry.resolveDescriptor( OffsetDateTime.class ),
-				timestampWithTimeZoneOverride,
-				"OffsetDateTime"
-		);
-		final BasicType<ZonedDateTime> zonedDateTimeType = new NamedBasicTypeImpl<>(
-				javaTypeRegistry.resolveDescriptor( ZonedDateTime.class ),
-				timestampWithTimeZoneOverride,
-				"ZonedDateTime"
-		);
 		basicTypeRegistry.register(
-				offsetDateTimeType,
+				new NamedBasicTypeImpl<>(
+						javaTypeRegistry.resolveDescriptor( OffsetDateTime.class ),
+						timestampWithTimeZoneOverride,
+						"OffsetDateTime"
+				),
 				"org.hibernate.type.OffsetDateTimeType",
 				OffsetDateTime.class.getSimpleName(),
 				OffsetDateTime.class.getName()
 		);
 		basicTypeRegistry.register(
-				zonedDateTimeType,
+				new NamedBasicTypeImpl<>(
+						javaTypeRegistry.resolveDescriptor( ZonedDateTime.class ),
+						timestampWithTimeZoneOverride,
+						"ZonedDateTime"
+				),
 				"org.hibernate.type.ZonedDateTimeType",
 				ZonedDateTime.class.getSimpleName(),
 				ZonedDateTime.class.getName()
@@ -937,7 +967,8 @@ private static void addFallbackIfNecessary(
 			int typeCode,
 			int fallbackTypeCode) {
 		if ( !jdbcTypeRegistry.hasRegisteredDescriptor( typeCode ) ) {
-			jdbcTypeRegistry.addDescriptor( typeCode, jdbcTypeRegistry.getDescriptor( fallbackTypeCode ) );
+			jdbcTypeRegistry.addDescriptor( typeCode,
+					jdbcTypeRegistry.getDescriptor( fallbackTypeCode ) );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AbstractAuxiliaryDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AbstractAuxiliaryDatabaseObject.java
index e2656dd9aaf7..6ad25ced6ec1 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AbstractAuxiliaryDatabaseObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/AbstractAuxiliaryDatabaseObject.java
@@ -64,7 +64,9 @@ public Set<String> getDialectScopes() {
 	@Override
 	public boolean appliesToDialect(Dialect dialect) {
 		// empty means no scoping
-		return getDialectScopes().isEmpty() || getDialectScopes().contains( dialect.getClass().getName() );
+		final var scopes = getDialectScopes();
+		return scopes.isEmpty()
+			|| scopes.contains( dialect.getClass().getName() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Database.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Database.java
index 23ba3cf59a64..c6e66ef366ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Database.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Database.java
@@ -103,7 +103,24 @@ public JdbcEnvironment getJdbcEnvironment() {
 	 * @return The wrapped Identifier form
 	 */
 	public Identifier toIdentifier(String text) {
-		return text == null ? null : jdbcEnvironment.getIdentifierHelper().toIdentifier( text );
+		return toIdentifier( text, false );
+	}
+
+	/**
+	 * Wrap the raw name of a database object in its Identifier form accounting
+	 * for quoting from any of:
+	 * <ul>
+	 *     <li>explicit quoting in the name itself</li>
+	 *     <li>global request to quote all identifiers</li>
+	 * </ul>
+	 *
+	 * @param text The raw object name
+	 * @param isExplicit Whether the name is explicitly set
+	 * @return The wrapped Identifier form
+	 * @implNote Quoting from database keywords happens only when building physical identifiers.
+	 */
+	public Identifier toIdentifier(String text, boolean isExplicit) {
+		return text == null ? null : jdbcEnvironment.getIdentifierHelper().toIdentifier( text, false, isExplicit );
 	}
 
 	public PhysicalNamingStrategy getPhysicalNamingStrategy() {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java
index 9df90bc003bf..ccf36577a86c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/Namespace.java
@@ -95,9 +95,9 @@ public void registerTable(Identifier logicalName, Table table) {
 		final Table previous = tables.put( logicalName, table );
 		if ( previous != null ) {
 			BOOT_LOGGER.replacingTableRegistration(
-					String.valueOf(logicalName),
-					String.valueOf(previous),
-					String.valueOf(table)
+					String.valueOf( logicalName ),
+					String.valueOf( previous ),
+					String.valueOf( table )
 			);
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameParser.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameParser.java
index b2b735e495e7..b9c940568ba0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/QualifiedNameParser.java
@@ -110,7 +110,7 @@ public NameParts parse(String text, Identifier defaultCatalog, Identifier defaul
 
 		if ( isQuotedInEntirety( text ) ) {
 			return new NameParts( defaultCatalog, defaultSchema,
-					Identifier.toIdentifier( unquote( text ), true ) );
+					Identifier.toIdentifier( unquote( text ), true, true, true ) );
 		}
 
 		String catalogName = null;
@@ -169,7 +169,7 @@ else if ( defaultCatalog != null ) {
 		return new NameParts(
 				Identifier.toIdentifier( catalogName, catalogWasQuoted ),
 				Identifier.toIdentifier( schemaName, schemaWasQuoted ),
-				Identifier.toIdentifier( name, nameWasQuoted )
+				Identifier.toIdentifier( name, nameWasQuoted, true, true )
 		);
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java
index 0c5b92199f09..387f3b51d855 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AdditionalManagedResourcesImpl.java
@@ -158,7 +158,7 @@ public Builder addXmlBinding(Binding<JaxbBindableMappingDescriptor> binding) {
 
 		public void addJaxbEntityMappings(List<JaxbEntityMappingsImpl> additionalJaxbMappings) {
 			if ( additionalJaxbMappings != null ) {
-				for ( JaxbEntityMappingsImpl additionalJaxbMapping : additionalJaxbMappings ) {
+				for ( var additionalJaxbMapping : additionalJaxbMappings ) {
 					addXmlBinding( new Binding<>( additionalJaxbMapping, new Origin( OTHER, "additional" ) ) );
 				}
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
index 5257460098c5..c59b3b067f4e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
@@ -12,9 +12,6 @@
 import org.hibernate.MappingException;
 import org.hibernate.boot.internal.MetadataBuildingContextRootImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
-import org.hibernate.boot.model.convert.internal.ConverterDescriptors;
-import org.hibernate.boot.model.convert.spi.RegisteredConversion;
-import org.hibernate.boot.model.internal.AnnotationBinder;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.boot.model.source.spi.MetadataSourceProcessor;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
@@ -22,14 +19,14 @@
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.models.spi.ClassDetails;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.MappedSuperclass;
-
 import static org.hibernate.boot.model.internal.AnnotationBinder.bindClass;
 import static org.hibernate.boot.model.internal.AnnotationBinder.bindDefaults;
 import static org.hibernate.boot.model.internal.AnnotationBinder.bindFetchProfilesForClass;
 import static org.hibernate.boot.model.internal.AnnotationBinder.bindFetchProfilesForPackage;
+import static org.hibernate.boot.model.internal.AnnotationBinder.bindPackage;
 import static org.hibernate.boot.model.internal.AnnotationBinder.buildInheritanceStates;
+import static org.hibernate.boot.model.internal.EntityBinder.isEntity;
+import static org.hibernate.boot.model.internal.EntityBinder.isMappedSuperclass;
 import static org.hibernate.boot.model.process.spi.MetadataBuildingProcess.processManagedResources;
 import static org.hibernate.internal.util.ReflectHelper.OBJECT_CLASS_NAME;
 
@@ -65,27 +62,6 @@ public AnnotationMetadataSourceProcessorImpl(
 		classLoaderService = bootstrapContext.getClassLoaderService();
 		assert classLoaderService != null;
 
-		final var converterRegistry =
-				rootMetadataBuildingContext.getMetadataCollector().getConverterRegistry();
-		domainModelSource.getConversionRegistrations().forEach( (registration) -> {
-			final var explicitDomainType = registration.getExplicitDomainType();
-			converterRegistry.addRegisteredConversion( new RegisteredConversion(
-					explicitDomainType == void.class || explicitDomainType == Void.class
-							? void.class
-							: explicitDomainType,
-					registration.getConverterType(),
-					registration.isAutoApply(),
-					rootMetadataBuildingContext
-			) );
-		} );
-		domainModelSource.getConverterRegistrations().forEach( (registration) -> {
-			converterRegistry.addAttributeConverter( ConverterDescriptors.of(
-					classLoaderService.classForName( registration.converterClass().getClassName() ),
-					registration.autoApply(), false,
-					bootstrapContext.getClassmateContext()
-			) );
-		} );
-
 		applyManagedClasses( domainModelSource, knownClasses );
 
 		final var classDetailsRegistry = domainModelSource.getClassDetailsRegistry();
@@ -109,9 +85,8 @@ public static void processAdditionalMappings(
 			List<JaxbEntityMappingsImpl> additionalJaxbMappings,
 			MetadataBuildingContextRootImpl rootMetadataBuildingContext,
 			MetadataBuildingOptions options) {
-		final var builder =
-				new AdditionalManagedResourcesImpl.Builder(
-						rootMetadataBuildingContext.getBootstrapContext().getServiceRegistry() );
+		final var context = rootMetadataBuildingContext.getBootstrapContext();
+		final var builder = new AdditionalManagedResourcesImpl.Builder( context.getServiceRegistry() );
 		builder.addLoadedClasses( additionalClasses );
 		builder.addClassDetails( additionalClassDetails );
 		builder.addJaxbEntityMappings( additionalJaxbMappings );
@@ -120,7 +95,7 @@ public static void processAdditionalMappings(
 		final var additionalDomainModelSource =
 				processManagedResources( managedResources,
 						rootMetadataBuildingContext.getMetadataCollector(),
-						rootMetadataBuildingContext.getBootstrapContext(),
+						context,
 						options.getMappingDefaults() );
 		new AnnotationMetadataSourceProcessorImpl( managedResources, additionalDomainModelSource, rootMetadataBuildingContext )
 				.processEntityHierarchies( new LinkedHashSet<>() );
@@ -138,7 +113,7 @@ public void prepare() {
 
 		bindDefaults( rootMetadataBuildingContext );
 		for ( String annotatedPackage : annotatedPackages ) {
-			AnnotationBinder.bindPackage( classLoaderService, annotatedPackage, rootMetadataBuildingContext );
+			bindPackage( classLoaderService, annotatedPackage, rootMetadataBuildingContext );
 		}
 	}
 
@@ -209,21 +184,20 @@ private List<ClassDetails> orderAndFillHierarchy(LinkedHashSet<ClassDetails> ori
 
 	private void insertMappedSuperclasses(LinkedHashSet<ClassDetails> original, LinkedHashSet<ClassDetails> copy) {
 		for ( var clazz : original ) {
-			if ( clazz.isInterface() && clazz.hasDirectAnnotationUsage( Entity.class ) ) {
+			if ( clazz.isInterface() && isEntity( clazz ) ) {
 				throw new MappingException( "Interface '" + clazz.getName() + "' may not be annotated '@Entity'" );
 			}
-			else if ( clazz.hasDirectAnnotationUsage( MappedSuperclass.class ) ) {
+			else if ( isMappedSuperclass( clazz ) ) {
 				// Skip class with explicit @MappedSuperclass annotation
 				// the class will be discovered analyzing the implementing class
 			}
 			else {
 				copy.add( clazz );
-				ClassDetails superClass = clazz.getSuperClass();
+				var superClass = clazz.getSuperClass();
 				while ( superClass != null
-						&& !OBJECT_CLASS_NAME.equals( superClass.getName() )
+						&& !isObjectClass( superClass )
 						&& !copy.contains( superClass ) ) {
-					if ( superClass.hasDirectAnnotationUsage( Entity.class )
-							|| superClass.hasDirectAnnotationUsage( MappedSuperclass.class ) ) {
+					if ( isEntity( superClass ) || isMappedSuperclass( superClass ) ) {
 						copy.add( superClass );
 					}
 					superClass = superClass.getSuperClass();
@@ -233,7 +207,7 @@ else if ( clazz.hasDirectAnnotationUsage( MappedSuperclass.class ) ) {
 	}
 
 	private void orderHierarchy(List<ClassDetails> copy, List<ClassDetails> newList, LinkedHashSet<ClassDetails> original, ClassDetails clazz) {
-		if ( clazz != null && !OBJECT_CLASS_NAME.equals( clazz.getName() ) ) {
+		if ( clazz != null && !isObjectClass( clazz ) ) {
 			//process superclass first
 			orderHierarchy( copy, newList, original, clazz.getSuperClass() );
 			if ( original.contains( clazz ) ) {
@@ -245,6 +219,10 @@ private void orderHierarchy(List<ClassDetails> copy, List<ClassDetails> newList,
 		}
 	}
 
+	private static boolean isObjectClass(ClassDetails classDetails) {
+		return OBJECT_CLASS_NAME.equals( classDetails.getName() );
+	}
+
 	@Override
 	public void postProcessEntityHierarchies() {
 		for ( String annotatedPackage : annotatedPackages ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java
index b8cc59f58235..2c2addd58c71 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java
@@ -41,6 +41,8 @@
 import org.hibernate.internal.util.collections.CollectionHelper;
 
 import static java.util.Collections.emptyMap;
+import static org.hibernate.internal.util.StringHelper.isNotEmpty;
+import static org.hibernate.internal.util.StringHelper.unqualify;
 
 /**
  * @author Steve Ebersole
@@ -97,19 +99,20 @@ protected AbstractEntitySourceImpl(MappingDocument sourceMappingDocument, JaxbHb
 		);
 	}
 
-	public static EntityNamingSourceImpl extractEntityNamingSource(
+	static EntityNamingSourceImpl extractEntityNamingSource(
 			MappingDocument sourceMappingDocument,
 			EntityInfo jaxbEntityMapping) {
 		final String className = sourceMappingDocument.qualifyClassName( jaxbEntityMapping.getName() );
+		final String mappingEntityName = jaxbEntityMapping.getEntityName();
 		final String entityName;
 		final String jpaEntityName;
-		if ( StringHelper.isNotEmpty( jaxbEntityMapping.getEntityName() ) ) {
-			entityName = jaxbEntityMapping.getEntityName();
-			jpaEntityName = jaxbEntityMapping.getEntityName();
+		if ( isNotEmpty( mappingEntityName ) ) {
+			entityName = mappingEntityName;
+			jpaEntityName = mappingEntityName;
 		}
 		else {
 			entityName = className;
-			jpaEntityName = StringHelper.unqualify( className );
+			jpaEntityName = unqualify( className );
 		}
 		return new EntityNamingSourceImpl( entityName, className, jpaEntityName );
 	}
@@ -122,7 +125,7 @@ private FilterSource[] buildFilterSources() {
 				return NO_FILTER_SOURCES;
 			}
 
-			FilterSource[] results = new FilterSource[size];
+			final var results = new FilterSource[size];
 			for ( int i = 0; i < size; i++ ) {
 				JaxbHbmFilterType element = jaxbClassElement.getFilter().get( i );
 				results[i] = new FilterSourceImpl( sourceMappingDocument(), element );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityNamingSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityNamingSourceImpl.java
index 68bc41743838..dd9cc77701be 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityNamingSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityNamingSourceImpl.java
@@ -5,9 +5,10 @@
 package org.hibernate.boot.model.source.internal.hbm;
 
 import org.hibernate.boot.model.source.spi.EntityNamingSource;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.mapping.PersistentClass;
 
+import static org.hibernate.internal.util.StringHelper.isNotEmpty;
+
 /**
  * Implementation of EntityNamingSource
  *
@@ -24,12 +25,13 @@ public EntityNamingSourceImpl(String entityName, String className, String jpaEnt
 		this.entityName = entityName;
 		this.className = className;
 		this.jpaEntityName = jpaEntityName;
-
-		this.typeName = StringHelper.isNotEmpty( className ) ? className : entityName;
+		this.typeName = isNotEmpty( className ) ? className : entityName;
 	}
 
 	public EntityNamingSourceImpl(PersistentClass entityBinding) {
-		this( entityBinding.getEntityName(), entityBinding.getClassName(), entityBinding.getJpaEntityName() );
+		this( entityBinding.getEntityName(),
+				entityBinding.getClassName(),
+				entityBinding.getJpaEntityName() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsSingularAssociationImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsSingularAssociationImpl.java
index 52643e31ea17..69f2e1887e3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsSingularAssociationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchCharacteristicsSingularAssociationImpl.java
@@ -12,7 +12,8 @@
 import org.hibernate.boot.spi.EffectiveMappingDefaults;
 import org.hibernate.engine.FetchStyle;
 import org.hibernate.engine.FetchTiming;
-import org.hibernate.internal.log.DeprecationLogger;
+
+import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
 
 /**
  * {@code hbm.xml} specific handling for FetchCharacteristicsSingularAssociation
@@ -169,7 +170,7 @@ public static FetchCharacteristicsSingularAssociationImpl interpretManyToManyEle
 				//NOTE <many-to-many outer-join="..." is deprecated.:
 				// Default to join and non-lazy for the "second join"
 				// of the many-to-many
-				DeprecationLogger.DEPRECATION_LOGGER.deprecatedManyToManyOuterJoin();
+				DEPRECATION_LOGGER.deprecatedManyToManyOuterJoin();
 				builder.setFetchTiming( FetchTiming.IMMEDIATE );
 				builder.setFetchStyle( FetchStyle.JOIN );
 			}
@@ -178,7 +179,7 @@ public static FetchCharacteristicsSingularAssociationImpl interpretManyToManyEle
 			//NOTE <many-to-many fetch="..." is deprecated.:
 			// Default to join and non-lazy for the "second join"
 			// of the many-to-many
-			DeprecationLogger.DEPRECATION_LOGGER.deprecatedManyToManyFetch();
+			DEPRECATION_LOGGER.deprecatedManyToManyFetch();
 			builder.setFetchTiming( FetchTiming.IMMEDIATE );
 			builder.setFetchStyle( FetchStyle.JOIN );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
index 4277507b3062..3fb5884fefa4 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
@@ -45,6 +45,7 @@
 import org.hibernate.boot.spi.NaturalIdUniqueKeyBinder;
 import org.hibernate.boot.spi.SecondPass;
 import org.hibernate.cache.spi.access.AccessType;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.FetchStyle;
 import org.hibernate.engine.FetchTiming;
 import org.hibernate.generator.internal.GeneratedGeneration;
@@ -80,9 +81,11 @@
 import org.hibernate.mapping.SingleTableSubclass;
 import org.hibernate.mapping.SortableValue;
 import org.hibernate.mapping.Table;
+import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.UnionSubclass;
 import org.hibernate.mapping.UniqueKey;
 import org.hibernate.mapping.Value;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.tuple.GenerationTiming;
@@ -184,7 +187,7 @@ private void bindRootEntity(EntityHierarchySourceImpl hierarchySource, RootClass
 		rootEntityDescriptor.setWhere( hierarchySource.getWhere() );
 
 		if ( hierarchySource.isExplicitPolymorphism() ) {
-			DEPRECATION_LOGGER.warn( "Implicit/explicit polymorphism no longer supported" );
+			DEPRECATION_LOGGER.explicitPolymorphism();
 		}
 
 		bindEntityIdentifier( mappingDocument, hierarchySource, rootEntityDescriptor );
@@ -215,7 +218,8 @@ private void bindRootEntity(EntityHierarchySourceImpl hierarchySource, RootClass
 
 	private void applyCaching(MappingDocument mappingDocument, Caching caching, RootClass rootEntityDescriptor) {
 		if ( isCacheEnabled( mappingDocument, caching ) ) {
-			rootEntityDescriptor.setCacheConcurrencyStrategy( getConcurrencyStrategy( mappingDocument, caching ).getExternalName() );
+			rootEntityDescriptor.setCacheConcurrencyStrategy(
+					getConcurrencyStrategy( mappingDocument, caching ).getExternalName() );
 			rootEntityDescriptor.setCacheRegionName( caching == null ? null : caching.getRegion() );
 			rootEntityDescriptor.setLazyPropertiesCacheable( caching == null || caching.isCacheLazyProperties() );
 			rootEntityDescriptor.setCached( true );
@@ -232,7 +236,7 @@ private static boolean isCacheEnabled(MappingDocument mappingDocument, Caching c
 		return switch ( mappingDocument.getBuildingOptions().getSharedCacheMode() ) {
 			case UNSPECIFIED, ENABLE_SELECTIVE ->
 				// this is the default behavior for hbm.xml
-					caching != null && caching.isRequested(false);
+					caching != null && caching.isRequested( false );
 			case NONE ->
 				// this option is actually really useful
 					false;
@@ -243,7 +247,7 @@ private static boolean isCacheEnabled(MappingDocument mappingDocument, Caching c
 			case DISABLE_SELECTIVE ->
 				// makes no sense for hbm.xml, and also goes against our
 				// ideology, and so it hurts me to support it here
-					caching == null || caching.isRequested(true);
+					caching == null || caching.isRequested( true );
 		};
 	}
 
@@ -263,12 +267,9 @@ private void bindEntityIdentifier(
 				break;
 			default:
 				throw new MappingException(
-						String.format(
-								Locale.ENGLISH,
-								"Unexpected entity identifier nature [%s] for entity %s",
-								hierarchySource.getIdentifierSource().getNature(),
-								hierarchySource.getRoot().getEntityNamingSource().getEntityName()
-						),
+						"Unexpected entity identifier nature [%s] for entity %s"
+								.formatted( hierarchySource.getIdentifierSource().getNature(),
+										hierarchySource.getRoot().getEntityNamingSource().getEntityName() ),
 						mappingDocument.getOrigin()
 				);
 		}
@@ -284,8 +285,8 @@ private void bindBasicEntityValues(
 		entityDescriptor.setEntityName( entityName );
 		entityDescriptor.setJpaEntityName( entityNamingSource.getJpaEntityName() );
 		entityDescriptor.setClassName( entityNamingSource.getClassName() );
-		String jpaEntityName = entityDescriptor.getJpaEntityName();
-		String className = entityDescriptor.getClassName();
+		final String jpaEntityName = entityDescriptor.getJpaEntityName();
+		final String className = entityDescriptor.getClassName();
 		if ( jpaEntityName != null && className != null ) {
 			metadataBuildingContext.getMetadataCollector().addImport( jpaEntityName, className );
 		}
@@ -470,7 +471,7 @@ private void bindJoinedSubclassEntity(
 			keyBinding.makeNationalized();
 		}
 		entityDescriptor.setKey( keyBinding );
-		keyBinding.setOnDeleteAction( getOnDeleteAction( entitySource.isCascadeDeleteEnabled() ) );
+		keyBinding.setOnDeleteAction( getOnDeleteAction( entitySource ) );
 		relationalObjectBinder.bindColumns(
 				mappingDocument,
 				entitySource.getPrimaryKeyColumnSources(),
@@ -478,6 +479,7 @@ private void bindJoinedSubclassEntity(
 				false,
 				new RelationalObjectBinder.ColumnNamingDelegate() {
 					int count = 0;
+
 					@Override
 					public Identifier determineImplicitName(LocalMetadataBuildingContext context) {
 						return primaryTable.getPrimaryKey().getColumn( count++ )
@@ -486,7 +488,8 @@ public Identifier determineImplicitName(LocalMetadataBuildingContext context) {
 				}
 		);
 		keyBinding.sortProperties();
-		setForeignKeyName( keyBinding, entitySource.getExplicitForeignKeyName() );
+		setForeignKeyName( keyBinding,
+				entitySource.getExplicitForeignKeyName() );
 		// model.getKey().setType( new Type( model.getIdentifier() ) );
 		entityDescriptor.createPrimaryKey();
 		entityDescriptor.createForeignKey();
@@ -497,6 +500,7 @@ public Identifier determineImplicitName(LocalMetadataBuildingContext context) {
 
 		bindJoinedSubclassEntities( entitySource, entityDescriptor );
 	}
+
 	private void bindUnionSubclassEntities(
 			EntitySource entitySource,
 			PersistentClass superEntityDescriptor) {
@@ -811,9 +815,9 @@ private void bindEntityVersion(
 		else {
 			versionValue.setNullValueUndefined();
 		}
-		if ( versionAttributeSource.getSource().equals("db") ) {
-			property.setValueGeneratorCreator(
-					context -> new SourceGeneration( SourceType.DB, property.getType().getReturnedClass(), context ) );
+		if ( versionAttributeSource.getSource().equals( "db" ) ) {
+			property.setValueGeneratorCreator( context ->
+					new SourceGeneration( SourceType.DB, property.getType().getReturnedClass(), context ) );
 		}
 
 		rootEntityDescriptor.setVersion( property );
@@ -831,11 +835,10 @@ private void bindEntityDiscriminator(
 
 		final var discriminatorSource = hierarchySource.getDiscriminatorSource();
 
-		String typeName = discriminatorSource.getExplicitHibernateTypeName();
-		if ( typeName == null ) {
-			typeName = "string";
-		}
-		bindSimpleValueType( sourceDocument, new HibernateTypeSourceImpl( typeName ), discriminatorValue );
+		final String typeName = discriminatorSource.getExplicitHibernateTypeName();
+		final var typeSource =
+				new HibernateTypeSourceImpl( typeName == null ? "string" : typeName );
+		bindSimpleValueType( sourceDocument, typeSource, discriminatorValue );
 
 		relationalObjectBinder.bindColumnOrFormula(
 				sourceDocument,
@@ -864,12 +867,9 @@ private void bindAllEntityAttributes(
 						.getEntityTableXref( entityDescriptor.getEntityName() );
 		if ( entityTableXref == null ) {
 			throw new AssertionFailure(
-					String.format(
-							Locale.ENGLISH,
-							"Unable to locate EntityTableXref for entity [%s] : %s",
-							entityDescriptor.getEntityName(),
-							mappingDocument.getOrigin()
-					)
+					"Unable to locate EntityTableXref for entity [%s] : %s"
+							.formatted( entityDescriptor.getEntityName(),
+									mappingDocument.getOrigin() )
 			);
 		}
 
@@ -882,7 +882,7 @@ private void bindAllEntityAttributes(
 		}
 
 		for ( var attributeSource : entitySource.attributeSources() ) {
-			if ( attributeSource instanceof PluralAttributeSource pluralAttributeSource) {
+			if ( attributeSource instanceof PluralAttributeSource pluralAttributeSource ) {
 				// plural attribute
 				final var attribute =
 						createPluralAttribute( mappingDocument, pluralAttributeSource, entityDescriptor );
@@ -895,17 +895,11 @@ private void bindAllEntityAttributes(
 					final Identifier tableName =
 							determineTable( mappingDocument, basicAttributeSource.getName(), basicAttributeSource );
 					final var secondaryTableJoin = entityTableXref.locateJoin( tableName );
-					final AttributeContainer attributeContainer;
-					final Table table;
-					if ( secondaryTableJoin == null ) {
-						table = entityDescriptor.getTable();
-						attributeContainer = entityDescriptor;
-					}
-					else {
-						table = secondaryTableJoin.getTable();
-						attributeContainer = secondaryTableJoin;
-					}
-
+					final var attributeContainer =
+							secondaryTableJoin == null
+									? entityDescriptor
+									: secondaryTableJoin;
+					final var table = attributeContainer.getTable();
 					final var attribute = createBasicAttribute(
 							mappingDocument,
 							basicAttributeSource,
@@ -913,22 +907,17 @@ private void bindAllEntityAttributes(
 							entityDescriptor.getClassName()
 					);
 
-					handleAttribute( attribute, secondaryTableJoin, attributeContainer, mappingDocument, entityDescriptor,
-							basicAttributeSource );
+					handleAttribute( attribute, secondaryTableJoin, attributeContainer, mappingDocument,
+							entityDescriptor, basicAttributeSource );
 				}
 				else if ( attributeSource instanceof SingularAttributeSourceEmbedded embeddedAttributeSource ) {
 					final Identifier tableName = determineTable( mappingDocument, embeddedAttributeSource );
 					final var secondaryTableJoin = entityTableXref.locateJoin( tableName );
-					final AttributeContainer attributeContainer;
-					final Table table;
-					if ( secondaryTableJoin == null ) {
-						table = entityDescriptor.getTable();
-						attributeContainer = entityDescriptor;
-					}
-					else {
-						table = secondaryTableJoin.getTable();
-						attributeContainer = secondaryTableJoin;
-					}
+					final var attributeContainer =
+							secondaryTableJoin == null
+									? entityDescriptor
+									: secondaryTableJoin;
+					final var table = attributeContainer.getTable();
 
 					final var attribute = createEmbeddedAttribute(
 							mappingDocument,
@@ -948,18 +937,14 @@ else if ( attributeSource instanceof SingularAttributeSourceEmbedded embeddedAtt
 				}
 				else if ( attributeSource instanceof SingularAttributeSourceManyToOne manyToOneAttributeSource ) {
 					final Identifier tableName =
-							determineTable( mappingDocument, manyToOneAttributeSource.getName(), manyToOneAttributeSource );
+							determineTable( mappingDocument, manyToOneAttributeSource.getName(),
+									manyToOneAttributeSource );
 					final var secondaryTableJoin = entityTableXref.locateJoin( tableName );
-					final AttributeContainer attributeContainer;
-					final Table table;
-					if ( secondaryTableJoin == null ) {
-						table = entityDescriptor.getTable();
-						attributeContainer = entityDescriptor;
-					}
-					else {
-						table = secondaryTableJoin.getTable();
-						attributeContainer = secondaryTableJoin;
-					}
+					final var attributeContainer =
+							secondaryTableJoin == null
+									? entityDescriptor
+									: secondaryTableJoin;
+					final var table = attributeContainer.getTable();
 
 					final var attribute = createManyToOneAttribute(
 							mappingDocument,
@@ -1000,16 +985,12 @@ else if ( attributeSource instanceof SingularAttributeSourceAny anyAttributeSour
 							anyAttributeSource.getKeySource().getRelationalValueSources()
 					);
 					final var secondaryTableJoin = entityTableXref.locateJoin( tableName );
-					final AttributeContainer attributeContainer;
-					final Table table;
-					if ( secondaryTableJoin == null ) {
-						table = entityDescriptor.getTable();
-						attributeContainer = entityDescriptor;
-					}
-					else {
-						table = secondaryTableJoin.getTable();
-						attributeContainer = secondaryTableJoin;
-					}
+					final var attributeContainer =
+							secondaryTableJoin == null
+									? entityDescriptor
+									: secondaryTableJoin;
+					final var table = attributeContainer.getTable();
+
 
 					final var attribute = createAnyAssociationAttribute(
 							mappingDocument,
@@ -1056,11 +1037,9 @@ private void handleNaturalIdBinding(
 			NaturalIdMutability naturalIdMutability) {
 		if ( naturalIdMutability != NaturalIdMutability.NOT_NATURAL_ID ) {
 			attributeBinding.setNaturalIdentifier( true );
-
 			if ( naturalIdMutability == NaturalIdMutability.IMMUTABLE ) {
 				attributeBinding.setUpdatable( false );
 			}
-
 			final var metadataCollector = mappingDocument.getMetadataCollector();
 			final String entityName = entityBinding.getEntityName();
 			var ukBinder = metadataCollector.locateNaturalIdUniqueKeyBinder( entityName );
@@ -1068,7 +1047,6 @@ private void handleNaturalIdBinding(
 				ukBinder = new NaturalIdUniqueKeyBinderImpl( mappingDocument, entityBinding );
 				metadataCollector.registerNaturalIdUniqueKeyBinder( entityName, ukBinder );
 			}
-
 			ukBinder.addAttributeBinding( attributeBinding );
 		}
 	}
@@ -1078,12 +1056,10 @@ private Property createPluralAttribute(
 			PluralAttributeSource attributeSource,
 			PersistentClass entityDescriptor) {
 		final Collection collectionBinding;
-
 		if ( attributeSource instanceof PluralAttributeSourceListImpl pluralAttributeSourceList ) {
-			final var list = new org.hibernate.mapping.List(sourceDocument, entityDescriptor);
+			final var list = new org.hibernate.mapping.List( sourceDocument, entityDescriptor );
 			collectionBinding = list;
 			bindCollectionMetadata( sourceDocument, attributeSource, collectionBinding );
-
 			registerSecondPass(
 					new PluralAttributeListSecondPass( sourceDocument, pluralAttributeSourceList, list ),
 					sourceDocument
@@ -1092,7 +1068,6 @@ private Property createPluralAttribute(
 		else if ( attributeSource instanceof PluralAttributeSourceSetImpl ) {
 			collectionBinding = new Set( sourceDocument, entityDescriptor );
 			bindCollectionMetadata( sourceDocument, attributeSource, collectionBinding );
-
 			registerSecondPass(
 					new PluralAttributeSetSecondPass( sourceDocument, attributeSource, collectionBinding ),
 					sourceDocument
@@ -1102,7 +1077,6 @@ else if ( attributeSource instanceof PluralAttributeSourceMapImpl pluralAttribut
 			final var map = new org.hibernate.mapping.Map( sourceDocument, entityDescriptor );
 			collectionBinding = map;
 			bindCollectionMetadata( sourceDocument, attributeSource, collectionBinding );
-
 			registerSecondPass(
 					new PluralAttributeMapSecondPass( sourceDocument, pluralAttributeSourceMap, map ),
 					sourceDocument
@@ -1111,7 +1085,6 @@ else if ( attributeSource instanceof PluralAttributeSourceMapImpl pluralAttribut
 		else if ( attributeSource instanceof PluralAttributeSourceBagImpl ) {
 			collectionBinding = new Bag( sourceDocument, entityDescriptor );
 			bindCollectionMetadata( sourceDocument, attributeSource, collectionBinding );
-
 			registerSecondPass(
 					new PluralAttributeBagSecondPass( sourceDocument, attributeSource, collectionBinding ),
 					sourceDocument
@@ -1120,19 +1093,16 @@ else if ( attributeSource instanceof PluralAttributeSourceBagImpl ) {
 		else if ( attributeSource instanceof PluralAttributeSourceIdBagImpl ) {
 			collectionBinding = new IdentifierBag( sourceDocument, entityDescriptor );
 			bindCollectionMetadata( sourceDocument, attributeSource, collectionBinding );
-
 			registerSecondPass(
 					new PluralAttributeIdBagSecondPass( sourceDocument, attributeSource, collectionBinding ),
 					sourceDocument
 			);
 		}
 		else if ( attributeSource instanceof PluralAttributeSourceArrayImpl arraySource ) {
-			final var array = new Array(sourceDocument, entityDescriptor);
+			final var array = new Array( sourceDocument, entityDescriptor );
 			collectionBinding = array;
 			bindCollectionMetadata( sourceDocument, attributeSource, collectionBinding );
-
 			array.setElementClassName( sourceDocument.qualifyClassName( arraySource.getElementClass() ) );
-
 			registerSecondPass(
 					new PluralAttributeArraySecondPass( sourceDocument, arraySource, array ),
 					sourceDocument
@@ -1142,7 +1112,6 @@ else if ( attributeSource instanceof PluralAttributeSourcePrimitiveArrayImpl plu
 			final var primitiveArray = new PrimitiveArray( sourceDocument, entityDescriptor );
 			collectionBinding = primitiveArray;
 			bindCollectionMetadata( sourceDocument, attributeSource, collectionBinding );
-
 			registerSecondPass(
 					new PluralAttributePrimitiveArraySecondPass(
 							sourceDocument,
@@ -1158,24 +1127,24 @@ else if ( attributeSource instanceof PluralAttributeSourcePrimitiveArrayImpl plu
 			);
 		}
 
-		sourceDocument.getMetadataCollector().addCollectionBinding( collectionBinding );
+		sourceDocument.getMetadataCollector()
+				.addCollectionBinding( collectionBinding );
 
 		final var attribute = new Property();
 		attribute.setValue( collectionBinding );
 		bindProperty( sourceDocument, attributeSource, attribute );
-
 		return attribute;
 	}
 
-	private void bindCollectionMetadata(MappingDocument mappingDocument, PluralAttributeSource source, Collection binding) {
+	private void bindCollectionMetadata(
+			MappingDocument mappingDocument, PluralAttributeSource source, Collection binding) {
 		binding.setRole( source.getAttributeRole().getFullPath() );
 		binding.setInverse( source.isInverse() );
 		binding.setMutable( source.isMutable() );
 		binding.setOptimisticLocked( source.isIncludedInOptimisticLocking() );
 
 		if ( source.getCustomPersisterClassName() != null ) {
-			DEPRECATION_LOGGER.debugf(
-					"Custom CollectionPersister impls are no longer supported - %s (%s)",
+			DEPRECATION_LOGGER.customCollectionPersister(
 					binding.getRole(),
 					mappingDocument.getOrigin().getName()
 			);
@@ -1183,39 +1152,11 @@ private void bindCollectionMetadata(MappingDocument mappingDocument, PluralAttri
 
 		applyCaching( mappingDocument, source.getCaching(), binding );
 
-		// bind the collection type info
-		String typeName = source.getTypeInformation().getName();
-		final Map<String,String> typeParameters = new HashMap<>();
-		if ( typeName != null ) {
-			// see if there is a corresponding type-def
-			final var typeDefinition =
-					mappingDocument.getMetadataCollector().getTypeDefinition( typeName );
-			if ( typeDefinition != null ) {
-				typeName = typeDefinition.getTypeImplementorClass().getName();
-				if ( typeDefinition.getParameters() != null ) {
-					typeParameters.putAll( typeDefinition.getParameters() );
-				}
-			}
-			else {
-				// it could be an unqualified class name, in which case we should qualify
-				// it with the implicit package name for this context, if one.
-				typeName = mappingDocument.qualifyClassName( typeName );
-			}
-		}
-		if ( source.getTypeInformation().getParameters() != null ) {
-			typeParameters.putAll( source.getTypeInformation().getParameters() );
-		}
+		bindCollectionType( mappingDocument, source, binding );
 
-		binding.setTypeName( typeName );
-		binding.setTypeParameters( typeParameters );
-
-		if ( source.getFetchCharacteristics().getFetchTiming() == FetchTiming.DELAYED ) {
-			binding.setLazy( true );
-			binding.setExtraLazy( source.getFetchCharacteristics().isExtraLazy() );
-		}
-		else {
-			binding.setLazy( false );
-		}
+		final var fetchCharacteristics = source.getFetchCharacteristics();
+		binding.setLazy( fetchCharacteristics.getFetchTiming() == FetchTiming.DELAYED );
+		binding.setExtraLazy( fetchCharacteristics.isExtraLazy() );
 
 		setupFetching( source, binding );
 
@@ -1226,23 +1167,16 @@ private void bindCollectionMetadata(MappingDocument mappingDocument, PluralAttri
 		binding.setLoaderName( source.getCustomLoaderName() );
 		bindCustomSql( source, binding );
 
-		if ( source instanceof Sortable sortable ) {
-			if ( sortable.isSorted() ) {
-				binding.setSorted( true );
-				final String comparatorName = sortable.getComparatorName();
-				if ( !comparatorName.equals( "natural" ) ) {
-					binding.setComparatorClassName( comparatorName );
-				}
-			}
-			else {
-				binding.setSorted( false );
+		if ( source instanceof Sortable sortable && sortable.isSorted() ) {
+			binding.setSorted( true );
+			final String comparatorName = sortable.getComparatorName();
+			if ( !comparatorName.equals( "natural" ) ) {
+				binding.setComparatorClassName( comparatorName );
 			}
 		}
 
-		if ( source instanceof Orderable orderable ) {
-			if ( orderable.isOrdered() ) {
-				binding.setOrderBy( orderable.getOrder() );
-			}
+		if ( source instanceof Orderable orderable && orderable.isOrdered() ) {
+			binding.setOrderBy( orderable.getOrder() );
 		}
 
 		final String cascadeStyle = source.getCascadeStyleName();
@@ -1261,64 +1195,101 @@ private void bindCollectionMetadata(MappingDocument mappingDocument, PluralAttri
 		}
 	}
 
+	private static void bindCollectionType(
+			MappingDocument mappingDocument, PluralAttributeSource source, Collection binding) {
+		// bind the collection type info
+		final String explicitTypeName = source.getTypeInformation().getName();
+		final Map<String, String> typeParameters = new HashMap<>();
+		final String typeName;
+		if ( explicitTypeName != null ) {
+			// see if there is a corresponding type-def
+			final var typeDefinition =
+					mappingDocument.getMetadataCollector()
+							.getTypeDefinition( explicitTypeName );
+			if ( typeDefinition != null ) {
+				typeName = typeDefinition.getTypeImplementorClass().getName();
+				final var parameters = typeDefinition.getParameters();
+				if ( parameters != null ) {
+					typeParameters.putAll( parameters );
+				}
+			}
+			else {
+				// it could be an unqualified class name, in which case qualify
+				// it with the implicit package name for this context, if one.
+				typeName = mappingDocument.qualifyClassName( explicitTypeName );
+			}
+		}
+		else {
+			typeName = null;
+		}
+		final var parameters = source.getTypeInformation().getParameters();
+		if ( parameters != null ) {
+			typeParameters.putAll( parameters );
+		}
+		binding.setTypeName( typeName );
+		binding.setTypeParameters( typeParameters );
+	}
+
 	private static void bindCustomSql(PluralAttributeSource source, Collection binding) {
-		if ( source.getCustomSqlInsert() != null ) {
+		final var customSqlInsert = source.getCustomSqlInsert();
+		if ( customSqlInsert != null ) {
 			binding.setCustomSQLInsert(
-					source.getCustomSqlInsert().sql(),
-					source.getCustomSqlInsert().callable(),
-					source.getCustomSqlInsert().checkStyle()
+					customSqlInsert.sql(),
+					customSqlInsert.callable(),
+					customSqlInsert.checkStyle()
 			);
 		}
-		if ( source.getCustomSqlUpdate() != null ) {
+
+		final var customSqlUpdate = source.getCustomSqlUpdate();
+		if ( customSqlUpdate != null ) {
 			binding.setCustomSQLUpdate(
-					source.getCustomSqlUpdate().sql(),
-					source.getCustomSqlUpdate().callable(),
-					source.getCustomSqlUpdate().checkStyle()
+					customSqlUpdate.sql(),
+					customSqlUpdate.callable(),
+					customSqlUpdate.checkStyle()
 			);
 		}
-		if ( source.getCustomSqlDelete() != null ) {
+
+		final var customSqlDelete = source.getCustomSqlDelete();
+		if ( customSqlDelete != null ) {
 			binding.setCustomSQLDelete(
-					source.getCustomSqlDelete().sql(),
-					source.getCustomSqlDelete().callable(),
-					source.getCustomSqlDelete().checkStyle()
+					customSqlDelete.sql(),
+					customSqlDelete.callable(),
+					customSqlDelete.checkStyle()
 			);
 		}
-		if ( source.getCustomSqlDeleteAll() != null ) {
+
+		final var customSqlDeleteAll = source.getCustomSqlDeleteAll();
+		if ( customSqlDeleteAll != null ) {
 			binding.setCustomSQLDeleteAll(
-					source.getCustomSqlDeleteAll().sql(),
-					source.getCustomSqlDeleteAll().callable(),
-					source.getCustomSqlDeleteAll().checkStyle()
+					customSqlDeleteAll.sql(),
+					customSqlDeleteAll.callable(),
+					customSqlDeleteAll.checkStyle()
 			);
 		}
 	}
 
 	private static void setupFetching(PluralAttributeSource source, Collection binding) {
-		switch ( source.getFetchCharacteristics().getFetchStyle() ) {
-			case SELECT:
-				binding.setFetchMode( FetchMode.SELECT );
-				break;
-			case JOIN:
-				binding.setFetchMode( FetchMode.JOIN );
-				break;
+		final var fetchCharacteristics = source.getFetchCharacteristics();
+		final var fetchStyle = fetchCharacteristics.getFetchStyle();
+		binding.setFetchMode( switch ( fetchStyle ) {
+			case SELECT, BATCH, SUBSELECT -> FetchMode.SELECT;
+			case JOIN -> FetchMode.JOIN;
+		} );
+		switch ( fetchStyle ) {
 			case BATCH:
-				binding.setFetchMode( FetchMode.SELECT );
-				binding.setBatchSize( source.getFetchCharacteristics().getBatchSize() );
+				binding.setBatchSize( fetchCharacteristics.getBatchSize() );
 				break;
 			case SUBSELECT:
-				binding.setFetchMode( FetchMode.SELECT );
 				binding.setSubselectLoadable( true );
-				// todo : this could totally be done using a "symbol map" approach
 				binding.getOwner().setSubselectLoadableCollections( true );
 				break;
-			default:
-				throw new AssertionFailure( "Unexpected FetchStyle : "
-											+ source.getFetchCharacteristics().getFetchStyle().name() );
 		}
 	}
 
 	private void applyCaching(MappingDocument mappingDocument, Caching caching, Collection collection) {
 		if ( isCacheEnabled( mappingDocument, caching ) ) {
-			collection.setCacheConcurrencyStrategy( getConcurrencyStrategy( mappingDocument, caching ).getExternalName() );
+			collection.setCacheConcurrencyStrategy(
+					getConcurrencyStrategy( mappingDocument, caching ).getExternalName() );
 			collection.setCacheRegionName( caching == null ? null : caching.getRegion() );
 		}
 	}
@@ -1327,7 +1298,8 @@ private Identifier determineTable(
 			MappingDocument sourceDocument,
 			String attributeName,
 			RelationalValueSourceContainer relationalValueSourceContainer) {
-		return determineTable( sourceDocument, attributeName, relationalValueSourceContainer.getRelationalValueSources() );
+		return determineTable( sourceDocument, attributeName,
+				relationalValueSourceContainer.getRelationalValueSources() );
 	}
 
 	private Identifier determineTable(
@@ -1335,39 +1307,14 @@ private Identifier determineTable(
 			SingularAttributeSourceEmbedded embeddedAttributeSource) {
 		Identifier tableName = null;
 		for ( var attributeSource : embeddedAttributeSource.getEmbeddableSource().attributeSources() ) {
-			final Identifier determinedName;
-			if ( attributeSource instanceof RelationalValueSourceContainer relationalValueSourceContainer ) {
-				determinedName = determineTable(
-						mappingDocument,
-						embeddedAttributeSource.getAttributeRole().getFullPath(),
-						relationalValueSourceContainer
-
-				);
-			}
-			else if ( attributeSource instanceof SingularAttributeSourceEmbedded singularAttributeSourceEmbedded ) {
-				determinedName = determineTable( mappingDocument, singularAttributeSourceEmbedded );
-			}
-			else if ( attributeSource instanceof SingularAttributeSourceAny singularAttributeSourceAny ) {
-				determinedName = determineTable(
-						mappingDocument,
-						attributeSource.getAttributeRole().getFullPath(),
-						singularAttributeSourceAny.getKeySource().getRelationalValueSources()
-				);
-			}
-			else {
-				continue;
-			}
-
-			if ( !Objects.equals( tableName, determinedName ) ) {
+			final Identifier determinedName =
+					determineTableName( mappingDocument, embeddedAttributeSource, attributeSource );
+			if ( determinedName != null && !determinedName.equals( tableName ) ) {
 				if ( tableName != null ) {
 					throw new MappingException(
-							String.format(
-									Locale.ENGLISH,
-									"Attribute [%s] referenced columns from multiple tables: %s, %s",
-									embeddedAttributeSource.getAttributeRole().getFullPath(),
-									tableName,
-									determinedName
-							),
+							"Attribute [%s] referenced columns from multiple tables: %s, %s"
+									.formatted( embeddedAttributeSource.getAttributeRole().getFullPath(),
+											tableName, determinedName ),
 							mappingDocument.getOrigin()
 					);
 				}
@@ -1377,6 +1324,30 @@ else if ( attributeSource instanceof SingularAttributeSourceAny singularAttribut
 		return tableName;
 	}
 
+	private Identifier determineTableName(MappingDocument mappingDocument, SingularAttributeSourceEmbedded embeddedAttributeSource, AttributeSource attributeSource) {
+		if ( attributeSource instanceof RelationalValueSourceContainer relationalValueSourceContainer ) {
+			return determineTable(
+					mappingDocument,
+					embeddedAttributeSource.getAttributeRole().getFullPath(),
+					relationalValueSourceContainer
+
+			);
+		}
+		else if ( attributeSource instanceof SingularAttributeSourceEmbedded singularAttributeSourceEmbedded ) {
+			return determineTable( mappingDocument, singularAttributeSourceEmbedded );
+		}
+		else if ( attributeSource instanceof SingularAttributeSourceAny singularAttributeSourceAny ) {
+			return determineTable(
+					mappingDocument,
+					attributeSource.getAttributeRole().getFullPath(),
+					singularAttributeSourceAny.getKeySource().getRelationalValueSources()
+			);
+		}
+		else {
+			return null;
+		}
+	}
+
 	private Identifier determineTable(
 			MappingDocument mappingDocument,
 			String attributeName,
@@ -1385,20 +1356,16 @@ private Identifier determineTable(
 		for ( var relationalValueSource : relationalValueSources ) {
 			// We need to get the containing table name for both columns and formulas,
 			// particularly when a column/formula is for a property on a secondary table.
-			if ( !Objects.equals( tableName, relationalValueSource.getContainingTableName() ) ) {
+			final String containingTableName = relationalValueSource.getContainingTableName();
+			if ( !Objects.equals( tableName, containingTableName ) ) {
 				if ( tableName != null ) {
 					throw new MappingException(
-							String.format(
-									Locale.ENGLISH,
-									"Attribute [%s] referenced columns from multiple tables: %s, %s",
-									attributeName,
-									tableName,
-									relationalValueSource.getContainingTableName()
-							),
+							"Attribute [%s] referenced columns from multiple tables: %s, %s"
+									.formatted( attributeName, tableName, containingTableName ),
 							mappingDocument.getOrigin()
 					);
 				}
-				tableName = relationalValueSource.getContainingTableName();
+				tableName = containingTableName;
 			}
 		}
 		return database.toIdentifier( tableName );
@@ -1414,23 +1381,24 @@ private void bindSecondaryTable(
 		final var tableSpecificationSource = secondaryTableSource.getTableSource();
 		final var namespace = locateTableNamespace( tableSpecificationSource );
 
-		Table secondaryTable;
+		final Table secondaryTable;
 		final Identifier logicalTableName;
 		if ( tableSpecificationSource instanceof TableSource tableSource ) {
 			logicalTableName = database.toIdentifier( tableSource.getExplicitTableName() );
-			secondaryTable = namespace.locateTable( logicalTableName );
-			if ( secondaryTable == null ) {
+			final var locatedTable = namespace.locateTable( logicalTableName );
+			if ( locatedTable == null ) {
 				secondaryTable =
-						namespace.createTable( logicalTableName,
-								identifier -> new Table( mappingDocument.getCurrentContributorName(), namespace, identifier, false ) );
+						namespace.createTable( logicalTableName, identifier ->
+								new Table( mappingDocument.getCurrentContributorName(),
+										namespace, identifier, false ) );
 			}
 			else {
+				secondaryTable = locatedTable;
 				secondaryTable.setAbstract( false );
 			}
 			secondaryTable.setComment( tableSource.getComment() );
 		}
-		else {
-			final var inLineViewSource = (InLineViewSource) tableSpecificationSource;
+		else if ( tableSpecificationSource instanceof InLineViewSource inLineViewSource ) {
 			logicalTableName = toIdentifier( inLineViewSource.getLogicalName() );
 			secondaryTable = new Table(
 					metadataBuildingContext.getCurrentContributorName(),
@@ -1439,6 +1407,9 @@ private void bindSecondaryTable(
 					false
 			);
 		}
+		else {
+			throw new AssertionFailure( "Unexpected table specification source type" );
+		}
 
 		secondaryTableJoin.setTable( secondaryTable );
 		entityTableXref.addSecondaryTable( mappingDocument, logicalTableName, secondaryTableJoin );
@@ -1456,13 +1427,14 @@ private void bindSecondaryTable(
 		}
 
 		final var keyBinding =
-				new DependantValue( mappingDocument, secondaryTable, persistentClass.getIdentifier() );
+				new DependantValue( mappingDocument, secondaryTable,
+						persistentClass.getIdentifier() );
 		if ( mappingDocument.getBuildingOptions().useNationalizedCharacterData() ) {
 			keyBinding.makeNationalized();
 		}
 		secondaryTableJoin.setKey( keyBinding );
 
-		keyBinding.setOnDeleteAction( getOnDeleteAction( secondaryTableSource.isCascadeDeleteEnabled() ) );
+		keyBinding.setOnDeleteAction( getOnDeleteAction( secondaryTableSource ) );
 
 		// NOTE: no Type info to bind...
 
@@ -1473,6 +1445,7 @@ private void bindSecondaryTable(
 				secondaryTableSource.isOptional(),
 				new RelationalObjectBinder.ColumnNamingDelegate() {
 					int count = 0;
+
 					@Override
 					public Identifier determineImplicitName(LocalMetadataBuildingContext context) {
 						return entityTableXref.getPrimaryTable().getPrimaryKey().getColumn( count++ )
@@ -1482,7 +1455,8 @@ public Identifier determineImplicitName(LocalMetadataBuildingContext context) {
 		);
 
 		keyBinding.sortProperties();
-		setForeignKeyName( keyBinding, secondaryTableSource.getExplicitForeignKeyName() );
+		setForeignKeyName( keyBinding,
+				secondaryTableSource.getExplicitForeignKeyName() );
 
 		// skip creating primary and foreign keys for a subselect.
 		if ( secondaryTable.getSubselect() == null ) {
@@ -1604,13 +1578,13 @@ private static BasicType<?> getBasicType(SingularAttributeSourceBasic attributeS
 
 	private static boolean isLob(Integer sqlType, String sqlTypeName) {
 		if ( sqlType != null ) {
-			return switch (sqlType) {
+			return switch ( sqlType ) {
 				case Types.BLOB, Types.CLOB, Types.NCLOB -> true;
 				default -> false;
 			};
 		}
 		else if ( sqlTypeName != null ) {
-			return switch ( sqlTypeName.toLowerCase(Locale.ROOT) ) {
+			return switch ( sqlTypeName.toLowerCase( Locale.ROOT ) ) {
 				case "blob", "clob", "nclob" -> true;
 				default -> false;
 			};
@@ -1633,15 +1607,8 @@ private Property createOneToOneAttribute(
 				oneToOneSource.getAttributeRole()
 		);
 
-		final String propertyRef = oneToOneBinding.getReferencedPropertyName();
-		if ( propertyRef != null ) {
-			handlePropertyReference(
-					sourceDocument,
-					oneToOneBinding.getReferencedEntityName(),
-					propertyRef,
-					"<one-to-one name=\"" + oneToOneSource.getName() + "\"/>"
-			);
-		}
+		handlePropertyRef( sourceDocument, oneToOneBinding,
+				"<one-to-one name=\"" + oneToOneSource.getName() + "\"/>" );
 
 		// Defer the creation of the foreign key as we need the
 		// associated entity persister to be initialized so that
@@ -1656,25 +1623,36 @@ private Property createOneToOneAttribute(
 		return property;
 	}
 
+	private void handlePropertyRef(
+			MappingDocument sourceDocument,
+			ToOne binding,
+			String synopsis) {
+		final String propertyRef = binding.getReferencedPropertyName();
+		if ( propertyRef != null ) {
+			handlePropertyReference(
+					sourceDocument,
+					binding.getReferencedEntityName(),
+					propertyRef,
+					synopsis
+			);
+		}
+	}
+
 	private void handlePropertyReference(
 			MappingDocument mappingDocument,
 			String referencedEntityName,
 			String referencedPropertyName,
 			String sourceElementSynopsis) {
-		final var entityBinding =
-				mappingDocument.getMetadataCollector()
-						.getEntityBinding( referencedEntityName );
+		final var collector = mappingDocument.getMetadataCollector();
+		final var entityBinding = collector.getEntityBinding( referencedEntityName );
 		if ( entityBinding == null ) {
 			// entity may just not have been processed yet - set up a delayed handler
 			registerDelayedPropertyReferenceHandler(
-					new DelayedPropertyReferenceHandlerImpl(
-							referencedEntityName,
-							referencedPropertyName,
-							true,
-							sourceElementSynopsis,
-							mappingDocument.getOrigin()
-					),
-					mappingDocument
+					mappingDocument,
+					referencedEntityName,
+					referencedPropertyName,
+					sourceElementSynopsis,
+					collector
 			);
 		}
 		else {
@@ -1683,14 +1661,11 @@ private void handlePropertyReference(
 			if ( propertyBinding == null ) {
 				// attribute may just not have been processed yet - set up a delayed handler
 				registerDelayedPropertyReferenceHandler(
-						new DelayedPropertyReferenceHandlerImpl(
-								referencedEntityName,
-								referencedPropertyName,
-								true,
-								sourceElementSynopsis,
-								mappingDocument.getOrigin()
-						),
-						mappingDocument
+						mappingDocument,
+						referencedEntityName,
+						referencedPropertyName,
+						sourceElementSynopsis,
+						collector
 				);
 			}
 			else {
@@ -1700,21 +1675,33 @@ private void handlePropertyReference(
 						referencedPropertyName,
 						sourceElementSynopsis
 				);
-				( (SimpleValue) propertyBinding.getValue() ).setAlternateUniqueKey( true );
+				( (SimpleValue) propertyBinding.getValue() )
+						.setAlternateUniqueKey( true );
 			}
 		}
 	}
 
 	private void registerDelayedPropertyReferenceHandler(
-			DelayedPropertyReferenceHandlerImpl handler,
-			MetadataBuildingContext buildingContext) {
+			MappingDocument mappingDocument,
+			String referencedEntityName,
+			String referencedPropertyName,
+			String sourceElementSynopsis,
+			InFlightMetadataCollector collector) {
+		final var handler =
+				new DelayedPropertyReferenceHandlerImpl(
+						referencedEntityName,
+						referencedPropertyName,
+						true,
+						sourceElementSynopsis,
+						mappingDocument.getOrigin()
+				);
 		BOOT_LOGGER.tracef(
 				"Property [%s.%s] referenced by property-ref [%s] was not yet available - creating delayed handler",
 				handler.referencedEntityName,
 				handler.referencedPropertyName,
 				handler.sourceElementSynopsis
 		);
-		buildingContext.getMetadataCollector().addDelayedPropertyReferenceHandler( handler );
+		collector.addDelayedPropertyReferenceHandler( handler );
 	}
 
 	public void bindOneToOne(
@@ -1729,19 +1716,8 @@ public void bindOneToOne(
 				oneToOneBinding
 		);
 
-
 		if ( oneToOneSource.isConstrained() ) {
-			final String cascadeStyleName = oneToOneSource.getCascadeStyleName();
-			if ( cascadeStyleName != null && cascadeStyleName.contains( "delete-orphan" ) ) {
-				throw new MappingException(
-						String.format(
-								Locale.ENGLISH,
-								"one-to-one attribute [%s] cannot specify orphan delete cascading as it is constrained",
-								oneToOneSource.getAttributeRole().getFullPath()
-						),
-						sourceDocument.getOrigin()
-				);
-			}
+			checkConstrainedOneToOneOrphanDelete( sourceDocument, oneToOneSource );
 			oneToOneBinding.setConstrained( true );
 			oneToOneBinding.setForeignKeyType( ForeignKeyDirection.FROM_PARENT );
 		}
@@ -1749,15 +1725,7 @@ public void bindOneToOne(
 			oneToOneBinding.setForeignKeyType( ForeignKeyDirection.TO_PARENT );
 		}
 
-		final var fetchCharacteristics = oneToOneSource.getFetchCharacteristics();
-		oneToOneBinding.setLazy( fetchCharacteristics.getFetchTiming() == FetchTiming.DELAYED );
-		oneToOneBinding.setFetchMode(
-				fetchCharacteristics.getFetchStyle() == FetchStyle.SELECT
-						? FetchMode.SELECT
-						: FetchMode.JOIN
-		);
-		oneToOneBinding.setUnwrapProxy( fetchCharacteristics.isUnwrapProxies() );
-
+		handleFetchCharacteristics( oneToOneSource, oneToOneBinding );
 
 		final String referencedEntityAttributeName = oneToOneSource.getReferencedEntityAttributeName();
 		if ( isNotEmpty( referencedEntityAttributeName ) ) {
@@ -1775,11 +1743,21 @@ public void bindOneToOne(
 			DEPRECATION_LOGGER.logDeprecationOfEmbedXmlSupport();
 		}
 
-		if ( isNotEmpty( oneToOneSource.getExplicitForeignKeyName() ) ) {
-			setForeignKeyName( oneToOneBinding, oneToOneSource.getExplicitForeignKeyName() );
-		}
+		setForeignKeyName( oneToOneBinding,
+				oneToOneSource.getExplicitForeignKeyName() );
 
-		oneToOneBinding.setOnDeleteAction( getOnDeleteAction( oneToOneSource.isCascadeDeleteEnabled() ) );
+		oneToOneBinding.setOnDeleteAction( getOnDeleteAction( oneToOneSource ) );
+	}
+
+	private static void handleFetchCharacteristics(SingularAttributeSourceToOne toOneSource, ToOne toOneBinding) {
+		final var fetchCharacteristics = toOneSource.getFetchCharacteristics();
+		toOneBinding.setLazy( fetchCharacteristics.getFetchTiming() == FetchTiming.DELAYED );
+		toOneBinding.setFetchMode(
+				fetchCharacteristics.getFetchStyle() == FetchStyle.SELECT
+						? FetchMode.SELECT
+						: FetchMode.JOIN
+		);
+		toOneBinding.setUnwrapProxy( fetchCharacteristics.isUnwrapProxies() );
 	}
 
 	private Property createManyToOneAttribute(
@@ -1787,18 +1765,42 @@ private Property createManyToOneAttribute(
 			SingularAttributeSourceManyToOne manyToOneSource,
 			ManyToOne manyToOneBinding,
 			String containingClassName) {
-		final String attributeName = manyToOneSource.getName();
+		final String referencedEntityName =
+				handleReferencedEntity( sourceDocument, manyToOneSource, manyToOneBinding, containingClassName );
+
+		if ( manyToOneSource.isUnique() ) {
+			manyToOneBinding.markAsLogicalOneToOne();
+		}
 
+		bindManyToOneAttribute( sourceDocument, manyToOneSource, manyToOneBinding, referencedEntityName );
+
+		handlePropertyRef( sourceDocument, manyToOneBinding,
+				"<many-to-one name=\"" + manyToOneSource.getName() + "\"/>" );
+
+		final var property = new Property();
+		property.setValue( manyToOneBinding );
+		bindProperty( sourceDocument, manyToOneSource, property );
+
+		checkManyToOneOrphanDelete( sourceDocument, manyToOneSource, manyToOneBinding );
+
+		return property;
+	}
+
+	private String handleReferencedEntity(
+			MappingDocument sourceDocument,
+			SingularAttributeSourceManyToOne manyToOneSource,
+			ManyToOne manyToOneBinding,
+			String containingClassName) {
 		final String explicitReferencedEntityName = manyToOneSource.getReferencedEntityName();
-		final String referencedEntityName;
 		if ( explicitReferencedEntityName != null ) {
-			referencedEntityName = explicitReferencedEntityName;
+			return explicitReferencedEntityName;
 		}
 		else {
+			final String attributeName = manyToOneSource.getName();
 			final var reflectedPropertyClass =
 					reflectedPropertyClass( sourceDocument, containingClassName, attributeName );
 			if ( reflectedPropertyClass != null ) {
-				referencedEntityName = reflectedPropertyClass.getName();
+				return reflectedPropertyClass.getName();
 			}
 			else {
 				prepareValueTypeViaReflection(
@@ -1808,57 +1810,50 @@ private Property createManyToOneAttribute(
 						attributeName,
 						manyToOneSource.getAttributeRole()
 				);
-				referencedEntityName = manyToOneBinding.getTypeName();
+				return manyToOneBinding.getTypeName();
 			}
 		}
+	}
 
-		if ( manyToOneSource.isUnique() ) {
-			manyToOneBinding.markAsLogicalOneToOne();
-		}
-
-		bindManyToOneAttribute( sourceDocument, manyToOneSource, manyToOneBinding, referencedEntityName );
-
-		final String propertyRef = manyToOneBinding.getReferencedPropertyName();
-		if ( propertyRef != null ) {
-			handlePropertyReference(
-					sourceDocument,
-					manyToOneBinding.getReferencedEntityName(),
-					propertyRef,
-					"<many-to-one name=\"" + manyToOneSource.getName() + "\"/>"
+	private static void checkManyToOneOrphanDelete(
+			MappingDocument sourceDocument,
+			SingularAttributeSourceManyToOne manyToOneSource,
+			ManyToOne manyToOneBinding) {
+		// TODO: would be better to delay this until the end of binding (second pass, etc)
+		//       in order to properly allow for a singular unique column for a many-to-one to
+		//       to also trigger a "logical one-to-one". As is, this can occasionally lead to
+		//       false exceptions if the many-to-one column binding is delayed and the
+		//       uniqueness is indicated on the <column/> rather than on the <many-to-one/>
+		//
+		//       Ideally, would love to see a SimpleValue#validate approach, rather than a
+		//       SimpleValue#isValid that is then handled at a higher level (Property, etc).
+		//       The reason being that the current approach misses the exact reason a
+		//       "validation" fails since it loses "context"
+		final String cascadeStyleName = manyToOneSource.getCascadeStyleName();
+		if ( cascadeStyleName != null && cascadeStyleName.contains( "delete-orphan" )
+				&& !manyToOneBinding.isLogicalOneToOne() ) {
+			throw new MappingException(
+					"""
+					many-to-one attribute [%s] specified delete-orphan but is not specified as unique; \
+					remove delete-orphan cascading or specify unique="true"
+					"""
+							.formatted( manyToOneSource.getAttributeRole().getFullPath() ),
+					sourceDocument.getOrigin()
 			);
 		}
+	}
 
-		final var property = new Property();
-		property.setValue( manyToOneBinding );
-		bindProperty( sourceDocument, manyToOneSource, property );
-
-		if ( isNotEmpty( manyToOneSource.getCascadeStyleName() ) ) {
-			// todo : would be better to delay this the end of binding (second pass, etc)
-			// in order to properly allow for a singular unique column for a many-to-one to
-			// also trigger a "logical one-to-one".  As-is, this can occasionally lead to
-			// false exceptions if the many-to-one column binding is delayed and the
-			// uniqueness is indicated on the <column/> rather than on the <many-to-one/>
-			//
-			// Ideally, would love to see a SimpleValue#validate approach, rather than a
-			// SimpleValue#isValid that is then handled at a higher level (Property, etc).
-			// The reason being that the current approach misses the exact reason
-			// a "validation" fails since it loses "context"
-			if ( manyToOneSource.getCascadeStyleName().contains( "delete-orphan" ) ) {
-				if ( !manyToOneBinding.isLogicalOneToOne() ) {
-					throw new MappingException(
-							String.format(
-									Locale.ENGLISH,
-									"many-to-one attribute [%s] specified delete-orphan but is not specified as unique; " +
-											"remove delete-orphan cascading or specify unique=\"true\"",
-									manyToOneSource.getAttributeRole().getFullPath()
-							),
-							sourceDocument.getOrigin()
-					);
-				}
-			}
+	private static void checkConstrainedOneToOneOrphanDelete(
+			MappingDocument sourceDocument,
+			SingularAttributeSourceOneToOne oneToOneSource) {
+		final String cascadeStyleName = oneToOneSource.getCascadeStyleName();
+		if ( cascadeStyleName != null && cascadeStyleName.contains( "delete-orphan" ) ) {
+			throw new MappingException(
+					"one-to-one attribute [%s] cannot specify orphan delete cascading as it is constrained"
+							.formatted( oneToOneSource.getAttributeRole().getFullPath() ),
+					sourceDocument.getOrigin()
+			);
 		}
-
-		return property;
 	}
 
 	private void bindManyToOneAttribute(
@@ -1868,24 +1863,10 @@ private void bindManyToOneAttribute(
 			String referencedEntityName) {
 		// NOTE: no type information to bind
 
-		manyToOneBinding.setReferencedEntityName( referencedEntityName );
-		final String referencedEntityAttributeName = manyToOneSource.getReferencedEntityAttributeName();
-		if ( isNotEmpty( referencedEntityAttributeName ) ) {
-			manyToOneBinding.setReferencedPropertyName( referencedEntityAttributeName );
-			manyToOneBinding.setReferenceToPrimaryKey( false );
-		}
-		else {
-			manyToOneBinding.setReferenceToPrimaryKey( true );
-		}
+		handleReferencedEntity( manyToOneBinding, referencedEntityName,
+				manyToOneSource.getReferencedEntityAttributeName() );
 
-		final var fetchCharacteristics = manyToOneSource.getFetchCharacteristics();
-		manyToOneBinding.setLazy( fetchCharacteristics.getFetchTiming() == FetchTiming.DELAYED );
-		manyToOneBinding.setUnwrapProxy( fetchCharacteristics.isUnwrapProxies() );
-		manyToOneBinding.setFetchMode(
-				fetchCharacteristics.getFetchStyle() == FetchStyle.SELECT
-						? FetchMode.SELECT
-						: FetchMode.JOIN
-		);
+		handleFetchCharacteristics( manyToOneSource, manyToOneBinding );
 
 		if ( manyToOneSource.isEmbedXml() == Boolean.TRUE ) {
 			DEPRECATION_LOGGER.logDeprecationOfEmbedXmlSupport();
@@ -1893,7 +1874,8 @@ private void bindManyToOneAttribute(
 
 		manyToOneBinding.setIgnoreNotFound( manyToOneSource.isIgnoreNotFound() );
 
-		setForeignKeyName( manyToOneBinding, manyToOneSource.getExplicitForeignKeyName() );
+		setForeignKeyName( manyToOneBinding,
+				manyToOneSource.getExplicitForeignKeyName() );
 
 		final var columnBinder = new ManyToOneColumnBinder(
 				sourceDocument,
@@ -1918,7 +1900,6 @@ private void bindManyToOneAttribute(
 					manyToOneBinding,
 					referencedEntityName
 			);
-
 			if ( canBindColumnsImmediately && fkSecondPass.canProcessImmediately() ) {
 				fkSecondPass.doSecondPass( null );
 			}
@@ -1927,7 +1908,19 @@ private void bindManyToOneAttribute(
 			}
 		}
 
-		manyToOneBinding.setOnDeleteAction( getOnDeleteAction( manyToOneSource.isCascadeDeleteEnabled() ) );
+		manyToOneBinding.setOnDeleteAction( getOnDeleteAction( manyToOneSource ) );
+	}
+
+	private static void handleReferencedEntity(
+			ManyToOne manyToOneBinding, String referencedEntityName, String referencedEntityAttributeName) {
+		manyToOneBinding.setReferencedEntityName( referencedEntityName );
+		if ( isNotEmpty( referencedEntityAttributeName ) ) {
+			manyToOneBinding.setReferencedPropertyName( referencedEntityAttributeName );
+			manyToOneBinding.setReferenceToPrimaryKey( false );
+		}
+		else {
+			manyToOneBinding.setReferenceToPrimaryKey( true );
+		}
 	}
 
 	private static void setForeignKeyName(SimpleValue manyToOneBinding, String foreignKeyName) {
@@ -1946,13 +1939,9 @@ private Property createAnyAssociationAttribute(
 			SingularAttributeSourceAny anyMapping,
 			Any anyBinding,
 			String entityName) {
-
 		final var attributeRole = anyMapping.getAttributeRole();
-
 		bindAny( sourceDocument, anyMapping, anyBinding, attributeRole );
-
 		prepareValueTypeViaReflection( sourceDocument, anyBinding, entityName, anyMapping.getName(), attributeRole );
-
 		anyBinding.createForeignKey();
 
 		final var property = new Property();
@@ -1989,9 +1978,7 @@ private void bindAny(
 				discriminatorSource.getRelationalValueSource(),
 				anyBinding.getMetaMapping(),
 				true,
-				context -> implicitNamingStrategy.determineAnyDiscriminatorColumnName(
-						discriminatorSource
-				)
+				context -> implicitNamingStrategy.determineAnyDiscriminatorColumnName( discriminatorSource )
 		);
 
 		relationalObjectBinder.bindColumnsAndFormulas(
@@ -1999,9 +1986,7 @@ private void bindAny(
 				anyMapping.getKeySource().getRelationalValueSources(),
 				anyBinding.getKeyMapping(),
 				true,
-				context -> implicitNamingStrategy.determineAnyKeyColumnName(
-						anyMapping.getKeySource()
-				)
+				context -> implicitNamingStrategy.determineAnyKeyColumnName( anyMapping.getKeySource() )
 		);
 	}
 
@@ -2022,35 +2007,30 @@ private BasicType<?> anyDiscriminatorType(Any anyBinding, TypeResolution discrim
 			);
 		}
 		else {
-			return metadataBuildingContext.getBootstrapContext()
-					.getTypeConfiguration().getBasicTypeRegistry()
-					.resolve( StandardBasicTypes.STRING );
+			return
+					metadataBuildingContext.getBootstrapContext().getTypeConfiguration().getBasicTypeRegistry()
+							.resolve( StandardBasicTypes.STRING );
 		}
 	}
 
-	private static HashMap<Object, String> discriminatorValueToEntityNameMap(
+	private static Map<DiscriminatorValue, String> discriminatorValueToEntityNameMap(
 			MappingDocument sourceDocument,
 			AnyMappingSource anyMapping,
 			AttributeRole attributeRole,
 			BasicType<?> discriminatorType) {
-		final HashMap<Object,String> discriminatorValueToEntityNameMap = new HashMap<>();
+		final Map<DiscriminatorValue, String> discriminatorValueToEntityNameMap = new HashMap<>();
 		anyMapping.getDiscriminatorSource().getValueMappings().forEach(
 				(discriminatorValueString, entityName) -> {
 					try {
 						final Object discriminatorValue =
 								discriminatorType.getJavaTypeDescriptor()
 										.fromString( discriminatorValueString );
-						discriminatorValueToEntityNameMap.put( discriminatorValue, entityName );
+						discriminatorValueToEntityNameMap.put( new DiscriminatorValue.Literal( discriminatorValue ), entityName );
 					}
 					catch (Exception exception) {
 						throw new MappingException(
-								String.format(
-										Locale.ENGLISH,
-										"Unable to interpret <meta-value value=\"%s\" class=\"%s\"/> defined as part of <any/> attribute [%s]",
-										discriminatorValueString,
-										entityName,
-										attributeRole.getFullPath()
-								),
+								"Unable to interpret <meta-value value=\"%s\" class=\"%s\"/> defined as part of <any/> attribute [%s]"
+										.formatted( discriminatorValueString, entityName, attributeRole.getFullPath() ),
 								exception,
 								sourceDocument.getOrigin()
 						);
@@ -2062,7 +2042,7 @@ private static HashMap<Object, String> discriminatorValueToEntityNameMap(
 
 	private BasicType<?> resolveExplicitlyNamedAnyDiscriminatorType(
 			String typeName,
-			Map<String,String> parameters,
+			Map<String, String> parameters,
 			Any.MetaValue discriminatorMapping) {
 		final var bootstrapContext = metadataBuildingContext.getBootstrapContext();
 		final var typeConfiguration = bootstrapContext.getTypeConfiguration();
@@ -2111,11 +2091,8 @@ private BasicType<?> resolveExplicitlyNamedAnyDiscriminatorType(
 			}
 
 			throw new org.hibernate.MappingException(
-					String.format(
-							Locale.ROOT,
-							"Unable to resolve explicit any-discriminator type name - %s",
-							typeName
-					)
+					"Unable to resolve explicit any-discriminator type name:"
+					+ typeName
 			);
 		}
 	}
@@ -2139,13 +2116,10 @@ private void prepareValueTypeViaReflection(
 			AttributeRole attributeRole) {
 		if ( StringHelper.isEmpty( propertyName ) ) {
 			throw new MappingException(
-					String.format(
-							Locale.ENGLISH,
-							"Attribute mapping must define a name attribute: containingClassName=[%s], propertyName=[%s], role=[%s]",
-							containingClassName,
-							propertyName,
-							attributeRole.getFullPath()
-					),
+					"Attribute mapping must define a name attribute:"
+					+ " containingClassName=[%s], propertyName=[%s], role=[%s]"
+							.formatted( containingClassName, propertyName,
+									attributeRole.getFullPath() ),
 					sourceDocument.getOrigin()
 			);
 		}
@@ -2153,15 +2127,12 @@ private void prepareValueTypeViaReflection(
 		try {
 			value.setTypeUsingReflection( containingClassName, propertyName );
 		}
-		catch (org.hibernate.MappingException ome) {
+		catch (MappingException ome) {
 			throw new MappingException(
-					String.format(
-							Locale.ENGLISH,
-							"Error calling Value#setTypeUsingReflection: containingClassName=[%s], propertyName=[%s], role=[%s]",
-							containingClassName,
-							propertyName,
-							attributeRole.getFullPath()
-					),
+					"Error calling Value#setTypeUsingReflection:"
+					+ " containingClassName=[%s], propertyName=[%s], role=[%s]"
+							.formatted( containingClassName, propertyName,
+									attributeRole.getFullPath() ),
 					ome,
 					sourceDocument.getOrigin()
 			);
@@ -2194,13 +2165,15 @@ private void bindProperty(
 			property.setUpdatable( singularAttributeSource.isUpdatable() );
 			// isBytecodeLazy() refers to whether a property is lazy via bytecode enhancement (not proxies)
 			property.setLazy( singularAttributeSource.isBytecodeLazy() );
-			handleGenerationTiming( mappingDocument, propertySource, property, singularAttributeSource.getGenerationTiming() );
+			handleGenerationTiming( mappingDocument, propertySource, property,
+					singularAttributeSource.getGenerationTiming() );
 		}
 
 		property.setMetaAttributes( propertySource.getToolingHintContext().getMetaAttributeMap() );
 
 		if ( BOOT_LOGGER.isTraceEnabled() ) {
-			BOOT_LOGGER.trace( "Mapped property: " + propertySource.getName() + " -> [" + columns( property.getValue() ) + "]" );
+			BOOT_LOGGER.mappedProperty( propertySource.getName(),
+					columns( property.getValue() ) );
 		}
 	}
 
@@ -2240,7 +2213,8 @@ private static void handleGenerationTiming(
 				);
 			}
 			if ( timing != GenerationTiming.NEVER ) {
-				property.setValueGeneratorCreator(context -> new GeneratedGeneration( timing.getEventTypes() ) );
+				property.setValueGeneratorCreator( context
+						-> new GeneratedGeneration( timing.getEventTypes() ) );
 
 				// generated properties can *never* be insertable...
 				if ( property.isInsertable() && timing.includesInsert() ) {
@@ -2342,7 +2316,7 @@ else if ( isVirtual ) {
 
 	private void createUniqueKeyForEmbeddable(Component componentBinding) {
 		final ArrayList<Column> columns = new ArrayList<>();
-		for ( var selectable: componentBinding.getSelectables() ) {
+		for ( var selectable : componentBinding.getSelectables() ) {
 			if ( selectable instanceof Column column ) {
 				columns.add( column );
 			}
@@ -2362,8 +2336,9 @@ private static void bindVirtual(String role, Component componentBinding) {
 		// virtual (what used to be called embedded) is just a conceptual composition...
 		// <properties/> for example
 		if ( componentBinding.getOwner().hasPojoRepresentation() ) {
-			BOOT_LOGGER.bindingVirtualComponentToOwner( role, componentBinding.getOwner().getClassName() );
-			componentBinding.setComponentClassName( componentBinding.getOwner().getClassName() );
+			final String ownerClassName = componentBinding.getOwner().getClassName();
+			BOOT_LOGGER.bindingVirtualComponentToOwner( role, ownerClassName );
+			componentBinding.setComponentClassName( ownerClassName );
 		}
 		else {
 			BOOT_LOGGER.bindingVirtualComponentAsDynamic( role );
@@ -2383,7 +2358,7 @@ private static void bindComponent(
 			try {
 				final Class<?> componentClass =
 						sourceDocument.getBootstrapContext().getClassLoaderAccess()
-							.classForName( explicitComponentClassName );
+								.classForName( explicitComponentClassName );
 				if ( CompositeUserType.class.isAssignableFrom( componentClass ) ) {
 					@SuppressWarnings("unchecked") // Safe, we just checked
 					final var compositeTypeClass =
@@ -2484,13 +2459,9 @@ else if ( attributeSource instanceof PluralAttributeSource pluralAttributeSource
 			}
 			else {
 				throw new AssertionFailure(
-						String.format(
-								Locale.ENGLISH,
-								"Unexpected AttributeSource subtype [%s] as part of composite [%s]",
-								attributeSource.getClass().getName(),
-								attributeSource.getAttributeRole().getFullPath()
-						)
-
+						"Unexpected AttributeSource subtype [%s] as part of composite [%s]"
+								.formatted( attributeSource.getClass().getName(),
+										attributeSource.getAttributeRole().getFullPath() )
 				);
 			}
 
@@ -2524,45 +2495,37 @@ private static void bindSimpleValueType(
 		// otherwise no explicit type info was found
 	}
 
-	private static class TypeResolution {
-		private final String typeName;
-		private final Map<String,String> parameters;
-
-		public TypeResolution(String typeName, Map<String,String> parameters) {
-			this.typeName = typeName;
-			this.parameters = parameters;
-		}
-	}
+	private record TypeResolution(String typeName, Map<String, String> parameters) {}
 
 	private static TypeResolution resolveType(
 			MappingDocument sourceDocument,
 			HibernateTypeSource typeSource) {
-		if ( StringHelper.isEmpty( typeSource.getName() ) ) {
+		final String typeSourceName = typeSource.getName();
+		if ( StringHelper.isEmpty( typeSourceName ) ) {
 			return null;
 		}
 
 		final var typeDefinition =
 				sourceDocument.getMetadataCollector()
-						.getTypeDefinition( typeSource.getName() );
-		final Map<String,String> typeParameters = new HashMap<>();
+						.getTypeDefinition( typeSourceName );
+		final Map<String, String> typeParameters = new HashMap<>();
 		final String typeName;
 		if ( typeDefinition == null ) {
-			typeName = typeSource.getName();
+			typeName = typeSourceName;
 		}
 		else {
 			// the explicit name referred to a type-def
 			typeName = typeDefinition.getTypeImplementorClass().getName();
-			if ( typeDefinition.getParameters() != null ) {
-				typeParameters.putAll( typeDefinition.getParameters() );
+			final var parameters = typeDefinition.getParameters();
+			if ( parameters != null ) {
+				typeParameters.putAll( parameters );
 			}
 		}
-
 		// parameters on the property mapping should override parameters in the type-def
 		final var parameters = typeSource.getParameters();
 		if ( parameters != null ) {
 			typeParameters.putAll( parameters );
 		}
-
 		return new TypeResolution( typeName, typeParameters );
 	}
 
@@ -2573,12 +2536,10 @@ private Table bindEntityTableSpecification(
 			final EntitySource entitySource,
 			PersistentClass entityDescriptor) {
 		final String contributorName = mappingDocument.getCurrentContributorName();
-		final boolean isTable = tableSpecSource instanceof TableSource;
 		final boolean isAbstract = entityDescriptor.isAbstract() != null && entityDescriptor.isAbstract();
 		final Identifier logicalTableName;
 		final Table table;
-		if ( isTable ) {
-			final var tableSource = (TableSource) tableSpecSource;
+		if ( tableSpecSource instanceof TableSource tableSource ) {
 			logicalTableName = logicalTableName( mappingDocument, entitySource, tableSource );
 			table = tableForEntity(
 					tableSource,
@@ -2588,8 +2549,7 @@ private Table bindEntityTableSpecification(
 					isAbstract
 			);
 		}
-		else {
-			final var inlineViewSource = (InLineViewSource) tableSpecSource;
+		else if ( tableSpecSource instanceof InLineViewSource inlineViewSource ) {
 			logicalTableName = database.toIdentifier( inlineViewSource.getLogicalName() );
 			table = tableForSubselect(
 					inlineViewSource,
@@ -2599,6 +2559,9 @@ private Table bindEntityTableSpecification(
 					logicalTableName
 			);
 		}
+		else {
+			throw new AssertionFailure( "Unexpected table specification source type" );
+		}
 
 		final var metadataCollector = mappingDocument.getMetadataCollector();
 
@@ -2609,8 +2572,7 @@ private Table bindEntityTableSpecification(
 				superEntityTableXref( mappingDocument, entitySource, entityDescriptor, metadataCollector )
 		);
 
-		if ( isTable ) {
-			final var tableSource = (TableSource) tableSpecSource;
+		if ( tableSpecSource instanceof TableSource tableSource ) {
 			table.setRowId( tableSource.getRowId() );
 			final String checkConstraint = tableSource.getCheckConstraint();
 			if ( isNotEmpty( checkConstraint ) ) {
@@ -2627,7 +2589,8 @@ private Table bindEntityTableSpecification(
 
 	private Identifier logicalTableName(
 			MappingDocument mappingDocument, EntitySource entitySource, TableSource tableSource) {
-		if ( isNotEmpty( tableSource.getExplicitTableName() ) ) {
+		final String explicitTableName = tableSource.getExplicitTableName();
+		if ( isNotEmpty( explicitTableName ) ) {
 			return database.toIdentifier( tableSource.getExplicitTableName() );
 		}
 		else {
@@ -2714,12 +2677,8 @@ private static EntityTableXref superEntityTableXref(
 			final var superEntityTableXref = metadataCollector.getEntityTableXref( superEntityName );
 			if ( superEntityTableXref == null ) {
 				throw new MappingException(
-						String.format(
-								Locale.ENGLISH,
-								"Unable to locate entity table xref for entity [%s] super-type [%s]",
-								entityDescriptor.getEntityName(),
-								superEntityName
-						),
+						"Unable to locate entity table xref for entity [%s] super-type [%s]"
+								.formatted( entityDescriptor.getEntityName(), superEntityName ),
 						mappingDocument.getOrigin()
 				);
 			}
@@ -2731,41 +2690,46 @@ private static EntityTableXref superEntityTableXref(
 	}
 
 	private Identifier determineCatalogName(TableSpecificationSource tableSpecSource) {
-		return isNotEmpty( tableSpecSource.getExplicitCatalogName() )
-				? database.toIdentifier( tableSpecSource.getExplicitCatalogName() )
+		final String explicitCatalogName = tableSpecSource.getExplicitCatalogName();
+		return isNotEmpty( explicitCatalogName )
+				? database.toIdentifier( explicitCatalogName )
 				: null;
 	}
 
 	private Identifier determineSchemaName(TableSpecificationSource tableSpecSource) {
-		return isNotEmpty( tableSpecSource.getExplicitSchemaName() )
-				? database.toIdentifier( tableSpecSource.getExplicitSchemaName() )
+		final String explicitSchemaName = tableSpecSource.getExplicitSchemaName();
+		return isNotEmpty( explicitSchemaName )
+				? database.toIdentifier( explicitSchemaName )
 				: null;
 	}
 
 	private static void bindCustomSql(
 			EntitySource entitySource,
 			PersistentClass entityDescriptor) {
-		if ( entitySource.getCustomSqlInsert() != null ) {
+		final var customSqlInsert = entitySource.getCustomSqlInsert();
+		if ( customSqlInsert != null ) {
 			entityDescriptor.setCustomSQLInsert(
-					entitySource.getCustomSqlInsert().sql(),
-					entitySource.getCustomSqlInsert().callable(),
-					entitySource.getCustomSqlInsert().checkStyle()
+					customSqlInsert.sql(),
+					customSqlInsert.callable(),
+					customSqlInsert.checkStyle()
 			);
 		}
 
-		if ( entitySource.getCustomSqlUpdate() != null ) {
+		final var customSqlUpdate = entitySource.getCustomSqlUpdate();
+		if ( customSqlUpdate != null ) {
 			entityDescriptor.setCustomSQLUpdate(
-					entitySource.getCustomSqlUpdate().sql(),
-					entitySource.getCustomSqlUpdate().callable(),
-					entitySource.getCustomSqlUpdate().checkStyle()
+					customSqlUpdate.sql(),
+					customSqlUpdate.callable(),
+					customSqlUpdate.checkStyle()
 			);
 		}
 
-		if ( entitySource.getCustomSqlDelete() != null ) {
+		final var customSqlDelete = entitySource.getCustomSqlDelete();
+		if ( customSqlDelete != null ) {
 			entityDescriptor.setCustomSQLDelete(
-					entitySource.getCustomSqlDelete().sql(),
-					entitySource.getCustomSqlDelete().callable(),
-					entitySource.getCustomSqlDelete().checkStyle()
+					customSqlDelete.sql(),
+					customSqlDelete.callable(),
+					customSqlDelete.checkStyle()
 			);
 		}
 
@@ -2775,27 +2739,30 @@ private static void bindCustomSql(
 	private static void bindCustomSql(
 			SecondaryTableSource secondaryTableSource,
 			Join secondaryTable) {
-		if ( secondaryTableSource.getCustomSqlInsert() != null ) {
+		final var customSqlInsert = secondaryTableSource.getCustomSqlInsert();
+		if ( customSqlInsert != null ) {
 			secondaryTable.setCustomSQLInsert(
-					secondaryTableSource.getCustomSqlInsert().sql(),
-					secondaryTableSource.getCustomSqlInsert().callable(),
-					secondaryTableSource.getCustomSqlInsert().checkStyle()
+					customSqlInsert.sql(),
+					customSqlInsert.callable(),
+					customSqlInsert.checkStyle()
 			);
 		}
 
-		if ( secondaryTableSource.getCustomSqlUpdate() != null ) {
+		final var customSqlUpdate = secondaryTableSource.getCustomSqlUpdate();
+		if ( customSqlUpdate != null ) {
 			secondaryTable.setCustomSQLUpdate(
-					secondaryTableSource.getCustomSqlUpdate().sql(),
-					secondaryTableSource.getCustomSqlUpdate().callable(),
-					secondaryTableSource.getCustomSqlUpdate().checkStyle()
+					customSqlUpdate.sql(),
+					customSqlUpdate.callable(),
+					customSqlUpdate.checkStyle()
 			);
 		}
 
-		if ( secondaryTableSource.getCustomSqlDelete() != null ) {
+		final var customSqlDelete = secondaryTableSource.getCustomSqlDelete();
+		if ( customSqlDelete != null ) {
 			secondaryTable.setCustomSQLDelete(
-					secondaryTableSource.getCustomSqlDelete().sql(),
-					secondaryTableSource.getCustomSqlDelete().callable(),
-					secondaryTableSource.getCustomSqlDelete().checkStyle()
+					customSqlDelete.sql(),
+					customSqlDelete.callable(),
+					customSqlDelete.checkStyle()
 			);
 		}
 	}
@@ -2805,7 +2772,6 @@ private void registerSecondPass(SecondPass secondPass, MetadataBuildingContext c
 	}
 
 
-
 	public static final class DelayedPropertyReferenceHandlerImpl
 			implements InFlightMetadataCollector.DelayedPropertyReferenceHandler {
 		public final String referencedEntityName;
@@ -2838,12 +2804,8 @@ public void process(InFlightMetadataCollector metadataCollector) {
 			final var entityBinding = metadataCollector.getEntityBinding( referencedEntityName );
 			if ( entityBinding == null ) {
 				throw new MappingException(
-						String.format(
-								Locale.ENGLISH,
-								"property-ref [%s] referenced an unmapped entity [%s]",
-								sourceElementSynopsis,
-								referencedEntityName
-						),
+						"property-ref [%s] referenced an unmapped entity [%s]"
+								.formatted( sourceElementSynopsis, referencedEntityName ),
 						propertyRefOrigin
 				);
 			}
@@ -2851,13 +2813,8 @@ public void process(InFlightMetadataCollector metadataCollector) {
 			final var propertyBinding = entityBinding.getReferencedProperty( referencedPropertyName );
 			if ( propertyBinding == null ) {
 				throw new MappingException(
-						String.format(
-								Locale.ENGLISH,
-								"property-ref [%s] referenced an unknown entity property [%s#%s]",
-								sourceElementSynopsis,
-								referencedEntityName,
-								referencedPropertyName
-						),
+						"property-ref [%s] referenced an unknown entity property [%s.%s]"
+								.formatted( sourceElementSynopsis, referencedEntityName, referencedPropertyName ),
 						propertyRefOrigin
 				);
 			}
@@ -2915,7 +2872,7 @@ public void doSecondPass(Map<String, PersistentClass> persistentClasses) {
 				BOOT_LOGGER.tracef( "   + key -> %s", columns( collection.getKey() ) );
 				if ( collection.isIndexed() ) {
 					BOOT_LOGGER.tracef( "   + index -> %s",
-							columns( ( (IndexedCollection) collection).getIndex() ) );
+							columns( ( (IndexedCollection) collection ).getIndex() ) );
 				}
 				if ( collection.isOneToMany() ) {
 					BOOT_LOGGER.tracef( "   + one-to-many -> %s",
@@ -2937,7 +2894,7 @@ private void bindCollectionTable() {
 					instanceof PluralAttributeElementSourceOneToMany elementSource ) {
 				// For one-to-many mappings, the "collection table" is the same as the table
 				// of the associated entity (the entity making up the collection elements).
-				// So lookup the associated entity and use its table here
+				// So look up the associated entity and use its table here
 				final var persistentClass = getReferencedEntityBinding( elementSource.getReferencedEntityName() );
 				// even though <key/> defines a property-ref I do not see where legacy
 				// code ever attempts to use that to "adjust" the table in its use to
@@ -2947,9 +2904,7 @@ private void bindCollectionTable() {
 			}
 			else {
 				final var tableSpecSource = pluralAttributeSource.getCollectionTableSpecificationSource();
-				final Identifier logicalCatalogName = determineCatalogName( tableSpecSource );
-				final Identifier logicalSchemaName = determineSchemaName( tableSpecSource );
-				final var namespace = database.locateNamespace( logicalCatalogName, logicalSchemaName );
+				final var namespace = locateTableNamespace( tableSpecSource );
 
 				final Table collectionTable;
 				if ( tableSpecSource instanceof TableSource tableSource ) {
@@ -2963,19 +2918,21 @@ private void bindCollectionTable() {
 							)
 					);
 				}
-				else {
+				else if ( tableSpecSource instanceof InLineViewSource inlineViewSource ) {
 					collectionTable = new Table(
 							metadataBuildingContext.getCurrentContributorName(),
 							namespace,
-							( (InLineViewSource) tableSpecSource ).getSelectStatement(),
+							inlineViewSource.getSelectStatement(),
 							false
 					);
 				}
+				else {
+					throw new AssertionFailure( "Unexpected table specification source type" );
+				}
 
 				collectionBinding.setCollectionTable( collectionTable );
 			}
 
-
 			final var collectionTable = collectionBinding.getCollectionTable();
 
 			if ( BOOT_LOGGER.isTraceEnabled() ) {
@@ -2984,36 +2941,33 @@ private void bindCollectionTable() {
 						collectionTable.getName() );
 			}
 
-			if ( pluralAttributeSource.getCollectionTableComment() != null ) {
-				collectionTable.setComment( pluralAttributeSource.getCollectionTableComment() );
+			final String tableComment = pluralAttributeSource.getCollectionTableComment();
+			if ( tableComment != null ) {
+				collectionTable.setComment( tableComment );
 			}
-			if ( pluralAttributeSource.getCollectionTableCheck() != null ) {
-				collectionTable.addCheckConstraint( pluralAttributeSource.getCollectionTableCheck() );
+			final String tableCheck = pluralAttributeSource.getCollectionTableCheck();
+			if ( tableCheck != null ) {
+				collectionTable.addCheckConstraint( tableCheck );
 			}
 		}
 
 		private Identifier logicalName(TableSource tableSource) {
-			if ( isNotEmpty( tableSource.getExplicitTableName() ) ) {
-				return toIdentifier( tableSource.getExplicitTableName(),
+			final String explicitTableName = tableSource.getExplicitTableName();
+			if ( isNotEmpty( explicitTableName ) ) {
+				return toIdentifier( explicitTableName,
 						mappingDocument.getEffectiveDefaults().isDefaultQuoteIdentifiers() );
 			}
 			else {
-				final var owner = collectionBinding.getOwner();
-				final var ownerEntityNaming = new EntityNamingSourceImpl(
-						owner.getEntityName(),
-						owner.getClassName(),
-						owner.getJpaEntityName()
-				);
 				final var implicitNamingSource =
 						new ImplicitCollectionTableNameSource() {
 							@Override
 							public Identifier getOwningPhysicalTableName() {
-								return owner.getTable().getNameIdentifier();
+								return collectionBinding.getOwner().getTable().getNameIdentifier();
 							}
 
 							@Override
 							public EntityNaming getOwningEntityNaming() {
-								return ownerEntityNaming;
+								return new EntityNamingSourceImpl( collectionBinding.getOwner() );
 							}
 
 							@Override
@@ -3037,10 +2991,10 @@ protected void createBackReferences() {
 					&& !collectionBinding.getKey().isNullable() ) {
 				// for non-inverse one-to-many, with a not-null fk, add a backref!
 				final var oneToMany = (OneToMany) collectionBinding.getElement();
-				final String entityName = oneToMany.getReferencedEntityName();
-				final var referenced = getReferencedEntityBinding( entityName );
+				final var referenced =
+						getReferencedEntityBinding( oneToMany.getReferencedEntityName() );
 				final var backref = new Backref();
-				backref.setName( '_' + collectionBinding.getOwnerEntityName() + "." + pluralAttributeSource.getName() + "Backref" );
+				backref.setName( backrefName() );
 				backref.setOptional( true );
 				backref.setUpdatable( false );
 				backref.setSelectable( false );
@@ -3059,6 +3013,12 @@ protected void createBackReferences() {
 			}
 		}
 
+		private String backrefName() {
+			return '_' + collectionBinding.getOwnerEntityName()
+				+ "." + pluralAttributeSource.getName()
+				+ "Backref";
+		}
+
 		protected void bindCollectionKey() {
 			final var pluralAttributeSource = getPluralAttributeSource();
 			final var keySource = pluralAttributeSource.getKeySource();
@@ -3075,8 +3035,9 @@ protected void bindCollectionKey() {
 					collectionBinding.getCollectionTable(),
 					keyVal
 			);
-			setForeignKeyName( key, keySource.getExplicitForeignKeyName() );
-			key.setOnDeleteAction( getOnDeleteAction( pluralAttributeSource.getKeySource().isCascadeDeleteEnabled() ) );
+			setForeignKeyName( key,
+					keySource.getExplicitForeignKeyName() );
+			key.setOnDeleteAction( getOnDeleteAction( keySource ) );
 
 //			final ImplicitJoinColumnNameSource.Nature implicitNamingNature;
 //			if ( getPluralAttributeSource().getElementSource() instanceof PluralAttributeElementSourceManyToMany
@@ -3105,13 +3066,12 @@ protected void bindCollectionKey() {
 		}
 
 		protected void bindCollectionIdentifier() {
-			final CollectionIdSource idSource = getPluralAttributeSource().getCollectionIdSource();
+			final var idSource = getPluralAttributeSource().getCollectionIdSource();
 			if ( idSource != null ) {
 				final var idBagBinding = (IdentifierCollection) getCollectionBinding();
-				final var idBinding = new BasicValue(
-						mappingDocument,
-						idBagBinding.getCollectionTable()
-				);
+				final var idBinding =
+						new BasicValue( mappingDocument,
+								idBagBinding.getCollectionTable() );
 
 				bindSimpleValueType(
 						mappingDocument,
@@ -3142,217 +3102,207 @@ protected void bindCollectionIndex() {
 		}
 
 		protected void bindCollectionElement() {
-			final PluralAttributeElementSource pluralElementSource = getPluralAttributeSource().getElementSource();
+			final var pluralElementSource = pluralAttributeSource.getElementSource();
 			if ( BOOT_LOGGER.isTraceEnabled() ) {
-				BOOT_LOGGER.tracef(
-						"Binding [%s] element type for a [%s]",
-						pluralElementSource.getNature(),
-						getPluralAttributeSource().getNature()
-				);
+				BOOT_LOGGER.tracef( "Binding [%s] element type for a [%s]",
+						pluralElementSource.getNature(), pluralAttributeSource.getNature() );
 			}
-			final var collectionBinding = getCollectionBinding();
-			final var mappingDocument = getMappingDocument();
 			if ( pluralElementSource instanceof PluralAttributeElementSourceBasic elementSource ) {
-				final var elementBinding =
-						new BasicValue( mappingDocument, collectionBinding.getCollectionTable() );
-
-				bindSimpleValueType(
-						mappingDocument,
-						elementSource.getExplicitHibernateTypeSource(),
-						elementBinding
-				);
-
-				relationalObjectBinder.bindColumnsAndFormulas(
-						this.mappingDocument,
-						elementSource.getRelationalValueSources(),
-						elementBinding,
-						elementSource.areValuesNullableByDefault(),
-						context -> context.getMetadataCollector().getDatabase()
-								.toIdentifier( Collection.DEFAULT_ELEMENT_COLUMN_NAME )
-				);
-
-				collectionBinding.setElement( elementBinding );
-				// Collection#setWhere is used to set the "where" clause that applies to the collection table
-				// (the table containing the basic elements)
-				// This "where" clause comes from the collection mapping; e.g., <set name="..." ... where="..." .../>
-				collectionBinding.setWhere( getPluralAttributeSource().getWhere() );
+				bindBasicElement( elementSource );
 			}
 			else if ( pluralElementSource instanceof PluralAttributeElementSourceEmbedded elementSource ) {
-				final var elementBinding = new Component( mappingDocument, collectionBinding );
-
-				final var embeddableSource = elementSource.getEmbeddableSource();
-				bindComponent(
-						this.mappingDocument,
-						embeddableSource,
-						elementBinding,
-						null,
-						embeddableSource.getAttributePathBase().getProperty(),
-						false
-				);
-
-				collectionBinding.setElement( elementBinding );
-				// Collection#setWhere is used to set the "where" clause that applies to the collection table
-				// (the table containing the embeddable elements)
-				// This "where" clause comes from the collection mapping; e.g., <set name="..." ... where="..." .../>
-				collectionBinding.setWhere( getPluralAttributeSource().getWhere() );
+				bindEmbeddedElement( elementSource );
 			}
 			else if ( pluralElementSource instanceof PluralAttributeElementSourceOneToMany elementSource ) {
-				final var elementBinding =
-						new OneToMany( mappingDocument, collectionBinding.getOwner() );
-				this.collectionBinding.setElement( elementBinding );
-
-				final var referencedEntityBinding =
-						getReferencedEntityBinding( elementSource.getReferencedEntityName() );
-
-				this.collectionBinding.setWhere(
-						getNonEmptyOrConjunctionIfBothNonEmpty(
-								referencedEntityBinding.getWhere(),
-								getPluralAttributeSource().getWhere()
-						)
-				);
-
-				elementBinding.setReferencedEntityName( referencedEntityBinding.getEntityName() );
-				elementBinding.setAssociatedClass( referencedEntityBinding );
-				elementBinding.setIgnoreNotFound( elementSource.isIgnoreNotFound() );
+				bindOneToManyElement( elementSource );
 			}
 			else if ( pluralElementSource instanceof PluralAttributeElementSourceManyToMany elementSource ) {
-				final var elementBinding =
-						new ManyToOne( mappingDocument, collectionBinding.getCollectionTable() );
-
-				relationalObjectBinder.bindColumnsAndFormulas(
-						mappingDocument,
-						elementSource.getRelationalValueSources(),
-						elementBinding,
-						false,
-						context -> context.getMetadataCollector().getDatabase()
-								.toIdentifier( Collection.DEFAULT_ELEMENT_COLUMN_NAME )
-				);
-
-				final var fetchCharacteristics = elementSource.getFetchCharacteristics();
-				elementBinding.setLazy( fetchCharacteristics.getFetchTiming() != FetchTiming.IMMEDIATE );
-				elementBinding.setFetchMode(
-						fetchCharacteristics.getFetchStyle() == FetchStyle.SELECT
-								? FetchMode.SELECT
-								: FetchMode.JOIN
-				);
-
-				setForeignKeyName( elementBinding, elementSource.getExplicitForeignKeyName() );
-
-				final String referencedEntityName = elementSource.getReferencedEntityName();
-				elementBinding.setReferencedEntityName( referencedEntityName );
-				final String referencedEntityAttributeName = elementSource.getReferencedEntityAttributeName();
-				if ( isNotEmpty( referencedEntityAttributeName ) ) {
-					elementBinding.setReferencedPropertyName( referencedEntityAttributeName );
-					elementBinding.setReferenceToPrimaryKey( false );
-				}
-				else {
-					elementBinding.setReferenceToPrimaryKey( true );
-				}
-
-				collectionBinding.setElement( elementBinding );
-
-				final PersistentClass referencedEntityBinding = getReferencedEntityBinding( referencedEntityName );
-
-				// Collection#setWhere is used to set the "where" clause that applies to the collection table
-				// (which is the join table for a many-to-many association).
-				// This "where" clause comes from the collection mapping; e.g., <set name="..." ... where="..." .../>
-				collectionBinding.setWhere( getPluralAttributeSource().getWhere() );
+				bindManyToManyElement( elementSource );
+			}
+			else if ( pluralElementSource instanceof PluralAttributeElementSourceManyToAny elementSource ) {
+				bindManyToAnyElement( elementSource );
+			}
+		}
 
-				collectionBinding.setManyToManyWhere(
-						getNonEmptyOrConjunctionIfBothNonEmpty(
-								referencedEntityBinding.getWhere(),
-								elementSource.getWhere()
-						)
-				);
+		private void bindManyToAnyElement(PluralAttributeElementSourceManyToAny elementSource) {
+			final var elementBinding =
+					new Any( mappingDocument,
+							collectionBinding.getCollectionTable() );
+			bindAny( mappingDocument, elementSource, elementBinding,
+					pluralAttributeSource.getAttributeRole().append( "element" ) );
+			collectionBinding.setElement( elementBinding );
+			// Collection#setWhere is used to set the "where" clause that applies to the collection table
+			// (which is the join table for a many-to-any association).
+			// This "where" clause comes from the collection mapping; e.g., <set name="..." ... where="..." .../>
+			collectionBinding.setWhere( getPluralAttributeSource().getWhere() );
+		}
 
-				collectionBinding.setManyToManyOrdering( elementSource.getOrder() );
+		private void bindManyToManyElement(PluralAttributeElementSourceManyToMany elementSource) {
+			final var elementBinding =
+					new ManyToOne( mappingDocument,
+							collectionBinding.getCollectionTable() );
+			relationalObjectBinder.bindColumnsAndFormulas(
+					mappingDocument,
+					elementSource.getRelationalValueSources(),
+					elementBinding,
+					false,
+					context -> context.getMetadataCollector().getDatabase()
+							.toIdentifier( Collection.DEFAULT_ELEMENT_COLUMN_NAME )
+			);
+			handleFetchCharacteristics( elementSource, elementBinding );
+			setForeignKeyName( elementBinding,
+					elementSource.getExplicitForeignKeyName() );
+			final String referencedEntityName = elementSource.getReferencedEntityName();
+			handleReferencedEntity( elementBinding, referencedEntityName,
+					elementSource.getReferencedEntityAttributeName() );
+			collectionBinding.setElement( elementBinding );
+			final var referencedEntityBinding = getReferencedEntityBinding( referencedEntityName );
+			// Collection#setWhere is used to set the "where" clause that applies to the collection table
+			// (which is the join table for a many-to-many association).
+			// This "where" clause comes from the collection mapping; e.g., <set name="..." ... where="..." .../>
+			collectionBinding.setWhere( pluralAttributeSource.getWhere() );
+			collectionBinding.setManyToManyWhere(
+					getNonEmptyOrConjunctionIfBothNonEmpty(
+							referencedEntityBinding.getWhere(),
+							elementSource.getWhere()
+					)
+			);
+			collectionBinding.setManyToManyOrdering( elementSource.getOrder() );
+			bindManyToManyFilters( elementSource, mappingDocument, collectionBinding, elementBinding );
+		}
 
-				if ( !isEmpty( elementSource.getFilterSources() )
-						|| elementSource.getWhere() != null ) {
-					if ( collectionBinding.getFetchMode() == FetchMode.JOIN
+		private void bindManyToManyFilters(
+				PluralAttributeElementSourceManyToMany elementSource,
+				MappingDocument mappingDocument,
+				Collection collectionBinding,
+				ManyToOne elementBinding) {
+			if ( !isEmpty( elementSource.getFilterSources() )
+					|| elementSource.getWhere() != null ) {
+				if ( collectionBinding.getFetchMode() == FetchMode.JOIN
 						&& elementBinding.getFetchMode() != FetchMode.JOIN ) {
-						throw new MappingException(
-								String.format(
-										Locale.ENGLISH,
-										"many-to-many defining filter or where without join fetching is not " +
-												"valid within collection [%s] using join fetching",
-										getPluralAttributeSource().getAttributeRole().getFullPath()
-								),
-								mappingDocument.getOrigin()
-						);
-					}
+					throw new MappingException(
+							"many-to-many defining filter or where without join fetching is not "
+							+ "valid within collection [%s] using join fetching"
+									.formatted( getPluralAttributeSource().getAttributeRole().getFullPath() ),
+							mappingDocument.getOrigin()
+					);
 				}
+			}
 
-				for ( var filterSource : elementSource.getFilterSources() ) {
-					if ( filterSource.getName() == null ) {
-						if ( BOOT_LOGGER.isTraceEnabled() ) {
-							BOOT_LOGGER.tracef(
-									"Encountered filter with no name associated with many-to-many [%s]; skipping",
-									getPluralAttributeSource().getAttributeRole().getFullPath()
-							);
-						}
-						continue;
-					}
-
-					if ( filterSource.getCondition() == null ) {
-						throw new MappingException(
-								String.format(
-										Locale.ENGLISH,
-										"No filter condition found for filter [%s] associated with many-to-many [%s]",
-										filterSource.getName(),
-										getPluralAttributeSource().getAttributeRole().getFullPath()
-								),
-								mappingDocument.getOrigin()
-						);
-					}
-
-					if ( BOOT_LOGGER.isTraceEnabled() ) {
-						BOOT_LOGGER.tracef(
-								"Applying many-to-many filter [%s] as [%s] to collection [%s]",
-								filterSource.getName(),
-								filterSource.getCondition(),
-								getPluralAttributeSource().getAttributeRole().getFullPath()
-						);
-					}
+			for ( var filterSource : elementSource.getFilterSources() ) {
+				bindManyToManyFilter( mappingDocument, collectionBinding, filterSource );
+			}
+		}
 
-					collectionBinding.addManyToManyFilter(
-							filterSource.getName(),
-							filterSource.getCondition(),
-							filterSource.shouldAutoInjectAliases(),
-							filterSource.getAliasToTableMap(),
-							filterSource.getAliasToEntityMap()
+		private void bindManyToManyFilter(
+				MappingDocument mappingDocument, Collection collectionBinding, FilterSource filterSource) {
+			final String name = filterSource.getName();
+			if ( name == null ) {
+				if ( BOOT_LOGGER.isTraceEnabled() ) {
+					BOOT_LOGGER.tracef(
+							"Encountered filter with no name associated with many-to-many [%s]; skipping",
+							getPluralAttributeSource().getAttributeRole().getFullPath()
 					);
 				}
 			}
-			else if ( pluralElementSource instanceof PluralAttributeElementSourceManyToAny elementSource ) {
-				final var elementBinding = new Any( mappingDocument, collectionBinding.getCollectionTable() );
-				bindAny(
-						this.mappingDocument,
-						elementSource,
-						elementBinding,
-						getPluralAttributeSource().getAttributeRole().append( "element" )
+			else {
+				final String condition = filterSource.getCondition();
+				if ( condition == null ) {
+					throw new MappingException(
+							"No filter condition found for filter [%s] associated with many-to-many [%s]"
+									.formatted( name, getPluralAttributeSource().getAttributeRole().getFullPath() ),
+							mappingDocument.getOrigin()
+					);
+				}
+				if ( BOOT_LOGGER.isTraceEnabled() ) {
+					BOOT_LOGGER.tracef(
+							"Applying many-to-many filter [%s] as [%s] to collection [%s]",
+							name,
+							condition,
+							getPluralAttributeSource().getAttributeRole().getFullPath()
+					);
+				}
+				collectionBinding.addManyToManyFilter(
+						name,
+						condition,
+						filterSource.shouldAutoInjectAliases(),
+						filterSource.getAliasToTableMap(),
+						filterSource.getAliasToEntityMap()
 				);
-				collectionBinding.setElement( elementBinding );
-				// Collection#setWhere is used to set the "where" clause that applies to the collection table
-				// (which is the join table for a many-to-any association).
-				// This "where" clause comes from the collection mapping; e.g., <set name="..." ... where="..." .../>
-				collectionBinding.setWhere( getPluralAttributeSource().getWhere() );
 			}
 		}
 
+		private void bindOneToManyElement(PluralAttributeElementSourceOneToMany elementSource) {
+			final var elementBinding =
+					new OneToMany( mappingDocument,
+							collectionBinding.getOwner() );
+			collectionBinding.setElement( elementBinding );
+			final var referencedEntityBinding =
+					getReferencedEntityBinding( elementSource.getReferencedEntityName() );
+			collectionBinding.setWhere(
+					getNonEmptyOrConjunctionIfBothNonEmpty(
+							referencedEntityBinding.getWhere(),
+							pluralAttributeSource.getWhere()
+					)
+			);
+			elementBinding.setReferencedEntityName( referencedEntityBinding.getEntityName() );
+			elementBinding.setAssociatedClass( referencedEntityBinding );
+			elementBinding.setIgnoreNotFound( elementSource.isIgnoreNotFound() );
+		}
+
+		private void bindEmbeddedElement(PluralAttributeElementSourceEmbedded elementSource) {
+			final var elementBinding = new Component( mappingDocument, collectionBinding );
+			final var embeddableSource = elementSource.getEmbeddableSource();
+			bindComponent( mappingDocument, embeddableSource, elementBinding, null,
+					embeddableSource.getAttributePathBase().getProperty(), false );
+			collectionBinding.setElement( elementBinding );
+			// Collection#setWhere is used to set the "where" clause that applies to the collection table
+			// (the table containing the embeddable elements)
+			// This "where" clause comes from the collection mapping; e.g., <set name="..." ... where="..." .../>
+			collectionBinding.setWhere( pluralAttributeSource.getWhere() );
+		}
+
+		private void bindBasicElement(PluralAttributeElementSourceBasic elementSource) {
+			final var elementBinding =
+					new BasicValue( mappingDocument,
+							collectionBinding.getCollectionTable() );
+			bindSimpleValueType( mappingDocument, elementSource.getExplicitHibernateTypeSource(), elementBinding );
+			relationalObjectBinder.bindColumnsAndFormulas(
+					mappingDocument,
+					elementSource.getRelationalValueSources(),
+					elementBinding,
+					elementSource.areValuesNullableByDefault(),
+					context -> context.getMetadataCollector().getDatabase()
+							.toIdentifier( Collection.DEFAULT_ELEMENT_COLUMN_NAME )
+			);
+			collectionBinding.setElement( elementBinding );
+			// Collection#setWhere is used to set the "where" clause that applies to the collection table
+			// (the table containing the basic elements)
+			// This "where" clause comes from the collection mapping; e.g., <set name="..." ... where="..." .../>
+			collectionBinding.setWhere( pluralAttributeSource.getWhere() );
+		}
+
+		private static void handleFetchCharacteristics(
+				PluralAttributeElementSourceManyToMany elementSource, ManyToOne elementBinding) {
+			final var characteristics = elementSource.getFetchCharacteristics();
+			elementBinding.setLazy( characteristics.getFetchTiming() != FetchTiming.IMMEDIATE );
+			elementBinding.setFetchMode(
+					characteristics.getFetchStyle() == FetchStyle.SELECT
+							? FetchMode.SELECT
+							: FetchMode.JOIN
+			);
+		}
+
 		private PersistentClass getReferencedEntityBinding(String referencedEntityName) {
 			final var entityBinding =
 					mappingDocument.getMetadataCollector()
 							.getEntityBinding( referencedEntityName );
 			if ( entityBinding == null ) {
 				throw new MappingException(
-						String.format(
-								Locale.ENGLISH,
-								"Collection [%s] references an unmapped entity [%s]",
-								getPluralAttributeSource().getAttributeRole().getFullPath(),
-								referencedEntityName
-						),
-						getMappingDocument().getOrigin()
+						"Collection [%s] references an unmapped entity [%s]"
+								.formatted( getPluralAttributeSource().getAttributeRole().getFullPath(),
+										referencedEntityName ),
+						mappingDocument.getOrigin()
 				);
 			}
 			return entityBinding;
@@ -3440,7 +3390,7 @@ protected void createBackReferences() {
 			final var collectionBinding = getCollectionBinding();
 
 			boolean indexIsFormula = false;
-			for ( var selectable: collectionBinding.getIndex().getSelectables() ) {
+			for ( var selectable : collectionBinding.getIndex().getSelectables() ) {
 				if ( selectable.isFormula() ) {
 					indexIsFormula = true;
 					break;
@@ -3452,10 +3402,12 @@ protected void createBackReferences() {
 					&& !collectionBinding.isInverse()
 					&& !indexIsFormula ) {
 				final var oneToMany = (OneToMany) collectionBinding.getElement();
-				final String entityName = oneToMany.getReferencedEntityName();
-				final var referenced = getMappingDocument().getMetadataCollector().getEntityBinding( entityName );
+				final var referenced =
+						getMappingDocument().getMetadataCollector()
+								.getEntityBinding( oneToMany.getReferencedEntityName() );
 				final var backref = new IndexBackref();
-				backref.setName( '_' + collectionBinding.getOwnerEntityName() + "." + getPluralAttributeSource().getName() + "IndexBackref" );
+				backref.setName( '_' + collectionBinding.getOwnerEntityName()
+								+ "." + getPluralAttributeSource().getName() + "IndexBackref" );
 				backref.setOptional( true );
 				backref.setUpdatable( false );
 				backref.setSelectable( false );
@@ -3531,10 +3483,12 @@ private void createIndexBackRef(
 				&& !collectionBinding.getKey().isNullable()
 				&& !collectionBinding.isInverse() ) {
 			final var oneToMany = (OneToMany) collectionBinding.getElement();
-			final String entityName = oneToMany.getReferencedEntityName();
-			final var referenced = mappingDocument.getMetadataCollector().getEntityBinding( entityName );
+			final var referenced =
+					mappingDocument.getMetadataCollector()
+							.getEntityBinding( oneToMany.getReferencedEntityName() );
 			final var backref = new IndexBackref();
-			backref.setName( '_' + collectionBinding.getOwnerEntityName() + "." + pluralAttributeSource.getName() + "IndexBackref" );
+			backref.setName( '_' + collectionBinding.getOwnerEntityName()
+							+ "." + pluralAttributeSource.getName() + "IndexBackref" );
 			backref.setOptional( true );
 			backref.setUpdatable( false );
 			backref.setSelectable( false );
@@ -3575,7 +3529,6 @@ protected void bindCollectionIndex() {
 		@Override
 		protected void createBackReferences() {
 			super.createBackReferences();
-
 			createIndexBackRef(
 					getMappingDocument(),
 					getPluralAttributeSource(),
@@ -3591,7 +3544,9 @@ public void bindListOrArrayIndex(
 		final var indexSource =
 				(PluralAttributeSequentialIndexSource)
 						attributeSource.getIndexSource();
-		final var indexBinding = new BasicValue( mappingDocument, collectionBinding.getCollectionTable() );
+		final var indexBinding =
+				new BasicValue( mappingDocument,
+						collectionBinding.getCollectionTable() );
 		bindSimpleValueType( mappingDocument, indexSource.getTypeInformation(), indexBinding );
 
 		relationalObjectBinder.bindColumnsAndFormulas(
@@ -3624,70 +3579,107 @@ private void bindMapKey(
 			final org.hibernate.mapping.Map collectionBinding) {
 		final var indexSource = pluralAttributeSource.getIndexSource();
 		if ( indexSource instanceof PluralAttributeMapKeySourceBasic mapKeySource ) {
-			final var value = new BasicValue( mappingDocument, collectionBinding.getCollectionTable() );
-			bindSimpleValueType( mappingDocument, mapKeySource.getTypeInformation(), value );
-			if ( !value.isTypeSpecified() ) {
-				throw new MappingException(
-						"map index element must specify a type: "
-								+ pluralAttributeSource.getAttributeRole().getFullPath(),
-						mappingDocument.getOrigin()
-				);
-			}
-
-			relationalObjectBinder.bindColumnsAndFormulas(
-					mappingDocument,
-					mapKeySource.getRelationalValueSources(),
-					value,
-					true,
-					context -> database.toIdentifier( IndexedCollection.DEFAULT_INDEX_COLUMN_NAME )
-			);
-
-			collectionBinding.setIndex( value );
+			bindBasicMapKey( mappingDocument, pluralAttributeSource, collectionBinding, mapKeySource );
 		}
 		else if ( indexSource instanceof PluralAttributeMapKeySourceEmbedded mapKeySource ) {
-			final var componentBinding = new Component( mappingDocument, collectionBinding );
-			bindComponent(
-					mappingDocument,
-					mapKeySource.getEmbeddableSource(),
-					componentBinding,
-					null,
-					pluralAttributeSource.getName(),
-					false
-			);
-			collectionBinding.setIndex( componentBinding );
+			bindEmbeddedMapKey( mappingDocument, pluralAttributeSource, collectionBinding, mapKeySource );
 		}
 		else if ( indexSource instanceof PluralAttributeMapKeyManyToManySource mapKeySource ) {
-			final var mapKeyBinding = new ManyToOne( mappingDocument, collectionBinding.getCollectionTable() );
+			bindManyToManyMapKey( mappingDocument, pluralAttributeSource, collectionBinding, mapKeySource );
+		}
+		else if ( indexSource instanceof PluralAttributeMapKeyManyToAnySource mapKeySource ) {
+			bindManyToAnyMapKey( mappingDocument, pluralAttributeSource, collectionBinding, mapKeySource );
+		}
+	}
 
-			mapKeyBinding.setReferencedEntityName( mapKeySource.getReferencedEntityName() );
+	private void bindManyToAnyMapKey(
+			MappingDocument mappingDocument,
+			IndexedPluralAttributeSource pluralAttributeSource,
+			org.hibernate.mapping.Map collectionBinding,
+			PluralAttributeMapKeyManyToAnySource mapKeySource) {
+		final var mapKeyBinding =
+				new Any( mappingDocument,
+						collectionBinding.getCollectionTable() );
+		bindAny( mappingDocument, mapKeySource, mapKeyBinding,
+				pluralAttributeSource.getAttributeRole().append( "key" ) );
+		collectionBinding.setIndex( mapKeyBinding );
+	}
 
-			relationalObjectBinder.bindColumnsAndFormulas(
-					mappingDocument,
-					mapKeySource.getRelationalValueSources(),
-					mapKeyBinding,
-					true,
-					context -> implicitNamingStrategy.determineMapKeyColumnName(
-							new ImplicitMapKeyColumnNameSource() {
-								@Override
-								public AttributePath getPluralAttributePath() {
-									return pluralAttributeSource.getAttributePath();
-								}
+	private void bindManyToManyMapKey(
+			MappingDocument mappingDocument,
+			IndexedPluralAttributeSource pluralAttributeSource,
+			org.hibernate.mapping.Map collectionBinding,
+			PluralAttributeMapKeyManyToManySource mapKeySource) {
+		final var mapKeyBinding =
+				new ManyToOne( mappingDocument,
+						collectionBinding.getCollectionTable() );
 
-								@Override
-								public MetadataBuildingContext getBuildingContext() {
-									return context;
-								}
+		mapKeyBinding.setReferencedEntityName( mapKeySource.getReferencedEntityName() );
+
+		relationalObjectBinder.bindColumnsAndFormulas(
+				mappingDocument,
+				mapKeySource.getRelationalValueSources(),
+				mapKeyBinding,
+				true,
+				context -> implicitNamingStrategy.determineMapKeyColumnName(
+						new ImplicitMapKeyColumnNameSource() {
+							@Override
+							public AttributePath getPluralAttributePath() {
+								return pluralAttributeSource.getAttributePath();
 							}
-					)
+							@Override
+							public MetadataBuildingContext getBuildingContext() {
+								return context;
+							}
+						}
+				)
+		);
+		collectionBinding.setIndex( mapKeyBinding );
+	}
+
+	private void bindEmbeddedMapKey(
+			MappingDocument mappingDocument,
+			IndexedPluralAttributeSource pluralAttributeSource,
+			org.hibernate.mapping.Map collectionBinding,
+			PluralAttributeMapKeySourceEmbedded mapKeySource) {
+		final var componentBinding = new Component( mappingDocument, collectionBinding );
+		bindComponent(
+				mappingDocument,
+				mapKeySource.getEmbeddableSource(),
+				componentBinding,
+				null,
+				pluralAttributeSource.getName(),
+				false
+		);
+		collectionBinding.setIndex( componentBinding );
+	}
+
+	private void bindBasicMapKey(
+			MappingDocument mappingDocument,
+			IndexedPluralAttributeSource pluralAttributeSource,
+			org.hibernate.mapping.Map collectionBinding,
+			PluralAttributeMapKeySourceBasic mapKeySource) {
+		final var value =
+				new BasicValue( mappingDocument,
+						collectionBinding.getCollectionTable() );
+		bindSimpleValueType( mappingDocument, mapKeySource.getTypeInformation(), value );
+		if ( !value.isTypeSpecified() ) {
+			throw new MappingException(
+					"map index element must specify a type: "
+					+ pluralAttributeSource.getAttributeRole().getFullPath(),
+					mappingDocument.getOrigin()
 			);
-			collectionBinding.setIndex( mapKeyBinding );
-		}
-		else if ( indexSource instanceof PluralAttributeMapKeyManyToAnySource mapKeySource) {
-			final var mapKeyBinding = new Any( mappingDocument, collectionBinding.getCollectionTable() );
-			bindAny( mappingDocument, mapKeySource, mapKeyBinding,
-					pluralAttributeSource.getAttributeRole().append( "key" ) );
-			collectionBinding.setIndex( mapKeyBinding );
 		}
+
+		relationalObjectBinder.bindColumnsAndFormulas(
+				mappingDocument,
+				mapKeySource.getRelationalValueSources(),
+				value,
+				true,
+				context -> database.toIdentifier( IndexedCollection.DEFAULT_INDEX_COLUMN_NAME )
+		);
+
+		collectionBinding.setIndex( value );
 	}
 
 	private class ManyToOneColumnBinder implements ImplicitColumnNamingSecondPass {
@@ -3727,7 +3719,8 @@ public boolean canProcessImmediately() {
 			}
 
 			final var referencedEntityBinding =
-					mappingDocument.getMetadataCollector().getEntityBinding( referencedEntityName );
+					mappingDocument.getMetadataCollector()
+							.getEntityBinding( referencedEntityName );
 			if ( referencedEntityBinding == null ) {
 				return false;
 			}
@@ -3759,12 +3752,13 @@ public void doSecondPass(Map<String, PersistentClass> persistentClasses) {
 				// column making up the FK.
 
 				final var referencedEntityBinding =
-						mappingDocument.getMetadataCollector().getEntityBinding( referencedEntityName );
+						mappingDocument.getMetadataCollector()
+								.getEntityBinding( referencedEntityName );
 
 				if ( referencedEntityBinding == null ) {
 					throw new AssertionFailure(
 							"Unable to locate referenced entity mapping [" + referencedEntityName +
-									"] in order to process many-to-one FK : " + manyToOneSource.getAttributeRole().getFullPath()
+							"] in order to process many-to-one FK : " + manyToOneSource.getAttributeRole().getFullPath()
 					);
 				}
 
@@ -3810,7 +3804,8 @@ private ManyToOneFkSecondPass(
 				String referencedEntityName) {
 			if ( referencedEntityName == null ) {
 				throw new MappingException(
-						"entity name referenced by many-to-one required [" + manyToOneSource.getAttributeRole().getFullPath() + "]",
+						"entity name referenced by many-to-one required [%s]"
+								.formatted( manyToOneSource.getAttributeRole().getFullPath() ),
 						mappingDocument.getOrigin()
 				);
 			}
@@ -3841,7 +3836,9 @@ public void doSecondPass(Map<String, PersistentClass> persistentClasses) throws
 				manyToOneBinding.createForeignKey();
 			}
 			else {
-				manyToOneBinding.createPropertyRefConstraints( mappingDocument.getMetadataCollector().getEntityBindingMap() );
+				manyToOneBinding.createPropertyRefConstraints(
+						mappingDocument.getMetadataCollector()
+								.getEntityBindingMap() );
 			}
 		}
 
@@ -3908,7 +3905,6 @@ public void process() {
 			BOOT_LOGGER.bindingNaturalIdUniqueKey( entityBinding.getEntityName() );
 
 			final List<Identifier> columnNames = new ArrayList<>();
-
 			final var uniqueKey = new UniqueKey( entityBinding.getTable() );
 			for ( var attributeBinding : attributeBindings ) {
 				for ( var selectable : attributeBinding.getSelectables() ) {
@@ -3945,10 +3941,14 @@ public Identifier getUserProvidedIdentifier() {
 								}
 							}
 					);
-			uniqueKey.setName( uniqueKeyName.render( mappingDocument.getMetadataCollector().getDatabase().getDialect() ) );
+			uniqueKey.setName( uniqueKeyName.render( getDialect() ) );
 
 			entityBinding.getTable().addUniqueKey( uniqueKey );
 		}
+
+		private Dialect getDialect() {
+			return mappingDocument.getMetadataCollector().getDatabase().getDialect();
+		}
 	}
 
 	private String columns(Value value) {
@@ -3962,7 +3962,7 @@ private String columns(Value value) {
 		return builder.toString();
 	}
 
-	private static OnDeleteAction getOnDeleteAction(boolean entitySource) {
-		return entitySource ? OnDeleteAction.CASCADE : OnDeleteAction.NO_ACTION;
+	private static OnDeleteAction getOnDeleteAction(ForeignKeyContributingSource entitySource) {
+		return entitySource.isCascadeDeleteEnabled() ? OnDeleteAction.CASCADE : OnDeleteAction.NO_ACTION;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java
index f7e9f45609e7..a078cad5da0b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java
@@ -4,8 +4,7 @@
  */
 package org.hibernate.boot.model.source.internal.hbm;
 
-import java.util.Locale;
-
+import org.hibernate.AssertionFailure;
 import org.hibernate.boot.MappingException;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNamedNativeQueryType;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNamedQueryType;
@@ -15,17 +14,17 @@
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryScalarReturnType;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmQueryParamType;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmSynchronizeType;
-import org.hibernate.boot.model.internal.QueryBinder;
 import org.hibernate.boot.query.ImplicitHbmResultSetMappingDescriptorBuilder;
 import org.hibernate.boot.query.NamedHqlQueryDefinition;
 import org.hibernate.boot.query.NamedNativeQueryDefinition;
-import org.hibernate.boot.query.NamedProcedureCallDefinition;
-import org.hibernate.internal.log.DeprecationLogger;
 
 import jakarta.xml.bind.JAXBElement;
 
+import static org.hibernate.boot.model.internal.QueryBinder.createStoredProcedure;
+import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
+import static org.hibernate.internal.util.StringHelper.isNotBlank;
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
-import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
+import static org.hibernate.internal.util.StringHelper.nullIfBlank;
 
 /**
  * @author Steve Ebersole
@@ -46,8 +45,7 @@ public static void processNamedQuery(
 			JaxbHbmNamedQueryType namedQueryBinding,
 			String prefix) {
 		final String registrationName = prefix + namedQueryBinding.getName();
-
-		final NamedHqlQueryDefinition.Builder<?> queryBuilder =
+		final var queryBuilder =
 				new NamedHqlQueryDefinition.Builder<>( registrationName )
 						.setComment( namedQueryBinding.getComment() )
 						.setCacheable( namedQueryBinding.isCacheable() )
@@ -62,25 +60,24 @@ public static void processNamedQuery(
 
 		for ( Object content : namedQueryBinding.getContent() ) {
 			if ( content instanceof String string ) {
-				final String hqlString = nullIfEmpty( string.trim() );
-				if ( isNotEmpty( hqlString ) ) {
-					queryBuilder.setHqlString( hqlString );
+				if ( isNotBlank( string ) ) {
+					queryBuilder.setHqlString( string.trim() );
 					foundQuery = true;
 				}
 			}
+			else if ( content instanceof JAXBElement<?> element
+					&& element.getValue() instanceof JaxbHbmQueryParamType queryParamType ) {
+				queryBuilder.addParameterTypeHint( queryParamType.getName(), queryParamType.getType() );
+			}
 			else {
-				final JaxbHbmQueryParamType paramTypeBinding = (JaxbHbmQueryParamType)
-						( (JAXBElement<?>) content ).getValue();
-				queryBuilder.addParameterTypeHint( paramTypeBinding.getName(), paramTypeBinding.getType() );
+				throw new AssertionFailure( "Unexpected content type: " + content.getClass().getName() );
 			}
 		}
 
-		if ( ! foundQuery ) {
-			throw new org.hibernate.boot.MappingException(
-					String.format(
-							"Named query [%s] did not specify query string",
-							namedQueryBinding.getName()
-					),
+		if ( !foundQuery ) {
+			throw new MappingException(
+					"Named query [%s] did not specify query string"
+							.formatted( namedQueryBinding.getName() ),
 					context.getOrigin()
 			);
 		}
@@ -103,14 +100,11 @@ public static void processNamedNativeQuery(
 			JaxbHbmNamedNativeQueryType namedQueryBinding,
 			String prefix) {
 		if ( namedQueryBinding.isCallable() ) {
-			DeprecationLogger.DEPRECATION_LOGGER.warn(
-					"Marking named native queries as callable is no longer supported; use `@jakarta.persistence.NamedStoredProcedureQuery` instead.  Ignoring."
-			);
+			DEPRECATION_LOGGER.callableNamedNativeQuery();
 		}
 
 		final String registrationName = prefix + namedQueryBinding.getName();
-
-		final NamedNativeQueryDefinition.Builder<?> builder =
+		final var builder =
 				new NamedNativeQueryDefinition.Builder<>( registrationName )
 						.setComment( namedQueryBinding.getComment() )
 						.setCacheable( namedQueryBinding.isCacheable() )
@@ -122,11 +116,10 @@ public static void processNamedNativeQuery(
 						.setFetchSize( namedQueryBinding.getFetchSize() )
 						.setResultSetMappingName( namedQueryBinding.getResultsetRef() );
 
-		final ImplicitHbmResultSetMappingDescriptorBuilder implicitResultSetMappingBuilder =
+		final var implicitResultSetMappingBuilder =
 				new ImplicitHbmResultSetMappingDescriptorBuilder( registrationName, context );
 
 		boolean foundQuery = false;
-
 		for ( Object content : namedQueryBinding.getContent() ) {
 			final boolean wasQuery = processNamedQueryContentItem(
 					content,
@@ -139,45 +132,38 @@ public static void processNamedNativeQuery(
 				foundQuery = true;
 			}
 		}
-
 		if ( !foundQuery ) {
-			throw new org.hibernate.boot.MappingException(
-					String.format(
-							"Named native query [%s] did not specify query string",
-							namedQueryBinding.getName()
-					),
+			throw new MappingException(
+					"Named native query [%s] did not specify query string"
+							.formatted( namedQueryBinding.getName() ),
 					context.getOrigin()
 			);
 		}
 
+		final var collector = context.getMetadataCollector();
+
 		if ( implicitResultSetMappingBuilder.hasAnyReturns() ) {
 			if ( isNotEmpty( namedQueryBinding.getResultsetRef() ) ) {
-				throw new org.hibernate.boot.MappingException(
-						String.format(
-								"Named native query [%s] specified both a resultset-ref and an inline mapping of results",
-								namedQueryBinding.getName()
-						),
+				throw new MappingException(
+						"Named native query [%s] specified both a resultset-ref and an inline mapping of results"
+								.formatted( namedQueryBinding.getName() ),
 						context.getOrigin()
 				);
 			}
 
-			context.getMetadataCollector().addResultSetMapping( implicitResultSetMappingBuilder.build( context ) );
-
+			collector.addResultSetMapping( implicitResultSetMappingBuilder.build( context ) );
 			builder.setResultSetMappingName( implicitResultSetMappingBuilder.getRegistrationName() );
 		}
 
 		if ( namedQueryBinding.isCallable() ) {
-			final NamedProcedureCallDefinition definition = QueryBinder.createStoredProcedure(
-					builder, context,
-					() -> illegalCallSyntax( context, namedQueryBinding, builder.getSqlString() )
-			);
-			context.getMetadataCollector().addNamedProcedureCallDefinition( definition );
-			DeprecationLogger.DEPRECATION_LOGGER.warn(
-					"Marking named native queries as callable is deprecated; use `<named-stored-procedure-query/>` instead."
-			);
+			final var definition =
+					createStoredProcedure( builder, context,
+							() -> illegalCallSyntax( context, namedQueryBinding, builder.getSqlString() ) );
+			collector.addNamedProcedureCallDefinition( definition );
+			DEPRECATION_LOGGER.callableNamedNativeQuery();
 		}
 		else {
-			context.getMetadataCollector().addNamedNativeQuery( builder.build() );
+			collector.addNamedNativeQuery( builder.build() );
 		}
 	}
 
@@ -186,11 +172,8 @@ private static MappingException illegalCallSyntax(
 			JaxbHbmNamedNativeQueryType namedQueryBinding,
 			String sqlString) {
 		return new MappingException(
-				String.format(
-						"Callable named native query [%s] doesn't use the JDBC call syntax: %s",
-						namedQueryBinding.getName(),
-						sqlString
-				),
+				"Callable named native query [%s] doesn't use the JDBC call syntax: %s"
+						.formatted( namedQueryBinding.getName(), sqlString ),
 				context.getOrigin()
 		);
 	}
@@ -203,9 +186,9 @@ private static boolean processNamedQueryContentItem(
 			HbmLocalMetadataBuildingContext context) {
 		if ( content instanceof String string ) {
 			// Especially when the query string is wrapped in CDATA we will get
-			// "extra" Strings here containing just spaces and/or newlines.  This
+			// "extra" Strings here containing just spaces and/or newlines. This
 			// bit tries to account for them.
-			final String contentString = nullIfEmpty( string.trim() );
+			final String contentString = nullIfBlank( string );
 			if ( contentString != null ) {
 				queryBuilder.setSqlString( string );
 				return true;
@@ -243,14 +226,9 @@ else if ( content instanceof JaxbHbmNativeQueryCollectionLoadReturnType collecti
 			implicitResultSetMappingBuilder.addReturn( collectionLoadReturnType );
 		}
 		else {
-			throw new org.hibernate.boot.MappingException(
-					String.format(
-							Locale.ENGLISH,
-							"Encountered unexpected content type [%s] for named native query [%s] : [%s]",
-							content.getClass().getName(),
-							namedQueryBinding.getName(),
-							content
-					),
+			throw new MappingException(
+					"Encountered unexpected content type [%s] for named native query [%s] : [%s]"
+							.formatted( content.getClass().getName(), namedQueryBinding.getName(), content ),
 					context.getOrigin()
 			);
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularIdentifierAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularIdentifierAttributeSourceImpl.java
index bf5b06e05bb9..9c1c44e6db30 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularIdentifierAttributeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SingularIdentifierAttributeSourceImpl.java
@@ -17,10 +17,11 @@
 import org.hibernate.boot.model.source.spi.SingularAttributeSource;
 import org.hibernate.boot.model.source.spi.SizeSource;
 import org.hibernate.boot.model.source.spi.ToolingHintContext;
-import org.hibernate.internal.log.DeprecationLogger;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.tuple.GenerationTiming;
 
+import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
+
 /**
  * Implementation for {@code <id/>} mappings
  *
@@ -49,7 +50,7 @@ public SingularIdentifierAttributeSourceImpl(
 		super( mappingDocument );
 
 		if ( StringHelper.isEmpty( idElement.getName() ) ) {
-			DeprecationLogger.DEPRECATION_LOGGER.logDeprecationOfNonNamedIdAttribute( container.getAttributeRoleBase().getFullPath() );
+			DEPRECATION_LOGGER.logDeprecationOfNonNamedIdAttribute( container.getAttributeRoleBase().getFullPath() );
 			name = "id";
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java b/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java
index fac3be808cb9..56ea928b182c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java
@@ -13,10 +13,11 @@
 import jakarta.persistence.Access;
 
 /**
- * Indicates a problem with the placement of the {@link Access} annotation; either<ul>
+ * Indicates a problem with the placement of the {@link Access} annotation; either
+ * <ul>
  *     <li>{@linkplain jakarta.persistence.AccessType#FIELD FIELD} on a getter</li>
- *     <li>{@linkplain jakarta.persistence.AccessType#PROPERTY PROPERTY} on a field
- *     <li>{@linkplain jakarta.persistence.AccessType#PROPERTY PROPERTY} on a setter</li></li>
+ *     <li>{@linkplain jakarta.persistence.AccessType#PROPERTY PROPERTY} on a field</li>
+ *     <li>{@linkplain jakarta.persistence.AccessType#PROPERTY PROPERTY} on a setter</li>
  * </ul>
  *
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java
index b613becdab1b..3207709fa463 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.boot.models;
 
+import java.util.EnumSet;
 import java.util.function.Consumer;
 
 import org.hibernate.annotations.DialectOverride;
@@ -46,157 +47,225 @@
 import org.hibernate.models.internal.OrmAnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationDescriptor;
 
+import static org.hibernate.models.spi.AnnotationTarget.Kind;
+
 /**
  * @author Steve Ebersole
  */
 public interface DialectOverrideAnnotations {
 	OrmAnnotationDescriptor<DialectOverride.Checks, OverriddenChecksAnnotation> DIALECT_OVERRIDE_CHECKS = new OrmAnnotationDescriptor<>(
 			DialectOverride.Checks.class,
-			OverriddenChecksAnnotation.class
+			OverriddenChecksAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.Check, OverriddenCheckAnnotation> DIALECT_OVERRIDE_CHECK = new OrmAnnotationDescriptor<>(
 			DialectOverride.Check.class,
 			OverriddenCheckAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false,
 			DIALECT_OVERRIDE_CHECKS
 	);
 	OrmAnnotationDescriptor<DialectOverride.ColumnDefaults, OverriddenColumnDefaultsAnnotation> DIALECT_OVERRIDE_COLUMN_DEFAULTS = new OrmAnnotationDescriptor<>(
 			DialectOverride.ColumnDefaults.class,
-			OverriddenColumnDefaultsAnnotation.class
+			OverriddenColumnDefaultsAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.ColumnDefault, OverriddenColumnDefaultAnnotation> DIALECT_OVERRIDE_COLUMN_DEFAULT = new OrmAnnotationDescriptor<>(
 			DialectOverride.ColumnDefault.class,
 			OverriddenColumnDefaultAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false,
 			DIALECT_OVERRIDE_COLUMN_DEFAULTS
 	);
 	OrmAnnotationDescriptor<DialectOverride.GeneratedColumns, OverriddenGeneratedColumnsAnnotation> DIALECT_OVERRIDE_GENERATED_COLUMNS = new OrmAnnotationDescriptor<>(
 			DialectOverride.GeneratedColumns.class,
-			OverriddenGeneratedColumnsAnnotation.class
+			OverriddenGeneratedColumnsAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.GeneratedColumn, OverriddenGeneratedColumnAnnotation> DIALECT_OVERRIDE_GENERATED_COLUMN = new OrmAnnotationDescriptor<>(
 			DialectOverride.GeneratedColumn.class,
 			OverriddenGeneratedColumnAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false,
 			DIALECT_OVERRIDE_GENERATED_COLUMNS
 	);
 	OrmAnnotationDescriptor<DialectOverride.DiscriminatorFormulas, OverriddenDiscriminatorFormulasAnnotation> DIALECT_OVERRIDE_DISCRIMINATOR_FORMULAS = new OrmAnnotationDescriptor<>(
 			DialectOverride.DiscriminatorFormulas.class,
-			OverriddenDiscriminatorFormulasAnnotation.class
+			OverriddenDiscriminatorFormulasAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.DiscriminatorFormula, OverriddenDiscriminatorFormulaAnnotation> DIALECT_OVERRIDE_DISCRIMINATOR_FORMULA = new OrmAnnotationDescriptor<>(
 			DialectOverride.DiscriminatorFormula.class,
 			OverriddenDiscriminatorFormulaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false,
 			DIALECT_OVERRIDE_DISCRIMINATOR_FORMULAS
 	);
 	OrmAnnotationDescriptor<FetchProfileOverrides, FetchProfileOverridesAnnotation> FETCH_PROFILE_OVERRIDES = new OrmAnnotationDescriptor<>(
 			FetchProfileOverrides.class,
-			FetchProfileOverridesAnnotation.class
+			FetchProfileOverridesAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
 	OrmAnnotationDescriptor<FetchProfileOverride, FetchProfileOverrideAnnotation> FETCH_PROFILE_OVERRIDE = new OrmAnnotationDescriptor<>(
 			FetchProfileOverride.class,
 			FetchProfileOverrideAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false,
 			FETCH_PROFILE_OVERRIDES
 	);
 	OrmAnnotationDescriptor<DialectOverride.FilterOverrides, OverriddenFilterOverridesAnnotation> DIALECT_OVERRIDE_FILTER_OVERRIDES = new OrmAnnotationDescriptor<>(
 			DialectOverride.FilterOverrides.class,
-			OverriddenFilterOverridesAnnotation.class
+			OverriddenFilterOverridesAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.Filters, OverriddenFiltersAnnotation> DIALECT_OVERRIDE_FILTERS = new OrmAnnotationDescriptor<DialectOverride.Filters, OverriddenFiltersAnnotation>(
 			DialectOverride.Filters.class,
 			OverriddenFiltersAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false,
 			DIALECT_OVERRIDE_FILTER_OVERRIDES
 	);
 	OrmAnnotationDescriptor<DialectOverride.FilterDefOverrides, OverriddenFilterDefOverridesAnnotation> DIALECT_OVERRIDE_FILTER_DEF_OVERRIDES = new OrmAnnotationDescriptor<>(
 			DialectOverride.FilterDefOverrides.class,
-			OverriddenFilterDefOverridesAnnotation.class
+			OverriddenFilterDefOverridesAnnotation.class,
+			EnumSet.of( Kind.PACKAGE, Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.FilterDefs, OverriddenFilterDefsAnnotation> DIALECT_OVERRIDE_FILTER_DEFS = new OrmAnnotationDescriptor<>(
 			DialectOverride.FilterDefs.class,
 			OverriddenFilterDefsAnnotation.class,
+			EnumSet.of( Kind.PACKAGE, Kind.CLASS ),
+			false,
 			DIALECT_OVERRIDE_FILTER_DEF_OVERRIDES
 	);
 	OrmAnnotationDescriptor<DialectOverride.Formulas, OverriddenFormulasAnnotation> DIALECT_OVERRIDE_FORMULAS = new OrmAnnotationDescriptor<>(
 			DialectOverride.Formulas.class,
-			OverriddenFormulasAnnotation.class
+			OverriddenFormulasAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.Formula, OverriddenFormulaAnnotation> DIALECT_OVERRIDE_FORMULA = new OrmAnnotationDescriptor<>(
 			DialectOverride.Formula.class,
 			OverriddenFormulaAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false,
 			DIALECT_OVERRIDE_FORMULAS
 	);
 	OrmAnnotationDescriptor<DialectOverride.JoinFormulas, OverriddenJoinFormulasAnnotation> DIALECT_OVERRIDE_JOIN_FORMULAS = new OrmAnnotationDescriptor<>(
 			DialectOverride.JoinFormulas.class,
-			OverriddenJoinFormulasAnnotation.class
+			OverriddenJoinFormulasAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.JoinFormula, OverriddenJoinFormulaAnnotation> DIALECT_OVERRIDE_JOIN_FORMULA = new OrmAnnotationDescriptor<>(
 			DialectOverride.JoinFormula.class,
 			OverriddenJoinFormulaAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false,
 			DIALECT_OVERRIDE_JOIN_FORMULAS
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLInserts, OverriddenSQLInsertsAnnotation> DIALECT_OVERRIDE_SQL_INSERTS = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLInserts.class,
-			OverriddenSQLInsertsAnnotation.class
+			OverriddenSQLInsertsAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLInsert, OverriddenSQLInsertAnnotation> DIALECT_OVERRIDE_SQL_INSERT = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLInsert.class,
 			OverriddenSQLInsertAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false,
 			DIALECT_OVERRIDE_SQL_INSERTS
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLUpdates, OverriddenSQLUpdatesAnnotation> DIALECT_OVERRIDE_SQL_UPDATES = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLUpdates.class,
-			OverriddenSQLUpdatesAnnotation.class
+			OverriddenSQLUpdatesAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLUpdate, OverriddenSQLUpdateAnnotation> DIALECT_OVERRIDE_SQL_UPDATE = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLUpdate.class,
 			OverriddenSQLUpdateAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false,
 			DIALECT_OVERRIDE_SQL_UPDATES
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLDeletes, OverriddenSQLDeletesAnnotation> DIALECT_OVERRIDE_SQL_DELETES = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLDeletes.class,
-			OverriddenSQLDeletesAnnotation.class
+			OverriddenSQLDeletesAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLDelete, OverriddenSQLDeleteAnnotation> DIALECT_OVERRIDE_SQL_DELETE = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLDelete.class,
 			OverriddenSQLDeleteAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false,
 			DIALECT_OVERRIDE_SQL_DELETES
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLDeleteAlls, OverriddenSQLDeleteAllsAnnotation> DIALECT_OVERRIDE_SQL_DELETE_ALLS = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLDeleteAlls.class,
-			OverriddenSQLDeleteAllsAnnotation.class
+			OverriddenSQLDeleteAllsAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLDeleteAll, OverriddenSQLDeleteAllAnnotation> DIALECT_OVERRIDE_SQL_DELETE_ALL = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLDeleteAll.class,
 			OverriddenSQLDeleteAllAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false,
 			DIALECT_OVERRIDE_SQL_DELETE_ALLS
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLOrders, OverriddenSQLOrdersAnnotation> DIALECT_OVERRIDE_SQL_ORDERS = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLOrders.class,
-			OverriddenSQLOrdersAnnotation.class
+			OverriddenSQLOrdersAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLOrder, OverriddenSQLOrderAnnotation> DIALECT_OVERRIDE_SQL_ORDER = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLOrder.class,
 			OverriddenSQLOrderAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false,
 			DIALECT_OVERRIDE_SQL_ORDERS
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLRestrictions, OverriddenSQLRestrictionsAnnotation> DIALECT_OVERRIDE_SQL_RESTRICTIONS = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLRestrictions.class,
-			OverriddenSQLRestrictionsAnnotation.class
+			OverriddenSQLRestrictionsAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLRestriction, OverriddenSQLRestrictionAnnotation> DIALECT_OVERRIDE_SQL_RESTRICTION = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLRestriction.class,
 			OverriddenSQLRestrictionAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false,
 			DIALECT_OVERRIDE_SQL_RESTRICTIONS
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLSelects, OverriddenSQLSelectsAnnotation> DIALECT_OVERRIDE_SQL_SELECTS = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLSelects.class,
-			OverriddenSQLSelectsAnnotation.class
+			OverriddenSQLSelectsAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<DialectOverride.SQLSelect, OverriddenSQLSelectAnnotation> DIALECT_OVERRIDE_SQL_SELECT = new OrmAnnotationDescriptor<>(
 			DialectOverride.SQLSelect.class,
 			OverriddenSQLSelectAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD, Kind.CLASS ),
+			false,
 			DIALECT_OVERRIDE_SQL_SELECTS
 	);
 	OrmAnnotationDescriptor<DialectOverride.Version, OverrideVersionAnnotation> DIALECT_OVERRIDE_VERSION = new OrmAnnotationDescriptor<>(
 			DialectOverride.Version.class,
-			OverrideVersionAnnotation.class
+			OverrideVersionAnnotation.class,
+			EnumSet.allOf( Kind.class ),
+			false
 	);
 
 	static void forEachAnnotation(Consumer<AnnotationDescriptor<?>> consumer) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java
index 7c343f3bac4b..7e885034d59a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.boot.models;
 
+import java.util.EnumSet;
 import java.lang.annotation.Annotation;
 import java.util.function.Consumer;
 
@@ -15,6 +16,8 @@
 import org.hibernate.models.internal.OrmAnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationDescriptor;
 
+import static org.hibernate.models.spi.AnnotationTarget.Kind;
+
 /**
  * Details about Hibernate annotations.
  *
@@ -28,633 +31,966 @@
  */
 @SuppressWarnings({ "deprecation", "removal", "unused" })
 public interface HibernateAnnotations {
-	OrmAnnotationDescriptor<Any,AnyAnnotation> ANY = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Any, AnyAnnotation> ANY = new OrmAnnotationDescriptor<>(
 			Any.class,
-			AnyAnnotation.class
+			AnyAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<AnyDiscriminator,AnyDiscriminatorAnnotation> ANY_DISCRIMINATOR = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<AnyDiscriminator, AnyDiscriminatorAnnotation> ANY_DISCRIMINATOR = new OrmAnnotationDescriptor<>(
 			AnyDiscriminator.class,
-			AnyDiscriminatorAnnotation.class
+			AnyDiscriminatorAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<AnyDiscriminatorImplicitValues,AnyDiscriminatorImplicitValuesAnnotation> ANY_DISCRIMINATOR_IMPLICIT_VALUES = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<AnyDiscriminatorImplicitValues, AnyDiscriminatorImplicitValuesAnnotation> ANY_DISCRIMINATOR_IMPLICIT_VALUES = new OrmAnnotationDescriptor<>(
 			AnyDiscriminatorImplicitValues.class,
-			AnyDiscriminatorImplicitValuesAnnotation.class
+			AnyDiscriminatorImplicitValuesAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<AnyDiscriminatorValues,AnyDiscriminatorValuesAnnotation> ANY_DISCRIMINATOR_VALUES = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<AnyDiscriminatorValues, AnyDiscriminatorValuesAnnotation> ANY_DISCRIMINATOR_VALUES = new OrmAnnotationDescriptor<>(
 			AnyDiscriminatorValues.class,
-			AnyDiscriminatorValuesAnnotation.class
+			AnyDiscriminatorValuesAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<AnyDiscriminatorValue,AnyDiscriminatorValueAnnotation> ANY_DISCRIMINATOR_VALUE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<AnyDiscriminatorValue, AnyDiscriminatorValueAnnotation> ANY_DISCRIMINATOR_VALUE = new OrmAnnotationDescriptor<>(
 			AnyDiscriminatorValue.class,
 			AnyDiscriminatorValueAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false,
 			ANY_DISCRIMINATOR_VALUES
 	);
-	OrmAnnotationDescriptor<AnyKeyJavaClass,AnyKeyJavaClassAnnotation> ANY_KEY_JAVA_CLASS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<AnyKeyJavaClass, AnyKeyJavaClassAnnotation> ANY_KEY_JAVA_CLASS = new OrmAnnotationDescriptor<>(
 			AnyKeyJavaClass.class,
-			AnyKeyJavaClassAnnotation.class
+			AnyKeyJavaClassAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<AnyKeyJavaType,AnyKeyJavaTypeAnnotation> ANY_KEY_JAVA_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<AnyKeyJavaType, AnyKeyJavaTypeAnnotation> ANY_KEY_JAVA_TYPE = new OrmAnnotationDescriptor<>(
 			AnyKeyJavaType.class,
-			AnyKeyJavaTypeAnnotation.class
+			AnyKeyJavaTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<AnyKeyJdbcType,AnyKeyJdbcTypeAnnotation> ANY_KEY_JDBC_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<AnyKeyJdbcType, AnyKeyJdbcTypeAnnotation> ANY_KEY_JDBC_TYPE = new OrmAnnotationDescriptor<>(
 			AnyKeyJdbcType.class,
-			AnyKeyJdbcTypeAnnotation.class
+			AnyKeyJdbcTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<AnyKeyJdbcTypeCode,AnyKeyJdbcTypeCodeAnnotation> ANY_KEY_JDBC_TYPE_CODE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<AnyKeyJdbcTypeCode, AnyKeyJdbcTypeCodeAnnotation> ANY_KEY_JDBC_TYPE_CODE = new OrmAnnotationDescriptor<>(
 			AnyKeyJdbcTypeCode.class,
-			AnyKeyJdbcTypeCodeAnnotation.class
+			AnyKeyJdbcTypeCodeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
 	OrmAnnotationDescriptor<AnyKeyType, AnyKeTypeAnnotation> ANY_KEY_TYPE = new OrmAnnotationDescriptor<>(
 			AnyKeyType.class,
-			AnyKeTypeAnnotation.class
+			AnyKeTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<Array,ArrayAnnotation> ARRAY = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Array, ArrayAnnotation> ARRAY = new OrmAnnotationDescriptor<>(
 			Array.class,
-			ArrayAnnotation.class
+			ArrayAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	SpecializedAnnotationDescriptor<AttributeAccessor,AttributeAccessorAnnotation> ATTRIBUTE_ACCESSOR = new SpecializedAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<AttributeAccessor, AttributeAccessorAnnotation> ATTRIBUTE_ACCESSOR = new OrmAnnotationDescriptor<>(
 			AttributeAccessor.class,
-			AttributeAccessorAnnotation.class
+			AttributeAccessorAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
-	OrmAnnotationDescriptor<AttributeBinderType,AttributeBinderTypeAnnotation> ATTRIBUTE_BINDER_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<AttributeBinderType, AttributeBinderTypeAnnotation> ATTRIBUTE_BINDER_TYPE = new OrmAnnotationDescriptor<>(
 			AttributeBinderType.class,
-			AttributeBinderTypeAnnotation.class
+			AttributeBinderTypeAnnotation.class,
+			EnumSet.of( Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<Bag,BagAnnotation> BAG = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Bag, BagAnnotation> BAG = new OrmAnnotationDescriptor<>(
 			Bag.class,
-			BagAnnotation.class
+			BagAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	SpecializedAnnotationDescriptor<BatchSize,BatchSizeAnnotation> BATCH_SIZE = new SpecializedAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<BatchSize, BatchSizeAnnotation> BATCH_SIZE = new OrmAnnotationDescriptor<>(
 			BatchSize.class,
-			BatchSizeAnnotation.class
+			BatchSizeAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.FIELD, Kind.METHOD ),
+			false
 	);
-	OrmAnnotationDescriptor<Cache,CacheAnnotation> CACHE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Cache, CacheAnnotation> CACHE = new OrmAnnotationDescriptor<>(
 			Cache.class,
-			CacheAnnotation.class
+			CacheAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<Cascade,CascadeAnnotation> CASCADE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Cascade, CascadeAnnotation> CASCADE = new OrmAnnotationDescriptor<>(
 			Cascade.class,
-			CascadeAnnotation.class
+			CascadeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<Checks,ChecksAnnotation> CHECKS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Checks, ChecksAnnotation> CHECKS = new OrmAnnotationDescriptor<>(
 			Checks.class,
-			ChecksAnnotation.class
+			ChecksAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<Check,CheckAnnotation> CHECK = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Check, CheckAnnotation> CHECK = new OrmAnnotationDescriptor<>(
 			Check.class,
 			CheckAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false,
 			CHECKS
 	);
-	SpecializedAnnotationDescriptor<Collate,CollateAnnotation> COLLATE = new SpecializedAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Collate, CollateAnnotation> COLLATE = new OrmAnnotationDescriptor<>(
 			Collate.class,
-			CollateAnnotation.class
+			CollateAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
-	OrmAnnotationDescriptor<CollectionId,CollectionIdAnnotation> COLLECTION_ID = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CollectionId, CollectionIdAnnotation> COLLECTION_ID = new OrmAnnotationDescriptor<>(
 			CollectionId.class,
-			CollectionIdAnnotation.class
+			CollectionIdAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<CollectionIdJavaClass,CollectionIdJavaClassAnnotation> COLLECTION_ID_JAVA_CLASS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CollectionIdJavaClass, CollectionIdJavaClassAnnotation> COLLECTION_ID_JAVA_CLASS = new OrmAnnotationDescriptor<>(
 			CollectionIdJavaClass.class,
-			CollectionIdJavaClassAnnotation.class
+			CollectionIdJavaClassAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<CollectionIdJavaType,CollectionIdJavaTypeAnnotation> COLLECTION_ID_JAVA_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CollectionIdJavaType, CollectionIdJavaTypeAnnotation> COLLECTION_ID_JAVA_TYPE = new OrmAnnotationDescriptor<>(
 			CollectionIdJavaType.class,
-			CollectionIdJavaTypeAnnotation.class
+			CollectionIdJavaTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
-	OrmAnnotationDescriptor<CollectionIdJdbcType,CollectionIdJdbcTypeAnnotation> COLLECTION_ID_JDBC_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CollectionIdJdbcType, CollectionIdJdbcTypeAnnotation> COLLECTION_ID_JDBC_TYPE = new OrmAnnotationDescriptor<>(
 			CollectionIdJdbcType.class,
-			CollectionIdJdbcTypeAnnotation.class
+			CollectionIdJdbcTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
-	OrmAnnotationDescriptor<CollectionIdJdbcTypeCode,CollectionIdJdbcTypeCodeAnnotation> COLLECTION_ID_JDBC_TYPE_CODE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CollectionIdJdbcTypeCode, CollectionIdJdbcTypeCodeAnnotation> COLLECTION_ID_JDBC_TYPE_CODE = new OrmAnnotationDescriptor<>(
 			CollectionIdJdbcTypeCode.class,
-			CollectionIdJdbcTypeCodeAnnotation.class
+			CollectionIdJdbcTypeCodeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
-	OrmAnnotationDescriptor<CollectionIdMutability,CollectionIdMutabilityAnnotation> COLLECTION_ID_MUTABILITY = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CollectionIdMutability, CollectionIdMutabilityAnnotation> COLLECTION_ID_MUTABILITY = new OrmAnnotationDescriptor<>(
 			CollectionIdMutability.class,
-			CollectionIdMutabilityAnnotation.class
+			CollectionIdMutabilityAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
-	OrmAnnotationDescriptor<CollectionIdType,CollectionIdTypeAnnotation> COLLECTION_ID_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CollectionIdType, CollectionIdTypeAnnotation> COLLECTION_ID_TYPE = new OrmAnnotationDescriptor<>(
 			CollectionIdType.class,
-			CollectionIdTypeAnnotation.class
+			CollectionIdTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<CollectionType,CollectionTypeAnnotation> COLLECTION_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CollectionType, CollectionTypeAnnotation> COLLECTION_TYPE = new OrmAnnotationDescriptor<>(
 			CollectionType.class,
-			CollectionTypeAnnotation.class
+			CollectionTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
 	OrmAnnotationDescriptor<CollectionClassification, CollectionClassificationXmlAnnotation> COLLECTION_CLASSIFICATION = new OrmAnnotationDescriptor<>(
 			CollectionClassification.class,
-			CollectionClassificationXmlAnnotation.class
+			CollectionClassificationXmlAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<CollectionTypeRegistrations,CollectionTypeRegistrationsAnnotation> COLLECTION_TYPE_REGISTRATIONS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CollectionTypeRegistrations, CollectionTypeRegistrationsAnnotation> COLLECTION_TYPE_REGISTRATIONS = new OrmAnnotationDescriptor<>(
 			CollectionTypeRegistrations.class,
-			CollectionTypeRegistrationsAnnotation.class
+			CollectionTypeRegistrationsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<CollectionTypeRegistration,CollectionTypeRegistrationAnnotation> COLLECTION_TYPE_REGISTRATION = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CollectionTypeRegistration, CollectionTypeRegistrationAnnotation> COLLECTION_TYPE_REGISTRATION = new OrmAnnotationDescriptor<>(
 			CollectionTypeRegistration.class,
 			CollectionTypeRegistrationAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false,
 			COLLECTION_TYPE_REGISTRATIONS
 	);
-	OrmAnnotationDescriptor<ColumnDefault,ColumnDefaultAnnotation> COLUMN_DEFAULT = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<ColumnDefault, ColumnDefaultAnnotation> COLUMN_DEFAULT = new OrmAnnotationDescriptor<>(
 			ColumnDefault.class,
-			ColumnDefaultAnnotation.class
-	);
-	OrmAnnotationDescriptor<Columns,ColumnsAnnotation> COLUMNS = new OrmAnnotationDescriptor<>(
-			Columns.class,
-			ColumnsAnnotation.class
+			ColumnDefaultAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<ColumnTransformers,ColumnTransformersAnnotation> COLUMN_TRANSFORMERS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<ColumnTransformers, ColumnTransformersAnnotation> COLUMN_TRANSFORMERS = new OrmAnnotationDescriptor<>(
 			ColumnTransformers.class,
-			ColumnTransformersAnnotation.class
+			ColumnTransformersAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<ColumnTransformer,ColumnTransformerAnnotation> COLUMN_TRANSFORMER = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<ColumnTransformer, ColumnTransformerAnnotation> COLUMN_TRANSFORMER = new OrmAnnotationDescriptor<>(
 			ColumnTransformer.class,
 			ColumnTransformerAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false,
 			COLUMN_TRANSFORMERS
 	);
-	SpecializedAnnotationDescriptor<Comments,CommentsAnnotation> COMMENTS = new SpecializedAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Comments, CommentsAnnotation> COMMENTS = new OrmAnnotationDescriptor<>(
 			Comments.class,
-			CommentsAnnotation.class
+			CommentsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.FIELD, Kind.METHOD ),
+			false
 	);
-	SpecializedAnnotationDescriptor<Comment,CommentAnnotation> COMMENT = new SpecializedAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Comment, CommentAnnotation> COMMENT = new OrmAnnotationDescriptor<>(
 			Comment.class,
 			CommentAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.FIELD, Kind.METHOD ),
+			false,
 			COMMENTS
 	);
-	OrmAnnotationDescriptor<CompositeType,CompositeTypeAnnotation> COMPOSITE_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CompositeType, CompositeTypeAnnotation> COMPOSITE_TYPE = new OrmAnnotationDescriptor<>(
 			CompositeType.class,
-			CompositeTypeAnnotation.class
+			CompositeTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<CompositeTypeRegistrations,CompositeTypeRegistrationsAnnotation> COMPOSITE_TYPE_REGISTRATIONS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CompositeTypeRegistrations, CompositeTypeRegistrationsAnnotation> COMPOSITE_TYPE_REGISTRATIONS = new OrmAnnotationDescriptor<>(
 			CompositeTypeRegistrations.class,
-			CompositeTypeRegistrationsAnnotation.class
+			CompositeTypeRegistrationsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false
 	);
-	OrmAnnotationDescriptor<CompositeTypeRegistration,CompositeTypeRegistrationAnnotation> COMPOSITE_TYPE_REGISTRATION = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CompositeTypeRegistration, CompositeTypeRegistrationAnnotation> COMPOSITE_TYPE_REGISTRATION = new OrmAnnotationDescriptor<>(
 			CompositeTypeRegistration.class,
 			CompositeTypeRegistrationAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false,
 			COMPOSITE_TYPE_REGISTRATIONS
 	);
-	OrmAnnotationDescriptor<ConcreteProxy,ConcreteProxyAnnotation> CONCRETE_PROXY = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<ConcreteProxy, ConcreteProxyAnnotation> CONCRETE_PROXY = new OrmAnnotationDescriptor<>(
 			ConcreteProxy.class,
-			ConcreteProxyAnnotation.class
+			ConcreteProxyAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<ConverterRegistrations,ConverterRegistrationsAnnotation> CONVERTER_REGISTRATIONS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<ConverterRegistrations, ConverterRegistrationsAnnotation> CONVERTER_REGISTRATIONS = new OrmAnnotationDescriptor<>(
 			ConverterRegistrations.class,
-			ConverterRegistrationsAnnotation.class
+			ConverterRegistrationsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false
 	);
-	OrmAnnotationDescriptor<ConverterRegistration,ConverterRegistrationAnnotation> CONVERTER_REGISTRATION = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<ConverterRegistration, ConverterRegistrationAnnotation> CONVERTER_REGISTRATION = new OrmAnnotationDescriptor<>(
 			ConverterRegistration.class,
 			ConverterRegistrationAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false,
 			CONVERTER_REGISTRATIONS
 	);
-	OrmAnnotationDescriptor<CreationTimestamp,CreationTimestampAnnotation> CREATION_TIMESTAMP = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CreationTimestamp, CreationTimestampAnnotation> CREATION_TIMESTAMP = new OrmAnnotationDescriptor<>(
 			CreationTimestamp.class,
-			CreationTimestampAnnotation.class
+			CreationTimestampAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<CurrentTimestamp,CurrentTimestampAnnotation> CURRENT_TIMESTAMP = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<CurrentTimestamp, CurrentTimestampAnnotation> CURRENT_TIMESTAMP = new OrmAnnotationDescriptor<>(
 			CurrentTimestamp.class,
-			CurrentTimestampAnnotation.class
+			CurrentTimestampAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<DiscriminatorFormula,DiscriminatorFormulaAnnotation> DISCRIMINATOR_FORMULA = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<DiscriminatorFormula, DiscriminatorFormulaAnnotation> DISCRIMINATOR_FORMULA = new OrmAnnotationDescriptor<>(
 			DiscriminatorFormula.class,
-			DiscriminatorFormulaAnnotation.class
+			DiscriminatorFormulaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	SpecializedAnnotationDescriptor<DiscriminatorOptions,DiscriminatorOptionsAnnotation> DISCRIMINATOR_OPTIONS = new SpecializedAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<DiscriminatorOptions, DiscriminatorOptionsAnnotation> DISCRIMINATOR_OPTIONS = new OrmAnnotationDescriptor<>(
 			DiscriminatorOptions.class,
-			DiscriminatorOptionsAnnotation.class
+			DiscriminatorOptionsAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<DynamicInsert,DynamicInsertAnnotation> DYNAMIC_INSERT = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<DynamicInsert, DynamicInsertAnnotation> DYNAMIC_INSERT = new OrmAnnotationDescriptor<>(
 			DynamicInsert.class,
-			DynamicInsertAnnotation.class
+			DynamicInsertAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<DynamicUpdate,DynamicUpdateAnnotation> DYNAMIC_UPDATE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<DynamicUpdate, DynamicUpdateAnnotation> DYNAMIC_UPDATE = new OrmAnnotationDescriptor<>(
 			DynamicUpdate.class,
-			DynamicUpdateAnnotation.class
+			DynamicUpdateAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<EmbeddableInstantiator,EmbeddableInstantiatorAnnotation> EMBEDDABLE_INSTANTIATOR = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<EmbeddableInstantiator, EmbeddableInstantiatorAnnotation> EMBEDDABLE_INSTANTIATOR = new OrmAnnotationDescriptor<>(
 			EmbeddableInstantiator.class,
-			EmbeddableInstantiatorAnnotation.class
+			EmbeddableInstantiatorAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<EmbeddableInstantiatorRegistrations,EmbeddableInstantiatorRegistrationsAnnotation> EMBEDDABLE_INSTANTIATOR_REGISTRATIONS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<EmbeddableInstantiatorRegistrations, EmbeddableInstantiatorRegistrationsAnnotation> EMBEDDABLE_INSTANTIATOR_REGISTRATIONS = new OrmAnnotationDescriptor<>(
 			EmbeddableInstantiatorRegistrations.class,
-			EmbeddableInstantiatorRegistrationsAnnotation.class
+			EmbeddableInstantiatorRegistrationsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false
 	);
-	OrmAnnotationDescriptor<EmbeddableInstantiatorRegistration,EmbeddableInstantiatorRegistrationAnnotation> EMBEDDABLE_INSTANTIATOR_REGISTRATION = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<EmbeddableInstantiatorRegistration, EmbeddableInstantiatorRegistrationAnnotation> EMBEDDABLE_INSTANTIATOR_REGISTRATION = new OrmAnnotationDescriptor<>(
 			EmbeddableInstantiatorRegistration.class,
 			EmbeddableInstantiatorRegistrationAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false,
 			EMBEDDABLE_INSTANTIATOR_REGISTRATIONS
 	);
-	OrmAnnotationDescriptor<EmbeddedColumnNaming,EmbeddedColumnNamingAnnotation> EMBEDDED_COLUMN_NAMING = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<EmbeddedColumnNaming, EmbeddedColumnNamingAnnotation> EMBEDDED_COLUMN_NAMING = new OrmAnnotationDescriptor<>(
 			EmbeddedColumnNaming.class,
-			EmbeddedColumnNamingAnnotation.class
+			EmbeddedColumnNamingAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<EmbeddedTable,EmbeddedTableAnnotation> EMBEDDED_TABLE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<EmbeddedTable, EmbeddedTableAnnotation> EMBEDDED_TABLE = new OrmAnnotationDescriptor<>(
 			EmbeddedTable.class,
-			EmbeddedTableAnnotation.class
+			EmbeddedTableAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<Fetch,FetchAnnotation> FETCH = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Fetch, FetchAnnotation> FETCH = new OrmAnnotationDescriptor<>(
 			Fetch.class,
-			FetchAnnotation.class
+			FetchAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<FetchProfiles,FetchProfilesAnnotation> FETCH_PROFILES = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<FetchProfiles, FetchProfilesAnnotation> FETCH_PROFILES = new OrmAnnotationDescriptor<>(
 			FetchProfiles.class,
-			FetchProfilesAnnotation.class
+			FetchProfilesAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			false
 	);
-	OrmAnnotationDescriptor<FetchProfile,FetchProfileAnnotation> FETCH_PROFILE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<FetchProfile, FetchProfileAnnotation> FETCH_PROFILE = new OrmAnnotationDescriptor<>(
 			FetchProfile.class,
 			FetchProfileAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			false,
 			FETCH_PROFILES
 	);
-	OrmAnnotationDescriptor<Filters,FiltersAnnotation> FILTERS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Filters, FiltersAnnotation> FILTERS = new OrmAnnotationDescriptor<>(
 			Filters.class,
-			FiltersAnnotation.class
+			FiltersAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<Filter,FilterAnnotation> FILTER = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Filter, FilterAnnotation> FILTER = new OrmAnnotationDescriptor<>(
 			Filter.class,
 			FilterAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false,
 			FILTERS
 	);
-	OrmAnnotationDescriptor<FilterDefs,FilterDefsAnnotation> FILTER_DEFS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<FilterDefs, FilterDefsAnnotation> FILTER_DEFS = new OrmAnnotationDescriptor<>(
 			FilterDefs.class,
-			FilterDefsAnnotation.class
+			FilterDefsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			false
 	);
-	OrmAnnotationDescriptor<FilterDef,FilterDefAnnotation> FILTER_DEF = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<FilterDef, FilterDefAnnotation> FILTER_DEF = new OrmAnnotationDescriptor<>(
 			FilterDef.class,
 			FilterDefAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			false,
 			FILTER_DEFS
 	);
-	OrmAnnotationDescriptor<FilterJoinTables,FilterJoinTablesAnnotation> FILTER_JOIN_TABLES = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<FilterJoinTables, FilterJoinTablesAnnotation> FILTER_JOIN_TABLES = new OrmAnnotationDescriptor<>(
 			FilterJoinTables.class,
-			FilterJoinTablesAnnotation.class
+			FilterJoinTablesAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<FilterJoinTable,FilterJoinTableAnnotation> FILTER_JOIN_TABLE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<FilterJoinTable, FilterJoinTableAnnotation> FILTER_JOIN_TABLE = new OrmAnnotationDescriptor<>(
 			FilterJoinTable.class,
 			FilterJoinTableAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false,
 			FILTER_JOIN_TABLES
 	);
-	OrmAnnotationDescriptor<Formula,FormulaAnnotation> FORMULA = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Formula, FormulaAnnotation> FORMULA = new OrmAnnotationDescriptor<>(
 			Formula.class,
-			FormulaAnnotation.class
+			FormulaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<FractionalSeconds,FractionalSecondsAnnotation> FRACTIONAL_SECONDS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<FractionalSeconds, FractionalSecondsAnnotation> FRACTIONAL_SECONDS = new OrmAnnotationDescriptor<>(
 			FractionalSeconds.class,
-			FractionalSecondsAnnotation.class
+			FractionalSecondsAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<Generated,GeneratedAnnotation> GENERATED = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Generated, GeneratedAnnotation> GENERATED = new OrmAnnotationDescriptor<>(
 			Generated.class,
-			GeneratedAnnotation.class
+			GeneratedAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<GeneratedColumn,GeneratedColumnAnnotation> GENERATED_COLUMN = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<GeneratedColumn, GeneratedColumnAnnotation> GENERATED_COLUMN = new OrmAnnotationDescriptor<>(
 			GeneratedColumn.class,
-			GeneratedColumnAnnotation.class
+			GeneratedColumnAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<GenericGenerators,GenericGeneratorsAnnotation> GENERIC_GENERATORS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<GenericGenerators, GenericGeneratorsAnnotation> GENERIC_GENERATORS = new OrmAnnotationDescriptor<>(
 			GenericGenerators.class,
-			GenericGeneratorsAnnotation.class
+			GenericGeneratorsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			false
 	);
-	OrmAnnotationDescriptor<GenericGenerator,GenericGeneratorAnnotation> GENERIC_GENERATOR = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<GenericGenerator, GenericGeneratorAnnotation> GENERIC_GENERATOR = new OrmAnnotationDescriptor<>(
 			GenericGenerator.class,
 			GenericGeneratorAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS, Kind.PACKAGE ),
+			false,
 			GENERIC_GENERATORS
 	);
-	OrmAnnotationDescriptor<HQLSelect,HQLSelectAnnotation> HQL_SELECT = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<HQLSelect, HQLSelectAnnotation> HQL_SELECT = new OrmAnnotationDescriptor<>(
 			HQLSelect.class,
-			HQLSelectAnnotation.class
+			HQLSelectAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<IdGeneratorType,IdGeneratorTypeAnnotation> ID_GENERATOR_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<IdGeneratorType, IdGeneratorTypeAnnotation> ID_GENERATOR_TYPE = new OrmAnnotationDescriptor<>(
 			IdGeneratorType.class,
-			IdGeneratorTypeAnnotation.class
+			IdGeneratorTypeAnnotation.class,
+			EnumSet.of( Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<Immutable,ImmutableAnnotation> IMMUTABLE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Immutable, ImmutableAnnotation> IMMUTABLE = new OrmAnnotationDescriptor<>(
 			Immutable.class,
-			ImmutableAnnotation.class
+			ImmutableAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<Imported,ImportedAnnotation> IMPORTED = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Imported, ImportedAnnotation> IMPORTED = new OrmAnnotationDescriptor<>(
 			Imported.class,
-			ImportedAnnotation.class
+			ImportedAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<Instantiator,InstantiatorAnnotation> INSTANTIATOR = new OrmAnnotationDescriptor<>(
+	// @Instantiator has @Target(CONSTRUCTOR) which is not supported by AnnotationTarget.Kind
+	OrmAnnotationDescriptor<Instantiator, InstantiatorAnnotation> INSTANTIATOR = new OrmAnnotationDescriptor<>(
 			Instantiator.class,
-			InstantiatorAnnotation.class
+			InstantiatorAnnotation.class,
+			EnumSet.noneOf( Kind.class ), // @Target(CONSTRUCTOR) - not representable in Kind enum
+			false
 	);
-	OrmAnnotationDescriptor<JavaType,JavaTypeAnnotation> JAVA_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<JavaType, JavaTypeAnnotation> JAVA_TYPE = new OrmAnnotationDescriptor<>(
 			JavaType.class,
-			JavaTypeAnnotation.class
+			JavaTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
-	OrmAnnotationDescriptor<JavaTypeRegistrations,JavaTypeRegistrationsAnnotation> JAVA_TYPE_REGISTRATIONS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<JavaTypeRegistrations, JavaTypeRegistrationsAnnotation> JAVA_TYPE_REGISTRATIONS = new OrmAnnotationDescriptor<>(
 			JavaTypeRegistrations.class,
-			JavaTypeRegistrationsAnnotation.class
+			JavaTypeRegistrationsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			true
 	);
-	OrmAnnotationDescriptor<JavaTypeRegistration,JavaTypeRegistrationAnnotation> JAVA_TYPE_REGISTRATION = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<JavaTypeRegistration, JavaTypeRegistrationAnnotation> JAVA_TYPE_REGISTRATION = new OrmAnnotationDescriptor<>(
 			JavaTypeRegistration.class,
 			JavaTypeRegistrationAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			true,
 			JAVA_TYPE_REGISTRATIONS
 	);
-	OrmAnnotationDescriptor<JdbcType,JdbcTypeAnnotation> JDBC_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<JdbcType, JdbcTypeAnnotation> JDBC_TYPE = new OrmAnnotationDescriptor<>(
 			JdbcType.class,
-			JdbcTypeAnnotation.class
+			JdbcTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
-	OrmAnnotationDescriptor<JdbcTypeCode,JdbcTypeCodeAnnotation> JDBC_TYPE_CODE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<JdbcTypeCode, JdbcTypeCodeAnnotation> JDBC_TYPE_CODE = new OrmAnnotationDescriptor<>(
 			JdbcTypeCode.class,
-			JdbcTypeCodeAnnotation.class
+			JdbcTypeCodeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
-	OrmAnnotationDescriptor<JdbcTypeRegistrations,JdbcTypeRegistrationsAnnotation> JDBC_TYPE_REGISTRATIONS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<JdbcTypeRegistrations, JdbcTypeRegistrationsAnnotation> JDBC_TYPE_REGISTRATIONS = new OrmAnnotationDescriptor<>(
 			JdbcTypeRegistrations.class,
-			JdbcTypeRegistrationsAnnotation.class
+			JdbcTypeRegistrationsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			true
 	);
-	OrmAnnotationDescriptor<JdbcTypeRegistration,JdbcTypeRegistrationAnnotation> JDBC_TYPE_REGISTRATION = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<JdbcTypeRegistration, JdbcTypeRegistrationAnnotation> JDBC_TYPE_REGISTRATION = new OrmAnnotationDescriptor<>(
 			JdbcTypeRegistration.class,
 			JdbcTypeRegistrationAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			true,
 			JDBC_TYPE_REGISTRATIONS
 	);
 	OrmAnnotationDescriptor<JoinColumnsOrFormulas, JoinColumnsOrFormulasAnnotation> JOIN_COLUMNS_OR_FORMULAS = new OrmAnnotationDescriptor<>(
 			JoinColumnsOrFormulas.class,
-			JoinColumnsOrFormulasAnnotation.class
+			JoinColumnsOrFormulasAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
 	OrmAnnotationDescriptor<JoinColumnOrFormula, JoinColumnOrFormulaAnnotation> JOIN_COLUMN_OR_FORMULA = new OrmAnnotationDescriptor<>(
 			JoinColumnOrFormula.class,
 			JoinColumnOrFormulaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false,
 			JOIN_COLUMNS_OR_FORMULAS
 	);
 	OrmAnnotationDescriptor<JoinFormula, JoinFormulaAnnotation> JOIN_FORMULA = new OrmAnnotationDescriptor<>(
 			JoinFormula.class,
-			JoinFormulaAnnotation.class
+			JoinFormulaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
 	OrmAnnotationDescriptor<LazyGroup, LazyGroupAnnotation> LAZY_GROUP = new OrmAnnotationDescriptor<>(
 			LazyGroup.class,
-			LazyGroupAnnotation.class
+			LazyGroupAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
 	OrmAnnotationDescriptor<ListIndexBase, ListIndexBaseAnnotation> LIST_INDEX_BASE = new OrmAnnotationDescriptor<>(
 			ListIndexBase.class,
-			ListIndexBaseAnnotation.class
+			ListIndexBaseAnnotation.class,
+			EnumSet.allOf( Kind.class ),
+			false
 	);
 	OrmAnnotationDescriptor<ListIndexJavaType, ListIndexJavaTypeAnnotation> LIST_INDEX_JAVA_TYPE = new OrmAnnotationDescriptor<>(
 			ListIndexJavaType.class,
-			ListIndexJavaTypeAnnotation.class
+			ListIndexJavaTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
 	OrmAnnotationDescriptor<ListIndexJdbcType, ListIndexJdbcTypeAnnotation> LIST_INDEX_JDBC_TYPE = new OrmAnnotationDescriptor<>(
 			ListIndexJdbcType.class,
-			ListIndexJdbcTypeAnnotation.class
+			ListIndexJdbcTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
 	OrmAnnotationDescriptor<ListIndexJdbcTypeCode, ListIndexJdbcTypeCodeAnnotation> LIST_INDEX_JDBC_TYPE_CODE = new OrmAnnotationDescriptor<>(
 			ListIndexJdbcTypeCode.class,
-			ListIndexJdbcTypeCodeAnnotation.class
+			ListIndexJdbcTypeCodeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
 	OrmAnnotationDescriptor<ManyToAny, ManyToAnyAnnotation> MANY_TO_ANY = new OrmAnnotationDescriptor<>(
 			ManyToAny.class,
-			ManyToAnyAnnotation.class
+			ManyToAnyAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
 	OrmAnnotationDescriptor<MapKeyCompositeType, MapKeyCompositeTypeAnnotation> MAP_KEY_COMPOSITE_TYPE = new OrmAnnotationDescriptor<>(
 			MapKeyCompositeType.class,
-			MapKeyCompositeTypeAnnotation.class
+			MapKeyCompositeTypeAnnotation.class,
+			EnumSet.allOf( Kind.class ),
+			false
 	);
 	OrmAnnotationDescriptor<MapKeyJavaType, MapKeyJavaTypeAnnotation> MAP_KEY_JAVA_TYPE = new OrmAnnotationDescriptor<>(
 			MapKeyJavaType.class,
-			MapKeyJavaTypeAnnotation.class
+			MapKeyJavaTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
 	OrmAnnotationDescriptor<MapKeyJdbcType, MapKeyJdbcTypeAnnotation> MAP_KEY_JDBC_TYPE = new OrmAnnotationDescriptor<>(
 			MapKeyJdbcType.class,
-			MapKeyJdbcTypeAnnotation.class
+			MapKeyJdbcTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
 	OrmAnnotationDescriptor<MapKeyJdbcTypeCode, MapKeyJdbcTypeCodeAnnotation> MAP_KEY_JDBC_TYPE_CODE = new OrmAnnotationDescriptor<>(
 			MapKeyJdbcTypeCode.class,
-			MapKeyJdbcTypeCodeAnnotation.class
+			MapKeyJdbcTypeCodeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
 	OrmAnnotationDescriptor<MapKeyMutability, MapKeyMutabilityAnnotation> MAP_KEY_MUTABILITY = new OrmAnnotationDescriptor<>(
 			MapKeyMutability.class,
-			MapKeyMutabilityAnnotation.class
+			MapKeyMutabilityAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
 	OrmAnnotationDescriptor<MapKeyType, MapKeyTypeAnnotation> MAP_KEY_TYPE = new OrmAnnotationDescriptor<>(
 			MapKeyType.class,
-			MapKeyTypeAnnotation.class
+			MapKeyTypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			true
 	);
 	OrmAnnotationDescriptor<Mutability, MutabilityAnnotation> MUTABILITY = new OrmAnnotationDescriptor<>(
 			Mutability.class,
-			MutabilityAnnotation.class
+			MutabilityAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS, Kind.ANNOTATION ),
+			true
 	);
 	OrmAnnotationDescriptor<NamedEntityGraphs, NamedEntityGraphsAnnotation> NAMED_ENTITY_GRAPHS = new OrmAnnotationDescriptor<>(
 			NamedEntityGraphs.class,
-			NamedEntityGraphsAnnotation.class
+			NamedEntityGraphsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false
 	);
 	OrmAnnotationDescriptor<NamedEntityGraph, NamedEntityGraphAnnotation> NAMED_ENTITY_GRAPH = new OrmAnnotationDescriptor<>(
 			NamedEntityGraph.class,
 			NamedEntityGraphAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			false,
 			NAMED_ENTITY_GRAPHS
 	);
 	OrmAnnotationDescriptor<NamedNativeQueries, NamedNativeQueriesAnnotation> NAMED_NATIVE_QUERIES = new OrmAnnotationDescriptor<>(
 			NamedNativeQueries.class,
-			NamedNativeQueriesAnnotation.class
+			NamedNativeQueriesAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			false
 	);
 	OrmAnnotationDescriptor<NamedNativeQuery, NamedNativeQueryAnnotation> NAMED_NATIVE_QUERY = new OrmAnnotationDescriptor<>(
 			NamedNativeQuery.class,
 			NamedNativeQueryAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			false,
 			NAMED_NATIVE_QUERIES
 	);
 	OrmAnnotationDescriptor<NamedQueries, NamedQueriesAnnotation> NAMED_QUERIES = new OrmAnnotationDescriptor<>(
 			NamedQueries.class,
-			NamedQueriesAnnotation.class
+			NamedQueriesAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			false
 	);
 	OrmAnnotationDescriptor<NamedQuery, NamedQueryAnnotation> NAMED_QUERY = new OrmAnnotationDescriptor<>(
 			NamedQuery.class,
 			NamedQueryAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.PACKAGE ),
+			false,
 			NAMED_QUERIES
 	);
 	OrmAnnotationDescriptor<Nationalized, NationalizedAnnotation> NATIONALIZED = new OrmAnnotationDescriptor<>(
 			Nationalized.class,
-			NationalizedAnnotation.class
+			NationalizedAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
 	OrmAnnotationDescriptor<NativeGenerator, NativeGeneratorAnnotation> NATIVE_GENERATOR = new OrmAnnotationDescriptor<>(
 			NativeGenerator.class,
-			NativeGeneratorAnnotation.class
+			NativeGeneratorAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS, Kind.PACKAGE ),
+			false
 	);
 	OrmAnnotationDescriptor<NaturalId, NaturalIdAnnotation> NATURAL_ID = new OrmAnnotationDescriptor<>(
 			NaturalId.class,
-			NaturalIdAnnotation.class
+			NaturalIdAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
 	OrmAnnotationDescriptor<NaturalIdCache, NaturalIdCacheAnnotation> NATURAL_ID_CACHE = new OrmAnnotationDescriptor<>(
 			NaturalIdCache.class,
-			NaturalIdCacheAnnotation.class
+			NaturalIdCacheAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
+	);
+	OrmAnnotationDescriptor<NaturalIdClass, NaturalIdClassAnnotation> NATURAL_ID_CLASS = new OrmAnnotationDescriptor<>(
+			NaturalIdClass.class,
+			NaturalIdClassAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<NotFound, NotFoundAnnotation> NOT_FOUND = new OrmAnnotationDescriptor<>(
 			NotFound.class,
-			NotFoundAnnotation.class
+			NotFoundAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<OnDelete,OnDeleteAnnotation> ON_DELETE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<OnDelete, OnDeleteAnnotation> ON_DELETE = new OrmAnnotationDescriptor<>(
 			OnDelete.class,
-			OnDeleteAnnotation.class
+			OnDeleteAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<OptimisticLock,OptimisticLockAnnotation> OPTIMISTIC_LOCK = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<OptimisticLock, OptimisticLockAnnotation> OPTIMISTIC_LOCK = new OrmAnnotationDescriptor<>(
 			OptimisticLock.class,
-			OptimisticLockAnnotation.class
+			OptimisticLockAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<OptimisticLocking,OptimisticLockingAnnotation> OPTIMISTIC_LOCKING = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<OptimisticLocking, OptimisticLockingAnnotation> OPTIMISTIC_LOCKING = new OrmAnnotationDescriptor<>(
 			OptimisticLocking.class,
-			OptimisticLockingAnnotation.class
+			OptimisticLockingAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<ParamDef,ParamDefAnnotation> PARAM_DEF = new OrmAnnotationDescriptor<>(
+	// @ParamDef has @Target({}) - used as nested annotation, not directly on code elements
+	OrmAnnotationDescriptor<ParamDef, ParamDefAnnotation> PARAM_DEF = new OrmAnnotationDescriptor<>(
 			ParamDef.class,
-			ParamDefAnnotation.class
+			ParamDefAnnotation.class,
+			EnumSet.noneOf( Kind.class ), // @Target({})
+			false
 	);
-	OrmAnnotationDescriptor<Parameter,ParameterAnnotation> PARAMETER = new OrmAnnotationDescriptor<>(
+	// @Parameter has @Target({}) - used as nested annotation, not directly on code elements
+	OrmAnnotationDescriptor<Parameter, ParameterAnnotation> PARAMETER = new OrmAnnotationDescriptor<>(
 			Parameter.class,
-			ParameterAnnotation.class
+			ParameterAnnotation.class,
+			EnumSet.noneOf( Kind.class ), // @Target({})
+			false
 	);
-	OrmAnnotationDescriptor<Parent,ParentAnnotation> PARENT = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Parent, ParentAnnotation> PARENT = new OrmAnnotationDescriptor<>(
 			Parent.class,
-			ParentAnnotation.class
+			ParentAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<PartitionKey,PartitionKeyAnnotation> PARTITION_KEY = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<PartitionKey, PartitionKeyAnnotation> PARTITION_KEY = new OrmAnnotationDescriptor<>(
 			PartitionKey.class,
-			PartitionKeyAnnotation.class
+			PartitionKeyAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<PropertyRef,PropertyRefAnnotation> PROPERTY_REF = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<PropertyRef, PropertyRefAnnotation> PROPERTY_REF = new OrmAnnotationDescriptor<>(
 			PropertyRef.class,
-			PropertyRefAnnotation.class
+			PropertyRefAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<QueryCacheLayout,QueryCacheLayoutAnnotation> QUERY_CACHE_LAYOUT = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<QueryCacheLayout, QueryCacheLayoutAnnotation> QUERY_CACHE_LAYOUT = new OrmAnnotationDescriptor<>(
 			QueryCacheLayout.class,
-			QueryCacheLayoutAnnotation.class
+			QueryCacheLayoutAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<RowId,RowIdAnnotation> ROW_ID = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<RowId, RowIdAnnotation> ROW_ID = new OrmAnnotationDescriptor<>(
 			RowId.class,
-			RowIdAnnotation.class
+			RowIdAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<SecondaryRows,SecondaryRowsAnnotation> SECONDARY_ROWS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SecondaryRows, SecondaryRowsAnnotation> SECONDARY_ROWS = new OrmAnnotationDescriptor<>(
 			SecondaryRows.class,
-			SecondaryRowsAnnotation.class
+			SecondaryRowsAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<SecondaryRow,SecondaryRowAnnotation> SECONDARY_ROW = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SecondaryRow, SecondaryRowAnnotation> SECONDARY_ROW = new OrmAnnotationDescriptor<>(
 			SecondaryRow.class,
 			SecondaryRowAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false,
 			SECONDARY_ROWS
 	);
-	OrmAnnotationDescriptor<SoftDelete,SoftDeleteAnnotation> SOFT_DELETE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SoftDelete, SoftDeleteAnnotation> SOFT_DELETE = new OrmAnnotationDescriptor<>(
 			SoftDelete.class,
-			SoftDeleteAnnotation.class
+			SoftDeleteAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false
 	);
-	OrmAnnotationDescriptor<SortComparator,SortComparatorAnnotation> SORT_COMPARATOR = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SortComparator, SortComparatorAnnotation> SORT_COMPARATOR = new OrmAnnotationDescriptor<>(
 			SortComparator.class,
-			SortComparatorAnnotation.class
+			SortComparatorAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<SortNatural,SortNaturalAnnotation> SORT_NATURAL = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SortNatural, SortNaturalAnnotation> SORT_NATURAL = new OrmAnnotationDescriptor<>(
 			SortNatural.class,
-			SortNaturalAnnotation.class
+			SortNaturalAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<Source,SourceAnnotation> SOURCE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Source, SourceAnnotation> SOURCE = new OrmAnnotationDescriptor<>(
 			Source.class,
-			SourceAnnotation.class
+			SourceAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<SQLDeletes,SQLDeletesAnnotation> SQL_DELETES = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLDeletes, SQLDeletesAnnotation> SQL_DELETES = new OrmAnnotationDescriptor<>(
 			SQLDeletes.class,
-			SQLDeletesAnnotation.class
+			SQLDeletesAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<SQLDelete,SQLDeleteAnnotation> SQL_DELETE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLDelete, SQLDeleteAnnotation> SQL_DELETE = new OrmAnnotationDescriptor<>(
 			SQLDelete.class,
 			SQLDeleteAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false,
 			SQL_DELETES
 	);
-	OrmAnnotationDescriptor<SQLDeleteAll,SQLDeleteAllAnnotation> SQL_DELETE_ALL = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLDeleteAll, SQLDeleteAllAnnotation> SQL_DELETE_ALL = new OrmAnnotationDescriptor<>(
 			SQLDeleteAll.class,
-			SQLDeleteAllAnnotation.class
+			SQLDeleteAllAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<SqlFragmentAlias,SqlFragmentAliasAnnotation> SQL_FRAGMENT_ALIAS = new OrmAnnotationDescriptor<>(
+	// @SqlFragmentAlias has @Target({}) - used as nested annotation, not directly on code elements
+	OrmAnnotationDescriptor<SqlFragmentAlias, SqlFragmentAliasAnnotation> SQL_FRAGMENT_ALIAS = new OrmAnnotationDescriptor<>(
 			SqlFragmentAlias.class,
-			SqlFragmentAliasAnnotation.class
+			SqlFragmentAliasAnnotation.class,
+			EnumSet.noneOf( Kind.class ), // @Target({})
+			false
 	);
-	OrmAnnotationDescriptor<SQLInserts,SQLInsertsAnnotation> SQL_INSERTS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLInserts, SQLInsertsAnnotation> SQL_INSERTS = new OrmAnnotationDescriptor<>(
 			SQLInserts.class,
-			SQLInsertsAnnotation.class
+			SQLInsertsAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<SQLInsert,SQLInsertAnnotation> SQL_INSERT = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLInsert, SQLInsertAnnotation> SQL_INSERT = new OrmAnnotationDescriptor<>(
 			SQLInsert.class,
 			SQLInsertAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false,
 			SQL_INSERTS
 	);
-	OrmAnnotationDescriptor<SQLOrder,SQLOrderAnnotation> SQL_ORDER = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLOrder, SQLOrderAnnotation> SQL_ORDER = new OrmAnnotationDescriptor<>(
 			SQLOrder.class,
-			SQLOrderAnnotation.class
+			SQLOrderAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<SQLRestriction,SQLRestrictionAnnotation> SQL_RESTRICTION = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLRestriction, SQLRestrictionAnnotation> SQL_RESTRICTION = new OrmAnnotationDescriptor<>(
 			SQLRestriction.class,
-			SQLRestrictionAnnotation.class
+			SQLRestrictionAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<SQLSelect,SQLSelectAnnotation> SQL_SELECT = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLSelect, SQLSelectAnnotation> SQL_SELECT = new OrmAnnotationDescriptor<>(
 			SQLSelect.class,
-			SQLSelectAnnotation.class
+			SQLSelectAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<SQLJoinTableRestriction,SQLJoinTableRestrictionAnnotation> SQL_JOIN_TABLE_RESTRICTION = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLJoinTableRestriction, SQLJoinTableRestrictionAnnotation> SQL_JOIN_TABLE_RESTRICTION = new OrmAnnotationDescriptor<>(
 			SQLJoinTableRestriction.class,
-			SQLJoinTableRestrictionAnnotation.class
+			SQLJoinTableRestrictionAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<SQLUpdates,SQLUpdatesAnnotation> SQL_UPDATES = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLUpdates, SQLUpdatesAnnotation> SQL_UPDATES = new OrmAnnotationDescriptor<>(
 			SQLUpdates.class,
-			SQLUpdatesAnnotation.class
+			SQLUpdatesAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<SQLUpdate,SQLUpdateAnnotation> SQL_UPDATE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<SQLUpdate, SQLUpdateAnnotation> SQL_UPDATE = new OrmAnnotationDescriptor<>(
 			SQLUpdate.class,
 			SQLUpdateAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false,
 			SQL_UPDATES
 	);
-	OrmAnnotationDescriptor<Struct,StructAnnotation> STRUCT = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Struct, StructAnnotation> STRUCT = new OrmAnnotationDescriptor<>(
 			Struct.class,
-			StructAnnotation.class
+			StructAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<Subselect,SubselectAnnotation> SUBSELECT = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Subselect, SubselectAnnotation> SUBSELECT = new OrmAnnotationDescriptor<>(
 			Subselect.class,
-			SubselectAnnotation.class
+			SubselectAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<Synchronize,SynchronizeAnnotation> SYNCHRONIZE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Synchronize, SynchronizeAnnotation> SYNCHRONIZE = new OrmAnnotationDescriptor<>(
 			Synchronize.class,
-			SynchronizeAnnotation.class
+			SynchronizeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
-	OrmAnnotationDescriptor<TargetEmbeddable,TargetEmbeddableAnnotation> TARGET_EMBEDDABLE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<TargetEmbeddable, TargetEmbeddableAnnotation> TARGET_EMBEDDABLE = new OrmAnnotationDescriptor<>(
 			TargetEmbeddable.class,
-			TargetEmbeddableAnnotation.class
-	);
-	SpecializedAnnotationDescriptor<TenantId,TenantIdAnnotation> TENANT_ID = new SpecializedAnnotationDescriptor<>(
+			TargetEmbeddableAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.FIELD, Kind.METHOD ),
+			false
+	);
+	OrmAnnotationDescriptor<Temporal,TemporalAnnotation> TEMPORAL = new OrmAnnotationDescriptor<>(
+			Temporal.class,
+			TemporalAnnotation.class,
+			EnumSet.of( Kind.ANNOTATION, Kind.CLASS, Kind.FIELD, Kind.METHOD, Kind.PACKAGE ),
+			false
+	);
+	OrmAnnotationDescriptor<Temporal.HistoryPartitioning,HistoryPartitioningAnnotation> TEMPORAL_HISTORY_PARTITIONING =
+			new OrmAnnotationDescriptor<>(
+					Temporal.HistoryPartitioning.class,
+					HistoryPartitioningAnnotation.class,
+					EnumSet.of( Kind.CLASS, Kind.FIELD, Kind.METHOD ),
+					false
+			);
+	OrmAnnotationDescriptor<Temporal.HistoryTable,HistoryTableAnnotation> TEMPORAL_HISTORY_TABLE =
+			new OrmAnnotationDescriptor<>(
+					Temporal.HistoryTable.class,
+					HistoryTableAnnotation.class,
+					EnumSet.of( Kind.CLASS, Kind.FIELD, Kind.METHOD ),
+					false
+			);
+	OrmAnnotationDescriptor<Temporal.Excluded,ExcludedAnnotation> TEMPORAL_EXCLUDED =
+			new OrmAnnotationDescriptor<>(
+					Temporal.Excluded.class,
+					ExcludedAnnotation.class,
+					EnumSet.of( Kind.FIELD, Kind.METHOD ),
+					false
+			);
+	OrmAnnotationDescriptor<TenantId, TenantIdAnnotation> TENANT_ID = new OrmAnnotationDescriptor<>(
 			TenantId.class,
-			TenantIdAnnotation.class
+			TenantIdAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
-	OrmAnnotationDescriptor<TimeZoneColumn,TimeZoneColumnAnnotation> TIME_ZONE_COLUMN = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<TimeZoneColumn, TimeZoneColumnAnnotation> TIME_ZONE_COLUMN = new OrmAnnotationDescriptor<>(
 			TimeZoneColumn.class,
-			TimeZoneColumnAnnotation.class
+			TimeZoneColumnAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<TimeZoneStorage,TimeZoneStorageAnnotation> TIME_ZONE_STORAGE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<TimeZoneStorage, TimeZoneStorageAnnotation> TIME_ZONE_STORAGE = new OrmAnnotationDescriptor<>(
 			TimeZoneStorage.class,
-			TimeZoneStorageAnnotation.class
+			TimeZoneStorageAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<Type,TypeAnnotation> TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<Type, TypeAnnotation> TYPE = new OrmAnnotationDescriptor<>(
 			Type.class,
-			TypeAnnotation.class
+			TypeAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.ANNOTATION ),
+			false
 	);
-	SpecializedAnnotationDescriptor<TypeBinderType,TypeBinderTypeAnnotation> TYPE_BINDER_TYPE = new SpecializedAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<TypeBinderType, TypeBinderTypeAnnotation> TYPE_BINDER_TYPE = new OrmAnnotationDescriptor<>(
 			TypeBinderType.class,
-			TypeBinderTypeAnnotation.class
+			TypeBinderTypeAnnotation.class,
+			EnumSet.of( Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<TypeRegistrations,TypeRegistrationsAnnotation> TYPE_REGISTRATIONS = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<TypeRegistrations, TypeRegistrationsAnnotation> TYPE_REGISTRATIONS = new OrmAnnotationDescriptor<>(
 			TypeRegistrations.class,
-			TypeRegistrationsAnnotation.class
+			TypeRegistrationsAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false
 	);
-	OrmAnnotationDescriptor<TypeRegistration,TypeRegistrationAnnotation> TYPE_REGISTRATION = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<TypeRegistration, TypeRegistrationAnnotation> TYPE_REGISTRATION = new OrmAnnotationDescriptor<>(
 			TypeRegistration.class,
 			TypeRegistrationAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.ANNOTATION, Kind.PACKAGE ),
+			false,
 			TYPE_REGISTRATIONS
 	);
-	OrmAnnotationDescriptor<UpdateTimestamp,UpdateTimestampAnnotation> UPDATE_TIMESTAMP = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<UpdateTimestamp, UpdateTimestampAnnotation> UPDATE_TIMESTAMP = new OrmAnnotationDescriptor<>(
 			UpdateTimestamp.class,
-			UpdateTimestampAnnotation.class
+			UpdateTimestampAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<UuidGenerator,UuidGeneratorAnnotation> UUID_GENERATOR = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<UuidGenerator, UuidGeneratorAnnotation> UUID_GENERATOR = new OrmAnnotationDescriptor<>(
 			UuidGenerator.class,
-			UuidGeneratorAnnotation.class
+			UuidGeneratorAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<ValueGenerationType,ValueGenerationTypeAnnotation> VALUE_GENERATION_TYPE = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<ValueGenerationType, ValueGenerationTypeAnnotation> VALUE_GENERATION_TYPE = new OrmAnnotationDescriptor<>(
 			ValueGenerationType.class,
-			ValueGenerationTypeAnnotation.class
+			ValueGenerationTypeAnnotation.class,
+			EnumSet.of( Kind.ANNOTATION ),
+			false
 	);
-	OrmAnnotationDescriptor<View,ViewAnnotation> VIEW = new OrmAnnotationDescriptor<>(
+	OrmAnnotationDescriptor<View, ViewAnnotation> VIEW = new OrmAnnotationDescriptor<>(
 			View.class,
-			ViewAnnotation.class
+			ViewAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
 
 	static void forEachAnnotation(Consumer<AnnotationDescriptor<? extends Annotation>> consumer) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/JpaAnnotations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/JpaAnnotations.java
index 69a241d2fb90..651d3df405d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/JpaAnnotations.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/JpaAnnotations.java
@@ -5,6 +5,7 @@
 package org.hibernate.boot.models;
 
 import java.lang.annotation.Annotation;
+import java.util.EnumSet;
 import java.util.function.Consumer;
 
 import org.hibernate.boot.models.annotations.internal.AccessJpaAnnotation;
@@ -99,6 +100,8 @@
 import org.hibernate.models.internal.OrmAnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationDescriptor;
 
+import static org.hibernate.models.spi.AnnotationTarget.Kind;
+
 import jakarta.persistence.Access;
 import jakarta.persistence.AssociationOverride;
 import jakarta.persistence.AssociationOverrides;
@@ -196,370 +199,632 @@
 public interface JpaAnnotations {
 	OrmAnnotationDescriptor<Access,AccessJpaAnnotation> ACCESS = new OrmAnnotationDescriptor<>(
 			Access.class,
-			AccessJpaAnnotation.class
+			AccessJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD ),
+			false
 	);
 
 	OrmAnnotationDescriptor<AssociationOverrides,AssociationOverridesJpaAnnotation> ASSOCIATION_OVERRIDES = new OrmAnnotationDescriptor<>(
 			AssociationOverrides.class,
-			AssociationOverridesJpaAnnotation.class
+			AssociationOverridesJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<AssociationOverride,AssociationOverrideJpaAnnotation> ASSOCIATION_OVERRIDE = new OrmAnnotationDescriptor<>(
 			AssociationOverride.class,
 			AssociationOverrideJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD ),
+			false,
 			ASSOCIATION_OVERRIDES
 	);
+
 	OrmAnnotationDescriptor<AttributeOverrides,AttributeOverridesJpaAnnotation> ATTRIBUTE_OVERRIDES = new OrmAnnotationDescriptor<>(
 			AttributeOverrides.class,
-			AttributeOverridesJpaAnnotation.class
+			AttributeOverridesJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<AttributeOverride,AttributeOverrideJpaAnnotation> ATTRIBUTE_OVERRIDE = new OrmAnnotationDescriptor<>(
 			AttributeOverride.class,
 			AttributeOverrideJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD ),
+			false,
 			ATTRIBUTE_OVERRIDES
 	);
+
 	OrmAnnotationDescriptor<Basic,BasicJpaAnnotation> BASIC = new OrmAnnotationDescriptor<>(
 			Basic.class,
-			BasicJpaAnnotation.class
+			BasicJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Cacheable,CacheableJpaAnnotation> CACHEABLE = new OrmAnnotationDescriptor<>(
 			Cacheable.class,
-			CacheableJpaAnnotation.class
+			CacheableJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<CheckConstraint,CheckConstraintJpaAnnotation> CHECK_CONSTRAINT = new OrmAnnotationDescriptor<>(
 			CheckConstraint.class,
-			CheckConstraintJpaAnnotation.class
+			CheckConstraintJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<CollectionTable,CollectionTableJpaAnnotation> COLLECTION_TABLE = new OrmAnnotationDescriptor<>(
 			CollectionTable.class,
-			CollectionTableJpaAnnotation.class
+			CollectionTableJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Column,ColumnJpaAnnotation> COLUMN = new OrmAnnotationDescriptor<>(
 			Column.class,
-			ColumnJpaAnnotation.class
+			ColumnJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<ColumnResult,ColumnResultJpaAnnotation> COLUMN_RESULT = new OrmAnnotationDescriptor<>(
 			ColumnResult.class,
-			ColumnResultJpaAnnotation.class
+			ColumnResultJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<ConstructorResult,ConstructorResultJpaAnnotation> CONSTRUCTOR_RESULT = new OrmAnnotationDescriptor<>(
 			ConstructorResult.class,
-			ConstructorResultJpaAnnotation.class
+			ConstructorResultJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Converts,ConvertsJpaAnnotation> CONVERTS = new OrmAnnotationDescriptor<>(
 			Converts.class,
-			ConvertsJpaAnnotation.class
+			ConvertsJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Convert,ConvertJpaAnnotation> CONVERT = new OrmAnnotationDescriptor<>(
 			Convert.class,
 			ConvertJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD, Kind.CLASS ),
+			false,
 			CONVERTS
 	);
+
 	OrmAnnotationDescriptor<Converter,ConverterJpaAnnotation> CONVERTER = new OrmAnnotationDescriptor<>(
 			Converter.class,
-			ConverterJpaAnnotation.class
+			ConverterJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<DiscriminatorColumn,DiscriminatorColumnJpaAnnotation> DISCRIMINATOR_COLUMN = new OrmAnnotationDescriptor<>(
 			DiscriminatorColumn.class,
-			DiscriminatorColumnJpaAnnotation.class
+			DiscriminatorColumnJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<DiscriminatorValue,DiscriminatorValueJpaAnnotation> DISCRIMINATOR_VALUE = new OrmAnnotationDescriptor<>(
 			DiscriminatorValue.class,
-			DiscriminatorValueJpaAnnotation.class
+			DiscriminatorValueJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<ElementCollection,ElementCollectionJpaAnnotation> ELEMENT_COLLECTION = new OrmAnnotationDescriptor<>(
 			ElementCollection.class,
-			ElementCollectionJpaAnnotation.class
+			ElementCollectionJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Embeddable,EmbeddableJpaAnnotation> EMBEDDABLE = new OrmAnnotationDescriptor<>(
 			Embeddable.class,
-			EmbeddableJpaAnnotation.class
+			EmbeddableJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Embedded,EmbeddedJpaAnnotation> EMBEDDED = new OrmAnnotationDescriptor<>(
 			Embedded.class,
-			EmbeddedJpaAnnotation.class
+			EmbeddedJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<EmbeddedId,EmbeddedIdJpaAnnotation> EMBEDDED_ID = new OrmAnnotationDescriptor<>(
 			EmbeddedId.class,
-			EmbeddedIdJpaAnnotation.class
+			EmbeddedIdJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Entity,EntityJpaAnnotation> ENTITY = new OrmAnnotationDescriptor<>(
 			Entity.class,
-			EntityJpaAnnotation.class
+			EntityJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<EntityListeners,EntityListenersJpaAnnotation> ENTITY_LISTENERS = new OrmAnnotationDescriptor<>(
 			EntityListeners.class,
-			EntityListenersJpaAnnotation.class
+			EntityListenersJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<EntityResult,EntityResultJpaAnnotation> ENTITY_RESULT = new OrmAnnotationDescriptor<>(
 			EntityResult.class,
-			EntityResultJpaAnnotation.class
+			EntityResultJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Enumerated,EnumeratedJpaAnnotation> ENUMERATED = new OrmAnnotationDescriptor<>(
 			Enumerated.class,
-			EnumeratedJpaAnnotation.class
+			EnumeratedJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<EnumeratedValue, EnumeratedValueJpaAnnotation> ENUMERATED_VALUE = new OrmAnnotationDescriptor<>(
+
+	OrmAnnotationDescriptor<EnumeratedValue,EnumeratedValueJpaAnnotation> ENUMERATED_VALUE = new OrmAnnotationDescriptor<>(
 			EnumeratedValue.class,
-			EnumeratedValueJpaAnnotation.class
+			EnumeratedValueJpaAnnotation.class,
+			EnumSet.of( Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<ExcludeDefaultListeners,ExcludeDefaultListenersJpaAnnotation> EXCLUDE_DEFAULT_LISTENERS = new OrmAnnotationDescriptor<>(
 			ExcludeDefaultListeners.class,
-			ExcludeDefaultListenersJpaAnnotation.class
+			ExcludeDefaultListenersJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<ExcludeSuperclassListeners,ExcludeSuperclassListenersJpaAnnotation> EXCLUDE_SUPERCLASS_LISTENERS = new OrmAnnotationDescriptor<>(
 			ExcludeSuperclassListeners.class,
-			ExcludeSuperclassListenersJpaAnnotation.class
+			ExcludeSuperclassListenersJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<FieldResult,FieldResultJpaAnnotation> FIELD_RESULT = new OrmAnnotationDescriptor<>(
 			FieldResult.class,
-			FieldResultJpaAnnotation.class
+			FieldResultJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<ForeignKey,ForeignKeyJpaAnnotation> FOREIGN_KEY = new OrmAnnotationDescriptor<>(
 			ForeignKey.class,
-			ForeignKeyJpaAnnotation.class
+			ForeignKeyJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<GeneratedValue,GeneratedValueJpaAnnotation> GENERATED_VALUE = new OrmAnnotationDescriptor<>(
 			GeneratedValue.class,
-			GeneratedValueJpaAnnotation.class
+			GeneratedValueJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Id,IdJpaAnnotation> ID = new OrmAnnotationDescriptor<>(
 			Id.class,
-			IdJpaAnnotation.class
+			IdJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<IdClass,IdClassJpaAnnotation> ID_CLASS = new OrmAnnotationDescriptor<>(
 			IdClass.class,
-			IdClassJpaAnnotation.class
+			IdClassJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Index,IndexJpaAnnotation> INDEX = new OrmAnnotationDescriptor<>(
 			Index.class,
-			IndexJpaAnnotation.class
+			IndexJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Inheritance,InheritanceJpaAnnotation> INHERITANCE = new OrmAnnotationDescriptor<>(
 			Inheritance.class,
-			InheritanceJpaAnnotation.class
+			InheritanceJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<JoinColumns,JoinColumnsJpaAnnotation> JOIN_COLUMNS = new OrmAnnotationDescriptor<>(
 			JoinColumns.class,
-			JoinColumnsJpaAnnotation.class
+			JoinColumnsJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<JoinColumn,JoinColumnJpaAnnotation> JOIN_COLUMN = new OrmAnnotationDescriptor<>(
 			JoinColumn.class,
 			JoinColumnJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false,
 			JOIN_COLUMNS
 	);
+
 	OrmAnnotationDescriptor<JoinTable,JoinTableJpaAnnotation> JOIN_TABLE = new OrmAnnotationDescriptor<>(
 			JoinTable.class,
-			JoinTableJpaAnnotation.class
+			JoinTableJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Lob,LobJpaAnnotation> LOB = new OrmAnnotationDescriptor<>(
 			Lob.class,
-			LobJpaAnnotation.class
+			LobJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<ManyToMany,ManyToManyJpaAnnotation> MANY_TO_MANY = new OrmAnnotationDescriptor<>(
 			ManyToMany.class,
-			ManyToManyJpaAnnotation.class
+			ManyToManyJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<ManyToOne,ManyToOneJpaAnnotation> MANY_TO_ONE = new OrmAnnotationDescriptor<>(
 			ManyToOne.class,
-			ManyToOneJpaAnnotation.class
+			ManyToOneJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<MapKey,MapKeyJpaAnnotation> MAP_KEY = new OrmAnnotationDescriptor<>(
 			MapKey.class,
-			MapKeyJpaAnnotation.class
+			MapKeyJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<MapKeyClass,MapKeyClassJpaAnnotation> MAP_KEY_CLASS = new OrmAnnotationDescriptor<>(
 			MapKeyClass.class,
-			MapKeyClassJpaAnnotation.class
+			MapKeyClassJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<MapKeyColumn,MapKeyColumnJpaAnnotation> MAP_KEY_COLUMN = new OrmAnnotationDescriptor<>(
 			MapKeyColumn.class,
-			MapKeyColumnJpaAnnotation.class
+			MapKeyColumnJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<MapKeyEnumerated,MapKeyEnumeratedJpaAnnotation> MAP_KEY_ENUMERATED = new OrmAnnotationDescriptor<>(
 			MapKeyEnumerated.class,
-			MapKeyEnumeratedJpaAnnotation.class
+			MapKeyEnumeratedJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<MapKeyJoinColumns,MapKeyJoinColumnsJpaAnnotation> MAP_KEY_JOIN_COLUMNS = new OrmAnnotationDescriptor<>(
 			MapKeyJoinColumns.class,
-			MapKeyJoinColumnsJpaAnnotation.class
+			MapKeyJoinColumnsJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<MapKeyJoinColumn, MapKeyJoinColumnJpaAnnotation> MAP_KEY_JOIN_COLUMN = new OrmAnnotationDescriptor<>(
+
+	OrmAnnotationDescriptor<MapKeyJoinColumn,MapKeyJoinColumnJpaAnnotation> MAP_KEY_JOIN_COLUMN = new OrmAnnotationDescriptor<>(
 			MapKeyJoinColumn.class,
 			MapKeyJoinColumnJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false,
 			MAP_KEY_JOIN_COLUMNS
 	);
+
 	OrmAnnotationDescriptor<MapKeyTemporal,MapKeyTemporalJpaAnnotation> MAP_KEY_TEMPORAL = new OrmAnnotationDescriptor<>(
 			MapKeyTemporal.class,
-			MapKeyTemporalJpaAnnotation.class
+			MapKeyTemporalJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<MappedSuperclass,MappedSuperclassJpaAnnotation> MAPPED_SUPERCLASS = new OrmAnnotationDescriptor<>(
 			MappedSuperclass.class,
-			MappedSuperclassJpaAnnotation.class
+			MappedSuperclassJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<MapsId,MapsIdJpaAnnotation> MAPS_ID = new OrmAnnotationDescriptor<>(
 			MapsId.class,
-			MapsIdJpaAnnotation.class
+			MapsIdJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<NamedAttributeNode,NamedAttributeNodeJpaAnnotation> NAMED_ATTRIBUTE_NODE = new OrmAnnotationDescriptor<>(
 			NamedAttributeNode.class,
-			NamedAttributeNodeJpaAnnotation.class
+			NamedAttributeNodeJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<NamedEntityGraphs,NamedEntityGraphsJpaAnnotation> NAMED_ENTITY_GRAPHS = new OrmAnnotationDescriptor<>(
 			NamedEntityGraphs.class,
-			NamedEntityGraphsJpaAnnotation.class
+			NamedEntityGraphsJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<NamedEntityGraph,NamedEntityGraphJpaAnnotation> NAMED_ENTITY_GRAPH = new OrmAnnotationDescriptor<>(
 			NamedEntityGraph.class,
 			NamedEntityGraphJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false,
 			NAMED_ENTITY_GRAPHS
 	);
+
 	OrmAnnotationDescriptor<NamedNativeQueries,NamedNativeQueriesJpaAnnotation> NAMED_NATIVE_QUERIES = new OrmAnnotationDescriptor<>(
 			NamedNativeQueries.class,
-			NamedNativeQueriesJpaAnnotation.class
+			NamedNativeQueriesJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<NamedNativeQuery,NamedNativeQueryJpaAnnotation> NAMED_NATIVE_QUERY = new OrmAnnotationDescriptor<>(
 			NamedNativeQuery.class,
 			NamedNativeQueryJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false,
 			NAMED_NATIVE_QUERIES
 	);
+
 	OrmAnnotationDescriptor<NamedQueries,NamedQueriesJpaAnnotation> NAMED_QUERIES = new OrmAnnotationDescriptor<>(
 			NamedQueries.class,
-			NamedQueriesJpaAnnotation.class
+			NamedQueriesJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<NamedQuery,NamedQueryJpaAnnotation> NAMED_QUERY = new OrmAnnotationDescriptor<>(
 			NamedQuery.class,
 			NamedQueryJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false,
 			NAMED_QUERIES
 	);
+
 	OrmAnnotationDescriptor<NamedStoredProcedureQueries,NamedStoredProcedureQueriesJpaAnnotation> NAMED_STORED_PROCEDURE_QUERIES = new OrmAnnotationDescriptor<>(
 			NamedStoredProcedureQueries.class,
-			NamedStoredProcedureQueriesJpaAnnotation.class
+			NamedStoredProcedureQueriesJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<NamedStoredProcedureQuery,NamedStoredProcedureQueryJpaAnnotation> NAMED_STORED_PROCEDURE_QUERY = new OrmAnnotationDescriptor<>(
 			NamedStoredProcedureQuery.class,
 			NamedStoredProcedureQueryJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false,
 			NAMED_STORED_PROCEDURE_QUERIES
 	);
+
 	OrmAnnotationDescriptor<NamedSubgraph,NamedSubgraphJpaAnnotation> NAMED_SUBGRAPH = new OrmAnnotationDescriptor<>(
 			NamedSubgraph.class,
-			NamedSubgraphJpaAnnotation.class
+			NamedSubgraphJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<OneToMany,OneToManyJpaAnnotation> ONE_TO_MANY = new OrmAnnotationDescriptor<>(
 			OneToMany.class,
-			OneToManyJpaAnnotation.class
+			OneToManyJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<OneToOne, OneToOneJpaAnnotation> ONE_TO_ONE = new OrmAnnotationDescriptor<>(
+
+	OrmAnnotationDescriptor<OneToOne,OneToOneJpaAnnotation> ONE_TO_ONE = new OrmAnnotationDescriptor<>(
 			OneToOne.class,
-			OneToOneJpaAnnotation.class
+			OneToOneJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<OrderBy,OrderByJpaAnnotation> ORDER_BY = new OrmAnnotationDescriptor<>(
 			OrderBy.class,
-			OrderByJpaAnnotation.class
+			OrderByJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<OrderColumn,OrderColumnJpaAnnotation> ORDER_COLUMN = new OrmAnnotationDescriptor<>(
 			OrderColumn.class,
-			OrderColumnJpaAnnotation.class
+			OrderColumnJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<PostLoad,PostLoadJpaAnnotation> POST_LOAD = new OrmAnnotationDescriptor<>(
 			PostLoad.class,
-			PostLoadJpaAnnotation.class
+			PostLoadJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<PostPersist,PostPersistJpaAnnotation> POST_PERSIST = new OrmAnnotationDescriptor<>(
 			PostPersist.class,
-			PostPersistJpaAnnotation.class
+			PostPersistJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<PostRemove,PostRemoveJpaAnnotation> POST_REMOVE = new OrmAnnotationDescriptor<>(
 			PostRemove.class,
-			PostRemoveJpaAnnotation.class
+			PostRemoveJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<PostUpdate,PostUpdateJpaAnnotation> POST_UPDATE = new OrmAnnotationDescriptor<>(
 			PostUpdate.class,
-			PostUpdateJpaAnnotation.class
+			PostUpdateJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<PrePersist,PrePersistJpaAnnotation> PRE_PERSIST = new OrmAnnotationDescriptor<>(
 			PrePersist.class,
-			PrePersistJpaAnnotation.class
+			PrePersistJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<PreRemove,PreRemoveJpaAnnotation> PRE_REMOVE = new OrmAnnotationDescriptor<>(
 			PreRemove.class,
-			PreRemoveJpaAnnotation.class
+			PreRemoveJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<PreUpdate,PreUpdateJpaAnnotation> PRE_UPDATE = new OrmAnnotationDescriptor<>(
 			PreUpdate.class,
-			PreUpdateJpaAnnotation.class
+			PreUpdateJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<PrimaryKeyJoinColumns,PrimaryKeyJoinColumnsJpaAnnotation> PRIMARY_KEY_JOIN_COLUMNS = new OrmAnnotationDescriptor<>(
 			PrimaryKeyJoinColumns.class,
-			PrimaryKeyJoinColumnsJpaAnnotation.class
+			PrimaryKeyJoinColumnsJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD ),
+			false
 	);
-	OrmAnnotationDescriptor<PrimaryKeyJoinColumn, PrimaryKeyJoinColumnJpaAnnotation> PRIMARY_KEY_JOIN_COLUMN = new OrmAnnotationDescriptor<>(
+
+	OrmAnnotationDescriptor<PrimaryKeyJoinColumn,PrimaryKeyJoinColumnJpaAnnotation> PRIMARY_KEY_JOIN_COLUMN = new OrmAnnotationDescriptor<>(
 			PrimaryKeyJoinColumn.class,
 			PrimaryKeyJoinColumnJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD ),
+			false,
 			PRIMARY_KEY_JOIN_COLUMNS
 	);
+
 	OrmAnnotationDescriptor<QueryHint,QueryHintJpaAnnotation> QUERY_HINT = new OrmAnnotationDescriptor<>(
 			QueryHint.class,
-			QueryHintJpaAnnotation.class
+			QueryHintJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<SecondaryTables,SecondaryTablesJpaAnnotation> SECONDARY_TABLES = new OrmAnnotationDescriptor<>(
 			SecondaryTables.class,
-			SecondaryTablesJpaAnnotation.class
+			SecondaryTablesJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<SecondaryTable,SecondaryTableJpaAnnotation> SECONDARY_TABLE = new OrmAnnotationDescriptor<>(
 			SecondaryTable.class,
 			SecondaryTableJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false,
 			SECONDARY_TABLES
 	);
+
 	OrmAnnotationDescriptor<SequenceGenerators,SequenceGeneratorsJpaAnnotation> SEQUENCE_GENERATORS = new OrmAnnotationDescriptor<>(
 			SequenceGenerators.class,
-			SequenceGeneratorsJpaAnnotation.class
+			SequenceGeneratorsJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD, Kind.PACKAGE ),
+			false
 	);
+
 	OrmAnnotationDescriptor<SequenceGenerator,SequenceGeneratorJpaAnnotation> SEQUENCE_GENERATOR = new OrmAnnotationDescriptor<>(
 			SequenceGenerator.class,
 			SequenceGeneratorJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD, Kind.PACKAGE ),
+			false,
 			SEQUENCE_GENERATORS
 	);
+
 	OrmAnnotationDescriptor<SqlResultSetMappings,SqlResultSetMappingsJpaAnnotation> SQL_RESULT_SET_MAPPINGS = new OrmAnnotationDescriptor<>(
 			SqlResultSetMappings.class,
-			SqlResultSetMappingsJpaAnnotation.class
+			SqlResultSetMappingsJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<SqlResultSetMapping,SqlResultSetMappingJpaAnnotation> SQL_RESULT_SET_MAPPING = new OrmAnnotationDescriptor<>(
 			SqlResultSetMapping.class,
 			SqlResultSetMappingJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false,
 			SQL_RESULT_SET_MAPPINGS
 	);
+
 	OrmAnnotationDescriptor<StoredProcedureParameter,StoredProcedureParameterJpaAnnotation> STORED_PROCEDURE_PARAMETER = new OrmAnnotationDescriptor<>(
 			StoredProcedureParameter.class,
-			StoredProcedureParameterJpaAnnotation.class
+			StoredProcedureParameterJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Table,TableJpaAnnotation> TABLE = new OrmAnnotationDescriptor<>(
 			Table.class,
-			TableJpaAnnotation.class
+			TableJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
+
 	OrmAnnotationDescriptor<TableGenerators,TableGeneratorsJpaAnnotation> TABLE_GENERATORS = new OrmAnnotationDescriptor<>(
 			TableGenerators.class,
-			TableGeneratorsJpaAnnotation.class
+			TableGeneratorsJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD, Kind.PACKAGE ),
+			false
 	);
+
 	OrmAnnotationDescriptor<TableGenerator,TableGeneratorJpaAnnotation> TABLE_GENERATOR = new OrmAnnotationDescriptor<>(
 			TableGenerator.class,
 			TableGeneratorJpaAnnotation.class,
+			EnumSet.of( Kind.CLASS, Kind.METHOD, Kind.FIELD, Kind.PACKAGE ),
+			false,
 			TABLE_GENERATORS
 	);
+
 	OrmAnnotationDescriptor<Temporal,TemporalJpaAnnotation> TEMPORAL = new OrmAnnotationDescriptor<>(
 			Temporal.class,
-			TemporalJpaAnnotation.class
+			TemporalJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Transient,TransientJpaAnnotation> TRANSIENT = new OrmAnnotationDescriptor<>(
 			Transient.class,
-			TransientJpaAnnotation.class
+			TransientJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
+
 	OrmAnnotationDescriptor<UniqueConstraint,UniqueConstraintJpaAnnotation> UNIQUE_CONSTRAINT = new OrmAnnotationDescriptor<>(
 			UniqueConstraint.class,
-			UniqueConstraintJpaAnnotation.class
+			UniqueConstraintJpaAnnotation.class,
+			EnumSet.noneOf( Kind.class ),
+			false
 	);
+
 	OrmAnnotationDescriptor<Version,VersionJpaAnnotation> VERSION = new OrmAnnotationDescriptor<>(
 			Version.class,
-			VersionJpaAnnotation.class
+			VersionJpaAnnotation.class,
+			EnumSet.of( Kind.METHOD, Kind.FIELD ),
+			false
 	);
 
 	static void forEachAnnotation(Consumer<AnnotationDescriptor<? extends Annotation>> consumer) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/XmlAnnotations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/XmlAnnotations.java
index 06f76c55cfbd..64742b33f771 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/XmlAnnotations.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/XmlAnnotations.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.boot.models;
 
+import java.util.EnumSet;
 import java.util.function.Consumer;
 
 import org.hibernate.boot.internal.Abstract;
@@ -20,29 +21,41 @@
 import org.hibernate.models.internal.OrmAnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationDescriptor;
 
+import static org.hibernate.models.spi.AnnotationTarget.Kind;
+
 /**
  * @author Steve Ebersole
  */
 public interface XmlAnnotations {
 	OrmAnnotationDescriptor<Abstract, AbstractXmlAnnotation> ABSTRACT = new OrmAnnotationDescriptor<>(
 			Abstract.class,
-			AbstractXmlAnnotation.class
+			AbstractXmlAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<AnyKeyType, AnyKeyTypeXmlAnnotation> ANY_KEY_TYPE = new OrmAnnotationDescriptor<>(
 			AnyKeyType.class,
-			AnyKeyTypeXmlAnnotation.class
+			AnyKeyTypeXmlAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
 	OrmAnnotationDescriptor<CollectionClassification, CollectionClassificationXmlAnnotation> COLLECTION_CLASSIFICATION = new OrmAnnotationDescriptor<>(
 			CollectionClassification.class,
-			CollectionClassificationXmlAnnotation.class
+			CollectionClassificationXmlAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
 	OrmAnnotationDescriptor<Extends, ExtendsXmlAnnotation> EXTENDS = new OrmAnnotationDescriptor<>(
 			Extends.class,
-			ExtendsXmlAnnotation.class
+			ExtendsXmlAnnotation.class,
+			EnumSet.of( Kind.CLASS ),
+			false
 	);
 	OrmAnnotationDescriptor<Target, TargetXmlAnnotation> TARGET = new OrmAnnotationDescriptor<>(
 			Target.class,
-			TargetXmlAnnotation.class
+			TargetXmlAnnotation.class,
+			EnumSet.of( Kind.FIELD, Kind.METHOD ),
+			false
 	);
 
 	static void forEachAnnotation(Consumer<AnnotationDescriptor<?>> consumer) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java
index 4cd5ba1617b5..617496213951 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java
@@ -10,12 +10,14 @@
 import org.hibernate.annotations.Any;
 import org.hibernate.boot.models.annotations.spi.AttributeMarker;
 import org.hibernate.models.spi.ModelsContext;
+import jakarta.persistence.CascadeType;
 
 @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
 @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
 public class AnyAnnotation implements Any, AttributeMarker, AttributeMarker.Fetchable, AttributeMarker.Optionalable {
 	private jakarta.persistence.FetchType fetch;
 	private boolean optional;
+	private CascadeType[] cascade;
 
 	/**
 	 * Used in creating dynamic annotation instances (e.g. from XML)
@@ -23,6 +25,7 @@ public class AnyAnnotation implements Any, AttributeMarker, AttributeMarker.Fetc
 	public AnyAnnotation(ModelsContext modelContext) {
 		this.fetch = jakarta.persistence.FetchType.EAGER;
 		this.optional = true;
+		this.cascade = new CascadeType[0];
 	}
 
 	/**
@@ -31,6 +34,7 @@ public AnyAnnotation(ModelsContext modelContext) {
 	public AnyAnnotation(Any annotation, ModelsContext modelContext) {
 		this.fetch = annotation.fetch();
 		this.optional = annotation.optional();
+		this.cascade = annotation.cascade();
 	}
 
 	/**
@@ -39,6 +43,7 @@ public AnyAnnotation(Any annotation, ModelsContext modelContext) {
 	public AnyAnnotation(Map<String, Object> attributeValues, ModelsContext modelContext) {
 		this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" );
 		this.optional = (boolean) attributeValues.get( "optional" );
+		this.cascade = (CascadeType[]) attributeValues.getOrDefault( "cascade", new CascadeType[0] );
 	}
 
 	@Override
@@ -65,5 +70,13 @@ public void optional(boolean value) {
 		this.optional = value;
 	}
 
+	@Override
+	public CascadeType[] cascade() {
+		return cascade;
+	}
+
+	public void cascade(CascadeType[] value) {
+		this.cascade = value;
+	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java
deleted file mode 100644
index d119ae9d5f56..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.boot.models.annotations.internal;
-
-import java.lang.annotation.Annotation;
-import java.util.Map;
-
-import org.hibernate.annotations.Columns;
-import org.hibernate.boot.models.HibernateAnnotations;
-import org.hibernate.models.spi.AnnotationDescriptor;
-import org.hibernate.models.spi.ModelsContext;
-
-import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue;
-
-@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
-@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
-public class ColumnsAnnotation implements Columns {
-	public static final AnnotationDescriptor<Columns> COLUMNS = null;
-
-	private jakarta.persistence.Column[] columns;
-
-	/**
-	 * Used in creating dynamic annotation instances (e.g. from XML)
-	 */
-	public ColumnsAnnotation(ModelsContext modelContext) {
-	}
-
-	/**
-	 * Used in creating annotation instances from JDK variant
-	 */
-	public ColumnsAnnotation(Columns annotation, ModelsContext modelContext) {
-		this.columns = extractJdkValue( annotation, HibernateAnnotations.COLUMNS, "columns", modelContext );
-	}
-
-	/**
-	 * Used in creating annotation instances from Jandex variant
-	 */
-	public ColumnsAnnotation(Map<String, Object> attributeValues, ModelsContext modelContext) {
-		this.columns = (jakarta.persistence.Column[]) attributeValues.get( "columns" );
-	}
-
-	@Override
-	public Class<? extends Annotation> annotationType() {
-		return Columns.class;
-	}
-
-	@Override
-	public jakarta.persistence.Column[] columns() {
-		return columns;
-	}
-
-	public void columns(jakarta.persistence.Column[] value) {
-		this.columns = value;
-	}
-
-
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludedAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludedAnnotation.java
new file mode 100644
index 000000000000..895e97d6b233
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludedAnnotation.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.models.annotations.internal;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
+import org.hibernate.annotations.Temporal;
+import org.hibernate.models.spi.ModelsContext;
+
+@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
+@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
+public class ExcludedAnnotation implements Temporal.Excluded {
+
+	/**
+	 * Used in creating dynamic annotation instances (e.g. from XML)
+	 */
+	public ExcludedAnnotation(ModelsContext modelContext) {
+	}
+
+	/**
+	 * Used in creating annotation instances from JDK variant
+	 */
+	public ExcludedAnnotation(Temporal.Excluded annotation, ModelsContext modelContext) {
+	}
+
+	/**
+	 * Used in creating annotation instances from Jandex variant
+	 */
+	public ExcludedAnnotation(Map<String, Object> attributeValues, ModelsContext modelContext) {
+	}
+
+	@Override
+	public Class<? extends Annotation> annotationType() {
+		return Temporal.Excluded.class;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HistoryPartitioningAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HistoryPartitioningAnnotation.java
new file mode 100644
index 000000000000..f6d0fcdd940c
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HistoryPartitioningAnnotation.java
@@ -0,0 +1,71 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.models.annotations.internal;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
+import org.hibernate.annotations.Temporal;
+import org.hibernate.models.spi.ModelsContext;
+
+@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
+@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
+public class HistoryPartitioningAnnotation implements Temporal.HistoryPartitioning {
+	private String currentPartition;
+	private String historyPartition;
+
+	/**
+	 * Used in creating dynamic annotation instances (e.g. from XML)
+	 */
+	public HistoryPartitioningAnnotation(ModelsContext modelContext) {
+		this.currentPartition = "";
+		this.historyPartition = "";
+	}
+
+	/**
+	 * Used in creating annotation instances from JDK variant
+	 */
+	public HistoryPartitioningAnnotation(Temporal.HistoryPartitioning annotation, ModelsContext modelContext) {
+		this.currentPartition = annotation.currentPartition();
+		this.historyPartition = annotation.historyPartition();
+	}
+
+	/**
+	 * Used in creating annotation instances from Jandex variant
+	 */
+	public HistoryPartitioningAnnotation(Map<String, Object> attributeValues, ModelsContext modelContext) {
+		this.currentPartition = (String) attributeValues.get( "currentPartition" );
+		this.historyPartition = (String) attributeValues.get( "historyPartition" );
+		if ( this.currentPartition == null ) {
+			this.currentPartition = "";
+		}
+		if ( this.historyPartition == null ) {
+			this.historyPartition = "";
+		}
+	}
+
+	@Override
+	public Class<? extends Annotation> annotationType() {
+		return Temporal.HistoryPartitioning.class;
+	}
+
+	@Override
+	public String currentPartition() {
+		return currentPartition;
+	}
+
+	public void currentPartition(String value) {
+		this.currentPartition = value;
+	}
+
+	@Override
+	public String historyPartition() {
+		return historyPartition;
+	}
+
+	public void historyPartition(String value) {
+		this.historyPartition = value;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HistoryTableAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HistoryTableAnnotation.java
new file mode 100644
index 000000000000..276a5c46e92a
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HistoryTableAnnotation.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.models.annotations.internal;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
+import org.hibernate.annotations.Temporal;
+import org.hibernate.models.spi.ModelsContext;
+
+@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
+@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
+public class HistoryTableAnnotation implements Temporal.HistoryTable {
+	private String name;
+
+	/**
+	 * Used in creating dynamic annotation instances (e.g. from XML)
+	 */
+	public HistoryTableAnnotation(ModelsContext modelContext) {
+		this.name = "";
+	}
+
+	/**
+	 * Used in creating annotation instances from JDK variant
+	 */
+	public HistoryTableAnnotation(Temporal.HistoryTable annotation, ModelsContext modelContext) {
+		this.name = annotation.name();
+	}
+
+	/**
+	 * Used in creating annotation instances from Jandex variant
+	 */
+	public HistoryTableAnnotation(Map<String, Object> attributeValues, ModelsContext modelContext) {
+		this.name = (String) attributeValues.get( "name" );
+		if ( this.name == null ) {
+			this.name = "";
+		}
+	}
+
+	@Override
+	public Class<? extends Annotation> annotationType() {
+		return Temporal.HistoryTable.class;
+	}
+
+	@Override
+	public String name() {
+		return name;
+	}
+
+	public void name(String value) {
+		this.name = value;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java
index e9c82de59880..400d49937e16 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java
@@ -10,17 +10,20 @@
 import org.hibernate.annotations.ManyToAny;
 import org.hibernate.boot.models.annotations.spi.AttributeMarker;
 import org.hibernate.models.spi.ModelsContext;
+import jakarta.persistence.CascadeType;
 
 @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
 @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
 public class ManyToAnyAnnotation implements ManyToAny, AttributeMarker, AttributeMarker.Fetchable {
 	private jakarta.persistence.FetchType fetch;
+	private CascadeType[] cascade;
 
 	/**
 	 * Used in creating dynamic annotation instances (e.g. from XML)
 	 */
 	public ManyToAnyAnnotation(ModelsContext modelContext) {
 		this.fetch = jakarta.persistence.FetchType.EAGER;
+		this.cascade = new CascadeType[0];
 	}
 
 	/**
@@ -28,6 +31,7 @@ public ManyToAnyAnnotation(ModelsContext modelContext) {
 	 */
 	public ManyToAnyAnnotation(ManyToAny annotation, ModelsContext modelContext) {
 		this.fetch = annotation.fetch();
+		this.cascade = annotation.cascade();
 	}
 
 	/**
@@ -35,6 +39,7 @@ public ManyToAnyAnnotation(ManyToAny annotation, ModelsContext modelContext) {
 	 */
 	public ManyToAnyAnnotation(Map<String, Object> attributeValues, ModelsContext modelContext) {
 		this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" );
+		this.cascade = (CascadeType[]) attributeValues.getOrDefault( "cascade", new CascadeType[0] );
 	}
 
 	@Override
@@ -51,5 +56,13 @@ public void fetch(jakarta.persistence.FetchType value) {
 		this.fetch = value;
 	}
 
+	@Override
+	public CascadeType[] cascade() {
+		return cascade;
+	}
+
+	public void cascade(CascadeType[] value) {
+		this.cascade = value;
+	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphAnnotation.java
index 488734b42b83..6e6f17b9dcb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphAnnotation.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphAnnotation.java
@@ -17,6 +17,7 @@
 public class NamedEntityGraphAnnotation implements NamedEntityGraph {
 	private String name;
 	private String graph;
+	private Class<?> root;
 
 	/**
 	 * Used in creating dynamic annotation instances (e.g. from XML)
@@ -31,6 +32,7 @@ public NamedEntityGraphAnnotation(ModelsContext modelContext) {
 	public NamedEntityGraphAnnotation(NamedEntityGraph annotation, ModelsContext modelContext) {
 		this.name = annotation.name();
 		this.graph = annotation.graph();
+		this.root = annotation.root();
 	}
 
 	/**
@@ -39,6 +41,7 @@ public NamedEntityGraphAnnotation(NamedEntityGraph annotation, ModelsContext mod
 	public NamedEntityGraphAnnotation(Map<String, Object> attributeValues, ModelsContext modelContext) {
 		this.name = (String) attributeValues.get( "name" );
 		this.graph = (String) attributeValues.get( "graph" );
+		this.root = (Class<?>) attributeValues.get( "root" );
 	}
 
 	@Override
@@ -46,6 +49,15 @@ public Class<? extends Annotation> annotationType() {
 		return NamedEntityGraph.class;
 	}
 
+	@Override
+	public Class<?> root() {
+		return this.root;
+	}
+
+	public void root(Class<?> root) {
+		this.root = root;
+	}
+
 	@Override
 	public String name() {
 		return name;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdClassAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdClassAnnotation.java
new file mode 100644
index 000000000000..654b5e292dc6
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdClassAnnotation.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.models.annotations.internal;
+
+import org.hibernate.annotations.NaturalIdClass;
+import org.hibernate.models.spi.ModelsContext;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
+@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
+@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
+public class NaturalIdClassAnnotation implements NaturalIdClass {
+	private Class<?> value;
+
+	/**
+	 * Used in creating dynamic annotation instances (e.g. from XML)
+	 */
+	public NaturalIdClassAnnotation(ModelsContext modelContext) {
+		this.value = void.class;
+	}
+
+	/**
+	 * Used in creating annotation instances from JDK variant
+	 */
+	public NaturalIdClassAnnotation(NaturalIdClass annotation, ModelsContext modelContext) {
+		this.value = annotation.value();
+	}
+
+	/**
+	 * Used in creating annotation instances from Jandex variant
+	 */
+	public NaturalIdClassAnnotation(Map<String, Object> attributeValues, ModelsContext modelContext) {
+		this.value = (Class<?>) attributeValues.get( "value" );
+	}
+
+	@Override
+	public Class<? extends Annotation> annotationType() {
+		return NaturalIdClass.class;
+	}
+
+	@Override
+	public Class<?> value() {
+		return value;
+	}
+
+	public void value(Class<?> value) {
+		this.value = value;
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SpecializedAnnotationDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SpecializedAnnotationDescriptor.java
index ddc7b1f73b95..3303ab423f7d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SpecializedAnnotationDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SpecializedAnnotationDescriptor.java
@@ -6,6 +6,7 @@
 
 import java.lang.annotation.Annotation;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -13,6 +14,7 @@
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.models.internal.OrmAnnotationDescriptor;
 import org.hibernate.models.spi.AnnotationDescriptor;
+import org.hibernate.models.spi.AnnotationTarget;
 
 import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractAnnotationTypeAnnotations;
 
@@ -25,16 +27,42 @@
 public class SpecializedAnnotationDescriptor<A extends Annotation,C extends A> extends OrmAnnotationDescriptor<A,C> {
 	private final Map<Class<? extends Annotation>, ? extends Annotation> usagesMap;
 
+	/**
+	 * @deprecated use {@link #SpecializedAnnotationDescriptor(Class, Class, EnumSet, boolean)}
+	 */
+	@Deprecated(forRemoval = true)
 	public SpecializedAnnotationDescriptor(Class<A> annotationType, Class<C> concreteType) {
 		super( annotationType, concreteType );
 		usagesMap = extractAnnotationsMap( annotationType );
 	}
 
+	/**
+	 * @deprecated use {@link #SpecializedAnnotationDescriptor(Class, Class, EnumSet, boolean, AnnotationDescriptor)}
+	 */
+	@Deprecated(forRemoval = true)
 	public SpecializedAnnotationDescriptor(Class<A> annotationType, Class<C> concreteType, AnnotationDescriptor<? extends Annotation> container) {
 		super( annotationType, concreteType, container );
 		usagesMap = extractAnnotationsMap( annotationType );
 	}
 
+	public SpecializedAnnotationDescriptor(
+			Class<A> annotationType,
+			Class<C> concreteType,
+			EnumSet<AnnotationTarget.Kind> allowableTargets,
+			boolean inherited,
+			AnnotationDescriptor<? extends Annotation> container) {
+		super( annotationType, concreteType, allowableTargets, inherited, container );
+		usagesMap = extractAnnotationsMap( annotationType );
+	}
+
+	public SpecializedAnnotationDescriptor(
+			Class<A> annotationType,
+			Class<C> concreteType,
+			EnumSet<AnnotationTarget.Kind> allowableTargets,
+			boolean inherited) {
+		this( annotationType, concreteType, allowableTargets, inherited, null );
+	}
+
 	@Override
 	public Map<Class<? extends Annotation>, ? extends Annotation> getUsageMap() {
 		return usagesMap;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalAnnotation.java
new file mode 100644
index 000000000000..a6911d72babb
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalAnnotation.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.models.annotations.internal;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
+import org.hibernate.annotations.Temporal;
+import org.hibernate.models.spi.ModelsContext;
+
+@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
+@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
+public class TemporalAnnotation implements Temporal {
+	private String rowStart;
+	private String rowEnd;
+	private int secondPrecision;
+
+	/**
+	 * Used in creating dynamic annotation instances (e.g. from XML)
+	 */
+	public TemporalAnnotation(ModelsContext modelContext) {
+		this.rowStart = "effective";
+		this.rowEnd = "superseded";
+		this.secondPrecision = -1;
+	}
+
+	/**
+	 * Used in creating annotation instances from JDK variant
+	 */
+	public TemporalAnnotation(Temporal annotation, ModelsContext modelContext) {
+		this.rowStart = annotation.rowStart();
+		this.rowEnd = annotation.rowEnd();
+		this.secondPrecision = annotation.secondPrecision();
+	}
+
+	/**
+	 * Used in creating annotation instances from Jandex variant
+	 */
+	public TemporalAnnotation(Map<String, Object> attributeValues, ModelsContext modelContext) {
+		this.rowStart = (String) attributeValues.get( "rowStart" );
+		this.rowEnd = (String) attributeValues.get( "rowEnd" );
+		final Integer secondPrecision = (Integer) attributeValues.get( "secondPrecision" );
+		this.secondPrecision = secondPrecision == null ? -1 : secondPrecision;
+		if ( this.rowStart == null ) {
+			this.rowStart = "effective";
+		}
+		if ( this.rowEnd == null ) {
+			this.rowEnd = "superseded";
+		}
+	}
+
+	@Override
+	public Class<? extends Annotation> annotationType() {
+		return Temporal.class;
+	}
+
+	@Override
+	public String rowStart() {
+		return rowStart;
+	}
+
+	public void setRowStart(String rowStart) {
+		this.rowStart = rowStart;
+	}
+
+	@Override
+	public String rowEnd() {
+		return rowEnd;
+	}
+
+	public void setRowEnd(String rowEnd) {
+		this.rowEnd = rowEnd;
+	}
+
+	@Override
+	public int secondPrecision() {
+		return secondPrecision;
+	}
+
+	public void setSecondPrecision(int secondPrecision) {
+		this.secondPrecision = secondPrecision;
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java
index c70ac5282d69..7e907678cb4e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java
@@ -6,13 +6,7 @@
 
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.Entity;
-import jakarta.persistence.MappedSuperclass;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityListenerContainerImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbPersistenceUnitDefaultsImpl;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbPersistenceUnitMetadataImpl;
 import org.hibernate.boot.models.spi.GlobalRegistrations;
 import org.hibernate.boot.models.xml.spi.XmlDocumentContext;
 import org.hibernate.models.spi.ClassDetails;
@@ -23,6 +17,10 @@
 import java.util.Map;
 import java.util.Set;
 
+import static org.hibernate.boot.model.internal.EmbeddableBinder.isEmbeddable;
+import static org.hibernate.boot.model.internal.EntityBinder.isEntity;
+import static org.hibernate.boot.model.internal.EntityBinder.isMappedSuperclass;
+
 /**
  * In-flight holder for various things as we process metadata sources
  *
@@ -60,23 +58,24 @@ public Map<String, ClassDetails> getEmbeddables() {
 	}
 
 	public void apply(JaxbEntityMappingsImpl jaxbRoot, XmlDocumentContext xmlDocumentContext) {
-		getGlobalRegistrations().collectJavaTypeRegistrations( jaxbRoot.getJavaTypeRegistrations() );
-		getGlobalRegistrations().collectJdbcTypeRegistrations( jaxbRoot.getJdbcTypeRegistrations() );
-		getGlobalRegistrations().collectConverterRegistrations( jaxbRoot.getConverterRegistrations() );
-		getGlobalRegistrations().collectConverters( jaxbRoot.getConverters() );
-		getGlobalRegistrations().collectUserTypeRegistrations( jaxbRoot.getUserTypeRegistrations() );
-		getGlobalRegistrations().collectCompositeUserTypeRegistrations( jaxbRoot.getCompositeUserTypeRegistrations() );
-		getGlobalRegistrations().collectCollectionTypeRegistrations( jaxbRoot.getCollectionUserTypeRegistrations() );
-		getGlobalRegistrations().collectEmbeddableInstantiatorRegistrations( jaxbRoot.getEmbeddableInstantiatorRegistrations() );
-		getGlobalRegistrations().collectFilterDefinitions( jaxbRoot.getFilterDefinitions() );
-
-		final JaxbPersistenceUnitMetadataImpl persistenceUnitMetadata = jaxbRoot.getPersistenceUnitMetadata();
+		globalRegistrations.collectJavaTypeRegistrations( jaxbRoot.getJavaTypeRegistrations() );
+		globalRegistrations.collectJdbcTypeRegistrations( jaxbRoot.getJdbcTypeRegistrations() );
+		globalRegistrations.collectConverterRegistrations( jaxbRoot.getConverterRegistrations() );
+		globalRegistrations.collectConverters( jaxbRoot.getConverters() );
+		globalRegistrations.collectUserTypeRegistrations( jaxbRoot.getUserTypeRegistrations() );
+		globalRegistrations.collectCompositeUserTypeRegistrations( jaxbRoot.getCompositeUserTypeRegistrations() );
+		globalRegistrations.collectCollectionTypeRegistrations( jaxbRoot.getCollectionUserTypeRegistrations() );
+		globalRegistrations.collectEmbeddableInstantiatorRegistrations( jaxbRoot.getEmbeddableInstantiatorRegistrations() );
+		globalRegistrations.collectFilterDefinitions( jaxbRoot.getFilterDefinitions() );
+
+		final var persistenceUnitMetadata = jaxbRoot.getPersistenceUnitMetadata();
 		if ( persistenceUnitMetadata != null ) {
-			final JaxbPersistenceUnitDefaultsImpl persistenceUnitDefaults = persistenceUnitMetadata.getPersistenceUnitDefaults();
+			final var persistenceUnitDefaults = persistenceUnitMetadata.getPersistenceUnitDefaults();
 			if ( persistenceUnitDefaults != null ) {
-				final JaxbEntityListenerContainerImpl listenerContainer = persistenceUnitDefaults.getEntityListenerContainer();
+				final var listenerContainer = persistenceUnitDefaults.getEntityListenerContainer();
 				if ( listenerContainer != null ) {
-					getGlobalRegistrations().collectEntityListenerRegistrations( listenerContainer.getEntityListeners(), modelsContext );
+					getGlobalRegistrations()
+							.collectEntityListenerRegistrations( listenerContainer.getEntityListeners(), modelsContext );
 				}
 			}
 		}
@@ -90,44 +89,48 @@ public void apply(JaxbEntityMappingsImpl jaxbRoot, XmlDocumentContext xmlDocumen
 	}
 
 	public void apply(ClassDetails classDetails) {
-		getGlobalRegistrations().collectJavaTypeRegistrations( classDetails );
-		getGlobalRegistrations().collectJdbcTypeRegistrations( classDetails );
-		getGlobalRegistrations().collectConverterRegistrations( classDetails );
-		getGlobalRegistrations().collectUserTypeRegistrations( classDetails );
-		getGlobalRegistrations().collectCompositeUserTypeRegistrations( classDetails );
-		getGlobalRegistrations().collectCollectionTypeRegistrations( classDetails );
-		getGlobalRegistrations().collectEmbeddableInstantiatorRegistrations( classDetails );
-		getGlobalRegistrations().collectFilterDefinitions( classDetails );
+		globalRegistrations.collectJavaTypeRegistrations( classDetails );
+		globalRegistrations.collectJdbcTypeRegistrations( classDetails );
+		globalRegistrations.collectConverterRegistrations( classDetails );
+		globalRegistrations.collectUserTypeRegistrations( classDetails );
+		globalRegistrations.collectCompositeUserTypeRegistrations( classDetails );
+		globalRegistrations.collectCollectionTypeRegistrations( classDetails );
+		globalRegistrations.collectEmbeddableInstantiatorRegistrations( classDetails );
+		globalRegistrations.collectFilterDefinitions( classDetails );
 
-		getGlobalRegistrations().collectIdGenerators( classDetails );
+		globalRegistrations.collectIdGenerators( classDetails );
 
-		getGlobalRegistrations().collectImportRename( classDetails );
+		globalRegistrations.collectImportRename( classDetails );
 
 		// todo : named queries
 		// todo : named graphs
 
-		if ( classDetails.getDirectAnnotationUsage( MappedSuperclass.class ) != null ) {
+		if ( isMappedSuperclass( classDetails ) ) {
 			if ( classDetails.getClassName() != null ) {
 				mappedSuperclasses.put( classDetails.getClassName(), classDetails );
 			}
 		}
-		else if ( classDetails.getDirectAnnotationUsage( Entity.class ) != null ) {
+		else if ( isEntity( classDetails ) ) {
 			if ( isRootEntity( classDetails ) ) {
 				rootEntities.add( classDetails );
 			}
 		}
-		else if ( classDetails.getDirectAnnotationUsage( Embeddable.class ) != null ) {
+		else if ( isEmbeddable( classDetails ) ) {
 			if ( classDetails.getClassName() != null ) {
 				embeddables.put( classDetails.getClassName(), classDetails );
 			}
 		}
 
-		if ( ( classDetails.getClassName() != null && classDetails.isImplementor( AttributeConverter.class ) )
-				|| classDetails.getDirectAnnotationUsage( Converter.class ) != null ) {
+		if ( isConverter( classDetails ) ) {
 			globalRegistrations.collectConverter( classDetails );
 		}
 	}
 
+	private static boolean isConverter(ClassDetails classDetails) {
+		return classDetails.getClassName() != null && classDetails.isImplementor( AttributeConverter.class )
+			|| classDetails.getDirectAnnotationUsage( Converter.class ) != null;
+	}
+
 	public static boolean isRootEntity(ClassDetails classInfo) {
 		// perform a series of opt-out checks against the super-type hierarchy
 
@@ -135,13 +138,9 @@ public static boolean isRootEntity(ClassDetails classInfo) {
 		// 		1) it has no super-types
 		//		2) its super types contain no entities (MappedSuperclasses are allowed)
 
-		if ( classInfo.getSuperClass() == null ) {
-			return true;
-		}
-
-		ClassDetails current = classInfo.getSuperClass();
-		while (  current != null ) {
-			if ( current.hasDirectAnnotationUsage( Entity.class ) && !current.isAbstract() ) {
+		var current = classInfo.getSuperClass();
+		while ( current != null ) {
+			if ( isEntity( current ) && !current.isAbstract() ) {
 				// a non-abstract super type has `@Entity` -> classInfo cannot be a root entity
 				return false;
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java
index 674c4e1a73ec..d9f981d9625b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java
@@ -9,15 +9,12 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
 
-import org.hibernate.MappingException;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Imported;
-import org.hibernate.annotations.ParamDef;
 import org.hibernate.annotations.Parameter;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbCollectionUserTypeRegistrationImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbCompositeUserTypeRegistrationImpl;
@@ -25,7 +22,6 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbConverterImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbConverterRegistrationImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbDatabaseObjectImpl;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbDatabaseObjectScopeImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEmbeddableInstantiatorRegistrationImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityListenerImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
@@ -37,20 +33,12 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbQueryHintContainer;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbNamedHqlQueryImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbNamedStoredProcedureQueryImpl;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbQueryHint;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbSequenceGeneratorImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbSqlResultSetMappingImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbTableGeneratorImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbUserTypeRegistrationImpl;
 import org.hibernate.boot.models.JpaAnnotations;
-import org.hibernate.boot.models.annotations.internal.GenericGeneratorAnnotation;
 import org.hibernate.boot.models.annotations.internal.NamedNativeQueryJpaAnnotation;
-import org.hibernate.boot.models.annotations.internal.NamedQueryJpaAnnotation;
-import org.hibernate.boot.models.annotations.internal.NamedStoredProcedureQueryJpaAnnotation;
-import org.hibernate.boot.models.annotations.internal.QueryHintJpaAnnotation;
-import org.hibernate.boot.models.annotations.internal.SequenceGeneratorJpaAnnotation;
-import org.hibernate.boot.models.annotations.internal.SqlResultSetMappingJpaAnnotation;
-import org.hibernate.boot.models.annotations.internal.TableGeneratorJpaAnnotation;
 import org.hibernate.boot.models.spi.CollectionTypeRegistration;
 import org.hibernate.boot.models.spi.CompositeUserTypeRegistration;
 import org.hibernate.boot.models.spi.ConversionRegistration;
@@ -78,22 +66,19 @@
 import org.hibernate.boot.models.xml.spi.XmlDocumentContext;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.internal.util.StringHelper;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.jpa.AvailableHints;
 import org.hibernate.metamodel.CollectionClassification;
 import org.hibernate.metamodel.spi.EmbeddableInstantiator;
 import org.hibernate.models.spi.AnnotationTarget;
 import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.ClassDetailsRegistry;
 import org.hibernate.models.spi.MemberDetails;
 import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.usertype.CompositeUserType;
 import org.hibernate.usertype.UserCollectionType;
 import org.hibernate.usertype.UserType;
 
-import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.QueryHint;
 import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.TableGenerator;
@@ -109,7 +94,6 @@
 import static org.hibernate.boot.models.HibernateAnnotations.GENERIC_GENERATOR;
 import static org.hibernate.boot.models.HibernateAnnotations.JAVA_TYPE_REGISTRATION;
 import static org.hibernate.boot.models.HibernateAnnotations.JDBC_TYPE_REGISTRATION;
-import static org.hibernate.boot.models.JpaAnnotations.ENTITY;
 import static org.hibernate.boot.models.JpaAnnotations.NAMED_STORED_PROCEDURE_QUERY;
 import static org.hibernate.boot.models.JpaAnnotations.SEQUENCE_GENERATOR;
 import static org.hibernate.boot.models.JpaAnnotations.TABLE_GENERATOR;
@@ -117,7 +101,10 @@
 import static org.hibernate.boot.models.xml.internal.QueryProcessing.collectResultClasses;
 import static org.hibernate.boot.BootLogging.BOOT_LOGGER;
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
+import static org.hibernate.internal.util.StringHelper.unqualify;
 import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty;
+import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
+import static org.hibernate.internal.util.collections.CollectionHelper.setOfSize;
 
 /**
  * @author Steve Ebersole
@@ -157,8 +144,7 @@ public GlobalRegistrationsImpl(ModelsContext sourceModelContext, BootstrapContex
 
 	@Override
 	public <T> T as(Class<T> type) {
-		//noinspection unchecked
-		return (T) this;
+		return type.cast( this );
 	}
 
 	@Override
@@ -259,21 +245,22 @@ public List<DatabaseObjectRegistration> getDatabaseObjectRegistrations() {
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// JavaTypeRegistration
 
+	private ClassDetailsRegistry getClassDetailsRegistry() {
+		return sourceModelContext.getClassDetailsRegistry();
+	}
+
 	public void collectJavaTypeRegistrations(AnnotationTarget annotationTarget) {
-		annotationTarget.forEachAnnotationUsage( JAVA_TYPE_REGISTRATION, sourceModelContext, (usage) -> collectJavaTypeRegistration(
-				toClassDetails( usage.javaType().getName() ),
-				toClassDetails( usage.descriptorClass().getName() )
-		) );
+		annotationTarget.forEachAnnotationUsage( JAVA_TYPE_REGISTRATION, sourceModelContext,
+				usage -> collectJavaTypeRegistration(
+						toClassDetails( usage.javaType().getName() ),
+						toClassDetails( usage.descriptorClass().getName() )
+				) );
 	}
 
 	public void collectJavaTypeRegistrations(List<JaxbJavaTypeRegistrationImpl> registrations) {
-		if ( CollectionHelper.isEmpty( registrations ) ) {
-			return;
-		}
-
-		registrations.forEach( (reg) -> collectJavaTypeRegistration(
-				toClassDetails( reg.getClazz() ),
-				toClassDetails( reg.getDescriptor() )
+		registrations.forEach( registration -> collectJavaTypeRegistration(
+				toClassDetails( registration.getClazz() ),
+				toClassDetails( registration.getDescriptor() )
 		) );
 	}
 
@@ -293,20 +280,18 @@ public  void collectJavaTypeRegistration(JavaTypeRegistration registration) {
 	// JdbcTypeRegistration
 
 	public void collectJdbcTypeRegistrations(AnnotationTarget annotationTarget) {
-		annotationTarget.forEachAnnotationUsage( JDBC_TYPE_REGISTRATION, sourceModelContext, (usage) -> collectJdbcTypeRegistration(
-				usage.registrationCode(),
-				sourceModelContext.getClassDetailsRegistry().resolveClassDetails( usage.value().getName() )
-		) );
+		annotationTarget.forEachAnnotationUsage( JDBC_TYPE_REGISTRATION, sourceModelContext,
+				usage -> collectJdbcTypeRegistration(
+						usage.registrationCode(),
+						getClassDetailsRegistry()
+								.resolveClassDetails( usage.value().getName() )
+				) );
 	}
 
 	public void collectJdbcTypeRegistrations(List<JaxbJdbcTypeRegistrationImpl> registrations) {
-		if ( CollectionHelper.isEmpty( registrations ) ) {
-			return;
-		}
-
-		registrations.forEach( (reg) -> collectJdbcTypeRegistration(
-				reg.getCode(),
-				toClassDetails( reg.getDescriptor() )
+		registrations.forEach( registration -> collectJdbcTypeRegistration(
+				registration.getCode(),
+				toClassDetails( registration.getDescriptor() )
 		) );
 	}
 
@@ -322,36 +307,28 @@ public void collectJdbcTypeRegistration(Integer registrationCode, ClassDetails d
 	// ConversionRegistration
 
 	public void collectConverterRegistrations(AnnotationTarget annotationTarget) {
-		annotationTarget.forEachAnnotationUsage( CONVERTER_REGISTRATION, sourceModelContext, (usage) -> {
-			collectConverterRegistration( new ConversionRegistration(
-					usage.domainType(),
-					usage.converter(),
-					usage.autoApply(),
-					CONVERTER_REGISTRATION
-			) );
-		} );
+		annotationTarget.forEachAnnotationUsage( CONVERTER_REGISTRATION, sourceModelContext,
+				usage -> collectConverterRegistration( new ConversionRegistration(
+						usage.domainType(),
+						usage.converter(),
+						usage.autoApply(),
+						CONVERTER_REGISTRATION
+				) ) );
 	}
 
 	public void collectConverterRegistrations(List<JaxbConverterRegistrationImpl> registrations) {
-		if ( CollectionHelper.isEmpty( registrations ) ) {
-			return;
-		}
-
-		registrations.forEach( (registration) -> {
-			final Class<?> explicitDomainType;
+		registrations.forEach( registration -> {
 			final String explicitDomainTypeName = registration.getClazz();
-			if ( isNotEmpty( explicitDomainTypeName ) ) {
-				explicitDomainType = sourceModelContext.getClassDetailsRegistry().resolveClassDetails( explicitDomainTypeName ).toJavaClass();
-			}
-			else {
-				explicitDomainType = null;
-			}
-			final Class<? extends AttributeConverter<?,?>> converterType = sourceModelContext.getClassDetailsRegistry().resolveClassDetails( registration.getConverter() ).toJavaClass();
-			final boolean autoApply = registration.isAutoApply();
 			collectConverterRegistration( new ConversionRegistration(
-					explicitDomainType,
-					converterType,
-					autoApply,
+					isNotEmpty( explicitDomainTypeName )
+							? getClassDetailsRegistry()
+									.resolveClassDetails( explicitDomainTypeName )
+									.toJavaClass()
+							: null,
+					getClassDetailsRegistry()
+							.resolveClassDetails( registration.getConverter() )
+							.toJavaClass(),
+					registration.isAutoApply(),
 					CONVERTER_REGISTRATION
 			) );
 		} );
@@ -369,20 +346,14 @@ public void collectConverterRegistration(ConversionRegistration conversion) {
 	// UserTypeRegistration
 
 	public void collectUserTypeRegistrations(AnnotationTarget annotationTarget) {
-		annotationTarget.forEachAnnotationUsage( TYPE_REGISTRATION, sourceModelContext, (usage) -> collectUserTypeRegistration(
-				usage.basicClass(),
-				usage.userType()
-		) );
+		annotationTarget.forEachAnnotationUsage( TYPE_REGISTRATION, sourceModelContext,
+				usage -> collectUserTypeRegistration( usage.basicClass(), usage.userType() ) );
 	}
 
 	public void collectUserTypeRegistrations(List<JaxbUserTypeRegistrationImpl> registrations) {
-		if ( CollectionHelper.isEmpty( registrations ) ) {
-			return;
-		}
-
-		registrations.forEach( (reg) -> {
-			final ClassDetails domainTypeDetails = toClassDetails( reg.getClazz() );
-			final ClassDetails descriptorDetails = toClassDetails( reg.getDescriptor() );
+		registrations.forEach( registration -> {
+			final var domainTypeDetails = toClassDetails( registration.getClazz() );
+			final var descriptorDetails = toClassDetails( registration.getDescriptor() );
 			collectUserTypeRegistration( domainTypeDetails, descriptorDetails );
 		} );
 	}
@@ -406,20 +377,14 @@ public void collectUserTypeRegistration(Class<?> domainClass, Class<? extends Us
 	// CompositeUserTypeRegistration
 
 	public void collectCompositeUserTypeRegistrations(AnnotationTarget annotationTarget) {
-		annotationTarget.forEachAnnotationUsage( COMPOSITE_TYPE_REGISTRATION, sourceModelContext, (usage) -> collectCompositeUserTypeRegistration(
-				usage.embeddableClass(),
-				usage.userType()
-		) );
+		annotationTarget.forEachAnnotationUsage( COMPOSITE_TYPE_REGISTRATION, sourceModelContext,
+				usage -> collectCompositeUserTypeRegistration( usage.embeddableClass(), usage.userType() ) );
 	}
 
 	public void collectCompositeUserTypeRegistrations(List<JaxbCompositeUserTypeRegistrationImpl> registrations) {
-		if ( CollectionHelper.isEmpty( registrations ) ) {
-			return;
-		}
-
-		registrations.forEach( (reg) -> collectCompositeUserTypeRegistration(
-				toClassDetails( reg.getClazz() ),
-				toClassDetails( reg.getDescriptor() )
+		registrations.forEach( registration -> collectCompositeUserTypeRegistration(
+				toClassDetails( registration.getClazz() ),
+				toClassDetails( registration.getDescriptor() )
 		) );
 	}
 
@@ -451,32 +416,29 @@ public void collectCollectionTypeRegistrations(AnnotationTarget annotationTarget
 
 	private Map<String,String> extractParameterMap(Parameter[] parameters) {
 		final Map<String,String> result = new HashMap<>();
-		for ( Parameter parameter : parameters ) {
+		for ( var parameter : parameters ) {
 			result.put( parameter.name(), parameter.value() );
 		}
 		return result;
 	}
 
 	public void collectCollectionTypeRegistrations(List<JaxbCollectionUserTypeRegistrationImpl> registrations) {
-		if ( CollectionHelper.isEmpty( registrations ) ) {
-			return;
-		}
-
-		registrations.forEach( (reg) -> collectCollectionTypeRegistration(
-				reg.getClassification(),
-				toClassDetails( reg.getDescriptor() ),
-				extractParameterMap( reg.getParameters() )
+		registrations.forEach( registration -> collectCollectionTypeRegistration(
+				registration.getClassification(),
+				toClassDetails( registration.getDescriptor() ),
+				extractParameterMap( registration.getParameters() )
 		) );
 	}
 
 	private Map<String, String> extractParameterMap(List<JaxbConfigurationParameterImpl> parameters) {
-		if ( CollectionHelper.isEmpty( parameters ) ) {
+		if ( isEmpty( parameters ) ) {
 			return Collections.emptyMap();
 		}
-
-		final Map<String,String> result = new HashMap<>();
-		parameters.forEach( parameter -> result.put( parameter.getName(), parameter.getValue() ) );
-		return result;
+		else {
+			final Map<String, String> result = new HashMap<>();
+			parameters.forEach( parameter -> result.put( parameter.getName(), parameter.getValue() ) );
+			return result;
+		}
 	}
 
 	public void collectCollectionTypeRegistration(
@@ -505,20 +467,15 @@ public void collectCollectionTypeRegistration(
 	// EmbeddableInstantiatorRegistration
 
 	public void collectEmbeddableInstantiatorRegistrations(AnnotationTarget annotationTarget) {
-		annotationTarget.forEachAnnotationUsage( EMBEDDABLE_INSTANTIATOR_REGISTRATION, sourceModelContext, (usage) -> collectEmbeddableInstantiatorRegistration(
-				usage.embeddableClass(),
-				usage.instantiator()
-		) );
+		annotationTarget.forEachAnnotationUsage( EMBEDDABLE_INSTANTIATOR_REGISTRATION, sourceModelContext,
+				usage -> collectEmbeddableInstantiatorRegistration( usage.embeddableClass(), usage.instantiator() ) );
 	}
 
 	public void collectEmbeddableInstantiatorRegistrations(List<JaxbEmbeddableInstantiatorRegistrationImpl> registrations) {
-		if ( CollectionHelper.isEmpty( registrations ) ) {
-			return;
-		}
-
-		registrations.forEach( (reg) -> collectEmbeddableInstantiatorRegistration(
-				sourceModelContext.getClassDetailsRegistry().resolveClassDetails( reg.getEmbeddableClass() ),
-				sourceModelContext.getClassDetailsRegistry().resolveClassDetails( reg.getInstantiator() )
+		final var classDetailsRegistry = getClassDetailsRegistry();
+		registrations.forEach( registration -> collectEmbeddableInstantiatorRegistration(
+				classDetailsRegistry.resolveClassDetails( registration.getEmbeddableClass() ),
+				classDetailsRegistry.resolveClassDetails( registration.getInstantiator() )
 		) );
 	}
 
@@ -541,11 +498,11 @@ public void collectEmbeddableInstantiatorRegistration(Class<?> embeddableClass,
 	// Filter-defs
 
 	public void collectFilterDefinitions(AnnotationTarget annotationTarget) {
-		annotationTarget.forEachAnnotationUsage( FILTER_DEF, sourceModelContext, (usage) -> {
+		annotationTarget.forEachAnnotationUsage( FILTER_DEF, sourceModelContext, usage -> {
 			final Map<String, ClassDetails> paramJdbcMappings;
 			final Map<String, ClassDetails> parameterResolvers;
-			final ParamDef[] parameters = usage.parameters();
-			if ( CollectionHelper.isEmpty( parameters ) ) {
+			final var parameters = usage.parameters();
+			if ( isEmpty( parameters ) ) {
 				paramJdbcMappings = emptyMap();
 				parameterResolvers = emptyMap();
 			}
@@ -553,9 +510,9 @@ public void collectFilterDefinitions(AnnotationTarget annotationTarget) {
 				paramJdbcMappings = new HashMap<>();
 				parameterResolvers = new HashMap<>();
 
-				for ( ParamDef parameter : parameters ) {
+				for ( var parameter : parameters ) {
 					paramJdbcMappings.put( parameter.name(), toClassDetails( parameter.type() ) );
-					final ClassDetails resolverClassDetails = toClassDetails( parameter.resolver() );
+					final var resolverClassDetails = toClassDetails( parameter.resolver() );
 					if ( !resolverClassDetails.getName().equals( Supplier.class.getName() ) ) {
 						parameterResolvers.put( parameter.name(), resolverClassDetails );
 					}
@@ -574,22 +531,19 @@ public void collectFilterDefinitions(AnnotationTarget annotationTarget) {
 	}
 
 	private ClassDetails toClassDetails(Class<?> type) {
-		return sourceModelContext.getClassDetailsRegistry().resolveClassDetails( type.getName() );
+		return getClassDetailsRegistry().resolveClassDetails( type.getName() );
 	}
 
 	private ClassDetails toClassDetails(String typeName) {
-		return sourceModelContext.getClassDetailsRegistry().resolveClassDetails( typeName );
+		return getClassDetailsRegistry().resolveClassDetails( typeName );
 	}
 
 	public void collectFilterDefinitions(List<JaxbFilterDefImpl> filterDefinitions) {
-		if ( CollectionHelper.isEmpty( filterDefinitions ) ) {
-			return;
-		}
-
-		filterDefinitions.forEach( (filterDefinition) -> {
+		final var classDetailsRegistry = getClassDetailsRegistry();
+		filterDefinitions.forEach( filterDefinition -> {
 			final Map<String, ClassDetails> paramJdbcMappings;
 			final Map<String, ClassDetails> parameterResolvers;
-			final List<JaxbFilterDefImpl.JaxbFilterParamImpl> jaxbParameters = filterDefinition.getFilterParams();
+			final var jaxbParameters = filterDefinition.getFilterParams();
 			if ( jaxbParameters.isEmpty() ) {
 				paramJdbcMappings = emptyMap();
 				parameterResolvers = emptyMap();
@@ -598,18 +552,17 @@ public void collectFilterDefinitions(List<JaxbFilterDefImpl> filterDefinitions)
 				paramJdbcMappings = new HashMap<>();
 				parameterResolvers = new HashMap<>();
 
-				for ( JaxbFilterDefImpl.JaxbFilterParamImpl jaxbParameter : jaxbParameters ) {
-					final ClassDetails targetClassDetails = XmlAnnotationHelper.resolveSimpleJavaType(
-							jaxbParameter.getType(),
-							sourceModelContext.getClassDetailsRegistry()
-					);
-					paramJdbcMappings.put( jaxbParameter.getName(), targetClassDetails );
-
-					if ( isNotEmpty( jaxbParameter.getResolver() ) ) {
-						parameterResolvers.put(
-								jaxbParameter.getName(),
-								sourceModelContext.getClassDetailsRegistry().resolveClassDetails( jaxbParameter.getResolver() )
-						);
+				for ( var jaxbParameter : jaxbParameters ) {
+					paramJdbcMappings.put( jaxbParameter.getName(),
+							XmlAnnotationHelper.resolveSimpleJavaType(
+									jaxbParameter.getType(),
+									classDetailsRegistry
+							) );
+
+					final String resolver = jaxbParameter.getResolver();
+					if ( isNotEmpty( resolver ) ) {
+						parameterResolvers.put( jaxbParameter.getName(),
+								classDetailsRegistry.resolveClassDetails( resolver ) );
 					}
 				}
 			}
@@ -636,10 +589,10 @@ public void collectFilterDefinition(
 			filterDefRegistrations = new HashMap<>();
 		}
 
-		final FilterDefRegistration previousEntry = filterDefRegistrations.put(
-				name,
-				new FilterDefRegistration( name, defaultCondition, autoEnabled, applyToLoadByKey, parameterTypes, parameterResolvers )
-		);
+		final var previousEntry =
+				filterDefRegistrations.put( name,
+						new FilterDefRegistration( name, defaultCondition, autoEnabled,
+								applyToLoadByKey, parameterTypes, parameterResolvers ) );
 		if ( previousEntry != null ) {
 			// legacy code simply allows the collision overwriting the previous
 			// todo (jpa32) : re-enable this, especially if the conditions differ
@@ -648,18 +601,15 @@ public void collectFilterDefinition(
 	}
 
 	public void collectImportRename(ClassDetails classDetails) {
-		final Imported importedUsage = classDetails.getDirectAnnotationUsage( Imported.class );
-
-		if ( importedUsage == null ) {
-			return;
+		final var importedUsage = classDetails.getDirectAnnotationUsage( Imported.class );
+		if ( importedUsage != null ) {
+			final String explicitRename = importedUsage.rename();
+			final String rename =
+					isNotEmpty( explicitRename )
+							? explicitRename
+							: unqualify( classDetails.getName() );
+			collectImportRename( rename, classDetails.getName() );
 		}
-
-		final String explicitRename = importedUsage.rename();
-		final String rename = isNotEmpty( explicitRename )
-				? explicitRename
-				: StringHelper.unqualify( classDetails.getName() );
-
-		collectImportRename( rename, classDetails.getName() );
 	}
 
 	public void collectImportRename(String rename, String name) {
@@ -675,20 +625,14 @@ public void collectImportRename(String rename, String name) {
 	// EntityListenerRegistration
 
 	public void collectEntityListenerRegistrations(List<JaxbEntityListenerImpl> listeners, ModelsContext modelsContext) {
-		if ( CollectionHelper.isEmpty( listeners ) ) {
-			return;
-		}
-
-		listeners.forEach( (jaxbEntityListener) -> {
-			final ClassDetails classDetails = sourceModelContext.getClassDetailsRegistry().resolveClassDetails( jaxbEntityListener.getClazz() );
-			final JpaEventListener listener = JpaEventListener.from(
-					JpaEventListenerStyle.LISTENER,
-					classDetails,
-					jaxbEntityListener,
-					modelsContext
-			);
-			addJpaEventListener( listener );
-		} );
+		final var classDetailsRegistry = getClassDetailsRegistry();
+		listeners.forEach( jaxbEntityListener ->
+				addJpaEventListener( JpaEventListener.from(
+						JpaEventListenerStyle.LISTENER,
+						classDetailsRegistry.resolveClassDetails( jaxbEntityListener.getClazz() ),
+						jaxbEntityListener,
+						modelsContext
+				) ) );
 	}
 
 	public void addJpaEventListener(JpaEventListener listener) {
@@ -720,7 +664,7 @@ public void collectIdGenerators(ClassDetails classDetails) {
 		classDetails.forEachRepeatedAnnotationUsages(
 				SEQUENCE_GENERATOR,
 				sourceModelContext,
-				(sequenceGenerator) -> collectSequenceGenerator( classDetails, sequenceGenerator )
+				sequenceGenerator -> collectSequenceGenerator( classDetails, sequenceGenerator )
 		);
 		classDetails.forEachAnnotationUsage(
 				TABLE_GENERATOR,
@@ -736,62 +680,56 @@ public void collectIdGenerators(ClassDetails classDetails) {
 
 	@Override
 	public void collectIdGenerators(MemberDetails memberDetails) {
-		if ( !bootstrapContext.getJpaCompliance().isGlobalGeneratorScopeEnabled() ) {
-			return;
+		if ( bootstrapContext.getJpaCompliance().isGlobalGeneratorScopeEnabled() ) {
+			memberDetails.forEachRepeatedAnnotationUsages(
+					SEQUENCE_GENERATOR,
+					sourceModelContext,
+					sequenceGenerator -> collectSequenceGenerator( memberDetails, sequenceGenerator )
+			);
+			memberDetails.forEachAnnotationUsage(
+					TABLE_GENERATOR,
+					sourceModelContext,
+					tableGenerator -> collectTableGenerator( memberDetails, tableGenerator )
+			);
+			memberDetails.forEachAnnotationUsage(
+					GENERIC_GENERATOR,
+					sourceModelContext,
+					this::collectGenericGenerator
+			);
 		}
-
-		memberDetails.forEachRepeatedAnnotationUsages(
-				SEQUENCE_GENERATOR,
-				sourceModelContext,
-				(sequenceGenerator) -> collectSequenceGenerator( memberDetails, sequenceGenerator )
-		);
-		memberDetails.forEachAnnotationUsage(
-				TABLE_GENERATOR,
-				sourceModelContext,
-				tableGenerator -> collectTableGenerator( memberDetails, tableGenerator )
-		);
-		memberDetails.forEachAnnotationUsage(
-				GENERIC_GENERATOR,
-				sourceModelContext,
-				this::collectGenericGenerator
-		);
 	}
 
-	/**
-	 * Account for implicit naming of sequence and table generators when applied to an entity class per JPA 3.2
-	 */
-	private String determineImplicitGeneratorNameBase(ClassDetails classDetails, GenerationType generationType) {
-		if ( classDetails.getName().endsWith( ".package-info" ) ) {
-			throw new MappingException( String.format(
-					Locale.ROOT,
-					"@%s placed on package (%s) specified no name",
-					generationType == GenerationType.SEQUENCE ? SequenceGenerator.class.getSimpleName() : TableGenerator.class.getSimpleName(),
-					StringHelper.qualifier( classDetails.getName() )
-			) );
-		}
-		final Entity entityAnnotation = classDetails.getDirectAnnotationUsage( ENTITY );
-		if ( entityAnnotation != null ) {
-			final String explicitEntityName = entityAnnotation.name();
-			return StringHelper.isNotEmpty( explicitEntityName )
-					? explicitEntityName
-					: StringHelper.unqualify( classDetails.getName() );
-		}
-		return null;
-	}
+//	/**
+//	 * Account for implicit naming of sequence and table generators when applied to an entity class per JPA 3.2
+//	 */
+//	private String determineImplicitGeneratorNameBase(ClassDetails classDetails, GenerationType generationType) {
+//		if ( classDetails.getName().endsWith( ".package-info" ) ) {
+//			throw new MappingException( String.format(
+//					Locale.ROOT,
+//					"@%s placed on package (%s) specified no name",
+//					generationType == GenerationType.SEQUENCE ? SequenceGenerator.class.getSimpleName() : TableGenerator.class.getSimpleName(),
+//					StringHelper.qualifier( classDetails.getName() )
+//			) );
+//		}
+//		final var entityAnnotation = classDetails.getDirectAnnotationUsage( ENTITY );
+//		if ( entityAnnotation != null ) {
+//			final String explicitEntityName = entityAnnotation.name();
+//			return StringHelper.isNotEmpty( explicitEntityName )
+//					? explicitEntityName
+//					: unqualify( classDetails.getName() );
+//		}
+//		return null;
+//	}
 
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Sequence generator
 
 	public void collectSequenceGenerators(List<JaxbSequenceGeneratorImpl> sequenceGenerators) {
-		if ( CollectionHelper.isEmpty( sequenceGenerators ) ) {
-			return;
-		}
-
-		sequenceGenerators.forEach( (jaxbGenerator) -> {
-			final SequenceGeneratorJpaAnnotation sequenceAnn = SEQUENCE_GENERATOR.createUsage( sourceModelContext );
+		sequenceGenerators.forEach( jaxbGenerator -> {
+			final var sequenceAnn = SEQUENCE_GENERATOR.createUsage( sourceModelContext );
 
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getName() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getName() ) ) {
 				sequenceAnn.name( jaxbGenerator.getName() );
 			}
 
@@ -799,11 +737,11 @@ public void collectSequenceGenerators(List<JaxbSequenceGeneratorImpl> sequenceGe
 				sequenceAnn.sequenceName( jaxbGenerator.getSequenceName() );
 			}
 
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getCatalog() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getCatalog() ) ) {
 				sequenceAnn.catalog( jaxbGenerator.getCatalog() );
 			}
 
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getSchema() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getSchema() ) ) {
 				sequenceAnn.schema( jaxbGenerator.getSchema() );
 			}
 
@@ -815,7 +753,7 @@ public void collectSequenceGenerators(List<JaxbSequenceGeneratorImpl> sequenceGe
 				sequenceAnn.allocationSize( jaxbGenerator.getAllocationSize() );
 			}
 
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getOptions() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getOptions() ) ) {
 				sequenceAnn.options( jaxbGenerator.getOptions() );
 			}
 
@@ -827,25 +765,11 @@ public void collectSequenceGenerator(MemberDetails memberDetails, SequenceGenera
 		collectSequenceGenerator( memberDetails.getDeclaringType(), usage );
 	}
 
-
 	public void collectSequenceGenerator(ClassDetails classDetails, SequenceGenerator usage) {
-		final String registrationName;
-		if ( !usage.name().isEmpty() ) {
-			registrationName = usage.name();
-		}
-		else {
-			final Entity entityAnnotation = classDetails.getDirectAnnotationUsage( Entity.class );
-			if ( entityAnnotation != null && !entityAnnotation.name().isEmpty() ) {
-				registrationName = entityAnnotation.name();
-			}
-			else {
-				registrationName = StringHelper.unqualify( classDetails.getName() );
-			}
-		}
+		final String registrationName = registrationName( classDetails, usage.name() );
 		collectSequenceGenerator( new SequenceGeneratorRegistration( registrationName, usage ) );
 	}
 
-
 	public void collectSequenceGenerator(SequenceGeneratorRegistration generatorRegistration) {
 		checkGeneratorName( generatorRegistration.name() );
 
@@ -862,12 +786,10 @@ private void checkGeneratorName(String name) {
 	}
 
 	private void checkGeneratorName(String name, Map<String, ?> generatorMap) {
-		if ( generatorMap == null ) {
-			return;
-		}
-		if ( generatorMap.containsKey( name ) ) {
+		if ( generatorMap != null && generatorMap.containsKey( name ) ) {
 			if ( bootstrapContext.getJpaCompliance().isGlobalGeneratorScopeEnabled() ) {
-				throw new IllegalArgumentException( "Duplicate generator name " + name + "; you will likely want to set the property " + AvailableSettings.JPA_ID_GENERATOR_GLOBAL_SCOPE_COMPLIANCE + " to false " );
+				throw new IllegalArgumentException(
+						"Duplicate generator name " + name + "; you will likely want to set the property " + AvailableSettings.JPA_ID_GENERATOR_GLOBAL_SCOPE_COMPLIANCE + " to false " );
 			}
 			else {
 				BOOT_LOGGER.duplicateGeneratorName( name );
@@ -880,31 +802,27 @@ private void checkGeneratorName(String name, Map<String, ?> generatorMap) {
 	// Table generator
 
 	public void collectTableGenerators(List<JaxbTableGeneratorImpl> jaxbGenerators) {
-		if ( CollectionHelper.isEmpty( jaxbGenerators ) ) {
-			return;
-		}
-
-		jaxbGenerators.forEach( (jaxbGenerator) -> {
-			final TableGeneratorJpaAnnotation annotation = TABLE_GENERATOR.createUsage( sourceModelContext );
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getName() ) ) {
+		jaxbGenerators.forEach( jaxbGenerator -> {
+			final var annotation = TABLE_GENERATOR.createUsage( sourceModelContext );
+			if ( isNotEmpty( jaxbGenerator.getName() ) ) {
 				annotation.name( jaxbGenerator.getName() );
 			}
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getTable() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getTable() ) ) {
 				annotation.table( jaxbGenerator.getTable() );
 			}
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getCatalog() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getCatalog() ) ) {
 				annotation.catalog( jaxbGenerator.getCatalog() );
 			}
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getSchema() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getSchema() ) ) {
 				annotation.schema( jaxbGenerator.getSchema() );
 			}
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getPkColumnName() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getPkColumnName() ) ) {
 				annotation.pkColumnName( jaxbGenerator.getPkColumnName() );
 			}
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getPkColumnValue() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getPkColumnValue() ) ) {
 				annotation.pkColumnValue( jaxbGenerator.getPkColumnValue() );
 			}
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getValueColumnName() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getValueColumnName() ) ) {
 				annotation.valueColumnName( jaxbGenerator.getValueColumnName() );
 			}
 			if ( jaxbGenerator.getInitialValue() != null ) {
@@ -913,7 +831,7 @@ public void collectTableGenerators(List<JaxbTableGeneratorImpl> jaxbGenerators)
 			if ( jaxbGenerator.getAllocationSize() != null ) {
 				annotation.allocationSize( jaxbGenerator.getAllocationSize() );
 			}
-			if ( StringHelper.isNotEmpty( jaxbGenerator.getOptions() ) ) {
+			if ( isNotEmpty( jaxbGenerator.getOptions() ) ) {
 				annotation.options( jaxbGenerator.getOptions() );
 			}
 
@@ -931,49 +849,13 @@ public void collectTableGenerators(List<JaxbTableGeneratorImpl> jaxbGenerators)
 		} );
 	}
 
-	public void collectTableGenerator(ClassDetails classDetails, TableGenerator usage) {
-		final TableGeneratorJpaAnnotation generatorAnnotation = new TableGeneratorJpaAnnotation(
-				usage,
-				sourceModelContext
-		);
-
-		final Entity entityAnnotation = classDetails.getDirectAnnotationUsage( Entity.class );
-		final String simpleName;
-		if ( entityAnnotation != null && !entityAnnotation.name().isEmpty() ) {
-			simpleName = entityAnnotation.name();
-		}
-		else {
-			simpleName = StringHelper.unqualify( classDetails.getName() );
-		}
-
-		final String registrationName;
-		if ( !usage.name().isEmpty() ) {
-			registrationName = usage.name();
-		}
-		else {
-			registrationName = simpleName;
-		}
-		generatorAnnotation.name( registrationName );
-		collectTableGenerator( new TableGeneratorRegistration( registrationName, usage ) );
-
+	public void collectTableGenerator(MemberDetails memberDetails, TableGenerator usage) {
+		collectTableGenerator(  memberDetails.getDeclaringType(), usage );
 	}
 
-	public void collectTableGenerator(MemberDetails memberDetails, TableGenerator usage) {
-		final String registrationName;
-		if ( !usage.name().isEmpty() ) {
-			registrationName = usage.name();
-		}
-		else {
-			final Entity entityAnnotation = memberDetails.getDeclaringType().getDirectAnnotationUsage( Entity.class );
-			if ( entityAnnotation != null && !entityAnnotation.name().isEmpty() ) {
-				registrationName = entityAnnotation.name();
-			}
-			else {
-				registrationName = StringHelper.unqualify( memberDetails.getDeclaringType().getName() );
-			}
-		}
+	public void collectTableGenerator(ClassDetails classDetails, TableGenerator usage) {
+		final String registrationName = registrationName( classDetails, usage.name() );
 		collectTableGenerator( new TableGeneratorRegistration( registrationName, usage ) );
-
 	}
 
 	public void collectTableGenerator(TableGeneratorRegistration generatorRegistration) {
@@ -990,15 +872,10 @@ public void collectTableGenerator(TableGeneratorRegistration generatorRegistrati
 	// Generic generators
 
 	private void collectGenericGenerators(List<JaxbGenericIdGeneratorImpl> jaxbGenerators) {
-		if ( CollectionHelper.isEmpty( jaxbGenerators ) ) {
-			return;
-		}
-
-		jaxbGenerators.forEach( (jaxbGenerator) -> {
-			final GenericGeneratorAnnotation annotation = GENERIC_GENERATOR.createUsage( sourceModelContext );
+		jaxbGenerators.forEach( jaxbGenerator -> {
+			final var annotation = GENERIC_GENERATOR.createUsage( sourceModelContext );
 			annotation.name( jaxbGenerator.getName() );
 			annotation.strategy( jaxbGenerator.getClazz() );
-
 			annotation.parameters( XmlAnnotationHelper.collectParameters(
 					jaxbGenerator.getParameters(),
 					sourceModelContext
@@ -1009,10 +886,9 @@ private void collectGenericGenerators(List<JaxbGenericIdGeneratorImpl> jaxbGener
 	}
 
 	public void collectGenericGenerator(GenericGenerator usage) {
-		if ( usage.name().isEmpty() ) {
-			return;
+		if ( !usage.name().isEmpty() ) {
+			collectGenericGenerator( new GenericGeneratorRegistration( usage.name(), usage ) );
 		}
-		collectGenericGenerator( new GenericGeneratorRegistration( usage.name(), usage ) );
 	}
 
 	public void collectGenericGenerator(GenericGeneratorRegistration generatorRegistration) {
@@ -1037,22 +913,20 @@ public void collectConverter(ClassDetails converterClassDetails) {
 	}
 
 	public void collectConverters(List<JaxbConverterImpl> converters) {
-		if ( CollectionHelper.isEmpty( converters ) ) {
-			return;
-		}
+		if ( !isEmpty( converters ) ) {
+			if ( jpaConverters == null ) {
+				jpaConverters = setOfSize( converters.size() );
+			}
 
-		if ( jpaConverters == null ) {
-			jpaConverters = CollectionHelper.setOfSize( converters.size() );
+			converters.forEach( jaxbConverter -> {
+				final String converterClassName = jaxbConverter.getClazz();
+				assert converterClassName != null;
+				final var converterType =
+						getClassDetailsRegistry()
+								.resolveClassDetails( converterClassName );
+				jpaConverters.add( new ConverterRegistration( converterType, jaxbConverter.isAutoApply() ) );
+			} );
 		}
-
-		converters.forEach( (jaxbConverter) -> {
-			final String converterClassName = jaxbConverter.getClazz();
-			assert converterClassName != null;
-			final ClassDetails converterType = sourceModelContext.getClassDetailsRegistry().resolveClassDetails( converterClassName );
-			final boolean autoApply = jaxbConverter.isAutoApply();
-
-			jpaConverters.add( new ConverterRegistration( converterType, autoApply ) );
-		} );
 	}
 
 	public void collectQueryReferences(JaxbEntityMappingsImpl jaxbRoot, XmlDocumentContext xmlDocumentContext) {
@@ -1065,86 +939,82 @@ public void collectQueryReferences(JaxbEntityMappingsImpl jaxbRoot, XmlDocumentC
 	private void collectNamedSqlResultSetMappings(
 			List<JaxbSqlResultSetMappingImpl> jaxbSqlResultSetMappings,
 			XmlDocumentContext xmlDocumentContext) {
-		if ( isEmpty( jaxbSqlResultSetMappings ) ) {
-			return;
-		}
+		if ( !isEmpty( jaxbSqlResultSetMappings ) ) {
+			if ( sqlResultSetMappingRegistrations == null ) {
+				sqlResultSetMappingRegistrations = new HashMap<>();
+			}
 
-		if ( sqlResultSetMappingRegistrations == null ) {
-			sqlResultSetMappingRegistrations = new HashMap<>();
-		}
+			jaxbSqlResultSetMappings.forEach( (jaxbMapping) -> {
+				final var annotation = JpaAnnotations.SQL_RESULT_SET_MAPPING.createUsage( sourceModelContext );
+				final String name = jaxbMapping.getName();
 
-		jaxbSqlResultSetMappings.forEach( (jaxbMapping) -> {
-			final SqlResultSetMappingJpaAnnotation annotation = JpaAnnotations.SQL_RESULT_SET_MAPPING.createUsage( sourceModelContext );
-			annotation.name( jaxbMapping.getName() );
+				annotation.name( name );
 
-			annotation.columns( QueryProcessing.extractColumnResults(
-					jaxbMapping.getColumnResult(),
-					xmlDocumentContext
-			) );
-			annotation.classes( QueryProcessing.extractConstructorResults(
-					jaxbMapping.getConstructorResult(),
-					xmlDocumentContext
-			) );
-			annotation.entities( QueryProcessing.extractEntityResults(
-					jaxbMapping.getEntityResult(),
-					xmlDocumentContext
-			) );
+				annotation.columns( QueryProcessing.extractColumnResults(
+						jaxbMapping.getColumnResult(),
+						xmlDocumentContext
+				) );
+				annotation.classes( QueryProcessing.extractConstructorResults(
+						jaxbMapping.getConstructorResult(),
+						xmlDocumentContext
+				) );
+				annotation.entities( QueryProcessing.extractEntityResults(
+						jaxbMapping.getEntityResult(),
+						xmlDocumentContext
+				) );
 
-			sqlResultSetMappingRegistrations.put(
-					jaxbMapping.getName(),
-					new SqlResultSetMappingRegistration( jaxbMapping.getName(), annotation )
-			);
-		} );
+				sqlResultSetMappingRegistrations.put( name,
+						new SqlResultSetMappingRegistration( name, annotation ) );
+			} );
+		}
 	}
 
 	private void collectNamedQueries(List<JaxbNamedHqlQueryImpl> jaxbNamedQueries, XmlDocumentContext xmlDocumentContext) {
-		if ( isEmpty( jaxbNamedQueries ) ) {
-			return;
-		}
+		if ( !isEmpty( jaxbNamedQueries ) ) {
+			if ( namedQueryRegistrations == null ) {
+				namedQueryRegistrations = new HashMap<>();
+			}
 
-		if ( namedQueryRegistrations == null ) {
-			namedQueryRegistrations = new HashMap<>();
-		}
+			for ( var jaxbNamedQuery : jaxbNamedQueries ) {
+				final var queryAnnotation = JpaAnnotations.NAMED_QUERY.createUsage( sourceModelContext );
+				final String name = jaxbNamedQuery.getName();
 
-		for ( JaxbNamedHqlQueryImpl jaxbNamedQuery : jaxbNamedQueries ) {
-			final NamedQueryJpaAnnotation queryAnnotation = JpaAnnotations.NAMED_QUERY.createUsage( xmlDocumentContext.getModelBuildingContext() );
-			namedQueryRegistrations.put(
-					jaxbNamedQuery.getName(),
-					new NamedQueryRegistration( jaxbNamedQuery.getName(), queryAnnotation )
-			);
+				namedQueryRegistrations.put( name,
+						new NamedQueryRegistration( name, queryAnnotation ) );
 
-			queryAnnotation.name( jaxbNamedQuery.getName() );
-			queryAnnotation.query( jaxbNamedQuery.getQuery() );
+				queryAnnotation.name( name );
+				queryAnnotation.query( jaxbNamedQuery.getQuery() );
 
-			if ( jaxbNamedQuery.getLockMode() != null ) {
-				queryAnnotation.lockMode( jaxbNamedQuery.getLockMode() );
-			}
+				final var lockMode = jaxbNamedQuery.getLockMode();
+				if ( lockMode != null ) {
+					queryAnnotation.lockMode( lockMode );
+				}
 
-			queryAnnotation.hints( collectQueryHints(
-					jaxbNamedQuery,
-					xmlDocumentContext
-			) );
+				queryAnnotation.hints( collectQueryHints( jaxbNamedQuery, xmlDocumentContext ) );
+			}
 		}
 	}
 
 	private QueryHint[] collectQueryHints(JaxbNamedHqlQueryImpl jaxbNamedQuery, XmlDocumentContext xmlDocumentContext) {
-		final List<QueryHint> hints = extractQueryHints( jaxbNamedQuery );
+		final var hints = extractQueryHints( jaxbNamedQuery );
+
+		final var modelBuildingContext = xmlDocumentContext.getModelBuildingContext();
 
 		if ( jaxbNamedQuery.isCacheable() == Boolean.TRUE ) {
-			final QueryHintJpaAnnotation cacheableHint = JpaAnnotations.QUERY_HINT.createUsage( xmlDocumentContext.getModelBuildingContext() );
+			final var cacheableHint = JpaAnnotations.QUERY_HINT.createUsage( modelBuildingContext );
 			cacheableHint.name( AvailableHints.HINT_CACHEABLE );
 			cacheableHint.value( Boolean.TRUE.toString() );
 			hints.add( cacheableHint );
 
 			if ( jaxbNamedQuery.getCacheMode() != null ) {
-				final QueryHintJpaAnnotation cacheModeHint = JpaAnnotations.QUERY_HINT.createUsage( xmlDocumentContext.getModelBuildingContext() );
+				final var cacheModeHint = JpaAnnotations.QUERY_HINT.createUsage( modelBuildingContext );
 				cacheModeHint.name( AvailableHints.HINT_CACHE_MODE );
 				cacheModeHint.value( jaxbNamedQuery.getCacheMode().name() );
 				hints.add( cacheModeHint );
 			}
 
 			if ( isNotEmpty( jaxbNamedQuery.getCacheRegion() ) ) {
-				final QueryHintJpaAnnotation cacheRegionHint = JpaAnnotations.QUERY_HINT.createUsage( xmlDocumentContext.getModelBuildingContext() );
+				final var cacheRegionHint = JpaAnnotations.QUERY_HINT.createUsage( modelBuildingContext );
 				cacheRegionHint.name( AvailableHints.HINT_CACHE_REGION );
 				cacheRegionHint.value( jaxbNamedQuery.getCacheRegion() );
 				hints.add( cacheRegionHint );
@@ -1152,28 +1022,28 @@ private QueryHint[] collectQueryHints(JaxbNamedHqlQueryImpl jaxbNamedQuery, XmlD
 		}
 
 		if ( isNotEmpty( jaxbNamedQuery.getComment() ) ) {
-			final QueryHintJpaAnnotation hint = JpaAnnotations.QUERY_HINT.createUsage( xmlDocumentContext.getModelBuildingContext() );
+			final var hint = JpaAnnotations.QUERY_HINT.createUsage( modelBuildingContext );
 			hint.name( AvailableHints.HINT_COMMENT );
 			hint.value( jaxbNamedQuery.getComment() );
 			hints.add( hint );
 		}
 
 		if ( jaxbNamedQuery.getFetchSize() != null ) {
-			final QueryHintJpaAnnotation hint = JpaAnnotations.QUERY_HINT.createUsage( xmlDocumentContext.getModelBuildingContext() );
+			final var hint = JpaAnnotations.QUERY_HINT.createUsage( modelBuildingContext );
 			hint.name( AvailableHints.HINT_FETCH_SIZE );
 			hint.value( jaxbNamedQuery.getFetchSize().toString() );
 			hints.add( hint );
 		}
 
 		if ( jaxbNamedQuery.isReadOnly() == Boolean.TRUE ) {
-			final QueryHintJpaAnnotation hint = JpaAnnotations.QUERY_HINT.createUsage( xmlDocumentContext.getModelBuildingContext() );
+			final var hint = JpaAnnotations.QUERY_HINT.createUsage( modelBuildingContext );
 			hint.name( AvailableHints.HINT_READ_ONLY );
 			hint.value( Boolean.TRUE.toString() );
 			hints.add( hint );
 		}
 
 		if ( jaxbNamedQuery.getFlushMode() != null ) {
-			final QueryHintJpaAnnotation hint = JpaAnnotations.QUERY_HINT.createUsage( xmlDocumentContext.getModelBuildingContext() );
+			final var hint = JpaAnnotations.QUERY_HINT.createUsage( modelBuildingContext );
 			hint.name( AvailableHints.HINT_FLUSH_MODE );
 			hint.value( jaxbNamedQuery.getFlushMode().name() );
 			hints.add( hint );
@@ -1183,32 +1053,30 @@ private QueryHint[] collectQueryHints(JaxbNamedHqlQueryImpl jaxbNamedQuery, XmlD
 	}
 
 	private void collectNamedNativeQueries(List<JaxbNamedNativeQueryImpl> namedNativeQueries, XmlDocumentContext xmlDocumentContext) {
-		if ( isEmpty( namedNativeQueries ) ) {
-			return;
-		}
+		if ( !isEmpty( namedNativeQueries ) ) {
+			if ( namedNativeQueryRegistrations == null ) {
+				namedNativeQueryRegistrations = new HashMap<>();
+			}
 
-		if ( namedNativeQueryRegistrations == null ) {
-			namedNativeQueryRegistrations = new HashMap<>();
-		}
+			for ( var jaxbNamedQuery : namedNativeQueries ) {
+				final var queryAnnotation = JpaAnnotations.NAMED_NATIVE_QUERY.createUsage( sourceModelContext );
+				final String name = jaxbNamedQuery.getName();
 
-		for ( JaxbNamedNativeQueryImpl jaxbNamedQuery : namedNativeQueries ) {
-			final NamedNativeQueryJpaAnnotation queryAnnotation = JpaAnnotations.NAMED_NATIVE_QUERY.createUsage( xmlDocumentContext.getModelBuildingContext() );
-			namedNativeQueryRegistrations.put(
-					jaxbNamedQuery.getName(),
-					new NamedNativeQueryRegistration( jaxbNamedQuery.getName(), queryAnnotation )
-			);
+				namedNativeQueryRegistrations.put( name,
+						new NamedNativeQueryRegistration( name, queryAnnotation ) );
 
-			queryAnnotation.name( jaxbNamedQuery.getName() );
-			queryAnnotation.query( jaxbNamedQuery.getQuery() );
+				queryAnnotation.name( name );
+				queryAnnotation.query( jaxbNamedQuery.getQuery() );
 
-			if ( isNotEmpty( jaxbNamedQuery.getResultClass() ) ) {
-				final ClassDetails resultClassDetails = toClassDetails( jaxbNamedQuery.getResultClass() );
-				queryAnnotation.resultClass( resultClassDetails.toJavaClass() );
-			}
+				final String resultClass = jaxbNamedQuery.getResultClass();
+				if ( isNotEmpty( resultClass ) ) {
+					queryAnnotation.resultClass( toClassDetails( resultClass ).toJavaClass() );
+				}
 
-			applyResultSetMapping( jaxbNamedQuery, queryAnnotation, xmlDocumentContext );
+				applyResultSetMapping( jaxbNamedQuery, queryAnnotation, xmlDocumentContext );
 
-			queryAnnotation.hints( collectNativeQueryHints( jaxbNamedQuery ) );
+				queryAnnotation.hints( collectNativeQueryHints( jaxbNamedQuery ) );
+			}
 		}
 	}
 
@@ -1216,43 +1084,44 @@ private void applyResultSetMapping(
 			JaxbNamedNativeQueryImpl jaxbNamedQuery,
 			NamedNativeQueryJpaAnnotation queryAnnotation,
 			XmlDocumentContext xmlDocumentContext) {
-		if ( isNotEmpty( jaxbNamedQuery.getResultSetMapping() ) ) {
+		final String resultSetMapping = jaxbNamedQuery.getResultSetMapping();
+		if ( isNotEmpty( resultSetMapping ) ) {
 			queryAnnotation.resultSetMapping( jaxbNamedQuery.getResultSetMapping() );
-			return;
 		}
-
-		queryAnnotation.columns( QueryProcessing.extractColumnResults(
-				jaxbNamedQuery.getColumnResult(),
-				xmlDocumentContext
-		) );
-		queryAnnotation.classes( QueryProcessing.extractConstructorResults(
-				jaxbNamedQuery.getConstructorResult(),
-				xmlDocumentContext
-		) );
-		queryAnnotation.entities( QueryProcessing.extractEntityResults(
-				jaxbNamedQuery.getEntityResult(),
-				xmlDocumentContext
-		) );
+		else {
+			queryAnnotation.columns( QueryProcessing.extractColumnResults(
+					jaxbNamedQuery.getColumnResult(),
+					xmlDocumentContext
+			) );
+			queryAnnotation.classes( QueryProcessing.extractConstructorResults(
+					jaxbNamedQuery.getConstructorResult(),
+					xmlDocumentContext
+			) );
+			queryAnnotation.entities( QueryProcessing.extractEntityResults(
+					jaxbNamedQuery.getEntityResult(),
+					xmlDocumentContext
+			) );
+		}
 	}
 
 	private QueryHint[] collectNativeQueryHints(JaxbNamedNativeQueryImpl jaxbNamedQuery) {
-		final List<QueryHint> hints = extractQueryHints( jaxbNamedQuery );
+		final var hints = extractQueryHints( jaxbNamedQuery );
 
 		if ( jaxbNamedQuery.isCacheable() == Boolean.TRUE ) {
-			final QueryHintJpaAnnotation cacheableHint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
+			final var cacheableHint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
 			cacheableHint.name( AvailableHints.HINT_CACHEABLE );
 			cacheableHint.value( Boolean.TRUE.toString() );
 			hints.add( cacheableHint );
 
 			if ( jaxbNamedQuery.getCacheMode() != null ) {
-				final QueryHintJpaAnnotation cacheModeHint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
+				final var cacheModeHint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
 				cacheModeHint.name( AvailableHints.HINT_CACHE_MODE );
 				cacheModeHint.value( jaxbNamedQuery.getCacheMode().name() );
 				hints.add( cacheModeHint );
 			}
 
 			if ( isNotEmpty( jaxbNamedQuery.getCacheRegion() ) ) {
-				final QueryHintJpaAnnotation cacheRegionHint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
+				final var cacheRegionHint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
 				cacheRegionHint.name( AvailableHints.HINT_CACHE_REGION );
 				cacheRegionHint.value( jaxbNamedQuery.getCacheRegion() );
 				hints.add( cacheRegionHint );
@@ -1260,14 +1129,14 @@ private QueryHint[] collectNativeQueryHints(JaxbNamedNativeQueryImpl jaxbNamedQu
 		}
 
 		if ( jaxbNamedQuery.isReadOnly() == Boolean.TRUE ) {
-			final QueryHintJpaAnnotation hint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
+			final var hint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
 			hint.name( AvailableHints.HINT_READ_ONLY );
 			hint.value( Boolean.TRUE.toString() );
 			hints.add( hint );
 		}
 
 		if ( isNotEmpty( jaxbNamedQuery.getComment() ) ) {
-			final QueryHintJpaAnnotation hint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
+			final var hint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
 			hint.name( AvailableHints.HINT_COMMENT );
 			hint.value( jaxbNamedQuery.getComment() );
 			hints.add( hint );
@@ -1279,46 +1148,46 @@ private QueryHint[] collectNativeQueryHints(JaxbNamedNativeQueryImpl jaxbNamedQu
 	private void collectStoredProcedureQueries(
 			List<JaxbNamedStoredProcedureQueryImpl> namedProcedureQueries,
 			XmlDocumentContext xmlDocumentContext) {
-		if ( isEmpty( namedProcedureQueries ) ) {
-			return;
-		}
+		if ( !isEmpty( namedProcedureQueries ) ) {
+			if ( namedStoredProcedureQueryRegistrations == null ) {
+				namedStoredProcedureQueryRegistrations = new HashMap<>();
+			}
 
-		if ( namedStoredProcedureQueryRegistrations == null ) {
-			namedStoredProcedureQueryRegistrations = new HashMap<>();
-		}
+			for ( var jaxbQuery : namedProcedureQueries ) {
+				final var queryAnnotation = NAMED_STORED_PROCEDURE_QUERY.createUsage( sourceModelContext );
+				final String name = jaxbQuery.getName();
 
-		for ( JaxbNamedStoredProcedureQueryImpl jaxbQuery : namedProcedureQueries ) {
-			final NamedStoredProcedureQueryJpaAnnotation queryAnnotation = NAMED_STORED_PROCEDURE_QUERY.createUsage( sourceModelContext );
-			namedStoredProcedureQueryRegistrations.put(
-					jaxbQuery.getName(),
-					new NamedStoredProcedureQueryRegistration( jaxbQuery.getName(), queryAnnotation )
-			);
+				namedStoredProcedureQueryRegistrations.put( name,
+						new NamedStoredProcedureQueryRegistration( name, queryAnnotation ) );
 
-			queryAnnotation.name( jaxbQuery.getName() );
-			queryAnnotation.procedureName( jaxbQuery.getProcedureName() );
+				queryAnnotation.name( name );
+				queryAnnotation.procedureName( jaxbQuery.getProcedureName() );
 
-			queryAnnotation.resultClasses( collectResultClasses(
-					jaxbQuery.getResultClasses(),
-					xmlDocumentContext
-			) );
+				queryAnnotation.resultClasses( collectResultClasses(
+						jaxbQuery.getResultClasses(),
+						xmlDocumentContext
+				) );
 
-			if ( CollectionHelper.isNotEmpty( jaxbQuery.getResultSetMappings() ) ) {
-				queryAnnotation.resultSetMappings( jaxbQuery.getResultSetMappings().toArray(String[]::new) );
-			}
+				final var resultSetMappings = jaxbQuery.getResultSetMappings();
+				if ( isNotEmpty( resultSetMappings ) ) {
+					queryAnnotation.resultSetMappings( resultSetMappings.toArray( String[]::new ) );
+				}
 
-			queryAnnotation.hints( extractQueryHints( jaxbQuery ).toArray(QueryHint[]::new) );
+				queryAnnotation.hints( extractQueryHints( jaxbQuery ).toArray( QueryHint[]::new ) );
 
-			queryAnnotation.parameters( QueryProcessing.collectParameters(
-					jaxbQuery.getProcedureParameters(),
-					xmlDocumentContext
-			) );
+				queryAnnotation.parameters( QueryProcessing.collectParameters(
+						jaxbQuery.getProcedureParameters(),
+						xmlDocumentContext
+				) );
+			}
 		}
 	}
 
 	private List<QueryHint> extractQueryHints(JaxbQueryHintContainer jaxbQuery) {
+		final var jaxbQueryHints = jaxbQuery.getHints();
 		final List<QueryHint> hints = new ArrayList<>();
-		for ( JaxbQueryHint jaxbHint : jaxbQuery.getHints() ) {
-			final QueryHintJpaAnnotation hint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
+		for ( var jaxbHint : jaxbQueryHints ) {
+			final var hint = JpaAnnotations.QUERY_HINT.createUsage( sourceModelContext );
 			hint.name( jaxbHint.getName() );
 			hint.value( jaxbHint.getValue() );
 		}
@@ -1326,32 +1195,43 @@ private List<QueryHint> extractQueryHints(JaxbQueryHintContainer jaxbQuery) {
 	}
 
 	public void collectDataBaseObject(List<JaxbDatabaseObjectImpl> databaseObjects) {
-		if ( isEmpty( databaseObjects ) ) {
-			return;
-		}
+		if ( !isEmpty( databaseObjects ) ) {
+			if ( databaseObjectRegistrations == null ) {
+				databaseObjectRegistrations = new ArrayList<>();
+			}
 
-		if ( databaseObjectRegistrations == null ) {
-			databaseObjectRegistrations = new ArrayList<>();
+			for ( var jaxbDatabaseObject : databaseObjects ) {
+				final var definition = jaxbDatabaseObject.getDefinition();
+				final var dialectScopes = jaxbDatabaseObject.getDialectScopes();
+				final List<DialectScopeRegistration> scopeRegistrations =
+						new ArrayList<>( dialectScopes.size() );
+				for ( var dialectScope : dialectScopes ) {
+					scopeRegistrations.add(
+							new DialectScopeRegistration(
+									dialectScope.getName(),
+									dialectScope.getContent(),
+									dialectScope.getMinimumVersion(),
+									dialectScope.getMaximumVersion() )
+					);
+				}
+				databaseObjectRegistrations.add( new DatabaseObjectRegistration(
+						jaxbDatabaseObject.getCreate(),
+						jaxbDatabaseObject.getDrop(),
+						definition != null ? definition.getClazz() : null,
+						scopeRegistrations ) );
+			}
 		}
+	}
 
-		for ( JaxbDatabaseObjectImpl jaxbDatabaseObject : databaseObjects ) {
-			final JaxbDatabaseObjectImpl.JaxbDefinitionImpl definition = jaxbDatabaseObject.getDefinition();
-			final List<JaxbDatabaseObjectScopeImpl> dialectScopes = jaxbDatabaseObject.getDialectScopes();
-			final List<DialectScopeRegistration> scopeRegistrations = new ArrayList<>(dialectScopes.size());
-			for ( JaxbDatabaseObjectScopeImpl dialectScope : dialectScopes ) {
-				scopeRegistrations.add(
-						new DialectScopeRegistration(
-								dialectScope.getName(),
-								dialectScope.getContent(),
-								dialectScope.getMinimumVersion(),
-								dialectScope.getMaximumVersion() )
-				);
-			}
-			databaseObjectRegistrations.add( new DatabaseObjectRegistration(
-					jaxbDatabaseObject.getCreate(),
-					jaxbDatabaseObject.getDrop(),
-					definition != null ? definition.getClazz() : null,
-					scopeRegistrations ) );
+	private static String registrationName(ClassDetails classDetails, String name) {
+		if ( !name.isBlank() ) {
+			return name;
+		}
+		else {
+			final var entityAnnotation = classDetails.getDirectAnnotationUsage( Entity.class );
+			return entityAnnotation != null && !entityAnnotation.name().isEmpty()
+					? entityAnnotation.name()
+					: unqualify( classDetails.getName() );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java
index 2adfe4d55949..e2efdf794515 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java
@@ -36,46 +36,17 @@ public static void preFillRegistries(RegistryPrimer.Contributions contributions,
 		registerPrimitive( Blob.class, buildingContext );
 		registerPrimitive( Clob.class, buildingContext );
 		registerPrimitive( NClob.class, buildingContext );
+		registerPrimitive( java.sql.Date.class, buildingContext );
+		registerPrimitive( java.sql.Time.class, buildingContext );
+		registerPrimitive( java.sql.Timestamp.class, buildingContext );
 
 		buildingContext.getAnnotationDescriptorRegistry().getDescriptor( TenantId.class );
-
-//		if ( buildingContext instanceof JandexModelBuildingContext ) {
-//			final IndexView jandexIndex = buildingContext.as( JandexModelBuildingContext.class ).getJandexIndex();
-//			if ( jandexIndex == null ) {
-//				return;
-//			}
-//
-//			final ClassDetailsRegistry classDetailsRegistry = buildingContext.getClassDetailsRegistry();
-//			final AnnotationDescriptorRegistry annotationDescriptorRegistry = buildingContext.getAnnotationDescriptorRegistry();
-//
-//			for ( ClassInfo knownClass : jandexIndex.getKnownClasses() ) {
-//				final String className = knownClass.name().toString();
-//
-//				if ( knownClass.isAnnotation() ) {
-//					// it is always safe to load the annotation classes - we will never be enhancing them
-//					//noinspection rawtypes
-//					final Class annotationClass = buildingContext
-//							.getClassLoading()
-//							.classForName( className );
-//					//noinspection unchecked
-//					annotationDescriptorRegistry.resolveDescriptor(
-//							annotationClass,
-//							(t) -> JdkBuilders.buildAnnotationDescriptor( annotationClass, buildingContext )
-//					);
-//				}
-//
-//				resolveClassDetails(
-//						className,
-//						classDetailsRegistry,
-//						() -> new JandexClassDetails( knownClass, buildingContext )
-//				);
-//			}
-//		}
 	}
 
 	private static void registerPrimitive(Class<?> theClass, ModelsContext buildingContext) {
-		final MutableClassDetailsRegistry classDetailsRegistry = buildingContext.getClassDetailsRegistry().as( MutableClassDetailsRegistry.class );
-		classDetailsRegistry.addClassDetails( new JdkClassDetails( theClass, buildingContext ) );
+		buildingContext.getClassDetailsRegistry()
+				.as( MutableClassDetailsRegistry.class )
+				.addClassDetails( new JdkClassDetails( theClass, buildingContext ) );
 
 	}
 
@@ -83,13 +54,15 @@ public static ClassDetails resolveClassDetails(
 			String className,
 			ClassDetailsRegistry classDetailsRegistry,
 			Supplier<ClassDetails> classDetailsSupplier) {
-		ClassDetails classDetails = classDetailsRegistry.findClassDetails( className );
+		var classDetails = classDetailsRegistry.findClassDetails( className );
 		if ( classDetails != null ) {
 			return classDetails;
 		}
-		classDetails = classDetailsSupplier.get();
-		classDetailsRegistry.as( MutableClassDetailsRegistry.class )
-				.addClassDetails( className, classDetails );
-		return classDetails;
+		else {
+			classDetails = classDetailsSupplier.get();
+			classDetailsRegistry.as( MutableClassDetailsRegistry.class )
+					.addClassDetails( className, classDetails );
+			return classDetails;
+		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java
index a03b7b9e9493..a7b76ba1a52a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java
@@ -9,7 +9,6 @@
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -38,7 +37,7 @@ public static void forEachOrmAnnotation(Consumer<AnnotationDescriptor<?>> consum
 	}
 
 	public static void forEachOrmAnnotation(Class<?> declarer, Consumer<AnnotationDescriptor<?>> consumer) {
-		for ( Field field : declarer.getFields() ) {
+		for ( var field : declarer.getFields() ) {
 			if ( AnnotationDescriptor.class.isAssignableFrom( field.getType() ) ) {
 				try {
 					consumer.accept( (AnnotationDescriptor<?>) field.get( null ) );
@@ -58,8 +57,7 @@ public static void forEachOrmAnnotation(Class<?> declarer, Consumer<AnnotationDe
 	}
 
 	public static <V, A extends Annotation> V extractJdkValue(A jdkAnnotation, AttributeDescriptor<V> attributeDescriptor, ModelsContext modelContext) {
-		return attributeDescriptor
-				.getTypeDescriptor()
+		return attributeDescriptor.getTypeDescriptor()
 				.createJdkValueExtractor( modelContext )
 				.extractValue( jdkAnnotation, attributeDescriptor, modelContext );
 	}
@@ -71,10 +69,10 @@ public static <V, A extends Annotation> V extractJdkValue(A jdkAnnotation, Annot
 
 	public static List<Annotation> extractAnnotationTypeAnnotations(Class<? extends Annotation> annotationType) {
 		final ArrayList<Annotation> result = new ArrayList<>();
-		final Annotation[] annotationTypeAnnotations = annotationType.getAnnotations();
+		final var annotationTypeAnnotations = annotationType.getAnnotations();
 		for ( int i = 0; i < annotationTypeAnnotations.length; i++ ) {
-			final Annotation annotationTypeAnnotation = annotationTypeAnnotations[i];
-			final Class<? extends Annotation> annotationTypeAnnotationType = annotationTypeAnnotation.annotationType();
+			final var annotationTypeAnnotation = annotationTypeAnnotations[i];
+			final var annotationTypeAnnotationType = annotationTypeAnnotation.annotationType();
 
 			// skip a few well-know ones that are irrelevant
 			if ( annotationTypeAnnotationType == Repeatable.class
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java
index ce2375277dab..bf380ed930da 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java
@@ -34,7 +34,7 @@
  * JPA-style event listener with support for resolving callback methods from
  * {@linkplain #from(JpaEventListenerStyle, ClassDetails, JaxbEntityListenerImpl, ModelsContext) XML}
  * or from {@linkplain #from(JpaEventListenerStyle, ClassDetails) annotation}.
- * <p/>
+ * <p>
  * Represents a global entity listener defined in the persistence unit
  *
  * @see JaxbPersistenceUnitDefaultsImpl#getEntityListenerContainer()
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/DynamicModelHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/DynamicModelHelper.java
index 9894f3953083..fb689fb3df4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/DynamicModelHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/DynamicModelHelper.java
@@ -11,26 +11,20 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbAnyMapping;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbAssociationAttribute;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbAttributesContainer;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbAttributesContainerImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbBasicImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbBasicMapping;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbElementCollectionImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEmbeddable;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbEmbeddedIdImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEmbeddedMapping;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntity;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbManagedType;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbMappedSuperclassImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbPluralAttribute;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbTenantIdImpl;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbUserTypeImpl;
 import org.hibernate.boot.models.internal.ModelsHelper;
 import org.hibernate.boot.models.xml.UnknownAttributeTypeException;
 import org.hibernate.boot.models.xml.spi.XmlDocumentContext;
 import org.hibernate.boot.spi.BootstrapContext;
-import org.hibernate.internal.util.StringHelper;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.models.internal.ClassTypeDetailsImpl;
 import org.hibernate.models.internal.MutableClassDetailsRegistry;
 import org.hibernate.models.internal.ParameterizedTypeDetailsImpl;
@@ -39,7 +33,6 @@
 import org.hibernate.models.internal.dynamic.DynamicFieldDetails;
 import org.hibernate.models.internal.jdk.JdkClassDetails;
 import org.hibernate.models.spi.ClassDetails;
-import org.hibernate.models.spi.ClassDetailsRegistry;
 import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.models.spi.MutableClassDetails;
 import org.hibernate.models.spi.TypeDetails;
@@ -58,6 +51,9 @@
 import static org.hibernate.internal.util.NullnessHelper.nullif;
 import static org.hibernate.internal.util.ReflectHelper.OBJECT_CLASS_NAME;
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
+import static org.hibernate.internal.util.StringHelper.isNotEmpty;
+import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
+import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
 import static org.hibernate.models.internal.ModifierUtils.DYNAMIC_ATTRIBUTE_MODIFIERS;
 
 /**
@@ -74,10 +70,9 @@ static void prepareDynamicClass(
 			JaxbManagedType jaxbManagedType,
 			XmlDocumentContext xmlDocumentContext) {
 		if ( jaxbManagedType instanceof JaxbEntityImpl jaxbDynamicEntity ) {
-			final JaxbAttributesContainerImpl attributes = jaxbDynamicEntity.getAttributes();
-
+			final var attributes = jaxbDynamicEntity.getAttributes();
 			if ( attributes != null ) {
-				if ( CollectionHelper.isNotEmpty( attributes.getIdAttributes() ) ) {
+				if ( isNotEmpty( attributes.getIdAttributes() ) ) {
 					// <id/>
 					attributes.getIdAttributes().forEach( (jaxbId) -> {
 						final TypeDetails attributeJavaType = determineAttributeJavaTypeDetails(
@@ -99,13 +94,13 @@ static void prepareDynamicClass(
 				}
 				else if ( attributes.getEmbeddedIdAttribute() != null ) {
 					// <embedded-id/>
-					final JaxbEmbeddedIdImpl embeddedId = attributes.getEmbeddedIdAttribute();
-					final TypeDetails attributeJavaType = determineAttributeJavaTypeDetails(
+					final var embeddedId = attributes.getEmbeddedIdAttribute();
+					final var attributeJavaType = determineAttributeJavaTypeDetails(
 							jaxbManagedType,
 							embeddedId,
 							xmlDocumentContext
 					);
-					final DynamicFieldDetails member = new DynamicFieldDetails(
+					final var member = new DynamicFieldDetails(
 							embeddedId.getName(),
 							attributeJavaType,
 							classDetails,
@@ -118,14 +113,15 @@ else if ( attributes.getEmbeddedIdAttribute() != null ) {
 				}
 
 				// <natural-id/>
-				if ( attributes.getNaturalId() != null ) {
-					attributes.getNaturalId().getBasicAttributes().forEach( (jaxbBasic) -> {
-						final TypeDetails attributeJavaType = determineAttributeJavaTypeDetails(
+				final var naturalId = attributes.getNaturalId();
+				if ( naturalId != null ) {
+					naturalId.getBasicAttributes().forEach( (jaxbBasic) -> {
+						final var attributeJavaType = determineAttributeJavaTypeDetails(
 								jaxbManagedType,
 								jaxbBasic,
 								xmlDocumentContext
 						);
-						final DynamicFieldDetails member = new DynamicFieldDetails(
+						final var member = new DynamicFieldDetails(
 								jaxbBasic.getName(),
 								attributeJavaType,
 								classDetails,
@@ -137,13 +133,13 @@ else if ( attributes.getEmbeddedIdAttribute() != null ) {
 						classDetails.addField( member );
 					} );
 
-					attributes.getNaturalId().getEmbeddedAttributes().forEach( (jaxbEmbedded) -> {
-						final TypeDetails attributeJavaType = determineAttributeJavaTypeDetails(
+					naturalId.getEmbeddedAttributes().forEach( (jaxbEmbedded) -> {
+						final var attributeJavaType = determineAttributeJavaTypeDetails(
 								jaxbManagedType,
 								jaxbEmbedded,
 								xmlDocumentContext
 						);
-						final DynamicFieldDetails member = new DynamicFieldDetails(
+						final var member = new DynamicFieldDetails(
 								jaxbEmbedded.getName(),
 								attributeJavaType,
 								classDetails,
@@ -155,12 +151,12 @@ else if ( attributes.getEmbeddedIdAttribute() != null ) {
 						classDetails.addField( member );
 					} );
 
-					attributes.getNaturalId().getManyToOneAttributes().forEach( (jaxbManyToOne) -> {
-						final TypeDetails attributeJavaType = determineAttributeJavaTypeDetails(
+					naturalId.getManyToOneAttributes().forEach( (jaxbManyToOne) -> {
+						final var attributeJavaType = determineAttributeJavaTypeDetails(
 								jaxbManyToOne,
 								xmlDocumentContext
 						);
-						final DynamicFieldDetails member = new DynamicFieldDetails(
+						final var member = new DynamicFieldDetails(
 								jaxbManyToOne.getName(),
 								attributeJavaType,
 								classDetails,
@@ -172,12 +168,12 @@ else if ( attributes.getEmbeddedIdAttribute() != null ) {
 						classDetails.addField( member );
 					} );
 
-					attributes.getNaturalId().getAnyMappingAttributes().forEach( (jaxbAnyMapping) -> {
-						final TypeDetails attributeJavaType = determineAttributeJavaTypeDetails(
+					naturalId.getAnyMappingAttributes().forEach( (jaxbAnyMapping) -> {
+						final var attributeJavaType = determineAttributeJavaTypeDetails(
 								jaxbAnyMapping,
 								xmlDocumentContext
 						);
-						final DynamicFieldDetails member = new DynamicFieldDetails(
+						final var member = new DynamicFieldDetails(
 								jaxbAnyMapping.getName(),
 								attributeJavaType,
 								classDetails,
@@ -192,14 +188,14 @@ else if ( attributes.getEmbeddedIdAttribute() != null ) {
 			}
 
 			// <tenant-id>
-			final JaxbTenantIdImpl tenantId = jaxbDynamicEntity.getTenantId();
+			final var tenantId = jaxbDynamicEntity.getTenantId();
 			if ( tenantId != null ) {
-				final TypeDetails attributeJavaType = determineAttributeJavaTypeDetails(
+				final var attributeJavaType = determineAttributeJavaTypeDetails(
 						jaxbManagedType,
 						tenantId,
 						xmlDocumentContext
 				);
-				final DynamicFieldDetails member = new DynamicFieldDetails(
+				final var member = new DynamicFieldDetails(
 						tenantId.getName(),
 						attributeJavaType,
 						classDetails,
@@ -212,18 +208,17 @@ else if ( attributes.getEmbeddedIdAttribute() != null ) {
 			}
 		}
 		else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSuperclass ) {
-			final JaxbAttributesContainerImpl attributes = jaxbMappedSuperclass.getAttributes();
-
+			final var attributes = jaxbMappedSuperclass.getAttributes();
 			if ( attributes != null ) {
-				if ( CollectionHelper.isNotEmpty( attributes.getIdAttributes() ) ) {
+				if ( isNotEmpty( attributes.getIdAttributes() ) ) {
 					// <id/>
 					attributes.getIdAttributes().forEach( (jaxbId) -> {
-						final TypeDetails attributeJavaType = determineAttributeJavaTypeDetails(
+						final var attributeJavaType = determineAttributeJavaTypeDetails(
 								jaxbManagedType,
 								jaxbId,
 								xmlDocumentContext
 						);
-						final DynamicFieldDetails member = new DynamicFieldDetails(
+						final var member = new DynamicFieldDetails(
 								jaxbId.getName(),
 								attributeJavaType,
 								classDetails,
@@ -237,13 +232,13 @@ else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSupercla
 				}
 				else {
 					// <embedded-id/>
-					final JaxbEmbeddedIdImpl embeddedId = attributes.getEmbeddedIdAttribute();
-					final TypeDetails attributeJavaType = determineAttributeJavaTypeDetails(
+					final var embeddedId = attributes.getEmbeddedIdAttribute();
+					final var attributeJavaType = determineAttributeJavaTypeDetails(
 							jaxbManagedType,
 							embeddedId,
 							xmlDocumentContext
 					);
-					final DynamicFieldDetails member = new DynamicFieldDetails(
+					final var member = new DynamicFieldDetails(
 							embeddedId.getName(),
 							attributeJavaType,
 							classDetails,
@@ -262,7 +257,7 @@ else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSupercla
 		if ( attributes != null ) {
 			// <basic/>
 			attributes.getBasicAttributes().forEach( (jaxbBasic) -> {
-				final DynamicFieldDetails member = new DynamicFieldDetails(
+				final var member = new DynamicFieldDetails(
 						jaxbBasic.getName(),
 						determineAttributeJavaTypeDetails( jaxbManagedType, jaxbBasic, xmlDocumentContext ),
 						classDetails,
@@ -276,7 +271,7 @@ else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSupercla
 
 			// <embedded/>
 			attributes.getEmbeddedAttributes().forEach( (jaxbEmbedded) -> {
-				final DynamicFieldDetails member = new DynamicFieldDetails(
+				final var member = new DynamicFieldDetails(
 						jaxbEmbedded.getName(),
 						determineAttributeJavaTypeDetails( jaxbManagedType, jaxbEmbedded, xmlDocumentContext ),
 						classDetails,
@@ -290,7 +285,7 @@ else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSupercla
 
 			// <one-to-one/>
 			attributes.getOneToOneAttributes().forEach( (jaxbOneToOne) -> {
-				final DynamicFieldDetails member = new DynamicFieldDetails(
+				final var member = new DynamicFieldDetails(
 						jaxbOneToOne.getName(),
 						determineAttributeJavaTypeDetails( jaxbOneToOne, xmlDocumentContext ),
 						classDetails,
@@ -304,7 +299,7 @@ else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSupercla
 
 			// <many-to-one/>
 			attributes.getManyToOneAttributes().forEach( (jaxbManyToOne) -> {
-				final DynamicFieldDetails member = new DynamicFieldDetails(
+				final var member = new DynamicFieldDetails(
 						jaxbManyToOne.getName(),
 						determineAttributeJavaTypeDetails( jaxbManyToOne, xmlDocumentContext ),
 						classDetails,
@@ -318,7 +313,7 @@ else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSupercla
 
 			// <any/>
 			attributes.getAnyMappingAttributes().forEach( (jaxbAnyMapping) -> {
-				final DynamicFieldDetails member = new DynamicFieldDetails(
+				final var member = new DynamicFieldDetails(
 						jaxbAnyMapping.getName(),
 						determineAttributeJavaTypeDetails( jaxbAnyMapping, xmlDocumentContext ),
 						classDetails,
@@ -332,8 +327,8 @@ else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSupercla
 
 			// <element-collection/>
 			attributes.getElementCollectionAttributes().forEach( (jaxbElementCollection) -> {
-				final TypeDetails elementType = determineAttributeJavaTypeDetails( jaxbElementCollection, xmlDocumentContext );
-				final DynamicFieldDetails member = new DynamicFieldDetails(
+				final var elementType = determineAttributeJavaTypeDetails( jaxbElementCollection, xmlDocumentContext );
+				final var member = new DynamicFieldDetails(
 						jaxbElementCollection.getName(),
 						makeCollectionType( classDetails, jaxbElementCollection, elementType, xmlDocumentContext ),
 						classDetails,
@@ -347,8 +342,8 @@ else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSupercla
 
 			// <one-to-many/>
 			attributes.getOneToManyAttributes().forEach( (jaxbOneToMany) -> {
-				final TypeDetails elementType = determineAttributeJavaTypeDetails( jaxbOneToMany, xmlDocumentContext );
-				final DynamicFieldDetails member = new DynamicFieldDetails(
+				final var elementType = determineAttributeJavaTypeDetails( jaxbOneToMany, xmlDocumentContext );
+				final var member = new DynamicFieldDetails(
 						jaxbOneToMany.getName(),
 						// todo : this is wrong.  should be the collection-type (List, ...)
 						//  	wrapping the result from determineAttributeJavaTypeDetails
@@ -364,8 +359,8 @@ else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSupercla
 
 			// <many-to-many/>
 			attributes.getManyToManyAttributes().forEach( (jaxbManyToMany) -> {
-				final TypeDetails elementType = determineAttributeJavaTypeDetails( jaxbManyToMany, xmlDocumentContext );
-				final DynamicFieldDetails member = new DynamicFieldDetails(
+				final var elementType = determineAttributeJavaTypeDetails( jaxbManyToMany, xmlDocumentContext );
+				final var member = new DynamicFieldDetails(
 						jaxbManyToMany.getName(),
 						makeCollectionType( classDetails, jaxbManyToMany, elementType, xmlDocumentContext ),
 						classDetails,
@@ -379,11 +374,11 @@ else if ( jaxbManagedType instanceof JaxbMappedSuperclassImpl jaxbMappedSupercla
 
 			// <many-to-any/>
 			attributes.getPluralAnyMappingAttributes().forEach( (jaxbPluralAnyMapping) -> {
-				final TypeDetails attributeType = determineAttributeJavaTypeDetails(
+				final var attributeType = determineAttributeJavaTypeDetails(
 						jaxbPluralAnyMapping,
 						xmlDocumentContext
 				);
-				final DynamicFieldDetails member = new DynamicFieldDetails(
+				final var member = new DynamicFieldDetails(
 						jaxbPluralAnyMapping.getName(),
 						attributeType,
 						classDetails,
@@ -409,7 +404,7 @@ private static TypeDetails makeCollectionType(
 			JaxbPluralAttribute jaxbPluralAttribute,
 			TypeDetails elementType,
 			XmlDocumentContext xmlDocumentContext) {
-		final MutableClassDetailsRegistry classDetailsRegistry = xmlDocumentContext
+		final var classDetailsRegistry = xmlDocumentContext
 				.getBootstrapContext()
 				.getModelsContext()
 				.getClassDetailsRegistry()
@@ -484,9 +479,9 @@ private static ClassDetails setType(JaxbPluralAttribute jaxbPluralAttribute, Mut
 	}
 
 	private static boolean isSorted(JaxbPluralAttribute jaxbPluralAttribute) {
-		return StringHelper.isNotEmpty( jaxbPluralAttribute.getSort() )
+		return isNotEmpty( jaxbPluralAttribute.getSort() )
 			|| jaxbPluralAttribute.getSortNatural() != null
-			|| StringHelper.isNotEmpty( jaxbPluralAttribute.getOrderBy() );
+			|| isNotEmpty( jaxbPluralAttribute.getOrderBy() );
 	}
 
 	private static ClassDetails mapType(JaxbPluralAttribute jaxbPluralAttribute, MutableClassDetailsRegistry classDetailsRegistry) {
@@ -523,7 +518,7 @@ private static ClassDetails determineAttributeJavaType(
 		// explicit <target/>
 		final String target = jaxbBasicMapping.getTarget();
 		if ( isNotEmpty( target ) ) {
-			final SimpleTypeInterpretation simpleTypeInterpretation = SimpleTypeInterpretation.interpret( target );
+			final var simpleTypeInterpretation = SimpleTypeInterpretation.interpret( target );
 			if ( simpleTypeInterpretation == null ) {
 				throw new UnknownAttributeTypeException(
 						String.format(
@@ -541,7 +536,7 @@ private static ClassDetails determineAttributeJavaType(
 		final ModelsContext modelsContext = bootstrapContext.getModelsContext();
 
 		// UserType
-		final JaxbUserTypeImpl userTypeNode = jaxbBasicMapping.getType();
+		final var userTypeNode = jaxbBasicMapping.getType();
 		if ( userTypeNode != null ) {
 			final String userTypeImplName = userTypeNode.getValue();
 			if ( isNotEmpty( userTypeImplName ) ) {
@@ -556,10 +551,10 @@ private static ClassDetails determineAttributeJavaType(
 		// JavaType
 		final String javaTypeImplName = jaxbBasicMapping.getJavaType();
 		if ( isNotEmpty( javaTypeImplName ) ) {
-			final ClassDetails javaTypeImplDetails = xmlDocumentContext.resolveJavaType( javaTypeImplName );
+			final var javaTypeImplDetails = xmlDocumentContext.resolveJavaType( javaTypeImplName );
 			// safe to convert to class, though unfortunate to have to instantiate it...
 			final JavaType<?> javaType = createInstance( javaTypeImplDetails );
-			final Class<?> modelClass = javaType.getJavaTypeClass();
+			final var modelClass = javaType.getJavaTypeClass();
 			return modelsContext.getClassDetailsRegistry().getClassDetails( modelClass.getName() );
 		}
 
@@ -568,7 +563,7 @@ private static ClassDetails determineAttributeJavaType(
 		final Integer jdbcTypeCode = jaxbBasicMapping.getJdbcTypeCode();
 		final JdbcType jdbcType;
 		if ( isNotEmpty( jdbcTypeImplName ) ) {
-			final ClassDetails jdbcTypeImplDetails = xmlDocumentContext.resolveJavaType( javaTypeImplName );
+			final var jdbcTypeImplDetails = xmlDocumentContext.resolveJavaType( javaTypeImplName );
 			jdbcType = createInstance( jdbcTypeImplDetails );
 		}
 		else if ( jdbcTypeCode != null ) {
@@ -578,13 +573,13 @@ else if ( jdbcTypeCode != null ) {
 			jdbcType = null;
 		}
 		if ( jdbcType != null ) {
-			final JavaType<?> javaType = jdbcType.getJdbcRecommendedJavaTypeMapping( 0, 0, bootstrapContext.getTypeConfiguration() );
-			final Class<?> modelClass = javaType.getJavaTypeClass();
+			final var javaType = jdbcType.getRecommendedJavaType( 0, 0, bootstrapContext.getTypeConfiguration() );
+			final var modelClass = javaType.getJavaTypeClass();
 			return modelsContext.getClassDetailsRegistry().getClassDetails( modelClass.getName() );
 		}
 
 		if ( jaxbBasicMapping instanceof JaxbBasicImpl jaxbBasicAttribute ) {
-			final TemporalType temporalType = jaxbBasicAttribute.getTemporal();
+			final var temporalType = jaxbBasicAttribute.getTemporal();
 			if ( temporalType != null ) {
 				return resolveTemporalJavaType( temporalType, xmlDocumentContext );
 			}
@@ -592,10 +587,10 @@ else if ( jdbcTypeCode != null ) {
 
 		final String declaringTypeName;
 		if ( declaringType instanceof JaxbEntity jaxbEntity ) {
-			declaringTypeName = StringHelper.nullIfEmpty( jaxbEntity.getName() );
+			declaringTypeName = nullIfEmpty( jaxbEntity.getName() );
 		}
 		else if ( declaringType instanceof JaxbEmbeddable jaxbEmbeddable ) {
-			declaringTypeName = StringHelper.nullIfEmpty( jaxbEmbeddable.getName() );
+			declaringTypeName = nullIfEmpty( jaxbEmbeddable.getName() );
 		}
 		else {
 			declaringTypeName = null;
@@ -617,16 +612,16 @@ else if ( declaringType instanceof JaxbEmbeddable jaxbEmbeddable ) {
 	 * SimpleTypeInterpretation we only care about the wrapper.
 	 */
 	private static ClassDetails resolveBasicMappingTarget(SimpleTypeInterpretation targetInterpretation, XmlDocumentContext xmlDocumentContext) {
-		final ModelsContext modelsContext = xmlDocumentContext.getBootstrapContext().getModelsContext();
-		final ClassDetailsRegistry classDetailsRegistry = modelsContext.getClassDetailsRegistry();
+		final var modelsContext = xmlDocumentContext.getBootstrapContext().getModelsContext();
+		final var classDetailsRegistry = modelsContext.getClassDetailsRegistry();
 		return classDetailsRegistry.resolveClassDetails( targetInterpretation.getJavaType().getName() );
 	}
 
 	private static MutableClassDetails resolveTemporalJavaType(
 			TemporalType temporalType,
 			XmlDocumentContext xmlDocumentContext) {
-		final ModelsContext modelsContext = xmlDocumentContext.getBootstrapContext().getModelsContext();
-		final MutableClassDetailsRegistry classDetailsRegistry = modelsContext.getClassDetailsRegistry().as( MutableClassDetailsRegistry.class );
+		final var modelsContext = xmlDocumentContext.getBootstrapContext().getModelsContext();
+		final var classDetailsRegistry = modelsContext.getClassDetailsRegistry().as( MutableClassDetailsRegistry.class );
 		switch ( temporalType ) {
 			case DATE -> {
 				return (MutableClassDetails) classDetailsRegistry.resolveClassDetails(
@@ -682,8 +677,8 @@ private static TypeDetails determineAttributeJavaTypeDetails(
 			XmlDocumentContext xmlDocumentContext) {
 		final String target = jaxbAssociationAttribute.getTargetEntity();
 		if ( isNotEmpty( target ) ) {
-			final ModelsContext modelsContext = xmlDocumentContext.getBootstrapContext().getModelsContext();
-			final ClassDetails classDetails = ModelsHelper.resolveClassDetails(
+			final var modelsContext = xmlDocumentContext.getBootstrapContext().getModelsContext();
+			final var classDetails = ModelsHelper.resolveClassDetails(
 					target,
 					modelsContext.getClassDetailsRegistry(),
 					() -> new DynamicClassDetails(
@@ -711,8 +706,8 @@ private static TypeDetails determineAttributeJavaTypeDetails(
 			XmlDocumentContext xmlDocumentContext) {
 		// Logically this is Object, which is what we return here for now.
 		// todo : might be nice to allow specifying a "common interface"
-		final ModelsContext modelsContext = xmlDocumentContext.getBootstrapContext().getModelsContext();
-		final ClassDetails objectClassDetails = modelsContext.getClassDetailsRegistry().resolveClassDetails( OBJECT_CLASS_NAME );
+		final var modelsContext = xmlDocumentContext.getBootstrapContext().getModelsContext();
+		final var objectClassDetails = modelsContext.getClassDetailsRegistry().resolveClassDetails( OBJECT_CLASS_NAME );
 		return new ClassTypeDetailsImpl( objectClassDetails, TypeDetails.Kind.CLASS );
 	}
 
@@ -723,7 +718,7 @@ private static TypeDetails determineAttributeJavaTypeDetails(
 	private static TypeDetails determineAttributeJavaTypeDetails(
 			JaxbElementCollectionImpl jaxbElementCollection,
 			XmlDocumentContext xmlDocumentContext) {
-		final LimitedCollectionClassification classification = nullif( jaxbElementCollection.getClassification(), LimitedCollectionClassification.BAG );
+		final var classification = nullif( jaxbElementCollection.getClassification(), LimitedCollectionClassification.BAG );
 		return switch ( classification ) {
 			case BAG -> resolveCollectionType( Collection.class, xmlDocumentContext );
 			case LIST -> resolveCollectionType( List.class, xmlDocumentContext );
@@ -733,7 +728,7 @@ private static TypeDetails determineAttributeJavaTypeDetails(
 	}
 
 	private static TypeDetails resolveCollectionType(Class<?> collectionType, XmlDocumentContext xmlDocumentContext) {
-		final ClassDetails classDetails = xmlDocumentContext
+		final var classDetails = xmlDocumentContext
 				.getBootstrapContext()
 				.getModelsContext()
 				.getClassDetailsRegistry()
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java
index 831be5b28700..7dc1066d6bbc 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java
@@ -9,16 +9,12 @@
 import org.hibernate.MappingException;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbAttributesContainerImpl;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbCachingImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEmbeddableImpl;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbEmbeddedIdImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityOrMappedSuperclass;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbIdImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbMappedSuperclassImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbPersistentAttribute;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbTenantIdImpl;
 import org.hibernate.boot.models.HibernateAnnotations;
 import org.hibernate.boot.models.JpaAnnotations;
 import org.hibernate.boot.models.XmlAnnotations;
@@ -26,7 +22,6 @@
 import org.hibernate.boot.models.annotations.internal.AttributeAccessorAnnotation;
 import org.hibernate.boot.models.annotations.internal.CacheAnnotation;
 import org.hibernate.boot.models.annotations.internal.CacheableJpaAnnotation;
-import org.hibernate.boot.models.annotations.internal.ExtendsXmlAnnotation;
 import org.hibernate.boot.models.internal.ModelsHelper;
 import org.hibernate.boot.models.xml.internal.attr.BasicAttributeProcessing;
 import org.hibernate.boot.models.xml.internal.attr.BasicIdAttributeProcessing;
@@ -34,7 +29,6 @@
 import org.hibernate.boot.models.xml.internal.attr.EmbeddedIdAttributeProcessing;
 import org.hibernate.boot.models.xml.spi.XmlDocumentContext;
 import org.hibernate.boot.models.xml.spi.XmlProcessingResult;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.models.ModelsException;
 import org.hibernate.models.internal.ClassTypeDetailsImpl;
 import org.hibernate.models.internal.ModelsClassLogging;
@@ -42,12 +36,10 @@
 import org.hibernate.models.rendering.internal.RenderingTargetCollectingImpl;
 import org.hibernate.models.rendering.internal.SimpleRenderer;
 import org.hibernate.models.spi.ClassDetails;
-import org.hibernate.models.spi.ClassDetailsRegistry;
-import org.hibernate.models.spi.FieldDetails;
+import org.hibernate.models.spi.MemberDetails;
 import org.hibernate.models.spi.MethodDetails;
 import org.hibernate.models.spi.MutableClassDetails;
 import org.hibernate.models.spi.MutableMemberDetails;
-import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.property.access.spi.BuiltInPropertyAccessStrategies;
 
@@ -57,8 +49,10 @@
 import jakarta.persistence.Id;
 
 import static org.hibernate.boot.models.xml.XmlProcessLogging.XML_PROCESS_LOGGER;
+import static org.hibernate.boot.models.xml.internal.DynamicModelHelper.prepareDynamicClass;
 import static org.hibernate.internal.util.NullnessHelper.coalesce;
 import static org.hibernate.internal.util.NullnessHelper.coalesceSuppliedValues;
+import static org.hibernate.internal.util.StringHelper.isEmpty;
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
 
@@ -81,13 +75,13 @@ public static void processCompleteEntity(
 		final AccessType classAccessType;
 		final AttributeProcessor.MemberAdjuster memberAdjuster;
 
-		final ClassDetailsRegistry classDetailsRegistry = xmlDocumentContext
-				.getModelBuildingContext()
-				.getClassDetailsRegistry();
+		final var classDetailsRegistry =
+				xmlDocumentContext.getModelBuildingContext()
+						.getClassDetailsRegistry();
 
-		if ( StringHelper.isEmpty( jaxbEntity.getClazz() ) ) {
+		if ( isEmpty( jaxbEntity.getClazz() ) ) {
 			// no class == dynamic
-			if ( StringHelper.isEmpty( jaxbEntity.getName() ) ) {
+			if ( isEmpty( jaxbEntity.getName() ) ) {
 				throw new ModelsException( "Assumed dynamic entity did not define entity-name" );
 			}
 
@@ -99,8 +93,7 @@ public static void processCompleteEntity(
 					() -> {
 						final ClassDetails superClass;
 						final TypeDetails superType;
-
-						if ( StringHelper.isEmpty( jaxbEntity.getExtends() ) ) {
+						if ( isEmpty( jaxbEntity.getExtends() ) ) {
 							superClass = null;
 							superType = null;
 						}
@@ -140,14 +133,15 @@ public static void processCompleteEntity(
 			}
 
 			classDetails.forEachPersistableMember( memberDetails -> {
-				final MutableMemberDetails mutableMemberDetails = (MutableMemberDetails) memberDetails;
+				final var mutableMemberDetails = (MutableMemberDetails) memberDetails;
 				mutableMemberDetails.clearAnnotationUsages();
 			} );
 		}
 
 		classDetails.clearAnnotationUsages();
 
-		// from here, processing is the same between override and metadata-complete modes (aside from the dynamic model handling)
+		// from here, processing is the same between override and metadata-complete modes
+		// (aside from the dynamic model handling)
 
 		processEntityMetadata(
 				classDetails,
@@ -178,10 +172,9 @@ private static void adjustDynamicTypeMember(
 			MutableMemberDetails memberDetails,
 			JaxbPersistentAttribute jaxbAttribute,
 			XmlDocumentContext xmlDocumentContext) {
-		final AttributeAccessorAnnotation annotationUsage = (AttributeAccessorAnnotation) memberDetails.applyAnnotationUsage(
-				HibernateAnnotations.ATTRIBUTE_ACCESSOR,
-				xmlDocumentContext.getModelBuildingContext()
-		);
+		final var annotationUsage = (AttributeAccessorAnnotation)
+				memberDetails.applyAnnotationUsage( HibernateAnnotations.ATTRIBUTE_ACCESSOR,
+						xmlDocumentContext.getModelBuildingContext() );
 		// todo (7.0) : this is the old String-based, deprecated form
 		annotationUsage.value( BuiltInPropertyAccessStrategies.MAP.getExternalName() );
 	}
@@ -199,18 +192,18 @@ private static void processEntityMetadata(
 		applyCaching( jaxbEntity, classDetails, xmlDocumentContext );
 
 		if ( jaxbEntity.isAbstract() != null ) {
-			classDetails.applyAnnotationUsage( XmlAnnotations.ABSTRACT, xmlDocumentContext.getModelBuildingContext() );
+			classDetails.applyAnnotationUsage( XmlAnnotations.ABSTRACT,
+					xmlDocumentContext.getModelBuildingContext() );
 		}
 
 		if ( isNotEmpty( jaxbEntity.getExtends() ) ) {
-			final ExtendsXmlAnnotation extendsAnn = XmlAnnotations.EXTENDS.createUsage( xmlDocumentContext.getModelBuildingContext() );
-			extendsAnn.superType( jaxbEntity.getExtends() );
+			XmlAnnotations.EXTENDS.createUsage( xmlDocumentContext.getModelBuildingContext() )
+					.superType( jaxbEntity.getExtends() );
 		}
 
 		XmlAnnotationHelper.applyTable( jaxbEntity.getTable(), classDetails, xmlDocumentContext );
 		XmlAnnotationHelper.applySecondaryTables( jaxbEntity.getSecondaryTables(), classDetails, xmlDocumentContext );
-
-		final JaxbAttributesContainerImpl attributes = jaxbEntity.getAttributes();
+		final var attributes = jaxbEntity.getAttributes();
 		if ( attributes != null ) {
 			processIdMappings(
 					attributes,
@@ -234,6 +227,9 @@ private static void processEntityMetadata(
 					xmlDocumentContext
 			);
 		}
+
+		XmlAnnotationHelper.applyConverts( jaxbEntity.getConverts(), classDetails, xmlDocumentContext );
+
 		AttributeProcessor.processAttributeOverrides(
 				jaxbEntity.getAttributeOverrides(),
 				classDetails,
@@ -301,27 +297,31 @@ private static void processEntityMetadata(
 				xmlDocumentContext
 		);
 
+		XmlAnnotationHelper.applySyncronizedTables(
+				jaxbEntity.getSynchronizeTables(),
+				classDetails,
+				xmlDocumentContext
+		);
+
 		renderClass( classDetails, xmlDocumentContext );
 	}
 
 	private static void renderClass(MutableClassDetails classDetails, XmlDocumentContext xmlDocumentContext) {
-		if ( !XML_PROCESS_LOGGER.isDebugEnabled() ) {
-			return;
+		if ( XML_PROCESS_LOGGER.isTraceEnabled() ) {
+			final var collectingTarget = new RenderingTargetCollectingImpl();
+			new SimpleRenderer( collectingTarget )
+					.renderClass( classDetails, xmlDocumentContext.getModelBuildingContext() );
+			XML_PROCESS_LOGGER.tracef( "Class annotations from XML for %s:\n%s",
+					classDetails.getName(),
+					collectingTarget.toString() );
 		}
-
-		final RenderingTargetCollectingImpl collectingTarget = new RenderingTargetCollectingImpl();
-		final SimpleRenderer renderer = new SimpleRenderer( collectingTarget );
-		renderer.renderClass( classDetails, xmlDocumentContext.getModelBuildingContext() );
-		XML_PROCESS_LOGGER.tracef( "Class annotations from XML for %s:\n%s",
-				classDetails.getName(),
-				collectingTarget.toString() );
 	}
 
 	private static void applyAccessAnnotation(
 			AccessType accessType,
 			MutableClassDetails target,
 			XmlDocumentContext xmlDocumentContext) {
-		final AccessJpaAnnotation annotationUsage =
+		final var annotationUsage =
 				(AccessJpaAnnotation)
 						target.applyAnnotationUsage( JpaAnnotations.ACCESS,
 								xmlDocumentContext.getModelBuildingContext() );
@@ -334,7 +334,7 @@ private static void applyCaching(
 			MutableClassDetails classDetails,
 			XmlDocumentContext xmlDocumentContext) {
 		if ( jaxbEntity.isCacheable() != null ) {
-			final CacheableJpaAnnotation cacheableUsage =
+			final var cacheableUsage =
 					(CacheableJpaAnnotation)
 							classDetails.applyAnnotationUsage( JpaAnnotations.CACHEABLE,
 									xmlDocumentContext.getModelBuildingContext() );
@@ -343,17 +343,17 @@ private static void applyCaching(
 			classDetails.addAnnotationUsage( cacheableUsage );
 		}
 
-		final JaxbCachingImpl jaxbCaching = jaxbEntity.getCaching();
+		final var jaxbCaching = jaxbEntity.getCaching();
 		if ( jaxbCaching != null ) {
-			final CacheAnnotation cacheUsage =
+			final var cacheUsage =
 					(CacheAnnotation)
 							classDetails.replaceAnnotationUsage( HibernateAnnotations.CACHE,
 									xmlDocumentContext.getModelBuildingContext() );
-			if ( StringHelper.isNotEmpty( jaxbCaching.getRegion() ) ) {
+			if ( isNotEmpty( jaxbCaching.getRegion() ) ) {
 				cacheUsage.region( jaxbCaching.getRegion() );
 			}
 			if ( jaxbCaching.getAccess() != null ) {
-				final CacheConcurrencyStrategy strategy = convertCacheAccessType( jaxbCaching.getAccess() );
+				final var strategy = convertCacheAccessType( jaxbCaching.getAccess() );
 				if ( strategy != null ) {
 					cacheUsage.usage( strategy );
 				}
@@ -370,9 +370,9 @@ private static void applyTenantId(
 			JaxbEntityImpl jaxbEntity,
 			AccessType classAccessType,
 			XmlDocumentContext xmlDocumentContext) {
-		final JaxbTenantIdImpl jaxbTenantId = jaxbEntity.getTenantId();
+		final var jaxbTenantId = jaxbEntity.getTenantId();
 		if ( jaxbTenantId != null ) {
-			final MutableMemberDetails memberDetails = XmlProcessingHelper.getAttributeMember(
+			final var memberDetails = XmlProcessingHelper.getAttributeMember(
 					jaxbTenantId.getName(),
 					coalesce( jaxbTenantId.getAccess(), classAccessType ),
 					classDetails
@@ -414,17 +414,14 @@ private static void adjustCompleteNonDynamicTypeMember(
 
 	public static void processOverrideEntity(List<XmlProcessingResult.OverrideTuple<JaxbEntityImpl>> entityOverrides) {
 		entityOverrides.forEach( (overrideTuple) -> {
-			final XmlDocumentContext xmlDocumentContext = overrideTuple.getXmlDocumentContext();
-			final JaxbEntityMappingsImpl jaxbRoot = overrideTuple.getJaxbRoot();
-			final JaxbEntityImpl jaxbEntity = overrideTuple.getManagedType();
-			final String className = XmlProcessingHelper.determineClassName( jaxbRoot, jaxbEntity );
-			final MutableClassDetails classDetails =
-					(MutableClassDetails)
-							xmlDocumentContext.getModelBuildingContext()
-									.getClassDetailsRegistry()
-									.resolveClassDetails( className );
-
-			final AccessType classAccessType = coalesceSuppliedValues(
+			final var xmlDocumentContext = overrideTuple.getXmlDocumentContext();
+			final var jaxbRoot = overrideTuple.getJaxbRoot();
+			final var jaxbEntity = overrideTuple.getManagedType();
+			final var classDetails =
+					getMutableClassDetails( xmlDocumentContext,
+							XmlProcessingHelper.determineClassName( jaxbRoot, jaxbEntity ) );
+
+			final var classAccessType = coalesceSuppliedValues(
 					// look on this <entity/>
 					jaxbEntity::getAccess,
 					// look on the root <entity/>
@@ -453,22 +450,20 @@ public static void processOverrideEntity(List<XmlProcessingResult.OverrideTuple<
 	}
 
 	private static AccessType determineAccessTypeFromClassAnnotations(ClassDetails classDetails) {
-		final Access accessUsage = classDetails.getDirectAnnotationUsage( Access.class );
+		final var accessUsage = classDetails.getDirectAnnotationUsage( Access.class );
 		return accessUsage != null ? accessUsage.value() : null;
 
 	}
 
 	private static AccessType determineAccessTypeFromClassMembers(ClassDetails classDetails) {
-		for ( FieldDetails field : classDetails.getFields() ) {
-			if ( field.hasDirectAnnotationUsage( Id.class )
-					|| field.hasDirectAnnotationUsage( EmbeddedId.class ) ) {
+		for ( var field : classDetails.getFields() ) {
+			if ( isId( field ) ) {
 				return AccessType.FIELD;
 			}
 		}
 
-		for ( MethodDetails method : classDetails.getMethods() ) {
-			if ( method.hasDirectAnnotationUsage( Id.class )
-					|| method.hasDirectAnnotationUsage( EmbeddedId.class ) ) {
+		for ( var method : classDetails.getMethods() ) {
+			if ( isId( method ) ) {
 				assert method.getMethodKind() == MethodDetails.MethodKind.GETTER;
 				return AccessType.PROPERTY;
 			}
@@ -477,19 +472,24 @@ private static AccessType determineAccessTypeFromClassMembers(ClassDetails class
 		return null;
 	}
 
+	private static boolean isId(MemberDetails field) {
+		return field.hasDirectAnnotationUsage( Id.class )
+			|| field.hasDirectAnnotationUsage( EmbeddedId.class );
+	}
+
 	private static void processIdMappings(
 			JaxbAttributesContainerImpl attributes,
 			AccessType classAccessType,
 			MutableClassDetails classDetails,
 			AttributeProcessor.MemberAdjuster memberAdjuster,
 			XmlDocumentContext xmlDocumentContext) {
-		final List<JaxbIdImpl> jaxbIds = attributes.getIdAttributes();
-		final JaxbEmbeddedIdImpl jaxbEmbeddedId = attributes.getEmbeddedIdAttribute();
+		final var jaxbIds = attributes.getIdAttributes();
+		final var jaxbEmbeddedId = attributes.getEmbeddedIdAttribute();
 
 		if ( isNotEmpty( jaxbIds ) ) {
 			for ( int i = 0; i < jaxbIds.size(); i++ ) {
-				final JaxbIdImpl jaxbId = jaxbIds.get( i );
-				final MutableMemberDetails memberDetails = BasicIdAttributeProcessing.processBasicIdAttribute(
+				final var jaxbId = jaxbIds.get( i );
+				final var memberDetails = BasicIdAttributeProcessing.processBasicIdAttribute(
 						jaxbId,
 						classDetails,
 						classAccessType,
@@ -499,7 +499,7 @@ private static void processIdMappings(
 			}
 		}
 		else if ( jaxbEmbeddedId != null ) {
-			final MutableMemberDetails memberDetails = EmbeddedIdAttributeProcessing.processEmbeddedIdAttribute(
+			final var memberDetails = EmbeddedIdAttributeProcessing.processEmbeddedIdAttribute(
 					jaxbEmbeddedId,
 					classDetails,
 					classAccessType,
@@ -527,10 +527,7 @@ public static void processCompleteMappedSuperclass(
 		//		that would need a change in XSD
 
 		final String className = XmlProcessingHelper.determineClassName( jaxbRoot, jaxbMappedSuperclass );
-		final MutableClassDetails classDetails = (MutableClassDetails) xmlDocumentContext
-				.getModelBuildingContext()
-				.getClassDetailsRegistry()
-				.resolveClassDetails( className );
+		final var classDetails = getMutableClassDetails( xmlDocumentContext, className );
 
 		classDetails.clearMemberAnnotationUsages();
 		classDetails.clearAnnotationUsages();
@@ -542,23 +539,21 @@ private static void processMappedSuperclassMetadata(
 			JaxbMappedSuperclassImpl jaxbMappedSuperclass,
 			MutableClassDetails classDetails,
 			XmlDocumentContext xmlDocumentContext) {
-		final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext();
+		final var modelBuildingContext = xmlDocumentContext.getModelBuildingContext();
 
 		classDetails.applyAnnotationUsage( JpaAnnotations.MAPPED_SUPERCLASS, modelBuildingContext );
 
-		final AccessType classAccessType = coalesce(
+		final var classAccessType = coalesce(
 				jaxbMappedSuperclass.getAccess(),
 				xmlDocumentContext.getEffectiveDefaults().getDefaultPropertyAccessType()
 		);
 		if ( classAccessType != null ) {
-			final AccessJpaAnnotation accessUsage = (AccessJpaAnnotation) classDetails.applyAnnotationUsage(
-					JpaAnnotations.ACCESS,
-					modelBuildingContext
-			);
+			final var accessUsage = (AccessJpaAnnotation)
+					classDetails.applyAnnotationUsage( JpaAnnotations.ACCESS, modelBuildingContext );
 			accessUsage.value( classAccessType );
 		}
 
-		final JaxbAttributesContainerImpl attributes = jaxbMappedSuperclass.getAttributes();
+		final var attributes = jaxbMappedSuperclass.getAttributes();
 		if ( attributes != null ) {
 			processIdMappings(
 					attributes,
@@ -577,14 +572,12 @@ private static void processMappedSuperclassMetadata(
 
 	public static void processOverrideMappedSuperclass(List<XmlProcessingResult.OverrideTuple<JaxbMappedSuperclassImpl>> mappedSuperclassesOverrides) {
 		mappedSuperclassesOverrides.forEach( (overrideTuple) -> {
-			final XmlDocumentContext xmlDocumentContext = overrideTuple.getXmlDocumentContext();
-			final JaxbEntityMappingsImpl jaxbRoot = overrideTuple.getJaxbRoot();
-			final JaxbMappedSuperclassImpl jaxbMappedSuperclass = overrideTuple.getManagedType();
-			final String className = XmlProcessingHelper.determineClassName( jaxbRoot, jaxbMappedSuperclass );
-			final MutableClassDetails classDetails = (MutableClassDetails) xmlDocumentContext
-					.getModelBuildingContext()
-					.getClassDetailsRegistry()
-					.resolveClassDetails( className );
+			final var xmlDocumentContext = overrideTuple.getXmlDocumentContext();
+			final var jaxbRoot = overrideTuple.getJaxbRoot();
+			final var jaxbMappedSuperclass = overrideTuple.getManagedType();
+			final var classDetails =
+					getMutableClassDetails( xmlDocumentContext,
+							XmlProcessingHelper.determineClassName( jaxbRoot, jaxbMappedSuperclass ) );
 
 			processMappedSuperclassMetadata( jaxbMappedSuperclass, classDetails, xmlDocumentContext );
 		} );
@@ -607,28 +600,25 @@ public static void processCompleteEmbeddable(
 		final AccessType classAccessType;
 		final AttributeProcessor.MemberAdjuster memberAdjuster;
 
-		final ClassDetailsRegistry classDetailsRegistry = xmlDocumentContext
-				.getModelBuildingContext()
-				.getClassDetailsRegistry();
+		final var classDetailsRegistry =
+				xmlDocumentContext.getModelBuildingContext()
+						.getClassDetailsRegistry();
 
-		if ( StringHelper.isEmpty( jaxbEmbeddable.getClazz() ) ) {
-			if ( StringHelper.isEmpty( jaxbEmbeddable.getName() ) ) {
+		if ( isEmpty( jaxbEmbeddable.getClazz() ) ) {
+			if ( isEmpty( jaxbEmbeddable.getName() ) ) {
 				throw new ModelsException( "Embeddable did not define class nor name" );
 			}
 			// no class == dynamic...
 			classDetails = (MutableClassDetails) ModelsHelper.resolveClassDetails(
 					jaxbEmbeddable.getName(),
 					classDetailsRegistry,
-					() ->
-							new DynamicClassDetails(
-									jaxbEmbeddable.getName(),
-									xmlDocumentContext.getModelBuildingContext()
-							)
+					() -> new DynamicClassDetails( jaxbEmbeddable.getName(),
+							xmlDocumentContext.getModelBuildingContext() )
 			);
 			classAccessType = AccessType.FIELD;
 			memberAdjuster = ManagedTypeProcessor::adjustDynamicTypeMember;
 
-			DynamicModelHelper.prepareDynamicClass( classDetails, jaxbEmbeddable, xmlDocumentContext );
+			prepareDynamicClass( classDetails, jaxbEmbeddable, xmlDocumentContext );
 		}
 		else {
 			final String className = XmlProcessingHelper.determineClassName( jaxbRoot, jaxbEmbeddable );
@@ -658,13 +648,13 @@ private static void processEmbeddableMetadata(
 			AccessType classAccessType,
 			AttributeProcessor.MemberAdjuster memberAdjuster,
 			XmlDocumentContext xmlDocumentContext) {
-		classDetails.applyAnnotationUsage( JpaAnnotations.EMBEDDABLE, xmlDocumentContext.getModelBuildingContext() );
+		classDetails.applyAnnotationUsage( JpaAnnotations.EMBEDDABLE,
+				xmlDocumentContext.getModelBuildingContext() );
 
 		if ( classAccessType != null ) {
-			final AccessJpaAnnotation accessUsage = (AccessJpaAnnotation) classDetails.applyAnnotationUsage(
-					JpaAnnotations.ACCESS,
-					xmlDocumentContext.getModelBuildingContext()
-			);
+			final var accessUsage = (AccessJpaAnnotation)
+					classDetails.applyAnnotationUsage( JpaAnnotations.ACCESS,
+							xmlDocumentContext.getModelBuildingContext() );
 			accessUsage.value( classAccessType );
 		}
 
@@ -681,20 +671,20 @@ private static void processEmbeddableMetadata(
 
 	public static void processOverrideEmbeddable(List<XmlProcessingResult.OverrideTuple<JaxbEmbeddableImpl>> embeddableOverrides) {
 		embeddableOverrides.forEach( (overrideTuple) -> {
-			final XmlDocumentContext xmlDocumentContext = overrideTuple.getXmlDocumentContext();
-			final JaxbEntityMappingsImpl jaxbRoot = overrideTuple.getJaxbRoot();
-			final JaxbEmbeddableImpl jaxbEmbeddable = overrideTuple.getManagedType();
-			final String className = XmlProcessingHelper.determineClassName( jaxbRoot, jaxbEmbeddable );
-			final MutableClassDetails classDetails = (MutableClassDetails) xmlDocumentContext
-					.getModelBuildingContext()
-					.getClassDetailsRegistry()
-					.resolveClassDetails( className );
-
-			classDetails.applyAnnotationUsage( JpaAnnotations.EMBEDDABLE, xmlDocumentContext.getModelBuildingContext() );
+			final var xmlDocumentContext = overrideTuple.getXmlDocumentContext();
+			final var jaxbRoot = overrideTuple.getJaxbRoot();
+			final var jaxbEmbeddable = overrideTuple.getManagedType();
+			final var classDetails =
+					getMutableClassDetails( xmlDocumentContext,
+							XmlProcessingHelper.determineClassName( jaxbRoot, jaxbEmbeddable ) );
+
+			classDetails.applyAnnotationUsage( JpaAnnotations.EMBEDDABLE,
+					xmlDocumentContext.getModelBuildingContext() );
 
-			if ( jaxbEmbeddable.getAttributes() != null ) {
+			final var attributes = jaxbEmbeddable.getAttributes();
+			if ( attributes != null ) {
 				AttributeProcessor.processAttributes(
-						jaxbEmbeddable.getAttributes(),
+						attributes,
 						classDetails,
 						AccessType.FIELD,
 						ManagedTypeProcessor::adjustNonDynamicTypeMember,
@@ -703,4 +693,11 @@ public static void processOverrideEmbeddable(List<XmlProcessingResult.OverrideTu
 			}
 		} );
 	}
+
+	private static MutableClassDetails getMutableClassDetails(XmlDocumentContext xmlDocumentContext, String className) {
+		return (MutableClassDetails)
+				xmlDocumentContext.getModelBuildingContext()
+						.getClassDetailsRegistry()
+						.resolveClassDetails( className );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/PersistenceUnitMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/PersistenceUnitMetadataImpl.java
index fc016ec0889b..f6fc5c17d138 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/PersistenceUnitMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/PersistenceUnitMetadataImpl.java
@@ -7,7 +7,6 @@
 import java.util.EnumSet;
 
 import org.hibernate.annotations.CascadeType;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbPersistenceUnitDefaultsImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbPersistenceUnitMetadataImpl;
 import org.hibernate.boot.models.xml.spi.PersistenceUnitMetadata;
 
@@ -80,7 +79,7 @@ public void apply(JaxbPersistenceUnitMetadataImpl metadata) {
 
 		xmlComplete = xmlComplete || metadata.getXmlMappingMetadataComplete() != null;
 
-		final JaxbPersistenceUnitDefaultsImpl defaults = metadata.getPersistenceUnitDefaults();
+		final var defaults = metadata.getPersistenceUnitDefaults();
 		if ( defaults == null ) {
 			return;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java
index 36608dcaed68..35c262a03315 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java
@@ -20,6 +20,7 @@
 import java.time.OffsetTime;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -32,6 +33,7 @@
 import org.hibernate.annotations.ResultCheckStyle;
 import org.hibernate.annotations.SecondaryRow;
 import org.hibernate.boot.internal.LimitedCollectionClassification;
+import org.hibernate.boot.jaxb.mapping.GenerationTiming;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbAssociationOverrideImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbAttributeOverrideImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbBasicMapping;
@@ -69,6 +71,7 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbSchemaAware;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbSecondaryTableImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbSequenceGeneratorImpl;
+import org.hibernate.boot.jaxb.mapping.spi.JaxbSynchronizedTableImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbTableGeneratorImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbTableImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbUniqueConstraintImpl;
@@ -90,6 +93,7 @@
 import org.hibernate.boot.models.xml.spi.XmlDocument;
 import org.hibernate.boot.models.xml.spi.XmlDocumentContext;
 import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle;
+import org.hibernate.generator.EventType;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.models.ModelsException;
@@ -132,6 +136,7 @@
 import static org.hibernate.boot.models.JpaAnnotations.CHECK_CONSTRAINT;
 import static org.hibernate.boot.models.JpaAnnotations.COLUMN;
 import static org.hibernate.boot.models.JpaAnnotations.CONVERT;
+import static org.hibernate.boot.models.JpaAnnotations.CONVERTS;
 import static org.hibernate.boot.models.JpaAnnotations.EXCLUDE_DEFAULT_LISTENERS;
 import static org.hibernate.boot.models.JpaAnnotations.EXCLUDE_SUPERCLASS_LISTENERS;
 import static org.hibernate.boot.models.JpaAnnotations.INDEX;
@@ -479,6 +484,27 @@ public static void applyNationalized(
 		memberDetails.applyAnnotationUsage( HibernateAnnotations.NATIONALIZED, xmlDocumentContext.getModelBuildingContext() );
 	}
 
+	public static void applyGenerated(
+			GenerationTiming timing,
+			MutableMemberDetails memberDetails,
+			XmlDocumentContext xmlDocumentContext) {
+		if ( timing == null ) {
+			return;
+		}
+
+		EnumSet<EventType> eventTypes = timing.getEventTypes();
+		if ( eventTypes == null ) {
+			return;
+		}
+
+		final GeneratedAnnotation generatedAnn = (GeneratedAnnotation) memberDetails.applyAnnotationUsage(
+				HibernateAnnotations.GENERATED,
+				xmlDocumentContext.getModelBuildingContext()
+		);
+
+		generatedAnn.event( eventTypes.toArray( new EventType[0] ) );
+	}
+
 	public static void applyGeneratedValue(
 			JaxbGeneratedValueImpl jaxbGeneratedValue,
 			MutableMemberDetails memberDetails,
@@ -780,6 +806,28 @@ public static void applyConvert(
 		transferConvertDetails( jaxbConvert, annotation, null, xmlDocumentContext );
 	}
 
+	public static void applyConverts(
+			List<JaxbConvertImpl> jaxbConverts,
+			MutableAnnotationTarget target,
+			XmlDocumentContext xmlDocumentContext){
+		if ( isEmpty( jaxbConverts ) ) {
+			return;
+		}
+
+		final ConvertsJpaAnnotation convertsUsage = (ConvertsJpaAnnotation) target.replaceAnnotationUsage(
+				CONVERT,
+				CONVERTS,
+				xmlDocumentContext.getModelBuildingContext()
+		);
+
+		final Convert[] convertUsages = new Convert[jaxbConverts.size()];
+		convertsUsage.value( convertUsages );
+
+		for ( int i = 0; i < jaxbConverts.size(); i++ ) {
+			convertUsages[i] = transformConvert( jaxbConverts.get( i ), null, xmlDocumentContext );
+		}
+	}
+
 	public static void applyConverts(
 			List<JaxbConvertImpl> jaxbConverts,
 			String namePrefix,
@@ -791,7 +839,7 @@ public static void applyConverts(
 
 		final ConvertsJpaAnnotation convertsUsage = (ConvertsJpaAnnotation) memberDetails.replaceAnnotationUsage(
 				CONVERT,
-				JpaAnnotations.CONVERTS,
+				CONVERTS,
 				xmlDocumentContext.getModelBuildingContext()
 		);
 		final Convert[] convertUsages = new Convert[jaxbConverts.size()];
@@ -1733,4 +1781,22 @@ public static void applyVersion(JaxbVersionImpl version, MutableClassDetails mut
 			}
 		}
 	}
+
+	public static void applySyncronizedTables(List<JaxbSynchronizedTableImpl> synchronizedTables, MutableClassDetails classDetails, XmlDocumentContext xmlDocumentContext) {
+		if ( isEmpty( synchronizedTables ) ) {
+			return;
+		}
+
+		final SynchronizeAnnotation synchronizeAnnotation = (SynchronizeAnnotation) classDetails.replaceAnnotationUsage(
+				HibernateAnnotations.SYNCHRONIZE,
+				xmlDocumentContext.getModelBuildingContext()
+		);
+
+		final String[] synchronizeTableNames = new String[synchronizedTables.size()];
+		for ( int i = 0; i < synchronizedTables.size(); i++ ) {
+			JaxbSynchronizedTableImpl jaxbSynchronizedTable = synchronizedTables.get( i );
+			synchronizeTableNames[i] = jaxbSynchronizedTable.getTable();
+		}
+		synchronizeAnnotation.value( synchronizeTableNames );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java
index ae06bd1ebb4d..a13e76dd2205 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlProcessingHelper.java
@@ -4,12 +4,12 @@
  */
 package org.hibernate.boot.models.xml.internal;
 
-import java.beans.Introspector;
-
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbManagedType;
 import org.hibernate.boot.models.MemberResolutionException;
 import org.hibernate.internal.util.StringHelper;
+
+import static org.hibernate.internal.util.StringHelper.decapitalize;
 import org.hibernate.models.spi.FieldDetails;
 import org.hibernate.models.spi.MethodDetails;
 import org.hibernate.models.spi.MutableClassDetails;
@@ -74,14 +74,14 @@ public static MutableMemberDetails findAttributeMember(
 				if ( methodDetails.getMethodKind() == MethodDetails.MethodKind.GETTER ) {
 					if ( methodDetails.getName().startsWith( "get" ) ) {
 						final String stemName = methodDetails.getName().substring( 3 );
-						final String decapitalizedStemName = Introspector.decapitalize( stemName );
+						final String decapitalizedStemName = decapitalize( stemName );
 						if ( stemName.equals( attributeName ) || decapitalizedStemName.equals( attributeName ) ) {
 							return (MutableMemberDetails) methodDetails;
 						}
 					}
 					else if ( methodDetails.getName().startsWith( "is" ) ) {
 						final String stemName = methodDetails.getName().substring( 2 );
-						final String decapitalizedStemName = Introspector.decapitalize( stemName );
+						final String decapitalizedStemName = decapitalize( stemName );
 						if ( stemName.equals( attributeName ) || decapitalizedStemName.equals( attributeName ) ) {
 							return (MutableMemberDetails) methodDetails;
 						}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicAttributeProcessing.java
index 60628ed0b286..8849ddd0df24 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/BasicAttributeProcessing.java
@@ -78,8 +78,8 @@ else if ( jaxbBasic.getColumn() != null ) {
 		XmlAnnotationHelper.applyLob( jaxbBasic.getLob(), memberDetails, xmlDocumentContext );
 		XmlAnnotationHelper.applyEnumerated( jaxbBasic.getEnumerated(), memberDetails, xmlDocumentContext );
 		XmlAnnotationHelper.applyNationalized( jaxbBasic.getNationalized(), memberDetails, xmlDocumentContext );
+		XmlAnnotationHelper.applyGenerated( jaxbBasic.getGenerated(), memberDetails, xmlDocumentContext );
 
-		// todo : value generation
 		// todo : ...
 
 		return memberDetails;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonAttributeProcessing.java
index d672ccec2708..21661969db04 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonAttributeProcessing.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonAttributeProcessing.java
@@ -65,7 +65,7 @@ public static void applyAttributeAccessor(
 		final ClassDetails strategyClassDetails = xmlDocumentContext
 				.getModelBuildingContext()
 				.getClassDetailsRegistry()
-				.getClassDetails( attributeAccessor );
+				.resolveClassDetails( attributeAccessor );
 		accessorAnn.strategy( strategyClassDetails.toJavaClass() );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/package-info.java
index 75041562561d..3b0a34443139 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/package-info.java
@@ -8,7 +8,7 @@
  * {@linkplain org.hibernate.models.spi.ClassDetails classes},
  * {@linkplain org.hibernate.models.spi.FieldDetails fields} and
  * {@linkplain org.hibernate.models.spi.MethodDetails methods}.
- * <p/>
+ * <p>
  * JPA defines 2 modes for applying mapping XML information, as covered under
  * section 12.1 (<i>Use of the XML Descriptor</i>) of the specification-<dl>
  *     <dt>metadata-complete</dt>
@@ -23,7 +23,7 @@
  *         12.2 (<i>XML Overriding Rules</i>) of the specification.
  *     </dd>
  * </dl>
- * <p/>
+ * <p>
  * When operating in metadata-complete mode,
  * {@linkplain org.hibernate.boot.models.xml.internal.ManagedTypeProcessor} will first clear
  * all annotations from the managed type's
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessor.java
index 25d58354a571..1e96506b2662 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlPreProcessor.java
@@ -23,7 +23,7 @@ public class XmlPreProcessor {
 	public static XmlPreProcessingResult preProcessXmlResources(
 			ManagedResources managedResources,
 			PersistenceUnitMetadata persistenceUnitMetadata) {
-		final XmlPreProcessingResultImpl collected = new XmlPreProcessingResultImpl( persistenceUnitMetadata );
+		final var collected = new XmlPreProcessingResultImpl( persistenceUnitMetadata );
 		for ( var mappingXmlBinding : managedResources.getXmlMappingBindings() ) {
 			// skip hbm.xml
 			if ( mappingXmlBinding.getRoot() instanceof JaxbEntityMappingsImpl ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java
index 60299939b009..05598da7f635 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java
@@ -6,14 +6,18 @@
 
 import org.hibernate.boot.internal.RootMappingDefaults;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
-import org.hibernate.boot.models.xml.internal.ManagedTypeProcessor;
 import org.hibernate.boot.models.xml.internal.XmlDocumentContextImpl;
 import org.hibernate.boot.models.xml.internal.XmlProcessingResultImpl;
+import org.hibernate.boot.models.xml.spi.XmlProcessingResult.OverrideTuple;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.models.spi.ModelsContext;
 
 import java.util.function.BiConsumer;
 
+import static org.hibernate.boot.models.xml.internal.ManagedTypeProcessor.processCompleteEmbeddable;
+import static org.hibernate.boot.models.xml.internal.ManagedTypeProcessor.processCompleteEntity;
+import static org.hibernate.boot.models.xml.internal.ManagedTypeProcessor.processCompleteMappedSuperclass;
+
 /**
  * Processes XML mappings - applying metadata-complete mappings and collecting
  * override mappings for later processing.
@@ -29,53 +33,52 @@ public static XmlProcessingResult processXml(
 			BootstrapContext bootstrapContext,
 			RootMappingDefaults mappingDefaults) {
 		final boolean xmlMappingsGloballyComplete = persistenceUnitMetadata.areXmlMappingsComplete();
-		final XmlProcessingResultImpl xmlOverlay = new XmlProcessingResultImpl();
+		final var xmlOverlay = new XmlProcessingResultImpl();
 
-		xmlPreProcessingResult.getDocuments().forEach( (xmlDocument) -> {
-			final XmlDocumentContext xmlDocumentContext = new XmlDocumentContextImpl(
+		xmlPreProcessingResult.getDocuments().forEach( xmlDocument -> {
+			final var xmlDocumentContext = new XmlDocumentContextImpl(
 					xmlDocument,
 					mappingDefaults,
 					ModelsContext,
 					bootstrapContext
 			);
 
-			final JaxbEntityMappingsImpl jaxbRoot = xmlDocument.getRoot();
+			final var jaxbRoot = xmlDocument.getRoot();
 			jaxbRootConsumer.accept( jaxbRoot, xmlDocumentContext );
 
-			jaxbRoot.getEmbeddables().forEach( (jaxbEmbeddable) -> {
+			jaxbRoot.getEmbeddables().forEach( jaxbEmbeddable -> {
 				if ( xmlMappingsGloballyComplete || jaxbEmbeddable.isMetadataComplete() == Boolean.TRUE ) {
 					// the XML mapping is complete, we can process it immediately
-					ManagedTypeProcessor.processCompleteEmbeddable(
-							jaxbRoot,
-							jaxbEmbeddable,
-							xmlDocumentContext
-					);
+					processCompleteEmbeddable( jaxbRoot, jaxbEmbeddable, xmlDocumentContext );
 				}
 				else {
 					// otherwise, wait to process it until later
-					xmlOverlay.addEmbeddableOverride( new XmlProcessingResult.OverrideTuple<>( jaxbRoot, xmlDocumentContext, jaxbEmbeddable ) );
+					xmlOverlay.addEmbeddableOverride(
+							new OverrideTuple<>( jaxbRoot, xmlDocumentContext, jaxbEmbeddable ) );
 				}
 			} );
 
-			jaxbRoot.getMappedSuperclasses().forEach( (jaxbMappedSuperclass) -> {
+			jaxbRoot.getMappedSuperclasses().forEach( jaxbMappedSuperclass -> {
 				if ( xmlMappingsGloballyComplete || jaxbMappedSuperclass.isMetadataComplete() == Boolean.TRUE ) {
 					// the XML mapping is complete, we can process it immediately
-					ManagedTypeProcessor.processCompleteMappedSuperclass( jaxbRoot, jaxbMappedSuperclass, xmlDocumentContext );
+					processCompleteMappedSuperclass( jaxbRoot, jaxbMappedSuperclass, xmlDocumentContext );
 				}
 				else {
 					// otherwise, wait to process it until later
-					xmlOverlay.addMappedSuperclassesOverride( new XmlProcessingResult.OverrideTuple<>( jaxbRoot, xmlDocumentContext, jaxbMappedSuperclass ) );
+					xmlOverlay.addMappedSuperclassesOverride(
+							new OverrideTuple<>( jaxbRoot, xmlDocumentContext, jaxbMappedSuperclass ) );
 				}
 			});
 
-			jaxbRoot.getEntities().forEach( (jaxbEntity) -> {
+			jaxbRoot.getEntities().forEach( jaxbEntity -> {
 				if ( xmlMappingsGloballyComplete || jaxbEntity.isMetadataComplete() == Boolean.TRUE ) {
 					// the XML mapping is complete, we can process it immediately
-					ManagedTypeProcessor.processCompleteEntity( jaxbRoot, jaxbEntity, xmlDocumentContext );
+					processCompleteEntity( jaxbRoot, jaxbEntity, xmlDocumentContext );
 				}
 				else {
 					// otherwise, wait to process it until later
-					xmlOverlay.addEntityOverride( new XmlProcessingResult.OverrideTuple<>( jaxbRoot, xmlDocumentContext, jaxbEntity ) );
+					xmlOverlay.addEntityOverride(
+							new OverrideTuple<>( jaxbRoot, xmlDocumentContext, jaxbEntity ) );
 				}
 			} );
 		} );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java
index 4f41cab22f95..ebcc4de5a834 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java
@@ -49,7 +49,6 @@
 import org.hibernate.sql.results.graph.Fetchable;
 import org.hibernate.sql.results.graph.FetchableContainer;
 import org.hibernate.sql.results.graph.entity.EntityValuedFetchable;
-import org.hibernate.type.BasicType;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -956,7 +955,7 @@ public ResultMementoBasicStandard resolve(ResultSetMappingResolutionContext reso
 			);
 
 			if ( hibernateTypeName != null ) {
-				final BasicType<?> namedType =
+				final var namedType =
 						resolutionContext.getTypeConfiguration().getBasicTypeRegistry()
 								.getRegisteredType( hibernateTypeName );
 
@@ -964,12 +963,12 @@ public ResultMementoBasicStandard resolve(ResultSetMappingResolutionContext reso
 					throw new IllegalArgumentException( "Could not resolve named type : " + hibernateTypeName );
 				}
 
-				return new ResultMementoBasicStandard( columnName, namedType, resolutionContext );
+				return new ResultMementoBasicStandard( columnName, namedType );
 			}
 
 			// todo (6.0) : column name may be optional in HBM - double check
 
-			return new ResultMementoBasicStandard( columnName, null, resolutionContext );
+			return new ResultMementoBasicStandard( columnName, null );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
index d4228f87ecf2..a89d6af99f63 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
@@ -45,6 +45,8 @@
 import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorBuilderImpl;
 import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
 import org.hibernate.type.format.FormatMapper;
+import org.hibernate.type.format.jackson.Jackson3JsonFormatMapper;
+import org.hibernate.type.format.jackson.Jackson3XmlFormatMapper;
 import org.hibernate.type.format.jackson.JacksonIntegration;
 import org.hibernate.type.format.jackson.JacksonJsonFormatMapper;
 import org.hibernate.type.format.jackson.JacksonOsonFormatMapper;
@@ -308,6 +310,11 @@ private static void addJsonFormatMappers(StrategySelectorImpl strategySelector)
 				JacksonJsonFormatMapper.SHORT_NAME,
 				JacksonJsonFormatMapper.class
 		);
+		strategySelector.registerStrategyImplementor(
+				FormatMapper.class,
+				Jackson3JsonFormatMapper.SHORT_NAME,
+				Jackson3JsonFormatMapper.class
+		);
 		if ( JacksonIntegration.isJacksonOsonExtensionAvailable() ) {
 			strategySelector.registerStrategyImplementor(
 					FormatMapper.class,
@@ -323,6 +330,11 @@ private static void addXmlFormatMappers(StrategySelectorImpl strategySelector) {
 				JacksonXmlFormatMapper.SHORT_NAME,
 				JacksonXmlFormatMapper.class
 		);
+		strategySelector.registerStrategyImplementor(
+				FormatMapper.class,
+				Jackson3XmlFormatMapper.SHORT_NAME,
+				Jackson3XmlFormatMapper.class
+		);
 		strategySelector.registerStrategyImplementor(
 				FormatMapper.class,
 				JaxbXmlFormatMapper.SHORT_NAME,
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/package-info.java
index ff966cd8aaa9..2bd2a47cdd38 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/package-info.java
@@ -7,6 +7,6 @@
  * Defines actual contract used for
  * {@linkplain org.hibernate.boot.registry.selector.spi.StrategySelector strategy selection}.
  *
- * @link org.hibernate.boot.registry.selector.spi.StrategySelector
+ * @see org.hibernate.boot.registry.selector.spi.StrategySelector
  */
 package org.hibernate.boot.registry.selector.spi;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java
index 3f82b67a1177..7f264777c88a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java
@@ -15,7 +15,9 @@
 import org.hibernate.boot.SessionFactoryBuilder;
 import org.hibernate.boot.TempTableDdlTransactionHandling;
 import org.hibernate.cache.spi.TimestampsCacheFactory;
+import org.hibernate.temporal.TemporalTableStrategy;
 import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
+import org.hibernate.context.spi.TenantCredentialsMapper;
 import org.hibernate.context.spi.TenantSchemaMapper;
 import org.hibernate.proxy.EntityNotFoundDelegate;
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
@@ -215,6 +217,12 @@ public SessionFactoryBuilder applyTenantSchemaMapper(TenantSchemaMapper<?> mappe
 		return getThis();
 	}
 
+	@Override
+	public SessionFactoryBuilder applyTenantCredentialsMapper(TenantCredentialsMapper<?> mapper) {
+		delegate.applyTenantCredentialsMapper( mapper );
+		return getThis();
+	}
+
 	@Override
 	public T applyJtaTrackingByThread(boolean enabled) {
 		delegate.applyJtaTrackingByThread( enabled );
@@ -409,6 +417,12 @@ public T applyXmlFormatMapper(FormatMapper xmlFormatMapper) {
 		return getThis();
 	}
 
+	@Override
+	public SessionFactoryBuilder applyTemporalTableStrategy(TemporalTableStrategy strategy) {
+		delegate.applyTemporalTableStrategy( strategy );
+		return getThis();
+	}
+
 	@Override
 	public SessionFactory build() {
 		return delegate.build();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
index 3754a15b7ccf..431434bd4e6c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
@@ -14,9 +14,12 @@
 import org.hibernate.CustomEntityDirtinessStrategy;
 import org.hibernate.EntityNameResolver;
 import org.hibernate.FlushMode;
+import org.hibernate.GraphParserMode;
 import org.hibernate.Interceptor;
 import org.hibernate.LockOptions;
 import org.hibernate.SessionFactoryObserver;
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.context.spi.TenantCredentialsMapper;
 import org.hibernate.context.spi.TenantSchemaMapper;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
@@ -242,6 +245,11 @@ public TenantSchemaMapper<Object> getTenantSchemaMapper() {
 		return delegate.getTenantSchemaMapper();
 	}
 
+	@Override
+	public TenantCredentialsMapper<Object> getTenantCredentialsMapper() {
+		return delegate.getTenantCredentialsMapper();
+	}
+
 	@Override
 	public JavaType<Object> getDefaultTenantIdentifierJavaType() {
 		return delegate.getDefaultTenantIdentifierJavaType();
@@ -402,6 +410,11 @@ public TimeZone getJdbcTimeZone() {
 		return delegate.getJdbcTimeZone();
 	}
 
+	@Override
+	public TemporalTableStrategy getTemporalTableStrategy() {
+		return delegate.getTemporalTableStrategy();
+	}
+
 	@Override
 	public ValueHandlingMode getCriteriaValueHandlingMode() {
 		return delegate.getCriteriaValueHandlingMode();
@@ -586,6 +599,11 @@ public Map<String, Object> getDefaultSessionProperties() {
 		return delegate.getDefaultSessionProperties();
 	}
 
+	@Override
+	public GraphParserMode getGraphParserMode() {
+		return delegate.getGraphParserMode();
+	}
+
 	@Override
 	public CacheMode getInitialSessionCacheMode() {
 		return delegate.getInitialSessionCacheMode();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
index c64311da83e9..c6077ed0a36d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
@@ -26,6 +26,8 @@
 import org.hibernate.resource.beans.spi.BeanInstanceProducer;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.type.BasicType;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 /**
@@ -125,13 +127,6 @@ public interface BootstrapContext {
 	 */
 	ClassLoaderAccess getClassLoaderAccess();
 
-	/**
-	 * Access to the shared {@link ClassmateContext} object used
-	 * throughout the bootstrap process.
-	 */
-	@Incubating
-	ClassmateContext getClassmateContext();
-
 	/**
 	 * Access to the {@link ArchiveDescriptorFactory} used for scanning.
 	 *
@@ -240,4 +235,9 @@ public interface BootstrapContext {
 	 * To support Envers.
 	 */
 	<T> BasicType<T> resolveAdHocBasicType(String key);
+
+	/**
+	 * Find a previously registered ad-hoc BasicTypeImpl based on java and jdbc type.
+	 */
+	<T> BasicType<T> findAdHocBasicType(JavaType<T> javaType, JdbcType jdbcType);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/ClassmateContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/ClassmateContext.java
deleted file mode 100644
index 73f6256575df..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/ClassmateContext.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.boot.spi;
-
-import com.fasterxml.classmate.MemberResolver;
-import com.fasterxml.classmate.TypeResolver;
-import org.hibernate.Incubating;
-
-/**
- * Exposes the Classmate {@link TypeResolver} and {@link MemberResolver}.
- *
- * @author Steve Ebersole
- */
-@Incubating
-public class ClassmateContext {
-	private TypeResolver typeResolver = new TypeResolver();
-	private MemberResolver memberResolver = new MemberResolver( typeResolver );
-
-	public TypeResolver getTypeResolver() {
-		if ( typeResolver == null ) {
-			throw new IllegalStateException( "Classmate context has been released" );
-		}
-		return typeResolver;
-	}
-
-	public MemberResolver getMemberResolver() {
-		if ( memberResolver == null ) {
-			throw new IllegalStateException( "Classmate context has been released" );
-		}
-		return memberResolver;
-	}
-
-	public void release() {
-		typeResolver = null;
-		memberResolver = null;
-	}
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java
index fc2903a9660e..405d82711e12 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java
@@ -140,6 +140,7 @@ default AnnotationDescriptorRegistry getAnnotationDescriptorRegistry() {
 	 * @param subselect A select statement which defines a logical table, much
 	 * like a DB view.
 	 * @param isAbstract Is the table abstract (i.e. not really existing in the DB)?
+	 * @param isExplicit Whether the name is explicitly set
 	 *
 	 * @return The created table metadata, or the existing reference.
 	 */
@@ -149,7 +150,8 @@ Table addTable(
 			String name,
 			String subselect,
 			boolean isAbstract,
-			MetadataBuildingContext buildingContext);
+			MetadataBuildingContext buildingContext,
+			boolean isExplicit);
 
 	/**
 	 * Adds a 'denormalized table' to this repository.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderContributor.java
index 25f340784cd5..3d518e8a1083 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderContributor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuilderContributor.java
@@ -10,9 +10,9 @@
 
 /**
  * A bootstrap process hook for contributing settings to {@link MetadataBuilder}.
- * <p/>
+ * <p>
  * Generally this is used from JPA bootstrapping where {@link MetadataBuilder} is not accessible.
- * <p/>
+ * <p>
  * Implementations can be {@linkplain java.util.ServiceLoader discovered}. For historical reasons,
  * an implementation can also be named using the
  * {@value org.hibernate.jpa.boot.spi.JpaSettings#METADATA_BUILDER_CONTRIBUTOR} setting, though
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java
index 0ecf44e76b78..1109e3a2eb8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java
@@ -8,6 +8,7 @@
 import org.hibernate.boot.model.TypeDefinitionRegistry;
 import org.hibernate.boot.model.naming.ObjectNameNormalizer;
 import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.temporal.TemporalTableStrategy;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.ServiceRegistry;
@@ -15,6 +16,7 @@
 import static org.hibernate.cfg.MappingSettings.JAVA_TIME_USE_DIRECT_JDBC;
 import static org.hibernate.cfg.MappingSettings.PREFER_LOCALE_LANGUAGE_TAG;
 import static org.hibernate.cfg.MappingSettings.PREFER_NATIVE_ENUM_TYPES;
+import static org.hibernate.temporal.TemporalTableStrategy.AUTO;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
 
 /**
@@ -133,4 +135,8 @@ static boolean isPreferLocaleLanguageTagEnabled(ConfigurationService configurati
 	 * The name of the contributor whose mappings we are currently processing
 	 */
 	String getCurrentContributorName();
+
+	default TemporalTableStrategy getTemporalTableStrategy() {
+		return AUTO;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
index ce8f8b3fff5e..585a5566641d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
@@ -14,12 +14,16 @@
 import org.hibernate.CustomEntityDirtinessStrategy;
 import org.hibernate.EntityNameResolver;
 import org.hibernate.FlushMode;
+import org.hibernate.GraphParserMode;
 import org.hibernate.Incubating;
 import org.hibernate.Interceptor;
 import org.hibernate.Internal;
 import org.hibernate.LockOptions;
 import org.hibernate.SessionEventListener;
 import org.hibernate.SessionFactoryObserver;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.context.spi.TenantCredentialsMapper;
 import org.hibernate.context.spi.TenantSchemaMapper;
 import org.hibernate.type.TimeZoneStorageStrategy;
 import org.hibernate.annotations.CacheLayout;
@@ -326,6 +330,17 @@ default SessionEventListener[] buildSessionEventListeners() {
 	 */
 	TenantSchemaMapper<Object> getTenantSchemaMapper();
 
+	/**
+	 * Obtain a reference to the current {@linkplain TenantCredentialsMapper tenant credentials mapper},
+	 * which is used to obtain the database user and password for the current tenant
+	 * each time a connection is obtained.
+	 *
+	 * @see org.hibernate.cfg.MultiTenancySettings#MULTI_TENANT_CREDENTIALS_MAPPER
+	 *
+	 * @since 7.3
+	 */
+	TenantCredentialsMapper<Object> getTenantCredentialsMapper();
+
 	/**
 	 * @see org.hibernate.cfg.TransactionSettings#JTA_TRACK_BY_THREAD
 	 */
@@ -528,6 +543,11 @@ default SessionEventListener[] buildSessionEventListeners() {
 	 */
 	TimeZone getJdbcTimeZone();
 
+	/**
+	 * @see StateManagementSettings#TEMPORAL_TABLE_STRATEGY
+	 */
+	TemporalTableStrategy getTemporalTableStrategy();
+
 	/**
 	 * @see org.hibernate.cfg.AvailableSettings#CRITERIA_COPY_TREE
 	 */
@@ -795,4 +815,14 @@ default JavaType<Object> getDefaultTenantIdentifierJavaType() {
 	 * @see org.hibernate.Session#setProperty(String, Object)
 	 */
 	Map<String, Object> getDefaultSessionProperties();
+
+	/**
+	 * The graph parser mode to use for parsing entity graph strings.
+	 *
+	 * @see org.hibernate.cfg.GraphParserSettings#GRAPH_PARSER_MODE
+	 *
+	 * @since 7.0
+	 */
+	GraphParserMode getGraphParserMode();
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java
index 5247e46e47b1..b958bac7f48b 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/BytecodeEnhancementLogging.java
@@ -14,6 +14,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -32,7 +33,7 @@
 @Internal
 public interface BytecodeEnhancementLogging extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".bytecode.enhancement";
-	BytecodeEnhancementLogging ENHANCEMENT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BytecodeEnhancementLogging.class, LOGGER_NAME  );
+	BytecodeEnhancementLogging ENHANCEMENT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BytecodeEnhancementLogging.class, LOGGER_NAME, Locale.ROOT );
 
 	// ---- trace messages ----
 	@LogMessage(level = TRACE)
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java
index a0452a453170..7fd918d6ff88 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java
@@ -7,7 +7,6 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 
 import jakarta.persistence.Access;
 import jakarta.persistence.AccessType;
@@ -22,9 +21,7 @@
 import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
 
 import net.bytebuddy.asm.Advice;
-import net.bytebuddy.description.annotation.AnnotationDescription;
 import net.bytebuddy.description.annotation.AnnotationValue;
-import net.bytebuddy.description.field.FieldDescription;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.dynamic.scaffold.FieldLocator;
@@ -49,18 +46,15 @@ static Implementation wrap(
 			return implementation;
 		}
 
-		TypeDescription targetEntity = getTargetEntityClass( managedCtClass, persistentField );
+		final var targetEntity = getTargetEntityClass( managedCtClass, persistentField );
 		if ( targetEntity == null ) {
 			return implementation;
 		}
-		String mappedBy = getMappedBy( persistentField, targetEntity, enhancementContext );
-		String bidirectionalAttributeName;
-		if ( mappedBy == null ) {
-			bidirectionalAttributeName = getMappedByManyToMany( persistentField, targetEntity, enhancementContext );
-		}
-		else {
-			bidirectionalAttributeName = mappedBy;
-		}
+		final String mappedBy = getMappedBy( persistentField, targetEntity, enhancementContext );
+		final String bidirectionalAttributeName =
+				mappedBy == null
+						? getMappedByManyToMany( persistentField, targetEntity, enhancementContext )
+						: mappedBy;
 		if ( bidirectionalAttributeName == null || bidirectionalAttributeName.isEmpty() ) {
 			if ( ENHANCEMENT_LOGGER.isInfoEnabled() ) {
 				ENHANCEMENT_LOGGER.bidirectionalNotManagedCouldNotFindTargetField(
@@ -72,12 +66,13 @@ static Implementation wrap(
 			return implementation;
 		}
 
-		TypeDescription targetType = FieldLocator.ForClassHierarchy.Factory.INSTANCE.make( targetEntity )
-				.locate( bidirectionalAttributeName )
-				.getField()
-				.asDefined()
-				.getType()
-				.asErasure();
+		final var targetType =
+				FieldLocator.ForClassHierarchy.Factory.INSTANCE.make( targetEntity )
+						.locate( bidirectionalAttributeName )
+						.getField()
+						.asDefined()
+						.getType()
+						.asErasure();
 
 		if ( persistentField.hasAnnotation( OneToOne.class ) ) {
 			implementation = Advice.withCustomMapping()
@@ -116,7 +111,8 @@ static Implementation wrap(
 
 		if ( persistentField.hasAnnotation( ManyToMany.class ) ) {
 
-			if ( persistentField.getType().asErasure().isAssignableTo( Map.class ) || targetType.isAssignableTo( Map.class ) ) {
+			if ( persistentField.getType().asErasure().isAssignableTo( Map.class )
+				|| targetType.isAssignableTo( Map.class ) ) {
 				if ( ENHANCEMENT_LOGGER.isInfoEnabled() ) {
 					ENHANCEMENT_LOGGER.manyToManyInMapNotSupported(
 							managedCtClass.getName(),
@@ -139,10 +135,10 @@ static Implementation wrap(
 
 	public static TypeDescription getTargetEntityClass(TypeDescription managedCtClass, AnnotatedFieldDescription persistentField) {
 		try {
-			AnnotationDescription.Loadable<OneToOne> oto = persistentField.getAnnotation( OneToOne.class );
-			AnnotationDescription.Loadable<OneToMany> otm = persistentField.getAnnotation( OneToMany.class );
-			AnnotationDescription.Loadable<ManyToOne> mto = persistentField.getAnnotation( ManyToOne.class );
-			AnnotationDescription.Loadable<ManyToMany> mtm = persistentField.getAnnotation( ManyToMany.class );
+			final var oto = persistentField.getAnnotation( OneToOne.class );
+			final var otm = persistentField.getAnnotation( OneToMany.class );
+			final var mto = persistentField.getAnnotation( ManyToOne.class );
+			final var mtm = persistentField.getAnnotation( ManyToMany.class );
 
 			final AnnotationValue<?, ?> targetClass;
 			if ( oto != null ) {
@@ -177,22 +173,22 @@ else if ( mtm != null ) {
 	}
 
 	private static TypeDescription.Generic target(AnnotatedFieldDescription persistentField) {
-		AnnotationDescription.Loadable<Access> access = persistentField.getDeclaringType().asErasure().getDeclaredAnnotations().ofType( Access.class );
+		final var access =
+				persistentField.getDeclaringType().asErasure()
+						.getDeclaredAnnotations().ofType( Access.class );
 		if ( access != null && access.load().value() == AccessType.FIELD ) {
 			return persistentField.getType();
 		}
 		else {
-			Optional<MethodDescription> getter = persistentField.getGetter();
-			if ( getter.isPresent() ) {
-				return getter.get().getReturnType();
-			}
-			else {
-				return persistentField.getType();
-			}
+			final var getter = persistentField.getGetter();
+			return getter.isPresent() ? getter.get().getReturnType() : persistentField.getType();
 		}
 	}
 
-	private static String getMappedBy(AnnotatedFieldDescription target, TypeDescription targetEntity, ByteBuddyEnhancementContext context) {
+	private static String getMappedBy(
+			AnnotatedFieldDescription target,
+			TypeDescription targetEntity,
+			ByteBuddyEnhancementContext context) {
 		final String mappedBy = getMappedByFromAnnotation( target );
 		if ( mappedBy == null || mappedBy.isEmpty() ) {
 			return null;
@@ -203,12 +199,19 @@ private static String getMappedBy(AnnotatedFieldDescription target, TypeDescript
 		}
 	}
 
-	private static boolean isValidMappedBy(AnnotatedFieldDescription persistentField, TypeDescription targetEntity, String mappedBy, ByteBuddyEnhancementContext context) {
+	private static boolean isValidMappedBy(
+			AnnotatedFieldDescription persistentField,
+			TypeDescription targetEntity,
+			String mappedBy,
+			ByteBuddyEnhancementContext context) {
 		try {
-			FieldDescription f = FieldLocator.ForClassHierarchy.Factory.INSTANCE.make( targetEntity ).locate( mappedBy ).getField();
-			AnnotatedFieldDescription annotatedF = new AnnotatedFieldDescription( context, f );
-
-			return context.isPersistentField( annotatedF ) && persistentField.getDeclaringType().asErasure().isAssignableTo( entityType( f.getType() ) );
+			final var fieldDescription =
+					FieldLocator.ForClassHierarchy.Factory.INSTANCE.make( targetEntity )
+							.locate( mappedBy ).getField();
+			final var annotatedField = new AnnotatedFieldDescription( context, fieldDescription );
+			return context.isPersistentField( annotatedField )
+				&& persistentField.getDeclaringType().asErasure()
+						.isAssignableTo( entityType( fieldDescription.getType() ) );
 		}
 		catch ( IllegalStateException e ) {
 			return false;
@@ -216,59 +219,59 @@ private static boolean isValidMappedBy(AnnotatedFieldDescription persistentField
 	}
 	private static String getMappedByFromAnnotation(AnnotatedFieldDescription target) {
 		try {
-			AnnotationDescription.Loadable<OneToOne> oto = target.getAnnotation( OneToOne.class );
+			final var oto = target.getAnnotation( OneToOne.class );
 			if ( oto != null ) {
-				return oto.getValue( new MethodDescription.ForLoadedMethod( OneToOne.class.getDeclaredMethod( "mappedBy" ) ) ).resolve( String.class );
+				return oto.getValue( new MethodDescription.ForLoadedMethod( OneToOne.class.getDeclaredMethod( "mappedBy" ) ) )
+						.resolve( String.class );
 			}
-
-			AnnotationDescription.Loadable<OneToMany> otm = target.getAnnotation( OneToMany.class );
+			final var otm = target.getAnnotation( OneToMany.class );
 			if ( otm != null ) {
-				return otm.getValue( new MethodDescription.ForLoadedMethod( OneToMany.class.getDeclaredMethod( "mappedBy" ) ) ).resolve( String.class );
+				return otm.getValue( new MethodDescription.ForLoadedMethod( OneToMany.class.getDeclaredMethod( "mappedBy" ) ) )
+						.resolve( String.class );
 			}
-
-			AnnotationDescription.Loadable<ManyToMany> mtm = target.getAnnotation( ManyToMany.class );
+			final var mtm = target.getAnnotation( ManyToMany.class );
 			if ( mtm != null ) {
-				return mtm.getValue( new MethodDescription.ForLoadedMethod( ManyToMany.class.getDeclaredMethod( "mappedBy" ) ) ).resolve( String.class );
+				return mtm.getValue( new MethodDescription.ForLoadedMethod( ManyToMany.class.getDeclaredMethod( "mappedBy" ) ) )
+						.resolve( String.class );
 			}
 		}
 		catch (NoSuchMethodException ignored) {
 		}
-
 		return null;
 	}
 
 	private static String getMappedByManyToMany(AnnotatedFieldDescription target, TypeDescription targetEntity, ByteBuddyEnhancementContext context) {
-		for ( FieldDescription f : targetEntity.getDeclaredFields() ) {
-			AnnotatedFieldDescription annotatedF = new AnnotatedFieldDescription( context, f );
-			if ( context.isPersistentField( annotatedF )
-					&& target.getName().equals( getMappedBy( annotatedF, entityType( annotatedF.getType() ), context ) )
-					&& target.getDeclaringType().asErasure().isAssignableTo( entityType( annotatedF.getType() ) ) ) {
+		for ( final var fieldDescription : targetEntity.getDeclaredFields() ) {
+			final var annotatedField = new AnnotatedFieldDescription( context, fieldDescription );
+			if ( context.isPersistentField( annotatedField )
+					&& target.getName().equals( getMappedBy( annotatedField, entityType( annotatedField.getType() ), context ) )
+					&& target.getDeclaringType().asErasure().isAssignableTo( entityType( annotatedField.getType() ) ) ) {
 				if ( ENHANCEMENT_LOGGER.isTraceEnabled() ) {
 					ENHANCEMENT_LOGGER.tracef(
 							"mappedBy association for field [%s#%s] is [%s#%s]",
 							target.getDeclaringType().asErasure().getName(),
 							target.getName(),
 							targetEntity.getName(),
-							f.getName()
+							fieldDescription.getName()
 					);
 				}
-				return f.getName();
+				return fieldDescription.getName();
 			}
 		}
 		return null;
 	}
 
 	private static TypeDescription entityType(TypeDescription.Generic type) {
+		final var erasure = type.asErasure();
 		if ( type.getSort().isParameterized() ) {
-			if ( type.asErasure().isAssignableTo( Collection.class ) ) {
+			if ( erasure.isAssignableTo( Collection.class ) ) {
 				return type.getTypeArguments().get( 0 ).asErasure();
 			}
-			if ( type.asErasure().isAssignableTo( Map.class ) ) {
+			if ( erasure.isAssignableTo( Map.class ) ) {
 				return type.getTypeArguments().get( 1 ).asErasure();
 			}
 		}
-
-		return type.asErasure();
+		return erasure;
 	}
 
 	private final Implementation delegate;
@@ -319,56 +322,62 @@ private WrappingAppender(ByteCodeAppender delegate) {
 		public Size apply(
 				MethodVisitor methodVisitor, Context implementationContext, MethodDescription instrumentedMethod) {
 			return delegate.apply( new MethodVisitor( OpenedClassReader.ASM_API, methodVisitor ) {
-
 				@Override
 				public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
 					if ( owner.startsWith( Type.getInternalName( CodeTemplates.class ) ) ) {
-						if ( name.equals( "getter" ) ) {
-							super.visitTypeInsn( Opcodes.CHECKCAST, targetEntity.getInternalName() );
-							super.visitMethodInsn(
-									Opcodes.INVOKEVIRTUAL,
-									targetEntity.getInternalName(),
-									EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + bidirectionalAttributeName,
-									Type.getMethodDescriptor( Type.getType( targetType.getDescriptor() ) ),
-									false
-							);
-						}
-						else if ( name.equals( "getterSelf" ) ) {
-							super.visitVarInsn( Opcodes.ALOAD, 0 );
-							super.visitMethodInsn(
-									Opcodes.INVOKEVIRTUAL,
-									entity.getInternalName(),
-									EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + field.getName(),
-									Type.getMethodDescriptor( Type.getType( field.asDefined().getDescriptor() ) ),
-									false
-							);
-						}
-						else if ( name.equals( "setterSelf" ) ) {
-							super.visitInsn( Opcodes.POP );
-							super.visitTypeInsn( Opcodes.CHECKCAST, targetEntity.getInternalName() );
-							super.visitVarInsn( Opcodes.ALOAD, 0 );
-							super.visitMethodInsn(
-									Opcodes.INVOKEVIRTUAL,
-									targetEntity.getInternalName(),
-									EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + bidirectionalAttributeName,
-									Type.getMethodDescriptor( Type.getType( void.class ), Type.getType( targetType.getDescriptor() ) ),
-									false
-							);
-						}
-						else if ( name.equals( "setterNull" ) ) {
-							super.visitInsn( Opcodes.POP );
-							super.visitTypeInsn( Opcodes.CHECKCAST, targetEntity.getInternalName() );
-							super.visitInsn( Opcodes.ACONST_NULL );
-							super.visitMethodInsn(
-									Opcodes.INVOKEVIRTUAL,
-									targetEntity.getInternalName(),
-									EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + bidirectionalAttributeName,
-									Type.getMethodDescriptor( Type.getType( void.class ), Type.getType( targetType.getDescriptor() ) ),
-									false
-							);
-						}
-						else {
-							throw new EnhancementException( "Unknown template method: " + name );
+						final String targetEntityInternalName = targetEntity.getInternalName();
+						switch ( name ) {
+							case "getter" -> {
+								super.visitTypeInsn( Opcodes.CHECKCAST, targetEntityInternalName );
+								super.visitMethodInsn(
+										Opcodes.INVOKEVIRTUAL,
+										targetEntityInternalName,
+										EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX
+												+ bidirectionalAttributeName,
+										Type.getMethodDescriptor( Type.getType( targetType.getDescriptor() ) ),
+										false
+								);
+							}
+							case "getterSelf" -> {
+								super.visitVarInsn( Opcodes.ALOAD, 0 );
+								super.visitMethodInsn(
+										Opcodes.INVOKEVIRTUAL,
+										entity.getInternalName(),
+										EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX
+												+ field.getName(),
+										Type.getMethodDescriptor( Type.getType( field.asDefined().getDescriptor() ) ),
+										false
+								);
+							}
+							case "setterSelf" -> {
+								super.visitInsn( Opcodes.POP );
+								super.visitTypeInsn( Opcodes.CHECKCAST, targetEntityInternalName );
+								super.visitVarInsn( Opcodes.ALOAD, 0 );
+								super.visitMethodInsn(
+										Opcodes.INVOKEVIRTUAL,
+										targetEntityInternalName,
+										EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX
+												+ bidirectionalAttributeName,
+										Type.getMethodDescriptor( Type.getType( void.class ),
+												Type.getType( targetType.getDescriptor() ) ),
+										false
+								);
+							}
+							case "setterNull" -> {
+								super.visitInsn( Opcodes.POP );
+								super.visitTypeInsn( Opcodes.CHECKCAST, targetEntityInternalName );
+								super.visitInsn( Opcodes.ACONST_NULL );
+								super.visitMethodInsn(
+										Opcodes.INVOKEVIRTUAL,
+										targetEntityInternalName,
+										EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX
+												+ bidirectionalAttributeName,
+										Type.getMethodDescriptor( Type.getType( void.class ),
+												Type.getType( targetType.getDescriptor() ) ),
+										false
+								);
+							}
+							default -> throw new EnhancementException( "Unknown template method: " + name );
 						}
 					}
 					else {
@@ -380,18 +389,19 @@ else if ( name.equals( "setterNull" ) ) {
 	}
 
 	@Override
-	public boolean equals(final Object o) {
-		if (this == o) {
+	public boolean equals(final Object object) {
+		if (this == object) {
 			return true;
 		}
-		if ( o == null || BiDirectionalAssociationHandler.class != o.getClass() ) {
+		else if ( !(object instanceof BiDirectionalAssociationHandler that ) ) {
 			return false;
 		}
-		final BiDirectionalAssociationHandler that = (BiDirectionalAssociationHandler) o;
-		return Objects.equals( delegate, that.delegate ) &&
-			Objects.equals( targetEntity, that.targetEntity ) &&
-			Objects.equals( targetType, that.targetType ) &&
-			Objects.equals( bidirectionalAttributeName, that.bidirectionalAttributeName );
+		else {
+			return Objects.equals( this.delegate, that.delegate )
+				&& Objects.equals( this.targetEntity, that.targetEntity )
+				&& Objects.equals( this.targetType, that.targetType )
+				&& Objects.equals( this.bidirectionalAttributeName, that.bidirectionalAttributeName );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java
index b4827d3c5ca4..d6d3e8aaf06f 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java
@@ -11,6 +11,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription;
 import org.hibernate.bytecode.enhance.spi.EnhancementContext;
 
@@ -24,7 +25,9 @@
 import net.bytebuddy.pool.TypePool;
 import org.hibernate.bytecode.enhance.spi.UnsupportedEnhancementStrategy;
 
+import static java.lang.Character.toUpperCase;
 import static net.bytebuddy.matcher.ElementMatchers.isGetter;
+import static org.hibernate.bytecode.enhance.internal.bytebuddy.PersistentAttributeTransformer.collectPersistentFields;
 
 class ByteBuddyEnhancementContext {
 
@@ -102,52 +105,72 @@ public UnsupportedEnhancementStrategy getUnsupportedEnhancementStrategy() {
 	}
 
 	public void discoverCompositeTypes(TypeDescription managedCtClass, TypePool typePool) {
-		if ( isDiscoveredType( managedCtClass ) ) {
-			return;
+		if ( !isDiscoveredType( managedCtClass ) ) {
+			final var determinedPersistenceType = determinePersistenceType( managedCtClass );
+			registerDiscoveredType( managedCtClass, determinedPersistenceType );
+			if ( determinedPersistenceType != Type.PersistenceType.BASIC ) {
+				final var enhancedFields =
+						collectPersistentFields( managedCtClass, this, typePool, constants )
+								.getEnhancedFields();
+				for ( var enhancedField : enhancedFields ) {
+					final var type = enhancedField.getType().asErasure();
+					if ( !type.isInterface() && enhancedField.hasAnnotation( Embedded.class ) ) {
+						registerDiscoveredType( type, Type.PersistenceType.EMBEDDABLE );
+					}
+					discoverCompositeTypes( type, typePool );
+				}
+			}
 		}
-		final Type.PersistenceType determinedPersistenceType;
+	}
+
+	private Type.PersistenceType determinePersistenceType(TypeDescription managedCtClass) {
 		if ( isEntityClass( managedCtClass ) ) {
-			determinedPersistenceType = Type.PersistenceType.ENTITY;
+			return Type.PersistenceType.ENTITY;
 		}
 		else if ( isCompositeClass( managedCtClass ) ) {
-			determinedPersistenceType = Type.PersistenceType.EMBEDDABLE;
+			return Type.PersistenceType.EMBEDDABLE;
 		}
 		else if ( isMappedSuperclassClass( managedCtClass ) ) {
-			determinedPersistenceType = Type.PersistenceType.MAPPED_SUPERCLASS;
+			return Type.PersistenceType.MAPPED_SUPERCLASS;
 		}
 		else {
 			// Default to assuming a basic type if this is not a managed type
-			determinedPersistenceType = Type.PersistenceType.BASIC;
-		}
-		registerDiscoveredType( managedCtClass, determinedPersistenceType );
-		if ( determinedPersistenceType != Type.PersistenceType.BASIC ) {
-			final EnhancerImpl.AnnotatedFieldDescription[] enhancedFields = PersistentAttributeTransformer.collectPersistentFields(
-							managedCtClass,
-							this,
-							typePool,
-							constants
-					)
-					.getEnhancedFields();
-			for ( EnhancerImpl.AnnotatedFieldDescription enhancedField : enhancedFields ) {
-				final TypeDescription type = enhancedField.getType().asErasure();
-				if ( !type.isInterface() && enhancedField.hasAnnotation( Embedded.class ) ) {
-					registerDiscoveredType( type, Type.PersistenceType.EMBEDDABLE );
-				}
-				discoverCompositeTypes( type, typePool );
-			}
+			return Type.PersistenceType.BASIC;
 		}
 	}
 
 	Optional<MethodDescription> resolveGetter(FieldDescription fieldDescription) {
 		//There is a non-straightforward cache here, but we really need this to be able to
 		//efficiently handle enhancement of large models.
+		var getters = getGetters( fieldDescription.getDeclaringType().asErasure() );
+
+		final String capitalizedFieldName =
+				toUpperCase( fieldDescription.getName().charAt( 0 ) )
+				+ fieldDescription.getName().substring( 1 );
 
-		final TypeDescription erasure = fieldDescription.getDeclaringType().asErasure();
+		final var getCandidate = getters.get( "get" + capitalizedFieldName );
+		final var isCandidate = getters.get( "is" + capitalizedFieldName );
 
+		if ( getCandidate != null ) {
+			if ( isCandidate != null ) {
+				// if there are two candidates, the existing code considered there was no getter;
+				// not sure it's such a good idea, but throwing an exception apparently throws
+				// exception in cases where Hibernate does not usually produce a mapping error.
+				return Optional.empty();
+			}
+			else {
+				return Optional.of( getCandidate );
+			}
+		}
+		else {
+			return Optional.ofNullable( isCandidate );
+		}
+	}
+
+	private @NonNull Map<String, MethodDescription> getGetters(TypeDescription erasure) {
 		//Always try to get with a simple "get" before doing a "computeIfAbsent" operation,
 		//otherwise large models might exhibit significant contention on the map.
-		Map<String, MethodDescription> getters = getterByTypeMap.get( erasure );
-
+		var getters = getterByTypeMap.get( erasure );
 		if ( getters == null ) {
 			//poor man lock striping: as CHM#computeIfAbsent has too coarse lock granularity
 			//and has been shown to trigger significant, unnecessary contention.
@@ -155,7 +178,7 @@ Optional<MethodDescription> resolveGetter(FieldDescription fieldDescription) {
 			final Object candidateLock = new Object();
 			final Object existingLock = locksMap.putIfAbsent( lockKey, candidateLock );
 			final Object lock = existingLock == null ? candidateLock : existingLock;
-			synchronized ( lock ) {
+			synchronized (lock) {
 				getters = getterByTypeMap.get( erasure );
 				if ( getters == null ) {
 					getters = MethodGraph.Compiler.DEFAULT.compile( erasure )
@@ -168,24 +191,6 @@ Optional<MethodDescription> resolveGetter(FieldDescription fieldDescription) {
 				}
 			}
 		}
-
-		String capitalizedFieldName = Character.toUpperCase( fieldDescription.getName().charAt( 0 ) )
-				+ fieldDescription.getName().substring( 1 );
-
-		MethodDescription getCandidate = getters.get( "get" + capitalizedFieldName );
-		MethodDescription isCandidate = getters.get( "is" + capitalizedFieldName );
-
-		if ( getCandidate != null ) {
-			if ( isCandidate != null ) {
-				// if there are two candidates, the existing code considered there was no getter.
-				// not sure it's such a good idea but throwing an exception apparently throws exception
-				// in cases where Hibernate does not usually throw a mapping error.
-				return Optional.empty();
-			}
-
-			return Optional.of( getCandidate );
-		}
-
-		return Optional.ofNullable( isCandidate );
+		return getters;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreCacheProvider.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreCacheProvider.java
index 5123b12f023d..3c0b351e71f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreCacheProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreCacheProvider.java
@@ -46,12 +46,10 @@ public TypePool.Resolution find(final String name) {
 	 */
 	@Override
 	public TypePool.Resolution register(String name, TypePool.Resolution resolution) {
-		//Ensure we DO NOT cache anything from a non-core namespace, to not leak application specific code:
+		//Ensure we DO NOT cache anything from a non-core namespace to not leak application-specific code:
 		if ( acceptedPrefixes.isCoreClassName( name ) ) {
-			TypePool.Resolution cached = storage.putIfAbsent( name, resolution );
-			return cached == null
-					? resolution
-					: cached;
+			final var cached = storage.putIfAbsent( name, resolution );
+			return cached == null ? resolution : cached;
 		}
 		else {
 			return resolution;
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CorePrefixFilter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CorePrefixFilter.java
index c66a99a99a6e..ca48f5f78fab 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CorePrefixFilter.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CorePrefixFilter.java
@@ -35,8 +35,14 @@ public final class CorePrefixFilter {
 	 * Do not invoke: use DEFAULT_INSTANCE
 	 */
 	CorePrefixFilter() {
-		//By default optimise for jakarta annotations, java util collections, and Hibernate marker interfaces
-		this("jakarta.", "java.", "org.hibernate.annotations.", "org.hibernate.bytecode.enhance.spi.", "org.hibernate.engine.spi.");
+		// By default, optimize for Jakarta annotations,
+		// java util collections,
+		// and Hibernate marker interfaces
+		this("jakarta.",
+				"java.",
+				"org.hibernate.annotations.",
+				"org.hibernate.bytecode.enhance.spi.",
+				"org.hibernate.engine.spi.");
 	}
 
 	public CorePrefixFilter(final String... acceptedPrefixes) {
@@ -44,7 +50,7 @@ public CorePrefixFilter(final String... acceptedPrefixes) {
 	}
 
 	public boolean isCoreClassName(final String name) {
-		for ( String acceptedPrefix : this.acceptedPrefixes ) {
+		for ( String acceptedPrefix : acceptedPrefixes ) {
 			if ( name.startsWith( acceptedPrefix ) ) {
 				return true;
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreTypePool.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreTypePool.java
index 7f71d4faf9d7..8dd0daf55529 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreTypePool.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CoreTypePool.java
@@ -49,7 +49,7 @@ public CoreTypePool(final String... acceptedPrefixes) {
 	}
 
 	public CoreTypePool(CorePrefixFilter acceptedPrefixes) {
-		//While we implement a cache in this class we also want to enable
+		//While we implement a cache in this class, we also want to enable
 		//ByteBuddy's default caching mechanism as it will cache the more
 		//useful output of the parsing and introspection of such types.
 		super( new CoreCacheProvider( acceptedPrefixes ) );
@@ -59,14 +59,14 @@ public CoreTypePool(CorePrefixFilter acceptedPrefixes) {
 	@Override
 	protected Resolution doDescribe(final String name) {
 		if ( acceptedPrefixes.isCoreClassName( name ) ) {
-			final Resolution resolution = resolutions.get( name );
+			final var resolution = resolutions.get( name );
 			if ( resolution != null ) {
 				return resolution;
 			}
 			else {
-				//We implement this additional layer of caching, which is on top of
-				//ByteBuddy's default caching, so as to prevent resolving the same
-				//types concurrently from the classloader.
+				//We implement this additional layer of caching, over ByteBuddy's
+				//built-in caching, to prevent resolving the same types concurrently
+				//from the classloader.
 				//This is merely an efficiency improvement and will NOT provide a
 				//strict guarantee of symbols being resolved exactly once as there
 				//is no SPI within ByteBuddy which would allow this: the point is to
@@ -83,8 +83,8 @@ protected Resolution doDescribe(final String name) {
 
 	private Resolution actualResolve(final String name) {
 		try {
-			final Class<?> aClass = Class.forName( name, false, hibernateClassLoader );
-			return new TypePool.Resolution.Simple( TypeDescription.ForLoadedType.of( aClass ) );
+			return new TypePool.Resolution.Simple( TypeDescription.ForLoadedType.of(
+					Class.forName( name, false, hibernateClassLoader ) ) );
 		}
 		catch ( ClassNotFoundException e ) {
 			return new Resolution.Illegal( name );
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerCacheProvider.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerCacheProvider.java
index 6a1d2cb1082b..e05b4aeedac7 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerCacheProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerCacheProvider.java
@@ -16,11 +16,10 @@ final class EnhancerCacheProvider extends TypePool.CacheProvider.Simple {
 
 	@Override
 	public TypePool.Resolution find(final String name) {
-		final EnhancementState enhancementState = getEnhancementState();
-		if ( enhancementState != null && enhancementState.getClassName().equals( name ) ) {
-			return enhancementState.getTypePoolResolution();
-		}
-		return super.find( name );
+		final var enhancementState = getEnhancementState();
+		return enhancementState != null && enhancementState.getClassName().equals( name )
+				? enhancementState.getTypePoolResolution()
+				: super.find( name );
 	}
 
 	EnhancementState getEnhancementState() {
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerClassFileLocator.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerClassFileLocator.java
index b3803f9c940d..1e2dcd8e6fca 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerClassFileLocator.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerClassFileLocator.java
@@ -23,11 +23,10 @@ public EnhancerClassFileLocator(EnhancerCacheProvider cacheProvider, ClassFileLo
 
 	@Override
 	public Resolution locate(final String name) throws IOException {
-		final EnhancerCacheProvider.EnhancementState enhancementState = cacheProvider.getEnhancementState();
-		if ( enhancementState != null && enhancementState.getClassName().equals( name ) ) {
-			return enhancementState.getClassFileResolution();
-		}
-		return delegate.locate( name );
+		final var enhancementState = cacheProvider.getEnhancementState();
+		return enhancementState != null && enhancementState.getClassName().equals( name )
+				? enhancementState.getClassFileResolution()
+				: delegate.locate( name );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
index 99508db43d38..86895366d72f 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java
@@ -30,6 +30,7 @@
 import net.bytebuddy.implementation.FixedValue;
 import net.bytebuddy.implementation.Implementation;
 import net.bytebuddy.implementation.StubMethod;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.AssertionFailure;
 import org.hibernate.Version;
@@ -43,14 +44,11 @@
 import org.hibernate.bytecode.enhance.spi.UnsupportedEnhancementStrategy;
 import org.hibernate.bytecode.internal.bytebuddy.ByteBuddyState;
 import org.hibernate.engine.spi.CompositeOwner;
-import org.hibernate.engine.spi.ExtendedSelfDirtinessTracker;
 import org.hibernate.engine.spi.Managed;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -58,18 +56,43 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
+import static java.lang.Character.isUpperCase;
+import static java.lang.Character.toLowerCase;
+import static java.lang.reflect.Modifier.isStatic;
+import static java.util.Collections.emptyList;
+import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.isGetter;
 import static net.bytebuddy.matcher.ElementMatchers.isSetter;
 import static net.bytebuddy.matcher.ElementMatchers.isStatic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.not;
+import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 import static org.hibernate.bytecode.enhance.internal.BytecodeEnhancementLogging.ENHANCEMENT_LOGGER;
 import static org.hibernate.bytecode.enhance.internal.bytebuddy.FeatureMismatchException.Feature.ASSOCIATION_MANAGEMENT;
 import static org.hibernate.bytecode.enhance.internal.bytebuddy.FeatureMismatchException.Feature.DIRTY_CHECK;
+import static org.hibernate.bytecode.enhance.internal.bytebuddy.ModelTypePool.buildModelTypePool;
+import static org.hibernate.bytecode.enhance.internal.bytebuddy.PersistentAttributeTransformer.collectPersistentFields;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.ENTITY_INSTANCE_GETTER_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.PERSISTENCE_INFO_SETTER_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_CHANGER_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_CLEAR_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_COLLECTION_CHANGED_FIELD_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_COLLECTION_CHANGED_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_COLLECTION_CLEAR_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_COLLECTION_GET_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_COLLECTION_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_COMPOSITE_CLEAR_OWNER;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_COMPOSITE_FIELD_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_COMPOSITE_SET_OWNER;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_FIELD_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_GET_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_HAS_CHANGED_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_SUSPEND_NAME;
+import static org.hibernate.engine.spi.ExtendedSelfDirtinessTracker.REMOVE_DIRTY_FIELDS_NAME;
 
 public class EnhancerImpl implements Enhancer {
 
-	protected final ByteBuddyEnhancementContext enhancementContext;
+	final ByteBuddyEnhancementContext enhancementContext;
 	private final ByteBuddyState byteBuddyState;
 	private final EnhancerClassLocator typePool;
 	private final EnhancerImplConstants constants;
@@ -82,24 +105,29 @@ public class EnhancerImpl implements Enhancer {
 	 * to contextual/environmental information.
 	 * @param byteBuddyState refers to the ByteBuddy instance to use
 	 */
-	public EnhancerImpl(final EnhancementContext enhancementContext, final ByteBuddyState byteBuddyState) {
-		this( enhancementContext, byteBuddyState, ModelTypePool.buildModelTypePool( enhancementContext.getLoadingClassLoader() ) );
+	public EnhancerImpl(
+			final EnhancementContext enhancementContext,
+			final ByteBuddyState byteBuddyState) {
+		this( enhancementContext, byteBuddyState,
+				buildModelTypePool( enhancementContext.getLoadingClassLoader() ) );
 	}
 
 	/**
 	 * Expert level constructor, this allows for more control of state and bytecode loading,
 	 * which allows integrators to optimise for particular contexts of use.
-	 * @param enhancementContext
-	 * @param byteBuddyState
-	 * @param classLocator
 	 */
-	public EnhancerImpl(final EnhancementContext enhancementContext, final ByteBuddyState byteBuddyState, final EnhancerClassLocator classLocator) {
-		this.enhancementContext = new ByteBuddyEnhancementContext( enhancementContext, byteBuddyState.getEnhancerConstants() );
+	public EnhancerImpl(
+			final EnhancementContext enhancementContext,
+			final ByteBuddyState byteBuddyState,
+			final EnhancerClassLocator classLocator) {
+		this.enhancementContext =
+				new ByteBuddyEnhancementContext( enhancementContext, byteBuddyState.getEnhancerConstants() );
 		this.byteBuddyState = Objects.requireNonNull( byteBuddyState );
 		this.typePool = Objects.requireNonNull( classLocator );
 		this.constants = byteBuddyState.getEnhancerConstants();
 
-		this.infoAnnotationList = new AnnotationList.ForLoadedAnnotations( List.of( createInfoAnnotation( enhancementContext ) ) );
+		this.infoAnnotationList =
+				new AnnotationList.ForLoadedAnnotations( List.of( createInfoAnnotation( enhancementContext ) ) );
 	}
 
 
@@ -120,14 +148,13 @@ public byte[] enhance(String className, byte[] originalBytes) throws Enhancement
 		final String safeClassName = className.replace( '/', '.' );
 		typePool.registerClassNameAndBytes( safeClassName, originalBytes );
 		try {
-			final TypeDescription typeDescription = typePool.describe( safeClassName ).resolve();
-
-			return byteBuddyState.rewrite( typePool, safeClassName, byteBuddy -> doEnhance(
-					() -> byteBuddy.ignore( constants.defaultFinalizer() )
-							.redefine( typeDescription, typePool.asClassFileLocator() )
-							.annotateType( infoAnnotationList ),
-					typeDescription
-			) );
+			final var typeDescription = typePool.describe( safeClassName ).resolve();
+			return byteBuddyState.rewrite( typePool, safeClassName, byteBuddy ->
+					doEnhance( () -> byteBuddy.ignore( constants.defaultFinalizer() )
+									.redefine( typeDescription, typePool.asClassFileLocator() )
+									.annotateType( infoAnnotationList ),
+							typeDescription
+					) );
 		}
 		catch (EnhancementException e) {
 			throw e;
@@ -146,7 +173,7 @@ public void discoverTypes(String className, byte[] originalBytes) {
 			typePool.registerClassNameAndBytes( className, originalBytes );
 		}
 		try {
-			final TypeDescription typeDescription = typePool.describe( className ).resolve();
+			final var typeDescription = typePool.describe( className ).resolve();
 			enhancementContext.registerDiscoveredType( typeDescription, Type.PersistenceType.ENTITY );
 			enhancementContext.discoverCompositeTypes( typeDescription, typePool );
 		}
@@ -158,261 +185,67 @@ public void discoverTypes(String className, byte[] originalBytes) {
 		}
 	}
 
-	private DynamicType.Builder<?> doEnhance(Supplier<DynamicType.Builder<?>> builderSupplier, TypeDescription managedCtClass) {
+	private DynamicType.Builder<?> doEnhance(
+			Supplier<DynamicType.Builder<?>> builderSupplier,
+			TypeDescription managedCtClass) {
 		if ( alreadyEnhanced( managedCtClass ) ) {
-			// the class already implements `Managed`.  there are 2 broad cases -
+			// The class already implements `Managed`.
+			// There are 2 broad cases:
 			//		1. the user manually implemented `Managed`
 			//		2. the class was previously enhanced
-			// in either case, look for `@EnhancementInfo` and, if found, verify we can "re-enhance" the class
-			final AnnotationDescription.Loadable<EnhancementInfo> infoAnnotation = managedCtClass.getDeclaredAnnotations().ofType( EnhancementInfo.class );
+			// In either case, look for `@EnhancementInfo` and,
+			// if found, verify we can "re-enhance" the class
+			final var infoAnnotation =
+					managedCtClass.getDeclaredAnnotations()
+							.ofType( EnhancementInfo.class );
 			if ( infoAnnotation != null ) {
 				// throws an exception if there is a mismatch...
 				verifyReEnhancement( managedCtClass, infoAnnotation.load(), enhancementContext );
 			}
-			// verification succeeded (or not done) - we can simply skip the enhancement
+			// Verification succeeded (or not done)
+			// We can simply skip the enhancement
 			ENHANCEMENT_LOGGER.skippingAlreadyAnnotated( managedCtClass.getName() );
 			return null;
 		}
-
 		// can't effectively enhance interfaces
-		if ( managedCtClass.isInterface() ) {
+		else if ( managedCtClass.isInterface() ) {
 			ENHANCEMENT_LOGGER.skippingInterface( managedCtClass.getName() );
 			return null;
 		}
-
 		// can't effectively enhance records
-		if ( managedCtClass.isRecord() ) {
+		else if ( managedCtClass.isRecord() ) {
 			ENHANCEMENT_LOGGER.skippingRecord( managedCtClass.getName() );
 			return null;
 		}
-
-		if ( enhancementContext.isEntityClass( managedCtClass ) ) {
-			if ( checkUnsupportedAttributeNaming( managedCtClass, enhancementContext ) ) {
+		else if ( enhancementContext.isEntityClass( managedCtClass ) ) {
+			if ( checkUnderlyingFields( managedCtClass, enhancementContext ) ) {
 				// do not enhance classes with mismatched names for PROPERTY-access persistent attributes
 				return null;
 			}
-
-			ENHANCEMENT_LOGGER.enhancingAsEntity( managedCtClass.getName() );
-			DynamicType.Builder<?> builder = builderSupplier.get();
-			builder = builder
-					.implement( constants.INTERFACES_for_ManagedEntity )
-					.defineMethod( EnhancerConstants.ENTITY_INSTANCE_GETTER_NAME, constants.TypeObject, constants.modifierPUBLIC )
-					.intercept( FixedValue.self() );
-
-			builder = addFieldWithGetterAndSetter(
-					builder,
-					constants.TypeEntityEntry,
-					EnhancerConstants.ENTITY_ENTRY_FIELD_NAME,
-					EnhancerConstants.ENTITY_ENTRY_GETTER_NAME,
-					EnhancerConstants.ENTITY_ENTRY_SETTER_NAME
-			);
-			builder = addFieldWithGetterAndSetter(
-					builder,
-					constants.TypeManagedEntity,
-					EnhancerConstants.PREVIOUS_FIELD_NAME,
-					EnhancerConstants.PREVIOUS_GETTER_NAME,
-					EnhancerConstants.PREVIOUS_SETTER_NAME
-			);
-			builder = addFieldWithGetterAndSetter(
-					builder,
-					constants.TypeManagedEntity,
-					EnhancerConstants.NEXT_FIELD_NAME,
-					EnhancerConstants.NEXT_GETTER_NAME,
-					EnhancerConstants.NEXT_SETTER_NAME
-			);
-
-			builder = addFieldWithGetterAndSetter(
-					builder,
-					constants.TypeBooleanPrimitive,
-					EnhancerConstants.USE_TRACKER_FIELD_NAME,
-					EnhancerConstants.USE_TRACKER_GETTER_NAME,
-					EnhancerConstants.USE_TRACKER_SETTER_NAME
-			);
-
-			builder = addFieldWithGetterAndSetter(
-					builder,
-					constants.TypeIntegerPrimitive,
-					EnhancerConstants.INSTANCE_ID_FIELD_NAME,
-					EnhancerConstants.INSTANCE_ID_GETTER_NAME,
-					EnhancerConstants.INSTANCE_ID_SETTER_NAME
-			);
-
-			builder = addSetPersistenceInfoMethod(
-					builder,
-					constants.TypeEntityEntry,
-					constants.TypeManagedEntity,
-					constants.TypeIntegerPrimitive
-			);
-
-			builder = addInterceptorHandling( builder, managedCtClass );
-
-			if ( enhancementContext.doDirtyCheckingInline() ) {
-				List<AnnotatedFieldDescription> collectionFields = collectCollectionFields( managedCtClass );
-
-				if ( collectionFields.isEmpty() ) {
-					builder = builder.implement( constants.INTERFACES_for_SelfDirtinessTracker )
-							.defineField( EnhancerConstants.TRACKER_FIELD_NAME, constants.DirtyTrackerTypeDescription, constants.modifierPRIVATE_TRANSIENT )
-									.annotateField( constants.TRANSIENT_ANNOTATION )
-							.defineMethod( EnhancerConstants.TRACKER_CHANGER_NAME, constants.TypeVoid, constants.modifierPUBLIC )
-									.withParameter( constants.TypeString )
-									.intercept( constants.implementationTrackChange )
-							.defineMethod( EnhancerConstants.TRACKER_GET_NAME, constants.Type_Array_String, constants.modifierPUBLIC )
-									.intercept( constants.implementationGetDirtyAttributesWithoutCollections )
-							.defineMethod( EnhancerConstants.TRACKER_HAS_CHANGED_NAME, constants.TypeBooleanPrimitive, constants.modifierPUBLIC )
-									.intercept( constants.implementationAreFieldsDirtyWithoutCollections )
-							.defineMethod( EnhancerConstants.TRACKER_CLEAR_NAME, constants.TypeVoid, constants.modifierPUBLIC )
-									.intercept( constants.implementationClearDirtyAttributesWithoutCollections )
-							.defineMethod( EnhancerConstants.TRACKER_SUSPEND_NAME, constants.TypeVoid, constants.modifierPUBLIC )
-									.withParameter( constants.TypeBooleanPrimitive )
-									.intercept( constants.implementationSuspendDirtyTracking )
-							.defineMethod( EnhancerConstants.TRACKER_COLLECTION_GET_NAME, constants.TypeCollectionTracker, constants.modifierPUBLIC )
-									.intercept( constants.implementationGetCollectionTrackerWithoutCollections );
-				}
-				else {
-					//TODO es.enableInterfaceExtendedSelfDirtinessTracker ? Careful with consequences..
-					builder = builder.implement( constants.INTERFACES_for_ExtendedSelfDirtinessTracker )
-							.defineField( EnhancerConstants.TRACKER_FIELD_NAME, constants.DirtyTrackerTypeDescription, constants.modifierPRIVATE_TRANSIENT )
-									.annotateField( constants.TRANSIENT_ANNOTATION )
-							.defineField( EnhancerConstants.TRACKER_COLLECTION_NAME, constants.TypeCollectionTracker, constants.modifierPRIVATE_TRANSIENT )
-									.annotateField( constants.TRANSIENT_ANNOTATION )
-							.defineMethod( EnhancerConstants.TRACKER_CHANGER_NAME, constants.TypeVoid, constants.modifierPUBLIC )
-									.withParameter( constants.TypeString )
-									.intercept( constants.implementationTrackChange )
-							.defineMethod( EnhancerConstants.TRACKER_GET_NAME, constants.Type_Array_String, constants.modifierPUBLIC )
-									.intercept( constants.implementationGetDirtyAttributes )
-							.defineMethod( EnhancerConstants.TRACKER_HAS_CHANGED_NAME, constants.TypeBooleanPrimitive, constants.modifierPUBLIC )
-									.intercept( constants.implementationAreFieldsDirty )
-							.defineMethod( EnhancerConstants.TRACKER_CLEAR_NAME, constants.TypeVoid, constants.modifierPUBLIC )
-									.intercept( constants.implementationClearDirtyAttributes )
-							.defineMethod( EnhancerConstants.TRACKER_SUSPEND_NAME, constants.TypeVoid, constants.modifierPUBLIC )
-									.withParameter( constants.TypeBooleanPrimitive )
-									.intercept( constants.implementationSuspendDirtyTracking )
-							.defineMethod( EnhancerConstants.TRACKER_COLLECTION_GET_NAME, constants.TypeCollectionTracker, constants.modifierPUBLIC )
-									.intercept( FieldAccessor.ofField( EnhancerConstants.TRACKER_COLLECTION_NAME ) );
-
-					Implementation isDirty = StubMethod.INSTANCE, getDirtyNames = StubMethod.INSTANCE, clearDirtyNames = StubMethod.INSTANCE;
-					for ( AnnotatedFieldDescription collectionField : collectionFields ) {
-						String collectionFieldName = collectionField.getName();
-						Class adviceIsDirty;
-						Class adviceGetDirtyNames;
-						Class adviceClearDirtyNames;
-						if ( collectionField.getType().asErasure().isAssignableTo( Map.class ) ) {
-							adviceIsDirty = CodeTemplates.MapAreCollectionFieldsDirty.class;
-							adviceGetDirtyNames = CodeTemplates.MapGetCollectionFieldDirtyNames.class;
-							adviceClearDirtyNames = CodeTemplates.MapGetCollectionClearDirtyNames.class;
-						}
-						else {
-							adviceIsDirty = CodeTemplates.CollectionAreCollectionFieldsDirty.class;
-							adviceGetDirtyNames = CodeTemplates.CollectionGetCollectionFieldDirtyNames.class;
-							adviceClearDirtyNames = CodeTemplates.CollectionGetCollectionClearDirtyNames.class;
-						}
-						if ( collectionField.isVisibleTo( managedCtClass ) ) {
-							FieldDescription fieldDescription = collectionField.getFieldDescription();
-							isDirty = Advice.withCustomMapping()
-									.bind( CodeTemplates.FieldName.class, collectionFieldName )
-									.bind( CodeTemplates.FieldValue.class, fieldDescription )
-									.to( adviceIsDirty, constants.adviceLocator )
-									.wrap( isDirty );
-							getDirtyNames = Advice.withCustomMapping()
-									.bind( CodeTemplates.FieldName.class, collectionFieldName )
-									.bind( CodeTemplates.FieldValue.class, fieldDescription )
-									.to( adviceGetDirtyNames, constants.adviceLocator )
-									.wrap( getDirtyNames );
-							clearDirtyNames = Advice.withCustomMapping()
-									.bind( CodeTemplates.FieldName.class, collectionFieldName )
-									.bind( CodeTemplates.FieldValue.class, fieldDescription )
-									.to( adviceClearDirtyNames, constants.adviceLocator )
-									.wrap( clearDirtyNames );
-						}
-						else {
-							CodeTemplates.GetterMapping getterMapping = new CodeTemplates.GetterMapping(
-									collectionField.getFieldDescription() );
-							isDirty = Advice.withCustomMapping()
-									.bind( CodeTemplates.FieldName.class, collectionFieldName )
-									.bind( CodeTemplates.FieldValue.class, getterMapping )
-									.to( adviceIsDirty, constants.adviceLocator )
-									.wrap( isDirty );
-							getDirtyNames = Advice.withCustomMapping()
-									.bind( CodeTemplates.FieldName.class, collectionFieldName )
-									.bind( CodeTemplates.FieldValue.class, getterMapping )
-									.to( adviceGetDirtyNames, constants.adviceLocator )
-									.wrap( getDirtyNames );
-							clearDirtyNames = Advice.withCustomMapping()
-									.bind( CodeTemplates.FieldName.class, collectionFieldName )
-									.bind( CodeTemplates.FieldValue.class, getterMapping )
-									.to( adviceClearDirtyNames, constants.adviceLocator )
-									.wrap( clearDirtyNames );
-						}
-					}
-
-					if ( enhancementContext.hasLazyLoadableAttributes( managedCtClass ) ) {
-						clearDirtyNames = constants.adviceInitializeLazyAttributeLoadingInterceptor.wrap( clearDirtyNames );
-					}
-
-					builder = builder.defineMethod( EnhancerConstants.TRACKER_COLLECTION_CHANGED_NAME, constants.TypeBooleanPrimitive, constants.modifierPUBLIC )
-							.intercept( isDirty )
-							.defineMethod( EnhancerConstants.TRACKER_COLLECTION_CHANGED_FIELD_NAME, constants.TypeVoid, constants.modifierPUBLIC )
-									.withParameter( constants.DirtyTrackerTypeDescription )
-									.intercept( getDirtyNames )
-							.defineMethod( EnhancerConstants.TRACKER_COLLECTION_CLEAR_NAME, constants.TypeVoid, constants.modifierPUBLIC )
-									.intercept( Advice.withCustomMapping()
-									.to( CodeTemplates.ClearDirtyCollectionNames.class, constants.adviceLocator )
-									.wrap( StubMethod.INSTANCE ) )
-							.defineMethod( ExtendedSelfDirtinessTracker.REMOVE_DIRTY_FIELDS_NAME, constants.TypeVoid, constants.modifierPUBLIC )
-									.withParameter( constants.TypeLazyAttributeLoadingInterceptor )
-									.intercept( clearDirtyNames );
-				}
+			else {
+				return createTransformer( managedCtClass )
+						.applyTo( enhanceEntity( addDefaultConstructor( builderSupplier.get(), managedCtClass ), managedCtClass ) );
 			}
-
-			return createTransformer( managedCtClass ).applyTo( builder );
 		}
 		else if ( enhancementContext.isCompositeClass( managedCtClass ) ) {
-			if ( checkUnsupportedAttributeNaming( managedCtClass, enhancementContext ) ) {
+			if ( checkUnderlyingFields( managedCtClass, enhancementContext ) ) {
 				// do not enhance classes with mismatched names for PROPERTY-access persistent attributes
 				return null;
 			}
-
-			ENHANCEMENT_LOGGER.enhancingAsComposite( managedCtClass.getName() );
-
-			DynamicType.Builder<?> builder = builderSupplier.get();
-			builder = builder.implement( constants.INTERFACES_for_ManagedComposite );
-			builder = addInterceptorHandling( builder, managedCtClass );
-
-			if ( enhancementContext.doDirtyCheckingInline() ) {
-				builder = builder.implement( constants.INTERFACES_for_CompositeTracker )
-						.defineField(
-								EnhancerConstants.TRACKER_COMPOSITE_FIELD_NAME,
-								constants.TypeCompositeOwnerTracker,
-								constants.modifierPRIVATE_TRANSIENT
-						)
-								.annotateField( constants.TRANSIENT_ANNOTATION )
-						.defineMethod(
-								EnhancerConstants.TRACKER_COMPOSITE_SET_OWNER,
-								constants.TypeVoid,
-								constants.modifierPUBLIC
-						)
-								.withParameters( String.class, CompositeOwner.class )
-								.intercept( constants.implementationSetOwner )
-						.defineMethod(
-								EnhancerConstants.TRACKER_COMPOSITE_CLEAR_OWNER,
-								constants.TypeVoid,
-								constants.modifierPUBLIC
-						)
-								.withParameter( constants.TypeString )
-								.intercept( constants.implementationClearOwner );
+			else {
+				return createTransformer( managedCtClass )
+						.applyTo( enhanceEmbeddable( addDefaultConstructor( builderSupplier.get(), managedCtClass ), managedCtClass ) );
 			}
-
-			return createTransformer( managedCtClass ).applyTo( builder );
 		}
 		else if ( enhancementContext.isMappedSuperclassClass( managedCtClass ) ) {
 			// Check for HHH-16572 (PROPERTY attributes with mismatched field and method names)
-			if ( checkUnsupportedAttributeNaming( managedCtClass, enhancementContext ) ) {
+			if ( checkUnderlyingFields( managedCtClass, enhancementContext ) ) {
 				return null;
 			}
 			else {
 				ENHANCEMENT_LOGGER.enhancingAsMappedSuperclass( managedCtClass.getName() );
-				DynamicType.Builder<?> builder = builderSupplier.get();
-				builder.implement( constants.INTERFACES_for_ManagedMappedSuperclass );
+				final var builder = addDefaultConstructor( builderSupplier.get(), managedCtClass )
+						.implement( constants.INTERFACES_for_ManagedMappedSuperclass );
 				return createTransformer( managedCtClass ).applyTo( builder );
 			}
 		}
@@ -426,6 +259,250 @@ else if ( enhancementContext.doExtendedEnhancement() ) {
 		}
 	}
 
+	private boolean hasDefaultConstructor(TypeDescription typeDescription) {
+		return !typeDescription.getDeclaredMethods()
+				.filter( isConstructor().and( takesArguments( 0 ) ) )
+				.isEmpty();
+	}
+
+	private DynamicType.Builder<?> addDefaultConstructor(DynamicType.Builder<?> builder, TypeDescription typeDescription) {
+		if ( !hasDefaultConstructor( typeDescription ) ) {
+			return builder.defineConstructor( constants.modifierPUBLIC )
+					.intercept( constants.implementationDefaultConstructor );
+		}
+		return builder;
+	}
+
+	private DynamicType.Builder<?> enhanceEmbeddable(
+			DynamicType.Builder<?> builder,
+			TypeDescription embeddableClass) {
+		ENHANCEMENT_LOGGER.enhancingAsComposite( embeddableClass.getName() );
+
+		builder = builder.implement( constants.INTERFACES_for_ManagedComposite );
+		builder = addInterceptorHandling( builder, embeddableClass );
+
+		if ( enhancementContext.doDirtyCheckingInline() ) {
+			return builder.implement( constants.INTERFACES_for_CompositeTracker )
+					.defineField(
+							TRACKER_COMPOSITE_FIELD_NAME,
+							constants.TypeCompositeOwnerTracker,
+							constants.modifierPRIVATE_TRANSIENT
+					)
+							.annotateField( constants.TRANSIENT_ANNOTATION )
+					.defineMethod(
+							TRACKER_COMPOSITE_SET_OWNER,
+							constants.TypeVoid,
+							constants.modifierPUBLIC
+					)
+							.withParameters( String.class, CompositeOwner.class )
+							.intercept( constants.implementationSetOwner )
+					.defineMethod(
+							TRACKER_COMPOSITE_CLEAR_OWNER,
+							constants.TypeVoid,
+							constants.modifierPUBLIC
+					)
+							.withParameter( constants.TypeString )
+							.intercept( constants.implementationClearOwner );
+		}
+		else {
+			return builder;
+		}
+	}
+
+	private DynamicType.Builder<?> enhanceEntity(
+			DynamicType.Builder<?> builder,
+			TypeDescription entityClass) {
+		ENHANCEMENT_LOGGER.enhancingAsEntity( entityClass.getName() );
+
+		builder = builder
+				.implement( constants.INTERFACES_for_ManagedEntity )
+				.defineMethod( ENTITY_INSTANCE_GETTER_NAME, constants.TypeObject, constants.modifierPUBLIC )
+				.intercept( FixedValue.self() );
+
+		builder = addFieldWithGetterAndSetter(
+				builder,
+				constants.TypeEntityEntry,
+				EnhancerConstants.ENTITY_ENTRY_FIELD_NAME,
+				EnhancerConstants.ENTITY_ENTRY_GETTER_NAME,
+				EnhancerConstants.ENTITY_ENTRY_SETTER_NAME
+		);
+		builder = addFieldWithGetterAndSetter(
+				builder,
+				constants.TypeManagedEntity,
+				EnhancerConstants.PREVIOUS_FIELD_NAME,
+				EnhancerConstants.PREVIOUS_GETTER_NAME,
+				EnhancerConstants.PREVIOUS_SETTER_NAME
+		);
+		builder = addFieldWithGetterAndSetter(
+				builder,
+				constants.TypeManagedEntity,
+				EnhancerConstants.NEXT_FIELD_NAME,
+				EnhancerConstants.NEXT_GETTER_NAME,
+				EnhancerConstants.NEXT_SETTER_NAME
+		);
+
+		builder = addFieldWithGetterAndSetter(
+				builder,
+				constants.TypeBooleanPrimitive,
+				EnhancerConstants.USE_TRACKER_FIELD_NAME,
+				EnhancerConstants.USE_TRACKER_GETTER_NAME,
+				EnhancerConstants.USE_TRACKER_SETTER_NAME
+		);
+
+		builder = addFieldWithGetterAndSetter(
+				builder,
+				constants.TypeIntegerPrimitive,
+				EnhancerConstants.INSTANCE_ID_FIELD_NAME,
+				EnhancerConstants.INSTANCE_ID_GETTER_NAME,
+				EnhancerConstants.INSTANCE_ID_SETTER_NAME
+		);
+
+		builder = addSetPersistenceInfoMethod(
+				builder,
+				constants.TypeEntityEntry,
+				constants.TypeManagedEntity,
+				constants.TypeIntegerPrimitive
+		);
+
+		builder = addInterceptorHandling( builder, entityClass );
+
+		if ( enhancementContext.doDirtyCheckingInline() ) {
+			final var collectionFields = collectCollectionFields( entityClass );
+			if ( collectionFields.isEmpty() ) {
+				return implementSelfDirtinessTracker( builder );
+			}
+			else {
+				//TODO es.enableInterfaceExtendedSelfDirtinessTracker?
+				//     Careful with consequences.
+				return enhanceCollectionFields( entityClass, collectionFields,
+						implementExtendedSelfDirtinessTracker( builder ) );
+			}
+		}
+		else {
+			return builder;
+		}
+	}
+
+	private DynamicType.Builder<?> implementExtendedSelfDirtinessTracker(DynamicType.Builder<?> builder) {
+		return builder.implement( constants.INTERFACES_for_ExtendedSelfDirtinessTracker )
+				.defineField( TRACKER_FIELD_NAME, constants.DirtyTrackerTypeDescription, constants.modifierPRIVATE_TRANSIENT )
+						.annotateField( constants.TRANSIENT_ANNOTATION )
+				.defineField( TRACKER_COLLECTION_NAME, constants.TypeCollectionTracker, constants.modifierPRIVATE_TRANSIENT )
+						.annotateField( constants.TRANSIENT_ANNOTATION )
+				.defineMethod( TRACKER_CHANGER_NAME, constants.TypeVoid, constants.modifierPUBLIC )
+						.withParameter( constants.TypeString )
+						.intercept( constants.implementationTrackChange )
+				.defineMethod( TRACKER_GET_NAME, constants.Type_Array_String, constants.modifierPUBLIC )
+						.intercept( constants.implementationGetDirtyAttributes )
+				.defineMethod( TRACKER_HAS_CHANGED_NAME, constants.TypeBooleanPrimitive, constants.modifierPUBLIC )
+						.intercept( constants.implementationAreFieldsDirty )
+				.defineMethod( TRACKER_CLEAR_NAME, constants.TypeVoid, constants.modifierPUBLIC )
+						.intercept( constants.implementationClearDirtyAttributes )
+				.defineMethod( TRACKER_SUSPEND_NAME, constants.TypeVoid, constants.modifierPUBLIC )
+						.withParameter( constants.TypeBooleanPrimitive )
+						.intercept( constants.implementationSuspendDirtyTracking )
+				.defineMethod( TRACKER_COLLECTION_GET_NAME, constants.TypeCollectionTracker, constants.modifierPUBLIC )
+						.intercept( FieldAccessor.ofField( TRACKER_COLLECTION_NAME ) );
+	}
+
+	private DynamicType.Builder<?> implementSelfDirtinessTracker(DynamicType.Builder<?> builder) {
+		return builder.implement( constants.INTERFACES_for_SelfDirtinessTracker )
+				.defineField( TRACKER_FIELD_NAME, constants.DirtyTrackerTypeDescription, constants.modifierPRIVATE_TRANSIENT )
+						.annotateField( constants.TRANSIENT_ANNOTATION )
+				.defineMethod( TRACKER_CHANGER_NAME, constants.TypeVoid, constants.modifierPUBLIC )
+						.withParameter( constants.TypeString )
+						.intercept( constants.implementationTrackChange )
+				.defineMethod( TRACKER_GET_NAME, constants.Type_Array_String, constants.modifierPUBLIC )
+						.intercept( constants.implementationGetDirtyAttributesWithoutCollections )
+				.defineMethod( TRACKER_HAS_CHANGED_NAME, constants.TypeBooleanPrimitive, constants.modifierPUBLIC )
+						.intercept( constants.implementationAreFieldsDirtyWithoutCollections )
+				.defineMethod( TRACKER_CLEAR_NAME, constants.TypeVoid, constants.modifierPUBLIC )
+						.intercept( constants.implementationClearDirtyAttributesWithoutCollections )
+				.defineMethod( TRACKER_SUSPEND_NAME, constants.TypeVoid, constants.modifierPUBLIC )
+						.withParameter( constants.TypeBooleanPrimitive )
+						.intercept( constants.implementationSuspendDirtyTracking )
+				.defineMethod( TRACKER_COLLECTION_GET_NAME, constants.TypeCollectionTracker, constants.modifierPUBLIC )
+						.intercept( constants.implementationGetCollectionTrackerWithoutCollections );
+	}
+
+	private DynamicType.Builder<?> enhanceCollectionFields(
+			TypeDescription entityClass,
+			List<AnnotatedFieldDescription> collectionFields,
+			DynamicType.Builder<?> builder) {
+		Implementation
+				isDirty = StubMethod.INSTANCE,
+				getDirtyNames = StubMethod.INSTANCE,
+				clearDirtyNames = StubMethod.INSTANCE;
+		for ( var collectionField : collectionFields ) {
+			final String collectionFieldName = collectionField.getName();
+			final Class<?> adviceIsDirty, adviceGetDirtyNames, adviceClearDirtyNames;
+			if ( collectionField.getType().asErasure().isAssignableTo( Map.class ) ) {
+				adviceIsDirty = CodeTemplates.MapAreCollectionFieldsDirty.class;
+				adviceGetDirtyNames = CodeTemplates.MapGetCollectionFieldDirtyNames.class;
+				adviceClearDirtyNames = CodeTemplates.MapGetCollectionClearDirtyNames.class;
+			}
+			else {
+				adviceIsDirty = CodeTemplates.CollectionAreCollectionFieldsDirty.class;
+				adviceGetDirtyNames = CodeTemplates.CollectionGetCollectionFieldDirtyNames.class;
+				adviceClearDirtyNames = CodeTemplates.CollectionGetCollectionClearDirtyNames.class;
+			}
+			if ( collectionField.isVisibleTo( entityClass ) ) {
+				final var fieldDescription = collectionField.getFieldDescription();
+				isDirty = Advice.withCustomMapping()
+						.bind( CodeTemplates.FieldName.class, collectionFieldName )
+						.bind( CodeTemplates.FieldValue.class, fieldDescription )
+						.to( adviceIsDirty, constants.adviceLocator )
+						.wrap( isDirty );
+				getDirtyNames = Advice.withCustomMapping()
+						.bind( CodeTemplates.FieldName.class, collectionFieldName )
+						.bind( CodeTemplates.FieldValue.class, fieldDescription )
+						.to( adviceGetDirtyNames, constants.adviceLocator )
+						.wrap( getDirtyNames );
+				clearDirtyNames = Advice.withCustomMapping()
+						.bind( CodeTemplates.FieldName.class, collectionFieldName )
+						.bind( CodeTemplates.FieldValue.class, fieldDescription )
+						.to( adviceClearDirtyNames, constants.adviceLocator )
+						.wrap( clearDirtyNames );
+			}
+			else {
+				final var getterMapping =
+						new CodeTemplates.GetterMapping( collectionField.getFieldDescription() );
+				isDirty = Advice.withCustomMapping()
+						.bind( CodeTemplates.FieldName.class, collectionFieldName )
+						.bind( CodeTemplates.FieldValue.class, getterMapping )
+						.to( adviceIsDirty, constants.adviceLocator )
+						.wrap( isDirty );
+				getDirtyNames = Advice.withCustomMapping()
+						.bind( CodeTemplates.FieldName.class, collectionFieldName )
+						.bind( CodeTemplates.FieldValue.class, getterMapping )
+						.to( adviceGetDirtyNames, constants.adviceLocator )
+						.wrap( getDirtyNames );
+				clearDirtyNames = Advice.withCustomMapping()
+						.bind( CodeTemplates.FieldName.class, collectionFieldName )
+						.bind( CodeTemplates.FieldValue.class, getterMapping )
+						.to( adviceClearDirtyNames, constants.adviceLocator )
+						.wrap( clearDirtyNames );
+			}
+		}
+
+		if ( enhancementContext.hasLazyLoadableAttributes( entityClass ) ) {
+			clearDirtyNames = constants.adviceInitializeLazyAttributeLoadingInterceptor.wrap( clearDirtyNames );
+		}
+
+		return builder.defineMethod( TRACKER_COLLECTION_CHANGED_NAME, constants.TypeBooleanPrimitive, constants.modifierPUBLIC )
+				.intercept( isDirty )
+				.defineMethod( TRACKER_COLLECTION_CHANGED_FIELD_NAME, constants.TypeVoid, constants.modifierPUBLIC )
+						.withParameter( constants.DirtyTrackerTypeDescription )
+						.intercept( getDirtyNames )
+				.defineMethod( TRACKER_COLLECTION_CLEAR_NAME, constants.TypeVoid, constants.modifierPUBLIC )
+						.intercept( Advice.withCustomMapping()
+						.to( CodeTemplates.ClearDirtyCollectionNames.class, constants.adviceLocator )
+						.wrap( StubMethod.INSTANCE ) )
+				.defineMethod( REMOVE_DIRTY_FIELDS_NAME, constants.TypeVoid, constants.modifierPUBLIC )
+						.withParameter( constants.TypeLazyAttributeLoadingInterceptor )
+						.intercept( clearDirtyNames );
+	}
+
 	private void verifyReEnhancement(
 			TypeDescription managedCtClass,
 			EnhancementInfo existingInfo,
@@ -437,7 +514,8 @@ private void verifyReEnhancement(
 			ENHANCEMENT_LOGGER.skippingReEnhancementVersionCheck( managedCtClass.getName() );
 		}
 		else if ( !Version.getVersionString().equals( enhancementVersion ) ) {
-			throw new VersionMismatchException( managedCtClass, enhancementVersion, Version.getVersionString() );
+			throw new VersionMismatchException( managedCtClass, enhancementVersion,
+					Version.getVersionString() );
 		}
 
 		FeatureMismatchException.checkFeatureEnablement(
@@ -463,31 +541,34 @@ else if ( !Version.getVersionString().equals( enhancementVersion ) ) {
 	 *
 	 * @return the {@link AccessType} used by the mapped class
 	 *
-	 * @implNote this does not fully account for embeddables, as they should inherit the access-type
+	 * @implNote this does not fully account for embeddables, as they should inherit the access type
 	 * from the entities they're used in - defaulting to PROPERTY to always run the accessor check
 	 */
 	private static AccessType determineDefaultAccessType(TypeDefinition typeDefinition) {
-		for ( TypeDefinition candidate = typeDefinition; candidate != null && !candidate.represents( Object.class ); candidate = candidate.getSuperClass() ) {
-			final AnnotationList annotations = candidate.asErasure().getDeclaredAnnotations();
+		for ( var candidate = typeDefinition;
+			candidate != null && !candidate.represents( Object.class );
+			candidate = candidate.getSuperClass() ) {
+			final var annotations = candidate.asErasure().getDeclaredAnnotations();
 			if ( hasMappingAnnotation( annotations ) ) {
-				final AnnotationDescription.Loadable<Access> access = annotations.ofType( Access.class );
+				final var access = annotations.ofType( Access.class );
 				if ( access != null ) {
 					return access.load().value();
 				}
 			}
 		}
 		// Guess from identifier.
-		// FIX: Shouldn't this be determined by the first attribute (i.e., field or property) with annotations,
-		// but without an explicit Access annotation, according to JPA 2.0 spec 2.3.1: Default Access Type?
-		for ( TypeDefinition candidate = typeDefinition; candidate != null && !candidate.represents( Object.class ); candidate = candidate.getSuperClass() ) {
-			final AnnotationList annotations = candidate.asErasure().getDeclaredAnnotations();
-			if ( hasMappingAnnotation( annotations ) ) {
-				for ( FieldDescription ctField : candidate.getDeclaredFields() ) {
-					if ( !Modifier.isStatic( ctField.getModifiers() ) ) {
-						final AnnotationList annotationList = ctField.getDeclaredAnnotations();
-						if ( annotationList.isAnnotationPresent( Id.class ) || annotationList.isAnnotationPresent( EmbeddedId.class ) ) {
-							return AccessType.FIELD;
-						}
+		// FIX: Shouldn't this be determined by the first attribute
+		//      (i.e., field or property) with annotations,
+		//      but without an explicit Access annotation, according
+		//      to JPA 2.0 spec 2.3.1: Default Access Type?
+		for ( var candidate = typeDefinition;
+			candidate != null && !candidate.represents( Object.class );
+			candidate = candidate.getSuperClass() ) {
+			if ( hasMappingAnnotation( candidate.asErasure().getDeclaredAnnotations() ) ) {
+				for ( var ctField : candidate.getDeclaredFields() ) {
+					if ( !isStatic( ctField.getModifiers() )
+						&& isIdField( ctField.getDeclaredAnnotations() ) ) {
+						return AccessType.FIELD;
 					}
 				}
 			}
@@ -496,28 +577,32 @@ private static AccessType determineDefaultAccessType(TypeDefinition typeDefiniti
 		return AccessType.PROPERTY;
 	}
 
+	private static boolean isIdField(AnnotationList annotationList) {
+		return annotationList.isAnnotationPresent( Id.class )
+			|| annotationList.isAnnotationPresent( EmbeddedId.class );
+	}
+
 	/**
-	 * Determines the access-type of the given annotation source if an explicit {@link Access} annotation
-	 * is present, otherwise defaults to the provided {@code defaultAccessType}
+	 * Determines the access-type of the given annotation source if an explicit {@link Access}
+	 * annotation is present, otherwise defaults to the provided {@code defaultAccessType}
 	 */
 	private static AccessType determineAccessType(AnnotationSource annotationSource, AccessType defaultAccessType) {
-		final AnnotationDescription.Loadable<Access> access = annotationSource.getDeclaredAnnotations().ofType( Access.class );
+		final var access = annotationSource.getDeclaredAnnotations().ofType( Access.class );
 		return access != null ? access.load().value() : defaultAccessType;
 	}
 
 	private static boolean hasMappingAnnotation(AnnotationList annotations) {
 		return annotations.isAnnotationPresent( Entity.class )
-				|| annotations.isAnnotationPresent( MappedSuperclass.class )
-				|| annotations.isAnnotationPresent( Embeddable.class );
+			|| annotations.isAnnotationPresent( MappedSuperclass.class )
+			|| annotations.isAnnotationPresent( Embeddable.class );
 	}
 
 	private static boolean isPersistentMethod(MethodDescription method) {
-		final AnnotationList annotations = method.getDeclaredAnnotations();
-		if ( annotations.isAnnotationPresent( Transient.class ) ) {
-			return false;
-		}
+		final var annotations = method.getDeclaredAnnotations();
+		return !annotations.isAnnotationPresent( Transient.class )
+			&& annotations.stream()
+				.noneMatch( a -> IGNORED_PERSISTENCE_ANNOTATIONS.contains( a.getAnnotationType().getName() ) );
 
-		return annotations.stream().noneMatch( a -> IGNORED_PERSISTENCE_ANNOTATIONS.contains( a.getAnnotationType().getName() ) );
 	}
 
 	private static final Set<String> IGNORED_PERSISTENCE_ANNOTATIONS = Set.of(
@@ -532,7 +617,9 @@ private static boolean isPersistentMethod(MethodDescription method) {
 
 	private static boolean containsField(Generic type, String fieldName) {
 		do {
-			if ( !type.getDeclaredFields().filter( not( isStatic() ).and( named( fieldName ) ) ).isEmpty() ) {
+			if ( !type.getDeclaredFields()
+					.filter( not( isStatic() ).and( named( fieldName ) ) )
+					.isEmpty() ) {
 				return true;
 			}
 			type = type.getSuperClass();
@@ -541,89 +628,114 @@ private static boolean containsField(Generic type, String fieldName) {
 		return false;
 	}
 
-	/**
-	 * Check whether an entity class ({@code managedCtClass}) has mismatched names between a persistent field and its
-	 * getter/setter when using {@link AccessType#PROPERTY}, which Hibernate does not currently support for enhancement.
-	 * See <a href="https://hibernate.atlassian.net/browse/HHH-16572">HHH-16572</a>
-	 *
-	 * @return {@code true} if enhancement of the class must be {@link UnsupportedEnhancementStrategy#SKIP skipped}
-	 * because it has mismatched names.
-	 * {@code false} if enhancement of the class must proceed, either because it doesn't have any mismatched names,
-	 * or because {@link UnsupportedEnhancementStrategy#LEGACY legacy mode} was opted into.
-	 * @throws EnhancementException if enhancement of the class must {@link UnsupportedEnhancementStrategy#FAIL abort} because it has mismatched names.
-	 */
+	/// Currently, we cannot correctly handle cases where
+	/// property accessor methods are not backed by a field
+	/// with a matching name.
+	///
+	/// ```java
+	/// @Entity
+	/// class Book {
+	///     Integer id; // Smiley
+	///     String smtg; // Sad face
+	///
+	///     @Id Integer getId() { return id; }
+	///     String getSomething() { return smtg; }
+	/// }
+	/// ```
+	/// See [HHH-16572](https://hibernate.atlassian.net/browse/HHH-16572).
+	///
+	/// @return {@code true} if enhancement of the class must be
+	///         [skipped](UnsupportedEnhancementStrategy#SKIP)
+	///         because it has missing fields.
+	///         {@code false} if enhancement of the class must proceed,
+	///         because it doesn't have any missing fields, or because
+	///         [legacy mode](UnsupportedEnhancementStrategy#LEGACY)
+	///         was opted into.
+	/// @throws EnhancementException if enhancement of the class must
+	///         [abort](UnsupportedEnhancementStrategy#FAIL) because
+	///         of missing fields.
+
 	@SuppressWarnings("deprecation")
-	private static boolean checkUnsupportedAttributeNaming(TypeDescription managedCtClass, ByteBuddyEnhancementContext enhancementContext) {
-		var strategy = enhancementContext.getUnsupportedEnhancementStrategy();
-		if ( UnsupportedEnhancementStrategy.LEGACY.equals( strategy ) ) {
-			// Don't check anything and act as if there was nothing unsupported in the class.
-			// This is unsafe but that's what LEGACY is about.
-			return false;
-		}
+	private static boolean checkUnderlyingFields(
+			TypeDescription managedCtClass,
+			ByteBuddyEnhancementContext enhancementContext) {
+		final var strategy = enhancementContext.getUnsupportedEnhancementStrategy();
+		return switch ( strategy ) {
+			case LEGACY ->
+					// Don't check anything and act as if there was nothing unsupported
+					// in the class. This is unsafe, but that's what LEGACY is about.
+					false;
+			default -> {
+				final var methods =
+						MethodGraph.Compiler.DEFAULT.compile( (TypeDefinition) managedCtClass )
+								.listNodes()
+								.asMethodList()
+								.filter( isGetter().or( isSetter() ) );
+				final var defaultAccessType = determineDefaultAccessType( managedCtClass );
+				yield checkUnderlyingFields( managedCtClass, methods, defaultAccessType, strategy );
+			}
+		};
+	}
 
-		// For process access rules, See https://jakarta.ee/specifications/persistence/3.2/jakarta-persistence-spec-3.2#default-access-type
-		// and https://jakarta.ee/specifications/persistence/3.2/jakarta-persistence-spec-3.2#a122
-		//
-		// This check will determine if entity field names do not match Property accessor method name
-		// For example:
-		// @Entity
-		// class Book {
-		//   Integer id;
-		//   String smtg;
-		//
-		//   @Id Integer getId() { return id; }
-		//   String getSomething() { return smtg; }
-		// }
-		//
-		// Check name of the getter/setter method with persistence annotation and getter/setter method name that doesn't refer to an entity field
-		// and will return false.  If the property accessor method(s) are named to match the field name(s), return true.
-		final AccessType defaultAccessType = determineDefaultAccessType( managedCtClass );
-		final MethodList<?> methods = MethodGraph.Compiler.DEFAULT.compile( (TypeDefinition) managedCtClass )
-				.listNodes()
-				.asMethodList()
-				.filter( isGetter().or( isSetter() ) );
-		for ( final MethodDescription methodDescription : methods ) {
-			if ( methodDescription.getDeclaringType().represents( Object.class )
-				|| determineAccessType( methodDescription, defaultAccessType ) != AccessType.PROPERTY ) {
+	private static boolean checkUnderlyingFields(
+			TypeDescription managedCtClass,
+			MethodList<?> methods,
+			AccessType defaultAccessType,
+			UnsupportedEnhancementStrategy strategy) {
+		for ( final var methodDescription : methods ) {
+			if ( !methodDescription.getDeclaringType().represents( Object.class )
 				// We only need to check this for AccessType.PROPERTY
-				continue;
+				&& determineAccessType( methodDescription, defaultAccessType ) == AccessType.PROPERTY
+				// We should ignore @Transient methods
+				&& isPersistentMethod( methodDescription ) ) {
+				final String fieldName = propertyName( methodDescription );
+				if ( fieldName != null && !containsField( managedCtClass.asGenericType(), fieldName ) ) {
+					// We shouldn't even be in this method if using LEGACY, see top of this method.
+					return handleMissingField( managedCtClass, strategy, methodDescription, fieldName );
+				}
 			}
+		}
+		return false;
+	}
 
-			final String methodName = methodDescription.getActualName();
-			String fieldName;
-			if ( methodName.startsWith( "get" ) || methodName.startsWith( "set" ) ) {
-				fieldName = methodName.substring( 3 );
-			}
-			else {
-				assert methodName.startsWith( "is" );
-				fieldName = methodName.substring( 2 );
-			}
-			// convert first field letter to lower case
-			fieldName = getJavaBeansFieldName( fieldName );
-			if ( fieldName != null && isPersistentMethod( methodDescription )
-				&& !containsField( managedCtClass.asGenericType(), fieldName ) ) {
-				// We shouldn't even be in this method if using LEGACY, see top of this method.
-				return switch ( strategy ) {
-					case SKIP -> {
-						ENHANCEMENT_LOGGER.propertyAccessorNoFieldSkip(
-								managedCtClass.getName(),
-								fieldName,
-								methodDescription.getName()
-						);
-						yield true;
-					}
-					case FAIL -> throw new EnhancementException( String.format(
-							"Enhancement of [%s] failed because no field named [%s] could be found for property accessor method [%s]."
-							+ " To fix this, make sure all property accessor methods have a matching field.",
-							managedCtClass.getName(),
-							fieldName,
-							methodDescription.getName()
-					) );
-					default -> throw new AssertionFailure( "Unexpected strategy at this point: " + strategy );
-				};
+	@SuppressWarnings("deprecation")
+	private static boolean handleMissingField(
+			TypeDescription managedCtClass,
+			UnsupportedEnhancementStrategy strategy,
+			MethodDescription methodDescription,
+			String fieldName) {
+		return switch ( strategy ) {
+			case SKIP -> {
+				ENHANCEMENT_LOGGER.propertyAccessorNoFieldSkip(
+						managedCtClass.getName(),
+						fieldName,
+						methodDescription.getName()
+				);
+				yield true;
 			}
+			case FAIL -> throw new EnhancementException( String.format(
+					"Enhancement of [%s] failed because no underlying field named [%s] exists for property accessor method [%s]"
+					+ " (ensure all property accessor methods have a matching field)",
+					managedCtClass.getName(),
+					fieldName,
+					methodDescription.getName()
+			) );
+			case LEGACY -> throw new AssertionFailure( "Unexpected strategy at this point: " + strategy );
+		};
+	}
+
+	private static @Nullable String propertyName(MethodDescription methodDescription) {
+		return getJavaBeansFieldName( trimGetterName( methodDescription.getActualName() ) );
+	}
+
+	private static @NonNull String trimGetterName(String methodName) {
+		if ( methodName.startsWith( "get" ) || methodName.startsWith( "set" ) ) {
+			return methodName.substring( 3 );
+		}
+		else {
+			assert methodName.startsWith( "is" );
+			return methodName.substring( 2 );
 		}
-		return false;
 	}
 
 	/**
@@ -637,21 +749,25 @@ private static boolean checkUnsupportedAttributeNaming(TypeDescription managedCt
 		if ( name.isEmpty() ) {
 			return null;
 		}
-		if ( name.length() > 1 && Character.isUpperCase( name.charAt( 1 ) ) && Character.isUpperCase( name.charAt( 0 ) ) ) {
+		else if ( name.length() > 1
+			&& isUpperCase( name.charAt( 1 ) )
+			&& isUpperCase( name.charAt( 0 ) ) ) {
 			return name;
 		}
-		final char[] chars = name.toCharArray();
-		chars[0] = Character.toLowerCase( chars[0] );
-		return new String( chars );
+		else {
+			final char[] chars = name.toCharArray();
+			chars[0] = toLowerCase( chars[0] );
+			return new String( chars );
+		}
 	}
 
 	private PersistentAttributeTransformer createTransformer(TypeDescription typeDescription) {
-		return PersistentAttributeTransformer.collectPersistentFields( typeDescription, enhancementContext, typePool, constants );
+		return collectPersistentFields( typeDescription, enhancementContext, typePool, constants );
 	}
 
 	// See HHH-10977 HHH-11284 HHH-11404 --- check for declaration of Managed interface on the class, not inherited
 	private boolean alreadyEnhanced(TypeDescription managedCtClass) {
-		for ( Generic declaredInterface : managedCtClass.getInterfaces() ) {
+		for ( var declaredInterface : managedCtClass.getInterfaces() ) {
 			if ( declaredInterface.asErasure().isAssignableTo( Managed.class ) ) {
 				return true;
 			}
@@ -660,22 +776,20 @@ private boolean alreadyEnhanced(TypeDescription managedCtClass) {
 	}
 
 	private DynamicType.Builder<?> addInterceptorHandling(DynamicType.Builder<?> builder, TypeDescription managedCtClass) {
-		// interceptor handling is only needed if class has lazy-loadable attributes
+		// interceptor handling is only needed if the class has lazy-loadable attributes
 		if ( enhancementContext.hasLazyLoadableAttributes( managedCtClass ) ) {
 			ENHANCEMENT_LOGGER.weavingPersistentAttributeInterceptable( managedCtClass.getName() );
-
-			builder = builder.implement( constants.INTERFACES_for_PersistentAttributeInterceptable );
-
-			builder = addFieldWithGetterAndSetter(
-					builder,
+			return addFieldWithGetterAndSetter(
+					builder.implement( constants.INTERFACES_for_PersistentAttributeInterceptable ),
 					constants.TypePersistentAttributeInterceptor,
 					EnhancerConstants.INTERCEPTOR_FIELD_NAME,
 					EnhancerConstants.INTERCEPTOR_GETTER_NAME,
 					EnhancerConstants.INTERCEPTOR_SETTER_NAME
 			);
 		}
-
-		return builder;
+		else {
+			return builder;
+		}
 	}
 
 	private DynamicType.Builder<?> addFieldWithGetterAndSetter(
@@ -701,53 +815,55 @@ private DynamicType.Builder<?> addSetPersistenceInfoMethod(
 			TypeDefinition intType) {
 		return builder
 				// returns previous entity entry
-				.defineMethod( EnhancerConstants.PERSISTENCE_INFO_SETTER_NAME, entityEntryType, constants.modifierPUBLIC )
+				.defineMethod( PERSISTENCE_INFO_SETTER_NAME, entityEntryType, constants.modifierPUBLIC )
 				// previous, next, instance-id
 				.withParameters( entityEntryType, managedEntityType, managedEntityType, intType )
 				.intercept( constants.implementationSetPersistenceInfo );
 	}
 
 	private List<AnnotatedFieldDescription> collectCollectionFields(TypeDescription managedCtClass) {
-		List<AnnotatedFieldDescription> collectionList = new ArrayList<>();
-
-		for ( FieldDescription ctField : managedCtClass.getDeclaredFields() ) {
+		final List<AnnotatedFieldDescription> collectionList = new ArrayList<>();
+		for ( var ctField : managedCtClass.getDeclaredFields() ) {
 			// skip static fields and skip fields added by enhancement
-			if ( Modifier.isStatic( ctField.getModifiers() ) || ctField.getName().startsWith( "$$_hibernate_" ) ) {
-				continue;
-			}
-			AnnotatedFieldDescription annotatedField = new AnnotatedFieldDescription( enhancementContext, ctField );
-			if ( enhancementContext.isPersistentField( annotatedField ) && enhancementContext.isMappedCollection( annotatedField ) ) {
-				if ( ctField.getType().asErasure().isAssignableTo( Collection.class ) || ctField.getType().asErasure().isAssignableTo( Map.class ) ) {
-					collectionList.add( annotatedField );
+			if ( !isStatic( ctField.getModifiers() )
+				&& !ctField.getName().startsWith( "$$_hibernate_" ) ) {
+				final var annotatedField = new AnnotatedFieldDescription( enhancementContext, ctField );
+				if ( enhancementContext.isPersistentField( annotatedField )
+					&& enhancementContext.isMappedCollection( annotatedField ) ) {
+					final var erasure = ctField.getType().asErasure();
+					if ( erasure.isAssignableTo( Collection.class )
+						|| erasure.isAssignableTo( Map.class ) ) {
+						collectionList.add( annotatedField );
+					}
 				}
 			}
 		}
-
 		// HHH-10646 Add fields inherited from @MappedSuperclass
 		// HHH-10981 There is no need to do it for @MappedSuperclass
 		if ( !enhancementContext.isMappedSuperclassClass( managedCtClass ) ) {
 			collectionList.addAll( collectInheritCollectionFields( managedCtClass ) );
 		}
-
 		return collectionList;
 	}
 
 	private Collection<AnnotatedFieldDescription> collectInheritCollectionFields(TypeDefinition managedCtClass) {
-		TypeDefinition managedCtSuperclass = managedCtClass.getSuperClass();
+		final var managedCtSuperclass = managedCtClass.getSuperClass();
 		if ( managedCtSuperclass == null || managedCtSuperclass.represents( Object.class ) ) {
-			return Collections.emptyList();
+			return emptyList();
 		}
 
 		if ( !enhancementContext.isMappedSuperclassClass( managedCtSuperclass.asErasure() ) ) {
 			return collectInheritCollectionFields( managedCtSuperclass.asErasure() );
 		}
-		List<AnnotatedFieldDescription> collectionList = new ArrayList<>();
-
-		for ( FieldDescription ctField : managedCtSuperclass.getDeclaredFields() ) {
-			if ( !Modifier.isStatic( ctField.getModifiers() ) ) {
-				AnnotatedFieldDescription annotatedField = new AnnotatedFieldDescription( enhancementContext, ctField );
-				if ( enhancementContext.isPersistentField( annotatedField ) && enhancementContext.isMappedCollection( annotatedField ) ) {
-					if ( ctField.getType().asErasure().isAssignableTo( Collection.class ) || ctField.getType().asErasure().isAssignableTo( Map.class ) ) {
+		final List<AnnotatedFieldDescription> collectionList = new ArrayList<>();
+		for ( var ctField : managedCtSuperclass.getDeclaredFields() ) {
+			if ( !isStatic( ctField.getModifiers() ) ) {
+				final var annotatedField = new AnnotatedFieldDescription( enhancementContext, ctField );
+				if ( enhancementContext.isPersistentField( annotatedField )
+					&& enhancementContext.isMappedCollection( annotatedField ) ) {
+					final var erasure = ctField.getType().asErasure();
+					if ( erasure.isAssignableTo( Collection.class )
+						|| erasure.isAssignableTo( Map.class ) ) {
 					collectionList.add( annotatedField );
 					}
 				}
@@ -837,7 +953,6 @@ Optional<MethodDescription> getGetter() {
 			if ( getter == null ) {
 				getter = context.resolveGetter( fieldDescription );
 			}
-
 			return getter;
 		}
 
@@ -849,38 +964,46 @@ private AnnotationList getAnnotations() {
 		}
 
 		private AnnotationList doGetAnnotations() {
-			AnnotationDescription.Loadable<Access> access = fieldDescription.getDeclaringType().asErasure()
-					.getDeclaredAnnotations().ofType( Access.class );
+			final var access =
+					fieldDescription.getDeclaringType().asErasure()
+							.getDeclaredAnnotations().ofType( Access.class );
 			if ( access != null && access.load().value() == AccessType.PROPERTY ) {
-				Optional<MethodDescription> getter = getGetter();
-				if ( getter.isPresent() ) {
-					return getter.get().getDeclaredAnnotations();
-				}
-				else {
+				final var fieldAccess = fieldDescription.getDeclaredAnnotations()
+						.ofType( Access.class );
+
+				if ( fieldAccess != null && fieldAccess.load().value() == AccessType.FIELD ) {
 					return fieldDescription.getDeclaredAnnotations();
 				}
+				return getGetter()
+						.map( MethodDescription::getDeclaredAnnotations )
+						.orElseGet( fieldDescription::getDeclaredAnnotations );
 			}
 			else if ( access != null && access.load().value() == AccessType.FIELD ) {
+				var getter = getGetter();
+				if ( getter.isPresent() ) {
+					var getterAccess = getter.get().getDeclaredAnnotations().ofType( Access.class );
+					if ( getterAccess != null && getterAccess.load().value() == AccessType.PROPERTY ) {
+						return getter.get().getDeclaredAnnotations();
+					}
+				}
 				return fieldDescription.getDeclaredAnnotations();
 			}
 			else {
-				Optional<MethodDescription> getter = getGetter();
-
+				final var getter = getGetter();
 				// Note that the order here is important
-				List<AnnotationDescription> annotationDescriptions = new ArrayList<>();
+				final List<AnnotationDescription> annotationDescriptions = new ArrayList<>();
 				if ( getter.isPresent() ) {
 					annotationDescriptions.addAll( getter.get().getDeclaredAnnotations() );
 				}
 				annotationDescriptions.addAll( fieldDescription.getDeclaredAnnotations() );
-
 				return new AnnotationList.Explicit( annotationDescriptions );
 			}
 		}
 	}
 
-
 	private static EnhancementInfo createInfoAnnotation(EnhancementContext enhancementContext) {
-		return new EnhancementInfoImpl( enhancementContext.doDirtyCheckingInline(), enhancementContext.doBiDirectionalAssociationManagement() );
+		return new EnhancementInfoImpl( enhancementContext.doDirtyCheckingInline(),
+				enhancementContext.doBiDirectionalAssociationManagement() );
 	}
 
 	private static class EnhancementInfoImpl implements EnhancementInfo {
@@ -915,5 +1038,4 @@ public Class<? extends Annotation> annotationType() {
 		}
 	}
 
-
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImplConstants.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImplConstants.java
index 7151dc438957..b7f8672ec6ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImplConstants.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImplConstants.java
@@ -22,6 +22,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import net.bytebuddy.implementation.bytecode.ByteCodeAppender;
+import net.bytebuddy.jar.asm.Opcodes;
 import net.bytebuddy.jar.asm.Type;
 import net.bytebuddy.matcher.ElementMatcher;
 import net.bytebuddy.matcher.ElementMatchers;
@@ -47,10 +49,9 @@
 import static net.bytebuddy.matcher.ElementMatchers.isDefaultFinalizer;
 
 /**
- * Extracts constants used by EnhancerImpl.
- * This allows integrators to choose reusing this state for multiple enhancement processes,
- * as these are fairly expensive to initialize, or rather choose to free memory by
- * not retaining this.
+ * Extracts constants used by {@link EnhancerImpl}.
+ * This allows integrators to choose between reusing this state for multiple enhancement processes,
+ * as these are fairly expensive to initialize, or rather choose to free memory by not retaining.
  */
 public final class EnhancerImplConstants {
 
@@ -71,6 +72,7 @@ public final class EnhancerImplConstants {
 	final Implementation implementationSetOwner;
 	final Implementation implementationClearOwner;
 	final Implementation implementationSetPersistenceInfo;
+	final Implementation implementationDefaultConstructor;
 
 	//Frequently used Modifiers:
 	final int modifierPUBLIC = ModifierContributor.Resolver.of( List.of( Visibility.PUBLIC ) ).resolve();
@@ -175,44 +177,55 @@ public final class EnhancerImplConstants {
 	final String Serializable_TYPE_DESCRIPTOR = Type.getDescriptor( Serializable.class );
 
 	public EnhancerImplConstants() {
-		this.adviceLocator = ClassFileLocator.ForClassLoader.of( CodeTemplates.class.getClassLoader() );
-		this.implementationTrackChange = Advice.to( CodeTemplates.TrackChange.class, adviceLocator )
+		adviceLocator = ClassFileLocator.ForClassLoader.of( CodeTemplates.class.getClassLoader() );
+		implementationTrackChange = Advice.to( CodeTemplates.TrackChange.class, adviceLocator )
 				.wrap( StubMethod.INSTANCE );
-		this.implementationGetDirtyAttributesWithoutCollections = Advice.to(
+		implementationGetDirtyAttributesWithoutCollections = Advice.to(
 				CodeTemplates.GetDirtyAttributesWithoutCollections.class,
 				adviceLocator
 		).wrap( StubMethod.INSTANCE );
-		this.implementationAreFieldsDirtyWithoutCollections = Advice.to(
+		implementationAreFieldsDirtyWithoutCollections = Advice.to(
 				CodeTemplates.AreFieldsDirtyWithoutCollections.class,
 				adviceLocator
 		).wrap( StubMethod.INSTANCE );
-		this.implementationClearDirtyAttributesWithoutCollections = Advice.to(
+		implementationClearDirtyAttributesWithoutCollections = Advice.to(
 				CodeTemplates.ClearDirtyAttributesWithoutCollections.class,
 				adviceLocator
 		).wrap( StubMethod.INSTANCE );
-		this.implementationSuspendDirtyTracking = Advice.to( CodeTemplates.SuspendDirtyTracking.class, adviceLocator )
+		implementationSuspendDirtyTracking = Advice.to( CodeTemplates.SuspendDirtyTracking.class, adviceLocator )
 				.wrap( StubMethod.INSTANCE );
-		this.implementationGetDirtyAttributes = Advice.to( CodeTemplates.GetDirtyAttributes.class, adviceLocator ).wrap(
+		implementationGetDirtyAttributes = Advice.to( CodeTemplates.GetDirtyAttributes.class, adviceLocator ).wrap(
 				StubMethod.INSTANCE );
-		this.implementationAreFieldsDirty = Advice.to( CodeTemplates.AreFieldsDirty.class, adviceLocator ).wrap(
+		implementationAreFieldsDirty = Advice.to( CodeTemplates.AreFieldsDirty.class, adviceLocator ).wrap(
 				StubMethod.INSTANCE );
-		this.implementationGetCollectionTrackerWithoutCollections = Advice.to(
+		implementationGetCollectionTrackerWithoutCollections = Advice.to(
 				CodeTemplates.GetCollectionTrackerWithoutCollections.class,
 				adviceLocator
 		).wrap( StubMethod.INSTANCE );
-		this.implementationClearDirtyAttributes = Advice.to( CodeTemplates.ClearDirtyAttributes.class, adviceLocator )
+		implementationClearDirtyAttributes = Advice.to( CodeTemplates.ClearDirtyAttributes.class, adviceLocator )
 				.wrap( StubMethod.INSTANCE );
 		//In this case we just extract the Advice:
-		this.adviceInitializeLazyAttributeLoadingInterceptor = Advice.to(
+		adviceInitializeLazyAttributeLoadingInterceptor = Advice.to(
 				CodeTemplates.InitializeLazyAttributeLoadingInterceptor.class,
 				adviceLocator
 		);
-		this.implementationSetOwner = Advice.to( CodeTemplates.SetOwner.class, adviceLocator )
+		implementationSetOwner = Advice.to( CodeTemplates.SetOwner.class, adviceLocator )
 				.wrap( StubMethod.INSTANCE );
-		this.implementationClearOwner = Advice.to( CodeTemplates.ClearOwner.class, adviceLocator )
+		implementationClearOwner = Advice.to( CodeTemplates.ClearOwner.class, adviceLocator )
 				.wrap( StubMethod.INSTANCE );
-		this.implementationSetPersistenceInfo = Advice.to( CodeTemplates.SetPersistenceInfo.class, adviceLocator )
+		implementationSetPersistenceInfo = Advice.to( CodeTemplates.SetPersistenceInfo.class, adviceLocator )
 				.wrap( StubMethod.INSTANCE );
+		implementationDefaultConstructor = new Implementation.Simple(
+				(methodVisitor, implementationContext, instrumentedMethod) -> {
+					methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
+					methodVisitor.visitMethodInsn( Opcodes.INVOKESPECIAL,
+							instrumentedMethod.getDeclaringType().getSuperClass().asErasure().getInternalName(),
+							"<init>",
+							"()V",
+							false );
+					methodVisitor.visitInsn( Opcodes.RETURN );
+					return new ByteCodeAppender.Size( 1, 1 );
+				} );
 	}
 
 	public ElementMatcher<? super MethodDescription> defaultFinalizer() {
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java
index c5dbac7a840c..8c6b1aa984a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java
@@ -10,10 +10,9 @@
 
 import jakarta.persistence.Id;
 
-import net.bytebuddy.description.NamedElement;
 import net.bytebuddy.description.type.TypeDefinition;
-import net.bytebuddy.matcher.ElementMatcher;
 import net.bytebuddy.utility.OpenedClassReader;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription;
 import org.hibernate.bytecode.enhance.spi.EnhancementException;
 import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
@@ -58,57 +57,57 @@ public MethodVisitor wrap(
 			public void visitFieldInsn(int opcode, String owner, String name, String desc) {
 				if ( opcode != Opcodes.GETFIELD && opcode != Opcodes.PUTFIELD ) {
 					super.visitFieldInsn( opcode, owner, name, desc );
-					return;
 				}
-
-				TypeDescription declaredOwnerType = findDeclaredType( owner );
-				AnnotatedFieldDescription field = findField( declaredOwnerType, name, desc );
-				// try to discover composite types on the fly to support some testing scenarios
-				enhancementContext.discoverCompositeTypes( declaredOwnerType, typePool );
-
-				if ( ( enhancementContext.isEntityClass( declaredOwnerType.asErasure() )
-						|| enhancementContext.isCompositeClass( declaredOwnerType.asErasure() ) )
-						&& !field.getType().asErasure().equals( managedCtClass )
-						&& enhancementContext.isPersistentField( field )
-						&& !field.hasAnnotation( Id.class )
-						&& !field.getName().equals( "this$0" ) ) {
-
-					ENHANCEMENT_LOGGER.extendedTransformingFieldAccess(
-							declaredOwnerType.getName(),
-							field.getName(),
-							instrumentedType.getName(),
-							instrumentedMethod.getName()
-					);
-
-					switch ( opcode ) {
-						case Opcodes.GETFIELD:
-							methodVisitor.visitMethodInsn(
-									Opcodes.INVOKEVIRTUAL,
-									owner,
-									EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + name,
-									Type.getMethodDescriptor( Type.getType( desc ) ),
-									false
-							);
-							return;
-						case Opcodes.PUTFIELD:
-							if ( field.getFieldDescription().isFinal() ) {
-								// Final fields will only be written to from the constructor,
-								// so there's no point trying to replace final field writes with a method call.
-								break;
-							}
-							methodVisitor.visitMethodInsn(
-									Opcodes.INVOKEVIRTUAL,
-									owner,
-									EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + name,
-									Type.getMethodDescriptor( Type.getType( void.class ), Type.getType( desc ) ),
-									false
-							);
-							return;
-						default:
-							throw new EnhancementException( "Unexpected opcode: " + opcode );
+				else {
+					final var declaredOwnerType = findDeclaredType( owner );
+					final var field = findField( declaredOwnerType, name, desc );
+					// try to discover composite types on the fly to support some testing scenarios
+					enhancementContext.discoverCompositeTypes( declaredOwnerType, typePool );
+
+					if ( (enhancementContext.isEntityClass( declaredOwnerType.asErasure() )
+						|| enhancementContext.isCompositeClass( declaredOwnerType.asErasure() ))
+							&& !field.getType().asErasure().equals( managedCtClass )
+							&& enhancementContext.isPersistentField( field )
+							&& !field.hasAnnotation( Id.class )
+							&& !field.getName().equals( "this$0" ) ) {
+
+						ENHANCEMENT_LOGGER.extendedTransformingFieldAccess(
+								declaredOwnerType.getName(),
+								field.getName(),
+								instrumentedType.getName(),
+								instrumentedMethod.getName()
+						);
+
+						switch ( opcode ) {
+							case Opcodes.GETFIELD:
+								methodVisitor.visitMethodInsn(
+										Opcodes.INVOKEVIRTUAL,
+										owner,
+										EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + name,
+										Type.getMethodDescriptor( Type.getType( desc ) ),
+										false
+								);
+								return;
+							case Opcodes.PUTFIELD:
+								if ( field.getFieldDescription().isFinal() ) {
+									// Final fields will only be written to from the constructor,
+									// so there's no point trying to replace final field writes with a method call.
+									break;
+								}
+								methodVisitor.visitMethodInsn(
+										Opcodes.INVOKEVIRTUAL,
+										owner,
+										EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + name,
+										Type.getMethodDescriptor( Type.getType( void.class ), Type.getType( desc ) ),
+										false
+								);
+								return;
+							default:
+								throw new EnhancementException( "Unexpected opcode: " + opcode );
+						}
 					}
+					super.visitFieldInsn( opcode, owner, name, desc );
 				}
-				super.visitFieldInsn( opcode, owner, name, desc );
 			}
 		};
 	}
@@ -116,50 +115,51 @@ public void visitFieldInsn(int opcode, String owner, String name, String desc) {
 	private TypeDescription findDeclaredType(String name) {
 		//Classpool#describe does not accept '/' in the description name as it expects a class name
 		final String cleanedName = name.replace( '/', '.' );
-		final TypePool.Resolution resolution = classPool.describe( cleanedName );
+		final var resolution = classPool.describe( cleanedName );
 		if ( !resolution.isResolved() ) {
-			final String msg = String.format(
+			throw new EnhancementException( String.format(
 					"Unable to perform extended enhancement - Unable to locate [%s]",
 					cleanedName
-			);
-			throw new EnhancementException( msg );
+			) );
 		}
 		return resolution.resolve();
 	}
 
 	private AnnotatedFieldDescription findField(TypeDescription declaredOwnedType, String name, String desc) {
-		TypeDefinition ownerType = declaredOwnedType;
-		ElementMatcher.Junction<NamedElement.WithDescriptor> fieldFilter = named( name ).and( hasDescriptor( desc ) );
+		final var fields = findFields( declaredOwnedType, name, desc );
+		if ( fields.size() != 1 ) {
+			throw new EnhancementException( String.format(
+					"Unable to perform extended enhancement - No unique field [%s] defined by [%s]",
+					name,
+					declaredOwnedType.getName()
+			) );
+		}
+		return new AnnotatedFieldDescription( enhancementContext, fields.getOnly() );
+	}
 
+	private static @NonNull FieldList<?> findFields(TypeDescription declaredOwnedType, String name, String desc) {
+		TypeDefinition ownerType = declaredOwnedType;
+		final var fieldFilter = named( name ).and( hasDescriptor( desc ) );
 		FieldList<?> fields = ownerType.getDeclaredFields().filter( fieldFilter );
-
 		// Look in the superclasses if necessary
 		while ( fields.isEmpty() && ownerType.getSuperClass() != null ) {
 			ownerType = ownerType.getSuperClass();
 			fields = ownerType.getDeclaredFields().filter( fieldFilter );
 		}
-
-		if ( fields.size() != 1 ) {
-			final String msg = String.format(
-					"Unable to perform extended enhancement - No unique field [%s] defined by [%s]",
-					name,
-					declaredOwnedType.getName()
-			);
-			throw new EnhancementException( msg );
-		}
-		return new AnnotatedFieldDescription( enhancementContext, fields.getOnly() );
+		return fields;
 	}
 
 	@Override
-	public boolean equals(final Object o) {
-		if ( this == o ) {
+	public boolean equals(final Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || FieldAccessEnhancer.class != o.getClass() ) {
+		else if ( !(object instanceof FieldAccessEnhancer that) ) {
 			return false;
 		}
-		final FieldAccessEnhancer that = (FieldAccessEnhancer) o;
-		return Objects.equals( managedCtClass, that.managedCtClass );
+		else {
+			return Objects.equals( this.managedCtClass, that.managedCtClass );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldReaderAppender.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldReaderAppender.java
index c35273d50e08..f1f20fc9f5b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldReaderAppender.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldReaderAppender.java
@@ -7,9 +7,7 @@
 import java.util.Objects;
 
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription;
-import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
 
-import net.bytebuddy.ClassFileVersion;
 import net.bytebuddy.description.field.FieldDescription;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
@@ -20,6 +18,12 @@
 import net.bytebuddy.jar.asm.Opcodes;
 import net.bytebuddy.jar.asm.Type;
 
+import static net.bytebuddy.ClassFileVersion.JAVA_V6;
+import static org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.capitalize;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.INTERCEPTOR_GETTER_NAME;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX;
+
 abstract class FieldReaderAppender implements ByteCodeAppender {
 
 	protected final TypeDescription managedCtClass;
@@ -38,12 +42,9 @@ private FieldReaderAppender(TypeDescription managedCtClass, AnnotatedFieldDescri
 	}
 
 	static ByteCodeAppender of(TypeDescription managedCtClass, AnnotatedFieldDescription persistentField, EnhancerImplConstants constants) {
-		if ( !persistentField.isVisibleTo( managedCtClass ) ) {
-			return new MethodDispatching( managedCtClass, persistentField, constants );
-		}
-		else {
-			return new FieldWriting( managedCtClass, persistentField, constants );
-		}
+		return persistentField.isVisibleTo( managedCtClass )
+				? new FieldWriting( managedCtClass, persistentField, constants )
+				: new MethodDispatching( managedCtClass, persistentField, constants );
 	}
 
 	@Override
@@ -51,24 +52,24 @@ public Size apply(
 			MethodVisitor methodVisitor,
 			Implementation.Context implementationContext,
 			MethodDescription instrumentedMethod) {
-		TypeDescription dispatcherType = persistentFieldAsDefined.getType().isPrimitive()
-				? persistentFieldAsDefined.getType().asErasure()
-				: TypeDescription.OBJECT;
+		final var type = persistentFieldAsDefined.getType();
+		final var erasure = type.asErasure();
+		final var dispatcherType = type.isPrimitive() ? erasure : TypeDescription.OBJECT;
 		// From `PersistentAttributeTransformer`:
 		//     Final fields will only be written to from the constructor,
 		//     so there's no point trying to replace final field writes with a method call.
-		// as a result if a field is final then there will be no write method, and we don't want to have this block:
+		// as a result if a field is final, then there will be no write method, and we don't want to have this block:
 		if ( !persistentField.asDefined().isFinal() ) {
 			// if ( this.$$_hibernate_getInterceptor() != null )
 			methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
 			methodVisitor.visitMethodInsn(
 					Opcodes.INVOKEVIRTUAL,
 					managedCtClass.getInternalName(),
-					EnhancerConstants.INTERCEPTOR_GETTER_NAME,
+					INTERCEPTOR_GETTER_NAME,
 					constants.methodDescriptor_getInterceptor,
 					false
 			);
-			Label skip = new Label();
+			final var skip = new Label();
 			methodVisitor.visitJumpInsn( Opcodes.IFNULL, skip );
 			// this (for field write)
 			methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
@@ -77,7 +78,7 @@ public Size apply(
 			methodVisitor.visitMethodInsn(
 					Opcodes.INVOKEVIRTUAL,
 					managedCtClass.getInternalName(),
-					EnhancerConstants.INTERCEPTOR_GETTER_NAME,
+					INTERCEPTOR_GETTER_NAME,
 					constants.methodDescriptor_getInterceptor,
 					false
 			);
@@ -87,27 +88,27 @@ public Size apply(
 			methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
 
 			fieldRead( methodVisitor );
+			final String descriptor = dispatcherType.getDescriptor();
 			methodVisitor.visitMethodInsn(
 					Opcodes.INVOKEINTERFACE,
 					constants.internalName_PersistentAttributeInterceptor,
-					"read" + EnhancerImpl.capitalize( dispatcherType.getSimpleName() ),
+					"read" + capitalize( dispatcherType.getSimpleName() ),
 					Type.getMethodDescriptor(
-							Type.getType( dispatcherType.getDescriptor() ),
+							Type.getType( descriptor ),
 							Type.getType( Object.class ),
 							Type.getType( String.class ),
-							Type.getType( dispatcherType.getDescriptor() )
+							Type.getType( descriptor )
 					),
 					true
 			);
 			// field = (cast) XXX
 			if ( !dispatcherType.isPrimitive() ) {
-				methodVisitor.visitTypeInsn(
-						Opcodes.CHECKCAST, persistentFieldAsDefined.getType().asErasure().getInternalName() );
+				methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, erasure.getInternalName() );
 			}
 			fieldWrite( methodVisitor );
 			// end if
 			methodVisitor.visitLabel( skip );
-			if ( implementationContext.getClassFileVersion().isAtLeast( ClassFileVersion.JAVA_V6 ) ) {
+			if ( implementationContext.getClassFileVersion().isAtLeast( JAVA_V6 ) ) {
 				methodVisitor.visitFrame( Opcodes.F_SAME, 0, null, 0, null );
 			}
 		}
@@ -115,12 +116,17 @@ public Size apply(
 		// return field
 		methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
 		fieldRead( methodVisitor );
-		if ( !persistentField.getType().isPrimitive()
-				&& !persistentField.getType().asErasure().getInternalName().equals( persistentFieldAsDefined.getType().asErasure().getInternalName() ) ) {
-			methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, persistentField.getType().asErasure().getInternalName() );
+		final var persistentFieldType = persistentField.getType();
+		if ( !persistentFieldType.isPrimitive() ) {
+			final String internalName = persistentFieldType.asErasure().getInternalName();
+			if ( !internalName.equals( erasure.getInternalName() ) ) {
+				methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, internalName );
+			}
 		}
-		methodVisitor.visitInsn( Type.getType( persistentFieldAsDefined.getType().asErasure().getDescriptor() ).getOpcode( Opcodes.IRETURN ) );
-		return new Size( 4 + persistentFieldAsDefined.getType().getStackSize().getSize(), instrumentedMethod.getStackSize() );
+		methodVisitor.visitInsn( Type.getType( erasure.getDescriptor() )
+				.getOpcode( Opcodes.IRETURN ) );
+		return new Size( 4 + type.getStackSize().getSize(),
+				instrumentedMethod.getStackSize() );
 	}
 
 	protected abstract void fieldRead(MethodVisitor methodVisitor);
@@ -129,7 +135,10 @@ public Size apply(
 
 	private static class FieldWriting extends FieldReaderAppender {
 
-		private FieldWriting(TypeDescription managedCtClass, AnnotatedFieldDescription persistentField, EnhancerImplConstants constants) {
+		private FieldWriting(
+				TypeDescription managedCtClass,
+				AnnotatedFieldDescription persistentField,
+				EnhancerImplConstants constants) {
 			super( managedCtClass, persistentField, constants );
 		}
 
@@ -156,17 +165,27 @@ protected void fieldWrite(MethodVisitor methodVisitor) {
 
 	private static class MethodDispatching extends FieldReaderAppender {
 
-		private MethodDispatching(TypeDescription managedCtClass, AnnotatedFieldDescription persistentField, EnhancerImplConstants constants) {
+		private final String internalName;
+		private final String descriptor;
+		private final String fieldName;
+
+		private MethodDispatching(
+				TypeDescription managedCtClass,
+				AnnotatedFieldDescription persistentField,
+				EnhancerImplConstants constants) {
 			super( managedCtClass, persistentField, constants );
+			internalName = managedCtClass.getSuperClass().asErasure().getInternalName();
+			descriptor = persistentFieldAsDefined.getType().asErasure().getDescriptor();
+			fieldName = persistentFieldAsDefined.getName();
 		}
 
 		@Override
 		protected void fieldRead(MethodVisitor methodVisitor) {
 			methodVisitor.visitMethodInsn(
 					Opcodes.INVOKESPECIAL,
-					managedCtClass.getSuperClass().asErasure().getInternalName(),
-					EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + persistentFieldAsDefined.getName(),
-					Type.getMethodDescriptor( Type.getType( persistentFieldAsDefined.getType().asErasure().getDescriptor() ) ),
+					internalName,
+					PERSISTENT_FIELD_READER_PREFIX + fieldName,
+					Type.getMethodDescriptor( Type.getType( descriptor ) ),
 					false
 			);
 		}
@@ -175,26 +194,27 @@ protected void fieldRead(MethodVisitor methodVisitor) {
 		protected void fieldWrite(MethodVisitor methodVisitor) {
 			methodVisitor.visitMethodInsn(
 					Opcodes.INVOKESPECIAL,
-					managedCtClass.getSuperClass().asErasure().getInternalName(),
-					EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + persistentFieldAsDefined.getName(),
-					Type.getMethodDescriptor( Type.getType( void.class ), Type.getType( persistentFieldAsDefined.getType().asErasure().getDescriptor() ) ),
+					internalName,
+					PERSISTENT_FIELD_WRITER_PREFIX + fieldName,
+					Type.getMethodDescriptor( Type.getType( void.class ), Type.getType( descriptor ) ),
 					false
 			);
 		}
 	}
 
 	@Override
-	public boolean equals(final Object o) {
-		if ( this == o ) {
+	public boolean equals(final Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		if ( !(object instanceof FieldReaderAppender that) ) {
 			return false;
 		}
-		final FieldReaderAppender that = (FieldReaderAppender) o;
-		return Objects.equals( managedCtClass, that.managedCtClass ) &&
-			Objects.equals( persistentField, that.persistentField ) &&
-			Objects.equals( persistentFieldAsDefined, that.persistentFieldAsDefined );
+		else {
+			return Objects.equals( managedCtClass, that.managedCtClass )
+				&& Objects.equals( persistentField, that.persistentField )
+				&& Objects.equals( persistentFieldAsDefined, that.persistentFieldAsDefined );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldWriterAppender.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldWriterAppender.java
index aeadb9da147b..ccb94ec68ae4 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldWriterAppender.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldWriterAppender.java
@@ -7,7 +7,6 @@
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription;
 import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
 
-import net.bytebuddy.ClassFileVersion;
 import net.bytebuddy.description.field.FieldDescription;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
@@ -18,6 +17,9 @@
 import net.bytebuddy.jar.asm.Opcodes;
 import net.bytebuddy.jar.asm.Type;
 
+import static net.bytebuddy.ClassFileVersion.JAVA_V6;
+import static org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.capitalize;
+
 abstract class FieldWriterAppender implements ByteCodeAppender {
 
 	protected final TypeDescription managedCtClass;
@@ -26,19 +28,22 @@ abstract class FieldWriterAppender implements ByteCodeAppender {
 
 	protected final EnhancerImplConstants constants;
 
-	private FieldWriterAppender(TypeDescription managedCtClass, FieldDescription.InDefinedShape persistentFieldAsDefined, EnhancerImplConstants constants) {
+	private FieldWriterAppender(
+			TypeDescription managedCtClass,
+			FieldDescription.InDefinedShape persistentFieldAsDefined,
+			EnhancerImplConstants constants) {
 		this.managedCtClass = managedCtClass;
 		this.persistentFieldAsDefined = persistentFieldAsDefined;
 		this.constants = constants;
 	}
 
-	static ByteCodeAppender of(TypeDescription managedCtClass, AnnotatedFieldDescription persistentField, EnhancerImplConstants constants) {
-		if ( !persistentField.isVisibleTo( managedCtClass ) ) {
-			return new MethodDispatching( managedCtClass, persistentField.asDefined(), constants );
-		}
-		else {
-			return new FieldWriting( managedCtClass, persistentField.asDefined(), constants );
-		}
+	static ByteCodeAppender of(
+			TypeDescription managedCtClass,
+			AnnotatedFieldDescription persistentField,
+			EnhancerImplConstants constants) {
+		return persistentField.isVisibleTo( managedCtClass )
+				? new FieldWriting( managedCtClass, persistentField.asDefined(), constants )
+				: new MethodDispatching( managedCtClass, persistentField.asDefined(), constants );
 	}
 
 	@Override
@@ -46,9 +51,9 @@ public Size apply(
 			MethodVisitor methodVisitor,
 			Implementation.Context implementationContext,
 			MethodDescription instrumentedMethod) {
-		TypeDescription dispatcherType = persistentFieldAsDefined.getType().isPrimitive()
-				? persistentFieldAsDefined.getType().asErasure()
-				: TypeDescription.OBJECT;
+		final var type = persistentFieldAsDefined.getType();
+		final var erasure = type.asErasure();
+		final var dispatcherType = type.isPrimitive() ? erasure : TypeDescription.OBJECT;
 		// if ( this.$$_hibernate_getInterceptor() != null )
 		methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
 		methodVisitor.visitMethodInsn(
@@ -76,43 +81,45 @@ public Size apply(
 		methodVisitor.visitLdcInsn( persistentFieldAsDefined.getName() );
 		methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
 		fieldRead( methodVisitor );
-		methodVisitor.visitVarInsn( Type.getType( dispatcherType.getDescriptor() ).getOpcode( Opcodes.ILOAD ), 1 );
+		final String descriptor = dispatcherType.getDescriptor();
+		methodVisitor.visitVarInsn( Type.getType( descriptor ).getOpcode( Opcodes.ILOAD ), 1 );
 		methodVisitor.visitMethodInsn(
 				Opcodes.INVOKEINTERFACE,
 				constants.internalName_PersistentAttributeInterceptor,
-				"write" + EnhancerImpl.capitalize( dispatcherType.getSimpleName() ),
+				"write" + capitalize( dispatcherType.getSimpleName() ),
 				Type.getMethodDescriptor(
-						Type.getType( dispatcherType.getDescriptor() ),
+						Type.getType( descriptor ),
 						Type.getType( Object.class ),
 						Type.getType( String.class ),
-						Type.getType( dispatcherType.getDescriptor() ),
-						Type.getType( dispatcherType.getDescriptor() )
+						Type.getType( descriptor ),
+						Type.getType( descriptor )
 				),
 				true
 		);
 		// arg1 = (cast) XXX
 		if ( !dispatcherType.isPrimitive() ) {
-			methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, persistentFieldAsDefined.getType().asErasure().getInternalName() );
+			methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, erasure.getInternalName() );
 		}
 		fieldWrite( methodVisitor );
 		// return
 		methodVisitor.visitInsn( Opcodes.RETURN );
 		// else
 		methodVisitor.visitLabel( noInterceptor );
-		if ( implementationContext.getClassFileVersion().isAtLeast( ClassFileVersion.JAVA_V6 ) ) {
+		if ( implementationContext.getClassFileVersion().isAtLeast( JAVA_V6 ) ) {
 			methodVisitor.visitFrame( Opcodes.F_SAME, 0, null, 0, null );
 		}
 		// this (for field write)
 		methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
 		// arg1 = (cast) XXX
-		methodVisitor.visitVarInsn( Type.getType( dispatcherType.getDescriptor() ).getOpcode( Opcodes.ILOAD ), 1 );
+		methodVisitor.visitVarInsn( Type.getType( descriptor ).getOpcode( Opcodes.ILOAD ), 1 );
 		if ( !dispatcherType.isPrimitive() ) {
-			methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, persistentFieldAsDefined.getType().asErasure().getInternalName() );
+			methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, erasure.getInternalName() );
 		}
 		fieldWrite( methodVisitor );
 		// return
 		methodVisitor.visitInsn( Opcodes.RETURN );
-		return new Size( 4 + 2 * persistentFieldAsDefined.getType().getStackSize().getSize(), instrumentedMethod.getStackSize() );
+		return new Size( 4 + 2 * type.getStackSize().getSize(),
+				instrumentedMethod.getStackSize() );
 	}
 
 	protected abstract void fieldRead(MethodVisitor methodVisitor);
@@ -121,7 +128,10 @@ public Size apply(
 
 	private static class FieldWriting extends FieldWriterAppender {
 
-		private FieldWriting(TypeDescription managedCtClass, FieldDescription.InDefinedShape persistentFieldAsDefined, EnhancerImplConstants constants) {
+		private FieldWriting(
+				TypeDescription managedCtClass,
+				FieldDescription.InDefinedShape persistentFieldAsDefined,
+				EnhancerImplConstants constants) {
 			super( managedCtClass, persistentFieldAsDefined, constants );
 		}
 
@@ -148,7 +158,10 @@ protected void fieldWrite(MethodVisitor methodVisitor) {
 
 	private static class MethodDispatching extends FieldWriterAppender {
 
-		private MethodDispatching(TypeDescription managedCtClass, FieldDescription.InDefinedShape persistentFieldAsDefined, EnhancerImplConstants constants) {
+		private MethodDispatching(
+				TypeDescription managedCtClass,
+				FieldDescription.InDefinedShape persistentFieldAsDefined,
+				EnhancerImplConstants constants) {
 			super( managedCtClass, persistentFieldAsDefined, constants );
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetFieldOnArgument.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetFieldOnArgument.java
index 5aa5f5810fc1..1b1f9a533e96 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetFieldOnArgument.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetFieldOnArgument.java
@@ -10,6 +10,7 @@
 import net.bytebuddy.jar.asm.MethodVisitor;
 import net.bytebuddy.jar.asm.Opcodes;
 import net.bytebuddy.jar.asm.Type;
+import org.hibernate.AssertionFailure;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
@@ -29,45 +30,44 @@ public Size apply(
 			Implementation.Context implementationContext,
 			MethodDescription instrumentedMethod) {
 		methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
+		final var declaringClass = getterMember.getDeclaringClass();
 		final Class<?> type;
 		if ( getterMember instanceof Method getter ) {
 			type = getter.getReturnType();
 			methodVisitor.visitMethodInsn(
-					getter.getDeclaringClass().isInterface() ?
-							Opcodes.INVOKEINTERFACE :
-							Opcodes.INVOKEVIRTUAL,
-					Type.getInternalName( getter.getDeclaringClass() ),
+					declaringClass.isInterface()
+							? Opcodes.INVOKEINTERFACE
+							: Opcodes.INVOKEVIRTUAL,
+					Type.getInternalName( declaringClass ),
 					getter.getName(),
 					Type.getMethodDescriptor( getter ),
-					getter.getDeclaringClass().isInterface()
+					declaringClass.isInterface()
 			);
 		}
-		else {
-			final Field getter = (Field) getterMember;
+		else if ( getterMember instanceof Field getter ) {
 			type = getter.getType();
 			methodVisitor.visitFieldInsn(
 					Opcodes.GETFIELD,
-					Type.getInternalName( getter.getDeclaringClass() ),
+					Type.getInternalName( declaringClass ),
 					getter.getName(),
 					Type.getDescriptor( type )
 			);
 		}
+		else {
+			throw new AssertionFailure( "Unknown getter member type" );
+		}
 		methodVisitor.visitInsn( getReturnOpCode( type ) );
 		return new Size( 2, instrumentedMethod.getStackSize() );
 	}
 
 	private int getReturnOpCode(Class<?> type) {
-		if ( type.isPrimitive() ) {
-			switch ( type.getTypeName() ) {
-				case "long":
-					return Opcodes.LRETURN;
-				case "float":
-					return Opcodes.FRETURN;
-				case "double":
-					return Opcodes.DRETURN;
-			}
-			return Opcodes.IRETURN;
-		}
-		return Opcodes.ARETURN;
+		return type.isPrimitive()
+				? switch ( type.getTypeName() ) {
+					case "long" -> Opcodes.LRETURN;
+					case "float" -> Opcodes.FRETURN;
+					case "double" -> Opcodes.DRETURN;
+					default -> Opcodes.IRETURN;
+				}
+				: Opcodes.ARETURN;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetPropertyValues.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetPropertyValues.java
index 403b42e168cf..0a0964b0cf3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetPropertyValues.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/GetPropertyValues.java
@@ -22,9 +22,10 @@
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
+import static java.util.Collections.emptyList;
+
 /**
  * Helper class to generate bytecode for getting property values, used by BytecodeProviderImpl.
  * Moved into package org.hibernate.bytecode.enhance.internal.bytebuddy to benefit from the constants.
@@ -71,7 +72,7 @@ public Size apply(
 			);
 
 			// Jump to the false label if the instanceof check fails
-			final Label instanceofFalseLabel = new Label();
+			final var instanceofFalseLabel = new Label();
 			methodVisitor.visitJumpInsn( Opcodes.IFEQ, instanceofFalseLabel );
 
 			// Cast to the subtype, so we can mark the property as initialized
@@ -83,7 +84,7 @@ public Size apply(
 			methodVisitor.visitVarInsn( Opcodes.ASTORE, 2 );
 
 			// Skip the cleanup
-			final Label instanceofEndLabel = new Label();
+			final var instanceofEndLabel = new Label();
 			methodVisitor.visitJumpInsn( Opcodes.GOTO, instanceofEndLabel );
 
 			// Here is the cleanup section for the false branch
@@ -105,8 +106,8 @@ public Size apply(
 			methodVisitor.visitLabel( instanceofEndLabel );
 			implementationContext.getFrameGeneration().full(
 					methodVisitor,
-					Collections.emptyList(),
-					Arrays.asList(
+					emptyList(),
+					List.of(
 							implementationContext.getInstrumentedType(),
 							constants.TypeObject,
 							constants.TypeLazyAttributeLoadingInterceptor
@@ -116,18 +117,18 @@ public Size apply(
 		methodVisitor.visitLdcInsn( getters.length );
 		methodVisitor.visitTypeInsn( Opcodes.ANEWARRAY, constants.internalName_Object );
 		for ( int index = 0; index < getters.length; index++ ) {
-			final Member getterMember = getters[index];
+			final var getterMember = getters[index];
 			methodVisitor.visitInsn( Opcodes.DUP );
 			methodVisitor.visitLdcInsn( index );
 
-			final Label arrayStoreLabel = new Label();
+			final var arrayStoreLabel = new Label();
 			if ( getterMember == BytecodeProviderImpl.EMBEDDED_MEMBER ) {
 				// The embedded property access returns the owner
 				methodVisitor.visitVarInsn( Opcodes.ALOAD, 1 );
 			}
 			else {
 				if ( persistentAttributeInterceptable ) {
-					final Label extractValueLabel = new Label();
+					final var extractValueLabel = new Label();
 
 					// Load the LazyAttributeLoadingInterceptor
 					methodVisitor.visitVarInsn( Opcodes.ALOAD, 2 );
@@ -179,39 +180,40 @@ public Size apply(
 				methodVisitor.visitVarInsn( Opcodes.ALOAD, 1 );
 				methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, internalClazzName );
 
+				final var declaringClass = getterMember.getDeclaringClass();
 				final Class<?> type;
 				if ( getterMember instanceof Method getter ) {
 					type = getter.getReturnType();
 					methodVisitor.visitMethodInsn(
-							getter.getDeclaringClass().isInterface() ?
-									Opcodes.INVOKEINTERFACE :
-									Opcodes.INVOKEVIRTUAL,
-							Type.getInternalName( getter.getDeclaringClass() ),
+							declaringClass.isInterface()
+									? Opcodes.INVOKEINTERFACE
+									: Opcodes.INVOKEVIRTUAL,
+							Type.getInternalName( declaringClass ),
 							getter.getName(),
 							Type.getMethodDescriptor( getter ),
-							getter.getDeclaringClass().isInterface()
+							declaringClass.isInterface()
 					);
 				}
 				else if ( getterMember instanceof Field getter ) {
 					type = getter.getType();
 					methodVisitor.visitFieldInsn(
 							Opcodes.GETFIELD,
-							Type.getInternalName( getter.getDeclaringClass() ),
+							Type.getInternalName( declaringClass ),
 							getter.getName(),
 							Type.getDescriptor( type )
 					);
 				}
-				else {
-					assert getterMember instanceof ForeignPackageMember;
-					final ForeignPackageMember foreignPackageMember = (ForeignPackageMember) getterMember;
-					final Member underlyingMember = foreignPackageMember.getMember();
+				else if ( getterMember instanceof ForeignPackageMember foreignPackageMember ) {
+					final var underlyingMember = foreignPackageMember.getMember();
 					if ( underlyingMember instanceof Method getter ) {
 						type = getter.getReturnType();
 					}
-					else {
-						final Field getter = (Field) underlyingMember;
+					else if ( underlyingMember instanceof Field getter ) {
 						type = getter.getType();
 					}
+					else {
+						throw new AssertionError( "Unknown underlying member type" );
+					}
 					methodVisitor.visitMethodInsn(
 							Opcodes.INVOKESTATIC,
 							Type.getInternalName( foreignPackageMember.getForeignPackageAccessor() ),
@@ -223,6 +225,9 @@ else if ( getterMember instanceof Field getter ) {
 							false
 					);
 				}
+				else {
+					throw new AssertionError( "Unknown getter member type" );
+				}
 				if ( type.isPrimitive() ) {
 					PrimitiveBoxingDelegate.forPrimitive( new TypeDescription.ForLoadedType( type ) )
 							.assignBoxedTo(
@@ -237,7 +242,7 @@ else if ( getterMember instanceof Field getter ) {
 				methodVisitor.visitLabel( arrayStoreLabel );
 				implementationContext.getFrameGeneration().full(
 						methodVisitor,
-						Arrays.asList(
+						List.of(
 								constants.Type_Array_Object,
 								constants.Type_Array_Object,
 								constants.TypeIntegerPrimitive,
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckerEqualsHelper.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckerEqualsHelper.java
index bb5b0e8b97f0..6c8410644252 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckerEqualsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckerEqualsHelper.java
@@ -7,21 +7,22 @@
 import java.util.Objects;
 
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
-import org.hibernate.engine.spi.PersistentAttributeInterceptor;
 
 public final class InlineDirtyCheckerEqualsHelper {
 
+	private static boolean isLoaded(PersistentAttributeInterceptable persistentAttributeInterceptable, String fieldName) {
+		final var persistentAttributeInterceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
+		return persistentAttributeInterceptor == null
+			|| persistentAttributeInterceptor.isAttributeLoaded( fieldName );
+	}
+
 	public static boolean areEquals(
 			PersistentAttributeInterceptable persistentAttributeInterceptable,
 			String fieldName,
 			Object a,
 			Object b) {
-		final PersistentAttributeInterceptor persistentAttributeInterceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-		if ( persistentAttributeInterceptor != null
-				&& !persistentAttributeInterceptor.isAttributeLoaded( fieldName ) ) {
-			return false;
-		}
-		return Objects.deepEquals( a, b );
+		return isLoaded( persistentAttributeInterceptable, fieldName )
+			&& Objects.deepEquals( a, b );
 	}
 
 	public static boolean areEquals(
@@ -29,12 +30,8 @@ public static boolean areEquals(
 			String fieldName,
 			boolean a,
 			boolean b) {
-		final PersistentAttributeInterceptor persistentAttributeInterceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-		if ( persistentAttributeInterceptor != null
-				&& !persistentAttributeInterceptor.isAttributeLoaded( fieldName ) ) {
-			return false;
-		}
-		return a == b;
+		return isLoaded( persistentAttributeInterceptable, fieldName )
+			&& a == b;
 	}
 
 	public static boolean areEquals(
@@ -42,12 +39,8 @@ public static boolean areEquals(
 			String fieldName,
 			byte a,
 			byte b) {
-		final PersistentAttributeInterceptor persistentAttributeInterceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-		if ( persistentAttributeInterceptor != null
-				&& !persistentAttributeInterceptor.isAttributeLoaded( fieldName ) ) {
-			return false;
-		}
-		return a == b;
+		return isLoaded( persistentAttributeInterceptable, fieldName )
+			&& a == b;
 	}
 
 	public static boolean areEquals(
@@ -55,12 +48,8 @@ public static boolean areEquals(
 			String fieldName,
 			short a,
 			short b) {
-		final PersistentAttributeInterceptor persistentAttributeInterceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-		if ( persistentAttributeInterceptor != null
-				&& !persistentAttributeInterceptor.isAttributeLoaded( fieldName ) ) {
-			return false;
-		}
-		return a == b;
+		return isLoaded( persistentAttributeInterceptable, fieldName )
+			&& a == b;
 	}
 
 	public static boolean areEquals(
@@ -68,12 +57,8 @@ public static boolean areEquals(
 			String fieldName,
 			char a,
 			char b) {
-		final PersistentAttributeInterceptor persistentAttributeInterceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-		if ( persistentAttributeInterceptor != null
-				&& !persistentAttributeInterceptor.isAttributeLoaded( fieldName ) ) {
-			return false;
-		}
-		return a == b;
+		return isLoaded( persistentAttributeInterceptable, fieldName )
+			&& a == b;
 	}
 
 	public static boolean areEquals(
@@ -81,12 +66,8 @@ public static boolean areEquals(
 			String fieldName,
 			int a,
 			int b) {
-		final PersistentAttributeInterceptor persistentAttributeInterceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-		if ( persistentAttributeInterceptor != null
-				&& !persistentAttributeInterceptor.isAttributeLoaded( fieldName ) ) {
-			return false;
-		}
-		return a == b;
+		return isLoaded( persistentAttributeInterceptable, fieldName )
+			&& a == b;
 	}
 
 	public static boolean areEquals(
@@ -94,12 +75,8 @@ public static boolean areEquals(
 			String fieldName,
 			long a,
 			long b) {
-		final PersistentAttributeInterceptor persistentAttributeInterceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-		if ( persistentAttributeInterceptor != null
-				&& !persistentAttributeInterceptor.isAttributeLoaded( fieldName ) ) {
-			return false;
-		}
-		return a == b;
+		return isLoaded( persistentAttributeInterceptable, fieldName )
+			&& a == b;
 	}
 
 	public static boolean areEquals(
@@ -107,12 +84,8 @@ public static boolean areEquals(
 			String fieldName,
 			float a,
 			float b) {
-		final PersistentAttributeInterceptor persistentAttributeInterceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-		if ( persistentAttributeInterceptor != null
-				&& !persistentAttributeInterceptor.isAttributeLoaded( fieldName ) ) {
-			return false;
-		}
-		return a == b;
+		return isLoaded( persistentAttributeInterceptable, fieldName )
+			&& a == b;
 	}
 
 	public static boolean areEquals(
@@ -120,11 +93,7 @@ public static boolean areEquals(
 			String fieldName,
 			double a,
 			double b) {
-		final PersistentAttributeInterceptor persistentAttributeInterceptor = persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-		if ( persistentAttributeInterceptor != null
-				&& !persistentAttributeInterceptor.isAttributeLoaded( fieldName ) ) {
-			return false;
-		}
-		return a == b;
+		return isLoaded( persistentAttributeInterceptable, fieldName )
+			&& a == b;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java
index 3eaede6d814f..81311e58bef4 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java
@@ -11,10 +11,8 @@
 import jakarta.persistence.Id;
 
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription;
-import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
 
-import net.bytebuddy.ClassFileVersion;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.field.FieldDescription;
 import net.bytebuddy.description.method.MethodDescription;
@@ -27,6 +25,10 @@
 import net.bytebuddy.jar.asm.Opcodes;
 import net.bytebuddy.jar.asm.Type;
 
+import static net.bytebuddy.ClassFileVersion.JAVA_V6;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.TRACKER_CHANGER_NAME;
+
 final class InlineDirtyCheckingHandler implements Implementation, ByteCodeAppender {
 
 	private static final String HELPER_TYPE_NAME = Type.getInternalName( InlineDirtyCheckerEqualsHelper.class );
@@ -85,7 +87,9 @@ else if ( !persistentField.hasAnnotation( Id.class )
 				Advice.WithCustomMapping advice = Advice.withCustomMapping();
 				advice = persistentField.isVisibleTo( managedCtClass )
 						? advice.bind( CodeTemplates.FieldValue.class, persistentField.getFieldDescription() )
-						: advice.bind( CodeTemplates.FieldValue.class, new CodeTemplates.GetterMapping( persistentField.getFieldDescription(), persistentField.getGetter().get().getReturnType() ) );
+						: advice.bind( CodeTemplates.FieldValue.class,
+								new CodeTemplates.GetterMapping( persistentField.getFieldDescription(),
+										persistentField.getGetter().get().getReturnType() ) );
 
 				implementation = advice
 						.bind( CodeTemplates.FieldName.class, persistentField.getName() )
@@ -111,18 +115,20 @@ public Size apply(
 			MethodVisitor methodVisitor,
 			Context implementationContext,
 			MethodDescription instrumentedMethod) {
-		// if (arg != field) {
-
+		final var type = persistentField.getType();
+		final var erasure = type.asErasure();
+		final var declaringType = persistentField.getDeclaringType();
 		if ( applyLazyCheck ) {
 			methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
 			methodVisitor.visitLdcInsn( persistentField.getName() );
 		}
-		methodVisitor.visitVarInsn( Type.getType( persistentField.getType().asErasure().getDescriptor() ).getOpcode( Opcodes.ILOAD ), 1 );
+		methodVisitor.visitVarInsn( Type.getType( erasure.getDescriptor() ).getOpcode( Opcodes.ILOAD ), 1 );
 		methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
-		if ( persistentField.getDeclaringType().asErasure().equals( managedCtClass ) ) {
+		final var declaringTypeErasure = declaringType.asErasure();
+		if ( declaringTypeErasure.equals( managedCtClass ) ) {
 			methodVisitor.visitFieldInsn(
 					Opcodes.GETFIELD,
-					persistentField.getDeclaringType().asErasure().getInternalName(),
+					declaringTypeErasure.getInternalName(),
 					persistentField.getName(),
 					persistentField.getDescriptor()
 			);
@@ -130,16 +136,16 @@ public Size apply(
 		else {
 			methodVisitor.visitMethodInsn(
 					Opcodes.INVOKEVIRTUAL,
-					persistentField.getDeclaringType().asErasure().getInternalName(),
-					EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + persistentField.getName(),
+					declaringTypeErasure.getInternalName(),
+					PERSISTENT_FIELD_READER_PREFIX + persistentField.getName(),
 					Type.getMethodDescriptor( Type.getType( persistentField.getDescriptor() ) ),
 					false
 			);
 		}
 		int branchCode;
 		if ( applyLazyCheck ) {
-			if ( persistentField.getType().isPrimitive() ) {
-				final Type fieldType = Type.getType( persistentField.getDescriptor() );
+			if ( type.isPrimitive() ) {
+				final var fieldType = Type.getType( persistentField.getDescriptor() );
 				methodVisitor.visitMethodInsn(
 						Opcodes.INVOKESTATIC,
 						HELPER_TYPE_NAME,
@@ -172,14 +178,14 @@ public Size apply(
 			branchCode = Opcodes.IFNE;
 		}
 		else {
-			if ( persistentField.getType().isPrimitive() ) {
-				if ( persistentField.getType().represents( long.class ) ) {
+			if ( type.isPrimitive() ) {
+				if ( type.represents( long.class ) ) {
 					methodVisitor.visitInsn( Opcodes.LCMP );
 				}
-				else if ( persistentField.getType().represents( float.class ) ) {
+				else if ( type.represents( float.class ) ) {
 					methodVisitor.visitInsn( Opcodes.FCMPL );
 				}
-				else if ( persistentField.getType().represents( double.class ) ) {
+				else if ( type.represents( double.class ) ) {
 					methodVisitor.visitInsn( Opcodes.DCMPL );
 				}
 				else {
@@ -202,7 +208,7 @@ else if ( persistentField.getType().represents( double.class ) ) {
 				branchCode = Opcodes.IFNE;
 			}
 		}
-		Label skip = new Label();
+		final var skip = new Label();
 		methodVisitor.visitJumpInsn( branchCode, skip );
 		// this.$$_hibernate_trackChange(fieldName)
 		methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
@@ -210,30 +216,32 @@ else if ( persistentField.getType().represents( double.class ) ) {
 		methodVisitor.visitMethodInsn(
 				Opcodes.INVOKEVIRTUAL,
 				managedCtClass.getInternalName(),
-				EnhancerConstants.TRACKER_CHANGER_NAME,
+				TRACKER_CHANGER_NAME,
 				Type.getMethodDescriptor( Type.VOID_TYPE, STRING_TYPE ),
 				false
 		);
 		// }
 		methodVisitor.visitLabel( skip );
-		if ( implementationContext.getClassFileVersion().isAtLeast( ClassFileVersion.JAVA_V6 ) ) {
+		if ( implementationContext.getClassFileVersion().isAtLeast( JAVA_V6 ) ) {
 			methodVisitor.visitFrame( Opcodes.F_SAME, 0, null, 0, null );
 		}
-		return new Size( 3 + 2 * persistentField.getType().asErasure().getStackSize().getSize(), instrumentedMethod.getStackSize() );
+		return new Size( 3 + 2 * erasure.getStackSize().getSize(),
+				instrumentedMethod.getStackSize() );
 	}
 
 	@Override
-	public boolean equals(final Object o) {
-		if ( this == o ) {
+	public boolean equals(final Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || InlineDirtyCheckingHandler.class != o.getClass() ) {
+		else if ( !(object instanceof InlineDirtyCheckingHandler that) ) {
 			return false;
 		}
-		final InlineDirtyCheckingHandler that = (InlineDirtyCheckingHandler) o;
-		return Objects.equals( delegate, that.delegate ) &&
-			Objects.equals( managedCtClass, that.managedCtClass ) &&
-			Objects.equals( persistentField, that.persistentField );
+		else {
+			return Objects.equals( delegate, that.delegate )
+				&& Objects.equals( managedCtClass, that.managedCtClass )
+				&& Objects.equals( persistentField, that.persistentField );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ModelTypePool.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ModelTypePool.java
index a62095d8aad1..943879e5abd6 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ModelTypePool.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ModelTypePool.java
@@ -18,7 +18,10 @@ public class ModelTypePool extends TypePool.Default implements EnhancerClassLoca
 	private final EnhancerClassFileLocator locator;
 	private final EnhancerCacheProvider poolCache;
 
-	private ModelTypePool(EnhancerCacheProvider cacheProvider, EnhancerClassFileLocator classFileLocator, CoreTypePool parent) {
+	private ModelTypePool(
+			EnhancerCacheProvider cacheProvider,
+			EnhancerClassFileLocator classFileLocator,
+			CoreTypePool parent) {
 		super( cacheProvider, classFileLocator, ReaderMode.FAST, parent );
 		this.poolCache = cacheProvider;
 		this.locator = classFileLocator;
@@ -30,9 +33,10 @@ private ModelTypePool(EnhancerCacheProvider cacheProvider, EnhancerClassFileLoca
 	 * This TypePool will delegate, parent first, to a newly constructed empty instance
 	 * of CoreTypePool; this parent pool will be used to load non-application types from
 	 * the Hibernate classloader instead, not the one specified as argument.
-	 * @see CoreTypePool
+	 *
 	 * @param classLoader
 	 * @return the newly created EnhancerClassLocator
+	 * @see CoreTypePool
 	 */
 	public static EnhancerClassLocator buildModelTypePool(ClassLoader classLoader) {
 		return buildModelTypePool( ClassFileLocator.ForClassLoader.of( classLoader ) );
@@ -42,6 +46,7 @@ public static EnhancerClassLocator buildModelTypePool(ClassLoader classLoader) {
 	 * Similar to {@link #buildModelTypePool(ClassLoader)} except the application classes
 	 * are not necessarily sourced from a standard classloader: it accepts a {@link ClassFileLocator},
 	 * which offers some more flexibility.
+	 *
 	 * @param classFileLocator
 	 * @return the newly created EnhancerClassLocator
 	 */
@@ -55,6 +60,7 @@ public static EnhancerClassLocator buildModelTypePool(ClassFileLocator classFile
 	 * This forms allows constructing a custom CoreTypePool and also separated the cache of the parent pool,
 	 * which might be useful to reuse for multiple enhancement processes while desiring a clean new
 	 * state for the {@link ModelTypePool}.
+	 *
 	 * @param classFileLocator
 	 * @param coreTypePool
 	 * @return
@@ -65,6 +71,7 @@ public static EnhancerClassLocator buildModelTypePool(ClassFileLocator classFile
 
 	/**
 	 * The more advanced strategy to construct a new ModelTypePool, allowing customization of all its aspects.
+	 *
 	 * @param classFileLocator
 	 * @param coreTypePool
 	 * @param cacheProvider
@@ -74,19 +81,19 @@ static EnhancerClassLocator buildModelTypePool(ClassFileLocator classFileLocator
 		Objects.requireNonNull( classFileLocator );
 		Objects.requireNonNull( coreTypePool );
 		Objects.requireNonNull( cacheProvider );
-		return new ModelTypePool( cacheProvider, new EnhancerClassFileLocator( cacheProvider, classFileLocator ), coreTypePool );
+		return new ModelTypePool( cacheProvider,
+				new EnhancerClassFileLocator( cacheProvider, classFileLocator ), coreTypePool );
 	}
 
 	@Override
 	public void registerClassNameAndBytes(final String className, final byte[] bytes) {
-		final EnhancerCacheProvider.EnhancementState currentEnhancementState = poolCache.getEnhancementState();
+		final var currentEnhancementState = poolCache.getEnhancementState();
 		if ( currentEnhancementState != null ) {
 			throw new IllegalStateException( "Re-entrant enhancement is not supported: " + className );
 		}
-		final EnhancerCacheProvider.EnhancementState state = new EnhancerCacheProvider.EnhancementState(
-				className,
-				new ClassFileLocator.Resolution.Explicit( Objects.requireNonNull( bytes ) )
-		);
+		final var state =
+				new EnhancerCacheProvider.EnhancementState( className,
+						new ClassFileLocator.Resolution.Explicit( Objects.requireNonNull( bytes ) ) );
 		// Set the state first because the ClassFileLocator needs this in the doDescribe() call below
 		poolCache.setEnhancementState( state );
 		state.setTypePoolResolution( doDescribe( className ) );
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/NameEncodeHelper.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/NameEncodeHelper.java
index be9773afc730..153ef9dc92c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/NameEncodeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/NameEncodeHelper.java
@@ -8,25 +8,23 @@
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 
+import static java.lang.Integer.toHexString;
 import static org.hibernate.bytecode.internal.bytebuddy.BytecodeProviderImpl.EMBEDDED_MEMBER;
 
 public class NameEncodeHelper {
 
 	public static String encodeName(String[] propertyNames, Member[] getters, Member[] setters) {
-		final StringBuilder sb = new StringBuilder();
+		final var encoded = new StringBuilder();
 		for ( int i = 0; i < propertyNames.length; i++ ) {
-			final String propertyName = propertyNames[i];
-			final Member getter = getters[i];
-			final Member setter = setters[i];
-			// Encode the two member types as 4 bit integer encoded as hex character
-			sb.append( Integer.toHexString( getKind( getter ) << 2 | getKind( setter ) ) );
-			sb.append( propertyName );
+			// Encode the two member types as 4-bit integer encoded as hex character
+			encoded.append( toHexString( getKind( getters[i] ) << 2 | getKind( setters[i] ) ) );
+			encoded.append( propertyNames[i] );
 		}
-		return sb.toString();
+		return encoded.toString();
 	}
 
 	private static int getKind(Member member) {
-		// Encode the member type as 2 bit integer
+		// Encode the member type as 2-bit integer
 		if ( member == EMBEDDED_MEMBER ) {
 			return 0;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
index eaa5eb739662..56b976cda919 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java
@@ -4,15 +4,17 @@
  */
 package org.hibernate.bytecode.enhance.internal.bytebuddy;
 
+import static java.util.Collections.emptyList;
 import static net.bytebuddy.matcher.ElementMatchers.anyOf;
 import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
 import static net.bytebuddy.matcher.ElementMatchers.not;
 import static org.hibernate.bytecode.enhance.internal.BytecodeEnhancementLogging.ENHANCEMENT_LOGGER;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX;
+import static org.hibernate.bytecode.enhance.spi.EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -108,25 +110,26 @@ public static PersistentAttributeTransformer collectPersistentFields(
 			ByteBuddyEnhancementContext enhancementContext,
 			TypePool classPool,
 			EnhancerImplConstants constants) {
-		List<AnnotatedFieldDescription> persistentFieldList = new ArrayList<>();
+		final List<AnnotatedFieldDescription> persistentFieldList = new ArrayList<>();
 		// HHH-10646 Add fields inherited from @MappedSuperclass
 		// HHH-10981 There is no need to do it for @MappedSuperclass
 		// HHH-15505 This needs to be done first so that fields with the same name in the mappedsuperclass and entity are handled correctly
 		if ( !enhancementContext.isMappedSuperclassClass( managedCtClass ) ) {
 			persistentFieldList.addAll( collectInheritPersistentFields( managedCtClass, enhancementContext ) );
 		}
-		for ( FieldDescription ctField : managedCtClass.getDeclaredFields() ) {
+		for ( var ctField : managedCtClass.getDeclaredFields() ) {
 			// skip static fields and skip fields added by enhancement and  outer reference in inner classes
-			if ( ctField.getName().startsWith( "$$_hibernate_" ) || "this$0".equals( ctField.getName() ) ) {
-				continue;
-			}
-			AnnotatedFieldDescription annotatedField = new AnnotatedFieldDescription( enhancementContext, ctField );
-			if ( !ctField.isStatic() && enhancementContext.isPersistentField( annotatedField ) ) {
-				persistentFieldList.add( annotatedField );
+			if ( !ctField.getName().startsWith( "$$_hibernate_" )
+				&& !"this$0".equals( ctField.getName() ) ) {
+				final var annotatedField = new AnnotatedFieldDescription( enhancementContext, ctField );
+				if ( !ctField.isStatic() && enhancementContext.isPersistentField( annotatedField ) ) {
+					persistentFieldList.add( annotatedField );
+				}
 			}
 		}
 
-		AnnotatedFieldDescription[] orderedFields = enhancementContext.order( persistentFieldList.toArray( new AnnotatedFieldDescription[0] ) );
+		final var orderedFields =
+				enhancementContext.order( persistentFieldList.toArray( new AnnotatedFieldDescription[0] ) );
 		if ( ENHANCEMENT_LOGGER.isTraceEnabled() ) {
 			ENHANCEMENT_LOGGER.persistentFieldsForEntity(
 					managedCtClass.getName(),
@@ -140,15 +143,14 @@ private static Collection<AnnotatedFieldDescription> collectInheritPersistentFie
 			TypeDefinition managedCtClass,
 			ByteBuddyEnhancementContext enhancementContext) {
 		if ( managedCtClass == null || managedCtClass.represents( Object.class ) ) {
-			return Collections.emptyList();
+			return emptyList();
 		}
-		TypeDefinition managedCtSuperclass = managedCtClass.getSuperClass();
-
+		final var managedCtSuperclass = managedCtClass.getSuperClass();
 		// If managedCtSuperclass is null, managedCtClass can be either interface or module-info.
 		// Interfaces are already filtered-out, and module-info does not have any fields to enhance
 		// so we can safely return empty list.
 		if ( managedCtSuperclass == null || enhancementContext.isEntityClass( managedCtSuperclass.asErasure() ) ) {
-			return Collections.emptyList();
+			return emptyList();
 		}
 		else if ( !enhancementContext.isMappedSuperclassClass( managedCtSuperclass.asErasure() ) ) {
 			return collectInheritPersistentFields( managedCtSuperclass, enhancementContext );
@@ -156,15 +158,15 @@ else if ( !enhancementContext.isMappedSuperclassClass( managedCtSuperclass.asEra
 
 		ENHANCEMENT_LOGGER.foundMappedSuperclass( String.valueOf( managedCtSuperclass ) );
 
-		List<AnnotatedFieldDescription> persistentFieldList = new ArrayList<>();
+		final List<AnnotatedFieldDescription> persistentFieldList = new ArrayList<>();
 
-		for ( FieldDescription ctField : managedCtSuperclass.getDeclaredFields() ) {
-			if ( ctField.getName().startsWith( "$$_hibernate_" ) || "this$0".equals( ctField.getName() ) ) {
-				continue;
-			}
-			AnnotatedFieldDescription annotatedField = new AnnotatedFieldDescription( enhancementContext, ctField );
-			if ( !ctField.isStatic() && enhancementContext.isPersistentField( annotatedField ) ) {
-				persistentFieldList.add( annotatedField );
+		for ( var ctField : managedCtSuperclass.getDeclaredFields() ) {
+			if ( !ctField.getName().startsWith( "$$_hibernate_" )
+				&& !"this$0".equals( ctField.getName() ) ) {
+				final var annotatedField = new AnnotatedFieldDescription( enhancementContext, ctField );
+				if ( !ctField.isStatic() && enhancementContext.isPersistentField( annotatedField ) ) {
+					persistentFieldList.add( annotatedField );
+				}
 			}
 		}
 		persistentFieldList.addAll( collectInheritPersistentFields( managedCtSuperclass, enhancementContext ) );
@@ -183,14 +185,14 @@ public MethodVisitor wrap(
 		return new MethodVisitor( OpenedClassReader.ASM_API, methodVisitor ) {
 			@Override
 			public void visitFieldInsn(int opcode, String owner, String name, String desc) {
-				AnnotatedFieldDescription enhancedField = getEnhancedField( owner, name, desc );
+				final var enhancedField = getEnhancedField( owner, name, desc );
 				if ( enhancedField != null ) {
 					switch ( opcode ) {
 						case Opcodes.GETFIELD:
 							methodVisitor.visitMethodInsn(
 									Opcodes.INVOKEVIRTUAL,
 									owner,
-									EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + name,
+									PERSISTENT_FIELD_READER_PREFIX + name,
 									"()" + desc,
 									false
 							);
@@ -204,7 +206,7 @@ public void visitFieldInsn(int opcode, String owner, String name, String desc) {
 							methodVisitor.visitMethodInsn(
 									Opcodes.INVOKEVIRTUAL,
 									owner,
-									EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + name,
+									PERSISTENT_FIELD_WRITER_PREFIX + name,
 									"(" + desc + ")V",
 									false
 							);
@@ -217,7 +219,7 @@ public void visitFieldInsn(int opcode, String owner, String name, String desc) {
 	}
 
 	private AnnotatedFieldDescription getEnhancedField(String owner, String name, String desc) {
-		for ( AnnotatedFieldDescription enhancedField : enhancedFields ) {
+		for ( var enhancedField : enhancedFields ) {
 			if ( enhancedField.getName().equals( name )
 					&& enhancedField.getDescriptor().equals( desc )
 					&& enhancedField.getDeclaringType().asErasure().getInternalName().equals( owner ) ) {
@@ -243,9 +245,9 @@ DynamicType.Builder<?> applyTo(DynamicType.Builder<?> builder) {
 		// 1. We sometimes need to write to final fields when they are lazy.
 		// 2. Those fields are already written to by Hibernate ORM through reflection anyway.
 		// 3. The compiler already makes sure that final fields are not written to from the user's source code.
-		List<FieldDescription.InDefinedShape> enhancedFieldsAsDefined = new ArrayList<>();
-		for ( AnnotatedFieldDescription f : enhancedFields ) {
-			enhancedFieldsAsDefined.add( f.asDefined() );
+		final List<FieldDescription.InDefinedShape> enhancedFieldsAsDefined = new ArrayList<>();
+		for ( var fieldDescription : enhancedFields ) {
+			enhancedFieldsAsDefined.add( fieldDescription.asDefined() );
 		}
 		// Replace the private modifier with package-private for all enhanced fields,
 		// because our AccessOptimizer needs to get/set fields and can't use field reader/writer,
@@ -256,10 +258,10 @@ DynamicType.Builder<?> applyTo(DynamicType.Builder<?> builder) {
 						REMOVE_PRIVATE_FINAL_MODIFIER
 				)
 		);
-		for ( AnnotatedFieldDescription enhancedField : enhancedFields ) {
+		for ( var enhancedField : enhancedFields ) {
 			builder = builder
 					.defineMethod(
-							EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + enhancedField.getName(),
+							PERSISTENT_FIELD_READER_PREFIX + enhancedField.getName(),
 							enhancedField.asDefined().getType().asErasure(),
 							constants.modifierPUBLIC
 					)
@@ -269,7 +271,7 @@ DynamicType.Builder<?> applyTo(DynamicType.Builder<?> builder) {
 			if ( !enhancedField.getFieldDescription().isFinal() ) {
 				builder = builder
 						.defineMethod(
-								EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + enhancedField.getName(),
+								PERSISTENT_FIELD_WRITER_PREFIX + enhancedField.getName(),
 								constants.TypeVoid,
 								constants.modifierPUBLIC
 						)
@@ -306,7 +308,7 @@ private Implementation fieldReader(AnnotatedFieldDescription enhancedField) {
 		if ( enhancementContext.isMappedSuperclassClass( managedCtClass ) ) {
 			return FieldAccessor.ofField( enhancedField.getName() ).in( enhancedField.getDeclaringType().asErasure() );
 		}
-		if ( !enhancementContext.hasLazyLoadableAttributes( managedCtClass ) || !enhancementContext.isLazyLoadable( enhancedField ) ) {
+		else if ( !enhancementContext.hasLazyLoadableAttributes( managedCtClass ) || !enhancementContext.isLazyLoadable( enhancedField ) ) {
 			if ( enhancedField.getDeclaringType().asErasure().equals( managedCtClass ) ) {
 				return FieldAccessor.ofField( enhancedField.getName() ).in( enhancedField.getDeclaringType().asErasure() );
 			}
@@ -332,7 +334,7 @@ private Implementation fieldWriterImplementation(AnnotatedFieldDescription enhan
 		if ( enhancementContext.isMappedSuperclassClass( managedCtClass ) ) {
 			return FieldAccessor.ofField( enhancedField.getName() ).in( enhancedField.getDeclaringType().asErasure() );
 		}
-		if ( !enhancementContext.hasLazyLoadableAttributes( managedCtClass ) || !enhancementContext.isLazyLoadable( enhancedField ) ) {
+		else if ( !enhancementContext.hasLazyLoadableAttributes( managedCtClass ) || !enhancementContext.isLazyLoadable( enhancedField ) ) {
 			if ( enhancedField.getDeclaringType().asErasure().equals( managedCtClass ) ) {
 				return FieldAccessor.ofField( enhancedField.getName() ).in( enhancedField.getDeclaringType().asErasure() );
 			}
@@ -367,16 +369,18 @@ public Size apply(
 				Implementation.Context implementationContext,
 				MethodDescription instrumentedMethod
 		) {
+			final String descriptor = persistentField.asDefined().getType().asErasure().getDescriptor();
 			methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
 			methodVisitor.visitMethodInsn(
 					Opcodes.INVOKESPECIAL,
 					managedCtClass.getSuperClass().asErasure().getInternalName(),
-					EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + persistentField.getName(),
-					Type.getMethodDescriptor( Type.getType( persistentField.asDefined().getType().asErasure().getDescriptor() ) ),
+					PERSISTENT_FIELD_READER_PREFIX + persistentField.getName(),
+					Type.getMethodDescriptor( Type.getType( descriptor ) ),
 					false
 			);
-			methodVisitor.visitInsn( Type.getType( persistentField.asDefined().getType().asErasure().getDescriptor() ).getOpcode( Opcodes.IRETURN ) );
-			return new Size( persistentField.getType().getStackSize().getSize(), instrumentedMethod.getStackSize() );
+			methodVisitor.visitInsn( Type.getType( descriptor ).getOpcode( Opcodes.IRETURN ) );
+			return new Size( persistentField.getType().getStackSize().getSize(),
+					instrumentedMethod.getStackSize() );
 		}
 	}
 
@@ -397,30 +401,33 @@ public Size apply(
 				Implementation.Context implementationContext,
 				MethodDescription instrumentedMethod
 		) {
+			final String descriptor = persistentField.asDefined().getType().asErasure().getDescriptor();
 			methodVisitor.visitVarInsn( Opcodes.ALOAD, 0 );
-			methodVisitor.visitVarInsn( Type.getType( persistentField.asDefined().getType().asErasure().getDescriptor() ).getOpcode( Opcodes.ILOAD ), 1 );
+			methodVisitor.visitVarInsn( Type.getType( descriptor ).getOpcode( Opcodes.ILOAD ), 1 );
 			methodVisitor.visitMethodInsn(
 					Opcodes.INVOKESPECIAL,
 					managedCtClass.getSuperClass().asErasure().getInternalName(),
-					EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + persistentField.getName(),
-					Type.getMethodDescriptor( Type.getType( void.class ), Type.getType( persistentField.asDefined().getType().asErasure().getDescriptor() ) ),
+					PERSISTENT_FIELD_WRITER_PREFIX + persistentField.getName(),
+					Type.getMethodDescriptor( Type.getType( void.class ), Type.getType( descriptor ) ),
 					false
 			);
 			methodVisitor.visitInsn( Opcodes.RETURN );
-			return new Size( 1 + persistentField.getType().getStackSize().getSize(), instrumentedMethod.getStackSize() );
+			return new Size( 1 + persistentField.getType().getStackSize().getSize(),
+					instrumentedMethod.getStackSize() );
 		}
 	}
 
 	@Override
-	public boolean equals(final Object o) {
-		if ( this == o ) {
+	public boolean equals(final Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || PersistentAttributeTransformer.class != o.getClass() ) {
+		else if ( !(object instanceof PersistentAttributeTransformer that) ) {
 			return false;
 		}
-		final PersistentAttributeTransformer that = (PersistentAttributeTransformer) o;
-		return Objects.equals( managedCtClass, that.managedCtClass );
+		else {
+			return Objects.equals( managedCtClass, that.managedCtClass );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/SetFieldOnArgument.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/SetFieldOnArgument.java
index 1f5249e063ab..a4e58f0bb412 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/SetFieldOnArgument.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/SetFieldOnArgument.java
@@ -58,8 +58,7 @@ public Size apply(
 				}
 			}
 		}
-		else {
-			final Field setter = (Field) setterMember;
+		else if ( setterMember instanceof Field setter ) {
 			type = setter.getType();
 			methodVisitor.visitVarInsn( getLoadOpCode( type ), 1 );
 			methodVisitor.visitFieldInsn(
@@ -69,6 +68,9 @@ public Size apply(
 					Type.getDescriptor( type )
 			);
 		}
+		else {
+			throw new AssertionError( "Unknown setter member type" );
+		}
 		methodVisitor.visitInsn( Opcodes.RETURN );
 		return new Size(
 				is64BitType( type ) ? 3 : 2,
@@ -77,18 +79,14 @@ public Size apply(
 	}
 
 	private int getLoadOpCode(Class<?> type) {
-		if ( type.isPrimitive() ) {
-			switch ( type.getTypeName() ) {
-				case "long":
-					return Opcodes.LLOAD;
-				case "float":
-					return Opcodes.FLOAD;
-				case "double":
-					return Opcodes.DLOAD;
-			}
-			return Opcodes.ILOAD;
-		}
-		return Opcodes.ALOAD;
+		return type.isPrimitive()
+				? switch ( type.getTypeName() ) {
+					case "long" -> Opcodes.LLOAD;
+					case "float" -> Opcodes.FLOAD;
+					case "double" -> Opcodes.DLOAD;
+					default -> Opcodes.ILOAD;
+				}
+				: Opcodes.ALOAD;
 	}
 
 	private boolean is64BitType(Class<?> type) {
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/SetPropertyValues.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/SetPropertyValues.java
index 5941e6f25d66..f8257f9f1792 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/SetPropertyValues.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/SetPropertyValues.java
@@ -15,6 +15,7 @@
 import net.bytebuddy.jar.asm.MethodVisitor;
 import net.bytebuddy.jar.asm.Opcodes;
 import net.bytebuddy.jar.asm.Type;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.bytecode.internal.bytebuddy.BytecodeProviderImpl;
 import org.hibernate.engine.spi.CompositeOwner;
 import org.hibernate.engine.spi.CompositeTracker;
@@ -24,9 +25,10 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.List;
 
+import static java.lang.reflect.Modifier.isFinal;
+
 public class SetPropertyValues implements ByteCodeAppender {
 
 	private final Class<?> clazz;
@@ -50,8 +52,8 @@ public Size apply(
 			MethodVisitor methodVisitor,
 			Implementation.Context implementationContext,
 			MethodDescription instrumentedMethod) {
-		final boolean persistentAttributeInterceptable = PersistentAttributeInterceptable.class.isAssignableFrom(
-				clazz );
+		final boolean persistentAttributeInterceptable =
+				PersistentAttributeInterceptable.class.isAssignableFrom( clazz );
 		final boolean compositeOwner = CompositeOwner.class.isAssignableFrom( clazz );
 		Label currentLabel = null;
 		Label nextLabel = new Label();
@@ -114,24 +116,7 @@ public Size apply(
 						)
 				);
 			}
-			final Class<?> type;
-			if ( setterMember instanceof Method setter ) {
-				type = setter.getParameterTypes()[0];
-			}
-			else if ( setterMember instanceof Field field ) {
-				type = field.getType();
-			}
-			else {
-				final ForeignPackageMember foreignPackageMember = (ForeignPackageMember) setterMember;
-				final Member underlyingMember = foreignPackageMember.getMember();
-				if ( underlyingMember instanceof Method setter ) {
-					type = setter.getParameterTypes()[0];
-				}
-				else {
-					final Field field = (Field) underlyingMember;
-					type = field.getType();
-				}
-			}
+			final var type = setterTypee( setterMember );
 			if ( type.isPrimitive() ) {
 				PrimitiveUnboxingDelegate.forReferenceType( constants.TypeObject )
 						.assignUnboxedTo(
@@ -142,56 +127,9 @@ else if ( setterMember instanceof Field field ) {
 						.apply( methodVisitor, implementationContext );
 			}
 			else {
-				methodVisitor.visitTypeInsn(
-						Opcodes.CHECKCAST,
-						Type.getInternalName( type )
-				);
-			}
-			if ( setterMember instanceof Method setter ) {
-				methodVisitor.visitMethodInsn(
-						setter.getDeclaringClass().isInterface() ?
-								Opcodes.INVOKEINTERFACE :
-								Opcodes.INVOKEVIRTUAL,
-						Type.getInternalName( setter.getDeclaringClass() ),
-						setter.getName(),
-						Type.getMethodDescriptor( setter ),
-						setter.getDeclaringClass().isInterface()
-				);
-				if ( setter.getReturnType() != void.class ) {
-					// Setters could return something which we have to ignore
-					switch ( setter.getReturnType().getTypeName() ) {
-						case "long":
-						case "double":
-							methodVisitor.visitInsn( Opcodes.POP2 );
-							break;
-						default:
-							methodVisitor.visitInsn( Opcodes.POP );
-							break;
-					}
-				}
-			}
-			else if ( setterMember instanceof Field field ) {
-				methodVisitor.visitFieldInsn(
-						Opcodes.PUTFIELD,
-						Type.getInternalName( field.getDeclaringClass() ),
-						field.getName(),
-						Type.getDescriptor( type )
-				);
-			}
-			else {
-				final ForeignPackageMember foreignPackageMember = (ForeignPackageMember) setterMember;
-				methodVisitor.visitMethodInsn(
-						Opcodes.INVOKESTATIC,
-						Type.getInternalName( foreignPackageMember.getForeignPackageAccessor() ),
-						"set_" + setterMember.getName(),
-						Type.getMethodDescriptor(
-								Type.getType( void.class ),
-								Type.getType( foreignPackageMember.getMember().getDeclaringClass() ),
-								Type.getType( type )
-						),
-						false
-				);
+				methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, Type.getInternalName( type ) );
 			}
+			visitSetter( methodVisitor, setterMember, type );
 			if ( enhanced ) {
 				final boolean compositeTracker = CompositeTracker.class.isAssignableFrom( type );
 				boolean alreadyHasFrame = false;
@@ -201,7 +139,7 @@ else if ( setterMember instanceof Field field ) {
 				//
 				// Final classes that don't already implement the interface never need to be checked.
 				// This helps a bit with common final types which otherwise would have to be checked a lot.
-				if ( compositeOwner && (compositeTracker || !Modifier.isFinal( type.getModifiers() )) ) {
+				if ( compositeOwner && (compositeTracker || !isFinal( type.getModifiers() )) ) {
 					// Push values array on stack
 					methodVisitor.visitVarInsn( Opcodes.ALOAD, 2 );
 					methodVisitor.visitLdcInsn( index );
@@ -221,20 +159,15 @@ else if ( setterMember instanceof Field field ) {
 						methodVisitor.visitJumpInsn( Opcodes.IFNULL, compositeTrackerFalseLabel );
 					}
 					else {
+						compositeTrackerType = constants.internalName_CompositeTracker;
 						// If we don't know for sure, we do an instanceof check
-						methodVisitor.visitTypeInsn(
-								Opcodes.INSTANCEOF,
-								compositeTrackerType = constants.internalName_CompositeTracker
-						);
+						methodVisitor.visitTypeInsn( Opcodes.INSTANCEOF, compositeTrackerType );
 						isInterface = true;
 						methodVisitor.visitJumpInsn( Opcodes.IFEQ, compositeTrackerFalseLabel );
 					}
 
 					// Load the tracker on which we will call $$_hibernate_setOwner
-					methodVisitor.visitTypeInsn(
-							Opcodes.CHECKCAST,
-							compositeTrackerType
-					);
+					methodVisitor.visitTypeInsn( Opcodes.CHECKCAST, compositeTrackerType );
 					methodVisitor.visitLdcInsn( propertyNames[index] );
 					// Load the owner and cast it to the owner class, as we know it implements CompositeOwner
 					methodVisitor.visitVarInsn( Opcodes.ALOAD, 1 );
@@ -249,7 +182,7 @@ else if ( setterMember instanceof Field field ) {
 					);
 
 					// Skip the cleanup
-					final Label compositeTrackerEndLabel = new Label();
+					final var compositeTrackerEndLabel = new Label();
 					methodVisitor.visitJumpInsn( Opcodes.GOTO, compositeTrackerEndLabel );
 
 					// Here is the cleanup section for the false branch
@@ -295,7 +228,7 @@ else if ( setterMember instanceof Field field ) {
 					);
 
 					// Jump to the false label if the instanceof check fails
-					final Label instanceofFalseLabel = new Label();
+					final var instanceofFalseLabel = new Label();
 					methodVisitor.visitJumpInsn( Opcodes.IFEQ, instanceofFalseLabel );
 
 					// Cast to the subtype, so we can mark the property as initialized
@@ -315,7 +248,7 @@ else if ( setterMember instanceof Field field ) {
 					);
 
 					// Skip the cleanup
-					final Label instanceofEndLabel = new Label();
+					final var instanceofEndLabel = new Label();
 					methodVisitor.visitJumpInsn( Opcodes.GOTO, instanceofEndLabel );
 
 					// Here is the cleanup section for the false branch
@@ -362,4 +295,77 @@ else if ( setterMember instanceof Field field ) {
 		methodVisitor.visitInsn( Opcodes.RETURN );
 		return new Size( 4, instrumentedMethod.getStackSize() );
 	}
+
+	private static void visitSetter(MethodVisitor methodVisitor, Member setterMember, Class<?> type) {
+		if ( setterMember instanceof Method setter ) {
+			final var declaringClass = setter.getDeclaringClass();
+			methodVisitor.visitMethodInsn(
+					declaringClass.isInterface()
+							? Opcodes.INVOKEINTERFACE
+							: Opcodes.INVOKEVIRTUAL,
+					Type.getInternalName( declaringClass ),
+					setter.getName(),
+					Type.getMethodDescriptor( setter ),
+					declaringClass.isInterface()
+			);
+			final var returnType = setter.getReturnType();
+			if ( returnType != void.class ) {
+				// Setters could return something which we have to ignore
+				switch ( returnType.getTypeName() ) {
+					case "long":
+					case "double":
+						methodVisitor.visitInsn( Opcodes.POP2 );
+						break;
+					default:
+						methodVisitor.visitInsn( Opcodes.POP );
+						break;
+				}
+			}
+		}
+		else if ( setterMember instanceof Field field ) {
+			methodVisitor.visitFieldInsn(
+					Opcodes.PUTFIELD,
+					Type.getInternalName( field.getDeclaringClass() ),
+					field.getName(),
+					Type.getDescriptor( type )
+			);
+		}
+		else if ( setterMember instanceof ForeignPackageMember foreignPackageMember ) {
+			methodVisitor.visitMethodInsn(
+					Opcodes.INVOKESTATIC,
+					Type.getInternalName( foreignPackageMember.getForeignPackageAccessor() ),
+					"set_" + setterMember.getName(),
+					Type.getMethodDescriptor(
+							Type.getType( void.class ),
+							Type.getType( foreignPackageMember.getMember().getDeclaringClass() ),
+							Type.getType( type )
+					),
+					false
+			);
+		}
+	}
+
+	private static @NonNull Class<?> setterTypee(Member setterMember) {
+		if ( setterMember instanceof Method setter ) {
+			return setter.getParameterTypes()[0];
+		}
+		else if ( setterMember instanceof Field field ) {
+			return field.getType();
+		}
+		else if ( setterMember instanceof ForeignPackageMember foreignPackageMember ) {
+			final var underlyingMember = foreignPackageMember.getMember();
+			if ( underlyingMember instanceof Method setter ) {
+				return setter.getParameterTypes()[0];
+			}
+			else if ( underlyingMember instanceof Field field ) {
+				return field.getType();
+			}
+			else {
+				throw new AssertionError( "Unknown underlying member type" );
+			}
+		}
+		else {
+			throw new AssertionError( "Unknown setter member type" );
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java
index 7be6264bd4c9..a50245d0f65e 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.bytecode.enhance.spi;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Set;
@@ -27,6 +28,7 @@ public String toString() {
 			return "<lazy>";
 		}
 
+		@Serial
 		public Object readResolve() {
 			return UNFETCHED_PROPERTY;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java
index 77a410795b9c..63bd19288e6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/BytecodeInterceptorLogging.java
@@ -15,6 +15,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.TRACE;
 import static org.jboss.logging.Logger.Level.DEBUG;
@@ -34,7 +35,7 @@ public interface BytecodeInterceptorLogging extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".bytecode.interceptor";
 
 	Logger LOGGER = Logger.getLogger( LOGGER_NAME );
-	BytecodeInterceptorLogging BYTECODE_INTERCEPTOR_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BytecodeInterceptorLogging.class, LOGGER_NAME );
+	BytecodeInterceptorLogging BYTECODE_INTERCEPTOR_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BytecodeInterceptorLogging.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage(level = WARN)
 	@Message(
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java
index 2b072677721c..6cf719d46cab 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java
@@ -32,28 +32,26 @@ public interface InheritanceChecker {
 	 * Should the given property be included in the owner's base fetch group?
 	 */
 	public static boolean includeInBaseFetchGroup(
-			Property bootMapping,
+			Property property,
 			boolean isEnhanced,
 			InheritanceChecker inheritanceChecker,
 			boolean collectionsInDefaultFetchGroupEnabled) {
-		final var value = bootMapping.getValue();
-
-		if ( ! isEnhanced ) {
-			if ( value instanceof ToOne toOne ) {
-				if ( toOne.isUnwrapProxy() ) {
-					BYTECODE_INTERCEPTOR_LOGGER.toOneLazyNoProxyButNotEnhanced(
-							bootMapping.getPersistentClass().getEntityName(),
-							bootMapping.getName()
-					);
-				}
+		final var value = property.getValue();
+
+		if ( !isEnhanced ) {
+			if ( value instanceof ToOne toOne && toOne.isUnwrapProxy() ) {
+				BYTECODE_INTERCEPTOR_LOGGER.toOneLazyNoProxyButNotEnhanced(
+						property.getPersistentClass().getEntityName(),
+						property.getName()
+				);
 			}
 			return true;
 		}
 
 		// if we get here, we know the property owner is enhanced for laziness
 		//
-		// NOTE : we make the (potentially untrue) assumption here that
-		// if the owner is enhanced, then all classes are enhanced..
+		// NOTE: we make the (potentially untrue) assumption here that
+		//       if the owner is enhanced, then all classes are enhanced.
 
 		if ( value instanceof ToOne toOne ) {
 
@@ -64,7 +62,7 @@ public static boolean includeInBaseFetchGroup(
 
 			// it is lazy.  see if we should select the FK
 
-			if ( bootMapping.getLazyGroup() != null ) {
+			if ( property.getLazyGroup() != null ) {
 				// a non-base fetch group was explicitly specified
 				//
 				// really this should indicate to not select it as part of the base group.
@@ -72,9 +70,9 @@ public static boolean includeInBaseFetchGroup(
 				// we simply log a message that we are ignoring the `@LazyGroup` for to-ones
 
 				BYTECODE_INTERCEPTOR_LOGGER.lazyGroupIgnoredForToOne(
-						bootMapping.getLazyGroup(),
-						bootMapping.getPersistentClass().getEntityName(),
-						bootMapping.getName()
+						property.getLazyGroup(),
+						property.getPersistentClass().getEntityName(),
+						property.getName()
 				);
 
 				// at a later time - for example 6.0 when we can implement the join solution
@@ -84,13 +82,13 @@ public static boolean includeInBaseFetchGroup(
 				// for now, fall through
 			}
 
-			if ( ! toOne.isReferenceToPrimaryKey() ) {
+			if ( !toOne.isReferenceToPrimaryKey() ) {
 				// we do not have a reference to the associated primary-key
 				return false;
 			}
 
-			if ( toOne.getColumnSpan() == 0 ) {
-				// generally this would indicate a "shared PK" on-to-one and there
+			if ( !toOne.hasColumns() ) {
+				// generally this would indicate a "shared PK" one-to-one and there
 				// is no column for the association on the owner table - do not add
 				// the association to the base group (which would force an immediate
 				// select from the association table effectively making this
@@ -98,15 +96,16 @@ public static boolean includeInBaseFetchGroup(
 				return false;
 			}
 
-			final boolean unwrapExplicitlyRequested = toOne.isUnwrapProxy() && !toOne.isUnwrapProxyImplicit();
+			final boolean unwrapExplicitlyRequested =
+					toOne.isUnwrapProxy() && !toOne.isUnwrapProxyImplicit();
 
 			if ( inheritanceChecker.hasSubclasses( toOne.getReferencedEntityName() ) ) {
 				// the associated type has subclasses - we cannot use the enhanced proxy and will generate a HibernateProxy
 				if ( unwrapExplicitlyRequested ) {
 					// NO_PROXY was explicitly requested
 					BYTECODE_INTERCEPTOR_LOGGER.lazyNoProxyButAssociatedHasSubclasses(
-							bootMapping.getPersistentClass().getEntityName(),
-							bootMapping.getName(),
+							property.getPersistentClass().getEntityName(),
+							property.getName(),
 							toOne.getReferencedEntityName()
 					);
 				}
@@ -117,8 +116,8 @@ public static boolean includeInBaseFetchGroup(
 			if ( toOne instanceof ManyToOne manyToOne && manyToOne.isIgnoreNotFound() ) {
 				if ( unwrapExplicitlyRequested ) {
 					BYTECODE_INTERCEPTOR_LOGGER.notFoundIgnoreWithNoProxySkippingFkSelection(
-							bootMapping.getPersistentClass().getEntityName(),
-							bootMapping.getName()
+							property.getPersistentClass().getEntityName(),
+							property.getName()
 					);
 					return false;
 				}
@@ -135,7 +134,7 @@ public static boolean includeInBaseFetchGroup(
 		}
 
 		return collectionsInDefaultFetchGroupEnabled && ( value instanceof Collection )
-			|| ! bootMapping.isLazy();
+			|| ! property.isLazy();
 	}
 
 	public static <T> T performWork(
@@ -143,7 +142,7 @@ public static <T> T performWork(
 			BiFunction<SharedSessionContractImplementor, Boolean, T> work,
 			String entityName,
 			String attributeName) {
-		SharedSessionContractImplementor session = interceptor.getLinkedSession();
+		var session = interceptor.getLinkedSession();
 
 		final boolean isTempSession;
 		final boolean isJta;
@@ -236,23 +235,20 @@ enum Cause {
 		NO_SF_UUID
 	}
 
-	private static LazyInitializationException createLazyInitializationException(final Cause cause, final String entityName, final String attributeName) {
-		final String reason = switch ( cause ) {
-			case NO_SESSION -> "no session and settings disallow loading outside the Session";
-			case CLOSED_SESSION -> "session is closed and settings disallow loading outside the Session";
-			case DISCONNECTED_SESSION -> "session is disconnected and settings disallow loading outside the Session";
-			case NO_SF_UUID -> "could not determine SessionFactory UUId to create temporary Session for loading";
-		};
-
-		final String message = String.format(
+	private static LazyInitializationException createLazyInitializationException(
+			Cause cause, String entityName, String attributeName) {
+		return new LazyInitializationException( String.format(
 				Locale.ROOT,
 				"Unable to perform requested lazy initialization [%s.%s] - %s",
 				entityName,
 				attributeName,
-				reason
-		);
-
-		return new LazyInitializationException( message );
+				switch ( cause ) {
+					case NO_SESSION -> "no session and settings disallow loading outside the Session";
+					case CLOSED_SESSION -> "session is closed and settings disallow loading outside the Session";
+					case DISCONNECTED_SESSION -> "session is disconnected and settings disallow loading outside the Session";
+					case NO_SF_UUID -> "could not determine SessionFactory UUId to create temporary Session for loading";
+				}
+		) );
 	}
 
 	private static SharedSessionContractImplementor openTemporarySessionForLoading(
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataPojoImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataPojoImpl.java
index c8536e8792b0..b793a37648f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataPojoImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataPojoImpl.java
@@ -14,18 +14,14 @@
 import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributesMetadata;
 import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
 import org.hibernate.bytecode.spi.NotInstrumentedException;
-import org.hibernate.engine.spi.EntityEntry;
-import org.hibernate.engine.spi.EntityHolder;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.ManagedEntity;
-import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
 import org.hibernate.engine.spi.PersistentAttributeInterceptor;
 import org.hibernate.engine.spi.SelfDirtinessTracker;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.Status;
 import org.hibernate.mapping.PersistentClass;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.type.CompositeType;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -50,9 +46,9 @@ public static BytecodeEnhancementMetadataPojoImpl from(
 			CompositeType nonAggregatedCidMapper,
 			boolean collectionsInDefaultFetchGroupEnabled,
 			Metadata metadata) {
-		final Class<?> mappedClass = persistentClass.getMappedClass();
+		final var mappedClass = persistentClass.getMappedClass();
 		final boolean enhancedForLazyLoading = isPersistentAttributeInterceptableType( mappedClass );
-		final LazyAttributesMetadata lazyAttributesMetadata = enhancedForLazyLoading
+		final var lazyAttributesMetadata = enhancedForLazyLoading
 				? LazyAttributesMetadata.from( persistentClass, true, collectionsInDefaultFetchGroupEnabled, metadata )
 				: LazyAttributesMetadata.nonEnhanced( persistentClass.getEntityName() );
 
@@ -139,7 +135,7 @@ public boolean isAttributeLoaded(Object entity, String attributeName) {
 			return true;
 		}
 
-		final BytecodeLazyAttributeInterceptor interceptor = extractLazyInterceptor( entity );
+		final var interceptor = extractLazyInterceptor( entity );
 		if ( interceptor instanceof LazyAttributeLoadingInterceptor ) {
 			return interceptor.isAttributeLoaded( attributeName );
 		}
@@ -154,12 +150,12 @@ public boolean isAttributeLoaded(Object entity, String attributeName) {
 
 	@Override
 	public PersistentAttributeInterceptable createEnhancedProxy(EntityKey entityKey, boolean addEmptyEntry, SharedSessionContractImplementor session) {
-		final EntityPersister persister = entityKey.getPersister();
+		final var persister = entityKey.getPersister();
 		final Object identifier = entityKey.getIdentifier();
-		final PersistenceContext persistenceContext = session.getPersistenceContext();
+		final var persistenceContext = session.getPersistenceContext();
 
 		// first, instantiate the entity instance to use as the proxy
-		final PersistentAttributeInterceptable entity = asPersistentAttributeInterceptable( persister.instantiate( identifier, session ) );
+		final var entity = asPersistentAttributeInterceptable( persister.instantiate( identifier, session ) );
 
 		// clear the fields that are marked as dirty in the dirtiness tracker
 		processIfSelfDirtinessTracker( entity, BytecodeEnhancementMetadataPojoImpl::clearDirtyAttributes );
@@ -170,8 +166,8 @@ public PersistentAttributeInterceptable createEnhancedProxy(EntityKey entityKey,
 
 		// if requested, add the "holder entry" to the PC
 		if ( addEmptyEntry ) {
-			EntityHolder entityHolder = persistenceContext.getEntityHolder( entityKey );
-			EntityEntry entityEntry = persistenceContext.addEntry(
+			final var entityHolder = persistenceContext.getEntityHolder( entityKey );
+			final var entityEntry = persistenceContext.addEntry(
 					entity,
 					Status.MANAGED,
 					// loaded state
@@ -223,14 +219,12 @@ public LazyAttributeLoadingInterceptor injectInterceptor(
 					)
 			);
 		}
-		final LazyAttributeLoadingInterceptor interceptor = new LazyAttributeLoadingInterceptor(
-				this.lazyAttributeLoadingInterceptorState,
+		final var interceptor = new LazyAttributeLoadingInterceptor(
+				lazyAttributeLoadingInterceptorState,
 				identifier,
 				session
 		);
-
 		injectInterceptor( entity, interceptor, session );
-
 		return interceptor;
 	}
 
@@ -257,10 +251,11 @@ public void injectEnhancedEntityAsProxyInterceptor(
 	//This state object needs to be lazily initialized as it needs access to the Persister, but once
 	//initialized it can be reused across multiple sessions.
 	public EnhancementAsProxyLazinessInterceptor.EntityRelatedState getEnhancementAsProxyLazinessInterceptorMetastate(SharedSessionContractImplementor session) {
-		EnhancementAsProxyLazinessInterceptor.EntityRelatedState state = this.enhancementAsProxyInterceptorState;
+		var state = this.enhancementAsProxyInterceptorState;
 		if ( state == null ) {
-			final EntityPersister entityPersister = session.getFactory().getMappingMetamodel()
-					.getEntityDescriptor( entityName );
+			final var entityPersister =
+					session.getFactory().getMappingMetamodel()
+							.getEntityDescriptor( entityName );
 			state = new EnhancementAsProxyLazinessInterceptor.EntityRelatedState(
 					entityPersister,
 					nonAggregatedCidMapper,
@@ -277,7 +272,8 @@ public void injectInterceptor(
 			PersistentAttributeInterceptor interceptor,
 			SharedSessionContractImplementor session) {
 		if ( !enhancedForLazyLoading ) {
-			throw new NotInstrumentedException( "Entity class [" + entityClass.getName() + "] is not enhanced for lazy loading" );
+			throw new NotInstrumentedException( "Entity class '" + entityClass.getName()
+												+ "' is not enhanced for lazy loading" );
 		}
 
 		if ( !entityClass.isInstance( entity ) ) {
@@ -296,7 +292,8 @@ public void injectInterceptor(
 	@Override
 	public @Nullable BytecodeLazyAttributeInterceptor extractLazyInterceptor(Object entity) throws NotInstrumentedException {
 		if ( !enhancedForLazyLoading ) {
-			throw new NotInstrumentedException( "Entity class [" + entityClass.getName() + "] is not enhanced for lazy loading" );
+			throw new NotInstrumentedException( "Entity class [" + entityClass.getName()
+												+ "] is not enhanced for lazy loading" );
 		}
 
 		if ( !entityClass.isInstance( entity ) ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java
index 1c86fd450e63..8b0475ec0754 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/BasicProxyFactoryImpl.java
@@ -9,7 +9,6 @@
 import net.bytebuddy.description.modifier.Visibility;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
-import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants;
 import org.hibernate.bytecode.spi.BasicProxyFactory;
 import org.hibernate.engine.spi.PrimeAmongSecondarySupertypes;
 import org.hibernate.internal.util.collections.ArrayHelper;
@@ -17,16 +16,17 @@
 
 import net.bytebuddy.dynamic.scaffold.subclass.ConstructorStrategy;
 
+import static org.hibernate.proxy.ProxyConfiguration.INTERCEPTOR_FIELD_NAME;
+
 public class BasicProxyFactoryImpl implements BasicProxyFactory {
 
-	private static final Class[] NO_INTERFACES = ArrayHelper.EMPTY_CLASS_ARRAY;
+	private static final Class<?>[] NO_INTERFACES = ArrayHelper.EMPTY_CLASS_ARRAY;
 	private static final String PROXY_NAMING_SUFFIX = "HibernateBasicProxy";
 
-	private final Class proxyClass;
-	private final Constructor proxyClassConstructor;
+	private final Class<?> proxyClass;
+	private final Constructor<?> proxyClassConstructor;
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public BasicProxyFactoryImpl(final Class superClass, final Class interfaceClass, final ByteBuddyState byteBuddyState) {
+	public BasicProxyFactoryImpl(final Class<?> superClass, final Class<?> interfaceClass, final ByteBuddyState byteBuddyState) {
 		if ( superClass == null && interfaceClass == null ) {
 			throw new AssertionFailure( "attempting to build proxy without any superclass or interfaces" );
 		}
@@ -35,9 +35,9 @@ public BasicProxyFactoryImpl(final Class superClass, final Class interfaceClass,
 			throw new AssertionFailure( "Ambiguous call: we assume invocation with EITHER a superClass OR an interfaceClass" );
 		}
 
-		final Class<?> superClassOrMainInterface = superClass != null ? superClass : interfaceClass;
-		final ByteBuddyState.ProxyDefinitionHelpers helpers = byteBuddyState.getProxyDefinitionHelpers();
-		final EnhancerImplConstants constants = byteBuddyState.getEnhancerConstants();
+		final var superClassOrMainInterface = superClass != null ? superClass : interfaceClass;
+		final var helpers = byteBuddyState.getProxyDefinitionHelpers();
+		final var constants = byteBuddyState.getEnhancerConstants();
 		final String proxyClassName = superClassOrMainInterface.getName() + "$" + PROXY_NAMING_SUFFIX;
 
 		this.proxyClass = byteBuddyState.loadBasicProxy( superClassOrMainInterface, proxyClassName, (byteBuddy, namingStrategy) ->
@@ -45,11 +45,11 @@ public BasicProxyFactoryImpl(final Class superClass, final Class interfaceClass,
 					.with( namingStrategy )
 					.subclass( superClass == null ? Object.class : superClass, ConstructorStrategy.Default.DEFAULT_CONSTRUCTOR )
 					.implement( interfaceClass == null ? NO_INTERFACES : new Class[]{ interfaceClass } )
-					.defineField( ProxyConfiguration.INTERCEPTOR_FIELD_NAME, ProxyConfiguration.Interceptor.class, Visibility.PRIVATE )
-					.method( byteBuddyState.getProxyDefinitionHelpers().getVirtualNotFinalizerFilter() )
-							.intercept( byteBuddyState.getProxyDefinitionHelpers().getDelegateToInterceptorDispatcherMethodDelegation() )
+					.defineField( INTERCEPTOR_FIELD_NAME, ProxyConfiguration.Interceptor.class, Visibility.PRIVATE )
+					.method( helpers.getVirtualNotFinalizerFilter() )
+							.intercept( helpers.getDelegateToInterceptorDispatcherMethodDelegation() )
 					.implement( constants.INTERFACES_for_ProxyConfiguration )
-							.intercept( byteBuddyState.getProxyDefinitionHelpers().getInterceptorFieldAccessor() )
+							.intercept( helpers.getInterceptorFieldAccessor() )
 				)
 		);
 
@@ -63,21 +63,25 @@ public BasicProxyFactoryImpl(final Class superClass, final Class interfaceClass,
 
 	@Override
 	public Object getProxy() {
-		final PrimeAmongSecondarySupertypes instance;
+		final var instance = instantiateProxy();
+		final var proxyConfiguration = instance.asProxyConfiguration();
+		if ( proxyConfiguration == null ) {
+			throw new HibernateException( "Produced proxy does not correctly implement ProxyConfiguration" );
+		}
+		// Create a dedicated interceptor for the proxy.
+		// This is required as the interceptor is stateful.
+		proxyConfiguration.$$_hibernate_set_interceptor(
+				new PassThroughInterceptor( proxyClass.getName() ) );
+		return instance;
+	}
+
+	private PrimeAmongSecondarySupertypes instantiateProxy() {
 		try {
-			instance = (PrimeAmongSecondarySupertypes) proxyClassConstructor.newInstance();
+			return (PrimeAmongSecondarySupertypes) proxyClassConstructor.newInstance();
 		}
 		catch (Throwable t) {
 			throw new HibernateException( "Unable to instantiate proxy instance", t );
 		}
-		final ProxyConfiguration proxyConfiguration = instance.asProxyConfiguration();
-		if ( proxyConfiguration == null ) {
-			throw new HibernateException( "Produced proxy does not correctly implement ProxyConfiguration" );
-		}
-		// Create a dedicated interceptor for the proxy. This is required as the interceptor is stateful.
-		final ProxyConfiguration.Interceptor interceptor = new PassThroughInterceptor( proxyClass.getName() );
-		proxyConfiguration.$$_hibernate_set_interceptor( interceptor );
-		return instance;
 	}
 
 	public boolean isInstance(Object object) {
diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java
index e79942865e70..4101c6ef3932 100644
--- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java
+++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java
@@ -27,6 +27,7 @@
 import net.bytebuddy.dynamic.DynamicType.Unloaded;
 import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
 import net.bytebuddy.dynamic.scaffold.TypeValidation;
+import net.bytebuddy.implementation.Implementation;
 import net.bytebuddy.implementation.FieldAccessor;
 import net.bytebuddy.implementation.MethodDelegation;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
@@ -74,7 +75,14 @@ public ByteBuddyState() {
 	}
 
 	ByteBuddyState(ClassFileVersion classFileVersion) {
-		byteBuddy = new ByteBuddy( classFileVersion ).with( TypeValidation.DISABLED );
+		byteBuddy = new ByteBuddy( classFileVersion )
+				.with( TypeValidation.DISABLED )
+				// we use a fixed suffix to make sure our builds are reproducible
+				// ByteBuddy uses a random suffix by default to be extremely safe
+				// in case the class is instrumented multiple times
+				// but in our case, we can use a common suffix affected to Hibernate ORM
+				// this change affects cached accessors and field values
+				.with( new Implementation.Context.Default.Factory.WithFixedSuffix( "hibernate" ) );
 		proxyCache = new TypeCache<>( TypeCache.Sort.WEAK );
 		basicProxyCache = new TypeCache<>( TypeCache.Sort.WEAK );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/CollectionDataCachingConfigImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/CollectionDataCachingConfigImpl.java
index c86988aaab33..f0a31ef48ba3 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/CollectionDataCachingConfigImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/CollectionDataCachingConfigImpl.java
@@ -12,6 +12,8 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.type.BasicType;
 
+import static org.hibernate.cache.cfg.internal.ComparatorUtil.versionComparator;
+
 /**
  * @author Steve Ebersole
  */
@@ -40,10 +42,11 @@ public boolean isVersioned() {
 	}
 
 	@Override
-	public Comparator<?> getOwnerVersionComparator() {
+	public Comparator<Object> getOwnerVersionComparator() {
 		if ( isVersioned() ) {
-			final var type = (BasicType<?>) collectionDescriptor.getOwner().getVersion().getType();
-			return type.getJavaTypeDescriptor().getComparator();
+			final var type = (BasicType<?>)
+					collectionDescriptor.getOwner().getVersion().getType();
+			return versionComparator( type );
 		}
 		else {
 			return null;
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/ComparatorUtil.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/ComparatorUtil.java
new file mode 100644
index 000000000000..0ea30c881f0c
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/ComparatorUtil.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.cache.cfg.internal;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.hibernate.type.BasicType;
+
+import java.util.Comparator;
+
+class ComparatorUtil {
+	@NonNull
+	static <T> Comparator<Object> versionComparator(BasicType<T> type) {
+		return (u, v) -> {
+			final var descriptor = type.getJavaTypeDescriptor();
+			final T x;
+			final T y;
+			try {
+				x = descriptor.cast( u );
+				y = descriptor.cast( v );
+			}
+			catch (Exception e) {
+				throw new IllegalArgumentException( "Cached version was not of type " + type.getName(), e );
+			}
+			return descriptor.getComparator().compare( x, y );
+		};
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/DomainDataRegionConfigImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/DomainDataRegionConfigImpl.java
index 46319bac9841..5b4652906e07 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/DomainDataRegionConfigImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/DomainDataRegionConfigImpl.java
@@ -5,10 +5,13 @@
 package org.hibernate.cache.cfg.internal;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.cache.cfg.spi.CollectionDataCachingConfig;
 import org.hibernate.cache.cfg.spi.DomainDataCachingConfig;
 import org.hibernate.cache.cfg.spi.DomainDataRegionConfig;
@@ -23,6 +26,7 @@
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
+import static org.hibernate.cache.cfg.internal.ComparatorUtil.versionComparator;
 
 /**
  * DomainDataRegionConfig implementation
@@ -96,12 +100,7 @@ public Builder addEntityConfig(PersistentClass bootEntityDescriptor, AccessType
 					rootEntityName,
 					x -> new EntityDataCachingConfigImpl(
 							rootEntityName,
-							bootEntityDescriptor.isVersioned()
-									? () -> {
-										final var type = (BasicType<?>) bootEntityDescriptor.getVersion().getType();
-										return type.getJavaTypeDescriptor().getComparator();
-									}
-									: null,
+							versionComparatorAccess( bootEntityDescriptor ),
 							bootEntityDescriptor.isMutable(),
 							accessType
 					)
@@ -116,6 +115,15 @@ public Builder addEntityConfig(PersistentClass bootEntityDescriptor, AccessType
 			return this;
 		}
 
+		private @Nullable Supplier<Comparator<Object>> versionComparatorAccess(PersistentClass bootEntityDescriptor) {
+			return bootEntityDescriptor.isVersioned()
+					? () -> {
+						final var type = (BasicType<?>)
+								bootEntityDescriptor.getVersion().getType();
+						return versionComparator( type );
+					}
+					: null;
+		}
 
 		// todo (6.0) : `EntityPersister` and `CollectionPersister` references here should be replaced with `EntityHierarchy` and `PersistentCollectionDescriptor`
 		//
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java
index 456bbffd91e3..8f28662585aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java
@@ -20,14 +20,14 @@ public class EntityDataCachingConfigImpl
 		extends AbstractDomainDataCachingConfig
 		implements EntityDataCachingConfig {
 	private final NavigableRole navigableRole;
-	private final Supplier<Comparator<?>> versionComparatorAccess;
+	private final Supplier<Comparator<Object>> versionComparatorAccess;
 	private final boolean isEntityMutable;
 
 	private final Set<NavigableRole> cachedTypes = new HashSet<>();
 
 	public EntityDataCachingConfigImpl(
 			NavigableRole rootEntityName,
-			Supplier<Comparator<?>> versionComparatorAccess,
+			Supplier<Comparator<Object>> versionComparatorAccess,
 			boolean isEntityMutable,
 			AccessType accessType) {
 		super( accessType );
@@ -37,7 +37,7 @@ public EntityDataCachingConfigImpl(
 	}
 
 	@Override
-	public Supplier<Comparator<?>> getVersionComparatorAccess() {
+	public Supplier<Comparator<Object>> getVersionComparatorAccess() {
 		return versionComparatorAccess;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/CollectionDataCachingConfig.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/CollectionDataCachingConfig.java
index 53a2067c4a8f..e0319efe0c2e 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/CollectionDataCachingConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/CollectionDataCachingConfig.java
@@ -16,5 +16,5 @@ public interface CollectionDataCachingConfig extends DomainDataCachingConfig {
 	/**
 	 * The comparator to be used with the owning entity's version (if it has one).
 	 */
-	Comparator<?> getOwnerVersionComparator();
+	Comparator<Object> getOwnerVersionComparator();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java
index 1ad5569bc660..47a805fd898c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java
@@ -32,7 +32,7 @@ public interface EntityDataCachingConfig extends DomainDataCachingConfig {
 	 * version.  If the entity is not versioned, then this method
 	 * returns {@code null}.
 	 */
-	Supplier<Comparator<?>> getVersionComparatorAccess();
+	Supplier<Comparator<Object>> getVersionComparatorAccess();
 
 	/**
 	 * The list of specific subclasses of the root that are actually
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java
index 388812b964de..6348e4737e5d 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/DefaultCacheKeysFactory.java
@@ -4,17 +4,17 @@
  */
 package org.hibernate.cache.internal;
 
-import java.io.Serializable;
 
 import org.hibernate.cache.spi.CacheKeysFactory;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.type.BasicType;
 import org.hibernate.type.Type;
 
 /**
- * Second level cache providers now have the option to use custom key implementations.
+ * Second-level cache providers now have the option to use custom key implementations.
  * This was done as the default key implementation is very generic and is quite
  * a large object to allocate in large quantities at runtime.
  * In some extreme cases, for example when the hit ratio is very low, this was making the efficiency
@@ -45,20 +45,30 @@ public class DefaultCacheKeysFactory implements CacheKeysFactory {
 
 	public static Object staticCreateCollectionKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
 		final Type keyType = persister.getKeyType();
-		final Serializable disassembledKey = keyType.disassemble( id, factory );
+		final var coercedId = getCoercedId( id, keyType );
+		final var disassembledKey = keyType.disassemble( coercedId, factory );
 		final boolean idIsArray = disassembledKey.getClass().isArray();
+		final String role = persister.getRole();
 		return tenantIdentifier == null && !idIsArray
-				? new BasicCacheKeyImplementation( id, disassembledKey, keyType, persister.getRole() )
-				: new CacheKeyImplementation( id, disassembledKey, keyType, persister.getRole(), tenantIdentifier );
+				? new BasicCacheKeyImplementation( coercedId, disassembledKey, keyType, role )
+				: new CacheKeyImplementation( coercedId, disassembledKey, keyType, role, tenantIdentifier );
 	}
 
 	public static Object staticCreateEntityKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
 		final Type keyType = persister.getIdentifierType();
-		final Serializable disassembledKey = keyType.disassemble( id, factory );
+		final var coercedId = getCoercedId( id, keyType );
+		final var disassembledKey = keyType.disassemble( coercedId, factory );
 		final boolean idIsArray = disassembledKey.getClass().isArray();
+		final String rootEntityName = persister.getRootEntityName();
 		return tenantIdentifier == null && !idIsArray
-				? new BasicCacheKeyImplementation( id, disassembledKey, keyType, persister.getRootEntityName() )
-				: new CacheKeyImplementation( id, disassembledKey, keyType, persister.getRootEntityName(), tenantIdentifier );
+				? new BasicCacheKeyImplementation( coercedId, disassembledKey, keyType, rootEntityName )
+				: new CacheKeyImplementation( coercedId, disassembledKey, keyType, rootEntityName, tenantIdentifier );
+	}
+
+	private static Object getCoercedId(Object id, Type keyType) {
+		return keyType instanceof BasicType<?> basicType
+				? basicType.getJavaTypeDescriptor().coerce( id )
+				: id;
 	}
 
 	public static Object staticCreateNaturalIdKey(
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/DisabledCaching.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/DisabledCaching.java
index 8986678a4b13..ade8b582440b 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/DisabledCaching.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/DisabledCaching.java
@@ -220,10 +220,9 @@ public void evict(Class cls) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <T> T unwrap(Class<T> type) {
 		if ( type.isAssignableFrom( DisabledCaching.class ) ) {
-			return (T) this;
+			return type.cast( this );
 		}
 		else {
 			throw new PersistenceException( "Hibernate cannot unwrap Cache as '" + type.getName() + "'" );
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java
index 093e2fc606be..c927b2d92702 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java
@@ -4,9 +4,6 @@
  */
 package org.hibernate.cache.internal;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
@@ -71,9 +68,6 @@ public class EnabledCaching implements CacheImplementor, DomainDataRegionBuildin
 	private final Map<String, QueryResultsCache> namedQueryResultsCacheMap = new ConcurrentHashMap<>();
 
 
-	private final Set<String> legacySecondLevelCacheNames = new LinkedHashSet<>();
-	private final Map<String,Set<NaturalIdDataAccess>> legacyNaturalIdAccessesForRegion = new ConcurrentHashMap<>();
-
 	public EnabledCaching(SessionFactoryImplementor sessionFactory) {
 		this.sessionFactory = sessionFactory;
 		final var options = sessionFactory.getSessionFactoryOptions();
@@ -105,7 +99,6 @@ private TimestampsCache buildTimestampsCache(SessionFactoryImplementor sessionFa
 						DEFAULT_UPDATE_TIMESTAMPS_REGION_UNQUALIFIED_NAME,
 						sessionFactory
 				);
-		legacySecondLevelCacheNames.add( timestampsRegion.getName() );
 		return sessionFactory.getSessionFactoryOptions().getTimestampsCacheFactory()
 				.buildTimestampsCache( this, timestampsRegion );
 	}
@@ -134,27 +127,16 @@ public void prime(Set<DomainDataRegionConfig> cacheRegionConfigs) {
 			for ( var entityAccessConfig : regionConfig.getEntityCaching() ) {
 				final var navigableRole = entityAccessConfig.getNavigableRole();
 				entityAccessMap.put( navigableRole, region.getEntityDataAccess( navigableRole ) );
-				legacySecondLevelCacheNames.add( qualifiedRegionName( region ) );
 			}
 
 
 			// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			// Natural-id caching
 
-			final var naturalIdCaching = regionConfig.getNaturalIdCaching();
-			if ( naturalIdCaching.isEmpty() ) {
-				legacyNaturalIdAccessesForRegion.put( region.getName(), Collections.emptySet() );
-			}
-			else {
-				final Set<NaturalIdDataAccess> accesses = new HashSet<>();
-				for ( var naturalIdAccessConfig : naturalIdCaching ) {
-					final var navigableRole = naturalIdAccessConfig.getNavigableRole();
-					final var naturalIdDataAccess =
-							naturalIdAccessMap.put( navigableRole,
-									region.getNaturalIdDataAccess( navigableRole ) );
-					accesses.add( naturalIdDataAccess );
-				}
-				legacyNaturalIdAccessesForRegion.put( region.getName(), accesses );
+			for ( var naturalIdAccessConfig : regionConfig.getNaturalIdCaching() ) {
+				final var navigableRole = naturalIdAccessConfig.getNavigableRole();
+				naturalIdAccessMap.put( navigableRole,
+						region.getNaturalIdDataAccess( navigableRole ) );
 			}
 
 
@@ -165,7 +147,6 @@ public void prime(Set<DomainDataRegionConfig> cacheRegionConfigs) {
 				final var navigableRole = collectionAccessConfig.getNavigableRole();
 				collectionAccessMap.put( navigableRole,
 						region.getCollectionDataAccess( navigableRole ) );
-				legacySecondLevelCacheNames.add( qualifiedRegionName( region ) );
 			}
 		}
 
@@ -213,7 +194,6 @@ public Region getRegion(String regionName) {
 	}
 
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Entity data
 
@@ -227,11 +207,9 @@ public boolean containsEntity(String entityName, Object identifier) {
 		final var persister = getEntityDescriptor( entityName );
 		final var cacheAccess = persister.getCacheAccessStrategy();
 		if ( cacheAccess != null ) {
-			final Object idValue =
-					persister.getIdentifierMapping().getJavaType()
-							.coerce( identifier, sessionFactory::getTypeConfiguration );
 			final Object key = cacheAccess.generateCacheKey(
-					idValue,
+					persister.getIdentifierMapping().getJavaType()
+							.coerce( identifier ),
 					persister.getRootEntityDescriptor().getEntityPersister(),
 					sessionFactory,
 					null
@@ -311,7 +289,6 @@ public void evictEntityData() {
 	}
 
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Natural-id data
 
@@ -343,7 +320,6 @@ private void evictNaturalIdData(NavigableRole rootEntityRole, NaturalIdDataAcces
 	}
 
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Collection data
 
@@ -429,7 +405,7 @@ private void evictQueryResultRegion(QueryResultsCache cache) {
 	public void evictQueryRegions() {
 		LOG.evictingAllQueryRegions();
 		evictQueryResultRegion( defaultQueryResultsCache );
-		for ( QueryResultsCache cache : namedQueryResultsCacheMap.values() ) {
+		for ( var cache : namedQueryResultsCacheMap.values() ) {
 			evictQueryResultRegion( cache );
 		}
 	}
@@ -472,7 +448,7 @@ else if ( regionName == null || regionName.equals( getDefaultResultCacheName() )
 		}
 		else {
 			final var existing = namedQueryResultsCacheMap.get( regionName );
-			return existing != null ? existing : makeQueryResultsRegionAccess( regionName );
+			return existing != null ? existing : makeQueryResultsCache( regionName );
 		}
 	}
 
@@ -489,21 +465,20 @@ else if ( regionName == null || regionName.equals( getDefaultResultCacheName() )
 		}
 	}
 
-	protected QueryResultsCache makeQueryResultsRegionAccess(String regionName) {
-		final var regionAccess = new QueryResultsCacheImpl( getQueryResultsRegion( regionName ), timestampsCache );
+	protected QueryResultsCache makeQueryResultsCache(String regionName) {
+		final var regionAccess = new QueryResultsCacheImpl( queryResultsRegion( regionName ), timestampsCache );
 		namedQueryResultsCacheMap.put( regionName, regionAccess );
-		legacySecondLevelCacheNames.add( regionName );
 		return regionAccess;
 	}
 
-	private QueryResultsRegion getQueryResultsRegion(String regionName) {
-		final Region region = regionsByName.computeIfAbsent( regionName, this::makeQueryResultsRegion );
-		return region instanceof QueryResultsRegion queryResultsRegion
+	private QueryResultsRegion queryResultsRegion(String regionName) {
+		return regionsByName.computeIfAbsent( regionName, this::buildQueryResultsRegion )
+					instanceof QueryResultsRegion queryResultsRegion
 				? queryResultsRegion // There was already a different type of Region with the same name.
-				: queryResultsRegionsByDuplicateName.computeIfAbsent( regionName, this::makeQueryResultsRegion );
+				: queryResultsRegionsByDuplicateName.computeIfAbsent( regionName, this::buildQueryResultsRegion );
 	}
 
-	protected QueryResultsRegion makeQueryResultsRegion(String regionName) {
+	protected QueryResultsRegion buildQueryResultsRegion(String regionName) {
 		return regionFactory.buildQueryResultsRegion( regionName, getSessionFactory() );
 	}
 
@@ -523,13 +498,12 @@ public void evictRegion(String regionName) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <T> T unwrap(Class<T> type) {
 		if ( type.isAssignableFrom( EnabledCaching.class ) ) {
-			return (T) this;
+			return type.cast( this );
 		}
 		else if ( type.isAssignableFrom( RegionFactory.class ) ) {
-			return (T) regionFactory;
+			return type.cast( regionFactory );
 		}
 		else {
 			throw new PersistenceException( "Hibernate cannot unwrap Cache as '" + type.getName() + "'" );
@@ -547,7 +521,6 @@ public void close() {
 	}
 
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// JPA-defined methods
 
@@ -570,8 +543,6 @@ public void evict(Class cls) {
 	}
 
 
-
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Deprecations
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java
index 748665c2fa86..8118ccbd33fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java
@@ -5,6 +5,7 @@
 package org.hibernate.cache.spi;
 
 import org.hibernate.Internal;
+import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.internal.log.SubSystemLogging;
 
 import org.jboss.logging.BasicLogger;
@@ -15,6 +16,8 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.UUID;
+import java.util.Locale;
 
 import static org.hibernate.cfg.CacheSettings.CACHE_REGION_FACTORY;
 import static org.jboss.logging.Logger.Level.DEBUG;
@@ -35,7 +38,7 @@
 public interface SecondLevelCacheLogger extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".cache";
 
-	SecondLevelCacheLogger L2CACHE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SecondLevelCacheLogger.class, LOGGER_NAME );
+	SecondLevelCacheLogger L2CACHE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SecondLevelCacheLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	int NAMESPACE = 90001000;
 
@@ -252,4 +255,138 @@ public interface SecondLevelCacheLogger extends BasicLogger {
 			id = NAMESPACE + 31
 	)
 	void noDefaultRegionFactory();
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Generating entity cache access: %s [%s]",
+			id = NAMESPACE + 32
+	)
+	void generatingEntityAccess(String entityName, String accessType);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Generating collection cache access: %s [%s]",
+			id = NAMESPACE + 33
+	)
+	void generatingCollectionAccess(String role, String accessType);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Generating natural id access: %s [%s]",
+			id = NAMESPACE + 34
+	)
+	void generatingNaturalIdAccess(String role, String accessType);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "DomainDataRegion created [%s]; key-factory = %s",
+			id = NAMESPACE + 35
+	)
+	void domainDataRegionCreated(String regionName, CacheKeysFactory keyFactory);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Clearing cache data map [region='%s']",
+			id = NAMESPACE + 36
+	)
+	void clearingCacheDataMap(String regionName);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Getting cached data from region ['%s' (%s)] by key [%s]",
+			id = NAMESPACE + 37
+	)
+	void gettingCachedData(String regionName, AccessType accessType, Object key);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Cache miss: region = '%s', key = '%s'",
+			id = NAMESPACE + 38
+	)
+	void cacheMiss(String regionName, Object key);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Cache hit: region = '%s', key = '%s'",
+			id = NAMESPACE + 39
+	)
+	void cacheHit(String regionName, Object key);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Cache hit, but item is unreadable/invalid: region = '%s', key = '%s'",
+			id = NAMESPACE + 40
+	)
+	void cacheHitUnreadable(String regionName, Object key);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Caching data from load [region='%s' (%s)] : key[%s] -> value[%s]",
+			id = NAMESPACE + 41
+	)
+	void cachingDataFromLoad(String regionName, AccessType accessType, Object key, Object value);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Cache put-from-load skipped due to minimal-put [region='%s' (%s), key='%s']",
+			id = NAMESPACE + 42
+	)
+	void cachePutFromLoadSkippedDueToMinimalPut(String regionName, AccessType accessType, Object key);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Cache put-from-load [region='%s' (%s), key='%s', value='%s'] failed due to being non-writable",
+			id = NAMESPACE + 43
+	)
+	void cachePutFromLoadFailedNonWritable(String regionName, AccessType accessType, Object key, Object value);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Locking cache item [region='%s' (%s)] : '%s' (timeout=%s, version=%s)",
+			id = NAMESPACE + 44
+	)
+	void lockingCacheItem(String regionName, AccessType accessType, Object key, long timeout, Object version);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Unlocking cache item [region='%s' (%s)] : %s",
+			id = NAMESPACE + 45
+	)
+	void unlockingCacheItem(String regionName, AccessType accessType, Object key);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Cached entry expired: %s",
+			id = NAMESPACE + 46
+	)
+	void cachedEntryExpired(Object key);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Checking readability of read-write cache item [timestamp='%s', version='%s'] : txTimestamp='%s'",
+			id = NAMESPACE + 47
+	)
+	void checkingReadWriteItemReadability(long timestamp, Object version, long txTimestamp);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Checking writeability of read-write cache item [timestamp='%s', version='%s'] : txTimestamp='%s', newVersion='%s'",
+			id = NAMESPACE + 48
+	)
+	void checkingReadWriteItemWriteability(long timestamp, Object version, long txTimestamp, Object newVersion);
+
+	@LogMessage(level = TRACE)
+	@Message(
+			value = "Checking writeability of read-write cache lock [timeout='%s', lockId='%s', version='%s', sourceUuid=%s, multiplicity='%s', unlockTimestamp='%s'] : txTimestamp='%s', newVersion='%s'",
+			id = NAMESPACE + 49
+	)
+	void checkingReadWriteLockWriteability(
+			long timeout,
+			long lockId,
+			Object version,
+			UUID sourceUuid,
+			int multiplicity,
+			long unlockTimestamp,
+			long txTimestamp,
+			Object newVersion);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/AccessType.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/AccessType.java
index a36a7929130e..631f675d4531 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/AccessType.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/AccessType.java
@@ -29,7 +29,7 @@ public enum AccessType {
 	/**
 	 * Read and write access. Data may be added, removed and mutated.
 	 * A "soft" lock on the cached item is used to manage concurrent
-	 * access during mutation.
+	 * access during mutation. Requires a version to be useful.
 	 */
 	READ_WRITE,
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/EntityDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/EntityDataAccess.java
index 8cc63b44384d..15cbad97b2d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/EntityDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/EntityDataAccess.java
@@ -66,7 +66,7 @@ Object generateCacheKey(
 
 	/**
 	 * Called after an item has been inserted (after the transaction completes),
-	 * instead of calling {@link #release}.
+	 * instead of calling {@code release()}.
 	 * This method is used by "asynchronous" concurrency strategies.
 	 *
 	 * @param session Current session
@@ -100,7 +100,7 @@ boolean update(
 
 	/**
 	 * Called after an item has been updated (after the transaction completes),
-	 * instead of calling {@link #release}. This method is used by "asynchronous"
+	 * instead of calling {@code release()}. This method is used by "asynchronous"
 	 * concurrency strategies.
 	 *
 	 * @param session Current session
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCachedDomainDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCachedDomainDataAccess.java
index 20326a78f66d..e9d58110488c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCachedDomainDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractCachedDomainDataAccess.java
@@ -39,7 +39,7 @@ public DomainDataStorageAccess getStorageAccess() {
 	}
 
 	protected void clearCache() {
-		L2CACHE_LOGGER.tracef( "Clearing cache data map [region='%s']", region.getName() );
+		L2CACHE_LOGGER.clearingCacheDataMap( region.getName() );
 		getStorageAccess().evictData();
 	}
 
@@ -50,7 +50,20 @@ public boolean contains(Object key) {
 
 	@Override
 	public Object get(SharedSessionContractImplementor session, Object key) {
-		return getStorageAccess().getFromCache( key, session );
+		final boolean traceEnabled = L2CACHE_LOGGER.isTraceEnabled();
+		if ( traceEnabled ) {
+			L2CACHE_LOGGER.gettingCachedData( region.getName(), getAccessType(), key );
+		}
+		final Object item = getStorageAccess().getFromCache( key, session );
+		if ( traceEnabled ) {
+			if ( item == null ) {
+				L2CACHE_LOGGER.cacheMiss( region.getName(), key );
+			}
+			else {
+				L2CACHE_LOGGER.cacheHit( region.getName(), key );
+			}
+		}
+		return item;
 	}
 
 	@Override
@@ -59,6 +72,9 @@ public boolean putFromLoad(
 			Object key,
 			Object value,
 			Object version) {
+		if ( L2CACHE_LOGGER.isTraceEnabled() ) {
+			L2CACHE_LOGGER.cachingDataFromLoad( region.getName(), getAccessType(), key, value );
+		}
 		getStorageAccess().putFromLoad( key, value, session );
 		return true;
 	}
@@ -70,7 +86,15 @@ public boolean putFromLoad(
 			Object value,
 			Object version,
 			boolean minimalPutOverride) {
-		return putFromLoad( session, key, value, version );
+		if ( minimalPutOverride && getStorageAccess().contains( key ) ) {
+			if ( L2CACHE_LOGGER.isTraceEnabled() ) {
+				L2CACHE_LOGGER.cachePutFromLoadSkippedDueToMinimalPut( region.getName(), getAccessType(), key );
+			}
+			return false;
+		}
+		else {
+			return putFromLoad( session, key, value, version );
+		}
 	}
 
 	private static final SoftLock REGION_LOCK = new SoftLock() {
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractDomainDataRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractDomainDataRegion.java
index 952974a29c55..2d654373547b 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractDomainDataRegion.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractDomainDataRegion.java
@@ -67,8 +67,7 @@ public AbstractDomainDataRegion(
 	protected void completeInstantiation(
 			DomainDataRegionConfig regionConfig,
 			DomainDataRegionBuildingContext buildingContext) {
-		L2CACHE_LOGGER.tracef( "DomainDataRegion created [%s]; key-factory = %s",
-				regionConfig.getRegionName(), effectiveKeysFactory );
+		L2CACHE_LOGGER.domainDataRegionCreated( regionConfig.getRegionName(), effectiveKeysFactory );
 
 		entityDataAccessMap = generateEntityDataAccessMap( regionConfig );
 		naturalIdDataAccessMap = generateNaturalIdDataAccessMap( regionConfig );
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractReadWriteAccess.java
index 539301feaa79..edff0764187e 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AbstractReadWriteAccess.java
@@ -37,7 +37,7 @@ protected AbstractReadWriteAccess(
 		super( domainDataRegion, storageAccess );
 	}
 
-	protected abstract Comparator<?> getVersionComparator();
+	protected abstract Comparator<Object> getVersionComparator();
 
 	protected UUID uuid() {
 		return uuid;
@@ -61,36 +61,32 @@ protected Lock writeLock() {
 	 */
 	@Override
 	public Object get(SharedSessionContractImplementor session, Object key) {
-		final boolean traceEnabled = L2CACHE_LOGGER.isTraceEnabled();
-		if ( traceEnabled ) {
-			L2CACHE_LOGGER.tracef( "Getting cached data from region ['%s' (%s)] by key [%s]",
-					getRegion().getName(), getAccessType(), key );
-		}
-		try {
-			readLock.lock();
-			final var item = (Lockable) getStorageAccess().getFromCache( key, session );
-			if ( item == null ) {
-				if ( traceEnabled ) {
-					L2CACHE_LOGGER.tracef( "Cache miss: region = '%s', key = '%s'",
-							getRegion().getName(), key );
-				}
-				return null;
+			final boolean traceEnabled = L2CACHE_LOGGER.isTraceEnabled();
+			if ( traceEnabled ) {
+				L2CACHE_LOGGER.gettingCachedData( getRegion().getName(), getAccessType(), key );
 			}
+			try {
+				readLock.lock();
+				final var item = (Lockable) getStorageAccess().getFromCache( key, session );
+				if ( item == null ) {
+					if ( traceEnabled ) {
+						L2CACHE_LOGGER.cacheMiss( getRegion().getName(), key );
+					}
+					return null;
+				}
 
-			if ( isReadable( session, item ) ) {
-				if ( traceEnabled ) {
-					L2CACHE_LOGGER.tracef( "Cache hit: region = '%s', key = '%s'",
-							getRegion().getName(), key );
+				if ( isReadable( session, item ) ) {
+					if ( traceEnabled ) {
+						L2CACHE_LOGGER.cacheHit( getRegion().getName(), key );
+					}
+					return item.getValue();
 				}
-				return item.getValue();
-			}
-			else {
-				if ( traceEnabled ) {
-					L2CACHE_LOGGER.tracef( "Cache hit, but item is unreadable/invalid: region = '%s', key = '%s'",
-							getRegion().getName(), key );
+				else {
+					if ( traceEnabled ) {
+						L2CACHE_LOGGER.cacheHitUnreadable( getRegion().getName(), key );
+					}
+					return null;
 				}
-				return null;
-			}
 		}
 		finally {
 			readLock.unlock();
@@ -107,28 +103,62 @@ public boolean putFromLoad(
 			Object key,
 			Object value,
 			Object version) {
+		return doPutFromLoad( session, key, value, version, false );
+	}
+
+	@Override
+	public final boolean putFromLoad(
+			SharedSessionContractImplementor session,
+			Object key,
+			Object value,
+			Object version,
+			boolean minimalPutOverride) {
+		return doPutFromLoad( session, key, value, version, minimalPutOverride );
+	}
+
+	private boolean doPutFromLoad(
+			SharedSessionContractImplementor session,
+			Object key,
+			Object value,
+			Object version,
+			boolean minimalPutOverride) {
 		try {
 			final boolean traceEnabled = L2CACHE_LOGGER.isTraceEnabled();
 			if ( traceEnabled ) {
-				L2CACHE_LOGGER.tracef( "Caching data from load [region='%s' (%s)] : key[%s] -> value[%s]",
-						getRegion().getName(), getAccessType(), key, value );
+				L2CACHE_LOGGER.cachingDataFromLoad( getRegion().getName(), getAccessType(), key, value );
 			}
 			writeLock.lock();
 			final var item = (Lockable) getStorageAccess().getFromCache( key, session );
 			if ( isWritable( session, version, item ) ) {
-				getStorageAccess().putIntoCache(
-						key,
-						new Item( value, version, session.getCacheTransactionSynchronization().getCachingTimestamp() ),
-						session
-				);
-				return true;
+				if ( minimalPutOverride && version == null && item != null ) {
+					// we didn't have a version to check, so we don't know for
+					// sure whether the cached item is stale, but 'minimal puts'
+					// is enabled, so we just assume it's not stale
+					if ( traceEnabled ) {
+						L2CACHE_LOGGER.cachePutFromLoadSkippedDueToMinimalPut(
+								getRegion().getName(),
+								getAccessType(),
+								key
+						);
+					}
+					return false;
+				}
+				else {
+					getStorageAccess().putIntoCache(
+							key,
+							new Item( value, version,
+									session.getCacheTransactionSynchronization()
+											.getCachingTimestamp() ),
+							session
+					);
+					return true;
+				}
 			}
 			else {
 				if ( traceEnabled ) {
-					L2CACHE_LOGGER.tracef(
-							"Cache put-from-load [region='%s' (%s), key='%s', value='%s'] failed due to being non-writable",
-							getAccessType(),
+					L2CACHE_LOGGER.cachePutFromLoadFailedNonWritable(
 							getRegion().getName(),
+							getAccessType(),
 							key,
 							value
 					);
@@ -147,26 +177,19 @@ private boolean isWritable(SharedSessionContractImplementor session, Object vers
 									version, getVersionComparator() );
 	}
 
+	/**
+	 * @deprecated No longer called
+	 */
+	@Deprecated(since = "7.4")
 	protected abstract AccessedDataClassification getAccessedDataClassification();
 
-	@Override
-	public final boolean putFromLoad(
-			SharedSessionContractImplementor session,
-			Object key,
-			Object value,
-			Object version,
-			boolean minimalPutOverride) {
-		return putFromLoad( session, key, value, version );
-	}
-
 	@Override
 	public SoftLock lockItem(SharedSessionContractImplementor session, Object key, Object version) {
 		try {
 			writeLock.lock();
 			final long timeout = nextTimestamp() + getTimeout();
 			if ( L2CACHE_LOGGER.isTraceEnabled() ) {
-				L2CACHE_LOGGER.tracef( "Locking cache item [region='%s' (%s)] : '%s' (timeout=%s, version=%s)",
-						getRegion().getName(), getAccessType(), key, timeout, version );
+				L2CACHE_LOGGER.lockingCacheItem( getRegion().getName(), getAccessType(), key, timeout, version );
 			}
 			final var item = (Lockable) getStorageAccess().getFromCache( key, session );
 			final var lock = lock( item, version, timeout );
@@ -188,8 +211,7 @@ private SoftLockImpl lock(Lockable item, Object version, long timeout) {
 	public void unlockItem(SharedSessionContractImplementor session, Object key, SoftLock lock) {
 		try {
 			if ( L2CACHE_LOGGER.isTraceEnabled() ) {
-				L2CACHE_LOGGER.tracef( "Unlocking cache item [region='%s' (%s)] : %s",
-						getRegion().getName(), getAccessType(), key );
+				L2CACHE_LOGGER.unlockingCacheItem( getRegion().getName(), getAccessType(), key );
 			}
 			writeLock.lock();
 			final var item = (Lockable) getStorageAccess().getFromCache( key, session );
@@ -220,7 +242,9 @@ protected void decrementLock(SharedSessionContractImplementor session, Object ke
 
 	protected void handleLockExpiry(SharedSessionContractImplementor session, Object key) {
 		L2CACHE_LOGGER.softLockedCacheExpired( getRegion().getName(), key );
-		L2CACHE_LOGGER.tracef( "Cached entry expired: %s", key );
+		if ( L2CACHE_LOGGER.isTraceEnabled() ) {
+			L2CACHE_LOGGER.cachedEntryExpired( key );
+		}
 		final var regionFactory = getRegion().getRegionFactory();
 		// create a new lock that times out immediately
 		long timestamp = regionFactory.nextTimestamp() + regionFactory.getTimeout();
@@ -262,7 +286,7 @@ public interface Lockable {
 		 * Returns <code>true</code> if the enclosed value can be replaced with one of the given version by a
 		 * transaction started at the given time.
 		 */
-		boolean isWriteable(long txTimestamp, Object version, Comparator versionComparator);
+		boolean isWriteable(long txTimestamp, Object version, Comparator<Object> versionComparator);
 
 		/**
 		 * Returns the enclosed value.
@@ -303,30 +327,18 @@ public final static class Item implements Serializable, Lockable {
 		@Override
 		public boolean isReadable(long txTimestamp) {
 			if ( L2CACHE_LOGGER.isTraceEnabled() ) {
-				L2CACHE_LOGGER.tracef(
-						"Checking readability of read-write cache item [timestamp='%s', version='%s'] : txTimestamp='%s'",
-						(Object) timestamp,
-						version,
-						txTimestamp
-				);
+				L2CACHE_LOGGER.checkingReadWriteItemReadability( timestamp, version, txTimestamp );
 			}
 
 			return txTimestamp > timestamp;
 		}
 
 		@Override
-		public boolean isWriteable(long txTimestamp, Object newVersion, Comparator versionComparator) {
+		public boolean isWriteable(long txTimestamp, Object newVersion, Comparator<Object> versionComparator) {
 			if ( L2CACHE_LOGGER.isTraceEnabled() ) {
-				L2CACHE_LOGGER.tracef(
-						"Checking writeability of read-write cache item [timestamp='%s', version='%s'] : txTimestamp='%s', newVersion='%s'",
-						timestamp,
-						version,
-						txTimestamp,
-						newVersion
-				);
+				L2CACHE_LOGGER.checkingReadWriteItemWriteability( timestamp, version, txTimestamp, newVersion );
 			}
 
-			//noinspection unchecked
 			return version != null && versionComparator.compare( version, newVersion ) < 0;
 		}
 
@@ -389,10 +401,9 @@ public boolean isReadable(long txTimestamp) {
 		}
 
 		@Override
-		public boolean isWriteable(long txTimestamp, Object newVersion, Comparator versionComparator) {
+		public boolean isWriteable(long txTimestamp, Object newVersion, Comparator<Object> versionComparator) {
 			if ( L2CACHE_LOGGER.isTraceEnabled() ) {
-				L2CACHE_LOGGER.tracef(
-						"Checking writeability of read-write cache lock [timeout='%s', lockId='%s', version='%s', sourceUuid=%s, multiplicity='%s', unlockTimestamp='%s'] : txTimestamp='%s', newVersion='%s'",
+				L2CACHE_LOGGER.checkingReadWriteLockWriteability(
 						timeout,
 						lockId,
 						version,
@@ -413,7 +424,6 @@ public boolean isWriteable(long txTimestamp, Object newVersion, Comparator versi
 				return false;
 			}
 
-			//noinspection unchecked
 			return version == null
 					? txTimestamp > unlockTimestamp
 					: versionComparator.compare( version, newVersion ) < 0;
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AccessedDataClassification.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AccessedDataClassification.java
index d84754bdf829..4daf3aa0a2e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AccessedDataClassification.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/AccessedDataClassification.java
@@ -6,7 +6,10 @@
 
 /**
  * @author Steve Ebersole
+ *
+ * @deprecated No longer used
  */
+@Deprecated(since = "7.4")
 public enum AccessedDataClassification {
 	ENTITY,
 	NATURAL_ID,
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java
index 9c1ea00ab49d..94e382a078df 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java
@@ -23,7 +23,7 @@
  * @author Steve Ebersole
  */
 public class CollectionReadWriteAccess extends AbstractReadWriteAccess implements CollectionDataAccess {
-	private final Comparator<?> versionComparator;
+	private final Comparator<Object> versionComparator;
 	private final CacheKeysFactory keysFactory;
 
 	public CollectionReadWriteAccess(
@@ -36,6 +36,7 @@ public CollectionReadWriteAccess(
 		this.versionComparator = config.getOwnerVersionComparator();
 	}
 
+	@Deprecated
 	@Override
 	protected AccessedDataClassification getAccessedDataClassification() {
 		return AccessedDataClassification.COLLECTION;
@@ -61,7 +62,7 @@ public Object getCacheKeyId(Object cacheKey) {
 	}
 
 	@Override
-	protected Comparator<?> getVersionComparator() {
+	protected Comparator<Object> getVersionComparator() {
 		return versionComparator;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionTemplate.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionTemplate.java
index a614f396b3c6..c560002b62a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionTemplate.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/DomainDataRegionTemplate.java
@@ -48,7 +48,6 @@ public DomainDataRegionTemplate(
 			DomainDataRegionBuildingContext buildingContext) {
 		super( regionConfig, regionFactory, defaultKeysFactory, buildingContext );
 		this.storageAccess = storageAccess;
-
 		// now the super-type calls will have access to the `DomainDataStorageAccess` reference
 		completeInstantiation( regionConfig, buildingContext );
 	}
@@ -63,12 +62,13 @@ public DomainDataStorageAccess getCacheStorageAccess() {
 
 	@Override
 	public EntityDataAccess generateEntityAccess(EntityDataCachingConfig entityAccessConfig) {
-		final var namedEntityRole = entityAccessConfig.getNavigableRole();
 		final var accessType = entityAccessConfig.getAccessType();
-
-		L2CACHE_LOGGER.tracef( "Generating entity cache access [%s] : %s",
-				accessType.getExternalName(), namedEntityRole );
-
+		if ( L2CACHE_LOGGER.isTraceEnabled() ) {
+			L2CACHE_LOGGER.generatingEntityAccess(
+					entityAccessConfig.getNavigableRole().toString(),
+					accessType.getExternalName()
+			);
+		}
 		return switch ( accessType ) {
 			case READ_ONLY -> generateReadOnlyEntityAccess( entityAccessConfig );
 			case READ_WRITE -> generateReadWriteEntityAccess( entityAccessConfig );
@@ -115,12 +115,13 @@ private UnsupportedOperationException generateTransactionalNotSupportedException
 
 	@Override
 	public NaturalIdDataAccess generateNaturalIdAccess(NaturalIdDataCachingConfig accessConfig) {
-		final var namedEntityRole = accessConfig.getNavigableRole();
 		final var accessType = accessConfig.getAccessType();
-
-		L2CACHE_LOGGER.tracef( "Generating entity natural-id access [%s] : %s",
-				accessType.getExternalName(), namedEntityRole );
-
+		if ( L2CACHE_LOGGER.isTraceEnabled() ) {
+			L2CACHE_LOGGER.generatingNaturalIdAccess(
+					accessConfig.getNavigableRole().toString(),
+					accessType.getExternalName()
+			);
+		}
 		return switch ( accessType ) {
 			case READ_ONLY -> generateReadOnlyNaturalIdAccess( accessConfig );
 			case READ_WRITE -> generateReadWriteNaturalIdAccess( accessConfig );
@@ -162,13 +163,14 @@ protected NaturalIdDataAccess generateTransactionalNaturalIdDataAccess(NaturalId
 
 	@Override
 	public CollectionDataAccess generateCollectionAccess(CollectionDataCachingConfig accessConfig) {
-		final var namedCollectionRole = accessConfig.getNavigableRole();
-
+		final var accessType = accessConfig.getAccessType();
 		if ( L2CACHE_LOGGER.isTraceEnabled() ) {
-			L2CACHE_LOGGER.trace( "Generating collection cache access: " + namedCollectionRole );
+			L2CACHE_LOGGER.generatingCollectionAccess(
+					accessConfig.getNavigableRole().toString(),
+					accessType.getExternalName()
+			);
 		}
-
-		return switch ( accessConfig.getAccessType() ) {
+		return switch ( accessType ) {
 			case READ_ONLY -> generateReadOnlyCollectionAccess( accessConfig );
 			case READ_WRITE -> generateReadWriteCollectionAccess( accessConfig );
 			case NONSTRICT_READ_WRITE -> generateNonStrictReadWriteCollectionAccess( accessConfig );
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java
index a1d36dee473b..22dbd800f503 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java
@@ -24,7 +24,7 @@
  */
 public class EntityReadWriteAccess extends AbstractReadWriteAccess implements EntityDataAccess {
 	private final CacheKeysFactory keysFactory;
-	private final Comparator<?> versionComparator;
+	private final Comparator<Object> versionComparator;
 
 	public EntityReadWriteAccess(
 			DomainDataRegion domainDataRegion,
@@ -46,13 +46,14 @@ public AccessType getAccessType() {
 		return AccessType.READ_WRITE;
 	}
 
+	@Deprecated
 	@Override
 	protected AccessedDataClassification getAccessedDataClassification() {
 		return AccessedDataClassification.ENTITY;
 	}
 
 	@Override
-	protected Comparator<?> getVersionComparator() {
+	protected Comparator<Object> getVersionComparator() {
 		return versionComparator;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java
index 7856d162b71b..0680f9e900a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java
@@ -33,6 +33,7 @@ public NaturalIdReadWriteAccess(
 		this.keysFactory = keysFactory;
 	}
 
+	@Deprecated
 	@Override
 	protected AccessedDataClassification getAccessedDataClassification() {
 		return AccessedDataClassification.NATURAL_ID;
@@ -44,7 +45,7 @@ public AccessType getAccessType() {
 	}
 
 	@Override
-	protected Comparator<?> getVersionComparator() {
+	protected Comparator<Object> getVersionComparator() {
 		// natural id has no comparator
 		return null;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
index 33b751ca7eae..72c0ce3ae0d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
@@ -30,7 +30,7 @@ public interface AvailableSettings
 		extends BatchSettings, BytecodeSettings, CacheSettings, EnvironmentSettings, FetchSettings,
 		JdbcSettings, JpaComplianceSettings, ManagedBeanSettings, MappingSettings, MultiTenancySettings,
 		PersistenceSettings, QuerySettings, SchemaToolingSettings, SessionEventSettings, StatisticsSettings,
-		TransactionSettings, ValidationSettings {
+		TransactionSettings, ValidationSettings, GraphParserSettings {
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// JPA settings
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
index f57f61df443d..c134f27df52c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
@@ -27,7 +27,6 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.SessionFactoryBuilder;
 import org.hibernate.boot.model.convert.internal.ConverterDescriptors;
-import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.model.FunctionContributor;
 import org.hibernate.boot.model.NamedEntityGraphDefinition;
@@ -95,7 +94,6 @@
  * These initial properties may be completely discarded by calling
  * {@link #setProperties(Properties)}, or they may be overridden
  * individually by calling {@link #setProperty(String, String)}.
- * <p>
  * <pre>
  * SessionFactory factory = new Configuration()
  *     // scan classes for mapping annotations
@@ -146,7 +144,6 @@ public class Configuration {
 	private final BootstrapServiceRegistry bootstrapServiceRegistry;
 	private final MetadataSources metadataSources;
 	final private StandardServiceRegistryBuilder standardServiceRegistryBuilder;
-	private final ClassmateContext classmateContext = new ClassmateContext();
 
 	// used during processing mappings
 	private ImplicitNamingStrategy implicitNamingStrategy;
@@ -1184,7 +1181,7 @@ public Configuration addAuxiliaryDatabaseObject(AuxiliaryDatabaseObject object)
 	 * @return {@code this} for method chaining
 	 */
 	public Configuration addAttributeConverter(Class<? extends AttributeConverter<?,?>> attributeConverterClass, boolean autoApply) {
-		addAttributeConverter( ConverterDescriptors.of( attributeConverterClass, autoApply, false, classmateContext ) );
+		addAttributeConverter( ConverterDescriptors.of( attributeConverterClass, autoApply, false ) );
 		return this;
 	}
 
@@ -1196,7 +1193,7 @@ public Configuration addAttributeConverter(Class<? extends AttributeConverter<?,
 	 * @return {@code this} for method chaining
 	 */
 	public Configuration addAttributeConverter(Class<? extends AttributeConverter<?, ?>> attributeConverterClass) {
-		addAttributeConverter( ConverterDescriptors.of( attributeConverterClass, classmateContext ) );
+		addAttributeConverter( ConverterDescriptors.of( attributeConverterClass ) );
 		return this;
 	}
 
@@ -1210,7 +1207,7 @@ public Configuration addAttributeConverter(Class<? extends AttributeConverter<?,
 	 * @return {@code this} for method chaining
 	 */
 	public Configuration addAttributeConverter(AttributeConverter<?,?> attributeConverter) {
-		addAttributeConverter( ConverterDescriptors.of( attributeConverter, classmateContext ) );
+		addAttributeConverter( ConverterDescriptors.of( attributeConverter ) );
 		return this;
 	}
 
@@ -1227,7 +1224,7 @@ public Configuration addAttributeConverter(AttributeConverter<?,?> attributeConv
 	 * @return {@code this} for method chaining
 	 */
 	public Configuration addAttributeConverter(AttributeConverter<?,?> attributeConverter, boolean autoApply) {
-		addAttributeConverter( ConverterDescriptors.of( attributeConverter, autoApply, classmateContext ) );
+		addAttributeConverter( ConverterDescriptors.of( attributeConverter, autoApply ) );
 		return this;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/FetchSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/FetchSettings.java
index 795ff3c76472..eb9c0b1546d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/FetchSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/FetchSettings.java
@@ -21,7 +21,7 @@ public interface FetchSettings {
 
 	/**
 	 * Specifies the default value for {@linkplain BatchSize#size() batch fetching}.
-	 * <p/>
+	 * <p>
 	 * By default, Hibernate only uses batch fetching for entities and collections explicitly
 	 * annotated {@code @BatchSize}.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/GraphParserSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/GraphParserSettings.java
new file mode 100644
index 000000000000..53abad8bedb3
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/GraphParserSettings.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.cfg;
+
+/**
+ * Settings for configuring graph parser behavior.
+ *
+ */
+public interface GraphParserSettings {
+
+	/**
+	 * Setting to control which graph parser syntax to use.
+	 * <p>
+	 * Valid values are:
+	 * <ul>
+	 *     <li>{@code "legacy"} - Uses the legacy syntax: attribute(SubType: attributes)
+	 *         This generates deprecation warnings when the old syntax is detected.
+	 *     <li>{@code "modern"} - Uses the new syntax: attribute:SubType(attributes)
+	 *         This is the preferred syntax going forward.
+	 * </ul>
+	 * @settingDefault {@code "legacy"} for backward compatibility
+	 * @since 7.0
+	 */
+	@Deprecated(since = "7.0", forRemoval = true)
+	String GRAPH_PARSER_MODE = "hibernate.graph_parser_mode";
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java
index f7905979fb03..e9edcf2dc8f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java
@@ -302,6 +302,20 @@ public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSett
 	 */
 	String AUTOCOMMIT = "hibernate.connection.autocommit";
 
+	/**
+	 * Controls the login timeout in seconds for JDBC connections obtained
+	 * from any {@link ConnectionProvider} implementation which respects
+	 * this setting.
+	 * <p>
+	 * If this setting is not explicitly specified, Hibernate does not modify
+	 * the login timeout of the JDBC {@link java.sql.DriverManager}.
+	 *
+	 * @see java.sql.DriverManager#setLoginTimeout(int)
+	 *
+	 * @since 7.3
+	 */
+	String LOGIN_TIMEOUT = "hibernate.connection.login_timeout";
+
 	/**
 	 * Indicates that connections obtained from the configured {@link ConnectionProvider} have
 	 * {@linkplain java.sql.Connection#getAutoCommit auto-commit} already disabled when they
@@ -541,7 +555,7 @@ public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSett
 
 	/**
 	 * Whether access to JDBC {@linkplain java.sql.DatabaseMetaData metadata} is allowed during bootstrap.
-	 * <p/>
+	 * <p>
 	 * Allowable options are defined by {@linkplain JdbcMetadataOnBoot}.  For configuration, any of the
 	 * following forms are accepted: <ul>
 	 *     <li>an instance of {@linkplain JdbcMetadataOnBoot}</li>
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java
index a6a9fdee2d8e..fe5f70e8b589 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java
@@ -235,7 +235,7 @@ public interface MappingSettings {
 	 * boundary for binding and extracting temporal values to/from the database using
 	 * the support added in JDBC 4.2 via {@linkplain java.sql.PreparedStatement#setObject(int, Object, int)}
 	 * and {@linkplain java.sql.ResultSet#getObject(int, Class)}.
-	 * <p/>
+	 * <p>
 	 * Used to set the value across the entire system as opposed to scattered, individual
 	 * {@linkplain org.hibernate.annotations.JdbcTypeCode} and {@linkplain org.hibernate.annotations.JdbcType}
 	 * naming specific {@linkplain JavaTimeJdbcType} implementations.
@@ -280,7 +280,7 @@ public interface MappingSettings {
 	/**
 	 * Indicates whether {@link Locale#toLanguageTag()} should be preferred over
 	 * {@link Locale#toString()} when converting a {@code Locale} to a {@code String}.
-	 * <p/>
+	 * <p>
 	 * This configuration property is used to specify a global preference,
 	 * but Hibernate ORM can always read both formats, so no data needs to be migrated.
 	 * The setting only affects how {@link Locale} data is stored.
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/MultiTenancySettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/MultiTenancySettings.java
index 60a6b36684ec..0290e9dde69b 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/MultiTenancySettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/MultiTenancySettings.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.cfg;
 
+import org.hibernate.Incubating;
 import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
 import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
 
@@ -67,5 +68,28 @@ public interface MultiTenancySettings {
 	 *
 	 * @since 7.1
 	 */
+	@Incubating
 	String MULTI_TENANT_SCHEMA_MAPPER = "hibernate.multi_tenant.schema_mapper";
+
+	/**
+	 * Specifies a {@link org.hibernate.context.spi.TenantCredentialsMapper} to use, either:
+	 * <ul>
+	 *     <li>an instance of {@code TenantCredentialsMapper},
+	 *     <li>a {@link Class} representing a class that implements {@code TenantCredentialsMapper}, or
+	 *     <li>the name of a class that implements {@code TenantCredentialsMapper}.
+	 * </ul>
+	 * When a tenant credentials mapper is set,
+	 * {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider#getConnection(String, String)}
+	 * is used to acquire JDBC connections. This typically requires that the JDBC {@code DataSource}
+	 * correctly implements the method {@link javax.sql.DataSource#getConnection(String, String)}.
+	 * <p>
+	 * By default, there is no tenant credentials mapper.
+	 *
+	 * @see org.hibernate.context.spi.TenantCredentialsMapper
+	 * @see org.hibernate.boot.SessionFactoryBuilder#applyTenantCredentialsMapper
+	 *
+	 * @since 7.3
+	 */
+	@Incubating
+	String MULTI_TENANT_CREDENTIALS_MAPPER = "hibernate.multi_tenant.credentials_mapper";
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/QuerySettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/QuerySettings.java
index 91d456f8a54a..95f5a0701e19 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/QuerySettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/QuerySettings.java
@@ -308,7 +308,6 @@ public interface QuerySettings {
 	/**
 	 * The maximum number of {@link org.hibernate.query.ParameterMetadata} instances
 	 * maintained by the {@link org.hibernate.query.spi.QueryInterpretationCache}.
-	 * <p>
 	 *
 	 * @deprecated this setting is not currently used
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/StateManagementSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/StateManagementSettings.java
new file mode 100644
index 000000000000..11dfaad318eb
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/StateManagementSettings.java
@@ -0,0 +1,93 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.cfg;
+
+import org.hibernate.Incubating;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.temporal.TemporalTableStrategy;
+
+/**
+ * Settings related to {@linkplain org.hibernate.persister.state.spi.StateManagement
+ * customized state management}, {@linkplain org.hibernate.annotations.Temporal
+ * temporal entities}, and {@linkplain org.hibernate.annotations.Audited audited
+ * entities}.
+ *
+ * @author Gavin King
+ */
+@Incubating
+public interface StateManagementSettings {
+	/**
+	 * Specifies the implementation strategy for
+	 * {@linkplain org.hibernate.annotations.Temporal temporal tables}.
+	 * <p>
+	 * Accepts any of:
+	 * <ul>
+	 *     <li>an instance of {@link TemporalTableStrategy}, or
+	 *     <li>the (case-insensitive) name of a {@code TemporalTableStrategy},
+	 *     for example, {@code native}, {@code single_time}, or
+	 *     {@code history_table}.
+	 * </ul>
+	 *
+	 * @settingDefault {@link TemporalTableStrategy#SINGLE_TABLE}
+	 * @see org.hibernate.annotations.Temporal
+	 * @see TemporalTableStrategy
+	 *
+	 * @since 7.4
+	 */
+	String TEMPORAL_TABLE_STRATEGY = "hibernate.temporal.table_strategy";
+
+	/**
+	 * Use transaction timestamps supplied by the database server's
+	 * {@link Dialect#currentTimestamp() current_timestamp} function
+	 * instead of {@link java.time.Instant#now()} to initialize the
+	 * effectivity columns for
+	 * {@linkplain org.hibernate.annotations.Temporal temporal data}
+	 * when using the {@link TemporalTableStrategy#SINGLE_TABLE} or
+	 * {@link TemporalTableStrategy#HISTORY_TABLE} mapping strategy.
+	 * <p>
+	 * Not recommended on database platforms with no way to obtain
+	 * the timestamp of the start of the current transaction (most
+	 * database except PostgreSQL-like databases).
+	 * <p>
+	 * This option cannot be used together with
+	 * {@value #TRANSACTION_ID_SUPPLIER}.
+	 * <p>
+	 * By default, transaction timestamps are generated in memory.
+	 *
+	 * @settingDefault {@code false}
+	 * @see org.hibernate.annotations.Temporal
+	 *
+	 * @since 7.4
+	 */
+	String USE_SERVER_TRANSACTION_TIMESTAMPS = "hibernate.temporal.use_server_transaction_timestamps";
+
+	/**
+	 * Specify a {@link org.hibernate.temporal.spi.TransactionIdentifierSupplier TransactionIdentifierSupplier} which
+	 * provides unique, monotonically increasing transaction IDs for
+	 * {@linkplain org.hibernate.annotations.Temporal temporal data}
+	 * when using the {@link TemporalTableStrategy#SINGLE_TABLE} or
+	 * {@link TemporalTableStrategy#HISTORY_TABLE} mapping strategy
+	 * or for {@linkplain org.hibernate.annotations.Audited audited
+	 * data}.
+	 * <p>
+	 * The Java type of the transaction id is inferred from the type
+	 * argument {@code T} in the instantiation of {@code TransactionIdentifierSupplier<T>}
+	 * implemented by the supplier class, and is used instead of
+	 * {@link java.time.Instant} for the effectivity column mappings.
+	 * <p>
+	 * By default, transaction IDs are timestamps generated using
+	 * {@link java.time.Instant#now()}.
+	 * <p>
+	 * This option cannot be used together with
+	 * {@value #USE_SERVER_TRANSACTION_TIMESTAMPS}.
+	 *
+	 * @see org.hibernate.annotations.Temporal
+	 * @see org.hibernate.annotations.Audited
+	 * @see org.hibernate.temporal.spi.TransactionIdentifierService
+	 *
+	 * @since 7.4
+	 */
+	String TRANSACTION_ID_SUPPLIER = "hibernate.temporal.transaction_id_supplier";
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/StatisticsSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/StatisticsSettings.java
index 281753ab8a54..c1d0bac8c861 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/StatisticsSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/StatisticsSettings.java
@@ -24,7 +24,7 @@ public interface StatisticsSettings {
 	 * When statistics are {@linkplain #GENERATE_STATISTICS enabled}, names the
 	 * {@link StatisticsFactory} to use.  Recognizes a class name as well as an instance of
 	 * {@link StatisticsFactory}.
-	 * <p/>
+	 * <p>
 	 * Allows customization of how the Hibernate Statistics are collected.
 	 */
 	String STATS_BUILDER = "hibernate.stats.factory";
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/TransactionSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/TransactionSettings.java
index 27b42a1b1d64..51e3f4bbf7a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/TransactionSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/TransactionSettings.java
@@ -16,7 +16,7 @@ public interface TransactionSettings {
 	 * implementation to use for creating instances of
 	 * {@link org.hibernate.resource.transaction.spi.TransactionCoordinator} which the interface
 	 * Hibernate uses to manage transactions.
-	 * <p/>
+	 * <p>
 	 * Accepts either:
 	 * <ul>
 	 *     <li>an instance of {@code TransactionCoordinatorBuilder},
@@ -24,7 +24,6 @@ public interface TransactionSettings {
 	 *     <li>the name of a class that implements {@code TransactionCoordinatorBuilder},
 	 *     <li>{@code jta} or {@code jdbc}</li>
 	 * </ul>
-	 * <p/>
 	 *
 	 * @settingDefault With Jakarta Persistence bootstrapping, based on the persistence unit's {@link PersistenceUnitInfo#getTransactionType()};
 	 * otherwise {@code jdbc}.
@@ -120,7 +119,6 @@ public interface TransactionSettings {
 	 * using a JTA for transaction management.
 	 * <p>
 	 * Values are {@code true}, which grants access, and {@code false}, which does not.
-	 * <p>
 	 *
 	 * @settingDefault {@code false} when bootstrapped via JPA; {@code true} otherwise.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/package-info.java b/hibernate-core/src/main/java/org/hibernate/cfg/package-info.java
index d6be39194dc6..10cd66c5e6fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/package-info.java
@@ -29,7 +29,7 @@
  * <p>
  * We now present a couple of example configuration files.
  *
- * <h3>Example JPA configuration file</h3>
+ * <h2>Example JPA configuration file</h2>
  *
  * The following JPA configuration may be specified in a file named {@code persistence.xml}:
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/CollectionLogger.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/CollectionLogger.java
index 765c54baf96e..6259734c6927 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/internal/CollectionLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/CollectionLogger.java
@@ -15,6 +15,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -33,7 +34,7 @@
 public interface CollectionLogger extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".collection";
 
-	CollectionLogger COLLECTION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CollectionLogger.class, NAME );
+	CollectionLogger COLLECTION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CollectionLogger.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = WARN)
 	@Message(id = 90030001, value = "Unable to close temporary session used to load lazy collection associated to no session")
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java
index d657c9d2cfbe..e4cbfe60325b 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java
@@ -7,7 +7,6 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -22,13 +21,11 @@
 import org.hibernate.HibernateException;
 import org.hibernate.LazyInitializationException;
 import org.hibernate.engine.spi.CollectionEntry;
-import org.hibernate.engine.spi.EntityEntry;
-import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.Status;
 import org.hibernate.engine.spi.TypedValue;
 import org.hibernate.internal.SessionFactoryRegistry;
-import org.hibernate.internal.util.MarkerObject;
+import org.hibernate.internal.util.Optional;
 import org.hibernate.internal.util.collections.IdentitySet;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.type.BasicType;
@@ -37,6 +34,7 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import static java.util.Collections.emptyIterator;
 import static java.util.Collections.emptyList;
 import static org.hibernate.collection.internal.CollectionLogger.COLLECTION_LOGGER;
 import static org.hibernate.engine.internal.ForeignKeys.getEntityIdentifier;
@@ -385,9 +383,7 @@ public boolean elementExists(Object element) {
 		}
 	}
 
-	protected static final Object UNKNOWN = new MarkerObject( "UNKNOWN" );
-
-	protected Object readElementByIndex(final Object index) {
+	protected Optional<E> readElementByIndex(final Object index) {
 		if ( !initialized ) {
 			return withTemporarySessionIfNeeded( () -> {
 				final var entry = getCollectionEntry();
@@ -397,15 +393,16 @@ protected Object readElementByIndex(final Object index) {
 					if ( hasQueuedOperations() ) {
 						session.flush();
 					}
-					return persister.getElementByIndex( entry.getLoadedKey(), index, session, owner );
+					final Object element = persister.getElementByIndex( entry.getLoadedKey(), index, session, owner );
+					return Optional.of( (E) element );
 				}
 				else {
 					read();
-					return UNKNOWN;
+					return Optional.undefined();
 				}
 			} );
 		}
-		return UNKNOWN;
+		return Optional.undefined();
 	}
 
 	@Override
@@ -686,7 +683,8 @@ public final boolean unsetSession(SharedSessionContractImplementor currentSessio
 				if ( allowLoadOutsideTransaction
 						&& !initialized
 						&& session.getLoadQueryInfluencers().hasEnabledFilters() ) {
-					COLLECTION_LOGGER.enabledFiltersWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) );
+					COLLECTION_LOGGER.enabledFiltersWhenDetachFromSession(
+							collectionInfoString( getRole(), getKey() ) );
 				}
 				session = null;
 			}
@@ -694,7 +692,8 @@ public final boolean unsetSession(SharedSessionContractImplementor currentSessio
 		}
 		else {
 			if ( session != null ) {
-				COLLECTION_LOGGER.logCannotUnsetUnexpectedSessionInCollection( unexpectedSessionStateMessage( currentSession ) );
+				COLLECTION_LOGGER.logCannotUnsetUnexpectedSessionInCollection(
+						unexpectedSessionStateMessage( currentSession ) );
 			}
 			return false;
 		}
@@ -704,20 +703,23 @@ private void logDiscardedQueuedOperations() {
 		try {
 			if ( wasTransactionRolledBack() ) {
 				// It was due to a rollback.
-				if ( COLLECTION_LOGGER.isDebugEnabled()) {
-					COLLECTION_LOGGER.queuedOperationWhenDetachFromSessionOnRollback( collectionInfoString( getRole(), getKey() ) );
+				if ( COLLECTION_LOGGER.isDebugEnabled() ) {
+					COLLECTION_LOGGER.queuedOperationWhenDetachFromSessionOnRollback(
+							collectionInfoString( getRole(), getKey() ) );
 				}
 			}
 			else {
 				// We don't know why the collection is being detached.
 				// Just log the info.
-				COLLECTION_LOGGER.queuedOperationWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) );
+				COLLECTION_LOGGER.queuedOperationWhenDetachFromSession(
+						collectionInfoString( getRole(), getKey() ) );
 			}
 		}
 		catch (Exception e) {
 			// We don't know why the collection is being detached.
 			// Just log the info.
-			COLLECTION_LOGGER.queuedOperationWhenDetachFromSession( collectionInfoString( getRole(), getKey() ) );
+			COLLECTION_LOGGER.queuedOperationWhenDetachFromSession(
+					collectionInfoString( getRole(), getKey() ) );
 		}
 	}
 
@@ -756,7 +758,8 @@ else if ( this.session != null ) {
 			}
 		}
 		if ( hasQueuedOperations() ) {
-			COLLECTION_LOGGER.queuedOperationWhenAttachToSession( collectionInfoString( getRole(), getKey() ) );
+			COLLECTION_LOGGER.queuedOperationWhenAttachToSession(
+					collectionInfoString( getRole(), getKey() ) );
 		}
 		this.session = session;
 		return true;
@@ -872,7 +875,7 @@ public void remove() {
 			};
 		}
 		else {
-			return Collections.emptyIterator();
+			return emptyIterator();
 		}
 	}
 
@@ -1070,8 +1073,8 @@ public <A> A[] toArray(A[] array) {
 		public final boolean equals(Object object) {
 			return object == this
 				|| object instanceof Set<?> that
-				&& that.size() == this.size()
-				&& containsAll( that );
+					&& that.size() == this.size()
+					&& containsAll( that );
 		}
 
 		@Override
@@ -1306,11 +1309,11 @@ protected static <E> Collection<E> getOrphans(
 		// collect EntityIdentifier(s) of the *current* elements - add them into a HashSet for fast access
 		final java.util.Set<Object> currentIds = new HashSet<>();
 		final java.util.Set<Object> currentSaving = new IdentitySet<>();
-		final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
+		final var persistenceContext = session.getPersistenceContextInternal();
 		for ( Object current : currentElements ) {
 			if ( current != null && isNotTransient( entityName, current, null, session ) ) {
-				final EntityEntry ee = persistenceContext.getEntry( current );
-				if ( ee != null && ee.getStatus() == Status.SAVING ) {
+				final var entityEntry = persistenceContext.getEntry( current );
+				if ( entityEntry != null && entityEntry.getStatus() == Status.SAVING ) {
 					currentSaving.add( current );
 				}
 				else {
@@ -1335,7 +1338,7 @@ protected static <E> Collection<E> getOrphans(
 
 	private static boolean mayUseIdDirect(Type idType) {
 		if ( idType instanceof BasicType<?> basicType ) {
-			final Class<?> javaType = basicType.getJavaType();
+			final var javaType = basicType.getJavaType();
 			return javaType == String.class
 				|| javaType == Integer.class
 				|| javaType == Long.class
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java
index 22c3d7134a29..6bb201872ebc 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java
@@ -451,7 +451,7 @@ default boolean isElementRemoved(){
 	 * <p>
 	 * Implementors that can copy elements out of a directly provided
 	 * collection into the wrapped collection should override this method.
-	 * <p>
+	 *
 	 * @param collection The collection
 	 * @return true, if {@code collection} was provided directly to this
 	 * PersistentCollection; false, otherwise.
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java
index b7a0c3a69e3f..693fb3b55a85 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentList.java
@@ -14,6 +14,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.Incubating;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.internal.util.Optional.Defined;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.type.Type;
@@ -299,8 +300,7 @@ public E get(int index) {
 		if ( index < 0 ) {
 			throw new ArrayIndexOutOfBoundsException( "negative index" );
 		}
-		final Object result = readElementByIndex( index );
-		return result == UNKNOWN ? list.get( index ) : (E) result;
+		return readElementByIndex( index ).evaluate( () -> list.get( index ) );
 	}
 
 	@Override
@@ -308,16 +308,15 @@ public E set(int index, E value) {
 		if (index<0) {
 			throw new ArrayIndexOutOfBoundsException("negative index");
 		}
-
-		final Object old = isPutQueueEnabled() ? readElementByIndex( index ) : UNKNOWN;
-
-		if ( old==UNKNOWN ) {
-			write();
-			return list.set( index, value );
+		if ( isPutQueueEnabled()
+				&& readElementByIndex( index ) instanceof Defined<E> element ) {
+			final E old = element.result();
+			queueOperation( new Set( index, value, old ) );
+			return old;
 		}
 		else {
-			queueOperation( new Set( index, value, (E) old ) );
-			return (E) old;
+			write();
+			return list.set( index, value );
 		}
 	}
 
@@ -326,17 +325,18 @@ public E remove(int index) {
 		if ( index < 0 ) {
 			throw new ArrayIndexOutOfBoundsException( "negative index" );
 		}
-		final Object old = isPutQueueEnabled() ? readElementByIndex( index ) : UNKNOWN;
 		elementRemoved = true;
-		if ( old == UNKNOWN ) {
+		if ( isPutQueueEnabled()
+				&& readElementByIndex( index ) instanceof Defined<E> element ) {
+			final E old = element.result();
+			queueOperation( new Remove( index, old ) );
+			return old;
+		}
+		else {
 			write();
 			dirty();
 			return list.remove( index );
 		}
-		else {
-			queueOperation( new Remove( index, (E) old ) );
-			return (E) old;
-		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentMap.java b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentMap.java
index 4e0f4bb840e5..276e6a1c26dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentMap.java
@@ -16,6 +16,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.Incubating;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.internal.util.Optional.Defined;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.collection.CollectionPersister;
@@ -146,50 +147,49 @@ public boolean containsValue(Object value) {
 
 	@Override
 	public E get(Object key) {
-		final Object result = readElementByIndex( key );
-		return result == UNKNOWN
-				? map.get( key )
-				: (E) result;
+		return readElementByIndex( key ).evaluate( () -> map.get( key ) );
 	}
 
 	@Override
 	public E put(K key, E value) {
-		if ( isPutQueueEnabled() ) {
-			final Object old = readElementByIndex( key );
-			if ( old != UNKNOWN ) {
-				queueOperation( new Put( key, value, (E) old ) );
-				return (E) old;
-			}
+		if ( isPutQueueEnabled()
+				&& readElementByIndex( key ) instanceof Defined<E> element ) {
+			final E old = element.result();
+			queueOperation( new Put( key, value, old ) );
+			return old;
 		}
-		initialize( true );
-		final E old = map.put( key, value );
-		// would be better to use the element-type to determine
-		// whether the old and the new are equal here; the problem being
-		// we do not necessarily have access to the element type in all
-		// cases
-		if ( value != old ) {
-			dirty();
+		else {
+			initialize( true );
+			final E old = map.put( key, value );
+			// would be better to use the element-type to determine
+			// whether the old and the new are equal here; the problem being
+			// we do not necessarily have access to the element type in all
+			// cases
+			if ( value != old ) {
+				dirty();
+			}
+			return old;
 		}
-		return old;
 	}
 
 	@Override
 	public E remove(Object key) {
-		if ( isPutQueueEnabled() ) {
-			final Object old = readElementByIndex( key );
-			if ( old != UNKNOWN ) {
+		if ( isPutQueueEnabled()
+				&& readElementByIndex( key ) instanceof Defined<E> element ) {
+			elementRemoved = true;
+			final E old = element.result();
+			queueOperation( new Remove( (K) key, old ) );
+			return old;
+		}
+		else {
+			// TODO : safe to interpret "map.remove(key) == null" as non-dirty?
+			initialize( true );
+			if ( map.containsKey( key ) ) {
 				elementRemoved = true;
-				queueOperation( new Remove( (K) key, (E) old ) );
-				return (E) old;
+				dirty();
 			}
+			return map.remove( key );
 		}
-		// TODO : safe to interpret "map.remove(key) == null" as non-dirty?
-		initialize( true );
-		if ( map.containsKey( key ) ) {
-			elementRemoved = true;
-			dirty();
-		}
-		return map.remove( key );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/CurrentSessionLogging.java b/hibernate-core/src/main/java/org/hibernate/context/internal/CurrentSessionLogging.java
index acff2c2c57c3..6e73fd95eb10 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/internal/CurrentSessionLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/internal/CurrentSessionLogging.java
@@ -16,6 +16,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.TRACE;
@@ -34,7 +35,7 @@
 public interface CurrentSessionLogging extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".current_session";
 
-	CurrentSessionLogging CURRENT_SESSION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CurrentSessionLogging.class, NAME );
+	CurrentSessionLogging CURRENT_SESSION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CurrentSessionLogging.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = WARN)
 	@Message(id = 90070001, value = "Session already bound on call to bind(); make sure you clean up your sessions")
diff --git a/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java
index 142692241536..502568624331 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java
@@ -9,6 +9,8 @@
 import jakarta.transaction.Synchronization;
 import jakarta.transaction.Transaction;
 
+import jakarta.transaction.TransactionManager;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
@@ -59,21 +61,53 @@ public Session currentSession() throws HibernateException {
 		final var jtaPlatform = factory().getServiceRegistry().requireService( JtaPlatform.class );
 		final var transactionManager = jtaPlatform.retrieveTransactionManager();
 		if ( transactionManager == null ) {
-			throw new HibernateException( "No TransactionManagerLookup specified" );
+			throw new HibernateException( "Could not obtain TransactionManager from JtaPlatform" );
 		}
 
-		Transaction txn;
+		final var txn = getTransaction( transactionManager );
+		final Object txnIdentifier = jtaPlatform.getTransactionIdentifier( txn );
+
+		Session currentSession = currentSessionMap.get( txnIdentifier );
+		if ( currentSession == null ) {
+			currentSession = buildOrObtainSession();
+			registerSynchronization( txn, txnIdentifier, currentSession );
+			currentSessionMap.put( txnIdentifier, currentSession );
+		}
+		else {
+			validateExistingSession( currentSession );
+		}
+
+		return currentSession;
+	}
+
+	private void registerSynchronization(Transaction txn, Object txnIdentifier, Session currentSession) {
+		try {
+			txn.registerSynchronization( buildCleanupSynch( txnIdentifier ) );
+		}
+		catch ( Throwable t ) {
+			try {
+				currentSession.close();
+			}
+			catch ( Throwable e ) {
+				CURRENT_SESSION_LOGGER.unableToReleaseGeneratedCurrentSessionOnFailedSynchronizationRegistration(e);
+			}
+			throw new HibernateException( "Unable to register cleanup Synchronization with TransactionManager" );
+		}
+	}
+
+	private static @NonNull Transaction getTransaction(TransactionManager transactionManager) {
 		try {
-			txn = transactionManager.getTransaction();
-			if ( txn == null ) {
+			final var transaction = transactionManager.getTransaction();
+			if ( transaction == null ) {
 				throw new HibernateException( "Unable to locate current JTA transaction" );
 			}
-			if ( !isActive( txn.getStatus() ) ) {
+			if ( !isActive( transaction.getStatus() ) ) {
 				// We could register the session against the transaction even though it is
 				// not started, but we'd have no guarantee of ever getting the map
 				// entries cleaned up (aside from spawning threads).
 				throw new HibernateException( "Current transaction is not in progress" );
 			}
+			return transaction;
 		}
 		catch ( HibernateException e ) {
 			throw e;
@@ -81,34 +115,6 @@ public Session currentSession() throws HibernateException {
 		catch ( Throwable t ) {
 			throw new HibernateException( "Problem locating/validating JTA transaction", t );
 		}
-
-		final Object txnIdentifier = jtaPlatform.getTransactionIdentifier( txn );
-
-		Session currentSession = currentSessionMap.get( txnIdentifier );
-
-		if ( currentSession == null ) {
-			currentSession = buildOrObtainSession();
-
-			try {
-				txn.registerSynchronization( buildCleanupSynch( txnIdentifier ) );
-			}
-			catch ( Throwable t ) {
-				try {
-					currentSession.close();
-				}
-				catch ( Throwable e ) {
-					CURRENT_SESSION_LOGGER.unableToReleaseGeneratedCurrentSessionOnFailedSynchronizationRegistration(e);
-				}
-				throw new HibernateException( "Unable to register cleanup Synchronization with TransactionManager" );
-			}
-
-			currentSessionMap.put( txnIdentifier, currentSession );
-		}
-		else {
-			validateExistingSession( currentSession );
-		}
-
-		return currentSession;
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/context/spi/MultiTenancy.java b/hibernate-core/src/main/java/org/hibernate/context/spi/MultiTenancy.java
index 6375d367d71f..5307fcd8d8d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/spi/MultiTenancy.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/spi/MultiTenancy.java
@@ -14,6 +14,7 @@
 
 import java.util.Map;
 
+import static org.hibernate.cfg.MultiTenancySettings.MULTI_TENANT_CREDENTIALS_MAPPER;
 import static org.hibernate.cfg.MultiTenancySettings.MULTI_TENANT_IDENTIFIER_RESOLVER;
 import static org.hibernate.cfg.MultiTenancySettings.MULTI_TENANT_SCHEMA_MAPPER;
 
@@ -85,4 +86,27 @@ public static TenantSchemaMapper<Object> getTenantSchemaMapper(
 		}
 		return tenantSchemaMapper;
 	}
+
+	/**
+	 * Obtain the configured {@link TenantCredentialsMapper}.
+	 */
+	@SuppressWarnings("unchecked")
+	@Nullable
+	public static TenantCredentialsMapper<Object> getTenantCredentialsMapper(
+			Map<String,Object> settings, StandardServiceRegistry registry) {
+		final var tenantCredentialsMapper =
+				registry.requireService( StrategySelector.class )
+						.resolveStrategy( TenantCredentialsMapper.class,
+								settings.get( MULTI_TENANT_CREDENTIALS_MAPPER ) );
+		if ( tenantCredentialsMapper == null ) {
+			return Helper.getBean(
+					Helper.getBeanContainer( registry ),
+					TenantCredentialsMapper.class,
+					true,
+					false,
+					null
+			);
+		}
+		return tenantCredentialsMapper;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/context/spi/TenantCredentialsMapper.java b/hibernate-core/src/main/java/org/hibernate/context/spi/TenantCredentialsMapper.java
new file mode 100644
index 000000000000..388374e4c842
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/context/spi/TenantCredentialsMapper.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.context.spi;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.hibernate.Incubating;
+
+/**
+ * Supplies
+ * {@linkplain org.hibernate.cfg.MultiTenancySettings#MULTI_TENANT_CREDENTIALS_MAPPER
+ * tenant-specific} credential to use to connect to the database. This feature may be
+ * used on its own or in conjunction with schema-based or discriminator-based
+ * multitenancy.
+ * <p>When a tenant credentials mapper is set,
+ * {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider#getConnection(String, String)}
+ * is used to acquire JDBC connections. This typically requires that the JDBC {@code DataSource}
+ * correctly implements the method {@link javax.sql.DataSource#getConnection(String, String)}.
+ *
+ * @param <T> The type of the tenant id
+ *
+ * @since 7.3
+ *
+ * @see org.hibernate.cfg.MultiTenancySettings#MULTI_TENANT_CREDENTIALS_MAPPER
+ * @see javax.sql.DataSource#getConnection(String, String)
+ * @see org.hibernate.engine.jdbc.connections.spi.ConnectionProvider#getConnection(String, String)
+ *
+ * @author Gavin King
+ */
+@Incubating
+public interface TenantCredentialsMapper<T> {
+	/**
+	 * The name of the database user for data belonging to the tenant
+	 * with the given identifier.
+	 *
+	 * @param tenantIdentifier The tenant identifier
+	 * @return The name of the database schema belonging to that tenant
+	 */
+	@NonNull String user(@NonNull T tenantIdentifier);
+
+	/**
+	 * The password of the database user for data belonging to the tenant
+	 * with the given identifier.
+	 *
+	 * @param tenantIdentifier The tenant identifier
+	 * @return The name of the database schema belonging to that tenant
+	 */
+	@NonNull String password(@NonNull T tenantIdentifier);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/context/spi/TenantSchemaMapper.java b/hibernate-core/src/main/java/org/hibernate/context/spi/TenantSchemaMapper.java
index c14f65d07d91..5b1045f79ad7 100644
--- a/hibernate-core/src/main/java/org/hibernate/context/spi/TenantSchemaMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/context/spi/TenantSchemaMapper.java
@@ -8,7 +8,7 @@
 import org.hibernate.Incubating;
 
 /**
- * Obtains the name of a database schema for a given tenant identifier when
+ * Supplies the name of a database schema for a given tenant identifier when
  * {@linkplain org.hibernate.cfg.MultiTenancySettings#MULTI_TENANT_SCHEMA_MAPPER
  * schema-based multitenancy} is enabled.
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java
index 564a04f7cb71..2ed177f9d3b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java
@@ -7,6 +7,7 @@
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.boot.model.FunctionContributions;
+import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.dialect.function.CaseLeastGreatestEmulation;
 import org.hibernate.dialect.function.CastingConcatFunction;
 import org.hibernate.dialect.function.TransactSQLStrFunction;
@@ -26,6 +27,7 @@
 import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
+import org.hibernate.service.ServiceRegistry;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.internal.TransactSQLLockingClauseStrategy;
 import org.hibernate.sql.ast.spi.LockingClauseStrategy;
@@ -33,6 +35,8 @@
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JsonAsStringJdbcType;
+import org.hibernate.type.descriptor.jdbc.XmlAsStringJdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 
 import java.sql.CallableStatement;
@@ -93,6 +97,14 @@ protected String columnType(int sqlTypeCode) {
 		};
 	}
 
+	@Override
+	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+		super.contributeTypes( typeContributions, serviceRegistry );
+		final var jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
+		jdbcTypeRegistry.addDescriptor( JsonAsStringJdbcType.NVARCHAR_INSTANCE );
+		jdbcTypeRegistry.addDescriptor( XmlAsStringJdbcType.NVARCHAR_INSTANCE );
+	}
+
 	@Override
 	public int getDefaultStatementBatchSize() {
 		return 0;
@@ -220,7 +232,7 @@ public String applyLocksToSql(String sql, LockOptions lockOptions, Map<String, S
 		}
 
 		// TODO:  merge additional lock options support in Dialect.applyLocksToSql
-		final StringBuilder buffer = new StringBuilder( sql );
+		final var buffer = new StringBuilder( sql );
 		keyColumnNameMap.forEach( (tableAlias, keyColumnNames) -> {
 			int start = -1;
 			int end = -1;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AzureSQLServerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AzureSQLServerDialect.java
index 834b82b0f9f5..379930a1b9f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/AzureSQLServerDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/AzureSQLServerDialect.java
@@ -11,7 +11,7 @@
  *
  * @deprecated Use {@link SQLServerDialect} instead.
  */
-@Deprecated(forRemoval = true)
+@Deprecated(forRemoval = true, since = "7.2")
 public class AzureSQLServerDialect extends SQLServerDialect {
 
 	public AzureSQLServerDialect() {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java
index c40a5cdad6d7..e0d4c3bbccf0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialect.java
@@ -49,8 +49,8 @@
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.config.ConfigurationHelper;
+import org.hibernate.persister.entity.mutation.EntityMutationTarget;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.common.TemporalUnit;
 import org.hibernate.query.sqm.IntervalType;
@@ -62,6 +62,9 @@
 import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
+import org.hibernate.sql.model.MutationOperation;
+import org.hibernate.sql.model.internal.OptionalTableUpdate;
+import org.hibernate.sql.model.jdbc.OptionalTableUpdateWithUpsertOperation;
 import org.hibernate.tool.schema.extract.internal.InformationExtractorPostgreSQLImpl;
 import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
 import org.hibernate.tool.schema.extract.spi.ExtractionContext;
@@ -77,11 +80,9 @@
 import org.hibernate.type.descriptor.sql.internal.NamedNativeEnumDdlTypeImpl;
 import org.hibernate.type.descriptor.sql.internal.NamedNativeOrdinalEnumDdlTypeImpl;
 import org.hibernate.type.descriptor.sql.internal.Scale6IntervalSecondDdlType;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.time.temporal.ChronoField;
@@ -90,13 +91,13 @@
 import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static java.lang.Integer.parseInt;
 import static org.hibernate.cfg.DialectSpecificSettings.COCKROACH_VERSION_STRING;
 import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
 import static org.hibernate.internal.util.JdbcExceptionHelper.extractSqlState;
+import static org.hibernate.internal.util.StringHelper.split;
 import static org.hibernate.query.common.TemporalUnit.DAY;
 import static org.hibernate.query.common.TemporalUnit.EPOCH;
 import static org.hibernate.query.common.TemporalUnit.NATIVE;
@@ -133,9 +134,10 @@
 import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithMillis;
 
 /**
- * A {@linkplain Dialect SQL dialect} for CockroachDB 23.1 and above.
+ * A {@linkplain Dialect SQL dialect} for CockroachDB 23.2 and above.
  *
  * @author Gavin King
+ * @author Yoobin Yoon
  */
 public class CockroachDialect extends Dialect {
 
@@ -145,7 +147,7 @@ public class CockroachDialect extends Dialect {
 	// Pre-compile and reuse pattern
 	private static final Pattern CRDB_VERSION_PATTERN = Pattern.compile( "v[\\d]+(\\.[\\d]+)?(\\.[\\d]+)?" );
 
-	protected static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 23, 1 );
+	protected static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 23, 2 );
 
 	protected final PostgreSQLDriverKind driverKind;
 
@@ -185,10 +187,10 @@ public DatabaseVersion determineDatabaseVersion(DialectResolutionInfo info) {
 
 	protected static DatabaseVersion fetchDataBaseVersion(DialectResolutionInfo info) {
 		String versionString = null;
-		final DatabaseMetaData databaseMetadata = info.getDatabaseMetadata();
+		final var databaseMetadata = info.getDatabaseMetadata();
 		if ( databaseMetadata != null ) {
-			try ( var statement = databaseMetadata.getConnection().createStatement() ) {
-				final ResultSet resultSet = statement.executeQuery( "SELECT version()" );
+			try ( var statement = databaseMetadata.getConnection().createStatement();
+					var resultSet = statement.executeQuery( "SELECT version()" ) ) {
 				if ( resultSet.next() ) {
 					versionString = resultSet.getString( 1 );
 				}
@@ -205,21 +207,20 @@ protected static DatabaseVersion fetchDataBaseVersion(DialectResolutionInfo info
 	}
 
 	public static DatabaseVersion parseVersion( String versionString ) {
-		DatabaseVersion databaseVersion = null;
-		// What the DB select returns is similar to "CockroachDB CCL v21.2.10 (x86_64-unknown-linux-gnu, built 2022/05/02 17:38:58, go1.16.6)"
-		final Matcher matcher = CRDB_VERSION_PATTERN.matcher( versionString == null ? "" : versionString );
+		// What the DB select returns is similar to
+		// "CockroachDB CCL v21.2.10 (x86_64-unknown-linux-gnu, built 2022/05/02 17:38:58, go1.16.6)"
+		final var matcher = CRDB_VERSION_PATTERN.matcher( versionString == null ? "" : versionString );
 		if ( matcher.find() ) {
-				final String[] versionParts = StringHelper.split( ".", matcher.group().substring( 1 ) );
-				// if we got to this point, there is at least a major version, so no need to check [].length > 0
-				int majorVersion = parseInt( versionParts[0] );
-				int minorVersion = versionParts.length > 1 ? parseInt( versionParts[1] ) : 0;
-				int microVersion = versionParts.length > 2 ? parseInt( versionParts[2] ) : 0;
-				databaseVersion=  new SimpleDatabaseVersion( majorVersion, minorVersion, microVersion);
+			final var versionParts = split( ".", matcher.group().substring( 1 ) );
+			// if we got to this point, there is at least a major version, so no need to check [].length > 0
+			final int majorVersion = parseInt( versionParts[0] );
+			final int minorVersion = versionParts.length > 1 ? parseInt( versionParts[1] ) : 0;
+			final int microVersion = versionParts.length > 2 ? parseInt( versionParts[2] ) : 0;
+			return new SimpleDatabaseVersion( majorVersion, minorVersion, microVersion);
 		}
-		if ( databaseVersion == null ) {
-			databaseVersion = MINIMUM_VERSION;
+		else {
+			return MINIMUM_VERSION;
 		}
-		return databaseVersion;
 	}
 
 	@Override
@@ -258,7 +259,7 @@ protected String castType(int sqlTypeCode) {
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.registerColumnTypes( typeContributions, serviceRegistry );
 
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( UUID, "uuid", this ) );
 
@@ -284,6 +285,11 @@ public JdbcType resolveSqlTypeDescriptor(
 			int scale,
 			JdbcTypeRegistry jdbcTypeRegistry) {
 		switch ( jdbcTypeCode ) {
+			case VARCHAR:
+				if ( "text".equals( columnTypeName ) && precision == Integer.MAX_VALUE ) {
+					jdbcTypeCode = LONG32VARCHAR;
+				}
+				break;
 			case OTHER:
 				switch ( columnTypeName ) {
 					case "uuid":
@@ -347,6 +353,20 @@ protected Integer resolveSqlTypeCode(String columnTypeName, TypeConfiguration ty
 		};
 	}
 
+	@Override
+	public boolean equivalentTypes(int typeCode1, int typeCode2) {
+		switch ( typeCode1 ) {
+			// On CockroachDB, we use the same DDL type, so treat the types as equivalent
+			case LONG32VARCHAR, LONG32NVARCHAR, CLOB, NCLOB:
+				switch ( typeCode2 ) {
+					case LONG32VARCHAR, LONG32NVARCHAR, CLOB, NCLOB:
+						return true;
+				}
+			default:
+				return super.equivalentTypes( typeCode1, typeCode2 );
+		}
+	}
+
 	@Override
 	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.contributeTypes( typeContributions, serviceRegistry );
@@ -354,7 +374,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 	}
 
 	protected void contributeCockroachTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-		final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration()
+		final var jdbcTypeRegistry = typeContributions.getTypeConfiguration()
 				.getJdbcTypeRegistry();
 		// Don't use this type due to https://github.com/pgjdbc/pgjdbc/issues/2862
 		//jdbcTypeRegistry.addDescriptor( TimestampUtcAsOffsetDateTimeJdbcType.INSTANCE );
@@ -460,41 +480,9 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.listagg_stringAgg( "string" );
 		functionFactory.inverseDistributionOrderedSetAggregates();
 		functionFactory.hypotheticalOrderedSetAggregates_windowEmulation();
-		functionFactory.array_postgresql();
-		functionFactory.arrayAggregate();
-		functionFactory.arrayPosition_postgresql();
-		functionFactory.arrayPositions_postgresql();
-		functionFactory.arrayLength_cardinality();
-		functionFactory.arrayConcat_postgresql();
-		functionFactory.arrayPrepend_postgresql();
-		functionFactory.arrayAppend_postgresql();
-		functionFactory.arrayContains_postgresql();
-		functionFactory.arrayIntersects_postgresql();
-		functionFactory.arrayGet_bracket();
-		functionFactory.arraySet_unnest();
-		functionFactory.arrayRemove();
-		functionFactory.arrayRemoveIndex_unnest( true );
-		functionFactory.arraySlice_operator();
-		functionFactory.arrayReplace();
-		functionFactory.arrayTrim_unnest();
-		functionFactory.arrayFill_cockroachdb();
-		functionFactory.arrayToString_postgresql();
 
-		functionFactory.jsonValue_cockroachdb();
-		functionFactory.jsonQuery_cockroachdb();
-		functionFactory.jsonExists_cockroachdb();
-		functionFactory.jsonObject_postgresql();
-		functionFactory.jsonArray_postgresql();
-		functionFactory.jsonArrayAgg_postgresql( false );
-		functionFactory.jsonObjectAgg_postgresql( false );
-		functionFactory.jsonSet_postgresql();
-		functionFactory.jsonRemove_cockroachdb();
-		functionFactory.jsonReplace_postgresql();
-		functionFactory.jsonInsert_postgresql();
-		// No support for WITH clause in subquery: https://github.com/cockroachdb/cockroach/issues/131011
-//		functionFactory.jsonMergepatch_postgresql();
-		functionFactory.jsonArrayAppend_postgresql( false );
-		functionFactory.jsonArrayInsert_postgresql();
+		registerArrayFunctions( functionFactory );
+		registerJsonFunctions( functionFactory );
 
 		functionFactory.unnest_postgresql( false );
 		functionFactory.generateSeries( null, "ordinality", true );
@@ -508,7 +496,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 
 		functionContributions.getFunctionRegistry().register(
 				"trunc",
-				new PostgreSQLTruncFunction( true, functionContributions.getTypeConfiguration() )
+				new PostgreSQLTruncFunction( true, true, functionContributions.getTypeConfiguration() )
 		);
 		functionContributions.getFunctionRegistry().registerAlternateKey( "truncate", "trunc" );
 
@@ -518,6 +506,48 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.regexpLike_postgresql( false );
 	}
 
+	protected static void registerJsonFunctions(CommonFunctionFactory functionFactory) {
+		functionFactory.jsonValue_cockroachdb();
+		functionFactory.jsonQuery_cockroachdb();
+		functionFactory.jsonExists_cockroachdb();
+		functionFactory.jsonObject_postgresql();
+		functionFactory.jsonArray_postgresql();
+		functionFactory.jsonArrayAgg_postgresql( false );
+		functionFactory.jsonObjectAgg_postgresql( false );
+		functionFactory.jsonSet_postgresql();
+		functionFactory.jsonRemove_cockroachdb();
+		functionFactory.jsonReplace_postgresql();
+		functionFactory.jsonInsert_postgresql();
+		// No support for WITH clause in subquery: https://github.com/cockroachdb/cockroach/issues/131011
+//		functionFactory.jsonMergepatch_postgresql();
+		functionFactory.jsonArrayAppend_postgresql( false );
+		functionFactory.jsonArrayInsert_postgresql();
+	}
+
+	protected static void registerArrayFunctions(CommonFunctionFactory functionFactory) {
+		functionFactory.array_postgresql();
+		functionFactory.arrayAggregate();
+		functionFactory.arrayPosition_postgresql();
+		functionFactory.arrayPositions_postgresql();
+		functionFactory.arrayLength_cardinality();
+		functionFactory.arrayConcat_postgresql();
+		functionFactory.arrayPrepend_postgresql();
+		functionFactory.arrayAppend_postgresql();
+		functionFactory.arrayContains_postgresql();
+		functionFactory.arrayIntersects_postgresql();
+		functionFactory.arrayGet_bracket();
+		functionFactory.arraySet_unnest();
+		functionFactory.arrayRemove();
+		functionFactory.arrayRemoveIndex_unnest( true );
+		functionFactory.arraySlice_operator();
+		functionFactory.arrayReplace();
+		functionFactory.arrayTrim_unnest();
+		functionFactory.arrayReverse_unnest();
+		functionFactory.arraySort_unnest();
+		functionFactory.arrayFill_cockroachdb();
+		functionFactory.arrayToString_postgresql();
+	}
+
 	@Override
 	public @Nullable String getDefaultOrdinalityColumnName() {
 		return "ordinality";
@@ -553,6 +583,11 @@ public String getCurrentTimestampSelectString() {
 		return "select now()";
 	}
 
+	@Override
+	public boolean isCurrentTimestampStable() {
+		return true;
+	}
+
 	@Override
 	public boolean supportsDistinctFromPredicate() {
 		return true;
@@ -573,6 +608,11 @@ public boolean supportsIfExistsAfterAlterTable() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsIfExistsBeforeIndexName() {
+		return true;
+	}
+
 	@Override
 	public boolean qualifyIndexName() {
 		return false;
@@ -583,6 +623,17 @@ public IdentityColumnSupport getIdentityColumnSupport() {
 		return CockroachDBIdentityColumnSupport.INSTANCE;
 	}
 
+	@Override
+	public String getAlterColumnTypeString(String columnName, String columnType, String columnDefinition) {
+		// would need multiple statements to 'set not null'/'drop not null', 'set default'/'drop default', 'set generated', etc
+		return "alter column " + columnName + " set data type " + columnType;
+	}
+
+	@Override
+	public boolean supportsAlterColumnType() {
+		return true;
+	}
+
 	@Override
 	public boolean supportsValuesList() {
 		return true;
@@ -676,6 +727,14 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 		};
 	}
 
+	@Override
+	public MutationOperation createOptionalTableUpdateOperation(
+			EntityMutationTarget mutationTarget,
+			OptionalTableUpdate optionalTableUpdate,
+			SessionFactoryImplementor factory) {
+		return new OptionalTableUpdateWithUpsertOperation( mutationTarget, optionalTableUpdate, factory );
+	}
+
 	@Override
 	public NationalizationSupport getNationalizationSupport() {
 		// TEXT / STRING inherently support nationalized data
@@ -1197,4 +1256,9 @@ public String getReadLockString(String aliases, int timeout) {
 	public InformationExtractor getInformationExtractor(ExtractionContext extractionContext) {
 		return new InformationExtractorPostgreSQLImpl( extractionContext );
 	}
+
+	@Override
+	public boolean causesRollback(SQLException sqlException) {
+		return true;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialectQueryHints.java b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialectQueryHints.java
index 5b7124049e31..211f723112a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialectQueryHints.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/CockroachDialectQueryHints.java
@@ -4,14 +4,13 @@
  */
 package org.hibernate.dialect;
 
-import org.hibernate.internal.util.StringHelper;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static org.hibernate.internal.util.StringHelper.split;
+
 class CockroachDialectQueryHints {
 
 	final private Pattern TABLE_QUERY_PATTERN = Pattern.compile(
@@ -31,46 +30,38 @@ public CockroachDialectQueryHints(String query, List<String> hintList) {
 	}
 
 	public String getQueryHintString() {
-		List<IndexHint> indexHints = new ArrayList<>();
+		final List<IndexHint> indexHints = new ArrayList<>();
 		JoinHint joinHint = null;
-		for ( var h : hints ) {
-			IndexHint indexHint = parseIndexHints( h );
+		for ( var hint : hints ) {
+			final var indexHint = parseIndexHints( hint );
 			if ( indexHint != null ) {
 				indexHints.add( indexHint );
-				continue;
 			}
-			joinHint = parseJoinHints( h );
+			else {
+				joinHint = parseJoinHints( hint );
+			}
 		}
 
-		String result = addIndexHints( query, indexHints );
+		final String result = addIndexHints( query, indexHints );
 		return joinHint == null ? result : addJoinHint( query, joinHint );
 	}
 
 	private IndexHint parseIndexHints(String hint) {
-		var parts = StringHelper.split( "@", hint );
-		if ( parts.length == 2 ) {
-			return new IndexHint( parts[0], hint );
-		}
-		return null;
+		final var parts = split( "@", hint );
+		return parts.length == 2 ? new IndexHint( parts[0], hint ) : null;
 	}
 
 	private JoinHint parseJoinHints(String hint) {
 		var matcher = JOIN_HINT_PATTERN.matcher( hint );
-		if ( matcher.find() ) {
-			return new JoinHint( matcher.group( 1 ) );
-		}
-		return null;
+		return matcher.find() ? new JoinHint( matcher.group( 1 ) ) : null;
 	}
 
-	String addIndexHints(String query, List<IndexHint> hints) {
-
-		Matcher statementMatcher = TABLE_QUERY_PATTERN.matcher( query );
-
+	private String addIndexHints(String query, List<IndexHint> hints) {
+		final var statementMatcher = TABLE_QUERY_PATTERN.matcher( query );
 		if ( statementMatcher.matches() && statementMatcher.groupCount() > 2 ) {
-			String prefix = statementMatcher.group( 1 );
-			String fromList = statementMatcher.group( 2 );
-			String suffix = statementMatcher.group( 3 );
-			fromList = addIndexHintsToFromList( fromList, hints );
+			final String prefix = statementMatcher.group( 1 );
+			final String fromList = addIndexHintsToFromList( statementMatcher.group( 2 ), hints );
+			final String suffix = statementMatcher.group( 3 );
 			return prefix + fromList + suffix;
 		}
 		else {
@@ -78,23 +69,22 @@ String addIndexHints(String query, List<IndexHint> hints) {
 		}
 	}
 
-	String addJoinHint(String query, JoinHint hint) {
-		var m = JOIN_PATTERN.matcher( query );
-		StringBuilder buffer = new StringBuilder();
+	private String addJoinHint(String query, JoinHint hint) {
+		final var matcher = JOIN_PATTERN.matcher( query );
+		final var buffer = new StringBuilder();
 		int start = 0;
-		while ( m.find() ) {
-			buffer.append(query, start, m.start());
-
-			if ( m.group( 1 ) == null ) {
+		while ( matcher.find() ) {
+			buffer.append( query, start, matcher.start() );
+			if ( matcher.group( 1 ) == null ) {
 				buffer.append( " inner" );
 			}
 			else {
-				buffer.append( m.group( 1 ) );
+				buffer.append( matcher.group( 1 ) );
 			}
 			buffer.append( " " )
 					.append( hint.joinType )
 					.append( " join" );
-			start = m.end();
+			start = matcher.end();
 		}
 		buffer.append( query.substring( start ) );
 		return buffer.toString();
@@ -109,22 +99,12 @@ String addIndexHintsToFromList(String fromList, List<IndexHint> hints) {
 	}
 
 
-	static class IndexHint {
-		final String table;
-		final String text;
-
-		IndexHint(String table, String text) {
-			this.table = table;
-			this.text = text;
-		}
-
+	private record IndexHint(String table, String text) {
 	}
 
-	static class JoinHint {
-		final String joinType;
-
-		JoinHint(String type) {
-			this.joinType = type.toLowerCase( Locale.ROOT );
+	private record JoinHint(String joinType) {
+		JoinHint(String joinType) {
+			this.joinType = joinType.toLowerCase( Locale.ROOT );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
index c0dda14c8589..a255cb691dfb 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
@@ -28,6 +28,8 @@
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.dialect.sql.ast.DB2SqlAstTranslator;
 import org.hibernate.dialect.sql.ast.PostgreSQLSqlAstTranslator;
+import org.hibernate.dialect.temporal.DB2TemporalTableSupport;
+import org.hibernate.dialect.temporal.TemporalTableSupport;
 import org.hibernate.dialect.temptable.DB2GlobalTemporaryTableStrategy;
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
 import org.hibernate.dialect.type.DB2StructJdbcType;
@@ -91,10 +93,8 @@
 import org.hibernate.type.descriptor.jdbc.OffsetTimeJdbcType;
 import org.hibernate.type.descriptor.jdbc.XmlJdbcType;
 import org.hibernate.type.descriptor.jdbc.ZonedDateTimeJdbcType;
-import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType;
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import java.sql.CallableStatement;
@@ -114,7 +114,6 @@
 import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static java.lang.Integer.parseInt;
@@ -197,7 +196,7 @@ public DatabaseVersion determineDatabaseVersion(DialectResolutionInfo info) {
 
 	public static DatabaseVersion determinFullDatabaseVersion(DialectResolutionInfo info) {
 		String versionString = null;
-		final DatabaseMetaData databaseMetadata = info.getDatabaseMetadata();
+		final var databaseMetadata = info.getDatabaseMetadata();
 		if ( databaseMetadata != null ) {
 			try {
 				versionString = databaseMetadata.getDatabaseProductVersion();
@@ -206,7 +205,7 @@ public static DatabaseVersion determinFullDatabaseVersion(DialectResolutionInfo
 				// Ignore
 			}
 		}
-		final DatabaseVersion databaseVersion = versionString == null ? null : parseVersion( versionString );
+		final var databaseVersion = versionString == null ? null : parseVersion( versionString );
 		return databaseVersion != null ? databaseVersion : info.makeCopyOrDefault( MINIMUM_VERSION );
 	}
 
@@ -215,15 +214,18 @@ public static DatabaseVersion determinFullDatabaseVersion(DialectResolutionInfo
 			// The default format
 			return null;
 		}
-		DatabaseVersion databaseVersion = null;
-		final Matcher matcher = DB2_VERSION_PATTERN.matcher( versionString );
-		if ( matcher.find() ) {
-			int majorVersion = parseInt( matcher.group( 1 ) );
-			int minorVersion = parseInt( matcher.group( 2 ) );
-			int microVersion = parseInt( matcher.group( 3 ) );
-			databaseVersion = new SimpleDatabaseVersion( majorVersion, minorVersion, microVersion );
+		else {
+			final var matcher = DB2_VERSION_PATTERN.matcher( versionString );
+			if ( matcher.find() ) {
+				final int majorVersion = parseInt( matcher.group( 1 ) );
+				final int minorVersion = parseInt( matcher.group( 2 ) );
+				final int microVersion = parseInt( matcher.group( 3 ) );
+				return new SimpleDatabaseVersion( majorVersion, minorVersion, microVersion );
+			}
+			else {
+				return null;
+			}
 		}
-		return databaseVersion;
 	}
 
 	protected LockingSupport buildLockingSupport() {
@@ -276,7 +278,7 @@ protected String columnType(int sqlTypeCode) {
 	@Override
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.registerColumnTypes( typeContributions, serviceRegistry );
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( SQLXML, "xml", this ) );
 		ddlTypeRegistry.addDescriptor(
@@ -323,7 +325,7 @@ public boolean supportsDistinctFromPredicate() {
 	public void initializeFunctionRegistry(FunctionContributions functionContributions) {
 		super.initializeFunctionRegistry( functionContributions );
 
-		final DdlTypeRegistry ddlTypeRegistry = functionContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = functionContributions.getTypeConfiguration().getDdlTypeRegistry();
 		final var functionFactory = new CommonFunctionFactory( functionContributions );
 		// AVG by default uses the input type, so we possibly need to cast the argument type, hence a special function
 		functionFactory.avg_castingNonDoubleArguments( this, SqlAstNodeRenderingMode.DEFAULT );
@@ -452,15 +454,20 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.windowFunctions();
 		functionFactory.listagg( null );
 
-		functionFactory.jsonValue_db2();
-		functionFactory.jsonQuery_no_passing();
-		functionFactory.jsonExists_no_passing();
-		functionFactory.jsonObject_db2();
-		functionFactory.jsonArray_db2();
-		functionFactory.jsonArrayAgg_db2();
-		functionFactory.jsonObjectAgg_db2();
-		functionFactory.jsonTable_db2( getMaximumSeriesSize() );
+		registerJsonFunctions( functionFactory );
+		registerXmlFunctions( functionFactory );
 
+		functionFactory.unnest_db2( getMaximumSeriesSize() );
+		functionFactory.generateSeries_recursive( getMaximumSeriesSize(), false, true );
+
+		functionFactory.hex( "hex(?1)" );
+		functionFactory.sha( "hash(?1, 2)" );
+		functionFactory.md5( "hash(?1, 0)" );
+
+		functionFactory.regexpLike();
+	}
+
+	protected static void registerXmlFunctions(CommonFunctionFactory functionFactory) {
 		functionFactory.xmlelement();
 		functionFactory.xmlcomment();
 		functionFactory.xmlforest();
@@ -470,15 +477,17 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.xmlexists();
 		functionFactory.xmlagg();
 		functionFactory.xmltable_db2();
+	}
 
-		functionFactory.unnest_db2( getMaximumSeriesSize() );
-		functionFactory.generateSeries_recursive( getMaximumSeriesSize(), false, true );
-
-		functionFactory.hex( "hex(?1)" );
-		functionFactory.sha( "hash(?1, 2)" );
-		functionFactory.md5( "hash(?1, 0)" );
-
-		functionFactory.regexpLike();
+	protected void registerJsonFunctions(CommonFunctionFactory functionFactory) {
+		functionFactory.jsonValue_db2();
+		functionFactory.jsonQuery_no_passing();
+		functionFactory.jsonExists_no_passing();
+		functionFactory.jsonObject_db2();
+		functionFactory.jsonArray_db2();
+		functionFactory.jsonArrayAgg_db2();
+		functionFactory.jsonObjectAgg_db2();
+		functionFactory.jsonTable_db2( getMaximumSeriesSize() );
 	}
 
 	/**
@@ -516,7 +525,7 @@ public long getFractionalSecondPrecisionInNanos() {
 
 	@Override @SuppressWarnings("deprecation")
 	public String timestampdiffPattern(TemporalUnit unit, TemporalType fromTemporalType, TemporalType toTemporalType) {
-		final StringBuilder pattern = new StringBuilder();
+		final var pattern = new StringBuilder();
 		final String fromExpression;
 		final String toExpression;
 		if ( unit.isDateUnit() ) {
@@ -589,7 +598,7 @@ public String timestampdiffPattern(TemporalUnit unit, TemporalType fromTemporalT
 
 	@Override @SuppressWarnings("deprecation")
 	public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType, IntervalType intervalType) {
-		final StringBuilder pattern = new StringBuilder();
+		final var pattern = new StringBuilder();
 		final String timestampExpression;
 		if ( unit.isDateUnit() ) {
 			if ( temporalType == TemporalType.TIME ) {
@@ -880,6 +889,11 @@ public boolean supportsIfExistsBeforeTableName() {
 		return getVersion().isSameOrAfter( 11, 5 );
 	}
 
+	@Override
+	public boolean supportsIfExistsBeforeIndexName() {
+		return getVersion().isSameOrAfter( 11, 5 );
+	}
+
 	@Override
 	public SqmMultiTableMutationStrategy getFallbackSqmMutationStrategy(
 			EntityMappingType rootEntityDescriptor,
@@ -966,7 +980,7 @@ public boolean supportsTupleDistinctCounts() {
 	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.contributeTypes( typeContributions, serviceRegistry );
 
-		final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
+		final var jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
 
 		jdbcTypeRegistry.addDescriptor( XmlJdbcType.INSTANCE );
 		jdbcTypeRegistry.addDescriptor( DB2StructJdbcType.INSTANCE );
@@ -1211,12 +1225,9 @@ public String extractPattern(TemporalUnit unit) {
 
 	@Override
 	public String castPattern(CastType from, CastType to) {
-		if ( from == CastType.STRING && to == CastType.BOOLEAN ) {
-			return "cast(?1 as ?2)";
-		}
-		else {
-			return super.castPattern( from, to );
-		}
+		return from == CastType.STRING && to == CastType.BOOLEAN
+				? "cast(?1 as ?2)"
+				: super.castPattern( from, to );
 	}
 
 	@Override
@@ -1226,7 +1237,12 @@ public int getInExpressionCountLimit() {
 
 	@Override
 	public String generatedAs(String generatedAs) {
-		return " generated always as (" + generatedAs + ")";
+		return switch ( generatedAs ) {
+			case "transaction start id" -> " not null generated always as transaction start id";
+			case "row start" -> " not null generated always as row begin";
+			case "row end" -> " not null generated always as row end";
+			default -> " generated always as (" + generatedAs + ")";
+		};
 	}
 
 	@Override
@@ -1322,4 +1338,13 @@ public boolean supportsRowValueConstructorSyntaxInInSubQuery() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsNotNullAfterGeneratedAs() {
+		return false;
+	}
+
+	@Override
+	public TemporalTableSupport getTemporalTableSupport() {
+		return new DB2TemporalTableSupport( this );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
index f16ec415d237..669fcb211455 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2iDialect.java
@@ -114,7 +114,8 @@ public boolean supportsUpdateReturning() {
 	@Override
 	public SequenceSupport getSequenceSupport() {
 		return getVersion().isSameOrAfter(7, 3)
-				? DB2iSequenceSupport.INSTANCE : NoSequenceSupport.INSTANCE;
+				? DB2iSequenceSupport.INSTANCE
+				: NoSequenceSupport.INSTANCE;
 	}
 
 	@Override
@@ -133,7 +134,8 @@ public String getQuerySequencesString() {
 	@Override
 	public LimitHandler getLimitHandler() {
 		return getVersion().isSameOrAfter(7, 3)
-				? FetchLimitHandler.INSTANCE : LegacyDB2LimitHandler.INSTANCE;
+				? FetchLimitHandler.INSTANCE
+				: LegacyDB2LimitHandler.INSTANCE;
 	}
 
 	@Override
@@ -154,13 +156,9 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 		};
 	}
 
-	// I speculate that this is a correct implementation of rowids for DB2 for i,
-	// just on the basis of the DB2 docs, but I currently have no way to test it
-	// Note that the implementation inherited from DB2Dialect for LUW will not work!
-
 	@Override
 	public String rowId(String rowId) {
-		return rowId == null || rowId.isEmpty() ? "rowid_" : rowId;
+		return rowId;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java
index 8c18859cbe07..4ab66edd96e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2zDialect.java
@@ -128,7 +128,7 @@ public IdentityColumnSupport getIdentityColumnSupport() {
 
 	@Override
 	public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType, IntervalType intervalType) {
-		final StringBuilder pattern = new StringBuilder();
+		final var pattern = new StringBuilder();
 		pattern.append("add_");
 		switch (unit) {
 			case NATIVE:
@@ -148,20 +148,16 @@ public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType,
 		pattern.append("s(");
 		final String timestampExpression;
 		if ( unit.isDateUnit() ) {
-			if ( temporalType == TemporalType.TIME ) {
-				timestampExpression = "timestamp('1970-01-01',?3)";
-			}
-			else {
-				timestampExpression = "?3";
-			}
+			timestampExpression =
+					temporalType == TemporalType.TIME
+							? "timestamp('1970-01-01',?3)"
+							: "?3";
 		}
 		else {
-			if ( temporalType == TemporalType.DATE ) {
-				timestampExpression = "cast(?3 as timestamp)";
-			}
-			else {
-				timestampExpression = "?3";
-			}
+			timestampExpression =
+					temporalType == TemporalType.DATE
+							? "cast(?3 as timestamp)"
+							: "?3";
 		}
 		pattern.append(timestampExpression);
 		pattern.append(",");
@@ -193,13 +189,9 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 		};
 	}
 
-	// I speculate that this is a correct implementation of rowids for DB2 for z/OS,
-	// just on the basis of the DB2 docs, but I currently have no way to test it
-	// Note that the implementation inherited from DB2Dialect for LUW will not work!
-
 	@Override
 	public String rowId(String rowId) {
-		return rowId == null || rowId.isEmpty() ? "rowid_" : rowId;
+		return rowId;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Database.java b/hibernate-core/src/main/java/org/hibernate/dialect/Database.java
index 6c8cba228f19..6d89eac5f3c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Database.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Database.java
@@ -4,10 +4,7 @@
  */
 package org.hibernate.dialect;
 
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 
 import org.hibernate.engine.jdbc.dialect.spi.BasicSQLExceptionConverter;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
@@ -29,7 +26,7 @@ public enum Database {
 	DB2 {
 		@Override
 		public Dialect createDialect(DialectResolutionInfo info) {
-			String databaseVersion = info.getDatabaseVersion();
+			final String databaseVersion = info.getDatabaseVersion();
 			if ( databaseVersion != null ) {
 				//See https://www.ibm.com/support/knowledgecenter/SSEPEK_12.0.0/java/src/tpc/imjcc_c0053013.html
 				switch ( databaseVersion.substring( 0, 3 ) ) {
@@ -42,17 +39,17 @@ public Dialect createDialect(DialectResolutionInfo info) {
 						return new DB2zDialect( info );
 					}
 					case "QSQ": {
-						// i, this only works if "use drda metadata version" property is set to true in the drivers properties
+						// i
+						// this only works if the "use drda metadata version"
+						// property is set to true in the driver properties
 						return new DB2iDialect( info );
 					}
 				}
 			}
-			if ("DB2 UDB for AS/400".equals(info.getDatabaseName())) {
-				// i
-				return new DB2iDialect( info );
-			}
-
-			return new DB2Dialect( info );
+			// i
+			return "DB2 UDB for AS/400".equals( info.getDatabaseName() )
+					? new DB2iDialect( info ) // i
+					: new DB2Dialect( info );
 		}
 		@Override
 		public boolean productNameMatches(String databaseName) {
@@ -144,7 +141,7 @@ public boolean matchesResolutionInfo(DialectResolutionInfo info) {
 			}
 			else {
 				//in case the product name has been set to MySQL
-				String driverName = info.getDriverName();
+				final String driverName = info.getDriverName();
 				return driverName != null && driverName.startsWith( "MariaDB" );
 			}
 		}
@@ -196,10 +193,9 @@ public String getDriverClassName() {
 		@Override
 		public Dialect createDialect(DialectResolutionInfo info) {
 			final String version = getVersion( info );
-			if ( version.startsWith( "Cockroach" ) ) {
-				return new CockroachDialect( info, version );
-			}
-			return new PostgreSQLDialect( info );
+			return version.startsWith( "Cockroach" )
+					? new CockroachDialect( info, version )
+					: new PostgreSQLDialect( info );
 		}
 		@Override
 		public boolean productNameMatches(String databaseName) {
@@ -210,10 +206,10 @@ public String getDriverClassName(String jdbcUrl) {
 			return "org.postgresql.Driver";
 		}
 		private String getVersion(DialectResolutionInfo info) {
-			final DatabaseMetaData databaseMetaData = info.getDatabaseMetadata();
+			final var databaseMetaData = info.getDatabaseMetadata();
 			if ( databaseMetaData != null ) {
-				try ( Statement statement = databaseMetaData.getConnection().createStatement() ) {
-					final ResultSet rs = statement.executeQuery( "select version()" );
+				try ( var statement = databaseMetaData.getConnection().createStatement();
+						var rs = statement.executeQuery( "select version()" ) ) {
 					if ( rs.next() ) {
 						return rs.getString( 1 );
 					}
@@ -235,7 +231,7 @@ public Dialect createDialect(DialectResolutionInfo info) {
 		}
 		@Override
 		public boolean productNameMatches(String databaseName) {
-			return databaseName.startsWith( "Google Cloud Spanner" );
+			return databaseName.equals( "Google Cloud Spanner" );
 		}
 		@Override
 		public String getDriverClassName(String jdbcUrl) {
@@ -262,15 +258,12 @@ public String getDriverClassName(String jdbcUrl) {
 		@Override
 		public Dialect createDialect(DialectResolutionInfo info) {
 			final String databaseName = info.getDatabaseName();
-			if ( isASE( databaseName ) ) {
-				return new SybaseASEDialect( info );
-			}
-			return null;
+			return isASE( databaseName ) ? new SybaseASEDialect( info ) : null;
 		}
 		private boolean isASE(String databaseName) {
 			return "Sybase SQL Server".equals( databaseName )
 				|| "Adaptive Server Enterprise".equals( databaseName )
-					|| "ASE".equals( databaseName );
+				|| "ASE".equals( databaseName );
 		}
 		@Override
 		public boolean productNameMatches(String productName) {
@@ -279,7 +272,7 @@ public boolean productNameMatches(String productName) {
 		@Override
 		public boolean matchesUrl(String jdbcUrl) {
 			return jdbcUrl.startsWith( "jdbc:sybase:" )
-					|| jdbcUrl.startsWith( "jdbc:sqlanywhere:" );
+				|| jdbcUrl.startsWith( "jdbc:sqlanywhere:" );
 		}
 	};
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
index 7601ab4ce695..86bcf0eafc6b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -55,6 +55,8 @@
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.sequence.NoSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
+import org.hibernate.dialect.temporal.DefaultTemporalTableSupport;
+import org.hibernate.dialect.temporal.TemporalTableSupport;
 import org.hibernate.dialect.temptable.LegacyTemporaryTableStrategy;
 import org.hibernate.dialect.temptable.PersistentTemporaryTableStrategy;
 import org.hibernate.dialect.temptable.StandardTemporaryTableExporter;
@@ -63,7 +65,6 @@
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
 import org.hibernate.dialect.unique.AlterTableUniqueDelegate;
 import org.hibernate.dialect.unique.UniqueDelegate;
-import org.hibernate.engine.jdbc.LobCreator;
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.engine.jdbc.env.internal.DefaultSchemaNameResolver;
@@ -73,13 +74,13 @@
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
 import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.exception.spi.ConversionContext;
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.exception.spi.SQLExceptionConverter;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
+import org.hibernate.internal.util.QuotingHelper;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.loader.ast.spi.MultiKeyLoadSizingStrategy;
 import org.hibernate.mapping.CheckConstraint;
@@ -103,6 +104,7 @@
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.sqm.CastType;
 import org.hibernate.query.sqm.IntervalType;
+import org.hibernate.query.sqm.SetOperator;
 import org.hibernate.query.sqm.TrimSpec;
 import org.hibernate.query.sqm.mutation.internal.temptable.PersistentTableInsertStrategy;
 import org.hibernate.query.sqm.mutation.internal.temptable.PersistentTableMutationStrategy;
@@ -151,7 +153,6 @@
 import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.tool.schema.spi.SchemaManagementTool;
 import org.hibernate.tool.schema.spi.TableMigrator;
-import org.hibernate.type.BasicType;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.descriptor.WrapperOptions;
@@ -178,8 +179,6 @@
 import org.hibernate.type.spi.TypeConfiguration;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.Reader;
 import java.sql.Blob;
 import java.sql.CallableStatement;
@@ -194,11 +193,6 @@
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
 import java.time.Period;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAccessor;
@@ -215,7 +209,6 @@
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.UUID;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static java.lang.Math.ceil;
@@ -338,7 +331,7 @@ public abstract class Dialect implements ConversionContext, TypeContributor, Fun
 	private static final Pattern ESCAPE_CLOSING_COMMENT_PATTERN = Pattern.compile( "\\*/" );
 	private static final Pattern ESCAPE_OPENING_COMMENT_PATTERN = Pattern.compile( "/\\*" );
 	private static final Pattern QUERY_PATTERN = Pattern.compile(
-		"^\\s*(select\\b.+?\\bfrom\\b.+?)(\\b(?:natural )?(?:left |right |full )?(?:inner |outer |cross )?join.+?\\b)?(\\bwhere\\b.+?)$",
+		"^\\s*(select\\s.+?\\sfrom\\s.+?)(\\s(?:(?:natural)?\\s*(?:left|right|full)?\\s*(?:inner|outer|cross)?\\s*join|straight_join)\\s.+?)?(\\swhere\\s.+?)?(\\sorder\\s+by\\s.+?)?$",
 			Pattern.CASE_INSENSITIVE);
 
 	//needed for converting precision from decimal to binary digits
@@ -378,14 +371,16 @@ protected Dialect(DialectResolutionInfo info) {
 	}
 
 	protected void checkVersion() {
-		final DatabaseVersion version = getVersion();
-		final DatabaseVersion minimumVersion = getMinimumSupportedVersion();
-		if ( version != null && version.isBefore( minimumVersion.getMajor(), minimumVersion.getMinor(), minimumVersion.getMicro() ) ) {
-			CORE_LOGGER.unsupportedDatabaseVersion(
-					getClass().getName(),
-					version.getMajor() + "." + version.getMinor() + "." + version.getMicro(),
-					minimumVersion.getMajor() + "." + minimumVersion.getMinor() + "." + minimumVersion.getMicro()
-			);
+		final var version = getVersion();
+		if ( version != null ) {
+			final var minimumVersion = getMinimumSupportedVersion();
+			if ( version.isBefore( minimumVersion.getMajor(), minimumVersion.getMinor(), minimumVersion.getMicro() ) ) {
+				CORE_LOGGER.unsupportedDatabaseVersion(
+						getClass().getName(),
+						version.getMajor() + "." + version.getMinor() + "." + version.getMicro(),
+						minimumVersion.getMajor() + "." + minimumVersion.getMinor() + "." + minimumVersion.getMicro()
+				);
+			}
 		}
 	}
 
@@ -432,7 +427,7 @@ protected void initDefaultProperties() {
 	 * This method is always called when a {@code Dialect} is instantiated.
 	 */
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 
 		ddlTypeRegistry.addDescriptor( simpleSqlType( BOOLEAN ) );
 
@@ -821,7 +816,7 @@ public String[] getDropEnumTypeCommand(Class<? extends Enum<?>> enumType) {
 	 * @return a SQL expression that will occur in a {@code check} constraint
 	 */
 	public String getCheckCondition(String columnName, String[] values) {
-		final StringBuilder check = new StringBuilder();
+		final var check = new StringBuilder();
 		check.append( columnName ).append( " in (" );
 		String separator = "";
 		boolean nullIsValid = false;
@@ -878,7 +873,7 @@ public String getCheckCondition(String columnName, long[] values) {
 	 * @return a SQL expression that will occur in a {@code check} constraint
 	 */
 	public String getCheckCondition(String columnName, Long[] values) {
-		final StringBuilder check = new StringBuilder();
+		final var check = new StringBuilder();
 		check.append( columnName ).append( " in (" );
 		String separator = "";
 		boolean nullIsValid = false;
@@ -912,7 +907,7 @@ public String getCheckCondition(String columnName, Collection<?> valueSet, JdbcT
 		final boolean isCharacterJdbcType = isCharacterType( jdbcType.getJdbcTypeCode() );
 		assert isCharacterJdbcType || isIntegral( jdbcType.getJdbcTypeCode() );
 
-		final StringBuilder check = new StringBuilder();
+		final var check = new StringBuilder();
 		check.append( columnName ).append( " in (" );
 		String separator = "";
 		boolean nullIsValid = false;
@@ -923,7 +918,7 @@ public String getCheckCondition(String columnName, Collection<?> valueSet, JdbcT
 			}
 			check.append( separator );
 			if ( isCharacterJdbcType ) {
-				check.append('\'').append( value ).append('\'');
+				QuotingHelper.appendSingleQuoteEscapedString( check, String.valueOf( value ) );
 			}
 			else {
 				check.append( value );
@@ -1105,14 +1100,14 @@ public int ordinal() {
 	public void initializeFunctionRegistry(FunctionContributions functionContributions) {
 		final var typeConfiguration = functionContributions.getTypeConfiguration();
 		final var basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
-		final BasicType<Date> timestampType = basicTypeRegistry.resolve( StandardBasicTypes.TIMESTAMP );
-		final BasicType<Date> dateType = basicTypeRegistry.resolve( StandardBasicTypes.DATE );
-		final BasicType<Date> timeType = basicTypeRegistry.resolve( StandardBasicTypes.TIME );
-		final BasicType<Instant> instantType = basicTypeRegistry.resolve( StandardBasicTypes.INSTANT );
-		final BasicType<OffsetDateTime> offsetDateTimeType = basicTypeRegistry.resolve( StandardBasicTypes.OFFSET_DATE_TIME );
-		final BasicType<LocalDateTime> localDateTimeType = basicTypeRegistry.resolve( StandardBasicTypes.LOCAL_DATE_TIME );
-		final BasicType<LocalTime> localTimeType = basicTypeRegistry.resolve( StandardBasicTypes.LOCAL_TIME );
-		final BasicType<LocalDate> localDateType = basicTypeRegistry.resolve( StandardBasicTypes.LOCAL_DATE );
+		final var timestampType = basicTypeRegistry.resolve( StandardBasicTypes.TIMESTAMP );
+		final var dateType = basicTypeRegistry.resolve( StandardBasicTypes.DATE );
+		final var timeType = basicTypeRegistry.resolve( StandardBasicTypes.TIME );
+		final var instantType = basicTypeRegistry.resolve( StandardBasicTypes.INSTANT );
+		final var offsetDateTimeType = basicTypeRegistry.resolve( StandardBasicTypes.OFFSET_DATE_TIME );
+		final var localDateTimeType = basicTypeRegistry.resolve( StandardBasicTypes.LOCAL_DATE_TIME );
+		final var localTimeType = basicTypeRegistry.resolve( StandardBasicTypes.LOCAL_TIME );
+		final var localDateType = basicTypeRegistry.resolve( StandardBasicTypes.LOCAL_DATE );
 
 		final var functionRegistry = functionContributions.getFunctionRegistry();
 		final var functionFactory = new CommonFunctionFactory( functionContributions );
@@ -1126,7 +1121,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.aggregates( this, SqlAstNodeRenderingMode.DEFAULT );
 
 		//the ANSI SQL-defined aggregate functions any() and every() are only
-		//supported on one database, but can be emulated using sum() and case,
+		//supported on one database but can be emulated using sum() and case,
 		//though there is a more natural mapping on some databases
 
 		functionFactory.everyAny_sumCase( supportsPredicateAsExpression() );
@@ -1135,8 +1130,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 
 		//Note that while certain mathematical functions return the same type
 		//as their arguments, this is not the case in general - any function
-		//involving exponentiation by a non-integer power, logarithms,
-		//trigonometric functions, etc., should be considered to be of type
+		//involving exponentiation by a noninteger power, logarithms,
+		//trigonometric functions, and so on should be treated as returning
 		//Double. In particular, there is no meaningful concept of an "exact
 		//decimal" version of these functions, and if any database attempted
 		//to implement such a silly thing, it would be dog slow.
@@ -1194,8 +1189,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 
 		functionFactory.length_characterLength();
 
-		//only some databases support the ANSI SQL-style position() function, so
-		//define it here as an alias for locate()
+		//only some databases support the ANSI SQL-style position() function,
+		//so define it here as an alias for locate()
 
 		functionRegistry.register( "position",
 				new LocatePositionEmulation( typeConfiguration ) );
@@ -1206,15 +1201,15 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionRegistry.register( "overlay",
 				new InsertSubstringOverlayEmulation( typeConfiguration, false ) );
 
-		//ANSI SQL trim() function is supported on almost all of the databases
-		//we care about, but on some it must be emulated using ltrim(), rtrim(),
+		//ANSI SQL trim() function is supported on almost all databases we
+		//care about, but on some it must be emulated using ltrim(), rtrim(),
 		//and replace()
 
 		functionRegistry.register( "trim",
 				new TrimFunction( this, typeConfiguration ) );
 
 		//ANSI SQL cast() function is supported on the databases we care most
-		//about but in certain cases it doesn't allow some useful typecasts,
+		//about, but in certain cases it doesn't allow some useful typecasts,
 		//which must be emulated in a dialect-specific way
 
 		//Note that two case are especially tricky to make portable:
@@ -1289,8 +1284,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 
 		//timestampadd()/timestampdiff() delegated back to the Dialect itself
 		//since there is a great variety of different ways to emulate them
-		//by default, we don't allow plain parameters for the timestamp argument as most database don't support this
-		functionFactory.timestampaddAndDiff( this, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
+
+		functionFactory.timestampaddAndDiff( this );
 		functionRegistry.registerAlternateKey( "dateadd", "timestampadd" );
 		functionRegistry.registerAlternateKey( "datediff", "timestampdiff" );
 
@@ -1324,6 +1319,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionRegistry.registerAlternateKey( "current date", "current_date" );
 		functionRegistry.registerAlternateKey( "current time", "current_time" );
 		functionRegistry.registerAlternateKey( "current timestamp", "current_timestamp" );
+
 		//HQL current instant/date/time/datetime functions, delegated back to the Dialect
 
 		functionRegistry.register(
@@ -1575,133 +1571,133 @@ public String castPattern(CastType from, CastType to) {
 
 	protected String buildStringToBooleanCast(String trueValue, String falseValue) {
 		final boolean supportsValuesList = supportsValuesList();
-		final StringBuilder sb = new StringBuilder();
-		sb.append( "(select v.x from (" );
+		final var fragment = new StringBuilder();
+		fragment.append( "(select v.x from (" );
 		if ( supportsValuesList ) {
-			sb.append( "values (" );
-			sb.append( trueValue );
-			sb.append( "),(" );
-			sb.append( falseValue );
-			sb.append( ")) v(x)" );
+			fragment.append( "values (" );
+			fragment.append( trueValue );
+			fragment.append( "),(" );
+			fragment.append( falseValue );
+			fragment.append( ")) v(x)" );
 		}
 		else {
-			sb.append( "select " );
-			sb.append( trueValue );
-			sb.append( " x");
-			sb.append( getFromDualForSelectOnly() );
-			sb.append(" union all select " );
-			sb.append( falseValue );
-			sb.append( getFromDualForSelectOnly() );
-			sb.append( ") v" );
+			fragment.append( "select " );
+			fragment.append( trueValue );
+			fragment.append( " x");
+			fragment.append( getFromDualForSelectOnly() );
+			fragment.append(" union all select " );
+			fragment.append( falseValue );
+			fragment.append( getFromDualForSelectOnly() );
+			fragment.append( ") v" );
 		}
-		sb.append( " left join (" );
+		fragment.append( " left join (" );
 		if ( supportsValuesList ) {
-			sb.append( "values" );
+			fragment.append( "values" );
 			char separator = ' ';
 			for ( String trueStringValue : Dialect.TRUE_STRING_VALUES ) {
-				sb.append( separator );
-				sb.append( "('" );
-				sb.append( trueStringValue );
-				sb.append( "'," );
-				sb.append( trueValue );
-				sb.append( ')' );
+				fragment.append( separator );
+				fragment.append( "('" );
+				fragment.append( trueStringValue );
+				fragment.append( "'," );
+				fragment.append( trueValue );
+				fragment.append( ')' );
 				separator = ',';
 			}
-			for ( String falseStringValue : Dialect.FALSE_STRING_VALUES ) {
-				sb.append( ",('" );
-				sb.append( falseStringValue );
-				sb.append( "'," );
-				sb.append( falseValue );
-				sb.append( ')' );
+			for ( String falseStringValue : FALSE_STRING_VALUES ) {
+				fragment.append( ",('" );
+				fragment.append( falseStringValue );
+				fragment.append( "'," );
+				fragment.append( falseValue );
+				fragment.append( ')' );
 			}
-			sb.append( ") t(k,v)" );
+			fragment.append( ") t(k,v)" );
 		}
 		else {
-			sb.append( "select '" );
-			sb.append( Dialect.TRUE_STRING_VALUES[0] );
-			sb.append( "' k," );
-			sb.append( trueValue );
-			sb.append( " v" );
-			sb.append( getFromDualForSelectOnly() );
-			for ( int i = 1; i < Dialect.TRUE_STRING_VALUES.length; i++ ) {
-				sb.append( " union all select '" );
-				sb.append( Dialect.TRUE_STRING_VALUES[i] );
-				sb.append( "'," );
-				sb.append( trueValue );
-				sb.append( getFromDualForSelectOnly() );
+			fragment.append( "select '" );
+			fragment.append( TRUE_STRING_VALUES[0] );
+			fragment.append( "' k," );
+			fragment.append( trueValue );
+			fragment.append( " v" );
+			fragment.append( getFromDualForSelectOnly() );
+			for ( int i = 1; i < TRUE_STRING_VALUES.length; i++ ) {
+				fragment.append( " union all select '" );
+				fragment.append( TRUE_STRING_VALUES[i] );
+				fragment.append( "'," );
+				fragment.append( trueValue );
+				fragment.append( getFromDualForSelectOnly() );
 			}
-			for ( String falseStringValue : Dialect.FALSE_STRING_VALUES ) {
-				sb.append( " union all select '" );
-				sb.append( falseStringValue );
-				sb.append( "'," );
-				sb.append( falseValue );
-				sb.append( getFromDualForSelectOnly() );
+			for ( String falseStringValue : FALSE_STRING_VALUES ) {
+				fragment.append( " union all select '" );
+				fragment.append( falseStringValue );
+				fragment.append( "'," );
+				fragment.append( falseValue );
+				fragment.append( getFromDualForSelectOnly() );
 			}
-			sb.append( ") t" );
+			fragment.append( ") t" );
 		}
-		sb.append( " on " );
-		sb.append( getLowercaseFunction() );
-		sb.append( "(?1)=t.k where t.v is null or v.x=t.v)" );
-		return sb.toString();
+		fragment.append( " on " );
+		fragment.append( getLowercaseFunction() );
+		fragment.append( "(?1)=t.k where t.v is null or v.x=t.v)" );
+		return fragment.toString();
 	}
 
 	protected String buildStringToBooleanCastDecode(String trueValue, String falseValue) {
 		final boolean supportsValuesList = supportsValuesList();
-		final StringBuilder sb = new StringBuilder();
-		sb.append( "(select v.x from (" );
+		final var fragment = new StringBuilder();
+		fragment.append( "(select v.x from (" );
 		if ( supportsValuesList ) {
-			sb.append( "values (" );
-			sb.append( trueValue );
-			sb.append( "),(" );
-			sb.append( falseValue );
-			sb.append( ")) v(x)" );
+			fragment.append( "values (" );
+			fragment.append( trueValue );
+			fragment.append( "),(" );
+			fragment.append( falseValue );
+			fragment.append( ")) v(x)" );
 		}
 		else {
-			sb.append( "select " );
-			sb.append( trueValue );
-			sb.append( " x");
-			sb.append( getFromDualForSelectOnly() );
-			sb.append(" union all select " );
-			sb.append( falseValue );
-			sb.append( getFromDualForSelectOnly() );
-			sb.append( ") v" );
+			fragment.append( "select " );
+			fragment.append( trueValue );
+			fragment.append( " x");
+			fragment.append( getFromDualForSelectOnly() );
+			fragment.append(" union all select " );
+			fragment.append( falseValue );
+			fragment.append( getFromDualForSelectOnly() );
+			fragment.append( ") v" );
 		}
-		sb.append( ", (" );
+		fragment.append( ", (" );
 		if ( supportsValuesList ) {
-			sb.append( "values (" );
-			sb.append( buildStringToBooleanDecode( trueValue, falseValue ) );
-			sb.append( ")) t(v)" );
+			fragment.append( "values (" );
+			fragment.append( buildStringToBooleanDecode( trueValue, falseValue ) );
+			fragment.append( ")) t(v)" );
 		}
 		else {
-			sb.append( "select " );
-			sb.append( buildStringToBooleanDecode( trueValue, falseValue ) );
-			sb.append( " v");
-			sb.append( getFromDualForSelectOnly() );
-			sb.append(") t" );
+			fragment.append( "select " );
+			fragment.append( buildStringToBooleanDecode( trueValue, falseValue ) );
+			fragment.append( " v");
+			fragment.append( getFromDualForSelectOnly() );
+			fragment.append(") t" );
 		}
-		sb.append( " where t.v is null or v.x=t.v)" );
-		return sb.toString();
+		fragment.append( " where t.v is null or v.x=t.v)" );
+		return fragment.toString();
 	}
 
 	protected String buildStringToBooleanDecode(String trueValue, String falseValue) {
-		final StringBuilder sb = new StringBuilder();
-		sb.append( "decode(" );
-		sb.append( getLowercaseFunction() );
-		sb.append( "(?1)" );
+		final var fragment = new StringBuilder();
+		fragment.append( "decode(" );
+		fragment.append( getLowercaseFunction() );
+		fragment.append( "(?1)" );
 		for ( String trueStringValue : TRUE_STRING_VALUES ) {
-			sb.append( ",'" );
-			sb.append( trueStringValue );
-			sb.append( "'," );
-			sb.append( trueValue );
+			fragment.append( ",'" );
+			fragment.append( trueStringValue );
+			fragment.append( "'," );
+			fragment.append( trueValue );
 		}
 		for ( String falseStringValue : FALSE_STRING_VALUES ) {
-			sb.append( ",'" );
-			sb.append( falseStringValue );
-			sb.append( "'," );
-			sb.append( falseValue );
+			fragment.append( ",'" );
+			fragment.append( falseStringValue );
+			fragment.append( "'," );
+			fragment.append( falseValue );
 		}
-		sb.append( ",null)" );
-		return sb.toString();
+		fragment.append( ",null)" );
+		return fragment.toString();
 	}
 
 	/**
@@ -1761,7 +1757,7 @@ public boolean supportsFractionalTimestampArithmetic() {
 	 */
 	@SuppressWarnings("deprecation")
 	public String timestampdiffPattern(TemporalUnit unit, TemporalType fromTemporalType, TemporalType toTemporalType) {
-		throw new UnsupportedOperationException( "`" + getClass().getName() + "` does not yet support #timestampdiffPattern" );
+		throw new UnsupportedOperationException( "'" + getClass().getName() + "' does not support 'timestampdiff()'" );
 	}
 
 	/**
@@ -1776,7 +1772,7 @@ public String timestampdiffPattern(TemporalUnit unit, TemporalType fromTemporalT
 	 */
 	@SuppressWarnings("deprecation")
 	public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType, IntervalType intervalType) {
-		throw new UnsupportedOperationException( "`" + getClass().getName() + "` does not yet support #timestampaddPattern" );
+		throw new UnsupportedOperationException( "'" + getClass().getName() + "' does not yet support 'timestampadd()'" );
 	}
 
 	/**
@@ -1906,8 +1902,8 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		// by default, not much to do...
 		registerColumnTypes( typeContributions, serviceRegistry );
-		final NationalizationSupport nationalizationSupport = getNationalizationSupport();
-		final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
+		final var nationalizationSupport = getNationalizationSupport();
+		final var jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
 		if ( nationalizationSupport == NationalizationSupport.EXPLICIT ) {
 			jdbcTypeRegistry.addDescriptor( NCharJdbcType.INSTANCE );
 			jdbcTypeRegistry.addDescriptor( NVarcharJdbcType.INSTANCE );
@@ -1966,9 +1962,9 @@ public Blob mergeBlob(Blob original, Blob target, SharedSessionContractImplement
 			if ( original != target ) {
 				try {
 					// the BLOB just read during the load phase of merge
-					final OutputStream connectedStream = target.setBinaryStream( 1L );
+					final var connectedStream = target.setBinaryStream( 1L );
 					// the BLOB from the detached state
-					final InputStream detachedStream = original.getBinaryStream();
+					final var detachedStream = original.getBinaryStream();
 					detachedStream.transferTo( connectedStream );
 					return target;
 				}
@@ -1990,9 +1986,9 @@ public Clob mergeClob(Clob original, Clob target, SharedSessionContractImplement
 			if ( original != target ) {
 				try {
 					// the CLOB just read during the load phase of merge
-					final OutputStream connectedStream = target.setAsciiStream( 1L );
+					final var connectedStream = target.setAsciiStream( 1L );
 					// the CLOB from the detached state
-					final InputStream detachedStream = original.getAsciiStream();
+					final var detachedStream = original.getAsciiStream();
 					detachedStream.transferTo( connectedStream );
 					return target;
 				}
@@ -2014,9 +2010,9 @@ public NClob mergeNClob(NClob original, NClob target, SharedSessionContractImple
 			if ( original != target ) {
 				try {
 					// the NCLOB just read during the load phase of merge
-					final OutputStream connectedStream = target.setAsciiStream( 1L );
+					final var connectedStream = target.setAsciiStream( 1L );
 					// the NCLOB from the detached state
-					final InputStream detachedStream = original.getAsciiStream();
+					final var detachedStream = original.getAsciiStream();
 					detachedStream.transferTo( connectedStream );
 					return target;
 				}
@@ -2043,9 +2039,9 @@ public Blob mergeBlob(Blob original, Blob target, SharedSessionContractImplement
 			if ( original == null && target == null ) {
 				return null;
 			}
-			final JdbcServices jdbcServices = session.getFactory().getJdbcServices();
+			final var jdbcServices = session.getFactory().getJdbcServices();
 			try {
-				final LobCreator lobCreator = jdbcServices.getLobCreator( session );
+				final var lobCreator = jdbcServices.getLobCreator( session );
 				return original == null
 						? lobCreator.createBlob( ArrayHelper.EMPTY_BYTE_ARRAY )
 						: lobCreator.createBlob( original.getBinaryStream(), original.length() );
@@ -2061,9 +2057,9 @@ public Clob mergeClob(Clob original, Clob target, SharedSessionContractImplement
 			if ( original == null && target == null ) {
 				return null;
 			}
-			final JdbcServices jdbcServices = session.getFactory().getJdbcServices();
+			final var jdbcServices = session.getFactory().getJdbcServices();
 			try {
-				final LobCreator lobCreator = jdbcServices.getLobCreator( session );
+				final var lobCreator = jdbcServices.getLobCreator( session );
 				return original == null
 						? lobCreator.createClob( "" )
 						: lobCreator.createClob( original.getCharacterStream(), original.length() );
@@ -2079,9 +2075,9 @@ public NClob mergeNClob(NClob original, NClob target, SharedSessionContractImple
 			if ( original == null && target == null ) {
 				return null;
 			}
-			final JdbcServices jdbcServices = session.getFactory().getJdbcServices();
+			final var jdbcServices = session.getFactory().getJdbcServices();
 			try {
-				final LobCreator lobCreator = jdbcServices.getLobCreator( session );
+				final var lobCreator = jdbcServices.getLobCreator( session );
 				return original == null
 						? lobCreator.createNClob( "" )
 						: lobCreator.createNClob( original.getCharacterStream(), original.length() );
@@ -2253,7 +2249,7 @@ public LockingSupport getLockingSupport() {
 	 */
 	@Deprecated
 	public boolean supportsForUpdate() {
-		return getLockingSupport().getMetadata().supportsForUpdate();
+		return getLockingMetadata().supportsForUpdate();
 	}
 
 	/**
@@ -2265,7 +2261,7 @@ public boolean supportsForUpdate() {
 	 */
 	@Deprecated
 	public boolean supportsSkipLocked() {
-		return getLockingSupport().getMetadata().supportsSkipLocked();
+		return getLockingMetadata().supportsSkipLocked();
 	}
 
 	/**
@@ -2277,7 +2273,7 @@ public boolean supportsSkipLocked() {
 	 */
 	@Deprecated
 	public boolean supportsNoWait() {
-		return getLockingSupport().getMetadata().supportsNoWait();
+		return getLockingMetadata().supportsNoWait();
 	}
 
 	/**
@@ -2289,7 +2285,7 @@ public boolean supportsNoWait() {
 	 */
 	@Deprecated
 	public boolean supportsWait() {
-		return getLockingSupport().getMetadata().supportsWait();
+		return getLockingMetadata().supportsWait();
 	}
 
 	/**
@@ -2315,13 +2311,17 @@ public boolean useFollowOnLocking(String sql, QueryOptions queryOptions) {
 		return false;
 	}
 
+	private LockingSupport.Metadata getLockingMetadata() {
+		return getLockingSupport().getMetadata();
+	}
+
 	/**
 	 * @deprecated Use {@linkplain LockingSupport.Metadata#getPessimisticLockStyle()} instead.
 	 * Here, fwiw, we use {@linkplain Timeouts#ONE_SECOND 1-second} to make the determination.
 	 */
 	@Deprecated
 	public PessimisticLockStyle getPessimisticLockStyle() {
-		return getLockingSupport().getMetadata().getPessimisticLockStyle();
+		return getLockingMetadata().getPessimisticLockStyle();
 	}
 
 	/**
@@ -2333,7 +2333,7 @@ public PessimisticLockStyle getPessimisticLockStyle() {
 	 */
 	@Deprecated
 	public RowLockStrategy getWriteRowLockStrategy() {
-		return getLockingSupport().getMetadata().getWriteRowLockStrategy();
+		return getLockingMetadata().getWriteRowLockStrategy();
 	}
 
 	/**
@@ -2345,7 +2345,7 @@ public RowLockStrategy getWriteRowLockStrategy() {
 	 */
 	@Deprecated
 	public RowLockStrategy getReadRowLockStrategy() {
-		return getLockingSupport().getMetadata().getReadRowLockStrategy();
+		return getLockingMetadata().getReadRowLockStrategy();
 	}
 
 	/**
@@ -2357,18 +2357,16 @@ public LockingClauseStrategy getLockingClauseStrategy(QuerySpec querySpec, LockO
 			return NON_CLAUSE_STRATEGY;
 		}
 
-		final LockMode lockMode = lockOptions.getLockMode();
-		final PessimisticLockKind lockKind = PessimisticLockKind.interpret( lockMode );
+		final var lockKind = PessimisticLockKind.interpret( lockOptions.getLockMode() );
 		if ( lockKind == PessimisticLockKind.NONE ) {
 			return NonLockingClauseStrategy.NON_CLAUSE_STRATEGY;
 		}
 
-		final RowLockStrategy rowLockStrategy;
-		switch ( lockKind ) {
-			case SHARE -> rowLockStrategy = getReadRowLockStrategy();
-			case UPDATE -> rowLockStrategy = getWriteRowLockStrategy();
-			default -> throw new IllegalStateException( "Should never happen due to checks above" );
-		}
+		final var rowLockStrategy = switch ( lockKind ) {
+			case SHARE -> getReadRowLockStrategy();
+			case UPDATE -> getWriteRowLockStrategy();
+			case NONE -> throw new IllegalStateException( "Should never happen due to checks above" );
+		};
 
 		return buildLockingClauseStrategy( lockKind, rowLockStrategy, lockOptions, querySpec.getRootPathsForLocking() );
 	}
@@ -2466,7 +2464,7 @@ public String getForUpdateString(LockOptions lockOptions) {
 	 * @return The appropriate {@code for update} fragment.
 	 */
 	public String getForUpdateString(LockMode lockMode, Timeout timeout) {
-		return switch (lockMode) {
+		return switch ( lockMode ) {
 			case PESSIMISTIC_READ -> getReadLockString( timeout );
 			case PESSIMISTIC_WRITE -> getWriteLockString( timeout );
 			case UPGRADE_NOWAIT, PESSIMISTIC_FORCE_INCREMENT -> getForUpdateNowaitString();
@@ -2488,7 +2486,7 @@ public String getForUpdateString(LockMode lockMode, Timeout timeout) {
 	 */
 	@Deprecated(since = "7.0")
 	public String getForUpdateString(LockMode lockMode, int timeout) {
-		return switch (lockMode) {
+		return switch ( lockMode ) {
 			case PESSIMISTIC_READ -> getReadLockString( timeout );
 			case PESSIMISTIC_WRITE -> getWriteLockString( timeout );
 			case UPGRADE_NOWAIT, PESSIMISTIC_FORCE_INCREMENT -> getForUpdateNowaitString();
@@ -2528,10 +2526,11 @@ public String getForUpdateString() {
 	 * @return The appropriate lock clause.
 	 */
 	public String getWriteLockString(Timeout timeout) {
-		if ( timeout.milliseconds() == Timeouts.SKIP_LOCKED_MILLI && supportsSkipLocked() ) {
+		final int milliseconds = timeout.milliseconds();
+		if ( milliseconds == Timeouts.SKIP_LOCKED_MILLI && supportsSkipLocked() ) {
 			return getForUpdateSkipLockedString();
 		}
-		else if ( timeout.milliseconds() == Timeouts.NO_WAIT_MILLI && supportsNoWait() ) {
+		else if ( milliseconds == Timeouts.NO_WAIT_MILLI && supportsNoWait() ) {
 			return getForUpdateNowaitString();
 		}
 		else if ( Timeouts.isRealTimeout( timeout ) && supportsWait() ) {
@@ -2690,14 +2689,14 @@ public String getReadLockString(String aliases, int timeout) {
 
 	/**
 	 * Get the {@code FOR UPDATE OF column_list} fragment appropriate
-	 * for this dialect, given the aliases of the columns to be write
-	 * locked.
+	 * for this dialect, given the aliases of the columns that are to
+	 * be write-locked.
 	 *
-	 * @param aliases The columns to be write locked.
+	 * @param aliases The columns to be write-locked.
 	 * @return The appropriate {@code FOR UPDATE OF column_list} clause string.
 	 */
 	public String getForUpdateString(String aliases) {
-		// by default we simply return the getForUpdateString() result since
+		// by default, we simply return the getForUpdateString() result since
 		// the default is to say no support for "FOR UPDATE OF ..."
 		return getForUpdateString();
 	}
@@ -2712,7 +2711,7 @@ public String getForUpdateString(String aliases) {
 	 * @return The appropriate {@code FOR UPDATE OF column_list} clause string.
 	 */
 	public String getForUpdateString(String aliases, LockOptions lockOptions) {
-		LockMode lockMode = lockOptions.getLockMode();
+		final var lockMode = lockOptions.getLockMode();
 		lockOptions.setLockMode( lockMode );
 		return getForUpdateString( lockOptions );
 	}
@@ -2759,9 +2758,9 @@ public String getForUpdateNowaitString(String aliases) {
 
 	/**
 	 * Get the {@code FOR UPDATE OF column_list SKIP LOCKED} fragment appropriate
-	 * for this dialect, given the aliases of the columns to be write locked.
+	 * for this dialect, given the aliases of the columns to be write-locked.
 	 *
-	 * @param aliases The columns to be write locked.
+	 * @param aliases The columns to be write-locked.
 	 * @return The appropriate {@code FOR UPDATE colunm_list SKIP LOCKED} clause string.
 	 */
 	public String getForUpdateSkipLockedString(String aliases) {
@@ -2808,7 +2807,7 @@ public String applyLocksToSql(String sql, LockOptions aliasedLockOptions, Map<St
 	 */
 	@Deprecated
 	public boolean supportsOuterJoinForUpdate() {
-		return switch ( getLockingSupport().getMetadata().getOuterJoinLockingType() ) {
+		return switch ( getLockingMetadata().getOuterJoinLockingType() ) {
 			case FULL, IDENTIFIED -> true;
 			default -> false;
 		};
@@ -2827,7 +2826,7 @@ public boolean supportsOuterJoinForUpdate() {
 	 */
 	@Deprecated
 	public boolean supportsLockTimeouts() {
-		return getLockingSupport().getMetadata().getLockTimeoutType( Timeouts.ONE_SECOND ) == LockTimeoutType.QUERY;
+		return getLockingMetadata().getLockTimeoutType( Timeouts.ONE_SECOND ) == LockTimeoutType.QUERY;
 	}
 
 	/**
@@ -2914,15 +2913,15 @@ public String getBeforeDropStatement() {
 	 */
 	@Deprecated(since = "6.6")
 	public String getDropTableString(String tableName) {
-		final StringBuilder buf = new StringBuilder( "drop table " );
+		final var dropTable = new StringBuilder( "drop table " );
 		if ( supportsIfExistsBeforeTableName() ) {
-			buf.append( "if exists " );
+			dropTable.append( "if exists " );
 		}
-		buf.append( tableName ).append( getCascadeConstraintsString() );
+		dropTable.append( tableName ).append( getCascadeConstraintsString() );
 		if ( supportsIfExistsAfterTableName() ) {
-			buf.append( " if exists" );
+			dropTable.append( " if exists" );
 		}
-		return buf.toString();
+		return dropTable.toString();
 	}
 
 	/**
@@ -2987,15 +2986,15 @@ public boolean hasAlterTable() {
 	 * @param tableName The name of the table to alter
 	 * @return The command used to alter a table.
 	 *
-	 * @since 5.2.11
+	 * @since 5.2
 	 */
 	public String getAlterTableString(String tableName) {
-		final StringBuilder sb = new StringBuilder( "alter table " );
+		final var alterTable = new StringBuilder( "alter table " );
 		if ( supportsIfExistsAfterAlterTable() ) {
-			sb.append( "if exists " );
+			alterTable.append( "if exists " );
 		}
-		sb.append( tableName );
-		return sb.toString();
+		alterTable.append( tableName );
+		return alterTable.toString();
 	}
 
 	/**
@@ -3087,6 +3086,14 @@ public boolean supportsIfExistsAfterConstraintName() {
 		return false;
 	}
 
+	/**
+	 * For dropping an index with {@code drop index}, can the phrase
+	 * {@code if exists} be applied before the index name?
+	 */
+	public boolean supportsIfExistsBeforeIndexName() {
+		return false;
+	}
+
 	/**
 	 * Does this dialect support modifying the type of an existing column?
 	 */
@@ -3130,22 +3137,19 @@ public String getAddForeignKeyConstraintString(
 			String referencedTable,
 			String[] primaryKey,
 			boolean referencesPrimaryKey) {
-		final StringBuilder res = new StringBuilder( 30 );
-
-		res.append( " add constraint " )
+		final var addConstraint = new StringBuilder( 30 );
+		addConstraint.append( " add constraint " )
 				.append( quote( constraintName ) )
 				.append( " foreign key (" )
 				.append( join( ", ", foreignKey ) )
 				.append( ") references " )
 				.append( referencedTable );
-
 		if ( !referencesPrimaryKey ) {
-			res.append( " (" )
+			addConstraint.append( " (" )
 					.append( join( ", ", primaryKey ) )
 					.append( ')' );
 		}
-
-		return res.toString();
+		return addConstraint.toString();
 	}
 
 	/**
@@ -3423,6 +3427,16 @@ public boolean supportsStandardCurrentTimestampFunction() {
 		return true;
 	}
 
+	/**
+	 * Is the result of {@code current_timestamp} stable i.e. does it always produce the same value
+	 * within a transaction?
+	 *
+	 * @return {@code true} if it is stable; false otherwise.
+	 */
+	public boolean isCurrentTimestampStable() {
+		return false;
+	}
+
 
 	// SQLException support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -3525,6 +3539,19 @@ public boolean supportsUnionInSubquery() {
 		return supportsUnionAll();
 	}
 
+	/**
+	 * Get the SQL string representation for a specific set operator (UNION, INTERSECT, EXCEPT).
+	 * <p>
+	 * The default implementation delegates to {@link SetOperator#sqlString()}.
+	 * Dialects like Cloud Spanner that require explicit 'DISTINCT' keywords can override this.
+	 *
+	 * @param operator The set operator
+	 * @return The SQL fragment (e.g., "union", "union all", "union distinct")
+	 */
+	public String getSetOperatorSqlString(SetOperator operator) {
+		return operator.sqlString();
+	}
+
 	// miscellaneous support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 	/**
@@ -3651,9 +3678,9 @@ public int getMaxIdentifierLength() {
 	 * @return The appropriate SQL literal.
 	 */
 	public String toBooleanValueString(boolean bool) {
-		final StringBuilder sb = new StringBuilder();
-		appendBooleanValueString( new StringBuilderSqlAppender( sb ), bool );
-		return sb.toString();
+		final var stringValue = new StringBuilder();
+		appendBooleanValueString( new StringBuilderSqlAppender( stringValue ), bool );
+		return stringValue.toString();
 	}
 
 	/**
@@ -3761,18 +3788,14 @@ public char closeQuote() {
 	 * @see #closeQuote()
 	 */
 	public String toQuotedIdentifier(String name) {
-		if ( name == null ) {
-			return null;
-		}
-
-		return openQuote() + name + closeQuote();
+		return name == null ? null : openQuote() + name + closeQuote();
 	}
 
 	/**
 	 * Apply dialect-specific quoting if the given name is quoted using backticks.
 	 * <p>
 	 * By default, the incoming name is checked to see if its first character is
-	 * a backtick ({@code `}). If it is, the dialect specific quoting is applied.
+	 * a backtick ({@code `}). If it is, the dialect-specific quoting is applied.
 	 *
 	 * @param name The value to be quoted.
 	 * @return The quoted (or unmodified, if not starting with backtick) value.
@@ -3783,12 +3806,10 @@ public String quote(String name) {
 		if ( name == null ) {
 			return null;
 		}
-
-		if ( name.charAt( 0 ) == '`' ) {
-			return openQuote() + name.substring( 1, name.length() - 1 ) + closeQuote();
-		}
 		else {
-			return name;
+			return name.charAt( 0 ) == '`'
+					? openQuote() + name.substring( 1, name.length() - 1 ) + closeQuote()
+					: name;
 		}
 	}
 
@@ -3919,7 +3940,8 @@ public TemporaryTableStrategy getPersistentTemporaryTableStrategy() {
 	 * @since 7.1
 	 */
 	public @Nullable TemporaryTableStrategy getLocalTemporaryTableStrategy() {
-		return getSupportedTemporaryTableKind() == TemporaryTableKind.LOCAL ? new LegacyTemporaryTableStrategy( this )
+		return getSupportedTemporaryTableKind() == TemporaryTableKind.LOCAL
+				? new LegacyTemporaryTableStrategy( this )
 				: null;
 	}
 
@@ -3929,7 +3951,8 @@ public TemporaryTableStrategy getPersistentTemporaryTableStrategy() {
 	 * @since 7.1
 	 */
 	public @Nullable TemporaryTableStrategy getGlobalTemporaryTableStrategy() {
-		return getSupportedTemporaryTableKind() == TemporaryTableKind.GLOBAL ? new LegacyTemporaryTableStrategy( this )
+		return getSupportedTemporaryTableKind() == TemporaryTableKind.GLOBAL
+				? new LegacyTemporaryTableStrategy( this )
 				: null;
 	}
 
@@ -4130,6 +4153,32 @@ public String getNullColumnString() {
 		return "";
 	}
 
+	/**
+	 * Allows the dialect to format the default value for a column.
+	 * The default implementation returns the given default value as-is.
+	 *
+	 * @param defaultValue the default value expression
+	 * @return the formatted default value expression
+	 *
+	 * @since 7.4
+	 */
+	public String getColumnDefaultString(String defaultValue) {
+		return defaultValue;
+	}
+
+	/**
+	 * Does this dialect require the {@code not null} constraint to precede the
+	 * {@code default} or {@code generated as} clause?
+	 * Spanner strictly requires {@code not null} to come before {@code default}.
+	 *
+	 * @return {@code true} if {@code not null} should precede {@code default}
+	 *
+	 * @since 7.4
+	 */
+	public boolean requiresNotNullBeforeDefault() {
+		return false;
+	}
+
 	/**
 	 * The keyword used to specify a nullable column of the given SQL type.
 	 *
@@ -4166,17 +4215,6 @@ public String getTableComment(String comment) {
 		return "";
 	}
 
-	/**
-	 * Get the comment into a form supported for UDT definition.
-	 *
-	 * @param comment The comment to apply
-	 *
-	 * @return The comment fragment
-	 */
-	public String getUserDefinedTypeComment(String comment) {
-		return "";
-	}
-
 	/**
 	 * Get the comment into a form supported for column definition.
 	 *
@@ -4385,8 +4423,8 @@ public boolean supportsSubselectAsInPredicateLHS() {
 	 * @implNote Part of the trickiness here is the fact that this is largely
 	 *           driver-dependent. For example, Oracle (which is notoriously
 	 *           bad with LOB support in their drivers historically) actually
-	 *           does a pretty good job with LOB support as of the 10.2.x v
-	 *           ersions of their driver.
+	 *           does a pretty good job with LOB support as of the 10.2.x
+	 *           versions of their driver.
 	 *
 	 * @return True if normal LOB usage patterns can be used with this driver;
 	 *         false if driver-specific hookiness needs to be applied.
@@ -4537,7 +4575,7 @@ public boolean requiresParensForTupleCounts() {
 	 *         false otherwise.
 	 */
 	public boolean supportsTupleDistinctCounts() {
-		// oddly most database in fact seem to, so true is the default.
+		// oddly, most databases in fact seem to, so true is the default.
 		return true;
 	}
 
@@ -4721,7 +4759,7 @@ public boolean supportsInsertReturning() {
 	}
 
 	/**
-	 * Does this dialect supports returning the {@link org.hibernate.annotations.RowId} column
+	 * Does this dialect support returning the {@link org.hibernate.annotations.RowId} column
 	 * after execution of an {@code insert} statement, using native SQL syntax?
 	 *
 	 * @return {@code true} is the dialect supports returning the rowid column
@@ -4950,7 +4988,7 @@ public AggregateSupport getAggregateSupport() {
 	}
 
 	/**
-	 * Does the database support user defined types?
+	 * Does the database support user-defined types?
 	 *
 	 * @see org.hibernate.annotations.Struct
 	 *
@@ -4974,7 +5012,7 @@ public boolean supportsStandardArrays() {
 	}
 
 	/**
-	 * Does this database prefer to use array types for multi-valued parameters.
+	 * Does this database prefer to use array types for multivalued parameters?
 	 *
 	 * @return boolean
 	 *
@@ -5218,11 +5256,15 @@ public String addSqlHintOrComment(String sql, QueryOptions queryOptions, boolean
 		// Keep this here, rather than moving to Select.
 		// Some Dialects may need the hint to be appended to the very end or beginning
 		// of the finalized SQL statement, so wait until everything is processed.
-		if ( queryOptions.getDatabaseHints() != null && !queryOptions.getDatabaseHints().isEmpty() ) {
-			sql = getQueryHintString( sql, queryOptions.getDatabaseHints() );
+		final var databaseHints = queryOptions.getDatabaseHints();
+		if ( databaseHints != null && !databaseHints.isEmpty() ) {
+			sql = getQueryHintString( sql, databaseHints );
 		}
-		if ( commentsEnabled && queryOptions.getComment() != null ) {
-			sql = prependComment( sql, queryOptions.getComment() );
+		if ( commentsEnabled ) {
+			final String comment = queryOptions.getComment();
+			if ( comment != null ) {
+				sql = prependComment( sql, comment );
+			}
 		}
 		return sql;
 	}
@@ -5240,16 +5282,11 @@ public String addSqlHintOrComment(String sql, QueryOptions queryOptions, boolean
 	 * @since 7.0
 	 */
 	public static String addUseIndexQueryHint(String query, String hints) {
-		final Matcher matcher = QUERY_PATTERN.matcher( query );
+		final var matcher = QUERY_PATTERN.matcher( query );
 		if ( matcher.matches() && matcher.groupCount() > 1 ) {
-			final String startToken = matcher.group(1);
-			// Null if there is no join in the query
-			final String joinToken = matcher.group(2);
-			final String endToken = matcher.group(3);
-			return startToken
-					+ " use index (" + hints + ") "
-					+ ( joinToken == null ? "" : joinToken )
-					+ endToken;
+			final String startToken = matcher.group( 1 );
+			return startToken + " use index (" + hints + ")"
+					+ query.substring( startToken.length() );
 		}
 		else {
 			return query;
@@ -5458,7 +5495,7 @@ public int getDefaultTimestampPrecision() {
 		//milliseconds or microseconds is the maximum
 		//for most dialects that support explicit
 		//precision, with the exception of Oracle,
-		//which accepts up to 9 digits, and DB2 which
+		//which accepts up to 9 digits, and DB2, which
 		//accepts up to 12 digits!
 		return 6; //microseconds!
 	}
@@ -5481,9 +5518,11 @@ public int getDefaultIntervalSecondScale(){
 	}
 
 	/**
-	 * Does this dialect round a temporal when converting from a precision higher to a lower one?
+	 * Does this dialect round a temporal when converting from
+	 * higher precision to lower?
 	 *
-	 * @return true if rounding is applied, false if truncation is applied
+	 * @return {@code true} if rounding is used;
+	 *         {@code false} if truncation is used
 	 */
 	public boolean doesRoundTemporalOnOverflow() {
 		return true;
@@ -5528,8 +5567,8 @@ public int getDoublePrecision() {
 	/**
 	 * The "native" precision for arithmetic with datetimes
 	 * and day-to-second durations. Datetime differences
-	 * will be calculated with this precision except when a
-	 * precision is explicitly specified as a
+	 * will be calculated with this precision except when
+	 * the precision is explicitly specified as a
 	 * {@link TemporalUnit}.
 	 * <p>
 	 * Usually 1 (nanoseconds), 1_000 (microseconds), or
@@ -5581,7 +5620,10 @@ protected boolean supportsPredicateAsExpression() {
 
 	/**
 	 * Obtain a {@link RowLockStrategy} for the given {@link LockMode}.
+	 *
+	 * @deprecated No longer used
 	 */
+	@Deprecated(since = "7.3", forRemoval = true)
 	public RowLockStrategy getLockRowIdentifier(LockMode lockMode) {
 		return switch (lockMode) {
 			case PESSIMISTIC_READ ->
@@ -5692,17 +5734,17 @@ public boolean canBatchTruncate() {
 	 */
 	public String[] getTruncateTableStatements(String[] tableNames) {
 		if ( canBatchTruncate() ) {
-			final StringBuilder builder = new StringBuilder();
+			final var truncatedTables = new StringBuilder();
 			for ( String tableName : tableNames ) {
-				if ( !builder.isEmpty() ) {
-					builder.append(", ");
+				if ( !truncatedTables.isEmpty() ) {
+					truncatedTables.append(", ");
 				}
-				builder.append( tableName );
+				truncatedTables.append( tableName );
 			}
-			return new String[] { getTruncateTableStatement( builder.toString() ) };
+			return new String[] { getTruncateTableStatement( truncatedTables.toString() ) };
 		}
 		else {
-			final String[] statements = new String[tableNames.length];
+			final var statements = new String[tableNames.length];
 			for ( int i = 0; i < tableNames.length; i++ ) {
 				statements[i] = getTruncateTableStatement( tableNames[i] );
 			}
@@ -5721,7 +5763,7 @@ public String getTruncateTableStatement(String tableName) {
 
 	/**
 	 * Support for native parameter markers.
-	 * <p/>
+	 * <p>
 	 * This is generally dependent on both the database and the driver.
 	 *
 	 * @return May return {@code null} to indicate that the JDBC
@@ -5764,6 +5806,37 @@ public Boolean supportsRefCursors() {
 		return null;
 	}
 
+	/**
+	 * Does the given exception cause the whole transaction to be
+	 * marked for rollback on this database?
+	 */
+	public boolean causesRollback(SQLException sqlException) {
+		return false;
+	}
+
+	/**
+	 * Does this dialect allow an explicit {@code not null}
+	 * constraint on a {@link #generatedAs generated as}
+	 * column?
+	 */
+	public boolean supportsNotNullAfterGeneratedAs() {
+		return true;
+	}
+
+	/**
+	 * Get the {@link TemporalTableSupport} for this dialect.
+	 */
+	@Incubating
+	public TemporalTableSupport getTemporalTableSupport() {
+		return new DefaultTemporalTableSupport( this );
+	}
+
+	//TODO: DELETEME
+	@Incubating @Deprecated(forRemoval = true)
+	public boolean throttleDdl() {
+		return false;
+	}
+
 	/**
 	 * Pluggable strategy for determining the {@link Size} to use for
 	 * columns of a given SQL type.
@@ -5804,14 +5877,13 @@ public Size resolveSize(
 				Integer precision,
 				Integer scale,
 				Long length) {
-			final Size size = new Size();
-			final int ddlTypeCode = jdbcType.getDdlTypeCode();
-			// Set the explicit length to null if we encounter the JPA default 255
+			final var size = new Size();
+			// Set the explicit length to null if we encounter the JPA default of 255
 			if ( length != null && length == Size.DEFAULT_LENGTH ) {
 				length = null;
 			}
 
-			switch ( ddlTypeCode ) {
+			switch ( jdbcType.getDdlTypeCode() ) {
 				case SqlTypes.ARRAY:
 					break;
 				case SqlTypes.BIT:
@@ -5839,7 +5911,7 @@ public Size resolveSize(
 					if ( scale != null && scale != 0 ) {
 						throw new IllegalArgumentException("scale has no meaning for SQL floating point types");
 					}
-					// but if the user explicitly specifies a precision, we need to convert it:
+					// but if the user explicitly specifies the precision, we need to convert it:
 					if ( precision != null ) {
 						// convert from base 10 (as specified in @Column) to base 2 (as specified by SQL)
 						// using the magic of high school math: log_2(10^n) = n*log_2(10) = n*ln(10)/ln(2)
@@ -5888,7 +5960,7 @@ public Size resolveSize(
 	 * database (often the {@code to_char()} function).
 	 * <p>
 	 * Since it's never possible to translate every
-	 * pattern letter sequences understood by
+	 * pattern letter sequence understood by
 	 * {@code DateTimeFormatter}, only the following
 	 * subset of pattern letters is accepted by
 	 * Hibernate:
@@ -5904,8 +5976,8 @@ public Size resolveSize(
 	 *     <li>d: day of month</li>
 	 *     <li>D: day of year</li>
 	 *     <li>a: AM/PM</li>
-	 *     <li>H: hour of day (24 hour time)</li>
-	 *     <li>h: hour of AM/PM (12 hour time)</li>
+	 *     <li>H: hour of day (24-hour time)</li>
+	 *     <li>h: hour of AM/PM (12-hour time)</li>
 	 *     <li>m: minutes</li>
 	 *     <li>s: seconds</li>
 	 *     <li>z,Z,x: timezone offset</li>
@@ -6198,14 +6270,15 @@ public void appendUUIDLiteral(SqlAppender appender, UUID literal) {
 	}
 
 	/**
-	 * Does this dialect supports timezone offsets in temporal literals.
+	 * Does this dialect support timezone offsets in temporal literals?
 	 */
 	public boolean supportsTemporalLiteralOffset() {
 		return false;
 	}
 
 	/**
-	 * How the dialect supports time zone types like {@link Types#TIMESTAMP_WITH_TIMEZONE}.
+	 * How the dialect supports time zone types like
+	 * {@link Types#TIMESTAMP_WITH_TIMEZONE TIMESTAMP WITH TIME ZONE}.
 	 */
 	public TimeZoneSupport getTimeZoneSupport() {
 		return TimeZoneSupport.NONE;
@@ -6216,7 +6289,7 @@ public TimeZoneSupport getTimeZoneSupport() {
 	 * acts as a high-performance row locator, or null if
 	 * this dialect has no such pseudo-column.
 	 * <p>
-	 * If the {@code rowid}-like value is an explicitly-declared
+	 * If the {@code rowid}-like value is an explicitly declared
 	 * named column instead of an implicit pseudo-column, and if
 	 * the given name is nonempty, return the given name.
 	 *
@@ -6363,6 +6436,10 @@ public boolean supportsIntersect() {
 		return true;
 	}
 
+	public boolean supportsExceptAll() {
+		return supportsIntersect();
+	}
+
 	/**
 	 * If the dialect supports using joins in mutation statement subquery
 	 * that could also use columns from the mutation target table
@@ -6412,44 +6489,49 @@ public boolean supportsCrossJoin() {
 	}
 
 	/**
-	 * Is this dialect known to support what ANSI-SQL terms "row value
-	 * constructor" syntax; sometimes called tuple syntax.
+	 * Is this dialect known to support what ANSI SQL calls the
+	 * <em>row value constructor</em> syntax, sometimes called
+	 * "tuples".
 	 * <p>
-	 * Basically, does it support syntax like
-	 * {@code ... where (FIRST_NAME, LAST_NAME) = ('Steve', 'Ebersole') ...}
+	 * That is, does it support comparisons like:
+	 * <pre>(FIRST_NAME, LAST_NAME) = ('Steve', 'Ebersole')</pre>
 	 *
-	 * @return True if this SQL dialect is known to support "row value
-	 * constructor" syntax; false otherwise.
+	 * @return True if this SQL dialect is known to support the
+	 *         use of row value constructors as operands of the
+	 *         equality operator; false otherwise.
 	 */
 	public boolean supportsRowValueConstructorSyntax() {
 		return true;
 	}
 
 	/**
-	 * Is this dialect known to support what ANSI-SQL terms "row value
-	 * constructor" syntax; sometimes called tuple syntax with <code>&lt;</code>, <code>&gt;</code>, <code>&le;</code>
-	 * and <code>&ge;</code> operators.
+	 * Is this dialect known to support what ANSI SQL calls the
+	 * <em>row value constructor</em> syntax with the {@code <}
+	 * {@code >}, {@code <=} and {@code >=} operators.
 	 * <p>
-	 * Basically, does it support syntax like
-	 * {@code ... where (FIRST_NAME, LAST_NAME) &lt; ('Steve', 'Ebersole') ...}
+	 * That is, does it support comparisons like:
+	 * <pre>(FIRST_NAME, LAST_NAME) &lt; ('Steve', 'Ebersole')</pre>
 	 *
-	 * @return True if this SQL dialect is known to support "row value
-	 * constructor" syntax with relational comparison operators; false otherwise.
+	 * @return True if this SQL dialect is known to support the
+	 *         use of row value constructors as operands of
+	 *         relational comparison operators; false otherwise.
 	 */
 	public boolean supportsRowValueConstructorGtLtSyntax() {
 		return supportsRowValueConstructorSyntax();
 	}
 
 	/**
-	 * Is this dialect known to support what ANSI-SQL terms "row value
-	 * constructor" syntax; sometimes called tuple syntax with <code>is distinct from</code>
-	 * and <code>is not distinct from</code> operators.
+	 * Is this dialect known to support what ANSI SQL calls the
+	 * <em>row value constructor</em> syntax with the
+	 * {@code is distinct from} and {@code is not distinct from}
+	 * operators.
 	 * <p>
-	 * Basically, does it support syntax like
-	 * {@code ... where (FIRST_NAME, LAST_NAME) is distinct from ('Steve', 'Ebersole') ...}
+	 * This is, does it support comparisons like:
+	 * <pre>(FIRST_NAME, LAST_NAME) is distinct from ('Steve', 'Ebersole')</pre>
 	 *
-	 * @return True if this SQL dialect is known to support "row value
-	 * constructor" syntax with distinct from comparison operators; false otherwise.
+	 * @return True if this SQL dialect is known to support the
+	 *         use of row value constructors as operands of
+	 *         {@code is distinct from}; false otherwise.
 	 */
 	public boolean supportsRowValueConstructorDistinctFromSyntax() {
 		return supportsRowValueConstructorSyntax() && supportsDistinctFromPredicate();
@@ -6477,42 +6559,72 @@ public boolean supportsNestedWithClause() {
 	}
 
 	/**
-	 * Is this dialect known to support what ANSI-SQL terms "row value
-	 * constructor" syntax; sometimes called tuple syntax with quantified predicates.
+	 * Is this dialect known to support what ANSI SQL calls the
+	 * <em>row value constructor</em> syntax with quantified
+	 * predicates.
 	 * <p>
-	 * Basically, does it support syntax like
-	 * {@code ... where (FIRST_NAME, LAST_NAME) = ALL (select ...) ...}
+	 * That is, does it support comparisons like:
+	 * <pre>(FIRST_NAME, LAST_NAME) = ALL (select ...)</pre>
 	 *
-	 * @return True if this SQL dialect is known to support "row value
-	 * constructor" syntax with quantified predicates; false otherwise.
+	 * @return True if this SQL dialect is known to support the
+	 *         use of row value constructors as operands with
+	 *         quantified predicates; false otherwise.
 	 */
 	public boolean supportsRowValueConstructorSyntaxInQuantifiedPredicates() {
 		return true;
 	}
 
 	/**
-	 * If the dialect supports {@link org.hibernate.dialect.Dialect#supportsRowValueConstructorSyntax() row values},
-	 * does it offer such support in IN lists as well?
+	 * If the dialect supports
+	 * {@linkplain #supportsRowValueConstructorSyntax row value
+	 * constructors}, does it allow them in {@code IN} lists?
 	 * <p>
-	 * For example, {@code ... where (FIRST_NAME, LAST_NAME) IN ( (?, ?), (?, ?) ) ...}
+	 * For example:
+	 * <pre>(FIRST_NAME, LAST_NAME) IN ((?, ?), (?, ?))</pre>
 	 *
-	 * @return True if this SQL dialect is known to support "row value
-	 * constructor" syntax in the IN list; false otherwise.
+	 * @return True if this SQL dialect is known to support the
+	 *         use of row value constructors in {@code IN} lists;
+	 *         false otherwise.
 	 */
 	public boolean supportsRowValueConstructorSyntaxInInList() {
 		return true;
 	}
 
 	/**
-	 * If the dialect supports {@link org.hibernate.dialect.Dialect#supportsRowValueConstructorSyntax() row values},
-	 * does it offer such support in IN subqueries as well?
+	 * If the dialect supports
+	 * {@linkplain #supportsRowValueConstructorSyntax row value
+	 * constructors}, does it allow them in {@code IN} subqueries?
 	 * <p>
-	 * For example, {@code ... where (FIRST_NAME, LAST_NAME) IN ( select ... ) ...}
+	 * For example:
+	 * <pre>(FIRST_NAME, LAST_NAME) IN (SELECT ... )</pre>
 	 *
-	 * @return True if this SQL dialect is known to support "row value
-	 * constructor" syntax in the IN subqueries; false otherwise.
+	 * @return True if this SQL dialect is known to support the
+	 *         use of row value constructors in {@code IN}
+	 *         subqueries; false otherwise.
 	 */
 	public boolean supportsRowValueConstructorSyntaxInInSubQuery() {
 		return supportsRowValueConstructorSyntaxInInList();
 	}
+
+	/**
+	 * @return True if database supports {@code UNIQUE} constraint
+	 * definitions in the {@code create table} and {@code alter table} statements.
+	 * If this is not supported, then Hibernate will create a unique index instead.
+	 */
+	public boolean supportsUniqueConstraints() {
+		return true;
+	}
+
+	/**
+	 * Does this dialect support defining the column list in the CTE header?
+	 * <p>
+	 * Standard syntax: {@code WITH cte (col1, col2) AS ...}
+	 * <p>
+	 * If false, Hibernate will generate: {@code WITH cte AS (SELECT ... AS col1, ... AS col2)}
+	 *
+	 * @return {@code true} if the dialect supports the column list in the CTE header; {@code false} otherwise.
+	 */
+	public boolean supportsCteHeaderColumnList() {
+		return true;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java b/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java
index cbe35342b302..bc04c258c33e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DialectLogging.java
@@ -14,6 +14,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 
@@ -30,7 +31,7 @@
 public interface DialectLogging {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".dialect";
 	Logger DIALECT_LOGGER = Logger.getLogger(LOGGER_NAME);
-	DialectLogging DIALECT_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), DialectLogging.class, LOGGER_NAME );
+	DialectLogging DIALECT_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), DialectLogging.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage(level = DEBUG)
 	@Message(value = "Using dialect: %s", id = 35001)
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
index dffce552b7aa..bd5ff56ac522 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
@@ -30,6 +30,7 @@
 import org.hibernate.dialect.type.H2DurationIntervalSecondJdbcType;
 import org.hibernate.dialect.type.H2JsonArrayJdbcTypeConstructor;
 import org.hibernate.dialect.type.H2JsonJdbcType;
+import org.hibernate.dialect.type.PostgreSQLEnumJdbcType;
 import org.hibernate.dialect.unique.CreateTableUniqueDelegate;
 import org.hibernate.dialect.unique.UniqueDelegate;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
@@ -73,9 +74,10 @@
 import org.hibernate.type.descriptor.jdbc.UUIDJdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
+import org.hibernate.type.descriptor.sql.internal.NamedNativeEnumDdlTypeImpl;
+import org.hibernate.type.descriptor.sql.internal.NamedNativeOrdinalEnumDdlTypeImpl;
 import org.hibernate.type.descriptor.sql.internal.NativeEnumDdlTypeImpl;
 import org.hibernate.type.descriptor.sql.internal.NativeOrdinalEnumDdlTypeImpl;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import java.sql.CallableStatement;
@@ -83,6 +85,7 @@
 import java.sql.Types;
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAccessor;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -126,6 +129,7 @@
  *
  * @author Thomas Mueller
  * @author Jürgen Kreitler
+ * @author Yoobin Yoon
  */
 public class H2Dialect extends Dialect {
 	private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 2, 1, 214 );
@@ -222,19 +226,21 @@ protected String castType(int sqlTypeCode) {
 	@Override
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.registerColumnTypes( typeContributions, serviceRegistry );
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( UUID, "uuid", this ) );
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( GEOMETRY, "geometry", this ) );
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( INTERVAL_SECOND, "interval second($p,$s)", this ) );
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( JSON, "json", this ) );
 		ddlTypeRegistry.addDescriptor( new NativeEnumDdlTypeImpl( this ) );
 		ddlTypeRegistry.addDescriptor( new NativeOrdinalEnumDdlTypeImpl( this ) );
+		ddlTypeRegistry.addDescriptor( new NamedNativeEnumDdlTypeImpl( this ) );
+		ddlTypeRegistry.addDescriptor( new NamedNativeOrdinalEnumDdlTypeImpl( this ) );
 	}
 
 	@Override
 	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.contributeTypes( typeContributions, serviceRegistry );
-		final JdbcTypeRegistry jdbcTypeRegistry =
+		final var jdbcTypeRegistry =
 				typeContributions.getTypeConfiguration()
 						.getJdbcTypeRegistry();
 		jdbcTypeRegistry.addDescriptor( TimeUtcAsOffsetTimeJdbcType.INSTANCE );
@@ -246,6 +252,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		jdbcTypeRegistry.addTypeConstructor( H2JsonArrayJdbcTypeConstructor.INSTANCE );
 		jdbcTypeRegistry.addDescriptor( EnumJdbcType.INSTANCE );
 		jdbcTypeRegistry.addDescriptor( OrdinalEnumJdbcType.INSTANCE );
+		jdbcTypeRegistry.addDescriptor( PostgreSQLEnumJdbcType.INSTANCE );
 	}
 
 	@Override
@@ -342,6 +349,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arraySlice();
 		functionFactory.arrayReplace_h2( getMaximumArraySize() );
 		functionFactory.arrayTrim_trim_array();
+		functionFactory.arrayReverse_h2( getMaximumArraySize() );
+		functionFactory.arraySort_h2( getMaximumArraySize() );
 		functionFactory.arrayFill_h2();
 		functionFactory.arrayToString_h2( getMaximumArraySize() );
 
@@ -682,11 +691,6 @@ private String withRealTimeout(String lockString, Timeout timeout) {
 		return lockString + " wait " + Timeouts.getTimeoutInSeconds( timeout );
 	}
 
-	private String withRealTimeout(String lockString, int millis) {
-		assert Timeouts.isRealTimeout( millis );
-		return lockString + " wait " + Timeouts.getTimeoutInSeconds( millis );
-	}
-
 	@Override
 	public boolean supportsDistinctFromPredicate() {
 		return true;
@@ -712,6 +716,11 @@ public boolean supportsIfExistsBeforeConstraintName() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsIfExistsBeforeIndexName() {
+		return true;
+	}
+
 	@Override
 	public String getCascadeConstraintsString() {
 		return " cascade ";
@@ -864,6 +873,11 @@ public String getCurrentTimestampSelectString() {
 		return "call current_timestamp()";
 	}
 
+	@Override
+	public boolean isCurrentTimestampStable() {
+		return true;
+	}
+
 
 	// Overridden informational metadata ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -908,6 +922,11 @@ public boolean supportsRecursiveCTE() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsExceptAll() {
+		return false;
+	}
+
 	@Override
 	public boolean supportsFetchClause(FetchClauseType type) {
 		return true;
@@ -1134,4 +1153,34 @@ public boolean supportsRowValueConstructorSyntaxInQuantifiedPredicates() {
 		return true;
 	}
 
+	/**
+	 * Uses {@code CREATE DOMAIN} to emulate a named enum type.
+	 */
+	@Override
+	public String[] getCreateEnumTypeCommand(String name, String[] values) {
+		final int maxLength =
+				Arrays.stream(values)
+						.map( String::length )
+						.max( Integer::compareTo )
+						.orElseThrow();
+		final var domain = new StringBuilder();
+		domain.append( "create domain " )
+				.append( name )
+				.append( " as varchar(")
+				.append( maxLength )
+				.append( ") check (value in (" );
+		String separator = "";
+		for ( String value : values ) {
+			domain.append( separator ).append('\'').append( value ).append('\'');
+			separator = ",";
+		}
+		domain.append( "))" );
+		return new String[] { domain.toString() };
+	}
+
+	@Override
+	public String[] getDropEnumTypeCommand(String name) {
+		return new String[] { "drop domain if exists " + name };
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java
index 4ff88f517c78..51fb4c2a4d53 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java
@@ -94,12 +94,9 @@
 import org.hibernate.type.descriptor.jdbc.NVarcharJdbcType;
 import org.hibernate.type.descriptor.jdbc.NumericJdbcType;
 import org.hibernate.type.descriptor.jdbc.TinyIntAsSmallIntJdbcType;
-import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType;
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import org.hibernate.type.internal.BasicTypeImpl;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -286,7 +283,7 @@ private String[] quoteTypeIfNecessary(Table table, String[] strings, String pref
 	public void contribute(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		// This is the best hook for consuming dialect configuration that we have for now,
 		// since this method is called very early in the bootstrap process
-		final ConfigurationService configurationService = serviceRegistry.requireService( ConfigurationService.class );
+		final var configurationService = serviceRegistry.requireService( ConfigurationService.class );
 
 		this.defaultTableTypeColumn = configurationService.getSetting(
 				USE_DEFAULT_TABLE_TYPE_COLUMN,
@@ -360,7 +357,7 @@ protected String columnType(int sqlTypeCode) {
 	@Override
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.registerColumnTypes( typeContributions, serviceRegistry );
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 
 		// varbinary max length 5000
 		ddlTypeRegistry.addDescriptor(
@@ -436,7 +433,7 @@ public int getPreferredSqlTypeCodeForArray() {
 	@Override
 	public void initializeFunctionRegistry(FunctionContributions functionContributions) {
 		super.initializeFunctionRegistry( functionContributions );
-		final TypeConfiguration typeConfiguration = functionContributions.getTypeConfiguration();
+		final var typeConfiguration = functionContributions.getTypeConfiguration();
 
 		functionContributions.getFunctionRegistry().registerBinaryTernaryPattern(
 				"locate",
@@ -959,6 +956,11 @@ public Identifier toIdentifier(String text, boolean quoted) {
 				return normalizeQuoting( Identifier.toIdentifier( text, quoted ) );
 			}
 
+			@Override
+			public Identifier toIdentifier(String text, boolean quoted, boolean isExplicit) {
+				return normalizeQuoting( Identifier.toIdentifier( text, quoted, false, isExplicit ) );
+			}
+
 			@Override
 			public Identifier normalizeQuoting(Identifier identifier) {
 				Identifier normalizedIdentifier = this.helper.normalizeQuoting( identifier );
@@ -1066,12 +1068,22 @@ public boolean supportsPartitionBy() {
 		return true;
 	}
 
+	@Override
+	public String getAlterColumnTypeString(String columnName, String columnType, String columnDefinition) {
+		return "alter (" + columnName + " " + columnType + ")";
+	}
+
+	@Override
+	public boolean supportsAlterColumnType() {
+		return true;
+	}
+
 	@Override
 	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.contributeTypes( typeContributions, serviceRegistry );
 
-		final TypeConfiguration typeConfiguration = typeContributions.getTypeConfiguration();
-		final JdbcTypeRegistry jdbcTypeRegistry = typeConfiguration.getJdbcTypeRegistry();
+		final var typeConfiguration = typeContributions.getTypeConfiguration();
+		final var jdbcTypeRegistry = typeConfiguration.getJdbcTypeRegistry();
 		if ( treatDoubleTypedFieldsAsDecimal ) {
 			typeConfiguration.getBasicTypeRegistry()
 					.register(
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java b/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java
index f846cb90e90f..04ad7e709d63 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java
@@ -9,15 +9,14 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.time.LocalDate;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.jboss.logging.Logger;
 
 import static org.hibernate.cfg.DialectSpecificSettings.HANA_MAX_LOB_PREFETCH_SIZE;
+import static org.hibernate.internal.util.StringHelper.split;
 
 /**
  * Utility class that extracts some initial configuration from the database for {@link HANADialect}.
@@ -124,14 +123,14 @@ public static DatabaseVersion determineDatabaseVersion(String versionString) {
 		if ( versionString == null ) {
 			return HANADialect.MINIMUM_VERSION;
 		}
-		final String[] components = StringHelper.split( " ", versionString );
-		final DatabaseVersion databaseVersion = staticDetermineDatabaseVersion( components[0] );
+		final var components = split( " ", versionString );
+		final var databaseVersion = staticDetermineDatabaseVersion( components[0] );
 		if ( components.length == 1 || databaseVersion.isBefore( 4 ) ) {
 			return databaseVersion;
 		}
 		else {
 			// Parse the HANA Cloud version
-			final Matcher matcher = CLOUD_VERSION_PATTERN.matcher( components[1] );
+			final var matcher = CLOUD_VERSION_PATTERN.matcher( components[1] );
 			if ( matcher.matches() ) {
 				final int year = Integer.parseInt( matcher.group( 1 ) );
 				final int week = Integer.parseInt( matcher.group( 2 ) );
@@ -169,7 +168,7 @@ public static DatabaseVersion staticDetermineDatabaseVersion(String versionStrin
 		if ( versionString == null ) {
 			return HANADialect.MINIMUM_VERSION;
 		}
-		final String[] components = StringHelper.split( ".", versionString );
+		final var components = split( ".", versionString );
 		if ( components.length >= 3 ) {
 			try {
 				majorVersion = Integer.parseInt( components[0] );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
index 9a636cb29992..de402a85ecf8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
@@ -77,6 +77,7 @@
  * @author Christoph Sturm
  * @author Phillip Baird
  * @author Fred Toussi
+ * @author Yoobin Yoon
  */
 public class HSQLDialect extends Dialect {
 
@@ -197,25 +198,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		// from v. 2.2.0 ROWNUM() is supported in all modes as the equivalent of Oracle ROWNUM
 		functionFactory.rownum();
 		functionFactory.listagg_groupConcat();
-		functionFactory.array_hsql();
-		functionFactory.arrayAggregate();
-		functionFactory.arrayPosition_hsql();
-		functionFactory.arrayPositions_hsql();
-		functionFactory.arrayLength_cardinality();
-		functionFactory.arrayConcat_operator();
-		functionFactory.arrayPrepend_operator();
-		functionFactory.arrayAppend_operator();
-		functionFactory.arrayContains_hsql();
-		functionFactory.arrayIntersects_hsql();
-		functionFactory.arrayGet_unnest();
-		functionFactory.arraySet_hsql();
-		functionFactory.arrayRemove_hsql();
-		functionFactory.arrayRemoveIndex_unnest( false );
-		functionFactory.arraySlice_unnest();
-		functionFactory.arrayReplace_unnest();
-		functionFactory.arrayTrim_trim_array();
-		functionFactory.arrayFill_hsql();
-		functionFactory.arrayToString_hsql();
+
+		registerArrayFunctions( functionFactory );
 
 		if ( getVersion().isSameOrAfter( 2, 7 ) ) {
 			functionFactory.jsonObject_hsqldb();
@@ -238,6 +222,30 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.regexpLike_hsql();
 	}
 
+	protected static void registerArrayFunctions(CommonFunctionFactory functionFactory) {
+		functionFactory.array_hsql();
+		functionFactory.arrayAggregate();
+		functionFactory.arrayPosition_hsql();
+		functionFactory.arrayPositions_hsql();
+		functionFactory.arrayLength_cardinality();
+		functionFactory.arrayConcat_operator();
+		functionFactory.arrayPrepend_operator();
+		functionFactory.arrayAppend_operator();
+		functionFactory.arrayContains_hsql();
+		functionFactory.arrayIntersects_hsql();
+		functionFactory.arrayGet_unnest();
+		functionFactory.arraySet_hsql();
+		functionFactory.arrayRemove_hsql();
+		functionFactory.arrayRemoveIndex_unnest( false );
+		functionFactory.arraySlice_unnest();
+		functionFactory.arrayReplace_unnest();
+		functionFactory.arrayTrim_trim_array();
+		functionFactory.arrayReverse_unnest();
+		functionFactory.arraySort_hsql();
+		functionFactory.arrayFill_hsql();
+		functionFactory.arrayToString_hsql();
+	}
+
 	/**
 	 * HSQLDB doesn't support the {@code generate_series} function or {@code lateral} recursive CTEs,
 	 * so it has to be emulated with a top level recursive CTE which requires an upper bound on the amount
@@ -333,7 +341,7 @@ public String castPattern(CastType from, CastType to) {
 
 	@Override @SuppressWarnings("deprecation")
 	public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType, IntervalType intervalType) {
-		final StringBuilder pattern = new StringBuilder();
+		final var pattern = new StringBuilder();
 		final boolean castTo = temporalType != TemporalType.TIMESTAMP && !unit.isDateUnit();
 		switch (unit) {
 			case NANOSECOND:
@@ -363,7 +371,7 @@ public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType,
 
 	@Override @SuppressWarnings("deprecation")
 	public String timestampdiffPattern(TemporalUnit unit, TemporalType fromTemporalType, TemporalType toTemporalType) {
-		final StringBuilder pattern = new StringBuilder();
+		final var pattern = new StringBuilder();
 		final boolean castFrom = fromTemporalType != TemporalType.TIMESTAMP && !unit.isDateUnit();
 		final boolean castTo = toTemporalType != TemporalType.TIMESTAMP && !unit.isDateUnit();
 		switch (unit) {
@@ -432,6 +440,16 @@ public boolean supportsIfExistsBeforeTableName() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsAlterColumnType() {
+		return true;
+	}
+
+	@Override
+	public String getAlterColumnTypeString(String columnName, String columnType, String columnDefinition) {
+		return "alter column " + columnName + " set data type " + columnType;
+	}
+
 	@Override
 	public SequenceSupport getSequenceSupport() {
 		return HSQLSequenceSupport.INSTANCE;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java
index 19c4fb69d1c8..600d2402e01a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.dialect;
 
+import org.hibernate.Incubating;
 import org.hibernate.QueryTimeoutException;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
@@ -17,6 +18,8 @@
 import org.hibernate.dialect.sequence.MariaDBSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.dialect.sql.ast.MariaDBSqlAstTranslator;
+import org.hibernate.dialect.temporal.MariaDBTemporalTableSupport;
+import org.hibernate.dialect.temporal.TemporalTableSupport;
 import org.hibernate.dialect.type.MariaDBCastingJsonArrayJdbcTypeConstructor;
 import org.hibernate.dialect.type.MariaDBCastingJsonJdbcType;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
@@ -49,7 +52,6 @@
 import org.hibernate.type.descriptor.jdbc.VarcharUUIDJdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
@@ -148,7 +150,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 	@Override
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.registerColumnTypes( typeContributions, serviceRegistry );
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 		if ( getVersion().isSameOrAfter( 10, 7 ) ) {
 			ddlTypeRegistry.addDescriptor( new DdlTypeImpl( UUID, "uuid", this ) );
 		}
@@ -192,7 +194,7 @@ public JdbcType resolveSqlTypeDescriptor(
 
 	@Override
 	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-		final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
+		final var jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
 		// Make sure we register the JSON type descriptor before calling super, because MariaDB needs special casting
 		jdbcTypeRegistry.addDescriptorIfAbsent( SqlTypes.JSON, MariaDBCastingJsonJdbcType.INSTANCE );
 		jdbcTypeRegistry.addTypeConstructorIfAbsent( MariaDBCastingJsonArrayJdbcTypeConstructor.INSTANCE );
@@ -263,6 +265,11 @@ public boolean supportsIfExistsAfterAlterTable() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsIfExistsBeforeIndexName() {
+		return true;
+	}
+
 	@Override
 	public SequenceSupport getSequenceSupport() {
 		return MariaDBSequenceSupport.INSTANCE;
@@ -409,18 +416,42 @@ public boolean supportsIntersect() {
 		return true;
 	}
 
+	@Override
+	@Incubating
+	public boolean supportsDuplicateSelectItemsInQueryGroup() {
+		return false;
+	}
+
 	@Override
 	public boolean supportsWithClauseInSubquery() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsNotNullAfterGeneratedAs() {
+		return false;
+	}
+
 	@Override
 	public MutationOperation createOptionalTableUpdateOperation(EntityMutationTarget mutationTarget, OptionalTableUpdate optionalTableUpdate, SessionFactoryImplementor factory) {
 		if ( optionalTableUpdate.getNumberOfOptimisticLockBindings() == 0 ) {
-			final MariaDBSqlAstTranslator<?> translator = new MariaDBSqlAstTranslator<>( factory, optionalTableUpdate, MariaDBDialect.this );
-			return translator.createMergeOperation( optionalTableUpdate );
+			return new MariaDBSqlAstTranslator<>( factory, optionalTableUpdate, this )
+					.createMergeOperation( optionalTableUpdate );
+		}
+		else {
+			return super.createOptionalTableUpdateOperation( mutationTarget, optionalTableUpdate, factory );
 		}
-		return super.createOptionalTableUpdateOperation( mutationTarget, optionalTableUpdate, factory );
 	}
 
+	@Override
+	public String generatedAs(String generatedAs) {
+		return generatedAs.startsWith( "row " )
+				? " generated always as " + generatedAs
+				: super.generatedAs( generatedAs );
+	}
+
+	@Override
+	public TemporalTableSupport getTemporalTableSupport() {
+		return new MariaDBTemporalTableSupport( this );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDeleteOrUpsertOperation.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDeleteOrUpsertOperation.java
deleted file mode 100644
index 53d4a5cf9f87..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDeleteOrUpsertOperation.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.dialect;
-
-
-import org.hibernate.StaleStateException;
-import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.jdbc.Expectation;
-import org.hibernate.persister.entity.mutation.EntityMutationTarget;
-import org.hibernate.persister.entity.mutation.EntityTableMapping;
-import org.hibernate.sql.model.ValuesAnalysis;
-import org.hibernate.sql.model.internal.OptionalTableUpdate;
-import org.hibernate.sql.model.jdbc.DeleteOrUpsertOperation;
-import org.hibernate.sql.model.jdbc.UpsertOperation;
-
-import java.sql.PreparedStatement;
-
-
-/**
- * @author Jan Schatteman
- */
-public class MySQLDeleteOrUpsertOperation extends DeleteOrUpsertOperation {
-
-	private Expectation customExpectation;
-
-	public MySQLDeleteOrUpsertOperation(EntityMutationTarget mutationTarget, EntityTableMapping tableMapping, UpsertOperation upsertOperation, OptionalTableUpdate optionalTableUpdate) {
-		super( mutationTarget, tableMapping, upsertOperation, optionalTableUpdate );
-	}
-
-	@Override
-	public void performMutation(JdbcValueBindings jdbcValueBindings, ValuesAnalysis valuesAnalysis, SharedSessionContractImplementor session) {
-		customExpectation = new MySQLRowCountExpectation();
-		super.performMutation( jdbcValueBindings, valuesAnalysis, session );
-	}
-
-	@Override
-	protected Expectation getExpectation() {
-		return customExpectation;
-	}
-
-	private static class MySQLRowCountExpectation implements Expectation {
-		@Override
-		public final void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) {
-			if ( rowCount > 2 ) {
-				throw new StaleStateException(
-						"Unexpected row count"
-						+ " (the expected row count for an ON DUPLICATE KEY UPDATE statement should be either 0, 1 or 2 )"
-						+ " [" + sql + "]"
-				);
-			}
-		}
-	}
-
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
index 14fb6c6c1abb..ae2bc785f8f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
@@ -11,9 +11,7 @@
 import org.hibernate.Timeouts;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
-import org.hibernate.cfg.FetchSettings;
 import org.hibernate.dialect.aggregate.AggregateSupport;
 import org.hibernate.dialect.aggregate.MySQLAggregateSupport;
 import org.hibernate.dialect.function.CommonFunctionFactory;
@@ -25,6 +23,8 @@
 import org.hibernate.dialect.sequence.NoSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.dialect.sql.ast.MySQLSqlAstTranslator;
+import org.hibernate.dialect.temporal.MySQLTemporalTableSupport;
+import org.hibernate.dialect.temporal.TemporalTableSupport;
 import org.hibernate.dialect.temptable.MySQLLocalTemporaryTableStrategy;
 import org.hibernate.dialect.temptable.TemporaryTableKind;
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
@@ -51,7 +51,6 @@
 import org.hibernate.query.common.TemporalUnit;
 import org.hibernate.query.sqm.CastType;
 import org.hibernate.query.sqm.IntervalType;
-import org.hibernate.query.sqm.function.SqmFunctionRegistry;
 import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableInsertStrategy;
 import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy;
 import org.hibernate.query.sqm.mutation.spi.AfterUseAction;
@@ -71,7 +70,6 @@
 import org.hibernate.tool.schema.extract.internal.InformationExtractorMySQLImpl;
 import org.hibernate.tool.schema.extract.spi.ExtractionContext;
 import org.hibernate.tool.schema.extract.spi.InformationExtractor;
-import org.hibernate.type.BasicTypeRegistry;
 import org.hibernate.type.NullType;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.StandardBasicTypes;
@@ -85,7 +83,6 @@
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
 import org.hibernate.type.descriptor.sql.internal.NativeEnumDdlTypeImpl;
 import org.hibernate.type.descriptor.sql.internal.NativeOrdinalEnumDdlTypeImpl;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 
 import java.sql.CallableStatement;
 import java.sql.DatabaseMetaData;
@@ -100,6 +97,7 @@
 import java.util.TimeZone;
 
 import static java.lang.Integer.parseInt;
+import static org.hibernate.cfg.SchemaToolingSettings.STORAGE_ENGINE;
 import static org.hibernate.dialect.MySQLServerConfiguration.getBytesPerCharacter;
 import static org.hibernate.dialect.lock.internal.MySQLLockingSupport.MYSQL_LOCKING_SUPPORT;
 import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
@@ -150,6 +148,11 @@ public class MySQLDialect extends Dialect {
 
 	private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 8 );
 
+	/**
+	 * On MySQL, 1GB or {@code 2^30 - 1} is the maximum size that a char value can be casted.
+	 */
+	private static final int MAX_CHAR_SIZE = (1 << 30) - 1;
+
 	private final MySQLStorageEngine storageEngine;
 
 	private final SizeStrategy sizeStrategy = new SizeStrategyImpl() {
@@ -223,7 +226,7 @@ public MySQLDialect(DatabaseVersion version, int bytesPerCharacter, boolean noBa
 		maxVarcharLength = maxVarcharLength( getMySQLVersion(), bytesPerCharacter ); //conservative assumption
 		maxVarbinaryLength = maxVarbinaryLength( getMySQLVersion() );
 		noBackslashEscapesEnabled = noBackslashEscapes;
-		storageEngine = createStorageEngine( Environment.getProperties().getProperty( AvailableSettings.STORAGE_ENGINE ) );
+		storageEngine = createStorageEngine( Environment.getProperties().getProperty( STORAGE_ENGINE ) );
 	}
 
 	public MySQLDialect(DialectResolutionInfo info) {
@@ -260,12 +263,6 @@ protected DatabaseVersion getMinimumSupportedVersion() {
 		return MINIMUM_VERSION;
 	}
 
-	@Override
-	protected void initDefaultProperties() {
-		super.initDefaultProperties();
-		getDefaultProperties().setProperty( FetchSettings.MAX_FETCH_DEPTH, "2" );
-	}
-
 	private MySQLStorageEngine createStorageEngine(String configuredStorageEngine) {
 		return configuredStorageEngine == null
 				? getDefaultMySQLStorageEngine()
@@ -351,7 +348,7 @@ protected String castType(int sqlTypeCode) {
 	@Override
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.registerColumnTypes( typeContributions, serviceRegistry );
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 
 		// MySQL 5.7 brings JSON native support with a dedicated datatype
 		// https://dev.mysql.com/doc/refman/5.7/en/json.html
@@ -367,12 +364,21 @@ protected void registerColumnTypes(TypeContributions typeContributions, ServiceR
 		final int maxLobLen = 65_535;
 		final int maxMediumLobLen = 16_777_215;
 
-		final CapacityDependentDdlType.Builder varcharBuilder =
+		ddlTypeRegistry.addDescriptor( new DdlTypeImpl(
+				CHAR,
+				false,
+				columnType( CHAR ),
+				"char($l)",
+				castType( CHAR ),
+				this
+		) );
+
+		final var varcharBuilder =
 				CapacityDependentDdlType.builder(
 								VARCHAR,
 								CapacityDependentDdlType.LobKind.BIGGEST_LOB,
 								columnType( CLOB ),
-								columnType( CHAR ),
+								this::charCastType,
 								castType( CHAR ),
 								this
 						)
@@ -385,12 +391,12 @@ protected void registerColumnTypes(TypeContributions typeContributions, ServiceR
 
 		// do not use nchar/nvarchar/ntext because these
 		// types use a deprecated character set on MySQL 8
-		final CapacityDependentDdlType.Builder nvarcharBuilder =
+		final var nvarcharBuilder =
 				CapacityDependentDdlType.builder(
 								NVARCHAR,
 								CapacityDependentDdlType.LobKind.BIGGEST_LOB,
 								columnType( NCLOB ),
-								columnType( NCHAR ),
+								this::charCastType,
 								castType( NCHAR ),
 								this
 						)
@@ -401,7 +407,7 @@ protected void registerColumnTypes(TypeContributions typeContributions, ServiceR
 		}
 		ddlTypeRegistry.addDescriptor( nvarcharBuilder.build() );
 
-		final CapacityDependentDdlType.Builder varbinaryBuilder =
+		final var varbinaryBuilder =
 				CapacityDependentDdlType.builder(
 								VARBINARY,
 								CapacityDependentDdlType.LobKind.BIGGEST_LOB,
@@ -435,7 +441,7 @@ protected void registerColumnTypes(TypeContributions typeContributions, ServiceR
 
 		ddlTypeRegistry.addDescriptor(
 				CapacityDependentDdlType.builder( CLOB,
-								columnType( CLOB ), castType( CHAR ), this )
+								columnType( CLOB ),  castType( CHAR ), this )
 						.withTypeCapacity( maxTinyLobLen, "tinytext" )
 						.withTypeCapacity( maxMediumLobLen, "mediumtext" )
 						.withTypeCapacity( maxLobLen, "text" )
@@ -451,10 +457,19 @@ protected void registerColumnTypes(TypeContributions typeContributions, ServiceR
 						.build()
 		);
 
-		ddlTypeRegistry.addDescriptor( new NativeEnumDdlTypeImpl( this ) );
+		ddlTypeRegistry.addDescriptor( new NativeEnumDdlTypeImpl( this ) {
+			@Override
+			public String getCastTypeName(Long length) {
+				return length == null ? "char" : charCastType( length.intValue() );
+			}
+		} );
 		ddlTypeRegistry.addDescriptor( new NativeOrdinalEnumDdlTypeImpl( this ) );
 	}
 
+	private String charCastType(int length) {
+		return length > MAX_CHAR_SIZE ? "char" : "char(" + length + ")";
+	}
+
 	@Override
 	public AggregateSupport getAggregateSupport() {
 		return MySQLAggregateSupport.forMySQL( this );
@@ -589,6 +604,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		super.initializeFunctionRegistry(functionContributions);
 
 		final var functionFactory = new CommonFunctionFactory( functionContributions );
+		final var basicTypeRegistry = functionContributions.getTypeConfiguration().getBasicTypeRegistry();
+		final var functionRegistry = functionContributions.getFunctionRegistry();
 
 		functionFactory.soundex();
 		functionFactory.radians();
@@ -640,11 +657,6 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.makedateMaketime();
 		functionFactory.localtimeLocaltimestamp();
 
-		final BasicTypeRegistry basicTypeRegistry =
-				functionContributions.getTypeConfiguration().getBasicTypeRegistry();
-
-		final SqmFunctionRegistry functionRegistry = functionContributions.getFunctionRegistry();
-
 		// pi() produces a value with 7 digits unless we're explicit
 		functionRegistry.patternDescriptorBuilder( "pi", "cast(pi() as double)" )
 				.setInvariantType( basicTypeRegistry.resolve( StandardBasicTypes.DOUBLE ) )
@@ -673,6 +685,24 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 
 		functionFactory.listagg_groupConcat();
 
+		registerJsonFunctions( functionFactory );
+
+		functionFactory.unnest_emulated();
+
+		// TODO: which one is correct??
+		functionFactory.regexpLike_regexp();
+		functionFactory.regexpLike();
+
+		if ( supportsRecursiveCTE() ) {
+			functionFactory.generateSeries_recursive( getMaximumSeriesSize(), false, false );
+		}
+
+		functionFactory.hex( "hex(?1)" );
+		functionFactory.sha( "unhex(sha2(?1, 256))" );
+		functionFactory.md5( "unhex(md5(?1))" );
+	}
+
+	protected static void registerJsonFunctions(CommonFunctionFactory functionFactory) {
 		functionFactory.jsonValue_mysql();
 		functionFactory.jsonQuery_mysql();
 		functionFactory.jsonExists_mysql();
@@ -687,19 +717,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.jsonMergepatch_mysql();
 		functionFactory.jsonArrayAppend_mysql();
 		functionFactory.jsonArrayInsert_mysql();
-		functionFactory.regexpLike_regexp();
-
-		functionFactory.unnest_emulated();
 		functionFactory.jsonTable_mysql();
-		functionFactory.regexpLike();
-
-		if ( supportsRecursiveCTE() ) {
-			functionFactory.generateSeries_recursive( getMaximumSeriesSize(), false, false );
-		}
-
-		functionFactory.hex( "hex(?1)" );
-		functionFactory.sha( "unhex(sha2(?1, 256))" );
-		functionFactory.md5( "unhex(md5(?1))" );
 	}
 
 	/**
@@ -716,7 +734,7 @@ protected int getMaximumSeriesSize() {
 	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.contributeTypes( typeContributions, serviceRegistry );
 
-		final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
+		final var jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
 
 		jdbcTypeRegistry.addDescriptorIfAbsent( SqlTypes.JSON, MySQLCastingJsonJdbcType.INSTANCE );
 		jdbcTypeRegistry.addTypeConstructorIfAbsent( MySQLCastingJsonArrayJdbcTypeConstructor.INSTANCE );
@@ -960,7 +978,7 @@ public boolean supportsColumnCheck() {
 
 	@Override
 	public String getEnumTypeDeclaration(String name, String[] values) {
-		final StringBuilder type = new StringBuilder();
+		final var type = new StringBuilder();
 		type.append( "enum (" );
 		String separator = "";
 		for ( String value : values ) {
@@ -1639,11 +1657,6 @@ public boolean supportsDistinctFromPredicate() {
 		return true;
 	}
 
-	@Override
-	public boolean supportsIntersect() {
-		return false;
-	}
-
 	@Override
 	public boolean supportsJoinsInDelete() {
 		return true;
@@ -1672,4 +1685,9 @@ public MutationOperation createOptionalTableUpdateOperation(EntityMutationTarget
 	public InformationExtractor getInformationExtractor(ExtractionContext extractionContext) {
 		return new InformationExtractorMySQLImpl( extractionContext );
 	}
+
+	@Override
+	public TemporalTableSupport getTemporalTableSupport() {
+		return new MySQLTemporalTableSupport( this );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLServerConfiguration.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLServerConfiguration.java
index a66b5089d94f..737642b24a5c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLServerConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLServerConfiguration.java
@@ -5,7 +5,6 @@
 package org.hibernate.dialect;
 
 import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.hibernate.Internal;
@@ -68,11 +67,10 @@ static Integer getBytesPerCharacter(String characterSet) {
 	public static MySQLServerConfiguration fromDialectResolutionInfo(DialectResolutionInfo info) {
 		Integer bytesPerCharacter = null;
 		Boolean noBackslashEscapes = null;
-		final DatabaseMetaData databaseMetaData = info.getDatabaseMetadata();
+		final var databaseMetaData = info.getDatabaseMetadata();
 		if ( databaseMetaData != null ) {
-			try ( var statement = databaseMetaData.getConnection().createStatement() ) {
-				final ResultSet resultSet =
-						statement.executeQuery( "SELECT @@character_set_database, @@sql_mode" );
+			try ( var statement = databaseMetaData.getConnection().createStatement();
+					var resultSet = statement.executeQuery( "SELECT @@character_set_database, @@sql_mode" ) ) {
 				if ( resultSet.next() ) {
 					final String characterSet = resultSet.getString( 1 );
 					bytesPerCharacter = getBytesPerCharacter( characterSet );
@@ -107,9 +105,8 @@ public static MySQLServerConfiguration fromDatabaseMetadata(DatabaseMetaData dat
 		int bytesPerCharacter = 4;
 		boolean noBackslashEscapes = false;
 		if ( databaseMetaData != null ) {
-			try ( var statement = databaseMetaData.getConnection().createStatement() ) {
-				final ResultSet resultSet =
-						statement.executeQuery( "SELECT @@character_set_database, @@sql_mode" );
+			try ( var statement = databaseMetaData.getConnection().createStatement();
+					var resultSet = statement.executeQuery( "SELECT @@character_set_database, @@sql_mode" ) ) {
 				if ( resultSet.next() ) {
 					final String characterSet = resultSet.getString( 1 );
 					bytesPerCharacter = getBytesPerCharacter( characterSet );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
index 59ca66444fc5..31b6dec8f91a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
@@ -27,6 +27,8 @@
 import org.hibernate.dialect.sequence.OracleSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.dialect.sql.ast.OracleSqlAstTranslator;
+import org.hibernate.dialect.temporal.OracleTemporalTableSupport;
+import org.hibernate.dialect.temporal.TemporalTableSupport;
 import org.hibernate.dialect.temptable.OracleLocalTemporaryTableStrategy;
 import org.hibernate.dialect.temptable.StandardGlobalTemporaryTableStrategy;
 import org.hibernate.dialect.temptable.TemporaryTableKind;
@@ -110,8 +112,6 @@
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
 import org.hibernate.type.descriptor.sql.internal.NamedNativeEnumDdlTypeImpl;
 import org.hibernate.type.descriptor.sql.internal.NamedNativeOrdinalEnumDdlTypeImpl;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
-import org.hibernate.type.spi.TypeConfiguration;
 import org.jboss.logging.Logger;
 
 import java.sql.CallableStatement;
@@ -123,7 +123,6 @@
 import java.time.temporal.TemporalAccessor;
 import java.util.List;
 import java.util.TimeZone;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static java.lang.String.join;
@@ -179,6 +178,7 @@
  * @author Steve Ebersole
  * @author Gavin King
  * @author Loïc Lefèvre
+ * @author Yoobin Yoon
  */
 public class OracleDialect extends Dialect {
 
@@ -293,10 +293,12 @@ public void appendBooleanValueString(SqlAppender appender, boolean bool) {
 
 	@Override
 	public void initializeFunctionRegistry(FunctionContributions functionContributions) {
-		super.initializeFunctionRegistry(functionContributions);
-		final TypeConfiguration typeConfiguration = functionContributions.getTypeConfiguration();
+		super.initializeFunctionRegistry( functionContributions );
+
+		final var typeConfiguration = functionContributions.getTypeConfiguration();
+		final var functionFactory = new CommonFunctionFactory( functionContributions );
+		final var functionRegistry = functionContributions.getFunctionRegistry();
 
-		CommonFunctionFactory functionFactory = new CommonFunctionFactory(functionContributions);
 		functionFactory.ascii();
 		functionFactory.char_chr();
 		functionFactory.cosh();
@@ -344,18 +346,18 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		//Oracle has had coalesce() since 9.0.1
 		functionFactory.coalesce();
 
-		functionContributions.getFunctionRegistry()
+		functionRegistry
 				.patternDescriptorBuilder( "bitor", "(?1+?2-bitand(?1,?2))" )
 				.setExactArgumentCount( 2 )
 				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
-		functionContributions.getFunctionRegistry()
+		functionRegistry
 				.patternDescriptorBuilder( "bitxor", "(?1+?2-2*bitand(?1,?2))" )
 				.setExactArgumentCount( 2 )
 				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 
-		functionContributions.getFunctionRegistry().registerBinaryTernaryPattern(
+		functionRegistry.registerBinaryTernaryPattern(
 				"locate",
 				typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.INTEGER ),
 				"instr(?2,?1)",
@@ -370,16 +372,65 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.hypotheticalOrderedSetAggregates();
 		functionFactory.inverseDistributionOrderedSetAggregates();
 		// Oracle has a regular aggregate function named stats_mode
-		functionContributions.getFunctionRegistry().register(
+		functionRegistry.register(
 				"mode",
 				new ModeStatsModeEmulation( typeConfiguration )
 		);
-		functionContributions.getFunctionRegistry().register(
+		functionRegistry.register(
 				"trunc",
 				new OracleTruncFunction( functionContributions.getTypeConfiguration() )
 		);
-		functionContributions.getFunctionRegistry().registerAlternateKey( "truncate", "trunc" );
+		functionRegistry.registerAlternateKey( "truncate", "trunc" );
+
+		registerArrayFunctions( functionFactory );
+		registerJsonFunctions( functionFactory );
+		registerXmlFunctions( functionFactory );
+
+		functionFactory.unnest_oracle( getVersion().isSameOrAfter( 21 ) );
+		functionFactory.generateSeries_recursive( getMaximumSeriesSize(), true, false );
+
+		functionFactory.hex( "rawtohex(?1)" );
+		functionFactory.sha( "standard_hash(?1, 'SHA256')" );
+		functionFactory.md5( "standard_hash(?1, 'MD5')" );
+
+		functionRegistry.register(
+				"extract",
+				new OracleExtractFunction( this, typeConfiguration )
+		);
+		functionFactory.regexpLike_predicateFunction();
+	}
+
+	protected static void registerXmlFunctions(CommonFunctionFactory functionFactory) {
+		functionFactory.xmlelement();
+		functionFactory.xmlcomment();
+		functionFactory.xmlforest();
+		functionFactory.xmlconcat();
+		functionFactory.xmlpi();
+		functionFactory.xmlquery_oracle();
+		functionFactory.xmlexists();
+		functionFactory.xmlagg();
+		functionFactory.xmltable_oracle();
+	}
+
+	protected static void registerJsonFunctions(CommonFunctionFactory functionFactory) {
+		functionFactory.jsonValue_oracle();
+		functionFactory.jsonQuery_oracle();
+		functionFactory.jsonExists_oracle();
+		functionFactory.jsonObject_oracle( true );
+		functionFactory.jsonArray_oracle();
+		functionFactory.jsonArrayAgg_oracle();
+		functionFactory.jsonObjectAgg_oracle();
+		functionFactory.jsonSet_oracle();
+		functionFactory.jsonRemove_oracle();
+		functionFactory.jsonReplace_oracle();
+		functionFactory.jsonInsert_oracle();
+		functionFactory.jsonMergepatch_oracle();
+		functionFactory.jsonArrayAppend_oracle();
+		functionFactory.jsonArrayInsert_oracle();
+		functionFactory.jsonTable_oracle();
+	}
 
+	protected static void registerArrayFunctions(CommonFunctionFactory functionFactory) {
 		functionFactory.array_oracle();
 		functionFactory.arrayAggregate_jsonArrayagg();
 		functionFactory.arrayPosition_oracle();
@@ -397,47 +448,10 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.arraySlice_oracle();
 		functionFactory.arrayReplace_oracle();
 		functionFactory.arrayTrim_oracle();
+		functionFactory.arrayReverse_oracle();
+		functionFactory.arraySort_oracle();
 		functionFactory.arrayFill_oracle();
 		functionFactory.arrayToString_oracle();
-
-		functionFactory.jsonValue_oracle();
-		functionFactory.jsonQuery_oracle();
-		functionFactory.jsonExists_oracle();
-		functionFactory.jsonObject_oracle( true );
-		functionFactory.jsonArray_oracle();
-		functionFactory.jsonArrayAgg_oracle();
-		functionFactory.jsonObjectAgg_oracle();
-		functionFactory.jsonSet_oracle();
-		functionFactory.jsonRemove_oracle();
-		functionFactory.jsonReplace_oracle();
-		functionFactory.jsonInsert_oracle();
-		functionFactory.jsonMergepatch_oracle();
-		functionFactory.jsonArrayAppend_oracle();
-		functionFactory.jsonArrayInsert_oracle();
-
-		functionFactory.xmlelement();
-		functionFactory.xmlcomment();
-		functionFactory.xmlforest();
-		functionFactory.xmlconcat();
-		functionFactory.xmlpi();
-		functionFactory.xmlquery_oracle();
-		functionFactory.xmlexists();
-		functionFactory.xmlagg();
-		functionFactory.xmltable_oracle();
-
-		functionFactory.unnest_oracle();
-		functionFactory.generateSeries_recursive( getMaximumSeriesSize(), true, false );
-		functionFactory.jsonTable_oracle();
-
-		functionFactory.hex( "rawtohex(?1)" );
-		functionFactory.sha( "standard_hash(?1, 'SHA256')" );
-		functionFactory.md5( "standard_hash(?1, 'MD5')" );
-
-		functionContributions.getFunctionRegistry().register(
-				"extract",
-				new OracleExtractFunction( this, typeConfiguration )
-		);
-		functionFactory.regexpLike_predicateFunction();
 	}
 
 	/**
@@ -651,7 +665,7 @@ public String extractPattern(TemporalUnit unit) {
 
 	@Override @SuppressWarnings("deprecation")
 	public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType, IntervalType intervalType) {
-		final StringBuilder pattern = new StringBuilder();
+		final var pattern = new StringBuilder();
 		switch ( unit ) {
 			case YEAR:
 				pattern.append( ADD_YEAR_EXPRESSION );
@@ -694,7 +708,7 @@ public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType,
 
 	@Override @SuppressWarnings("deprecation")
 	public String timestampdiffPattern(TemporalUnit unit, TemporalType fromTemporalType, TemporalType toTemporalType) {
-		final StringBuilder pattern = new StringBuilder();
+		final var pattern = new StringBuilder();
 		final boolean hasTimePart = toTemporalType != TemporalType.DATE || fromTemporalType != TemporalType.DATE;
 		switch ( unit ) {
 			case YEAR:
@@ -839,7 +853,7 @@ protected String columnType(int sqlTypeCode) {
 	@Override
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.registerColumnTypes( typeContributions, serviceRegistry );
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( SQLXML, "SYS.XMLTYPE", this ) );
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( GEOMETRY, "MDSYS.SDO_GEOMETRY", this ) );
@@ -997,7 +1011,7 @@ public Exporter<UserDefinedType> getUserDefinedTypeExporter() {
 
 	@Override
 	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-		final ConfigurationService configurationService = serviceRegistry.requireService( ConfigurationService.class );
+		final var configurationService = serviceRegistry.requireService( ConfigurationService.class );
 		useBinaryFloat = configurationService.getSetting( ORACLE_USE_BINARY_FLOATS, StandardConverters.BOOLEAN, true );
 
 		super.contributeTypes( typeContributions, serviceRegistry );
@@ -1079,7 +1093,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		);
 
 		if ( getVersion().isSameOrAfter(23) ) {
-			final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
+			final var jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
 			jdbcTypeRegistry.addDescriptor( OracleEnumJdbcType.INSTANCE );
 			jdbcTypeRegistry.addDescriptor( OracleOrdinalEnumJdbcType.INSTANCE );
 		}
@@ -1139,6 +1153,11 @@ public boolean supportsIfExistsAfterAlterTable() {
 		return getVersion().isSameOrAfter( 23 );
 	}
 
+	@Override
+	public boolean supportsIfExistsBeforeIndexName() {
+		return getVersion().isSameOrAfter( 23 );
+	}
+
 	@Override
 	public boolean supportsIfExistsBeforeTypeName() {
 		return getVersion().isSameOrAfter( 23 );
@@ -1426,7 +1445,7 @@ public boolean supportsPartitionBy() {
 	}
 
 	private String statementType(String sql) {
-		final Matcher matcher = SQL_STATEMENT_TYPE_PATTERN.matcher( sql );
+		final var matcher = SQL_STATEMENT_TYPE_PATTERN.matcher( sql );
 		if ( matcher.matches() && matcher.groupCount() == 1 ) {
 			return matcher.group(1);
 		}
@@ -1698,7 +1717,9 @@ public ResultSet getResultSet(CallableStatement statement, String name) throws S
 
 	@Override
 	public String generatedAs(String generatedAs) {
-		return " generated always as (" + generatedAs + ")";
+		return generatedAs.startsWith( "row " )
+				? ""
+				: " generated always as (" + generatedAs + ")";
 	}
 
 	@Override
@@ -1773,7 +1794,7 @@ public String getEnumTypeDeclaration(String name, String[] values) {
 
 	@Override
 	public String[] getCreateEnumTypeCommand(String name, String[] values) {
-		final StringBuilder domain = new StringBuilder();
+		final var domain = new StringBuilder();
 		domain.append( "create domain " )
 				.append( name )
 				.append( " as enum (" );
@@ -1793,7 +1814,7 @@ public String[] getCreateEnumTypeCommand(String name, String[] values) {
 	 * @return the DDL command to create that enum
 	 */
 	public static String[] getCreateVarcharEnumTypeCommand(String name, String[] values) {
-		final StringBuilder domain = new StringBuilder();
+		final var domain = new StringBuilder();
 		domain.append( "create domain " )
 				.append( name )
 				.append( " as enum (" );
@@ -1882,4 +1903,13 @@ public InformationExtractor getInformationExtractor(ExtractionContext extraction
 		return new InformationExtractorOracleImpl( extractionContext );
 	}
 
+	@Override
+	public TemporalTableSupport getTemporalTableSupport() {
+		return new OracleTemporalTableSupport( this );
+	}
+
+	@Override //TODO: DELETEME
+	public boolean throttleDdl() {
+		return true;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonArrayJdbcType.java
index c19501402183..e405119b1e41 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonArrayJdbcType.java
@@ -7,7 +7,6 @@
 import oracle.jdbc.OracleType;
 import oracle.jdbc.driver.DatabaseError;
 import oracle.sql.json.OracleJsonDatum;
-import oracle.sql.json.OracleJsonGenerator;
 
 import org.hibernate.dialect.type.OracleJsonArrayJdbcType;
 import org.hibernate.type.descriptor.ValueBinder;
@@ -25,7 +24,6 @@
 import org.hibernate.type.format.OsonDocumentWriter;
 
 import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.sql.CallableStatement;
@@ -62,17 +60,17 @@ public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
 		return new BasicBinder<>( javaType, this ) {
 
 			private <T> byte[] toOsonStream(T value, JavaType<T> javaType, WrapperOptions options) throws Exception {
-				final Object[] domainObjects = javaType.unwrap( value, Object[].class, options );
-				final ByteArrayOutputStream out = new ByteArrayOutputStream();
-				try (OracleJsonGenerator generator = OSON_JSON_FACTORY.createJsonBinaryGenerator( out )) {
-					final JavaType<?> elementJavaType = ((BasicPluralJavaType<?>) javaType).getElementJavaType();
+				final var domainObjects = javaType.unwrap( value, Object[].class, options );
+				final var out = new ByteArrayOutputStream();
+				try ( var generator = OSON_JSON_FACTORY.createJsonBinaryGenerator( out ) ) {
+					final var elementJavaType = ((BasicPluralJavaType<?>) javaType).getElementJavaType();
 					if ( elementJavaType instanceof UnknownBasicJavaType<?> ) {
-						try (Closeable osonGen = OracleOsonJacksonHelper.createWriteTarget( out )) {
+						try ( var osonGen = OracleOsonJacksonHelper.createWriteTarget( out ) ) {
 							options.getJsonFormatMapper().writeToTarget( value, javaType, osonGen, options );
 						}
 					}
 					else {
-						final OsonDocumentWriter writer = new OsonDocumentWriter( generator );
+						final var writer = new OsonDocumentWriter( generator );
 						JsonGeneratingVisitor.INSTANCE.visitArray( elementJavaType, getElementJdbcType(), domainObjects, options, writer );
 					}
 				}
@@ -80,7 +78,7 @@ private <T> byte[] toOsonStream(T value, JavaType<T> javaType, WrapperOptions op
 			}
 
 			private boolean useUtf8(WrapperOptions options) {
-				final JavaType<?> elementJavaType = ((BasicPluralJavaType<?>) getJavaType()).getElementJavaType();
+				final var elementJavaType = ((BasicPluralJavaType<?>) getJavaType()).getElementJavaType();
 				return elementJavaType instanceof UnknownBasicJavaType<?>
 					&& !options.getJsonFormatMapper().supportsTargetType( OracleOsonJacksonHelper.WRITER_CLASS );
 			}
@@ -136,7 +134,7 @@ public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
 
 			private X fromOson(InputStream osonBytes, WrapperOptions options) throws Exception {
 				if ( ((BasicPluralJavaType<?>) getJavaType()).getElementJavaType() instanceof UnknownBasicJavaType<?> ) {
-					try (Closeable oParser = OracleOsonJacksonHelper.createReadSource( osonBytes )) {
+					try ( var oParser = OracleOsonJacksonHelper.createReadSource( osonBytes ) ) {
 						return options.getJsonFormatMapper().readFromSource( getJavaType(), oParser, options );
 					}
 				}
@@ -165,7 +163,7 @@ private X doExtraction(OracleJsonDatum datum,  WrapperOptions options) throws SQ
 			}
 
 			private boolean useUtf8(WrapperOptions options) {
-				final JavaType<?> elementJavaType = ((BasicPluralJavaType<?>) getJavaType()).getElementJavaType();
+				final var elementJavaType = ((BasicPluralJavaType<?>) getJavaType()).getElementJavaType();
 				return elementJavaType instanceof UnknownBasicJavaType<?>
 					&& !options.getJsonFormatMapper().supportsTargetType( OracleOsonJacksonHelper.READER_CLASS );
 			}
@@ -214,7 +212,7 @@ protected X doExtract(CallableStatement statement, int index, WrapperOptions opt
 						return fromString( statement.getBytes( index ), options );
 					}
 					else {
-						OracleJsonDatum ojd = statement.getObject( index, OracleJsonDatum.class );
+						final var ojd = statement.getObject( index, OracleJsonDatum.class );
 						return doExtraction( ojd, options );
 					}
 				}
@@ -240,7 +238,7 @@ protected X doExtract(CallableStatement statement, String name, WrapperOptions o
 						return fromString( statement.getBytes( name ), options );
 					}
 					else {
-						OracleJsonDatum ojd = statement.getObject( name, OracleJsonDatum.class );
+						final var ojd = statement.getObject( name, OracleJsonDatum.class );
 						return doExtraction( ojd, options );
 					}
 				}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJdbcType.java
index a195cfd8cf29..43d907844314 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJdbcType.java
@@ -8,7 +8,6 @@
 import oracle.jdbc.driver.DatabaseError;
 import oracle.sql.json.OracleJsonDatum;
 import oracle.sql.json.OracleJsonFactory;
-import oracle.sql.json.OracleJsonGenerator;
 import org.hibernate.dialect.type.OracleJsonJdbcType;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
@@ -25,7 +24,6 @@
 import org.hibernate.type.format.OsonDocumentWriter;
 
 import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.sql.CallableStatement;
@@ -74,10 +72,10 @@ public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
 		return new BasicBinder<>( javaType, this ) {
 
 			private <T> byte[] toOson(T value, JavaType<T> javaType, WrapperOptions options) throws Exception {
-				final ByteArrayOutputStream out = new ByteArrayOutputStream();
+				final var out = new ByteArrayOutputStream();
 				if ( getEmbeddableMappingType() != null ) {
 					// OracleJsonFactory is used and not OracleOsonFactory as Jackson is not involved here
-					try (OracleJsonGenerator generator = OSON_JSON_FACTORY.createJsonBinaryGenerator( out )) {
+					try ( var generator = OSON_JSON_FACTORY.createJsonBinaryGenerator( out ) ) {
 						JsonGeneratingVisitor.INSTANCE.visit(
 								getEmbeddableMappingType(),
 								value,
@@ -87,7 +85,7 @@ private <T> byte[] toOson(T value, JavaType<T> javaType, WrapperOptions options)
 					}
 				}
 				else {
-					try (Closeable osonGen = OracleOsonJacksonHelper.createWriteTarget( out )) {
+					try ( var osonGen = OracleOsonJacksonHelper.createWriteTarget( out ) ) {
 						options.getJsonFormatMapper().writeToTarget( value, javaType, osonGen, options );
 					}
 				}
@@ -162,7 +160,7 @@ private X fromOson(InputStream osonBytes, WrapperOptions options) throws Excepti
 					);
 				}
 				else {
-					try (Closeable osonParser = OracleOsonJacksonHelper.createReadSource( osonBytes )) {
+					try ( var osonParser = OracleOsonJacksonHelper.createReadSource( osonBytes ) ) {
 						return options.getJsonFormatMapper().readFromSource( getJavaType(), osonParser, options );
 					}
 				}
@@ -177,7 +175,7 @@ private X doExtraction(OracleJsonDatum datum, WrapperOptions options) throws SQL
 				if ( datum == null ) {
 					return null;
 				}
-				InputStream osonBytes = datum.getStream();
+				final var osonBytes = datum.getStream();
 				try {
 					return fromOson( osonBytes, options );
 				}
@@ -238,7 +236,7 @@ protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) thro
 				}
 				else {
 					try {
-						OracleJsonDatum ojd = rs.getObject( paramIndex, OracleJsonDatum.class );
+						final var ojd = rs.getObject( paramIndex, OracleJsonDatum.class );
 						return doExtraction( ojd, options );
 					}
 					catch (SQLException exc) {
@@ -263,7 +261,7 @@ protected X doExtract(CallableStatement statement, int index, WrapperOptions opt
 				}
 				else {
 					try {
-						OracleJsonDatum ojd = statement.getObject( index, OracleJsonDatum.class );
+						final var ojd = statement.getObject( index, OracleJsonDatum.class );
 						return doExtraction( ojd, options );
 					}
 					catch (SQLException exc) {
@@ -289,7 +287,7 @@ protected X doExtract(CallableStatement statement, String name, WrapperOptions o
 				}
 				else {
 					try {
-						OracleJsonDatum ojd = statement.getObject( name, OracleJsonDatum.class );
+						final var ojd = statement.getObject( name, OracleJsonDatum.class );
 						return doExtraction( ojd, options );
 					}
 					catch (SQLException exc) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleServerConfiguration.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleServerConfiguration.java
index 3bed6d31b58e..65a873a3c964 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleServerConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleServerConfiguration.java
@@ -12,7 +12,6 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Map;
 
 import org.hibernate.Internal;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
@@ -84,7 +83,7 @@ public OracleServerConfiguration(
 	public static OracleServerConfiguration fromDialectResolutionInfo(DialectResolutionInfo info) {
 
 		// default to the dialect-specific configuration settings
-		final Map<String, Object> configuration = info.getConfigurationValues();
+		final var configuration = info.getConfigurationValues();
 		final boolean defaultExtended = getBoolean( ORACLE_EXTENDED_STRING_SIZE, configuration );
 		final boolean defaultAutonomous =  getBoolean( ORACLE_AUTONOMOUS_DATABASE, configuration );
 		final boolean defaultContinuity = getBoolean( ORACLE_APPLICATION_CONTINUITY, configuration );
@@ -114,8 +113,8 @@ public static OracleServerConfiguration fromDialectResolutionInfo(DialectResolut
 			majorVersion = databaseMetaData.getDriverMajorVersion();
 			minorVersion = databaseMetaData.getDriverMinorVersion();
 			try {
-				final Connection connection = databaseMetaData.getConnection(); // we should not close this
-				try ( final Statement statement = connection.createStatement() ) {
+				final var connection = databaseMetaData.getConnection(); // we should not close this
+				try ( final var statement = connection.createStatement() ) {
 					applicationContinuity = determineApplicationContinuity( connection, statement );
 					autonomous = isAutonomous( statement );
 					extended = isExtended( statement );
@@ -132,11 +131,11 @@ public static OracleServerConfiguration fromDialectResolutionInfo(DialectResolut
 	}
 
 	private static boolean isExtended(Statement statement) {
-		try (final ResultSet resultSet =
+		try ( final var resultSet =
 					statement.executeQuery( "select property_value from database_properties "
-													+ "where property_name = 'MAX_STRING_SIZE'" )) {
+													+ "where property_name = 'MAX_STRING_SIZE'" ) ) {
 			return resultSet.next()
-					&& "EXTENDED".equalsIgnoreCase( resultSet.getString( 1 ) );
+				&& "EXTENDED".equalsIgnoreCase( resultSet.getString( 1 ) );
 		}
 		catch (SQLException ex) {
 			return false;
@@ -162,7 +161,7 @@ private static Boolean determineApplicationContinuity(Connection connection, Sta
 			final Long totalRequestsBefore = (Long) getTotalRequests.invoke( before );
 			final Long protectedCallsBefore = (Long) getTotalProtectedCalls.invoke( before );
 
-			try ( final ResultSet resultSet = statement.executeQuery("select 1") ) {
+			try ( final var resultSet = statement.executeQuery("select 1") ) {
 				resultSet.next();
 			}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
index 6621a58cd495..50e85083aa1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
@@ -30,6 +30,8 @@
 import org.hibernate.dialect.sequence.PostgreSQLSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.dialect.sql.ast.PostgreSQLSqlAstTranslator;
+import org.hibernate.dialect.temporal.PostgreSQLTemporalTableSupport;
+import org.hibernate.dialect.temporal.TemporalTableSupport;
 import org.hibernate.dialect.temptable.StandardLocalTemporaryTableStrategy;
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
 import org.hibernate.dialect.type.PgJdbcHelper;
@@ -85,6 +87,7 @@
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.internal.OptionalTableUpdate;
+import org.hibernate.sql.model.jdbc.OptionalTableUpdateWithUpsertOperation;
 import org.hibernate.tool.schema.extract.internal.InformationExtractorPostgreSQLImpl;
 import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
 import org.hibernate.tool.schema.extract.spi.ExtractionContext;
@@ -97,7 +100,6 @@
 import org.hibernate.type.descriptor.jdbc.ClobJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.ObjectNullAsBinaryTypeJdbcType;
-import org.hibernate.type.descriptor.jdbc.SqlTypedJdbcType;
 import org.hibernate.type.descriptor.jdbc.XmlJdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.ArrayDdlTypeImpl;
@@ -106,7 +108,6 @@
 import org.hibernate.type.descriptor.sql.internal.NamedNativeEnumDdlTypeImpl;
 import org.hibernate.type.descriptor.sql.internal.NamedNativeOrdinalEnumDdlTypeImpl;
 import org.hibernate.type.descriptor.sql.internal.Scale6IntervalSecondDdlType;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import java.sql.CallableStatement;
@@ -160,27 +161,25 @@
 import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithMicros;
 import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithMillis;
 
-/**
- * A {@linkplain Dialect SQL dialect} for PostgreSQL 13 and above.
- * <p>
- * Please refer to the
- * <a href="https://www.postgresql.org/docs/current/index.html">PostgreSQL documentation</a>.
- *
- * @author Gavin King
- */
+/// A {@linkplain Dialect SQL dialect} for PostgreSQL 14 and above.
+///
+/// Please refer to the
+/// <a href="https://www.postgresql.org/docs/current/index.html">PostgreSQL documentation</a>.
+///
+/// @author Gavin King
+/// @author Yoobin Yoon
 public class PostgreSQLDialect extends Dialect {
-	protected final static DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 13 );
+	protected final static DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 14 );
 
 	private final UniqueDelegate uniqueDelegate = new CreateTableUniqueDelegate(this);
 	private final StandardTableExporter postgresqlTableExporter = new StandardTableExporter( this ) {
 		@Override
 		protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
-			final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
-			if ( jdbcType.isXml() ) {
-				// Requires the use of xmltable which is not supported in check constraints
-				return;
+			final var jdbcType = aggregateColumn.getType().getJdbcType();
+			if ( !jdbcType.isXml() ) {
+				super.applyAggregateColumnCheck( buf, aggregateColumn );
 			}
-			super.applyAggregateColumnCheck( buf, aggregateColumn );
+			// Otherwise requires the use of XMLTABLE which is not supported in check constraints
 		}
 	};
 
@@ -275,7 +274,11 @@ protected String castType(int sqlTypeCode) {
 	@Override
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.registerColumnTypes( typeContributions, serviceRegistry );
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		registerPostgreSQLColumnTypes( typeContributions, serviceRegistry );
+	}
+
+	protected void registerPostgreSQLColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 
 		// We need to configure that the array type uses the raw element type for casts
 		ddlTypeRegistry.addDescriptor( new ArrayDdlTypeImpl( this, true ) );
@@ -373,7 +376,8 @@ public JdbcType resolveSqlTypeDescriptor(
 				// PostgreSQL names array types by prepending an underscore to the base name
 				if ( columnTypeName.charAt( 0 ) == '_' ) {
 					final String componentTypeName = columnTypeName.substring( 1 );
-					final Integer sqlTypeCode = resolveSqlTypeCode( componentTypeName, jdbcTypeRegistry.getTypeConfiguration() );
+					final Integer sqlTypeCode =
+							resolveSqlTypeCode( componentTypeName, jdbcTypeRegistry.getTypeConfiguration() );
 					if ( sqlTypeCode != null ) {
 						return jdbcTypeRegistry.resolveTypeConstructorDescriptor(
 								jdbcTypeCode,
@@ -381,7 +385,7 @@ public JdbcType resolveSqlTypeDescriptor(
 								ColumnTypeInformation.EMPTY
 						);
 					}
-					final SqlTypedJdbcType elementDescriptor = jdbcTypeRegistry.findSqlTypedDescriptor( componentTypeName );
+					final var elementDescriptor = jdbcTypeRegistry.findSqlTypedDescriptor( componentTypeName );
 					if ( elementDescriptor != null ) {
 						return jdbcTypeRegistry.resolveTypeConstructorDescriptor(
 								jdbcTypeCode,
@@ -392,7 +396,7 @@ public JdbcType resolveSqlTypeDescriptor(
 				}
 				break;
 			case STRUCT:
-				final SqlTypedJdbcType descriptor = jdbcTypeRegistry.findSqlTypedDescriptor(
+				final var descriptor = jdbcTypeRegistry.findSqlTypedDescriptor(
 						// Skip the schema
 						columnTypeName.substring( columnTypeName.indexOf( '.' ) + 1 )
 				);
@@ -424,7 +428,7 @@ public String getEnumTypeDeclaration(String name, String[] values) {
 
 	@Override
 	public String[] getCreateEnumTypeCommand(String name, String[] values) {
-		StringBuilder type = new StringBuilder();
+		final var type = new StringBuilder();
 		type.append( "create type " )
 				.append( name )
 				.append( " as enum (" );
@@ -463,12 +467,10 @@ public String currentTimestampWithTimeZone() {
 		return "current_timestamp";
 	}
 
-	/**
-	 * The {@code extract()} function returns {@link TemporalUnit#DAY_OF_WEEK}
-	 * numbered from 0 to 6. This isn't consistent with what most other
-	 * databases do, so here we adjust the result by generating
-	 * {@code (extract(dow,arg)+1))}.
-	 */
+	/// The `extract()` function returns [TemporalUnit#DAY_OF_WEEK]
+	/// numbered from 0 to 6. This isn't consistent with what most other
+	/// databases do, so here we adjust the result by generating
+	/// `(extract(dow,arg)+1))`.
 	@Override
 	public String extractPattern(TemporalUnit unit) {
 		return switch (unit) {
@@ -487,14 +489,12 @@ public String castPattern(CastType from, CastType to) {
 		}
 	}
 
-	/**
-	 * {@code microsecond} is the smallest unit for an {@code interval},
-	 * and the highest precision for a {@code timestamp}, so we could
-	 * use it as the "native" precision, but it's more convenient to use
-	 * whole seconds (with the fractional part), since we want to use
-	 * {@code extract(epoch from ...)} in our emulation of
-	 * {@code timestampdiff()}.
-	 */
+	/// `microsecond` is the smallest unit for an `interval`,
+	/// and the highest precision for a `timestamp`, so we could
+	/// use it as the "native" precision, but it's more convenient to use
+	/// whole seconds (with the fractional part), since we want to use
+	/// `extract(epoch from ...)` in our emulation of
+	/// `timestampdiff()`.
 	@Override
 	public long getFractionalSecondPrecisionInNanos() {
 		return 1_000_000_000; //seconds
@@ -581,7 +581,6 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.translate();
 		functionFactory.toCharNumberDateTimestamp();
 		functionFactory.concat_pipeOperator( "convert_from(lo_get(?1),pg_client_encoding())" );
-		functionFactory.localtimeLocaltimestamp();
 		functionFactory.length_characterLength_pattern( "length(lo_get(?1),pg_client_encoding())" );
 		functionFactory.bitLength_pattern( "bit_length(?1)", "length(lo_get(?1))*8" );
 		functionFactory.octetLength_pattern( "octet_length(?1)", "length(lo_get(?1))" );
@@ -591,46 +590,84 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.bitandorxornot_operator();
 		functionFactory.bitAndOr();
 		functionFactory.everyAny_boolAndOr();
+		functionFactory.corr();
+		functionFactory.regrLinearRegressionAggregates();
+		functionFactory.soundex(); //was introduced in Postgres 9 apparently
+
+		functionFactory.locate_positionSubstring();
+		functionFactory.windowFunctions();
+		functionFactory.listagg_stringAgg( "varchar" );
+
+		registerArrayFunctions( functionFactory );
+		registerJsonFunction( functionFactory );
+		registerXmlFunctions( functionFactory );
+		registerUtilityFunctions( functionContributions );
+	}
+
+	protected void registerUtilityFunctions( FunctionContributions functionContributions ) {
+		final var functionFactory = new CommonFunctionFactory( functionContributions );
+		final var functionRegistry =  functionContributions.getFunctionRegistry();
+
+		functionFactory.localtimeLocaltimestamp();
+
 		functionFactory.median_percentileCont( false );
 		functionFactory.stddev();
 		functionFactory.stddevPopSamp();
 		functionFactory.variance();
 		functionFactory.varPopSamp();
 		functionFactory.covarPopSamp();
-		functionFactory.corr();
-		functionFactory.regrLinearRegressionAggregates();
 		functionFactory.insert_overlay();
 		functionFactory.overlay();
-		functionFactory.soundex(); //was introduced in Postgres 9 apparently
 
-		functionFactory.locate_positionSubstring();
-		functionFactory.windowFunctions();
-		functionFactory.listagg_stringAgg( "varchar" );
-		functionFactory.array_postgresql();
-		functionFactory.arrayAggregate();
-		functionFactory.arrayPosition_postgresql();
-		functionFactory.arrayPositions_postgresql();
-		functionFactory.arrayLength_cardinality();
-		functionFactory.arrayConcat_postgresql();
-		functionFactory.arrayPrepend_postgresql();
-		functionFactory.arrayAppend_postgresql();
-		functionFactory.arrayContains_postgresql();
-		functionFactory.arrayIntersects_postgresql();
-		functionFactory.arrayGet_bracket();
-		functionFactory.arraySet_unnest();
-		functionFactory.arrayRemove();
-		functionFactory.arrayRemoveIndex_unnest( true );
-		functionFactory.arraySlice_operator();
-		functionFactory.arrayReplace();
-		if ( getVersion().isSameOrAfter( 14 ) ) {
-			functionFactory.arrayTrim_trim_array();
-		}
-		else {
-			functionFactory.arrayTrim_unnest();
+		functionFactory.makeDateTimeTimestamp();
+		// Note that PostgreSQL doesn't support the OVER clause for ordered set-aggregate functions
+		functionFactory.inverseDistributionOrderedSetAggregates();
+		functionFactory.hypotheticalOrderedSetAggregates();
+
+		if ( !supportsMinMaxOnUuid() ) {
+			functionRegistry.register( "min", new PostgreSQLMinMaxFunction( "min" ) );
+			functionRegistry.register( "max", new PostgreSQLMinMaxFunction( "max" ) );
 		}
-		functionFactory.arrayFill_postgresql();
-		functionFactory.arrayToString_postgresql();
 
+		// Postgres uses # instead of ^ for XOR
+		functionRegistry.patternDescriptorBuilder( "bitxor", "(?1#?2)" )
+				.setExactArgumentCount( 2 )
+				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.register();
+
+		functionRegistry.register(
+				"round", new PostgreSQLTruncRoundFunction( "round", true )
+		);
+		functionRegistry.register(
+				"trunc",
+				new PostgreSQLTruncFunction( true, functionContributions.getTypeConfiguration() )
+		);
+		functionRegistry.registerAlternateKey( "truncate", "trunc" );
+		functionFactory.dateTrunc();
+
+		functionFactory.unnest_postgresql( getVersion().isSameOrAfter( 17 ) );
+		functionFactory.generateSeries( null, "ordinality", false );
+
+		functionFactory.hex( "encode(?1, 'hex')" );
+		functionFactory.sha( "sha256(?1)" );
+		functionFactory.md5( "decode(md5(?1), 'hex')" );
+
+		functionFactory.regexpLike_postgresql( getVersion().isSameOrAfter( 15 ) );
+	}
+
+	protected void registerXmlFunctions(CommonFunctionFactory functionFactory) {
+		functionFactory.xmlelement();
+		functionFactory.xmlcomment();
+		functionFactory.xmlforest();
+		functionFactory.xmlconcat();
+		functionFactory.xmlpi();
+		functionFactory.xmlquery_postgresql();
+		functionFactory.xmlexists();
+		functionFactory.xmlagg();
+		functionFactory.xmltable( true );
+	}
+
+	protected void registerJsonFunction(CommonFunctionFactory functionFactory) {
 		if ( getVersion().isSameOrAfter( 17 ) ) {
 			functionFactory.jsonValue_postgresql( true );
 			functionFactory.jsonQuery();
@@ -667,51 +704,37 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.jsonMergepatch_postgresql();
 		functionFactory.jsonArrayAppend_postgresql( true );
 		functionFactory.jsonArrayInsert_postgresql();
+	}
 
-		functionFactory.xmlelement();
-		functionFactory.xmlcomment();
-		functionFactory.xmlforest();
-		functionFactory.xmlconcat();
-		functionFactory.xmlpi();
-		functionFactory.xmlquery_postgresql();
-		functionFactory.xmlexists();
-		functionFactory.xmlagg();
-		functionFactory.xmltable( true );
-
-		functionFactory.makeDateTimeTimestamp();
-		// Note that PostgreSQL doesn't support the OVER clause for ordered set-aggregate functions
-		functionFactory.inverseDistributionOrderedSetAggregates();
-		functionFactory.hypotheticalOrderedSetAggregates();
+	protected void registerArrayFunctions(CommonFunctionFactory functionFactory) {
+		functionFactory.array_postgresql();
+		functionFactory.arrayAggregate();
+		functionFactory.arrayPosition_postgresql();
+		functionFactory.arrayPositions_postgresql();
+		functionFactory.arrayLength_cardinality();
+		functionFactory.arrayConcat_postgresql();
+		functionFactory.arrayPrepend_postgresql();
+		functionFactory.arrayAppend_postgresql();
+		functionFactory.arrayContains_postgresql();
+		functionFactory.arrayIntersects_postgresql();
+		functionFactory.arrayGet_bracket();
+		functionFactory.arraySet_unnest();
+		functionFactory.arrayRemove();
+		functionFactory.arrayRemoveIndex_unnest( true );
+		functionFactory.arraySlice_operator();
+		functionFactory.arrayReplace();
+		functionFactory.arrayTrim_trim_array();
 
-		if ( !supportsMinMaxOnUuid() ) {
-			functionContributions.getFunctionRegistry().register( "min", new PostgreSQLMinMaxFunction( "min" ) );
-			functionContributions.getFunctionRegistry().register( "max", new PostgreSQLMinMaxFunction( "max" ) );
+		if ( getVersion().isSameOrAfter( 18 ) ) {
+			functionFactory.arrayReverse();
+			functionFactory.arraySort();
 		}
-
-		// Postgres uses # instead of ^ for XOR
-		functionContributions.getFunctionRegistry().patternDescriptorBuilder( "bitxor", "(?1#?2)" )
-				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
-				.register();
-
-		functionContributions.getFunctionRegistry().register(
-				"round", new PostgreSQLTruncRoundFunction( "round", true )
-		);
-		functionContributions.getFunctionRegistry().register(
-				"trunc",
-				new PostgreSQLTruncFunction( true, functionContributions.getTypeConfiguration() )
-		);
-		functionContributions.getFunctionRegistry().registerAlternateKey( "truncate", "trunc" );
-		functionFactory.dateTrunc();
-
-		functionFactory.unnest_postgresql( getVersion().isSameOrAfter( 17 ) );
-		functionFactory.generateSeries( null, "ordinality", false );
-
-		functionFactory.hex( "encode(?1, 'hex')" );
-		functionFactory.sha( "sha256(?1)" );
-		functionFactory.md5( "decode(md5(?1), 'hex')" );
-
-		functionFactory.regexpLike_postgresql( getVersion().isSameOrAfter( 15 ) );
+		else {
+			functionFactory.arrayReverse_unnest();
+			functionFactory.arraySort_unnest();
+		}
+		functionFactory.arrayFill_postgresql();
+		functionFactory.arrayToString_postgresql();
 	}
 
 	@Override
@@ -719,51 +742,49 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		return "ordinality";
 	}
 
-	/**
-	 * Whether PostgreSQL supports {@code min(uuid)}/{@code max(uuid)},
-	 * which it doesn't by default. Since the emulation does not perform well,
-	 * this method may be overridden by any user who ensures that aggregate
-	 * functions for handling uuids exist in the database.
-	 * <p>
-	 * The following definitions can be used for this purpose:
-	 * <code><pre>
-	 * create or replace function min(uuid, uuid)
-	 *     returns uuid
-	 *     immutable parallel safe
-	 *     language plpgsql as
-	 * $$
-	 * begin
-	 *     return least($1, $2);
-	 * end
-	 * $$;
-	 *
-	 * create aggregate min(uuid) (
-	 *     sfunc = min,
-	 *     stype = uuid,
-	 *     combinefunc = min,
-	 *     parallel = safe,
-	 *     sortop = operator (&lt;)
-	 *     );
-	 *
-	 * create or replace function max(uuid, uuid)
-	 *     returns uuid
-	 *     immutable parallel safe
-	 *     language plpgsql as
-	 * $$
-	 * begin
-	 *     return greatest($1, $2);
-	 * end
-	 * $$;
-	 *
-	 * create aggregate max(uuid) (
-	 *     sfunc = max,
-	 *     stype = uuid,
-	 *     combinefunc = max,
-	 *     parallel = safe,
-	 *     sortop = operator (&gt;)
-	 *     );
-	 * </pre></code>
-	 */
+	/// Whether PostgreSQL supports `min(uuid)`/`max(uuid)`,
+	/// which it doesn't by default. Since the emulation does not perform well,
+	/// this method may be overridden by any user who ensures that aggregate
+	/// functions for handling uuids exist in the database.
+	///
+	/// The following definitions can be used for this purpose:
+	/// ```sql
+	/// create or replace function min(uuid, uuid)
+	///     returns uuid
+	///     immutable parallel safe
+	///     language plpgsql as
+	/// $$
+	/// begin
+	///     return least($1, $2);
+	/// end
+	/// $$;
+	///
+	/// create aggregate min(uuid) (
+	///     sfunc = min,
+	///     stype = uuid,
+	///     combinefunc = min,
+	///     parallel = safe,
+	///     sortop = operator (&lt;)
+	///     );
+	///
+	/// create or replace function max(uuid, uuid)
+	///     returns uuid
+	///     immutable parallel safe
+	///     language plpgsql as
+	/// $$
+	/// begin
+	///     return greatest($1, $2);
+	/// end
+	/// $$;
+	///
+	/// create aggregate max(uuid) (
+	///     sfunc = max,
+	///     stype = uuid,
+	///     combinefunc = max,
+	///     parallel = safe,
+	///     sortop = operator (&gt;)
+	///     );
+	/// ```
 	protected boolean supportsMinMaxOnUuid() {
 		return false;
 	}
@@ -805,6 +826,11 @@ public boolean supportsIfExistsAfterAlterTable() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsIfExistsBeforeIndexName() {
+		return true;
+	}
+
 	@Override
 	public String getBeforeDropStatement() {
 		// by default, the Postgres driver reports
@@ -901,6 +927,12 @@ public boolean supportsCaseInsensitiveLike() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsNotNullAfterGeneratedAs() {
+		// actually it is allowed for 'generated always as (...) stored'
+		return false;
+	}
+
 	@Override
 	public String generatedAs(String generatedAs) {
 		return getVersion().isSameOrAfter( 18 )
@@ -934,12 +966,13 @@ public String getSelectClauseNullString(int sqlType, TypeConfiguration typeConfi
 
 	@Override
 	public String getSelectClauseNullString(SqlTypedMapping sqlType, TypeConfiguration typeConfiguration) {
-		final DdlTypeRegistry ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
-		final String castTypeName = ddlTypeRegistry
-				.getDescriptor( sqlType.getJdbcMapping().getJdbcType().getDdlTypeCode() )
-				.getCastTypeName( sqlType.toSize(), (SqlExpressible) sqlType.getJdbcMapping(), ddlTypeRegistry );
+		final var ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
+		final var jdbcMapping = sqlType.getJdbcMapping();
+		final String castTypeName =
+				ddlTypeRegistry.getDescriptor( jdbcMapping.getJdbcType().getDdlTypeCode() )
+						.getCastTypeName( sqlType.toSize(), (SqlExpressible) jdbcMapping, ddlTypeRegistry );
 		// PostgreSQL assumes a plain null literal in the select statement to be of type text,
-		// which can lead to issues in e.g. the union subclass strategy, so do a cast
+		// which can lead to issues in, for example, the union subclass strategy, so do a cast.
 		return "cast(null as " + castTypeName + ")";
 	}
 
@@ -968,6 +1001,11 @@ public String getCurrentTimestampSelectString() {
 		return "select now()";
 	}
 
+	@Override
+	public boolean isCurrentTimestampStable() {
+		return true;
+	}
+
 	@Override
 	public boolean supportsTupleCounts() {
 		return true;
@@ -1035,10 +1073,8 @@ public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
 		return EXTRACTOR;
 	}
 
-	/**
-	 * Constraint-name extractor for Postgres constraint violation exceptions.
-	 * Originally contributed by Denny Bartelt.
-	 */
+	/// Constraint-name extractor for Postgres constraint violation exceptions.
+	/// Originally contributed by Denny Bartelt.
 	private static final ViolatedConstraintNameExtractor EXTRACTOR =
 			new TemplatedViolatedConstraintNameExtractor( sqle -> {
 				final String sqlState = extractSqlState( sqle );
@@ -1463,11 +1499,9 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		contributePostgreSQLTypes(typeContributions, serviceRegistry);
 	}
 
-	/**
-	 * Allow for extension points to override this only
-	 */
+	/// Allow for extension points to override this only
 	protected void contributePostgreSQLTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
-		final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration()
+		final var jdbcTypeRegistry = typeContributions.getTypeConfiguration()
 				.getJdbcTypeRegistry();
 		// For discussion of BLOB support in Postgres, as of 8.4, see:
 		//     http://jdbc.postgresql.org/documentation/84/binary-data.html
@@ -1539,9 +1573,7 @@ public Exporter<Table> getTableExporter() {
 		return postgresqlTableExporter;
 	}
 
-	/**
-	 * @return {@code true}, but only because we can "batch" truncate
-	 */
+	/// @return `true`, but only because we can "batch" truncate
 	@Override
 	public boolean canBatchTruncate() {
 		return true;
@@ -1582,13 +1614,10 @@ public MutationOperation createOptionalTableUpdateOperation(
 			EntityMutationTarget mutationTarget,
 			OptionalTableUpdate optionalTableUpdate,
 			SessionFactoryImplementor factory) {
-		if ( supportsMerge ) {
-			return new PostgreSQLSqlAstTranslator<>( factory, optionalTableUpdate )
-					.createMergeOperation( optionalTableUpdate );
-		}
-		else {
-			return super.createOptionalTableUpdateOperation( mutationTarget, optionalTableUpdate, factory );
-		}
+		return supportsMerge
+				? new PostgreSQLSqlAstTranslator<>( factory, optionalTableUpdate )
+						.createMergeOperation( optionalTableUpdate )
+				: new OptionalTableUpdateWithUpsertOperation( mutationTarget, optionalTableUpdate, factory );
 	}
 
 	@Override
@@ -1646,21 +1675,31 @@ public boolean supportsArrayConstructor() {
 
 	@Override
 	public boolean supportsRecursiveCycleClause() {
-		return getVersion().isSameOrAfter( 14 );
+		return true;
 	}
 
 	@Override
 	public boolean supportsRecursiveCycleUsingClause() {
-		return getVersion().isSameOrAfter( 14 );
+		return true;
 	}
 
 	@Override
 	public boolean supportsRecursiveSearchClause() {
-		return getVersion().isSameOrAfter( 14 );
+		return true;
 	}
 
 	@Override
 	public InformationExtractor getInformationExtractor(ExtractionContext extractionContext) {
 		return new InformationExtractorPostgreSQLImpl( extractionContext );
 	}
+
+	@Override
+	public boolean causesRollback(SQLException sqlException) {
+		return true;
+	}
+
+	@Override
+	public TemporalTableSupport getTemporalTableSupport() {
+		return new PostgreSQLTemporalTableSupport( this );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java
index fe925b3a2777..9422f66b101f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java
@@ -15,7 +15,6 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.sqm.CastType;
 import org.hibernate.query.common.TemporalUnit;
-import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
 import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory;
@@ -25,6 +24,8 @@
 
 import jakarta.persistence.TemporalType;
 
+import static org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE;
+
 /**
  * An SQL dialect for Postgres Plus
  *
@@ -52,33 +53,25 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		super.initializeFunctionRegistry( functionContributions );
 
 		final var functionFactory = new CommonFunctionFactory( functionContributions );
+		final var functionRegistry = functionContributions.getFunctionRegistry();
 
+		functionFactory.arrayGet_bracket( false );
 		functionFactory.soundex();
 		functionFactory.rownumRowid();
 		functionFactory.sysdate();
 		functionFactory.systimestamp();
 
-		if ( getVersion().isSameOrAfter( 14 ) ) {
-			// Support for these functions were apparently only added in version 14
-			functionFactory.bitand();
-			functionFactory.bitor();
-			functionContributions.getFunctionRegistry().patternDescriptorBuilder(
-							"bitxor",
-							"(bitor(?1,?2)-bitand(?1,?2))"
-					)
-					.setExactArgumentCount( 2 )
-					.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
-					.register();
-		}
-		else {
-			functionContributions.getFunctionRegistry().patternDescriptorBuilder(
-							"bitxor",
-							"((?1|?2)-(?1&?2))"
-					)
-					.setExactArgumentCount( 2 )
-					.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
-					.register();
-		}
+
+		// These functions were apparently only added in version 14
+		functionFactory.bitand();
+		functionFactory.bitor();
+		functionRegistry.patternDescriptorBuilder(
+				"bitxor",
+						"(bitor(?1,?2)-bitand(?1,?2))"
+				)
+				.setExactArgumentCount( 2 )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.register();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
index 46d3de5b485b..598f8b5cc2a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java
@@ -32,6 +32,8 @@
 import org.hibernate.dialect.sequence.SQLServerSequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.dialect.sql.ast.SQLServerSqlAstTranslator;
+import org.hibernate.dialect.temporal.SQLServerTemporalTableSupport;
+import org.hibernate.dialect.temporal.TemporalTableSupport;
 import org.hibernate.dialect.temptable.SQLServerLocalTemporaryTableStrategy;
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
 import org.hibernate.dialect.type.SQLServerCastingXmlArrayJdbcTypeConstructor;
@@ -77,8 +79,6 @@
 import org.hibernate.tool.schema.internal.StandardSequenceExporter;
 import org.hibernate.tool.schema.internal.StandardTableExporter;
 import org.hibernate.tool.schema.spi.Exporter;
-import org.hibernate.type.BasicType;
-import org.hibernate.type.BasicTypeRegistry;
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
@@ -87,10 +87,8 @@
 import org.hibernate.type.descriptor.jdbc.UUIDJdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 
 import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.time.temporal.ChronoField;
@@ -217,11 +215,11 @@ private static DatabaseVersion staticDetermineDatabaseVersion(DialectResolutionI
 	}
 
 	private static Integer getCompatibilityLevel(DialectResolutionInfo info) {
-		final DatabaseMetaData databaseMetaData = info.getDatabaseMetadata();
+		final var databaseMetaData = info.getDatabaseMetadata();
 		if ( databaseMetaData != null ) {
-			try ( var statement = databaseMetaData.getConnection().createStatement() ) {
-				final ResultSet resultSet =
-						statement.executeQuery( "SELECT compatibility_level FROM sys.databases where name = db_name();" );
+			try ( var statement = databaseMetaData.getConnection().createStatement();
+					var resultSet = statement.executeQuery(
+							"SELECT compatibility_level FROM sys.databases where name = db_name();" ) ) {
 				if ( resultSet.next() ) {
 					return resultSet.getInt( 1 );
 				}
@@ -283,7 +281,7 @@ protected String castType(int sqlTypeCode) {
 	@Override
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.registerColumnTypes( typeContributions, serviceRegistry );
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( GEOMETRY, "geometry", this ) );
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( GEOGRAPHY, "geography", this ) );
 		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( SQLXML, "xml", this ) );
@@ -362,11 +360,11 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 	public void initializeFunctionRegistry(FunctionContributions functionContributions) {
 		super.initializeFunctionRegistry( functionContributions );
 
-		final BasicTypeRegistry basicTypeRegistry =
+		final var basicTypeRegistry =
 				functionContributions.getTypeConfiguration().getBasicTypeRegistry();
-		final BasicType<Date> dateType = basicTypeRegistry.resolve( StandardBasicTypes.DATE );
-		final BasicType<Date> timeType = basicTypeRegistry.resolve( StandardBasicTypes.TIME );
-		final BasicType<Date> timestampType = basicTypeRegistry.resolve( StandardBasicTypes.TIMESTAMP );
+		final var dateType = basicTypeRegistry.resolve( StandardBasicTypes.DATE );
+		final var timeType = basicTypeRegistry.resolve( StandardBasicTypes.TIME );
+		final var timestampType = basicTypeRegistry.resolve( StandardBasicTypes.TIMESTAMP );
 
 		final var functionFactory = new CommonFunctionFactory( functionContributions );
 
@@ -444,37 +442,14 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.windowFunctions();
 		functionFactory.inverseDistributionOrderedSetAggregates_windowEmulation();
 		functionFactory.hypotheticalOrderedSetAggregates_windowEmulation();
-		if ( getVersion().isSameOrAfter( 13 ) ) {
-			functionFactory.jsonValue_sqlserver();
-			functionFactory.jsonQuery_sqlserver();
-			functionFactory.jsonExists_sqlserver( getVersion().isSameOrAfter( 16 ) );
-			functionFactory.jsonObject_sqlserver( getVersion().isSameOrAfter( 16 ) );
-			functionFactory.jsonArray_sqlserver( getVersion().isSameOrAfter( 16 ) );
-			functionFactory.jsonSet_sqlserver();
-			functionFactory.jsonRemove_sqlserver();
-			functionFactory.jsonReplace_sqlserver( getVersion().isSameOrAfter( 16 ) );
-			functionFactory.jsonInsert_sqlserver( getVersion().isSameOrAfter( 16 ) );
-			functionFactory.jsonArrayAppend_sqlserver( getVersion().isSameOrAfter( 16 ) );
-			functionFactory.jsonArrayInsert_sqlserver();
-			functionFactory.jsonTable_sqlserver();
-		}
 
-		functionFactory.xmlelement_sqlserver();
-		functionFactory.xmlcomment_sqlserver();
-		functionFactory.xmlforest_sqlserver();
-		functionFactory.xmlconcat_sqlserver();
-		functionFactory.xmlpi_sqlserver();
-		functionFactory.xmlquery_sqlserver();
-		functionFactory.xmlexists_sqlserver();
-		functionFactory.xmlagg_sqlserver();
-		functionFactory.xmltable_sqlserver();
+		registerJsonFunctions( functionFactory );
+		registerXmlFunctions( functionFactory );
 
 		functionFactory.unnest_sqlserver();
 
 		if ( getVersion().isSameOrAfter( 14 ) ) {
 			functionFactory.listagg_stringAggWithinGroup( "varchar(max)" );
-			functionFactory.jsonArrayAgg_sqlserver( getVersion().isSameOrAfter( 16 ) );
-			functionFactory.jsonObjectAgg_sqlserver( getVersion().isSameOrAfter( 16 ) );
 		}
 		if ( getVersion().isSameOrAfter( 16 ) ) {
 			functionFactory.leastGreatest();
@@ -501,6 +476,39 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		}
 	}
 
+	private static void registerXmlFunctions(CommonFunctionFactory functionFactory) {
+		functionFactory.xmlelement_sqlserver();
+		functionFactory.xmlcomment_sqlserver();
+		functionFactory.xmlforest_sqlserver();
+		functionFactory.xmlconcat_sqlserver();
+		functionFactory.xmlpi_sqlserver();
+		functionFactory.xmlquery_sqlserver();
+		functionFactory.xmlexists_sqlserver();
+		functionFactory.xmlagg_sqlserver();
+		functionFactory.xmltable_sqlserver();
+	}
+
+	private void registerJsonFunctions(CommonFunctionFactory functionFactory) {
+		if ( getVersion().isSameOrAfter( 13 ) ) {
+			functionFactory.jsonValue_sqlserver();
+			functionFactory.jsonQuery_sqlserver();
+			functionFactory.jsonExists_sqlserver( getVersion().isSameOrAfter( 16 ) );
+			functionFactory.jsonObject_sqlserver( getVersion().isSameOrAfter( 16 ) );
+			functionFactory.jsonArray_sqlserver( getVersion().isSameOrAfter( 16 ) );
+			functionFactory.jsonSet_sqlserver();
+			functionFactory.jsonRemove_sqlserver();
+			functionFactory.jsonReplace_sqlserver( getVersion().isSameOrAfter( 16 ) );
+			functionFactory.jsonInsert_sqlserver( getVersion().isSameOrAfter( 16 ) );
+			functionFactory.jsonArrayAppend_sqlserver( getVersion().isSameOrAfter( 16 ) );
+			functionFactory.jsonArrayInsert_sqlserver();
+			functionFactory.jsonTable_sqlserver();
+		}
+		if ( getVersion().isSameOrAfter( 14 ) ) {
+			functionFactory.jsonArrayAgg_sqlserver( getVersion().isSameOrAfter( 16 ) );
+			functionFactory.jsonObjectAgg_sqlserver( getVersion().isSameOrAfter( 16 ) );
+		}
+	}
+
 	/**
 	 * SQL Server doesn't support the {@code generate_series} function or {@code lateral} recursive CTEs,
 	 * so it has to be emulated with a top level recursive CTE which requires an upper bound on the amount
@@ -631,12 +639,17 @@ public String getCurrentSchemaCommand() {
 
 	@Override
 	public boolean supportsIfExistsBeforeTableName() {
-		return getVersion().isSameOrAfter( 16 ) || super.supportsIfExistsBeforeTableName();
+		return getVersion().isSameOrAfter( 16 );
 	}
 
 	@Override
 	public boolean supportsIfExistsBeforeConstraintName() {
-		return getVersion().isSameOrAfter( 16 ) || super.supportsIfExistsBeforeConstraintName();
+		return getVersion().isSameOrAfter( 16 );
+	}
+
+	@Override
+	public boolean supportsIfExistsBeforeIndexName() {
+		return getVersion().isSameOrAfter( 16 );
 	}
 
 	@Override
@@ -748,7 +761,7 @@ public String getQuerySequencesString() {
 
 	@Override
 	public String getQueryHintString(String sql, String hints) {
-		final StringBuilder buffer =
+		final var buffer =
 				new StringBuilder( sql.length() + hints.length() + 12 );
 		final int pos = sql.indexOf( ';' );
 		if ( pos > -1 ) {
@@ -1073,6 +1086,13 @@ public void appendDateTimeLiteral(
 		}
 	}
 
+	@Override
+	public String generatedAs(String generatedAs) {
+		return generatedAs.startsWith( "row " )
+				? " datetime2 generated always as " + generatedAs
+				: " as (" + generatedAs + ") persisted";
+	}
+
 	@Override
 	public TemporaryTableStrategy getLocalTemporaryTableStrategy() {
 		return SQLServerLocalTemporaryTableStrategy.INSTANCE;
@@ -1100,7 +1120,7 @@ public String getCreateIndexString(boolean unique) {
 	@Override
 	public String getCreateIndexTail(boolean unique, List<Column> columns) {
 		if ( unique ) {
-			final StringBuilder tail = new StringBuilder();
+			final var tail = new StringBuilder();
 			for ( Column column : columns ) {
 				if ( column.isNullable() ) {
 					tail.append( tail.isEmpty() ? " where " : " and " )
@@ -1161,11 +1181,6 @@ protected String getFormattedSequenceName(QualifiedSequenceName name, Metadata m
 		}
 	}
 
-	@Override
-	public String generatedAs(String generatedAs) {
-		return " as (" + generatedAs + ") persisted";
-	}
-
 	@Override
 	public boolean hasDataTypeBeforeGeneratedAs() {
 		return false;
@@ -1267,4 +1282,8 @@ public boolean supportsRowValueConstructorSyntaxInInList() {
 		return false;
 	}
 
+	@Override
+	public TemporalTableSupport getTemporalTableSupport() {
+		return new SQLServerTemporalTableSupport( this );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SimpleDatabaseVersion.java b/hibernate-core/src/main/java/org/hibernate/dialect/SimpleDatabaseVersion.java
index e2368af65758..847a51a0f8cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SimpleDatabaseVersion.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SimpleDatabaseVersion.java
@@ -21,20 +21,20 @@ public SimpleDatabaseVersion(DatabaseVersion copySource) {
 	}
 
 	public SimpleDatabaseVersion(DatabaseVersion version, boolean noVersionAsZero) {
-		this.major = version.getDatabaseMajorVersion();
+		major = version.getDatabaseMajorVersion();
 
 		if ( version.getDatabaseMinorVersion() == NO_VERSION ) {
-			this.minor = noVersionAsZero ? 0 : NO_VERSION;
+			minor = noVersionAsZero ? 0 : NO_VERSION;
 		}
 		else {
-			this.minor = version.getDatabaseMinorVersion();
+			minor = version.getDatabaseMinorVersion();
 		}
 
 		if ( version.getDatabaseMicroVersion() == NO_VERSION ) {
-			this.micro = noVersionAsZero ? 0 : NO_VERSION;
+			micro = noVersionAsZero ? 0 : NO_VERSION;
 		}
 		else {
-			this.micro = version.getDatabaseMicroVersion();
+			micro = version.getDatabaseMicroVersion();
 		}
 	}
 
@@ -87,7 +87,7 @@ public int getMicro() {
 
 	@Override
 	public String toString() {
-		StringBuilder version = new StringBuilder();
+		final var version = new StringBuilder();
 		if ( major != NO_VERSION ) {
 			version.append( major );
 		}
@@ -103,15 +103,18 @@ public String toString() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof SimpleDatabaseVersion that ) ) {
 			return false;
 		}
-		SimpleDatabaseVersion that = (SimpleDatabaseVersion) o;
-		return major == that.major && minor == that.minor && micro == that.micro;
+		else {
+			return major == that.major
+				&& minor == that.minor
+				&& micro == that.micro;
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java
index f1d82629dd10..c9c68d58b3a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialect.java
@@ -4,41 +4,69 @@
  */
 package org.hibernate.dialect;
 
+import jakarta.persistence.GenerationType;
 import jakarta.persistence.TemporalType;
 import jakarta.persistence.Timeout;
-import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
-import org.hibernate.StaleObjectStateException;
-import org.hibernate.boot.Metadata;
+import org.hibernate.ScrollMode;
 import org.hibernate.boot.model.FunctionContributions;
-import org.hibernate.boot.model.relational.Exportable;
-import org.hibernate.boot.model.relational.Sequence;
-import org.hibernate.boot.model.relational.SqlStringGenerationContext;
+import org.hibernate.boot.model.TypeContributions;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.function.CommonFunctionFactory;
-import org.hibernate.dialect.function.FormatFunction;
-import org.hibernate.dialect.lock.LockingStrategy;
-import org.hibernate.dialect.lock.LockingStrategyException;
-import org.hibernate.dialect.lock.internal.NoLockingSupport;
+import org.hibernate.dialect.function.array.SpannerArrayConcatElementFunction;
+import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.engine.config.spi.StandardConverters;
+import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
+import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
+import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.dialect.function.InsertSubstringOverlayEmulation;
+import org.hibernate.dialect.function.CastingConcatFunction;
+import org.hibernate.dialect.function.SpannerFormatFunction;
+import org.hibernate.dialect.function.SpannerExtractFunction;
+import org.hibernate.dialect.function.SpannerTruncFunction;
+import org.hibernate.dialect.function.array.ArrayAggFunction;
+import org.hibernate.dialect.function.array.ArrayToStringFunction;
+import org.hibernate.dialect.identity.IdentityColumnSupport;
+import org.hibernate.dialect.identity.SpannerIdentityColumnSupport;
 import org.hibernate.dialect.lock.spi.LockingSupport;
+import org.hibernate.exception.ConstraintViolationException;
+import org.hibernate.exception.SQLGrammarException;
+import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.pagination.LimitOffsetLimitHandler;
+import org.hibernate.dialect.sequence.SequenceSupport;
+import org.hibernate.dialect.sequence.SpannerSequenceSupport;
+import org.hibernate.dialect.type.SpannerJsonJdbcType;
+import org.hibernate.dialect.function.json.SpannerJsonValueFunction;
+import org.hibernate.dialect.function.json.SpannerJsonQueryFunction;
 import org.hibernate.dialect.sql.ast.SpannerSqlAstTranslator;
+import org.hibernate.dialect.unique.AlterTableUniqueIndexDelegate;
 import org.hibernate.dialect.unique.UniqueDelegate;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.engine.jdbc.env.spi.SchemaNameResolver;
+import org.hibernate.sql.model.MutationOperation;
+import org.hibernate.sql.model.ast.ColumnValueBinding;
+import org.hibernate.sql.model.internal.OptionalTableUpdate;
+import org.hibernate.persister.entity.mutation.EntityMutationTarget;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.internal.util.collections.ArrayHelper;
-import org.hibernate.mapping.Column;
-import org.hibernate.mapping.ForeignKey;
 import org.hibernate.mapping.Table;
-import org.hibernate.mapping.UniqueKey;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.common.TemporalUnit;
+import org.hibernate.query.sqm.CastType;
 import org.hibernate.query.sqm.IntervalType;
+import org.hibernate.query.sqm.SetOperator;
+import org.hibernate.query.sqm.TrimSpec;
+import org.hibernate.query.sqm.produce.function.FunctionParameterType;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
+import org.hibernate.sql.ast.internal.PessimisticLockKind;
+import org.hibernate.dialect.lock.PessimisticLockStyle;
+import org.hibernate.dialect.lock.internal.LockingSupportSimple;
+import org.hibernate.dialect.lock.spi.ConnectionLockTimeoutStrategy;
+import org.hibernate.dialect.lock.spi.LockTimeoutType;
+import org.hibernate.dialect.lock.spi.OuterJoinLockingType;
 import org.hibernate.sql.ast.spi.LockingClauseStrategy;
 import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.sql.ast.spi.StandardSqlAstTranslatorFactory;
@@ -46,21 +74,39 @@
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.tool.schema.spi.Exporter;
-import org.hibernate.type.BasicType;
-import org.hibernate.type.BasicTypeRegistry;
+import org.hibernate.dialect.function.CountFunction;
+import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.type.StandardBasicTypes;
-
-import java.util.Date;
-import java.util.Map;
+import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
+import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
+import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType;
+import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
+
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+
+import org.hibernate.Timeouts;
+import java.util.Calendar;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import static org.hibernate.dialect.SimpleDatabaseVersion.ZERO_VERSION;
 import static org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers.useArgType;
 import static org.hibernate.sql.ast.internal.NonLockingClauseStrategy.NON_CLAUSE_STRATEGY;
+import static org.hibernate.type.SqlTypes.ARRAY;
 import static org.hibernate.type.SqlTypes.BIGINT;
+import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
 import static org.hibernate.type.SqlTypes.BINARY;
 import static org.hibernate.type.SqlTypes.BLOB;
 import static org.hibernate.type.SqlTypes.BOOLEAN;
 import static org.hibernate.type.SqlTypes.CHAR;
+import static org.hibernate.type.SqlTypes.JSON;
 import static org.hibernate.type.SqlTypes.CLOB;
 import static org.hibernate.type.SqlTypes.DECIMAL;
 import static org.hibernate.type.SqlTypes.DOUBLE;
@@ -77,10 +123,12 @@
 import static org.hibernate.type.SqlTypes.SMALLINT;
 import static org.hibernate.type.SqlTypes.TIME;
 import static org.hibernate.type.SqlTypes.TIMESTAMP;
-import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
 import static org.hibernate.type.SqlTypes.TINYINT;
 import static org.hibernate.type.SqlTypes.VARBINARY;
 import static org.hibernate.type.SqlTypes.VARCHAR;
+import static org.hibernate.type.descriptor.DateTimeUtils.appendAsDate;
+import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithMillis;
+import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithNanos;
 
 /**
  * A {@linkplain Dialect SQL dialect} for Cloud Spanner.
@@ -89,16 +137,30 @@
  * @author Chengyuan Zhao
  * @author Daniel Zou
  * @author Dmitry Solomakha
+ * @author Rayudu Abbireddy
  */
 public class SpannerDialect extends Dialect {
 
-	private final Exporter<Table> spannerTableExporter = new SpannerDialectTableExporter( this );
+	private final UniqueDelegate SPANNER_UNIQUE_DELEGATE = new AlterTableUniqueIndexDelegate( this );
+	private final Exporter<Table> SPANNER_TABLE_EXPORTER = new SpannerDialectTableExporter( this );
+	private final SequenceSupport SPANNER_SEQUENCE_SUPPORT = new SpannerSequenceSupport(this);
 
-	private static final LockingStrategy LOCKING_STRATEGY = new DoNothingLockingStrategy();
+	private static final Pattern NOT_NULL_PATTERN = Pattern.compile( ".*Cannot specify a null value for column(?:[:]? (.*?) in table|: (.*?(?=$))).*" );
+	private static final Pattern NOT_NULL_PATTERN_2 = Pattern.compile( ".*A new row in table .* does not specify a non-null value for NOT NULL column: (.*?)\\s*" );
+	private static final Pattern UNIQUE_INDEX_PATTERN = Pattern.compile( ".*UNIQUE violation on index (.*?)(?:,|$).*" );
+	private static final Pattern CHECK_PATTERN = Pattern.compile( ".*Check constraint (.*?) is violated.*" );
+	private static final Pattern FK_PATTERN = Pattern.compile( ".*Foreign key (.*?) constraint violation.*" );
 
-	private static final EmptyExporter NOOP_EXPORTER = new EmptyExporter();
+	private static final String USE_INTEGER_FOR_PRIMARY_KEY = "hibernate.dialect.spanner.use_integer_for_primary_key";
+	private boolean useIntegerForPrimaryKey;
 
-	private static final UniqueDelegate NOOP_UNIQUE_DELEGATE = new DoNothingUniqueDelegate();
+	private static final LockingSupport SPANNER_LOCKING_SUPPORT = new LockingSupportSimple(
+			PessimisticLockStyle.CLAUSE,
+			RowLockStrategy.NONE,
+			LockTimeoutType.NONE,
+			OuterJoinLockingType.FULL,
+			ConnectionLockTimeoutStrategy.NONE
+	);
 
 	public SpannerDialect() {
 		super( ZERO_VERSION );
@@ -108,69 +170,162 @@ public SpannerDialect(DialectResolutionInfo info) {
 		super(info);
 	}
 
+	public boolean useIntegerForPrimaryKey() {
+		return useIntegerForPrimaryKey;
+	}
+
 	@Override
-	protected String columnType(int sqlTypeCode) {
-		switch ( sqlTypeCode ) {
-			case BOOLEAN:
-				return "bool";
-
-			case TINYINT:
-			case SMALLINT:
-			case INTEGER:
-			case BIGINT:
-				return "int64";
-
-			case REAL:
-			case FLOAT:
-			case DOUBLE:
-			case DECIMAL:
-			case NUMERIC:
-				return "float64";
+	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+		super.contributeTypes( typeContributions, serviceRegistry );
+		final var configurationService = serviceRegistry.requireService( ConfigurationService.class );
+		this.useIntegerForPrimaryKey = configurationService.getSetting(
+				USE_INTEGER_FOR_PRIMARY_KEY,
+				StandardConverters.BOOLEAN,
+				false
+		);
+		final var jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
+		jdbcTypeRegistry.addDescriptor( SpannerJsonJdbcType.INSTANCE );
+	}
 
-			//there is no time type of any kind
-			case TIME:
-			//timestamp does not accept precision
-			case TIMESTAMP:
-			case TIMESTAMP_WITH_TIMEZONE:
-				return "timestamp";
+	@Override
+	public MutationOperation createOptionalTableUpdateOperation(
+			EntityMutationTarget mutationTarget,
+			OptionalTableUpdate optionalTableUpdate,
+			SessionFactoryImplementor factory) {
+		final boolean hasUpdatableBindings = optionalTableUpdate.getValueBindings().stream()
+				.anyMatch( ColumnValueBinding::isAttributeUpdatable );
+		if ( hasUpdatableBindings ) {
+			// If an entity contains BOTH updatable properties and read-only properties
+			// (like `@Column(updatable = false)`), we MUST fall back to Hibernate's core UPDATE-then-INSERT
+			// mutation workflow to protect the immutable state from being unintentionally overwritten,
+			// as Spanner's native `INSERT OR UPDATE` statement updates all columns.
+			// Spanner's native `INSERT OR UPDATE` statement does not support a `WHERE` clause,
+			// so optimistic locking checks cannot be applied there.
+			final boolean hasNonUpdatableBindings = optionalTableUpdate.getValueBindings().stream()
+					.anyMatch( binding -> !binding.isAttributeUpdatable() );
+			if ( hasNonUpdatableBindings || optionalTableUpdate.getNumberOfOptimisticLockBindings() > 0 ) {
+				return super.createOptionalTableUpdateOperation( mutationTarget, optionalTableUpdate, factory );
+			}
+		}
+		return new SpannerSqlAstTranslator<>( factory, optionalTableUpdate )
+				.createMergeOperation( optionalTableUpdate, hasUpdatableBindings );
+	}
 
-			case CHAR:
-			case NCHAR:
-			case VARCHAR:
-			case NVARCHAR:
-				return "string($l)";
+	@Override
+	protected void initDefaultProperties() {
+		super.initDefaultProperties();
+		getDefaultProperties().setProperty( AvailableSettings.PREFERRED_POOLED_OPTIMIZER, "none" );
+	}
 
-			case BINARY:
-			case VARBINARY:
-				return "bytes($l)";
+	@Override
+	public JdbcType resolveSqlTypeDescriptor(
+			String columnTypeName,
+			int jdbcTypeCode,
+			int precision,
+			int scale,
+			JdbcTypeRegistry jdbcTypeRegistry) {
+		if ( jdbcTypeCode == ARRAY ) {
+			final int startIndex = columnTypeName.indexOf( '<' ) + 1;
+			final int endIndex = columnTypeName.lastIndexOf( '>' );
+			final String componentTypeName = columnTypeName.substring( startIndex, endIndex ).trim();
+			// Spanner uses STRING for VARCHAR/CLOB. DdlTypeRegistry prefers CLOB for "string".
+			final Integer sqlTypeCode = componentTypeName.equalsIgnoreCase( "STRING" )
+					? VARCHAR
+					: resolveSqlTypeCode( componentTypeName, jdbcTypeRegistry.getTypeConfiguration() );
+			if ( sqlTypeCode != null ) {
+				return jdbcTypeRegistry.resolveTypeConstructorDescriptor(
+						jdbcTypeCode,
+						jdbcTypeRegistry.getDescriptor( sqlTypeCode ),
+						ColumnTypeInformation.EMPTY
+				);
+			}
+		}
+		return super.resolveSqlTypeDescriptor( columnTypeName, jdbcTypeCode, precision, scale, jdbcTypeRegistry );
+	}
 
-			case CLOB:
-			case NCLOB:
-				return "string(max)";
-			case BLOB:
-				return "bytes(max)";
+	@Override
+	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+		super.registerColumnTypes( typeContributions, serviceRegistry );
+		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		ddlTypeRegistry.addDescriptor( new DdlTypeImpl( JSON, columnType( JSON ),this ));
+		ddlTypeRegistry.addDescriptor(
+				CapacityDependentDdlType.builder(
+						VARCHAR,
+						columnType( VARCHAR ),
+						castType( VARCHAR ),
+						castType( VARCHAR ),
+						this
+				)
+				.withTypeCapacity( getMaxVarcharLength(), columnType( VARCHAR ) )
+				.build()
+		);
+		ddlTypeRegistry.addDescriptor(
+				CapacityDependentDdlType.builder(
+						NVARCHAR,
+						columnType( NVARCHAR ),
+						castType( NVARCHAR ),
+						castType( NVARCHAR ),
+						this
+				)
+				.withTypeCapacity( getMaxNVarcharLength(), columnType( NVARCHAR ) )
+				.build()
+		);
+		ddlTypeRegistry.addDescriptor(
+				CapacityDependentDdlType.builder(
+						VARBINARY,
+						columnType( VARBINARY ),
+						castType( VARBINARY ),
+						castType( VARBINARY ),
+						this
+				)
+				.withTypeCapacity( getMaxVarbinaryLength(), columnType( VARBINARY ) )
+				.build()
+		);
+	}
 
-			default:
-				return super.columnType( sqlTypeCode );
+	@Override
+	protected String columnType(int sqlTypeCode) {
+		return switch ( sqlTypeCode ) {
+			case BOOLEAN -> "bool";
+			case TINYINT, SMALLINT, INTEGER, BIGINT -> "int64";
+			case REAL -> "float32";
+			case FLOAT, DOUBLE -> "float64";
+			case DECIMAL, NUMERIC -> "numeric";
+			//there is no time type of any kind
+			//timestamp does not accept precision
+			case TIME, TIMESTAMP, TIMESTAMP_WITH_TIMEZONE -> "timestamp";
+			case CHAR, NCHAR, VARCHAR, NVARCHAR -> "string($l)";
+			case BINARY, VARBINARY -> "bytes($l)";
+			case CLOB, NCLOB -> "string(max)";
+			case BLOB -> "bytes(max)";
+			case JSON -> "json";
+			default -> super.columnType( sqlTypeCode );
+		};
+	}
+
+	@Override
+	public String castPattern(CastType from, CastType to) {
+		if ( to == CastType.TIME && from == CastType.STRING ) {
+			return "cast('1970-01-01 ' || ?1 as timestamp)";
+		}
+		if ( to == CastType.STRING && from == CastType.TIME ) {
+			return "format_timestamp('%H:%M:%E*S', ?1)";
 		}
+		return super.castPattern( from, to );
 	}
 
 	@Override
 	protected String castType(int sqlTypeCode) {
-		switch ( sqlTypeCode ) {
-			case CHAR:
-			case NCHAR:
-			case VARCHAR:
-			case NVARCHAR:
-			case LONG32VARCHAR:
-			case LONG32NVARCHAR:
-				return "string";
-			case BINARY:
-			case VARBINARY:
-			case LONG32VARBINARY:
-				return "bytes";
-		}
-		return super.castType( sqlTypeCode );
+		return switch ( sqlTypeCode ) {
+			case CHAR, NCHAR, VARCHAR, NVARCHAR, LONG32VARCHAR, LONG32NVARCHAR, CLOB, NCLOB -> "string";
+			case BINARY, VARBINARY, LONG32VARBINARY, BLOB -> "bytes";
+			default -> super.castType( sqlTypeCode );
+		};
+	}
+
+	@Override
+	public boolean supportsTruncateWithCast() {
+		return false;
 	}
 
 	@Override
@@ -198,35 +353,48 @@ public String getArrayTypeName(String javaElementTypeName, String elementTypeNam
 	@Override
 	public void initializeFunctionRegistry(FunctionContributions functionContributions) {
 		super.initializeFunctionRegistry( functionContributions );
-
-		final BasicTypeRegistry basicTypeRegistry = functionContributions.getTypeConfiguration().getBasicTypeRegistry();
-		final BasicType<byte[]> byteArrayType = basicTypeRegistry.resolve( StandardBasicTypes.BINARY );
-		final BasicType<Long> longType = basicTypeRegistry.resolve( StandardBasicTypes.LONG );
-		final BasicType<Boolean> booleanType = basicTypeRegistry.resolve( StandardBasicTypes.BOOLEAN );
-		final BasicType<String> stringType = basicTypeRegistry.resolve( StandardBasicTypes.STRING );
-		final BasicType<Date> dateType = basicTypeRegistry.resolve( StandardBasicTypes.DATE );
-		final BasicType<Date> timestampType = basicTypeRegistry.resolve( StandardBasicTypes.TIMESTAMP );
+		final var basicTypeRegistry = functionContributions.getTypeConfiguration().getBasicTypeRegistry();
+		final var byteArrayType = basicTypeRegistry.resolve( StandardBasicTypes.BINARY );
+		final var intType = basicTypeRegistry.resolve( StandardBasicTypes.INTEGER );
+		final var longType = basicTypeRegistry.resolve( StandardBasicTypes.LONG );
+		final var doubleType = basicTypeRegistry.resolve( StandardBasicTypes.DOUBLE );
+		final var booleanType = basicTypeRegistry.resolve( StandardBasicTypes.BOOLEAN );
+		final var charType = basicTypeRegistry.resolve( StandardBasicTypes.CHARACTER );
+		final var stringType = basicTypeRegistry.resolve( StandardBasicTypes.STRING );
+		final var dateType = basicTypeRegistry.resolve( StandardBasicTypes.DATE );
+		final var timestampType = basicTypeRegistry.resolve( StandardBasicTypes.TIMESTAMP );
+
+		final var functionRegistry = functionContributions.getFunctionRegistry();
 
 		// Aggregate Functions
-		functionContributions.getFunctionRegistry().namedAggregateDescriptorBuilder( "any_value" )
+		functionRegistry.namedAggregateDescriptorBuilder( "any_value" )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedAggregateDescriptorBuilder( "array_agg" )
-				.setExactArgumentCount( 1 )
-				.register();
-		functionContributions.getFunctionRegistry().namedAggregateDescriptorBuilder( "countif" )
+		functionRegistry.register(
+				"count",
+				new CountFunction(
+						this,
+						functionContributions.getTypeConfiguration(),
+						SqlAstNodeRenderingMode.DEFAULT,
+						"||",
+						"string",
+						false
+				)
+		);
+		functionRegistry.register( ArrayAggFunction.FUNCTION_NAME, new ArrayAggFunction( "array_agg", false, true ) );
+		functionRegistry.namedAggregateDescriptorBuilder( "countif" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedAggregateDescriptorBuilder( "logical_and" )
+		functionRegistry.namedAggregateDescriptorBuilder( "logical_and" )
 				.setInvariantType( booleanType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedAggregateDescriptorBuilder( "logical_or" )
+		functionRegistry.namedAggregateDescriptorBuilder( "logical_or" )
 				.setInvariantType( booleanType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedAggregateDescriptorBuilder( "string_agg" )
+		functionRegistry.namedAggregateDescriptorBuilder( "string_agg" )
 				.setInvariantType( stringType )
 				.setArgumentCountBetween( 1, 2 )
 				.register();
@@ -243,37 +411,56 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.tanh();
 		functionFactory.moreHyperbolic();
 
-		functionFactory.bitandorxornot_bitAndOrXorNot();
+		functionRegistry.registerPattern(
+				"var_pop",
+				"(avg(?1 * ?1)-power(avg(?1),2))" );
+		functionRegistry.registerPattern(
+				"stddev_pop",
+				"sqrt(avg(?1 * ?1)-power(avg(?1),2))" );
 
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "is_inf" )
+		functionFactory.bitandorxornot_operator();
+
+		functionRegistry.namedDescriptorBuilder( "is_inf" )
 				.setInvariantType( booleanType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "is_nan" )
+		functionRegistry.namedDescriptorBuilder( "is_nan" )
 				.setInvariantType( booleanType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "ieee_divide" )
+		functionRegistry.namedDescriptorBuilder( "ieee_divide" )
 				.setInvariantType( booleanType )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "div" )
+		functionRegistry.namedDescriptorBuilder( "div" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 2 )
 				.register();
+		functionRegistry.registerPattern(
+				"degrees",
+				"(?1 * 180 / acos(-1))",
+				doubleType );
+		functionRegistry.registerPattern(
+				"radians",
+				"(?1 * acos(-1) / 180)",
+				doubleType );
+		functionRegistry.registerPattern(
+				"log",
+				"log(?2, ?1)",
+				doubleType );
 
 		functionFactory.sha1();
 
 		// Hash Functions
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "farm_fingerprint" )
+		functionRegistry.namedDescriptorBuilder( "farm_fingerprint" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "sha256" )
+		functionRegistry.namedDescriptorBuilder( "sha256" )
 				.setInvariantType( byteArrayType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "sha512" )
+		functionRegistry.namedDescriptorBuilder( "sha512" )
 				.setInvariantType( byteArrayType )
 				.setExactArgumentCount( 1 )
 				.register();
@@ -285,205 +472,245 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.repeat();
 		functionFactory.substr();
 		functionFactory.substring_substr();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "byte_length" )
+		functionFactory.octetLength();
+		functionFactory.bitLength_pattern( "(octet_length(?1) * 8)" );
+		functionRegistry.namedDescriptorBuilder( "byte_length" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "code_points_to_bytes" )
+		functionRegistry.namedDescriptorBuilder( "code_points_to_bytes" )
 				.setInvariantType( byteArrayType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "code_points_to_string" )
+		functionRegistry.namedDescriptorBuilder( "code_points_to_string" )
 				.setInvariantType( stringType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "ends_with" )
+		functionRegistry.namedDescriptorBuilder( "ends_with" )
 				.setInvariantType( booleanType )
 				.setExactArgumentCount( 2 )
 				.register();
 //		queryEngine.getSqmFunctionRegistry().namedTemplateBuilder( "format" )
 //				.setInvariantType( StandardBasicTypes.STRING )
 //				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "from_base64" )
+		functionRegistry.namedDescriptorBuilder( "from_base64" )
 				.setInvariantType( byteArrayType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "from_hex" )
+		functionRegistry.namedDescriptorBuilder( "from_hex" )
 				.setInvariantType( byteArrayType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "regexp_contains" )
+		functionRegistry.namedDescriptorBuilder( "regexp_contains" )
 				.setInvariantType( booleanType )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "regexp_extract" )
+		functionRegistry.namedDescriptorBuilder( "regexp_extract" )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "regexp_extract_all" )
+		functionRegistry.namedDescriptorBuilder( "regexp_extract_all" )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "regexp_replace" )
+		functionRegistry.namedDescriptorBuilder( "regexp_replace" )
 				.setExactArgumentCount( 3 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "safe_convert_bytes_to_string" )
+		functionRegistry.namedDescriptorBuilder( "safe_convert_bytes_to_string" )
 				.setInvariantType( stringType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "split" )
+		functionRegistry.namedDescriptorBuilder( "split" )
 				.setArgumentCountBetween( 1, 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "starts_with" )
+		functionRegistry.namedDescriptorBuilder( "starts_with" )
 				.setInvariantType( booleanType )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "strpos" )
+		functionRegistry.namedDescriptorBuilder( "strpos" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "to_base64" )
+		functionRegistry.namedDescriptorBuilder( "to_base64" )
 				.setInvariantType( stringType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "to_code_points" )
+		functionRegistry.namedDescriptorBuilder( "to_code_points" )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "to_hex" )
+		functionRegistry.namedDescriptorBuilder( "to_hex" )
 				.setInvariantType( stringType )
 				.setExactArgumentCount( 1 )
 				.register();
+		functionRegistry.registerPattern(
+				"hex",
+				"to_hex(cast(?1 as bytes))",
+				stringType );
+		functionRegistry.registerPattern(
+				"ascii",
+				"to_code_points(?1)[offset(0)]",
+				intType );
+		functionRegistry.registerPattern(
+				"chr",
+				"code_points_to_string([?1])",
+				charType );
+		functionRegistry.registerPattern(
+				"left",
+				"substr(?1, 1, ?2)",
+				stringType );
+		functionRegistry.registerPattern(
+				"right",
+				"substr(?1, -?2)",
+				stringType );
+		functionRegistry.register(
+				"overlay",
+				new InsertSubstringOverlayEmulation( functionContributions.getTypeConfiguration(), false ) );
+		functionRegistry.registerBinaryTernaryPattern(
+						"locate",
+						intType,
+						"strpos(?2,?1)",
+						"(strpos(substr(?2,?3),?1)+case when strpos(substr(?2,?3),?1)>0 then ?3-1 else 0 end)",
+						FunctionParameterType.STRING, FunctionParameterType.STRING, FunctionParameterType.INTEGER,
+						functionContributions.getTypeConfiguration()
+				)
+				.setArgumentListSignature( "(STRING pattern, STRING string[, INTEGER start])" );
 
 		// JSON Functions
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "json_query" )
-				.setInvariantType( stringType )
-				.setExactArgumentCount( 2 )
-				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "json_value" )
-				.setInvariantType( stringType )
-				.setExactArgumentCount( 2 )
-				.register();
+		functionRegistry.register(
+				"json_value",
+				new SpannerJsonValueFunction( functionContributions.getTypeConfiguration() ) );
+		functionRegistry.register(
+				"json_query",
+				new SpannerJsonQueryFunction( functionContributions.getTypeConfiguration() ) );
 
 		// Array Functions
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "array" )
+		functionRegistry.namedDescriptorBuilder( "array" )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "array_concat" )
-				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "array_length" )
-				.setInvariantType( longType )
-				.setExactArgumentCount( 1 )
-				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "array_to_string" )
-				.setInvariantType( stringType )
-				.setArgumentCountBetween( 2, 3 )
-				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "array_reverse" )
+		functionFactory.arrayConcat_operator();
+		functionRegistry.register( "array_append", new SpannerArrayConcatElementFunction( false ) );
+		functionRegistry.register( "array_prepend", new SpannerArrayConcatElementFunction( true ) );
+		functionFactory.arrayLength_spanner();
+		functionRegistry.register( "array_to_string", new ArrayToStringFunction( functionContributions.getTypeConfiguration() ) );
+		functionRegistry.namedDescriptorBuilder( "array_reverse" )
 				.setExactArgumentCount( 1 )
 				.register();
 
 		// Date functions
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "date" )
+		functionRegistry.namedDescriptorBuilder( "date" )
 				.setInvariantType( dateType )
 				.setArgumentCountBetween( 1, 3 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "date_add" )
+		functionRegistry.namedDescriptorBuilder( "date_add" )
 				.setInvariantType( dateType )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "date_sub" )
+		functionRegistry.namedDescriptorBuilder( "date_sub" )
 				.setInvariantType( dateType )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "date_diff" )
+		functionRegistry.namedDescriptorBuilder( "date_diff" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 3 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "date_trunc" )
+		functionRegistry.namedDescriptorBuilder( "date_trunc" )
 				.setReturnTypeResolver( useArgType( 1 ) )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "date_from_unix_date" )
+		functionRegistry.namedDescriptorBuilder( "date_from_unix_date" )
 				.setInvariantType( dateType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "format_date" )
+		functionRegistry.namedDescriptorBuilder( "format_date" )
 				.setInvariantType( stringType )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "parse_date" )
+		functionRegistry.namedDescriptorBuilder( "parse_date" )
 				.setInvariantType( dateType )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "unix_date" )
+		functionRegistry.namedDescriptorBuilder( "unix_date" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 1 )
 				.register();
 
 		// Timestamp functions
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "string" )
-				.setInvariantType( stringType )
-				.setArgumentCountBetween( 1, 2 )
-				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "timestamp" )
+		functionRegistry.namedDescriptorBuilder( "timestamp" )
 				.setInvariantType( timestampType )
 				.setArgumentCountBetween( 1, 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "timestamp_add" )
+		functionRegistry.namedDescriptorBuilder( "timestamp_add" )
 				.setInvariantType( timestampType )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "timestamp_sub" )
+		functionRegistry.namedDescriptorBuilder( "timestamp_sub" )
 				.setInvariantType( timestampType )
 				.setExactArgumentCount( 2 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "timestamp_diff" )
+		functionRegistry.namedDescriptorBuilder( "timestamp_diff" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 3 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "timestamp_trunc" )
+		functionRegistry.namedDescriptorBuilder( "timestamp_trunc" )
 				.setInvariantType( timestampType )
 				.setArgumentCountBetween( 2, 3 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "format_timestamp" )
+		functionRegistry.namedDescriptorBuilder( "format_timestamp" )
 				.setInvariantType( stringType )
 				.setArgumentCountBetween( 2, 3 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "parse_timestamp" )
+		functionRegistry.namedDescriptorBuilder( "parse_timestamp" )
 				.setInvariantType( timestampType )
 				.setArgumentCountBetween( 2, 3 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "timestamp_seconds" )
+		functionRegistry.namedDescriptorBuilder( "timestamp_seconds" )
 				.setInvariantType( timestampType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "timestamp_millis" )
+		functionRegistry.namedDescriptorBuilder( "timestamp_millis" )
 				.setInvariantType( timestampType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "timestamp_micros" )
+		functionRegistry.namedDescriptorBuilder( "timestamp_micros" )
 				.setInvariantType( timestampType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "unix_seconds" )
+		functionRegistry.namedDescriptorBuilder( "unix_seconds" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "unix_millis" )
+		functionRegistry.namedDescriptorBuilder( "unix_millis" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 1 )
 				.register();
-		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "unix_micros" )
+		functionRegistry.namedDescriptorBuilder( "unix_micros" )
 				.setInvariantType( longType )
 				.setExactArgumentCount( 1 )
 				.register();
+		functionFactory.listagg_stringAgg( "string" );
+		functionFactory.array_spanner();
 
-		functionContributions.getFunctionRegistry().register(
+		functionRegistry.register(
+				"extract",
+				new SpannerExtractFunction( this, functionContributions.getTypeConfiguration() )
+		);
+
+		functionRegistry.register(
 				"format",
-				new FormatFunction( "format_timestamp", true, true, functionContributions.getTypeConfiguration() )
+				new SpannerFormatFunction( functionContributions.getTypeConfiguration() )
 		);
-		functionFactory.listagg_stringAgg( "string" );
-		functionFactory.inverseDistributionOrderedSetAggregates();
-		functionFactory.hypotheticalOrderedSetAggregates();
-		functionFactory.array_spanner();
+
+		functionRegistry.register(
+				"concat",
+				new CastingConcatFunction(
+						this,
+						"||",
+						false,
+						SqlAstNodeRenderingMode.DEFAULT,
+						functionContributions.getTypeConfiguration()
+				)
+		);
+
+		functionRegistry.register( "trunc", new SpannerTruncFunction() );
+		functionRegistry.registerAlternateKey( "truncate", "trunc" );
 	}
 
 	@Override
@@ -498,8 +725,8 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 	}
 
 	@Override
-	public Exporter<Table> getTableExporter() {
-		return this.spannerTableExporter;
+	public boolean supportsIfExistsBeforeTableName() {
+		return true;
 	}
 
 	/* SELECT-related functions */
@@ -524,6 +751,178 @@ public void appendBooleanValueString(SqlAppender appender, boolean bool) {
 		appender.appendSql( bool );
 	}
 
+	@Override
+	public void appendBinaryLiteral(SqlAppender appender, byte[] bytes) {
+		appender.appendSql( "FROM_HEX('" );
+		PrimitiveByteArrayJavaType.INSTANCE.appendString( appender, bytes );
+		appender.appendSql( "')" );
+	}
+
+	@Override
+	public void appendLiteral(SqlAppender appender, String literal) {
+		// Spanner uses backslash escaping, so escape single quotes and backslashes with \
+		// We also explicitly escape newlines (\n) because Spanner forbids raw line breaks
+		// inside standard quoted strings
+		StringBuilder builder = new StringBuilder( literal.length() + 2 );
+		builder.append( '\'' );
+		for ( int i = 0; i < literal.length(); i++ ) {
+			final char c = literal.charAt( i );
+			switch ( c ) {
+				case '\'':
+				case '\\':
+					builder.append( '\\' );
+					builder.append( c );
+					break;
+				case '\n':
+					builder.append( "\\n" );
+					break;
+				default:
+					builder.append( c );
+			}
+		}
+		builder.append( '\'' );
+		appender.appendSql( builder.toString() );
+	}
+
+	@Override
+	public String currentTime() {
+		return currentTimestamp();
+	}
+
+	@Override
+	public boolean supportsTemporalLiteralOffset() {
+		return true;
+	}
+
+	@Override
+	public void appendDateTimeLiteral(
+			org.hibernate.sql.ast.spi.SqlAppender appender,
+			java.time.temporal.TemporalAccessor temporalAccessor,
+			jakarta.persistence.TemporalType precision,
+			java.util.TimeZone jdbcTimeZone) {
+		switch ( precision ) {
+			case DATE:
+				appender.appendSql( "DATE '" );
+				appendAsDate( appender, temporalAccessor );
+				appender.appendSql( "'" );
+				break;
+			case TIME:
+				appender.appendSql( "TIMESTAMP '" );
+				if ( temporalAccessor instanceof java.time.LocalTime localTime ) {
+					final OffsetDateTime offsetDateTime = localTime
+							.atDate( LocalDate.of( 1970, 1, 1 ) )
+							.atOffset( ZoneOffset.UTC );
+					appendAsTimestampWithNanos( appender, offsetDateTime, true, jdbcTimeZone );
+				}
+				else if ( temporalAccessor instanceof java.time.OffsetTime offsetTime ) {
+					OffsetDateTime offsetDateTime =
+							offsetTime.atDate( LocalDate.of( 1970, 1, 1 ) );
+					appendAsTimestampWithNanos( appender, offsetDateTime, true, jdbcTimeZone );
+				}
+				appender.appendSql( "'" );
+				break;
+			case TIMESTAMP:
+				appender.appendSql( "TIMESTAMP '" );
+				if ( temporalAccessor instanceof java.time.LocalDateTime ldt ) {
+					appendAsTimestampWithNanos(
+							appender,
+							ldt.atOffset( ZoneOffset.UTC ),
+							supportsTemporalLiteralOffset(),
+							jdbcTimeZone
+					);
+				}
+				else {
+					appendAsTimestampWithNanos(
+							appender,
+							temporalAccessor,
+							supportsTemporalLiteralOffset(),
+							jdbcTimeZone
+					);
+				}
+				appender.appendSql( "'" );
+				break;
+			default:
+				throw new IllegalArgumentException( "Unsupported TemporalType: " + precision );
+		}
+	}
+
+	@Override
+	public void appendDateTimeLiteral(
+			org.hibernate.sql.ast.spi.SqlAppender appender,
+			java.util.Date date,
+			jakarta.persistence.TemporalType precision,
+			java.util.TimeZone jdbcTimeZone) {
+		switch ( precision ) {
+			case DATE:
+				appender.appendSql( "DATE '" );
+				appendAsDate( appender, date );
+				appender.appendSql( "'" );
+				break;
+			case TIME:
+				appender.appendSql( "TIMESTAMP '" );
+				if ( date instanceof java.sql.Time time ) {
+					final OffsetDateTime offsetDateTime = time.toLocalTime()
+							.atDate( LocalDate.of( 1970, 1, 1 ) )
+							.atOffset( ZoneOffset.UTC );
+					appendAsTimestampWithNanos( appender, offsetDateTime, true, jdbcTimeZone );
+				}
+				appender.appendSql( "'" );
+				break;
+			case TIMESTAMP:
+				appender.appendSql( "TIMESTAMP '" );
+				appendAsTimestampWithNanos(
+						appender,
+						date.toInstant(),
+						supportsTemporalLiteralOffset(),
+						jdbcTimeZone
+				);
+				appender.appendSql( "'" );
+				break;
+			default:
+				throw new IllegalArgumentException( "Unsupported TemporalType: " + precision );
+		}
+	}
+
+	@Override
+	public void appendDateTimeLiteral(
+			org.hibernate.sql.ast.spi.SqlAppender appender,
+			java.util.Calendar calendar,
+			jakarta.persistence.TemporalType precision,
+			java.util.TimeZone jdbcTimeZone) {
+		switch ( precision ) {
+			case DATE:
+				appender.appendSql( "DATE '" );
+				appendAsDate( appender, calendar );
+				appender.appendSql( "'" );
+				break;
+			case TIME:
+				appender.appendSql( "TIMESTAMP '" );
+				final OffsetDateTime offsetDateTime = Instant.EPOCH.atOffset( ZoneOffset.UTC )
+						.withHour( calendar.get( Calendar.HOUR_OF_DAY ) )
+						.withMinute( calendar.get( Calendar.MINUTE ) )
+						.withSecond( calendar.get( Calendar.SECOND ) )
+						.withNano( calendar.get( Calendar.MILLISECOND ) * 1_000_000 );
+				appendAsTimestampWithMillis( appender, offsetDateTime, true, jdbcTimeZone );
+				appender.appendSql( "'" );
+				break;
+			case TIMESTAMP:
+				appender.appendSql( "TIMESTAMP '" );
+				final OffsetDateTime odt = OffsetDateTime.ofInstant(
+						calendar.toInstant(),
+						calendar.getTimeZone().toZoneId() );
+				appendAsTimestampWithMillis(
+						appender,
+						odt,
+						supportsTemporalLiteralOffset(),
+						jdbcTimeZone
+				);
+				appender.appendSql( "'" );
+				break;
+			default:
+				throw new IllegalArgumentException( "Unsupported TemporalType: " + precision );
+		}
+	}
+
 	@Override
 	public String translateExtractField(TemporalUnit unit) {
 		switch (unit) {
@@ -542,52 +941,64 @@ public String translateExtractField(TemporalUnit unit) {
 
 	@Override
 	public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType, IntervalType intervalType) {
-		if ( temporalType == TemporalType.TIMESTAMP ) {
-			switch (unit) {
+		if ( temporalType == TemporalType.TIMESTAMP || temporalType == TemporalType.TIME ) {
+			switch ( unit ) {
 				case YEAR:
 				case QUARTER:
 				case MONTH:
-					throw new SemanticException("Illegal unit for timestamp_add(): " + unit);
+					throw new SemanticException( "Illegal unit for timestamp_add(): " + unit );
+				case WEEK:
+					return "timestamp_add(?3, interval cast(?2 * 7 as int64) day)";
+				case SECOND:
+					return "timestamp_add(?3, interval cast(?2 * 1000000000 as int64) nanosecond)";
 				default:
-					return "timestamp_add(?3,interval ?2 ?1)";
+					return "timestamp_add(?3, interval cast(?2 as int64) ?1)";
 			}
 		}
 		else {
-			switch (unit) {
+			switch ( unit ) {
 				case NANOSECOND:
 				case SECOND:
 				case MINUTE:
 				case HOUR:
 				case NATIVE:
-					throw new SemanticException("Illegal unit for date_add(): " + unit);
+					throw new SemanticException( "Illegal unit for date_add(): " + unit );
 				default:
-					return "date_add(?3,interval ?2 ?1)";
+					return "date_add(?3, interval cast(?2 as int64) ?1)";
 			}
 		}
 	}
 
 	@Override
 	public String timestampdiffPattern(TemporalUnit unit, TemporalType fromTemporalType, TemporalType toTemporalType) {
-		if ( toTemporalType == TemporalType.TIMESTAMP || fromTemporalType == TemporalType.TIMESTAMP ) {
-			switch (unit) {
+		if ( toTemporalType == TemporalType.TIMESTAMP || fromTemporalType == TemporalType.TIMESTAMP
+			|| toTemporalType == TemporalType.TIME || fromTemporalType == TemporalType.TIME ) {
+			switch ( unit ) {
 				case YEAR:
 				case QUARTER:
 				case MONTH:
-					throw new SemanticException("Illegal unit for timestamp_diff(): " + unit);
+					throw new SemanticException( "Illegal unit for timestamp_diff(): " + unit );
+				case WEEK:
+					return "div(timestamp_diff(?3, ?2, day), 7)";
+				case NATIVE:
+					return "timestamp_diff(?3, ?2, nanosecond)";
 				default:
-					return "timestamp_diff(?3,?2,?1)";
+					return "timestamp_diff(?3, ?2, ?1)";
 			}
 		}
 		else {
-			switch (unit) {
+			switch ( unit ) {
 				case NANOSECOND:
+				case NATIVE:
+					return "(date_diff(?3, ?2, day) * 86400000000000)";
 				case SECOND:
+					return "(date_diff(?3, ?2, day) * 86400)";
 				case MINUTE:
+					return "(date_diff(?3, ?2, day) * 1440)";
 				case HOUR:
-				case NATIVE:
-					throw new SemanticException("Illegal unit for date_diff(): " + unit);
+					return "(date_diff(?3, ?2, day) * 24)";
 				default:
-					return "date_diff(?3,?2,?1)";
+					return "date_diff(?3, ?2, ?1)";
 			}
 		}
 	}
@@ -634,51 +1045,40 @@ public static Replacer datetimeFormat(String format) {
 				.replace("xx", "%z"); //note special case
 	}
 
-	/* DDL-related functions */
-
-	@Override
-	public boolean canCreateSchema() {
-		return false;
-	}
-
 	@Override
-	public String[] getCreateSchemaCommand(String schemaName) {
-		throw new UnsupportedOperationException(
-				"No create schema syntax supported by " + getClass().getName() );
+	public String trimPattern(TrimSpec specification, boolean isWhitespace) {
+		return switch ( specification ) {
+			case LEADING -> isWhitespace ? "ltrim(?1)" : "ltrim(?1, ?2)";
+			case TRAILING -> isWhitespace ? "rtrim(?1)" : "rtrim(?1, ?2)";
+			default -> isWhitespace ? "trim(?1)" : "trim(?1, ?2)";
+		};
 	}
 
-	@Override
-	public String[] getDropSchemaCommand(String schemaName) {
-		throw new UnsupportedOperationException(
-				"No drop schema syntax supported by " + getClass().getName() );
-	}
+	/* DDL-related functions */
 
 	@Override
-	public String getCurrentSchemaCommand() {
-		throw new UnsupportedOperationException(
-				"No current schema syntax supported by " + getClass().getName() );
+	public Exporter<Table> getTableExporter() {
+		return SPANNER_TABLE_EXPORTER;
 	}
 
 	@Override
-	public SchemaNameResolver getSchemaNameResolver() {
-		// Spanner does not have a notion of database name schemas, so return "".
-		return (connection, dialect) -> "";
+	public boolean supportsColumnCheck() {
+		return false;
 	}
 
 	@Override
-	public boolean dropConstraints() {
-		return false;
+	public String getCreateIndexString(boolean unique) {
+		return unique ? "create unique null_filtered index" : "create index";
 	}
 
 	@Override
-	public boolean qualifyIndexName() {
+	public boolean supportsUniqueConstraints() {
 		return false;
 	}
 
 	@Override
-	public String getDropForeignKeyString() {
-		throw new UnsupportedOperationException(
-				"Cannot drop foreign-key constraint because Cloud Spanner does not support foreign keys." );
+	public UniqueDelegate getUniqueDelegate() {
+		return SPANNER_UNIQUE_DELEGATE;
 	}
 
 	@Override
@@ -688,176 +1088,212 @@ public String getAddForeignKeyConstraintString(
 			String referencedTable,
 			String[] primaryKey,
 			boolean referencesPrimaryKey) {
-		throw new UnsupportedOperationException(
-				"Cannot add foreign-key constraint because Cloud Spanner does not support foreign keys." );
+		// Spanner requires the referenced columns to specify in all cases, including
+		// if the foreign key is referencing the primary key of the referenced table. Setting referencesPrimaryKey to
+		// false will add all the referenced columns.
+		return super.getAddForeignKeyConstraintString( constraintName, foreignKey, referencedTable, primaryKey, false );
 	}
 
 	@Override
-	public String getAddForeignKeyConstraintString(
-			String constraintName,
-			String foreignKeyDefinition) {
-		throw new UnsupportedOperationException(
-				"Cannot add foreign-key constraint because Cloud Spanner does not support foreign keys." );
+	public boolean supportsCircularCascadeDeleteConstraints() {
+		return false;
 	}
 
 	@Override
-	public String getAddPrimaryKeyConstraintString(String constraintName) {
-		throw new UnsupportedOperationException( "Cannot add primary key constraint in Cloud Spanner." );
+	public String getColumnDefaultString(String defaultValue) {
+		if ( defaultValue != null && !defaultValue.startsWith( "(" ) ) {
+			return "(" + defaultValue + ")";
+		}
+		return defaultValue;
 	}
 
-	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	// Lock acquisition functions
-
-
 	@Override
-	public LockingSupport getLockingSupport() {
-		return NoLockingSupport.NO_LOCKING_SUPPORT;
+	public boolean requiresNotNullBeforeDefault() {
+		return true;
 	}
 
 	@Override
-	public LockingClauseStrategy getLockingClauseStrategy(QuerySpec querySpec, LockOptions lockOptions) {
-		// Spanner does not support the FOR UPDATE clause
-		return NON_CLAUSE_STRATEGY;
+	public String generatedAs(String generatedAs) {
+		return " as (" + generatedAs + ") stored";
 	}
 
 	@Override
-	public LockingStrategy getLockingStrategy(EntityPersister lockable, LockMode lockMode) {
-		return LOCKING_STRATEGY;
+	public boolean supportsNotNullAfterGeneratedAs() {
+		return false;
 	}
 
 	@Override
-	public String getForUpdateString(LockOptions lockOptions) {
-		return "";
+	public boolean supportsNoColumnsInsert() {
+		return false;
 	}
 
 	@Override
-	public String getForUpdateString() {
-		return "";
+	public IdentityColumnSupport getIdentityColumnSupport() {
+		return SpannerIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override
-	public String getForUpdateString(String aliases) {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public SequenceSupport getSequenceSupport() {
+		return SPANNER_SEQUENCE_SUPPORT;
 	}
 
 	@Override
-	public String getForUpdateString(String aliases, LockOptions lockOptions) {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public String getQuerySequencesString() {
+		return """
+				select seq.CATALOG as sequence_catalog,
+					seq.SCHEMA as sequence_schema,
+					seq.NAME as sequence_name,
+					coalesce(kind.OPTION_VALUE, 'bit_reversed_positive') as KIND,
+					coalesce(safe_cast(initial.OPTION_VALUE AS INT64),
+						case coalesce(kind.OPTION_VALUE, 'bit_reversed_positive')
+							when 'bit_reversed_positive' then 1
+							when 'bit_reversed_signed' then -pow(2, 63)
+							else 1
+						end
+					) as start_value, 1 as minimum_value, 9223372036854775807 as maximum_value,
+					1 as increment,
+					safe_cast(skip_range_min.OPTION_VALUE as int64) as skip_range_min,
+					safe_cast(skip_range_max.OPTION_VALUE as int64) as skip_range_max
+				from INFORMATION_SCHEMA.SEQUENCES seq
+				left outer join INFORMATION_SCHEMA.SEQUENCE_OPTIONS kind
+					on seq.CATALOG=kind.CATALOG and seq.SCHEMA=kind.SCHEMA and seq.NAME=kind.NAME and kind.OPTION_NAME='sequence_kind'
+				left outer join INFORMATION_SCHEMA.SEQUENCE_OPTIONS initial
+					on seq.CATALOG=initial.CATALOG and seq.SCHEMA=initial.SCHEMA and seq.NAME=initial.NAME and initial.OPTION_NAME='start_with_counter'
+				left outer join INFORMATION_SCHEMA.SEQUENCE_OPTIONS skip_range_min
+					on seq.CATALOG=skip_range_min.CATALOG and seq.SCHEMA=skip_range_min.SCHEMA and seq.NAME=skip_range_min.NAME and skip_range_min.OPTION_NAME='skip_range_min'
+				left outer join INFORMATION_SCHEMA.SEQUENCE_OPTIONS skip_range_max
+					on seq.CATALOG=skip_range_max.CATALOG and seq.SCHEMA=skip_range_max.SCHEMA and seq.NAME=skip_range_max.NAME and skip_range_max.OPTION_NAME='skip_range_max'
+				""";
 	}
 
 	@Override
-	public String getWriteLockString(Timeout timeout) {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public GenerationType getNativeValueGenerationStrategy() {
+		return GenerationType.SEQUENCE;
 	}
 
 	@Override
-	public String getWriteLockString(String aliases, Timeout timeout) {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public boolean canCreateSchema() {
+		return false;
 	}
 
 	@Override
-	public String getReadLockString(Timeout timeout) {
+	public String[] getCreateSchemaCommand(String schemaName) {
 		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+				"No create schema syntax supported by " + getClass().getName() );
 	}
 
 	@Override
-	public String getReadLockString(String aliases, Timeout timeout) {
+	public String[] getDropSchemaCommand(String schemaName) {
 		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+				"No drop schema syntax supported by " + getClass().getName() );
 	}
 
 	@Override
-	public String getWriteLockString(int timeout) {
+	public String getCurrentSchemaCommand() {
 		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+				"No current schema syntax supported by " + getClass().getName() );
 	}
 
 	@Override
-	public String getWriteLockString(String aliases, int timeout) {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public SchemaNameResolver getSchemaNameResolver() {
+		// Spanner does not have a notion of database name schemas, so return "".
+		return (connection, dialect) -> "";
 	}
 
 	@Override
-	public String getReadLockString(int timeout) {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public boolean qualifyIndexName() {
+		return false;
 	}
 
 	@Override
-	public String getReadLockString(String aliases, int timeout) {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public String getAddPrimaryKeyConstraintString(String constraintName) {
+		throw new UnsupportedOperationException( "Cannot add primary key constraint in Cloud Spanner." );
 	}
 
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// Lock acquisition functions
+
 	@Override
-	public String getForUpdateNowaitString() {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public LockingSupport getLockingSupport() {
+		return SPANNER_LOCKING_SUPPORT;
 	}
 
 	@Override
-	public String getForUpdateNowaitString(String aliases) {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public LockingClauseStrategy getLockingClauseStrategy(QuerySpec querySpec, LockOptions lockOptions) {
+		if ( getPessimisticLockStyle() != PessimisticLockStyle.CLAUSE || lockOptions == null ) {
+			return NON_CLAUSE_STRATEGY;
+		}
+		final var lockKind = PessimisticLockKind.interpret( lockOptions.getLockMode() );
+		if ( lockKind == PessimisticLockKind.NONE ) {
+			return NON_CLAUSE_STRATEGY;
+		}
+		if ( lockOptions.getTimeout() != null ) {
+			validateSpannerLockTimeout( lockOptions.getTimeout().milliseconds() );
+		}
+		return buildLockingClauseStrategy(
+				lockKind, RowLockStrategy.NONE, lockOptions, querySpec.getRootPathsForLocking() );
 	}
 
-
 	@Override
-	public String getForUpdateSkipLockedString() {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public String getForUpdateString(LockOptions lockOptions) {
+		if ( lockOptions != null && lockOptions.getTimeout() != null ) {
+			validateSpannerLockTimeout( lockOptions.getTimeout().milliseconds() );
+		}
+		return getForUpdateString();
 	}
 
 	@Override
-	public String getForUpdateSkipLockedString(String aliases) {
-		throw new UnsupportedOperationException(
-				"Cloud Spanner does not support selecting for lock acquisition." );
+	public String getWriteLockString(int timeout) {
+		validateSpannerLockTimeout( timeout );
+		return getForUpdateString();
 	}
 
-	/* Unsupported Hibernate Exporters */
-
 	@Override
-	public Exporter<Sequence> getSequenceExporter() {
-		return NOOP_EXPORTER;
+	public String getWriteLockString(Timeout timeout) {
+		return getWriteLockString( timeout.milliseconds() );
 	}
 
 	@Override
-	public Exporter<ForeignKey> getForeignKeyExporter() {
-		return NOOP_EXPORTER;
+	public String getReadLockString(int timeout) {
+		validateSpannerLockTimeout( timeout );
+		return getForUpdateString();
 	}
 
 	@Override
-	public Exporter<UniqueKey> getUniqueKeyExporter() {
-		return NOOP_EXPORTER;
+	public String getReadLockString(Timeout timeout) {
+		return getReadLockString( timeout.milliseconds() );
 	}
 
 	@Override
-	public String applyLocksToSql(
-			String sql,
-			LockOptions aliasedLockOptions,
-			Map<String, String[]> keyColumnNames) {
-		return sql;
+	public String getForUpdateNowaitString() {
+		throw new UnsupportedOperationException( "Spanner does not support no wait." );
 	}
 
 	@Override
-	public UniqueDelegate getUniqueDelegate() {
-		return NOOP_UNIQUE_DELEGATE;
+	public String getForUpdateNowaitString(String aliases) {
+		throw new UnsupportedOperationException( "Spanner does not support no wait." );
 	}
 
 	@Override
-	public boolean supportsCircularCascadeDeleteConstraints() {
-		return false;
+	public String getForUpdateSkipLockedString() {
+		throw new UnsupportedOperationException( "Spanner does not support skip locked." );
 	}
 
 	@Override
-	public boolean supportsCascadeDelete() {
-		return false;
+	public String getForUpdateSkipLockedString(String aliases) {
+		throw new UnsupportedOperationException( "Spanner does not support skip locked." );
+	}
+
+	private static void validateSpannerLockTimeout(int millis) {
+		if ( Timeouts.isRealTimeout( millis ) ) {
+			throw new UnsupportedOperationException( "Spanner does not support lock timeout." );
+		}
+		if ( millis == Timeouts.SKIP_LOCKED_MILLI ) {
+			throw new UnsupportedOperationException( "Spanner does not support skip locked." );
+		}
+		if ( millis == Timeouts.NO_WAIT_MILLI ) {
+			throw new UnsupportedOperationException( "Spanner does not support no wait." );
+		}
 	}
 
 	@Override
@@ -895,68 +1331,145 @@ public boolean supportsRowValueConstructorSyntaxInInList() {
 		return false;
 	}
 
-	/* Type conversion and casting */
-
-	/**
-	 * A no-op {@link Exporter} which is responsible for returning empty Create and Drop SQL strings.
-	 *
-	 * @author Daniel Zou
-	 */
-	static class EmptyExporter<T extends Exportable> implements Exporter<T> {
+	@Override
+	public DmlTargetColumnQualifierSupport getDmlTargetColumnQualifierSupport() {
+		return DmlTargetColumnQualifierSupport.TABLE_ALIAS;
+	}
 
-		@Override
-		public String[] getSqlCreateStrings(T exportable, Metadata metadata, SqlStringGenerationContext context) {
-			return ArrayHelper.EMPTY_STRING_ARRAY;
+	@Override
+	public IdentifierHelper buildIdentifierHelper(
+			IdentifierHelperBuilder builder,
+			DatabaseMetaData metadata) throws SQLException {
+		if ( metadata == null ) {
+			builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.MIXED );
 		}
+		builder.applyReservedWords( metadata );
+		builder.setAutoQuoteKeywords( true );
+		builder.setAutoQuoteDollar( true );
+		return super.buildIdentifierHelper( builder, metadata );
+	}
 
-		@Override
-		public String[] getSqlDropStrings(T exportable, Metadata metadata, SqlStringGenerationContext context) {
-			return ArrayHelper.EMPTY_STRING_ARRAY;
-		}
+	@Override
+	public ScrollMode defaultScrollMode() {
+		return ScrollMode.FORWARD_ONLY;
 	}
 
-	/**
-	 * A locking strategy for the Cloud Spanner dialect that does nothing. Cloud Spanner does not
-	 * support locking.
-	 *
-	 * @author Chengyuan Zhao
-	 */
-	static class DoNothingLockingStrategy implements LockingStrategy {
+	@Override
+	public String getTruncateTableStatement(String tableName) {
+		// spanner doesn't have truncate command, so we delete
+		return "delete from " + tableName + " where true";
+	}
 
-		@Override
-		public void lock(
-				Object id, Object version, Object object, int timeout, SharedSessionContractImplementor session)
-				throws StaleObjectStateException, LockingStrategyException {
-			// Do nothing. Cloud Spanner doesn't have have locking strategies.
-		}
+	@Override
+	public String getSetOperatorSqlString(SetOperator operator) {
+		return switch ( operator ) {
+			case UNION -> "union distinct";
+			case INTERSECT -> "intersect distinct";
+			case EXCEPT -> "except distinct";
+			default -> super.getSetOperatorSqlString( operator );
+		};
 	}
 
-	/**
-	 * A no-op delegate for generating Unique-Constraints. Cloud Spanner offers unique-restrictions
-	 * via interleaved indexes with the "UNIQUE" option. This is not currently supported.
-	 *
-	 * @author Chengyuan Zhao
-	 */
-	static class DoNothingUniqueDelegate implements UniqueDelegate {
+	@Override
+	public String getDual() {
+		return "unnest([1])";
+	}
 
-		@Override
-		public String getColumnDefinitionUniquenessFragment(Column column, SqlStringGenerationContext context) {
-			return "";
-		}
+	@Override
+	public String getFromDualForSelectOnly() {
+		return " from " + getDual() + " dual";
+	}
 
-		@Override
-		public String getTableCreationUniqueConstraintsFragment(Table table, SqlStringGenerationContext context) {
-			return "";
-		}
+	@Override
+	public boolean supportsLateral() {
+		// Spanner does not support the `LATERAL` keyword natively.
+		// However, we return true here because `SpannerSqlAstTranslator` emulates
+		// lateral joins using the `UNNEST(ARRAY(select as struct..)) alias` syntax.
+		return true;
+	}
 
-		@Override
-		public String getAlterTableToAddUniqueKeyCommand(UniqueKey uniqueKey, Metadata metadata, SqlStringGenerationContext context) {
-			return "";
-		}
+	@Override
+	public boolean supportsLobValueChangePropagation() {
+		return false;
+	}
+
+	@Override
+	public NullOrdering getNullOrdering() {
+		return NullOrdering.SMALLEST;
+	}
+
+	@Override
+	public boolean supportsNullPrecedence() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsWithClauseInSubquery() {
+		return false;
+	}
 
-		@Override
-		public String getAlterTableToDropUniqueKeyCommand(UniqueKey uniqueKey, Metadata metadata, SqlStringGenerationContext context) {
-			return "";
+	@Override
+	public boolean supportsCteHeaderColumnList() {
+		return false;
+	}
+
+	@Override
+	public boolean supportsTupleDistinctCounts() {
+		return false;
+	}
+
+	@Override
+	public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
+		return (sqlException, message, sql) -> {
+			final String sqlMessage = sqlException.getMessage();
+			if ( sqlMessage != null ) {
+				Matcher matcher = NOT_NULL_PATTERN.matcher( sqlMessage );
+				if ( matcher.matches() ) {
+					String group = matcher.group( 1 ) != null ? matcher.group( 1 ) : matcher.group( 2 );
+					return new ConstraintViolationException( message, sqlException, sql, ConstraintViolationException.ConstraintKind.NOT_NULL, extractConstraintName( group ) );
+				}
+
+				matcher = NOT_NULL_PATTERN_2.matcher( sqlMessage );
+				if ( matcher.matches() ) {
+					return new ConstraintViolationException( message, sqlException, sql, ConstraintViolationException.ConstraintKind.NOT_NULL, extractConstraintName( matcher.group( 1 ) ) );
+				}
+
+				matcher = UNIQUE_INDEX_PATTERN.matcher( sqlMessage );
+				if ( matcher.matches() ) {
+					return new ConstraintViolationException( message, sqlException, sql, ConstraintViolationException.ConstraintKind.UNIQUE, extractConstraintName( matcher.group( 1 ) ) );
+				}
+
+				if ( sqlMessage.contains( "Failed to insert row with primary key" ) ) {
+					return new ConstraintViolationException( message, sqlException, sql, ConstraintViolationException.ConstraintKind.UNIQUE, null );
+				}
+
+				if ( sqlMessage.contains( "Table not found" ) ) {
+					return new SQLGrammarException( message, sqlException, sql );
+				}
+
+				matcher = CHECK_PATTERN.matcher( sqlMessage );
+				if ( matcher.matches() ) {
+					return new ConstraintViolationException( message, sqlException, sql, ConstraintViolationException.ConstraintKind.CHECK, extractConstraintName( matcher.group( 1 ) ) );
+				}
+
+				matcher = FK_PATTERN.matcher( sqlMessage );
+				if ( matcher.matches() ) {
+					return new ConstraintViolationException( message, sqlException, sql, ConstraintViolationException.ConstraintKind.FOREIGN_KEY, extractConstraintName( matcher.group( 1 ) ) );
+				}
+			}
+			return null;
+		};
+	}
+
+	private String extractConstraintName(String name) {
+		if ( name == null ) {
+			return null;
+		}
+		name = name.replace( "`", "" ).replace( "\"", "" ).replace( "'", "" ).trim();
+		int dotIndex = name.lastIndexOf( '.' );
+		if ( dotIndex > -1 ) {
+			name = name.substring( dotIndex + 1 );
 		}
+		return name;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialectTableExporter.java b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialectTableExporter.java
index a5e9d0dc339a..47ca8999727d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialectTableExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SpannerDialectTableExporter.java
@@ -4,22 +4,19 @@
  */
 package org.hibernate.dialect;
 
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.mapping.Column;
-import org.hibernate.mapping.Index;
+import org.hibernate.mapping.PrimaryKey;
 import org.hibernate.mapping.Table;
-import org.hibernate.tool.schema.spi.Exporter;
+import org.hibernate.mapping.UniqueKey;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.tool.schema.internal.ColumnValue;
+import org.hibernate.tool.schema.internal.StandardTableExporter;
 
-import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_STRING_ARRAY;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.stream.Stream;
 
 /**
  * The exporter for Cloud Spanner CREATE and DROP table statements.
@@ -27,90 +24,73 @@
  * @author Chengyuan Zhao
  * @author Daniel Zou
  */
-class SpannerDialectTableExporter implements Exporter<Table> {
+class SpannerDialectTableExporter extends StandardTableExporter {
 
-	private final SpannerDialect spannerDialect;
-
-	private final String createTableTemplate;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param spannerDialect a Cloud Spanner dialect.
-	 */
 	public SpannerDialectTableExporter(SpannerDialect spannerDialect) {
-		this.spannerDialect = spannerDialect;
-		this.createTableTemplate =
-				this.spannerDialect.getCreateTableString() + " {0} ({1}) PRIMARY KEY ({2})";
+		super( spannerDialect );
 	}
 
 	@Override
 	public String[] getSqlCreateStrings(Table table, Metadata metadata, SqlStringGenerationContext context) {
+		// Spanner mandates that primary key should be present in all the tables. For element collection tables or
+		// sequence tables, there will be no primary key. In order to fix the problem, we randomly generate
+		// the ID column with BIT_REVERSED_POSITIVE sequence
+		if ( !table.hasPrimaryKey() && (!table.getForeignKeyCollection().isEmpty() || isSequenceTable(table, context) || isHistoryOrAuditedTable(table, metadata))) {
+			Column column = getAutoGeneratedPrimaryKeyColumn( table, metadata );
+			table.addColumn( column );
 
-		Collection<Column> keyColumns;
+			PrimaryKey primaryKey = new PrimaryKey( table );
+			primaryKey.addColumn( column );
 
-		if ( table.hasPrimaryKey() ) {
-			// a typical table that corresponds to an entity type
-			keyColumns = table.getPrimaryKey().getColumns();
-		}
-		else if ( !table.getForeignKeyCollection().isEmpty() ) {
-			// a table with no PK's but has FK's; often corresponds to element collection properties
-			keyColumns = table.getColumns();
-		}
-		else {
-			// the case corresponding to a sequence-table that will only have 1 row.
-			keyColumns = Collections.emptyList();
+			table.setPrimaryKey( primaryKey );
 		}
 
-		return getTableString( table, metadata, keyColumns, context );
+		return super.getSqlCreateStrings( table, metadata, context );
 	}
 
-	private String[] getTableString(Table table, Metadata metadata, Iterable<Column> keyColumns, SqlStringGenerationContext context) {
-		String primaryKeyColNames = StreamSupport.stream( keyColumns.spliterator(), false )
-				.map( Column::getName )
-				.collect( Collectors.joining( "," ) );
-
-		StringJoiner colsAndTypes = new StringJoiner( "," );
-
-
-		for ( Column column : table.getColumns() ) {
-			final String sqlType = column.getSqlType( metadata );
-			final String columnDeclaration =
-					column.getName()
-							+ " " + sqlType
-							+ ( column.isNullable() ? this.spannerDialect.getNullColumnString( sqlType ) : " not null" );
-			colsAndTypes.add( columnDeclaration );
-		}
-
-		ArrayList<String> statements = new ArrayList<>();
-		statements.add(
-				MessageFormat.format(
-						this.createTableTemplate,
-						context.format( table.getQualifiedTableName() ),
-						colsAndTypes.toString(),
-						primaryKeyColNames
-				)
-		);
-
-		return statements.toArray(EMPTY_STRING_ARRAY);
+	private boolean isSequenceTable(Table table, SqlStringGenerationContext context) {
+		return table.getColumnSpan() == 1 && table.getInitCommands( context ).size() == 1;
 	}
 
 	@Override
 	public String[] getSqlDropStrings(Table table, Metadata metadata, SqlStringGenerationContext context) {
-
-		/* Cloud Spanner requires examining the metadata to find all indexes and interleaved tables.
-		 * These must be dropped before the given table can be dropped.
-		 * The current implementation does not support interleaved tables.
-		 */
-
-		ArrayList<String> dropStrings = new ArrayList<>();
-
-		for ( Index index : table.getIndexes().values() ) {
-			dropStrings.add( "drop index " + index.getName() );
+		final ArrayList<String> sqlDropIndexStrings = new ArrayList<>();
+		for ( var index : table.getIndexes().values() ) {
+			sqlDropIndexStrings.add( sqlDropIndexString( index.getName() ) );
+		}
+		for ( UniqueKey uniqueKey : table.getUniqueKeys().values() ) {
+			sqlDropIndexStrings.add( sqlDropIndexString( uniqueKey.getName() ) );
 		}
+		for ( Column column : table.getColumns() ) {
+			if ( column.isUnique() ) {
+				sqlDropIndexStrings.add( sqlDropIndexString( column.getUniqueKeyName() ) );
+			}
+		}
+		String[] sqlDropStrings = super.getSqlDropStrings( table, metadata, context );
+		return Stream.concat( sqlDropIndexStrings.stream(), Stream.of( sqlDropStrings ) )
+				.toArray( String[]::new );
+	}
 
-		dropStrings.add( this.spannerDialect.getDropTableString( context.format( table.getQualifiedTableName() ) ) );
+	private String sqlDropIndexString(String indexName) {
+		return "drop index if exists " + indexName;
+	}
+
+	private Column getAutoGeneratedPrimaryKeyColumn(Table table, Metadata metadata) {
+		Column column = new Column( "rowid" );
+		column.setSqlTypeCode( Types.BIGINT );
+		column.setNullable( false );
+		column.setSqlType( "int64" );
+		column.setIdentity( true );
+		column.setOptions( "hidden" );
+		column.setValue( new ColumnValue( metadata.getDatabase(), table, column, metadata.getDatabase().getTypeConfiguration().getBasicTypeForJavaType( Long.class ) ) );
+		return column;
+	}
 
-		return dropStrings.toArray( new String[0] );
+	private boolean isHistoryOrAuditedTable(Table targetTable, Metadata metadata) {
+		return metadata.getCollectionBindings().stream()
+					.anyMatch( collection -> collection.getAuxiliaryTable() == targetTable )
+			|| metadata.getEntityBindings().stream()
+					.filter( entity -> entity instanceof RootClass )
+					.anyMatch( entity -> ((RootClass) entity).getAuxiliaryTable() == targetTable );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
index fccfbd3fa031..594644b06e99 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
@@ -42,7 +42,6 @@
 import org.hibernate.type.descriptor.jdbc.TimestampJdbcType;
 import org.hibernate.type.descriptor.jdbc.TinyIntJdbcType;
 import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 
 import java.sql.SQLException;
 import java.sql.Types;
@@ -119,6 +118,21 @@ public SybaseASEDialect(DialectResolutionInfo info) {
 		pageSize = pageSize( info );
 	}
 
+	@Override
+	public DatabaseVersion determineDatabaseVersion(DialectResolutionInfo info) {
+		if ( SybaseDriverKind.determineKind( info ) == SybaseDriverKind.JTDS
+			&& info.getDatabaseMinorVersion() != DatabaseVersion.NO_VERSION ) {
+			// The jTDS driver encodes the SP part into the minor version, so we have to unpack this
+			final int infoMinorVersion = info.getDatabaseMinorVersion();
+			final int minorVersion = infoMinorVersion / 10;
+			final int microVersion = infoMinorVersion % 10;
+			return new SimpleDatabaseVersion( info.getDatabaseMajorVersion(), minorVersion, microVersion );
+		}
+		else {
+			return super.determineDatabaseVersion( info );
+		}
+	}
+
 	@Override
 	protected String columnType(int sqlTypeCode) {
 		return switch ( sqlTypeCode ) {
@@ -138,7 +152,7 @@ protected String columnType(int sqlTypeCode) {
 	@Override
 	protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.registerColumnTypes( typeContributions, serviceRegistry );
-		final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 
 		// According to Wikipedia bigdatetime and bigtime were added in 15.5
 		// But with jTDS we can't use them as the driver can't handle the types
@@ -205,8 +219,8 @@ public long getDefaultLobLength() {
 	private static boolean isAnsiNull(DialectResolutionInfo info) {
 		final var databaseMetaData = info.getDatabaseMetadata();
 		if ( databaseMetaData != null ) {
-			try ( var statement = databaseMetaData.getConnection().createStatement() ) {
-				final var resultSet = statement.executeQuery( "SELECT @@options" );
+			try ( var statement = databaseMetaData.getConnection().createStatement();
+					var resultSet = statement.executeQuery( "SELECT @@options" ) ) {
 				if ( resultSet.next() ) {
 					final byte[] optionBytes = resultSet.getBytes( 1 );
 					// By trial and error, enabling and disabling ansinull revealed that this bit is the indicator
@@ -224,8 +238,8 @@ private static boolean isAnsiNull(DialectResolutionInfo info) {
 	private int pageSize(DialectResolutionInfo info) {
 		final var databaseMetaData = info.getDatabaseMetadata();
 		if ( databaseMetaData != null ) {
-			try ( var statement = databaseMetaData.getConnection().createStatement() ) {
-				final var resultSet = statement.executeQuery( "SELECT @@maxpagesize" );
+			try ( var statement = databaseMetaData.getConnection().createStatement();
+					var resultSet = statement.executeQuery( "SELECT @@maxpagesize" ) ) {
 				if ( resultSet.next() ) {
 					return resultSet.getInt( 1 );
 				}
@@ -343,17 +357,15 @@ public String timestampaddPattern(TemporalUnit unit, TemporalType temporalType,
 
 	@Override
 	public String timestampdiffPattern(TemporalUnit unit, TemporalType fromTemporalType, TemporalType toTemporalType) {
-		switch ( unit ) {
-			case NANOSECOND:
-				return "(cast(datediff(ms,?2,?3) as numeric(21))*1000000)";
-//				return "(cast(datediff(mcs,?2,?3) as numeric(21))*1000)";
-//				}
-			case NATIVE:
-				return "cast(datediff(ms,?2,?3) as numeric(21))";
-//				return "cast(datediff(mcs,cast(?2 as bigdatetime),cast(?3 as bigdatetime)) as numeric(21))";
-			default:
-				return "datediff(?1,?2,?3)";
-		}
+		return switch ( unit ) {
+			case NANOSECOND ->
+//					"(cast(datediff(mcs,?2,?3) as numeric(21))*1000)";
+					"(cast(datediff(ms,?2,?3) as numeric(21))*1000000)";
+			case NATIVE ->
+//					"cast(datediff(mcs,cast(?2 as bigdatetime),cast(?3 as bigdatetime)) as numeric(21))";
+					"cast(datediff(ms,?2,?3) as numeric(21))";
+			default -> "datediff(?1,?2,?3)";
+		};
 	}
 
 	@Override
@@ -644,13 +656,15 @@ public String toQuotedIdentifier(String name) {
 		if ( name == null || name.isEmpty() ) {
 			return name;
 		}
-		if ( name.charAt( 0 ) == '#' ) {
+		else if ( name.charAt( 0 ) == '#' ) {
 			// Temporary tables must start with a '#' character,
 			// but Sybase doesn't support quoting of such identifiers,
 			// so we simply don't apply quoting in this case
 			return name;
 		}
-		return super.toQuotedIdentifier( name );
+		else {
+			return super.toQuotedIdentifier( name );
+		}
 	}
 
 	@Override
@@ -695,7 +709,15 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 						new QueryTimeoutException( message, sqlException, sql );
 					case "JZ0TO", "JZ006" ->
 						new LockTimeoutException( message, sqlException, sql );
-					case "S1000", "23000" ->
+					case "S1000" -> {
+						if ( errorCode == 12205 ) {
+							yield new LockTimeoutException( message, sqlException, sql );
+						}
+						else {
+							yield convertConstraintViolation( sqlException, message, sql, errorCode );
+						}
+					}
+					case "23000" ->
 						convertConstraintViolation( sqlException, message, sql, errorCode );
 					case "ZZZZZ" -> {
 						if ( 515 == errorCode ) {
@@ -703,6 +725,9 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 							yield new ConstraintViolationException( message, sqlException, sql, ConstraintKind.NOT_NULL,
 									getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) );
 						}
+						else if ( errorCode == 12205 ) {
+							yield new LockTimeoutException( message, sqlException, sql );
+						}
 						else {
 							yield null;
 						}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java
index a7bca1173da3..805f168a8305 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java
@@ -231,25 +231,35 @@ public int getParameterCountLimit() {
 	@Override
 	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.contributeTypes(typeContributions, serviceRegistry);
-		final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration()
+		final var jdbcTypeRegistry = typeContributions.getTypeConfiguration()
 				.getJdbcTypeRegistry();
 		if ( driverKind == SybaseDriverKind.JTDS ) {
-			jdbcTypeRegistry.addDescriptor( Types.TINYINT, TinyIntAsSmallIntJdbcType.INSTANCE );
+			jdbcTypeRegistry.addDescriptor( TinyIntAsSmallIntJdbcType.INSTANCE );
 
 			// The jTDS driver doesn't support the JDBC4 signatures using 'long length' for stream bindings
-			jdbcTypeRegistry.addDescriptor( Types.CLOB, ClobJdbcType.CLOB_BINDING );
-			jdbcTypeRegistry.addDescriptor( Types.NCLOB, NClobJdbcType.NCLOB_BINDING );
+			jdbcTypeRegistry.addDescriptor( ClobJdbcType.CLOB_BINDING );
+
+			// Need to register specialized JdbcType instances for jTDS because it throws an AbstractMethodError
+			// when invoking nationalized methods and requires binding through UTF-16LE bytes
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsNClobJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsNCharJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsNVarcharJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsLongNVarcharJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsJsonAsStringJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addDescriptor( SybaseJtdsXmlAsStringJdbcType.JTDS_INSTANCE );
+			jdbcTypeRegistry.addTypeConstructor( SybaseJtdsJsonAsStringArrayJdbcTypeConstructor.INSTANCE );
+			jdbcTypeRegistry.addTypeConstructor( SybaseJtdsXmlAsStringArrayJdbcTypeConstructor.INSTANCE );
 		}
 		else {
 			// jConnect driver only conditionally supports getClob/getNClob depending on a server setting. See
 			//		- https://help.sap.com/doc/e3cb6844decf441e85e4670e1cf48c9b/16.0.3.6/en-US/SAP_jConnect_Programmers_Reference_en.pdf
 			// 		- https://infocenter.sybase.com/help/index.jsp?topic=/com.sybase.infocenter.dc20155.1570/html/OS_SDK_nf/CIHJFDDH.htm
 			//		- HHH-7889
-			jdbcTypeRegistry.addDescriptor( Types.CLOB, ClobJdbcType.STREAM_BINDING_EXTRACTING );
-			jdbcTypeRegistry.addDescriptor( Types.NCLOB, ClobJdbcType.STREAM_BINDING_EXTRACTING );
+			jdbcTypeRegistry.addDescriptor( ClobJdbcType.STREAM_BINDING_EXTRACTING );
+			jdbcTypeRegistry.addDescriptor( NClobJdbcType.STREAM_BINDING_EXTRACTING );
 		}
 
-		jdbcTypeRegistry.addDescriptor( Types.BLOB, BlobJdbcType.PRIMITIVE_ARRAY_BINDING );
+		jdbcTypeRegistry.addDescriptor( BlobJdbcType.PRIMITIVE_ARRAY_BINDING );
 
 		// Sybase requires a custom binder for binding untyped nulls with the NULL type
 		typeContributions.contributeJdbcType( ObjectNullAsBinaryTypeJdbcType.INSTANCE );
@@ -279,6 +289,12 @@ public NationalizationSupport getNationalizationSupport() {
 		return super.getNationalizationSupport();
 	}
 
+	@Override
+	public boolean supportsNationalizedMethods() {
+		// The jTDS driver doesn't support nationalized methods, but the jconn driver does
+		return driverKind != SybaseDriverKind.JTDS;
+	}
+
 	@Override
 	public boolean stripsTrailingSpacesFromChar() {
 		return true;
@@ -604,10 +620,9 @@ public String resolveSchemaName(Connection connection, Dialect dialect) throws S
 				);
 			}
 
-			try ( var statement = connection.createStatement() ) {
-				try ( var resultSet = statement.executeQuery( command ) ) {
-					return resultSet.next() ? resultSet.getString( 1 ) : null;
-				}
+			try ( var statement = connection.createStatement();
+					var resultSet = statement.executeQuery( command ) ) {
+				return resultSet.next() ? resultSet.getString( 1 ) : null;
 			}
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDriverKind.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDriverKind.java
index f6eac930a591..d8f7cb50d2c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDriverKind.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDriverKind.java
@@ -21,13 +21,10 @@ public static SybaseDriverKind determineKind(DialectResolutionInfo dialectResolu
 		if ( driverName == null ) {
 			return OTHER;
 		}
-		switch ( driverName ) {
-			case "jConnect (TM) for JDBC (TM)":
-				return JCONNECT;
-			case "jTDS Type 4 JDBC Driver for MS SQL Server and Sybase":
-				return JTDS;
-			default:
-				return OTHER;
-		}
+		return switch ( driverName ) {
+			case "jConnect (TM) for JDBC (TM)" -> JCONNECT;
+			case "jTDS Type 4 JDBC Driver for MS SQL Server and Sybase" -> JTDS;
+			default -> OTHER;
+		};
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsJsonAsStringArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsJsonAsStringArrayJdbcType.java
new file mode 100644
index 000000000000..e8490d5ca34a
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsJsonAsStringArrayJdbcType.java
@@ -0,0 +1,134 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.BasicExtractor;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
+import org.hibernate.type.descriptor.jdbc.JsonAsStringArrayJdbcType;
+
+import java.nio.charset.StandardCharsets;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * Specialized type mapping for {@code JSON} that binds UTF-16LE bytes,
+ * because the jTDS driver can't handle Unicode characters and doesn't support nationalized methods.
+ * For extraction, the {@code getString} method works fine though.
+ */
+public class SybaseJtdsJsonAsStringArrayJdbcType extends JsonAsStringArrayJdbcType {
+
+	public SybaseJtdsJsonAsStringArrayJdbcType(JdbcType elementJdbcType) {
+		super( elementJdbcType, SqlTypes.NCLOB );
+	}
+
+	public SybaseJtdsJsonAsStringArrayJdbcType(JdbcType elementJdbcType, int ddlTypeCode) {
+		super( elementJdbcType, ddlTypeCode );
+	}
+
+	@Override
+	public String toString() {
+		return "SybaseJtdsXmlAsStringArrayJdbcType";
+	}
+
+	@Override
+	public JdbcType resolveIndicatedType(JdbcTypeIndicators indicators, JavaType<?> domainJtd) {
+		// Depending on the size of the column, we might have to adjust the jdbc type code for DDL.
+		// In some DBMS we can compare LOBs with special functions which is handled in the SqlAstTranslators,
+		// but that requires the correct jdbc type code to be available, which we ensure this way
+		if ( needsLob( indicators ) ) {
+			return indicators.isNationalized()
+					? new SybaseJtdsJsonAsStringArrayJdbcType( getElementJdbcType(), SqlTypes.NCLOB )
+					: new SybaseJtdsJsonAsStringArrayJdbcType( getElementJdbcType(), SqlTypes.CLOB );
+		}
+		else {
+			return indicators.isNationalized()
+					? new SybaseJtdsJsonAsStringArrayJdbcType( getElementJdbcType(), SqlTypes.LONG32NVARCHAR )
+					: new SybaseJtdsJsonAsStringArrayJdbcType( getElementJdbcType(), SqlTypes.LONG32VARCHAR );
+		}
+	}
+
+	@Override
+	public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
+		if ( !isNationalized() ) {
+			return super.getBinder( javaType );
+		}
+		return new BasicBinder<>( javaType, this ) {
+
+			private SybaseJtdsJsonAsStringArrayJdbcType getJsonAsStringArrayJdbcType() {
+				return (SybaseJtdsJsonAsStringArrayJdbcType) getJdbcType();
+			}
+
+			@Override
+			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
+					throws SQLException {
+				final SybaseJtdsJsonAsStringArrayJdbcType jdbcType = getJsonAsStringArrayJdbcType();
+				final String xml = jdbcType.toString( value, getJavaType(), options );
+				st.setBytes( index, xml.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+					throws SQLException {
+				final SybaseJtdsJsonAsStringArrayJdbcType jdbcType = getJsonAsStringArrayJdbcType();
+				final String xml = jdbcType.toString( value, getJavaType(), options );
+				st.setBytes( name, xml.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+				st.setNull( index, SqlTypes.VARCHAR );
+			}
+
+			@Override
+			protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+					throws SQLException {
+				st.setNull( name, SqlTypes.VARCHAR );
+			}
+		};
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
+		if ( !isNationalized() ) {
+			return super.getExtractor( javaType );
+		}
+		return new BasicExtractor<>( javaType, this ) {
+
+			private SybaseJtdsJsonAsStringArrayJdbcType getJsonAsStringArrayJdbcType() {
+				return (SybaseJtdsJsonAsStringArrayJdbcType) getJdbcType();
+			}
+
+			@Override
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+				final String value = rs.getString( paramIndex );
+				return getJsonAsStringArrayJdbcType().fromString( value, getJavaType(), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options)
+					throws SQLException {
+				final String value = statement.getString( index );
+				return getJsonAsStringArrayJdbcType().fromString( value, getJavaType(), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
+					throws SQLException {
+				final String value = statement.getString( name );
+				return getJsonAsStringArrayJdbcType().fromString( value, getJavaType(), options );
+			}
+
+		};
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsJsonAsStringArrayJdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsJsonAsStringArrayJdbcTypeConstructor.java
new file mode 100644
index 000000000000..2c6b4763aa3b
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsJsonAsStringArrayJdbcTypeConstructor.java
@@ -0,0 +1,41 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+
+import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
+import org.hibernate.type.BasicType;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeConstructor;
+import org.hibernate.type.spi.TypeConfiguration;
+
+/**
+ * Factory for {@link SybaseJtdsJsonAsStringArrayJdbcType}.
+ */
+public class SybaseJtdsJsonAsStringArrayJdbcTypeConstructor implements JdbcTypeConstructor {
+	public static final SybaseJtdsJsonAsStringArrayJdbcTypeConstructor INSTANCE = new SybaseJtdsJsonAsStringArrayJdbcTypeConstructor();
+
+	public JdbcType resolveType(
+			TypeConfiguration typeConfiguration,
+			Dialect dialect,
+			BasicType<?> elementType,
+			ColumnTypeInformation columnTypeInformation) {
+		return resolveType( typeConfiguration, dialect, elementType.getJdbcType(), columnTypeInformation );
+	}
+
+	public JdbcType resolveType(
+			TypeConfiguration typeConfiguration,
+			Dialect dialect,
+			JdbcType elementType,
+			ColumnTypeInformation columnTypeInformation) {
+		return new SybaseJtdsJsonAsStringArrayJdbcType( elementType, SqlTypes.NCLOB );
+	}
+
+	@Override
+	public int getDefaultSqlTypeCode() {
+		return SqlTypes.JSON_ARRAY;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsJsonAsStringJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsJsonAsStringJdbcType.java
new file mode 100644
index 000000000000..1af946157aaa
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsJsonAsStringJdbcType.java
@@ -0,0 +1,164 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
+import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.BasicExtractor;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
+import org.hibernate.type.descriptor.jdbc.JsonAsStringJdbcType;
+
+import java.nio.charset.StandardCharsets;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * Specialized type mapping for {@code JSON} that binds UTF-16LE bytes,
+ * because the jTDS driver can't handle Unicode characters and doesn't support nationalized methods.
+ * For extraction, the {@code getString} method works fine though.
+ */
+public class SybaseJtdsJsonAsStringJdbcType extends JsonAsStringJdbcType {
+
+	public static final SybaseJtdsJsonAsStringJdbcType JTDS_VARCHAR_INSTANCE =
+			new SybaseJtdsJsonAsStringJdbcType( SqlTypes.LONG32VARCHAR, null );
+	public static final SybaseJtdsJsonAsStringJdbcType JTDS_NVARCHAR_INSTANCE =
+			new SybaseJtdsJsonAsStringJdbcType( SqlTypes.LONG32NVARCHAR, null );
+	public static final SybaseJtdsJsonAsStringJdbcType JTDS_CLOB_INSTANCE =
+			new SybaseJtdsJsonAsStringJdbcType( SqlTypes.CLOB, null );
+	public static final SybaseJtdsJsonAsStringJdbcType JTDS_INSTANCE =
+			new SybaseJtdsJsonAsStringJdbcType( SqlTypes.NCLOB, null );
+
+	public SybaseJtdsJsonAsStringJdbcType(int ddlTypeCode, EmbeddableMappingType embeddableMappingType) {
+		super( ddlTypeCode, embeddableMappingType );
+	}
+
+	@Override
+	public AggregateJdbcType resolveAggregateJdbcType(
+			EmbeddableMappingType mappingType,
+			String sqlType,
+			RuntimeModelCreationContext creationContext) {
+		return new SybaseJtdsJsonAsStringJdbcType( getDdlTypeCode(), mappingType );
+	}
+
+	@Override
+	public String toString() {
+		return "SybaseJtdsJsonAsStringJdbcType";
+	}
+
+	@Override
+	public JdbcType resolveIndicatedType(JdbcTypeIndicators indicators, JavaType<?> domainJtd) {
+		// Depending on the size of the column, we might have to adjust the jdbc type code for DDL.
+		// In some DBMS we can compare LOBs with special functions which is handled in the SqlAstTranslators,
+		// but that requires the correct jdbc type code to be available, which we ensure this way
+		if ( getEmbeddableMappingType() == null ) {
+			if ( needsLob( indicators ) ) {
+				return indicators.isNationalized() ? JTDS_INSTANCE : JTDS_CLOB_INSTANCE;
+			}
+			else {
+				return indicators.isNationalized() ? JTDS_NVARCHAR_INSTANCE : JTDS_VARCHAR_INSTANCE;
+			}
+		}
+		else {
+			if ( needsLob( indicators ) ) {
+				return new SybaseJtdsJsonAsStringJdbcType(
+						indicators.isNationalized() ? SqlTypes.NCLOB : SqlTypes.CLOB,
+						getEmbeddableMappingType()
+				);
+			}
+			else {
+				return new SybaseJtdsJsonAsStringJdbcType(
+						indicators.isNationalized() ? SqlTypes.LONG32NVARCHAR : SqlTypes.LONG32VARCHAR,
+						getEmbeddableMappingType()
+				);
+			}
+		}
+	}
+
+	@Override
+	public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
+		if ( !isNationalized() ) {
+			return super.getBinder( javaType );
+		}
+		return new BasicBinder<>( javaType, this ) {
+
+			private SybaseJtdsJsonAsStringJdbcType getJsonAsStringJdbcType() {
+				return (SybaseJtdsJsonAsStringJdbcType) getJdbcType();
+			}
+
+			private String getXml(X value, WrapperOptions options) throws SQLException {
+				return getJsonAsStringJdbcType().toString( value, getJavaType(), options );
+			}
+
+			@Override
+			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
+					throws SQLException {
+				final String xml = getXml( value, options );
+				st.setBytes( index, xml.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+					throws SQLException {
+				final String xml = getXml( value, options );
+				st.setBytes( name, xml.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+				st.setNull( index, SqlTypes.VARCHAR );
+			}
+
+			@Override
+			protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+					throws SQLException {
+				st.setNull( name, SqlTypes.VARCHAR );
+			}
+		};
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
+		if ( !isNationalized() ) {
+			return super.getExtractor( javaType );
+		}
+		return new BasicExtractor<>( javaType, this ) {
+
+			@Override
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+				return getObject( rs.getString( paramIndex ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options)
+					throws SQLException {
+				return getObject( statement.getString( index ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
+					throws SQLException {
+				return getObject( statement.getString( name ), options );
+			}
+
+			private X getObject(String xml, WrapperOptions options) throws SQLException {
+				return xml == null ? null : getJsonAsStringJdbcType().fromString( xml, getJavaType(), options );
+			}
+
+			private SybaseJtdsJsonAsStringJdbcType getJsonAsStringJdbcType() {
+				return (SybaseJtdsJsonAsStringJdbcType) getJdbcType();
+			}
+		};
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsLongNVarcharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsLongNVarcharJdbcType.java
new file mode 100644
index 000000000000..de152f70ec09
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsLongNVarcharJdbcType.java
@@ -0,0 +1,54 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
+import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
+
+import java.sql.Types;
+
+public class SybaseJtdsLongNVarcharJdbcType extends SybaseJtdsNVarcharJdbcType {
+
+	public static final SybaseJtdsLongNVarcharJdbcType JTDS_INSTANCE = new SybaseJtdsLongNVarcharJdbcType();
+
+	public SybaseJtdsLongNVarcharJdbcType() {
+	}
+
+	@Override
+	public int getJdbcTypeCode() {
+		return Types.LONGNVARCHAR;
+	}
+
+	@Override
+	public String toString() {
+		return "SybaseJtdsLongNVarcharJdbcType";
+	}
+
+	@Override
+	public JdbcType resolveIndicatedType(
+			JdbcTypeIndicators indicators,
+			JavaType<?> domainJtd) {
+		assert domainJtd != null;
+
+		final var typeConfiguration = indicators.getTypeConfiguration();
+		final JdbcTypeRegistry jdbcTypeRegistry = typeConfiguration.getJdbcTypeRegistry();
+
+		final int jdbcTypeCode;
+		if ( indicators.isLob() ) {
+			jdbcTypeCode = indicators.isNationalized() ? Types.NCLOB : Types.CLOB;
+		}
+		else if ( shouldUseMaterializedLob( indicators ) ) {
+			jdbcTypeCode = indicators.isNationalized() ? SqlTypes.MATERIALIZED_NCLOB : SqlTypes.MATERIALIZED_CLOB;
+		}
+		else {
+			jdbcTypeCode = indicators.isNationalized() ? Types.LONGNVARCHAR : Types.LONGVARCHAR;
+		}
+
+		return jdbcTypeRegistry.getDescriptor( indicators.resolveJdbcTypeCode( jdbcTypeCode ) );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsNCharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsNCharJdbcType.java
new file mode 100644
index 000000000000..0a70b60c165c
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsNCharJdbcType.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
+import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
+
+import java.sql.Types;
+
+public class SybaseJtdsNCharJdbcType extends SybaseJtdsNVarcharJdbcType {
+
+	public static final SybaseJtdsNCharJdbcType JTDS_INSTANCE = new SybaseJtdsNCharJdbcType();
+
+	public SybaseJtdsNCharJdbcType() {
+	}
+
+	@Override
+	public int getJdbcTypeCode() {
+		return Types.NCHAR;
+	}
+
+	@Override
+	public String toString() {
+		return "SybaseJtdsNCharJdbcType";
+	}
+
+	@Override
+	public JdbcType resolveIndicatedType(
+			JdbcTypeIndicators indicators,
+			JavaType<?> domainJtd) {
+		assert domainJtd != null;
+
+		final var typeConfiguration = indicators.getTypeConfiguration();
+		final JdbcTypeRegistry jdbcTypeRegistry = typeConfiguration.getJdbcTypeRegistry();
+
+		final int jdbcTypeCode;
+		if ( indicators.isLob() ) {
+			jdbcTypeCode = indicators.isNationalized() ? Types.NCLOB : Types.CLOB;
+		}
+		else {
+			jdbcTypeCode = indicators.isNationalized() ? Types.NCHAR : Types.CHAR;
+		}
+
+		return jdbcTypeRegistry.getDescriptor( indicators.resolveJdbcTypeCode( jdbcTypeCode ) );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsNClobJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsNClobJdbcType.java
new file mode 100644
index 000000000000..a2794b5462d6
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsNClobJdbcType.java
@@ -0,0 +1,88 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.BasicExtractor;
+import org.hibernate.type.descriptor.jdbc.NClobJdbcType;
+
+import java.nio.charset.StandardCharsets;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * Specialized type mapping for {@code NCLOB} that binds UTF-16LE bytes,
+ * because the jTDS driver can't handle Unicode characters and doesn't support nationalized methods.
+ * For extraction, the {@code getString} method works fine though.
+ */
+public class SybaseJtdsNClobJdbcType extends NClobJdbcType {
+
+	public static final SybaseJtdsNClobJdbcType JTDS_INSTANCE = new SybaseJtdsNClobJdbcType();
+
+	public SybaseJtdsNClobJdbcType() {
+	}
+
+	@Override
+	public String toString() {
+		return "SybaseJtdsNClobJdbcType";
+	}
+
+	@Override
+	protected <X> BasicBinder<X> getNClobBinder(JavaType<X> javaType) {
+		return new BasicBinder<>( javaType, this ) {
+			@Override
+			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
+				final String string = javaType.unwrap( value, String.class, options );
+				st.setBytes( index, string == null ? null : string.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+					throws SQLException {
+				final String string = javaType.unwrap( value, String.class, options );
+				st.setBytes( name, string == null ? null : string.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+				st.setNull( index, Types.VARCHAR );
+			}
+
+			@Override
+			protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+					throws SQLException {
+				st.setNull( name, Types.VARCHAR );
+			}
+		};
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
+		return new BasicExtractor<>( javaType, this ) {
+			@Override
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+				return javaType.wrap( rs.getCharacterStream( paramIndex ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options)
+					throws SQLException {
+				return javaType.wrap( statement.getCharacterStream( index ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
+					throws SQLException {
+				return javaType.wrap( statement.getCharacterStream( name ), options );
+			}
+		};
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsNVarcharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsNVarcharJdbcType.java
new file mode 100644
index 000000000000..75609ae87fc5
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsNVarcharJdbcType.java
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.BasicExtractor;
+import org.hibernate.type.descriptor.jdbc.NVarcharJdbcType;
+
+import java.nio.charset.StandardCharsets;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+/**
+ * Specialized type mapping for {@code NVARCHAR} that binds/extracts UTF-16LE bytes,
+ * because the jTDS driver can't handle Unicode characters and doesn't support nationalized methods.
+ */
+public class SybaseJtdsNVarcharJdbcType extends NVarcharJdbcType {
+
+	public static final SybaseJtdsNVarcharJdbcType JTDS_INSTANCE = new SybaseJtdsNVarcharJdbcType();
+
+	public SybaseJtdsNVarcharJdbcType() {
+	}
+
+	@Override
+	public String toString() {
+		return "SybaseJtdsNVarcharJdbcType";
+	}
+
+
+	@Override
+	public <X> ValueBinder<X> getBinder(final JavaType<X> javaType) {
+		return new BasicBinder<>( javaType, this ) {
+			@Override
+			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
+				final String string = javaType.unwrap( value, String.class, options );
+				st.setBytes( index, string == null ? null : string.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+					throws SQLException {
+				final String string = javaType.unwrap( value, String.class, options );
+				st.setBytes( name, string == null ? null : string.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+				st.setNull( index, Types.VARCHAR );
+			}
+
+			@Override
+			protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+					throws SQLException {
+				st.setNull( name, Types.VARCHAR );
+			}
+		};
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
+		return new BasicExtractor<>( javaType, this ) {
+			@Override
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+				final byte[] bytes = rs.getBytes( paramIndex );
+				return bytes == null ? null : javaType.wrap( new String( bytes, StandardCharsets.UTF_16LE ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
+				final byte[] bytes = statement.getBytes( index );
+				return bytes == null ? null : javaType.wrap( new String( bytes, StandardCharsets.UTF_16LE ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options) throws SQLException {
+				final byte[] bytes = statement.getBytes( name );
+				return bytes == null ? null : javaType.wrap( new String( bytes, StandardCharsets.UTF_16LE ), options );
+			}
+		};
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsXmlAsStringArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsXmlAsStringArrayJdbcType.java
new file mode 100644
index 000000000000..764c108e00d3
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsXmlAsStringArrayJdbcType.java
@@ -0,0 +1,134 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.BasicExtractor;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
+import org.hibernate.type.descriptor.jdbc.XmlAsStringArrayJdbcType;
+
+import java.nio.charset.StandardCharsets;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * Specialized type mapping for {@code XML} that binds UTF-16LE bytes,
+ * because the jTDS driver can't handle Unicode characters and doesn't support nationalized methods.
+ * For extraction, the {@code getString} method works fine though.
+ */
+public class SybaseJtdsXmlAsStringArrayJdbcType extends XmlAsStringArrayJdbcType {
+
+	public SybaseJtdsXmlAsStringArrayJdbcType(JdbcType elementJdbcType) {
+		super( elementJdbcType, SqlTypes.NCLOB );
+	}
+
+	public SybaseJtdsXmlAsStringArrayJdbcType(JdbcType elementJdbcType, int ddlTypeCode) {
+		super( elementJdbcType, ddlTypeCode );
+	}
+
+	@Override
+	public String toString() {
+		return "SybaseJtdsXmlAsStringArrayJdbcType";
+	}
+
+	@Override
+	public JdbcType resolveIndicatedType(JdbcTypeIndicators indicators, JavaType<?> domainJtd) {
+		// Depending on the size of the column, we might have to adjust the jdbc type code for DDL.
+		// In some DBMS we can compare LOBs with special functions which is handled in the SqlAstTranslators,
+		// but that requires the correct jdbc type code to be available, which we ensure this way
+		if ( needsLob( indicators ) ) {
+			return indicators.isNationalized()
+					? new SybaseJtdsXmlAsStringArrayJdbcType( getElementJdbcType(), SqlTypes.NCLOB )
+					: new SybaseJtdsXmlAsStringArrayJdbcType( getElementJdbcType(), SqlTypes.CLOB );
+		}
+		else {
+			return indicators.isNationalized()
+					? new SybaseJtdsXmlAsStringArrayJdbcType( getElementJdbcType(), SqlTypes.LONG32NVARCHAR )
+					: new SybaseJtdsXmlAsStringArrayJdbcType( getElementJdbcType(), SqlTypes.LONG32VARCHAR );
+		}
+	}
+
+	@Override
+	public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
+		if ( !isNationalized() ) {
+			return super.getBinder( javaType );
+		}
+		return new BasicBinder<>( javaType, this ) {
+
+			private SybaseJtdsXmlAsStringArrayJdbcType getXmlAsStringArrayJdbcType() {
+				return (SybaseJtdsXmlAsStringArrayJdbcType) getJdbcType();
+			}
+
+			@Override
+			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
+					throws SQLException {
+				final SybaseJtdsXmlAsStringArrayJdbcType jdbcType = getXmlAsStringArrayJdbcType();
+				final String xml = jdbcType.toString( value, getJavaType(), options );
+				st.setBytes( index, xml.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+					throws SQLException {
+				final SybaseJtdsXmlAsStringArrayJdbcType jdbcType = getXmlAsStringArrayJdbcType();
+				final String xml = jdbcType.toString( value, getJavaType(), options );
+				st.setBytes( name, xml.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+				st.setNull( index, SqlTypes.VARCHAR );
+			}
+
+			@Override
+			protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+					throws SQLException {
+				st.setNull( name, SqlTypes.VARCHAR );
+			}
+		};
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
+		if ( !isNationalized() ) {
+			return super.getExtractor( javaType );
+		}
+		return new BasicExtractor<>( javaType, this ) {
+
+			private SybaseJtdsXmlAsStringArrayJdbcType getXmlAsStringArrayJdbcType() {
+				return (SybaseJtdsXmlAsStringArrayJdbcType) getJdbcType();
+			}
+
+			@Override
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+				final String value = rs.getString( paramIndex );
+				return getXmlAsStringArrayJdbcType().fromString( value, getJavaType(), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options)
+					throws SQLException {
+				final String value = statement.getString( index );
+				return getXmlAsStringArrayJdbcType().fromString( value, getJavaType(), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
+					throws SQLException {
+				final String value = statement.getString( name );
+				return getXmlAsStringArrayJdbcType().fromString( value, getJavaType(), options );
+			}
+
+		};
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsXmlAsStringArrayJdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsXmlAsStringArrayJdbcTypeConstructor.java
new file mode 100644
index 000000000000..43d50bbacba6
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsXmlAsStringArrayJdbcTypeConstructor.java
@@ -0,0 +1,41 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+
+import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation;
+import org.hibernate.type.BasicType;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeConstructor;
+import org.hibernate.type.spi.TypeConfiguration;
+
+/**
+ * Factory for {@link SybaseJtdsXmlAsStringArrayJdbcType}.
+ */
+public class SybaseJtdsXmlAsStringArrayJdbcTypeConstructor implements JdbcTypeConstructor {
+	public static final SybaseJtdsXmlAsStringArrayJdbcTypeConstructor INSTANCE = new SybaseJtdsXmlAsStringArrayJdbcTypeConstructor();
+
+	public JdbcType resolveType(
+			TypeConfiguration typeConfiguration,
+			Dialect dialect,
+			BasicType<?> elementType,
+			ColumnTypeInformation columnTypeInformation) {
+		return resolveType( typeConfiguration, dialect, elementType.getJdbcType(), columnTypeInformation );
+	}
+
+	public JdbcType resolveType(
+			TypeConfiguration typeConfiguration,
+			Dialect dialect,
+			JdbcType elementType,
+			ColumnTypeInformation columnTypeInformation) {
+		return new SybaseJtdsXmlAsStringArrayJdbcType( elementType, SqlTypes.NCLOB );
+	}
+
+	@Override
+	public int getDefaultSqlTypeCode() {
+		return SqlTypes.XML_ARRAY;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsXmlAsStringJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsXmlAsStringJdbcType.java
new file mode 100644
index 000000000000..65af341ad300
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseJtdsXmlAsStringJdbcType.java
@@ -0,0 +1,164 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect;
+
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
+import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.BasicExtractor;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
+import org.hibernate.type.descriptor.jdbc.XmlAsStringJdbcType;
+
+import java.nio.charset.StandardCharsets;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * Specialized type mapping for {@code XML} that binds UTF-16LE bytes,
+ * because the jTDS driver can't handle Unicode characters and doesn't support nationalized methods.
+ * For extraction, the {@code getString} method works fine though.
+ */
+public class SybaseJtdsXmlAsStringJdbcType extends XmlAsStringJdbcType {
+
+	public static final SybaseJtdsXmlAsStringJdbcType JTDS_VARCHAR_INSTANCE =
+			new SybaseJtdsXmlAsStringJdbcType( SqlTypes.LONG32VARCHAR, null );
+	public static final SybaseJtdsXmlAsStringJdbcType JTDS_NVARCHAR_INSTANCE =
+			new SybaseJtdsXmlAsStringJdbcType( SqlTypes.LONG32NVARCHAR, null );
+	public static final SybaseJtdsXmlAsStringJdbcType JTDS_CLOB_INSTANCE =
+			new SybaseJtdsXmlAsStringJdbcType( SqlTypes.CLOB, null );
+	public static final SybaseJtdsXmlAsStringJdbcType JTDS_INSTANCE =
+			new SybaseJtdsXmlAsStringJdbcType( SqlTypes.NCLOB, null );
+
+	public SybaseJtdsXmlAsStringJdbcType(int ddlTypeCode, EmbeddableMappingType embeddableMappingType) {
+		super( ddlTypeCode, embeddableMappingType );
+	}
+
+	@Override
+	public AggregateJdbcType resolveAggregateJdbcType(
+			EmbeddableMappingType mappingType,
+			String sqlType,
+			RuntimeModelCreationContext creationContext) {
+		return new SybaseJtdsXmlAsStringJdbcType( getDdlTypeCode(), mappingType );
+	}
+
+	@Override
+	public String toString() {
+		return "SybaseJtdsXmlAsStringJdbcType";
+	}
+
+	@Override
+	public JdbcType resolveIndicatedType(JdbcTypeIndicators indicators, JavaType<?> domainJtd) {
+		// Depending on the size of the column, we might have to adjust the jdbc type code for DDL.
+		// In some DBMS we can compare LOBs with special functions which is handled in the SqlAstTranslators,
+		// but that requires the correct jdbc type code to be available, which we ensure this way
+		if ( getEmbeddableMappingType() == null ) {
+			if ( needsLob( indicators ) ) {
+				return indicators.isNationalized() ? JTDS_INSTANCE : JTDS_CLOB_INSTANCE;
+			}
+			else {
+				return indicators.isNationalized() ? JTDS_NVARCHAR_INSTANCE : JTDS_VARCHAR_INSTANCE;
+			}
+		}
+		else {
+			if ( needsLob( indicators ) ) {
+				return new SybaseJtdsXmlAsStringJdbcType(
+						indicators.isNationalized() ? SqlTypes.NCLOB : SqlTypes.CLOB,
+						getEmbeddableMappingType()
+				);
+			}
+			else {
+				return new SybaseJtdsXmlAsStringJdbcType(
+						indicators.isNationalized() ? SqlTypes.LONG32NVARCHAR : SqlTypes.LONG32VARCHAR,
+						getEmbeddableMappingType()
+				);
+			}
+		}
+	}
+
+	@Override
+	public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
+		if ( !isNationalized() ) {
+			return super.getBinder( javaType );
+		}
+		return new BasicBinder<>( javaType, this ) {
+
+			private SybaseJtdsXmlAsStringJdbcType getXmlAsStringJdbcType() {
+				return (SybaseJtdsXmlAsStringJdbcType) getJdbcType();
+			}
+
+			private String getXml(X value, WrapperOptions options) throws SQLException {
+				return getXmlAsStringJdbcType().toString( value, getJavaType(), options );
+			}
+
+			@Override
+			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
+					throws SQLException {
+				final String xml = getXml( value, options );
+				st.setBytes( index, xml.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+					throws SQLException {
+				final String xml = getXml( value, options );
+				st.setBytes( name, xml.getBytes( StandardCharsets.UTF_16LE ) );
+			}
+
+			@Override
+			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+				st.setNull( index, SqlTypes.VARCHAR );
+			}
+
+			@Override
+			protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+					throws SQLException {
+				st.setNull( name, SqlTypes.VARCHAR );
+			}
+		};
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
+		if ( !isNationalized() ) {
+			return super.getExtractor( javaType );
+		}
+		return new BasicExtractor<>( javaType, this ) {
+
+			@Override
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+				return getObject( rs.getString( paramIndex ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options)
+					throws SQLException {
+				return getObject( statement.getString( index ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
+					throws SQLException {
+				return getObject( statement.getString( name ), options );
+			}
+
+			private X getObject(String xml, WrapperOptions options) throws SQLException {
+				return xml == null ? null : getXmlAsStringJdbcType().fromString( xml, getJavaType(), options );
+			}
+
+			private SybaseJtdsXmlAsStringJdbcType getXmlAsStringJdbcType() {
+				return (SybaseJtdsXmlAsStringJdbcType) getJdbcType();
+			}
+		};
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java
index 35cc3d101f35..03649ddbea98 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/AggregateSupport.java
@@ -7,6 +7,7 @@
 import java.util.List;
 
 import org.hibernate.Incubating;
+import org.hibernate.Internal;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.model.relational.Namespace;
 import org.hibernate.dialect.Dialect;
@@ -71,6 +72,11 @@ default String aggregateComponentCustomReadExpression(
 		);
 	}
 
+	@Internal // TODO: find a better way!
+	default boolean useLengthsInCasts() {
+		return false;
+	}
+
 	/**
 	 * Returns the custom read expression to use for {@code column}.
 	 * Replaces the given {@code placeholder} in the given {@code template}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java
index 348b852e6711..3ad57364c48b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/DB2AggregateSupport.java
@@ -71,6 +71,11 @@ public DB2AggregateSupport(boolean jsonSupport) {
 		this.jsonSupport = jsonSupport;
 	}
 
+	@Override
+	public boolean useLengthsInCasts() {
+		return true;
+	}
+
 	@Override
 	public String aggregateComponentCustomReadExpression(
 			String template,
@@ -211,7 +216,7 @@ private static String xmlExtractArguments(String aggregateParentReadExpression,
 		if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_START )
 				&& aggregateParentReadExpression.endsWith( XML_EXTRACT_END )
 				&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SEPARATOR )) != -1 ) {
-			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
+			final var sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
 			sb.append( aggregateParentReadExpression, XML_EXTRACT_START.length(), separatorIndex );
 			sb.append( '/' );
 			sb.append( xpathFragment );
@@ -320,7 +325,7 @@ public String aggregateCustomWriteExpression(
 			case XML_ARRAY:
 				return null;
 			case STRUCT:
-				final StringBuilder sb = new StringBuilder();
+				final var sb = new StringBuilder();
 				appendStructCustomWriteExpression( aggregateColumn, aggregatedColumns, sb );
 				return sb.toString();
 		}
@@ -1031,7 +1036,7 @@ private void renderParentInserts(SqlAppender sqlAppender, SelectablePath parentP
 
 		private String columnXPath(SelectablePath selectablePath) {
 			final SelectablePath[] parts = selectablePath.getParts();
-			final StringBuilder xpath = new StringBuilder();
+			final var xpath = new StringBuilder();
 			for ( int i = 1; i < parts.length; i++ ) {
 				xpath.append( '/' );
 				xpath.append( parts[i].getSelectableName() );
@@ -1041,7 +1046,7 @@ private String columnXPath(SelectablePath selectablePath) {
 
 		private String columnVariable(SelectablePath selectablePath) {
 			final SelectablePath[] parts = selectablePath.getParts();
-			final StringBuilder variable = new StringBuilder();
+			final var variable = new StringBuilder();
 			for ( int i = 1; i < parts.length; i++ ) {
 				variable.append( parts[i].getSelectableName() );
 				variable.append( '-' );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/H2AggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/H2AggregateSupport.java
index d984016407ef..3d5fd958635c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/H2AggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/H2AggregateSupport.java
@@ -53,20 +53,20 @@ public String aggregateComponentCustomReadExpression(
 		switch ( aggregateColumnTypeCode ) {
 			case JSON_ARRAY:
 			case JSON:
+				final String readExpression = aggregateParentReadExpression.isEmpty() ?
+						columnExpression
+						: "(" + aggregateParentReadExpression + ").\"" + columnExpression + "\"";
 				switch ( column.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode() ) {
 					case JSON:
 					case JSON_ARRAY:
-						return template.replace(
-								placeholder,
-								"(" + aggregateParentReadExpression + ").\"" + columnExpression + "\""
-						);
+						return template.replace( placeholder, readExpression );
 					case BINARY:
 					case VARBINARY:
 					case LONG32VARBINARY:
 						// We encode binary data as hex, so we have to decode here
 						return template.replace(
 								placeholder,
-								hexDecodeExpression( queryExpression( "(" + aggregateParentReadExpression + ").\"" + columnExpression + "\"" ), column.getColumnDefinition() )
+								hexDecodeExpression( queryExpression( readExpression ), column.getColumnDefinition() )
 						);
 					case ARRAY:
 						final BasicPluralType<?, ?> pluralType = (BasicPluralType<?, ?>) column.getJdbcMapping();
@@ -78,18 +78,18 @@ public String aggregateComponentCustomReadExpression(
 								// We encode binary data as hex, so we have to decode here
 								return template.replace(
 										placeholder,
-										"(select array_agg(" + hexDecodeExpression( queryExpression( "(" + aggregateParentReadExpression + ").\"" + columnExpression + "\"[i.x]" ), elementTypeName ) + ") from system_range(1,10000) i where i.x<=coalesce(array_length((" + aggregateParentReadExpression + ").\"" + columnExpression + "\"),0))"
+										"(select array_agg(" + hexDecodeExpression( queryExpression( readExpression + "[i.x]" ), elementTypeName ) + ") from system_range(1,10000) i where i.x<=coalesce(array_length(" + readExpression + "),0))"
 								);
 							default:
 								return template.replace(
 										placeholder,
-										"(select array_agg(" + valueExpression( "(" + aggregateParentReadExpression + ").\"" + columnExpression + "\"[i.x]", elementTypeName ) + ") from system_range(1,10000) i where i.x<=coalesce(array_length((" + aggregateParentReadExpression + ").\"" + columnExpression + "\"),0))"
+										"(select array_agg(" + valueExpression( readExpression + "[i.x]", elementTypeName ) + ") from system_range(1,10000) i where i.x<=coalesce(array_length(" + readExpression + "),0))"
 								);
 						}
 					default:
 						return template.replace(
 								placeholder,
-								columnExpression( aggregateParentReadExpression, columnExpression, column.getColumnDefinition() )
+								valueExpression( readExpression, column.getColumnDefinition() )
 						);
 				}
 		}
@@ -102,10 +102,6 @@ private static String getElementTypeName(String arrayTypeName) {
 		return elementTypeName.equals( "clob" ) ? "varchar" : elementTypeName;
 	}
 
-	private static String columnExpression(String aggregateParentReadExpression, String columnExpression, String columnType) {
-		return valueExpression( "(" + aggregateParentReadExpression + ").\"" + columnExpression + "\"", columnType );
-	}
-
 	private static String hexDecodeExpression(String valueExpression, String columnType) {
 		return "cast(hextoraw(regexp_replace(" + valueExpression + ",'([0-9a-f][0-9a-f])','00$1')) as " + columnType + ")";
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
index 55f290752e0b..159a17e66ffd 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
@@ -37,7 +37,6 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.StructuredJdbcType;
 import org.hibernate.type.descriptor.sql.DdlType;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import java.util.LinkedHashMap;
@@ -358,7 +357,7 @@ private static String xmlExtractArguments(String aggregateParentReadExpression,
 		if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_START )
 			&& aggregateParentReadExpression.endsWith( XML_EXTRACT_END )
 			&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SEPARATOR )) != -1 ) {
-			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
+			final var sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
 			sb.append( aggregateParentReadExpression, XML_EXTRACT_START.length(), separatorIndex );
 			sb.append( '/' );
 			sb.append( xpathFragment );
@@ -368,7 +367,7 @@ private static String xmlExtractArguments(String aggregateParentReadExpression,
 		else if ( aggregateParentReadExpression.startsWith( XML_QUERY_START )
 				&& aggregateParentReadExpression.endsWith( XML_QUERY_END )
 				&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_QUERY_SEPARATOR )) != -1 ) {
-			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_QUERY_START.length() + xpathFragment.length() );
+			final var sb = new StringBuilder( aggregateParentReadExpression.length() - XML_QUERY_START.length() + xpathFragment.length() );
 			sb.append( aggregateParentReadExpression, XML_QUERY_START.length(), separatorIndex );
 			sb.append( '/' );
 			sb.append( xpathFragment );
@@ -511,7 +510,7 @@ private static String determineElementTypeName(
 			Size castTargetSize,
 			BasicPluralType<?, ?> pluralType,
 			TypeConfiguration typeConfiguration) {
-		final DdlTypeRegistry ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
+		final var ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
 		final BasicType<?> expressionType = pluralType.getElementType();
 		DdlType ddlType = ddlTypeRegistry.getDescriptor( expressionType.getJdbcType().getDdlTypeCode() );
 		if ( ddlType == null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java
index ba2ea0ee7794..e7bc400ab948 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/PostgreSQLAggregateSupport.java
@@ -170,7 +170,7 @@ private static String xmlExtractArguments(String aggregateParentReadExpression,
 		if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_START )
 			&& aggregateParentReadExpression.endsWith( XML_EXTRACT_END )
 			&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SEPARATOR )) != -1 ) {
-			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
+			final var sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
 			sb.append( aggregateParentReadExpression, XML_EXTRACT_START.length(), separatorIndex );
 			sb.append( '/' );
 			sb.append( xpathFragment );
@@ -180,7 +180,7 @@ private static String xmlExtractArguments(String aggregateParentReadExpression,
 		else if ( aggregateParentReadExpression.startsWith( XML_QUERY_START )
 				&& aggregateParentReadExpression.endsWith( XML_QUERY_END )
 				&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_QUERY_SEPARATOR )) != -1 ) {
-			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_QUERY_START.length() + xpathFragment.length() );
+			final var sb = new StringBuilder( aggregateParentReadExpression.length() - XML_QUERY_START.length() + xpathFragment.length() );
 			sb.append( aggregateParentReadExpression, XML_QUERY_START.length(), separatorIndex );
 			sb.append( '/' );
 			sb.append( xpathFragment );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SybaseASEAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SybaseASEAggregateSupport.java
index a43864a57889..85e992d90199 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SybaseASEAggregateSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/SybaseASEAggregateSupport.java
@@ -167,7 +167,7 @@ private static String xmlExtractArguments(String aggregateParentReadExpression,
 				XML_EXTRACT_READ_INVOCATION_START, 0, XML_EXTRACT_READ_INVOCATION_START.length() )) {
 			final int argumentsStartIndex = patternIdx + XML_EXTRACT_READ_NULL_CHECK.length() + XML_EXTRACT_READ_INVOCATION_START.length();
 			separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SEPARATOR );
-			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - argumentsStartIndex + xpathFragment.length() );
+			final var sb = new StringBuilder( aggregateParentReadExpression.length() - argumentsStartIndex + xpathFragment.length() );
 			sb.append( aggregateParentReadExpression, argumentsStartIndex, separatorIndex );
 			sb.append( '/' );
 			sb.append( xpathFragment );
@@ -177,7 +177,7 @@ private static String xmlExtractArguments(String aggregateParentReadExpression,
 		else if ( aggregateParentReadExpression.startsWith( XML_EXTRACT_START )
 			&& aggregateParentReadExpression.endsWith( XML_EXTRACT_END )
 			&& (separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SIMPLE_SEPARATOR )) != -1 ) {
-			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
+			final var sb = new StringBuilder( aggregateParentReadExpression.length() - XML_EXTRACT_START.length() + xpathFragment.length() );
 			final int xpathEnd;
 			if ( aggregateParentReadExpression.regionMatches( separatorIndex - 2, XML_EXTRACT_SEPARATOR, 0, XML_EXTRACT_SEPARATOR.length() ) ) {
 				xpathEnd = separatorIndex - 2;
@@ -209,7 +209,7 @@ private static String xmlExtractForConcat(String prefix, String aggregateParentR
 			caseExpression = aggregateParentReadExpression.substring( 0, patternIdx + XML_EXTRACT_READ_NULL_CHECK.length() );
 			final int argumentsStartIndex = patternIdx + XML_EXTRACT_READ_NULL_CHECK.length() + XML_EXTRACT_READ_INVOCATION_START.length();
 			final int separatorIndex = aggregateParentReadExpression.indexOf( XML_EXTRACT_SEPARATOR );
-			final StringBuilder sb = new StringBuilder( aggregateParentReadExpression.length() - argumentsStartIndex + xpathFragment.length() );
+			final var sb = new StringBuilder( aggregateParentReadExpression.length() - argumentsStartIndex + xpathFragment.length() );
 			sb.append( aggregateParentReadExpression, argumentsStartIndex, separatorIndex );
 			sb.append( '/' );
 			sb.append( xpathFragment );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java
index d2f944187055..779b06f07161 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CommonFunctionFactory.java
@@ -54,7 +54,10 @@
 import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.query.sqm.produce.function.FunctionParameterType.*;
+import static org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE;
+import static org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE;
 import static org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers.useArgType;
+import static org.hibernate.sql.ast.SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER;
 
 /**
  * Enumeratoes common function template definitions.
@@ -62,6 +65,7 @@
  *
  * @author Steve Ebersole
  * @author Gavin King
+ * @author Yoobin Yoon
  */
 public class CommonFunctionFactory {
 
@@ -181,6 +185,44 @@ public void log10_log() {
 				.register();
 	}
 
+	/**
+	 *  For Spanner
+	 */
+	public void position_locate_spanner() {
+		functionRegistry.registerBinaryTernaryPattern(
+						"locate",
+						integerType,
+						"strpos(?2,?1)",
+						"strpos(substr(?2,?3),?1)",
+						FunctionParameterType.STRING, FunctionParameterType.STRING, FunctionParameterType.INTEGER,
+						typeConfiguration
+				)
+				.setArgumentListSignature( "(STRING pattern, STRING string[, INTEGER start])" );
+		functionRegistry.registerAlternateKey( "position", "locate" );
+	}
+
+	public void round_spanner() {
+		functionRegistry.registerUnaryBinaryPattern(
+				"round",
+				"round(?1::float8)",
+				"(floor(?1*power(10,?2)+0.5)/power(10,?2))",
+				NUMERIC, INTEGER,
+				typeConfiguration
+		).setArgumentListSignature( "(NUMERIC number[, INTEGER places])" );
+	}
+
+	public void log_spanner() {
+		functionRegistry.registerUnaryBinaryPattern(
+						"log",
+						doubleType,
+						"log(cast(?1 as float8))",
+						"ln(cast(?2 as float8))/ln(cast(?1 as  float8))",
+						NUMERIC, NUMERIC, typeConfiguration
+				)
+				.setArgumentListSignature( "(NUMERIC arg1[, NUMERIC arg2])" );
+		functionRegistry.registerAlternateKey( "log10", "log" );
+	}
+
 	public void log2() {
 		functionRegistry.namedDescriptorBuilder( "log2" )
 				.setInvariantType(doubleType)
@@ -308,20 +350,43 @@ private void trunc(
 		functionRegistry.registerAlternateKey( "truncate", "trunc" );
 	}
 
-	private void trunc(TruncFunction.DatetimeTrunc datetimeTrunc) {
-		trunc( "trunc(?1)", "trunc(?1,?2)", datetimeTrunc, null );
-	}
-
 	public void trunc() {
-		trunc( null );
+		trunc( "trunc(?1)", "trunc(?1,?2)", null, null );
 	}
 
+	/**
+	 * H2, DB2
+	 */
 	public void trunc_dateTrunc() {
-		trunc( TruncFunction.DatetimeTrunc.DATE_TRUNC );
+		functionRegistry.register(
+				"trunc",
+				new TruncFunction(
+						"trunc(?1)",
+						"trunc(?1,?2)",
+						TruncFunction.DatetimeTrunc.DATE_TRUNC,
+						null,
+						NO_PLAIN_PARAMETER,
+						typeConfiguration
+				)
+		);
+		functionRegistry.registerAlternateKey( "truncate", "trunc" );
 	}
 
+	/**
+	 * HSQL
+	 */
 	public void trunc_dateTrunc_trunc() {
-		trunc( TruncFunction.DatetimeTrunc.TRUNC );
+		functionRegistry.register(
+				"trunc",
+				new TruncFunction(
+						"trunc(?1)",
+						"trunc(?1,?2)",
+						TruncFunction.DatetimeTrunc.TRUNC,
+						null,
+						NO_PLAIN_PARAMETER,
+						typeConfiguration )
+		);
+		functionRegistry.registerAlternateKey( "truncate", "trunc" );
 	}
 
 	/**
@@ -848,7 +913,7 @@ public void md5() {
 		functionRegistry.namedDescriptorBuilder( "md5" )
 				.setInvariantType(stringType)
 				.setExactArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
@@ -856,7 +921,7 @@ public void initcap() {
 		functionRegistry.namedDescriptorBuilder( "initcap" )
 				.setInvariantType(stringType)
 				.setExactArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
@@ -889,28 +954,28 @@ public void translate() {
 	public void bitand() {
 		functionRegistry.namedDescriptorBuilder( "bitand" )
 				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
 	public void bitor() {
 		functionRegistry.namedDescriptorBuilder( "bitor" )
 				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
 	public void bitxor() {
 		functionRegistry.namedDescriptorBuilder( "bitxor" )
 				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
 	public void bitnot() {
 		functionRegistry.namedDescriptorBuilder( "bitnot" )
 				.setExactArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
@@ -920,25 +985,25 @@ public void bitnot() {
 	public void bitandorxornot_bitAndOrXorNot() {
 		functionRegistry.namedDescriptorBuilder( "bit_and" )
 				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.registerAlternateKey( "bitand", "bit_and" );
 
 		functionRegistry.namedDescriptorBuilder( "bit_or" )
 				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.registerAlternateKey( "bitor", "bit_or" );
 
 		functionRegistry.namedDescriptorBuilder( "bit_xor" )
 				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.registerAlternateKey( "bitxor", "bit_xor" );
 
 		functionRegistry.namedDescriptorBuilder( "bit_not" )
 				.setExactArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.registerAlternateKey( "bitnot", "bit_not" );
 	}
@@ -949,25 +1014,25 @@ public void bitandorxornot_bitAndOrXorNot() {
 	public void bitandorxornot_binAndOrXorNot() {
 		functionRegistry.namedDescriptorBuilder( "bin_and" )
 				.setMinArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.registerAlternateKey( "bitand", "bin_and" );
 
 		functionRegistry.namedDescriptorBuilder( "bin_or" )
 				.setMinArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.registerAlternateKey( "bitor", "bin_or" );
 
 		functionRegistry.namedDescriptorBuilder( "bin_xor" )
 				.setMinArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.registerAlternateKey( "bitxor", "bin_xor" );
 
 		functionRegistry.namedDescriptorBuilder( "bin_not" )
 				.setExactArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.registerAlternateKey( "bitnot", "bin_not" );
 	}
@@ -978,22 +1043,22 @@ public void bitandorxornot_binAndOrXorNot() {
 	public void bitandorxornot_operator() {
 		functionRegistry.patternDescriptorBuilder( "bitand", "(?1&?2)" )
 				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 
 		functionRegistry.patternDescriptorBuilder( "bitor", "(?1|?2)" )
 				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 
 		functionRegistry.patternDescriptorBuilder( "bitxor", "(?1^?2)" )
 				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 
 		functionRegistry.patternDescriptorBuilder( "bitnot", "~?1" )
 				.setExactArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
@@ -1003,12 +1068,12 @@ public void bitandorxornot_operator() {
 	public void bitAndOr() {
 		functionRegistry.namedAggregateDescriptorBuilder( "bit_and" )
 				.setExactArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 
 		functionRegistry.namedAggregateDescriptorBuilder( "bit_or" )
 				.setExactArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 
 		//MySQL has it but how is that even useful?
@@ -1558,7 +1623,7 @@ public void atan2_atn2() {
 	public void coalesce() {
 		functionRegistry.namedDescriptorBuilder( "coalesce" )
 				.setMinArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
@@ -1568,7 +1633,7 @@ public void coalesce() {
 	public void coalesce_value() {
 		functionRegistry.namedDescriptorBuilder( "value" )
 				.setMinArgumentCount( 1 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.registerAlternateKey( "coalesce", "value" );
 	}
@@ -1576,7 +1641,7 @@ public void coalesce_value() {
 	public void nullif() {
 		functionRegistry.namedDescriptorBuilder( "nullif" )
 				.setExactArgumentCount( 2 )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
@@ -1968,12 +2033,12 @@ public void leastGreatest() {
 		functionRegistry.namedDescriptorBuilder( "least" )
 				.setMinArgumentCount( 2 )
 				.setParameterTypes(COMPARABLE, COMPARABLE)
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.namedDescriptorBuilder( "greatest" )
 				.setMinArgumentCount( 2 )
 				.setParameterTypes(COMPARABLE, COMPARABLE)
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
@@ -1981,12 +2046,12 @@ public void leastGreatest_minMax() {
 		functionRegistry.namedDescriptorBuilder( "least", "min" )
 				.setMinArgumentCount( 2 )
 				.setParameterTypes(COMPARABLE, COMPARABLE)
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.namedDescriptorBuilder( "greatest", "max" )
 				.setMinArgumentCount( 2 )
 				.setParameterTypes(COMPARABLE, COMPARABLE)
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
@@ -1994,12 +2059,12 @@ public void leastGreatest_minMaxValue() {
 		functionRegistry.namedDescriptorBuilder( "least", "minvalue" )
 				.setMinArgumentCount( 2 )
 				.setParameterTypes(COMPARABLE, COMPARABLE)
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 		functionRegistry.namedDescriptorBuilder( "greatest", "maxvalue" )
 				.setMinArgumentCount( 2 )
 				.setParameterTypes(COMPARABLE, COMPARABLE)
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.ARGUMENT_OR_IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( ARGUMENT_OR_IMPLIED_RESULT_TYPE )
 				.register();
 	}
 
@@ -2008,14 +2073,14 @@ public void aggregates(Dialect dialect, SqlAstNodeRenderingMode inferenceArgumen
 				.setArgumentRenderingMode( inferenceArgumentRenderingMode )
 				.setExactArgumentCount( 1 )
 				.setParameterTypes(COMPARABLE)
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.register();
 
 		functionRegistry.namedAggregateDescriptorBuilder( "min" )
 				.setArgumentRenderingMode( inferenceArgumentRenderingMode )
 				.setExactArgumentCount( 1 )
 				.setParameterTypes(COMPARABLE)
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.register();
 
 		functionRegistry.namedAggregateDescriptorBuilder( "sum" )
@@ -2186,19 +2251,19 @@ public void windowFunctions() {
 		functionRegistry.namedWindowDescriptorBuilder( "first_value" )
 				.setExactArgumentCount( 1 )
 				.setParameterTypes( ANY )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.setArgumentListSignature( "ANY value" )
 				.register();
 		functionRegistry.namedWindowDescriptorBuilder( "last_value" )
 				.setExactArgumentCount( 1 )
 				.setParameterTypes( ANY )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.setArgumentListSignature( "ANY value" )
 				.register();
 		functionRegistry.namedWindowDescriptorBuilder( "nth_value" )
 				.setExactArgumentCount( 2 )
 				.setParameterTypes( ANY, INTEGER )
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE )
+				.setArgumentTypeResolver( IMPLIED_RESULT_TYPE )
 				.setArgumentListSignature( "ANY value, INTEGER nth" )
 				.register();
 	}
@@ -2280,6 +2345,17 @@ public void power_expLn() {
 				.register();
 	}
 
+	/**
+	 * power() for Spanner
+	 */
+	public void power_spanner() {
+		functionRegistry.patternDescriptorBuilder("power", "power(?1::float8, ?2::float8)")
+				.setExactArgumentCount(2)
+				.setParameterTypes(NUMERIC)
+				.setInvariantType(doubleType)
+				.register();
+	}
+
 	public void round() {
 		functionRegistry.namedDescriptorBuilder( "round" )
 				// To avoid truncating to a specific data type, we default to using the argument type
@@ -2290,6 +2366,24 @@ public void round() {
 				.register();
 	}
 
+	private static final String VAR_SAMP_SUM_COUNT_SPANNER_PATTERN = "(sum(power(cast(?1 as float8), cast(2 as float8)))-(power(cast(sum(?1) as float8), cast(2 as float8))/count(?1)))/nullif(count(?1)-1,0)";
+
+	public void stddevSamp_sumCount_spanner() {
+		functionRegistry.patternAggregateDescriptorBuilder( "stddev_samp", "sqrt(" + VAR_SAMP_SUM_COUNT_SPANNER_PATTERN + ")" )
+				.setInvariantType( doubleType )
+				.setExactArgumentCount( 1 )
+				.setParameterTypes( NUMERIC )
+				.register();
+	}
+
+	public void varSamp_sumCount_spanner() {
+		functionRegistry.patternAggregateDescriptorBuilder( "var_samp", VAR_SAMP_SUM_COUNT_SPANNER_PATTERN )
+				.setInvariantType( doubleType )
+				.setExactArgumentCount( 1 )
+				.setParameterTypes( NUMERIC )
+				.register();
+	}
+
 	/**
 	 * SQL Server
 	 */
@@ -2353,6 +2447,14 @@ public void crc32() {
 				.register();
 	}
 
+	public void sqrt_spanner() {
+		functionRegistry.patternDescriptorBuilder("sqrt", "sqrt(?1::float8)")
+				.setExactArgumentCount(1)
+				.setParameterTypes(NUMERIC)
+				.setInvariantType(doubleType)
+				.register();
+	}
+
 	public void hex(String pattern) {
 		functionRegistry.patternDescriptorBuilder( "hex", pattern )
 				.setInvariantType(stringType)
@@ -2404,7 +2506,8 @@ public void sha() {
 				.register();
 	}
 
-	public void timestampaddAndDiff(Dialect dialect, SqlAstNodeRenderingMode timestampRenderingMode) {
+	public void timestampaddAndDiff(Dialect dialect) {
+		// disallow plain parameter for timestamps argument since databases reject it
 		functionRegistry.register(
 				"timestampadd",
 				new TimestampaddFunction(
@@ -2412,7 +2515,7 @@ public void timestampaddAndDiff(Dialect dialect, SqlAstNodeRenderingMode timesta
 						typeConfiguration,
 						SqlAstNodeRenderingMode.DEFAULT,
 						SqlAstNodeRenderingMode.DEFAULT,
-						timestampRenderingMode
+						NO_PLAIN_PARAMETER
 				)
 		);
 		functionRegistry.register(
@@ -2421,8 +2524,8 @@ public void timestampaddAndDiff(Dialect dialect, SqlAstNodeRenderingMode timesta
 						dialect,
 						typeConfiguration,
 						SqlAstNodeRenderingMode.DEFAULT,
-						timestampRenderingMode,
-						timestampRenderingMode
+						NO_PLAIN_PARAMETER,
+						NO_PLAIN_PARAMETER
 				)
 		);
 	}
@@ -2985,6 +3088,41 @@ public void arrayLength_cardinality() {
 		functionRegistry.register( "length", new DynamicDispatchFunction( functionRegistry, "character_length", "array_length" ) );
 	}
 
+	/**
+	 * Spanner Postgres array_length() function
+	 */
+	public void arrayLength_spannerpg() {
+		functionRegistry.patternDescriptorBuilder( "array_length", "case when ?1 is null then null else coalesce(array_length(?1, 1), 0) end" )
+				.setReturnTypeResolver( StandardFunctionReturnTypeResolvers.invariant( integerType ) )
+				.setArgumentsValidator(
+						StandardArgumentsValidators.composite(
+								StandardArgumentsValidators.exactly( 1 ),
+								ArrayArgumentValidator.DEFAULT_INSTANCE
+						)
+				)
+				.setArgumentListSignature( "(ARRAY array)" )
+				.register();
+		functionRegistry.register( "length", new DynamicDispatchFunction( functionRegistry, "character_length", "array_length" ) );
+		functionRegistry.registerAlternateKey( "cardinality", "array_length" );
+	}
+
+	/**
+	 * Spanner array_length() function
+	 */
+	public void arrayLength_spanner() {
+		functionRegistry.patternDescriptorBuilder( "array_length", "array_length(?1)" )
+				.setReturnTypeResolver( StandardFunctionReturnTypeResolvers.invariant( integerType ) )
+				.setArgumentsValidator(
+						StandardArgumentsValidators.composite(
+								StandardArgumentsValidators.exactly( 1 ),
+								ArrayArgumentValidator.DEFAULT_INSTANCE
+						)
+				)
+				.setArgumentListSignature( "(ARRAY array)" )
+				.register();
+		functionRegistry.register( "length", new DynamicDispatchFunction( functionRegistry, "character_length", "array_length" ) );
+	}
+
 	/**
 	 * Oracle array_length() function
 	 */
@@ -3072,21 +3210,16 @@ public void arrayGet_h2() {
 				.setArgumentListSignature( "(ARRAY array, INTEGER index)" )
 				.register();
 	}
+
+	public void arrayGet_bracket() {
+		arrayGet_bracket( true );
+	}
+
 	/**
 	 * CockroachDB and PostgreSQL array_get() function via bracket syntax
 	 */
-	public void arrayGet_bracket() {
-		functionRegistry.patternDescriptorBuilder( "array_get", "?1[?2]" )
-				.setReturnTypeResolver( ElementViaArrayArgumentReturnTypeResolver.DEFAULT_INSTANCE )
-				.setArgumentsValidator(
-						StandardArgumentsValidators.composite(
-								ArrayArgumentValidator.DEFAULT_INSTANCE,
-								new ArgumentTypesValidator( null, ANY, INTEGER )
-						)
-				)
-				.setArgumentTypeResolver( StandardFunctionArgumentTypeResolvers.invariant( ANY, INTEGER ) )
-				.setArgumentListSignature( "(ARRAY array, INTEGER index)" )
-				.register();
+	public void arrayGet_bracket(boolean supportsJsonBracket) {
+		functionRegistry.register( "array_get", new ArrayGetBracketFunction( supportsJsonBracket ) );
 	}
 
 	/**
@@ -3204,7 +3337,7 @@ public void arraySlice() {
 				.setArgumentTypeResolver(
 						StandardFunctionArgumentTypeResolvers.composite(
 								StandardFunctionArgumentTypeResolvers.invariant( ANY, INTEGER, INTEGER ),
-								StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE
+								IMPLIED_RESULT_TYPE
 						)
 				)
 				.setArgumentListSignature( "(ARRAY array, INTEGER start, INTEGER end)" )
@@ -3233,7 +3366,7 @@ public void arraySlice_operator() {
 				.setArgumentTypeResolver(
 						StandardFunctionArgumentTypeResolvers.composite(
 								StandardFunctionArgumentTypeResolvers.invariant( ANY, INTEGER, INTEGER ),
-								StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE
+								IMPLIED_RESULT_TYPE
 						)
 				)
 				.setArgumentListSignature( "(ARRAY array, INTEGER start, INTEGER end)" )
@@ -3300,7 +3433,7 @@ public void arrayTrim_trim_array() {
 				.setArgumentTypeResolver(
 						StandardFunctionArgumentTypeResolvers.composite(
 								StandardFunctionArgumentTypeResolvers.invariant( ANY, INTEGER ),
-								StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE
+								IMPLIED_RESULT_TYPE
 						)
 				)
 				.setArgumentListSignature( "(ARRAY array, INTEGER elementsToRemove)" )
@@ -3321,6 +3454,108 @@ public void arrayTrim_oracle() {
 		functionRegistry.register( "array_trim", new OracleArrayTrimFunction() );
 	}
 
+	/**
+	 * CockroachDB and PostgreSQL array_reverse() function
+	 */
+	public void arrayReverse() {
+		functionRegistry.namedDescriptorBuilder( "array_reverse" )
+				.setArgumentsValidator(
+						StandardArgumentsValidators.composite(
+								StandardArgumentsValidators.exactly( 1 ),
+								ArrayArgumentValidator.DEFAULT_INSTANCE
+						) )
+				.setReturnTypeResolver( ArrayViaArgumentReturnTypeResolver.DEFAULT_INSTANCE )
+				.setArgumentTypeResolver(
+						StandardFunctionArgumentTypeResolvers.composite(
+								StandardFunctionArgumentTypeResolvers.invariant( ANY )
+						) )
+				.setArgumentListSignature( "(ARRAY array)" )
+				.register();
+	}
+
+	/**
+	 * array_reverse() emulation for PostgreSQL versions before 18 and HSQLDB
+	 */
+	public void arrayReverse_unnest() {
+		functionRegistry.register( "array_reverse", new PostgreSQLArrayReverseEmulation() );
+	}
+
+	/**
+	 * Oracle array_reverse() function
+	 */
+	public void arrayReverse_oracle() {
+		functionRegistry.register( "array_reverse", new OracleArrayReverseFunction() );
+	}
+
+	/**
+	 * H2 array_reverse() function
+	 */
+	public void arrayReverse_h2(int maximumArraySize) {
+		functionRegistry.register( "array_reverse", new H2ArrayReverseFunction( maximumArraySize ) );
+	}
+
+	/**
+	 * CockroachDB and PostgreSQL array_sort() function
+	 */
+	public void arraySort() {
+		functionRegistry.namedDescriptorBuilder( "array_sort" )
+				.setArgumentsValidator(
+						new ArgumentTypesValidator(
+								StandardArgumentsValidators.composite(
+										StandardArgumentsValidators.between( 1, 3 ),
+										ArrayArgumentValidator.DEFAULT_INSTANCE
+								),
+								FunctionParameterType.ANY,
+								FunctionParameterType.BOOLEAN,
+								FunctionParameterType.BOOLEAN
+						)
+				)
+				.setReturnTypeResolver( ArrayViaArgumentReturnTypeResolver.DEFAULT_INSTANCE )
+				.setArgumentTypeResolver(
+						StandardFunctionArgumentTypeResolvers.composite(
+								StandardFunctionArgumentTypeResolvers.invariant( ANY ),
+								StandardFunctionArgumentTypeResolvers.invariant(
+										typeConfiguration,
+										FunctionParameterType.BOOLEAN
+								),
+								StandardFunctionArgumentTypeResolvers.invariant(
+										typeConfiguration,
+										FunctionParameterType.BOOLEAN
+								)
+						)
+				)
+				.setArgumentListSignature( "(ARRAY array[, boolean descending[, boolean nulls_first]])" )
+				.register();
+	}
+
+	/**
+	 * PostgreSQL array_sort() emulation for versions before 18
+	 */
+	public void arraySort_unnest() {
+		functionRegistry.register( "array_sort", new PostgreSQLArraySortEmulation( typeConfiguration ) );
+	}
+
+	/**
+	 * Oracle array_sort() function
+	 */
+	public void arraySort_oracle() {
+		functionRegistry.register( "array_sort", new OracleArraySortFunction( typeConfiguration ) );
+	}
+
+	/**
+	 * H2 array_sort() function
+	 */
+	public void arraySort_h2(int maximumArraySize) {
+		functionRegistry.register( "array_sort", new H2ArraySortFunction( maximumArraySize, typeConfiguration ) );
+	}
+
+	/**
+	 * HSQL array_sort() function
+	 */
+	public void arraySort_hsql() {
+		functionRegistry.register( "array_sort", new HSQLArraySortFunction( typeConfiguration ) );
+	}
+
 	/**
 	 * H2 array_fill() function
 	 */
@@ -4267,7 +4502,7 @@ public void xmlagg_sqlserver() {
 	 * Standard unnest() function
 	 */
 	public void unnest(@Nullable String defaultBasicArrayElementColumnName, String defaultIndexSelectionExpression) {
-		functionRegistry.register( "unnest", new UnnestFunction( defaultBasicArrayElementColumnName, defaultIndexSelectionExpression ) );
+		functionRegistry.register( "unnest", new UnnestFunction( defaultBasicArrayElementColumnName, defaultIndexSelectionExpression, false ) );
 	}
 
 	/**
@@ -4288,10 +4523,18 @@ public void unnest_h2(int maxArraySize) {
 	/**
 	 * Oracle unnest() function
 	 */
+	@Deprecated(forRemoval = true)
 	public void unnest_oracle() {
 		functionRegistry.register( "unnest", new OracleUnnestFunction() );
 	}
 
+	/**
+	 * Oracle unnest() function
+	 */
+	public void unnest_oracle(boolean supportsJsonType) {
+		functionRegistry.register( "unnest", new OracleUnnestFunction( supportsJsonType ) );
+	}
+
 	/**
 	 * PostgreSQL unnest() function
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java
index f9fb0a665246..cfe20aa577fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java
@@ -52,6 +52,7 @@ public class CountFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
 	private final String concatArgumentCastType;
 	private final boolean castDistinctStringConcat;
 	private final String distinctArgumentCastType;
+	private final int separatorAsciiCode;
 
 	public CountFunction(
 			Dialect dialect,
@@ -116,6 +117,29 @@ public CountFunction(
 			String concatArgumentCastType,
 			boolean castDistinctStringConcat,
 			String distinctArgumentCastType) {
+		this(
+				dialect,
+				typeConfiguration,
+				defaultArgumentRenderingMode,
+				countFunctionName,
+				concatOperator,
+				concatArgumentCastType,
+				castDistinctStringConcat,
+				distinctArgumentCastType,
+				0
+		);
+	}
+
+	public CountFunction(
+			Dialect dialect,
+			TypeConfiguration typeConfiguration,
+			SqlAstNodeRenderingMode defaultArgumentRenderingMode,
+			String countFunctionName,
+			String concatOperator,
+			String concatArgumentCastType,
+			boolean castDistinctStringConcat,
+			String distinctArgumentCastType,
+			int separatorAsciiCode) {
 		super(
 				"count",
 				FunctionKind.AGGREGATE,
@@ -132,6 +156,7 @@ public CountFunction(
 		this.concatArgumentCastType = concatArgumentCastType;
 		this.castDistinctStringConcat = castDistinctStringConcat;
 		this.distinctArgumentCastType = distinctArgumentCastType;
+		this.separatorAsciiCode = separatorAsciiCode;
 	}
 
 	@Override
@@ -188,7 +213,7 @@ else if ( !dialect.supportsTupleDistinctCounts() ) {
 											.findFunctionDescriptor( "chr" );
 					final List<Expression> chrArguments = List.of(
 							new QueryLiteral<>(
-									0,
+									separatorAsciiCode,
 									translator.getSessionFactory().getTypeConfiguration()
 											.getBasicTypeForJavaType( Integer.class )
 							)
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java
index 095917d69b10..15879a2ce2ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java
@@ -147,7 +147,7 @@ private SelfRenderingSqmFunction<Integer> extractWeek(
 			QueryEngine queryEngine) {
 		final NodeBuilder builder = field.nodeBuilder();
 
-		final TypeConfiguration typeConfiguration = queryEngine.getTypeConfiguration();
+		final var typeConfiguration = queryEngine.getTypeConfiguration();
 		final BasicType<Integer> intType = typeConfiguration.getBasicTypeForJavaType( Integer.class );
 		final BasicType<Float> floatType = typeConfiguration.getBasicTypeForJavaType( Float.class );
 
@@ -240,7 +240,7 @@ private SelfRenderingSqmFunction<Long> extractNanoseconds(
 			QueryEngine queryEngine) {
 		final NodeBuilder builder = expressionToExtract.nodeBuilder();
 
-		final TypeConfiguration typeConfiguration = queryEngine.getTypeConfiguration();
+		final var typeConfiguration = queryEngine.getTypeConfiguration();
 		final BasicType<Float> floatType = typeConfiguration.getBasicTypeForJavaType(Float.class);
 
 		final SqmExtractUnit<Float> extractSeconds = new SqmExtractUnit<>( SECOND, floatType, builder );
@@ -266,7 +266,7 @@ private SelfRenderingSqmFunction<ZoneOffset> extractOffsetUsingFormat(
 			QueryEngine queryEngine) {
 		final NodeBuilder builder = expressionToExtract.nodeBuilder();
 
-		final TypeConfiguration typeConfiguration = queryEngine.getTypeConfiguration();
+		final var typeConfiguration = queryEngine.getTypeConfiguration();
 		final BasicType<ZoneOffset> offsetType = typeConfiguration.getBasicTypeForJavaType(ZoneOffset.class);
 		final BasicType<String> stringType = typeConfiguration.getBasicTypeForJavaType(String.class);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java
index 0d99aa6bf826..c64bea4faacd 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java
@@ -223,7 +223,7 @@ public Expression convertToSqlAst(SqmToSqlAstConverter walker) {
 							.resolve( StandardBasicTypes.STRING );
 					final Dialect dialect = walker.getCreationContext().getDialect();
 					Expression formatExpression = null;
-					final StringBuilder sb = new StringBuilder();
+					final var sb = new StringBuilder();
 					final StringBuilderSqlAppender sqlAppender = new StringBuilderSqlAppender( sb );
 					final String delimiter;
 					if ( supportsPatternLiterals ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java
index 2633d0acbd5e..b2054ee942ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java
@@ -48,7 +48,7 @@
 import org.hibernate.sql.ast.tree.predicate.PredicateContainer;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.internal.SqlSelectionImpl;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.SqlTypes;
@@ -458,10 +458,10 @@ private static String timestampadd(String startExpression, String stepExpression
 							type
 					)
 			) );
-			final SqlAstTranslator<JdbcOperationQuerySelect> translator =
+			final SqlAstTranslator<JdbcSelect> translator =
 					creationContext.getDialect().getSqlAstTranslatorFactory()
 							.buildSelectTranslator( creationContext.getSessionFactory(), new SelectStatement( fakeQuery ) );
-			final JdbcOperationQuerySelect operation = translator.translate( null, QueryOptions.NONE );
+			final JdbcSelect operation = translator.translate( null, QueryOptions.NONE );
 			final String sqlString = operation.getSqlString();
 			assert sqlString.startsWith( "select " );
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java
index 1a3af951d364..b1a83bb91a57 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java
@@ -23,6 +23,10 @@ public class PostgreSQLTruncFunction extends TruncFunction {
 	private final PostgreSQLTruncRoundFunction postgreSQLTruncRoundFunction;
 
 	public PostgreSQLTruncFunction(boolean supportsTwoArguments, TypeConfiguration typeConfiguration) {
+		this( false, supportsTwoArguments, typeConfiguration );
+	}
+
+	public PostgreSQLTruncFunction(boolean requiresArgumentCasts, boolean supportsTwoArguments, TypeConfiguration typeConfiguration) {
 		super(
 				"trunc(?1)",
 				null,
@@ -30,7 +34,7 @@ public PostgreSQLTruncFunction(boolean supportsTwoArguments, TypeConfiguration t
 				null,
 				typeConfiguration
 		);
-		this.postgreSQLTruncRoundFunction = new PostgreSQLTruncRoundFunction( "trunc", supportsTwoArguments );
+		this.postgreSQLTruncRoundFunction = new PostgreSQLTruncRoundFunction( "trunc", requiresArgumentCasts, supportsTwoArguments );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java
index f91c3fd50d0e..ca3258639732 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java
@@ -36,8 +36,7 @@
  * This custom function falls back to using {@code floor} as a workaround only when necessary,
  * e.g. when there are 2 arguments to the function and either:
  * <ul>
- *     <li>The first argument is not of type {@code numeric}</li>
- *     or
+ *     <li>The first argument is not of type {@code numeric}, or</li>
  *     <li>The dialect doesn't support the two-argument {@code trunc} function</li>
  * </ul>
  *
@@ -45,15 +44,21 @@
  * @see <a href="https://www.postgresql.org/docs/current/functions-math.html">PostgreSQL documentation</a>
  */
 public class PostgreSQLTruncRoundFunction extends AbstractSqmFunctionDescriptor implements FunctionRenderer {
+	private final boolean requiresArgumentCasts;
 	private final boolean supportsTwoArguments;
 
 	public PostgreSQLTruncRoundFunction(String name, boolean supportsTwoArguments) {
+		this( name, false, supportsTwoArguments );
+	}
+
+	public PostgreSQLTruncRoundFunction(String name, boolean requiresArgumentCasts, boolean supportsTwoArguments) {
 		super(
 				name,
 				new ArgumentTypesValidator( StandardArgumentsValidators.between( 1, 2 ), NUMERIC, INTEGER ),
 				StandardFunctionReturnTypeResolvers.useArgType( 1 ),
 				StandardFunctionArgumentTypeResolvers.invariant( NUMERIC, INTEGER )
 		);
+		this.requiresArgumentCasts = requiresArgumentCasts;
 		this.supportsTwoArguments = supportsTwoArguments;
 	}
 
@@ -79,23 +84,69 @@ public void render(
 		}
 		else {
 			// workaround using floor
+			sqlAppender.appendSql( '(' );
+			final SqlAstNode secondArg = arguments.get( 1 );
 			if ( getName().equals( "trunc" ) ) {
 				sqlAppender.appendSql( "sign(" );
+				if ( requiresArgumentCasts ) {
+					sqlAppender.appendSql( "cast(" );
+				}
 				firstArg.accept( walker );
+				if ( requiresArgumentCasts ) {
+					sqlAppender.appendSql( " as numeric)" );
+				}
 				sqlAppender.appendSql( ")*floor(abs(" );
+				if ( requiresArgumentCasts ) {
+					sqlAppender.appendSql( "cast(" );
+				}
 				firstArg.accept( walker );
-				sqlAppender.appendSql( ")*1e" );
-				arguments.get( 1 ).accept( walker );
+				if ( requiresArgumentCasts ) {
+					sqlAppender.appendSql( " as numeric)" );
+				}
+				sqlAppender.appendSql( ")*" );
+				if ( requiresArgumentCasts ) {
+					sqlAppender.appendSql( "cast(" );
+				}
+				sqlAppender.appendSql( "power(10," );
+				secondArg.accept( walker );
+				sqlAppender.appendSql( ')' );
+				if ( requiresArgumentCasts ) {
+					sqlAppender.appendSql( " as numeric)" );
+				}
+				sqlAppender.appendSql( ')' );
 			}
 			else {
 				sqlAppender.appendSql( "floor(" );
+				if ( requiresArgumentCasts ) {
+					sqlAppender.appendSql( "cast(" );
+				}
 				firstArg.accept( walker );
-				sqlAppender.appendSql( "*1e" );
-				arguments.get( 1 ).accept( walker );
-				sqlAppender.appendSql( "+0.5" );
+				if ( requiresArgumentCasts ) {
+					sqlAppender.appendSql( " as numeric)" );
+				}
+				sqlAppender.appendSql( "*" );
+				if ( requiresArgumentCasts ) {
+					sqlAppender.appendSql( "cast(" );
+				}
+				sqlAppender.appendSql( "power(10," );
+				secondArg.accept( walker );
+				sqlAppender.appendSql( ')' );
+				if ( requiresArgumentCasts ) {
+					sqlAppender.appendSql( " as numeric)" );
+				}
+				sqlAppender.appendSql( "+0.5)" );
+			}
+			sqlAppender.appendSql( '/' );
+			if ( requiresArgumentCasts ) {
+				sqlAppender.appendSql( "cast(" );
+			}
+			sqlAppender.appendSql( "power(10," );
+			secondArg.accept( walker );
+			sqlAppender.appendSql( ')' );
+			if ( requiresArgumentCasts ) {
+				sqlAppender.appendSql( " as numeric)" );
 			}
-			sqlAppender.appendSql( ")/1e" );
-			arguments.get( 1 ).accept( walker );
+			sqlAppender.appendSql( ')' );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerConcatFunction.java
new file mode 100644
index 000000000000..8b3537789124
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerConcatFunction.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
+import org.hibernate.query.sqm.function.FunctionKind;
+import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
+import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.type.StandardBasicTypes;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import java.util.List;
+
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.STRING;
+
+public class SpannerConcatFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
+
+	private static final String CAST = "::text";
+
+	public SpannerConcatFunction(TypeConfiguration typeConfiguration) {
+		super( "concat",
+				FunctionKind.NORMAL,
+				StandardArgumentsValidators.min( 1 ),
+				StandardFunctionReturnTypeResolvers.invariant(
+						typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.STRING )
+				),
+				StandardFunctionArgumentTypeResolvers.impliedOrInvariant( typeConfiguration, STRING));
+	}
+
+	@Override
+	public void render(SqlAppender sqlAppender, List<? extends SqlAstNode> sqlAstArguments, ReturnableType<?> returnType, SqlAstTranslator<?> walker) {
+		sqlAppender.append( "concat((" );
+		sqlAstArguments.get( 0 ).accept( walker );
+		for ( int i = 1; i < sqlAstArguments.size(); i++ ) {
+			sqlAppender.append( ")::text" );
+			sqlAppender.append( ",(" );
+			sqlAstArguments.get( i ).accept( walker );
+		}
+		sqlAppender.append( ")::text)" );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerExtractFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerExtractFunction.java
new file mode 100644
index 000000000000..dcdabcffd492
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerExtractFunction.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function;
+
+import jakarta.persistence.TemporalType;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.query.common.TemporalUnit;
+import org.hibernate.query.sqm.produce.function.internal.PatternRenderer;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.sql.ast.tree.expression.ExtractUnit;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import java.util.List;
+
+import static org.hibernate.type.spi.TypeConfiguration.getSqlTemporalType;
+
+/**
+ *  uses unix_seconds function for EPOCH unit
+ */
+public class SpannerExtractFunction extends ExtractFunction {
+	public SpannerExtractFunction(Dialect dialect, TypeConfiguration typeConfiguration) {
+		super( dialect, typeConfiguration );
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		new PatternRenderer( extractPattern( sqlAstArguments ) ).render( sqlAppender, sqlAstArguments, walker );
+	}
+
+	@SuppressWarnings("deprecation")
+	private String extractPattern(List<? extends SqlAstNode> sqlAstArguments) {
+		var field = (ExtractUnit) sqlAstArguments.get( 0 );
+		if ( field.getUnit() == TemporalUnit.EPOCH ) {
+			var expression = (Expression) sqlAstArguments.get( 1 );
+			var type = expression.getExpressionType();
+			var temporalType = type != null ? getSqlTemporalType( type ) : null;
+			return temporalType == TemporalType.DATE
+					? "unix_seconds(timestamp(?2))"
+					: "unix_seconds(?2)";
+		}
+		return dialect.extractPattern( field.getUnit() );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerFormatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerFormatFunction.java
new file mode 100644
index 000000000000..161c76dd85c6
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerFormatFunction.java
@@ -0,0 +1,46 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import java.util.List;
+
+import static org.hibernate.type.spi.TypeConfiguration.getSqlTemporalType;
+
+/**
+ * The format function for Spanner.
+ * It uses FORMAT_DATE for temporal type date and FORMAT_TIMESTAMP for temporal type time and timestamp.
+ */
+public class SpannerFormatFunction extends FormatFunction {
+	public SpannerFormatFunction(TypeConfiguration typeConfiguration) {
+		super("format_timestamp", true, true, false, typeConfiguration);
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		var datetime = (Expression) sqlAstArguments.get( 0 );
+		var format = sqlAstArguments.get( 1 );
+		var temporalType = getSqlTemporalType( datetime.getExpressionType() );
+		switch ( temporalType ) {
+			case DATE -> sqlAppender.appendSql( "format_date(" );
+			case TIME, TIMESTAMP -> sqlAppender.appendSql( "format_timestamp(" );
+			default -> throw new IllegalArgumentException( "Unsupported temporal type: " + temporalType );
+		}
+		format.accept( walker );
+		sqlAppender.append( ',' );
+		datetime.accept( walker );
+		sqlAppender.append( ')' );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerPostgreSQLRegexpLikeFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerPostgreSQLRegexpLikeFunction.java
new file mode 100644
index 000000000000..42d785f79cd3
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerPostgreSQLRegexpLikeFunction.java
@@ -0,0 +1,34 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import java.util.List;
+
+
+public class SpannerPostgreSQLRegexpLikeFunction extends AbstractRegexpLikeFunction {
+
+	public SpannerPostgreSQLRegexpLikeFunction(TypeConfiguration typeConfiguration) {
+		super( typeConfiguration );
+	}
+
+	@Override
+	public void render(SqlAppender sqlAppender, List<? extends SqlAstNode> sqlAstArguments, ReturnableType<?> returnType, SqlAstTranslator<?> walker) {
+		sqlAppender.append( "regexp_match(" );
+		sqlAstArguments.get( 0 ).accept( walker );
+		sqlAppender.append( "," );
+		sqlAstArguments.get( 1 ).accept( walker );
+		if (sqlAstArguments.size() > 2) {
+			sqlAppender.append( "," );
+			sqlAstArguments.get( 2 ).accept( walker );
+		}
+		sqlAppender.append( ") IS NOT NULL" );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerPostgreSQLTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerPostgreSQLTruncFunction.java
new file mode 100644
index 000000000000..3fbaacbc746d
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerPostgreSQLTruncFunction.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.query.spi.QueryEngine;
+import org.hibernate.query.sqm.function.SelfRenderingSqmFunction;
+import org.hibernate.query.sqm.tree.SqmTypedNode;
+import org.hibernate.query.sqm.tree.expression.SqmExtractUnit;
+import org.hibernate.type.spi.TypeConfiguration;
+
+/**
+ * Spanner-specific TruncFunction that extends PostgreSQLTruncFunction to handle
+ * both numeric and datetime truncation, reusing PostgreSQL logic where
+ * applicable.
+ */
+public class SpannerPostgreSQLTruncFunction extends PostgreSQLTruncFunction {
+	private final SpannerPostgreSQLTruncRoundFunction spannerPostgreSQLTruncRoundFunction;
+
+	public SpannerPostgreSQLTruncFunction(TypeConfiguration typeConfiguration) {
+		super(false, typeConfiguration);
+		this.spannerPostgreSQLTruncRoundFunction = new SpannerPostgreSQLTruncRoundFunction();
+	}
+
+	@Override
+	protected <T> SelfRenderingSqmFunction<T> generateSqmFunctionExpression(
+			List<? extends SqmTypedNode<?>> arguments,
+			ReturnableType<T> impliedResultType,
+			QueryEngine queryEngine) {
+		final List<SqmTypedNode<?>> args = new ArrayList<>(arguments);
+		if (arguments.size() != 2 || !(arguments.get(1) instanceof SqmExtractUnit)) {
+			// numeric truncation - delegate to Spanner-specific implementation
+			return spannerPostgreSQLTruncRoundFunction.generateSqmFunctionExpression(
+					arguments,
+					impliedResultType,
+					queryEngine);
+		}
+		// datetime truncation - delegate to parent (PostgreSQLTruncFunction) which
+		// handles it correctly
+		return super.generateSqmFunctionExpression(arguments, impliedResultType, queryEngine);
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerPostgreSQLTruncRoundFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerPostgreSQLTruncRoundFunction.java
new file mode 100644
index 000000000000..b705d57a238d
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerPostgreSQLTruncRoundFunction.java
@@ -0,0 +1,41 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+
+import java.util.List;
+
+public class SpannerPostgreSQLTruncRoundFunction extends PostgreSQLTruncRoundFunction {
+
+	public SpannerPostgreSQLTruncRoundFunction() {
+		super( "trunc", false );
+	}
+
+	@Override
+	public void render(SqlAppender sqlAppender, List<? extends SqlAstNode> arguments, ReturnableType<?> returnType, SqlAstTranslator<?> walker) {
+		final int numberOfArguments = arguments.size();
+		final Expression firstArg = (Expression) arguments.get( 0 );
+		if ( numberOfArguments == 1 ) {
+			sqlAppender.appendSql( getName() );
+			sqlAppender.appendSql( "(" );
+			firstArg.accept( walker );
+			sqlAppender.appendSql( "::float8" );
+			sqlAppender.appendSql( ")" );
+		}
+		else {
+			final SqlAstNode secondArg = arguments.get( 1 );
+			sqlAppender.appendSql( "trunc(cast((" );
+			firstArg.accept( walker );
+			sqlAppender.appendSql( ") as numeric), cast(" );
+			secondArg.accept( walker );
+			sqlAppender.appendSql( " as integer))");
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerTruncFunction.java
new file mode 100644
index 000000000000..8e4cb5e3f421
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SpannerTruncFunction.java
@@ -0,0 +1,78 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
+import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+
+
+import static org.hibernate.type.spi.TypeConfiguration.getSqlTemporalType;
+
+/**
+ * The trunc function for Spanner.
+ * It renders DATE_TRUNC for dates, TIMESTAMP_TRUNC for timestamps, and TRUNC for numeric types.
+ */
+public class SpannerTruncFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
+
+	public SpannerTruncFunction() {
+		super(
+				"trunc",
+				new TruncFunction.TruncArgumentsValidator(),
+				StandardFunctionReturnTypeResolvers.useArgType( 1 ),
+				StandardFunctionArgumentTypeResolvers.byArgument(
+						StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE,
+						StandardFunctionArgumentTypeResolvers.NULL
+				)
+		);
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final Expression expression = (Expression) sqlAstArguments.get( 0 );
+		final var type = expression.getExpressionType();
+		final var temporalType = type != null ? getSqlTemporalType( type ) : null;
+
+		if ( temporalType != null ) {
+			switch ( temporalType ) {
+				case DATE -> sqlAppender.appendSql( "DATE_TRUNC" );
+				case TIMESTAMP, TIME -> sqlAppender.appendSql( "TIMESTAMP_TRUNC" );
+				default -> throw new IllegalArgumentException( "Unsupported temporal type: " + temporalType );
+			}
+			sqlAppender.appendSql( "(" );
+			expression.accept( walker );
+			sqlAppender.appendSql( ", " );
+			sqlAstArguments.get( 1 ).accept( walker );
+			sqlAppender.appendSql( ")" );
+		}
+		else {
+			renderNumericTrunc( sqlAppender, sqlAstArguments, walker );
+		}
+	}
+
+	private void renderNumericTrunc(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> args,
+			SqlAstTranslator<?> walker) {
+		sqlAppender.appendSql( "TRUNC(" );
+		args.get( 0 ).accept( walker );
+		if ( args.size() > 1 ) {
+			sqlAppender.appendSql( ", " );
+			args.get( 1 ).accept( walker );
+		}
+		sqlAppender.appendSql( ")" );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java
index 3b963edfe7d8..9d75f601e484 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java
@@ -8,6 +8,7 @@
 import java.util.List;
 
 import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.type.BindingContext;
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor;
@@ -65,6 +66,16 @@ public TruncFunction(
 			DatetimeTrunc datetimeTrunc,
 			String toDateFunction,
 			TypeConfiguration typeConfiguration) {
+		this( truncPattern, twoArgTruncPattern, datetimeTrunc, toDateFunction, SqlAstNodeRenderingMode.DEFAULT, typeConfiguration );
+	}
+
+	public TruncFunction(
+			String truncPattern,
+			String twoArgTruncPattern,
+			DatetimeTrunc datetimeTrunc,
+			String toDateFunction,
+			SqlAstNodeRenderingMode argumentRenderingMode,
+			TypeConfiguration typeConfiguration) {
 		super(
 				"trunc",
 				new TruncArgumentsValidator(),
@@ -76,8 +87,8 @@ public TruncFunction(
 		);
 		this.datetimeTrunc = datetimeTrunc;
 		numericRenderingSupport =
-				new TruncRenderingSupport( new PatternRenderer( truncPattern ),
-						twoArgTruncPattern == null ? null : new PatternRenderer( twoArgTruncPattern ) );
+				new TruncRenderingSupport( new PatternRenderer( truncPattern, argumentRenderingMode ),
+						twoArgTruncPattern == null ? null : new PatternRenderer( twoArgTruncPattern, argumentRenderingMode ) );
 		if ( datetimeTrunc == null ) {
 			dateTruncEmulation = null;
 			datetimeRenderingSupport = null;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java
index d751ff7d1220..0c670ffe743f 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java
@@ -8,6 +8,7 @@
 import java.util.List;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.engine.jdbc.Size;
 import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
@@ -28,6 +29,7 @@
 import org.hibernate.type.BasicPluralType;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
+import org.hibernate.type.descriptor.sql.DdlType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 /**
@@ -158,15 +160,27 @@ public SelectableMapping[] resolveFunctionReturnType(
 			final String elementSelectionExpression = defaultBasicArrayColumnName == null
 					? tableIdentifierVariable
 					: defaultBasicArrayColumnName;
+			final TypeConfiguration typeConfiguration = converter.getCreationContext().getTypeConfiguration();
+			final DdlType ddlType = typeConfiguration.getDdlTypeRegistry()
+					.getDescriptor( elementType.getJdbcType().getDefaultSqlTypeCode() );
 			final SelectableMapping elementMapping;
 			if ( expressionType instanceof SqlTypedMapping typedMapping ) {
+				final String columnTypeName = ddlType.getTypeName(
+						new Size(
+								typedMapping.getPrecision(),
+								typedMapping.getScale(),
+								typedMapping.getLength()
+						),
+						elementType,
+						typeConfiguration.getDdlTypeRegistry()
+				);
 				elementMapping = new SelectableMappingImpl(
 						"",
 						elementSelectionExpression,
 						new SelectablePath( CollectionPart.Nature.ELEMENT.getName() ),
 						null,
 						null,
-						typedMapping.getColumnDefinition(),
+						columnTypeName,
 						typedMapping.getLength(),
 						typedMapping.getArrayLength(),
 						typedMapping.getPrecision(),
@@ -182,13 +196,18 @@ public SelectableMapping[] resolveFunctionReturnType(
 				);
 			}
 			else {
+				final String columnTypeName = ddlType.getTypeName(
+						Size.nil(),
+						elementType,
+						typeConfiguration.getDdlTypeRegistry()
+				);
 				elementMapping = new SelectableMappingImpl(
 						"",
 						elementSelectionExpression,
 						new SelectablePath( CollectionPart.Nature.ELEMENT.getName() ),
 						null,
 						null,
-						null,
+						columnTypeName,
 						null,
 						null,
 						null,
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java
index 5b2964e0ead8..53e28f37a919 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayContainsFunction.java
@@ -13,6 +13,7 @@
 import org.jboss.logging.Logger;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 /**
  * Encapsulates the validator, return type and argument type resolvers for the array_contains function.
@@ -20,7 +21,7 @@
  */
 public abstract class AbstractArrayContainsFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
 
-	protected static final DeprecationLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, AbstractArrayContainsFunction.class.getName() );
+	protected static final DeprecationLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, AbstractArrayContainsFunction.class.getName(), Locale.ROOT );
 
 	protected final boolean nullable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayGetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayGetFunction.java
new file mode 100644
index 000000000000..cba044891f8d
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayGetFunction.java
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
+import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator;
+import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
+
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.ANY;
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.INTEGER;
+
+/**
+ * Basic array get function configuration.
+ */
+public abstract class AbstractArrayGetFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
+
+	public AbstractArrayGetFunction() {
+		super(
+				"array_get",
+				StandardArgumentsValidators.composite(
+						ArrayArgumentValidator.DEFAULT_INSTANCE,
+						new ArgumentTypesValidator( null, ANY, INTEGER )
+				),
+				ElementViaArrayArgumentReturnTypeResolver.DEFAULT_INSTANCE,
+				StandardFunctionArgumentTypeResolvers.invariant( ANY, INTEGER )
+		);
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayReverseFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayReverseFunction.java
new file mode 100644
index 000000000000..7e759ed59fb8
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArrayReverseFunction.java
@@ -0,0 +1,32 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
+import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
+
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.ANY;
+
+/**
+ * Encapsulates the validator, return type and argument type resolvers for the array_reverse functions.
+ * Subclasses only have to implement the rendering.
+ */
+public abstract class AbstractArrayReverseFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
+
+	public AbstractArrayReverseFunction() {
+		super(
+				"array_reverse",
+				StandardArgumentsValidators.composite(
+						StandardArgumentsValidators.exactly( 1 ),
+						ArrayArgumentValidator.DEFAULT_INSTANCE
+				),
+				ArrayViaArgumentReturnTypeResolver.DEFAULT_INSTANCE,
+				StandardFunctionArgumentTypeResolvers.composite(
+						StandardFunctionArgumentTypeResolvers.invariant( ANY )
+				)
+		);
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArraySortFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArraySortFunction.java
new file mode 100644
index 000000000000..ca45dad8288b
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/AbstractArraySortFunction.java
@@ -0,0 +1,49 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
+import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator;
+import org.hibernate.query.sqm.produce.function.FunctionParameterType;
+import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.ANY;
+
+/**
+ * Encapsulates the validator, return type and argument type resolvers for the array_sort functions.
+ * Subclasses only have to implement the rendering.
+ */
+public abstract class AbstractArraySortFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
+
+	public AbstractArraySortFunction(TypeConfiguration typeConfiguration) {
+		super(
+				"array_sort",
+				new ArgumentTypesValidator(
+						StandardArgumentsValidators.composite(
+								StandardArgumentsValidators.between( 1, 3 ),
+								ArrayArgumentValidator.DEFAULT_INSTANCE
+						),
+						FunctionParameterType.ANY,
+						FunctionParameterType.BOOLEAN,
+						FunctionParameterType.BOOLEAN
+				),
+				ArrayViaArgumentReturnTypeResolver.DEFAULT_INSTANCE,
+				StandardFunctionArgumentTypeResolvers.composite(
+						StandardFunctionArgumentTypeResolvers.invariant( ANY ),
+						StandardFunctionArgumentTypeResolvers.invariant(
+								typeConfiguration,
+								FunctionParameterType.BOOLEAN
+						),
+						StandardFunctionArgumentTypeResolvers.invariant(
+								typeConfiguration,
+								FunctionParameterType.BOOLEAN
+						)
+				)
+		);
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetBracketFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetBracketFunction.java
new file mode 100644
index 000000000000..09aaa449183b
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetBracketFunction.java
@@ -0,0 +1,59 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import org.hibernate.metamodel.mapping.JdbcMapping;
+import org.hibernate.metamodel.mapping.JdbcMappingContainer;
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.type.BasicPluralType;
+
+import java.util.List;
+
+/**
+ * Implement the array get function by using {@code []} (bracket) syntax.
+ */
+public class ArrayGetBracketFunction extends AbstractArrayGetFunction {
+
+	private final boolean supportsJsonBracket;
+
+	public ArrayGetBracketFunction(boolean supportsJsonBracket) {
+		this.supportsJsonBracket = supportsJsonBracket;
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final Expression arrayExpression = (Expression) sqlAstArguments.get( 0 );
+		final Expression indexExpression = (Expression) sqlAstArguments.get( 1 );
+		final JdbcMappingContainer arrayTypeContainer = arrayExpression.getExpressionType();
+		final JdbcMapping arrayType = arrayTypeContainer == null ? null : arrayTypeContainer.getSingleJdbcMapping();
+		final boolean isJson = arrayType instanceof BasicPluralType<?, ?> && arrayType.getJdbcType().isJson();
+		if ( isJson && !supportsJsonBracket ) {
+			// JSON arrays have 0-based indexed, so we have to adapt the 1-based array_get index
+			sqlAppender.append( "(select jsonb_path_query(" );
+			arrayExpression.accept( walker );
+			sqlAppender.append( ",'$[$i]',('{\"i\":'||((" );
+			indexExpression.accept( walker );
+			sqlAppender.append( ")-1)||'}')::jsonb))" );
+		}
+		else {
+			arrayExpression.accept( walker );
+			sqlAppender.append( '[' );
+			indexExpression.accept( walker );
+			if ( isJson ) {
+				// JSON arrays have 0-based indexed, so we have to adapt the 1-based array_get index
+				sqlAppender.append( "-1" );
+			}
+			sqlAppender.append( ']' );
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java
index 093fc440d558..bb9c00985627 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java
@@ -7,34 +7,15 @@
 import java.util.List;
 
 import org.hibernate.metamodel.model.domain.ReturnableType;
-import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
-import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator;
-import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
-import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.sql.ast.tree.SqlAstNode;
 import org.hibernate.sql.ast.tree.expression.Expression;
 
-import static org.hibernate.query.sqm.produce.function.FunctionParameterType.ANY;
-import static org.hibernate.query.sqm.produce.function.FunctionParameterType.INTEGER;
-
 /**
  * Implement the array get function by using {@code unnest}.
  */
-public class ArrayGetUnnestFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
-
-	public ArrayGetUnnestFunction() {
-		super(
-				"array_get",
-				StandardArgumentsValidators.composite(
-						ArrayArgumentValidator.DEFAULT_INSTANCE,
-						new ArgumentTypesValidator( null, ANY, INTEGER )
-				),
-				ElementViaArrayArgumentReturnTypeResolver.DEFAULT_INSTANCE,
-				StandardFunctionArgumentTypeResolvers.invariant( ANY, INTEGER )
-		);
-	}
+public class ArrayGetUnnestFunction extends AbstractArrayGetFunction {
 
 	@Override
 	public void render(
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java
index 74d88eab2f87..9e3723c3fd55 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java
@@ -52,7 +52,7 @@ public void render(
 		final Expression indexExpression = (Expression) sqlAstArguments.get( 1 );
 		sqlAppender.append( "case when ");
 		arrayExpression.accept( walker );
-		sqlAppender.append( " is not null then coalesce((select array_agg(t.val) from unnest(" );
+		sqlAppender.append( " is not null then coalesce((select array_agg(t.val order by t.idx) from unnest(" );
 		arrayExpression.accept( walker );
 		sqlAppender.append( ") with ordinality t(val,idx) where t.idx is distinct from " );
 		indexExpression.accept( walker );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java
index 91870da7fd21..b7cc8e928bbc 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java
@@ -57,7 +57,7 @@ public void render(
 		startIndexExpression.accept( walker );
 		sqlAppender.append( " is not null and ");
 		endIndexExpression.accept( walker );
-		sqlAppender.append( " is not null then coalesce((select array_agg(t.val) from unnest(" );
+		sqlAppender.append( " is not null then coalesce((select array_agg(t.val order by t.idx) from unnest(" );
 		arrayExpression.accept( walker );
 		sqlAppender.append( ") with ordinality t(val,idx) where t.idx between " );
 		startIndexExpression.accept( walker );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java
index c8fd2ec6bdcf..e72c764affe5 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java
@@ -43,7 +43,7 @@ public class DB2UnnestFunction extends UnnestFunction {
 	private final int maximumArraySize;
 
 	public DB2UnnestFunction(int maximumArraySize) {
-		super( "v", "i" );
+		super( "v", "i", true );
 		this.maximumArraySize = maximumArraySize;
 	}
 
@@ -138,6 +138,9 @@ protected void renderJsonTable(
 					sqlAppender.append( selectableMapping.getSelectionExpression() );
 					sqlAppender.append( ' ' );
 					sqlAppender.append( getDdlType( selectableMapping, SqlTypes.JSON_ARRAY, walker ) );
+					if ( selectableMapping.getJdbcMapping().getJdbcType().isJson() ) {
+						sqlAppender.append( " format json" );
+					}
 					sqlAppender.appendSql( " path '$." );
 					sqlAppender.append( selectableMapping.getSelectableName() );
 					sqlAppender.appendSql( "' error on error" );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java
index 1e5be6ab186c..17230c3b79b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java
@@ -7,15 +7,13 @@
 import java.lang.reflect.Type;
 import java.util.List;
 
-import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.Size;
-import org.hibernate.internal.build.AllowReflection;
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
 import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.ReturnableType;
-import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
 import org.hibernate.type.BasicType;
+import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.java.BasicPluralJavaType;
 import org.hibernate.type.descriptor.sql.DdlType;
 import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
@@ -24,17 +22,15 @@
 
 public class DdlTypeHelper {
 	@SuppressWarnings("unchecked")
-	@AllowReflection
+//	@AllowReflection
 	public static BasicType<?> resolveArrayType(DomainType<?> elementType, TypeConfiguration typeConfiguration) {
-		@SuppressWarnings("unchecked")
 		final var arrayJavaType =
 				(BasicPluralJavaType<Object>)
 						typeConfiguration.getJavaTypeRegistry()
 								.resolveArrayDescriptor( elementType.getJavaType() );
-		final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
 		return arrayJavaType.resolveType(
 				typeConfiguration,
-				dialect,
+				typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect(),
 				(BasicType<Object>) elementType,
 				null,
 				typeConfiguration.getCurrentBaseSqlTypeIndicators()
@@ -43,19 +39,17 @@ public static BasicType<?> resolveArrayType(DomainType<?> elementType, TypeConfi
 
 	@SuppressWarnings("unchecked")
 	public static BasicType<?> resolveListType(DomainType<?> elementType, TypeConfiguration typeConfiguration) {
-		@SuppressWarnings("unchecked")
-		final BasicPluralJavaType<Object> arrayJavaType =
+		final var arrayJavaType =
 				(BasicPluralJavaType<Object>)
 						typeConfiguration.getJavaTypeRegistry()
-								.getDescriptor( List.class )
+								.resolveDescriptor( List.class )
 								.createJavaType(
-										new ParameterizedTypeImpl( List.class, new Type[]{ elementType.getJavaType() }, null ),
+										new ParameterizedTypeImpl( List.class, new Type[] { elementType.getJavaType() }, null ),
 										typeConfiguration
 								);
-		final Dialect dialect = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect();
 		return arrayJavaType.resolveType(
 				typeConfiguration,
-				dialect,
+				typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect(),
 				(BasicType<Object>) elementType,
 				null,
 				typeConfiguration.getCurrentBaseSqlTypeIndicators()
@@ -76,14 +70,12 @@ public static String getTypeName(JdbcMappingContainer type, TypeConfiguration ty
 
 	public static String getTypeName(JdbcMappingContainer type, Size size, TypeConfiguration typeConfiguration) {
 		if ( type instanceof SqlTypedMapping sqlTypedMapping ) {
-			return AbstractSqlAstTranslator.getSqlTypeName( sqlTypedMapping, typeConfiguration );
+			return getSqlTypeName( sqlTypedMapping, typeConfiguration );
 		}
 		else {
-			final BasicType<?> basicType = (BasicType<?>) type.getSingleJdbcMapping();
-			final DdlTypeRegistry ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
-			final DdlType ddlType = ddlTypeRegistry.getDescriptor(
-					basicType.getJdbcType().getDdlTypeCode()
-			);
+			final var basicType = (BasicType<?>) type.getSingleJdbcMapping();
+			final var ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
+			final var ddlType = ddlTypeRegistry.getDescriptor( basicType.getJdbcType().getDdlTypeCode() );
 			return ddlType.getTypeName( size, basicType, ddlTypeRegistry );
 		}
 	}
@@ -94,14 +86,12 @@ public static String getTypeName(ReturnableType<?> type, TypeConfiguration typeC
 
 	public static String getTypeName(ReturnableType<?> type, Size size, TypeConfiguration typeConfiguration) {
 		if ( type instanceof SqlTypedMapping sqlTypedMapping ) {
-			return AbstractSqlAstTranslator.getSqlTypeName( sqlTypedMapping, typeConfiguration );
+			return getSqlTypeName( sqlTypedMapping, typeConfiguration );
 		}
 		else {
-			final BasicType<?> basicType = (BasicType<?>) ( (JdbcMappingContainer) type ).getSingleJdbcMapping();
-			final DdlTypeRegistry ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
-			final DdlType ddlType = ddlTypeRegistry.getDescriptor(
-					basicType.getJdbcType().getDdlTypeCode()
-			);
+			final var basicType = (BasicType<?>) ( (JdbcMappingContainer) type ).getSingleJdbcMapping();
+			final var ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
+			final var ddlType = ddlTypeRegistry.getDescriptor( basicType.getJdbcType().getDdlTypeCode() );
 			return ddlType.getTypeName( size, basicType, ddlTypeRegistry );
 		}
 	}
@@ -120,14 +110,12 @@ public static String getCastTypeName(JdbcMappingContainer type, TypeConfiguratio
 
 	public static String getCastTypeName(JdbcMappingContainer type, Size size, TypeConfiguration typeConfiguration) {
 		if ( type instanceof SqlTypedMapping sqlTypedMapping ) {
-			return AbstractSqlAstTranslator.getCastTypeName( sqlTypedMapping, typeConfiguration );
+			return getCastTypeName( sqlTypedMapping, typeConfiguration );
 		}
 		else {
-			final BasicType<?> basicType = (BasicType<?>) type.getSingleJdbcMapping();
-			final DdlTypeRegistry ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
-			final DdlType ddlType = ddlTypeRegistry.getDescriptor(
-					basicType.getJdbcType().getDdlTypeCode()
-			);
+			final var basicType = (BasicType<?>) type.getSingleJdbcMapping();
+			final var ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
+			final var ddlType = ddlTypeRegistry.getDescriptor( basicType.getJdbcType().getDdlTypeCode() );
 			return ddlType.getCastTypeName( size, basicType, ddlTypeRegistry );
 		}
 	}
@@ -138,16 +126,34 @@ public static String getCastTypeName(ReturnableType<?> type, TypeConfiguration t
 
 	public static String getCastTypeName(ReturnableType<?> type, Size size, TypeConfiguration typeConfiguration) {
 		if ( type instanceof SqlTypedMapping sqlTypedMapping ) {
-			return AbstractSqlAstTranslator.getCastTypeName( sqlTypedMapping, typeConfiguration );
+			return getCastTypeName( sqlTypedMapping, typeConfiguration );
 		}
 		else {
-			final BasicType<?> basicType = (BasicType<?>) ( (JdbcMappingContainer) type ).getSingleJdbcMapping();
-			final DdlTypeRegistry ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
-			final DdlType ddlType = ddlTypeRegistry.getDescriptor(
-					basicType.getJdbcType().getDdlTypeCode()
-			);
+			final var basicType = (BasicType<?>) ( (JdbcMappingContainer) type ).getSingleJdbcMapping();
+			final var ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
+			final var ddlType = ddlTypeRegistry.getDescriptor( basicType.getJdbcType().getDdlTypeCode() );
 			return ddlType.getCastTypeName( size, basicType, ddlTypeRegistry );
 		}
 	}
 
+	private static DdlType getDdlType(DdlTypeRegistry ddlTypeRegistry, BasicType<?> expressionType) {
+		var ddlType = ddlTypeRegistry.getDescriptor( expressionType.getJdbcType().getDdlTypeCode() );
+		// this may happen when selecting a null value like `SELECT null from ...`
+		// some dbs need the value to be cast, so not knowing the real type we fall back to INTEGER
+		return ddlType == null ? ddlTypeRegistry.getDescriptor( SqlTypes.INTEGER ) : ddlType;
+	}
+
+	private static String getSqlTypeName(SqlTypedMapping castTarget, TypeConfiguration typeConfiguration) {
+		final var expressionType = (BasicType<?>) castTarget.getJdbcMapping();
+		final var ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
+		return getDdlType( ddlTypeRegistry, expressionType )
+				.getTypeName( castTarget.toSize(), expressionType, ddlTypeRegistry );
+	}
+
+	public static String getCastTypeName(SqlTypedMapping castTarget, TypeConfiguration typeConfiguration) {
+		final var expressionType = (BasicType<?>) castTarget.getJdbcMapping();
+		final var ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
+		return getDdlType( ddlTypeRegistry, expressionType )
+				.getCastTypeName( castTarget.toSize(), expressionType, ddlTypeRegistry );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReverseFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReverseFunction.java
new file mode 100644
index 000000000000..0572556a0f3a
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReverseFunction.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+
+/**
+ * H2 requires a very special emulation, because {@code unnest} is pretty much useless,
+ * due to https://github.com/h2database/h2database/issues/1815.
+ * This emulation uses {@code array_get}, {@code cardinality} and {@code system_range}
+ * functions to achieve array reversal.
+ */
+public class H2ArrayReverseFunction extends AbstractArrayReverseFunction {
+
+	private final int maximumArraySize;
+
+	public H2ArrayReverseFunction(int maximumArraySize) {
+		this.maximumArraySize = maximumArraySize;
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final Expression arrayExpression = (Expression) sqlAstArguments.get( 0 );
+
+		sqlAppender.append( "case when " );
+		arrayExpression.accept( walker );
+		sqlAppender.append( " is not null then coalesce((select array_agg(array_get(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ",i.idx) order by i.idx desc) from system_range(1," );
+		sqlAppender.append( Integer.toString( maximumArraySize ) );
+		sqlAppender.append( ") i(idx) where i.idx<=coalesce(cardinality(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( "),0)),array[]) end" );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySortFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySortFunction.java
new file mode 100644
index 000000000000..e462c9a52664
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySortFunction.java
@@ -0,0 +1,132 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.sql.ast.tree.expression.Literal;
+import org.hibernate.type.spi.TypeConfiguration;
+
+/**
+ * H2 requires a very special emulation, because {@code unnest} is pretty much useless,
+ * due to https://github.com/h2database/h2database/issues/1815.
+ * This emulation uses {@code array_get}, {@code cardinality} and {@code system_range}
+ * functions to achieve array sorting.
+ */
+public class H2ArraySortFunction extends AbstractArraySortFunction {
+
+	private final int maximumArraySize;
+
+	public H2ArraySortFunction(int maximumArraySize, TypeConfiguration typeConfiguration) {
+		super( typeConfiguration );
+		this.maximumArraySize = maximumArraySize;
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+
+		final boolean areArgumentsLiterals =
+				( sqlAstArguments.size() <= 1 || sqlAstArguments.get( 1 ) instanceof Literal ) &&
+						( sqlAstArguments.size() <= 2 || sqlAstArguments.get( 2 ) instanceof Literal );
+
+		if ( areArgumentsLiterals ) {
+			renderWithLiteralArguments( sqlAppender, sqlAstArguments, walker );
+		}
+		else {
+			renderWithExpressionArguments( sqlAppender, sqlAstArguments, walker );
+		}
+	}
+
+	private void renderWithLiteralArguments(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			SqlAstTranslator<?> walker) {
+
+		final Expression arrayExpression = (Expression) sqlAstArguments.get( 0 );
+
+		final boolean descending = sqlAstArguments.size() > 1
+				&& sqlAstArguments.get( 1 ) instanceof Literal literal
+				&& literal.getLiteralValue() instanceof Boolean boolValue
+				? boolValue : false;
+
+		final Boolean nullsFirst = sqlAstArguments.size() > 2
+				&& sqlAstArguments.get( 2 ) instanceof Literal literal
+				&& literal.getLiteralValue() instanceof Boolean boolValue
+				? boolValue : null;
+
+		final boolean actualNullsFirst = nullsFirst != null ? nullsFirst : descending;
+
+		sqlAppender.append( "case when " );
+		arrayExpression.accept( walker );
+		sqlAppender.append( " is not null then coalesce((select array_agg(array_get(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ",i.idx) order by array_get(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ",i.idx)" );
+
+		sqlAppender.append( descending
+									? ( actualNullsFirst ? " desc nulls first" : " desc nulls last" )
+									: ( actualNullsFirst ? " asc nulls first" : " asc nulls last" ) );
+
+		sqlAppender.append( ") from system_range(1," );
+		sqlAppender.append( Integer.toString( maximumArraySize ) );
+		sqlAppender.append( ") i(idx) where i.idx<=coalesce(cardinality(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( "),0)),array[]) end" );
+	}
+
+	private void renderWithExpressionArguments(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			SqlAstTranslator<?> walker) {
+
+		assert sqlAstArguments.size() >= 2;
+
+		final Expression arrayExpression = (Expression) sqlAstArguments.get( 0 );
+		final SqlAstNode descendingNode = sqlAstArguments.get( 1 );
+		final SqlAstNode nullsFirstNode = sqlAstArguments.size() > 2
+				? sqlAstArguments.get( 2 )
+				: descendingNode;
+
+		sqlAppender.append( "case when " );
+		arrayExpression.accept( walker );
+		sqlAppender.append( " is not null then coalesce((select array_agg(array_get(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ",i.idx) order by " );
+
+		sqlAppender.append( '(' );
+		nullsFirstNode.accept( walker );
+		sqlAppender.append( "=(array_get(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ",i.idx) is null)) desc," );
+
+		sqlAppender.append( "case when " );
+		descendingNode.accept( walker );
+		sqlAppender.append( " then array_get(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ",i.idx) end desc," );
+
+		sqlAppender.append( "case when not " );
+		descendingNode.accept( walker );
+		sqlAppender.append( " then array_get(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ",i.idx) end" );
+
+		sqlAppender.append( ") from system_range(1," );
+		sqlAppender.append( Integer.toString( maximumArraySize ) );
+		sqlAppender.append( ") i(idx) where i.idx<=coalesce(cardinality(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( "),0)),array[]) end" );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java
index 3c0dea0ee1a9..5982815fd868 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java
@@ -6,9 +6,10 @@
 
 import java.util.List;
 
+import org.hibernate.dialect.aggregate.AggregateSupport;
 import org.hibernate.dialect.function.UnnestSetReturningFunctionTypeResolver;
+import org.hibernate.engine.jdbc.Size;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.util.NullnessUtil;
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
@@ -16,6 +17,7 @@
 import org.hibernate.metamodel.mapping.SelectablePath;
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
 import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl;
+import org.hibernate.metamodel.mapping.internal.SqlTypedMappingImpl;
 import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer;
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.ComparisonOperator;
@@ -37,9 +39,12 @@
 import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
 import org.hibernate.type.BasicPluralType;
 import org.hibernate.type.BasicType;
+import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.type.descriptor.sql.DdlType;
+import org.hibernate.type.spi.TypeConfiguration;
 
 /**
  * H2 unnest function.
@@ -55,7 +60,7 @@ public class H2UnnestFunction extends UnnestFunction {
 	private final int maximumArraySize;
 
 	public H2UnnestFunction(int maximumArraySize) {
-		super( new H2UnnestSetReturningFunctionTypeResolver() );
+		super( new H2UnnestSetReturningFunctionTypeResolver(), false );
 		this.maximumArraySize = maximumArraySize;
 	}
 
@@ -232,7 +237,6 @@ public SelectableMapping[] resolveFunctionReturnType(
 				// For column references we render an emulation through system_range(),
 				// so we need to render an array access to get to the element
 				final String elementReadExpression = "array_get(" + arrayColumnReference.getExpressionText() + "," + Template.TEMPLATE + ".x)";
-				final String arrayReadExpression = NullnessUtil.castNonNull( arrayColumnReference.getReadExpression() );
 				final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
 				final int jdbcValueCount = embeddableMappingType.getJdbcValueCount();
 				returnType = new SelectableMapping[jdbcValueCount + (indexMapping == null ? 0 : 1)];
@@ -240,7 +244,7 @@ public SelectableMapping[] resolveFunctionReturnType(
 					final SelectableMapping selectableMapping = embeddableMappingType.getJdbcValueSelectable( i );
 					// The array expression has to be replaced with the actual array_get read expression in this emulation
 					final String customReadExpression = selectableMapping.getCustomReadExpression()
-							.replace( arrayReadExpression, elementReadExpression );
+							.replace( Template.TEMPLATE, elementReadExpression );
 					returnType[i] = new SelectableMappingImpl(
 							selectableMapping.getContainingTableExpression(),
 							selectableMapping.getSelectablePath().getSelectableName(),
@@ -280,15 +284,53 @@ public SelectableMapping[] resolveFunctionReturnType(
 					elementSelectionExpression = defaultBasicArrayColumnName;
 					elementReadExpression = null;
 				}
+				final TypeConfiguration typeConfiguration = converter.getCreationContext().getTypeConfiguration();
+				final DdlType ddlType = typeConfiguration.getDdlTypeRegistry()
+						.getDescriptor( elementType.getJdbcType().getDefaultSqlTypeCode() );
+				final AggregateSupport aggregateSupport =
+						converter.getCreationContext().getDialect().getAggregateSupport();
 				final SelectableMapping elementMapping;
+				final int pluralSqlTypeCode = pluralType.getJdbcType().getDefaultSqlTypeCode();
 				if ( expressionType instanceof SqlTypedMapping typedMapping ) {
+					final String columnTypeName = ddlType.getTypeName(
+							new Size(
+									typedMapping.getPrecision(),
+									typedMapping.getScale(),
+									typedMapping.getLength()
+							),
+							elementType,
+							typeConfiguration.getDdlTypeRegistry()
+					);
+					final String readExpression;
+					if ( pluralSqlTypeCode == SqlTypes.JSON_ARRAY || pluralSqlTypeCode == SqlTypes.XML_ARRAY ) {
+						readExpression = aggregateSupport.aggregateComponentCustomReadExpression(
+								"",
+								"",
+								"",
+								elementReadExpression,
+								pluralSqlTypeCode,
+								new SqlTypedMappingImpl(
+										columnTypeName,
+										typedMapping.getLength(),
+										null,
+										typedMapping.getPrecision(),
+										typedMapping.getScale(),
+										typedMapping.getTemporalPrecision(),
+										elementType
+								),
+								typeConfiguration
+						);
+					}
+					else {
+						readExpression = elementReadExpression;
+					}
 					elementMapping = new SelectableMappingImpl(
 							"",
 							elementSelectionExpression,
 							new SelectablePath( CollectionPart.Nature.ELEMENT.getName() ),
-							elementReadExpression,
+							readExpression,
 							null,
-							typedMapping.getColumnDefinition(),
+							columnTypeName,
 							typedMapping.getLength(),
 							typedMapping.getArrayLength(),
 							typedMapping.getPrecision(),
@@ -304,11 +346,39 @@ public SelectableMapping[] resolveFunctionReturnType(
 					);
 				}
 				else {
+					final String columnTypeName = ddlType.getTypeName(
+							Size.nil(),
+							elementType,
+							typeConfiguration.getDdlTypeRegistry()
+					);
+					final String readExpression;
+					if ( pluralSqlTypeCode == SqlTypes.JSON_ARRAY || pluralSqlTypeCode == SqlTypes.XML_ARRAY ) {
+						readExpression = aggregateSupport.aggregateComponentCustomReadExpression(
+								"",
+								"",
+								"",
+								elementReadExpression,
+								pluralSqlTypeCode,
+								new SqlTypedMappingImpl(
+										columnTypeName,
+										null,
+										null,
+										null,
+										null,
+										null,
+										elementType
+								),
+								typeConfiguration
+						);
+					}
+					else {
+						readExpression = elementReadExpression;
+					}
 					elementMapping = new SelectableMappingImpl(
 							"",
 							elementSelectionExpression,
 							new SelectablePath( CollectionPart.Nature.ELEMENT.getName() ),
-							elementReadExpression,
+							readExpression,
 							null,
 							null,
 							null,
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java
index 67c7fafe8383..7de0a610e517 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java
@@ -67,7 +67,7 @@
 public class HANAUnnestFunction extends UnnestFunction {
 
 	public HANAUnnestFunction() {
-		super( "v", "i" );
+		super( "v", "i", true );
 	}
 
 	@Override
@@ -233,7 +233,7 @@ private void addIdColumns(EmbeddableValuedModelPart embeddableModelPart, List<Co
 			}
 
 			private void addIdColumns(PluralAttributeMapping pluralAttributeMapping, List<ColumnInfo> idColumns) {
-				final DdlTypeRegistry ddlTypeRegistry = pluralAttributeMapping.getCollectionDescriptor()
+				final var ddlTypeRegistry = pluralAttributeMapping.getCollectionDescriptor()
 						.getFactory()
 						.getTypeConfiguration()
 						.getDdlTypeRegistry();
@@ -241,7 +241,7 @@ private void addIdColumns(PluralAttributeMapping pluralAttributeMapping, List<Co
 			}
 
 			private void addIdColumns(EntityMappingType entityMappingType, List<ColumnInfo> idColumns) {
-				final DdlTypeRegistry ddlTypeRegistry = entityMappingType.getEntityPersister()
+				final var ddlTypeRegistry = entityMappingType.getEntityPersister()
 						.getFactory()
 						.getTypeConfiguration()
 						.getDdlTypeRegistry();
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java
index bb7a91f23d17..6526e5fda3e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java
@@ -30,7 +30,7 @@ public void render(
 		final Expression elementExpression = (Expression) sqlAstArguments.get( 1 );
 		sqlAppender.append( "case when ");
 		arrayExpression.accept( walker );
-		sqlAppender.append( " is not null then coalesce((select array_agg(t.val) from unnest(" );
+		sqlAppender.append( " is not null then coalesce((select array_agg(t.val order by t.idx) from unnest(" );
 		arrayExpression.accept( walker );
 		sqlAppender.append( ") with ordinality t(val,idx) where t.val is distinct from " );
 		elementExpression.accept( walker );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySortFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySortFunction.java
new file mode 100644
index 000000000000..f344c0e5326f
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySortFunction.java
@@ -0,0 +1,111 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.sql.ast.tree.expression.Literal;
+import org.hibernate.type.spi.TypeConfiguration;
+
+/**
+ * HSQLDB sort_array function.
+ */
+public class HSQLArraySortFunction extends AbstractArraySortFunction {
+
+	public HSQLArraySortFunction(TypeConfiguration typeConfiguration) {
+		super( typeConfiguration );
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+
+		final boolean areArgumentsLiterals =
+				( sqlAstArguments.size() <= 1 || sqlAstArguments.get( 1 ) instanceof Literal ) &&
+						( sqlAstArguments.size() <= 2 || sqlAstArguments.get( 2 ) instanceof Literal );
+
+		if ( areArgumentsLiterals ) {
+			renderWithLiteralArguments( sqlAppender, sqlAstArguments, walker );
+		}
+		else {
+			renderWithExpressionArguments( sqlAppender, sqlAstArguments, walker );
+		}
+	}
+
+	private void renderWithLiteralArguments(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			SqlAstTranslator<?> walker) {
+
+		final Expression arrayExpression = (Expression) sqlAstArguments.get( 0 );
+
+		final boolean descending = sqlAstArguments.size() > 1
+				&& sqlAstArguments.get( 1 ) instanceof Literal literal
+				&& literal.getLiteralValue() instanceof Boolean boolValue
+				? boolValue : false;
+
+		final Boolean nullsFirst = sqlAstArguments.size() > 2
+				&& sqlAstArguments.get( 2 ) instanceof Literal literal
+				&& literal.getLiteralValue() instanceof Boolean boolValue
+				? boolValue : null;
+
+		final boolean actualNullsFirst = nullsFirst != null ? nullsFirst : descending;
+
+		sqlAppender.append( "sort_array(" );
+		arrayExpression.accept( walker );
+
+		sqlAppender.append( descending
+									? ( actualNullsFirst ? " desc nulls first" : " desc nulls last" )
+									: ( actualNullsFirst ? " asc nulls first" : " asc nulls last" ) );
+
+		sqlAppender.append( ')' );
+	}
+
+	private void renderWithExpressionArguments(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			SqlAstTranslator<?> walker) {
+
+		assert sqlAstArguments.size() >= 2;
+
+		final SqlAstNode arrayExpression = sqlAstArguments.get( 0 );
+		final SqlAstNode descendingNode = sqlAstArguments.get( 1 );
+		final SqlAstNode nullsFirstNode = sqlAstArguments.size() > 2
+				? sqlAstArguments.get( 2 )
+				: descendingNode;
+
+		sqlAppender.append( "case when " );
+		arrayExpression.accept( walker );
+		sqlAppender.append( " is not null then " );
+
+		sqlAppender.append( "coalesce((select array_agg(t.val order by " );
+
+		sqlAppender.append( '(' );
+		nullsFirstNode.accept( walker );
+		sqlAppender.append( "=(t.val is null)) desc," );
+
+		sqlAppender.append( "case when " );
+		descendingNode.accept( walker );
+		sqlAppender.append( " then t.val end desc," );
+
+		sqlAppender.append( "case when not " );
+		descendingNode.accept( walker );
+		sqlAppender.append( " then t.val end" );
+
+		sqlAppender.append( ") from unnest(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ") t(val))" );
+
+		sqlAppender.append( ",array[]) end" );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java
index ce7ed772650b..4ddb37bf909e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java
@@ -7,9 +7,7 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import org.hibernate.internal.build.AllowReflection;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
-import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.ReturnableType;
 import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver;
@@ -20,7 +18,6 @@
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.java.BasicPluralJavaType;
 import org.hibernate.type.descriptor.jdbc.DelegatingJdbcTypeIndicators;
-import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -44,12 +41,12 @@ public ReturnableType<?> resolveFunctionReturnType(
 			TypeConfiguration typeConfiguration) {
 		if ( converter != null ) {
 			if ( converter.isInTypeInference() ) {
-				// Don't default to a Json array when in type inference mode.
+				// Don't default to a JSON array when in type inference mode.
 				// Comparing e.g. `array() = (select array_agg() ...)` will trigger this resolver
 				// while inferring the type for `array()`, which we want to avoid.
 				return null;
 			}
-			final MappingModelExpressible<?> inferredType = converter.resolveFunctionImpliedReturnType();
+			final var inferredType = converter.resolveFunctionImpliedReturnType();
 			if ( inferredType != null ) {
 				if ( inferredType instanceof ReturnableType<?> returnableType ) {
 					return returnableType;
@@ -62,8 +59,8 @@ else if ( inferredType instanceof BasicValuedMapping basicValuedMapping ) {
 		if ( impliedType != null ) {
 			return impliedType;
 		}
-		for ( SqmTypedNode<?> argument : arguments ) {
-			final DomainType<?> sqmType = argument.getExpressible().getSqmType();
+		for ( var argument : arguments ) {
+			final var sqmType = argument.getExpressible().getSqmType();
 			if ( sqmType instanceof ReturnableType<?> ) {
 				return resolveJsonArrayType( sqmType, typeConfiguration );
 			}
@@ -78,14 +75,14 @@ public BasicValuedMapping resolveFunctionReturnType(
 		return null;
 	}
 
-	@AllowReflection
+//	@AllowReflection
 	public static <T> BasicType<?> resolveJsonArrayType(DomainType<T> elementType, TypeConfiguration typeConfiguration) {
 		@SuppressWarnings("unchecked")
 		final var arrayJavaType =
 				(BasicPluralJavaType<T>)
 						typeConfiguration.getJavaTypeRegistry()
 								.resolveArrayDescriptor( elementType.getJavaType() );
-		final JdbcTypeIndicators currentBaseSqlTypeIndicators = typeConfiguration.getCurrentBaseSqlTypeIndicators();
+		final var currentBaseSqlTypeIndicators = typeConfiguration.getCurrentBaseSqlTypeIndicators();
 		return arrayJavaType.resolveType(
 				typeConfiguration,
 				currentBaseSqlTypeIndicators.getDialect(),
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java
index 9044a16492f2..bd8607e77ca8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java
@@ -15,10 +15,7 @@
 /**
  * Oracle array_get function.
  */
-public class OracleArrayGetFunction extends ArrayGetUnnestFunction {
-
-	public OracleArrayGetFunction() {
-	}
+public class OracleArrayGetFunction extends AbstractArrayGetFunction {
 
 	@Override
 	public void render(
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReverseFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReverseFunction.java
new file mode 100644
index 000000000000..c00fa75aea00
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReverseFunction.java
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+
+/**
+ * Oracle array_reverse function.
+ */
+public class OracleArrayReverseFunction extends AbstractArrayReverseFunction {
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final Expression arrayExpression = (Expression) sqlAstArguments.get( 0 );
+		final String arrayTypeName = DdlTypeHelper.getTypeName(
+				arrayExpression.getExpressionType(),
+				walker.getSessionFactory().getTypeConfiguration()
+		);
+		sqlAppender.append( arrayTypeName );
+		sqlAppender.append( "_reverse(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ')' );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySortFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySortFunction.java
new file mode 100644
index 000000000000..e6f9bf7aba99
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySortFunction.java
@@ -0,0 +1,75 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import static org.hibernate.internal.util.NullnessUtil.castNonNull;
+
+/**
+ * Oracle array_sort function.
+ */
+public class OracleArraySortFunction extends AbstractArraySortFunction {
+
+	public OracleArraySortFunction(TypeConfiguration typeConfiguration) {
+		super( typeConfiguration );
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final Expression arrayExpression = (Expression) sqlAstArguments.get( 0 );
+		final String arrayTypeName = DdlTypeHelper.getTypeName(
+				arrayExpression.getExpressionType(),
+				walker.getSessionFactory().getTypeConfiguration()
+		);
+
+		sqlAppender.append( arrayTypeName );
+		sqlAppender.append( "_sort(" );
+		arrayExpression.accept( walker );
+
+		if ( sqlAstArguments.size() > 1 ) {
+			sqlAppender.append( ',' );
+			final Expression descNode = (Expression) sqlAstArguments.get( 1 );
+			sqlAppender.append( "case when " );
+			descNode.accept( walker );
+			sqlAppender.append( '=' );
+			var sessionFactory = walker.getSessionFactory();
+			castNonNull( descNode.getExpressionType() ).getSingleJdbcMapping().getJdbcLiteralFormatter()
+					.appendJdbcLiteral(
+							sqlAppender,
+							true,
+							sessionFactory.getJdbcServices().getDialect(),
+							sessionFactory.getWrapperOptions()
+					);
+			sqlAppender.append( " then 1 else 0 end" );
+			if ( sqlAstArguments.size() > 2 ) {
+				sqlAppender.append( ",case when " );
+				final Expression nullsNode = (Expression) sqlAstArguments.get( 2 );
+				nullsNode.accept( walker );
+				sqlAppender.append( '=' );
+				castNonNull( nullsNode.getExpressionType() ).getSingleJdbcMapping().getJdbcLiteralFormatter()
+						.appendJdbcLiteral(
+								sqlAppender,
+								true,
+								sessionFactory.getJdbcServices().getDialect(),
+								sessionFactory.getWrapperOptions()
+						);
+				sqlAppender.append( " then 1 else 0 end" );
+			}
+		}
+		sqlAppender.append( ')' );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java
index 9fcb44dd9bd5..c2c26f8f5820 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java
@@ -20,8 +20,13 @@
  */
 public class OracleUnnestFunction extends UnnestFunction {
 
+	@Deprecated(forRemoval = true)
 	public OracleUnnestFunction() {
-		super( "column_value", "i" );
+		this( false );
+	}
+
+	public OracleUnnestFunction(boolean supportsJsonType) {
+		super( "column_value", "i", !supportsJsonType );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayReverseEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayReverseEmulation.java
new file mode 100644
index 000000000000..5c0e4adf7581
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayReverseEmulation.java
@@ -0,0 +1,60 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.type.BasicPluralType;
+import org.hibernate.type.BasicType;
+
+/**
+ * PostgreSQL array_reverse emulation for versions before 18.
+ * HSQLDB uses the same approach.
+ */
+public class PostgreSQLArrayReverseEmulation extends AbstractArrayReverseFunction {
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final SqlAstNode arrayExpression = sqlAstArguments.get( 0 );
+
+		sqlAppender.append( "case when " );
+		arrayExpression.accept( walker );
+		sqlAppender.append( " is not null then " );
+		sqlAppender.append( "coalesce((select array_agg(t.val order by t.idx desc) from unnest(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ") with ordinality t(val,idx)" );
+
+		String arrayTypeName = null;
+		if ( returnType instanceof BasicPluralType<?, ?> pluralType ) {
+			if ( needsArrayCasting( pluralType.getElementType() ) ) {
+				arrayTypeName = DdlTypeHelper.getCastTypeName(
+						returnType,
+						walker.getSessionFactory().getTypeConfiguration()
+				);
+			}
+		}
+		if ( arrayTypeName != null ) {
+			sqlAppender.append( "),cast(array[] as " );
+			sqlAppender.appendSql( arrayTypeName );
+			sqlAppender.appendSql( "))" );
+		}
+		else {
+			sqlAppender.append( "),array[])" );
+		}
+		sqlAppender.append( " end" );
+	}
+
+	private static boolean needsArrayCasting(BasicType<?> elementType) {
+		return elementType.getJdbcType().isString();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArraySortEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArraySortEmulation.java
new file mode 100644
index 000000000000..b7cfa927563e
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArraySortEmulation.java
@@ -0,0 +1,154 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Literal;
+import org.hibernate.type.BasicPluralType;
+import org.hibernate.type.BasicType;
+import org.hibernate.type.spi.TypeConfiguration;
+
+/**
+ * PostgreSQL array_sort emulation for versions before 18.
+ */
+public class PostgreSQLArraySortEmulation extends AbstractArraySortFunction {
+
+	public PostgreSQLArraySortEmulation(TypeConfiguration typeConfiguration) {
+		super( typeConfiguration );
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+
+		final boolean areArgumentsLiterals =
+				( sqlAstArguments.size() <= 1 || sqlAstArguments.get( 1 ) instanceof Literal ) &&
+						( sqlAstArguments.size() <= 2 || sqlAstArguments.get( 2 ) instanceof Literal );
+
+		if ( areArgumentsLiterals ) {
+			renderWithLiteralArguments( sqlAppender, sqlAstArguments, returnType, walker );
+		}
+		else {
+			renderWithExpressionArguments( sqlAppender, sqlAstArguments, returnType, walker );
+		}
+	}
+
+	private void renderWithLiteralArguments(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+
+		final SqlAstNode arrayExpression = sqlAstArguments.get( 0 );
+
+		final boolean descending = sqlAstArguments.size() > 1
+				&& sqlAstArguments.get( 1 ) instanceof Literal literal
+				&& literal.getLiteralValue() instanceof Boolean
+				? (Boolean) literal.getLiteralValue()
+				: false;
+
+		final Boolean nullsFirst = sqlAstArguments.size() > 2
+				&& sqlAstArguments.get( 2 ) instanceof Literal literal
+				&& literal.getLiteralValue() instanceof Boolean
+				? (Boolean) literal.getLiteralValue()
+				: null;
+
+		final boolean actualNullsFirst = nullsFirst != null ? nullsFirst : descending;
+
+		sqlAppender.append( "case when " );
+		arrayExpression.accept( walker );
+		sqlAppender.append( " is not null then " );
+
+		sqlAppender.append( "coalesce((select array_agg(t.val order by t.val" );
+
+		sqlAppender.append( descending
+									? ( actualNullsFirst ? " desc nulls first" : " desc nulls last" )
+									: ( actualNullsFirst ? " asc nulls first" : " asc nulls last" ) );
+
+		sqlAppender.append( ") from unnest(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ") t(val))" );
+
+		appendEmptyArrayWithCasting( sqlAppender, returnType, walker );
+		sqlAppender.append( " end" );
+	}
+
+	private void renderWithExpressionArguments(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+
+		assert sqlAstArguments.size() >= 2;
+
+		final SqlAstNode arrayExpression = sqlAstArguments.get( 0 );
+		final SqlAstNode descendingNode = sqlAstArguments.get( 1 );
+		final SqlAstNode nullsFirstNode = sqlAstArguments.size() > 2
+				? sqlAstArguments.get( 2 )
+				: descendingNode;
+
+		sqlAppender.append( "case when " );
+		arrayExpression.accept( walker );
+		sqlAppender.append( " is not null then " );
+
+		sqlAppender.append( "coalesce((select array_agg(t.val order by " );
+
+		sqlAppender.append( '(' );
+		nullsFirstNode.accept( walker );
+		sqlAppender.append( "=(t.val is null)) desc," );
+
+		sqlAppender.append( "case when " );
+		descendingNode.accept( walker );
+		sqlAppender.append( " then t.val end desc," );
+
+		sqlAppender.append( "case when not " );
+		descendingNode.accept( walker );
+		sqlAppender.append( " then t.val end" );
+
+		sqlAppender.append( ") from unnest(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ") t(val))" );
+
+		appendEmptyArrayWithCasting( sqlAppender, returnType, walker );
+		sqlAppender.append( " end" );
+	}
+
+	private void appendEmptyArrayWithCasting(
+			SqlAppender sqlAppender,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+
+		String arrayTypeName = null;
+		if ( returnType instanceof BasicPluralType<?, ?> pluralType ) {
+			if ( needsArrayCasting( pluralType.getElementType() ) ) {
+				arrayTypeName = DdlTypeHelper.getCastTypeName(
+						returnType,
+						walker.getSessionFactory().getTypeConfiguration()
+				);
+			}
+		}
+
+		if ( arrayTypeName != null ) {
+			sqlAppender.append( ",cast(array[] as " );
+			sqlAppender.appendSql( arrayTypeName );
+			sqlAppender.appendSql( "))" );
+		}
+		else {
+			sqlAppender.append( ",array[])" );
+		}
+	}
+
+	private static boolean needsArrayCasting(BasicType<?> elementType) {
+		return elementType.getJdbcType().isString();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java
index de9712049da9..899cfb331e53 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java
@@ -5,6 +5,7 @@
 package org.hibernate.dialect.function.array;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.type.descriptor.jdbc.XmlHelper;
 import org.hibernate.dialect.aggregate.AggregateSupport;
 import org.hibernate.metamodel.mapping.CollectionPart;
@@ -26,7 +27,7 @@ public class PostgreSQLUnnestFunction extends UnnestFunction {
 	private final boolean supportsJsonTable;
 
 	public PostgreSQLUnnestFunction(boolean supportsJsonTable) {
-		super( null, "ordinality" );
+		super( null, "ordinality", false );
 		this.supportsJsonTable = supportsJsonTable;
 	}
 
@@ -62,7 +63,10 @@ protected void renderJsonTable(
 					sqlAppender.append( ',' );
 				}
 				if ( CollectionPart.Nature.INDEX.getName().equals( selectableMapping.getSelectableName() ) ) {
-					sqlAppender.appendSql( "t.i" );
+					sqlAppender.append( "t.i" );
+				}
+				else if ( CollectionPart.Nature.ELEMENT.getName().equals( selectableMapping.getSelectableName() ) ) {
+					sqlAppender.append( "t.v" );
 				}
 				else {
 					sqlAppender.append( aggregateSupport.aggregateComponentCustomReadExpression(
@@ -78,7 +82,13 @@ protected void renderJsonTable(
 				sqlAppender.append( " as " );
 				sqlAppender.append( selectableMapping.getSelectionExpression() );
 			} );
-			sqlAppender.appendSql( " from jsonb_array_elements(" );
+			final ModelPart elementPart = tupleType.findSubPart( CollectionPart.Nature.ELEMENT.getName(), null );
+			if ( elementPart != null && elementPart.getSingleJdbcMapping().getJdbcType().isStringLike() ) {
+				sqlAppender.appendSql( " from jsonb_array_elements_text(" );
+			}
+			else {
+				sqlAppender.appendSql( " from jsonb_array_elements(" );
+			}
 			array.accept( walker );
 			sqlAppender.appendSql( ')' );
 			if ( tupleType.findSubPart( CollectionPart.Nature.INDEX.getName(), null ) != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java
index eed68fb15aff..a9d2bd2e8ec1 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java
@@ -24,7 +24,7 @@
 public class SQLServerUnnestFunction extends UnnestFunction {
 
 	public SQLServerUnnestFunction() {
-		super( "v", "i" );
+		super( "v", "i", false );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerArrayConcatElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerArrayConcatElementFunction.java
new file mode 100644
index 000000000000..760546ef0601
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerArrayConcatElementFunction.java
@@ -0,0 +1,74 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.sql.ast.tree.expression.Literal;
+import org.hibernate.type.BasicPluralType;
+
+/**
+ * Uses typed array literals for {@code null} arrays like {@code ARRAY<type>[null]}, to resolve ambiguity.
+ */
+public class SpannerArrayConcatElementFunction extends ArrayConcatElementFunction {
+
+	public SpannerArrayConcatElementFunction(boolean prepend) {
+		super( "", "||", "", prepend );
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final Expression firstArgument = (Expression) sqlAstArguments.get( 0 );
+		final Expression secondArgument = (Expression) sqlAstArguments.get( 1 );
+		final Expression elementArgument = prepend ? firstArgument : secondArgument;
+
+		if ( needsTypedLiteral( elementArgument ) ) {
+			String typeName = null;
+			if ( returnType instanceof BasicPluralType<?, ?> pluralType ) {
+				typeName = DdlTypeHelper.getCastTypeName( pluralType.getElementType(), walker.getSessionFactory().getTypeConfiguration() );
+			}
+
+			if ( typeName != null && !typeName.isEmpty() ) {
+				final Expression arrayArgument = prepend ? secondArgument : firstArgument;
+				if ( prepend ) {
+					sqlAppender.append( "ARRAY<" );
+					sqlAppender.append( typeName );
+					sqlAppender.append( ">[" );
+					walker.render( elementArgument, SqlAstNodeRenderingMode.DEFAULT );
+					sqlAppender.append( "]||" );
+					walker.render( arrayArgument, SqlAstNodeRenderingMode.DEFAULT );
+				}
+				else {
+					walker.render( arrayArgument, SqlAstNodeRenderingMode.DEFAULT );
+					sqlAppender.append( "||ARRAY<" );
+					sqlAppender.append( typeName );
+					sqlAppender.append( ">[" );
+					walker.render( elementArgument, SqlAstNodeRenderingMode.DEFAULT );
+					sqlAppender.append( "]" );
+				}
+			}
+		}
+		else {
+			super.render( sqlAppender, sqlAstArguments, returnType, walker );
+		}
+	}
+
+	private static boolean needsTypedLiteral(Expression elementExpression) {
+		if ( elementExpression instanceof Literal literal ) {
+			return literal.getLiteralValue() == null;
+		}
+		return false;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayConcatElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayConcatElementFunction.java
new file mode 100644
index 000000000000..33ab2c450b62
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayConcatElementFunction.java
@@ -0,0 +1,71 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+
+/**
+ * Spanner PostgreSQL variant of the function to properly return {@code null} when the array argument is null
+ * without generating casts which Spanner doesn't support.
+ */
+public class SpannerPostgreSQLArrayConcatElementFunction extends ArrayConcatElementFunction {
+
+	public SpannerPostgreSQLArrayConcatElementFunction(boolean prepend) {
+		super( "", "||", "", prepend );
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final Expression firstArgument = (Expression) sqlAstArguments.get( 0 );
+		final Expression secondArgument = (Expression) sqlAstArguments.get( 1 );
+		final Expression arrayArgument;
+		final Expression elementArgument;
+		if ( prepend ) {
+			elementArgument = firstArgument;
+			arrayArgument = secondArgument;
+		}
+		else {
+			arrayArgument = firstArgument;
+			elementArgument = secondArgument;
+		}
+
+		sqlAppender.append( "case when " );
+		walker.render( arrayArgument, SqlAstNodeRenderingMode.DEFAULT );
+		sqlAppender.append( " is not null then " );
+
+		if ( prepend ) {
+			sqlAppender.append( "array[" );
+			walker.render( elementArgument, SqlAstNodeRenderingMode.DEFAULT );
+			sqlAppender.append( "]" );
+		}
+		else {
+			walker.render( arrayArgument, SqlAstNodeRenderingMode.DEFAULT );
+		}
+
+		sqlAppender.append( "||" );
+
+		if ( prepend ) {
+			walker.render( arrayArgument, SqlAstNodeRenderingMode.DEFAULT );
+		}
+		else {
+			sqlAppender.append( "array[" );
+			walker.render( elementArgument, SqlAstNodeRenderingMode.DEFAULT );
+			sqlAppender.append( "]" );
+		}
+
+		sqlAppender.append( " end" );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayRemoveFunction.java
new file mode 100644
index 000000000000..958aa129c6c6
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayRemoveFunction.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.type.BasicPluralType;
+import org.hibernate.type.BasicType;
+
+/**
+ * Emulation of PostgreSQL's array_remove function for Spanner PostgreSQL dialect.
+ */
+public class SpannerPostgreSQLArrayRemoveFunction extends AbstractArrayRemoveFunction {
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final Expression arrayExpression = (Expression) sqlAstArguments.get( 0 );
+		final Expression elementExpression = (Expression) sqlAstArguments.get( 1 );
+
+		sqlAppender.append( "case when " );
+		arrayExpression.accept( walker );
+		sqlAppender.append( " is not null then coalesce((select array_agg(t.val order by t.idx) from unnest(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ") with ordinality as t(val, idx) where t.val != " );
+		elementExpression.accept( walker );
+		sqlAppender.append( " or (t.val is null and " );
+		elementExpression.accept( walker );
+		sqlAppender.append( " is not null) or (t.val is not null and " );
+		elementExpression.accept( walker );
+		sqlAppender.append( " is null))" );
+
+		String arrayTypeName = null;
+		if ( returnType instanceof BasicPluralType<?, ?> pluralType ) {
+			if ( needsArrayCasting( pluralType.getElementType() ) ) {
+				arrayTypeName = org.hibernate.dialect.function.array.DdlTypeHelper.getCastTypeName(
+						returnType,
+						walker.getSessionFactory().getTypeConfiguration()
+				);
+			}
+		}
+		if ( arrayTypeName != null ) {
+			sqlAppender.append( ",cast(array[] as " );
+			sqlAppender.appendSql( arrayTypeName );
+			sqlAppender.appendSql( ")) end" );
+		}
+		else {
+			sqlAppender.append( ",array[]) end" );
+		}
+	}
+
+	private static boolean needsArrayCasting(BasicType<?> elementType) {
+		// PostgreSQL doesn't do implicit conversion between text[] and varchar[], so we need casting
+		return elementType.getJdbcType().isString();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayRemoveIndexFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayRemoveIndexFunction.java
new file mode 100644
index 000000000000..9da088feaf99
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayRemoveIndexFunction.java
@@ -0,0 +1,78 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
+import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator;
+import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.ANY;
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.INTEGER;
+
+/**
+ * Spanner PostgreSQL specific emulation of array_remove_index.
+ *
+ * Spanner does not support the {@code IS DISTINCT FROM} operator, so this
+ * emulation uses a null-safe inequality check using {@code coalesce}.
+ */
+public class SpannerPostgreSQLArrayRemoveIndexFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
+
+	private final boolean castEmptyArrayLiteral;
+
+	public SpannerPostgreSQLArrayRemoveIndexFunction(boolean castEmptyArrayLiteral) {
+		super(
+				"array_remove_index",
+				StandardArgumentsValidators.composite(
+						new ArgumentTypesValidator( null, ANY, INTEGER ),
+						ArrayArgumentValidator.DEFAULT_INSTANCE
+				),
+				ArrayViaArgumentReturnTypeResolver.DEFAULT_INSTANCE,
+				StandardFunctionArgumentTypeResolvers.composite(
+						StandardFunctionArgumentTypeResolvers.invariant( ANY, INTEGER ),
+						StandardFunctionArgumentTypeResolvers.IMPLIED_RESULT_TYPE
+				)
+		);
+		this.castEmptyArrayLiteral = castEmptyArrayLiteral;
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final Expression arrayExpression = (Expression) sqlAstArguments.get( 0 );
+		final Expression indexExpression = (Expression) sqlAstArguments.get( 1 );
+
+		sqlAppender.append( "case when ");
+		arrayExpression.accept( walker );
+		sqlAppender.append( " is not null then coalesce((select array_agg(t.val order by t.idx) from unnest(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ") with ordinality t(val,idx) where coalesce(t.idx != " );
+		indexExpression.accept( walker );
+		sqlAppender.append( ", true)),");
+
+		if ( castEmptyArrayLiteral ) {
+			sqlAppender.append( "cast(array[] as " );
+			sqlAppender.append( DdlTypeHelper.getCastTypeName(
+					returnType,
+					walker.getSessionFactory().getTypeConfiguration()
+			) );
+			sqlAppender.append( ')' );
+		}
+		else {
+			sqlAppender.append( "array[]" );
+		}
+		sqlAppender.append(") end" );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayReplaceFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayReplaceFunction.java
new file mode 100644
index 000000000000..7ce90f317ff5
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayReplaceFunction.java
@@ -0,0 +1,81 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
+import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.type.BasicPluralType;
+import org.hibernate.type.BasicType;
+
+/**
+ * Emulation of PostgreSQL's array_replace function for Spanner PostgreSQL dialect.
+ */
+public class SpannerPostgreSQLArrayReplaceFunction extends AbstractSqmSelfRenderingFunctionDescriptor {
+
+	public SpannerPostgreSQLArrayReplaceFunction() {
+		super(
+				"array_replace",
+				StandardArgumentsValidators.composite(
+						StandardArgumentsValidators.exactly( 3 ),
+						new ArrayAndElementArgumentValidator( 0, 1, 2 )
+				),
+				ArrayViaArgumentReturnTypeResolver.DEFAULT_INSTANCE,
+				new ArrayAndElementArgumentTypeResolver( 0, 1, 2 )
+		);
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final Expression arrayExpression = (Expression) sqlAstArguments.get( 0 );
+		final Expression oldExpression = (Expression) sqlAstArguments.get( 1 );
+		final Expression newExpression = (Expression) sqlAstArguments.get( 2 );
+
+		sqlAppender.append( "case when " );
+		arrayExpression.accept( walker );
+		sqlAppender.append( " is not null then coalesce((select array_agg(case when t.val = " );
+		oldExpression.accept( walker );
+		sqlAppender.append( " or (t.val is null and " );
+		oldExpression.accept( walker );
+		sqlAppender.append( " is null) then " );
+		newExpression.accept( walker );
+		sqlAppender.append( " else t.val end order by t.idx) from unnest(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ") with ordinality as t(val, idx))" );
+
+		String arrayTypeName = null;
+		if ( returnType instanceof BasicPluralType<?, ?> pluralType ) {
+			if ( needsArrayCasting( pluralType.getElementType() ) ) {
+				arrayTypeName = org.hibernate.dialect.function.array.DdlTypeHelper.getCastTypeName(
+						returnType,
+						walker.getSessionFactory().getTypeConfiguration()
+				);
+			}
+		}
+		if ( arrayTypeName != null ) {
+			sqlAppender.append( ",cast(array[] as " );
+			sqlAppender.appendSql( arrayTypeName );
+			sqlAppender.appendSql( ")) end" );
+		}
+		else {
+			sqlAppender.append( ",array[]) end" );
+		}
+	}
+
+	private static boolean needsArrayCasting(BasicType<?> elementType) {
+		// PostgreSQL doesn't do implicit conversion between text[] and varchar[], so we need casting
+		return elementType.getJdbcType().isString();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayTrimEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayTrimEmulation.java
new file mode 100644
index 000000000000..22be08b15c49
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SpannerPostgreSQLArrayTrimEmulation.java
@@ -0,0 +1,59 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.array;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.type.BasicPluralType;
+import org.hibernate.type.BasicType;
+
+/**
+ * Spanner PostgreSQL emulation for array_trim.
+ */
+public class SpannerPostgreSQLArrayTrimEmulation extends AbstractArrayTrimFunction {
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final SqlAstNode arrayExpression = sqlAstArguments.get( 0 );
+		final SqlAstNode elementCountExpression = sqlAstArguments.get( 1 );
+		sqlAppender.append( "coalesce((select array_agg(t.val order by t.idx) from unnest(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ") with ordinality t(val,idx) where t.idx<=coalesce(array_length(" );
+		arrayExpression.accept( walker );
+		sqlAppender.append( ", 1), 0)-" );
+		elementCountExpression.accept( walker );
+
+		String arrayTypeName = null;
+		if ( returnType instanceof BasicPluralType<?, ?> pluralType ) {
+			if ( needsArrayCasting( pluralType.getElementType() ) ) {
+				arrayTypeName = org.hibernate.dialect.function.array.DdlTypeHelper.getCastTypeName(
+						returnType,
+						walker.getSessionFactory().getTypeConfiguration()
+				);
+			}
+		}
+		if ( arrayTypeName != null ) {
+			sqlAppender.append( "),cast(array[] as " );
+			sqlAppender.appendSql( arrayTypeName );
+			sqlAppender.appendSql( "))" );
+		}
+		else {
+			sqlAppender.append( "),array[])" );
+		}
+	}
+
+	private static boolean needsArrayCasting(BasicType<?> elementType) {
+		// PostgreSQL doesn't do implicit conversion between text[] and varchar[], so we need casting
+		return elementType.getJdbcType().isString();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java
index 80db0e89ebf2..88fd509120e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java
@@ -23,7 +23,7 @@
 public class SybaseASEUnnestFunction extends UnnestFunction {
 
 	public SybaseASEUnnestFunction() {
-		super( "v", "i" );
+		super( "v", "i", false );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java
index 3c2eedb3e62d..6b9d2136d0eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java
@@ -29,17 +29,28 @@
  */
 public class UnnestFunction extends AbstractSqmSelfRenderingSetReturningFunctionDescriptor {
 
+	private final boolean needsFormatJson;
+
 	public UnnestFunction(@Nullable String defaultBasicArrayColumnName, String defaultIndexSelectionExpression) {
-		this( new UnnestSetReturningFunctionTypeResolver( defaultBasicArrayColumnName, defaultIndexSelectionExpression ) );
+		this( defaultBasicArrayColumnName, defaultIndexSelectionExpression, false );
+	}
+
+	public UnnestFunction(@Nullable String defaultBasicArrayColumnName, String defaultIndexSelectionExpression, boolean needsFormatJson) {
+		this( new UnnestSetReturningFunctionTypeResolver( defaultBasicArrayColumnName, defaultIndexSelectionExpression ), needsFormatJson );
 	}
 
 	protected UnnestFunction(SetReturningFunctionTypeResolver setReturningFunctionTypeResolver) {
+		this( setReturningFunctionTypeResolver, false );
+	}
+
+	protected UnnestFunction(SetReturningFunctionTypeResolver setReturningFunctionTypeResolver, boolean needsFormatJson) {
 		super(
 				"unnest",
 				ArrayArgumentValidator.DEFAULT_INSTANCE,
 				setReturningFunctionTypeResolver,
 				null
 		);
+		this.needsFormatJson = needsFormatJson;
 	}
 
 	@Override
@@ -108,6 +119,9 @@ protected void renderJsonTableColumns(SqlAppender sqlAppender, AnonymousTupleTab
 				}
 				else {
 					sqlAppender.append( getDdlType( selectableMapping, SqlTypes.JSON_ARRAY, walker ) );
+					if ( needsFormatJson && selectableMapping.getJdbcMapping().getJdbcType().isJson() ) {
+						sqlAppender.append( " format json" );
+					}
 					sqlAppender.appendSql( " path '$." );
 					sqlAppender.append( selectableMapping.getSelectableName() );
 					sqlAppender.appendSql( '\'' );
@@ -132,6 +146,9 @@ protected void renderJsonTableColumns(SqlAppender sqlAppender, AnonymousTupleTab
 				else {
 					sqlAppender.append( ' ' );
 					sqlAppender.append( getDdlType( selectableMapping, SqlTypes.JSON_ARRAY, walker ) );
+					if ( needsFormatJson && selectableMapping.getJdbcMapping().getJdbcType().isJson() ) {
+						sqlAppender.append( " format json" );
+					}
 					sqlAppender.appendSql( " path '$'" );
 					if ( errorOnError ) {
 						sqlAppender.appendSql( " error on error" );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java
index 3f4b68655851..1a7fb4426045 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java
@@ -726,7 +726,7 @@ protected void addSelectableMappings(List<SelectableMapping> selectableMappings,
 		}
 
 		private String castValueExpression(String baseReadExpression, CastTarget castTarget, @Nullable Literal defaultExpression, SqmToSqlAstConverter converter) {
-			final StringBuilder sb = new StringBuilder( baseReadExpression.length() + 200 );
+			final var sb = new StringBuilder( baseReadExpression.length() + 200 );
 			if ( defaultExpression != null ) {
 				sb.append( "coalesce(" );
 			}
@@ -773,7 +773,7 @@ protected void addSelectableMappings(List<SelectableMapping> selectableMappings,
 		}
 
 		private String castQueryExpression(String baseReadExpression, JsonQueryEmptyBehavior emptyBehavior, JsonQueryWrapMode wrapMode, SqmToSqlAstConverter converter) {
-			final StringBuilder sb = new StringBuilder( baseReadExpression.length() + 200 );
+			final var sb = new StringBuilder( baseReadExpression.length() + 200 );
 			if ( emptyBehavior == JsonQueryEmptyBehavior.EMPTY_ARRAY || emptyBehavior == JsonQueryEmptyBehavior.EMPTY_OBJECT ) {
 				sb.append( "coalesce(" );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonValueFunction.java
index d5926101f6cc..e28edb2a1f45 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonValueFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonValueFunction.java
@@ -161,7 +161,7 @@ static String applyJsonPath(String parentPath, boolean isColumn, boolean isJson,
 		if ( "$".equals( jsonPath ) ) {
 			return parentPath;
 		}
-		final StringBuilder sb = new StringBuilder( parentPath.length() + jsonPath.length() );
+		final var sb = new StringBuilder( parentPath.length() + jsonPath.length() );
 		final List<JsonPathHelper.JsonPathElement> jsonPathElements = JsonPathHelper.parseJsonPathElements( jsonPath );
 		final boolean needsWrapping = jsonPathElements.get( 0 ) instanceof JsonPathHelper.JsonAttribute
 				&& isColumn
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java
index b2f0b1c30a79..4141b0f4a592 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java
@@ -346,7 +346,7 @@ private void addIdColumns(EmbeddableValuedModelPart embeddableModelPart, List<Co
 			}
 
 			private void addIdColumns(PluralAttributeMapping pluralAttributeMapping, List<ColumnInfo> idColumns) {
-				final DdlTypeRegistry ddlTypeRegistry = pluralAttributeMapping.getCollectionDescriptor()
+				final var ddlTypeRegistry = pluralAttributeMapping.getCollectionDescriptor()
 						.getFactory()
 						.getTypeConfiguration()
 						.getDdlTypeRegistry();
@@ -354,7 +354,7 @@ private void addIdColumns(PluralAttributeMapping pluralAttributeMapping, List<Co
 			}
 
 			private void addIdColumns(EntityMappingType entityMappingType, List<ColumnInfo> idColumns) {
-				final DdlTypeRegistry ddlTypeRegistry = entityMappingType.getEntityPersister()
+				final var ddlTypeRegistry = entityMappingType.getEntityPersister()
 						.getFactory()
 						.getTypeConfiguration()
 						.getDdlTypeRegistry();
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java
index c1508963a2fb..46f3aa263810 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java
@@ -15,7 +15,7 @@
 import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import static org.hibernate.sql.ast.spi.AbstractSqlAstTranslator.getCastTypeName;
+import static org.hibernate.dialect.function.array.DdlTypeHelper.getCastTypeName;
 
 /**
  * HANA json_value function.
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonPathHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonPathHelper.java
index 60b44caad8f0..5b21c46fb708 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonPathHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonPathHelper.java
@@ -248,7 +248,7 @@ public static String toJsonPath(List<JsonPathElement> pathElements) {
 	}
 
 	public static String toJsonPath(List<JsonPathElement> pathElements, int start, int end) {
-		final StringBuilder jsonPath = new StringBuilder();
+		final var jsonPath = new StringBuilder();
 		jsonPath.append( "$" );
 		for ( int i = start; i < end; i++ ) {
 			final JsonPathElement jsonPathElement = pathElements.get( i );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java
index 6ab41692351a..38b9e6c6d6fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java
@@ -93,7 +93,7 @@ private static class OracleJsonTableSetReturningFunctionTypeResolver extends Jso
 		@Override
 		protected void addSelectableMappings(List<SelectableMapping> selectableMappings, JsonTableQueryColumnDefinition definition, SqmToSqlAstConverter converter) {
 			//
-			final TypeConfiguration typeConfiguration = converter.getCreationContext().getTypeConfiguration();
+			final var typeConfiguration = converter.getCreationContext().getTypeConfiguration();
 			final JdbcType jsonType = typeConfiguration.getJdbcTypeRegistry().getDescriptor( SqlTypes.JSON );
 			if ( jsonType.getDdlTypeCode() == SqlTypes.BLOB ) {
 				// Blob is not supported on all DB versions as return type for json_table(), so we have to use clob
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayFunction.java
index 8eaa5c72a273..a9695f7480e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayFunction.java
@@ -36,7 +36,7 @@ public void render(
 		}
 		else {
 			if ( sqlAstArguments.isEmpty() ) {
-				sqlAppender.appendSql( "'[]'" );
+				sqlAppender.appendSql( "N'[]'" );
 			}
 			else {
 				final SqlAstNode lastArgument = sqlAstArguments.get( sqlAstArguments.size() - 1 );
@@ -51,7 +51,7 @@ public void render(
 					argumentsCount = sqlAstArguments.size();
 				}
 				if ( nullBehavior == JsonNullBehavior.ABSENT ) {
-					sqlAppender.appendSql( "(select '['+string_agg(substring(t.d,2,len(t.d)-2),',')" );
+					sqlAppender.appendSql( "(select N'['+string_agg(substring(t.d,2,len(t.d)-2),',')" );
 					sqlAppender.appendSql( "within group (order by t.k)+']' from (values" );
 					char separator = ' ';
 					for ( int i = 0; i < argumentsCount; i++ ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerJsonQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerJsonQueryFunction.java
new file mode 100644
index 000000000000..60008de9e382
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerJsonQueryFunction.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.json;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.expression.JsonQueryWrapMode;
+import org.hibernate.type.spi.TypeConfiguration;
+
+public class SpannerJsonQueryFunction extends JsonQueryFunction {
+
+	public SpannerJsonQueryFunction(TypeConfiguration typeConfiguration) {
+		super( typeConfiguration, false, false );
+	}
+
+	@Override
+	protected void render(SqlAppender sqlAppender, JsonQueryArguments arguments, ReturnableType<?> returnType, SqlAstTranslator<?> walker) {
+		if ( arguments.wrapMode() == JsonQueryWrapMode.WITH_WRAPPER ) {
+			sqlAppender.appendSql( "parse_json(concat('[', to_json_string(" );
+			JsonQueryArguments noWrapArgs = new JsonQueryArguments(
+					arguments.jsonDocument(),
+					arguments.jsonPath(),
+					arguments.isJsonType(),
+					arguments.passingClause(),
+					null,
+					arguments.errorBehavior(),
+					arguments.emptyBehavior()
+			);
+			super.render( sqlAppender, noWrapArgs, returnType, walker );
+			sqlAppender.appendSql( "), ']'))" );
+		}
+		else {
+			super.render( sqlAppender, arguments, returnType, walker );
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerJsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerJsonValueFunction.java
new file mode 100644
index 000000000000..fc149d790045
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerJsonValueFunction.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.json;
+
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.expression.CastTarget;
+import org.hibernate.type.spi.TypeConfiguration;
+
+public class SpannerJsonValueFunction extends JsonValueFunction {
+
+	public SpannerJsonValueFunction(TypeConfiguration typeConfiguration) {
+		super( typeConfiguration, false, false );
+	}
+
+	@Override
+	protected void render(
+			SqlAppender sqlAppender,
+			JsonValueArguments arguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		final CastTarget returningType = arguments.returningType();
+		if ( returningType != null ) {
+			sqlAppender.appendSql( "cast(" );
+		}
+		sqlAppender.appendSql( "json_value(" );
+		arguments.jsonDocument().accept( walker );
+		sqlAppender.appendSql( ',' );
+		// Spanner requires literal JSONPath expressions; named parameters (e.g. $idx) are not parsed and must be manually inlined.
+		JsonPathHelper.appendInlinedJsonPathIncludingPassingClause(
+				sqlAppender,
+				"",
+				arguments.jsonPath(),
+				arguments.passingClause(),
+				walker
+		);
+		sqlAppender.appendSql( ')' );
+		if ( returningType != null ) {
+			sqlAppender.appendSql( " as " );
+			returningType.accept( walker );
+			sqlAppender.appendSql( ')' );
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerPostgreSQLJsonArrayFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerPostgreSQLJsonArrayFunction.java
new file mode 100644
index 000000000000..4fcd6d023b68
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerPostgreSQLJsonArrayFunction.java
@@ -0,0 +1,65 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.json;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.JsonNullBehavior;
+import org.hibernate.type.spi.TypeConfiguration;
+
+/**
+ * Spanner PostgreSQL json_array function.
+ */
+public class SpannerPostgreSQLJsonArrayFunction extends JsonArrayFunction {
+
+	public SpannerPostgreSQLJsonArrayFunction(TypeConfiguration typeConfiguration) {
+		super( typeConfiguration );
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		if ( sqlAstArguments.isEmpty() ) {
+			sqlAppender.appendSql( "jsonb_build_array()" );
+		}
+		else {
+			final SqlAstNode lastArgument = sqlAstArguments.get( sqlAstArguments.size() - 1 );
+			final JsonNullBehavior nullBehavior;
+			final int argumentsCount;
+			if ( lastArgument instanceof JsonNullBehavior jsonNullBehavior ) {
+				nullBehavior = jsonNullBehavior;
+				argumentsCount = sqlAstArguments.size() - 1;
+			}
+			else {
+				nullBehavior = null;
+				argumentsCount = sqlAstArguments.size();
+			}
+
+			if ( nullBehavior == JsonNullBehavior.ABSENT ) {
+				sqlAppender.appendSql( "(select cast('['||coalesce(string_agg(cast(e.v as varchar),','),'')||']' as jsonb) from jsonb_array_elements(jsonb_build_array" );
+			}
+			else {
+				sqlAppender.appendSql( "jsonb_build_array" );
+			}
+			char separator = '(';
+			for ( int i = 0; i < argumentsCount; i++ ) {
+				sqlAppender.appendSql( separator );
+				sqlAstArguments.get( i ).accept( walker );
+				separator = ',';
+			}
+			sqlAppender.appendSql( ')' );
+			if ( nullBehavior == JsonNullBehavior.ABSENT ) {
+				sqlAppender.appendSql( ") e(v) where jsonb_typeof(e.v) != 'null')" );
+			}
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerPostgreSQLJsonObjectFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerPostgreSQLJsonObjectFunction.java
new file mode 100644
index 000000000000..fe8d3d5552f5
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SpannerPostgreSQLJsonObjectFunction.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.function.json;
+
+import java.util.List;
+
+import org.hibernate.metamodel.model.domain.ReturnableType;
+import org.hibernate.sql.ast.SqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.JsonNullBehavior;
+import org.hibernate.type.spi.TypeConfiguration;
+
+/**
+ * Spanner PostgreSQL json_object function.
+ */
+public class SpannerPostgreSQLJsonObjectFunction extends JsonObjectFunction {
+
+	public SpannerPostgreSQLJsonObjectFunction(TypeConfiguration typeConfiguration) {
+		super( typeConfiguration, false );
+	}
+
+	@Override
+	public void render(
+			SqlAppender sqlAppender,
+			List<? extends SqlAstNode> sqlAstArguments,
+			ReturnableType<?> returnType,
+			SqlAstTranslator<?> walker) {
+		if ( sqlAstArguments.isEmpty() ) {
+			sqlAppender.appendSql( "jsonb_build_object()" );
+		}
+		else {
+			final SqlAstNode lastArgument = sqlAstArguments.get( sqlAstArguments.size() - 1 );
+			final JsonNullBehavior nullBehavior;
+			final int argumentsCount;
+			if ( lastArgument instanceof JsonNullBehavior jsonNullBehavior ) {
+				nullBehavior = jsonNullBehavior;
+				argumentsCount = sqlAstArguments.size() - 1;
+			}
+			else {
+				nullBehavior = JsonNullBehavior.NULL;
+				argumentsCount = sqlAstArguments.size();
+			}
+
+			if ( nullBehavior == JsonNullBehavior.ABSENT ) {
+				sqlAppender.appendSql( "jsonb_strip_nulls(jsonb_build_object" );
+			}
+			else {
+				sqlAppender.appendSql( "jsonb_build_object" );
+			}
+
+			char separator = '(';
+			for ( int i = 0; i < argumentsCount; i++ ) {
+				sqlAppender.appendSql( separator );
+				sqlAstArguments.get( i ).accept( walker );
+				separator = ',';
+			}
+			sqlAppender.appendSql( ')' );
+
+			if ( nullBehavior == JsonNullBehavior.ABSENT ) {
+				sqlAppender.appendSql( ')' );
+			}
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java
index dbcd1fb66619..74304e850291 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java
@@ -235,7 +235,7 @@ private void addIdColumns(EmbeddableValuedModelPart embeddableModelPart, List<Co
 			}
 
 			private void addIdColumns(PluralAttributeMapping pluralAttributeMapping, List<ColumnInfo> idColumns) {
-				final DdlTypeRegistry ddlTypeRegistry = pluralAttributeMapping.getCollectionDescriptor()
+				final var ddlTypeRegistry = pluralAttributeMapping.getCollectionDescriptor()
 						.getFactory()
 						.getTypeConfiguration()
 						.getDdlTypeRegistry();
@@ -243,7 +243,7 @@ private void addIdColumns(PluralAttributeMapping pluralAttributeMapping, List<Co
 			}
 
 			private void addIdColumns(EntityMappingType entityMappingType, List<ColumnInfo> idColumns) {
-				final DdlTypeRegistry ddlTypeRegistry = entityMappingType.getEntityPersister()
+				final var ddlTypeRegistry = entityMappingType.getEntityPersister()
 						.getFactory()
 						.getTypeConfiguration()
 						.getDdlTypeRegistry();
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/SpannerIdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/SpannerIdentityColumnSupport.java
new file mode 100644
index 000000000000..09387dbb7605
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/identity/SpannerIdentityColumnSupport.java
@@ -0,0 +1,32 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.identity;
+
+import org.hibernate.MappingException;
+
+/**
+ * Identity column support for Spanner.
+ */
+public class SpannerIdentityColumnSupport extends IdentityColumnSupportImpl {
+	public static final SpannerIdentityColumnSupport INSTANCE = new SpannerIdentityColumnSupport();
+
+	private SpannerIdentityColumnSupport() {}
+
+	@Override
+	public boolean supportsIdentityColumns() {
+		return true;
+	}
+
+	@Override
+	public String getIdentitySelectString(String table, String column, int type) throws MappingException {
+		throw new MappingException(
+				getClass().getName() + " does not support selecting the last generated identity value");
+	}
+
+	@Override
+	public String getIdentityColumnString(int type) {
+		return "not null generated by default as identity (bit_reversed_positive)";
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractPessimisticUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractPessimisticUpdateLockingStrategy.java
index de3ebdbda91e..af1b1c4709d8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractPessimisticUpdateLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractPessimisticUpdateLockingStrategy.java
@@ -10,12 +10,11 @@
 import org.hibernate.StaleObjectStateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.pretty.MessageHelper;
 import org.hibernate.sql.Update;
 
 import java.sql.SQLException;
 
-import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
+import static org.hibernate.pretty.MessageHelper.infoString;
 
 /**
  * Common implementation of {@link PessimisticReadUpdateLockingStrategy}
@@ -39,13 +38,15 @@ public abstract class AbstractPessimisticUpdateLockingStrategy implements Lockin
 	public AbstractPessimisticUpdateLockingStrategy(EntityPersister lockable, LockMode lockMode) {
 		this.lockable = lockable;
 		this.lockMode = lockMode;
-		if ( !lockable.isVersioned() ) {
-			CORE_LOGGER.writeLocksNotSupported( lockable.getEntityName() );
-			this.sql = null;
+		if ( lockMode.lessThan( LockMode.PESSIMISTIC_READ ) ) {
+			throw new HibernateException( "Lock mode " + lockMode
+						+ " not valid for locking via 'update' statement" );
 		}
-		else {
-			this.sql = generateLockString();
+		if ( !lockable.isVersioned() ) {
+			throw new HibernateException( "Entity '" + lockable.getEntityName()
+						+ "' has no version and may not be locked via 'update' statement" );
 		}
+		this.sql = generateLockString();
 	}
 
 	@Override
@@ -54,14 +55,11 @@ public void lock(Object id, Object version, Object object, int timeout, SharedSe
 			doLock( id, version, session );
 		}
 		catch (JDBCException e) {
-			throw new PessimisticEntityLockException( object, "could not obtain pessimistic lock", e );
+			throw new PessimisticEntityLockException( object, "Could not obtain pessimistic lock", e );
 		}
 	}
 
 	void doLock(Object id, Object version, SharedSessionContractImplementor session) {
-		if ( !lockable.isVersioned() ) {
-			throw new HibernateException( "write locks via update not supported for non-versioned entities [" + lockable.getEntityName() + "]" );
-		}
 		try {
 			final var factory = session.getFactory();
 			final var jdbcCoordinator = session.getJdbcCoordinator();
@@ -100,7 +98,7 @@ void doLock(Object id, Object version, SharedSessionContractImplementor session)
 		catch ( SQLException e ) {
 			throw session.getJdbcServices().getSqlExceptionHelper().convert(
 					e,
-					"could not lock: " + MessageHelper.infoString( lockable, id, session.getFactory() ),
+					"could not lock: " + infoString( lockable, id, session.getFactory() ),
 					sql
 			);
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java
index 5cf5ab687068..5276bd42a9d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java
@@ -34,15 +34,17 @@ public OptimisticForceIncrementLockingStrategy(EntityPersister lockable, LockMod
 		this.lockable = lockable;
 		this.lockMode = lockMode;
 		if ( lockMode.lessThan( LockMode.OPTIMISTIC_FORCE_INCREMENT ) ) {
-			throw new HibernateException( "[" + lockMode + "] not valid for [" + lockable.getEntityName() + "]" );
+			throw new HibernateException( "Entity '" + lockable.getEntityName()
+						+ "' may not be locked at level " + lockMode );
+		}
+		if ( !lockable.isVersioned() ) {
+			throw new HibernateException( "Entity '" + lockable.getEntityName()
+						+ "' has no version and may not be locked at level " + lockMode);
 		}
 	}
 
 	@Override
 	public void lock(Object id, Object version, Object object, int timeout, EventSource session) {
-		if ( !lockable.isVersioned() ) {
-			throw new HibernateException( "[" + lockMode + "] not supported for non-versioned entities [" + lockable.getEntityName() + "]" );
-		}
 //		final EntityEntry entry = session.getPersistenceContextInternal().getEntry( object );
 		// Register the EntityIncrementVersionProcess action to run just prior to transaction commit.
 		session.getActionQueue().registerCallback( new EntityIncrementVersionProcess( object ) );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java
index 79337885d354..8c8c28260760 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java
@@ -33,15 +33,17 @@ public OptimisticLockingStrategy(EntityPersister lockable, LockMode lockMode) {
 		this.lockable = lockable;
 		this.lockMode = lockMode;
 		if ( lockMode.lessThan( LockMode.OPTIMISTIC ) ) {
-			throw new HibernateException( "[" + lockMode + "] not valid for [" + lockable.getEntityName() + "]" );
+			throw new HibernateException( "Entity '" + lockable.getEntityName()
+						+ "' may not be locked at level " + lockMode );
+		}
+		if ( !lockable.isVersioned() ) {
+			throw new HibernateException( "Entity '" + lockable.getEntityName()
+						+ "' has no version and may not be locked at level " + lockMode);
 		}
 	}
 
 	@Override
 	public void lock(Object id, Object version, Object object, int timeout, EventSource session) {
-		if ( !lockable.isVersioned() ) {
-			throw new HibernateException( "[" + lockMode + "] not supported for non-versioned entities [" + lockable.getEntityName() + "]" );
-		}
 		// Register the EntityVerifyVersionProcess action to run just prior to transaction commit.
 		session.getActionQueue().registerCallback( new EntityVerifyVersionProcess( object ) );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticEntityLockException.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticEntityLockException.java
index b7469e0e7b5e..3a2e1e9e8fcb 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticEntityLockException.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticEntityLockException.java
@@ -24,4 +24,9 @@ public class PessimisticEntityLockException extends LockingStrategyException {
 	public PessimisticEntityLockException(Object entity, String message, JDBCException cause) {
 		super( entity, message, cause );
 	}
+
+	@Override
+	public JDBCException getCause() {
+		return (JDBCException) super.getCause();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java
index cc2df7827e9d..b5e1345455cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java
@@ -34,15 +34,17 @@ public PessimisticForceIncrementLockingStrategy(EntityPersister lockable, LockMo
 		this.lockMode = lockMode;
 		// ForceIncrement can be used for PESSIMISTIC_READ, PESSIMISTIC_WRITE or PESSIMISTIC_FORCE_INCREMENT
 		if ( lockMode.lessThan( LockMode.PESSIMISTIC_READ ) ) {
-			throw new HibernateException( "[" + lockMode + "] not valid for [" + lockable.getEntityName() + "]" );
+			throw new HibernateException( "Entity '" + lockable.getEntityName()
+						+ "' may not be locked at level " + lockMode );
+		}
+		if ( !lockable.isVersioned() ) {
+			throw new HibernateException( "Entity '" + lockable.getEntityName()
+						+ "' has no version and may not be locked at level " + lockMode);
 		}
 	}
 
 	@Override
 	public void lock(Object id, Object version, Object object, int timeout, SharedSessionContractImplementor session) {
-		if ( !lockable.isVersioned() ) {
-			throw new HibernateException( "[" + lockMode + "] not supported for non-versioned entities [" + lockable.getEntityName() + "]" );
-		}
 		final var entry = session.getPersistenceContextInternal().getEntry( object );
 		OptimisticLockHelper.forceVersionIncrement( object, entry, session );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java
index 717fe17b9b08..51d222654d43 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.dialect.lock;
 
-import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.persister.entity.EntityPersister;
 
@@ -30,8 +29,5 @@ public class PessimisticReadUpdateLockingStrategy extends AbstractPessimisticUpd
 	 */
 	public PessimisticReadUpdateLockingStrategy(EntityPersister lockable, LockMode lockMode) {
 		super( lockable, lockMode );
-		if ( lockMode.lessThan( LockMode.PESSIMISTIC_READ ) ) {
-			throw new HibernateException( "[" + lockMode + "] not valid for update statement" );
-		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java
index b809344f1d78..0bfab56ad135 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.dialect.lock;
 
-import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.persister.entity.EntityPersister;
 
@@ -29,8 +28,5 @@ public class PessimisticWriteUpdateLockingStrategy extends AbstractPessimisticUp
 	 */
 	public PessimisticWriteUpdateLockingStrategy(EntityPersister lockable, LockMode lockMode) {
 		super( lockable, lockMode );
-		if ( lockMode.lessThan( LockMode.PESSIMISTIC_READ ) ) {
-			throw new HibernateException( "[" + lockMode + "] not valid for update statement" );
-		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java
index cc0e93d1ba20..1e7235629d82 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java
@@ -35,7 +35,7 @@ public class UpdateLockingStrategy extends AbstractPessimisticUpdateLockingStrat
 	public UpdateLockingStrategy(EntityPersister lockable, LockMode lockMode) {
 		super( lockable, lockMode );
 		if ( lockMode.lessThan( LockMode.WRITE ) ) {
-			throw new HibernateException( "[" + lockMode + "] not valid for update statement" );
+			throw new HibernateException( "Lock mode " + lockMode + " not valid for locking via 'update' statement" );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/Helper.java
index 2f8924011b27..28bd8283d291 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/Helper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/Helper.java
@@ -6,7 +6,6 @@
 
 import jakarta.persistence.Timeout;
 import org.hibernate.HibernateException;
-import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 
 import java.sql.Connection;
@@ -29,17 +28,17 @@ public static Timeout getLockTimeout(
 			TimeoutExtractor extractor,
 			Connection connection,
 			SessionFactoryImplementor factory) {
-		try (final java.sql.Statement statement = connection.createStatement()) {
+		try ( final var statement = connection.createStatement() ) {
 			factory.getJdbcServices().getSqlStatementLogger().logStatement( sql );
-			final ResultSet results = statement.executeQuery( sql );
+			final var results = statement.executeQuery( sql );
 			if ( !results.next() ) {
 				throw new HibernateException( "Unable to query JDBC Connection for current lock-timeout setting (no result)" );
 			}
 			return extractor.extractFrom( results );
 		}
 		catch (SQLException sqle) {
-			final SqlExceptionHelper sqlExceptionHelper = factory.getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper();
-			throw sqlExceptionHelper.convert( sqle, "Unable to query JDBC Connection for current lock-timeout setting" );
+			throw factory.getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()
+					.convert( sqle, "Unable to query JDBC Connection for current lock-timeout setting" );
 		}
 	}
 
@@ -50,13 +49,13 @@ public static void setLockTimeout(
 			String sql,
 			Connection connection,
 			SessionFactoryImplementor factory) {
-		try (final java.sql.Statement statement = connection.createStatement()) {
+		try ( final var statement = connection.createStatement() ) {
 			factory.getJdbcServices().getSqlStatementLogger().logStatement( sql );
 			statement.execute( sql );
 		}
 		catch (SQLException sqle) {
-			final SqlExceptionHelper sqlExceptionHelper = factory.getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper();
-			throw sqlExceptionHelper.convert( sqle, "Unable to set lock-timeout setting on JDBC connection" );
+			throw factory.getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()
+					.convert( sqle, "Unable to set lock-timeout setting on JDBC connection" );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/MySQLLockingSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/MySQLLockingSupport.java
index 739007513db2..3ceb9658490d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/MySQLLockingSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/MySQLLockingSupport.java
@@ -90,9 +90,23 @@ public ConnectionLockTimeoutStrategy getConnectionLockTimeoutStrategy() {
 	}
 
 	public static class ConnectionLockTimeoutStrategyImpl implements ConnectionLockTimeoutStrategy {
+		// Making this configurable so TiDBDialect can re-use this, but with a lower value
+		// TiDB v8.5.5 limits innodb_lock_wait_timeout to 3600s
+		private final int foreverValue;
+
+		public ConnectionLockTimeoutStrategyImpl() {
+			// see https://dev.mysql.com/doc/refman/8.4/en/innodb-parameters.html#sysvar_innodb_lock_wait_timeout
+			// unit: seconds, allowed values: [1, 1073741824]
+			this( 100_000 );
+		}
+
+		public ConnectionLockTimeoutStrategyImpl(int foreverValue) {
+			this.foreverValue = foreverValue;
+		}
+
 		@Override
 		public Level getSupportedLevel() {
-			return ConnectionLockTimeoutStrategy.Level.EXTENDED;
+			return Level.SUPPORTED;
 		}
 
 		@Override
@@ -101,12 +115,9 @@ public Timeout getLockTimeout(Connection connection, SessionFactoryImplementor f
 					"SELECT @@SESSION.innodb_lock_wait_timeout",
 					(resultSet) -> {
 						// see https://dev.mysql.com/doc/refman/8.4/en/innodb-parameters.html#sysvar_innodb_lock_wait_timeout
-						final int millis = resultSet.getInt( 1 );
-						return switch ( millis ) {
-							case 0 -> Timeouts.NO_WAIT;
-							case 100000000 -> Timeouts.WAIT_FOREVER;
-							default -> Timeout.milliseconds( millis );
-						};
+						// unit: seconds, allowed values: [1, 1073741824]
+						final int seconds = resultSet.getInt( 1 );
+						return seconds == foreverValue ? Timeouts.WAIT_FOREVER : Timeout.seconds( seconds );
 					},
 					connection,
 					factory
@@ -119,14 +130,18 @@ public void setLockTimeout(Timeout timeout, Connection connection, SessionFactor
 					timeout,
 					(t) -> {
 						// see https://dev.mysql.com/doc/refman/8.4/en/innodb-parameters.html#sysvar_innodb_lock_wait_timeout
+						// unit: seconds, allowed values: [1, 1073741824]
 						final int milliseconds = timeout.milliseconds();
 						if ( milliseconds == SKIP_LOCKED_MILLI ) {
 							throw new HibernateException( "Connection lock-timeout does not accept skip-locked" );
 						}
+						if ( milliseconds == NO_WAIT_MILLI ) {
+							throw new HibernateException( "Connection lock-timeout does not accept no-wait" );
+						}
 						if ( milliseconds == WAIT_FOREVER_MILLI ) {
-							return 100000000;
+							return foreverValue;
 						}
-						return milliseconds;
+						return (int) Math.ceil( (double) milliseconds / 1000);
 					},
 					"SET @@SESSION.innodb_lock_wait_timeout = %s",
 					connection,
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/PostgreSQLLockingSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/PostgreSQLLockingSupport.java
index 89dc933e087e..23f2ef4b5d9d 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/PostgreSQLLockingSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/PostgreSQLLockingSupport.java
@@ -79,19 +79,31 @@ public Timeout getLockTimeout(Connection connection, SessionFactoryImplementor f
 		return Helper.getLockTimeout(
 				"select current_setting('lock_timeout', true)",
 				(resultSet) -> {
-					// even though lock_timeout is "in milliseconds", `current_setting`
-					// returns a String form which unfortunately varies depending on
-					// the actual value:
-					//		* for zero (no timeout), "0" is returned
-					//		* for non-zero, `{timeout-in-seconds}s` is returned (e.g. "4s")
-					// so we need to "parse" that form here
-					final String value = resultSet.getString( 1 );
+					// Although lock_timeout is stored internally in milliseconds,
+					// `current_setting` returns a String in a canonical, human-readable form
+					// that varies depending on the value:
+					//   * "0" is returned for no timeout (WAIT_FOREVER)
+					//   * Non-zero values may be returned with units such as:
+					//       - milliseconds: "500ms"
+					//       - seconds:      "3s"
+					//       - minutes:      "1min"
+					//       - hours:        "1h"
+					// Therefore, we need to parse this String carefully to reconstruct the correct Timeout.
+					String value = resultSet.getString( 1 );
 					if ( "0".equals( value ) ) {
 						return Timeouts.WAIT_FOREVER;
 					}
-					assert value.endsWith( "s" );
-					final int secondsValue = Integer.parseInt( value.substring( 0, value.length() - 1 ) );
-					return Timeout.seconds( secondsValue );
+					final var unitStartIndex = findUnitStartIndex( value );
+					final var amount = Integer.parseInt( value, 0, unitStartIndex, 10 );
+					return switch ( unitStartIndex == -1 ? "ms" : value.substring( unitStartIndex ) ) {
+						case "ms" -> Timeout.milliseconds( amount );
+						case "s" -> Timeout.seconds( amount );
+						case "min" -> Timeout.seconds( amount * 60 );
+						case "h" -> Timeout.seconds( amount * 3600 );
+						case "d" -> Timeout.seconds( amount * 3600 * 24 );
+						default -> throw new IllegalArgumentException(
+							"Unexpected PostgreSQL lock_timeout format: " + value );
+					};
 				},
 				connection,
 				factory
@@ -120,4 +132,13 @@ public void setLockTimeout(Timeout timeout, Connection connection, SessionFactor
 				factory
 		);
 	}
+
+	private static int findUnitStartIndex(String value) {
+		for ( int i = value.length() - 1; i >= 0; i-- ) {
+			if ( Character.isDigit( value.charAt( i ) ) ) {
+				return i + 1;
+			}
+		}
+		return -1;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/TransactSQLLockingSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/TransactSQLLockingSupport.java
index 95714c02456d..a2636d1a6420 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/TransactSQLLockingSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/TransactSQLLockingSupport.java
@@ -47,8 +47,8 @@ public class TransactSQLLockingSupport extends LockingSupportParameterized {
 	public static final LockingSupport SYBASE_ASE = new TransactSQLLockingSupport(
 			PessimisticLockStyle.TABLE_HINT,
 			LockTimeoutType.CONNECTION,
-			LockTimeoutType.NONE,
-			LockTimeoutType.NONE,
+			LockTimeoutType.CONNECTION,
+			LockTimeoutType.QUERY,
 			RowLockStrategy.TABLE,
 			OuterJoinLockingType.IDENTIFIED,
 			SybaseImpl.IMPL
@@ -154,7 +154,7 @@ public static class SybaseImpl implements ConnectionLockTimeoutStrategy {
 
 		@Override
 		public Level getSupportedLevel() {
-			return Level.SUPPORTED;
+			return Level.EXTENDED;
 		}
 
 		@Override
@@ -162,11 +162,11 @@ public Timeout getLockTimeout(Connection connection, SessionFactoryImplementor f
 			return Helper.getLockTimeout(
 					"select @@lock_timeout",
 					(resultSet) -> {
-						final int timeoutInMilliseconds = resultSet.getInt( 1 );
-						return switch ( timeoutInMilliseconds ) {
+						final int timeoutInSeconds = resultSet.getInt( 1 );
+						return switch ( timeoutInSeconds ) {
 							case -1 -> Timeouts.WAIT_FOREVER;
 							case 0 -> Timeouts.NO_WAIT;
-							default -> Timeout.milliseconds( timeoutInMilliseconds );
+							default -> Timeout.seconds( timeoutInSeconds );
 						};
 					},
 					connection,
@@ -176,27 +176,30 @@ public Timeout getLockTimeout(Connection connection, SessionFactoryImplementor f
 
 		@Override
 		public void setLockTimeout(Timeout timeout, Connection connection, SessionFactoryImplementor factory) {
+			// see https://infocenter.sybase.com/help/index.jsp?topic=/com.sybase.infocenter.dc31654.1600/doc/html/san1360629104549.html
+			// SAP Adaptive Server Enterprise 16.0
+			// > System Administration Guide 16.0: Volume 1
+			//   > Setting Configuration Parameters
+			//     > Configuration Parameters
+			//       > Alphabetical Listing of Configuration Parameters
+			//         > lock wait period
+			//
+			// range:   0 – 2147483647
+			// default: 2147483647
+			// unit:    seconds
 			final int milliseconds = timeout.milliseconds();
 
 			if ( milliseconds == Timeouts.SKIP_LOCKED_MILLI ) {
 				throw new HibernateException( "Sybase does not accept skip-locked for lock-timeout" );
 			}
 
-			// Sybase needs a special syntax for NO_WAIT rather than a number
-			if ( milliseconds == Timeouts.NO_WAIT_MILLI ) {
-				// NOTE: The docs say this is supported, and it does not fail when used,
-				// but immediately after the setting value is still -1.  So it seems to
-				// allow the call but ignore it.  Might just be jTDS.
-				Helper.setLockTimeout( "set lock nowait", connection, factory );
-			}
-			else if ( milliseconds == Timeouts.WAIT_FOREVER_MILLI ) {
+			if ( milliseconds == Timeouts.WAIT_FOREVER_MILLI ) {
 				// Even though Sybase's wait-forever (and default) value is -1, it won't accept
-				// -1 as a value because, well, of course it won't.  Need to set max value instead
-				// because, well, of course you do.
-				Helper.setLockTimeout( 2147483647, "set lock wait %s", connection, factory );
+				// -1 as a value because, well, of course it won't.  Need to omit the argument to reset it
+				Helper.setLockTimeout( "set lock wait", connection, factory );
 			}
 			else {
-				Helper.setLockTimeout( milliseconds, "set lock wait %s", connection, factory );
+				Helper.setLockTimeout( (int) Math.ceil( (double) milliseconds / 1000), "set lock wait %s", connection, factory );
 			}
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/spi/LockingSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/spi/LockingSupport.java
index 71434d4ab2ba..49f061e410b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/spi/LockingSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/spi/LockingSupport.java
@@ -63,7 +63,7 @@ default LockTimeoutType getLockTimeoutType(Timeout timeout) {
 		/**
 		 * The {@linkplain RowLockStrategy strategy} for indicating which rows
 		 * to lock as part of a {@code for share of} style clause.
-		 * <p/>
+		 * <p>
 		 * By default, simply uses {@linkplain #getWriteRowLockStrategy()}.
 		 */
 		default RowLockStrategy getReadRowLockStrategy() {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java
index e0562ab87015..580fb8e638f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java
@@ -248,8 +248,7 @@ public static boolean hasMaxRows(Limit limit) {
 	 */
 	public static boolean hasFirstRow(Limit limit) {
 		return limit != null
-			&& limit.getFirstRow() != null
-			&& limit.getFirstRow() > 0;
+			&& limit.getFirstRow() != null;
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SpannerSequenceSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SpannerSequenceSupport.java
new file mode 100644
index 000000000000..b8d188d9894d
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sequence/SpannerSequenceSupport.java
@@ -0,0 +1,89 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.sequence;
+
+
+import org.hibernate.MappingException;
+
+import static org.hibernate.internal.util.StringHelper.isNotEmpty;
+
+import org.hibernate.dialect.SpannerDialect;
+
+/**
+ * Sequence support for Spanner.
+ */
+public class SpannerSequenceSupport implements SequenceSupport {
+
+	private final SpannerDialect dialect;
+
+	public SpannerSequenceSupport(SpannerDialect dialect) {
+		this.dialect = dialect;
+	}
+
+	@Override
+	public String getCreateSequenceString(String sequenceName) throws MappingException {
+		return getCreateSequenceString(sequenceName, 1, 1);
+	}
+
+	@Override
+	public String getCreateSequenceString(String sequenceName, int initialValue, int incrementSize)
+			throws MappingException {
+		if (incrementSize == 1) {
+			return getCreateSequenceString(sequenceName, initialValue, "");
+		}
+		throw new MappingException("Cloud Spanner does not support sequences with an increment size != 1");
+	}
+
+	@Override
+	public String[] getCreateSequenceStrings(String sequenceName, int initialValue, int incrementSize, String options)
+			throws MappingException {
+		if (incrementSize == 1) {
+			return new String[] { getCreateSequenceString(sequenceName, initialValue, options) };
+		}
+		throw new MappingException("Cloud Spanner does not support sequences with an increment size != 1");
+	}
+
+	protected String getCreateSequenceString(String sequenceName, int initialValue, String additionalOptions) {
+		final var builder = new StringBuilder("create sequence if not exists ");
+		builder.append(sequenceName).append(" options(sequence_kind=\"bit_reversed_positive\"");
+		if (initialValue != 1) {
+			builder.append(", start_with_counter=").append(initialValue);
+		}
+		if (isNotEmpty(additionalOptions)) {
+			builder.append(", ").append(additionalOptions);
+		}
+		builder.append(")");
+		return builder.toString();
+	}
+
+	@Override
+	public String getDropSequenceString(String sequenceName) {
+		return "drop sequence if exists " + sequenceName;
+	}
+
+	@Override
+	public String getRestartSequenceString(String sequenceName, long startWith) {
+		return "alter sequence " + sequenceName + " set options (start_with_counter = " + startWith + ")";
+	}
+
+	@Override
+	public String getSequenceNextValString(String sequenceName) {
+		return "select " + getSelectSequenceNextValString(sequenceName);
+	}
+
+	@Override
+	public String getSelectSequenceNextValString(String sequenceName) {
+		var nextValString = "get_next_sequence_value(sequence " + sequenceName + ")";
+		if ( dialect != null && dialect.useIntegerForPrimaryKey() ) {
+			return "bit_reverse(" + nextValString + ", true)";
+		}
+		return nextValString;
+	}
+
+	@Override
+	public boolean supportsPooledSequences() {
+		return false;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/CockroachSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/CockroachSqlAstTranslator.java
index 85bdacbc40ab..43bb87f4e509 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/CockroachSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/CockroachSqlAstTranslator.java
@@ -27,6 +27,8 @@
 import org.hibernate.sql.exec.internal.JdbcOperationQueryInsertImpl;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert;
+import org.hibernate.sql.model.internal.OptionalTableInsert;
+import org.hibernate.sql.model.internal.TableInsertStandard;
 
 /**
  * A SQL AST translator for Cockroach.
@@ -47,6 +49,39 @@ public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeti
 		super.visitBinaryArithmeticExpression(arithmeticExpression);
 	}
 
+	@Override
+	public void visitStandardTableInsert(TableInsertStandard tableInsert) {
+		getCurrentClauseStack().push( Clause.INSERT );
+		try {
+			renderInsertInto( tableInsert );
+			if ( tableInsert instanceof OptionalTableInsert optionalTableInsert ) {
+				appendSql( " on conflict " );
+				final String constraintName = optionalTableInsert.getConstraintName();
+				if ( constraintName != null ) {
+					appendSql( " on constraint " );
+					appendSql( constraintName );
+				}
+				else {
+					char separator = '(';
+					for ( String constraintColumnName : optionalTableInsert.getConstraintColumnNames() ) {
+						appendSql( separator );
+						appendSql( constraintColumnName );
+						separator = ',';
+					}
+					appendSql( ')' );
+				}
+				appendSql( " do nothing" );
+			}
+
+			if ( tableInsert.getNumberOfReturningColumns() > 0 ) {
+				visitReturningColumns( tableInsert::getReturningColumns );
+			}
+		}
+		finally {
+			getCurrentClauseStack().pop();
+		}
+	}
+
 	@Override
 	protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {
 		visitInsertStatement( sqlAst );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/DB2iSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/DB2iSqlAstTranslator.java
index 1c23fd495dc6..38826e01eccf 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/DB2iSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/DB2iSqlAstTranslator.java
@@ -9,8 +9,11 @@
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.sql.ast.tree.expression.SqlTupleContainer;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 
+import java.util.List;
+
 import static org.hibernate.dialect.DB2iDialect.DB2_LUW_VERSION;
 
 /**
@@ -32,6 +35,20 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 		renderComparisonStandard( lhs, operator, rhs );
 	}
 
+	@Override
+	protected void renderExpressionsAsValuesSubquery(int tupleSize, List<Expression> listExpressions) {
+		// DB2 for i supports type-inference in this special VALUES expression, but not if it's wrapped as SELECT
+		appendSql( "values" );
+		char separator = ' ';
+		for ( Expression expression : listExpressions ) {
+			appendSql( separator );
+			appendSql( OPEN_PARENTHESIS );
+			renderCommaSeparated( SqlTupleContainer.getSqlTuple( expression ).getExpressions() );
+			appendSql( CLOSE_PARENTHESIS );
+			separator = ',';
+		}
+	}
+
 	@Override
 	public DatabaseVersion getDB2Version() {
 		return DB2_LUW_VERSION;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/DB2zSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/DB2zSqlAstTranslator.java
index aafa7174ebf4..7c4eaf5e42db 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/DB2zSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/DB2zSqlAstTranslator.java
@@ -55,6 +55,12 @@ protected String getNewTableChangeModifier() {
 		return "final";
 	}
 
+	@Override
+	protected boolean preferUnionQueryForTupleInListPredicate() {
+		// DB2 z/OS can't use an index when rendering a union query
+		return false;
+	}
+
 	@Override
 	public DatabaseVersion getDB2Version() {
 		return DB2_LUW_VERSION;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/H2SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/H2SqlAstTranslator.java
index 2b4c24a35156..b10e3189a5a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/H2SqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/H2SqlAstTranslator.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.dialect.sql.ast;
 
+import java.util.ArrayDeque;
 import java.util.List;
 
 import org.hibernate.LockMode;
@@ -14,6 +15,7 @@
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
+import org.hibernate.sql.ast.spi.FullJoinEmulation;
 import org.hibernate.sql.ast.spi.SqlAstTranslatorWithMerge;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.Statement;
@@ -27,8 +29,8 @@
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
 import org.hibernate.sql.ast.tree.expression.Summarization;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
-import org.hibernate.sql.ast.tree.from.QueryPartTableReference;
 import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.ast.tree.from.QueryPartTableReference;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.insert.ConflictClause;
 import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
@@ -36,6 +38,8 @@
 import org.hibernate.sql.ast.tree.predicate.LikePredicate;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.SelectClause;
+import org.hibernate.sql.ast.tree.select.SortSpecification;
+import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.model.internal.TableInsertStandard;
@@ -51,9 +55,45 @@
 public class H2SqlAstTranslator<T extends JdbcOperation> extends SqlAstTranslatorWithMerge<T> {
 
 	private boolean renderAsArray;
+	private final ArrayDeque<FullJoinEmulation> fullJoinEmulations = new ArrayDeque<>();
 
 	public H2SqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
 		super( sessionFactory, statement );
+		this.fullJoinEmulations.push( new FullJoinEmulation( this ) );
+	}
+
+	private FullJoinEmulation currentFullJoinEmulationHelper() {
+		return fullJoinEmulations.getFirst();
+	}
+
+	@Override
+	public void visitQuerySpec(QuerySpec querySpec) {
+		final var helper = currentFullJoinEmulationHelper();
+		final boolean needsNestedHelper =
+				helper.hasActiveFullJoinEmulation()
+						&& !helper.isFullJoinEmulationQueryPart( querySpec );
+		if ( needsNestedHelper ) {
+			fullJoinEmulations.push( new FullJoinEmulation( this ) );
+		}
+		try {
+			final var currentHelper = currentFullJoinEmulationHelper();
+			if ( !currentHelper.renderFullJoinEmulationBranchIfNeeded( querySpec, super::visitQuerySpec )
+					&& !currentHelper.emulateFullJoinWithUnionIfNeeded( querySpec ) ) {
+				super.visitQuerySpec( querySpec );
+			}
+		}
+		finally {
+			if ( needsNestedHelper ) {
+				fullJoinEmulations.pop();
+			}
+		}
+	}
+
+	@Override
+	public void visitSelectClause(SelectClause selectClause) {
+		if ( !currentFullJoinEmulationHelper().renderSelectClauseIfNeeded( selectClause ) ) {
+			super.visitSelectClause( selectClause );
+		}
 	}
 
 	@Override
@@ -170,10 +210,11 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
 
 	@Override
 	protected void visitConflictClause(ConflictClause conflictClause) {
-		if ( conflictClause != null ) {
-			if ( conflictClause.isDoUpdate() && conflictClause.getConstraintName() != null ) {
-				throw new IllegalQueryOperationException( "Insert conflict 'do update' clause with constraint name is not supported" );
-			}
+		if ( conflictClause != null
+				&& conflictClause.isDoUpdate()
+				&& conflictClause.getConstraintName() != null ) {
+			throw new IllegalQueryOperationException(
+					"Insert conflict 'do update' clause with constraint name is not supported" );
 		}
 	}
 
@@ -220,23 +261,31 @@ public void visitBooleanExpressionPredicate(BooleanExpressionPredicate booleanEx
 		}
 	}
 
+	@Override
+	protected void visitOrderBy(List<SortSpecification> sortSpecifications) {
+		currentFullJoinEmulationHelper().renderOrderByIfNeeded( getCurrentQueryPart(), sortSpecifications, super::visitOrderBy );
+	}
+
 	@Override
 	public void visitOffsetFetchClause(QueryPart queryPart) {
-		if ( isRowsOnlyFetchClauseType( queryPart ) ) {
-			if ( supportsOffsetFetchClause() ) {
-				renderOffsetFetchClause( queryPart, true );
-			}
-			else {
-				renderLimitOffsetClause( queryPart );
-			}
-		}
-		else {
-			if ( supportsOffsetFetchClausePercentWithTies() ) {
-				renderOffsetFetchClause( queryPart, true );
+		if ( !currentFullJoinEmulationHelper().isFullJoinEmulationQueryPart( queryPart ) ) {
+			if ( isRowsOnlyFetchClauseType( queryPart ) ) {
+				if ( supportsOffsetFetchClause() ) {
+					renderOffsetFetchClause( queryPart, true );
+				}
+				else {
+					renderLimitOffsetClause( queryPart );
+				}
 			}
 			else {
-				// FETCH PERCENT and WITH TIES were introduced along with window functions
-				throw new IllegalArgumentException( "Can't emulate fetch clause type: " + queryPart.getFetchClauseType() );
+				if ( supportsOffsetFetchClausePercentWithTies() ) {
+					renderOffsetFetchClause( queryPart, true );
+				}
+				else {
+					// FETCH PERCENT and WITH TIES were introduced along with window functions
+					throw new IllegalArgumentException(
+							"Can't emulate fetch clause type: " + queryPart.getFetchClauseType() );
+				}
 			}
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MariaDBSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MariaDBSqlAstTranslator.java
index 30958f0fe4eb..5b5e270510fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MariaDBSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MariaDBSqlAstTranslator.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.dialect.sql.ast;
 
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -14,10 +15,12 @@
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.sql.ast.Clause;
+import org.hibernate.sql.ast.spi.NestedOrTargetTableCorrelationVisitor;
+import org.hibernate.sql.ast.tree.AbstractUpdateOrDeleteStatement;
+import org.hibernate.sql.ast.tree.MutationStatement;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
 import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression;
-import org.hibernate.sql.ast.tree.expression.CastTarget;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
@@ -32,25 +35,35 @@
 import org.hibernate.sql.ast.tree.select.QueryGroup;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.sql.ast.tree.select.SelectClause;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
+import org.hibernate.sql.ast.tree.select.SortSpecification;
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.internal.JdbcOperationQueryInsertImpl;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert;
 import org.hibernate.sql.model.ast.ColumnValueBinding;
+import org.hibernate.sql.ast.spi.FullJoinEmulation;
 
 /**
  * A SQL AST translator for MariaDB.
  *
  * @author Christian Beikov
+ * @author Yoobin Yoon
  */
 public class MariaDBSqlAstTranslator<T extends JdbcOperation> extends SqlAstTranslatorWithOnDuplicateKeyUpdate<T> {
 
 	private final MariaDBDialect dialect;
+	private final ArrayDeque<FullJoinEmulation> fullJoinEmulations = new ArrayDeque<>();
 
 	public MariaDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, MariaDBDialect dialect) {
 		super( sessionFactory, statement );
 		this.dialect = dialect;
+		this.fullJoinEmulations.push( new FullJoinEmulation( this ) );
+	}
+
+	private FullJoinEmulation currentFullJoinEmulationHelper() {
+		return fullJoinEmulations.getFirst();
 	}
 
 	@Override
@@ -113,17 +126,24 @@ && getStatementStack().getCurrent() instanceof InsertSelectStatement insertSelec
 
 	@Override
 	protected void renderDeleteClause(DeleteStatement statement) {
-		appendSql( "delete" );
 		final Stack<Clause> clauseStack = getClauseStack();
 		try {
 			clauseStack.push( Clause.DELETE );
-			renderTableReferenceIdentificationVariable( statement.getTargetTable() );
-			if ( statement.getFromClause().getRoots().isEmpty() ) {
-				appendSql( " from " );
-				renderDmlTargetTableExpression( statement.getTargetTable() );
+			if ( usesSingleTableDml( statement ) ) {
+				appendSql( "delete from " );
+				appendSql( statement.getTargetTable().getTableExpression() );
+				registerAffectedTable( statement.getTargetTable() );
 			}
 			else {
-				visitFromClause( statement.getFromClause() );
+				appendSql( "delete" );
+				renderTableReferenceIdentificationVariable( statement.getTargetTable() );
+				if ( statement.getFromClause().getRoots().isEmpty() ) {
+					appendSql( " from " );
+					renderDmlTargetTableExpression( statement.getTargetTable() );
+				}
+				else {
+					visitFromClause( statement.getFromClause() );
+				}
 			}
 		}
 		finally {
@@ -133,7 +153,12 @@ protected void renderDeleteClause(DeleteStatement statement) {
 
 	@Override
 	protected void renderUpdateClause(UpdateStatement updateStatement) {
-		if ( updateStatement.getFromClause().getRoots().isEmpty() ) {
+		if ( usesSingleTableDml( updateStatement ) ) {
+			appendSql( "update " );
+			appendSql( updateStatement.getTargetTable().getTableExpression() );
+			registerAffectedTable( updateStatement.getTargetTable() );
+		}
+		else if ( updateStatement.getFromClause().getRoots().isEmpty() ) {
 			super.renderUpdateClause( updateStatement );
 		}
 		else {
@@ -145,7 +170,7 @@ protected void renderUpdateClause(UpdateStatement updateStatement) {
 	@Override
 	protected void renderDmlTargetTableExpression(NamedTableReference tableReference) {
 		super.renderDmlTargetTableExpression( tableReference );
-		if ( getClauseStack().getCurrent() != Clause.INSERT ) {
+		if ( getClauseStack().getCurrent() != Clause.INSERT && !usesSingleTableDml( getCurrentDmlStatement() ) ) {
 			renderTableReferenceIdentificationVariable( tableReference );
 		}
 	}
@@ -178,6 +203,16 @@ protected String determineColumnReferenceQualifier(ColumnReference columnReferen
 				|| !( getCurrentDmlStatement() instanceof InsertSelectStatement insertSelectStatement )
 				|| ( dmlAlias = insertSelectStatement.getTargetTable().getIdentificationVariable() ) == null
 				|| !dmlAlias.equals( columnReference.getQualifier() ) ) {
+			final MutationStatement currentStatement = getCurrentDmlStatement();
+			if ( currentStatement != null && usesSingleTableDml( currentStatement ) && columnReference.getQualifier() != null ) {
+				final NamedTableReference targetTable = currentStatement.getTargetTable();
+				final String targetTableName = targetTable.getTableExpression();
+				final String qualifier = columnReference.getQualifier();
+				final String targetAlias = targetTable.getIdentificationVariable();
+				if ( ( targetAlias != null && qualifier.equals( targetAlias ) ) || qualifier.equals( targetTableName ) ) {
+					return !getQueryPartStack().isEmpty() ? targetTableName : null;
+				}
+			}
 			return columnReference.getQualifier();
 		}
 		// Qualify the column reference with the table expression also when in subqueries
@@ -247,11 +282,37 @@ public void visitQueryGroup(QueryGroup queryGroup) {
 
 	@Override
 	public void visitQuerySpec(QuerySpec querySpec) {
-		if ( shouldEmulateFetchClause( querySpec ) ) {
-			emulateFetchOffsetWithWindowFunctions( querySpec, true );
+		final var helper = currentFullJoinEmulationHelper();
+		final boolean needsNestedHelper =
+				helper.hasActiveFullJoinEmulation()
+						&& !helper.isFullJoinEmulationQueryPart( querySpec );
+		if ( needsNestedHelper ) {
+			fullJoinEmulations.push( new FullJoinEmulation( this ) );
 		}
-		else {
-			super.visitQuerySpec( querySpec );
+		try {
+			final var currentHelper = currentFullJoinEmulationHelper();
+			if ( !currentHelper.renderFullJoinEmulationBranchIfNeeded( querySpec, super::visitQuerySpec ) ) {
+				if ( !currentHelper.emulateFullJoinWithUnionIfNeeded( querySpec ) ) {
+					if ( shouldEmulateFetchClause( querySpec ) ) {
+						emulateFetchOffsetWithWindowFunctions( querySpec, true );
+					}
+					else {
+						super.visitQuerySpec( querySpec );
+					}
+				}
+			}
+		}
+		finally {
+			if ( needsNestedHelper ) {
+				fullJoinEmulations.pop();
+			}
+		}
+	}
+
+	@Override
+	public void visitSelectClause(SelectClause selectClause) {
+		if ( !currentFullJoinEmulationHelper().renderSelectClauseIfNeeded( selectClause ) ) {
+			super.visitSelectClause( selectClause );
 		}
 	}
 
@@ -267,11 +328,17 @@ protected void renderDerivedTableReferenceIdentificationVariable(DerivedTableRef
 
 	@Override
 	public void visitOffsetFetchClause(QueryPart queryPart) {
-		if ( !isRowNumberingCurrentQueryPart() ) {
+		if ( !currentFullJoinEmulationHelper().isFullJoinEmulationQueryPart( queryPart )
+				&& !isRowNumberingCurrentQueryPart() ) {
 			renderCombinedLimitClause( queryPart );
 		}
 	}
 
+	@Override
+	protected void visitOrderBy(List<SortSpecification> sortSpecifications) {
+		currentFullJoinEmulationHelper().renderOrderByIfNeeded( getCurrentQueryPart(), sortSpecifications, super::visitOrderBy );
+	}
+
 	@Override
 	protected void renderComparison(Expression lhs, ComparisonOperator operator, Expression rhs) {
 		final JdbcMappingContainer lhsExpressionType = lhs.getExpressionType();
@@ -387,17 +454,6 @@ private boolean supportsWindowFunctions() {
 		return true;
 	}
 
-	@Override
-	public void visitCastTarget(CastTarget castTarget) {
-		String sqlType = MySQLSqlAstTranslator.getSqlType( castTarget, getSessionFactory() );
-		if ( sqlType != null ) {
-			appendSql( sqlType );
-		}
-		else {
-			super.visitCastTarget( castTarget );
-		}
-	}
-
 	@Override
 	protected void renderStringContainsExactlyPredicate(Expression haystack, Expression needle) {
 		// MariaDB can't cope with NUL characters in the position function, so we use a like predicate instead
@@ -416,7 +472,7 @@ INSERT INTO employees (id, name, salary, version)
 				salary = values(salary)
 	*/
 	@Override
-	protected void renderUpdatevalue(ColumnValueBinding columnValueBinding) {
+	protected void renderUpdateValue(ColumnValueBinding columnValueBinding) {
 		appendSql( "values(" );
 		appendSql( columnValueBinding.getColumnReference().getColumnExpression() );
 		appendSql( ")" );
@@ -430,4 +486,72 @@ protected void appendAssignmentColumn(ColumnReference column) {
 						? determineColumnReferenceQualifier( column )
 						: null );
 	}
+
+	private boolean usesSingleTableDml(MutationStatement statement) {
+		// As of MariaDB 11.1, the self-join rewrite optimization can handle this, so no need force single table DML
+		return getDialect().getVersion().isBefore( 11, 1 ) && hasTargetTableCorrelation( statement );
+	}
+
+	private boolean needsDmlSubqueryWrapper() {
+		final Statement statement = getStatement();
+		// As of MariaDB 11.1, the self-join rewrite optimization can handle this, so no need for the wrapper
+		return getDialect().getVersion().isBefore( 11, 1 )
+				&& statement instanceof AbstractUpdateOrDeleteStatement updateOrDeleteStatement
+				&& !NestedOrTargetTableCorrelationVisitor.hasCorrelation( updateOrDeleteStatement );
+	}
+
+	@Override
+	public void visitSelectStatement(SelectStatement statement) {
+		final boolean needsParenthesis = !statement.getQueryPart().isRoot();
+		if ( needsParenthesis && needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.visitSelectStatement( statement );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.visitSelectStatement( statement );
+		}
+	}
+
+	@Override
+	protected <X extends Expression> void renderRelationalEmulationSubQuery(
+			QuerySpec subQuery,
+			X lhsTuple,
+			SubQueryRelationalRestrictionEmulationRenderer<X> renderer,
+			ComparisonOperator tupleComparisonOperator) {
+		if ( needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.renderRelationalEmulationSubQuery( subQuery, lhsTuple, renderer, tupleComparisonOperator );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.renderRelationalEmulationSubQuery( subQuery, lhsTuple, renderer, tupleComparisonOperator );
+		}
+	}
+
+	@Override
+	protected void renderQuantifiedEmulationSubQuery(
+			QuerySpec subQuery,
+			ComparisonOperator tupleComparisonOperator) {
+		if ( needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.renderQuantifiedEmulationSubQuery( subQuery, tupleComparisonOperator );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.renderQuantifiedEmulationSubQuery( subQuery, tupleComparisonOperator );
+		}
+	}
+
+	@Override
+	protected void renderFetchFirstRow() {
+		appendSql( " limit 1" );
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java
index f71014d744f8..c72eb552c616 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java
@@ -4,10 +4,12 @@
  */
 package org.hibernate.dialect.sql.ast;
 
-import org.hibernate.dialect.Dialect;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.engine.jdbc.Size;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.query.sqm.ComparisonOperator;
@@ -15,7 +17,6 @@
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
 import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression;
-import org.hibernate.sql.ast.tree.expression.CastTarget;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
@@ -32,94 +33,69 @@
 import org.hibernate.sql.ast.tree.select.QueryGroup;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.sql.ast.tree.select.SelectClause;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
+import org.hibernate.sql.ast.tree.select.SortSpecification;
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.model.ast.ColumnValueBinding;
+import org.hibernate.sql.ast.spi.FullJoinEmulation;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * A SQL AST translator for MySQL.
  *
  * @author Christian Beikov
+ * @author Yoobin Yoon
  */
 public class MySQLSqlAstTranslator<T extends JdbcOperation> extends SqlAstTranslatorWithOnDuplicateKeyUpdate<T> {
 
-	/**
-	 * On MySQL, 1GB or {@code 2^30 - 1} is the maximum size that a char value can be casted.
-	 */
-	private static final int MAX_CHAR_SIZE = (1 << 30) - 1;
-
 	private final MySQLDialect dialect;
+	private final ArrayDeque<FullJoinEmulation> fullJoinEmulations = new ArrayDeque<>();
 
 	public MySQLSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, MySQLDialect dialect) {
 		super( sessionFactory, statement );
 		this.dialect = dialect;
+		this.fullJoinEmulations.push( new FullJoinEmulation( this ) );
+	}
+
+	private FullJoinEmulation currentFullJoinEmulationHelper() {
+		return fullJoinEmulations.getFirst();
 	}
 
-	public static String getSqlType(CastTarget castTarget, SessionFactoryImplementor factory) {
-		final String sqlType = getCastTypeName( castTarget, factory.getTypeConfiguration() );
-		return getSqlType( castTarget, sqlType, factory.getJdbcServices().getDialect() );
-	}
-
-	//TODO: this is really, really bad since it circumvents the whole machinery we have in DdlType
-	//      and in the Dialect for doing this in a unified way! These mappings should be held in
-	//      the DdlTypes themselves and should be set up in registerColumnTypes(). Doing it here
-	//      means we have problems distinguishing, say, the 'as Character' special case
-	private static String getSqlType(CastTarget castTarget, String sqlType, Dialect dialect) {
-		if ( sqlType != null ) {
-			int parenthesesIndex = sqlType.indexOf( '(' );
-			final String baseName = parenthesesIndex == -1 ? sqlType : sqlType.substring( 0, parenthesesIndex ).trim();
-			switch ( baseName.toLowerCase( Locale.ROOT ) ) {
-				case "bit":
-					return "unsigned";
-				case "tinyint":
-				case "smallint":
-				case "integer":
-				case "bigint":
-					return "signed";
-				case "float":
-				case "real":
-				case "double precision":
-					if ( ((MySQLDialect) dialect).getMySQLVersion().isSameOrAfter( 8, 0, 17 ) ) {
-						return sqlType;
-					}
-					final int precision = castTarget.getPrecision() == null
-							? dialect.getDefaultDecimalPrecision()
-							: castTarget.getPrecision();
-					final int scale = castTarget.getScale() == null ? Size.DEFAULT_SCALE : castTarget.getScale();
-					return "decimal(" + precision + "," + scale + ")";
-				case "char":
-				case "varchar":
-				case "nchar":
-				case "nvarchar":
-				case "text":
-				case "mediumtext":
-				case "longtext":
-				case "enum":
-					if ( castTarget.getLength() == null ) {
-						// TODO: this is ugly and fragile, but could easily be handled in a DdlType
-						if ( castTarget.getJdbcMapping().getJdbcJavaType().getJavaType() == Character.class ) {
-							return "char(1)";
-						}
-						else {
-							return "char";
-						}
-					}
-					return castTarget.getLength() > MAX_CHAR_SIZE ? "char" : "char(" + castTarget.getLength() + ")";
-				case "binary":
-				case "varbinary":
-				case "mediumblob":
-				case "longblob":
-					return castTarget.getLength() == null
-						? "binary"
-						: "binary(" + castTarget.getLength() + ")";
+	@Override
+	public void visitQuerySpec(QuerySpec querySpec) {
+		final var helper = currentFullJoinEmulationHelper();
+		final boolean needsNestedHelper =
+				helper.hasActiveFullJoinEmulation()
+						&& !helper.isFullJoinEmulationQueryPart( querySpec );
+		if ( needsNestedHelper ) {
+			fullJoinEmulations.push( new FullJoinEmulation( this ) );
+		}
+		try {
+			final var currentHelper = currentFullJoinEmulationHelper();
+			if ( !currentHelper.renderFullJoinEmulationBranchIfNeeded( querySpec, super::visitQuerySpec )
+					&& !currentHelper.emulateFullJoinWithUnionIfNeeded( querySpec ) ) {
+				if ( shouldEmulateFetchClause( querySpec ) ) {
+					emulateFetchOffsetWithWindowFunctions( querySpec, true );
+				}
+				else {
+					super.visitQuerySpec( querySpec );
+				}
+			}
+		}
+		finally {
+			if ( needsNestedHelper ) {
+				fullJoinEmulations.pop();
 			}
 		}
-		return sqlType;
+	}
+
+	@Override
+	public void visitSelectClause(SelectClause selectClause) {
+		if ( !currentFullJoinEmulationHelper().renderSelectClauseIfNeeded( selectClause ) ) {
+			super.visitSelectClause( selectClause );
+		}
 	}
 
 	@Override
@@ -292,8 +268,10 @@ public void visitBooleanExpressionPredicate(BooleanExpressionPredicate booleanEx
 
 	protected boolean shouldEmulateFetchClause(QueryPart queryPart) {
 		// Check if current query part is already row numbering to avoid infinite recursion
-		return useOffsetFetchClause( queryPart ) && getQueryPartForRowNumbering() != queryPart
-				&& getDialect().supportsWindowFunctions() && !isRowsOnlyFetchClauseType( queryPart );
+		return useOffsetFetchClause( queryPart )
+			&& getQueryPartForRowNumbering() != queryPart
+			&& getDialect().supportsWindowFunctions()
+			&& !isRowsOnlyFetchClauseType( queryPart );
 	}
 
 	@Override
@@ -306,16 +284,6 @@ public void visitQueryGroup(QueryGroup queryGroup) {
 		}
 	}
 
-	@Override
-	public void visitQuerySpec(QuerySpec querySpec) {
-		if ( shouldEmulateFetchClause( querySpec ) ) {
-			emulateFetchOffsetWithWindowFunctions( querySpec, true );
-		}
-		else {
-			super.visitQuerySpec( querySpec );
-		}
-	}
-
 	@Override
 	public void visitValuesTableReference(ValuesTableReference tableReference) {
 		emulateValuesTableReferenceColumnAliasing( tableReference );
@@ -332,9 +300,15 @@ protected void renderDerivedTableReference(DerivedTableReference tableReference)
 		}
 	}
 
+	@Override
+	protected void visitOrderBy(List<SortSpecification> sortSpecifications) {
+		currentFullJoinEmulationHelper().renderOrderByIfNeeded( getCurrentQueryPart(), sortSpecifications, super::visitOrderBy );
+	}
+
 	@Override
 	public void visitOffsetFetchClause(QueryPart queryPart) {
-		if ( !isRowNumberingCurrentQueryPart() ) {
+		if ( !currentFullJoinEmulationHelper().isFullJoinEmulationQueryPart( queryPart )
+				&& !isRowNumberingCurrentQueryPart() ) {
 			renderCombinedLimitClause( queryPart );
 		}
 	}
@@ -413,17 +387,6 @@ public MySQLDialect getDialect() {
 		return dialect;
 	}
 
-	@Override
-	public void visitCastTarget(CastTarget castTarget) {
-		String sqlType = getSqlType( castTarget, getSessionFactory() );
-		if ( sqlType != null ) {
-			appendSql( sqlType );
-		}
-		else {
-			super.visitCastTarget( castTarget );
-		}
-	}
-
 	@Override
 	protected void renderStringContainsExactlyPredicate(Expression haystack, Expression needle) {
 		// MySQL can't cope with NUL characters in the position function, so we use a like predicate instead
@@ -449,7 +412,7 @@ protected void renderNewRowAlias() {
 	}
 
 	@Override
-	protected void renderUpdatevalue(ColumnValueBinding columnValueBinding) {
+	protected void renderUpdateValue(ColumnValueBinding columnValueBinding) {
 		renderAlias();
 		appendSql( "." );
 		appendSql( columnValueBinding.getColumnReference().getColumnExpression() );
@@ -467,4 +430,63 @@ protected void appendAssignmentColumn(ColumnReference column) {
 						? determineColumnReferenceQualifier( column )
 						: null );
 	}
+
+	private boolean needsDmlSubqueryWrapper() {
+		final Statement statement = getStatement();
+		return statement instanceof DeleteStatement || statement instanceof UpdateStatement;
+	}
+
+	@Override
+	public void visitSelectStatement(SelectStatement statement) {
+		final boolean needsParenthesis = !statement.getQueryPart().isRoot();
+		if ( needsParenthesis && needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.visitSelectStatement( statement );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.visitSelectStatement( statement );
+		}
+	}
+
+	@Override
+	protected <X extends Expression> void renderRelationalEmulationSubQuery(
+			QuerySpec subQuery,
+			X lhsTuple,
+			SubQueryRelationalRestrictionEmulationRenderer<X> renderer,
+			ComparisonOperator tupleComparisonOperator) {
+		if ( needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.renderRelationalEmulationSubQuery( subQuery, lhsTuple, renderer, tupleComparisonOperator );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.renderRelationalEmulationSubQuery( subQuery, lhsTuple, renderer, tupleComparisonOperator );
+		}
+	}
+
+	@Override
+	protected void renderQuantifiedEmulationSubQuery(
+			QuerySpec subQuery,
+			ComparisonOperator tupleComparisonOperator) {
+		if ( needsDmlSubqueryWrapper() ) {
+			appendSql( OPEN_PARENTHESIS );
+			appendSql( "select * from " );
+			super.renderQuantifiedEmulationSubQuery( subQuery, tupleComparisonOperator );
+			appendSql( " _sub_" );
+			appendSql( CLOSE_PARENTHESIS );
+		}
+		else {
+			super.renderQuantifiedEmulationSubQuery( subQuery, tupleComparisonOperator );
+		}
+	}
+
+	@Override
+	protected void renderFetchFirstRow() {
+		appendSql( " limit 1" );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/PostgreSQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/PostgreSQLSqlAstTranslator.java
index da605ae88d61..fef96801d12b 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/PostgreSQLSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/PostgreSQLSqlAstTranslator.java
@@ -32,6 +32,7 @@
 import org.hibernate.sql.exec.internal.JdbcOperationQueryInsertImpl;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert;
+import org.hibernate.sql.model.internal.OptionalTableInsert;
 import org.hibernate.sql.model.internal.TableInsertStandard;
 import org.hibernate.type.SqlTypes;
 
@@ -59,6 +60,39 @@ protected String getArrayContainsFunction() {
 		return super.getArrayContainsFunction();
 	}
 
+	@Override
+	public void visitStandardTableInsert(TableInsertStandard tableInsert) {
+		getCurrentClauseStack().push( Clause.INSERT );
+		try {
+			renderInsertInto( tableInsert );
+			if ( tableInsert instanceof OptionalTableInsert optionalTableInsert ) {
+				appendSql( " on conflict " );
+				final String constraintName = optionalTableInsert.getConstraintName();
+				if ( constraintName != null ) {
+					appendSql( " on constraint " );
+					appendSql( constraintName );
+				}
+				else {
+					char separator = '(';
+					for ( String constraintColumnName : optionalTableInsert.getConstraintColumnNames() ) {
+						appendSql( separator );
+						appendSql( constraintColumnName );
+						separator = ',';
+					}
+					appendSql( ')' );
+				}
+				appendSql( " do nothing" );
+			}
+
+			if ( tableInsert.getNumberOfReturningColumns() > 0 ) {
+				visitReturningColumns( tableInsert::getReturningColumns );
+			}
+		}
+		finally {
+			getCurrentClauseStack().pop();
+		}
+	}
+
 	@Override
 	protected void renderInsertIntoNoColumns(TableInsertStandard tableInsert) {
 		renderIntoIntoAndTable( tableInsert );
@@ -259,23 +293,11 @@ else if ( expression instanceof Summarization summarization ) {
 	}
 
 	@Override
-	public void visitLikePredicate(LikePredicate likePredicate) {
+	protected void renderLikePredicate(LikePredicate likePredicate) {
 		// We need a custom implementation here because PostgreSQL
 		// uses the backslash character as default escape character
 		// According to the documentation, we can overcome this by specifying an empty escape character
 		// See https://www.postgresql.org/docs/current/functions-matching.html#FUNCTIONS-LIKE
-		likePredicate.getMatchExpression().accept( this );
-		if ( likePredicate.isNegated() ) {
-			appendSql( " not" );
-		}
-		if ( likePredicate.isCaseSensitive() ) {
-			appendSql( " like " );
-		}
-		else {
-			appendSql( WHITESPACE );
-			appendSql( getDialect().getCaseInsensitiveLike() );
-			appendSql( WHITESPACE );
-		}
 		likePredicate.getPattern().accept( this );
 		if ( likePredicate.getEscapeCharacter() != null ) {
 			appendSql( " escape " );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SpannerSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SpannerSqlAstTranslator.java
index 2a46627baa6e..59a9ccc769f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SpannerSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SpannerSqlAstTranslator.java
@@ -4,24 +4,52 @@
  */
 package org.hibernate.dialect.sql.ast;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.List;
 
-import org.hibernate.Locking;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
+import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.sql.ast.spi.SqlSelection;
+import org.hibernate.sql.ast.tree.MutationStatement;
 import org.hibernate.sql.ast.tree.Statement;
+import org.hibernate.sql.ast.tree.delete.DeleteStatement;
+import org.hibernate.sql.ast.tree.expression.BinaryArithmeticExpression;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
 import org.hibernate.sql.ast.tree.expression.Summarization;
+import org.hibernate.sql.ast.tree.expression.UnparsedNumericLiteral;
 import org.hibernate.sql.ast.tree.from.DerivedTableReference;
+import org.hibernate.sql.ast.tree.from.NamedTableReference;
+import org.hibernate.sql.ast.tree.from.QueryPartTableReference;
+import org.hibernate.sql.ast.tree.from.TableReference;
+import org.hibernate.sql.ast.tree.insert.ConflictClause;
+import org.hibernate.sql.ast.tree.predicate.InArrayPredicate;
+import org.hibernate.sql.ast.tree.predicate.LikePredicate;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectClause;
+import org.hibernate.sql.ast.tree.expression.Any;
+import org.hibernate.sql.ast.tree.expression.Every;
+import org.hibernate.sql.ast.tree.expression.ModifiedSubQueryExpression;
+import org.hibernate.sql.ast.tree.select.SelectStatement;
+import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
+import org.hibernate.sql.model.MutationOperation;
+import org.hibernate.sql.model.ast.RestrictedTableMutation;
+import org.hibernate.sql.model.internal.OptionalTableUpdate;
+import org.hibernate.sql.model.internal.TableUpdateStandard;
+import org.hibernate.sql.ast.spi.SqlAliasStemHelper;
+import org.hibernate.sql.model.jdbc.UpsertOperation;
+import org.hibernate.jdbc.Expectation;
+import org.hibernate.sql.model.jdbc.DeleteOrUpsertOperation;
+import org.hibernate.persister.entity.mutation.EntityTableMapping;
+import org.hibernate.sql.model.ast.ColumnValueBinding;
 
 /**
  * A SQL AST translator for Spanner.
@@ -37,13 +65,6 @@ public SpannerSqlAstTranslator(SessionFactoryImplementor sessionFactory, Stateme
 		super( sessionFactory, statement );
 	}
 
-	@Override
-	protected LockStrategy determineLockingStrategy(
-			QuerySpec querySpec,
-			Locking.FollowOn followOnLocking) {
-		return LockStrategy.NONE;
-	}
-
 	@Override
 	public void visitOffsetFetchClause(QueryPart queryPart) {
 		renderLimitOffsetClause( queryPart );
@@ -51,7 +72,48 @@ public void visitOffsetFetchClause(QueryPart queryPart) {
 
 	@Override
 	protected void renderComparison(Expression lhs, ComparisonOperator operator, Expression rhs) {
-		renderComparisonEmulateIntersect( lhs, operator, rhs );
+		if ( rhs instanceof Every || rhs instanceof Any ) {
+			final boolean all = rhs instanceof Every;
+			final SelectStatement subquery = all ? ( (Every) rhs ).getSubquery() : ( (Any) rhs ).getSubquery();
+
+			final AbstractSqlAstTranslator.SubQueryRelationalRestrictionEmulationRenderer<Expression> singleRenderer = (lhsSelections, singleExpr, op) -> {
+				lhsSelections.get( 0 ).getExpression().accept( this );
+				appendSql( op.invert().sqlText() );
+				singleExpr.accept( this );
+			};
+
+			emulateSubQueryRelationalRestrictionPredicate(
+					null,
+					all,
+					subquery,
+					lhs,
+					singleRenderer,
+					all ? operator.negated() : operator
+			);
+		}
+		else if ( rhs instanceof ModifiedSubQueryExpression expression ) {
+			SelectStatement subquery = expression.getSubQuery();
+			if ( subquery.getQueryPart() instanceof QuerySpec querySpec ) {
+				if ( operator != ComparisonOperator.NOT_EQUAL && operator != ComparisonOperator.NOT_DISTINCT_FROM ) {
+					if ( expression.getModifier() == ModifiedSubQueryExpression.Modifier.ALL ) {
+						// Emulate ALL
+						lhs.accept( this );
+						appendSql( operator.sqlText() );
+						renderQuantifiedEmulationSubQuery( querySpec, operator );
+					}
+					else if ( expression.getModifier() == ModifiedSubQueryExpression.Modifier.ANY ||
+							expression.getModifier() == ModifiedSubQueryExpression.Modifier.SOME ) {
+						// Emulate ANY
+						lhs.accept( this );
+						appendSql( operator.sqlText() );
+						renderQuantifiedEmulationSubQuery( querySpec, operator.invert() );
+					}
+				}
+			}
+		}
+		else {
+			renderComparisonEmulateIntersect( lhs, operator, rhs );
+		}
 	}
 
 	@Override
@@ -62,6 +124,11 @@ protected void renderSelectTupleComparison(
 		emulateSelectTupleComparison( lhsExpressions, tuple.getExpressions(), operator, true );
 	}
 
+	@Override
+	protected void renderFetchFirstRow() {
+		appendSql( " limit 1" );
+	}
+
 	@Override
 	protected void renderPartitionItem(Expression expression) {
 		if ( expression instanceof Literal ) {
@@ -109,7 +176,349 @@ protected void renderDerivedTableReference(DerivedTableReference tableReference)
 		if ( correlated ) {
 			this.correlated = oldCorrelated;
 			appendSql( CLOSE_PARENTHESIS );
+			// Spanner requires the alias to be outside the parentheses UNNEST(... ) alias
+			super.renderTableReferenceIdentificationVariable( tableReference );
+		}
+	}
+
+	@Override
+	protected void visitDeleteStatementOnly(DeleteStatement statement) {
+		// Spanner requires a WHERE in delete clause so we add "where true" if there is none
+		if ( !hasWhere( statement.getRestriction() ) ) {
+			renderDeleteClause( statement );
+			appendSql( " where true" );
+			visitReturningColumns( statement.getReturningColumns() );
+		}
+		else {
+			super.visitDeleteStatementOnly( statement );
+		}
+	}
+
+	@Override
+	protected void visitUpdateStatementOnly(UpdateStatement statement) {
+		// Spanner requires a WHERE in update clause so we add "where true" if there is none
+		if ( !hasWhere( statement.getRestriction() ) ) {
+			renderUpdateClause( statement );
+			renderSetClause( statement.getAssignments() );
+			appendSql( " where true" );
+			visitReturningColumns( statement.getReturningColumns() );
+		}
+		else {
+			super.visitUpdateStatementOnly( statement );
+		}
+	}
+
+	@Override
+	public void visitStandardTableUpdate(TableUpdateStandard tableUpdate) {
+		getClauseStack().push( Clause.UPDATE );
+		try {
+			visitSpannerTableUpdate( tableUpdate );
+			if ( tableUpdate.getWhereFragment() != null ) {
+				appendSql( " and (" );
+				appendSql( tableUpdate.getWhereFragment() );
+				appendSql( ")" );
+			}
+
+			if ( tableUpdate.getNumberOfReturningColumns() > 0 ) {
+				visitReturningColumns( tableUpdate::getReturningColumns );
+			}
+		}
+		finally {
+			getClauseStack().pop();
+		}
+	}
+
+	@Override
+	public void visitOptionalTableUpdate(OptionalTableUpdate tableUpdate) {
+		getClauseStack().push( Clause.UPDATE );
+		try {
+			visitSpannerTableUpdate( tableUpdate );
+		}
+		finally {
+			getClauseStack().pop();
+		}
+	}
+
+	/**
+	 * Spanner requires table aliasing in UPDATE statements to disambiguate table and column names
+	 * if they are identical (e.g., table 'Discount' and column 'discount').
+	 * This method overrides standard Hibernate rendering to inject generated aliases.
+	 */
+	private void visitSpannerTableUpdate(RestrictedTableMutation<? extends MutationOperation> tableUpdate) {
+		applySqlComment( tableUpdate.getMutationComment() );
+		final String stem = SqlAliasStemHelper.INSTANCE.generateStemFromEntityName( tableUpdate.getMutatingTable().getTableName() );
+		final String alias = stem + "1_0";
+
+		appendSql( "update " );
+		appendSql( tableUpdate.getMutatingTable().getTableName() );
+		appendSql( " " + alias );
+		registerAffectedTable( tableUpdate.getMutatingTable().getTableName() );
+
+		getClauseStack().push( Clause.SET );
+		try {
+			appendSql( " set" );
+			tableUpdate.forEachValueBinding( (columnPosition, columnValueBinding) -> {
+				if ( columnPosition == 0 ) {
+					appendSql( " " );
+				}
+				else {
+					appendSql( "," );
+				}
+				appendSql( alias + "." );
+				appendSql( columnValueBinding.getColumnReference().getColumnExpression() );
+				appendSql( "=" );
+				columnValueBinding.getValueExpression().accept( this );
+			} );
+		}
+		finally {
+			getClauseStack().pop();
+		}
+
+		getClauseStack().push( Clause.WHERE );
+		try {
+			appendSql( " where" );
+			tableUpdate.forEachKeyBinding( (position, columnValueBinding) -> {
+				if ( position == 0 ) {
+					appendSql( " " );
+				}
+				else {
+					appendSql( " and " );
+				}
+				appendSql( alias + "." );
+				appendSql( columnValueBinding.getColumnReference().getColumnExpression() );
+				appendSql( "=" );
+				columnValueBinding.getValueExpression().accept( this );
+			} );
+
+			if ( tableUpdate.getNumberOfOptimisticLockBindings() > 0 ) {
+				tableUpdate.forEachOptimisticLockBinding( (position, columnValueBinding) -> {
+					appendSql( " and " );
+					appendSql( alias + "." );
+					appendSql( columnValueBinding.getColumnReference().getColumnExpression() );
+					if ( columnValueBinding.getValueExpression() == null
+							|| columnValueBinding.getValueExpression().getFragment() == null ) {
+						appendSql( " is null" );
+					}
+					else {
+						appendSql( "=" );
+						columnValueBinding.getValueExpression().accept( this );
+					}
+				} );
+			}
+		}
+		finally {
+			getClauseStack().pop();
+		}
+	}
+
+	private void applySqlComment(String comment) {
+		if ( getSessionFactory().getSessionFactoryOptions().isCommentsEnabled() ) {
+			if ( comment != null ) {
+				appendSql( "/* " );
+				appendSql( org.hibernate.dialect.Dialect.escapeComment( comment ) );
+				appendSql( " */" );
+			}
+		}
+	}
+
+	@Override
+	protected void renderTableReferenceIdentificationVariable(TableReference tableReference) {
+		// Spanner requires `UNNEST(...) alias`. Standard rendering places the alias
+		// inside the parentheses UNNEST(... alias). We suppress it here to manually
+		// render it outside the UNNEST wrapper in `renderDerivedTableReference`.
+		if ( correlated
+			&& tableReference instanceof DerivedTableReference
+			&& ((DerivedTableReference) tableReference).isLateral() ) {
+			return;
 		}
+		super.renderTableReferenceIdentificationVariable( tableReference );
 	}
 
+	@Override
+	protected void renderDmlTargetTableExpression(NamedTableReference tableReference) {
+		super.renderDmlTargetTableExpression( tableReference );
+		if ( getClauseStack().getCurrent() != Clause.INSERT ) {
+			renderTableReferenceIdentificationVariable( tableReference );
+		}
+	}
+
+	@Override
+	protected void renderDerivedTableReferenceIdentificationVariable(DerivedTableReference tableReference) {
+		renderTableReferenceIdentificationVariable( tableReference );
+	}
+
+	@Override
+	public void visitQueryPartTableReference(QueryPartTableReference tableReference) {
+		emulateQueryPartTableReferenceColumnAliasing( tableReference );
+	}
+
+	@Override
+	public void visitInArrayPredicate(InArrayPredicate inArrayPredicate) {
+		inArrayPredicate.getTestExpression().accept( this );
+		appendSql( " in unnest(" );
+		inArrayPredicate.getArrayParameter().accept( this );
+		appendSql( ')' );
+	}
+
+	@Override
+	protected void renderLikePredicate(LikePredicate likePredicate) {
+		// Spanner uses the backslash character as the default escape character
+		if (likePredicate.getEscapeCharacter() == null) {
+			renderBackslashEscapedLikePattern( likePredicate.getPattern(), likePredicate.getEscapeCharacter(), false );
+		}
+		else {
+			renderLikePattern( likePredicate.getPattern(), likePredicate.getEscapeCharacter() );
+		}
+	}
+
+	@Override
+	protected void renderLikePattern(Expression pattern, Expression escapeCharacter) {
+		if (escapeCharacter == null) {
+			super.renderLikePattern( pattern, escapeCharacter );
+		}
+		else {
+			appendSql( "replace(replace(replace(" );
+			pattern.accept( this );
+			appendSql( ", " );
+			escapeCharacter.accept( this );
+			appendSql( "||" );
+			escapeCharacter.accept( this );
+			appendSql( ", '\\\\\\\\'), " );
+			escapeCharacter.accept( this );
+			appendSql( "||'%', '\\\\%'), " );
+			escapeCharacter.accept( this );
+			appendSql( "||'_', '\\\\_')" );
+		}
+	}
+
+	@Override
+	protected void renderEscapeCharacter(Expression escapeCharacter) {
+		// Spanner doesn't support passing escape character
+	}
+
+	@Override
+	protected void appendBackslashEscapedLikeLiteral(SqlAppender appender, String literal, boolean noBackslashEscapes) {
+		appender.appendSql( '\'' );
+		for ( int i = 0; i < literal.length(); i++ ) {
+			final char c = literal.charAt( i );
+			switch ( c ) {
+				case '\'':
+					appender.appendSql( '\\' );
+					break;
+				case '\\':
+					appender.appendSql( "\\\\\\" );
+					break;
+			}
+			appender.appendSql( c );
+		}
+		appender.appendSql( '\'' );
+	}
+
+	@Override
+	public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
+		if ( isIntegerDivisionEmulationRequired( arithmeticExpression ) ) {
+			// Spanner uses functional syntax: DIV(numerator, denominator)
+			appendSql( "div(" );
+			visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
+			appendSql( "," );
+			visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
+			appendSql( ")" );
+		}
+		else {
+			super.visitBinaryArithmeticExpression( arithmeticExpression );
+		}
+	}
+
+	@Override
+	public <N extends Number> void visitUnparsedNumericLiteral(UnparsedNumericLiteral<N> literal) {
+		final Class<?> javaTypeClass = literal.getJdbcMapping().getJavaTypeDescriptor().getJavaTypeClass();
+		if ( BigDecimal.class.isAssignableFrom( javaTypeClass )
+			|| BigInteger.class.isAssignableFrom( javaTypeClass ) ) {
+			appendSql( "NUMERIC '" );
+			appendSql( literal.getUnparsedLiteralValue() );
+			appendSql( "'" );
+		}
+		else {
+			super.visitUnparsedNumericLiteral( literal );
+		}
+	}
+
+	@Override
+	protected void visitConflictClause(ConflictClause conflictClause) {
+		visitStandardConflictClause( conflictClause );
+	}
+
+	@Override
+	protected String determineColumnReferenceQualifier(ColumnReference columnReference) {
+		// Cloud Spanner does not support target table aliases in INSERT statements,
+		// so we must qualify column references with the actual table name to avoid ambiguity.
+		if ( getClauseStack().findCurrentFirst( clause -> clause == Clause.CONFLICT ? Boolean.TRUE : null ) != null ) {
+			if ( !"excluded".equalsIgnoreCase( columnReference.getQualifier() ) ) {
+				final MutationStatement currentDmlStatement = getCurrentDmlStatement();
+				if ( currentDmlStatement != null && currentDmlStatement.getTargetTable() != null ) {
+					return currentDmlStatement.getTargetTable().getTableExpression();
+				}
+			}
+		}
+		return super.determineColumnReferenceQualifier( columnReference );
+	}
+
+	public MutationOperation createMergeOperation(OptionalTableUpdate optionalTableUpdate, boolean hasUpdatableBindings) {
+		renderInsertOrUpdate( optionalTableUpdate, hasUpdatableBindings );
+
+		final UpsertOperation upsertOperation = new UpsertOperation(
+				optionalTableUpdate.getMutatingTable().getTableMapping(),
+				optionalTableUpdate.getMutationTarget(),
+				getSql(),
+				hasUpdatableBindings ? new Expectation.RowCount() : new Expectation.OptionalRowCount(),
+				getParameterBinders()
+		);
+
+		return new DeleteOrUpsertOperation(
+				optionalTableUpdate.getMutationTarget(),
+				(EntityTableMapping) optionalTableUpdate.getMutatingTable().getTableMapping(),
+				upsertOperation,
+				optionalTableUpdate
+		);
+	}
+
+	protected void renderInsertOrUpdate(OptionalTableUpdate optionalTableUpdate, boolean hasUpdatableBindings) {
+		if ( hasUpdatableBindings ) {
+			appendSql( "insert or update into " );
+		}
+		else {
+			appendSql( "insert or ignore into " );
+		}
+
+		appendSql( optionalTableUpdate.getMutatingTable().getTableName() );
+		appendSql( " (" );
+
+		final List<ColumnValueBinding> keyBindings = optionalTableUpdate.getKeyBindings();
+		char separator = ' ';
+		for ( ColumnValueBinding keyBinding : keyBindings ) {
+			appendSql( separator );
+			appendSql( keyBinding.getColumnReference().getColumnExpression() );
+			separator = ',';
+		}
+
+		optionalTableUpdate.forEachValueBinding( (columnPosition, columnValueBinding) -> {
+			appendSql( ',' );
+			appendSql( columnValueBinding.getColumnReference().getColumnExpression() );
+		} );
+
+		appendSql( ") values (" );
+
+		separator = ' ';
+		for ( ColumnValueBinding keyBinding : keyBindings ) {
+			appendSql( separator );
+			keyBinding.getValueExpression().accept( this );
+			separator = ',';
+		}
+
+		optionalTableUpdate.forEachValueBinding( (columnPosition, columnValueBinding) -> {
+			appendSql( ',' );
+			columnValueBinding.getValueExpression().accept( this );
+		} );
+		appendSql( ") " );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SqlAstTranslatorWithOnDuplicateKeyUpdate.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SqlAstTranslatorWithOnDuplicateKeyUpdate.java
index 73fab31d26ca..c842455068a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SqlAstTranslatorWithOnDuplicateKeyUpdate.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SqlAstTranslatorWithOnDuplicateKeyUpdate.java
@@ -5,8 +5,9 @@
 package org.hibernate.dialect.sql.ast;
 
 
-import org.hibernate.dialect.MySQLDeleteOrUpsertOperation;
+import org.hibernate.StaleStateException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.jdbc.Expectation;
 import org.hibernate.persister.entity.mutation.EntityTableMapping;
 import org.hibernate.sql.ast.spi.SqlAstTranslatorWithUpsert;
 import org.hibernate.sql.ast.tree.Statement;
@@ -14,9 +15,12 @@
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.ast.ColumnValueBinding;
 import org.hibernate.sql.model.internal.OptionalTableUpdate;
+import org.hibernate.sql.model.jdbc.DeleteOrUpsertOperation;
 import org.hibernate.sql.model.jdbc.UpsertOperation;
 
+import java.sql.PreparedStatement;
 import java.util.List;
+import java.util.function.BiConsumer;
 
 /**
  * @author Jan Schatteman
@@ -37,10 +41,11 @@ public MutationOperation createMergeOperation(OptionalTableUpdate optionalTableU
 				optionalTableUpdate.getMutatingTable().getTableMapping(),
 				optionalTableUpdate.getMutationTarget(),
 				getSql(),
+				new MySQLRowCountExpectation(),
 				getParameterBinders()
 		);
 
-		return new MySQLDeleteOrUpsertOperation(
+		return new DeleteOrUpsertOperation(
 				optionalTableUpdate.getMutationTarget(),
 				(EntityTableMapping) optionalTableUpdate.getMutatingTable().getTableMapping(),
 				upsertOperation,
@@ -48,6 +53,19 @@ public MutationOperation createMergeOperation(OptionalTableUpdate optionalTableU
 		);
 	}
 
+	private static class MySQLRowCountExpectation implements Expectation {
+		@Override
+		public final void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) {
+			if ( rowCount > 2 ) {
+				throw new StaleStateException(
+						"Unexpected row count"
+						+ " (the expected row count for an ON DUPLICATE KEY UPDATE statement should be either 0, 1 or 2 )"
+						+ " [" + sql + "]"
+				);
+			}
+		}
+	}
+
 	@Override
 	protected void renderUpsertStatement(OptionalTableUpdate optionalTableUpdate) {
 		renderInsertInto( optionalTableUpdate );
@@ -56,38 +74,48 @@ protected void renderUpsertStatement(OptionalTableUpdate optionalTableUpdate) {
 	}
 
 	protected void renderInsertInto(OptionalTableUpdate optionalTableUpdate) {
-		appendSql( "insert into " );
+		if ( optionalTableUpdate.getValueBindings().isEmpty() ) {
+			appendSql( "insert ignore into " );
+		}
+		else {
+			appendSql( "insert into " );
+		}
 		appendSql( optionalTableUpdate.getMutatingTable().getTableName() );
-		appendSql( " (" );
+		appendSql( " " );
 
 		final List<ColumnValueBinding> keyBindings = optionalTableUpdate.getKeyBindings();
+		char separator = '(';
 		for ( ColumnValueBinding keyBinding : keyBindings ) {
+			appendSql( separator );
 			appendSql( keyBinding.getColumnReference().getColumnExpression() );
-			appendSql( ',' );
+			separator = ',';
 		}
 
 		optionalTableUpdate.forEachValueBinding( (columnPosition, columnValueBinding) -> {
-				appendSql( columnValueBinding.getColumnReference().getColumnExpression() );
-			if ( columnPosition != optionalTableUpdate.getValueBindings().size() - 1  ) {
-				appendSql( ',' );
-			}
+			appendSql( ',' );
+			appendSql( columnValueBinding.getColumnReference().getColumnExpression() );
 		} );
 
-		appendSql( ") values (" );
+		appendSql( ") values " );
 
+		separator = '(';
 		for ( ColumnValueBinding keyBinding : keyBindings ) {
+			appendSql( separator );
 			keyBinding.getValueExpression().accept( this );
-			appendSql( ',' );
+			separator = ',';
 		}
 
 		optionalTableUpdate.forEachValueBinding( (columnPosition, columnValueBinding) -> {
-			if ( columnPosition > 0 ) {
+			if ( columnValueBinding.isAttributeInsertable() ) {
 				appendSql( ',' );
+				columnValueBinding.getValueExpression().accept( this );
 			}
-			columnValueBinding.getValueExpression().accept( this );
 		} );
 		appendSql(") ");
-		renderNewRowAlias();
+		if ( optionalTableUpdate.getValueBindings().stream()
+				.anyMatch( ColumnValueBinding::isAttributeUpdatable ) ) {
+			renderNewRowAlias();
+		}
 	}
 
 	protected void renderNewRowAlias() {
@@ -95,18 +123,39 @@ protected void renderNewRowAlias() {
 
 	protected void renderOnDuplicateKeyUpdate(OptionalTableUpdate optionalTableUpdate) {
 		appendSql( "on duplicate key update " );
-		optionalTableUpdate.forEachValueBinding( (columnPosition, columnValueBinding) -> {
-			final String columnName = columnValueBinding.getColumnReference().getColumnExpression();
-			if ( columnPosition > 0 ) {
-				appendSql( ',' );
+		if ( optionalTableUpdate.getValueBindings().stream()
+					.anyMatch( ColumnValueBinding::isAttributeUpdatable ) ) {
+			class BindingProcessor implements BiConsumer<Integer, ColumnValueBinding> {
+				boolean first = true;
+				@Override
+				public void accept(Integer columnPosition, ColumnValueBinding columnValueBinding) {
+					if ( columnValueBinding.isAttributeUpdatable() ) {
+						final String columnName = columnValueBinding.getColumnReference().getColumnExpression();
+						if ( first ) {
+							first = false;
+						}
+						else {
+							appendSql( ',' );
+						}
+						appendSql( columnName );
+						append( " = " );
+						renderUpdateValue( columnValueBinding );
+					}
+				}
 			}
-			appendSql( columnName );
-			append( " = " );
-			renderUpdatevalue( columnValueBinding );
-		} );
+			optionalTableUpdate.forEachValueBinding( new BindingProcessor() );
+		}
+		else {
+			final String keyColName =
+					optionalTableUpdate.getKeyBindings().get( 0 )
+							.getColumnReference().getColumnExpression();
+			appendSql( keyColName );
+			appendSql( "=" );
+			appendSql( keyColName );
+		}
 	}
 
-	protected void renderUpdatevalue(ColumnValueBinding columnValueBinding) {
+	protected void renderUpdateValue(ColumnValueBinding columnValueBinding) {
 	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SybaseASESqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SybaseASESqlAstTranslator.java
index 62c902b1f196..a155047caa9e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SybaseASESqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SybaseASESqlAstTranslator.java
@@ -4,6 +4,10 @@
  */
 package org.hibernate.dialect.sql.ast;
 
+import java.util.ArrayDeque;
+import java.util.List;
+import java.util.function.Consumer;
+
 import org.hibernate.Internal;
 import org.hibernate.LockMode;
 import org.hibernate.Locking;
@@ -17,6 +21,7 @@
 import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
+import org.hibernate.sql.ast.spi.FullJoinEmulation;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.MutationStatement;
 import org.hibernate.sql.ast.tree.Statement;
@@ -40,13 +45,11 @@
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectClause;
+import org.hibernate.sql.ast.tree.select.SortSpecification;
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.type.SqlTypes;
 
-import java.util.List;
-import java.util.function.Consumer;
-
 import static org.hibernate.Timeouts.SKIP_LOCKED_MILLI;
 
 /**
@@ -57,9 +60,15 @@
 public class SybaseASESqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAstTranslator<T> {
 
 	private static final String UNION_ALL = " union all ";
+	private final ArrayDeque<FullJoinEmulation> fullJoinEmulations = new ArrayDeque<>();
 
 	public SybaseASESqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
 		super( sessionFactory, statement );
+		this.fullJoinEmulations.push( new FullJoinEmulation( this ) );
+	}
+
+	private FullJoinEmulation currentFullJoinEmulationHelper() {
+		return fullJoinEmulations.getFirst();
 	}
 
 	@Override
@@ -247,6 +256,36 @@ protected void renderFetchPlusOffsetExpression(
 		renderFetchPlusOffsetExpressionAsLiteral( fetchClauseExpression, offsetClauseExpression, offset );
 	}
 
+	@Override
+	public void visitQuerySpec(QuerySpec querySpec) {
+		final var helper = currentFullJoinEmulationHelper();
+		final boolean needsNestedHelper =
+				helper.hasActiveFullJoinEmulation()
+						&& !helper.isFullJoinEmulationQueryPart( querySpec );
+		if ( needsNestedHelper ) {
+			fullJoinEmulations.push( new FullJoinEmulation( this ) );
+		}
+		try {
+			final var currentHelper = currentFullJoinEmulationHelper();
+			if ( !currentHelper.renderFullJoinEmulationBranchIfNeeded( querySpec, super::visitQuerySpec )
+					&& !currentHelper.emulateFullJoinWithUnionIfNeeded( querySpec ) ) {
+				super.visitQuerySpec( querySpec );
+			}
+		}
+		finally {
+			if ( needsNestedHelper ) {
+				fullJoinEmulations.pop();
+			}
+		}
+	}
+
+	@Override
+	public void visitSelectClause(SelectClause selectClause) {
+		if ( !currentFullJoinEmulationHelper().renderSelectClauseIfNeeded( selectClause ) ) {
+			super.visitSelectClause( selectClause );
+		}
+	}
+
 	@Override
 	public void visitQueryGroup(QueryGroup queryGroup) {
 		if ( queryGroup.hasSortSpecifications() || queryGroup.hasOffsetOrFetchClause() ) {
@@ -262,8 +301,8 @@ public void visitQueryGroup(QueryGroup queryGroup) {
 			renderQueryGroup( queryGroup, false );
 			appendSql( ") grp_(c0" );
 			// Sybase doesn't have implicit names for non-column select expressions, so we need to assign names
-			final int itemCount = queryGroup.getFirstQuerySpec().getSelectClause().getSqlSelections().size();
-			for (int i = 1; i < itemCount; i++) {
+			final int itemCount = assignNamesToSelectItems( queryGroup );
+			for ( int i = 1; i < itemCount; i++ ) {
 				appendSql( ",c" );
 				appendSql( i );
 			}
@@ -275,6 +314,27 @@ public void visitQueryGroup(QueryGroup queryGroup) {
 		}
 	}
 
+	private int assignNamesToSelectItems(QueryGroup queryGroup) {
+		int itemCount =
+				currentFullJoinEmulationHelper()
+						.countRenderedSelectItemsIncludingEmulationSelections(
+								queryGroup.getFirstQuerySpec() );
+		final var sortSpecifications = queryGroup.getSortSpecifications();
+		if ( sortSpecifications != null ) {
+			for ( var sortSpecification : sortSpecifications ) {
+				final int[] sortSelectionIndexes = sortSpecification.getSortSelectionIndexes();
+				if ( sortSelectionIndexes != null ) {
+					for ( int sortSelectionIndex : sortSelectionIndexes ) {
+						if ( sortSelectionIndex >= 0 && sortSelectionIndex + 1 > itemCount ) {
+							itemCount = sortSelectionIndex + 1;
+						}
+					}
+				}
+			}
+		}
+		return itemCount;
+	}
+
 	@Override
 	protected void visitValuesList(List<Values> valuesList) {
 		visitValuesListEmulateSelectUnion( valuesList );
@@ -290,14 +350,21 @@ public void visitValuesTableReference(ValuesTableReference tableReference) {
 
 	@Override
 	public void visitOffsetFetchClause(QueryPart queryPart) {
-		assertRowsOnlyFetchClauseType( queryPart );
-		if ( !queryPart.isRoot() && queryPart.hasOffsetOrFetchClause() ) {
-			if ( queryPart.getFetchClauseExpression() != null && queryPart.getOffsetClauseExpression() != null ) {
-				throw new IllegalArgumentException( "Can't emulate offset fetch clause in subquery" );
+		if ( !currentFullJoinEmulationHelper().isFullJoinEmulationQueryPart( queryPart ) ) {
+			assertRowsOnlyFetchClauseType( queryPart );
+			if ( !queryPart.isRoot() && queryPart.hasOffsetOrFetchClause() ) {
+				if ( queryPart.getFetchClauseExpression() != null && queryPart.getOffsetClauseExpression() != null ) {
+					throw new IllegalArgumentException( "Can't emulate offset fetch clause in subquery" );
+				}
 			}
 		}
 	}
 
+	@Override
+	protected void visitOrderBy(List<SortSpecification> sortSpecifications) {
+		currentFullJoinEmulationHelper().renderOrderByIfNeeded( getCurrentQueryPart(), sortSpecifications, super::visitOrderBy );
+	}
+
 	@Override
 	protected void renderFetchExpression(Expression fetchExpression) {
 		if ( supportsParameterOffsetFetchExpression() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SybaseSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SybaseSqlAstTranslator.java
index 7afd01da5c41..e14eb19ffa08 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SybaseSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SybaseSqlAstTranslator.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.dialect.sql.ast;
 
+import java.util.ArrayDeque;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -17,6 +18,7 @@
 import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
+import org.hibernate.sql.ast.spi.FullJoinEmulation;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
@@ -35,6 +37,8 @@
 import org.hibernate.sql.ast.tree.insert.Values;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.sql.ast.tree.select.SelectClause;
+import org.hibernate.sql.ast.tree.select.SortSpecification;
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 
@@ -46,9 +50,15 @@
 public class SybaseSqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAstTranslator<T> {
 
 	private static final String UNION_ALL = " union all ";
+	private final ArrayDeque<FullJoinEmulation> fullJoinEmulations = new ArrayDeque<>();
 
 	public SybaseSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
 		super( sessionFactory, statement );
+		this.fullJoinEmulations.push( new FullJoinEmulation( this ) );
+	}
+
+	private FullJoinEmulation currentFullJoinEmulationHelper() {
+		return fullJoinEmulations.getFirst();
 	}
 
 	@Override
@@ -99,7 +109,8 @@ protected void visitConflictClause(ConflictClause conflictClause) {
 	protected void visitAnsiCaseSearchedExpression(
 			CaseSearchedExpression caseSearchedExpression,
 			Consumer<Expression> resultRenderer) {
-		if ( getParameterRenderingMode() == SqlAstNodeRenderingMode.DEFAULT && areAllResultsParameters( caseSearchedExpression ) ) {
+		if ( getParameterRenderingMode() == SqlAstNodeRenderingMode.DEFAULT
+				&& areAllResultsParameters( caseSearchedExpression ) ) {
 			final List<CaseSearchedExpression.WhenFragment> whenFragments = caseSearchedExpression.getWhenFragments();
 			final Expression firstResult = whenFragments.get( 0 ).getResult();
 			super.visitAnsiCaseSearchedExpression(
@@ -123,7 +134,8 @@ protected void visitAnsiCaseSearchedExpression(
 	protected void visitAnsiCaseSimpleExpression(
 			CaseSimpleExpression caseSimpleExpression,
 			Consumer<Expression> resultRenderer) {
-		if ( getParameterRenderingMode() == SqlAstNodeRenderingMode.DEFAULT && areAllResultsParameters( caseSimpleExpression ) ) {
+		if ( getParameterRenderingMode() == SqlAstNodeRenderingMode.DEFAULT
+				&& areAllResultsParameters( caseSimpleExpression ) ) {
 			final List<CaseSimpleExpression.WhenFragment> whenFragments = caseSimpleExpression.getWhenFragments();
 			final Expression firstResult = whenFragments.get( 0 ).getResult();
 			super.visitAnsiCaseSimpleExpression(
@@ -206,10 +218,47 @@ public void visitValuesTableReference(ValuesTableReference tableReference) {
 
 	@Override
 	public void visitOffsetFetchClause(QueryPart queryPart) {
-		assertRowsOnlyFetchClauseType( queryPart );
-		if ( !queryPart.isRoot() && queryPart.getOffsetClauseExpression() != null ) {
-			throw new IllegalArgumentException( "Can't emulate offset clause in subquery" );
+		if ( !currentFullJoinEmulationHelper().isFullJoinEmulationQueryPart( queryPart ) ) {
+			assertRowsOnlyFetchClauseType( queryPart );
+			if ( !queryPart.isRoot() && queryPart.getOffsetClauseExpression() != null ) {
+				throw new IllegalArgumentException( "Can't emulate offset clause in subquery" );
+			}
+		}
+	}
+
+	@Override
+	public void visitQuerySpec(QuerySpec querySpec) {
+		final var helper = currentFullJoinEmulationHelper();
+		final boolean needsNestedHelper =
+				helper.hasActiveFullJoinEmulation()
+						&& !helper.isFullJoinEmulationQueryPart( querySpec );
+		if ( needsNestedHelper ) {
+			fullJoinEmulations.push( new FullJoinEmulation( this ) );
+		}
+		try {
+			final var currentHelper = currentFullJoinEmulationHelper();
+			if ( !currentHelper.renderFullJoinEmulationBranchIfNeeded( querySpec, super::visitQuerySpec )
+					&& !currentHelper.emulateFullJoinWithUnionIfNeeded( querySpec ) ) {
+				super.visitQuerySpec( querySpec );
+			}
 		}
+		finally {
+			if ( needsNestedHelper ) {
+				fullJoinEmulations.pop();
+			}
+		}
+	}
+
+	@Override
+	public void visitSelectClause(SelectClause selectClause) {
+		if ( !currentFullJoinEmulationHelper().renderSelectClauseIfNeeded( selectClause ) ) {
+			super.visitSelectClause( selectClause );
+		}
+	}
+
+	@Override
+	protected void visitOrderBy(List<SortSpecification> sortSpecifications) {
+		currentFullJoinEmulationHelper().renderOrderByIfNeeded( getCurrentQueryPart(), sortSpecifications, super::visitOrderBy );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temporal/DB2TemporalTableSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/DB2TemporalTableSupport.java
new file mode 100644
index 000000000000..94a88f123e5d
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/DB2TemporalTableSupport.java
@@ -0,0 +1,101 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.temporal;
+
+import org.hibernate.boot.model.relational.Database;
+import org.hibernate.boot.model.relational.NamedAuxiliaryDatabaseObject;
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.dialect.DB2Dialect;
+import org.hibernate.mapping.Table;
+
+import static java.util.Collections.emptySet;
+
+/**
+ * @author Gavin King
+ */
+public class DB2TemporalTableSupport extends DefaultTemporalTableSupport {
+
+	public DB2TemporalTableSupport(DB2Dialect dialect) {
+		super( dialect );
+	}
+
+	@Override
+	public int getTemporalColumnPrecision() {
+		return 12; // required!
+	}
+
+	@Override
+	public boolean supportsNativeTemporalTables() {
+		return true;
+	}
+
+	@Override
+	public boolean supportsTemporalTablePartitioning() {
+		return true;
+	}
+
+	@Override
+	public String getExtraTemporalTableDeclarations(
+			TemporalTableStrategy strategy,
+			String rowStartColumn, String rowEndColumn,
+			boolean partitioned) {
+		// no 'for' keyword
+		if ( strategy == TemporalTableStrategy.NATIVE ) {
+			return "transaction_start_id timestamp(12) not null generated always as transaction start id implicitly hidden"
+					+ ", period system_time (" + rowStartColumn + ", " + rowEndColumn + ")";
+		}
+		else if ( partitioned ) {
+			return rowEndColumn + "_null smallint generated always as (case when " + rowEndColumn + " is null then 1 else 0 end) implicitly hidden";
+		}
+		else {
+			return null;
+		}
+	}
+
+	@Override
+	public String getTemporalTableOptions(
+			TemporalTableStrategy strategy,
+			String rowEndColumnName,
+			boolean partitioned,
+			String currentPartition,
+			String historyPartition) {
+		return partitioned
+				? "partition by range (" + rowEndColumnName + "_null)"
+						+ " (partition " + historyPartition + " starting from (0) ending at (0),"
+						+ " partition " + currentPartition + " starting from (1) ending at (1))"
+				: null;
+	}
+
+	@Override
+	public void addTemporalTableAuxiliaryObjects(
+			TemporalTableStrategy strategy,
+			Table table, Database database,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName) {
+		if ( strategy == TemporalTableStrategy.NATIVE ) {
+			final String name = table.getQuotedName( dialect );
+			final String historyTableName = name + "_history";
+			database.addAuxiliaryDatabaseObject(
+					new NamedAuxiliaryDatabaseObject(
+							historyTableName,
+							database.getDefaultNamespace(),
+							new String[] {
+									"create table " + historyTableName + " like " + name,
+									"alter table " + name + " add versioning use history table " + historyTableName,
+							},
+							new String[] {"drop table " + historyTableName},
+							emptySet()
+					)
+			);
+		}
+	}
+
+	@Override
+	public TemporalTableStrategy getDefaultTemporalTableStrategy() {
+		return TemporalTableStrategy.NATIVE;
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temporal/DefaultTemporalTableSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/DefaultTemporalTableSupport.java
new file mode 100644
index 000000000000..d2e72e4a91dd
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/DefaultTemporalTableSupport.java
@@ -0,0 +1,119 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.temporal;
+
+import org.hibernate.MappingException;
+import org.hibernate.boot.model.relational.Database;
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.spi.LoadQueryInfluencers;
+import org.hibernate.mapping.Table;
+import org.hibernate.type.SqlTypes;
+
+import static org.hibernate.temporal.TemporalTableStrategy.HISTORY_TABLE;
+
+/**
+ * @author Gavin King
+ */
+public class DefaultTemporalTableSupport implements TemporalTableSupport {
+
+	final Dialect dialect;
+
+	public DefaultTemporalTableSupport(Dialect dialect) {
+		this.dialect = dialect;
+	}
+
+
+	@Override
+	public boolean supportsNativeTemporalTables() {
+		return false;
+	}
+
+	@Override
+	public int getTemporalColumnType() {
+		return SqlTypes.TIMESTAMP;
+	}
+
+	@Override
+	public int getTemporalColumnPrecision() {
+		return dialect.getDefaultTimestampPrecision();
+	}
+
+	@Override
+	public String getTemporalTableOptions(
+			TemporalTableStrategy strategy,
+			String rowEndColumnName,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName) {
+		return null;
+	}
+
+	@Override
+	public boolean suppressesTemporalTablePrimaryKeys(boolean partitioned) {
+		return partitioned && supportsTemporalTablePartitioning();
+	}
+
+	@Override
+	public boolean supportsTemporalTablePartitioning() {
+		return false;
+	}
+
+	@Override
+	public void addTemporalTableAuxiliaryObjects(
+			TemporalTableStrategy strategy,
+			Table table, Database database,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName) {
+	}
+
+	@Override
+	public String getExtraTemporalTableDeclarations(
+			TemporalTableStrategy strategy,
+			String rowStartColumn, String rowEndColumn,
+			boolean partitioned) {
+		return null;
+	}
+
+	@Override
+	public boolean createTemporalTableCheckConstraint(TemporalTableStrategy strategy) {
+		return strategy != TemporalTableStrategy.NATIVE
+			&& dialect.supportsTableCheck();
+	}
+
+	@Override
+	public String getAsOfOperator(TemporalTableStrategy strategy) {
+		return "for system_time as of";
+	}
+
+	@Override
+	public boolean useAsOfOperator(TemporalTableStrategy strategy) {
+		return strategy == TemporalTableStrategy.NATIVE;
+	}
+
+	@Override
+	public boolean useTemporalRestriction(LoadQueryInfluencers influencers) {
+		final var strategy =
+				influencers.getSessionFactory().getSessionFactoryOptions()
+						.getTemporalTableStrategy();
+		return switch ( strategy ) {
+			case HISTORY_TABLE -> influencers.getTemporalIdentifier() != null;
+			case NATIVE -> false;
+			default -> true;
+		};
+	}
+
+	@Override
+	public String getTemporalExclusionColumnOption() {
+		throw new MappingException( "Native temporal exclusion column option is not supported by this dialect" );
+	}
+
+	@Override
+	public TemporalTableStrategy getDefaultTemporalTableStrategy() {
+		return HISTORY_TABLE;
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temporal/MariaDBTemporalTableSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/MariaDBTemporalTableSupport.java
new file mode 100644
index 000000000000..41ec49d81e54
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/MariaDBTemporalTableSupport.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.temporal;
+
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.type.SqlTypes;
+
+/**
+ * @author Gavin King
+ */
+public class MariaDBTemporalTableSupport extends MySQLTemporalTableSupport {
+
+	public MariaDBTemporalTableSupport(MariaDBDialect dialect) {
+		super( dialect );
+	}
+
+	@Override
+	public boolean supportsNativeTemporalTables() {
+		return true;
+	}
+
+	@Override
+	public boolean supportsTemporalTablePartitioning() {
+		return false;
+	}
+
+	@Override
+	public String getTemporalTableOptions(
+			TemporalTableStrategy strategy,
+			String rowEndColumnName,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName) {
+		return strategy == TemporalTableStrategy.NATIVE
+				? "with system versioning"
+				: null;
+	}
+
+	@Override
+	public String getExtraTemporalTableDeclarations(TemporalTableStrategy strategy, String rowStartColumn, String rowEndColumn, boolean partitioned) {
+		return strategy == TemporalTableStrategy.NATIVE
+				? "period for system_time (" + rowStartColumn + ", " + rowEndColumn + ")"
+				: null;
+	}
+
+	@Override
+	public int getTemporalColumnType() {
+		return SqlTypes.TIMESTAMP_WITH_TIMEZONE;
+	}
+
+	@Override
+	public String getTemporalExclusionColumnOption() {
+		return "without system versioning";
+	}
+
+	@Override
+	public TemporalTableStrategy getDefaultTemporalTableStrategy() {
+		return TemporalTableStrategy.NATIVE;
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temporal/MySQLTemporalTableSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/MySQLTemporalTableSupport.java
new file mode 100644
index 000000000000..ee4b94438416
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/MySQLTemporalTableSupport.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.temporal;
+
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.type.SqlTypes;
+
+/**
+ * @author Gavin King
+ */
+public class MySQLTemporalTableSupport extends DefaultTemporalTableSupport {
+
+	public MySQLTemporalTableSupport(MySQLDialect dialect) {
+		super( dialect );
+	}
+
+	@Override
+	public boolean supportsTemporalTablePartitioning() {
+		return true;
+	}
+
+	@Override
+	public String getTemporalTableOptions(
+			TemporalTableStrategy strategy,
+			String rowEndColumnName,
+			boolean partitioned,
+			String currentPartition,
+			String historyPartition) {
+		return partitioned
+				? "partition by list (" + rowEndColumnName + "_null)"
+				+ " (partition " + historyPartition + " values in (0),"
+				+ " partition " + currentPartition + " values in (1))"
+				: null;
+	}
+
+	@Override
+	public String getExtraTemporalTableDeclarations(
+			TemporalTableStrategy strategy,
+			String rowStartColumn, String rowEndColumn,
+			boolean partitioned) {
+		return partitioned
+				? rowEndColumn + "_null tinyint as (" + rowEndColumn + " is null) virtual invisible"
+				: null;
+	}
+
+	@Override
+	public int getTemporalColumnType() {
+		return SqlTypes.TIMESTAMP_UTC;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temporal/OracleTemporalTableSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/OracleTemporalTableSupport.java
new file mode 100644
index 000000000000..778c85d27873
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/OracleTemporalTableSupport.java
@@ -0,0 +1,125 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.temporal;
+
+import org.hibernate.boot.model.relational.Database;
+import org.hibernate.boot.model.relational.NamedAuxiliaryDatabaseObject;
+import org.hibernate.boot.model.relational.SimpleAuxiliaryDatabaseObject;
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.dialect.OracleDialect;
+import org.hibernate.engine.spi.LoadQueryInfluencers;
+import org.hibernate.mapping.Table;
+
+import static java.util.Collections.emptySet;
+import static org.hibernate.temporal.TemporalTableStrategy.HISTORY_TABLE;
+
+/**
+ * @author Gavin King
+ */
+public class OracleTemporalTableSupport extends DefaultTemporalTableSupport {
+
+	public OracleTemporalTableSupport(OracleDialect dialect) {
+		super( dialect );
+	}
+
+	/**
+	 * Return {@code false} because we use {@code period for system_time}
+	 * to implement the constraint on Oracle.
+	 */
+	@Override
+	public boolean createTemporalTableCheckConstraint(TemporalTableStrategy strategy) {
+		return false;
+	}
+
+	@Override
+	public String getExtraTemporalTableDeclarations(TemporalTableStrategy strategy, String rowStartColumn, String rowEndColumn, boolean partitioned) {
+		return "period for system_time (" + rowStartColumn + ", " + rowEndColumn + ")";
+	}
+
+	@Override
+	public String getAsOfOperator(TemporalTableStrategy strategy) {
+		return strategy == TemporalTableStrategy.NATIVE
+				? "as of timestamp"
+				: "as of period for system_time";
+	}
+
+	@Override
+	public boolean useAsOfOperator(TemporalTableStrategy strategy) {
+		return strategy != HISTORY_TABLE;
+	}
+
+	@Override
+	public boolean useTemporalRestriction(LoadQueryInfluencers influencers) {
+		final var sessionFactory = influencers.getSessionFactory();
+		return sessionFactory.getTransactionIdentifierService().isIdentifierTypeInstant()
+				? sessionFactory.getSessionFactoryOptions().getTemporalTableStrategy() == HISTORY_TABLE
+						&& influencers.getTemporalIdentifier() != null
+				: super.useTemporalRestriction( influencers );
+	}
+
+	@Override
+	public boolean supportsTemporalTablePartitioning() {
+		return true;
+	}
+
+	@Override
+	public boolean suppressesTemporalTablePrimaryKeys(boolean partitioned) {
+		return false;
+	}
+
+	@Override
+	public String getTemporalTableOptions(
+			TemporalTableStrategy strategy,
+			String rowEndColumnName,
+			boolean partitioned,
+			String currentPartition,
+			String historyPartition) {
+		if ( strategy == TemporalTableStrategy.NATIVE ) {
+			return "flashback archive fba_history";
+		}
+		else if ( partitioned ) {
+			return "partition by list( " + rowEndColumnName + ")"
+				+ " (partition " + currentPartition + " values (null),"
+				+ " partition " + historyPartition + " values (default))"
+				+ " enable row movement";
+		}
+		else {
+			return null;
+		}
+	}
+
+	@Override
+	public boolean supportsNativeTemporalTables() {
+		return true;
+	}
+
+	@Override
+	public void addTemporalTableAuxiliaryObjects(
+			TemporalTableStrategy strategy,
+			Table table,
+			Database database,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName) {
+		if ( strategy == TemporalTableStrategy.NATIVE ) {
+			database.addAuxiliaryDatabaseObject( new SimpleAuxiliaryDatabaseObject(
+					database.getDefaultNamespace(),
+					new String[0],
+					new String[] { "alter table " + table.getQuotedName(dialect) + " no flashback archive" } ,
+					emptySet(),
+					false
+			) );
+			database.addAuxiliaryDatabaseObject( new NamedAuxiliaryDatabaseObject(
+					"fba_history",
+					database.getDefaultNamespace(),
+					"create flashback archive fba_history tablespace users quota 1M retention 1 month",
+					"drop flashback archive fba_history",
+					emptySet(),
+					true
+			) );
+		}
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temporal/PostgreSQLTemporalTableSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/PostgreSQLTemporalTableSupport.java
new file mode 100644
index 000000000000..569bc18bfde9
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/PostgreSQLTemporalTableSupport.java
@@ -0,0 +1,73 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.temporal;
+
+import org.hibernate.boot.model.relational.Database;
+import org.hibernate.boot.model.relational.NamedAuxiliaryDatabaseObject;
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.mapping.Table;
+import org.hibernate.type.SqlTypes;
+
+import static java.util.Collections.emptySet;
+
+/**
+ * @author Gavin King
+ */
+public class PostgreSQLTemporalTableSupport extends DefaultTemporalTableSupport {
+
+	public PostgreSQLTemporalTableSupport(PostgreSQLDialect dialect) {
+		super( dialect );
+	}
+
+	@Override
+	public boolean supportsTemporalTablePartitioning() {
+		return true;
+	}
+
+	@Override
+	public String getTemporalTableOptions(
+			TemporalTableStrategy strategy,
+			String rowEndColumnName,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName) {
+		return partitioned
+				? "partition by list (" + rowEndColumnName + ")"
+				: null;
+	}
+
+	@Override
+	public void addTemporalTableAuxiliaryObjects(
+			TemporalTableStrategy strategy,
+			Table table,
+			Database database,
+			boolean partitioned,
+			String currentPartition,
+			String historyPartition) {
+		if ( partitioned ) {
+			final String tableName = table.getQuotedName( dialect );
+			database.addAuxiliaryDatabaseObject( new NamedAuxiliaryDatabaseObject(
+					currentPartition,
+					database.getDefaultNamespace(),
+					"create table " + currentPartition + " partition of " + tableName + " for values in (null)",
+					"drop table if exists " + currentPartition + " cascade",
+					emptySet()
+			) );
+			database.addAuxiliaryDatabaseObject( new NamedAuxiliaryDatabaseObject(
+					historyPartition,
+					database.getDefaultNamespace(),
+					"create table " + historyPartition + " partition of " + tableName + " default",
+					"drop table if exists " + historyPartition + " cascade",
+					emptySet()
+			) );
+		}
+	}
+
+	@Override
+	public int getTemporalColumnType() {
+		return SqlTypes.TIMESTAMP_UTC;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temporal/SQLServerTemporalTableSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/SQLServerTemporalTableSupport.java
new file mode 100644
index 000000000000..e7acd9696822
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/SQLServerTemporalTableSupport.java
@@ -0,0 +1,73 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.temporal;
+
+import org.hibernate.boot.model.relational.Database;
+import org.hibernate.boot.model.relational.SimpleAuxiliaryDatabaseObject;
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.mapping.Table;
+
+import static java.util.Collections.emptySet;
+
+/**
+ * @author Gavin King
+ */
+public class SQLServerTemporalTableSupport extends DefaultTemporalTableSupport {
+
+	public SQLServerTemporalTableSupport(SQLServerDialect dialect) {
+		super( dialect );
+	}
+
+	@Override
+	public boolean supportsNativeTemporalTables() {
+		return true;
+	}
+
+	@Override
+	public String getExtraTemporalTableDeclarations(
+			TemporalTableStrategy strategy,
+			String rowStartColumn, String rowEndColumn,
+			boolean partitioned) {
+		return strategy == TemporalTableStrategy.NATIVE
+				// Transaction id support was only added in SQL Server 2022 (16.x)
+				? (dialect.getVersion().isSameOrAfter( 16 )
+				? "transaction_start_id bigint generated always as transaction_id start hidden not null, " : "")
+				+ "period for system_time (" + rowStartColumn + ", " + rowEndColumn + ")"
+				: null;
+	}
+
+	@Override
+	public String getTemporalTableOptions(
+			TemporalTableStrategy strategy,
+			String rowEndColumnName,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName) {
+		return strategy == TemporalTableStrategy.NATIVE
+				? "with (system_versioning = on)"
+				: null;
+	}
+
+	@Override
+	public void addTemporalTableAuxiliaryObjects(
+			TemporalTableStrategy strategy,
+			Table table,
+			Database database,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName) {
+		if ( strategy == TemporalTableStrategy.NATIVE ) {
+			database.addAuxiliaryDatabaseObject( new SimpleAuxiliaryDatabaseObject(
+					database.getDefaultNamespace(),
+					new String[0],
+					new String[] { "alter table " + table.getQuotedName(dialect) + " set (system_versioning = off)" },
+					emptySet(),
+					false
+			) );
+		}
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temporal/TemporalTableSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/TemporalTableSupport.java
new file mode 100644
index 000000000000..b208e5d307db
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/TemporalTableSupport.java
@@ -0,0 +1,169 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.temporal;
+
+import org.hibernate.Incubating;
+import org.hibernate.boot.model.relational.Database;
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.spi.LoadQueryInfluencers;
+import org.hibernate.mapping.Table;
+import org.hibernate.type.SqlTypes;
+
+/**
+ * Abstracts the support for temporal tables.
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+@Incubating
+public interface TemporalTableSupport {
+
+	/**
+	 * Does this dialect natively support SQL 2011-style
+	 * temporal tables?
+	 *
+	 * @see TemporalTableStrategy#NATIVE
+	 */
+	boolean supportsNativeTemporalTables();
+
+	/**
+	 * The column type to use for effectivity columns of
+	 * temporal tables. The default implementation returns
+	 * {@link SqlTypes#TIMESTAMP TIMESTAMP}.
+	 */
+	int getTemporalColumnType();
+
+	/**
+	 * The column precision to use for effectivity columns
+	 * of native temporal tables when the precision is not
+	 * explicitly specified. The default implementation
+	 * returns {@linkplain Dialect#getDefaultTimestampPrecision
+	 * the default timestamp precision} for this dialect.
+	 *
+	 * @see org.hibernate.annotations.Temporal#secondPrecision
+	 */
+	int getTemporalColumnPrecision();
+
+	/**
+	 * Table {@linkplain jakarta.persistence.Table#options options}
+	 * to use for temporal tables, used to specify system versioning
+	 * or table partitioning.
+	 *
+	 * @param strategy The temporal table strategy
+	 * @param rowEndColumnName The name of the {@code row end} column
+	 * specified via {@link org.hibernate.annotations.Temporal#rowEnd}
+	 * @param partitioned Is partitioning requested
+	 * @param currentPartitionName The current partition name, if specified
+	 * @param historyPartitionName The history partition name, if specified
+	 * @return The options, or {@code null} if there are no options
+	 */
+	String getTemporalTableOptions(
+			TemporalTableStrategy strategy,
+			String rowEndColumnName,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName);
+
+	/**
+	 * Do we need to suppress creation of the primary key
+	 * constraint on a temporal table?
+	 *
+	 * @param partitioned Is partitioning requested
+	 */
+	boolean suppressesTemporalTablePrimaryKeys(boolean partitioned);
+
+	/**
+	 * Do we support partitioning temporal tables in this
+	 * dialect?
+	 *
+	 * @see org.hibernate.annotations.Temporal.HistoryPartitioning
+	 */
+	boolean supportsTemporalTablePartitioning();
+
+	/**
+	 * Register any auxiliary database objects required
+	 * for the given temporary table and strategy. Used
+	 * to create history tables or table partitions.
+	 *
+	 * @param strategy The temporal table strategy
+	 * @param table A temporal table
+	 * @param database The database to register with
+	 * @param partitioned Is partitioning requested
+	 * @param currentPartitionName The current partition name, if specified
+	 * @param historyPartitionName The history partition name, if specified
+	 */
+	void addTemporalTableAuxiliaryObjects(
+			TemporalTableStrategy strategy,
+			Table table, Database database,
+			boolean partitioned,
+			String currentPartitionName,
+			String historyPartitionName);
+
+	/**
+	 * Any extra declarations required as part of the {@code create table}
+	 * statement for a temporal table. These declarations, unlike the
+	 * {@linkplain #getTemporalTableOptions options} come inside the
+	 * parentheses, along with the column and constraint definitions.
+	 * Examples include the {@code period for system_time} clause, the Db2
+	 * {@code transaction start id} column, the MySQL partitioning column,
+	 * and so on.
+	 *
+	 * @param strategy The temporal table strategy
+	 * @param partitioned Is partitioning requested
+	 */
+	String getExtraTemporalTableDeclarations(
+			TemporalTableStrategy strategy,
+			String rowStartColumn, String rowEndColumn,
+			boolean partitioned);
+
+	/**
+	 * Should we create a {@code check} constraint to enforce effectivity
+	 * constraints? (That starting timestamps precede ending timestamps.)
+	 * This is typically not needed for native temporal tables.
+	 */
+	boolean createTemporalTableCheckConstraint(TemporalTableStrategy strategy);
+
+	/**
+	 * The operator used to specify a temporal instant for querying
+	 * historical data. Usually {@code for system_time as of}. This
+	 * is usually used together with native temporal tables, but in
+	 * Oracle we use it all the time.
+	 */
+	String getAsOfOperator(TemporalTableStrategy strategy);
+
+	/**
+	 * Should be use the {@link #getAsOfOperator for system_time as of}
+	 * operator when querying temporal tables? We usually only use it
+	 * for querying native temporal tables at a historical instant, but
+	 * in Oracle we use it all the time.
+	 *
+	 * @param strategy The strategy
+	 */
+	boolean useAsOfOperator(TemporalTableStrategy strategy);
+
+	/**
+	 * Should we use temporal restrictions on the {@code row start} and
+	 * {@code row end} columns when querying temporal tables? We usually
+	 * use them unless we are using native temporal tables, but on Oracle
+	 * we never use them.
+	 * @param influencers The {@link LoadQueryInfluencers}
+	 */
+	boolean useTemporalRestriction(LoadQueryInfluencers influencers);
+
+	/**
+	 * Column options for a native implementation of exclusion from
+	 * temporal versioning.
+	 */
+	String getTemporalExclusionColumnOption();
+
+	/**
+	 * The recommended temporal table strategy for this dialect.
+	 *
+	 * @see TemporalTableStrategy#AUTO
+	 */
+	TemporalTableStrategy getDefaultTemporalTableStrategy();
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temporal/package-info.java b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/package-info.java
new file mode 100644
index 000000000000..55ac88b90d79
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temporal/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Abstracts over database-native support for temporal tables.
+ *
+ * @see org.hibernate.dialect.temporal.TemporalTableSupport
+ */
+package org.hibernate.dialect.temporal;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/StandardTemporaryTableExporter.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/StandardTemporaryTableExporter.java
index 6eb3a86eff5c..725491b1470e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/StandardTemporaryTableExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/StandardTemporaryTableExporter.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.dialect.temptable;
 
+import java.util.Locale;
 import java.util.function.Function;
 
 import org.hibernate.dialect.Dialect;
@@ -72,7 +73,7 @@ private TemporaryTableStrategy getDefaultTemporaryTableStrategy(TemporaryTable t
 	@Override
 	public String getSqlCreateCommand(TemporaryTable temporaryTable) {
 		final TemporaryTableStrategy temporaryTableStrategy = getDefaultTemporaryTableStrategy( temporaryTable );
-		final StringBuilder buffer = new StringBuilder( getCreateCommand( temporaryTableStrategy ) ).append( ' ' );
+		final var buffer = new StringBuilder( getCreateCommand( temporaryTableStrategy ) ).append( ' ' );
 		buffer.append( temporaryTable.getQualifiedTableName() );
 		buffer.append( '(' );
 
@@ -96,7 +97,9 @@ public String getSqlCreateCommand(TemporaryTable temporaryTable) {
 					}
 				}
 				else {
-					buffer.append( " not null" );
+					if ( !databaseTypeName.toLowerCase( Locale.ROOT ).contains( "not null" ) ) {
+						buffer.append( " not null" );
+					}
 				}
 			}
 			buffer.append( ", " );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java
index 8a434369749f..a59d069fdf48 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/temptable/TemporaryTable.java
@@ -46,9 +46,9 @@
 import org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
+import static org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper.isPartOfId;
 
 
 /**
@@ -111,7 +111,7 @@ private TemporaryTable(
 		this.temporaryTableKind = temporaryTableKind;
 		this.dialect = dialect;
 		if ( temporaryTableKind == TemporaryTableKind.PERSISTENT ) {
-			final TypeConfiguration typeConfiguration = creationContext.getTypeConfiguration();
+			final var typeConfiguration = creationContext.getTypeConfiguration();
 			final BasicType<UUID> uuidType = typeConfiguration.getBasicTypeRegistry().resolve(
 					StandardBasicTypes.UUID_CHAR
 			);
@@ -354,7 +354,7 @@ public static TemporaryTable createEntityTable(
 						}
 					}
 					if ( isExternallyGenerated ) {
-						final TypeConfiguration typeConfiguration = metadata.getTypeConfiguration();
+						final var typeConfiguration = metadata.getTypeConfiguration();
 						// We add a special row number column that we can use to identify and join rows
 						final BasicType<Integer> integerBasicType = typeConfiguration.getBasicTypeForJavaType( Integer.class );
 						final String rowNumberType;
@@ -512,10 +512,14 @@ else if ( modelPart instanceof EmbeddableValuedModelPart embeddablePart ) {
 			}
 			return offset;
 		}
-		else if ( modelPart instanceof BasicValuedModelPart basicModelPart ) {
-			return offset + (basicModelPart.isInsertable() ? modelPart.getJdbcTypeCount() : 0);
+		else if ( modelPart instanceof BasicValuedModelPart basicModelPart
+				&& !basicModelPart.isInsertable()
+				&& !(modelPart instanceof AttributeMapping attributeMapping && isPartOfId( attributeMapping )) ) {
+			return offset;
+		}
+		else {
+			return offset + modelPart.getJdbcTypeCount();
 		}
-		return offset + modelPart.getJdbcTypeCount();
 	}
 
 	public boolean isRowNumberGenerated() {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/type/AbstractPostgreSQLStructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/type/AbstractPostgreSQLStructJdbcType.java
index 5a28ee9ef16d..694f6b7875f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/type/AbstractPostgreSQLStructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/type/AbstractPostgreSQLStructJdbcType.java
@@ -4,27 +4,9 @@
  */
 package org.hibernate.dialect.type;
 
-import java.lang.reflect.Array;
-import java.sql.CallableStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalAccessor;
-import java.util.ArrayList;
-import java.util.TimeZone;
-
 import org.hibernate.internal.util.CharSequenceHelper;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.MappingType;
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.mapping.ValuedModelPart;
 import org.hibernate.sql.ast.spi.SqlAppender;
@@ -43,13 +25,31 @@
 import org.hibernate.type.descriptor.jdbc.StructuredJdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import static org.hibernate.type.descriptor.jdbc.StructHelper.getSubPart;
-import static org.hibernate.type.descriptor.jdbc.StructHelper.instantiate;
+import java.sql.CallableStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
+import java.util.ArrayList;
+import java.util.TimeZone;
+
+import static java.lang.reflect.Array.get;
+import static java.lang.reflect.Array.getLength;
 import static org.hibernate.type.descriptor.DateTimeUtils.appendAsDate;
 import static org.hibernate.type.descriptor.DateTimeUtils.appendAsLocalTime;
 import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTime;
 import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithMicros;
 import static org.hibernate.type.descriptor.DateTimeUtils.appendAsTimestampWithMillis;
+import static org.hibernate.type.descriptor.jdbc.StructHelper.getSubPart;
+import static org.hibernate.type.descriptor.jdbc.StructHelper.instantiate;
 
 /**
  * Implementation for serializing/deserializing an embeddable aggregate to/from the PostgreSQL component format.
@@ -125,17 +125,13 @@ public EmbeddableMappingType getEmbeddableMappingType() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		if ( embeddableMappingType == null ) {
-			return typeConfiguration.getJavaTypeRegistry().getDescriptor( Object[].class );
-		}
-		else {
-			//noinspection unchecked
-			return (JavaType<T>) embeddableMappingType.getMappedJavaType();
-		}
+		return embeddableMappingType == null
+				? typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Object[].class )
+				: embeddableMappingType.getMappedJavaType();
 	}
 
 	@Override
@@ -189,15 +185,13 @@ protected <X> X fromString(String string, JavaType<X> javaType, WrapperOptions o
 		}
 		assert end == string.length();
 		if ( returnEmbeddable ) {
-			final StructAttributeValues attributeValues = getAttributeValues( embeddableMappingType, orderMapping, array, options );
-			//noinspection unchecked
-			return (X) instantiate( embeddableMappingType, attributeValues );
+			final var attributeValues = getAttributeValues( embeddableMappingType, orderMapping, array, options );
+			return javaType.cast( instantiate( embeddableMappingType, attributeValues ) );
 		}
 		else if ( inverseOrderMapping != null ) {
 			StructHelper.orderJdbcValues( embeddableMappingType, inverseOrderMapping, array.clone(), array );
 		}
-		//noinspection unchecked
-		return (X) array;
+		return javaType.cast( array );
 	}
 
 	private int deserializeStruct(
@@ -336,7 +330,7 @@ private int deserializeStruct(
 							continue;
 						}
 						assert isDoubleQuote( string, i, 1 << quotes );
-						final JdbcMapping jdbcMapping = getJdbcValueSelectable( column ).getJdbcMapping();
+						final var jdbcMapping = getJdbcValueSelectable( column ).getJdbcMapping();
 						switch ( jdbcMapping.getJdbcType().getDefaultSqlTypeCode() ) {
 							case SqlTypes.DATE:
 								values[column] = fromRawObject(
@@ -450,7 +444,7 @@ private int deserializeStruct(
 						i += expectedQuotes - 1;
 						if ( string.charAt( i + 1 ) == '(' ) {
 							// This could be a nested struct
-							final JdbcMapping jdbcMapping = getJdbcValueSelectable( column ).getJdbcMapping();
+							final var jdbcMapping = getJdbcValueSelectable( column ).getJdbcMapping();
 							if ( jdbcMapping.getJdbcType() instanceof AbstractPostgreSQLStructJdbcType structJdbcType ) {
 								final Object[] subValues = new Object[structJdbcType.embeddableMappingType.getJdbcValueCount()];
 								final int subEnd = structJdbcType.deserializeStruct(
@@ -500,7 +494,7 @@ private int deserializeStruct(
 						}
 						else if ( string.charAt( i + 1 ) == '{' ) {
 							// This could be a quoted array
-							final JdbcMapping jdbcMapping = getJdbcValueSelectable( column ).getJdbcMapping();
+							final var jdbcMapping = getJdbcValueSelectable( column ).getJdbcMapping();
 							if ( jdbcMapping instanceof BasicPluralType<?, ?> pluralType ) {
 								final ArrayList<Object> arrayList = new ArrayList<>();
 								//noinspection unchecked
@@ -543,7 +537,7 @@ else if ( string.charAt( i + 1 ) == '{' ) {
 							values[column] = null;
 						}
 						else {
-							final JdbcMapping jdbcMapping = getJdbcValueSelectable( column ).getJdbcMapping();
+							final var jdbcMapping = getJdbcValueSelectable( column ).getJdbcMapping();
 							if ( jdbcMapping.getJdbcType().getDefaultSqlTypeCode() == SqlTypes.BOOLEAN ) {
 								values[column] = fromRawObject(
 										jdbcMapping,
@@ -579,7 +573,7 @@ else if ( jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass().isEnum()
 								values[column] = null;
 							}
 							else {
-								final JdbcMapping jdbcMapping = getJdbcValueSelectable( column ).getJdbcMapping();
+								final var jdbcMapping = getJdbcValueSelectable( column ).getJdbcMapping();
 								if ( jdbcMapping.getJdbcType().getDefaultSqlTypeCode() == SqlTypes.BOOLEAN ) {
 									values[column] = fromRawObject(
 											jdbcMapping,
@@ -610,7 +604,7 @@ else if ( jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass().isEnum()
 					break;
 				case '{':
 					if ( !inQuote ) {
-						final BasicPluralType<?, ?> pluralType = (BasicPluralType<?, ?>) getJdbcValueSelectable( column ).getJdbcMapping();
+						final var pluralType = (BasicPluralType<?, ?>) getJdbcValueSelectable( column ).getJdbcMapping();
 						final ArrayList<Object> arrayList = new ArrayList<>();
 						//noinspection unchecked
 						i = deserializeArray(
@@ -645,14 +639,10 @@ private boolean isBinary(int column) {
 	}
 
 	private static boolean isBinary(JdbcMapping jdbcMapping) {
-		switch ( jdbcMapping.getJdbcType().getDefaultSqlTypeCode() ) {
-			case SqlTypes.BINARY:
-			case SqlTypes.VARBINARY:
-			case SqlTypes.LONGVARBINARY:
-			case SqlTypes.LONG32VARBINARY:
-				return true;
-		}
-		return false;
+		return switch ( jdbcMapping.getJdbcType().getDefaultSqlTypeCode() ) {
+			case SqlTypes.BINARY, SqlTypes.VARBINARY, SqlTypes.LONGVARBINARY, SqlTypes.LONG32VARBINARY -> true;
+			default -> false;
+		};
 	}
 
 	private int deserializeArray(
@@ -803,7 +793,7 @@ private int deserializeArray(
 								);
 								break;
 							default:
-								if ( escapingSb == null || escapingSb.length() == 0 ) {
+								if ( escapingSb == null || escapingSb.isEmpty() ) {
 									values.add(
 											fromString(
 													elementType,
@@ -1027,19 +1017,6 @@ private static boolean isDoubleQuote(String string, int start, int escapes) {
 		return false;
 	}
 
-	private Object fromString(
-			int selectableIndex,
-			String string,
-			int start,
-			int end) {
-		return fromString(
-				getJdbcValueSelectable( selectableIndex ).getJdbcMapping(),
-				string,
-				start,
-				end
-		);
-	}
-
 	private static Object fromString(JdbcMapping jdbcMapping, CharSequence charSequence, int start, int end) {
 		return jdbcMapping.getJdbcJavaType().fromEncodedString(
 				charSequence,
@@ -1064,22 +1041,19 @@ private Object parseTime(CharSequence subSequence) {
 	}
 
 	private Object parseTimestamp(CharSequence subSequence, JavaType<?> jdbcJavaType) {
-		final TemporalAccessor temporalAccessor = LOCAL_DATE_TIME.parse( subSequence );
-		final LocalDateTime localDateTime = LocalDateTime.from( temporalAccessor );
-		final Timestamp timestamp = Timestamp.valueOf( localDateTime );
+		final var temporalAccessor = LOCAL_DATE_TIME.parse( subSequence );
+		final var localDateTime = LocalDateTime.from( temporalAccessor );
+		final var timestamp = Timestamp.valueOf( localDateTime );
 		timestamp.setNanos( temporalAccessor.get( ChronoField.NANO_OF_SECOND ) );
 		return timestamp;
 	}
 
 	private Object parseTimestampWithTimeZone(CharSequence subSequence, JavaType<?> jdbcJavaType) {
-		final TemporalAccessor temporalAccessor = LOCAL_DATE_TIME.parse( subSequence );
+		final var temporalAccessor = LOCAL_DATE_TIME.parse( subSequence );
 		if ( temporalAccessor.isSupported( ChronoField.OFFSET_SECONDS ) ) {
-			if ( jdbcJavaType.getJavaTypeClass() == Instant.class ) {
-				return Instant.from( temporalAccessor );
-			}
-			else {
-				return OffsetDateTime.from( temporalAccessor );
-			}
+			return jdbcJavaType.getJavaTypeClass() == Instant.class
+					? Instant.from( temporalAccessor )
+					: OffsetDateTime.from( temporalAccessor );
 		}
 		return LocalDateTime.from( temporalAccessor );
 	}
@@ -1101,7 +1075,7 @@ private static String unescape(CharSequence string, int start, int end) {
 	@Override
 	public Object createJdbcValue(Object domainValue, WrapperOptions options) throws SQLException {
 		assert embeddableMappingType != null;
-		final StringBuilder sb = new StringBuilder();
+		final var sb = new StringBuilder();
 		serializeStructTo( new PostgreSQLAppender( sb ), domainValue, options );
 		return sb.toString();
 	}
@@ -1129,7 +1103,7 @@ protected <X> String toString(X value, JavaType<X> javaType, WrapperOptions opti
 		if ( value == null ) {
 			return null;
 		}
-		final StringBuilder sb = new StringBuilder();
+		final var sb = new StringBuilder();
 		serializeStructTo( new PostgreSQLAppender( sb ), value, options );
 		return sb.toString();
 	}
@@ -1164,10 +1138,10 @@ private void serializeJdbcValuesTo(
 			if ( jdbcValue == null ) {
 				continue;
 			}
-			final SelectableMapping selectableMapping = orderMapping == null ?
+			final var selectableMapping = orderMapping == null ?
 					embeddableMappingType.getJdbcValueSelectable( i ) :
 					embeddableMappingType.getJdbcValueSelectable( orderMapping[i] );
-			final JdbcMapping jdbcMapping = selectableMapping.getJdbcMapping();
+			final var jdbcMapping = selectableMapping.getJdbcMapping();
 			if ( jdbcMapping.getJdbcType() instanceof AbstractPostgreSQLStructJdbcType structJdbcType ) {
 				appender.quoteStart();
 				structJdbcType.serializeJdbcValuesTo(
@@ -1267,7 +1241,7 @@ private void serializeConvertedBasicTo(
 				break;
 			case SqlTypes.ARRAY:
 				if ( subValue != null ) {
-					final int length = Array.getLength( subValue );
+					final int length = getLength( subValue );
 					if ( length == 0 ) {
 						appender.append( "{}" );
 					}
@@ -1276,7 +1250,7 @@ private void serializeConvertedBasicTo(
 						final BasicType<Object> elementType = ((BasicPluralType<?, Object>) jdbcMapping).getElementType();
 						appender.quoteStart();
 						appender.append( '{' );
-						Object arrayElement = Array.get( subValue, 0 );
+						Object arrayElement = get( subValue, 0 );
 						if ( arrayElement == null ) {
 							appender.appendNull();
 						}
@@ -1284,7 +1258,7 @@ private void serializeConvertedBasicTo(
 							serializeConvertedBasicTo( appender, options, elementType, arrayElement );
 						}
 						for ( int i = 1; i < length; i++ ) {
-							arrayElement = Array.get( subValue, i );
+							arrayElement = get( subValue, i );
 							appender.append( ',' );
 							if ( arrayElement == null ) {
 								appender.appendNull();
@@ -1301,7 +1275,7 @@ private void serializeConvertedBasicTo(
 				break;
 			case SqlTypes.STRUCT:
 				if ( subValue != null ) {
-					final AbstractPostgreSQLStructJdbcType structJdbcType = (AbstractPostgreSQLStructJdbcType) jdbcMapping.getJdbcType();
+					final var structJdbcType = (AbstractPostgreSQLStructJdbcType) jdbcMapping.getJdbcType();
 					appender.quoteStart();
 					structJdbcType.serializeJdbcValuesTo( appender, options, (Object[]) subValue, '(' );
 					appender.append( ')' );
@@ -1354,7 +1328,7 @@ private int injectAttributeValue(
 			Object[] rawJdbcValues,
 			int jdbcIndex,
 			WrapperOptions options) throws SQLException {
-		final MappingType mappedType = modelPart.getMappedType();
+		final var mappedType = modelPart.getMappedType();
 		final int jdbcValueCount;
 		final Object rawJdbcValue = rawJdbcValues[jdbcIndex];
 		if ( mappedType instanceof EmbeddableMappingType embeddableMappingType ) {
@@ -1378,7 +1352,7 @@ private int injectAttributeValue(
 		else {
 			assert modelPart.getJdbcTypeCount() == 1;
 			jdbcValueCount = 1;
-			final JdbcMapping jdbcMapping = modelPart.getSingleJdbcMapping();
+			final var jdbcMapping = modelPart.getSingleJdbcMapping();
 			final Object jdbcValue = jdbcMapping.getJdbcJavaType().wrap(
 					rawJdbcValue,
 					options
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/type/DB2StructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/type/DB2StructJdbcType.java
index 7966480a4de6..e0672eab7bad 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/type/DB2StructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/type/DB2StructJdbcType.java
@@ -93,17 +93,13 @@ public String getStructTypeName() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		if ( embeddableMappingType == null ) {
-			return typeConfiguration.getJavaTypeRegistry().getDescriptor( Object[].class );
-		}
-		else {
-			//noinspection unchecked
-			return (JavaType<T>) embeddableMappingType.getMappedJavaType();
-		}
+		return embeddableMappingType == null
+				? typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Object[].class )
+				: embeddableMappingType.getMappedJavaType();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleArrayJdbcType.java
index 7712cd7e08d2..9aeb04eaffff 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleArrayJdbcType.java
@@ -14,7 +14,6 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.boot.model.relational.Database;
-import org.hibernate.boot.model.relational.Namespace;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.mapping.UserDefinedArrayType;
@@ -71,60 +70,68 @@ public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaTypeD
 
 	@Override
 	public <X> ValueBinder<X> getBinder(final JavaType<X> javaTypeDescriptor) {
-		@SuppressWarnings("unchecked")
-		final BasicPluralJavaType<X> pluralJavaType = (BasicPluralJavaType<X>) javaTypeDescriptor;
-		final ValueBinder<X> elementBinder = getElementJdbcType().getBinder( pluralJavaType.getElementJavaType() );
-		return new BasicBinder<>( javaTypeDescriptor, this ) {
-			private String typeName(WrapperOptions options) {
-				final BasicPluralJavaType<?> javaType = (BasicPluralJavaType<?>) getJavaType();
-				final ArrayJdbcType jdbcType = (ArrayJdbcType) getJdbcType();
+		return new Binder<>( javaTypeDescriptor,
+				(BasicPluralJavaType<?>) javaTypeDescriptor );
+	}
+
+	private class Binder<X,E> extends BasicBinder<X> {
+		private final BasicPluralJavaType<E> pluralJavaType;
+
+		private Binder(JavaType<X> javaType, BasicPluralJavaType<E> pluralJavaType) {
+			super( javaType, OracleArrayJdbcType.this );
+			this.pluralJavaType = pluralJavaType;
+		}
+
+		private String typeName(WrapperOptions options) {
+				final var javaType = (BasicPluralJavaType<?>) getJavaType();
+				final var jdbcType = (ArrayJdbcType) getJdbcType();
 				return upperTypeName == null
 						? getTypeName( options, javaType, jdbcType ).toUpperCase( Locale.ROOT )
 						: upperTypeName;
-			}
-			@Override
-			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
-				st.setNull( index, ARRAY, typeName( options ) );
-			}
+		}
 
-			@Override
-			protected void doBindNull(CallableStatement st, String name, WrapperOptions options) throws SQLException {
-				st.setNull( name, ARRAY, typeName( options ) );
-			}
+		@Override
+		protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+			st.setNull( index, ARRAY, typeName( options ) );
+		}
 
-			@Override
-			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-				st.setArray( index, getBindValue( value, options ) );
-			}
+		@Override
+		protected void doBindNull(CallableStatement st, String name, WrapperOptions options) throws SQLException {
+			st.setNull( name, ARRAY, typeName( options ) );
+		}
 
-			@Override
-			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
-					throws SQLException {
-				final java.sql.Array arr = getBindValue( value, options );
-				try {
-					st.setObject( name, arr, ARRAY );
-				}
-				catch (SQLException ex) {
-					throw new HibernateException( "JDBC driver does not support named parameters for setArray. Use positional.", ex );
-				}
+		@Override
+		protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
+			st.setArray( index, getBindValue( value, options ) );
+		}
+
+		@Override
+		protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+				throws SQLException {
+			final java.sql.Array arr = getBindValue( value, options );
+			try {
+				st.setObject( name, arr, ARRAY );
+			}
+			catch (SQLException ex) {
+				throw new HibernateException( "JDBC driver does not support named parameters for setArray. Use positional.", ex );
 			}
+		}
 
-			@Override
-			public java.sql.Array getBindValue(X value, WrapperOptions options) throws SQLException {
-				final OracleArrayJdbcType oracleArrayJdbcType = (OracleArrayJdbcType) getJdbcType();
-				final Object[] objects = oracleArrayJdbcType.getArray( this, elementBinder, value, options );
-				final String arrayTypeName = typeName( options );
-				final OracleConnection oracleConnection =
-						options.getSession().getJdbcCoordinator().getLogicalConnection().getPhysicalConnection()
-								.unwrap( OracleConnection.class );
-				try {
-					return oracleConnection.createOracleArray( arrayTypeName, objects );
-				}
-				catch (Exception e) {
-					throw new HibernateException( "Couldn't create a java.sql.Array", e );
-				}
+		@Override
+		public java.sql.Array getBindValue(X value, WrapperOptions options) throws SQLException {
+			final var elementBinder = getElementJdbcType().getBinder( pluralJavaType.getElementJavaType() );
+			final var objects = convertToArray( this, elementBinder, pluralJavaType, value, options );
+			final String arrayTypeName = typeName( options );
+			final var oracleConnection =
+					options.getSession().getJdbcCoordinator().getLogicalConnection().getPhysicalConnection()
+							.unwrap( OracleConnection.class );
+			try {
+				return oracleConnection.createOracleArray( arrayTypeName, objects );
 			}
-		};
+			catch (Exception e) {
+				throw new HibernateException( "Couldn't create a java.sql.Array", e );
+			}
+		}
 	}
 
 	@Override
@@ -153,17 +160,18 @@ static String getTypeName(WrapperOptions options, BasicPluralJavaType<?> contain
 	}
 
 	static String getTypeName(BasicType<?> elementType, Dialect dialect) {
-		final BasicValueConverter<?, ?> converter = elementType.getValueConverter();
-		if ( converter != null ) {
-			return dialect.getArrayTypeName(
-					converterClassName( converter ),
-					null, // not needed by OracleDialect.getArrayTypeName()
-					null // not needed by OracleDialect.getArrayTypeName()
-			);
-		}
-		else {
-			return getTypeName( elementType.getJavaTypeDescriptor(), elementType.getJdbcType(), dialect );
-		}
+		final var converter = elementType.getValueConverter();
+		return converter != null
+				? dialect.getArrayTypeName(
+						converterClassName( converter ),
+						null, // not needed by OracleDialect.getArrayTypeName()
+						null // not needed by OracleDialect.getArrayTypeName()
+				)
+				: getTypeName(
+						elementType.getJavaTypeDescriptor(),
+						elementType.getJdbcType(),
+						dialect
+				);
 	}
 
 	private static String converterClassName(BasicValueConverter<?, ?> converter) {
@@ -181,7 +189,7 @@ static String getTypeName(JavaType<?> elementJavaType, JdbcType elementJdbcType,
 	}
 
 	private static String arrayClassName(JavaType<?> elementJavaType, JdbcType elementJdbcType, Dialect dialect) {
-		final Class<?> javaClass = elementJavaType.getJavaTypeClass();
+		final var javaClass = elementJavaType.getJavaTypeClass();
 		if ( javaClass.isArray() ) {
 			return dialect.getArrayTypeName(
 					javaClass.getComponentType().getSimpleName(),
@@ -193,20 +201,23 @@ else if ( elementJdbcType instanceof StructuredJdbcType structJdbcType ) {
 			return structJdbcType.getStructTypeName();
 		}
 		else {
-			final Class<?> preferredJavaTypeClass = elementJdbcType.getPreferredJavaTypeClass( null );
+			final var preferredJavaTypeClass =
+					elementJdbcType.getPreferredJavaTypeClass( null );
 			if ( preferredJavaTypeClass == javaClass) {
 				return javaClass.getSimpleName();
 			}
 			else {
 				if ( preferredJavaTypeClass.isArray() ) {
-					return javaClass.getSimpleName() + dialect.getArrayTypeName(
-							preferredJavaTypeClass.getComponentType().getSimpleName(),
-							null,
-							null
-					);
+					return javaClass.getSimpleName()
+							+ dialect.getArrayTypeName(
+									preferredJavaTypeClass.getComponentType().getSimpleName(),
+									null,
+									null
+							);
 				}
 				else {
-					return javaClass.getSimpleName() + preferredJavaTypeClass.getSimpleName();
+					return javaClass.getSimpleName()
+							+ preferredJavaTypeClass.getSimpleName();
 				}
 			}
 		}
@@ -219,18 +230,18 @@ public void addAuxiliaryDatabaseObjects(
 			Size columnSize,
 			Database database,
 			JdbcTypeIndicators context) {
-		final JdbcType elementJdbcType = getElementJdbcType();
-		if ( elementJdbcType instanceof StructuredJdbcType ) {
-			// OracleAggregateSupport will take care of contributing the auxiliary database object
-			return;
+		final var elementJdbcType = getElementJdbcType();
+		if ( !(elementJdbcType instanceof StructuredJdbcType) ) {
+			final var dialect = database.getDialect();
+			final var pluralJavaType = (BasicPluralJavaType<?>) javaType;
+			final var elementJavaType = pluralJavaType.getElementJavaType();
+			final String elementTypeName =
+					elementType( elementJavaType, elementJdbcType, columnSize, context.getTypeConfiguration(),
+							dialect );
+			final String arrayTypeName = arrayTypeName( elementJavaType, elementJdbcType, dialect );
+			createUserDefinedArrayType( arrayTypeName, elementTypeName, columnSize, elementJdbcType, database );
 		}
-		final Dialect dialect = database.getDialect();
-		final BasicPluralJavaType<?> pluralJavaType = (BasicPluralJavaType<?>) javaType;
-		final JavaType<?> elementJavaType = pluralJavaType.getElementJavaType();
-		final String elementTypeName =
-				elementType( elementJavaType, elementJdbcType, columnSize, context.getTypeConfiguration(), dialect );
-		final String arrayTypeName = arrayTypeName( elementJavaType, elementJdbcType, dialect );
-		createUserDefinedArrayType( arrayTypeName, elementTypeName, columnSize, elementJdbcType, database );
+		// else OracleAggregateSupport will take care of contributing the auxiliary database object
 	}
 
 	private String arrayTypeName(JavaType<?> elementJavaType, JdbcType elementJdbcType, Dialect dialect) {
@@ -241,8 +252,8 @@ private String arrayTypeName(JavaType<?> elementJavaType, JdbcType elementJdbcTy
 
 	private void createUserDefinedArrayType(
 			String arrayTypeName, String elementTypeName, Size columnSize, JdbcType elementJdbcType, Database database) {
-		final Namespace defaultNamespace = database.getDefaultNamespace();
-		final UserDefinedArrayType userDefinedArrayType =
+		final var defaultNamespace = database.getDefaultNamespace();
+		final var userDefinedArrayType =
 				defaultNamespace.createUserDefinedArrayType(
 						toIdentifier( arrayTypeName ),
 						name -> new UserDefinedArrayType( "orm", defaultNamespace, name )
@@ -275,7 +286,7 @@ public void registerOutParameter(CallableStatement callableStatement, int index)
 
 	@Override
 	public String getExtraCreateTableInfo(JavaType<?> javaType, String columnName, String tableName, Database database) {
-		final BasicPluralJavaType<?> pluralJavaType = (BasicPluralJavaType<?>) javaType;
+		final var pluralJavaType = (BasicPluralJavaType<?>) javaType;
 		return getElementJdbcType()
 				.getExtraCreateTableInfo( pluralJavaType.getElementJavaType(), columnName, tableName, database );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleArrayJdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleArrayJdbcTypeConstructor.java
index 9b7b358806c6..990b5a929825 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleArrayJdbcTypeConstructor.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleArrayJdbcTypeConstructor.java
@@ -54,7 +54,7 @@ public JdbcType resolveType(
 				precision = columnTypeInformation.getColumnSize();
 				scale = columnTypeInformation.getDecimalDigits();
 			}
-			typeName = OracleArrayJdbcType.getTypeName( elementType.getJdbcRecommendedJavaTypeMapping(
+			typeName = OracleArrayJdbcType.getTypeName( elementType.getRecommendedJavaType(
 					precision,
 					scale,
 					typeConfiguration
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleNestedTableJdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleNestedTableJdbcTypeConstructor.java
index 6bbae75b3305..a93e216dca83 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleNestedTableJdbcTypeConstructor.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleNestedTableJdbcTypeConstructor.java
@@ -48,7 +48,7 @@ public JdbcType resolveType(
 				precision = columnTypeInformation.getColumnSize();
 				scale = columnTypeInformation.getDecimalDigits();
 			}
-			typeName = OracleArrayJdbcType.getTypeName( elementType.getJdbcRecommendedJavaTypeMapping(
+			typeName = OracleArrayJdbcType.getTypeName( elementType.getRecommendedJavaType(
 					precision,
 					scale,
 					typeConfiguration
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleUserDefinedTypeExporter.java b/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleUserDefinedTypeExporter.java
index 4808017f80ce..0641293a735c 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleUserDefinedTypeExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/type/OracleUserDefinedTypeExporter.java
@@ -30,6 +30,7 @@
 
 /**
  * @author Christian Beikov
+ * @author Yoobin Yoon
  */
 public class OracleUserDefinedTypeExporter extends StandardUserDefinedTypeExporter {
 
@@ -220,6 +221,53 @@ public String[] getSqlCreateStrings(
 						"end loop; " +
 						"return res; " +
 						"end;",
+				"create or replace function " + arrayTypeName + "_reverse(arr in " + arrayTypeName +
+						") return " + arrayTypeName + " deterministic is " +
+						"res " + arrayTypeName + ":=" + arrayTypeName + "(); begin " +
+						"if arr is null then return null; end if; " +
+						"for i in reverse 1 .. arr.count loop " +
+						"res.extend; " +
+						"res(res.count) := arr(i); " +
+						"end loop; " +
+						"return res; " +
+						"end;",
+				"create or replace function " + arrayTypeName + "_sort(" +
+						"arr in " + arrayTypeName + "," +
+						"p_descending in number default 0," +
+						"p_nulls_first in number default null" +
+						") return " + arrayTypeName + " deterministic is " +
+						"v_result " + arrayTypeName + "; " +
+						"v_nulls_first number; " +
+						"begin " +
+						"if arr is null then return null; end if; " +
+						"if p_nulls_first is null then " +
+						"v_nulls_first := p_descending; " +
+						"else " +
+						"v_nulls_first := p_nulls_first; " +
+						"end if; " +
+						"if p_descending = 0 then " +
+						"if v_nulls_first = 0 then " +
+						"select cast(multiset(select column_value from table(arr) " +
+						"order by column_value asc nulls last) as " + arrayTypeName + ") " +
+						"into v_result from dual; " +
+						"else " +
+						"select cast(multiset(select column_value from table(arr) " +
+						"order by column_value asc nulls first) as " + arrayTypeName + ") " +
+						"into v_result from dual; " +
+						"end if; " +
+						"else " +
+						"if v_nulls_first = 0 then " +
+						"select cast(multiset(select column_value from table(arr) " +
+						"order by column_value desc nulls last) as " + arrayTypeName + ") " +
+						"into v_result from dual; " +
+						"else " +
+						"select cast(multiset(select column_value from table(arr) " +
+						"order by column_value desc nulls first) as " + arrayTypeName + ") " +
+						"into v_result from dual; " +
+						"end if; " +
+						"end if; " +
+						"return v_result; " +
+						"end;",
 				"create or replace function " + arrayTypeName + "_fill(elem in " + getRawTypeName( elementType ) +
 						", elems number) return " + arrayTypeName + " deterministic is " +
 						"res " + arrayTypeName + ":=" + arrayTypeName + "(); begin " +
@@ -303,6 +351,8 @@ public String[] getSqlDropStrings(UserDefinedArrayType userDefinedType, Metadata
 				buildDropFunctionSqlString(arrayTypeName + "_slice"),
 				buildDropFunctionSqlString(arrayTypeName + "_replace"),
 				buildDropFunctionSqlString(arrayTypeName + "_trim"),
+				buildDropFunctionSqlString(arrayTypeName + "_reverse"),
+				buildDropFunctionSqlString(arrayTypeName + "_sort"),
 				buildDropFunctionSqlString(arrayTypeName + "_fill"),
 				buildDropFunctionSqlString(arrayTypeName + "_positions"),
 				buildDropFunctionSqlString(arrayTypeName + "_to_string"),
@@ -395,7 +445,7 @@ protected String createOrReplaceConcatFunction(String arrayTypeName) {
 	}
 
 	protected String createOrReplaceConcatFunction(String arrayTypeName, int maxConcatParams) {
-		final StringBuilder sb = new StringBuilder();
+		final var sb = new StringBuilder();
 		sb.append( "create or replace function " ).append( arrayTypeName ).append( "_concat(" );
 		sb.append( "arr0 in " ).append( arrayTypeName ).append( ",arr1 in " ).append( arrayTypeName );
 		for ( int i = 2; i < maxConcatParams; i++ ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/type/PostgreSQLArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/type/PostgreSQLArrayJdbcType.java
index 4f02999d4d0b..25fd637c1891 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/type/PostgreSQLArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/type/PostgreSQLArrayJdbcType.java
@@ -10,7 +10,6 @@
 import java.sql.Types;
 
 import org.hibernate.HibernateException;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.BasicPluralJavaType;
@@ -31,62 +30,66 @@ public PostgreSQLArrayJdbcType(JdbcType elementJdbcType) {
 
 	@Override
 	public <X> ValueBinder<X> getBinder(final JavaType<X> javaTypeDescriptor) {
-		@SuppressWarnings("unchecked")
-		final BasicPluralJavaType<X> pluralJavaType = (BasicPluralJavaType<X>) javaTypeDescriptor;
-		final ValueBinder<X> elementBinder = getElementJdbcType().getBinder( pluralJavaType.getElementJavaType() );
-		return new BasicBinder<>( javaTypeDescriptor, this ) {
+		return new Binder<>( javaTypeDescriptor,
+				(BasicPluralJavaType<?>) javaTypeDescriptor );
+	}
 
-			@Override
-			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-				st.setArray( index, getArray( value, options ) );
-			}
+	private class Binder<X,E> extends BasicBinder<X> {
+		private final BasicPluralJavaType<E> pluralJavaType;
 
-			@Override
-			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
-					throws SQLException {
-				final java.sql.Array arr = getArray( value, options );
-				try {
-					st.setObject( name, arr, java.sql.Types.ARRAY );
-				}
-				catch (SQLException ex) {
-					throw new HibernateException( "JDBC driver does not support named parameters for setArray. Use positional.", ex );
-				}
-			}
+		private Binder(JavaType<X> javaType, BasicPluralJavaType<E> pluralJavaType) {
+			super( javaType, PostgreSQLArrayJdbcType.this );
+			this.pluralJavaType = pluralJavaType;
+		}
+
+		@Override
+		protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
+			st.setArray( index, getArray( value, options ) );
+		}
 
-			@Override
-			public Object getBindValue(X value, WrapperOptions options) throws SQLException {
-				return ( (PostgreSQLArrayJdbcType) getJdbcType() ).getArray( this, elementBinder, value, options );
+		@Override
+		protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+				throws SQLException {
+			final java.sql.Array arr = getArray( value, options );
+			try {
+				st.setObject( name, arr, java.sql.Types.ARRAY );
 			}
+			catch (SQLException ex) {
+				throw new HibernateException( "JDBC driver does not support named parameters for setArray. Use positional.", ex );
+			}
+		}
+
+		@Override
+		public Object[] getBindValue(X value, WrapperOptions options) throws SQLException {
+			final var elementBinder = getElementJdbcType().getBinder( pluralJavaType.getElementJavaType() );
+			return convertToArray( this, elementBinder, pluralJavaType, value, options );
+		}
 
-			private java.sql.Array getArray(X value, WrapperOptions options) throws SQLException {
-				final PostgreSQLArrayJdbcType arrayJdbcType = (PostgreSQLArrayJdbcType) getJdbcType();
-				final Object[] objects;
+		private java.sql.Array getArray(X value, WrapperOptions options) throws SQLException {
+			final var session = options.getSession();
+			return session.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection()
+					.createArrayOf( getElementTypeName( getJavaType(), session ),
+							elements( value, options, PostgreSQLArrayJdbcType.this ) );
+		}
 
-				final JdbcType elementJdbcType = arrayJdbcType.getElementJdbcType();
-				if ( elementJdbcType instanceof AggregateJdbcType aggregateJdbcType ) {
-					// The PostgreSQL JDBC driver does not support arrays of structs, which contain byte[]
-					final Object[] domainObjects = getJavaType().unwrap(
-							value,
-							Object[].class,
-							options
-					);
-					objects = new Object[domainObjects.length];
-					for ( int i = 0; i < domainObjects.length; i++ ) {
-						if ( domainObjects[i] != null ) {
-							objects[i] = aggregateJdbcType.createJdbcValue( domainObjects[i], options );
-						}
+		private Object[] elements(X value, WrapperOptions options, PostgreSQLArrayJdbcType arrayJdbcType)
+				throws SQLException {
+			final var elementJdbcType = arrayJdbcType.getElementJdbcType();
+			if ( elementJdbcType instanceof AggregateJdbcType aggregateJdbcType ) {
+				// The PostgreSQL JDBC driver does not support arrays of structs, which contain byte[]
+				final var domainObjects = getJavaType().unwrap( value, Object[].class, options );
+				final var objects = new Object[domainObjects.length];
+				for ( int i = 0; i < domainObjects.length; i++ ) {
+					if ( domainObjects[i] != null ) {
+						objects[i] = aggregateJdbcType.createJdbcValue( domainObjects[i], options );
 					}
 				}
-				else {
-					objects = arrayJdbcType.getArray( this, elementBinder, value, options );
-				}
-
-				final SharedSessionContractImplementor session = options.getSession();
-				final String typeName = arrayJdbcType.getElementTypeName( getJavaType(), session );
-				return session.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection()
-						.createArrayOf( typeName, objects );
+				return objects;
+			}
+			else {
+				return getBindValue( value, options );
 			}
-		};
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/type/SpannerJsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/type/SpannerJsonJdbcType.java
new file mode 100644
index 000000000000..e2aae14b6fce
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/type/SpannerJsonJdbcType.java
@@ -0,0 +1,70 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.dialect.type;
+
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
+import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.JsonJdbcType;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+public class SpannerJsonJdbcType extends JsonJdbcType {
+	private static final int VENDOR_TYPE_NUMBER = 100011;
+
+	public static final SpannerJsonJdbcType INSTANCE = new SpannerJsonJdbcType( null );
+
+	public SpannerJsonJdbcType(EmbeddableMappingType embeddableMappingType) {
+		super( embeddableMappingType );
+	}
+
+	@Override
+	public int getDdlTypeCode() {
+		return SqlTypes.JSON;
+	}
+
+	@Override
+	public AggregateJdbcType resolveAggregateJdbcType(
+			EmbeddableMappingType mappingType,
+			String sqlType,
+			RuntimeModelCreationContext creationContext) {
+		return new SpannerJsonJdbcType( mappingType );
+	}
+
+	@Override
+	public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
+		return new BasicBinder<>( javaType, this ) {
+			@Override
+			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
+					throws java.sql.SQLException {
+				final String json = ( (SpannerJsonJdbcType) getJdbcType() ).toString( value, getJavaType(), options );
+				st.setObject( index, json, VENDOR_TYPE_NUMBER );
+			}
+
+			@Override
+			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options) throws SQLException {
+				final String json = ( (SpannerJsonJdbcType) getJdbcType() ).toString( value, getJavaType(), options );
+				st.setObject( name, json, VENDOR_TYPE_NUMBER );
+			}
+
+			@Override
+			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+				st.setNull( index, VENDOR_TYPE_NUMBER );
+			}
+
+			@Override
+			protected void doBindNull(CallableStatement st, String name, WrapperOptions options) throws SQLException {
+				st.setNull( name, VENDOR_TYPE_NUMBER );
+			}
+		};
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueDelegate.java
index ca126f56e4d2..e68c3cad2c90 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueDelegate.java
@@ -5,12 +5,18 @@
 package org.hibernate.dialect.unique;
 
 import org.hibernate.boot.Metadata;
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.naming.NamingHelper;
+import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.UniqueKey;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 
 /**
@@ -29,6 +35,25 @@ public AlterTableUniqueDelegate(Dialect dialect ) {
 		this.dialect = dialect;
 	}
 
+	static String constraintName(UniqueKey uniqueKey, Database database) {
+		final String uniqueKeyName = uniqueKey.getName();
+		if ( uniqueKeyName == null ) {
+			final List<Identifier> columnIdentifiers = new ArrayList<>();
+			for ( var column : uniqueKey.getColumns() ) {
+				columnIdentifiers.add( column.getNameIdentifier( database ) );
+			}
+			return NamingHelper.INSTANCE.generateHashedConstraintName("UK",
+					uniqueKey.getTable().getNameIdentifier(), columnIdentifiers );
+		}
+		else {
+			return database.getDialect().quote( uniqueKeyName );
+		}
+	}
+
+	static String tableName(UniqueKey uniqueKey, SqlStringGenerationContext context) {
+		return context.format( uniqueKey.getTable().getQualifiedTableName() );
+	}
+
 	// legacy model ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 	@Override
@@ -44,19 +69,19 @@ public String getTableCreationUniqueConstraintsFragment(Table table,
 	}
 
 	@Override
-	public String getAlterTableToAddUniqueKeyCommand(UniqueKey uniqueKey, Metadata metadata,
+	public String getAlterTableToAddUniqueKeyCommand(
+			UniqueKey uniqueKey, Metadata metadata,
 			SqlStringGenerationContext context) {
-		final String tableName = context.format( uniqueKey.getTable().getQualifiedTableName() );
-		final String constraintName = dialect.quote( uniqueKey.getName() );
-		return dialect.getAlterTableString( tableName )
-				+ " add constraint " + constraintName + " " + uniqueConstraintSql( uniqueKey );
+		return dialect.getAlterTableString( tableName( uniqueKey, context ) )
+				+ " add constraint " + constraintName( uniqueKey, metadata.getDatabase() )
+				+ " " + uniqueConstraintSql( uniqueKey );
 	}
 
 	protected String uniqueConstraintSql(UniqueKey uniqueKey) {
-		final StringBuilder fragment = new StringBuilder();
+		final var fragment = new StringBuilder();
 		fragment.append( "unique (" );
 		boolean first = true;
-		for ( Column column : uniqueKey.getColumns() ) {
+		for ( var column : uniqueKey.getColumns() ) {
 			if ( first ) {
 				first = false;
 			}
@@ -78,22 +103,23 @@ protected String uniqueConstraintSql(UniqueKey uniqueKey) {
 	@Override
 	public String getAlterTableToDropUniqueKeyCommand(UniqueKey uniqueKey, Metadata metadata,
 			SqlStringGenerationContext context) {
-		final String tableName = context.format( uniqueKey.getTable().getQualifiedTableName() );
-		final StringBuilder command = new StringBuilder( dialect.getAlterTableString(tableName) );
+		final String tableName = tableName( uniqueKey, context );
+		final String constraintName = constraintName( uniqueKey, metadata.getDatabase() );
+		final var command = new StringBuilder( dialect.getAlterTableString( tableName ) );
 		command.append( ' ' );
 		command.append( dialect.getDropUniqueKeyString() );
 		if ( dialect.supportsIfExistsBeforeConstraintName() ) {
 			command.append( " if exists " );
-			command.append( dialect.quote( uniqueKey.getName() ) );
+			command.append( constraintName );
 		}
 		else if ( dialect.supportsIfExistsAfterConstraintName() ) {
 			command.append( ' ' );
-			command.append( dialect.quote( uniqueKey.getName() ) );
+			command.append( constraintName );
 			command.append( " if exists" );
 		}
 		else {
 			command.append( ' ' );
-			command.append( dialect.quote( uniqueKey.getName() ) );
+			command.append( constraintName );
 		}
 		return command.toString();
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueIndexDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueIndexDelegate.java
index f4e8ed5c92c1..a105ec625925 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueIndexDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/unique/AlterTableUniqueIndexDelegate.java
@@ -7,13 +7,8 @@
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.mapping.Column;
 import org.hibernate.mapping.UniqueKey;
 
-import java.util.List;
-import java.util.Map;
-
-import static org.hibernate.internal.util.StringHelper.qualify;
 import static org.hibernate.internal.util.StringHelper.unqualify;
 
 /**
@@ -25,6 +20,8 @@
  * <li>SQL Server <em>does</em> allow unique constraints on nullable columns, but the semantics
  *     are that two null values are non-unique. So here we need to jump through hoops with the
  *     {@code create unique nonclustered index ... where ...} command.
+ * <li>Spanner does not allow unique column definition, but it does allow the creation of unique
+ * 	   indexes instead, using {@code create unique index ...}
  * </ul>
  *
  * @author Brett Meyer
@@ -37,28 +34,29 @@ public AlterTableUniqueIndexDelegate(Dialect dialect ) {
 	@Override
 	public String getAlterTableToAddUniqueKeyCommand(UniqueKey uniqueKey, Metadata metadata,
 			SqlStringGenerationContext context) {
-		if ( uniqueKey.hasNullableColumn() ) {
-			final Dialect dialect = context.getDialect();
-			final String name = uniqueKey.getName();
-			final String tableName = context.format( uniqueKey.getTable().getQualifiedTableName() );
-			final List<Column> columns = uniqueKey.getColumns();
-			final Map<Column, String> columnOrderMap = uniqueKey.getColumnOrderMap();
-			final StringBuilder statement =
+		final var dialect = context.getDialect();
+		if ( needsUniqueIndex( uniqueKey, dialect ) ) {
+			final String constraintName = constraintName( uniqueKey, metadata.getDatabase() );
+			final var statement =
 					new StringBuilder( dialect.getCreateIndexString( true ) )
 							.append( " " )
-							.append( dialect.qualifyIndexName() ? name : unqualify( name ) )
+							.append( dialect.qualifyIndexName()
+									? constraintName
+									: unqualify( constraintName ) )
 							.append( " on " )
-							.append( tableName )
+							.append( tableName( uniqueKey, context ) )
 							.append( " (" );
+			final var columns = uniqueKey.getColumns();
+			final var columnOrderMap = uniqueKey.getColumnOrderMap();
 			boolean first = true;
-			for ( Column column : columns ) {
+			for ( var column : columns ) {
 				if ( first ) {
 					first = false;
 				}
 				else {
 					statement.append(", ");
 				}
-				statement.append( column.getQuotedName(dialect) );
+				statement.append( column.getQuotedName( dialect ) );
 				if ( columnOrderMap.containsKey( column ) ) {
 					statement.append( " " ).append( columnOrderMap.get( column ) );
 				}
@@ -75,13 +73,22 @@ public String getAlterTableToAddUniqueKeyCommand(UniqueKey uniqueKey, Metadata m
 	@Override
 	public String getAlterTableToDropUniqueKeyCommand(UniqueKey uniqueKey, Metadata metadata,
 			SqlStringGenerationContext context) {
-		if ( uniqueKey.hasNullableColumn() ) {
-			final String tableName = context.format( uniqueKey.getTable().getQualifiedTableName() );
-			return "drop index " + qualify( tableName, uniqueKey.getName() );
+		if ( needsUniqueIndex( uniqueKey, context.getDialect() ) ) {
+			final var statement = new StringBuilder().append( "drop index " );
+			if ( dialect.supportsIfExistsBeforeIndexName() ) {
+				statement.append( "if exists " );
+			}
+			statement.append( tableName( uniqueKey, context ) ).append( '.' )
+					.append( constraintName( uniqueKey, metadata.getDatabase() ) );
+			return statement.toString();
 		}
 		else {
 			return super.getAlterTableToDropUniqueKeyCommand( uniqueKey, metadata, context );
 		}
 	}
 
+	private boolean needsUniqueIndex(UniqueKey uniqueKey, Dialect dialect) {
+		return uniqueKey.hasNullableColumn() || !dialect.supportsUniqueConstraints();
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/CreateTableUniqueDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/CreateTableUniqueDelegate.java
index 97d1f0a77cc5..75683dfb6669 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/CreateTableUniqueDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/unique/CreateTableUniqueDelegate.java
@@ -58,7 +58,7 @@ public String getTableCreationUniqueConstraintsFragment(Table table, SqlStringGe
 				// then getColumnDefinitionUniquenessFragment() already handled it, and
 				// so we don't need to bother creating a constraint. The only downside
 				// to this is that if the user added a column marked unique=true to a
-				// named unique constraint, then the name gets lost. Unfortunately the
+				// named unique constraint, then the name gets lost. Unfortunately, the
 				// signature of getColumnDefinitionUniquenessFragment() doesn't let me
 				// detect this case. (But that would be easy to fix!)
 				if ( !isSingleColumnUnique( table, uniqueKey ) ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java
index 005ee176c523..ed0ac5d4fecc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java
@@ -66,42 +66,49 @@ public void injectServices(ServiceRegistryImplementor serviceRegistry) {
 		return target !=null ? target : defaultValue;
 	}
 
-	@SuppressWarnings("unchecked")
 	public <T> @Nullable T cast(Class<T> expected, @Nullable Object candidate){
-		if (candidate == null) {
+		if ( candidate == null ) {
 			return null;
 		}
+		else if ( expected.isInstance( candidate ) ) {
+			return expected.cast( candidate );
+		}
+		else {
+			final var target = getTargetClass( expected, candidate );
+			return target == null ? null : instantiate( expected, target );
 
-		if ( expected.isInstance( candidate ) ) {
-			return (T) candidate;
 		}
+	}
+
+	private static <T> @Nullable T instantiate(Class<T> expected, Class<? extends T> target) {
+		try {
+			return target.getDeclaredConstructor().newInstance();
+		}
+		catch (Exception e) {
+			//TODO: should this really be a debug-level
+			//      log instead of a proper error?
+			CORE_LOGGER.debugf( "Unable to instantiate %s class %s",
+					expected.getName(), target.getName() );
+			return null;
+		}
+	}
 
-		Class<T> target;
-		if (candidate instanceof Class) {
-			target = (Class<T>) candidate;
+	private <T> @Nullable Class<? extends T> getTargetClass(Class<T> expected, Object candidate) {
+		if ( candidate instanceof Class<?> candidateClass ) {
+			return candidateClass.asSubclass( expected );
 		}
 		else {
 			try {
-				target = serviceRegistry.requireService( ClassLoaderService.class )
+				return serviceRegistry.requireService( ClassLoaderService.class )
 						.classForName( candidate.toString() );
 			}
-			catch ( ClassLoadingException e ) {
+			catch (ClassLoadingException e) {
+				//TODO: should this really be a debug-level
+				//      log instead of a proper error?
 				CORE_LOGGER.debugf( "Unable to locate %s implementation class %s",
 						expected.getName(), candidate.toString() );
-				target = null;
+				return null;
 			}
 		}
-		if ( target != null ) {
-			try {
-				return target.newInstance();
-			}
-			catch ( Exception e ) {
-				CORE_LOGGER.debugf( "Unable to instantiate %s class %s",
-						expected.getName(), target.getName() );
-			}
-		}
-		return null;
 	}
-
-
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/CommonBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/CommonBuilder.java
index dc9aedb051ec..af93563e3b2c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/creation/CommonBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/CommonBuilder.java
@@ -12,8 +12,10 @@
 import org.hibernate.Session;
 import org.hibernate.SharedSessionContract;
 import org.hibernate.StatelessSession;
+import org.hibernate.cfg.StateManagementSettings;
 
 import java.sql.Connection;
+import java.time.Instant;
 import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
@@ -170,4 +172,30 @@ public interface CommonBuilder {
 	///
 	/// @return `this`, for method chaining
 	CommonBuilder jdbcTimeZone(TimeZone timeZone);
+
+	/**
+	 * Specify the instant for reading
+	 * {@linkplain org.hibernate.annotations.Temporal temporal} entity data.
+	 * Instances of temporal entities retrieved in the session will represent
+	 * the revisions effective at the given instant.
+	 *
+	 * @see org.hibernate.annotations.Temporal
+	 */
+	@Incubating
+	CommonBuilder asOf(Instant instant);
+
+	/**
+	 * Specify the
+	 * {@linkplain StateManagementSettings#TRANSACTION_ID_SUPPLIER
+	 * transaction id} for reading {@linkplain org.hibernate.annotations.Temporal
+	 * temporal} entity data. Instances of temporal entities retrieved in the
+	 * session will represent the revisions effective at the end of the given
+	 * transaction.
+	 * The given value should match the type returned by the configured
+	 * transaction id supplier.
+	 *
+	 * @see org.hibernate.annotations.Temporal
+	 */
+	@Incubating
+	CommonBuilder atTransaction(Object transactionId);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/AbstractCommonBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/AbstractCommonBuilder.java
index 134e25de0c3b..18dc0442ca86 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/AbstractCommonBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/AbstractCommonBuilder.java
@@ -15,6 +15,7 @@
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 
 import java.sql.Connection;
+import java.time.Instant;
 import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
@@ -36,6 +37,7 @@ public abstract class AbstractCommonBuilder<T extends CommonBuilder> implements
 	protected boolean readOnly;
 	protected CacheMode cacheMode;
 	protected TimeZone jdbcTimeZone;
+	protected Object temporalIdentifier;
 
 	public AbstractCommonBuilder(SessionFactoryImplementor factory) {
 		sessionFactory = factory;
@@ -161,4 +163,16 @@ public T jdbcTimeZone(TimeZone timeZone) {
 		jdbcTimeZone = timeZone;
 		return getThis();
 	}
+
+	@Override
+	public T asOf(Instant instant) {
+		this.temporalIdentifier = instant;
+		return getThis();
+	}
+
+	@Override
+	public T atTransaction(Object transactionId) {
+		this.temporalIdentifier = transactionId;
+		return getThis();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java
index 5a23d775850c..dfde5093e26d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionBuilderImpl.java
@@ -138,6 +138,11 @@ public TimeZone getJdbcTimeZone() {
 		return jdbcTimeZone;
 	}
 
+	@Override
+	public Object getTemporalIdentifier() {
+		return temporalIdentifier;
+	}
+
 	@Override
 	public List<SessionEventListener> getCustomSessionEventListeners() {
 		return listeners;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionCreationOptions.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionCreationOptions.java
index b09fede8a06e..bf21484aa16b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionCreationOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionCreationOptions.java
@@ -56,6 +56,8 @@ public interface SessionCreationOptions {
 
 	TimeZone getJdbcTimeZone();
 
+	Object getTemporalIdentifier();
+
 	/**
 	 * @return the full list of SessionEventListener if this was customized,
 	 * or null if this Session is being created with the default list.
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionCreationOptionsAdaptor.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionCreationOptionsAdaptor.java
index 2235305d3053..067fd2562164 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionCreationOptionsAdaptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SessionCreationOptionsAdaptor.java
@@ -150,4 +150,9 @@ public TransactionCompletionCallbacksImplementor getTransactionCompletionCallbac
 	public void registerParentSessionObserver(ParentSessionObserver observer) {
 		registerParentSessionObserver( observer, originalSession );
 	}
+
+	@Override
+	public Object getTemporalIdentifier() {
+		return null;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionBuilderImpl.java
index 8f529e21436e..194442e1a9df 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedSessionBuilderImpl.java
@@ -68,6 +68,7 @@ public SharedSessionBuilderImpl(SharedSessionContractImplementor original) {
 		identifierRollback = original.isIdentifierRollbackEnabled();
 		// good idea to inherit this
 		jdbcTimeZone = original.getJdbcTimeZone();
+		temporalIdentifier = original.getLoadQueryInfluencers().getTemporalIdentifier();
 	}
 
 	protected abstract SessionImplementor createSession();
@@ -81,7 +82,7 @@ protected SharedSessionBuilderImplementor getThis() {
 	// SharedSessionBuilder
 
 	@Override
-	public SessionImplementor openSession() {
+	public SessionImplementor open() {
 		CORE_LOGGER.openingSession( tenantIdentifier );
 		if ( original.getFactory().getSessionFactoryOptions().isMultiTenancyEnabled() ) {
 			if ( shareTransactionContext ) {
@@ -98,6 +99,11 @@ public SessionImplementor openSession() {
 		return createSession();
 	}
 
+	@Override
+	public SessionImplementor openSession() {
+		return open();
+	}
+
 	@Override
 	@Deprecated(forRemoval = true)
 	@SuppressWarnings("removal")
@@ -381,6 +387,11 @@ public TimeZone getJdbcTimeZone() {
 		return jdbcTimeZone;
 	}
 
+	@Override
+	public Object getTemporalIdentifier() {
+		return temporalIdentifier;
+	}
+
 	@Override
 	public List<SessionEventListener> getCustomSessionEventListeners() {
 		return listeners;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedStatelessSessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedStatelessSessionBuilderImpl.java
index 585579dbf1a8..9af5a6c25f93 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedStatelessSessionBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/SharedStatelessSessionBuilderImpl.java
@@ -92,7 +92,7 @@ public SharedStatelessSessionBuilder interceptor() {
 
 	@Override
 	public SharedStatelessSessionBuilder statementInspector() {
-		this.statementInspector = original.getJdbcSessionContext().getStatementInspector();
+		statementInspector = original.getJdbcSessionContext().getStatementInspector();
 		return this;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/StatelessSessionBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/StatelessSessionBuilderImpl.java
index 40fc388ebcfa..66ff4cad73b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/StatelessSessionBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/internal/StatelessSessionBuilderImpl.java
@@ -146,6 +146,11 @@ public TimeZone getJdbcTimeZone() {
 		return jdbcTimeZone;
 	}
 
+	@Override
+	public Object getTemporalIdentifier() {
+		return temporalIdentifier;
+	}
+
 	@Override
 	public List<SessionEventListener> getCustomSessionEventListeners() {
 		return null;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/spi/SessionBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/spi/SessionBuilderImplementor.java
index d9b869a65dca..b0802ee0d051 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/creation/spi/SessionBuilderImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/spi/SessionBuilderImplementor.java
@@ -16,6 +16,7 @@
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 
 import java.sql.Connection;
+import java.time.Instant;
 import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
@@ -99,4 +100,10 @@ public interface SessionBuilderImplementor extends SessionBuilder {
 
 	@Override
 	SessionBuilderImplementor subselectFetchEnabled(boolean subselectFetchEnabled);
+
+	@Override
+	SessionBuilderImplementor asOf(Instant instant);
+
+	@Override
+	SessionBuilderImplementor atTransaction(Object transactionId);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/creation/spi/SharedSessionBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/creation/spi/SharedSessionBuilderImplementor.java
index 9b4529b0b7df..7187e9fd50b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/creation/spi/SharedSessionBuilderImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/creation/spi/SharedSessionBuilderImplementor.java
@@ -15,6 +15,7 @@
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 
 import java.sql.Connection;
+import java.time.Instant;
 import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
@@ -117,4 +118,10 @@ public interface SharedSessionBuilderImplementor extends SharedSessionBuilder, S
 
 	@Override
 	SharedSessionBuilderImplementor subselectFetchEnabled(boolean subselectFetchEnabled);
+
+	@Override
+	SharedSessionBuilderImplementor asOf(Instant instant);
+
+	@Override
+	SharedSessionBuilderImplementor atTransaction(Object transactionId);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractTransactionCompletionProcessQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractTransactionCompletionProcessQueue.java
index a5b706b9c107..ac785e78ceb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractTransactionCompletionProcessQueue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/AbstractTransactionCompletionProcessQueue.java
@@ -18,8 +18,8 @@
  */
 abstract class AbstractTransactionCompletionProcessQueue<T extends CompletionCallback> {
 	SharedSessionContractImplementor session;
-	// Concurrency handling required when transaction completion process is dynamically registered
-	// inside event listener (HHH-7478).
+	// Concurrency handling required when the transaction completion process
+	// is dynamically registered inside an event listener (HHH-7478).
 	ConcurrentLinkedQueue<@NonNull T> processes = new ConcurrentLinkedQueue<>();
 
 	AbstractTransactionCompletionProcessQueue(SharedSessionContractImplementor session) {
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/AfterTransactionCompletionProcessQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/AfterTransactionCompletionProcessQueue.java
index ddcd55f70d84..8a9a3f57024c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/AfterTransactionCompletionProcessQueue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/AfterTransactionCompletionProcessQueue.java
@@ -5,9 +5,8 @@
 package org.hibernate.engine.internal;
 
 import org.hibernate.HibernateException;
-import org.hibernate.action.internal.BulkOperationCleanupAction;
+import org.hibernate.action.internal.BulkOperationCleanupAction.BulkOperationCleanUpAfterTransactionCompletionProcess;
 import org.hibernate.cache.CacheException;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.TransactionCompletionCallbacks.AfterCompletionCallback;
 
@@ -15,6 +14,7 @@
 import java.util.Set;
 
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
+import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_STRING_ARRAY;
 
 /**
  * Encapsulates behavior needed for after transaction processing
@@ -40,57 +40,54 @@ boolean hasActions() {
 	void afterTransactionCompletion(boolean success) {
 		AfterCompletionCallback process;
 		while ( (process = processes.poll()) != null ) {
-			try {
-				process.doAfterTransactionCompletion( success, session );
-			}
-			catch (CacheException ce) {
-				CORE_LOGGER.unableToReleaseCacheLock( ce );
-				// continue loop
-			}
-			catch (Exception e) {
-				throw new HibernateException(
-						"Unable to perform afterTransactionCompletion callback: " + e.getMessage(), e );
-			}
+			callAfterCompletion( success, process );
 		}
+		invalidateCaches();
+	}
 
-		final SessionFactoryImplementor factory = session.getFactory();
-		if ( factory.getSessionFactoryOptions().isQueryCacheEnabled() ) {
-			factory.getCache().getTimestampsCache()
-					.invalidate( querySpacesToInvalidate.toArray( new String[0] ), session );
+	void executePendingBulkOperationCleanUpActions() {
+		if ( performBulkOperationCallbacks() ) {
+			invalidateCaches();
 		}
-		querySpacesToInvalidate.clear();
 	}
 
-	void executePendingBulkOperationCleanUpActions() {
-		AfterCompletionCallback process;
+	private boolean performBulkOperationCallbacks() {
 		boolean hasPendingBulkOperationCleanUpActions = false;
-		while ( ( process = processes.poll() ) != null ) {
-			if ( process instanceof BulkOperationCleanupAction.BulkOperationCleanUpAfterTransactionCompletionProcess ) {
-				try {
-					hasPendingBulkOperationCleanUpActions = true;
-					process.doAfterTransactionCompletion( true, session );
-				}
-				catch (CacheException ce) {
-					CORE_LOGGER.unableToReleaseCacheLock( ce );
-					// continue loop
-				}
-				catch (Exception e) {
-					throw new HibernateException(
-							"Unable to perform afterTransactionCompletion callback: " + e.getMessage(),
-							e
-					);
+		var iterator = processes.iterator();
+		while ( iterator.hasNext() ) {
+			var process = iterator.next();
+			if ( process instanceof BulkOperationCleanUpAfterTransactionCompletionProcess ) {
+				hasPendingBulkOperationCleanUpActions = true;
+				if ( callAfterCompletion( true, process ) ) {
+					iterator.remove();
 				}
 			}
 		}
+		return hasPendingBulkOperationCleanUpActions;
+	}
 
-		if ( hasPendingBulkOperationCleanUpActions ) {
-			if ( session.getFactory().getSessionFactoryOptions().isQueryCacheEnabled() ) {
-				session.getFactory().getCache().getTimestampsCache().invalidate(
-						querySpacesToInvalidate.toArray( new String[0] ),
-						session
-				);
-			}
-			querySpacesToInvalidate.clear();
+	private boolean callAfterCompletion(boolean success, AfterCompletionCallback process) {
+		try {
+			process.doAfterTransactionCompletion( success, session );
+			return true;
+		}
+		catch (CacheException ce) {
+			CORE_LOGGER.unableToReleaseCacheLock( ce );
+			// continue loop
+			return false;
+		}
+		catch (Exception e) {
+			throw new HibernateException(
+					"Unable to perform afterTransactionCompletion callback: " + e.getMessage(), e );
 		}
 	}
+
+	private void invalidateCaches() {
+		final var factory = session.getFactory();
+		if ( factory.getSessionFactoryOptions().isQueryCacheEnabled() ) {
+			factory.getCache().getTimestampsCache().
+					invalidate( querySpacesToInvalidate.toArray( EMPTY_STRING_ARRAY ), session );
+		}
+		querySpacesToInvalidate.clear();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
index d490df522cc4..b646310bc2fd 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java
@@ -322,8 +322,9 @@ private static <T> void cascadeLogicalOneToOneOrphanRemoval(
 				if ( child == null || loadedValue != null && child != loadedValue ) {
 					EntityEntry valueEntry = persistenceContext.getEntry( loadedValue );
 					if ( valueEntry == null && isHibernateProxy( loadedValue ) ) {
-						// un-proxy and re-associate for cascade operation
+						// unproxy and reassociate for cascade operation
 						// useful for @OneToOne defined as FetchType.LAZY
+						//TODO: what should really happen here???
 						loadedValue = persistenceContext.unproxyAndReassociate( loadedValue );
 						valueEntry = persistenceContext.getEntry( loadedValue );
 						// HHH-11965
@@ -565,9 +566,7 @@ private static <T> void cascadeCollectionElements(
 			final T anything,
 			final boolean isCascadeDeleteEnabled) throws HibernateException {
 
-		final boolean reallyDoCascade = style.reallyDoCascade( action )
-				&& child != CollectionType.UNFETCHED_COLLECTION;
-		if ( reallyDoCascade ) {
+		if ( style.reallyDoCascade( action ) ) {
 			final boolean traceEnabled = CORE_LOGGER.isTraceEnabled();
 			if ( traceEnabled ) {
 				CORE_LOGGER.cascadingCollection( action, collectionType.getRole() );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java
index 083168527b00..90d82ba69b8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java
@@ -240,22 +240,14 @@ private static void prepareCollectionForUpdate(
 		if ( loadedPersister != null || currentPersister != null ) {
 			// it is or was referenced _somewhere_
 
-			// if either its role changed, or its key changed
+			// if either its role changed or its key changed
 			final boolean ownerChanged =
 					loadedPersister != currentPersister
 						|| wasKeyChanged( collectionEntry, factory, currentPersister );
 
 			if ( ownerChanged ) {
-				// do a check
-				final boolean orphanDeleteAndRoleChanged =
-						loadedPersister != null && currentPersister != null && loadedPersister.hasOrphanDelete();
-
-				if ( orphanDeleteAndRoleChanged ) {
-					throw new HibernateException(
-							"Don't change the reference to a collection with delete orphan enabled: "
-							+ loadedPersister.getRole()
-					);
-				}
+				// do some checks
+				checkOnChangedOwner( collection, collectionEntry, loadedPersister, currentPersister );
 
 				// do the work
 				if ( currentPersister != null ) {
@@ -278,6 +270,37 @@ else if ( collection.isDirty() ) {
 		}
 	}
 
+	private static void checkOnChangedOwner(PersistentCollection<?> collection, CollectionEntry collectionEntry, CollectionPersister loadedPersister, CollectionPersister currentPersister) {
+		final boolean immutableDereferenced =
+				collectionEntry.isReadOnly()
+				&& loadedPersister != null
+				&& !isOwnerDeletedOrGone( collection );
+		if ( immutableDereferenced ) {
+			throw new HibernateException( "Immutable collection dereferenced by owner: "
+						+ collectionInfoString( loadedPersister.getRole(), collectionEntry.getLoadedKey() ) );
+		}
+
+
+		final boolean orphanDeleteAndRoleChanged =
+				loadedPersister != null
+				&& currentPersister != null
+				&& loadedPersister.hasOrphanDelete();
+		if ( orphanDeleteAndRoleChanged ) {
+			throw new HibernateException(
+					"Collection with orphan orphan delete enabled has modifier owner: "
+					+ collectionInfoString( loadedPersister.getRole(), collectionEntry.getLoadedKey() ) );
+		}
+	}
+
+	private static boolean isOwnerDeletedOrGone(PersistentCollection<?> collection) {
+		final Object owner = collection.getOwner();
+		assert owner != null;
+		final var session = collection.getSession();
+		assert session != null;
+		final var entry = session.getPersistenceContextInternal().getEntry( owner );
+		return entry != null && entry.getStatus().isDeletedOrGone();
+	}
+
 	/**
 	 * Check if the key changed.
 	 * Excludes marking key changed when the loaded key is a {@code DelayedPostInsertIdentifier}.
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
index 535836d0a35e..fcf4decfeff3 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryContext.java
@@ -161,14 +161,13 @@ private static boolean isReferenceCachingEnabled(EntityPersister persister) {
 	private ManagedEntity getAssociatedManagedEntity(Object entity) {
 		if ( isManagedEntity( entity ) ) {
 			final var managedEntity = asManagedEntity( entity );
-			if ( managedEntity.$$_hibernate_getEntityEntry() == null ) {
-				// it is not associated
-				return null;
-			}
 			final var entityEntry =
 					(EntityEntryImpl)
 							managedEntity.$$_hibernate_getEntityEntry();
-
+			if ( entityEntry == null ) {
+				// it is not associated
+				return null;
+			}
 			if ( entityEntry.getPersister().isMutable() ) {
 				return entityEntry.getPersistenceContext() == persistenceContext
 						? managedEntity // it is associated
@@ -449,12 +448,14 @@ public void serialize(ObjectOutputStream oos) throws IOException {
 		var managedEntity = head;
 		while ( managedEntity != null ) {
 			// so we know whether or not to build a ManagedEntityImpl on deserialize
-			oos.writeBoolean( managedEntity == managedEntity.$$_hibernate_getEntityInstance() );
-			oos.writeObject( managedEntity.$$_hibernate_getEntityInstance() );
+			final var instance = managedEntity.$$_hibernate_getEntityInstance();
+			oos.writeBoolean( managedEntity == instance );
+			oos.writeObject( instance );
 			// we need to know which implementation of EntityEntry is being serialized
-			oos.writeInt( managedEntity.$$_hibernate_getEntityEntry().getClass().getName().length() );
-			oos.writeChars( managedEntity.$$_hibernate_getEntityEntry().getClass().getName() );
-			managedEntity.$$_hibernate_getEntityEntry().serialize( oos );
+			final var entry = managedEntity.$$_hibernate_getEntityEntry();
+			oos.writeInt( entry.getClass().getName().length() );
+			oos.writeChars( entry.getClass().getName() );
+			entry.serialize( oos );
 			managedEntity = managedEntity.$$_hibernate_getNextManagedEntity();
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryExtraStateHolder.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryExtraStateHolder.java
index 6a53f3f79b0d..95ba26e31fff 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryExtraStateHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryExtraStateHolder.java
@@ -36,13 +36,13 @@ public void addExtraState(EntityEntryExtraState extraState) {
 		}
 	}
 
-	@Override @SuppressWarnings("unchecked")
+	@Override
 	public <T extends EntityEntryExtraState> T getExtraState(Class<T> extraStateType) {
 		if ( next == null ) {
 			return null;
 		}
-		if ( extraStateType.isAssignableFrom( next.getClass() ) ) {
-			return (T) next;
+		if ( extraStateType.isInstance( next ) ) {
+			return extraStateType.cast( next );
 		}
 		else {
 			return next.getExtraState( extraStateType );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryImpl.java
index f32adf748e9b..0691aadbae32 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryImpl.java
@@ -437,8 +437,9 @@ public boolean isReadOnly() {
 	}
 
 	@Override
-	public void setReadOnly(boolean readOnly, Object entity) {
-		if ( readOnly != isReadOnly() ) {
+	public boolean setReadOnly(boolean readOnly, Object entity) {
+		final boolean changed = readOnly != isReadOnly();
+		if ( changed ) {
 			if ( readOnly ) {
 				setStatus( READ_ONLY );
 				loadedState = null;
@@ -468,6 +469,7 @@ else if ( !persister.isMutable() ) {
 				}
 			}
 		}
+		return changed;
 	}
 
 	@Override
@@ -548,13 +550,13 @@ public void addExtraState(EntityEntryExtraState extraState) {
 		}
 	}
 
-	@Override @SuppressWarnings("unchecked")
+	@Override
 	public <T extends EntityEntryExtraState> T getExtraState(Class<T> extraStateType) {
 		if ( next == null ) {
 			return null;
 		}
-		else if ( extraStateType.isAssignableFrom( next.getClass() ) ) {
-			return (T) next;
+		else if ( extraStateType.isInstance( next ) ) {
+			return extraStateType.cast( next );
 		}
 		else {
 			return next.getExtraState( extraStateType );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java
index bf806dc1e2b8..22ddd82e497f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java
@@ -137,7 +137,7 @@ private Object nullifyCompositeType(Object value, String propertyName, Component
 			}
 			if ( substitute ) {
 				// todo : need to account for entity mode on the CompositeType interface :(
-				compositeType.setPropertyValues( value, subvalues );
+				return compositeType.replacePropertyValues( value, subvalues, session );
 			}
 			return value;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdLogging.java
index f6efdfc2e508..b530a60db8e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdLogging.java
@@ -15,6 +15,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.TRACE;
@@ -36,7 +37,8 @@ public interface NaturalIdLogging extends BasicLogger {
 	NaturalIdLogging NATURAL_ID_LOGGER = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			NaturalIdLogging.class,
-			LOGGER_NAME
+			LOGGER_NAME,
+			Locale.ROOT
 	);
 
 	@LogMessage(level = TRACE)
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java
index 16be10ec9430..d6ead424401d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java
@@ -5,6 +5,7 @@
 package org.hibernate.engine.internal;
 
 import org.hibernate.AssertionFailure;
+import org.hibernate.CacheMode;
 import org.hibernate.cache.spi.access.NaturalIdDataAccess;
 import org.hibernate.cache.spi.access.SoftLock;
 import org.hibernate.engine.spi.CachedNaturalIdValueSource;
@@ -31,7 +32,7 @@
 import static org.hibernate.engine.internal.CacheHelper.fromSharedCache;
 import static org.hibernate.engine.internal.NaturalIdLogging.NATURAL_ID_LOGGER;
 
-class NaturalIdResolutionsImpl implements NaturalIdResolutions, Serializable {
+public class NaturalIdResolutionsImpl implements NaturalIdResolutions, Serializable {
 
 	private final StatefulPersistenceContext persistenceContext;
 	private final ConcurrentHashMap<EntityMappingType, EntityResolutions> resolutionsByEntity = new ConcurrentHashMap<>();
@@ -54,6 +55,14 @@ private SharedSessionContractImplementor session() {
 		return persistenceContext.getSession();
 	}
 
+	public EntityResolutions getEntityResolutions(EntityMappingType entityMappingType) {
+		return resolutionsByEntity.get( entityMappingType );
+	}
+
+	public EntityResolutions getEntityResolutions(Class<?> entityType) {
+		return getEntityResolutions( session().getFactory().getMappingMetamodel().getEntityDescriptor( entityType ) );
+	}
+
 	@Override
 	public boolean cacheResolution(Object id, Object naturalId, EntityMappingType entityDescriptor) {
 		validateNaturalId( entityDescriptor, naturalId );
@@ -407,12 +416,15 @@ private void cacheFromLoad(
 		final var session = session();
 		// prevent identical re-caching
 		if ( fromSharedCache( session, cacheKey, persister, cacheAccess ) == null ) {
+			final boolean minimalPutsEnabled =
+					session.getFactory().getSessionFactoryOptions().isMinimalPutsEnabled()
+							&& session.getCacheMode() != CacheMode.REFRESH;
 			final var statistics = session.getFactory().getStatistics();
 			final var eventMonitor = session.getEventMonitor();
 			boolean put = false;
 			final var cachePutEvent = eventMonitor.beginCachePutEvent();
 			try {
-				put = cacheAccess.putFromLoad( session, cacheKey, id, null );
+				put = cacheAccess.putFromLoad( session, cacheKey, id, null, minimalPutsEnabled );
 				if ( put && statistics.isStatisticsEnabled() ) {
 					statistics.naturalIdCachePut(
 							rootEntityDescriptor.getNavigableRole(),
@@ -709,7 +721,7 @@ public void clear() {
 	/**
 	 * Represents the entity-specific cross-reference cache.
 	 */
-	private static class EntityResolutions implements Serializable {
+	public static class EntityResolutions implements Serializable {
 		private final PersistenceContext persistenceContext;
 
 		private final EntityMappingType entityDescriptor;
@@ -732,6 +744,25 @@ public EntityPersister getPersister() {
 			return getEntityDescriptor().getEntityPersister();
 		}
 
+		/**
+		 * Used for testing.
+		 */
+		public Resolution getResolutionByPk(Object pk) {
+			return pkToNaturalIdMap.get( pk );
+		}
+
+		/**
+		 * Used for testing.
+		 */
+		public Object getIdResolutionByNaturalId(Object naturalId) {
+			for ( var entry : pkToNaturalIdMap.entrySet() ) {
+				if ( entry.getValue().getNaturalIdValue().equals( naturalId ) ) {
+					return entry.getKey();
+				}
+			}
+			return null;
+		}
+
 		public boolean sameAsCached(Object pk, Object naturalIdValues) {
 			if ( pk == null ) {
 				return false;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/PersistenceContextLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/PersistenceContextLogging.java
index d10fd1fedd73..a5dba6d7528c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/PersistenceContextLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/PersistenceContextLogging.java
@@ -15,6 +15,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.TRACE;
@@ -33,7 +34,7 @@
 public interface PersistenceContextLogging extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".persistenceContext";
 
-	PersistenceContextLogging PERSISTENCE_CONTEXT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), PersistenceContextLogging.class, NAME );
+	PersistenceContextLogging PERSISTENCE_CONTEXT_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), PersistenceContextLogging.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = TRACE)
 	@Message("Setting proxy identifier: %s")
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ProxyUtil.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ProxyUtil.java
new file mode 100644
index 000000000000..8704e10a3c87
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ProxyUtil.java
@@ -0,0 +1,107 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.engine.internal;
+
+import org.hibernate.DetachedObjectException;
+import org.hibernate.PersistentObjectException;
+import org.hibernate.bytecode.enhance.spi.interceptor.BytecodeLazyAttributeInterceptor;
+import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+
+import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
+import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
+
+/**
+ * @author Gavin King
+ * @since 7.2
+ */
+public class ProxyUtil {
+
+	/**
+	 * Get the entity instance underlying the given proxy, throwing
+	 * an exception if the proxy is uninitialized. If the given
+	 * object is not a proxy, simply return the argument.
+	 */
+	public static Object assertInitialized(Object maybeProxy) {
+		final var lazyInitializer = extractLazyInitializer( maybeProxy );
+		if ( lazyInitializer != null ) {
+			if ( lazyInitializer.isUninitialized() ) {
+				throw new PersistentObjectException( "Object was an uninitialized proxy for "
+													+ lazyInitializer.getEntityName() );
+			}
+			//unwrap the object and return
+			return lazyInitializer.getImplementation();
+		}
+		else {
+			return maybeProxy;
+		}
+	}
+
+	/**
+	 * Get the entity instance underlying the given proxy, forcing
+	 * initialization if the proxy is uninitialized. If the given
+	 * object is not a proxy, simply return the argument.
+	 * @throws DetachedObjectException if the given proxy does not
+	 *         belong to the given session
+	 */
+	public static Object forceInitialize(Object maybeProxy, SharedSessionContractImplementor session) {
+		final var lazyInitializer = extractLazyInitializer( maybeProxy );
+		if ( lazyInitializer != null ) {
+			if ( lazyInitializer.getSession() != session ) {
+				throw new DetachedObjectException( "Given proxy does not belong to this persistence context" );
+			}
+			//initialize + unwrap the object and return it
+			return lazyInitializer.getImplementation();
+		}
+		else if ( isPersistentAttributeInterceptable( maybeProxy ) ) {
+			final var interceptor =
+					asPersistentAttributeInterceptable( maybeProxy )
+							.$$_hibernate_getInterceptor();
+			if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor lazinessInterceptor ) {
+				if ( lazinessInterceptor.getLinkedSession() != session ) {
+					throw new DetachedObjectException( "Given proxy does not belong to this persistence context" );
+				}
+				lazinessInterceptor.forceInitialize( maybeProxy, null );
+			}
+			return maybeProxy;
+		}
+		else {
+			return maybeProxy;
+		}
+	}
+
+	/**
+	 * Determine of the given proxy is uninitialized. If the given
+	 * object is not a proxy, simply return false.
+	 * @throws DetachedObjectException if the given proxy does not
+	 *         belong to the given session
+	 */
+	public static boolean isUninitialized(Object value, SharedSessionContractImplementor session) {
+		// could be a proxy
+		final var lazyInitializer = extractLazyInitializer( value );
+		if ( lazyInitializer != null ) {
+			if ( lazyInitializer.getSession() != session ) {
+				throw new DetachedObjectException( "Given proxy does not belong to this persistence context" );
+			}
+			return lazyInitializer.isUninitialized();
+		}
+		// or an uninitialized enhanced entity ("bytecode proxy")
+		else if ( isPersistentAttributeInterceptable( value ) ) {
+			final var interceptor =
+					(BytecodeLazyAttributeInterceptor)
+							asPersistentAttributeInterceptable( value )
+									.$$_hibernate_getInterceptor();
+			if ( interceptor != null && interceptor.getLinkedSession() != session ) {
+				throw new DetachedObjectException( "Given proxy does not belong to this persistence context" );
+			}
+			return interceptor instanceof EnhancementAsProxyLazinessInterceptor enhancementInterceptor
+				&& !enhancementInterceptor.isInitialized();
+		}
+		else {
+			return false;
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionMetricsLogger.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionMetricsLogger.java
index 1bc782582807..7cbf0f358d45 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionMetricsLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/SessionMetricsLogger.java
@@ -12,6 +12,7 @@
 import org.jboss.logging.annotations.MessageLogger;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 
@@ -23,7 +24,7 @@
 public interface SessionMetricsLogger extends BasicLogger {
 	String LOGGER_NAME = "org.hibernate.session.metrics";
 
-	SessionMetricsLogger SESSION_METRICS_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionMetricsLogger.class, LOGGER_NAME );
+	SessionMetricsLogger SESSION_METRICS_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionMetricsLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage(level = DEBUG)
 	@Message(
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
index 1470d7afd928..ee74c85bb8e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
@@ -8,6 +8,7 @@
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,7 +29,6 @@
 import org.hibernate.LockMode;
 import org.hibernate.MappingException;
 import org.hibernate.NonUniqueObjectException;
-import org.hibernate.PersistentObjectException;
 import org.hibernate.bytecode.enhance.spi.interceptor.BytecodeLazyAttributeInterceptor;
 import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
 import org.hibernate.collection.spi.PersistentCollection;
@@ -52,7 +52,6 @@
 import org.hibernate.internal.util.collections.InstanceIdentityMap;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.pretty.MessageHelper;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.sql.exec.spi.Callback;
@@ -72,6 +71,7 @@
 import static org.hibernate.engine.internal.PersistenceContextLogging.PERSISTENCE_CONTEXT_LOGGER;
 import static org.hibernate.internal.util.collections.CollectionHelper.mapOfSize;
 import static org.hibernate.internal.util.collections.CollectionHelper.setOfSize;
+import static org.hibernate.pretty.MessageHelper.infoString;
 import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 
 /**
@@ -87,22 +87,32 @@
  */
 class StatefulPersistenceContext implements PersistenceContext {
 
+	/**
+	 * Marker object used to indicate (via reference checking) that no row was returned.
+	 */
+	private static final Serializable NO_ROW = new Serializable() {
+		@Override
+		public String toString() {
+			return "NO_ROW";
+		}
+
+		@Serial
+		public Object readResolve() {
+			return NO_ROW;
+		}
+	};
+
 	private static final int INIT_COLL_SIZE = 8;
 
-	/*
-		Eagerly Initialized Fields
-		the following fields are used in all circumstances, and are not worth (or not suited) to being converted into lazy
-	 */
+	// Eagerly initialized fields. The following fields are used in every circumstance
+	// and are not worth (or not suited) to being converted to lazy initialization.
+
 	private final SharedSessionContractImplementor session;
 	private EntityEntryContext entityEntryContext;
 
-	/*
-		Everything else below should be carefully initialized only on first need;
-		this optimisation is very effective as null checks are free, while allocation costs
-		are very often the dominating cost of an application using ORM.
-		This is not general advice, but it's worth the added maintenance burden in this case
-		as this is a very central component of our library.
-	 */
+	// Everything else below should be carefully initialized only on first need.
+	// This optimization is very effective as null checks are free, while allocation
+	// costs are very often the dominating cost of an application using ORM.
 
 	// Loaded entity instances, by EntityKey
 	private HashMap<EntityKey, EntityHolderImpl> entitiesByKey;
@@ -113,8 +123,7 @@ the following fields are used in all circumstances, and are not worth (or not su
 	// Loaded entity instances, by EntityUniqueKey
 	private HashMap<EntityUniqueKey, Object> entitiesByUniqueKey;
 
-
-	// Snapshots of current database state for entities
+	// Snapshots of the current database state for entities
 	// that have *not* been loaded
 	private HashMap<EntityKey, Object> entitySnapshotsByKey;
 
@@ -136,7 +145,7 @@ the following fields are used in all circumstances, and are not worth (or not su
 	// Set of EntityKeys of deleted unloaded proxies
 	private HashSet<EntityKey> deletedUnloadedEntityKeys;
 
-	// properties that we have tried to load, and not found in the database
+	// properties that we have tried to load and not found in the database
 	private HashSet<AssociationKey> nullAssociations;
 
 	// A list of collection wrappers that were instantiating during result set
@@ -209,14 +218,6 @@ public boolean hasLoadContext() {
 		return loadContexts != null;
 	}
 
-//	@Override
-//	public void addUnownedCollection(CollectionKey key, PersistentCollection collection) {
-//		if ( unownedCollections == null ) {
-//			unownedCollections = CollectionHelper.mapOfSize( INIT_COLL_SIZE );
-//		}
-//		unownedCollections.put( key, collection );
-//	}
-//
 	@Override
 	public PersistentCollection<?> useUnownedCollection(CollectionKey key) {
 		return unownedCollections == null ? null : unownedCollections.remove( key );
@@ -297,10 +298,11 @@ public void setDefaultReadOnly(boolean defaultReadOnly) {
 	@Override
 	public void setEntryStatus(EntityEntry entry, Status status) {
 		entry.setStatus( status );
-		setHasNonReadOnlyEnties( status );
+		setHasNonReadOnlyEntities( status );
+		// TODO: can/should we also set its collections to read-only?
 	}
 
-	private void setHasNonReadOnlyEnties(Status status) {
+	private void setHasNonReadOnlyEntities(Status status) {
 		if ( status==Status.DELETED || status==Status.MANAGED || status==Status.SAVING ) {
 			hasNonReadOnlyEntities = true;
 		}
@@ -376,7 +378,7 @@ public Object[] getCachedDatabaseSnapshot(EntityKey key) {
 		if ( snapshot == NO_ROW ) {
 			throw new IllegalStateException(
 					"persistence context reported no row snapshot for "
-							+ MessageHelper.infoString( key.getEntityName(), key.getIdentifier() )
+							+ infoString( key.getEntityName(), key.getIdentifier() )
 			);
 		}
 		return (Object[]) snapshot;
@@ -656,7 +658,7 @@ public EntityEntry addEntry(
 						this
 				);
 		entityEntryContext.addEntityEntry( entity, entityEntry );
-		setHasNonReadOnlyEnties( status );
+		setHasNonReadOnlyEntities( status );
 		return entityEntry;
 	}
 
@@ -667,7 +669,7 @@ public EntityEntry addReferenceEntry(
 		final var entityEntry = asManagedEntity( entity ).$$_hibernate_getEntityEntry();
 		entityEntry.setStatus( status );
 		entityEntryContext.addEntityEntry( entity, entityEntry );
-		setHasNonReadOnlyEnties( status );
+		setHasNonReadOnlyEntities( status );
 		return entityEntry;
 	}
 
@@ -691,26 +693,35 @@ public boolean containsProxy(Object entity) {
 
 	@Override
 	public boolean reassociateIfUninitializedProxy(Object value) throws MappingException {
-		if ( !Hibernate.isInitialized( value ) ) {
-			// could be a proxy
-			final var lazyInitializer = extractLazyInitializer( value );
-			if ( lazyInitializer != null ) {
+		if ( Hibernate.isInitialized( value ) ) {
+			return false;
+		}
+		// could be a proxy
+		final var lazyInitializer = extractLazyInitializer( value );
+		if ( lazyInitializer != null ) {
+			final boolean uninitialized = lazyInitializer.isUninitialized();
+			if ( uninitialized ) {
 				reassociateProxy( lazyInitializer, asHibernateProxy( value ) );
-				return true;
 			}
-			// or an uninitialized enhanced entity ("bytecode proxy")
-			if ( isPersistentAttributeInterceptable( value ) ) {
-				final var bytecodeProxy = asPersistentAttributeInterceptable( value );
-				final var interceptor =
-						(BytecodeLazyAttributeInterceptor)
-								bytecodeProxy.$$_hibernate_getInterceptor();
-				if ( interceptor != null ) {
-					interceptor.setSession( getSession() );
-				}
-				return true;
+			return uninitialized;
+		}
+		// or an uninitialized enhanced entity ("bytecode proxy")
+		else if ( isPersistentAttributeInterceptable( value ) ) {
+			final var interceptor =
+					(BytecodeLazyAttributeInterceptor)
+							asPersistentAttributeInterceptable( value )
+									.$$_hibernate_getInterceptor();
+			final boolean uninitialized =
+					interceptor instanceof EnhancementAsProxyLazinessInterceptor enhancementInterceptor
+							&& !enhancementInterceptor.isInitialized();
+			if ( uninitialized ) {
+				interceptor.setSession( getSession() );
 			}
+			return uninitialized;
+		}
+		else {
+			return false;
 		}
-		return false;
 	}
 
 	@Override
@@ -750,22 +761,6 @@ private void reassociateProxy(LazyInitializer li, HibernateProxy proxy) {
 		}
 	}
 
-	@Override
-	public Object unproxy(Object maybeProxy) throws HibernateException {
-		final var lazyInitializer = extractLazyInitializer( maybeProxy );
-		if ( lazyInitializer != null ) {
-			if ( lazyInitializer.isUninitialized() ) {
-				throw new PersistentObjectException( "object was an uninitialized proxy for "
-														+ lazyInitializer.getEntityName() );
-			}
-			//unwrap the object and return
-			return lazyInitializer.getImplementation();
-		}
-		else {
-			return maybeProxy;
-		}
-	}
-
 	@Override
 	public Object unproxyAndReassociate(final Object maybeProxy) throws HibernateException {
 		final var lazyInitializer = extractLazyInitializer( maybeProxy );
@@ -935,7 +930,7 @@ else if ( ownerPersister.isInstance( key ) ) {
 				}
 				else {
 					//		b) try by EntityKey, which means we need to resolve owner-key -> collection-key
-					//			IMPL NOTE : yes if we get here this impl is very non-performant, but PersistenceContext
+					//			IMPL NOTE: yes if we get here this impl is very non-performant, but PersistenceContext
 					//					was never designed to handle this case; adding that capability for real means splitting
 					//					the notions of:
 					//						1) collection key
@@ -999,8 +994,12 @@ private Object getLoadedCollectionOwnerIdOrNull(CollectionEntry collectionEntry)
 	}
 
 	@Override
-	public void addUninitializedCollection(CollectionPersister persister, PersistentCollection<?> collection, Object id) {
-		final var collectionEntry = new CollectionEntry( collection, persister, id, flushing );
+	public void addUninitializedCollection(
+			CollectionPersister persister,
+			PersistentCollection<?> collection,
+			Object id,
+			boolean readOnly) {
+		final var collectionEntry = new CollectionEntry( collection, persister, id, flushing, readOnly );
 		addCollection( collection, collectionEntry, id );
 		if ( session.getLoadQueryInfluencers().effectivelyBatchLoadable( persister ) ) {
 			getBatchFetchQueue().addBatchLoadableCollection( collection, collectionEntry );
@@ -1038,6 +1037,7 @@ public void replaceCollection(CollectionPersister persister, PersistentCollectio
 						? new CollectionEntry( collection, session.getFactory() )
 						// A newly wrapped collection
 						: new CollectionEntry( persister, collection );
+		entry.setReadOnly( oldEntry.isReadOnly(), collection );
 		putCollectionEntry( collection, entry );
 		final Object key = collection.getKey();
 		if ( key != null ) {
@@ -1102,9 +1102,13 @@ public void addInitializedDetachedCollection(CollectionPersister collectionPersi
 	}
 
 	@Override
-	public CollectionEntry addInitializedCollection(CollectionPersister persister, PersistentCollection<?> collection, Object id)
+	public CollectionEntry addInitializedCollection(
+			CollectionPersister persister,
+			PersistentCollection<?> collection,
+			Object id,
+			boolean readOnly)
 			throws HibernateException {
-		final var collectionEntry = new CollectionEntry( collection, persister, id, flushing );
+		final var collectionEntry = new CollectionEntry( collection, persister, id, flushing, readOnly );
 		collectionEntry.postInitialize( collection, session );
 		addCollection( collection, collectionEntry, id );
 		return collectionEntry;
@@ -1228,14 +1232,6 @@ public Object removeProxy(EntityKey key) {
 		return removeProxyByKey( key );
 	}
 
-//	@Override
-//	public HashSet getNullifiableEntityKeys() {
-//		if ( nullifiableEntityKeys == null ) {
-//			nullifiableEntityKeys = new HashSet<>();
-//		}
-//		return nullifiableEntityKeys;
-//	}
-
 	/**
 	 * @deprecated this will be removed: it provides too wide access, making it hard to optimise the internals
 	 * for specific access needs. Consider using #iterateEntities instead.
@@ -1727,8 +1723,19 @@ private void setEntityReadOnly(Object entity, boolean readOnly) {
 		if ( entry == null ) {
 			throw new IllegalArgumentException( "Given entity is not associated with the persistence context" );
 		}
-		entry.setReadOnly( readOnly, entity );
-		hasNonReadOnlyEntities = hasNonReadOnlyEntities || ! readOnly;
+		if ( entry.setReadOnly( readOnly, entity ) ) {
+			hasNonReadOnlyEntities = hasNonReadOnlyEntities || !readOnly;
+			if ( collectionEntries != null && entry.getPersister().hasCollections() ) {
+				forEachCollectionEntry(
+						(collection, collectionEntry) -> {
+							if ( collection.getOwner() == entity ) {
+								collectionEntry.setReadOnly( readOnly, collection );
+							}
+						},
+						false
+				);
+			}
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/VersionLogger.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/VersionLogger.java
index 950767dcf29c..49dfa605b707 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/internal/VersionLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/VersionLogger.java
@@ -14,6 +14,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.TRACE;
 
@@ -26,7 +27,7 @@
 @Internal
 public interface VersionLogger extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".versioning";
-	VersionLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), VersionLogger.class, LOGGER_NAME );
+	VersionLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), VersionLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage(level = TRACE)
 	@Message(value = "Seeding version: %s", id = 160001)
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java
index 5c69484fa99f..f9d131bf138b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcLogging.java
@@ -18,6 +18,7 @@
 
 import java.lang.invoke.MethodHandles;
 import java.sql.SQLException;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -39,7 +40,7 @@
 public interface JdbcLogging extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".jdbc";
 
-	JdbcLogging JDBC_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcLogging.class, NAME );
+	JdbcLogging JDBC_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcLogging.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = WARN)
 	@Message(
@@ -76,6 +77,10 @@ public interface JdbcLogging extends BasicLogger {
 	@Message(value = "Closing unreleased batch in JdbcCoordinator @%s", id = 100008)
 	void closingUnreleasedBatch(int hashCode);
 
+	@LogMessage(level = DEBUG)
+	@Message(value = "Skipping aggressive release in AFTER_STATEMENT mode (%s)", id = 100010)
+	void skippingAggressiveRelease(String reason);
+
 	@LogMessage(level = DEBUG)
 	@Message(value = """
 			Database:
@@ -192,4 +197,9 @@ public interface JdbcLogging extends BasicLogger {
 	@LogMessage(level = TRACE)
 	@Message(value =  "AutoCommit was initially %s", id = 100047)
 	void initialAutoCommit(boolean wasInitiallyAutoCommit);
+
+
+	@LogMessage(level = TRACE)
+	@Message(value = "ResultSet statement was not registered (on register)", id = 100048)
+	void resultSetStatementWasNotRegistered();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java
index 1a693908d5fb..86c5adfca3f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/JdbcBatchLogging.java
@@ -15,6 +15,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.TRACE;
@@ -35,7 +36,7 @@
 public interface JdbcBatchLogging extends BasicLogger {
 	String NAME = "org.hibernate.orm.jdbc.batch";
 
-	JdbcBatchLogging BATCH_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcBatchLogging.class, NAME );
+	JdbcBatchLogging BATCH_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JdbcBatchLogging.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = INFO)
 	@Message(id=100501, value = "Automatic JDBC statement batching enabled (maximum batch size %s)")
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java
index bb6ce470199a..0665e0386ebb 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java
@@ -17,6 +17,7 @@
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
 import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
 
@@ -38,6 +39,7 @@ public class BatchImpl implements Batch {
 	private final JdbcCoordinator jdbcCoordinator;
 	private final SqlStatementLogger sqlStatementLogger;
 	private final SqlExceptionHelper sqlExceptionHelper;
+	private final JdbcServices jdbcServices;
 
 	private final LinkedHashSet<BatchObserver> observers = new LinkedHashSet<>();
 
@@ -58,7 +60,7 @@ public BatchImpl(
 		this.jdbcCoordinator = jdbcCoordinator;
 		this.statementGroup = statementGroup;
 
-		final var jdbcServices =
+		this.jdbcServices =
 				jdbcCoordinator.getJdbcSessionOwner().getJdbcSessionContext().getJdbcServices();
 		sqlStatementLogger = jdbcServices.getSqlStatementLogger();
 		sqlExceptionHelper = jdbcServices.getSqlExceptionHelper();
@@ -255,6 +257,10 @@ protected void performExecution() {
 								eventHandler.jdbcExecuteBatchStart();
 								rowCounts = statement.executeBatch();
 							}
+							catch (SQLException sqle) {
+								jdbcCoordinator.afterFailedStatementExecution( sqle );
+								throw sqle;
+							}
 							finally {
 								eventMonitor.completeJdbcBatchExecutionEvent( executionEvent, sql );
 								eventHandler.jdbcExecuteBatchEnd();
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java
index e39abf7d9278..ef0112e9ada2 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java
@@ -116,9 +116,7 @@ private static Class<? extends ConnectionProvider> connectionProviderClass(Class
 			throw new ConnectionProviderConfigurationException( "Class '" + providerClass.getName()
 																+ "' does not implement 'ConnectionProvider'" );
 		}
-		@SuppressWarnings("unchecked") // Safe, we just checked
-		final var connectionProviderClass = (Class<? extends ConnectionProvider>) providerClass;
-		return connectionProviderClass;
+		return providerClass.asSubclass( ConnectionProvider.class );
 	}
 
 	private ConnectionProvider instantiateNamedConnectionProvider(
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderLogging.java
index b67f5059f27f..b09ce1a11dae 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderLogging.java
@@ -12,6 +12,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.WARN;
@@ -29,7 +30,7 @@
 @ValidIdRange(min = 102001, max = 102100)
 interface ConnectionProviderLogging {
 	String NAME = SubSystemLogging.BASE + ".connection";
-	ConnectionProviderLogging CONNECTION_PROVIDER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ConnectionProviderLogging.class, NAME );
+	ConnectionProviderLogging CONNECTION_PROVIDER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ConnectionProviderLogging.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = WARN)
 	@Message(id = 102001,
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DataSourceConnectionProvider.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DataSourceConnectionProvider.java
index 5fb8e27e552e..960835f54d92 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DataSourceConnectionProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DataSourceConnectionProvider.java
@@ -23,8 +23,10 @@
 import org.hibernate.service.spi.Stoppable;
 
 import static org.hibernate.cfg.JdbcSettings.DATASOURCE;
+import static org.hibernate.cfg.JdbcSettings.LOGIN_TIMEOUT;
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
 import static org.hibernate.internal.log.ConnectionInfoLogger.CONNECTION_INFO_LOGGER;
+import static org.hibernate.internal.util.config.ConfigurationHelper.getInteger;
 
 /**
  * A {@link ConnectionProvider} that manages connections from an underlying {@link DataSource}.
@@ -73,13 +75,12 @@ public boolean isUnwrappableAs(Class<?> unwrapType) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <T> T unwrap(Class<T> unwrapType) {
 		if ( unwrapType.isAssignableFrom( DataSourceConnectionProvider.class ) ) {
-			return (T) this;
+			return unwrapType.cast( this );
 		}
 		else if ( unwrapType.isAssignableFrom( DataSource.class) ) {
-			return (T) getDataSource();
+			return unwrapType.cast( getDataSource() );
 		}
 		else {
 			throw new UnknownUnwrapTypeException( unwrapType );
@@ -109,6 +110,16 @@ else if ( dataSourceSetting instanceof String jndiName ) {
 			throw new ConnectionProviderConfigurationException( "Unable to determine appropriate DataSource to use" );
 		}
 
+		final Integer loginTimeout = getInteger( LOGIN_TIMEOUT, configuration );
+		if ( loginTimeout != null ) {
+			try {
+				dataSource.setLoginTimeout( loginTimeout );
+			}
+			catch (SQLException e) {
+				CONNECTION_INFO_LOGGER.couldNotSetLoginTimeout( e );
+			}
+		}
+
 		if ( configuration.containsKey( JdbcSettings.AUTOCOMMIT ) ) {
 			CONNECTION_INFO_LOGGER.ignoredSetting( JdbcSettings.AUTOCOMMIT,
 					DataSourceConnectionProvider.class );
@@ -138,6 +149,14 @@ public Connection getConnection() throws SQLException {
 		return useCredentials ? dataSource.getConnection( user, pass ) : dataSource.getConnection();
 	}
 
+	@Override
+	public Connection getConnection(String user, String password) throws SQLException {
+		if ( !available ) {
+			throw new HibernateException( "Provider is closed" );
+		}
+		return dataSource.getConnection( user, password );
+	}
+
 	@Override
 	public void closeConnection(Connection connection) throws SQLException {
 		connection.close();
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
index 5595eb0b0ebf..48b26ca3d325 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
@@ -8,5 +8,5 @@
  * @deprecated Use {@link DataSourceConnectionProvider}
  */
 @Deprecated(since = "7.1", forRemoval = true)
-public class DatasourceConnectionProviderImpl extends DriverManagerConnectionProvider {
+public class DatasourceConnectionProviderImpl extends DataSourceConnectionProvider {
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProvider.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProvider.java
index 3013dd5054d0..84867629bded 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProvider.java
@@ -9,7 +9,6 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Map;
-import java.util.Properties;
 
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.dialect.Database;
@@ -30,6 +29,7 @@
 import static org.hibernate.cfg.JdbcSettings.AUTOCOMMIT;
 import static org.hibernate.cfg.JdbcSettings.DRIVER;
 import static org.hibernate.cfg.JdbcSettings.JAKARTA_JDBC_URL;
+import static org.hibernate.cfg.JdbcSettings.LOGIN_TIMEOUT;
 import static org.hibernate.cfg.JdbcSettings.POOL_SIZE;
 import static org.hibernate.cfg.JdbcSettings.URL;
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.extractIsolation;
@@ -45,6 +45,7 @@
 import static org.hibernate.internal.log.ConnectionInfoLogger.CONNECTION_INFO_LOGGER;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getInt;
+import static org.hibernate.internal.util.config.ConfigurationHelper.getInteger;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getLong;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getString;
 
@@ -83,7 +84,7 @@ public void injectServices(ServiceRegistryImplementor serviceRegistry) {
 	@Override
 	public void configure(Map<String, Object> configurationValues) {
 		CONNECTION_INFO_LOGGER.usingHibernateBuiltInConnectionPool();
-		final PooledConnections pool = buildPool( configurationValues, serviceRegistry );
+		final var pool = buildPool( configurationValues, serviceRegistry );
 		final long validationInterval = getLong( VALIDATION_INTERVAL, configurationValues, 30 );
 		state = new PoolState( pool, validationInterval );
 	}
@@ -92,17 +93,22 @@ private PooledConnections buildPool(Map<String,Object> configuration, ServiceReg
 		// connection settings
 		final String url = jdbcUrl( configuration );
 		final String driverClassName = getString( DRIVER, configuration );
-		final Properties connectionProps = getConnectionProperties( configuration );
+		final var connectionProps = getConnectionProperties( configuration );
 		final boolean autoCommit = getBoolean( AUTOCOMMIT, configuration );  // default autocommit to false
 		final Integer isolation = extractIsolation( configuration );
 		final String initSql = getString( INIT_SQL, configuration );
+		final Integer loginTimeout = getInteger( LOGIN_TIMEOUT, configuration );
 
 		// pool settings
 		final int minSize = getInt( MIN_SIZE, configuration, 1 );
 		final int maxSize = getInt( POOL_SIZE, configuration, 20 );
 		final int initialSize = getInt( INITIAL_SIZE, configuration, minSize );
 
-		final Driver driver = loadDriver( driverClassName, serviceRegistry, url );
+		if ( loginTimeout!= null ) {
+			DriverManager.setLoginTimeout( loginTimeout );
+		}
+
+		final var driver = loadDriver( driverClassName, serviceRegistry, url );
 		if ( driver == null ) {
 			//we're hoping that the driver is already loaded
 			logAvailableDrivers();
@@ -322,10 +328,9 @@ public boolean isUnwrappableAs(Class<?> unwrapType) {
 	}
 
 	@Override
-	@SuppressWarnings( {"unchecked"})
 	public <T> T unwrap(Class<T> unwrapType) {
 		if ( unwrapType.isAssignableFrom( DriverManagerConnectionProvider.class ) ) {
-			return (T) this;
+			return unwrapType.cast( this );
 		}
 		else {
 			throw new UnknownUnwrapTypeException( unwrapType );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
index f85a9144faac..35c79503eba4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
@@ -25,10 +25,9 @@ public boolean isUnwrappableAs(Class<?> unwrapType) {
 	}
 
 	@Override
-	@SuppressWarnings( {"unchecked"})
 	public <T> T unwrap(Class<T> unwrapType) {
 		if ( unwrapType.isAssignableFrom( UserSuppliedConnectionProviderImpl.class ) ) {
-			return (T) this;
+			return unwrapType.cast( this );
 		}
 		else {
 			throw new UnknownUnwrapTypeException( unwrapType );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
index e14bafb1729b..0649321fd924 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
@@ -52,13 +52,12 @@ public boolean isUnwrappableAs(Class<?> unwrapType) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public <T> T unwrap(Class<T> unwrapType) {
+	public <X> X unwrap(Class<X> unwrapType) {
 		if ( unwrapType.isInstance( this ) ) {
-			return (T) this;
+			return unwrapType.cast( this );
 		}
 		else if ( unwrapType.isAssignableFrom( DataSource.class ) ) {
-			return (T) selectAnyDataSource();
+			return unwrapType.cast( selectAnyDataSource() );
 		}
 		else {
 			throw new UnknownUnwrapTypeException( unwrapType );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
index 6117ea3e59d0..55e98ec0b8d1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
@@ -54,13 +54,12 @@ public boolean isUnwrappableAs(Class<?> unwrapType) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public <T> T unwrap(Class<T> unwrapType) {
+	public <X> X unwrap(Class<X> unwrapType) {
 		if ( unwrapType.isInstance( this ) ) {
-			return (T) this;
+			return unwrapType.cast( this );
 		}
 		else if ( unwrapType.isAssignableFrom( ConnectionProvider.class ) ) {
-			return (T) getAnyConnectionProvider();
+			return unwrapType.cast(  getAnyConnectionProvider() );
 		}
 		else {
 			throw new UnknownUnwrapTypeException( unwrapType );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.java
index 14e7206285e3..169be3759411 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.java
@@ -45,6 +45,27 @@ public interface ConnectionProvider extends Service, Wrapped {
 	 */
 	Connection getConnection() throws SQLException;
 
+	/**
+	 * Obtains a connection for Hibernate use according to the underlying strategy of this provider,
+	 * using the given credentials.
+	 *
+	 * @param user The database user
+	 * @param password The database password
+	 * @return The obtained JDBC connection
+	 *
+	 * @throws SQLException Indicates a problem opening a connection
+	 * @throws org.hibernate.HibernateException Indicates a problem obtaining a connection.
+	 *
+	 * @since 7.3
+	 */
+	@Incubating
+	default Connection getConnection(String user, String password) throws SQLException {
+		throw new UnsupportedOperationException(
+				"ConnectionProvider does not support contextual credentials: "
+						+ getClass().getTypeName()
+						+ " (use a different ConnectionProvider for credentials-based multitenancy)" );
+	}
+
 	/**
 	 * Obtains a connection to a read-only replica for use according to the underlying
 	 * strategy of this provider.
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java
index ea0d146ea4f8..3e480762c326 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreationLogging.java
@@ -17,6 +17,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 
@@ -34,7 +35,7 @@ public interface LobCreationLogging extends BasicLogger {
 	String NAME = JdbcLogging.NAME + ".lob";
 
 	Logger LOB_LOGGER = Logger.getLogger( NAME );
-	LobCreationLogging LOB_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LobCreationLogging.class, NAME );
+	LobCreationLogging LOB_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LobCreationLogging.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = DEBUG)
 	@Message(value = "Disabling contextual LOB creation as %s is true", id = 10010001)
@@ -53,10 +54,14 @@ public interface LobCreationLogging extends BasicLogger {
 	void nonContextualLobCreationDialect();
 
 	@LogMessage(level = DEBUG)
-	@Message(value = "Disabling contextual LOB creation as createClob() method threw error : %s", id = 10010005)
+	@Message(value = "Disabling contextual LOB creation as createClob() method threw error: %s", id = 10010005)
 	void contextualClobCreationFailed(Throwable t);
 
 	@LogMessage(level = DEBUG)
-	@Message(value = "Disabling contextual NCLOB creation as createNClob() method threw error : %s", id = 10010006)
+	@Message(value = "Disabling contextual NCLOB creation as createNClob() method threw error: %s", id = 10010006)
 	void contextualNClobCreationFailed(Throwable t);
+
+	@LogMessage(level = DEBUG)
+	@Message(value = "Falling back to non-contextual LOB creation", id = 10010007)
+	void fallingBackToNonContextual();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java
index f7e847ee9306..941f819cdd4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java
@@ -15,7 +15,6 @@
 
 import static org.hibernate.engine.jdbc.env.internal.LobCreationHelper.NONE;
 import static org.hibernate.engine.jdbc.env.internal.LobCreationHelper.getSupportedContextualLobTypes;
-import static org.hibernate.engine.jdbc.env.internal.LobCreationLogging.LOB_LOGGER;
 import static org.hibernate.engine.jdbc.env.internal.LobCreationLogging.LOB_MESSAGE_LOGGER;
 
 /**
@@ -79,7 +78,7 @@ else if ( supportedContextualLobTypes.contains( LobTypes.BLOB )
 					: new StandardLobCreator( lobCreationContext, useConnectionToCreateLob );
 		}
 		else {
-			LOB_LOGGER.debug( "Unexpected condition resolving type of LobCreator to use. Falling back to NonContextualLobCreator" );
+			LOB_MESSAGE_LOGGER.fallingBackToNonContextual();
 			return NonContextualLobCreator.INSTANCE;
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java
index f4c683fbfeb0..8ec3dcae03c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java
@@ -89,6 +89,11 @@ public Identifier toIdentifier(String text, boolean quoted) {
 		return normalizeQuoting( Identifier.toIdentifier( text, quoted ) );
 	}
 
+	@Override
+	public Identifier toIdentifier(String text, boolean quoted, boolean isExplicit) {
+		return normalizeQuoting( Identifier.toIdentifier( text, quoted, true, isExplicit ) );
+	}
+
 	@Override
 	public Identifier applyGlobalQuoting(String text) {
 		return Identifier.toIdentifier( text, globallyQuoteIdentifiers && !globallyQuoteIdentifiersSkipColumnDefinitions, false );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java
index 23cbb6c231dc..d5d91969e22f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java
@@ -51,6 +51,21 @@ public interface IdentifierHelper {
 	 */
 	Identifier toIdentifier(String text, boolean quoted);
 
+	/**
+	 * Generate an Identifier instance from its simple name as obtained from mapping
+	 * information.  Additionally, this form takes a boolean indicating whether to
+	 * explicitly quote the Identifier.
+	 * <p>
+	 * Note that Identifiers returned from here may be implicitly quoted based on
+	 * 'globally quoted identifiers' or based on reserved words.
+	 *
+	 * @param text The text form of a name as obtained from mapping information.
+	 * @param quoted Is the identifier to be quoted explicitly.
+	 * @param isExplicit Whether the name is explicitly set
+	 * @return The identifier form of the name.
+	 */
+	Identifier toIdentifier(String text, boolean quoted, boolean isExplicit);
+
 	/**
 	 * Intended only for use in handling quoting requirements for {@code column-definition}
 	 * as defined by {@link jakarta.persistence.Column#columnDefinition()},
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java
index 735e7e9fbb68..fab9ae82b895 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java
@@ -162,6 +162,7 @@ public String perform() {
 					case "into":
 					case "union":
 					case "intersect":
+					case "except":
 					case "offset":
 					case "limit":
 					case "fetch":
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
index 7d70641bfa30..94aa6c24a945 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
@@ -293,10 +293,10 @@ public void afterStatementExecution() {
 		}
 		if ( connectionReleaseMode == AFTER_STATEMENT ) {
 			if ( ! releasesEnabled ) {
-				JDBC_LOGGER.trace( "Skipping aggressive release due to manual disabling" );
+				JDBC_LOGGER.skippingAggressiveRelease( "manually disabled" );
 			}
 			else if ( hasRegisteredResources() ) {
-				JDBC_LOGGER.trace( "Skipping aggressive release due to registered resources" );
+				JDBC_LOGGER.skippingAggressiveRelease( "registered resources" );
 			}
 			else {
 				getLogicalConnection().afterStatement();
@@ -304,6 +304,21 @@ else if ( hasRegisteredResources() ) {
 		}
 	}
 
+	/**
+	 * Notification that a {@link SQLException} has occurred
+	 * while executing a JDBC {@linkplain java.sql.Statement}
+	 * or {@link java.sql.PreparedStatement}. This gives us a
+	 * chance to mark the current transaction as rollback-only
+	 * on those databases where exceptions always cause the
+	 * transaction to be marked for rollback (PostgreSQL).
+	 */
+	@Override
+	public void afterFailedStatementExecution(SQLException sqlException) {
+		if ( jdbcServices.getDialect().causesRollback( sqlException ) ) {
+			getLogicalConnection().markRollbackOnly();
+		}
+	}
+
 	@Override
 	public void afterTransaction() {
 		transactionTimeOutInstant = -1;
@@ -332,6 +347,7 @@ public <T> T coordinateWork(WorkExecutorVisitable<T> work) {
 			return result;
 		}
 		catch ( SQLException e ) {
+			afterFailedStatementExecution( e );
 			throw sqlExceptionHelper().convert( e, "Error executing work" );
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
index e37887a7805c..3589efc39798 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
@@ -55,12 +55,13 @@ public ResultSet extract(PreparedStatement statement, String sql) {
 			finally {
 				eventMonitor.completeJdbcPreparedStatementExecutionEvent( executionEvent, sql );
 				jdbcExecuteStatementEnd();
-				endSlowQueryLogging(sql, executeStartNanos);
+				endSlowQueryLogging( sql, executeStartNanos );
 			}
 			postExtract( resultSet, statement );
 			return resultSet;
 		}
 		catch (SQLException e) {
+			jdbcCoordinator.afterFailedStatementExecution( e );
 			throw sqlExceptionHelper.convert( e, "could not extract ResultSet", sql );
 		}
 	}
@@ -106,6 +107,7 @@ public ResultSet extract(Statement statement, String sql) {
 			return resultSet;
 		}
 		catch (SQLException e) {
+			jdbcCoordinator.afterFailedStatementExecution( e );
 			throw sqlExceptionHelper.convert( e, "could not extract ResultSet", sql );
 		}
 	}
@@ -136,6 +138,7 @@ public ResultSet execute(PreparedStatement statement, String sql) {
 			return resultSet;
 		}
 		catch (SQLException e) {
+			jdbcCoordinator.afterFailedStatementExecution( e );
 			throw sqlExceptionHelper.convert( e, "could not execute statement", sql );
 		}
 	}
@@ -166,6 +169,7 @@ public ResultSet execute(Statement statement, String sql) {
 			return resultSet;
 		}
 		catch (SQLException e) {
+			jdbcCoordinator.afterFailedStatementExecution( e );
 			throw sqlExceptionHelper.convert( e, "could not execute statement", sql );
 		}
 	}
@@ -181,6 +185,7 @@ public int executeUpdate(PreparedStatement statement, String sql) {
 			return statement.executeUpdate();
 		}
 		catch (SQLException e) {
+			jdbcCoordinator.afterFailedStatementExecution( e );
 			throw sqlExceptionHelper.convert( e, "could not execute statement", sql );
 		}
 		finally {
@@ -201,6 +206,7 @@ public int executeUpdate(Statement statement, String sql) {
 			return statement.executeUpdate( sql );
 		}
 		catch (SQLException e) {
+			jdbcCoordinator.afterFailedStatementExecution( e );
 			throw sqlExceptionHelper.convert( e, "could not execute statement", sql );
 		}
 		finally {
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java
index b73fc23a67c8..7ed849d6e4bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/AbstractMutationExecutor.java
@@ -17,7 +17,6 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.values.GeneratedValues;
 import org.hibernate.persister.entity.mutation.EntityTableMapping;
-import org.hibernate.sql.model.TableMapping;
 import org.hibernate.sql.model.ValuesAnalysis;
 
 import static org.hibernate.engine.jdbc.mutation.internal.ModelMutationHelper.checkResults;
@@ -63,7 +62,7 @@ public final GeneratedValues execute(
 			OperationResultChecker resultChecker,
 			SharedSessionContractImplementor session,
 			Batch.StaleStateMapper staleStateMapper) {
-		final GeneratedValues generatedValues = performNonBatchedOperations(
+		final var generatedValues = performNonBatchedOperations(
 				modelReference,
 				valuesAnalysis,
 				inclusionChecker,
@@ -112,7 +111,7 @@ protected void performNonBatchedMutation(
 			return;
 		}
 
-		final TableMapping tableDetails = statementDetails.getMutatingTableDetails();
+		final var tableDetails = statementDetails.getMutatingTableDetails();
 		if ( inclusionChecker != null && !inclusionChecker.include( tableDetails ) ) {
 			if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
 				MODEL_MUTATION_LOGGER.skippingSecondaryInsert( tableDetails.getTableName() );
@@ -140,9 +139,10 @@ protected void performNonBatchedMutation(
 		try {
 			valueBindings.beforeStatement( statementDetails );
 
-			final int affectedRowCount = session.getJdbcCoordinator()
-					.getResultSetReturn()
-					.executeUpdate( statementDetails.getStatement(), statementDetails.getSqlString() );
+			final int affectedRowCount =
+					session.getJdbcCoordinator()
+							.getResultSetReturn()
+							.executeUpdate( statementDetails.getStatement(), statementDetails.getSqlString() );
 
 			if ( affectedRowCount == 0 && tableDetails.isOptional() ) {
 				// the optional table did not have a row
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java
index 5aa57b50cae4..eb52c677a0c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/JdbcValueBindingsImpl.java
@@ -53,29 +53,32 @@ public void bindValue(
 			String tableName,
 			String columnName,
 			ParameterUsage usage) {
-		final JdbcValueDescriptor jdbcValueDescriptor = jdbcValueDescriptorAccess.resolveValueDescriptor( tableName, columnName, usage );
+		final var jdbcValueDescriptor =
+				jdbcValueDescriptorAccess.resolveValueDescriptor( tableName, columnName, usage );
 		if ( jdbcValueDescriptor == null ) {
 			throw new UnknownParameterException( mutationType, mutationTarget, tableName, columnName, usage );
 		}
-
-		resolveBindingGroup( jdbcValueDescriptorAccess.resolvePhysicalTableName( tableName ) ).bindValue( columnName, value, jdbcValueDescriptor );
+		resolveBindingGroup( jdbcValueDescriptorAccess.resolvePhysicalTableName( tableName ) )
+				.bindValue( columnName, value, jdbcValueDescriptor );
 	}
 
 	private BindingGroup resolveBindingGroup(String tableName) {
-		final BindingGroup existing = bindingGroupMap.get( tableName );
+		final var existing = bindingGroupMap.get( tableName );
 		if ( existing != null ) {
 			assert tableName.equals( existing.getTableName() );
 			return existing;
 		}
-
-		final BindingGroup created = new BindingGroup( tableName );
-		bindingGroupMap.put( tableName, created );
-		return created;
+		else {
+			final var created = new BindingGroup( tableName );
+			bindingGroupMap.put( tableName, created );
+			return created;
+		}
 	}
 
 	@Override
 	public void beforeStatement(PreparedStatementDetails statementDetails) {
-		final BindingGroup bindingGroup = bindingGroupMap.get( statementDetails.getMutatingTableDetails().getTableName() );
+		final var bindingGroup =
+				bindingGroupMap.get( statementDetails.getMutatingTableDetails().getTableName() );
 		if ( bindingGroup == null ) {
 			statementDetails.resolveStatement();
 		}
@@ -106,12 +109,10 @@ public void beforeStatement(PreparedStatementDetails statementDetails) {
 
 	@Override
 	public void afterStatement(TableMapping mutatingTable) {
-		final BindingGroup bindingGroup = bindingGroupMap.remove( mutatingTable.getTableName() );
-		if ( bindingGroup == null ) {
-			return;
+		final var bindingGroup = bindingGroupMap.remove( mutatingTable.getTableName() );
+		if ( bindingGroup != null ) {
+			bindingGroup.clear();
 		}
-
-		bindingGroup.clear();
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java
index 80bbad199ea1..7f60fc9c37a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/ModelMutationHelper.java
@@ -15,8 +15,6 @@
 import org.hibernate.engine.jdbc.mutation.OperationResultChecker;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.MutationStatementPreparer;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
@@ -24,7 +22,6 @@
 import org.hibernate.sql.model.MutationTarget;
 import org.hibernate.sql.model.MutationType;
 import org.hibernate.sql.model.PreparableMutationOperation;
-import org.hibernate.stat.spi.StatisticsImplementor;
 
 import static org.hibernate.engine.jdbc.mutation.internal.PreparedStatementGroupNone.GROUP_OF_NONE;
 
@@ -63,14 +60,16 @@ public static boolean identifiedResultsCheck(
 					batchPosition,
 					statementDetails.getSqlString()
 			);
+			return true;
 		}
 		catch (StaleStateException e) {
 			if ( !statementDetails.getMutatingTableDetails().isOptional() && affectedRowCount == 0 ) {
-				final StatisticsImplementor statistics = sessionFactory.getStatistics();
+				final String fullPath = mutationTarget.getNavigableRole().getFullPath();
+				final var statistics = sessionFactory.getStatistics();
 				if ( statistics.isStatisticsEnabled() ) {
-					statistics.optimisticFailure( mutationTarget.getNavigableRole().getFullPath() );
+					statistics.optimisticFailure( fullPath );
 				}
-				throw new StaleObjectStateException( mutationTarget.getNavigableRole().getFullPath(), id, e );
+				throw new StaleObjectStateException( fullPath, id, e );
 			}
 			return false;
 		}
@@ -88,8 +87,6 @@ public static boolean identifiedResultsCheck(
 		catch (Throwable t) {
 			return false;
 		}
-
-		return true;
 	}
 
 	public static PreparedStatementGroup toPreparedStatementGroup(
@@ -126,7 +123,7 @@ public static PreparedStatement delegateStatementPreparation(
 			PreparableMutationOperation jdbcMutation,
 			GeneratedValuesMutationDelegate delegate,
 			SharedSessionContractImplementor session) {
-		final PreparedStatement statement = delegate.prepareStatement( jdbcMutation.getSqlString(), session );
+		final var statement = delegate.prepareStatement( jdbcMutation.getSqlString(), session );
 		session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().register( null, statement );
 		return statement;
 	}
@@ -134,9 +131,9 @@ public static PreparedStatement delegateStatementPreparation(
 	public static PreparedStatement standardStatementPreparation(
 			PreparableMutationOperation jdbcMutation,
 			SharedSessionContractImplementor session) {
-		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-		final MutationStatementPreparer statementPreparer = jdbcCoordinator.getMutationStatementPreparer();
-		final PreparedStatement statement = statementPreparer.prepareStatement( jdbcMutation.getSqlString(), jdbcMutation.isCallable() );
+		final var jdbcCoordinator = session.getJdbcCoordinator();
+		final var statementPreparer = jdbcCoordinator.getMutationStatementPreparer();
+		final var statement = statementPreparer.prepareStatement( jdbcMutation.getSqlString(), jdbcMutation.isCallable() );
 		session.getJdbcCoordinator().getLogicalConnection().getResourceRegistry().register( null, statement );
 		return statement;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java
index e4616aaffd2b..fa5c9785eb8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/mutation/internal/PreparedStatementDetailsStandard.java
@@ -10,7 +10,6 @@
 
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementGroup;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.jdbc.Expectation;
@@ -67,7 +66,7 @@ public TableMapping getMutatingTableDetails() {
 	@Override
 	public void releaseStatement(SharedSessionContractImplementor session) {
 		if ( statement != null ) {
-			final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
+			final var jdbcCoordinator = session.getJdbcCoordinator();
 			jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( statement );
 			statement = null;
 			toRelease = false;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java
index 98fae920aa91..348ea19fd811 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java
@@ -9,6 +9,7 @@
 import java.io.Serializable;
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.function.Supplier;
 
@@ -114,12 +115,19 @@ Batch getBatch(
 	void afterTransaction();
 
 	/**
-	 * Used to signify that a statement has completed execution which may
-	 * indicate that this logical connection need to perform an
+	 * Notification that a statement has completed execution, which
+	 * might indicate that the logical connection should perform an
 	 * aggressive release of its physical connection.
 	 */
 	void afterStatementExecution();
 
+	/**
+	 * Notification that execution of a statement has failed, which
+	 * might mean that the database has marked the transaction for
+	 * rollback.
+	 */
+	void afterFailedStatementExecution(SQLException sqlException);
+
 	/**
 	 * Perform the requested work handling exceptions, coordinating and handling return processing.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionLogging.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionLogging.java
index 717a4bfaa2a1..c17f1e62b6e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionLogging.java
@@ -14,6 +14,7 @@
 
 import java.lang.invoke.MethodHandles;
 import java.sql.SQLException;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.WARN;
@@ -30,8 +31,8 @@ public interface SQLExceptionLogging extends BasicLogger {
 	String ERROR_NAME = SubSystemLogging.BASE + ".jdbc.error";
 	String WARN_NAME = SubSystemLogging.BASE + ".jdbc.warn";
 
-	SQLExceptionLogging ERROR_LOG = Logger.getMessageLogger( MethodHandles.lookup(), SQLExceptionLogging.class, ERROR_NAME );
-	SQLExceptionLogging WARNING_LOG = Logger.getMessageLogger( MethodHandles.lookup(), SQLExceptionLogging.class, WARN_NAME );
+	SQLExceptionLogging ERROR_LOG = Logger.getMessageLogger( MethodHandles.lookup(), SQLExceptionLogging.class, ERROR_NAME, Locale.ROOT );
+	SQLExceptionLogging WARNING_LOG = Logger.getMessageLogger( MethodHandles.lookup(), SQLExceptionLogging.class, WARN_NAME, Locale.ROOT );
 
 	@LogMessage(level = WARN)
 	@Message(value = "ErrorCode: %s, SQLState: %s", id = 247)
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java
index e83cfe19c44d..b64e6e129bf8 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java
@@ -10,14 +10,13 @@
 /**
  * Contract for resolving the schema of a {@link Connection}.
  *
- * @apiNote No used.
+ * @apiNote Not used.
  * @deprecated Use {@linkplain org.hibernate.engine.jdbc.env.spi.SchemaNameResolver} instead.
  *
  * @author Steve Ebersole
  */
 @Deprecated(since = "7.0", forRemoval = true)
 public interface SchemaNameResolver {
-	/**
 	/**
 	 * Given a JDBC {@link Connection}, resolve the name of the schema (if one) to which it connects.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilder.java
index ed18b0f97fab..e0cdab723477 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilder.java
@@ -5,6 +5,7 @@
 package org.hibernate.engine.spi;
 
 import java.sql.Connection;
+import java.time.Instant;
 import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
@@ -184,4 +185,16 @@ public SessionBuilderImplementor subselectFetchEnabled(boolean subselectFetchEna
 		delegate.subselectFetchEnabled( subselectFetchEnabled );
 		return this;
 	}
+
+	@Override
+	public SessionBuilderImplementor asOf(Instant instant) {
+		delegate.asOf( instant );
+		return this;
+	}
+
+	@Override
+	public SessionBuilderImplementor atTransaction(Object transactionId) {
+		delegate.atTransaction( transactionId );
+		return this;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java
index 08e8e7cb53ed..7d62cc2a0fa8 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java
@@ -5,6 +5,7 @@
 package org.hibernate.engine.spi;
 
 import java.sql.Connection;
+import java.time.Instant;
 import java.util.TimeZone;
 import java.util.function.UnaryOperator;
 
@@ -46,6 +47,11 @@ public Session openSession() {
 		return delegate.openSession();
 	}
 
+	@Override
+	public Session open() {
+		return delegate.open();
+	}
+
 	@Override
 	public SharedSessionBuilder interceptor() {
 		delegate.interceptor();
@@ -231,4 +237,16 @@ public SharedSessionBuilder subselectFetchEnabled(boolean subselectFetchEnabled)
 		delegate.subselectFetchEnabled( subselectFetchEnabled );
 		return this;
 	}
+
+	@Override
+	public SharedSessionBuilder asOf(Instant instant) {
+		delegate.asOf( instant );
+		return this;
+	}
+
+	@Override
+	public SharedSessionBuilder atTransaction(Object transactionId) {
+		delegate.atTransaction( transactionId );
+		return this;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
index ed1689a7d5ef..2149933e48f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
@@ -100,7 +100,7 @@ public class ActionQueue implements TransactionCompletionCallbacks {
 
 
 	private transient boolean isTransactionCoordinatorShared;
-	private TransactionCompletionCallbacksImplementor transactionCompletionCallbacks;;
+	private TransactionCompletionCallbacksImplementor transactionCompletionCallbacks;
 
 	// Extract this as a constant to perform efficient iterations:
 	// method values() otherwise allocates a new array on each invocation.
@@ -959,7 +959,8 @@ public static ActionQueue deserialize(ObjectInputStream ois, EventSource session
 	 * Scheduling serially means, that there is an order which doesn't violate the FK constraint dependencies.
 	 * The inserts of insert groups which can't be scheduled, are going to be inserted in the original order.
 	 */
-	private static class InsertActionSorter implements ExecutableList.Sorter<AbstractEntityInsertAction> {
+	// Used by Hibernate Reactive
+	public static class InsertActionSorter implements ExecutableList.Sorter<AbstractEntityInsertAction> {
 		/**
 		 * Singleton access
 		 */
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java
index f6981b79b4f3..38b7c78c1689 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java
@@ -17,6 +17,7 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import static java.util.Collections.emptyList;
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 import static org.hibernate.pretty.MessageHelper.collectionInfoString;
@@ -35,6 +36,7 @@ public final class CollectionEntry implements Serializable {
 	private @Nullable Serializable snapshot;
 	// allow the CollectionSnapshot to be serialized
 	private @Nullable String role;
+	private boolean readOnly;
 
 	// "loaded" means the reference that is consistent
 	// with the current database state
@@ -65,11 +67,9 @@ public CollectionEntry(CollectionPersister persister, PersistentCollection<?> co
 		// new collections that get found + wrapped
 		// during flush shouldn't be ignored
 		ignore = false;
-
 		// a newly wrapped collection is NOT dirty
 		// (or we get unnecessary version updates)
 		collection.clearDirty();
-
 		snapshot = persister.isMutable() ? collection.getSnapshot( persister ) : null;
 		role = persister.getRole();
 		collection.setSnapshot( loadedKey, role, snapshot );
@@ -82,18 +82,15 @@ public CollectionEntry(
 			final PersistentCollection<?> collection,
 			final CollectionPersister loadedPersister,
 			final Object loadedKey,
-			final boolean ignore ) {
+			final boolean ignore,
+			final boolean readOnly) {
 		this.ignore = ignore;
-
+		this.readOnly = readOnly;
 		//collection.clearDirty()
-
 		this.loadedKey = loadedKey;
-
 		this.loadedPersister = loadedPersister;
 		this.role = loadedPersister == null ? null : loadedPersister.getRole();
-
 		collection.setSnapshot( loadedKey, role, null );
-
 		//postInitialize() will be called after initialization
 	}
 
@@ -104,12 +101,10 @@ public CollectionEntry(CollectionPersister loadedPersister, Object loadedKey) {
 		// detached collection wrappers that get found + reattached
 		// during flush shouldn't be ignored
 		ignore = false;
-
 		//collection.clearDirty()
-
 		this.loadedKey = loadedKey;
 		this.loadedPersister = loadedPersister;
-		this.role = ( loadedPersister == null ? null : loadedPersister.getRole() );
+		this.role = loadedPersister == null ? null : loadedPersister.getRole();
 	}
 
 	/**
@@ -119,11 +114,11 @@ public CollectionEntry(PersistentCollection<?> collection, SessionFactoryImpleme
 		// detached collections that get found + reattached
 		// during flush shouldn't be ignored
 		ignore = false;
-
 		loadedKey = collection.getKey();
 		role = collection.getRole();
-		loadedPersister = factory.getMappingMetamodel().getCollectionDescriptor( castNonNull( role ) );
-
+		loadedPersister =
+				factory.getMappingMetamodel()
+						.getCollectionDescriptor( castNonNull( role ) );
 		snapshot = collection.getStoredSnapshot();
 	}
 
@@ -137,10 +132,12 @@ private CollectionEntry(
 			@Nullable String role,
 			Serializable snapshot,
 			Object loadedKey,
+			boolean readOnly,
 			@Nullable SessionFactoryImplementor factory) {
 		this.role = role;
 		this.snapshot = snapshot;
 		this.loadedKey = loadedKey;
+		this.readOnly = readOnly;
 		if ( role != null ) {
 			afterDeserialize( factory );
 		}
@@ -151,57 +148,66 @@ private CollectionEntry(
 	 * of the collection elements, if necessary
 	 */
 	private void dirty(PersistentCollection<?> collection) {
-
-		final var loadedPersister = getLoadedPersister();
-		final boolean forceDirty =
-				collection.wasInitialized()
-						&& !collection.isDirty() //optimization
-						&& loadedPersister != null
-						&& loadedPersister.isMutable() //optimization
-						&& ( collection.isDirectlyAccessible() || loadedPersister.getElementType().isMutable() ) //optimization
-						&& !collection.equalsSnapshot( loadedPersister );
-		if ( forceDirty ) {
+		if ( forceDirty( collection ) ) {
 			collection.dirty();
 		}
+	}
 
+	private boolean forceDirty(PersistentCollection<?> collection) {
+		final var loadedPersister = this.loadedPersister;
+		return loadedPersister != null
+			&& collection.wasInitialized()
+			&& !collection.isDirty() //optimization
+			&& isModifiable() //optimization
+			&& isElementMutable( collection, loadedPersister ) //optimization
+			&& !collection.equalsSnapshot( loadedPersister );
+	}
+
+	private static boolean isElementMutable(
+			PersistentCollection<?> collection,
+			CollectionPersister loadedPersister) {
+		return collection.isDirectlyAccessible()
+			|| loadedPersister.getElementType().isMutable();
+	}
+
+	private boolean isModifiable() {
+		return !readOnly
+			&& loadedPersister != null
+			&& loadedPersister.isMutable();
 	}
 
 	public void preFlush(PersistentCollection<?> collection) {
-		if ( loadedKey == null && collection.getKey() != null ) {
+		if ( loadedKey == null ) {
 			loadedKey = collection.getKey();
 		}
 
-		final var loadedPersister = getLoadedPersister();
-		final boolean nonMutableChange =
-				collection.isDirty()
-						&& loadedPersister != null
-						&& !loadedPersister.isMutable();
-		if ( nonMutableChange ) {
+		final var loadedPersister = this.loadedPersister;
+		if ( collection.isDirty()
+				&& loadedPersister != null
+				&& !isModifiable() ) {
 			throw new HibernateException( "Immutable collection was modified: " +
-					collectionInfoString( castNonNull( loadedPersister ).getRole(), getLoadedKey() ) );
+					collectionInfoString( loadedPersister.getRole(), getLoadedKey() ) );
 		}
 
 		dirty( collection );
 
-		if ( CORE_LOGGER.isTraceEnabled() && collection.isDirty() && loadedPersister != null ) {
+		if ( CORE_LOGGER.isTraceEnabled()
+				&& loadedPersister != null
+				&& collection.isDirty() ) {
 			CORE_LOGGER.collectionDirty(
 					collectionInfoString( loadedPersister.getRole(), getLoadedKey() ) );
 		}
 
-		setReached( false );
-		setProcessed( false );
-
-		setDoupdate( false );
-		setDoremove( false );
-		setDorecreate( false );
+		reached = false;
+		processed = false;
+		doupdate = false;
+		doremove = false;
+		dorecreate = false;
 	}
 
 	public void postInitialize(PersistentCollection<?> collection, SharedSessionContractImplementor session) {
-		final var loadedPersister = getLoadedPersister();
-		snapshot =
-				loadedPersister != null && loadedPersister.isMutable()
-						? collection.getSnapshot( loadedPersister )
-						: null;
+		final var loadedPersister = this.loadedPersister;
+		snapshot = loadedPersister != null && isModifiable() ? collection.getSnapshot( loadedPersister ) : null;
 		collection.setSnapshot( loadedKey, role, snapshot );
 		if ( loadedPersister != null
 				&& session.getLoadQueryInfluencers().effectivelyBatchLoadable( loadedPersister ) ) {
@@ -214,13 +220,11 @@ public void postInitialize(PersistentCollection<?> collection, SharedSessionCont
 	 * Called after a successful flush
 	 */
 	public void postFlush(PersistentCollection<?> collection) {
-		if ( isIgnore() ) {
-			ignore = false;
-		}
-		else if ( !isProcessed() ) {
+		if ( !ignore && !processed ) {
 			throw new HibernateException( "Collection '" + collection.getRole() + "' was not processed by flush"
 					+ " (this is likely due to unsafe use of the session, for example, current use in multiple threads, or updates during entity lifecycle callbacks)");
 		}
+		ignore = false;
 		collection.setSnapshot( loadedKey, role, snapshot );
 	}
 
@@ -228,18 +232,16 @@ else if ( !isProcessed() ) {
 	 * Called after execution of an action
 	 */
 	public void afterAction(PersistentCollection<?> collection) {
-		loadedKey = getCurrentKey();
-		setLoadedPersister( getCurrentPersister() );
-
+		loadedKey = currentKey;
+		loadedPersister = currentPersister;
+		role = currentPersister == null ? null : currentPersister.getRole();
 		if ( collection.wasInitialized()
-				&& ( isDoremove() || isDorecreate() || isDoupdate() ) ) {
+				&& ( doremove || dorecreate || doupdate ) ) {
 			// update the snapshot
-			snapshot =
-					loadedPersister != null && loadedPersister.isMutable()
-							? collection.getSnapshot( castNonNull( loadedPersister ) )
-							: null;
+			snapshot = isModifiable()
+					? collection.getSnapshot( castNonNull( loadedPersister ) )
+					: null;
 		}
-
 		collection.postAction();
 	}
 
@@ -255,6 +257,10 @@ public void afterAction(PersistentCollection<?> collection) {
 		return snapshot;
 	}
 
+	public boolean isReadOnly() {
+		return readOnly;
+	}
+
 	private boolean fromMerge;
 
 	/**
@@ -266,7 +272,6 @@ public void afterAction(PersistentCollection<?> collection) {
 	 */
 	public void resetStoredSnapshot(PersistentCollection<?> collection, Serializable storedSnapshot) {
 		CORE_LOGGER.resetStoredSnapshot( storedSnapshot, this );
-
 		if ( !fromMerge ) {
 			snapshot = storedSnapshot;
 			collection.setSnapshot( loadedKey, role, snapshot );
@@ -274,9 +279,23 @@ public void resetStoredSnapshot(PersistentCollection<?> collection, Serializable
 		}
 	}
 
-	private void setLoadedPersister(@Nullable CollectionPersister persister) {
-		loadedPersister = persister;
-		setRole( persister == null ? null : persister.getRole() );
+	public void setReadOnly(boolean readOnly, PersistentCollection<?> collection) {
+		if ( this.readOnly != readOnly ) {
+			this.readOnly = readOnly;
+			if ( readOnly ) {
+				snapshot = null;
+				collection.setSnapshot( loadedKey, role, null );
+			}
+			else {
+				final var loadedPersister = this.loadedPersister;
+				if ( collection.wasInitialized()
+						&& loadedPersister != null
+						&& loadedPersister.isMutable() ) {
+					snapshot = collection.getSnapshot( loadedPersister );
+					collection.setSnapshot( loadedKey, role, snapshot );
+				}
+			}
+		}
 	}
 
 	void afterDeserialize(@Nullable SessionFactoryImplementor factory) {
@@ -286,7 +305,7 @@ void afterDeserialize(@Nullable SessionFactoryImplementor factory) {
 	}
 
 	public boolean wasDereferenced() {
-		return getLoadedKey() == null;
+		return loadedKey == null;
 	}
 
 	public boolean isReached() {
@@ -370,13 +389,13 @@ public void setRole(@Nullable String role) {
 
 	@Override
 	public String toString() {
-		final StringBuilder result =
+		final var result =
 				new StringBuilder( "CollectionEntry" )
 						.append( collectionInfoString( role, loadedKey ) );
-		final CollectionPersister persister = currentPersister;
-		if ( persister != null ) {
+		final var currentPersister = this.currentPersister;
+		if ( currentPersister != null ) {
 			result.append( "->" )
-					.append( collectionInfoString( persister.getRole(), currentKey ) );
+					.append( collectionInfoString( currentPersister.getRole(), currentKey ) );
 		}
 		return result.toString();
 	}
@@ -385,21 +404,24 @@ public String toString() {
 	 * Get the collection orphans (entities which were removed from the collection)
 	 */
 	public Collection<?> getOrphans(String entityName, PersistentCollection<?> collection) {
-		if ( snapshot == null ) {
-			throw new AssertionFailure( "no collection snapshot for orphan delete" );
+		if ( readOnly ) {
+			return emptyList();
+		}
+		else {
+			if ( snapshot == null ) {
+				throw new AssertionFailure( "no collection snapshot for orphan delete" );
+			}
+			return collection.getOrphans( snapshot, entityName );
 		}
-		return collection.getOrphans( snapshot, entityName );
 	}
 
 	public boolean isSnapshotEmpty(PersistentCollection<?> collection) {
 		//TODO: does this really need to be here?
 		//      does the collection already have
 		//      it's own up-to-date snapshot?
-		final var loadedPersister = getLoadedPersister();
-		final Serializable snapshot = getSnapshot();
 		return collection.wasInitialized()
-			&& ( loadedPersister == null || loadedPersister.isMutable() )
-			&& ( snapshot == null || collection.isSnapshotEmpty(snapshot) );
+			&& ( loadedPersister == null || isModifiable() )
+			&& ( snapshot == null || collection.isSnapshotEmpty( snapshot ) );
 	}
 
 
@@ -414,6 +436,7 @@ public void serialize(ObjectOutputStream oos) throws IOException {
 		oos.writeObject( role );
 		oos.writeObject( snapshot );
 		oos.writeObject( loadedKey );
+		oos.writeBoolean( readOnly );
 	}
 
 	/**
@@ -431,6 +454,7 @@ public static CollectionEntry deserialize(ObjectInputStream ois, SessionImplemen
 				(String) ois.readObject(),
 				(Serializable) ois.readObject(),
 				ois.readObject(),
+				ois.readBoolean(),
 				session == null ? null : session.getFactory()
 		);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
index fbd27332f059..5de223af4a40 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
@@ -132,7 +132,7 @@ public interface EntityEntry {
 
 	boolean isReadOnly();
 
-	void setReadOnly(boolean readOnly, Object entity);
+	boolean setReadOnly(boolean readOnly, Object entity);
 
 	/**
 	 * Has a bit set for every attribute position that is potentially lazy.
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java
index d7d41fa8f5d9..2e7277842826 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java
@@ -59,6 +59,7 @@ public class LoadQueryInfluencers implements Serializable {
 	private final EffectiveEntityGraph effectiveEntityGraph;
 
 	private Boolean readOnly;
+	private Object temporalIdentifier;
 
 	public LoadQueryInfluencers(SessionFactoryImplementor sessionFactory) {
 		this.sessionFactory = sessionFactory;
@@ -72,6 +73,7 @@ public LoadQueryInfluencers(SessionFactoryImplementor sessionFactory, SessionCre
 		batchSize = options.getDefaultBatchFetchSize();
 		subselectFetchEnabled = options.isSubselectFetchEnabled();
 		effectiveEntityGraph = new EffectiveEntityGraph();
+		temporalIdentifier = options.getTemporalIdentifier();
 		for ( var filterDefinition : sessionFactory.getAutoEnabledFilters() ) {
 			final var filter = new FilterImpl( filterDefinition );
 			if ( enabledFilters == null ) {
@@ -96,6 +98,14 @@ public SessionFactoryImplementor getSessionFactory() {
 		return sessionFactory;
 	}
 
+	public Object getTemporalIdentifier() {
+		return temporalIdentifier;
+	}
+
+	public void setTemporalIdentifier(Object temporalIdentifier) {
+		this.temporalIdentifier = temporalIdentifier;
+	}
+
 
 	// internal fetch profile support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/Managed.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/Managed.java
index 88923c564f23..d9d5730b56c9 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/Managed.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/Managed.java
@@ -5,16 +5,20 @@
 package org.hibernate.engine.spi;
 
 /**
- * Contract for classes (specifically, entities and components/embeddables) that are "managed".  Developers can
- * choose to either have their classes manually implement these interfaces or Hibernate can enhance their classes
- * to implement these interfaces via built-time or run-time enhancement.
+ * Contract for classes (specifically, entities and components/embeddables) that are "managed".
+ * Developers can choose to either have their classes manually implement these interfaces, or
+ * Hibernate can enhance their classes to implement these interfaces via built-time or run-time
+ * enhancement.
  * <p>
- * The term managed here is used to describe both:<ul>
+ * The term <em>managed</em> is used in two senses:<ul>
  *     <li>
- *         the fact that they are known to the persistence provider (this is defined by the interface itself)
+ *         A class is considered managed if it belongs to the persistence unit. This is
+ *         represented by the class implementing {@code Managed}.
  *     </li>
  *     <li>
- *         its association with Session/EntityManager (this is defined by the state exposed through the interface)
+ *         An instance is considered managed if it is associated with a persistence context.
+ *         Any such association is represented by the state exposed via operations of this
+ *         interface.
  *     </li>
  * </ul>
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedComposite.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedComposite.java
index 11268eac0450..8d08d8ae8212 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedComposite.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedComposite.java
@@ -5,7 +5,8 @@
 package org.hibernate.engine.spi;
 
 /**
- * Specialized {@link Managed} contract for component/embeddable classes.
+ * Specialized {@link Managed} contract for
+ * {@linkplain jakarta.persistence.Embeddable embeddable classes}.
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedEntity.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedEntity.java
index 74857b93b039..1d19fa091893 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedEntity.java
@@ -5,17 +5,19 @@
 package org.hibernate.engine.spi;
 
 /**
- * Specialized {@link Managed} contract for entity classes.  Essentially provides access to information
- * about an instance's association to a Session/EntityManager.  Specific information includes:<ul>
+ * Specialized {@link Managed} contract for entity classes, providing access to information
+ * about the association between the instance and the {@link PersistenceContext}, including:
+ * <ul>
  *     <li>
- *        the association's {@link EntityEntry} (by way of {@link #$$_hibernate_getEntityEntry} and
- *        {@link #$$_hibernate_setEntityEntry}).  EntityEntry describes states, snapshots, etc.
+ *        The {@link EntityEntry}, by way of {@link #$$_hibernate_getEntityEntry} and
+ *        {@link #$$_hibernate_setEntityEntry}. The {@code EntityEntry} describes states,
+ *        snapshots, and so on.
  *     </li>
  *     <li>
- *         link information.  ManagedEntity instances are part of a "linked list", thus link information
- *         describes the next and previous entries/nodes in that ordering.  See
+ *         Link information. {@code ManagedEntity} instances are part of a linked list; thus,
+ *         link information describes the next and previous entries/nodes in that ordering. See
  *         {@link #$$_hibernate_getNextManagedEntity}, {@link #$$_hibernate_setNextManagedEntity},
- *         {@link #$$_hibernate_getPreviousManagedEntity}, {@link #$$_hibernate_setPreviousManagedEntity}
+ *         {@link #$$_hibernate_getPreviousManagedEntity}, {@link #$$_hibernate_setPreviousManagedEntity}.
  *     </li>
  * </ul>
  *
@@ -39,8 +41,9 @@ public interface ManagedEntity extends Managed, InstanceIdentity {
 	EntityEntry $$_hibernate_getEntityEntry();
 
 	/**
-	 * Injects the EntityEntry associated with this entity instance.  The EntityEntry represents state associated
-	 * with the entity in regards to its association with a Hibernate Session.
+	 * Injects the {@link EntityEntry} associated with this entity instance.
+	 * The {@code EntityEntry} holds information about the association between
+	 * the instance and the persistence context.
 	 *
 	 * @param entityEntry The EntityEntry associated with this entity instance.
 	 */
@@ -88,25 +91,24 @@ public interface ManagedEntity extends Managed, InstanceIdentity {
 	 * 	String name
 	 * }
 	 *
-	 * inSession (
-	 * 	session -> {
+	 * inSession(session -> {
 	 * 		MyEntity entity = new MyEntity(1, "Poul");
 	 * 		session.persist(entity);
 	 * });
 	 *
 	 *
-	 * inSession (
-	 * 	session -> {
+	 * inSession(session -> {
 	 * 		MyEntity entity = new MyEntity(1, null);
 	 * 		session.merge(entity);
 	 * });
 	 * </pre>
-	 * Because the attribute `name` has been set to null the SelfDirtyTracker
-	 * does not detect any change and so doesn't mark the attribute as dirty
-	 * so the merge does not perform any update.
+	 * Because the attribute name has been set to null, the {@code SelfDirtyTracker}
+	 * does not detect any change and so doesn't mark the attribute as dirty so the
+	 * merge does not perform any update.
 	 *
 	 *
-	 * @param useTracker true if the tracker can be used to detect dirty properties, false otherwise
+	 * @param useTracker true if the tracker can be used to detect dirty properties;
+	 *                   false otherwise
 	 *
 	 */
 	void $$_hibernate_setUseTracker(boolean useTracker);
@@ -143,7 +145,7 @@ default ManagedEntity asManagedEntity() {
 	 * @since 7.0
 	 */
 	default EntityEntry $$_hibernate_setPersistenceInfo(EntityEntry entityEntry, ManagedEntity previous, ManagedEntity next, int instanceId) {
-		final EntityEntry oldEntry = $$_hibernate_getEntityEntry();
+		final var oldEntry = $$_hibernate_getEntityEntry();
 		$$_hibernate_setEntityEntry( entityEntry );
 		$$_hibernate_setPreviousManagedEntity( previous );
 		$$_hibernate_setNextManagedEntity( next );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedMappedSuperclass.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedMappedSuperclass.java
index 210d6fb3b537..d04d71fb990c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedMappedSuperclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ManagedMappedSuperclass.java
@@ -5,7 +5,8 @@
 package org.hibernate.engine.spi;
 
 /**
- * Specialized {@link Managed} contract for MappedSuperclass classes.
+ * Specialized {@link Managed} contract for
+ * {@linkplain jakarta.persistence.MappedSuperclass mapped superclasses}.
  *
  * @author Luis Barreiro
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java
index 881dba6098a0..90288b2daa72 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java
@@ -16,7 +16,7 @@
 import org.hibernate.Internal;
 import org.hibernate.LockMode;
 import org.hibernate.collection.spi.PersistentCollection;
-import org.hibernate.internal.util.MarkerObject;
+import org.hibernate.engine.internal.ProxyUtil;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.sql.results.graph.entity.EntityInitializer;
@@ -41,10 +41,6 @@
  * @author Steve Ebersole
  */
 public interface PersistenceContext {
-	/**
-	 * Marker object used to indicate (via reference checking) that no row was returned.
-	 */
-	Object NO_ROW = new MarkerObject( "NO_ROW" );
 
 	boolean isStateless();
 
@@ -125,12 +121,12 @@ default boolean hasLoadContext() {
 	 * <ol>
 	 * <li>no snapshot is obtained from the database if not already cached,
 	 *     and
-	 * <li>an entry of {@link #NO_ROW} here results in an exception.
+	 * <li>an entry of {@code NO_ROW} here results in an exception.
 	 * </ol>
 	 *
 	 * @param key The entity key for which to retrieve the cached snapshot
 	 * @return The cached snapshot
-	 * @throws IllegalStateException if the cached snapshot was {@link #NO_ROW}.
+	 * @throws IllegalStateException if the cached snapshot was {@code NO_ROW}.
 	 */
 	Object[] getCachedDatabaseSnapshot(EntityKey key);
 
@@ -293,8 +289,12 @@ EntityEntry addReferenceEntry(
 	 * Get the entity instance underlying the given proxy, throwing
 	 * an exception if the proxy is uninitialized. If the given object
 	 * is not a proxy, simply return the argument.
+	 * @deprecated No longer used
 	 */
-	Object unproxy(Object maybeProxy);
+	@Deprecated(since = "7.2", forRemoval = true)
+	default Object unproxy(Object maybeProxy) {
+		return ProxyUtil.assertInitialized( maybeProxy );
+	}
 
 	/**
 	 * Possibly unproxy the given reference and reassociate it with the current session.
@@ -378,7 +378,18 @@ EntityEntry addReferenceEntry(
 	/**
 	 * add a collection we just loaded up (still needs initializing)
 	 */
-	void addUninitializedCollection(CollectionPersister persister, PersistentCollection<?> collection, Object id);
+	void addUninitializedCollection(
+			CollectionPersister persister,
+			PersistentCollection<?> collection,
+			Object id,
+			boolean readOnly);
+
+	default void addUninitializedCollection(
+			CollectionPersister persister,
+			PersistentCollection<?> collection,
+			Object id) {
+		addUninitializedCollection( persister, collection, id, false );
+	}
 
 	/**
 	 * add a detached uninitialized collection
@@ -396,9 +407,7 @@ EntityEntry addReferenceEntry(
 	 * add an (initialized) collection that was created by another session and passed
 	 * into update() (ie. one with a snapshot and existing state on the database)
 	 */
-	void addInitializedDetachedCollection(
-			CollectionPersister collectionPersister,
-			PersistentCollection<?> collection);
+	void addInitializedDetachedCollection(CollectionPersister collectionPersister, PersistentCollection<?> collection);
 
 	/**
 	 * Replaces a directly accessible collection with the given one
@@ -415,7 +424,15 @@ void addInitializedDetachedCollection(
 	CollectionEntry addInitializedCollection(
 			CollectionPersister persister,
 			PersistentCollection<?> collection,
-			Object id);
+			Object id,
+			boolean readOnly);
+
+	default CollectionEntry addInitializedCollection(
+			CollectionPersister persister,
+			PersistentCollection<?> collection,
+			Object id) {
+		return addInitializedCollection( persister, collection, id, false );
+	}
 
 	/**
 	 * Get the collection instance associated with the {@code CollectionKey}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
index 492ecd4462c8..bf7d28366cce 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
@@ -97,7 +97,7 @@ public SessionDelegatorBaseImpl(SessionImplementor delegate) {
 
 	/**
 	 * Returns the delegate session.
-	 * <p>
+	 *
 	 * @apiNote This returns a different object to the {@link #getDelegate()}
 	 *          method inherited from {@link jakarta.persistence.EntityManager}.
 	 *
@@ -463,6 +463,11 @@ public CacheTransactionSynchronization getCacheTransactionSynchronization() {
 		return delegate.getCacheTransactionSynchronization();
 	}
 
+	@Override
+	public Object getCurrentTransactionIdentifier() {
+		return delegate.getCurrentTransactionIdentifier();
+	}
+
 	@Override
 	public void afterTransactionBegin() {
 		delegate.afterTransactionBegin();
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java
index 1ce6152abe87..5c13194fe73f 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java
@@ -42,6 +42,7 @@
 import org.hibernate.query.sql.spi.SqlTranslationEngine;
 import org.hibernate.relational.SchemaManager;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
+import org.hibernate.temporal.spi.TransactionIdentifierService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducerProvider;
@@ -427,4 +428,9 @@ public <R> TypedQueryReference<R> addNamedQuery(String name, TypedQuery<R> query
 	public Object resolveTenantIdentifier() {
 		return delegate.resolveTenantIdentifier();
 	}
+
+	@Override
+	public TransactionIdentifierService getTransactionIdentifierService() {
+		return delegate.getTransactionIdentifierService();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
index 84831c176e26..aa912780f653 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
@@ -23,6 +23,8 @@
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EntityCopyObserverFactory;
 import org.hibernate.event.spi.EventEngine;
+import org.hibernate.graph.GraphParser;
+import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.event.service.spi.EventListenerGroups;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
@@ -32,6 +34,7 @@
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sql.spi.SqlTranslationEngine;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
+import org.hibernate.temporal.spi.TransactionIdentifierService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
 import org.hibernate.sql.exec.internal.JdbcSelectWithActions;
@@ -259,6 +262,11 @@ default JpaMetamodel getJpaMetamodel() {
 	@Incubating
 	EventListenerRegistry getEventListenerRegistry();
 
+	/**
+	 * Efficient access to the {@link TransactionIdentifierService}.
+	 */
+	TransactionIdentifierService getTransactionIdentifierService();
+
 	/**
 	 * Return an instance of {@link WrapperOptions} which is not backed by a session,
 	 * and whose functionality is therefore incomplete.
@@ -322,4 +330,18 @@ default JdbcSelectWithActionsBuilder getJdbcSelectWithActionsBuilder(){
 		return new JdbcSelectWithActions.Builder();
 	}
 
+	@Override
+	default <T> RootGraph<T> parseEntityGraph(Class<T> rootEntityClass, CharSequence graphText) {
+		return GraphParser.parse( rootEntityClass, graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
+	}
+
+	@Override @Incubating
+	default <T> RootGraph<T> parseEntityGraph(String rootEntityName, CharSequence graphText) {
+		return GraphParser.parse( rootEntityName, graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
+	}
+
+	@Override @Incubating
+	default <T> RootGraph<T> parseEntityGraph(CharSequence graphText) {
+		return GraphParser.parse( graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
index 5dd68770d060..5648f4944941 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
@@ -70,19 +70,12 @@ default SessionImplementor getSession() {
 
 	/**
 	 * Get the {@link ActionQueue} associated with this session.
+	 * @deprecated This was only used in tests and can be quite safely removed.
+	 *             Use {@link org.hibernate.event.spi.EventSource#getActionQueue()}.
 	 */
+	@Deprecated(since = "7.3", forRemoval = true)
 	ActionQueue getActionQueue();
 
-	@Override
-	default TransactionCompletionCallbacks getTransactionCompletionCallbacks() {
-		return getActionQueue();
-	}
-
-	@Override
-	default TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacksImplementor() {
-		return getActionQueue().getTransactionCompletionCallbacks();
-	}
-
 	/**
 	 * Should this session be automatically closed after the current
 	 * transaction completes?
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java
index 19fbf55a7a03..ca102676a444 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java
@@ -886,17 +886,15 @@ public boolean isJoinedToTransaction() {
 	}
 
 	@Override
-	public <T> T unwrap(Class<T> cls) {
-		if ( cls.isAssignableFrom( Session.class ) ) {
-			//noinspection unchecked
-			return (T) this;
-		}
-		return this.lazySession.get().unwrap( cls );
+	public <T> T unwrap(Class<T> type) {
+		return type.isAssignableFrom( Session.class )
+				? type.cast( this )
+				: lazySession.get().unwrap( type );
 	}
 
 	@Override
 	public Object getDelegate() {
-		return this.lazySession.get().getDelegate();
+		return lazySession.get().getDelegate();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
index f655ecf2bb73..6e60a15f657e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
@@ -155,7 +155,7 @@ default Object getSessionToken() {
 
 	/**
 	 * Determines whether the session is closed.
-	 * <p>
+	 *
 	 * @apiNote Provided separately from {@link #isOpen()} as this method
 	 *          does not attempt any JTA synchronization registration,
 	 *          whereas {@link #isOpen()} does. This one is better for most
@@ -217,6 +217,15 @@ default void checkOpen() {
 	 */
 	CacheTransactionSynchronization getCacheTransactionSynchronization();
 
+	/**
+	 * A transaction id representing the beginning of the current transaction,
+	 * for use with {@linkplain org.hibernate.annotations.Temporal temporal}
+	 * effectivity columns and with
+	 * {@linkplain org.hibernate.annotations.Audited#transactionId audit log
+	 * transaction id columns}.
+	 */
+	Object getCurrentTransactionIdentifier();
+
 	/**
 	 * Does this session have an active Hibernate transaction, or is it
 	 * associated with a JTA transaction currently in progress?
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java
index dd504209d509..a7567b46f3f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java
@@ -408,6 +408,11 @@ public CacheTransactionSynchronization getCacheTransactionSynchronization() {
 		return delegate.getCacheTransactionSynchronization();
 	}
 
+	@Override
+	public Object getCurrentTransactionIdentifier() {
+		return delegate.getCurrentTransactionIdentifier();
+	}
+
 	@Override
 	public boolean isTransactionInProgress() {
 		return delegate.isTransactionInProgress();
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java
index 04da87409873..103e19d101fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java
@@ -102,8 +102,19 @@ protected Object saveWithGeneratedId(
 		final boolean generatedBeforeExecution = generator.generatedBeforeExecution( entity, source );
 		final Object generatedId;
 		if ( generatedOnExecution ) {
-			// the id gets generated by the database
-			// and is not yet available
+			if ( generatedBeforeExecution
+					&& generator instanceof CompositeNestedGeneratedValueGenerator compositeGenerator ) {
+				// for a composite id, we might need to
+				// create the composite id instance early
+				final Object preGeneratedId = compositeGenerator.generate( source, entity );
+				if ( preGeneratedId == null ) {
+					throw new IdentifierGenerationException(
+							"Null id generated for entity '" + persister.getEntityName() + "'" );
+				}
+				persister.setIdentifier( entity, preGeneratedId, source );
+			}
+			// the id gets generated by the database and is
+			// not yet available
 			generatedId = null;
 		}
 		else if ( !generator.generatesOnInsert() ) {
@@ -198,7 +209,9 @@ protected Object performSave(
 		processIfManagedEntity( entity, managedEntity -> managedEntity.$$_hibernate_setUseTracker( true ) );
 
 		final var generator = persister.getGenerator();
-		if ( !generator.generatesOnInsert() || generator instanceof CompositeNestedGeneratedValueGenerator ) {
+		if ( !generator.generatesOnInsert()
+				|| generator instanceof CompositeNestedGeneratedValueGenerator compositeGenerator
+						&& compositeGenerator.hasAssignedValues() ) {
 			id = persister.getIdentifier( entity, source );
 			if ( id == null ) {
 				throw new IdentifierGenerationException( "Identifier of entity '" + persister.getEntityName()
@@ -292,8 +305,8 @@ protected Object performSaveOrReplicate(
 				delayIdentityInserts
 		);
 
-		// postpone initializing id in case the insert has non-nullable transient dependencies
-		// that are not resolved until cascadeAfterSave() is executed
+		// postpone initializing id in case the insert has non-nullable transient
+		// dependencies that are not resolved until cascadeAfterSave() is executed
 		cascadeAfterSave( source, persister, entity, context );
 
 		final Object finalId = handleGeneratedId( useIdentityColumn, id, insert );
@@ -423,7 +436,7 @@ protected boolean visitCollectionsBeforeSave(
 	 * @param persister The entity persister
 	 * @param source The originating session
 	 *
-	 * @return True if the snapshot state changed such that
+	 * @return true if the snapshot state changed such that
 	 *         reinjection of the values into the entity is required.
 	 */
 	protected boolean substituteValuesIfNecessary(
@@ -460,7 +473,7 @@ protected void cascadeBeforeSave(
 			EntityPersister persister,
 			Object entity,
 			C context) {
-		// cascade-save to many-to-one BEFORE the parent is saved
+		// cascade save to many-to-one BEFORE the parent is saved
 		final var persistenceContext = source.getPersistenceContextInternal();
 		persistenceContext.incrementCascadeLevel();
 		try {
@@ -491,7 +504,7 @@ protected void cascadeAfterSave(
 			EntityPersister persister,
 			Object entity,
 			C context) {
-		// cascade-save to collections AFTER the collection owner was saved
+		// cascade save to collections AFTER the collection owner was saved
 		final var persistenceContext = source.getPersistenceContextInternal();
 		persistenceContext.incrementCascadeLevel();
 		try {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java
index ee51e8b9ef2f..ab80d10ec677 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java
@@ -5,6 +5,7 @@
 package org.hibernate.event.internal;
 
 import org.hibernate.CacheMode;
+import org.hibernate.DetachedObjectException;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.StaleObjectStateException;
@@ -166,7 +167,7 @@ private void deleteUnmanagedInstance(DeleteEvent event, DeleteContext transientE
 	private void deleteDetachedEntity(
 			DeleteEvent event, DeleteContext transientEntities, Object entity, EntityPersister persister, EventSource source) {
 		if ( source.getFactory().getSessionFactoryOptions().isJpaBootstrap() ) {
-			throw new IllegalArgumentException( "Given entity is not associated with the persistence context" );
+			throw new DetachedObjectException( "Given entity is not associated with the persistence context" );
 		}
 		final Object id = persister.getIdentifier( entity, source );
 		if ( id == null ) {
@@ -182,18 +183,19 @@ private void deleteDetachedEntity(
 
 			new OnUpdateVisitor( source, id, entity ).process( entity, persister );
 
-			final var persistenceContext = source.getPersistenceContextInternal();
-			final var entityEntry = persistenceContext.addEntity(
-					entity,
-					persister.isMutable() ? Status.MANAGED : Status.READ_ONLY,
-					persister.getValues( entity ),
-					key,
-					version,
-					LockMode.NONE,
-					true,
-					persister,
-					false
-			);
+			final var entityEntry =
+					source.getPersistenceContextInternal()
+							.addEntity(
+									entity,
+									persister.isMutable() ? Status.MANAGED : Status.READ_ONLY,
+									persister.getValues( entity ),
+									key,
+									version,
+									LockMode.NONE,
+									true,
+									persister,
+									false
+							);
 			persister.afterReassociate( entity, source );
 
 			delete( event, transientEntities, source, entity, persister, id, version, entityEntry );
@@ -497,7 +499,7 @@ protected void cascadeBeforeDelete(
 		final var persistenceContext = session.getPersistenceContextInternal();
 		persistenceContext.incrementCascadeLevel();
 		try {
-			// cascade-delete to collections BEFORE the collection owner is deleted
+			// cascade delete to collections BEFORE the collection owner is deleted
 			Cascade.cascade(
 					CascadingActions.REMOVE,
 					CascadePoint.AFTER_INSERT_BEFORE_DELETE,
@@ -524,7 +526,7 @@ protected void cascadeAfterDelete(
 		final var persistenceContext = session.getPersistenceContextInternal();
 		persistenceContext.incrementCascadeLevel();
 		try {
-			// cascade-delete to many-to-one AFTER the parent was deleted
+			// cascade delete to many-to-one AFTER the parent was deleted
 			Cascade.cascade(
 					CascadingActions.REMOVE,
 					CascadePoint.BEFORE_INSERT_AFTER_DELETE,
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java
index 515d64532f36..f0195dc11662 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEvictEventListener.java
@@ -13,7 +13,6 @@
 import org.hibernate.event.spi.EvictEvent;
 import org.hibernate.event.spi.EvictEventListener;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.proxy.LazyInitializer;
 
 import static org.hibernate.event.internal.EventListenerLogging.EVENT_LISTENER_LOGGER;
 import static org.hibernate.pretty.MessageHelper.infoString;
@@ -43,7 +42,7 @@ public void onEvict(EvictEvent event) throws HibernateException {
 		if ( object == null ) {
 			throw new NullPointerException( "null passed to Session.evict()" );
 		}
-		final LazyInitializer lazyInitializer = extractLazyInitializer( object );
+		final var lazyInitializer = extractLazyInitializer( object );
 		if ( lazyInitializer != null ) {
 			final Object id = lazyInitializer.getInternalIdentifier();
 			if ( id == null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java
index 50b4a23aaccb..80b16701cd1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java
@@ -22,6 +22,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.Status;
+import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.spi.FlushEntityEvent;
 import org.hibernate.event.spi.FlushEntityEventListener;
 import org.hibernate.jpa.event.spi.CallbackRegistry;
@@ -75,14 +76,19 @@ public void checkId(Object object, EntityPersister persister, EntityEntry entry,
 			if ( entryId != currentId
 						&& !entry.getStatus().isDeletedOrGone()
 						&& !persister.getIdentifierType().isEqual( entryId, currentId, session.getFactory() ) ) {
-				throw new HibernateException( "Identifier of an instance of '" + persister.getEntityName()
-											+ "' was altered from " + entryId + " to " + currentId );
+				throwIdentifiedAlteredException( persister, entryId, currentId );
 			}
 		}
 		// else this is a situation where the entity id is assigned by a post-insert
 		// generator and was saved outside the transaction, forcing it to be delayed
 	}
 
+	// Used by Hibernate Reactive
+	protected void throwIdentifiedAlteredException(EntityPersister persister, Object entryId, Object currentId) {
+		throw new HibernateException( "Identifier of an instance of '" + persister.getEntityName()
+									+ "' was altered from " + entryId + " to " + currentId );
+	}
+
 	private void checkNaturalId(
 			EntityPersister persister,
 			Object entity,
@@ -120,6 +126,12 @@ public void onFlushEntity(FlushEntityEvent event) throws HibernateException {
 		final var entry = event.getEntityEntry();
 		final var session = event.getSession();
 
+		// short-circuit for immutable entities....
+		if ( !entry.getPersister().isMutable() && !entry.getPersister().hasCollections() ) {
+			// nothing to do
+			return;
+		}
+
 		final boolean mightBeDirty = entry.requiresDirtyCheck( entity );
 
 		final Object[] values = getValues( entity, entry, mightBeDirty, session );
@@ -243,6 +255,13 @@ private boolean scheduleUpdate(final FlushEntityEvent event) {
 		// we'll use scheduled updates for that.
 		new Nullability( session, NullabilityCheckType.UPDATE ).checkNullability( values, persister );
 
+		addEntityUpdateActionToActionQueue( event, session, entry, values, dirtyProperties, status, persister, entity, nextVersion );
+
+		return intercepted;
+	}
+
+	// Used by Hibernate Reactive
+	protected void addEntityUpdateActionToActionQueue(FlushEntityEvent event, EventSource session, EntityEntry entry, Object[] values, int[] dirtyProperties, Status status, EntityPersister persister, Object entity, Object nextVersion) {
 		// schedule the update
 		// note that we intentionally do _not_ pass in currentPersistentState!
 		session.getActionQueue().addAction(
@@ -262,8 +281,6 @@ private boolean scheduleUpdate(final FlushEntityEvent event) {
 						session
 				)
 		);
-
-		return intercepted;
 	}
 
 	private static int[] getDirtyProperties(FlushEntityEvent event, boolean intercepted) {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
index 12e95883e97a..01354e2f124a 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java
@@ -114,7 +114,7 @@ private boolean handleIdType(EntityPersister persister, LoadEvent event, LoadTyp
 							parentIdTargetIdMapping instanceof CompositeIdentifierMapping compositeMapping
 									? compositeMapping.getMappedIdEmbeddableTypeDescriptor()
 									: parentIdTargetIdMapping.getMappedType();
-					if ( parentIdType.getMappedJavaType().getJavaTypeClass().isInstance( event.getEntityId() ) ) {
+					if ( parentIdType.getMappedJavaType().isInstance( event.getEntityId() ) ) {
 						// yep that's what we have...
 						loadByDerivedIdentitySimplePkValue(
 								event,
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java
index 3c8eec03629c..e37b4ff938f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java
@@ -4,27 +4,15 @@
  */
 package org.hibernate.event.internal;
 
+import org.hibernate.DetachedObjectException;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
-import org.hibernate.TransientObjectException;
-import org.hibernate.engine.internal.Cascade;
-import org.hibernate.engine.internal.CascadePoint;
-import org.hibernate.engine.internal.ForeignKeys;
-import org.hibernate.engine.spi.CascadingActions;
-import org.hibernate.engine.spi.EntityEntry;
-import org.hibernate.engine.spi.Status;
-import org.hibernate.event.spi.AbstractSessionEvent;
 import org.hibernate.event.spi.LockEvent;
 import org.hibernate.event.spi.LockEventListener;
-import org.hibernate.persister.entity.EntityPersister;
 
-import org.hibernate.type.TypeHelper;
 
-
-import static org.hibernate.engine.internal.Versioning.getVersion;
-import static org.hibernate.event.internal.EventListenerLogging.EVENT_LISTENER_LOGGER;
+import static org.hibernate.engine.internal.ProxyUtil.forceInitialize;
 import static org.hibernate.loader.ast.internal.LoaderHelper.upgradeLock;
-import static org.hibernate.pretty.MessageHelper.infoString;
 
 /**
  * Defines the default lock event listeners used by hibernate to lock entities
@@ -42,105 +30,26 @@ public class DefaultLockEventListener implements LockEventListener {
 	@Override
 	public void onLock(LockEvent event) throws HibernateException {
 
-		if ( event.getObject() == null ) {
-			throw new NullPointerException( "attempted to lock null" );
+		final Object instance = event.getObject();
+		if ( instance == null ) {
+			throw new NullPointerException( "Attempted to lock null" );
 		}
 
 		final var lockMode = event.getLockMode();
 		if ( lockMode == LockMode.WRITE || lockMode == LockMode.UPGRADE_SKIPLOCKED ) {
-			throw new HibernateException( "Invalid lock mode for lock()" );
+			throw new IllegalArgumentException( "Invalid lock mode '" + lockMode + "' passed to 'lock()'" );
 		}
 
 		final var source = event.getSession();
-		final var persistenceContext = source.getPersistenceContextInternal();
-		final Object entity = persistenceContext.unproxyAndReassociate( event.getObject() );
-		//TODO: if object was an uninitialized proxy, this is inefficient,
+		final Object entity = forceInitialize( instance, source );
+		//TODO: if instance was an uninitialized proxy, this is inefficient,
 		//      resulting in two SQL selects
 
-		var entry = persistenceContext.getEntry( entity );
-		if ( entry == null ) {
-			final var persister = source.getEntityPersister( event.getEntityName(), entity );
-			final Object id = persister.getIdentifier( entity, source );
-			if ( !ForeignKeys.isNotTransient( event.getEntityName(), entity, Boolean.FALSE, source ) ) {
-				throw new TransientObjectException( "Cannot lock unsaved transient instance of entity '"
-						+ persister.getEntityName() + "'" );
-			}
-			entry = reassociate( event, entity, id, persister );
-			cascadeOnLock( event, persister, entity );
-		}
-
-		upgradeLock( entity, entry, event.getLockOptions(), event.getSession() );
-	}
-
-	private void cascadeOnLock(LockEvent event, EntityPersister persister, Object entity) {
-		final var source = event.getSession();
-		final var persistenceContext = source.getPersistenceContextInternal();
-		persistenceContext.incrementCascadeLevel();
-		try {
-			Cascade.cascade(
-					CascadingActions.LOCK,
-					CascadePoint.AFTER_LOCK,
-					source,
-					persister,
-					entity,
-					event.getLockOptions()
-			);
-		}
-		finally {
-			persistenceContext.decrementCascadeLevel();
-		}
-	}
-
-	/**
-	 * Associates a given entity (either transient or associated with another session)
-	 * to the given session.
-	 *
-	 * @param event The event triggering the re-association
-	 * @param object The entity to be associated
-	 * @param id The id of the entity.
-	 * @param persister The entity's persister instance.
-	 *
-	 * @return An EntityEntry representing the entity within this session.
-	 */
-	protected final EntityEntry reassociate(AbstractSessionEvent event, Object object, Object id, EntityPersister persister) {
-
-		if ( EVENT_LISTENER_LOGGER.isTraceEnabled() ) {
-			EVENT_LISTENER_LOGGER.reassociatingTransientInstance(
-					infoString( persister, id, event.getFactory() ) );
+		final var entry = source.getPersistenceContextInternal().getEntry( entity );
+		if ( entry == null && instance == entity ) {
+			throw new DetachedObjectException( "Given entity is not associated with the persistence context" );
 		}
 
-		final var source = event.getSession();
-		final var key = source.generateEntityKey( id, persister );
-		final var persistenceContext = source.getPersistenceContext();
-
-		persistenceContext.checkUniqueness( key, object );
-
-		//get a snapshot
-		final Object[] values = persister.getValues( object );
-		TypeHelper.deepCopy(
-				values,
-				persister.getPropertyTypes(),
-				persister.getPropertyUpdateability(),
-				values,
-				source
-		);
-
-		final var newEntry = persistenceContext.addEntity(
-				object,
-				persister.isMutable() ? Status.MANAGED : Status.READ_ONLY,
-				values,
-				key,
-				getVersion( values, persister ),
-				LockMode.NONE,
-				true,
-				persister,
-				false
-		);
-
-		new OnLockVisitor( source, id, object ).process( object, persister );
-
-		persister.afterReassociate( object, source );
-
-		return newEntry;
+		upgradeLock( entity, entry, event.getLockOptions(), source );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
index 0d43b7dbf5b1..191f2f5f91ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
@@ -40,6 +40,7 @@
 import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isSelfDirtinessTracker;
+import static org.hibernate.engine.internal.ProxyUtil.assertInitialized;
 import static org.hibernate.event.internal.EntityState.getEntityState;
 import static org.hibernate.event.internal.EventListenerLogging.EVENT_LISTENER_LOGGER;
 import static org.hibernate.event.internal.EventUtil.getLoggableName;
@@ -362,11 +363,12 @@ private static class CollectionVisitor extends WrapVisitor {
 		@Override
 		protected Object processCollection(Object collection, CollectionType collectionType) {
 			if ( collection instanceof PersistentCollection<?> persistentCollection ) {
+				final var session = getSession();
 				final var persister =
-						getSession().getFactory().getMappingMetamodel()
+						session.getFactory().getMappingMetamodel()
 								.getCollectionDescriptor( collectionType.getRole() );
 				final var collectionEntry =
-						getSession().getPersistenceContextInternal()
+						session.getPersistenceContextInternal()
 								.getCollectionEntry( persistentCollection );
 				if ( !persistentCollection.equalsSnapshot( persister ) ) {
 					collectionEntry.resetStoredSnapshot( persistentCollection, persistentCollection.getSnapshot( persister ) );
@@ -374,10 +376,6 @@ protected Object processCollection(Object collection, CollectionType collectionT
 			}
 			return null;
 		}
-		@Override
-		Object processEntity(Object value, EntityType entityType) {
-			return null;
-		}
 	}
 
 	private void saveTransientEntity(
@@ -518,7 +516,7 @@ private static Object unproxyManagedForDetachedMerging(
 			EntityPersister persister,
 			EventSource source) {
 		if ( isHibernateProxy( managed ) ) {
-			return source.getPersistenceContextInternal().unproxy( managed );
+			return assertInitialized( managed );
 		}
 
 		if ( isPersistentAttributeInterceptable( incoming )
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java
index 3f8d9ecb7d0e..e942e6842dff 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java
@@ -18,8 +18,10 @@
 import org.hibernate.jpa.event.spi.CallbackRegistryConsumer;
 import org.hibernate.persister.entity.EntityPersister;
 
+import static org.hibernate.engine.internal.ProxyUtil.assertInitialized;
 import static org.hibernate.event.internal.EntityState.getEntityState;
 import static org.hibernate.event.internal.EventListenerLogging.EVENT_LISTENER_LOGGER;
+import static org.hibernate.event.internal.EventUtil.getLoggableName;
 import static org.hibernate.pretty.MessageHelper.infoString;
 import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 
@@ -62,7 +64,7 @@ public void onPersist(PersistEvent event, PersistContext createCache) throws Hib
 		if ( lazyInitializer != null ) {
 			if ( lazyInitializer.isUninitialized() ) {
 				if ( lazyInitializer.getSession() != event.getSession() ) {
-					throw new PersistentObjectException( "uninitialized proxy passed to persist()" );
+					throw new PersistentObjectException( "Uninitialized proxy passed to persist()" );
 				}
 			}
 			else {
@@ -81,7 +83,7 @@ private void persist(PersistEvent event, PersistContext createCache, Object enti
 		switch ( getEntityState( entity, entityName, entityEntry, source, true ) ) {
 			case DETACHED:
 				throw new PersistentObjectException( "Detached entity passed to persist: "
-						+ EventUtil.getLoggableName( event.getEntityName(), entity) );
+										+ getLoggableName( event.getEntityName(), entity) );
 			case PERSISTENT:
 				entityIsPersistent( event, createCache );
 				break;
@@ -95,17 +97,15 @@ private void persist(PersistEvent event, PersistContext createCache, Object enti
 				entityIsDeleted( event, createCache );
 				break;
 			default:
-				throw new ObjectDeletedException(
-						"Deleted entity passed to persist",
-						null,
-						EventUtil.getLoggableName( event.getEntityName(), entity )
-				);
+				throw new ObjectDeletedException( "Deleted entity passed to persist", null,
+										getLoggableName( entityName, entity ) );
 		}
 	}
 
 	private static String entityName(PersistEvent event, Object entity, EntityEntry entityEntry) {
-		if ( event.getEntityName() != null ) {
-			return event.getEntityName();
+		final String explicitEntityName = event.getEntityName();
+		if ( explicitEntityName != null ) {
+			return explicitEntityName;
 		}
 		else {
 			// changes event.entityName by side effect!
@@ -119,14 +119,13 @@ protected void entityIsPersistent(PersistEvent event, PersistContext createCache
 		final var source = event.getSession();
 		final String entityName = event.getEntityName();
 		//TODO: check that entry.getIdentifier().equals(requestedId)
-		final Object entity = source.getPersistenceContextInternal().unproxy( event.getObject() );
+		final Object entity = assertInitialized( event.getObject() );
+		final var persister = source.getEntityPersister( entityName, entity );
 		if ( EVENT_LISTENER_LOGGER.isTraceEnabled() ) {
-			final var persister = source.getEntityPersister( entityName, entity );
 			EVENT_LISTENER_LOGGER.ignoringPersistentInstance(
 					infoString( entityName, persister.getIdentifier( entity ) ) );
 		}
 		if ( createCache.add( entity ) ) {
-			final var persister = source.getEntityPersister( entityName, entity );
 			justCascade( createCache, source, entity, persister );
 		}
 	}
@@ -139,21 +138,20 @@ private void justCascade(PersistContext createCache, EventSource source, Object
 
 	protected void entityIsTransient(PersistEvent event, PersistContext createCache) {
 		EVENT_LISTENER_LOGGER.persistingTransientInstance();
-		final var source = event.getSession();
-		final Object entity = source.getPersistenceContextInternal().unproxy( event.getObject() );
+		final Object entity = assertInitialized( event.getObject() );
 		if ( createCache.add( entity ) ) {
+			final var source = event.getSession();
 			saveWithGeneratedId( entity, event.getEntityName(), createCache, source, false );
 		}
 	}
 
 	private void entityIsDeleted(PersistEvent event, PersistContext createCache) {
 		final var source = event.getSession();
-		final Object entity = source.getPersistenceContextInternal().unproxy( event.getObject() );
+		final Object entity = assertInitialized( event.getObject() );
 		final var persister = source.getEntityPersister( event.getEntityName(), entity );
 		if ( EVENT_LISTENER_LOGGER.isTraceEnabled() ) {
-			final Object id = persister.getIdentifier( entity, source );
 			EVENT_LISTENER_LOGGER.unschedulingEntityDeletion(
-					infoString( persister, id, source.getFactory() ) );
+					infoString( persister, persister.getIdentifier( entity, source ), source.getFactory() ) );
 		}
 		if ( createCache.add( entity ) ) {
 			justCascade( createCache, source, entity, persister );
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPostLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPostLoadEventListener.java
index a929a2362b94..0b6516e45cc1 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPostLoadEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPostLoadEventListener.java
@@ -51,16 +51,18 @@ public void onPostLoad(PostLoadEvent event) {
 						OptimisticLockHelper.forceVersionIncrement( entity, entry, session );
 						break;
 					case OPTIMISTIC_FORCE_INCREMENT:
-						session.getActionQueue().registerCallback( new EntityIncrementVersionProcess( entity ) );
+						session.getActionQueue()
+								.registerCallback( new EntityIncrementVersionProcess( entity ) );
 						break;
 					case OPTIMISTIC:
-						session.getActionQueue().registerCallback( new EntityVerifyVersionProcess( entity ) );
+						session.getActionQueue()
+								.registerCallback( new EntityVerifyVersionProcess( entity ) );
 						break;
 				}
 			}
 			else {
-				throw new HibernateException("[" + lockMode
-						+ "] not supported for non-versioned entities [" + persister.getEntityName() + "]");
+				throw new HibernateException( "Entity '" + persister.getEntityName()
+							+ "' has no version and may not be locked at level " + lockMode);
 			}
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java
index 0fe45834b391..369dc220c61c 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java
@@ -4,11 +4,10 @@
  */
 package org.hibernate.event.internal;
 
+import org.hibernate.DetachedObjectException;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
-import org.hibernate.NonUniqueObjectException;
-import org.hibernate.TransientObjectException;
 import org.hibernate.UnresolvableObjectException;
 import org.hibernate.cache.spi.access.SoftLock;
 import org.hibernate.engine.internal.Cascade;
@@ -27,6 +26,8 @@
 import org.hibernate.type.ComponentType;
 import org.hibernate.type.Type;
 
+import static org.hibernate.engine.internal.ProxyUtil.forceInitialize;
+import static org.hibernate.engine.internal.ProxyUtil.isUninitialized;
 import static org.hibernate.event.internal.EventListenerLogging.EVENT_LISTENER_LOGGER;
 import static org.hibernate.pretty.MessageHelper.infoString;
 import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
@@ -51,29 +52,30 @@ public void onRefresh(RefreshEvent event) throws HibernateException {
 	 */
 	@Override
 	public void onRefresh(RefreshEvent event, RefreshContext refreshedAlready) {
-		final var source = event.getSession();
-		final var persistenceContext = source.getPersistenceContextInternal();
 		final Object object = event.getObject();
-		if ( persistenceContext.reassociateIfUninitializedProxy( object ) ) {
-			handleUninitializedProxy( event, refreshedAlready, source, object, persistenceContext );
+		if ( object == null ) {
+			throw new NullPointerException( "Attempted to refresh null" );
 		}
 		else {
-			final Object entity = persistenceContext.unproxyAndReassociate( object );
-			if ( refreshedAlready.add( entity) ) {
-				refresh( event, refreshedAlready, entity );
+			final var source = event.getEventSource();
+			if ( isUninitialized( object, source ) ) {
+				handleUninitializedProxy( event, refreshedAlready );
 			}
 			else {
-				EVENT_LISTENER_LOGGER.alreadyRefreshed();
+				final Object entity = forceInitialize( object, source );
+				if ( refreshedAlready.add( entity ) ) {
+					refresh( event, refreshedAlready, entity );
+				}
+				else {
+					EVENT_LISTENER_LOGGER.alreadyRefreshed();
+				}
 			}
 		}
 	}
 
-	private static void handleUninitializedProxy(
-			RefreshEvent event,
-			RefreshContext refreshedAlready,
-			EventSource source,
-			Object object,
-			PersistenceContext persistenceContext) {
+	private static void handleUninitializedProxy(RefreshEvent event, RefreshContext refreshedAlready) {
+		final var source = event.getEventSource();
+		final Object object = event.getObject();
 		final boolean isTransient = !source.isManaged( object );
 		// If refreshAlready is nonempty then the refresh is the result of a cascade refresh and the
 		// refresh of the parent will take care of initializing the lazy entity and setting the
@@ -88,8 +90,8 @@ private static void handleUninitializedProxy(
 					persister,
 					lazyInitializer,
 					null,
-					persister.getIdentifier( object, event.getSession() ),
-					persistenceContext
+					persister.getIdentifier( object, source ),
+					source.getPersistenceContextInternal()
 			);
 			if ( lazyInitializer != null ) {
 				refreshedAlready.add( lazyInitializer.getImplementation() );
@@ -122,37 +124,18 @@ private static void refresh(RefreshEvent event, RefreshContext refreshedAlready,
 		final var persistenceContext = source.getPersistenceContextInternal();
 		final var entry = persistenceContext.getEntry( object );
 
-		final EntityPersister persister;
-		final Object id;
 		if ( entry == null ) {
-			//refresh() does not pass an entityName
-			persister = source.getEntityPersister( event.getEntityName(), object );
-			id = persister.getIdentifier( object, event.getSession() );
-			if ( id == null ) {
-				throw new TransientObjectException( "Cannot refresh instance of entity '" + persister.getEntityName()
-						+ "' because it has a null identifier" );
-			}
-			if ( EVENT_LISTENER_LOGGER.isTraceEnabled() ) {
-				EVENT_LISTENER_LOGGER.refreshingTransient(
-						infoString( persister, id, event.getFactory() ) );
-			}
-			if ( persistenceContext.getEntry( source.generateEntityKey( id, persister ) ) != null ) {
-				throw new NonUniqueObjectException( id, persister.getEntityName() );
-			}
+			throw new DetachedObjectException( "Given entity is not associated with the persistence context" );
 		}
-		else {
-			if ( EVENT_LISTENER_LOGGER.isTraceEnabled() ) {
-				EVENT_LISTENER_LOGGER.refreshing(
-						infoString( entry.getPersister(), entry.getId(), event.getFactory() ) );
-			}
-			if ( !entry.isExistsInDatabase() ) {
-				throw new UnresolvableObjectException(
-						entry.getId(),
-						"this instance does not yet exist as a row in the database"
-				);
-			}
-			persister = entry.getPersister();
-			id = entry.getId();
+
+		final EntityPersister persister = entry.getPersister();
+		final Object id = entry.getId();
+		if ( EVENT_LISTENER_LOGGER.isTraceEnabled() ) {
+			EVENT_LISTENER_LOGGER.refreshing(
+					infoString( persister, id, event.getFactory() ) );
+		}
+		if ( !entry.isExistsInDatabase() ) {
+			throw new UnresolvableObjectException( id, persister.getEntityName() );
 		}
 
 		// cascade the refresh prior to refreshing this entity
@@ -165,13 +148,11 @@ private static void refresh(RefreshEvent event, RefreshContext refreshedAlready,
 				refreshedAlready
 		);
 
-		if ( entry != null ) {
-			persistenceContext.removeEntityHolder( entry.getEntityKey() );
-			if ( persister.hasCollections() ) {
-				new EvictVisitor( source, object ).process( object, persister );
-			}
-			persistenceContext.removeEntry( object );
+		persistenceContext.removeEntityHolder( entry.getEntityKey() );
+		if ( persister.hasCollections() ) {
+			new EvictVisitor( source, object ).process( object, persister );
 		}
+		persistenceContext.removeEntry( object );
 
 		evictEntity( object, persister, id, source );
 		evictCachedCollections( persister, id, source );
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java
index 710c4593eccc..c1db00d2a228 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultReplicateEventListener.java
@@ -114,7 +114,17 @@ else if ( EVENT_LISTENER_LOGGER.isTraceEnabled() ) {
 
 	private static <T> boolean shouldOverwrite(
 			ReplicationMode replicationMode, Object entityVersion, Object realOldVersion, BasicType<T> versionType) {
-		return replicationMode.shouldOverwriteCurrentVersion( (T) realOldVersion, (T) entityVersion, versionType );
+		return replicationMode.shouldOverwriteCurrentVersion(
+				castVersion( realOldVersion, versionType ),
+				castVersion( entityVersion, versionType ),
+				versionType
+		);
+	}
+
+	private static <T> T castVersion(Object realOldVersion, BasicType<T> versionType) {
+		return versionType == null
+				? null
+				: versionType.getJavaTypeDescriptor().cast( realOldVersion );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyLogging.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyLogging.java
index 9933de5d4553..3d8e63cada09 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyLogging.java
@@ -14,6 +14,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.TRACE;
@@ -31,7 +32,7 @@
 public interface EntityCopyLogging extends BasicLogger {
 	String NAME = EventListenerLogging.NAME + ".copy";
 
-	EntityCopyLogging EVENT_COPY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), EntityCopyLogging.class, NAME );
+	EntityCopyLogging EVENT_COPY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), EntityCopyLogging.class, NAME, Locale.ROOT );
 
 
 	// EntityCopyObserver
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java
index 0a284a8003bd..362892d6322a 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EventListenerLogging.java
@@ -15,6 +15,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.TRACE;
@@ -32,7 +33,7 @@
 public interface EventListenerLogging extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".event";
 
-	EventListenerLogging EVENT_LISTENER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), EventListenerLogging.class, NAME );
+	EventListenerLogging EVENT_LISTENER_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), EventListenerLogging.class, NAME, Locale.ROOT );
 
 	// Load
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java
index bfeb3bc2e357..1193f6307a1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/FlushVisitor.java
@@ -28,7 +28,7 @@ public FlushVisitor(EventSource session, Object owner) {
 	}
 
 	Object processCollection(Object collection, CollectionType type) throws HibernateException {
-		if ( collection != null && collection != CollectionType.UNFETCHED_COLLECTION ) {
+		if ( collection != null ) {
 			final var session = getSession();
 			final var persistentCollection = persistentCollection( collection, type, session );
 			if ( persistentCollection != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/OnLockVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/OnLockVisitor.java
deleted file mode 100644
index e9ae9db88778..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/OnLockVisitor.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.event.internal;
-
-import org.hibernate.HibernateException;
-import org.hibernate.collection.spi.PersistentCollection;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.type.CollectionType;
-
-/**
- * When a transient entity is passed to lock(), we must inspect all its collections and
- * <ol>
- * <li> associate any uninitialized PersistentCollections with this session
- * <li> associate any initialized PersistentCollections with this session, using the
- *      existing snapshot
- * <li> throw an exception for each "new" collection
- * </ol>
- *
- * @author Gavin King
- */
-public class OnLockVisitor extends ReattachVisitor {
-
-	public OnLockVisitor(EventSource session, Object key, Object owner) {
-		super( session, key, owner );
-	}
-
-	@Override
-	public Object processCollection(Object collection, CollectionType type) throws HibernateException {
-		if ( collection == null ) {
-			return null;
-		}
-
-		final var session = getSession();
-		final var persister =
-				session.getFactory().getMappingMetamodel()
-						.getCollectionDescriptor( type.getRole() );
-		if ( collection instanceof PersistentCollection<?> persistentCollection ) {
-			if ( persistentCollection.setCurrentSession( session ) ) {
-				if ( isOwnerUnchanged( persister, extractCollectionKeyFromOwner( persister ), persistentCollection ) ) {
-					// a "detached" collection that originally belonged to the same entity
-					if ( persistentCollection.isDirty() ) {
-						throw new HibernateException( "reassociated object has dirty collection" );
-					}
-					reattachCollection( persistentCollection, type );
-				}
-				else {
-					// a "detached" collection that belonged to a different entity
-					throw new HibernateException( "reassociated object has dirty collection reference" );
-				}
-			}
-			else {
-				// a collection loaded in the current session
-				// cannot possibly be the collection belonging
-				// to the entity passed to update()
-				throw new HibernateException( "reassociated object has dirty collection reference" );
-			}
-		}
-		else {
-			// brand new collection
-			//TODO: or an array!! we can't lock objects with arrays now??
-			throw new HibernateException( "reassociated object has dirty collection reference (or an array)" );
-		}
-		return null;
-	}
-
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/OnReplicateVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/OnReplicateVisitor.java
index a29866e9b476..464da5cd7c0b 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/OnReplicateVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/OnReplicateVisitor.java
@@ -10,8 +10,8 @@
 import org.hibernate.type.CollectionType;
 
 /**
- * When an entity is passed to replicate(), and there is an existing row, we must
- * inspect all its collections and
+ * When an entity is passed to {@link org.hibernate.Session#replicate}, and there
+ * is an existing row, we must inspect all its collections and:
  * <ol>
  * <li> associate any uninitialized PersistentCollections with this session
  * <li> associate any initialized PersistentCollections with this session, using the
@@ -32,10 +32,6 @@ public OnReplicateVisitor(EventSource session, Object key, Object owner, boolean
 
 	@Override
 	public Object processCollection(Object collection, CollectionType type) throws HibernateException {
-		if ( collection == CollectionType.UNFETCHED_COLLECTION ) {
-			return null;
-		}
-
 		final var session = getSession();
 		final var persister =
 				session.getFactory().getMappingMetamodel()
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/OnUpdateVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/OnUpdateVisitor.java
index 4e083feb66e5..26476736670d 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/OnUpdateVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/OnUpdateVisitor.java
@@ -10,12 +10,15 @@
 import org.hibernate.type.CollectionType;
 
 /**
- * When an entity is passed to update(), we must inspect all its collections and
- * 1. associate any uninitialized PersistentCollections with this session
- * 2. associate any initialized PersistentCollections with this session, using the
- *	existing snapshot
- * 3. execute a collection removal (SQL DELETE) for each null collection property
- *	or "new" collection
+ * When a detached entity is passed to {@link org.hibernate.Session#remove(Object)},
+ * we must inspect all its collections and:
+ * <ol>
+ * <li>associate any uninitialized PersistentCollections with this session
+ * <li>associate any initialized PersistentCollections with this session, using the
+ *     existing snapshot
+ * <li>execute a collection removal (SQL DELETE) for each null collection property
+ *     or "new" collection
+ *</ol>
  *
  * @author Gavin King
  */
@@ -27,10 +30,6 @@ public OnUpdateVisitor(EventSource session, Object key, Object owner) {
 
 	@Override
 	Object processCollection(Object collection, CollectionType type) throws HibernateException {
-		if ( collection == CollectionType.UNFETCHED_COLLECTION ) {
-			return null;
-		}
-
 		final var session = getSession();
 		final var persister =
 				session.getFactory().getMappingMetamodel()
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/ProxyVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/ProxyVisitor.java
index 7d08753bb5d4..d0e22cde10de 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/ProxyVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/ProxyVisitor.java
@@ -9,10 +9,11 @@
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.type.CollectionType;
-import org.hibernate.type.EntityType;
 
 /**
- * Reassociates uninitialized proxies with the session
+ * A visitor able to reattach {@linkplain PersistentCollection collections}
+ * to the current session.
+ *
  * @author Gavin King
  */
 public abstract class ProxyVisitor extends AbstractVisitor {
@@ -21,15 +22,6 @@ public ProxyVisitor(EventSource session) {
 		super(session);
 	}
 
-	Object processEntity(Object value, EntityType entityType) {
-		if ( value != null ) {
-			getSession().getPersistenceContext().reassociateIfUninitializedProxy( value );
-			// if it is an initialized proxy, let cascade
-			// handle it later on
-		}
-		return null;
-	}
-
 	/**
 	 * Has the owner of the collection changed since the collection
 	 * was snapshotted and detached?
@@ -63,7 +55,7 @@ protected void reattachCollection(PersistentCollection<?> collection, Collection
 		}
 		else {
 			if ( !isCollectionSnapshotValid( collection ) ) {
-				throw new HibernateException( "could not re-associate uninitialized transient collection" );
+				throw new HibernateException( "Could not reassociate uninitialized transient collection" );
 			}
 			final var persister = metamodel.getCollectionDescriptor( collection.getRole() );
 			context.addUninitializedDetachedCollection( persister, collection );
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java
index eb059e50b610..b4fc55cc6fde 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/ReattachVisitor.java
@@ -9,13 +9,15 @@
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.type.CompositeType;
+import org.hibernate.type.EntityType;
 import org.hibernate.type.Type;
 
 import static org.hibernate.event.internal.EventListenerLogging.EVENT_LISTENER_LOGGER;
 import static org.hibernate.pretty.MessageHelper.collectionInfoString;
 
 /**
- * Abstract superclass of visitors that reattach collections.
+ * Abstract superclass of visitors that reattach collections
+ * and reassociate uninitialized proxies with the session.
  *
  * @author Gavin King
  */
@@ -30,6 +32,17 @@ public ReattachVisitor(EventSource session, Object ownerIdentifier, Object owner
 		this.owner = owner;
 	}
 
+	@Override
+	Object processEntity(Object value, EntityType entityType) {
+		if ( value != null ) {
+			getSession().getPersistenceContext()
+					.reassociateIfUninitializedProxy( value );
+			// if it is an initialized proxy,
+			// let cascade handle it later on
+		}
+		return null;
+	}
+
 	/**
 	 * Retrieve the identifier of the entity being visited.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java
index 90c6ec8f37d0..d442200b7fc1 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java
@@ -22,7 +22,7 @@
 import static org.hibernate.persister.entity.AbstractEntityPersister.getCollectionKey;
 
 /**
- * Wrap collections in a Hibernate collection wrapper.
+ * Wrap collections in {@linkplain PersistentCollection collection wrappers}.
  *
  * @author Gavin King
  */
@@ -74,8 +74,7 @@ final Object processArrayOrNewCollection(Object collection, CollectionType colle
 			final var persistenceContext = session.getPersistenceContextInternal();
 			//TODO: move into collection type, so we can use polymorphism!
 			if ( collectionType.hasHolder() ) {
-				if ( collection != CollectionType.UNFETCHED_COLLECTION
-						&& persistenceContext.getCollectionHolder( collection ) == null ) {
+				if ( persistenceContext.getCollectionHolder( collection ) == null ) {
 					final var collectionHolder = collectionType.wrap( session, collection );
 					persistenceContext.addNewCollection( persister, collectionHolder );
 					persistenceContext.addCollectionHolder( collectionHolder );
@@ -103,7 +102,12 @@ else if ( attributeInterceptor instanceof LazyAttributeLoadingInterceptor lazyLo
 										collectionInstance =
 												persister.getCollectionSemantics()
 														.instantiateWrapper( key, persister, session );
-										persistenceContext.addUninitializedCollection( persister, collectionInstance, key );
+										persistenceContext.addUninitializedCollection(
+												persister,
+												collectionInstance,
+												key,
+												entry.isReadOnly()
+										);
 										persistenceContext.getCollectionEntry( collectionInstance ).setDoremove( true );
 									}
 								}
@@ -132,10 +136,10 @@ protected void processValue(int i, Object[] values, Type[] types) {
 	}
 
 	@Override
-	protected Object processComponent(Object component, CompositeType componentType) throws HibernateException {
+	protected Object processComponent(Object component, CompositeType compositeType) throws HibernateException {
 		if ( component != null ) {
-			final Object[] values = componentType.getPropertyValues( component, getSession() );
-			final Type[] types = componentType.getSubtypes();
+			final Object[] values = compositeType.getPropertyValues( component, getSession() );
+			final Type[] types = compositeType.getSubtypes();
 			boolean substituteComponent = false;
 			for ( int i = 0; i < types.length; i++ ) {
 				final Object result = processValue( values[i], types[i] );
@@ -145,7 +149,8 @@ protected Object processComponent(Object component, CompositeType componentType)
 				}
 			}
 			if ( substituteComponent ) {
-				componentType.setPropertyValues( component, values );
+				final Object newComponent = compositeType.replacePropertyValues( component, values, getSession() );
+				return newComponent == component ? null : newComponent;
 			}
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java
index 2bda60e2a49b..445ac91b47c8 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java
@@ -135,10 +135,9 @@ private <T> T[] resolveListenerInstances(EventType<T> type, Class<? extends T>..
 	}
 
 	private <T> T resolveListenerInstance(Class<T> listenerClass) {
-		@SuppressWarnings("unchecked")
-		final T listenerInstance = (T) listenerClassToInstanceMap.get( listenerClass );
+		final T listenerInstance = listenerClass.cast( listenerClassToInstanceMap.get( listenerClass ) );
 		if ( listenerInstance == null ) {
-			T newListenerInstance = instantiateListener( listenerClass );
+			final T newListenerInstance = instantiateListener( listenerClass );
 			listenerClassToInstanceMap.put( listenerClass, newListenerInstance );
 			return newListenerInstance;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java
index 9ffbe16cd706..325392c012fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java
@@ -4,66 +4,124 @@
  */
 package org.hibernate.event.spi;
 
-import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.Internal;import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.persister.collection.CollectionPersister;
 
 /**
  * Defines a base class for events involving collections.
  *
  * @author Gail Badner
+ * @author Steve Ebersole
+ *
+ * @apiNote AbstractCollectionEvent and its implementations are defined
+ * as SPI for consumption; their constructors are defined as
+ * {@linkplain Internal internal}
  */
 public abstract class AbstractCollectionEvent extends AbstractSessionEvent {
-
 	private final PersistentCollection<?> collection;
-	private final Object affectedOwner;
-	private final Object affectedOwnerId;
-	private final String affectedOwnerEntityName;
+	private final CollectionPersister collectionPersister;
+	private final Object owner;
+	private final Object ownerId;
+	private final String ownerEntityName;
 
 	/**
 	 * Constructs an instance for a stateful session.
-	 * @param collection - the collection
-	 * @param source - the Session source
-	 * @param affectedOwner - the owner that is affected by this event;
-	 * can be null if unavailable
-	 * @param affectedOwnerId - the ID for the owner that is affected
-	 * by this event; can be null if unavailable
+	 *
+	 * @param collectionPersister The descriptor for the collection mapping.
+	 * @param collection - The (wrapped) collection instance.
+	 * @param source - The {@linkplain org.hibernate.Session session}
+	 * @param owner - The entity instance that "owns" the {@code collection}
+	 * 		affected by this event; can be {@code null} if unavailable.
+	 * @param ownerId - The identifier value for the {@code owner}; can be
+	 * 		{@code null} if unavailable.
 	 */
+	@Internal
 	public AbstractCollectionEvent(
 			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
 			EventSource source,
-			Object affectedOwner,
-			Object affectedOwnerId) {
+			Object owner,
+			Object ownerId) {
 		super( source );
 		this.collection = collection;
-		this.affectedOwner = affectedOwner;
-		this.affectedOwnerId = affectedOwnerId;
-		this.affectedOwnerEntityName =
-				getAffectedOwnerEntityName( collectionPersister, affectedOwner, source );
+		this.collectionPersister = collectionPersister;
+		this.owner = owner;
+		this.ownerId = ownerId;
+		this.ownerEntityName = getAffectedOwnerEntityName( collectionPersister, owner, source );
 	}
 
 	/**
 	 * Constructs an instance for a stateless session.
-	 * @param collection - the collection
-	 * @param entityName - the name of the owning entity
-	 * @param affectedOwner - the owner that is affected by this event;
-	 * can be null if unavailable
-	 * @param affectedOwnerId - the ID for the owner that is affected
-	 * by this event; can be null if unavailable
+	 *
+	 * @param collectionPersister The descriptor for the collection mapping.
+	 * @param collection - The (wrapped) collection instance.
+	 * @param ownerEntityName - The entity-name of the {@code owner}.
+	 * @param owner - The entity instance that "owns" the {@code collection}
+	 * 		affected by this event; can be {@code null} if unavailable.
+	 * @param ownerId - The identifier value for the {@code owner}; can be
+	 * 		{@code null} if unavailable.
 	 */
+	@Internal
 	public AbstractCollectionEvent(
+			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
-			String entityName,
-			Object affectedOwner,
-			Object affectedOwnerId) {
+			String ownerEntityName,
+			Object owner,
+			Object ownerId) {
 		super( null );
 		this.collection = collection;
-		this.affectedOwner = affectedOwner;
-		this.affectedOwnerId = affectedOwnerId;
-		this.affectedOwnerEntityName = entityName;
+		this.owner = owner;
+		this.ownerId = ownerId;
+		this.ownerEntityName = ownerEntityName;
+		this.collectionPersister = collectionPersister;
+	}
+
+	/**
+	 * The descriptor for the {@linkplain #getCollection() collection} mapping.
+	 */
+	public CollectionPersister getCollectionPersister() {
+		return collectionPersister;
+	}
+
+	/**
+	 * The (wrapped) collection instance affected by this event.
+	 */
+	public PersistentCollection<?> getCollection() {
+		return collection;
 	}
 
-	protected static CollectionPersister getLoadedCollectionPersister( PersistentCollection<?> collection, EventSource source ) {
+	/**
+	 * Get the collection owner entity that is affected by this event.
+	 *
+	 * @return the affected owner; returns null if the entity is not in the persistence context
+	 * (e.g., because the collection from a detached entity was moved to a new owner)
+	 */
+	public Object getAffectedOwnerOrNull() {
+		return owner;
+	}
+
+	/**
+	 * Get the ID for the collection owner entity that is affected by this event.
+	 *
+	 * @return the affected owner ID; returns null if the ID cannot be obtained
+	 * from the collection's loaded key (e.g., a property-ref is used for the
+	 * collection and does not include the entity's ID)
+	 */
+	public Object getAffectedOwnerIdOrNull() {
+		return ownerId;
+	}
+
+	/**
+	 * Get the entity name for the collection owner entity that is affected by this event.
+	 *
+	 * @return the entity name; if the owner is not in the PersistenceContext, the
+	 * returned value may be a superclass name, instead of the actual class name
+	 */
+	public String getAffectedOwnerEntityName() {
+		return ownerEntityName;
+	}
+
+	protected static CollectionPersister getLoadedCollectionPersister(PersistentCollection<?> collection, EventSource source) {
 		final var entry = source.getPersistenceContextInternal().getCollectionEntry( collection );
 		return entry == null ? null : entry.getLoadedPersister();
 	}
@@ -102,39 +160,4 @@ protected static String getAffectedOwnerEntityName(
 				: null;
 	}
 
-	public PersistentCollection<?> getCollection() {
-		return collection;
-	}
-
-	/**
-	 * Get the collection owner entity that is affected by this event.
-	 *
-	 * @return the affected owner; returns null if the entity is not in the persistence context
-	 * (e.g., because the collection from a detached entity was moved to a new owner)
-	 */
-	public Object getAffectedOwnerOrNull() {
-		return affectedOwner;
-	}
-
-	/**
-	 * Get the ID for the collection owner entity that is affected by this event.
-	 *
-	 * @return the affected owner ID; returns null if the ID cannot be obtained
-	 * from the collection's loaded key (e.g., a property-ref is used for the
-	 * collection and does not include the entity's ID)
-	 */
-	public Object getAffectedOwnerIdOrNull() {
-		return affectedOwnerId;
-	}
-
-	/**
-	 * Get the entity name for the collection owner entity that is affected by this event.
-	 *
-	 * @return the entity name; if the owner is not in the PersistenceContext, the
-	 * returned value may be a superclass name, instead of the actual class name
-	 */
-	public String getAffectedOwnerEntityName() {
-		return affectedOwnerEntityName;
-	}
-
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java
index 5aba62a74464..d0c95a73a2be 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java
@@ -9,6 +9,8 @@
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.TransactionCompletionCallbacks;
+import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;
 import org.hibernate.persister.entity.EntityPersister;
 
 /**
@@ -68,4 +70,13 @@ public interface EventSource extends SessionImplementor {
 	//       This should be removed once action/task ordering is improved.
 	void removeOrphanBeforeUpdates(String entityName, Object child);
 
+	@Override
+	default TransactionCompletionCallbacks getTransactionCompletionCallbacks() {
+		return getActionQueue();
+	}
+
+	@Override
+	default TransactionCompletionCallbacksImplementor getTransactionCompletionCallbacksImplementor() {
+		return getActionQueue().getTransactionCompletionCallbacks();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java
index 1a2174f5c324..d2f430ef82b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.event.spi;
 
+import org.hibernate.Internal;
 import org.hibernate.collection.spi.PersistentCollection;
 
 /**
@@ -14,6 +15,7 @@
  */
 public class InitializeCollectionEvent extends AbstractCollectionEvent {
 
+	@Internal
 	public InitializeCollectionEvent(PersistentCollection<?> collection, EventSource source ) {
 		super(
 				getLoadedCollectionPersister( collection, source ),
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEvent.java
index e85ba703c64a..70b209b7d413 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/LoadEvent.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.event.spi;
 
+import org.hibernate.Internal;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.Locking;
@@ -66,32 +67,36 @@ private LoadEvent(
 			boolean isAssociationFetch,
 			EventSource source,
 			Boolean readOnly) {
-
 		super( source );
+		this.entityId = entityId;
+		this.entityClassName = entityClassName;
+		this.instanceToLoad = instanceToLoad;
+		this.lockOptions = lockOptions;
+		this.isAssociationFetch = isAssociationFetch;
+		this.readOnly = readOnly;
+		validate();
+	}
 
+	@Internal
+	public void validate() {
 		if ( entityId == null ) {
-			throw new IllegalArgumentException( "id to load is required for loading" );
+			throw new IllegalArgumentException( "Identifier may not be null" );
 		}
 
-		if ( lockOptions.getLockMode() == LockMode.WRITE ) {
-			throw new IllegalArgumentException("Invalid lock mode for loading");
+		final var lockMode = lockOptions.getLockMode();
+		if ( lockMode == LockMode.WRITE ) {
+			throw new IllegalArgumentException( "Invalid lock mode: " + LockMode.WRITE );
 		}
-		else if ( lockOptions.getLockMode() == null ) {
+		else if ( lockMode == null ) {
 			lockOptions.setLockMode( LockMode.NONE );
 		}
-
-		this.entityId = entityId;
-		this.entityClassName = entityClassName;
-		this.instanceToLoad = instanceToLoad;
-		this.lockOptions = lockOptions;
-		this.isAssociationFetch = isAssociationFetch;
-		this.readOnly = readOnly;
 	}
 
 	public Object getEntityId() {
 		return entityId;
 	}
 
+	@Internal
 	public void setEntityId(Object entityId) {
 		this.entityId = entityId;
 	}
@@ -100,6 +105,7 @@ public String getEntityClassName() {
 		return entityClassName;
 	}
 
+	@Internal
 	public void setEntityClassName(String entityClassName) {
 		this.entityClassName = entityClassName;
 	}
@@ -108,6 +114,7 @@ public boolean isAssociationFetch() {
 		return isAssociationFetch;
 	}
 
+	@Internal
 	public void setAssociationFetch(boolean associationFetch) {
 		isAssociationFetch = associationFetch;
 	}
@@ -116,6 +123,7 @@ public Object getInstanceToLoad() {
 		return instanceToLoad;
 	}
 
+	@Internal
 	public void setInstanceToLoad(Object instanceToLoad) {
 		this.instanceToLoad = instanceToLoad;
 	}
@@ -124,6 +132,7 @@ public LockOptions getLockOptions() {
 		return lockOptions;
 	}
 
+	@Internal
 	public void setLockOptions(LockOptions lockOptions) {
 		this.lockOptions = lockOptions;
 	}
@@ -140,12 +149,11 @@ public Boolean getReadOnly() {
 		return readOnly;
 	}
 
+	@Internal
 	public void setReadOnly(Boolean readOnly) {
 		this.readOnly = readOnly;
 	}
 
-
-
 	/**
 	 * @deprecated Use {@linkplain #getLockOptions()} instead.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeContext.java b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeContext.java
index 4806036405ad..2a99ab47f018 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeContext.java
@@ -185,7 +185,7 @@ public Set<Object> keySet() {
 	 * This method assumes that the merge process is not yet operating on {@code mergeEntity}.
 	 * Later when {@code mergeEntity} enters the merge process, {@link #setOperatedOn(Object, boolean)}
 	 * should be called.
-	 * <p>
+	 *
 	 * @param mergeEntity the merge entity; must be non-null
 	 * @param managedEntity the managed entity result; must be non-null
 	 * @return previous managed entity associated with specified merge entity, or null if
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java
index 6a5357a98705..4cb78d4ef14e 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRecreateEvent.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.event.spi;
 
+import org.hibernate.Internal;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.persister.collection.CollectionPersister;
 
@@ -14,6 +15,7 @@
  */
 public class PostCollectionRecreateEvent extends AbstractCollectionEvent {
 
+	@Internal
 	public PostCollectionRecreateEvent(
 			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
@@ -27,11 +29,13 @@ public PostCollectionRecreateEvent(
 		);
 	}
 
+	@Internal
 	public PostCollectionRecreateEvent(
+			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
 			Object id,
 			String entityName,
 			Object loadedOwner) {
-		super( collection, entityName, loadedOwner, id );
+		super( collectionPersister, collection, entityName, loadedOwner, id );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEvent.java
index 96061a54fd74..abc1deff336e 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionRemoveEvent.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.event.spi;
 
+import org.hibernate.Internal;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.persister.collection.CollectionPersister;
 
@@ -13,6 +14,7 @@
  * @author Gail Badner
  */
 public class PostCollectionRemoveEvent extends AbstractCollectionEvent {
+	@Internal
 	public PostCollectionRemoveEvent(
 			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
@@ -27,11 +29,13 @@ public PostCollectionRemoveEvent(
 		);
 	}
 
+	@Internal
 	public PostCollectionRemoveEvent(
+			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
 			Object id,
 			String entityName,
 			Object loadedOwner) {
-		super( collection, entityName, loadedOwner, id );
+		super( collectionPersister, collection, entityName, loadedOwner, id );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java
index c0a3569451d8..0501c2893db2 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PostCollectionUpdateEvent.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.event.spi;
 
+import org.hibernate.Internal;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.persister.collection.CollectionPersister;
 
@@ -13,6 +14,8 @@
  * @author Gail Badner
  */
 public class PostCollectionUpdateEvent extends AbstractCollectionEvent {
+
+	@Internal
 	public PostCollectionUpdateEvent(
 			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
@@ -26,12 +29,13 @@ public PostCollectionUpdateEvent(
 		);
 	}
 
-
+	@Internal
 	public PostCollectionUpdateEvent(
+			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
 			Object id,
 			String entityName,
 			Object loadedOwner) {
-		super( collection, entityName, loadedOwner, id );
+		super( collectionPersister, collection, entityName, loadedOwner, id );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEvent.java
index 68cd61f9eab0..d6ad51f61b24 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRecreateEvent.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.event.spi;
 
+import org.hibernate.Internal;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.persister.collection.CollectionPersister;
 
@@ -14,6 +15,7 @@
  */
 public class PreCollectionRecreateEvent extends AbstractCollectionEvent {
 
+	@Internal
 	public PreCollectionRecreateEvent(
 			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
@@ -27,12 +29,13 @@ public PreCollectionRecreateEvent(
 		);
 	}
 
-
+	@Internal
 	public PreCollectionRecreateEvent(
+			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
 			Object id,
 			String entityName,
 			Object loadedOwner) {
-		super( collection, entityName, loadedOwner, id );
+		super( collectionPersister, collection, entityName, loadedOwner, id );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEvent.java
index 84a458bb9df3..edd55f15feca 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionRemoveEvent.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.event.spi;
 
+import org.hibernate.Internal;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.persister.collection.CollectionPersister;
 
@@ -14,6 +15,7 @@
  */
 public class PreCollectionRemoveEvent extends AbstractCollectionEvent {
 
+	@Internal
 	public PreCollectionRemoveEvent(
 			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
@@ -28,11 +30,13 @@ public PreCollectionRemoveEvent(
 		);
 	}
 
+	@Internal
 	public PreCollectionRemoveEvent(
+			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
 			Object id,
 			String entityName,
 			Object loadedOwner) {
-		super( collection, entityName, loadedOwner, id );
+		super( collectionPersister, collection, entityName, loadedOwner, id );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEvent.java
index 2aea2a8becad..8376ff79830f 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEvent.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreCollectionUpdateEvent.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.event.spi;
 
+import org.hibernate.Internal;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.persister.collection.CollectionPersister;
 
@@ -14,6 +15,7 @@
  */
 public class PreCollectionUpdateEvent extends AbstractCollectionEvent {
 
+	@Internal
 	public PreCollectionUpdateEvent(
 			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
@@ -27,12 +29,13 @@ public PreCollectionUpdateEvent(
 		);
 	}
 
-
+	@Internal
 	public PreCollectionUpdateEvent(
+			CollectionPersister collectionPersister,
 			PersistentCollection<?> collection,
 			Object id,
 			String entityName,
 			Object loadedOwner) {
-		super( collection, entityName, loadedOwner, id );
+		super( collectionPersister, collection, entityName, loadedOwner, id );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/AnnotationBasedGenerator.java b/hibernate-core/src/main/java/org/hibernate/generator/AnnotationBasedGenerator.java
index f478b4cf3280..925520a8b8e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/AnnotationBasedGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/AnnotationBasedGenerator.java
@@ -20,16 +20,22 @@
  * For example, implementing {@code AnnotationBasedGenerator<AnnotationType>} is the
  * same as providing a constructor with this signature:
  * <pre>
- * public GeneratorClass(AnnotationType config, Member idMember,
+ * public GeneratorClass(AnnotationType config,
  *                      GeneratorCreationContext creationContext)
  * </pre>
  * <p>
  * where {@code GeneratorClass} is the class that implements {@code Generator}, and
  * {@code AnnotationType} is the generator annotation type used to configure the
- * generator.
+ * generator. That is, it is an annotation type annotated
+ * {@link org.hibernate.annotations.ValueGenerationType @ValueGenerationType}
+ * or {@link org.hibernate.annotations.IdGeneratorType @IdGeneratorType}.
+ * <pre>
+ * &#64;IdGeneratorType(GeneratorClass.class)
+ * public &#64;interface AnnotationType { ... }
+ * </pre>
  * <p>
- * Every instance of this class must implement either {@link BeforeExecutionGenerator} or
- * {@link OnExecutionGenerator}.
+ * Every instance of this interface must also implement either
+ * {@link BeforeExecutionGenerator} or {@link OnExecutionGenerator}.
  *
  * @param <A> The generator annotation type supported by an implementation
  *
@@ -37,6 +43,7 @@
  * @see org.hibernate.annotations.IdGeneratorType
  *
  * @author Gavin King
+ * @author Yanming Zhou
  *
  * @since 6.2
  */
@@ -49,8 +56,27 @@ public interface AnnotationBasedGenerator<A extends Annotation> extends Generato
 	 *                   values and store them in fields.
 	 * @param member the Java member annotated with the generator annotation.
 	 * @param context a {@link GeneratorCreationContext}
-	 * @throws org.hibernate.HibernateException in case an error occurred during initialization, e.g. if
-	 *                                          an implementation can't create a value for the given property type.
+	 * @throws org.hibernate.HibernateException in case an error occurred during initialization,
+	 *         for example, if an implementation can't create a value for the given property type.
+	 * @deprecated Use {@link #initialize(Annotation, GeneratorCreationContext)} instead
+	 */
+	@Deprecated(since = "7.3", forRemoval = true)
+	default void initialize(A annotation, Member member, GeneratorCreationContext context) {
+	}
+
+	/**
+	 * Initializes this generation strategy for the given annotation instance.
+	 *
+	 * @param annotation an instance of the strategy's annotation type. Typically,
+	 *                   implementations will retrieve the annotation's attribute
+	 *                   values and store them in fields.
+	 * @param context a {@link GeneratorCreationContext}
+	 * @throws org.hibernate.HibernateException in case an error occurred during initialization,
+	 *         for example, if an implementation can't create a value for the given property type.
+	 *
+	 * @since 7.3
 	 */
-	void initialize(A annotation, Member member, GeneratorCreationContext context);
+	default void initialize(A annotation, GeneratorCreationContext context) {
+		initialize( annotation, context.getMemberDetails().toJavaMember(), context );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/EventType.java b/hibernate-core/src/main/java/org/hibernate/generator/EventType.java
index f83c36c3b698..00b6d1bf0128 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/EventType.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/EventType.java
@@ -12,7 +12,7 @@
  * implementing {@link Generator#getEventTypes()}.
  * <p>
  * We usually work with {@linkplain EventTypeSets sets} of event types,
- * even though there are only two types.
+ * even though there are only three types.
  *
  * @author Gavin King
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/Generator.java b/hibernate-core/src/main/java/org/hibernate/generator/Generator.java
index a379444fa85a..9de078ffd21c 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/Generator.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/Generator.java
@@ -48,7 +48,8 @@
  *     {@link AnnotationBasedGenerator#initialize},
  * <li>declare a constructor with the same signature as {@link AnnotationBasedGenerator#initialize},
  * <li>declare a constructor which accepts just the annotation instance, or
- * <li>declare a only default constructor, in which case it will not receive parameters.
+ * <li>declare a constructor which accepts just the {@link GeneratorCreationContext} instance, or
+ * <li>declare only a default constructor, in which case it does not receive parameters.
  * </ul>
  * <p>
  * A {@code Generator} may be a managed bean (for example, a CDI bean) instantiated by the
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/GeneratorCreationContext.java b/hibernate-core/src/main/java/org/hibernate/generator/GeneratorCreationContext.java
index b8b575f5b579..0d8c8677fa3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/GeneratorCreationContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/GeneratorCreationContext.java
@@ -13,6 +13,7 @@
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.RootClass;
 import org.hibernate.mapping.Value;
+import org.hibernate.models.spi.MemberDetails;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.Type;
 
@@ -81,7 +82,17 @@ default Type getType() {
 	 * The {@link SqlStringGenerationContext} to use when generating SQL.
 	 */
 	default SqlStringGenerationContext getSqlStringGenerationContext() {
-		final Database database = getDatabase();
+		final var database = getDatabase();
 		return fromExplicit( database.getJdbcEnvironment(), database, getDefaultCatalog(), getDefaultSchema() );
 	}
+
+	/**
+	 * Access to the {@link MemberDetails}.
+	 *
+	 * @since 7.3
+	 */
+	default MemberDetails getMemberDetails() {
+		return null;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/OnExecutionGenerator.java b/hibernate-core/src/main/java/org/hibernate/generator/OnExecutionGenerator.java
index 3ae21e03e1cc..0b6c2ba5a287 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/OnExecutionGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/OnExecutionGenerator.java
@@ -63,11 +63,43 @@ public interface OnExecutionGenerator extends Generator {
 	boolean referenceColumnsInSql(Dialect dialect);
 
 	/**
-	 * Determines if the property values are written to JDBC as the argument of a JDBC {@code ?}
-	 * parameter.
+	 * Determines if the columns whose values are generated are included in the column list
+	 * of the SQL {@code insert} or {@code update} statement for the given event type.
+	 * <p>
+	 * The default implementation delegates to {@link #referenceColumnsInSql(Dialect)}.
+	 *
+	 * @apiNote This is used for generating composite values with mixed event timings.
+	 * User-written generators usually implement {@link #referenceColumnsInSql(Dialect)}
+	 *
+	 * @since 7.4
+	 */
+	@Incubating
+	default boolean referenceColumnsInSql(Dialect dialect, EventType eventType) {
+		return referenceColumnsInSql( dialect );
+	}
+
+	/**
+	 * Determines if the property values are written to JDBC as the argument of a JDBC
+	 * {@code ?} parameter.
 	 */
 	boolean writePropertyValue();
 
+	/**
+	 * Determines if the property values are written to JDBC as the argument of a JDBC
+	 * {@code ?} parameter for the given event type.
+	 * <p>
+	 * The default implementation delegates to {@link #writePropertyValue()}.
+	 *
+	 * @apiNote This is used for generating composite values with mixed event timings.
+	 * User-written generators usually implement {@link #writePropertyValue()}
+	 *
+	 * @since 7.4
+	 */
+	@Incubating
+	default boolean writePropertyValue(EventType eventType) {
+		return writePropertyValue();
+	}
+
 	/**
 	 * A SQL expression indicating how to calculate the generated values when the mapped columns
 	 * are {@linkplain #referenceColumnsInSql(Dialect) included in the SQL statement}. The SQL
@@ -83,6 +115,35 @@ public interface OnExecutionGenerator extends Generator {
 	 */
 	String[] getReferencedColumnValues(Dialect dialect);
 
+	/**
+	 * A SQL expression indicating how to calculate the generated values when the mapped columns
+	 * are included in the SQL statement for the given event type.
+	 * <p>
+	 * The default implementation delegates to {@link #getReferencedColumnValues(Dialect)}.
+	 *
+	 * @apiNote This is used for generating composite values with mixed event timings.
+	 * User-written generators usually implement {@link #getReferencedColumnValues(Dialect)}
+	 *
+	 * @since 7.4
+	 */
+	@Incubating
+	default String[] getReferencedColumnValues(Dialect dialect, EventType eventType) {
+		return getReferencedColumnValues( dialect );
+	}
+
+	/**
+	 * Indicates which columns should be included in SQL for the given event type.
+	 * A {@code null} return value indicates that all columns are included.
+	 *
+	 * @apiNote This is used for generating composite values with mixed event timings.
+	 *
+	 * @since 7.4
+	 */
+	@Incubating
+	default boolean[] getColumnInclusions(Dialect dialect, EventType eventType) {
+		return null;
+	}
+
 	/**
 	 * The {@link InsertGeneratedIdentifierDelegate} used to retrieve the generated value if this
 	 * object is an identifier generator.
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java
index a3018f966b85..032ad835e931 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/CurrentTimestampGeneration.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.generator.internal;
 
-import java.lang.reflect.Member;
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -25,6 +24,7 @@
 import java.util.EnumSet;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.hibernate.MappingException;
 import org.hibernate.SessionFactory;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.CurrentTimestamp;
@@ -39,8 +39,8 @@
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.generator.OnExecutionGenerator;
-import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.mapping.BasicValue;
+import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.java.ClockHelper;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -86,29 +86,44 @@ public class CurrentTimestampGeneration implements BeforeExecutionGenerator, OnE
 
 	private static final ConcurrentHashMap<Key, GeneratorDelegate> GENERATOR_DELEGATES = new ConcurrentHashMap<>();
 
-	public CurrentTimestampGeneration(CurrentTimestamp annotation, Member member, GeneratorCreationContext context) {
-		delegate = getGeneratorDelegate( annotation.source(), member, context );
+	public CurrentTimestampGeneration(CurrentTimestamp annotation, GeneratorCreationContext context) {
+		delegate = getGeneratorDelegate( annotation.source(), context.getType(), context );
 		eventTypes = fromArray( annotation.event() );
 		propertyType = getPropertyType( context );
+		if ( eventTypes.contains( EventType.INSERT ) ) {
+			notNull( context );
+		}
 	}
 
-	public CurrentTimestampGeneration(CreationTimestamp annotation, Member member, GeneratorCreationContext context) {
-		delegate = getGeneratorDelegate( annotation.source(), member, context );
+	public CurrentTimestampGeneration(CreationTimestamp annotation, GeneratorCreationContext context) {
+		delegate = getGeneratorDelegate( annotation.source(), context.getType(), context );
 		eventTypes = INSERT_ONLY;
 		propertyType = getPropertyType( context );
+		notNull( context );
 	}
 
-	public CurrentTimestampGeneration(UpdateTimestamp annotation, Member member, GeneratorCreationContext context) {
-		delegate = getGeneratorDelegate( annotation.source(), member, context );
+	public CurrentTimestampGeneration(UpdateTimestamp annotation, GeneratorCreationContext context) {
+		delegate = getGeneratorDelegate( annotation.source(), context.getType(), context );
 		eventTypes = INSERT_AND_UPDATE;
 		propertyType = getPropertyType( context );
+		notNull( context );
+	}
+
+	private static void notNull(GeneratorCreationContext context) {
+		final var property = context.getProperty();
+		property.setOptional( false );
+		final var columns = property.getColumns();
+		if ( columns.size() != 1 ) {
+			throw new MappingException( "CurrentTimestampGeneration requires exactly one column" );
+		}
+		columns.get( 0 ).setNullable( false );
 	}
 
 	private static GeneratorDelegate getGeneratorDelegate(
 			SourceType source,
-			Member member,
+			Type type,
 			GeneratorCreationContext context) {
-		return getGeneratorDelegate( source, ReflectHelper.getPropertyType( member ), context );
+		return getGeneratorDelegate( source, type.getReturnedClass(), context );
 	}
 
 	static GeneratorDelegate getGeneratorDelegate(
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java
index 333735e46e1f..a1415ecebcdf 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/SourceGeneration.java
@@ -16,7 +16,6 @@
 import org.hibernate.type.descriptor.java.JavaType;
 
 
-import java.lang.reflect.Member;
 import java.util.EnumSet;
 
 import static org.hibernate.generator.internal.CurrentTimestampGeneration.getCurrentTimestamp;
@@ -45,7 +44,7 @@ public class SourceGeneration implements BeforeExecutionGenerator {
 	private final JavaType<?> propertyType;
 	private final CurrentTimestampGeneration.GeneratorDelegate valueGenerator;
 
-	public SourceGeneration(Source annotation, Member member, GeneratorCreationContext context) {
+	public SourceGeneration(Source annotation, GeneratorCreationContext context) {
 		this( annotation.value(), context.getProperty().getType().getReturnedClass(), context );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/internal/TenantIdGeneration.java b/hibernate-core/src/main/java/org/hibernate/generator/internal/TenantIdGeneration.java
index 074eef45f0a0..367bd56d17e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/internal/TenantIdGeneration.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/internal/TenantIdGeneration.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.generator.internal;
 
-import java.lang.reflect.Member;
 import java.util.EnumSet;
 
 import org.hibernate.PropertyValueException;
@@ -28,13 +27,13 @@ public class TenantIdGeneration implements BeforeExecutionGenerator {
 	private final String entityName;
 	private final String propertyName;
 
-	public TenantIdGeneration(TenantId annotation, Member member, GeneratorCreationContext context) {
+	public TenantIdGeneration(TenantId annotation, GeneratorCreationContext context) {
 		final var persistentClass = context.getPersistentClass();
 		entityName =
 				persistentClass != null
 						? persistentClass.getEntityName()
 						// it's an attribute of an embeddable
-						: member.getDeclaringClass().getName();
+						: context.getMemberDetails().toJavaMember().getDeclaringClass().getName();
 		propertyName = context.getProperty().getName();
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java
index 3160f321f60a..f06fd720c484 100644
--- a/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java
@@ -22,7 +22,11 @@
 import org.hibernate.id.insert.InsertReturningDelegate;
 import org.hibernate.id.insert.UniqueKeySelectingDelegate;
 import org.hibernate.internal.util.collections.ArrayHelper;
+import org.hibernate.id.CompositeNestedGeneratedValueGenerator;
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
+import org.hibernate.metamodel.mapping.CompositeIdentifierMapping;
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
+import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.persister.entity.EntityPersister;
@@ -30,7 +34,6 @@
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
-import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.exec.internal.BaseExecutionContext;
 import org.hibernate.sql.results.internal.ResultsHelper;
 import org.hibernate.sql.results.internal.RowProcessingStateStandardImpl;
@@ -38,7 +41,6 @@
 import org.hibernate.sql.results.jdbc.internal.DirectResultSetAccess;
 import org.hibernate.sql.results.jdbc.internal.JdbcValuesResultSetImpl;
 import org.hibernate.sql.results.jdbc.internal.JdbcValuesSourceProcessingStateStandardImpl;
-import org.hibernate.sql.results.jdbc.spi.JdbcValues;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 import org.hibernate.sql.results.spi.RowReader;
@@ -133,7 +135,7 @@ private static Object[] readGeneratedValues(
 		final var directResultSetAccess =
 				new DirectResultSetAccess( session, statement, resultSet );
 		final var influencers = session.getLoadQueryInfluencers();
-		final JdbcValues jdbcValues = new JdbcValuesResultSetImpl(
+		final var jdbcValues = new JdbcValuesResultSetImpl(
 				directResultSetAccess,
 				null,
 				null,
@@ -190,7 +192,7 @@ private static GeneratedValuesMappingProducer generatedValuesMappingProducer(
 			List<? extends ModelPart> generatedProperties) {
 		final var parentNavigablePath = new NavigablePath( persister.getEntityName() );
 		// This is just a mock table group needed to correctly resolve expressions
-		final TableGroup tableGroup = new TableGroupImpl(
+		final var tableGroup = new TableGroupImpl(
 				parentNavigablePath,
 				null,
 				new NamedTableReference( "t", "t" ),
@@ -206,7 +208,12 @@ private static GeneratedValuesMappingProducer generatedValuesMappingProducer(
 						parentNavigablePath.append( basicModelPart.getSelectableName() ),
 						basicModelPart,
 						tableGroup,
-						supportsArbitraryValues ? i : null
+						// For composite identifiers we may expand generated identifier parts even when
+						// supportsArbitraryValues is false; in that case, rely on positional ordering
+						// instead of column name resolution.
+						supportsArbitraryValues || !basicModelPart.isEntityIdentifierMapping()
+								? i
+								: null
 				) );
 			}
 			else {
@@ -237,19 +244,30 @@ private static List<? extends ModelPart> getActualGeneratedModelParts(
 			boolean supportsArbitraryValues,
 			boolean supportsRowId) {
 		if ( timing == EventType.INSERT ) {
-			final var generatedProperties =
-					supportsArbitraryValues
-							? persister.getInsertGeneratedProperties()
-							: List.of( persister.getIdentifierMapping() );
+			if ( !supportsArbitraryValues ) {
+				final var identifierMapping = persister.getIdentifierMapping();
+				if ( identifierMapping instanceof CompositeIdentifierMapping compositeIdentifier
+						&& persister.getGenerator() instanceof CompositeNestedGeneratedValueGenerator compositeGenerator ) {
+					final boolean[] generatedColumns =
+							compositeGenerator.getGeneratedOnExecutionColumnInclusions();
+					if ( generatedColumns != null ) {
+						return generatedIdentifierModelParts( compositeIdentifier, generatedColumns );
+					}
+				}
+				return List.of( identifierMapping );
+			}
+			final var generatedProperties = persister.getInsertGeneratedProperties();
+			final var expandedProperties =
+					expandCompositeIdentifierGeneratedParts( persister, generatedProperties );
 			if ( persister.getRowIdMapping() != null && supportsRowId ) {
 				final List<ModelPart> newList =
-						new ArrayList<>( generatedProperties.size() + 1 );
-				newList.addAll( generatedProperties );
+						new ArrayList<>( expandedProperties.size() + 1 );
+				newList.addAll( expandedProperties );
 				newList.add( persister.getRowIdMapping() );
 				return unmodifiableList( newList );
 			}
 			else {
-				return generatedProperties;
+				return expandedProperties;
 			}
 		}
 		else {
@@ -277,7 +295,7 @@ public static GeneratedValuesMutationDelegate getGeneratedValuesDelegate(
 		final boolean hasRowId =
 				timing == EventType.INSERT
 						&& persister.getRowIdMapping() != null;
-		final Dialect dialect = factory.getJdbcServices().getDialect();
+		final var dialect = factory.getJdbcServices().getDialect();
 		if ( hasRowId
 				&& dialect.supportsInsertReturning()
 				&& dialect.supportsInsertReturningRowId()
@@ -305,6 +323,112 @@ else if ( timing == EventType.INSERT
 		return null;
 	}
 
+	private static List<? extends ModelPart> generatedIdentifierModelParts(
+			CompositeIdentifierMapping compositeIdentifier,
+			boolean[] generatedColumns) {
+		final List<ModelPart> modelParts = new ArrayList<>();
+		collectGeneratedIdParts(
+				compositeIdentifier.getEmbeddableTypeDescriptor(),
+				generatedColumns,
+				0,
+				modelParts
+		);
+		return modelParts;
+	}
+
+	private static List<? extends ModelPart> expandCompositeIdentifierGeneratedParts(
+			EntityPersister persister,
+			List<? extends ModelPart> generatedProperties) {
+		if ( !generatedProperties.isEmpty()
+				&& persister.getIdentifierMapping() instanceof CompositeIdentifierMapping compositeIdentifier
+				&& persister.getGenerator() instanceof CompositeNestedGeneratedValueGenerator compositeGenerator ) {
+			final boolean[] generatedColumns =
+					compositeGenerator.getGeneratedOnExecutionColumnInclusions();
+			if ( generatedColumns != null ) {
+				return needsExpansion( generatedProperties )
+						? expand( generatedProperties, compositeIdentifier, generatedColumns )
+						: generatedProperties;
+			}
+		}
+		return generatedProperties;
+	}
+
+	private static List<ModelPart> expand(
+			List<? extends ModelPart> generatedProperties,
+			CompositeIdentifierMapping compositeIdentifier,
+			boolean[] generatedColumns) {
+		final List<ModelPart> expanded = new ArrayList<>( generatedProperties.size() );
+		for ( var part : generatedProperties ) {
+			if ( part.isEntityIdentifierMapping()
+					&& part instanceof CompositeIdentifierMapping ) {
+				expanded.addAll( generatedIdentifierModelParts( compositeIdentifier, generatedColumns ) );
+			}
+			else {
+				expanded.add( part );
+			}
+		}
+		return expanded;
+	}
+
+	private static boolean needsExpansion(List<? extends ModelPart> generatedProperties) {
+		for ( var part : generatedProperties ) {
+			if ( part.isEntityIdentifierMapping()
+					&& part instanceof CompositeIdentifierMapping ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private static int collectGeneratedIdParts(
+			EmbeddableMappingType embeddableMapping,
+			boolean[] generatedColumns,
+			int offset,
+			List<ModelPart> modelParts) {
+		final var attributeMappings = embeddableMapping.getAttributeMappings();
+		int position = offset;
+		for ( int i = 0; i < attributeMappings.size(); i++ ) {
+			final var attributeMapping = attributeMappings.get( i );
+			final int span = attributeMapping.getJdbcTypeCount();
+			if ( hasGeneratedColumns( generatedColumns, position, span ) ) {
+				final var basicPart = attributeMapping.asBasicValuedModelPart();
+				if ( basicPart != null ) {
+					modelParts.add( basicPart );
+					position += span;
+				}
+				else if ( attributeMapping instanceof EmbeddableValuedModelPart embeddablePart ) {
+					position = collectGeneratedIdParts(
+							embeddablePart.getEmbeddableTypeDescriptor(),
+							generatedColumns,
+							position,
+							modelParts
+					);
+				}
+				else {
+					throw new UnsupportedOperationException(
+							"Unsupported generated ModelPart: " + attributeMapping.getPartName()
+					);
+				}
+			}
+			else {
+				position += span;
+			}
+		}
+		return position;
+	}
+
+	private static boolean hasGeneratedColumns(boolean[] generatedColumns, int start, int span) {
+		if ( generatedColumns != null ) {
+			final int end = Math.min( generatedColumns.length, start + span );
+			for ( int i = start; i < end; i++ ) {
+				if ( generatedColumns[i] ) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	private static boolean supportsReturning(Dialect dialect, EventType timing) {
 		return timing == EventType.INSERT
 				? dialect.supportsInsertReturning()
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java b/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java
index b023feca0dbf..b9c806048e1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java
@@ -50,6 +50,14 @@ public interface AttributeNode<J> extends GraphNode<J>, jakarta.persistence.Attr
 	 */
 	PersistentAttribute<?, J> getAttributeDescriptor();
 
+	/**
+	 * Whether this attribute was {@linkplain Graph#removeAttributeNode removed}.
+	 * Per the Jakarta Persistence specification, such nodes should actually suppress inclusion of the
+	 * attribute mapped for eager fetching when the graph is used as a
+	 * {@linkplain org.hibernate.graph.GraphSemantic#LOAD load graph}.
+	 */
+	boolean isRemoved();
+
 	/**
 	 * All value subgraphs rooted at this node.
 	 * <p>
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java b/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java
index 9d38c57924e1..b59f589b284c 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java
@@ -7,7 +7,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Stream;
 
 import jakarta.persistence.AttributeNode;
@@ -64,13 +63,13 @@ public static <T> EntityGraph<T> createGraph(EntityType<T> rootType) {
 	 * @since 7.0
 	 */
 	public static EntityGraph<Map<String,?>> createGraphForDynamicEntity(EntityType<?> rootType) {
-		final EntityDomainType<?> domainType = (EntityDomainType<?>) rootType;
+		final var domainType = (EntityDomainType<?>) rootType;
 		if ( domainType.getRepresentationMode() != RepresentationMode.MAP ) {
 			throw new IllegalArgumentException( "Entity '" + domainType.getHibernateEntityName()
 												+ "' is not a dynamic entity" );
 		}
 		@SuppressWarnings("unchecked") //Safe, because we just checked
-		final EntityDomainType<Map<String, ?>> dynamicEntity = (EntityDomainType<Map<String, ?>>) domainType;
+		final var dynamicEntity = (EntityDomainType<Map<String, ?>>) domainType;
 		return new RootGraphImpl<>( null, dynamicEntity );
 	}
 
@@ -172,7 +171,7 @@ public static <R> void setFetchGraph(TypedQuery<R> query, EntityGraph<R> graph)
 	}
 
 	/**
-	 * Allows a treated subgraph to ve created for a {@link Subgraph}, since the
+	 * Allows a treated subgraph to be created for a {@link Subgraph}, since the
 	 * JPA-standard operation {@link EntityGraph#addTreatedSubgraph(Class)} is
 	 * declared by {@link EntityGraph}.
 	 *
@@ -310,31 +309,10 @@ public static <T> boolean areEqual(EntityGraph<T> a, EntityGraph<T> b) {
 		if ( a == b ) {
 			return true;
 		}
-		if ( ( a == null ) || ( b == null ) ) {
-			return false;
-		}
-
-		final List<AttributeNode<?>> aNodes = a.getAttributeNodes();
-		final List<AttributeNode<?>> bNodes = b.getAttributeNodes();
-
-		if ( aNodes.size() != bNodes.size() ) {
-			return false;
-		}
-		for ( AttributeNode<?> aNode : aNodes ) {
-			final String attributeName = aNode.getAttributeName();
-			AttributeNode<?> bNode = null;
-			for ( AttributeNode<?> bCandidate : bNodes ) {
-				if ( attributeName.equals( bCandidate.getAttributeName() ) ) {
-					bNode = bCandidate;
-					break;
-				}
-			}
-			if ( !areEqual( aNode, bNode ) ) {
-				return false;
-			}
+		else {
+			return a != null && b != null
+				&& haveSameNodes( a, b );
 		}
-
-		return true;
 	}
 
 	/**
@@ -345,10 +323,10 @@ public static boolean areEqual(AttributeNode<?> a, AttributeNode<?> b) {
 		if ( a == b ) {
 			return true;
 		}
-		if ( ( a == null ) || ( b == null ) ) {
+		else if ( a == null || b == null ) {
 			return false;
 		}
-		if ( a.getAttributeName().equals( b.getAttributeName() ) ) {
+		else if ( a.getAttributeName().equals( b.getAttributeName() ) ) {
 			return areEqual( a.getSubgraphs(), b.getSubgraphs() )
 				&& areEqual( a.getKeySubgraphs(), b.getKeySubgraphs() );
 		}
@@ -367,28 +345,23 @@ public static boolean areEqual(
 		if ( a == b ) {
 			return true;
 		}
-		if ( ( a == null ) || ( b == null ) ) {
+		else if ( a == null || b == null ) {
 			return false;
 		}
-
-		@SuppressWarnings("rawtypes")
-		final Set<Class> aKeys = a.keySet();
-		@SuppressWarnings("rawtypes")
-		final Set<Class> bKeys = b.keySet();
-
-		if ( aKeys.equals( bKeys ) ) {
-			for ( Class<?> clazz : aKeys ) {
-				if ( !bKeys.contains( clazz ) ) {
-					return false;
-				}
-				if ( !areEqual( a.get( clazz ), b.get( clazz ) ) ) {
-					return false;
+		else {
+			final var aKeys = a.keySet();
+			final var bKeys = b.keySet();
+			if ( aKeys.equals( bKeys ) ) {
+				for ( var key : aKeys ) {
+					if ( !areEqual( a.get( key ), b.get( key ) ) ) {
+						return false;
+					}
 				}
+				return true;
+			}
+			else {
+				return false;
 			}
-			return true;
-		}
-		else {
-			return false;
 		}
 	}
 
@@ -396,42 +369,38 @@ public static boolean areEqual(
 	 * Compares two entity subgraphs and returns {@code true} if they are equal,
 	 * ignoring attribute order.
 	 */
-	public static boolean areEqual(
-			@SuppressWarnings("rawtypes") Subgraph a,
-			@SuppressWarnings("rawtypes") Subgraph b) {
+	public static boolean areEqual(Subgraph<?> a, Subgraph<?> b) {
 		if ( a == b ) {
 			return true;
 		}
-		if ( ( a == null ) || ( b == null ) ) {
-			return false;
-		}
-		if ( a.getClassType() != b.getClassType() ) {
-			return false;
+		else {
+			return a != null && b != null
+				&& a.getClassType() == b.getClassType()
+				&& haveSameNodes( a, b );
 		}
+	}
 
-		@SuppressWarnings("unchecked")
-		final List<AttributeNode<?>> aNodes = a.getAttributeNodes();
-		@SuppressWarnings("unchecked")
-		final List<AttributeNode<?>> bNodes = b.getAttributeNodes();
-
+	private static boolean haveSameNodes(Graph<?> a, Graph<?> b) {
+		final var aNodes = a.getAttributeNodes();
+		final var bNodes = b.getAttributeNodes();
 		if ( aNodes.size() != bNodes.size() ) {
 			return false;
 		}
-
-		for ( AttributeNode<?> aNode : aNodes ) {
-			final String attributeName = aNode.getAttributeName();
-			AttributeNode<?> bNode = null;
-			for ( AttributeNode<?> bCandidate : bNodes ) {
-				if ( attributeName.equals( bCandidate.getAttributeName() ) ) {
-					bNode = bCandidate;
-					break;
+		else {
+			for ( var aNode : aNodes ) {
+				final String attributeName = aNode.getAttributeName();
+				AttributeNode<?> bNode = null;
+				for ( var bCandidate : bNodes ) {
+					if ( attributeName.equals( bCandidate.getAttributeName() ) ) {
+						bNode = bCandidate;
+						break;
+					}
+				}
+				if ( !areEqual( aNode, bNode ) ) {
+					return false;
 				}
 			}
-			if ( !areEqual( aNode, bNode ) ) {
-				return false;
-			}
+			return true;
 		}
-
-		return true;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java b/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java
index 0bfcb46624ad..20e6133115f0 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java
@@ -9,6 +9,7 @@
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.Subgraph;
 
+import org.hibernate.Incubating;
 import org.hibernate.SessionFactory;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
@@ -23,11 +24,12 @@
  *     attributeNode:: attributePath subGraph?
  *     subGraph:: LPAREN (subTypeEntityName COLON)? attributeList RPAREN
  * </pre>
- * <p/>
+ * <p>
  * The {@link #parse} methods all create a root {@link jakarta.persistence.EntityGraph}
  * based on the passed entity class and parse the graph string into that root graph.
  * <p>
- * The {@link #parseInto} methods parse the graph string into a passed graph, which may be a subgraph
+ * The {@link #parseInto} methods parse the graph string into a passed graph, which may
+ * be a subgraph.
  * <p>
  * Multiple graphs for the same entity type can be
  * {@linkplain EntityGraphs#merge(EntityManager, Class, jakarta.persistence.Graph...)
@@ -35,7 +37,6 @@
  *
  * @author asusnjar
  */
-@SuppressWarnings("unused")
 public final class GraphParser {
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -89,6 +90,7 @@ public static <T> RootGraph<T> parse(
 	 *
 	 * @since 7.0
 	 */
+	@Incubating
 	public static <T> RootGraph<T> parse(
 			final String rootEntityName,
 			final CharSequence graphText,
@@ -96,7 +98,8 @@ public static <T> RootGraph<T> parse(
 		if ( graphText == null ) {
 			return null;
 		}
-		return GraphParsing.parse(
+		//noinspection unchecked
+		return (RootGraph<T>) GraphParsing.parse(
 				rootEntityName,
 				graphText.toString(),
 				sessionFactory.unwrap( SessionFactoryImplementor.class )
@@ -117,21 +120,23 @@ public static <T> RootGraph<T> parse(
 	 *
 	 * @since 7.0
 	 */
-		public static <T> RootGraph<T> parse(
+	@Incubating
+	public static <T> RootGraph<T> parse(
 				final CharSequence graphText,
 				final SessionFactory sessionFactory) {
 			if ( graphText == null ) {
 				return null;
 			}
-			return GraphParsing.parse(
+			//noinspection unchecked
+			return (RootGraph<T>) GraphParsing.parse(
 					graphText.toString(),
 					sessionFactory.unwrap( SessionFactoryImplementor.class )
-		);
+			);
 	}
 
 	/**
-	 * Creates a root graph based on the passed `rootType` and parses `graphText` into
-	 * the generated root graph
+	 * Creates a root graph based on the passed {@code rootType} and parses {@code graphText}
+	 * into the generated root graph.
 	 *
 	 * @apiNote The passed EntityManager is expected to be a Hibernate implementation.
 	 * Attempting to pass another provider's EntityManager implementation will fail.
@@ -153,7 +158,8 @@ public static <T> RootGraph<T> parse(
 		return GraphParsing.parse(
 				rootType,
 				graphText.toString(),
-				entityManager.getEntityManagerFactory().unwrap( SessionFactoryImplementor.class )
+				entityManager.getEntityManagerFactory()
+						.unwrap( SessionFactoryImplementor.class )
 		);
 	}
 
@@ -190,13 +196,12 @@ public static <T> void parseInto(
 	 *
 	 * @throws InvalidGraphException if the textual representation is invalid.
 	 */
-	@SuppressWarnings("unchecked")
 	public static <T> void parseInto(
-			final EntityGraph<T> graph,
+			final EntityGraph<?> graph,
 			final CharSequence graphText,
 			final EntityManager entityManager) {
 		parseInto(
-				(GraphImplementor<T>) graph,
+				(GraphImplementor<?>) graph,
 				graphText,
 				( (SessionImplementor) entityManager ).getSessionFactory()
 		);
@@ -211,13 +216,12 @@ public static <T> void parseInto(
 	 *
 	 * @throws InvalidGraphException if the textual representation is invalid.
 	 */
-	@SuppressWarnings("unchecked")
-	public static <T> void parseInto(
-			final Subgraph<T> graph,
+	public static void parseInto(
+			final Subgraph<?> graph,
 			final CharSequence graphText,
 			final EntityManager entityManager) {
 		parseInto(
-				(GraphImplementor<T>) graph,
+				(GraphImplementor<?>) graph,
 				graphText,
 				( (SessionImplementor) entityManager ).getSessionFactory()
 		);
@@ -232,12 +236,12 @@ public static <T> void parseInto(
 	 *
 	 * @throws InvalidGraphException if the textual representation is invalid.
 	 */
-	public static <T> void parseInto(
-			final Graph<T> graph,
+	public static void parseInto(
+			final Graph<?> graph,
 			final CharSequence graphText,
 			final EntityManagerFactory entityManagerFactory) {
 		parseInto(
-				(GraphImplementor<T>) graph,
+				(GraphImplementor<?>) graph,
 				graphText,
 				(SessionFactoryImplementor) entityManagerFactory
 		);
@@ -252,13 +256,12 @@ public static <T> void parseInto(
 	 *
 	 * @throws InvalidGraphException if the textual representation is invalid.
 	 */
-	@SuppressWarnings("unchecked")
-	public static <T> void parseInto(
-			final EntityGraph<T> graph,
+	public static void parseInto(
+			final EntityGraph<?> graph,
 			final CharSequence graphText,
 			final EntityManagerFactory entityManagerFactory) {
 		parseInto(
-				(GraphImplementor<T>) graph,
+				(GraphImplementor<?>) graph,
 				graphText,
 				(SessionFactoryImplementor) entityManagerFactory
 		);
@@ -273,13 +276,12 @@ public static <T> void parseInto(
 	 *
 	 * @throws InvalidGraphException if the textual representation is invalid.
 	 */
-	@SuppressWarnings("unchecked")
-	public static <T> void parseInto(
-			final Subgraph<T> graph,
+	public static void parseInto(
+			final Subgraph<?> graph,
 			final CharSequence graphText,
 			final EntityManagerFactory entityManagerFactory) {
 		parseInto(
-				(GraphImplementor<T>) graph,
+				(GraphImplementor<?>) graph,
 				graphText,
 				(SessionFactoryImplementor) entityManagerFactory
 		);
@@ -289,8 +291,6 @@ public static <T> void parseInto(
 	 * Parses the textual graph representation as {@linkplain GraphParser described above}
 	 * into the specified graph.
 	 *
-	 * @param <T> The Java type for the ManagedType described by `graph`
-	 *
 	 * @param graph The target graph.  This is the graph that will be populated
 	 * by this process
 	 * @param graphText Textual representation of the graph
@@ -298,8 +298,8 @@ public static <T> void parseInto(
 	 *
 	 * @throws InvalidGraphException if the textual representation is invalid.
 	 */
-	private static <T> void parseInto(
-			GraphImplementor<T> graph,
+	private static void parseInto(
+			GraphImplementor<?> graph,
 			final CharSequence graphText,
 			SessionFactoryImplementor sessionFactory) {
 		if ( graphText != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/GraphSemantic.java b/hibernate-core/src/main/java/org/hibernate/graph/GraphSemantic.java
index 862de7d95c79..212b63a9894d 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/GraphSemantic.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/GraphSemantic.java
@@ -4,6 +4,8 @@
  */
 package org.hibernate.graph;
 
+import jakarta.persistence.FindOption;
+
 import java.util.Locale;
 
 import static org.hibernate.jpa.LegacySpecHints.HINT_JAVAEE_FETCH_GRAPH;
@@ -17,7 +19,7 @@
  *
  * @author Steve Ebersole
  */
-public enum GraphSemantic {
+public enum GraphSemantic implements FindOption {
 	/**
 	 * Indicates that an {@link jakarta.persistence.EntityGraph} should be interpreted as a JPA "fetch graph".
 	 * <ul>
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java
index 6856698ea440..c2a8d329fd86 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java
@@ -45,9 +45,21 @@ public abstract sealed class AttributeNodeImpl<J, E, K>
 	protected final DomainType<E> valueGraphType;
 	protected final SimpleDomainType<K> keyGraphType;
 
+	protected boolean removed;
 	protected SubGraphImplementor<E> valueSubgraph;
 	protected SubGraphImplementor<K> keySubgraph;
 
+	@Override
+	public boolean isRemoved() {
+		return removed;
+	}
+
+	@Override
+	public AttributeNodeImplementor<J, E, K> markRemoved(boolean removed) {
+		this.removed = removed;
+		return this;
+	}
+
 	static <J> AttributeNodeImpl<J,?,?> create(
 			PersistentAttribute<?, J> attribute, boolean mutable) {
 		if ( attribute instanceof PluralPersistentAttribute<?, J, ?> pluralAttribute ) {
@@ -258,13 +270,13 @@ public SubGraphImplementor<E> makeSubGraph() {
 
 	@Override @Deprecated
 	public <S> SubGraphImplementor<S> makeSubGraph(Class<S> subtype) {
-		final ManagedDomainType<E> managedType = asManagedType( valueGraphType );
+		final var managedType = asManagedType( valueGraphType );
 		if ( !managedType.getJavaType().isAssignableFrom( subtype ) ) {
 			throw new IllegalArgumentException( "Not a subtype: " + subtype.getName() );
 		}
 		@SuppressWarnings("unchecked")
-		final Class<? extends E> castSuptype = (Class<? extends E>) subtype;
-		final SubGraphImplementor<? extends E> result = makeSubGraph().addTreatedSubgraph( castSuptype );
+		final var castSuptype = (Class<? extends E>) subtype;
+		final var result = makeSubGraph().addTreatedSubgraph( castSuptype );
 		//noinspection unchecked
 		return (SubGraphImplementor<S>) result;
 	}
@@ -282,13 +294,13 @@ public SubGraphImplementor<K> makeKeySubGraph() {
 	@Override @Deprecated
 	public <S> SubGraphImplementor<S> makeKeySubGraph(Class<S> subtype) {
 		checkMap();
-		final ManagedDomainType<K> type = asManagedType( keyGraphType );
+		final var type = asManagedType( keyGraphType );
 		if ( !type.getJavaType().isAssignableFrom( subtype ) ) {
 			throw new IllegalArgumentException( "Not a key subtype: " + subtype.getName() );
 		}
 		@SuppressWarnings("unchecked")
-		final Class<? extends K> castType = (Class<? extends K>) subtype;
-		final SubGraphImplementor<? extends K> result = makeKeySubGraph().addTreatedSubgraph( castType );
+		final var castType = (Class<? extends K>) subtype;
+		final var result = makeKeySubGraph().addTreatedSubgraph( castType );
 		//noinspection unchecked
 		return (SubGraphImplementor<S>) result;
 	}
@@ -323,7 +335,7 @@ public String toString() {
 	public void merge(AttributeNodeImplementor<J, E, K> that) {
 		assert that.isMutable() == isMutable();
 		assert that.getAttributeDescriptor() == attribute;
-		final SubGraphImplementor<E> otherValueSubgraph = that.getValueSubgraph();
+		final var otherValueSubgraph = that.getValueSubgraph();
 		if ( otherValueSubgraph != null ) {
 			if ( valueSubgraph == null ) {
 				valueSubgraph = otherValueSubgraph.makeCopy( isMutable() );
@@ -333,7 +345,7 @@ public void merge(AttributeNodeImplementor<J, E, K> that) {
 				valueSubgraph.mergeInternal( otherValueSubgraph );
 			}
 		}
-		final SubGraphImplementor<K> otherKeySubgraph = that.getKeySubgraph();
+		final var otherKeySubgraph = that.getKeySubgraph();
 		if ( otherKeySubgraph != null ) {
 			if ( keySubgraph == null ) {
 				keySubgraph = otherKeySubgraph.makeCopy( isMutable() );
@@ -351,7 +363,8 @@ public Map<Class<?>, SubGraphImplementor<?>> getSubGraphs() {
 			return emptyMap();
 		}
 		else {
-			final HashMap<Class<?>, SubGraphImplementor<?>> map = new HashMap<>( valueSubgraph.getTreatedSubgraphs() );
+			final HashMap<Class<?>, SubGraphImplementor<?>> map =
+					new HashMap<>( valueSubgraph.getTreatedSubgraphs() );
 			map.put( attribute.getValueGraphType().getJavaType(), valueSubgraph );
 			return map;
 		}
@@ -363,7 +376,8 @@ public Map<Class<?>, SubGraphImplementor<?>> getKeySubGraphs() {
 			return emptyMap();
 		}
 		else {
-			final HashMap<Class<?>, SubGraphImplementor<?>> map = new HashMap<>( keySubgraph.getTreatedSubgraphs() );
+			final HashMap<Class<?>, SubGraphImplementor<?>> map =
+					new HashMap<>( keySubgraph.getTreatedSubgraphs() );
 			map.put( attribute.getKeyGraphType().getJavaType(), keySubgraph );
 			return map;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/GraphImpl.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/GraphImpl.java
index cd40c149e714..0a819c7a5f59 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/GraphImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/GraphImpl.java
@@ -4,11 +4,7 @@
  */
 package org.hibernate.graph.internal;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import jakarta.persistence.metamodel.Attribute;
 import jakarta.persistence.metamodel.ManagedType;
 import jakarta.persistence.metamodel.MapAttribute;
 import jakarta.persistence.metamodel.PluralAttribute;
@@ -27,11 +23,15 @@
 import org.hibernate.metamodel.model.domain.PluralPersistentAttribute;
 import org.hibernate.query.sqm.SqmPathSource;
 
-import jakarta.persistence.metamodel.Attribute;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.unmodifiableMap;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toUnmodifiableList;
 
 /**
  *  Base class for {@link RootGraph} and {@link SubGraph} implementations.
@@ -68,151 +68,51 @@ protected GraphImpl(GraphImplementor<J> graph, boolean mutable) {
 	public final ManagedDomainType<J> getGraphedType() {
 		return managedType;
 	}
-
-	@SuppressWarnings("unchecked")
-	private <S extends J> SubGraphImplementor<S> getTreatedSubgraph(Class<S> javaType) {
-		return treatedSubgraphs == null ? null : (SubGraphImplementor<S>) treatedSubgraphs.get( javaType );
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> AttributeNodeImplementor<T,?,?> getNode(PersistentAttribute<?, ? extends T> attribute) {
-		return attributeNodes == null ? null : (AttributeNodeImplementor<T,?,?>) attributeNodes.get( attribute );
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T, E> AttributeNodeImplementor<T,E,?> getNode(PluralPersistentAttribute<?, T, E> attribute) {
-		return attributeNodes == null ? null : (AttributeNodeImplementor<T,E,?>) attributeNodes.get( attribute );
-	}
-
-	@SuppressWarnings("unchecked")
-	private <K, V> AttributeNodeImplementor<Map<K,V>, V, K> getNode(MapPersistentAttribute<?, K, V> attribute) {
-		return attributeNodes == null ? null : (AttributeNodeImplementor<Map<K,V>, V, K>) attributeNodes.get( attribute );
-	}
-
-	private <S extends J> SubGraphImplementor<S> getTreatedSubgraphForPut(Class<S> javaType) {
-		if ( treatedSubgraphs == null ) {
-			treatedSubgraphs = new HashMap<>(1);
-			return null;
-		}
-		else {
-			return getTreatedSubgraph( javaType );
-		}
-	}
-
-	private <AJ> AttributeNodeImplementor<AJ,?,?> getNodeForPut(PersistentAttribute<?, AJ> attribute) {
+	@Override
+	public List<jakarta.persistence.AttributeNode<?>> getAttributeNodes() {
 		if ( attributeNodes == null ) {
-			attributeNodes = new HashMap<>();
-			return null;
+			return emptyList();
 		}
 		else {
-			return getNode( attribute );
+			// we need to filter out removed nodes
+			return attributeNodes.values().stream()
+					.filter( (node) -> !node.isRemoved() )
+					.collect( toUnmodifiableList());
 		}
 	}
 
-	private <C, E> AttributeNodeImplementor<C,E,?> getNodeForPut(PluralPersistentAttribute<?, C, E> attribute) {
-		if ( attributeNodes == null ) {
-			attributeNodes = new HashMap<>();
-			return null;
-		}
-		else {
-			return getNode( attribute );
-		}
-	}
 
-	private <V, K> AttributeNodeImplementor<Map<K,V>, V, K> getNodeForPut(MapPersistentAttribute<?, K, V> attribute) {
+	@Override
+	public List<AttributeNodeImplementor<?,?,?>> getAttributeNodeList() {
 		if ( attributeNodes == null ) {
-			attributeNodes = new HashMap<>();
-			return null;
+			return emptyList();
 		}
 		else {
-			return getNode( attribute );
-		}
-	}
-
-	@Override @Deprecated(forRemoval = true)
-	public RootGraphImplementor<J> makeRootGraph(String name, boolean mutable) {
-		if ( getGraphedType() instanceof EntityDomainType ) {
-			return new RootGraphImpl<>( name, this, mutable);
-		}
-		else {
-			throw new CannotBecomeEntityGraphException( "Graph cannot be a root graph because '"
-														+ getGraphedType() + "' is not an entity type" );
-		}
-	}
-
-	@Override
-	public void merge(GraphImplementor<J> graph) {
-		if ( graph != null ) {
-			verifyMutability();
-			mergeInternal( graph );
+			// we need to filter out removed nodes
+			return attributeNodes.values().stream()
+					.filter( (node) -> !node.isRemoved() )
+					.toList();
 		}
 	}
 
 	@Override
-	public void mergeInternal(GraphImplementor<J> graph) {
-		// skip verifyMutability()
-		graph.getNodes().forEach( this::mergeNode );
-		graph.getTreatedSubgraphs().values().forEach( this::mergeGraph );
-	}
-
-	private void mergeNode(PersistentAttribute<? super J, ?> attribute, AttributeNodeImplementor<?,?,?> node) {
-		final AttributeNodeImplementor<?,?,?> existingNode = getNodeForPut( attribute );
-		if ( existingNode == null ) {
-			attributeNodes.put( attribute, node.makeCopy( isMutable() ) );
-		}
-		else {
-			// keep the local one, but merge in the incoming one
-			mergeNode( node, existingNode );
-		}
-	}
-
-	private <T extends J> void mergeGraph(SubGraphImplementor<T> subgraph) {
-		final Class<T> javaType = subgraph.getClassType();
-		final SubGraphImplementor<T> existing = getTreatedSubgraphForPut( javaType );
-		if ( existing == null ) {
-			treatedSubgraphs.put( javaType, subgraph.makeCopy( isMutable() ) );
-		}
-		else {
-			// even if immutable, we need to merge here
-			existing.mergeInternal( subgraph );
-		}
-	}
-
-	private static <T,E,K> void mergeNode(
-			AttributeNodeImplementor<?,?,?> node, AttributeNodeImplementor<T,E,K> existingNode) {
-		if ( existingNode.getAttributeDescriptor() == node.getAttributeDescriptor() ) {
-			@SuppressWarnings("unchecked") // safe, we just checked
-			final AttributeNodeImplementor<T,E,K> castNode = (AttributeNodeImplementor<T,E,K>) node;
-			existingNode.merge( castNode );
+	public Map<PersistentAttribute<? super J, ?>, AttributeNodeImplementor<?,?,?>> getNodes() {
+		if ( attributeNodes == null ) {
+			return emptyMap();
 		}
 		else {
-			throw new AssertionFailure( "Attributes should have been identical" );
+			return attributeNodes
+					.entrySet()
+					.stream()
+					.filter( (entry) -> !entry.getValue().isRemoved() )
+					.collect( toMap( Map.Entry::getKey, Map.Entry::getValue ) );
 		}
 	}
 
-	@Override
-	public List<AttributeNodeImplementor<?,?,?>> getAttributeNodeList() {
-		return attributeNodes == null ? emptyList() : new ArrayList<>( attributeNodes.values() );
-	}
-
 	@Override
 	public <AJ> AttributeNodeImplementor<AJ,?,?> findAttributeNode(String attributeName) {
-		final PersistentAttribute<? super J, ?> attribute = findAttributeInSupertypes( attributeName );
-		@SuppressWarnings("unchecked") // The JPA API is unsafe by nature
-		final PersistentAttribute<? super J, AJ> persistentAttribute = (PersistentAttribute<? super J, AJ>) attribute;
-		final AttributeNodeImplementor<AJ,?,?> node = attribute == null ? null : findAttributeNode( persistentAttribute );
-		if ( node == null && treatedSubgraphs != null ) {
-			for ( SubGraphImplementor<?> subgraph : treatedSubgraphs.values() ) {
-				final AttributeNodeImplementor<AJ,?,?> subgraphNode = subgraph.findAttributeNode( attributeName );
-				if ( subgraphNode != null ) {
-					return subgraphNode;
-				}
-			}
-			return null;
-		}
-		else {
-			return node;
-		}
+		final AttributeNodeImplementor<AJ,?,?> node = findNode( attributeName );
+		return node == null || node.isRemoved() ? null : node;
 	}
 
 	@Override
@@ -222,32 +122,26 @@ public <Y> AttributeNodeImplementor<Y,?,?> getAttributeNode(String attributeName
 
 	@Override
 	public <AJ> AttributeNodeImplementor<AJ,?,?> findAttributeNode(PersistentAttribute<? super J, AJ> attribute) {
-		return getNode( attribute );
+		return getActiveNode( attribute );
 	}
 
 	@Override
 	public <Y> AttributeNodeImplementor<Y,?,?> getAttributeNode(Attribute<? super J, Y> attribute) {
-		return getNode( (PersistentAttribute<?, ? extends Y>) attribute );
-	}
-
-	@Override
-	public List<jakarta.persistence.AttributeNode<?>> getAttributeNodes() {
-		return attributeNodes == null ? emptyList() : new ArrayList<>( attributeNodes.values() );
-	}
-
-	@Override
-	public Map<PersistentAttribute<? super J, ?>, AttributeNodeImplementor<?,?,?>> getNodes() {
-		return attributeNodes == null ? emptyMap() : unmodifiableMap( attributeNodes );
+		return getActiveNode( (PersistentAttribute<?, ? extends Y>) attribute );
 	}
 
 	@Override
 	public <AJ> AttributeNodeImplementor<AJ,?,?> addAttributeNode(String attributeName) {
-		return findOrCreateAttributeNode( attributeName );
+		final AttributeNodeImplementor<AJ, ?, ?> node = findOrCreateAttributeNode( attributeName );
+		node.markRemoved( false );
+		return node;
 	}
 
 	@Override
 	public <AJ> AttributeNodeImplementor<AJ,?,?> addAttributeNode(PersistentAttribute<? super J, AJ> attribute) {
-		return findOrCreateAttributeNode( attribute );
+		final AttributeNodeImplementor<AJ, ?, ?> node = findOrCreateAttributeNode( attribute );
+		node.markRemoved( false );
+		return node;
 	}
 
 	@Override
@@ -264,7 +158,7 @@ public void addAttributeNodes(String... attributeNames) {
 
 	@Override @SafeVarargs
 	public final void addAttributeNodes(Attribute<? super J, ?>... attributes) {
-		for ( Attribute<? super J, ?> attribute : attributes ) {
+		for ( var attribute : attributes ) {
 			addAttributeNode( attribute );
 		}
 	}
@@ -272,27 +166,33 @@ public final void addAttributeNodes(Attribute<? super J, ?>... attributes) {
 	@Override
 	public void removeAttributeNode(String attributeName) {
 		verifyMutability();
-		attributeNodes.remove( managedType.findAttribute( attributeName ) );
+		removeAttributeNode( managedType.findAttribute( attributeName ) );
 	}
 
 	@Override
 	public void removeAttributeNode(Attribute<? super J, ?> attribute) {
 		verifyMutability();
-		attributeNodes.remove( (PersistentAttribute<? super J, ?>) attribute );
+		findOrCreateAttributeNode( (PersistentAttribute<? super J, ?>) attribute ).markRemoved( true );
 	}
 
 	@Override
 	public void removeAttributeNodes(Attribute.PersistentAttributeType nodeType) {
 		verifyMutability();
-		attributeNodes.keySet().removeIf( entry -> entry.getPersistentAttributeType() == nodeType );
+		for ( Attribute<? super J, ?> typeAttribute : managedType.getAttributes() ) {
+			if ( typeAttribute.getPersistentAttributeType() != nodeType ) {
+				continue;
+			}
+
+			findOrCreateAttributeNode( (PersistentAttribute<? super J, ?>) typeAttribute ).markRemoved( true );
+		}
 	}
 
 	@Override
 	public <AJ> AttributeNodeImplementor<AJ,?,?> findOrCreateAttributeNode(PersistentAttribute<? super J, AJ> attribute) {
 		verifyMutability();
-		final AttributeNodeImplementor<AJ,?,?> node = getNodeForPut( attribute );
+		final var node = getNodeForPut( attribute );
 		if ( node == null ) {
-			final AttributeNodeImplementor<AJ,?,?> newAttrNode = AttributeNodeImpl.create( attribute, isMutable() );
+			final var newAttrNode = AttributeNodeImpl.create( attribute, isMutable() );
 			attributeNodes.put( attribute, newAttrNode );
 			return newAttrNode;
 		}
@@ -303,9 +203,9 @@ public <AJ> AttributeNodeImplementor<AJ,?,?> findOrCreateAttributeNode(Persisten
 
 	private <C,E> AttributeNodeImplementor<C,E,?> findOrCreateAttributeNode(PluralPersistentAttribute<? super J, C, E> attribute) {
 		verifyMutability();
-		final AttributeNodeImplementor<C,E,?> node = getNodeForPut( attribute );
+		final var node = getNodeForPut( attribute );
 		if ( node == null ) {
-			final AttributeNodeImplementor<C,E,?> newAttrNode = AttributeNodeImpl.create( attribute, isMutable() );
+			final var newAttrNode = AttributeNodeImpl.create( attribute, isMutable() );
 			attributeNodes.put( attribute, newAttrNode );
 			return newAttrNode;
 		}
@@ -316,9 +216,9 @@ private <C,E> AttributeNodeImplementor<C,E,?> findOrCreateAttributeNode(PluralPe
 
 	private <K,V> AttributeNodeImplementor<Map<K,V>,V,K> findOrCreateAttributeNode(MapPersistentAttribute<? super J, K, V> attribute) {
 		verifyMutability();
-		final AttributeNodeImplementor<Map<K,V>,V,K> node = getNodeForPut( attribute );
+		final var node = getNodeForPut( attribute );
 		if ( node == null ) {
-			final AttributeNodeImplementor<Map<K,V>,V,K> newAttrNode = AttributeNodeImpl.create( attribute, isMutable() );
+			final var newAttrNode = AttributeNodeImpl.create( attribute, isMutable() );
 			attributeNodes.put( attribute, newAttrNode );
 			return newAttrNode;
 		}
@@ -329,26 +229,199 @@ private <K,V> AttributeNodeImplementor<Map<K,V>,V,K> findOrCreateAttributeNode(M
 
 	@Override
 	public <AJ> AttributeNodeImplementor<AJ,?,?> findOrCreateAttributeNode(String attributeName) {
-		final PersistentAttribute<? super J, ?> attribute = getAttribute( attributeName );
+		final var attribute = getAttribute( attributeName );
 		@SuppressWarnings("unchecked") // The JPA API is unsafe by nature
-		final PersistentAttribute<? super J, AJ> persistentAttribute = (PersistentAttribute<? super J, AJ>) attribute;
+		final var persistentAttribute = (PersistentAttribute<? super J, AJ>) attribute;
 		return findOrCreateAttributeNode( persistentAttribute );
 	}
 
 	private PersistentAttribute<? super J, ?> findAttributeInSupertypes(String attributeName) {
-		final PersistentAttribute<? super J, ?> attribute = managedType.findAttributeInSuperTypes( attributeName );
+		final var attribute = managedType.findAttributeInSuperTypes( attributeName );
 		return attribute instanceof SqmPathSource<?> sqmPathSource && sqmPathSource.isGeneric()
 				? managedType.findConcreteGenericAttribute( attributeName )
 				: attribute;
 	}
 
 	private PersistentAttribute<? super J, ?> getAttribute(String attributeName) {
-		final PersistentAttribute<? super J, ?> attribute = managedType.getAttribute( attributeName );
+		final var attribute = managedType.getAttribute( attributeName );
 		return attribute instanceof SqmPathSource<?> sqmPathSource && sqmPathSource.isGeneric()
 				? managedType.findConcreteGenericAttribute( attributeName )
 				: attribute;
 	}
 
+	@Override
+	public <T> AttributeNodeImplementor<T,?,?> findNode(String attributeName) {
+		//noinspection unchecked
+		final var attribute = (PersistentAttribute<? super J,T>) findAttributeInSupertypes( attributeName );
+		if ( attribute != null ) {
+			final var node = getExistingNode( attribute );
+			if ( node != null ) {
+				return node;
+			}
+		}
+
+		if ( treatedSubgraphs != null ) {
+			for ( var subgraph : treatedSubgraphs.values() ) {
+				final AttributeNodeImplementor<T,?,?> subgraphNode = subgraph.getExistingNode( attributeName );
+				if ( subgraphNode != null ) {
+					return subgraphNode;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> AttributeNodeImplementor<T,?,?> getExistingNode(PersistentAttribute<?, ? extends T> attribute) {
+		if ( attributeNodes == null ) {
+			return null;
+		}
+		return (AttributeNodeImplementor<T,?,?>) attributeNodes.get( attribute );
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> AttributeNodeImplementor<T,?,?> getExistingNode(String attributeName) {
+		if ( attributeNodes == null ) {
+			return null;
+		}
+		return (AttributeNodeImplementor<T,?,?>) attributeNodes.get( managedType.getAttribute( attributeName ) );
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T> AttributeNodeImplementor<T,?,?> getActiveNode(PersistentAttribute<?, ? extends T> attribute) {
+		if ( attributeNodes == null ) {
+			return null;
+		}
+		final AttributeNodeImplementor<?, ?, ?> node = attributeNodes.get( attribute );
+		if ( node == null || node.isRemoved() ) {
+			return null;
+		}
+		return (AttributeNodeImplementor<T,?,?>) node;
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T, E> AttributeNodeImplementor<T,E,?> getActiveNode(PluralPersistentAttribute<?, T, E> attribute) {
+		return (AttributeNodeImplementor<T, E, ?>) getActiveNode( (PersistentAttribute<?,? extends T>) attribute );
+	}
+
+	@SuppressWarnings("unchecked")
+	private <K, V> AttributeNodeImplementor<Map<K,V>, V, K> getActiveNode(MapPersistentAttribute<?, K, V> attribute) {
+		return (AttributeNodeImplementor<Map<K, V>, V, K>) getActiveNode( (PersistentAttribute<?,? extends V>) attribute );
+	}
+
+	private <AJ> AttributeNodeImplementor<AJ,?,?> getNodeForPut(PersistentAttribute<?, AJ> attribute) {
+		if ( attributeNodes == null ) {
+			attributeNodes = new HashMap<>();
+			return null;
+		}
+		else {
+			return getActiveNode( attribute );
+		}
+	}
+
+	private <C, E> AttributeNodeImplementor<C,E,?> getNodeForPut(PluralPersistentAttribute<?, C, E> attribute) {
+		if ( attributeNodes == null ) {
+			attributeNodes = new HashMap<>();
+			return null;
+		}
+		else {
+			return getActiveNode( attribute );
+		}
+	}
+
+	private <V, K> AttributeNodeImplementor<Map<K,V>, V, K> getNodeForPut(MapPersistentAttribute<?, K, V> attribute) {
+		if ( attributeNodes == null ) {
+			attributeNodes = new HashMap<>();
+			return null;
+		}
+		else {
+			return getActiveNode( attribute );
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private <S extends J> SubGraphImplementor<S> getTreatedSubgraph(Class<S> javaType) {
+		return treatedSubgraphs == null ? null : (SubGraphImplementor<S>) treatedSubgraphs.get( javaType );
+	}
+
+	private <S extends J> SubGraphImplementor<S> getTreatedSubgraphForPut(Class<S> javaType) {
+		if ( treatedSubgraphs == null ) {
+			treatedSubgraphs = new HashMap<>(1);
+			return null;
+		}
+		else {
+			return getTreatedSubgraph( javaType );
+		}
+	}
+
+
+
+	@Override @Deprecated(forRemoval = true)
+	public RootGraphImplementor<J> makeRootGraph(String name, boolean mutable) {
+		if ( getGraphedType() instanceof EntityDomainType ) {
+			return new RootGraphImpl<>( name, this, mutable);
+		}
+		else {
+			throw new CannotBecomeEntityGraphException( "Graph cannot be a root graph because '"
+														+ getGraphedType() + "' is not an entity type" );
+		}
+	}
+
+	@Override
+	public void merge(GraphImplementor<J> graph) {
+		if ( graph != null ) {
+			verifyMutability();
+			mergeInternal( graph );
+		}
+	}
+
+	@Override
+	public void mergeInternal(GraphImplementor<J> graph) {
+		// skip verifyMutability()
+		graph.getNodes().forEach( this::mergeNode );
+		graph.getTreatedSubgraphs().values().forEach( this::mergeGraph );
+	}
+
+	private void mergeNode(PersistentAttribute<? super J, ?> attribute, AttributeNodeImplementor<?,?,?> node) {
+		final var existingNode = getNodeForPut( attribute );
+		if ( existingNode == null ) {
+			attributeNodes.put( attribute, node.makeCopy( isMutable() ) );
+		}
+		else {
+			// keep the local one but merge in the incoming one
+			mergeNode( node, existingNode );
+		}
+	}
+
+	private <T extends J> void mergeGraph(SubGraphImplementor<T> subgraph) {
+		final var javaType = subgraph.getClassType();
+		final var existing = getTreatedSubgraphForPut( javaType );
+		if ( existing == null ) {
+			treatedSubgraphs.put( javaType, subgraph.makeCopy( isMutable() ) );
+		}
+		else {
+			// even if immutable, we need to merge here
+			existing.mergeInternal( subgraph );
+		}
+	}
+
+	private static <T,E,K> void mergeNode(
+			AttributeNodeImplementor<?,?,?> node, AttributeNodeImplementor<T,E,K> existingNode) {
+		if ( existingNode.getAttributeDescriptor() == node.getAttributeDescriptor() ) {
+			@SuppressWarnings("unchecked") // safe, we just checked
+			final var castNode = (AttributeNodeImplementor<T,E,K>) node;
+			existingNode.merge( castNode );
+		}
+		else {
+			throw new AssertionFailure( "Attributes should have been identical" );
+		}
+	}
+
+
+
 	@Override @SuppressWarnings("unchecked") // The JPA API is unsafe by nature
 	public <X> SubGraphImplementor<X> addSubgraph(String attributeName) {
 		return (SubGraphImplementor<X>) findOrCreateAttributeNode( attributeName ).addValueSubgraph();
@@ -470,10 +543,10 @@ public <S extends J> SubGraphImplementor<S> addTreatedSubgraph(ManagedType<S> ty
 			return (SubGraphImplementor<S>) this;
 		}
 		else {
-			final Class<S> javaType = type.getJavaType();
-			final SubGraphImplementor<S> castSubgraph = getTreatedSubgraphForPut( javaType );
+			final var javaType = type.getJavaType();
+			final var castSubgraph = getTreatedSubgraphForPut( javaType );
 			if ( castSubgraph == null ) {
-				final SubGraphImpl<S> subgraph = new SubGraphImpl<>( (ManagedDomainType<S>) type, true );
+				final var subgraph = new SubGraphImpl<>( (ManagedDomainType<S>) type, true );
 				treatedSubgraphs.put( javaType, subgraph );
 				return subgraph;
 			}
@@ -495,7 +568,7 @@ public Map<Class<? extends J>, SubGraphImplementor<? extends J>> getTreatedSubgr
 
 	@Override
 	public String toString() {
-		final StringBuilder builder = new StringBuilder( "Graph[" ).append( managedType.getTypeName() );
+		final var builder = new StringBuilder( "Graph[" ).append( managedType.getTypeName() );
 		if ( attributeNodes != null ) {
 			builder.append( ", nodes=" )
 					.append( attributeNodes.values().stream()
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/EntityNameResolverSessionFactory.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/EntityNameResolverSessionFactory.java
deleted file mode 100644
index 88f601c9d6d0..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/EntityNameResolverSessionFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.graph.internal.parse;
-
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.metamodel.model.domain.EntityDomainType;
-
-/**
- * @author Steve Ebersole
- */
-public class EntityNameResolverSessionFactory implements EntityNameResolver {
-	private final SessionFactoryImplementor sessionFactory;
-
-	public EntityNameResolverSessionFactory(SessionFactoryImplementor sessionFactory) {
-		this.sessionFactory = sessionFactory;
-	}
-
-	@Override
-	public <T> EntityDomainType<T> resolveEntityName(String entityName) {
-		//noinspection unchecked
-		return (EntityDomainType<T>) sessionFactory.getJpaMetamodel().findEntityType( entityName );
-	}
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java
index e02e5f06ee03..00caf8f1be11 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParser.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.graph.internal.parse;
 
+import org.hibernate.UnknownEntityTypeException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.grammars.graph.GraphLanguageParser;
 import org.hibernate.grammars.graph.GraphLanguageParserBaseVisitor;
@@ -11,12 +12,14 @@
 import org.hibernate.graph.InvalidGraphException;
 import org.hibernate.graph.spi.AttributeNodeImplementor;
 import org.hibernate.graph.spi.GraphImplementor;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.spi.SubGraphImplementor;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.internal.util.collections.StandardStack;
+import org.hibernate.metamodel.model.domain.EntityDomainType;
 
 import static org.hibernate.graph.internal.GraphParserLogging.PARSING_LOGGER;
+import static org.hibernate.internal.util.StringHelper.repeat;
 
 /**
  * Unified access to the Antlr parser for Hibernate's "graph language"
@@ -24,24 +27,23 @@
  * @author Steve Ebersole
  */
 public class GraphParser extends GraphLanguageParserBaseVisitor<GraphNode<?>> {
-	private final EntityNameResolver entityNameResolver;
+	private final GraphParserEntityNameResolver entityNameResolver;
 
 	private final Stack<GraphImplementor<?>> graphStack = new StandardStack<>();
-	private final Stack<AttributeNodeImplementor<?,?,?>> attributeNodeStack = new StandardStack<>();
+	private final Stack<AttributeNodeImplementor<?, ?, ?>> attributeNodeStack = new StandardStack<>();
 	private final Stack<SubGraphGenerator> graphSourceStack = new StandardStack<>();
 
-	public GraphParser(EntityNameResolver entityNameResolver) {
+	public GraphParser(GraphParserEntityNameResolver entityNameResolver) {
 		this.entityNameResolver = entityNameResolver;
 	}
 
 	/**
 	 * @apiNote It is important that this form only be used after the session-factory is fully
 	 * initialized, especially the {@linkplain SessionFactoryImplementor#getJpaMetamodel()} JPA metamodel}.
-	 *
-	 * @see GraphParser#GraphParser(EntityNameResolver)
+	 * @see GraphParser#GraphParser(GraphParserEntityNameResolver)
 	 */
 	public GraphParser(SessionFactoryImplementor sessionFactory) {
-		this( new EntityNameResolverSessionFactory( sessionFactory ) );
+		this( sessionFactory.getJpaMetamodel()::findEntityType );
 	}
 
 	public Stack<GraphImplementor<?>> getGraphStack() {
@@ -49,70 +51,101 @@ public Stack<GraphImplementor<?>> getGraphStack() {
 	}
 
 	@Override
-	public AttributeNodeImplementor<?,?,?> visitAttributeNode(GraphLanguageParser.AttributeNodeContext attributeNodeContext) {
-		final String attributeName = attributeNodeContext.attributePath().ATTR_NAME().getText();
+	public AttributeNodeImplementor<?, ?, ?> visitAttributeNode(GraphLanguageParser.AttributeNodeContext attributeNodeContext) {
+		final var attributePathContext = attributeNodeContext.attributePath();
+		final var attributeQualifierContext = attributePathContext.attributeQualifier();
 
-		final SubGraphGenerator subGraphCreator;
+		final String attributeName = attributePathContext.ATTR_NAME().getText();
 
-		if ( attributeNodeContext.attributePath().attributeQualifier() == null ) {
+		final var subGraphCreator = subGraphCreator( attributeQualifierContext, attributeName );
+
+		final var attributeNode = resolveAttributeNode( attributeName );
+
+		if ( attributeNodeContext.subGraph() != null ) {
+			attributeNodeStack.push( attributeNode );
+			graphSourceStack.push( subGraphCreator );
+
+			try {
+				visitSubGraph( attributeNodeContext.subGraph() );
+
+			}
+			finally {
+				graphSourceStack.pop();
+				attributeNodeStack.pop();
+			}
+		}
+
+		if ( PARSING_LOGGER.isTraceEnabled() ) {
+			PARSING_LOGGER.tracef(
+					"%s Finished attribute : %s",
+					repeat( "<<", attributeNodeStack.depth() + 1 ),
+					attributeName
+			);
+		}
+
+		return attributeNode;
+	}
+
+	private SubGraphGenerator subGraphCreator(GraphLanguageParser.AttributeQualifierContext attributeQualifierContext, String attributeName) {
+		if ( attributeQualifierContext == null ) {
 			if ( PARSING_LOGGER.isTraceEnabled() ) {
 				PARSING_LOGGER.tracef(
 						"%s Start attribute : %s",
-						StringHelper.repeat( ">>", attributeNodeStack.depth() + 1 ),
+						repeat( ">>", attributeNodeStack.depth() + 1 ),
 						attributeName
 				);
 			}
-
-			subGraphCreator = PathQualifierType.VALUE.getSubGraphCreator();
+			return PathQualifierType.VALUE.getSubGraphCreator();
 		}
 		else {
-			final String qualifierName = attributeNodeContext.attributePath().attributeQualifier().ATTR_NAME().getText();
-
+			final String qualifierName = attributeQualifierContext.ATTR_NAME().getText();
 			if ( PARSING_LOGGER.isTraceEnabled() ) {
 				PARSING_LOGGER.tracef(
 						"%s Start qualified attribute : %s.%s",
-						StringHelper.repeat( ">>", attributeNodeStack.depth() + 1 ),
+						repeat( ">>", attributeNodeStack.depth() + 1 ),
 						attributeName,
 						qualifierName
 				);
 			}
-
-			final PathQualifierType pathQualifierType = resolvePathQualifier( qualifierName );
-			subGraphCreator = pathQualifierType.getSubGraphCreator();
+			return resolvePathQualifier( qualifierName ).getSubGraphCreator();
 		}
+	}
 
-		final AttributeNodeImplementor<?,?,?> attributeNode = resolveAttributeNode( attributeName );
+	private SubGraphImplementor<?> createSubGraph(AttributeNodeImplementor<?, ?, ?> attributeNode, String subTypeName) {
 
-		if ( attributeNodeContext.subGraph() != null ) {
-			attributeNodeStack.push( attributeNode );
-			graphSourceStack.push( subGraphCreator );
+		final var shouldCreateTreatedSubgraph = attributeNode == null && subTypeName != null;
 
-			try {
-				visitSubGraph( attributeNodeContext.subGraph() );
+		if ( shouldCreateTreatedSubgraph ) {
+			final var currentGraph = graphStack.getCurrent();
 
+			final EntityDomainType entityDomainType = entityNameResolver.resolveEntityName( subTypeName );
+
+			if ( entityDomainType == null ) {
+				throw new UnknownEntityTypeException( subTypeName );
 			}
-			finally {
-				graphSourceStack.pop();
-				attributeNodeStack.pop();
-			}
-		}
 
-		if ( PARSING_LOGGER.isTraceEnabled() ) {
-			PARSING_LOGGER.tracef(
-					"%s Finished attribute : %s",
-					StringHelper.repeat( "<<", attributeNodeStack.depth() + 1 ),
-					attributeName
+			return currentGraph.addTreatedSubgraph(
+					entityDomainType
 			);
+
 		}
 
-		return attributeNode;
+
+		final var subGraphCreator = graphSourceStack.getCurrent();
+
+		return subGraphCreator.createSubGraph(
+				attributeNode,
+				subTypeName,
+				entityNameResolver
+		);
+
 	}
 
-	private AttributeNodeImplementor<?,?,?> resolveAttributeNode(String attributeName) {
-		final GraphImplementor<?> currentGraph = graphStack.getCurrent();
+	private AttributeNodeImplementor<?, ?, ?> resolveAttributeNode(String attributeName) {
+		final var currentGraph = graphStack.getCurrent();
 		assert currentGraph != null;
 
-		final AttributeNodeImplementor<?,?,?> attributeNode = currentGraph.findOrCreateAttributeNode( attributeName );
+		final var attributeNode = currentGraph.findOrCreateAttributeNode( attributeName );
 		assert attributeNode != null;
 
 		return attributeNode;
@@ -132,24 +165,21 @@ private PathQualifierType resolvePathQualifier(String qualifier) {
 
 	@Override
 	public SubGraphImplementor<?> visitSubGraph(GraphLanguageParser.SubGraphContext subGraphContext) {
-		final String subTypeName = subGraphContext.typeIndicator() == null ? null : subGraphContext.typeIndicator().TYPE_NAME().getText();
+		final String subTypeName =
+				subGraphContext.subTypeIndicator() == null ? null
+						: subGraphContext.subTypeIndicator().TYPE_NAME().getText();
 
 		if ( PARSING_LOGGER.isTraceEnabled() ) {
 			PARSING_LOGGER.tracef(
 					"%s Starting graph: %s",
-					StringHelper.repeat( ">>", attributeNodeStack.depth() + 2 ),
+					repeat( ">>", attributeNodeStack.depth() + 2 ),
 					subTypeName
 			);
 		}
 
-		final AttributeNodeImplementor<?,?,?> attributeNode = attributeNodeStack.getCurrent();
-		final SubGraphGenerator subGraphCreator = graphSourceStack.getCurrent();
+		final var attributeNode = attributeNodeStack.getCurrent();
 
-		final SubGraphImplementor<?> subGraph = subGraphCreator.createSubGraph(
-				attributeNode,
-				subTypeName,
-				entityNameResolver
-		);
+		final var subGraph = createSubGraph( attributeNode, subTypeName );
 
 		graphStack.push( subGraph );
 
@@ -163,7 +193,7 @@ public SubGraphImplementor<?> visitSubGraph(GraphLanguageParser.SubGraphContext
 		if ( PARSING_LOGGER.isTraceEnabled() ) {
 			PARSING_LOGGER.tracef(
 					"%s Finished graph : %s",
-					StringHelper.repeat( "<<", attributeNodeStack.depth() + 2 ),
+					repeat( "<<", attributeNodeStack.depth() + 2 ),
 					subGraph.getGraphedType().getTypeName()
 			);
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java
index 2c8be74ef601..92e020f253d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/GraphParsing.java
@@ -6,12 +6,18 @@
 
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
+
+import org.hibernate.GraphParserMode;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.grammars.graph.GraphLanguageLexer;
 import org.hibernate.grammars.graph.GraphLanguageParser;
-import org.hibernate.graph.InvalidGraphException;
-import org.hibernate.graph.internal.RootGraphImpl;
+import org.hibernate.grammars.graph.LegacyGraphLanguageParser;
+import org.hibernate.graph.internal.parse.strategy.ModernGraphParsingStrategy;
+import org.hibernate.graph.internal.parse.strategy.GraphParsingStrategy;
+import org.hibernate.graph.internal.parse.strategy.LegacyGraphParsingStrategy;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.spi.GraphImplementor;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
@@ -22,127 +28,85 @@
  * @author Steve Ebersole
  */
 public class GraphParsing {
+
 	public static <T> RootGraphImplementor<T> parse(
-			Class<T> entityClass,
+			EntityDomainType<T> entityDomainType,
 			String graphText,
 			SessionFactoryImplementor sessionFactory) {
-		if ( graphText == null ) {
-			return null;
-		}
-
-		final GraphLanguageLexer lexer = new GraphLanguageLexer( CharStreams.fromString( graphText ) );
-		final GraphLanguageParser parser = new GraphLanguageParser( new CommonTokenStream( lexer ) );
-		final GraphLanguageParser.GraphContext graphContext = parser.graph();
-
-		if ( graphContext.typeIndicator() != null ) {
-			// todo : an alternative here would be to simply validate that the entity type
-			//  	from the text matches the passed one...
-			throw new InvalidGraphException( "Expecting graph text to not include an entity name : " + graphText );
-		}
-
-		final EntityDomainType<T> entityType = sessionFactory.getJpaMetamodel().entity( entityClass );
-		return parse( entityType, graphContext.attributeList(), sessionFactory );
+		return getGraphParsingStrategy( sessionFactory ).parse(
+				entityDomainType,
+				graphText,
+				sessionFactory
+		);
 	}
 
 	public static <T> RootGraphImplementor<T> parse(
-			EntityDomainType<T> entityDomainType,
+			Class<T> entityClass,
 			String graphText,
 			SessionFactoryImplementor sessionFactory) {
-		if ( graphText == null ) {
-			return null;
-		}
-
-		final GraphLanguageLexer lexer = new GraphLanguageLexer( CharStreams.fromString( graphText ) );
-		final GraphLanguageParser parser = new GraphLanguageParser( new CommonTokenStream( lexer ) );
-		final GraphLanguageParser.GraphContext graphContext = parser.graph();
-
-		if ( graphContext.typeIndicator() != null ) {
-			// todo : an alternative here would be to simply validate that the entity type
-			//  	from the text matches the passed one...
-			throw new InvalidGraphException( "Expecting graph text to not include an entity name : " + graphText );
-		}
-
-		return parse( entityDomainType, graphContext.attributeList(), sessionFactory );
+		return parse( sessionFactory.getJpaMetamodel().entity( entityClass ),
+				graphText, sessionFactory );
 	}
 
-	public static <T> RootGraphImplementor<T> parse(
+	public static RootGraphImplementor<?> parse(
 			String entityName,
 			String graphText,
 			SessionFactoryImplementor sessionFactory) {
-		if ( graphText == null ) {
-			return null;
-		}
-
-		final GraphLanguageLexer lexer = new GraphLanguageLexer( CharStreams.fromString( graphText ) );
-		final GraphLanguageParser parser = new GraphLanguageParser( new CommonTokenStream( lexer ) );
-		final GraphLanguageParser.GraphContext graphContext = parser.graph();
-
-		if ( graphContext.typeIndicator() != null ) {
-			// todo : an alternative here would be to simply validate that the entity type
-			//  	from the text matches the passed one...
-			throw new InvalidGraphException( "Expecting graph text to not include an entity name : " + graphText );
-		}
-
-		//noinspection unchecked
-		final EntityDomainType<T> entityType = (EntityDomainType<T>) sessionFactory.getJpaMetamodel().entity( entityName );
-		return parse( entityType, graphContext.attributeList(), sessionFactory );
+		return parse( sessionFactory.getJpaMetamodel().entity( entityName ),
+				graphText, sessionFactory );
 	}
 
-	public static <T> RootGraphImplementor<T> parse(
+	@Deprecated(forRemoval = true)
+	public static RootGraphImplementor<?> parse(
 			String graphText,
 			SessionFactoryImplementor sessionFactory) {
-		if ( graphText == null ) {
-			return null;
-		}
-
-		final GraphLanguageLexer lexer = new GraphLanguageLexer( CharStreams.fromString( graphText ) );
-		final GraphLanguageParser parser = new GraphLanguageParser( new CommonTokenStream( lexer ) );
-		final GraphLanguageParser.GraphContext graphContext = parser.graph();
-
-		if ( graphContext.typeIndicator() == null ) {
-			throw new InvalidGraphException( "Expecting graph text to include an entity name : " + graphText );
-		}
-
-		final String entityName = graphContext.typeIndicator().TYPE_NAME().getText();
 
-		//noinspection unchecked
-		final EntityDomainType<T> entityType = (EntityDomainType<T>) sessionFactory.getJpaMetamodel().entity( entityName );
-		return parse( entityType, graphContext.attributeList(), sessionFactory );
+		return getGraphParsingStrategy( sessionFactory ).parse( graphText, sessionFactory );
 	}
 
-	public static <T> RootGraphImplementor<T> parse(
+	public static <T> RootGraphImplementor<T> visit(
 			EntityDomainType<T> rootType,
-			GraphLanguageParser.AttributeListContext attributeListContext,
+			LegacyGraphLanguageParser.AttributeListContext attributeListContext,
 			SessionFactoryImplementor sessionFactory) {
-		return parse( rootType, attributeListContext, new EntityNameResolverSessionFactory( sessionFactory ) );
+		return visit( rootType, attributeListContext, sessionFactory.getJpaMetamodel()::findEntityType );
 	}
 
-	public static <T> RootGraphImplementor<T> parse(
+	public static <T> RootGraphImplementor<T> visit(
 			EntityDomainType<T> rootType,
-			GraphLanguageParser.AttributeListContext attributeListContext,
-			EntityNameResolver entityNameResolver) {
-		return parse( null, rootType, attributeListContext, entityNameResolver );
+			LegacyGraphLanguageParser.AttributeListContext attributeListContext,
+			GraphParserEntityNameResolver entityNameResolver) {
+		return visit( null, rootType, attributeListContext, entityNameResolver );
 	}
 
-	public static <T> RootGraphImplementor<T> parse(
+	@Deprecated(forRemoval = true)
+	public static LegacyGraphLanguageParser.@NonNull GraphContext parseLegacyGraphText(String graphText) {
+		final var lexer = new GraphLanguageLexer( CharStreams.fromString( graphText ) );
+		final var parser = new LegacyGraphLanguageParser( new CommonTokenStream( lexer ) );
+		return parser.graph();
+	}
+
+	public static GraphLanguageParser.@NonNull GraphContext parseText(String graphText) {
+		final var lexer = new GraphLanguageLexer( CharStreams.fromString( graphText ) );
+		final var parser = new GraphLanguageParser( new CommonTokenStream( lexer ) );
+		return parser.graph();
+	}
+
+	public static <T> RootGraphImplementor<T> visit(
 			@Nullable String name,
 			EntityDomainType<T> rootType,
-			GraphLanguageParser.AttributeListContext attributeListContext,
-			EntityNameResolver entityNameResolver) {
-		final RootGraphImpl<T> targetGraph = new RootGraphImpl<>( name, rootType );
-
-		final GraphParser visitor = new GraphParser( entityNameResolver );
-		visitor.getGraphStack().push( targetGraph );
-		try {
-			visitor.visitAttributeList( attributeListContext );
-		}
-		finally {
-			visitor.getGraphStack().pop();
+			LegacyGraphLanguageParser.AttributeListContext graphElementListContext,
+			GraphParserEntityNameResolver entityNameResolver) {
 
-			assert visitor.getGraphStack().isEmpty();
-		}
+		return LegacyGraphParsingStrategy.parse( name, rootType, graphElementListContext, entityNameResolver );
+	}
 
-		return targetGraph;
+	public static <T> RootGraphImplementor<T> visit(
+			@Nullable String name,
+			EntityDomainType<T> rootType,
+			GraphLanguageParser.GraphElementListContext graphElementListContext,
+			GraphParserEntityNameResolver entityNameResolver) {
+
+		return ModernGraphParsingStrategy.parse( name, rootType, graphElementListContext, entityNameResolver );
 	}
 
 	/**
@@ -153,26 +117,18 @@ public static void parseInto(
 			GraphImplementor<?> targetGraph,
 			CharSequence graphString,
 			SessionFactoryImplementor sessionFactory) {
-		final GraphLanguageLexer lexer = new GraphLanguageLexer( CharStreams.fromString( graphString.toString() ) );
-		final GraphLanguageParser parser = new GraphLanguageParser( new CommonTokenStream( lexer ) );
-		final GraphLanguageParser.GraphContext graphContext = parser.graph();
 
-		if ( graphContext.typeIndicator() != null ) {
-			// todo : throw an exception?  Log warning?  Ignore?
-			//		for now, ignore
-		}
+		getGraphParsingStrategy( sessionFactory ).parseInto( targetGraph, graphString.toString(), sessionFactory );
+	}
 
-		// Build an instance of this class as a visitor
-		final GraphParser visitor = new GraphParser( sessionFactory );
+	private static GraphParsingStrategy getGraphParsingStrategy(SessionFactoryImplementor sessionFactory) {
+		final GraphParserMode mode = sessionFactory.getSessionFactoryOptions().getGraphParserMode();
 
-		visitor.getGraphStack().push( targetGraph );
-		try {
-			visitor.visitAttributeList( graphContext.attributeList() );
+		if ( mode == GraphParserMode.MODERN ) {
+			return new ModernGraphParsingStrategy();
 		}
-		finally {
-			visitor.getGraphStack().pop();
 
-			assert visitor.getGraphStack().isEmpty();
-		}
+		return new LegacyGraphParsingStrategy();
 	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/LegacyGraphParser.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/LegacyGraphParser.java
new file mode 100644
index 000000000000..08885f0f6e5e
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/LegacyGraphParser.java
@@ -0,0 +1,177 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.graph.internal.parse;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.grammars.graph.LegacyGraphLanguageParser;
+import org.hibernate.grammars.graph.LegacyGraphLanguageParserBaseVisitor;
+import org.hibernate.graph.GraphNode;
+import org.hibernate.graph.InvalidGraphException;
+import org.hibernate.graph.spi.AttributeNodeImplementor;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
+import org.hibernate.graph.spi.GraphImplementor;
+import org.hibernate.graph.spi.SubGraphImplementor;
+import org.hibernate.internal.util.collections.Stack;
+import org.hibernate.internal.util.collections.StandardStack;
+
+import static org.hibernate.graph.internal.GraphParserLogging.PARSING_LOGGER;
+import static org.hibernate.internal.util.StringHelper.repeat;
+
+/**
+ * Unified access to the Antlr parser for Hibernate's "graph language"
+ *
+ * @author Steve Ebersole
+ */
+public class LegacyGraphParser extends LegacyGraphLanguageParserBaseVisitor<GraphNode<?>> {
+	private final GraphParserEntityNameResolver entityNameResolver;
+
+	private final Stack<GraphImplementor<?>> graphStack = new StandardStack<>();
+	private final Stack<AttributeNodeImplementor<?,?,?>> attributeNodeStack = new StandardStack<>();
+	private final Stack<SubGraphGenerator> graphSourceStack = new StandardStack<>();
+
+	public LegacyGraphParser(GraphParserEntityNameResolver entityNameResolver) {
+		this.entityNameResolver = entityNameResolver;
+	}
+
+	/**
+	 * @apiNote It is important that this form only be used after the session-factory is fully
+	 * initialized, especially the {@linkplain SessionFactoryImplementor#getJpaMetamodel()} JPA metamodel}.
+	 *
+	 * @see LegacyGraphParser#LegacyGraphParser(GraphParserEntityNameResolver)
+	 */
+	public LegacyGraphParser(SessionFactoryImplementor sessionFactory) {
+		this( sessionFactory.getJpaMetamodel()::findEntityType );
+	}
+
+	public Stack<GraphImplementor<?>> getGraphStack() {
+		return graphStack;
+	}
+
+	@Override
+	public AttributeNodeImplementor<?,?,?> visitAttributeNode(LegacyGraphLanguageParser.AttributeNodeContext attributeNodeContext) {
+		final var attributePathContext = attributeNodeContext.attributePath();
+		final var attributeQualifierContext = attributePathContext.attributeQualifier();
+
+		final var attributeName = attributePathContext.ATTR_NAME().getText();
+
+		final var subGraphCreator = subGraphCreator( attributeQualifierContext, attributeName );
+
+		final var attributeNode = resolveAttributeNode( attributeName );
+
+		if ( attributeNodeContext.subGraph() != null ) {
+			attributeNodeStack.push( attributeNode );
+			graphSourceStack.push( subGraphCreator );
+
+			try {
+				visitSubGraph( attributeNodeContext.subGraph() );
+
+			}
+			finally {
+				graphSourceStack.pop();
+				attributeNodeStack.pop();
+			}
+		}
+
+		if ( PARSING_LOGGER.isTraceEnabled() ) {
+			PARSING_LOGGER.tracef(
+					"%s Finished attribute : %s",
+					repeat( "<<", attributeNodeStack.depth() + 1 ),
+					attributeName
+			);
+		}
+
+		return attributeNode;
+	}
+
+	private SubGraphGenerator subGraphCreator(LegacyGraphLanguageParser.AttributeQualifierContext attributeQualifierContext, String attributeName) {
+		if ( attributeQualifierContext == null ) {
+			if ( PARSING_LOGGER.isTraceEnabled() ) {
+				PARSING_LOGGER.tracef(
+						"%s Start attribute : %s",
+						repeat( ">>", attributeNodeStack.depth() + 1 ),
+						attributeName
+				);
+			}
+			return PathQualifierType.VALUE.getSubGraphCreator();
+		}
+		else {
+			final var qualifierName = attributeQualifierContext.ATTR_NAME().getText();
+			if ( PARSING_LOGGER.isTraceEnabled() ) {
+				PARSING_LOGGER.tracef(
+						"%s Start qualified attribute : %s.%s",
+						repeat( ">>", attributeNodeStack.depth() + 1 ),
+						attributeName,
+						qualifierName
+				);
+			}
+			return resolvePathQualifier( qualifierName ).getSubGraphCreator();
+		}
+	}
+
+	private AttributeNodeImplementor<?,?,?> resolveAttributeNode(String attributeName) {
+		final var currentGraph = graphStack.getCurrent();
+		assert currentGraph != null;
+
+		final var attributeNode = currentGraph.findOrCreateAttributeNode( attributeName );
+		assert attributeNode != null;
+
+		return attributeNode;
+	}
+
+	private PathQualifierType resolvePathQualifier(String qualifier) {
+		if ( "key".equalsIgnoreCase( qualifier ) ) {
+			return PathQualifierType.KEY;
+		}
+
+		if ( "value".equalsIgnoreCase( qualifier ) ) {
+			return PathQualifierType.VALUE;
+		}
+
+		throw new InvalidGraphException( "Invalid path qualifier [" + qualifier + "] - expecting 'key' or 'value'" );
+	}
+
+	@Override
+	public SubGraphImplementor<?> visitSubGraph(LegacyGraphLanguageParser.SubGraphContext subGraphContext) {
+		final String subTypeName =
+				subGraphContext.typeIndicator() == null ? null
+						: subGraphContext.typeIndicator().TYPE_NAME().getText();
+
+		if ( PARSING_LOGGER.isTraceEnabled() ) {
+			PARSING_LOGGER.tracef(
+					"%s Starting graph: %s",
+					repeat( ">>", attributeNodeStack.depth() + 2 ),
+					subTypeName
+			);
+		}
+
+		final var attributeNode = attributeNodeStack.getCurrent();
+		final var subGraphCreator = graphSourceStack.getCurrent();
+
+		final var subGraph = subGraphCreator.createSubGraph(
+				attributeNode,
+				subTypeName,
+				entityNameResolver
+		);
+
+		graphStack.push( subGraph );
+
+		try {
+			subGraphContext.attributeList().accept( this );
+		}
+		finally {
+			graphStack.pop();
+		}
+
+		if ( PARSING_LOGGER.isTraceEnabled() ) {
+			PARSING_LOGGER.tracef(
+					"%s Finished graph : %s",
+					repeat( "<<", attributeNodeStack.depth() + 2 ),
+					subGraph.getGraphedType().getTypeName()
+			);
+		}
+
+		return subGraph;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java
index 3687da5df37f..f9973dcf3e49 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java
@@ -5,7 +5,7 @@
 package org.hibernate.graph.internal.parse;
 
 
-import org.hibernate.metamodel.model.domain.EntityDomainType;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
 
 /**
@@ -23,12 +23,13 @@ public enum PathQualifierType {
 			: attributeNode.addValueSubgraph().addTreatedSubgraph( managedType( subtypeName, entityNameResolver ) )
 	);
 
-	private static <T> ManagedDomainType<T> managedType(String subtypeName, EntityNameResolver entityNameResolver) {
-		final EntityDomainType<T> entityDomainType = entityNameResolver.resolveEntityName( subtypeName );
+	private static <T> ManagedDomainType<T> managedType(String subtypeName, GraphParserEntityNameResolver resolver) {
+		final var entityDomainType = resolver.resolveEntityName( subtypeName );
 		if ( entityDomainType == null ) {
 			throw new IllegalArgumentException( "Unknown managed type: " + subtypeName );
 		}
-		return entityDomainType;
+		//noinspection unchecked
+		return (ManagedDomainType<T>) entityDomainType;
 	}
 
 	private final SubGraphGenerator subGraphCreator;
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/SubGraphGenerator.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/SubGraphGenerator.java
index f575b2b9a624..295c33d93f64 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/SubGraphGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/SubGraphGenerator.java
@@ -5,6 +5,7 @@
 package org.hibernate.graph.internal.parse;
 
 import org.hibernate.graph.spi.AttributeNodeImplementor;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
 import org.hibernate.graph.spi.SubGraphImplementor;
 
 /**
@@ -15,5 +16,5 @@ public interface SubGraphGenerator {
 	SubGraphImplementor<?> createSubGraph(
 			AttributeNodeImplementor<?,?,?> attributeNode,
 			String subTypeName,
-			EntityNameResolver entityNameResolver);
+			GraphParserEntityNameResolver entityNameResolver);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/strategy/GraphParsingStrategy.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/strategy/GraphParsingStrategy.java
new file mode 100644
index 000000000000..139e473be48b
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/strategy/GraphParsingStrategy.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.graph.internal.parse.strategy;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.graph.spi.GraphImplementor;
+import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.metamodel.model.domain.EntityDomainType;
+
+public interface GraphParsingStrategy {
+	<T> RootGraphImplementor<T> parse(
+			EntityDomainType<T> entityDomainType,
+			String graphText,
+			SessionFactoryImplementor sessionFactory);
+
+	@Deprecated(forRemoval = true)
+	<T> RootGraphImplementor<T> parse(String graphText, SessionFactoryImplementor sessionFactory);
+
+	void parseInto(GraphImplementor<?> graph, String graphText, SessionFactoryImplementor sessionFactory);
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/strategy/LegacyGraphParsingStrategy.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/strategy/LegacyGraphParsingStrategy.java
new file mode 100644
index 000000000000..0eff46269b28
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/strategy/LegacyGraphParsingStrategy.java
@@ -0,0 +1,101 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.graph.internal.parse.strategy;
+
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.grammars.graph.GraphLanguageLexer;
+import org.hibernate.grammars.graph.LegacyGraphLanguageParser;
+import org.hibernate.graph.InvalidGraphException;
+import org.hibernate.graph.internal.RootGraphImpl;
+import org.hibernate.graph.internal.parse.LegacyGraphParser;
+import org.hibernate.graph.spi.GraphImplementor;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
+import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.metamodel.model.domain.EntityDomainType;
+
+@Deprecated(forRemoval = true)
+public class LegacyGraphParsingStrategy implements GraphParsingStrategy {
+
+	@Override
+	public <T> RootGraphImplementor<T> parse(EntityDomainType<T> entityDomainType, String graphText, SessionFactoryImplementor sessionFactory) {
+		if ( graphText == null ) {
+			return null;
+		}
+		final var parser = new LegacyGraphLanguageParser(
+				new CommonTokenStream( new GraphLanguageLexer( CharStreams.fromString( graphText ) ) ) );
+		final var graph = parser.graph();
+		if ( graph.typeIndicator() != null ) {
+			throw new InvalidGraphException( "Expecting graph text to not include an entity name : " + graphText );
+		}
+		return parse( entityDomainType, graph.attributeList(), sessionFactory );
+	}
+
+	@Override
+	@Deprecated(forRemoval = true)
+	public <T> RootGraphImplementor<T> parse(String graphText, SessionFactoryImplementor sessionFactory) {
+		if ( graphText == null ) {
+			return null;
+		}
+		final var parser = new LegacyGraphLanguageParser(
+				new CommonTokenStream( new GraphLanguageLexer( CharStreams.fromString( graphText ) ) ) );
+		final var graph = parser.graph();
+		if ( graph.typeIndicator() == null ) {
+			throw new InvalidGraphException( "Expecting graph text to include an entity name : " + graphText );
+		}
+		final String entityName = graph.typeIndicator().TYPE_NAME().getText();
+		@SuppressWarnings(
+				"unchecked") final EntityDomainType<T> entityType = (EntityDomainType<T>) sessionFactory.getJpaMetamodel()
+				.entity( entityName );
+		return parse( entityType, graph.attributeList(), sessionFactory );
+	}
+
+	@Override
+	public void parseInto(GraphImplementor<?> graph, String graphText, SessionFactoryImplementor sessionFactory) {
+		final var lexer = new GraphLanguageLexer( CharStreams.fromString( graphText ) );
+		final var parser = new LegacyGraphLanguageParser( new CommonTokenStream( lexer ) );
+		final var graphContext = parser.graph();
+
+		if ( graphContext.typeIndicator() != null ) {
+			// todo : throw an exception?  Log warning?  Ignore?
+			//		for now, ignore
+		}
+
+		// Build an instance of this class as a visitor
+		final LegacyGraphParser visitor = new LegacyGraphParser( sessionFactory );
+
+		visitor.getGraphStack().push( graph );
+		try {
+			visitor.visitAttributeList( graphContext.attributeList() );
+		}
+		finally {
+			visitor.getGraphStack().pop();
+
+			assert visitor.getGraphStack().isEmpty();
+		}
+
+	}
+
+	public static <T> RootGraphImplementor<T> parse(EntityDomainType<T> rootType, LegacyGraphLanguageParser.AttributeListContext graphElementListContext, SessionFactoryImplementor sessionFactory) {
+		return parse( null, rootType, graphElementListContext, sessionFactory.getJpaMetamodel()::findEntityType );
+	}
+
+	public static <T> RootGraphImplementor<T> parse(@Nullable String name, EntityDomainType<T> rootType, LegacyGraphLanguageParser.AttributeListContext graphElementListContext, GraphParserEntityNameResolver entityNameResolver) {
+		final RootGraphImpl<T> targetGraph = new RootGraphImpl<>( name, rootType );
+
+		final var visitor = new LegacyGraphParser( entityNameResolver );
+		visitor.getGraphStack().push( targetGraph );
+		try {
+			visitor.visitAttributeList( graphElementListContext );
+		}
+		finally {
+			visitor.getGraphStack().pop();
+			assert visitor.getGraphStack().isEmpty();
+		}
+		return targetGraph;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/strategy/ModernGraphParsingStrategy.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/strategy/ModernGraphParsingStrategy.java
new file mode 100644
index 000000000000..c048db8b18ee
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/strategy/ModernGraphParsingStrategy.java
@@ -0,0 +1,85 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.graph.internal.parse.strategy;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.grammars.graph.GraphLanguageLexer;
+import org.hibernate.grammars.graph.GraphLanguageParser;
+import org.hibernate.graph.internal.RootGraphImpl;
+import org.hibernate.graph.internal.parse.GraphParser;
+import org.hibernate.graph.spi.GraphImplementor;
+import org.hibernate.graph.spi.GraphParserEntityNameResolver;
+import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.metamodel.model.domain.EntityDomainType;
+
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class ModernGraphParsingStrategy implements GraphParsingStrategy {
+
+	@Override
+	public <T> RootGraphImplementor<T> parse(
+			EntityDomainType<T> entityDomainType,
+			String graphText,
+			SessionFactoryImplementor sessionFactory) {
+		if ( graphText == null ) {
+			return null;
+		}
+		final var parser = new GraphLanguageParser( new CommonTokenStream( new GraphLanguageLexer(
+				CharStreams.fromString( graphText ) ) ) );
+		final var graph = parser.graph();
+
+		return parse( entityDomainType, graph.graphElementList(), sessionFactory );
+	}
+
+	@Override
+	public <T> RootGraphImplementor<T> parse(String graphText, SessionFactoryImplementor sessionFactory) {
+		throw new UnsupportedOperationException(
+				"Parsing of graph text is not supported with 'modern' graph parser mode" );
+	}
+
+	@Override
+	public void parseInto(GraphImplementor<?> graph, String graphText, SessionFactoryImplementor sessionFactory) {
+		final var parser = new GraphLanguageParser( new CommonTokenStream( new GraphLanguageLexer(
+				CharStreams.fromString( graphText ) ) ) );
+		final var graphCtx = parser.graph();
+		final var visitor = new GraphParser( sessionFactory );
+		visitor.getGraphStack().push( graph );
+		try {
+			visitor.visitGraphElementList( graphCtx.graphElementList() );
+		}
+		finally {
+			visitor.getGraphStack().pop();
+			assert visitor.getGraphStack().isEmpty();
+		}
+	}
+
+	public static <T> RootGraphImplementor<T> parse(
+			EntityDomainType<T> rootType,
+			GraphLanguageParser.GraphElementListContext graphElementListContext,
+			SessionFactoryImplementor sessionFactory) {
+		return parse( null, rootType, graphElementListContext, sessionFactory.getJpaMetamodel()::findEntityType );
+	}
+
+
+	public static <T> RootGraphImplementor<T> parse(
+			@Nullable String name,
+			EntityDomainType<T> rootType,
+			GraphLanguageParser.GraphElementListContext graphElementListContext,
+			GraphParserEntityNameResolver entityNameResolver) {
+		final RootGraphImpl<T> targetGraph = new RootGraphImpl<>( name, rootType );
+		final var visitor = new GraphParser( entityNameResolver );
+		visitor.getGraphStack().push( targetGraph );
+		try {
+			visitor.visitGraphElementList( graphElementListContext );
+		}
+		finally {
+			visitor.getGraphStack().pop();
+			assert visitor.getGraphStack().isEmpty();
+		}
+		return targetGraph;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java
index b3988f8b27ae..9b0d292c5436 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java
@@ -28,6 +28,15 @@ public interface AttributeNodeImplementor<J, E, K> extends AttributeNode<J>, Gra
 	@Override
 	AttributeNodeImplementor<J, E, K> makeCopy(boolean mutable);
 
+	/**
+	 * Mark the attribute as removed or not.
+	 * We allow passing the boolean to allow for later unmarking it for removal, e.g.
+	 * should {@linkplain org.hibernate.graph.Graph#addAttributeNode} be called later.
+	 *
+	 * @return {@code this} for chaining.
+	 */
+	AttributeNodeImplementor<J, E, K> markRemoved(boolean removed);
+
 	/**
 	 * Create a value subgraph, without knowing whether it represents a singular value or
 	 * plural element, rooted at this attribute node.
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphImplementor.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphImplementor.java
index 8de0d72ef088..b053c68dda59 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphImplementor.java
@@ -12,6 +12,7 @@
 import jakarta.persistence.metamodel.MapAttribute;
 import jakarta.persistence.metamodel.PluralAttribute;
 import org.hibernate.Internal;
+import org.hibernate.graph.AttributeNode;
 import org.hibernate.graph.Graph;
 import org.hibernate.graph.SubGraph;
 import org.hibernate.metamodel.model.domain.MapPersistentAttribute;
@@ -28,6 +29,34 @@
  */
 public interface GraphImplementor<J> extends Graph<J>, GraphNodeImplementor<J> {
 
+	/**
+	 * Returns the named node associated with the graph, if one, including
+	 * checks into treated subgraphs.
+	 * Returns the node regardless of {@linkplain AttributeNode#isRemoved()} which
+	 * is important for actually implementing proper spec compliance with regard to
+	 * impact of removed nodes.
+	 *
+	 * @return The named node, or {@code null}.
+	 *
+	 * @see jakarta.persistence.Graph#removeAttributeNode
+	 */
+	<T> AttributeNodeImplementor<T,?,?> findNode(String name);
+
+	/**
+	 * Retrieve an already existing node, if one, from the graph excluding all other checks.
+	 * Used in implementing {@linkplain #findNode(String)}
+	 */
+	<T> AttributeNodeImplementor<T,?,?> getExistingNode(PersistentAttribute<?, ? extends T> attribute);
+
+	/**
+	 * Retrieve an already existing node, if one, from the graph excluding all other checks.
+	 * Used in implementing {@linkplain #findNode(String)}
+	 */
+	<T> AttributeNodeImplementor<T,?,?> getExistingNode(String attributeName);
+
+	@Override
+	GraphImplementor<J> makeCopy(boolean mutable);
+
 	void merge(GraphImplementor<J> other);
 
 	@Internal
@@ -41,9 +70,6 @@ public interface GraphImplementor<J> extends Graph<J>, GraphNodeImplementor<J> {
 	@Deprecated(forRemoval = true)
 	SubGraphImplementor<J> makeSubGraph(boolean mutable);
 
-	@Override
-	GraphImplementor<J> makeCopy(boolean mutable);
-
 	@Override
 	List<? extends AttributeNodeImplementor<?,?,?>> getAttributeNodeList();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphParserEntityClassResolver.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphParserEntityClassResolver.java
new file mode 100644
index 000000000000..7210cddaae5f
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphParserEntityClassResolver.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.graph.spi;
+
+import org.hibernate.Incubating;
+import org.hibernate.metamodel.model.domain.EntityDomainType;
+
+/**
+ * @author Gavin King
+ *
+ * @since 7.2
+ */
+@Incubating
+@FunctionalInterface
+public interface GraphParserEntityClassResolver {
+	EntityDomainType<?> resolveEntityClass(Class<?> entityClass);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/EntityNameResolver.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphParserEntityNameResolver.java
similarity index 51%
rename from hibernate-core/src/main/java/org/hibernate/graph/internal/parse/EntityNameResolver.java
rename to hibernate-core/src/main/java/org/hibernate/graph/spi/GraphParserEntityNameResolver.java
index 10073e2468b4..3734bd8b4086 100644
--- a/hibernate-core/src/main/java/org/hibernate/graph/internal/parse/EntityNameResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/GraphParserEntityNameResolver.java
@@ -2,14 +2,18 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.graph.internal.parse;
+package org.hibernate.graph.spi;
 
+import org.hibernate.Incubating;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 
 /**
  * @author Steve Ebersole
+ *
+ * @since 7.2
  */
+@Incubating
 @FunctionalInterface
-public interface EntityNameResolver {
-	<T> EntityDomainType<T> resolveEntityName(String entityName);
+public interface GraphParserEntityNameResolver {
+	EntityDomainType<?> resolveEntityName(String entityName);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java
index b6e44cdd7878..1b19d59076b8 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java
@@ -12,11 +12,19 @@
 import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.model.relational.ExportableProducer;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
+import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.BeforeExecutionGenerator;
+import org.hibernate.generator.EventType;
+import org.hibernate.generator.Generator;
+import org.hibernate.generator.OnExecutionGenerator;
+import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate;
 import org.hibernate.property.access.spi.Setter;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.type.ComponentType;
 import org.hibernate.type.CompositeType;
 
+import static org.hibernate.action.internal.EntityIdentityInsertAction.defaultedPrimitiveIds;
 import static org.hibernate.generator.EventType.INSERT;
 
 /**
@@ -51,7 +59,7 @@
  */
 @Internal
 public class CompositeNestedGeneratedValueGenerator
-		implements IdentifierGenerator, IdentifierGeneratorAggregator, Serializable {
+		implements IdentifierGenerator, IdentifierGeneratorAggregator, OnExecutionGenerator, Serializable {
 	/**
 	 * Contract for declaring how to locate the context for sub-value injection.
 	 */
@@ -105,71 +113,125 @@ public interface GenerationPlan extends ExportableProducer {
 	}
 
 	private final GenerationContextLocator generationContextLocator;
-	private final CompositeType compositeType;
+	private final ComponentType componentType;
 	private final List<GenerationPlan> generationPlans = new ArrayList<>();
+	private final List<Generator> generators;
+	private final String[] columnValues;
+	private final boolean[] columnInclusions;
+	private final boolean[] generatedOnExecutionColumns;
+	private final boolean hasOnExecutionGenerators;
+	private final boolean hasIncludedColumns;
+	private final boolean needsValueBinding;
+	private final boolean hasAssignedValues;
 
 	public CompositeNestedGeneratedValueGenerator(
 			GenerationContextLocator generationContextLocator,
-			CompositeType compositeType) {
-		this.generationContextLocator = generationContextLocator;
-		this.compositeType = compositeType;
+			ComponentType componentType) {
+		this( generationContextLocator, componentType,
+				List.of(), null, null, null );
+	}
+
+	// Used by Hibernate Reactive to override generation plans
+	public CompositeNestedGeneratedValueGenerator(CompositeNestedGeneratedValueGenerator original, List<GenerationPlan> generationPlans) {
+		this.generationContextLocator = original.generationContextLocator;
+		this.componentType = original.componentType;
+		this.generators = original.generators;
+		this.columnValues = original.columnValues;
+		this.columnInclusions = original.columnInclusions;
+		this.generatedOnExecutionColumns = original.generatedOnExecutionColumns;
+		this.hasOnExecutionGenerators = original.hasOnExecutionGenerators;
+		this.hasIncludedColumns = original.hasIncludedColumns;
+		this.needsValueBinding = original.needsValueBinding;
+		this.hasAssignedValues = original.hasAssignedValues;
+		this.generationPlans.addAll( generationPlans );
 	}
 
-	// Used by Hibernate Reactive
 	public CompositeNestedGeneratedValueGenerator(
 			GenerationContextLocator generationContextLocator,
-			CompositeType compositeType,
-			List<GenerationPlan> generationPlans) {
+			ComponentType componentType,
+			List<Generator> generators,
+			String[] columnValues,
+			boolean[] columnInclusions,
+			boolean[] generatedOnExecutionColumns) {
 		this.generationContextLocator = generationContextLocator;
-		this.compositeType = compositeType;
-		this.generationPlans.addAll( generationPlans );
+		this.componentType = componentType;
+		this.generators = generators == null ? List.of() : new ArrayList<>( generators );
+		this.columnValues = columnValues;
+		this.columnInclusions = columnInclusions;
+		this.generatedOnExecutionColumns = generatedOnExecutionColumns;
+		this.hasOnExecutionGenerators = hasOnExecutionGenerators( this.generators );
+		this.hasIncludedColumns = hasIncludedColumns( columnInclusions );
+		this.needsValueBinding = needsValueBinding( columnValues, columnInclusions );
+		this.hasAssignedValues = generators.stream()
+				.anyMatch( g -> g == null || g instanceof org.hibernate.generator.Assigned );
 	}
 
 	public void addGeneratedValuePlan(GenerationPlan plan) {
 		generationPlans.add( plan );
 	}
 
+	public boolean hasAssignedValues() {
+		return hasAssignedValues;
+	}
+
 	@Override
 	public Object generate(SharedSessionContractImplementor session, Object object) {
 		final Object context = generationContextLocator.locateGenerationContext( session, object );
-		final List<Object> generatedValues = generatedValues( session, object, context );
+		final Object result = context != null ? context : instantiateEmptyComposite();
+		final var generatedValues = generatedValues( session, object, result );
 		if ( generatedValues != null) {
-			final Object[] values = compositeType.getPropertyValues( context );
+			final var values = componentType.getPropertyValues( result );
 			for ( int i = 0; i < generatedValues.size(); i++ ) {
 				values[generationPlans.get( i ).getPropertyIndex()] = generatedValues.get( i );
 			}
-			return compositeType.replacePropertyValues( context, values, session );
+			return componentType.replacePropertyValues( result, values, session );
 		}
 		else {
-			return context;
+			return result;
 		}
 	}
 
+	private Object instantiateEmptyComposite() {
+		final var mappingModelPart = componentType.getMappingModelPart();
+		final var embeddable = mappingModelPart.getEmbeddableTypeDescriptor();
+		return embeddable.getRepresentationStrategy().getInstantiator()
+				.instantiate( () -> defaultedPrimitiveIds( embeddable, embeddable ) );
+	}
+
 	private List<Object> generatedValues(SharedSessionContractImplementor session, Object object, Object context) {
-		final List<Object> generatedValues =
-				compositeType.isMutable()
-						? null
-						: new ArrayList<>( generationPlans.size() );
+		final boolean mutable = componentType.isMutable();
+		final List<Object> generatedValues = mutable ? null : new ArrayList<>( generationPlans.size() );
 		for ( var generationPlan : generationPlans ) {
-			final var generator = generationPlan.getGenerator();
-			if ( !generator.generatedBeforeExecution( object, session ) ) {
-				throw new IdentifierGenerationException( "Identity generation isn't supported for composite ids" );
-			}
-			final Object currentValue =
-					generator.allowAssignedIdentifiers()
-							? compositeType.getPropertyValue( context, generationPlan.getPropertyIndex(), session )
-							: null;
-			final Object generated = generator.generate( session, object, currentValue, INSERT );
-			if ( generatedValues != null ) {
-				generatedValues.add( generated );
-			}
-			else {
-				generationPlan.getInjector().set( context, generated );
+			final Object value = generatedValue( session, object, context, generationPlan, mutable );
+			if ( !mutable ) {
+				generatedValues.add( value );
 			}
 		}
 		return generatedValues;
 	}
 
+	private Object generatedValue(
+			SharedSessionContractImplementor session,
+			Object object,
+			Object context,
+			GenerationPlan generationPlan,
+			boolean inject) {
+		final var generator = generationPlan.getGenerator();
+		final Object existingValue =
+				componentType.getPropertyValue( context, generationPlan.getPropertyIndex(), session );
+		if ( generator.generatedBeforeExecution( object, session ) ) {
+			final Object currentValue = generator.allowAssignedIdentifiers() ? existingValue : null;
+			final Object generatedValue = generator.generate( session, object, currentValue, INSERT );
+			if ( inject ) {
+				generationPlan.getInjector().set( context, generatedValue );
+			}
+			return generatedValue;
+		}
+		else {
+			return existingValue;
+		}
+	}
+
 	@Override
 	public void registerExportables(Database database) {
 		for ( var plan : generationPlans ) {
@@ -184,6 +246,83 @@ public void initialize(SqlStringGenerationContext context) {
 		}
 	}
 
+	@Override
+	public boolean generatedOnExecution() {
+		return hasOnExecutionGenerators;
+	}
+
+	@Override
+	public boolean generatedOnExecution(Object entity, SharedSessionContractImplementor session) {
+		for ( var generator : generators ) {
+			if ( generator instanceof OnExecutionGenerator
+					&& generator.generatesOnInsert()
+					&& generator.generatedOnExecution( entity, session ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean generatedBeforeExecution(Object entity, SharedSessionContractImplementor session) {
+		for ( var generator : generators ) {
+			if ( generator instanceof BeforeExecutionGenerator
+					&& generator.generatesOnInsert()
+					&& generator.generatedBeforeExecution( entity, session ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean referenceColumnsInSql(Dialect dialect) {
+		return hasIncludedColumns;
+	}
+
+	@Override
+	public boolean referenceColumnsInSql(Dialect dialect, EventType eventType) {
+		return eventType == EventType.INSERT && hasIncludedColumns;
+	}
+
+	@Override
+	public boolean writePropertyValue() {
+		return needsValueBinding;
+	}
+
+	@Override
+	public boolean writePropertyValue(EventType eventType) {
+		return eventType == EventType.INSERT && needsValueBinding;
+	}
+
+	@Override
+	public InsertGeneratedIdentifierDelegate getGeneratedIdentifierDelegate(EntityPersister persister) {
+		for ( var generator : generators ) {
+			if ( generator instanceof PostInsertIdentifierGenerator postInsertIdentifierGenerator ) {
+				final var delegate = postInsertIdentifierGenerator.getGeneratedIdentifierDelegate( persister );
+				if ( delegate != null ) {
+					return delegate;
+				}
+			}
+		}
+		return OnExecutionGenerator.super.getGeneratedIdentifierDelegate( persister );
+	}
+
+	@Override
+	public String[] getReferencedColumnValues(Dialect dialect) {
+		return columnValues;
+	}
+
+	@Override
+	public String[] getReferencedColumnValues(Dialect dialect, EventType eventType) {
+		return eventType == EventType.INSERT ? columnValues : null;
+	}
+
+	@Override
+	public boolean[] getColumnInclusions(Dialect dialect, EventType eventType) {
+		return eventType == EventType.INSERT ? columnInclusions : null;
+	}
+
 	// Used by Hibernate Reactive
 	public List<GenerationPlan> getGenerationPlans() {
 		return generationPlans;
@@ -195,7 +334,44 @@ public GenerationContextLocator getGenerationContextLocator() {
 	}
 
 	// Used by Hibernate Reactive
-	public CompositeType getCompositeType() {
-		return compositeType;
+	public ComponentType getComponentType() {
+		return componentType;
+	}
+
+	public boolean[] getGeneratedOnExecutionColumnInclusions() {
+		return generatedOnExecutionColumns;
+	}
+
+	private static boolean hasOnExecutionGenerators(List<Generator> generators) {
+		for ( var generator : generators ) {
+			if ( generator instanceof OnExecutionGenerator
+					&& generator.generatesOnInsert() ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private static boolean hasIncludedColumns(boolean[] columnInclusions) {
+		if ( columnInclusions != null ) {
+			for ( boolean columnInclusion : columnInclusions ) {
+				if ( columnInclusion ) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+
+	private static boolean needsValueBinding(String[] columnValues, boolean[] columnInclusions) {
+		if ( columnValues != null && columnInclusions != null ) {
+			for ( int i = 0; i < columnValues.length; i++ ) {
+				if ( columnInclusions[i] && "?".equals( columnValues[i] ) ) {
+					return true;
+				}
+			}
+		}
+		return false;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java
index 43834809bdcd..437c0c3fa29c 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDLogger.java
@@ -16,6 +16,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.WARN;
 
@@ -35,7 +36,8 @@ public interface UUIDLogger extends BasicLogger {
 	UUIDLogger UUID_MESSAGE_LOGGER = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			UUIDLogger.class,
-			NAME
+			NAME,
+			Locale.ROOT
 	);
 
 	@LogMessage(level = WARN)
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/ExportableColumnHelper.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/ExportableColumnHelper.java
index aa389af5c179..f5f4091c29a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/ExportableColumnHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/ExportableColumnHelper.java
@@ -4,151 +4,18 @@
  */
 package org.hibernate.id.enhanced;
 
-import org.hibernate.FetchMode;
-import org.hibernate.MappingException;
 import org.hibernate.boot.model.relational.Database;
-import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.internal.util.collections.ArrayHelper;
+import org.hibernate.tool.schema.internal.ColumnValue;
 import org.hibernate.mapping.Column;
-import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.Table;
-import org.hibernate.mapping.Value;
-import org.hibernate.mapping.ValueVisitor;
-import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.BasicType;
-import org.hibernate.type.MappingContext;
-import org.hibernate.type.Type;
-
-import java.util.List;
 
 class ExportableColumnHelper {
 
 	static Column column(Database database, Table table, String segmentColumnName, BasicType<?> type, String typeName) {
 		final var column = new Column( segmentColumnName );
 		column.setSqlType( typeName );
-		column.setValue( new Value() {
-			@Override
-			public Value copy() {
-				return this;
-			}
-
-			@Override
-			public int getColumnSpan() {
-				return 1;
-			}
-
-			@Override
-			public List<Selectable> getSelectables() {
-				return List.of( column );
-			}
-
-			@Override
-			public List<Column> getColumns() {
-				return List.of( column );
-			}
-
-			@Override
-			public Type getType() {
-				return type;
-			}
-
-			@Override
-			public FetchMode getFetchMode() {
-				return null;
-			}
-
-			@Override
-			public Table getTable() {
-				return table;
-			}
-
-			@Override
-			public boolean hasFormula() {
-				return false;
-			}
-
-			@Override
-			public boolean isAlternateUniqueKey() {
-				return false;
-			}
-
-			@Override
-			public boolean isNullable() {
-				return false;
-			}
-
-			@Override
-			public boolean[] getColumnInsertability() {
-				return ArrayHelper.TRUE;
-			}
-
-			@Override
-			public boolean hasAnyInsertableColumns() {
-				return true;
-			}
-
-			@Override
-			public boolean[] getColumnUpdateability() {
-				return ArrayHelper.TRUE;
-			}
-
-			@Override
-			public boolean hasAnyUpdatableColumns() {
-				return true;
-			}
-
-			@Override
-			public void createForeignKey() {
-			}
-
-			@Override
-			public void createUniqueKey(MetadataBuildingContext context) {
-			}
-
-			@Override
-			public boolean isSimpleValue() {
-				return true;
-			}
-
-			@Override
-			public boolean isValid(MappingContext mappingContext) throws MappingException {
-				return false;
-			}
-
-			@Override
-			public void setTypeUsingReflection(String className, String propertyName) {
-			}
-
-			@Override
-			public Object accept(ValueVisitor visitor) {
-				return null;
-			}
-
-			@Override
-			public boolean isSame(Value value) {
-				return this == value;
-			}
-
-			@Override
-			public ServiceRegistry getServiceRegistry() {
-				return database.getServiceRegistry();
-			}
-
-			@Override
-			public boolean isColumnInsertable(int index) {
-				return true;
-			}
-
-			@Override
-			public boolean isColumnUpdateable(int index) {
-				return true;
-			}
-
-			@Override
-			public boolean isPartitionKey() {
-				return false;
-			}
-		} );
+		column.setValue( new ColumnValue( database, table, column, type ) );
 		return column;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyNamingStrategy.java
index d4c22fb40caf..26bed7a155a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/LegacyNamingStrategy.java
@@ -79,7 +79,6 @@ public QualifiedName determineSequenceName(
 
 	private String implicitSequenceName(Map<?, ?> configValues) {
 		final String explicitSuffix = getString( CONFIG_SEQUENCE_PER_ENTITY_SUFFIX, configValues );
-
 		if ( isNotEmpty( explicitSuffix ) ) {
 			// an "implicit name suffix" was specified
 			final String rootTableName = getString( TABLE, configValues );
@@ -102,7 +101,6 @@ public QualifiedName determineTableName(
 			Map<?, ?> configValues,
 			ServiceRegistry serviceRegistry) {
 		final String implicitName = implicitTableName( configValues );
-
 		return implicitName.contains( "." )
 				? QualifiedNameParser.INSTANCE.parse( implicitName )
 				: new QualifiedTableName(
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
index 3c55ec148adb..36409171a4eb 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java
@@ -37,8 +37,8 @@ private static Optimizer createOptimizer(OptimizerDescriptor descriptor, Class<?
 		}
 
 		try {
-			final var ctor = optimizerClass.getConstructor( CTOR_SIG );
-			return ctor.newInstance( returnClass, incrementSize );
+			return optimizerClass.getConstructor( CTOR_SIG )
+					.newInstance( returnClass, incrementSize );
 		}
 		catch ( Throwable ignore ) {
 			OPTIMIZER_MESSAGE_LOGGER.unableToInstantiateOptimizer( descriptor.getExternalName() );
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerLogger.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerLogger.java
index c5fdb650677d..4193c44f076a 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerLogger.java
@@ -16,6 +16,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -38,7 +39,8 @@ public interface OptimizerLogger extends BasicLogger {
 	OptimizerLogger OPTIMIZER_MESSAGE_LOGGER = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			OptimizerLogger.class,
-			NAME
+			NAME,
+			Locale.ROOT
 	);
 
 	@LogMessage(level = TRACE)
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/ResyncHelper.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/ResyncHelper.java
index 8af041683390..ed6d758165cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/ResyncHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/ResyncHelper.java
@@ -15,11 +15,10 @@ class ResyncHelper {
 
 	private static long execute(DdlTransactionIsolator isolator, String sequenceCurrentValue, String message) {
 		isolator.getJdbcContext().getSqlStatementLogger().logStatement( sequenceCurrentValue );
-		try ( var select = isolator.getIsolatedConnection().prepareStatement( sequenceCurrentValue ) ) {
-			try ( var resultSet = select.executeQuery() ) {
-				resultSet.next();
-				return resultSet.getLong( 1 );
-			}
+		try ( var select = isolator.getIsolatedConnection().prepareStatement( sequenceCurrentValue );
+				var resultSet = select.executeQuery() ) {
+			resultSet.next();
+			return resultSet.getLong( 1 );
 		}
 		catch (SQLException e) {
 			throw isolator.getJdbcContext().getSqlExceptionHelper()
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java
index 594374d762a2..8ca1218a6130 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceGeneratorLogger.java
@@ -14,6 +14,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.TRACE;
@@ -37,7 +38,8 @@ public interface SequenceGeneratorLogger extends BasicLogger {
 	SequenceGeneratorLogger SEQUENCE_GENERATOR_LOGGER = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			SequenceGeneratorLogger.class,
-			NAME
+			NAME,
+			Locale.ROOT
 	);
 
 	@LogMessage(level = INFO)
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
index d44d65157729..328e07201f1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
@@ -48,7 +48,6 @@
  * Variations range from actually using a sequence to using a table to mimic
  * a sequence.  These variations are encapsulated by the {@link DatabaseStructure}
  * interface internally.
- * <p>
  * <table>
  * <caption>General configuration parameters</caption>
  * 	 <tr>
@@ -368,10 +367,10 @@ private static QualifiedName sequenceName(
 			IdentifierHelper identifierHelper) {
 		if ( isNotEmpty( explicitSequenceName ) ) {
 			// we have an explicit name, use it
-			return explicitSequenceName.contains(".")
+			return explicitSequenceName.contains( "." )
 					? QualifiedNameParser.INSTANCE.parse( explicitSequenceName )
 					: new QualifiedNameParser.NameParts( catalog, schema,
-							identifierHelper.toIdentifier( explicitSequenceName ) );
+							identifierHelper.toIdentifier( explicitSequenceName, false, true ) );
 		}
 		else {
 			// otherwise, determine an implicit name to use
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardNamingStrategy.java
index 75b71a18ea03..689423a07cce 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardNamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/StandardNamingStrategy.java
@@ -74,36 +74,32 @@ public QualifiedName determineSequenceName(
 			Identifier schemaName,
 			Map<?, ?> configValues,
 			ServiceRegistry serviceRegistry) {
-		final String rootTableName = getString( TABLE, configValues );
-		final String implicitName = implicitSequenceName( rootTableName, configValues );
-		return qualifiedSequenceName( catalogName, schemaName, serviceRegistry, implicitName );
-
+		return qualifiedSequenceName( catalogName, schemaName, serviceRegistry,
+				implicitSequenceName( getString( TABLE, configValues ), configValues ) );
 	}
 
 	private static String implicitSequenceName(String rootTableName, Map<?, ?> configValues) {
 		final String explicitSuffix = getString( CONFIG_SEQUENCE_PER_ENTITY_SUFFIX, configValues );
 		final String base = getString( IMPLICIT_NAME_BASE, configValues, rootTableName );
-
-		if ( isNotEmpty( explicitSuffix ) ) {
+		if ( isNotEmpty( explicitSuffix ) && isNotEmpty( base ) ) {
 			// an "implicit name suffix" was specified
-			if ( isNotEmpty( base ) ) {
-				return isQuoted( base )
-						? "`" + unQuote( base ) + explicitSuffix + "`"
-						: base + explicitSuffix;
-			}
-		}
-
-		final String annotationGeneratorName = getString( GENERATOR_NAME, configValues );
-		if ( isNotEmpty( annotationGeneratorName ) ) {
-			return annotationGeneratorName;
-		}
-		else if ( isNotEmpty( base ) ) {
 			return isQuoted( base )
-					? "`" + unQuote( base ) + DEF_SEQUENCE_SUFFIX + "`"
-					: base + DEF_SEQUENCE_SUFFIX;
+					? "`" + unQuote( base ) + explicitSuffix + "`"
+					: base + explicitSuffix;
 		}
 		else {
-			throw new MappingException( "Unable to determine implicit sequence name; target table - " + rootTableName );
+			final String annotationGeneratorName = getString( GENERATOR_NAME, configValues );
+			if ( isNotEmpty( annotationGeneratorName ) ) {
+				return annotationGeneratorName;
+			}
+			else if ( isNotEmpty( base ) ) {
+				return isQuoted( base )
+						? "`" + unQuote( base ) + DEF_SEQUENCE_SUFFIX + "`"
+						: base + DEF_SEQUENCE_SUFFIX;
+			}
+			else {
+				throw new MappingException( "Unable to determine implicit sequence name for target table '" + rootTableName + "'" );
+			}
 		}
 	}
 
@@ -113,8 +109,8 @@ public QualifiedName determineTableName(
 			Identifier schemaName,
 			Map<?, ?> configValues,
 			ServiceRegistry serviceRegistry) {
-		final String implicitName = implicitTableName( configValues );
-		return qualifiedTableName( catalogName, schemaName, serviceRegistry, implicitName );
+		return qualifiedTableName( catalogName, schemaName, serviceRegistry,
+				implicitTableName( configValues ) );
 	}
 
 	private static String implicitTableName(Map<?, ?> configValues) {
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
index e22f4f0ee6e4..eeadcec76016 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
@@ -72,7 +72,6 @@
  * By default, we use a single row for all generators (the {@value #DEF_SEGMENT_VALUE}
  * segment). The configuration parameter {@value #CONFIG_PREFER_SEGMENT_PER_ENTITY} can
  * be used to change that to instead default to using a row for each entity name.
- * <p>
  * <table>
  * <caption>Configuration parameters</caption>
  * 	 <tr>
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java
index ec836d4599f9..096ad9edb6a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGeneratorLogger.java
@@ -18,6 +18,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.ERROR;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -41,7 +42,8 @@ public interface TableGeneratorLogger extends BasicLogger {
 	TableGeneratorLogger TABLE_GENERATOR_LOGGER = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			TableGeneratorLogger.class,
-			NAME
+			NAME,
+			Locale.ROOT
 	);
 
 	@LogMessage(level = ERROR)
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java
index 85bd2f068ba4..a68838352a6c 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java
@@ -9,13 +9,13 @@
 
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.values.AbstractGeneratedValuesMutationDelegate;
 import org.hibernate.generator.values.GeneratedValues;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.pretty.MessageHelper;
+
+import static org.hibernate.pretty.MessageHelper.infoString;
 
 /**
  * Abstract {@link org.hibernate.generator.values.GeneratedValuesMutationDelegate} implementation where
@@ -42,14 +42,11 @@ public GeneratedValues performMutation(
 			JdbcValueBindings valueBindings,
 			Object entity,
 			SharedSessionContractImplementor session) {
-		session.getJdbcServices().getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
+		final String sql = statementDetails.getSqlString();
+		session.getJdbcServices().getSqlStatementLogger().logStatement( sql );
 		try {
 			valueBindings.beforeStatement( statementDetails );
-			return executeAndExtractReturning(
-					statementDetails.getSqlString(),
-					statementDetails.getStatement(),
-					session
-			);
+			return executeAndExtractReturning( sql, statementDetails.getStatement(), session );
 		}
 		finally {
 			if ( statementDetails.getStatement() != null ) {
@@ -63,35 +60,28 @@ public GeneratedValues performMutation(
 	@Override
 	public final GeneratedValues performInsertReturning(String sql, SharedSessionContractImplementor session, Binder binder) {
 		session.getJdbcServices().getSqlStatementLogger().logStatement( sql );
-
+		// prepare and execute the insert
+		final var insert = prepareStatement( sql, session );
 		try {
-			// prepare and execute the insert
-			final var insert = prepareStatement( sql, session );
-			try {
-				binder.bindValues( insert );
-				return executeAndExtractReturning( sql, insert, session );
-			}
-			finally {
-				releaseStatement( insert, session );
-			}
+			binder.bindValues( insert );
+			return executeAndExtractReturning( sql, insert, session );
 		}
 		catch (SQLException sqle) {
 			throw session.getJdbcServices().getSqlExceptionHelper().convert(
 					sqle,
-					"could not insert: " + MessageHelper.infoString( persister ),
+					"Could not insert: " + infoString( persister ),
 					sql
 			);
 		}
+		finally {
+			final var jdbcCoordinator = session.getJdbcCoordinator();
+			jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( insert );
+			jdbcCoordinator.afterStatementExecution();
+		}
 	}
 
 	protected abstract GeneratedValues executeAndExtractReturning(
 			String sql,
 			PreparedStatement preparedStatement,
 			SharedSessionContractImplementor session);
-
-	protected void releaseStatement(PreparedStatement preparedStatement, SharedSessionContractImplementor session) {
-		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-		jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( preparedStatement );
-		jdbcCoordinator.afterStatementExecution();
-	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java
index a6dbb0f48b7f..c52733e3550a 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java
@@ -70,14 +70,12 @@ public GeneratedValues performMutation(
 			Object entity,
 			SharedSessionContractImplementor session) {
 		final var jdbcCoordinator = session.getJdbcCoordinator();
-		final var jdbcServices = session.getJdbcServices();
-
-		jdbcServices.getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
-
+		final String sql = statementDetails.getSqlString();
+		session.getJdbcServices().getSqlStatementLogger().logStatement( sql );
 		try {
 			jdbcValueBindings.beforeStatement( statementDetails );
 			jdbcCoordinator.getResultSetReturn()
-					.executeUpdate( statementDetails.resolveStatement(), statementDetails.getSqlString() );
+					.executeUpdate( statementDetails.resolveStatement(), sql );
 		}
 		finally {
 			if ( statementDetails.getStatement() != null ) {
@@ -85,91 +83,76 @@ public GeneratedValues performMutation(
 			}
 			jdbcValueBindings.afterStatement( statementDetails.getMutatingTableDetails() );
 		}
-
-		// the insert is complete, select the generated id...
-
-		final String idSelectSql = getSelectSQL();
-		final var idSelect = jdbcCoordinator.getStatementPreparer().prepareStatement( idSelectSql );
-		try {
-			bindParameters( entity, idSelect, session );
-
-			final ResultSet resultSet = jdbcCoordinator.getResultSetReturn().extract( idSelect, idSelectSql );
-			try {
-				return extractReturningValues( resultSet, idSelect, session );
-			}
-			catch (SQLException e) {
-				throw jdbcServices.getSqlExceptionHelper().convert(
-						e,
-						"Unable to execute post-insert id selection query",
-						idSelectSql
-				);
-			}
-			finally {
-				jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( idSelect );
-				jdbcCoordinator.afterStatementExecution();
-			}
-		}
-		catch (SQLException e) {
-			throw jdbcServices.getSqlExceptionHelper().convert(
-					e,
-					"Unable to bind parameters for post-insert id selection query",
-					idSelectSql
-			);
-		}
+		return selectGeneratedId( session, entity );
 	}
 
 	@Override
 	public final GeneratedValues performInsertReturning(String sql, SharedSessionContractImplementor session, Binder binder) {
 		final var jdbcCoordinator = session.getJdbcCoordinator();
-		final var statementPreparer = jdbcCoordinator.getStatementPreparer();
+		// prepare and execute the insert
+		final var insert =
+				jdbcCoordinator.getStatementPreparer()
+						.prepareStatement( sql, NO_GENERATED_KEYS );
 		try {
-			// prepare and execute the insert
-			final var insert = statementPreparer.prepareStatement( sql, NO_GENERATED_KEYS );
-			try {
-				binder.bindValues( insert );
-				jdbcCoordinator.getResultSetReturn().executeUpdate( insert, sql );
-			}
-			finally {
-				jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( insert );
-				jdbcCoordinator.afterStatementExecution();
-			}
+			binder.bindValues( insert );
+			jdbcCoordinator.getResultSetReturn().executeUpdate( insert, sql );
 		}
 		catch (SQLException sqle) {
 			throw session.getJdbcServices().getSqlExceptionHelper().convert(
 					sqle,
-					"could not insert: " + infoString( persister ),
+					"Could not insert: " + infoString( persister ),
 					sql
 			);
 		}
+		finally {
+			jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( insert );
+			jdbcCoordinator.afterStatementExecution();
+		}
+		// the insert is complete, select the generated id
+		return selectGeneratedId( session, binder.getEntity() );
+	}
 
-		final String selectSQL = getSelectSQL();
-
+	private GeneratedValues selectGeneratedId(SharedSessionContractImplementor session, Object entity) {
+		final String idSelectSql = getSelectSQL();
+		var jdbcCoordinator = session.getJdbcCoordinator();
+		final var idSelect = jdbcCoordinator.getStatementPreparer().prepareStatement( idSelectSql );
 		try {
-			//fetch the generated id in a separate query
-			final var idSelect = statementPreparer.prepareStatement( selectSQL );
+			bindParameters( entity, session, idSelect, idSelectSql );
+			final var resultSet = jdbcCoordinator.getResultSetReturn().extract( idSelect, idSelectSql );
 			try {
-				bindParameters( binder.getEntity(), idSelect, session );
-				final ResultSet resultSet = jdbcCoordinator.getResultSetReturn().extract( idSelect, selectSQL );
-				try {
-					return extractReturningValues( resultSet, idSelect, session );
-				}
-				finally {
-					jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( resultSet, idSelect );
-				}
+				return extractReturningValues( resultSet, idSelect, session );
+			}
+			catch (SQLException sqle) {
+				throw session.getJdbcServices().getSqlExceptionHelper().convert(
+						sqle,
+						"Could not retrieve generated id after insert: " + infoString( persister ),
+						idSelectSql
+				);
 			}
 			finally {
-				jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( idSelect );
-				jdbcCoordinator.afterStatementExecution();
+				jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( resultSet, idSelect );
 			}
+		}
+		finally {
+			jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( idSelect );
+			jdbcCoordinator.afterStatementExecution();
+		}
+	}
 
+	private void bindParameters(
+			Object entity,
+			SharedSessionContractImplementor session,
+			PreparedStatement idSelect,
+			String idSelectSql) {
+		try {
+			bindParameters( entity, idSelect, session );
 		}
-		catch (SQLException sqle) {
+		catch (SQLException e) {
 			throw session.getJdbcServices().getSqlExceptionHelper().convert(
-					sqle,
-					"could not retrieve generated id after insert: " + infoString( persister ),
-					selectSQL
+					e,
+					"Unable to bind parameters for post-insert id selection query",
+					idSelectSql
 			);
 		}
 	}
-
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java
index eed0b456c69a..9d9afe5dc52a 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/GetGeneratedKeysDelegate.java
@@ -5,16 +5,15 @@
 package org.hibernate.id.insert;
 
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.function.Supplier;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.EventType;
@@ -89,49 +88,16 @@ public GeneratedValues performMutation(
 			JdbcValueBindings jdbcValueBindings,
 			Object entity,
 			SharedSessionContractImplementor session) {
-		final JdbcServices jdbcServices = session.getJdbcServices();
-		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-
 		final String sql = statementDetails.getSqlString();
-
-		jdbcServices.getSqlStatementLogger().logStatement( sql );
-
+		session.getJdbcServices().getSqlStatementLogger().logStatement( sql );
 		try {
 			final var preparedStatement = statementDetails.resolveStatement();
 			jdbcValueBindings.beforeStatement( statementDetails );
-
-			jdbcCoordinator.getResultSetReturn().executeUpdate( preparedStatement, sql );
-
-			try {
-				final ResultSet resultSet = preparedStatement.getGeneratedKeys();
-				try {
-					return getGeneratedValues( resultSet, preparedStatement, persister, getTiming(), session );
-				}
-				catch (SQLException e) {
-					throw jdbcServices.getSqlExceptionHelper().convert(
-							e,
-							() -> String.format(
-									Locale.ROOT,
-									"Unable to extract generated key from generated-key for `%s`",
-									persister.getNavigableRole().getFullPath()
-							),
-							sql
-					);
-				}
-				finally {
-					if ( resultSet != null ) {
-						jdbcCoordinator.getLogicalConnection().getResourceRegistry()
-								.release( resultSet, preparedStatement );
-					}
-				}
-			}
-			catch (SQLException e) {
-				throw jdbcServices.getSqlExceptionHelper().convert(
-						e,
-						"Unable to extract generated-keys ResultSet",
-						sql
-				);
-			}
+			session.getJdbcCoordinator().getResultSetReturn().executeUpdate( preparedStatement, sql );
+			return extractGeneratedValues( session, preparedStatement, sql,
+					() -> String.format( Locale.ROOT,
+							"Unable to extract generated key for '%s'",
+							persister.getNavigableRole().getFullPath() ) );
 		}
 		finally {
 			if ( statementDetails.getStatement() != null ) {
@@ -146,22 +112,25 @@ public GeneratedValues executeAndExtractReturning(
 			String sql,
 			PreparedStatement preparedStatement,
 			SharedSessionContractImplementor session) {
-		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-		final JdbcServices jdbcServices = session.getJdbcServices();
-
-		jdbcCoordinator.getResultSetReturn().executeUpdate( preparedStatement, sql );
+		session.getJdbcCoordinator().getResultSetReturn().executeUpdate( preparedStatement, sql );
+		return extractGeneratedValues( session, preparedStatement, sql,
+				() -> "Unable to extract generated keys from ResultSet" );
+	}
 
+	private @Nullable GeneratedValues extractGeneratedValues(
+			SharedSessionContractImplementor session,
+			PreparedStatement preparedStatement,
+			String sql,
+			Supplier<String> message) {
+		final var jdbcServices = session.getJdbcServices();
+		final var jdbcCoordinator = session.getJdbcCoordinator();
 		try {
-			final ResultSet resultSet = preparedStatement.getGeneratedKeys();
+			final var resultSet = preparedStatement.getGeneratedKeys();
 			try {
 				return getGeneratedValues( resultSet, preparedStatement, persister, getTiming(), session );
 			}
 			catch (SQLException e) {
-				throw jdbcServices.getSqlExceptionHelper().convert(
-						e,
-						"Unable to extract generated key(s) from generated-keys ResultSet",
-						sql
-				);
+				throw jdbcServices.getSqlExceptionHelper().convert( e, message.get(), sql );
 			}
 			finally {
 				if ( resultSet != null ) {
@@ -173,7 +142,7 @@ public GeneratedValues executeAndExtractReturning(
 		catch (SQLException e) {
 			throw jdbcServices.getSqlExceptionHelper().convert(
 					e,
-					"Unable to extract generated-keys ResultSet",
+					"Unable to extract generated keys from ResultSet",
 					sql
 			);
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java
index 79a2a259244c..971c9b5c2867 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertReturningDelegate.java
@@ -5,7 +5,6 @@
 package org.hibernate.id.insert;
 
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -41,13 +40,9 @@ public class InsertReturningDelegate extends AbstractReturningDelegate {
 	private final List<ColumnReference> generatedColumns;
 
 	public InsertReturningDelegate(EntityPersister persister, EventType timing) {
-		super(
-				persister,
-				timing,
-				true,
+		super( persister, timing, true,
 				persister.getFactory().getJdbcServices().getDialect()
-						.supportsInsertReturningRowId()
-		);
+						.supportsInsertReturningRowId() );
 		tableReference = new MutatingTableReference( persister.getIdentifierTableMapping() );
 		final var resultBuilders = jdbcValuesMappingProducer.getResultBuilders();
 		generatedColumns = new ArrayList<>( resultBuilders.size() );
@@ -71,7 +66,7 @@ protected GeneratedValues executeAndExtractReturning(
 			String sql,
 			PreparedStatement preparedStatement,
 			SharedSessionContractImplementor session) {
-		final ResultSet resultSet =
+		final var resultSet =
 				session.getJdbcCoordinator().getResultSetReturn()
 						.execute( preparedStatement, sql );
 		try {
@@ -80,7 +75,7 @@ protected GeneratedValues executeAndExtractReturning(
 		catch (SQLException sqle) {
 			throw session.getJdbcServices().getSqlExceptionHelper().convert(
 					sqle,
-					"Unable to extract generated key(s) from generated-keys ResultSet",
+					"Unable to extract generated keys from ResultSet",
 					sql
 			);
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java
index f1988411468d..ee0ab07f1c23 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/SybaseJConnGetGeneratedKeysDelegate.java
@@ -5,7 +5,6 @@
 package org.hibernate.id.insert;
 
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -43,17 +42,16 @@ public GeneratedValues executeAndExtractReturning(
 			String sql,
 			PreparedStatement preparedStatement,
 			SharedSessionContractImplementor session) {
-		final var jdbcCoordinator = session.getJdbcCoordinator();
-		final var jdbcServices = session.getJdbcServices();
-
-		final ResultSet resultSet = jdbcCoordinator.getResultSetReturn().execute( preparedStatement, sql );
+		final var resultSet =
+				session.getJdbcCoordinator().getResultSetReturn()
+						.execute( preparedStatement, sql );
 		try {
 			return getGeneratedValues( resultSet, preparedStatement, persister, getTiming(), session );
 		}
 		catch (SQLException e) {
-			throw jdbcServices.getSqlExceptionHelper().convert(
+			throw session.getJdbcServices().getSqlExceptionHelper().convert(
 					e,
-					"Unable to extract generated-keys ResultSet",
+					"Unable to extract generated keys from ResultSet",
 					sql
 			);
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/UniqueKeySelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/UniqueKeySelectingDelegate.java
index 0739702c0394..cf86ab529e60 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/UniqueKeySelectingDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/UniqueKeySelectingDelegate.java
@@ -13,7 +13,6 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.EventType;
 import org.hibernate.jdbc.Expectation;
-import org.hibernate.metamodel.mapping.EntityRowIdMapping;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.sql.model.ast.builder.TableInsertBuilderStandard;
 import org.hibernate.sql.model.ast.builder.TableMutationBuilder;
@@ -46,7 +45,7 @@ public UniqueKeySelectingDelegate(
 			uniqueKeyTypes[i] = persister.getPropertyType( uniqueKeyPropertyNames[i] );
 		}
 
-		final EntityRowIdMapping rowIdMapping = persister.getRowIdMapping();
+		final var rowIdMapping = persister.getRowIdMapping();
 		if ( !persister.isIdentifierAssignedByInsert()
 				|| persister.getInsertGeneratedProperties().size() > 1
 				|| rowIdMapping != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/id/package-info.java b/hibernate-core/src/main/java/org/hibernate/id/package-info.java
index 099124f62e7a..bdb21faf6d29 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/package-info.java
@@ -16,7 +16,7 @@
  *     <li>{@link org.hibernate.id.enhanced.TableGenerator} - {@code @GeneratedValue(strategy=TABLE)}
  *     <li>{@link org.hibernate.id.uuid.UuidGenerator} - {@code @UuidGenerator}
  * </ul>
- * <p>
+ *
  * @apiNote The remaining id generators are kept around for backward compatibility
  *          and as an implementation detail of the {@code hbm.xml} mapping format.
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidGenerator.java
index c6f786a8664e..e66ef0ab5bed 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidGenerator.java
@@ -30,7 +30,7 @@
 
 /**
  * {@linkplain org.hibernate.generator.Generator} for producing {@link UUID} values.
- * <p/>
+ * <p>
  * Uses a {@linkplain UuidValueGenerator} and {@linkplain ValueTransformer} to
  * generate the values.
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidVersion7Strategy.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidVersion7Strategy.java
index 35ff129960b5..65170aba9361 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidVersion7Strategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidVersion7Strategy.java
@@ -54,6 +54,13 @@ public long millis() {
 			return lastTimestamp.toEpochMilli();
 		}
 
+		/**
+		 * Sub-miliseconds part of timestamp (micro- and nanoseconds) mapped to 12 bit integral value.
+		 * Calculated as nanos / 1000000 * 4096
+		 *
+		 * @param timestamp
+		 * @return
+		 */
 		private static long nanos(Instant timestamp) {
 			return (long) ((timestamp.getNano() % 1_000_000L) * 0.004096);
 		}
@@ -64,9 +71,17 @@ public State getNextState() {
 				return new State( now, randomSequence() );
 			}
 			else {
-				final long nextSequence = lastSequence + Holder.numberGenerator.nextLong( 0xFFFF_FFFFL );
-				return nextSequence > MAX_RANDOM_SEQUENCE
-						? new State( lastTimestamp.plusNanos( 250 ), randomSequence() )
+				final long nextSequence = randomSequence();
+				/*
+				 *	If next random sequence is less or equal to last one sub-millisecond part
+				 * 	should be incremented to preserve monotonicity of generated UUIDs.
+				 * 	To do this smallest number of nanoseconds that will always increase
+				 * 	sub-millisecond part mapped to 12 bits is
+				 * 		1_000_000 (nanons per milli) / 4096 (12 bits) = 244.14...
+				 * 	So 245 is used as smallest integer larger than this value.
+				 */
+				return lastSequence >= nextSequence
+						? new State( lastTimestamp.plusNanos( 245 ), nextSequence )
 						: new State( lastTimestamp, nextSequence );
 			}
 		}
@@ -77,7 +92,7 @@ private boolean lastTimestampEarlierThan(Instant now) {
 		}
 
 		private static long randomSequence() {
-			return Holder.numberGenerator.nextLong( MAX_RANDOM_SEQUENCE );
+			return Holder.numberGenerator.nextLong( MAX_RANDOM_SEQUENCE + 1 );
 		}
 	}
 
@@ -118,7 +133,7 @@ public UUID generateUuid(final SharedSessionContractImplementor session) {
 				| state.nanos() & 0xFFFL,
 				// LSB bits 0-1 - variant = 4
 				0x8000_0000_0000_0000L
-				// LSB bits 2-15 - pseudorandom counter
+				// LSB bits 2-63 - pseudorandom counter
 				| state.lastSequence
 		);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
index 2474372bc614..39b5248113af 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
@@ -102,6 +102,7 @@
 import org.hibernate.resource.transaction.TransactionRequiredForJoinException;
 import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;
 import org.hibernate.resource.transaction.spi.TransactionCoordinator;
+import org.hibernate.temporal.spi.TransactionIdentifierSupplier;
 import org.hibernate.type.format.FormatMapper;
 import org.hibernate.type.spi.TypeConfiguration;
 
@@ -166,10 +167,14 @@ abstract class AbstractSharedSessionContract implements SharedSessionContractImp
 	private final boolean readOnly;
 	private final TimeZone jdbcTimeZone;
 
+	private transient TransactionIdentifierSupplier<?> transactionIdSupplier;
+
 	// mutable state
 	private CacheMode cacheMode;
 	private Integer jdbcBatchSize;
 
+	private transient Object currentTransactionIdentifier;
+
 	private boolean criteriaCopyTreeEnabled;
 	private boolean criteriaPlanCacheEnabled;
 
@@ -210,6 +215,8 @@ abstract class AbstractSharedSessionContract implements SharedSessionContractImp
 
 		final var statementInspector = interpret( options.getStatementInspector() );
 
+		transactionIdSupplier = initializeTransactionIdSupplier( factory );
+
 		if ( options instanceof SharedSessionCreationOptions sharedOptions
 				&& sharedOptions.isTransactionCoordinatorShared() ) {
 			isTransactionCoordinatorShared = true;
@@ -250,6 +257,13 @@ public void onParentClose() {
 		}
 	}
 
+	private static TransactionIdentifierSupplier<?> initializeTransactionIdSupplier(SessionFactoryImplementor factory) {
+		final var transactionIdentifierService = factory.getTransactionIdentifierService();
+		return transactionIdentifierService.useServerTimestamp( factory.getJdbcServices().getDialect() )
+				? null
+				: transactionIdentifierService.getIdentifierSupplier();
+	}
+
 	final SessionFactoryOptions getSessionFactoryOptions() {
 		return factoryOptions;
 	}
@@ -260,7 +274,8 @@ public SharedStatelessSessionBuilder statelessWithOptions() {
 			@Override
 			protected StatelessSessionImplementor createStatelessSession() {
 				return new StatelessSessionImpl( factory,
-						new SessionCreationOptionsAdaptor( factory, this, AbstractSharedSessionContract.this ) );
+						new SessionCreationOptionsAdaptor( factory, this,
+								AbstractSharedSessionContract.this ) );
 			}
 		};
 	}
@@ -482,10 +497,9 @@ public final Object getSessionToken() {
 
 	@Override
 	public String getTenantIdentifier() {
-		if ( tenantIdentifier == null ) {
-			return null;
-		}
-		return factory.getTenantIdentifierJavaType().toString( tenantIdentifier );
+		return tenantIdentifier == null
+				? null
+				: factory.getTenantIdentifierJavaType().toString( tenantIdentifier );
 	}
 
 	@Override
@@ -604,6 +618,39 @@ public boolean isTransactionInProgress() {
 			&& transactionCoordinator.isTransactionActive();
 	}
 
+	@Override
+	public Object getCurrentTransactionIdentifier() {
+		if ( currentTransactionIdentifier != null ) {
+			return currentTransactionIdentifier;
+		}
+		else if ( isTransactionInProgress() ) {
+			initializeCurrentTransactionIdentifier();
+			return currentTransactionIdentifier;
+		}
+		else {
+			return generateCurrentTransactionIdentifier();
+		}
+	}
+
+	private Object generateCurrentTransactionIdentifier() {
+		return transactionIdSupplier == null
+				? null
+				: transactionIdSupplier.generateTransactionIdentifier( this );
+	}
+
+	@Override
+	public void afterTransactionBegin() {
+		initializeCurrentTransactionIdentifier();
+	}
+
+	protected void initializeCurrentTransactionIdentifier() {
+		currentTransactionIdentifier = generateCurrentTransactionIdentifier();
+	}
+
+	protected void clearTransactionStartInstant() {
+		currentTransactionIdentifier = null;
+	}
+
 	@Override
 	public void checkTransactionNeededForUpdateOperation(String exceptionMessage) {
 		if ( !factoryOptions.isAllowOutOfTransactionUpdateOperations()
@@ -653,6 +700,7 @@ public void beforeTransactionCompletion() {
 
 	@Override
 	public void afterTransactionCompletion(boolean successful, boolean delayed) {
+		clearTransactionStartInstant();
 		cacheTransactionSynchronization.transactionCompleted( successful );
 	}
 
@@ -1771,6 +1819,8 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
 				factory.transactionCoordinatorBuilder.buildTransactionCoordinator( jdbcCoordinator, this );
 
 		entityNameResolver = new CoordinatingEntityNameResolver( factory, interceptor );
+
+		transactionIdSupplier = initializeTransactionIdSupplier( factory );
 	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
index 1213a3bb9bb0..3016f7179ddd 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
@@ -10,6 +10,7 @@
 import java.net.URL;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
+import java.util.Locale;
 import java.util.Properties;
 
 import org.hibernate.HibernateException;
@@ -52,7 +53,7 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	String NAME = SubSystemLogging.BASE + ".core";
 
-	CoreMessageLogger CORE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, NAME );
+	CoreMessageLogger CORE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = INFO)
 	@Message(value = "Hibernate ORM core version %s", id = 1)
@@ -234,6 +235,10 @@ void missingArguments(
 	@Message(value = "Unable to mark for rollback on TransientObjectException: ", id = 338)
 	void unableToMarkForRollbackOnTransientObjectException(@Cause Exception e);
 
+	@LogMessage(level = ERROR)
+	@Message(value = "Unable to mark for rollback on DetachedObjectException: ", id = 339)
+	void unableToMarkForRollbackOnDetachedObjectException(@Cause Exception e);
+
 	@LogMessage(level = ERROR)
 	@Message(value = "Could not release a cache lock: %s", id = 353)
 	void unableToReleaseCacheLock(CacheException ce);
@@ -270,10 +275,6 @@ void missingArguments(
 	@Message(value = "Warnings creating temp table: %s", id = 413)
 	void warningsCreatingTempTable(SQLWarning warning);
 
-	@LogMessage(level = WARN)
-	@Message(value = "Write locks via update not supported for non-versioned entities [%s]", id = 416)
-	void writeLocksNotSupported(String entityName);
-
 	@LogMessage(level = WARN)
 	@Message(
 			value = """
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java
index 40fbce66c837..e9fadea15895 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java
@@ -8,6 +8,7 @@
 import java.sql.SQLException;
 
 import org.hibernate.AssertionFailure;
+import org.hibernate.DetachedObjectException;
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.LockOptions;
@@ -96,8 +97,13 @@ else if ( exception instanceof LockingStrategyException lockingStrategyException
 		else if ( exception instanceof SnapshotIsolationException ) {
 			return new OptimisticLockException( exception.getMessage(), exception );
 		}
-		else if ( exception instanceof org.hibernate.QueryTimeoutException ) {
-			final var converted = new QueryTimeoutException( exception.getMessage(), exception );
+		else if ( exception instanceof org.hibernate.QueryTimeoutException queryTimeoutException ) {
+			final var converted =
+					isMarkedForRollback( queryTimeoutException )
+							// per spec, we must throw this exception if the tx was aborted
+							? new PersistenceException( exception.getMessage(), exception )
+							// per spec, we only throw this exception if the tx is not aborted
+							: new QueryTimeoutException( exception.getMessage(), exception );
 			rollbackIfNecessary( converted );
 			return converted;
 		}
@@ -141,6 +147,16 @@ else if ( exception instanceof TransientObjectException ) {
 			//Spec 3.2.3 Synchronization rules
 			return new IllegalStateException( exception );
 		}
+		else if ( exception instanceof DetachedObjectException ) {
+			try {
+				session.markForRollbackOnly();
+			}
+			catch (Exception ne) {
+				//we do not want the subsequent exception to swallow the original one
+				CORE_LOGGER.unableToMarkForRollbackOnDetachedObjectException( ne );
+			}
+			throw new IllegalArgumentException( exception );
+		}
 		else if ( exception instanceof TransactionSerializationException ) {
 			final var converted = new RollbackException( exception.getMessage(), exception );
 			rollbackIfNecessary( converted );
@@ -211,9 +227,12 @@ protected PersistenceException wrapLockException(LockingStrategyException except
 			return new OptimisticLockException( message, lockException, entity );
 		}
 		else if ( exception instanceof PessimisticEntityLockException lockException ) {
-			// assume lock timeout occurred if a timeout or NO WAIT was specified
-			return lockOptions != null && lockOptions.getTimeout().milliseconds() > -1
+			// assume a lock timeout occurred if a timeout or NO WAIT was specified
+			return !isMarkedForRollback( lockException.getCause() )
+				&& hasTimeout( lockOptions )
+					// per spec, we only throw this exception if the tx is not aborted
 					? new LockTimeoutException( message, lockException, entity )
+					// per spec, we must throw this exception if the tx was aborted
 					: new PessimisticLockException( message, lockException, entity );
 		}
 		else {
@@ -223,17 +242,33 @@ else if ( exception instanceof PessimisticEntityLockException lockException ) {
 
 	protected PersistenceException wrapLockException(org.hibernate.PessimisticLockException exception, LockOptions lockOptions) {
 		final String message = exception.getMessage();
+		final boolean markedForRollback = isMarkedForRollback( exception );
 		if ( exception instanceof org.hibernate.exception.LockTimeoutException ) {
-			return new LockTimeoutException( message, exception );
+			return markedForRollback
+					// per spec, we must throw this exception if the tx was aborted
+					? new PessimisticLockException( message, exception )
+					// per spec, we only throw this exception if the tx is not aborted
+					: new LockTimeoutException( message, exception );
 		}
 		else {
-			// assume lock timeout occurred if a timeout or NO WAIT was specified
-			return lockOptions != null && lockOptions.getTimeout().milliseconds() > -1
+			// assume a lock timeout occurred if a timeout or NO WAIT was specified
+			return !markedForRollback && hasTimeout( lockOptions )
+					// per spec, we only throw this exception if the tx is not aborted
 					? new LockTimeoutException( message, exception )
+					// per spec, we must throw this exception if the tx was aborted
 					: new PessimisticLockException( message, exception );
 		}
 	}
 
+	private static boolean hasTimeout(LockOptions lockOptions) {
+		return lockOptions != null
+			&& lockOptions.getTimeout().milliseconds() > -1;
+	}
+
+	private boolean isMarkedForRollback(JDBCException exception) {
+		return session.getJdbcServices().getDialect().causesRollback( exception.getSQLException() );
+	}
+
 	private void rollbackIfNecessary(PersistenceException persistenceException) {
 		if ( !isNonRollbackException( persistenceException ) ) {
 			try {
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FilterImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/FilterImpl.java
index ec35374aa238..bcb767f83f01 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FilterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FilterImpl.java
@@ -37,9 +37,11 @@ public class FilterImpl implements Filter, Serializable {
 	private @Nullable TreeMap<String,Object> parameters;
 	private final boolean autoEnabled;
 	private final boolean applyToLoadByKey;
+	private transient boolean validated;
 
 	void afterDeserialize(SessionFactoryImplementor factory) {
 		definition = factory.getFilterDefinition( filterName );
+		validated = false;
 		validate();
 	}
 
@@ -117,6 +119,7 @@ public Filter setParameter(String name, Object value) throws IllegalArgumentExce
 			parameters = new TreeMap<>();
 		}
 		parameters.put( name, argument );
+		validated = false;
 		return this;
 	}
 
@@ -148,6 +151,7 @@ public Filter setParameterList(String name, Collection<?> values) throws Hiberna
 			parameters = new TreeMap<>();
 		}
 		parameters.put( name, values );
+		validated = false;
 		return this;
 	}
 
@@ -184,6 +188,9 @@ public Supplier<?> getParameterResolver(String name) {
 	 * @throws HibernateException If the state is not currently valid.
 	 */
 	public void validate() throws HibernateException {
+		if ( validated ) {
+			return;
+		}
 		// for each of the defined parameters, make sure its argument
 		// has been set or a resolver has been implemented and specified
 		for ( final String parameterName : definition.getParameterNames() ) {
@@ -192,6 +199,7 @@ public void validate() throws HibernateException {
 						+ "' has neither an argument nor a resolver" );
 			}
 		}
+		validated = true;
 	}
 
 	private boolean hasResolver(String parameterName) {
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/MultiIdentifierLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/MultiIdentifierLoadAccessImpl.java
index e2fdedb0f9d1..10b05f7fcc7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/MultiIdentifierLoadAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/MultiIdentifierLoadAccessImpl.java
@@ -7,11 +7,15 @@
 import jakarta.persistence.EntityGraph;
 import jakarta.persistence.PessimisticLockScope;
 import jakarta.persistence.Timeout;
+import org.hibernate.BatchSize;
 import org.hibernate.CacheMode;
+import org.hibernate.KeyType;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.MultiIdentifierLoadAccess;
+import org.hibernate.NaturalIdSynchronization;
 import org.hibernate.OrderingMode;
+import org.hibernate.ReadOnlyMode;
 import org.hibernate.RemovalsMode;
 import org.hibernate.SessionCheckMode;
 import org.hibernate.UnknownProfileException;
@@ -19,19 +23,23 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.internal.find.FindMultipleByKeyOperation;
 import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
+import org.hibernate.loader.internal.LoadAccessContext;
 import org.hibernate.persister.entity.EntityPersister;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Supplier;
 
 import static java.util.Collections.emptyList;
 
-/**
- * @author Steve Ebersole
- */
+/// Implementation of MultiIdentifierLoadAccess.
+///
+/// @author Steve Ebersole
+///
+/// @deprecated Use [FindMultipleByKeyOperation] instead.
+@Deprecated
 class MultiIdentifierLoadAccessImpl<T> implements MultiIdentifierLoadAccess<T>, MultiIdLoadOptions {
 	private final SharedSessionContractImplementor session;
 	private final EntityPersister entityPersister;
@@ -43,7 +51,7 @@ class MultiIdentifierLoadAccessImpl<T> implements MultiIdentifierLoadAccess<T>,
 	private RootGraphImplementor<T> rootGraph;
 	private GraphSemantic graphSemantic;
 
-	private Integer batchSize;
+	private BatchSize batchSize;
 	private SessionCheckMode sessionCheckMode = SessionCheckMode.DISABLED;
 	private RemovalsMode removalsMode = RemovalsMode.REPLACE;
 	protected OrderingMode orderingMode = OrderingMode.ORDERED;
@@ -107,12 +115,12 @@ public MultiIdentifierLoadAccess<T> with(EntityGraph<T> graph, GraphSemantic sem
 
 	@Override
 	public Integer getBatchSize() {
-		return batchSize;
+		return batchSize.batchSize();
 	}
 
 	@Override
 	public MultiIdentifierLoadAccess<T> withBatchSize(int batchSize) {
-		this.batchSize = batchSize < 1 ? null : batchSize;
+		this.batchSize = batchSize < 1 ? null : new BatchSize( batchSize );
 		return this;
 	}
 
@@ -164,45 +172,25 @@ public Boolean getReadOnly(SessionImplementor session) {
 	@Override
 	@SuppressWarnings( "unchecked" )
 	public <K> List<T> multiLoad(K... ids) {
-		return perform( () -> (List<T>) entityPersister.multiLoad( ids, session, this ) );
-	}
-
-	public List<T> perform(Supplier<List<T>> executor) {
-		final var sessionCacheMode = session.getCacheMode();
-		boolean cacheModeChanged = false;
-		if ( cacheMode != null ) {
-			// naive check for now...
-			// todo : account for "conceptually equal"
-			if ( cacheMode != sessionCacheMode ) {
-				session.setCacheMode( cacheMode );
-				cacheModeChanged = true;
-			}
-		}
+		return buildOperation().performFind( List.of( ids ), graphSemantic, rootGraph, (LoadAccessContext) session );
+	}
 
-		try {
-			final var influencers = session.getLoadQueryInfluencers();
-			final var fetchProfiles =
-					influencers.adjustFetchProfiles( disabledFetchProfiles, enabledFetchProfiles );
-			final var effectiveEntityGraph =
-					rootGraph == null
-							? null
-							: influencers.applyEntityGraph( rootGraph, graphSemantic );
-			try {
-				return executor.get();
-			}
-			finally {
-				if ( effectiveEntityGraph != null ) {
-					effectiveEntityGraph.clear();
-				}
-				influencers.setEnabledFetchProfileNames( fetchProfiles );
-			}
-		}
-		finally {
-			if ( cacheModeChanged ) {
-				// change it back
-				session.setCacheMode( sessionCacheMode );
-			}
-		}
+	private FindMultipleByKeyOperation<T> buildOperation() {
+		return new FindMultipleByKeyOperation<T>(
+				entityPersister,
+				KeyType.IDENTIFIER,
+				batchSize,
+				sessionCheckMode,
+				removalsMode,
+				orderingMode,
+				cacheMode,
+				lockOptions,
+				readOnly == Boolean.TRUE ? ReadOnlyMode.READ_ONLY : ReadOnlyMode.READ_WRITE,
+				enabledFetchProfiles,
+				disabledFetchProfiles,
+				// irrelevant for load-by-id
+				NaturalIdSynchronization.DISABLED
+		);
 	}
 
 	@Override
@@ -210,7 +198,7 @@ public List<T> perform(Supplier<List<T>> executor) {
 	public <K> List<T> multiLoad(List<K> ids) {
 		return ids.isEmpty()
 				? emptyList()
-				: perform( () -> (List<T>) entityPersister.multiLoad( ids.toArray(), session, this ) );
+				: buildOperation().performFind( (List<Object>)ids, graphSemantic, rootGraph, (LoadAccessContext) session );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdHelper.java
index b607a9f59997..b9cde2b804f3 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdHelper.java
@@ -43,7 +43,7 @@ public static void performAnyNeededCrossReferenceSynchronizations(
 		// first check if synchronization (this process) was disabled
 		if ( synchronizationEnabled
 				// only mutable natural-ids need this processing
-				&& entityMappingType.getNaturalIdMapping().isMutable()
+				&& entityMappingType.requireNaturalIdMapping().isMutable()
 				// skip synchronization when not in a transaction
 				&& session.isTransactionInProgress() ) {
 			final var persister = entityMappingType.getEntityPersister();
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdMultiLoadAccessStandard.java b/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdMultiLoadAccessStandard.java
index bb84eb30e4e6..ce8b2adca103 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdMultiLoadAccessStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/NaturalIdMultiLoadAccessStandard.java
@@ -4,30 +4,38 @@
  */
 package org.hibernate.internal;
 
-import java.util.List;
-
 import jakarta.persistence.EntityGraph;
-
 import jakarta.persistence.PessimisticLockScope;
 import jakarta.persistence.Timeout;
+import org.hibernate.BatchSize;
 import org.hibernate.CacheMode;
+import org.hibernate.KeyType;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
+import org.hibernate.Locking;
 import org.hibernate.NaturalIdMultiLoadAccess;
+import org.hibernate.NaturalIdSynchronization;
 import org.hibernate.OrderingMode;
+import org.hibernate.ReadOnlyMode;
 import org.hibernate.RemovalsMode;
+import org.hibernate.SessionCheckMode;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.internal.find.FindMultipleByKeyOperation;
 import org.hibernate.loader.ast.spi.MultiNaturalIdLoadOptions;
+import org.hibernate.loader.internal.LoadAccessContext;
 import org.hibernate.persister.entity.EntityPersister;
 
-import static org.hibernate.internal.NaturalIdHelper.performAnyNeededCrossReferenceSynchronizations;
+import java.util.List;
 
-/**
- * @author Steve Ebersole
- */
-class NaturalIdMultiLoadAccessStandard<T> implements NaturalIdMultiLoadAccess<T>, MultiNaturalIdLoadOptions {
+/// Implementation of NaturalIdMultiLoadAccess.
+///
+/// @deprecated Use [FindMultipleByKeyOperation] instead.
+///
+/// @author Steve Ebersole
+@Deprecated
+public class NaturalIdMultiLoadAccessStandard<T> implements NaturalIdMultiLoadAccess<T>, MultiNaturalIdLoadOptions {
 	private final EntityPersister entityDescriptor;
 	private final SharedSessionContractImplementor session;
 
@@ -41,7 +49,7 @@ class NaturalIdMultiLoadAccessStandard<T> implements NaturalIdMultiLoadAccess<T>
 	private RemovalsMode removalsMode = RemovalsMode.REPLACE;
 	private OrderingMode orderingMode = OrderingMode.ORDERED;
 
-	NaturalIdMultiLoadAccessStandard(EntityPersister entityDescriptor, SharedSessionContractImplementor session) {
+	public NaturalIdMultiLoadAccessStandard(EntityPersister entityDescriptor, SharedSessionContractImplementor session) {
 		this.entityDescriptor = entityDescriptor;
 		this.session = session;
 	}
@@ -56,6 +64,13 @@ public NaturalIdMultiLoadAccess<T> with(LockMode lockMode, PessimisticLockScope
 		return this;
 	}
 
+	public void with(Locking.Scope scope) {
+		if ( lockOptions == null ) {
+			lockOptions = new LockOptions();
+		}
+		lockOptions.setScope( scope );
+	}
+
 	@Override
 	public NaturalIdMultiLoadAccess<T> with(Timeout timeout) {
 		if ( lockOptions == null ) {
@@ -96,72 +111,47 @@ public NaturalIdMultiLoadAccess<T> enableReturnOfDeletedEntities(boolean enabled
 		return this;
 	}
 
+	public void with(RemovalsMode removalsMode) {
+		this.removalsMode = removalsMode;
+	}
+
 	@Override
 	public NaturalIdMultiLoadAccess<T> enableOrderedReturn(boolean enabled) {
 		this.orderingMode = enabled ? OrderingMode.ORDERED : OrderingMode.UNORDERED;
 		return this;
 	}
 
+	public void with(OrderingMode orderingMode) {
+		this.orderingMode = orderingMode;
+	}
+
 	@Override
-	@SuppressWarnings( "unchecked" )
 	public List<T> multiLoad(Object... ids) {
-		performAnyNeededCrossReferenceSynchronizations( true, entityDescriptor, session );
-
-		final CacheMode sessionCacheMode = session.getCacheMode();
-		boolean cacheModeChanged = false;
-
-		if ( cacheMode != null ) {
-			// naive check for now...
-			// todo : account for "conceptually equal"
-			if ( cacheMode != sessionCacheMode ) {
-				session.setCacheMode( cacheMode );
-				cacheModeChanged = true;
-			}
-		}
-
-		final var loadQueryInfluencers = session.getLoadQueryInfluencers();
-
-		try {
-			final var effectiveEntityGraph = loadQueryInfluencers.getEffectiveEntityGraph();
-			final var initialGraphSemantic = effectiveEntityGraph.getSemantic();
-			final var initialGraph = effectiveEntityGraph.getGraph();
-			final boolean hadInitialGraph = initialGraphSemantic != null;
-
-			if ( graphSemantic != null ) {
-				if ( rootGraph == null ) {
-					throw new IllegalArgumentException( "Graph semantic specified, but no RootGraph was supplied" );
-				}
-				effectiveEntityGraph.applyGraph( rootGraph, graphSemantic );
-			}
-
-			try {
-				return (List<T>)
-						entityDescriptor.getMultiNaturalIdLoader()
-								.multiLoad( ids, this, session );
-			}
-			finally {
-				if ( graphSemantic != null ) {
-					if ( hadInitialGraph ) {
-						effectiveEntityGraph.applyGraph( initialGraph, initialGraphSemantic );
-					}
-					else {
-						effectiveEntityGraph.clear();
-					}
-				}
-			}
-		}
-		finally {
-			if ( cacheModeChanged ) {
-				// change it back
-				session.setCacheMode( sessionCacheMode );
-			}
-		}
-
+		return buildOperation()
+				.performFind( List.of( ids ), graphSemantic, rootGraph, (LoadAccessContext) session );
 	}
 
 	@Override
 	public List<T> multiLoad(List<?> ids) {
-		return multiLoad( ids.toArray( new Object[ 0 ] ) );
+		return buildOperation()
+				.performFind( ids, graphSemantic, rootGraph, (LoadAccessContext) session );
+	}
+
+	private FindMultipleByKeyOperation<T> buildOperation() {
+		return new FindMultipleByKeyOperation<T>(
+				entityDescriptor,
+				KeyType.NATURAL,
+				batchSize == null ? null : new BatchSize( batchSize ),
+				SessionCheckMode.ENABLED,
+				removalsMode,
+				orderingMode,
+				cacheMode,
+				lockOptions,
+				session.isDefaultReadOnly() ? ReadOnlyMode.READ_ONLY : ReadOnlyMode.READ_WRITE,
+				null,
+				null,
+				NaturalIdSynchronization.ENABLED
+		);
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java b/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java
index 0361ba625d0b..37c26c0d0d70 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java
@@ -9,7 +9,9 @@
 import java.sql.SQLException;
 import java.util.Objects;
 
+import org.hibernate.HibernateException;
 import org.hibernate.SessionEventListener;
+import org.hibernate.context.spi.TenantCredentialsMapper;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -42,6 +44,19 @@ public Connection obtainConnection() throws SQLException {
 		final var connectionAcquisitionEvent = eventMonitor.beginJdbcConnectionAcquisitionEvent();
 		try {
 			listener.jdbcConnectionAcquisitionStart();
+			final Object tenantIdentifier = session.getTenantIdentifierValue();
+			if ( tenantIdentifier != null ) {
+				final var tenantCredentialsMapper = getTenantCredentialsMapper();
+				if ( tenantCredentialsMapper != null ) {
+					if ( readOnly ) {
+						throw new HibernateException( "Credentials-based multitenancy not supported with read-only replicas" );
+					}
+					return connectionProvider.getConnection(
+							tenantCredentialsMapper.user( tenantIdentifier ),
+							tenantCredentialsMapper.password( tenantIdentifier )
+					);
+				}
+			}
 			return readOnly
 					? connectionProvider.getReadOnlyConnection()
 					: connectionProvider.getConnection();
@@ -52,6 +67,11 @@ public Connection obtainConnection() throws SQLException {
 		}
 	}
 
+	private TenantCredentialsMapper<Object> getTenantCredentialsMapper() {
+		return session.getSessionFactory().getSessionFactoryOptions()
+				.getTenantCredentialsMapper();
+	}
+
 	@Override
 	public void releaseConnection(Connection connection) throws SQLException {
 		final var eventMonitor = session.getEventMonitor();
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
index 4c29bcfc4df2..37cf5956688a 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -91,6 +91,7 @@
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
 import org.hibernate.service.ServiceRegistry;
+import org.hibernate.temporal.spi.TransactionIdentifierService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.service.spi.SessionFactoryServiceRegistry;
 import org.hibernate.service.spi.SessionFactoryServiceRegistryFactory;
@@ -205,6 +206,7 @@ public class SessionFactoryImpl implements SessionFactoryImplementor {
 	final transient EntityCopyObserverFactory entityCopyObserverFactory;
 	final transient ParameterMarkerStrategy parameterMarkerStrategy;
 	final transient JdbcValuesMappingProducerProvider jdbcValuesMappingProducerProvider;
+	final transient TransactionIdentifierService transactionIdentifierService;
 
 	public SessionFactoryImpl(
 			final MetadataImplementor bootMetamodel,
@@ -256,6 +258,8 @@ public SessionFactoryImpl(
 		classLoaderService = serviceRegistry.requireService( ClassLoaderService.class );
 		jdbcValuesMappingProducerProvider = serviceRegistry.requireService( JdbcValuesMappingProducerProvider.class );
 
+		transactionIdentifierService = serviceRegistry.requireService( TransactionIdentifierService.class );
+
 		final var integratorObserver = new IntegratorObserver();
 		observerChain.addObserver( integratorObserver );
 		try {
@@ -1094,6 +1098,11 @@ boolean connectionProviderHandlesConnectionSchema() {
 				: connectionProvider.handlesConnectionSchema();
 	}
 
+	@Override
+	public TransactionIdentifierService getTransactionIdentifierService() {
+		return transactionIdentifierService;
+	}
+
 	// Serialization handling ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryLogging.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryLogging.java
index 5697463fdfe2..309f4adb160c 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryLogging.java
@@ -16,6 +16,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 import java.util.Map;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
@@ -35,7 +36,7 @@
 public interface SessionFactoryLogging extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".factory";
 
-	SessionFactoryLogging SESSION_FACTORY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionFactoryLogging.class, NAME );
+	SessionFactoryLogging SESSION_FACTORY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionFactoryLogging.class, NAME, Locale.ROOT );
 
 	// ---- SessionFactoryImpl related ---------------------------------------------------------------
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java
index 96835db000ea..682030b90656 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistryMessageLogger.java
@@ -17,6 +17,7 @@
 
 import javax.naming.NamingException;
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.ERROR;
@@ -36,7 +37,7 @@ public interface SessionFactoryRegistryMessageLogger extends BasicLogger  {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".factoryRegistry";
 
 	SessionFactoryRegistryMessageLogger REGISTRY_LOGGER =
-			getMessageLogger( MethodHandles.lookup(), SessionFactoryRegistryMessageLogger.class, LOGGER_NAME );
+			getMessageLogger( MethodHandles.lookup(), SessionFactoryRegistryMessageLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage(level = TRACE)
 	@Message("Initializing SessionFactoryRegistry @%s")
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
index a37ec581e42c..dd6c6a6904fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -40,9 +40,12 @@
 import org.hibernate.event.service.spi.EventListenerGroups;
 import org.hibernate.event.spi.*;
 import org.hibernate.event.spi.LoadEventListener.LoadType;
+import org.hibernate.exception.GenericJDBCException;
+import org.hibernate.exception.JDBCConnectionException;
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.internal.find.FindByKeyOperation;
+import org.hibernate.internal.find.FindMultipleByKeyOperation;
 import org.hibernate.internal.util.ExceptionHelper;
 import org.hibernate.jpa.internal.LegacySpecHelper;
 import org.hibernate.jpa.internal.util.ConfigurationHelper;
@@ -86,7 +89,6 @@
 import static java.lang.Boolean.parseBoolean;
 import static java.lang.Integer.parseInt;
 import static java.lang.System.currentTimeMillis;
-import static java.util.Collections.unmodifiableMap;
 import static org.hibernate.CacheMode.fromJpaModes;
 import static org.hibernate.Timeouts.WAIT_FOREVER_MILLI;
 import static org.hibernate.cfg.AvailableSettings.CRITERIA_COPY_TREE;
@@ -158,8 +160,8 @@ public class SessionImpl
 		implements Serializable, SharedSessionContractImplementor, JdbcSessionOwner, SessionImplementor, EventSource,
 				TransactionCoordinatorBuilder.Options, WrapperOptions, LoadAccessContext {
 
-	// Defaults to null which means the properties are the default
-	// as defined in FastSessionServices#defaultSessionProperties
+	// Defaults to null, meaning the properties
+	// are the default properties of the factory.
 	private Map<String, Object> properties;
 
 	private transient ActionQueue actionQueue;
@@ -191,8 +193,6 @@ public SessionImpl(SessionFactoryImpl factory, SessionCreationOptions options) {
 			actionQueue = createActionQueue();
 			eventListenerGroups = factory.getEventListenerGroups();
 
-			flushMode = options.getInitialSessionFlushMode();
-
 			autoClear = options.shouldAutoClear();
 			autoClose = options.shouldAutoClose();
 
@@ -202,13 +202,10 @@ public SessionImpl(SessionFactoryImpl factory, SessionCreationOptions options) {
 
 			loadQueryInfluencers = new LoadQueryInfluencers( factory, options );
 
-			// NOTE : pulse() already handles auto-join-ability correctly
+			// NOTE: pulse() already handles auto-join-ability correctly
 			getTransactionCoordinator().pulse();
 
-			// do not override explicitly set flush mode ( SessionBuilder#flushMode() )
-			if ( getHibernateFlushMode() == null ) {
-				setHibernateFlushMode( getInitialFlushMode() );
-			}
+			flushMode = getInitialFlushMode( options );
 
 			setUpMultitenancy( factory, loadQueryInfluencers );
 
@@ -247,10 +244,16 @@ private static void setUpTransactionCompletionProcesses(
 		}
 	}
 
-	private FlushMode getInitialFlushMode() {
-		return properties == null
-				? getSessionFactoryOptions().getInitialSessionFlushMode()
-				: ConfigurationHelper.getFlushMode( getSessionProperty( HINT_FLUSH_MODE ), FlushMode.AUTO );
+	private FlushMode getInitialFlushMode(SessionCreationOptions options) {
+		final var initialSessionFlushMode = options.getInitialSessionFlushMode();
+		if ( initialSessionFlushMode != null ) {
+			return initialSessionFlushMode;
+		}
+		else {
+			return properties == null
+					? getSessionFactoryOptions().getInitialSessionFlushMode()
+					: ConfigurationHelper.getFlushMode( properties.get( HINT_FLUSH_MODE ), FlushMode.AUTO );
+		}
 	}
 
 	protected PersistenceContext createPersistenceContext(SessionCreationOptions options) {
@@ -351,7 +354,6 @@ public void clear() {
 	private void internalClear() {
 		persistenceContext.clear();
 		actionQueue.clear();
-
 		eventListenerGroups.eventListenerGroup_CLEAR
 				.fireLazyEventOnEachListener( this::createClearEvent, ClearEventListener::onClear );
 	}
@@ -392,7 +394,7 @@ public void closeWithoutOpenChecks() {
 				else {
 					// In the JPA bootstrap, if the session is closed
 					// before the transaction commits, we just mark the
-					// session as closed, and set waitingForAutoClose.
+					// session as closed and set waitingForAutoClose.
 					// This method will be called a second time from
 					// afterTransactionCompletion when the transaction
 					// commits, and the session will be closed for real.
@@ -405,10 +407,12 @@ public void closeWithoutOpenChecks() {
 			}
 		}
 		finally {
-			// E.g. when we are in the JTA context the session can get closed while the transaction is still active
-			// and JTA will call the AfterCompletion itself. Hence, we don't want to clear out the action queue callbacks at this point:
-			if ( !getTransactionCoordinator().isTransactionActive() && actionQueue.hasAfterTransactionActions() ) {
-				SESSION_LOGGER.warn( "Closing session with unprocessed clean up bulk operations, forcing their execution" );
+			// E.g. When we are in the JTA context, the session can get closed while the
+			// transaction is still active and JTA will call the AfterCompletion itself.
+			// Hence, we don't want to clear out the action queue callbacks at this point:
+			if ( !getTransactionCoordinator().isTransactionActive()
+					&& actionQueue.hasAfterTransactionActions() ) {
+				SESSION_LOGGER.closingSessionWithUnprocessedBulkOperations();
 				actionQueue.executePendingBulkOperationCleanUpActions();
 			}
 			final var statistics = getSessionFactory().getStatistics();
@@ -489,8 +493,8 @@ else if ( isClosed() ) {
 			return false;
 		}
 		else {
-			// JPA technically requires that this be a PersistentUnityTransactionType#JTA to work,
-			// but we do not assert that here:
+			// JPA requires PersistentUnitTransactionType.JTA,
+			// for this, but we do not assert that here:
 			return isAutoCloseSessionEnabled();
 			//  && getTransactionCoordinator().getTransactionCoordinatorBuilder().isJta();
 		}
@@ -557,7 +561,9 @@ public Object getEntityUsingInterceptor(EntityKey key) {
 		// logically, is PersistentContext the "thing" to which an interceptor gets attached?
 		final Object result = persistenceContext.getEntity( key );
 		if ( result == null ) {
-			final Object newObject = getInterceptor().getEntity( key.getEntityName(), key.getIdentifier() );
+			final Object newObject =
+					getInterceptor()
+							.getEntity( key.getEntityName(), key.getIdentifier() );
 			if ( newObject != null ) {
 				lock( newObject, LockMode.NONE );
 			}
@@ -624,7 +630,6 @@ public void lock(Object object, LockMode lockMode, LockOption... lockOptions) {
 
 	private void fireLock(final LockEvent lockEvent) {
 		checkOpen();
-		checkEntityManaged( lockEvent.getEntityName(), lockEvent.getObject() );
 		try {
 			pulseTransactionCoordinator();
 			checkTransactionNeededForLock( lockEvent.getLockMode() );
@@ -642,7 +647,11 @@ private void fireLock(final LockEvent lockEvent) {
 
 	private void convertIfJpaBootstrap(RuntimeException exception, LockOptions lockOptions) {
 		if ( !isJpaBootstrap() && exception instanceof HibernateException ) {
-			throw exception;
+			throw exception instanceof DetachedObjectException
+					// convert to IllegalArgumentException for backward compatibility
+					// TODO: drop this conversion in Hibernate 8
+					? new IllegalArgumentException( exception )
+					: exception;
 		}
 		else if ( exception instanceof MappingException ) {
 			// I believe this is now obsolete everywhere we do it,
@@ -870,8 +879,8 @@ public void removeOrphanBeforeUpdates(String entityName, Object child) {
 	private void logRemoveOrphanBeforeUpdates(String timing, String entityName, Object entity) {
 		if ( SESSION_LOGGER.isTraceEnabled() ) {
 			final var entityEntry = persistenceContext.getEntry( entity );
-			final String entityInfo = entityEntry == null ? entityName : infoString( entityName, entityEntry.getId() );
-			SESSION_LOGGER.removeOrphanBeforeUpdates( timing, entityInfo );
+			SESSION_LOGGER.removeOrphanBeforeUpdates( timing,
+					entityEntry == null ? entityName : infoString( entityName, entityEntry.getId() ) );
 		}
 	}
 
@@ -928,80 +937,46 @@ public void load(Object object, Object id) {
 		fireLoad( new LoadEvent( id, object, this, getReadOnlyFromLoadQueryInfluencers() ), LoadEventListener.RELOAD );
 	}
 
-	private <T> void setMultiIdentifierLoadAccessOptions(FindOption[] options, MultiIdentifierLoadAccess<T> loadAccess) {
-		CacheStoreMode storeMode = getCacheStoreMode();
-		CacheRetrieveMode retrieveMode = getCacheRetrieveMode();
-		LockOptions lockOptions = copySessionLockOptions();
-		int batchSize = -1;
-		for ( FindOption option : options ) {
-			if ( option instanceof CacheStoreMode cacheStoreMode ) {
-				storeMode = cacheStoreMode;
-			}
-			else if ( option instanceof CacheRetrieveMode cacheRetrieveMode ) {
-				retrieveMode = cacheRetrieveMode;
-			}
-			else if ( option instanceof CacheMode cacheMode ) {
-				storeMode = cacheMode.getJpaStoreMode();
-				retrieveMode = cacheMode.getJpaRetrieveMode();
-			}
-			else if ( option instanceof LockModeType lockModeType ) {
-				lockOptions.setLockMode( LockModeTypeHelper.getLockMode( lockModeType ) );
-			}
-			else if ( option instanceof LockMode lockMode ) {
-				lockOptions.setLockMode( lockMode );
-			}
-			else if ( option instanceof LockOptions lockOpts ) {
-				lockOptions = lockOpts;
-			}
-			else if ( option instanceof PessimisticLockScope pessimisticLockScope ) {
-				lockOptions.setLockScope( pessimisticLockScope );
-			}
-			else if ( option instanceof Timeout timeout ) {
-				lockOptions.setTimeOut( timeout.milliseconds() );
-			}
-			else if ( option instanceof EnabledFetchProfile enabledFetchProfile ) {
-				loadAccess.enableFetchProfile( enabledFetchProfile.profileName() );
-			}
-			else if ( option instanceof ReadOnlyMode ) {
-				loadAccess.withReadOnly( option == ReadOnlyMode.READ_ONLY );
-			}
-			else if ( option instanceof BatchSize batchSizeOption ) {
-				batchSize = batchSizeOption.batchSize();
-			}
-			else if ( option instanceof SessionCheckMode ) {
-				loadAccess.enableSessionCheck( option == SessionCheckMode.ENABLED );
-			}
-			else if ( option instanceof OrderingMode ) {
-				loadAccess.enableOrderedReturn( option == OrderingMode.ORDERED );
-			}
-			else if ( option instanceof RemovalsMode ) {
-				loadAccess.enableReturnOfDeletedEntities( option == RemovalsMode.INCLUDE );
-			}
-		}
-		loadAccess.with( lockOptions )
-				.with( interpretCacheMode( storeMode, retrieveMode ) )
-				.withBatchSize( batchSize );
+	@Override
+	public <E> List<E> findMultiple(Class<E> entityType, List<?> keys, FindOption... options) {
+		//noinspection unchecked
+		return findMultiple(
+				requireEntityPersister( entityType ),
+				loadQueryInfluencers.getEffectiveEntityGraph().getSemantic(),
+				(RootGraphImplementor<E>) loadQueryInfluencers.getEffectiveEntityGraph().getGraph(),
+				(List<Object>) keys,
+				options
+		);
 	}
 
-	@Override
-	public <E> List<E> findMultiple(Class<E> entityType, List<?> ids, FindOption... options) {
-		final var loadAccess = byMultipleIds( entityType );
-		setMultiIdentifierLoadAccessOptions( options, loadAccess );
-		return loadAccess.multiLoad( ids );
+	private <E> List<E> findMultiple(
+			EntityPersister entityDescriptor,
+			GraphSemantic graphSemantic,
+			RootGraphImplementor<E> rootGraph,
+			List<Object> keys,
+			FindOption... options) {
+		final var operation = new FindMultipleByKeyOperation<E>(
+				entityDescriptor,
+				lockOptions,
+				getCacheMode(),
+				isDefaultReadOnly(),
+				getFactory(),
+				options
+		);
+		return operation.performFind( keys, graphSemantic, rootGraph, this );
 	}
 
 	@Override
-	public <E> List<E> findMultiple(EntityGraph<E> entityGraph, List<?> ids, FindOption... options) {
-		final var rootGraph = (RootGraph<E>) entityGraph;
+	public <E> List<E> findMultiple(EntityGraph<E> entityGraph, List<?> keys, FindOption... options) {
+		final var rootGraph = (RootGraphImplementor<E>) entityGraph;
 		final var type = rootGraph.getGraphedType();
-		final MultiIdentifierLoadAccess<E> loadAccess =
-				switch ( type.getRepresentationMode() ) {
-					case MAP -> byMultipleIds( type.getTypeName() );
-					case POJO -> byMultipleIds( type.getJavaType() );
-				};
-		loadAccess.withLoadGraph( rootGraph );
-		setMultiIdentifierLoadAccessOptions( options, loadAccess );
-		return loadAccess.multiLoad( ids );
+		final var entityDescriptor = switch ( type.getRepresentationMode() ) {
+			case POJO -> requireEntityPersister( type.getJavaType() );
+			case MAP -> requireEntityPersister( type.getTypeName() );
+		};
+
+		//noinspection unchecked
+		return findMultiple( entityDescriptor, GraphSemantic.LOAD, rootGraph, (List<Object>) keys, options );
 	}
 
 	@Override
@@ -1128,6 +1103,7 @@ protected LoadEvent makeLoadEvent(String entityName, Object id, Boolean readOnly
 			event.setReadOnly( readOnly );
 			event.setLockOptions( lockOptions );
 			event.setAssociationFetch( false );
+			event.validate();
 			return event;
 		}
 	}
@@ -1308,7 +1284,6 @@ public void refresh(String entityName, Object object, RefreshContext refreshedAl
 
 	private void fireRefresh(final RefreshEvent refreshEvent) {
 		checkOpen();
-		checkEntityManaged( refreshEvent.getEntityName(), refreshEvent.getObject() );
 		try {
 			pulseTransactionCoordinator();
 			checkTransactionNeededForLock( refreshEvent.getLockMode() );
@@ -1327,7 +1302,6 @@ private void fireRefresh(final RefreshEvent refreshEvent) {
 	private void fireRefresh(final RefreshContext refreshedAlready, final RefreshEvent refreshEvent) {
 		// called from cascades
 		checkOpenOrWaitingForAutoClose();
-		checkEntityManaged( refreshEvent.getEntityName(), refreshEvent.getObject() );
 		try {
 			pulseTransactionCoordinator();
 			eventListenerGroups.eventListenerGroup_REFRESH
@@ -1339,12 +1313,6 @@ private void fireRefresh(final RefreshContext refreshedAlready, final RefreshEve
 		}
 	}
 
-	private void checkEntityManaged(String entityName, Object entity) {
-		if ( !isManaged( entity ) ) {
-			throw new IllegalArgumentException( "Given entity is not associated with the persistence context" );
-		}
-	}
-
 	@Override
 	public boolean isManaged(Object entity) {
 		try {
@@ -1552,7 +1520,8 @@ public void forceFlush(EntityEntry entityEntry) {
 	@Override
 	public void forceFlush(EntityKey key) {
 		if ( SESSION_LOGGER.isTraceEnabled() ) {
-			SESSION_LOGGER.flushingToForceDeletion( infoString( key.getPersister(), key.getIdentifier(), getFactory() ) );
+			SESSION_LOGGER.flushingToForceDeletion(
+					infoString( key.getPersister(), key.getIdentifier(), getFactory() ) );
 		}
 
 		if ( persistenceContext.getCascadeLevel() > 0 ) {
@@ -2102,6 +2071,7 @@ public void startTransactionBoundary() {
 	@Override
 	public void afterTransactionBegin() {
 		checkOpenOrWaitingForAutoClose();
+		super.afterTransactionBegin();
 		afterTransactionBeginEvents();
 	}
 
@@ -2123,7 +2093,7 @@ private boolean isTransactionFlushable() {
 			return true;
 		}
 		else {
-			final TransactionStatus status = currentTransaction.getStatus();
+			final var status = currentTransaction.getStatus();
 			return status == TransactionStatus.ACTIVE
 				|| status == TransactionStatus.COMMITTING;
 		}
@@ -2189,13 +2159,13 @@ private <T> T find(Class<T> entityClass, Object primaryKey, LockOptions lockOpti
 					.load( primaryKey );
 		}
 		catch ( FetchNotFoundException e ) {
-			// This may happen if the entity has an associations mapped with
+			// This may happen if the entity has an association mapped with
 			// @NotFound(action = NotFoundAction.EXCEPTION) and this associated
 			// entity is not found
 			throw e;
 		}
 		catch ( EntityFilterException e ) {
-			// This may happen if the entity has an associations which is
+			// This may happen if the entity has an association which is
 			// filtered by a FilterDef and this associated entity is not found
 			throw e;
 		}
@@ -2222,8 +2192,11 @@ private <T> T find(Class<T> entityClass, Object primaryKey, LockOptions lockOpti
 			throw getExceptionConverter().convert( new IllegalArgumentException( e.getMessage(), e ) );
 		}
 		catch ( JDBCException e ) {
-			if ( accessTransaction().isActive() && accessTransaction().getRollbackOnly() ) {
-				// Assume situation HHH-12472 running on WildFly
+			final Transaction transaction = accessTransaction();
+			if ( transaction.isActive() && transaction.getRollbackOnly()
+				&& (e instanceof GenericJDBCException || e instanceof JDBCConnectionException) ) {
+				// Assume situation HHH-12472 running on WildFly,
+				// but only if the exception is generic to avoid swallowing locking exceptions (HHH-20260)
 				// Just log the exception and return null
 				SESSION_LOGGER.jdbcExceptionThrownWithTransactionRolledBack( e );
 				return null;
@@ -2251,81 +2224,24 @@ protected static <T> void logIgnoringEntityNotFound(Class<T> entityClass, Object
 		}
 	}
 
-	private <T> void setLoadAccessOptions(FindOption[] options, IdentifierLoadAccessImpl<T> loadAccess) {
-		CacheStoreMode storeMode = getCacheStoreMode();
-		CacheRetrieveMode retrieveMode = getCacheRetrieveMode();
-		LockOptions lockOptions = copySessionLockOptions();
-		for ( FindOption option : options ) {
-			if ( option instanceof CacheStoreMode cacheStoreMode ) {
-				storeMode = cacheStoreMode;
-			}
-			else if ( option instanceof CacheRetrieveMode cacheRetrieveMode ) {
-				retrieveMode = cacheRetrieveMode;
-			}
-			else if ( option instanceof CacheMode cacheMode ) {
-				storeMode = cacheMode.getJpaStoreMode();
-				retrieveMode = cacheMode.getJpaRetrieveMode();
-			}
-			else if ( option instanceof LockModeType lockModeType ) {
-				lockOptions.setLockMode( LockModeTypeHelper.getLockMode( lockModeType ) );
-			}
-			else if ( option instanceof LockMode lockMode ) {
-				lockOptions.setLockMode( lockMode );
-			}
-			else if ( option instanceof LockOptions lockOpts ) {
-				lockOptions = lockOpts;
-			}
-			else if ( option instanceof Locking.Scope lockScope ) {
-				lockOptions.setScope( lockScope );
-			}
-			else if ( option instanceof PessimisticLockScope pessimisticLockScope ) {
-				lockOptions.setScope( Locking.Scope.fromJpaScope( pessimisticLockScope ) );
-			}
-			else if ( option instanceof Locking.FollowOn followOn ) {
-				lockOptions.setFollowOnStrategy( followOn );
-			}
-			else if ( option instanceof Timeout timeout ) {
-				lockOptions.setTimeout( timeout );
-			}
-			else if ( option instanceof EnabledFetchProfile enabledFetchProfile ) {
-				loadAccess.enableFetchProfile( enabledFetchProfile.profileName() );
-			}
-			else if ( option instanceof ReadOnlyMode ) {
-				loadAccess.withReadOnly( option == ReadOnlyMode.READ_ONLY );
-			}
-			else if ( option instanceof FindMultipleOption findMultipleOption ) {
-				throw new IllegalArgumentException( "Option '" + findMultipleOption + "' can only be used in 'findMultiple()'" );
-			}
-		}
-		if ( lockOptions.getLockMode().isPessimistic() ) {
-			if ( lockOptions.getTimeOut() == WAIT_FOREVER_MILLI ) {
-				final Object factoryHint = getFactory().getProperties().get( HINT_SPEC_LOCK_TIMEOUT );
-				if ( factoryHint != null ) {
-					lockOptions.setTimeOut( Timeouts.fromHint( factoryHint ) );
-				}
-			}
-		}
-		loadAccess.with( lockOptions ).with( interpretCacheMode( storeMode, retrieveMode ) );
-	}
-
 	@Override
-	public <T> T find(Class<T> entityClass, Object primaryKey, FindOption... options) {
-		final IdentifierLoadAccessImpl<T> loadAccess = byId( entityClass );
-		setLoadAccessOptions( options, loadAccess );
-		return loadAccess.load( primaryKey );
+	public <T> T find(Class<T> entityClass, Object key, FindOption... options) {
+		//noinspection unchecked
+		return (T) byKey( requireEntityPersister( entityClass ), options ).performFind( key, this );
 	}
 
 	@Override
-	public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... options) {
-		final var graph = (RootGraph<T>) entityGraph;
+	public <T> T find(EntityGraph<T> entityGraph, Object key, FindOption... options) {
+		final var graph = (RootGraphImplementor<T>) entityGraph;
 		final var type = graph.getGraphedType();
-		final IdentifierLoadAccessImpl<T> loadAccess =
-				switch ( type.getRepresentationMode() ) {
-					case MAP -> byId( type.getTypeName() );
-					case POJO -> byId( type.getJavaType() );
-				};
-		setLoadAccessOptions( options, loadAccess );
-		return loadAccess.withLoadGraph( graph ).load( primaryKey );
+
+		final EntityPersister entityDescriptor = switch ( type.getRepresentationMode() ) {
+			case POJO -> requireEntityPersister( type.getJavaType() );
+			case MAP -> requireEntityPersister( type.getTypeName() );
+		};
+
+		//noinspection unchecked
+		return (T) byKey( entityDescriptor, GraphSemantic.LOAD, graph, options ).performFind( key, this );
 	}
 
 	// Hibernate Reactive may need to use this
@@ -2388,16 +2304,34 @@ private void checkTransactionNeededForUpdateOperation() {
 	}
 
 	@Override
-	public Object find(String entityName, Object primaryKey) {
-		final IdentifierLoadAccessImpl<?> loadAccess = byId( entityName );
-		return loadAccess.load( primaryKey );
+	public Object find(String entityName, Object key) {
+		return byKey( requireEntityPersister( entityName ) ).performFind( key, this );
 	}
 
 	@Override
-	public Object find(String entityName, Object primaryKey, FindOption... options) {
-		final IdentifierLoadAccessImpl<?> loadAccess = byId( entityName );
-		setLoadAccessOptions( options, loadAccess );
-		return loadAccess.load( primaryKey );
+	public Object find(String entityName, Object key, FindOption... options) {
+		return byKey( requireEntityPersister( entityName ), options ).performFind( key, this );
+	}
+
+	private <T> FindByKeyOperation<T> byKey(EntityPersister entityDescriptor, FindOption... options) {
+		return byKey( entityDescriptor, null, null, options );
+	}
+
+	private <T> FindByKeyOperation<T> byKey(
+			EntityPersister entityDescriptor,
+			GraphSemantic graphSemantic,
+			RootGraphImplementor<?> rootGraph,
+			FindOption... options) {
+		return new FindByKeyOperation<>(
+				entityDescriptor,
+				graphSemantic,
+				rootGraph,
+				lockOptions,
+				getCacheMode(),
+				isReadOnly(),
+				getFactory(),
+				options
+		);
 	}
 
 	@Override
@@ -2577,25 +2511,22 @@ public LockModeType getLockMode(Object entity) {
 	@Override
 	public void setProperty(String propertyName, Object value) {
 		checkOpen();
-
-		if ( !( value instanceof Serializable ) ) {
-			SESSION_LOGGER.nonSerializableProperty( propertyName );
-			return;
-		}
-
 		if ( propertyName == null ) {
 			SESSION_LOGGER.nullPropertyKey();
-			return;
 		}
-
-		// store property for future reference:
-		if ( properties == null ) {
-			properties = computeCurrentProperties();
+		else if ( !(value instanceof Serializable) ) {
+			SESSION_LOGGER.nonSerializableProperty( propertyName );
+		}
+		else {
+			// store property for future reference
+			if ( properties == null ) {
+				properties = getInitialProperties();
+			}
+			properties.put( propertyName, value );
+			// now actually update the setting if
+			// it's one that affects this Session
+			interpretProperty( propertyName, value );
 		}
-		properties.put( propertyName, value );
-
-		// now actually update the setting, if it's one which affects this Session
-		interpretProperty( propertyName, value );
 	}
 
 	private void interpretProperty(String propertyName, Object value) {
@@ -2658,7 +2589,7 @@ private void interpretProperty(String propertyName, Object value) {
 		}
 	}
 
-	private Map<String, Object> computeCurrentProperties() {
+	private Map<String, Object> getInitialProperties() {
 		final var map = new HashMap<>( getDefaultProperties() );
 		//The FLUSH_MODE is always set at Session creation time,
 		//so it needs special treatment to not eagerly initialize this Map:
@@ -2668,10 +2599,15 @@ private Map<String, Object> computeCurrentProperties() {
 
 	@Override
 	public Map<String, Object> getProperties() {
-		if ( properties == null ) {
-			properties = computeCurrentProperties();
-		}
-		return unmodifiableMap( properties );
+		// EntityManager Javadoc implies that the
+		// returned map should be a mutable copy,
+		// not an unmodifiable map. There's no
+		// good reason to cache the initial
+		// properties, since we have to copy them
+		// each time this method is called.
+		return properties == null
+				? getInitialProperties()
+				: new HashMap<>( properties );
 	}
 
 	@Override
@@ -2780,23 +2716,24 @@ public Collection<?> getManagedEntities(String entityName) {
 	public <E> Collection<E> getManagedEntities(Class<E> entityType) {
 		return persistenceContext.getEntityHoldersByKey().entrySet().stream()
 				.filter( entry -> entry.getKey().getPersister().getMappedClass().equals( entityType ) )
-				.map( entry -> (E) entry.getValue().getManagedObject() )
+				.map( entry -> entityType.cast( entry.getValue().getManagedObject() ) )
 				.toList();
 	}
 
 	@Override
 	public <E> Collection<E> getManagedEntities(EntityType<E> entityType) {
-		final String entityName = ( (EntityDomainType<E>) entityType ).getHibernateEntityName();
+		final var entityDomainType = (EntityDomainType<E>) entityType;
+		final String entityName = entityDomainType.getHibernateEntityName();
 		return persistenceContext.getEntityHoldersByKey().entrySet().stream()
 				.filter( entry -> entry.getKey().getEntityName().equals( entityName ) )
-				.map( entry -> (E) entry.getValue().getManagedObject() )
+				.map( entry -> entityType.getJavaType().cast( entry.getValue().getManagedObject() ) )
 				.toList();
 	}
 
 	/**
-	 * Used by JDK serialization...
+	 * Used by JDK serialization
 	 *
-	 * @param oos The output stream to which we are being written...
+	 * @param oos The output stream to which we are being written
 	 *
 	 * @throws IOException Indicates a general IO stream exception
 	 */
@@ -2815,9 +2752,9 @@ private void writeObject(ObjectOutputStream oos) throws IOException {
 	}
 
 	/**
-	 * Used by JDK serialization...
+	 * Used by JDK serialization
 	 *
-	 * @param ois The input stream from which we are being read...
+	 * @param ois The input stream from which we are being read
 	 *
 	 * @throws IOException Indicates a general IO stream exception
 	 * @throws ClassNotFoundException Indicates a class resolution issue
@@ -2837,7 +2774,7 @@ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFound
 
 		// LoadQueryInfluencers#getEnabledFilters() tries to validate each enabled
 		// filter, which will fail when called before FilterImpl#afterDeserialize( factory );
-		// Instead lookup the filter by name and then call FilterImpl#afterDeserialize( factory ).
+		// Instead, look up the filter by name and then call FilterImpl#afterDeserialize( factory ).
 		for ( String filterName : loadQueryInfluencers.getEnabledFilterNames() ) {
 			( (FilterImpl) loadQueryInfluencers.getEnabledFilter( filterName ) )
 					.afterDeserialize( getFactory() );
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionLogging.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionLogging.java
index cddf971d6999..f11920add427 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionLogging.java
@@ -16,6 +16,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 import java.util.UUID;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
@@ -36,7 +37,7 @@
 public interface SessionLogging extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".session";
 
-	SessionLogging SESSION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionLogging.class, NAME );
+	SessionLogging SESSION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SessionLogging.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = DEBUG)
 	@Message("Session creation specified 'autoJoinTransactions', "
@@ -145,6 +146,10 @@ public interface SessionLogging extends BasicLogger {
 	@Message(id = 90010107, value = "Exception in interceptor afterTransactionCompletion()")
 	void exceptionInAfterTransactionCompletionInterceptor(@Cause Throwable e);
 
+	@LogMessage(level = WARN)
+	@Message(id = 90010108, value = "Closing session with unprocessed clean up bulk operations, forcing their execution")
+	void closingSessionWithUnprocessedBulkOperations();
+
 	// StatelessSession-specific
 
 	@LogMessage(level = TRACE)
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
index f38757327a72..6c9635c3b5d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
@@ -33,7 +33,6 @@
 import org.hibernate.engine.spi.TransactionCompletionCallbacks;
 import org.hibernate.engine.spi.TransactionCompletionCallbacksImplementor;
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
-import org.hibernate.event.monitor.spi.DiagnosticEvent;
 import org.hibernate.event.service.spi.EventListenerGroups;
 import org.hibernate.event.spi.PostCollectionRecreateEvent;
 import org.hibernate.event.spi.PostCollectionRecreateEventListener;
@@ -150,10 +149,11 @@ public StatelessSessionImpl(SessionFactoryImpl factory, SessionCreationOptions o
 		}
 		temporaryPersistenceContext = createPersistenceContext( this );
 		influencers = new LoadQueryInfluencers( getFactory() );
+		influencers.setTemporalIdentifier( options.getTemporalIdentifier() );
 		eventListenerGroups = factory.getEventListenerGroups();
 		setUpMultitenancy( factory, influencers );
-		// a nonzero batch size forces use of write-behind
-		// therefore ignore the value of hibernate.jdbc.batch_size
+		// A nonzero batch size forces the use of write-behind
+		// Therefore, ignore the value of hibernate.jdbc.batch_size
 		setJdbcBatchSize( 0 );
 	}
 
@@ -187,6 +187,7 @@ public void insertMultiple(List<?> entities) {
 			for ( Object entity : entities ) {
 				insert( null, entity );
 			}
+			getJdbcCoordinator().executeBatch();
 		}
 		finally {
 			setJdbcBatchSize( batchSize );
@@ -294,7 +295,7 @@ private void recreateCollections(Object entity, Object id, EntityPersister persi
 			forEachOwnedCollection( entity, id, persister,
 					(descriptor, collection) -> {
 						final String role = descriptor.getRole();
-						firePreRecreate( collection, id, entityName, entity );
+						firePreRecreate( descriptor, collection, id, entityName, entity );
 						final var event = eventMonitor.beginCollectionRecreateEvent();
 						boolean success = false;
 						try {
@@ -307,7 +308,7 @@ private void recreateCollections(Object entity, Object id, EntityPersister persi
 						if ( statistics.isStatisticsEnabled() ) {
 							statistics.recreateCollection( role );
 						}
-						firePostRecreate( collection, id, entityName, entity );
+						firePostRecreate( descriptor, collection, id, entityName, entity );
 					} );
 		}
 	}
@@ -327,6 +328,7 @@ public void deleteMultiple(List<?> entities) {
 			for ( Object entity : entities ) {
 				delete( null, entity );
 			}
+			getJdbcCoordinator().executeBatch();
 		}
 		finally {
 			setJdbcBatchSize( batchSize );
@@ -371,8 +373,8 @@ private void removeCollections(Object entity, Object id, EntityPersister persist
 			forEachOwnedCollection( entity, id, persister,
 					(descriptor, collection) -> {
 						final String role = descriptor.getRole();
-						firePreRemove( collection, id, entityName, entity );
-						final DiagnosticEvent event = eventMonitor.beginCollectionRemoveEvent();
+						firePreRemove( descriptor, collection, id, entityName, entity );
+						final var event = eventMonitor.beginCollectionRemoveEvent();
 						boolean success = false;
 						try {
 							descriptor.remove( id, this );
@@ -381,7 +383,7 @@ private void removeCollections(Object entity, Object id, EntityPersister persist
 						finally {
 							eventMonitor.completeCollectionRemoveEvent( event, id, role, success, this );
 						}
-						firePostRemove( collection, id, entityName, entity );
+						firePostRemove( descriptor, collection, id, entityName, entity );
 						if ( statistics.isStatisticsEnabled() ) {
 							statistics.removeCollection( role );
 						}
@@ -405,6 +407,7 @@ public void updateMultiple(List<?> entities) {
 			for ( Object entity : entities ) {
 				update( null, entity );
 			}
+			getJdbcCoordinator().executeBatch();
 		}
 		finally {
 			setJdbcBatchSize( batchSize );
@@ -459,8 +462,8 @@ private void removeAndRecreateCollections(Object entity, Object id, EntityPersis
 			forEachOwnedCollection( entity, id, persister,
 					(descriptor, collection) -> {
 						final String role = descriptor.getRole();
-						firePreUpdate( collection, id, entityName, entity );
-						final DiagnosticEvent event = eventMonitor.beginCollectionRemoveEvent();
+						firePreUpdate( descriptor, collection, id, entityName, entity );
+						final var event = eventMonitor.beginCollectionRemoveEvent();
 						boolean success = false;
 						try {
 							// TODO: can we do better here?
@@ -471,7 +474,7 @@ private void removeAndRecreateCollections(Object entity, Object id, EntityPersis
 						finally {
 							eventMonitor.completeCollectionRemoveEvent( event, id, role, success, this );
 						}
-						firePostUpdate( collection, id, entityName, entity );
+						firePostUpdate( descriptor, collection, id, entityName, entity );
 						if ( statistics.isStatisticsEnabled() ) {
 							statistics.updateCollection( role );
 						}
@@ -492,6 +495,7 @@ public void upsertMultiple(List<?> entities) {
 			for ( Object entity : entities ) {
 				upsert( null, entity );
 			}
+			getJdbcCoordinator().executeBatch();
 		}
 		finally {
 			setJdbcBatchSize( batchSize );
@@ -668,44 +672,74 @@ protected void firePostDelete(Object entity, Object id, EntityPersister persiste
 	}
 
 	// Hibernate Reactive may need to call this
-	protected void firePreRecreate(PersistentCollection<?> collection, Object id, String entityName, Object owner) {
+	protected void firePreRecreate(
+			CollectionPersister collectionPersister,
+			PersistentCollection<?> collection,
+			Object id,
+			String entityName,
+			Object owner) {
 		eventListenerGroups.eventListenerGroup_PRE_COLLECTION_RECREATE.fireLazyEventOnEachListener(
-				() -> new PreCollectionRecreateEvent( collection, id, entityName, owner ),
+				() -> new PreCollectionRecreateEvent( collectionPersister, collection, id, entityName, owner ),
 				PreCollectionRecreateEventListener::onPreRecreateCollection );
 	}
 
 	// Hibernate Reactive may need to call this
-	protected void firePreUpdate(PersistentCollection<?> collection, Object id, String entityName, Object owner) {
+	protected void firePreUpdate(
+			CollectionPersister collectionPersister,
+			PersistentCollection<?> collection,
+			Object id,
+			String entityName,
+			Object owner) {
 		eventListenerGroups.eventListenerGroup_PRE_COLLECTION_UPDATE.fireLazyEventOnEachListener(
-				() -> new PreCollectionUpdateEvent( collection, id, entityName, owner ),
+				() -> new PreCollectionUpdateEvent( collectionPersister, collection, id, entityName, owner ),
 				PreCollectionUpdateEventListener::onPreUpdateCollection );
 	}
 
 	// Hibernate Reactive may need to call this
-	protected void firePreRemove(PersistentCollection<?> collection, Object id, String entityName, Object owner) {
+	protected void firePreRemove(
+			CollectionPersister collectionPersister,
+			PersistentCollection<?> collection,
+			Object id,
+			String entityName,
+			Object owner) {
 		eventListenerGroups.eventListenerGroup_PRE_COLLECTION_REMOVE.fireLazyEventOnEachListener(
-				() -> new PreCollectionRemoveEvent( collection, id, entityName, owner ),
+				() -> new PreCollectionRemoveEvent( collectionPersister, collection, id, entityName, owner ),
 				PreCollectionRemoveEventListener::onPreRemoveCollection );
 	}
 
 	// Hibernate Reactive may need to call this
-	protected void firePostRecreate(PersistentCollection<?> collection, Object id, String entityName, Object owner) {
+	protected void firePostRecreate(
+			CollectionPersister collectionPersister,
+			PersistentCollection<?> collection,
+			Object id,
+			String entityName,
+			Object owner) {
 		eventListenerGroups.eventListenerGroup_POST_COLLECTION_RECREATE.fireLazyEventOnEachListener(
-				() -> new PostCollectionRecreateEvent( collection, id, entityName, owner ),
+				() -> new PostCollectionRecreateEvent( collectionPersister, collection, id, entityName, owner ),
 				PostCollectionRecreateEventListener::onPostRecreateCollection );
 	}
 
 	// Hibernate Reactive may need to call this
-	protected void firePostUpdate(PersistentCollection<?> collection, Object id, String entityName, Object owner) {
+	protected void firePostUpdate(
+			CollectionPersister collectionPersister,
+			PersistentCollection<?> collection,
+			Object id,
+			String entityName,
+			Object owner) {
 		eventListenerGroups.eventListenerGroup_POST_COLLECTION_UPDATE.fireLazyEventOnEachListener(
-				() -> new PostCollectionUpdateEvent( collection, id, entityName, owner ),
+				() -> new PostCollectionUpdateEvent( collectionPersister, collection, id, entityName, owner ),
 				PostCollectionUpdateEventListener::onPostUpdateCollection );
 	}
 
 	// Hibernate Reactive may need to call this
-	protected void firePostRemove(PersistentCollection<?> collection, Object id, String entityName, Object owner) {
+	protected void firePostRemove(
+			CollectionPersister collectionPersister,
+			PersistentCollection<?> collection,
+			Object id,
+			String entityName,
+			Object owner) {
 		eventListenerGroups.eventListenerGroup_POST_COLLECTION_REMOVE.fireLazyEventOnEachListener(
-				() -> new PostCollectionRemoveEvent(  collection, id, entityName, owner ),
+				() -> new PostCollectionRemoveEvent( collectionPersister, collection, id, entityName, owner ),
 				PostCollectionRemoveEventListener::onPostRemoveCollection );
 	}
 
@@ -961,6 +995,8 @@ public void refresh(String entityName, Object entity, LockMode lockMode) {
 
 		final Object result =
 				getLoadQueryInfluencers()
+						// TODO: This is wrong. StatelessSession is not supposed
+						//       to be affected by cascade = REFRESH. Fix in H8.
 						.fromInternalFetchProfile( CascadingFetchProfile.REFRESH,
 								() -> persister.load( id, entity, getNullSafeLockMode( lockMode ), this ) );
 		UnresolvableObjectException.throwIfNull( result, id, persister.getEntityName() );
@@ -1032,25 +1068,26 @@ public Object internalLoad(
 		final var persister = requireEntityPersister( entityName );
 		final var entityKey = generateEntityKey( id, persister );
 
-		// first, try to load it from the temp PC associated to this SS
+		// First, try to load it from the temporary PersistenceContext
 		final var persistenceContext = getPersistenceContext();
 		final var holder = persistenceContext.getEntityHolder( entityKey );
 		if ( holder != null && holder.getEntity() != null ) {
-			// we found it in the temp PC.  Should indicate we are in the midst of processing a result set
-			// containing eager fetches via join fetch
+			// We found it in the temporary persistence context.
+			// Should indicate we are in the midst of processing a
+			// result set containing eager fetches via join fetch.
 			return holder.getEntity();
 		}
 
 		if ( !eager ) {
-			// caller did not request forceful eager loading, see if we can create
-			// some form of proxy
+			// The caller did not request forceful eager loading;
+			// see if we can create some form of proxy.
 
 			// first, check to see if we can use "bytecode proxies"
-
 			final var enhancementMetadata = persister.getBytecodeEnhancementMetadata();
 			if ( enhancementMetadata.isEnhancedForLazyLoading() ) {
-				// if the entity defines a HibernateProxy factory, see if there is an
-				// existing proxy associated with the PC - and if so, use it
+				// If the entity defines a HibernateProxy factory,
+				// see if there is an existing proxy associated with
+				// the persistence context - and if so, use it
 				if ( persister.getRepresentationStrategy().getProxyFactory() != null ) {
 					final Object proxy = holder == null ? null : holder.getProxy();
 
@@ -1063,9 +1100,11 @@ public Object internalLoad(
 						return persistenceContext.narrowProxy( proxy, persister, entityKey, null );
 					}
 
-					// specialized handling for entities with subclasses with a HibernateProxy factory
+					// Specialized handling for entities with subclasses with
+					// a HibernateProxy factory.
 					if ( persister.hasSubclasses() ) {
-						// entities with subclasses that define a ProxyFactory can create a HibernateProxy.
+						// Entities with subclasses that define a ProxyFactory
+						// can create a HibernateProxy.
 						SESSION_LOGGER.creatingHibernateProxyToHonorLaziness();
 						return createProxy( entityKey );
 					}
@@ -1074,8 +1113,8 @@ public Object internalLoad(
 				else if ( !persister.hasSubclasses() ) {
 					return enhancementMetadata.createEnhancedProxy( entityKey, false, this );
 				}
-				// If we get here, then the entity class has subclasses and there is no HibernateProxy factory.
-				// The entity will get loaded below.
+				// If we get here, then the entity class has subclasses and there
+				// is no HibernateProxy factory. The entity will be loaded below.
 			}
 			else {
 				if ( persister.hasProxy() ) {
@@ -1087,14 +1126,14 @@ else if ( !persister.hasSubclasses() ) {
 			}
 		}
 
-		// otherwise immediately materialize it
+		// Otherwise, immediately materialize it.
 		return internalLoadGet( entityName, id, persistenceContext );
 	}
 
 	// For Hibernate Reactive
 	protected Object internalLoadGet(String entityName, Object id, PersistenceContext persistenceContext) {
-		// IMPLEMENTATION NOTE: increment/decrement the load count before/after getting the value
-		//                      to ensure that #get does not clear the PersistenceContext.
+		// Increment/decrement the load count before/after getting the value
+		// to ensure that #get does not clear the PersistenceContext.
 		persistenceContext.beforeLoad();
 		try {
 			return get( entityName, id );
@@ -1353,6 +1392,7 @@ public boolean autoFlushIfRequired(Set<String> querySpaces, boolean skipPreFlush
 
 	@Override
 	public void afterTransactionBegin() {
+		super.afterTransactionBegin();
 		afterTransactionBeginEvents();
 	}
 
@@ -1367,6 +1407,7 @@ public void beforeTransactionCompletion() {
 	public void afterTransactionCompletion(boolean successful, boolean delayed) {
 		transactionCompletionCallbacks.afterTransactionCompletion( successful );
 		afterTransactionCompletionEvents( successful );
+		clearTransactionStartInstant();
 		if ( shouldAutoClose() && !isClosed() ) {
 			managedClose();
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/find/FindByKeyOperation.java b/hibernate-core/src/main/java/org/hibernate/internal/find/FindByKeyOperation.java
new file mode 100644
index 000000000000..20ec4286566e
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/internal/find/FindByKeyOperation.java
@@ -0,0 +1,344 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.internal.find;
+
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
+import jakarta.persistence.FindOption;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.PessimisticLockScope;
+import jakarta.persistence.Timeout;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.CacheMode;
+import org.hibernate.EnabledFetchProfile;
+import org.hibernate.KeyType;
+import org.hibernate.FindMultipleOption;
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.Locking;
+import org.hibernate.NaturalIdSynchronization;
+import org.hibernate.ObjectNotFoundException;
+import org.hibernate.ReadOnlyMode;
+import org.hibernate.Timeouts;
+import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.Status;
+import org.hibernate.event.spi.LoadEventListener;
+import org.hibernate.graph.GraphSemantic;
+import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.jpa.internal.util.LockModeTypeHelper;
+import org.hibernate.loader.ast.spi.NaturalIdLoader;
+import org.hibernate.loader.internal.LoadAccessContext;
+import org.hibernate.metamodel.mapping.NaturalIdMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.proxy.HibernateProxy;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import static org.hibernate.Timeouts.WAIT_FOREVER;
+import static org.hibernate.engine.spi.NaturalIdResolutions.INVALID_NATURAL_ID_REFERENCE;
+import static org.hibernate.internal.NaturalIdHelper.performAnyNeededCrossReferenceSynchronizations;
+import static org.hibernate.jpa.SpecHints.HINT_SPEC_LOCK_TIMEOUT;
+import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
+
+/// Support for loading a single entity by key (either [id][KeyType#IDENTIFIER] or [natural-id][KeyType#NATURAL]).
+///
+/// @see org.hibernate.Session#find
+/// @see KeyType
+///
+/// @author Steve Ebersole
+public class FindByKeyOperation<T> implements NaturalIdLoader.Options {
+	private final EntityPersister entityDescriptor;
+
+	private KeyType keyType = KeyType.IDENTIFIER;
+
+	private CacheStoreMode cacheStoreMode;
+	private CacheRetrieveMode cacheRetrieveMode;
+
+	private LockMode lockMode;
+	private Locking.Scope lockScope;
+	private Locking.FollowOn lockFollowOn;
+	private Timeout lockTimeout = WAIT_FOREVER;
+
+	private ReadOnlyMode readOnlyMode;
+
+	private RootGraphImplementor<?> rootGraph;
+	private GraphSemantic graphSemantic;
+
+	private Set<String> enabledFetchProfiles;
+
+	private NaturalIdSynchronization naturalIdSynchronization;
+
+	public FindByKeyOperation(
+			@NonNull EntityPersister entityDescriptor,
+			@Nullable GraphSemantic graphSemantic,
+			@Nullable RootGraphImplementor<?> rootGraph,
+			@Nullable LockOptions defaultLockOptions,
+			@Nullable CacheMode defaultCacheMode,
+			boolean defaultReadOnly,
+			@NonNull SessionFactoryImplementor sessionFactory,
+			FindOption... findOptions) {
+		this.entityDescriptor = entityDescriptor;
+
+		this.graphSemantic = graphSemantic;
+		this.rootGraph = rootGraph;
+
+		if ( defaultCacheMode != null ) {
+			cacheStoreMode = defaultCacheMode.getJpaStoreMode();
+			cacheRetrieveMode = defaultCacheMode.getJpaRetrieveMode();
+		}
+
+		if ( defaultLockOptions != null ) {
+			lockMode = defaultLockOptions.getLockMode();
+			lockScope = defaultLockOptions.getScope();
+			lockTimeout = defaultLockOptions.getTimeout();
+			lockFollowOn = defaultLockOptions.getFollowOnStrategy();
+		}
+		if ( lockTimeout == WAIT_FOREVER ) {
+			final Object factoryTimeoutHint = sessionFactory.getProperties().get( HINT_SPEC_LOCK_TIMEOUT );
+			if ( factoryTimeoutHint != null ) {
+				lockTimeout = Timeouts.fromHintTimeout( factoryTimeoutHint );
+			}
+		}
+
+		readOnlyMode = defaultReadOnly ? ReadOnlyMode.READ_ONLY : ReadOnlyMode.READ_WRITE;
+
+		for ( FindOption option : findOptions ) {
+			if ( option instanceof KeyType keyType ) {
+				this.keyType = keyType;
+			}
+			else if ( option instanceof CacheStoreMode cacheStoreMode ) {
+				this.cacheStoreMode = cacheStoreMode;
+			}
+			else if ( option instanceof CacheRetrieveMode cacheRetrieveMode ) {
+				this.cacheRetrieveMode = cacheRetrieveMode;
+			}
+			else if ( option instanceof CacheMode cacheMode ) {
+				this.cacheStoreMode = cacheMode.getJpaStoreMode();
+				this.cacheRetrieveMode = cacheMode.getJpaRetrieveMode();
+			}
+			else if ( option instanceof LockModeType lockModeType ) {
+				this.lockMode = LockModeTypeHelper.getLockMode( lockModeType );
+			}
+			else if ( option instanceof LockMode lockMode ) {
+				this.lockMode = lockMode;
+			}
+			else if ( option instanceof Locking.Scope lockScope ) {
+				this.lockScope = lockScope;
+			}
+			else if ( option instanceof PessimisticLockScope pessimisticLockScope ) {
+				this.lockScope = Locking.Scope.fromJpaScope( pessimisticLockScope );
+			}
+			else if ( option instanceof Locking.FollowOn followOn ) {
+				this.lockFollowOn = followOn;
+			}
+			else if ( option instanceof Timeout timeout ) {
+				this.lockTimeout = timeout;
+			}
+			else if ( option instanceof ReadOnlyMode readOnlyMode) {
+				this.readOnlyMode = readOnlyMode;
+			}
+			else if ( option instanceof EnabledFetchProfile enabledFetchProfile ) {
+				this.enabledFetchProfile( enabledFetchProfile.profileName() );
+			}
+			else if ( option instanceof GraphSemantic semantic ) {
+				if ( rootGraph == null ) {
+					throw new IllegalArgumentException( "GraphSemantic option was specified, but no Graph was supplied" );
+				}
+				this.graphSemantic = semantic;
+			}
+			else if ( option instanceof NaturalIdSynchronization naturalIdSynchronization ) {
+				this.naturalIdSynchronization = naturalIdSynchronization;
+			}
+			else if ( option instanceof FindMultipleOption findMultipleOption ) {
+				throw new IllegalArgumentException( "Option '" + findMultipleOption + "' can only be used in 'findMultiple()'" );
+			}
+		}
+	}
+
+	private void enabledFetchProfile(String profileName) {
+		if ( enabledFetchProfiles == null ) {
+			enabledFetchProfiles = new HashSet<>();
+		}
+		enabledFetchProfiles.add( profileName );
+	}
+
+	public T performFind(Object key, LoadAccessContext loadAccessContext) {
+		if ( keyType == KeyType.NATURAL ) {
+			return findByNaturalId( key, loadAccessContext );
+		}
+		else {
+			return findById( key, loadAccessContext );
+		}
+
+	}
+
+	private T findByNaturalId(Object key, LoadAccessContext loadAccessContext) {
+		final NaturalIdMapping naturalIdMapping = entityDescriptor.requireNaturalIdMapping();
+		final SessionImplementor session = loadAccessContext.getSession();
+
+		performAnyNeededCrossReferenceSynchronizations(
+				naturalIdSynchronization != NaturalIdSynchronization.DISABLED,
+				entityDescriptor,
+				session
+		);
+
+		final var normalizedKey = naturalIdMapping.normalizeInput( key );
+
+		final Object cachedResolution = getCachedNaturalIdResolution( normalizedKey, loadAccessContext );
+		if ( cachedResolution == INVALID_NATURAL_ID_REFERENCE ) {
+			return null;
+		}
+
+		if ( cachedResolution != null ) {
+			return findById( cachedResolution, loadAccessContext );
+		}
+
+		return withOptions( loadAccessContext, () -> {
+			@SuppressWarnings("unchecked")
+			final T loaded = (T) entityDescriptor.getNaturalIdLoader()
+							.load( normalizedKey, this, session );
+			if ( loaded != null ) {
+				final var persistenceContext = session.getPersistenceContextInternal();
+				final var lazyInitializer = HibernateProxy.extractLazyInitializer( loaded );
+				final var entity = lazyInitializer != null ? lazyInitializer.getImplementation() : loaded;
+				final var entry = persistenceContext.getEntry( entity );
+				assert entry != null;
+				if ( entry.getStatus() == Status.DELETED ) {
+					return null;
+				}
+			}
+			return loaded;
+		} );
+	}
+
+	private T withOptions(LoadAccessContext loadAccessContext, Supplier<T> action) {
+		final var session = loadAccessContext.getSession();
+		final var influencers = session.getLoadQueryInfluencers();
+		final var fetchProfiles = influencers.adjustFetchProfiles( null, enabledFetchProfiles );
+		final var effectiveEntityGraph = rootGraph == null
+				? null
+				: influencers.applyEntityGraph( rootGraph, graphSemantic );
+
+		final var readOnly = session.isDefaultReadOnly();
+		session.setDefaultReadOnly( readOnlyMode == ReadOnlyMode.READ_ONLY );
+
+		final var cacheMode = session.getCacheMode();
+		session.setCacheMode( CacheMode.fromJpaModes( cacheRetrieveMode, cacheStoreMode ) );
+
+		try {
+			return action.get();
+		}
+		finally {
+			loadAccessContext.delayedAfterCompletion();
+			if ( effectiveEntityGraph != null ) {
+				effectiveEntityGraph.clear();
+			}
+			influencers.setEnabledFetchProfileNames( fetchProfiles );
+			session.setDefaultReadOnly( readOnly );
+			session.setCacheMode( cacheMode );
+		}
+	}
+
+	private Object getCachedNaturalIdResolution(
+			Object normalizedNaturalIdValue,
+			LoadAccessContext loadAccessContext) {
+		loadAccessContext.checkOpenOrWaitingForAutoClose();
+		loadAccessContext.pulseTransactionCoordinator();
+
+		return loadAccessContext
+				.getSession()
+				.getPersistenceContextInternal()
+				.getNaturalIdResolutions()
+				.findCachedIdByNaturalId( normalizedNaturalIdValue, entityDescriptor );
+	}
+
+	private T findById(Object key, LoadAccessContext loadAccessContext) {
+		return withOptions( loadAccessContext, () -> {
+			final var session = loadAccessContext.getSession();
+			Object result;
+			try {
+				result = loadAccessContext.load(
+						LoadEventListener.GET,
+						coerceId( key, session.getFactory() ),
+						entityDescriptor.getEntityName(),
+						makeLockOptions(),
+						readOnlyMode == ReadOnlyMode.READ_ONLY
+				);
+			}
+			catch (ObjectNotFoundException notFoundException) {
+				// if session cache contains proxy for nonexisting object
+				result = null;
+			}
+			initializeIfNecessary( result );
+			//noinspection unchecked
+			return (T) result;
+		} );
+	}
+
+	private LockOptions makeLockOptions() {
+		return Helper.makeLockOptions( lockMode, lockScope, lockTimeout, lockFollowOn );
+	}
+
+	// Used by Hibernate Reactive
+	protected Object coerceId(Object id, SessionFactoryImplementor factory) {
+		if ( factory.getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled() ) {
+			return id;
+		}
+
+		try {
+			return entityDescriptor.getIdentifierMapping().getJavaType().coerce( id );
+		}
+		catch ( Exception e ) {
+			throw new IllegalArgumentException( "Argument '" + id
+												+ "' could not be converted to the identifier type of entity '"
+												+ entityDescriptor.getEntityName() + "'"
+												+ " [" + e.getMessage() + "]", e );
+		}
+	}
+
+	private void initializeIfNecessary(Object result) {
+		if ( result != null ) {
+			final var lazyInitializer = extractLazyInitializer( result );
+			if ( lazyInitializer != null ) {
+				if ( lazyInitializer.isUninitialized() ) {
+					lazyInitializer.initialize();
+				}
+			}
+			else {
+				final var enhancementMetadata = entityDescriptor.getBytecodeEnhancementMetadata();
+				if ( enhancementMetadata.isEnhancedForLazyLoading()
+					&& enhancementMetadata.extractLazyInterceptor( result )
+							instanceof EnhancementAsProxyLazinessInterceptor lazinessInterceptor ) {
+					lazinessInterceptor.forceInitialize( result, null );
+				}
+			}
+		}
+	}
+
+	@Override
+	public LockMode getLockMode() {
+		return lockMode;
+	}
+
+	@Override
+	public Timeout getLockTimeout() {
+		return lockTimeout;
+	}
+
+	@Override
+	public Locking.Scope getLockScope() {
+		return lockScope;
+	}
+
+	@Override
+	public Locking.FollowOn getLockFollowOn() {
+		return lockFollowOn;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/find/FindMultipleByKeyOperation.java b/hibernate-core/src/main/java/org/hibernate/internal/find/FindMultipleByKeyOperation.java
new file mode 100644
index 000000000000..76c073b66d8a
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/internal/find/FindMultipleByKeyOperation.java
@@ -0,0 +1,344 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.internal.find;
+
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
+import jakarta.persistence.FindOption;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.PessimisticLockScope;
+import jakarta.persistence.Timeout;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.BatchSize;
+import org.hibernate.CacheMode;
+import org.hibernate.EnabledFetchProfile;
+import org.hibernate.KeyType;
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.Locking;
+import org.hibernate.NaturalIdSynchronization;
+import org.hibernate.OrderingMode;
+import org.hibernate.ReadOnlyMode;
+import org.hibernate.RemovalsMode;
+import org.hibernate.SessionCheckMode;
+import org.hibernate.Timeouts;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.graph.GraphSemantic;
+import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.jpa.internal.util.LockModeTypeHelper;
+import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
+import org.hibernate.loader.ast.spi.MultiNaturalIdLoadOptions;
+import org.hibernate.loader.internal.LoadAccessContext;
+import org.hibernate.persister.entity.EntityPersister;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Supplier;
+
+import static org.hibernate.Timeouts.WAIT_FOREVER;
+import static org.hibernate.internal.NaturalIdHelper.performAnyNeededCrossReferenceSynchronizations;
+import static org.hibernate.jpa.SpecHints.HINT_SPEC_LOCK_TIMEOUT;
+
+/// Support for loading multiple entities (of a type) by key (either [id][KeyType#IDENTIFIER] or [natural-id][KeyType#NATURAL]).
+///
+/// @see org.hibernate.Session#findMultiple
+/// @see KeyType
+///
+/// @author Steve Ebersole
+public class FindMultipleByKeyOperation<T> implements MultiIdLoadOptions, MultiNaturalIdLoadOptions {
+	private final EntityPersister entityDescriptor;
+
+	private KeyType keyType = KeyType.IDENTIFIER;
+
+	private BatchSize batchSize;
+	private SessionCheckMode sessionCheckMode = SessionCheckMode.DISABLED;
+	private RemovalsMode removalsMode = RemovalsMode.REPLACE;
+	private OrderingMode orderingMode = OrderingMode.ORDERED;
+
+	private CacheStoreMode cacheStoreMode;
+	private CacheRetrieveMode cacheRetrieveMode;
+
+	private LockMode lockMode;
+	private Locking.Scope lockScope;
+	private Locking.FollowOn lockFollowOn;
+	private Timeout lockTimeout = WAIT_FOREVER;
+
+	private ReadOnlyMode readOnlyMode;
+
+	private Set<String> enabledFetchProfiles;
+	private Set<String> disabledFetchProfiles;
+
+	private NaturalIdSynchronization naturalIdSynchronization;
+
+	@SuppressWarnings("PatternVariableHidesField")
+	public FindMultipleByKeyOperation(
+			@NonNull EntityPersister entityDescriptor,
+			@Nullable LockOptions defaultLockOptions,
+			@Nullable CacheMode defaultCacheMode,
+			boolean defaultReadOnly,
+			@NonNull SessionFactoryImplementor sessionFactory,
+			FindOption... findOptions) {
+		this.entityDescriptor = entityDescriptor;
+
+		if ( defaultCacheMode != null ) {
+			cacheStoreMode = defaultCacheMode.getJpaStoreMode();
+			cacheRetrieveMode = defaultCacheMode.getJpaRetrieveMode();
+		}
+
+		if ( defaultLockOptions != null ) {
+			lockMode = defaultLockOptions.getLockMode();
+			lockScope = defaultLockOptions.getScope();
+			lockTimeout = defaultLockOptions.getTimeout();
+			lockFollowOn = defaultLockOptions.getFollowOnStrategy();
+		}
+		if ( lockTimeout == WAIT_FOREVER ) {
+			final Object factoryTimeoutHint = sessionFactory.getProperties().get( HINT_SPEC_LOCK_TIMEOUT );
+			if ( factoryTimeoutHint != null ) {
+				lockTimeout = Timeouts.fromHintTimeout( factoryTimeoutHint );
+			}
+		}
+
+		readOnlyMode = defaultReadOnly ? ReadOnlyMode.READ_ONLY : ReadOnlyMode.READ_WRITE;
+
+		for ( FindOption option : findOptions ) {
+			if ( option instanceof KeyType keyType ) {
+				this.keyType = keyType;
+			}
+			else if (  option instanceof BatchSize batchSize ) {
+				this.batchSize = batchSize;
+			}
+			else if ( option instanceof SessionCheckMode sessionCheckMode ) {
+				this.sessionCheckMode = sessionCheckMode;
+			}
+			else if ( option instanceof RemovalsMode removalsMode ) {
+				this.removalsMode = removalsMode;
+			}
+			else if ( option instanceof OrderingMode orderingMode ) {
+				this.orderingMode = orderingMode;
+			}
+			else if ( option instanceof CacheStoreMode cacheStoreMode ) {
+				this.cacheStoreMode = cacheStoreMode;
+			}
+			else if ( option instanceof CacheRetrieveMode cacheRetrieveMode ) {
+				this.cacheRetrieveMode = cacheRetrieveMode;
+			}
+			else if ( option instanceof CacheMode cacheMode ) {
+				this.cacheStoreMode = cacheMode.getJpaStoreMode();
+				this.cacheRetrieveMode = cacheMode.getJpaRetrieveMode();
+			}
+			else if ( option instanceof LockModeType lockModeType ) {
+				this.lockMode = LockModeTypeHelper.getLockMode( lockModeType );
+			}
+			else if ( option instanceof LockMode lockMode ) {
+				this.lockMode = lockMode;
+			}
+			else if ( option instanceof Locking.Scope lockScope ) {
+				this.lockScope = lockScope;
+			}
+			else if ( option instanceof PessimisticLockScope pessimisticLockScope ) {
+				this.lockScope = Locking.Scope.fromJpaScope( pessimisticLockScope );
+			}
+			else if ( option instanceof Locking.FollowOn followOn ) {
+				this.lockFollowOn = followOn;
+			}
+			else if ( option instanceof Timeout timeout ) {
+				this.lockTimeout = timeout;
+			}
+			else if ( option instanceof ReadOnlyMode readOnlyMode) {
+				this.readOnlyMode = readOnlyMode;
+			}
+			else if ( option instanceof EnabledFetchProfile enabledFetchProfile ) {
+				this.enabledFetchProfile( enabledFetchProfile.profileName() );
+			}
+			else if ( option instanceof NaturalIdSynchronization naturalIdSynchronization ) {
+				this.naturalIdSynchronization = naturalIdSynchronization;
+			}
+		}
+	}
+
+	private void enabledFetchProfile(String profileName) {
+		if ( enabledFetchProfiles == null ) {
+			enabledFetchProfiles = new HashSet<>();
+		}
+		enabledFetchProfiles.add( profileName );
+	}
+
+	public List<T> performFind(
+			List<?> keys,
+			@Nullable GraphSemantic graphSemantic,
+			@Nullable RootGraphImplementor<T> rootGraph,
+			LoadAccessContext loadAccessContext) {
+		// todo (natural-id-class) : these impls are temporary
+		//		longer term, move the logic here as much of it can be shared
+		return keyType == KeyType.NATURAL
+				? findByNaturalIds( keys, graphSemantic, rootGraph, loadAccessContext )
+				: findByIds( keys, graphSemantic, rootGraph, loadAccessContext );
+	}
+
+	private List<T> findByNaturalIds(List<?> keys, GraphSemantic graphSemantic, RootGraphImplementor<T> rootGraph, LoadAccessContext loadAccessContext) {
+		final var naturalIdMapping = entityDescriptor.requireNaturalIdMapping();
+		final var session = loadAccessContext.getSession();
+
+		performAnyNeededCrossReferenceSynchronizations(
+				naturalIdSynchronization != NaturalIdSynchronization.DISABLED,
+				entityDescriptor,
+				session
+		);
+
+		return withOptions( loadAccessContext, graphSemantic, rootGraph, () -> {
+			// normalize the incoming natural-id values and get them in array form as needed
+			// by MultiNaturalIdLoader
+			final int size = keys.size();
+			final var naturalIds = new Object[size];
+			for ( int i = 0; i < size; i++ ) {
+				naturalIds[i] = naturalIdMapping.normalizeInput( keys.get( i ) );
+			}
+			//noinspection unchecked
+			return (List<T>)
+					entityDescriptor.getMultiNaturalIdLoader()
+							.multiLoad( naturalIds, this, session );
+		} );
+	}
+
+	private List<T> withOptions(
+			LoadAccessContext loadAccessContext,
+			GraphSemantic graphSemantic,
+			RootGraphImplementor<T> rootGraph,
+			Supplier<List<T>> action) {
+		final var session = loadAccessContext.getSession();
+		final var influencers = session.getLoadQueryInfluencers();
+		final var fetchProfiles =
+				influencers.adjustFetchProfiles( disabledFetchProfiles, enabledFetchProfiles );
+		final var effectiveEntityGraph =
+				rootGraph == null
+						? null
+						: influencers.applyEntityGraph( rootGraph, graphSemantic );
+
+		final var readOnly = session.isDefaultReadOnly();
+		session.setDefaultReadOnly( readOnlyMode == ReadOnlyMode.READ_ONLY );
+
+		final var cacheMode = session.getCacheMode();
+		session.setCacheMode( CacheMode.fromJpaModes( cacheRetrieveMode, cacheStoreMode ) );
+
+		try {
+			return action.get();
+		}
+		finally {
+			loadAccessContext.delayedAfterCompletion();
+			if ( effectiveEntityGraph != null ) {
+				effectiveEntityGraph.clear();
+			}
+			influencers.setEnabledFetchProfileNames( fetchProfiles );
+			session.setDefaultReadOnly( readOnly );
+			session.setCacheMode( cacheMode );
+		}
+	}
+
+//	private Object getCachedNaturalIdResolution(
+//			Object normalizedNaturalIdValue,
+//			LoadAccessContext loadAccessContext) {
+//		loadAccessContext.checkOpenOrWaitingForAutoClose();
+//		loadAccessContext.pulseTransactionCoordinator();
+//
+//		return loadAccessContext
+//				.getSession()
+//				.getPersistenceContextInternal()
+//				.getNaturalIdResolutions()
+//				.findCachedIdByNaturalId( normalizedNaturalIdValue, entityDescriptor );
+//	}
+
+	private List<T> findByIds(List<?> keys, GraphSemantic graphSemantic, RootGraphImplementor<T> rootGraph, LoadAccessContext loadAccessContext) {
+		final var ids = keys.toArray( new Object[0] );
+		//noinspection unchecked
+		return withOptions( loadAccessContext, graphSemantic, rootGraph,
+				() -> (List<T>) entityDescriptor.multiLoad( ids, loadAccessContext.getSession(), this ) );
+	}
+
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// MultiIdLoadOptions & MultiNaturalIdLoadOptions
+
+	@Override
+	public SessionCheckMode getSessionCheckMode() {
+		return sessionCheckMode;
+	}
+
+	@Override
+	public boolean isSecondLevelCacheCheckingEnabled() {
+		return cacheRetrieveMode == CacheRetrieveMode.USE;
+	}
+
+	@Override
+	public Boolean getReadOnly(SessionImplementor session) {
+		return readOnlyMode == null ? null : readOnlyMode == ReadOnlyMode.READ_ONLY;
+	}
+
+	@Override
+	public RemovalsMode getRemovalsMode() {
+		return removalsMode;
+	}
+
+	@Override
+	public OrderingMode getOrderingMode() {
+		return orderingMode;
+	}
+
+	@Override
+	public LockOptions getLockOptions() {
+		return Helper.makeLockOptions( lockMode, lockScope, lockTimeout, lockFollowOn );
+	}
+
+	@Override
+	public Integer getBatchSize() {
+		return batchSize == null ? null : batchSize.batchSize();
+	}
+
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+	/// Temporarily defined full constructor in support of
+	/// [org.hibernate.MultiIdentifierLoadAccess] and [org.hibernate.MultiIdentifierLoadAccess].
+	///
+	/// @deprecated [org.hibernate.MultiIdentifierLoadAccess] and [org.hibernate.MultiIdentifierLoadAccess]
+	/// are both also deprecated.
+	@Deprecated
+	public FindMultipleByKeyOperation(
+			EntityPersister entityDescriptor,
+			KeyType keyType,
+			BatchSize batchSize,
+			SessionCheckMode sessionCheckMode,
+			RemovalsMode removalsMode,
+			OrderingMode orderingMode,
+			CacheMode cacheMode,
+			LockOptions lockOptions,
+			ReadOnlyMode readOnlyMode,
+			Set<String> enabledFetchProfiles,
+			Set<String> disabledFetchProfiles,
+			NaturalIdSynchronization naturalIdSynchronization) {
+		if ( cacheMode == null ) {
+			cacheMode = CacheMode.NORMAL;
+		}
+		if ( lockOptions == null ) {
+			lockOptions = LockOptions.NONE;
+		}
+		this.entityDescriptor = entityDescriptor;
+		this.keyType = keyType;
+		this.batchSize = batchSize;
+		this.sessionCheckMode = sessionCheckMode;
+		this.removalsMode = removalsMode;
+		this.orderingMode = orderingMode;
+		this.cacheStoreMode = cacheMode.getJpaStoreMode();
+		this.cacheRetrieveMode = cacheMode.getJpaRetrieveMode();
+		this.lockMode = lockOptions.getLockMode();
+		this.lockScope = lockOptions.getScope();
+		this.lockFollowOn = lockOptions.getFollowOnStrategy();
+		this.lockTimeout = lockOptions.getTimeout();
+		this.readOnlyMode = readOnlyMode;
+		this.enabledFetchProfiles = enabledFetchProfiles;
+		this.disabledFetchProfiles = disabledFetchProfiles;
+		this.naturalIdSynchronization = naturalIdSynchronization;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/find/Helper.java b/hibernate-core/src/main/java/org/hibernate/internal/find/Helper.java
new file mode 100644
index 000000000000..7a43743efbf5
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/internal/find/Helper.java
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.internal.find;
+
+import jakarta.persistence.Timeout;
+import org.hibernate.LockMode;
+import org.hibernate.LockOptions;
+import org.hibernate.Locking;
+import org.hibernate.Timeouts;
+
+/**
+ * @author Steve Ebersole
+ */
+public class Helper {
+	public static LockOptions makeLockOptions(LockMode lockMode, Locking.Scope lockScope, Timeout lockTimeout, Locking.FollowOn lockFollowOn) {
+		if ( lockMode == null || lockMode == LockMode.NONE ) {
+			return LockOptions.NONE;
+		}
+		if ( lockMode == LockMode.READ ) {
+			return LockOptions.READ;
+		}
+
+		final var lockOptions = new LockOptions( lockMode );
+		lockOptions.setScope( lockScope != null ? lockScope : Locking.Scope.ROOT_ONLY );
+		lockOptions.setTimeout( lockTimeout != null ? lockTimeout : Timeouts.WAIT_FOREVER );
+		lockOptions.setFollowOnStrategy( lockFollowOn != null ? lockFollowOn : Locking.FollowOn.ALLOW );
+		return lockOptions;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java
index ee17c0cd9c45..e44fac29867a 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionAccessLogger.java
@@ -14,6 +14,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.TRACE;
 
@@ -36,7 +37,8 @@ public interface ConnectionAccessLogger extends BasicLogger {
 	ConnectionAccessLogger INSTANCE = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			ConnectionAccessLogger.class,
-			LOGGER_NAME
+			LOGGER_NAME,
+			Locale.ROOT
 	);
 
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java
index 441dca267c0f..79ed53876bfd 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java
@@ -6,6 +6,7 @@
 
 import java.lang.invoke.MethodHandles;
 import java.sql.SQLException;
+import java.util.Locale;
 
 import org.hibernate.Internal;
 import org.hibernate.cfg.JdbcSettings;
@@ -38,7 +39,7 @@ public interface ConnectionInfoLogger extends BasicLogger {
 	/**
 	 * Static access to the logging instance
 	 */
-	ConnectionInfoLogger CONNECTION_INFO_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ConnectionInfoLogger.class, LOGGER_NAME );
+	ConnectionInfoLogger CONNECTION_INFO_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ConnectionInfoLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage(level = WARN)
 	@Message(value = "Using built-in connection pool (not intended for production use)", id = 10001002)
@@ -123,4 +124,8 @@ public interface ConnectionInfoLogger extends BasicLogger {
 	@LogMessage(level = ERROR)
 	@Message(value = "Connection leak detected: there are %s unclosed connections", id = 10001023)
 	void connectionLeakDetected(int allocationCount);
+
+	@LogMessage(level = WARN)
+	@Message(value = "Could not set login timeout", id = 10001024)
+	void couldNotSetLoginTimeout(@Cause SQLException e);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java
index e097de473ad6..a95f19ad10f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java
@@ -7,6 +7,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodHandles;
 import java.util.List;
+import java.util.Locale;
 
 import org.hibernate.Internal;
 import org.hibernate.boot.jaxb.SourceType;
@@ -19,6 +20,7 @@
 import org.jboss.logging.annotations.MessageLogger;
 import org.jboss.logging.annotations.ValidIdRange;
 
+import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.WARN;
 
 /**
@@ -36,7 +38,7 @@
 public interface DeprecationLogger extends BasicLogger {
 	String CATEGORY = SubSystemLogging.BASE + ".deprecation";
 
-	DeprecationLogger DEPRECATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, CATEGORY );
+	DeprecationLogger DEPRECATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), DeprecationLogger.class, CATEGORY, Locale.ROOT );
 
 	@LogMessage(level = WARN)
 	@Message(
@@ -248,4 +250,33 @@ void recognizedObsoleteHibernateNamespace(
 			value = "DEPRECATED: use [%s] instead with custom [%s] implementation"
 	)
 	void deprecatedUuidGenerator(String name, String name2);
+
+	@LogMessage(level = WARN)
+	@Message(
+			id = 90000041,
+			value = "Marking named native queries as callable is deprecated; use <named-stored-procedure-query/> instead"
+	)
+	void callableNamedNativeQuery();
+
+	@LogMessage(level = WARN)
+	@Message(
+			id = 90000042,
+			value = "Implicit/explicit polymorphism no longer supported"
+	)
+	void explicitPolymorphism();
+
+	@LogMessage(level = DEBUG)
+	@Message(
+			id = 90000043,
+			value = "Custom CollectionPersister implementations are no longer supported - %s (%s)"
+	)
+	void customCollectionPersister(String role, String name);
+
+	@LogMessage(level = WARN)
+	@Message(
+			id = 90000044,
+			value = "Deprecated syntax when using @NamedEntityGraph: 'Type: attr1, attr2' is deprecated. " +
+					"Specify the root entity using the 'root' attribute instead of prefixing the graph with the entity type."
+	)
+	void deprecatedNamedEntityGraphTextThatContainTypeIndicator();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java
index 99e2852fe729..535a47fd1d17 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/IncubationLogger.java
@@ -12,6 +12,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.INFO;
 
@@ -24,7 +25,7 @@
 public interface IncubationLogger {
 	String CATEGORY = SubSystemLogging.BASE + ".incubating";
 
-	IncubationLogger INCUBATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), IncubationLogger.class, CATEGORY );
+	IncubationLogger INCUBATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), IncubationLogger.class, CATEGORY, Locale.ROOT );
 
 	@LogMessage(level = INFO)
 	@Message(
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/StatisticsLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/StatisticsLogger.java
index e7c12ac90ad5..9d15bd818108 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/StatisticsLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/StatisticsLogger.java
@@ -11,6 +11,7 @@
 import org.jboss.logging.annotations.MessageLogger;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -24,7 +25,7 @@
 public interface StatisticsLogger extends BasicLogger {
 	String LOGGER_NAME = "org.hibernate.statistics";
 
-	StatisticsLogger STATISTICS_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), StatisticsLogger.class, LOGGER_NAME );
+	StatisticsLogger STATISTICS_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), StatisticsLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage(level = TRACE)
 	@Message(value = "Statistics initialized", id = 460)
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java
index b1e270f329f2..805fb776ec0a 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java
@@ -7,6 +7,7 @@
 import java.lang.invoke.MethodHandles;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Locale;
 
 import org.hibernate.Internal;
 import org.jboss.logging.Logger;
@@ -36,7 +37,7 @@ public interface UrlMessageBundle {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".url";
 
 	Logger URL_LOGGER = Logger.getLogger( LOGGER_NAME );
-	UrlMessageBundle URL_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), UrlMessageBundle.class, LOGGER_NAME );
+	UrlMessageBundle URL_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), UrlMessageBundle.class, LOGGER_NAME, Locale.ROOT );
 
 	/**
 	 * Logs a warning about a malformed URL, caused by a {@link URISyntaxException}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/GenericAssignability.java b/hibernate-core/src/main/java/org/hibernate/internal/util/GenericAssignability.java
new file mode 100644
index 000000000000..1da0cb05cce2
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/GenericAssignability.java
@@ -0,0 +1,204 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.internal.util;
+
+import java.lang.reflect.*;
+
+/**
+ * @author Gavin King
+ */
+public final class GenericAssignability {
+
+	public static boolean isAssignableFrom(Type to, Type from) {
+		return isAssignable( from, to );
+	}
+
+	public static boolean isAssignable(Type from, Type to) {
+		if ( from.equals( to ) ) {
+			return true;
+		}
+
+		// Wildcards (target side)
+		if ( to instanceof WildcardType wt ) {
+			return isAssignableToWildcard( from, wt );
+		}
+
+		// Type variables (target side)
+		if ( to instanceof TypeVariable<?> tv ) {
+			return isAssignableToTypeVariable( from, tv );
+		}
+
+		// Generic arrays
+		if ( to instanceof GenericArrayType gaTo ) {
+			return isAssignableToGenericArray( from, gaTo );
+		}
+
+		// From-side wildcard
+		if ( from instanceof WildcardType wf ) {
+			return isAssignableFromWildcard( wf, to );
+		}
+
+		// Parameterized types
+		if ( from instanceof ParameterizedType pf &&
+			to instanceof ParameterizedType pt ) {
+			return isAssignableParameterized( pf, pt );
+		}
+
+		// Raw class or array class
+		final var fromRaw = rawClass( from );
+		final var toRaw = rawClass( to );
+
+		if ( fromRaw != null && toRaw != null ) {
+			return toRaw.isAssignableFrom( fromRaw )
+				|| isAssignableViaInheritance( from, toRaw );
+		}
+
+		return false;
+	}
+
+	private static boolean isAssignableToGenericArray(Type from, GenericArrayType to) {
+		final var toComponent = to.getGenericComponentType();
+		if ( from instanceof GenericArrayType gaFrom ) {
+			return isAssignable( gaFrom.getGenericComponentType(), toComponent );
+		}
+		else if ( from instanceof Class<?> c && c.isArray() ) {
+			return isAssignable( c.getComponentType(), toComponent );
+		}
+		else {
+			return false;
+		}
+	}
+
+	private static boolean isAssignableParameterized(ParameterizedType from, ParameterizedType to) {
+
+		final var fromRaw = (Class<?>) from.getRawType();
+		final var toRaw = (Class<?>) to.getRawType();
+
+		if ( toRaw.isAssignableFrom( fromRaw ) ) {
+			final var superType = findGenericSuperType( from, toRaw );
+			if ( !( superType instanceof ParameterizedType ps ) ) {
+				return false;
+			}
+			else {
+				final var fromArgs = ps.getActualTypeArguments();
+				final var toArgs = to.getActualTypeArguments();
+				if ( fromArgs.length != toArgs.length ) {
+					return false;
+				}
+				for ( int i = 0; i < fromArgs.length; i++ ) {
+					if ( !isTypeArgumentAssignable( fromArgs[i], toArgs[i] ) ) {
+						return false;
+					}
+				}
+				return true;
+			}
+		}
+		else {
+			return false;
+		}
+
+	}
+
+	private static boolean isTypeArgumentAssignable(Type from, Type to) {
+		return to instanceof WildcardType wt
+				? isAssignableToWildcard( from, wt )
+				: isAssignable( from, to );
+	}
+
+	private static boolean isAssignableViaInheritance(Type from, Class<?> toRaw) {
+
+		final var raw = rawClass( from );
+		if ( raw == null ) {
+			return false;
+		}
+
+		// Check interfaces
+		for ( var iface : raw.getGenericInterfaces() ) {
+			if ( isAssignable( iface, toRaw ) ) {
+				return true;
+			}
+		}
+
+		// Check superclass
+		final var superclass = raw.getGenericSuperclass();
+		if ( superclass != null ) {
+			return isAssignable( superclass, toRaw );
+		}
+
+		return false;
+	}
+
+	private static Type findGenericSuperType(Type from, Class<?> target) {
+		final var raw = rawClass( from );
+		if ( raw == null ) {
+			return null;
+		}
+
+		if ( raw == target ) {
+			return from;
+		}
+
+		for ( var iface : raw.getGenericInterfaces() ) {
+			final var found = findGenericSuperType( iface, target );
+			if ( found != null ) {
+				return found;
+			}
+		}
+
+		final var superclass = raw.getGenericSuperclass();
+		if ( superclass != null ) {
+			return findGenericSuperType( superclass, target );
+		}
+
+		return null;
+	}
+
+	private static boolean isAssignableToWildcard(Type from, WildcardType to) {
+		for ( var lower : to.getLowerBounds() ) {
+			if ( !isAssignable( lower, from ) ) {
+				return false;
+			}
+		}
+		for ( var upper : to.getUpperBounds() ) {
+			if ( !isAssignable( from, upper ) ) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private static boolean isAssignableFromWildcard(WildcardType from, Type to) {
+		for ( var upper : from.getUpperBounds() ) {
+			if ( isAssignable( upper, to ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private static boolean isAssignableToTypeVariable(Type from, TypeVariable<?> tv) {
+		for ( var bound : tv.getBounds() ) {
+			if ( !isAssignable( from, bound ) ) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private static Class<?> rawClass(Type type) {
+		if ( type instanceof Class<?> c ) {
+			return c;
+		}
+		else if ( type instanceof ParameterizedType pt ) {
+			return (Class<?>) pt.getRawType();
+		}
+		else if ( type instanceof GenericArrayType ga ) {
+			return rawClass( ga.getGenericComponentType() ).arrayType();
+		}
+		else {
+			return null;
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/GenericsHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/GenericsHelper.java
index da448b313a6e..b66b9f6f6731 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/GenericsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/GenericsHelper.java
@@ -4,38 +4,213 @@
  */
 package org.hibernate.internal.util;
 
+import org.hibernate.models.spi.MemberDetails;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * @author Gavin King
+ */
+public final class GenericsHelper {
+
+	/**
+	 * The type of the member inherited by the subclass from the supertype,
+	 * as viewed from within the subclass.
+	 * @param memberDetails The member, represented in the subclass
+	 * @return The type of the member as it would be seen in the subclass
+	 */
+	public static Type actualMemberType(MemberDetails memberDetails) {
+		return actualInheritedMemberType(
+				memberDetails.getDeclaringType().toJavaClass(),
+				memberDetails.toJavaMember()
+		);
+	}
+
+	/**
+	 * The type of the member inherited by the subclass from the supertype,
+	 * as viewed from within the subclass.
+	 * @param subclass The inheriting subclass
+	 * @param superMember The member declared in the supertype
+	 * @return The type of the member as it would be seen in the subclass
+	 */
+	public static Type actualInheritedMemberType(Class<?> subclass, Member superMember) {
+		return substituteTypeVariables( getMemberType( superMember ),
+				collectTypeArguments( subclass, superMember ) );
+	}
+
+	private static Map<TypeVariable<?>, Type> collectTypeArguments(
+			Class<?> subclass, Member superMember) {
+		final var superclass = superMember.getDeclaringClass();
+		final var typeArguments = typeArguments( superclass, subclass );
+		final var typeParameters = superclass.getTypeParameters();
+		final Map<TypeVariable<?>, Type> typeMap =
+				new HashMap<>( typeParameters.length );
+		for ( int i = 0; i < typeParameters.length; i++ ) {
+			typeMap.put( typeParameters[i], typeArguments[i] );
+		}
+		return typeMap;
+	}
+
+	private static Type getMemberType(Member superMember) {
+		if ( superMember instanceof Field field ) {
+			return field.getGenericType();
+		}
+		else if ( superMember instanceof Method method ) {
+			return method.getGenericReturnType();
+		}
+		else {
+			throw new IllegalArgumentException( "Unsupported member: " + superMember );
+		}
+	}
+
+	private static Type substituteTypeVariables(Type type, Map<TypeVariable<?>, Type> typeMap) {
+
+		if ( type instanceof TypeVariable<?> typeVariable ) {
+			final var substituted = typeMap.get( typeVariable );
+			return substituted == null
+					? Object.class
+					: substituteTypeVariables( substituted, typeMap );
+		}
+		else if ( type instanceof ParameterizedType parameterizedType ) {
+			final var args = parameterizedType.getActualTypeArguments();
+			final var resolved = new Type[args.length];
+			for ( int i = 0; i < args.length; i++ ) {
+				resolved[i] = substituteTypeVariables( args[i], typeMap );
+			}
+			return new SimpleParameterizedType(
+					(Class<?>) parameterizedType.getRawType(),
+					resolved,
+					parameterizedType.getOwnerType()
+			);
+		}
+		else if ( type instanceof GenericArrayType genericArrayType ) {
+			final var elementType =
+					substituteTypeVariables( genericArrayType.getGenericComponentType(), typeMap );
+			return new GenericArrayType() {
+				@Override
+				public Type getGenericComponentType() {
+					return elementType;
+				}
+
+				@Override
+				public String toString() {
+					return elementType.getTypeName() + "[]";
+				}
+			};
+		}
+		else {
+			return type;
+		}
+	}
+
+	/**
+	 * The erased type of the given type.
+	 * @param type A type, possibly with type arguments
+	 * @return The erased type
+	 */
+	public static Class<?> erasedType(Type type) {
+		if ( type instanceof Class<?> clazz ) {
+			return clazz;
+		}
+		else if ( type instanceof ParameterizedType parameterizedType ) {
+			return erasedType( parameterizedType.getRawType() );
+		}
+		else if ( type instanceof TypeVariable<?> typeVariable ) {
+			return erasedType( typeVariable.getBounds()[0] );
+		}
+		else if ( type instanceof GenericArrayType genericArrayType ) {
+			return genericArrayType.getGenericComponentType() instanceof Class<?> elementClass
+					? elementClass.arrayType()
+					: Object[].class;
+		}
+		else {
+			throw new IllegalArgumentException( "Cannot erase type: " + type );
+		}
+	}
 
-public class GenericsHelper {
+	/**
+	 * Get the type argument of the instantiation of the given generic
+	 * type constructor which is a supertype of the given type expression.
+	 * @param genericType A generic type constructor
+	 * @param implementingType A type expression
+	 * @return The type arguments assigned to parameters of the generic type constructor
+	 */
+	public static Type[] typeArguments(Class<?> genericType, Type implementingType) {
+		if ( genericType.getTypeParameters().length == 0 ) {
+			return EMPTY_TYPE_ARRAY;
+		}
+		else {
+			final var instantiation =
+					supertypeInstantiation( genericType, implementingType );
+			if ( instantiation == null ) {
+				throw new IllegalArgumentException(
+						implementingType.getTypeName()
+						+ " is is not a subtype of "
+						+ genericType.getName() );
+			}
+			return instantiation.getActualTypeArguments();
+		}
+	}
 
-	public static ParameterizedType extractParameterizedType(Type base, Class<?> genericType) {
+	private static final Type[] EMPTY_TYPE_ARRAY = new Type[0];
+
+	/**
+	 * A supertype of the given type which is an instantiation of the
+	 * given generic type constructor.
+	 * @param genericType A generic type constructor
+	 * @param base A type which is assignable to some instantiation of
+	 *             the given generic type constructor
+	 * @return An instantiation of the generic type constructor which
+	 *         is a supertype of the given type, or null if none exists
+	 */
+	public static ParameterizedType supertypeInstantiation(Class<?> genericType, Type base) {
 		if ( base == null ) {
 			return null;
 		}
 
-		final Class<?> clazz = extractClass( base );
+		final var clazz = erasedType( base );
 		if ( clazz == null ) {
 			return null;
 		}
 
-		final List<Type> types = new ArrayList<>();
-		types.add( clazz.getGenericSuperclass() );
-		types.addAll( Arrays.asList( clazz.getGenericInterfaces() ) );
+		if ( clazz == genericType
+				&& base instanceof ParameterizedType result ) {
+			return result;
+		}
 
-		for ( Type type : types ) {
-			type = resolveType( type, base );
-			if ( type instanceof ParameterizedType parameterizedType ) {
-				if ( genericType.equals( parameterizedType.getRawType() ) ) {
-					return parameterizedType;
-				}
+		final var superclass = clazz.getGenericSuperclass();
+		if ( superclass != null ) {
+			final var type = substituteTypeArguments( superclass, base );
+			if ( type instanceof ParameterizedType parameterizedType
+					&& genericType.equals( parameterizedType.getRawType() ) ) {
+				return parameterizedType;
+			}
+
+			final var parameterizedType =
+					supertypeInstantiation( genericType, type );
+			if ( parameterizedType != null ) {
+				return parameterizedType;
+			}
+		}
+
+		for ( var iface : clazz.getGenericInterfaces() ) {
+			final var type = substituteTypeArguments( iface, base );
+			if ( type instanceof ParameterizedType parameterizedType
+					&& genericType.equals( parameterizedType.getRawType() ) ) {
+				return parameterizedType;
 			}
 
-			final ParameterizedType parameterizedType = extractParameterizedType( type, genericType );
+			final var parameterizedType =
+					supertypeInstantiation( genericType, type );
 			if ( parameterizedType != null ) {
 				return parameterizedType;
 			}
@@ -44,66 +219,75 @@ public static ParameterizedType extractParameterizedType(Type base, Class<?> gen
 		return null;
 	}
 
-	private static Type resolveTypeVariable(TypeVariable<?> typeVariable, ParameterizedType context) {
-		final Class<?> clazz = extractClass( context.getRawType() );
+	private static Type replaceTypeVariableWithArgument(
+			TypeVariable<?> typeVariable, ParameterizedType context) {
+		final var clazz = erasedType( context.getRawType() );
 		if ( clazz == null ) {
 			return null;
 		}
 
-		final TypeVariable<?>[] typeParameters = clazz.getTypeParameters();
+		final var typeArguments = context.getActualTypeArguments();
+		final var typeParameters = clazz.getTypeParameters();
 		for ( int idx = 0; idx < typeParameters.length; idx++ ) {
 			if ( typeVariable.getName().equals( typeParameters[idx].getName() ) ) {
-				return resolveType( context.getActualTypeArguments()[idx], context );
+				return substituteTypeArguments( typeArguments[idx], context );
 			}
 		}
 
 		return typeVariable;
 	}
 
-	public static Class<?> extractClass(Type type) {
-		if ( type instanceof Class<?> clazz ) {
-			return clazz;
+	private static Type substituteTypeArguments(Type target, Type context) {
+		if ( target instanceof ParameterizedType parameterizedType ) {
+			return replaceTypeVariablesWithArguments( parameterizedType, context );
 		}
-		else if ( type instanceof ParameterizedType parameterizedType ) {
-			return extractClass( parameterizedType.getRawType() );
+		else if ( target instanceof TypeVariable<?> typeVariable
+					&& context instanceof ParameterizedType parameterizedContext ) {
+			return replaceTypeVariableWithArgument( typeVariable, parameterizedContext );
+		}
+		else {
+			return target;
 		}
-		return null;
 	}
 
-	private static Type resolveType(Type target, Type context) {
-		if ( target instanceof ParameterizedType parameterizedType ) {
-			return resolveParameterizedType( parameterizedType, context );
+	private static ParameterizedType replaceTypeVariablesWithArguments(
+			ParameterizedType parameterizedType, Type context) {
+		final var typeArguments = parameterizedType.getActualTypeArguments();
+		final var resolvedTypeArguments = new Type[typeArguments.length];
+		for ( int idx = 0; idx < typeArguments.length; idx++ ) {
+			resolvedTypeArguments[idx] = substituteTypeArguments( typeArguments[idx], context );
 		}
-		else if ( target instanceof TypeVariable<?> typeVariable ) {
-			return resolveTypeVariable( typeVariable, (ParameterizedType) context );
-		}
-		return target;
+		return new SimpleParameterizedType(
+				erasedType( parameterizedType ),
+				resolvedTypeArguments,
+				parameterizedType.getOwnerType()
+		);
 	}
 
-	private static ParameterizedType resolveParameterizedType(final ParameterizedType parameterizedType, Type context) {
-		final Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
-
-		final Type[] resolvedTypeArguments = new Type[actualTypeArguments.length];
-		for ( int idx = 0; idx < actualTypeArguments.length; idx++ ) {
-			resolvedTypeArguments[idx] = resolveType( actualTypeArguments[idx], context );
+	private record SimpleParameterizedType(Class<?> raw, Type[] args, Type owner)
+			implements ParameterizedType {
+		@Override
+		public Type[] getActualTypeArguments() {
+			return args;
 		}
-		return new ParameterizedType() {
 
-			@Override
-			public Type[] getActualTypeArguments() {
-				return resolvedTypeArguments;
-			}
+		@Override
+		public Type getRawType() {
+			return raw;
+		}
 
-			@Override
-			public Type getRawType() {
-				return parameterizedType.getRawType();
-			}
+		@Override
+		public Type getOwnerType() {
+			return owner;
+		}
 
-			@Override
-			public Type getOwnerType() {
-				return parameterizedType.getOwnerType();
+		@Override
+		public String toString() {
+			final var joiner = new StringJoiner( ", ", "<", ">" );
+			for ( var type : args ) {
+				joiner.add( type.getTypeName() );
 			}
-
-		};
+			return raw.getName() + joiner;
+		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java
deleted file mode 100644
index 38f605615ce2..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.internal.util;
-
-import java.io.Serializable;
-
-/**
- * @deprecated This is a legacy of very ancient versions of Hibernate.
- *
- * @author Gavin King
- */
-@Deprecated
-public class MarkerObject implements Serializable {
-	private final String name;
-
-	public MarkerObject(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public String toString() {
-		return name;
-	}
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/Optional.java b/hibernate-core/src/main/java/org/hibernate/internal/util/Optional.java
new file mode 100644
index 000000000000..ccc017bf72e6
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/Optional.java
@@ -0,0 +1,79 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.internal.util;
+
+import java.io.Serializable;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * A slightly less-broken version of {@link java.util.Optional}.
+ *
+ * @author Gavin King
+ */
+sealed public interface Optional<T> extends Serializable {
+	record Defined<T>(T result) implements Optional<T> {}
+	record Undefined<T>() implements Optional<T> {}
+
+	static <T> Undefined<T> undefined() {
+		return new Undefined<>();
+	}
+	static <T> Defined<T> of(T t) {
+		return new Defined<>(t);
+	}
+
+	default boolean defined() {
+		return this instanceof Defined;
+	}
+
+	default void consume(Consumer<T> consumer) {
+		if (this instanceof Defined<T> defined) {
+			consumer.accept( defined.result() );
+		}
+	}
+
+	default void consume(Consumer<T> consumer, T value) {
+		if (this instanceof Defined<T> defined) {
+			consumer.accept( defined.result() );
+		}
+		else {
+			consumer.accept( value );
+		}
+	}
+
+	default void consume(Consumer<T> consumer, Supplier<T> supplier) {
+		if (this instanceof Defined<T> defined) {
+			consumer.accept( defined.result() );
+		}
+		else {
+			consumer.accept( supplier.get() );
+		}
+	}
+
+	default T evaluate(T value) {
+		return this instanceof Defined<T> defined
+				? defined.result()
+				: value;
+	}
+
+	default T evaluate(Supplier<T> supplier) {
+		return this instanceof Defined<T> defined
+				? defined.result()
+				: supplier.get();
+	}
+
+	default <X> X evaluate(Function<T,X> function, Supplier<X> supplier) {
+		return this instanceof Defined<T> defined
+				? function.apply( defined.result() )
+				: supplier.get();
+	}
+
+	default <X> X evaluate(Function<T,X> function, X value) {
+		return this instanceof Defined<T> defined
+				? function.apply( defined.result() )
+				: value;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
index 263524d9b6e7..5a6031434883 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
@@ -30,7 +30,7 @@
 
 import jakarta.persistence.Transient;
 
-import static java.beans.Introspector.decapitalize;
+import static org.hibernate.internal.util.StringHelper.decapitalize;
 import static java.lang.Character.isLowerCase;
 import static java.lang.Thread.currentThread;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java
index c0127039985c..a62fedab1f0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java
@@ -922,4 +922,37 @@ public static String safeInterning(final String string) {
 		return string == null ? null : string.intern();
 	}
 
+	/**
+	 * Converts a string to normal Java variable name capitalization following
+	 * the JavaBeans Introspector rules. This normally means converting the first
+	 * character from upper case to lower case, but in the (unusual) special case
+	 * when there is more than one character and both the first and second characters
+	 * are upper case, we leave it alone.
+	 * <p>
+	 * Thus "FooBah" becomes "fooBah" and "X" becomes "x", but "URL" stays as "URL".
+	 * <p>
+	 * This is a reimplementation of {@code java.beans.Introspector.decapitalize()}
+	 * to avoid pulling in the java.desktop module dependency.
+	 *
+	 * @param name The string to be decapitalized.
+	 * @return The decapitalized version of the string.
+	 */
+	public static String decapitalize(final String name) {
+		if ( name == null || name.isEmpty() ) {
+			return name;
+		}
+		final char firstChar = name.charAt( 0 );
+		// Already lowercase - return as-is to avoid allocation
+		if ( Character.isLowerCase( firstChar ) ) {
+			return name;
+		}
+		// Both first and second chars uppercase - return unchanged per JavaBeans spec
+		if ( name.length() > 1 && Character.isUpperCase( name.charAt( 1 ) ) ) {
+			return name;
+		}
+		final char[] chars = name.toCharArray();
+		chars[0] = Character.toLowerCase( firstChar );
+		return new String( chars );
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java b/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java
index f670f73be4ca..eacf855b5b41 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/SubSequence.java
@@ -33,10 +33,10 @@ public char charAt(int index) {
 
 	@Override
 	public CharSequence subSequence(int start, int end) {
-		if ( start < 0 || start >= length ) {
+		if ( start < 0 || start > length ) {
 			throw new StringIndexOutOfBoundsException( start );
 		}
-		if ( end > length ) {
+		if ( end < start || end > length ) {
 			throw new StringIndexOutOfBoundsException( end );
 		}
 		return sequence.subSequence( this.start + start, this.start + end );
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfo.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfo.java
new file mode 100644
index 000000000000..b96e4b82f865
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfo.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.internal.util.beans;
+
+/**
+ * Describes the properties of a JavaBean.
+ * This is a reimplementation to avoid dependency on the {@code java.desktop} module.
+ */
+public interface BeanInfo {
+	/**
+	 * Returns an array of {@link PropertyDescriptor}s describing the
+	 * editable properties of the bean.
+	 *
+	 * @return An array of PropertyDescriptor objects, or null if the
+	 *         information should be obtained by automatic analysis.
+	 */
+	PropertyDescriptor[] getPropertyDescriptors();
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java
index 248b52c18d64..117c6fece88b 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java
@@ -3,17 +3,49 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.internal.util.beans;
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
+
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static org.hibernate.internal.util.StringHelper.decapitalize;
 
 /**
- * Utility for helping deal with {@link BeanInfo}
+ * Utility for helping deal with {@link BeanInfo}.
+ * <p>
+ * This is a simplified reimplementation to avoid dependency on the {@code java.desktop} module.
+ * Unlike the JDK's {@code java.beans.Introspector}, this implementation:
+ * <ul>
+ *   <li>Does not validate type compatibility between getters and setters</li>
+ *   <li>Does not introspect methods from implemented interfaces (only class hierarchy)</li>
+ *   <li>Takes the first matching setter when overloads exist</li>
+ * </ul>
+ * These simplifications are acceptable for Hibernate's use case of property-name-based injection.
+ * <p>
+ * Caching is implemented using {@link ClassValue}, which is the JVM's built-in mechanism for
+ * associating computed values with classes. Unlike the JDK's {@code Introspector} cache, this
+ * approach is inherently GC-friendly: when a class is unloaded, the associated {@link BeanInfo}
+ * is automatically released, preventing classloader leaks without requiring explicit cache flushing.
  *
  * @author Steve Ebersole
  */
 public class BeanInfoHelper {
+
+	/**
+	 * Cache of BeanInfo instances, keyed by class.
+	 * Uses ClassValue which automatically handles class unloading - when a class is GC'd,
+	 * its associated BeanInfo is also released, preventing classloader leaks.
+	 * This cache is for the common case where stopClass is null (introspect up to Object).
+	 */
+	private static final ClassValue<BeanInfo> BEAN_INFO_CACHE = new ClassValue<>() {
+		@Override
+		protected BeanInfo computeValue(final Class<?> type) {
+			return computeBeanInfo( type, null );
+		}
+	};
+
 	public interface BeanInfoDelegate {
 		void processBeanInfo(BeanInfo beanInfo) throws Exception;
 	}
@@ -48,7 +80,7 @@ public static void visitBeanInfo(Class<?> beanClass, BeanInfoDelegate delegate)
 
 	public static void visitBeanInfo(Class<?> beanClass, Class<?> stopClass, BeanInfoDelegate delegate) {
 		try {
-			BeanInfo info = Introspector.getBeanInfo( beanClass, stopClass );
+			final BeanInfo info = getBeanInfo( beanClass, stopClass );
 			try {
 				delegate.processBeanInfo( info );
 			}
@@ -61,11 +93,11 @@ public static void visitBeanInfo(Class<?> beanClass, Class<?> stopClass, BeanInf
 			catch ( Exception e ) {
 				throw new BeanIntrospectionException( "Error delegating bean info use", e );
 			}
-			finally {
-				Introspector.flushFromCaches( beanClass );
-			}
 		}
-		catch ( IntrospectionException e ) {
+		catch ( BeanIntrospectionException e ) {
+			throw e;
+		}
+		catch ( Exception e ) {
 			throw new BeanIntrospectionException( "Unable to determine bean info from class [" + beanClass.getName() + "]", e );
 		}
 	}
@@ -76,7 +108,7 @@ public static <T> T visitBeanInfo(Class<?> beanClass, ReturningBeanInfoDelegate<
 
 	public static <T> T visitBeanInfo(Class<?> beanClass, Class<?> stopClass, ReturningBeanInfoDelegate<T> delegate) {
 		try {
-			BeanInfo info = Introspector.getBeanInfo( beanClass, stopClass );
+			final BeanInfo info = getBeanInfo( beanClass, stopClass );
 			try {
 				return delegate.processBeanInfo( info );
 			}
@@ -89,14 +121,126 @@ public static <T> T visitBeanInfo(Class<?> beanClass, Class<?> stopClass, Return
 			catch ( Exception e ) {
 				throw new BeanIntrospectionException( "Error delegating bean info use", e );
 			}
-			finally {
-				Introspector.flushFromCaches( beanClass );
-			}
 		}
-		catch ( IntrospectionException e ) {
+		catch ( BeanIntrospectionException e ) {
+			throw e;
+		}
+		catch ( Exception e ) {
 			throw new BeanIntrospectionException( "Unable to determine bean info from class [" + beanClass.getName() + "]", e );
 		}
 	}
 
+	/**
+	 * Introspect a JavaBean and return a BeanInfo object describing its properties.
+	 * This method walks up the class hierarchy to collect all properties.
+	 * <p>
+	 * Results are cached using {@link ClassValue} for the common case where stopClass is null.
+	 * The cache is GC-friendly and does not cause classloader leaks.
+	 *
+	 * @param beanClass The class to introspect
+	 * @param stopClass The base class at which to stop the analysis. Any methods
+	 *                  declared in the stopClass or its superclasses will be ignored.
+	 *                  May be null.
+	 * @return A BeanInfo object describing the target bean
+	 */
+	public static BeanInfo getBeanInfo(final Class<?> beanClass, final Class<?> stopClass) {
+		// Use cache for the common case (stopClass == null means introspect up to Object)
+		if ( stopClass == null ) {
+			return BEAN_INFO_CACHE.get( beanClass );
+		}
+		// Non-null stopClass is rare; compute without caching to keep cache simple
+		return computeBeanInfo( beanClass, stopClass );
+	}
+
+	private static BeanInfo computeBeanInfo(final Class<?> beanClass, final Class<?> stopClass) {
+		// LinkedHashMap for reproducible ordering (important for build-time code)
+		final Map<String, PropertyDescriptor> properties = new LinkedHashMap<>();
+
+		// Walk from subclass to superclass; subclass properties take precedence
+		Class<?> currentClass = beanClass;
+		while ( currentClass != null && currentClass != stopClass && currentClass != Object.class ) {
+			introspectClass( currentClass, properties );
+			currentClass = currentClass.getSuperclass();
+		}
+
+		final PropertyDescriptor[] descriptors = properties.values().toArray( new PropertyDescriptor[0] );
+		return new SimpleBeanInfo( descriptors );
+	}
 
+	/**
+	 * Simple implementation of {@link BeanInfo} that holds a fixed array of property descriptors.
+	 */
+	private static class SimpleBeanInfo implements BeanInfo {
+		private final PropertyDescriptor[] propertyDescriptors;
+
+		SimpleBeanInfo(PropertyDescriptor[] propertyDescriptors) {
+			this.propertyDescriptors = propertyDescriptors;
+		}
+
+		@Override
+		public PropertyDescriptor[] getPropertyDescriptors() {
+			return propertyDescriptors;
+		}
+	}
+
+	private static void introspectClass(final Class<?> clazz, final Map<String, PropertyDescriptor> properties) {
+		for ( final Method method : clazz.getDeclaredMethods() ) {
+			final int modifiers = method.getModifiers();
+			// Skip static, non-public, bridge, and synthetic methods
+			if ( Modifier.isStatic( modifiers )
+					|| !Modifier.isPublic( modifiers )
+					|| method.isBridge()
+					|| method.isSynthetic() ) {
+				continue;
+			}
+
+			final String methodName = method.getName();
+			final int paramCount = method.getParameterCount();
+			final Class<?> returnType = method.getReturnType();
+
+			// Check for getter: getXxx() or isXxx()
+			if ( paramCount == 0 && returnType != void.class ) {
+				String propertyName = null;
+				if ( methodName.startsWith( "get" ) && methodName.length() > 3 ) {
+					propertyName = decapitalize( methodName.substring( 3 ) );
+				}
+				else if ( methodName.startsWith( "is" ) && methodName.length() > 2
+						&& ( returnType == boolean.class || returnType == Boolean.class ) ) {
+					propertyName = decapitalize( methodName.substring( 2 ) );
+				}
+
+				if ( propertyName != null && !propertyName.isEmpty() ) {
+					final PropertyDescriptor existing = properties.get( propertyName );
+					if ( existing == null ) {
+						properties.put( propertyName, new PropertyDescriptor( propertyName, method, null ) );
+					}
+					else if ( existing.getReadMethod() == null ) {
+						// Merge: we had a setter, now add the getter
+						properties.put( propertyName,
+								new PropertyDescriptor( propertyName, method, existing.getWriteMethod() ) );
+					}
+					// else: subclass already defined a getter, keep it (subclass precedence)
+				}
+			}
+
+			// Check for setter: setXxx(value)
+			// Note: if overloaded setters exist, we take the first one found.
+			// This is acceptable for name-based property matching.
+			if ( paramCount == 1 && methodName.startsWith( "set" ) && methodName.length() > 3 ) {
+				final String propertyName = decapitalize( methodName.substring( 3 ) );
+				if ( !propertyName.isEmpty() ) {
+					final PropertyDescriptor existing = properties.get( propertyName );
+					if ( existing == null ) {
+						properties.put( propertyName, new PropertyDescriptor( propertyName, null, method ) );
+					}
+					else if ( existing.getWriteMethod() == null ) {
+						// Merge: we had a getter, now add the setter
+						properties.put( propertyName,
+								new PropertyDescriptor( propertyName, existing.getReadMethod(), method ) );
+					}
+					// else: subclass already defined a setter, keep it (subclass precedence)
+				}
+			}
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java
index f206f80b3b09..346994ee756e 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java
@@ -7,7 +7,7 @@
 import org.hibernate.HibernateException;
 
 /**
- * Indicates a problem dealing with {@link java.beans.BeanInfo} via the {@link BeanInfoHelper} delegate.
+ * Indicates a problem dealing with {@link BeanInfo} via the {@link BeanInfoHelper} delegate.
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/PropertyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/PropertyDescriptor.java
new file mode 100644
index 000000000000..8c21d62ef9c1
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/PropertyDescriptor.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.internal.util.beans;
+
+import java.lang.reflect.Method;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * Describes a single property of a JavaBean.
+ * This is a reimplementation to avoid dependency on the {@code java.desktop} module.
+ */
+public final class PropertyDescriptor {
+	private final String name;
+	private final @Nullable Method readMethod;
+	private final @Nullable Method writeMethod;
+
+	public PropertyDescriptor(final String name, final @Nullable Method readMethod, final @Nullable Method writeMethod) {
+		this.name = name;
+		this.readMethod = readMethod;
+		this.writeMethod = writeMethod;
+	}
+
+	/**
+	 * Gets the programmatic name of this property.
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Gets the method used to read the property value.
+	 *
+	 * @return The getter method, or null if the property is write-only.
+	 */
+	public @Nullable Method getReadMethod() {
+		return readMethod;
+	}
+
+	/**
+	 * Gets the method used to write the property value.
+	 *
+	 * @return The setter method, or null if the property is read-only.
+	 */
+	public @Nullable Method getWriteMethod() {
+		return writeMethod;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/InstanceIdentityMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/InstanceIdentityMap.java
index 23c35c747b18..d6e303816b6c 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/InstanceIdentityMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/InstanceIdentityMap.java
@@ -62,7 +62,7 @@ public boolean containsKey(int instanceId, Object key) {
 	}
 
 	/**
-	 * @inheritDoc
+	 * {@inheritDoc}
 	 * @implNote This only works for {@link InstanceIdentity} keys, and it's inefficient
 	 * since we need to do a type check. Prefer using {@link #containsKey(int, Object)}.
 	 */
@@ -130,7 +130,7 @@ private boolean containsMapping(Object key, Object value) {
 	}
 
 	/**
-	 * @inheritDoc
+	 * {@inheritDoc}
 	 * @implNote This only works for {@link InstanceIdentity} keys, and it's inefficient
 	 * since we need to do a type check. Prefer using {@link #get(int, Object)}.
 	 */
@@ -200,7 +200,7 @@ private boolean containsMapping(Object key, Object value) {
 	}
 
 	/**
-	 * @inheritDoc
+	 * {@inheritDoc}
 	 * @implNote This only works for {@link InstanceIdentity} keys, and it's inefficient
 	 * since we need to do a type check. Prefer using {@link #remove(int, Object)}.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/type/PrimitiveWrapperHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/type/PrimitiveWrapperHelper.java
deleted file mode 100644
index e9c2de5052d0..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/type/PrimitiveWrapperHelper.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.internal.util.type;
-
-/**
- * Helper for primitive/wrapper utilities.
- *
- * @author Steve Ebersole
- */
-public final class PrimitiveWrapperHelper {
-	private PrimitiveWrapperHelper() {
-	}
-
-	/**
-	 * Describes a particular primitive/wrapper combo
-	 */
-	public interface PrimitiveWrapperDescriptor<T> {
-		Class<T> getPrimitiveClass();
-		Class<T> getWrapperClass();
-	}
-
-	public static class BooleanDescriptor implements PrimitiveWrapperDescriptor<Boolean> {
-		public static final BooleanDescriptor INSTANCE = new BooleanDescriptor();
-
-		private BooleanDescriptor() {
-		}
-
-		@Override
-		public Class<Boolean> getPrimitiveClass() {
-			return boolean.class;
-		}
-
-		@Override
-		public Class<Boolean> getWrapperClass() {
-			return Boolean.class;
-		}
-	}
-
-	public static class CharacterDescriptor implements PrimitiveWrapperDescriptor<Character> {
-		public static final CharacterDescriptor INSTANCE = new CharacterDescriptor();
-
-		private CharacterDescriptor() {
-		}
-
-		@Override
-		public Class<Character> getPrimitiveClass() {
-			return char.class;
-		}
-
-		@Override
-		public Class<Character> getWrapperClass() {
-			return Character.class;
-		}
-	}
-
-	public static class ByteDescriptor implements PrimitiveWrapperDescriptor<Byte> {
-		public static final ByteDescriptor INSTANCE = new ByteDescriptor();
-
-		private ByteDescriptor() {
-		}
-
-		@Override
-		public Class<Byte> getPrimitiveClass() {
-			return byte.class;
-		}
-
-		@Override
-		public Class<Byte> getWrapperClass() {
-			return Byte.class;
-		}
-	}
-
-	public static class ShortDescriptor implements PrimitiveWrapperDescriptor<Short> {
-		public static final ShortDescriptor INSTANCE = new ShortDescriptor();
-
-		private ShortDescriptor() {
-		}
-
-		@Override
-		public Class<Short> getPrimitiveClass() {
-			return short.class;
-		}
-
-		@Override
-		public Class<Short> getWrapperClass() {
-			return Short.class;
-		}
-	}
-
-	public static class IntegerDescriptor implements PrimitiveWrapperDescriptor<Integer> {
-		public static final IntegerDescriptor INSTANCE = new IntegerDescriptor();
-
-		private IntegerDescriptor() {
-		}
-
-		@Override
-		public Class<Integer> getPrimitiveClass() {
-			return int.class;
-		}
-
-		@Override
-		public Class<Integer> getWrapperClass() {
-			return Integer.class;
-		}
-	}
-
-	public static class LongDescriptor implements PrimitiveWrapperDescriptor<Long> {
-		public static final LongDescriptor INSTANCE = new LongDescriptor();
-
-		private LongDescriptor() {
-		}
-
-		@Override
-		public Class<Long> getPrimitiveClass() {
-			return long.class;
-		}
-
-		@Override
-		public Class<Long> getWrapperClass() {
-			return Long.class;
-		}
-	}
-
-	public static class FloatDescriptor implements PrimitiveWrapperDescriptor<Float> {
-		public static final FloatDescriptor INSTANCE = new FloatDescriptor();
-
-		private FloatDescriptor() {
-		}
-
-		@Override
-		public Class<Float> getPrimitiveClass() {
-			return float.class;
-		}
-
-		@Override
-		public Class<Float> getWrapperClass() {
-			return Float.class;
-		}
-	}
-
-	public static class DoubleDescriptor implements PrimitiveWrapperDescriptor<Double> {
-		public static final DoubleDescriptor INSTANCE = new DoubleDescriptor();
-
-		private DoubleDescriptor() {
-		}
-
-		@Override
-		public Class<Double> getPrimitiveClass() {
-			return double.class;
-		}
-
-		@Override
-		public Class<Double> getWrapperClass() {
-			return Double.class;
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <X> PrimitiveWrapperDescriptor<X> getDescriptorByPrimitiveType(Class<X> primitiveClazz) {
-		if ( ! primitiveClazz.isPrimitive() ) {
-			throw new IllegalArgumentException( "Given class is not a primitive type : " + primitiveClazz.getName() );
-		}
-
-		if ( boolean.class == primitiveClazz ) {
-			return (PrimitiveWrapperDescriptor<X>) BooleanDescriptor.INSTANCE;
-		}
-
-		if ( char.class == primitiveClazz ) {
-			return (PrimitiveWrapperDescriptor<X>) CharacterDescriptor.INSTANCE;
-		}
-
-		if ( byte.class == primitiveClazz ) {
-			return (PrimitiveWrapperDescriptor<X>) ByteDescriptor.INSTANCE;
-		}
-
-		if ( short.class == primitiveClazz ) {
-			return (PrimitiveWrapperDescriptor<X>) ShortDescriptor.INSTANCE;
-		}
-
-		if ( int.class == primitiveClazz ) {
-			return (PrimitiveWrapperDescriptor<X>) IntegerDescriptor.INSTANCE;
-		}
-
-		if ( long.class == primitiveClazz ) {
-			return (PrimitiveWrapperDescriptor<X>) LongDescriptor.INSTANCE;
-		}
-
-		if ( float.class == primitiveClazz ) {
-			return (PrimitiveWrapperDescriptor<X>) FloatDescriptor.INSTANCE;
-		}
-
-		if ( double.class == primitiveClazz ) {
-			return (PrimitiveWrapperDescriptor<X>) DoubleDescriptor.INSTANCE;
-		}
-
-		if ( void.class == primitiveClazz ) {
-			throw new IllegalArgumentException( "void, as primitive type, has no wrapper equivalent" );
-		}
-
-		throw new IllegalArgumentException( "Unrecognized primitive type class : " + primitiveClazz.getName() );
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <X> PrimitiveWrapperDescriptor<X> getDescriptorByWrapperType(Class<X> wrapperClass) {
-		if ( wrapperClass.isPrimitive() ) {
-			throw new IllegalArgumentException( "Given class is a primitive type : " + wrapperClass.getName() );
-		}
-
-		if ( Boolean.class.equals( wrapperClass ) ) {
-			return (PrimitiveWrapperDescriptor<X>) BooleanDescriptor.INSTANCE;
-		}
-
-		if ( Character.class == wrapperClass ) {
-			return (PrimitiveWrapperDescriptor<X>) CharacterDescriptor.INSTANCE;
-		}
-
-		if ( Byte.class == wrapperClass ) {
-			return (PrimitiveWrapperDescriptor<X>) ByteDescriptor.INSTANCE;
-		}
-
-		if ( Short.class == wrapperClass ) {
-			return (PrimitiveWrapperDescriptor<X>) ShortDescriptor.INSTANCE;
-		}
-
-		if ( Integer.class == wrapperClass ) {
-			return (PrimitiveWrapperDescriptor<X>) IntegerDescriptor.INSTANCE;
-		}
-
-		if ( Long.class == wrapperClass ) {
-			return (PrimitiveWrapperDescriptor<X>) LongDescriptor.INSTANCE;
-		}
-
-		if ( Float.class == wrapperClass ) {
-			return (PrimitiveWrapperDescriptor<X>) FloatDescriptor.INSTANCE;
-		}
-
-		if ( Double.class == wrapperClass ) {
-			return (PrimitiveWrapperDescriptor<X>) DoubleDescriptor.INSTANCE;
-		}
-
-		// most likely Void.class, which we can't really handle here
-		throw new IllegalArgumentException( "Unrecognized wrapper type class : " + wrapperClass.getName() );
-	}
-
-	public static boolean isWrapper(Class<?> clazz) {
-		try {
-			getDescriptorByWrapperType( clazz );
-			return true;
-		}
-		catch (Exception e) {
-			return false;
-		}
-	}
-
-	public static boolean arePrimitiveWrapperEquivalents(Class converterDefinedType, Class propertyType) {
-		if ( converterDefinedType.isPrimitive() ) {
-			return getDescriptorByPrimitiveType( converterDefinedType ).getWrapperClass().equals( propertyType );
-		}
-		else if ( propertyType.isPrimitive() ) {
-			return getDescriptorByPrimitiveType( propertyType ).getWrapperClass().equals( converterDefinedType );
-		}
-		return false;
-	}
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/type/PrimitiveWrappers.java b/hibernate-core/src/main/java/org/hibernate/internal/util/type/PrimitiveWrappers.java
new file mode 100644
index 000000000000..163f1c35caeb
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/type/PrimitiveWrappers.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.internal.util.type;
+
+/**
+ * Maps primitive types to their wrapper counterparts.
+ *
+ * @author Gavin King
+ */
+public final class PrimitiveWrappers {
+
+	public static <T> Class<T> canonicalize(Class<T> type) {
+		if ( type.isPrimitive() ) {
+			@SuppressWarnings("unchecked")
+			// completely safe, boolean.class is a Class<Boolean>
+			final var wrapperClass = (Class<T>) wrapperClass( type );
+			return wrapperClass;
+		}
+		else {
+			return type;
+		}
+	}
+
+	private static Class<?> wrapperClass(Class<?> primitiveClass) {
+		return switch ( primitiveClass.getName() ) {
+			case "boolean" -> Boolean.class;
+			case "char" -> Character.class;
+			case "byte" -> Byte.class;
+			case "short" -> Short.class;
+			case "int" -> Integer.class;
+			case "long" -> Long.class;
+			case "float" -> Float.class;
+			case "double" -> Double.class;
+			default -> throw new AssertionError( "Unknown primitive type: " + primitiveClass );
+		};
+	}
+
+	public static <X> X cast(Class<X> type, Object value) {
+		return canonicalize( type ).cast( value );
+	}
+
+	public static boolean isInstance(Class<?> type, Object value) {
+		return canonicalize( type ).isInstance( value );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java
index 941eb5e65d97..3e29db80f41e 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java
@@ -179,6 +179,31 @@ protected int expectedRowCount() {
 		}
 	}
 
+	/**
+	 * Row count checking. A row count is an integer value returned by
+	 * {@link java.sql.PreparedStatement#executeUpdate()} or
+	 * {@link java.sql.Statement#executeBatch()}. The row count is checked
+	 * against an expected value, but is also allowed to be 0.
+	 * For example, the expected row count for an {@code UPSERT} statement is 0 or 1.
+	 */
+	class OptionalRowCount implements Expectation {
+		@Override
+		public final void verifyOutcome(int rowCount, PreparedStatement statement, int batchPosition, String sql) {
+			if ( rowCount != 0 ) {
+				if ( batchPosition < 0 ) {
+					checkNonBatched( expectedRowCount(), rowCount, sql );
+				}
+				else {
+					checkBatched( expectedRowCount(), rowCount, batchPosition, sql );
+				}
+			}
+		}
+
+		protected int expectedRowCount() {
+			return 1;
+		}
+	}
+
 	/**
 	 * Essentially identical to {@link RowCount} except that the row count
 	 * is obtained via an output parameter of a {@linkplain CallableStatement
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceConfiguration.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceConfiguration.java
index 67e823efaab9..5ae350c28054 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceConfiguration.java
@@ -51,8 +51,7 @@
  * Standard JPA configuration properties are enumerated by the supertype
  * {@link PersistenceConfiguration}. All configuration properties understood
  * by Hibernate are enumerated by {@link AvailableSettings}.
- * <p>
- * <pre>
+ * <pre>{@code
  * SessionFactory factory = new HibernatePersistenceConfiguration()
  *     // scan classes for mapping annotations
  *     .managedClasses(Item.class, Bid.class, User.class)
@@ -60,7 +59,7 @@
  *     .setProperty(PersistenceConfiguration.JDBC_DATASOURCE,
  *                  "java:comp/env/jdbc/test")
  *     .buildSessionFactory();
- * </pre>
+ * }</pre>
  * <p>
  * When instantiated, an instance of
  * {@code HibernatePersistenceConfiguration} has its properties initially
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java
index 51f3b5b9fb3c..97f76df178c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java
@@ -5,6 +5,7 @@
 package org.hibernate.jpa;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import jakarta.persistence.EntityManagerFactory;
@@ -43,12 +44,13 @@ public class HibernatePersistenceProvider implements PersistenceProvider {
 	/**
 	 * {@inheritDoc}
 	 *
-	 * @implSpec Per the specification, the values passed as {@code properties} override values found in {@code persistence.xml}
+	 * @implSpec The values passed in the {@code map} override values found
+	 *           in {@code persistence.xml} according to the JPA specification.
 	 */
 	@Override
-	public EntityManagerFactory createEntityManagerFactory(String persistenceUnitName, Map properties) {
+	public EntityManagerFactory createEntityManagerFactory(String persistenceUnitName, Map<?,?> map) {
 		JPA_LOGGER.startingCreateEntityManagerFactory( persistenceUnitName );
-		final var builder = getEntityManagerFactoryBuilderOrNull( persistenceUnitName, properties );
+		final var builder = getEntityManagerFactoryBuilderOrNull( persistenceUnitName, map );
 		if ( builder == null ) {
 			JPA_LOGGER.couldNotObtainEmfBuilder("null");
 			return null;
@@ -58,21 +60,40 @@ public EntityManagerFactory createEntityManagerFactory(String persistenceUnitNam
 		}
 	}
 
-	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String persistenceUnitName, Map<?,?> properties) {
-		return getEntityManagerFactoryBuilderOrNull( persistenceUnitName, properties, null, null );
+	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(
+			String persistenceUnitName, Map<?,?> properties) {
+		return getEntityManagerFactoryBuilderOrNull(
+				persistenceUnitName,
+				properties,
+				null,
+				null
+		);
 	}
 
-	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String persistenceUnitName, Map<?,?> properties,
+	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(
+			String persistenceUnitName, Map<?,?> properties,
 			ClassLoader providedClassLoader) {
-		return getEntityManagerFactoryBuilderOrNull( persistenceUnitName, properties, providedClassLoader, null );
+		return getEntityManagerFactoryBuilderOrNull(
+				persistenceUnitName,
+				properties,
+				providedClassLoader,
+				null
+		);
 	}
 
-	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String persistenceUnitName, Map<?,?> properties,
+	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(
+			String persistenceUnitName, Map<?,?> properties,
 			ClassLoaderService providedClassLoaderService) {
-		return getEntityManagerFactoryBuilderOrNull( persistenceUnitName, properties, null, providedClassLoaderService );
+		return getEntityManagerFactoryBuilderOrNull(
+				persistenceUnitName,
+				properties,
+				null,
+				providedClassLoaderService
+		);
 	}
 
-	private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String persistenceUnitName, Map<?,?> properties,
+	private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(
+			String persistenceUnitName, Map<?,?> properties,
 			ClassLoader providedClassLoader, ClassLoaderService providedClassLoaderService) {
 		JPA_LOGGER.attemptingToObtainEmfBuilder( persistenceUnitName );
 		final var integration = wrap( properties );
@@ -92,21 +113,24 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
 				);
 			}
 
-			final boolean matches = persistenceUnitName == null || persistenceUnit.getName().equals( persistenceUnitName );
-			if ( !matches ) {
-				JPA_LOGGER.excludingDueToNameMismatch();
-				continue;
-			}
+			final boolean matches =
+					persistenceUnitName == null
+					|| persistenceUnit.getName().equals( persistenceUnitName );
+			if ( matches ) {
+				// See if we (Hibernate) are the persistence provider
+				if ( isProvider( persistenceUnit, properties ) ) {
+					return providedClassLoaderService == null
+							? getEntityManagerFactoryBuilder( persistenceUnit, integration, providedClassLoader )
+							: getEntityManagerFactoryBuilder( persistenceUnit, integration, providedClassLoaderService );
+				}
+				else {
+					JPA_LOGGER.excludingDueToProviderMismatch();
+				}
 
-			// See if we (Hibernate) are the persistence provider
-			if ( !isProvider( persistenceUnit, properties ) ) {
-				JPA_LOGGER.excludingDueToProviderMismatch();
-				continue;
 			}
-
-			return providedClassLoaderService == null
-					? getEntityManagerFactoryBuilder( persistenceUnit, integration, providedClassLoader )
-					: getEntityManagerFactoryBuilder( persistenceUnit, integration, providedClassLoaderService );
+			else {
+				JPA_LOGGER.excludingDueToNameMismatch();
+			}
 		}
 
 		JPA_LOGGER.foundNoMatchingPersistenceUnits();
@@ -118,11 +142,16 @@ protected static Map<?,?> wrap(Map<?,?> properties) {
 	}
 
 	// Check before changing: may be overridden in Quarkus
-	protected Collection<PersistenceUnitDescriptor> locatePersistenceUnits(Map<?, ?> integration, ClassLoader providedClassLoader,
+	protected Collection<PersistenceUnitDescriptor> locatePersistenceUnits(
+			Map<?, ?> integration,
+			ClassLoader providedClassLoader,
 			ClassLoaderService providedClassLoaderService) {
 		try {
-			var parser = PersistenceXmlParser.create( integration, providedClassLoader, providedClassLoaderService );
-			final var xmlUrls = parser.getClassLoaderService().locateResources( "META-INF/persistence.xml" );
+			final var parser =
+					PersistenceXmlParser.create( integration, providedClassLoader, providedClassLoaderService );
+			final var xmlUrls =
+					parser.getClassLoaderService()
+							.locateResources( "META-INF/persistence.xml" );
 			if ( xmlUrls.isEmpty() ) {
 				JPA_LOGGER.unableToFindPersistenceXmlInClasspath();
 				return List.of();
@@ -139,23 +168,38 @@ protected Collection<PersistenceUnitDescriptor> locatePersistenceUnits(Map<?, ?>
 
 	/**
 	 * {@inheritDoc}
-	 * <p>
-	 * Note: per-spec, the values passed as {@code properties} override values found in {@link PersistenceUnitInfo}
+	 *
+	 * @implSpec The values passed in the {@code map} override values found
+	 *           in {@link PersistenceUnitInfo#getProperties()} according to
+	 *           the JPA specification.
 	 */
 	@Override
-	public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map properties) {
+	public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map<?,?> map) {
 		JPA_LOGGER.startingCreateContainerEntityManagerFactory( info.getPersistenceUnitName() );
-		return getEntityManagerFactoryBuilder( info, properties ).build();
+		return getEntityManagerFactoryBuilder( info, map ).build();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @implSpec The values passed in the {@code map} override values found
+	 *           in {@link PersistenceUnitInfo#getProperties()} according to
+	 *           the JPA specification.
+	 */
 	@Override
-	public void generateSchema(PersistenceUnitInfo info, Map map) {
+	public void generateSchema(PersistenceUnitInfo info, Map<?,?> map) {
 		JPA_LOGGER.startingGenerateSchemaForPuiName( info.getPersistenceUnitName() );
 		getEntityManagerFactoryBuilder( info, map ).generateSchema();
 	}
 
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @implSpec The values passed in the {@code map} override values found
+	 *           in {@code persistence.xml} according to the JPA specification.
+	 */
 	@Override
-	public boolean generateSchema(String persistenceUnitName, Map map) {
+	public boolean generateSchema(String persistenceUnitName, Map<?,?> map) {
 		JPA_LOGGER.startingGenerateSchema( persistenceUnitName );
 		final var builder = getEntityManagerFactoryBuilderOrNull( persistenceUnitName, map );
 		if ( builder == null ) {
@@ -168,18 +212,36 @@ public boolean generateSchema(String persistenceUnitName, Map map) {
 		}
 	}
 
-	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(PersistenceUnitInfo info, Map<?,?> integration) {
-		return Bootstrap.getEntityManagerFactoryBuilder( info, integration );
+	private static Map<String, Object> settingsMap(Map<?, ?> integration) {
+		final Map<String, Object> result = new HashMap<>();
+		integration.forEach( (key, value) -> {
+			// ignore non-string keys
+			if (key instanceof String string) {
+				result.put( string, value );
+			}
+		} );
+		return result;
+	}
+
+	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
+			PersistenceUnitInfo info, Map<?,?> integration) {
+		return Bootstrap.getEntityManagerFactoryBuilder( info, settingsMap( integration ) );
 	}
 
-	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(PersistenceUnitDescriptor persistenceUnitDescriptor,
-			Map<?,?> integration, ClassLoader providedClassLoader) {
-		return Bootstrap.getEntityManagerFactoryBuilder( persistenceUnitDescriptor, integration, providedClassLoader );
+	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
+			PersistenceUnitDescriptor persistenceUnitDescriptor,
+			Map<?,?> integration,
+			ClassLoader providedClassLoader) {
+		return Bootstrap.getEntityManagerFactoryBuilder( persistenceUnitDescriptor,
+				settingsMap( integration ), providedClassLoader );
 	}
 
-	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(PersistenceUnitDescriptor persistenceUnitDescriptor,
-			Map<?,?> integration, ClassLoaderService providedClassLoaderService) {
-		return Bootstrap.getEntityManagerFactoryBuilder( persistenceUnitDescriptor, integration, providedClassLoaderService );
+	protected EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
+			PersistenceUnitDescriptor persistenceUnitDescriptor,
+			Map<?,?> integration,
+			ClassLoaderService providedClassLoaderService) {
+		return Bootstrap.getEntityManagerFactoryBuilder( persistenceUnitDescriptor,
+				settingsMap( integration ), providedClassLoaderService );
 	}
 
 	private final ProviderUtil providerUtil = new ProviderUtil() {
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
index 8d82e0320a57..b768e2bed31b 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
@@ -210,7 +210,7 @@ private EntityManagerFactoryBuilderImpl(
 		try {
 			// merge configuration sources and build the "standard" service registry
 			final var registryBuilder = getStandardServiceRegistryBuilder( bootstrapServiceRegistry );
-			final MergedSettings mergedSettings =
+			final var mergedSettings =
 					mergeSettings( persistenceUnit, integrationSettings, registryBuilder, mergedSettingsBaseline );
 			ignoreFlushBeforeCompletion( mergedSettings );
 			// keep the merged config values for phase-2
@@ -627,13 +627,10 @@ else if ( keyString.startsWith( COLLECTION_CACHE_PREFIX ) ) {
 
 	private static String getCfgXmlResourceName(Map<String, Object> integrationSettings, MergedSettings mergedSettings) {
 		final String cfgXmlResourceName = (String) mergedSettings.getConfigurationValues().remove( CFG_XML_FILE );
-		if ( isEmpty( cfgXmlResourceName ) ) {
-			// see if integration settings named a Hibernate config file....
-			return (String) integrationSettings.get( CFG_XML_FILE );
-		}
-		else {
-			return cfgXmlResourceName;
-		}
+		return isEmpty( cfgXmlResourceName )
+				// see if integration settings named a Hibernate config file
+				? (String) integrationSettings.get( CFG_XML_FILE )
+				: cfgXmlResourceName;
 	}
 
 	/**
@@ -1304,8 +1301,7 @@ private void addMappingFiles(MetadataSources metadataSources) {
 						}
 						@SuppressWarnings("unchecked") // Safe, because we just checked!
 						final var attributeConverterType = (Class<? extends AttributeConverter<?, ?>>) converterClass;
-						converterDescriptors.add( ConverterDescriptors.of( attributeConverterType,
-								metamodelBuilder.getBootstrapContext().getClassmateContext() ) );
+						converterDescriptors.add( ConverterDescriptors.of( attributeConverterType ) );
 					}
 					else {
 						metadataSources.addAnnotatedClass( converterClass );
@@ -1515,8 +1511,8 @@ private String exceptionHeader() {
 	@SuppressWarnings("unchecked")
 	private <T> T loadSettingInstance(String settingName, Object settingValue, Class<T> clazz) {
 		final Class<? extends T> instanceClass;
-		if ( clazz.isAssignableFrom( settingValue.getClass() ) ) {
-			return (T) settingValue;
+		if ( clazz.isInstance( settingValue ) ) {
+			return clazz.cast( settingValue );
 		}
 		else if ( settingValue instanceof Class ) {
 			instanceClass = (Class<? extends T>) settingValue;
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/MergedSettings.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/MergedSettings.java
index 7599e09a6bd6..22804e84d470 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/MergedSettings.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/MergedSettings.java
@@ -13,7 +13,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 
 import static org.hibernate.cfg.PersistenceSettings.PERSISTENCE_UNIT_NAME;
@@ -37,7 +36,7 @@ List<CacheRegionDefinition> getCacheRegionDefinitions() {
 	}
 
 	void processPersistenceUnitDescriptorProperties(PersistenceUnitDescriptor persistenceUnit) {
-		final Properties properties = persistenceUnit.getProperties();
+		final var properties = persistenceUnit.getProperties();
 		if ( properties != null ) {
 			getConfigurationValues().putAll( PropertiesHelper.map( properties ) );
 		}
@@ -45,7 +44,7 @@ void processPersistenceUnitDescriptorProperties(PersistenceUnitDescriptor persis
 	}
 
 	void processHibernateConfigXmlResources(LoadedConfig loadedConfig) {
-		if ( !getConfigurationValues().containsKey(  SESSION_FACTORY_NAME) ) {
+		if ( !getConfigurationValues().containsKey( SESSION_FACTORY_NAME) ) {
 			// there is not already a SF-name in the merged settings
 			final String sessionFactoryName = loadedConfig.getSessionFactoryName();
 			if ( sessionFactoryName != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java
index 759aa78d24f3..7d0f7f3cfb82 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java
@@ -30,7 +30,7 @@ private Bootstrap() {
 
 	public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 			PersistenceUnitDescriptor persistenceUnitDescriptor,
-			Map integration) {
+			Map<String,Object> integration) {
 		return new EntityManagerFactoryBuilderImpl( persistenceUnitDescriptor, integration );
 	}
 
@@ -46,7 +46,7 @@ public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 	public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 			URL persistenceXmlUrl,
 			String persistenceUnitName,
-			Map integration) {
+			Map<String,Object> integration) {
 		return getEntityManagerFactoryBuilder( persistenceXmlUrl, persistenceUnitName, PersistenceUnitTransactionType.RESOURCE_LOCAL, integration );
 	}
 
@@ -63,7 +63,7 @@ public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 			URL persistenceXmlUrl,
 			String persistenceUnitName,
 			PersistenceUnitTransactionType transactionType,
-			Map integration) {
+			Map<String,Object> integration) {
 		return new EntityManagerFactoryBuilderImpl(
 				PersistenceXmlParser.create( integration ).parse( List.of( persistenceXmlUrl ), transactionType ).get( persistenceUnitName ),
 				integration
@@ -72,14 +72,14 @@ public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 
 	public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 			PersistenceUnitDescriptor persistenceUnitDescriptor,
-			Map integration,
+			Map<String,Object> integration,
 			ClassLoader providedClassLoader) {
 		return new EntityManagerFactoryBuilderImpl( persistenceUnitDescriptor, integration, providedClassLoader );
 	}
 
 	public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 			PersistenceUnitDescriptor persistenceUnitDescriptor,
-			Map integration,
+			Map<String,Object> integration,
 			ClassLoaderService providedClassLoaderService) {
 		return new EntityManagerFactoryBuilderImpl( persistenceUnitDescriptor, integration, providedClassLoaderService );
 	}
@@ -90,27 +90,27 @@ public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 	@Internal
 	public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 			PersistenceUnitDescriptor persistenceUnitDescriptor,
-			Map integration,
+			Map<String,Object> integration,
 			Consumer<MergedSettings> mergedSettingsBaseline) {
 		return new EntityManagerFactoryBuilderImpl( persistenceUnitDescriptor, integration, mergedSettingsBaseline );
 	}
 
 	public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 			PersistenceUnitInfo persistenceUnitInfo,
-			Map integration) {
+			Map<String,Object> integration) {
 		return getEntityManagerFactoryBuilder( new PersistenceUnitInfoDescriptor( persistenceUnitInfo ), integration );
 	}
 
 	public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 			PersistenceUnitInfo persistenceUnitInfo,
-			Map integration,
+			Map<String,Object> integration,
 			ClassLoader providedClassLoader) {
 		return getEntityManagerFactoryBuilder( new PersistenceUnitInfoDescriptor( persistenceUnitInfo ), integration, providedClassLoader );
 	}
 
 	public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 			PersistenceUnitInfo persistenceUnitInfo,
-			Map integration,
+			Map<String,Object> integration,
 			ClassLoaderService providedClassLoaderService) {
 		return getEntityManagerFactoryBuilder( new PersistenceUnitInfoDescriptor( persistenceUnitInfo ), integration, providedClassLoaderService );
 	}
@@ -121,7 +121,7 @@ public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 	@Internal
 	public static EntityManagerFactoryBuilder getEntityManagerFactoryBuilder(
 			PersistenceUnitInfo persistenceUnitInfo,
-			Map integration,
+			Map<String,Object> integration,
 			Consumer<MergedSettings> mergedSettingsBaseline) {
 		return getEntityManagerFactoryBuilder( new PersistenceUnitInfoDescriptor( persistenceUnitInfo ), integration, mergedSettingsBaseline );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java
index 772c67bcf017..98b0256f5c4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceXmlParser.java
@@ -5,34 +5,24 @@
 package org.hibernate.jpa.boot.spi;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import javax.xml.transform.stream.StreamSource;
 
-import org.hibernate.boot.archive.internal.ArchiveHelper;
 import org.hibernate.boot.jaxb.Origin;
 import org.hibernate.boot.jaxb.SourceType;
 import org.hibernate.boot.jaxb.configuration.spi.JaxbPersistenceImpl;
 import org.hibernate.boot.jaxb.configuration.spi.JaxbPersistenceImpl.JaxbPersistenceUnitImpl;
-import org.hibernate.boot.jaxb.configuration.spi.JaxbPersistenceImpl.JaxbPersistenceUnitImpl.JaxbPropertiesImpl;
-import org.hibernate.boot.jaxb.configuration.spi.JaxbPersistenceImpl.JaxbPersistenceUnitImpl.JaxbPropertiesImpl.JaxbPropertyImpl;
 import org.hibernate.boot.jaxb.internal.ConfigurationBinder;
-import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
 import org.hibernate.boot.registry.classloading.internal.TcclLookupPrecedence;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.internal.log.DeprecationLogger;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
-import org.hibernate.jpa.internal.util.ConfigurationHelper;
 
 import jakarta.persistence.PersistenceException;
 import jakarta.persistence.PersistenceUnitTransactionType;
@@ -40,8 +30,20 @@
 
 import static jakarta.persistence.PersistenceUnitTransactionType.JTA;
 import static jakarta.persistence.PersistenceUnitTransactionType.RESOURCE_LOCAL;
+import static org.hibernate.boot.archive.internal.ArchiveHelper.getJarURLFromURLEntry;
+import static org.hibernate.cfg.JdbcSettings.JAKARTA_JTA_DATASOURCE;
+import static org.hibernate.cfg.JdbcSettings.JAKARTA_NON_JTA_DATASOURCE;
+import static org.hibernate.cfg.JdbcSettings.JPA_JTA_DATASOURCE;
+import static org.hibernate.cfg.JdbcSettings.JPA_NON_JTA_DATASOURCE;
+import static org.hibernate.cfg.PersistenceSettings.JAKARTA_PERSISTENCE_PROVIDER;
+import static org.hibernate.cfg.PersistenceSettings.JAKARTA_TRANSACTION_TYPE;
+import static org.hibernate.cfg.PersistenceSettings.JPA_PERSISTENCE_PROVIDER;
+import static org.hibernate.cfg.PersistenceSettings.JPA_TRANSACTION_TYPE;
+import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
+import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 import static org.hibernate.jpa.internal.JpaLogger.JPA_LOGGER;
 import static org.hibernate.internal.util.StringHelper.isEmpty;
+import static org.hibernate.jpa.internal.util.ConfigurationHelper.overrideProperties;
 
 /**
  * Used by Hibernate to parse {@code persistence.xml} files in SE environments.
@@ -95,17 +97,18 @@ private PersistenceXmlParser(Map<?, ?> integration, ClassLoader providedClassLoa
 				providedClassLoaders.add( providedClassLoader );
 			}
 
-			@SuppressWarnings("unchecked")
-			final Collection<ClassLoader> classLoaders =
-					(Collection<ClassLoader>) integration.get( AvailableSettings.CLASSLOADERS );
+			final var classLoaders =
+					(Collection<?>)
+							integration.get( AvailableSettings.CLASSLOADERS );
 			if ( classLoaders != null ) {
-				providedClassLoaders.addAll( classLoaders );
+				for ( var classLoader : classLoaders ) {
+					providedClassLoaders.add( (ClassLoader) classLoader );
+				}
 			}
 
-			classLoaderService = new ClassLoaderServiceImpl(
-					providedClassLoaders,
-					TcclLookupPrecedence.from( integration, TcclLookupPrecedence.AFTER )
-			);
+			classLoaderService =
+					new ClassLoaderServiceImpl( providedClassLoaders,
+							TcclLookupPrecedence.from( integration, TcclLookupPrecedence.AFTER ) );
 		}
 	}
 
@@ -162,28 +165,20 @@ private void parsePersistenceXml(Map<String, PersistenceUnitDescriptor> persiste
 			JPA_LOGGER.attemptingToParsePersistenceXml( xmlUrl.toExternalForm() );
 		}
 
-		final URL persistenceUnitRootUrl = ArchiveHelper.getJarURLFromURLEntry( xmlUrl, "/META-INF/persistence.xml" );
-
-		final JaxbPersistenceImpl jaxbPersistence = loadUrlWithJaxb( xmlUrl );
-		final List<JaxbPersistenceUnitImpl> jaxbPersistenceUnits = jaxbPersistence.getPersistenceUnit();
-
-		for ( int i = 0; i < jaxbPersistenceUnits.size(); i++ ) {
-			final JaxbPersistenceUnitImpl jaxbPersistenceUnit = jaxbPersistenceUnits.get( i );
-
+		final URL persistenceUnitRootUrl = getJarURLFromURLEntry( xmlUrl, "/META-INF/persistence.xml" );
+		for ( var jaxbPersistenceUnit : loadUrlWithJaxb( xmlUrl ).getPersistenceUnit() ) {
 			if ( persistenceUnits.containsKey( jaxbPersistenceUnit.getName() ) ) {
 				JPA_LOGGER.duplicatedPersistenceUnitName( jaxbPersistenceUnit.getName() );
-				continue;
 			}
-
-			final ParsedPersistenceXmlDescriptor persistenceUnitDescriptor =
-					new ParsedPersistenceXmlDescriptor( persistenceUnitRootUrl );
-			bindPersistenceUnit( jaxbPersistenceUnit, persistenceUnitDescriptor );
-
-			// per JPA spec, any settings passed in to PersistenceProvider bootstrap methods should override
-			// values found in persistence.xml
-			applyIntegrationOverrides( integration, defaultTransactionType, persistenceUnitDescriptor );
-
-			persistenceUnits.put( persistenceUnitDescriptor.getName(), persistenceUnitDescriptor );
+			else {
+				final var persistenceUnitDescriptor =
+						new ParsedPersistenceXmlDescriptor( persistenceUnitRootUrl );
+				bindPersistenceUnit( jaxbPersistenceUnit, persistenceUnitDescriptor );
+				// per JPA spec, any settings passed in to PersistenceProvider
+				// bootstrap methods should override values found in persistence.xml
+				applyIntegrationOverrides( integration, defaultTransactionType, persistenceUnitDescriptor );
+				persistenceUnits.put( persistenceUnitDescriptor.getName(), persistenceUnitDescriptor );
+			}
 		}
 	}
 
@@ -191,7 +186,7 @@ private void bindPersistenceUnit(
 			JaxbPersistenceUnitImpl jaxbPersistenceUnit,
 			ParsedPersistenceXmlDescriptor persistenceUnitDescriptor) {
 		final String name = jaxbPersistenceUnit.getName();
-		if ( StringHelper.isNotEmpty( name ) ) {
+		if ( isNotEmpty( name ) ) {
 			JPA_LOGGER.persistenceUnitNameFromXml( name );
 			persistenceUnitDescriptor.setName( name );
 		}
@@ -208,21 +203,19 @@ private void bindPersistenceUnit(
 		persistenceUnitDescriptor.addMappingFiles( jaxbPersistenceUnit.getMappingFiles() );
 		persistenceUnitDescriptor.addJarFileUrls( jaxbPersistenceUnit.getJarFiles() );
 
-		final JaxbPropertiesImpl propertyContainer = jaxbPersistenceUnit.getPropertyContainer();
+		final var propertyContainer = jaxbPersistenceUnit.getPropertyContainer();
 		if ( propertyContainer != null ) {
-			for ( JaxbPropertyImpl property : propertyContainer.getProperties() ) {
+			for ( var property : propertyContainer.getProperties() ) {
 				persistenceUnitDescriptor.getProperties()
 						.put( property.getName(), property.getValue() );
 			}
 		}
 	}
 
-	@SuppressWarnings("removal")
 	private static void setTransactionType(
 			JaxbPersistenceUnitImpl jaxbPersistenceUnit,
 			ParsedPersistenceXmlDescriptor persistenceUnitDescriptor) {
-		final jakarta.persistence.spi.PersistenceUnitTransactionType transactionType =
-				jaxbPersistenceUnit.getTransactionType();
+		final var transactionType = jaxbPersistenceUnit.getTransactionType();
 		if ( transactionType != null ) {
 			persistenceUnitDescriptor.setTransactionType(
 					PersistenceUnitTransactionTypeHelper.toNewForm( transactionType ) );
@@ -239,94 +232,81 @@ private boolean handleBoolean(Boolean incoming) {
 	@SuppressWarnings("deprecation")
 	private void applyIntegrationOverrides(Map<?,?> integration, PersistenceUnitTransactionType defaultTransactionType,
 			ParsedPersistenceXmlDescriptor persistenceUnitDescriptor) {
-		if ( integration.containsKey( AvailableSettings.JAKARTA_PERSISTENCE_PROVIDER ) ) {
+		if ( integration.containsKey( JAKARTA_PERSISTENCE_PROVIDER ) ) {
 			persistenceUnitDescriptor.setProviderClassName( (String)
-					integration.get( AvailableSettings.JAKARTA_PERSISTENCE_PROVIDER ) );
+					integration.get( JAKARTA_PERSISTENCE_PROVIDER ) );
 		}
-		else if ( integration.containsKey( AvailableSettings.JPA_PERSISTENCE_PROVIDER ) ) {
-			DeprecationLogger.DEPRECATION_LOGGER.deprecatedSetting(
-					AvailableSettings.JPA_PERSISTENCE_PROVIDER,
-					AvailableSettings.JAKARTA_PERSISTENCE_PROVIDER
-			);
+		else if ( integration.containsKey( JPA_PERSISTENCE_PROVIDER ) ) {
+			DEPRECATION_LOGGER.deprecatedSetting( JPA_PERSISTENCE_PROVIDER, JAKARTA_PERSISTENCE_PROVIDER );
 			persistenceUnitDescriptor.setProviderClassName( (String)
-					integration.get( AvailableSettings.JPA_PERSISTENCE_PROVIDER ) );
+					integration.get( JPA_PERSISTENCE_PROVIDER ) );
 		}
 
-		if ( integration.containsKey( AvailableSettings.JPA_TRANSACTION_TYPE ) ) {
-			DeprecationLogger.DEPRECATION_LOGGER.deprecatedSetting(
-					AvailableSettings.JPA_TRANSACTION_TYPE,
-					AvailableSettings.JAKARTA_TRANSACTION_TYPE
-			);
-			String transactionType = (String) integration.get( AvailableSettings.JPA_TRANSACTION_TYPE );
+		if ( integration.containsKey( JPA_TRANSACTION_TYPE ) ) {
+			DEPRECATION_LOGGER.deprecatedSetting( JPA_TRANSACTION_TYPE, JAKARTA_TRANSACTION_TYPE );
+			String transactionType = (String) integration.get( JPA_TRANSACTION_TYPE );
 			persistenceUnitDescriptor.setTransactionType( parseTransactionType( transactionType ) );
 		}
-		else if ( integration.containsKey( AvailableSettings.JAKARTA_TRANSACTION_TYPE ) ) {
-			String transactionType = (String) integration.get( AvailableSettings.JAKARTA_TRANSACTION_TYPE );
+		else if ( integration.containsKey( JAKARTA_TRANSACTION_TYPE ) ) {
+			String transactionType = (String) integration.get( JAKARTA_TRANSACTION_TYPE );
 			persistenceUnitDescriptor.setTransactionType( parseTransactionType( transactionType ) );
 		}
 
-		if ( integration.containsKey( AvailableSettings.JPA_JTA_DATASOURCE ) ) {
-			DeprecationLogger.DEPRECATION_LOGGER.deprecatedSetting(
-					AvailableSettings.JPA_JTA_DATASOURCE,
-					AvailableSettings.JAKARTA_JTA_DATASOURCE
-			);
-			persistenceUnitDescriptor.setJtaDataSource( integration.get( AvailableSettings.JPA_JTA_DATASOURCE ) );
+		if ( integration.containsKey( JPA_JTA_DATASOURCE ) ) {
+			DEPRECATION_LOGGER.deprecatedSetting( JPA_JTA_DATASOURCE, JAKARTA_JTA_DATASOURCE );
+			persistenceUnitDescriptor.setJtaDataSource( integration.get( JPA_JTA_DATASOURCE ) );
 		}
-		else if ( integration.containsKey( AvailableSettings.JAKARTA_JTA_DATASOURCE ) ) {
-			persistenceUnitDescriptor.setJtaDataSource( integration.get( AvailableSettings.JAKARTA_JTA_DATASOURCE ) );
+		else if ( integration.containsKey( JAKARTA_JTA_DATASOURCE ) ) {
+			persistenceUnitDescriptor.setJtaDataSource( integration.get( JAKARTA_JTA_DATASOURCE ) );
 		}
 
-		if ( integration.containsKey( AvailableSettings.JPA_NON_JTA_DATASOURCE ) ) {
-			DeprecationLogger.DEPRECATION_LOGGER.deprecatedSetting(
-					AvailableSettings.JPA_NON_JTA_DATASOURCE,
-					AvailableSettings.JAKARTA_NON_JTA_DATASOURCE
-			);
-			persistenceUnitDescriptor.setNonJtaDataSource( integration.get( AvailableSettings.JPA_NON_JTA_DATASOURCE ) );
+		if ( integration.containsKey( JPA_NON_JTA_DATASOURCE ) ) {
+			DEPRECATION_LOGGER.deprecatedSetting( JPA_NON_JTA_DATASOURCE, JAKARTA_NON_JTA_DATASOURCE );
+			persistenceUnitDescriptor.setNonJtaDataSource( integration.get( JPA_NON_JTA_DATASOURCE ) );
 		}
-		else if ( integration.containsKey( AvailableSettings.JAKARTA_NON_JTA_DATASOURCE ) ) {
-			persistenceUnitDescriptor.setNonJtaDataSource( integration.get( AvailableSettings.JAKARTA_NON_JTA_DATASOURCE ) );
+		else if ( integration.containsKey( JAKARTA_NON_JTA_DATASOURCE ) ) {
+			persistenceUnitDescriptor.setNonJtaDataSource( integration.get( JAKARTA_NON_JTA_DATASOURCE ) );
 		}
 
 		applyTransactionTypeOverride( persistenceUnitDescriptor, defaultTransactionType );
 
-		final Properties properties = persistenceUnitDescriptor.getProperties();
-		ConfigurationHelper.overrideProperties( properties, integration );
+		overrideProperties( persistenceUnitDescriptor.getProperties(), integration );
 	}
 
-	private void applyTransactionTypeOverride(ParsedPersistenceXmlDescriptor persistenceUnitDescriptor,
+	private void applyTransactionTypeOverride(
+			ParsedPersistenceXmlDescriptor persistenceUnitDescriptor,
 			PersistenceUnitTransactionType defaultTransactionType) {
-		// if transaction type is set already, use that value
+		// if the transaction type is set already, use that value
 		if ( persistenceUnitDescriptor.getPersistenceUnitTransactionType() == null ) {
-			// else
-			//		if JTA DS
-			//			use JTA
-			//		else if NOT JTA DS
-			//			use RESOURCE_LOCAL
-			//		else
-			//			use defaultTransactionType
-			if ( persistenceUnitDescriptor.getJtaDataSource() != null ) {
-				persistenceUnitDescriptor.setTransactionType( JTA );
-			}
-			else if ( persistenceUnitDescriptor.getNonJtaDataSource() != null ) {
-				persistenceUnitDescriptor.setTransactionType( RESOURCE_LOCAL );
-			}
-			else {
-				persistenceUnitDescriptor.setTransactionType( defaultTransactionType );
-			}
+			persistenceUnitDescriptor.setTransactionType(
+					determineTransactionType( persistenceUnitDescriptor, defaultTransactionType ) );
 		}
 	}
 
-	private static PersistenceUnitTransactionType parseTransactionType(String value) {
-		if ( isEmpty( value ) ) {
-			return null;
-		}
-		else if ( JTA.name().equalsIgnoreCase( value ) ) {
+	private static PersistenceUnitTransactionType determineTransactionType(
+			ParsedPersistenceXmlDescriptor persistenceUnitDescriptor,
+			PersistenceUnitTransactionType defaultTransactionType) {
+		if ( persistenceUnitDescriptor.getJtaDataSource() != null ) {
 			return JTA;
 		}
-		else if ( RESOURCE_LOCAL.name().equalsIgnoreCase( value ) ) {
+		else if ( persistenceUnitDescriptor.getNonJtaDataSource() != null ) {
 			return RESOURCE_LOCAL;
 		}
 		else {
+			return defaultTransactionType;
+		}
+	}
+
+	private static PersistenceUnitTransactionType parseTransactionType(String value) {
+		if ( isEmpty( value ) ) {
+			return null;
+		}
+		else {
+			for ( var transactionType : PersistenceUnitTransactionType.values() ) {
+				if ( transactionType.name().equalsIgnoreCase( value ) ) {
+					return transactionType;
+				}
+			}
 			throw new PersistenceException( "Unknown persistence unit transaction type : " + value );
 		}
 	}
@@ -334,16 +314,14 @@ else if ( RESOURCE_LOCAL.name().equalsIgnoreCase( value ) ) {
 	private JaxbPersistenceImpl loadUrlWithJaxb(URL xmlUrl) {
 		final String resourceName = xmlUrl.toExternalForm();
 		try {
-			URLConnection conn = xmlUrl.openConnection();
+			var connection = xmlUrl.openConnection();
 			// avoid JAR locking on Windows and Tomcat
-			conn.setUseCaches( false );
-
-			try ( InputStream inputStream = conn.getInputStream() ) {
-				final StreamSource inputSource = new StreamSource( inputStream );
-				final ConfigurationBinder configurationBinder = new ConfigurationBinder( classLoaderService );
-				final Binding<JaxbPersistenceImpl> binding =
-						configurationBinder.bind( inputSource, new Origin( SourceType.URL, resourceName ) );
-				return binding.getRoot();
+			connection.setUseCaches( false );
+			try ( var inputStream = connection.getInputStream() ) {
+				return new ConfigurationBinder( classLoaderService )
+						.bind( new StreamSource( inputStream ),
+								new Origin( SourceType.URL, resourceName ) )
+						.getRoot();
 			}
 			catch (IOException e) {
 				throw new PersistenceException( "Unable to obtain input stream from [" + resourceName + "]", e );
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java
index 436f8d95f4ac..20e9714d5a29 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java
@@ -26,7 +26,7 @@ public final class ProviderChecker {
 	/**
 	 * Does the descriptor and/or integration request Hibernate as the
 	 * {@link jakarta.persistence.spi.PersistenceProvider}?
-	 * <p></p>
+	 * <p>
 	 * Note that in the case of no requested provider being named, we
 	 * assume we are the provider. (The calls got to us somehow...)
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaLogger.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaLogger.java
index 9024e217f5bc..5c6a96c00bca 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/JpaLogger.java
@@ -16,6 +16,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -36,7 +37,7 @@ public interface JpaLogger extends BasicLogger {
 
 	String NAME = SubSystemLogging.BASE + ".jpa";
 
-	JpaLogger JPA_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JpaLogger.class, NAME );
+	JpaLogger JPA_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JpaLogger.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = WARN)
 	@Message(value = "Defining %s=true ignored in HEM", id = 8059)
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java
index 630800df6e7b..af90dae005bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java
@@ -123,7 +123,7 @@ public interface JpaCompliance {
 	 * {@link jakarta.persistence.EntityManager#find} should be exactly the
 	 * expected type, allowing no type coercion.
 	 * <p>
-	 * Historically, Hibernate behaved the same way. Since 6.0 however,
+	 * Historically, Hibernate behaved the same way. Since 6.0, however,
 	 * Hibernate has the ability to coerce the passed type to the expected
 	 * type. For example, an {@link Integer} may be widened to {@link Long}.
 	 * Coercion is performed by calling
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryConstructorTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryConstructorTransformer.java
index f65b2bcb84c3..69448a111305 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryConstructorTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryConstructorTransformer.java
@@ -4,11 +4,11 @@
  */
 package org.hibernate.jpa.spi;
 
+import java.lang.reflect.Constructor;
+
 import org.hibernate.InstantiationException;
 import org.hibernate.query.TupleTransformer;
 
-import java.lang.reflect.Constructor;
-
 /**
  * A {@link TupleTransformer} which packages each native query result in
  * an instance of the result class by calling an appropriate constructor.
@@ -26,6 +26,24 @@ public class NativeQueryConstructorTransformer<T> implements TupleTransformer<T>
 	private final Class<T> resultClass;
 	private transient Constructor<T> constructor;
 
+	public NativeQueryConstructorTransformer(Class<T> resultClass) {
+		this.resultClass = resultClass;
+	}
+
+	private static String constructorSignature(Constructor<?> ctor) {
+		final var signature = new StringBuilder();
+		signature.append( ctor.getDeclaringClass().getSimpleName() ).append( "(" );
+		final var params = ctor.getParameterTypes();
+		for ( int i = 0; i < params.length; i++ ) {
+			if ( i > 0 ) {
+				signature.append( ", " );
+			}
+			signature.append( params[i].getSimpleName() );
+		}
+		signature.append( ")" );
+		return signature.toString();
+	}
+
 	private Constructor<T> constructor(Object[] elements) {
 		if ( constructor == null ) {
 			try {
@@ -33,8 +51,8 @@ private Constructor<T> constructor(Object[] elements) {
 				// of the constructor we're looking for, so we need
 				// to do something a bit weird here: match on just
 				// the number of parameters
-				for ( final Constructor<?> candidate : resultClass.getDeclaredConstructors() ) {
-					final Class<?>[] parameterTypes = candidate.getParameterTypes();
+				for ( final var candidate : resultClass.getDeclaredConstructors() ) {
+					final var parameterTypes = candidate.getParameterTypes();
 					if ( parameterTypes.length == elements.length ) {
 						// found a candidate with the right number
 						// of parameters
@@ -55,24 +73,53 @@ private Constructor<T> constructor(Object[] elements) {
 				throw new InstantiationException( "Cannot instantiate query result type", resultClass, e );
 			}
 			if ( constructor == null ) {
-				throw new InstantiationException( "Result class must have a single constructor with exactly "
-						+ elements.length + " parameters", resultClass );
+				final var message = new StringBuilder();
+				message.append( "Result class" )
+						.append( " must have exactly one constructor with " )
+						.append( elements.length )
+						.append( " parameters - found ['" );
+				boolean first = true;
+				for ( var c : resultClass.getDeclaredConstructors() ) {
+					if ( c.getParameterCount() == elements.length ) {
+						if ( !first ) {
+							message.append( "', '" );
+						}
+						message.append( constructorSignature( c ) );
+						first = false;
+					}
+				}
+
+				message.append( "'] in" );
+
+				throw new InstantiationException( message.toString(), resultClass );
 			}
 		}
 		return constructor;
 	}
 
-	public NativeQueryConstructorTransformer(Class<T> resultClass) {
-		this.resultClass = resultClass;
-	}
-
 	@Override
 	public T transformTuple(Object[] tuple, String[] aliases) {
+		final var ctor = constructor( tuple );
 		try {
-			return constructor( tuple ).newInstance( tuple );
+			return ctor.newInstance( tuple );
 		}
 		catch (Exception e) {
-			throw new InstantiationException( "Cannot instantiate query result type", resultClass, e );
+			final var message = new StringBuilder();
+			message.append( "Could not instantiate query result type - expected '" )
+					.append( constructorSignature( ctor ) )
+					.append( "' but found '" )
+					.append( ctor.getDeclaringClass().getSimpleName() )
+					.append( '(' );
+
+			for ( int i = 0; i < tuple.length; i++ ) {
+				final Object value = tuple[i];
+				if ( i > 0 ) {
+					message.append( ", " );
+				}
+				message.append( value == null ? "null" : value.getClass().getSimpleName() );
+			}
+			message.append( ")' in" );
+			throw new InstantiationException( message.toString(), resultClass, e );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java
index 2cb5490e63ab..5d1d37eec6e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java
@@ -9,6 +9,8 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+
 import jakarta.persistence.Tuple;
 import jakarta.persistence.TupleElement;
 
@@ -134,6 +136,19 @@ public String toString() {
 			return Arrays.toString( tuple );
 		}
 
+
+		@Override
+		public boolean equals(Object obj) {
+			return obj instanceof NativeTupleImpl that
+				&& Objects.equals( this.aliasToValue, that.aliasToValue );
+		}
+
+		@Override
+		public int hashCode() {
+			return Arrays.hashCode( tuple );
+		}
+
+
 		@Override
 		public List<TupleElement<?>> getElements() {
 			final List<TupleElement<?>> elements = new ArrayList<>( size );
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java
index 24e8f5f49fbb..d32aa47b0929 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java
@@ -20,6 +20,7 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
 import org.hibernate.sql.exec.spi.JdbcSelectExecutor;
+import org.hibernate.type.descriptor.java.JavaType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,11 +40,17 @@ public abstract class AbstractMultiIdEntityLoader<T> implements MultiIdEntityLoa
 	private final EntityMappingType entityDescriptor;
 	private final SessionFactoryImplementor sessionFactory;
 	protected final EntityIdentifierMapping identifierMapping;
+	private final boolean idCoercionEnabled;
 
 	public AbstractMultiIdEntityLoader(EntityMappingType entityDescriptor, SessionFactoryImplementor sessionFactory) {
 		this.entityDescriptor = entityDescriptor;
 		this.sessionFactory = sessionFactory;
 		identifierMapping = getLoadable().getIdentifierMapping();
+		idCoercionEnabled =
+				!sessionFactory.getSessionFactoryOptions()
+						.getJpaCompliance().isLoadByIdComplianceEnabled()
+				// special handling for entity with @IdClass
+				&& !entityDescriptor.getIdentifierMapping().isVirtual();
 	}
 
 	protected EntityMappingType getEntityDescriptor() {
@@ -111,8 +118,9 @@ private List<T> orderedMultiLoad(
 			Object[] ids,
 			MultiIdLoadOptions loadOptions,
 			SharedSessionContractImplementor session) {
-		final boolean idCoercionEnabled = isIdCoercionEnabled();
-		final var idType = getLoadable().getIdentifierMapping().getJavaType();
+		final var loadable = getLoadable();
+		final var persister = loadable.getEntityPersister();
+		final var idType = loadable.getIdentifierMapping().getJavaType();
 
 		final int maxBatchSize = maxBatchSize( ids, loadOptions );
 
@@ -124,9 +132,9 @@ private List<T> orderedMultiLoad(
 		final var lockOptions = lockOptions( loadOptions );
 
 		for ( int i = 0; i < ids.length; i++ ) {
-			final Object id = idCoercionEnabled ? idType.coerce( ids[i], session ) : ids[i];
-			final var entityKey = new EntityKey( id, getLoadable().getEntityPersister() );
-			if ( !loadFromEnabledCaches( loadOptions, session, id, lockOptions, entityKey, results, i ) ) {
+			final Object id = coerce( idType, ids[i] );
+			final var entityKey = new EntityKey( id, persister );
+			if ( !loadFromEnabledCaches( loadOptions, session, lockOptions, entityKey, results, i ) ) {
 				// if we did not hit any of the continues above,
 				// then we need to batch load the entity state.
 				idsInBatch.add( id );
@@ -154,10 +162,13 @@ private List<T> orderedMultiLoad(
 		return (List<T>) results;
 	}
 
+	private Object coerce(JavaType<?> idType, Object id) {
+		return idCoercionEnabled ? idType.coerce( id ) : id;
+	}
+
 	private static LockOptions lockOptions(MultiIdLoadOptions loadOptions) {
-		return loadOptions.getLockOptions() == null
-				? new LockOptions( LockMode.NONE )
-				: loadOptions.getLockOptions();
+		final var lockOptions = loadOptions.getLockOptions();
+		return lockOptions == null ? new LockOptions( LockMode.NONE ) : lockOptions;
 	}
 
 	protected abstract int maxBatchSize(Object[] ids, MultiIdLoadOptions loadOptions);
@@ -169,21 +180,19 @@ private void handleResults(
 			List<Object> results) {
 		final var persistenceContext = session.getPersistenceContext();
 		for ( Integer position : elementPositionsLoadedByBatch ) {
-			// the element value at this position in the results List should be
-			// the EntityKey for that entity - reuse it
+			// the element value at this position in the results List
+			// should be the EntityKey for that entity - reuse it
 			final var entityKey = (EntityKey) results.get( position );
-			session.getPersistenceContextInternal().getBatchFetchQueue().removeBatchLoadableEntityKey( entityKey );
+			session.getPersistenceContextInternal().getBatchFetchQueue()
+					.removeBatchLoadableEntityKey( entityKey );
 			final Object entity = persistenceContext.getEntity( entityKey );
-			final Object result;
-			if ( entity == null
-				// the entity is locally deleted, and the options ask that we not return such entities
-				|| loadOptions.getRemovalsMode() == RemovalsMode.REPLACE
-					&& persistenceContext.getEntry( entity ).getStatus().isDeletedOrGone() ) {
-				result = null;
-			}
-			else {
-				result = persistenceContext.proxyFor( entity );
-			}
+			final Object result =
+					entity == null
+						// the entity is locally deleted, and the options ask that we not return such entities
+						|| loadOptions.getRemovalsMode() == RemovalsMode.REPLACE
+								&& persistenceContext.getEntry( entity ).getStatus().isDeletedOrGone()
+							? null
+							: persistenceContext.proxyFor( entity );
 			results.set( position, result );
 		}
 	}
@@ -198,12 +207,11 @@ protected abstract void loadEntitiesById(
 	private boolean loadFromEnabledCaches(
 			MultiIdLoadOptions loadOptions,
 			SharedSessionContractImplementor session,
-			Object id,
 			LockOptions lockOptions,
 			EntityKey entityKey,
 			List<Object> result,
 			int i) {
-		return (loadOptions.getSessionCheckMode() == SessionCheckMode.ENABLED
+		return ( loadOptions.getSessionCheckMode() == SessionCheckMode.ENABLED
 				|| loadOptions.isSecondLevelCacheCheckingEnabled() )
 			&& isLoadFromCaches( loadOptions, entityKey, lockOptions, result, i, session );
 	}
@@ -214,21 +222,22 @@ private boolean isLoadFromCaches(
 			LockOptions lockOptions,
 			List<Object> results, int i,
 			SharedSessionContractImplementor session) {
-
 		if ( loadOptions.getSessionCheckMode() == SessionCheckMode.ENABLED ) {
+			final var removalsMode = loadOptions.getRemovalsMode();
+			if ( removalsMode == RemovalsMode.EXCLUDE ) {
+				// note, this method is only called from orderedMultiLoad()
+				throw new IllegalArgumentException( "RemovalsMode.EXCLUDE is incompatible with OrderingMode.ORDERED" );
+			}
 			// look for it in the Session first
 			final var entry = loadFromSessionCache( entityKey, lockOptions, GET, session );
 			final Object entity = entry.entity();
 			if ( entity != null ) {
 				// put a null in the results
-				final Object result;
-				if ( loadOptions.getRemovalsMode() == RemovalsMode.INCLUDE
-					|| entry.isManaged() ) {
-					result = entity;
-				}
-				else {
-					result = null;
-				}
+				final Object result =
+						loadOptions.getRemovalsMode() == RemovalsMode.INCLUDE
+							|| entry.isManaged()
+								? entity
+								: null;
 				results.add( i, result );
 				return true;
 			}
@@ -292,7 +301,8 @@ private <R> Object[] resolveInCachesIfEnabled(
 			@NonNull LockOptions lockOptions,
 			SharedSessionContractImplementor session,
 			ResolutionConsumer<R> resolutionConsumer) {
-		return loadOptions.getSessionCheckMode() == SessionCheckMode.ENABLED || loadOptions.isSecondLevelCacheCheckingEnabled()
+		return loadOptions.getSessionCheckMode() == SessionCheckMode.ENABLED
+			|| loadOptions.isSecondLevelCacheCheckingEnabled()
 				// the user requested that we exclude ids corresponding to already managed
 				// entities from the generated load SQL. So here we will iterate all
 				// incoming id values and see whether it corresponds to an existing
@@ -330,18 +340,19 @@ private <R> List<Object> unresolvedIds(
 			LockOptions lockOptions,
 			SharedSessionContractImplementor session,
 			ResolutionConsumer<R> resolutionConsumer) {
-		final boolean idCoercionEnabled = isIdCoercionEnabled();
-		final var idType = getLoadable().getIdentifierMapping().getJavaType();
+		final var loadable = getLoadable();
+		final var persister = loadable.getEntityPersister();
+		final var idType = loadable.getIdentifierMapping().getJavaType();
 		List<Object> unresolvedIds = null;
 		for ( int i = 0; i < ids.length; i++ ) {
-			final Object id = idCoercionEnabled ? idType.coerce( ids[i], session ) : ids[i];
+			final Object id = coerce( idType, ids[i] );
 			unresolvedIds =
 					loadFromCaches(
 							loadOptions,
 							lockOptions,
 							resolutionConsumer,
 							id,
-							new EntityKey( id, getLoadable().getEntityPersister() ),
+							new EntityKey( id, persister ),
 							unresolvedIds,
 							i,
 							session
@@ -353,10 +364,6 @@ private <R> List<Object> unresolvedIds(
 	// Depending on the implementation, a specific subtype of Object[] (e.g. Integer[]) may be needed.
 	protected abstract Object[] toIdArray(List<Object> ids);
 
-	private boolean isIdCoercionEnabled() {
-		return !getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled();
-	}
-
 	public interface ResolutionConsumer<T> {
 		void consume(int position, EntityKey entityKey, T resolvedRef);
 	}
@@ -373,13 +380,16 @@ private <R> List<Object> loadFromCaches(
 		// look for it in the Session first
 		final var entry = loadFromSessionCache( entityKey, lockOptions, GET, session );
 		final Object sessionEntity;
-		if ( loadOptions.getSessionCheckMode() ==  SessionCheckMode.ENABLED ) {
+		if ( loadOptions.getSessionCheckMode() == SessionCheckMode.ENABLED ) {
 			sessionEntity = entry.entity();
-			if ( sessionEntity != null
-					&& loadOptions.getRemovalsMode() == RemovalsMode.REPLACE
-					&& !entry.isManaged() ) {
-				resolutionConsumer.consume( i, entityKey, null );
-				return unresolvedIds;
+			if ( sessionEntity != null && !entry.isManaged() ) {
+				switch ( loadOptions.getRemovalsMode() ) {
+					case REPLACE :
+						resolutionConsumer.consume( i, entityKey, null );
+						return unresolvedIds;
+					case EXCLUDE:
+						return unresolvedIds;
+				}
 			}
 		}
 		else {
@@ -387,7 +397,8 @@ private <R> List<Object> loadFromCaches(
 		}
 
 		final Object cachedEntity =
-				sessionEntity == null && loadOptions.isSecondLevelCacheCheckingEnabled()
+				sessionEntity == null
+					&& loadOptions.isSecondLevelCacheCheckingEnabled()
 						? loadFromSecondLevelCache( entityKey, lockOptions, session )
 						: sessionEntity;
 
@@ -404,8 +415,11 @@ private <R> List<Object> loadFromCaches(
 		return unresolvedIds;
 	}
 
-	private Object loadFromSecondLevelCache(EntityKey entityKey, LockOptions lockOptions, SharedSessionContractImplementor session) {
-		final var persister = getLoadable().getEntityPersister();
-		return session.loadFromSecondLevelCache( persister, entityKey, null, lockOptions.getLockMode() );
+	private Object loadFromSecondLevelCache(
+			EntityKey entityKey,
+			LockOptions lockOptions,
+			SharedSessionContractImplementor session) {
+		return session.loadFromSecondLevelCache( getLoadable().getEntityPersister(),
+				entityKey, null, lockOptions.getLockMode() );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiNaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiNaturalIdLoader.java
index 8ac139d2d38d..f3dee6a789d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiNaturalIdLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiNaturalIdLoader.java
@@ -129,7 +129,7 @@ private <K> List<E> sortResults(
 		return results;
 	}
 
-	private <K> Object entityForNaturalId(PersistenceContext context, K naturalId) {
+	private Object entityForNaturalId(PersistenceContext context, Object naturalId) {
 		final var descriptor = getEntityDescriptor();
 		final Object id = context.getNaturalIdResolutions().findCachedIdByNaturalId( naturalId, descriptor );
 		// id can be null if a non-existent natural id is requested, or a mutable natural id was changed and then deleted
@@ -142,20 +142,26 @@ private <K> Object[] checkPersistenceContextForCachedResults(
 			SharedSessionContractImplementor session,
 			LockOptions lockOptions,
 			Consumer<E> results ) {
+		final var removalsMode = loadOptions.getRemovalsMode();
+		if ( removalsMode == RemovalsMode.EXCLUDE
+				&& loadOptions.getOrderingMode() == OrderingMode.ORDERED ) {
+			throw new IllegalArgumentException( "RemovalsMode.EXCLUDE is incompatible with OrderingMode.ORDERED" );
+		}
 		final List<K> unresolvedIds = arrayList( naturalIds.length );
 		final var context = session.getPersistenceContextInternal();
-		final var naturalIdMapping = getEntityDescriptor().getNaturalIdMapping();
 		for ( K naturalId : naturalIds ) {
-			final Object entity = entityForNaturalId( context, naturalIdMapping.normalizeInput( naturalId ) );
+			final Object entity = entityForNaturalId( context, naturalId );
 			if ( entity != null ) {
 				// Entity is already in the persistence context
 				final var entry = context.getEntry( entity );
-				if ( loadOptions.getRemovalsMode() == RemovalsMode.INCLUDE
+				if ( removalsMode == RemovalsMode.INCLUDE
 						|| !entry.getStatus().isDeletedOrGone() ) {
 					// either a managed entry, or a deleted one with returnDeleted enabled
 					upgradeLock( entity, entry, lockOptions, session );
-					final Object result = context.proxyFor( entity );
-					results.accept( (E) result );
+					if ( removalsMode != RemovalsMode.EXCLUDE ) {
+						final Object result = context.proxyFor( entity );
+						results.accept( (E) result );
+					}
 				}
 			}
 			else {
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java
index 600074f7b0e3..2baec15775f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java
@@ -5,7 +5,10 @@
 package org.hibernate.loader.ast.internal;
 
 import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
+import org.hibernate.Locking;
+import org.hibernate.Timeouts;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -32,7 +35,6 @@
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.BaseExecutionContext;
 import org.hibernate.sql.exec.internal.CallbackImpl;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
@@ -40,6 +42,7 @@
 import org.hibernate.sql.exec.spi.JdbcParameterBinding;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.graph.internal.ImmutableFetchList;
 import org.hibernate.sql.results.internal.RowTransformerSingularReturnImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
@@ -86,13 +89,28 @@ public EntityMappingType getLoadable() {
 	}
 
 	@Override
-	public T load(Object naturalIdValue, NaturalIdLoadOptions options, SharedSessionContractImplementor session) {
-		final var factory = session.getFactory();
+	public T load(Object naturalIdToLoad, Options options, SharedSessionContractImplementor session) {
+		final var lockOptions = makeLockOptions( options );
+		return load( naturalIdToLoad, lockOptions, session );
+	}
+
+	private LockOptions makeLockOptions(Options options) {
+		if ( options.getLockMode() == null || options.getLockMode() == LockMode.NONE ) {
+			return LockOptions.NONE;
+		}
+		if ( options.getLockMode() == LockMode.READ ) {
+			return LockOptions.READ;
+		}
+
+		final var lockOptions = new LockOptions( options.getLockMode() );
+		lockOptions.setScope( options.getLockScope() != null ? options.getLockScope() : Locking.Scope.ROOT_ONLY );
+		lockOptions.setTimeout( options.getLockTimeout() != null ? options.getLockTimeout() : Timeouts.WAIT_FOREVER );
+		lockOptions.setFollowOnStrategy( options.getLockFollowOn() != null ? options.getLockFollowOn() : Locking.FollowOn.ALLOW );
+		return lockOptions;
+	}
 
-		final var lockOptions =
-				options.getLockOptions() == null
-						? new LockOptions()
-						: options.getLockOptions();
+	private T load(Object naturalIdValue, LockOptions lockOptions, SharedSessionContractImplementor session) {
+		final var factory = session.getFactory();
 
 		final var sqlSelect = LoaderSelectBuilder.createSelect(
 				getLoadable(),
@@ -104,6 +122,7 @@ public T load(Object naturalIdValue, NaturalIdLoadOptions options, SharedSession
 				session.getLoadQueryInfluencers(),
 				lockOptions,
 				JdbcParametersList.newBuilder()::add,
+				new SqlAliasBaseManager(),
 				factory
 		);
 
@@ -128,6 +147,14 @@ public T load(Object naturalIdValue, NaturalIdLoadOptions options, SharedSession
 		);
 	}
 
+	@Override
+	public T load(Object naturalIdValue, NaturalIdLoadOptions options, SharedSessionContractImplementor session) {
+		final var lockOptions = options.getLockOptions() == null
+				? new LockOptions()
+				: options.getLockOptions();
+		return load( naturalIdValue, lockOptions, session );
+	}
+
 	/**
 	 * Apply restriction necessary to match the given natural-id value.
 	 * Should also apply any predicates to the predicate consumer and
@@ -148,9 +175,10 @@ protected Expression resolveColumnReference(
 			TableGroup rootTableGroup,
 			SelectableMapping selectableMapping,
 			SqlExpressionResolver sqlExpressionResolver) {
-		final var tableReference =
-				rootTableGroup.getTableReference( rootTableGroup.getNavigablePath(),
-						selectableMapping.getContainingTableExpression() );
+		final var tableReference = rootTableGroup.getTableReference(
+				rootTableGroup.getNavigablePath(),
+				selectableMapping.getContainingTableExpression()
+		);
 		if ( tableReference == null ) {
 			throw new IllegalStateException(
 					String.format(
@@ -179,17 +207,16 @@ public Object resolveNaturalIdToId(Object naturalIdValue, SharedSessionContractI
 		final var entityPath = new NavigablePath( entityDescriptor.getRootPathName() );
 		final var rootQuerySpec = new QuerySpec( true );
 
-		final var sqlAstCreationState =
-				new LoaderSqlAstCreationState(
-						rootQuerySpec,
-						new SqlAliasBaseManager(),
-						new SimpleFromClauseAccessImpl(),
-						LockOptions.NONE,
-						(fetchParent, creationState) -> ImmutableFetchList.EMPTY,
-						true,
-						new LoadQueryInfluencers( factory ),
-						factory.getSqlTranslationEngine()
-				);
+		final var sqlAstCreationState = new LoaderSqlAstCreationState(
+				rootQuerySpec,
+				new SqlAliasBaseManager(),
+				new SimpleFromClauseAccessImpl(),
+				LockOptions.NONE,
+				(fetchParent, creationState) -> ImmutableFetchList.EMPTY,
+				true,
+				new LoadQueryInfluencers( factory ),
+				factory.getSqlTranslationEngine()
+		);
 
 		final var rootTableGroup = entityDescriptor.createRootTableGroup(
 				true,
@@ -231,12 +258,13 @@ protected <R> R executeNaturalIdQuery(
 			Consumer<Predicate> predicateConsumer,
 			LoaderSqlAstCreationState sqlAstCreationState,
 			SharedSessionContractImplementor session) {
+		assert naturalIdMapping.isNormalized( naturalIdValue );
+
 		final var factory = session.getFactory();
 
-		final var bindings =
-				new JdbcParameterBindingsImpl( naturalIdMapping.getJdbcTypeCount() );
+		final var bindings = new JdbcParameterBindingsImpl( naturalIdMapping.getJdbcTypeCount() );
 		applyNaturalIdRestriction(
-				naturalIdMapping().normalizeInput( naturalIdValue ),
+				naturalIdValue,
 				rootTableGroup,
 				predicateConsumer,
 				bindings::addBinding,
@@ -282,7 +310,7 @@ protected <R> R executeNaturalIdQuery(
 		};
 	}
 
-	private static JdbcOperationQuerySelect createJdbcOperationQuerySelect(
+	private static JdbcSelect createJdbcOperationQuerySelect(
 			SelectStatement sqlSelect,
 			SessionFactoryImplementor factory,
 			JdbcParameterBindings bindings,
@@ -308,6 +336,7 @@ public Object resolveIdToNaturalId(Object id, SharedSessionContractImplementor s
 				session.getLoadQueryInfluencers(),
 				new LockOptions(),
 				builder::add,
+				new SqlAliasBaseManager(),
 				factory
 		);
 		final var jdbcParameters = builder.build();
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
index 3045c41a60d5..614838b1d353 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java
@@ -20,14 +20,15 @@
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
 import org.hibernate.metamodel.mapping.internal.SqlTypedMappingImpl;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 
@@ -48,7 +49,7 @@ public class CollectionBatchLoaderArrayParam
 	private final SqlTypedMapping arraySqlTypedMapping;
 	private final JdbcParameter jdbcParameter;
 	private final SelectStatement sqlSelect;
-	private final JdbcOperationQuerySelect jdbcSelectOperation;
+	private final JdbcSelect jdbcSelectOperation;
 
 	public CollectionBatchLoaderArrayParam(
 			int domainBatchSize,
@@ -82,6 +83,8 @@ public CollectionBatchLoaderArrayParam(
 				)
 		);
 
+		final var sqlAliasBaseGenerator = new SqlAliasBaseManager();
+
 		jdbcParameter = new SqlTypedMappingJdbcParameter( arraySqlTypedMapping );
 		sqlSelect = LoaderSelectBuilder.createSelectBySingleArrayParameter(
 				getLoadable(),
@@ -89,12 +92,18 @@ public CollectionBatchLoaderArrayParam(
 				getInfluencers(),
 				new LockOptions(),
 				jdbcParameter,
+				sqlAliasBaseGenerator,
 				getSessionFactory()
 		);
 
 		final var querySpec = sqlSelect.getQueryPart().getFirstQuerySpec();
 		final var tableGroup = querySpec.getFromClause().getRoots().get( 0 );
-		attributeMapping.applySoftDeleteRestrictions( tableGroup, querySpec::applyPredicate );
+		attributeMapping.applyAuxiliaryRestrictions(
+				tableGroup,
+				querySpec::applyPredicate,
+				getInfluencers(),
+				sqlAliasBaseGenerator
+		);
 
 		jdbcSelectOperation = getSessionFactory().getJdbcServices()
 				.getJdbcEnvironment()
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java
index efea2c40a173..3e62b690fa42 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java
@@ -13,9 +13,10 @@
 import org.hibernate.loader.ast.spi.SqlArrayMultiKeyLoader;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 
 import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.countIds;
 import static org.hibernate.loader.ast.internal.MultiKeyLoadLogging.MULTI_KEY_LOAD_LOGGER;
@@ -34,7 +35,7 @@ public class CollectionBatchLoaderInPredicate
 	private final int sqlBatchSize;
 	private final JdbcParametersList jdbcParameters;
 	private final SelectStatement sqlAst;
-	private final JdbcOperationQuerySelect jdbcSelect;
+	private final JdbcSelect jdbcSelect;
 
 	public CollectionBatchLoaderInPredicate(
 			int domainBatchSize,
@@ -56,8 +57,10 @@ public CollectionBatchLoaderInPredicate(
 			);
 		}
 
+		final var sqlAliasBaseGenerator = new SqlAliasBaseManager();
+
 		final var jdbcParametersBuilder = JdbcParametersList.newBuilder();
-		this.sqlAst = LoaderSelectBuilder.createSelect(
+		sqlAst = LoaderSelectBuilder.createSelect(
 				attributeMapping,
 				null,
 				attributeMapping.getKeyDescriptor(),
@@ -66,12 +69,18 @@ public CollectionBatchLoaderInPredicate(
 				influencers,
 				new LockOptions(),
 				jdbcParametersBuilder::add,
+				sqlAliasBaseGenerator,
 				sessionFactory
 		);
 
 		final var querySpec = sqlAst.getQueryPart().getFirstQuerySpec();
 		final var tableGroup = querySpec.getFromClause().getRoots().get( 0 );
-		attributeMapping.applySoftDeleteRestrictions( tableGroup, querySpec::applyPredicate );
+		attributeMapping.applyAuxiliaryRestrictions(
+				tableGroup,
+				querySpec::applyPredicate,
+				influencers,
+				sqlAliasBaseGenerator
+		);
 
 		jdbcParameters = jdbcParametersBuilder.build();
 		assert jdbcParameters.size() == sqlBatchSize * keyColumnCount;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java
index b37cfe985b56..a3f85a19b9e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java
@@ -16,6 +16,7 @@
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.EntityCollectionPart;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.BaseExecutionContext;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
@@ -87,6 +88,7 @@ public CollectionElementLoaderByIndex(
 				influencers,
 				new LockOptions(),
 				jdbcParametersBuilder::add,
+				new SqlAliasBaseManager(),
 				sessionFactory
 		);
 		jdbcParameters = jdbcParametersBuilder.build();
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java
index 4ff1caf44f74..8dc4589f64a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java
@@ -15,11 +15,12 @@
 import org.hibernate.loader.ast.spi.CollectionLoader;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.BaseExecutionContext;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 
@@ -36,7 +37,7 @@ public class CollectionLoaderSingleKey implements CollectionLoader {
 	private final int keyJdbcCount;
 
 	private final SelectStatement sqlAst;
-	private final JdbcOperationQuerySelect jdbcSelect;
+	private final JdbcSelect jdbcSelect;
 	private final JdbcParametersList jdbcParameters;
 
 	public CollectionLoaderSingleKey(
@@ -48,6 +49,8 @@ public CollectionLoaderSingleKey(
 		keyJdbcCount = attributeMapping.getKeyDescriptor().getJdbcTypeCount();
 		final var jdbcParametersBuilder = JdbcParametersList.newBuilder();
 
+		final var sqlAliasBaseGenerator = new SqlAliasBaseManager();
+
 		sqlAst = LoaderSelectBuilder.createSelect(
 				attributeMapping,
 				null,
@@ -57,12 +60,18 @@ public CollectionLoaderSingleKey(
 				influencers,
 				new LockOptions(),
 				jdbcParametersBuilder::add,
+				sqlAliasBaseGenerator,
 				sessionFactory
 		);
 
 		final var querySpec = sqlAst.getQueryPart().getFirstQuerySpec();
 		final var tableGroup = querySpec.getFromClause().getRoots().get( 0 );
-		attributeMapping.applySoftDeleteRestrictions( tableGroup, querySpec::applyPredicate );
+		attributeMapping.applyAuxiliaryRestrictions(
+				tableGroup,
+				querySpec::applyPredicate,
+				influencers,
+				sqlAliasBaseGenerator
+		);
 
 		jdbcParameters = jdbcParametersBuilder.build();
 		jdbcSelect =
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java
index 24d7807674c9..dbef2e7ca33f 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSubSelectFetch.java
@@ -16,6 +16,7 @@
 import org.hibernate.loader.ast.spi.CollectionLoader;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.internal.ResultsHelper;
@@ -43,6 +44,8 @@ public CollectionLoaderSubSelectFetch(
 		this.attributeMapping = attributeMapping;
 		this.subselect = subselect;
 
+		final var sqlAliasBaseGenerator = new SqlAliasBaseManager();
+
 		sqlAst = LoaderSelectBuilder.createSubSelectFetchSelect(
 				attributeMapping,
 				subselect,
@@ -50,12 +53,18 @@ public CollectionLoaderSubSelectFetch(
 				session.getLoadQueryInfluencers(),
 				new LockOptions(),
 				jdbcParameter -> {},
+				sqlAliasBaseGenerator,
 				session.getFactory()
 		);
 
 		final var querySpec = sqlAst.getQueryPart().getFirstQuerySpec();
 		final var tableGroup = querySpec.getFromClause().getRoots().get( 0 );
-		attributeMapping.applySoftDeleteRestrictions( tableGroup, querySpec::applyPredicate );
+		attributeMapping.applyAuxiliaryRestrictions(
+				tableGroup,
+				querySpec::applyPredicate,
+				session.getLoadQueryInfluencers(),
+				sqlAliasBaseGenerator
+		);
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java
index c676d11b812d..81ce23b7d327 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/DatabaseSnapshotExecutor.java
@@ -4,9 +4,6 @@
  */
 package org.hibernate.loader.ast.internal;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -25,14 +22,17 @@
 import org.hibernate.sql.exec.internal.BaseExecutionContext;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.internal.ImmutableFetchList;
 import org.hibernate.sql.results.internal.RowTransformerArrayImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 import org.hibernate.type.StandardBasicTypes;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_OBJECT_ARRAY;
 import static org.hibernate.loader.LoaderLogging.LOADER_LOGGER;
 import static org.hibernate.pretty.MessageHelper.infoString;
@@ -44,7 +44,7 @@ class DatabaseSnapshotExecutor {
 
 	private final EntityMappingType entityDescriptor;
 
-	private final JdbcOperationQuerySelect jdbcSelect;
+	private final JdbcSelect jdbcSelect;
 	private final JdbcParametersList jdbcParameters;
 
 	DatabaseSnapshotExecutor(
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java
index 09322aa83d7d..55b076fccb79 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java
@@ -4,8 +4,6 @@
  */
 package org.hibernate.loader.ast.internal;
 
-import java.util.Locale;
-
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -18,10 +16,13 @@
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
 import org.hibernate.metamodel.mapping.internal.SqlTypedMappingImpl;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.spi.JdbcSelect;
+
+import java.util.Locale;
 
 import static org.hibernate.loader.ast.internal.LoaderHelper.loadByArrayParameter;
 import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.trimIdBatch;
@@ -44,7 +45,7 @@ public class EntityBatchLoaderArrayParam<T>
 	private final SqlTypedMapping arraySqlTypedMapping;
 	private final JdbcParameter jdbcParameter;
 	private final SelectStatement sqlAst;
-	private final JdbcOperationQuerySelect jdbcSelectOperation;
+	private final JdbcSelect jdbcSelectOperation;
 
 
 	/**
@@ -95,6 +96,7 @@ public EntityBatchLoaderArrayParam(
 				loadQueryInfluencers,
 				new LockOptions(),
 				jdbcParameter,
+				new SqlAliasBaseManager(),
 				sessionFactory
 		);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java
index 78dc80db9297..8bf64034ffd4 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java
@@ -4,8 +4,6 @@
  */
 package org.hibernate.loader.ast.internal;
 
-import java.util.Locale;
-
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -15,9 +13,12 @@
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
+
+import java.util.Locale;
 
 import static org.hibernate.loader.ast.internal.MultiKeyLoadLogging.MULTI_KEY_LOAD_LOGGER;
 import static org.hibernate.pretty.MessageHelper.infoString;
@@ -41,7 +42,7 @@ public class EntityBatchLoaderInPredicate<T>
 
 	private final JdbcParametersList jdbcParameters;
 	private final SelectStatement sqlAst;
-	private final JdbcOperationQuerySelect jdbcSelectOperation;
+	private final JdbcSelect jdbcSelectOperation;
 
 	/**
 	 * @param domainBatchSize The maximum number of entities we will initialize for each load
@@ -80,6 +81,7 @@ public EntityBatchLoaderInPredicate(
 				loadQueryInfluencers,
 				new LockOptions(),
 				builder::add,
+				new SqlAliasBaseManager(),
 				sessionFactory
 		);
 		jdbcParameters = builder.build();
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java
index ac770282f810..d593045a8566 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityConcreteTypeLoader.java
@@ -15,6 +15,7 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.BaseExecutionContext;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
@@ -49,6 +50,7 @@ public EntityConcreteTypeLoader(EntityMappingType entityDescriptor, SessionFacto
 				new LoadQueryInfluencers( sessionFactory ),
 				new LockOptions(),
 				builder::add,
+				new SqlAliasBaseManager(),
 				sessionFactory
 		);
 		jdbcParameters = builder.build();
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java
index 77fc6ac9a14a..eb40e138af61 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java
@@ -4,8 +4,6 @@
  */
 package org.hibernate.loader.ast.internal;
 
-import java.util.List;
-
 import org.hibernate.Hibernate;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
@@ -26,12 +24,14 @@
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import java.util.List;
+
 import static java.lang.System.arraycopy;
 import static java.lang.reflect.Array.newInstance;
 import static org.hibernate.loader.LoaderLogging.LOADER_LOGGER;
@@ -152,9 +152,9 @@ public static Boolean getReadOnlyFromLoadQueryInfluencers(LoadQueryInfluencers i
 
 	/**
 	 * Normalize an array of keys (primary, foreign or natural).
-	 * <p/>
+	 * <p>
 	 * If the array is already typed as the key type, {@code keys} is simply returned.
-	 * <p/>
+	 * <p>
 	 * Otherwise, a new typed array is created and the contents copied from {@code keys} to this new array.  If
 	 * key {@linkplain org.hibernate.cfg.AvailableSettings#JPA_LOAD_BY_ID_COMPLIANCE coercion} is enabled, the
 	 * values will be coerced to the key type.
@@ -188,7 +188,7 @@ public static <K> K[] normalizeKeys(
 		}
 		else {
 			for ( int i = 0; i < keys.length; i++ ) {
-				typedArray[i] = keyJavaType.coerce( keys[i], session );
+				typedArray[i] = keyJavaType.cast( keyJavaType.coerce( keys[i] ) );
 			}
 		}
 		return typedArray;
@@ -217,7 +217,7 @@ public static <X> X[] createTypedArray(Class<X> elementClass, @SuppressWarnings(
 	public static <R,K> List<R> loadByArrayParameter(
 			K[] idsToInitialize,
 			SelectStatement sqlAst,
-			JdbcOperationQuerySelect jdbcOperation,
+			JdbcSelect jdbcOperation,
 			JdbcParameter jdbcParameter,
 			JdbcMapping arrayJdbcMapping,
 			Object entityId,
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java
index 21a312f47640..be37a2849b8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java
@@ -37,10 +37,9 @@
 import org.hibernate.spi.EntityIdentifierNavigablePath;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstJoinType;
-import org.hibernate.sql.ast.spi.AliasCollector;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.spi.SimpleFromClauseAccessImpl;
-import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
+import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator;
 import org.hibernate.sql.ast.spi.SqlAstCreationContext;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
@@ -103,6 +102,7 @@ public static SelectStatement createSelectByUniqueKey(
 			LoadQueryInfluencers loadQueryInfluencers,
 			LockOptions lockOptions,
 			Consumer<JdbcParameter> jdbcParameterConsumer,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
 			SessionFactoryImplementor sessionFactory) {
 		final var process = new LoaderSelectBuilder(
 				sessionFactory.getSqlTranslationEngine(),
@@ -115,7 +115,8 @@ public static SelectStatement createSelectByUniqueKey(
 				lockOptions,
 				determineGraphTraversalState( loadQueryInfluencers, sessionFactory.getJpaMetamodel() ),
 				true,
-				jdbcParameterConsumer
+				jdbcParameterConsumer,
+				sqlAliasBaseGenerator
 		);
 		return process.generateSelect();
 	}
@@ -129,6 +130,7 @@ public static SelectStatement createSelectBySingleArrayParameter(
 			LoadQueryInfluencers influencers,
 			LockOptions lockOptions,
 			JdbcParameter jdbcArrayParameter,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
 			SessionFactoryImplementor sessionFactory) {
 		final var builder = new LoaderSelectBuilder(
 				sessionFactory.getSqlTranslationEngine(),
@@ -141,7 +143,8 @@ public static SelectStatement createSelectBySingleArrayParameter(
 				lockOptions,
 				determineGraphTraversalState( influencers, sessionFactory.getJpaMetamodel() ),
 				true,
-				null
+				null,
+				sqlAliasBaseGenerator
 		);
 
 		final var rootQuerySpec = new QuerySpec( true );
@@ -226,6 +229,7 @@ public static SelectStatement createSelect(
 			LoadQueryInfluencers loadQueryInfluencers,
 			LockOptions lockOptions,
 			Consumer<JdbcParameter> jdbcParameterConsumer,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
 			SessionFactoryImplementor sessionFactory) {
 		final var process = new LoaderSelectBuilder(
 				sessionFactory.getSqlTranslationEngine(),
@@ -236,7 +240,8 @@ public static SelectStatement createSelect(
 				numberOfKeysToLoad,
 				loadQueryInfluencers,
 				lockOptions,
-				jdbcParameterConsumer
+				jdbcParameterConsumer,
+				sqlAliasBaseGenerator
 		);
 		return process.generateSelect();
 	}
@@ -250,6 +255,7 @@ public static SelectStatement createSelect(
 			LoadQueryInfluencers loadQueryInfluencers,
 			LockOptions lockOptions,
 			Consumer<JdbcParameter> jdbcParameterConsumer,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
 			SessionFactoryImplementor sessionFactory) {
 		final var process = new LoaderSelectBuilder(
 				sessionFactory.getSqlTranslationEngine(),
@@ -260,7 +266,8 @@ public static SelectStatement createSelect(
 				numberOfKeysToLoad,
 				loadQueryInfluencers,
 				lockOptions,
-				jdbcParameterConsumer
+				jdbcParameterConsumer,
+				sqlAliasBaseGenerator
 		);
 		return process.generateSelect();
 	}
@@ -277,6 +284,7 @@ static SelectStatement createSelect(
 			LoadQueryInfluencers loadQueryInfluencers,
 			LockOptions lockOptions,
 			Consumer<JdbcParameter> jdbcParameterConsumer,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
 			SessionFactoryImplementor sessionFactory) {
 		final var process = new LoaderSelectBuilder(
 				sessionFactory.getSqlTranslationEngine(),
@@ -289,9 +297,9 @@ static SelectStatement createSelect(
 				lockOptions,
 				determineGraphTraversalState( loadQueryInfluencers, sessionFactory.getJpaMetamodel() ),
 				forceIdentifierSelection,
-				jdbcParameterConsumer
+				jdbcParameterConsumer,
+				sqlAliasBaseGenerator
 		);
-
 		return process.generateSelect();
 	}
 
@@ -315,6 +323,7 @@ public static SelectStatement createSubSelectFetchSelect(
 			LoadQueryInfluencers loadQueryInfluencers,
 			LockOptions lockOptions,
 			Consumer<JdbcParameter> jdbcParameterConsumer,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
 			SessionFactoryImplementor sessionFactory) {
 		final var process = new LoaderSelectBuilder(
 				sessionFactory.getSqlTranslationEngine(),
@@ -325,9 +334,10 @@ public static SelectStatement createSubSelectFetchSelect(
 				-1,
 				loadQueryInfluencers,
 				lockOptions,
-				jdbcParameterConsumer
+				jdbcParameterConsumer,
+				sqlAliasBaseGenerator
 		);
-		return process.generateSelect( subselect );
+		return process.generateSelect( subselect, sqlAliasBaseGenerator );
 	}
 
 	private final SqlAstCreationContext creationContext;
@@ -344,6 +354,7 @@ public static SelectStatement createSubSelectFetchSelect(
 
 	private int fetchDepth;
 	private RowCardinality rowCardinality = RowCardinality.SINGLE;
+	private final SqlAliasBaseGenerator sqlAliasBasGenerator;
 
 	private LoaderSelectBuilder(
 			SqlAstCreationContext creationContext,
@@ -356,7 +367,8 @@ private LoaderSelectBuilder(
 			LockOptions lockOptions,
 			EntityGraphTraversalState entityGraphTraversalState,
 			boolean forceIdentifierSelection,
-			Consumer<JdbcParameter> jdbcParameterConsumer) {
+			Consumer<JdbcParameter> jdbcParameterConsumer,
+			SqlAliasBaseGenerator sqlAliasBasGenerator) {
 		this.creationContext = creationContext;
 		this.loadable = loadable;
 		this.partsToSelect = partsToSelect;
@@ -368,6 +380,7 @@ private LoaderSelectBuilder(
 		this.entityGraphTraversalState = entityGraphTraversalState;
 		this.forceIdentifierSelection = forceIdentifierSelection;
 		this.jdbcParameterConsumer = jdbcParameterConsumer;
+		this.sqlAliasBasGenerator = sqlAliasBasGenerator;
 		if ( loadable instanceof PluralAttributeMapping pluralAttributeMapping ) {
 			if ( pluralAttributeMapping.getMappedType().getCollectionSemantics()
 						.getCollectionClassification() == CollectionClassification.BAG ) {
@@ -385,7 +398,8 @@ private LoaderSelectBuilder(
 			int numberOfKeysToLoad,
 			LoadQueryInfluencers loadQueryInfluencers,
 			LockOptions lockOptions,
-			Consumer<JdbcParameter> jdbcParameterConsumer) {
+			Consumer<JdbcParameter> jdbcParameterConsumer,
+			SqlAliasBaseGenerator sqlAliasBasGenerator) {
 		this(
 				creationContext,
 				loadable,
@@ -397,7 +411,8 @@ private LoaderSelectBuilder(
 				lockOptions != null ? lockOptions : new LockOptions(),
 				determineGraphTraversalState( loadQueryInfluencers, creationContext.getJpaMetamodel() ),
 				determineWhetherToForceIdSelection( numberOfKeysToLoad, restrictedParts ),
-				jdbcParameterConsumer
+				jdbcParameterConsumer,
+				sqlAliasBasGenerator
 		);
 	}
 
@@ -410,7 +425,8 @@ private LoaderSelectBuilder(
 			int numberOfKeysToLoad,
 			LoadQueryInfluencers loadQueryInfluencers,
 			LockOptions lockOptions,
-			Consumer<JdbcParameter> jdbcParameterConsumer) {
+			Consumer<JdbcParameter> jdbcParameterConsumer,
+			SqlAliasBaseGenerator sqlAliasBasGenerator) {
 		this(
 				creationContext,
 				loadable,
@@ -420,7 +436,8 @@ private LoaderSelectBuilder(
 				numberOfKeysToLoad,
 				loadQueryInfluencers,
 				lockOptions,
-				jdbcParameterConsumer
+				jdbcParameterConsumer,
+				sqlAliasBasGenerator
 		);
 	}
 
@@ -570,7 +587,7 @@ private TableGroup buildRootTableGroup(
 	private LoaderSqlAstCreationState createSqlAstCreationState(QuerySpec rootQuerySpec) {
 		return new LoaderSqlAstCreationState(
 				rootQuerySpec,
-				new SqlAliasBaseManager(),
+				sqlAliasBasGenerator,
 				new SimpleFromClauseAccessImpl(),
 				lockOptions,
 				this::visitFetches,
@@ -580,6 +597,10 @@ private LoaderSqlAstCreationState createSqlAstCreationState(QuerySpec rootQueryS
 		);
 	}
 
+	private SqlAliasBaseGenerator getSqlAliasBaseGenerator() {
+		return sqlAliasBasGenerator;
+	}
+
 	private void applyRestriction(
 			QuerySpec rootQuerySpec,
 			NavigablePath rootNavigablePath,
@@ -960,7 +981,7 @@ else if ( fetchable instanceof PluralAttributeMapping pluralAttributeMapping ) {
 		return true;
 	}
 
-	private SelectStatement generateSelect(SubselectFetch subselect) {
+	private SelectStatement generateSelect(SubselectFetch subselect, SqlAliasBaseGenerator sqlAliasBaseGenerator) {
 
 		// todo (6.0) : we could even convert this to a join by piecing together
 		//		parts from the subselect-fetch sql-ast.  e.g. today we do:
@@ -989,11 +1010,9 @@ private SelectStatement generateSelect(SubselectFetch subselect) {
 		final var rootQuerySpec = new QuerySpec( true );
 		rootQuerySpec.applyRootPathForLocking( rootNavigablePath );
 
-		// We need to initialize the acronymMap based on subselect.getLoadingSqlAst() to avoid alias collisions
-		final var tableReferences = AliasCollector.getTableReferences( subselect.getLoadingSqlAst() );
 		final var sqlAstCreationState = new LoaderSqlAstCreationState(
 				rootQuerySpec,
-				new SqlAliasBaseManager( tableReferences.keySet() ),
+				sqlAliasBaseGenerator,
 				new SimpleFromClauseAccessImpl(),
 				lockOptions,
 				this::visitFetches,
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java
index 6f6e364364e5..d706927b857e 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java
@@ -33,7 +33,6 @@
 import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator;
-import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.spi.SqlAstCreationContext;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlAstProcessingState;
@@ -57,7 +56,7 @@ public interface FetchProcessor {
 		ImmutableFetchList visitFetches(FetchParent fetchParent, LoaderSqlAstCreationState creationState);
 	}
 
-	private final SqlAliasBaseManager sqlAliasBaseManager;
+	private final SqlAliasBaseGenerator sqlAliasBaseManager;
 	private final boolean forceIdentifierSelection;
 	private final LoadQueryInfluencers loadQueryInfluencers;
 	private final SqlAstCreationContext sf;
@@ -72,7 +71,7 @@ public interface FetchProcessor {
 
 	public LoaderSqlAstCreationState(
 			QueryPart queryPart,
-			SqlAliasBaseManager sqlAliasBaseManager,
+			SqlAliasBaseGenerator sqlAliasBaseManager,
 			FromClauseAccess fromClauseAccess,
 			LockOptions lockOptions,
 			FetchProcessor fetchProcessor,
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java
index 8d3e2d8618e9..ddeb5dbac4a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java
@@ -24,6 +24,7 @@
 import org.hibernate.metamodel.mapping.internal.SqlTypedMappingImpl;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.spi.QueryOptionsAdapter;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
@@ -103,6 +104,7 @@ protected void loadEntitiesById(
 						session.getLoadQueryInfluencers(),
 						lockOptions,
 						jdbcParameter,
+						new SqlAliasBaseManager(),
 						getSessionFactory()
 				);
 
@@ -163,6 +165,7 @@ protected void loadEntitiesWithUnresolvedIds(
 						session.getLoadQueryInfluencers(),
 						lockOptions,
 						jdbcParameter,
+						new SqlAliasBaseManager(),
 						getSessionFactory()
 				);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderInPredicate.java
index 487fd91b074d..202d1004603d 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderInPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderInPredicate.java
@@ -15,6 +15,7 @@
 import org.hibernate.loader.ast.spi.MultiKeyLoadSizingStrategy;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.spi.QueryOptionsAdapter;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
@@ -113,6 +114,7 @@ private List<T> performRegularMultiLoad(
 						session.getLoadQueryInfluencers(),
 						lockOptions,
 						jdbcParametersBuilder::add,
+						new SqlAliasBaseManager(),
 						getSessionFactory()
 				);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java
index 18b8bbc55bf6..c450d5406e75 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadChunker.java
@@ -10,9 +10,9 @@
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.spi.ExecutionContext;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
 import org.hibernate.sql.results.spi.ManagedResultConsumer;
 
@@ -52,7 +52,7 @@ interface ChunkBoundaryListener {
 
 	private final JdbcParametersList jdbcParameters;
 	private final SelectStatement sqlAst;
-	private final JdbcOperationQuerySelect jdbcSelect;
+	private final JdbcSelect jdbcSelect;
 
 	public MultiKeyLoadChunker(
 			int chunkSize,
@@ -60,7 +60,7 @@ public MultiKeyLoadChunker(
 			Bindable bindable,
 			JdbcParametersList jdbcParameters,
 			SelectStatement sqlAst,
-			JdbcOperationQuerySelect jdbcSelect) {
+			JdbcSelect jdbcSelect) {
 		this.chunkSize = chunkSize;
 		this.keyColumnCount = keyColumnCount;
 		this.bindable = bindable;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java
index 450395721f85..2f57294f29cd 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadLogging.java
@@ -15,6 +15,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.TRACE;
 
@@ -38,7 +39,7 @@
 public interface MultiKeyLoadLogging extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".loader.multi";
 
-	MultiKeyLoadLogging MULTI_KEY_LOAD_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), MultiKeyLoadLogging.class, LOGGER_NAME );
+	MultiKeyLoadLogging MULTI_KEY_LOAD_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), MultiKeyLoadLogging.class, LOGGER_NAME, Locale.ROOT );
 
 	// Enablement messages
 	@LogMessage(level = TRACE)
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java
index 39dc23766895..d27bef273a1b 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java
@@ -17,6 +17,7 @@
 import org.hibernate.metamodel.mapping.internal.SimpleNaturalIdMapping;
 import org.hibernate.metamodel.mapping.internal.SqlTypedMappingImpl;
 import org.hibernate.query.spi.QueryOptionsAdapter;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 
@@ -71,6 +72,7 @@ public List<E> loadEntitiesWithUnresolvedIds(
 				session.getLoadQueryInfluencers(),
 				lockOptions,
 				jdbcParameter,
+				new SqlAliasBaseManager(),
 				factory
 		);
 		final var jdbcSelectOperation =
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java
index d9d723a73a18..020ee729ec30 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java
@@ -4,9 +4,6 @@
  */
 package org.hibernate.loader.ast.internal;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -15,14 +12,18 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.query.spi.QueryOptionsAdapter;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.hibernate.internal.util.collections.CollectionHelper.arrayList;
 
 /**
@@ -49,7 +50,7 @@ interface KeyValueResolver {
 
 	private final KeyValueResolver keyValueResolver;
 
-	private final JdbcOperationQuerySelect jdbcSelect;
+	private final JdbcSelect jdbcSelect;
 
 	private final LockOptions lockOptions;
 
@@ -75,6 +76,7 @@ public MultiNaturalIdLoadingBatcher(
 				loadQueryInfluencers,
 				lockOptions,
 				jdbcParametersBuilder::add,
+				new SqlAliasBaseManager(),
 				sessionFactory
 		);
 		this.jdbcParameters = jdbcParametersBuilder.build();
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderProvidedQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderProvidedQueryImpl.java
index 1f65168f7587..c4d4d430eed4 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderProvidedQueryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderProvidedQueryImpl.java
@@ -15,6 +15,7 @@
 import org.hibernate.type.descriptor.java.JavaType;
 
 import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_OBJECT_ARRAY;
+import static org.hibernate.query.ResultListTransformer.uniqueResultTransformer;
 
 /**
  * Implementation of SingleIdEntityLoader for cases where the application has
@@ -44,6 +45,7 @@ public T load(Object pkValue, LockOptions lockOptions, Boolean readOnly, SharedS
 		final var query = namedQueryMemento.toQuery( session, mappedJavaType.getJavaTypeClass() );
 		query.setParameter( (Parameter<Object>) query.getParameters().iterator().next(), pkValue );
 		query.setQueryFlushMode( QueryFlushMode.NO_FLUSH );
+		query.setResultListTransformer( uniqueResultTransformer() );
 		return query.uniqueResult();
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderStandardImpl.java
index 48e6db7f6c12..4971c747004b 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleIdEntityLoaderStandardImpl.java
@@ -14,6 +14,7 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.loader.ast.spi.CascadingFetchProfile;
 import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
 
 /**
@@ -179,6 +180,7 @@ private static <T> SingleIdLoadPlan<T> createLoadPlan(
 						influencers,
 						lockOptions,
 						jdbcParametersBuilder::add,
+						new SqlAliasBaseManager(),
 						factory
 				),
 				jdbcParametersBuilder.build(),
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java
index 166709179f7e..ed06653cd5ad 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/SingleUniqueKeyEntityLoaderStandard.java
@@ -4,8 +4,6 @@
  */
 package org.hibernate.loader.ast.internal;
 
-import java.util.List;
-
 import org.hibernate.HibernateException;
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
@@ -20,18 +18,21 @@
 import org.hibernate.metamodel.mapping.SingularAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.BaseExecutionContext;
 import org.hibernate.sql.exec.internal.CallbackImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.spi.Callback;
 import org.hibernate.sql.exec.spi.ExecutionContext;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.internal.RowTransformerSingularReturnImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 
+import java.util.List;
+
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
@@ -43,7 +44,7 @@ public class SingleUniqueKeyEntityLoaderStandard<T> implements SingleUniqueKeyEn
 	private final ModelPart uniqueKeyAttribute;
 	private final String uniqueKeyAttributePath;
 	private final JdbcParametersList jdbcParameters;
-	private final JdbcOperationQuerySelect jdbcSelect;
+	private final JdbcSelect jdbcSelect;
 
 	public SingleUniqueKeyEntityLoaderStandard(
 			EntityMappingType entityDescriptor,
@@ -66,6 +67,7 @@ public SingleUniqueKeyEntityLoaderStandard(
 				loadQueryInfluencers,
 				new LockOptions(),
 				builder::add,
+				new SqlAliasBaseManager(),
 				factory
 		);
 		jdbcParameters = builder.build();
@@ -74,11 +76,12 @@ public SingleUniqueKeyEntityLoaderStandard(
 
 	private static String getAttributePath(AttributeMapping attribute) {
 		ManagedMappingType declaringType = attribute.getDeclaringType();
-		if ( declaringType instanceof EmbeddableMappingType embeddableMappingType ) {
+		if ( declaringType instanceof EmbeddableMappingType ) {
 			final var path = new StringBuilder();
 			path.append( attribute.getAttributeName() );
 			do {
-				final var valueMapping = embeddableMappingType.getEmbeddedValueMapping();
+				// declaringType must be cast each time (not a pattern variable) as it's updated each iteration
+				final var valueMapping = ( (EmbeddableMappingType) declaringType ).getEmbeddedValueMapping();
 				attribute = valueMapping.asAttributeMapping();
 				if ( attribute == null ) {
 					break;
@@ -127,6 +130,7 @@ public Object resolveId(Object ukValue, SharedSessionContractImplementor session
 				new LoadQueryInfluencers( factory ),
 				new LockOptions(),
 				builder::add,
+				new SqlAliasBaseManager(),
 				factory
 		);
 		final var bindings = jdbcParameterBindings( ukValue, builder.build(), session );
@@ -147,7 +151,7 @@ private JdbcParameterBindings jdbcParameterBindings(
 	}
 
 	private static <T> List<T> list(
-			JdbcOperationQuerySelect jdbcSelect,
+			JdbcSelect jdbcSelect,
 			JdbcParameterBindings jdbcParameterBindings,
 			ExecutionContext executionContext) {
 		return executionContext.getSession().getJdbcServices().getJdbcSelectExecutor()
@@ -162,7 +166,7 @@ private static <T> List<T> list(
 				);
 	}
 
-	private static JdbcOperationQuerySelect getJdbcSelect
+	private static JdbcSelect getJdbcSelect
 			(SessionFactoryImplementor factory, SelectStatement sqlAst, JdbcParameterBindings jdbcParameterBindings) {
 		return factory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
 				.buildSelectTranslator( factory, sqlAst )
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java
index 7f38ed2a4ecc..e09f49de47e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/Loadable.java
@@ -36,9 +36,9 @@ default boolean isAffectedByInfluencers(LoadQueryInfluencers influencers) {
 
 	default boolean isAffectedByInfluencers(LoadQueryInfluencers influencers, boolean onlyApplyForLoadByKeyFilters) {
 		return isAffectedByEntityGraph( influencers )
-				|| isAffectedByEnabledFetchProfiles( influencers )
-				|| isAffectedByEnabledFilters( influencers, onlyApplyForLoadByKeyFilters )
-				|| isAffectedByBatchSize( influencers );
+			|| isAffectedByEnabledFetchProfiles( influencers )
+			|| isAffectedByEnabledFilters( influencers, onlyApplyForLoadByKeyFilters )
+			|| isAffectedByBatchSize( influencers );
 	}
 
 	default boolean isNotAffectedByInfluencers(LoadQueryInfluencers influencers) {
@@ -49,7 +49,7 @@ default boolean isNotAffectedByInfluencers(LoadQueryInfluencers influencers) {
 			&& influencers.getEnabledCascadingFetchProfile() == null;
 	}
 
-	private boolean isAffectedByBatchSize(LoadQueryInfluencers influencers) {
+	default boolean isAffectedByBatchSize(LoadQueryInfluencers influencers) {
 		return influencers.getBatchSize() > 0
 			&& influencers.getBatchSize() != getBatchSize();
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdEntityLoader.java
index 0063236946a9..48e5199b96a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdEntityLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdEntityLoader.java
@@ -4,13 +4,15 @@
  */
 package org.hibernate.loader.ast.spi;
 
-import java.util.List;
-
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 
-/**
- * Loader subtype for loading multiple entities by multiple identifier values.
- */
+import java.util.List;
+
+/// EntityMultiLoader implementation based on [identifier][org.hibernate.KeyType#IDENTIFIER].
+///
+/// @see org.hibernate.Session#findMultiple
+///
+/// @author Steve Ebersole
 public interface MultiIdEntityLoader<T> extends EntityMultiLoader<T> {
 	/**
 	 * Load multiple entities by id.  The exact result depends on the passed options.
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdLoadOptions.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdLoadOptions.java
index b1417d1ff3e5..eab7df01fe53 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdLoadOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiIdLoadOptions.java
@@ -7,9 +7,14 @@
 import org.hibernate.SessionCheckMode;
 import org.hibernate.engine.spi.SessionImplementor;
 
-/**
- * Encapsulation of the options for loading multiple entities by id
- */
+
+/// Encapsulation of the options for loading multiple entities (of a type)
+/// by [id][org.hibernate.KeyType#IDENTIFIER].
+///
+/// @see org.hibernate.Session#findMultiple
+/// @see MultiIdEntityLoader
+///
+/// @author Steve Ebersole
 public interface MultiIdLoadOptions extends MultiLoadOptions {
 	/**
 	 * Controls whether to check the current status of each identified entity
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoadSizingStrategy.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoadSizingStrategy.java
index 58f0573d9d66..d7a6f8fa439f 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoadSizingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiKeyLoadSizingStrategy.java
@@ -28,12 +28,10 @@
 public interface MultiKeyLoadSizingStrategy {
 	/**
 	 * Determine the optimal batch size (number of key values) to load at a time.
-	 * <p/>
+	 * <p>
 	 * The return can be less than the total {@code numberOfKeys} to be loaded indicating
 	 * that the load should be split across multiple SQL queries.  E.g. if we are loading
 	 * 7 keys and the strategy says the optimal size is 5, we will perform 2 queries.
-	 * <p/>
-	 * @apiNote
 	 *
 	 * @param numberOfKeyColumns The number of columns to which the key is mapped
 	 * @param numberOfKeys The total number of keys we need to load
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiLoadOptions.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiLoadOptions.java
index 2279ad8279c8..c84ad7039880 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiLoadOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiLoadOptions.java
@@ -8,9 +8,13 @@
 import org.hibernate.OrderingMode;
 import org.hibernate.RemovalsMode;
 
-/**
- * Base contract for options for multi-load operations
- */
+/// Encapsulation of the options for loading multiple entities (of a type)
+/// by [key][org.hibernate.KeyType].
+///
+/// @see MultiIdLoadOptions
+/// @see MultiNaturalIdLoadOptions
+///
+/// @author Steve Ebersole
 public interface MultiLoadOptions {
 	/**
 	 * How should entities in removed status be handled.
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoadOptions.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoadOptions.java
index 48ce0b5dc67b..f8d635636546 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoadOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoadOptions.java
@@ -4,8 +4,11 @@
  */
 package org.hibernate.loader.ast.spi;
 
-/**
- * Encapsulation of the options for loading multiple entities by natural-id
- */
+/// Encapsulation of the options for loading multiple entities (of a type)
+/// by [natural-id][org.hibernate.KeyType#NATURAL].
+///
+/// @see MultiNaturalIdLoader
+///
+/// @author Steve Ebersole
 public interface MultiNaturalIdLoadOptions extends MultiLoadOptions {
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoader.java
index 4aa96b303666..7f3c6bb4f8f3 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/MultiNaturalIdLoader.java
@@ -4,25 +4,25 @@
  */
 package org.hibernate.loader.ast.spi;
 
-import java.util.List;
-
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 
-/**
- * Loader for entities by multiple natural-ids
- *
- * @param <E> The entity Java type
- */
+import java.util.List;
+
+/// EntityMultiLoader implementation based on [identifier][org.hibernate.KeyType#NATURAL].
+///
+/// @param <E> The entity Java type
+///
+/// @see org.hibernate.Session#findMultiple
+///
+/// @author Steve Ebersole
 public interface MultiNaturalIdLoader<E> extends EntityMultiLoader<E> {
-	/**
-	 * Load multiple entities by natural-id.  The exact result depends on the passed options.
-	 *
-	 * @param naturalIds The natural-ids to load.  The values of this array will depend on whether the
-	 * natural-id is simple or complex.
-	 *
-	 * @param <K> The basic form for a natural-id is a Map of its attribute values, or an array of the
-	 * values positioned according to "attribute ordering".  Simple natural-ids can also be expressed
-	 * by their simple (basic/embedded) type.
-	 */
+	/// Load multiple entities by natural-id.  The exact result depends on the passed options.
+	///
+	/// @param naturalIds The natural-ids to load.  The values of this array will depend on whether the
+	/// natural-id is simple or complex.
+	///
+	/// @param <K> The basic form for a natural-id is a Map of its attribute values, or an array of the
+	/// values positioned according to "attribute ordering".  Simple natural-ids can also be expressed
+	/// by their simple (basic/embedded) type.
 	<K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions options, SharedSessionContractImplementor session);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoader.java
index 9333140979de..388c4e52a0d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/spi/NaturalIdLoader.java
@@ -4,30 +4,46 @@
  */
 package org.hibernate.loader.ast.spi;
 
+import jakarta.persistence.Timeout;
+import org.hibernate.LockMode;
+import org.hibernate.Locking;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 
-/**
- * Loader for {@link org.hibernate.annotations.NaturalId} handling
- *
- * @author Steve Ebersole
- */
+/// Loader for [org.hibernate.annotations.NaturalId]
+///
+/// @author Steve Ebersole
 public interface NaturalIdLoader<T> extends EntityLoader, MultiKeyLoader {
+	interface Options {
+		LockMode getLockMode();
+		Timeout getLockTimeout();
+		Locking.Scope getLockScope();
+		Locking.FollowOn getLockFollowOn();
+	}
 
-	/**
-	 * Perform the load of the entity by its natural-id
-	 *
-	 * @param naturalIdToLoad The natural-id to load.  One of 2 forms accepted:
-	 *		* Single-value - valid for entities with a simple (single-valued)
-	 *			natural-id
-	 *		* Map - valid for any natural-id load.  The map is each value keyed
-	 *			by the attribute name that the value corresponds to.  Even though
-	 *			this form is allowed for simple natural-ids, the single value form
-	 *			should be used as it is more efficient
-	 * @param options The options to apply to the load operation
-	 * @param session The session into which the entity is being loaded
-	 */
+	/// Perform the load of the entity by its natural-id
+	///
+	/// @param naturalIdToLoad The natural-id to load.  One of 2 forms accepted:
+	///		* Single-value - valid for entities with a simple (single-valued)
+	///			natural-id
+	///		* Map - valid for any natural-id load.  The map is each value keyed
+	///			by the attribute name that the value corresponds to.  Even though
+	///			this form is allowed for simple natural-ids, the single value form
+	///			should be used as it is more efficient
+	/// @param options The options to apply to the load operation
+	/// @param session The session into which the entity is being loaded
+	///
+	/// @deprecated (since 7.3) : use [#load(Object, Options, SharedSessionContractImplementor)] instead.
+	@Deprecated
 	T load(Object naturalIdToLoad, NaturalIdLoadOptions options, SharedSessionContractImplementor session);
 
+	/// Perform the load of the entity by its natural-id
+	///
+	/// @param naturalIdToLoad The [normalized][org.hibernate.metamodel.mapping.NaturalIdMapping#normalizeInput]
+	/// 	form of the natural-id.
+	/// @param options The options to apply to the load operation
+	/// @param session The session into which the entity is being loaded
+	T load(Object naturalIdToLoad, Options options, SharedSessionContractImplementor session);
+
 	/**
 	 * Resolve the id from natural-id value
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java
index 14685b1c9ba7..1de0d68f623f 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/BaseNaturalIdLoadAccessImpl.java
@@ -15,6 +15,7 @@
 import org.hibernate.IdentifierLoadAccess;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
+import org.hibernate.Locking;
 import org.hibernate.UnknownProfileException;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.Status;
@@ -70,6 +71,14 @@ protected Object with(LockMode lockMode, PessimisticLockScope lockScope) {
 		return this;
 	}
 
+	protected Object with(Locking.Scope lockScope) {
+		if ( lockOptions == null ) {
+			lockOptions = new LockOptions();
+		}
+		lockOptions.setScope( lockScope );
+		return this;
+	}
+
 
 	protected Object with(Timeout timeout) {
 		if ( lockOptions == null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java
index f8d38d956b43..6bb5a3423a2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/IdentifierLoadAccessImpl.java
@@ -26,8 +26,6 @@
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 
@@ -37,7 +35,7 @@
  * @author Steve Ebersole
  */
 // Hibernate Reactive extends this class: see ReactiveIdentifierLoadAccessImpl
-public class IdentifierLoadAccessImpl<T> implements IdentifierLoadAccess<T>, JavaType.CoercionContext {
+public class IdentifierLoadAccessImpl<T> implements IdentifierLoadAccess<T> {
 	private final LoadAccessContext context;
 	private final EntityPersister entityPersister;
 
@@ -196,7 +194,10 @@ protected Object coerceId(Object id, SessionFactoryImplementor factory) {
 		}
 		else {
 			try {
-				return entityPersister.getIdentifierMapping().getJavaType().coerce( id, this );
+				final var identifierMapping = entityPersister.getIdentifierMapping();
+				return identifierMapping.isVirtual()
+						? id // special case for a class with an @IdClass
+						: identifierMapping.getJavaType().coerce( id );
 			}
 			catch ( Exception e ) {
 				throw new IllegalArgumentException( "Argument '" + id
@@ -230,11 +231,6 @@ private static boolean isLoadByIdComplianceEnabled(SessionFactoryImplementor fac
 		return factory.getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled();
 	}
 
-	@Override
-	public TypeConfiguration getTypeConfiguration() {
-		return context.getSession().getSessionFactory().getTypeConfiguration();
-	}
-
 	@Override
 	public IdentifierLoadAccess<T> enableFetchProfile(String profileName) {
 		if ( !context.getSession().getFactory().containsFetchProfileDefinition( profileName ) ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/SimpleNaturalIdLoadAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/SimpleNaturalIdLoadAccessImpl.java
index f041771aaa06..c083911ffed7 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/internal/SimpleNaturalIdLoadAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/SimpleNaturalIdLoadAccessImpl.java
@@ -16,10 +16,12 @@
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
+import org.hibernate.Locking;
 import org.hibernate.SimpleNaturalIdLoadAccess;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.internal.SimpleNaturalIdMapping;
+import org.hibernate.persister.entity.EntityPersister;
 
 /**
  * Implementation of {@link SimpleNaturalIdLoadAccess}.
@@ -57,6 +59,11 @@ public SimpleNaturalIdLoadAccess<T> with(LockMode lockMode, PessimisticLockScope
 		return (SimpleNaturalIdLoadAccess<T>) super.with( lockMode, lockScope );
 	}
 
+	public SimpleNaturalIdLoadAccess<T> with(Locking.Scope lockScope) {
+		super.with( lockScope );
+		return this;
+	}
+
 	@Override
 	public SimpleNaturalIdLoadAccess<T> with(Timeout timeout) {
 		//noinspection unchecked
@@ -99,7 +106,8 @@ private void verifySimplicity(Object naturalIdValue) {
 		if ( !hasSimpleNaturalId
 				&& !naturalIdValue.getClass().isArray()
 				&& !(naturalIdValue instanceof List)
-				&& !(naturalIdValue instanceof Map) ) {
+				&& !(naturalIdValue instanceof Map)
+				&& ! ( isNaturalIdClass( naturalIdValue ) ) ) {
 			throw new HibernateException(
 					String.format(
 							Locale.ROOT,
@@ -111,6 +119,11 @@ private void verifySimplicity(Object naturalIdValue) {
 		}
 	}
 
+	private boolean isNaturalIdClass(Object naturalIdValue) {
+		final EntityPersister entityPersister = entityPersister();
+		return entityPersister.getNaturalIdMapping().getNaturalIdClass().isInstance(  naturalIdValue );
+	}
+
 	@Override
 	public Optional<T> loadOptional(Object naturalIdValue) {
 		return Optional.ofNullable( load( naturalIdValue ) );
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Any.java b/hibernate-core/src/main/java/org/hibernate/mapping/Any.java
index 71ca1269e581..fb9974ffe733 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Any.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Any.java
@@ -8,6 +8,7 @@
 import org.hibernate.MappingException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.spi.ImplicitDiscriminatorStrategy;
 import org.hibernate.type.AnyType;
 import org.hibernate.type.MappingContext;
@@ -35,7 +36,7 @@ public class Any extends SimpleValue {
 	private BasicValue keyDescriptor;
 
 	// common
-	private Map<Object,String> metaValueToEntityNameMap;
+	private Map<DiscriminatorValue,String> metaValueToEntityNameMap;
 	private ImplicitDiscriminatorStrategy implicitValueStrategy;
 	private boolean lazy = true;
 
@@ -157,7 +158,7 @@ public void addFormula(Formula formula) {
 	private void applySelectableLocally(Selectable selectable) {
 		// note: adding column to meta or key mapping ultimately calls back into `#applySelectableToSuper`
 		//		to add the column to the ANY super.
-		if ( discriminatorDescriptor == null && getColumnSpan() == 0 ) {
+		if ( discriminatorDescriptor == null && !hasColumns() ) {
 			if ( selectable instanceof Column column ) {
 				metaMapping.addColumn( column );
 			}
@@ -183,11 +184,11 @@ public void setMetaType(String type) {
 		metaMapping.setTypeName( type );
 	}
 
-	public Map<Object,String> getMetaValues() {
+	public Map<DiscriminatorValue,String> getMetaValues() {
 		return metaValueToEntityNameMap;
 	}
 
-	public void setMetaValues(Map<Object,String> metaValueToEntityNameMap) {
+	public void setMetaValues(Map<DiscriminatorValue,String> metaValueToEntityNameMap) {
 		this.metaValueToEntityNameMap = metaValueToEntityNameMap;
 	}
 
@@ -247,7 +248,7 @@ public boolean isValid(MappingContext mappingContext) throws MappingException {
 	}
 
 	private static String columnName(Column column, MetadataBuildingContext buildingContext) {
-		final JdbcServices jdbcServices =
+		final var jdbcServices =
 				buildingContext.getBootstrapContext().getServiceRegistry()
 						.requireService( JdbcServices.class );
 		return column.getQuotedName( jdbcServices.getDialect() );
@@ -267,7 +268,7 @@ public void setDiscriminator(BasicValue discriminatorDescriptor) {
 		}
 	}
 
-	public void setDiscriminatorValueMappings(Map<Object, Class<?>> discriminatorValueMappings) {
+	public void setDiscriminatorValueMappings(Map<DiscriminatorValue, Class<?>> discriminatorValueMappings) {
 		metaValueToEntityNameMap = new HashMap<>();
 		discriminatorValueMappings.forEach( (value, entity) -> metaValueToEntityNameMap.put( value, entity.getName() ) );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
index ff4db8c1906e..40069d60b765 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
@@ -4,15 +4,23 @@
  */
 package org.hibernate.mapping;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.ParameterizedType;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import org.hibernate.AnnotationException;
+import org.hibernate.AssertionFailure;
 import org.hibernate.Incubating;
 import org.hibernate.Internal;
 import org.hibernate.MappingException;
+import org.hibernate.boot.model.internal.Constructors;
+import org.hibernate.models.spi.MemberDetails;
+import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.TimeZoneStorageStrategy;
 import org.hibernate.annotations.SoftDelete;
 import org.hibernate.annotations.SoftDeleteType;
@@ -63,15 +71,17 @@
 import org.hibernate.type.internal.ConvertedBasicTypeImpl;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.hibernate.type.spi.TypeConfigurationAware;
+import org.hibernate.usertype.AnnotationBasedUserType;
 import org.hibernate.usertype.DynamicParameterizedType;
 import org.hibernate.usertype.UserType;
 
-import com.fasterxml.classmate.ResolvedType;
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.TemporalType;
+import org.hibernate.usertype.UserTypeCreationContext;
 
 import static java.lang.Boolean.parseBoolean;
+import static org.hibernate.internal.util.GenericAssignability.isAssignableFrom;
 import static org.hibernate.boot.model.convert.spi.ConverterDescriptor.TYPE_NAME_PREFIX;
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
 import static org.hibernate.internal.util.ReflectHelper.reflectedPropertyType;
@@ -83,6 +93,7 @@
 
 /**
  * @author Steve Ebersole
+ * @author Yanming Zhou
  */
 public class BasicValue extends SimpleValue
 		implements JdbcTypeIndicators, Resolvable, JpaAttributeConverterCreationContext {
@@ -145,6 +156,7 @@ public BasicValue(BasicValue original) {
 		this.isSoftDelete = original.isSoftDelete;
 		this.softDeleteStrategy = original.softDeleteStrategy;
 		this.aggregateColumn = original.aggregateColumn;
+		this.jdbcTypeCode = original.jdbcTypeCode;
 	}
 
 	@Override
@@ -215,8 +227,24 @@ public void setImplicitJavaTypeAccess(Function<TypeConfiguration, java.lang.refl
 		this.implicitJavaTypeAccess = implicitJavaTypeAccess;
 	}
 
+	public Function<TypeConfiguration, BasicJavaType<?>> getExplicitJavaTypeAccess() {
+		return explicitJavaTypeAccess;
+	}
+
+	public Function<TypeConfiguration, JdbcType> getExplicitJdbcTypeAccess() {
+		return explicitJdbcTypeAccess;
+	}
+
+	public Function<TypeConfiguration, MutabilityPlan<?>> getExplicitMutabilityPlanAccess() {
+		return explicitMutabilityPlanAccess;
+	}
+
+	public Function<TypeConfiguration, java.lang.reflect.Type> getImplicitJavaTypeAccess() {
+		return implicitJavaTypeAccess;
+	}
+
 	public Selectable getColumn() {
-		return getColumnSpan() == 0 ? null : getColumn( 0 );
+		return hasColumns() ? getColumn( 0 ) : null;
 	}
 
 	public java.lang.reflect.Type getResolvedJavaType() {
@@ -476,18 +504,17 @@ private ConverterDescriptor<Boolean,?> getSoftDeleteConverterDescriptor(
 				SoftDelete.UnspecifiedConversion.class.equals( attributeConverterDescriptor.getAttributeConverterClass() );
 		if ( conversionWasUnspecified ) {
 			final var jdbcType = BooleanJdbcType.INSTANCE.resolveIndicatedType( this, javaType );
-			final var classmateContext = getBootstrapContext().getClassmateContext();
 			if ( jdbcType.isNumber() ) {
-				return ConverterDescriptors.of( NumericBooleanConverter.INSTANCE, classmateContext );
+				return ConverterDescriptors.of( NumericBooleanConverter.INSTANCE );
 			}
 			else if ( jdbcType.isString() ) {
 				// here we pick 'T' / 'F' storage, though 'Y' / 'N' is equally valid - its 50/50
-				return ConverterDescriptors.of( TrueFalseConverter.INSTANCE, classmateContext );
+				return ConverterDescriptors.of( TrueFalseConverter.INSTANCE );
 			}
 			else {
 				// should indicate BIT or BOOLEAN == no conversion needed
 				//		- we still create the converter to properly set up JDBC type, etc
-				return ConverterDescriptors.of( PassThruSoftDeleteConverter.INSTANCE, classmateContext );
+				return ConverterDescriptors.of( PassThruSoftDeleteConverter.INSTANCE );
 			}
 		}
 		else {
@@ -509,12 +536,12 @@ public Class<? extends AttributeConverter<Boolean,R>> getAttributeConverterClass
 		}
 
 		@Override
-		public ResolvedType getDomainValueResolvedType() {
+		public java.lang.reflect.Type getDomainValueResolvedType() {
 			return underlyingDescriptor.getDomainValueResolvedType();
 		}
 
 		@Override
-		public ResolvedType getRelationalValueResolvedType() {
+		public java.lang.reflect.Type getRelationalValueResolvedType() {
 			return underlyingDescriptor.getRelationalValueResolvedType();
 		}
 
@@ -612,14 +639,14 @@ public Boolean convertToEntityAttribute(Boolean relationalValue) {
 		}
 	}
 
-	private <T> Resolution<?> resolution(BasicJavaType explicitJavaType, JavaType<T> javaType) {
-		final JavaType<T> basicJavaType;
+	private Resolution<?> resolution(BasicJavaType explicitJavaType, JavaType<?> javaType) {
+		final JavaType<?> basicJavaType;
 		final JdbcType jdbcType;
 		if ( explicitJdbcTypeAccess != null ) {
 			final var typeConfiguration = getTypeConfiguration();
 			jdbcType = explicitJdbcTypeAccess.apply( typeConfiguration );
 			basicJavaType = javaType == null && jdbcType != null
-					? jdbcType.getJdbcRecommendedJavaTypeMapping( null, null, typeConfiguration )
+					? jdbcType.getRecommendedJavaType( null, null, typeConfiguration )
 					: javaType;
 		}
 		else {
@@ -630,7 +657,7 @@ private <T> Resolution<?> resolution(BasicJavaType explicitJavaType, JavaType<T>
 			throw new MappingException( "Unable to determine JavaType to use : " + this );
 		}
 
-		if ( basicJavaType instanceof BasicJavaType<T> castType
+		if ( basicJavaType instanceof BasicJavaType<?> castType
 				&& ( !basicJavaType.getJavaTypeClass().isEnum() || enumerationStyle == null ) ) {
 			final var context = getBuildingContext();
 			final var autoAppliedTypeDef = context.getTypeDefinitionRegistry().resolveAutoApplied( castType );
@@ -673,8 +700,8 @@ private Resolution<?> converterResolution(JavaType<?> javaType, ConverterDescrip
 		);
 
 		if ( javaType instanceof BasicPluralJavaType<?> pluralJavaType
-				&& !attributeConverterDescriptor.getDomainValueResolvedType().getErasedType()
-						.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+				&& !isAssignableFrom( attributeConverterDescriptor.getDomainValueResolvedType(),
+						javaType.getJavaTypeClass() ) ) {
 			// In this case, the converter applies to the element of a BasicPluralJavaType
 			final BasicType registeredElementType = converterResolution.getLegacyResolvedBasicType();
 			final BasicType<?> registeredType = registeredElementType == null ? null
@@ -779,7 +806,7 @@ private JavaType<?> specialJavaType(
 					return xmlJavaType;
 			}
 		}
-		return javaTypeRegistry.getDescriptor( impliedJavaType );
+		return javaTypeRegistry.resolveDescriptor( impliedJavaType );
 	}
 
 	private MutabilityPlan<?> mutabilityPlan(
@@ -1030,6 +1057,10 @@ public void setExplicitTypeParams(Map<String,String> explicitLocalTypeParams) {
 		this.explicitLocalTypeParams = explicitLocalTypeParams;
 	}
 
+	public Map<String, String> getExplicitTypeParams() {
+		return explicitLocalTypeParams;
+	}
+
 	public void setExplicitTypeName(String typeName) {
 		this.explicitTypeName = typeName;
 	}
@@ -1055,19 +1086,20 @@ public void setExplicitCustomType(Class<? extends UserType<?>> explicitCustomTyp
 				throw new UnsupportedOperationException( "Unsupported attempt to set an explicit-custom-type when value is already resolved" );
 			}
 			else {
+				final var parameters = buildCustomTypeProperties();
 				resolution = new UserTypeResolution<>(
 						new CustomType<>(
-								getConfiguredUserTypeBean( explicitCustomType, getCustomTypeProperties() ),
+								getConfiguredUserTypeBean( explicitCustomType, getTypeAnnotation(), parameters ),
 								getTypeConfiguration()
 						),
 						null,
-						getCustomTypeProperties()
+						parameters
 				);
 			}
 		}
 	}
 
-	private Properties getCustomTypeProperties() {
+	private Properties buildCustomTypeProperties() {
 		final var properties = new Properties();
 		if ( isNotEmpty( getTypeParameters() ) ) {
 			properties.putAll( getTypeParameters() );
@@ -1078,29 +1110,139 @@ private Properties getCustomTypeProperties() {
 		return properties;
 	}
 
-	private UserType<?> getConfiguredUserTypeBean(Class<? extends UserType<?>> explicitCustomType, Properties properties) {
+	private UserType<?> getConfiguredUserTypeBean(
+			Class<? extends UserType<?>> explicitCustomType,
+			Annotation typeAnnotation, Properties parameters) {
 		final var typeInstance =
-				getBuildingContext().getBuildingOptions().isAllowExtensionsInCdi()
-						? getUserTypeBean( explicitCustomType, properties ).getBeanInstance()
-						: FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( explicitCustomType );
-
+				createUserTypeInstance( explicitCustomType, parameters, typeAnnotation );
 		if ( typeInstance instanceof TypeConfigurationAware configurationAware ) {
 			configurationAware.setTypeConfiguration( getTypeConfiguration() );
 		}
+		addParameterType( parameters, typeInstance );
+		injectParameters( typeInstance, parameters );
+		// envers - grr
+		setTypeParameters( parameters );
+		return typeInstance;
+	}
+
+	private UserType<?> createUserTypeInstance(
+			Class<? extends UserType<?>> customType,
+			Properties parameters,
+			Annotation typeAnnotation) {
+		final var creationContext = new TypeCreationContext( parameters );
+		final var typeInstance = instantiateUserType( customType, typeAnnotation, creationContext );
+		if ( typeInstance instanceof AnnotationBasedUserType<?, ?> annotationBased ) {
+			initializeAnnotationBasedUserType( typeAnnotation, annotationBased, creationContext );
+		}
+		return typeInstance;
+	}
+
+	private void addParameterType(Properties properties, UserType<?> typeInstance) {
+		if ( typeInstance instanceof DynamicParameterizedType
+				&& parseBoolean( properties.getProperty( DynamicParameterizedType.IS_DYNAMIC ) )
+				&& properties.get( DynamicParameterizedType.PARAMETER_TYPE ) == null ) {
+			properties.put( DynamicParameterizedType.PARAMETER_TYPE, createParameterType() );
+		}
+	}
+
+	private <A extends Annotation> void initializeAnnotationBasedUserType(
+			Annotation typeAnnotation,
+			AnnotationBasedUserType<A, ?> annotationBased,
+			UserTypeCreationContext creationContext) {
+		if ( typeAnnotation == null ) {
+			throw new AnnotationException( String.format(
+					"Custom type '%s' implements 'AnnotationBasedUserType' but no custom type annotation is present",
+					annotationBased.getClass().getName() ) );
+		}
+		annotationBased.initialize( castAnnotationType( typeAnnotation, annotationBased ), creationContext );
+	}
+
+	private class TypeCreationContext implements UserTypeCreationContext {
+		private final Properties parameters;
 
-		if ( typeInstance instanceof DynamicParameterizedType ) {
-			if ( parseBoolean( properties.getProperty( DynamicParameterizedType.IS_DYNAMIC ) ) ) {
-				if ( properties.get( DynamicParameterizedType.PARAMETER_TYPE ) == null ) {
-					properties.put( DynamicParameterizedType.PARAMETER_TYPE, createParameterType() );
+		private TypeCreationContext(Properties parameters) {
+			this.parameters = parameters;
+		}
+
+		@Override
+		public MetadataBuildingContext getBuildingContext() {
+			return BasicValue.this.getBuildingContext();
+		}
+
+		@Override
+		public ServiceRegistry getServiceRegistry() {
+			return BasicValue.this.getServiceRegistry();
+		}
+
+		@Override
+		public MemberDetails getMemberDetails() {
+			return BasicValue.this.getMemberDetails();
+		}
+
+		@Override
+		public Properties getParameters() {
+			return parameters;
+		}
+	}
+
+	private <A extends Annotation> A castAnnotationType(
+			Annotation typeAnnotation, AnnotationBasedUserType<A, ?> annotationBased ) {
+		final var annotationType = annotationBased.getClass();
+		for ( var iface: annotationType.getGenericInterfaces() ) {
+			if ( iface instanceof ParameterizedType parameterizedType
+				&& parameterizedType.getRawType() == AnnotationBasedUserType.class ) {
+				final var typeArguments = parameterizedType.getActualTypeArguments();
+				if ( typeArguments.length > 0
+					&& typeArguments[0] instanceof Class<?> annotationClass ) {
+					if ( !annotationClass.isInstance( typeAnnotation ) ) {
+						throw new AnnotationException( String.format( "Annotation '%s' is not assignable to '%s'",
+								annotationType.getName(), iface.getTypeName() ) );
+					}
+					@SuppressWarnings("unchecked") // safe, we just checked it
+					final var castAnnotation = (A) typeAnnotation;
+					return castAnnotation;
 				}
 			}
 		}
+		throw new AssertionFailure( "Could not find implementing interface" );
+	}
 
-		injectParameters( typeInstance, properties );
-		// envers - grr
-		setTypeParameters( properties );
+	private <T extends UserType<?>, A extends Annotation> T instantiateUserType(
+			Class<T> customType, A typeAnnotation,
+			UserTypeCreationContext creationContext) {
+		try {
+			T userType;
+			if ( typeAnnotation != null ) {
+				@SuppressWarnings("unchecked") // totally safe
+				final var annotationType = (Class<A>) typeAnnotation.annotationType();
+				// attempt to instantiate it with the annotation and context object as constructor arguments
+				userType =
+						Constructors.construct( customType,
+								annotationType, typeAnnotation,
+								UserTypeCreationContext.class, creationContext );
+				if ( userType != null ) {
+					return userType;
+				}
+				// attempt to instantiate it with the annotation as a constructor argument
+				userType = Constructors.construct( customType, annotationType, typeAnnotation );
+				if ( userType != null ) {
+					return userType;
+				}
+			}
 
-		return typeInstance;
+			// attempt to instantiate it with the context object as a constructor argument
+			userType = Constructors.construct( customType, UserTypeCreationContext.class, creationContext );
+			if ( userType != null ) {
+				return userType;
+			}
+		}
+		catch (InvocationTargetException | InstantiationException | IllegalAccessException e) {
+			throw new org.hibernate.InstantiationException( "Could not instantiate custom type", customType, e );
+		}
+
+		return getBuildingContext().getBuildingOptions().isAllowExtensionsInCdi()
+				? getUserTypeBean( customType, creationContext.getParameters() ).getBeanInstance()
+				: FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( customType );
 	}
 
 	private <T> ManagedBean<? extends T> getUserTypeBean(Class<T> explicitCustomType, Properties properties) {
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
index df98cf2be022..4af5c8b9b276 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
@@ -17,6 +17,7 @@
 import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.jdbc.Expectation;
+import org.hibernate.persister.state.spi.StateManagement;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.CollectionType;
@@ -27,8 +28,10 @@
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.function.Supplier;
@@ -101,9 +104,15 @@ public abstract sealed class Collection
 	private String customSQLDeleteAll;
 	private boolean customDeleteAllCallable;
 
-	private Column softDeleteColumn;
 	private SoftDeleteType softDeleteStrategy;
 
+	private Class<? extends StateManagement> stateManagementType;
+	private Table auxiliaryTable;
+	private boolean partitioned;
+	private Map<String, Column> auxiliaryColumns;
+	private String auxiliaryColumnInPrimaryKey;
+	private boolean primaryKeyDisabled;
+
 	private String loaderName;
 
 	private Supplier<? extends Expectation> insertExpectation;
@@ -177,6 +186,16 @@ protected Collection(Collection original) {
 		this.deleteExpectation = original.deleteExpectation;
 		this.deleteAllExpectation = original.deleteAllExpectation;
 		this.loaderName = original.loaderName;
+		this.auxiliaryTable = original.auxiliaryTable;
+		this.auxiliaryColumns = original.auxiliaryColumns == null ? null : new HashMap<>( original.auxiliaryColumns );
+		this.stateManagementType = original.stateManagementType;
+		this.auxiliaryColumnInPrimaryKey = original.auxiliaryColumnInPrimaryKey;
+		this.primaryKeyDisabled = original.primaryKeyDisabled;
+		this.softDeleteStrategy = original.softDeleteStrategy;
+		this.partitioned = original.partitioned;
+		this.queryCacheLayout = original.queryCacheLayout;
+		this.cachedCollectionType = original.cachedCollectionType;
+		this.cachedCollectionSemantics = original.cachedCollectionSemantics;
 	}
 
 	@Override
@@ -396,7 +415,7 @@ public void validate(MappingContext mappingContext) throws MappingException {
 
 	private void checkColumnDuplication() throws MappingException {
 		final String owner = "collection '" + getReferencedPropertyName() + "'";
-		final HashSet<String> cols = new HashSet<>();
+		final HashSet<QualifiedColumnName> cols = new HashSet<>();
 		getKey().checkColumnDuplication( cols, owner );
 		if ( isIndexed() ) {
 			( (IndexedCollection) this ).getIndex().checkColumnDuplication( cols, owner );
@@ -424,6 +443,11 @@ public int getColumnSpan() {
 		return 0;
 	}
 
+	@Override
+	public boolean hasColumns() {
+		return false;
+	}
+
 	@Override
 	public Type getType() throws MappingException {
 		return getCollectionType();
@@ -557,11 +581,55 @@ private void createForeignKeys() throws MappingException {
 
 	public void createAllKeys() throws MappingException {
 		createForeignKeys();
-		if ( !isInverse() ) {
+		if ( !isInverse() && !isPrimaryKeyDisabled() ) {
 			createPrimaryKey();
+			adjustTemporalPrimaryKey();
+		}
+	}
+
+	private void adjustTemporalPrimaryKey() {
+		if ( isAuxiliaryColumnInPrimaryKey() ) {
+			final var startingColumn = getAuxiliaryColumn( auxiliaryColumnInPrimaryKey );
+			if ( startingColumn != null ) {
+				final var primaryKey = collectionTable.getPrimaryKey();
+				if ( primaryKey != null ) {
+					if ( !primaryKey.containsColumn( startingColumn ) ) {
+						primaryKey.addColumn( startingColumn );
+					}
+				}
+				// TODO: we should probably only do this for the UK created in
+				//       Set.createPrimaryKey() and not one the user defined
+				else if ( !collectionTable.getUniqueKeys().isEmpty() ) {
+					for ( var uniqueKey : collectionTable.getUniqueKeys().values() ) {
+						if ( !uniqueKey.containsColumn( startingColumn ) ) {
+							uniqueKey.addColumn( startingColumn );
+						}
+					}
+				}
+			}
 		}
 	}
 
+	@Override
+	public boolean isPrimaryKeyDisabled() {
+		return primaryKeyDisabled;
+	}
+
+	@Override
+	public void setPrimaryKeyDisabled(boolean disabled) {
+		this.primaryKeyDisabled = disabled;
+	}
+
+	@Override
+	public void setAuxiliaryColumnInPrimaryKey(String key) {
+		this.auxiliaryColumnInPrimaryKey = key;
+	}
+
+	@Override
+	public boolean isAuxiliaryColumnInPrimaryKey() {
+		return auxiliaryColumnInPrimaryKey != null;
+	}
+
 	public String getCacheConcurrencyStrategy() {
 		return cacheConcurrencyStrategy;
 	}
@@ -770,6 +838,14 @@ public boolean[] getColumnUpdateability() {
 		return EMPTY_BOOLEAN_ARRAY;
 	}
 
+	@Override
+	public void setNonInsertable() {
+	}
+
+	@Override
+	public void setNonUpdatable() {
+	}
+
 	@Override
 	public boolean hasAnyUpdatableColumns() {
 		return false;
@@ -831,7 +907,7 @@ public boolean isColumnUpdateable(int index) {
 
 	@Override
 	public void enableSoftDelete(Column indicatorColumn, SoftDeleteType strategy) {
-		this.softDeleteColumn = indicatorColumn;
+		SoftDeletable.super.enableSoftDelete( indicatorColumn, strategy );
 		this.softDeleteStrategy = strategy;
 	}
 
@@ -841,8 +917,18 @@ public SoftDeleteType getSoftDeleteStrategy() {
 	}
 
 	@Override
-	public Column getSoftDeleteColumn() {
-		return softDeleteColumn;
+	public Table getMainTable() {
+		return collectionTable;
+	}
+
+	@Override
+	public boolean isMainTablePartitioned() {
+		return partitioned;
+	}
+
+	@Override
+	public void setMainTablePartitioned(boolean partitioned) {
+		this.partitioned = partitioned;
 	}
 
 	public Supplier<? extends Expectation> getInsertExpectation() {
@@ -881,4 +967,32 @@ public void setDeleteAllExpectation(Supplier<? extends Expectation> deleteAllExp
 	public boolean isPartitionKey() {
 		return false;
 	}
+
+	public void setStateManagementType(Class<? extends StateManagement> stateManagementType) {
+		this.stateManagementType = stateManagementType;
+	}
+
+	public Class<? extends StateManagement> getStateManagementType() {
+		return stateManagementType;
+	}
+
+	public Table getAuxiliaryTable() {
+		return auxiliaryTable;
+	}
+
+	public void setAuxiliaryTable(Table auxiliaryTable) {
+		this.auxiliaryTable = auxiliaryTable;
+	}
+
+	public Column getAuxiliaryColumn(String column) {
+		return auxiliaryColumns == null ? null
+				: auxiliaryColumns.get( column );
+	}
+
+	public void addAuxiliaryColumn(String name, Column column) {
+		if ( auxiliaryColumns == null ) {
+			auxiliaryColumns = new HashMap<>();
+		}
+		auxiliaryColumns.put( name, column );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java
index f72ee0bea568..8c96785fa58d 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java
@@ -10,6 +10,7 @@
 import java.util.Locale;
 import java.util.Objects;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.AssertionFailure;
 import org.hibernate.Internal;
 import org.hibernate.MappingException;
@@ -30,9 +31,6 @@
 import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.JdbcTypeNameMapper;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
-import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
-import org.hibernate.type.descriptor.sql.DdlType;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import org.hibernate.type.MappingContext;
 import org.hibernate.type.spi.TypeConfiguration;
 
@@ -141,8 +139,12 @@ public void setName(String name) {
 
 	@Internal
 	public Identifier getNameIdentifier(MetadataBuildingContext buildingContext) {
-		return buildingContext.getMetadataCollector().getDatabase()
-				.toIdentifier( getQuotedName() );
+		return getNameIdentifier( buildingContext.getMetadataCollector().getDatabase() );
+	}
+
+	@Internal
+	public Identifier getNameIdentifier(Database database) {
+		return database.toIdentifier( getQuotedName() );
 	}
 
 	public boolean isExplicit() {
@@ -195,35 +197,42 @@ public String getQuotedName(Dialect dialect) {
 
 	@Override
 	public String getAlias(Dialect dialect) {
-		final int lastLetter = lastIndexOfLetter( name );
 		final String suffix = AliasConstantsHelper.get( uniqueInteger );
+		return qualifyAlias( dialect, suffix, aliasRoot() );
+	}
 
-		final String alias;
+	private @NonNull String aliasRoot() {
+		final int lastLetter = lastIndexOfLetter( name );
 		if ( lastLetter == -1 ) {
-			alias = "column";
+			return "column";
 		}
 		else {
 			final String lowerCaseName = name.toLowerCase( Locale.ROOT );
-			alias = lowerCaseName.length() > lastLetter + 1
+			return lowerCaseName.length() > lastLetter + 1
 					? lowerCaseName.substring( 0, lastLetter + 1 )
 					: lowerCaseName;
 		}
+	}
 
+	private @NonNull String qualifyAlias(Dialect dialect, String suffix, String alias) {
+		final int suffixLength = suffix.length();
+		final int maxAliasLength = dialect.getMaxAliasLength();
+		final int freeLength = maxAliasLength - suffixLength;
 		final boolean useRawName =
-				name.length() + suffix.length() <= dialect.getMaxAliasLength()
+				name.length() <= freeLength
 				&& !quoted
 				&& !name.equalsIgnoreCase( dialect.rowId(null) );
 		if ( !useRawName ) {
-			if ( suffix.length() >= dialect.getMaxAliasLength() ) {
+			if ( suffixLength >= maxAliasLength ) {
 				throw new MappingException(
 						String.format(
 								"Unique suffix [%s] length must be less than maximum [%d]",
-								suffix, dialect.getMaxAliasLength()
+								suffix, maxAliasLength
 						)
 				);
 			}
-			if ( alias.length() + suffix.length() > dialect.getMaxAliasLength() ) {
-				return alias.substring( 0, dialect.getMaxAliasLength() - suffix.length() ) + suffix;
+			if ( alias.length() > freeLength ) {
+				return alias.substring( 0, freeLength ) + suffix;
 			}
 		}
 		return alias + suffix;
@@ -283,50 +292,23 @@ public boolean equals(Column column) {
 
 	public int getSqlTypeCode(MappingContext mapping) throws MappingException {
 		if ( sqlTypeCode == null ) {
-			final Type type = getValue().getType();
-			final int[] sqlTypeCodes;
-			try {
-				sqlTypeCodes = type.getSqlTypeCodes( mapping );
-			}
-			catch ( Exception cause ) {
-				throw new MappingException(
-						String.format(
-								Locale.ROOT,
-								"Unable to resolve JDBC type code for column '%s' of table '%s'",
-								getName(),
-								getValue().getTable().getName()
-						),
-						cause
-				);
-			}
-			final int index = getTypeIndex();
-			if ( index >= sqlTypeCodes.length ) {
-				throw new MappingException(
-						String.format(
-								Locale.ROOT,
-								"Unable to resolve JDBC type code for column '%s' of table '%s'",
-								getName(),
-								getValue().getTable().getName()
-						)
-				);
-			}
-			sqlTypeCode = sqlTypeCodes[index];
+			sqlTypeCode = getSqlTypeCode( mapping, getValue().getType() );
 		}
 		return sqlTypeCode;
 	}
 
+	private int getSqlTypeCode(MappingContext mapping, Type type) {
+		return ( (BasicType<?>) getUnderlyingType( mapping, type, typeIndex ) )
+				.getJdbcType()
+				.getDefaultSqlTypeCode();
+	}
+
 	private String getSqlTypeName(TypeConfiguration typeConfiguration, Dialect dialect, MappingContext mapping) {
 		if ( sqlTypeName == null ) {
-			final DdlTypeRegistry ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
-			final JdbcTypeRegistry jdbcTypeRegistry = typeConfiguration.getJdbcTypeRegistry();
-			final int sqlTypeCode = getSqlTypeCode( mapping );
-			final JdbcType jdbcType =
-					jdbcTypeRegistry.getConstructor( sqlTypeCode ) == null
-							? jdbcTypeRegistry.findDescriptor( sqlTypeCode )
-							: ( (BasicType<?>) getUnderlyingType( mapping, getValue().getType(), typeIndex ) ).getJdbcType();
-			final DdlType descriptor = jdbcType == null
-					? null
-					: ddlTypeRegistry.getDescriptor( jdbcType.getDdlTypeCode() );
+			final var ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
+			final var type = ( (BasicType<?>) getUnderlyingType( mapping, getValue().getType(), typeIndex ) );
+			final var jdbcType = type.getJdbcType();
+			final var descriptor = ddlTypeRegistry.getDescriptor( jdbcType.getDdlTypeCode() );
 			if ( descriptor == null ) {
 				throw new MappingException(
 						String.format(
@@ -334,19 +316,19 @@ private String getSqlTypeName(TypeConfiguration typeConfiguration, Dialect diale
 								"Unable to determine SQL type name for column '%s' of table '%s' because there is no type mapping for org.hibernate.type.SqlTypes code: %s (%s)",
 								getName(),
 								getValue().getTable().getName(),
-								sqlTypeCode,
-								JdbcTypeNameMapper.getTypeName( sqlTypeCode )
+								jdbcType.getDefaultSqlTypeCode(),
+								JdbcTypeNameMapper.getTypeName( jdbcType.getDefaultSqlTypeCode() )
 						)
 				);
 			}
 			try {
-				final Size size = getColumnSize( dialect, mapping );
-				sqlTypeName = descriptor.getTypeName(
-						size,
-						getUnderlyingType( mapping, getValue().getType(), typeIndex ),
-						ddlTypeRegistry
-				);
+				final var size = getColumnSize( dialect, mapping );
+				sqlTypeName = descriptor.getTypeName( size, type, ddlTypeRegistry );
 				sqlTypeLob = descriptor.isLob( size );
+				// TODO: this is rubbish (could not find another way)
+				if ( dialect.getAggregateSupport().useLengthsInCasts() ) {
+					length = size.getLength();
+				}
 			}
 			catch ( Exception cause ) {
 				throw new MappingException(
@@ -367,7 +349,7 @@ private String getSqlTypeName(TypeConfiguration typeConfiguration, Dialect diale
 	private static Type getUnderlyingType(MappingContext mappingContext, Type type, int typeIndex) {
 		if ( type instanceof ComponentType componentType ) {
 			int cols = 0;
-			for ( Type subtype : componentType.getSubtypes() ) {
+			for ( var subtype : componentType.getSubtypes() ) {
 				final int columnSpan = subtype.getColumnSpan( mappingContext );
 				if ( cols+columnSpan > typeIndex ) {
 					return getUnderlyingType( mappingContext, subtype, typeIndex-cols );
@@ -377,7 +359,7 @@ private static Type getUnderlyingType(MappingContext mappingContext, Type type,
 			throw new IndexOutOfBoundsException();
 		}
 		else if ( type instanceof EntityType entityType ) {
-			final Type idType = entityType.getIdentifierOrUniqueKeyType( mappingContext );
+			final var idType = entityType.getIdentifierOrUniqueKeyType( mappingContext );
 			return getUnderlyingType( mappingContext, idType, typeIndex );
 		}
 		else {
@@ -406,7 +388,7 @@ public void setSqlTypeCode(Integer typeCode) {
 	}
 
 	public String getSqlType(Metadata mapping) {
-		final Database database = mapping.getDatabase();
+		final var database = mapping.getDatabase();
 		return getSqlTypeName( database.getTypeConfiguration(), database.getDialect(), mapping );
 	}
 
@@ -448,22 +430,21 @@ public Size getColumnSize(Dialect dialect, MappingContext mappingContext) {
 	}
 
 	Size calculateColumnSize(Dialect dialect, MappingContext mappingContext) {
-		Type type = getValue().getType();
-		Long lengthToUse = getLength();
-		Integer precisionToUse = getPrecision();
-		Integer scaleToUse = getScale();
+		var lengthToUse = getLength();
+		var precisionToUse = getPrecision();
+		var scaleToUse = getScale();
+		var type = getValue().getType();
 		if ( type instanceof EntityType ) {
 			type = getTypeForEntityValue( mappingContext, type, getTypeIndex() );
 		}
-		if ( type instanceof ComponentType ) {
-			type = getTypeForComponentValue( mappingContext, type, getTypeIndex() );
+		if ( type instanceof ComponentType componentType ) {
+			type = getTypeForComponentValue( mappingContext, componentType, getTypeIndex() );
 		}
-		if ( type instanceof BasicType<?> basicType ) {
-			if ( isTemporal( basicType.getExpressibleJavaType() ) ) {
-				precisionToUse = getTemporalPrecision();
-				lengthToUse = null;
-				scaleToUse = null;
-			}
+		if ( type instanceof BasicType<?> basicType
+				&& isTemporal( basicType.getExpressibleJavaType() ) ) {
+			precisionToUse = getTemporalPrecision();
+			lengthToUse = null;
+			scaleToUse = null;
 		}
 		if ( type == null ) {
 			throw new AssertionFailure( "no typing information available to determine column size" );
@@ -480,23 +461,25 @@ Size calculateColumnSize(Dialect dialect, MappingContext mappingContext) {
 		return size;
 	}
 
-	private Type getTypeForComponentValue(MappingContext mappingContext, Type type, int typeIndex) {
-		final Type[] subtypes = ( (ComponentType) type ).getSubtypes();
+	private Type getTypeForComponentValue(MappingContext mappingContext, ComponentType type, int typeIndex) {
+		final var subtypes = type.getSubtypes();
 		int typeStartIndex = 0;
-		for ( Type subtype : subtypes ) {
+		for ( var subtype : subtypes ) {
 			final int columnSpan = subtype.getColumnSpan( mappingContext );
 			if ( typeStartIndex + columnSpan > typeIndex ) {
 				final int subtypeIndex = typeIndex - typeStartIndex;
 				if ( subtype instanceof EntityType ) {
 					return getTypeForEntityValue( mappingContext, subtype, subtypeIndex );
 				}
-				if ( subtype instanceof ComponentType ) {
-					return getTypeForComponentValue( mappingContext, subtype, subtypeIndex );
+				else if ( subtype instanceof ComponentType componentType ) {
+					return getTypeForComponentValue( mappingContext, componentType, subtypeIndex );
 				}
-				if ( subtypeIndex == 0 ) {
+				else if ( subtypeIndex == 0 ) {
 					return subtype;
 				}
-				break;
+				else {
+					break;
+				}
 			}
 			typeStartIndex += columnSpan;
 		}
@@ -514,11 +497,20 @@ private Type getTypeForComponentValue(MappingContext mappingContext, Type type,
 	private Type getTypeForEntityValue(MappingContext mappingContext, Type type, int typeIndex) {
 		int index = 0;
 		if ( type instanceof EntityType entityType ) {
-			return getTypeForEntityValue( mappingContext, entityType.getIdentifierOrUniqueKeyType( mappingContext ), typeIndex );
+			return getTypeForEntityValue(
+					mappingContext,
+					entityType.getIdentifierOrUniqueKeyType( mappingContext ),
+					typeIndex
+			);
 		}
 		else if ( type instanceof ComponentType componentType ) {
-			for ( Type subtype : componentType.getSubtypes() ) {
-				final Type result = getTypeForEntityValue( mappingContext, subtype, typeIndex - index );
+			for ( var subtype : componentType.getSubtypes() ) {
+				final var result =
+						getTypeForEntityValue(
+								mappingContext,
+								subtype,
+								typeIndex - index
+						);
 				if ( result != null ) {
 					return result;
 				}
@@ -557,13 +549,10 @@ public boolean isSqlTypeLob(Metadata mapping) {
 			try {
 				final int typeCode = getSqlTypeCode( mapping );
 				final var ddlType = ddlTypeRegistry.getDescriptor( typeCode );
-				if ( ddlType == null ) {
-					sqlTypeLob = JdbcType.isLob( typeCode );
-				}
-				else {
-					final Size size = getColumnSize( dialect, mapping );
-					sqlTypeLob = ddlType.isLob( size );
-				}
+				sqlTypeLob =
+						ddlType == null
+								? JdbcType.isLob( typeCode )
+								: ddlType.isLob( getColumnSize( dialect, mapping ) );
 			}
 			catch ( MappingException cause ) {
 				throw cause;
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java
index 1ee0aed059a5..b393c755b8e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java
@@ -16,6 +16,7 @@
 
 import org.hibernate.Internal;
 import org.hibernate.MappingException;
+import org.hibernate.boot.model.internal.GeneratorBinder;
 import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.model.relational.ExportableProducer;
 import org.hibernate.boot.model.relational.QualifiedName;
@@ -28,8 +29,8 @@
 import org.hibernate.generator.BeforeExecutionGenerator;
 import org.hibernate.generator.Generator;
 import org.hibernate.id.CompositeNestedGeneratedValueGenerator;
+import org.hibernate.id.CompositeNestedGeneratedValueGenerator.GenerationPlan;
 import org.hibernate.id.Configurable;
-import org.hibernate.id.IdentifierGenerationException;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
@@ -246,6 +247,17 @@ public int getColumnSpan() {
 		return getSelectables().size();
 	}
 
+	@Override
+	public boolean hasColumns() {
+		for ( var property : properties ) {
+			if ( property.hasColumns() ) {
+				return true;
+			}
+		}
+		return discriminator != null
+			&& discriminator.hasColumns();
+	}
+
 	public List<Column> getAggregatedColumns() {
 		final List<Column> aggregatedColumns = new ArrayList<>( getPropertySpan() );
 		collectAggregatedColumns( aggregatedColumns, this );
@@ -312,16 +324,16 @@ public void setStructName(QualifiedName structName) {
 	}
 
 	@Override
-	public void checkColumnDuplication(Set<String> distinctColumns, String owner) {
+	public void checkColumnDuplication(Set<QualifiedColumnName> distinctColumns, String owner) {
 		if ( aggregateColumn == null ) {
 			if ( isPolymorphic() ) {
 				// We can allow different subtypes reusing the same columns
 				// since only one subtype can exist at one time
-				final Map<String, Set<String>> distinctColumnsByClass = new HashMap<>();
+				final Map<String, Set<QualifiedColumnName>> distinctColumnsByClass = new HashMap<>();
 				for ( var prop : properties ) {
 					if ( prop.isUpdatable() || prop.isInsertable() ) {
 						final String declaringClass = propertyDeclaringClasses.get( prop );
-						final Set<String> set = distinctColumnsByClass.computeIfAbsent(
+						final Set<QualifiedColumnName> set = distinctColumnsByClass.computeIfAbsent(
 								declaringClass,
 								k -> new HashSet<>( distinctColumns )
 						);
@@ -490,7 +502,7 @@ public boolean isSame(Component other) {
 
 	@Override
 	public boolean[] getColumnInsertability() {
-		final boolean[] result = new boolean[getColumnSpan()];
+		final var result = new boolean[getColumnSpan()];
 		int i = 0;
 		for ( var property : getProperties() ) {
 			i += copyFlags( property.getValue().getColumnInsertability(), result, i, property.isInsertable() );
@@ -522,7 +534,7 @@ public boolean hasAnyInsertableColumns() {
 
 	@Override
 	public boolean[] getColumnUpdateability() {
-		final boolean[] result = new boolean[getColumnSpan()];
+		final var result = new boolean[getColumnSpan()];
 		int i = 0;
 		for ( var property : getProperties() ) {
 			i += copyFlags( property.getValue().getColumnUpdateability(), result, i, property.isUpdatable() );
@@ -534,6 +546,26 @@ public boolean[] getColumnUpdateability() {
 		return result;
 	}
 
+	@Override
+	public void setNonUpdatable() {
+		for ( var property : properties ) {
+			property.getValue().setNonUpdatable();
+		}
+		if ( isPolymorphic() ) {
+			getDiscriminator().setNonUpdatable();
+		}
+	}
+
+	@Override
+	public void setNonInsertable() {
+		for ( var property : properties ) {
+			property.getValue().setNonInsertable();
+		}
+		if ( isPolymorphic() ) {
+			getDiscriminator().setNonInsertable();
+		}
+	}
+
 	@Override
 	public boolean hasAnyUpdatableColumns() {
 		for ( var property : properties ) {
@@ -582,8 +614,8 @@ public boolean matchesAllProperties(String... propertyNames) {
 	}
 
 	public boolean hasProperty(String propertyName) {
-		for ( Property prop : properties ) {
-			if ( prop.getName().equals(propertyName) ) {
+		for ( var property : properties ) {
+			if ( property.getName().equals(propertyName) ) {
 				return true;
 			}
 		}
@@ -666,81 +698,10 @@ public String toString() {
 	@Override
 	public Generator createGenerator(Dialect dialect, RootClass rootClass, Property property, GeneratorSettings defaults) {
 		return getCustomIdGeneratorCreator().isAssigned()
-				? buildIdentifierGenerator( dialect, rootClass, defaults )
+				? GeneratorBinder.buildIdentifierGenerator( this, dialect, rootClass, defaults )
 				: super.createGenerator( dialect, rootClass, property, defaults );
 	}
 
-	private Generator buildIdentifierGenerator(Dialect dialect, RootClass rootClass, GeneratorSettings defaults) {
-		final var generator =
-				new CompositeNestedGeneratedValueGenerator(
-						new StandardGenerationContextLocator( rootClass.getEntityName() ),
-						getType()
-				);
-		final var properties = getProperties();
-		for ( int i = 0; i < properties.size(); i++ ) {
-			final var property = properties.get( i );
-			if ( property.getValue().isSimpleValue() ) {
-				final SimpleValue value = (SimpleValue) property.getValue();
-				if ( !value.getCustomIdGeneratorCreator().isAssigned() ) {
-					// skip any 'assigned' generators, they would have been
-					// handled by the StandardGenerationContextLocator
-					if ( value.createGenerator( dialect, rootClass, property, defaults )
-							instanceof BeforeExecutionGenerator beforeExecutionGenerator ) {
-						generator.addGeneratedValuePlan( new ValueGenerationPlan(
-								beforeExecutionGenerator,
-								getType().isMutable()
-										? injector( property, getAttributeDeclarer( rootClass ) )
-										: null,
-								i
-						) );
-					}
-					else {
-						throw new IdentifierGenerationException( "Identity generation isn't supported for composite ids" );
-					}
-				}
-			}
-		}
-		return generator;
-	}
-
-	/**
-	 * Return the class that declares the composite pk attributes,
-	 * which might be an {@code @IdClass}, an {@code @EmbeddedId},
-	 * of the entity class itself.
-	 */
-	private Class<?> getAttributeDeclarer(RootClass rootClass) {
-		// See the javadoc discussion on CompositeNestedGeneratedValueGenerator
-		// for the various scenarios we need to account for here
-		if ( rootClass.getIdentifierMapper() != null ) {
-			// we have the @IdClass / <composite-id mapped="true"/> case
-			return resolveComponentClass();
-		}
-		else if ( rootClass.getIdentifierProperty() != null ) {
-			// we have the "@EmbeddedId" / <composite-id name="idName"/> case
-			return resolveComponentClass();
-		}
-		else {
-			// we have the "straight up" embedded (again the Hibernate term)
-			// component identifier: the entity class itself is the id class
-			return rootClass.getMappedClass();
-		}
-	}
-
-	private Setter injector(Property property, Class<?> attributeDeclarer) {
-		return property.getPropertyAccessStrategy( attributeDeclarer )
-				.buildPropertyAccess( attributeDeclarer, property.getName(), true )
-				.getSetter();
-	}
-
-	private Class<?> resolveComponentClass() {
-		try {
-			return getComponentClass();
-		}
-		catch ( Exception e ) {
-			return null;
-		}
-	}
-
 	@Internal
 	public String[] getPropertyNames() {
 		final String[] propertyNames = new String[properties.size()];
@@ -786,7 +747,7 @@ public Object locateGenerationContext(SharedSessionContractImplementor session,
 		}
 	}
 
-	public static class ValueGenerationPlan implements CompositeNestedGeneratedValueGenerator.GenerationPlan {
+	public static class ValueGenerationPlan implements GenerationPlan {
 		private final BeforeExecutionGenerator generator;
 		private final Setter injector;
 		private final int propertyIndex;
@@ -850,9 +811,10 @@ public boolean isValid(MappingContext mappingContext) throws MappingException {
 			}
 			if ( assignedPropertyNames.size() != properties.size() ) {
 				final ArrayList<String> missingProperties = new ArrayList<>();
-				for ( Property property : properties ) {
-					if ( !assignedPropertyNames.contains( property.getName() ) ) {
-						missingProperties.add( property.getName() );
+				for ( var property : properties ) {
+					final String propertyName = property.getName();
+					if ( !assignedPropertyNames.contains( propertyName ) ) {
+						missingProperties.add( propertyName );
 					}
 				}
 				throw new MappingException( "component type [" + componentClassName + "] has " + properties.size() + " properties but the instantiator only assigns " + assignedPropertyNames.size() + " properties. missing properties: " + missingProperties );
@@ -886,7 +848,7 @@ private int[] sortProperties(boolean forceRetainOriginalOrder) {
 		// because XML mappings might refer to this through the defined order
 		if ( forceRetainOriginalOrder || isAlternateUniqueKey() || isEmbedded()
 				|| getBuildingContext() instanceof MappingDocument ) {
-			final Property[] originalProperties = properties.toArray( new Property[0] );
+			final var originalProperties = properties.toArray( new Property[0] );
 			properties.sort( Comparator.comparing( Property::getName ) );
 			originalPropertyOrder = new int[originalProperties.length];
 			for ( int j = 0; j < originalPropertyOrder.length; j++ ) {
@@ -944,6 +906,15 @@ public boolean isSimpleRecord() {
 		return simple;
 	}
 
+	private Class<?> resolveComponentClass() {
+		try {
+			return getComponentClass();
+		}
+		catch ( Exception e ) {
+			return null;
+		}
+	}
+
 	public Class<? extends EmbeddableInstantiator> getCustomInstantiator() {
 		return customInstantiator;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Contributable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Contributable.java
index 6536e6d85200..4c5c956bfd66 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Contributable.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Contributable.java
@@ -9,7 +9,7 @@
 /**
  * Parts of the mapping model which are associated with a
  * {@linkplain #getContributor() contributor} (ORM, Envers, etc).
- * <p/>
+ * <p>
  * The most useful aspect of this is the {@link ContributableDatabaseObject}
  * specialization.
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifiableTypeClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifiableTypeClass.java
index ef3a0211018b..75f119296953 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifiableTypeClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifiableTypeClass.java
@@ -18,8 +18,13 @@ public interface IdentifiableTypeClass extends TableContainer {
 
 	List<Property> getDeclaredProperties();
 
+	Component getIdentifierMapper();
+
 	Table getImplicitTable();
 
+	boolean isVersioned();
+	Property getVersion();
+
 	/**
 	 * @deprecated No longer used
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java
index f83bbd1ded5e..86fff6980020 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java
@@ -65,7 +65,7 @@ void createPrimaryKey() {
 		if ( !isOneToMany() ) {
 			final var primaryKey = new PrimaryKey( getCollectionTable() );
 			primaryKey.addColumns( getIdentifier() );
-			getCollectionTable().setPrimaryKey(primaryKey);
+			getCollectionTable().setPrimaryKey( primaryKey );
 		}
 		// create an index on the key columns??
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Join.java b/hibernate-core/src/main/java/org/hibernate/mapping/Join.java
index c6d8513e02d5..dfe48165b9a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Join.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Join.java
@@ -115,7 +115,7 @@ public void disableForeignKeyCreation() {
 
 	public void createForeignKey() {
 		final var foreignKey = getKey().createForeignKeyOfEntity( persistentClass.getEntityName() );
-		if ( disableForeignKeyCreation ) {
+		if ( foreignKey != null && disableForeignKeyCreation ) {
 			foreignKey.disableCreation();
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java
index 14917846d48c..707ed0a41366 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java
@@ -4,8 +4,6 @@
  */
 package org.hibernate.mapping;
 
-import java.util.List;
-
 import org.hibernate.MappingException;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.spi.MetadataBuildingContext;
@@ -55,10 +53,6 @@ public void validate(Metadata mapping) throws MappingException {
 		}
 	}
 
-	public List<Property> getReferenceableProperties() {
-		return getProperties();
-	}
-
 	public Object accept(PersistentClassVisitor mv) {
 		return mv.accept(this);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java
index af73c108a036..dddfb193c005 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java
@@ -95,7 +95,7 @@ public void createPropertyRefConstraints(Map<String, PersistentClass> persistent
 					component.sortProperties();
 				}
 				// todo : if "none" another option is to create the ForeignKey object still	but to set its #disableCreation flag
-				if ( isForeignKeyEnabled() && !hasFormula() ) {
+				if ( isConstrained() && !hasAuxiliaryColumnInPrimaryKey( referencedClass ) ) {
 					final var foreignKey = getTable().createForeignKey(
 							getForeignKeyName(),
 							getConstraintColumns(),
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java
index c0e0a879b347..279a2702d67b 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java
@@ -49,6 +49,7 @@ public boolean hasIdentifierProperty() {
 		return getIdentifierProperty() != null;
 	}
 
+	@Override
 	public boolean isVersioned() {
 		return getVersion() != null;
 	}
@@ -63,6 +64,7 @@ public PersistentClass getSuperPersistentClass() {
 		return superPersistentClass;
 	}
 
+	@Override
 	public List<Property> getDeclaredProperties() {
 		return declaredProperties;
 	}
@@ -109,6 +111,7 @@ public void setDeclaredIdentifierProperty(Property prop) {
 		this.identifierProperty = prop;
 	}
 
+	@Override
 	public Property getVersion() {
 		//get direct version or the one from the super mappedSuperclass
 		// or the one from the super persistentClass
@@ -132,6 +135,7 @@ public void setDeclaredVersion(Property prop) {
 		this.version = prop;
 	}
 
+	@Override
 	public Component getIdentifierMapper() {
 		//get direct identifierMapper or the one from the super mappedSuperclass
 		// or the one from the super persistentClass
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java b/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java
index bfe537b75570..a10dfd72f6ba 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java
@@ -16,6 +16,7 @@
 import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.resource.beans.spi.ProvidedInstanceManagedBeanImpl;
+import org.hibernate.usertype.AnnotationBasedUserType;
 import org.hibernate.usertype.ParameterizedType;
 import org.hibernate.usertype.UserCollectionType;
 
@@ -75,9 +76,10 @@ public static void injectParameters(Object type, Properties parameters) {
 		if ( type instanceof ParameterizedType parameterizedType ) {
 			parameterizedType.setParameterValues( parameters == null ? EMPTY_PROPERTIES : parameters );
 		}
-		else if ( parameters != null && !parameters.isEmpty() ) {
+		else if ( parameters != null && !parameters.isEmpty()
+				&& !( type instanceof AnnotationBasedUserType<?,?> ) ) {
 			throw new MappingException( "'UserType' implementation '" + type.getClass().getName()
-					+ "' does not implement 'ParameterizedType' but parameters were provided" );
+					+ "' does not implement 'ParameterizedType' or 'AnnotationBasedUserType' but parameters were provided" );
 		}
 	}
 
@@ -102,11 +104,11 @@ private static ManagedBean<UserCollectionType> createLocalUserTypeBean(
 	}
 
 	public static void checkPropertyColumnDuplication(
-			Set<String> distinctColumns,
+			Set<QualifiedColumnName> distinctColumns,
 			List<Property> properties,
 			String owner) throws MappingException {
 		for ( var property : properties ) {
-			if ( property.isUpdatable() || property.isInsertable() ) {
+			if ( ( property.isUpdatable() || property.isInsertable() ) && !property.isGenericSpecialization() ) {
 				property.getValue().checkColumnDuplication( distinctColumns, owner );
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
index 7d0f98fdd0bd..6709c3689dca 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
@@ -93,6 +93,11 @@ public int getColumnSpan() {
 		return associatedClass.getKey().getColumnSpan();
 	}
 
+	@Override
+	public boolean hasColumns() {
+		return associatedClass.getKey().hasColumns();
+	}
+
 	@Override
 	public FetchMode getFetchMode() {
 		return FetchMode.JOIN;
@@ -203,6 +208,14 @@ public boolean hasAnyUpdatableColumns() {
 		return false;
 	}
 
+	@Override
+	public void setNonInsertable() {
+	}
+
+	@Override
+	public void setNonUpdatable() {
+	}
+
 	public NotFoundAction getNotFoundAction() {
 		return notFoundAction;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
index 22b99da2bbe5..1ac63b1a3d94 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
@@ -61,7 +61,7 @@ public String getEntityName() {
 	}
 
 	public OneToOneType getType() throws MappingException {
-		if ( getColumnSpan()>0 ) {
+		if ( hasColumns() ) {
 			return new SpecialOneToOneType(
 					getTypeConfiguration(),
 					getReferencedEntityName(),
@@ -93,7 +93,7 @@ public OneToOneType getType() throws MappingException {
 
 	@Override
 	public void createUniqueKey(MetadataBuildingContext context) {
-		if ( !hasFormula() && getColumnSpan()>0  ) {
+		if ( !hasFormula() && hasColumns()  ) {
 			getTable().createUniqueKey( getConstraintColumns(), context );
 		}
 	}
@@ -117,6 +117,11 @@ public boolean isConstrained() {
 		return constrained;
 	}
 
+	@Override
+	boolean isActuallyConstrained() {
+		return constrained && super.isConstrained();
+	}
+
 	/**
 	 * Returns the foreignKeyType.
 	 * @return AssociationType.ForeignKeyType
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java
index b53e780c0b5a..fee402e687f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java
@@ -315,6 +315,7 @@ public String getEntityName() {
 
 	public abstract KeyValue getIdentifier();
 
+	@Override
 	public abstract Property getVersion();
 
 	public abstract Property getDeclaredVersion();
@@ -325,9 +326,9 @@ public String getEntityName() {
 
 	public abstract boolean isPolymorphic();
 
+	@Override
 	public abstract boolean isVersioned();
 
-
 	public boolean isCached() {
 		return isCached;
 	}
@@ -362,6 +363,8 @@ public boolean isExplicitPolymorphism() {
 
 	public abstract List<Property> getPropertyClosure();
 
+	public abstract List<Property> getAllPropertyClosure();
+
 	public abstract List<Table> getTableClosure();
 
 	public abstract List<KeyValue> getKeyClosure();
@@ -431,8 +434,12 @@ public void setEntityName(String entityName) {
 	}
 
 	public void createPrimaryKey() {
-		//Primary key constraint
 		final var table = getTable();
+		final var primaryKey = makePrimaryKey( table );
+		table.setPrimaryKey( primaryKey );
+	}
+
+	PrimaryKey makePrimaryKey(Table table) {
 		final var primaryKey = new PrimaryKey( table );
 		primaryKey.setName( PK_ALIAS.toAliasString( table.getName() ) );
 		primaryKey.addColumns( getKey() );
@@ -443,7 +450,7 @@ public void createPrimaryKey() {
 				}
 			}
 		}
-		table.setPrimaryKey( primaryKey );
+		return primaryKey;
 	}
 
 	private boolean addPartitionKeyToPrimaryKey() {
@@ -722,6 +729,23 @@ public int getJoinClosureSpan() {
 	}
 
 	public int getPropertyClosureSpan() {
+		int span = 0;
+		for ( Property property : properties ) {
+			if ( !property.isGeneric() ) {
+				span += 1;
+			}
+		}
+		for ( var join : joins ) {
+			for ( Property property : join.getProperties() ) {
+				if ( !property.isGeneric() ) {
+					span += 1;
+				}
+			}
+		}
+		return span;
+	}
+
+	public int getAllPropertyClosureSpan() {
 		int span = properties.size();
 		for ( var join : joins ) {
 			span += join.getPropertySpan();
@@ -754,6 +778,23 @@ public int getJoinNumber(Property prop) {
 	 * @return A list over the "normal" properties.
 	 */
 	public List<Property> getProperties() {
+		final ArrayList<Property> list = new ArrayList<>();
+		for ( Property property : properties ) {
+			if ( !property.isGeneric() ) {
+				list.add( property );
+			}
+		}
+		for ( var join : joins ) {
+			for ( Property property : join.getProperties() ) {
+				if ( !property.isGeneric() ) {
+					list.add( property );
+				}
+			}
+		}
+		return list;
+	}
+
+	public List<Property> getAllProperties() {
 		final ArrayList<List<Property>> list = new ArrayList<>();
 		list.add( properties );
 		for ( var join : joins ) {
@@ -871,7 +912,7 @@ protected List<Property> getNonDuplicatedProperties() {
 
 	protected void checkColumnDuplication() {
 		final String owner = "entity '" + getEntityName() + "'";
-		final HashSet<String> cols = new HashSet<>();
+		final HashSet<QualifiedColumnName> cols = new HashSet<>();
 		if ( getIdentifierMapper() == null ) {
 			//an identifier mapper => getKey will be included in the getNonDuplicatedPropertyIterator()
 			//and checked later, so it needs to be excluded
@@ -950,6 +991,7 @@ public boolean hasPartitionedSelectionMapping() {
 		return false;
 	}
 
+	@Override
 	public Component getIdentifierMapper() {
 		return identifierMapper;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java
index c5e35b1def13..2a5f8aeff8dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java
@@ -24,6 +24,7 @@
 import org.hibernate.jpa.event.spi.CallbackDefinition;
 import org.hibernate.metamodel.RepresentationMode;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
+import org.hibernate.models.spi.MemberDetails;
 import org.hibernate.property.access.spi.Getter;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.property.access.spi.PropertyAccessStrategy;
@@ -61,6 +62,8 @@ public class Property implements Serializable, MetaAttributable {
 	private boolean insertable = true;
 	private boolean selectable = true;
 	private boolean optimisticLocked = true;
+	private boolean temporalExcluded;
+	private boolean auditedExcluded;
 	private GeneratorCreator generatorCreator;
 	private String propertyAccessorName;
 	private PropertyAccessStrategy propertyAccessStrategy;
@@ -71,6 +74,7 @@ public class Property implements Serializable, MetaAttributable {
 	private PersistentClass persistentClass;
 	private boolean naturalIdentifier;
 	private boolean isGeneric;
+	private boolean isGenericSpecialization;
 	private boolean lob;
 	private java.util.List<CallbackDefinition> callbackDefinitions;
 	private String returnedClassName;
@@ -98,6 +102,10 @@ public int getColumnSpan() {
 		return value.getColumnSpan();
 	}
 
+	boolean hasColumns() {
+		return value.hasColumns();
+	}
+
 	/**
 	 * Delegates to {@link Value#getSelectables()}.
 	 */
@@ -126,12 +134,17 @@ public Value getValue() {
 		return value;
 	}
 
+	public void resetInsertable(boolean insertable) {
+		setInsertable( insertable );
+		if ( !insertable ) {
+			value.setNonInsertable();
+		}
+	}
+
 	public void resetUpdateable(boolean updateable) {
 		setUpdatable( updateable );
-		final boolean[] columnUpdateability = getValue().getColumnUpdateability();
-		final int columnSpan = getColumnSpan();
-		for ( int i = 0; i < columnSpan; i++ ) {
-			columnUpdateability[i] = updateable;
+		if ( !updateable ) {
+			value.setNonUpdatable();
 		}
 	}
 
@@ -490,6 +503,30 @@ public void setGeneric(boolean generic) {
 		this.isGeneric = generic;
 	}
 
+	public boolean isGenericSpecialization() {
+		return isGenericSpecialization;
+	}
+
+	public void setGenericSpecialization(boolean genericSpecialization) {
+		isGenericSpecialization = genericSpecialization;
+	}
+
+	public boolean isTemporalExcluded() {
+		return temporalExcluded;
+	}
+
+	public void setTemporalExcluded(boolean temporalExcluded) {
+		this.temporalExcluded = temporalExcluded;
+	}
+
+	public boolean isAuditedExcluded() {
+		return auditedExcluded;
+	}
+
+	public void setAuditedExcluded(boolean auditedExcluded) {
+		this.auditedExcluded = auditedExcluded;
+	}
+
 	public boolean isLob() {
 		return lob;
 	}
@@ -544,6 +581,8 @@ public Property copy() {
 		property.setInsertable( isInsertable() );
 		property.setSelectable( isSelectable() );
 		property.setOptimisticLocked( isOptimisticLocked() );
+		property.setTemporalExcluded( isTemporalExcluded() );
+		property.setAuditedExcluded( isAuditedExcluded() );
 		property.setValueGeneratorCreator( getValueGeneratorCreator() );
 		property.setPropertyAccessorName( getPropertyAccessorName() );
 		property.setPropertyAccessStrategy( getPropertyAccessStrategy() );
@@ -554,6 +593,7 @@ public Property copy() {
 		property.setPersistentClass( getPersistentClass() );
 		property.setNaturalIdentifier( isNaturalIdentifier() );
 		property.setGeneric( isGeneric() );
+		property.setGenericSpecialization( isGenericSpecialization() );
 		property.setLob( isLob() );
 		property.addCallbackDefinitions( getCallbackDefinitions() );
 		property.setReturnedClassName( getReturnedClassName() );
@@ -607,6 +647,13 @@ public Value getValue() {
 			return value;
 		}
 
+		@Override
+		public MemberDetails getMemberDetails() {
+			return value instanceof SimpleValue simpleValue
+					? simpleValue.getMemberDetails()
+					: null; // TODO: Give Property a reference to the MemberDetails
+		}
+
 		@Override
 		public SqlStringGenerationContext getSqlStringGenerationContext() {
 			return context.getSqlStringGenerationContext();
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/QualifiedColumnName.java b/hibernate-core/src/main/java/org/hibernate/mapping/QualifiedColumnName.java
new file mode 100644
index 000000000000..4e5fc1d6e7a5
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/QualifiedColumnName.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.mapping;
+
+import org.hibernate.boot.model.naming.Identifier;
+
+/**
+ * Represents a fully qualified column name for uniqueness checks.
+ */
+public record QualifiedColumnName(
+		Identifier catalogName,
+		Identifier schemaName,
+		Identifier tableName,
+		Identifier columnName
+) {}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java
index 6503fa477807..fdf3a04f39e9 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java
@@ -4,14 +4,18 @@
  */
 package org.hibernate.mapping;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.hibernate.MappingException;
 import org.hibernate.annotations.SoftDeleteType;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.persister.state.spi.StateManagement;
 
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
 import static org.hibernate.internal.util.ReflectHelper.overridesEquals;
@@ -34,6 +38,7 @@ public final class RootClass extends PersistentClass implements TableOwner, Soft
 	private String cacheConcurrencyStrategy;
 	private String cacheRegionName;
 	private boolean lazyPropertiesCacheable = true;
+	private ClassDetails naturalIdClass;
 	private String naturalIdCacheRegionName;
 
 	private Value discriminator;
@@ -47,9 +52,16 @@ public final class RootClass extends PersistentClass implements TableOwner, Soft
 	private int nextSubclassId;
 	private Property declaredIdentifierProperty;
 	private Property declaredVersion;
-	private Column softDeleteColumn;
+
 	private SoftDeleteType softDeleteStrategy;
 
+	private Class<? extends StateManagement> stateManagementType;
+	private Table auxiliaryTable;
+	private boolean partitioned;
+	private Map<String, Column> auxiliaryColumns;
+	private String auxiliaryColumnInPrimaryKey;
+	private boolean primaryKeyDisabled;
+
 	public RootClass(MetadataBuildingContext buildingContext) {
 		super( buildingContext );
 	}
@@ -134,6 +146,11 @@ public List<Property> getPropertyClosure() {
 		return getProperties();
 	}
 
+	@Override
+	public List<Property> getAllPropertyClosure() {
+		return getAllProperties();
+	}
+
 	@Override
 	public List<Table> getTableClosure() {
 		return List.of( getTable() );
@@ -365,6 +382,14 @@ public void setLazyPropertiesCacheable(boolean lazyPropertiesCacheable) {
 		this.lazyPropertiesCacheable = lazyPropertiesCacheable;
 	}
 
+	public ClassDetails getNaturalIdClass() {
+		return naturalIdClass;
+	}
+
+	public void setNaturalIdClass(ClassDetails naturalIdClass) {
+		this.naturalIdClass = naturalIdClass;
+	}
+
 	@Override
 	public String getNaturalIdCacheRegionName() {
 		return naturalIdCacheRegionName;
@@ -396,18 +421,47 @@ public Set<Table> getIdentityTables() {
 
 	@Override
 	public void enableSoftDelete(Column indicatorColumn, SoftDeleteType strategy) {
-		softDeleteColumn = indicatorColumn;
+		SoftDeletable.super.enableSoftDelete( indicatorColumn, strategy );
 		softDeleteStrategy = strategy;
 	}
 
 	@Override
-	public Column getSoftDeleteColumn() {
-		return softDeleteColumn;
+	public SoftDeleteType getSoftDeleteStrategy() {
+		return softDeleteStrategy;
 	}
 
 	@Override
-	public SoftDeleteType getSoftDeleteStrategy() {
-		return softDeleteStrategy;
+	public Table getMainTable() {
+		return table;
+	}
+
+	@Override
+	public boolean isMainTablePartitioned() {
+		return partitioned;
+	}
+
+	public void setMainTablePartitioned(boolean partitioned) {
+		this.partitioned = partitioned;
+	}
+
+	@Override
+	public boolean isAuxiliaryColumnInPrimaryKey() {
+		return auxiliaryColumnInPrimaryKey != null;
+	}
+
+	@Override
+	public void setAuxiliaryColumnInPrimaryKey(String key) {
+		this.auxiliaryColumnInPrimaryKey = key;
+	}
+
+	@Override
+	public boolean isPrimaryKeyDisabled() {
+		return primaryKeyDisabled;
+	}
+
+	@Override
+	public void setPrimaryKeyDisabled(boolean disabled) {
+		this.primaryKeyDisabled = disabled;
 	}
 
 	@Override
@@ -415,4 +469,50 @@ public Object accept(PersistentClassVisitor mv) {
 		return mv.accept( this );
 	}
 
+	@Override
+	public PrimaryKey makePrimaryKey(Table table) {
+		if ( isPrimaryKeyDisabled() ) {
+			return null;
+		}
+		else {
+			final var primaryKey = super.makePrimaryKey( table );
+			if ( isAuxiliaryColumnInPrimaryKey() ) {
+				if ( isVersioned() ) {
+					primaryKey.addColumns( getVersion().getValue() );
+				}
+				else {
+					primaryKey.addColumn( getAuxiliaryColumn( auxiliaryColumnInPrimaryKey ) );
+				}
+			}
+			return primaryKey;
+		}
+	}
+
+	public void setStateManagementType(Class<? extends StateManagement> stateManagementType) {
+		this.stateManagementType = stateManagementType;
+	}
+
+	public Class<? extends StateManagement> getStateManagementType() {
+		return stateManagementType;
+	}
+
+	public Table getAuxiliaryTable() {
+		return auxiliaryTable;
+	}
+
+	public void setAuxiliaryTable(Table auxiliaryTable) {
+		this.auxiliaryTable = auxiliaryTable;
+	}
+
+	public Column getAuxiliaryColumn(String column) {
+		return auxiliaryColumns == null ? null
+				: auxiliaryColumns.get( column );
+	}
+
+	public void addAuxiliaryColumn(String name, Column column) {
+		if ( auxiliaryColumns == null ) {
+			auxiliaryColumns = new HashMap<>();
+		}
+		auxiliaryColumns.put( name, column );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java
index ddf9a042bc1e..606efa04f26a 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java
@@ -4,9 +4,13 @@
  */
 package org.hibernate.mapping;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Supplier;
 
 import org.hibernate.MappingException;
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.naming.ImplicitUniqueKeyNameSource;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.type.CollectionType;
@@ -19,7 +23,8 @@
 /**
  * A mapping model object representing a collection of type {@link java.util.List}.
  * A set has no nullable element columns (unless it is a one-to-many association).
- * It has a primary key consisting of all columns (i.e. key columns + element columns).
+ * It has a primary key consisting of all columns (i.e. key columns + element columns),
+ * or a unique key if some element columns are nullable.
  *
  * @author Gavin King
  */
@@ -38,7 +43,7 @@ public Set(Supplier<ManagedBean<? extends UserCollectionType>> customTypeBeanRes
 		super( customTypeBeanResolver, persistentClass, buildingContext );
 	}
 
-	private Set(Collection original) {
+	private Set(Set original) {
 		super( original );
 	}
 
@@ -79,22 +84,67 @@ else if ( hasOrder() ) {
 	void createPrimaryKey() {
 		if ( !isOneToMany() ) {
 			final var collectionTable = getCollectionTable();
-			var primaryKey = collectionTable.getPrimaryKey();
-			if ( primaryKey == null ) {
-				primaryKey = new PrimaryKey( getCollectionTable() );
-				primaryKey.addColumns( getKey() );
+			if ( !collectionTable.hasPrimaryKey()
+					&& collectionTable.getUniqueKeys().isEmpty() ) {
+				boolean useUniqueKey = false;
 				for ( var selectable : getElement().getSelectables() ) {
-					if ( selectable instanceof Column col ) {
-						if ( !col.isNullable() ) {
-							primaryKey.addColumn( col );
+					if ( selectable instanceof Column column ) {
+						try {
+							if ( column.isSqlTypeLob( getMetadata() ) ) {
+								return;
+							}
 						}
-						else {
-							return;
+						catch (MappingException me) {
+							// ignore
+						}
+						if ( column.isNullable() ) {
+							useUniqueKey = true;
 						}
 					}
 				}
-				if ( primaryKey.getColumnSpan() != getKey().getColumnSpan() ) {
-					collectionTable.setPrimaryKey( primaryKey );
+				final var key = useUniqueKey
+						? new UniqueKey( collectionTable )
+						: new PrimaryKey( collectionTable );
+				key.addColumns( getKey() );
+				for ( var selectable : getElement().getSelectables() ) {
+					if ( selectable instanceof Column column ) {
+						key.addColumn( column );
+					}
+				}
+				key.setName( getBuildingContext().getBuildingOptions().getImplicitNamingStrategy()
+						.determineUniqueKeyName( new ImplicitUniqueKeyNameSource() {
+							@Override
+							public Identifier getTableName() {
+								return getTable().getNameIdentifier();
+							}
+
+							@Override
+							public List<Identifier> getColumnNames() {
+								final List<Identifier> list = new ArrayList<>();
+								for ( var c : key.getColumns() ) {
+									list.add( c.getNameIdentifier( getBuildingContext() ) );
+								}
+								return list;
+							}
+
+							@Override
+							public Identifier getUserProvidedIdentifier() {
+								return null;
+							}
+
+							@Override
+							public MetadataBuildingContext getBuildingContext() {
+								return Set.this.getBuildingContext();
+							}
+						} )
+						.render( getMetadata().getDatabase().getDialect() ) );
+				if ( key.getColumnSpan() > getKey().getColumnSpan() ) {
+					if ( useUniqueKey ) {
+						collectionTable.addUniqueKey( (UniqueKey) key );
+					}
+					else {
+						collectionTable.setPrimaryKey( (PrimaryKey) key );
+					}
 				}
 //				else {
 					//for backward compatibility, allow a set with no not-null
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
index 4cabe13f4194..28322426675f 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
@@ -88,6 +88,8 @@ public abstract class SimpleValue implements KeyValue {
 
 	private String typeName;
 	private Properties typeParameters;
+	private Annotation typeAnnotation;
+	private MemberDetails memberDetails;
 	private boolean isVersion;
 	private boolean isNationalized;
 	private boolean isLob;
@@ -121,12 +123,20 @@ public SimpleValue(MetadataBuildingContext buildingContext, Table table) {
 	protected SimpleValue(SimpleValue original) {
 		this.buildingContext = original.buildingContext;
 		this.metadata = original.metadata;
-		this.columns.addAll( original.columns );
+		for ( var selectable : original.columns ) {
+			if ( selectable instanceof Column column ) {
+				final var newColumn = column.clone();
+				newColumn.setValue( this );
+				this.columns.add( newColumn );
+			}
+		}
 		this.insertability.addAll( original.insertability );
 		this.updatability.addAll( original.updatability );
 		this.partitionKey = original.partitionKey;
 		this.typeName = original.typeName;
 		this.typeParameters = original.typeParameters == null ? null : new Properties( original.typeParameters );
+		this.typeAnnotation = original.typeAnnotation;
+		this.memberDetails = original.memberDetails;
 		this.isVersion = original.isVersion;
 		this.isNationalized = original.isNationalized;
 		this.isLob = original.isLob;
@@ -227,8 +237,8 @@ protected void justAddFormula(Formula formula) {
 	public void sortColumns(int[] originalOrder) {
 		if ( columns.size() > 1 ) {
 			final var originalColumns = columns.toArray( new Selectable[0] );
-			final boolean[] originalInsertability = toBooleanArray( insertability );
-			final boolean[] originalUpdatability = toBooleanArray( updatability );
+			final var originalInsertability = toBooleanArray( insertability );
+			final var originalUpdatability = toBooleanArray( updatability );
 			for ( int i = 0; i < originalOrder.length; i++ ) {
 				final int originalIndex = originalOrder[i];
 				final var selectable = originalColumns[i];
@@ -257,6 +267,11 @@ public int getColumnSpan() {
 		return columns.size();
 	}
 
+	@Override
+	public boolean hasColumns() {
+		return !columns.isEmpty();
+	}
+
 	protected Selectable getColumn(int position){
 		return columns.get( position );
 	}
@@ -298,8 +313,7 @@ void setAttributeConverterDescriptor(String typeName) {
 				(Class<? extends AttributeConverter<?,?>>)
 						classForName( AttributeConverter.class, converterClassName, bootstrapContext );
 		attributeConverterDescriptor =
-				ConverterDescriptors.of( clazz, null, false,
-						bootstrapContext.getClassmateContext() );
+				ConverterDescriptors.of( clazz, null, false );
 	}
 
 	ClassLoaderService classLoaderService() {
@@ -307,7 +321,7 @@ ClassLoaderService classLoaderService() {
 	}
 
 	public void makeVersion() {
-		this.isVersion = true;
+		isVersion = true;
 	}
 
 	public boolean isVersion() {
@@ -341,7 +355,7 @@ public void createForeignKey(PersistentClass referencedEntity, AnnotatedJoinColu
 
 	@Override
 	public ForeignKey createForeignKeyOfEntity(String entityName) {
-		if ( isConstrained() ) {
+		if ( isConstrained() && !hasAuxiliaryColumnInPrimaryKey( entityName ) ) {
 			final var foreignKey = table.createForeignKey(
 					getForeignKeyName(),
 					getConstraintColumns(),
@@ -359,7 +373,7 @@ public ForeignKey createForeignKeyOfEntity(String entityName) {
 
 	@Override
 	public ForeignKey createForeignKeyOfEntity(String entityName, List<Column> referencedColumns) {
-		if ( isConstrained() ) {
+		if ( isConstrained() && !hasAuxiliaryColumnInPrimaryKey( entityName ) ) {
 			final var foreignKey = table.createForeignKey(
 					getForeignKeyName(),
 					getConstraintColumns(),
@@ -375,6 +389,20 @@ public ForeignKey createForeignKeyOfEntity(String entityName, List<Column> refer
 		return null;
 	}
 
+	protected boolean hasAuxiliaryColumnInPrimaryKey(PersistentClass referencedEntity) {
+		return referencedEntity.getRootClass().isAuxiliaryColumnInPrimaryKey();
+	}
+
+	protected boolean hasAuxiliaryColumnInPrimaryKey(String entityName) {
+		if ( entityName == null ) {
+			return false;
+		}
+		else {
+			final var referencedEntity = metadata.getEntityBinding( entityName );
+			return referencedEntity != null && hasAuxiliaryColumnInPrimaryKey( referencedEntity );
+		}
+	}
+
 	@Override
 	public void createUniqueKey(MetadataBuildingContext context) {
 		if ( hasFormula() ) {
@@ -589,12 +617,11 @@ public boolean isNullable() {
 				// considered nullable
 				return true;
 			}
-			else if ( selectable instanceof Column column ) {
-				if ( !column.isNullable() ) {
-					// if there is a single non-nullable column, the Value
-					// overall is considered non-nullable.
-					return false;
-				}
+			else if ( selectable instanceof Column column
+						&& !column.isNullable() ) {
+				// if there is a single non-nullable column, the Value
+				// overall is considered non-nullable.
+				return false;
 			}
 		}
 		// nullable by default
@@ -792,11 +819,27 @@ public void setTypeParameters(Map<String, ?> parameters) {
 		}
 	}
 
+	public void setTypeAnnotation(Annotation typeAnnotation) {
+		this.typeAnnotation = typeAnnotation;
+	}
+
+	public void setMemberDetails(MemberDetails memberDetails) {
+		this.memberDetails = memberDetails;
+	}
+
 	public Properties getTypeParameters() {
 		return typeParameters;
 	}
 
-	public void copyTypeFrom( SimpleValue sourceValue ) {
+	public Annotation getTypeAnnotation() {
+		return typeAnnotation;
+	}
+
+	public MemberDetails getMemberDetails() {
+		return memberDetails;
+	}
+
+	public void copyTypeFrom(SimpleValue sourceValue ) {
 		setTypeName( sourceValue.getTypeName() );
 		setTypeParameters( sourceValue.getTypeParameters() );
 
@@ -818,6 +861,8 @@ public boolean isSame(SimpleValue other) {
 		return Objects.equals( columns, other.columns )
 			&& Objects.equals( typeName, other.typeName )
 			&& Objects.equals( typeParameters, other.typeParameters )
+			&& Objects.equals( typeAnnotation, other.typeAnnotation )
+			&& Objects.equals( memberDetails, other.memberDetails )
 			&& Objects.equals( table, other.table )
 			&& Objects.equals( foreignKeyName, other.foreignKeyName )
 			&& Objects.equals( foreignKeyDefinition, other.foreignKeyDefinition );
@@ -854,6 +899,16 @@ public boolean[] getColumnUpdateability() {
 		return extractBooleansFromList( updatability );
 	}
 
+	@Override
+	public void setNonInsertable() {
+		insertability.replaceAll( current -> false );
+	}
+
+	@Override
+	public void setNonUpdatable() {
+		updatability.replaceAll( current -> false );
+	}
+
 	@Override
 	public boolean hasAnyUpdatableColumns() {
 		for ( int i = 0; i < updatability.size(); i++ ) {
@@ -883,7 +938,7 @@ public void setPartitionKey(boolean partitionColumn) {
 	}
 
 	private static boolean[] extractBooleansFromList(List<Boolean> list) {
-		final boolean[] array = new boolean[ list.size() ];
+		final var array = new boolean[ list.size() ];
 		int i = 0;
 		for ( Boolean value : list ) {
 			array[ i++ ] = value;
@@ -912,11 +967,11 @@ private static Annotation[] getAnnotations(MemberDetails memberDetails) {
 
 	protected ParameterType createParameterType() {
 		try {
-			final String[] columnNames = new String[ columns.size() ];
-			final Long[] columnLengths = new Long[ columns.size() ];
-			for ( int i = 0; i < columns.size(); i++ ) {
-				final var selectable = columns.get(i);
-				if ( selectable instanceof Column column ) {
+			final int size = columns.size();
+			final var columnNames = new String[size];
+			final var columnLengths = new Long[size];
+			for ( int i = 0; i < size; i++ ) {
+				if ( columns.get(i) instanceof Column column ) {
 					columnNames[i] = column.getName();
 					columnLengths[i] = column.getLength();
 				}
@@ -1096,6 +1151,11 @@ public Type getType() {
 			return SimpleValue.this.getType();
 		}
 
+		@Override
+		public MemberDetails getMemberDetails() {
+			return SimpleValue.this.getMemberDetails();
+		}
+
 		// we could add this if it helps integrate old infrastructure
 //		@Override
 //		public Properties getParameters() {
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SoftDeletable.java b/hibernate-core/src/main/java/org/hibernate/mapping/SoftDeletable.java
index 30eeeb2da084..06564bb70cba 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/SoftDeletable.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/SoftDeletable.java
@@ -4,26 +4,40 @@
  */
 package org.hibernate.mapping;
 
+import org.hibernate.Incubating;
 import org.hibernate.annotations.SoftDeleteType;
+import org.hibernate.persister.state.internal.SoftDeleteStateManagement;
 
 /**
  * Part of the boot model which can be soft-deleted
  *
  * @author Steve Ebersole
+ *
+ * @deprecated This is no longer needed after the
+ *             introduction of {@link Stateful}.
  */
-public interface SoftDeletable {
+@Incubating @Deprecated(forRemoval = true)
+public interface SoftDeletable extends Stateful {
+
+	String INDICATOR = "indicator";
+
 	/**
 	 * Enable soft-delete for this part of the model.
 	 *
 	 * @param indicatorColumn The column which indicates soft-deletion
 	 * @param strategy The strategy for indicating soft-deletion
 	 */
-	void enableSoftDelete(Column indicatorColumn, SoftDeleteType strategy);
+	default void enableSoftDelete(Column indicatorColumn, SoftDeleteType strategy) {
+		addAuxiliaryColumn( INDICATOR, indicatorColumn );
+		setStateManagementType( SoftDeleteStateManagement.class );
+	}
 
 	/**
 	 * The column which indicates soft-deletion.
 	 */
-	Column getSoftDeleteColumn();
+	default Column getSoftDeleteColumn() {
+		return getAuxiliaryColumn( INDICATOR );
+	}
 
 	/**
 	 * The strategy for indicating soft-deletion.
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Stateful.java b/hibernate-core/src/main/java/org/hibernate/mapping/Stateful.java
new file mode 100644
index 000000000000..22d9c3ef2df7
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Stateful.java
@@ -0,0 +1,70 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.mapping;
+
+import org.hibernate.InstantiationException;
+import org.hibernate.persister.state.spi.StateManagement;
+import org.hibernate.persister.state.internal.StandardStateManagement;
+
+/**
+ * Abstracts over things which can have a {@linkplain StateManagement
+ * customized state management strategy}, providing slots to plug in
+ * extra columns related to custom state management.
+ *
+ * @author Gavin King
+ *
+ * @see org.hibernate.annotations.Temporal
+ * @see org.hibernate.annotations.Audited
+ * @see org.hibernate.annotations.SoftDelete
+ *
+ * @since 7.4
+ */
+public interface Stateful {
+
+	void setStateManagementType(Class<? extends StateManagement> stateManagementType);
+
+	Class<? extends StateManagement> getStateManagementType();
+
+	Table getAuxiliaryTable();
+
+	void setAuxiliaryTable(Table auxiliaryTable);
+
+	Table getMainTable();
+
+	boolean isMainTablePartitioned();
+
+	void setMainTablePartitioned(boolean partitioned);
+
+	Column getAuxiliaryColumn(String column);
+
+	void addAuxiliaryColumn(String name, Column column);
+
+	boolean isAuxiliaryColumnInPrimaryKey();
+
+	void setAuxiliaryColumnInPrimaryKey(String key);
+
+	boolean isPrimaryKeyDisabled();
+
+	void setPrimaryKeyDisabled(boolean disabled);
+
+	default StateManagement getStateManagement() {
+		final var stateManagementType = getStateManagementType();
+		if ( stateManagementType == null ) {
+			return StandardStateManagement.INSTANCE;
+		}
+		else {
+			try {
+				return (StateManagement)
+						stateManagementType
+								.getDeclaredField( "INSTANCE" )
+								.get( null );
+			}
+			catch (IllegalAccessException | NoSuchFieldException e) {
+				throw new InstantiationException( "Could not create StateManagement",
+						stateManagementType, e );
+			}
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java
index 8a420fb15bbe..d6c322557a24 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java
@@ -138,6 +138,11 @@ public List<Property> getPropertyClosure() {
 		return new JoinedList<>( getSuperclass().getPropertyClosure(), getProperties() );
 	}
 
+	@Override
+	public List<Property> getAllPropertyClosure() {
+		return new JoinedList<>( getSuperclass().getAllPropertyClosure(), getAllProperties() );
+	}
+
 	@Override
 	public List<Table> getTableClosure() {
 		return new JoinedList<>(
@@ -238,6 +243,11 @@ public int getPropertyClosureSpan() {
 		return getSuperclass().getPropertyClosureSpan() + super.getPropertyClosureSpan();
 	}
 
+	@Override
+	public int getAllPropertyClosureSpan() {
+		return getSuperclass().getAllPropertyClosureSpan() + super.getAllPropertyClosureSpan();
+	}
+
 	@Override
 	public List<Join> getJoinClosure() {
 		return new JoinedList<>( getSuperclass().getJoinClosure(), super.getJoinClosure() );
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java
index 04d3f60d8a6b..498d0982e578 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java
@@ -30,7 +30,6 @@
 import org.hibernate.dialect.Dialect;
 
 import org.hibernate.resource.transaction.spi.DdlTransactionIsolator;
-import org.jboss.logging.Logger;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
@@ -46,7 +45,6 @@
  * @author Gavin King
  */
 public class Table implements Serializable, ContributableDatabaseObject {
-	private static final Logger LOG = Logger.getLogger( Table.class );
 	private static final Column[] EMPTY_COLUMN_ARRAY = new Column[0];
 
 	private final String contributor;
@@ -72,6 +70,7 @@ public class Table implements Serializable, ContributableDatabaseObject {
 	private String comment;
 	private String viewQuery;
 	private String options;
+	private String extraDeclarations;
 
 	private List<Function<SqlStringGenerationContext, InitCommand>> initCommandProducers;
 	private List<BiFunction<SqlStringGenerationContext, DdlTransactionIsolator, InitCommand>> resyncCommandProducers;
@@ -110,8 +109,9 @@ public Table(
 			String subselect,
 			boolean isAbstract) {
 		this.contributor = contributor;
-		this.catalog = namespace.getPhysicalName().catalog();
-		this.schema = namespace.getPhysicalName().schema();
+		final var physicalName = namespace.getPhysicalName();
+		this.catalog = physicalName.catalog();
+		this.schema = physicalName.schema();
 		this.name = physicalTableName;
 		this.subselect = subselect;
 		this.isAbstract = isAbstract;
@@ -119,8 +119,9 @@ public Table(
 
 	public Table(String contributor, Namespace namespace, String subselect, boolean isAbstract) {
 		this.contributor = contributor;
-		this.catalog = namespace.getPhysicalName().catalog();
-		this.schema = namespace.getPhysicalName().schema();
+		final var physicalName = namespace.getPhysicalName();
+		this.catalog = physicalName.catalog();
+		this.schema = physicalName.schema();
 		this.subselect = subselect;
 		this.isAbstract = isAbstract;
 	}
@@ -247,7 +248,7 @@ public Column getColumn(Column column) {
 			return null;
 		}
 		else {
-			final Column existing = columns.get( column.getCanonicalName() );
+			final var existing = columns.get( column.getCanonicalName() );
 			return column.equals( existing ) ? existing : null;
 		}
 	}
@@ -276,15 +277,11 @@ public void addColumn(Column column) {
 		if ( oldColumn == null ) {
 			if ( primaryKey != null ) {
 				for ( var primaryKeyColumn : primaryKey.getColumns() ) {
-					if ( primaryKeyColumn.getCanonicalName().equals( column.getCanonicalName() ) ) {
+					if ( Objects.equals( column.getCanonicalName(),
+							primaryKeyColumn.getCanonicalName() ) ) {
+						// Force the column to be non-null
+						// as it is part of the primary key
 						column.setNullable( false );
-						if ( LOG.isTraceEnabled() ) {
-							LOG.tracef(
-									"Forcing column [%s] to be non-null as it is part of the primary key for table [%s]",
-									column.getCanonicalName(),
-									getNameIdentifier().getCanonicalName()
-							);
-						}
 					}
 				}
 			}
@@ -452,18 +449,21 @@ public void setPrimaryKey(PrimaryKey primaryKey) {
 	}
 
 	public Index getOrCreateIndex(String indexName) {
-		Index index =  indexes.get( indexName );
-		if ( index == null ) {
-			index = new Index();
-			index.setName( indexName );
-			index.setTable( this );
-			indexes.put( indexName, index );
+		final var index =  indexes.get( indexName );
+		if ( index != null ) {
+			return index;
+		}
+		else {
+			final var newIndex = new Index();
+			newIndex.setName( indexName );
+			newIndex.setTable( this );
+			indexes.put( indexName, newIndex );
+			return newIndex;
 		}
-		return index;
 	}
 
 	public Index getIndex(String indexName) {
-		return  indexes.get( indexName );
+		return indexes.get( indexName );
 	}
 
 	public Index addIndex(Index index) {
@@ -859,4 +859,12 @@ public String getOptions() {
 	public void setOptions(String options) {
 		this.options = options;
 	}
+
+	public String getExtraDeclarations() {
+		return extraDeclarations;
+	}
+
+	public void setExtraDeclarations(String extraDeclarations) {
+		this.extraDeclarations = extraDeclarations;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java
index 4826d44f23cf..52feb8b9796b 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java
@@ -176,7 +176,7 @@ public int[] sortProperties() {
 							? entityBinding.getIdentifier()
 							: entityBinding.getRecursiveProperty( referencedPropertyName ).getValue();
 			if ( value instanceof Component component ) {
-				final int[] originalPropertyOrder = component.sortProperties();
+				final var originalPropertyOrder = component.sortProperties();
 				if ( !sorted ) {
 					if ( originalPropertyOrder != null ) {
 						sortColumns( originalPropertyOrder );
@@ -192,14 +192,17 @@ public int[] sortProperties() {
 		return null;
 	}
 
+	boolean isActuallyConstrained() {
+		return isConstrained();
+	}
+
 	@Override
 	public void createForeignKey(PersistentClass referencedEntity, AnnotatedJoinColumns joinColumns) {
 		// Ensure properties are sorted before we create a foreign key
 		sortProperties();
-		if ( isForeignKeyEnabled()
-				&& referencedPropertyName == null
-				&& !hasFormula()
-				&& isConstrained() ) {
+		if ( referencedPropertyName == null
+				&& isActuallyConstrained()
+				&& !hasAuxiliaryColumnInPrimaryKey( referencedEntity ) ) {
 			final var firstColumn = joinColumns.getJoinColumns().get( 0 );
 			final Object owner = findReferencedColumnOwner( referencedEntity, firstColumn, getBuildingContext() );
 			if ( owner instanceof Join join ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java
index a31aab07297d..a9becae74c04 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java
@@ -12,6 +12,7 @@
 import org.hibernate.Incubating;
 import org.hibernate.Internal;
 import org.hibernate.MappingException;
+import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.service.ServiceRegistry;
@@ -51,6 +52,13 @@ public interface Value extends Serializable {
 	 */
 	List<Column> getColumns();
 
+	/**
+	 * Does the mapping involve at least one column?
+	 *
+	 * @since 7.3
+	 */
+	boolean hasColumns();
+
 	/**
 	 * Same as {@link #getSelectables()} except it returns the PK for the
 	 * non-owning side of a one-to-one association.
@@ -78,9 +86,7 @@ default JdbcMapping getSelectableType(MappingContext mappingContext, int index)
 
 	private JdbcMapping getType(MappingContext factory, Type elementType, int index) {
 		if ( elementType instanceof CompositeType compositeType ) {
-			final Type[] subtypes = compositeType.getSubtypes();
-			for ( int i = 0; i < subtypes.length; i++ ) {
-				final Type subtype = subtypes[i];
+			for ( final var subtype : compositeType.getSubtypes() ) {
 				final int columnSpan =
 						subtype instanceof EntityType entityType
 								? getIdType( entityType ).getColumnSpan( factory )
@@ -107,7 +113,7 @@ else if ( elementType instanceof MetaType metaType ) {
 	}
 
 	private Type getIdType(EntityType entityType) {
-		final PersistentClass entityBinding =
+		final var entityBinding =
 				getBuildingContext().getMetadataCollector()
 						.getEntityBinding( entityType.getAssociatedEntityName() );
 		return entityType.isReferenceToPrimaryKey()
@@ -145,16 +151,23 @@ private Type getIdType(EntityType entityType) {
 	boolean isSame(Value other);
 
 	boolean[] getColumnInsertability();
+
 	boolean hasAnyInsertableColumns();
 
 	boolean[] getColumnUpdateability();
+
 	boolean hasAnyUpdatableColumns();
 
+	void setNonUpdatable();
+	void setNonInsertable();
+
 	@Incubating
 	default MetadataBuildingContext getBuildingContext() {
 		throw new UnsupportedOperationException( "Value#getBuildingContext is not implemented by: " + getClass().getName() );
 	}
+
 	ServiceRegistry getServiceRegistry();
+
 	Value copy();
 
 	boolean isColumnInsertable(int index);
@@ -177,14 +190,28 @@ default String getExtraCreateTableInfo() {
 	 * @param owner the owner of this value, used just for error reporting
 	 */
 	@Internal
-	default void checkColumnDuplication(Set<String> distinctColumns, String owner) {
+	default void checkColumnDuplication(Set<QualifiedColumnName> distinctColumns, String owner) {
 		for ( int i = 0; i < getSelectables().size(); i++ ) {
-			final Selectable selectable = getSelectables().get( i );
-			if ( isColumnInsertable( i ) || isColumnUpdateable( i ) ) {
-				final Column col = (Column) selectable;
-				if ( !distinctColumns.add( col.getName() ) ) {
+			if ( getSelectables().get( i ) instanceof Column column
+					&& ( isColumnInsertable( i ) || isColumnUpdateable( i ) ) ) {
+				final var primaryTable = getTable();
+				final Identifier catalog;
+				final Identifier schema;
+				final Identifier table;
+				if ( primaryTable != null ) {
+					catalog = primaryTable.getCatalogIdentifier();
+					schema = primaryTable.getSchemaIdentifier();
+					table = primaryTable.getNameIdentifier();
+				}
+				else {
+					catalog = null;
+					schema = null;
+					table = null;
+				}
+				final var columnName = column.getNameIdentifier( getBuildingContext() );
+				if ( !distinctColumns.add( new QualifiedColumnName( catalog, schema, table, columnName ) ) ){
 					throw new MappingException(
-							"Column '" + col.getName()
+							"Column '" + column.getName()
 									+ "' is duplicated in mapping for " + owner
 									+ " (use '@Column(insertable=false, updatable=false)' when mapping multiple properties to the same column)"
 					);
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/package-info.java b/hibernate-core/src/main/java/org/hibernate/mapping/package-info.java
index 933119b20822..f49209c6f25f 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/package-info.java
@@ -24,14 +24,14 @@
  * The lifecycle of these mapping objects is outlined below.
  * <ol>
  * <li>It is the responsibility of the metadata binders in the package
- *     {@link org.hibernate.boot.model.internal} to process a set of
+ *     {@code org.hibernate.boot.model.internal} to process a set of
  *     annotated classes and produce fully-initialized mapping model
  *     objects. This is in itself a complicated multiphase process,
  *     since, for example, the type of an association mapping in one
  *     entity cannot be fully assigned until the target entity has
  *     been processed.
  * <li>The mapping model objects are then passed to the constructor
- *     of {@link org.hibernate.internal.SessionFactoryImpl}, which
+ *     of {@code org.hibernate.internal.SessionFactoryImpl}, which
  *     simply passes them along on to an object which implements
  *     {@link org.hibernate.metamodel.MappingMetamodel} and uses them
  *     to create persister objects for
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java
index 0a1ac0b12589..d201ffe211e1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java
@@ -143,7 +143,7 @@ public TableGroupJoin createTableGroupJoin(
 				null,
 				creationState
 		);
-		return new TableGroupJoin( navigablePath, joinType, tableGroup, null );
+		return new TableGroupJoin( navigablePath, joinType, tableGroup );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java
index 9277ea7e1098..940c0745304d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java
@@ -212,7 +212,7 @@ private DomainType<?> determineSimpleType(ValueContext typeContext) {
 	public static DomainType<?> determineSimpleType(ValueContext typeContext, MetadataContext context) {
 		return switch ( typeContext.getValueClassification() ) {
 			case BASIC -> basicDomainType( typeContext, context );
-			case ENTITY -> entityDomainType (typeContext, context );
+			case ENTITY -> entityDomainType( typeContext, context );
 			case EMBEDDABLE -> embeddableDomainType( typeContext, context );
 			default -> throw new AssertionFailure( "Unknown type : " + typeContext.getValueClassification() );
 		};
@@ -367,7 +367,7 @@ private static JavaType<?> determineRelationalJavaType(
 			final var descriptor = value.getJpaAttributeConverterDescriptor();
 			if ( descriptor != null ) {
 				return context.getJavaTypeRegistry().resolveDescriptor(
-						descriptor.getRelationalValueResolvedType().getErasedType()
+						descriptor.getRelationalValueResolvedType()
 				);
 			}
 		}
@@ -699,7 +699,7 @@ private static Member resolveVirtualIdentifierMember( Property property, EntityP
 	private static Member resolveEntityMember(Property property, EntityPersister declaringEntity) {
 		final String propertyName = property.getName();
 		return !propertyName.equals( declaringEntity.getIdentifierPropertyName() )
-			&& declaringEntity.findAttributeMapping( propertyName ) == null
+			&& declaringEntity.findAttributeMapping( propertyName ) == null && !property.isGeneric()
 				// just like in #determineIdentifierJavaMember , this *should* indicate we have an IdClass mapping
 				? resolveVirtualIdentifierMember( property, declaringEntity )
 				: getter( declaringEntity, property, propertyName, property.getType().getReturnedClass() );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableHelper.java
index dbb05cd63ee6..6e2eeffddc05 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableHelper.java
@@ -4,14 +4,18 @@
  */
 package org.hibernate.metamodel.internal;
 
-import static java.util.Arrays.binarySearch;
-
 public class EmbeddableHelper {
 	public static int[] determineMappingIndex(String[] sortedNames, String[] names) {
 		final int[] index = new int[sortedNames.length];
 		int i = 0;
 		for ( String name : names ) {
-			final int mappingIndex = binarySearch( sortedNames, name );
+			int mappingIndex = -1;
+			for ( int j = 0; j < sortedNames.length; j++ ) {
+				if ( name.equals( sortedNames[j] ) ) {
+					mappingIndex = j;
+					break;
+				}
+			}
 			if ( mappingIndex != -1 ) {
 				index[i++] = mappingIndex;
 			}
@@ -22,7 +26,13 @@ public static int[] determineMappingIndex(String[] sortedNames, String[] names)
 	public static boolean resolveIndex(String[] sortedComponentNames, String[] componentNames, int[] index) {
 		boolean hasGaps = false;
 		for ( int i = 0; i < componentNames.length; i++ ) {
-			final int newIndex = binarySearch( sortedComponentNames, componentNames[i] );
+			int newIndex = -1;
+			for ( int j = 0; j < sortedComponentNames.length; j++ ) {
+				if ( componentNames[i].equals( sortedComponentNames[j] ) ) {
+					newIndex = j;
+					break;
+				}
+			}
 			index[i] = newIndex;
 			hasGaps = hasGaps || newIndex < 0;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorDynamicMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorDynamicMap.java
index b66760bf778c..ed3e1042c2ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorDynamicMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorDynamicMap.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.metamodel.internal;
 
-import java.util.Map;
 import java.util.function.Supplier;
 
 import org.hibernate.mapping.Component;
@@ -30,7 +29,7 @@ public EmbeddableInstantiatorDynamicMap(
 
 	@Override
 	public Object instantiate(ValueAccess valuesAccess) {
-		final Map<?,?> dataMap = generateDataMap();
+		final var dataMap = generateDataMap();
 		final var values = valuesAccess == null ? null : valuesAccess.getValues();
 		if ( values != null ) {
 			final var mappingType = runtimeDescriptorAccess.get();
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoIndirecting.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoIndirecting.java
index 4b02422129a0..67efacb44cbb 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoIndirecting.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoIndirecting.java
@@ -13,7 +13,9 @@
 /**
  * Support for instantiating embeddables as POJO representation through a constructor
  */
-public class EmbeddableInstantiatorPojoIndirecting extends AbstractPojoInstantiator implements EmbeddableInstantiator {
+public class EmbeddableInstantiatorPojoIndirecting
+		extends AbstractPojoInstantiator
+		implements EmbeddableInstantiator {
 	protected final Constructor<?> constructor;
 	protected final int[] index;
 
@@ -30,7 +32,7 @@ public static EmbeddableInstantiatorPojoIndirecting of(
 		if ( componentNames == null ) {
 			throw new IllegalArgumentException( "Can't determine field assignment for constructor: " + constructor );
 		}
-		final int[] index = new int[componentNames.length];
+		final var index = new int[componentNames.length];
 		return EmbeddableHelper.resolveIndex( propertyNames, componentNames, index )
 				? new EmbeddableInstantiatorPojoIndirectingWithGap( constructor, index )
 				: new EmbeddableInstantiatorPojoIndirecting( constructor, index );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoOptimized.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoOptimized.java
index 40c72aeabeae..5e77b55c317e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoOptimized.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoOptimized.java
@@ -15,7 +15,9 @@
  * Support for instantiating embeddables as POJO representation
  * using bytecode optimizer
  */
-public class EmbeddableInstantiatorPojoOptimized extends AbstractPojoInstantiator implements StandardEmbeddableInstantiator {
+public class EmbeddableInstantiatorPojoOptimized
+		extends AbstractPojoInstantiator
+		implements StandardEmbeddableInstantiator {
 	private final Supplier<EmbeddableMappingType> embeddableMappingAccess;
 	private final InstantiationOptimizer instantiationOptimizer;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java
index f6218d5565c8..d28556d9d9a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorPojoStandard.java
@@ -18,12 +18,16 @@
 /**
  * Support for instantiating embeddables as POJO representation
  */
-public class EmbeddableInstantiatorPojoStandard extends AbstractPojoInstantiator implements StandardEmbeddableInstantiator {
+public class EmbeddableInstantiatorPojoStandard
+		extends AbstractPojoInstantiator
+		implements StandardEmbeddableInstantiator {
 
 	private final Supplier<EmbeddableMappingType> embeddableMappingAccess;
 	private final Constructor<?> constructor;
 
-	public EmbeddableInstantiatorPojoStandard(Class<?> embeddableClass, Supplier<EmbeddableMappingType> embeddableMappingAccess) {
+	public EmbeddableInstantiatorPojoStandard(
+			Class<?> embeddableClass,
+			Supplier<EmbeddableMappingType> embeddableMappingAccess) {
 		super( embeddableClass );
 		this.embeddableMappingAccess = embeddableMappingAccess;
 		this.constructor = resolveConstructor( embeddableClass );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordIndirecting.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordIndirecting.java
index aa323b43c8d5..9b51f59eb072 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordIndirecting.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableInstantiatorRecordIndirecting.java
@@ -22,8 +22,8 @@ public EmbeddableInstantiatorRecordIndirecting(Class<?> javaType, int[] index) {
 	}
 
 	public static EmbeddableInstantiatorRecordIndirecting of(Class<?> javaType, String[] propertyNames) {
-		final String[] componentNames = getRecordComponentNames( javaType );
-		final int[] index = new int[componentNames.length];
+		final var componentNames = getRecordComponentNames( javaType );
+		final var index = new int[componentNames.length];
 		return EmbeddableHelper.resolveIndex( propertyNames, componentNames, index )
 				? new EmbeddableInstantiatorRecordIndirectingWithGap( javaType, index )
 				: new EmbeddableInstantiatorRecordIndirecting( javaType, index );
@@ -49,7 +49,8 @@ public Object instantiate(ValueAccess valuesAccess) {
 	}
 
 	// Handles gaps, by leaving the value null for that index
-	private static class EmbeddableInstantiatorRecordIndirectingWithGap extends EmbeddableInstantiatorRecordIndirecting {
+	private static class EmbeddableInstantiatorRecordIndirectingWithGap
+			extends EmbeddableInstantiatorRecordIndirecting {
 
 		public EmbeddableInstantiatorRecordIndirectingWithGap(Class<?> javaType, int[] index) {
 			super( javaType, index );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java
index ff64b3d31b40..86b61966b486 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java
@@ -39,7 +39,6 @@ public class EmbeddableRepresentationStrategyPojo implements EmbeddableRepresent
 	private final PropertyAccess[] propertyAccesses;
 	private final Map<String, Integer> attributeNameToPositionMap;
 
-	private final StrategySelector strategySelector;
 	private final ReflectionOptimizer reflectionOptimizer;
 	private final EmbeddableInstantiator instantiator;
 	private final Map<Object, EmbeddableInstantiator> instantiatorsByDiscriminator;
@@ -57,20 +56,23 @@ public EmbeddableRepresentationStrategyPojo(
 		propertyAccesses = new PropertyAccess[propertySpan];
 		attributeNameToPositionMap = new HashMap<>( propertySpan );
 
+		final var strategySelector =
+				creationContext.getServiceRegistry()
+						.getService( StrategySelector.class );
+
 		// We need access to the Class objects, used only during initialization
 		final var subclassesByName = getSubclassesByName( bootDescriptor, creationContext );
 		boolean foundCustomAccessor = false;
 		for ( int i = 0; i < bootDescriptor.getProperties().size(); i++ ) {
 			final var property = bootDescriptor.getProperty( i );
-			final Class<?> embeddableClass;
-			if ( subclassesByName != null ) {
-				final var subclass = subclassesByName.get( bootDescriptor.getPropertyDeclaringClass( property ) );
-				embeddableClass = subclass != null ? subclass : getEmbeddableJavaType().getJavaTypeClass();
-			}
-			else {
-				embeddableClass = getEmbeddableJavaType().getJavaTypeClass();
-			}
-			propertyAccesses[i] = buildPropertyAccess( property, embeddableClass, customInstantiator == null );
+			final var embeddableClass = getEmbeddableClass( bootDescriptor, subclassesByName, property );
+			propertyAccesses[i] =
+					buildPropertyAccess(
+							property,
+							embeddableClass,
+							customInstantiator == null,
+							strategySelector
+					);
 			attributeNameToPositionMap.put( property.getName(), i );
 
 			if ( !property.isBasicPropertyAccessor() ) {
@@ -78,11 +80,9 @@ public EmbeddableRepresentationStrategyPojo(
 			}
 		}
 
-		boolean hasCustomAccessors = foundCustomAccessor;
-		strategySelector = creationContext.getServiceRegistry().getService( StrategySelector.class );
 		reflectionOptimizer = buildReflectionOptimizer(
 				bootDescriptor,
-				hasCustomAccessors,
+				foundCustomAccessor,
 				propertyAccesses,
 				creationContext
 		);
@@ -120,13 +120,26 @@ public EmbeddableRepresentationStrategyPojo(
 		}
 	}
 
-	private static <T> JavaType<T> resolveEmbeddableJavaType(
+	private Class<?> getEmbeddableClass(
+			Component bootDescriptor,
+			Map<String, Class<?>> subclassesByName,
+			Property property) {
+		if ( subclassesByName != null ) {
+			final var subclass = subclassesByName.get( bootDescriptor.getPropertyDeclaringClass( property ) );
+			return subclass != null ? subclass : getEmbeddableJavaType().getJavaTypeClass();
+		}
+		else {
+			return getEmbeddableJavaType().getJavaTypeClass();
+		}
+	}
+
+	private static <T> JavaType<?> resolveEmbeddableJavaType(
 			Component bootDescriptor,
 			CompositeUserType<T> compositeUserType,
 			RuntimeModelCreationContext creationContext) {
 		final var javaTypeRegistry = creationContext.getTypeConfiguration().getJavaTypeRegistry();
 		return compositeUserType == null
-				? javaTypeRegistry.getDescriptor( bootDescriptor.getComponentClass() )
+				? javaTypeRegistry.resolveDescriptor( bootDescriptor.getComponentClass() )
 				: javaTypeRegistry.resolveDescriptor( compositeUserType.returnedClass(),
 						() -> new CompositeUserTypeJavaTypeWrapper<>( compositeUserType ) );
 	}
@@ -165,7 +178,8 @@ private static ProxyFactoryFactory getProxyFactoryFactory(RuntimeModelCreationCo
 	private PropertyAccess buildPropertyAccess(
 			Property property,
 			Class<?> embeddableClass,
-			boolean requireSetters) {
+			boolean requireSetters,
+			StrategySelector strategySelector) {
 		final var strategy = propertyAccessStrategy( property, embeddableClass, strategySelector );
 		if ( strategy == null ) {
 			throw new HibernateException(
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java
index 32b3a1216e61..d452dbbd0bf0 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyPojoStandard.java
@@ -52,8 +52,6 @@ public class EntityRepresentationStrategyPojoStandard implements EntityRepresent
 	private final ProxyFactory proxyFactory;
 	private final EntityInstantiator instantiator;
 
-	private final StrategySelector strategySelector;
-
 	private final String identifierPropertyName;
 	private final PropertyAccess identifierPropertyAccess;
 	private final Map<String, PropertyAccess> propertyAccessMap;
@@ -73,17 +71,23 @@ public EntityRepresentationStrategyPojoStandard(
 
 		isBytecodeEnhanced = isPersistentAttributeInterceptableType( mappedJavaType );
 
+		final var strategySelector =
+				creationContext.getServiceRegistry()
+						.getService( StrategySelector.class );
+
 		final var identifierProperty = bootDescriptor.getIdentifierProperty();
 		if ( identifierProperty == null ) {
 			identifierPropertyName = null;
 			identifierPropertyAccess = null;
 
 			if ( bootDescriptor.getIdentifier() instanceof Component descriptorIdentifierComponent ) {
-				final Component identifierMapper = bootDescriptor.getIdentifierMapper();
+				final var identifierMapper = bootDescriptor.getIdentifierMapper();
 				mapsIdRepresentationStrategy = new EmbeddableRepresentationStrategyPojo(
 						identifierMapper == null ? descriptorIdentifierComponent : identifierMapper,
 						() -> {
-							final var type = (CompositeTypeImplementor) bootDescriptor.getIdentifierMapper().getType();
+							final var type =
+									(CompositeTypeImplementor)
+											bootDescriptor.getIdentifierMapper().getType();
 							return type.getMappingModelPart().getEmbeddableTypeDescriptor();
 						},
 						// we currently do not support custom instantiators for identifiers
@@ -99,11 +103,9 @@ public EntityRepresentationStrategyPojoStandard(
 		else {
 			mapsIdRepresentationStrategy = null;
 			identifierPropertyName = identifierProperty.getName();
-			identifierPropertyAccess = makePropertyAccess( identifierProperty );
+			identifierPropertyAccess = makePropertyAccess( identifierProperty, strategySelector );
 		}
 
-		strategySelector = creationContext.getServiceRegistry().getService( StrategySelector.class );
-
 		final var bytecodeProvider =
 				creationContext.getBootstrapContext().getServiceRegistry()
 						.requireService( BytecodeProvider.class );
@@ -116,7 +118,7 @@ public EntityRepresentationStrategyPojoStandard(
 				creationContext
 		);
 
-		propertyAccessMap = buildPropertyAccessMap( bootDescriptor );
+		propertyAccessMap = buildPropertyAccessMap( bootDescriptor, strategySelector );
 		reflectionOptimizer = resolveReflectionOptimizer( bytecodeProvider );
 
 		instantiator = determineInstantiator( bootDescriptor, runtimeDescriptor );
@@ -129,7 +131,8 @@ private ProxyFactory resolveProxyFactory(
 			BytecodeProvider bytecodeProvider,
 			RuntimeModelCreationContext creationContext) {
 		if ( entityPersister.isAbstract() && bootDescriptor.isConcreteProxy() ) {
-			// The entity class is abstract, but the hierarchy always gets entities loaded/proxied using their concrete type.
+			// The entity class is abstract, but the hierarchy always
+			// gets entities loaded/proxied using their concrete type.
 			// So we do not need proxies for this entity class.
 			return null;
 		}
@@ -143,9 +146,10 @@ else if ( entityPersister.getBytecodeEnhancementMetadata().isEnhancedForLazyLoad
 		}
 		else {
 			if ( proxyJavaType != null && entityPersister.isLazy() ) {
-				final var proxyFactory = createProxyFactory( bootDescriptor, bytecodeProvider, creationContext );
+				final var proxyFactory =
+						createProxyFactory( bootDescriptor, bytecodeProvider, creationContext );
 				if ( proxyFactory == null ) {
-					((EntityMetamodel) entityPersister).setLazy( false );
+					( (EntityMetamodel) entityPersister ).setLazy( false );
 				}
 				return proxyFactory;
 			}
@@ -155,10 +159,11 @@ else if ( entityPersister.getBytecodeEnhancementMetadata().isEnhancedForLazyLoad
 		}
 	}
 
-	private Map<String, PropertyAccess> buildPropertyAccessMap(PersistentClass bootDescriptor) {
+	private Map<String, PropertyAccess> buildPropertyAccessMap(
+			PersistentClass bootDescriptor, StrategySelector strategySelector) {
 		final Map<String, PropertyAccess> propertyAccessMap = new LinkedHashMap<>();
-		for ( var property : bootDescriptor.getPropertyClosure() ) {
-			propertyAccessMap.put( property.getName(), makePropertyAccess( property ) );
+		for ( var property : bootDescriptor.getAllPropertyClosure() ) {
+			propertyAccessMap.put( property.getName(), makePropertyAccess( property, strategySelector ) );
 		}
 		return propertyAccessMap;
 	}
@@ -309,7 +314,7 @@ private ReflectionOptimizer resolveReflectionOptimizer(BytecodeProvider bytecode
 		return bytecodeProvider.getReflectionOptimizer( mappedJtd.getJavaTypeClass(), propertyAccessMap );
 	}
 
-	private PropertyAccess makePropertyAccess(Property bootAttributeDescriptor) {
+	private PropertyAccess makePropertyAccess(Property bootAttributeDescriptor, StrategySelector strategySelector) {
 		final var mappedClass = mappedJtd.getJavaTypeClass();
 		final String descriptorName = bootAttributeDescriptor.getName();
 		final var strategy = propertyAccessStrategy( bootAttributeDescriptor, mappedClass, strategySelector );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
index c0c3949b7bf9..671708a1bf09 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java
@@ -12,8 +12,8 @@
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.mapping.Component;
+import org.hibernate.mapping.IdentifiableTypeClass;
 import org.hibernate.mapping.MappedSuperclass;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
@@ -49,7 +49,8 @@
 import java.util.function.BiFunction;
 
 import static java.util.Collections.unmodifiableMap;
-import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
+import static org.hibernate.internal.util.collections.ArrayHelper.contains;
+import static org.hibernate.metamodel.mapping.MappingModelCreationLogging.MAPPING_MODEL_CREATION_MESSAGE_LOGGER;
 import static org.hibernate.internal.util.collections.CollectionHelper.mapOfSize;
 import static org.hibernate.metamodel.internal.InjectionHelper.injectField;
 
@@ -129,7 +130,7 @@ public TypeConfiguration getTypeConfiguration() {
 		return typeConfiguration;
 	}
 
-	public JavaTypeRegistry getJavaTypeRegistry(){
+	public JavaTypeRegistry getJavaTypeRegistry() {
 		return typeConfiguration.getJavaTypeRegistry();
 	}
 
@@ -172,7 +173,7 @@ public Map<Class<?>, MappedSuperclassDomainType<?>> getMappedSuperclassTypeMap()
 		return mappedSuperClassTypeMap;
 	}
 
-	public  void registerEntityType(PersistentClass persistentClass, EntityTypeImpl<?> entityType) {
+	public void registerEntityType(PersistentClass persistentClass, EntityTypeImpl<?> entityType) {
 		final var javaType = entityType.getJavaType();
 		if ( javaType != null && javaType != Map.class ) {
 			entityTypes.put( javaType, entityType );
@@ -222,7 +223,6 @@ public void registerMappedSuperclassType(
 	 * implementation.  May return null if the given {@link PersistentClass} has not yet been processed.
 	 *
 	 * @param persistentClass The Hibernate (config time) metamodel instance representing an entity.
-	 *
 	 * @return Tne corresponding JPA {@link org.hibernate.type.EntityType}, or null if not yet processed.
 	 */
 	public EntityDomainType<?> locateEntityType(PersistentClass persistentClass) {
@@ -234,7 +234,6 @@ public EntityDomainType<?> locateEntityType(PersistentClass persistentClass) {
 	 * return null which could mean that no such mapping exists at least at this time.
 	 *
 	 * @param javaType The java class.
-	 *
 	 * @return The corresponding JPA {@link org.hibernate.type.EntityType}, or null.
 	 */
 	public EntityDomainType<?> locateEntityType(Class<?> javaType) {
@@ -246,7 +245,6 @@ public EntityDomainType<?> locateEntityType(Class<?> javaType) {
 	 * return null which could means that no such mapping exists at least at this time.
 	 *
 	 * @param entityName The entity-name.
-	 *
 	 * @return The corresponding JPA {@link org.hibernate.type.EntityType}, or null.
 	 */
 	public IdentifiableDomainType<?> locateIdentifiableType(String entityName) {
@@ -287,9 +285,7 @@ public Map<String, IdentifiableDomainType<?>> getIdentifiableTypesByName() {
 	}
 
 	public void wrapUp() {
-		if ( CORE_LOGGER.isTraceEnabled() ) {
-			CORE_LOGGER.trace( "Wrapping up metadata context..." );
-		}
+		MAPPING_MODEL_CREATION_MESSAGE_LOGGER.wrappingUpMetadataContext();
 
 		final boolean staticMetamodelScanEnabled =
 				jpaStaticMetaModelPopulationSetting != JpaStaticMetamodelPopulationSetting.DISABLED;
@@ -298,8 +294,9 @@ public void wrapUp() {
 		//we need to process types from superclasses to subclasses
 		for ( Object mapping : orderedMappings ) {
 			if ( mapping instanceof PersistentClass persistentClass ) {
-				if ( CORE_LOGGER.isTraceEnabled() ) {
-					CORE_LOGGER.trace( "Starting entity [" + persistentClass.getEntityName() + ']' );
+				if ( MAPPING_MODEL_CREATION_MESSAGE_LOGGER.isTraceEnabled() ) {
+					MAPPING_MODEL_CREATION_MESSAGE_LOGGER.startingEntity(
+							persistentClass.getEntityName() );
 				}
 				try {
 					final var jpaMapping = entityTypesByPersistentClass.get( persistentClass );
@@ -309,17 +306,16 @@ public void wrapUp() {
 					applyGenericProperties( persistentClass, jpaMapping );
 
 					for ( var property : persistentClass.getDeclaredProperties() ) {
-						if ( property.getValue() == persistentClass.getIdentifierMapper() ) {
-							// property represents special handling for id-class mappings but we have already
-							// accounted for the embedded property mappings in #applyIdMetadata &&
-							// #buildIdClassAttributes
-							continue;
-						}
-						if ( persistentClass.isVersioned() && property == persistentClass.getVersion() ) {
+						// property represents special handling for @IdClass mappings,
+						// but we have already accounted for the embedded property mappings
+						// in #applyIdMetadata && #buildIdClassAttributes
+						if ( property.getValue() != persistentClass.getIdentifierMapper()
 							// skip the version property, it was already handled previously.
-							continue;
+							&& !isVersion( persistentClass, property )
+							// Skip generic properties since they may only be declared on abstract classes
+							&& !property.isGenericSpecialization() ) {
+							buildAttribute( property, jpaMapping );
 						}
-						buildAttribute( property, jpaMapping );
 					}
 
 					( (AttributeContainer<?>) jpaMapping ).getInFlightAccess().finishUp();
@@ -329,14 +325,16 @@ public void wrapUp() {
 					}
 				}
 				finally {
-					if ( CORE_LOGGER.isTraceEnabled() ) {
-						CORE_LOGGER.trace( "Completed entity [" + persistentClass.getEntityName() + ']' );
+					if ( MAPPING_MODEL_CREATION_MESSAGE_LOGGER.isTraceEnabled() ) {
+						MAPPING_MODEL_CREATION_MESSAGE_LOGGER.completedEntity(
+								persistentClass.getEntityName() );
 					}
 				}
 			}
 			else if ( mapping instanceof MappedSuperclass mappedSuperclass ) {
-				if ( CORE_LOGGER.isTraceEnabled() ) {
-					CORE_LOGGER.trace( "Starting mapped superclass [" + mappedSuperclass.getMappedClass().getName() + ']' );
+				if ( MAPPING_MODEL_CREATION_MESSAGE_LOGGER.isTraceEnabled() ) {
+					MAPPING_MODEL_CREATION_MESSAGE_LOGGER.startingMappedSuperclass(
+							mappedSuperclass.getMappedClass().getName() );
 				}
 				try {
 					final var jpaType = mappedSuperclassByMappedSuperclassMapping.get( mappedSuperclass );
@@ -346,17 +344,14 @@ else if ( mapping instanceof MappedSuperclass mappedSuperclass ) {
 //					applyNaturalIdAttribute( safeMapping, jpaType );
 
 					for ( var property : mappedSuperclass.getDeclaredProperties() ) {
-						if ( isIdentifierProperty( property, mappedSuperclass ) ) {
-							// property represents special handling for id-class mappings but we have already
-							// accounted for the embedded property mappings in #applyIdMetadata &&
-							// #buildIdClassAttributes
-							continue;
-						}
-						else if ( mappedSuperclass.isVersioned() && property == mappedSuperclass.getVersion() ) {
+						// property represents special handling for @IdClass mappings,
+						// but we have already accounted for the embedded property mappings
+						// in #applyIdMetadata && #buildIdClassAttributes
+						if ( !isIdentifierProperty( property, mappedSuperclass )
 							// skip the version property, it was already handled previously.
-							continue;
+							&& !isVersion( mappedSuperclass, property ) ) {
+							buildAttribute( property, jpaType );
 						}
-						buildAttribute( property, jpaType );
 					}
 
 					( (AttributeContainer<?>) jpaType ).getInFlightAccess().finishUp();
@@ -366,8 +361,9 @@ else if ( mappedSuperclass.isVersioned() && property == mappedSuperclass.getVers
 					}
 				}
 				finally {
-					if ( CORE_LOGGER.isTraceEnabled() ) {
-						CORE_LOGGER.trace( "Completed mapped superclass [" + mappedSuperclass.getMappedClass().getName() + ']' );
+					if ( MAPPING_MODEL_CREATION_MESSAGE_LOGGER.isTraceEnabled() ) {
+						MAPPING_MODEL_CREATION_MESSAGE_LOGGER.completedMappedSuperclass(
+								mappedSuperclass.getMappedClass().getName() );
 					}
 				}
 			}
@@ -377,7 +373,7 @@ else if ( mappedSuperclass.isVersioned() && property == mappedSuperclass.getVers
 		}
 
 
-		while ( ! embeddablesToProcess.isEmpty() ) {
+		while ( !embeddablesToProcess.isEmpty() ) {
 			final List<EmbeddableDomainType<?>> processingEmbeddables =
 					new ArrayList<>( embeddablesToProcess.size() );
 			for ( var embeddableDomainTypes : embeddablesToProcess.values() ) {
@@ -409,14 +405,18 @@ else if ( mappedSuperclass.isVersioned() && property == mappedSuperclass.getVers
 		}
 	}
 
+	private static boolean isVersion(IdentifiableTypeClass persistentClass, Property property) {
+		return persistentClass.isVersioned() && property == persistentClass.getVersion();
+	}
+
 	private static boolean isIdentifierProperty(Property property, MappedSuperclass mappedSuperclass) {
 		final var identifierMapper = mappedSuperclass.getIdentifierMapper();
 		return identifierMapper != null
-			&& ArrayHelper.contains( identifierMapper.getPropertyNames(), property.getName() );
+			&& contains( identifierMapper.getPropertyNames(), property.getName() );
 	}
 
 	private <T> void addAttribute(EmbeddableDomainType<T> embeddable, Property property, Component component) {
-		final var attribute = buildAttribute( embeddable, property);
+		final var attribute = buildAttribute( embeddable, property );
 		if ( attribute != null ) {
 			final var superclassProperty =
 					getMappedSuperclassProperty( property.getName(),
@@ -445,26 +445,47 @@ private <T> void buildAttribute(Property property, IdentifiableDomainType<T> jpa
 	}
 
 	private <T> void addAttribute(ManagedDomainType<T> type, PersistentAttribute<T, ?> attribute) {
-		final var container = (AttributeContainer<T>) type;
-		final var inFlightAccess = container.getInFlightAccess();
-		final boolean virtual =
-				attribute.getPersistentAttributeType() == Attribute.PersistentAttributeType.EMBEDDED
-						&& attribute.getAttributeJavaType() instanceof EntityJavaType<?>;
-		if ( virtual ) {
-			@SuppressWarnings("unchecked")
-			final var embeddableDomainType = (EmbeddableDomainType<T>) attribute.getValueGraphType();
-			final var component = componentByEmbeddable.get( embeddableDomainType );
-			for ( var property : component.getProperties() ) {
-				final var subAttribute = buildAttribute( embeddableDomainType, property );
-				if ( subAttribute != null ) {
-					inFlightAccess.addAttribute( subAttribute );
-				}
+		if ( isVirtual( attribute ) ) {
+			final var embeddableDomainType = (EmbeddableDomainType<?>) attribute.getValueGraphType();
+			if ( attribute.getValueGraphType().getJavaType() == type.getJavaType() ) {
+				// weird hbm.xml <properties> construct used as a target for property-ref
+				@SuppressWarnings("unchecked") // Safe, we just checked
+				final var virtualEmbeddedType = (EmbeddableDomainType<T>) embeddableDomainType;
+				buildVirtualEmbeddedAttribute( virtualEmbeddedType, (AttributeContainer<T>) type );
+			}
+			else {
+				// occurs in a hbm.xml test where a class is mapped both as an entity and as embeddable
+				buildVirtualEmbeddedAttribute( embeddableDomainType );
 			}
 			if ( jpaMetaModelPopulationSetting != JpaMetamodelPopulationSetting.ENABLED ) {
 				return;
 			}
 		}
-		inFlightAccess.addAttribute( attribute );
+		final var container = (AttributeContainer<T>) type;
+		container.getInFlightAccess().addAttribute( attribute );
+	}
+
+	private static <T> boolean isVirtual(PersistentAttribute<T, ?> attribute) {
+		return attribute.getPersistentAttributeType() == Attribute.PersistentAttributeType.EMBEDDED
+			&& attribute.getAttributeJavaType() instanceof EntityJavaType<?>;
+	}
+
+	private <E> void buildVirtualEmbeddedAttribute(EmbeddableDomainType<E> embeddableDomainType) {
+		//noinspection UnnecessaryLocalVariable
+		final ManagedDomainType<E> domainType = embeddableDomainType;
+		buildVirtualEmbeddedAttribute( embeddableDomainType, (AttributeContainer<E>) domainType );
+	}
+
+	private <E> void buildVirtualEmbeddedAttribute(
+			EmbeddableDomainType<E> embeddableDomainType, AttributeContainer<E> container) {
+		final var inFlightAccess = container.getInFlightAccess();
+		final var component = componentByEmbeddable.get( embeddableDomainType );
+		for ( var property : component.getProperties() ) {
+			final var subAttribute = buildAttribute( embeddableDomainType, property );
+			if ( subAttribute != null ) {
+				inFlightAccess.addAttribute( subAttribute );
+			}
+		}
 	}
 
 	// 1) create the part
@@ -507,56 +528,51 @@ private <T> void applyIdAttributes(
 			PersistentClass persistentClass,
 			IdentifiableDomainType<T> identifiableType,
 			Component compositeId) {
+		assert compositeId.isEmbedded();
 		// Handle the actual id attributes
-		final List<Property> cidProperties;
-		final int propertySpan;
-		final EmbeddableTypeImpl<?> idClassType;
 		final var identifierMapper = persistentClass.getIdentifierMapper();
-		if ( identifierMapper != null ) {
-			cidProperties = identifierMapper.getProperties();
-			propertySpan = identifierMapper.getPropertySpan();
-			idClassType =
-					identifierMapper.getComponentClassName() == null
-							? null  // support for no id-class, especially for dynamic models
-							: applyIdClassMetadata( (Component) persistentClass.getIdentifier() );
-		}
-		else {
-			cidProperties = compositeId.getProperties();
-			propertySpan = compositeId.getPropertySpan();
-			idClassType = null;
-		}
-
-		assert compositeId.isEmbedded();
+		final var idClassType =
+				identifierMapper == null || identifierMapper.getComponentClassName() == null
+						? null  // support for no @IdClass, especially for dynamic models
+						: applyIdClassMetadata( (Component) persistentClass.getIdentifier() );
+		final var id = identifierMapper == null ? compositeId : identifierMapper;
+		final var compositeIdProperties = id.getProperties();
+		final int propertySpan = id.getPropertySpan();
 
-		final var idDomainType = identifiableTypesByName.get( compositeId.getOwner().getEntityName() );
-		@SuppressWarnings("unchecked")
-		final var idType = (AbstractIdentifiableType<T>) idDomainType;
-		applyIdAttributes( identifiableType, idType, propertySpan, cidProperties, idClassType );
+		final var domainType = identifiableTypesByName.get( compositeId.getOwner().getEntityName() );
+		if ( !domainType.getJavaType().isAssignableFrom( identifiableType.getJavaType() ) ) {
+			throw new AssertionFailure( "Type mismatch:"
+					+ " expected " + identifiableType.getJavaType().getTypeName()
+					+ " but was " + domainType.getJavaType().getTypeName() );
+		}
+		@SuppressWarnings("unchecked") // Safe, we just checked
+		final var castDomainType = (AbstractIdentifiableType<? super T>) domainType;
+		applyIdAttributes( identifiableType, castDomainType, propertySpan, compositeIdProperties, idClassType );
 	}
 
 	private <T> void applyIdAttributes(
 			IdentifiableDomainType<T> identifiableType,
-			AbstractIdentifiableType<T> idType,
+			AbstractIdentifiableType<? super T> idType,
 			int propertySpan,
-			List<Property> cidProperties,
+			List<Property> compositeIdProperties,
 			EmbeddableTypeImpl<?> idClassType) {
-		final var idAttributes = idClassAttributes( idType, propertySpan, cidProperties );
+		final var idAttributes = idClassAttributes( idType, propertySpan, compositeIdProperties );
 		final var managedType = (ManagedDomainType<T>) identifiableType;
 		final var container = (AttributeContainer<T>) managedType;
-		container.getInFlightAccess().applyNonAggregatedIdAttributes( idAttributes, idClassType);
+		container.getInFlightAccess().applyNonAggregatedIdAttributes( idAttributes, idClassType );
 	}
 
 	private <T> Set<SingularPersistentAttribute<? super T, ?>> idClassAttributes(
 			AbstractIdentifiableType<T> idType,
 			int propertySpan,
-			List<Property> cidProperties) {
+			List<Property> compositeIdProperties) {
 		final var idAttributes = idType.getIdClassAttributesSafely();
 		if ( idAttributes != null ) {
 			return idAttributes;
 		}
 		else {
 			final Set<SingularPersistentAttribute<? super T, ?>> result = new HashSet<>( propertySpan );
-			for ( Property cidSubproperty : cidProperties ) {
+			for ( var cidSubproperty : compositeIdProperties ) {
 				result.add( buildIdAttribute( idType, cidSubproperty ) );
 			}
 			return result;
@@ -566,7 +582,7 @@ private <T> void applyIdAttributes(
 	private Property getMappedSuperclassIdentifier(PersistentClass persistentClass) {
 		MappedSuperclass mappedSuperclass = getMappedSuperclass( persistentClass );
 		while ( mappedSuperclass != null ) {
-			final Property declaredIdentifierProperty = mappedSuperclass.getDeclaredIdentifierProperty();
+			final var declaredIdentifierProperty = mappedSuperclass.getDeclaredIdentifierProperty();
 			if ( declaredIdentifierProperty != null ) {
 				return declaredIdentifierProperty;
 			}
@@ -584,26 +600,39 @@ private EmbeddableTypeImpl<?> applyIdClassMetadata(Component idClassComponent) {
 	private <Y> EmbeddableTypeImpl<Y> embeddableType(Component idClassComponent, Class<Y> componentClass) {
 		return new EmbeddableTypeImpl<>(
 				getJavaTypeRegistry().resolveManagedTypeDescriptor( componentClass ),
-				getMappedSuperclassDomainType( idClassComponent ),
+				getMappedSuperclassDomainType( idClassComponent, componentClass ),
 				null,
 				false,
 				getJpaMetamodel()
 		);
 	}
 
-	@SuppressWarnings("unchecked")
-	private <Y> MappedSuperclassDomainType<? super Y> getMappedSuperclassDomainType(Component idClassComponent) {
+	private <Y> MappedSuperclassDomainType<? super Y> getMappedSuperclassDomainType(
+			Component idClassComponent, Class<Y> componentClass) {
 		final var mappedSuperclass = idClassComponent.getMappedSuperclass();
-		return mappedSuperclass == null ? null
-				: (MappedSuperclassDomainType<? super Y>)
-						locateMappedSuperclassType( mappedSuperclass );
+		if ( mappedSuperclass == null ) {
+			return null;
+		}
+		else {
+			final var domainType = locateMappedSuperclassType( mappedSuperclass );
+			final var mappedSuperclassClass = domainType.getJavaType();
+			if ( !mappedSuperclassClass.isAssignableFrom( componentClass ) ) {
+				throw new IllegalStateException(
+						mappedSuperclassClass.getTypeName()
+						+ " is not a supertype of " + componentClass.getTypeName()
+				);
+			}
+			@SuppressWarnings("unchecked") // Safe, we just checked
+			final var castDomainType = (MappedSuperclassDomainType<? super Y>) domainType;
+			return castDomainType;
+		}
 	}
 
 	private <X> void applyIdMetadata(MappedSuperclass mappingType, MappedSuperclassDomainType<X> jpaMappingType) {
 		final var managedType = (ManagedDomainType<X>) jpaMappingType;
 		final var attributeContainer = (AttributeContainer<X>) managedType;
 		if ( mappingType.hasIdentifierProperty() ) {
-			final Property declaredIdentifierProperty = mappingType.getDeclaredIdentifierProperty();
+			final var declaredIdentifierProperty = mappingType.getDeclaredIdentifierProperty();
 			if ( declaredIdentifierProperty != null ) {
 				final var attribute =
 						(SingularPersistentAttribute<X, ?>)
@@ -655,6 +684,17 @@ private <X> void applyGenericProperties(PersistentClass persistentClass, EntityD
 			}
 			mappedSuperclass = getMappedSuperclass( mappedSuperclass );
 		}
+		final Boolean persistentClassAbstract = persistentClass.isAbstract();
+		if ( persistentClassAbstract == null || !persistentClassAbstract ) {
+			for ( var property : persistentClass.getDeclaredProperties() ) {
+				if ( property.isGenericSpecialization() ) {
+					final var managedType = (ManagedDomainType<X>) entityType;
+					final var attributeContainer = (AttributeContainer<X>) managedType;
+					attributeContainer.getInFlightAccess()
+							.addConcreteGenericAttribute( buildAttribute( entityType, property ) );
+				}
+			}
+		}
 	}
 
 	private MappedSuperclass getMappedSuperclass(PersistentClass persistentClass) {
@@ -701,8 +741,9 @@ private Property getMappedSuperclassProperty(String propertyName, MappedSupercla
 	private <X> Set<SingularPersistentAttribute<? super X, ?>> buildIdClassAttributes(
 			IdentifiableDomainType<X> ownerType,
 			List<Property> properties) {
-		if ( CORE_LOGGER.isTraceEnabled() ) {
-			CORE_LOGGER.trace( "Building old-school composite identifier [" + ownerType.getJavaType().getName() + ']' );
+		if ( MAPPING_MODEL_CREATION_MESSAGE_LOGGER.isTraceEnabled() ) {
+			MAPPING_MODEL_CREATION_MESSAGE_LOGGER.buildingOldSchoolCompositeIdentifier(
+					ownerType.getJavaType().getName() );
 		}
 		final Set<SingularPersistentAttribute<? super X, ?>> attributes = new HashSet<>();
 		for ( var property : properties ) {
@@ -805,10 +846,7 @@ private <X> void registerAttribute(Class<?> metamodelClass, Attribute<X, ?> attr
 			injectField( metamodelClass, name, attribute, allowNonDeclaredFieldReference );
 		}
 		catch (NoSuchFieldException e) {
-			CORE_LOGGER.unableToLocateStaticMetamodelField( metamodelClass.getName(), name );
-//			throw new AssertionFailure(
-//					"Unable to locate static metamodel field: " + metamodelClass.getName() + '#' + name
-//			);
+			MAPPING_MODEL_CREATION_MESSAGE_LOGGER.unableToLocateStaticMetamodelField( metamodelClass.getName(), name );
 		}
 	}
 
@@ -844,11 +882,10 @@ public Set<MappedSuperclass> getUnusedMappedSuperclasses() {
 		return new HashSet<>( knownMappedSuperclasses );
 	}
 
-	private final Map<Class<?>,BasicDomainType<?>> basicDomainTypeMap = new HashMap<>();
+	private final Map<Class<?>, BasicDomainType<?>> basicDomainTypeMap = new HashMap<>();
 
 	public <J> BasicDomainType<J> resolveBasicType(Class<J> javaType) {
-		@SuppressWarnings("unchecked")
-		final var domainType = (BasicDomainType<J>) basicDomainTypeMap.get( javaType );
+		final var domainType = basicDomainTypeMap.get( javaType );
 		if ( domainType == null ) {
 			// we cannot use getTypeConfiguration().standardBasicTypeForJavaType(javaType)
 			// because that doesn't return the right thing for primitive types
@@ -856,14 +893,22 @@ public <J> BasicDomainType<J> resolveBasicType(Class<J> javaType) {
 			return basicDomainType( javaType );
 		}
 		else {
-			return domainType;
+			if ( domainType.getJavaType() != javaType ) {
+				throw new AssertionFailure( "Basic type mismatch:"
+						+ " expected " + javaType.getTypeName()
+						+ " but was " + domainType.getJavaType().getTypeName() );
+			}
+			@SuppressWarnings("unchecked") // Safe, we just checked
+			final var castDomainType = (BasicDomainType<J>) domainType;
+			return castDomainType;
 		}
 	}
 
 	private <J> BasicDomainType<J> basicDomainType(Class<J> javaType) {
 		final var javaTypeDescriptor = getJavaTypeRegistry().resolveDescriptor( javaType );
 		final var jdbcType =
-				javaTypeDescriptor.getRecommendedJdbcType( typeConfiguration.getCurrentBaseSqlTypeIndicators() );
+				javaTypeDescriptor.getRecommendedJdbcType(
+						typeConfiguration.getCurrentBaseSqlTypeIndicators() );
 		return javaType.isPrimitive()
 				? new PrimitiveBasicTypeImpl<>( javaTypeDescriptor, jdbcType, javaType )
 				: new BasicTypeImpl<>( javaTypeDescriptor, jdbcType );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AuditMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AuditMapping.java
new file mode 100644
index 000000000000..5c1761fb19ed
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AuditMapping.java
@@ -0,0 +1,25 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.metamodel.mapping;
+
+import org.hibernate.Incubating;
+
+/**
+ * Metadata about audit log tables for entities and collections enabled for audit logging.
+ *
+ * @see org.hibernate.annotations.Audited
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+@Incubating
+public interface AuditMapping extends AuxiliaryMapping {
+
+	SelectableMapping getTransactionIdMapping();
+
+	SelectableMapping getModificationTypeMapping();
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AuxiliaryMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AuxiliaryMapping.java
new file mode 100644
index 000000000000..8ff3e391a6d8
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AuxiliaryMapping.java
@@ -0,0 +1,74 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.metamodel.mapping;
+
+import org.hibernate.Incubating;
+import org.hibernate.engine.spi.LoadQueryInfluencers;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.spi.NavigablePath;
+import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator;
+import org.hibernate.sql.ast.spi.SqlAstCreationState;
+import org.hibernate.sql.ast.tree.from.LazyTableGroup;
+import org.hibernate.sql.ast.tree.from.NamedTableReference;
+import org.hibernate.sql.ast.tree.from.StandardTableGroup;
+import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.ast.tree.from.TableGroupJoin;
+import org.hibernate.sql.ast.tree.predicate.Predicate;
+import org.hibernate.sql.model.ast.builder.MutationGroupBuilder;
+
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+/**
+ * Unified mapping contract for state management strategies (soft-delete, temporal, audit).
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+@Incubating
+public interface AuxiliaryMapping {
+	/**
+	 * The name of the table to which this auxiliary mapping applies.
+	 */
+	String getTableName();
+
+	default void addToInsertGroup(MutationGroupBuilder insertGroupBuilder, EntityPersister persister) {}
+
+	void applyPredicate(
+			EntityMappingType associatedEntityMappingType,
+			Consumer<Predicate> predicateConsumer,
+			LazyTableGroup lazyTableGroup,
+			NavigablePath navigablePath,
+			SqlAstCreationState creationState);
+
+	void applyPredicate(
+			EntityMappingType associatedEntityDescriptor,
+			Consumer<Predicate> predicateConsumer,
+			TableGroup tableGroup,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
+			LoadQueryInfluencers influencers);
+
+	void applyPredicate(
+			PluralAttributeMapping associatedEntityDescriptor,
+			Consumer<Predicate> predicateConsumer,
+			TableGroup tableGroup,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
+			LoadQueryInfluencers influencers);
+
+	void applyPredicate(TableGroupJoin tableGroupJoin, LoadQueryInfluencers loadQueryInfluencers);
+
+	void applyPredicate(
+			Supplier<Consumer<Predicate>> predicateCollector,
+			SqlAstCreationState creationState,
+			StandardTableGroup tableGroup,
+			NamedTableReference rootTableReference, EntityMappingType entityMappingType);
+
+	JdbcMapping getJdbcMapping();
+
+	boolean useAuxiliaryTable(LoadQueryInfluencers influencers);
+
+	boolean isAffectedByInfluencers(LoadQueryInfluencers influencers);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java
index e3bb99e58b79..3f9b77e4826f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java
@@ -43,8 +43,7 @@ default int forEachJdbcType(IndexedConsumer<JdbcMapping> action) {
 	 * <p>
 	 * Generally speaking, this is the form in which entity state is kept relative to a
 	 * Session via {@code EntityEntry}.
-	 * <p>
-	 * <pre>
+	 * <pre>{@code
 	 * &#64;Entity class Person {
 	 *     &#64;Id Integer id;
 	 *     &#64;Embedded Name name;
@@ -55,27 +54,23 @@ default int forEachJdbcType(IndexedConsumer<JdbcMapping> action) {
 	 *     String familiarName;
 	 *     String familyName;
 	 * }
-	 * </pre>
+	 * }</pre>
 	 * <p>
 	 * At the top level, we would want to disassemble a {@code Person} value, so we'd
 	 * ask the {@code Bindable} for the {@code Person} entity to disassemble.  Given a
 	 * {@code Person} value:
-	 * <p>
 	 * <pre>
 	 * Person( id=1, name=Name( 'Steve', 'Ebersole' ), 28 )
 	 * </pre>
-	 * <p>
 	 * this disassemble would result in a multidimensional array:
-	 * <p>
-	 * <pre>
+	 * <pre>{@code
 	 * [ ["Steve", "Ebersole"], 28 ]
-	 * </pre>
+	 * }</pre>
 	 * <p>
 	 * Note that the identifier is not part of this disassembled state.  Note also
 	 * how the embedded value results in a sub-array.
 	 *
 	 * @see org.hibernate.engine.spi.EntityEntry
-	 * <p>
 	 */
 	Object disassemble(Object value, SharedSessionContractImplementor session);
 
@@ -94,12 +89,11 @@ default int forEachJdbcType(IndexedConsumer<JdbcMapping> action) {
 	 * <p>
 	 * Given the example in {@link #disassemble}, this results in the consumer being
 	 * called for each simple value.  E.g.:
-	 * <p>
-	 * <pre>
+	 * <pre>{@code
 	 * consumer.consume( "Steve" );
 	 * consumer.consume( "Ebersole" );
 	 * consumer.consume( 28 );
-	 * </pre>
+	 * }</pre>
 	 * <p>
 	 * Think of it as breaking the multidimensional array into a visitable flat array.
 	 * Additionally, it passes through the values {@code X} and {@code Y} to the consumer.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorConverter.java
index e9c24d6c58ff..7452af89019c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorConverter.java
@@ -72,7 +72,8 @@ public R toRelationalValue(O domainForm) {
 		else {
 			final var discriminatorValueDetails = getDetailsForEntityName( entityName );
 			//noinspection unchecked
-			return (R) discriminatorValueDetails.getValue();
+			Object value = discriminatorValueDetails.getValue();
+			return (R) value;
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorMapping.java
index 2d5dfeb55676..6b6faacb965e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorMapping.java
@@ -19,7 +19,7 @@
 /**
  * Mapping of a discriminator, for either {@linkplain EntityMappingType#getDiscriminatorMapping() entity} or
  * {@linkplain DiscriminatedAssociationModelPart#getDiscriminatorMapping() association} (ANY) discrimination.
- * <p/>
+ * <p>
  * Represents a composition of <ul>
  *     <li>a {@linkplain #getValueConverter() converter} between the domain and relational form</li>
  *     <li>a {@linkplain #getUnderlyingJdbcMapping JDBC mapping} to read and write the relational values</li>
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorValue.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorValue.java
new file mode 100644
index 000000000000..0a79762f0b34
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatorValue.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.metamodel.mapping;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Represents the discriminator value used for entity mappings.
+ */
+public sealed interface DiscriminatorValue extends Serializable {
+
+	Object value();
+
+	static DiscriminatorValue of(Object value) {
+		return value == null ? Special.NULL : new Literal( value );
+	}
+
+	record Literal(Object value) implements DiscriminatorValue {
+		public Literal {
+			Objects.requireNonNull( value, "discriminator literal value must not be null" );
+		}
+
+		@Override
+		public String toString() {
+			return value.toString();
+		}
+
+		@Override
+		public boolean equals(Object object) {
+			return this == object
+				|| object instanceof Literal that && this.value.equals(that.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return value.hashCode();
+		}
+	}
+
+	enum Special implements DiscriminatorValue {
+		NULL,
+		NOT_NULL;
+
+		@Override
+		public Object value() {
+			return switch ( this ) {
+				case NULL -> null;
+				case NOT_NULL ->
+						throw new IllegalStateException( "Cannot obtain a discriminator value for NOT_NULL mapping" );
+			};
+		}
+
+		@Override
+		public String toString() {
+			return switch ( this ) {
+				case NULL -> "<null discriminator>";
+				case NOT_NULL -> "<not null discriminator>";
+			};
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java
index 57f9b8762b89..c89dc3fa0e7a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java
@@ -5,7 +5,11 @@
 package org.hibernate.metamodel.mapping;
 
 import jakarta.persistence.Entity;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.AssertionFailure;
 import org.hibernate.Filter;
+import org.hibernate.HibernateException;
 import org.hibernate.Incubating;
 import org.hibernate.Internal;
 import org.hibernate.annotations.ConcreteProxy;
@@ -45,6 +49,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import static java.lang.String.format;
 import static org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer.UNFETCHED_PROPERTY;
 
 /**
@@ -61,7 +66,7 @@ public interface EntityMappingType
 
 	/**
 	 * The entity name.
-	 * <p/>
+	 * <p>
 	 * For most entities, this will be the fully-qualified name
 	 * of the entity class.  The alternative is an explicit
 	 * {@linkplain org.hibernate.boot.jaxb.mapping.spi.JaxbEntity#getName() entity-name} which takes precedence if provided
@@ -248,10 +253,22 @@ default Set<String> getSubclassEntityNames() {
 	/**
 	 * The discriminator value which indicates this entity mapping
 	 */
-	Object getDiscriminatorValue();
+	DiscriminatorValue getDiscriminatorValue();
 
 	default String getDiscriminatorSQLValue() {
-		return getDiscriminatorValue().toString();
+		final DiscriminatorValue discriminatorValue = getDiscriminatorValue();
+		if ( discriminatorValue instanceof DiscriminatorValue.Literal literal ) {
+			return String.valueOf( literal.value() );
+		}
+		else if ( discriminatorValue instanceof DiscriminatorValue.Special special ) {
+			return switch ( special ) {
+				case NULL -> "null";
+				case NOT_NULL -> throw new IllegalStateException( "Illegal call for NOT_NULL discriminator" );
+			};
+		}
+		else {
+			throw new AssertionFailure( "Unrecognized DiscriminatorValue" );
+		}
 	}
 
 	default EntityMappingType getRootEntityDescriptor() {
@@ -363,7 +380,16 @@ default OptimisticLockStyle optimisticLockStyle() {
 	/**
 	 * The mapping for the natural-id of the entity, if one is defined
 	 */
-	NaturalIdMapping getNaturalIdMapping();
+	@Nullable NaturalIdMapping getNaturalIdMapping();
+
+	@NonNull
+	default NaturalIdMapping requireNaturalIdMapping() {
+		var mapping = getNaturalIdMapping();
+		if ( mapping == null ) {
+			throw new HibernateException( format( "Entity %s does not specify a natural id", getEntityName() ) );
+		}
+		return mapping;
+	}
 
 	/**
 	 * The mapping for the row-id of the entity, if one is defined.
@@ -373,10 +399,31 @@ default OptimisticLockStyle optimisticLockStyle() {
 	/**
 	 * Mapping for soft-delete support, or {@code null} if soft-delete not defined
 	 */
+	@Incubating
 	default SoftDeleteMapping getSoftDeleteMapping() {
 		return null;
 	}
 
+	/**
+	 * Mapping for temporal entity support, or {@code null} if not defined.
+	 */
+	@Incubating
+	default TemporalMapping getTemporalMapping() {
+		return null;
+	}
+
+	/**
+	 * Mapping for audit support, or {@code null} if not defined.
+	 */
+	@Incubating
+	default AuditMapping getAuditMapping() {
+		return null;
+	}
+
+	default AuxiliaryMapping getAuxiliaryMapping() {
+		return null;
+	}
+
 	@Override
 	default TableDetails getSoftDeleteTableDetails() {
 		return getIdentifierTableDetails();
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java
index 87863523a66c..d12a3e09cbfb 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelCreationLogging.java
@@ -9,10 +9,16 @@
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
+
+import static org.jboss.logging.Logger.Level.TRACE;
+import static org.jboss.logging.Logger.Level.WARN;
 
 /**
  * Logger used during mapping-model creation
@@ -31,5 +37,33 @@ public interface MappingModelCreationLogging extends BasicLogger {
 
 	Logger MAPPING_MODEL_CREATION_LOGGER = Logger.getLogger( LOGGER_NAME );
 	MappingModelCreationLogging MAPPING_MODEL_CREATION_MESSAGE_LOGGER =
-			Logger.getMessageLogger( MethodHandles.lookup(), MappingModelCreationLogging.class, LOGGER_NAME );
+			Logger.getMessageLogger( MethodHandles.lookup(), MappingModelCreationLogging.class, LOGGER_NAME, Locale.ROOT );
+
+	@LogMessage(level = TRACE)
+	@Message(id = 90005701, value = "Wrapping up metadata context...")
+	void wrappingUpMetadataContext();
+
+	@LogMessage(level = TRACE)
+	@Message(id = 90005702, value = "Starting entity [%s]")
+	void startingEntity(String entityName);
+
+	@LogMessage(level = TRACE)
+	@Message(id = 90005703, value = "Completed entity [%s]")
+	void completedEntity(String entityName);
+
+	@LogMessage(level = TRACE)
+	@Message(id = 90005704, value = "Starting mapped superclass [%s]")
+	void startingMappedSuperclass(String name);
+
+	@LogMessage(level = TRACE)
+	@Message(id = 90005705, value = "Completed mapped superclass [%s]")
+	void completedMappedSuperclass(String name);
+
+	@LogMessage(level = TRACE)
+	@Message(id = 90005706, value = "Building old-school composite identifier [%s]")
+	void buildingOldSchoolCompositeIdentifier(String name);
+
+	@LogMessage(level = WARN)
+	@Message(id = 90005707, value = "Unable to locate static metamodel field: %s.%s")
+	void unableToLocateStaticMetamodelField(String className, String fieldName);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java
index 6c9060842dfb..4fc3a3d76495 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java
@@ -19,74 +19,57 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-/**
- * Base descriptor, within the mapping model, for any part of the
- * application's domain model: an attribute, an entity identifier,
- * collection elements, and so on.
- *
- * @see DomainResultProducer
- * @see jakarta.persistence.metamodel.Bindable
- *
- * @author Steve Ebersole
- */
+/// Base descriptor, within the mapping model, for any part of the
+/// application's domain model: an attribute, an entity identifier,
+/// collection elements, and so on.
+///
+/// @see DomainResultProducer
+/// @see jakarta.persistence.metamodel.Bindable
+///
+/// @author Steve Ebersole
 public interface ModelPart extends MappingModelExpressible {
 
-	/**
-	 * @asciidoc
-	 *
-	 * The path for this fetchable back to an entity in the domain model.  Acts as a unique
-	 * identifier for individual parts.
-	 *
-	 * Some examples:
-	 *
-	 * For an entity, the role name is simply the entity name.
-	 *
-	 * For embeddable the role name is the path back to the root entity.  E.g. a Person's address
-	 * would be a path `Person#address`.
-	 *
-	 * For a collection the path would be the same as the "collection role".  E.g. an Order's lineItems
-	 * would be `Order#lineItems`.  This is the same as the historical `CollectionPersister#getRoleName`.
-	 *
-	 * For the (model)parts of a collection the role is either `{element}` or `{index}` depending.  E.g.
-	 * `Order#lineItems.{element}`.  Attributes of the element or index type (embeddable or entity typed)
-	 * would be based on this role.  E.g. `Order#lineItems.{element}.quantity`
-	 *
-	 * For an attribute of an embedded, the role would be relative to its "container".  E.g. `Person#address.city` or
-	 * `Person#addresses.{element}.city`
-	 *
-	 * @apiNote Whereas {@link #getPartName()} is local to this part, NavigableRole can be a compound path
-	 *
-	 * @see #getPartName()
-	 */
+	/// The path for this fetchable back to an entity in the domain model.  Acts as a unique
+	/// identifier for individual parts.
+	/// Some examples:
+	/// * For an entity, the role name is simply the entity name.
+	/// * For embeddable the role name is the path back to the root entity.  E.g. a Person's address
+	/// would be a path `Person#address`.
+	///
+	/// For a collection the path would be the same as the "collection role".  E.g. an Order's lineItems
+	/// would be `Order#lineItems`.  This is the same as the historical `CollectionPersister#getRoleName`.
+	///
+	/// For the (model)parts of a collection the role is either `{element}` or `{index}` depending.  E.g.
+	/// `Order#lineItems.{element}`.  Attributes of the element or index type (embeddable or entity typed)
+	/// would be based on this role.  E.g. `Order#lineItems.{element}.quantity`
+	///
+	/// For an attribute of an embedded, the role would be relative to its "container".  E.g. `Person#address.city` or
+	/// `Person#addresses.{element}.city`
+	///
+	/// @apiNote Whereas [#getPartName()] is local to this part, NavigableRole can be a compound path
+	///
+	/// @see #getPartName()
 	NavigableRole getNavigableRole();
 
-	/**
-	 * The local part name, which is generally the unqualified role name
-	 */
+	/// The local part name, which is generally the unqualified role name
 	String getPartName();
 
-	/**
-	 * The type for this part.
-	 */
+	/// The type for this part.
 	MappingType getPartMappingType();
 
-	/**
-	 * The Java type for this part.  Generally equivalent to
-	 * {@link MappingType#getMappedJavaType()} relative to
-	 * {@link #getPartMappingType()}
-	 */
+	/// The Java type for this part.  Generally equivalent to
+	/// `getMappedJavaType()` relative to
+	/// [#getPartMappingType()]
 	JavaType<?> getJavaType();
 
-	/**
-	 * Whether this model part describes something that physically
-	 * exists in the domain model.
-	 * <p/>
-	 * For example, an entity's {@linkplain EntityDiscriminatorMapping discriminator}
-	 * is part of the model, but is not a physical part of the domain model - there
-	 * is no "discriminator attribute".
-	 * <p/>
-	 * Also indicates whether the part is castable to {@link VirtualModelPart}
-	 */
+	/// Whether this model part describes something that physically
+	/// exists in the domain model.
+	///
+	/// For example, an entity's {@linkplain EntityDiscriminatorMapping discriminator}
+	/// is part of the model, but is not a physical part of the domain model - there
+	/// is no "discriminator attribute".
+	///
+	/// Also indicates whether the part is castable to [VirtualModelPart]
 	default boolean isVirtual() {
 		return false;
 	}
@@ -97,43 +80,35 @@ default boolean isEntityIdentifierMapping() {
 
 	boolean hasPartitionedSelectionMapping();
 
-	/**
-	 * Create a DomainResult for a specific reference to this ModelPart.
-	 */
+	/// Create a [DomainResult] for a specific reference to this [ModelPart].
 	<T> DomainResult<T> createDomainResult(
 			NavigablePath navigablePath,
 			TableGroup tableGroup,
 			String resultVariable,
 			DomainResultCreationState creationState);
 
-	/**
-	 * Apply SQL selections for a specific reference to this ModelPart outside the domain query's root select clause.
-	 */
+	/// Apply SQL selections for a specific reference to this [ModelPart]
+	/// outside the domain query's root select clause.
 	void applySqlSelections(
 			NavigablePath navigablePath,
 			TableGroup tableGroup,
 			DomainResultCreationState creationState);
 
-	/**
-	 * Apply SQL selections for a specific reference to this ModelPart outside the domain query's root select clause.
-	 */
+	/// Apply SQL selections for a specific reference to this [ModelPart]
+	/// outside the domain query's root select clause.
 	void applySqlSelections(
 			NavigablePath navigablePath,
 			TableGroup tableGroup,
 			DomainResultCreationState creationState,
 			BiConsumer<SqlSelection,JdbcMapping> selectionConsumer);
 
-	/**
-	 * A short hand form of {@link #forEachSelectable(int, SelectableConsumer)}, that passes 0 as offset.
-	 */
+	/// A short hand form of [#forEachSelectable(int,SelectableConsumer)], that passes `0` as offset.
 	default int forEachSelectable(SelectableConsumer consumer) {
 		return forEachSelectable( 0, consumer );
 	}
 
-	/**
-	 * Visits each selectable mapping with the selectable index offset by the given value.
-	 * Returns the amount of jdbc types that have been visited.
-	 */
+	/// Visits each selectable mapping with the selectable index offset by the given value.
+	/// Returns the amount of jdbc types that have been visited.
 	default int forEachSelectable(int offset, SelectableConsumer consumer) {
 		return 0;
 	}
@@ -150,10 +125,8 @@ default EntityMappingType asEntityMappingType(){
 		return null;
 	}
 
-	/**
-	 * A short hand form of {@link #breakDownJdbcValues(Object, int, Object, Object, JdbcValueBiConsumer, SharedSessionContractImplementor)},
-	 * that passes 0 as offset and null for the two values {@code X} and {@code Y}.
-	 */
+	/// A short hand form of [#breakDownJdbcValues(Object,int,Object,Object,JdbcValueBiConsumer,SharedSessionContractImplementor)],
+	/// that passes `0` as offset and null for the two values `X` and `Y`.
 	default int breakDownJdbcValues(
 			Object domainValue,
 			JdbcValueConsumer valueConsumer,
@@ -161,13 +134,11 @@ default int breakDownJdbcValues(
 		return breakDownJdbcValues( domainValue, 0, null, null, valueConsumer, session );
 	}
 
-	/**
-	 * Breaks down the domain value to its constituent JDBC values.
-	 *
-	 * Think of it as breaking the multi-dimensional array into a visitable flat array.
-	 * Additionally, it passes through the values {@code X} and {@code Y} to the consumer.
-	 * Returns the amount of jdbc types that have been visited.
-	 */
+	/// Breaks down the domain value to its constituent JDBC values.
+	///
+	/// Think of it as breaking the multi-dimensional array into a visitable flat array.
+	/// Additionally, it passes through the values `X` and `Y` to the consumer.
+	/// Returns the amount of jdbc types that have been visited.
 	<X, Y> int breakDownJdbcValues(
 			Object domainValue,
 			int offset,
@@ -176,10 +147,8 @@ <X, Y> int breakDownJdbcValues(
 			JdbcValueBiConsumer<X, Y> valueConsumer,
 			SharedSessionContractImplementor session);
 
-	/**
-	 * A short hand form of {@link #decompose(Object, int, Object, Object, JdbcValueBiConsumer, SharedSessionContractImplementor)},
-	 * that passes 0 as offset and null for the two values {@code X} and {@code Y}.
-	 */
+	/// A short hand form of [#decompose(Object,int,Object,Object,JdbcValueBiConsumer,SharedSessionContractImplementor)],
+	/// that passes `0` as offset and null for the two values `X` and `Y`.
 	default int decompose(
 			Object domainValue,
 			JdbcValueConsumer valueConsumer,
@@ -187,11 +156,9 @@ default int decompose(
 		return decompose( domainValue, 0, null, null, valueConsumer, session );
 	}
 
-	/**
-	 * Similar to {@link #breakDownJdbcValues(Object, int, Object, Object, JdbcValueBiConsumer, SharedSessionContractImplementor)},
-	 * but this method is supposed to be used for decomposing values for assignment expressions.
-	 * Returns the amount of jdbc types that have been visited.
-	 */
+	/// Similar to [#breakDownJdbcValues(Object,int,Object,Object,JdbcValueBiConsumer,SharedSessionContractImplementor)],
+	/// but this method is supposed to be used for decomposing values for assignment expressions.
+	/// Returns the amount of jdbc types that have been visited.
 	default <X, Y> int decompose(
 			Object domainValue,
 			int offset,
@@ -209,9 +176,7 @@ default boolean areEqual(@Nullable Object one, @Nullable Object other, SharedSes
 		return Objects.deepEquals( one, other );
 	}
 
-	/**
-	 * Functional interface for consuming the JDBC values.
-	 */
+	/// Functional interface for consuming the JDBC values.
 	@FunctionalInterface
 	interface JdbcValueConsumer extends JdbcValueBiConsumer<Object, Object> {
 		@Override
@@ -219,20 +184,14 @@ default void consume(int valueIndex, Object x, Object y, Object value, Selectabl
 			consume( valueIndex, value, jdbcValueMapping );
 		}
 
-		/**
-		 * Consume a JDBC-level jdbcValue.  The JDBC jdbcMapping descriptor is also passed in
-		 */
+		/// Consume a JDBC-level jdbcValue. The JDBC jdbcMapping descriptor is also passed in
 		void consume(int valueIndex, Object value, SelectableMapping jdbcValueMapping);
 	}
 
-	/**
-	 * Functional interface for consuming the JDBC values, along with two values of type {@code X} and {@code Y}.
-	 */
+	/// Functional interface for consuming the JDBC values, along with two values of type `X` and `Y`.
 	@FunctionalInterface
 	interface JdbcValueBiConsumer<X, Y> {
-		/**
-		 * Consume a JDBC-level jdbcValue.  The JDBC jdbcMapping descriptor is also passed in
-		 */
+		/// Consume a JDBC-level jdbcValue.  The JDBC jdbcMapping descriptor is also passed in
 		void consume(int valueIndex, X x, Y y, Object value, SelectableMapping jdbcValueMapping);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdMapping.java
index 8ecf1ef79562..e066da830037 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/NaturalIdMapping.java
@@ -6,52 +6,49 @@
 
 import java.util.List;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Incubating;
 import org.hibernate.cache.spi.access.NaturalIdDataAccess;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.loader.ast.spi.MultiNaturalIdLoader;
 import org.hibernate.loader.ast.spi.NaturalIdLoader;
 
-/**
- * Mapping for an entity's natural-id, if one is defined.
- * <p/>
- * Natural identifiers are an alternative form of uniquely
- * identifying a specific row.  In this sense, they are similar
- * to a primary key.  In fact most natural identifiers will also
- * be classified as "candidate keys" (as in a column or group of
- * columns that are considered candidates for primary-key).
- * <p/>
- * However, a natural id has fewer restrictions than a primary
- * key.  While these lessened restrictions make them inappropriate
- * for use as a primary key, they are still generally usable as
- * unique locators with caveats.  General reasons a natural id
- * might be inappropriate for use as a primary key are<ul>
- *     <li>it contains nullable values</li>
- *     <li>it contains modifiable values</li>
- * </ul>
- * <p>
- * See other sources for a more complete discussion of data modeling.
- *
- * @see org.hibernate.Session#byNaturalId
- * @see org.hibernate.Session#bySimpleNaturalId
- * @see org.hibernate.Session#byMultipleNaturalId
- *
- * @author Steve Ebersole
- */
+/// Mapping for an entity's natural-id, if one is defined.
+///
+/// Natural identifiers are an alternative form of uniquely
+/// identifying a specific row.  In this sense, they are similar
+/// to a primary key.  In fact most natural identifiers will also
+/// be classified as "candidate keys" (as in a column or group of
+/// columns that are considered candidates for primary-key).
+///
+/// However, a natural id has fewer restrictions than a primary
+/// key.  While these lessened restrictions make them inappropriate
+/// for use as a primary key, they are still generally usable as
+/// unique locators with caveats.  General reasons a natural id
+/// might be inappropriate for use as a primary key are
+///   - it contains nullable values
+///   - it contains modifiable values
+///
+/// @see org.hibernate.annotations.NaturalId
+/// @see org.hibernate.annotations.NaturalIdCache
+/// @see org.hibernate.annotations.NaturalIdClass
+/// @see org.hibernate.KeyType#NATURAL
+///
+/// @author Steve Ebersole
 @Incubating
 public interface NaturalIdMapping extends VirtualModelPart {
 	String PART_NAME = "{natural-id}";
 
-	/**
-	 * The attribute(s) making up the natural-id.
-	 */
+	/// A [class][org.hibernate.annotations.NaturalIdClass] which used
+	/// as a wrapper for natural-id values.
+	@Nullable Class<?> getNaturalIdClass();
+
+	/// The attribute(s) making up the natural-id.
 	List<SingularAttributeMapping> getNaturalIdAttributes();
 
-	/**
-	 * Whether the natural-id is mutable.
-	 *
-	 * @apiNote For compound natural-ids, this is true if any of the attributes are mutable.
-	 */
+	/// Whether the natural-id is mutable.
+	///
+	/// @apiNote For compound natural-ids, this is true if any of the attributes are mutable.
 	boolean isMutable();
 
 	@Override
@@ -59,67 +56,54 @@ default String getPartName() {
 		return PART_NAME;
 	}
 
-	/**
-	 * Access to the natural-id's L2 cache access.  Returns null if the natural-id is not
-	 * configured for caching
-	 */
+	/// Access to the natural-id's L2 cache access.
+	/// Returns null if the natural-id is not configured for caching.
 	NaturalIdDataAccess getCacheAccess();
 
-	/**
-	 * Verify the natural-id value(s) we are about to flush to the database
-	 */
+	/// Verify the natural-id value(s) we are about to flush to the database
 	void verifyFlushState(
 			Object id,
 			Object[] currentState,
 			Object[] loadedState,
 			SharedSessionContractImplementor session);
 
-	/**
-	 * Given an array of "full entity state", extract the normalized natural id representation
-	 *
-	 * @param state The attribute state array
-	 *
-	 * @return The extracted natural id values.  This is a normalized
-	 */
+	/// Given an array of "full entity state", extract the normalized natural id representation.
+	///
+	/// @param state The attribute state array
+	///
+	/// @return The extracted natural id values.
 	Object extractNaturalIdFromEntityState(Object[] state);
 
-	/**
-	 * Given an entity instance, extract the normalized natural id representation
-	 *
-	 * @param entity The entity instance
-	 *
-	 * @return The extracted natural id values
-	 */
+	/// Given an entity instance, extract the normalized natural-id representation.
+	///
+	/// @param entity The entity instance
+	///
+	/// @return The extracted natural-id values.
 	Object extractNaturalIdFromEntity(Object entity);
 
-	/**
-	 * Normalize a user-provided natural-id value into the representation Hibernate uses internally
-	 *
-	 * @param incoming The user-supplied value
-	 * @return The normalized, internal representation
-	 */
+	/// Normalize a user-provided natural-id value into the representation Hibernate uses internally.
+	///
+	/// @param incoming The user-supplied value
+	/// @return The normalized, internal representation
 	Object normalizeInput(Object incoming);
 
-	/**
-	 * Validates a natural id value(s) for the described natural-id based on the expected internal representation
-	 */
+	/// Whether the incoming value is in normalized internal form.
+	///
+	/// @see #normalizeInput
+	boolean isNormalized(Object incoming);
+
+	/// Validates a natural id value(s) for the described natural-id based on the expected internal representation
 	void validateInternalForm(Object naturalIdValue);
 
-	/**
-	 * Calculate the hash-code of a natural-id value
-	 *
-	 * @param value The natural-id value
-	 * @return The hash-code
-	 */
+	/// Calculate the hash-code of a natural-id value
+	///
+	/// @param value The natural-id value
+	/// @return The hash-code
 	int calculateHashCode(Object value);
 
-	/**
-	 * Make a loader capable of loading a single entity by natural-id
-	 */
+	/// Make a loader capable of loading a single entity by natural-id
 	NaturalIdLoader<?> makeLoader(EntityMappingType entityDescriptor);
 
-	/**
-	 * Make a loader capable of loading multiple entities by natural-id
-	 */
+	/// Make a loader capable of loading multiple entities by natural-id
 	MultiNaturalIdLoader<?> makeMultiLoader(EntityMappingType entityDescriptor);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PluralAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PluralAttributeMapping.java
index 3220cfcfe067..14f33467d6b8 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PluralAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/PluralAttributeMapping.java
@@ -9,6 +9,8 @@
 import java.util.function.Consumer;
 
 import org.hibernate.Filter;
+import org.hibernate.Incubating;
+import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.internal.util.IndexedConsumer;
 import org.hibernate.loader.ast.spi.Loadable;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
@@ -16,6 +18,7 @@
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
+import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroupJoinProducer;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
@@ -47,7 +50,14 @@ interface PredicateConsumer {
 		void applyPredicate(Predicate predicate);
 	}
 
-	void applySoftDeleteRestrictions(TableGroup tableGroup, PredicateConsumer predicateConsumer);
+	/**
+	 * Apply auxiliary restrictions (soft delete, temporal, audit) in a single pass.
+	 */
+	void applyAuxiliaryRestrictions(
+			TableGroup tableGroup,
+			PredicateConsumer predicateConsumer,
+			LoadQueryInfluencers influencers,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator);
 
 	interface IndexMetadata {
 		CollectionPart getIndexDescriptor();
@@ -64,10 +74,27 @@ interface IndexMetadata {
 	/**
 	 * Mapping for soft-delete support, or {@code null} if soft-delete not defined
 	 */
+	@Incubating
 	default SoftDeleteMapping getSoftDeleteMapping() {
 		return null;
 	}
 
+	/**
+	 * Mapping for temporal support, or {@code null} if temporal not defined
+	 */
+	@Incubating
+	default TemporalMapping getTemporalMapping() {
+		return null;
+	}
+
+	/**
+	 * Mapping for audit support, or {@code null} if audit not defined
+	 */
+	@Incubating
+	default AuditMapping getAuditMapping() {
+		return null;
+	}
+
 	OrderByFragment getOrderByFragment();
 	OrderByFragment getManyToManyOrderByFragment();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeleteMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeleteMapping.java
index 4f1b02afe8dc..40c4d4118cf4 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeleteMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SoftDeleteMapping.java
@@ -5,6 +5,7 @@
 package org.hibernate.metamodel.mapping;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.Internal;
 import org.hibernate.annotations.SoftDeleteType;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
@@ -14,7 +15,6 @@
 import org.hibernate.sql.model.ast.ColumnValueBinding;
 
 /**
- *
  * Metadata about the indicator column for entities and collections enabled
  * for soft delete
  *
@@ -22,17 +22,19 @@
  *
  * @author Steve Ebersole
  */
-public interface SoftDeleteMapping extends SelectableMapping, VirtualModelPart, SqlExpressible {
+public interface SoftDeleteMapping extends AuxiliaryMapping, SelectableMapping, VirtualModelPart, SqlExpressible {
 	String ROLE_NAME = "{soft-delete}";
 
 	/**
 	 * The soft-delete strategy - how to interpret indicator values
 	 */
+	@Internal // only used in tests!
 	SoftDeleteType getSoftDeleteStrategy();
 
 	/**
 	 * The name of the soft-delete indicator column.
 	 */
+	@Internal // only used in tests!
 	String getColumnName();
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TableDetails.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TableDetails.java
index d7509fc159ec..6ac3f0c06cc5 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TableDetails.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TableDetails.java
@@ -31,7 +31,7 @@ public interface TableDetails {
 
 	/**
 	 * Whether this table is the root for a given {@link ModelPartContainer}.
-	 * <p/>
+	 * <p>
 	 * Only relevant for entity-mappings where this indicates whether this
 	 * table holds the entity's identifier.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TemporalMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TemporalMapping.java
new file mode 100644
index 000000000000..c9f1941f0775
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/TemporalMapping.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.metamodel.mapping;
+
+
+import org.hibernate.Incubating;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.model.ast.ColumnValueBinding;
+
+/**
+ * Metadata about temporal columns for entities enabled for temporal history.
+ *
+ * @see org.hibernate.annotations.Temporal
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+@Incubating
+public interface TemporalMapping extends AuxiliaryMapping {
+
+	SelectableMapping getStartingColumnMapping();
+
+	SelectableMapping getEndingColumnMapping();
+
+	ColumnValueBinding createStartingValueBinding(ColumnReference startingColumnReference);
+
+	ColumnValueBinding createEndingValueBinding(ColumnReference endingColumnReference);
+
+	ColumnValueBinding createNullEndingValueBinding(ColumnReference endingColumnReference);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java
index d2069e238121..e2f730dd19f3 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValueMapping.java
@@ -40,8 +40,7 @@ default JavaType<?> getExpressibleJavaType() {
 	 */
 	default <X> X treatAs(Class<X> targetType) {
 		if ( targetType.isInstance( this ) ) {
-			//noinspection unchecked
-			return (X) this;
+			return targetType.cast( this );
 		}
 
 		throw new IllegalArgumentException(
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValuedModelPart.java
index a99386a77b73..daed3951c928 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ValuedModelPart.java
@@ -6,7 +6,7 @@
 
 /**
  * Describes a ModelPart that is also a ValueMapping (and therefore also a SelectableMappings).
- * <p/>
+ * <p>
  * {@linkplain BasicValuedModelPart Basic} and {@linkplain EmbeddableValuedModelPart embedded}
  * model-parts fall into this category.
  *
@@ -41,11 +41,9 @@ default int forEachSelectable(SelectableConsumer consumer) {
 	default void forEachInsertable(SelectableConsumer consumer) {
 		ModelPart.super.forEachSelectable(
 				(selectionIndex, selectableMapping) -> {
-					if ( ! selectableMapping.isInsertable() || selectableMapping.isFormula() ) {
-						return;
+					if ( selectableMapping.isInsertable() && !selectableMapping.isFormula() ) {
+						consumer.accept( selectionIndex, selectableMapping );
 					}
-
-					consumer.accept( selectionIndex, selectableMapping );
 				}
 		);
 	}
@@ -53,11 +51,9 @@ default void forEachInsertable(SelectableConsumer consumer) {
 	default void forEachNonFormula(SelectableConsumer consumer) {
 		ModelPart.super.forEachSelectable(
 				(selectionIndex, selectableMapping) -> {
-					if ( selectableMapping.isFormula() ) {
-						return;
+					if ( !selectableMapping.isFormula() ) {
+						consumer.accept( selectionIndex, selectableMapping );
 					}
-
-					consumer.accept( selectionIndex, selectableMapping );
 				}
 		);
 	}
@@ -65,11 +61,9 @@ default void forEachNonFormula(SelectableConsumer consumer) {
 	default void forEachUpdatable(SelectableConsumer consumer) {
 		ModelPart.super.forEachSelectable(
 				(selectionIndex, selectableMapping) -> {
-					if ( ! selectableMapping.isUpdateable() || selectableMapping.isFormula() ) {
-						return;
+					if ( selectableMapping.isUpdateable() && !selectableMapping.isFormula() ) {
+						consumer.accept( selectionIndex, selectableMapping );
 					}
-
-					consumer.accept( selectionIndex, selectableMapping );
 				}
 		);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java
index 451b1f45099f..ee3b840217c9 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java
@@ -168,7 +168,6 @@ public BasicFetch<?> generateFetch(
 				discriminatorType.getValueConverter(),
 				fetchTiming,
 				true,
-				creationState,
 				false,
 				!sqlSelection.isVirtual()
 		);
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java
index be1ce030c509..0a6cc88cdfd4 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDomainPath.java
@@ -14,7 +14,6 @@
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.mapping.ordering.ast.DomainPath;
-import org.hibernate.metamodel.mapping.ordering.ast.OrderingExpression;
 import org.hibernate.query.SortDirection;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.tree.SqlAstNode;
@@ -28,6 +27,7 @@
 import org.hibernate.sql.results.internal.SqlSelectionImpl;
 
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
+import static org.hibernate.metamodel.mapping.ordering.ast.OrderingExpression.applyCollation;
 import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
 
 /**
@@ -209,9 +209,11 @@ private void addSortSpecification(
 			);
 		}
 		else {
-			final var subPart = embeddableValuedModelPart.findSubPart( modelPartName, null );
+			final var subPart =
+					embeddableValuedModelPart.findSubPart( modelPartName, null )
+							.asBasicValuedModelPart();
 			addSortSpecification(
-					castNonNull( subPart.asBasicValuedModelPart() ),
+					castNonNull( subPart ),
 					ast,
 					tableGroup,
 					collation,
@@ -260,8 +262,7 @@ && selectClauseDoesNotContainOrderExpression( expression, selectClause ) ) {
 			selectClause.addSqlSelection( new SqlSelectionImpl( valuesArrayPosition, expression ) );
 		}
 
-		final var sortExpression =
-				OrderingExpression.applyCollation( expression, collation, creationState );
+		final var sortExpression = applyCollation( expression, collation, creationState );
 		ast.addSortSpecification( new SortSpecification( sortExpression, sortOrder, nullPrecedence ) );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java
index 79a61fe5037d..50152c6c16b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java
@@ -58,6 +58,9 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.MutabilityPlan;
 
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.buildBasicAttributeMapping;
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getPropertyPath;
+
 /**
  * Base support for EmbeddableMappingType implementations
  */
@@ -351,7 +354,7 @@ protected boolean finishInitialization(
 					selectablePath = new SelectablePath( determineEmbeddablePrefix() + bootPropertyDescriptor.getName() );
 				}
 
-				attributeMapping = MappingModelCreationHelper.buildBasicAttributeMapping(
+				attributeMapping = buildBasicAttributeMapping(
 						bootPropertyDescriptor.getName(),
 						role,
 						attributeIndex,
@@ -502,11 +505,7 @@ else if ( subtype instanceof EntityType ) {
 	}
 
 	protected String determineEmbeddablePrefix() {
-		var root = getNavigableRole().getParent();
-		while ( !root.isRoot() ) {
-			root = root.getParent();
-		}
-		return getNavigableRole().getFullPath().substring( root.getFullPath().length() + 1 ) + ".";
+		return getPropertyPath( getNavigableRole() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java
index e7418e75dd38..954e4f4a4ce0 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java
@@ -24,7 +24,6 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.spi.SqlAliasBase;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.tree.from.PluralTableGroup;
@@ -42,6 +41,8 @@
 import org.hibernate.type.Type;
 
 import static org.hibernate.internal.util.StringHelper.isEmpty;
+import static org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping.addPrefixedPropertyNames;
+import static org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping.addPrefixedPropertyPaths;
 import static org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping.findMapsIdPropertyName;
 
 /**
@@ -188,18 +189,15 @@ public <T> DomainResult<T> createDomainResult(
 			TableGroup tableGroup,
 			String resultVariable,
 			DomainResultCreationState creationState) {
-		final TableGroup partTableGroup = resolveTableGroup( navigablePath, creationState );
+		final var partTableGroup = resolveTableGroup( navigablePath, creationState );
 		return associatedEntityTypeDescriptor.createDomainResult( navigablePath, partTableGroup, resultVariable, creationState );
 	}
 
 	@Override
 	public Object disassemble(Object value, SharedSessionContractImplementor session) {
-		if ( value == null ) {
-			return null;
-		}
-
-		// should be an instance of the associated entity
-		return getAssociatedEntityMappingType().getIdentifierMapping().getIdentifier( value );
+		return value == null ? null
+				// should be an instance of the associated entity
+				: getAssociatedEntityMappingType().getIdentifierMapping().getIdentifier( value );
 	}
 
 
@@ -214,11 +212,10 @@ public EntityFetch generateFetch(
 		final var associationKey = resolveFetchAssociationKey();
 		final boolean added = creationState.registerVisitedAssociationKey( associationKey );
 
-		final var partTableGroup = resolveTableGroup( fetchablePath, creationState );
 		final var fetch = buildEntityFetchJoined(
 				fetchParent,
 				this,
-				partTableGroup,
+				resolveTableGroup( fetchablePath, creationState ),
 				fetchablePath,
 				creationState
 		);
@@ -271,25 +268,18 @@ protected EntityFetch buildEntityFetchJoined(
 
 	private TableGroup resolveTableGroup(NavigablePath fetchablePath, DomainResultCreationState creationState) {
 		final var fromClauseAccess = creationState.getSqlAstCreationState().getFromClauseAccess();
-		return fromClauseAccess.resolveTableGroup( fetchablePath, (np) -> {
-			final var parentTableGroup = (PluralTableGroup) fromClauseAccess.getTableGroup( np.getParent() );
+		return fromClauseAccess.resolveTableGroup( fetchablePath, navigablePath -> {
+			final var parentTableGroup =
+					(PluralTableGroup)
+							fromClauseAccess.getTableGroup( navigablePath.getParent() );
 			return switch ( nature ) {
 				case ELEMENT -> parentTableGroup.getElementTableGroup();
-				case INDEX -> resolveIndexTableGroup( parentTableGroup, fetchablePath, fromClauseAccess, creationState );
-				default -> throw new IllegalStateException( "Could not find table group for: " + np );
+				case INDEX -> parentTableGroup.getIndexTableGroup();
+				default -> throw new IllegalStateException( "Could not find table group for: " + navigablePath );
 			};
-
 		} );
 	}
 
-	private TableGroup resolveIndexTableGroup(
-			PluralTableGroup collectionTableGroup,
-			NavigablePath fetchablePath,
-			FromClauseAccess fromClauseAccess,
-			DomainResultCreationState creationState) {
-		return collectionTableGroup.getIndexTableGroup();
-	}
-
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// TableGroupProducer
@@ -316,7 +306,7 @@ public TableGroup createTableGroupInternal(
 				getEntityMappingType()
 						.createPrimaryTableReference( sqlAliasBase, creationState );
 
-		final TableGroup tableGroup = new StandardTableGroup(
+		final var tableGroup = new StandardTableGroup(
 				canUseInnerJoins,
 				navigablePath,
 				this,
@@ -383,13 +373,13 @@ else if ( bootModelValue instanceof ToOne toOne ) {
 				if ( propertyType instanceof ComponentType compositeType
 						&& compositeType.isEmbedded()
 						&& compositeType.getPropertyNames().length == 1 ) {
-					ToOneAttributeMapping.addPrefixedPropertyPaths(
+					addPrefixedPropertyPaths(
 							targetKeyPropertyNames,
 							compositeType.getPropertyNames()[0],
 							compositeType.getSubtypes()[0],
 							creationProcess.getCreationContext().getSessionFactory()
 					);
-					ToOneAttributeMapping.addPrefixedPropertyNames(
+					addPrefixedPropertyNames(
 							targetKeyPropertyNames,
 							EntityIdentifierMapping.ID_ROLE_NAME,
 							propertyType,
@@ -397,7 +387,7 @@ else if ( bootModelValue instanceof ToOne toOne ) {
 					);
 				}
 				else {
-					ToOneAttributeMapping.addPrefixedPropertyPaths(
+					addPrefixedPropertyPaths(
 							targetKeyPropertyNames,
 							null,
 							propertyType,
@@ -406,7 +396,7 @@ else if ( bootModelValue instanceof ToOne toOne ) {
 				}
 			}
 			else {
-				ToOneAttributeMapping.addPrefixedPropertyPaths(
+				addPrefixedPropertyPaths(
 						targetKeyPropertyNames,
 						entityBinding.getIdentifierProperty().getName(),
 						propertyType,
@@ -422,7 +412,7 @@ else if ( bootModelValue instanceof OneToMany ) {
 				targetKeyPropertyNames.add( referencedPropertyName.substring( 0, dotIndex ) );
 			}
 			// todo (PropertyMapping) : the problem here is timing.  this needs to be delayed.
-			ToOneAttributeMapping.addPrefixedPropertyPaths(
+			addPrefixedPropertyPaths(
 					targetKeyPropertyNames,
 					referencedPropertyName,
 					elementTypeDescriptor.getEntityPersister().getPropertyType( referencedPropertyName ),
@@ -436,13 +426,13 @@ else if ( bootModelValue instanceof OneToMany ) {
 					&& compositeType.isEmbedded()
 					&& compositeType.getPropertyNames().length == 1 ) {
 				final Set<String> targetKeyPropertyNames = new HashSet<>( 2 );
-				ToOneAttributeMapping.addPrefixedPropertyPaths(
+				addPrefixedPropertyPaths(
 						targetKeyPropertyNames,
 						compositeType.getPropertyNames()[0],
 						compositeType.getSubtypes()[0],
 						creationProcess.getCreationContext().getSessionFactory()
 				);
-				ToOneAttributeMapping.addPrefixedPropertyNames(
+				addPrefixedPropertyNames(
 						targetKeyPropertyNames,
 						EntityIdentifierMapping.ID_ROLE_NAME,
 						propertyType,
@@ -457,7 +447,7 @@ else if ( bootModelValue instanceof OneToMany ) {
 				final String mapsIdAttributeName =
 						findMapsIdPropertyName( elementTypeDescriptor, referencedPropertyName );
 				if ( mapsIdAttributeName != null ) {
-					ToOneAttributeMapping.addPrefixedPropertyPaths(
+					addPrefixedPropertyPaths(
 							targetKeyPropertyNames,
 							mapsIdAttributeName,
 							elementTypeDescriptor.getEntityPersister().getIdentifierType(),
@@ -465,7 +455,7 @@ else if ( bootModelValue instanceof OneToMany ) {
 					);
 				}
 				else {
-					ToOneAttributeMapping.addPrefixedPropertyPaths(
+					addPrefixedPropertyPaths(
 							targetKeyPropertyNames,
 							null,
 							propertyType,
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractNaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractNaturalIdMapping.java
index 52254432816e..307519db477c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractNaturalIdMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractNaturalIdMapping.java
@@ -19,12 +19,12 @@ public abstract class AbstractNaturalIdMapping implements NaturalIdMapping {
 
 	private final NavigableRole role;
 
-	public AbstractNaturalIdMapping(EntityMappingType declaringType, boolean mutable) {
+	public AbstractNaturalIdMapping(
+			EntityMappingType declaringType,
+			boolean mutable) {
 		this.declaringType = declaringType;
 		this.mutable = mutable;
-
 		this.cachesAccess = declaringType.getEntityPersister().getNaturalIdCacheAccessStrategy();
-
 		this.role = declaringType.getNavigableRole().append( PART_NAME );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java
index 15199d208562..a06775efee11 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java
@@ -13,6 +13,7 @@
 import org.hibernate.metamodel.mapping.DiscriminatedAssociationModelPart;
 import org.hibernate.metamodel.mapping.DiscriminatorConverter;
 import org.hibernate.metamodel.mapping.DiscriminatorMapping;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
@@ -86,7 +87,7 @@ public AnyDiscriminatorPart(
 			boolean updateable,
 			boolean partitioned,
 			BasicType<?> underlyingJdbcMapping,
-			Map<Object, String> valueToEntityNameMap,
+			Map<DiscriminatorValue, String> valueToEntityNameMap,
 			ImplicitDiscriminatorStrategy implicitValueStrategy,
 			MappingMetamodelImplementor mappingMetamodel) {
 		this(
@@ -129,7 +130,7 @@ public AnyDiscriminatorPart(
 			boolean updateable,
 			boolean partitioned,
 			BasicType<?> underlyingJdbcMapping,
-			Map<Object,String> valueToEntityNameMap,
+			Map<DiscriminatorValue,String> valueToEntityNameMap,
 			ImplicitDiscriminatorStrategy implicitValueStrategy,
 			MappingMetamodelImplementor mappingMetamodel) {
 		this.navigableRole = partRole;
@@ -161,7 +162,7 @@ public AnyDiscriminatorPart(
 	public static DiscriminatorConverter<?, ?> determineDiscriminatorConverter(
 			NavigableRole partRole,
 			BasicType<?> underlyingJdbcMapping,
-			Map<Object, String> valueToEntityNameMap,
+			Map<DiscriminatorValue, String> valueToEntityNameMap,
 			ImplicitDiscriminatorStrategy implicitValueStrategy,
 			MappingMetamodelImplementor mappingMetamodel) {
 		return new UnifiedAnyDiscriminatorConverter<>(
@@ -399,7 +400,6 @@ public BasicFetch<?> generateFetch(
 				fetchablePath,
 				this,
 				fetchTiming,
-				creationState,
 				!sqlSelection.isVirtual()
 		);
 	}
@@ -437,11 +437,9 @@ public Expression resolveSqlExpression(
 			JdbcMapping jdbcMappingToUse,
 			TableGroup tableGroup,
 			SqlAstCreationState creationState) {
-		var tableReference = tableGroup.resolveTableReference(
-				navigablePath,
-				this,
-				getContainingTableExpression()
-		);
+		final var tableReference =
+				tableGroup.resolveTableReference( navigablePath, this,
+						getContainingTableExpression() );
 		return creationState.getSqlExpressionResolver()
 				.resolveSqlExpression( tableReference, this );
 	}
@@ -472,7 +470,7 @@ private SqlSelection resolveSqlSelection(
 				resolveSqlExpression( navigablePath, null, tableGroup, sqlAstCreationState ),
 				jdbcMapping().getJdbcJavaType(),
 				null,
-				creationState.getSqlAstCreationState().getCreationContext().getTypeConfiguration()
+				sqlAstCreationState.getCreationContext().getTypeConfiguration()
 		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java
index c5b473ef1665..521db9b6737e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java
@@ -270,23 +270,20 @@ public Fetch generateFetch(
 			String resultVariable,
 			DomainResultCreationState creationState) {
 		final var sqlAstCreationState = creationState.getSqlAstCreationState();
-		final var fromClauseAccess = sqlAstCreationState.getFromClauseAccess();
 		final var sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
 
-		final var tableGroup = fromClauseAccess.getTableGroup( fetchParent.getNavigablePath().getParent() );
-		final var tableReference = tableGroup.resolveTableReference( fetchablePath, table );
+		final var tableReference =
+				sqlAstCreationState.getFromClauseAccess()
+						.getTableGroup( fetchParent.getNavigablePath().getParent() )
+						.resolveTableReference( fetchablePath, table );
 
-		final var columnReference = sqlExpressionResolver.resolveSqlExpression(
-				tableReference,
-				this
-		);
-
-		final var sqlSelection = sqlExpressionResolver.resolveSqlSelection(
-				columnReference,
-				jdbcMapping.getJdbcJavaType(),
-				fetchParent,
-				sqlAstCreationState.getCreationContext().getTypeConfiguration()
-		);
+		final var sqlSelection =
+				sqlExpressionResolver.resolveSqlSelection(
+						sqlExpressionResolver.resolveSqlExpression( tableReference, this ),
+						jdbcMapping.getJdbcJavaType(),
+						fetchParent,
+						sqlAstCreationState.getCreationContext().getTypeConfiguration()
+				);
 
 		return new BasicFetch<>(
 				sqlSelection.getValuesArrayPosition(),
@@ -294,7 +291,6 @@ public Fetch generateFetch(
 				fetchablePath,
 				this,
 				fetchTiming,
-				creationState,
 				!sqlSelection.isVirtual()
 		);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AuditMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AuditMappingImpl.java
new file mode 100644
index 000000000000..96b74e43041c
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AuditMappingImpl.java
@@ -0,0 +1,416 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.metamodel.mapping.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import org.hibernate.engine.spi.LoadQueryInfluencers;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.mapping.Stateful;
+import org.hibernate.metamodel.mapping.AuditMapping;
+import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.metamodel.mapping.JdbcMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor;
+import org.hibernate.query.sqm.function.FunctionRenderer;
+import org.hibernate.query.sqm.function.SelfRenderingAggregateFunctionSqlAstExpression;
+import org.hibernate.spi.NavigablePath;
+import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator;
+import org.hibernate.sql.ast.spi.SqlAstCreationState;
+import org.hibernate.sql.ast.tree.expression.AggregateFunctionExpression;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.ast.tree.expression.JdbcLiteral;
+import org.hibernate.sql.ast.tree.expression.SelfRenderingSqlFragmentExpression;
+import org.hibernate.sql.ast.tree.from.LazyTableGroup;
+import org.hibernate.sql.ast.tree.from.NamedTableReference;
+import org.hibernate.sql.ast.tree.from.StandardTableGroup;
+import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.ast.tree.from.TableGroupJoin;
+import org.hibernate.sql.ast.tree.from.TableGroupProducer;
+import org.hibernate.sql.ast.tree.from.TableReference;
+import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
+import org.hibernate.sql.ast.tree.predicate.Junction;
+import org.hibernate.sql.ast.tree.predicate.Predicate;
+import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.sql.ast.tree.select.SelectStatement;
+import org.hibernate.sql.exec.internal.TemporalJdbcParameter;
+import org.hibernate.sql.results.internal.SqlSelectionImpl;
+import org.hibernate.type.BasicType;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import static java.util.Collections.singletonList;
+import static org.hibernate.boot.model.internal.AuditHelper.MODIFICATION_TYPE;
+import static org.hibernate.boot.model.internal.AuditHelper.TRANSACTION_ID;
+import static org.hibernate.query.sqm.ComparisonOperator.EQUAL;
+import static org.hibernate.query.sqm.ComparisonOperator.LESS_THAN_OR_EQUAL;
+import static org.hibernate.query.sqm.ComparisonOperator.NOT_EQUAL;
+
+/**
+ * Audit mapping implementation.
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+public class AuditMappingImpl implements AuditMapping {
+	private static final String SUBQUERY_ALIAS_STEM = "audit";
+	public static final String MAX = "max";
+
+	private final String tableName;
+	private final SelectableMapping transactionIdMapping;
+	private final SelectableMapping modificationTypeMapping;
+	private final JdbcMapping jdbcMapping;
+	private final BasicType<?> transactionIdBasicType;
+	private final String currentTimestampFunctionName;
+	private final FunctionRenderer maxFunctionDescriptor;
+
+	public AuditMappingImpl(
+			Stateful auditable,
+			String tableName,
+			MappingModelCreationProcess creationProcess) {
+		this.tableName = tableName;
+
+		final var transactionIdColumnName = auditable.getAuxiliaryColumn( TRANSACTION_ID );
+		final var modificationTypeColumnName = auditable.getAuxiliaryColumn( MODIFICATION_TYPE );
+
+		final var creationContext = creationProcess.getCreationContext();
+		final var typeConfiguration = creationContext.getTypeConfiguration();
+		final var dialect = creationContext.getDialect();
+		final var sessionFactory = creationContext.getSessionFactory();
+		final var transactionIdJavaType = sessionFactory.getTransactionIdentifierService().getIdentifierType();
+		final var sqmFunctionRegistry = sessionFactory.getQueryEngine().getSqmFunctionRegistry();
+
+		jdbcMapping = resolveJdbcMapping( typeConfiguration, transactionIdJavaType );
+		transactionIdBasicType = resolveBasicType( typeConfiguration, transactionIdJavaType );
+
+		transactionIdMapping = SelectableMappingImpl.from(
+				tableName,
+				transactionIdColumnName,
+				null,
+				null,
+				jdbcMapping,
+				typeConfiguration,
+				true,
+				false,
+				false,
+				false,
+				dialect,
+				sqmFunctionRegistry,
+				creationContext
+		);
+
+		modificationTypeMapping = SelectableMappingImpl.from(
+				tableName,
+				modificationTypeColumnName,
+				null,
+				null,
+				jdbcMapping,
+				typeConfiguration,
+				true,
+				false,
+				false,
+				false,
+				dialect,
+				sqmFunctionRegistry,
+				creationContext
+		);
+
+		currentTimestampFunctionName =
+				sessionFactory.getTransactionIdentifierService().useServerTimestamp( dialect )
+						? dialect.currentTimestamp()
+						: null;
+
+		maxFunctionDescriptor = resolveMaxFunction( sessionFactory );
+	}
+
+	@Override
+	public String getTableName() {
+		return tableName;
+	}
+
+	@Override
+	public SelectableMapping getTransactionIdMapping() {
+		return transactionIdMapping;
+	}
+
+	@Override
+	public SelectableMapping getModificationTypeMapping() {
+		return modificationTypeMapping;
+	}
+
+	@Override
+	public JdbcMapping getJdbcMapping() {
+		return jdbcMapping;
+	}
+
+	private Predicate createRestriction(
+			TableGroupProducer tableGroupProducer,
+			TableReference tableReference,
+			List<SelectableMapping> keySelectables,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator) {
+		final var subQueryExpression =
+				new SelectStatement( buildSubquery( tableGroupProducer, tableReference, keySelectables, sqlAliasBaseGenerator ) );
+		final var revisionPredicate =
+				new ComparisonPredicate(
+						new ColumnReference( tableReference, transactionIdMapping ),
+						EQUAL,
+						subQueryExpression
+				);
+		final var modificationTypePredicate =
+				new ComparisonPredicate(
+						new ColumnReference( tableReference, modificationTypeMapping ),
+						NOT_EQUAL,
+						new JdbcLiteral<>(
+								AuditStateManagement.ModificationType.DEL.ordinal(),
+								modificationTypeMapping.getJdbcMapping()
+						)
+				);
+
+		final var auditPredicate = new Junction( Junction.Nature.CONJUNCTION );
+		auditPredicate.add( revisionPredicate );
+		auditPredicate.add( modificationTypePredicate );
+		return auditPredicate;
+	}
+
+	private QuerySpec buildSubquery(
+			TableGroupProducer tableGroupProducer,
+			TableReference tableReference,
+			List<SelectableMapping> keySelectables,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator) {
+		final var subQuerySpec = new QuerySpec( false, 1 );
+		final String stem = tableGroupProducer.getSqlAliasStem();
+		final String aliasStem = stem == null ? SUBQUERY_ALIAS_STEM : stem;
+		final var subTableReference =
+				new NamedTableReference( tableName,
+						sqlAliasBaseGenerator.createSqlAliasBase( aliasStem )
+								.generateNewAlias() );
+		final var subTableGroup = new StandardTableGroup(
+				true,
+				new NavigablePath( stem == null ? "audit-subquery" : stem + "#audit" ),
+				tableGroupProducer,
+				subTableReference.getIdentificationVariable(),
+				subTableReference,
+				null,
+				null
+		);
+		subQuerySpec.getFromClause().addRoot( subTableGroup );
+
+		final var transactionId =
+				new ColumnReference( subTableReference, transactionIdMapping );
+		subQuerySpec.getSelectClause()
+				.addSqlSelection( new SqlSelectionImpl( buildMaxExpression( transactionId ) ) );
+
+		subQuerySpec.applyPredicate(
+				buildSubqueryPredicate( tableReference, keySelectables, subTableReference, transactionId ) );
+
+		return subQuerySpec;
+	}
+
+	private Junction buildSubqueryPredicate(
+			TableReference tableReference,
+			List<SelectableMapping> keySelectables,
+			NamedTableReference subTableReference,
+			ColumnReference transactionId) {
+		final var predicate = new Junction( Junction.Nature.CONJUNCTION );
+		for ( var selectableMapping : keySelectables ) {
+			predicate.add( new ComparisonPredicate(
+					new ColumnReference( subTableReference, selectableMapping ),
+					EQUAL,
+					new ColumnReference( tableReference, selectableMapping )
+			) );
+		}
+		predicate.add( new ComparisonPredicate(
+				transactionId,
+				LESS_THAN_OR_EQUAL,
+				currentTimestampFunctionName != null
+						? new SelfRenderingSqlFragmentExpression( currentTimestampFunctionName, jdbcMapping )
+						: new TemporalJdbcParameter( transactionIdMapping )
+		) );
+		return predicate;
+	}
+
+	private AggregateFunctionExpression buildMaxExpression(ColumnReference expression) {
+		return new SelfRenderingAggregateFunctionSqlAstExpression<>(
+				MAX,
+				maxFunctionDescriptor,
+				singletonList( expression ),
+				null,
+				transactionIdBasicType,
+				transactionIdBasicType
+		);
+	}
+
+	private static FunctionRenderer resolveMaxFunction(SessionFactoryImplementor sessionFactory) {
+		final var functionDescriptor =
+				sessionFactory.getQueryEngine().getSqmFunctionRegistry()
+						.findFunctionDescriptor( MAX );
+		if ( functionDescriptor instanceof AbstractSqmSelfRenderingFunctionDescriptor selfRendering ) {
+			return selfRendering;
+		}
+		throw new IllegalStateException( "Function 'max' is not a self rendering function" );
+	}
+
+	private static JdbcMapping resolveJdbcMapping(
+			TypeConfiguration typeConfiguration,
+			Class<?> javaType) {
+		final var basicType = typeConfiguration.getBasicTypeForJavaType( javaType );
+		return basicType != null
+				? basicType
+				: typeConfiguration.standardBasicTypeForJavaType( javaType );
+	}
+
+	private static <J> BasicType<J> resolveBasicType(
+			TypeConfiguration typeConfiguration,
+			Class<J> javaType) {
+		final var basicType = typeConfiguration.getBasicTypeForJavaType( javaType );
+		return basicType == null
+				? typeConfiguration.standardBasicTypeForJavaType( javaType )
+				: basicType;
+	}
+
+	@Override
+	public void applyPredicate(
+			EntityMappingType associatedEntityMappingType,
+			Consumer<Predicate> predicateConsumer,
+			LazyTableGroup lazyTableGroup,
+			NavigablePath navigablePath,
+			SqlAstCreationState creationState) {
+		if ( creationState.getLoadQueryInfluencers().getTemporalIdentifier() != null ) {
+			predicateConsumer.accept( createRestriction(
+					associatedEntityMappingType.getEntityPersister(),
+					lazyTableGroup.resolveTableReference( navigablePath, getTableName() ),
+					collectEntityKeySelectables( associatedEntityMappingType ),
+					creationState.getSqlAliasBaseGenerator()
+			) );
+		}
+	}
+
+	@Override
+	public void applyPredicate(
+			EntityMappingType associatedEntityDescriptor,
+			Consumer<Predicate> predicateConsumer,
+			TableGroup tableGroup,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
+			LoadQueryInfluencers influencers) {
+		if ( influencers.getTemporalIdentifier() != null ) {
+			predicateConsumer.accept( createRestriction(
+					associatedEntityDescriptor.getEntityPersister(),
+					tableGroup.resolveTableReference( getTableName() ),
+					collectEntityKeySelectables( associatedEntityDescriptor ),
+					sqlAliasBaseGenerator
+			) );
+		}
+	}
+
+	@Override
+	public void applyPredicate(
+			PluralAttributeMapping collectionDescriptor,
+			Consumer<Predicate> predicateConsumer,
+			TableGroup tableGroup,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
+			LoadQueryInfluencers influencers) {
+		if ( influencers.getTemporalIdentifier() != null ) {
+			predicateConsumer.accept( createRestriction(
+					collectionDescriptor,
+					tableGroup.resolveTableReference( getTableName() ),
+					collectCollectionRowKeySelectables( collectionDescriptor ),
+					sqlAliasBaseGenerator
+			) );
+		}
+	}
+
+	@Override
+	public void applyPredicate(TableGroupJoin tableGroupJoin, LoadQueryInfluencers loadQueryInfluencers) {
+		//TODO!!
+	}
+
+	private static List<SelectableMapping> collectEntityKeySelectables(EntityMappingType entityDescriptor) {
+		final var keySelectables = new ArrayList<SelectableMapping>();
+		entityDescriptor.getIdentifierMapping().forEachSelectable(
+				(selectionIndex, selectableMapping) -> {
+					if ( !selectableMapping.isFormula() ) {
+						keySelectables.add( selectableMapping );
+					}
+				}
+		);
+		return keySelectables;
+	}
+
+	private List<SelectableMapping> collectCollectionRowKeySelectables(PluralAttributeMapping collectionDescriptor) {
+		final var keySelectables = new ArrayList<SelectableMapping>();
+		final var identifierDescriptor = collectionDescriptor.getIdentifierDescriptor();
+		if ( identifierDescriptor != null ) {
+			identifierDescriptor.forEachSelectable(
+					(selectionIndex, selectableMapping) -> {
+						if ( !selectableMapping.isFormula() ) {
+							keySelectables.add( selectableMapping );
+						}
+					}
+			);
+			return keySelectables;
+		}
+
+		collectionDescriptor.getKeyDescriptor().getKeyPart().forEachSelectable(
+				(selectionIndex, selectableMapping) -> {
+					if ( !selectableMapping.isFormula() ) {
+						keySelectables.add( selectableMapping );
+					}
+				}
+		);
+
+		final var indexDescriptor = collectionDescriptor.getIndexDescriptor();
+		if ( indexDescriptor != null ) {
+			indexDescriptor.forEachSelectable(
+					(selectionIndex, selectableMapping) -> {
+						if ( !selectableMapping.isFormula() ) {
+							keySelectables.add( selectableMapping );
+						}
+					}
+			);
+		}
+		else {
+			collectionDescriptor.getElementDescriptor().forEachSelectable(
+					(selectionIndex, selectableMapping) -> {
+						if ( !selectableMapping.isFormula() ) {
+							keySelectables.add( selectableMapping );
+						}
+					}
+			);
+		}
+		return keySelectables;
+	}
+
+	@Override
+	public void applyPredicate(
+			Supplier<Consumer<Predicate>> predicateCollector,
+			SqlAstCreationState creationState,
+			StandardTableGroup tableGroup,
+			NamedTableReference rootTableReference,
+			EntityMappingType entityMappingType) {
+		if ( creationState.getLoadQueryInfluencers().getTemporalIdentifier() != null ) {
+			predicateCollector.get().accept( createRestriction(
+					entityMappingType,
+					tableGroup.resolveTableReference( getTableName() ),
+					collectEntityKeySelectables( entityMappingType ),
+					creationState.getSqlAliasBaseGenerator()
+			) );
+		}
+	}
+
+	@Override
+	public boolean useAuxiliaryTable(LoadQueryInfluencers influencers) {
+		return influencers.getTemporalIdentifier() != null;
+	}
+
+	@Override
+	public boolean isAffectedByInfluencers(LoadQueryInfluencers influencers) {
+		return influencers.getTemporalIdentifier() != null;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java
index de0e545e9543..6427846cbd81 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java
@@ -165,9 +165,10 @@ public BasicAttributeMapping(
 		this.tableExpression = tableExpression;
 		this.mappedColumnExpression = mappedColumnExpression;
 		this.temporalPrecision = temporalPrecision;
-		this.selectablePath = selectablePath == null
-				? new SelectablePath( mappedColumnExpression )
-				: selectablePath;
+		this.selectablePath =
+				selectablePath == null
+						? new SelectablePath( isFormula ? attributeName : mappedColumnExpression )
+						: selectablePath;
 		this.isFormula = isFormula;
 		this.columnDefinition = columnDefinition;
 		this.length = length;
@@ -181,16 +182,10 @@ public BasicAttributeMapping(
 		this.partitioned = partitioned;
 		this.jdbcMapping = jdbcMapping;
 		this.domainTypeDescriptor = jdbcMapping.getJavaTypeDescriptor();
-
 		this.customReadExpression = customReadExpression;
-
-		if ( isFormula ) {
-			this.customWriteExpression = null;
-		}
-		else {
-			this.customWriteExpression = customWriteExpression;
-		}
-		this.isLazy = navigableRole.getParent().getParent() == null
+		this.customWriteExpression = isFormula ? null : customWriteExpression;
+		this.isLazy =
+				navigableRole.getParent().getParent() == null
 					&& declaringType.findContainingEntityMapping()
 							.getEntityPersister()
 							.getBytecodeEnhancementMetadata()
@@ -380,7 +375,8 @@ public NavigableRole getNavigableRole() {
 
 	@Override
 	public String toString() {
-		return "BasicAttributeMapping(" + navigableRole + ")@" + System.identityHashCode( this );
+		return "BasicAttributeMapping(" + navigableRole + ")@"
+			+ System.identityHashCode( this );
 	}
 
 	@Override
@@ -389,10 +385,9 @@ public <T> DomainResult<T> createDomainResult(
 			TableGroup tableGroup,
 			String resultVariable,
 			DomainResultCreationState creationState) {
-		final SqlSelection sqlSelection = resolveSqlSelection( navigablePath, tableGroup, null, creationState );
-
-		//noinspection unchecked
-		return new BasicResult(
+		final var sqlSelection =
+				resolveSqlSelection( navigablePath, tableGroup, null, creationState );
+		return new BasicResult<>(
 				sqlSelection.getValuesArrayPosition(),
 				resultVariable,
 				jdbcMapping,
@@ -409,12 +404,9 @@ private SqlSelection resolveSqlSelection(
 			DomainResultCreationState creationState) {
 		final var sqlAstCreationState = creationState.getSqlAstCreationState();
 		final var expressionResolver = sqlAstCreationState.getSqlExpressionResolver();
-		final var tableReference = tableGroup.resolveTableReference(
-				navigablePath,
-				this,
-				getContainingTableExpression()
-		);
-
+		final var tableReference =
+				tableGroup.resolveTableReference( navigablePath, this,
+						getContainingTableExpression() );
 		return expressionResolver.resolveSqlSelection(
 				expressionResolver.resolveSqlExpression( tableReference, this ),
 				jdbcMapping.getJdbcJavaType(),
@@ -486,7 +478,6 @@ public Fetch generateFetch(
 				getJdbcMapping().getValueConverter(),
 				fetchTiming,
 				true,
-				creationState,
 				coerceResultType,
 				sqlSelection != null && !sqlSelection.isVirtual()
 		);
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java
index 6b28e756d836..c2f338be8f66 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java
@@ -21,14 +21,13 @@
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
+import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.metamodel.mapping.MappingType;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.property.access.spi.PropertyAccess;
-import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlSelection;
-import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.results.graph.DomainResult;
@@ -41,6 +40,8 @@
 import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
+
 /**
  * Mapping of a simple identifier
  *
@@ -180,7 +181,7 @@ public IdentifierValue getUnsavedStrategy() {
 
 	@Override
 	public Object getIdentifier(Object entity) {
-		final var lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
+		final var lazyInitializer = extractLazyInitializer( entity );
 		if ( lazyInitializer != null ) {
 			return lazyInitializer.getInternalIdentifier();
 		}
@@ -246,7 +247,8 @@ public <T> DomainResult<T> createDomainResult(
 			TableGroup tableGroup,
 			String resultVariable,
 			DomainResultCreationState creationState) {
-		final var sqlSelection = resolveSqlSelection( navigablePath, tableGroup, null, creationState );
+		final var sqlSelection =
+				resolveSqlSelection( navigablePath, tableGroup, null, creationState );
 		return new BasicResult<>(
 				sqlSelection.getValuesArrayPosition(),
 				resultVariable,
@@ -283,9 +285,18 @@ private SqlSelection resolveSqlSelection(
 			FetchParent fetchParent,
 			DomainResultCreationState creationState) {
 		final var expressionResolver = creationState.getSqlAstCreationState().getSqlExpressionResolver();
-		final TableReference rootTableReference;
+		final var rootTableReference = rootTableReference( navigablePath, tableGroup );
+		return expressionResolver.resolveSqlSelection(
+				expressionResolver.resolveSqlExpression( rootTableReference, this ),
+				idType.getJdbcJavaType(),
+				fetchParent,
+				sessionFactory.getTypeConfiguration()
+		);
+	}
+
+	private TableReference rootTableReference(NavigablePath navigablePath, TableGroup tableGroup) {
 		try {
-			rootTableReference = tableGroup.resolveTableReference( navigablePath, rootTable );
+			return tableGroup.resolveTableReference( navigablePath, rootTable );
 		}
 		catch (Exception e) {
 			throw new IllegalStateException(
@@ -299,18 +310,6 @@ private SqlSelection resolveSqlSelection(
 					e
 			);
 		}
-
-		final Expression expression = expressionResolver.resolveSqlExpression(
-				rootTableReference,
-				this
-		);
-
-		return expressionResolver.resolveSqlSelection(
-				expression,
-				idType.getJdbcJavaType(),
-				fetchParent,
-				sessionFactory.getTypeConfiguration()
-		);
 	}
 
 	@Override
@@ -437,14 +436,14 @@ public Fetch generateFetch(
 			boolean selected,
 			String resultVariable,
 			DomainResultCreationState creationState) {
-		final var sqlAstCreationState = creationState.getSqlAstCreationState();
 		final var tableGroup =
-				sqlAstCreationState.getFromClauseAccess()
+				creationState.getSqlAstCreationState()
+						.getFromClauseAccess()
 						.getTableGroup( fetchParent.getNavigablePath() );
 		assert tableGroup != null;
 
-		final var sqlSelection = resolveSqlSelection( fetchablePath, tableGroup, fetchParent, creationState );
-		final var selectionType = sqlSelection.getExpressionType();
+		final var sqlSelection =
+				resolveSqlSelection( fetchablePath, tableGroup, fetchParent, creationState );
 		return new BasicFetch<>(
 				sqlSelection.getValuesArrayPosition(),
 				fetchParent,
@@ -453,14 +452,18 @@ public Fetch generateFetch(
 				getJdbcMapping().getValueConverter(),
 				FetchTiming.IMMEDIATE,
 				true,
-				creationState,
 				// if the expression type is different that the expected type coerce the value
-				selectionType != null
-					&& selectionType.getSingleJdbcMapping().getJdbcJavaType() != getJdbcMapping().getJdbcJavaType(),
+				mustCoerceResultType( sqlSelection.getExpressionType() ),
 				!sqlSelection.isVirtual()
 		);
 	}
 
+	private boolean mustCoerceResultType(JdbcMappingContainer selectionType) {
+		return selectionType != null
+			&& selectionType.getSingleJdbcMapping().getJdbcJavaType()
+				!= getJdbcMapping().getJdbcJavaType();
+	}
+
 	@Override
 	public FetchStyle getStyle() {
 		return FetchStyle.JOIN;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java
index ace237b91190..d59e5ef17332 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java
@@ -19,6 +19,7 @@
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.metamodel.mapping.SelectablePath;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.spi.EntityIdentifierNavigablePath;
@@ -26,7 +27,6 @@
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.from.PluralTableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.results.ResultsLogger;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetch;
@@ -36,6 +36,8 @@
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static org.hibernate.sql.results.ResultsLogger.RESULTS_LOGGER;
+
 /**
  * Models a basic collection element/value or index/key
  *
@@ -84,6 +86,16 @@ public String getSelectionExpression() {
 		return selectableMapping.getSelectionExpression();
 	}
 
+	@Override
+	public SelectablePath getSelectablePath() {
+		return selectableMapping.getSelectablePath();
+	}
+
+	@Override
+	public String getSelectableName() {
+		return selectableMapping.getSelectableName();
+	}
+
 	@Override
 	public boolean isFormula() {
 		return selectableMapping.isFormula();
@@ -261,8 +273,8 @@ public Fetch generateFetch(
 			boolean selected,
 			String resultVariable,
 			DomainResultCreationState creationState) {
-		if ( ResultsLogger.RESULTS_LOGGER.isTraceEnabled() ) {
-			ResultsLogger.RESULTS_LOGGER.tracef(
+		if ( RESULTS_LOGGER.isTraceEnabled() ) {
+			RESULTS_LOGGER.tracef(
 					"Generating Fetch for collection-part: `%s` -> `%s`",
 					collectionDescriptor.getRole(),
 					nature.getName()
@@ -285,7 +297,6 @@ public Fetch generateFetch(
 				fetchablePath,
 				this,
 				FetchTiming.IMMEDIATE,
-				creationState,
 				!sqlSelection.isVirtual()
 		);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java
index a4ca7680880b..3831a11093b8 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java
@@ -28,7 +28,6 @@
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.predicate.NullnessPredicate;
-import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
@@ -62,14 +61,13 @@ public CaseStatementDiscriminatorMappingImpl(
 				final String tableName = tableNames[notNullColumnTableNumbers[i]];
 				final String oneSubEntityColumn = notNullColumnNames[i];
 				final String discriminatorValue = discriminatorValues[i];
-				tableDiscriminatorDetailsMap.put(
-						tableName,
+				tableDiscriminatorDetailsMap.put( tableName,
 						new TableDiscriminatorDetails(
 								tableName,
 								oneSubEntityColumn,
-								getUnderlyingJdbcMapping().getJavaTypeDescriptor().wrap( discriminatorValue, null )
-						)
-				);
+								getUnderlyingJdbcMapping().getJavaTypeDescriptor()
+										.wrap( discriminatorValue, null )
+						) );
 			}
 		}
 	}
@@ -125,15 +123,15 @@ public Expression resolveSqlExpression(
 			JdbcMapping jdbcMappingToUse,
 			TableGroup tableGroup,
 			SqlAstCreationState creationState) {
-		final var expressionResolver = creationState.getSqlExpressionResolver();
-		return expressionResolver.resolveSqlExpression(
-				createColumnReferenceKey(
-						tableGroup.getPrimaryTableReference(),
-						getSelectionExpression(),
-						jdbcMappingToUse
-				),
-				sqlAstProcessingState -> createCaseSearchedExpression( tableGroup )
-		);
+		return creationState.getSqlExpressionResolver()
+				.resolveSqlExpression(
+						createColumnReferenceKey(
+								tableGroup.getPrimaryTableReference(),
+								getSelectionExpression(),
+								jdbcMappingToUse
+						),
+						sqlAstProcessingState -> createCaseSearchedExpression( tableGroup )
+				);
 	}
 
 	private Expression createCaseSearchedExpression(TableGroup entityTableGroup) {
@@ -263,7 +261,8 @@ public CaseStatementDiscriminatorExpression(TableGroup entityTableGroup) {
 		}
 
 		public List<TableReference> getUsedTableReferences() {
-			final ArrayList<TableReference> usedTableReferences = new ArrayList<>( tableDiscriminatorDetailsMap.size() );
+			final ArrayList<TableReference> usedTableReferences =
+					new ArrayList<>( tableDiscriminatorDetailsMap.size() );
 			tableDiscriminatorDetailsMap.forEach(
 					(tableName, tableDiscriminatorDetails) -> {
 						final var tableReference = entityTableGroup.getTableReference(
@@ -287,7 +286,8 @@ public void renderToSql(
 				SessionFactoryImplementor sessionFactory) {
 			if ( caseSearchedExpression == null ) {
 				// todo (6.0): possible optimization is to omit cases for table reference joins, that touch a super class, where a subclass is inner joined due to pruning
-				caseSearchedExpression = new CaseSearchedExpression( CaseStatementDiscriminatorMappingImpl.this );
+				caseSearchedExpression =
+						new CaseSearchedExpression( CaseStatementDiscriminatorMappingImpl.this );
 				tableDiscriminatorDetailsMap.forEach(
 						(tableName, tableDiscriminatorDetails) -> {
 							final var tableReference = entityTableGroup.getTableReference(
@@ -296,29 +296,26 @@ public void renderToSql(
 									false
 							);
 
-							if ( tableReference == null ) {
-								// assume this is because it is a table that is not part of the processing entity's sub-hierarchy
-								return;
+							if ( tableReference != null ) {
+								caseSearchedExpression.when(
+										new NullnessPredicate(
+												new ColumnReference(
+														tableReference,
+														tableDiscriminatorDetails.getCheckColumnName(),
+														false,
+														null,
+														getJdbcMapping()
+												),
+												true
+										),
+										new QueryLiteral<>(
+												tableDiscriminatorDetails.getDiscriminatorValue(),
+												getUnderlyingJdbcMapping()
+										)
+								);
 							}
-
-							final Predicate predicate = new NullnessPredicate(
-									new ColumnReference(
-											tableReference,
-											tableDiscriminatorDetails.getCheckColumnName(),
-											false,
-											null,
-											getJdbcMapping()
-									),
-									true
-							);
-
-							caseSearchedExpression.when(
-									predicate,
-									new QueryLiteral<>(
-											tableDiscriminatorDetails.getDiscriminatorValue(),
-											getUnderlyingJdbcMapping()
-									)
-							);
+							// else assume this is because it is a table that is
+							// not part of the processing entity's sub-hierarchy
 						}
 				);
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java
index 9bb5843f01d9..de41785a65d1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java
@@ -47,7 +47,9 @@ public CollectionIdentifierDescriptorImpl(
 			String containingTableName,
 			String columnName,
 			BasicType<?> type) {
-		this.navigableRole = collectionDescriptor.getNavigableRole().append( Nature.ID.getName() );
+		this.navigableRole =
+				collectionDescriptor.getNavigableRole()
+						.append( Nature.ID.getName() );
 		this.collectionDescriptor = collectionDescriptor;
 		this.containingTableName = containingTableName;
 		this.columnName = columnName;
@@ -274,7 +276,6 @@ public Fetch generateFetch(
 				fetchablePath,
 				this,
 				FetchTiming.IMMEDIATE,
-				creationState,
 				!sqlSelection.isVirtual()
 		);
 	}
@@ -284,7 +285,6 @@ public DomainResult<?> createDomainResult(
 			TableGroup tableGroup,
 			DomainResultCreationState creationState) {
 		final var astCreationState = creationState.getSqlAstCreationState();
-		final var astCreationContext = astCreationState.getCreationContext();
 		final var sqlExpressionResolver = astCreationState.getSqlExpressionResolver();
 
 		final var sqlSelection = sqlExpressionResolver.resolveSqlSelection(
@@ -294,7 +294,8 @@ public DomainResult<?> createDomainResult(
 				),
 				type.getJdbcJavaType(),
 				null,
-				astCreationContext.getTypeConfiguration()
+				astCreationState.getCreationContext()
+						.getTypeConfiguration()
 		);
 
 		return new BasicResult<>(
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java
index 395328a6595e..be0a05893e42 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java
@@ -4,15 +4,12 @@
  */
 package org.hibernate.metamodel.mapping.internal;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
 import org.hibernate.cache.MutableCacheKeyBuilder;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.IndexedConsumer;
 import org.hibernate.loader.ast.internal.CompoundNaturalIdLoader;
@@ -20,6 +17,7 @@
 import org.hibernate.loader.ast.spi.MultiNaturalIdLoader;
 import org.hibernate.loader.ast.spi.NaturalIdLoader;
 import org.hibernate.metamodel.UnsupportedMappingException;
+import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.MappingType;
@@ -27,6 +25,11 @@
 import org.hibernate.metamodel.mapping.NaturalIdMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SingularAttributeMapping;
+import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.ModelsContext;
+import org.hibernate.property.access.spi.Getter;
+import org.hibernate.property.access.spi.GetterFieldImpl;
+import org.hibernate.property.access.spi.GetterMethodImpl;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.from.TableGroup;
@@ -44,14 +47,27 @@
 import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.RecordComponent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import static org.hibernate.internal.util.StringHelper.decapitalize;
+import static java.lang.reflect.Modifier.isStatic;
+import static java.util.Collections.emptyMap;
+
 /**
  * Multi-attribute NaturalIdMapping implementation
  */
 public class CompoundNaturalIdMapping extends AbstractNaturalIdMapping implements MappingType, FetchableContainer {
 
-	// todo (6.0) : create a composite MappingType for this descriptor's Object[]?
-
 	private final List<SingularAttributeMapping> attributes;
+	private final ValueNormalizer valueNormalizer;
 
 	private List<JdbcMapping> jdbcMappings;
 	/*
@@ -60,11 +76,15 @@ This value is used to determine the size of the array used to create the Immutab
 	 */
 	private final int maxFetchableKeyIndex;
 
+	private final SessionFactoryImplementor sessionFactory;
+
 	public CompoundNaturalIdMapping(
 			EntityMappingType declaringType,
+			ClassDetails naturalIdClass,
 			List<SingularAttributeMapping> attributes,
 			MappingModelCreationProcess creationProcess) {
 		super( declaringType, isMutable( attributes ) );
+		this.valueNormalizer = createValueNormalizer( naturalIdClass, attributes, creationProcess );
 		this.attributes = attributes;
 
 		int maxIndex = 0;
@@ -79,15 +99,15 @@ public CompoundNaturalIdMapping(
 				"Determine compound natural-id JDBC mappings ( " + declaringType.getEntityName() + ")",
 				() -> {
 					final List<JdbcMapping> jdbcMappings = new ArrayList<>();
-					attributes.forEach(
-							(attribute) -> attribute.forEachJdbcType(
-									(index, jdbcMapping) -> jdbcMappings.add( jdbcMapping )
-							)
-					);
+					attributes.forEach( attribute -> attribute.forEachJdbcType(
+							(index, jdbcMapping) -> jdbcMappings.add( jdbcMapping )
+					) );
 					this.jdbcMappings = jdbcMappings;
 					return true;
 				}
 		);
+
+		this.sessionFactory = creationProcess.getCreationContext().getSessionFactory();
 	}
 
 	private static boolean isMutable(List<SingularAttributeMapping> attributes) {
@@ -99,6 +119,12 @@ private static boolean isMutable(List<SingularAttributeMapping> attributes) {
 		return false;
 	}
 
+	@Override
+	@Nullable
+	public Class<?> getNaturalIdClass() {
+		return valueNormalizer.getIdClassType();
+	}
+
 	@Override
 	public Object[] extractNaturalIdFromEntityState(Object[] state) {
 		if ( state == null ) {
@@ -119,7 +145,7 @@ else if ( state.length == attributes.size() ) {
 
 	@Override
 	public Object[] extractNaturalIdFromEntity(Object entity) {
-		final var values = new Object[ attributes.size() ];
+		final var values = new Object[attributes.size()];
 		for ( int i = 0; i < attributes.size(); i++ ) {
 			values[i] = attributes.get( i ).getPropertyAccess().getGetter().get( entity );
 		}
@@ -128,22 +154,22 @@ public Object[] extractNaturalIdFromEntity(Object entity) {
 
 	@Override
 	public Object[] normalizeInput(Object incoming) {
+		sessionFactory.getStatistics().normalizeNaturalId( getDeclaringType().getEntityName() );
+
 		if ( incoming instanceof Object[] array ) {
+			// already normalized
 			return array;
 		}
-		else if ( incoming instanceof Map<?,?> valueMap ) {
-			final var attributes = getNaturalIdAttributes();
-			final var values = new Object[ attributes.size() ];
-			for ( int i = 0; i < attributes.size(); i++ ) {
-				values[ i ] = valueMap.get( attributes.get( i ).getAttributeName() );
-			}
-			return values;
-		}
 		else {
-			throw new UnsupportedMappingException( "Could not normalize compound natural id value: " + incoming );
+			return valueNormalizer.normalize( incoming );
 		}
 	}
 
+	@Override
+	public boolean isNormalized(Object incoming) {
+		return incoming instanceof Object[];
+	}
+
 	@Override
 	public void validateInternalForm(Object naturalIdValue) {
 		if ( naturalIdValue != null ) {
@@ -198,8 +224,7 @@ public void verifyFlushState(Object id, Object[] currentState, Object[] loadedSt
 
 			for ( int i = 0; i < getNaturalIdAttributes().size(); i++ ) {
 				final var attributeMapping = getNaturalIdAttributes().get( i );
-				final boolean updatable = attributeMapping.getAttributeMetadata().isUpdatable();
-				if ( !updatable ) {
+				if ( !attributeMapping.getAttributeMetadata().isUpdatable() ) {
 					final Object currentValue = naturalId[i];
 					final Object previousValue = previousNaturalId[i];
 					if ( !attributeMapping.areEqual( currentValue, previousValue, session ) ) {
@@ -343,7 +368,7 @@ else if ( domainValue instanceof Object[] values ) {
 			}
 		}
 		else {
-			throw new AssertionFailure("Unexpected domain value type");
+			throw new AssertionFailure( "Unexpected domain value type" );
 		}
 		return span;
 	}
@@ -394,7 +419,7 @@ else if ( value instanceof Object[] incoming ) {
 			return outgoing;
 		}
 		else {
-			throw new AssertionFailure("Unexpected value");
+			throw new AssertionFailure( "Unexpected value" );
 		}
 	}
 
@@ -412,7 +437,7 @@ else if ( value instanceof Object[] values ) {
 			}
 		}
 		else {
-			throw new AssertionFailure("Unexpected value");
+			throw new AssertionFailure( "Unexpected value" );
 		}
 	}
 
@@ -453,7 +478,7 @@ else if ( value instanceof Object[] incoming ) {
 			}
 		}
 		else {
-			throw new AssertionFailure("Unexpected value");
+			throw new AssertionFailure( "Unexpected value" );
 		}
 		return span;
 	}
@@ -481,7 +506,7 @@ else if ( value instanceof Object[] incoming ) {
 			}
 		}
 		else {
-			throw new AssertionFailure("Unexpected value");
+			throw new AssertionFailure( "Unexpected value" );
 		}
 		return span;
 	}
@@ -509,7 +534,7 @@ public ModelPart findSubPart(String name, EntityMappingType treatTargetType) {
 	@Override
 	public void forEachSubPart(IndexedConsumer<ModelPart> consumer, EntityMappingType treatTarget) {
 		for ( int i = 0; i < attributes.size(); i++ ) {
-			consumer.accept( i, attributes.get(i) );
+			consumer.accept( i, attributes.get( i ) );
 		}
 	}
 
@@ -630,16 +655,16 @@ private AssemblerImpl(ImmutableFetchList fetches, JavaType<Object[]> jtd, Assemb
 
 		@Override
 		public Object[] assemble(RowProcessingState rowProcessingState) {
-			final var result = new Object[ subAssemblers.length ];
+			final var result = new Object[subAssemblers.length];
 			for ( int i = 0; i < subAssemblers.length; i++ ) {
-				result[ i ] = subAssemblers[i].assemble( rowProcessingState );
+				result[i] = subAssemblers[i].assemble( rowProcessingState );
 			}
 			return result;
 		}
 
 		@Override
 		public void resolveState(RowProcessingState rowProcessingState) {
-			for ( DomainResultAssembler<?> subAssembler : subAssemblers ) {
+			for ( var subAssembler : subAssemblers ) {
 				subAssembler.resolveState( rowProcessingState );
 			}
 		}
@@ -662,4 +687,232 @@ public JavaType<Object[]> getAssembledJavaType() {
 		}
 	}
 
+	interface ValueNormalizer {
+		boolean isInstance(Object value);
+		Object[] normalize(Object value);
+		Class<?> getIdClassType();
+	}
+
+	private static <T> ValueNormalizer createValueNormalizer(
+			ClassDetails naturalIdClassDetails,
+			List<SingularAttributeMapping> keyAttributes,
+			MappingModelCreationProcess creationProcess) {
+		if ( naturalIdClassDetails == null ) {
+			return new ValueNormalizerSupport( keyAttributes );
+		}
+
+		final var modelsContext =
+				creationProcess.getCreationContext().getBootstrapContext()
+						.getModelsContext();
+
+		var naturalIdClass = naturalIdClassDetails.toJavaClass( modelsContext.getClassLoading(), modelsContext );
+		var naturalIdClassComponents = extractComponents( naturalIdClass );
+		var naturalIdClassGetterAccess = createNaturalIdClassGetterAccess( naturalIdClass );
+
+		final List<AttributeMapper<Object, T>> attributeMappers = new ArrayList<>();
+		keyAttributes.forEach( keyAttribute -> {
+			// find the matching MemberDetails on the `naturalIdClass`...
+			final var extractor = resolveMatchingExtractor(
+					naturalIdClass,
+					keyAttribute,
+					naturalIdClassGetterAccess,
+					naturalIdClassComponents,
+					modelsContext
+			);
+			// todo (natural-id-class) : atm there is functionally no difference
+			//		between BasicAttributeMapperImpl and ToOneAttributeMapperImpl.
+			//		ideally we'd eventually support usage of the associated key entity's
+			//		id and then there would.  see the note in ToOneAttributeMapperImpl#extractFrom
+			final var attrMapper =
+					keyAttribute instanceof ToOneAttributeMapping
+							? new ToOneAttributeMapperImpl<T>( keyAttribute, extractor )
+							: new BasicAttributeMapperImpl<T>( keyAttribute, extractor );
+			attributeMappers.add( attrMapper );
+		} );
+
+		//noinspection unchecked,rawtypes
+		return new KeyClassNormalizer( keyAttributes, naturalIdClass, attributeMappers );
+	}
+
+	static class ValueNormalizerSupport implements ValueNormalizer {
+		private final List<SingularAttributeMapping> naturalIdAttributes;
+
+		public ValueNormalizerSupport(List<SingularAttributeMapping> naturalIdAttributes) {
+			this.naturalIdAttributes = naturalIdAttributes;
+		}
+
+		@Override
+		public boolean isInstance(Object value) {
+			return value instanceof Map;
+		}
+
+		@Override
+		public Object[] normalize(Object incoming) {
+			if ( !isInstance( incoming ) ) {
+				throw new UnsupportedMappingException( "Could not normalize compound natural id value: " + incoming );
+			}
+			final var values = new Object[naturalIdAttributes.size()];
+			//noinspection unchecked
+			final Map<String,Object> valuesMap = (Map<String,Object>) incoming;
+			for ( int i = 0; i < naturalIdAttributes.size(); i++ ) {
+				values[i] = valuesMap.get( naturalIdAttributes.get( i ).getAttributeName() );
+			}
+			return values;
+		}
+
+		@Override
+		public Class<?> getIdClassType() {
+			return null;
+		}
+	}
+
+	/// Responsible for decomposing a value of the NaturalIdClass into the internal array format
+	static class KeyClassNormalizer<T> extends ValueNormalizerSupport {
+		private final Class<T> idClassType;
+		private final List<AttributeMapper<Object, T>> idClassAttributeMappers;
+
+		public KeyClassNormalizer(
+				List<SingularAttributeMapping> naturalIdAttributes,
+				Class<T> idClassType,
+				List<AttributeMapper<Object, T>> idClassAttributeMappers) {
+			super( naturalIdAttributes );
+			this.idClassType = idClassType;
+			this.idClassAttributeMappers = idClassAttributeMappers;
+		}
+
+		@Override
+		public Class<?> getIdClassType() {
+			return idClassType;
+		}
+
+		@Override
+		public Object[] normalize(Object value) {
+			if ( idClassType.isInstance( value ) ) {
+				return doNormalize( idClassType.cast( value ) );
+			}
+
+			return super.normalize( value );
+		}
+
+		public Object[] doNormalize(T idClassValue) {
+			final var result = new Object[idClassAttributeMappers.size()];
+			for ( int i = 0; i < idClassAttributeMappers.size(); i++ ) {
+				var value = idClassAttributeMappers.get( i ).extractFrom( idClassValue );
+				result[i] = value;
+			}
+			return result;
+		}
+
+		public boolean isInstance(Object value) {
+			return idClassType.isInstance( value ) || super.isInstance( value );
+		}
+	}
+
+	private static <T> Function<String, Method> createNaturalIdClassGetterAccess(Class<T> naturalIdClass) {
+		return new Function<>() {
+			private Map<String,Method> getterMethods;
+			@Override
+			public Method apply(String name) {
+				if ( getterMethods == null ) {
+					getterMethods = extractGetterMethods( naturalIdClass );
+				}
+				return getterMethods.get( name );
+			}
+		};
+	}
+
+	private static <T> Getter resolveMatchingExtractor(
+			Class<T> naturalIdClass,
+			AttributeMapping keyAttribute,
+			Function<String, Method> getterMethodAccess,
+			Map<String, RecordComponent> naturalIdClassComponents,
+			ModelsContext modelsContext) {
+		// first, if the `naturalIdClass` is a record, look for a component
+		final String keyName = keyAttribute.getAttributeName();
+
+		if ( naturalIdClass.isRecord() ) {
+			final var component = naturalIdClassComponents.get( keyName );
+			if ( component != null ) {
+				return new GetterMethodImpl( naturalIdClass, keyName, component.getAccessor() );
+			}
+		}
+
+		// next look for a getter method
+		final var getterMethod = getterMethodAccess.apply( keyName );
+		if ( getterMethod != null ) {
+			return new GetterMethodImpl( naturalIdClass, keyName, getterMethod );
+		}
+
+		// lastly, look for a field
+		try {
+			return new GetterFieldImpl( naturalIdClass, keyName,
+					naturalIdClass.getDeclaredField( keyName ) );
+		}
+		catch (NoSuchFieldException ignore) {
+		}
+
+		throw new MappingException( "Unable to find NaturalIdClass accessor for natural id attribute: " + keyName );
+	}
+
+	private static <T> Map<String, Method> extractGetterMethods(Class<T> naturalIdClass) {
+		final Map<String, Method> result = new HashMap<>();
+		for ( var declaredMethod : naturalIdClass.getDeclaredMethods() ) {
+			if ( declaredMethod.getParameterCount() == 0
+				&& declaredMethod.getReturnType() != void.class
+				&& !isStatic( declaredMethod.getModifiers() ) ) {
+				var methodName = declaredMethod.getName();
+				if ( methodName.startsWith( "is" ) ) {
+					result.put( decapitalize( methodName.substring( 2 ) ),
+							declaredMethod );
+				}
+				else if ( methodName.startsWith( "get" ) ) {
+					result.put( decapitalize( methodName.substring( 3 ) ),
+							declaredMethod );
+				}
+			}
+		}
+		return result;
+	}
+
+	private static Map<String, RecordComponent> extractComponents(Class<?> naturalIdClass) {
+		if ( !naturalIdClass.isRecord() ) {
+			return emptyMap();
+		}
+
+		final var recordComponents = naturalIdClass.getRecordComponents();
+		final Map<String, RecordComponent> result = new HashMap<>();
+		for ( RecordComponent recordComponent : recordComponents ) {
+			result.put( recordComponent.getName(), recordComponent );
+		}
+		return result;
+	}
+
+	public interface AttributeMapper<V, T> {
+		V extractFrom(T keyValue);
+	}
+
+	/// AttributeMapper for both basic and embedded values
+	public record BasicAttributeMapperImpl<T>(AttributeMapping entityAttribute, Getter keyClassExtractor)
+			implements AttributeMapper<Object, T> {
+		@Override
+		public Object extractFrom(T keyValue) {
+			return keyClassExtractor.get( keyValue );
+		}
+	}
+
+	/// AttributeMapper for to-one values
+	public record ToOneAttributeMapperImpl<T>(AttributeMapping entityAttribute, Getter keyClassExtractor)
+			implements AttributeMapper<Object, T> {
+		@Override
+		public Object extractFrom(T keyValue) {
+			// todo (natural-id-class) : handle "key -> to-one" resolutions
+			//		this requires some contract changes though to pass Session
+			//		to be able to resolve key -> entity for the to-one.
+			//		+
+			/// 	the other difficulty is handling "derived id" structures
+			//
+			//		see `NaturalIdMapping#normalizeInput`
+			return keyClassExtractor.get( keyValue );
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java
index 48809f49bd69..497edd11af3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java
@@ -36,7 +36,6 @@
 import org.hibernate.sql.ast.spi.SqlAliasBase;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlSelection;
-import org.hibernate.sql.ast.tree.from.StandardVirtualTableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
@@ -84,7 +83,7 @@ public DiscriminatedAssociationAttributeMapping(
 				fetchableIndex,
 				attributeMetadata,
 				fetchTiming,
-				FetchStyle.SELECT,
+				fetchTiming == FetchTiming.IMMEDIATE ? FetchStyle.JOIN : FetchStyle.SELECT,
 				declaringType,
 				propertyAccess
 		);
@@ -140,8 +139,17 @@ public Fetch generateFetch(
 				fetchTiming,
 				selected,
 				resultVariable,
-				creationState
-		);
+					creationState
+			);
+	}
+
+	@Override
+	public Fetch resolveCircularFetch(
+			NavigablePath fetchablePath,
+			FetchParent fetchParent,
+			FetchTiming fetchTiming,
+			DomainResultCreationState creationState) {
+		return discriminatorMapping.resolveCircularFetch( fetchParent, fetchablePath, fetchTiming, creationState );
 	}
 
 	@Override
@@ -466,7 +474,7 @@ public Serializable disassemble(Object value, SharedSessionContract session) {
 			// this ^^ is what we want eventually, but for the time-being to ensure compatibility with
 			// writing just reuse the AnyType
 
-			final SharedSessionContractImplementor persistenceContext = (SharedSessionContractImplementor) session;
+			final var persistenceContext = (SharedSessionContractImplementor) session;
 			return anyType.disassemble( value, persistenceContext, null );
 		}
 
@@ -477,7 +485,7 @@ public Object assemble(Serializable cached, SharedSessionContract session) {
 
 			// again, what we want eventually ^^ versus what we should do now vv
 
-			final SharedSessionContractImplementor persistenceContext = (SharedSessionContractImplementor) session;
+			final var persistenceContext = (SharedSessionContractImplementor) session;
 			return anyType.assemble( cached, persistenceContext, null );
 		}
 	}
@@ -517,7 +525,14 @@ public TableGroup createRootTableGroupJoin(
 			boolean fetched,
 			@Nullable Consumer<Predicate> predicateConsumer,
 			SqlAstCreationState creationState) {
-		return new StandardVirtualTableGroup( navigablePath, this, lhs, fetched );
+		return discriminatorMapping.createRootTableGroupJoin(
+				navigablePath,
+				lhs,
+				fetched,
+				sqlAstJoinType,
+				predicateConsumer,
+				creationState
+		);
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java
index d5dbbe343c6a..a9bdfd0d6b06 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationMapping.java
@@ -4,7 +4,12 @@
  */
 package org.hibernate.metamodel.mapping.internal;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import org.hibernate.engine.FetchStyle;
 import org.hibernate.engine.FetchTiming;
@@ -12,6 +17,7 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.mapping.Any;
 import org.hibernate.mapping.Column;
+import org.hibernate.metamodel.mapping.AssociationKey;
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
 import org.hibernate.metamodel.mapping.DiscriminatedAssociationModelPart;
 import org.hibernate.metamodel.mapping.DiscriminatorMapping;
@@ -22,12 +28,26 @@
 import org.hibernate.metamodel.mapping.SelectablePath;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.spi.NavigablePath;
+import org.hibernate.sql.ast.SqlAstJoinType;
+import org.hibernate.sql.ast.spi.FromClauseAccess;
 import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.ast.tree.from.TableGroupJoin;
+import org.hibernate.sql.ast.tree.from.TableReference;
+import org.hibernate.sql.ast.tree.from.TableGroupJoinProducer;
+import org.hibernate.sql.ast.tree.from.StandardVirtualTableGroup;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.ast.tree.expression.QueryLiteral;
+import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
+import org.hibernate.sql.ast.tree.predicate.Junction;
+import org.hibernate.sql.ast.tree.predicate.Predicate;
+import org.hibernate.sql.ast.tree.predicate.PredicateCollector;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.FetchOptions;
 import org.hibernate.sql.results.graph.FetchParent;
+import org.hibernate.sql.results.graph.entity.internal.JoinedDiscriminatedEntityFetch;
+import org.hibernate.sql.results.graph.entity.internal.JoinedDiscriminatedEntityResult;
 import org.hibernate.sql.results.graph.entity.internal.DiscriminatedEntityFetch;
 import org.hibernate.sql.results.graph.entity.internal.DiscriminatedEntityResult;
 import org.hibernate.type.AnyType;
@@ -36,6 +56,8 @@
 import org.hibernate.type.descriptor.java.JavaType;
 
 import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getSelectablePath;
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getTableIdentifierExpression;
+import static org.hibernate.query.sqm.ComparisonOperator.EQUAL;
 
 /**
  * Represents the "type" of an any-valued mapping
@@ -52,11 +74,11 @@ public static DiscriminatedAssociationMapping from(
 			Any bootValueMapping,
 			MappingModelCreationProcess creationProcess) {
 
-		final var dialect = creationProcess.getCreationContext().getDialect();
-		final String tableName = MappingModelCreationHelper.getTableIdentifierExpression(
-				bootValueMapping.getTable(),
-				creationProcess
-		);
+		final var creationContext = creationProcess.getCreationContext();
+		final var sessionFactory = creationContext.getSessionFactory();
+		final var dialect = creationContext.getDialect();
+		final String tableName =
+				getTableIdentifierExpression( bootValueMapping.getTable(), creationProcess );
 
 		assert bootValueMapping.getColumnSpan() == 2;
 		final var columnIterator = bootValueMapping.getSelectables().iterator();
@@ -70,7 +92,7 @@ public static DiscriminatedAssociationMapping from(
 		assert !keySelectable.isFormula();
 		final var metaColumn = (Column) metaSelectable;
 		final var keyColumn = (Column) keySelectable;
-		final SelectablePath parentSelectablePath =
+		final var parentSelectablePath =
 				declaringModelPart.asAttributeMapping() != null
 						? getSelectablePath( declaringModelPart.asAttributeMapping().getDeclaringType() )
 						: null;
@@ -81,7 +103,8 @@ public static DiscriminatedAssociationMapping from(
 				declaringModelPart,
 				tableName,
 				metaColumn.getText( dialect ),
-				parentSelectablePath != null ? parentSelectablePath.append( metaColumn.getQuotedName( dialect ) )
+				parentSelectablePath != null
+						? parentSelectablePath.append( metaColumn.getQuotedName( dialect ) )
 						: new SelectablePath( metaColumn.getQuotedName( dialect ) ),
 				metaColumn.getCustomReadExpression(),
 				metaColumn.getCustomWriteExpression(),
@@ -96,7 +119,7 @@ public static DiscriminatedAssociationMapping from(
 				(BasicType<?>) metaType.getBaseType(),
 				metaType.getDiscriminatorValuesToEntityNameMap(),
 				metaType.getImplicitValueStrategy(),
-				creationProcess.getCreationContext().getSessionFactory().getMappingMetamodel()
+				sessionFactory.getMappingMetamodel()
 		);
 
 
@@ -106,7 +129,8 @@ public static DiscriminatedAssociationMapping from(
 				declaringModelPart,
 				tableName,
 				keyColumn.getText( dialect ),
-				parentSelectablePath != null ? parentSelectablePath.append( keyColumn.getQuotedName( dialect ) )
+				parentSelectablePath != null
+						? parentSelectablePath.append( keyColumn.getQuotedName( dialect ) )
 						: new SelectablePath( keyColumn.getQuotedName( dialect ) ),
 				keyColumn.getCustomReadExpression(),
 				keyColumn.getCustomWriteExpression(),
@@ -130,7 +154,7 @@ public static DiscriminatedAssociationMapping from(
 				bootValueMapping.isLazy()
 						? FetchTiming.DELAYED
 						: FetchTiming.IMMEDIATE,
-				creationProcess.getCreationContext().getSessionFactory()
+				sessionFactory
 		);
 	}
 
@@ -140,6 +164,7 @@ public static DiscriminatedAssociationMapping from(
 	private final JavaType<?> baseAssociationJtd;
 	private final FetchTiming fetchTiming;
 	private final SessionFactoryImplementor sessionFactory;
+	private AssociationKey associationKey;
 
 	public DiscriminatedAssociationMapping(
 			DiscriminatedAssociationModelPart modelPart,
@@ -169,12 +194,10 @@ public BasicValuedModelPart getKeyPart() {
 	}
 
 	public Object resolveDiscriminatorValueToEntityMapping(EntityMappingType entityMappingType) {
-		final DiscriminatorValueDetails details =
+		final var details =
 				discriminatorPart.getValueConverter()
 						.getDetailsForEntityName( entityMappingType.getEntityName() );
-		return details != null
-				? details.getValue()
-				: null;
+		return details == null ? null : details.getValue();
 	}
 
 	public EntityMappingType resolveDiscriminatorValueToEntityMapping(Object discriminatorValue) {
@@ -294,7 +317,9 @@ private ModelPart resolveAssociatedSubPart(String name, EntityMappingType entity
 	private void ensureMapped(EntityMappingType treatTarget) {
 		assert treatTarget != null;
 
-		final DiscriminatorValueDetails details = discriminatorPart.getValueConverter().getDetailsForEntityName( treatTarget.getEntityName() );
+		final var details =
+				discriminatorPart.getValueConverter()
+						.getDetailsForEntityName( treatTarget.getEntityName() );
 		if ( details == null ) {
 			throw new IllegalArgumentException(
 					String.format(
@@ -322,7 +347,7 @@ public JavaType<?> getMappedJavaType() {
 
 	@Override
 	public FetchStyle getStyle() {
-		return FetchStyle.SELECT;
+		return fetchTiming == FetchTiming.IMMEDIATE ? FetchStyle.JOIN : FetchStyle.SELECT;
 	}
 
 	@Override
@@ -330,6 +355,230 @@ public FetchTiming getTiming() {
 		return fetchTiming;
 	}
 
+	AssociationKey getAssociationKey() {
+		if ( associationKey == null ) {
+			final List<String> columns = new ArrayList<>( discriminatorPart.getJdbcTypeCount() + keyPart.getJdbcTypeCount() );
+			discriminatorPart.forEachSelectable( (selectionIndex, selectableMapping) -> columns.add( selectableMapping.getSelectionExpression() ) );
+			keyPart.forEachSelectable( (selectionIndex, selectableMapping) -> columns.add( selectableMapping.getSelectionExpression() ) );
+			associationKey = new AssociationKey( discriminatorPart.getContainingTableExpression(), columns );
+		}
+		return associationKey;
+	}
+
+	Fetch resolveCircularFetch(
+			FetchParent fetchParent,
+			NavigablePath fetchablePath,
+			FetchTiming fetchTiming,
+			DomainResultCreationState creationState) {
+		if ( creationState.isAssociationKeyVisited( getAssociationKey() ) ) {
+			return new DiscriminatedEntityFetch(
+					fetchablePath,
+					baseAssociationJtd,
+					modelPart,
+					fetchTiming,
+					fetchParent,
+					creationState
+			);
+		}
+		return null;
+	}
+
+	private Fetch withRegisteredAssociationKey(
+			Supplier<Fetch> fetchCreator,
+			DomainResultCreationState creationState) {
+		final boolean added = creationState.registerVisitedAssociationKey( getAssociationKey() );
+		try {
+			return fetchCreator.get();
+		}
+		finally {
+			if ( added ) {
+				creationState.removeVisitedAssociationKey( getAssociationKey() );
+			}
+		}
+	}
+
+	List<DiscriminatorValueDetails> getMappedEntityValueDetails() {
+		final var valueDetails = new ArrayList<DiscriminatorValueDetails>();
+		discriminatorPart.getValueConverter().forEachValueDetail( valueDetails::add );
+		return valueDetails;
+	}
+
+	public static NavigablePath concreteEntityPath(NavigablePath associationPath, EntityMappingType entityMappingType) {
+		return associationPath.treatAs( entityMappingType.getEntityName() );
+	}
+
+	TableGroup createRootTableGroupJoin(
+			NavigablePath navigablePath,
+			TableGroup lhs,
+			boolean fetched,
+			SqlAstJoinType requestedJoinType,
+			Consumer<Predicate> predicateConsumer,
+			org.hibernate.sql.ast.spi.SqlAstCreationState creationState) {
+		final var virtualTableGroup = new StandardVirtualTableGroup( navigablePath, modelPart, lhs, fetched );
+		final var valueDetails = getMappedEntityValueDetails();
+		final SqlAstJoinType effectiveJoinType =
+				valueDetails.size() == 1 && requestedJoinType == SqlAstJoinType.INNER
+						? SqlAstJoinType.INNER
+						: SqlAstJoinType.LEFT;
+
+		for ( DiscriminatorValueDetails valueDetail : valueDetails ) {
+			addConcreteEntityTableGroupJoin(
+					virtualTableGroup,
+					lhs,
+					navigablePath,
+					valueDetail,
+					effectiveJoinType,
+					predicateConsumer,
+					creationState
+			);
+		}
+
+		return virtualTableGroup;
+	}
+
+	private void addConcreteEntityTableGroupJoin(
+			StandardVirtualTableGroup virtualTableGroup,
+			TableGroup lhs,
+			NavigablePath associationPath,
+			DiscriminatorValueDetails valueDetail,
+			SqlAstJoinType joinType,
+			Consumer<Predicate> predicateConsumer,
+			org.hibernate.sql.ast.spi.SqlAstCreationState creationState) {
+		final var entityMapping = valueDetail.getIndicatedEntity();
+		final var concretePath = concreteEntityPath( associationPath, entityMapping );
+		final var joinPredicateCollector = new PredicateCollector();
+
+		final var entityTableGroup = entityMapping.createRootTableGroup(
+				joinType == SqlAstJoinType.INNER && lhs.canUseInnerJoins(),
+				concretePath,
+				null,
+				null,
+				() -> joinPredicateCollector::applyPredicate,
+				creationState
+		);
+		joinPredicateCollector.applyPredicate(
+				createAssociationPredicate( lhs, entityTableGroup, entityMapping, valueDetail )
+		);
+
+		applyEntityRestrictions( joinPredicateCollector, entityMapping, entityTableGroup, creationState );
+
+		final var tableGroupJoin = new TableGroupJoin(
+				concretePath,
+				joinType,
+				entityTableGroup,
+				joinPredicateCollector.getPredicate()
+		);
+		virtualTableGroup.addNestedTableGroupJoin( tableGroupJoin );
+		creationState.getFromClauseAccess().registerTableGroup( concretePath, entityTableGroup );
+
+		if ( predicateConsumer != null && joinPredicateCollector.getPredicate() != null ) {
+			predicateConsumer.accept( joinPredicateCollector.getPredicate() );
+		}
+	}
+
+	private void applyEntityRestrictions(
+			PredicateCollector predicateCollector,
+			EntityMappingType entityMappingType,
+			TableGroup entityTableGroup,
+			org.hibernate.sql.ast.spi.SqlAstCreationState creationState) {
+		final Map<String, org.hibernate.Filter> enabledFilters = creationState.getLoadQueryInfluencers().getEnabledFilters();
+		if ( entityMappingType.getEntityPersister().hasFilterForLoadByKey() ) {
+			entityMappingType.applyBaseRestrictions(
+					predicateCollector::applyPredicate,
+					entityTableGroup,
+					true,
+					enabledFilters,
+					creationState.applyOnlyLoadByKeyFilters(),
+					null,
+					creationState
+			);
+		}
+		entityMappingType.applyWhereRestrictions(
+				predicateCollector::applyPredicate,
+				entityTableGroup,
+				true,
+				creationState
+		);
+		if ( entityMappingType.getSuperMappingType() != null && !creationState.supportsEntityNameUsage() ) {
+			entityMappingType.applyDiscriminator( null, null, entityTableGroup, creationState );
+		}
+		final var auxiliaryMapping = entityMappingType.getAuxiliaryMapping();
+		if ( auxiliaryMapping != null ) {
+			auxiliaryMapping.applyPredicate(
+					entityMappingType,
+					predicateCollector::applyPredicate,
+					entityTableGroup,
+					creationState.getSqlAliasBaseGenerator(),
+					creationState.getLoadQueryInfluencers()
+			);
+		}
+	}
+
+	private Predicate createAssociationPredicate(
+			TableGroup lhs,
+			TableGroup entityTableGroup,
+			EntityMappingType entityMappingType,
+			DiscriminatorValueDetails valueDetail) {
+		final var identifierMapping = entityMappingType.getIdentifierMapping();
+		final BasicValuedModelPart identifierPart = identifierMapping.asBasicValuedModelPart();
+		if ( identifierPart == null ) {
+			throw new UnsupportedOperationException(
+					"Join fetching an @Any association is not supported for entity '" + entityMappingType.getEntityName()
+							+ "' because it does not use a basic identifier"
+			);
+		}
+
+		final TableReference discriminatorTableReference =
+				lhs.resolveTableReference( null, discriminatorPart.getContainingTableExpression() );
+		final TableReference keyTableReference =
+				lhs.resolveTableReference( null, keyPart.getContainingTableExpression() );
+		final TableReference identifierTableReference =
+				entityTableGroup.resolveTableReference( entityTableGroup.getNavigablePath(), identifierPart.getContainingTableExpression() );
+
+		final Junction predicate = new Junction( Junction.Nature.CONJUNCTION );
+		predicate.add(
+				new ComparisonPredicate(
+						new ColumnReference( discriminatorTableReference, discriminatorPart ),
+						EQUAL,
+						new QueryLiteral<>( valueDetail.getValue(), discriminatorPart )
+				)
+		);
+		predicate.add(
+				new ComparisonPredicate(
+						new ColumnReference( identifierTableReference, identifierPart ),
+						EQUAL,
+						new ColumnReference( keyTableReference, keyPart )
+				)
+		);
+		return predicate;
+	}
+
+	private TableGroup resolveJoinedFetchTableGroup(
+			FetchParent fetchParent,
+			NavigablePath fetchablePath,
+			String resultVariable,
+			DomainResultCreationState creationState) {
+		final FromClauseAccess fromClauseAccess = creationState.getSqlAstCreationState().getFromClauseAccess();
+		return fromClauseAccess.resolveTableGroup(
+				fetchablePath,
+				navigablePath -> {
+					final TableGroup parentTableGroup = fromClauseAccess.getTableGroup( fetchParent.getNavigablePath() );
+					final TableGroupJoin tableGroupJoin = ( (TableGroupJoinProducer) modelPart ).createTableGroupJoin(
+							navigablePath,
+							parentTableGroup,
+							resultVariable,
+							null,
+							SqlAstJoinType.LEFT,
+							true,
+							false,
+							creationState.getSqlAstCreationState()
+					);
+					parentTableGroup.addTableGroupJoin( tableGroupJoin );
+					return tableGroupJoin.getJoinedGroup();
+				}
+		);
+	}
+
 	public Fetch generateFetch(
 			FetchParent fetchParent,
 			NavigablePath fetchablePath,
@@ -337,6 +586,23 @@ public Fetch generateFetch(
 			boolean selected,
 			String resultVariable,
 			DomainResultCreationState creationState) {
+		if ( selected ) {
+			return withRegisteredAssociationKey(
+					() -> {
+						resolveJoinedFetchTableGroup( fetchParent, fetchablePath, resultVariable, creationState );
+						return new JoinedDiscriminatedEntityFetch(
+								fetchablePath,
+								baseAssociationJtd,
+								modelPart,
+								fetchTiming,
+								fetchParent,
+								getMappedEntityValueDetails(),
+								creationState
+						);
+					},
+					creationState
+			);
+		}
 		return new DiscriminatedEntityFetch(
 				fetchablePath,
 				baseAssociationJtd,
@@ -352,13 +618,49 @@ public <T> DomainResult<T> createDomainResult(
 			TableGroup tableGroup,
 			String resultVariable,
 			DomainResultCreationState creationState) {
-		return new DiscriminatedEntityResult<>(
-				navigablePath,
-				baseAssociationJtd,
-				modelPart,
-				resultVariable,
-				creationState
-		);
+		if ( resolveJoinedResultTableGroup( navigablePath, tableGroup, creationState ) != null ) {
+			return new JoinedDiscriminatedEntityResult<>(
+					navigablePath,
+					baseAssociationJtd,
+					modelPart,
+					resultVariable,
+					getMappedEntityValueDetails(),
+					creationState
+			);
+		}
+		else {
+			return new DiscriminatedEntityResult<>(
+					navigablePath,
+					baseAssociationJtd,
+					modelPart,
+					resultVariable,
+					creationState
+			);
+		}
+	}
+
+	private TableGroup resolveJoinedResultTableGroup(
+			NavigablePath navigablePath,
+			TableGroup tableGroup,
+			DomainResultCreationState creationState) {
+		final TableGroup joinedTableGroup =
+				creationState.getSqlAstCreationState().getFromClauseAccess()
+						.findTableGroup( navigablePath );
+		if ( joinedTableGroup != null
+				&& isModelPartWithRealJoins( joinedTableGroup ) ) {
+			return joinedTableGroup;
+		}
+		else if ( isModelPartWithRealJoins( tableGroup ) ) {
+			return tableGroup;
+		}
+		else {
+			return null;
+		}
+	}
+
+	private boolean isModelPartWithRealJoins(TableGroup joinedTableGroup) {
+		return joinedTableGroup.getModelPart() == modelPart
+			&& joinedTableGroup.hasRealJoins();
 	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java
index d16c3806ee66..fbc5d72c2d38 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java
@@ -30,7 +30,6 @@
 import org.hibernate.sql.ast.spi.SqlAliasBase;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlSelection;
-import org.hibernate.sql.ast.tree.from.StandardVirtualTableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
@@ -369,7 +368,14 @@ public TableGroup createRootTableGroupJoin(
 			boolean fetched,
 			@Nullable Consumer<Predicate> predicateConsumer,
 			SqlAstCreationState creationState) {
-		return new StandardVirtualTableGroup( navigablePath, this, lhs, fetched );
+		return associationMapping.createRootTableGroupJoin(
+				navigablePath,
+				lhs,
+				fetched,
+				sqlAstJoinType,
+				predicateConsumer,
+				creationState
+		);
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorValueDetailsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorValueDetailsImpl.java
index 8a68a66d5dbd..4e9767ea69b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorValueDetailsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatorValueDetailsImpl.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.metamodel.mapping.internal;
 
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.mapping.DiscriminatorValueDetails;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 
@@ -11,17 +12,17 @@
  * @author Steve Ebersole
  */
 public class DiscriminatorValueDetailsImpl implements DiscriminatorValueDetails {
-	private final Object value;
+	private final DiscriminatorValue value;
 	private final EntityMappingType matchedEntityDescriptor;
 
-	public DiscriminatorValueDetailsImpl(Object value, EntityMappingType matchedEntityDescriptor) {
+	public DiscriminatorValueDetailsImpl(DiscriminatorValue value, EntityMappingType matchedEntityDescriptor) {
 		this.value = value;
 		this.matchedEntityDescriptor = matchedEntityDescriptor;
 	}
 
 	@Override
 	public Object getValue() {
-		return value;
+		return value.value();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java
index b957478d6c88..118659129f02 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java
@@ -17,12 +17,8 @@
 
 import org.hibernate.MappingException;
 import org.hibernate.SharedSessionContract;
-import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.FetchTiming;
-import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.Any;
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.Column;
@@ -65,12 +61,14 @@
 import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.MutabilityPlan;
-import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
-import org.hibernate.type.descriptor.jdbc.JdbcTypeConstructor;
-import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.spi.CompositeTypeImplementor;
-import org.hibernate.type.spi.TypeConfiguration;
 
+import static java.lang.System.arraycopy;
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.buildBasicAttributeMapping;
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.buildEmbeddedAttributeMapping;
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.buildPluralAttributeMapping;
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.buildSingularAssociationAttributeMapping;
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getTableIdentifierExpression;
 import static org.hibernate.type.SqlTypes.ARRAY;
 import static org.hibernate.type.SqlTypes.JSON;
 import static org.hibernate.type.SqlTypes.JSON_ARRAY;
@@ -203,9 +201,9 @@ private EmbeddableMappingTypeImpl(
 			this.concreteEmbeddableBySubclass = null;
 		}
 
-		final AggregateColumn aggregateColumn = bootDescriptor.getAggregateColumn();
+		final var aggregateColumn = bootDescriptor.getAggregateColumn();
 		if ( aggregateColumn != null ) {
-			final Dialect dialect = creationContext.getDialect();
+			final var dialect = creationContext.getDialect();
 			final boolean insertable;
 			final boolean updatable;
 			if ( componentProperty == null ) {
@@ -220,6 +218,7 @@ private EmbeddableMappingTypeImpl(
 					bootDescriptor.getOwner().getTable()
 							.getQualifiedName( creationContext.getSqlStringGenerationContext() ),
 					aggregateColumn,
+					null,
 					bootDescriptor.getParentAggregateColumn() != null
 							? bootDescriptor.getParentAggregateColumn().getSelectablePath()
 							: null,
@@ -228,13 +227,18 @@ private EmbeddableMappingTypeImpl(
 					insertable,
 					updatable,
 					false,
+					false,
 					dialect,
 					null,
 					creationContext
 			);
-			final int defaultSqlTypeCode = aggregateMapping.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode();
+			final int defaultSqlTypeCode =
+					aggregateMapping.getJdbcMapping().getJdbcType().getDefaultSqlTypeCode();
 			final var aggregateSupport = dialect.getAggregateSupport();
-			final int sqlTypeCode = defaultSqlTypeCode == ARRAY ? aggregateColumn.getTypeCode() : defaultSqlTypeCode;
+			final int sqlTypeCode =
+					defaultSqlTypeCode == ARRAY
+							? aggregateColumn.getTypeCode()
+							: defaultSqlTypeCode;
 			this.aggregateMappingRequiresColumnWriter = aggregateSupport
 					.requiresAggregateCustomWriteExpressionRenderer( sqlTypeCode );
 			this.preferSelectAggregateMapping = aggregateSupport.preferSelectAggregateMapping( sqlTypeCode );
@@ -296,36 +300,36 @@ private JdbcMapping resolveJdbcMapping(Component bootDescriptor, RuntimeModelCre
 				aggregateSqlTypeCode = aggregateColumnSqlTypeCode;
 				break;
 		}
-		final JdbcTypeRegistry jdbcTypeRegistry = typeConfiguration.getJdbcTypeRegistry();
-		final AggregateJdbcType aggregateJdbcType = jdbcTypeRegistry.resolveAggregateDescriptor(
+		final var jdbcTypeRegistry = typeConfiguration.getJdbcTypeRegistry();
+		final var aggregateJdbcType = jdbcTypeRegistry.resolveAggregateDescriptor(
 				aggregateSqlTypeCode,
 				structTypeName,
 				this,
 				creationContext
 		);
-		final BasicType<?> basicType = basicTypeRegistry.resolve(
-				getMappedJavaType(),
-				aggregateJdbcType
-		);
+		final var basicType = basicTypeRegistry.resolve( getMappedJavaType(), aggregateJdbcType );
 		// Register the resolved type under its struct name and java class name
-		if ( bootDescriptor.getStructName() != null ) {
-			basicTypeRegistry.register( basicType, bootDescriptor.getStructName().render() );
+		final var structName = bootDescriptor.getStructName();
+		if ( structName != null ) {
+			basicTypeRegistry.register( basicType, structName.render() );
 			basicTypeRegistry.register( basicType, getMappedJavaType().getJavaTypeClass().getName() );
 		}
 		final BasicType<?> resolvedJdbcMapping;
 		if ( isArray ) {
-			final JdbcTypeConstructor arrayConstructor = jdbcTypeRegistry.getConstructor( aggregateColumnSqlTypeCode );
+			final var arrayConstructor = jdbcTypeRegistry.getConstructor( aggregateColumnSqlTypeCode );
 			if ( arrayConstructor == null ) {
 				throw new IllegalArgumentException( "No JdbcTypeConstructor registered for SqlTypes." + JdbcTypeNameMapper.getTypeName( aggregateColumnSqlTypeCode ) );
 			}
 			//noinspection rawtypes,unchecked
-			final BasicType<?> arrayType = ( (BasicPluralJavaType) resolution.getDomainJavaType() ).resolveType(
-					typeConfiguration,
-					creationContext.getDialect(),
-					basicType,
-					aggregateColumn,
-					typeConfiguration.getCurrentBaseSqlTypeIndicators()
-			);
+			final BasicType<?> arrayType =
+					( (BasicPluralJavaType) resolution.getDomainJavaType() )
+							.resolveType(
+									typeConfiguration,
+									creationContext.getDialect(),
+									basicType,
+									aggregateColumn,
+									typeConfiguration.getCurrentBaseSqlTypeIndicators()
+							);
 			basicTypeRegistry.register( arrayType );
 			resolvedJdbcMapping = arrayType;
 		}
@@ -356,7 +360,9 @@ public EmbeddableMappingTypeImpl(
 		this.preferBindAggregateMapping = false;
 		this.selectableMappings = selectableMappings;
 		creationProcess.registerInitializationCallback(
-				"EmbeddableMappingType(" + inverseMappingType.getNavigableRole().getFullPath() + ".{inverse})#finishInitialization",
+				"EmbeddableMappingType("
+						+ inverseMappingType.getNavigableRole().getFullPath()
+						+ ".{inverse})#finishInitialization",
 				() -> inverseInitializeCallback(
 						declaringTableGroupProducer,
 						selectableMappings,
@@ -418,13 +424,14 @@ private boolean finishInitialization(
 //		);
 // todo (6.0) - get this ^^ to work, or drop the comment
 
-		final TypeConfiguration typeConfiguration = creationProcess.getCreationContext().getTypeConfiguration();
-		final JdbcServices jdbcServices = creationProcess.getCreationContext().getJdbcServices();
-		final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment();
-		final Dialect dialect = jdbcEnvironment.getDialect();
+		final var creationContext = creationProcess.getCreationContext();
+		final var typeConfiguration = creationContext.getTypeConfiguration();
+		final var dialect =
+				creationContext.getJdbcServices()
+						.getJdbcEnvironment().getDialect();
 
 		final String baseTableExpression = valueMapping.getContainingTableExpression();
-		final Type[] subtypes = compositeType.getSubtypes();
+		final var subtypes = compositeType.getSubtypes();
 
 		int attributeIndex = 0;
 		int columnPosition = 0;
@@ -432,7 +439,7 @@ private boolean finishInitialization(
 		// Reset the attribute mappings that were added in previous attempts
 		attributeMappings.clear();
 
-		for ( final Property bootPropertyDescriptor : bootDescriptor.getProperties() ) {
+		for ( final var bootPropertyDescriptor : bootDescriptor.getProperties() ) {
 			final AttributeMapping attributeMapping;
 
 			final Type subtype = subtypes[attributeIndex];
@@ -446,18 +453,13 @@ private boolean finishInitialization(
 				final String containingTableExpression;
 				final String columnExpression;
 				if ( rootTableKeyColumnNames == null ) {
-					if ( selectable.isFormula() ) {
-						columnExpression = selectable.getTemplate( dialect,
-								creationProcess.getCreationContext().getTypeConfiguration() );
-					}
-					else {
-						columnExpression = selectable.getText( dialect );
-					}
+					columnExpression =
+							selectable.isFormula()
+									? selectable.getTemplate( dialect, typeConfiguration )
+									: selectable.getText( dialect );
 					if ( selectable instanceof Column column ) {
-						containingTableExpression = MappingModelCreationHelper.getTableIdentifierExpression(
-								column.getValue().getTable(),
-								creationProcess
-						);
+						containingTableExpression =
+								getTableIdentifierExpression( column.getValue().getTable(), creationProcess );
 					}
 					else {
 						containingTableExpression = baseTableExpression;
@@ -467,7 +469,9 @@ private boolean finishInitialization(
 					containingTableExpression = rootTableExpression;
 					columnExpression = rootTableKeyColumnNames[columnPosition];
 				}
-				final var role = valueMapping.getNavigableRole().append( bootPropertyDescriptor.getName() );
+				final var role =
+						valueMapping.getNavigableRole()
+								.append( bootPropertyDescriptor.getName() );
 				final SelectablePath selectablePath;
 				final String columnDefinition;
 				final Long length;
@@ -484,7 +488,7 @@ private boolean finishInitialization(
 					precision = column.getPrecision();
 					scale = column.getScale();
 					temporalPrecision = column.getTemporalPrecision();
-					isLob = column.isSqlTypeLob( creationProcess.getCreationContext().getMetadata() );
+					isLob = column.isSqlTypeLob( creationContext.getMetadata() );
 					nullable = bootPropertyDescriptor.isOptional() && column.isNullable() ;
 					selectablePath = basicValue.createSelectablePath( column.getQuotedName( dialect ) );
 					MappingModelCreationHelper.resolveAggregateColumnBasicType( creationProcess, role, column );
@@ -500,7 +504,7 @@ private boolean finishInitialization(
 					nullable = bootPropertyDescriptor.isOptional();
 					selectablePath = new SelectablePath( determineEmbeddablePrefix() + bootPropertyDescriptor.getName() );
 				}
-				attributeMapping = MappingModelCreationHelper.buildBasicAttributeMapping(
+				attributeMapping = buildBasicAttributeMapping(
 						bootPropertyDescriptor.getName(),
 						role,
 						attributeIndex,
@@ -516,7 +520,7 @@ private boolean finishInitialization(
 						selectable.getWriteExpr(
 								basicValue.getResolution().getJdbcMapping(),
 								dialect,
-								creationProcess.getCreationContext().getBootModel()
+								creationContext.getBootModel()
 						),
 						columnDefinition,
 						length,
@@ -537,28 +541,24 @@ private boolean finishInitialization(
 			}
 			else if ( subtype instanceof AnyType anyType ) {
 				final var bootValueMapping = (Any) value;
-
-				final var propertyAccess = representationStrategy.resolvePropertyAccess( bootPropertyDescriptor );
-				final boolean nullable = bootValueMapping.isNullable();
-				final boolean insertable = insertability[columnPosition];
-				final boolean updateable = updateability[columnPosition];
-				final boolean includeInOptimisticLocking = bootPropertyDescriptor.isOptimisticLocked();
-				final var cascadeStyle = compositeType.getCascadeStyle( attributeIndex );
-
-				SimpleAttributeMetadata attributeMetadataAccess = new SimpleAttributeMetadata(
+				final var propertyAccess =
+						representationStrategy.resolvePropertyAccess( bootPropertyDescriptor );
+				final var attributeMetadataAccess = new SimpleAttributeMetadata(
 						propertyAccess,
-						getMutabilityPlan( updateable ),
-						nullable,
-						insertable,
-						updateable,
-						includeInOptimisticLocking,
+						getMutabilityPlan( updateability[columnPosition] ),
+						bootValueMapping.isNullable(),
+						insertability[columnPosition],
+						updateability[columnPosition],
+						bootPropertyDescriptor.isOptimisticLocked(),
 						true,
-						cascadeStyle
+						compositeType.getCascadeStyle( attributeIndex )
 				);
 
 				attributeMapping = new DiscriminatedAssociationAttributeMapping(
-						valueMapping.getNavigableRole().append( bootPropertyDescriptor.getName() ),
-						typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Object.class ),
+						valueMapping.getNavigableRole()
+								.append( bootPropertyDescriptor.getName() ),
+						typeConfiguration.getJavaTypeRegistry()
+								.resolveDescriptor( Object.class ),
 						this,
 						attributeIndex,
 						attributeIndex,
@@ -572,7 +572,7 @@ else if ( subtype instanceof AnyType anyType ) {
 				);
 			}
 			else if ( subtype instanceof CompositeType subCompositeType ) {
-				final int columnSpan = subCompositeType.getColumnSpan( creationProcess.getCreationContext().getMetadata() );
+				final int columnSpan = subCompositeType.getColumnSpan( creationContext.getMetadata() );
 				final String subTableExpression;
 				final String[] subRootTableKeyColumnNames;
 				if ( rootTableKeyColumnNames == null ) {
@@ -582,10 +582,10 @@ else if ( subtype instanceof CompositeType subCompositeType ) {
 				else {
 					subTableExpression = rootTableExpression;
 					subRootTableKeyColumnNames = new String[columnSpan];
-					System.arraycopy( rootTableKeyColumnNames, columnPosition, subRootTableKeyColumnNames, 0, columnSpan );
+					arraycopy( rootTableKeyColumnNames, columnPosition, subRootTableKeyColumnNames, 0, columnSpan );
 				}
 
-				attributeMapping = MappingModelCreationHelper.buildEmbeddedAttributeMapping(
+				attributeMapping = buildEmbeddedAttributeMapping(
 						bootPropertyDescriptor.getName(),
 						attributeIndex,
 						attributeIndex,
@@ -604,7 +604,7 @@ else if ( subtype instanceof CompositeType subCompositeType ) {
 				columnPosition += columnSpan;
 			}
 			else if ( subtype instanceof CollectionType ) {
-				attributeMapping = MappingModelCreationHelper.buildPluralAttributeMapping(
+				attributeMapping = buildPluralAttributeMapping(
 						bootPropertyDescriptor.getName(),
 						attributeIndex,
 						attributeIndex,
@@ -617,7 +617,7 @@ else if ( subtype instanceof CollectionType ) {
 				);
 			}
 			else if ( subtype instanceof EntityType subentityType ) {
-				attributeMapping = MappingModelCreationHelper.buildSingularAssociationAttributeMapping(
+				attributeMapping = buildSingularAssociationAttributeMapping(
 						bootPropertyDescriptor.getName(),
 						valueMapping.getNavigableRole().append( bootPropertyDescriptor.getName() ),
 						attributeIndex,
@@ -708,7 +708,7 @@ public Object assemble(Serializable cached, SharedSessionContract session) {
 	private EmbeddableDiscriminatorMapping generateDiscriminatorMapping(
 			Component bootDescriptor,
 			RuntimeModelCreationContext creationContext) {
-		final Value discriminator = bootDescriptor.getDiscriminator();
+		final var discriminator = bootDescriptor.getDiscriminator();
 		if ( discriminator == null ) {
 			return null;
 		}
@@ -723,7 +723,7 @@ private EmbeddableDiscriminatorMapping generateDiscriminatorMapping(
 		final Integer scale;
 		final boolean isFormula = discriminator.hasFormula();
 		if ( isFormula ) {
-			final Formula formula = (Formula) selectable;
+			final var formula = (Formula) selectable;
 			discriminatorColumnExpression = name = formula.getTemplate(
 					creationContext.getDialect(),
 					creationContext.getTypeConfiguration()
@@ -735,7 +735,7 @@ private EmbeddableDiscriminatorMapping generateDiscriminatorMapping(
 			scale = null;
 		}
 		else {
-			final Column column = discriminator.getColumns().get( 0 );
+			final var column = discriminator.getColumns().get( 0 );
 			assert column != null : "Embeddable discriminators require a column";
 			discriminatorColumnExpression = column.getReadExpr( creationContext.getDialect() );
 			columnDefinition = column.getSqlType();
@@ -1097,7 +1097,7 @@ public void forEachUpdatable(int offset, SelectableConsumer consumer) {
 		else {
 			final int jdbcTypeCount = selectableMappings.getJdbcTypeCount();
 			for ( int i = 0; i < jdbcTypeCount; i++ ) {
-				final SelectableMapping selectable = selectableMappings.getSelectable( i );
+				final var selectable = selectableMappings.getSelectable( i );
 				if ( selectable.isUpdateable() ) {
 					consumer.accept( offset + i, selectable );
 				}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
index 68e0aab1a2f6..f892b95e7e8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
@@ -153,7 +153,9 @@ public EmbeddedAttributeMapping(
 						: null
 		);
 
-		navigableRole = inverseModelPart.getNavigableRole().getParent().append( inverseModelPart.getFetchableName() );
+		navigableRole =
+				inverseModelPart.getNavigableRole().getParent()
+						.append( inverseModelPart.getFetchableName() );
 
 		tableExpression = selectableMappings.getSelectable( 0 ).getContainingTableExpression();
 		embeddableMappingType = embeddableTypeDescriptor.createInverseMappingType(
@@ -386,18 +388,20 @@ public boolean isSelectable() {
 
 	@Override
 	public boolean containsTableReference(String tableExpression) {
-		final var declaringType = getDeclaringType();
-		final TableGroupProducer producer;
+		return tableGroupProducer( getDeclaringType() )
+				.containsTableReference( tableExpression );
+	}
+
+	private static TableGroupProducer tableGroupProducer(ManagedMappingType declaringType) {
 		if ( declaringType instanceof TableGroupProducer tableGroupProducer ) {
-			producer = tableGroupProducer;
+			return tableGroupProducer;
 		}
 		else if ( declaringType instanceof EmbeddableMappingType embeddableMappingType ) {
-			producer = embeddableMappingType.getEmbeddedValueMapping();
+			return embeddableMappingType.getEmbeddedValueMapping();
 		}
 		else {
 			throw new AssertionFailure( "Unexpected declaring type" );
 		}
-		return producer.containsTableReference( tableExpression );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java
index c5d19af063b7..55f568eca153 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedCollectionPart.java
@@ -28,7 +28,6 @@
 import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.spi.SqlAliasBase;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
@@ -199,8 +198,7 @@ public SqlTuple toSqlExpression(
 			Clause clause,
 			SqmToSqlAstConverter walker,
 			SqlAstCreationState sqlAstCreationState) {
-		final SqlExpressionResolver sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
-
+		final var sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
 		final List<Expression> expressions = new ArrayList<>();
 		getEmbeddableTypeDescriptor().forEachSelectable(
 				(columnIndex, selection) -> {
@@ -244,7 +242,7 @@ public TableGroupJoin createTableGroupJoin(
 				creationState
 		);
 
-		return new TableGroupJoin( navigablePath, joinType, tableGroup, null );
+		return new TableGroupJoin( navigablePath, joinType, tableGroup );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java
index ba2b89492cc7..cde0a6e48820 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java
@@ -34,10 +34,8 @@
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
-import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.from.OneToManyTableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.from.TableGroupProducer;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.from.VirtualTableGroup;
@@ -50,6 +48,8 @@
 import org.hibernate.sql.results.graph.embeddable.internal.EmbeddableForeignKeyResultImpl;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.createInverseModelPart;
+
 /**
  * @author Andrea Boriero
  */
@@ -100,7 +100,8 @@ public EmbeddedForeignKeyDescriptor(
 		this.targetSelectableMappings = targetSelectableMappings;
 		this.targetSide = new EmbeddedForeignKeyDescriptorSide( Nature.TARGET, targetMappingType );
 		this.keySide = new EmbeddedForeignKeyDescriptorSide( Nature.KEY, keyMappingType );
-		final List<String> columns = new ArrayList<>( keySelectableMappings.getJdbcTypeCount() );
+		final List<String> columns =
+				new ArrayList<>( keySelectableMappings.getJdbcTypeCount() );
 		keySelectableMappings.forEachSelectable(
 				(columnIndex, selection) -> columns.add( selection.getSelectionExpression() )
 		);
@@ -132,7 +133,7 @@ private EmbeddedForeignKeyDescriptor(
 		this.targetSide = original.targetSide;
 		this.keySide = new EmbeddedForeignKeyDescriptorSide(
 				Nature.KEY,
-				MappingModelCreationHelper.createInverseModelPart(
+				createInverseModelPart(
 						original.targetSide.getModelPart(),
 						keyDeclaringType,
 						keyDeclaringTableGroupProducer,
@@ -140,11 +141,10 @@ private EmbeddedForeignKeyDescriptor(
 						creationProcess
 				)
 		);
-		final List<String> columns = new ArrayList<>( keySelectableMappings.getJdbcTypeCount() );
+		final List<String> columns =
+				new ArrayList<>( keySelectableMappings.getJdbcTypeCount() );
 		keySelectableMappings.forEachSelectable(
-				(columnIndex, selection) -> {
-					columns.add( selection.getSelectionExpression() );
-				}
+				(columnIndex, selection) -> columns.add( selection.getSelectionExpression() )
 		);
 		this.associationKey = new AssociationKey( keyTable, columns );
 		this.hasConstraint = original.hasConstraint;
@@ -156,10 +156,7 @@ private EmbeddedForeignKeyDescriptor(EmbeddedForeignKeyDescriptor original, Embe
 		this.keySide = original.keySide;
 		this.targetTable = targetPart.getContainingTableExpression();
 		this.targetSelectableMappings = targetPart;
-		this.targetSide = new EmbeddedForeignKeyDescriptorSide(
-				Nature.TARGET,
-				targetPart
-		);
+		this.targetSide = new EmbeddedForeignKeyDescriptorSide( Nature.TARGET, targetPart );
 		this.associationKey = original.associationKey;
 		this.hasConstraint = original.hasConstraint;
 	}
@@ -317,19 +314,17 @@ public <T> DomainResult<T> createDomainResult(
 
 	private boolean isTargetTableGroup(TableGroup tableGroup) {
 		tableGroup = getUnderlyingTableGroup( tableGroup );
-		final TableGroupProducer tableGroupProducer;
-		if ( tableGroup instanceof OneToManyTableGroup oneToManyTableGroup ) {
-			tableGroupProducer = (TableGroupProducer) oneToManyTableGroup.getElementTableGroup().getModelPart();
-		}
-		else {
-			tableGroupProducer = (TableGroupProducer) tableGroup.getModelPart();
-		}
+		final var tableGroupProducer =
+				tableGroup instanceof OneToManyTableGroup oneToManyTableGroup
+					? (TableGroupProducer) oneToManyTableGroup.getElementTableGroup().getModelPart()
+					: (TableGroupProducer) tableGroup.getModelPart();
 		return tableGroupProducer.containsTableReference( targetSide.getModelPart().getContainingTableExpression() );
 	}
 
 	private static TableGroup getUnderlyingTableGroup(TableGroup tableGroup) {
 		if ( tableGroup.isVirtual() ) {
-			tableGroup = getUnderlyingTableGroup( ( (VirtualTableGroup) tableGroup ).getUnderlyingTableGroup() );
+			final var virtualTableGroup = (VirtualTableGroup) tableGroup;
+			tableGroup = getUnderlyingTableGroup( virtualTableGroup.getUnderlyingTableGroup() );
 		}
 		return tableGroup;
 	}
@@ -372,7 +367,7 @@ private <T> DomainResult<T> createDomainResult(
 		creationState.getSqlAstCreationState().getFromClauseAccess().resolveTableGroup(
 				resultNavigablePath,
 				np -> {
-					final TableGroupJoin tableGroupJoin = modelPart.createTableGroupJoin(
+					final var tableGroupJoin = modelPart.createTableGroupJoin(
 							resultNavigablePath,
 							tableGroup,
 							null,
@@ -387,7 +382,8 @@ private <T> DomainResult<T> createDomainResult(
 				}
 		);
 
-		final Nature currentForeignKeyResolvingKey = creationState.getCurrentlyResolvingForeignKeyPart();
+		final Nature currentForeignKeyResolvingKey =
+				creationState.getCurrentlyResolvingForeignKeyPart();
 		try {
 			creationState.setCurrentlyResolvingForeignKeyPart( nature );
 			return new EmbeddableForeignKeyResultImpl<>(
@@ -408,15 +404,14 @@ public Predicate generateJoinPredicate(
 			TableGroup targetSideTableGroup,
 			TableGroup keySideTableGroup,
 			SqlAstCreationState creationState) {
-		final TableReference lhsTableReference = targetSideTableGroup.resolveTableReference(
+		final var lhsTableReference = targetSideTableGroup.resolveTableReference(
 				targetSideTableGroup.getNavigablePath(),
 				targetTable
 		);
-		final TableReference rhsTableKeyReference = keySideTableGroup.resolveTableReference(
+		final var rhsTableKeyReference = keySideTableGroup.resolveTableReference(
 				null,
 				keyTable
 		);
-
 		return generateJoinPredicate( lhsTableReference, rhsTableKeyReference, creationState );
 	}
 
@@ -428,7 +423,7 @@ public Predicate generateJoinPredicate(
 		final var predicate = new Junction( Junction.Nature.CONJUNCTION );
 		targetSelectableMappings.forEachSelectable(
 				(i, selection) -> {
-					final ComparisonPredicate comparisonPredicate = new ComparisonPredicate(
+					final var comparisonPredicate = new ComparisonPredicate(
 							new ColumnReference( targetSideReference, selection ),
 							ComparisonOperator.EQUAL,
 							new ColumnReference( keySideReference, keySelectableMappings.getSelectable( i ) )
@@ -460,9 +455,9 @@ public boolean isSimpleJoinPredicate(Predicate predicate) {
 			if ( comparisonPredicate.getOperator() != ComparisonOperator.EQUAL ) {
 				return false;
 			}
-			final Expression lhsExpr = comparisonPredicate.getLeftHandExpression();
-			final Expression rhsExpr = comparisonPredicate.getRightHandExpression();
-			if ( !(lhsExpr instanceof ColumnReference lhs) || !(rhsExpr instanceof ColumnReference rhs) ) {
+			final var lhsExpr = comparisonPredicate.getLeftHandExpression();
+			final var rhsExpr = comparisonPredicate.getRightHandExpression();
+			if ( !( lhsExpr instanceof ColumnReference lhs ) || !( rhsExpr instanceof ColumnReference rhs ) ) {
 				return false;
 			}
 			if ( lhsIsKey == null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java
index 0ed88928c633..3c9cf6ff83c4 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java
@@ -13,13 +13,13 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.property.access.spi.PropertyAccess;
-import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 
+import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
+
 /**
  * Support for {@link jakarta.persistence.EmbeddedId}
  *
@@ -78,12 +78,13 @@ public void applySqlSelections(
 			TableGroup tableGroup,
 			DomainResultCreationState creationState,
 			BiConsumer<SqlSelection, JdbcMapping> selectionConsumer) {
-		getEmbeddableTypeDescriptor().applySqlSelections( navigablePath, tableGroup, creationState, selectionConsumer );
+		getEmbeddableTypeDescriptor()
+				.applySqlSelections( navigablePath, tableGroup, creationState, selectionConsumer );
 	}
 
 	@Override
 	public Object getIdentifier(Object entity) {
-		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entity );
+		final var lazyInitializer = extractLazyInitializer( entity );
 		if ( lazyInitializer != null ) {
 			return lazyInitializer.getInternalIdentifier();
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java
index e8f5a3062546..e5cd89f47096 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java
@@ -294,7 +294,6 @@ public Fetch generateFetch(
 				fetchablePath,
 				this,
 				fetchTiming,
-				creationState,
 				!sqlSelection.isVirtual()
 		);
 	}
@@ -306,7 +305,6 @@ public <T> DomainResult<T> createDomainResult(
 			String resultVariable,
 			DomainResultCreationState creationState) {
 		final SqlSelection sqlSelection = resolveSqlSelection( tableGroup, creationState );
-
 		return new BasicResult<>(
 				sqlSelection.getValuesArrayPosition(),
 				resultVariable,
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java
index 4cdafde04d55..af4857008864 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java
@@ -124,16 +124,13 @@ public Expression resolveSqlExpression(
 			JdbcMapping jdbcMappingToUse,
 			TableGroup tableGroup,
 			SqlAstCreationState creationState) {
-		final var expressionResolver = creationState.getSqlExpressionResolver();
 		final var tableReference = tableGroup.resolveTableReference( navigablePath, tableExpression );
-		return expressionResolver.resolveSqlExpression(
-				createColumnReferenceKey(
-						tableGroup.getPrimaryTableReference(),
-						getSelectionExpression(),
-						jdbcMappingToUse
-				),
-				processingState -> new ColumnReference( tableReference, this )
-		);
+		return creationState.getSqlExpressionResolver()
+				.resolveSqlExpression(
+						createColumnReferenceKey( tableGroup.getPrimaryTableReference(),
+								getSelectionExpression(), jdbcMappingToUse ),
+						processingState -> new ColumnReference( tableReference, this )
+				);
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java
index 9b8473a974d8..472ff041945a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java
@@ -4,9 +4,6 @@
  */
 package org.hibernate.metamodel.mapping.internal;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.hibernate.Incubating;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
@@ -23,13 +20,17 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.internal.RowTransformerArrayImpl;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.hibernate.sql.results.spi.ListResultsConsumer.UniqueSemantic.FILTER;
 
 /**
@@ -51,7 +52,7 @@
 @Incubating
 public class GeneratedValuesProcessor {
 	private final SelectStatement selectStatement;
-	private final JdbcOperationQuerySelect jdbcSelect;
+	private final JdbcSelect jdbcSelect;
 	private final List<AttributeMapping> generatedValuesToSelect;
 	private final JdbcParametersList jdbcParameters;
 
@@ -81,6 +82,7 @@ public GeneratedValuesProcessor(
 					new LoadQueryInfluencers( sessionFactory ),
 					new LockOptions( LockMode.READ ),
 					builder::add,
+					new SqlAliasBaseManager(),
 					sessionFactory
 			);
 			jdbcSelect =
@@ -182,7 +184,7 @@ private List<Object[]> executeSelect(Object id, SharedSessionContractImplementor
 
 	private JdbcParameterBindings getJdbcParameterBindings(Object id, SharedSessionContractImplementor session) {
 		final var jdbcParamBindings = new JdbcParameterBindingsImpl( jdbcParameters.size() );
-		int offset = jdbcParamBindings.registerParametersForEachJdbcValue(
+		final int offset = jdbcParamBindings.registerParametersForEachJdbcValue(
 				id,
 				entityDescriptor.getIdentifierMapping(),
 				jdbcParameters,
@@ -217,7 +219,7 @@ public EntityMappingType getEntityDescriptor() {
 		return entityDescriptor;
 	}
 
-	public JdbcOperationQuerySelect getJdbcSelect() {
+	public JdbcSelect getJdbcSelect() {
 		return jdbcSelect;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java
index 266b7e0d32a2..bfc8328ba1ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java
@@ -34,6 +34,8 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.CompositeTypeImplementor;
 
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getTableIdentifierExpression;
+
 /**
  * EmbeddableMappingType implementation describing an {@link jakarta.persistence.IdClass}
  */
@@ -128,7 +130,7 @@ public IdClassEmbeddable(
 		this.virtualIdEmbeddable = (VirtualIdEmbeddable) valueMapping.getEmbeddableTypeDescriptor();
 		this.javaType = inverseMappingType.javaType;
 		this.representationStrategy = new IdClassRepresentationStrategy( this, false, () -> {
-			final String[] attributeNames = new String[inverseMappingType.getNumberOfAttributeMappings()];
+			final var attributeNames = new String[inverseMappingType.getNumberOfAttributeMappings()];
 			for ( int i = 0; i < attributeNames.length; i++ ) {
 				attributeNames[i] = inverseMappingType.getAttributeMapping( i ).getAttributeName();
 			}
@@ -137,7 +139,9 @@ public IdClassEmbeddable(
 		this.embedded = valueMapping;
 		this.selectableMappings = selectableMappings;
 		creationProcess.registerInitializationCallback(
-				"IdClassEmbeddable(" + inverseMappingType.getNavigableRole().getFullPath() + ".{inverse})#finishInitialization",
+				"IdClassEmbeddable("
+						+ inverseMappingType.getNavigableRole().getFullPath()
+						+ ".{inverse})#finishInitialization",
 				() -> inverseInitializeCallback(
 						declaringTableGroupProducer,
 						selectableMappings,
@@ -332,7 +336,7 @@ private boolean finishInitialization(
 						throw new IllegalAttributeType( "An IdClass cannot define <any/> attributes : " + attributeName );
 					}
 				},
-				(column, jdbcEnvironment) -> MappingModelCreationHelper.getTableIdentifierExpression( column.getValue().getTable(), creationProcess ),
+				(column, jdbcEnvironment) -> getTableIdentifierExpression( column.getValue().getTable(), creationProcess ),
 				this::addAttribute,
 				() -> {
 					// We need the attribute mapping types to finish initialization first before we can build the column mappings
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java
index 6de2d203f13d..aa848c1f1bef 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java
@@ -52,6 +52,7 @@
 import static java.util.Objects.requireNonNullElse;
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.createInverseModelPart;
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getCollectionPropertyPath;
 import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getPropertyOrder;
 
 /**
@@ -266,14 +267,9 @@ public TableGroupJoin createTableGroupJoin(
 				creationState
 		);
 
-		final var join = new TableGroupJoin(
-				navigablePath,
-				joinType,
-				lazyTableGroup,
-				null
-		);
+		final var join = new TableGroupJoin( navigablePath, joinType, lazyTableGroup );
 
-		lazyTableGroup.setTableGroupInitializerCallback( (partTableGroup) -> {
+		lazyTableGroup.setTableGroupInitializerCallback( partTableGroup -> {
 			// `partTableGroup` is the association table group
 			join.applyPredicate(
 					foreignKey.generateJoinPredicate(
@@ -322,7 +318,9 @@ public LazyTableGroup createRootTableGroupJoin(
 				this,
 				explicitSourceAlias,
 				sqlAliasBase,
-				creationState.getCreationContext().getSessionFactory(),
+				creationState.getCreationContext()
+						// TODO: FIXME
+						.getSessionFactory(),
 				lhs
 		);
 
@@ -423,7 +421,12 @@ else if ( isNotEmpty( bootCollectionDescriptor.getMappedByProperty() ) ) {
 					return false;
 				}
 
-				foreignKey = createJoinTablePartForeignKey( collectionTableName, elementDescriptor, creationProcess );
+				foreignKey = createJoinTablePartForeignKey(
+						collectionTableName,
+						elementDescriptor,
+						getCollectionPropertyPath( collectionDescriptor ),
+						creationProcess
+				);
 				creationProcess.registerForeignKey( this, foreignKey );
 			}
 			else {
@@ -450,6 +453,7 @@ else if ( isNotEmpty( bootCollectionDescriptor.getMappedByProperty() ) ) {
 					element,
 					(EntityType) collectionDescriptor.getElementType(),
 					fkTargetModelPart,
+					getCollectionPropertyPath( collectionDescriptor ),
 					creationProcess,
 					collectionDescriptor.getFactory().getJdbcServices().getDialect()
 			);
@@ -461,6 +465,7 @@ else if ( isNotEmpty( bootCollectionDescriptor.getMappedByProperty() ) ) {
 					index,
 					(EntityType) collectionDescriptor.getIndexType(),
 					fkTargetModelPart,
+					null, // No @MapKeyFormula or @OrderFormula
 					creationProcess,
 					collectionDescriptor.getFactory().getJdbcServices().getDialect()
 			);
@@ -472,6 +477,7 @@ else if ( isNotEmpty( bootCollectionDescriptor.getMappedByProperty() ) ) {
 	private ForeignKeyDescriptor createJoinTablePartForeignKey(
 			String collectionTableName,
 			ManyToOne elementBootDescriptor,
+			@Nullable String propertyPath,
 			MappingModelCreationProcess creationProcess) {
 		final var associatedEntityMapping = getAssociatedEntityMappingType();
 		final var associatedIdMapping = associatedEntityMapping.getIdentifierMapping();
@@ -492,11 +498,14 @@ private ForeignKeyDescriptor createJoinTablePartForeignKey(
 			final var keySelectableMapping = SelectableMappingImpl.from(
 					collectionTableName,
 					keyColumn,
+					propertyPath,
+					null,
 					targetModelPart.getJdbcMapping(),
 					creationProcess.getCreationContext().getTypeConfiguration(),
 					true,
 					false,
 					false,
+					false,
 					creationProcess.getCreationContext().getDialect(),
 					creationProcess.getSqmFunctionRegistry(),
 					creationProcess.getCreationContext()
@@ -530,6 +539,8 @@ private ForeignKeyDescriptor createJoinTablePartForeignKey(
 					collectionTableName,
 					elementBootDescriptor,
 					getPropertyOrder( elementBootDescriptor, creationProcess ),
+					propertyPath,
+					null,
 					creationProcess.getCreationContext().getMetadata(),
 					creationProcess.getCreationContext().getTypeConfiguration(),
 					elementBootDescriptor.getColumnInsertability(),
@@ -586,6 +597,7 @@ private ForeignKeyDescriptor createForeignKeyDescriptor(
 			Value fkBootDescriptorSource,
 			EntityType entityType,
 			ModelPart fkTargetModelPart,
+			@Nullable String propertyPath,
 			MappingModelCreationProcess creationProcess,
 			Dialect dialect) {
 		assert fkTargetModelPart != null;
@@ -598,6 +610,7 @@ private ForeignKeyDescriptor createForeignKeyDescriptor(
 			return determineForeignKey(
 					toOneAttributeMapping.getForeignKeyDescriptor(),
 					fkBootDescriptorSource,
+					propertyPath,
 					creationProcess
 			);
 		}
@@ -610,6 +623,7 @@ private ForeignKeyDescriptor createForeignKeyDescriptor(
 			return determineForeignKey(
 					targetModelPart.getForeignKeyDescriptor(),
 					fkBootDescriptorSource,
+					propertyPath,
 					creationProcess
 			);
 		}
@@ -626,16 +640,19 @@ private ForeignKeyDescriptor createForeignKeyDescriptor(
 					creationProcess,
 					dialect,
 					collectionTableName,
-					basicFkTarget
+					basicFkTarget,
+					propertyPath
 			);
 		}
 
 		if ( fkTargetModelPart instanceof EmbeddableValuedModelPart embeddableValuedModelPart ) {
 			return MappingModelCreationHelper.buildEmbeddableForeignKeyDescriptor(
+					propertyPath,
 					embeddableValuedModelPart,
 					fkBootDescriptorSource,
 					findContainingEntityMapping(),
 					getCollectionDescriptor().getAttributeMapping(),
+					null,
 					false,
 					fkBootDescriptorSource.getColumnInsertability(),
 					fkBootDescriptorSource.getColumnUpdateability(),
@@ -652,6 +669,7 @@ private ForeignKeyDescriptor createForeignKeyDescriptor(
 	private ForeignKeyDescriptor determineForeignKey(
 			ForeignKeyDescriptor foreignKeyDescriptor,
 			Value fkBootDescriptorSource,
+			@Nullable String propertyPath,
 			MappingModelCreationProcess creationProcess) {
 		final int selectableCount = foreignKeyDescriptor.getJdbcTypeCount();
 		final var keyPart = foreignKeyDescriptor.getKeyPart();
@@ -666,6 +684,8 @@ private ForeignKeyDescriptor determineForeignKey(
 						keyPart.getContainingTableExpression(),
 						fkBootDescriptorSource,
 						getPropertyOrder( fkBootDescriptorSource, creationProcess ),
+						propertyPath,
+						null,
 						creationProcess.getCreationContext().getMetadata(),
 						creationProcess.getCreationContext().getTypeConfiguration(),
 						fkBootDescriptorSource.getColumnInsertability(),
@@ -692,7 +712,8 @@ private SimpleForeignKeyDescriptor createSimpleForeignKeyDescriptor(
 			MappingModelCreationProcess creationProcess,
 			Dialect dialect,
 			String fkKeyTableName,
-			BasicValuedModelPart basicFkTargetPart) {
+			BasicValuedModelPart basicFkTargetPart,
+			@Nullable String propertyPath) {
 		final boolean columnInsertable;
 		final boolean columnUpdateable;
 		if ( getNature() == Nature.ELEMENT && !fkBootDescriptorSource.getSelectables().get( 0 ).isFormula() ) {
@@ -708,11 +729,14 @@ private SimpleForeignKeyDescriptor createSimpleForeignKeyDescriptor(
 		final var keySelectableMapping = SelectableMappingImpl.from(
 				fkKeyTableName,
 				fkBootDescriptorSource.getSelectables().get( 0 ),
+				propertyPath,
+				null,
 				basicFkTargetPart.getJdbcMapping(),
 				creationProcess.getCreationContext().getTypeConfiguration(),
 				columnInsertable,
 				columnUpdateable,
 				fkValue.isPartitionKey(),
+				false,
 				dialect,
 				creationProcess.getSqmFunctionRegistry(),
 				creationProcess.getCreationContext()
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
index 212fe6538e8d..b436609627ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
@@ -43,6 +43,7 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Resolvable;
+import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.SortableValue;
 import org.hibernate.mapping.Table;
@@ -575,12 +576,15 @@ public static PluralAttributeMapping buildPluralAttributeMapping(
 				final var index = (BasicValue) ( (IndexedCollection) bootValueMapping ).getIndex();
 				final var selectableMapping = SelectableMappingImpl.from(
 						tableExpression,
-						index.getSelectables().get(0),
+						index.getSelectables().get( 0 ),
+						null, // No support for @OrderFormula
+						null,
 						creationContext.getTypeConfiguration().getBasicTypeForJavaType( Integer.class ),
 						creationProcess.getCreationContext().getTypeConfiguration(),
 						index.isColumnInsertable( 0 ),
 						index.isColumnUpdateable( 0 ),
 						false,
+						false,
 						dialect,
 						creationProcess.getSqmFunctionRegistry(),
 						creationProcess.getCreationContext()
@@ -627,12 +631,15 @@ public static PluralAttributeMapping buildPluralAttributeMapping(
 				final var index = (BasicValue) ( (IndexedCollection) bootValueMapping ).getIndex();
 				final var selectableMapping = SelectableMappingImpl.from(
 						tableExpression,
-						index.getSelectables().get(0),
+						index.getSelectables().get( 0 ),
+						null, // No support for @OrderFormula
+						null,
 						creationContext.getTypeConfiguration().getBasicTypeForJavaType( Integer.class ),
 						creationProcess.getCreationContext().getTypeConfiguration(),
 						index.isColumnInsertable( 0 ),
 						index.isColumnUpdateable( 0 ),
 						false,
+						false,
 						dialect,
 						creationProcess.getSqmFunctionRegistry(),
 						creationProcess.getCreationContext()
@@ -835,12 +842,16 @@ private static void interpretPluralAttributeMappingKeyDescriptor(
 			final String keyTableExpression = collectionTableName;//getTableIdentifierExpression( bootValueMappingKey.getTable(), creationProcess );
 			final var keySelectableMapping = SelectableMappingImpl.from(
 					keyTableExpression,
-					bootValueMappingKey.getSelectables().get(0),
+					bootValueMappingKey.getSelectables().get( 0 ),
+					// In the annotation model it is not possible to have a @MapKeyFormula, but hbm.xml supports this
+					getPropertyPath( attributeMapping.getNavigableRole() ) + "." + CollectionPart.Nature.INDEX.getName(),
+					null,
 					(JdbcMapping) keyType,
 					creationProcess.getCreationContext().getTypeConfiguration(),
 					bootValueMappingKey.isColumnInsertable( 0 ),
 					bootValueMappingKey.isColumnUpdateable( 0 ),
 					false,
+					false,
 					dialect,
 					creationProcess.getSqmFunctionRegistry(),
 					creationProcess.getCreationContext()
@@ -858,6 +869,7 @@ private static void interpretPluralAttributeMappingKeyDescriptor(
 		}
 		else if ( fkTargetPart instanceof EmbeddableValuedModelPart embeddableValuedModelPart ) {
 			final var keyDescriptor = buildEmbeddableForeignKeyDescriptor(
+					getPropertyPath( attributeMapping.getNavigableRole() ),
 					embeddableValuedModelPart,
 					bootValueMapping,
 					keyDeclaringType,
@@ -880,6 +892,22 @@ else if ( fkTargetPart instanceof EmbeddableValuedModelPart embeddableValuedMode
 		}
 	}
 
+	static String getCollectionPropertyPath(CollectionPersister collectionPersister) {
+		return collectionPersister.getNavigableRole().getFullPath().substring( collectionPersister.getOwnerEntityPersister().getNavigableRole().getFullPath().length() + 1 );
+	}
+
+	static String getPropertyPath(NavigableRole navigableRole) {
+		final StringBuilder propertyPath = new StringBuilder();
+		while (navigableRole.getParent() != null) {
+			if ( !propertyPath.isEmpty() ) {
+				propertyPath.insert( 0, "." );
+			}
+			propertyPath.insert( 0, navigableRole.getLocalName() );
+			navigableRole = navigableRole.getParent();
+		}
+		return propertyPath.toString();
+	}
+
 	/**
 	 * Tries to {@link ToOneAttributeMapping#setForeignKeyDescriptor}
 	 * to the given attribute {@code attributeMapping}.
@@ -951,10 +979,12 @@ else if ( modelPart instanceof ToOneAttributeMapping toOneAttributeMapping ) {
 			}
 			else if ( modelPart instanceof EmbeddableValuedModelPart embeddableValuedModelPart ) {
 				final var embeddedForeignKeyDescriptor = buildEmbeddableForeignKeyDescriptor(
+						getPropertyPath( attributeMapping.getNavigableRole() ),
 						embeddableValuedModelPart,
 						bootValueMapping,
 						attributeMapping.getDeclaringType(),
 						attributeMapping.findContainingEntityMapping(),
+						null,
 						true,
 						bootValueMapping.getColumnInsertability(),
 						bootValueMapping.getColumnUpdateability(),
@@ -1009,15 +1039,18 @@ else if ( modelPart instanceof EmbeddableValuedModelPart embeddableValuedModelPa
 			int i = 0;
 			final Value value = bootProperty.getValue();
 			if ( columnIterator.hasNext() ) {
+				final Selectable selectable = columnIterator.next();
 				keySelectableMapping = SelectableMappingImpl.from(
 						tableExpression,
-						columnIterator.next(),
+						selectable,
+						selectable.isFormula() ? getPropertyPath( attributeMapping.getNavigableRole() ) : null,
 						parentSelectablePath,
 						simpleFkTarget.getJdbcMapping(),
 						creationProcess.getCreationContext().getTypeConfiguration(),
 						value.isColumnInsertable( i ),
 						value.isColumnUpdateable( i ),
 						value.isPartitionKey(),
+						false,
 						dialect,
 						creationProcess.getSqmFunctionRegistry(),
 						creationProcess.getCreationContext()
@@ -1029,12 +1062,14 @@ else if ( modelPart instanceof EmbeddableValuedModelPart embeddableValuedModelPa
 				keySelectableMapping = SelectableMappingImpl.from(
 						tableExpression,
 						table.getPrimaryKey().getColumn( 0 ),
+						null, // Primary key selectable must always be a column
 						parentSelectablePath,
 						simpleFkTarget.getJdbcMapping(),
 						creationProcess.getCreationContext().getTypeConfiguration(),
 						value.isColumnInsertable( 0 ),
 						value.isColumnUpdateable( 0 ),
 						value.isPartitionKey(),
+						false,
 						dialect,
 						creationProcess.getSqmFunctionRegistry(),
 						creationProcess.getCreationContext()
@@ -1057,10 +1092,12 @@ else if ( modelPart instanceof EmbeddableValuedModelPart embeddableValuedModelPa
 		else if ( fkTarget instanceof EmbeddableValuedModelPart embeddableValuedModelPart ) {
 			final var value = bootProperty.getValue();
 			final var embeddedForeignKeyDescriptor = buildEmbeddableForeignKeyDescriptor(
+					getPropertyPath( attributeMapping.getNavigableRole() ),
 					embeddableValuedModelPart,
 					bootValueMapping,
 					attributeMapping.getDeclaringType(),
 					attributeMapping.findContainingEntityMapping(),
+					null,
 					swapDirection,
 					value.getColumnInsertability(),
 					value.getColumnUpdateability(),
@@ -1131,6 +1168,7 @@ else if ( modelPart instanceof EmbeddableValuedModelPart embeddableValuedModelPa
 		return false;
 	}
 
+	@Deprecated(forRemoval = true)
 	public static EmbeddedForeignKeyDescriptor buildEmbeddableForeignKeyDescriptor(
 			EmbeddableValuedModelPart embeddableValuedModelPart,
 			Value bootValueMapping,
@@ -1142,6 +1180,7 @@ public static EmbeddedForeignKeyDescriptor buildEmbeddableForeignKeyDescriptor(
 			Dialect dialect,
 			MappingModelCreationProcess creationProcess) {
 		return buildEmbeddableForeignKeyDescriptor(
+				null,
 				embeddableValuedModelPart,
 				bootValueMapping,
 				keyDeclaringType,
@@ -1155,7 +1194,8 @@ public static EmbeddedForeignKeyDescriptor buildEmbeddableForeignKeyDescriptor(
 		);
 	}
 
-	private static EmbeddedForeignKeyDescriptor buildEmbeddableForeignKeyDescriptor(
+	public static EmbeddedForeignKeyDescriptor buildEmbeddableForeignKeyDescriptor(
+			String propertyPath,
 			EmbeddableValuedModelPart embeddableValuedModelPart,
 			Value bootValueMapping,
 			ManagedMappingType keyDeclaringType,
@@ -1179,6 +1219,7 @@ private static EmbeddedForeignKeyDescriptor buildEmbeddableForeignKeyDescriptor(
 					keyTableExpression,
 					collectionBootValueMapping.getKey(),
 					getPropertyOrder( bootValueMapping, creationProcess ),
+					propertyPath,
 					parentSelectablePath,
 					creationProcess.getCreationContext().getMetadata(),
 					creationProcess.getCreationContext().getTypeConfiguration(),
@@ -1204,6 +1245,7 @@ private static EmbeddedForeignKeyDescriptor buildEmbeddableForeignKeyDescriptor(
 					keyTableExpression,
 					bootValueMapping,
 					getPropertyOrder( bootValueMapping, creationProcess ),
+					propertyPath,
 					parentSelectablePath,
 					creationProcess.getCreationContext().getMetadata(),
 					creationProcess.getCreationContext().getTypeConfiguration(),
@@ -1386,11 +1428,15 @@ private static CollectionPart interpretMapKey(
 			final var selectableMapping = SelectableMappingImpl.from(
 					tableExpression,
 					basicValue.getSelectables().get( 0 ),
+					// In the annotation model it is not possible to have a @MapKeyFormula, but hbm.xml supports this
+					getCollectionPropertyPath( collectionDescriptor ) + "." + CollectionPart.Nature.INDEX.getName(),
+					null,
 					basicValue.resolve().getJdbcMapping(),
 					creationProcess.getCreationContext().getTypeConfiguration(),
 					insertable,
 					updatable,
 					false,
+					false,
 					dialect,
 					creationProcess.getSqmFunctionRegistry(),
 					creationProcess.getCreationContext()
@@ -1478,7 +1524,11 @@ private static CollectionPart interpretElement(
 		if ( element instanceof BasicValue basicElement ) {
 			final var selectableMapping = SelectableMappingImpl.from(
 					tableExpression,
-					basicElement.getSelectables().get(0),
+					basicElement.getSelectables().get( 0 ),
+					basicElement.getSelectables().get( 0 ).isFormula()
+							? getCollectionPropertyPath( collectionDescriptor )
+							: null,
+					null,
 					basicElement.resolve().getJdbcMapping(),
 					creationProcess.getCreationContext().getTypeConfiguration(),
 					basicElement.isColumnInsertable( 0 ),
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java
index b81f892f4ff0..7dff3a5b2219 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java
@@ -65,12 +65,12 @@ public NonAggregatedIdentifierMappingImpl(
 		super( entityPersister, rootTableName, creationProcess );
 		entityDescriptor = entityPersister;
 
-		if ( bootEntityDescriptor.getIdentifierMapper() == null
-				|| bootEntityDescriptor.getIdentifierMapper() == bootEntityDescriptor.getIdentifier() ) {
+		final var identifierMapper = bootEntityDescriptor.getIdentifierMapper();
+		final var identifier = bootEntityDescriptor.getIdentifier();
+		if ( identifierMapper == null || identifierMapper == identifier ) {
 			// cid -> getIdentifier
 			// idClass -> null
-			final Component virtualIdSource = (Component) bootEntityDescriptor.getIdentifier();
-
+			final var virtualIdSource = (Component) identifier;
 			virtualIdEmbeddable = new VirtualIdEmbeddable(
 					virtualIdSource,
 					this,
@@ -85,9 +85,8 @@ public NonAggregatedIdentifierMappingImpl(
 		else {
 			// cid = getIdentifierMapper
 			// idClass = getIdentifier
-			final var virtualIdSource = bootEntityDescriptor.getIdentifierMapper();
-			final var idClassSource = (Component) bootEntityDescriptor.getIdentifier();
-
+			final var virtualIdSource = identifierMapper;
+			final var idClassSource = (Component) identifier;
 			virtualIdEmbeddable = new VirtualIdEmbeddable(
 					virtualIdSource,
 					this,
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java
index 0630e9ff28c0..855ab62424e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java
@@ -160,7 +160,8 @@ public TableGroupJoin createTableGroupJoin(
 		if ( mapKeyPropertyName != null ) {
 			final var elementPart =
 					(EntityCollectionPart)
-							getCollectionDescriptor().getAttributeMapping().getElementDescriptor();
+							getCollectionDescriptor().getAttributeMapping()
+									.getElementDescriptor();
 			if ( elementPart.getAssociatedEntityMappingType().findAttributeMapping( mapKeyPropertyName )
 							instanceof ToOneAttributeMapping toOne ) {
 				final var mapKeyPropertyPath = navigablePath.append( mapKeyPropertyName );
@@ -180,7 +181,7 @@ public TableGroupJoin createTableGroupJoin(
 			}
 		}
 
-		return new TableGroupJoin( navigablePath, joinType, elementTableGroup, null );
+		return new TableGroupJoin( navigablePath, joinType, elementTableGroup );
 	}
 
 	@Override
@@ -234,14 +235,16 @@ public boolean finishInitialization(
 		if ( pluralAttribute == null ) {
 			return false;
 		}
-
-		final var foreignKey = pluralAttribute.getKeyDescriptor();
-		if ( foreignKey == null ) {
-			return false;
+		else {
+			final var foreignKey = pluralAttribute.getKeyDescriptor();
+			if ( foreignKey == null ) {
+				return false;
+			}
+			else {
+				fetchAssociationKey = foreignKey.getAssociationKey();
+				return true;
+			}
 		}
-
-		fetchAssociationKey = foreignKey.getAssociationKey();
-		return true;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
index 09bfb164a96f..e56ccf0a89bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java
@@ -5,6 +5,7 @@
 package org.hibernate.metamodel.mapping.internal;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.MappingException;
 import org.hibernate.cache.MutableCacheKeyBuilder;
 import org.hibernate.engine.FetchStyle;
 import org.hibernate.engine.FetchTiming;
@@ -18,10 +19,14 @@
 import org.hibernate.mapping.List;
 import org.hibernate.mapping.Map;
 import org.hibernate.mapping.Property;
+import org.hibernate.metamodel.RepresentationMode;
+import org.hibernate.metamodel.mapping.AuditMapping;
 import org.hibernate.metamodel.mapping.AttributeMetadata;
+import org.hibernate.metamodel.mapping.AuxiliaryMapping;
 import org.hibernate.metamodel.mapping.CollectionIdentifierDescriptor;
 import org.hibernate.metamodel.mapping.CollectionMappingType;
 import org.hibernate.metamodel.mapping.CollectionPart;
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.JdbcMapping;
@@ -32,21 +37,29 @@
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.mapping.SoftDeleteMapping;
 import org.hibernate.metamodel.mapping.TableDetails;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.metamodel.mapping.ValuedModelPart;
 import org.hibernate.metamodel.mapping.ordering.OrderByFragment;
 import org.hibernate.metamodel.mapping.ordering.OrderByFragmentTranslator;
 import org.hibernate.metamodel.mapping.ordering.TranslationContext;
 import org.hibernate.metamodel.model.domain.NavigableRole;
+import org.hibernate.metamodel.spi.ManagedTypeRepresentationStrategy;
+import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.FieldDetails;
+import org.hibernate.models.spi.MemberDetails;
+import org.hibernate.models.spi.MethodDetails;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.collection.mutation.CollectionMutationTarget;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstJoinType;
-import org.hibernate.sql.ast.internal.TableGroupJoinHelper;
+import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator;
 import org.hibernate.sql.ast.spi.SqlAliasBase;
 import org.hibernate.sql.ast.spi.SqlAliasStemHelper;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.from.CollectionTableGroup;
+import org.hibernate.sql.ast.tree.from.AuxiliaryTableReference;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.OneToManyTableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroup;
@@ -64,12 +77,15 @@
 import org.hibernate.sql.results.graph.collection.internal.EagerCollectionFetch;
 import org.hibernate.sql.results.graph.collection.internal.SelectEagerCollectionFetch;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import static org.hibernate.boot.model.internal.SoftDeleteHelper.resolveSoftDeleteMapping;
+import static java.util.Locale.ROOT;
 import static org.hibernate.internal.util.StringHelper.subStringNullIfEmpty;
+import static org.hibernate.sql.ast.internal.TableGroupJoinHelper.determineJoinForPredicateApply;
 
 /**
  * @author Steve Ebersole
@@ -101,8 +117,7 @@ public interface Aware {
 	private final CollectionIdentifierDescriptor identifierDescriptor;
 	private final FetchTiming fetchTiming;
 	private final FetchStyle fetchStyle;
-	private final SoftDeleteMapping softDeleteMapping;
-	private Boolean hasSoftDelete;
+	private final AuxiliaryMapping auxiliaryMapping;
 
 	private final String bidirectionalAttributeName;
 
@@ -145,16 +160,15 @@ public PluralAttributeMappingImpl(
 		this.collectionDescriptor = collectionDescriptor;
 		this.referencedPropertyName = bootDescriptor.getReferencedPropertyName();
 
-		this.mapKeyPropertyName = bootDescriptor instanceof Map map ? map.getMapKeyPropertyName() : null;
+		mapKeyPropertyName = bootDescriptor instanceof Map map ? map.getMapKeyPropertyName() : null;
 
-		this.bidirectionalAttributeName = subStringNullIfEmpty( bootDescriptor.getMappedByProperty(), '.');
+		bidirectionalAttributeName = subStringNullIfEmpty( bootDescriptor.getMappedByProperty(), '.');
 
-		this.sqlAliasStem = SqlAliasStemHelper.INSTANCE.generateStemFromAttributeName( attributeName );
+		sqlAliasStem = SqlAliasStemHelper.INSTANCE.generateStemFromAttributeName( attributeName );
 
 		separateCollectionTable = bootDescriptor.isOneToMany() ? null : collectionDescriptor.getTableName();
 
 		final int baseIndex = bootDescriptor instanceof List list ? list.getBaseIndex() : -1;
-
 		indexMetadata = new IndexMetadata() {
 			@Override
 			public CollectionPart getIndexDescriptor() {
@@ -172,9 +186,150 @@ public String getIndexPropertyName() {
 			}
 		};
 
-		softDeleteMapping = resolveSoftDeleteMapping( this, bootDescriptor, getSeparateCollectionTable(), creationProcess );
+		auxiliaryMapping =
+				bootDescriptor.getStateManagement()
+						.createAuxiliaryMapping( this, bootDescriptor, creationProcess );
 
 		injectAttributeMapping( elementDescriptor, indexDescriptor, collectionDescriptor, this );
+
+		if ( elementDescriptor instanceof EntityCollectionPart elementMapping ) {
+			validateTargetEntity( elementMapping, declaringType, attributeName, propertyAccess, creationProcess );
+		}
+	}
+
+	/**
+	 * @implNote This is check based on best effort.  If we are not able to resolve
+	 * something needed for the check we simply short-circuit in the "affirmative".
+	 * In testing, this mainly manifested in cases with embeddable inheritance
+	 * given how the EmbeddableMappingType is built and an inability to locate
+	 * subtype members.
+	 */
+	private static void validateTargetEntity(
+			EntityCollectionPart elementPart,
+			ManagedMappingType declaringType,
+			String attributeName,
+			PropertyAccess propertyAccess,
+			MappingModelCreationProcess creationProcess) {
+		final var representationStrategy = typeRepresentationStrategy( declaringType );
+		if ( representationStrategy != null
+				// nothing to check against with dynamic models
+				&& representationStrategy.getMode() == RepresentationMode.POJO ) {
+			final var attributeMemberDetails =
+					getMemberDetails( attributeName, propertyAccess,
+							declaringClassDetails( declaringType, creationProcess ) );
+			if ( attributeMemberDetails != null ) {
+				checkElementType( elementPart, declaringType, attributeName, attributeMemberDetails );
+			}
+			// else usually indicates the case of embeddable
+			// inheritance mentioned in the @implNote
+		}
+	}
+
+	private static ClassDetails declaringClassDetails(
+			ManagedMappingType declaringType,
+			MappingModelCreationProcess creationProcess) {
+		return creationProcess.getCreationContext().getBootstrapContext()
+				.getModelsContext().getClassDetailsRegistry()
+				.resolveClassDetails( declaringType.getJavaType().getTypeName() );
+	}
+
+	private static void checkElementType(
+			EntityCollectionPart elementPart,
+			ManagedMappingType declaringType,
+			String attributeName,
+			MemberDetails attributeMemberDetails) {
+		final var elementType =
+				attributeMemberDetails.getElementType()
+						.determineRawClass().toJavaClass();
+		if ( !Object.class.equals( elementType ) ) {
+			final var targetType = elementPart.getJavaType().getJavaTypeClass();
+			if ( !elementType.isAssignableFrom( targetType ) ) {
+				throw new MappingException(
+						String.format(
+								ROOT,
+								"Plural attribute [%s.%s] was mapped with targetEntity=`%s`,"
+										+ " but the attribute is declared as `%s`",
+								declaringType.getNavigableRole().getFullPath(),
+								attributeName,
+								targetType.getName(),
+								elementType.getName()
+						)
+				);
+			}
+		}
+	}
+
+	private static @Nullable MemberDetails getMemberDetails(
+			String attributeName, PropertyAccess propertyAccess, ClassDetails declaringClassDetails) {
+		final var member = propertyAccess.getGetter().getMember();
+		if ( member instanceof Field ) {
+			return locateField( declaringClassDetails, attributeName );
+		}
+		else if ( member instanceof Method method ) {
+			return locateGetter( declaringClassDetails, method );
+		}
+		else {
+			// we need access to the field or getter...
+			return null;
+		}
+	}
+
+	private static @Nullable ManagedTypeRepresentationStrategy typeRepresentationStrategy(ManagedMappingType declaringType) {
+		if ( declaringType instanceof EntityMappingType declaringEntityType ) {
+			return declaringEntityType.getRepresentationStrategy();
+		}
+		else if ( declaringType instanceof EmbeddableMappingType declaringEmbeddableType ) {
+			return declaringEmbeddableType.getRepresentationStrategy();
+		}
+		else {
+			// should never happen, but be lenient
+			return null;
+		}
+	}
+
+	/**
+	 * Locate the corresponding field details.
+	 *
+	 * @return The field details, or {@code null} if we cannot locate it.
+	 *
+	 * @implNote See `implNote` on {@linkplain #validateTargetEntity} for details
+	 * about why we return {@code null} instead of throwing an exception.
+	 */
+	private static FieldDetails locateField(ClassDetails declaringClassDetails, String attributeName) {
+		assert declaringClassDetails != null;
+		var classDetails = declaringClassDetails;
+		while ( classDetails != null && classDetails != ClassDetails.OBJECT_CLASS_DETAILS ) {
+			final var fieldDetails = classDetails.findFieldByName( attributeName );
+			if ( fieldDetails != null ) {
+				return fieldDetails;
+			}
+			classDetails = classDetails.getSuperClass();
+		}
+		return null;
+	}
+
+	/**
+	 * Locate the corresponding getter method details.
+	 *
+	 * @return The getter method details, or {@code null} if we cannot locate it.
+	 *
+	 * @implNote See `implNote` on {@linkplain #validateTargetEntity} for details
+	 * about why we return {@code null} instead of throwing an exception.
+	 */
+	private static MethodDetails locateGetter(ClassDetails declaringClassDetails, Method method) {
+		assert declaringClassDetails != null;
+		var classDetails = declaringClassDetails;
+		while ( classDetails != null && classDetails != ClassDetails.OBJECT_CLASS_DETAILS ) {
+			for ( int i = 0; i < classDetails.getMethods().size(); i++ ) {
+				final var methodDetails = classDetails.getMethods().get(i);
+				if ( methodDetails.getName().equals( method.getName() )
+						&& methodDetails.getMethodKind() == MethodDetails.MethodKind.GETTER ) {
+					return methodDetails;
+				}
+			}
+			classDetails = classDetails.getSuperClass();
+		}
+		return null;
 	}
 
 
@@ -189,8 +344,6 @@ protected PluralAttributeMappingImpl(PluralAttributeMappingImpl original) {
 		this.identifierDescriptor = original.identifierDescriptor;
 		this.fetchTiming = original.fetchTiming;
 		this.fetchStyle = original.fetchStyle;
-		this.softDeleteMapping = original.softDeleteMapping;
-		this.hasSoftDelete = original.hasSoftDelete;
 		this.collectionDescriptor = original.collectionDescriptor;
 		this.referencedPropertyName = original.referencedPropertyName;
 		this.mapKeyPropertyName = original.mapKeyPropertyName;
@@ -201,6 +354,7 @@ protected PluralAttributeMappingImpl(PluralAttributeMappingImpl original) {
 		this.fkDescriptor = original.fkDescriptor;
 		this.orderByFragment = original.orderByFragment;
 		this.manyToManyOrderByFragment = original.manyToManyOrderByFragment;
+		this.auxiliaryMapping = original.auxiliaryMapping;
 		injectAttributeMapping( elementDescriptor, indexDescriptor, collectionDescriptor, this );
 	}
 
@@ -225,11 +379,31 @@ private static void injectAttributeMapping(
 	@Override
 	public boolean isBidirectionalAttributeName(NavigablePath fetchablePath, ToOneAttributeMapping modelPart) {
 		return bidirectionalAttributeName == null
-				// If the FK-target of the to-one mapping is the same as the FK-target of this plural mapping,
-				// then we say this is bidirectional, given that this is only invoked for model parts of the
-				// collection elements
-				? fkDescriptor.getTargetPart() == modelPart.getForeignKeyDescriptor().getTargetPart()
-				: fetchablePath.getLocalName().endsWith( bidirectionalAttributeName );
+				// If the FK-target of the to-one mapping is the same as the FK-target of this one-to-many mapping,
+				// and the FK-key refer to the same column then we say this is bidirectional,
+				// given that this is only invoked for model parts of the collection elements
+				? modelPart.getSideNature() == ForeignKeyDescriptor.Nature.KEY
+						&& collectionDescriptor.isOneToMany()
+						&& fkDescriptor.getTargetPart() == modelPart.getForeignKeyDescriptor().getTargetPart()
+						&& areEqual( fkDescriptor.getKeyPart(), modelPart.getForeignKeyDescriptor().getKeyPart() )
+				: fetchablePath.getLocalName().equals( bidirectionalAttributeName );
+	}
+
+	private boolean areEqual(ValuedModelPart part1, ValuedModelPart part2) {
+		final int typeCount = part1.getJdbcTypeCount();
+		if ( part2.getJdbcTypeCount() != typeCount ) {
+			return false;
+		}
+		for ( int i = 0; i < typeCount; i++ ) {
+			final var selectable1 = part1.getSelectable( i );
+			final var selectable2 = part2.getSelectable( i );
+			if ( selectable1.getJdbcMapping() != selectable2.getJdbcMapping()
+				|| !selectable1.getContainingTableExpression().equals( selectable2.getContainingTableExpression() )
+				|| !selectable1.getSelectionExpression().equals( selectable2.getSelectionExpression() ) ) {
+				return false;
+			}
+		}
+		return true;
 	}
 
 	public void finishInitialization(
@@ -304,7 +478,8 @@ public CollectionIdentifierDescriptor getIdentifierDescriptor() {
 
 	@Override
 	public SoftDeleteMapping getSoftDeleteMapping() {
-		return softDeleteMapping;
+		return auxiliaryMapping instanceof SoftDeleteMapping softDeleteMapping
+				? softDeleteMapping : null;
 	}
 
 	@Override
@@ -312,6 +487,23 @@ public TableDetails getSoftDeleteTableDetails() {
 		return ( (CollectionMutationTarget) getCollectionDescriptor() ).getCollectionTableMapping();
 	}
 
+	@Override
+	public TemporalMapping getTemporalMapping() {
+		return auxiliaryMapping instanceof TemporalMapping temporalMapping
+				? temporalMapping : null;
+	}
+
+	@Override
+	public AuditMapping getAuditMapping() {
+		return auxiliaryMapping instanceof AuditMapping auditMapping
+				? auditMapping : null;
+	}
+
+	private AuxiliaryMapping getAuxiliaryMapping() {
+		return auxiliaryMapping;
+	}
+
+
 	@Override
 	public OrderByFragment getOrderByFragment() {
 		return orderByFragment;
@@ -364,34 +556,36 @@ public boolean hasPartitionedSelectionMapping() {
 	}
 
 	@Override
-	public void applySoftDeleteRestrictions(TableGroup tableGroup, PredicateConsumer predicateConsumer) {
-		if ( hasSoftDelete() ) {
-			final var descriptor = getCollectionDescriptor();
-			if ( descriptor.isOneToMany() || descriptor.isManyToMany() ) {
-				// see if the associated entity has soft-delete defined
-				final var elementDescriptor = (EntityCollectionPart) getElementDescriptor();
-				final var associatedEntityDescriptor = elementDescriptor.getAssociatedEntityMappingType();
-				final var softDeleteMapping = associatedEntityDescriptor.getSoftDeleteMapping();
-				if ( softDeleteMapping != null ) {
-					final String primaryTableName =
-							associatedEntityDescriptor.getSoftDeleteTableDetails().getTableName();
-					final var primaryTableReference =
-							tableGroup.resolveTableReference( primaryTableName );
-					final var softDeleteRestriction =
-							softDeleteMapping.createNonDeletedRestriction( primaryTableReference );
-					predicateConsumer.applyPredicate( softDeleteRestriction );
-				}
+	public void applyAuxiliaryRestrictions(
+			TableGroup tableGroup,
+			PredicateConsumer predicateConsumer,
+			LoadQueryInfluencers influencers,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator) {
+		final var descriptor = getCollectionDescriptor();
+		if ( descriptor.isOneToMany() || descriptor.isManyToMany() ) {
+			final var elementDescriptor = (EntityCollectionPart) getElementDescriptor();
+			final var associatedEntityDescriptor = elementDescriptor.getAssociatedEntityMappingType();
+			final var associatedAuxiliaryMapping = associatedEntityDescriptor.getAuxiliaryMapping();
+			if ( associatedAuxiliaryMapping != null ) {
+				associatedAuxiliaryMapping.applyPredicate(
+						associatedEntityDescriptor,
+						predicateConsumer::applyPredicate,
+						tableGroup,
+						sqlAliasBaseGenerator,
+						influencers
+				);
 			}
+		}
 
-			// apply the collection's soft-delete mapping, if one
-			final var softDeleteMapping = getSoftDeleteMapping();
-			if ( softDeleteMapping != null ) {
-				final var primaryTableReference =
-						tableGroup.resolveTableReference( getSoftDeleteTableDetails().getTableName() );
-				final var softDeleteRestriction =
-						softDeleteMapping.createNonDeletedRestriction( primaryTableReference );
-				predicateConsumer.applyPredicate( softDeleteRestriction );
-			}
+		final var auxiliaryMapping = getAuxiliaryMapping();
+		if ( auxiliaryMapping != null ) {
+			auxiliaryMapping.applyPredicate(
+					this,
+					predicateConsumer::applyPredicate,
+					tableGroup,
+					sqlAliasBaseGenerator,
+					influencers
+			);
 		}
 	}
 
@@ -524,19 +718,19 @@ public Fetch resolveCircularFetch(
 			FetchParent fetchParent,
 			FetchTiming fetchTiming,
 			DomainResultCreationState creationState) {
-		if ( fetchTiming == FetchTiming.IMMEDIATE ) {
-			final boolean alreadyVisited = creationState.isAssociationKeyVisited( fkDescriptor.getAssociationKey() );
-			if ( alreadyVisited ) {
-				return createSelectEagerCollectionFetch(
-						fetchParent,
-						fetchablePath,
-						creationState,
-						creationState.getSqlAstCreationState()
-				);
-			}
+		if ( fetchTiming == FetchTiming.IMMEDIATE
+				// if it's already visited
+				&& creationState.isAssociationKeyVisited( fkDescriptor.getAssociationKey() ) ) {
+			return createSelectEagerCollectionFetch(
+					fetchParent,
+					fetchablePath,
+					creationState,
+					creationState.getSqlAstCreationState()
+			);
+		}
+		else {
+			return null;
 		}
-
-		return null;
 	}
 
 	private Fetch createSelectEagerCollectionFetch(
@@ -544,20 +738,29 @@ private Fetch createSelectEagerCollectionFetch(
 			NavigablePath fetchablePath,
 			DomainResultCreationState creationState,
 			SqlAstCreationState sqlAstCreationState) {
-		final DomainResult<?> collectionKeyDomainResult;
-		if ( referencedPropertyName != null ) {
-			collectionKeyDomainResult = getKeyDescriptor().createTargetDomainResult(
-					fetchablePath,
-					sqlAstCreationState.getFromClauseAccess()
-							.getTableGroup( fetchParent.getNavigablePath() ),
-					fetchParent,
-					creationState
-			);
+		return buildSelectEagerCollectionFetch( fetchablePath, this,
+				collectionKeyDomainResult( fetchParent, fetchablePath, creationState, sqlAstCreationState ),
+				fetchParent );
+	}
+
+	private @Nullable DomainResult<?> collectionKeyDomainResult(
+			FetchParent fetchParent,
+			NavigablePath fetchablePath,
+			DomainResultCreationState creationState,
+			SqlAstCreationState sqlAstCreationState) {
+		if ( referencedPropertyName == null ) {
+			return null;
 		}
 		else {
-			collectionKeyDomainResult = null;
+			return getKeyDescriptor()
+					.createTargetDomainResult(
+							fetchablePath,
+							sqlAstCreationState.getFromClauseAccess()
+									.getTableGroup( fetchParent.getNavigablePath() ),
+							fetchParent,
+							creationState
+					);
 		}
-		return buildSelectEagerCollectionFetch( fetchablePath, this, collectionKeyDomainResult, fetchParent );
 	}
 
 	private TableGroup resolveCollectionTableGroup(
@@ -686,10 +889,11 @@ public TableGroupJoin createTableGroupJoin(
 				creationState
 		);
 
-		applySoftDeleteRestriction(
-				predicateCollector::applyPredicate,
+		applyAuxiliaryRestrictions(
 				tableGroup,
-				creationState
+				predicateCollector::applyPredicate,
+				creationState.getLoadQueryInfluencers(),
+				creationState.getSqlAliasBaseGenerator()
 		);
 
 		if ( fetched ) {
@@ -709,50 +913,18 @@ public TableGroupJoin createTableGroupJoin(
 				collectionPredicateCollector.getPredicate()
 		);
 		if ( predicateCollector != collectionPredicateCollector ) {
-			final var joinForPredicate = TableGroupJoinHelper.determineJoinForPredicateApply( tableGroupJoin );
-			joinForPredicate.applyPredicate( predicateCollector.getPredicate() );
+			determineJoinForPredicateApply( tableGroupJoin )
+					.applyPredicate( predicateCollector.getPredicate() );
 		}
 		return tableGroupJoin;
 	}
 
 	private boolean hasSoftDelete() {
-		// NOTE : this needs to be done lazily because the associated entity mapping (if one)
+		// NOTE: this needs to be done lazily because the associated entity mapping (if one)
 		// does not know its SoftDeleteMapping yet when this is created
-		if ( hasSoftDelete == null ) {
-			hasSoftDelete =
-					softDeleteMapping != null
-						|| getElementDescriptor() instanceof EntityCollectionPart collectionPart
-								&& collectionPart.getAssociatedEntityMappingType().getSoftDeleteMapping() != null;
-		}
-		return hasSoftDelete;
-	}
-
-	private void applySoftDeleteRestriction(
-			Consumer<Predicate> predicateConsumer,
-			TableGroup tableGroup,
-			SqlAstCreationState creationState) {
-		if ( hasSoftDelete() ) {
-			if ( getElementDescriptor() instanceof EntityCollectionPart entityCollectionPart ) {
-				final var entityMappingType = entityCollectionPart.getAssociatedEntityMappingType();
-				final var softDeleteMapping = entityMappingType.getSoftDeleteMapping();
-				if ( softDeleteMapping != null ) {
-					final var softDeleteTable = entityMappingType.getSoftDeleteTableDetails();
-					predicateConsumer.accept( softDeleteMapping.createNonDeletedRestriction(
-							tableGroup.resolveTableReference( softDeleteTable.getTableName() ),
-							creationState.getSqlExpressionResolver()
-					) );
-				}
-			}
-
-			final var softDeleteMapping = getSoftDeleteMapping();
-			if ( softDeleteMapping != null ) {
-				final var softDeleteTable = getSoftDeleteTableDetails();
-				predicateConsumer.accept( softDeleteMapping.createNonDeletedRestriction(
-						tableGroup.resolveTableReference( softDeleteTable.getTableName() ),
-						creationState.getSqlExpressionResolver()
-				) );
-			}
-		}
+		return auxiliaryMapping instanceof SoftDeleteMapping
+			|| getElementDescriptor() instanceof EntityCollectionPart collectionPart
+					&& collectionPart.getAssociatedEntityMappingType().getSoftDeleteMapping() != null;
 	}
 
 	public SqlAstJoinType determineSqlJoinType(TableGroup lhs, @Nullable SqlAstJoinType requestedJoinType, boolean fetched) {
@@ -760,12 +932,9 @@ public SqlAstJoinType determineSqlJoinType(TableGroup lhs, @Nullable SqlAstJoinT
 			return SqlAstJoinType.LEFT;
 		}
 		else if ( requestedJoinType == null ) {
-			if ( fetched ) {
-				return getDefaultSqlAstJoinType( lhs );
-			}
-			else {
-				return SqlAstJoinType.INNER;
-			}
+			return fetched
+					? getDefaultSqlAstJoinType( lhs )
+					: SqlAstJoinType.INNER;
 		}
 		else {
 			return requestedJoinType;
@@ -805,43 +974,62 @@ private TableGroup createRootTableGroupJoin(
 			boolean addsPredicate,
 			Consumer<Predicate> predicateConsumer,
 			SqlAstCreationState creationState) {
-		final CollectionPersister collectionDescriptor = getCollectionDescriptor();
-		final SqlAstJoinType joinType = determineSqlJoinType( lhs, requestedJoinType, fetched );
-		final SqlAliasBase sqlAliasBase = creationState.getSqlAliasBaseGenerator().createSqlAliasBase( getSqlAliasStem() );
-
-		final TableGroup tableGroup;
-		if ( collectionDescriptor.isOneToMany() ) {
-			tableGroup = createOneToManyTableGroup(
-					lhs.canUseInnerJoins() && joinType == SqlAstJoinType.INNER,
-					joinType,
-					navigablePath,
-					fetched,
-					addsPredicate,
-					explicitSourceAlias,
-					sqlAliasBase,
-					creationState
-			);
-		}
-		else {
-			tableGroup = createCollectionTableGroup(
-					lhs.canUseInnerJoins() && joinType == SqlAstJoinType.INNER,
-					joinType,
-					navigablePath,
-					fetched,
-					addsPredicate,
-					explicitSourceAlias,
-					sqlAliasBase,
-					creationState
-			);
-		}
+
+		final var tableGroup =
+				rootTableGroup(
+						navigablePath,
+						lhs,
+						explicitSourceAlias,
+						fetched,
+						addsPredicate,
+						creationState,
+						determineSqlJoinType( lhs, requestedJoinType, fetched ),
+						creationState.getSqlAliasBaseGenerator()
+								.createSqlAliasBase( getSqlAliasStem() )
+				);
 
 		if ( predicateConsumer != null ) {
-			predicateConsumer.accept( getKeyDescriptor().generateJoinPredicate( lhs, tableGroup, creationState ) );
+			predicateConsumer.accept( getKeyDescriptor()
+					.generateJoinPredicate( lhs, tableGroup, creationState ) );
 		}
 
 		return tableGroup;
 	}
 
+	private TableGroup rootTableGroup(
+			NavigablePath navigablePath,
+			TableGroup lhs,
+			String explicitSourceAlias,
+			boolean fetched,
+			boolean addsPredicate,
+			SqlAstCreationState creationState,
+			SqlAstJoinType joinType,
+			SqlAliasBase sqlAliasBase) {
+		return getCollectionDescriptor().isOneToMany()
+				? createOneToManyTableGroup(
+						lhs.canUseInnerJoins()
+						&& joinType == SqlAstJoinType.INNER,
+						joinType,
+						navigablePath,
+						fetched,
+						addsPredicate,
+						explicitSourceAlias,
+						sqlAliasBase,
+						creationState
+				)
+				: createCollectionTableGroup(
+						lhs.canUseInnerJoins()
+						&& joinType == SqlAstJoinType.INNER,
+						joinType,
+						navigablePath,
+						fetched,
+						addsPredicate,
+						explicitSourceAlias,
+						sqlAliasBase,
+						creationState
+				);
+	}
+
 
 	@Override
 	public void setForeignKeyDescriptor(ForeignKeyDescriptor fkDescriptor) {
@@ -857,33 +1045,27 @@ private TableGroup createOneToManyTableGroup(
 			String sourceAlias,
 			SqlAliasBase explicitSqlAliasBase,
 			SqlAstCreationState creationState) {
+		final var oneToManyCollectionPart = (OneToManyCollectionPart) elementDescriptor;
 		final var sqlAliasBase = SqlAliasBase.from(
 				explicitSqlAliasBase,
 				sourceAlias,
 				this,
 				creationState.getSqlAliasBaseGenerator()
 		);
-		final var oneToManyCollectionPart = (OneToManyCollectionPart) elementDescriptor;
-		final var elementTableGroup = oneToManyCollectionPart.createAssociatedTableGroup(
-				canUseInnerJoins,
-				navigablePath.append( CollectionPart.Nature.ELEMENT.getName() ),
-				fetched,
-				sourceAlias,
-				sqlAliasBase,
-				creationState
-		);
 		final var tableGroup = new OneToManyTableGroup(
 				this,
-				elementTableGroup,
-				creationState.getCreationContext().getSessionFactory()
+				oneToManyCollectionPart.createAssociatedTableGroup(
+						canUseInnerJoins,
+						navigablePath.append( CollectionPart.Nature.ELEMENT.getName() ),
+						fetched,
+						sourceAlias,
+						sqlAliasBase,
+						creationState
+				),
+				creationState.getCreationContext()
+						// TODO: FIX ME
+						.getSessionFactory()
 		);
-		// For inner joins we never need join nesting
-		final boolean nestedJoin = joinType != SqlAstJoinType.INNER
-				// For outer joins we need nesting if there might be an on-condition that refers to the element table
-				&& ( addsPredicate
-				|| isAffectedByEnabledFilters( creationState.getLoadQueryInfluencers(), creationState.applyOnlyLoadByKeyFilters() )
-				|| collectionDescriptor.hasWhereRestrictions() );
-
 		if ( indexDescriptor instanceof TableGroupJoinProducer tableGroupJoinProducer ) {
 			final var tableGroupJoin = tableGroupJoinProducer.createTableGroupJoin(
 					navigablePath.append( CollectionPart.Nature.INDEX.getName() ),
@@ -895,12 +1077,23 @@ private TableGroup createOneToManyTableGroup(
 					false,
 					creationState
 			);
-			tableGroup.registerIndexTableGroup( tableGroupJoin, nestedJoin );
+			tableGroup.registerIndexTableGroup( tableGroupJoin,
+					isNestedJoin( joinType, addsPredicate, creationState ) );
 		}
 
 		return tableGroup;
 	}
 
+	private boolean isNestedJoin(SqlAstJoinType joinType, boolean addsPredicate, SqlAstCreationState creationState) {
+		// For inner joins we never need join nesting
+		return joinType != SqlAstJoinType.INNER
+			// For outer joins we need nesting if there might be an on-condition that refers to the element table
+			&& ( addsPredicate
+					|| collectionDescriptor.hasWhereRestrictions()
+					|| isAffectedByEnabledFilters( creationState.getLoadQueryInfluencers(),
+							creationState.applyOnlyLoadByKeyFilters() ) );
+	}
+
 	private TableGroup createCollectionTableGroup(
 			boolean canUseInnerJoins,
 			SqlAstJoinType joinType,
@@ -917,12 +1110,12 @@ private TableGroup createCollectionTableGroup(
 				this,
 				creationState.getSqlAliasBaseGenerator()
 		);
-		final String collectionTableName = collectionDescriptor.getTableName();
-		final var collectionTableReference = new NamedTableReference(
-				collectionTableName,
-				sqlAliasBase.generateNewAlias(),
-				true
-		);
+		final String tableName = collectionDescriptor.getTableName();
+		final String alias = sqlAliasBase.generateNewAlias();
+		final var collectionTableReference =
+				collectionTableReference( creationState, tableName, alias );
+		collectionTableReference.applyAuxiliaryTable( auxiliaryMapping,
+				creationState.getLoadQueryInfluencers() );
 
 		final var tableGroup = new CollectionTableGroup(
 				canUseInnerJoins,
@@ -935,14 +1128,12 @@ private TableGroup createCollectionTableGroup(
 				sqlAliasBase,
 				s -> false,
 				null,
-				creationState.getCreationContext().getSessionFactory()
+				creationState.getCreationContext()
+						// TODO: FIX ME
+						.getSessionFactory()
 		);
-		// For inner joins we never need join nesting
-		final boolean nestedJoin = joinType != SqlAstJoinType.INNER
-				// For outer joins we need nesting if there might be an on-condition that refers to the element table
-				&& ( addsPredicate
-				|| isAffectedByEnabledFilters( creationState.getLoadQueryInfluencers(), creationState.applyOnlyLoadByKeyFilters() )
-				|| collectionDescriptor.hasWhereRestrictions() );
+
+		final boolean nestedJoin = isNestedJoin( joinType, addsPredicate, creationState );
 
 		if ( elementDescriptor instanceof TableGroupJoinProducer tableGroupJoinProducer ) {
 			final var tableGroupJoin = tableGroupJoinProducer.createTableGroupJoin(
@@ -975,12 +1166,19 @@ private TableGroup createCollectionTableGroup(
 		return tableGroup;
 	}
 
+	private NamedTableReference collectionTableReference(SqlAstCreationState creationState, String tableName, String alias) {
+		return auxiliaryMapping != null && auxiliaryMapping.useAuxiliaryTable( creationState.getLoadQueryInfluencers() )
+				? new AuxiliaryTableReference( auxiliaryMapping.getTableName(), tableName, alias, true )
+				: new NamedTableReference( tableName, alias, true );
+	}
+
 	@Override
 	public TableGroup createRootTableGroup(
 			boolean canUseInnerJoins,
 			NavigablePath navigablePath,
 			String explicitSourceAlias,
-			SqlAliasBase explicitSqlAliasBase, Supplier<Consumer<Predicate>> additionalPredicateCollectorAccess,
+			SqlAliasBase explicitSqlAliasBase,
+			Supplier<Consumer<Predicate>> additionalPredicateCollectorAccess,
 			SqlAstCreationState creationState) {
 		if ( getCollectionDescriptor().isOneToMany() ) {
 			return createOneToManyTableGroup(
@@ -1018,6 +1216,23 @@ public boolean isAffectedByEnabledFilters(LoadQueryInfluencers influencers, bool
 		return getCollectionDescriptor().isAffectedByEnabledFilters( influencers, onlyApplyForLoadByKeyFilters );
 	}
 
+	@Override
+	public boolean isAffectedByInfluencers(LoadQueryInfluencers influencers, boolean onlyApplyForLoadByKeyFilters) {
+		if ( PluralAttributeMapping.super.isAffectedByInfluencers( influencers, onlyApplyForLoadByKeyFilters )
+				|| auxiliaryMapping != null && auxiliaryMapping.isAffectedByInfluencers( influencers )) {
+			return true;
+		}
+		else {
+			final var descriptor = getCollectionDescriptor();
+			if ( descriptor.isOneToMany() || descriptor.isManyToMany() ) {
+				final var elementDescriptor = (EntityCollectionPart) getElementDescriptor();
+				return elementDescriptor.getAssociatedEntityMappingType()
+						.isAffectedByInfluencers( influencers, onlyApplyForLoadByKeyFilters );
+			}
+			return false;
+		}
+	}
+
 	@Override
 	public boolean isAffectedByEntityGraph(LoadQueryInfluencers influencers) {
 		return getCollectionDescriptor().isAffectedByEntityGraph( influencers );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java
index d68524175980..9402bf31fcb1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingImpl.java
@@ -109,6 +109,7 @@ public SelectableMappingImpl(
 		this.isFormula = isFormula;
 	}
 
+	@Deprecated(forRemoval = true)
 	public static SelectableMapping from(
 			final String containingTableExpression,
 			final Selectable selectable,
@@ -129,12 +130,14 @@ public static SelectableMapping from(
 				insertable,
 				updateable,
 				partitioned,
+				false,
 				dialect,
 				sqmFunctionRegistry,
 				creationContext
 		);
 	}
 
+	@Deprecated(forRemoval = true)
 	public static SelectableMapping from(
 			final String containingTableExpression,
 			final Selectable selectable,
@@ -163,6 +166,7 @@ public static SelectableMapping from(
 		);
 	}
 
+	@Deprecated(forRemoval = true)
 	public static SelectableMapping from(
 			final String containingTableExpression,
 			final Selectable selectable,
@@ -191,6 +195,7 @@ public static SelectableMapping from(
 		);
 	}
 
+	@Deprecated(forRemoval = true)
 	public static SelectableMapping from(
 			final String containingTableExpression,
 			final Selectable selectable,
@@ -204,6 +209,39 @@ public static SelectableMapping from(
 			final Dialect dialect,
 			final SqmFunctionRegistry sqmFunctionRegistry,
 			RuntimeModelCreationContext creationContext) {
+		return from(
+				containingTableExpression,
+				selectable,
+				selectable.isFormula() ? selectable.getText() : null,
+				parentPath,
+				jdbcMapping,
+				typeConfiguration,
+				insertable,
+				updateable,
+				partitioned,
+				forceNotNullable,
+				dialect,
+				sqmFunctionRegistry,
+				creationContext
+		);
+	}
+
+	public static SelectableMapping from(
+			final String containingTableExpression,
+			final Selectable selectable,
+			// The path to the property for this selectable mapping, which is used as selectable name
+			// if the selectable is a formula. If it's a formula, the value should be non-null
+			@Nullable final String propertyPath,
+			@Nullable final SelectablePath parentPath,
+			final JdbcMapping jdbcMapping,
+			final TypeConfiguration typeConfiguration,
+			boolean insertable,
+			boolean updateable,
+			boolean partitioned,
+			boolean forceNotNullable,
+			final Dialect dialect,
+			final SqmFunctionRegistry sqmFunctionRegistry,
+			RuntimeModelCreationContext creationContext) {
 		final String columnExpression;
 		final String columnDefinition;
 		final Long length;
@@ -212,6 +250,7 @@ public static SelectableMapping from(
 		final Integer scale;
 		final Integer temporalPrecision;
 		final String selectableName;
+		final SelectablePath selectablePath;
 		final boolean isLob;
 		final boolean isNullable;
 		if ( selectable.isFormula() ) {
@@ -224,7 +263,9 @@ public static SelectableMapping from(
 			temporalPrecision = null;
 			isNullable = true;
 			isLob = false;
-			selectableName = selectable.getText();
+			selectableName = propertyPath;
+			assert propertyPath != null : "Property path must be non-null for formulas";
+			selectablePath = new SelectablePath( propertyPath );
 		}
 		else {
 			var column = (Column) selectable;
@@ -239,13 +280,14 @@ public static SelectableMapping from(
 			isNullable = !forceNotNullable && column.isNullable();
 			isLob = column.isSqlTypeLob( creationContext.getMetadata() );
 			selectableName = column.getQuotedName( dialect );
+			selectablePath = parentPath == null
+					? null
+					: parentPath.append( selectableName );
 		}
 		return new SelectableMappingImpl(
 				containingTableExpression,
 				columnExpression,
-				parentPath == null
-						? null
-						: parentPath.append( selectableName ),
+				selectablePath,
 				selectable.getCustomReadExpression(),
 				selectable.getWriteExpr( jdbcMapping, dialect, creationContext.getBootModel() ),
 				columnDefinition,
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java
index 7c0871166ad1..c8031de558b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java
@@ -38,12 +38,12 @@ public SelectableMappingsImpl(SelectableMapping[] selectableMappings) {
 	}
 
 	private static void resolveJdbcMappings(List<JdbcMapping> jdbcMappings, MappingContext mapping, Type valueType) {
-		final Type keyType =
+		final var keyType =
 				valueType instanceof EntityType entityType
 						? entityType.getIdentifierOrUniqueKeyType( mapping )
 						: valueType;
 		if ( keyType instanceof CompositeType compositeType ) {
-			for ( Type subtype : compositeType.getSubtypes() ) {
+			for ( var subtype : compositeType.getSubtypes() ) {
 				resolveJdbcMappings( jdbcMappings, mapping, subtype );
 			}
 		}
@@ -52,6 +52,7 @@ private static void resolveJdbcMappings(List<JdbcMapping> jdbcMappings, MappingC
 		}
 	}
 
+	@Deprecated(forRemoval = true)
 	public static SelectableMappings from(
 			String containingTableExpression,
 			Value value,
@@ -78,6 +79,7 @@ public static SelectableMappings from(
 		);
 	}
 
+	@Deprecated(forRemoval = true)
 	public static SelectableMappings from(
 			String containingTableExpression,
 			Value value,
@@ -90,6 +92,35 @@ public static SelectableMappings from(
 			Dialect dialect,
 			SqmFunctionRegistry sqmFunctionRegistry,
 			RuntimeModelCreationContext creationContext) {
+		return from(
+				containingTableExpression,
+				value,
+				propertyOrder,
+				null,
+				parentSelectablePath,
+				mappingContext,
+				typeConfiguration,
+				insertable,
+				updateable,
+				dialect,
+				sqmFunctionRegistry,
+				creationContext
+		);
+	}
+
+	public static SelectableMappings from(
+			String containingTableExpression,
+			Value value,
+			int[] propertyOrder,
+			@Nullable String propertyPath,
+			@Nullable SelectablePath parentSelectablePath,
+			MappingContext mappingContext,
+			TypeConfiguration typeConfiguration,
+			boolean[] insertable,
+			boolean[] updateable,
+			Dialect dialect,
+			SqmFunctionRegistry sqmFunctionRegistry,
+			RuntimeModelCreationContext creationContext) {
 		final List<JdbcMapping> jdbcMappings = new ArrayList<>();
 		resolveJdbcMappings( jdbcMappings, mappingContext, value.getType() );
 
@@ -99,12 +130,14 @@ public static SelectableMappings from(
 			selectableMappings[propertyOrder[i]] = SelectableMappingImpl.from(
 					containingTableExpression,
 					selectables.get( i ),
+					selectables.get( i ).isFormula() ? (propertyPath + "_" + i) : null,
 					parentSelectablePath,
 					jdbcMappings.get( propertyOrder[i] ),
 					typeConfiguration,
 					i < insertable.length && insertable[i],
 					i < updateable.length && updateable[i],
 					false,
+					false,
 					dialect,
 					sqmFunctionRegistry,
 					creationContext
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
index aed1ace3cc83..04bef9d0f78e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java
@@ -30,6 +30,7 @@
 import org.hibernate.metamodel.mapping.PropertyBasedMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.metamodel.mapping.SelectablePath;
 import org.hibernate.metamodel.mapping.ValuedModelPart;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.property.access.spi.PropertyAccess;
@@ -387,7 +388,8 @@ private <T> DomainResult<T> createDomainResult(
 				selectableMapping.getJdbcMapping(),
 				navigablePath,
 				// if the expression type is different that the expected type coerce the value
-				selectionType != null && selectionType.getSingleJdbcMapping().getJdbcJavaType() != javaType,
+				selectionType != null
+						&& selectionType.getSingleJdbcMapping().getJdbcJavaType() != javaType,
 				!sqlSelection.isVirtual()
 		);
 	}
@@ -409,30 +411,21 @@ public Predicate generateJoinPredicate(
 			TableGroup targetSideTableGroup,
 			TableGroup keySideTableGroup,
 			SqlAstCreationState creationState) {
-		final var lhsTableReference = targetSideTableGroup.resolveTableReference(
-				targetSideTableGroup.getNavigablePath(),
-				targetSide.getModelPart().getContainingTableExpression()
-		);
-		final var rhsTableKeyReference = keySideTableGroup.resolveTableReference(
-				null,
-				keySide.getModelPart().getContainingTableExpression()
-		);
-
+		final var lhsTableReference =
+				targetSideTableGroup.resolveTableReference( targetSideTableGroup.getNavigablePath(),
+						targetSide.getModelPart().getContainingTableExpression() );
+		final var rhsTableKeyReference =
+				keySideTableGroup.resolveTableReference( null,
+						keySide.getModelPart().getContainingTableExpression() );
 		return generateJoinPredicate( lhsTableReference, rhsTableKeyReference, creationState );
 	}
 
 	@Override
 	public boolean isSimpleJoinPredicate(Predicate predicate) {
-		if ( !(predicate instanceof ComparisonPredicate comparisonPredicate) ) {
-			return false;
-		}
-		if ( comparisonPredicate.getOperator() != ComparisonOperator.EQUAL ) {
-			return false;
-		}
-		final var lhsExpr = comparisonPredicate.getLeftHandExpression();
-		final var rhsExpr = comparisonPredicate.getRightHandExpression();
-		if ( lhsExpr instanceof ColumnReference lhsColumnRef
-				&& rhsExpr instanceof ColumnReference rhsColumnRef ) {
+		if ( predicate instanceof ComparisonPredicate comparisonPredicate
+				&& comparisonPredicate.getOperator() == ComparisonOperator.EQUAL
+				&& comparisonPredicate.getLeftHandExpression() instanceof ColumnReference lhsColumnRef
+				&& comparisonPredicate.getRightHandExpression() instanceof ColumnReference rhsColumnRef ) {
 			final String lhs = lhsColumnRef.getColumnExpression();
 			final String rhs = rhsColumnRef.getColumnExpression();
 			final String keyExpression = keySide.getModelPart().getSelectionExpression();
@@ -440,9 +433,7 @@ public boolean isSimpleJoinPredicate(Predicate predicate) {
 			return lhs.equals( keyExpression ) && rhs.equals( targetExpression )
 				|| lhs.equals( targetExpression ) && rhs.equals( keyExpression );
 		}
-		else {
-			return false;
-		}
+		return false;
 	}
 
 	@Override
@@ -500,7 +491,8 @@ public Object getAssociationKeyFromSide(
 		}
 		final var modelPart = side.getModelPart();
 		if ( modelPart.isEntityIdentifierMapping() ) {
-			return ( (EntityIdentifierMapping) modelPart ).getIdentifierIfNotUnsaved( targetObject, session );
+			return ( (EntityIdentifierMapping) modelPart )
+					.getIdentifierIfNotUnsaved( targetObject, session );
 		}
 
 		if ( lazyInitializer == null && isPersistentAttributeInterceptable( targetObject ) ) {
@@ -511,7 +503,8 @@ public Object getAssociationKeyFromSide(
 			}
 		}
 
-		return ( (PropertyBasedMapping) modelPart ).getPropertyAccess().getGetter().get( targetObject );
+		return ( (PropertyBasedMapping) modelPart )
+				.getPropertyAccess().getGetter().get( targetObject );
 	}
 
 	@Override
@@ -605,6 +598,16 @@ public String getSelectionExpression() {
 		return keySide.getModelPart().getSelectionExpression();
 	}
 
+	@Override
+	public String getSelectableName() {
+		return keySide.getModelPart().getSelectableName();
+	}
+
+	@Override
+	public SelectablePath getSelectablePath() {
+		return keySide.getModelPart().getSelectablePath();
+	}
+
 	@Override
 	public SelectableMapping getSelectable(int columnIndex) {
 		return keySide.getModelPart();
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java
index 555117bf9d97..b53d6688ea4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java
@@ -10,6 +10,7 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.HibernateException;
 import org.hibernate.cache.MutableCacheKeyBuilder;
 import org.hibernate.dialect.Dialect;
@@ -34,7 +35,6 @@
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.supportsSqlArrayType;
 
@@ -42,10 +42,9 @@
  * Single-attribute NaturalIdMapping implementation
  */
 public class SimpleNaturalIdMapping extends AbstractNaturalIdMapping
-		implements JavaType.CoercionContext, BasicValuedMapping {
+		implements BasicValuedMapping {
 	private final SingularAttributeMapping attribute;
 	private final SessionFactoryImplementor sessionFactory;
-	private final TypeConfiguration typeConfiguration;
 
 	public SimpleNaturalIdMapping(
 			SingularAttributeMapping attribute,
@@ -54,7 +53,6 @@ public SimpleNaturalIdMapping(
 		super( declaringType, attribute.getAttributeMetadata().isUpdatable() );
 		this.attribute = attribute;
 		this.sessionFactory = creationProcess.getCreationContext().getSessionFactory();
-		this.typeConfiguration = creationProcess.getCreationContext().getTypeConfiguration();
 	}
 
 	public SingularAttributeMapping getAttribute() {
@@ -106,19 +104,24 @@ public Object extractNaturalIdFromEntity(Object entity) {
 		return attribute.getPropertyAccess().getGetter().get( entity );
 	}
 
+	@Override
+	public boolean isNormalized(Object incoming) {
+		return incoming == null || getJavaType().getJavaTypeClass().isInstance( incoming );
+	}
+
 	@Override
 	public void validateInternalForm(Object naturalIdValue) {
 		if ( naturalIdValue != null ) {
 			final var naturalIdValueClass = naturalIdValue.getClass();
+			// be flexible - allow a single-valued array
 			if ( naturalIdValueClass.isArray() && !naturalIdValueClass.getComponentType().isPrimitive() ) {
-				// be flexible
 				final var values = (Object[]) naturalIdValue;
 				if ( values.length == 1 ) {
 					naturalIdValue = values[0];
 				}
 			}
 
-			if ( !getJavaType().getJavaTypeClass().isInstance( naturalIdValue ) ) {
+			if ( !getJavaType().isInstance( naturalIdValue ) ) {
 				throw new IllegalArgumentException(
 						String.format(
 								Locale.ROOT,
@@ -143,10 +146,12 @@ public Object normalizeInput(Object incoming) {
 		final Object normalizedValue = normalizedValue( incoming );
 		return isLoadByIdComplianceEnabled()
 				? normalizedValue
-				: getJavaType().coerce( normalizedValue, this );
+				: getJavaType().coerce( normalizedValue );
 	}
 
 	private Object normalizedValue(Object incoming) {
+		sessionFactory.getStatistics().normalizeNaturalId( getDeclaringType().getEntityName() );
+
 		if ( incoming instanceof Map<?,?> valueMap ) {
 			assert valueMap.size() == 1;
 			assert valueMap.containsKey( getAttribute().getAttributeName() );
@@ -170,6 +175,12 @@ public List<SingularAttributeMapping> getNaturalIdAttributes() {
 		return Collections.singletonList( attribute );
 	}
 
+	@Override
+	@Nullable
+	public Class<?> getNaturalIdClass() {
+		return null;
+	}
+
 	@Override
 	public MappingType getPartMappingType() {
 		return attribute.getPartMappingType();
@@ -295,11 +306,6 @@ private Dialect getDialect() {
 		return sessionFactory.getJdbcServices().getDialect();
 	}
 
-	@Override
-	public TypeConfiguration getTypeConfiguration() {
-		return typeConfiguration;
-	}
-
 	@Override
 	public AttributeMapping asAttributeMapping() {
 		return getAttribute();
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SoftDeleteMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SoftDeleteMappingImpl.java
index 0c78976e3a6d..047f31c48bc3 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SoftDeleteMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SoftDeleteMappingImpl.java
@@ -7,6 +7,7 @@
 import org.hibernate.annotations.SoftDeleteType;
 import org.hibernate.cache.MutableCacheKeyBuilder;
 import org.hibernate.dialect.function.CurrentFunction;
+import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.IndexedConsumer;
 import org.hibernate.mapping.BasicValue;
@@ -14,16 +15,25 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.MappingType;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.SoftDeletableModelPart;
 import org.hibernate.metamodel.mapping.SoftDeleteMapping;
 import org.hibernate.metamodel.model.domain.NavigableRole;
+import org.hibernate.persister.entity.EntityNameUse;
+import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression;
 import org.hibernate.spi.NavigablePath;
+import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator;
+import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.JdbcLiteral;
+import org.hibernate.sql.ast.tree.from.LazyTableGroup;
+import org.hibernate.sql.ast.tree.from.NamedTableReference;
+import org.hibernate.sql.ast.tree.from.StandardTableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
 import org.hibernate.sql.ast.tree.predicate.NullnessPredicate;
@@ -31,6 +41,8 @@
 import org.hibernate.sql.ast.tree.update.Assignment;
 import org.hibernate.sql.model.ast.ColumnValueBinding;
 import org.hibernate.sql.model.ast.ColumnWriteFragment;
+import org.hibernate.sql.model.ast.builder.MutationGroupBuilder;
+import org.hibernate.sql.model.ast.builder.TableInsertBuilder;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
@@ -40,6 +52,8 @@
 
 import java.time.Instant;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import static java.util.Collections.emptyList;
 import static org.hibernate.query.sqm.ComparisonOperator.EQUAL;
@@ -351,6 +365,90 @@ public EntityMappingType findContainingEntityMapping() {
 		return softDeletable.findContainingEntityMapping();
 	}
 
+	@Override
+	public void addToInsertGroup(MutationGroupBuilder insertGroupBuilder, EntityPersister persister) {
+		final TableInsertBuilder insertBuilder =
+				insertGroupBuilder.getTableDetailsBuilder( persister.getIdentifierTableName() );
+		insertBuilder.addValueColumn( createNonDeletedValueBinding(
+				new ColumnReference( insertBuilder.getMutatingTable(), this ) ) );
+	}
+
+	@Override
+	public void applyPredicate(
+			EntityMappingType associatedEntityMappingType,
+			Consumer<Predicate> predicateConsumer,
+			LazyTableGroup lazyTableGroup,
+			NavigablePath navigablePath,
+			SqlAstCreationState creationState) {
+		// add the restriction
+		final var tableReference =
+				lazyTableGroup.resolveTableReference( navigablePath,
+						associatedEntityMappingType.getSoftDeleteTableDetails().getTableName() );
+		predicateConsumer.accept( createNonDeletedRestriction( tableReference,
+				creationState.getSqlExpressionResolver() ) );
+	}
+
+	@Override
+	public void applyPredicate(
+			EntityMappingType associatedEntityDescriptor,
+			Consumer<Predicate> predicateConsumer,
+			TableGroup tableGroup,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
+			LoadQueryInfluencers influencers) {
+		final String primaryTableName =
+				associatedEntityDescriptor.getSoftDeleteTableDetails().getTableName();
+		predicateConsumer.accept( createNonDeletedRestriction(
+				tableGroup.resolveTableReference( primaryTableName ) ) );
+	}
+
+	@Override
+	public void applyPredicate(
+			PluralAttributeMapping associatedEntityDescriptor,
+			Consumer<Predicate> predicateConsumer,
+			TableGroup tableGroup,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
+			LoadQueryInfluencers influencers) {
+		predicateConsumer.accept( createNonDeletedRestriction(
+				tableGroup.resolveTableReference( getTableName() ) ) );
+	}
+
+	@Override
+	public void applyPredicate(TableGroupJoin tableGroupJoin, LoadQueryInfluencers loadQueryInfluencers) {
+		tableGroupJoin.applyPredicate( createNonDeletedRestriction(
+				tableGroupJoin.getJoinedGroup().resolveTableReference( getTableName() )
+		) );
+	}
+
+	@Override
+	public void applyPredicate(
+			Supplier<Consumer<Predicate>> predicateCollector,
+			SqlAstCreationState creationState,
+			StandardTableGroup tableGroup,
+			NamedTableReference rootTableReference,
+			EntityMappingType entityMappingType) {
+		final var tableReference =
+				tableGroup.resolveTableReference( getTableName() );
+		final var softDeletePredicate =
+				createNonDeletedRestriction( tableReference,
+						creationState.getSqlExpressionResolver() );
+		predicateCollector.get().accept( softDeletePredicate );
+		if ( tableReference != rootTableReference && creationState.supportsEntityNameUsage() ) {
+			// Register entity name usage for the hierarchy root table to avoid pruning
+			creationState.registerEntityNameUsage( tableGroup, EntityNameUse.EXPRESSION,
+					entityMappingType.getRootEntityDescriptor().getEntityName() );
+		}
+	}
+
+	@Override
+	public boolean useAuxiliaryTable(LoadQueryInfluencers influencers) {
+		return false;
+	}
+
+	@Override
+	public boolean isAffectedByInfluencers(LoadQueryInfluencers influencers) {
+		return false;
+	}
+
 	@Override
 	public String toString() {
 		return "SoftDeleteMapping(" + tableName + "." + columnName + ")";
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/TemporalMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/TemporalMappingImpl.java
new file mode 100644
index 000000000000..13bd9cf0d6dc
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/TemporalMappingImpl.java
@@ -0,0 +1,361 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.metamodel.mapping.internal;
+
+import org.hibernate.temporal.TemporalTableStrategy;
+import org.hibernate.engine.spi.LoadQueryInfluencers;
+import org.hibernate.mapping.BasicValue;
+import org.hibernate.mapping.Stateful;
+import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.metamodel.mapping.JdbcMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.persister.entity.EntityNameUse;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.spi.NavigablePath;
+import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator;
+import org.hibernate.sql.ast.spi.SqlAstCreationState;
+import org.hibernate.sql.ast.spi.SqlExpressionResolver;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.sql.ast.tree.expression.SelfRenderingSqlFragmentExpression;
+import org.hibernate.sql.ast.tree.from.LazyTableGroup;
+import org.hibernate.sql.ast.tree.from.NamedTableReference;
+import org.hibernate.sql.ast.tree.from.StandardTableGroup;
+import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.ast.tree.from.TableGroupJoin;
+import org.hibernate.sql.ast.tree.from.TableReference;
+import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
+import org.hibernate.sql.ast.tree.predicate.Junction;
+import org.hibernate.sql.ast.tree.predicate.NullnessPredicate;
+import org.hibernate.sql.ast.tree.predicate.Predicate;
+import org.hibernate.sql.model.ast.ColumnValueBinding;
+import org.hibernate.sql.model.ast.ColumnValueParameter;
+import org.hibernate.sql.model.ast.ColumnWriteFragment;
+import org.hibernate.sql.exec.internal.TemporalJdbcParameter;
+import org.hibernate.sql.model.ast.builder.MutationGroupBuilder;
+import org.hibernate.sql.model.ast.builder.TableInsertBuilder;
+
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import static java.util.Collections.emptyList;
+import static org.hibernate.boot.model.internal.TemporalHelper.ROW_END;
+import static org.hibernate.boot.model.internal.TemporalHelper.ROW_START;
+import static org.hibernate.query.sqm.ComparisonOperator.GREATER_THAN;
+import static org.hibernate.query.sqm.ComparisonOperator.LESS_THAN_OR_EQUAL;
+
+/**
+ * Temporal mapping implementation.
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+public class TemporalMappingImpl implements TemporalMapping {
+	private final String tableName;
+	private final SelectableMapping startingColumnMapping;
+	private final SelectableMapping endingColumnMapping;
+	private final JdbcMapping jdbcMapping;
+	private final String currentTimestampFunctionName;
+	private final Expression currentTimestampExpression;
+	private final TemporalTableStrategy temporalTableStrategy;
+
+	public TemporalMappingImpl(
+			Stateful bootMapping,
+			String tableName,
+			MappingModelCreationProcess creationProcess) {
+		this.tableName = tableName;
+
+		final var creationContext = creationProcess.getCreationContext();
+		temporalTableStrategy =
+				creationContext.getSessionFactoryOptions()
+						.getTemporalTableStrategy();
+
+		final var startingColumn = bootMapping.getAuxiliaryColumn( ROW_START );
+		final var endingColumn = bootMapping.getAuxiliaryColumn( ROW_END );
+		final var startingValue = (BasicValue) startingColumn.getValue();
+		final var endingValue = (BasicValue) endingColumn.getValue();
+
+		final var startingResolution = startingValue.resolve();
+		final var endingResolution = endingValue.resolve();
+
+		jdbcMapping = startingResolution.getJdbcMapping();
+		if ( jdbcMapping != endingResolution.getJdbcMapping() ) {
+			throw new IllegalStateException( "Temporal starting and ending columns must use the same JDBC mapping" );
+		}
+
+		final var typeConfiguration = creationContext.getTypeConfiguration();
+		final var dialect = creationContext.getDialect();
+		final var sessionFactory = creationContext.getSessionFactory();
+		final var sqmFunctionRegistry = sessionFactory.getQueryEngine().getSqmFunctionRegistry();
+
+		startingColumnMapping = SelectableMappingImpl.from(
+				tableName,
+				startingColumn,
+				null,
+				null,
+				jdbcMapping,
+				typeConfiguration,
+				true,
+				false,
+				false,
+				false,
+				dialect,
+				sqmFunctionRegistry,
+				creationContext
+		);
+		endingColumnMapping = SelectableMappingImpl.from(
+				tableName,
+				endingColumn,
+				null,
+				null,
+				jdbcMapping,
+				typeConfiguration,
+				true,
+				true,
+				false,
+				false,
+				dialect,
+				sqmFunctionRegistry,
+				creationContext
+		);
+
+		if ( sessionFactory.getTransactionIdentifierService().useServerTimestamp( dialect ) ) {
+			currentTimestampFunctionName = dialect.currentTimestamp();
+			currentTimestampExpression =
+					new SelfRenderingSqlFragmentExpression( currentTimestampFunctionName, jdbcMapping );
+		}
+		else {
+			currentTimestampFunctionName = null;
+			currentTimestampExpression = null;
+		}
+	}
+
+	@Override
+	public String getTableName() {
+		return tableName;
+	}
+
+	@Override
+	public SelectableMapping getStartingColumnMapping() {
+		return startingColumnMapping;
+	}
+
+	@Override
+	public SelectableMapping getEndingColumnMapping() {
+		return endingColumnMapping;
+	}
+
+	@Override
+	public JdbcMapping getJdbcMapping() {
+		return jdbcMapping;
+	}
+
+	private Predicate createCurrentRestriction(TableReference tableReference) {
+		return createCurrentRestriction( tableReference, null );
+	}
+
+	private Predicate createCurrentRestriction(TableReference tableReference, SqlExpressionResolver expressionResolver) {
+		final var endingColumn = resolveColumn( tableReference, expressionResolver, endingColumnMapping );
+		return new NullnessPredicate( endingColumn, false, jdbcMapping );
+	}
+
+	private Predicate createRestriction(TableReference tableReference, Object temporalValue) {
+		return createRestriction( tableReference, null, temporalValue );
+	}
+
+	private Predicate createRestriction(
+			TableReference tableReference,
+			SqlExpressionResolver expressionResolver,
+			Object temporalValue) {
+		final var startingColumn = resolveColumn( tableReference, expressionResolver, startingColumnMapping );
+		final var endingColumn = resolveColumn( tableReference, expressionResolver, endingColumnMapping );
+
+		final Expression startingTemporalValue;
+		final Expression endingTemporalValue;
+		if ( currentTimestampExpression == null || temporalValue != null ) {
+			startingTemporalValue = new TemporalJdbcParameter( startingColumnMapping );
+			endingTemporalValue = new TemporalJdbcParameter( endingColumnMapping );
+		}
+		else {
+			startingTemporalValue = currentTimestampExpression;
+			endingTemporalValue = currentTimestampExpression;
+		}
+
+		final var startingPredicate = new ComparisonPredicate( startingColumn, LESS_THAN_OR_EQUAL, startingTemporalValue );
+		final var endingNullPredicate = new NullnessPredicate( endingColumn, false, jdbcMapping );
+		final var endingAfterPredicate = new ComparisonPredicate( endingColumn, GREATER_THAN, endingTemporalValue );
+
+		final var endingPredicate = new Junction( Junction.Nature.DISJUNCTION );
+		endingPredicate.add( endingNullPredicate );
+		endingPredicate.add( endingAfterPredicate );
+
+		final var predicate = new Junction( Junction.Nature.CONJUNCTION );
+		predicate.add( startingPredicate );
+		predicate.add( endingPredicate );
+
+		return predicate;
+	}
+
+	@Override
+	public ColumnValueBinding createStartingValueBinding(ColumnReference startingColumnReference) {
+		return createTemporalValueBinding( startingColumnReference, startingColumnMapping );
+	}
+
+	@Override
+	public ColumnValueBinding createEndingValueBinding(ColumnReference endingColumnReference) {
+		return createTemporalValueBinding( endingColumnReference, endingColumnMapping );
+	}
+
+	private ColumnValueBinding createTemporalValueBinding(
+			ColumnReference endingColumnReference, SelectableMapping columnMapping) {
+		return new ColumnValueBinding( endingColumnReference,
+				currentTimestampFunctionName != null
+						? new ColumnWriteFragment( currentTimestampFunctionName, emptyList(), columnMapping )
+						: new ColumnWriteFragment( "?",
+								new ColumnValueParameter( endingColumnReference ),
+								columnMapping ) );
+	}
+
+	@Override
+	public ColumnValueBinding createNullEndingValueBinding(ColumnReference endingColumnReference) {
+		return new ColumnValueBinding( endingColumnReference,
+				new ColumnWriteFragment( null, emptyList(), endingColumnMapping ) );
+	}
+
+	private Expression resolveColumn(
+			TableReference tableReference,
+			SqlExpressionResolver expressionResolver,
+			SelectableMapping selectableMapping) {
+		return expressionResolver != null
+				? expressionResolver.resolveSqlExpression( tableReference, selectableMapping )
+				: new ColumnReference( tableReference, selectableMapping );
+	}
+
+	@Override
+	public void addToInsertGroup(MutationGroupBuilder insertGroupBuilder, EntityPersister persister) {
+		if ( temporalTableStrategy == TemporalTableStrategy.SINGLE_TABLE ) {
+			final TableInsertBuilder insertBuilder =
+					insertGroupBuilder.getTableDetailsBuilder( persister.getIdentifierTableName() );
+			final var mutatingTable = insertBuilder.getMutatingTable();
+
+			final var startingColumn = new ColumnReference( mutatingTable, getStartingColumnMapping() );
+			insertBuilder.addValueColumn( createStartingValueBinding( startingColumn ) );
+
+			final var endingColumn = new ColumnReference( mutatingTable, getEndingColumnMapping() );
+			insertBuilder.addValueColumn( createNullEndingValueBinding( endingColumn ) );
+		}
+	}
+
+	@Override
+	public void applyPredicate(
+			EntityMappingType associatedEntityMappingType,
+			Consumer<Predicate> predicateConsumer,
+			LazyTableGroup lazyTableGroup,
+			NavigablePath navigablePath,
+			SqlAstCreationState creationState) {
+		if ( useTemporalRestriction( creationState ) ) {
+			final var tableReference = lazyTableGroup.resolveTableReference( navigablePath, getTableName() );
+			final var temporalInstant = creationState.getLoadQueryInfluencers().getTemporalIdentifier();
+			final var resolver = creationState.getSqlExpressionResolver();
+			final var temporalPredicate =
+					temporalInstant == null
+							? createCurrentRestriction( tableReference, resolver )
+							: createRestriction( tableReference, resolver, temporalInstant );
+			predicateConsumer.accept( temporalPredicate );
+		}
+	}
+
+	@Override
+	public void applyPredicate(
+			EntityMappingType associatedEntityDescriptor,
+			Consumer<Predicate> predicateConsumer,
+			TableGroup tableGroup,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
+			LoadQueryInfluencers influencers) {
+		if ( useTemporalRestriction( influencers ) ) {
+			final var instant = influencers.getTemporalIdentifier();
+			final var primaryTableReference =
+					tableGroup.resolveTableReference( getTableName() );
+			predicateConsumer.accept( instant == null
+					? createCurrentRestriction( primaryTableReference )
+					: createRestriction( primaryTableReference, instant ) );
+		}
+	}
+
+	@Override
+	public void applyPredicate(
+			PluralAttributeMapping associatedEntityDescriptor,
+			Consumer<Predicate> predicateConsumer,
+			TableGroup tableGroup,
+			SqlAliasBaseGenerator sqlAliasBaseGenerator,
+			LoadQueryInfluencers influencers) {
+		if ( useTemporalRestriction( influencers ) ) {
+			final var instant = influencers.getTemporalIdentifier();
+			final var tableReference = tableGroup.resolveTableReference( getTableName() );
+			predicateConsumer.accept( instant == null
+					? createCurrentRestriction( tableReference )
+					: createRestriction( tableReference, instant ) );
+		}
+	}
+
+	@Override
+	public void applyPredicate(TableGroupJoin tableGroupJoin, LoadQueryInfluencers loadQueryInfluencers) {
+		if ( useTemporalRestriction( loadQueryInfluencers ) ) {
+			final var temporalInstant = loadQueryInfluencers.getTemporalIdentifier();
+			final var tableReference = tableGroupJoin.getJoinedGroup().resolveTableReference( getTableName() );
+			tableGroupJoin.applyPredicate( temporalInstant == null
+					? createCurrentRestriction( tableReference )
+					: createRestriction( tableReference, temporalInstant ) );
+		}
+	}
+
+	@Override
+	public void applyPredicate(
+			Supplier<Consumer<Predicate>> predicateCollector,
+			SqlAstCreationState creationState,
+			StandardTableGroup tableGroup,
+			NamedTableReference rootTableReference,
+			EntityMappingType entityMappingType) {
+		if ( useTemporalRestriction( creationState ) ) {
+			final var tableReference =
+					tableGroup.resolveTableReference( getTableName() );
+			final var temporalInstant =
+					creationState.getLoadQueryInfluencers().getTemporalIdentifier();
+			final var resolver = creationState.getSqlExpressionResolver();
+			predicateCollector.get()
+					.accept( temporalInstant == null
+							? createCurrentRestriction( tableReference, resolver )
+							: createRestriction( tableReference, resolver, temporalInstant ) );
+			if ( tableReference != rootTableReference && creationState.supportsEntityNameUsage() ) {
+				creationState.registerEntityNameUsage( tableGroup, EntityNameUse.EXPRESSION,
+						entityMappingType.getRootEntityDescriptor().getEntityName() );
+			}
+		}
+	}
+
+	private static boolean useTemporalRestriction(LoadQueryInfluencers influencers) {
+		return influencers.getSessionFactory().getJdbcServices().getDialect().getTemporalTableSupport()
+				.useTemporalRestriction( influencers );
+	}
+
+	private boolean useTemporalRestriction(SqlAstCreationState creationState) {
+		return creationState.getCreationContext().getDialect().getTemporalTableSupport()
+				.useTemporalRestriction( creationState.getLoadQueryInfluencers() );
+	}
+
+	@Override
+	public boolean useAuxiliaryTable(LoadQueryInfluencers influencers) {
+		return temporalTableStrategy == TemporalTableStrategy.HISTORY_TABLE
+			&& influencers.getTemporalIdentifier() != null;
+	}
+
+	@Override
+	public boolean isAffectedByInfluencers(LoadQueryInfluencers influencers) {
+		return influencers.getTemporalIdentifier() != null;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
index b2dd2b44219a..40a87e91ce82 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
@@ -6,8 +6,10 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.AssertionFailure;
+import org.hibernate.MappingException;
 import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.cache.MutableCacheKeyBuilder;
+import org.hibernate.temporal.TemporalTableStrategy;
 import org.hibernate.engine.FetchStyle;
 import org.hibernate.engine.FetchTiming;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
@@ -18,12 +20,12 @@
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Component;
-import org.hibernate.mapping.Join;
 import org.hibernate.mapping.ManyToOne;
 import org.hibernate.mapping.OneToOne;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.Value;
+import org.hibernate.metamodel.RepresentationMode;
 import org.hibernate.metamodel.UnsupportedMappingException;
 import org.hibernate.metamodel.mapping.AssociationKey;
 import org.hibernate.metamodel.mapping.AttributeMetadata;
@@ -107,6 +109,12 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.createInverseModelPart;
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getTableIdentifierExpression;
+import static org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping.Cardinality.LOGICAL_ONE_TO_ONE;
+import static org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping.Cardinality.MANY_TO_ONE;
+import static org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping.Cardinality.ONE_TO_ONE;
+
 /**
  * @author Steve Ebersole
  */
@@ -168,6 +176,7 @@ public class Entity1 {
 	private boolean canUseParentTableGroup;
 	private @Nullable EmbeddableValuedModelPart circularFetchModelPart;
 
+	private final TemporalTableStrategy temporalTableStrategy;
 	/**
 	 * For Hibernate Reactive
 	 */
@@ -194,7 +203,7 @@ protected ToOneAttributeMapping(ToOneAttributeMapping original) {
 		sideNature = original.sideNature;
 		identifyingColumnsTableExpression = original.identifyingColumnsTableExpression;
 		canUseParentTableGroup = original.canUseParentTableGroup;
-
+		temporalTableStrategy = original.temporalTableStrategy;
 	}
 
 	public ToOneAttributeMapping(
@@ -248,6 +257,32 @@ public ToOneAttributeMapping(
 				declaringType,
 				propertyAccess
 		);
+
+
+		temporalTableStrategy =
+				declaringEntityPersister.getFactory()
+						.getSessionFactoryOptions().getTemporalTableStrategy();
+
+		if ( entityMappingType.getRepresentationStrategy().getMode() == RepresentationMode.POJO ) {
+			// validate the type.
+			var declaredType = propertyAccess.getGetter().getReturnTypeClass();
+			if ( !Object.class.equals( declaredType ) ) {
+				final var targetType = entityMappingType.getMappedJavaType().getJavaTypeClass();
+				if ( !declaredType.isAssignableFrom( targetType ) ) {
+					throw new MappingException(
+							String.format(
+									Locale.ROOT,
+									"To-one mapping [%s.%s] was mapped with targetEntity=`%s`, but the attribute is declared as `%s`",
+									declaringType.getNavigableRole().getFullPath(),
+									name,
+									targetType.getName(),
+									declaredType.getName()
+							)
+					);
+				}
+			}
+		}
+
 		sqlAliasStem = SqlAliasStemHelper.INSTANCE.generateStemFromAttributeName( name );
 		isNullable = bootValue.isNullable();
 		isLazy = navigableRole.getParent().getParent() == null
@@ -265,21 +300,21 @@ public ToOneAttributeMapping(
 		);
 		if ( bootValue instanceof ManyToOne manyToOne ) {
 			notFoundAction = manyToOne.getNotFoundAction();
-			cardinality = manyToOne.isLogicalOneToOne()
-					? Cardinality.LOGICAL_ONE_TO_ONE
-					: Cardinality.MANY_TO_ONE;
+			cardinality =
+					manyToOne.isLogicalOneToOne()
+							? LOGICAL_ONE_TO_ONE
+							: MANY_TO_ONE;
 			final var entityBinding =
-					manyToOne.getMetadata().getEntityBinding( manyToOne.getReferencedEntityName() );
+					manyToOne.getMetadata()
+							.getEntityBinding( manyToOne.getReferencedEntityName() );
 			if ( referencedPropertyName == null ) {
 				SelectablePath bidirectionalAttributeName = null;
-				final String propertyPath =
-						bootValue.getPropertyName() == null
-								? name
-								: bootValue.getPropertyName();
-				if ( cardinality == Cardinality.LOGICAL_ONE_TO_ONE ) {
+				final String propertyName = bootValue.getPropertyName();
+				final String propertyPath = propertyName == null ? name : propertyName;
+				if ( cardinality == LOGICAL_ONE_TO_ONE ) {
 					boolean hasJoinTable = false;
 					// Handle join table cases
-					for ( Join join : entityBinding.getJoinClosure() ) {
+					for ( var join : entityBinding.getJoinClosure() ) {
 						if ( join.getPersistentClass().getEntityName().equals( entityBinding.getEntityName() )
 								&& join.getPropertySpan() == 1
 								&& join.getTable() == manyToOne.getTable()
@@ -304,12 +339,13 @@ && equal( join.getKey(), manyToOne ) ) {
 				}
 				else {
 					this.hasJoinTable = false;
-					bidirectionalAttributeName = findBidirectionalOneToManyAttributeName(
-							propertyPath,
-							declaringType,
-							null,
-							entityBinding.getPropertyClosure()
-					);
+					bidirectionalAttributeName =
+							findBidirectionalOneToManyAttributeName(
+									propertyPath,
+									declaringType,
+									null,
+									entityBinding.getPropertyClosure()
+							);
 				}
 				bidirectionalAttributePath = bidirectionalAttributeName;
 			}
@@ -317,7 +353,7 @@ && equal( join.getKey(), manyToOne ) ) {
 				// Only set the bidirectional attribute name if the referenced property can actually be circular i.e. an entity type
 				final var property = entityBinding.getProperty( referencedPropertyName );
 				hasJoinTable =
-						cardinality == Cardinality.LOGICAL_ONE_TO_ONE
+						cardinality == LOGICAL_ONE_TO_ONE
 								&& property != null
 								&& property.getValue() instanceof ManyToOne manyToOneValue
 								&& manyToOneValue.isLogicalOneToOne();
@@ -331,7 +367,7 @@ && equal( join.getKey(), manyToOne ) ) {
 			}
 			else {
 				final String targetTableName =
-						MappingModelCreationHelper.getTableIdentifierExpression( manyToOne.getTable(),
+						getTableIdentifierExpression( manyToOne.getTable(),
 								declaringEntityPersister.getFactory() );
 				if ( CollectionPart.Nature.fromNameExact( navigableRole.getParent().getLocalName() ) != null ) {
 					// * the to-one's parent is directly a collection element or index
@@ -342,7 +378,9 @@ && equal( join.getKey(), manyToOne ) ) {
 					final var pluralAttribute = (PluralAttributeMapping) declaringEntityPersister.findByPath( path );
 					assert pluralAttribute != null;
 
-					final var persister = (AbstractCollectionPersister) pluralAttribute.getCollectionDescriptor();
+					final var persister =
+							(AbstractCollectionPersister)
+									pluralAttribute.getCollectionDescriptor();
 					isKeyTableNullable = !persister.getTableName().equals( targetTableName );
 				}
 				else {
@@ -358,7 +396,7 @@ && equal( join.getKey(), manyToOne ) ) {
 		}
 		else {
 			assert bootValue instanceof OneToOne;
-			cardinality = Cardinality.ONE_TO_ONE;
+			cardinality = ONE_TO_ONE;
 			hasJoinTable = false;
 
 			/*
@@ -416,16 +454,15 @@ the navigable path is NavigablePath(Card.fields.{element}.{id}.card) and it does
 			isInternalLoadNullable = isNullable();
 		}
 
-		if ( entityMappingType.getSoftDeleteMapping() != null ) {
-			// cannot be lazy
-			if ( getTiming() == FetchTiming.DELAYED ) {
-				throw new UnsupportedMappingException( String.format(
-						Locale.ROOT,
-						"To-one attribute (%s.%s) cannot be mapped as LAZY as its associated entity is defined with @SoftDelete",
-						declaringType.getPartName(),
-						getAttributeName()
-				) );
-			}
+		if ( entityMappingType.getSoftDeleteMapping() != null
+				// cannot be lazy
+				&& getTiming() == FetchTiming.DELAYED ) {
+			throw new UnsupportedMappingException( String.format(
+					Locale.ROOT,
+					"To-one attribute (%s.%s) cannot be mapped as LAZY as its associated entity is defined with @SoftDelete",
+					declaringType.getPartName(),
+					getAttributeName()
+			) );
 		}
 
 		if ( referencedPropertyName == null ) {
@@ -435,12 +472,13 @@ the navigable path is NavigablePath(Card.fields.{element}.{id}.card) and it does
 					bootValue.getBuildingContext().getMetadataCollector()
 							.getEntityBinding( entityMappingType.getEntityName() );
 			final var identifierMapper = entityBinding.getIdentifierMapper();
-			final Type propertyType =
+			final var propertyType =
 					identifierMapper == null
 							? entityBinding.getIdentifier().getType()
 							: identifierMapper.getType();
 			if ( entityBinding.getIdentifierProperty() == null ) {
-				if ( propertyType instanceof ComponentType compositeType && compositeType.isEmbedded()
+				if ( propertyType instanceof ComponentType compositeType
+						&& compositeType.isEmbedded()
 						&& compositeType.getPropertyNames().length == 1 ) {
 					targetKeyPropertyName = compositeType.getPropertyNames()[0];
 					addPrefixedPropertyPaths(
@@ -481,7 +519,9 @@ the navigable path is NavigablePath(Card.fields.{element}.{id}.card) and it does
 			final var entityBinding =
 					bootValue.getBuildingContext().getMetadataCollector()
 							.getEntityBinding( entityMappingType.getEntityName() );
-			final Type propertyType = entityBinding.getRecursiveProperty( referencedPropertyName ).getType();
+			final var propertyType =
+					entityBinding.getRecursiveProperty( referencedPropertyName )
+							.getType();
 			if ( bootValue.isReferenceToPrimaryKey() ) {
 				this.targetKeyPropertyName = referencedPropertyName;
 				final Set<String> targetKeyPropertyNames = new HashSet<>( 3 );
@@ -500,7 +540,8 @@ the navigable path is NavigablePath(Card.fields.{element}.{id}.card) and it does
 				this.targetKeyPropertyNames = targetKeyPropertyNames;
 			}
 			else {
-				if ( propertyType instanceof ComponentType compositeType && compositeType.isEmbedded()
+				if ( propertyType instanceof ComponentType compositeType
+						&& compositeType.isEmbedded()
 						&& compositeType.getPropertyNames().length == 1 ) {
 					final Set<String> targetKeyPropertyNames = new HashSet<>( 2 );
 					this.targetKeyPropertyName = compositeType.getPropertyNames()[0];
@@ -521,13 +562,13 @@ the navigable path is NavigablePath(Card.fields.{element}.{id}.card) and it does
 				else {
 					final Set<String> targetKeyPropertyNames = new HashSet<>( 2 );
 					this.targetKeyPropertyName = referencedPropertyName;
-					final String mapsIdAttributeName;
-					// If there is a "virtual property" for a non-PK join mapping, we try to see if the columns match the
-					// primary key columns and if so, we add the primary key property name as target key property
-					if ( ( mapsIdAttributeName = findMapsIdPropertyName(
-							entityMappingType,
-							referencedPropertyName
-					) ) != null ) {
+					final String mapsIdAttributeName =
+							findMapsIdPropertyName( entityMappingType, referencedPropertyName );
+					// If there is a "virtual property" for a non-PK join mapping,
+					// we try to see if the columns match the primary key columns
+					// and if so, we add the primary key property name as target
+					// key property
+					if ( mapsIdAttributeName != null ) {
 						addPrefixedPropertyPaths(
 								targetKeyPropertyNames,
 								mapsIdAttributeName,
@@ -558,17 +599,18 @@ private static SelectablePath findBidirectionalOneToManyAttributeName(
 			ManagedMappingType declaringType,
 			SelectablePath parentSelectablePath,
 			java.util.Collection<Property> properties) {
-		for ( Property property : properties ) {
-			final Value value = property.getValue();
+		for ( var property : properties ) {
+			final var value = property.getValue();
 			if ( value instanceof Component component ) {
-				final SelectablePath bidirectionalAttributeName = findBidirectionalOneToManyAttributeName(
-						propertyPath,
-						declaringType,
-						parentSelectablePath == null
-								? SelectablePath.parse( property.getName() )
-								: parentSelectablePath.append( property.getName() ),
-						component.getProperties()
-				);
+				final var bidirectionalAttributeName =
+						findBidirectionalOneToManyAttributeName(
+								propertyPath,
+								declaringType,
+								parentSelectablePath == null
+										? SelectablePath.parse( property.getName() )
+										: parentSelectablePath.append( property.getName() ),
+								component.getProperties()
+						);
 				if ( bidirectionalAttributeName != null ) {
 					return bidirectionalAttributeName;
 				}
@@ -591,8 +633,8 @@ private SelectablePath findBidirectionalOneToOneAttributeName(
 			ManagedMappingType declaringType,
 			SelectablePath parentSelectablePath,
 			java.util.Collection<Property> properties) {
-		for ( Property property : properties ) {
-			final Value value = property.getValue();
+		for ( var property : properties ) {
+			final var value = property.getValue();
 			if ( value instanceof Component component ) {
 				final var bidirectionalAttributeName =
 						findBidirectionalOneToOneAttributeName(
@@ -611,7 +653,8 @@ else if ( value instanceof OneToOne oneToOne ) {
 				if ( declaringTableGroupProducer.getNavigableRole().getLocalName()
 								.equals( oneToOne.getReferencedEntityName() )
 						&& propertyPath.equals( oneToOne.getMappedByProperty() )
-						&& oneToOne.getReferencedEntityName().equals( declaringType.getJavaType().getTypeName() ) ) {
+						&& oneToOne.getReferencedEntityName()
+								.equals( declaringType.getJavaType().getTypeName() ) ) {
 					return parentSelectablePath == null
 							? SelectablePath.parse( property.getName() )
 							: parentSelectablePath.append( property.getName() );
@@ -624,13 +667,16 @@ else if ( value instanceof OneToOne oneToOne ) {
 	private static FetchTiming adjustFetchTiming(
 			FetchTiming mappedFetchTiming,
 			ToOne bootValue) {
-		return bootValue instanceof ManyToOne manyToOne && manyToOne.getNotFoundAction() != null
+		return bootValue instanceof ManyToOne manyToOne
+			&& manyToOne.getNotFoundAction() != null
 				? FetchTiming.IMMEDIATE
 				: mappedFetchTiming;
 	}
 
-	private static TableGroupProducer resolveDeclaringTableGroupProducer(EntityPersister declaringEntityPersister, NavigableRole navigableRole) {
-		// Also handle cases where a collection contains an embeddable, that contains an association
+	private static TableGroupProducer resolveDeclaringTableGroupProducer(
+			EntityPersister declaringEntityPersister, NavigableRole navigableRole) {
+		// Also handle cases where a collection contains an embeddable,
+		// that contains an association
 		NavigableRole parentRole = navigableRole.getParent();
 		String collectionRole = null;
 		do {
@@ -682,6 +728,7 @@ private ToOneAttributeMapping(
 		this.bidirectionalAttributePath = original.bidirectionalAttributePath;
 		this.declaringTableGroupProducer = declaringTableGroupProducer;
 		this.isInternalLoadNullable = original.isInternalLoadNullable;
+		this.temporalTableStrategy = original.temporalTableStrategy;
 	}
 
 	private static boolean equal(Value lhsValue, Value rhsValue) {
@@ -704,11 +751,10 @@ private static boolean equal(Value lhsValue, Value rhsValue) {
 
 	static String findMapsIdPropertyName(EntityMappingType entityMappingType, String referencedPropertyName) {
 		final var persister = entityMappingType.getEntityPersister();
-		if ( Arrays.equals( persister.getIdentifierColumnNames(),
-				persister.getPropertyColumnNames( referencedPropertyName ) ) ) {
-			return persister.getIdentifierPropertyName();
-		}
-		return null;
+		return Arrays.equals( persister.getIdentifierColumnNames(),
+					persister.getPropertyColumnNames( referencedPropertyName ) )
+				? persister.getIdentifierPropertyName()
+				: null;
 	}
 
 	public static void addPrefixedPropertyPaths(
@@ -745,26 +791,17 @@ public static void addPrefixedPropertyNames(
 			targetKeyPropertyNames.add( prefix );
 		}
 		if ( type instanceof ComponentType componentType ) {
-			final String[] propertyNames = componentType.getPropertyNames();
-			final Type[] componentTypeSubtypes = componentType.getSubtypes();
+			final var propertyNames = componentType.getPropertyNames();
+			final var componentTypeSubtypes = componentType.getSubtypes();
 			for ( int i = 0, propertyNamesLength = propertyNames.length; i < propertyNamesLength; i++ ) {
 				final String newPrefix = prefix == null ? propertyNames[i] : prefix + "." + propertyNames[i];
 				addPrefixedPropertyNames( targetKeyPropertyNames, newPrefix, componentTypeSubtypes[i], factory );
 			}
 		}
 		else if ( type instanceof EntityType entityType ) {
-			final Type identifierOrUniqueKeyType =
+			final var identifierOrUniqueKeyType =
 					entityType.getIdentifierOrUniqueKeyType( factory.getRuntimeMetamodels() );
-			final String propertyName;
-			if ( entityType.isReferenceToPrimaryKey() ) {
-				propertyName = entityType.getAssociatedEntityPersister( factory ).getIdentifierPropertyName();
-			}
-			else if ( identifierOrUniqueKeyType instanceof EmbeddedComponentType ) {
-				propertyName = null;
-			}
-			else {
-				propertyName = entityType.getRHSUniqueKeyPropertyName();
-			}
+			final String propertyName = propertyName( factory, entityType, identifierOrUniqueKeyType );
 			final String newPrefix;
 			final String newPkPrefix;
 			final String newFkPrefix;
@@ -803,6 +840,18 @@ else if ( propertyName == null ) {
 		}
 	}
 
+	private static @Nullable String propertyName(SessionFactoryImplementor factory, EntityType entityType, Type identifierOrUniqueKeyType) {
+		if ( entityType.isReferenceToPrimaryKey() ) {
+			return entityType.getAssociatedEntityPersister( factory ).getIdentifierPropertyName();
+		}
+		else if ( identifierOrUniqueKeyType instanceof EmbeddedComponentType ) {
+			return null;
+		}
+		else {
+			return entityType.getRHSUniqueKeyPropertyName();
+		}
+	}
+
 	public ToOneAttributeMapping copy(ManagedMappingType declaringType, TableGroupProducer declaringTableGroupProducer) {
 		return new ToOneAttributeMapping( this, declaringType, declaringTableGroupProducer );
 	}
@@ -811,7 +860,7 @@ public ToOneAttributeMapping copy(ManagedMappingType declaringType, TableGroupPr
 	public void setForeignKeyDescriptor(ForeignKeyDescriptor foreignKeyDescriptor) {
 		assert identifyingColumnsTableExpression != null;
 		this.foreignKeyDescriptor = foreignKeyDescriptor;
-		if ( cardinality == Cardinality.ONE_TO_ONE && bidirectionalAttributePath != null ) {
+		if ( cardinality == ONE_TO_ONE && bidirectionalAttributePath != null ) {
 			sideNature = ForeignKeyDescriptor.Nature.TARGET;
 		}
 		else {
@@ -827,7 +876,7 @@ public void setForeignKeyDescriptor(ForeignKeyDescriptor foreignKeyDescriptor) {
 		// Otherwise we need to join to the associated entity table(s)
 		final boolean forceJoin = hasNotFoundAction()
 				|| entityMappingType.getSoftDeleteMapping() != null
-				|| ( cardinality == Cardinality.ONE_TO_ONE && isNullable() );
+				|| cardinality == ONE_TO_ONE && isNullable();
 		canUseParentTableGroup = ! forceJoin
 				&& sideNature == ForeignKeyDescriptor.Nature.KEY
 				&& declaringTableGroupProducer.containsTableReference( identifyingColumnsTableExpression );
@@ -842,7 +891,7 @@ && getAssociatedEntityMappingType().getIdentifierMapping()
 			// This is needed if the association entity nests the "inverse" toOne association in the embedded id,
 			// because then, the key part of the foreign key is just a simple value instead of the expected embedded id
 			// when doing delayed creation/querying of target entities. See HHH-19687 for details
-			circularFetchModelPart = MappingModelCreationHelper.createInverseModelPart(
+			circularFetchModelPart = createInverseModelPart(
 					identifierMapping,
 					getDeclaringType(),
 					this,
@@ -938,12 +987,13 @@ public ModelPart findSubPart(String name, EntityMappingType targetType) {
 					sideNature == ForeignKeyDescriptor.Nature.KEY
 							? foreignKeyDescriptor.getKeyPart()
 							: foreignKeyDescriptor.getTargetPart();
-			if ( fkPart instanceof EmbeddableValuedModelPart && fkPart instanceof VirtualModelPart
+			if ( fkPart instanceof EmbeddableValuedModelPart modelPart
+					&& fkPart instanceof VirtualModelPart
 					&& !EntityIdentifierMapping.ID_ROLE_NAME.equals( name )
 					&& !ForeignKeyDescriptor.PART_NAME.equals( name )
 					&& !ForeignKeyDescriptor.TARGET_PART_NAME.equals( name )
 					&& !fkPart.getPartName().equals( name ) ) {
-				return ( (ModelPartContainer) fkPart ).findSubPart( name, targetType );
+				return modelPart.findSubPart( name, targetType );
 			}
 			return fkPart;
 		}
@@ -964,8 +1014,18 @@ public Fetch resolveCircularFetch(
 				// then there can't be a circular fetch
 				return null;
 			}
+			final var fetchParentNavigablePath = fetchParent.getNavigablePath();
 			var parentNavigablePath = fetchablePath.getParent();
-			assert parentNavigablePath.equals( fetchParent.getNavigablePath() );
+			assert parentNavigablePath.equals( fetchParentNavigablePath )
+				|| fetchParentNavigablePath instanceof TreatedNavigablePath
+						&& parentNavigablePath.equals( fetchParentNavigablePath.getRealParent() );
+			if ( fetchParentNavigablePath instanceof TreatedNavigablePath
+					&& parentNavigablePath.equals( fetchParentNavigablePath.getRealParent() ) ) {
+				// Children of treated paths report the untreated path as their parent.
+				// For circular-fetch resolution we need the actual treated fetch-parent path,
+				// otherwise bidirectional checks compare against the wrong navigable path.
+				parentNavigablePath = fetchParentNavigablePath;
+			}
 			// The parent navigable path is {fk} if we are creating the domain result for the foreign key for a circular fetch
 			// In the following example, we create a circular fetch for the composite `Card.field.{id}.card.field`
 			// While creating the domain result for the foreign key of `Card#field`, we run into this condition
@@ -992,8 +1052,9 @@ public class PrimaryKey {
 					private Key key;
 				}
 			 */
-			if ( parentNavigablePath.getLocalName().equals( ForeignKeyDescriptor.PART_NAME )
-					|| parentNavigablePath.getLocalName().equals( ForeignKeyDescriptor.TARGET_PART_NAME ) ) {
+			final String localName = parentNavigablePath.getLocalName();
+			if ( localName.equals( ForeignKeyDescriptor.PART_NAME )
+				|| localName.equals( ForeignKeyDescriptor.TARGET_PART_NAME ) ) {
 				// todo (6.0): maybe it's better to have a flag in creation state that marks if we are building a circular fetch domain result already to skip this?
 				return null;
 			}
@@ -1061,7 +1122,8 @@ private DomainResult<?> determineCircularKeyResult(
 			if ( circularFetchModelPart != null ) {
 				return circularFetchModelPart.createDomainResult(
 						fetchablePath,
-						createTableGroupForDelayedFetch( fetchablePath, parentTableGroup, null, creationState ),
+						createTableGroupForDelayedFetch( fetchablePath,
+								parentTableGroup, null, creationState ),
 						null,
 						creationState
 				);
@@ -1069,7 +1131,8 @@ private DomainResult<?> determineCircularKeyResult(
 			else if ( sideNature == ForeignKeyDescriptor.Nature.KEY ) {
 				return foreignKeyDescriptor.createKeyDomainResult(
 						fetchablePath,
-						createTableGroupForDelayedFetch( fetchablePath, parentTableGroup, null, creationState ),
+						createTableGroupForDelayedFetch( fetchablePath,
+								parentTableGroup, null, creationState ),
 						fetchParent,
 						creationState
 				);
@@ -1166,7 +1229,7 @@ class EmbeddableB {
 			 */
 			return false;
 		}
-		else if ( cardinality == Cardinality.MANY_TO_ONE ) {
+		else if ( cardinality == MANY_TO_ONE ) {
 			/*
 				class Child {
 					@OneToOne(mappedBy = "biologicalChild")
@@ -1189,19 +1252,19 @@ class Mother {
 				final var parentPath = grandparentNavigablePath.getParent();
 				// This can be null for a collection loader
 				if ( parentPath == null ) {
-					return grandparentNavigablePath.getFullPath().equals(
-							entityMappingType.findByPath( bidirectionalAttributePath ).getNavigableRole().getFullPath()
-					);
+					return grandparentNavigablePath.getFullPath()
+							.equals( entityMappingType.findByPath( bidirectionalAttributePath )
+									.getNavigableRole().getFullPath() );
 				}
 				else {
 					// If the parent is null, this is a simple collection fetch of a root, in which case the types must match
 					if ( parentPath.getParent() == null ) {
 						final String entityName = entityMappingType.getPartName();
-						return parentPath.getFullPath().startsWith( entityName ) && (
-								parentPath.getFullPath().length() == entityName.length()
-										// Ignore a possible alias
-										|| parentPath.getFullPath().charAt( entityName.length() ) == '('
-						);
+						final String fullPath = parentPath.getFullPath();
+						return fullPath.startsWith( entityName )
+							&& ( fullPath.length() == entityName.length()
+								// Ignore a possible alias
+								|| fullPath.charAt( entityName.length() ) == '(');
 					}
 					// If we have a parent, we ensure that the parent is the same as the attribute name
 					else {
@@ -1227,7 +1290,7 @@ class Mother {
 
 	private boolean isParentEmbeddedCollectionPart(DomainResultCreationState creationState, NavigablePath parentNavigablePath) {
 		while ( parentNavigablePath != null ) {
-			final ModelPart parentModelPart = creationState.resolveModelPart( parentNavigablePath );
+			final var parentModelPart = creationState.resolveModelPart( parentNavigablePath );
 			if ( parentModelPart instanceof EmbeddedCollectionPart ) {
 				return true;
 			}
@@ -1361,7 +1424,8 @@ else if ( CollectionPart.Nature.fromNameExact( parentNavigablePath.getLocalName(
 				);
 			}
 
-			if ( entityMappingType.isConcreteProxy() && sideNature == ForeignKeyDescriptor.Nature.TARGET ) {
+			if ( entityMappingType.isConcreteProxy()
+					&& sideNature == ForeignKeyDescriptor.Nature.TARGET ) {
 				createTableGroupForDelayedFetch( fetchablePath, parentTableGroup, null, creationState );
 			}
 
@@ -1444,7 +1508,9 @@ private NavigablePath getReferencedNavigablePath(
 			DomainResultCreationState creationState,
 			NavigablePath parentNavigablePath) {
 		NavigablePath referencedNavigablePath = parentNavigablePath.getParent();
-		MappingType partMappingType = creationState.resolveModelPart( referencedNavigablePath ).getPartMappingType();
+		MappingType partMappingType =
+				creationState.resolveModelPart( referencedNavigablePath )
+						.getPartMappingType();
 
 		/*
 				class LineItem {
@@ -1500,13 +1566,17 @@ class Level3 {
 		 */
 		while ( !( partMappingType instanceof EntityMappingType entityMapping )
 				|| ( partMappingType != entityMappingType
-				&& !entityMappingType.getEntityPersister().isSubclassEntityName( partMappingType.getMappedJavaType().getTypeName() )
-				&& !entityMapping.getEntityPersister().isSubclassEntityName( entityMappingType.getEntityName() ) ) ) {
+					&& !entityMappingType.getEntityPersister()
+							.isSubclassEntityName( partMappingType.getMappedJavaType().getTypeName() )
+					&& !entityMapping.getEntityPersister()
+							.isSubclassEntityName( entityMappingType.getEntityName() ) ) ) {
 			referencedNavigablePath = referencedNavigablePath.getParent();
 			if ( referencedNavigablePath == null ) {
 				return null;
 			}
-			partMappingType = creationState.resolveModelPart( referencedNavigablePath ).getPartMappingType();
+			partMappingType =
+					creationState.resolveModelPart( referencedNavigablePath )
+							.getPartMappingType();
 		}
 		return referencedNavigablePath;
 	}
@@ -1523,12 +1593,13 @@ public EntityFetch generateFetch(
 		final var sqlAstCreationState = creationState.getSqlAstCreationState();
 		final var fromClauseAccess = sqlAstCreationState.getFromClauseAccess();
 
-		final var parentTableGroup = fromClauseAccess.getTableGroup( fetchParent.getNavigablePath() );
+		final var fetchParentNavigablePath = fetchParent.getNavigablePath();
+		final var parentTableGroup = fromClauseAccess.getTableGroup( fetchParentNavigablePath );
 
 		final var parentNavigablePath = fetchablePath.getParent();
-		assert parentNavigablePath.equals( fetchParent.getNavigablePath() )
-			|| fetchParent.getNavigablePath() instanceof TreatedNavigablePath
-				&& parentNavigablePath.equals( fetchParent.getNavigablePath().getRealParent() );
+		assert parentNavigablePath.equals( fetchParentNavigablePath )
+			|| fetchParentNavigablePath instanceof TreatedNavigablePath
+					&& parentNavigablePath.equals( fetchParentNavigablePath.getRealParent() );
 
 		/*
 		In case of selected we are going to add a fetch for the `fetchablePath` only if there is not already a `TableGroupJoin`.
@@ -1555,19 +1626,10 @@ public static class EntityB {
 		having the left join we don't want to add an extra implicit join that will be translated into an SQL inner join (see HHH-15342)
 		*/
 
-		final var resolvingKeySideOfForeignKey = creationState.getCurrentlyResolvingForeignKeyPart();
-		final ForeignKeyDescriptor.Nature side;
-		if ( resolvingKeySideOfForeignKey == ForeignKeyDescriptor.Nature.KEY
-				&& this.sideNature == ForeignKeyDescriptor.Nature.TARGET ) {
-			// If we are currently resolving the key part of a foreign key we do not want to add joins.
-			// So if the lhs of this association is the target of the FK, we have to use the KEY part to avoid a join
-			side = ForeignKeyDescriptor.Nature.KEY;
-		}
-		else {
-			side = this.sideNature;
-		}
+		final var side = getSide( creationState );
 		if ( fetchTiming == FetchTiming.IMMEDIATE && selected
-			|| !creationState.getSqlAstCreationState().isProcedureOrNativeQuery() && needsJoinFetch( side ) ) {
+			|| !creationState.getSqlAstCreationState().isProcedureOrNativeQuery()
+					&& needsJoinFetch( side ) ) {
 			final var tableGroup = determineTableGroupForFetch(
 					fetchablePath,
 					fetchParent,
@@ -1645,31 +1707,8 @@ else if ( hasNotFoundAction()
 
 		 */
 
-		final DomainResult<?> keyResult;
-		if ( side == ForeignKeyDescriptor.Nature.KEY ) {
-			final var tableGroup =
-					sideNature == ForeignKeyDescriptor.Nature.KEY
-							? createTableGroupForDelayedFetch( fetchablePath, parentTableGroup, null, creationState )
-							: parentTableGroup;
-			keyResult = foreignKeyDescriptor.createKeyDomainResult(
-					fetchablePath,
-					tableGroup,
-					fetchParent,
-					creationState
-			);
-		}
-		else {
-			final var tableGroup =
-					sideNature == ForeignKeyDescriptor.Nature.TARGET
-							? parentTableGroup
-							: createTableGroupForDelayedFetch( fetchablePath, parentTableGroup, null, creationState );
-			keyResult = foreignKeyDescriptor.createTargetDomainResult(
-					fetchablePath,
-					tableGroup,
-					fetchParent,
-					creationState
-			);
-		}
+		final var keyResult =
+				getKeyResult( fetchParent, fetchablePath, creationState, side, parentTableGroup );
 		final boolean selectByUniqueKey = isSelectByUniqueKey( side );
 
 		if ( needsImmediateFetch( fetchTiming ) ) {
@@ -1698,19 +1737,68 @@ else if ( hasNotFoundAction()
 		);
 	}
 
+	private DomainResult<?> getKeyResult(
+			FetchParent fetchParent,
+			NavigablePath fetchablePath,
+			DomainResultCreationState creationState,
+			ForeignKeyDescriptor.Nature side,
+			TableGroup parentTableGroup) {
+		if ( side == ForeignKeyDescriptor.Nature.KEY ) {
+			final var tableGroup =
+					sideNature == ForeignKeyDescriptor.Nature.KEY
+							? createTableGroupForDelayedFetch( fetchablePath, parentTableGroup, null, creationState )
+							: parentTableGroup;
+			return foreignKeyDescriptor.createKeyDomainResult(
+					fetchablePath,
+					tableGroup,
+					fetchParent,
+					creationState
+			);
+		}
+		else {
+			final var tableGroup =
+					sideNature == ForeignKeyDescriptor.Nature.TARGET
+							? parentTableGroup
+							: createTableGroupForDelayedFetch( fetchablePath, parentTableGroup, null, creationState );
+			return foreignKeyDescriptor.createTargetDomainResult(
+					fetchablePath,
+					tableGroup,
+					fetchParent,
+					creationState
+			);
+		}
+	}
+
+	private ForeignKeyDescriptor.Nature getSide(DomainResultCreationState creationState) {
+		final var resolvingKeySideOfForeignKey = creationState.getCurrentlyResolvingForeignKeyPart();
+		if ( resolvingKeySideOfForeignKey == ForeignKeyDescriptor.Nature.KEY
+				&& sideNature == ForeignKeyDescriptor.Nature.TARGET ) {
+			// If we are currently resolving the key part of a foreign key we do not want to add joins.
+			// So if the lhs of this association is the target of the FK, we have to use the KEY part to avoid a join
+			return ForeignKeyDescriptor.Nature.KEY;
+		}
+		else {
+			return sideNature;
+		}
+	}
+
 	private boolean needsJoinFetch(ForeignKeyDescriptor.Nature side) {
 		if ( side == ForeignKeyDescriptor.Nature.TARGET ) {
-			// With composite identifier if the target model part doesn't correspond to the identifier of the target entity mapping
-			// we must eagerly fetch with a join (subselect would still cause problems).
+			// With composite identifier if the target model part doesn't correspond
+			// to the identifier of the target entity mapping, we must eagerly fetch
+			// with a join (subselect would still cause problems).
 			final var identifier = entityMappingType.getIdentifierMapping();
 			if ( identifier instanceof BasicEntityIdentifierMappingImpl ) {
 				return false;
 			}
-			final var targetPart = foreignKeyDescriptor.getTargetPart();
-			if ( identifier != targetPart ) {
-				// If the identifier and the target part of the same class, we can preserve laziness as deferred loading will still work
-				return identifier.getExpressibleJavaType().getJavaTypeClass() != targetPart.getExpressibleJavaType()
-						.getJavaTypeClass();
+			else {
+				final var targetPart = foreignKeyDescriptor.getTargetPart();
+				if ( identifier != targetPart ) {
+					// If the identifier and the target part of the same class,
+					// we can preserve laziness as deferred loading will still work
+					return identifier.getExpressibleJavaType().getJavaTypeClass()
+						!= targetPart.getExpressibleJavaType().getJavaTypeClass();
+				}
 			}
 		}
 
@@ -1735,7 +1823,7 @@ else if ( !entityMappingType.isConcreteProxy() ) {
 			return hasNotFoundAction()
 				|| entityMappingType.getSoftDeleteMapping() != null
 				|| ( !entityMappingType.getEntityPersister().isInstrumented()
-					&& cardinality == Cardinality.ONE_TO_ONE && isOptional );
+						&& cardinality == ONE_TO_ONE && isOptional );
 		}
 		else {
 			return false;
@@ -1842,17 +1930,19 @@ private boolean isSelectByUniqueKey(ForeignKeyDescriptor.Nature side) {
 		if ( referencedPropertyName == null ) {
 			return false;
 		}
+		final var identifierMapping = entityMappingType.getIdentifierMapping();
 		if ( side == ForeignKeyDescriptor.Nature.KEY ) {
 			// case 1.2
 			return !foreignKeyDescriptor.getNavigableRole()
-					.equals( entityMappingType.getIdentifierMapping().getNavigableRole() );
+					.equals( identifierMapping.getNavigableRole() );
 		}
 		else {
 			// case 1.1
-			// Make sure the entity identifier is not a target key property i.e. this really is a unique key mapping
+			// Make sure the entity identifier is not a target key property,
+			// i.e. this really is a unique key mapping
 			return bidirectionalAttributePath != null
-				&& ( !( entityMappingType.getIdentifierMapping() instanceof SingleAttributeIdentifierMapping )
-					|| !targetKeyPropertyNames.contains( entityMappingType.getIdentifierMapping().getAttributeName() ) );
+				&& !( identifierMapping instanceof SingleAttributeIdentifierMapping
+						&& targetKeyPropertyNames.contains( identifierMapping.getAttributeName() ) );
 		}
 	}
 
@@ -1872,16 +1962,20 @@ public <T> DomainResult<T> createSnapshotDomainResult(
 			);
 		}
 		else {
-			return new NullDomainResult( foreignKeyDescriptor.getKeyPart().getJavaType() );
+			final var javaType = foreignKeyDescriptor.getKeyPart().getJavaType();
+			@SuppressWarnings("unchecked")
+			// Not safe, but that's the fault of the method signature
+			final var castJavaType = (JavaType<T>) javaType;
+			return new NullDomainResult<>( castJavaType );
 		}
 	}
 
-	public static class NullDomainResult implements DomainResult {
-		private final DomainResultAssembler resultAssembler;
-		private final JavaType<?> resultJavaType;
+	public static class NullDomainResult<J> implements DomainResult<J> {
+		private final DomainResultAssembler<J> resultAssembler;
+		private final JavaType<J> resultJavaType;
 
-		public NullDomainResult(JavaType<?> javaType) {
-			resultAssembler = new NullValueAssembler( javaType );
+		public NullDomainResult(JavaType<J> javaType) {
+			resultAssembler = new NullValueAssembler<>( javaType );
 			this.resultJavaType = javaType;
 		}
 
@@ -1891,8 +1985,8 @@ public String getResultVariable() {
 		}
 
 		@Override
-		public DomainResultAssembler createResultAssembler(
-				InitializerParent parent,
+		public DomainResultAssembler<J> createResultAssembler(
+				InitializerParent<?> parent,
 				AssemblerCreationState creationState) {
 			return resultAssembler;
 		}
@@ -1911,14 +2005,16 @@ public void collectValueIndexesToCache(BitSet valueIndexes) {
 	private EntityFetch withRegisteredAssociationKeys(
 			Supplier<EntityFetch> fetchCreator,
 			DomainResultCreationState creationState) {
-		final boolean added = creationState.registerVisitedAssociationKey( foreignKeyDescriptor.getAssociationKey() );
+		final boolean added =
+				creationState.registerVisitedAssociationKey(
+						foreignKeyDescriptor.getAssociationKey() );
 		AssociationKey additionalAssociationKey = null;
-		if ( cardinality == Cardinality.LOGICAL_ONE_TO_ONE && bidirectionalAttributePath != null ) {
-			final var bidirectionalModelPart = entityMappingType.findByPath( bidirectionalAttributePath );
+		if ( cardinality == LOGICAL_ONE_TO_ONE && bidirectionalAttributePath != null ) {
 			// Add the inverse association key side as well to be able to resolve to a CircularFetch
-			if ( bidirectionalModelPart instanceof ToOneAttributeMapping bidirectionalAttribute ) {
-				assert bidirectionalModelPart.getPartMappingType() == declaringTableGroupProducer;
-				final AssociationKey secondKey = bidirectionalAttribute.getForeignKeyDescriptor().getAssociationKey();
+			if ( entityMappingType.findByPath( bidirectionalAttributePath )
+					instanceof ToOneAttributeMapping bidirectionalAttribute ) {
+				assert bidirectionalAttribute.getPartMappingType() == declaringTableGroupProducer;
+				final var secondKey = bidirectionalAttribute.getForeignKeyDescriptor().getAssociationKey();
 				if ( creationState.registerVisitedAssociationKey( secondKey ) ) {
 					additionalAssociationKey = secondKey;
 				}
@@ -1930,7 +2026,8 @@ private EntityFetch withRegisteredAssociationKeys(
 		}
 		finally {
 			if ( added ) {
-				creationState.removeVisitedAssociationKey( foreignKeyDescriptor.getAssociationKey() );
+				creationState.removeVisitedAssociationKey(
+						foreignKeyDescriptor.getAssociationKey() );
 			}
 			if ( additionalAssociationKey != null ) {
 				creationState.removeVisitedAssociationKey( additionalAssociationKey );
@@ -1964,7 +2061,8 @@ else if ( parentTableGroup.getModelPart() instanceof CollectionPart ) {
 	public boolean isSimpleJoinPredicate(Predicate predicate) {
 		// Since the table group is lazy, the initial predicate is null,
 		// but if we get null here, we can safely assume this will be a simple join predicate
-		return predicate == null || foreignKeyDescriptor.isSimpleJoinPredicate( predicate );
+		return predicate == null
+			|| foreignKeyDescriptor.isSimpleJoinPredicate( predicate );
 	}
 
 	@Override
@@ -2001,7 +2099,8 @@ public TableGroupJoin createTableGroupJoin(
 
 		// If a parent is a collection part, there is no custom predicate and the join is INNER or LEFT
 		// we check if this attribute is the map key property to reuse the existing index table group
-		if ( !addsPredicate && ( joinType == SqlAstJoinType.INNER || joinType == SqlAstJoinType.LEFT ) ) {
+		if ( !addsPredicate
+				&& ( joinType == SqlAstJoinType.INNER || joinType == SqlAstJoinType.LEFT ) ) {
 			TableGroup parentTableGroup = lhs;
 			ModelPartContainer parentContainer = lhs.getModelPart();
 			StringBuilder embeddablePathSb = null;
@@ -2012,11 +2111,11 @@ public TableGroupJoin createTableGroupJoin(
 						embeddablePathSb = new StringBuilder();
 					}
 					embeddablePathSb.insert( 0, parentContainer.getPartName() + "." );
-					final NavigablePath parentNavigablePath = parentTableGroup.getNavigablePath();
-					final TableGroup tableGroup = fromClauseAccess.findTableGroup( parentNavigablePath.getParent() );
+					final var parentNavigablePath = parentTableGroup.getNavigablePath();
+					final var tableGroup = fromClauseAccess.findTableGroup( parentNavigablePath.getParent() );
 					if ( tableGroup == null ) {
 						assert parentNavigablePath.getLocalName().equals( ForeignKeyDescriptor.PART_NAME )
-								|| parentNavigablePath.getLocalName().equals( ForeignKeyDescriptor.TARGET_PART_NAME );
+							|| parentNavigablePath.getLocalName().equals( ForeignKeyDescriptor.TARGET_PART_NAME );
 						// Might happen that we don't register a table group for the collection role if this is a
 						// foreign key part and the collection is delayed. We can just break out in this case though,
 						// since these checks here are only for reusing a map key property, which we won't have
@@ -2031,8 +2130,11 @@ public TableGroupJoin createTableGroupJoin(
 			}
 
 			if ( CollectionPart.Nature.ELEMENT.getName().equals( parentTableGroup.getNavigablePath().getLocalName() ) ) {
-				final var parentParentPath = parentTableGroup.getNavigablePath().getParent();
-				final var pluralTableGroup = (PluralTableGroup) fromClauseAccess.findTableGroup( parentParentPath );
+				final var parentParentPath =
+						parentTableGroup.getNavigablePath().getParent();
+				final var pluralTableGroup =
+						(PluralTableGroup)
+								fromClauseAccess.findTableGroup( parentParentPath );
 				if ( pluralTableGroup != null ) {
 					final String indexPropertyName =
 							pluralTableGroup.getModelPart().getIndexMetadata()
@@ -2055,8 +2157,7 @@ public TableGroupJoin createTableGroupJoin(
 										fetched,
 										pluralTableGroup,
 										this
-								),
-								null
+								)
 						);
 					}
 				}
@@ -2076,13 +2177,14 @@ public TableGroupJoin createTableGroupJoin(
 
 		final var join = new TableGroupJoin(
 				navigablePath,
-				// Avoid checking for nested joins in here again, since this is already done in createRootTableGroupJoin
-				// and simply rely on the canUseInnerJoins flag instead for override the join type to LEFT
+				// Avoid checking for nested joins in here again,
+				// since this is already done in createRootTableGroupJoin
+				// and simply rely on the canUseInnerJoins flag instead
+				// for override the join type to LEFT
 				requestedJoinType == null && !lazyTableGroup.canUseInnerJoins()
 						? SqlAstJoinType.LEFT
 						: joinType,
-				lazyTableGroup,
-				null
+				lazyTableGroup
 		);
 		final var lhsTableReference = lhs.resolveTableReference(
 				navigablePath,
@@ -2134,17 +2236,16 @@ public TableGroupJoin createTableGroupJoin(
 						associatedEntityMappingType.applyDiscriminator( null, null, tableGroup, creationState );
 					}
 
-					final var softDeleteMapping = associatedEntityMappingType.getSoftDeleteMapping();
-					if ( softDeleteMapping != null ) {
-						// add the restriction
-						final TableReference tableReference = lazyTableGroup.resolveTableReference(
+					final var auxiliaryMapping =
+							associatedEntityMappingType.getAuxiliaryMapping();
+					if ( auxiliaryMapping != null ) {
+						auxiliaryMapping.applyPredicate(
+								associatedEntityMappingType,
+								join::applyPredicate,
+								lazyTableGroup,
 								navigablePath,
-								associatedEntityMappingType.getSoftDeleteTableDetails().getTableName()
+								creationState
 						);
-						join.applyPredicate( softDeleteMapping.createNonDeletedRestriction(
-								tableReference,
-								creationState.getSqlExpressionResolver()
-						) );
 					}
 				}
 		);
@@ -2175,14 +2276,13 @@ public LazyTableGroup createRootTableGroupJoin(
 			boolean fetched,
 			@Nullable Consumer<Predicate> predicateConsumer,
 			SqlAstCreationState creationState) {
-		final SqlAliasBase sqlAliasBase = SqlAliasBase.from(
+		final var sqlAliasBase = SqlAliasBase.from(
 				explicitSqlAliasBase,
 				explicitSourceAlias,
 				this,
 				creationState.getSqlAliasBaseGenerator()
 		);
 
-		final var softDeleteMapping = getAssociatedEntityMappingType().getSoftDeleteMapping();
 		final boolean canUseInnerJoin;
 		final var currentlyProcessingJoinType =
 				creationState instanceof SqmToSqlAstConverter sqmToSqlAstConverter
@@ -2241,7 +2341,8 @@ public LazyTableGroup createRootTableGroupJoin(
 				tableGroupProducer,
 				explicitSourceAlias,
 				sqlAliasBase,
-				creationState.getCreationContext().getSessionFactory(),
+				creationState.getCreationContext()
+						.getSessionFactory(),
 				lhs
 		);
 
@@ -2258,13 +2359,18 @@ public LazyTableGroup createRootTableGroupJoin(
 					)
 			);
 
-			if ( fetched && softDeleteMapping != null ) {
-				// add the restriction
-				final var tableReference =
-						lazyTableGroup.resolveTableReference( navigablePath,
-								getAssociatedEntityMappingType().getSoftDeleteTableDetails().getTableName() );
-				predicateConsumer.accept( softDeleteMapping.createNonDeletedRestriction( tableReference,
-						creationState.getSqlExpressionResolver() ) );
+			if ( fetched ) {
+				final var auxiliaryMapping =
+						getAssociatedEntityMappingType().getAuxiliaryMapping();
+				if ( auxiliaryMapping != null ) {
+					auxiliaryMapping.applyPredicate(
+							getAssociatedEntityMappingType(),
+							predicateConsumer,
+							lazyTableGroup,
+							navigablePath,
+							creationState
+					);
+				}
 			}
 		}
 
@@ -2290,7 +2396,8 @@ public boolean canUseParentTableGroup(
 	}
 
 	private void initializeIfNeeded(TableGroup lhs, SqlAstJoinType sqlAstJoinType, TableGroup tableGroup) {
-		if ( sqlAstJoinType == SqlAstJoinType.INNER && ( isNullable || !lhs.canUseInnerJoins() ) ) {
+		if ( sqlAstJoinType == SqlAstJoinType.INNER
+				&& ( isNullable || !lhs.canUseInnerJoins() ) ) {
 			if ( hasJoinTable ) {
 				// Set the join type of the table reference join to INNER to retain cardinality expectation
 				final var lhsTableReference =
@@ -2423,7 +2530,7 @@ public <X, Y> int breakDownJdbcValues(
 			Y y,
 			JdbcValueBiConsumer<X, Y> valueConsumer,
 			SharedSessionContractImplementor session) {
-		if ( cardinality == Cardinality.ONE_TO_ONE && sideNature == ForeignKeyDescriptor.Nature.TARGET ) {
+		if ( cardinality == ONE_TO_ONE && sideNature == ForeignKeyDescriptor.Nature.TARGET ) {
 			return 0;
 		}
 
@@ -2462,7 +2569,7 @@ protected static Object extractAttributePathValue(Object domainValue, EntityMapp
 
 		Object value = domainValue;
 		ManagedMappingType managedType = entityType;
-		final String[] pathParts = StringHelper.split( ".", attributePath );
+		final var pathParts = StringHelper.split( ".", attributePath );
 		for ( int i = 0; i < pathParts.length; i++ ) {
 			assert managedType != null;
 
@@ -2480,12 +2587,9 @@ protected static Object extractAttributePathValue(Object domainValue, EntityMapp
 
 	@Override
 	public int forEachSelectable(int offset, SelectableConsumer consumer) {
-		if ( sideNature == ForeignKeyDescriptor.Nature.KEY ) {
-			return foreignKeyDescriptor.visitKeySelectables( offset, consumer );
-		}
-		else {
-			return 0;
-		}
+		return sideNature == ForeignKeyDescriptor.Nature.KEY
+				? foreignKeyDescriptor.visitKeySelectables( offset, consumer )
+				: 0;
 	}
 
 	@Override
@@ -2516,20 +2620,16 @@ public void applySqlSelections(
 
 	@Override
 	public String getContainingTableExpression() {
-		if ( sideNature == ForeignKeyDescriptor.Nature.KEY ) {
-			return foreignKeyDescriptor.getKeyTable();
-		}
-		else {
-			return foreignKeyDescriptor.getTargetTable();
-		}
+		return sideNature == ForeignKeyDescriptor.Nature.KEY
+				? foreignKeyDescriptor.getKeyTable()
+				: foreignKeyDescriptor.getTargetTable();
 	}
 
 	@Override
 	public int getJdbcTypeCount() {
-		if ( sideNature == ForeignKeyDescriptor.Nature.KEY ) {
-			return foreignKeyDescriptor.getJdbcTypeCount();
-		}
-		return 0;
+		return sideNature == ForeignKeyDescriptor.Nature.KEY
+				? foreignKeyDescriptor.getJdbcTypeCount()
+				: 0;
 	}
 
 	@Override
@@ -2539,10 +2639,9 @@ public JdbcMapping getJdbcMapping(final int index) {
 
 	@Override
 	public SelectableMapping getSelectable(int columnIndex) {
-		if ( sideNature == ForeignKeyDescriptor.Nature.KEY ) {
-			return foreignKeyDescriptor.getSelectable( columnIndex );
-		}
-		return null;
+		return sideNature == ForeignKeyDescriptor.Nature.KEY
+				? foreignKeyDescriptor.getSelectable( columnIndex )
+				: null;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/UnifiedAnyDiscriminatorConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/UnifiedAnyDiscriminatorConverter.java
index 5d022bc820e8..08661756f12c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/UnifiedAnyDiscriminatorConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/UnifiedAnyDiscriminatorConverter.java
@@ -7,6 +7,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.metamodel.internal.FullNameImplicitDiscriminatorStrategy;
 import org.hibernate.metamodel.mapping.DiscriminatorConverter;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.mapping.DiscriminatorValueDetails;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.model.domain.NavigableRole;
@@ -22,16 +23,16 @@
 
 import static org.hibernate.Hibernate.unproxy;
 import static org.hibernate.internal.util.collections.CollectionHelper.concurrentMap;
-import static org.hibernate.persister.entity.DiscriminatorHelper.NOT_NULL_DISCRIMINATOR;
-import static org.hibernate.persister.entity.DiscriminatorHelper.NULL_DISCRIMINATOR;
+import static org.hibernate.metamodel.mapping.DiscriminatorValue.Special.NOT_NULL;
+import static org.hibernate.metamodel.mapping.DiscriminatorValue.Special.NULL;
 
 /**
  * @author Steve Ebersole
  */
 public class UnifiedAnyDiscriminatorConverter<O,R> extends DiscriminatorConverter<O,R> {
 	private final NavigableRole discriminatorRole;
-	private final Map<Object, DiscriminatorValueDetails> detailsByValue;
-	private final Map<String,DiscriminatorValueDetails> detailsByEntityName;
+	private final Map<DiscriminatorValue, DiscriminatorValueDetails> detailsByValue;
+	private final Map<String, DiscriminatorValueDetails> detailsByEntityName;
 	private final ImplicitDiscriminatorStrategy implicitValueStrategy;
 	private final MappingMetamodelImplementor mappingMetamodel;
 
@@ -39,7 +40,7 @@ public UnifiedAnyDiscriminatorConverter(
 			NavigableRole discriminatorRole,
 			JavaType<O> domainJavaType,
 			JavaType<R> relationalJavaType,
-			Map<Object,String> explicitValueMappings,
+			Map<DiscriminatorValue, String> explicitValueMappings,
 			ImplicitDiscriminatorStrategy implicitValueStrategy,
 			MappingMetamodelImplementor mappingMetamodel) {
 		super( discriminatorRole.getFullPath(), domainJavaType, relationalJavaType );
@@ -57,14 +58,20 @@ public UnifiedAnyDiscriminatorConverter(
 		} );
 	}
 
-	private ImplicitDiscriminatorStrategy resolveImplicitValueStrategy(ImplicitDiscriminatorStrategy implicitValueStrategy, Map<Object, String> explicitValueMappings) {
+	public boolean hasImplicitValueStrategy() {
+		return implicitValueStrategy != null;
+	}
+
+	private ImplicitDiscriminatorStrategy resolveImplicitValueStrategy(
+			ImplicitDiscriminatorStrategy implicitValueStrategy,
+			Map<DiscriminatorValue, String> explicitValueMappings) {
 		if ( explicitValueMappings.isEmpty() ) {
 			if ( implicitValueStrategy == null ) {
 				return FullNameImplicitDiscriminatorStrategy.FULL_NAME_STRATEGY;
 			}
 		}
 		else {
-			if ( explicitValueMappings.containsKey( NOT_NULL_DISCRIMINATOR ) ) {
+			if ( explicitValueMappings.containsKey( NOT_NULL ) ) {
 				if ( implicitValueStrategy != null ) {
 					// we will ultimately not know how to handle "implicit" values which are non-null
 					throw new HibernateException( "Illegal use of ImplicitDiscriminatorStrategy with explicit non-null discriminator mapping: " + discriminatorRole.getFullPath() );
@@ -74,54 +81,50 @@ private ImplicitDiscriminatorStrategy resolveImplicitValueStrategy(ImplicitDiscr
 		return implicitValueStrategy;
 	}
 
-	private DiscriminatorValueDetails register(Object value, EntityMappingType entityMapping) {
+	private DiscriminatorValueDetails register(DiscriminatorValue value, EntityMappingType entityMapping) {
 		final var details = new DiscriminatorValueDetailsImpl( value, entityMapping );
 		detailsByValue.put( value, details );
 		detailsByEntityName.put( entityMapping.getEntityName(), details );
 		return details;
 	}
 
-	public Map<Object, DiscriminatorValueDetails> getDetailsByValue() {
-		return detailsByValue;
-	}
-
-	public Map<String, DiscriminatorValueDetails> getDetailsByEntityName() {
-		return detailsByEntityName;
-	}
-
 	@Override
 	public DiscriminatorValueDetails getDetailsForDiscriminatorValue(Object relationalValue) {
 		if ( relationalValue == null ) {
-			return detailsByValue.get( NULL_DISCRIMINATOR );
+			// return immediately to avoid falling through to NOT_NULL case
+			return detailsByValue.get( NULL );
 		}
+		else {
+			final var existing = detailsByValue.get( DiscriminatorValue.of( relationalValue ) );
+			if ( existing != null ) {
+				return existing;
+			}
 
-		final var existing = detailsByValue.get( relationalValue );
-		if ( existing != null ) {
-			return existing;
-		}
+			if ( relationalValue.getClass().isEnum() ) {
+				final Object enumValue = enumValue( (Enum<?>) relationalValue );
+				final var enumMatch = detailsByValue.get( DiscriminatorValue.of( enumValue ) );
+				if ( enumMatch != null ) {
+					return enumMatch;
+				}
+			}
 
-		if ( relationalValue.getClass().isEnum() ) {
-			final Object enumValue = enumValue( (Enum<?>) relationalValue );
-			final var enumMatch = detailsByValue.get( enumValue );
-			if ( enumMatch != null ) {
-				return enumMatch;
+			if ( implicitValueStrategy != null ) {
+				final var entityMapping =
+						implicitValueStrategy.toEntityMapping( relationalValue,
+								discriminatorRole, mappingMetamodel );
+				if ( entityMapping != null ) {
+					return register( DiscriminatorValue.of( relationalValue ), entityMapping );
+				}
 			}
-		}
 
-		if ( implicitValueStrategy != null ) {
-			final var entityMapping =
-					implicitValueStrategy.toEntityMapping( relationalValue, discriminatorRole, mappingMetamodel );
-			if ( entityMapping != null ) {
-				return register( relationalValue, entityMapping );
+			final var nonNullMatch = detailsByValue.get( NOT_NULL );
+			if ( nonNullMatch != null ) {
+				return nonNullMatch;
 			}
-		}
 
-		final var nonNullMatch = detailsByValue.get( NOT_NULL_DISCRIMINATOR );
-		if ( nonNullMatch != null ) {
-			return nonNullMatch;
+			throw new HibernateException(
+					"Unknown discriminator value for " + discriminatorRole.getFullPath() + ": " + relationalValue );
 		}
-
-		throw new HibernateException( "Unknown discriminator value (" + discriminatorRole.getFullPath() + ") : " + relationalValue );
 	}
 
 	private Object enumValue(Enum<?> relationalEnum) {
@@ -140,7 +143,7 @@ else if ( relationalJavaType instanceof CharacterJavaType ) {
 	@Override
 	public DiscriminatorValueDetails getDetailsForEntityName(String entityName) {
 		final var existing = detailsByEntityName.get( entityName );
-		if ( existing != null) {
+		if ( existing != null ) {
 			return existing;
 		}
 
@@ -152,7 +155,7 @@ public DiscriminatorValueDetails getDetailsForEntityName(String entityName) {
 					discriminatorRole,
 					mappingMetamodel
 			);
-			return register( discriminatorValue, entityMapping );
+			return register( DiscriminatorValue.of( discriminatorValue ), entityMapping );
 		}
 
 		throw new HibernateException( "Cannot determine discriminator value from entity-name (" + discriminatorRole.getFullPath() + ") : " + entityName );
@@ -163,6 +166,13 @@ public void forEachValueDetail(Consumer<DiscriminatorValueDetails> consumer) {
 		detailsByEntityName.values().forEach( consumer );
 	}
 
+	@Override
+	@SuppressWarnings("unchecked")
+	public R toRelationalValue(O domainForm) {
+		final String entityName = getEntityName( domainForm );
+		return entityName == null ? null : (R) getDetailsForEntityName( entityName ).getValue();
+	}
+
 	@Override
 	public <X> X fromValueDetails(Function<DiscriminatorValueDetails, X> handler) {
 		for ( var valueDetails : detailsByEntityName.values() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java
index f1f69e3f4a3c..cc577960c98a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java
@@ -54,7 +54,8 @@ public VirtualIdEmbeddable(
 		);
 
 		final var compositeType = virtualIdSource.getType();
-		( (CompositeTypeImplementor) compositeType ).injectMappingModelPart( idMapping, creationProcess );
+		( (CompositeTypeImplementor) compositeType )
+				.injectMappingModelPart( idMapping, creationProcess );
 
 		creationProcess.registerInitializationCallback(
 				"VirtualIdEmbeddable(" + navigableRole.getFullPath() + ")#finishInitialization",
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java
index ca496516c904..cedc919759e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java
@@ -34,7 +34,7 @@ public interface JpaMetamodel extends Metamodel {
 	/**
 	 * Access to a managed type through its name
 	 */
-	<X> ManagedDomainType<X> managedType(String typeName);
+	ManagedDomainType<?> managedType(String typeName);
 
 	/**
 	 * Access to an entity supporting Hibernate's entity-name feature
@@ -50,13 +50,13 @@ public interface JpaMetamodel extends Metamodel {
 	 * Specialized handling for resolving entity-name references in
 	 * an HQL query
 	 */
-	<X> EntityDomainType<X> getHqlEntityReference(String entityName);
+	EntityDomainType<?> getHqlEntityReference(String entityName);
 
 	/**
 	 * Specialized handling for resolving entity-name references in
 	 * an HQL query
 	 */
-	<X> EntityDomainType<X> resolveHqlEntityReference(String entityName);
+	EntityDomainType<?> resolveHqlEntityReference(String entityName);
 
 	/**
 	 * Same as {@link #managedType(Class)} except {@code null} is returned rather
@@ -80,7 +80,7 @@ public interface JpaMetamodel extends Metamodel {
 	 * Same as {@link #managedType(String)} except {@code null} is returned rather
 	 * than throwing an exception
 	 */
-	@Nullable <X> ManagedDomainType<X> findManagedType(@Nullable String typeName);
+	@Nullable ManagedDomainType<?> findManagedType(@Nullable String typeName);
 
 	/**
 	 * Same as {@link #entity(String)} except {@code null} is returned rather
@@ -107,7 +107,7 @@ public interface JpaMetamodel extends Metamodel {
 
 	JavaType<?> getJavaConstantType(String className, String fieldName);
 
-	<T> T getJavaConstant(String className, String fieldName);
+	<E> @Nullable E getJavaConstant(String className, String fieldName, Class<E> javaTypeClass);
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Covariant returns
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java
index 51b1f0848042..29ec99b46375 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java
@@ -16,7 +16,7 @@
 /**
  * A compound path which represents a {@link org.hibernate.metamodel.mapping.ModelPart}
  * and uniquely identifies it with the runtime metamodel.
- * <p/>
+ * <p>
  * The {@linkplain #isRoot root} will name either an
  * {@linkplain org.hibernate.metamodel.MappingMetamodel#getEntityDescriptor entity} or
  * {@linkplain org.hibernate.metamodel.MappingMetamodel#getCollectionDescriptor collection}.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java
index 22b999de5b4c..93661361b225 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java
@@ -11,11 +11,10 @@
 import jakarta.persistence.metamodel.Attribute;
 
 import org.hibernate.metamodel.AttributeClassification;
-import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
-import org.hibernate.metamodel.model.domain.PluralPersistentAttribute;
+import org.hibernate.query.sqm.spi.SqmCreationHelper;
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.query.sqm.tree.domain.SqmPersistentAttribute;
@@ -63,8 +62,11 @@ public String getName() {
 
 	@Override
 	public Class<J> getJavaType() {
-		return valueType instanceof BasicTypeImpl basicType
-				? basicType.getJavaType()
+		// TODO: create a new method to abstract this logic
+		return valueType instanceof BasicTypeImpl<?> basicType
+				// handles primitives in basic types
+				? (Class<J>) basicType.getJavaType()
+				// good for everything else
 				: attributeJtd.getJavaTypeClass();
 	}
 
@@ -105,11 +107,7 @@ public DomainType<?> getValueGraphType() {
 	NavigablePath getParentNavigablePath(SqmPath<?> parent) {
 		final var parentPathSource = parent.getResolvedModel();
 		final var parentType = parentPathSource.getPathType();
-		final NavigablePath parentNavigablePath =
-				parentPathSource instanceof PluralPersistentAttribute<?, ?, ?>
-						// for collections, implicitly navigate to the element
-						? parent.getNavigablePath().append( CollectionPart.Nature.ELEMENT.getName() )
-						: parent.getNavigablePath();
+		final NavigablePath parentNavigablePath = SqmCreationHelper.buildParentNavigablePath( parent, "" );
 		if ( parentType != declaringType
 				&& parentType instanceof EntityDomainType<?> entityDomainType
 				&& entityDomainType.findAttribute( name ) == null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractIdentifiableType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractIdentifiableType.java
index e3edd41e03c2..658ea8fd557e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractIdentifiableType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractIdentifiableType.java
@@ -34,8 +34,6 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.spi.PrimitiveJavaType;
 
-import org.jboss.logging.Logger;
-
 import static java.util.Collections.emptyList;
 
 /**
@@ -114,14 +112,15 @@ public boolean hasSingleIdAttribute() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <Y> SqmSingularPersistentAttribute<? super J, Y> getId(Class<Y> javaType) {
 		ensureNoIdClass();
 		final var id = findIdAttribute();
 		if ( id != null ) {
 			checkType( id, javaType );
 		}
-		return (SqmSingularPersistentAttribute<? super J, Y>) id;
+		@SuppressWarnings("unchecked") // safe, we just checked
+		final var castId = (SqmSingularPersistentAttribute<? super J, Y>) id;
+		return castId;
 	}
 
 	private void ensureNoIdClass() {
@@ -148,8 +147,7 @@ else if ( getSuperType() != null ) {
 
 	private void checkType(SingularPersistentAttribute<?, ?> attribute, Class<?> javaType) {
 		if ( !javaType.isAssignableFrom( attribute.getType().getJavaType() ) ) {
-			final JavaType<?> attributeJavaType = attribute.getAttributeJavaType();
-			if ( !( attributeJavaType instanceof PrimitiveJavaType<?> primitiveJavaType )
+			if ( !( attribute.getAttributeJavaType() instanceof PrimitiveJavaType<?> primitiveJavaType )
 					|| primitiveJavaType.getPrimitiveClass() != javaType ) {
 				throw new IllegalArgumentException(
 						String.format(
@@ -165,14 +163,15 @@ private void checkType(SingularPersistentAttribute<?, ?> attribute, Class<?> jav
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <Y> SqmSingularPersistentAttribute<J, Y> getDeclaredId(Class<Y> javaType) {
 		ensureNoIdClass();
 		if ( id == null ) {
 			throw new IllegalArgumentException( "The id attribute is not declared on this type [" + getTypeName() + "]" );
 		}
 		checkType( id, javaType );
-		return (SqmSingularPersistentAttribute<J, Y>) id;
+		@SuppressWarnings("unchecked") // safe, we just checked
+		final var castId = (SqmSingularPersistentAttribute<J, Y>) id;
+		return castId;
 	}
 
 	@Override
@@ -226,14 +225,16 @@ else if ( idClassType instanceof SimpleDomainType<?> simpleDomainType ) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public void visitIdClassAttributes(Consumer<SingularPersistentAttribute<? super J, ?>> attributeConsumer) {
 		if ( nonAggregatedIdAttributes != null ) {
 			nonAggregatedIdAttributes.forEach( attributeConsumer );
 		}
-		else if ( getSuperType() != null ) {
-			//noinspection rawtypes
-			getSuperType().visitIdClassAttributes( (Consumer) attributeConsumer );
+		else {
+			final var superType = getSuperType();
+			if ( superType != null ) {
+				//noinspection rawtypes, unchecked
+				superType.visitIdClassAttributes( (Consumer) attributeConsumer );
+			}
 		}
 	}
 
@@ -247,14 +248,15 @@ public boolean hasDeclaredVersionAttribute() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <Y> SingularPersistentAttribute<? super J, Y> getVersion(Class<Y> javaType) {
 		if ( hasVersionAttribute() ) {
 			final var version = findVersionAttribute();
 			if ( version != null ) {
 				checkType( version, javaType );
 			}
-			return (SingularPersistentAttribute<? super J, Y>) version;
+			@SuppressWarnings("unchecked") // safe, we just checked
+			final var castVersion = (SingularPersistentAttribute<? super J, Y>) version;
+			return castVersion;
 		}
 		else {
 			return null;
@@ -288,21 +290,27 @@ else if ( getSuperType() != null ) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <Y> SingularPersistentAttribute<J, Y> getDeclaredVersion(Class<Y> javaType) {
 		checkDeclaredVersion();
 		checkType( versionAttribute, javaType );
-		return (SingularPersistentAttribute<J, Y>) versionAttribute;
+		@SuppressWarnings("unchecked") // safe, we just checked
+		final var castVersion = (SingularPersistentAttribute<J, Y>) versionAttribute;
+		return castVersion;
 	}
 
 	private void checkDeclaredVersion() {
-		if ( versionAttribute == null || ( getSuperType() != null && getSuperType().hasVersionAttribute() )) {
+		if ( versionAttribute == null || supertypeDeclaresVersion() ) {
 			throw new IllegalArgumentException(
 					"The version attribute is not declared by this type [" + getJavaType() + "]"
 			);
 		}
 	}
 
+	private boolean supertypeDeclaresVersion() {
+		final var superType = getSuperType();
+		return superType != null && superType.hasVersionAttribute();
+	}
+
 //	@Override
 //	public void visitJdbcTypes(Consumer action, TypeConfiguration typeConfiguration) {
 //		id.visitJdbcTypes( action, typeConfiguration );
@@ -341,7 +349,7 @@ public void applyIdAttribute(SingularPersistentAttribute<J, ?> idAttribute) {
 
 		@Override
 		public void applyNonAggregatedIdAttributes(
-				Set<SingularPersistentAttribute<? super J, ?>> idAttributes,
+				Set<? extends SingularPersistentAttribute<? super J, ?>> idAttributes,
 				EmbeddableDomainType<?> idClassType) {
 			if ( id != null ) {
 				throw new IllegalArgumentException( "`AbstractIdentifiableType#id` already set on call to `#applyNonAggregatedIdAttribute`" );
@@ -360,9 +368,8 @@ public void applyNonAggregatedIdAttributes(
 					nonAggregatedIdAttributes.add( (SqmSingularPersistentAttribute<? super J, ?>) idAttribute );
 					if ( AbstractIdentifiableType.this == idAttribute.getDeclaringType() ) {
 						@SuppressWarnings("unchecked")
-						// Safe, because we know it's declared  by this type
-						final PersistentAttribute<J, ?> declaredAttribute =
-								(PersistentAttribute<J, ?>) idAttribute;
+						// Safe, because we know it's declared by this type
+						final var declaredAttribute = (PersistentAttribute<J, ?>) idAttribute;
 						addAttribute( declaredAttribute );
 					}
 				}
@@ -402,11 +409,7 @@ public void finishUp() {
 		}
 	}
 
-	private static final Logger LOG = Logger.getLogger( AbstractIdentifiableType.class );
-
 	private SqmPathSource<?> interpretIdDescriptor() {
-		LOG.tracef( "Interpreting domain-model identifier descriptor" );
-
 		final var superType = getSuperType();
 		if ( superType != null ) {
 			final var idDescriptor = superType.getIdentifierDescriptor();
@@ -425,11 +428,10 @@ else if ( nonAggregatedIdAttributes != null && !nonAggregatedIdAttributes.isEmpt
 		else {
 			if ( isIdMappingRequired() ) {
 				throw new UnsupportedMappingException(
-						"Could not build SqmPathSource for entity identifier : " + getTypeName() );
+						"Could not build SqmPathSource for entity identifier: " + getTypeName() );
 			}
 			return null;
 		}
-
 	}
 
 	private AbstractSqmPathSource<?> compositePathSource() {
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractManagedType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractManagedType.java
index f9c319934dd6..c47ce142886d 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractManagedType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractManagedType.java
@@ -126,8 +126,9 @@ public RepresentationMode getRepresentationMode() {
 	@Override
 	public void visitAttributes(Consumer<? super PersistentAttribute<? super J, ?>> action) {
 		visitDeclaredAttributes( action );
-		if ( getSuperType() != null ) {
-			getSuperType().visitAttributes( action );
+		final var superType = getSuperType();
+		if ( superType != null ) {
+			superType.visitAttributes( action );
 		}
 	}
 
@@ -317,9 +318,9 @@ private <K,Y> SqmSingularPersistentAttribute<K,Y> checkTypeForSingleAttribute(
 			Class<Y> javaType) {
 		if ( attribute == null || !hasMatchingReturnType( attribute, javaType ) ) {
 			throw new IllegalArgumentException(
-					"SingularAttribute named " + name
-							+ ( javaType != null ? " and of type " + javaType.getName() : "" )
-							+ " is not present"
+					"No singular attribute named '" + name
+					+ ( javaType != null ? "' and of type '" + javaType.getName() : "" )
+					+ "' in type '" + hibernateTypeName + "'"
 			);
 		}
 		else {
@@ -417,9 +418,9 @@ private <E> void checkTypeForPluralAttributes(
 				|| elementType != null && !attribute.getBindableJavaType().equals( elementType )
 				|| attribute.getCollectionType() != collectionType ) {
 			throw new IllegalArgumentException(
-					attributeType + " named " + name
-							+ ( elementType != null ? " and of element type " + elementType : "" )
-							+ " is not present"
+					"No plural attribute named '" + name
+					+ ( elementType != null ? "' and of element type '" + elementType.getName() : "" )
+					+ "' in type '" + hibernateTypeName + "'"
 			);
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java
index 8fcf2003a79a..4c085a9b4546 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java
@@ -125,8 +125,9 @@ public SimpleDomainType<?> getKeyGraphType() {
 
 	@Override
 	public boolean isAssociation() {
-		return getPersistentAttributeType() == PersistentAttributeType.ONE_TO_MANY
-			|| getPersistentAttributeType() == PersistentAttributeType.MANY_TO_MANY;
+		final var persistentAttributeType = getPersistentAttributeType();
+		return persistentAttributeType == PersistentAttributeType.ONE_TO_MANY
+			|| persistentAttributeType == PersistentAttributeType.MANY_TO_MANY;
 	}
 
 	@Override
@@ -147,8 +148,8 @@ public Class<E> getBindableJavaType() {
 	@SuppressWarnings("unchecked")
 	@Override
 	public SqmPath<E> createSqmPath(SqmPath<?> lhs, @Nullable SqmPathSource<?> intermediatePathSource) {
-		// We need an unchecked cast here : PluralPersistentAttribute implements path source with its element type
-		//  but resolving paths from it must produce collection-typed expressions.
+		// We need an unchecked cast here: PluralPersistentAttribute implements PathSource with
+		// its element type, but resolving paths from it must produce collection-typed expressions.
 		return (SqmPath<E>) new SqmPluralValuedSimplePath<>(
 				PathHelper.append( lhs, this, intermediatePathSource ),
 				this,
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java
index 3fbe0ec4040e..03b74253ba57 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPath.java
@@ -29,7 +29,7 @@ protected AnyDiscriminatorSqmPath(
 
 	@Override
 	public AnyDiscriminatorSqmPath<T> copy(SqmCopyContext context) {
-		final AnyDiscriminatorSqmPath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java
index a49b01080e81..64ea52e4f7d9 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java
@@ -12,7 +12,6 @@
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
-import org.hibernate.spi.NavigablePath;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.java.JavaType;
 
@@ -38,10 +37,11 @@ public AnyDiscriminatorSqmPathSource(
 
 	@Override
 	public SqmPath<D> createSqmPath(SqmPath<?> lhs, @Nullable SqmPathSource<?> intermediatePathSource) {
-		final NavigablePath navigablePath =
+		final var path = lhs.getNavigablePath();
+		final var navigablePath =
 				intermediatePathSource == null
-						? lhs.getNavigablePath()
-						: lhs.getNavigablePath().append( intermediatePathSource.getPathName() );
+						? path
+						: path.append( intermediatePathSource.getPathName() );
 		return new AnyDiscriminatorSqmPath<>( navigablePath, pathModel, lhs, lhs.nodeBuilder() );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java
index 81e7b9977877..1145ed937e8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java
@@ -6,7 +6,6 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.mapping.Any;
-import org.hibernate.mapping.Column;
 import org.hibernate.metamodel.model.domain.AnyMappingDomainType;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.metamodel.model.domain.SimpleDomainType;
@@ -18,8 +17,6 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.internal.ConvertedBasicTypeImpl;
 
-import java.util.List;
-
 import static jakarta.persistence.metamodel.Type.PersistenceType.ENTITY;
 import static org.hibernate.metamodel.mapping.internal.AnyDiscriminatorPart.determineDiscriminatorConverter;
 
@@ -40,10 +37,9 @@ public AnyMappingDomainTypeImpl(
 		this.anyType = anyType;
 		this.baseJtd = baseJtd;
 
-		final MetaType discriminatorType = (MetaType) anyType.getDiscriminatorType();
-		final BasicType discriminatorBaseType = (BasicType) discriminatorType.getBaseType();
-		final NavigableRole navigableRole = resolveNavigableRole( bootAnyMapping );
-
+		final var discriminatorType = (MetaType) anyType.getDiscriminatorType();
+		final var discriminatorBaseType = (BasicType) discriminatorType.getBaseType();
+		final var navigableRole = resolveNavigableRole( bootAnyMapping );
 		anyDiscriminatorType = new ConvertedBasicTypeImpl(
 				navigableRole.getFullPath(),
 				discriminatorBaseType.getJdbcType(),
@@ -73,13 +69,14 @@ public String getTypeName() {
 	}
 
 	private NavigableRole resolveNavigableRole(Any bootAnyMapping) {
-		final StringBuilder buffer = new StringBuilder();
-		if ( bootAnyMapping.getTable() != null ) {
-			buffer.append( bootAnyMapping.getTable().getName() );
+		final var buffer = new StringBuilder();
+		final var table = bootAnyMapping.getTable();
+		if ( table != null ) {
+			buffer.append( table.getName() );
 		}
 
 		buffer.append( "(" );
-		final List<Column> columns = bootAnyMapping.getColumns();
+		final var columns = bootAnyMapping.getColumns();
 		for ( int i = 0; i < columns.size(); i++ ) {
 			buffer.append( columns.get( i ).getName() );
 			if ( i+1 < columns.size() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java
index f25f1eb7e394..c06524882631 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java
@@ -53,7 +53,7 @@ public String getTypeName() {
 	}
 
 	private static JavaType<?>[] getTypeDescriptors(SqmExpressible<?>[] components) {
-		final JavaType<?>[] typeDescriptors = new JavaType<?>[components.length];
+		final var typeDescriptors = new JavaType<?>[components.length];
 		for ( int i = 0; i < components.length; i++ ) {
 			typeDescriptors[i] = components[i].getExpressibleJavaType();
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java
index 741b4fc25a25..c972fc58dc20 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java
@@ -35,7 +35,7 @@ default void applyIdAttribute(SingularPersistentAttribute<J, ?> idAttribute) {
 		}
 
 		default void applyNonAggregatedIdAttributes(
-				Set<SingularPersistentAttribute<? super J, ?>> idAttributes,
+				Set<? extends SingularPersistentAttribute<? super J, ?>> idAttributes,
 				EmbeddableDomainType<?> idClassType) {
 			throw new UnsupportedMappingException(
 					"AttributeContainer [" + getClass().getName() + "] does not support identifiers"
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java
index cd699971ba16..6b909090f748 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java
@@ -48,8 +48,8 @@ public String getTypeName() {
 
 	@Override
 	public @Nullable SqmPathSource<?> findSubPathSource(String name) {
-		String path = pathModel.getPathName();
-		String pathDesc = path == null || path.startsWith( "{" ) ? " " : " '" + pathModel.getPathName() + "' ";
+		final String path = pathModel.getPathName();
+		final String pathDesc = path == null || path.startsWith( "{" ) ? " " : " '" + pathModel.getPathName() + "' ";
 		throw new TerminalPathException( "Terminal path" + pathDesc + "has no attribute '" + name + "'" );
 	}
 
@@ -85,8 +85,8 @@ public boolean isGeneric() {
 
 	@Override
 	public String toString() {
-		return "BasicSqmPathSource(" +
-				getPathName() + " : " + getJavaType().getSimpleName() +
-				")";
+		return "BasicSqmPathSource("
+			+ getPathName() + " : " + getJavaType().getSimpleName()
+			+ ")";
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java
index d01d2ef09ac3..f4cfb2433533 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java
@@ -5,7 +5,6 @@
 package org.hibernate.metamodel.model.domain.internal;
 
 import org.hibernate.metamodel.MappingMetamodel;
-import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
@@ -28,9 +27,9 @@ static boolean isCompatible(
 			return true;
 		}
 		else {
-			final ModelPart modelPart1 =
+			final var modelPart1 =
 					getEntityAttributeModelPart( attribute1, attribute1.getDeclaringType(), mappingMetamodel );
-			final ModelPart modelPart2 =
+			final var modelPart2 =
 					getEntityAttributeModelPart( attribute2, attribute2.getDeclaringType(), mappingMetamodel );
 			return modelPart1 != null
 				&& modelPart2 != null
@@ -43,13 +42,13 @@ static ModelPart getEntityAttributeModelPart(
 			ManagedDomainType<?> domainType,
 			MappingMetamodel mappingMetamodel) {
 		if ( domainType instanceof EntityDomainType<?> ) {
-			final EntityMappingType entity = mappingMetamodel.getEntityDescriptor( domainType.getTypeName() );
-			return entity.findSubPart( attribute.getName() );
+			return mappingMetamodel.getEntityDescriptor( domainType.getTypeName() )
+					.findSubPart( attribute.getName() );
 		}
 		else {
 			ModelPart candidate = null;
-			for ( ManagedDomainType<?> subType : domainType.getSubTypes() ) {
-				final ModelPart modelPart = getEntityAttributeModelPart( attribute, subType, mappingMetamodel );
+			for ( var subType : domainType.getSubTypes() ) {
+				final var modelPart = getEntityAttributeModelPart( attribute, subType, mappingMetamodel );
 				if ( modelPart != null ) {
 					if ( candidate != null && !isCompatibleModelPart( candidate, modelPart ) ) {
 						return null;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java
index 267c7cba8051..d308d62873c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java
@@ -5,9 +5,12 @@
 package org.hibernate.metamodel.model.domain.internal;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.AssertionFailure;
 import org.hibernate.metamodel.UnsupportedMappingException;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.model.domain.DomainType;
@@ -31,8 +34,10 @@
 public class EmbeddableTypeImpl<J>
 		extends AbstractManagedType<J>
 		implements SqmEmbeddableDomainType<J>, Serializable {
+	@SuppressWarnings("FieldCanBeLocal")
 	private final boolean isDynamic;
 	private final EmbeddedDiscriminatorSqmPathSource<?> discriminatorPathSource;
+	private final List<SqmEmbeddableDomainType<? extends J>> subtypes = new ArrayList<>();
 
 	public EmbeddableTypeImpl(
 			JavaType<J> javaType,
@@ -61,15 +66,27 @@ public PersistenceType getPersistenceType() {
 	public int getTupleLength() {
 		int count = 0;
 		for ( var attribute : getSingularAttributes() ) {
-			count += ( (SqmDomainType<?>) attribute.getType() ).getTupleLength();
+			if ( attribute.getType() instanceof SqmDomainType<?> domainType ) {
+				count += domainType.getTupleLength();
+			}
+			else {
+				throw new AssertionFailure( "Should have been a domain type" );
+			}
 		}
 		return count;
 	}
 
 	@Override
 	public Collection<? extends SqmEmbeddableDomainType<? extends J>> getSubTypes() {
-		//noinspection unchecked
-		return (Collection<? extends SqmEmbeddableDomainType<? extends J>>) super.getSubTypes();
+		return subtypes;
+	}
+
+	@Override
+	public void addSubType(ManagedDomainType<? extends J> subType) {
+		super.addSubType( subType );
+		if ( subType instanceof SqmEmbeddableDomainType<? extends J> entityDomainType ) {
+			subtypes.add( entityDomainType );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java
index 65a3b05667d5..650f0c406415 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedDiscriminatorSqmPath.java
@@ -52,7 +52,7 @@ public EmbeddableDomainType<T> getEmbeddableDomainType() {
 
 	@Override
 	public EmbeddedDiscriminatorSqmPath<T> copy(SqmCopyContext context) {
-		final EmbeddedDiscriminatorSqmPath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java
index 10fe6fa1b404..093b7d59238e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java
@@ -64,7 +64,7 @@ public EntityMappingType getEntityDescriptor() {
 
 	@Override
 	public EntityDiscriminatorSqmPath copy(SqmCopyContext context) {
-		final EntityDiscriminatorSqmPath existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
@@ -80,6 +80,7 @@ public EntityDiscriminatorSqmPath copy(SqmCopyContext context) {
 	public <X> X accept(SemanticQueryWalker<X> walker) {
 		return entityDescriptor.hasSubclasses()
 				? walker.visitDiscriminatorPath( this )
-				: walker.visitEntityTypeLiteralExpression( new SqmLiteralEntityType( entityDomainType, nodeBuilder() ) );
+				: walker.visitEntityTypeLiteralExpression(
+						new SqmLiteralEntityType( entityDomainType, nodeBuilder() ) );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java
index db13d7b2e468..85526604475c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityPersisterConcurrentMap.java
@@ -7,10 +7,11 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 import org.hibernate.persister.entity.EntityPersister;
 
+import static java.util.stream.Collectors.toUnmodifiableMap;
+
 /**
  * Concurrent Map implementation of mappings entity name -> EntityPersister.
  * Concurrency is optimised for read operations; write operations will
@@ -26,10 +27,7 @@ public final class EntityPersisterConcurrentMap {
 
 	public EntityPersister get(final String name) {
 		final var entityPersisterHolder = map.get( name );
-		if ( entityPersisterHolder != null ) {
-			return entityPersisterHolder.entityPersister;
-		}
-		return null;
+		return entityPersisterHolder == null ? null : entityPersisterHolder.entityPersister;
 	}
 
 	public EntityPersister[] values() {
@@ -55,10 +53,10 @@ public String[] keys() {
 	}
 
 	private void recomputeValues() {
-		//Assumption: the write lock is being held (synchronize on this)
+		//Assumption: the write lock is held (synchronize on this)
 		final int size = map.size();
-		final EntityPersister[] newValues = new EntityPersister[size];
-		final String[] newKeys = new String[size];
+		final var newValues = new EntityPersister[size];
+		final var newKeys = new String[size];
 		int i = 0;
 		for ( var entry : map.entrySet() ) {
 			newValues[i] = entry.getValue().entityPersister;
@@ -75,7 +73,7 @@ private void recomputeValues() {
 	 */
 	@Deprecated(forRemoval = true)
 	public Map<String, EntityPersister> convertToMap() {
-		return map.entrySet().stream().collect( Collectors.toUnmodifiableMap(
+		return map.entrySet().stream().collect( toUnmodifiableMap(
 				Map.Entry::getKey,
 				e -> e.getValue().entityPersister
 		) );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java
index b9f2da1a067a..6a7a91821778 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java
@@ -7,7 +7,9 @@
 import java.io.ObjectStreamException;
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Locale;
 
 import jakarta.persistence.metamodel.EntityType;
@@ -15,19 +17,16 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.metamodel.UnsupportedMappingException;
-import org.hibernate.metamodel.mapping.DiscriminatorType;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
 import org.hibernate.metamodel.mapping.EntityVersionMapping;
 import org.hibernate.metamodel.model.domain.IdentifiableDomainType;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
-import org.hibernate.metamodel.model.domain.PersistentAttribute;
+import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.PathException;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
-import org.hibernate.query.sqm.tree.domain.SqmManagedDomainType;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.query.sqm.tree.domain.SqmPersistentAttribute;
 import org.hibernate.query.sqm.tree.domain.SqmEntityDomainType;
@@ -35,6 +34,7 @@
 
 import static jakarta.persistence.metamodel.Bindable.BindableType.ENTITY_TYPE;
 import static jakarta.persistence.metamodel.Type.PersistenceType.ENTITY;
+import static jakarta.persistence.metamodel.Type.PersistenceType.MAPPED_SUPERCLASS;
 import static org.hibernate.metamodel.model.domain.internal.DomainModelHelper.isCompatible;
 
 /**
@@ -50,6 +50,7 @@ public class EntityTypeImpl<J>
 	private final String jpaEntityName;
 	private final JpaMetamodelImplementor metamodel;
 	private final SqmPathSource<?> discriminatorPathSource;
+	private final List<SqmEntityDomainType<? extends J>> subtypes = new ArrayList<>();
 
 	public EntityTypeImpl(
 			String entityName,
@@ -77,10 +78,10 @@ public EntityTypeImpl(
 	}
 
 	private EntityDiscriminatorSqmPathSource<?> entityDiscriminatorPathSource(JpaMetamodelImplementor metamodel) {
-		final EntityPersister entityDescriptor =
+		final var entityDescriptor =
 				metamodel.getMappingMetamodel()
 						.getEntityDescriptor( getHibernateEntityName() );
-		final DiscriminatorType<?> discriminatorType = entityDescriptor.getDiscriminatorDomainType();
+		final var discriminatorType = entityDescriptor.getDiscriminatorDomainType();
 		return discriminatorType == null ? null
 				: new EntityDiscriminatorSqmPathSource<>( discriminatorType, this, entityDescriptor );
 	}
@@ -151,7 +152,7 @@ public SqmEntityDomainType<J> getPathType() {
 
 	@Override
 	public @Nullable SqmPathSource<?> findSubPathSource(String name) {
-		final PersistentAttribute<? super J,?> attribute = super.findAttribute( name );
+		final var attribute = super.findAttribute( name );
 		if ( attribute != null ) {
 			return (SqmPathSource<?>) attribute;
 		}
@@ -176,13 +177,19 @@ else if ( EntityDiscriminatorMapping.matchesRoleName( name ) ) {
 
 	@Override
 	public @Nullable SqmPathSource<?> findSubPathSource(String name, boolean includeSubtypes) {
-		final PersistentAttribute<? super J,?> attribute = super.findAttribute( name );
+		final var attribute = super.findAttribute( name );
 		if ( attribute != null ) {
+			if ( attribute.getDeclaringType().getPersistenceType() == MAPPED_SUPERCLASS ) {
+				final var concreteGeneric = findConcreteGenericAttribute( name );
+				if ( concreteGeneric != null ) {
+					return (SqmPathSource<?>) concreteGeneric;
+				}
+			}
 			return (SqmPathSource<?>) attribute;
 		}
 		else {
 			if ( includeSubtypes ) {
-				final PersistentAttribute<?, ?> subtypeAttribute = findSubtypeAttribute( name );
+				final var subtypeAttribute = findSubtypeAttribute( name );
 				if ( subtypeAttribute != null ) {
 					return (SqmPathSource<?>) subtypeAttribute;
 				}
@@ -201,8 +208,8 @@ else if ( EntityDiscriminatorMapping.matchesRoleName( name ) ) {
 
 	private SqmPersistentAttribute<?, ?> findSubtypeAttribute(String name) {
 		SqmPersistentAttribute<?,?> subtypeAttribute = null;
-		for ( SqmManagedDomainType<?> subtype : getSubTypes() ) {
-			final SqmPersistentAttribute<?,?> candidate = subtype.findSubTypesAttribute( name );
+		for ( var subtype : super.getSubTypes() ) {
+			final var candidate = subtype.findSubTypesAttribute( name );
 			if ( candidate != null ) {
 				if ( subtypeAttribute != null
 						&& !isCompatible( subtypeAttribute, candidate, metamodel.getMappingMetamodel() ) ) {
@@ -249,8 +256,15 @@ public PersistenceType getPersistenceType() {
 
 	@Override
 	public Collection<? extends SqmEntityDomainType<? extends J>> getSubTypes() {
-		//noinspection unchecked
-		return (Collection<? extends SqmEntityDomainType<? extends J>>) super.getSubTypes();
+		return subtypes;
+	}
+
+	@Override
+	public void addSubType(ManagedDomainType<? extends J> subType) {
+		super.addSubType( subType );
+		if ( subType instanceof SqmEntityDomainType<? extends J> entityDomainType ) {
+			subtypes.add( entityDomainType );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
index e412aa39bb02..e08792583ec9 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
@@ -14,6 +14,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
@@ -21,6 +22,7 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import org.hibernate.AssertionFailure;
 import org.hibernate.boot.model.NamedEntityGraphDefinition;
 import org.hibernate.boot.query.NamedQueryDefinition;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
@@ -58,6 +60,7 @@
 
 import static java.util.Collections.emptySet;
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
+import static org.hibernate.internal.util.type.PrimitiveWrappers.canonicalize;
 import static org.hibernate.metamodel.internal.InjectionHelper.injectEntityGraph;
 import static org.hibernate.metamodel.internal.InjectionHelper.injectTypedQueryReference;
 
@@ -66,11 +69,11 @@
  */
 public class JpaMetamodelImpl implements JpaMetamodelImplementor, Serializable {
 
-	private static class ImportInfo<T> {
+	private static class ImportInfo {
 		private final String importedName;
-		private Class<T> loadedClass; // could be null for boot metamodel import; not final to allow for populating later
+		private Class<?> loadedClass; // could be null for boot metamodel import; not final to allow for populating later
 
-		private ImportInfo(String importedName, Class<T> loadedClass) {
+		private ImportInfo(String importedName, Class<?> loadedClass) {
 			this.importedName = importedName;
 			this.loadedClass = loadedClass;
 		}
@@ -93,7 +96,7 @@ private ImportInfo(String importedName, Class<T> loadedClass) {
 
 	private final Map<Class<?>, String> entityProxyInterfaceMap = new HashMap<>();
 
-	private final Map<String, ImportInfo<?>> nameToImportMap = new ConcurrentHashMap<>();
+	private final Map<String, ImportInfo> nameToImportMap = new ConcurrentHashMap<>();
 	private final Map<String, Object> knownInvalidnameToImportMap = new ConcurrentHashMap<>();
 
 
@@ -116,14 +119,13 @@ public ServiceRegistry getServiceRegistry() {
 	}
 
 	@Override
-	public @Nullable <X> ManagedDomainType<X> findManagedType(@Nullable String typeName) {
-		//noinspection unchecked
-		return typeName == null ? null : (ManagedDomainType<X>) managedTypeByName.get( typeName );
+	public @Nullable ManagedDomainType<?> findManagedType(@Nullable String typeName) {
+		return typeName == null ? null : managedTypeByName.get( typeName );
 	}
 
 	@Override
-	public <X> ManagedDomainType<X> managedType(String typeName) {
-		final ManagedDomainType<X> managedType = findManagedType( typeName );
+	public ManagedDomainType<?> managedType(String typeName) {
+		final var managedType = findManagedType( typeName );
 		if ( managedType == null ) {
 			throw new IllegalArgumentException( "Not a managed type: " + typeName );
 		}
@@ -137,18 +139,18 @@ public EntityDomainType<?> findEntityType(@Nullable String entityName) {
 			return null;
 		}
 
-		final ManagedDomainType<?> managedType = managedTypeByName.get( entityName );
-		if ( managedType instanceof EntityDomainType<?> entityDomainType ){
+		if ( managedTypeByName.get( entityName )
+				instanceof EntityDomainType<?> entityDomainType ){
 			return entityDomainType;
 		}
 
 		// NOTE: `managedTypeByName` is keyed by Hibernate entity name.
 		// If there is a direct match based on key, we want that one - see above.
-		// However, the JPA contract for `#entity` is to match `@Entity(name)`; if there
-		// was no direct match, we need to iterate over all of the and look based on
-		// JPA entity-name.
+		// However, the JPA contract for `#entity` is to match `@Entity(name)`;
+		// if there was no direct match, we need to iterate over all of them and
+		// look based on JPA entity name.
 
-		for ( Map.Entry<String, ManagedDomainType<?>> entry : managedTypeByName.entrySet() ) {
+		for ( var entry : managedTypeByName.entrySet() ) {
 			if ( entry.getValue() instanceof EntityDomainType<?> possibility ) {
 				if ( entityName.equals( possibility.getName() ) ) {
 					return possibility;
@@ -176,7 +178,7 @@ public EmbeddableDomainType<?> findEmbeddableType(@Nullable String embeddableNam
 		if ( embeddableName == null ) {
 			return null;
 		}
-		final ManagedDomainType<?> managedType = managedTypeByName.get( embeddableName );
+		final var managedType = managedTypeByName.get( embeddableName );
 		if ( !( managedType instanceof EmbeddableDomainType<?> embeddableDomainType ) ) {
 			return null;
 		}
@@ -185,7 +187,7 @@ public EmbeddableDomainType<?> findEmbeddableType(@Nullable String embeddableNam
 
 	@Override
 	public EmbeddableDomainType<?> embeddable(String embeddableName) {
-		final EmbeddableDomainType<?> embeddableType = findEmbeddableType( embeddableName );
+		final var embeddableType = findEmbeddableType( embeddableName );
 		if ( embeddableType == null ) {
 			throw new IllegalArgumentException( "Not an embeddable: " + embeddableName );
 		}
@@ -193,52 +195,60 @@ public EmbeddableDomainType<?> embeddable(String embeddableName) {
 	}
 
 	@Override
-	public <X> EntityDomainType<X> getHqlEntityReference(String entityName) {
-		Class<X> loadedClass = null;
-		final ImportInfo<X> importInfo = resolveImport( entityName );
+	public EntityDomainType<?> getHqlEntityReference(String entityName) {
+		Class<?> loadedClass = null;
+		final var importInfo = resolveImport( entityName );
 		if ( importInfo != null ) {
 			loadedClass = importInfo.loadedClass;
 			entityName = importInfo.importedName;
 		}
 
-		final EntityDomainType<?> entityDescriptor = findEntityType( entityName );
+		final var entityDescriptor = findEntityType( entityName );
 		if ( entityDescriptor != null ) {
-			//noinspection unchecked
-			return (EntityDomainType<X>) entityDescriptor;
+			return entityDescriptor;
 		}
 
 		if ( loadedClass == null ) {
 			loadedClass = resolveRequestedClass( entityName );
-			// populate class cache for boot metamodel imports
+			// populate the class cache for boot metamodel imports
 			if ( importInfo != null && loadedClass != null ) {
 				importInfo.loadedClass = loadedClass;
 			}
 		}
-		if ( loadedClass != null ) {
-			return resolveEntityReference( loadedClass );
-		}
-		return null;
+
+		return loadedClass == null ? null : resolveEntityReference( loadedClass );
 	}
 
 	@Override
-	public <X> EntityDomainType<X> resolveHqlEntityReference(String entityName) {
-		final EntityDomainType<X> hqlEntityReference = getHqlEntityReference( entityName );
+	public EntityDomainType<?> resolveHqlEntityReference(String entityName) {
+		final var hqlEntityReference = getHqlEntityReference( entityName );
 		if ( hqlEntityReference == null ) {
 			throw new EntityTypeException( "Could not resolve entity name '" + entityName + "'", entityName );
 		}
 		return hqlEntityReference;
 	}
 
+	private static <X> ManagedDomainType<X> checkDomainType(Class<X> cls, ManagedDomainType<?> domainType) {
+		if ( domainType != null && !Objects.equals( domainType.getJavaType(), cls ) ) {
+			throw new IllegalStateException( "Managed type " + domainType
+						+ " has a different Java type than requested" );
+		}
+		else {
+			@SuppressWarnings("unchecked") // Safe, we checked it
+			final var type = (ManagedDomainType<X>) domainType;
+			return type;
+		}
+	}
+
 	@Override
 	@Nullable
 	public <X> ManagedDomainType<X> findManagedType(Class<X> cls) {
-		//noinspection unchecked
-		return (ManagedDomainType<X>) managedTypeByClass.get( cls );
+		return checkDomainType( cls, managedTypeByClass.get( cls ) );
 	}
 
 	@Override
 	public <X> ManagedDomainType<X> managedType(Class<X> cls) {
-		final ManagedDomainType<X> type = findManagedType( cls );
+		final var type = findManagedType( cls );
 		if ( type == null ) {
 			// per JPA
 			throw new IllegalArgumentException( "Not a managed type: " + cls );
@@ -249,17 +259,15 @@ public <X> ManagedDomainType<X> managedType(Class<X> cls) {
 	@Override
 	@Nullable
 	public <X> EntityDomainType<X> findEntityType(Class<X> cls) {
-		final ManagedType<?> type = managedTypeByClass.get( cls );
-		if ( !( type instanceof EntityDomainType<?> ) ) {
-			return null;
-		}
-		//noinspection unchecked
-		return (EntityDomainType<X>) type;
+		return checkDomainType( cls, managedTypeByClass.get( cls ) )
+					instanceof EntityDomainType<X> entityDomainType
+				? entityDomainType
+				: null;
 	}
 
 	@Override
 	public <X> EntityDomainType<X> entity(Class<X> cls) {
-		final EntityDomainType<X> entityType = findEntityType( cls );
+		final var entityType = findEntityType( cls );
 		if ( entityType == null ) {
 			throw new IllegalArgumentException( "Not an entity: " + cls.getName() );
 		}
@@ -268,17 +276,15 @@ public <X> EntityDomainType<X> entity(Class<X> cls) {
 
 	@Override
 	public @Nullable <X> EmbeddableDomainType<X> findEmbeddableType(Class<X> cls) {
-		final ManagedType<?> type = managedTypeByClass.get( cls );
-		if ( !( type instanceof EmbeddableDomainType<?> ) ) {
-			return null;
-		}
-		//noinspection unchecked
-		return (EmbeddableDomainType<X>) type;
+		return checkDomainType( cls, managedTypeByClass.get( cls ) )
+					instanceof EmbeddableDomainType<X> embeddableDomainType
+				? embeddableDomainType
+				: null;
 	}
 
 	@Override
 	public <X> EmbeddableDomainType<X> embeddable(Class<X> cls) {
-		final EmbeddableDomainType<X> embeddableType = findEmbeddableType( cls );
+		final var embeddableType = findEmbeddableType( cls );
 		if ( embeddableType == null ) {
 			throw new IllegalArgumentException( "Not an embeddable: " + cls.getName() );
 		}
@@ -322,7 +328,7 @@ public Set<EmbeddableType<?>> getEmbeddables() {
 
 	@Override
 	public EnumJavaType<?> getEnumType(String className) {
-		final EnumJavaType<?> enumJavaType = enumJavaTypes.get( className );
+		final var enumJavaType = enumJavaTypes.get( className );
 		if ( enumJavaType != null ) {
 			return enumJavaType;
 		}
@@ -332,8 +338,10 @@ public EnumJavaType<?> getEnumType(String className) {
 				if ( clazz == null || !clazz.isEnum() ) {
 					return null;
 				}
-				//noinspection rawtypes,unchecked
-				return new EnumJavaType( clazz );
+				else {
+					//noinspection rawtypes,unchecked
+					return new EnumJavaType( clazz );
+				}
 			}
 			catch (ClassLoadingException e) {
 				throw new RuntimeException( e );
@@ -349,7 +357,7 @@ public <E extends Enum<E>> E enumValue(EnumJavaType<E> enumType, String enumValu
 	@Override
 	public JavaType<?> getJavaConstantType(String className, String fieldName) {
 		try {
-			final Field referencedField = getJavaField( className, fieldName );
+			final var referencedField = getJavaField( className, fieldName );
 			if ( referencedField != null ) {
 				return getTypeConfiguration().getJavaTypeRegistry()
 						.resolveDescriptor( referencedField.getType() );
@@ -362,11 +370,19 @@ public JavaType<?> getJavaConstantType(String className, String fieldName) {
 	}
 
 	@Override
-	public <T> T getJavaConstant(String className, String fieldName) {
+	public <E> E getJavaConstant(String className, String fieldName, Class<E> javaTypeClass) {
 		try {
-			final Field referencedField = getJavaField( className, fieldName );
-			//noinspection unchecked
-			return (T) referencedField.get( null );
+			final var referencedField = getJavaField( className, fieldName );
+			if ( referencedField == null ) {
+				throw new IllegalArgumentException( "Referenced field '" + fieldName
+						+ "' of class '" + className + "' does not exist" );
+			}
+			if ( !javaTypeClass.isAssignableFrom( canonicalize( referencedField.getType() ) ) ) {
+				throw new IllegalArgumentException( "Referenced field '" + fieldName
+						+ "' of class '" + className
+						+ "' is not assignable to '" + javaTypeClass.getTypeName() + "'" );
+			}
+			return javaTypeClass.cast( referencedField.get( null) );
 		}
 		catch (NoSuchFieldException | IllegalAccessException e) {
 			throw new RuntimeException( e );
@@ -375,15 +391,12 @@ public <T> T getJavaConstant(String className, String fieldName) {
 
 	private Field getJavaField(String className, String fieldName) throws NoSuchFieldException {
 		final Class<?> namedClass = classLoaderService.classForName( className );
-		if ( namedClass != null ) {
-			return namedClass.getDeclaredField( fieldName );
-		}
-		return null;
+		return namedClass == null ? null : namedClass.getDeclaredField( fieldName );
 	}
 
 	@Override
 	public void addNamedEntityGraph(String graphName, RootGraphImplementor<?> rootGraph) {
-		final EntityGraph<?> old = entityGraphMap.put( graphName, rootGraph.makeImmutableCopy( graphName ) );
+		final var old = entityGraphMap.put( graphName, rootGraph.makeImmutableCopy( graphName ) );
 		if ( old != null ) {
 			CORE_LOGGER.tracef( "EntityGraph named '%s' was replaced", graphName );
 		}
@@ -396,7 +409,7 @@ public RootGraphImplementor<?> findEntityGraphByName(String name) {
 
 	@Override
 	public <T> List<EntityGraph<? super T>> findEntityGraphsByJavaType(Class<T> entityClass) {
-		final EntityDomainType<T> entityType = entity( entityClass );
+		final var entityType = entity( entityClass );
 		if ( entityType == null ) {
 			throw new IllegalArgumentException( "Given class is not an entity: " + entityClass.getName() );
 		}
@@ -415,7 +428,7 @@ public <T> List<EntityGraph<? super T>> findEntityGraphsByJavaType(Class<T> enti
 
 	@Override
 	public <T> Map<String, EntityGraph<? extends T>> getNamedEntityGraphs(Class<T> entityClass) {
-		final EntityDomainType<T> entityType = entity( entityClass );
+		final var entityType = entity( entityClass );
 		if ( entityType == null ) {
 			throw new IllegalArgumentException( "Given class is not an entity: " + entityClass.getName() );
 		}
@@ -434,27 +447,26 @@ public <T> Map<String, EntityGraph<? extends T>> getNamedEntityGraphs(Class<T> e
 
 	@Override
 	public String qualifyImportableName(String queryName) {
-		final ImportInfo<?> importInfo = resolveImport( queryName );
+		final var importInfo = resolveImport( queryName );
 		return importInfo == null ? null : importInfo.importedName;
 	}
 
-	private <T> ImportInfo<T> resolveImport(final String name) {
-		final ImportInfo<?> importInfo = nameToImportMap.get( name );
+	private ImportInfo resolveImport(final String name) {
+		final var importInfo = nameToImportMap.get( name );
 		//optimal path first
 		if ( importInfo != null ) {
-			//noinspection unchecked
-			return (ImportInfo<T>) importInfo;
+			return importInfo;
 		}
 		else {
-			//then check the negative cache, to avoid bothering the classloader unnecessarily
+			//then check the negative cache to avoid bothering the classloader unnecessarily
 			if ( knownInvalidnameToImportMap.containsKey( name ) ) {
 				return null;
 			}
 			else {
-				// see if the name is a fully-qualified class name
-				final Class<T> loadedClass = resolveRequestedClass( name );
+				// see if the name is a fully qualified class name
+				final var loadedClass = resolveRequestedClass( name );
 				if ( loadedClass == null ) {
-					// it is NOT a fully-qualified class name - add a marker entry so we do not keep trying later
+					// it is NOT a fully qualified class name - add a marker entry, so we do not keep trying later
 					// note that ConcurrentHashMap does not support null value so a marker entry is needed
 					// [HHH-14948] But only add it if the cache size isn't getting too large, as in some use cases
 					// the queries are dynamically generated and this cache could lead to memory leaks when left unbounded.
@@ -470,9 +482,9 @@ private <T> ImportInfo<T> resolveImport(final String name) {
 					return null;
 				}
 				else {
-					// it is a fully-qualified class name - add it to the cache
+					// it is a fully qualified class name - add it to the cache
 					// so to not needing to load from the classloader again
-					final ImportInfo<T> info = new ImportInfo<>( name, loadedClass );
+					final var info = new ImportInfo( name, loadedClass );
 					nameToImportMap.put( name, info );
 					return info;
 				}
@@ -481,35 +493,34 @@ private <T> ImportInfo<T> resolveImport(final String name) {
 	}
 
 	private void applyNamedEntityGraphs(Collection<NamedEntityGraphDefinition> namedEntityGraphs) {
-		for ( NamedEntityGraphDefinition definition : namedEntityGraphs ) {
+		for ( var definition : namedEntityGraphs ) {
 			CORE_LOGGER.tracef( "Applying named entity graph [name=%s, source=%s]",
 					definition.name(), definition.source() );
 
-			final RootGraphImplementor<?> graph = definition.graphCreator().createEntityGraph(
-					(entityClass) -> {
-						final ManagedDomainType<?> managedDomainType = managedTypeByClass.get( entityClass );
-						if ( managedDomainType instanceof EntityDomainType<?> match ) {
+			final var graph = definition.graphCreator().createEntityGraph(
+					entityClass -> {
+						if ( managedTypeByClass.get( entityClass ) instanceof EntityDomainType<?> match ) {
 							return match;
 						}
 						throw new IllegalArgumentException( "Cannot resolve entity class : " + entityClass.getName() );
 					},
-					(jpaEntityName) -> {
-						for ( Map.Entry<String, ManagedDomainType<?>> entry : managedTypeByName.entrySet() ) {
-							if ( entry.getValue() instanceof EntityDomainType<?> possibility ) {
-								if ( jpaEntityName.equals( possibility.getName() ) ) {
-									return possibility;
-								}
+					jpaEntityName -> {
+						for ( var entry : managedTypeByName.entrySet() ) {
+							if ( entry.getValue() instanceof EntityDomainType<?> possibility
+									&& jpaEntityName.equals( possibility.getName() ) ) {
+								return possibility;
 							}
 						}
 						throw new IllegalArgumentException( "Cannot resolve entity name : " + jpaEntityName );
-					}
+					},
+					serviceRegistry
 			);
 			entityGraphMap.put( definition.name(), graph );
 		}
 	}
 
 
-	private <X> Class<X> resolveRequestedClass(String entityName) {
+	private Class<?> resolveRequestedClass(String entityName) {
 		try {
 			return classLoaderService.classForName( entityName );
 		}
@@ -518,68 +529,29 @@ private <X> Class<X> resolveRequestedClass(String entityName) {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
-	public <T> EntityDomainType<T> resolveEntityReference(Class<T> javaType) {
+	private EntityDomainType<?> resolveEntityReference(Class<?> javaType) {
 		// try the incoming Java type as a "strict" entity reference
-		{
-			final ManagedDomainType<?> managedType = managedTypeByClass.get( javaType );
-			if ( managedType instanceof EntityDomainType<?> ) {
-				return (EntityDomainType<T>) managedType;
-			}
+		final var managedType = managedTypeByClass.get( javaType );
+		if ( managedType instanceof EntityDomainType<?> entityDomainType ) {
+			return entityDomainType;
 		}
 
 		// Next, try it as a proxy interface reference
-		{
-			final String proxyEntityName = entityProxyInterfaceMap.get( javaType );
-			if ( proxyEntityName != null ) {
-				return (EntityDomainType<T>) entity( proxyEntityName );
-			}
+		final String proxyEntityName = entityProxyInterfaceMap.get( javaType );
+		if ( proxyEntityName != null ) {
+			return entity( proxyEntityName );
 		}
 
 		// otherwise, try to handle it as a polymorphic reference
-		{
-			final EntityDomainType<T> polymorphicDomainType =
-					(EntityDomainType<T>) polymorphicEntityReferenceMap.get( javaType );
-			if ( polymorphicDomainType != null ) {
-				return polymorphicDomainType;
-			}
-
-			// create a set of descriptors that should be used to build the polymorphic EntityDomainType
-			final Set<EntityDomainType<? extends T>> matchingDescriptors = new HashSet<>();
-			for ( ManagedDomainType<?> managedType : managedTypeByName.values() ) {
-				if ( managedType.getPersistenceType() != Type.PersistenceType.ENTITY ) {
-					continue;
-				}
-				// see if we should add `entityDomainType` as one of the matching-descriptors.
-				if ( javaType.isAssignableFrom( managedType.getJavaType() ) ) {
-					// the queried type is assignable from the type of the current entity-type
-					// we should add it to the collecting set of matching descriptors.  it should
-					// be added aside from a few cases...
-
-					// if the managed-type has a super type and the java type is assignable from the super type,
-					// do not add the managed-type as the super itself will get added and the initializers for
-					// entity mappings already handle loading subtypes - adding it would be redundant and lead to
-					// incorrect results
-					final ManagedDomainType<?> superType = managedType.getSuperType();
-					if ( superType != null
-							&& superType.getPersistenceType() == Type.PersistenceType.ENTITY
-							&& javaType.isAssignableFrom( superType.getJavaType() ) ) {
-						continue;
-					}
-
-					// otherwise, add it
-					matchingDescriptors.add( (EntityDomainType<? extends T>) managedType );
-				}
-			}
-
-			// if we found any matching, create the virtual root EntityDomainType reference
-			if ( !matchingDescriptors.isEmpty() ) {
-				final var polymorphicRootDescriptor = new SqmPolymorphicRootDescriptor<>(
-						typeConfiguration.getJavaTypeRegistry().resolveDescriptor( javaType ),
-						matchingDescriptors,
-						this
-				);
-				polymorphicEntityReferenceMap.putIfAbsent( javaType, polymorphicRootDescriptor );
+		final var polymorphicDomainType =
+						polymorphicEntityReferenceMap.get( javaType );
+		if ( polymorphicDomainType != null ) {
+			return polymorphicDomainType;
+		}
+		else {
+			final var polymorphicRootDescriptor =
+					createPolymorphicRootDescriptor( javaType );
+			if ( polymorphicRootDescriptor != null ) {
 				return polymorphicRootDescriptor;
 			}
 		}
@@ -590,6 +562,50 @@ public <T> EntityDomainType<T> resolveEntityReference(Class<T> javaType) {
 		);
 	}
 
+	private <T> @Nullable SqmPolymorphicRootDescriptor<T> createPolymorphicRootDescriptor(Class<T> javaType) {
+		// create a set of descriptors that should be used to build the polymorphic EntityDomainType
+		final Set<EntityDomainType<? extends T>> matchingDescriptors = new HashSet<>();
+		for ( var managedType : managedTypeByName.values() ) {
+			if ( managedType.getPersistenceType() == Type.PersistenceType.ENTITY
+				// see if we should add EntityDomainType as one of the matching descriptors.
+				&& javaType.isAssignableFrom( managedType.getJavaType() ) ) {
+				// The queried type is assignable from the type of the current entity type.
+				// We should add it to the collecting set of matching descriptors. It should
+				// be added aside from a few cases...
+
+				// If the managed type has a supertype and the java type is assignable from the super type,
+				// do not add the managed type as the supertype itself will get added and the initializers
+				// for entity mappings already handle loading subtypes - adding it would be redundant and
+				// lead to incorrect results
+				final var superType = managedType.getSuperType();
+				if ( superType == null
+						|| superType.getPersistenceType() != Type.PersistenceType.ENTITY
+						|| !javaType.isAssignableFrom( superType.getJavaType() ) ) {
+					final var entityDomainType = (EntityDomainType<?>) managedType;
+					if ( !javaType.isAssignableFrom( entityDomainType.getJavaType() ) ) {
+						throw new AssertionFailure( "Supertype mismatch: " + javaType.getTypeName()
+								+ " is not a supertype of " + entityDomainType.getJavaType().getTypeName() );
+					}
+					@SuppressWarnings("unchecked") // Safe, we just checked
+					final var castDomainType = (EntityDomainType<? extends T>) entityDomainType;
+					matchingDescriptors.add( castDomainType );
+				}
+			}
+		}
+
+		// if we found any matching, create the virtual root EntityDomainType reference
+		if ( !matchingDescriptors.isEmpty() ) {
+			final var polymorphicRootDescriptor = new SqmPolymorphicRootDescriptor<>(
+					typeConfiguration.getJavaTypeRegistry().resolveDescriptor( javaType ),
+					matchingDescriptors,
+					this
+			);
+			polymorphicEntityReferenceMap.putIfAbsent( javaType, polymorphicRootDescriptor );
+			return polymorphicRootDescriptor;
+		}
+		return null;
+	}
+
 	@Override
 	public MappingMetamodel getMappingMetamodel() {
 		return mappingMetamodel;
@@ -604,10 +620,11 @@ public void processJpa(
 			Collection<NamedEntityGraphDefinition> namedEntityGraphDefinitions,
 			RuntimeModelCreationContext runtimeModelCreationContext) {
 		bootMetamodel.getImports()
-				.forEach( (key, value) -> this.nameToImportMap.put( key, new ImportInfo<>( value, null ) ) );
+				.forEach( (key, value) -> nameToImportMap.put( key,
+						new ImportInfo( value, null ) ) );
 		this.entityProxyInterfaceMap.putAll( entityProxyInterfaceMap );
 
-		final MetadataContext context = new MetadataContext(
+		final var context = new MetadataContext(
 				this,
 				mappingMetamodel,
 				bootMetamodel,
@@ -628,31 +645,31 @@ public void processJpa(
 		this.jpaMetaModelPopulationSetting = jpaMetaModelPopulationSetting;
 
 		// Identifiable types (Entities and MappedSuperclasses)
-		this.managedTypeByName.putAll( context.getIdentifiableTypesByName() );
-		this.managedTypeByClass.putAll( context.getEntityTypeMap() );
-		this.managedTypeByClass.putAll( context.getMappedSuperclassTypeMap() );
+		managedTypeByName.putAll( context.getIdentifiableTypesByName() );
+		managedTypeByClass.putAll( context.getEntityTypeMap() );
+		managedTypeByClass.putAll( context.getMappedSuperclassTypeMap() );
 
 		// Embeddable types
 		int mapEmbeddables = 0;
-		for ( EmbeddableDomainType<?> embeddable : context.getEmbeddableTypeSet() ) {
+		for ( var embeddable : context.getEmbeddableTypeSet() ) {
 			// Do not register the embeddable types for id classes
 			if ( embeddable.getExpressibleJavaType() instanceof EntityJavaType<?> ) {
 				continue;
 			}
-			final Class<?> embeddableClass = embeddable.getJavaType();
+			final var embeddableClass = embeddable.getJavaType();
 			if ( embeddableClass != Map.class ) {
-				this.managedTypeByClass.put( embeddable.getJavaType(), embeddable );
-				this.managedTypeByName.put( embeddable.getTypeName(), embeddable );
+				managedTypeByClass.put( embeddable.getJavaType(), embeddable );
+				managedTypeByName.put( embeddable.getTypeName(), embeddable );
 			}
 			else {
-				this.managedTypeByName.put( "dynamic-embeddable-" + mapEmbeddables++, embeddable );
+				managedTypeByName.put( "dynamic-embeddable-" + mapEmbeddables++, embeddable );
 			}
 		}
 
 		typeConfiguration.getJavaTypeRegistry().forEachDescriptor( descriptor -> {
 			if ( descriptor instanceof EnumJavaType<? extends Enum<?>> enumJavaType ) {
-				final Class<? extends Enum<?>> enumJavaClass = enumJavaType.getJavaTypeClass();
-				for ( Enum<?> enumConstant : enumJavaClass.getEnumConstants() ) {
+				final var enumJavaClass = enumJavaType.getJavaTypeClass();
+				for ( var enumConstant : enumJavaClass.getEnumConstants() ) {
 					addAllowedEnumLiteralsToEnumTypesMap(
 							allowedEnumLiteralsToEnumTypeNames,
 							enumConstant.name(),
@@ -731,7 +748,8 @@ private EntityTypeImpl<?> buildEntityType(
 			MetadataContext context,
 			TypeConfiguration typeConfiguration) {
 		context.pushEntityWorkedOn( persistentClass );
-		final var entityType = entityType( persistentClass, persistentClass.getMappedClass(), context, typeConfiguration );
+		final var entityType =
+				entityType( persistentClass, persistentClass.getMappedClass(), context, typeConfiguration );
 		context.registerEntityType( persistentClass, entityType );
 		context.popEntityWorkedOn( persistentClass );
 		return entityType;
@@ -742,27 +760,31 @@ private <J> EntityTypeImpl<J> entityType(
 			Class<J> mappedClass,
 			MetadataContext context,
 			TypeConfiguration typeConfiguration) {
-		@SuppressWarnings("unchecked")
-		final var supertype =
-				(IdentifiableDomainType<? super J>)
-						supertypeForPersistentClass( persistentClass, context, typeConfiguration );
-		final JavaType<J> javaType;
+		return new EntityTypeImpl<>(
+				entityJavaType( mappedClass, context ),
+				narrowSupertype( mappedClass,
+					supertypeForPersistentClass( persistentClass, context, typeConfiguration ) ),
+				persistentClass,
+				this
+		);
+	}
+
+	private static <J> JavaType<J> entityJavaType(Class<J> mappedClass, MetadataContext context) {
 		if ( mappedClass == null || Map.class.isAssignableFrom( mappedClass ) ) {
 			// dynamic map
 			//noinspection unchecked
-			javaType = (JavaType<J>) new DynamicModelJavaType();
+			return (JavaType<J>) new DynamicModelJavaType();
 		}
 		else {
-			javaType = context.getTypeConfiguration().getJavaTypeRegistry()
+			return context.getTypeConfiguration().getJavaTypeRegistry()
 					.resolveEntityTypeDescriptor( mappedClass );
 		}
-		return new EntityTypeImpl<>( javaType, supertype, persistentClass, this );
 	}
 
 	private void handleUnusedMappedSuperclasses(MetadataContext context, TypeConfiguration typeConfiguration) {
-		final Set<MappedSuperclass> unusedMappedSuperclasses = context.getUnusedMappedSuperclasses();
+		final var unusedMappedSuperclasses = context.getUnusedMappedSuperclasses();
 		if ( !unusedMappedSuperclasses.isEmpty() ) {
-			for ( MappedSuperclass mappedSuperclass : unusedMappedSuperclasses ) {
+			for ( var mappedSuperclass : unusedMappedSuperclasses ) {
 				CORE_LOGGER.unusedMappedSuperclass( mappedSuperclass.getMappedClass().getName() );
 				locateOrBuildMappedSuperclassType( mappedSuperclass, context, typeConfiguration );
 			}
@@ -773,7 +795,7 @@ private MappedSuperclassDomainType<?> locateOrBuildMappedSuperclassType(
 			MappedSuperclass mappedSuperclass,
 			MetadataContext context,
 			TypeConfiguration typeConfiguration) {
-		final MappedSuperclassDomainType<?> mappedSuperclassType =
+		final var mappedSuperclassType =
 				context.locateMappedSuperclassType( mappedSuperclass );
 		return mappedSuperclassType == null
 				? buildMappedSuperclassType( mappedSuperclass, mappedSuperclass.getMappedClass(), context, typeConfiguration )
@@ -785,32 +807,54 @@ private <T> MappedSuperclassTypeImpl<T> buildMappedSuperclassType(
 			Class<T> mappedClass,
 			MetadataContext context,
 			TypeConfiguration typeConfiguration) {
-		@SuppressWarnings("unchecked")
-		final IdentifiableDomainType<? super T> superType =
-				(IdentifiableDomainType<? super T>)
-						supertypeForMappedSuperclass( mappedSuperclass, context, typeConfiguration );
-		final JavaType<T> javaType =
-				context.getTypeConfiguration().getJavaTypeRegistry()
-						.resolveManagedTypeDescriptor( mappedClass );
-		final MappedSuperclassTypeImpl<T> mappedSuperclassType =
-				new MappedSuperclassTypeImpl<>( javaType, mappedSuperclass, superType, this );
+		final var mappedSuperclassType =
+				new MappedSuperclassTypeImpl<>(
+						context.getTypeConfiguration().getJavaTypeRegistry()
+								.resolveManagedTypeDescriptor( mappedClass ),
+						mappedSuperclass,
+						narrowSupertype( mappedClass,
+								supertypeForMappedSuperclass( mappedSuperclass, context, typeConfiguration ) ),
+						this
+				);
 		context.registerMappedSuperclassType( mappedSuperclass, mappedSuperclassType );
 		return mappedSuperclassType;
 	}
 
-	private IdentifiableDomainType<?> supertypeForPersistentClass(
+	private <J> @Nullable IdentifiableDomainType<? super J> narrowSupertype(
+			Class<J> mappedClass, @Nullable IdentifiableDomainType<?> supertypeDomainType) {
+		if ( supertypeDomainType == null ) {
+			return null;
+		}
+		else if ( mappedClass == null ) {
+			// dynamic map
+			//noinspection unchecked
+			return (IdentifiableDomainType<? super J>)
+					supertypeDomainType;
+		}
+		else {
+			if ( !supertypeDomainType.getJavaType().isAssignableFrom( mappedClass ) ) {
+				throw new AssertionFailure( "Supertype mismatch: "
+						+ supertypeDomainType.getJavaType().getTypeName()
+						+ " is not a supertype of " + mappedClass.getTypeName() );
+			}
+			@SuppressWarnings("unchecked") // Safe, we just checked
+			final var supertype = (IdentifiableDomainType<? super J>) supertypeDomainType;
+			return supertype;
+		}
+	}
+
+	private @Nullable IdentifiableDomainType<?> supertypeForPersistentClass(
 			PersistentClass persistentClass,
 			MetadataContext context,
 			TypeConfiguration typeConfiguration) {
-		final MappedSuperclass superMappedSuperclass = persistentClass.getSuperMappedSuperclass();
-		final IdentifiableDomainType<?> supertype =
+		final var superMappedSuperclass = persistentClass.getSuperMappedSuperclass();
+		final var supertype =
 				superMappedSuperclass == null
 						? null
 						: locateOrBuildMappedSuperclassType( superMappedSuperclass, context, typeConfiguration );
-
-		//no mappedSuperclass, check for a super entity
 		if ( supertype == null ) {
-			final PersistentClass superPersistentClass = persistentClass.getSuperclass();
+			// no mapped superclass, check for a super entity
+			final var superPersistentClass = persistentClass.getSuperclass();
 			return superPersistentClass == null
 					? null
 					: locateOrBuildEntityType( superPersistentClass, context, typeConfiguration );
@@ -820,18 +864,18 @@ private IdentifiableDomainType<?> supertypeForPersistentClass(
 		}
 	}
 
-	private IdentifiableDomainType<?> supertypeForMappedSuperclass(
+	private @Nullable IdentifiableDomainType<?> supertypeForMappedSuperclass(
 			MappedSuperclass mappedSuperclass,
 			MetadataContext context,
 			TypeConfiguration typeConfiguration) {
-		final MappedSuperclass superMappedSuperclass = mappedSuperclass.getSuperMappedSuperclass();
-		final IdentifiableDomainType<?> superType =
+		final var superMappedSuperclass = mappedSuperclass.getSuperMappedSuperclass();
+		final var superType =
 				superMappedSuperclass == null
 						? null
 						: locateOrBuildMappedSuperclassType( superMappedSuperclass, context, typeConfiguration );
-		//no mappedSuperclass, check for a super entity
 		if ( superType == null ) {
-			final PersistentClass superPersistentClass = mappedSuperclass.getSuperPersistentClass();
+			//no mapped superclass, check for a super entity
+			final var superPersistentClass = mappedSuperclass.getSuperPersistentClass();
 			return superPersistentClass == null
 					? null
 					: locateOrBuildEntityType( superPersistentClass, context, typeConfiguration );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java
index eb6030e662f8..4f5cb67470a9 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java
@@ -9,7 +9,6 @@
 import org.hibernate.metamodel.UnsupportedMappingException;
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
 import org.hibernate.metamodel.model.domain.IdentifiableDomainType;
-import org.hibernate.metamodel.model.domain.PersistentAttribute;
 import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
@@ -89,7 +88,7 @@ public SqmMappedSuperclassDomainType<J> getPathType() {
 
 	@Override
 	public @Nullable SqmPathSource<?> findSubPathSource(String name) {
-		final PersistentAttribute<?,?> attribute = findAttribute( name );
+		final var attribute = findAttribute( name );
 		if ( attribute != null ) {
 			return (SqmPathSource<?>) attribute;
 		}
@@ -103,7 +102,7 @@ else if ( "id".equalsIgnoreCase( name ) ) {
 
 	@Override
 	public @Nullable SqmPathSource<?> getIdentifierDescriptor() {
-		return (SqmPathSource<?>) super.getIdentifierDescriptor();
+		return super.getIdentifierDescriptor();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java
index 33209e400641..ac68541722c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java
@@ -35,6 +35,7 @@
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.metamodel.model.domain.NavigableRole;
+import org.hibernate.query.sqm.tree.domain.SqmManagedDomainType;
 import org.hibernate.type.BindingContext;
 import org.hibernate.query.sqm.tuple.TupleType;
 import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
@@ -58,7 +59,6 @@
 import org.hibernate.type.ComponentType;
 import org.hibernate.type.descriptor.java.EnumJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import jakarta.persistence.metamodel.EmbeddableType;
@@ -113,12 +113,12 @@ public class MappingMetamodelImpl
 	// - ignoring Hibernate's representation mode (entity mode), the Class
 	// object for an entity (or mapped superclass) always refers to the same
 	// JPA EntityType and Hibernate EntityPersister. The problem arises with
-	// embeddables. For an embeddable, as with the rest of its metamodel,
+	// embeddables. For an embeddable type, as with the rest of its metamodel,
 	// Hibernate combines the embeddable's relational/mapping while JPA does
 	// not. This is perfectly consistent with each paradigm. But it results
 	// in a mismatch since JPA expects a single "type descriptor" for a
-	// given embeddable class while Hibernate incorporates the
-	// relational/mapping info so we have a "type descriptor" for each usage
+	// given embeddable class, while Hibernate incorporates the
+	// relational/mapping info, so we have a "type descriptor" for each usage
 	// of that embeddable type. (Think embeddable versus embedded.)
 	//
 	// To account for this, we track both paradigms here.
@@ -258,11 +258,9 @@ private void processBootCollections(
 		for ( final var model : collectionBindings ) {
 			final String role = model.getRole();
 			final var persister =
-					persisterFactory.createCollectionPersister(
-							model,
+					persisterFactory.createCollectionPersister( model,
 							cacheImplementor.getCollectionRegionAccess( new NavigableRole( role ) ),
-							modelCreationContext
-					);
+							modelCreationContext );
 			collectionPersisterMap.put( role, persister );
 			if ( persister.getIndexType() instanceof org.hibernate.type.EntityType entityType ) {
 				registerEntityParticipant( entityType, persister );
@@ -360,32 +358,29 @@ public boolean isEntityClass(Class<?> entityJavaType) {
 
 	@Override
 	public EntityPersister getEntityDescriptor(Class<?> entityJavaType) {
-		var entityPersister = entityPersisterMap.get( entityJavaType.getName() );
-		if ( entityPersister == null ) {
-			final String mappedEntityName = entityProxyInterfaceMap.get( entityJavaType );
-			if ( mappedEntityName != null ) {
-				entityPersister = entityPersisterMap.get( mappedEntityName );
-			}
-		}
-		if ( entityPersister == null ) {
-			throw new UnknownEntityTypeException( entityJavaType );
-		}
-		return entityPersister;
+		return getEntityPersister( entityJavaType );
 	}
 
 	@Override @Deprecated(forRemoval = true) @SuppressWarnings( "removal" )
 	public EntityPersister locateEntityDescriptor(Class<?> byClass) {
-		var entityPersister = entityPersisterMap.get( byClass.getName() );
-		if ( entityPersister == null ) {
+		return getEntityPersister( byClass );
+	}
+
+	private EntityPersister getEntityPersister(Class<?> byClass) {
+		final var entityPersister = entityPersisterMap.get( byClass.getName() );
+		if ( entityPersister != null ) {
+			return entityPersister;
+		}
+		else {
 			final String mappedEntityName = entityProxyInterfaceMap.get( byClass );
 			if ( mappedEntityName != null ) {
-				entityPersister = entityPersisterMap.get( mappedEntityName );
+				final var persister = entityPersisterMap.get( mappedEntityName );
+				if ( persister != null ) {
+					return persister;
+				}
 			}
-		}
-		if ( entityPersister == null ) {
 			throw new UnknownEntityTypeException( byClass );
 		}
-		return entityPersister;
 	}
 
 	@Override
@@ -419,12 +414,12 @@ public Set<EmbeddableType<?>> getEmbeddables() {
 	}
 
 	@Override
-	public @Nullable <X> ManagedDomainType<X> findManagedType(@Nullable String typeName) {
+	public @Nullable ManagedDomainType<?> findManagedType(@Nullable String typeName) {
 		return jpaMetamodel.findManagedType( typeName );
 	}
 
 	@Override
-	public <X> ManagedDomainType<X> managedType(String typeName) {
+	public ManagedDomainType<?> managedType(String typeName) {
 		return jpaMetamodel.managedType( typeName );
 	}
 
@@ -449,12 +444,12 @@ public EmbeddableDomainType<?> embeddable(String embeddableName) {
 	}
 
 	@Override
-	public <X> EntityDomainType<X> getHqlEntityReference(String entityName) {
+	public EntityDomainType<?> getHqlEntityReference(String entityName) {
 		return jpaMetamodel.getHqlEntityReference( entityName );
 	}
 
 	@Override
-	public <X> EntityDomainType<X> resolveHqlEntityReference(String entityName) {
+	public EntityDomainType<?> resolveHqlEntityReference(String entityName) {
 		return jpaMetamodel.resolveHqlEntityReference( entityName );
 	}
 
@@ -489,8 +484,8 @@ public JavaType<?> getJavaConstantType(String className, String fieldName) {
 	}
 
 	@Override
-	public <T> T getJavaConstant(String className, String fieldName) {
-		return jpaMetamodel.getJavaConstant( className, fieldName );
+	public <E> E getJavaConstant(String className, String fieldName, Class<E> javaTypeClass) {
+		return jpaMetamodel.getJavaConstant( className, fieldName, javaTypeClass );
 	}
 
 	@Override
@@ -644,21 +639,21 @@ public String[] getAllCollectionRoles() {
 	public <T> @Nullable BindableType<T> resolveParameterBindType(Class<T> javaType) {
 		final var typeConfiguration = getTypeConfiguration();
 
-		final BasicType<T> basicType = typeConfiguration.getBasicTypeForJavaType( javaType );
+		final var basicType = typeConfiguration.getBasicTypeForJavaType( javaType );
 		// For enums, we simply don't know the exact mapping if there is no basic type registered
 		if ( basicType != null || javaType.isEnum() ) {
 			return basicType;
 		}
 
-		final ManagedDomainType<T> managedType = jpaMetamodel.findManagedType( javaType );
+		final var managedType = jpaMetamodel.findManagedType( javaType );
 		if ( managedType != null ) {
-			return (BindableType<T>) managedType;
+			return (SqmManagedDomainType<T>) managedType;
 		}
 
 		final var javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
-		final JavaType<T> javaTypeDescriptor = javaTypeRegistry.findDescriptor( javaType );
+		final var javaTypeDescriptor = javaTypeRegistry.findDescriptor( javaType );
 		if ( javaTypeDescriptor != null ) {
-			final JdbcType recommendedJdbcType =
+			final var recommendedJdbcType =
 					javaTypeDescriptor.getRecommendedJdbcType( typeConfiguration.getCurrentBaseSqlTypeIndicators() );
 			if ( recommendedJdbcType != null ) {
 				return typeConfiguration.getBasicTypeRegistry().resolve( javaTypeDescriptor, recommendedJdbcType );
@@ -685,25 +680,20 @@ public String[] getAllCollectionRoles() {
 			return null;
 		}
 
-		final Class<T> clazz = unproxiedClass( bindValue );
-
-		// Resolve superclass bindable type if necessary, as we don't register types for e.g. Inet4Address
-		Class<? super T> c = clazz;
-		do {
-			final BindableType<? super T> type = resolveParameterBindType( c );
-			if ( type != null ) {
-				return type;
-			}
-			c = c.getSuperclass();
+		final var clazz = unproxiedClass( bindValue );
+		// Resolve the superclass bindable type if necessary,
+		// as we don't register types for e.g. Inet4Address
+		var type = searchSupertypesForBindableType( clazz );
+		if ( type != null ) {
+			return type;
 		}
-		while ( c != Object.class );
 
 		if ( clazz.isEnum() ) {
 			return null; //createEnumType( (Class) clazz );
 		}
 		else if ( Serializable.class.isAssignableFrom( clazz ) ) {
 			final var parameterBindType = resolveParameterBindType( Serializable.class );
-			//noinspection unchecked
+			//noinspection unchecked (completely safe)
 			return (BindableType<? super T>) parameterBindType;
 		}
 		else {
@@ -711,6 +701,19 @@ else if ( Serializable.class.isAssignableFrom( clazz ) ) {
 		}
 	}
 
+	private <T> @Nullable BindableType<? super T> searchSupertypesForBindableType(Class<T> clazz) {
+		Class<? super T> c = clazz;
+		do {
+			final var type = resolveParameterBindType( c );
+			if ( type != null ) {
+				return type;
+			}
+			c = c.getSuperclass();
+		}
+		while ( c != Object.class );
+		return null;
+	}
+
 	private static <T> Class<T> unproxiedClass(T bindValue) {
 		final var lazyInitializer = extractLazyInitializer( bindValue );
 		final var result =
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PathHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PathHelper.java
index b9889b827173..3a30d128b970 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PathHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PathHelper.java
@@ -11,8 +11,9 @@
 
 public class PathHelper {
 	public static NavigablePath append(SqmPath<?> lhs, SqmPathSource<?> rhs, @Nullable SqmPathSource<?> intermediatePathSource) {
+		final var navigablePath = lhs.getNavigablePath();
 		return intermediatePathSource == null
-				? lhs.getNavigablePath().append( rhs.getPathName() )
-				: lhs.getNavigablePath().append( intermediatePathSource.getPathName() ).append( rhs.getPathName() );
+				? navigablePath.append( rhs.getPathName() )
+				: navigablePath.append( intermediatePathSource.getPathName() ).append( rhs.getPathName() );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java
index a47add5cdde1..028144d45019 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java
@@ -86,7 +86,7 @@ public static <Y, X> PersistentAttribute<X, Y> build(
 				attributeMetadata.getMember()
 		);
 
-		final Class<Y> javaClass = attributeJtd.getJavaTypeClass();
+		final var javaClass = attributeJtd.getJavaTypeClass();
 		if ( Map.class.equals( javaClass ) ) {
 			return new MapAttributeImpl( builder );
 		}
@@ -124,7 +124,7 @@ else if ( Collection.class.isAssignableFrom( javaClass ) ) {
 	private static SimpleDomainType<?> determineListIndexOrMapKeyType(
 			PluralAttributeMetadata<?,?,?> attributeMetadata,
 			MetadataContext metadataContext) {
-		final Class<?> javaType = attributeMetadata.getJavaType();
+		final var javaType = attributeMetadata.getJavaType();
 		if ( Map.class.isAssignableFrom( javaType ) ) {
 			return (SimpleDomainType<?>)
 					determineSimpleType( attributeMetadata.getMapKeyValueContext(), metadataContext );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java
index 28f1f9c3565d..0fe85954e99c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java
@@ -10,18 +10,12 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.metamodel.AttributeClassification;
-import org.hibernate.metamodel.mapping.CollectionPart;
-import org.hibernate.metamodel.model.domain.AnyMappingDomainType;
 import org.hibernate.metamodel.model.domain.IdentifiableDomainType;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
-import org.hibernate.metamodel.model.domain.PluralPersistentAttribute;
 import org.hibernate.metamodel.model.domain.SimpleDomainType;
-import org.hibernate.query.SemanticException;
-import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.hql.spi.SqmCreationState;
-import org.hibernate.query.sqm.internal.SqmMappingModelHelper;
 import org.hibernate.query.sqm.tree.SqmJoinType;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.query.sqm.tree.domain.SqmSingularJoin;
@@ -31,13 +25,14 @@
 import org.hibernate.query.sqm.tree.from.SqmFrom;
 import org.hibernate.query.sqm.tree.from.SqmFunctionJoin;
 import org.hibernate.query.sqm.tree.from.SqmJoin;
-import org.hibernate.query.sqm.tree.from.SqmRoot;
 import org.hibernate.spi.EntityIdentifierNavigablePath;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.type.BasicPluralType;
 import org.hibernate.type.descriptor.java.JavaType;
 
 import static jakarta.persistence.metamodel.Bindable.BindableType.SINGULAR_ATTRIBUTE;
+import static org.hibernate.query.sqm.internal.SqmMappingModelHelper.resolveSqmPathSource;
+import static org.hibernate.query.sqm.spi.SqmCreationHelper.buildParentNavigablePath;
 import static org.hibernate.query.sqm.spi.SqmCreationHelper.buildSubNavigablePath;
 import static org.hibernate.query.sqm.spi.SqmCreationHelper.determineAlias;
 
@@ -77,7 +72,7 @@ public SingularAttributeImpl(
 		this.isVersion = isVersion;
 		this.isOptional = isOptional;
 
-		this.sqmPathSource = SqmMappingModelHelper.resolveSqmPathSource(
+		this.sqmPathSource = resolveSqmPathSource(
 				name,
 				this,
 				attributeType,
@@ -157,22 +152,18 @@ public SqmJoin<D,J> createSqmJoin(
 			@Nullable String alias,
 			boolean fetched,
 			SqmCreationState creationState) {
-		final NodeBuilder nodeBuilder = creationState.getCreationContext().getNodeBuilder();
-		if ( getType() instanceof AnyMappingDomainType ) {
-			throw new SemanticException( "An @Any attribute cannot be join fetched" );
-		}
-		else if ( sqmPathSource.getPathType() instanceof BasicPluralType<?,?> ) {
+		final var nodeBuilder = creationState.getCreationContext().getNodeBuilder();
+		if ( sqmPathSource.getPathType() instanceof BasicPluralType<?,?> ) {
 			final SqmSetReturningFunction<J> setReturningFunction =
 					nodeBuilder.unnestArray( lhs.get( getName() ) );
-			//noinspection unchecked
-			final SqmFunctionJoin<J> join = new SqmFunctionJoin<>(
+			final var join = new SqmFunctionJoin<>(
 					createNavigablePath( lhs, alias ),
 					setReturningFunction,
 					true,
 					setReturningFunction.getType(),
 					alias,
 					joinType,
-					(SqmRoot<Object>) lhs
+					(SqmFrom<?, Object>) lhs
 			);
 			return (SqmJoin<D, J>) join;
 		}
@@ -232,11 +223,7 @@ public NavigablePath createNavigablePath(SqmPath<?> parent, @Nullable String ali
 						"LHS cannot be null for a sub-navigable reference - " + getName()
 				);
 			}
-			final SqmPathSource<?> parentPathSource = parent.getResolvedModel();
-			final NavigablePath parentNavigablePath =
-					parentPathSource instanceof PluralPersistentAttribute<?, ?, ?>
-							? parent.getNavigablePath().append( CollectionPart.Nature.ELEMENT.getName() )
-							: parent.getNavigablePath();
+			final var parentNavigablePath = buildParentNavigablePath( parent, "" );
 			if ( getDeclaringType() instanceof IdentifiableDomainType<?> declaringType
 					&& !declaringType.hasSingleIdAttribute() ) {
 				return new EntityIdentifierNavigablePath( parentNavigablePath, null )
@@ -291,7 +278,7 @@ public boolean isOptional() {
 
 	@Override
 	public boolean isAssociation() {
-		final PersistentAttributeType persistentAttributeType = getPersistentAttributeType();
+		final var persistentAttributeType = getPersistentAttributeType();
 		return persistentAttributeType == PersistentAttributeType.MANY_TO_ONE
 			|| persistentAttributeType == PersistentAttributeType.ONE_TO_ONE;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
index 8f9d8968cccc..e2c6d551e783 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
@@ -124,6 +124,7 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.function.Consumer;
+import java.util.function.UnaryOperator;
 
 import static java.util.Collections.emptyList;
 import static org.hibernate.internal.util.StringHelper.getNonEmptyOrConjunctionIfBothNonEmpty;
@@ -137,6 +138,7 @@
 import static org.hibernate.pretty.MessageHelper.collectionInfoString;
 import static org.hibernate.sql.Template.renderWhereStringTemplate;
 import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
+import static org.hibernate.temporal.TemporalTableStrategy.HISTORY_TABLE;
 
 /**
  * Base implementation of the {@code QueryableCollection} interface.
@@ -177,6 +179,8 @@ public abstract class AbstractCollectionPersister
 
 	// columns
 	protected final String[] keyColumnNames;
+	protected final String[] keyFormulaTemplates;
+	protected final String[] keyFormulas;
 	protected final String[] indexColumnNames;
 	protected final String[] indexFormulaTemplates;
 	protected final String[] indexFormulas;
@@ -297,6 +301,8 @@ public AbstractCollectionPersister(
 
 		isVersioned = collectionBootDescriptor.isOptimisticLocked();
 
+		final var typeConfiguration = creationContext.getTypeConfiguration();
+
 		// KEY
 
 		final var key = collectionBootDescriptor.getKey();
@@ -304,16 +310,19 @@ public AbstractCollectionPersister(
 		keyType = key.getType();
 		final int keySpan = key.getColumnSpan();
 		keyColumnNames = new String[keySpan];
+		keyFormulaTemplates = new String[keySpan];
+		keyFormulas = new String[keySpan];
 		keyColumnAliases = new String[keySpan];
 		int k = 0;
 		for ( var selectable: key.getSelectables() ) {
 			// NativeSQL: collect key column and auto-aliases
 			keyColumnAliases[k] = selectable.getAlias( dialect, table );
-			if ( selectable instanceof Column column ) {
-				keyColumnNames[k] = column.getQuotedName( dialect );
+			if ( selectable instanceof Formula formula ) {
+				keyFormulaTemplates[k] = formula.getTemplate( dialect, typeConfiguration );
+				keyFormulas[k] = formula.getFormula();
 			}
-			else {
-				throw new MappingException( "Collection keys may not contain formulas: " + navigableRole.getFullPath() );
+			else if ( selectable instanceof Column column ) {
+				keyColumnNames[k] = column.getQuotedName( dialect );
 			}
 			k++;
 		}
@@ -334,8 +343,6 @@ public AbstractCollectionPersister(
 		// because it's needed in OneToManyPersister.getTableName()
 		spaces[0] = getTableName();
 
-		final var typeConfiguration = creationContext.getTypeConfiguration();
-
 		final int elementSpan = elementBootDescriptor.getColumnSpan();
 		elementColumnAliases = new String[elementSpan];
 		elementColumnNames = new String[elementSpan];
@@ -513,23 +520,23 @@ private FilterHelper manyToManyFilterHelper(Collection collection, RuntimeModelC
 	private FilterHelper filterHelper(
 			Collection collection, EntityPersister elementPersister, RuntimeModelCreationContext context) {
 		final var filters = collection.getFilters();
-		if ( filters.isEmpty() ) {
-			return null;
-		}
-		else {
-			final var entityNameByTableNameMap =
-					elementPersister == null
-							? null
-							: AbstractEntityPersister.getEntityNameByTableNameMap(
-									context.getBootModel().getEntityBinding( elementPersister.getEntityName() ),
-									context.getSessionFactory().getSqlStringGenerationContext()
-							);
-			return new FilterHelper( filters, entityNameByTableNameMap, factory );
-		}
+		return filters.isEmpty()
+				? null
+				: new FilterHelper( filters, entityNameByTableNameMap( elementPersister, context ), factory );
+	}
+
+	private static Map<String, String> entityNameByTableNameMap(
+			EntityPersister elementPersister, RuntimeModelCreationContext context) {
+		return elementPersister == null
+				? null
+				: AbstractEntityPersister.getEntityNameByTableNameMap(
+						context.getBootModel().getEntityBinding( elementPersister.getEntityName() ),
+						context.getSessionFactory().getSqlStringGenerationContext()
+				);
 	}
 
 	private static int batchSize(Collection collection, SessionFactoryOptions options) {
-		int batchSize = collection.getBatchSize();
+		final int batchSize = collection.getBatchSize();
 		return batchSize >= 0
 				? batchSize
 				: options.getDefaultBatchFetchSize();
@@ -538,8 +545,8 @@ private static int batchSize(Collection collection, SessionFactoryOptions option
 	private static CacheEntryStructure cacheEntryStructure(Collection collection, SessionFactoryOptions options) {
 		if ( options.isStructuredCacheEntriesEnabled() ) {
 			return collection.isMap()
-							? StructuredMapCacheEntry.INSTANCE
-							: StructuredCollectionCacheEntry.INSTANCE;
+					? StructuredMapCacheEntry.INSTANCE
+					: StructuredCollectionCacheEntry.INSTANCE;
 		}
 		else {
 			return UnstructuredCacheEntry.INSTANCE;
@@ -887,7 +894,8 @@ public boolean useShallowQueryCacheLayout() {
 		return useShallowQueryCacheLayout;
 	}
 
-	protected abstract RowMutationOperations getRowMutationOperations();
+	@Override
+	public abstract RowMutationOperations getRowMutationOperations();
 	protected abstract RemoveCoordinator getRemoveCoordinator();
 
 	@Override
@@ -1013,6 +1021,7 @@ protected String generateSelectSizeString(boolean isIntegerIndexed) {
 		return new SimpleSelect( getFactory() )
 				.setTableName( getTableName() )
 				.addRestriction( getKeyColumnNames() )
+				.addRestriction( keyFormulas )
 				.addWhereToken( sqlWhereString )
 				.addColumn( selectValue )
 				.toStatementString();
@@ -1026,8 +1035,9 @@ protected String generateDetectRowByIndexString() {
 			return new SimpleSelect( getFactory() )
 					.setTableName( getTableName() )
 					.addRestriction( getKeyColumnNames() )
+					.addRestriction( getKeyFormulas() )
 					.addRestriction( getIndexColumnNames() )
-					.addRestriction( indexFormulas )
+					.addRestriction( getIndexFormulas() )
 					.addWhereToken( sqlWhereString )
 					.addColumn( "1" )
 					.toStatementString();
@@ -1039,8 +1049,9 @@ protected String generateDetectRowByElementString() {
 		return new SimpleSelect( getFactory() )
 				.setTableName( getTableName() )
 				.addRestriction( getKeyColumnNames() )
+				.addRestriction( getKeyFormulas() )
 				.addRestriction( getElementColumnNames() )
-				.addRestriction( elementFormulas )
+				.addRestriction( getElementFormulas() )
 				.addWhereToken( sqlWhereString )
 				.addColumn( "1" )
 				.toStatementString();
@@ -1058,6 +1069,18 @@ public String[] getKeyColumnNames() {
 		return keyColumnNames;
 	}
 
+	public String[] getKeyFormulas() {
+		return keyFormulas;
+	}
+
+	public String[] getElementFormulas() {
+		return elementFormulas;
+	}
+
+	public String[] getIndexFormulas() {
+		return indexFormulas;
+	}
+
 	@Override
 	public boolean hasIndex() {
 		return collectionSemantics.getCollectionClassification().isIndexed();
@@ -1090,7 +1113,12 @@ public void remove(Object id, SharedSessionContractImplementor session) throws H
 		getRemoveCoordinator().deleteAllRows( id, session );
 	}
 
-	protected boolean isRowDeleteEnabled() {
+	boolean isHistoryStrategy() {
+		return getFactory().getSessionFactoryOptions().getTemporalTableStrategy() == HISTORY_TABLE;
+	}
+
+	@Override
+	public boolean isRowDeleteEnabled() {
 		return keyIsUpdateable;
 	}
 
@@ -1099,10 +1127,26 @@ public boolean needsRemove() {
 		return !isInverse() && isRowDeleteEnabled();
 	}
 
-	protected boolean isRowInsertEnabled() {
+	@Override
+	public boolean isRowInsertEnabled() {
 		return keyIsUpdateable;
 	}
 
+	@Override
+	public boolean[] getIndexColumnIsSettable() {
+		return indexColumnIsSettable;
+	}
+
+	@Override
+	public boolean[] getElementColumnIsSettable() {
+		return elementColumnIsSettable;
+	}
+
+	@Override
+	public UnaryOperator<Object> getIndexIncrementer() {
+		return this::incrementIndexByBase;
+	}
+
 	public String getOwnerEntityName() {
 		return ownerPersister.getEntityName();
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java
index 95be9c0f067b..010b7ee89dac 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java
@@ -19,19 +19,11 @@
 import org.hibernate.mapping.Collection;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.persister.collection.mutation.DeleteRowsCoordinator;
-import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorNoOp;
-import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorStandard;
 import org.hibernate.persister.collection.mutation.InsertRowsCoordinator;
-import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorNoOp;
-import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorStandard;
 import org.hibernate.persister.collection.mutation.OperationProducer;
 import org.hibernate.persister.collection.mutation.RemoveCoordinator;
-import org.hibernate.persister.collection.mutation.RemoveCoordinatorNoOp;
-import org.hibernate.persister.collection.mutation.RemoveCoordinatorStandard;
 import org.hibernate.persister.collection.mutation.RowMutationOperations;
 import org.hibernate.persister.collection.mutation.UpdateRowsCoordinator;
-import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorNoOp;
-import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorStandard;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.model.ast.ColumnValueBinding;
@@ -48,6 +40,8 @@
 
 import java.util.List;
 
+import static org.hibernate.temporal.TemporalTableStrategy.NATIVE;
+import static org.hibernate.temporal.TemporalTableStrategy.SINGLE_TABLE;
 import static org.hibernate.internal.util.collections.ArrayHelper.isAnyTrue;
 import static org.hibernate.internal.util.collections.CollectionHelper.arrayList;
 import static org.hibernate.persister.collection.mutation.RowMutationOperations.DEFAULT_RESTRICTOR;
@@ -77,13 +71,15 @@ public BasicCollectionPersister(
 					throws MappingException, CacheException {
 		super( collectionBinding, cacheAccessStrategy, creationContext );
 		this.rowMutationOperations = buildRowMutationOperations();
-		this.insertRowsCoordinator = buildInsertRowCoordinator();
-		this.updateCoordinator = buildUpdateRowCoordinator();
-		this.deleteRowsCoordinator = buildDeleteRowCoordinator();
-		this.removeCoordinator = buildDeleteAllCoordinator();
+		final var stateManagement = collectionBinding.getStateManagement();
+		this.insertRowsCoordinator = stateManagement.createInsertRowsCoordinator( this );
+		this.updateCoordinator = stateManagement.createUpdateRowsCoordinator( this );
+		this.deleteRowsCoordinator = stateManagement.createDeleteRowsCoordinator( this );
+		this.removeCoordinator = stateManagement.createRemoveCoordinator( this );
 	}
 
-	protected RowMutationOperations getRowMutationOperations() {
+	@Override
+	public RowMutationOperations getRowMutationOperations() {
 		return rowMutationOperations;
 	}
 
@@ -130,93 +126,19 @@ protected void doProcessQueuedOps(PersistentCollection<?> collection, Object id,
 	}
 
 	private boolean isPerformingUpdates() {
-		return getCollectionSemantics().getCollectionClassification().isRowUpdatePossible()
-			&& isAnyTrue( elementColumnIsSettable )
-			&& !isInverse();
-	}
-
-	private UpdateRowsCoordinator buildUpdateRowCoordinator() {
-		if ( !isPerformingUpdates() ) {
-//			if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
-//				MODEL_MUTATION_LOGGER.tracef(
-//						"Skipping collection row updates - %s",
-//						getRolePath()
-//				);
-//			}
-			return new UpdateRowsCoordinatorNoOp( this );
-		}
-		else {
-			return new UpdateRowsCoordinatorStandard(
-					this,
-					rowMutationOperations,
-					getFactory()
-			);
-		}
-	}
-
-	private InsertRowsCoordinator buildInsertRowCoordinator() {
-		if ( isInverse() || !isRowInsertEnabled() ) {
-//			if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
-//				MODEL_MUTATION_LOGGER.tracef(
-//						"Skipping collection inserts - %s",
-//						getRolePath()
-//				);
-//			}
-			return new InsertRowsCoordinatorNoOp( this );
-		}
-		else {
-			return new InsertRowsCoordinatorStandard(
-					this,
-					rowMutationOperations,
-					getFactory().getServiceRegistry()
-			);
-		}
-	}
-
-	private DeleteRowsCoordinator buildDeleteRowCoordinator() {
-		if ( !needsRemove() ) {
-//			if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
-//				MODEL_MUTATION_LOGGER.tracef(
-//						"Skipping collection row deletions - %s",
-//						getRolePath()
-//				);
-//			}
-			return new DeleteRowsCoordinatorNoOp( this );
-		}
-		else {
-			return new DeleteRowsCoordinatorStandard(
-					this,
-					rowMutationOperations,
-					hasPhysicalIndexColumn(),
-					getFactory().getServiceRegistry()
-			);
-		}
+		return !isInverse()
+			&& getCollectionSemantics().getCollectionClassification().isRowUpdatePossible()
+			&& isAnyTrue( elementColumnIsSettable );
 	}
 
-	private RemoveCoordinator buildDeleteAllCoordinator() {
-		if ( !needsRemove() ) {
-//			if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
-//				MODEL_MUTATION_LOGGER.tracef(
-//						"Skipping collection removals - %s",
-//						getRolePath()
-//				);
-//			}
-			return new RemoveCoordinatorNoOp( this );
-		}
-		else {
-			return new RemoveCoordinatorStandard(
-					this,
-					this::buildDeleteAllOperation,
-					getFactory().getServiceRegistry()
-			);
-		}
-	}
-
-
 	@Override
 	public RestrictedTableMutation<JdbcMutationOperation> generateDeleteAllAst(MutatingTableReference tableReference) {
 		final var attributeMapping = getAttributeMapping();
 		assert attributeMapping != null;
+		final var temporalMapping = attributeMapping.getTemporalMapping();
+		if ( temporalMapping != null && shouldApplyTemporalOperations( tableReference ) ) {
+			return generateTemporalDeleteAllAst( tableReference );
+		}
 		final var softDeleteMapping = attributeMapping.getSoftDeleteMapping();
 		if ( softDeleteMapping == null ) {
 			return super.generateDeleteAllAst( tableReference );
@@ -243,6 +165,30 @@ public RestrictedTableMutation<JdbcMutationOperation> generateDeleteAllAst(Mutat
 		}
 	}
 
+	protected RestrictedTableMutation<JdbcMutationOperation> generateTemporalDeleteAllAst(MutatingTableReference tableReference) {
+		final var attributeMapping = getAttributeMapping();
+		final var temporalMapping = attributeMapping.getTemporalMapping();
+		assert temporalMapping != null;
+		final var foreignKeyDescriptor = attributeMapping.getKeyDescriptor();
+		assert foreignKeyDescriptor != null;
+		final int keyColumnCount = foreignKeyDescriptor.getJdbcTypeCount();
+		final var parameterBinders =
+				new ColumnValueParameterList( tableReference, ParameterUsage.RESTRICT, keyColumnCount );
+		final List<ColumnValueBinding> restrictionBindings = arrayList( keyColumnCount );
+		applyKeyRestrictions( parameterBinders, restrictionBindings );
+		final var endingColumn = new ColumnReference( tableReference, temporalMapping.getEndingColumnMapping() );
+		final var endingBinding = temporalMapping.createEndingValueBinding( endingColumn );
+		final var nullEndingBinding = temporalMapping.createNullEndingValueBinding( endingColumn );
+		return new TableUpdateStandard(
+				tableReference,
+				this,
+				"temporal removal",
+				List.of( endingBinding ),
+				restrictionBindings,
+				List.of( nullEndingBinding )
+		);
+	}
+
 	protected RowMutationOperations buildRowMutationOperations() {
 		final OperationProducer insertRowOperationProducer;
 		final RowMutationOperations.Values insertRowValues;
@@ -281,6 +227,14 @@ protected RowMutationOperations buildRowMutationOperations() {
 			deleteRowRestrictions = null;
 		}
 
+		final OperationProducer deleteAllRowsOperationProducer;
+		if ( !isInverse() && isRowDeleteEnabled() ) {
+			deleteAllRowsOperationProducer = this::buildDeleteAllOperation;
+		}
+		else {
+			deleteAllRowsOperationProducer = null;
+		}
+
 		return new RowMutationOperations(
 				this,
 				insertRowOperationProducer,
@@ -289,7 +243,8 @@ protected RowMutationOperations buildRowMutationOperations() {
 				updateRowValues,
 				updateRowRestrictions,
 				deleteRowOperationProducer,
-				deleteRowRestrictions
+				deleteRowRestrictions,
+				deleteAllRowsOperationProducer
 		);
 	}
 
@@ -329,6 +284,15 @@ else if ( indexDescriptor != null ) {
 			final var columnReference = new ColumnReference( insertBuilder.getMutatingTable(), softDeleteMapping );
 			insertBuilder.addValueColumn( softDeleteMapping.createNonDeletedValueBinding( columnReference ) );
 		}
+		final var temporalMapping = attributeMapping.getTemporalMapping();
+		if ( temporalMapping != null && shouldApplyTemporalOperations( insertBuilder.getMutatingTable() ) ) {
+			final var startingColumnReference =
+					new ColumnReference( insertBuilder.getMutatingTable(), temporalMapping.getStartingColumnMapping() );
+			insertBuilder.addValueColumn( temporalMapping.createStartingValueBinding( startingColumnReference ) );
+			final var endingColumnReference =
+					new ColumnReference( insertBuilder.getMutatingTable(), temporalMapping.getEndingColumnMapping() );
+			insertBuilder.addValueColumn( temporalMapping.createNullEndingValueBinding( endingColumnReference ) );
+		}
 	}
 
 	private JdbcMutationOperation buildGeneratedInsertRowOperation(MutatingTableReference tableReference) {
@@ -420,6 +384,15 @@ private void applyInsertRowValues(
 				},
 				session
 		);
+
+		final var temporalMapping = attributeMapping.getTemporalMapping();
+		if ( temporalMapping != null && isUsingTransactionIdParameters( session ) ) {
+			jdbcValueBindings.bindValue(
+					session.getCurrentTransactionIdentifier(),
+					temporalMapping.getStartingColumnMapping(),
+					ParameterUsage.SET
+			);
+		}
 	}
 
 
@@ -565,6 +538,10 @@ private JdbcMutationOperation generateDeleteRowOperation(MutatingTableReference
 	private RestrictedTableMutation<JdbcMutationOperation> generateDeleteRowAst(MutatingTableReference tableReference) {
 		final var pluralAttribute = getAttributeMapping();
 		assert pluralAttribute != null;
+		final var temporalMapping = pluralAttribute.getTemporalMapping();
+		if ( temporalMapping != null && shouldApplyTemporalOperations( tableReference ) ) {
+			return generateTemporalDeleteRowsAst( tableReference );
+		}
 		final var softDeleteMapping = pluralAttribute.getSoftDeleteMapping();
 		if ( softDeleteMapping != null ) {
 			return generateSoftDeleteRowsAst( tableReference );
@@ -633,6 +610,39 @@ protected RestrictedTableMutation<JdbcMutationOperation> generateSoftDeleteRowsA
 		return updateBuilder.buildMutation();
 	}
 
+	protected RestrictedTableMutation<JdbcMutationOperation> generateTemporalDeleteRowsAst(MutatingTableReference tableReference) {
+		final var attributeMapping = getAttributeMapping();
+		final var temporalMapping = attributeMapping.getTemporalMapping();
+		assert temporalMapping != null;
+		final var foreignKeyDescriptor = attributeMapping.getKeyDescriptor();
+		assert foreignKeyDescriptor != null;
+		final TableUpdateBuilderStandard<JdbcMutationOperation> updateBuilder = new TableUpdateBuilderStandard<>(
+				this,
+				tableReference,
+				getFactory(),
+				sqlWhereString
+		);
+		final var identifierDescriptor = attributeMapping.getIdentifierDescriptor();
+		if ( identifierDescriptor != null ) {
+			updateBuilder.addKeyRestrictionsLeniently( identifierDescriptor );
+		}
+		else {
+			updateBuilder.addKeyRestrictionsLeniently( foreignKeyDescriptor.getKeyPart() );
+			if ( hasIndex() && !indexContainsFormula ) {
+				assert attributeMapping.getIndexDescriptor() != null;
+				updateBuilder.addKeyRestrictionsLeniently( attributeMapping.getIndexDescriptor() );
+			}
+			else {
+				updateBuilder.addKeyRestrictions( attributeMapping.getElementDescriptor() );
+			}
+		}
+
+		final var endingColumnReference = new ColumnReference( tableReference, temporalMapping.getEndingColumnMapping() );
+		updateBuilder.addValueColumn( temporalMapping.createEndingValueBinding( endingColumnReference ) );
+		updateBuilder.addNonKeyRestriction( temporalMapping.createNullEndingValueBinding( endingColumnReference ) );
+		return updateBuilder.buildMutation();
+	}
+
 	private void applyDeleteRowRestrictions(
 			PersistentCollection<?> collection,
 			Object keyValue,
@@ -641,6 +651,14 @@ private void applyDeleteRowRestrictions(
 			SharedSessionContractImplementor session,
 			JdbcValueBindings jdbcValueBindings) {
 		final var attributeMapping = getAttributeMapping();
+		final var temporalMapping = attributeMapping.getTemporalMapping();
+		if ( temporalMapping != null && isUsingTransactionIdParameters( session ) ) {
+			jdbcValueBindings.bindValue(
+					session.getCurrentTransactionIdentifier(),
+					temporalMapping.getEndingColumnMapping(),
+					ParameterUsage.SET
+			);
+		}
 		final var identifierDescriptor = attributeMapping.getIdentifierDescriptor();
 		if ( identifierDescriptor != null ) {
 			identifierDescriptor.decompose(
@@ -698,6 +716,29 @@ public boolean isManyToMany() {
 		return elementType instanceof EntityType; //instanceof AssociationType;
 	}
 
+	private static boolean isUsingTransactionIdParameters(SharedSessionContractImplementor session) {
+		final var factory = session.getFactory();
+		return factory.getSessionFactoryOptions().getTemporalTableStrategy() == SINGLE_TABLE
+			&& !factory.getTransactionIdentifierService().useServerTimestamp( session.getDialect() );
+	}
+
+	private boolean isNativeTemporalTablesEnabled() {
+		return getFactory().getSessionFactoryOptions().getTemporalTableStrategy() == NATIVE;
+	}
+
+	private boolean shouldApplyTemporalOperations(MutatingTableReference tableReference) {
+		final var attributeMapping = getAttributeMapping();
+		if ( attributeMapping == null ) {
+			return false;
+		}
+		else {
+			final var temporalMapping = attributeMapping.getTemporalMapping();
+			return temporalMapping != null
+				&& !isNativeTemporalTablesEnabled()
+				&& ( !isHistoryStrategy() || temporalMapping.getTableName().equals( tableReference.getTableName() ) );
+		}
+	}
+
 	@Override
 	public FilterAliasGenerator getFilterAliasGenerator(String rootAlias) {
 		return new StaticFilterAliasGenerator( rootAlias );
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java
index 0b68859fb23e..53d3f20760de 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java
@@ -8,10 +8,12 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.function.UnaryOperator;
 
 import org.hibernate.Filter;
 import org.hibernate.HibernateException;
 import org.hibernate.Incubating;
+import org.hibernate.Internal;
 import org.hibernate.MappingException;
 import org.hibernate.cache.spi.access.CollectionDataAccess;
 import org.hibernate.cache.spi.entry.CacheEntryStructure;
@@ -27,6 +29,7 @@
 import org.hibernate.metamodel.mapping.Restrictable;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
+import org.hibernate.persister.collection.mutation.RowMutationOperations;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.tree.from.TableGroup;
@@ -124,6 +127,24 @@ default boolean needsRemove() {
 		return true;
 	}
 
+	@Internal @Incubating
+	RowMutationOperations getRowMutationOperations();
+
+	@Internal @Incubating
+	boolean isRowInsertEnabled();
+
+	@Internal @Incubating
+	boolean isRowDeleteEnabled();
+
+	@Internal @Incubating
+	boolean[] getIndexColumnIsSettable();
+
+	@Internal @Incubating
+	boolean[] getElementColumnIsSettable();
+
+	@Internal @Incubating
+	UnaryOperator<Object> getIndexIncrementer();
+
 	/**
 	 * Access to the collection's cache region
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
index d29f16385c89..48cf50062ab7 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
@@ -27,24 +27,11 @@
 import org.hibernate.metamodel.mapping.internal.OneToManyCollectionPart;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.persister.collection.mutation.DeleteRowsCoordinator;
-import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorNoOp;
-import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorStandard;
-import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorTablePerSubclass;
 import org.hibernate.persister.collection.mutation.InsertRowsCoordinator;
-import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorNoOp;
-import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorStandard;
-import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorTablePerSubclass;
 import org.hibernate.persister.collection.mutation.OperationProducer;
 import org.hibernate.persister.collection.mutation.RemoveCoordinator;
-import org.hibernate.persister.collection.mutation.RemoveCoordinatorNoOp;
-import org.hibernate.persister.collection.mutation.RemoveCoordinatorStandard;
-import org.hibernate.persister.collection.mutation.RemoveCoordinatorTablePerSubclass;
 import org.hibernate.persister.collection.mutation.RowMutationOperations;
 import org.hibernate.persister.collection.mutation.UpdateRowsCoordinator;
-import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorNoOp;
-import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorOneToMany;
-import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorTablePerSubclass;
-import org.hibernate.persister.entity.UnionSubclassEntityPersister;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.from.TableGroup;
@@ -65,7 +52,6 @@
 import static org.hibernate.internal.util.collections.ArrayHelper.isAnyTrue;
 import static org.hibernate.internal.util.collections.CollectionHelper.arrayList;
 import static org.hibernate.persister.collection.mutation.RowMutationOperations.DEFAULT_RESTRICTOR;
-import static org.hibernate.persister.collection.mutation.RowMutationOperations.DEFAULT_VALUE_SETTER;
 import static org.hibernate.sql.model.ast.builder.TableUpdateBuilder.NULL;
 import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
 
@@ -108,16 +94,16 @@ && isAnyTrue( indexColumnIsSettable )
 					&& !getElementPersisterInternal().managesColumns( indexColumnNames );
 
 		rowMutationOperations = buildRowMutationOperations();
-
-		insertRowsCoordinator = buildInsertCoordinator();
-		updateRowsCoordinator = buildUpdateCoordinator();
-		deleteRowsCoordinator = buildDeleteCoordinator();
-		removeCoordinator = buildDeleteAllCoordinator();
+		final var stateManagement = collectionBinding.getStateManagement();
+		insertRowsCoordinator = stateManagement.createInsertRowsCoordinator( this );
+		updateRowsCoordinator = stateManagement.createUpdateRowsCoordinator( this );
+		deleteRowsCoordinator = stateManagement.createDeleteRowsCoordinator( this );
+		removeCoordinator = stateManagement.createRemoveCoordinator( this );
 		mutationExecutorService = creationContext.getServiceRegistry().getService( MutationExecutorService.class );
 	}
 
 	@Override
-	protected RowMutationOperations getRowMutationOperations() {
+	public RowMutationOperations getRowMutationOperations() {
 		return rowMutationOperations;
 	}
 
@@ -139,7 +125,7 @@ protected RemoveCoordinator getRemoveCoordinator() {
 	}
 
 	@Override
-	protected boolean isRowDeleteEnabled() {
+	public boolean isRowDeleteEnabled() {
 		return super.isRowDeleteEnabled() && keyIsNullable;
 	}
 
@@ -369,6 +355,14 @@ private RowMutationOperations buildRowMutationOperations() {
 			deleteEntryRestrictions = null;
 		}
 
+		final OperationProducer deleteAllEntriesOperationProducer;
+		if ( !isInverse() && isRowDeleteEnabled() ) {
+			deleteAllEntriesOperationProducer = this::buildDeleteAllOperation;
+		}
+		else {
+			deleteAllEntriesOperationProducer = null;
+		}
+
 		return new RowMutationOperations(
 				this,
 				insertRowOperationProducer,
@@ -377,79 +371,11 @@ private RowMutationOperations buildRowMutationOperations() {
 				writeIndexValues,
 				writeIndexRestrictions,
 				deleteEntryOperationProducer,
-				deleteEntryRestrictions
+				deleteEntryRestrictions,
+				deleteAllEntriesOperationProducer
 		);
 	}
 
-	private InsertRowsCoordinator buildInsertCoordinator() {
-		if ( isInverse() || !isRowInsertEnabled() ) {
-//			if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
-//				MODEL_MUTATION_LOGGER.tracef( "Skipping collection (re)creation - %s", getRolePath() );
-//			}
-			return new InsertRowsCoordinatorNoOp( this );
-		}
-		else {
-			final var registry = getFactory().getServiceRegistry();
-			final var elementPersister = getElementPersisterInternal();
-			return elementPersister != null && elementPersister.hasSubclasses()
-						&& elementPersister instanceof UnionSubclassEntityPersister
-					? new InsertRowsCoordinatorTablePerSubclass( this, rowMutationOperations, registry )
-					: new InsertRowsCoordinatorStandard( this, rowMutationOperations, registry );
-		}
-	}
-
-	private UpdateRowsCoordinator buildUpdateCoordinator() {
-		if ( !isRowDeleteEnabled() && !isRowInsertEnabled() ) {
-//			if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
-//				MODEL_MUTATION_LOGGER.tracef( "Skipping collection row updates - %s", getRolePath() );
-//			}
-			return new UpdateRowsCoordinatorNoOp( this );
-		}
-		else {
-			final var elementPersister = getElementPersisterInternal();
-			final var factory = getFactory();
-			return elementPersister != null && elementPersister.hasSubclasses()
-				&& elementPersister instanceof UnionSubclassEntityPersister
-					? new UpdateRowsCoordinatorTablePerSubclass( this, rowMutationOperations, factory )
-					: new UpdateRowsCoordinatorOneToMany( this, rowMutationOperations, factory );
-		}
-	}
-
-	private DeleteRowsCoordinator buildDeleteCoordinator() {
-		if ( !needsRemove() ) {
-//			if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
-//				MODEL_MUTATION_LOGGER.tracef( "Skipping collection row deletions - %s", getRolePath() );
-//			}
-			return new DeleteRowsCoordinatorNoOp( this );
-		}
-		else {
-			final var elementPersister = getElementPersisterInternal();
-			final var registry = getFactory().getServiceRegistry();
-			return elementPersister != null && elementPersister.hasSubclasses()
-				&& elementPersister instanceof UnionSubclassEntityPersister
-					// never delete by index for one-to-many
-					? new DeleteRowsCoordinatorTablePerSubclass( this, rowMutationOperations, false, registry )
-					: new DeleteRowsCoordinatorStandard( this, rowMutationOperations, false, registry );
-		}
-	}
-
-	private RemoveCoordinator buildDeleteAllCoordinator() {
-		if ( ! needsRemove() ) {
-//			if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
-//				MODEL_MUTATION_LOGGER.tracef( "Skipping collection removals - %s", getRolePath() );
-//			}
-			return new RemoveCoordinatorNoOp( this );
-		}
-		else {
-			final var registry = getFactory().getServiceRegistry();
-			final var elementPersister = getElementPersisterInternal();
-			return elementPersister != null && elementPersister.hasSubclasses()
-				&& elementPersister instanceof UnionSubclassEntityPersister
-					? new RemoveCoordinatorTablePerSubclass( this, this::buildDeleteAllOperation, registry )
-					: new RemoveCoordinatorStandard( this, this::buildDeleteAllOperation, registry );
-		}
-	}
-
 	private JdbcMutationOperation generateDeleteRowOperation(MutatingTableReference tableReference) {
 		return getSqlAstTranslatorFactory()
 				.buildModelMutationTranslator( generateDeleteRowAst( tableReference ), getFactory() )
@@ -517,7 +443,11 @@ private void applyDeleteRowRestrictions(
 				0,
 				jdbcValueBindings,
 				null,
-				DEFAULT_RESTRICTOR,
+				(valueIndex, bindings, noop, value, jdbcValueMapping) -> {
+					if ( !jdbcValueMapping.isFormula() ) {
+						bindings.bindValue( value, jdbcValueMapping, ParameterUsage.RESTRICT );
+					}
+				},
 				session
 		);
 		pluralAttribute.getElementDescriptor().decompose(
@@ -541,7 +471,7 @@ private TableUpdate<JdbcMutationOperation> buildTableUpdate(MutatingTableReferen
 		final TableUpdateBuilderStandard<JdbcMutationOperation> updateBuilder =
 				new TableUpdateBuilderStandard<>( this, tableReference, getFactory(), sqlWhereString );
 		final var attributeMapping = getAttributeMapping();
-		attributeMapping.getKeyDescriptor().getKeyPart().forEachSelectable( updateBuilder );
+		attributeMapping.getKeyDescriptor().getKeyPart().forEachUpdatable( updateBuilder );
 		final var indexDescriptor = attributeMapping.getIndexDescriptor();
 		if ( indexDescriptor != null ) {
 			indexDescriptor.forEachUpdatable( updateBuilder );
@@ -566,7 +496,11 @@ private void applyInsertRowValues(
 				0,
 				jdbcValueBindings,
 				null,
-				DEFAULT_VALUE_SETTER,
+				(valueIndex, bindings, noop, value, jdbcValueMapping) -> {
+					if ( jdbcValueMapping.isUpdateable() && !jdbcValueMapping.isFormula() ) {
+						bindings.bindValue( value, jdbcValueMapping, ParameterUsage.SET );
+					}
+				},
 				session
 		);
 		final var indexDescriptor = attributeMapping.getIndexDescriptor();
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java
index 5b5658252627..ced669009629 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AbstractUpdateRowsCoordinator.java
@@ -52,4 +52,18 @@ public void updateRows(Object key, PersistentCollection<?> collection, SharedSes
 	}
 
 	protected abstract int doUpdate(Object key, PersistentCollection<?> collection, SharedSessionContractImplementor session);
+
+	protected Object resolveDeleteRowValue(PersistentCollection<?> collection, Object entry, int entryPosition) {
+		final var attributeMapping = getMutationTarget().getTargetPart();
+		final var identifierDescriptor = attributeMapping.getIdentifierDescriptor();
+		if ( identifierDescriptor != null ) {
+			return collection.getIdentifier( entry, entryPosition );
+		}
+		else if ( getMutationTarget().hasPhysicalIndexColumn() && attributeMapping.getIndexDescriptor() != null ) {
+			return collection.getIndex( entry, entryPosition, attributeMapping.getCollectionDescriptor() );
+		}
+		else {
+			return collection.getSnapshotElement( entry, entryPosition );
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AuditCollectionHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AuditCollectionHelper.java
new file mode 100644
index 000000000000..cd462913f021
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AuditCollectionHelper.java
@@ -0,0 +1,124 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.function.UnaryOperator;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.metamodel.mapping.AuditMapping;
+import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+import org.hibernate.sql.model.ast.builder.TableInsertBuilderStandard;
+
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * Support for building audit log mutations for collections.
+ */
+final class AuditCollectionHelper {
+	private final CollectionMutationTarget mutationTarget;
+	private final SessionFactoryImplementor sessionFactory;
+	private final CollectionTableMapping auditTableMapping;
+	private final SelectableMapping transactionIdMapping;
+	private final SelectableMapping modificationTypeMapping;
+	private final boolean useServerTransactionTimestamps;
+	private final String currentTimestampFunctionName;
+	private final boolean[] indexColumnIsSettable;
+	private final boolean[] elementColumnIsSettable;
+	private final UnaryOperator<Object> indexIncrementer;
+
+	private MutationOperationGroup auditInsertOperationGroup;
+	private AuditCollectionRowMutationHelper rowMutationHelper;
+
+	AuditCollectionHelper(
+			CollectionMutationTarget mutationTarget,
+			SessionFactoryImplementor sessionFactory,
+			boolean[] indexColumnIsSettable,
+			boolean[] elementColumnIsSettable,
+			UnaryOperator<Object> indexIncrementer,
+			AuditMapping auditMapping) {
+		this.mutationTarget = mutationTarget;
+		this.sessionFactory = sessionFactory;
+		this.indexColumnIsSettable = indexColumnIsSettable;
+		this.elementColumnIsSettable = elementColumnIsSettable;
+		this.indexIncrementer = indexIncrementer;
+		this.auditTableMapping =
+				new CollectionTableMapping( mutationTarget.getCollectionTableMapping(),
+						auditMapping.getTableName() );
+		this.transactionIdMapping = auditMapping.getTransactionIdMapping();
+		this.modificationTypeMapping = auditMapping.getModificationTypeMapping();
+
+		final var dialect = sessionFactory.getJdbcServices().getDialect();
+		this.useServerTransactionTimestamps =
+				sessionFactory.getTransactionIdentifierService()
+						.useServerTimestamp( dialect );
+		this.currentTimestampFunctionName = useServerTransactionTimestamps
+				? dialect.currentTimestamp()
+				: null;
+	}
+
+	CollectionTableMapping getAuditTableMapping() {
+		return auditTableMapping;
+	}
+
+	MutationOperationGroup getAuditInsertOperationGroup() {
+		if ( auditInsertOperationGroup == null ) {
+			auditInsertOperationGroup = buildAuditInsertOperationGroup();
+		}
+		return auditInsertOperationGroup;
+	}
+
+	AuditCollectionRowMutationHelper getRowMutationHelper() {
+		if ( rowMutationHelper == null ) {
+			rowMutationHelper = new AuditCollectionRowMutationHelper(
+					mutationTarget,
+					auditTableMapping.getTableName(),
+					transactionIdMapping,
+					modificationTypeMapping,
+					indexColumnIsSettable,
+					elementColumnIsSettable,
+					indexIncrementer,
+					useServerTransactionTimestamps
+			);
+		}
+		return rowMutationHelper;
+	}
+
+	private MutationOperationGroup buildAuditInsertOperationGroup() {
+		final var insertBuilder =
+				new TableInsertBuilderStandard( mutationTarget, auditTableMapping, sessionFactory );
+		applyAuditInsertDetails( insertBuilder );
+		final var tableInsert = insertBuilder.buildMutation();
+		final var operation = tableInsert.createMutationOperation( null, sessionFactory );
+		return operation == null ? null : singleOperation( MutationType.INSERT, mutationTarget, operation );
+	}
+
+	private void applyAuditInsertDetails(TableInsertBuilderStandard insertBuilder) {
+		final var attributeMapping = mutationTarget.getTargetPart();
+		attributeMapping.getKeyDescriptor().getKeyPart().forEachSelectable( insertBuilder );
+
+		final var identifierDescriptor = attributeMapping.getIdentifierDescriptor();
+		if ( identifierDescriptor != null ) {
+			identifierDescriptor.forEachSelectable( insertBuilder );
+		}
+		else {
+			final var indexDescriptor = attributeMapping.getIndexDescriptor();
+			if ( indexDescriptor != null ) {
+				indexDescriptor.forEachInsertable( insertBuilder );
+			}
+		}
+
+		attributeMapping.getElementDescriptor().forEachInsertable( insertBuilder );
+
+		if ( useServerTransactionTimestamps ) {
+			insertBuilder.addValueColumn( currentTimestampFunctionName, transactionIdMapping );
+		}
+		else {
+			insertBuilder.addValueColumn( "?", transactionIdMapping );
+		}
+		insertBuilder.addValueColumn( "?", modificationTypeMapping );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AuditCollectionRowMutationHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AuditCollectionRowMutationHelper.java
new file mode 100644
index 000000000000..a21516e92c1f
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/AuditCollectionRowMutationHelper.java
@@ -0,0 +1,162 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.function.UnaryOperator;
+
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+
+/**
+ * Binds collection row values for audit table mutations.
+ */
+final class AuditCollectionRowMutationHelper {
+	private final CollectionMutationTarget mutationTarget;
+	private final PluralAttributeMapping attributeMapping;
+	private final String auditTableName;
+	private final SelectableMapping transactionIdMapping;
+	private final SelectableMapping modificationTypeMapping;
+	private final boolean[] indexColumnIsSettable;
+	private final boolean[] elementColumnIsSettable;
+	private final UnaryOperator<Object> indexIncrementer;
+	private final boolean useServerTransactionTimestamps;
+
+	AuditCollectionRowMutationHelper(
+			CollectionMutationTarget mutationTarget,
+			String auditTableName,
+			SelectableMapping transactionIdMapping,
+			SelectableMapping modificationTypeMapping,
+			boolean[] indexColumnIsSettable,
+			boolean[] elementColumnIsSettable,
+			UnaryOperator<Object> indexIncrementer,
+			boolean useServerTransactionTimestamps) {
+		this.mutationTarget = mutationTarget;
+		this.attributeMapping = mutationTarget.getTargetPart();
+		this.auditTableName = auditTableName;
+		this.transactionIdMapping = transactionIdMapping;
+		this.modificationTypeMapping = modificationTypeMapping;
+		this.indexColumnIsSettable = indexColumnIsSettable;
+		this.elementColumnIsSettable = elementColumnIsSettable;
+		this.indexIncrementer = indexIncrementer;
+		this.useServerTransactionTimestamps = useServerTransactionTimestamps;
+	}
+
+	void bindInsertValues(
+			PersistentCollection<?> collection,
+			Object key,
+			Object rowValue,
+			int rowPosition,
+			AuditStateManagement.ModificationType modificationType,
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings) {
+		if ( key == null ) {
+			throw new IllegalArgumentException( "null key for collection: " + mutationTarget.getRolePath() );
+		}
+
+		attributeMapping.getKeyDescriptor().getKeyPart().decompose(
+				key,
+				0,
+				jdbcValueBindings,
+				null,
+				this::bindSetValue,
+				session
+		);
+
+		final var identifierDescriptor = attributeMapping.getIdentifierDescriptor();
+		if ( identifierDescriptor != null ) {
+			identifierDescriptor.decompose(
+					collection.getIdentifier( rowValue, rowPosition ),
+					0,
+					jdbcValueBindings,
+					null,
+					this::bindSetValue,
+					session
+			);
+		}
+		else {
+			final var indexDescriptor = attributeMapping.getIndexDescriptor();
+			if ( indexDescriptor != null ) {
+				final Object index = indexIncrementer.apply(
+						collection.getIndex( rowValue, rowPosition, attributeMapping.getCollectionDescriptor() )
+				);
+				indexDescriptor.decompose(
+						index,
+						0,
+						indexColumnIsSettable,
+						jdbcValueBindings,
+						(valueIndex, settable, bindings, jdbcValue, jdbcValueMapping) -> {
+							if ( settable[valueIndex]
+									&& auditTableName.equals( jdbcValueMapping.getContainingTableExpression() )
+									&& !jdbcValueMapping.isFormula() ) {
+								bindings.bindValue(
+										jdbcValue,
+										auditTableName,
+										jdbcValueMapping.getSelectionExpression(),
+										ParameterUsage.SET
+								);
+							}
+						},
+						session
+				);
+			}
+		}
+
+		attributeMapping.getElementDescriptor().decompose(
+				collection.getElement( rowValue ),
+				0,
+				elementColumnIsSettable,
+				jdbcValueBindings,
+				(valueIndex, settable, bindings, jdbcValue, jdbcValueMapping) -> {
+					if ( settable[valueIndex] && !jdbcValueMapping.isFormula() ) {
+						bindings.bindValue(
+								jdbcValue,
+								auditTableName,
+								jdbcValueMapping.getSelectionExpression(),
+								ParameterUsage.SET
+						);
+					}
+				},
+				session
+		);
+
+		if ( !useServerTransactionTimestamps ) {
+			jdbcValueBindings.bindValue(
+				session.getCurrentTransactionIdentifier(),
+				auditTableName,
+				transactionIdMapping.getSelectionExpression(),
+				ParameterUsage.SET
+			);
+		}
+
+		jdbcValueBindings.bindValue(
+				Integer.valueOf( modificationType.ordinal() ),
+				auditTableName,
+				modificationTypeMapping.getSelectionExpression(),
+				ParameterUsage.SET
+		);
+	}
+
+	private void bindSetValue(
+			int valueIndex,
+			JdbcValueBindings jdbcValueBindings,
+			Object unused,
+			Object jdbcValue,
+			SelectableMapping selectableMapping) {
+		if ( selectableMapping.isFormula() ) {
+			return;
+		}
+		jdbcValueBindings.bindValue(
+				jdbcValue,
+				auditTableName,
+				selectableMapping.getSelectionExpression(),
+				ParameterUsage.SET
+		);
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java
index 0290d9f6ea2c..0a1f51630581 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/CollectionTableMapping.java
@@ -45,6 +45,34 @@ public CollectionTableMapping(
 		this.deleteRowDetails = deleteRowDetails;
 	}
 
+	/**
+	 * Creates an auxiliary table mapping (for history or audit tables)
+	 * based on an existing collection table mapping.
+	 */
+	public CollectionTableMapping(CollectionTableMapping baseMapping, String tableName) {
+		this.tableName = tableName;
+		this.spaces = appendSpace( baseMapping.spaces, tableName );
+		this.isJoinTable = baseMapping.isJoinTable;
+		this.isInverse = baseMapping.isInverse;
+		this.insertDetails = baseMapping.insertDetails;
+		this.updateDetails = baseMapping.updateDetails;
+		this.cascadeDeleteEnabled = baseMapping.cascadeDeleteEnabled;
+		this.deleteAllDetails = baseMapping.deleteAllDetails;
+		this.deleteRowDetails = baseMapping.deleteRowDetails;
+	}
+
+	private static String[] appendSpace(String[] baseSpaces, String newSpace) {
+		for ( String space : baseSpaces ) {
+			if ( newSpace.equals( space ) ) {
+				return baseSpaces;
+			}
+		}
+		final var spaces = new String[baseSpaces.length + 1];
+		System.arraycopy( baseSpaces, 0, spaces, 0, baseSpaces.length );
+		spaces[baseSpaces.length] = newSpace;
+		return spaces;
+	}
+
 	@Override
 	public String getTableName() {
 		return tableName;
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorAudit.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorAudit.java
new file mode 100644
index 000000000000..2a963cc2d7cb
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorAudit.java
@@ -0,0 +1,128 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.UnaryOperator;
+
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+import org.hibernate.sql.model.MutationOperationGroup;
+
+/**
+ * DeleteRowsCoordinator for audited collections.
+ */
+public class DeleteRowsCoordinatorAudit implements DeleteRowsCoordinator {
+	private final CollectionMutationTarget mutationTarget;
+	private final DeleteRowsCoordinator currentDeleteCoordinator;
+	private final SessionFactoryImplementor sessionFactory;
+	private final boolean deleteByIndex;
+	private final MutationExecutorService mutationExecutorService;
+	private final BasicBatchKey auditBatchKey;
+	private final boolean[] indexColumnIsSettable;
+	private final boolean[] elementColumnIsSettable;
+	private final UnaryOperator<Object> indexIncrementer;
+
+	private MutationOperationGroup auditOperationGroup;
+	private AuditCollectionHelper auditHelper;
+
+	public DeleteRowsCoordinatorAudit(
+			CollectionMutationTarget mutationTarget,
+			DeleteRowsCoordinator currentDeleteCoordinator,
+			boolean deleteByIndex,
+			boolean[] indexColumnIsSettable,
+			boolean[] elementColumnIsSettable,
+			UnaryOperator<Object> indexIncrementer,
+			SessionFactoryImplementor sessionFactory) {
+		this.mutationTarget = mutationTarget;
+		this.currentDeleteCoordinator = currentDeleteCoordinator;
+		this.sessionFactory = sessionFactory;
+		this.deleteByIndex = deleteByIndex;
+		this.indexColumnIsSettable = indexColumnIsSettable;
+		this.elementColumnIsSettable = elementColumnIsSettable;
+		this.indexIncrementer = indexIncrementer;
+		this.auditBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#AUDIT_INSERT" );
+		this.mutationExecutorService = sessionFactory.getServiceRegistry().getService( MutationExecutorService.class );
+	}
+
+	@Override
+	public CollectionMutationTarget getMutationTarget() {
+		return mutationTarget;
+	}
+
+	@Override
+	public void deleteRows(
+			PersistentCollection<?> collection,
+			Object key,
+			SharedSessionContractImplementor session) {
+		final var collectionDescriptor = mutationTarget.getTargetPart().getCollectionDescriptor();
+		final var deletions = collectDeletions( collection, collectionDescriptor );
+
+		currentDeleteCoordinator.deleteRows( collection, key, session );
+
+		if ( !deletions.isEmpty() ) {
+			if ( auditOperationGroup == null ) {
+				auditOperationGroup = getAuditHelper().getAuditInsertOperationGroup();
+			}
+			if ( auditOperationGroup != null ) {
+				final var auditExecutor = mutationExecutorService.createExecutor(
+						() -> auditBatchKey,
+						auditOperationGroup,
+						session
+				);
+				try {
+					final var bindings = getAuditHelper().getRowMutationHelper();
+					for ( int i = 0; i < deletions.size(); i++ ) {
+						final Object removal = deletions.get( i );
+						bindings.bindInsertValues(
+								collection,
+								key,
+								removal,
+								i,
+								AuditStateManagement.ModificationType.DEL,
+								session,
+								auditExecutor.getJdbcValueBindings()
+						);
+						auditExecutor.execute( removal, null, null, null, session );
+					}
+				}
+				finally {
+					auditExecutor.release();
+				}
+			}
+		}
+	}
+
+	private AuditCollectionHelper getAuditHelper() {
+		if ( auditHelper == null ) {
+			auditHelper = new AuditCollectionHelper(
+					mutationTarget,
+					sessionFactory,
+					indexColumnIsSettable,
+					elementColumnIsSettable,
+					indexIncrementer,
+					mutationTarget.getTargetPart().getAuditMapping()
+			);
+		}
+		return auditHelper;
+	}
+
+	private List<Object> collectDeletions(
+			PersistentCollection<?> collection,
+			CollectionPersister persister) {
+		final List<Object> deletions = new ArrayList<>();
+		final var deletes = collection.getDeletes( persister, !deleteByIndex );
+		while ( deletes.hasNext() ) {
+			deletions.add( deletes.next() );
+		}
+		return deletions;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorHistory.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorHistory.java
new file mode 100644
index 000000000000..9a51692b9afc
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorHistory.java
@@ -0,0 +1,178 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.function.UnaryOperator;
+
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+
+import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * {@link DeleteRowsCoordinator} implementation for temporal collection tables
+ * in the {@link org.hibernate.temporal.TemporalTableStrategy#HISTORY_TABLE}
+ * temporal table mapping strategy.
+ *
+ * @author Gavin King
+ */
+public class DeleteRowsCoordinatorHistory implements DeleteRowsCoordinator {
+	private final CollectionMutationTarget mutationTarget;
+	private final RowMutationOperations rowMutationOperations;
+	private final boolean deleteByIndex;
+	private final boolean[] indexColumnIsSettable;
+	private final boolean[] elementColumnIsSettable;
+	private final UnaryOperator<Object> indexIncrementer;
+	private final MutationExecutorService mutationExecutorService;
+	private final BasicBatchKey deleteBatchKey;
+	private final BasicBatchKey historyBatchKey;
+
+	private MutationOperationGroup deleteOperationGroup;
+	private MutationOperationGroup historyOperationGroup;
+	private CollectionTableMapping historyTableMapping;
+	private HistoryCollectionRowMutationHelper rowMutationHelper;
+
+	public DeleteRowsCoordinatorHistory(
+			CollectionMutationTarget mutationTarget,
+			RowMutationOperations rowMutationOperations,
+			boolean deleteByIndex,
+			boolean[] indexColumnIsSettable,
+			boolean[] elementColumnIsSettable,
+			UnaryOperator<Object> indexIncrementer,
+			ServiceRegistry serviceRegistry) {
+		this.mutationTarget = mutationTarget;
+		this.rowMutationOperations = rowMutationOperations;
+		this.deleteByIndex = deleteByIndex;
+		this.indexColumnIsSettable = indexColumnIsSettable;
+		this.elementColumnIsSettable = elementColumnIsSettable;
+		this.indexIncrementer = indexIncrementer;
+		this.deleteBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#DELETE" );
+		this.historyBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#HISTORY_DELETE" );
+		this.mutationExecutorService = serviceRegistry.getService( MutationExecutorService.class );
+	}
+
+	@Override
+	public CollectionMutationTarget getMutationTarget() {
+		return mutationTarget;
+	}
+
+	@Override
+	public void deleteRows(PersistentCollection<?> collection, Object key, SharedSessionContractImplementor session) {
+		if ( deleteOperationGroup == null ) {
+			deleteOperationGroup = createOperationGroup();
+		}
+		if ( deleteOperationGroup == null ) {
+			return;
+		}
+		if ( historyOperationGroup == null ) {
+			historyOperationGroup = createHistoryOperationGroup();
+		}
+
+		if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
+			MODEL_MUTATION_LOGGER.deletingRemovedCollectionRows( mutationTarget.getRolePath(), key );
+		}
+
+		final var mutationExecutor = mutationExecutorService.createExecutor(
+				() -> deleteBatchKey,
+				deleteOperationGroup,
+				session
+		);
+		final var historyExecutor = historyOperationGroup == null ? null : mutationExecutorService.createExecutor(
+				() -> historyBatchKey,
+				historyOperationGroup,
+				session
+		);
+
+		try {
+			final var pluralAttribute = mutationTarget.getTargetPart();
+			final var collectionDescriptor = pluralAttribute.getCollectionDescriptor();
+
+			final var deletes = collection.getDeletes( collectionDescriptor, !deleteByIndex );
+			if ( !deletes.hasNext() ) {
+				MODEL_MUTATION_LOGGER.noRowsToDelete();
+				return;
+			}
+
+			int deletionCount = 0;
+			final var restrictions = rowMutationOperations.getDeleteRowRestrictions();
+			final var historyBindings = getRowMutationHelper();
+
+			while ( deletes.hasNext() ) {
+				final Object removal = deletes.next();
+
+				restrictions.applyRestrictions(
+						collection,
+						key,
+						removal,
+						deletionCount,
+						session,
+						mutationExecutor.getJdbcValueBindings()
+				);
+				mutationExecutor.execute( removal, null, null, null, session );
+
+				if ( historyExecutor != null ) {
+					historyBindings.bindDeleteRowRestrictions(
+							collection,
+							key,
+							removal,
+							deletionCount,
+							session,
+							historyExecutor.getJdbcValueBindings()
+					);
+					historyExecutor.execute( removal, null, null, null, session );
+				}
+
+				deletionCount++;
+			}
+
+			MODEL_MUTATION_LOGGER.doneDeletingCollectionRows( deletionCount, mutationTarget.getRolePath() );
+		}
+		finally {
+			mutationExecutor.release();
+			if ( historyExecutor != null ) {
+				historyExecutor.release();
+			}
+		}
+	}
+
+	private MutationOperationGroup createOperationGroup() {
+		final var operation = rowMutationOperations.getDeleteRowOperation();
+		return operation == null ? null : singleOperation( MutationType.DELETE, mutationTarget, operation );
+	}
+
+	private MutationOperationGroup createHistoryOperationGroup() {
+		final var operation = rowMutationOperations.getDeleteRowOperation( getHistoryTableMapping() );
+		return operation == null ? null : singleOperation( MutationType.DELETE, mutationTarget, operation );
+	}
+
+	private CollectionTableMapping getHistoryTableMapping() {
+		if ( historyTableMapping == null ) {
+			final var temporalMapping = mutationTarget.getTargetPart().getTemporalMapping();
+			historyTableMapping =
+					new CollectionTableMapping( mutationTarget.getCollectionTableMapping(),
+							temporalMapping.getTableName() );
+		}
+		return historyTableMapping;
+	}
+
+	private HistoryCollectionRowMutationHelper getRowMutationHelper() {
+		if ( rowMutationHelper == null ) {
+			rowMutationHelper = new HistoryCollectionRowMutationHelper(
+					mutationTarget,
+					getHistoryTableMapping().getTableName(),
+					indexColumnIsSettable,
+					elementColumnIsSettable,
+					indexIncrementer
+			);
+		}
+		return rowMutationHelper;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java
index f6698fb4d754..b643a25ea76c 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/DeleteRowsCoordinatorStandard.java
@@ -70,31 +70,33 @@ public void deleteRows(PersistentCollection<?> collection, Object key, SharedSes
 			final var deletes = collection.getDeletes( collectionDescriptor, !deleteByIndex );
 			if ( !deletes.hasNext() ) {
 				MODEL_MUTATION_LOGGER.noRowsToDelete();
-				return;
 			}
+			else {
 
-			int deletionCount = 0;
+				int deletionCount = 0;
 
-			final var restrictions = rowMutationOperations.getDeleteRowRestrictions();
+				final var restrictions = rowMutationOperations.getDeleteRowRestrictions();
 
-			while ( deletes.hasNext() ) {
-				final Object removal = deletes.next();
+				while ( deletes.hasNext() ) {
+					final Object removal = deletes.next();
 
-				restrictions.applyRestrictions(
-						collection,
-						key,
-						removal,
-						deletionCount,
-						session,
-						jdbcValueBindings
-				);
+					restrictions.applyRestrictions(
+							collection,
+							key,
+							removal,
+							deletionCount,
+							session,
+							jdbcValueBindings
+					);
 
-				mutationExecutor.execute( removal, null, null, null, session );
+					mutationExecutor.execute( removal, null, null, null, session );
 
-				deletionCount++;
-			}
+					deletionCount++;
+
+				}
 
-			MODEL_MUTATION_LOGGER.doneDeletingCollectionRows( deletionCount, mutationTarget.getRolePath() );
+				MODEL_MUTATION_LOGGER.doneDeletingCollectionRows( deletionCount, mutationTarget.getRolePath() );
+			}
 		}
 		finally {
 			mutationExecutor.release();
@@ -105,7 +107,7 @@ private MutationOperationGroup createOperationGroup() {
 		assert mutationTarget.getTargetPart() != null
 			&& mutationTarget.getTargetPart().getKeyDescriptor() != null;
 
-		final var operation = rowMutationOperations.getDeleteRowOperation();
-		return singleOperation( MutationType.DELETE, mutationTarget, operation );
+		return singleOperation( MutationType.DELETE, mutationTarget,
+				rowMutationOperations.getDeleteRowOperation() );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/HistoryCollectionRowMutationHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/HistoryCollectionRowMutationHelper.java
new file mode 100644
index 000000000000..5d1d6714fde4
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/HistoryCollectionRowMutationHelper.java
@@ -0,0 +1,257 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.function.UnaryOperator;
+
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.persister.entity.mutation.TemporalMutationHelper;
+
+/**
+ * Binds collection row values and restrictions for history table mutations.
+ */
+final class HistoryCollectionRowMutationHelper {
+	private final CollectionMutationTarget mutationTarget;
+	private final PluralAttributeMapping attributeMapping;
+	private final TemporalMapping temporalMapping;
+	private final String historyTableName;
+	private final String currentTableName;
+	private final boolean[] indexColumnIsSettable;
+	private final boolean[] elementColumnIsSettable;
+	private final UnaryOperator<Object> indexIncrementer;
+
+	HistoryCollectionRowMutationHelper(
+			CollectionMutationTarget mutationTarget,
+			String historyTableName,
+			boolean[] indexColumnIsSettable,
+			boolean[] elementColumnIsSettable,
+			UnaryOperator<Object> indexIncrementer) {
+		this.mutationTarget = mutationTarget;
+		this.attributeMapping = mutationTarget.getTargetPart();
+		this.temporalMapping = attributeMapping.getTemporalMapping();
+		this.historyTableName = historyTableName;
+		this.currentTableName = mutationTarget.getCollectionTableMapping().getTableName();
+		this.indexColumnIsSettable = indexColumnIsSettable;
+		this.elementColumnIsSettable = elementColumnIsSettable;
+		this.indexIncrementer = indexIncrementer;
+	}
+
+	void bindInsertValues(
+			PersistentCollection<?> collection,
+			Object key,
+			Object rowValue,
+			int rowPosition,
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings) {
+		if ( key == null ) {
+			throw new IllegalArgumentException( "null key for collection: " + mutationTarget.getRolePath() );
+		}
+		attributeMapping.getKeyDescriptor().getKeyPart().decompose(
+				key,
+				0,
+				jdbcValueBindings,
+				null,
+				this::bindSetValue,
+				session
+		);
+
+		final var identifierDescriptor = attributeMapping.getIdentifierDescriptor();
+		if ( identifierDescriptor != null ) {
+			identifierDescriptor.decompose(
+					collection.getIdentifier( rowValue, rowPosition ),
+					0,
+					jdbcValueBindings,
+					null,
+					this::bindSetValue,
+					session
+			);
+		}
+		else {
+			final var indexDescriptor = attributeMapping.getIndexDescriptor();
+			if ( indexDescriptor != null ) {
+				final Object index =
+						indexIncrementer.apply( collection.getIndex( rowValue, rowPosition,
+								attributeMapping.getCollectionDescriptor() ) );
+				indexDescriptor.decompose(
+						index,
+						0,
+						indexColumnIsSettable,
+						jdbcValueBindings,
+						(valueIndex, settable, bindings, jdbcValue, jdbcValueMapping) -> {
+							if ( settable[valueIndex]
+									&& currentTableName.equals( jdbcValueMapping.getContainingTableExpression() )
+									&& !jdbcValueMapping.isFormula() ) {
+								bindings.bindValue(
+										jdbcValue,
+										historyTableName,
+										jdbcValueMapping.getSelectionExpression(),
+										ParameterUsage.SET
+								);
+							}
+						},
+						session
+				);
+			}
+		}
+
+		attributeMapping.getElementDescriptor().decompose(
+				collection.getElement( rowValue ),
+				0,
+				elementColumnIsSettable,
+				jdbcValueBindings,
+				(valueIndex, settable, bindings, jdbcValue, jdbcValueMapping) -> {
+					if ( settable[valueIndex] && !jdbcValueMapping.isFormula() ) {
+						bindings.bindValue(
+								jdbcValue,
+								historyTableName,
+								jdbcValueMapping.getSelectionExpression(),
+								ParameterUsage.SET
+						);
+					}
+				},
+				session
+		);
+
+		if ( temporalMapping != null && TemporalMutationHelper.isUsingParameters( session ) ) {
+			jdbcValueBindings.bindValue(
+					session.getCurrentTransactionIdentifier(),
+					historyTableName,
+					temporalMapping.getStartingColumnMapping().getSelectionExpression(),
+					ParameterUsage.SET
+			);
+		}
+	}
+
+	void bindDeleteRowRestrictions(
+			PersistentCollection<?> collection,
+			Object keyValue,
+			Object rowValue,
+			int rowPosition,
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings) {
+		if ( temporalMapping != null && TemporalMutationHelper.isUsingParameters( session ) ) {
+			jdbcValueBindings.bindValue(
+					session.getCurrentTransactionIdentifier(),
+					historyTableName,
+					temporalMapping.getEndingColumnMapping().getSelectionExpression(),
+					ParameterUsage.SET
+			);
+		}
+
+		final var identifierDescriptor = attributeMapping.getIdentifierDescriptor();
+		if ( identifierDescriptor != null ) {
+			identifierDescriptor.decompose(
+					rowValue,
+					0,
+					jdbcValueBindings,
+					null,
+					this::bindRestrictValue,
+					session
+			);
+		}
+		else {
+			attributeMapping.getKeyDescriptor().getKeyPart().decompose(
+					keyValue,
+					0,
+					jdbcValueBindings,
+					null,
+					this::bindRestrictValue,
+					session
+			);
+
+			if ( mutationTarget.hasPhysicalIndexColumn() ) {
+				attributeMapping.getIndexDescriptor().decompose(
+						indexIncrementer.apply( rowValue ),
+						0,
+						jdbcValueBindings,
+						null,
+						this::bindRestrictValue,
+						session
+				);
+			}
+			else {
+				attributeMapping.getElementDescriptor().decompose(
+						rowValue,
+						0,
+						jdbcValueBindings,
+						null,
+						(valueIndex, bindings, unused, jdbcValue, jdbcValueMapping) -> {
+							if ( !jdbcValueMapping.isNullable() && !jdbcValueMapping.isFormula() ) {
+								bindings.bindValue(
+										jdbcValue,
+										historyTableName,
+										jdbcValueMapping.getSelectionExpression(),
+										ParameterUsage.RESTRICT
+								);
+							}
+						},
+						session
+				);
+			}
+		}
+	}
+
+	void bindDeleteAllRestrictions(
+			Object keyValue,
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings) {
+		attributeMapping.getKeyDescriptor().getKeyPart().decompose(
+				keyValue,
+				0,
+				jdbcValueBindings,
+				null,
+				this::bindRestrictValue,
+				session
+		);
+		if ( temporalMapping != null && TemporalMutationHelper.isUsingParameters( session ) ) {
+			jdbcValueBindings.bindValue(
+					session.getCurrentTransactionIdentifier(),
+					historyTableName,
+					temporalMapping.getEndingColumnMapping().getSelectionExpression(),
+					ParameterUsage.SET
+			);
+		}
+	}
+
+	private void bindSetValue(
+			int valueIndex,
+			JdbcValueBindings jdbcValueBindings,
+			Object unused,
+			Object jdbcValue,
+			SelectableMapping selectableMapping) {
+		bindValue( jdbcValueBindings, jdbcValue, selectableMapping, ParameterUsage.SET );
+	}
+
+	private void bindRestrictValue(
+			int valueIndex,
+			JdbcValueBindings jdbcValueBindings,
+			Object unused,
+			Object jdbcValue,
+			SelectableMapping selectableMapping) {
+		bindValue( jdbcValueBindings, jdbcValue, selectableMapping, ParameterUsage.RESTRICT );
+	}
+
+	private void bindValue(
+			JdbcValueBindings jdbcValueBindings,
+			Object jdbcValue,
+			SelectableMapping selectableMapping,
+			ParameterUsage usage) {
+		if ( selectableMapping.isFormula() ) {
+			return;
+		}
+		jdbcValueBindings.bindValue(
+				jdbcValue,
+				historyTableName,
+				selectableMapping.getSelectionExpression(),
+				usage
+		);
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorAudit.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorAudit.java
new file mode 100644
index 000000000000..751c57ad5735
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorAudit.java
@@ -0,0 +1,121 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.function.UnaryOperator;
+
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+import org.hibernate.sql.model.MutationOperationGroup;
+
+/**
+ * InsertRowsCoordinator for audited collections.
+ */
+public class InsertRowsCoordinatorAudit implements InsertRowsCoordinator {
+	private final CollectionMutationTarget mutationTarget;
+	private final InsertRowsCoordinator currentInsertCoordinator;
+	private final SessionFactoryImplementor sessionFactory;
+	private final MutationExecutorService mutationExecutorService;
+	private final BasicBatchKey auditBatchKey;
+	private final boolean[] indexColumnIsSettable;
+	private final boolean[] elementColumnIsSettable;
+	private final UnaryOperator<Object> indexIncrementer;
+
+	private MutationOperationGroup auditOperationGroup;
+	private AuditCollectionHelper auditHelper;
+
+	public InsertRowsCoordinatorAudit(
+			CollectionMutationTarget mutationTarget,
+			RowMutationOperations rowMutationOperations,
+			InsertRowsCoordinator currentInsertCoordinator,
+			boolean[] indexColumnIsSettable,
+			boolean[] elementColumnIsSettable,
+			UnaryOperator<Object> indexIncrementer,
+			SessionFactoryImplementor sessionFactory) {
+		this.mutationTarget = mutationTarget;
+		this.currentInsertCoordinator = currentInsertCoordinator;
+		this.sessionFactory = sessionFactory;
+		this.indexColumnIsSettable = indexColumnIsSettable;
+		this.elementColumnIsSettable = elementColumnIsSettable;
+		this.indexIncrementer = indexIncrementer;
+		this.auditBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#AUDIT_INSERT" );
+		this.mutationExecutorService = sessionFactory.getServiceRegistry().getService( MutationExecutorService.class );
+	}
+
+	@Override
+	public CollectionMutationTarget getMutationTarget() {
+		return mutationTarget;
+	}
+
+	@Override
+	public void insertRows(
+			PersistentCollection<?> collection,
+			Object id,
+			EntryFilter entryChecker,
+			SharedSessionContractImplementor session) {
+		currentInsertCoordinator.insertRows( collection, id, entryChecker, session );
+
+		if ( auditOperationGroup == null ) {
+			auditOperationGroup = getAuditHelper().getAuditInsertOperationGroup();
+		}
+		if ( auditOperationGroup == null ) {
+			return;
+		}
+
+		final var pluralAttribute = mutationTarget.getTargetPart();
+		final var collectionDescriptor = pluralAttribute.getCollectionDescriptor();
+		final var entries = collection.entries( collectionDescriptor );
+		if ( entries.hasNext() ) {
+			final var mutationExecutor = mutationExecutorService.createExecutor(
+					() -> auditBatchKey,
+					auditOperationGroup,
+					session
+			);
+
+			try {
+				int entryCount = 0;
+				final var bindings = getAuditHelper().getRowMutationHelper();
+				while ( entries.hasNext() ) {
+					final Object entry = entries.next();
+					if ( entryChecker == null || entryChecker.include( entry, entryCount, collection,
+							pluralAttribute ) ) {
+						bindings.bindInsertValues(
+								collection,
+								id,
+								entry,
+								entryCount,
+								AuditStateManagement.ModificationType.ADD,
+								session,
+								mutationExecutor.getJdbcValueBindings()
+						);
+						mutationExecutor.execute( entry, null, null, null, session );
+					}
+					entryCount++;
+				}
+			}
+			finally {
+				mutationExecutor.release();
+			}
+		}
+	}
+
+	private AuditCollectionHelper getAuditHelper() {
+		if ( auditHelper == null ) {
+			auditHelper = new AuditCollectionHelper(
+					mutationTarget,
+					sessionFactory,
+					indexColumnIsSettable,
+					elementColumnIsSettable,
+					indexIncrementer,
+					mutationTarget.getTargetPart().getAuditMapping()
+			);
+		}
+		return auditHelper;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorHistory.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorHistory.java
new file mode 100644
index 000000000000..11f10787c975
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/InsertRowsCoordinatorHistory.java
@@ -0,0 +1,142 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.function.UnaryOperator;
+
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * {@link InsertRowsCoordinator} implementation for temporal collection tables
+ * in the {@link org.hibernate.temporal.TemporalTableStrategy#HISTORY_TABLE}
+ * temporal table mapping strategy.
+ *
+ * @author Gavin King
+ */
+public class InsertRowsCoordinatorHistory implements InsertRowsCoordinator {
+	private final CollectionMutationTarget mutationTarget;
+	private final RowMutationOperations rowMutationOperations;
+	private final InsertRowsCoordinator currentInsertCoordinator;
+	private final MutationExecutorService mutationExecutorService;
+	private final BasicBatchKey historyBatchKey;
+	private final boolean[] indexColumnIsSettable;
+	private final boolean[] elementColumnIsSettable;
+	private final UnaryOperator<Object> indexIncrementer;
+
+	private MutationOperationGroup historyOperationGroup;
+	private CollectionTableMapping historyTableMapping;
+	private HistoryCollectionRowMutationHelper rowMutationHelper;
+
+	public InsertRowsCoordinatorHistory(
+			CollectionMutationTarget mutationTarget,
+			RowMutationOperations rowMutationOperations,
+			InsertRowsCoordinator currentInsertCoordinator,
+			boolean[] indexColumnIsSettable,
+			boolean[] elementColumnIsSettable,
+			UnaryOperator<Object> indexIncrementer,
+			ServiceRegistry serviceRegistry) {
+		this.mutationTarget = mutationTarget;
+		this.rowMutationOperations = rowMutationOperations;
+		this.currentInsertCoordinator = currentInsertCoordinator;
+		this.indexColumnIsSettable = indexColumnIsSettable;
+		this.elementColumnIsSettable = elementColumnIsSettable;
+		this.indexIncrementer = indexIncrementer;
+		this.historyBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#HISTORY_INSERT" );
+		this.mutationExecutorService = serviceRegistry.getService( MutationExecutorService.class );
+	}
+
+	@Override
+	public CollectionMutationTarget getMutationTarget() {
+		return mutationTarget;
+	}
+
+	@Override
+	public void insertRows(
+			PersistentCollection<?> collection,
+			Object id,
+			EntryFilter entryChecker,
+			SharedSessionContractImplementor session) {
+		currentInsertCoordinator.insertRows( collection, id, entryChecker, session );
+
+		if ( historyOperationGroup == null ) {
+			historyOperationGroup = createHistoryOperationGroup();
+		}
+		if ( historyOperationGroup == null ) {
+			return;
+		}
+
+		final var pluralAttribute = mutationTarget.getTargetPart();
+		final var collectionDescriptor = pluralAttribute.getCollectionDescriptor();
+		final var entries = collection.entries( collectionDescriptor );
+		if ( !entries.hasNext() ) {
+			return;
+		}
+
+		final var mutationExecutor = mutationExecutorService.createExecutor(
+				() -> historyBatchKey,
+				historyOperationGroup,
+				session
+		);
+
+		try {
+			int entryCount = 0;
+			final var historyBindings = getRowMutationHelper();
+			while ( entries.hasNext() ) {
+				final Object entry = entries.next();
+				if ( entryChecker == null || entryChecker.include( entry, entryCount, collection, pluralAttribute ) ) {
+					historyBindings.bindInsertValues(
+							collection,
+							id,
+							entry,
+							entryCount,
+							session,
+							mutationExecutor.getJdbcValueBindings()
+					);
+					mutationExecutor.execute( entry, null, null, null, session );
+				}
+				entryCount++;
+			}
+		}
+		finally {
+			mutationExecutor.release();
+		}
+	}
+
+	private MutationOperationGroup createHistoryOperationGroup() {
+		final var operation = rowMutationOperations.getInsertRowOperation( getHistoryTableMapping() );
+		return operation == null ? null : singleOperation( MutationType.INSERT, mutationTarget, operation );
+	}
+
+	private CollectionTableMapping getHistoryTableMapping() {
+		if ( historyTableMapping == null ) {
+			final var temporalMapping = mutationTarget.getTargetPart().getTemporalMapping();
+			historyTableMapping =
+					new CollectionTableMapping( mutationTarget.getCollectionTableMapping(),
+							temporalMapping.getTableName() );
+		}
+		return historyTableMapping;
+	}
+
+	private HistoryCollectionRowMutationHelper getRowMutationHelper() {
+		if ( rowMutationHelper == null ) {
+			rowMutationHelper = new HistoryCollectionRowMutationHelper(
+					mutationTarget,
+					getHistoryTableMapping().getTableName(),
+					indexColumnIsSettable,
+					elementColumnIsSettable,
+					indexIncrementer
+			);
+		}
+		return rowMutationHelper;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorHistory.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorHistory.java
new file mode 100644
index 000000000000..79bd3d121687
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorHistory.java
@@ -0,0 +1,151 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.function.UnaryOperator;
+
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+import org.hibernate.sql.model.ast.MutatingTableReference;
+import org.hibernate.sql.model.jdbc.JdbcMutationOperation;
+
+import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * {@link RemoveCoordinator} implementation for temporal collection tables
+ * in the {@link org.hibernate.temporal.TemporalTableStrategy#HISTORY_TABLE}
+ * temporal table mapping strategy.
+ *
+ * @author Gavin King
+ */
+public class RemoveCoordinatorHistory implements RemoveCoordinator {
+	private final CollectionMutationTarget mutationTarget;
+	private final OperationProducer operationProducer;
+	private final MutationExecutorService mutationExecutorService;
+	private final BasicBatchKey batchKey;
+	private final BasicBatchKey historyBatchKey;
+	private final boolean[] indexColumnIsSettable;
+	private final boolean[] elementColumnIsSettable;
+	private final UnaryOperator<Object> indexIncrementer;
+
+	private MutationOperationGroup operationGroup;
+	private MutationOperationGroup historyOperationGroup;
+	private CollectionTableMapping historyTableMapping;
+	private HistoryCollectionRowMutationHelper rowMutationHelper;
+
+	public RemoveCoordinatorHistory(
+			CollectionMutationTarget mutationTarget,
+			RowMutationOperations mutationOperations,
+			boolean[] indexColumnIsSettable,
+			boolean[] elementColumnIsSettable,
+			UnaryOperator<Object> indexIncrementer,
+			ServiceRegistry serviceRegistry) {
+		this.mutationTarget = mutationTarget;
+		this.operationProducer = mutationOperations.getDeleteAllRowsOperationProducer();
+		this.indexColumnIsSettable = indexColumnIsSettable;
+		this.elementColumnIsSettable = elementColumnIsSettable;
+		this.indexIncrementer = indexIncrementer;
+		this.batchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#REMOVE" );
+		this.historyBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#HISTORY_REMOVE" );
+		this.mutationExecutorService = serviceRegistry.getService( MutationExecutorService.class );
+	}
+
+	@Override
+	public CollectionMutationTarget getMutationTarget() {
+		return mutationTarget;
+	}
+
+	@Override
+	public String getSqlString() {
+		if ( operationGroup == null ) {
+			operationGroup = buildOperationGroup( mutationTarget.getCollectionTableMapping() );
+		}
+		final var operation = (JdbcMutationOperation) operationGroup.getSingleOperation();
+		return operation.getSqlString();
+	}
+
+	@Override
+	public void deleteAllRows(Object key, SharedSessionContractImplementor session) {
+		if ( MODEL_MUTATION_LOGGER.isTraceEnabled() ) {
+			MODEL_MUTATION_LOGGER.removingCollection( mutationTarget.getRolePath(), key );
+		}
+
+		if ( operationGroup == null ) {
+			operationGroup = buildOperationGroup( mutationTarget.getCollectionTableMapping() );
+		}
+		if ( historyOperationGroup == null ) {
+			historyOperationGroup = buildOperationGroup( getHistoryTableMapping() );
+		}
+
+		final var mutationExecutor = mutationExecutorService.createExecutor(
+				() -> batchKey,
+				operationGroup,
+				session
+		);
+		final var historyExecutor = mutationExecutorService.createExecutor(
+				() -> historyBatchKey,
+				historyOperationGroup,
+				session
+		);
+
+		try {
+			final var jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
+			final var foreignKeyDescriptor = mutationTarget.getTargetPart().getKeyDescriptor();
+			foreignKeyDescriptor.getKeyPart().decompose(
+					key,
+					0,
+					jdbcValueBindings,
+					null,
+					RowMutationOperations.DEFAULT_RESTRICTOR,
+					session
+			);
+			mutationExecutor.execute( key, null, null, null, session );
+
+			getRowMutationHelper().bindDeleteAllRestrictions(
+					key,
+					session,
+					historyExecutor.getJdbcValueBindings()
+			);
+			historyExecutor.execute( key, null, null, null, session );
+		}
+		finally {
+			mutationExecutor.release();
+			historyExecutor.release();
+		}
+	}
+
+	private MutationOperationGroup buildOperationGroup(CollectionTableMapping tableMapping) {
+		final var tableReference = new MutatingTableReference( tableMapping );
+		return singleOperation( MutationType.DELETE, mutationTarget, operationProducer.createOperation( tableReference ) );
+	}
+
+	private CollectionTableMapping getHistoryTableMapping() {
+		if ( historyTableMapping == null ) {
+			final var temporalMapping = mutationTarget.getTargetPart().getTemporalMapping();
+			historyTableMapping =
+					new CollectionTableMapping( mutationTarget.getCollectionTableMapping(),
+							temporalMapping.getTableName() );
+		}
+		return historyTableMapping;
+	}
+
+	private HistoryCollectionRowMutationHelper getRowMutationHelper() {
+		if ( rowMutationHelper == null ) {
+			rowMutationHelper = new HistoryCollectionRowMutationHelper(
+					mutationTarget,
+					getHistoryTableMapping().getTableName(),
+					indexColumnIsSettable,
+					elementColumnIsSettable,
+					indexIncrementer
+			);
+		}
+		return rowMutationHelper;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java
index ca83d28999ed..a771cc46a527 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorStandard.java
@@ -5,8 +5,10 @@
 package org.hibernate.persister.collection.mutation;
 
 import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
 import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.persister.entity.mutation.TemporalMutationHelper;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.sql.model.MutationOperationGroup;
 import org.hibernate.sql.model.MutationType;
@@ -37,10 +39,10 @@ public class RemoveCoordinatorStandard implements RemoveCoordinator {
 	 */
 	public RemoveCoordinatorStandard(
 			CollectionMutationTarget mutationTarget,
-			OperationProducer operationProducer,
+			RowMutationOperations mutationOperations,
 			ServiceRegistry serviceRegistry) {
 		this.mutationTarget = mutationTarget;
-		this.operationProducer = operationProducer;
+		this.operationProducer = mutationOperations.getDeleteAllRowsOperationProducer();
 
 		batchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#REMOVE" );
 		mutationExecutorService = serviceRegistry.getService( MutationExecutorService.class );
@@ -86,8 +88,7 @@ public void deleteAllRows(Object key, SharedSessionContractImplementor session)
 
 		try {
 			final var jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
-			final var foreignKeyDescriptor = mutationTarget.getTargetPart().getKeyDescriptor();
-			foreignKeyDescriptor.getKeyPart().decompose(
+			mutationTarget.getTargetPart().getKeyDescriptor().getKeyPart().decompose(
 					key,
 					0,
 					jdbcValueBindings,
@@ -95,6 +96,14 @@ public void deleteAllRows(Object key, SharedSessionContractImplementor session)
 					RowMutationOperations.DEFAULT_RESTRICTOR,
 					session
 			);
+			final var temporalMapping = mutationTarget.getTargetPart().getTemporalMapping();
+			if ( temporalMapping != null && TemporalMutationHelper.isUsingParameters( session ) ) {
+				jdbcValueBindings.bindValue(
+						session.getCurrentTransactionIdentifier(),
+						temporalMapping.getEndingColumnMapping(),
+						ParameterUsage.SET
+				);
+			}
 
 			mutationExecutor.execute(
 					key,
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorTablePerSubclass.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorTablePerSubclass.java
index 01b63ad1c67c..4da36998b872 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorTablePerSubclass.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RemoveCoordinatorTablePerSubclass.java
@@ -35,10 +35,10 @@ public class RemoveCoordinatorTablePerSubclass implements RemoveCoordinator {
 	 */
 	public RemoveCoordinatorTablePerSubclass(
 			OneToManyPersister mutationTarget,
-			OperationProducer operationProducer,
+			RowMutationOperations mutationOperations,
 			ServiceRegistry serviceRegistry) {
 		this.mutationTarget = mutationTarget;
-		this.operationProducer = operationProducer;
+		this.operationProducer = mutationOperations.getDeleteAllRowsOperationProducer();
 		mutationExecutorService = serviceRegistry.getService( MutationExecutorService.class );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java
index b932b32cb317..61745447608e 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/RowMutationOperations.java
@@ -43,6 +43,8 @@ public class RowMutationOperations {
 	private final OperationProducer deleteRowOperationProducer;
 	private final Restrictions deleteRowRestrictions;
 
+	private final OperationProducer deleteAllRowsOperationProducer;
+
 	private JdbcMutationOperation insertRowOperation;
 	private JdbcMutationOperation updateRowOperation;
 	private JdbcMutationOperation deleteRowOperation;
@@ -55,7 +57,8 @@ public RowMutationOperations(
 			Values updateRowValues,
 			Restrictions updateRowRestrictions,
 			OperationProducer deleteRowOperationProducer,
-			Restrictions deleteRowRestrictions) {
+			Restrictions deleteRowRestrictions,
+			OperationProducer deleteAllRowsOperationProducer) {
 		this.target = target;
 
 		assert areSameNullness( insertRowOperationProducer, insertRowValues );
@@ -71,6 +74,8 @@ public RowMutationOperations(
 
 		this.deleteRowOperationProducer = deleteRowOperationProducer;
 		this.deleteRowRestrictions = deleteRowRestrictions;
+
+		this.deleteAllRowsOperationProducer = deleteAllRowsOperationProducer;
 	}
 
 	@Override
@@ -180,6 +185,9 @@ public JdbcMutationOperation getDeleteRowOperation(TableMapping tableMapping) {
 		}
 	}
 
+	public OperationProducer getDeleteAllRowsOperationProducer() {
+		return deleteAllRowsOperationProducer;
+	}
 
 	@FunctionalInterface
 	public interface Restrictions {
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorAudit.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorAudit.java
new file mode 100644
index 000000000000..288f96b73fe6
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorAudit.java
@@ -0,0 +1,151 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.UnaryOperator;
+
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+import org.hibernate.sql.model.MutationOperationGroup;
+
+/**
+ * UpdateRowsCoordinator for audited collections.
+ */
+public class UpdateRowsCoordinatorAudit implements UpdateRowsCoordinator {
+	private final CollectionMutationTarget mutationTarget;
+	private final UpdateRowsCoordinator currentUpdateCoordinator;
+	private final SessionFactoryImplementor sessionFactory;
+	private final MutationExecutorService mutationExecutorService;
+	private final BasicBatchKey auditBatchKey;
+	private final boolean[] indexColumnIsSettable;
+	private final boolean[] elementColumnIsSettable;
+	private final UnaryOperator<Object> indexIncrementer;
+
+	private MutationOperationGroup auditOperationGroup;
+	private AuditCollectionHelper auditHelper;
+
+	public UpdateRowsCoordinatorAudit(
+			CollectionMutationTarget mutationTarget,
+			UpdateRowsCoordinator currentUpdateCoordinator,
+			boolean[] indexColumnIsSettable,
+			boolean[] elementColumnIsSettable,
+			UnaryOperator<Object> indexIncrementer,
+			SessionFactoryImplementor sessionFactory) {
+		this.mutationTarget = mutationTarget;
+		this.currentUpdateCoordinator = currentUpdateCoordinator;
+		this.sessionFactory = sessionFactory;
+		this.indexColumnIsSettable = indexColumnIsSettable;
+		this.elementColumnIsSettable = elementColumnIsSettable;
+		this.indexIncrementer = indexIncrementer;
+		this.auditBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#AUDIT_INSERT" );
+		this.mutationExecutorService = sessionFactory.getServiceRegistry().getService( MutationExecutorService.class );
+	}
+
+	@Override
+	public CollectionMutationTarget getMutationTarget() {
+		return mutationTarget;
+	}
+
+	@Override
+	public void updateRows(Object key, PersistentCollection<?> collection, SharedSessionContractImplementor session) {
+		final var attribute = mutationTarget.getTargetPart();
+		final var collectionDescriptor = attribute.getCollectionDescriptor();
+		final var rowsToAudit = collectUpdatedRows( collection, attribute, collectionDescriptor );
+
+		currentUpdateCoordinator.updateRows( key, collection, session );
+
+		if ( !rowsToAudit.isEmpty() ) {
+			if ( auditOperationGroup == null ) {
+				auditOperationGroup = getAuditHelper().getAuditInsertOperationGroup();
+			}
+			if ( auditOperationGroup != null ) {
+				final var auditExecutor = mutationExecutorService.createExecutor(
+						() -> auditBatchKey,
+						auditOperationGroup,
+						session
+				);
+				try {
+					final var bindings = getAuditHelper().getRowMutationHelper();
+					for ( var row : rowsToAudit ) {
+						bindings.bindInsertValues(
+								collection,
+								key,
+								row.entry,
+								row.position,
+								AuditStateManagement.ModificationType.MOD,
+								session,
+								auditExecutor.getJdbcValueBindings()
+						);
+						auditExecutor.execute( row.entry, null, null, null, session );
+					}
+				}
+				finally {
+					auditExecutor.release();
+				}
+			}
+		}
+	}
+
+	private AuditCollectionHelper getAuditHelper() {
+		if ( auditHelper == null ) {
+			auditHelper = new AuditCollectionHelper(
+					mutationTarget,
+					sessionFactory,
+					indexColumnIsSettable,
+					elementColumnIsSettable,
+					indexIncrementer,
+					mutationTarget.getTargetPart().getAuditMapping()
+			);
+		}
+		return auditHelper;
+	}
+
+	private List<RowReference> collectUpdatedRows(
+			PersistentCollection<?> collection,
+			PluralAttributeMapping attribute,
+			CollectionPersister persister) {
+		final List<RowReference> rows = new ArrayList<>();
+		final var entries = collection.entries( persister );
+		if ( !entries.hasNext() ) {
+			return rows;
+		}
+
+		if ( collection.isElementRemoved() ) {
+			final List<Object> elements = new ArrayList<>();
+			while ( entries.hasNext() ) {
+				elements.add( entries.next() );
+			}
+			for ( int i = elements.size() - 1; i >= 0; i-- ) {
+				final Object entry = elements.get( i );
+				if ( collection.needsUpdating( entry, i, attribute ) ) {
+					rows.add( new RowReference( entry, i ) );
+				}
+			}
+		}
+		else {
+			int position = 0;
+			while ( entries.hasNext() ) {
+				final Object entry = entries.next();
+				if ( collection.needsUpdating( entry, position, attribute ) ) {
+					rows.add( new RowReference( entry, position ) );
+				}
+				position++;
+			}
+		}
+
+		return rows;
+	}
+
+	private record RowReference(Object entry, int position) {
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorHistory.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorHistory.java
new file mode 100644
index 000000000000..2a5597272a10
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorHistory.java
@@ -0,0 +1,261 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.UnaryOperator;
+
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.MutationExecutor;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.noOperations;
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * {@link UpdateRowsCoordinator} implementation for temporal collection tables
+ * in the {@link org.hibernate.temporal.TemporalTableStrategy#HISTORY_TABLE}
+ * temporal table mapping strategy.
+ *
+ * @author Gavin King
+ */
+public class UpdateRowsCoordinatorHistory extends AbstractUpdateRowsCoordinator implements UpdateRowsCoordinator {
+	private final RowMutationOperations rowMutationOperations;
+	private final BasicBatchKey historyDeleteBatchKey;
+	private final BasicBatchKey historyInsertBatchKey;
+	private final boolean[] indexColumnIsSettable;
+	private final boolean[] elementColumnIsSettable;
+	private final UnaryOperator<Object> indexIncrementer;
+
+	private MutationOperationGroup updateOperationGroup;
+	private MutationOperationGroup historyDeleteOperationGroup;
+	private MutationOperationGroup historyInsertOperationGroup;
+	private CollectionTableMapping historyTableMapping;
+	private HistoryCollectionRowMutationHelper rowMutationHelper;
+
+	public UpdateRowsCoordinatorHistory(
+			CollectionMutationTarget mutationTarget,
+			RowMutationOperations rowMutationOperations,
+			SessionFactoryImplementor sessionFactory,
+			boolean[] indexColumnIsSettable,
+			boolean[] elementColumnIsSettable,
+			UnaryOperator<Object> indexIncrementer) {
+		super( mutationTarget, sessionFactory );
+		this.rowMutationOperations = rowMutationOperations;
+		this.indexColumnIsSettable = indexColumnIsSettable;
+		this.elementColumnIsSettable = elementColumnIsSettable;
+		this.indexIncrementer = indexIncrementer;
+		this.historyDeleteBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#HISTORY_DELETE" );
+		this.historyInsertBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#HISTORY_INSERT" );
+	}
+
+	@Override
+	protected int doUpdate(Object key, PersistentCollection<?> collection, SharedSessionContractImplementor session) {
+		if ( rowMutationOperations.getUpdateRowOperation() == null ) {
+			return 0;
+		}
+
+		final var updateOperationGroup = getUpdateOperationGroup();
+		final var historyDeleteGroup = getHistoryDeleteOperationGroup();
+		final var historyInsertGroup = getHistoryInsertOperationGroup();
+
+		final var updateExecutor = mutationExecutorService.createExecutor(
+				() -> new BasicBatchKey( getMutationTarget().getRolePath() + "#UPDATE" ),
+				updateOperationGroup,
+				session
+		);
+		final var historyDeleteExecutor = historyDeleteGroup == null
+				? null
+				: mutationExecutorService.createExecutor(
+						() -> historyDeleteBatchKey,
+						historyDeleteGroup,
+						session
+				);
+		final var historyInsertExecutor = historyInsertGroup == null
+				? null
+				: mutationExecutorService.createExecutor(
+						() -> historyInsertBatchKey,
+						historyInsertGroup,
+						session
+				);
+
+		try {
+			final var entries =
+					collection.entries( getMutationTarget().getTargetPart().getCollectionDescriptor() );
+			int count = 0;
+
+			if ( collection.isElementRemoved() ) {
+				final List<Object> elements = new ArrayList<>();
+				while ( entries.hasNext() ) {
+					elements.add( entries.next() );
+				}
+				for ( int i = elements.size() - 1; i >= 0; i-- ) {
+					final Object entry = elements.get( i );
+					final boolean updated = processRow(
+							key,
+							collection,
+							entry,
+							i,
+							updateExecutor,
+							historyDeleteExecutor,
+							historyInsertExecutor,
+							session
+					);
+					if ( updated ) {
+						count++;
+					}
+				}
+			}
+			else {
+				int position = 0;
+				while ( entries.hasNext() ) {
+					final Object entry = entries.next();
+					final boolean updated = processRow(
+							key,
+							collection,
+							entry,
+							position++,
+							updateExecutor,
+							historyDeleteExecutor,
+							historyInsertExecutor,
+							session
+					);
+					if ( updated ) {
+						count++;
+					}
+				}
+			}
+
+			return count;
+		}
+		finally {
+			updateExecutor.release();
+			if ( historyDeleteExecutor != null ) {
+				historyDeleteExecutor.release();
+			}
+			if ( historyInsertExecutor != null ) {
+				historyInsertExecutor.release();
+			}
+		}
+	}
+
+	private boolean processRow(
+			Object key,
+			PersistentCollection<?> collection,
+			Object entry,
+			int entryPosition,
+			MutationExecutor updateExecutor,
+			MutationExecutor historyDeleteExecutor,
+			MutationExecutor historyInsertExecutor,
+			SharedSessionContractImplementor session) {
+		final var attribute = getMutationTarget().getTargetPart();
+		if ( !collection.needsUpdating( entry, entryPosition, attribute ) ) {
+			return false;
+		}
+
+		final Object deleteRowValue = resolveDeleteRowValue( collection, entry, entryPosition );
+		rowMutationOperations.getUpdateRowValues().applyValues(
+				collection,
+				key,
+				entry,
+				entryPosition,
+				session,
+				updateExecutor.getJdbcValueBindings()
+		);
+		rowMutationOperations.getUpdateRowRestrictions().applyRestrictions(
+				collection,
+				key,
+				entry,
+				entryPosition,
+				session,
+				updateExecutor.getJdbcValueBindings()
+		);
+		updateExecutor.execute( collection, null, null, null, session );
+
+		if ( historyDeleteExecutor != null && historyInsertExecutor != null ) {
+			final var historyBindings = getRowMutationHelper();
+			historyBindings.bindDeleteRowRestrictions(
+					collection,
+					key,
+					deleteRowValue,
+					entryPosition,
+					session,
+					historyDeleteExecutor.getJdbcValueBindings()
+			);
+			historyDeleteExecutor.execute( deleteRowValue, null, null, null, session );
+
+			historyBindings.bindInsertValues(
+					collection,
+					key,
+					entry,
+					entryPosition,
+					session,
+					historyInsertExecutor.getJdbcValueBindings()
+			);
+			historyInsertExecutor.execute( entry, null, null, null, session );
+		}
+
+		return true;
+	}
+
+	private MutationOperationGroup getUpdateOperationGroup() {
+		if ( updateOperationGroup == null ) {
+			final var updateRowOperation = rowMutationOperations.getUpdateRowOperation();
+			final var mutationTarget = getMutationTarget();
+			updateOperationGroup = updateRowOperation == null
+					? noOperations( MutationType.UPDATE, mutationTarget )
+					: singleOperation( MutationType.UPDATE, mutationTarget, updateRowOperation );
+		}
+		return updateOperationGroup;
+	}
+
+	private MutationOperationGroup getHistoryDeleteOperationGroup() {
+		if ( historyDeleteOperationGroup == null ) {
+			final var operation = rowMutationOperations.getDeleteRowOperation( getHistoryTableMapping() );
+			historyDeleteOperationGroup = operation == null
+					? null
+					: singleOperation( MutationType.DELETE, getMutationTarget(), operation );
+		}
+		return historyDeleteOperationGroup;
+	}
+
+	private MutationOperationGroup getHistoryInsertOperationGroup() {
+		if ( historyInsertOperationGroup == null ) {
+			final var operation = rowMutationOperations.getInsertRowOperation( getHistoryTableMapping() );
+			historyInsertOperationGroup = operation == null
+					? null
+					: singleOperation( MutationType.INSERT, getMutationTarget(), operation );
+		}
+		return historyInsertOperationGroup;
+	}
+
+	private CollectionTableMapping getHistoryTableMapping() {
+		if ( historyTableMapping == null ) {
+			final var mutationTarget = getMutationTarget();
+			historyTableMapping =
+					new CollectionTableMapping( mutationTarget.getCollectionTableMapping(),
+							mutationTarget.getTargetPart().getTemporalMapping().getTableName() );
+		}
+		return historyTableMapping;
+	}
+
+	private HistoryCollectionRowMutationHelper getRowMutationHelper() {
+		if ( rowMutationHelper == null ) {
+			rowMutationHelper = new HistoryCollectionRowMutationHelper(
+					getMutationTarget(),
+					getHistoryTableMapping().getTableName(),
+					indexColumnIsSettable,
+					elementColumnIsSettable,
+					indexIncrementer
+			);
+		}
+		return rowMutationHelper;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorTemporal.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorTemporal.java
new file mode 100644
index 000000000000..49c0e1c883ad
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/mutation/UpdateRowsCoordinatorTemporal.java
@@ -0,0 +1,150 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.collection.mutation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.MutationExecutor;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * {@link UpdateRowsCoordinator} implementation for temporal collection tables
+ * in the {@link org.hibernate.temporal.TemporalTableStrategy#SINGLE_TABLE}
+ * temporal table mapping strategy.
+ *
+ * @author Gavin King
+ */
+public class UpdateRowsCoordinatorTemporal extends AbstractUpdateRowsCoordinator implements UpdateRowsCoordinator {
+
+	private final RowMutationOperations rowMutationOperations;
+	private final BasicBatchKey deleteBatchKey;
+	private final BasicBatchKey insertBatchKey;
+
+	private MutationOperationGroup deleteOperationGroup;
+	private MutationOperationGroup insertOperationGroup;
+
+	public UpdateRowsCoordinatorTemporal(
+			CollectionMutationTarget mutationTarget,
+			RowMutationOperations rowMutationOperations,
+			SessionFactoryImplementor sessionFactory) {
+		super( mutationTarget, sessionFactory );
+		this.rowMutationOperations = rowMutationOperations;
+		this.deleteBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#DELETE" );
+		this.insertBatchKey = new BasicBatchKey( mutationTarget.getRolePath() + "#INSERT" );
+	}
+
+	@Override
+	protected int doUpdate(Object key, PersistentCollection<?> collection, SharedSessionContractImplementor session) {
+		if ( rowMutationOperations.getDeleteRowOperation() == null
+				|| rowMutationOperations.getInsertRowOperation() == null ) {
+			return 0;
+		}
+
+		if ( deleteOperationGroup == null ) {
+			deleteOperationGroup = singleOperation(
+					MutationType.DELETE,
+					getMutationTarget(),
+					rowMutationOperations.getDeleteRowOperation()
+			);
+		}
+		if ( insertOperationGroup == null ) {
+			insertOperationGroup = singleOperation(
+					MutationType.INSERT,
+					getMutationTarget(),
+					rowMutationOperations.getInsertRowOperation()
+			);
+		}
+
+		final MutationExecutor deleteExecutor = mutationExecutorService.createExecutor(
+				() -> deleteBatchKey,
+				deleteOperationGroup,
+				session
+		);
+		final MutationExecutor insertExecutor = mutationExecutorService.createExecutor(
+				() -> insertBatchKey,
+				insertOperationGroup,
+				session
+		);
+
+		try {
+			final var attribute = getMutationTarget().getTargetPart();
+			final var collectionDescriptor = attribute.getCollectionDescriptor();
+			final var entries = collection.entries( collectionDescriptor );
+
+			int count = 0;
+			if ( collection.isElementRemoved() ) {
+				final List<Object> elements = new ArrayList<>();
+				while ( entries.hasNext() ) {
+					elements.add( entries.next() );
+				}
+				for ( int i = elements.size() - 1; i >= 0; i-- ) {
+					final Object entry = elements.get( i );
+					if ( processRow( key, collection, entry, i, deleteExecutor, insertExecutor, session ) ) {
+						count++;
+					}
+				}
+			}
+			else {
+				int position = 0;
+				while ( entries.hasNext() ) {
+					final Object entry = entries.next();
+					if ( processRow( key, collection, entry, position++, deleteExecutor, insertExecutor, session ) ) {
+						count++;
+					}
+				}
+			}
+			return count;
+		}
+		finally {
+			deleteExecutor.release();
+			insertExecutor.release();
+		}
+	}
+
+	private boolean processRow(
+			Object key,
+			PersistentCollection<?> collection,
+			Object entry,
+			int entryPosition,
+			MutationExecutor deleteExecutor,
+			MutationExecutor insertExecutor,
+			SharedSessionContractImplementor session) {
+		final var attribute = getMutationTarget().getTargetPart();
+		if ( !collection.needsUpdating( entry, entryPosition, attribute ) ) {
+			return false;
+		}
+
+		final Object deleteRowValue = resolveDeleteRowValue( collection, entry, entryPosition );
+		rowMutationOperations.getDeleteRowRestrictions().applyRestrictions(
+				collection,
+				key,
+				deleteRowValue,
+				entryPosition,
+				session,
+				deleteExecutor.getJdbcValueBindings()
+		);
+		deleteExecutor.execute( deleteRowValue, null, null, null, session );
+
+		rowMutationOperations.getInsertRowValues().applyValues(
+				collection,
+				key,
+				entry,
+				entryPosition,
+				session,
+				insertExecutor.getJdbcValueBindings()
+		);
+		insertExecutor.execute( entry, null, null, null, session );
+
+		return true;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
index 76d9652c8e94..a02fc10b248f 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -53,7 +53,6 @@
 import org.hibernate.engine.spi.EntityEntryFactory;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
@@ -68,12 +67,15 @@
 import org.hibernate.generator.values.GeneratedValues;
 import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
 import org.hibernate.id.BulkInsertionCapableIdentifierGenerator;
+import org.hibernate.id.CompositeNestedGeneratedValueGenerator;
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.id.OptimizableGenerator;
+import org.hibernate.metamodel.mapping.AuditMapping;
+import org.hibernate.metamodel.mapping.AuxiliaryMapping;
+import org.hibernate.metamodel.mapping.TemporalMapping;
 import org.hibernate.persister.filter.internal.FilterHelper;
 import org.hibernate.internal.util.ImmutableBitSet;
 import org.hibernate.internal.util.IndexedConsumer;
-import org.hibernate.internal.util.MarkerObject;
 import org.hibernate.internal.util.collections.LockModeEnumMap;
 import org.hibernate.jdbc.Expectation;
 import org.hibernate.loader.ast.internal.EntityConcreteTypeLoader;
@@ -106,6 +108,7 @@
 import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.AttributeMappingsList;
 import org.hibernate.metamodel.mapping.AttributeMappingsMap;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.mapping.DiscriminatorType;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
@@ -150,17 +153,12 @@
 import org.hibernate.models.internal.util.CollectionHelper;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.mutation.DeleteCoordinator;
-import org.hibernate.persister.entity.mutation.DeleteCoordinatorSoft;
-import org.hibernate.persister.entity.mutation.DeleteCoordinatorStandard;
 import org.hibernate.persister.entity.mutation.EntityMutationTarget;
 import org.hibernate.persister.entity.mutation.EntityTableMapping;
 import org.hibernate.persister.entity.mutation.InsertCoordinator;
-import org.hibernate.persister.entity.mutation.InsertCoordinatorStandard;
-import org.hibernate.persister.entity.mutation.MergeCoordinator;
 import org.hibernate.persister.entity.mutation.UpdateCoordinator;
-import org.hibernate.persister.entity.mutation.UpdateCoordinatorNoOp;
-import org.hibernate.persister.entity.mutation.UpdateCoordinatorStandard;
 import org.hibernate.persister.internal.SqlFragmentPredicate;
+import org.hibernate.persister.state.spi.StateManagement;
 import org.hibernate.property.access.spi.Getter;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.property.access.spi.Setter;
@@ -189,6 +187,7 @@
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.QueryLiteral;
+import org.hibernate.sql.ast.tree.from.AuxiliaryTableReference;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.StandardTableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroup;
@@ -204,7 +203,6 @@
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
 import org.hibernate.sql.model.ast.builder.MutationGroupBuilder;
-import org.hibernate.sql.model.ast.builder.TableInsertBuilder;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
@@ -222,6 +220,7 @@
 import org.hibernate.type.CompositeType;
 import org.hibernate.type.EntityType;
 import org.hibernate.type.ManyToOneType;
+import org.hibernate.type.MappingContext;
 import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
@@ -244,13 +243,14 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.emptySet;
 import static java.util.Collections.unmodifiableList;
-import static org.hibernate.boot.model.internal.SoftDeleteHelper.resolveSoftDeleteMapping;
+import static java.util.function.Function.identity;
 import static org.hibernate.engine.internal.CacheHelper.fromSharedCache;
 import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
@@ -273,7 +273,6 @@
 import static org.hibernate.internal.util.collections.ArrayHelper.isAllTrue;
 import static org.hibernate.internal.util.collections.ArrayHelper.to2DStringArray;
 import static org.hibernate.internal.util.collections.ArrayHelper.toIntArray;
-import static org.hibernate.internal.util.collections.ArrayHelper.toObjectArray;
 import static org.hibernate.internal.util.collections.ArrayHelper.toStringArray;
 import static org.hibernate.internal.util.collections.ArrayHelper.toTypeArray;
 import static org.hibernate.internal.util.collections.CollectionHelper.combine;
@@ -289,8 +288,6 @@
 import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.buildNonEncapsulatedCompositeIdentifierMapping;
 import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.resolveAggregateColumnBasicType;
 import static org.hibernate.metamodel.mapping.internal.MappingModelHelper.isCompatibleModelPart;
-import static org.hibernate.persister.entity.DiscriminatorHelper.NOT_NULL_DISCRIMINATOR;
-import static org.hibernate.persister.entity.DiscriminatorHelper.NULL_DISCRIMINATOR;
 import static org.hibernate.pretty.MessageHelper.infoString;
 import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
 import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
@@ -357,6 +354,9 @@ public abstract class AbstractEntityPersister
 	private final boolean[][] propertyColumnUpdateable;
 	private final boolean[][] propertyColumnInsertable;
 	private final Set<String> sharedColumnNames;
+	private final boolean[] propertyTemporalExcluded;
+	private final boolean[] propertyAuditedExcluded;
+	private final boolean hasTemporalExcludedProperties;
 
 	//information about lazy properties of this class
 	private final String[] lazyPropertyNames;
@@ -373,6 +373,8 @@ public abstract class AbstractEntityPersister
 	private final String[][] subclassPropertyColumnReaderTemplateClosure;
 	private final FetchMode[] subclassPropertyFetchModeClosure;
 
+	private final StateManagement stateManagement;
+
 	private Map<String, SingleIdArrayLoadPlan> lazyLoadPlanByFetchGroup;
 	private final LockModeEnumMap<LockingStrategy> lockers = new LockModeEnumMap<>();
 	private String sqlVersionSelectString;
@@ -423,10 +425,11 @@ public abstract class AbstractEntityPersister
 	private EntityVersionMapping versionMapping;
 	private EntityRowIdMapping rowIdMapping;
 	private EntityDiscriminatorMapping discriminatorMapping;
-	private SoftDeleteMapping softDeleteMapping;
+	private AuxiliaryMapping auxiliaryMapping;
 
 	private AttributeMappingsList attributeMappings;
 	protected AttributeMappingsMap declaredAttributeMappings = AttributeMappingsMap.builder().build();
+	protected AttributeMappingsMap declaredGenericAttributeMappings = AttributeMappingsMap.builder().build();
 	protected AttributeMappingsList staticFetchableList;
 	// We build a cache for getters and setters to avoid megamorphic calls
 	private Getter[] getterCache;
@@ -439,7 +442,7 @@ public abstract class AbstractEntityPersister
 	protected ReflectionOptimizer.AccessOptimizer accessOptimizer;
 
 	protected final String[] fullDiscriminatorSQLValues;
-	private final Object[] fullDiscriminatorValues;
+	private final DiscriminatorValue[] fullDiscriminatorValues;
 
 	/**
 	 * Warning:
@@ -459,6 +462,22 @@ public AbstractEntityPersister(
 			final EntityDataAccess cacheAccessStrategy,
 			final NaturalIdDataAccess naturalIdRegionAccessStrategy,
 			final RuntimeModelCreationContext creationContext)
+			throws HibernateException {
+		this(
+				persistentClass,
+				cacheAccessStrategy,
+				naturalIdRegionAccessStrategy,
+				creationContext,
+				identity()
+		);
+	}
+
+	protected AbstractEntityPersister(
+			final PersistentClass persistentClass,
+			final EntityDataAccess cacheAccessStrategy,
+			final NaturalIdDataAccess naturalIdRegionAccessStrategy,
+			final RuntimeModelCreationContext creationContext,
+			final Function<StateManagement, StateManagement> statementManagerConverter)
 				throws HibernateException {
 		super( persistentClass, creationContext );
 		jpaEntityName = persistentClass.getJpaEntityName();
@@ -583,6 +602,8 @@ public AbstractEntityPersister(
 		propertyColumnFormulaTemplates = new String[hydrateSpan][];
 		propertyColumnUpdateable = new boolean[hydrateSpan][];
 		propertyColumnInsertable = new boolean[hydrateSpan][];
+		propertyTemporalExcluded = new boolean[hydrateSpan];
+		propertyAuditedExcluded = new boolean[hydrateSpan];
 		sharedColumnNames = new HashSet<>();
 		nonLazyPropertyNames = new HashSet<>();
 
@@ -590,6 +611,8 @@ public AbstractEntityPersister(
 		final ArrayList<String> lazyNames = new ArrayList<>();
 		final ArrayList<Integer> lazyNumbers = new ArrayList<>();
 		final ArrayList<Type> lazyTypes = new ArrayList<>();
+		boolean foundTemporalExcluded = false;
+		boolean foundNonExcludedCollection = false;
 
 		final var propertyClosure = persistentClass.getPropertyClosure();
 		boolean foundFormula = false;
@@ -598,6 +621,14 @@ public AbstractEntityPersister(
 			thisClassProperties.add( property );
 			final var propertyValue = property.getValue();
 
+			final boolean temporalExcluded = property.isTemporalExcluded();
+			propertyTemporalExcluded[i] = temporalExcluded;
+			foundTemporalExcluded = foundTemporalExcluded || temporalExcluded;
+			propertyAuditedExcluded[i] = property.isAuditedExcluded();
+			foundNonExcludedCollection = foundNonExcludedCollection
+					|| propertyValue instanceof org.hibernate.mapping.Collection
+							&& !temporalExcluded;
+
 			final int span = property.getColumnSpan();
 			final String[] colNames = new String[span];
 			final String[] colAliases = new String[span];
@@ -644,6 +675,7 @@ else if ( selectable instanceof Column column ) {
 			propertyColumnUpdateable[i] = propertyValue.getColumnUpdateability();
 			propertyColumnInsertable[i] = propertyValue.getColumnInsertability();
 		}
+		hasTemporalExcludedProperties = foundTemporalExcluded;
 		hasFormulaProperties = foundFormula;
 		lazyPropertyNames = toStringArray( lazyNames );
 		lazyPropertyNumbers = toIntArray( lazyNumbers );
@@ -740,7 +772,7 @@ else if ( selectable instanceof Column column ) {
 						&& canWriteToCache
 						&& shouldInvalidateCache( persistentClass, creationContext );
 
-		final List<Object> values = new ArrayList<>();
+		final List<DiscriminatorValue> values = new ArrayList<>();
 		final List<String> sqlValues = new ArrayList<>();
 
 		if ( persistentClass.isPolymorphic() && persistentClass.getDiscriminator() != null ) {
@@ -761,11 +793,14 @@ else if ( selectable instanceof Column column ) {
 		}
 
 		fullDiscriminatorSQLValues = toStringArray( sqlValues );
-		fullDiscriminatorValues = toObjectArray( values );
+		fullDiscriminatorValues = values.toArray( DiscriminatorValue[]::new );
 
 		if ( hasNamedQueryLoader() ) {
 			getNamedQueryMemento( creationContext.getBootModel() );
 		}
+
+		// Hibernate Reactive needs to convert the stateManagement so that it can create reactive coordinators
+		stateManagement = statementManagerConverter.apply( persistentClass.getRootClass().getStateManagement() );
 	}
 
 	private static String renderSqlWhereStringTemplate(
@@ -871,17 +906,59 @@ && supportsSqlArrayType( getDialect() )
 	}
 
 	private String getIdentitySelectString(Dialect dialect) {
-		try {
-			final var identifierType = (BasicType<?>) getIdentifierType();
-			final int idTypeCode = identifierType.getJdbcType().getDdlTypeCode();
-			return dialect.getIdentityColumnSupport()
-					.getIdentitySelectString( getTableName(0), getKeyColumns(0)[0], idTypeCode );
+		final BasicType<?> identifierType;
+		if ( getIdentifierType() instanceof BasicType<?> type ) {
+			identifierType = type;
+		}
+		else {
+			final ComponentType componentType = (ComponentType) getIdentifierType();
+			final CompositeNestedGeneratedValueGenerator compositeGenerator = (CompositeNestedGeneratedValueGenerator) getGenerator();
+			int position = 0;
+			for ( boolean generatedOnExecution : compositeGenerator.getGeneratedOnExecutionColumnInclusions() ) {
+				if ( generatedOnExecution ) {
+					break;
+				}
+				position++;
+			}
+			identifierType = getUnderlyingType( factory.getRuntimeMetamodels(), componentType, position );
 		}
-		catch (MappingException ex) {
+		if ( identifierType != null ) {
+			try {
+				return dialect.getIdentityColumnSupport()
+						.getIdentitySelectString( getTableName( 0 ), getKeyColumns( 0 )[0],
+								identifierType.getJdbcType().getDdlTypeCode() );
+			}
+			catch (MappingException ex) {
+				// no proper IdentityColumnSupport in the dialect
+				return null;
+			}
+		}
+		else {
 			return null;
 		}
 	}
 
+	private static BasicType<?> getUnderlyingType(MappingContext mappingContext, Type type, int typeIndex) {
+		if ( type instanceof ComponentType componentType ) {
+			int cols = 0;
+			for ( var subtype : componentType.getSubtypes() ) {
+				final int columnSpan = subtype.getColumnSpan( mappingContext );
+				if ( cols+columnSpan > typeIndex ) {
+					return getUnderlyingType( mappingContext, subtype, typeIndex-cols );
+				}
+				cols += columnSpan;
+			}
+			throw new IndexOutOfBoundsException();
+		}
+		else if ( type instanceof EntityType entityType ) {
+			final var idType = entityType.getIdentifierOrUniqueKeyType( mappingContext );
+			return getUnderlyingType( mappingContext, idType, typeIndex );
+		}
+		else {
+			return (BasicType<?>) type;
+		}
+	}
+
 	static boolean isAbstract(PersistentClass subclass) {
 		final Boolean knownAbstract = subclass.isAbstract();
 		return knownAbstract == null
@@ -1249,6 +1326,7 @@ private SingleIdArrayLoadPlan createLazyLoanPlan(List<ModelPart> partsToSelect)
 				new LoadQueryInfluencers( factory ),
 				lockOptions,
 				jdbcParametersBuilder::add,
+				new SqlAliasBaseManager(),
 				factory
 		);
 		return new SingleIdArrayLoadPlan(
@@ -1282,14 +1360,13 @@ public <T> DomainResult<T> createDomainResult(
 			TableGroup tableGroup,
 			String resultVariable,
 			DomainResultCreationState creationState) {
-		final var entityResult = new EntityResultImpl(
+		final var entityResult = new EntityResultImpl<T>(
 				navigablePath,
 				this,
 				tableGroup,
 				resultVariable
 		);
 		entityResult.afterInitialize( entityResult, creationState );
-		//noinspection unchecked
 		return entityResult;
 	}
 
@@ -1327,8 +1404,22 @@ public NaturalIdMapping getNaturalIdMapping() {
 	@Override
 	public TableReference createPrimaryTableReference(
 			SqlAliasBase sqlAliasBase,
-			SqlAstCreationState sqlAstCreationState) {
-		return new NamedTableReference( getTableName(), sqlAliasBase.generateNewAlias() );
+			SqlAstCreationState creationState) {
+		final var loadQueryInfluencers = creationState.getLoadQueryInfluencers();
+		final boolean useAuxiliaryTable =
+				auxiliaryMapping != null
+						&& auxiliaryMapping.useAuxiliaryTable( loadQueryInfluencers );
+		final String primaryTableName =
+				useAuxiliaryTable
+						? auxiliaryMapping.getTableName()
+						: getTableName();
+		final String primaryAlias = sqlAliasBase.generateNewAlias();
+		final var tableReference =
+				useAuxiliaryTable
+						? new AuxiliaryTableReference( primaryTableName, getTableName(), primaryAlias )
+						: new NamedTableReference( primaryTableName, primaryAlias );
+		tableReference.applyAuxiliaryTable( auxiliaryMapping, loadQueryInfluencers );
+		return tableReference;
 	}
 
 	@Override
@@ -1365,6 +1456,8 @@ protected TableReferenceJoin generateTableReferenceJoin(
 				sqlAliasBase.generateNewAlias(),
 				!innerJoin
 		);
+		joinedTableReference.applyAuxiliaryTable( auxiliaryMapping,
+				creationState.getLoadQueryInfluencers() );
 		return new TableReferenceJoin(
 				innerJoin,
 				joinedTableReference,
@@ -1544,7 +1637,8 @@ private static PersistentCollection<?> getCollection(
 		if ( collection == null ) {
 			final var newCollection = collectionType.instantiate( session, persister, key );
 			newCollection.setOwner( entity );
-			persistenceContext.addUninitializedCollection( persister, newCollection, key );
+			persistenceContext.addUninitializedCollection( persister, newCollection, key,
+					entry != null && entry.isReadOnly() );
 			return newCollection;
 		}
 		else {
@@ -2795,7 +2889,7 @@ protected void logStaticSQL() {
 		}
 	}
 
-	public abstract Map<Object, String> getSubclassByDiscriminatorValue();
+	public abstract Map<DiscriminatorValue, String> getSubclassByDiscriminatorValue();
 
 	public abstract String[] getConstraintOrderedTableNameClosure();
 
@@ -2811,18 +2905,35 @@ public TableGroup createRootTableGroup(
 			NavigablePath navigablePath,
 			String explicitSourceAlias,
 			SqlAliasBase explicitSqlAliasBase,
-			Supplier<Consumer<Predicate>> additionalPredicateCollectorAccess,
+			Supplier<Consumer<Predicate>> additionalPredicateCollector,
 			SqlAstCreationState creationState) {
+		final var loadQueryInfluencers = creationState.getLoadQueryInfluencers();
+
 		final var sqlAliasBase = SqlAliasBase.from(
 				explicitSqlAliasBase,
 				explicitSourceAlias,
 				this,
 				creationState.getSqlAliasBaseGenerator()
 		);
-		final var rootTableReference = new NamedTableReference(
-				needsDiscriminator() ? getRootTableName() : getTableName(),
-				sqlAliasBase.generateNewAlias()
-		);
+		final boolean useAuxiliaryTable =
+				auxiliaryMapping != null
+						&& auxiliaryMapping.useAuxiliaryTable( loadQueryInfluencers );
+		final String rootTableName =
+				useAuxiliaryTable
+						? auxiliaryMapping.getTableName()
+						: needsDiscriminator() ? getRootTableName() : getTableName();
+		final String rootAlias = sqlAliasBase.generateNewAlias();
+		final var rootTableReference =
+				useAuxiliaryTable
+						? new AuxiliaryTableReference(
+								rootTableName,
+								needsDiscriminator()
+										? getRootTableName()
+										: getTableName(),
+								rootAlias
+						)
+						: new NamedTableReference( rootTableName, rootAlias );
+		rootTableReference.applyAuxiliaryTable( auxiliaryMapping, loadQueryInfluencers );
 
 		final var tableGroup = new StandardTableGroup(
 				canUseInnerJoins,
@@ -2842,10 +2953,11 @@ public TableGroup createRootTableGroup(
 									sqlAliasBase.generateNewAlias(),
 									isNullableSubclassTable( i )
 							);
+							joinedTableReference.applyAuxiliaryTable( auxiliaryMapping, loadQueryInfluencers );
 							return new TableReferenceJoin(
 									shouldInnerJoinSubclassTable( i, emptySet() ),
 									joinedTableReference,
-									additionalPredicateCollectorAccess == null
+									additionalPredicateCollector == null
 											? null
 											: generateJoinPredicate(
 													rootTableReference,
@@ -2864,24 +2976,21 @@ public TableGroup createRootTableGroup(
 				getFactory()
 		);
 
-		if ( additionalPredicateCollectorAccess != null ) {
+		if ( additionalPredicateCollector != null ) {
 			if ( needsDiscriminator() ) {
 				final String alias = tableGroup.getPrimaryTableReference().getIdentificationVariable();
 				final var discriminatorPredicate = createDiscriminatorPredicate( alias, tableGroup, creationState );
-				additionalPredicateCollectorAccess.get().accept( discriminatorPredicate );
+				additionalPredicateCollector.get().accept( discriminatorPredicate );
 			}
 
-			if ( softDeleteMapping != null ) {
-				final var tableReference =
-						tableGroup.resolveTableReference( getSoftDeleteTableDetails().getTableName() );
-				final var softDeletePredicate =
-						softDeleteMapping.createNonDeletedRestriction( tableReference,
-								creationState.getSqlExpressionResolver() );
-				additionalPredicateCollectorAccess.get().accept( softDeletePredicate );
-				if ( tableReference != rootTableReference && creationState.supportsEntityNameUsage() ) {
-					// Register entity name usage for the hierarchy root table to avoid pruning
-					creationState.registerEntityNameUsage( tableGroup, EntityNameUse.EXPRESSION, getRootEntityName() );
-				}
+			if ( auxiliaryMapping != null ) {
+				auxiliaryMapping.applyPredicate(
+						additionalPredicateCollector,
+						creationState,
+						tableGroup,
+						rootTableReference,
+						this
+				);
 			}
 		}
 
@@ -2958,27 +3067,33 @@ private Predicate createDisciminatorPredicate(BasicType<?> discriminatorType, Ex
 			return createInListPredicate( discriminatorType, sqlExpression );
 		}
 		else {
-			final Object value = getDiscriminatorValue();
-			if ( value == NULL_DISCRIMINATOR ) {
+			final DiscriminatorValue value = getDiscriminatorValue();
+			if ( value == DiscriminatorValue.Special.NULL ) {
 				return new NullnessPredicate( sqlExpression );
 			}
-			else if ( value == NOT_NULL_DISCRIMINATOR ) {
+			else if ( value == DiscriminatorValue.Special.NOT_NULL ) {
 				return new NullnessPredicate( sqlExpression, true );
 			}
+			else if ( value instanceof DiscriminatorValue.Literal literal ) {
+				return new ComparisonPredicate(
+						sqlExpression,
+						ComparisonOperator.EQUAL,
+						new QueryLiteral<>( literal.value(), discriminatorType )
+				);
+			}
 			else {
-				return new ComparisonPredicate( sqlExpression, ComparisonOperator.EQUAL,
-						new QueryLiteral<>( value, discriminatorType ) );
+				throw new IllegalStateException( "Unexpected discriminator value: " + value );
 			}
 		}
 	}
 
 	private Predicate createInListPredicate(BasicType<?> discriminatorType, Expression sqlExpression) {
 		boolean hasNull = false, hasNonNull = false;
-		for ( Object discriminatorValue : fullDiscriminatorValues ) {
-			if ( discriminatorValue == NULL_DISCRIMINATOR ) {
+		for ( DiscriminatorValue discriminatorValue : fullDiscriminatorValues ) {
+			if ( discriminatorValue == DiscriminatorValue.Special.NULL ) {
 				hasNull = true;
 			}
-			else if ( discriminatorValue == NOT_NULL_DISCRIMINATOR ) {
+			else if ( discriminatorValue == DiscriminatorValue.Special.NOT_NULL ) {
 				hasNonNull = true;
 			}
 		}
@@ -3005,12 +3120,12 @@ else if ( hasNull ) {
 
 	private InListPredicate discriminatorValuesPredicate(BasicType<?> discriminatorType, Expression sqlExpression) {
 		final List<Expression> values = new ArrayList<>( fullDiscriminatorValues.length );
-		for ( Object discriminatorValue : fullDiscriminatorValues ) {
-			if ( !(discriminatorValue instanceof MarkerObject) ) {
-				values.add( new QueryLiteral<>( discriminatorValue, discriminatorType) );
+		for ( DiscriminatorValue discriminatorValue : fullDiscriminatorValues ) {
+			if ( discriminatorValue instanceof DiscriminatorValue.Literal literal ) {
+				values.add( new QueryLiteral<>( literal.value(), discriminatorType ) );
 			}
 		}
-		return new InListPredicate( sqlExpression, values);
+		return new InListPredicate( sqlExpression, values );
 	}
 
 	protected String getPrunedDiscriminatorPredicate(
@@ -3222,10 +3337,10 @@ private void doLateInit() {
 					createGeneratedValuesProcessor( UPDATE, updateGeneratedAttributes );
 		}
 
-		insertCoordinator = buildInsertCoordinator();
-		updateCoordinator = buildUpdateCoordinator();
-		deleteCoordinator = buildDeleteCoordinator();
-		mergeCoordinator = buildMergeCoordinator();
+		insertCoordinator = stateManagement.createInsertCoordinator( this );
+		updateCoordinator = stateManagement.createUpdateCoordinator( this );
+		deleteCoordinator = stateManagement.createDeleteCoordinator( this );
+		mergeCoordinator = stateManagement.createMergeCoordinator( this );
 
 		//select SQL
 		sqlVersionSelectString = generateSelectVersionString();
@@ -3445,50 +3560,14 @@ private void collectAttributesIndexesForTable(int naturalTableIndex, Consumer<In
 
 	protected abstract boolean isIdentifierTable(String tableExpression);
 
-	protected InsertCoordinator buildInsertCoordinator() {
-		return new InsertCoordinatorStandard( this, factory );
-	}
-
-	protected UpdateCoordinator buildUpdateCoordinator() {
-		// we only have updates to issue for entities with one or more singular attributes
-		for ( int i = 0; i < attributeMappings.size(); i++ ) {
-			if ( attributeMappings.get( i ) instanceof SingularAttributeMapping ) {
-				return new UpdateCoordinatorStandard( this, factory );
-			}
-		}
-		// otherwise, nothing to update
-		return new UpdateCoordinatorNoOp( this );
-	}
-
-	protected UpdateCoordinator buildMergeCoordinator() {
-		// we only have updates to issue for entities with one or more singular attributes
-		for ( int i = 0; i < attributeMappings.size(); i++ ) {
-			if ( attributeMappings.get( i ) instanceof SingularAttributeMapping ) {
-				return new MergeCoordinator( this, factory );
-			}
-		}
-		// otherwise, nothing to update
-		return new UpdateCoordinatorNoOp( this );
-	}
-
-	protected DeleteCoordinator buildDeleteCoordinator() {
-		return softDeleteMapping == null
-				? new DeleteCoordinatorStandard( this, factory )
-				: new DeleteCoordinatorSoft( this, factory );
-	}
-
 	@Override
 	public void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
 	}
 
 	@Override
-	public void addSoftDeleteToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
-		if ( softDeleteMapping != null ) {
-			final TableInsertBuilder insertBuilder = insertGroupBuilder.getTableDetailsBuilder( getIdentifierTableName() );
-			final var mutatingTable = insertBuilder.getMutatingTable();
-			final var columnReference = new ColumnReference( mutatingTable, softDeleteMapping );
-			final var nonDeletedValueBinding = softDeleteMapping.createNonDeletedValueBinding( columnReference );
-			insertBuilder.addValueColumn( nonDeletedValueBinding );
+	public void addAuxiliaryToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
+		if ( auxiliaryMapping != null ) {
+			auxiliaryMapping.addToInsertGroup( insertGroupBuilder, this );
 		}
 	}
 
@@ -3682,6 +3761,14 @@ public boolean isAffectedByEnabledFilters(
 		}
 	}
 
+	@Override
+	public boolean isAffectedByInfluencers(
+			LoadQueryInfluencers influencers,
+			boolean onlyApplyForLoadByKeyFilters) {
+		return EntityPersister.super.isAffectedByInfluencers( influencers, onlyApplyForLoadByKeyFilters )
+			|| auxiliaryMapping != null && auxiliaryMapping.isAffectedByInfluencers( influencers );
+	}
+
 	/**
 	 * Locate the property-indices of all properties considered to be dirty.
 	 *
@@ -3753,6 +3840,35 @@ public boolean[] getPropertyUpdateability(Object entity) {
 				: getPropertyUpdateability();
 	}
 
+	@Override
+	public boolean isPropertyTemporalExcluded(int attributeIndex) {
+		return propertyTemporalExcluded[attributeIndex];
+	}
+
+	@Override
+	public boolean isPropertyAuditedExcluded(int attributeIndex) {
+		return propertyAuditedExcluded[attributeIndex];
+	}
+
+	@Override
+	public boolean excludedFromTemporalVersioning(
+			int[] dirtyAttributeIndexes,
+			boolean hasDirtyCollection) {
+		if ( !hasTemporalExcludedProperties
+				|| hasDirtyCollection
+				|| dirtyAttributeIndexes == null ) {
+			return false;
+		}
+		else {
+			for ( final int index : dirtyAttributeIndexes ) {
+				if ( !propertyTemporalExcluded[index] ) {
+					return false;
+				}
+			}
+			return true;
+		}
+	}
+
 	private void logDirtyProperties(int[] properties) {
 		if ( CORE_LOGGER.isTraceEnabled() ) {
 			for ( int property : properties ) {
@@ -3869,7 +3985,7 @@ private void handleNaturalIdReattachment(Object entity, SharedSessionContractImp
 				// for reattachment of mutable natural-ids, we absolutely positively have to grab the snapshot from the
 				// database, because we have no other way to know if the state changed while detached.
 				final Object[] entitySnapshot = persistenceContext.getDatabaseSnapshot( id, this );
-				final Object naturalIdSnapshot = naturalIdFromSnapshot( entitySnapshot );
+				final Object naturalIdSnapshot = naturalIdMapping.extractNaturalIdFromEntityState( entitySnapshot );
 
 				naturalIdResolutions.removeSharedResolution( id, naturalIdSnapshot, this, false );
 				final Object naturalId = naturalIdMapping.extractNaturalIdFromEntity( entity );
@@ -3880,11 +3996,6 @@ private void handleNaturalIdReattachment(Object entity, SharedSessionContractImp
 		}
 	}
 
-	private Object naturalIdFromSnapshot(Object[] entitySnapshot) {
-		return entitySnapshot == PersistenceContext.NO_ROW ? null
-				: naturalIdMapping.extractNaturalIdFromEntityState( entitySnapshot );
-	}
-
 	@Override
 	public Boolean isTransient(Object entity, SharedSessionContractImplementor session) throws HibernateException {
 		final Object id = getIdentifier( entity, session );
@@ -4518,7 +4629,7 @@ protected int determineTableNumberForColumn(String columnName) {
 		return 0;
 	}
 
-	protected String determineTableName(Table table) {
+	public String determineTableName(Table table) {
 		return table.getSubselect() != null
 				? "( " + createSqlQueryParser( table ).process() + " )"
 				: factory.getSqlStringGenerationContext().format( table.getQualifiedTableName() );
@@ -4696,33 +4807,73 @@ private void inheritSupertypeSpecialAttributeMappings() {
 		naturalIdMapping = superMappingType.getNaturalIdMapping();
 		versionMapping = superMappingType.getVersionMapping();
 		rowIdMapping = superMappingType.getRowIdMapping();
-		softDeleteMapping = superMappingType.getSoftDeleteMapping();
+		auxiliaryMapping = superMappingType.getAuxiliaryMapping();
 	}
 
 	private void buildDeclaredAttributeMappings
 			(MappingModelCreationProcess creationProcess, PersistentClass bootEntityDescriptor) {
+		final var allPropertyClosure = bootEntityDescriptor.getAllPropertyClosure();
 		final var properties = getProperties();
 		final var mappingsBuilder = AttributeMappingsMap.builder();
+		final var genericMappingsBuilder = AttributeMappingsMap.builder();
 		int stateArrayPosition = getStateArrayInitialPosition( creationProcess );
 		int fetchableIndex = getFetchableIndexOffset();
-		for ( int i = 0; i < getPropertySpan(); i++ ) {
-			final var runtimeAttributeDefinition = properties[i];
-			final String attributeName = runtimeAttributeDefinition.getName();
-			final var bootProperty = bootEntityDescriptor.getProperty( attributeName );
-			if ( superMappingType == null
+		int i = 0;
+		for ( var property : allPropertyClosure ) {
+			if ( !property.isGeneric() ) {
+				final var runtimeAttributeDefinition = properties[i];
+				final String attributeName = runtimeAttributeDefinition.getName();
+				final var bootProperty = bootEntityDescriptor.getProperty( attributeName );
+				if ( superMappingType == null
 					|| superMappingType.findAttributeMapping( bootProperty.getName() ) == null ) {
-				mappingsBuilder.put(
-						attributeName,
+					mappingsBuilder.put(
+							attributeName,
+							generateNonIdAttributeMapping(
+									runtimeAttributeDefinition,
+									bootProperty,
+									stateArrayPosition++,
+									fetchableIndex++,
+									creationProcess
+							)
+					);
+				}
+				declaredAttributeMappings = mappingsBuilder.build();
+				i++;
+			}
+			else {
+				final int span = property.getColumnSpan();
+				final String[] colNames = new String[span];
+				final var selectables = property.getSelectables();
+				final Dialect dialect = getDialect();
+				final TypeConfiguration typeConfiguration = creationProcess.getCreationContext().getTypeConfiguration();
+				for ( int k = 0; k < selectables.size(); k++ ) {
+					final var selectable = selectables.get(k);
+					if ( selectable instanceof Formula formula ) {
+						formula.setFormula( substituteBrackets( formula.getFormula() ) );
+						colNames[k] = selectable.getTemplate( dialect, typeConfiguration );
+					}
+					else if ( selectable instanceof Column column ) {
+						colNames[k] = column.getQuotedName( dialect );
+					}
+				}
+				final String tableName = determineTableName( property.getValue().getTable() );
+				genericMappingsBuilder.put(
+						property.getName(),
 						generateNonIdAttributeMapping(
-								runtimeAttributeDefinition,
-								bootProperty,
-								stateArrayPosition++,
-								fetchableIndex++,
+								property.getName(),
+								property.getType(),
+								property.getCascadeStyle(),
+								-1,
+								tableName,
+								colNames,
+								property,
+								-1,
+								-1,
 								creationProcess
 						)
 				);
+				declaredGenericAttributeMappings = genericMappingsBuilder.build();
 			}
-			declaredAttributeMappings = mappingsBuilder.build();
 			// otherwise, it's defined on the supertype, skip it here
 		}
 	}
@@ -4786,10 +4937,11 @@ private boolean isSubselect() {
 
 	private boolean generatorNeedsMultiTableInsert() {
 		final var generator = getGenerator();
-		if ( generator instanceof BulkInsertionCapableIdentifierGenerator
+		if ( generator instanceof BulkInsertionCapableIdentifierGenerator bulkInsertionCapableGenerator
 				&& generator instanceof OptimizableGenerator optimizableGenerator ) {
 			final var optimizer = optimizableGenerator.getOptimizer();
-			return optimizer != null && optimizer.getIncrementSize() > 1;
+			return optimizer != null && optimizer.getIncrementSize() > 1
+				|| !bulkInsertionCapableGenerator.supportsBulkInsertionIdentifierGeneration();
 		}
 		else {
 			return false;
@@ -4831,9 +4983,8 @@ private void prepareMappingModel(MappingModelCreationProcess creationProcess, Pe
 						(role, process) -> new EntityRowIdMappingImpl( rowIdName, getTableName(), this ) );
 		discriminatorMapping = generateDiscriminatorMapping( bootEntityDescriptor );
 		final var rootClass = bootEntityDescriptor.getRootClass();
-		softDeleteMapping =
-				resolveSoftDeleteMapping( this, rootClass, getIdentifierTableName(), creationProcess );
-		if ( softDeleteMapping != null && rootClass.getCustomSQLDelete() != null ) {
+		auxiliaryMapping = stateManagement.createAuxiliaryMapping( this, rootClass, creationProcess );
+		if ( auxiliaryMapping instanceof SoftDeleteMapping && rootClass.getCustomSQLDelete() != null ) {
 			throw new UnsupportedMappingException( "Entity may not define both @SoftDelete and @SQLDelete" );
 		}
 	}
@@ -4851,8 +5002,9 @@ else if ( bootEntityDescriptor.hasNaturalId() ) {
 		}
 	}
 
-	protected NaturalIdMapping generateNaturalIdMapping
-			(MappingModelCreationProcess creationProcess, PersistentClass bootEntityDescriptor) {
+	protected NaturalIdMapping generateNaturalIdMapping(
+			MappingModelCreationProcess creationProcess,
+			PersistentClass bootEntityDescriptor) {
 		//noinspection AssertWithSideEffects
 		assert bootEntityDescriptor.hasNaturalId();
 
@@ -4860,9 +5012,16 @@ else if ( bootEntityDescriptor.hasNaturalId() ) {
 		assert naturalIdAttributeIndexes.length > 0;
 
 		if ( naturalIdAttributeIndexes.length == 1 ) {
+			if ( bootEntityDescriptor.getRootClass().getNaturalIdClass() != null ) {
+				throw new UnsupportedMappingException( "NaturalIdClass not supported for simple naturaal-id mappings" );
+			}
 			final String propertyName = getPropertyNames()[ naturalIdAttributeIndexes[ 0 ] ];
 			final var attributeMapping = (SingularAttributeMapping) findAttributeMapping( propertyName );
-			return new SimpleNaturalIdMapping( attributeMapping, this, creationProcess );
+			return new SimpleNaturalIdMapping(
+					attributeMapping,
+					this,
+					creationProcess
+			);
 		}
 
 		// collect the names of the attributes making up the natural-id.
@@ -4886,7 +5045,12 @@ else if ( bootEntityDescriptor.hasNaturalId() ) {
 			throw new MappingException( "Expected multiple natural-id attributes, but found only one: " + getEntityName() );
 		}
 
-		return new CompoundNaturalIdMapping(this, collectedAttrMappings, creationProcess );
+		return new CompoundNaturalIdMapping(
+				this,
+				bootEntityDescriptor.getRootClass().getNaturalIdClass(),
+				collectedAttrMappings,
+				creationProcess
+		);
 	}
 
 	protected static SqmMultiTableMutationStrategy interpretSqmMultiTableStrategy(
@@ -5234,15 +5398,39 @@ protected AttributeMapping generateNonIdAttributeMapping(
 			int stateArrayPosition,
 			int fetchableIndex,
 			MappingModelCreationProcess creationProcess) {
-		final var creationContext = creationProcess.getCreationContext();
-
-		final String attrName = tupleAttrDefinition.getName();
-		final Type attrType = tupleAttrDefinition.getType();
-
+		final Type type = tupleAttrDefinition.getType();
 		final int propertyIndex = getPropertyIndex( bootProperty.getName() );
+		final String[] attrColumnExpression =
+				type instanceof BasicType<?>
+				&& bootProperty.getSelectables().get( 0 ).isFormula()
+						? propertyColumnFormulaTemplates[ propertyIndex ]
+						: getPropertyColumnNames( propertyIndex ) ;
+		return generateNonIdAttributeMapping(
+				tupleAttrDefinition.getName(),
+				type,
+				tupleAttrDefinition.getCascadeStyle(),
+				propertyIndex,
+				getTableName( getPropertyTableNumbers()[propertyIndex] ),
+				attrColumnExpression,
+				bootProperty,
+				stateArrayPosition,
+				fetchableIndex,
+				creationProcess
+		);
+	}
 
-		final String tableExpression = getTableName( getPropertyTableNumbers()[propertyIndex] );
-		final String[] attrColumnNames = getPropertyColumnNames( propertyIndex );
+	protected AttributeMapping generateNonIdAttributeMapping(
+			String attrName,
+			Type attrType,
+			CascadeStyle cascadeStyle,
+			int propertyIndex,
+			String tableExpression,
+			String[] attrColumnNames,
+			Property bootProperty,
+			int stateArrayPosition,
+			int fetchableIndex,
+			MappingModelCreationProcess creationProcess) {
+		final var creationContext = creationProcess.getCreationContext();
 
 		final var propertyAccess = getRepresentationStrategy().resolvePropertyAccess( bootProperty );
 
@@ -5274,7 +5462,7 @@ protected AttributeMapping generateNonIdAttributeMapping(
 					value.isColumnInsertable( 0 ),
 					value.isColumnUpdateable( 0 ),
 					propertyAccess,
-					tupleAttrDefinition.getCascadeStyle(),
+					cascadeStyle,
 					creationProcess
 			);
 		}
@@ -5312,7 +5500,7 @@ protected AttributeMapping generateNonIdAttributeMapping(
 			else {
 				final var basicBootValue = (BasicValue) value;
 
-				if ( attrColumnNames[ 0 ] != null ) {
+				if ( !value.getSelectables().get( 0 ).isFormula() ) {
 					attrColumnExpression = attrColumnNames[ 0 ];
 					isAttrColumnExpressionFormula = false;
 
@@ -5345,8 +5533,7 @@ protected AttributeMapping generateNonIdAttributeMapping(
 					resolveAggregateColumnBasicType( creationProcess, role, column );
 				}
 				else {
-					final String[] attrColumnFormulaTemplate = propertyColumnFormulaTemplates[ propertyIndex ];
-					attrColumnExpression = attrColumnFormulaTemplate[ 0 ];
+					attrColumnExpression = attrColumnNames[ 0 ];
 					isAttrColumnExpressionFormula = true;
 					customReadExpr = null;
 					customWriteExpr = null;
@@ -5386,7 +5573,7 @@ protected AttributeMapping generateNonIdAttributeMapping(
 					value.isColumnInsertable( 0 ),
 					value.isColumnUpdateable( 0 ),
 					propertyAccess,
-					tupleAttrDefinition.getCascadeStyle(),
+					cascadeStyle,
 					creationProcess
 			);
 		}
@@ -5431,7 +5618,7 @@ else if ( attrType instanceof CompositeType ) {
 					tableExpression,
 					null,
 					propertyAccess,
-					tupleAttrDefinition.getCascadeStyle(),
+					cascadeStyle,
 					creationProcess
 			);
 		}
@@ -5443,7 +5630,7 @@ else if ( attrType instanceof CollectionType ) {
 					bootProperty,
 					this,
 					propertyAccess,
-					tupleAttrDefinition.getCascadeStyle(),
+					cascadeStyle,
 					getFetchMode( stateArrayPosition ),
 					creationProcess
 			);
@@ -5459,7 +5646,7 @@ else if ( attrType instanceof EntityType entityType ) {
 					this,
 					entityType,
 					propertyAccess,
-					tupleAttrDefinition.getCascadeStyle(),
+					cascadeStyle,
 					creationProcess
 			);
 		}
@@ -5591,7 +5778,25 @@ public EntityDiscriminatorMapping getDiscriminatorMapping() {
 
 	@Override
 	public SoftDeleteMapping getSoftDeleteMapping() {
-		return softDeleteMapping;
+		return auxiliaryMapping instanceof SoftDeleteMapping softDeleteMapping
+				? softDeleteMapping : null;
+	}
+
+	@Override
+	public TemporalMapping getTemporalMapping() {
+		return auxiliaryMapping instanceof TemporalMapping temporalMapping
+				? temporalMapping : null;
+	}
+
+	@Override
+	public AuditMapping getAuditMapping() {
+		return auxiliaryMapping instanceof AuditMapping auditMapping
+				? auditMapping : null;
+	}
+
+	@Override
+	public AuxiliaryMapping getAuxiliaryMapping() {
+		return auxiliaryMapping;
 	}
 
 	@Override
@@ -5722,6 +5927,11 @@ else if ( treatTargetType != this ) {
 	}
 
 	private ModelPart findSubPartInSubclassMappings(String name) {
+		final var declaredGenericAttribute = declaredGenericAttributeMappings.get( name );
+		if ( declaredGenericAttribute != null ) {
+			return declaredGenericAttribute;
+		}
+
 		ModelPart attribute = null;
 		if ( isNotEmpty( subclassMappingTypes ) ) {
 			for ( var subMappingType : subclassMappingTypes.values() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/DirtyHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/DirtyHelper.java
index d8eb504ad3f6..9819b2cdb036 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/DirtyHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/DirtyHelper.java
@@ -96,9 +96,7 @@ public static int[] findDirty(
 		int[] results = null;
 		int count = 0;
 		int span = propertyTypes.length;
-
 		for ( int i = 0; i < span; i++ ) {
-
 			if ( isDirty( propertyTypes, currentState, previousState, includeColumns, session, i ) ) {
 				if ( results == null ) {
 					results = new int[span];
@@ -106,7 +104,6 @@ public static int[] findDirty(
 				results[count++] = i;
 			}
 		}
-
 		return count == 0 ? null : ArrayHelper.trim( results, count );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorHelper.java
index a20b51d75e40..64bc7d439c5b 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorHelper.java
@@ -7,9 +7,9 @@
 import org.hibernate.Internal;
 import org.hibernate.MappingException;
 import org.hibernate.dialect.Dialect;
-import org.hibernate.internal.util.MarkerObject;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.PersistentClass;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.query.sqm.SqmPathSource;
@@ -29,9 +29,6 @@
 @Internal
 public class DiscriminatorHelper {
 
-	public static final Object NULL_DISCRIMINATOR = new MarkerObject( "<null discriminator>" );
-	public static final Object NOT_NULL_DISCRIMINATOR = new MarkerObject( "<not null discriminator>" );
-
 	/**
 	 * The underlying BasicType as the "JDBC mapping" between the relational {@link org.hibernate.type.descriptor.java.JavaType}
 	 * and the {@link org.hibernate.type.descriptor.jdbc.JdbcType}.
@@ -68,11 +65,13 @@ else if ( persistentClass.isDiscriminatorValueNotNull() ) {
 		}
 	}
 
-	private static Object parseDiscriminatorValue(PersistentClass persistentClass) {
+	private static DiscriminatorValue parseDiscriminatorValue(PersistentClass persistentClass) {
 		final BasicType<?> discriminatorType = getDiscriminatorType( persistentClass );
 		final String discriminatorValue = persistentClass.getDiscriminatorValue();
 		try {
-			return discriminatorType.getJavaTypeDescriptor().fromString( discriminatorValue );
+			return new DiscriminatorValue.Literal(
+					discriminatorType.getJavaTypeDescriptor().fromString( discriminatorValue )
+			);
 		}
 		catch ( Exception e ) {
 			throw new MappingException( "Could not parse discriminator value '" + discriminatorValue
@@ -80,18 +79,30 @@ private static Object parseDiscriminatorValue(PersistentClass persistentClass) {
 		}
 	}
 
-	public static Object getDiscriminatorValue(PersistentClass persistentClass) {
+	public static DiscriminatorValue getDiscriminatorValue(PersistentClass persistentClass) {
 		if ( persistentClass.isDiscriminatorValueNull() ) {
-			return NULL_DISCRIMINATOR;
+			return DiscriminatorValue.Special.NULL;
 		}
 		else if ( persistentClass.isDiscriminatorValueNotNull() ) {
-			return NOT_NULL_DISCRIMINATOR;
+			return DiscriminatorValue.Special.NOT_NULL;
 		}
 		else {
 			return parseDiscriminatorValue( persistentClass );
 		}
 	}
 
+	public static Object toRelationalValue(DiscriminatorValue discriminatorValue) {
+		if ( discriminatorValue instanceof DiscriminatorValue.Literal literal ) {
+			return literal.value();
+		}
+		else if ( discriminatorValue == DiscriminatorValue.Special.NULL ) {
+			return null;
+		}
+		else {
+			throw new IllegalStateException( "Cannot convert NOT_NULL discriminator marker to a relational literal" );
+		}
+	}
+
 	private static <T> String discriminatorSqlLiteral(
 			BasicType<T> discriminatorType,
 			PersistentClass persistentClass,
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
index 1647bb84e45d..5aafe8020f56 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java
@@ -139,7 +139,7 @@ public interface EntityPersister extends EntityMappingType, EntityMutationTarget
 	 * Prepare loaders associated with the persister.  Distinct "phase"
 	 * in building the persister after {@linkplain InFlightEntityMappingType#prepareMappingModel}
 	 * and {@linkplain #postInstantiate()} have occurred.
-	 * <p/>
+	 * <p>
 	 * The distinct phase is used to ensure that all {@linkplain org.hibernate.metamodel.mapping.TableDetails}
 	 * are available across the entire model
 	 */
@@ -862,6 +862,20 @@ default UpdateCoordinator getMergeCoordinator() {
 	 */
 	boolean[] getPropertyUpdateability();
 
+	/**
+	 * Is the property excluded from temporal versioning.
+	 */
+	default boolean isPropertyTemporalExcluded(int attributeIndex) {
+		return false;
+	}
+
+	/**
+	 * Is the property excluded from audit logging.
+	 */
+	default boolean isPropertyAuditedExcluded(int attributeIndex) {
+		return false;
+	}
+
 	/**
 	 * Get the "checkability" of the properties of this class
 	 * (is the property dirty checked, does the cache need
@@ -1557,6 +1571,9 @@ default DiscriminatorMetadata getTypeDiscriminatorMetadata() {
 	@Deprecated(since = "7.0", forRemoval = true)
 	String[] toColumns(String propertyName);
 
+	@Incubating
+	boolean excludedFromTemporalVersioning(int[] dirtyAttributeIndexes, boolean hasDirtyCollection);
+
 	boolean isSharedColumn(String columnExpression);
 
 	String[][] getConstraintOrderedTableKeyColumnClosure();
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
index 5bfc852cd76a..c9dcb90e0f1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
@@ -10,6 +10,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.hibernate.AssertionFailure;
@@ -26,6 +27,7 @@
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
 import org.hibernate.metamodel.mapping.EntityVersionMapping;
@@ -36,6 +38,7 @@
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.persister.filter.internal.DynamicFilterAliasGenerator;
+import org.hibernate.persister.state.spi.StateManagement;
 import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.TableGroup;
@@ -51,6 +54,7 @@
 import org.jboss.logging.Logger;
 
 import static java.util.Collections.emptyMap;
+import static java.util.function.Function.identity;
 import static org.hibernate.internal.util.collections.ArrayHelper.contains;
 import static org.hibernate.internal.util.collections.ArrayHelper.join;
 import static org.hibernate.internal.util.collections.ArrayHelper.reverseFirst;
@@ -62,8 +66,6 @@
 import static org.hibernate.jdbc.Expectations.createExpectation;
 import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.buildEncapsulatedCompositeIdentifierMapping;
 import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.buildNonEncapsulatedCompositeIdentifierMapping;
-import static org.hibernate.persister.entity.DiscriminatorHelper.NOT_NULL_DISCRIMINATOR;
-import static org.hibernate.persister.entity.DiscriminatorHelper.NULL_DISCRIMINATOR;
 
 /**
  * An {@link EntityPersister} implementing the normalized
@@ -119,7 +121,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
 	// subclass discrimination works by assigning particular
 	// values to certain combinations of not-null primary key
 	// values in the outer join using an SQL CASE
-	private final Map<Object,String> subclassesByDiscriminatorValue = new HashMap<>();
+	private final Map<DiscriminatorValue, String> subclassesByDiscriminatorValue = new HashMap<>();
 	private final String[] discriminatorValues;
 	private final boolean[] discriminatorAbstract;
 	private final String[] notNullColumnNames;
@@ -128,7 +130,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
 	private final String[] constraintOrderedTableNames;
 	private final String[][] constraintOrderedKeyColumnNames;
 
-	private final Object discriminatorValue;
+	private final DiscriminatorValue discriminatorValue;
 	private final String discriminatorSQLString;
 	private final BasicType<?> discriminatorType;
 	private final String explicitDiscriminatorColumnName;
@@ -142,7 +144,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
 	private final boolean[] isNullableTable;
 	private final boolean[] isInverseTable;
 
-	private final Map<String, Object> discriminatorValuesByTableName;
+	private final Map<String, DiscriminatorValue> discriminatorValuesByTableName;
 	private final Map<String, String> discriminatorColumnNameByTableName;
 
 	public JoinedSubclassEntityPersister(
@@ -150,8 +152,18 @@ public JoinedSubclassEntityPersister(
 			final EntityDataAccess cacheAccessStrategy,
 			final NaturalIdDataAccess naturalIdRegionAccessStrategy,
 			final RuntimeModelCreationContext creationContext)
+			throws HibernateException {
+		this( persistentClass, cacheAccessStrategy, naturalIdRegionAccessStrategy, creationContext, identity() );
+	}
+
+	protected JoinedSubclassEntityPersister(
+			final PersistentClass persistentClass,
+			final EntityDataAccess cacheAccessStrategy,
+			final NaturalIdDataAccess naturalIdRegionAccessStrategy,
+			final RuntimeModelCreationContext creationContext,
+			final Function<StateManagement, StateManagement> stateManagementConverter)
 					throws HibernateException {
-		super( persistentClass, cacheAccessStrategy, naturalIdRegionAccessStrategy, creationContext );
+		super( persistentClass, cacheAccessStrategy, naturalIdRegionAccessStrategy, creationContext, stateManagementConverter );
 
 		final var dialect = creationContext.getDialect();
 		final var typeConfiguration = creationContext.getTypeConfiguration();
@@ -181,8 +193,8 @@ public JoinedSubclassEntityPersister(
 				discriminatorAlias = IMPLICIT_DISCRIMINATOR_ALIAS;
 				discriminatorType = basicTypeRegistry.resolve( StandardBasicTypes.INTEGER );
 				try {
-					discriminatorValue = persistentClass.getSubclassId();
-					discriminatorSQLString = discriminatorValue.toString();
+					discriminatorValue = new DiscriminatorValue.Literal( persistentClass.getSubclassId() );
+					discriminatorSQLString = Integer.toString( persistentClass.getSubclassId() );
 				}
 				catch ( Exception e ) {
 					throw new MappingException( "Could not format discriminator value to SQL string", e );
@@ -480,12 +492,12 @@ public JoinedSubclassEntityPersister(
 				final var subclass = subclasses.get(k);
 				final var subclassTable = subclass.getTable();
 				if ( persistentClass.isPolymorphic() ) {
-					final Object discriminatorValue = explicitDiscriminatorColumnName != null
+					final DiscriminatorValue discriminatorValue = explicitDiscriminatorColumnName != null
 							? DiscriminatorHelper.getDiscriminatorValue( subclass )
 							// we now use subclass ids that are consistent across all
 							// persisters for a class hierarchy, so that the use of
 							// "foo.class = Bar" works in HQL
-							: subclass.getSubclassId();
+							: new DiscriminatorValue.Literal( subclass.getSubclassId() );
 					initDiscriminatorProperties( dialect, k, subclassTable, discriminatorValue, isAbstract( subclass ) );
 					subclassesByDiscriminatorValue.put( discriminatorValue, subclass.getEntityName() );
 					final int tableId = getTableId(
@@ -509,17 +521,30 @@ public JoinedSubclassEntityPersister(
 
 	}
 
-	private void initDiscriminatorProperties(Dialect dialect, int k, Table table, Object discriminatorValue, boolean isAbstract) {
+	private void initDiscriminatorProperties(
+			Dialect dialect,
+			int k,
+			Table table,
+			DiscriminatorValue discriminatorValue,
+			boolean isAbstract) {
 		final String tableName = determineTableName( table );
 		final String columnName = table.getPrimaryKey().getColumn( 0 ).getQuotedName( dialect );
 		discriminatorValuesByTableName.put( tableName, discriminatorValue );
 		discriminatorColumnNameByTableName.put( tableName, columnName );
-		discriminatorValues[k] = discriminatorValue.toString();
+		if ( discriminatorValue instanceof DiscriminatorValue.Literal literal ) {
+			discriminatorValues[k] = String.valueOf( literal.value() );
+		}
+		else if ( discriminatorValue == DiscriminatorValue.Special.NULL ) {
+			discriminatorValues[k] = "null";
+		}
+		else {
+			discriminatorValues[k] = "not null";
+		}
 		discriminatorAbstract[k] = isAbstract;
 	}
 
 	@Override
-	public Map<Object, String> getSubclassByDiscriminatorValue() {
+	public Map<DiscriminatorValue, String> getSubclassByDiscriminatorValue() {
 		return subclassesByDiscriminatorValue;
 	}
 
@@ -704,7 +729,7 @@ public BasicType<?> getDiscriminatorType() {
 	}
 
 	@Override
-	public Object getDiscriminatorValue() {
+	public DiscriminatorValue getDiscriminatorValue() {
 		return discriminatorValue;
 	}
 
@@ -748,10 +773,10 @@ public void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilde
 	}
 
 	private String getDiscriminatorValueString() {
-		if ( discriminatorValue == NULL_DISCRIMINATOR ) {
+		if ( discriminatorValue == DiscriminatorValue.Special.NULL ) {
 			return "null";
 		}
-		else if ( discriminatorValue == NOT_NULL_DISCRIMINATOR ) {
+		else if ( discriminatorValue == DiscriminatorValue.Special.NOT_NULL ) {
 			return "not null";
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
index 4573d6ccbf1f..faa088965af3 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
@@ -21,15 +22,18 @@
 import org.hibernate.mapping.Formula;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.metamodel.MappingMetamodel;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.mapping.TableDetails;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
 import org.hibernate.persister.filter.internal.DynamicFilterAliasGenerator;
+import org.hibernate.persister.state.spi.StateManagement;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.model.ast.builder.MutationGroupBuilder;
 import org.hibernate.sql.model.ast.builder.TableInsertBuilder;
 import org.hibernate.type.BasicType;
 
+import static java.util.function.Function.identity;
 import static org.hibernate.internal.util.collections.ArrayHelper.indexOf;
 import static org.hibernate.internal.util.collections.ArrayHelper.join;
 import static org.hibernate.internal.util.collections.ArrayHelper.to2DStringArray;
@@ -38,7 +42,6 @@
 import static org.hibernate.internal.util.collections.ArrayHelper.toStringArray;
 import static org.hibernate.internal.util.collections.CollectionHelper.toSmallMap;
 import static org.hibernate.jdbc.Expectations.createExpectation;
-import static org.hibernate.persister.entity.DiscriminatorHelper.NULL_DISCRIMINATOR;
 import static org.hibernate.sql.model.ast.builder.TableMutationBuilder.NULL;
 
 /**
@@ -87,14 +90,14 @@ public class SingleTableEntityPersister extends AbstractEntityPersister {
 	private final int[] subclassPropertyTableNumberClosure;
 
 	// discriminator column
-	private final Map<Object, String> subclassesByDiscriminatorValue;
+	private final Map<DiscriminatorValue, String> subclassesByDiscriminatorValue;
 	private final boolean forceDiscriminator;
 	private final String discriminatorColumnName;
 	private final String discriminatorColumnReaders;
 	private final String discriminatorColumnReaderTemplate;
 	private final String discriminatorFormulaTemplate;
 	private final BasicType<?> discriminatorType;
-	private final Object discriminatorValue;
+	private final DiscriminatorValue discriminatorValue;
 	private final String discriminatorSQLValue;
 	private final boolean discriminatorInsertable;
 
@@ -106,8 +109,18 @@ public SingleTableEntityPersister(
 			final EntityDataAccess cacheAccessStrategy,
 			final NaturalIdDataAccess naturalIdRegionAccessStrategy,
 			final RuntimeModelCreationContext creationContext)
+			throws HibernateException {
+		this( persistentClass, cacheAccessStrategy, naturalIdRegionAccessStrategy, creationContext, identity() );
+	}
+
+	protected SingleTableEntityPersister(
+			final PersistentClass persistentClass,
+			final EntityDataAccess cacheAccessStrategy,
+			final NaturalIdDataAccess naturalIdRegionAccessStrategy,
+			final RuntimeModelCreationContext creationContext,
+			final Function<StateManagement, StateManagement> statementManagerConverter)
 					throws HibernateException {
-		super( persistentClass, cacheAccessStrategy, naturalIdRegionAccessStrategy, creationContext );
+		super( persistentClass, cacheAccessStrategy, naturalIdRegionAccessStrategy, creationContext, statementManagerConverter );
 
 		final var dialect = creationContext.getDialect();
 		final var typeConfiguration = creationContext.getTypeConfiguration();
@@ -282,7 +295,7 @@ else if ( selectable instanceof Column column ) {
 		//TODO: code duplication with JoinedSubclassEntityPersister
 
 		final ArrayList<Integer> propertyJoinNumbers = new ArrayList<>();
-		final Map<Object, String> subclassesByDiscriminatorValueLocal = new HashMap<>();
+		final Map<DiscriminatorValue, String> subclassesByDiscriminatorValueLocal = new HashMap<>();
 
 		for ( var property : persistentClass.getSubclassPropertyClosure() ) {
 			propertyJoinNumbers.add( persistentClass.getJoinNumber( property ) );
@@ -329,8 +342,8 @@ private static boolean isDiscriminatorInsertable(PersistentClass persistentClass
 	}
 
 	private static void addSubclassByDiscriminatorValue(
-			Map<Object, String> subclassesByDiscriminatorValue,
-			Object discriminatorValue,
+			Map<DiscriminatorValue, String> subclassesByDiscriminatorValue,
+			DiscriminatorValue discriminatorValue,
 			String entityName) {
 		final String mappedEntityName = subclassesByDiscriminatorValue.put( discriminatorValue, entityName );
 		if ( mappedEntityName != null ) {
@@ -377,7 +390,7 @@ public BasicType<?> getDiscriminatorType() {
 	}
 
 	@Override
-	public Map<Object, String> getSubclassByDiscriminatorValue() {
+	public Map<DiscriminatorValue, String> getSubclassByDiscriminatorValue() {
 		return subclassesByDiscriminatorValue;
 	}
 
@@ -392,7 +405,7 @@ public TableDetails getIdentifierTableDetails() {
 	}
 
 	@Override
-	public Object getDiscriminatorValue() {
+	public DiscriminatorValue getDiscriminatorValue() {
 		return discriminatorValue;
 	}
 
@@ -472,7 +485,7 @@ public void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilde
 			final TableInsertBuilder tableInsertBuilder =
 					insertGroupBuilder.getTableDetailsBuilder( getRootTableName() );
 			tableInsertBuilder.addValueColumn(
-					discriminatorValue == NULL_DISCRIMINATOR ? NULL : discriminatorSQLValue,
+					discriminatorValue == DiscriminatorValue.Special.NULL ? NULL : discriminatorSQLValue,
 					getDiscriminatorMapping()
 			);
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java
index 68ca65971a64..431e71d5ded3 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java
@@ -15,6 +15,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.hibernate.AssertionFailure;
@@ -31,6 +32,7 @@
 import org.hibernate.jdbc.Expectation;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.PersistentClass;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
@@ -38,6 +40,7 @@
 import org.hibernate.metamodel.mapping.TableDetails;
 import org.hibernate.metamodel.mapping.internal.SqlTypedMappingImpl;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
+import org.hibernate.persister.state.spi.StateManagement;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlAliasBase;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
@@ -52,6 +55,7 @@
 
 import static java.util.Collections.addAll;
 import static java.util.Collections.unmodifiableList;
+import static java.util.function.Function.identity;
 import static org.hibernate.internal.util.collections.ArrayHelper.to2DStringArray;
 import static org.hibernate.internal.util.collections.ArrayHelper.toStringArray;
 import static org.hibernate.jdbc.Expectations.createExpectation;
@@ -77,10 +81,10 @@ public class UnionSubclassEntityPersister extends AbstractEntityPersister {
 	private final String[] spaces;
 	private final String[] subclassSpaces;
 	private final String[] subclassTableExpressions;
-	private final Object discriminatorValue;
+	private final DiscriminatorValue discriminatorValue;
 	private final String discriminatorSQLValue;
 	private final BasicType<?> discriminatorType;
-	private final Map<Object,String> subclassByDiscriminatorValue = new HashMap<>();
+	private final Map<DiscriminatorValue, String> subclassByDiscriminatorValue = new HashMap<>();
 
 	private final String[] constraintOrderedTableNames;
 	private final String[][] constraintOrderedKeyColumnNames;
@@ -90,8 +94,18 @@ public UnionSubclassEntityPersister(
 			final EntityDataAccess cacheAccessStrategy,
 			final NaturalIdDataAccess naturalIdRegionAccessStrategy,
 			final RuntimeModelCreationContext creationContext)
+			throws HibernateException {
+		this( persistentClass, cacheAccessStrategy, naturalIdRegionAccessStrategy, creationContext, identity() );
+	}
+
+	protected UnionSubclassEntityPersister(
+			final PersistentClass persistentClass,
+			final EntityDataAccess cacheAccessStrategy,
+			final NaturalIdDataAccess naturalIdRegionAccessStrategy,
+			final RuntimeModelCreationContext creationContext,
+			final Function<StateManagement, StateManagement> stateManagementConverter)
 					throws HibernateException {
-		super( persistentClass, cacheAccessStrategy, naturalIdRegionAccessStrategy, creationContext );
+		super( persistentClass, cacheAccessStrategy, naturalIdRegionAccessStrategy, creationContext, stateManagementConverter );
 
 		validateGenerator();
 
@@ -118,17 +132,17 @@ public UnionSubclassEntityPersister(
 		deleteExpectations = new Expectation[] { createExpectation( persistentClass.getDeleteExpectation(),
 				persistentClass.isCustomDeleteCallable() ) };
 
-		discriminatorValue = persistentClass.getSubclassId();
+		discriminatorValue = new DiscriminatorValue.Literal( persistentClass.getSubclassId() );
 		discriminatorSQLValue = String.valueOf( persistentClass.getSubclassId() );
 		discriminatorType = creationContext.getTypeConfiguration().getBasicTypeRegistry().resolve( StandardBasicTypes.INTEGER );
 
 		// PROPERTIES
 
 		// SUBCLASSES
-		subclassByDiscriminatorValue.put( persistentClass.getSubclassId(), persistentClass.getEntityName() );
+		subclassByDiscriminatorValue.put( new DiscriminatorValue.Literal( persistentClass.getSubclassId() ), persistentClass.getEntityName() );
 		if ( persistentClass.isPolymorphic() ) {
 			for ( var subclass : persistentClass.getSubclasses() ) {
-				subclassByDiscriminatorValue.put( subclass.getSubclassId(), subclass.getEntityName() );
+				subclassByDiscriminatorValue.put( new DiscriminatorValue.Literal( subclass.getSubclassId() ), subclass.getEntityName() );
 			}
 		}
 
@@ -236,13 +250,25 @@ public TableGroup createRootTableGroup(
 			SqlAliasBase sqlAliasBase,
 			Supplier<Consumer<Predicate>> additionalPredicateCollectorAccess,
 			SqlAstCreationState creationState) {
-		return new UnionTableGroup(
+		final var tableGroup = new UnionTableGroup(
 				canUseInnerJoins,
 				navigablePath,
 				createPrimaryTableReference( sqlAliasBase, creationState ),
 				this,
 				explicitSourceAlias
 		);
+		final var softDeleteMapping = getSoftDeleteMapping();
+		if ( additionalPredicateCollectorAccess != null && softDeleteMapping != null ) {
+			final var tableReference =
+					tableGroup.resolveTableReference( getSoftDeleteTableDetails().getTableName() );
+			additionalPredicateCollectorAccess.get().accept(
+					softDeleteMapping.createNonDeletedRestriction(
+							tableReference,
+							creationState.getSqlExpressionResolver()
+					)
+			);
+		}
+		return tableGroup;
 	}
 
 	@Override
@@ -271,7 +297,7 @@ public BasicType<?> getDiscriminatorType() {
 	}
 
 	@Override
-	public Map<Object, String> getSubclassByDiscriminatorValue() {
+	public Map<DiscriminatorValue, String> getSubclassByDiscriminatorValue() {
 		return subclassByDiscriminatorValue;
 	}
 
@@ -286,7 +312,7 @@ public TableDetails getIdentifierTableDetails() {
 	}
 
 	@Override
-	public Object getDiscriminatorValue() {
+	public DiscriminatorValue getDiscriminatorValue() {
 		return discriminatorValue;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractAuditCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractAuditCoordinator.java
new file mode 100644
index 000000000000..4f6ff8741384
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractAuditCoordinator.java
@@ -0,0 +1,289 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import java.sql.SQLException;
+
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.batch.spi.BatchKey;
+import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.MappingException;
+import org.hibernate.generator.Generator;
+import org.hibernate.generator.OnExecutionGenerator;
+import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+import org.hibernate.sql.model.ast.builder.TableInsertBuilderStandard;
+import org.hibernate.sql.model.internal.MutationGroupSingle;
+
+import static org.hibernate.persister.entity.mutation.InsertCoordinatorStandard.getPropertiesToInsert;
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * Base support for audit log insert coordinators.
+ */
+abstract class AbstractAuditCoordinator extends AbstractMutationCoordinator {
+	protected final EntityTableMapping identifierTableMapping;
+	protected final EntityTableMapping auditTableMapping;
+	protected final String auditTableName;
+	protected final boolean[] auditedPropertyMask;
+	private final SelectableMapping transactionIdMapping;
+	private final SelectableMapping modificationTypeMapping;
+	protected final BasicBatchKey auditBatchKey;
+	private final boolean useServerTransactionTimestamps;
+	private final String currentTimestampFunctionName;
+	private final MutationOperationGroup staticAuditInsertGroup;
+
+	protected AbstractAuditCoordinator(EntityPersister entityPersister, SessionFactoryImplementor factory) {
+		super( entityPersister, factory );
+		this.identifierTableMapping = entityPersister.getIdentifierTableMapping();
+		final var auditMapping = entityPersister.getAuditMapping();
+		if ( auditMapping == null ) {
+			throw new MappingException( "No audit mapping available for " + entityPersister.getEntityName() );
+		}
+		this.auditTableName = auditMapping.getTableName();
+		this.auditTableMapping = createAuxiliaryTableMapping( identifierTableMapping, entityPersister, auditTableName );
+		this.auditedPropertyMask = new boolean[entityPersister.getPropertySpan()];
+		for ( int i = 0; i < this.auditedPropertyMask.length; i++ ) {
+			this.auditedPropertyMask[i] = !entityPersister.isPropertyAuditedExcluded( i );
+		}
+		this.transactionIdMapping = auditMapping.getTransactionIdMapping();
+		this.modificationTypeMapping = auditMapping.getModificationTypeMapping();
+		this.useServerTransactionTimestamps =
+				factory.getTransactionIdentifierService().useServerTimestamp( dialect() );
+		this.currentTimestampFunctionName = useServerTransactionTimestamps ? dialect().currentTimestamp() : null;
+		this.auditBatchKey = new BasicBatchKey( entityPersister.getEntityName() + "#AUDIT_INSERT" );
+		this.staticAuditInsertGroup = entityPersister.isDynamicInsert()
+				? null
+				: buildAuditInsertGroup( applyAuditMask( entityPersister.getPropertyInsertability() ), null, null );
+	}
+
+	protected void insertAuditRow(
+			Object entity,
+			Object id,
+			Object[] values,
+			AuditStateManagement.ModificationType modificationType,
+			SharedSessionContractImplementor session) {
+		if ( values != null ) {
+			final boolean dynamicInsert = entityPersister().isDynamicInsert();
+			final boolean[] propertyInclusions = applyAuditMask(
+					dynamicInsert
+							? getPropertiesToInsert( entityPersister(), values )
+							: entityPersister().getPropertyInsertability()
+			);
+			final MutationOperationGroup operationGroup = dynamicInsert
+					? buildAuditInsertGroup( propertyInclusions, entity, session )
+					: staticAuditInsertGroup;
+
+			final Object resolvedId = id != null
+					? id
+					: entity != null ? entityPersister().getIdentifier( entity, session ) : null;
+			if ( resolvedId == null || operationGroup == null ) {
+				return;
+			}
+
+			final var mutationExecutor = mutationExecutorService.createExecutor(
+					resolveBatchKeyAccess( dynamicInsert, session ),
+					operationGroup,
+					session
+			);
+			try {
+				bindAuditValues( resolvedId, values, propertyInclusions, modificationType, session,
+						mutationExecutor.getJdbcValueBindings() );
+				mutationExecutor.execute( entity, null, null, AbstractAuditCoordinator::verifyOutcome, session );
+			}
+			finally {
+				mutationExecutor.release();
+			}
+		}
+	}
+
+	protected BatchKey getAuditBatchKey() {
+		return auditBatchKey;
+	}
+
+	@Override
+	protected BatchKey getBatchKey() {
+		return auditBatchKey;
+	}
+
+	private MutationOperationGroup buildAuditInsertGroup(
+			boolean[] propertyInclusions,
+			Object entity,
+			SharedSessionContractImplementor session) {
+		final var insertBuilder =
+				new TableInsertBuilderStandard( entityPersister(), auditTableMapping, factory() );
+		applyAuditInsertDetails( insertBuilder, propertyInclusions, entity, session );
+		final var tableMutation = insertBuilder.buildMutation();
+		return singleOperation(
+				new MutationGroupSingle( MutationType.INSERT, entityPersister(), tableMutation ),
+				tableMutation.createMutationOperation( null, factory() )
+		);
+	}
+
+	private void applyAuditInsertDetails(
+			TableInsertBuilderStandard insertBuilder,
+			boolean[] propertyInclusions,
+			Object entity,
+			SharedSessionContractImplementor session) {
+		final var attributeMappings = entityPersister().getAttributeMappings();
+		for ( final int attributeIndex : identifierTableMapping.getAttributeIndexes() ) {
+			final var attributeMapping = attributeMappings.get( attributeIndex );
+			if ( propertyInclusions[attributeIndex] ) {
+				attributeMapping.forEachInsertable( insertBuilder );
+			}
+			else {
+				final var generator = attributeMapping.getGenerator();
+				if ( isValueGenerated( generator ) ) {
+					if ( entity != null && generator.generatedBeforeExecution( entity, session ) ) {
+						propertyInclusions[attributeIndex] = true;
+						attributeMapping.forEachInsertable( insertBuilder );
+					}
+					else if ( isValueGenerationInSql( generator ) ) {
+						addSqlGeneratedValue( insertBuilder, attributeMapping, (OnExecutionGenerator) generator );
+					}
+				}
+			}
+		}
+
+		if ( useServerTransactionTimestamps ) {
+			insertBuilder.addValueColumn( currentTimestampFunctionName, getTransactionIdMapping() );
+		}
+		else {
+			insertBuilder.addValueColumn( "?", getTransactionIdMapping() );
+		}
+		insertBuilder.addValueColumn( "?", getModificationTypeMapping() );
+
+		identifierTableMapping.getKeyMapping().forEachKeyColumn( insertBuilder::addKeyColumn );
+	}
+
+	private void bindAuditValues(
+			Object id,
+			Object[] values,
+			boolean[] propertyInclusions,
+			AuditStateManagement.ModificationType modificationType,
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings) {
+		final String tableName = auditTableName;
+		auditTableMapping.getKeyMapping().breakDownKeyJdbcValues(
+				id,
+				(jdbcValue, columnMapping) -> jdbcValueBindings.bindValue(
+						jdbcValue,
+						tableName,
+						columnMapping.getColumnName(),
+						ParameterUsage.SET
+				),
+				session
+		);
+
+		final var attributeMappings = entityPersister().getAttributeMappings();
+		for ( final int attributeIndex : identifierTableMapping.getAttributeIndexes() ) {
+			if ( propertyInclusions[attributeIndex] ) {
+				final var attributeMapping = attributeMappings.get( attributeIndex );
+				if ( !(attributeMapping instanceof PluralAttributeMapping) ) {
+					attributeMapping.decompose(
+							values[attributeIndex],
+							0,
+							jdbcValueBindings,
+							null,
+							(valueIndex, bindings, noop, jdbcValue, selectableMapping) -> {
+								if ( selectableMapping.isInsertable() && !selectableMapping.isFormula() ) {
+									bindings.bindValue(
+											jdbcValue,
+											tableName,
+											selectableMapping.getSelectionExpression(),
+											ParameterUsage.SET
+										);
+								}
+							},
+							session
+					);
+				}
+			}
+		}
+
+		if ( !useServerTransactionTimestamps ) {
+			jdbcValueBindings.bindValue(
+				session.getCurrentTransactionIdentifier(),
+				tableName,
+				getTransactionIdMapping().getSelectionExpression(),
+				ParameterUsage.SET
+			);
+		}
+
+		jdbcValueBindings.bindValue(
+				Integer.valueOf( modificationType.ordinal() ),
+				tableName,
+				getModificationTypeMapping().getSelectionExpression(),
+				ParameterUsage.SET
+		);
+	}
+
+	private boolean[] applyAuditMask(boolean[] propertyInclusions) {
+		if ( auditedPropertyMask == null ) {
+			return propertyInclusions;
+		}
+		final boolean[] masked = propertyInclusions.clone();
+		for ( int i = 0; i < masked.length; i++ ) {
+			if ( !auditedPropertyMask[i] ) {
+				masked[i] = false;
+			}
+		}
+		return masked;
+	}
+
+	private static boolean isValueGenerated(Generator generator) {
+		return generator != null
+			&& generator.generatesOnInsert()
+			&& generator.generatedOnExecution();
+	}
+
+	private boolean isValueGenerationInSql(Generator generator) {
+		assert isValueGenerated( generator );
+		return ( (OnExecutionGenerator) generator ).referenceColumnsInSql( dialect() );
+	}
+
+	private void addSqlGeneratedValue(
+			TableInsertBuilderStandard insertBuilder,
+			AttributeMapping attributeMapping,
+			OnExecutionGenerator generator) {
+		final boolean writePropertyValue = generator.writePropertyValue();
+		final String[] columnValues =
+				writePropertyValue
+						? null
+						: generator.getReferencedColumnValues( factory.getJdbcServices().getDialect() );
+		attributeMapping.forEachSelectable( (j, mapping) ->
+				insertBuilder.addValueColumn( writePropertyValue ? "?" : columnValues[j], mapping ) );
+	}
+
+	protected SelectableMapping getTransactionIdMapping() {
+		return transactionIdMapping;
+	}
+
+	protected SelectableMapping getModificationTypeMapping() {
+		return modificationTypeMapping;
+	}
+
+	private static boolean verifyOutcome(
+			PreparedStatementDetails statementDetails,
+			int affectedRowCount,
+			int batchPosition) throws SQLException {
+		statementDetails.getExpectation().verifyOutcome(
+				affectedRowCount,
+				statementDetails.getStatement(),
+				batchPosition,
+				statementDetails.getSqlString()
+		);
+		return true;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractDeleteCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractDeleteCoordinator.java
index 6ca1007386eb..b764dac8b919 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractDeleteCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractDeleteCoordinator.java
@@ -4,19 +4,25 @@
  */
 package org.hibernate.persister.entity.mutation;
 
-import org.hibernate.StaleObjectStateException;
-import org.hibernate.StaleStateException;
+import org.hibernate.engine.OptimisticLockStyle;
 import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.MutationExecutor;
 import org.hibernate.engine.jdbc.mutation.ParameterUsage;
-import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+import org.hibernate.sql.model.ast.builder.RestrictedTableMutationBuilder;
+import org.hibernate.sql.model.ast.builder.TableUpdateBuilderStandard;
+import org.hibernate.sql.model.internal.MutationGroupSingle;
 
-import static org.hibernate.engine.jdbc.mutation.internal.ModelMutationHelper.identifiedResultsCheck;
+import java.util.function.Function;
+
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
 
 /**
  * Template support for DeleteCoordinator implementations.  Mainly
@@ -115,7 +121,7 @@ protected void doDynamicDelete(
 					(statementDetails, affectedRowCount, batchPosition) ->
 							resultCheck( id, statementDetails, affectedRowCount, batchPosition ),
 					session,
-					staleStateException -> staleObjectState( id, staleStateException )
+					staleStateException -> staleObjectStateException( id, staleStateException )
 			);
 		}
 		finally {
@@ -272,7 +278,7 @@ protected void doStaticDelete(
 					(statementDetails, affectedRowCount, batchPosition) ->
 							resultCheck( id, statementDetails, affectedRowCount, batchPosition ),
 					session,
-					staleStateException -> staleObjectState( id, staleStateException )
+					staleStateException -> staleObjectStateException( id, staleStateException )
 			);
 		}
 		finally {
@@ -280,22 +286,6 @@ protected void doStaticDelete(
 		}
 	}
 
-	private StaleObjectStateException staleObjectState(Object id, StaleStateException staleStateException) {
-		return new StaleObjectStateException( entityPersister.getEntityName(), id, staleStateException );
-	}
-
-	private boolean resultCheck(
-			Object id, PreparedStatementDetails statementDetails, int affectedRowCount, int batchPosition) {
-		return identifiedResultsCheck(
-				statementDetails,
-				affectedRowCount,
-				batchPosition,
-				entityPersister,
-				id,
-				factory
-		);
-	}
-
 	protected void applyStaticDeleteTableDetails(
 			Object id,
 			Object rowId,
@@ -308,8 +298,8 @@ protected void applyStaticDeleteTableDetails(
 			applyLocking( version, null, mutationExecutor, session );
 		}
 
-		final var jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
-		bindPartitionColumnValueBindings( loadedState, session, jdbcValueBindings );
+		bindPartitionColumnValueBindings( loadedState, session,
+				mutationExecutor.getJdbcValueBindings() );
 
 		applyId( id, rowId, mutationExecutor, staticOperationGroup, session );
 	}
@@ -324,4 +314,115 @@ protected MutationOperationGroup resolveNoVersionDeleteGroup(SharedSessionContra
 		}
 		return noVersionDeleteGroup;
 	}
+
+	protected void applyOptimisticLocking(
+			OptimisticLockStyle optimisticLockStyle,
+			Function<String,RestrictedTableMutationBuilder<?, ?>> resolver,
+			Object[] loadedState,
+			SharedSessionContractImplementor session) {
+		if ( optimisticLockStyle.isVersion() && entityPersister().getVersionMapping() != null ) {
+			applyVersionBasedOptLocking( resolver );
+		}
+		else if ( loadedState != null && optimisticLockStyle.isAllOrDirty() ) {
+			applyNonVersionOptLocking( optimisticLockStyle, resolver, loadedState, session );
+		}
+	}
+
+	protected void applyVersionBasedOptLocking(Function<String,RestrictedTableMutationBuilder<?, ?>> resolver) {
+		final var versionMapping = entityPersister().getVersionMapping();
+		if ( versionMapping != null ) {
+			final String tableNameForMutation =
+					entityPersister().physicalTableNameForMutation( versionMapping );
+			final var tableMutationBuilder = resolver.apply( tableNameForMutation );
+			if ( tableMutationBuilder != null ) {
+				applyVersionOptimisticLocking( tableMutationBuilder );
+			}
+		}
+	}
+
+	protected void applyNonVersionOptLocking(
+			OptimisticLockStyle lockStyle,
+			Function<String,RestrictedTableMutationBuilder<?, ?>> resolver,
+			Object[] loadedState,
+			SharedSessionContractImplementor session) {
+		final var persister = entityPersister();
+		assert loadedState != null;
+		assert lockStyle.isAllOrDirty();
+		assert persister.optimisticLockStyle().isAllOrDirty();
+		assert session != null;
+
+		final boolean[] versionability = persister.getPropertyVersionability();
+		for ( int attributeIndex = 0; attributeIndex < versionability.length; attributeIndex++ ) {
+			// only makes sense to lock on singular attributes which are not excluded from optimistic locking
+			if ( versionability[attributeIndex] ) {
+				final var attribute = persister.getAttributeMapping( attributeIndex );
+				if ( !attribute.isPluralAttributeMapping() ) {
+					breakDownJdbcValues( resolver, session, attribute, loadedState[attributeIndex] );
+				}
+			}
+		}
+	}
+
+	private void breakDownJdbcValues(
+			Function<String,RestrictedTableMutationBuilder<?, ?>> resolver,
+			SharedSessionContractImplementor session,
+			AttributeMapping attribute,
+			Object loadedValue) {
+		final var tableMutationBuilder =
+				resolver.apply( attribute.getContainingTableExpression() );
+		if ( tableMutationBuilder != null ) {
+			final var optimisticLockBindings = tableMutationBuilder.getOptimisticLockBindings();
+			if ( optimisticLockBindings != null ) {
+				attribute.breakDownJdbcValues(
+						loadedValue,
+						(valueIndex, value, jdbcValueMapping) -> {
+							if ( !tableMutationBuilder.getKeyRestrictionBindings()
+									.containsColumn(
+											jdbcValueMapping.getSelectableName(),
+											jdbcValueMapping.getJdbcMapping()
+									) ) {
+								optimisticLockBindings.consume( valueIndex, value, jdbcValueMapping );
+							}
+						},
+						session
+				);
+			}
+		}
+	}
+
+	protected Function<String,RestrictedTableMutationBuilder<?, ?>> tableMutationBuilderResolver(
+			RestrictedTableMutationBuilder<?, ?> tableMutationBuilder) {
+		final String tableName = tableMutationBuilder.getMutatingTable().getTableName();
+		return name -> tableName.equals( name ) ? tableMutationBuilder : null;
+	}
+
+	protected void applyPartitionKeyRestriction(Function<String,RestrictedTableMutationBuilder<?, ?>> resolver) {
+		final var persister = entityPersister();
+		if ( persister.hasPartitionedSelectionMapping() ) {
+			final var attributeMappings = persister.getAttributeMappings();
+			for ( int m = 0; m < attributeMappings.size(); m++ ) {
+				final var attributeMapping = attributeMappings.get( m );
+				final int jdbcTypeCount = attributeMapping.getJdbcTypeCount();
+				for ( int i = 0; i < jdbcTypeCount; i++ ) {
+					final var selectableMapping = attributeMapping.getSelectable( i );
+					if ( selectableMapping.isPartitioned() ) {
+						final String tableNameForMutation =
+								persister.physicalTableNameForMutation( selectableMapping );
+						final var tableMutationBuilder = resolver.apply( tableNameForMutation );
+						if ( tableMutationBuilder != null ) {
+							tableMutationBuilder.addKeyRestrictionLeniently( selectableMapping );
+						}
+					}
+				}
+			}
+		}
+	}
+
+	MutationOperationGroup createMutationOperationGroup(TableUpdateBuilderStandard<MutationOperation> tableUpdateBuilder) {
+		final var tableMutation = tableUpdateBuilder.buildMutation();
+		return singleOperation(
+				new MutationGroupSingle( MutationType.DELETE, entityPersister(), tableMutation ),
+				tableMutation.createMutationOperation( null, factory() )
+		);
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java
index 9c80593e111f..6336fbe95fb4 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractMutationCoordinator.java
@@ -5,15 +5,20 @@
 package org.hibernate.persister.entity.mutation;
 
 import org.hibernate.Internal;
+import org.hibernate.StaleObjectStateException;
+import org.hibernate.StaleStateException;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.OptimisticLockStyle;
 import org.hibernate.engine.jdbc.batch.spi.BatchKey;
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
 import org.hibernate.engine.jdbc.mutation.internal.NoBatchKeyAccess;
 import org.hibernate.engine.jdbc.mutation.spi.BatchKeyAccess;
 import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.generator.EventType;
 import org.hibernate.generator.OnExecutionGenerator;
 import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.persister.entity.EntityPersister;
@@ -27,6 +32,7 @@
 import org.hibernate.sql.model.ast.builder.RestrictedTableMutationBuilder;
 
 import static java.lang.System.arraycopy;
+import static org.hibernate.engine.jdbc.mutation.internal.ModelMutationHelper.identifiedResultsCheck;
 import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
 import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.manyOperations;
 import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.noOperations;
@@ -55,6 +61,43 @@ public AbstractMutationCoordinator(EntityPersister entityPersister, SessionFacto
 		mutationExecutorService = factory.getServiceRegistry().getService( MutationExecutorService.class );
 	}
 
+	static boolean hasValueGenerationOnExecution(
+			OnExecutionGenerator generator,
+			Dialect dialect,
+			EventType eventType) {
+		if ( generator.getEventTypes().contains( eventType ) ) {
+			final boolean[] columnInclusions = generator.getColumnInclusions( dialect, eventType );
+			if ( columnInclusions != null ) {
+				for ( boolean included : columnInclusions ) {
+					if ( !included ) {
+						return true;
+					}
+				}
+			}
+			if ( !generator.referenceColumnsInSql( dialect, eventType ) ) {
+				return false;
+			}
+			else if ( !generator.writePropertyValue( eventType ) ) {
+				return true;
+			}
+			else {
+				final String[] columnValues = generator.getReferencedColumnValues( dialect, eventType );
+				if ( columnValues != null ) {
+					for ( int i = 0; i < columnValues.length; i++ ) {
+						if ( (columnInclusions == null || columnInclusions[i])
+								&& !"?".equals( columnValues[i] ) ) {
+							return true;
+						}
+					}
+				}
+				return false;
+			}
+		}
+		else {
+			return false;
+		}
+	}
+
 	protected EntityPersister entityPersister() {
 		return entityPersister;
 	}
@@ -68,11 +111,11 @@ protected Dialect dialect() {
 	}
 
 	protected BatchKeyAccess resolveBatchKeyAccess(boolean dynamicUpdate, SharedSessionContractImplementor session) {
-		if ( !dynamicUpdate
-				&& !entityPersister().optimisticLockStyle().isAllOrDirty()
-				&& session.getTransactionCoordinator() != null
-				&& session.getTransactionCoordinator().isTransactionActive() ) {
-			return this::getBatchKey;
+		if ( !dynamicUpdate && !entityPersister().optimisticLockStyle().isAllOrDirty() ) {
+			final var transactionCoordinator = session.getTransactionCoordinator();
+			if ( transactionCoordinator != null && transactionCoordinator.isTransactionActive() ) {
+				return this::getBatchKey;
+			}
 		}
 
 		return NoBatchKeyAccess.INSTANCE;
@@ -123,21 +166,39 @@ protected MutationOperation createOperation(ValuesAnalysis valuesAnalysis, Table
 		return singleTableMutation.createMutationOperation( valuesAnalysis, factory() );
 	}
 
+	// Used by Hibernate Reactive
+	protected boolean hasValueGenerationOnExecution(
+			Object entity,
+			SharedSessionContractImplementor session,
+			OnExecutionGenerator generator,
+			EventType eventType) {
+		final boolean generatedOnExecution =
+				session == null
+						? generator.generatedOnExecution()
+						: generator.generatedOnExecution( entity, session );
+		return generatedOnExecution
+			&& hasValueGenerationOnExecution( generator, dialect(), eventType );
+	}
+
 	protected void handleValueGeneration(
 			AttributeMapping attributeMapping,
 			MutationGroupBuilder mutationGroupBuilder,
-			OnExecutionGenerator generator) {
-		final Dialect dialect = factory.getJdbcServices().getDialect();
-		final boolean writePropertyValue = generator.writePropertyValue();
-		final String[] columnValues = writePropertyValue ? null : generator.getReferencedColumnValues( dialect );
+			OnExecutionGenerator generator,
+			EventType eventType) {
+		final var dialect = dialect();
+		final var columnValues = generator.getReferencedColumnValues( dialect, eventType );
+		final var columnInclusions = generator.getColumnInclusions( dialect, eventType );
 		attributeMapping.forEachSelectable( (j, mapping) -> {
-			final String tableName = entityPersister.physicalTableNameForMutation( mapping );
-			final ColumnValuesTableMutationBuilder tableUpdateBuilder =
-					mutationGroupBuilder.findTableDetailsBuilder( tableName );
-			tableUpdateBuilder.addValueColumn(
-					writePropertyValue ? "?" : columnValues[j],
-					mapping
-			);
+			if ( columnInclusions == null || columnInclusions[j] ) {
+				final ColumnValuesTableMutationBuilder<?> tableUpdateBuilder =
+						mutationGroupBuilder.findTableDetailsBuilder(
+								entityPersister.physicalTableNameForMutation( mapping ) );
+				final String columnValue =
+						columnValues != null && columnValues[j] != null
+								? columnValues[j]
+								: "?";
+				tableUpdateBuilder.addValueColumn( columnValue, mapping );
+			}
 		} );
 	}
 
@@ -220,4 +281,82 @@ protected void breakDownKeyJdbcValues(
 			);
 		}
 	}
-}
+
+	boolean resultCheck(
+			Object id,
+			PreparedStatementDetails statementDetails,
+			int affectedRowCount,
+			int batchPosition) {
+		return identifiedResultsCheck(
+				statementDetails,
+				affectedRowCount,
+				batchPosition,
+				entityPersister(),
+				id,
+				factory()
+		);
+	}
+
+	void applyOptimisticLocking(RestrictedTableMutationBuilder<?, ?> tableMutationBuilder) {
+		if ( entityPersister().optimisticLockStyle() == OptimisticLockStyle.VERSION ) {
+			applyVersionOptimisticLocking( tableMutationBuilder );
+		}
+	}
+
+	void applyVersionOptimisticLocking(RestrictedTableMutationBuilder<?, ?> tableMutationBuilder) {
+		final var versionMapping = entityPersister().getVersionMapping();
+		if ( versionMapping != null ) {
+			tableMutationBuilder.addOptimisticLockRestriction( versionMapping );
+		}
+	}
+
+	StaleObjectStateException staleObjectStateException(Object id, StaleStateException cause) {
+		return new StaleObjectStateException( entityPersister().getEntityName(), id, cause );
+	}
+
+	void applyPartitionKeyRestriction(RestrictedTableMutationBuilder<?, ?> tableMutationBuilder) {
+		final var persister = entityPersister();
+		if ( persister.hasPartitionedSelectionMapping() ) {
+			final var attributeMappings = persister.getAttributeMappings();
+			for ( int m = 0; m < attributeMappings.size(); m++ ) {
+				final var attributeMapping = attributeMappings.get( m );
+				final int jdbcTypeCount = attributeMapping.getJdbcTypeCount();
+				for ( int i = 0; i < jdbcTypeCount; i++ ) {
+					final var selectableMapping = attributeMapping.getSelectable( i );
+					if ( selectableMapping.isPartitioned() ) {
+						tableMutationBuilder.addKeyRestrictionLeniently( selectableMapping );
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * For temporal history tables and audit log tables.
+	 */
+	static EntityTableMapping createAuxiliaryTableMapping(
+			EntityTableMapping identifierTableMapping,
+			EntityPersister persister,
+			String tableName) {
+		return new EntityTableMapping(
+				tableName,
+				identifierTableMapping.getRelativePosition(),
+				identifierTableMapping.getKeyMapping(),
+				identifierTableMapping.isOptional(),
+				identifierTableMapping.isInverse(),
+				identifierTableMapping.isIdentifierTable(),
+				identifierTableMapping.getAttributeIndexes(),
+				identifierTableMapping.getInsertExpectation(),
+				identifierTableMapping.getInsertCustomSql(),
+				identifierTableMapping.isInsertCallable(),
+				identifierTableMapping.getUpdateExpectation(),
+				identifierTableMapping.getUpdateCustomSql(),
+				identifierTableMapping.isUpdateCallable(),
+				identifierTableMapping.isCascadeDeleteEnabled(),
+				identifierTableMapping.getDeleteExpectation(),
+				identifierTableMapping.getDeleteCustomSql(),
+				identifierTableMapping.isDeleteCallable(),
+				persister.isDynamicUpdate(),
+				persister.isDynamicInsert()
+		);
+	}}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractTemporalUpdateCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractTemporalUpdateCoordinator.java
new file mode 100644
index 000000000000..33709eaa64be
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/AbstractTemporalUpdateCoordinator.java
@@ -0,0 +1,105 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
+import org.hibernate.engine.jdbc.mutation.OperationResultChecker;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.model.MutationOperation;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+import org.hibernate.sql.model.ast.builder.TableUpdateBuilder;
+import org.hibernate.sql.model.ast.builder.TableUpdateBuilderStandard;
+import org.hibernate.sql.model.internal.MutationGroupSingle;
+
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * @author Gavin King
+ */
+abstract class AbstractTemporalUpdateCoordinator extends AbstractMutationCoordinator implements UpdateCoordinator {
+	AbstractTemporalUpdateCoordinator(EntityPersister entityPersister, SessionFactoryImplementor factory) {
+		super( entityPersister, factory );
+	}
+
+	static void applyTemporalEnding(TableUpdateBuilder<?> tableUpdateBuilder, TemporalMapping temporalMapping) {
+		final var endingColumnReference =
+				new ColumnReference( tableUpdateBuilder.getMutatingTable(), temporalMapping.getEndingColumnMapping() );
+		tableUpdateBuilder.addValueColumn( temporalMapping.createEndingValueBinding( endingColumnReference ) );
+		tableUpdateBuilder.addNonKeyRestriction( temporalMapping.createNullEndingValueBinding( endingColumnReference ) );
+	}
+
+	MutationOperationGroup buildEndingUpdateGroup(EntityTableMapping tableMapping, TemporalMapping temporalMapping) {
+		final var tableUpdateBuilder =
+				new TableUpdateBuilderStandard<>( entityPersister(), tableMapping, factory() );
+
+		applyKeyRestriction( null, entityPersister(), tableUpdateBuilder, tableMapping );
+		applyTemporalEnding( tableUpdateBuilder, temporalMapping );
+		applyPartitionKeyRestriction( tableUpdateBuilder );
+		applyOptimisticLocking( tableUpdateBuilder );
+
+		return createMutationOperationGroup( tableUpdateBuilder );
+	}
+
+	MutationOperationGroup createMutationOperationGroup(TableUpdateBuilderStandard<MutationOperation> tableUpdateBuilder) {
+		final var tableMutation = tableUpdateBuilder.buildMutation();
+		return singleOperation(
+				new MutationGroupSingle( MutationType.UPDATE, entityPersister(), tableMutation ),
+				tableMutation.createMutationOperation( null, factory() )
+		);
+	}
+
+	abstract void bindVersionRestriction(Object oldVersion, JdbcValueBindings jdbcValueBindings, String temporalTableName);
+
+	void performRowEndUpdate(
+			Object entity,
+			Object id,
+			Object rowId,
+			Object oldVersion,
+			SharedSessionContractImplementor session,
+			TemporalMapping temporalMapping,
+			MutationOperationGroup endUpdateGroup,
+			String temporalTableName,
+			OperationResultChecker resultChecker) {
+		final var mutationExecutor =
+				mutationExecutorService.createExecutor( resolveBatchKeyAccess( false, session ),
+						endUpdateGroup, session );
+		try {
+			final var jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
+			for ( int i = 0; i < endUpdateGroup.getNumberOfOperations(); i++ ) {
+				breakDownKeyJdbcValues( id, rowId, session, jdbcValueBindings,
+						(EntityTableMapping) endUpdateGroup.getOperation( i ).getTableDetails() );
+			}
+
+			bindVersionRestriction( oldVersion, jdbcValueBindings, temporalTableName );
+
+			if ( TemporalMutationHelper.isUsingParameters( session ) ) {
+				jdbcValueBindings.bindValue(
+						session.getCurrentTransactionIdentifier(),
+						temporalTableName,
+						temporalMapping.getEndingColumnMapping().getSelectionExpression(),
+						ParameterUsage.SET
+				);
+			}
+
+			mutationExecutor.execute(
+					entity,
+					null,
+					null,
+					resultChecker,
+					session,
+					staleStateException -> staleObjectStateException( id, staleStateException )
+			);
+		}
+		finally {
+			mutationExecutor.release();
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorAudit.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorAudit.java
new file mode 100644
index 000000000000..f4b2ce87468f
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorAudit.java
@@ -0,0 +1,58 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+import org.hibernate.sql.model.MutationOperationGroup;
+
+/**
+ * Delete coordinator for audited entities.
+ */
+public class DeleteCoordinatorAudit extends AbstractAuditCoordinator implements DeleteCoordinator {
+	private final DeleteCoordinator currentDeleteCoordinator;
+
+	public DeleteCoordinatorAudit(
+			EntityPersister entityPersister,
+			SessionFactoryImplementor factory,
+			DeleteCoordinator currentDeleteCoordinator) {
+		super( entityPersister, factory );
+		this.currentDeleteCoordinator = currentDeleteCoordinator;
+	}
+
+	@Override
+	public MutationOperationGroup getStaticMutationOperationGroup() {
+		return currentDeleteCoordinator.getStaticMutationOperationGroup();
+	}
+
+	@Override
+	public void delete(
+			Object entity,
+			Object id,
+			Object version,
+			SharedSessionContractImplementor session) {
+		currentDeleteCoordinator.delete( entity, id, version, session );
+		final var state = resolveDeleteState( entity, session );
+		if ( state != null ) {
+			insertAuditRow( entity, id, state, AuditStateManagement.ModificationType.DEL, session );
+		}
+	}
+
+	private Object[] resolveDeleteState(Object entity, SharedSessionContractImplementor session) {
+		if ( entity == null ) {
+			return null;
+		}
+		else {
+			final var persistenceContext = session.getPersistenceContextInternal();
+			final var entry = persistenceContext.getEntry( entity );
+			return entry != null
+				&& entry.getLoadedState() != null
+					? entry.getLoadedState()
+					: entityPersister().getValues( entity );
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorHistory.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorHistory.java
new file mode 100644
index 000000000000..5ff7f01a5ab6
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorHistory.java
@@ -0,0 +1,139 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.batch.spi.BatchKey;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+import org.hibernate.sql.model.ast.builder.TableUpdateBuilderStandard;
+import org.hibernate.sql.model.internal.MutationGroupSingle;
+
+import static org.hibernate.persister.entity.mutation.AbstractTemporalUpdateCoordinator.applyTemporalEnding;
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * Delete coordinator for
+ * {@link org.hibernate.temporal.TemporalTableStrategy#HISTORY_TABLE}
+ * temporal strategy.
+ *
+ * @author Gavin King
+ */
+public class DeleteCoordinatorHistory
+		extends AbstractMutationCoordinator
+		implements DeleteCoordinator {
+
+	private final DeleteCoordinator currentDeleteCoordinator;
+	private final EntityTableMapping historyTableMapping;
+	private final TemporalMapping temporalMapping;
+	private final BasicBatchKey historyBatchKey;
+	private final MutationOperationGroup historyEndUpdateGroup;
+
+	public DeleteCoordinatorHistory(
+			EntityPersister entityPersister,
+			SessionFactoryImplementor factory,
+			DeleteCoordinator currentDeleteCoordinator) {
+		super( entityPersister, factory );
+		this.currentDeleteCoordinator = currentDeleteCoordinator;
+		this.temporalMapping = entityPersister.getTemporalMapping();
+		this.historyTableMapping =
+				createAuxiliaryTableMapping( entityPersister.getIdentifierTableMapping(),
+						entityPersister, temporalMapping.getTableName() );
+		this.historyBatchKey = new BasicBatchKey( entityPersister.getEntityName() + "#HISTORY_DELETE" );
+		this.historyEndUpdateGroup = buildHistoryEndUpdateGroup();
+	}
+
+	@Override
+	public MutationOperationGroup getStaticMutationOperationGroup() {
+		return currentDeleteCoordinator.getStaticMutationOperationGroup();
+	}
+
+	@Override
+	protected BatchKey getBatchKey() {
+		return historyBatchKey;
+	}
+
+	@Override
+	public void delete(
+			Object entity,
+			Object id,
+			Object version,
+			SharedSessionContractImplementor session) {
+		currentDeleteCoordinator.delete( entity, id, version, session );
+		performHistoryEndingUpdate( entity, id, version, session );
+	}
+
+	private void performHistoryEndingUpdate(
+			Object entity,
+			Object id,
+			Object oldVersion,
+			SharedSessionContractImplementor session) {
+		final var mutationExecutor =
+				mutationExecutorService.createExecutor( resolveBatchKeyAccess( false, session ),
+						historyEndUpdateGroup, session );
+		try {
+			final var jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
+			for ( int i = 0; i < historyEndUpdateGroup.getNumberOfOperations(); i++ ) {
+				final var operation = historyEndUpdateGroup.getOperation( i );
+				breakDownKeyJdbcValues( id, null, session, jdbcValueBindings,
+						(EntityTableMapping) operation.getTableDetails() );
+			}
+
+			final var versionMapping = entityPersister().getVersionMapping();
+			if ( versionMapping != null && entityPersister().optimisticLockStyle().isVersion() ) {
+				jdbcValueBindings.bindValue(
+						oldVersion,
+						historyTableMapping.getTableName(),
+						versionMapping.getSelectionExpression(),
+						ParameterUsage.RESTRICT
+				);
+			}
+
+			if ( TemporalMutationHelper.isUsingParameters( session ) ) {
+				jdbcValueBindings.bindValue(
+						session.getCurrentTransactionIdentifier(),
+						historyTableMapping.getTableName(),
+						temporalMapping.getEndingColumnMapping().getSelectionExpression(),
+						ParameterUsage.SET
+				);
+			}
+
+			mutationExecutor.execute(
+					entity,
+					null,
+					null,
+					(statementDetails, affectedRowCount, batchPosition) ->
+							resultCheck( id, statementDetails, affectedRowCount, batchPosition ),
+					session,
+					staleStateException -> staleObjectStateException( id, staleStateException )
+			);
+		}
+		finally {
+			mutationExecutor.release();
+		}
+	}
+
+	private MutationOperationGroup buildHistoryEndUpdateGroup() {
+		final var tableUpdateBuilder =
+				new TableUpdateBuilderStandard<>( entityPersister(), historyTableMapping, factory() );
+
+		applyKeyRestriction( null, entityPersister(), tableUpdateBuilder, historyTableMapping );
+		applyTemporalEnding( tableUpdateBuilder, temporalMapping );
+		if ( entityPersister().optimisticLockStyle().isVersion() ) {
+			applyVersionOptimisticLocking( tableUpdateBuilder );
+		}
+
+		final var tableMutation = tableUpdateBuilder.buildMutation();
+		return singleOperation(
+				new MutationGroupSingle( MutationType.DELETE, entityPersister(), tableMutation ),
+				tableMutation.createMutationOperation( null, factory() )
+		);
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorSoft.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorSoft.java
index 7630096018ea..673d3abbd09b 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorSoft.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorSoft.java
@@ -4,21 +4,14 @@
  */
 package org.hibernate.persister.entity.mutation;
 
-import org.hibernate.engine.OptimisticLockStyle;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.SoftDeleteMapping;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.MutationOperationGroup;
-import org.hibernate.sql.model.MutationType;
-import org.hibernate.sql.model.ast.builder.TableUpdateBuilder;
 import org.hibernate.sql.model.ast.builder.TableUpdateBuilderStandard;
-import org.hibernate.sql.model.internal.MutationGroupSingle;
-
-import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
 
 /**
  * DeleteCoordinator for soft-deletes
@@ -37,129 +30,29 @@ protected MutationOperationGroup generateOperationGroup(
 			boolean applyVersion,
 			SharedSessionContractImplementor session) {
 		final var rootTableMapping = entityPersister().getIdentifierTableMapping();
-		final TableUpdateBuilderStandard<MutationOperation> tableUpdateBuilder = new TableUpdateBuilderStandard<>(
-				entityPersister(),
-				rootTableMapping,
-				factory()
-		);
+		final var tableUpdateBuilder = new TableUpdateBuilderStandard<>( entityPersister(), rootTableMapping, factory() );
 
 		applyKeyRestriction( rowId, entityPersister(), tableUpdateBuilder, rootTableMapping );
 		applySoftDelete( entityPersister().getSoftDeleteMapping(), tableUpdateBuilder );
-		applyPartitionKeyRestriction( tableUpdateBuilder );
-		applyOptimisticLocking( tableUpdateBuilder, loadedState, session );
-
-		final var tableMutation = tableUpdateBuilder.buildMutation();
-		final MutationGroupSingle mutationGroup = new MutationGroupSingle(
-				MutationType.DELETE,
-				entityPersister(),
-				tableMutation
+		applyPartitionKeyRestriction( tableName -> tableUpdateBuilder );
+		applyOptimisticLocking(
+				entityPersister().optimisticLockStyle(),
+				tableMutationBuilderResolver( tableUpdateBuilder ),
+				loadedState,
+				session
 		);
 
-		final var mutationOperation = tableMutation.createMutationOperation( null, factory() );
-		return singleOperation( mutationGroup, mutationOperation );
-	}
-
-	private void applyPartitionKeyRestriction(TableUpdateBuilder<?> tableUpdateBuilder) {
-		final var persister = entityPersister();
-		if ( persister.hasPartitionedSelectionMapping() ) {
-			final var attributeMappings = persister.getAttributeMappings();
-			for ( int m = 0; m < attributeMappings.size(); m++ ) {
-				final var attributeMapping = attributeMappings.get( m );
-				final int jdbcTypeCount = attributeMapping.getJdbcTypeCount();
-				for ( int i = 0; i < jdbcTypeCount; i++ ) {
-					final var selectableMapping = attributeMapping.getSelectable( i );
-					if ( selectableMapping.isPartitioned() ) {
-						tableUpdateBuilder.addKeyRestrictionLeniently( selectableMapping );
-					}
-				}
-			}
-		}
+		return createMutationOperationGroup( tableUpdateBuilder );
 	}
 
-	private void applySoftDelete(
+	private static void applySoftDelete(
 			SoftDeleteMapping softDeleteMapping,
 			TableUpdateBuilderStandard<MutationOperation> tableUpdateBuilder) {
-		final var softDeleteColumnReference = new ColumnReference( tableUpdateBuilder.getMutatingTable(), softDeleteMapping );
-
+		final var softDeleteColumnReference =
+				new ColumnReference( tableUpdateBuilder.getMutatingTable(), softDeleteMapping );
 		// apply the assignment
 		tableUpdateBuilder.addValueColumn( softDeleteMapping.createDeletedValueBinding( softDeleteColumnReference ) );
 		// apply the restriction
 		tableUpdateBuilder.addNonKeyRestriction( softDeleteMapping.createNonDeletedValueBinding( softDeleteColumnReference ) );
 	}
-
-	protected void applyOptimisticLocking(
-			TableUpdateBuilderStandard<MutationOperation> tableUpdateBuilder,
-			Object[] loadedState,
-			SharedSessionContractImplementor session) {
-		final var persister = entityPersister();
-		final var optimisticLockStyle = persister.optimisticLockStyle();
-		if ( optimisticLockStyle.isVersion() && persister.getVersionMapping() != null ) {
-			applyVersionBasedOptLocking( tableUpdateBuilder );
-		}
-		else if ( loadedState != null && persister.optimisticLockStyle().isAllOrDirty() ) {
-			applyNonVersionOptLocking(
-					optimisticLockStyle,
-					tableUpdateBuilder,
-					loadedState,
-					session
-			);
-		}
-	}
-
-	protected void applyVersionBasedOptLocking(TableUpdateBuilderStandard<MutationOperation> tableUpdateBuilder) {
-		assert entityPersister().optimisticLockStyle() == OptimisticLockStyle.VERSION;
-		assert entityPersister().getVersionMapping() != null;
-
-		tableUpdateBuilder.addOptimisticLockRestriction( entityPersister().getVersionMapping() );
-	}
-
-	protected void applyNonVersionOptLocking(
-			OptimisticLockStyle lockStyle,
-			TableUpdateBuilderStandard<MutationOperation> tableUpdateBuilder,
-			Object[] loadedState,
-			SharedSessionContractImplementor session) {
-		final var persister = entityPersister();
-		assert loadedState != null;
-		assert lockStyle.isAllOrDirty();
-		assert persister.optimisticLockStyle().isAllOrDirty();
-		assert session != null;
-
-		final boolean[] versionability = persister.getPropertyVersionability();
-		for ( int attributeIndex = 0; attributeIndex < versionability.length; attributeIndex++ ) {
-			// only makes sense to lock on singular attributes which are not excluded from optimistic locking
-			if ( versionability[attributeIndex] ) {
-				final var attribute = persister.getAttributeMapping( attributeIndex );
-				if ( !attribute.isPluralAttributeMapping() ) {
-					breakDownJdbcValues( tableUpdateBuilder, session, attribute, loadedState[attributeIndex] );
-				}
-			}
-		}
-	}
-
-	private void breakDownJdbcValues(
-			TableUpdateBuilderStandard<MutationOperation> tableUpdateBuilder,
-			SharedSessionContractImplementor session,
-			AttributeMapping attribute,
-			Object loadedValue) {
-		if ( tableUpdateBuilder.getMutatingTable().getTableName()
-				.equals( attribute.getContainingTableExpression() ) ) {
-			final var optimisticLockBindings = tableUpdateBuilder.getOptimisticLockBindings();
-			if ( optimisticLockBindings != null ) {
-				attribute.breakDownJdbcValues(
-						loadedValue,
-						(valueIndex, value, jdbcValueMapping) -> {
-							if ( !tableUpdateBuilder.getKeyRestrictionBindings()
-									.containsColumn(
-											jdbcValueMapping.getSelectableName(),
-											jdbcValueMapping.getJdbcMapping()
-									) ) {
-								optimisticLockBindings.consume( valueIndex, value, jdbcValueMapping );
-							}
-						},
-						session
-				);
-			}
-		}
-		// else if it is not on the root table, skip it
-	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorStandard.java
index 7eeb0affec71..e455ec60f85b 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorStandard.java
@@ -4,15 +4,12 @@
  */
 package org.hibernate.persister.entity.mutation;
 
-import org.hibernate.engine.OptimisticLockStyle;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.sql.model.MutationOperationGroup;
 import org.hibernate.sql.model.MutationType;
 import org.hibernate.sql.model.ast.builder.MutationGroupBuilder;
-import org.hibernate.sql.model.ast.builder.RestrictedTableMutationBuilder;
 import org.hibernate.sql.model.ast.builder.TableDeleteBuilder;
 import org.hibernate.sql.model.ast.builder.TableDeleteBuilderSkipped;
 import org.hibernate.sql.model.ast.builder.TableDeleteBuilderStandard;
@@ -36,12 +33,10 @@ protected MutationOperationGroup generateOperationGroup(
 			SharedSessionContractImplementor session) {
 		final var deleteGroupBuilder = new MutationGroupBuilder( MutationType.DELETE, entityPersister() );
 
-		entityPersister().forEachMutableTableReverse( (tableMapping) -> {
-			final var tableDeleteBuilder = tableMapping.isCascadeDeleteEnabled()
-					? new TableDeleteBuilderSkipped( tableMapping )
-					: new TableDeleteBuilderStandard( entityPersister(), tableMapping, factory() );
-			deleteGroupBuilder.addTableDetailsBuilder( tableDeleteBuilder );
-		} );
+		entityPersister().forEachMutableTableReverse( tableMapping ->
+				deleteGroupBuilder.addTableDetailsBuilder( tableMapping.isCascadeDeleteEnabled()
+						? new TableDeleteBuilderSkipped( tableMapping )
+						: new TableDeleteBuilderStandard( entityPersister(), tableMapping, factory() ) ) );
 
 		applyTableDeleteDetails( deleteGroupBuilder, rowId, loadedState, applyVersion, session );
 
@@ -55,113 +50,19 @@ private void applyTableDeleteDetails(
 			boolean applyVersion,
 			SharedSessionContractImplementor session) {
 		// first, the table key column(s)
-		deleteGroupBuilder.forEachTableMutationBuilder( (builder) -> {
-			final var tableMapping = (EntityTableMapping) builder.getMutatingTable().getTableMapping();
-			final var tableDeleteBuilder = (TableDeleteBuilder) builder;
-			applyKeyRestriction( rowId, entityPersister(), tableDeleteBuilder, tableMapping );
-		} );
+		deleteGroupBuilder.forEachTableMutationBuilder( builder ->
+				applyKeyRestriction( rowId, entityPersister(), (TableDeleteBuilder) builder,
+						(EntityTableMapping) builder.getMutatingTable().getTableMapping() ) );
 
 		if ( applyVersion ) {
 			// apply any optimistic locking
-			applyOptimisticLocking( deleteGroupBuilder, loadedState, session );
-			final var persister = entityPersister();
-			if ( persister.hasPartitionedSelectionMapping() ) {
-				final var attributeMappings = persister.getAttributeMappings();
-				for ( int m = 0; m < attributeMappings.size(); m++ ) {
-					final var attributeMapping = attributeMappings.get( m );
-					final int jdbcTypeCount = attributeMapping.getJdbcTypeCount();
-					for ( int i = 0; i < jdbcTypeCount; i++ ) {
-						final var selectableMapping = attributeMapping.getSelectable( i );
-						if ( selectableMapping.isPartitioned() ) {
-							final String tableNameForMutation =
-									persister.physicalTableNameForMutation( selectableMapping );
-							final RestrictedTableMutationBuilder<?, ?> rootTableMutationBuilder =
-									deleteGroupBuilder.findTableDetailsBuilder( tableNameForMutation );
-							rootTableMutationBuilder.addKeyRestrictionLeniently( selectableMapping );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	protected void applyOptimisticLocking(
-			MutationGroupBuilder mutationGroupBuilder,
-			Object[] loadedState,
-			SharedSessionContractImplementor session) {
-		final var optimisticLockStyle = entityPersister().optimisticLockStyle();
-		if ( optimisticLockStyle.isVersion() && entityPersister().getVersionMapping() != null ) {
-			applyVersionBasedOptLocking( mutationGroupBuilder );
-		}
-		else if ( loadedState != null && entityPersister().optimisticLockStyle().isAllOrDirty() ) {
-			applyNonVersionOptLocking(
-					optimisticLockStyle,
-					mutationGroupBuilder,
+			applyOptimisticLocking(
+					entityPersister().optimisticLockStyle(),
+					deleteGroupBuilder::findTableDetailsBuilder,
 					loadedState,
 					session
 			);
-		}
-	}
-
-	protected void applyVersionBasedOptLocking(MutationGroupBuilder mutationGroupBuilder) {
-		assert entityPersister().optimisticLockStyle() == OptimisticLockStyle.VERSION;
-		assert entityPersister().getVersionMapping() != null;
-
-		final String tableNameForMutation =
-				entityPersister().physicalTableNameForMutation( entityPersister().getVersionMapping() );
-		final RestrictedTableMutationBuilder<?,?> rootTableMutationBuilder =
-				mutationGroupBuilder.findTableDetailsBuilder( tableNameForMutation );
-		rootTableMutationBuilder.addOptimisticLockRestriction( entityPersister().getVersionMapping() );
-	}
-
-	protected void applyNonVersionOptLocking(
-			OptimisticLockStyle lockStyle,
-			MutationGroupBuilder mutationGroupBuilder,
-			Object[] loadedState,
-			SharedSessionContractImplementor session) {
-		final var persister = entityPersister();
-		assert loadedState != null;
-		assert lockStyle.isAllOrDirty();
-		assert persister.optimisticLockStyle().isAllOrDirty();
-		assert session != null;
-
-		final boolean[] versionability = persister.getPropertyVersionability();
-		for ( int attributeIndex = 0; attributeIndex < versionability.length; attributeIndex++ ) {
-			// only makes sense to lock on singular attributes which are not excluded from optimistic locking
-			if ( versionability[attributeIndex] ) {
-				final var attribute = persister.getAttributeMapping( attributeIndex );
-				if ( !attribute.isPluralAttributeMapping() ) {
-					breakDownJdbcValues( mutationGroupBuilder, session, attribute, loadedState[attributeIndex] );
-				}
-			}
-		}
-	}
-
-	private void breakDownJdbcValues(
-			MutationGroupBuilder mutationGroupBuilder,
-			SharedSessionContractImplementor session,
-			AttributeMapping attribute,
-			Object loadedValue) {
-		final RestrictedTableMutationBuilder<?, ?> tableMutationBuilder =
-				mutationGroupBuilder.findTableDetailsBuilder( attribute.getContainingTableExpression() );
-		if ( tableMutationBuilder != null ) {
-			final var optimisticLockBindings = tableMutationBuilder.getOptimisticLockBindings();
-			if ( optimisticLockBindings != null ) {
-				attribute.breakDownJdbcValues(
-						loadedValue,
-						(valueIndex, value, jdbcValueMapping) -> {
-							if ( !tableMutationBuilder.getKeyRestrictionBindings()
-									.containsColumn(
-											jdbcValueMapping.getSelectableName(),
-											jdbcValueMapping.getJdbcMapping()
-									) ) {
-								optimisticLockBindings.consume( valueIndex, value, jdbcValueMapping );
-							}
-						}
-						,
-						session
-				);
-			}
+			applyPartitionKeyRestriction( deleteGroupBuilder::findTableDetailsBuilder );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorTemporal.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorTemporal.java
new file mode 100644
index 000000000000..430c796156cd
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/DeleteCoordinatorTemporal.java
@@ -0,0 +1,93 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
+import org.hibernate.engine.jdbc.mutation.MutationExecutor;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.ast.builder.TableUpdateBuilderStandard;
+
+import static org.hibernate.persister.entity.mutation.AbstractTemporalUpdateCoordinator.applyTemporalEnding;
+
+/**
+ * Delete coordinator for
+ * {@link org.hibernate.temporal.TemporalTableStrategy#SINGLE_TABLE}
+ * temporal strategy.
+ *
+ * @author Gavin King
+ */
+public class DeleteCoordinatorTemporal extends AbstractDeleteCoordinator {
+	private final TemporalMapping temporalMapping;
+
+	public DeleteCoordinatorTemporal(EntityPersister entityPersister, SessionFactoryImplementor factory) {
+		super( entityPersister, factory );
+		this.temporalMapping = entityPersister.getTemporalMapping();
+	}
+
+	@Override
+	protected void applyStaticDeleteTableDetails(
+			Object id,
+			Object rowId,
+			Object[] loadedState,
+			Object version,
+			boolean applyVersion,
+			MutationExecutor mutationExecutor,
+			SharedSessionContractImplementor session) {
+		super.applyStaticDeleteTableDetails( id, rowId, loadedState, version, applyVersion, mutationExecutor, session );
+		bindTemporalEndingValue( session, mutationExecutor.getJdbcValueBindings() );
+	}
+
+	@Override
+	protected void applyDynamicDeleteTableDetails(
+			Object id,
+			Object rowId,
+			Object[] loadedState,
+			MutationExecutor mutationExecutor,
+			MutationOperationGroup operationGroup,
+			SharedSessionContractImplementor session) {
+		super.applyDynamicDeleteTableDetails( id, rowId, loadedState, mutationExecutor, operationGroup, session );
+		bindTemporalEndingValue( session, mutationExecutor.getJdbcValueBindings() );
+	}
+
+	private void bindTemporalEndingValue(
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings) {
+		if ( TemporalMutationHelper.isUsingParameters( session ) ) {
+			jdbcValueBindings.bindValue(
+					session.getCurrentTransactionIdentifier(),
+					entityPersister().physicalTableNameForMutation( temporalMapping.getEndingColumnMapping() ),
+					temporalMapping.getEndingColumnMapping().getSelectionExpression(),
+					ParameterUsage.SET
+			);
+		}
+	}
+
+	@Override
+	protected MutationOperationGroup generateOperationGroup(
+			Object rowId,
+			Object[] loadedState,
+			boolean applyVersion,
+			SharedSessionContractImplementor session) {
+		final var rootTableMapping = entityPersister().getIdentifierTableMapping();
+		final var tableUpdateBuilder = new TableUpdateBuilderStandard<>( entityPersister(), rootTableMapping, factory() );
+
+		applyKeyRestriction( rowId, entityPersister(), tableUpdateBuilder, rootTableMapping );
+		applyTemporalEnding( tableUpdateBuilder, entityPersister().getTemporalMapping() );
+		applyPartitionKeyRestriction( tableName -> tableUpdateBuilder );
+		applyOptimisticLocking(
+				entityPersister().optimisticLockStyle(),
+				tableMutationBuilderResolver( tableUpdateBuilder ),
+				loadedState,
+				session
+		);
+
+		return createMutationOperationGroup( tableUpdateBuilder );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java
index 04b78e26dc71..568781a9d8da 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityMutationTarget.java
@@ -42,7 +42,7 @@ public interface EntityMutationTarget extends MutationTarget<EntityTableMapping>
 
 	void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilder);
 
-	void addSoftDeleteToInsertGroup(MutationGroupBuilder insertGroupBuilder);
+	void addAuxiliaryToInsertGroup(MutationGroupBuilder insertGroupBuilder);
 
 	/**
 	 * The name of the table to use when performing mutations (INSERT,UPDATE,DELETE)
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorAudit.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorAudit.java
new file mode 100644
index 000000000000..96d0bed60f45
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorAudit.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+import org.hibernate.sql.model.MutationOperationGroup;
+
+/**
+ * Insert coordinator for audited entities.
+ */
+public class InsertCoordinatorAudit extends AbstractAuditCoordinator implements InsertCoordinator {
+	private final InsertCoordinator currentInsertCoordinator;
+
+	public InsertCoordinatorAudit(
+			EntityPersister entityPersister,
+			SessionFactoryImplementor factory,
+			InsertCoordinator currentInsertCoordinator) {
+		super( entityPersister, factory );
+		this.currentInsertCoordinator = currentInsertCoordinator;
+	}
+
+	@Override
+	public MutationOperationGroup getStaticMutationOperationGroup() {
+		return currentInsertCoordinator.getStaticMutationOperationGroup();
+	}
+
+	@Override
+	public GeneratedValues insert(
+			Object entity,
+			Object[] values,
+			SharedSessionContractImplementor session) {
+		final var generatedValues = currentInsertCoordinator.insert( entity, values, session );
+		insertAuditRow( entity, null, values, AuditStateManagement.ModificationType.ADD, session );
+		return generatedValues;
+	}
+
+	@Override
+	public GeneratedValues insert(
+			Object entity,
+			Object id,
+			Object[] values,
+			SharedSessionContractImplementor session) {
+		final var generatedValues = currentInsertCoordinator.insert( entity, id, values, session );
+		insertAuditRow( entity, id, values, AuditStateManagement.ModificationType.ADD, session );
+		return generatedValues;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorHistory.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorHistory.java
new file mode 100644
index 000000000000..b4797b55fec0
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorHistory.java
@@ -0,0 +1,258 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import java.sql.SQLException;
+
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.batch.spi.BatchKey;
+import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.generator.Generator;
+import org.hibernate.generator.OnExecutionGenerator;
+import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+import org.hibernate.sql.model.ast.builder.TableInsertBuilderStandard;
+import org.hibernate.sql.model.internal.MutationGroupSingle;
+
+import static org.hibernate.persister.entity.mutation.InsertCoordinatorStandard.getPropertiesToInsert;
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * Insert coordinator for
+ * {@link org.hibernate.temporal.TemporalTableStrategy#HISTORY_TABLE}
+ * temporal strategy.
+ *
+ * @author Gavin King
+ */
+public class InsertCoordinatorHistory extends AbstractMutationCoordinator implements InsertCoordinator {
+	private final InsertCoordinator currentInsertCoordinator;
+	private final EntityTableMapping identifierTableMapping;
+	private final EntityTableMapping historyTableMapping;
+	private final TemporalMapping temporalMapping;
+	private final BasicBatchKey historyBatchKey;
+	private final MutationOperationGroup staticHistoryInsertGroup;
+
+	public InsertCoordinatorHistory(
+			EntityPersister entityPersister,
+			SessionFactoryImplementor factory,
+			InsertCoordinator currentInsertCoordinator) {
+		super( entityPersister, factory );
+		this.currentInsertCoordinator = currentInsertCoordinator;
+		identifierTableMapping = entityPersister.getIdentifierTableMapping();
+		temporalMapping = entityPersister.getTemporalMapping();
+		historyTableMapping =
+				createAuxiliaryTableMapping( identifierTableMapping,
+						entityPersister, temporalMapping.getTableName()
+		);
+		historyBatchKey = new BasicBatchKey( entityPersister.getEntityName() + "#HISTORY_INSERT" );
+		staticHistoryInsertGroup = entityPersister.isDynamicInsert()
+				? null
+				: buildHistoryInsertGroup( entityPersister.getPropertyInsertability(), null, null );
+	}
+
+	@Override
+	public MutationOperationGroup getStaticMutationOperationGroup() {
+		return currentInsertCoordinator.getStaticMutationOperationGroup();
+	}
+
+	@Override
+	protected BatchKey getBatchKey() {
+		return historyBatchKey;
+	}
+
+	@Override
+	public GeneratedValues insert(Object entity, Object[] values, SharedSessionContractImplementor session) {
+		final var generatedValues = currentInsertCoordinator.insert( entity, values, session );
+		final Object id = entityPersister().getIdentifier( entity, session );
+		insertHistoryRow( entity, id, values, session );
+		return generatedValues;
+	}
+
+	@Override
+	public GeneratedValues insert(
+			Object entity,
+			Object id,
+			Object[] values,
+			SharedSessionContractImplementor session) {
+		final var generatedValues = currentInsertCoordinator.insert( entity, id, values, session );
+		final Object resolvedId = id == null ? entityPersister().getIdentifier( entity, session ) : id;
+		insertHistoryRow( entity, resolvedId, values, session );
+		return generatedValues;
+	}
+
+	private void insertHistoryRow(
+			Object entity,
+			Object id,
+			Object[] values,
+			SharedSessionContractImplementor session) {
+		final boolean dynamicInsert = entityPersister().isDynamicInsert();
+		final boolean[] propertyInclusions = dynamicInsert
+				? getPropertiesToInsert( entityPersister(), values )
+				: entityPersister().getPropertyInsertability();
+		final var operationGroup = dynamicInsert
+				? buildHistoryInsertGroup( propertyInclusions, entity, session )
+				: staticHistoryInsertGroup;
+
+		final var mutationExecutor =
+				mutationExecutorService.createExecutor( resolveBatchKeyAccess( dynamicInsert, session ),
+						operationGroup, session );
+		try {
+			bindHistoryValues( id, values, propertyInclusions, session, mutationExecutor.getJdbcValueBindings() );
+			mutationExecutor.execute( entity, null, null, InsertCoordinatorHistory::verifyOutcome, session );
+		}
+		finally {
+			mutationExecutor.release();
+		}
+	}
+
+	private MutationOperationGroup buildHistoryInsertGroup(
+			boolean[] propertyInclusions,
+			Object entity,
+			SharedSessionContractImplementor session) {
+		final var insertBuilder =
+				new TableInsertBuilderStandard( entityPersister(), historyTableMapping, factory() );
+		applyHistoryInsertDetails( insertBuilder, propertyInclusions, entity, session );
+		final var tableMutation = insertBuilder.buildMutation();
+		return singleOperation(
+				new MutationGroupSingle( MutationType.INSERT, entityPersister(), tableMutation ),
+				tableMutation.createMutationOperation( null, factory() )
+		);
+	}
+
+	private void applyHistoryInsertDetails(
+			TableInsertBuilderStandard insertBuilder,
+			boolean[] propertyInclusions,
+			Object entity,
+			SharedSessionContractImplementor session) {
+		final var attributeMappings = entityPersister().getAttributeMappings();
+		for ( final int attributeIndex : identifierTableMapping.getAttributeIndexes() ) {
+			final var attributeMapping = attributeMappings.get( attributeIndex );
+			if ( propertyInclusions[attributeIndex] ) {
+				attributeMapping.forEachInsertable( insertBuilder );
+			}
+			else {
+				final var generator = attributeMapping.getGenerator();
+				if ( isValueGenerated( generator ) ) {
+					if ( session != null && generator.generatedBeforeExecution( entity, session ) ) {
+						propertyInclusions[attributeIndex] = true;
+						attributeMapping.forEachInsertable( insertBuilder );
+					}
+					else if ( isValueGenerationInSql( generator ) ) {
+						addSqlGeneratedValue( insertBuilder, attributeMapping, (OnExecutionGenerator) generator );
+					}
+				}
+			}
+		}
+
+		final var mutatingTable = insertBuilder.getMutatingTable();
+		final var startingColumn = new ColumnReference( mutatingTable, temporalMapping.getStartingColumnMapping() );
+		insertBuilder.addValueColumn( temporalMapping.createStartingValueBinding( startingColumn ) );
+		final var endingColumn = new ColumnReference( mutatingTable, temporalMapping.getEndingColumnMapping() );
+		insertBuilder.addValueColumn( temporalMapping.createNullEndingValueBinding( endingColumn ) );
+
+		identifierTableMapping.getKeyMapping().forEachKeyColumn( insertBuilder::addKeyColumn );
+	}
+
+	private void addSqlGeneratedValue(
+			TableInsertBuilderStandard insertBuilder,
+			AttributeMapping attributeMapping,
+			OnExecutionGenerator generator) {
+		final boolean writePropertyValue = generator.writePropertyValue();
+		final var columnValues =
+				writePropertyValue
+						? null
+						: generator.getReferencedColumnValues( factory.getJdbcServices().getDialect() );
+		attributeMapping.forEachSelectable( (j, mapping) ->
+				insertBuilder.addValueColumn( writePropertyValue ? "?" : columnValues[j], mapping ) );
+	}
+
+	private void bindHistoryValues(
+			Object id,
+			Object[] values,
+			boolean[] propertyInclusions,
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings) {
+		final String historyTableName = historyTableMapping.getTableName();
+		historyTableMapping.getKeyMapping().breakDownKeyJdbcValues(
+				id,
+				(jdbcValue, columnMapping) -> jdbcValueBindings.bindValue(
+						jdbcValue,
+						historyTableName,
+						columnMapping.getColumnName(),
+						ParameterUsage.SET
+				),
+				session
+		);
+
+		final var attributeMappings = entityPersister().getAttributeMappings();
+		for ( final int attributeIndex : identifierTableMapping.getAttributeIndexes() ) {
+			if ( propertyInclusions[attributeIndex] ) {
+				final var attributeMapping = attributeMappings.get( attributeIndex );
+				if ( !(attributeMapping instanceof PluralAttributeMapping) ) {
+					attributeMapping.decompose(
+							values[attributeIndex],
+							0,
+							jdbcValueBindings,
+							null,
+							(valueIndex, bindings, noop, jdbcValue, selectableMapping) -> {
+								if ( selectableMapping.isInsertable() && !selectableMapping.isFormula() ) {
+									bindings.bindValue(
+											jdbcValue,
+											historyTableName,
+											selectableMapping.getSelectionExpression(),
+											ParameterUsage.SET
+									);
+								}
+							},
+							session
+					);
+				}
+			}
+		}
+
+		if ( TemporalMutationHelper.isUsingParameters( session ) ) {
+			jdbcValueBindings.bindValue(
+					session.getCurrentTransactionIdentifier(),
+					historyTableName,
+					temporalMapping.getStartingColumnMapping().getSelectionExpression(),
+					ParameterUsage.SET
+			);
+		}
+	}
+
+	private static boolean isValueGenerated(Generator generator) {
+		return generator != null
+			&& generator.generatesOnInsert()
+			&& generator.generatedOnExecution();
+	}
+
+	private boolean isValueGenerationInSql(Generator generator) {
+		assert isValueGenerated( generator );
+		return ( (OnExecutionGenerator) generator ).referenceColumnsInSql( dialect() );
+	}
+
+	private static boolean verifyOutcome(
+			PreparedStatementDetails statementDetails,
+			int affectedRowCount,
+			int batchPosition) throws SQLException {
+		statementDetails.getExpectation().verifyOutcome(
+				affectedRowCount,
+				statementDetails.getStatement(),
+				batchPosition,
+				statementDetails.getSqlString()
+		);
+		return true;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java
index 9f2354a8ac3b..45b5497dcb38 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java
@@ -6,6 +6,7 @@
 
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.IdentityHashMap;
 import java.util.List;
 
 import org.hibernate.Internal;
@@ -20,12 +21,14 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.BeforeExecutionGenerator;
+import org.hibernate.generator.EventType;
 import org.hibernate.generator.Generator;
 import org.hibernate.generator.OnExecutionGenerator;
 import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.id.CompositeNestedGeneratedValueGenerator;
 import org.hibernate.metamodel.mapping.AttributeMapping;
-import org.hibernate.metamodel.mapping.AttributeMappingsList;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.TableDetails;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.sql.model.MutationOperationGroup;
 import org.hibernate.sql.model.MutationType;
@@ -144,9 +147,8 @@ public static class InsertValuesAnalysis implements ValuesAnalysis {
 
 		public InsertValuesAnalysis(EntityMutationTarget mutationTarget, Object[] values) {
 			mutationTarget.forEachMutableTable( (tableMapping) -> {
-				final int[] tableAttributeIndexes = tableMapping.getAttributeIndexes();
-				for ( int i = 0; i < tableAttributeIndexes.length; i++ ) {
-					if ( values[tableAttributeIndexes[i]] != null ) {
+				for ( int tableAttributeIndex : tableMapping.getAttributeIndexes() ) {
+					if ( values[tableAttributeIndex] != null ) {
 						tablesWithNonNullValues.add( tableMapping );
 						break;
 					}
@@ -170,6 +172,7 @@ protected GeneratedValues doStaticInserts(Object id, Object[] values, Object obj
 				mutationExecutor,
 				id,
 				values,
+				object,
 				staticInsertGroup,
 				entityPersister().getPropertyInsertability(),
 				tableInclusionChecker,
@@ -194,6 +197,7 @@ protected void decomposeForInsert(
 			MutationExecutor mutationExecutor,
 			Object id,
 			Object[] values,
+			Object object,
 			MutationOperationGroup mutationGroup,
 			boolean[] propertyInclusions,
 			TableInclusionChecker tableInclusionChecker,
@@ -205,12 +209,17 @@ protected void decomposeForInsert(
 			final var operation = mutationGroup.getOperation( position );
 			final var tableDetails = (EntityTableMapping) operation.getTableDetails();
 			if ( tableInclusionChecker.include( tableDetails ) ) {
-				final int[] attributeIndexes = tableDetails.getAttributeIndexes();
-				for ( int i = 0; i < attributeIndexes.length; i++ ) {
-					final int attributeIndex = attributeIndexes[ i ];
+				for ( final int attributeIndex : tableDetails.getAttributeIndexes() ) {
 					if ( propertyInclusions[attributeIndex] ) {
-						decomposeAttribute( values[attributeIndex], session, jdbcValueBindings,
-								attributeMappings.get( attributeIndex ) );
+						final var attributeMapping = attributeMappings.get( attributeIndex );
+						decomposeAttribute(
+								values[attributeIndex],
+								session,
+								jdbcValueBindings,
+								attributeMapping,
+								attributeMapping.getGenerator(),
+								object
+						);
 					}
 				}
 			}
@@ -218,6 +227,7 @@ protected void decomposeForInsert(
 
 		if ( id == null ) {
 			assert entityPersister().getInsertDelegate() != null;
+			bindGeneratedIdentifierJdbcValues( object, session, jdbcValueBindings, mutationGroup );
 		}
 		else {
 			for ( int position = 0; position < mutationGroup.getNumberOfOperations(); position++ ) {
@@ -228,6 +238,52 @@ protected void decomposeForInsert(
 		}
 	}
 
+	private void bindGeneratedIdentifierJdbcValues(
+			Object entity,
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings,
+			MutationOperationGroup mutationGroup) {
+		if ( entityPersister().getGenerator()
+					instanceof CompositeNestedGeneratedValueGenerator compositeGenerator ) {
+			final boolean[] columnInclusions =
+					compositeGenerator.getColumnInclusions( dialect(), EventType.INSERT );
+			final String[] columnValues =
+					compositeGenerator.getReferencedColumnValues( dialect(), EventType.INSERT );
+			final boolean bindAllIncluded =
+					columnValues == null && compositeGenerator.writePropertyValue( EventType.INSERT );
+			if ( bindAllIncluded || hasParameterMarkers( columnValues, columnInclusions ) ) {
+				final Object idToBind = entityPersister().getIdentifier( entity, session );
+				if ( idToBind != null ) {
+					for ( int position = 0; position < mutationGroup.getNumberOfOperations(); position++ ) {
+						breakDownJdbcValue(
+								idToBind,
+								session,
+								jdbcValueBindings,
+								(EntityTableMapping)
+										mutationGroup.getOperation( position )
+												.getTableDetails(),
+								columnInclusions,
+								columnValues,
+								bindAllIncluded
+						);
+					}
+				}
+			}
+		}
+	}
+
+	private static boolean hasParameterMarkers(String[] columnValues, boolean[] columnInclusions) {
+		if ( columnValues != null ) {
+			for ( int i = 0; i < columnValues.length; i++ ) {
+				if ( (columnInclusions == null || i >= columnInclusions.length || columnInclusions[i])
+					&& "?".equals( columnValues[i] ) ) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	protected void breakDownJdbcValue(
 			Object id,
 			SharedSessionContractImplementor session,
@@ -248,19 +304,93 @@ protected void breakDownJdbcValue(
 		);
 	}
 
+	protected void breakDownJdbcValue(
+			Object id,
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings,
+			EntityTableMapping tableDetails,
+			boolean[] columnInclusions,
+			String[] columnValues,
+			boolean bindAllIncluded) {
+		final String tableName = tableDetails.getTableName();
+		final var keyMapping = tableDetails.getKeyMapping();
+		final var keyColumns = keyMapping.getKeyColumns();
+		final var keyColumnIndex =
+				new IdentityHashMap<TableDetails.KeyColumn, Integer>( keyColumns.size() );
+		for ( int i = 0; i < keyColumns.size(); i++ ) {
+			keyColumnIndex.put( keyColumns.get( i ), i );
+		}
+		keyMapping.breakDownKeyJdbcValues(
+				id,
+				(jdbcValue, columnMapping) -> {
+					final Integer index = keyColumnIndex.get( columnMapping );
+					if ( index != null
+							&& shouldBindKeyColumn( index, columnInclusions, columnValues, bindAllIncluded ) ) {
+						jdbcValueBindings.bindValue(
+								jdbcValue,
+								tableName,
+								columnMapping.getColumnName(),
+								ParameterUsage.SET
+						);
+					}
+				},
+				session
+		);
+	}
+
+	private static boolean shouldBindKeyColumn(
+			int index,
+			boolean[] columnInclusions,
+			String[] columnValues,
+			boolean bindAllIncluded) {
+		if ( columnInclusions != null
+				&& ( index >= columnInclusions.length || !columnInclusions[index] ) ) {
+			return false;
+		}
+		else if ( columnValues == null ) {
+			return bindAllIncluded;
+		}
+		else {
+			return index < columnValues.length
+				&& "?".equals( columnValues[index] );
+		}
+	}
+
 	protected void decomposeAttribute(
 			Object value,
 			SharedSessionContractImplementor session,
 			JdbcValueBindings jdbcValueBindings,
-			AttributeMapping mapping) {
+			AttributeMapping mapping,
+			Generator generator,
+			Object entity) {
 		if ( !(mapping instanceof PluralAttributeMapping) ) {
+			final OnExecutionGenerator onExecutionGenerator;
+			final String[] columnValues;
+			final boolean[] columnInclusions;
+			final boolean bindAllValues;
+			if ( generator instanceof OnExecutionGenerator executionGenerator
+					&& generator.generatedOnExecution( entity, session )
+					&& generator.generatesOnInsert() ) {
+				onExecutionGenerator = executionGenerator;
+				columnValues = onExecutionGenerator.getReferencedColumnValues( dialect(), EventType.INSERT );
+				columnInclusions = onExecutionGenerator.getColumnInclusions( dialect(), EventType.INSERT );
+				bindAllValues = onExecutionGenerator.writePropertyValue( EventType.INSERT ) && columnValues == null;
+			}
+			else {
+				onExecutionGenerator = null;
+				columnValues = null;
+				columnInclusions = null;
+				bindAllValues = false;
+			}
+
 			mapping.decompose(
 					value,
 					0,
 					jdbcValueBindings,
 					null,
 					(valueIndex, bindings, noop, jdbcValue, selectableMapping) -> {
-						if ( selectableMapping.isInsertable() ) {
+						if ( selectableMapping.isInsertable()
+								&& shouldBindValue( onExecutionGenerator, columnValues, columnInclusions, bindAllValues, valueIndex ) ) {
 							bindings.bindValue(
 									jdbcValue,
 									entityPersister().physicalTableNameForMutation( selectableMapping ),
@@ -274,19 +404,37 @@ protected void decomposeAttribute(
 		}
 	}
 
+	private static boolean shouldBindValue(
+			OnExecutionGenerator onExecutionGenerator,
+			String[] columnValues,
+			boolean[] columnInclusions,
+			boolean bindAllValues,
+			int valueIndex) {
+		if ( onExecutionGenerator == null ) {
+			return true;
+		}
+		else if ( columnInclusions != null && !columnInclusions[valueIndex] ) {
+			return false;
+		}
+		else {
+			return bindAllValues
+				|| columnValues != null && "?".equals( columnValues[valueIndex] );
+		}
+	}
+
 	protected GeneratedValues doDynamicInserts(
 			Object id,
 			Object[] values,
 			Object object,
 			SharedSessionContractImplementor session,
 			boolean forceIdentifierBinding) {
-		final boolean[] propertiesToInsert = getPropertiesToInsert( values );
+		final boolean[] propertiesToInsert = getPropertiesToInsert( entityPersister(), values );
 		final var insertGroup =
 				generateDynamicInsertSqlGroup( propertiesToInsert, object, session, forceIdentifierBinding );
 		final var mutationExecutor = executor( session, insertGroup, true );
 		final var insertValuesAnalysis = new InsertValuesAnalysis( entityPersister(), values );
 		final var tableInclusionChecker = getTableInclusionChecker( insertValuesAnalysis );
-		decomposeForInsert( mutationExecutor, id, values, insertGroup, propertiesToInsert, tableInclusionChecker, session );
+		decomposeForInsert( mutationExecutor, id, values, object, insertGroup, propertiesToInsert, tableInclusionChecker, session );
 		try {
 			return mutationExecutor.execute(
 					object,
@@ -327,9 +475,9 @@ protected static TableInclusionChecker getTableInclusionChecker(InsertValuesAnal
 	 * Transform the array of property indexes to an array of booleans,
 	 * true when the property is insertable and non-null
 	 */
-	public boolean[] getPropertiesToInsert(Object[] fields) {
+	static boolean[] getPropertiesToInsert(EntityPersister persister, Object[] fields) {
 		final var notNull = new boolean[fields.length];
-		final var insertable = entityPersister().getPropertyInsertability();
+		final var insertable = persister.getPropertyInsertability();
 		for ( int i = 0; i < fields.length; i++ ) {
 			notNull[i] = insertable[i] && fields[i] != null;
 		}
@@ -375,7 +523,7 @@ private void applyTableInsertDetails(
 			Object object,
 			SharedSessionContractImplementor session,
 			boolean forceIdentifierBinding) {
-		final AttributeMappingsList attributeMappings = entityPersister().getAttributeMappings();
+		final var attributeMappings = entityPersister().getAttributeMappings();
 
 		insertGroupBuilder.forEachTableMutationBuilder( (builder) -> {
 			final var tableMapping = (EntityTableMapping) builder.getMutatingTable().getTableMapping();
@@ -383,23 +531,23 @@ private void applyTableInsertDetails(
 
 			// `attributeIndexes` represents the indexes (relative to `attributeMappings`) of
 			// the attributes mapped to the table
-			final int[] attributeIndexes = tableMapping.getAttributeIndexes();
-			for ( int i = 0; i < attributeIndexes.length; i++ ) {
-				final int attributeIndex = attributeIndexes[ i ];
+			for ( final int attributeIndex : tableMapping.getAttributeIndexes() ) {
 				final var attributeMapping = attributeMappings.get( attributeIndex );
-				if ( attributeInclusions[attributeIndex] ) {
+				final var generator = attributeMapping.getGenerator();
+				if ( generator instanceof OnExecutionGenerator onExecutionGenerator
+						&& hasValueGenerationOnExecution( object, session, onExecutionGenerator, EventType.INSERT ) ) {
+					if ( needsValueBinding( onExecutionGenerator, dialect() ) ) {
+						attributeInclusions[attributeIndex] = true;
+					}
+					handleValueGeneration( attributeMapping, insertGroupBuilder, onExecutionGenerator, EventType.INSERT );
+				}
+				else if ( attributeInclusions[attributeIndex] ) {
 					attributeMapping.forEachInsertable( insertGroupBuilder );
 				}
-				else {
-					final var generator = attributeMapping.getGenerator();
-					if ( isValueGenerated( generator ) ) {
-						if ( session != null && generator.generatedBeforeExecution( object, session ) ) {
-							attributeInclusions[attributeIndex] = true;
-							attributeMapping.forEachInsertable( insertGroupBuilder );
-						}
-						else if ( isValueGenerationInSql( generator, factory.getJdbcServices().getDialect() ) ) {
-							handleValueGeneration( attributeMapping, insertGroupBuilder, (OnExecutionGenerator) generator );
-						}
+				else if ( generator != null && generator.generatesOnInsert() ) {
+					if ( session != null && generator.generatedBeforeExecution( object, session ) ) {
+						attributeInclusions[attributeIndex] = true;
+						attributeMapping.forEachInsertable( insertGroupBuilder );
 					}
 				}
 			}
@@ -407,21 +555,42 @@ else if ( isValueGenerationInSql( generator, factory.getJdbcServices().getDialec
 
 		// add the discriminator
 		entityPersister().addDiscriminatorToInsertGroup( insertGroupBuilder );
-		entityPersister().addSoftDeleteToInsertGroup( insertGroupBuilder );
+		entityPersister().addAuxiliaryToInsertGroup( insertGroupBuilder );
 
 		// add the keys
 		insertGroupBuilder.forEachTableMutationBuilder( (tableMutationBuilder) -> {
 			final var tableInsertBuilder = (TableInsertBuilder) tableMutationBuilder;
 			final var tableMapping = (EntityTableMapping) tableInsertBuilder.getMutatingTable().getTableMapping();
 			final var keyMapping = tableMapping.getKeyMapping();
-			if ( tableMapping.isIdentifierTable() && entityPersister().isIdentifierAssignedByInsert() && !forceIdentifierBinding ) {
+			if ( tableMapping.isIdentifierTable()
+					&& entityPersister().isIdentifierAssignedByInsert()
+					&& !forceIdentifierBinding ) {
 				assert entityPersister().getInsertDelegate() != null;
 				final var generator = (OnExecutionGenerator) entityPersister().getGenerator();
-				if ( generator.referenceColumnsInSql( dialect ) ) {
-					final String[] columnValues = generator.getReferencedColumnValues( dialect );
+				final boolean[] columnInclusions = generator.getColumnInclusions( dialect, EventType.INSERT );
+				final String[] columnValues = generator.getReferencedColumnValues( dialect, EventType.INSERT );
+				final int keyColumnCount = keyMapping.getColumnCount();
+				if ( columnInclusions != null ) {
+					if ( columnValues != null && columnValues.length != keyColumnCount ) {
+						throw new IllegalStateException(
+								"Mismatch between generated column values and identifier columns for "
+										+ entityPersister().getEntityName()
+						);
+					}
+					for ( int i = 0; i < keyColumnCount; i++ ) {
+						if ( columnInclusions[i] ) {
+							final String valueExpression =
+									columnValues == null
+											? keyMapping.getKeyColumn( i ).getWriteExpression()
+											: columnValues[i];
+							tableInsertBuilder.addKeyColumn( valueExpression, keyMapping.getKeyColumn( i ) );
+						}
+					}
+				}
+				else if ( generator.referenceColumnsInSql( dialect, EventType.INSERT ) ) {
 					if ( columnValues != null ) {
 						assert columnValues.length == 1;
-						assert keyMapping.getColumnCount() == 1;
+						assert keyColumnCount == 1;
 						tableInsertBuilder.addKeyColumn( columnValues[0], keyMapping.getKeyColumn( 0 ) );
 					}
 				}
@@ -432,15 +601,26 @@ else if ( isValueGenerationInSql( generator, factory.getJdbcServices().getDialec
 		} );
 	}
 
-	private static boolean isValueGenerated(Generator generator) {
-		return generator != null
-			&& generator.generatesOnInsert()
-			&& generator.generatedOnExecution();
-	}
-
-	private static boolean isValueGenerationInSql(Generator generator, Dialect dialect) {
-		assert isValueGenerated( generator );
-		return ( (OnExecutionGenerator) generator ).referenceColumnsInSql( dialect );
+	private static boolean needsValueBinding(OnExecutionGenerator generator, Dialect dialect) {
+		if ( generator.generatesOnInsert() ) {
+			final boolean[] columnInclusions = generator.getColumnInclusions( dialect, EventType.INSERT );
+			final String[] columnValues = generator.getReferencedColumnValues( dialect, EventType.INSERT );
+			if ( columnValues != null ) {
+				for ( int i = 0; i < columnValues.length; i++ ) {
+					if ( (columnInclusions == null || columnInclusions[i])
+							&& "?".equals( columnValues[i] ) ) {
+						return true;
+					}
+				}
+				return false;
+			}
+			else {
+				return generator.writePropertyValue( EventType.INSERT );
+			}
+		}
+		else {
+			return false;
+		}
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorTemporal.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorTemporal.java
new file mode 100644
index 000000000000..3e5c3b4e9680
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorTemporal.java
@@ -0,0 +1,56 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.jdbc.mutation.MutationExecutor;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.jdbc.mutation.TableInclusionChecker;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.model.MutationOperationGroup;
+
+/**
+ * @author Gavin King
+ */
+public class InsertCoordinatorTemporal extends InsertCoordinatorStandard {
+	private final TemporalMapping temporalMapping;
+
+	public InsertCoordinatorTemporal(EntityPersister entityPersister, SessionFactoryImplementor factory) {
+		super( entityPersister, factory );
+		this.temporalMapping = entityPersister.getTemporalMapping();
+	}
+
+	@Override
+	protected void decomposeForInsert(
+			MutationExecutor mutationExecutor,
+			Object id,
+			Object[] values,
+			Object object,
+			MutationOperationGroup mutationGroup,
+			boolean[] propertyInclusions,
+			TableInclusionChecker tableInclusionChecker,
+			SharedSessionContractImplementor session) {
+		super.decomposeForInsert(
+				mutationExecutor,
+				id, values,
+				object,
+				mutationGroup,
+				propertyInclusions,
+				tableInclusionChecker,
+				session
+		);
+
+		if ( TemporalMutationHelper.isUsingParameters( session ) ) {
+			mutationExecutor.getJdbcValueBindings().bindValue(
+					session.getCurrentTransactionIdentifier(),
+					entityPersister().physicalTableNameForMutation( temporalMapping.getStartingColumnMapping() ),
+					temporalMapping.getStartingColumnMapping().getSelectionExpression(),
+					ParameterUsage.SET
+			);
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinator.java
deleted file mode 100644
index 1b6f78497dc9..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.persister.entity.mutation;
-
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.sql.model.MutationOperation;
-import org.hibernate.sql.model.ast.builder.AbstractTableUpdateBuilder;
-import org.hibernate.sql.model.ast.builder.TableMergeBuilder;
-
-/**
- * Specialized {@link UpdateCoordinator} for {@code merge into}.
- *
- * @author Gavin King
- */
-public class MergeCoordinator extends UpdateCoordinatorStandard {
-
-	public MergeCoordinator(EntityPersister entityPersister, SessionFactoryImplementor factory) {
-		super(entityPersister, factory);
-	}
-
-	@Override
-	protected <O extends MutationOperation> AbstractTableUpdateBuilder<O> newTableUpdateBuilder(EntityTableMapping tableMapping) {
-		return new TableMergeBuilder<>( entityPersister(), tableMapping, factory() );
-	}
-
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorAudit.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorAudit.java
new file mode 100644
index 000000000000..ae9666f3f0c8
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorAudit.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.persister.entity.EntityPersister;
+
+/**
+ * Merge coordinator for audited entities.
+ */
+public class MergeCoordinatorAudit extends UpdateCoordinatorAudit {
+	public MergeCoordinatorAudit(
+			EntityPersister entityPersister,
+			SessionFactoryImplementor factory,
+			UpdateCoordinator currentUpdateCoordinator) {
+		super( entityPersister, factory, currentUpdateCoordinator );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorHistory.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorHistory.java
new file mode 100644
index 000000000000..a5591ea3d3d5
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorHistory.java
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.persister.entity.EntityPersister;
+
+/**
+ * Merge coordinator for
+ * {@link org.hibernate.temporal.TemporalTableStrategy#HISTORY_TABLE}
+ * temporal strategy.
+ *
+ * @author Gavin King
+ */
+public class MergeCoordinatorHistory extends UpdateCoordinatorHistory {
+	public MergeCoordinatorHistory(
+			EntityPersister entityPersister,
+			SessionFactoryImplementor factory,
+			UpdateCoordinator currentMergeCoordinator) {
+		super( entityPersister, factory, currentMergeCoordinator );
+	}
+
+	@Override
+	boolean resultCheck(Object id, PreparedStatementDetails statementDetails, int affectedRowCount, int batchPosition) {
+		return affectedRowCount != 0
+			&& super.resultCheck( id, statementDetails, affectedRowCount, batchPosition );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorStandard.java
new file mode 100644
index 000000000000..ea9da62b4d37
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorStandard.java
@@ -0,0 +1,163 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
+import org.hibernate.metamodel.mapping.SelectableMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.model.MutationOperation;
+import org.hibernate.sql.model.ast.builder.AbstractTableUpdateBuilder;
+import org.hibernate.sql.model.ast.builder.TableMergeBuilder;
+import org.hibernate.sql.model.ast.builder.TableUpdateBuilder;
+
+/**
+ * Specialized {@link UpdateCoordinator} for {@code merge into}.
+ *
+ * @author Gavin King
+ */
+public class MergeCoordinatorStandard extends UpdateCoordinatorStandard {
+
+	public MergeCoordinatorStandard(EntityPersister entityPersister, SessionFactoryImplementor factory) {
+		super( entityPersister, factory );
+	}
+
+	@Override
+	protected <O extends MutationOperation> AbstractTableUpdateBuilder<O> newTableUpdateBuilder(EntityTableMapping tableMapping) {
+		final TableMergeBuilder<O> tableUpdateBuilder =
+				new TableMergeBuilder<>( entityPersister(), tableMapping, factory() );
+		addDiscriminatorValueIfNeeded( tableUpdateBuilder, tableMapping );
+		return tableUpdateBuilder;
+	}
+
+	private void addDiscriminatorValueIfNeeded(
+			AbstractTableUpdateBuilder<?> tableUpdateBuilder,
+			EntityTableMapping tableMapping) {
+		final var discriminatorMapping = entityPersister().getDiscriminatorMapping();
+		if ( discriminatorMapping != null
+				&& discriminatorMapping.hasPhysicalColumn()
+				&& tableMapping.getTableName().equals( discriminatorMapping.getContainingTableExpression() ) ) {
+			final DiscriminatorValue discriminatorValue = entityPersister().getDiscriminatorValue();
+			if ( discriminatorValue != DiscriminatorValue.Special.NULL
+				&& discriminatorValue != DiscriminatorValue.Special.NOT_NULL ) {
+				tableUpdateBuilder.addValueColumn(
+						entityPersister().getDiscriminatorSQLValue(),
+						discriminatorMapping
+				);
+			}
+		}
+	}
+
+	@Override
+	protected boolean isColumnIncludedInSet(SelectableMapping selectable) {
+		return selectable.isUpdateable() || selectable.isInsertable();
+	}
+
+	private static boolean isInsertableOrUpdatable(AttributeMapping attribute) {
+		final var attributeMetadata = attribute.getAttributeMetadata();
+		return attributeMetadata.isUpdatable()
+			|| attributeMetadata.isInsertable();
+	}
+
+	@Override
+	protected InclusionChecker createInclusionChecker(boolean[] attributeUpdateability) {
+		return (position, attribute) -> isInsertableOrUpdatable( attribute );
+	}
+
+	@Override
+	protected boolean includeInStaticUpdate(
+			int index,
+			AttributeMapping attribute,
+			boolean[] propertyUpdateability) {
+		return isInsertableOrUpdatable( attribute )
+			|| super.includeInStaticUpdate( index, attribute, propertyUpdateability );
+	}
+
+	@Override
+	protected boolean includeProperty(boolean[] insertability, boolean[] updateability, int property) {
+		return insertability[property] || updateability[property];
+	}
+
+	@Override
+	public boolean[] getPropertyUpdateability(Object entity) {
+		final boolean[] updateability = super.getPropertyUpdateability( entity );
+		final boolean[] insertability = entityPersister().getPropertyInsertability();
+		final var result = new boolean[updateability.length];
+		for ( int i = 0; i < updateability.length; i++ ) {
+			result[i] = updateability[i] || insertability[i];
+		}
+		return result;
+	}
+
+	@Override
+	public boolean[] getPropertyUpdateability() {
+		final boolean[] updateability = entityPersister().getPropertyUpdateability();
+		final boolean[] insertability = entityPersister().getPropertyInsertability();
+		final var result = new boolean[updateability.length];
+		for ( int i = 0; i < updateability.length; i++ ) {
+			result[i] = updateability[i] || insertability[i];
+		}
+		return result;
+	}
+	@Override
+	protected void forEachUpdatable(AttributeMapping attributeMapping, TableUpdateBuilder<?> tableUpdateBuilder) {
+		attributeMapping.forEachSelectable( tableUpdateBuilder );
+	}
+
+	@Override
+	protected UpdateValuesAnalysisImpl analyzeUpdateValues(
+			Object entity,
+			Object[] values,
+			Object oldVersion,
+			Object[] oldValues,
+			int[] dirtyAttributeIndexes,
+			InclusionChecker inclusionChecker,
+			InclusionChecker lockingChecker,
+			InclusionChecker dirtinessChecker,
+			boolean restrictToTemporalExcluded,
+			Object rowId,
+			boolean forceDynamicUpdate,
+			SharedSessionContractImplementor session) {
+		final var updateValuesAnalysis = super.analyzeUpdateValues(
+				entity,
+				values,
+				oldVersion,
+				oldValues,
+				dirtyAttributeIndexes,
+				inclusionChecker,
+				lockingChecker,
+				dirtinessChecker,
+				restrictToTemporalExcluded,
+				rowId,
+				forceDynamicUpdate,
+				session
+		);
+		if ( oldValues == null ) {
+			final TableSet tablesNeedingUpdate = updateValuesAnalysis.getTablesNeedingUpdate();
+			final TableSet tablesWithNonNullValues = updateValuesAnalysis.getTablesWithNonNullValues();
+			final TableSet tablesWithPreviousNonNullValues = updateValuesAnalysis.getTablesWithPreviousNonNullValues();
+			for ( var tableMapping : entityPersister().getTableMappings() ) {
+				// Need to upsert into all non-optional table mappings
+				if ( !tableMapping.isOptional() ) {
+					// If the table was previously not needing an update, remove it from tablesWithPreviousNonNullValues
+					// to avoid triggering a delete-statement for this operation
+					if ( !tablesNeedingUpdate.contains( tableMapping ) ) {
+						tablesWithPreviousNonNullValues.remove( tableMapping );
+					}
+					tablesNeedingUpdate.add( tableMapping );
+					tablesWithNonNullValues.add( tableMapping );
+				}
+			}
+		}
+		return updateValuesAnalysis;
+	}
+
+	@Override
+	public String toString() {
+		return "MergeCoordinator(" + entityPersister().getEntityName() + ")";
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorTemporal.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorTemporal.java
new file mode 100644
index 000000000000..891658f6ed1d
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MergeCoordinatorTemporal.java
@@ -0,0 +1,135 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.StaleObjectStateException;
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
+import org.hibernate.engine.jdbc.mutation.OperationResultChecker;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.model.MutationOperationGroup;
+
+/**
+ * Merge coordinator for
+ * {@link org.hibernate.temporal.TemporalTableStrategy#SINGLE_TABLE}
+ * temporal strategy.
+ *
+ * @author Gavin King
+ */
+public class MergeCoordinatorTemporal extends AbstractTemporalUpdateCoordinator {
+	private final TemporalMapping temporalMapping;
+	private final MutationOperationGroup endingUpdateGroup;
+	private final BasicBatchKey batchKey;
+	private final UpdateCoordinator versionUpdateDelegate;
+
+	public MergeCoordinatorTemporal(EntityPersister entityPersister, SessionFactoryImplementor factory) {
+		super( entityPersister, factory );
+		this.temporalMapping = entityPersister.getTemporalMapping();
+		this.endingUpdateGroup = buildEndingUpdateGroup( entityPersister.getIdentifierTableMapping(), temporalMapping );
+		this.batchKey = new BasicBatchKey( entityPersister.getEntityName() + "#TEMPORAL_MERGE" );
+		this.versionUpdateDelegate = new MergeCoordinatorStandard( entityPersister, factory );
+	}
+
+	@Override
+	public MutationOperationGroup getStaticMutationOperationGroup() {
+		return endingUpdateGroup;
+	}
+
+	@Override
+	protected BasicBatchKey getBatchKey() {
+		return batchKey;
+	}
+
+	@Override
+	public GeneratedValues update(
+			Object entity,
+			Object id,
+			Object rowId,
+			Object[] values,
+			Object oldVersion,
+			Object[] incomingOldValues,
+			int[] dirtyAttributeIndexes,
+			boolean hasDirtyCollection,
+			SharedSessionContractImplementor session) {
+		if ( entityPersister()
+				.excludedFromTemporalVersioning( dirtyAttributeIndexes, hasDirtyCollection ) ) {
+			return versionUpdateDelegate.update(
+					entity,
+					id,
+					rowId,
+					values,
+					oldVersion,
+					incomingOldValues,
+					dirtyAttributeIndexes,
+					hasDirtyCollection,
+					session
+			);
+		}
+		else {
+			final boolean rowEnded = performRowEndUpdate( entity, id, rowId, oldVersion, session );
+			if ( !rowEnded && currentRowExists( id, session ) ) {
+				throw new StaleObjectStateException( entityPersister().getEntityName(), id );
+			}
+			return entityPersister().getInsertCoordinator().insert( entity, id, values, session );
+		}
+	}
+
+	boolean performRowEndUpdate(
+			Object entity,
+			Object id,
+			Object rowId,
+			Object oldVersion,
+			SharedSessionContractImplementor session) {
+		class Result implements OperationResultChecker {
+			private boolean updated;
+			@Override
+			public boolean checkResult(PreparedStatementDetails statementDetails, int affectedRowCount, int batchPosition) {
+				updated = affectedRowCount > 0;
+				return !updated
+					|| resultCheck( id, statementDetails, affectedRowCount, batchPosition );
+			}
+		}
+		final var resultChecker = new Result();
+		performRowEndUpdate(
+				entity,
+				id,
+				rowId,
+				oldVersion,
+				session,
+				temporalMapping,
+				endingUpdateGroup,
+				entityPersister().physicalTableNameForMutation( temporalMapping.getEndingColumnMapping() ),
+				resultChecker
+		);
+		return resultChecker.updated;
+	}
+
+	private boolean currentRowExists(Object id, SharedSessionContractImplementor session) {
+		return entityPersister().getDatabaseSnapshot( id, session ) != null;
+	}
+
+	@Override
+	void bindVersionRestriction(Object oldVersion, JdbcValueBindings jdbcValueBindings, String temporalTableName) {
+		final var versionMapping = entityPersister().getVersionMapping();
+		if ( versionMapping != null && entityPersister().optimisticLockStyle().isVersion() ) {
+			jdbcValueBindings.bindValue( oldVersion, versionMapping, ParameterUsage.RESTRICT );
+		}
+	}
+
+	@Override
+	public void forceVersionIncrement(
+			Object id,
+			Object currentVersion,
+			Object nextVersion,
+			SharedSessionContractImplementor session) {
+		versionUpdateDelegate.forceVersionIncrement( id, currentVersion, nextVersion, session );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MutationCoordinator.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MutationCoordinator.java
index 594c8d071e05..58b821da8d8f 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MutationCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/MutationCoordinator.java
@@ -12,7 +12,7 @@
  * @see InsertCoordinator
  * @see DeleteCoordinator
  * @see UpdateCoordinator
- * @see MergeCoordinator
+ * @see MergeCoordinatorStandard
  *
  * @author Marco Belladelli
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TableSet.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TableSet.java
index 4d2de0f42b09..e8fb90cf818c 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TableSet.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TableSet.java
@@ -34,6 +34,13 @@ public void add(final TableMapping tableMapping) {
 		bits.set( tableMapping.getRelativePosition() );
 	}
 
+	public void remove(final TableMapping tableMapping) {
+		if ( bits != null ) {
+			assert addForChecks( tableMapping );
+			bits.set( tableMapping.getRelativePosition(), false );
+		}
+	}
+
 	public boolean isEmpty() {
 		return bits == null;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TemporalMutationHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TemporalMutationHelper.java
new file mode 100644
index 000000000000..9eb8aebb7b4f
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/TemporalMutationHelper.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+
+import static org.hibernate.temporal.TemporalTableStrategy.NATIVE;
+
+public class TemporalMutationHelper {
+	public static boolean isUsingParameters(SharedSessionContractImplementor session) {
+		final var factory = session.getFactory();
+		return factory.getSessionFactoryOptions().getTemporalTableStrategy() != NATIVE
+			&& !factory.getTransactionIdentifierService().useServerTimestamp( session.getDialect() );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorAudit.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorAudit.java
new file mode 100644
index 000000000000..41f0d5e0a3b4
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorAudit.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+import org.hibernate.sql.model.MutationOperationGroup;
+
+/**
+ * Update coordinator for audited entities.
+ */
+public class UpdateCoordinatorAudit extends AbstractAuditCoordinator implements UpdateCoordinator {
+	private final UpdateCoordinator currentUpdateCoordinator;
+
+	public UpdateCoordinatorAudit(
+			EntityPersister entityPersister,
+			SessionFactoryImplementor factory,
+			UpdateCoordinator currentUpdateCoordinator) {
+		super( entityPersister, factory );
+		this.currentUpdateCoordinator = currentUpdateCoordinator;
+	}
+
+	@Override
+	public MutationOperationGroup getStaticMutationOperationGroup() {
+		return currentUpdateCoordinator.getStaticMutationOperationGroup();
+	}
+
+	@Override
+	public GeneratedValues update(
+			Object entity,
+			Object id,
+			Object rowId,
+			Object[] values,
+			Object oldVersion,
+			Object[] incomingOldValues,
+			int[] dirtyAttributeIndexes,
+			boolean hasDirtyCollection,
+			SharedSessionContractImplementor session) {
+		final var generatedValues = currentUpdateCoordinator.update(
+				entity,
+				id,
+				rowId,
+				values,
+				oldVersion,
+				incomingOldValues,
+				dirtyAttributeIndexes,
+				hasDirtyCollection,
+				session
+		);
+		if ( shouldAuditUpdate( dirtyAttributeIndexes, hasDirtyCollection ) ) {
+			insertAuditRow( entity, id, values, AuditStateManagement.ModificationType.MOD, session );
+		}
+		return generatedValues;
+	}
+
+	@Override
+	public void forceVersionIncrement(
+			Object id,
+			Object currentVersion,
+			Object nextVersion,
+			SharedSessionContractImplementor session) {
+		currentUpdateCoordinator.forceVersionIncrement( id, currentVersion, nextVersion, session );
+	}
+
+	private boolean shouldAuditUpdate(int[] dirtyAttributeIndexes, boolean hasDirtyCollection) {
+		if ( dirtyAttributeIndexes == null || dirtyAttributeIndexes.length == 0 ) {
+			return true;
+		}
+		else if ( hasDirtyCollection ) {
+			return true;
+		}
+		else {
+			for ( int dirtyIndex : dirtyAttributeIndexes ) {
+				if ( auditedPropertyMask[dirtyIndex] ) {
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorHistory.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorHistory.java
new file mode 100644
index 000000000000..df599f8d7552
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorHistory.java
@@ -0,0 +1,518 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.generator.Generator;
+import org.hibernate.generator.OnExecutionGenerator;
+import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.metamodel.mapping.AttributeMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.model.MutationOperation;
+import org.hibernate.sql.model.MutationOperationGroup;
+import org.hibernate.sql.model.MutationType;
+import org.hibernate.sql.model.ast.builder.ColumnValuesTableMutationBuilder;
+import org.hibernate.sql.model.ast.builder.TableInsertBuilderStandard;
+import org.hibernate.sql.model.ast.builder.TableUpdateBuilderStandard;
+import org.hibernate.sql.model.internal.MutationGroupSingle;
+
+import static org.hibernate.sql.model.internal.MutationOperationGroupFactory.singleOperation;
+
+/**
+ * Update coordinator for
+ * {@link org.hibernate.temporal.TemporalTableStrategy#HISTORY_TABLE}
+ * temporal strategy.
+ *
+ * @author Gavin King
+ */
+public class UpdateCoordinatorHistory extends AbstractTemporalUpdateCoordinator {
+	private final UpdateCoordinator currentUpdateCoordinator;
+	private final EntityTableMapping identifierTableMapping;
+	private final EntityTableMapping historyTableMapping;
+	private final TemporalMapping temporalMapping;
+	private final BasicBatchKey historyUpdateBatchKey;
+	private final BasicBatchKey historyInsertBatchKey;
+	private final MutationOperationGroup historyEndUpdateGroup;
+	private final MutationOperationGroup historyInsertGroup;
+
+	public UpdateCoordinatorHistory(
+			EntityPersister entityPersister,
+			SessionFactoryImplementor factory,
+			UpdateCoordinator currentUpdateCoordinator) {
+		super( entityPersister, factory );
+		this.currentUpdateCoordinator = currentUpdateCoordinator;
+		this.identifierTableMapping = entityPersister.getIdentifierTableMapping();
+		this.temporalMapping = entityPersister.getTemporalMapping();
+		this.historyTableMapping =
+				createAuxiliaryTableMapping( identifierTableMapping, entityPersister,
+						temporalMapping.getTableName() );
+		final String entityName = entityPersister.getEntityName();
+		this.historyUpdateBatchKey = new BasicBatchKey( entityName + "#HISTORY_UPDATE" );
+		this.historyInsertBatchKey = new BasicBatchKey( entityName + "#HISTORY_INSERT" );
+		this.historyEndUpdateGroup = buildEndingUpdateGroup( historyTableMapping, temporalMapping );
+		this.historyInsertGroup = buildHistoryInsertGroup( entityPersister.getPropertyInsertability() );
+	}
+
+	@Override
+	public MutationOperationGroup getStaticMutationOperationGroup() {
+		return currentUpdateCoordinator.getStaticMutationOperationGroup();
+	}
+
+	@Override
+	protected BasicBatchKey getBatchKey() {
+		return historyUpdateBatchKey;
+	}
+
+	@Override
+	public GeneratedValues update(
+			Object entity,
+			Object id,
+			Object rowId,
+			Object[] values,
+			Object oldVersion,
+			Object[] incomingOldValues,
+			int[] dirtyAttributeIndexes,
+			boolean hasDirtyCollection,
+			SharedSessionContractImplementor session) {
+		final var generatedValues = currentUpdateCoordinator.update(
+				entity,
+				id,
+				rowId,
+				values,
+				oldVersion,
+				incomingOldValues,
+				dirtyAttributeIndexes,
+				hasDirtyCollection,
+				session
+		);
+		if ( entityPersister()
+				.excludedFromTemporalVersioning( dirtyAttributeIndexes, hasDirtyCollection ) ) {
+			performHistoryExcludedUpdate(
+					entity,
+					id,
+					rowId,
+					values,
+					oldVersion,
+					incomingOldValues,
+					dirtyAttributeIndexes,
+					session
+			);
+		}
+		else {
+			performRowEndUpdate(
+					entity,
+					id,
+					rowId,
+					oldVersion,
+					session,
+					temporalMapping,
+					historyEndUpdateGroup,
+					historyTableMapping.getTableName(),
+					(statementDetails, affectedRowCount, batchPosition) ->
+							resultCheck( id, statementDetails, affectedRowCount, batchPosition )
+
+			);
+			insertHistoryRow( id, values, session );
+		}
+		return generatedValues;
+	}
+
+	private void performHistoryExcludedUpdate(
+			Object entity,
+			Object id,
+			Object rowId,
+			Object[] values,
+			Object oldVersion,
+			Object[] incomingOldValues,
+			int[] dirtyAttributeIndexes,
+			SharedSessionContractImplementor session) {
+		final var updateDetails =
+				buildHistoryExcludedUpdateDetails( entity, rowId, dirtyAttributeIndexes, session );
+		if ( updateDetails != null ) {
+			final var mutationExecutor =
+					mutationExecutorService.createExecutor( resolveBatchKeyAccess( true, session ),
+							updateDetails.operationGroup, session );
+			try {
+				final var jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
+				breakDownKeyJdbcValues( id, rowId, session, jdbcValueBindings, historyTableMapping );
+
+				if ( updateDetails.applyVersionRestriction ) {
+					final var versionMapping = entityPersister().getVersionMapping();
+					jdbcValueBindings.bindValue(
+							oldVersion,
+							historyTableMapping.getTableName(),
+							versionMapping.getSelectionExpression(),
+							ParameterUsage.RESTRICT
+					);
+				}
+
+				final var loadedState = incomingOldValues != null ? incomingOldValues : values;
+				bindPartitionColumnValueBindings( loadedState, session, jdbcValueBindings );
+				bindHistoryExcludedUpdateValues( values, updateDetails, session, jdbcValueBindings );
+
+				mutationExecutor.execute(
+						entity,
+						null,
+						null,
+						(statementDetails, affectedRowCount, batchPosition) ->
+								resultCheck( id, statementDetails, affectedRowCount, batchPosition ),
+						session,
+						staleStateException -> staleObjectStateException( id, staleStateException )
+				);
+			}
+			finally {
+				mutationExecutor.release();
+			}
+		}
+	}
+
+	private HistoryExcludedUpdateDetails buildHistoryExcludedUpdateDetails(
+			Object entity,
+			Object rowId,
+			int[] dirtyAttributeIndexes,
+			SharedSessionContractImplementor session) {
+		if ( dirtyAttributeIndexes == null || dirtyAttributeIndexes.length == 0 ) {
+			return null;
+		}
+
+		final var attributeMappings = entityPersister().getAttributeMappings();
+		final int attributeCount = attributeMappings.size();
+		final boolean[] dirtyFlags = new boolean[attributeCount];
+		for ( int dirtyAttributeIndex : dirtyAttributeIndexes ) {
+			dirtyFlags[dirtyAttributeIndex] = true;
+		}
+
+		final var versionMapping = entityPersister().getVersionMapping();
+		final var updateability =
+				entityPersister().hasUninitializedLazyProperties( entity )
+						? entityPersister().getNonLazyPropertyUpdateability()
+						: entityPersister().getPropertyUpdateability();
+
+		final var tableUpdateBuilder =
+				new TableUpdateBuilderStandard<>( entityPersister(), historyTableMapping, factory() );
+		final List<Integer> bindableAttributeIndexes = new ArrayList<>();
+		boolean hasValues = false;
+
+		for ( final int attributeIndex : identifierTableMapping.getAttributeIndexes() ) {
+			final var attributeMapping = attributeMappings.get( attributeIndex );
+			if ( !(attributeMapping instanceof PluralAttributeMapping) ) {
+				if ( entityPersister().isPropertyTemporalExcluded( attributeIndex ) ) {
+					final var generator = attributeMapping.getGenerator();
+					final boolean generatedInSql = needsUpdateValueGeneration( entity, session, generator );
+					final boolean include =
+							generatedInSql
+								|| isGeneratedBeforeExecution( entity, session, generator )
+								|| dirtyFlags[attributeIndex] && updateability[attributeIndex];
+
+					if ( include ) {
+						if ( generatedInSql ) {
+							final var onExecutionGenerator = (OnExecutionGenerator) generator;
+							addSqlGeneratedValue( tableUpdateBuilder, attributeMapping, onExecutionGenerator );
+							hasValues = true;
+							if ( onExecutionGenerator.writePropertyValue() ) {
+								bindableAttributeIndexes.add( attributeIndex );
+							}
+						}
+						else {
+							attributeMapping.forEachUpdatable( tableUpdateBuilder );
+							hasValues = true;
+							bindableAttributeIndexes.add( attributeIndex );
+						}
+					}
+				}
+			}
+		}
+
+		if ( hasValues ) {
+			applyKeyRestriction( rowId, entityPersister(), tableUpdateBuilder, historyTableMapping );
+			applyCurrentRowRestriction( tableUpdateBuilder );
+			applyPartitionKeyRestriction( tableUpdateBuilder );
+			applyOptimisticLocking( tableUpdateBuilder );
+
+			return new HistoryExcludedUpdateDetails(
+					createMutationOperationGroup( tableUpdateBuilder ),
+					toIntArray( bindableAttributeIndexes ),
+					entityPersister().optimisticLockStyle().isVersion()
+							&& versionMapping != null
+			);
+		}
+		else {
+			return null;
+		}
+
+	}
+
+	private static boolean isGeneratedBeforeExecution(
+			Object entity, SharedSessionContractImplementor session, Generator generator) {
+		return generator != null
+			&& generator.generatesOnUpdate()
+			&& generator.generatedBeforeExecution( entity, session );
+	}
+
+	private void bindHistoryExcludedUpdateValues(
+			Object[] values,
+			HistoryExcludedUpdateDetails updateDetails,
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings) {
+		final var attributeMappings = entityPersister().getAttributeMappings();
+		for ( final int attributeIndex : updateDetails.attributeIndexes ) {
+			final var attributeMapping = attributeMappings.get( attributeIndex );
+			if ( !(attributeMapping instanceof PluralAttributeMapping) ) {
+				attributeMapping.decompose(
+						values[attributeIndex],
+						0,
+						jdbcValueBindings,
+						historyTableMapping,
+						(valueIndex, bindings, table, jdbcValue, selectableMapping) -> {
+							if ( selectableMapping.isUpdateable() && !selectableMapping.isFormula() ) {
+								bindings.bindValue(
+										jdbcValue,
+										table.getTableName(),
+										selectableMapping.getSelectionExpression(),
+										ParameterUsage.SET
+								);
+							}
+						},
+						session
+				);
+			}
+		}
+	}
+
+	private void applyCurrentRowRestriction(TableUpdateBuilderStandard<MutationOperation> tableUpdateBuilder) {
+		final var endingColumnReference =
+				new ColumnReference( tableUpdateBuilder.getMutatingTable(), temporalMapping.getEndingColumnMapping() );
+		tableUpdateBuilder.addNonKeyRestriction( temporalMapping.createNullEndingValueBinding( endingColumnReference ) );
+	}
+
+	@Override
+	void bindVersionRestriction(Object oldVersion, JdbcValueBindings jdbcValueBindings, String temporalTableName) {
+		final var versionMapping = entityPersister().getVersionMapping();
+		if ( versionMapping != null && entityPersister().optimisticLockStyle().isVersion() ) {
+			jdbcValueBindings.bindValue(
+					oldVersion,
+					temporalTableName,
+					versionMapping.getSelectionExpression(),
+					ParameterUsage.RESTRICT
+			);
+		}
+	}
+
+	private void insertHistoryRow(
+			Object id,
+			Object[] values,
+			SharedSessionContractImplementor session) {
+		final var mutationExecutor =
+				mutationExecutorService.createExecutor( () -> historyInsertBatchKey, historyInsertGroup, session );
+		try {
+			bindHistoryInsertValues( id, values, entityPersister().getPropertyInsertability(), session,
+					mutationExecutor.getJdbcValueBindings() );
+			mutationExecutor.execute( id, null, null,
+					UpdateCoordinatorHistory::verifyOutcome, session );
+		}
+		finally {
+			mutationExecutor.release();
+		}
+	}
+
+	private MutationOperationGroup buildHistoryInsertGroup(boolean[] propertyInclusions) {
+		final var insertBuilder =
+				new TableInsertBuilderStandard( entityPersister(), historyTableMapping, factory() );
+		applyHistoryInsertDetails( insertBuilder, propertyInclusions );
+		final var tableMutation = insertBuilder.buildMutation();
+		return singleOperation(
+				new MutationGroupSingle( MutationType.INSERT, entityPersister(), tableMutation ),
+				tableMutation.createMutationOperation( null, factory() )
+		);
+	}
+
+	private void applyHistoryInsertDetails(
+			TableInsertBuilderStandard insertBuilder,
+			boolean[] propertyInclusions) {
+		final var attributeMappings = entityPersister().getAttributeMappings();
+		for ( final int attributeIndex : identifierTableMapping.getAttributeIndexes() ) {
+			final var attributeMapping = attributeMappings.get( attributeIndex );
+			if ( propertyInclusions[attributeIndex] ) {
+				attributeMapping.forEachInsertable( insertBuilder );
+			}
+			else {
+				final var generator = attributeMapping.getGenerator();
+				if ( isValueGeneratedOnInsert( generator ) ) {
+//					if ( session != null && generator.generatedBeforeExecution( entity, session ) ) {
+//						propertyInclusions[attributeIndex] = true;
+//						attributeMapping.forEachInsertable( insertBuilder );
+//					}
+//					else
+					if ( isValueGenerationInSql( generator ) ) {
+						addSqlGeneratedValue( insertBuilder, attributeMapping, (OnExecutionGenerator) generator );
+					}
+				}
+			}
+		}
+
+		final var mutatingTable = insertBuilder.getMutatingTable();
+		final var startingColumn = new ColumnReference( mutatingTable, temporalMapping.getStartingColumnMapping() );
+		insertBuilder.addValueColumn( temporalMapping.createStartingValueBinding( startingColumn ) );
+		final var endingColumn = new ColumnReference( mutatingTable, temporalMapping.getEndingColumnMapping() );
+		insertBuilder.addValueColumn( temporalMapping.createNullEndingValueBinding( endingColumn ) );
+
+		identifierTableMapping.getKeyMapping().forEachKeyColumn( insertBuilder::addKeyColumn );
+	}
+
+	private void addSqlGeneratedValue(
+			ColumnValuesTableMutationBuilder<?> updateBuilder,
+			AttributeMapping attributeMapping,
+			OnExecutionGenerator generator) {
+		final boolean writePropertyValue = generator.writePropertyValue();
+		final var columnValues =
+				writePropertyValue
+						? null
+						: generator.getReferencedColumnValues( factory.getJdbcServices().getDialect() );
+		attributeMapping.forEachSelectable( (j, mapping) ->
+				updateBuilder.addValueColumn( writePropertyValue ? "?" : columnValues[j], mapping ) );
+	}
+
+	private void bindHistoryInsertValues(
+			Object id,
+			Object[] values,
+			boolean[] propertyInclusions,
+			SharedSessionContractImplementor session,
+			JdbcValueBindings jdbcValueBindings) {
+		final String historyTableName = historyTableMapping.getTableName();
+		historyTableMapping.getKeyMapping().breakDownKeyJdbcValues(
+				id,
+				(jdbcValue, columnMapping) -> jdbcValueBindings.bindValue(
+						jdbcValue,
+						historyTableName,
+						columnMapping.getColumnName(),
+						ParameterUsage.SET
+				),
+				session
+		);
+
+		final var attributeMappings = entityPersister().getAttributeMappings();
+		for ( final int attributeIndex : identifierTableMapping.getAttributeIndexes() ) {
+			if ( propertyInclusions[attributeIndex] ) {
+				final var attributeMapping = attributeMappings.get( attributeIndex );
+				if ( !(attributeMapping instanceof PluralAttributeMapping) ) {
+					attributeMapping.decompose(
+							values[attributeIndex],
+							0,
+							jdbcValueBindings,
+							null,
+							(valueIndex, bindings, noop, jdbcValue, selectableMapping) -> {
+								if ( selectableMapping.isInsertable() && !selectableMapping.isFormula() ) {
+									bindings.bindValue(
+											jdbcValue,
+											historyTableName,
+											selectableMapping.getSelectionExpression(),
+											ParameterUsage.SET
+									);
+								}
+							},
+							session
+					);
+				}
+			}
+		}
+
+		if ( TemporalMutationHelper.isUsingParameters( session ) ) {
+			jdbcValueBindings.bindValue(
+					session.getCurrentTransactionIdentifier(),
+					historyTableName,
+					temporalMapping.getStartingColumnMapping().getSelectionExpression(),
+					ParameterUsage.SET
+			);
+		}
+	}
+
+	private static boolean isValueGeneratedOnInsert(Generator generator) {
+		return generator != null
+			&& generator.generatesOnInsert()
+			&& generator.generatedOnExecution();
+	}
+
+	private static boolean isValueGeneratedOnUpdate(Generator generator) {
+		return generator != null
+			&& generator.generatesOnUpdate()
+			&& generator.generatedOnExecution();
+	}
+
+	private boolean isValueGenerationInSql(Generator generator) {
+		assert isValueGeneratedOnInsert( generator );
+		return ( (OnExecutionGenerator) generator ).referenceColumnsInSql( dialect() );
+	}
+
+	private boolean isUpdateValueGenerationInSql(Generator generator) {
+		assert isValueGeneratedOnUpdate( generator );
+		return ( (OnExecutionGenerator) generator ).referenceColumnsInSql( dialect() );
+	}
+
+	private boolean needsUpdateValueGeneration(
+			Object entity,
+			SharedSessionContractImplementor session,
+			Generator generator) {
+		return isValueGeneratedOnUpdate( generator )
+			&& (session == null && generator.generatedOnExecution() || generator.generatedOnExecution( entity, session ) )
+			&& isUpdateValueGenerationInSql( generator );
+	}
+
+	private static int[] toIntArray(List<Integer> values) {
+		final int[] result = new int[values.size()];
+		for ( int i = 0; i < values.size(); i++ ) {
+			result[i] = values.get( i );
+		}
+		return result;
+	}
+
+	private static final class HistoryExcludedUpdateDetails {
+		private final MutationOperationGroup operationGroup;
+		private final int[] attributeIndexes;
+		private final boolean applyVersionRestriction;
+
+		private HistoryExcludedUpdateDetails(
+				MutationOperationGroup operationGroup,
+				int[] attributeIndexes,
+				boolean applyVersionRestriction) {
+			this.operationGroup = operationGroup;
+			this.attributeIndexes = attributeIndexes;
+			this.applyVersionRestriction = applyVersionRestriction;
+		}
+	}
+
+	private static boolean verifyOutcome(
+			PreparedStatementDetails statementDetails,
+			int affectedRowCount,
+			int batchPosition) throws SQLException {
+		statementDetails.getExpectation().verifyOutcome(
+				affectedRowCount,
+				statementDetails.getStatement(),
+				batchPosition,
+				statementDetails.getSqlString()
+		);
+		return true;
+	}
+
+	@Override
+	public void forceVersionIncrement(
+			Object id,
+			Object currentVersion,
+			Object nextVersion,
+			SharedSessionContractImplementor session) {
+		currentUpdateCoordinator.forceVersionIncrement( id, currentVersion, nextVersion, session );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java
index f2c9fc3f2117..c13c5a07fa49 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java
@@ -9,10 +9,9 @@
 import java.util.Locale;
 import java.util.function.Supplier;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.HibernateException;
 import org.hibernate.Internal;
-import org.hibernate.StaleObjectStateException;
-import org.hibernate.StaleStateException;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.OptimisticLockStyle;
 import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
@@ -20,7 +19,6 @@
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.MutationExecutor;
 import org.hibernate.engine.jdbc.mutation.ParameterUsage;
-import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
 import org.hibernate.engine.jdbc.mutation.internal.MutationQueryOptions;
 import org.hibernate.engine.jdbc.mutation.internal.NoBatchKeyAccess;
 import org.hibernate.engine.jdbc.mutation.spi.BatchKeyAccess;
@@ -28,6 +26,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.BeforeExecutionGenerator;
+import org.hibernate.generator.EventType;
 import org.hibernate.generator.Generator;
 import org.hibernate.generator.OnExecutionGenerator;
 import org.hibernate.generator.values.GeneratedValues;
@@ -51,7 +50,6 @@
 
 import static org.hibernate.engine.OptimisticLockStyle.DIRTY;
 import static org.hibernate.engine.internal.Versioning.isVersionIncrementRequired;
-import static org.hibernate.engine.jdbc.mutation.internal.ModelMutationHelper.identifiedResultsCheck;
 import static org.hibernate.generator.EventType.UPDATE;
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
 import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_INT_ARRAY;
@@ -135,7 +133,14 @@ public void forceVersionIncrement(
 		if ( versionUpdateGroup == null ) {
 			throw new HibernateException( "Cannot force version increment relative to subtype; use the root type" );
 		}
-		doVersionUpdate( null, id, nextVersion, currentVersion, session );
+		doVersionUpdate( null, id, nextVersion, currentVersion, getLoadedState( id, session ), session );
+	}
+
+	private Object @Nullable [] getLoadedState(Object id, SharedSessionContractImplementor session) {
+		return entityPersister.hasPartitionedSelectionMapping()
+				? session.getPersistenceContextInternal()
+				.getEntityHolder( session.generateEntityKey( id, entityPersister ) ).getEntityEntry().getLoadedState()
+				: null;
 	}
 
 	@Override
@@ -148,7 +153,7 @@ public void forceVersionIncrement(
 		if ( versionUpdateGroup == null ) {
 			throw new HibernateException( "Cannot force version increment relative to subtype; use the root type" );
 		}
-		doVersionUpdate( null, id, nextVersion, currentVersion, batching, session );
+		doVersionUpdate( null, id, nextVersion, currentVersion, batching, getLoadedState( id, session ), session );
 	}
 
 	@Override
@@ -169,6 +174,7 @@ public GeneratedValues update(
 							entity,
 							id,
 							values,
+							incomingOldValues,
 							oldVersion,
 							incomingDirtyAttributeIndexes,
 							session,
@@ -192,9 +198,21 @@ public GeneratedValues update(
 		final int[] dirtyAttributeIndexes =
 				dirtyAttributeIndexes( incomingDirtyAttributeIndexes, preUpdateGeneratedAttributeIndexes );
 
+		final boolean temporalExcludedUpdate =
+				entityPersister().excludedFromTemporalVersioning( dirtyAttributeIndexes, hasDirtyCollection );
+
 		final boolean[] attributeUpdateability;
-		boolean forceDynamicUpdate;
-		if ( entityPersister().isDynamicUpdate() && dirtyAttributeIndexes != null ) {
+		final boolean forceDynamicUpdate;
+		if ( temporalExcludedUpdate ) {
+			attributeUpdateability = getPropertiesToUpdate( dirtyAttributeIndexes, hasDirtyCollection );
+			for ( int i = 0; i < attributeUpdateability.length; i++ ) {
+				if ( attributeUpdateability[i] && !entityPersister().isPropertyTemporalExcluded( i ) ) {
+					attributeUpdateability[i] = false;
+				}
+			}
+			forceDynamicUpdate = true;
+		}
+		else if ( entityPersister().isDynamicUpdate() && dirtyAttributeIndexes != null ) {
 			attributeUpdateability = getPropertiesToUpdate( dirtyAttributeIndexes, hasDirtyCollection );
 			forceDynamicUpdate = true;
 		}
@@ -227,7 +245,6 @@ && hasLazyDirtyFields( entityPersister(), dirtyAttributeIndexes ) ) {
 			forceDynamicUpdate = entityPersister().hasUninitializedLazyProperties( entity );
 		}
 
-
 		return performUpdate(
 				entity,
 				id,
@@ -240,7 +257,8 @@ && hasLazyDirtyFields( entityPersister(), dirtyAttributeIndexes ) ) {
 				versionMapping,
 				dirtyAttributeIndexes,
 				attributeUpdateability,
-				forceDynamicUpdate
+				forceDynamicUpdate,
+				temporalExcludedUpdate
 		);
 	}
 
@@ -253,9 +271,11 @@ protected GeneratedValues performUpdate(
 			Object[] incomingOldValues,
 			boolean hasDirtyCollection,
 			SharedSessionContractImplementor session,
-			EntityVersionMapping versionMapping, int[] dirtyAttributeIndexes,
+			EntityVersionMapping versionMapping,
+			int[] dirtyAttributeIndexes,
 			boolean[] attributeUpdateability,
-			boolean forceDynamicUpdate) {
+			boolean forceDynamicUpdate,
+			boolean temporalExcludedUpdate) {
 
 		final InclusionChecker dirtinessChecker =
 				(position, attribute) -> isDirty(
@@ -277,23 +297,23 @@ protected GeneratedValues performUpdate(
 						entityPersister()
 				);
 
-		final InclusionChecker inclusionChecker = (position, attribute) -> attributeUpdateability[position];
-
 		final var valuesAnalysis = analyzeUpdateValues(
 				entity,
 				values,
 				oldVersion,
 				incomingOldValues,
 				dirtyAttributeIndexes,
-				inclusionChecker,
+				createInclusionChecker( attributeUpdateability ),
 				lockingChecker,
 				dirtinessChecker,
+				temporalExcludedUpdate,
 				rowId,
 				forceDynamicUpdate,
 				session
 		);
 
-		if ( valuesAnalysis.tablesNeedingUpdate.isEmpty() && valuesAnalysis.tablesNeedingDynamicUpdate.isEmpty() ) {
+		if ( valuesAnalysis.tablesNeedingUpdate.isEmpty()
+				&& valuesAnalysis.tablesNeedingDynamicUpdate.isEmpty() ) {
 			// nothing to do
 			return null;
 		}
@@ -382,6 +402,7 @@ protected Supplier<GeneratedValues> handlePotentialImplicitForcedVersionIncremen
 			Object entity,
 			Object id,
 			Object[] values,
+			Object[] oldValues,
 			Object oldVersion,
 			int[] incomingDirtyAttributeIndexes,
 			SharedSessionContractImplementor session,
@@ -432,7 +453,14 @@ else if ( incomingDirtyAttributeIndexes != null ) {
 
 		// we have just the version being updated - use the special handling
 		assert newVersion != null;
-		final GeneratedValues generatedValues = doVersionUpdate( entity, id, newVersion, oldVersion, session );
+		final var generatedValues = doVersionUpdate(
+				entity,
+				id,
+				newVersion,
+				oldVersion,
+				oldValues == null ? values : oldValues,
+				session
+		);
 		return () -> generatedValues;
 	}
 
@@ -442,15 +470,11 @@ private boolean hasUpdateGeneratedValues() {
 			|| entityMetamodel.hasPreUpdateGeneratedProperties();
 	}
 
-	private static boolean isValueGenerated(Generator generator) {
+	private static boolean isValueGenerationOnUpdateInSql(Generator generator, Dialect dialect) {
 		return generator != null
+			&& generator.generatedOnExecution()
 			&& generator.generatesOnUpdate()
-			&& generator.generatedOnExecution();
-	}
-
-	private static boolean isValueGenerationInSql(Generator generator, Dialect dialect) {
-		assert isValueGenerated( generator );
-		return ( (OnExecutionGenerator) generator ).referenceColumnsInSql( dialect );
+			&& ( (OnExecutionGenerator) generator ).referenceColumnsInSql( dialect, EventType.UPDATE );
 	}
 
 	/**
@@ -468,8 +492,17 @@ protected GeneratedValues doVersionUpdate(
 			Object id,
 			Object version,
 			Object oldVersion,
+			Object[] loadedState,
 			SharedSessionContractImplementor session) {
-		return doVersionUpdate( entity, id, version, oldVersion, true, session );
+		return doVersionUpdate(
+				entity,
+				id,
+				version,
+				oldVersion,
+				true,
+				loadedState,
+				session
+		);
 	}
 
 	protected GeneratedValues doVersionUpdate(
@@ -478,6 +511,7 @@ protected GeneratedValues doVersionUpdate(
 			Object version,
 			Object oldVersion,
 			boolean batching,
+			Object[] loadedState,
 			SharedSessionContractImplementor session) {
 		assert versionUpdateGroup != null;
 
@@ -497,6 +531,8 @@ protected GeneratedValues doVersionUpdate(
 				ParameterUsage.SET
 		);
 
+		bindPartitionColumnValueBindings( loadedState, session, mutationExecutor.getJdbcValueBindings() );
+
 		// restrict the key
 		mutatingTableDetails.getKeyMapping().breakDownKeyJdbcValues(
 				id,
@@ -548,7 +584,7 @@ private int[] preUpdateInMemoryValueGeneration(
 			final int[] fieldsPreUpdateNeeded = new int[generators.length];
 			int count = 0;
 			for ( int i = 0; i < generators.length; i++ ) {
-				final Generator generator = generators[i];
+				final var generator = generators[i];
 				if ( generator != null
 						&& generator.generatesOnUpdate()
 						&& generator.generatedBeforeExecution( object, session ) ) {
@@ -566,22 +602,25 @@ private int[] preUpdateInMemoryValueGeneration(
 		return EMPTY_INT_ARRAY;
 	}
 
+	public boolean[] getPropertyUpdateability() {
+		return entityPersister().getPropertyUpdateability();
+	}
+
 	/**
 	 * Transform the array of property indexes to an array of booleans for each attribute,
 	 * true when the property is dirty
 	 */
 	protected boolean[] getPropertiesToUpdate(final int[] dirtyProperties, final boolean hasDirtyCollection) {
 		final var persister = entityPersister();
-		final var updateability = persister.getPropertyUpdateability();
 		if ( dirtyProperties == null ) {
-			return updateability;
+			return getPropertyUpdateability();
 		}
 		else {
+			final var updateability = persister.getPropertyUpdateability();
+			final var insertability = persister.getPropertyInsertability();
 			final var propsToUpdate = new boolean[persister.getNumberOfAttributeMappings()];
 			for ( int property: dirtyProperties ) {
-				if ( updateability[property] ) {
-					propsToUpdate[property] = true;
-				}
+				propsToUpdate[property] = includeProperty( insertability, updateability, property );
 			}
 			if ( persister.isVersioned() ) {
 				final var versionAttribute = persister.getVersionMapping().getVersionAttribute();
@@ -600,7 +639,11 @@ protected boolean[] getPropertiesToUpdate(final int[] dirtyProperties, final boo
 		}
 	}
 
-	private UpdateValuesAnalysisImpl analyzeUpdateValues(
+	protected boolean includeProperty(boolean[] insertability, boolean[] updateability, int property) {
+		return updateability[property];
+	}
+
+	protected UpdateValuesAnalysisImpl analyzeUpdateValues(
 			Object entity,
 			Object[] values,
 			Object oldVersion,
@@ -609,6 +652,7 @@ private UpdateValuesAnalysisImpl analyzeUpdateValues(
 			InclusionChecker inclusionChecker,
 			InclusionChecker lockingChecker,
 			InclusionChecker dirtinessChecker,
+			boolean restrictToTemporalExcluded,
 			Object rowId,
 			boolean forceDynamicUpdate,
 			SharedSessionContractImplementor session) {
@@ -630,30 +674,29 @@ private UpdateValuesAnalysisImpl analyzeUpdateValues(
 				forceDynamicUpdate
 		);
 
-		final var propertyUpdateability = persister.getPropertyUpdateability();
-
 		for ( int attributeIndex = 0; attributeIndex < attributeMappings.size(); attributeIndex++ ) {
 			final var attributeMapping = attributeMappings.get( attributeIndex );
 			analysis.startingAttribute( attributeMapping );
 
 			try {
 				if ( attributeMapping.getJdbcTypeCount() > 0
-						&& attributeMapping instanceof SingularAttributeMapping asSingularAttributeMapping ) {
+						&& attributeMapping instanceof SingularAttributeMapping singularAttributeMapping ) {
 					processAttribute(
 							entity,
 							analysis,
 							attributeIndex,
-							asSingularAttributeMapping,
+							singularAttributeMapping,
 							oldVersion,
 							oldValues,
 							inclusionChecker,
 							lockingChecker,
+							restrictToTemporalExcluded,
 							session
 					);
 
 					// In this case we check for exactly DirtynessStatus.DIRTY so to not log warnings when the user didn't get it wrong:
 					if ( analysis.currentAttributeAnalysis.getDirtynessStatus() == AttributeAnalysis.DirtynessStatus.DIRTY ) {
-						if ( !propertyUpdateability[attributeIndex] ) {
+						if ( !includeProperty( persister.getPropertyInsertability(), persister.getPropertyUpdateability(), attributeIndex ) ) {
 							CORE_LOGGER.ignoreImmutablePropertyModification( attributeMapping.getAttributeName(), persister.getEntityName() );
 						}
 					}
@@ -676,14 +719,36 @@ private void processAttribute(
 			Object[] oldValues,
 			InclusionChecker inclusionChecker,
 			InclusionChecker lockingChecker,
+			boolean restrictToTemporalExcluded,
 			SharedSessionContractImplementor session) {
 
-		final var generator = attributeMapping.getGenerator();
-		final boolean generated = isValueGenerated( generator );
+		final var generator =
+				restrictToTemporalExcluded
+						&& !entityPersister().isPropertyTemporalExcluded( attributeIndex )
+				? null
+				: attributeMapping.getGenerator();
+		final boolean generatesOnUpdate =
+				generator != null
+						&& generator.generatesOnUpdate();
 		final boolean needsDynamicUpdate =
-				generated && session != null && generator.generatedBeforeExecution( entity, session );
-		final boolean generatedInSql = generated && isValueGenerationInSql( generator, dialect );
-		if ( generatedInSql && !needsDynamicUpdate && !( (OnExecutionGenerator) generator ).writePropertyValue() ) {
+				generatesOnUpdate
+						&& session != null
+						&& generator.generatedBeforeExecution( entity, session )
+						// Only force dynamic update when the generator can switch to on-execution mode.
+						&& generator.generatedOnExecution();
+		final boolean generatedOnExecution =
+				generatesOnUpdate
+						&& ( session == null
+							? generator.generatedOnExecution()
+							: generator.generatedOnExecution( entity, session )
+						);
+		final boolean generatedInSql =
+				generatedOnExecution
+						&& generator instanceof OnExecutionGenerator onExecutionGenerator
+						&& hasValueGenerationOnExecution( onExecutionGenerator, dialect, EventType.UPDATE );
+		if ( generatedInSql
+				&& !needsDynamicUpdate
+				&& !( (OnExecutionGenerator) generator ).writePropertyValue( EventType.UPDATE ) ) {
 			analysis.registerValueGeneratedInSqlNoWrite();
 		}
 
@@ -716,7 +781,7 @@ private Object attributeLockValue(
 	}
 
 	private void processSet(UpdateValuesAnalysisImpl analysis, SelectableMapping selectable, boolean needsDynamicUpdate) {
-		if ( selectable != null && !selectable.isFormula() && selectable.isUpdateable() ) {
+		if ( selectable != null && !selectable.isFormula() && isColumnIncludedInSet( selectable ) ) {
 			final var tableMapping = physicalTableMappingForMutation( entityPersister(), selectable );
 			analysis.registerColumnSet( tableMapping, selectable.getSelectionExpression(), selectable.getWriteExpression() );
 			if ( needsDynamicUpdate ) {
@@ -725,6 +790,14 @@ private void processSet(UpdateValuesAnalysisImpl analysis, SelectableMapping sel
 		}
 	}
 
+	protected boolean isColumnIncludedInSet(SelectableMapping selectable) {
+		return selectable.isUpdateable();
+	}
+
+	protected InclusionChecker createInclusionChecker(boolean[] attributeUpdateability) {
+		return (position, attribute) -> attributeUpdateability[position];
+	}
+
 	private void processLock(
 			UpdateValuesAnalysisImpl analysis,
 			SingularAttributeMapping attributeMapping,
@@ -760,6 +833,7 @@ protected GeneratedValues doStaticUpdate(
 		final var mutationExecutor = executor( session, staticUpdateGroup, false );
 
 		decomposeForUpdate(
+				entity,
 				id,
 				rowId,
 				values,
@@ -770,7 +844,9 @@ protected GeneratedValues doStaticUpdate(
 				(position, attribute) -> AttributeAnalysis.DirtynessStatus.CONSIDER_LIKE_DIRTY,
 				session
 		);
-		bindPartitionColumnValueBindings( oldValues, session, mutationExecutor.getJdbcValueBindings() );
+		// no snapshot when called from StatelessSession.update()
+		bindPartitionColumnValueBindings( oldValues == null ? values : oldValues,
+				session, mutationExecutor.getJdbcValueBindings() );
 
 		try {
 			return mutationExecutor.execute(
@@ -789,6 +865,7 @@ protected GeneratedValues doStaticUpdate(
 	}
 
 	protected void decomposeForUpdate(
+			Object entity,
 			Object id,
 			Object rowId,
 			Object[] values,
@@ -797,23 +874,23 @@ protected void decomposeForUpdate(
 			MutationOperationGroup jdbcOperationGroup,
 			DirtinessChecker dirtinessChecker,
 			SharedSessionContractImplementor session) {
-		final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
+		final var jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
 
 		// apply values
 		for ( int position = 0; position < jdbcOperationGroup.getNumberOfOperations(); position++ ) {
 			final var operation = jdbcOperationGroup.getOperation( position );
 			final var tableMapping = (EntityTableMapping) operation.getTableDetails();
 			if ( valuesAnalysis.tablesNeedingUpdate.contains( tableMapping ) ) {
-				final int[] attributeIndexes = tableMapping.getAttributeIndexes();
-				for ( int i = 0; i < attributeIndexes.length; i++ ) {
+				for ( int attributeIndex : tableMapping.getAttributeIndexes() ) {
 					decomposeAttributeForUpdate(
+							entity,
 							values,
 							valuesAnalysis,
 							dirtinessChecker,
 							session,
 							jdbcValueBindings,
 							tableMapping,
-							attributeIndexes[ i ]
+							attributeIndex
 					);
 				}
 			}
@@ -828,6 +905,7 @@ protected void decomposeForUpdate(
 	}
 
 	private void decomposeAttributeForUpdate(
+			Object entity,
 			Object[] values,
 			UpdateValuesAnalysisImpl valuesAnalysis,
 			DirtinessChecker dirtinessChecker,
@@ -844,7 +922,14 @@ private void decomposeAttributeForUpdate(
 				if ( attributeAnalysis.includeInSet() ) {
 					// apply the new values
 					if ( includeInSet( dirtinessChecker, attributeIndex, attributeMapping, attributeAnalysis ) ) {
-						decomposeAttributeMapping( session, jdbcValueBindings, tableMapping, attributeMapping, values[attributeIndex] );
+						decomposeAttributeMapping(
+								session,
+								jdbcValueBindings,
+								tableMapping,
+								attributeMapping,
+								values[attributeIndex],
+								entity
+						);
 					}
 				}
 
@@ -873,19 +958,42 @@ private static void optimisticLock(
 		} );
 	}
 
-	private static void decomposeAttributeMapping(
+	private void decomposeAttributeMapping(
 			SharedSessionContractImplementor session,
 			JdbcValueBindings jdbcValueBindings,
 			EntityTableMapping tableMapping,
 			AttributeMapping attributeMapping,
-			Object values) {
+			Object values,
+			Object entity) {
+		final var generator = attributeMapping.getGenerator();
+		final OnExecutionGenerator onExecutionGenerator;
+		final String[] columnValues;
+		final boolean[] columnInclusions;
+		final boolean bindAllValues;
+		if ( generator instanceof OnExecutionGenerator executionGenerator
+				&& generator.generatedOnExecution( entity, session )
+				&& generator.generatesOnUpdate() ) {
+			onExecutionGenerator = executionGenerator;
+			columnValues = onExecutionGenerator.getReferencedColumnValues( dialect(), EventType.UPDATE );
+			columnInclusions = onExecutionGenerator.getColumnInclusions( dialect(), EventType.UPDATE );
+			bindAllValues = onExecutionGenerator.writePropertyValue( EventType.UPDATE ) && columnValues == null;
+		}
+		else {
+			onExecutionGenerator = null;
+			columnValues = null;
+			columnInclusions = null;
+			bindAllValues = false;
+		}
+
 		attributeMapping.decompose(
 				values,
 				0,
 				jdbcValueBindings,
 				tableMapping,
 				(valueIndex, bindings, table, jdbcValue, jdbcMapping) -> {
-					if ( !jdbcMapping.isFormula() && jdbcMapping.isUpdateable() ) {
+					if ( !jdbcMapping.isFormula()
+							&& isColumnIncludedInSet( jdbcMapping )
+							&& shouldBindValue( onExecutionGenerator, columnValues, columnInclusions, bindAllValues, valueIndex ) ) {
 						bindings.bindValue(
 								jdbcValue,
 								table.getTableName(),
@@ -898,6 +1006,24 @@ private static void decomposeAttributeMapping(
 		);
 	}
 
+	private static boolean shouldBindValue(
+			OnExecutionGenerator onExecutionGenerator,
+			String[] columnValues,
+			boolean[] columnInclusions,
+			boolean bindAllValues,
+			int valueIndex) {
+		if ( onExecutionGenerator == null ) {
+			return true;
+		}
+		else if ( columnInclusions != null && !columnInclusions[valueIndex] ) {
+			return false;
+		}
+		else {
+			return bindAllValues
+				|| columnValues != null && "?".equals( columnValues[valueIndex] );
+		}
+	}
+
 	private boolean includeInSet(
 			DirtinessChecker dirtinessChecker,
 			int attributeIndex,
@@ -944,6 +1070,7 @@ protected GeneratedValues doDynamicUpdate(
 		final var mutationExecutor = executor( session, dynamicUpdateGroup, true );
 
 		decomposeForUpdate(
+				entity,
 				id,
 				rowId,
 				values,
@@ -956,7 +1083,9 @@ protected GeneratedValues doDynamicUpdate(
 								: AttributeAnalysis.DirtynessStatus.NOT_DIRTY,
 				session
 		);
-		bindPartitionColumnValueBindings( oldValues, session, mutationExecutor.getJdbcValueBindings() );
+		// no snapshot when called from StatelessSession.update()
+		bindPartitionColumnValueBindings( oldValues == null ? values : oldValues,
+				session, mutationExecutor.getJdbcValueBindings() );
 
 		try {
 			return mutationExecutor.execute(
@@ -1017,22 +1146,6 @@ protected BatchKey getVersionUpdateBatchkey(){
 		return versionUpdateBatchkey;
 	}
 
-	private boolean resultCheck(
-			Object id, PreparedStatementDetails statementDetails, int affectedRowCount, int batchPosition) {
-		return identifiedResultsCheck(
-				statementDetails,
-				affectedRowCount,
-				batchPosition,
-				entityPersister,
-				id,
-				factory
-		);
-	}
-
-	private StaleObjectStateException staleObjectStateException(Object id, StaleStateException staleStateException) {
-		return new StaleObjectStateException( entityPersister.getEntityName(), id, staleStateException );
-	}
-
 	protected MutationOperationGroup generateDynamicUpdateGroup(
 			Object entity,
 			Object id,
@@ -1044,14 +1157,11 @@ protected MutationOperationGroup generateDynamicUpdateGroup(
 
 		entityPersister().forEachMutableTable( (tableMapping) -> {
 			final var tableReference = new MutatingTableReference( tableMapping );
-			final TableMutationBuilder<?> tableUpdateBuilder;
-			if ( ! valuesAnalysis.tablesNeedingUpdate.contains( tableReference.getTableMapping() ) ) {
-				// this table does not need updating
-				tableUpdateBuilder = new TableUpdateBuilderSkipped( tableReference );
-			}
-			else {
-				tableUpdateBuilder = createTableUpdateBuilder( tableMapping );
-			}
+			final var tableUpdateBuilder =
+					valuesAnalysis.tablesNeedingUpdate.contains( tableReference.getTableMapping() )
+							? createTableUpdateBuilder( tableMapping )
+							// this table does not need updating
+							: new TableUpdateBuilderSkipped( tableReference );
 			updateGroupBuilder.addTableDetailsBuilder( tableUpdateBuilder );
 		} );
 
@@ -1099,16 +1209,13 @@ private void applyTableUpdateDetails(
 		updateGroupBuilder.forEachTableMutationBuilder( (builder) -> {
 			final var tableMapping = (EntityTableMapping) builder.getMutatingTable().getTableMapping();
 
-			final int[] attributeIndexes = tableMapping.getAttributeIndexes();
-			for ( int i = 0; i < attributeIndexes.length; i++ ) {
-				final int attributeIndex = attributeIndexes[i];
-
+			for ( final int attributeIndex : tableMapping.getAttributeIndexes() ) {
 				final var attributeMapping = attributeMappings.get( attributeIndex );
 				final var attributeAnalysis = updateValuesAnalysis.attributeAnalyses.get( attributeIndex );
 
 				if ( attributeAnalysis.includeInSet() ) {
 					assert updateValuesAnalysis.tablesNeedingUpdate.contains( tableMapping )
-							|| updateValuesAnalysis.tablesNeedingDynamicUpdate.contains( tableMapping );
+						|| updateValuesAnalysis.tablesNeedingDynamicUpdate.contains( tableMapping );
 					applyAttributeUpdateDetails(
 							entity,
 							updateGroupBuilder,
@@ -1154,23 +1261,6 @@ private void applyTableUpdateDetails(
 		} );
 	}
 
-	private void applyPartitionKeyRestriction(TableUpdateBuilder<?> tableUpdateBuilder) {
-		final var persister = entityPersister();
-		if ( persister.hasPartitionedSelectionMapping() ) {
-			final var attributeMappings = persister.getAttributeMappings();
-			for ( int m = 0; m < attributeMappings.size(); m++ ) {
-				final var attributeMapping = attributeMappings.get( m );
-				final int jdbcTypeCount = attributeMapping.getJdbcTypeCount();
-				for ( int i = 0; i < jdbcTypeCount; i++ ) {
-					final var selectableMapping = attributeMapping.getSelectable( i );
-					if ( selectableMapping.isPartitioned() ) {
-						tableUpdateBuilder.addKeyRestrictionLeniently( selectableMapping );
-					}
-				}
-			}
-		}
-	}
-
 	private static void applyAttributeLockingDetails(
 			Object[] oldValues,
 			SharedSessionContractImplementor session,
@@ -1236,8 +1326,9 @@ private void applyAttributeUpdateDetails(
 			TableUpdateBuilder<?> tableUpdateBuilder,
 			SharedSessionContractImplementor session) {
 		final var generator = attributeMapping.getGenerator();
-		if ( needsValueGeneration( entity, session, generator ) ) {
-			handleValueGeneration( attributeMapping, updateGroupBuilder, (OnExecutionGenerator) generator );
+		if ( generator instanceof OnExecutionGenerator onExecutionGenerator
+				&& hasValueGenerationOnExecution( entity, session, onExecutionGenerator, EventType.UPDATE ) ) {
+			handleValueGeneration( attributeMapping, updateGroupBuilder, onExecutionGenerator, EventType.UPDATE );
 		}
 		else if ( versionMapping != null
 				&& versionMapping.getVersionAttribute() == attributeMapping) {
@@ -1248,15 +1339,13 @@ else if ( versionMapping != null
 					|| dirtinessChecker == null
 					|| dirtinessChecker.isDirty( attributeIndex, attributeMapping ).isDirty();
 			if ( includeInSet ) {
-				attributeMapping.forEachUpdatable( tableUpdateBuilder );
+				forEachUpdatable( attributeMapping, tableUpdateBuilder );
 			}
 		}
 	}
 
-	private boolean needsValueGeneration(Object entity, SharedSessionContractImplementor session, Generator generator) {
-		return isValueGenerated( generator )
-			&& (session == null && generator.generatedOnExecution() || generator.generatedOnExecution( entity, session ) )
-			&& isValueGenerationInSql( generator, dialect );
+	protected void forEachUpdatable(AttributeMapping attributeMapping, TableUpdateBuilder<?> tableUpdateBuilder) {
+		attributeMapping.forEachUpdatable( tableUpdateBuilder );
 	}
 
 	/**
@@ -1297,9 +1386,8 @@ public UpdateValuesAnalysisImpl(
 					tablesWithNonNullValues.add( tableMapping );
 				}
 				else {
-					for ( int i = 0; i < tableMapping.getAttributeIndexes().length; i++ ) {
-						final int attributeIndex = tableMapping.getAttributeIndexes()[ i ];
-						if ( values[ attributeIndex ] != null ) {
+					for ( final int attributeIndex : tableMapping.getAttributeIndexes() ) {
+						if ( values[attributeIndex] != null ) {
 							tablesWithNonNullValues.add( tableMapping );
 							break;
 						}
@@ -1314,9 +1402,8 @@ public UpdateValuesAnalysisImpl(
 					tablesWithPreviousNonNullValues.add( tableMapping );
 				}
 				else {
-					for ( int i = 0; i < tableMapping.getAttributeIndexes().length; i++ ) {
-						final int attributeIndex = tableMapping.getAttributeIndexes()[ i ];
-						if ( oldValues[ attributeIndex ] != null ) {
+					for ( final int attributeIndex : tableMapping.getAttributeIndexes() ) {
+						if ( oldValues[attributeIndex] != null ) {
 							tablesWithPreviousNonNullValues.add( tableMapping );
 							break;
 						}
@@ -1614,7 +1701,7 @@ public Object getLockValue() {
 		}
 	}
 
-	private MutationOperationGroup buildStaticUpdateGroup() {
+	protected MutationOperationGroup buildStaticUpdateGroup() {
 		final var persister = entityPersister();
 		final var valuesAnalysis = analyzeUpdateValues(
 				null,
@@ -1622,10 +1709,7 @@ private MutationOperationGroup buildStaticUpdateGroup() {
 				null,
 				null,
 				null,
-				(index,attribute) ->
-						isValueGenerated( attribute.getGenerator() )
-								&& isValueGenerationInSql( attribute.getGenerator(), dialect() )
-						|| persister.getPropertyUpdateability()[index],
+				(index, attribute) -> includeInStaticUpdate( index, attribute, persister.getPropertyUpdateability() ),
 				(index,attribute) ->
 						switch ( persister.optimisticLockStyle() ) {
 							case ALL -> true;
@@ -1636,6 +1720,7 @@ && isValueGenerationInSql( attribute.getGenerator(), dialect() )
 							default -> false;
 						},
 				(index,attribute) -> true,
+				false,
 				"", // pass anything here to generate the row id restriction if possible
 				false,
 				null
@@ -1667,6 +1752,14 @@ && isValueGenerationInSql( attribute.getGenerator(), dialect() )
 		return createOperationGroup( valuesAnalysis, updateGroupBuilder.buildMutationGroup() );
 	}
 
+	protected boolean includeInStaticUpdate(
+			int index,
+			AttributeMapping attribute,
+			boolean[] propertyUpdateability) {
+		return isValueGenerationOnUpdateInSql( attribute.getGenerator(), dialect() )
+			|| propertyUpdateability[index];
+	}
+
 	private MutationOperationGroup buildVersionUpdateGroup() {
 		final var versionMapping = entityPersister().getVersionMapping();
 		if ( versionMapping == null ) {
@@ -1683,7 +1776,7 @@ private MutationOperationGroup buildVersionUpdateGroup() {
 
 			updateBuilder.addKeyRestrictionsLeniently( identifierTableMapping.getKeyMapping() );
 
-			updateBuilder.addOptimisticLockRestriction( versionMapping );
+			applyVersionOptimisticLocking( updateBuilder );
 			applyPartitionKeyRestriction( updateBuilder );
 
 			//noinspection resource
@@ -1710,8 +1803,8 @@ protected interface DirtinessChecker {
 
 	public boolean hasLazyDirtyFields(EntityPersister persister,  int[] dirtyFields) {
 		final var propertyLaziness = persister.getPropertyLaziness();
-		for ( int i = 0; i < dirtyFields.length; i++ ) {
-			if ( propertyLaziness[dirtyFields[i]] ) {
+		for ( int dirtyField : dirtyFields ) {
+			if ( propertyLaziness[dirtyField] ) {
 				return true;
 			}
 		}
@@ -1721,10 +1814,9 @@ public boolean hasLazyDirtyFields(EntityPersister persister,  int[] dirtyFields)
 	public EntityTableMapping physicalTableMappingForMutation(
 			EntityPersister persister, SelectableMapping selectableMapping) {
 		final String tableNameForMutation = persister.physicalTableNameForMutation( selectableMapping );
-		final var tableMappings = persister.getTableMappings();
-		for ( int i = 0; i < tableMappings.length; i++ ) {
-			if ( tableNameForMutation.equals( tableMappings[i].getTableName() ) ) {
-				return tableMappings[i];
+		for ( var tableMapping : persister.getTableMappings() ) {
+			if ( tableNameForMutation.equals( tableMapping.getTableName() ) ) {
+				return tableMapping;
 			}
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorTemporal.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorTemporal.java
new file mode 100644
index 000000000000..3877859421bd
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorTemporal.java
@@ -0,0 +1,111 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.entity.mutation;
+
+import org.hibernate.engine.jdbc.batch.internal.BasicBatchKey;
+import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
+import org.hibernate.engine.jdbc.mutation.ParameterUsage;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.model.MutationOperationGroup;
+
+
+/**
+ * Update coordinator for
+ * {@link org.hibernate.temporal.TemporalTableStrategy#SINGLE_TABLE}
+ * temporal strategy.
+ *
+ * @author Gavin King
+ */
+public class UpdateCoordinatorTemporal extends AbstractTemporalUpdateCoordinator {
+	private final TemporalMapping temporalMapping;
+	private final MutationOperationGroup endingUpdateGroup;
+	private final BasicBatchKey batchKey;
+	private final UpdateCoordinator versionUpdateDelegate;
+
+	public UpdateCoordinatorTemporal(
+			EntityPersister entityPersister,
+			SessionFactoryImplementor factory) {
+		super( entityPersister, factory );
+		this.temporalMapping = entityPersister.getTemporalMapping();
+		this.endingUpdateGroup = buildEndingUpdateGroup( entityPersister.getIdentifierTableMapping(), temporalMapping );
+		this.batchKey = new BasicBatchKey( entityPersister.getEntityName() + "#TEMPORAL_UPDATE" );
+		this.versionUpdateDelegate = new UpdateCoordinatorStandard( entityPersister, factory );
+	}
+
+	@Override
+	public MutationOperationGroup getStaticMutationOperationGroup() {
+		return endingUpdateGroup;
+	}
+
+	@Override
+	protected BasicBatchKey getBatchKey() {
+		return batchKey;
+	}
+
+	@Override
+	public GeneratedValues update(
+			Object entity,
+			Object id,
+			Object rowId,
+			Object[] values,
+			Object oldVersion,
+			Object[] incomingOldValues,
+			int[] dirtyAttributeIndexes,
+			boolean hasDirtyCollection,
+			SharedSessionContractImplementor session) {
+		if ( entityPersister()
+				.excludedFromTemporalVersioning( dirtyAttributeIndexes, hasDirtyCollection ) ) {
+			return versionUpdateDelegate.update(
+					entity,
+					id,
+					rowId,
+					values,
+					oldVersion,
+					incomingOldValues,
+					dirtyAttributeIndexes,
+					hasDirtyCollection,
+					session
+			);
+		}
+		else {
+			performRowEndUpdate(
+					entity,
+					id,
+					rowId,
+					oldVersion,
+					session,
+					temporalMapping,
+					endingUpdateGroup,
+					entityPersister()
+							.physicalTableNameForMutation( temporalMapping.getEndingColumnMapping() ),
+					(statementDetails, affectedRowCount, batchPosition) ->
+							resultCheck( id, statementDetails, affectedRowCount, batchPosition )
+
+			);
+			return entityPersister().getInsertCoordinator().insert( entity, id, values, session );
+		}
+	}
+
+	@Override
+	void bindVersionRestriction(Object oldVersion, JdbcValueBindings jdbcValueBindings, String temporalTableName) {
+		final var versionMapping = entityPersister().getVersionMapping();
+		if ( versionMapping != null && entityPersister().optimisticLockStyle().isVersion() ) {
+			jdbcValueBindings.bindValue( oldVersion, versionMapping, ParameterUsage.RESTRICT );
+		}
+	}
+
+	@Override
+	public void forceVersionIncrement(
+			Object id,
+			Object currentVersion,
+			Object nextVersion,
+			SharedSessionContractImplementor session) {
+		versionUpdateDelegate.forceVersionIncrement( id, currentVersion, nextVersion, session );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/state/internal/AbstractStateManagement.java b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/AbstractStateManagement.java
new file mode 100644
index 000000000000..dc4a73c9c4ae
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/AbstractStateManagement.java
@@ -0,0 +1,225 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.state.internal;
+
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.metamodel.mapping.AuxiliaryMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.SingularAttributeMapping;
+import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.collection.OneToManyPersister;
+import org.hibernate.persister.collection.mutation.CollectionMutationTarget;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinator;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorStandard;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorTablePerSubclass;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinator;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorStandard;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorTablePerSubclass;
+import org.hibernate.persister.collection.mutation.RemoveCoordinator;
+import org.hibernate.persister.collection.mutation.RemoveCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.RemoveCoordinatorStandard;
+import org.hibernate.persister.collection.mutation.RemoveCoordinatorTablePerSubclass;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinator;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorOneToMany;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorStandard;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorTablePerSubclass;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.UnionSubclassEntityPersister;
+import org.hibernate.persister.entity.mutation.DeleteCoordinator;
+import org.hibernate.persister.entity.mutation.DeleteCoordinatorStandard;
+import org.hibernate.persister.entity.mutation.InsertCoordinator;
+import org.hibernate.persister.entity.mutation.InsertCoordinatorStandard;
+import org.hibernate.persister.entity.mutation.MergeCoordinatorStandard;
+import org.hibernate.persister.entity.mutation.UpdateCoordinator;
+import org.hibernate.persister.entity.mutation.UpdateCoordinatorNoOp;
+import org.hibernate.persister.entity.mutation.UpdateCoordinatorStandard;
+import org.hibernate.persister.state.spi.StateManagement;
+
+import static org.hibernate.internal.util.collections.ArrayHelper.isAnyTrue;
+
+/**
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+public abstract class AbstractStateManagement implements StateManagement {
+	@Override
+	public InsertCoordinator createInsertCoordinator(EntityPersister persister) {
+		return new InsertCoordinatorStandard( persister, persister.getFactory() );
+	}
+
+	@Override
+	public UpdateCoordinator createUpdateCoordinator(EntityPersister persister) {
+		final var attributeMappings = persister.getAttributeMappings();
+		for ( int i = 0; i < attributeMappings.size(); i++ ) {
+			if ( attributeMappings.get( i ) instanceof SingularAttributeMapping ) {
+				return new UpdateCoordinatorStandard( persister, persister.getFactory() );
+			}
+		}
+		return new UpdateCoordinatorNoOp( persister );
+	}
+
+	@Override
+	public UpdateCoordinator createMergeCoordinator(EntityPersister persister) {
+		return new MergeCoordinatorStandard( persister, persister.getFactory() );
+	}
+
+	@Override
+	public DeleteCoordinator createDeleteCoordinator(EntityPersister persister) {
+		return new DeleteCoordinatorStandard( persister, persister.getFactory() );
+	}
+
+	@Override
+	public InsertRowsCoordinator createInsertRowsCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !isInsertAllowed( persister ) ) {
+			return new InsertRowsCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() && isTablePerSubclass( persister ) ) {
+			return new InsertRowsCoordinatorTablePerSubclass(
+					(OneToManyPersister) mutationTarget,
+					persister.getRowMutationOperations(),
+					persister.getFactory().getServiceRegistry()
+			);
+		}
+		else {
+			return new InsertRowsCoordinatorStandard(
+					mutationTarget,
+					persister.getRowMutationOperations(),
+					persister.getFactory().getServiceRegistry()
+			);
+		}
+	}
+
+	@Override
+	public UpdateRowsCoordinator createUpdateRowsCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !isUpdatePossible( persister ) ) {
+			return new UpdateRowsCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() ) {
+			if ( isTablePerSubclass( persister ) ) {
+				return new UpdateRowsCoordinatorTablePerSubclass(
+						(OneToManyPersister) mutationTarget,
+						persister.getRowMutationOperations(),
+						persister.getFactory()
+				);
+			}
+			else {
+				return new UpdateRowsCoordinatorOneToMany(
+						mutationTarget,
+						persister.getRowMutationOperations(),
+						persister.getFactory()
+				);
+			}
+		}
+		else {
+			return new UpdateRowsCoordinatorStandard(
+					mutationTarget,
+					persister.getRowMutationOperations(),
+					persister.getFactory()
+			);
+		}
+	}
+
+	@Override
+	public DeleteRowsCoordinator createDeleteRowsCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !persister.needsRemove() ) {
+			return new DeleteRowsCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() && isTablePerSubclass( persister ) ) {
+			return new DeleteRowsCoordinatorTablePerSubclass(
+					(OneToManyPersister) mutationTarget,
+					persister.getRowMutationOperations(),
+					false,
+					persister.getFactory().getServiceRegistry()
+			);
+		}
+		else {
+			return new DeleteRowsCoordinatorStandard(
+					mutationTarget,
+					persister.getRowMutationOperations(),
+					!persister.isOneToMany()
+							&& mutationTarget.hasPhysicalIndexColumn(),
+					persister.getFactory().getServiceRegistry()
+			);
+		}
+	}
+
+	@Override
+	public RemoveCoordinator createRemoveCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !persister.needsRemove() ) {
+			return new RemoveCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() && isTablePerSubclass( persister ) ) {
+			return new RemoveCoordinatorTablePerSubclass(
+					(OneToManyPersister) mutationTarget,
+					persister.getRowMutationOperations(),
+					persister.getFactory().getServiceRegistry()
+			);
+		}
+		else {
+			return new RemoveCoordinatorStandard(
+					mutationTarget,
+					persister.getRowMutationOperations(),
+					persister.getFactory().getServiceRegistry()
+			);
+		}
+	}
+
+	protected static boolean isUpdatePossible(CollectionPersister persister) {
+		if ( persister.isOneToMany() ) {
+			return persister.isRowDeleteEnabled()
+				|| persister.isRowInsertEnabled();
+		}
+		else {
+			return !persister.isInverse()
+				&& persister.getCollectionSemantics().getCollectionClassification().isRowUpdatePossible()
+				&& isAnyTrue( persister.getElementColumnIsSettable() );
+		}
+	}
+
+	protected static boolean isInsertAllowed(CollectionPersister persister) {
+		return !persister.isInverse() && persister.isRowInsertEnabled();
+	}
+
+	protected boolean isTablePerSubclass(CollectionPersister persister) {
+		final var elementPersister = persister.getElementPersister();
+		return elementPersister != null
+			&& elementPersister.hasSubclasses()
+			&& elementPersister instanceof UnionSubclassEntityPersister;
+	}
+
+	protected static CollectionMutationTarget resolveMutationTarget(CollectionPersister persister) {
+		if ( persister instanceof CollectionMutationTarget collectionMutationTarget ) {
+			return collectionMutationTarget;
+		}
+		throw new IllegalArgumentException( "CollectionPersister does not implement CollectionMutationTarget" );
+	}
+
+
+	@Override
+	public AuxiliaryMapping createAuxiliaryMapping(
+			EntityPersister persister,
+			RootClass rootClass,
+			MappingModelCreationProcess creationProcess) {
+		return null;
+	}
+
+	@Override
+	public AuxiliaryMapping createAuxiliaryMapping(
+			PluralAttributeMapping pluralAttributeMapping,
+			Collection bootDescriptor,
+			MappingModelCreationProcess creationProcess) {
+		return null;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/state/internal/AuditStateManagement.java b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/AuditStateManagement.java
new file mode 100644
index 000000000000..a196b3375adf
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/AuditStateManagement.java
@@ -0,0 +1,194 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.state.internal;
+
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.metamodel.mapping.AuditMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.internal.AuditMappingImpl;
+import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinator;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorAudit;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinator;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorAudit;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.RemoveCoordinator;
+import org.hibernate.persister.collection.mutation.RemoveCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinator;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorAudit;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorNoOp;
+import org.hibernate.persister.entity.AbstractEntityPersister;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.mutation.DeleteCoordinator;
+import org.hibernate.persister.entity.mutation.DeleteCoordinatorAudit;
+import org.hibernate.persister.entity.mutation.InsertCoordinator;
+import org.hibernate.persister.entity.mutation.InsertCoordinatorAudit;
+import org.hibernate.persister.entity.mutation.MergeCoordinatorAudit;
+import org.hibernate.persister.entity.mutation.UpdateCoordinator;
+import org.hibernate.persister.entity.mutation.UpdateCoordinatorAudit;
+import org.hibernate.persister.state.spi.StateManagement;
+
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getTableIdentifierExpression;
+import static org.hibernate.persister.state.internal.AbstractStateManagement.resolveMutationTarget;
+
+/**
+ * State management for {@linkplain org.hibernate.annotations.Audited audited}
+ * entities and collections.
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+public class AuditStateManagement implements StateManagement {
+	public static final AuditStateManagement INSTANCE = new AuditStateManagement();
+
+	private AuditStateManagement() {
+	}
+
+	/**
+	 * The modification type stored in the
+	 * {@linkplain org.hibernate.annotations.Audited#modificationType
+	 * modification type column}.
+	 */
+	public enum ModificationType {
+		/** Creation, encoded as 0 */
+		ADD,
+		/** Modification, encoded as 1 */
+		MOD,
+		/** Deletion, encoded as 2 */
+		DEL
+	}
+
+	@Override
+	public InsertCoordinator createInsertCoordinator(EntityPersister persister) {
+		return new InsertCoordinatorAudit( persister, persister.getFactory(),
+				StandardStateManagement.INSTANCE.createInsertCoordinator( persister ) );
+	}
+
+	@Override
+	public UpdateCoordinator createUpdateCoordinator(EntityPersister persister) {
+		return new UpdateCoordinatorAudit( persister, persister.getFactory(),
+				StandardStateManagement.INSTANCE.createUpdateCoordinator( persister ) );
+	}
+
+	@Override
+	public UpdateCoordinator createMergeCoordinator(EntityPersister persister) {
+		return new MergeCoordinatorAudit( persister, persister.getFactory(),
+				StandardStateManagement.INSTANCE.createMergeCoordinator( persister ) );
+	}
+
+	@Override
+	public DeleteCoordinator createDeleteCoordinator(EntityPersister persister) {
+		return new DeleteCoordinatorAudit( persister, persister.getFactory(),
+				StandardStateManagement.INSTANCE.createDeleteCoordinator( persister ) );
+	}
+
+	@Override
+	public InsertRowsCoordinator createInsertRowsCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !AbstractStateManagement.isInsertAllowed( persister ) ) {
+			return new InsertRowsCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() ) {
+			throw new UnsupportedOperationException();
+		}
+		else {
+			return new InsertRowsCoordinatorAudit(
+					mutationTarget,
+					persister.getRowMutationOperations(),
+					StandardStateManagement.INSTANCE.createInsertRowsCoordinator( persister ),
+					persister.getIndexColumnIsSettable(),
+					persister.getElementColumnIsSettable(),
+					persister.getIndexIncrementer(),
+					persister.getFactory()
+			);
+		}
+	}
+
+	@Override
+	public UpdateRowsCoordinator createUpdateRowsCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !AbstractStateManagement.isUpdatePossible( persister ) ) {
+			return new UpdateRowsCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() ) {
+			throw new UnsupportedOperationException();
+		}
+		else {
+			return new UpdateRowsCoordinatorAudit(
+					mutationTarget,
+					StandardStateManagement.INSTANCE.createUpdateRowsCoordinator( persister ),
+					persister.getIndexColumnIsSettable(),
+					persister.getElementColumnIsSettable(),
+					persister.getIndexIncrementer(),
+					persister.getFactory()
+			);
+		}
+	}
+
+	@Override
+	public DeleteRowsCoordinator createDeleteRowsCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !persister.needsRemove() ) {
+			return new DeleteRowsCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() ) {
+			throw new UnsupportedOperationException();
+		}
+		else {
+			return new DeleteRowsCoordinatorAudit(
+					mutationTarget,
+					StandardStateManagement.INSTANCE.createDeleteRowsCoordinator( persister ),
+					mutationTarget.hasPhysicalIndexColumn(),
+					persister.getIndexColumnIsSettable(),
+					persister.getElementColumnIsSettable(),
+					persister.getIndexIncrementer(),
+					persister.getFactory()
+			);
+		}
+	}
+
+	@Override
+	public RemoveCoordinator createRemoveCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !persister.needsRemove() ) {
+			return new RemoveCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() ) {
+			throw new UnsupportedOperationException();
+		}
+		else {
+			return StandardStateManagement.INSTANCE.createRemoveCoordinator( persister );
+		}
+	}
+
+	@Override
+	public AuditMapping createAuxiliaryMapping(
+			EntityPersister persister,
+			RootClass rootClass,
+			MappingModelCreationProcess creationProcess) {
+		final var auditTable = rootClass.getAuxiliaryTable();
+		final String tableName = auditTable == null
+				? persister.getIdentifierTableName()
+				: ( (AbstractEntityPersister) persister )
+						.determineTableName( auditTable );
+		return new AuditMappingImpl( rootClass, tableName, creationProcess );
+	}
+
+	@Override
+	public AuditMapping createAuxiliaryMapping(
+			PluralAttributeMapping pluralAttributeMapping,
+			Collection bootDescriptor,
+			MappingModelCreationProcess creationProcess) {
+		final var auditTable = bootDescriptor.getAuxiliaryTable();
+		final String tableName = auditTable == null ? null
+				: getTableIdentifierExpression( auditTable, creationProcess );
+		return new AuditMappingImpl( bootDescriptor, tableName, creationProcess );
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/state/internal/HistoryStateManagement.java b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/HistoryStateManagement.java
new file mode 100644
index 000000000000..8c8101d663f7
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/HistoryStateManagement.java
@@ -0,0 +1,191 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.state.internal;
+
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.metamodel.mapping.AuxiliaryMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
+import org.hibernate.metamodel.mapping.internal.TemporalMappingImpl;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinator;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorHistory;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinator;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorHistory;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.RemoveCoordinator;
+import org.hibernate.persister.collection.mutation.RemoveCoordinatorHistory;
+import org.hibernate.persister.collection.mutation.RemoveCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinator;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorHistory;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorNoOp;
+import org.hibernate.persister.entity.AbstractEntityPersister;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.mutation.DeleteCoordinator;
+import org.hibernate.persister.entity.mutation.DeleteCoordinatorHistory;
+import org.hibernate.persister.entity.mutation.InsertCoordinator;
+import org.hibernate.persister.entity.mutation.InsertCoordinatorHistory;
+import org.hibernate.persister.entity.mutation.MergeCoordinatorHistory;
+import org.hibernate.persister.entity.mutation.UpdateCoordinator;
+import org.hibernate.persister.entity.mutation.UpdateCoordinatorHistory;
+import org.hibernate.persister.state.spi.StateManagement;
+
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getTableIdentifierExpression;
+import static org.hibernate.persister.state.internal.AbstractStateManagement.isInsertAllowed;
+import static org.hibernate.persister.state.internal.AbstractStateManagement.isUpdatePossible;
+import static org.hibernate.persister.state.internal.AbstractStateManagement.resolveMutationTarget;
+
+/**
+ * State management for temporal entities and collections with
+ * {@linkplain org.hibernate.annotations.Temporal.HistoryTable
+ * history tables}.
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+public final class HistoryStateManagement implements StateManagement {
+	public static final HistoryStateManagement INSTANCE = new HistoryStateManagement();
+
+	private HistoryStateManagement() {
+	}
+
+	@Override
+	public UpdateCoordinator createMergeCoordinator(EntityPersister persister) {
+		return new MergeCoordinatorHistory( persister, persister.getFactory(),
+				StandardStateManagement.INSTANCE.createMergeCoordinator( persister ) );
+	}
+
+	@Override
+	public InsertCoordinator createInsertCoordinator(EntityPersister persister) {
+		return new InsertCoordinatorHistory( persister, persister.getFactory(),
+				StandardStateManagement.INSTANCE.createInsertCoordinator( persister ) );
+	}
+
+	@Override
+	public UpdateCoordinator createUpdateCoordinator(EntityPersister persister) {
+		return new UpdateCoordinatorHistory( persister, persister.getFactory(),
+				StandardStateManagement.INSTANCE.createUpdateCoordinator( persister ) );
+	}
+
+	@Override
+	public DeleteCoordinator createDeleteCoordinator(EntityPersister persister) {
+		return new DeleteCoordinatorHistory( persister, persister.getFactory(),
+				StandardStateManagement.INSTANCE.createDeleteCoordinator( persister ) );
+	}
+
+	@Override
+	public InsertRowsCoordinator createInsertRowsCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !isInsertAllowed( persister ) ) {
+			return new InsertRowsCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() ) {
+			throw new UnsupportedOperationException();
+		}
+		else {
+			return new InsertRowsCoordinatorHistory(
+					mutationTarget,
+					persister.getRowMutationOperations(),
+					StandardStateManagement.INSTANCE.createInsertRowsCoordinator( persister ),
+					persister.getIndexColumnIsSettable(),
+					persister.getElementColumnIsSettable(),
+					persister.getIndexIncrementer(),
+					persister.getFactory().getServiceRegistry()
+			);
+		}
+	}
+
+	@Override
+	public UpdateRowsCoordinator createUpdateRowsCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !isUpdatePossible( persister ) ) {
+			return new UpdateRowsCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() ) {
+			throw new UnsupportedOperationException();
+		}
+		else {
+			return new UpdateRowsCoordinatorHistory(
+					mutationTarget,
+					persister.getRowMutationOperations(),
+					persister.getFactory(),
+					persister.getIndexColumnIsSettable(),
+					persister.getElementColumnIsSettable(),
+					persister.getIndexIncrementer()
+			);
+		}
+	}
+
+	@Override
+	public DeleteRowsCoordinator createDeleteRowsCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !persister.needsRemove() ) {
+			return new DeleteRowsCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() ) {
+			throw new UnsupportedOperationException();
+		}
+		else {
+			return new DeleteRowsCoordinatorHistory(
+					mutationTarget,
+					persister.getRowMutationOperations(),
+					mutationTarget.hasPhysicalIndexColumn(),
+					persister.getIndexColumnIsSettable(),
+					persister.getElementColumnIsSettable(),
+					persister.getIndexIncrementer(),
+					persister.getFactory().getServiceRegistry()
+			);
+		}
+	}
+
+	@Override
+	public RemoveCoordinator createRemoveCoordinator(CollectionPersister persister) {
+		final var mutationTarget = resolveMutationTarget( persister );
+		if ( !persister.needsRemove() ) {
+			return new RemoveCoordinatorNoOp( mutationTarget );
+		}
+		else if ( persister.isOneToMany() ) {
+			throw new UnsupportedOperationException();
+		}
+		else {
+			return new RemoveCoordinatorHistory(
+					mutationTarget,
+					persister.getRowMutationOperations(),
+					persister.getIndexColumnIsSettable(),
+					persister.getElementColumnIsSettable(),
+					persister.getIndexIncrementer(),
+					persister.getFactory().getServiceRegistry()
+			);
+		}
+	}
+
+	@Override
+	public AuxiliaryMapping createAuxiliaryMapping(
+			EntityPersister persister,
+			RootClass rootClass,
+			MappingModelCreationProcess creationProcess) {
+		final var temporalTable = rootClass.getAuxiliaryTable();
+		String tableName = temporalTable == null
+				? persister.getIdentifierTableName()
+				: ( (AbstractEntityPersister) persister )
+						.determineTableName( temporalTable );
+		return new TemporalMappingImpl( rootClass, tableName, creationProcess );
+	}
+
+	@Override
+	public AuxiliaryMapping createAuxiliaryMapping(
+			PluralAttributeMapping pluralAttributeMapping,
+			Collection bootDescriptor,
+			MappingModelCreationProcess creationProcess) {
+		final var temporalTable = bootDescriptor.getAuxiliaryTable();
+		String tableName = temporalTable == null
+				? pluralAttributeMapping.getSeparateCollectionTable()
+				: getTableIdentifierExpression( temporalTable, creationProcess );
+		return new TemporalMappingImpl( bootDescriptor, tableName, creationProcess );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/state/internal/NativeTemporalStateManagement.java b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/NativeTemporalStateManagement.java
new file mode 100644
index 000000000000..23b24af67bdd
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/NativeTemporalStateManagement.java
@@ -0,0 +1,45 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.state.internal;
+
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.metamodel.mapping.AuxiliaryMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.temporal.TemporalTableStrategy;
+
+/**
+ * State management for temporal entities and collections with
+ * {@linkplain TemporalTableStrategy#NATIVE
+ * dialect-native temporary tables}.
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+public final class NativeTemporalStateManagement extends AbstractStateManagement {
+	public static final NativeTemporalStateManagement INSTANCE = new NativeTemporalStateManagement();
+
+	private NativeTemporalStateManagement() {
+	}
+
+	@Override
+	public AuxiliaryMapping createAuxiliaryMapping(
+			EntityPersister persister,
+			RootClass rootClass,
+			MappingModelCreationProcess creationProcess) {
+		return TemporalStateManagement.INSTANCE.createAuxiliaryMapping( persister, rootClass, creationProcess);
+	}
+
+	@Override
+	public AuxiliaryMapping createAuxiliaryMapping(
+			PluralAttributeMapping pluralAttributeMapping,
+			Collection bootDescriptor,
+			MappingModelCreationProcess creationProcess) {
+		return TemporalStateManagement.INSTANCE.createAuxiliaryMapping( pluralAttributeMapping, bootDescriptor, creationProcess);
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/state/internal/SoftDeleteStateManagement.java b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/SoftDeleteStateManagement.java
new file mode 100644
index 000000000000..94a1c27cbd64
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/SoftDeleteStateManagement.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.state.internal;
+
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.metamodel.mapping.AuxiliaryMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.mutation.DeleteCoordinator;
+import org.hibernate.persister.entity.mutation.DeleteCoordinatorSoft;
+
+import static org.hibernate.boot.model.internal.SoftDeleteHelper.resolveSoftDeleteMapping;
+
+/**
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+public final class SoftDeleteStateManagement extends AbstractStateManagement {
+	public static final SoftDeleteStateManagement INSTANCE = new SoftDeleteStateManagement();
+
+	private SoftDeleteStateManagement() {
+	}
+
+	@Override
+	public DeleteCoordinator createDeleteCoordinator(EntityPersister persister) {
+		return new DeleteCoordinatorSoft( persister, persister.getFactory() );
+	}
+
+	@Override
+	public AuxiliaryMapping createAuxiliaryMapping(
+			EntityPersister persister,
+			RootClass rootClass,
+			MappingModelCreationProcess creationProcess) {
+		return resolveSoftDeleteMapping( persister, rootClass, persister.getIdentifierTableName(), creationProcess );
+	}
+
+	@Override
+	public AuxiliaryMapping createAuxiliaryMapping(
+			PluralAttributeMapping pluralAttributeMapping,
+			Collection bootDescriptor,
+			MappingModelCreationProcess creationProcess) {
+		return resolveSoftDeleteMapping( pluralAttributeMapping, bootDescriptor,
+				pluralAttributeMapping.getSeparateCollectionTable(), creationProcess );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/state/internal/StandardStateManagement.java b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/StandardStateManagement.java
new file mode 100644
index 000000000000..b6d4752b61b9
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/StandardStateManagement.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.state.internal;
+
+/**
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+public final class StandardStateManagement extends AbstractStateManagement {
+	public static final StandardStateManagement INSTANCE = new StandardStateManagement();
+
+	private StandardStateManagement() {
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/state/internal/TemporalStateManagement.java b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/TemporalStateManagement.java
new file mode 100644
index 000000000000..4721285d93df
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/state/internal/TemporalStateManagement.java
@@ -0,0 +1,106 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.state.internal;
+
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.TemporalMapping;
+import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
+import org.hibernate.metamodel.mapping.internal.TemporalMappingImpl;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinator;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorNoOp;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinatorTemporal;
+import org.hibernate.persister.entity.AbstractEntityPersister;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.mutation.DeleteCoordinator;
+import org.hibernate.persister.entity.mutation.DeleteCoordinatorTemporal;
+import org.hibernate.persister.entity.mutation.InsertCoordinator;
+import org.hibernate.persister.entity.mutation.InsertCoordinatorTemporal;
+import org.hibernate.persister.entity.mutation.MergeCoordinatorTemporal;
+import org.hibernate.persister.entity.mutation.UpdateCoordinator;
+import org.hibernate.persister.entity.mutation.UpdateCoordinatorTemporal;
+import org.hibernate.temporal.TemporalTableStrategy;
+
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.getTableIdentifierExpression;
+
+/**
+ * State management for temporal entities and collections in the
+ * {@linkplain TemporalTableStrategy#SINGLE_TABLE
+ * single table strategy}.
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+public final class TemporalStateManagement extends AbstractStateManagement {
+	public static final TemporalStateManagement INSTANCE = new TemporalStateManagement();
+
+	private TemporalStateManagement() {
+	}
+
+	@Override
+	public InsertCoordinator createInsertCoordinator(EntityPersister persister) {
+		return new InsertCoordinatorTemporal( persister, persister.getFactory() );
+	}
+
+	@Override
+	public UpdateCoordinator createUpdateCoordinator(EntityPersister persister) {
+		return new UpdateCoordinatorTemporal( persister, persister.getFactory() );
+	}
+
+	@Override
+	public UpdateCoordinator createMergeCoordinator(EntityPersister persister) {
+		return new MergeCoordinatorTemporal( persister, persister.getFactory() );
+	}
+
+	@Override
+	public DeleteCoordinator createDeleteCoordinator(EntityPersister persister) {
+		return new DeleteCoordinatorTemporal( persister, persister.getFactory() );
+	}
+
+	@Override
+	public UpdateRowsCoordinator createUpdateRowsCoordinator(CollectionPersister persister) {
+		if ( !isUpdatePossible( persister ) ) {
+			return new UpdateRowsCoordinatorNoOp( resolveMutationTarget( persister ) );
+		}
+		else if ( persister.isOneToMany() ) {
+			throw new UnsupportedOperationException();
+		}
+		else {
+			return new UpdateRowsCoordinatorTemporal(
+					resolveMutationTarget( persister ),
+					persister.getRowMutationOperations(),
+					persister.getFactory()
+			);
+		}
+	}
+
+	@Override
+	public TemporalMapping createAuxiliaryMapping(
+			EntityPersister persister,
+			RootClass rootClass,
+			MappingModelCreationProcess creationProcess) {
+		final var temporalTable = rootClass.getAuxiliaryTable();
+		final String tableName = temporalTable == null
+				? persister.getIdentifierTableName()
+				: ( (AbstractEntityPersister) persister )
+						.determineTableName( temporalTable );
+		return new TemporalMappingImpl( rootClass, tableName, creationProcess );
+	}
+
+	@Override
+	public TemporalMapping createAuxiliaryMapping(
+			PluralAttributeMapping pluralAttributeMapping,
+			Collection bootDescriptor,
+			MappingModelCreationProcess creationProcess) {
+		final var temporalTable = bootDescriptor.getAuxiliaryTable();
+		final String tableName = temporalTable == null
+				? pluralAttributeMapping.getSeparateCollectionTable()
+				: getTableIdentifierExpression( temporalTable, creationProcess );
+		return new TemporalMappingImpl( bootDescriptor, tableName, creationProcess );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/state/spi/StateManagement.java b/hibernate-core/src/main/java/org/hibernate/persister/state/spi/StateManagement.java
new file mode 100644
index 000000000000..3654a2fe17f1
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/state/spi/StateManagement.java
@@ -0,0 +1,72 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.persister.state.spi;
+
+import org.hibernate.Incubating;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.metamodel.mapping.AuxiliaryMapping;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.collection.mutation.DeleteRowsCoordinator;
+import org.hibernate.persister.collection.mutation.InsertRowsCoordinator;
+import org.hibernate.persister.collection.mutation.RemoveCoordinator;
+import org.hibernate.persister.collection.mutation.UpdateRowsCoordinator;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.mutation.DeleteCoordinator;
+import org.hibernate.persister.entity.mutation.InsertCoordinator;
+import org.hibernate.persister.entity.mutation.UpdateCoordinator;
+import org.hibernate.persister.state.internal.AuditStateManagement;
+import org.hibernate.persister.state.internal.HistoryStateManagement;
+import org.hibernate.persister.state.internal.SoftDeleteStateManagement;
+import org.hibernate.persister.state.internal.StandardStateManagement;
+import org.hibernate.persister.state.internal.TemporalStateManagement;
+
+/**
+ * Aggregates the coordinators for a given state management strategy.
+ * <p>
+ * Every concrete implementation of this interface should declare a
+ * field {@code public static final StateManagement INSTANCE}.
+ *
+ * @author Gavin King
+ *
+ * @see StandardStateManagement
+ * @see SoftDeleteStateManagement
+ * @see TemporalStateManagement
+ * @see HistoryStateManagement
+ * @see AuditStateManagement
+ *
+ * @since 7.4
+ */
+@Incubating
+public interface StateManagement {
+
+	InsertCoordinator createInsertCoordinator(EntityPersister persister);
+
+	UpdateCoordinator createUpdateCoordinator(EntityPersister persister);
+
+	UpdateCoordinator createMergeCoordinator(EntityPersister persister);
+
+	DeleteCoordinator createDeleteCoordinator(EntityPersister persister);
+
+	InsertRowsCoordinator createInsertRowsCoordinator(CollectionPersister persister);
+
+	UpdateRowsCoordinator createUpdateRowsCoordinator(CollectionPersister persister);
+
+	DeleteRowsCoordinator createDeleteRowsCoordinator(CollectionPersister persister);
+
+	RemoveCoordinator createRemoveCoordinator(CollectionPersister persister);
+
+	AuxiliaryMapping createAuxiliaryMapping(
+			EntityPersister persister,
+			RootClass rootClass,
+			MappingModelCreationProcess creationProcess);
+
+	AuxiliaryMapping createAuxiliaryMapping(
+			PluralAttributeMapping pluralAttributeMapping,
+			Collection bootDescriptor,
+			MappingModelCreationProcess creationProcess);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/state/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/persister/state/spi/package-info.java
new file mode 100644
index 000000000000..450452190e40
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/persister/state/spi/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * Extension point for customized state management,
+ * enabling functionality such as soft delete, temporal
+ * data, and audit logging.
+ *
+ * @see org.hibernate.persister.state.spi.StateManagement
+ */
+package org.hibernate.persister.state.spi;
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java
index 11a3f45b0955..f5b77b6f44b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java
@@ -19,25 +19,20 @@
 /**
  * @author Christian Beikov
  */
-public class EntityDomainResultBuilder implements ResultBuilder {
+class EntityDomainResultBuilder implements ResultBuilder {
 
 	private final NavigablePath navigablePath;
 	private final EntityMappingType entityDescriptor;
 	private final FetchBuilderBasicValued discriminatorFetchBuilder;
 
-	public EntityDomainResultBuilder(EntityMappingType entityDescriptor) {
+	EntityDomainResultBuilder(EntityMappingType entityDescriptor) {
 		this.entityDescriptor = entityDescriptor;
 		this.navigablePath = new NavigablePath( entityDescriptor.getEntityName() );
-		final EntityDiscriminatorMapping discriminatorMapping = entityDescriptor.getDiscriminatorMapping();
-		if ( discriminatorMapping == null ) {
-			this.discriminatorFetchBuilder = null;
-		}
-		else {
-			this.discriminatorFetchBuilder = new ImplicitFetchBuilderBasic(
-					navigablePath,
-					discriminatorMapping
-			);
-		}
+		final var discriminatorMapping = entityDescriptor.getDiscriminatorMapping();
+		this.discriminatorFetchBuilder =
+				discriminatorMapping == null
+						? null
+						: new ImplicitFetchBuilderBasic( navigablePath, discriminatorMapping );
 	}
 
 	@Override
@@ -51,12 +46,12 @@ public ResultBuilder cacheKeyInstance() {
 	}
 
 	@Override
-	public EntityResult buildResult(
+	public EntityResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
 
-		return new EntityResultImpl(
+		return new EntityResultImpl<>(
 				navigablePath,
 				entityDescriptor,
 				null,
@@ -77,16 +72,16 @@ public EntityResult buildResult(
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof EntityDomainResultBuilder that ) ) {
 			return false;
 		}
-
-		final EntityDomainResultBuilder that = (EntityDomainResultBuilder) o;
-		return entityDescriptor.equals( that.entityDescriptor );
+		else {
+			return entityDescriptor.equals( that.entityDescriptor );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java
index fce45e336280..2de0be02215b 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java
@@ -17,23 +17,20 @@
 import org.hibernate.sql.exec.internal.JdbcCallParameterExtractorImpl;
 import org.hibernate.sql.exec.internal.JdbcCallRefCursorExtractorImpl;
 import org.hibernate.sql.exec.spi.JdbcCallFunctionReturn;
-import org.hibernate.type.BasicType;
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import jakarta.persistence.ParameterMode;
 
 /**
  * @author Steve Ebersole
  */
-public class FunctionReturnImpl<T> implements FunctionReturnImplementor<T> {
+class FunctionReturnImpl<T> implements FunctionReturnImplementor<T> {
 
 	private final ProcedureCallImplementor<T> procedureCall;
 	private final int sqlTypeCode;
 
 	private OutputableType<T> ormType;
 
-	public FunctionReturnImpl(ProcedureCallImplementor<T> procedureCall, int sqlTypeCode) {
+	FunctionReturnImpl(ProcedureCallImplementor<T> procedureCall, int sqlTypeCode) {
 		this.procedureCall = procedureCall;
 		this.sqlTypeCode = sqlTypeCode;
 	}
@@ -67,11 +64,11 @@ private OutputableType<T> getOrmType(SharedSessionContractImplementor persistenc
 			return ormType;
 		}
 		else {
-			final TypeConfiguration typeConfiguration = persistenceContext.getFactory().getTypeConfiguration();
-			final JavaType<?> javaType =
+			final var typeConfiguration = persistenceContext.getFactory().getTypeConfiguration();
+			final var javaType =
 					typeConfiguration.getJdbcTypeRegistry().getDescriptor( getJdbcTypeCode() )
-							.getJdbcRecommendedJavaTypeMapping( null, null, typeConfiguration );
-			final BasicType<?> basicType =
+							.getRecommendedJavaType( null, null, typeConfiguration );
+			final var basicType =
 					typeConfiguration.standardBasicTypeForJavaType( javaType.getJavaTypeClass() );
 			//noinspection unchecked
 			return (OutputableType<T>) basicType;
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java
index 798d3f729b57..17f2f6dd7c0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java
@@ -16,6 +16,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+import jakarta.persistence.AttributeConverter;
 import org.hibernate.HibernateException;
 import org.hibernate.LockOptions;
 import org.hibernate.ScrollMode;
@@ -31,11 +32,13 @@
 import org.hibernate.procedure.ProcedureOutputs;
 import org.hibernate.procedure.spi.FunctionReturnImplementor;
 import org.hibernate.procedure.spi.NamedCallableQueryMemento;
+import org.hibernate.procedure.spi.NamedCallableQueryMemento.ParameterMemento;
 import org.hibernate.procedure.spi.ParameterStrategy;
 import org.hibernate.procedure.spi.ProcedureCallImplementor;
 import org.hibernate.procedure.spi.ProcedureParameterImplementor;
 import org.hibernate.query.KeyedPage;
 import org.hibernate.query.KeyedResultList;
+import org.hibernate.query.spi.ProcedureParameterMetadataImplementor;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryCall;
@@ -50,8 +53,6 @@
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.spi.QueryParameterBindings;
 import org.hibernate.query.spi.ScrollableResultsImplementor;
-import org.hibernate.query.sqm.SqmExpressible;
-import org.hibernate.result.Output;
 import org.hibernate.result.ResultSetOutput;
 import org.hibernate.result.UpdateCountOutput;
 import org.hibernate.result.internal.OutputsExecutionContext;
@@ -78,6 +79,7 @@
 import jakarta.persistence.metamodel.Type;
 
 import static java.lang.Boolean.parseBoolean;
+import static java.lang.Integer.parseInt;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
@@ -89,6 +91,7 @@
 import static org.hibernate.jpa.HibernateHints.HINT_CALLABLE_FUNCTION_RETURN_TYPE;
 import static org.hibernate.procedure.internal.NamedCallableQueryMementoImpl.ParameterMementoImpl.fromRegistration;
 import static org.hibernate.procedure.internal.Util.resolveResultSetMappingClasses;
+import static org.hibernate.procedure.internal.Util.resolveResultSetMappingNames;
 import static org.hibernate.procedure.internal.Util.resolveResultSetMappings;
 import static org.hibernate.query.results.ResultSetMapping.resolveResultSetMapping;
 
@@ -105,7 +108,7 @@ public class ProcedureCallImpl<R>
 
 	private FunctionReturnImpl<R> functionReturn;
 
-	private final ProcedureParameterMetadataImpl parameterMetadata;
+	private final ProcedureParameterMetadataImplementor parameterMetadata;
 	private final ProcedureParamBindings parameterBindings;
 
 	private final ResultSetMapping resultSetMapping;
@@ -117,29 +120,46 @@ public class ProcedureCallImpl<R>
 	private ProcedureOutputsImpl outputs;
 
 	private static String mappingId(String procedureName, Class<?>[] resultClasses) {
+		assert resultClasses != null && resultClasses.length > 0;
 		return procedureName + ":" + join( ",", resultClasses );
 	}
 
 	private static String mappingId(String procedureName, String[] resultSetMappingNames) {
+		assert resultSetMappingNames != null && resultSetMappingNames.length > 0;
 		return procedureName + ":" + join( ",", resultSetMappingNames );
 	}
 
+	private void registerParameters(SharedSessionContractImplementor session, NamedCallableQueryMemento memento) {
+		for ( var parameterMemento : memento.getParameterMementos() ) {
+			registerParameter( parameterMemento.resolve( session ) );
+		}
+	}
+
+	private ProcedureCallImpl(
+			SharedSessionContractImplementor session,
+			String procedureName,
+			String resultSetMappingName,
+			boolean resultSetMappingDynamic,
+			Set<String> synchronizedQuerySpaces) {
+		super( session );
+		this.procedureName = procedureName;
+		this.synchronizedQuerySpaces = synchronizedQuerySpaces;
+		final var factory = session.getSessionFactory();
+		resultSetMapping = resolveResultSetMapping( resultSetMappingName, resultSetMappingDynamic, factory );
+		parameterMetadata = new ProcedureParameterMetadataImpl();
+		parameterBindings = new ProcedureParamBindings( parameterMetadata, factory );
+	}
+
 	/**
 	 * The no-returns form.
 	 *
 	 * @param session The session
 	 * @param procedureName The name of the procedure to call
 	 */
-	public ProcedureCallImpl(SharedSessionContractImplementor session, String procedureName) {
-		super( session );
-		this.procedureName = procedureName;
-
-		parameterMetadata = new ProcedureParameterMetadataImpl();
-		parameterBindings = new ProcedureParamBindings( parameterMetadata, getSessionFactory() );
-
-		resultSetMapping = resolveResultSetMapping( procedureName, true, session.getSessionFactory() );
-
-		synchronizedQuerySpaces = null;
+	public ProcedureCallImpl(
+			SharedSessionContractImplementor session,
+			String procedureName) {
+		this( session, procedureName, procedureName, true, null );
 	}
 
 	/**
@@ -149,22 +169,14 @@ public ProcedureCallImpl(SharedSessionContractImplementor session, String proced
 	 * @param procedureName The name of the procedure to call
 	 * @param resultClasses The classes making up the result
 	 */
-	public ProcedureCallImpl(SharedSessionContractImplementor session, String procedureName, Class<?>... resultClasses) {
-		super( session );
-
-		assert resultClasses != null && resultClasses.length > 0;
-
-		this.procedureName = procedureName;
-
-		final var factory = session.getSessionFactory();
-
-		parameterMetadata = new ProcedureParameterMetadataImpl();
-		parameterBindings = new ProcedureParamBindings( parameterMetadata, factory );
-
-		synchronizedQuerySpaces = new HashSet<>();
-
-		resultSetMapping = resolveResultSetMapping( mappingId( procedureName, resultClasses ), factory );
-
+	public ProcedureCallImpl(
+			SharedSessionContractImplementor session,
+			String procedureName,
+			Class<?>... resultClasses) {
+		this( session, procedureName,
+				mappingId( procedureName, resultClasses ),
+				false,
+				new HashSet<>() );
 		resolveResultSetMappingClasses(
 				resultClasses,
 				resultSetMapping,
@@ -184,22 +196,11 @@ public ProcedureCallImpl(
 			final SharedSessionContractImplementor session,
 			String procedureName,
 			String... resultSetMappingNames) {
-		super( session );
-
-		assert resultSetMappingNames != null && resultSetMappingNames.length > 0;
-
-		this.procedureName = procedureName;
-
-		final var factory = session.getSessionFactory();
-
-		parameterMetadata = new ProcedureParameterMetadataImpl();
-		parameterBindings = new ProcedureParamBindings( parameterMetadata, factory );
-
-		synchronizedQuerySpaces = new HashSet<>();
-
-		resultSetMapping = resolveResultSetMapping( mappingId( procedureName, resultSetMappingNames ), factory );
-
-		Util.resolveResultSetMappingNames(
+		this( session, procedureName,
+				mappingId( procedureName, resultSetMappingNames ),
+				false,
+				new HashSet<>() );
+		resolveResultSetMappingNames(
 				resultSetMappingNames,
 				resultSetMapping,
 				synchronizedQuerySpaces::add,
@@ -213,20 +214,13 @@ public ProcedureCallImpl(
 	 * @param session The session
 	 * @param memento The named/stored memento
 	 */
-	ProcedureCallImpl(SharedSessionContractImplementor session, NamedCallableQueryMemento memento) {
-		super( session );
-
-		procedureName = memento.getCallableName();
-
-		final var factory = session.getSessionFactory();
-
-		parameterMetadata = new ProcedureParameterMetadataImpl( memento, session );
-		parameterBindings = new ProcedureParamBindings( parameterMetadata, factory );
-
-		synchronizedQuerySpaces = makeCopy( memento.getQuerySpaces() );
-
-		resultSetMapping = resolveResultSetMapping( memento.getRegistrationName(), factory );
-
+	ProcedureCallImpl(
+			SharedSessionContractImplementor session,
+			NamedCallableQueryMemento memento) {
+		this( session, memento.getCallableName(),
+				memento.getRegistrationName(),
+				false,
+				makeCopy( memento.getQuerySpaces() ) );
 		resolveResultSetMappings(
 				memento.getResultSetMappingNames(),
 				memento.getResultSetMappingClasses(),
@@ -234,7 +228,7 @@ public ProcedureCallImpl(
 				synchronizedQuerySpaces::add,
 				this::getSessionFactory
 		);
-
+		registerParameters( session, memento );
 		applyOptions( memento );
 	}
 
@@ -248,19 +242,10 @@ public ProcedureCallImpl(
 			SharedSessionContractImplementor session,
 			NamedCallableQueryMemento memento,
 			Class<?>... resultTypes) {
-		super( session );
-
-		procedureName = memento.getCallableName();
-
-		final var factory = session.getSessionFactory();
-
-		parameterMetadata = new ProcedureParameterMetadataImpl( memento, session );
-		parameterBindings = new ProcedureParamBindings( parameterMetadata, factory );
-
-		synchronizedQuerySpaces = makeCopy( memento.getQuerySpaces() );
-
-		resultSetMapping = resolveResultSetMapping( mappingId( procedureName, resultTypes ), factory );
-
+		this( session, memento.getCallableName(),
+				mappingId( memento.getCallableName(), resultTypes ),
+				false,
+				makeCopy( memento.getQuerySpaces() ) );
 		resolveResultSetMappings(
 				null,
 				resultTypes,
@@ -268,7 +253,7 @@ public ProcedureCallImpl(
 				synchronizedQuerySpaces::add,
 				this::getSessionFactory
 		);
-
+		registerParameters( session, memento );
 		applyOptions( memento );
 	}
 
@@ -276,19 +261,10 @@ public ProcedureCallImpl(
 			SharedSessionContractImplementor session,
 			NamedCallableQueryMementoImpl memento,
 			String... resultSetMappingNames) {
-		super( session );
-
-		procedureName = memento.getCallableName();
-
-		final var factory = session.getSessionFactory();
-
-		parameterMetadata = new ProcedureParameterMetadataImpl( memento, session );
-		parameterBindings = new ProcedureParamBindings( parameterMetadata, factory );
-
-		synchronizedQuerySpaces = makeCopy( memento.getQuerySpaces() );
-
-		resultSetMapping = resolveResultSetMapping( mappingId( procedureName, resultSetMappingNames ), factory );
-
+		this( session, memento.getCallableName(),
+				mappingId( memento.getCallableName(), resultSetMappingNames ),
+				false,
+				makeCopy( memento.getQuerySpaces() ) );
 		resolveResultSetMappings(
 				resultSetMappingNames,
 				null,
@@ -296,7 +272,7 @@ public ProcedureCallImpl(
 				synchronizedQuerySpaces::add,
 				this::getSessionFactory
 		);
-
+		registerParameters( session, memento );
 		applyOptions( memento );
 	}
 
@@ -332,7 +308,7 @@ public MutableQueryOptions getQueryOptions() {
 	}
 
 	@Override
-	public ProcedureParameterMetadataImpl getParameterMetadata() {
+	public ProcedureParameterMetadataImplementor getParameterMetadata() {
 		return parameterMetadata;
 	}
 
@@ -369,7 +345,7 @@ private void markAsFunctionCallRefRefCursor() {
 	public ProcedureCallImpl<R> markAsFunctionCall(Class<?> resultType) {
 		final var basicType = getTypeConfiguration().getBasicTypeForJavaType( resultType );
 		if ( basicType == null ) {
-			throw new IllegalArgumentException( "Could not resolve a BasicType for the java type: " + resultType.getName() );
+			throw new IllegalArgumentException( "Could not resolve a BasicType for the Java type: " + resultType.getName() );
 		}
 		markAsFunctionCall( basicType );
 		return this;
@@ -381,7 +357,7 @@ public ProcedureCall markAsFunctionCall(Type<?> typeReference) {
 			throw new IllegalArgumentException( "Given type is not an OutputableType: " + typeReference );
 		}
 		if ( resultSetMapping.getNumberOfResultBuilders() == 0 ) {
-			final SqmExpressible<?> expressible = resolveExpressible( typeReference );
+			final var expressible = resolveExpressible( typeReference );
 			// Function returns might not be represented as callable parameters,
 			// but we still want to convert the result to the requested java type if possible
 			resultSetMapping.addResultBuilder( new ScalarDomainResultBuilder<>( expressible.getExpressibleJavaType() ) );
@@ -414,7 +390,13 @@ public QueryParameterBindings getParameterBindings() {
 	public ProcedureCallImplementor<R> registerStoredProcedureParameter(int position, Class<?> type, ParameterMode mode) {
 		getSession().checkOpen( true );
 		try {
-			registerParameter( position, type, mode );
+			if ( AttributeConverter.class.isAssignableFrom( type ) ) {
+				// Hack to deal with HHH-12661
+				registerParameterWithConverter( position, getConvertedType( type ), mode );
+			}
+			else {
+				registerParameter( position, type, mode );
+			}
 		}
 		catch (HibernateException he) {
 			throw getExceptionConverter().convert( he );
@@ -433,7 +415,13 @@ public ProcedureCallImplementor<R> registerStoredProcedureParameter(
 			ParameterMode mode) {
 		getSession().checkOpen( true );
 		try {
-			registerParameter( parameterName, type, mode );
+			if ( AttributeConverter.class.isAssignableFrom( type ) ) {
+				// Hack to deal with HHH-12661
+				registerParameterWithConverter( parameterName, getConvertedType( type ), mode );
+			}
+			else {
+				registerParameter( parameterName, type, mode );
+			}
 		}
 		catch (HibernateException he) {
 			throw getExceptionConverter().convert( he );
@@ -445,6 +433,34 @@ public ProcedureCallImplementor<R> registerStoredProcedureParameter(
 		return this;
 	}
 
+	private BasicType<?> getConvertedType(Class<?> type) {
+		final var convertedType =
+				getNodeBuilder().getTypeConfiguration().getBasicTypeRegistry()
+						.getRegisteredType( type.getTypeName() );
+		if ( convertedType == null ) {
+			throw new IllegalArgumentException( "Unregistered converter type: " + type.getName() );
+		}
+		return convertedType;
+	}
+
+	private <C> void registerParameterWithConverter(int position, BasicType<C> convertedType, ParameterMode mode) {
+		registerParameter( new ProcedureParameterImpl<>(
+				position,
+				mode,
+				getExpressibleJavaType( convertedType ),
+				convertedType
+		) );
+	}
+
+	private <C> void registerParameterWithConverter(String name, BasicType<C> convertedType, ParameterMode mode) {
+		registerParameter( new ProcedureParameterImpl<>(
+				name,
+				mode,
+				getExpressibleJavaType( convertedType ),
+				convertedType
+		) );
+	}
+
 	@Override
 	public ProcedureCallImplementor<R> registerStoredProcedureParameter(
 			int position,
@@ -510,12 +526,12 @@ private <T> SqmBindableType<T> resolveExpressible(Type<T> typeReference) {
 	}
 
 	private void registerParameter(ProcedureParameterImplementor<?> parameter) {
-		getParameterMetadata().registerParameter( parameter );
+		parameterMetadata.registerParameter( parameter );
 	}
 
 	@Override
 	public ProcedureParameterImplementor<?> getParameterRegistration(int position) {
-		return getParameterMetadata().getQueryParameter( position );
+		return parameterMetadata.getQueryParameter( position );
 	}
 
 	@Override
@@ -556,12 +572,12 @@ public <T> ProcedureParameterImplementor<T> registerParameter(
 
 	@Override
 	public ProcedureParameterImplementor<?> getParameterRegistration(String name) {
-		return getParameterMetadata().getQueryParameter( name );
+		return parameterMetadata.getQueryParameter( name );
 	}
 
 	@Override
 	public List<ProcedureParameter<?>> getRegisteredParameters() {
-		return unmodifiableList( getParameterMetadata().getRegistrationsAsList() );
+		return unmodifiableList( parameterMetadata.getRegistrationsAsList() );
 	}
 
 	@Override
@@ -651,8 +667,9 @@ private ProcedureOutputsImpl buildOutputs() {
 
 	private Map<ProcedureParameter<?>, JdbcCallParameterRegistration> collectParameterRegistrations(JdbcOperationQueryCall call) {
 		final Map<ProcedureParameter<?>, JdbcCallParameterRegistration> parameterRegistrations = new IdentityHashMap<>();
-		if ( call.getFunctionReturn() != null ) {
-			parameterRegistrations.put( functionReturn, call.getFunctionReturn() );
+		final var funReturn = call.getFunctionReturn();
+		if ( funReturn != null ) {
+			parameterRegistrations.put( functionReturn, funReturn );
 		}
 		final var registrations = getParameterMetadata().getRegistrationsAsList();
 		final var jdbcParameters = call.getParameterRegistrations();
@@ -665,8 +682,9 @@ private Map<ProcedureParameter<?>, JdbcCallParameterRegistration> collectParamet
 
 	private List<JdbcCallRefCursorExtractor> collectRefCursorExtractors(JdbcOperationQueryCall call) {
 		final List<JdbcCallRefCursorExtractor> refCursorExtractors = new ArrayList<>();
-		if ( call.getFunctionReturn() != null ) {
-			final var refCursorExtractor = call.getFunctionReturn().getRefCursorExtractor();
+		final var funReturn = call.getFunctionReturn();
+		if ( funReturn != null ) {
+			final var refCursorExtractor = funReturn.getRefCursorExtractor();
 			if ( refCursorExtractor != null ) {
 				refCursorExtractors.add( refCursorExtractor );
 			}
@@ -674,8 +692,7 @@ private List<JdbcCallRefCursorExtractor> collectRefCursorExtractors(JdbcOperatio
 		final var registrations = getParameterMetadata().getRegistrationsAsList();
 		final var jdbcParameters = call.getParameterRegistrations();
 		for ( int i = 0; i < registrations.size(); i++ ) {
-			final var jdbcCallParameterRegistration = jdbcParameters.get( i );
-			final var refCursorExtractor = jdbcCallParameterRegistration.getRefCursorExtractor();
+			final var refCursorExtractor = jdbcParameters.get( i ).getRefCursorExtractor();
 			if ( refCursorExtractor != null ) {
 				refCursorExtractors.add( refCursorExtractor );
 			}
@@ -685,7 +702,7 @@ private List<JdbcCallRefCursorExtractor> collectRefCursorExtractors(JdbcOperatio
 
 	private JdbcParameterBindings parameterBindings(
 			Map<ProcedureParameter<?>, JdbcCallParameterRegistration> parameterRegistrations) {
-		final JdbcParameterBindings jdbcParameterBindings =
+		final var jdbcParameterBindings =
 				new JdbcParameterBindingsImpl( parameterRegistrations.size() );
 		for ( var entry : parameterRegistrations.entrySet() ) {
 			final var registration = entry.getValue();
@@ -694,20 +711,18 @@ private JdbcParameterBindings parameterBindings(
 				final var parameter = entry.getKey();
 				final var binding = getParameterBindings().getBinding( parameter );
 				if ( !binding.isBound() ) {
-					if ( parameter.getPosition() == null ) {
-						throw new IllegalArgumentException( "The parameter named [" + parameter + "] was not set! You need to call the setParameter method." );
+					if ( parameter.isNamed() ) {
+						throw new IllegalArgumentException( "The parameter named '" + parameter + "' was not set" );
 					}
 					else {
-						throw new IllegalArgumentException( "The parameter at position [" + parameter + "] was not set! You need to call the setParameter method." );
+						throw new IllegalArgumentException( "The parameter at position " + parameter + " was not set" );
 					}
 				}
 				final var parameterType = (JdbcMapping) registration.getParameterType();
 				jdbcParameterBindings.addBinding(
 						(JdbcParameter) parameterBinder,
-						new JdbcParameterBindingImpl(
-								parameterType,
-								parameterType.convertToRelationalValue( binding.getBindValue() )
-						)
+						new JdbcParameterBindingImpl( parameterType,
+								parameterType.convertToRelationalValue( binding.getBindValue() ) )
 				);
 			}
 		}
@@ -785,14 +800,13 @@ public NamedCallableQueryMemento toMemento(String name) {
 		);
 	}
 
-	private static List<NamedCallableQueryMemento.ParameterMemento> toParameterMementos(
-			ProcedureParameterMetadataImpl parameterMetadata) {
+	private static List<ParameterMemento> toParameterMementos(
+			ProcedureParameterMetadataImplementor parameterMetadata) {
 		if ( parameterMetadata.getParameterStrategy() == ParameterStrategy.UNKNOWN ) {
-			// none...
 			return emptyList();
 		}
 		else {
-			final List<NamedCallableQueryMemento.ParameterMemento> mementos = new ArrayList<>();
+			final List<ParameterMemento> mementos = new ArrayList<>();
 			parameterMetadata.visitRegistrations(
 					queryParameter -> mementos.add(
 							fromRegistration( (ProcedureParameterImplementor<?>) queryParameter ) )
@@ -815,12 +829,10 @@ public Query<R> applyGraph(@SuppressWarnings("rawtypes") RootGraph graph, GraphS
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// outputs
 
-	private ProcedureOutputs procedureResult;
-
 	@Override
 	public boolean execute() {
 		try {
-			return outputs().getCurrent() instanceof ResultSetOutput;
+			return getOutputs().getCurrent() instanceof ResultSetOutput;
 		}
 		catch (NoMoreOutputsException e) {
 			return false;
@@ -834,30 +846,23 @@ public boolean execute() {
 		}
 	}
 
-	protected ProcedureOutputs outputs() {
-		if ( procedureResult == null ) {
-			procedureResult = getOutputs();
-		}
-		return procedureResult;
-	}
-
 	@Override
 	protected int doExecuteUpdate() {
-		// the expectation is that there is just one Output, of type UpdateCountOutput
+		// The expectation is that there is just one Output, of type UpdateCountOutput
 		try {
 			execute();
 			return getUpdateCount();
 		}
 		finally {
-			outputs().release();
+			getOutputs().release();
 		}
 	}
 
 	@Override
 	public Object getOutputParameterValue(int position) {
-		// NOTE : according to spec (specifically), an exception thrown from this method should not mark for rollback.
+		// According to spec, an exception thrown from this method should not mark for rollback.
 		try {
-			return outputs().getOutputParameterValue( position );
+			return getOutputs().getOutputParameterValue( position );
 		}
 		catch (ParameterStrategyException e) {
 			throw new IllegalArgumentException( "Invalid mix of named and positional parameters", e );
@@ -869,9 +874,9 @@ public Object getOutputParameterValue(int position) {
 
 	@Override
 	public Object getOutputParameterValue(String parameterName) {
-		// NOTE : according to spec (specifically), an exception thrown from this method should not mark for rollback.
+		// According to spec, an exception thrown from this method should not mark for rollback.
 		try {
-			return outputs().getOutputParameterValue( parameterName );
+			return getOutputs().getOutputParameterValue( parameterName );
 		}
 		catch (ParameterStrategyException e) {
 			throw new IllegalArgumentException( "Invalid mix of named and positional parameters", e );
@@ -883,17 +888,19 @@ public Object getOutputParameterValue(String parameterName) {
 
 	@Override
 	public boolean hasMoreResults() {
-		return outputs().goToNext() && outputs().getCurrent() instanceof ResultSetOutput;
+		final var outputs = getOutputs();
+		return outputs.goToNext()
+			&& outputs.getCurrent() instanceof ResultSetOutput;
 	}
 
 	@Override
 	public int getUpdateCount() {
 		try {
-			final Output rtn = outputs().getCurrent();
-			if ( rtn == null ) {
+			final var output = getOutputs().getCurrent();
+			if ( output == null ) {
 				return -1;
 			}
-			else if ( rtn instanceof UpdateCountOutput updateCount ) {
+			else if ( output instanceof UpdateCountOutput updateCount ) {
 				return updateCount.getUpdateCount();
 			}
 			else {
@@ -919,7 +926,7 @@ protected List<R> doList() {
 		}
 		else {
 			try {
-				if ( outputs().getCurrent() instanceof ResultSetOutput<?> resultSetOutput ) {
+				if ( getOutputs().getCurrent() instanceof ResultSetOutput<?> resultSetOutput ) {
 					return ((ResultSetOutput<R>) resultSetOutput).getResultList();
 				}
 				else {
@@ -928,9 +935,9 @@ protected List<R> doList() {
 				}
 			}
 			catch (NoMoreOutputsException e) {
-				// todo : the spec is completely silent on these type of edge-case scenarios.
-				// Essentially here we'd have a case where there are no more results (ResultSets nor updateCount) but
-				// getResultList was called.
+				// TODO: the spec is completely silent on these type of edge-case scenarios.
+				// Essentially here we'd have a case where there are no more results
+				// (ResultSets nor updateCount) but getResultList() was called.
 				return null;
 			}
 			catch (HibernateException he) {
@@ -972,22 +979,13 @@ public List<R> getResultList() {
 	public R getSingleResult() {
 		final var resultList = getResultList();
 		if ( resultList == null || resultList.isEmpty() ) {
-			throw new NoResultException(
-					String.format(
-							"Call to stored procedure [%s] returned no results",
-							getProcedureName()
-					)
-			);
+			throw new NoResultException( "Call to stored procedure '" + getProcedureName()
+										+ "' returned no results" );
 		}
 		else if ( resultList.size() > 1 ) {
-			throw new NonUniqueResultException(
-					String.format(
-							"Call to stored procedure [%s] returned multiple results",
-							getProcedureName()
-					)
-			);
+			throw new NonUniqueResultException( "Call to stored procedure '" + getProcedureName()
+												+ "' returned multiple results" );
 		}
-
 		return resultList.get( 0 );
 	}
 
@@ -998,14 +996,9 @@ public R getSingleResultOrNull() {
 			return null;
 		}
 		else if ( resultList.size() > 1 ) {
-			throw new NonUniqueResultException(
-					String.format(
-							"Call to stored procedure [%s] returned multiple results",
-							getProcedureName()
-					)
-			);
+			throw new NonUniqueResultException( "Call to stored procedure '" + getProcedureName()
+												+ "' returned multiple results" );
 		}
-
 		return resultList.get( 0 );
 	}
 
@@ -1046,7 +1039,7 @@ public <T> T unwrap(Class<T> type) {
 	public ProcedureCallImplementor<R> setLockMode(LockModeType lockMode) {
 		// the JPA spec requires IllegalStateException here, even
 		// though it's logically an UnsupportedOperationException
-		throw new IllegalStateException( "Illegal attempt to set lock mode for a procedure calls" );
+		throw new IllegalStateException( "Illegal attempt to set lock mode for a procedure call" );
 	}
 
 	@Override
@@ -1062,7 +1055,7 @@ public ProcedureCallImplementor<R> setTimeout(Integer timeout) {
 	public LockModeType getLockMode() {
 		// the JPA spec requires IllegalStateException here, even
 		// though it's logically an UnsupportedOperationException
-		throw new IllegalStateException( "Illegal attempt to get lock mode on a native-query" );
+		throw new IllegalStateException( "Illegal attempt to get lock mode for a procedure call" );
 	}
 
 	@Override @Deprecated
@@ -1070,39 +1063,33 @@ public QueryImplementor<R> setLockOptions(LockOptions lockOptions) {
 		throw new UnsupportedOperationException( "setLockOptions does not apply to procedure calls" );
 	}
 
-	@Override
+	@Override @SuppressWarnings("resource")
 	public ProcedureCallImplementor<R> setHint(String hintName, Object value) {
 		switch ( hintName ) {
 			case HINT_CALLABLE_FUNCTION:
-				if ( value != null ) {
-					if ( value instanceof Boolean bool ) {
-						if ( bool ) {
-							applyCallableFunctionHint();
-						}
-					}
-					else if ( parseBoolean( value.toString() ) ) {
-						applyCallableFunctionHint();
-					}
+				if ( value instanceof Boolean bool && bool
+					|| value instanceof String string && parseBoolean( string ) ) {
+					applyCallableFunctionHint();
+				}
+				else {
+					throw new IllegalArgumentException( "Illegal value for hint '" + hintName + "'" );
 				}
 				break;
 			case HINT_CALLABLE_FUNCTION_RETURN_TYPE:
-				if ( value != null ) {
-					if ( value instanceof Integer code ) {
-						//noinspection resource
-						markAsFunctionCall( code );
-					}
-					else if ( value instanceof Type<?> type ) {
-						//noinspection resource
-						markAsFunctionCall( type );
-					}
-					else if ( value instanceof Class<?> type ) {
-						//noinspection resource
-						markAsFunctionCall( type );
-					}
-					else {
-						//noinspection resource
-						markAsFunctionCall( Integer.parseInt( value.toString() ) );
-					}
+				if ( value instanceof Integer code ) {
+					markAsFunctionCall( code );
+				}
+				else if ( value instanceof Type<?> type ) {
+					markAsFunctionCall( type );
+				}
+				else if ( value instanceof Class<?> type ) {
+					markAsFunctionCall( type );
+				}
+				else if ( value instanceof String string ) {
+					markAsFunctionCall( parseInt( string ) );
+				}
+				else {
+					throw new IllegalArgumentException( "Illegal value for hint '" + hintName + "'" );
 				}
 				break;
 			default:
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java
index d4686e03774f..5e7942736e49 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureOutputsImpl.java
@@ -5,7 +5,6 @@
 package org.hibernate.procedure.internal;
 
 import java.sql.CallableStatement;
-import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -26,7 +25,7 @@
  *
  * @author Steve Ebersole
  */
-public class ProcedureOutputsImpl extends OutputsImpl implements ProcedureOutputs {
+class ProcedureOutputsImpl extends OutputsImpl implements ProcedureOutputs {
 	private final ProcedureCallImpl<?> procedureCall;
 	private final CallableStatement callableStatement;
 
@@ -53,7 +52,7 @@ public <T> T getOutputParameterValue(ProcedureParameter<T> parameter) {
 		if ( parameter.getMode() == ParameterMode.IN ) {
 			throw new ParameterMisuseException( "IN parameter not valid for output extraction" );
 		}
-		final JdbcCallParameterRegistration registration = parameterRegistrations.get( parameter );
+		final var registration = parameterRegistrations.get( parameter );
 		if ( registration == null ) {
 			throw new IllegalArgumentException( "Parameter [" + parameter + "] is not registered with this procedure call" );
 		}
@@ -108,7 +107,7 @@ private ProcedureCurrentReturnState(boolean isResultSet, int updateCount, int re
 		@Override
 		public boolean indicatesMoreOutputs() {
 			return super.indicatesMoreOutputs()
-					|| ProcedureOutputsImpl.this.refCursorParamIndex < refCursorParameters.length;
+				|| ProcedureOutputsImpl.this.refCursorParamIndex < refCursorParameters.length;
 		}
 
 		@Override
@@ -118,8 +117,8 @@ protected boolean hasExtendedReturns() {
 
 		@Override
 		protected Output buildExtendedReturn() {
-			final JdbcCallRefCursorExtractor refCursorParam = refCursorParameters[ProcedureOutputsImpl.this.refCursorParamIndex++];
-			final ResultSet resultSet = refCursorParam.extractResultSet(
+			final var refCursorParam = refCursorParameters[ProcedureOutputsImpl.this.refCursorParamIndex++];
+			final var resultSet = refCursorParam.extractResultSet(
 					callableStatement,
 					procedureCall.getSession()
 			);
@@ -133,13 +132,14 @@ protected boolean hasFunctionReturns() {
 
 		@Override
 		protected Output buildFunctionReturn() {
-			final Object result = parameterRegistrations.get( procedureCall.getFunctionReturn() )
-					.getParameterExtractor()
-					.extractValue(
-							callableStatement,
-							false,
-							procedureCall.getSession()
-					);
+			final Object result =
+					parameterRegistrations.get( procedureCall.getFunctionReturn() )
+							.getParameterExtractor()
+							.extractValue(
+									callableStatement,
+									false,
+									procedureCall.getSession()
+							);
 			final List<Object> results = new ArrayList<>( 1 );
 			results.add( result );
 			return buildResultSetOutput( () -> results );
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java
index f53fb220006a..6c2deaf960c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java
@@ -14,6 +14,7 @@
 import org.hibernate.procedure.spi.ProcedureParameterBinding;
 import org.hibernate.procedure.spi.ProcedureParameterImplementor;
 import org.hibernate.query.QueryParameter;
+import org.hibernate.query.spi.ProcedureParameterMetadataImplementor;
 import org.hibernate.query.spi.QueryParameterBinding;
 import org.hibernate.query.spi.QueryParameterBindings;
 import org.hibernate.query.spi.QueryParameterImplementor;
@@ -29,87 +30,87 @@ public class ProcedureParamBindings implements QueryParameterBindings {
 
 	private static final Logger LOG = Logger.getLogger( QueryParameterBindings.class );
 
-	private final ProcedureParameterMetadataImpl parameterMetadata;
+	private final ProcedureParameterMetadataImplementor parameterMetadata;
 	private final SessionFactoryImplementor sessionFactory;
 
 	private final Map<ProcedureParameterImplementor<?>, ProcedureParameterBinding<?>> bindingMap = new HashMap<>();
 
 	public ProcedureParamBindings(
-			ProcedureParameterMetadataImpl parameterMetadata,
+			ProcedureParameterMetadataImplementor parameterMetadata,
 			SessionFactoryImplementor sessionFactory) {
 		this.parameterMetadata = parameterMetadata;
 		this.sessionFactory = sessionFactory;
 	}
 
-	public ProcedureParameterMetadataImpl getParameterMetadata() {
+	public ProcedureParameterMetadataImplementor getParameterMetadata() {
 		return parameterMetadata;
 	}
 
 	@Override
 	public boolean isBound(QueryParameterImplementor<?> parameter) {
-		//noinspection SuspiciousMethodCalls
-		return bindingMap.containsKey( parameter );
+		return parameter instanceof ProcedureParameterImplementor<?>
+			&& bindingMap.containsKey( parameter );
 	}
 
 	@Override
 	public <P> ProcedureParameterBinding<P> getBinding(QueryParameterImplementor<P> parameter) {
-		return getQueryParamerBinding( (ProcedureParameterImplementor<P>) parameter );
+		return getQueryParameterBinding( (ProcedureParameterImplementor<P>) parameter );
 	}
 
-	public <P> ProcedureParameterBinding<P> getQueryParamerBinding(ProcedureParameterImplementor<P> parameter) {
+	public <P> ProcedureParameterBinding<P> getQueryParameterBinding(ProcedureParameterImplementor<P> parameter) {
 		final var procParam = parameterMetadata.resolve( parameter );
-		var binding = bindingMap.get( procParam );
+		final var binding = bindingMap.get( procParam );
 		if ( binding == null ) {
 			if ( !parameterMetadata.containsReference( parameter ) ) {
 				throw new IllegalArgumentException( "Passed parameter is not registered with this query" );
 			}
-			binding = new ProcedureParameterBindingImpl<>( procParam, sessionFactory );
-			bindingMap.put( procParam, binding );
+			final var parameterBinding = new ProcedureParameterBindingImpl<>( procParam, sessionFactory );
+			bindingMap.put( procParam, parameterBinding );
+			return parameterBinding;
+		}
+		else {
+			//noinspection unchecked
+			return (ProcedureParameterBinding<P>) binding;
 		}
-		//noinspection unchecked
-		return (ProcedureParameterBinding<P>) binding;
 	}
 
 	@Override
-	public <P> ProcedureParameterBinding<P> getBinding(String name) {
-		//noinspection unchecked
-		final var parameter =
-				(ProcedureParameterImplementor<P>)
-						parameterMetadata.getQueryParameter( name );
+	public ProcedureParameterBinding<?> getBinding(String name) {
+		final var parameter = parameterMetadata.getQueryParameter( name );
 		if ( parameter == null ) {
-			throw new IllegalArgumentException( "Parameter does not exist: " + name );
+			throw new IllegalArgumentException( "Parameter with name '" + name + "' does not exist" );
 		}
-		return getQueryParamerBinding( parameter );
+		return getQueryParameterBinding( (ProcedureParameterImplementor<?>) parameter );
 	}
 
 	@Override
-	public <P> ProcedureParameterBinding<P> getBinding(int position) {
-		//noinspection unchecked
-		final var parameter =
-				(ProcedureParameterImplementor<P>)
-						parameterMetadata.getQueryParameter( position );
+	public ProcedureParameterBinding<?> getBinding(int position) {
+		final var parameter = parameterMetadata.getQueryParameter( position );
 		if ( parameter == null ) {
 			throw new IllegalArgumentException( "Parameter at position " + position + "does not exist" );
 		}
-		return getQueryParamerBinding( parameter );
+		return getQueryParameterBinding( (ProcedureParameterImplementor<?>) parameter );
 	}
 
 	@Override
 	public void validate() {
-		parameterMetadata.visitRegistrations( parameter -> validate( (ProcedureParameterImplementor<?>) parameter ) );
+		if ( LOG.isDebugEnabled() ) {
+			parameterMetadata.visitRegistrations(
+					parameter -> validate( (ProcedureParameterImplementor<?>) parameter ) );
+		}
 	}
 
 	private <T> void validate(ProcedureParameterImplementor<T> procParam) {
-		final ParameterMode mode = procParam.getMode();
+		final var mode = procParam.getMode();
 		if ( mode == ParameterMode.IN || mode == ParameterMode.INOUT ) {
 			if ( !getBinding( procParam ).isBound() ) {
 				// depending on "pass nulls" this might be OK - for now, just log a warning
-				if ( procParam.getPosition() != null ) {
+				if ( procParam.isOrdinal() ) {
 					LOG.debugf( "Procedure parameter at position %s is not bound", procParam.getPosition() );
 
 				}
 				else {
-					LOG.debugf( "Procedure parameter %s is not bound", procParam.getName() );
+					LOG.debugf( "Procedure parameter '%s' is not bound", procParam.getName() );
 				}
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java
index 8b1cf5a39536..cf80e1e8d8ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterBindingImpl.java
@@ -14,10 +14,10 @@
  *
  * @author Steve Ebersole
  */
-public class ProcedureParameterBindingImpl<T>
+class ProcedureParameterBindingImpl<T>
 		extends QueryParameterBindingImpl<T>
 		implements ProcedureParameterBinding<T> {
-	public ProcedureParameterBindingImpl(
+	ProcedureParameterBindingImpl(
 			ProcedureParameterImplementor<T> queryParameter,
 			SessionFactoryImplementor sessionFactory) {
 		super( queryParameter, sessionFactory );
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java
index 4ba366ceef69..c8244612676a 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java
@@ -8,7 +8,6 @@
 import java.util.Objects;
 
 import org.hibernate.engine.jdbc.env.spi.ExtractedDatabaseMetaData;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.procedure.ParameterTypeException;
 import org.hibernate.procedure.spi.NamedCallableQueryMemento;
 import org.hibernate.procedure.spi.ParameterStrategy;
@@ -16,7 +15,6 @@
 import org.hibernate.procedure.spi.ProcedureParameterImplementor;
 import org.hibernate.type.BindableType;
 import org.hibernate.type.OutputableType;
-import org.hibernate.type.internal.BindingTypeHelper;
 import org.hibernate.query.spi.AbstractQueryParameter;
 import org.hibernate.query.spi.QueryParameterBinding;
 import org.hibernate.sql.exec.internal.JdbcCallParameterExtractorImpl;
@@ -30,10 +28,12 @@
 
 import jakarta.persistence.ParameterMode;
 
+import static org.hibernate.type.internal.BindingTypeHelper.resolveTemporalPrecision;
+
 /**
  * @author Steve Ebersole
  */
-public class ProcedureParameterImpl<T> extends AbstractQueryParameter<T> implements ProcedureParameterImplementor<T> {
+class ProcedureParameterImpl<T> extends AbstractQueryParameter<T> implements ProcedureParameterImplementor<T> {
 
 	private final String name;
 	private final Integer position;
@@ -43,7 +43,7 @@ public class ProcedureParameterImpl<T> extends AbstractQueryParameter<T> impleme
 	/**
 	 * Used for named Query parameters
 	 */
-	public ProcedureParameterImpl(
+	ProcedureParameterImpl(
 			String name,
 			ParameterMode mode,
 			Class<T> javaType,
@@ -101,12 +101,16 @@ public NamedCallableQueryMemento.ParameterMemento toMemento() {
 	public JdbcCallParameterRegistration toJdbcParameterRegistration(
 			int startIndex,
 			ProcedureCallImplementor<?> procedureCall) {
-		final QueryParameterBinding<T> binding = procedureCall.getParameterBindings().getBinding( this );
-		final boolean isNamed = procedureCall.getParameterStrategy() == ParameterStrategy.NAMED && this.name != null;
-		final SharedSessionContractImplementor session = procedureCall.getSession();
+		final QueryParameterBinding<T> binding =
+				procedureCall.getParameterBindings()
+						.getBinding( this );
+		final boolean isNamed =
+				procedureCall.getParameterStrategy() == ParameterStrategy.NAMED
+						&& name != null;
+		final var session = procedureCall.getSession();
 
-		final OutputableType<T> typeToUse = (OutputableType<T>)
-				BindingTypeHelper.resolveTemporalPrecision(
+		final var typeToUse = (OutputableType<T>)
+				resolveTemporalPrecision(
 						binding == null ? null : binding.getExplicitTemporalPrecision(),
 						getBindableType( binding ),
 						session.getFactory().getQueryEngine().getCriteriaBuilder()
@@ -116,14 +120,20 @@ public JdbcCallParameterRegistration toJdbcParameterRegistration(
 		final JdbcParameterBinder parameterBinder;
 		final JdbcCallRefCursorExtractorImpl refCursorExtractor;
 		final JdbcCallParameterExtractorImpl<T> parameterExtractor;
-		final ExtractedDatabaseMetaData databaseMetaData =
+		final var databaseMetaData =
 				session.getFactory().getJdbcServices().getJdbcEnvironment()
 						.getExtractedDatabaseMetaData();
 		final boolean passProcedureParameterNames =
-				session.getFactory().getSessionFactoryOptions().isPassProcedureParameterNames();
+				session.getFactory().getSessionFactoryOptions()
+						.isPassProcedureParameterNames();
 		switch ( mode ) {
 			case REF_CURSOR:
-				jdbcParamName = this.name != null && databaseMetaData.supportsNamedParameters() && passProcedureParameterNames ? this.name : null;
+				jdbcParamName =
+						name != null
+							&& databaseMetaData.supportsNamedParameters()
+							&& passProcedureParameterNames
+								? name
+								: null;
 				refCursorExtractor = new JdbcCallRefCursorExtractorImpl( startIndex );
 				parameterBinder = null;
 				parameterExtractor = null;
@@ -151,16 +161,24 @@ public JdbcCallParameterRegistration toJdbcParameterRegistration(
 				break;
 		}
 
-		return new JdbcCallParameterRegistrationImpl( jdbcParamName, startIndex, mode, typeToUse, parameterBinder, parameterExtractor, refCursorExtractor );
+		return new JdbcCallParameterRegistrationImpl(
+				jdbcParamName,
+				startIndex,
+				mode,
+				typeToUse,
+				parameterBinder,
+				parameterExtractor,
+				refCursorExtractor
+		);
 	}
 
 	private BindableType<T> getBindableType(QueryParameterBinding<T> binding) {
-		if ( getHibernateType() != null ) {
-			return getHibernateType();
+		final var type = getHibernateType();
+		if ( type != null ) {
+			return type;
 		}
 		else if ( binding != null ) {
-			//noinspection unchecked
-			return (BindableType<T>) binding.getBindType();
+			return binding.getBindType();
 		}
 		else {
 			return null;
@@ -175,7 +193,7 @@ private String getJdbcParamName(
 			ExtractedDatabaseMetaData databaseMetaData) {
 		return isNamed && passProcedureParameterNames
 			&& canDoNameParameterBinding( typeToUse, procedureCall, databaseMetaData )
-				? this.name
+				? name
 				: null;
 	}
 
@@ -203,8 +221,8 @@ private JdbcParameterBinder getParameterBinder(BindableType<T> typeToUse, String
 					)
 			);
 		}
-		else if ( typeToUse instanceof BasicType<?> ) {
-			return new JdbcParameterImpl( (BasicType<T>) typeToUse );
+		else if ( typeToUse instanceof BasicType<?> basicType ) {
+			return new JdbcParameterImpl( basicType );
 		}
 		else {
 			throw new UnsupportedOperationException();
@@ -217,8 +235,8 @@ private boolean canDoNameParameterBinding(
 			ExtractedDatabaseMetaData databaseMetaData) {
 		return procedureCall.getFunctionReturn() == null
 			&& databaseMetaData.supportsNamedParameters()
-			&& hibernateType instanceof ProcedureParameterNamedBinder
-			&& ( (ProcedureParameterNamedBinder<?>) hibernateType ).canDoSetting();
+			&& hibernateType instanceof ProcedureParameterNamedBinder<?> binder
+			&& binder.canDoSetting();
 	}
 
 	@Override
@@ -227,19 +245,21 @@ public int hashCode() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null ) {
+		else if ( object == null ) {
 			return false;
 		}
-		if ( !(o instanceof ProcedureParameterImpl<?> that) ) {
+		else if ( !(object instanceof ProcedureParameterImpl<?> that) ) {
 			return false;
 		}
-		return Objects.equals( name, that.name )
-			&& Objects.equals( position, that.position )
-			&& mode == that.mode;
+		else {
+			return Objects.equals( name, that.name )
+				&& Objects.equals( position, that.position )
+				&& mode == that.mode;
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java
index ac0d02d98462..cd77b4e06cba 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java
@@ -14,13 +14,10 @@
 import jakarta.persistence.Parameter;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.procedure.spi.NamedCallableQueryMemento;
 import org.hibernate.procedure.spi.ParameterStrategy;
 import org.hibernate.type.BindableType;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.internal.QueryParameterBindingsImpl;
-import org.hibernate.procedure.ProcedureParameter;
 import org.hibernate.procedure.spi.ProcedureParameterImplementor;
 import org.hibernate.query.spi.ProcedureParameterMetadataImplementor;
 import org.hibernate.query.spi.QueryParameterBindings;
@@ -36,18 +33,11 @@
  *
  * @author Steve Ebersole
  */
-public class ProcedureParameterMetadataImpl implements ProcedureParameterMetadataImplementor {
+class ProcedureParameterMetadataImpl implements ProcedureParameterMetadataImplementor {
 	private ParameterStrategy parameterStrategy = ParameterStrategy.UNKNOWN;
 	private List<ProcedureParameterImplementor<?>> parameters;
 
-	public ProcedureParameterMetadataImpl() {
-	}
-
-	public ProcedureParameterMetadataImpl(NamedCallableQueryMemento memento, SharedSessionContractImplementor session) {
-		memento.getParameterMementos()
-				.forEach( parameterMemento -> registerParameter( parameterMemento.resolve( session ) ) );
-	}
-
+	@Override
 	public void registerParameter(ProcedureParameterImplementor<?> parameter) {
 		if ( parameter.isNamed() ) {
 			if ( parameterStrategy == ParameterStrategy.POSITIONAL ) {
@@ -99,17 +89,18 @@ public boolean hasPositionalParameters() {
 
 	@Override
 	public Set<String> getNamedParameterNames() {
-		if ( !hasNamedParameters() ) {
-			return emptySet();
-		}
-
-		final Set<String> rtn = new HashSet<>();
-		for ( ProcedureParameter<?> parameter : parameters ) {
-			if ( parameter.getName() != null ) {
-				rtn.add( parameter.getName() );
+		if ( hasNamedParameters() && parameters != null ) {
+			final Set<String> names = new HashSet<>();
+			for ( var parameter : parameters ) {
+				if ( parameter.getName() != null ) {
+					names.add( parameter.getName() );
+				}
 			}
+			return names;
+		}
+		else {
+			return emptySet();
 		}
-		return rtn;
 	}
 
 	@Override
@@ -123,13 +114,14 @@ public boolean containsReference(QueryParameter<?> parameter) {
 			&& parameters.contains( (ProcedureParameterImplementor<?>) parameter );
 	}
 
+	@Override
 	public ParameterStrategy getParameterStrategy() {
 		return parameterStrategy;
 	}
 
 	@Override
 	public boolean hasAnyMatching(Predicate<QueryParameterImplementor<?>> filter) {
-		if ( parameters.isEmpty() ) {
+		if ( parameters == null || parameters.isEmpty() ) {
 			return false;
 		}
 		else {
@@ -144,9 +136,11 @@ public boolean hasAnyMatching(Predicate<QueryParameterImplementor<?>> filter) {
 
 	@Override
 	public ProcedureParameterImplementor<?> findQueryParameter(String name) {
-		for ( var parameter : parameters ) {
-			if ( name.equals( parameter.getName() ) ) {
-				return parameter;
+		if ( parameters != null ) {
+			for ( var parameter : parameters ) {
+				if ( name.equals( parameter.getName() ) ) {
+					return parameter;
+				}
 			}
 		}
 		return null;
@@ -163,9 +157,12 @@ public ProcedureParameterImplementor<?> getQueryParameter(String name) {
 
 	@Override
 	public ProcedureParameterImplementor<?> findQueryParameter(int positionLabel) {
-		for ( var parameter : parameters ) {
-			if ( parameter.getName() == null && positionLabel == parameter.getPosition() ) {
-				return parameter;
+		if ( parameters != null ) {
+			for ( var parameter : parameters ) {
+				if ( parameter.getName() == null
+						&& positionLabel == parameter.getPosition() ) {
+					return parameter;
+				}
 			}
 		}
 		return null;
@@ -174,18 +171,20 @@ public ProcedureParameterImplementor<?> findQueryParameter(int positionLabel) {
 	@Override
 	public ProcedureParameterImplementor<?> getQueryParameter(int positionLabel) {
 		final var queryParameter = findQueryParameter( positionLabel );
-		if ( queryParameter != null ) {
-			return queryParameter;
+		if ( queryParameter == null ) {
+			throw new IllegalArgumentException(
+					"Positional parameter " + positionLabel + " is not registered with this procedure call" );
 		}
-		throw new IllegalArgumentException( "Positional parameter [" + positionLabel + "] is not registered with this procedure call" );
+		return queryParameter;
 	}
 
 	@Override
 	public <P> ProcedureParameterImplementor<P> resolve(Parameter<P> parameter) {
-		if ( parameter instanceof ProcedureParameterImplementor<P> parameterImplementor ) {
+		if ( parameters != null
+				&& parameter instanceof ProcedureParameterImplementor<P> procedureParam ) {
 			for ( var registered : parameters ) {
 				if ( registered == parameter ) {
-					return parameterImplementor;
+					return procedureParam;
 				}
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ScalarDomainResultBuilder.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ScalarDomainResultBuilder.java
index 240436770c6c..27508941a6bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ScalarDomainResultBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ScalarDomainResultBuilder.java
@@ -7,23 +7,22 @@
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.query.results.ResultBuilder;
 import org.hibernate.query.results.internal.ResultSetMappingSqlSelection;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
-import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
+
+import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
 
 /**
  * @author Steve Ebersole
  */
-public class ScalarDomainResultBuilder<T> implements ResultBuilder {
+class ScalarDomainResultBuilder<T> implements ResultBuilder {
 	private final JavaType<T> typeDescriptor;
 
-	public ScalarDomainResultBuilder(JavaType<T> typeDescriptor) {
+	ScalarDomainResultBuilder(JavaType<T> typeDescriptor) {
 		this.typeDescriptor = typeDescriptor;
 	}
 
@@ -37,17 +36,18 @@ public DomainResult<T> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
-		final SqlExpressionResolver sqlExpressionResolver =
-				domainResultCreationState.getSqlAstCreationState().getSqlExpressionResolver();
-		final TypeConfiguration typeConfiguration =
-				domainResultCreationState.getSqlAstCreationState().getCreationContext().getTypeConfiguration();
-		final SqlSelection sqlSelection = sqlExpressionResolver.resolveSqlSelection(
+		final var sqlAstCreationState = domainResultCreationState.getSqlAstCreationState();
+		final var sqlExpressionResolver =
+				sqlAstCreationState.getSqlExpressionResolver();
+		final var typeConfiguration =
+				sqlAstCreationState.getCreationContext().getTypeConfiguration();
+		final var sqlSelection = sqlExpressionResolver.resolveSqlSelection(
 				sqlExpressionResolver.resolveSqlExpression(
-						SqlExpressionResolver.createColumnReferenceKey(
+						createColumnReferenceKey(
 								Integer.toString( resultPosition + 1 )
 						),
 						processingState -> {
-							final BasicType<?> basicType = jdbcResultsMetadata.resolveType(
+							final var basicType = jdbcResultsMetadata.resolveType(
 									resultPosition + 1,
 									typeDescriptor,
 									typeConfiguration
@@ -75,17 +75,16 @@ public ResultBuilder cacheKeyInstance() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof ScalarDomainResultBuilder<?> that ) ) {
 			return false;
 		}
-
-		ScalarDomainResultBuilder<?> that = (ScalarDomainResultBuilder<?>) o;
-
-		return typeDescriptor.equals( that.typeDescriptor );
+		else {
+			return typeDescriptor.equals( that.typeDescriptor );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java
index 9145aaf77bca..319ff33ac5ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java
+++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/Util.java
@@ -6,15 +6,11 @@
 
 import java.util.function.Consumer;
 
-import org.hibernate.internal.util.collections.ArrayHelper;
-import org.hibernate.metamodel.MappingMetamodel;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.UnknownSqlResultSetMappingException;
 import org.hibernate.query.internal.ResultSetMappingResolutionContext;
-import org.hibernate.query.named.NamedObjectRepository;
-import org.hibernate.query.named.NamedResultSetMappingMemento;
 import org.hibernate.query.results.ResultSetMapping;
-import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
+
+import static org.hibernate.internal.util.collections.ArrayHelper.isEmpty;
 
 /**
  * Utilities used to implement procedure call support.
@@ -28,18 +24,18 @@ private Util() {
 
 	public static void resolveResultSetMappings(
 			String[] resultSetMappingNames,
-			Class[] resultSetMappingClasses,
+			Class<?>[] resultSetMappingClasses,
 			ResultSetMapping resultSetMapping,
 			Consumer<String> querySpaceConsumer,
 			ResultSetMappingResolutionContext context) {
-		if ( ! ArrayHelper.isEmpty( resultSetMappingNames ) ) {
+		if ( !isEmpty( resultSetMappingNames ) ) {
 			// cannot specify both
-			if ( ! ArrayHelper.isEmpty( resultSetMappingClasses ) ) {
+			if ( !isEmpty( resultSetMappingClasses ) ) {
 				throw new IllegalArgumentException( "Cannot specify both result-set mapping names and classes" );
 			}
 			resolveResultSetMappingNames( resultSetMappingNames, resultSetMapping, querySpaceConsumer, context );
 		}
-		else if ( ! ArrayHelper.isEmpty( resultSetMappingClasses ) ) {
+		else if ( !isEmpty( resultSetMappingClasses ) ) {
 			resolveResultSetMappingClasses( resultSetMappingClasses, resultSetMapping, querySpaceConsumer, context );
 		}
 
@@ -51,31 +47,26 @@ public static void resolveResultSetMappingNames(
 			ResultSetMapping resultSetMapping,
 			Consumer<String> querySpaceConsumer,
 			ResultSetMappingResolutionContext context) {
-		final NamedObjectRepository namedObjectRepository = context.getNamedObjectRepository();
+		final var namedObjectRepository = context.getNamedObjectRepository();
 		for ( String resultSetMappingName : resultSetMappingNames ) {
-			final NamedResultSetMappingMemento memento =
+			final var memento =
 					namedObjectRepository.getResultSetMappingMemento( resultSetMappingName );
 			if ( memento == null ) {
 				throw new UnknownSqlResultSetMappingException( "Unknown SqlResultSetMapping [" + resultSetMappingName + "]" );
 			}
-			memento.resolve(
-					resultSetMapping,
-					querySpaceConsumer,
-					context
-			);
+			memento.resolve( resultSetMapping, querySpaceConsumer, context );
 		}
 	}
 
 	public static void resolveResultSetMappingClasses(
-			Class[] resultSetMappingClasses,
+			Class<?>[] resultSetMappingClasses,
 			ResultSetMapping resultSetMapping,
 			Consumer<String> querySpaceConsumer,
 			ResultSetMappingResolutionContext context) {
-		final MappingMetamodel mappingMetamodel = context.getMappingMetamodel();
-		final JavaTypeRegistry javaTypeRegistry = mappingMetamodel.getTypeConfiguration().getJavaTypeRegistry();
-
-		for ( Class<?> resultSetMappingClass : resultSetMappingClasses ) {
-			final EntityPersister entityDescriptor = mappingMetamodel.findEntityDescriptor( resultSetMappingClass );
+		final var mappingMetamodel = context.getMappingMetamodel();
+		final var javaTypeRegistry = mappingMetamodel.getTypeConfiguration().getJavaTypeRegistry();
+		for ( var resultSetMappingClass : resultSetMappingClasses ) {
+			final var entityDescriptor = mappingMetamodel.findEntityDescriptor( resultSetMappingClass );
 			if ( entityDescriptor != null ) {
 				resultSetMapping.addResultBuilder( new EntityDomainResultBuilder( entityDescriptor ) );
 				for ( String querySpace : entityDescriptor.getSynchronizedQuerySpaces() ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java
index 11d7f16c8aef..618cd2b28e2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java
@@ -8,7 +8,6 @@
 
 import org.hibernate.LazyInitializationException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.internal.util.MarkerObject;
 import org.hibernate.proxy.AbstractLazyInitializer;
 import org.hibernate.type.CompositeType;
 
@@ -21,8 +20,6 @@
  */
 public abstract class BasicLazyInitializer extends AbstractLazyInitializer {
 
-	protected static final Object INVOKE_IMPLEMENTATION = new MarkerObject( "INVOKE_IMPLEMENTATION" );
-
 	protected final Class<?> persistentClass;
 	protected final Method getIdentifierMethod;
 	protected final Method setIdentifierMethod;
@@ -50,7 +47,10 @@ protected BasicLazyInitializer(
 
 	protected abstract Object serializableProxy();
 
-	protected final Object invoke(Method method, Object[] args, Object proxy) throws Throwable {
+	protected abstract Object call(Object proxy, Method method, Object[] args) throws Throwable;
+
+	protected final Object invoke(Method method, Object[] args, Object proxy)
+			throws Throwable {
 		final String methodName = method.getName();
 		switch ( args.length ) {
 			case 0:
@@ -74,7 +74,7 @@ else if ( "getHibernateLazyInitializer".equals( methodName ) ) {
 				else if ( method.equals( setIdentifierMethod ) ) {
 					initialize();
 					setIdentifier( args[0] );
-					return INVOKE_IMPLEMENTATION;
+					return call( proxy, method, args );
 				}
 				break;
 		}
@@ -85,7 +85,7 @@ else if ( method.equals( setIdentifierMethod ) ) {
 		}
 
 		// otherwise:
-		return INVOKE_IMPLEMENTATION;
+		return call( proxy, method, args );
 	}
 
 	private Object getReplacement() {
diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java
index d625895b55f5..9c3d196dfa39 100644
--- a/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/proxy/pojo/bytebuddy/ByteBuddyInterceptor.java
@@ -37,43 +37,42 @@ public ByteBuddyInterceptor(
 
 	@Override
 	public Object intercept(Object proxy, Method method, Object[] args) throws Throwable {
-		final Object result = this.invoke( method, args, proxy );
-		if ( result == INVOKE_IMPLEMENTATION ) {
-			final Object target = getImplementation();
-			final Object returnValue;
-			try {
-				if ( isPublic( persistentClass, method ) ) {
-					if ( !method.getDeclaringClass().isInstance( target ) ) {
-						throw new ClassCastException(
-								target.getClass().getName()
-										+ " incompatible with "
-										+ method.getDeclaringClass().getName()
-						);
-					}
-					returnValue = method.invoke( target, args );
-				}
-				else {
-					method.setAccessible( true );
-					returnValue = method.invoke( target, args );
-				}
+		return invoke( method, args, proxy );
+	}
 
-				if ( returnValue == target ) {
-					final var returnValueClass = returnValue.getClass();
-					if ( returnValueClass.isInstance( proxy ) ) {
-						return proxy;
-					}
-					else {
-						CORE_LOGGER.narrowingProxy( returnValueClass );
-					}
+	@Override
+	protected Object call(Object proxy, Method method, Object[] args) throws Throwable {
+		final Object target = getImplementation();
+		final Object returnValue;
+		try {
+			if ( isPublic( persistentClass, method ) ) {
+				if ( !method.getDeclaringClass().isInstance( target ) ) {
+					throw new ClassCastException(
+							target.getClass().getName()
+							+ " incompatible with "
+							+ method.getDeclaringClass().getName()
+					);
 				}
-				return returnValue;
+				returnValue = method.invoke( target, args );
 			}
-			catch (InvocationTargetException ite) {
-				throw ite.getTargetException();
+			else {
+				method.setAccessible( true );
+				returnValue = method.invoke( target, args );
+			}
+
+			if ( returnValue == target ) {
+				final var returnValueClass = returnValue.getClass();
+				if ( returnValueClass.isInstance( proxy ) ) {
+					return proxy;
+				}
+				else {
+					CORE_LOGGER.narrowingProxy( returnValueClass );
+				}
 			}
+			return returnValue;
 		}
-		else {
-			return result;
+		catch (InvocationTargetException ite) {
+			throw ite.getTargetException();
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/CommonQueryContract.java b/hibernate-core/src/main/java/org/hibernate/query/CommonQueryContract.java
index 4986bcaaf28f..b22c990ac617 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/CommonQueryContract.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/CommonQueryContract.java
@@ -59,9 +59,7 @@
  * Setting the {@linkplain QueryFlushMode query flush mode} does not affect the flush
  * mode of other operations performed via the parent {@linkplain Session session}.
  * This operation is usually used as follows:
- * <p>
- * <pre>query.setQueryFlushMode(NO_FLUSH).getResultList()</pre>
- * <p>
+ * <pre>{@code query.setQueryFlushMode(NO_FLUSH).getResultList() }</pre>
  * The call to {@code setQueryFlushMode(NO_FLUSH)} disables the usual automatic flush
  * operation that occurs before query execution.
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java
index 34965418c134..b00a80d7ea34 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java
@@ -619,8 +619,8 @@ interface FetchReturn extends ResultNode {
 	NativeQuery<T> setHint(String hintName, Object value);
 
 	/**
-	 * @inheritDoc
-	 *
+	 * {@inheritDoc}
+	 * <p>
 	 * This operation is supported even for native queries.
 	 * Note that specifying an explicit lock mode might
 	 * result in changes to the native SQL query that is
@@ -630,7 +630,7 @@ interface FetchReturn extends ResultNode {
 	LockOptions getLockOptions();
 
 	/**
-	 * @inheritDoc
+	 * {@inheritDoc}
 	 *
 	 * This operation is supported even for native queries.
 	 * Note that specifying an explicit lock mode might
@@ -652,8 +652,8 @@ interface FetchReturn extends ResultNode {
 	LockModeType getLockMode();
 
 	/**
-	 * @inheritDoc
-	 *
+	 * {@inheritDoc}
+	 * <p>
 	 * This operation is supported even for native queries.
 	 * Note that specifying an explicit lock mode might
 	 * result in changes to the native SQL query that is
@@ -676,8 +676,8 @@ interface FetchReturn extends ResultNode {
 	NativeQuery<T> setLockMode(LockModeType lockMode);
 
 	/**
-	 * @inheritDoc
-	 *
+	 * {@inheritDoc}
+	 * <p>
 	 * This operation is supported even for native queries.
 	 * Note that specifying an explicit lock mode might
 	 * result in changes to the native SQL query that is
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java b/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java
index 828f3ac61e17..1b6705d39364 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryArgumentException.java
@@ -15,11 +15,20 @@
  */
 public class QueryArgumentException extends IllegalArgumentException {
 	private final Class<?> parameterType;
+	private final Class<?> argumentType;
 	private final Object argument;
 
 	public QueryArgumentException(String message, Class<?> parameterType, Object argument) {
-		super(message);
+		super( message + " (argument [" + argument + "] is not assignable to " + parameterType.getName() + ")" );
 		this.parameterType = parameterType;
+		this.argumentType = argument == null ? null : argument.getClass();
+		this.argument = argument;
+	}
+
+	public QueryArgumentException(String message, Class<?> parameterType, Class<?> argumentType, Object argument) {
+		super( message + " (" + argumentType.getName() + " is not assignable to " + parameterType.getName() + ")" );
+		this.parameterType = parameterType;
+		this.argumentType = argumentType;
 		this.argument = argument;
 	}
 
@@ -27,6 +36,10 @@ public Class<?> getParameterType() {
 		return parameterType;
 	}
 
+	public Class<?> getArgumentType() {
+		return argumentType;
+	}
+
 	public Object getArgument() {
 		return argument;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java b/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java
index c3165a97e5a3..eae24d66f98c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryLogging.java
@@ -17,6 +17,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.ERROR;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -36,7 +37,7 @@ public interface QueryLogging extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".query";
 
 	Logger QUERY_LOGGER = Logger.getLogger( LOGGER_NAME );
-	QueryLogging QUERY_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), QueryLogging.class, LOGGER_NAME );
+	QueryLogging QUERY_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), QueryLogging.class, LOGGER_NAME, Locale.ROOT );
 
 	static String subLoggerName(String subName) {
 		return LOGGER_NAME + '.' + subName;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
index 1c211239818b..edbb71ad176f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
@@ -38,6 +38,7 @@
  * </ul>
  * This interface declares operations for creating instances of these objects.
  * <table style="width:100%;margin:10px">
+ *     <caption>Operations of different query types</caption>
  *     <tr>
  *         <th style="width:10%"></th>
  *         <th style="text-align:left;width:45%">Selection</th>
@@ -68,7 +69,6 @@
  *         <td>{@link #createNamedMutationQuery(String)}</td>
  *     </tr>
  * </table>
- * <p>
  * Operations like {@link #createSelectionQuery(String, Class) createSelectionQuery()},
  * {@link #createNamedSelectionQuery(String, Class) createNamedSelectionQuery()}, and
  * {@link #createNativeQuery(String, Class) createNativeQuery()} accept a Java
diff --git a/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java b/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java
index 6c56622f4841..0a6b6afaf452 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java
@@ -4,14 +4,19 @@
  */
 package org.hibernate.query;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import org.hibernate.Incubating;
+import org.hibernate.NonUniqueResultException;
 
 /**
  * Defines some processing performed on the overall result {@link List}
  * of a {@link Query} before the result list is returned to the caller.
  *
+ * @param <T> The result list element type
+ *
  * @see Query#setResultListTransformer
  * @see Query#list
  * @see Query#getResultList
@@ -36,4 +41,33 @@ public interface ResultListTransformer<T> {
 	 * @return The transformed result.
 	 */
 	List<T> transformList(List<T> resultList);
+
+	/**
+	 * A {@code ResultListTransformer} which collapses a list of results
+	 * into a single result when all results are equal, or throws
+	 * {@link NonUniqueResultException} otherwise.
+	 *
+	 * @param <T> The result list element type
+	 *
+	 * @since 7.3
+	 */
+	static <T> ResultListTransformer<T> uniqueResultTransformer() {
+		return resultList ->
+				switch ( resultList.size() ) {
+					case 0, 1 -> resultList;
+					default -> {
+						final var first = resultList.get( 0 );
+						for ( int i = 1; i < resultList.size(); i++ ) {
+							final T current = resultList.get( i );
+							if ( !Objects.equals( first, current )
+									// also consider case of multiple select items in an Object[]
+									&& !( first instanceof Object[] array
+											&& !Arrays.equals( array, (Object[]) current ) ) ) {
+								throw new NonUniqueResultException( resultList.size() );
+							}
+						}
+						yield List.of( first );
+					}
+				};
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java
index d21452932703..d76383e2f79f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java
@@ -90,6 +90,7 @@
  * @since 6.0
  *
  * @author Steve Ebersole
+ * @author Yoobin Yoon
  */
 @Incubating
 public interface HibernateCriteriaBuilder extends CriteriaBuilder {
@@ -2744,6 +2745,54 @@ <T> JpaExpression<T[]> arrayAgg(
 	@Incubating
 	<T> JpaExpression<T[]> arrayTrim(Expression<T[]> arrayExpression, Integer elementCount);
 
+	/**
+	 * Reverses the order of elements in an array.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<T> JpaExpression<T[]> arrayReverse(Expression<T[]> arrayExpression);
+
+	/**
+	 * Sorts the elements of an array in ascending order.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<T> JpaExpression<T[]> arraySort(Expression<T[]> arrayExpression);
+
+	/**
+	 * Sorts the elements of an array in the specified order.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<T> JpaExpression<T[]> arraySort(Expression<T[]> arrayExpression, boolean descending);
+
+	/**
+	 * Sorts the elements of an array in the specified order.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<T> JpaExpression<T[]> arraySort(Expression<T[]> arrayExpression, Expression<Boolean> descendingExpression);
+
+	/**
+	 * Create an expression that sorts the given array with explicit null ordering.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<T> JpaExpression<T[]> arraySort(Expression<T[]> arrayExpression, boolean descending, boolean nullsFirst);
+
+	/**
+	 * Create an expression that sorts the given array with explicit null ordering.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<T> JpaExpression<T[]> arraySort(Expression<T[]> arrayExpression, Expression<Boolean> descendingExpression, Expression<Boolean> nullsFirstExpression);
+
 	/**
 	 * Creates array with the same element N times, as specified by the arguments.
 	 *
@@ -3403,6 +3452,62 @@ default <T> JpaPredicate arrayOverlapsNullable(T[] array1, Expression<T[]> array
 	@Incubating
 	<C extends Collection<?>> JpaExpression<C> collectionTrim(Expression<C> arrayExpression, Integer elementCount);
 
+	/**
+	 * Create an expression that reverses the order of the elements of a collection.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<C extends Collection<?>> JpaExpression<C> collectionReverse(Expression<C> collectionExpression);
+
+	/**
+	 * Create an expression that sorts the elements of a collection.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<C extends Collection<?>> JpaExpression<C> collectionSort(Expression<C> collectionExpression);
+
+	/**
+	 * Create an expression that sorts the given collection in specified order.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<C extends Collection<?>> JpaExpression<C> collectionSort(Expression<C> collectionExpression, boolean descending);
+
+	/**
+	 * Create an expression that sorts the given collection in specified order.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<C extends Collection<?>> JpaExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			Expression<Boolean> descendingExpression);
+
+	/**
+	 * Create an expression that sorts the given collection with explicit null ordering.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<C extends Collection<?>> JpaExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			boolean descending,
+			boolean nullsFirst);
+
+	/**
+	 * Create an expression that sorts the given collection with explicit null ordering.
+	 *
+	 * @since 7.2
+	 */
+	@Incubating
+	<C extends Collection<?>> JpaExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			Expression<Boolean> descendingExpression,
+			Expression<Boolean> nullsFirstExpression);
+
 	/**
 	 * Creates basic collection with the same element N times, as specified by the arguments.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java
index 2a67e5ab3625..71e4cd403596 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/spi/HibernateCriteriaBuilderDelegate.java
@@ -2557,6 +2557,45 @@ public <T> JpaExpression<T[]> arrayTrim(Expression<T[]> arrayExpression, Integer
 		return criteriaBuilder.arrayTrim( arrayExpression, elementCount );
 	}
 
+	@Override
+	@Incubating
+	public <T> JpaExpression<T[]> arrayReverse(Expression<T[]> arrayExpression) {
+		return criteriaBuilder.arrayReverse( arrayExpression );
+	}
+
+	@Override
+	@Incubating
+	public <T> JpaExpression<T[]> arraySort(Expression<T[]> arrayExpression) {
+		return criteriaBuilder.arraySort( arrayExpression );
+	}
+
+	@Override
+	@Incubating
+	public <T> JpaExpression<T[]> arraySort(Expression<T[]> arrayExpression, boolean descending) {
+		return criteriaBuilder.arraySort( arrayExpression, descending );
+	}
+
+	@Override
+	@Incubating
+	public <T> JpaExpression<T[]> arraySort(Expression<T[]> arrayExpression, Expression<Boolean> descendingExpression) {
+		return criteriaBuilder.arraySort( arrayExpression, descendingExpression );
+	}
+
+	@Override
+	@Incubating
+	public <T> JpaExpression<T[]> arraySort(Expression<T[]> arrayExpression, boolean descending, boolean nullsFirst) {
+		return criteriaBuilder.arraySort( arrayExpression, descending, nullsFirst );
+	}
+
+	@Override
+	@Incubating
+	public <T> JpaExpression<T[]> arraySort(
+			Expression<T[]> arrayExpression,
+			Expression<Boolean> descendingExpression,
+			Expression<Boolean> nullsFirstExpression) {
+		return criteriaBuilder.arraySort( arrayExpression, descendingExpression, nullsFirstExpression );
+	}
+
 	@Override
 	@Incubating
 	public <T> JpaExpression<T[]> arrayFill(
@@ -3103,6 +3142,52 @@ public <C extends Collection<?>> JpaExpression<C> collectionTrim(
 		return criteriaBuilder.collectionTrim( arrayExpression, elementCount );
 	}
 
+	@Override
+	@Incubating
+	public <C extends Collection<?>> JpaExpression<C> collectionReverse(Expression<C> collectionExpression) {
+		return criteriaBuilder.collectionReverse( collectionExpression );
+	}
+
+	@Override
+	@Incubating
+	public <C extends Collection<?>> JpaExpression<C> collectionSort(Expression<C> collectionExpression) {
+		return criteriaBuilder.collectionSort( collectionExpression );
+	}
+
+	@Override
+	@Incubating
+	public <C extends Collection<?>> JpaExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			boolean descending) {
+		return criteriaBuilder.collectionSort( collectionExpression, descending );
+	}
+
+	@Override
+	@Incubating
+	public <C extends Collection<?>> JpaExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			Expression<Boolean> descendingExpression) {
+		return criteriaBuilder.collectionSort( collectionExpression, descendingExpression );
+	}
+
+	@Override
+	@Incubating
+	public <C extends Collection<?>> JpaExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			boolean descending,
+			boolean nullsFirst) {
+		return criteriaBuilder.collectionSort( collectionExpression, descending, nullsFirst );
+	}
+
+	@Override
+	@Incubating
+	public <C extends Collection<?>> JpaExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			Expression<Boolean> descendingExpression,
+			Expression<Boolean> nullsFirstExpression) {
+		return criteriaBuilder.collectionSort( collectionExpression, descendingExpression, nullsFirstExpression );
+	}
+
 	@Override
 	@Incubating
 	public <T> JpaExpression<Collection<T>> collectionFill(
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java b/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java
index dc984324048c..d9fff5863628 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/HqlLogging.java
@@ -14,6 +14,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 /**
  * @author Steve Ebersole
@@ -28,7 +29,7 @@
 public interface HqlLogging extends BasicLogger {
 	String LOGGER_NAME = QueryLogging.LOGGER_NAME + ".hql";
 
-	HqlLogging QUERY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HqlLogging.class, LOGGER_NAME );
+	HqlLogging QUERY_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HqlLogging.class, LOGGER_NAME, Locale.ROOT );
 
 	static String subLoggerName(String subName) {
 		return LOGGER_NAME + '.' + subName;
@@ -39,6 +40,6 @@ static Logger subLogger(String subName) {
 	}
 
 	static <T> T subLogger(String subName, Class<T> loggerJavaType) {
-		return Logger.getMessageLogger( MethodHandles.lookup(), loggerJavaType, subLoggerName( subName ) );
+		return Logger.getMessageLogger( MethodHandles.lookup(), loggerJavaType, subLoggerName( subName ), Locale.ROOT );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java
index 1cd1d5d0e2ac..a1dabf39bdc8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/BasicDotIdentifierConsumer.java
@@ -5,7 +5,6 @@
 package org.hibernate.query.hql.internal;
 
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
-import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.hql.spi.DotIdentifierConsumer;
 import org.hibernate.query.hql.spi.SemanticPathPart;
@@ -16,6 +15,7 @@
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
 import org.hibernate.query.sqm.spi.SqmCreationContext;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
+import org.hibernate.query.sqm.tree.domain.SqmTreatedPath;
 import org.hibernate.query.sqm.tree.expression.SqmEnumLiteral;
 import org.hibernate.query.sqm.tree.expression.SqmExpression;
 import org.hibernate.query.sqm.tree.expression.SqmFieldLiteral;
@@ -92,15 +92,18 @@ public void consumeIdentifier(String identifier, boolean isBase, boolean isTermi
 
 	@Override
 	public void consumeTreat(String importableName, boolean isTerminal) {
-		final SqmPath<?> sqmPath = (SqmPath<?>) currentPart;
-		currentPart = sqmPath.treatAs( treatTarget( importableName ) );
+		currentPart = treat( importableName, (SqmPath<?>) currentPart );
 	}
 
-	private <T> Class<T> treatTarget(String typeName) {
-		final ManagedDomainType<T> managedType =
+	private <T> SqmTreatedPath<?, ?> treat(String importableName, SqmPath<T> path) {
+		return path.treatAs( treatTarget( path, importableName ) );
+	}
+
+	private <T> Class<? extends T> treatTarget(SqmPath<T> path, String typeName) {
+		final var javaType =
 				creationState.getCreationContext().getJpaMetamodel()
-						.managedType( typeName );
-		return managedType.getJavaType();
+						.managedType( typeName ).getJavaType();
+		return javaType.asSubclass( path.getJavaType() );
 	}
 
 	protected void reset() {
@@ -195,8 +198,7 @@ private SemanticPathPart resolvePath(String identifier, boolean isTerminal, SqmC
 			if ( pathRootByExposedNavigable != null ) {
 				// identifier is an "unqualified attribute reference"
 				validateAsRoot( pathRootByExposedNavigable );
-				final SqmPath<?> sqmPath =
-						pathRootByExposedNavigable.get( identifier, true );
+				final var sqmPath = pathRootByExposedNavigable.get( identifier, true );
 				return isTerminal ? sqmPath : new DomainPathPart( sqmPath );
 			}
 
@@ -213,7 +215,7 @@ private SemanticPathPart resolveLiteralType(JpaMetamodel jpaMetamodel, NodeBuild
 				return null;
 			}
 			else {
-				final ManagedDomainType<?> managedType = jpaMetamodel.managedType( importableName );
+				final var managedType = jpaMetamodel.managedType( importableName );
 				if ( managedType instanceof SqmEntityDomainType<?> entityDomainType ) {
 					return new SqmLiteralEntityType<>( entityDomainType, nodeBuilder );
 				}
@@ -257,7 +259,7 @@ private static <E> SqmFieldLiteral<E> sqmFieldLiteral(
 				JavaType<E> fieldJtdTest,
 				NodeBuilder nodeBuilder) {
 			return new SqmFieldLiteral<>(
-					jpaMetamodel.getJavaConstant( prefix, terminal ),
+					jpaMetamodel.getJavaConstant( prefix, terminal, fieldJtdTest.getJavaTypeClass() ),
 					fieldJtdTest,
 					terminal,
 					nodeBuilder
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java
index 7f2e838a6067..39aeed17f989 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java
@@ -4,22 +4,19 @@
  */
 package org.hibernate.query.hql.internal;
 
-import org.hibernate.metamodel.model.domain.EntityDomainType;
-import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.query.PathException;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.hql.spi.DotIdentifierConsumer;
 import org.hibernate.query.hql.spi.SemanticPathPart;
 import org.hibernate.query.hql.spi.SqmCreationProcessingState;
 import org.hibernate.query.hql.spi.SqmCreationState;
-import org.hibernate.query.hql.spi.SqmPathRegistry;
 import org.hibernate.query.sqm.SqmJoinable;
 import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.spi.SqmCreationHelper;
 import org.hibernate.query.sqm.tree.SqmJoinType;
-import org.hibernate.query.sqm.tree.cte.SqmCteStatement;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.query.sqm.tree.domain.SqmPolymorphicRootDescriptor;
+import org.hibernate.query.sqm.tree.domain.SqmTreatedFrom;
 import org.hibernate.query.sqm.tree.from.SqmAttributeJoin;
 import org.hibernate.query.sqm.tree.from.SqmCteJoin;
 import org.hibernate.query.sqm.tree.from.SqmEntityJoin;
@@ -27,6 +24,7 @@
 import org.hibernate.query.sqm.tree.from.SqmJoin;
 import org.hibernate.query.sqm.tree.from.SqmRoot;
 
+import org.hibernate.query.sqm.tree.from.SqmTreatedAttributeJoin;
 import org.jboss.logging.Logger;
 
 import static org.hibernate.query.sqm.internal.SqmUtil.findCompatibleFetchJoin;
@@ -125,7 +123,7 @@ public void consumeTreat(String entityName, boolean isTerminal) {
 
 	private ConsumerDelegate resolveBase(String identifier, boolean isTerminal) {
 		final SqmCreationProcessingState processingState = creationState.getCurrentProcessingState();
-		final SqmPathRegistry pathRegistry = processingState.getPathRegistry();
+		final var pathRegistry = processingState.getPathRegistry();
 		final SqmFrom<?, Object> pathRootByAlias = pathRegistry.findFromByAlias( identifier, true );
 		if ( pathRootByAlias != null ) {
 			return resolveAlias( identifier, isTerminal, pathRootByAlias );
@@ -240,7 +238,7 @@ else if ( fetch ) {
 			boolean allowReuse,
 			SqmCreationState creationState,
 			SqmJoinable<U,V> joinSource) {
-		final SqmJoin<U,V> join = joinSource.createSqmJoin(
+		final var join = joinSource.createSqmJoin(
 				lhs,
 				joinType,
 				isTerminal ? alias : allowReuse ? SqmCreationHelper.IMPLICIT_ALIAS : null,
@@ -296,22 +294,39 @@ public void consumeIdentifier(String identifier, boolean isTerminal, boolean all
 
 		@Override
 		public void consumeTreat(String typeName, boolean isTerminal) {
+			currentPath = treat( typeName, isTerminal );
+			creationState.getCurrentProcessingState().getPathRegistry().register( currentPath );
+		}
+
+		private SqmTreatedFrom<?, ?, ?> treat(String typeName, boolean isTerminal) {
 			if ( isTerminal ) {
-				currentPath = fetch
-						? ( (SqmAttributeJoin<?, ?>) currentPath ).treatAs( treatTarget( typeName ), alias, true )
-						: currentPath.treatAs( treatTarget( typeName ), alias );
+				return fetch
+						? treatTerminalFetch( currentPath, typeName )
+						: treatTerminal( currentPath, typeName );
 			}
 			else {
-				currentPath = currentPath.treatAs( treatTarget( typeName ) );
+				return treatNonTerminal( currentPath, typeName );
 			}
-			creationState.getCurrentProcessingState().getPathRegistry().register( currentPath );
 		}
 
-		private <T> Class<T> treatTarget(String typeName) {
-			final ManagedDomainType<T> managedType = creationState.getCreationContext()
-					.getJpaMetamodel()
-					.managedType( typeName );
-			return managedType.getJavaType();
+		private <L,R> SqmTreatedFrom<?, ?, ?> treatNonTerminal(SqmFrom<L,R> path, String typeName) {
+			return path.treatAs( treatTarget( path, typeName ) );
+		}
+
+		private <L,R> SqmTreatedAttributeJoin<?, ?, ?> treatTerminalFetch(SqmFrom<L,R> path, String typeName) {
+			final var attributeJoin = (SqmAttributeJoin<L,R>) path;
+			return attributeJoin.treatAs( treatTarget( path, typeName ), alias, true );
+		}
+
+		private <L,R> SqmTreatedFrom<?, ?, ?> treatTerminal(SqmFrom<L,R> path, String typeName) {
+			return path.treatAs( treatTarget( path, typeName ), alias );
+		}
+
+		private <T> Class<? extends T> treatTarget(SqmPath<T> path, String typeName) {
+			final var javaType =
+					creationState.getCreationContext().getJpaMetamodel()
+							.managedType( typeName ).getJavaType();
+			return javaType.asSubclass( path.getJavaType() );
 		}
 
 		@Override
@@ -357,11 +372,11 @@ public void consumeIdentifier(String identifier, boolean isTerminal, boolean all
 			path.append( identifier );
 			if ( isTerminal ) {
 				final String fullPath = path.toString();
-				final EntityDomainType<?> joinedEntityType =
+				final var joinedEntityType =
 						creationState.getCreationContext().getJpaMetamodel()
 								.getHqlEntityReference( fullPath );
 				if ( joinedEntityType == null ) {
-					final SqmCteStatement<?> cteStatement = creationState.findCteStatement( fullPath );
+					final var cteStatement = creationState.findCteStatement( fullPath );
 					if ( cteStatement != null ) {
 						//noinspection rawtypes,unchecked
 						join = new SqmCteJoin( cteStatement, alias, joinType, sqmRoot );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java
index b7c294e5577d..cca925e7b74f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/QuerySplitter.java
@@ -78,7 +78,7 @@ private static <S extends SqmStatement<?>> S copyStatement(
 		final SqmCopyContext context = SqmCopyContext.noParamCopyContext();
 		// Copy the statement replacing the root's unmapped polymorphic reference with
 		// the concrete mapped descriptor entity domain type.
-		final SqmRoot<?> path = context.registerCopy(
+		final var path = context.registerCopy(
 				unmappedPolymorphicReference,
 				new SqmRoot<>(
 						mappedDescriptor,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
index 2e721a911f52..6ac675948e1f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
@@ -44,6 +44,7 @@
 import org.hibernate.metamodel.CollectionClassification;
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.internal.AnyKeyPart;
+import org.hibernate.metamodel.model.domain.AnyMappingDomainType;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.metamodel.model.domain.IdentifiableDomainType;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
@@ -52,7 +53,6 @@
 import org.hibernate.metamodel.model.domain.PluralPersistentAttribute;
 import org.hibernate.metamodel.model.domain.SingularPersistentAttribute;
 import org.hibernate.metamodel.model.domain.internal.AnyDiscriminatorSqmPath;
-import org.hibernate.metamodel.model.domain.internal.EntitySqmPathSource;
 import org.hibernate.query.ParameterLabelException;
 import org.hibernate.query.PathException;
 import org.hibernate.query.SemanticException;
@@ -2138,8 +2138,6 @@ public final SqmCrossJoin<?> visitCrossJoin(HqlParser.CrossJoinContext ctx) {
 	protected <T> void consumeCrossJoin(HqlParser.CrossJoinContext parserJoin, SqmRoot<T> sqmRoot) {
 		final String name = getEntityName( parserJoin.entityName() );
 
-//		SqmTreeCreationLogger.LOGGER.tracef( "Handling root path - %s", name );
-
 		final var entityDescriptor = getJpaMetamodel().resolveHqlEntityReference( name );
 
 		if ( entityDescriptor instanceof SqmPolymorphicRootDescriptor ) {
@@ -2579,8 +2577,8 @@ else if ( r instanceof AnyDiscriminatorSqmPath<?> anyDiscriminatorPath && l inst
 		);
 	}
 
-	private <T> SqmExpression<T> createDiscriminatorValue(
-			AnyDiscriminatorSqmPath<T> anyDiscriminatorTypeSqmPath,
+	private SqmExpression<?> createDiscriminatorValue(
+			AnyDiscriminatorSqmPath<?> anyDiscriminatorTypeSqmPath,
 			HqlParser.ExpressionContext valueExpressionContext) {
 		final var expressible = anyDiscriminatorTypeSqmPath.getExpressible();
 		return new SqmAnyDiscriminatorValue<>(
@@ -3531,10 +3529,10 @@ else if ( attributes.size() >1 ) {
 	@Override
 	public SqmFkExpression<?> visitToOneFkReference(HqlParser.ToOneFkReferenceContext ctx) {
 		final var sqmPath = consumeDomainPath( (HqlParser.PathContext) ctx.getChild( 2 ) );
-		final var toOneReference = sqmPath.getReferencedPathSource();
+		final var toOneReference = sqmPath.getResolvedModel();
 		final boolean validToOneRef =
 				toOneReference.getBindableType() == Bindable.BindableType.SINGULAR_ATTRIBUTE
-						&& toOneReference instanceof EntitySqmPathSource;
+						&& toOneReference.getPathType() instanceof SqmEntityDomainType<?>;
 		if ( !validToOneRef ) {
 			throw new FunctionArgumentException(
 					String.format(
@@ -6073,24 +6071,26 @@ private SqmPath<?> consumeDomainPath(HqlParser.SimplePathContext sequence) {
 
 	private SqmPath<?> consumeManagedTypeReference(HqlParser.PathContext parserPath) {
 		final var sqmPath = consumeDomainPath( parserPath );
-		final var pathSource = sqmPath.getReferencedPathSource();
-		if ( pathSource.getPathType() instanceof ManagedDomainType<?> ) {
+		final var pathType = sqmPath.getReferencedPathSource().getPathType();
+		if ( pathType instanceof ManagedDomainType<?> || pathType instanceof AnyMappingDomainType<?> ) {
 			return sqmPath;
 		}
 		else {
-			throw new PathException( "Expecting ManagedType valued path [" + sqmPath.getNavigablePath()
-					+ "], but found: " + pathSource.getPathType() );
+			throw new PathException( "Expecting ManagedType or @Any valued path ["
+						+ sqmPath.getNavigablePath() + "], but found: " + pathType );
 		}
 	}
 
 	private SqmPath<?> consumePluralAttributeReference(HqlParser.PathContext parserPath) {
 		final var sqmPath = consumeDomainPath( parserPath );
-		if ( sqmPath.getReferencedPathSource() instanceof PluralPersistentAttribute ) {
+		final var pathSource = sqmPath.getReferencedPathSource();
+		if ( pathSource instanceof PluralPersistentAttribute ) {
 			return sqmPath;
 		}
 		else {
-			throw new PathException( "Expecting plural attribute valued path [" + sqmPath.getNavigablePath()
-					+ "], but found: " + sqmPath.getReferencedPathSource().getPathType() );
+			throw new PathException( "Expecting plural attribute valued path ["
+						+ sqmPath.getNavigablePath() + "], but found: "
+						+ pathSource.getPathType() );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/StandardHqlTranslator.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/StandardHqlTranslator.java
index 3b6eef1846c7..50ee1fbc9bb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/StandardHqlTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/StandardHqlTranslator.java
@@ -8,7 +8,6 @@
 import org.antlr.v4.runtime.InputMismatchException;
 import org.antlr.v4.runtime.NoViableAltException;
 import org.hibernate.QueryException;
-import org.hibernate.grammars.hql.HqlLexer;
 import org.hibernate.grammars.hql.HqlParser;
 import org.hibernate.query.sqm.EntityTypeException;
 import org.hibernate.query.sqm.PathElementException;
@@ -24,7 +23,6 @@
 import org.hibernate.query.sqm.spi.SqmCreationContext;
 import org.hibernate.query.sqm.tree.SqmStatement;
 
-import org.antlr.v4.runtime.ANTLRErrorListener;
 import org.antlr.v4.runtime.BailErrorStrategy;
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.DefaultErrorStrategy;
@@ -33,7 +31,6 @@
 import org.antlr.v4.runtime.atn.PredictionMode;
 import org.antlr.v4.runtime.misc.ParseCancellationException;
 
-import static java.util.stream.Collectors.toList;
 import static org.hibernate.query.hql.HqlLogging.QUERY_LOGGER;
 
 /**
@@ -91,10 +88,9 @@ public <R> SqmStatement<R> translate(String query, Class<R> expectedResultType)
 
 	private HqlParser.StatementContext parseHql(String hql) {
 		// Build the lexer
-		final HqlLexer hqlLexer = HqlParseTreeBuilder.INSTANCE.buildHqlLexer( hql );
-
+		final var hqlLexer = HqlParseTreeBuilder.INSTANCE.buildHqlLexer( hql );
 		// Build the parse tree
-		final HqlParser hqlParser = HqlParseTreeBuilder.INSTANCE.buildHqlParser( hql, hqlLexer );
+		final var hqlParser = HqlParseTreeBuilder.INSTANCE.buildHqlParser( hql, hqlLexer );
 
 		// try to use SLL(k)-based parsing first - it's faster
 		hqlParser.getInterpreter().setPredictionMode( PredictionMode.SLL );
@@ -104,7 +100,7 @@ private HqlParser.StatementContext parseHql(String hql) {
 		try {
 			return hqlParser.statement();
 		}
-		catch (ParseCancellationException e) {
+		catch ( ParseCancellationException e ) {
 			// When resetting the parser, its CommonTokenStream will seek(0) i.e. restart emitting buffered tokens.
 			// This is enough when reusing the lexer and parser, and it would be wrong to also reset the lexer.
 			// Resetting the lexer causes it to hand out tokens again from the start, which will then append to the
@@ -117,14 +113,12 @@ private HqlParser.StatementContext parseHql(String hql) {
 			// fall back to LL(k)-based parsing
 			hqlParser.getInterpreter().setPredictionMode( PredictionMode.LL );
 			hqlParser.setErrorHandler( new DefaultErrorStrategy() );
-
-			final ANTLRErrorListener errorListener = new BaseErrorListener() {
+			hqlParser.addErrorListener( new BaseErrorListener() {
 				@Override
-				public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) {
-					throw new SyntaxException( prettifyAntlrError( offendingSymbol, line, charPositionInLine, msg, e, hql, true ), hql );
+				public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e1) {
+					throw new SyntaxException( prettifyAntlrError( offendingSymbol, line, charPositionInLine, msg, e1, hql, true ), hql );
 				}
-			};
-			hqlParser.addErrorListener( errorListener );
+			} );
 
 			return hqlParser.statement();
 		}
@@ -163,8 +157,34 @@ public static String prettifyAntlrError(
 				errorText += "'*' (empty query string)";
 			}
 			else {
-				String lineText = hql.lines().collect( toList() ).get( line -1 );
-				String text = lineText.substring( 0, charPositionInLine) + "*" + lineText.substring(charPositionInLine);
+				// don't use String.lines() because it strips trailing blank lines
+				final String[] lines = hql.split( "\\R", -1 );
+				final String currentLineText = lines[line - 1];
+				final String errorLineText;
+				if ( currentLineText.isEmpty() ) { // no text on the line with the error
+					if ( lines.length == line ) { // on last line
+						// back up to end of previous line, if any
+						if ( line == 1 ) {
+							// query has no text
+							errorLineText = currentLineText;
+						}
+						else {
+							errorLineText = lines[line - 2];
+							charPositionInLine = errorLineText.length();
+						}
+					}
+					else {
+						// move forward to start of next line
+						errorLineText = lines[line];
+						charPositionInLine = 0;
+					}
+				}
+				else {
+					errorLineText = currentLineText;
+				}
+				final String text =
+						errorLineText.substring( 0, charPositionInLine )
+							+ "*" + errorLineText.substring( charPositionInLine );
 				errorText += "'" + text + "'";
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SemanticPathPart.java b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SemanticPathPart.java
index a8947c0284f5..b8b84f3c9c8a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SemanticPathPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/spi/SemanticPathPart.java
@@ -5,22 +5,17 @@
 package org.hibernate.query.hql.spi;
 
 import org.hibernate.query.sqm.tree.domain.SqmPath;
-import org.hibernate.query.sqm.tree.domain.SqmSimplePath;
 import org.hibernate.query.sqm.tree.expression.SqmExpression;
 
-/**
- * @asciidoc
- *
- * Contract for things that can be part of a path structure, including:
- *
- * 		* package name
- * 		* class name
- * 		* field name
- * 		* enum name
- * 		* {@link SqmSimplePath}
- *
- * @author Steve Ebersole
- */
+/// Contract for things that can be part of a path structure, including:
+///
+/// * package name
+/// * class name
+/// * field name
+/// * enum name
+/// * [org.hibernate.query.sqm.tree.domain.SqmSimplePath]
+///
+/// @author Steve Ebersole
 public interface SemanticPathPart {
 	SemanticPathPart resolvePathPart(
 			String name,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryArguments.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryArguments.java
new file mode 100644
index 000000000000..b11e89d9416d
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryArguments.java
@@ -0,0 +1,127 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.query.internal;
+
+import jakarta.persistence.metamodel.Type;
+import org.hibernate.HibernateException;
+import org.hibernate.type.BindingContext;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.java.spi.EntityJavaType;
+
+import java.util.Collection;
+
+import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
+
+/**
+ * @author Gavin King
+ */
+public class QueryArguments {
+
+	private static boolean isInstance(Object value, JavaType<?> javaType) {
+		try {
+			if ( value == null ) {
+				return true;
+			}
+			else if ( javaType instanceof EntityJavaType<?> ) {
+				// special handling for entity arguments due to
+				// the possibility of an uninitialized proxy
+				// (which we don't want or need to fetch)
+				final var javaTypeClass = javaType.getJavaTypeClass();
+				final var initializer = extractLazyInitializer( value );
+				final var valueEntityClass =
+						initializer != null
+								? initializer.getPersistentClass()
+								: value.getClass();
+				// accept assignability in either direction
+				return javaTypeClass.isAssignableFrom( valueEntityClass )
+					|| valueEntityClass.isAssignableFrom( javaTypeClass );
+			}
+			else {
+				// require that the argument be assignable to the parameter
+				return javaType.isInstance( javaType.coerce( value ) );
+			}
+		}
+		catch (HibernateException ce) {
+			return false;
+		}
+	}
+
+	public static boolean isInstance(
+			Type<?> parameterType, Object value,
+			BindingContext bindingContext) {
+		if ( value == null ) {
+			return true;
+		}
+		final var sqmExpressible = bindingContext.resolveExpressible( parameterType );
+		assert sqmExpressible != null;
+		final var javaType = sqmExpressible.getExpressibleJavaType();
+		return isInstance( value, javaType );
+	}
+
+	public static boolean areInstances(
+			Type<?> parameterType, Collection<?> values,
+			BindingContext bindingContext) {
+		if ( values.isEmpty() ) {
+			return true;
+		}
+		final var sqmExpressible = bindingContext.resolveExpressible( parameterType );
+		assert sqmExpressible != null;
+		final var javaType = sqmExpressible.getExpressibleJavaType();
+		for ( Object value : values ) {
+			if ( !isInstance( value, javaType ) ) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public static boolean areInstances(
+			Type<?> parameterType, Object[] values,
+			BindingContext bindingContext) {
+		if ( values.length == 0 ) {
+			return true;
+		}
+		if ( parameterType.getJavaType()
+				.isAssignableFrom( values.getClass().getComponentType() ) ) {
+			return true;
+		}
+		final var sqmExpressible = bindingContext.resolveExpressible( parameterType );
+		assert sqmExpressible != null;
+		final var javaType = sqmExpressible.getExpressibleJavaType();
+		for ( Object value : values ) {
+			if ( !isInstance( value, javaType ) ) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public static <T> T cast(Object value, JavaType<T> javaType) {
+		if ( value == null ) {
+			return null;
+		}
+		else if ( javaType instanceof EntityJavaType<?> ) {
+			// special handling for entity arguments due to
+			// the possibility of an uninitialized proxy
+			// (which we don't want or need to fetch)
+			if ( isInstance( value, javaType ) ) {
+				// The proxy might not literally be an
+				// instance of the entity class represented
+				// by the unreified type T, but it is an
+				// instance in spirit
+				//noinspection unchecked
+				return (T) value;
+			}
+			else {
+				throw new ClassCastException( "Cannot cast to entity type '"
+							+ javaType.getJavaTypeClass().getTypeName() + "'" );
+			}
+		}
+		else {
+			// require that the argument be assignable to the parameter
+			return javaType.cast( javaType.coerce( value ) );
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java
index 7c3759472b80..5884213c5fb0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java
@@ -18,7 +18,6 @@
 import org.hibernate.query.spi.QueryInterpretationCache;
 import org.hibernate.query.spi.QueryPlan;
 import org.hibernate.query.spi.SelectQueryPlan;
-import org.hibernate.query.spi.SimpleHqlInterpretationImpl;
 import org.hibernate.query.sql.spi.ParameterInterpretation;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.service.ServiceRegistry;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
index 1341b1fdd2ff..0b2279627f09 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
@@ -4,20 +4,25 @@
  */
 package org.hibernate.query.internal;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
+import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.metamodel.mapping.ModelPart;
+import org.hibernate.query.QueryArgumentException;
 import org.hibernate.type.BindableType;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.query.spi.QueryParameterBinding;
 import org.hibernate.query.spi.QueryParameterBindingTypeResolver;
-import org.hibernate.query.spi.QueryParameterBindingValidator;
 import org.hibernate.query.sqm.NodeBuilder;
+import org.hibernate.type.NullType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 
@@ -31,18 +36,18 @@
  *
  * @author Steve Ebersole
  */
-public class QueryParameterBindingImpl<T> implements QueryParameterBinding<T>, JavaType.CoercionContext {
+public class QueryParameterBindingImpl<T> implements QueryParameterBinding<T> {
 	private final QueryParameter<T> queryParameter;
 	private final SessionFactoryImplementor sessionFactory;
 
 	private boolean isBound;
 	private boolean isMultiValued;
 
-	private @Nullable BindableType<? super T> bindType;
+	private @Nullable BindableType<T> bindType;
 	private @Nullable MappingModelExpressible<T> type;
-	private @Nullable TemporalType explicitTemporalPrecision;
+	private @Nullable @SuppressWarnings("deprecation") TemporalType explicitTemporalPrecision;
 
-	private Object bindValue;
+	private T bindValue;
 	private Collection<? extends T> bindValues;
 
 	/**
@@ -60,7 +65,7 @@ protected QueryParameterBindingImpl(
 	public QueryParameterBindingImpl(
 			QueryParameter<T> queryParameter,
 			SessionFactoryImplementor sessionFactory,
-			BindableType<? super T> bindType) {
+			@Nullable BindableType<T> bindType) {
 		this.queryParameter = queryParameter;
 		this.sessionFactory = sessionFactory;
 		this.bindType = bindType;
@@ -70,13 +75,17 @@ private QueryParameterBindingTypeResolver getParameterBindingTypeResolver() {
 		return sessionFactory.getMappingMetamodel();
 	}
 
+	public TypeConfiguration getTypeConfiguration() {
+		return sessionFactory.getTypeConfiguration();
+	}
+
 	@Override
-	public @Nullable BindableType<? super T> getBindType() {
+	public @Nullable BindableType<T> getBindType() {
 		return bindType;
 	}
 
 	@Override
-	public @Nullable TemporalType getExplicitTemporalPrecision() {
+	public @Nullable @SuppressWarnings("deprecation") TemporalType getExplicitTemporalPrecision() {
 		return explicitTemporalPrecision;
 	}
 
@@ -107,90 +116,101 @@ public T getBindValue() {
 		if ( isMultiValued ) {
 			throw new IllegalStateException( "Binding is multi-valued; illegal call to #getBindValue" );
 		}
-
-		//TODO: I believe this cast is unsound due to coercion
-		return (T) bindValue;
+		return bindValue;
 	}
 
 	@Override
-	public void setBindValue(T value, boolean resolveJdbcTypeIfNecessary) {
-		if ( !handleAsMultiValue( value, null ) ) {
-			final Object coerced = coerceIfNotJpa( value );
+	public void setBindValue(Object value, boolean resolveJdbcTypeIfNecessary) {
+		if ( handleAsMultiValue( value, bindType ) ) {
+			setBindValues( (Collection<?>) value );
+		}
+		else {
+			final Object coerced = coerce( value );
 			validate( coerced );
-
 			if ( value == null ) {
 				// needed when setting a null value to the parameter of a native SQL query
 				// TODO: this does not look like a very disciplined way to handle this
 				bindNull( resolveJdbcTypeIfNecessary );
 			}
 			else {
-				bindValue( coerced );
+				initBindType( value );
+				bindSingleValue( coerced );
 			}
 		}
 	}
 
+	@Override
+	public void setBindValue(
+			Object value,
+			@SuppressWarnings("deprecation")
+			TemporalType temporalTypePrecision) {
+		if ( handleAsMultiValue( value, bindType ) ) {
+			setBindValues( (Collection<?>) value, temporalTypePrecision );
+		}
+		else {
+			setExplicitTemporalPrecision( temporalTypePrecision );
+			final Object coerced = coerce( value );
+			validate( coerced );
+			initBindType( value );
+			bindSingleValue( coerced );
+		}
+	}
+
+	@Override
+	public <A> void setBindValue(A value, @Nullable BindableType<A> clarifiedType) {
+		// don't coerce, because value is already of the clarified type
+		validate( value );
+		clarifyType( value, clarifiedType );
+		bindSingleValue( value );
+	}
+
+	private void initBindType(Object value) {
+		if ( bindType == null ) {
+			@SuppressWarnings("unchecked")
+			// If there is no bindType set, then this is effectively a
+			// parameter of the top type. At least arguably safe cast.
+			final var self = (QueryParameterBindingImpl<Object>) this;
+			//noinspection UnnecessaryLocalVariable (needed to make javac happy)
+			final var valueType =
+					getParameterBindingTypeResolver()
+							.resolveParameterBindType( value );
+			self.bindType = valueType;
+		}
+	}
+
 	private void bindNull(boolean resolveJdbcTypeIfNecessary) {
 		isBound = true;
 		bindValue = null;
 		if ( resolveJdbcTypeIfNecessary && bindType == null ) {
-			bindType = (BindableType<? super T>)
+			final var nullType =
 					getTypeConfiguration().getBasicTypeRegistry()
 							.getRegisteredType( "null" );
-		}
-	}
-
-	private boolean handleAsMultiValue(T value, @Nullable BindableType<T> bindableType) {
-		if ( queryParameter.allowsMultiValuedBinding()
-				&& value instanceof Collection
-				&& !( bindableType == null
-					? isRegisteredAsBasicType( value.getClass() )
-					: bindableType.getJavaType().isInstance( value ) ) ) {
 			//noinspection unchecked
-			setBindValues( (Collection<T>) value );
-			return true;
-		}
-		else {
-			return false;
+			bindType = (BindableType<T>) nullType;
 		}
 	}
 
-	private boolean isRegisteredAsBasicType(Class<?> valueClass) {
-		return getTypeConfiguration().getBasicTypeForJavaType( valueClass ) != null;
+	private boolean handleAsMultiValue(Object value, @Nullable BindableType<?> bindableType) {
+		return queryParameter.allowsMultiValuedBinding()
+			&& value instanceof Collection
+			&& !validInstance( value, bindableType );
 	}
 
-	private void bindValue(Object value) {
+	private void bindSingleValue(Object value) {
+		bindValue = cast( value );
+		bindValues = null;
+		isMultiValued = false;
 		isBound = true;
-		bindValue = value;
-		if ( canBindValueBeSet( value, bindType ) ) {
-			bindType = getParameterBindingTypeResolver().resolveParameterBindType( value );
-		}
 	}
 
-	@Override
-	public void setBindValue(T value, @Nullable BindableType<T> clarifiedType) {
-		if ( !handleAsMultiValue( value, clarifiedType ) ) {
-			if ( clarifiedType != null ) {
-				bindType = clarifiedType;
-			}
-
-			final Object coerced = coerce( value );
-			validate( coerced, clarifiedType );
-			bindValue( coerced );
-		}
+	private boolean validInstance(Object value, @Nullable BindableType<?> bindableType) {
+		return bindableType == null
+				? isRegisteredAsBasicType( value.getClass() )
+				: bindableType.getJavaType().isInstance( value );
 	}
 
-	@Override
-	public void setBindValue(T value, TemporalType temporalTypePrecision) {
-		if ( !handleAsMultiValue( value, null ) ) {
-			if ( bindType == null ) {
-				bindType = queryParameter.getHibernateType();
-			}
-
-			final Object coerced = coerceIfNotJpa( value );
-			validate( coerced, temporalTypePrecision );
-			bindValue( coerced );
-			setExplicitTemporalPrecision( temporalTypePrecision );
-		}
+	private boolean isRegisteredAsBasicType(Class<?> valueClass) {
+		return getTypeConfiguration().getBasicTypeForJavaType( valueClass ) != null;
 	}
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -205,55 +225,58 @@ public Collection<? extends T> getBindValues() {
 	}
 
 	@Override
-	public void setBindValues(Collection<? extends T> values) {
-		if ( !queryParameter.allowsMultiValuedBinding() ) {
-			throw new IllegalArgumentException(
-					"Illegal attempt to bind a collection value to a single-valued parameter"
-			);
-		}
-
-		this.isBound = true;
-		this.isMultiValued = true;
-
-		this.bindValue = null;
-		this.bindValues = values;
-
-		final var iterator = values.iterator();
-		T value = null;
-		while ( value == null && iterator.hasNext() ) {
-			value = iterator.next();
-		}
-
-		if ( canBindValueBeSet( value, bindType ) ) {
-			bindType = getParameterBindingTypeResolver().resolveParameterBindType( value );
-		}
+	public void setBindValues(Collection<?> values) {
+		assertMultivalued();
+		final var coerced = values.stream().map( this::coerce ).toList();
+		coerced.forEach( this::validate );
+		initBindType( firstNonNull( values ) );
+		bindMultipleValues( coerced );
 	}
 
 	@Override
-	public void setBindValues(Collection<? extends T> values, BindableType<T> clarifiedType) {
-		if ( clarifiedType != null ) {
-			bindType = clarifiedType;
-		}
+	public void setBindValues(
+			Collection<?> values,
+			@SuppressWarnings("deprecation") TemporalType temporalTypePrecision) {
+		setExplicitTemporalPrecision( temporalTypePrecision );
 		setBindValues( values );
 	}
 
 	@Override
-	public void setBindValues(
-			Collection<? extends T> values,
-			TemporalType temporalTypePrecision,
-			TypeConfiguration typeConfiguration) {
-		setBindValues( values );
-		setExplicitTemporalPrecision( temporalTypePrecision );
+	public <V> void setBindValues(Collection<? extends V> values, BindableType<V> clarifiedType) {
+		assertMultivalued();
+		// don't coerce, because value is already of the clarified type
+		values.forEach( this::validate );
+		clarifyType( values, clarifiedType );
+		bindMultipleValues( values );
+	}
+
+	private void bindMultipleValues(Collection<?> coerced) {
+		final List<T> list = new ArrayList<>();
+		for ( var value : coerced ) {
+			list.add( cast( value ) );
+		}
+		bindValues = list;
+		bindValue = null;
+		isMultiValued = true;
+		isBound = true;
 	}
 
-	private void setExplicitTemporalPrecision(TemporalType precision) {
+	private void assertMultivalued() {
+		if ( !queryParameter.allowsMultiValuedBinding() ) {
+			throw new IllegalArgumentException(
+					"Illegal attempt to bind a collection value to a single-valued parameter"
+			);
+		}
+	}
+
+	private void setExplicitTemporalPrecision(@SuppressWarnings("deprecation") TemporalType precision) {
 		explicitTemporalPrecision = precision;
 		if ( bindType == null || isTemporal( determineJavaType( bindType ) ) ) {
 			bindType = resolveTemporalPrecision( precision, bindType, getCriteriaBuilder() );
 		}
 	}
 
-	private JavaType<? super T> determineJavaType(BindableType<? super T> bindType) {
+	private JavaType<T> determineJavaType(BindableType<T> bindType) {
 		return getCriteriaBuilder().resolveExpressible( bindType ).getExpressibleJavaType();
 	}
 
@@ -264,88 +287,133 @@ private JavaType<? super T> determineJavaType(BindableType<? super T> bindType)
 
 	@Override @SuppressWarnings("unchecked")
 	public boolean setType(@Nullable MappingModelExpressible<T> type) {
+		final MappingModelExpressible<T> previousType = this.type;
 		this.type = type;
 		// If the bind type is undetermined or the given type is a model part, then we try to apply a new bind type
 		if ( bindType == null || bindType.getJavaType() == Object.class || type instanceof ModelPart ) {
 			if ( type instanceof BindableType<?> ) {
 				final boolean changed = bindType != null && type != bindType;
-				bindType = (BindableType<? super T>) type;
+				bindType = (BindableType<T>) type;
 				return changed;
 			}
 			else if ( type instanceof BasicValuedMapping basicValuedMapping ) {
 				final var jdbcMapping = basicValuedMapping.getJdbcMapping();
 				if ( jdbcMapping instanceof BindableType<?> ) {
 					final boolean changed = bindType != null && jdbcMapping != bindType;
-					bindType = (BindableType<? super T>) jdbcMapping;
-					return changed;
+					if ( changed && previousType instanceof BasicValuedMapping previousBasicValuedMapping
+						&& !areTypesCompatible( basicValuedMapping, previousBasicValuedMapping ) ) {
+						// An SQM parameter is used in multiple type-incompatible contexts,
+						// so let's play safe and not force a type onto the binding,
+						// but let SQM type inference dictate the type instead
+						this.type = NullType.INSTANCE;
+						this.bindType = (BindableType<T>) NullType.INSTANCE;
+						return true;
+					}
+					else {
+						this.bindType = (BindableType<T>) jdbcMapping;
+						return changed;
+					}
 				}
 			}
 		}
 		return false;
 	}
 
-	private void validate(Object value) {
-		QueryParameterBindingValidator.INSTANCE.validate( getBindType(), value, getCriteriaBuilder() );
+	private boolean areTypesCompatible(BasicValuedMapping mapping1, BasicValuedMapping mapping2) {
+		final JdbcMapping jdbcMapping1 = mapping1.getSingleJdbcMapping();
+		final JdbcMapping jdbcMapping2 = mapping2.getSingleJdbcMapping();
+		// We can assume the java types are compatible, since this is relevant for cases when using the same parameter
+		// in multiple contexts e.g. assignment or comparison.
+		return jdbcMapping1.getJdbcType() == jdbcMapping2.getJdbcType()
+				&& jdbcMapping1.getValueConverter() == jdbcMapping2.getValueConverter();
 	}
 
-	private void validate(Object value, BindableType<?> clarifiedType) {
-		QueryParameterBindingValidator.INSTANCE.validate( clarifiedType, value, getCriteriaBuilder() );
+	private <V> void clarifyType(Object valueOrValues, BindableType<V> clarifiedType) {
+		if ( clarifiedType != null ) {
+			checkClarifiedType( clarifiedType, valueOrValues );
+			@SuppressWarnings("unchecked") // safe
+			final var newType = (BindableType<T>) clarifiedType;
+			bindType = newType;
+		}
 	}
 
-	private void validate(Object value, TemporalType clarifiedTemporalType) {
-		QueryParameterBindingValidator.INSTANCE.validate( getBindType(), value, clarifiedTemporalType, getCriteriaBuilder() );
+	private <A> void checkClarifiedType(
+			@NonNull BindableType<A> clarifiedType,
+			Object valueOrValues) {
+		final var parameterType = queryParameter.getParameterType();
+		if ( parameterType != null ) {
+			final var clarifiedJavaType = clarifiedType.getJavaType();
+			if ( !parameterType.isAssignableFrom( clarifiedJavaType ) ) {
+				throw new QueryArgumentException(
+						"Given type is incompatible with parameter type",
+						parameterType, clarifiedJavaType, valueOrValues
+				);
+			}
+		}
+		else {
+			assert queryParameter.getHibernateType() == null;
+		}
 	}
 
-	@Override
-	public TypeConfiguration getTypeConfiguration() {
-		return sessionFactory.getTypeConfiguration();
+	private T cast(Object value) {
+		if ( value == null ) {
+			return null;
+		}
+		else {
+			final var bindableType =
+					getCriteriaBuilder()
+							.resolveExpressible( bindType );
+			if ( bindableType != null ) {
+				return QueryArguments.cast( value,
+						bindableType.getExpressibleJavaType() );
+			}
+			else if ( bindType != null ) {
+				return bindType.getJavaType().cast( value );
+			}
+			else {
+				// no typing information, but in this
+				// case we can view this as T = Object
+				// noinspection unchecked
+				return (T) value;
+			}
+		}
 	}
 
-	private Object coerceIfNotJpa(T value) {
-		return sessionFactory.getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled()
-				? value
-				: coerce( value );
+	private void validate(Object value) {
+		QueryParameterBindingValidator.validate( queryParameter, bindType, value, sessionFactory );
 	}
 
-	private Object coerce(T value) {
+	private Object coerce(Object value) {
 		try {
-			if ( canValueBeCoerced( bindType ) ) {
+			if ( bindType != null ) {
 				return coerce( value, bindType );
 			}
-			else if ( canValueBeCoerced( queryParameter.getHibernateType() ) ) {
-				return coerce( value, queryParameter.getHibernateType() );
-			}
+//			else if ( queryParameter.getHibernateType() != null ) {
+//				return coerce( value, queryParameter.getHibernateType() );
+//			}
 			else {
 				return value;
 			}
 		}
 		catch (HibernateException ex) {
-			throw new IllegalArgumentException(
-					String.format(
-							"Parameter value [%s] did not match expected type [%s]",
-							value,
-							bindType
-					),
-					ex
-			);
+			throw new QueryArgumentException( "Argument to query parameter has an incompatible type: " + ex.getMessage(),
+					queryParameter.getParameterType(), value );
 		}
 	}
 
-	private Object coerce(T value, BindableType<? super T> parameterType) {
-		if ( value == null ) {
-			return null;
-		}
-		else {
-			return getCriteriaBuilder().resolveExpressible( parameterType )
-					.getExpressibleJavaType().coerce( value, this );
-		}
+	private Object coerce(Object value, BindableType<T> parameterType) {
+		return value == null ? null
+				: getCriteriaBuilder().resolveExpressible( parameterType )
+						.getExpressibleJavaType().coerce( value );
 	}
 
-	private static boolean canValueBeCoerced(BindableType<?> bindType) {
-		return bindType != null;
+	private static <T> @Nullable T firstNonNull(Collection<? extends T> values) {
+		final var iterator = values.iterator();
+		T value = null;
+		while ( value == null && iterator.hasNext() ) {
+			value = iterator.next();
+		}
+		return value;
 	}
 
-	private static boolean canBindValueBeSet(Object value, BindableType<?> bindType) {
-		return value != null && bindType == null;
-	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingValidator.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingValidator.java
new file mode 100644
index 000000000000..2ab637b5a014
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingValidator.java
@@ -0,0 +1,113 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.query.internal;
+
+import java.util.Collection;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.query.QueryArgumentException;
+import org.hibernate.query.QueryParameter;
+import org.hibernate.type.BindableType;
+
+import static org.hibernate.query.internal.QueryArguments.areInstances;
+import static org.hibernate.query.internal.QueryArguments.isInstance;
+
+/**
+ * @author Andrea Boriero
+ */
+class QueryParameterBindingValidator {
+
+	private QueryParameterBindingValidator() {
+	}
+
+	public static void validate(
+			QueryParameter<?> parameter,
+			BindableType<?> parameterType,
+			Object argument,
+			SessionFactoryImplementor factory) {
+		if ( argument != null && parameterType != null ) {
+			final var parameterJavaType = getParameterJavaType( parameterType, factory );
+			if ( parameterJavaType != null ) {
+				final var criteriaBuilder = factory.getQueryEngine().getCriteriaBuilder();
+				if ( argument instanceof Collection<?> collection
+						&& !Collection.class.isAssignableFrom( parameterJavaType ) ) {
+					// We have a collection passed in where we were expecting a non-collection.
+					// NOTE: This can happen in Hibernate's notion of "parameter list" binding.
+					// NOTE2: The case of a collection value and an expected collection
+					// 	      (if that can even happen) will fall through to the main check.
+					if ( !areInstances( parameterType, collection, criteriaBuilder ) ) {
+						throw queryArgumentException(
+								"Collection-valued argument to parameter %s has an incompatible type",
+								parameterJavaType, collection, parameter );
+					}
+				}
+				else if ( !argument.getClass().isArray() ) {
+					// assume single-valued argument
+					if ( !isInstance( parameterType, argument, criteriaBuilder ) ) {
+						throw queryArgumentException(
+								"Argument to parameter %s has an incompatible type",
+								parameterJavaType, argument, parameter );
+					}
+				}
+				else {
+					validateArrayValuedParameterBinding( parameterJavaType, argument, parameter );
+				}
+			}
+			// else nothing we can check
+		}
+	}
+
+	private static Class<?> getParameterJavaType(
+			BindableType<?> parameterType, SessionFactoryImplementor factory) {
+		final var javaType = parameterType.getJavaType();
+		return javaType != null
+				? javaType
+				: factory.getQueryEngine().getCriteriaBuilder()
+						.resolveExpressible( parameterType )
+						.getJavaType();
+	}
+
+	private static @NonNull QueryArgumentException queryArgumentException(
+			String messagePattern, Class<?> parameterJavaType, Object value, QueryParameter<?> parameter) {
+		final String message = String.format( messagePattern,
+				parameter.isNamed() ? "named '" + parameter.getName() + "'"
+						: "at position " + parameter.getPosition() );
+		return new QueryArgumentException( message, parameterJavaType, value );
+	}
+
+	private static void validateArrayValuedParameterBinding(
+			Class<?> parameterType, Object value, QueryParameter<?> parameter) {
+		if ( !parameterType.isArray() ) {
+			throw queryArgumentException( "Unexpected array-valued argument to parameter %s",
+					parameterType, value, parameter );
+		}
+
+		final var componentType = value.getClass().getComponentType();
+		final var parameterComponentType = parameterType.getComponentType();
+		if ( componentType.isPrimitive() ) {
+			// We have a primitive array.
+			// We validate that the actual array has the component type (type of elements)
+			// that we expect based on the component type of the parameter specification.
+			if ( !parameterComponentType.isAssignableFrom( componentType ) ) {
+				throw queryArgumentException(
+						"Primitive array-valued argument to parameter %s has an incompatible component type",
+						parameterType, value, parameter );
+			}
+		}
+		else {
+			// We have an object array.
+			// Here we loop over the array and physically check each element against the
+			// type we expect based on the component type of the parameter specification.
+			for ( Object element : (Object[]) value ) {
+				if ( element != null && !parameterComponentType.isInstance( element ) ) {
+					throw queryArgumentException(
+							"Array-valued argument to parameter %s has an element with an incompatible type",
+							parameterComponentType, element, parameter );
+				}
+			}
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
index 281a0b5de19e..033feee2ddf3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
@@ -13,6 +13,7 @@
 
 import org.hibernate.Incubating;
 import org.hibernate.QueryParameterException;
+import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
 import org.hibernate.cache.MutableCacheKeyBuilder;
 import org.hibernate.cache.spi.QueryKey;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -29,7 +30,9 @@
 import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.engine.internal.CacheHelper.addBasicValueToCacheKey;
+import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
+import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
 import static org.hibernate.internal.util.collections.CollectionHelper.linkedMapOfSize;
 import static org.hibernate.internal.util.collections.CollectionHelper.mapOfSize;
 
@@ -65,10 +68,11 @@ private QueryParameterBindingsImpl(
 			ParameterMetadataImplementor parameterMetadata) {
 		this.parameterMetadata = parameterMetadata;
 		final var queryParameters = parameterMetadata.getRegistrations();
-		this.parameterBindingMap = linkedMapOfSize( queryParameters.size() );
-		this.parameterBindingMapByNameOrPosition = mapOfSize( queryParameters.size() );
+		parameterBindingMap = linkedMapOfSize( queryParameters.size() );
+		parameterBindingMapByNameOrPosition = mapOfSize( queryParameters.size() );
 		for ( var queryParameter : queryParameters ) {
-			parameterBindingMap.put( queryParameter, createBinding( sessionFactory, parameterMetadata, queryParameter ) );
+			parameterBindingMap.put( queryParameter,
+					createBinding( sessionFactory, parameterMetadata, queryParameter ) );
 		}
 		for ( var entry : parameterBindingMap.entrySet() ) {
 			final var queryParameter = entry.getKey();
@@ -83,28 +87,30 @@ else if ( queryParameter.isOrdinal() ) {
 	}
 
 	private static <T> QueryParameterBindingImpl<T> createBinding(
-			SessionFactoryImplementor factory, ParameterMetadataImplementor parameterMetadata, QueryParameter<T> parameter) {
+			SessionFactoryImplementor factory,
+			ParameterMetadataImplementor parameterMetadata,
+			QueryParameter<T> parameter) {
 		return new QueryParameterBindingImpl<>( parameter, factory,
 				parameterMetadata.getInferredParameterType( parameter ) );
 	}
 
-	private QueryParameterBindingsImpl(QueryParameterBindingsImpl original, SessionFactoryImplementor sessionFactory) {
+	private QueryParameterBindingsImpl(
+			QueryParameterBindingsImpl original,
+			SessionFactoryImplementor sessionFactory) {
 		this.parameterMetadata = original.parameterMetadata;
 		this.parameterBindingMap = linkedMapOfSize( original.parameterBindingMap.size() );
-		this.parameterBindingMapByNameOrPosition = mapOfSize( original.parameterBindingMapByNameOrPosition.size() );
-		for ( var entry : original.parameterBindingMap.entrySet() ) {
-			parameterBindingMap.put( entry.getKey(), createBinding( sessionFactory, entry.getValue() ) );
-		}
-		for ( var entry : parameterBindingMap.entrySet() ) {
-			final var queryParameter = entry.getKey();
-			final var parameterBinding = entry.getValue();
+		this.parameterBindingMapByNameOrPosition =
+				mapOfSize( original.parameterBindingMapByNameOrPosition.size() );
+		original.parameterBindingMap.forEach( (key, value) ->
+				parameterBindingMap.put( key, createBinding( sessionFactory, value ) ) );
+		parameterBindingMap.forEach( (queryParameter, parameterBinding) -> {
 			if ( queryParameter.isNamed() ) {
 				parameterBindingMapByNameOrPosition.put( queryParameter.getName(), parameterBinding );
 			}
-			else if ( queryParameter.getPosition() != null ) {
+			else if ( queryParameter.isOrdinal() ) {
 				parameterBindingMapByNameOrPosition.put( queryParameter.getPosition(), parameterBinding );
 			}
-		}
+		} );
 	}
 
 	private static <T> QueryParameterBindingImpl<T> createBinding(
@@ -129,30 +135,32 @@ public <P> QueryParameterBinding<P> getBinding(QueryParameterImplementor<P> para
 					"Cannot create binding for parameter reference [" + parameter + "] - reference is not a parameter of this query"
 			);
 		}
-		//noinspection unchecked
-		return (QueryParameterBinding<P>) binding;
+		if ( !binding.getQueryParameter().equals( parameter ) ) {
+			throw new IllegalStateException( "Parameter binding corrupted for: " + parameter.getName() );
+		}
+		@SuppressWarnings("unchecked") // safe because we checked the parameter
+		final var castBinding = (QueryParameterBinding<P>) binding;
+		return castBinding;
 	}
 
 	@Override
-	public <P> QueryParameterBinding<P> getBinding(int position) {
+	public QueryParameterBinding<?> getBinding(int position) {
 		final var binding = parameterBindingMapByNameOrPosition.get( position );
 		if ( binding == null ) {
 			// Invoke this method to throw the exception
 			parameterMetadata.getQueryParameter( position );
 		}
-		//noinspection unchecked
-		return (QueryParameterBinding<P>) binding;
+		return binding;
 	}
 
 	@Override
-	public <P> QueryParameterBinding<P> getBinding(String name) {
+	public QueryParameterBinding<?> getBinding(String name) {
 		final var binding = parameterBindingMapByNameOrPosition.get( name );
 		if ( binding == null ) {
 			// Invoke this method to throw the exception
 			parameterMetadata.getQueryParameter( name );
 		}
-		//noinspection unchecked
-		return (QueryParameterBinding<P>) binding;
+		return binding;
 	}
 
 	@Override
@@ -161,10 +169,14 @@ public void validate() {
 			if ( !entry.getValue().isBound() ) {
 				final var queryParameter = entry.getKey();
 				if ( queryParameter.isNamed() ) {
-					throw new QueryParameterException( "No argument for named parameter ':" + queryParameter.getName() + "'" );
+					throw new QueryParameterException(
+							"No argument for named parameter ':"
+								+ queryParameter.getName() + "'" );
 				}
 				else {
-					throw new QueryParameterException( "No argument for ordinal parameter '?" + queryParameter.getPosition() + "'" );
+					throw new QueryParameterException(
+							"No argument for ordinal parameter '?"
+								+ queryParameter.getPosition() + "'" );
 				}
 			}
 		}
@@ -202,12 +214,20 @@ public boolean hasAnyTransientEntityBindings(SharedSessionContractImplementor se
 	private static boolean isTransientEntityBinding(
 			SharedSessionContractImplementor session, QueryParameterBinding<?> binding, Object value) {
 		return value != null && !isHibernateProxy( value )
+			&& !isUninitializedEnhancedEntity( value )
 			&& binding.getBindType() instanceof EntityDomainType<?> entityDomainType
 			&& session.getFactory().getMappingMetamodel()
 					.getEntityDescriptor( entityDomainType.getHibernateEntityName() )
 					.isTransient( value, session ) == Boolean.TRUE;
 	}
 
+	private static boolean isUninitializedEnhancedEntity(Object value) {
+		return isPersistentAttributeInterceptable( value )
+			&& asPersistentAttributeInterceptable( value ).$$_hibernate_getInterceptor()
+					instanceof EnhancementAsProxyLazinessInterceptor enhancementInterceptor
+			&& !enhancementInterceptor.isInitialized();
+	}
+
 	@Override
 	public void visitBindings(BiConsumer<? super QueryParameter<?>, ? super QueryParameterBinding<?>> action) {
 		parameterBindingMap.forEach( action );
@@ -228,7 +248,8 @@ public QueryKey.ParameterBindingsMemento generateQueryKeyMemento(SharedSessionCo
 
 	private void handleQueryParameters(SharedSessionContractImplementor session, MutableCacheKeyImpl mutableCacheKey) {
 		final var typeConfiguration = session.getFactory().getTypeConfiguration();
-		// We know that parameters are consumed in processing order, this ensures consistency of generated cache keys
+		// We know that parameters are consumed in processing order;
+		// this ensures the consistency of generated cache keys
 		for ( var entry : parameterBindingMap.entrySet() ) {
 			final var queryParameter = entry.getKey();
 			final var binding = entry.getValue();
@@ -298,12 +319,14 @@ else if ( binding.getBindValue() != null ) {
 
 		if ( bindType == null ) {
 			if ( queryParameter.isNamed() ) {
-				throw new QueryParameterException( "Could not determine mapping type for named parameter ':"
-													+ queryParameter.getName() + "'" );
+				throw new QueryParameterException(
+						"Could not determine mapping type for named parameter ':"
+							+ queryParameter.getName() + "'" );
 			}
 			else {
-				throw new QueryParameterException( "Could not determine mapping type for ordinal parameter '?"
-													+ queryParameter.getPosition() + "'" );
+				throw new QueryParameterException(
+						"Could not determine mapping type for ordinal parameter '?"
+							+ queryParameter.getPosition() + "'" );
 			}
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java
index ddba63c2b754..ff6270abf65e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java
@@ -4,7 +4,7 @@
  */
 package org.hibernate.query.internal;
 
-import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.util.function.Consumer;
 
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
@@ -24,7 +24,7 @@
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.ColumnResult;
 
-import static org.hibernate.boot.model.convert.internal.ConverterHelper.extractAttributeConverterParameterizedType;
+import static org.hibernate.internal.util.GenericsHelper.typeArguments;
 
 /**
  * Implementation of {@link ResultMementoBasic} for scalar (basic) results.
@@ -86,15 +86,16 @@ public ResultMementoBasicStandard(
 						typeConfiguration.getJavaTypeRegistry()
 								.resolveDescriptor( converterClass );
 
-				final var parameterizedType =
-						extractAttributeConverterParameterizedType( converterBean.getBeanClass() );
+				final var typeArguments =
+						typeArguments( AttributeConverter.class,
+								converterBean.getBeanClass() );
 
 				builder = new CompleteResultBuilderBasicValuedConverted(
 						explicitColumnName,
 						converterBean,
 						converterJtd,
-						determineDomainJavaType( parameterizedType, typeConfiguration.getJavaTypeRegistry() ),
-						resolveUnderlyingMapping( parameterizedType, typeConfiguration )
+						determineDomainJavaType( typeArguments, typeConfiguration.getJavaTypeRegistry() ),
+						resolveUnderlyingMapping( typeArguments, typeConfiguration )
 				);
 			}
 			else {
@@ -139,25 +140,21 @@ else if ( UserType.class.isAssignableFrom( registeredJtd.getJavaTypeClass() ) )
 	}
 
 	private BasicJavaType<?> determineDomainJavaType(
-			ParameterizedType parameterizedType,
+			Type[] typeArguments,
 			JavaTypeRegistry jtdRegistry) {
-		final var typeParameters = parameterizedType.getActualTypeArguments();
-		final var domainTypeType = typeParameters[ 0 ];
-		final var domainClass = (Class<?>) domainTypeType;
+		final var domainClass = (Class<?>) typeArguments[0];
 		return (BasicJavaType<?>) jtdRegistry.resolveDescriptor( domainClass );
 	}
 
 	private BasicValuedMapping resolveUnderlyingMapping(
-			ParameterizedType parameterizedType,
+			Type[] typeArguments,
 			TypeConfiguration typeConfiguration) {
-		final var typeParameters = parameterizedType.getActualTypeArguments();
-		return typeConfiguration.standardBasicTypeForJavaType( typeParameters[ 1 ] );
+		return typeConfiguration.standardBasicTypeForJavaType( typeArguments[1] );
 	}
 
 	public ResultMementoBasicStandard(
 			String explicitColumnName,
-			BasicType<?> explicitType,
-			ResultSetMappingResolutionContext context) {
+			BasicType<?> explicitType) {
 		this.explicitColumnName = explicitColumnName;
 		this.builder = new CompleteResultBuilderBasicValuedStandard(
 				explicitColumnName,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/SimpleHqlInterpretationImpl.java
similarity index 87%
rename from hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java
rename to hibernate-core/src/main/java/org/hibernate/query/internal/SimpleHqlInterpretationImpl.java
index 9aecd24816db..120bceae71f5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/SimpleHqlInterpretationImpl.java
@@ -2,11 +2,12 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.query.spi;
+package org.hibernate.query.internal;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.hibernate.Internal;
+import org.hibernate.query.spi.HqlInterpretation;
+import org.hibernate.query.spi.ParameterMetadataImplementor;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.tree.SqmStatement;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -17,13 +18,8 @@
 /**
  * Default implementation if {@link HqlInterpretation}.
  *
- * @apiNote This class is now considered internal implementation
- * and will move to an internal package in a future version.
- * Application programs should never depend directly on this class.
- *
  * @author Steve Ebersole
  */
-@Internal
 public class SimpleHqlInterpretationImpl<R> implements HqlInterpretation<R> {
 	private final SqmStatement<R> sqmStatement;
 	private final ParameterMetadataImplementor parameterMetadata;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEntityValued.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEntityValued.java
index 2171d133b976..d22eb84dbbe9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEntityValued.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultBuilderEntityValued.java
@@ -17,7 +17,7 @@
  */
 public interface ResultBuilderEntityValued extends ResultBuilder {
 	@Override
-	EntityResult buildResult(
+	EntityResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState);
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java
index 3564169f3288..48a07fc01743 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java
@@ -67,7 +67,7 @@ public interface ResultSetMapping extends JdbcValuesMappingProducer {
 
 	/**
 	 * Visit the "legacy" fetch builders.
-	 * <p/>
+	 * <p>
 	 * Historically these mappings in Hibernate were defined such that results and fetches are
 	 * unaware of each other.  So while {@link ResultBuilder} encapsulates the fetches (see
 	 * {@link ResultBuilder#visitFetchBuilders}), fetches defined in the legacy way are unassociated
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java
index cf38c55f2281..8ad9b54376a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/DomainResultCreationStateImpl.java
@@ -4,6 +4,8 @@
  */
 package org.hibernate.query.results.internal;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Internal;
 import org.hibernate.LockMode;
 import org.hibernate.engine.FetchTiming;
@@ -12,11 +14,9 @@
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.internal.util.collections.StandardStack;
 import org.hibernate.metamodel.mapping.Association;
-import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
-import org.hibernate.metamodel.mapping.EntityValuedModelPart;
 import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.ModelPart;
-import org.hibernate.metamodel.mapping.internal.CaseStatementDiscriminatorMappingImpl;
+import org.hibernate.metamodel.mapping.internal.CaseStatementDiscriminatorMappingImpl.CaseStatementDiscriminatorExpression;
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.LegacyFetchBuilder;
 import org.hibernate.spi.EntityIdentifierNavigablePath;
@@ -30,12 +30,10 @@
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
-import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.Fetchable;
-import org.hibernate.sql.results.graph.FetchableContainer;
 import org.hibernate.sql.results.graph.entity.EntityResultGraphNode;
 import org.hibernate.sql.results.graph.internal.ImmutableFetchList;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
@@ -47,7 +45,9 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import static org.hibernate.query.results.internal.Builders.implicitFetchBuilder;
 import static org.hibernate.query.results.internal.ResultsHelper.attributeName;
+import static org.hibernate.query.results.internal.ResultsHelper.jdbcPositionToValuesArrayPosition;
 import static org.hibernate.sql.results.ResultsLogger.RESULTS_LOGGER;
 
 /**
@@ -82,7 +82,7 @@ public class DomainResultCreationStateImpl
 	private boolean processingKeyFetches = false;
 	private boolean resolvingCircularFetch;
 	private ForeignKeyDescriptor.Nature currentlyResolvingForeignKeySide;
-	private boolean isProcedureOrNativeQuery;
+	private final boolean isProcedureOrNativeQuery;
 
 	public DomainResultCreationStateImpl(
 			String stateIdentifier,
@@ -132,7 +132,7 @@ public void pushExplicitFetchMementoResolver(Function<Fetchable, FetchBuilder> r
 	}
 
 	public Function<Fetchable, FetchBuilder> getCurrentExplicitFetchMementoResolver() {
-		return fetchBuilderResolverStack.getCurrent();
+		return currentFetchBuilderResolver();
 	}
 
 	public Function<Fetchable, FetchBuilder> popExplicitFetchMementoResolver() {
@@ -146,7 +146,7 @@ public void withExplicitFetchMementoResolver(Function<Fetchable, FetchBuilder> r
 			runnable.run();
 		}
 		finally {
-			final Function<Fetchable, FetchBuilder> popped = popExplicitFetchMementoResolver();
+			final var popped = popExplicitFetchMementoResolver();
 			assert popped == resolver;
 		}
 	}
@@ -172,15 +172,17 @@ public SqlAliasBaseManager getSqlAliasBaseManager() {
 
 	@Override
 	public ModelPart resolveModelPart(NavigablePath navigablePath) {
-		final TableGroup tableGroup = fromClauseAccess.findTableGroup( navigablePath );
+		final var tableGroup = fromClauseAccess.findTableGroup( navigablePath );
 		if ( tableGroup != null ) {
 			return tableGroup.getModelPart();
 		}
 
-		if ( navigablePath.getParent() != null ) {
-			final TableGroup parentTableGroup = fromClauseAccess.findTableGroup( navigablePath.getParent() );
+		final var parentPath = navigablePath.getParent();
+		if ( parentPath != null ) {
+			final var parentTableGroup = fromClauseAccess.findTableGroup( parentPath );
 			if ( parentTableGroup != null ) {
-				return parentTableGroup.getModelPart().findSubPart( navigablePath.getLocalName(), null );
+				return parentTableGroup.getModelPart()
+						.findSubPart( navigablePath.getLocalName(), null );
 			}
 		}
 
@@ -198,7 +200,7 @@ public DomainResultCreationStateImpl getSqlExpressionResolver() {
 
 	@Override
 	public void registerLockMode(String identificationVariable, LockMode explicitLockMode) {
-		if (registeredLockModes == null ) {
+		if ( registeredLockModes == null ) {
 			registeredLockModes = new HashMap<>();
 		}
 		registeredLockModes.put( identificationVariable, explicitLockMode );
@@ -250,60 +252,45 @@ public SqlAstProcessingState getParentState() {
 	public Expression resolveSqlExpression(
 			ColumnReferenceKey key,
 			Function<SqlAstProcessingState, Expression> creator) {
-		final ResultSetMappingSqlSelection existing = sqlSelectionMap.get( key );
-		if ( existing != null ) {
-			return existing;
-		}
+		final var existing = sqlSelectionMap.get( key );
+		return existing != null ? existing : createSqlSelection( key, creator );
+	}
 
-		final Expression created = creator.apply( this );
+	private Expression createSqlSelection(
+			ColumnReferenceKey key,
+			Function<SqlAstProcessingState, Expression> creator) {
+		final var created = creator.apply( this );
 
+		final ResultSetMappingSqlSelection sqlSelection;
 		if ( created instanceof ResultSetMappingSqlSelection resultSetMappingSqlSelection ) {
-			sqlSelectionMap.put( key, resultSetMappingSqlSelection );
-			sqlSelectionConsumer.accept( resultSetMappingSqlSelection );
+			sqlSelection = resultSetMappingSqlSelection;
 		}
 		else if ( created instanceof ColumnReference columnReference) {
-			final String selectableName = columnReference.getSelectableName();
-			final int valuesArrayPosition;
-			if ( nestingFetchParent != null ) {
-				valuesArrayPosition = nestingFetchParent.getReferencedMappingType().getSelectableIndex( selectableName );
-			}
-			else {
-				final int jdbcPosition = jdbcResultsMetadata.resolveColumnPosition( selectableName );
-				valuesArrayPosition = ResultsHelper.jdbcPositionToValuesArrayPosition( jdbcPosition );
-			}
-
-			final ResultSetMappingSqlSelection sqlSelection = new ResultSetMappingSqlSelection(
-					valuesArrayPosition,
-					columnReference.getJdbcMapping()
-			);
-
-			sqlSelectionMap.put( key, sqlSelection );
-			sqlSelectionConsumer.accept( sqlSelection );
-
-			return sqlSelection;
+			sqlSelection =
+					new ResultSetMappingSqlSelection(
+							valuesArrayPosition( columnReference.getSelectableName() ),
+							columnReference.getJdbcMapping()
+					);
 		}
-		else if ( created instanceof CaseStatementDiscriminatorMappingImpl.CaseStatementDiscriminatorExpression ) {
-			final int valuesArrayPosition;
-			if ( nestingFetchParent != null ) {
-				valuesArrayPosition = nestingFetchParent.getReferencedMappingType().getSelectableIndex( DISCRIMINATOR_ALIAS );
-			}
-			else {
-				final int jdbcPosition = jdbcResultsMetadata.resolveColumnPosition( DISCRIMINATOR_ALIAS );
-				valuesArrayPosition = ResultsHelper.jdbcPositionToValuesArrayPosition( jdbcPosition );
-			}
-
-			final ResultSetMappingSqlSelection sqlSelection = new ResultSetMappingSqlSelection(
-					valuesArrayPosition,
+		else if ( created instanceof CaseStatementDiscriminatorExpression ) {
+			sqlSelection = new ResultSetMappingSqlSelection(
+					valuesArrayPosition( DISCRIMINATOR_ALIAS ),
 					created.getExpressionType().getSingleJdbcMapping()
 			);
-
-			sqlSelectionMap.put( key, sqlSelection );
-			sqlSelectionConsumer.accept( sqlSelection );
-
-			return sqlSelection;
 		}
+		else {
+			return created;
+		}
+
+		sqlSelectionMap.put( key, sqlSelection );
+		sqlSelectionConsumer.accept( sqlSelection );
+		return sqlSelection;
+	}
 
-		return created;
+	private int valuesArrayPosition(String selectableName) {
+		return nestingFetchParent != null
+				? nestingFetchParent.getReferencedMappingType().getSelectableIndex( selectableName )
+				: jdbcPositionToValuesArrayPosition( jdbcResultsMetadata.resolveColumnPosition( selectableName ) );
 	}
 
 	@Override
@@ -314,8 +301,10 @@ public SqlSelection resolveSqlSelection(
 		if ( expression == null ) {
 			throw new IllegalArgumentException( "Expression cannot be null" );
 		}
-		assert expression instanceof ResultSetMappingSqlSelection;
-		return (SqlSelection) expression;
+		if ( !(expression instanceof ResultSetMappingSqlSelection sqlSelection) ) {
+			throw new IllegalArgumentException( "Expression must be a ResultSetMappingSqlSelection" );
+		}
+		return sqlSelection;
 	}
 
 	private static class LegacyFetchResolver {
@@ -329,71 +318,78 @@ public LegacyFetchBuilder resolve(String ownerTableAlias, Fetchable fetchedPart)
 			if ( legacyFetchBuilders == null ) {
 				return null;
 			}
-
-			final Map<Fetchable, LegacyFetchBuilder> fetchBuilders = legacyFetchBuilders.get( ownerTableAlias );
-			if ( fetchBuilders == null ) {
-				return null;
+			else {
+				final var fetchBuilders = legacyFetchBuilders.get( ownerTableAlias );
+				return fetchBuilders == null ? null : fetchBuilders.get( fetchedPart );
 			}
-
-			return fetchBuilders.get( fetchedPart );
 		}
 	}
 
 	@Override
 	public <R> R withNestedFetchParent(FetchParent fetchParent, Function<FetchParent, R> action) {
-		final FetchParent oldNestingFetchParent = this.nestingFetchParent;
+		final var oldNestingFetchParent = this.nestingFetchParent;
 		this.nestingFetchParent = fetchParent;
 		final R result = action.apply( fetchParent );
 		this.nestingFetchParent = oldNestingFetchParent;
 		return result;
 	}
 
-	@Override
-	public Fetch visitIdentifierFetch(EntityResultGraphNode fetchParent) {
-		final EntityValuedModelPart parentModelPart = fetchParent.getEntityValuedModelPart();
-		final EntityIdentifierMapping identifierMapping = parentModelPart.getEntityMappingType().getIdentifierMapping();
-		final String identifierAttributeName = attributeName( identifierMapping );
+	private @NonNull FetchBuilder fetchBuilder(
+			Fetchable fetchable,
+			FetchBuilder explicitFetchBuilder,
+			LegacyFetchBuilder fetchBuilderLegacy,
+			NavigablePath fetchPath) {
+		if ( explicitFetchBuilder != null ) {
+			return explicitFetchBuilder;
+		}
+		else if ( fetchBuilderLegacy != null ) {
+			return fetchBuilderLegacy;
+		}
+		else {
+			return implicitFetchBuilder( fetchPath, fetchable, this );
+		}
+	}
 
-		final FetchBuilder explicitFetchBuilder = fetchBuilderResolverStack.getCurrent().apply( identifierMapping );
-		final LegacyFetchBuilder fetchBuilderLegacy;
+	private @Nullable LegacyFetchBuilder legacyFetchBuilder(
+			Fetchable fetchable, FetchParent fetchParent,
+			FetchBuilder explicitFetchBuilder) {
 		if ( explicitFetchBuilder == null ) {
-			fetchBuilderLegacy = legacyFetchResolver.resolve(
+			return legacyFetchResolver.resolve(
 					fromClauseAccess.findTableGroup( fetchParent.getNavigablePath() )
 							.getPrimaryTableReference()
 							.getIdentificationVariable(),
-					identifierMapping
+					fetchable
 			);
 		}
 		else {
-			fetchBuilderLegacy = null;
+			return null;
 		}
+	}
+
+	@Override
+	public Fetch visitIdentifierFetch(EntityResultGraphNode fetchParent) {
+		final var identifierMapping =
+				fetchParent.getEntityValuedModelPart()
+						.getEntityMappingType().getIdentifierMapping();
 
-		final EntityIdentifierNavigablePath fetchPath = new EntityIdentifierNavigablePath(
-				fetchParent.getNavigablePath(),
-				identifierAttributeName
-		);
+		final var explicitFetchBuilder =
+				currentFetchBuilderResolver().apply( identifierMapping );
+
+		final var fetchBuilderLegacy =
+				legacyFetchBuilder( identifierMapping, fetchParent, explicitFetchBuilder );
+
+		final var fetchPath =
+				new EntityIdentifierNavigablePath(
+						fetchParent.getNavigablePath(),
+						attributeName( identifierMapping )
+				);
 
 		final boolean processingKeyFetches = this.processingKeyFetches;
 		this.processingKeyFetches = true;
 
 		try {
-			final FetchBuilder fetchBuilder;
-			if ( explicitFetchBuilder != null ) {
-				fetchBuilder = explicitFetchBuilder;
-			}
-			else if ( fetchBuilderLegacy != null ) {
-				fetchBuilder = fetchBuilderLegacy;
-			}
-			else {
-				fetchBuilder = Builders.implicitFetchBuilder( fetchPath, identifierMapping, this );
-			}
-
-			return fetchBuilder.buildFetch(
-					fetchParent,
-					fetchPath,
-					jdbcResultsMetadata,
-					this
-			);
+			return fetchBuilder( identifierMapping, explicitFetchBuilder, fetchBuilderLegacy, fetchPath )
+					.buildFetch( fetchParent, fetchPath, jdbcResultsMetadata, this );
 		}
 		finally {
 			this.processingKeyFetches = processingKeyFetches;
@@ -402,9 +398,9 @@ else if ( fetchBuilderLegacy != null ) {
 
 	@Override
 	public ImmutableFetchList visitFetches(FetchParent fetchParent) {
-		final FetchableContainer fetchableContainer = fetchParent.getReferencedMappingContainer();
-		final ImmutableFetchList.Builder fetches = new ImmutableFetchList.Builder( fetchableContainer );
-		final Consumer<Fetchable> fetchableConsumer = createFetchableConsumer( fetchParent, fetches );
+		final var fetchableContainer = fetchParent.getReferencedMappingContainer();
+		final var fetches = new ImmutableFetchList.Builder( fetchableContainer );
+		final var fetchableConsumer = createFetchableConsumer( fetchParent, fetches );
 		fetchableContainer.visitKeyFetchables( fetchableConsumer, null );
 		fetchableContainer.visitFetchables( fetchableConsumer, null );
 		return fetches.build();
@@ -415,60 +411,36 @@ private Consumer<Fetchable> createFetchableConsumer(FetchParent fetchParent, Imm
 			if ( !fetchable.isSelectable() ) {
 				return;
 			}
-			FetchBuilder explicitFetchBuilder = fetchBuilderResolverStack.getCurrent().apply( fetchable );
-			LegacyFetchBuilder fetchBuilderLegacy;
-			if ( explicitFetchBuilder == null ) {
-				fetchBuilderLegacy = legacyFetchResolver.resolve(
-						fromClauseAccess.findTableGroup( fetchParent.getNavigablePath() )
-								.getPrimaryTableReference()
-								.getIdentificationVariable(),
-						fetchable
-				);
-			}
-			else {
-				fetchBuilderLegacy = null;
-			}
+			FetchBuilder explicitFetchBuilder = currentFetchBuilderResolver().apply( fetchable );
+			LegacyFetchBuilder fetchBuilderLegacy =
+					legacyFetchBuilder( fetchable, fetchParent, explicitFetchBuilder );
 			if ( fetchable instanceof Association association
 					&& fetchable.getMappedFetchOptions().getTiming() == FetchTiming.DELAYED ) {
-				final ForeignKeyDescriptor foreignKeyDescriptor = association.getForeignKeyDescriptor();
 				// If there are no fetch builders for this association, we only want to fetch the FK
 				if ( explicitFetchBuilder == null && fetchBuilderLegacy == null  ) {
-					Fetchable modelPart = (Fetchable)
-							foreignKeyDescriptor.getSide( association.getSideNature().inverse() ).getModelPart();
-					explicitFetchBuilder = fetchBuilderResolverStack.getCurrent().apply( modelPart );
+					final var modelPart = (Fetchable)
+							association.getForeignKeyDescriptor()
+									.getSide( association.getSideNature().inverse() )
+									.getModelPart();
+					explicitFetchBuilder = currentFetchBuilderResolver().apply( modelPart );
 					if ( explicitFetchBuilder == null ) {
-						fetchBuilderLegacy = legacyFetchResolver.resolve(
-								fromClauseAccess.findTableGroup( fetchParent.getNavigablePath() )
-										.getPrimaryTableReference()
-										.getIdentificationVariable(),
-								fetchable
-						);
+						fetchBuilderLegacy =
+								legacyFetchBuilder( fetchable, fetchParent, null );
 					}
 				}
 			}
-			final NavigablePath fetchPath = fetchParent.resolveNavigablePath( fetchable );
-			final FetchBuilder fetchBuilder;
-			if ( explicitFetchBuilder != null ) {
-				fetchBuilder = explicitFetchBuilder;
-			}
-			else {
-				if ( fetchBuilderLegacy == null ) {
-					fetchBuilder = Builders.implicitFetchBuilder( fetchPath, fetchable, this );
-				}
-				else {
-					fetchBuilder = fetchBuilderLegacy;
-				}
-			}
-			final Fetch fetch = fetchBuilder.buildFetch(
-					fetchParent,
-					fetchPath,
-					jdbcResultsMetadata,
-					this
-			);
+			final var fetchPath = fetchParent.resolveNavigablePath( fetchable );
+			final var fetch =
+					fetchBuilder( fetchable, explicitFetchBuilder, fetchBuilderLegacy, fetchPath )
+							.buildFetch( fetchParent, fetchPath, jdbcResultsMetadata, this );
 			fetches.add( fetch );
 		};
 	}
 
+	private Function<Fetchable, FetchBuilder> currentFetchBuilderResolver() {
+		return fetchBuilderResolverStack.getCurrent();
+	}
+
 	@Override
 	public boolean isResolvingCircularFetch() {
 		return resolvingCircularFetch;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/FromClauseAccessImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/FromClauseAccessImpl.java
index c43e27d4ab3f..1f7ca19f94ea 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/FromClauseAccessImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/FromClauseAccessImpl.java
@@ -23,28 +23,13 @@ public class FromClauseAccessImpl implements FromClauseAccess {
 	private Map<String, TableGroup> tableGroupBySqlAlias;
 	private Map<NavigablePath, TableGroup> tableGroupByPath;
 
-	public FromClauseAccessImpl() {
-	}
-
-	public TableGroup getByAlias(String alias) {
-		final TableGroup byAlias = findByAlias( alias );
-		if ( byAlias == null ) {
-			throw new IllegalArgumentException( "Could not resolve TableGroup by alias [" + alias + "]" );
-		}
-		return byAlias;
-	}
-
 	public TableGroup findByAlias(String alias) {
-		if ( tableGroupBySqlAlias != null ) {
-			return tableGroupBySqlAlias.get( alias );
-		}
-
-		return null;
+		return tableGroupBySqlAlias == null ? null : tableGroupBySqlAlias.get( alias );
 	}
 
 	@Override
 	public @Nullable TableGroup findTableGroupByIdentificationVariable(String identificationVariable) {
-		for ( TableGroup tableGroup : tableGroupByPath.values() ) {
+		for ( var tableGroup : tableGroupByPath.values() ) {
 			if ( tableGroup.findTableReference( identificationVariable ) != null ) {
 				return tableGroup;
 			}
@@ -59,11 +44,8 @@ public TableGroup findTableGroupOnCurrentFromClause(NavigablePath navigablePath)
 
 	@Override
 	public TableGroup findTableGroup(NavigablePath navigablePath) {
-		if ( tableGroupByPath != null ) {
-			return tableGroupByPath.get( navigablePath );
-		}
+		return tableGroupByPath == null ? null : tableGroupByPath.get( navigablePath );
 
-		return null;
 	}
 
 	@Override
@@ -73,11 +55,12 @@ public void registerTableGroup(NavigablePath navigablePath, TableGroup tableGrou
 		}
 		tableGroupByPath.put( navigablePath, tableGroup );
 
-		if ( tableGroup.getGroupAlias() != null ) {
+		final String groupAlias = tableGroup.getGroupAlias();
+		if ( groupAlias != null ) {
 			if ( tableGroupBySqlAlias == null ) {
 				tableGroupBySqlAlias = new HashMap<>();
 			}
-			tableGroupBySqlAlias.put( tableGroup.getGroupAlias(), tableGroup );
+			tableGroupBySqlAlias.put( groupAlias, tableGroup );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/JdbcValuesMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/JdbcValuesMappingImpl.java
index b20dcf11786a..60505b89dbd1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/JdbcValuesMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/JdbcValuesMappingImpl.java
@@ -40,6 +40,8 @@ public int getRowSize() {
 
 	@Override
 	public LockMode determineDefaultLockMode(String alias, LockMode defaultLockMode) {
-		return registeredLockModes == null ? defaultLockMode : registeredLockModes.getOrDefault( alias, defaultLockMode );
+		return registeredLockModes == null
+				? defaultLockMode
+				: registeredLockModes.getOrDefault( alias, defaultLockMode );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingImpl.java
index c093d9d11ac7..696d56fa1bad 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingImpl.java
@@ -6,10 +6,8 @@
 
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.loader.NonUniqueDiscoveredSqlAliasException;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
 import org.hibernate.query.results.LegacyFetchBuilder;
 import org.hibernate.query.results.ResultBuilder;
@@ -24,7 +22,6 @@
 import org.hibernate.type.BasicType;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +31,11 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
+import static java.util.Collections.addAll;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
+import static org.hibernate.internal.util.StringHelper.isEmpty;
+
 /**
  * ResultSetMapping implementation used while building
  * {@linkplain org.hibernate.query.results.ResultSetMapping} references.
@@ -63,7 +65,7 @@ private ResultSetMappingImpl(ResultSetMappingImpl original) {
 		}
 		else {
 			final List<ResultBuilder> resultBuilders = new ArrayList<>( original.resultBuilders.size() );
-			for ( ResultBuilder resultBuilder : original.resultBuilders ) {
+			for ( var resultBuilder : original.resultBuilders ) {
 				resultBuilders.add( resultBuilder.cacheKeyInstance() );
 			}
 			this.resultBuilders = resultBuilders;
@@ -72,11 +74,14 @@ private ResultSetMappingImpl(ResultSetMappingImpl original) {
 			this.legacyFetchBuilders = null;
 		}
 		else {
-			final Map<String, Map<Fetchable, LegacyFetchBuilder>> builders = new HashMap<>( original.legacyFetchBuilders.size() );
-			for ( Map.Entry<String, Map<Fetchable, LegacyFetchBuilder>> entry : original.legacyFetchBuilders.entrySet() ) {
-				final Map<Fetchable, LegacyFetchBuilder> newValue = new HashMap<>( entry.getValue().size() );
-				for ( Map.Entry<Fetchable, LegacyFetchBuilder> builderEntry : entry.getValue().entrySet() ) {
-					newValue.put( builderEntry.getKey(), builderEntry.getValue().cacheKeyInstance() );
+			final Map<String, Map<Fetchable, LegacyFetchBuilder>> builders =
+					new HashMap<>( original.legacyFetchBuilders.size() );
+			for ( var entry : original.legacyFetchBuilders.entrySet() ) {
+				final Map<Fetchable, LegacyFetchBuilder> newValue =
+						new HashMap<>( entry.getValue().size() );
+				for ( var builderEntry : entry.getValue().entrySet() ) {
+					newValue.put( builderEntry.getKey(),
+							builderEntry.getValue().cacheKeyInstance() );
 				}
 				builders.put( entry.getKey(), newValue );
 			}
@@ -100,32 +105,27 @@ public int getNumberOfResultBuilders() {
 	}
 
 	public List<ResultBuilder> getResultBuilders() {
-		if ( resultBuilders == null ) {
-			return Collections.emptyList();
-		}
-		return Collections.unmodifiableList( resultBuilders );
+		return resultBuilders == null
+				? emptyList()
+				: unmodifiableList( resultBuilders );
 	}
 
 	@Override
 	public void visitResultBuilders(BiConsumer<Integer, ResultBuilder> resultBuilderConsumer) {
-		if ( resultBuilders == null ) {
-			return;
-		}
-
-		for ( int i = 0; i < resultBuilders.size(); i++ ) {
-			resultBuilderConsumer.accept( i, resultBuilders.get( i ) );
+		if ( resultBuilders != null ) {
+			for ( int i = 0; i < resultBuilders.size(); i++ ) {
+				resultBuilderConsumer.accept( i, resultBuilders.get( i ) );
+			}
 		}
 	}
 
 	@Override
 	public void visitLegacyFetchBuilders(Consumer<LegacyFetchBuilder> resultBuilderConsumer) {
-		if ( legacyFetchBuilders == null ) {
-			return;
-		}
-
-		for ( Map.Entry<String, Map<Fetchable, LegacyFetchBuilder>> entry : legacyFetchBuilders.entrySet() ) {
-			for ( LegacyFetchBuilder fetchBuilder : entry.getValue().values() ) {
-				resultBuilderConsumer.accept( fetchBuilder );
+		if ( legacyFetchBuilders != null ) {
+			for ( var entry : legacyFetchBuilders.entrySet() ) {
+				for ( LegacyFetchBuilder fetchBuilder : entry.getValue().values() ) {
+					resultBuilderConsumer.accept( fetchBuilder );
+				}
 			}
 		}
 	}
@@ -164,18 +164,14 @@ public void addLegacyFetchBuilder(LegacyFetchBuilder fetchBuilder) {
 
 	@Override
 	public void addAffectedTableNames(Set<String> affectedTableNames, SessionFactoryImplementor sessionFactory) {
-		if ( StringHelper.isEmpty( mappingIdentifier ) ) {
-			return;
-		}
-
-		final EntityPersister entityDescriptor =
-				sessionFactory.getMappingMetamodel()
-						.findEntityDescriptor( mappingIdentifier );
-		if ( entityDescriptor == null ) {
-			return;
+		if ( !isEmpty( mappingIdentifier ) ) {
+			final var entityDescriptor =
+					sessionFactory.getMappingMetamodel()
+							.findEntityDescriptor( mappingIdentifier );
+			if ( entityDescriptor != null ) {
+				addAll( affectedTableNames, (String[]) entityDescriptor.getQuerySpaces() );
+			}
 		}
-
-		Collections.addAll( affectedTableNames, (String[]) entityDescriptor.getQuerySpaces() );
 	}
 
 	@Override
@@ -184,15 +180,12 @@ public JdbcValuesMapping resolve(
 			LoadQueryInfluencers loadQueryInfluencers,
 			SessionFactoryImplementor sessionFactory) {
 
-		final int numberOfResults;
 		final int rowSize = jdbcResultsMetadata.getColumnCount();
-
-		numberOfResults = resultBuilders == null ? rowSize : resultBuilders.size();
+		final int numberOfResults = resultBuilders == null ? rowSize : resultBuilders.size();
 
 		final List<SqlSelection> sqlSelections = new ArrayList<>( rowSize );
-		final List<DomainResult<?>> domainResults = new ArrayList<>( numberOfResults );
 
-		final DomainResultCreationStateImpl creationState = new DomainResultCreationStateImpl(
+		final var creationState = new DomainResultCreationStateImpl(
 				mappingIdentifier,
 				jdbcResultsMetadata,
 				legacyFetchBuilders,
@@ -202,79 +195,14 @@ public JdbcValuesMapping resolve(
 				sessionFactory
 		);
 
-		for ( int i = 0; i < numberOfResults; i++ ) {
-			final ResultBuilder resultBuilder = resultBuilders != null
-					? resultBuilders.get( i )
-					: null;
-
-			final DomainResult<?> domainResult;
-			if ( resultBuilder == null ) {
-				domainResult = makeImplicitDomainResult(
-						i,
-						sqlSelections::add,
-						jdbcResultsMetadata,
-						sessionFactory
-				);
-			}
-			else {
-				domainResult = resultBuilder.buildResult(
-						jdbcResultsMetadata,
-						domainResults.size(),
-						creationState
-				);
-			}
-
-			if ( domainResult.containsAnyNonScalarResults() ) {
-				creationState.disallowPositionalSelections();
-			}
+		final var domainResults =
+				collectDomainResults( jdbcResultsMetadata, sessionFactory,
+						numberOfResults, sqlSelections, creationState );
 
-			domainResults.add( domainResult );
-		}
 		// We only need this check when we actually have result builders
 		// As people should be able to just run native queries and work with tuples
 		if ( resultBuilders != null ) {
-			final Set<String> knownDuplicateAliases = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
-			if ( resultBuilders.size() == 1 && domainResults.size()  == 1 && domainResults.get( 0 ) instanceof EntityResult entityResult ) {
-				// Special case for result set mappings that just fetch a single polymorphic entity
-				final EntityPersister persister = entityResult.getReferencedMappingContainer().getEntityPersister();
-				final boolean polymorphic = persister.isPolymorphic();
-				// We only need to check for duplicate aliases if we have join fetches,
-				// otherwise we assume that even if there are duplicate aliases, the values are equivalent.
-				// If we don't do that, there is no way to fetch joined inheritance entities
-				if ( polymorphic && ( legacyFetchBuilders == null || legacyFetchBuilders.isEmpty() )
-						&& !entityResult.hasJoinFetches() ) {
-					final Set<String> aliases = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
-					for ( String[] columns : persister.getConstraintOrderedTableKeyColumnClosure() ) {
-						addColumns( aliases, knownDuplicateAliases, columns );
-					}
-					addColumn( aliases, knownDuplicateAliases, persister.getDiscriminatorColumnName() );
-					addColumn( aliases, knownDuplicateAliases, persister.getVersionColumnName() );
-					for (int i = 0; i < persister.countSubclassProperties(); i++ ) {
-						addColumns(
-								aliases,
-								knownDuplicateAliases,
-								persister.getSubclassPropertyColumnNames( i )
-						);
-					}
-				}
-			}
-			final String[] aliases = new String[rowSize];
-			final Map<String, Boolean> aliasHasDuplicates = new HashMap<>( rowSize );
-			for ( int i = 0; i < rowSize; i++ ) {
-				aliasHasDuplicates.compute(
-						aliases[i] = jdbcResultsMetadata.resolveColumnName( i + 1 ),
-						(k, v) -> v == null ? Boolean.FALSE : Boolean.TRUE
-				);
-			}
-			// Only check for duplicates for the selections that we actually use
-			for ( SqlSelection sqlSelection : sqlSelections ) {
-				final String alias = aliases[sqlSelection.getValuesArrayPosition()];
-				if ( !knownDuplicateAliases.contains( alias ) && aliasHasDuplicates.get( alias ) == Boolean.TRUE ) {
-					throw new NonUniqueDiscoveredSqlAliasException(
-							"Encountered a duplicated sql alias [" + alias + "] during auto-discovery of a native-sql query"
-					);
-				}
-			}
+			checkDuplicateAliases( jdbcResultsMetadata, domainResults, rowSize, sqlSelections );
 		}
 
 		return new JdbcValuesMappingImpl(
@@ -285,6 +213,108 @@ public JdbcValuesMapping resolve(
 		);
 	}
 
+	private void checkDuplicateAliases(
+			JdbcValuesMetadata jdbcResultsMetadata,
+			List<DomainResult<?>> domainResults,
+			int rowSize,
+			List<SqlSelection> sqlSelections) {
+		final Set<String> knownDuplicateAliases = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
+		if ( resultBuilders.size() == 1 && domainResults.size() == 1
+			&& domainResults.get( 0 ) instanceof EntityResult<?> entityResult ) {
+			// Special case for result set mappings that just fetch a single polymorphic entity
+			final var persister = entityResult.getReferencedMappingContainer().getEntityPersister();
+			final boolean polymorphic = persister.isPolymorphic();
+			// We only need to check for duplicate aliases if we have join fetches,
+			// otherwise we assume that even if there are duplicate aliases, the values are equivalent.
+			// If we don't do that, there is no way to fetch joined inheritance entities
+			if ( polymorphic
+					&& ( legacyFetchBuilders == null || legacyFetchBuilders.isEmpty() )
+					&& !entityResult.hasJoinFetches() ) {
+				final Set<String> aliases = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
+				for ( var columns : persister.getConstraintOrderedTableKeyColumnClosure() ) {
+					addColumns( aliases, knownDuplicateAliases, columns );
+				}
+				addColumn( aliases, knownDuplicateAliases, persister.getDiscriminatorColumnName() );
+				addColumn( aliases, knownDuplicateAliases, persister.getVersionColumnName() );
+				for (int i = 0; i < persister.countSubclassProperties(); i++ ) {
+					addColumns( aliases, knownDuplicateAliases,
+							persister.getSubclassPropertyColumnNames( i ) );
+				}
+			}
+		}
+		final var aliases = new String[rowSize];
+		final Map<String, Boolean> aliasHasDuplicates = new HashMap<>( rowSize );
+		for ( int i = 0; i < rowSize; i++ ) {
+			aliasHasDuplicates.compute(
+					aliases[i] = jdbcResultsMetadata.resolveColumnName( i + 1 ),
+					(k, v) -> v == null ? Boolean.FALSE : Boolean.TRUE
+			);
+		}
+		// Only check for duplicates for the selections that we actually use
+		for ( var sqlSelection : sqlSelections ) {
+			final String alias = aliases[sqlSelection.getValuesArrayPosition()];
+			if ( !knownDuplicateAliases.contains( alias )
+					&& aliasHasDuplicates.get( alias ) == Boolean.TRUE ) {
+				throw new NonUniqueDiscoveredSqlAliasException(
+						"Encountered a duplicated sql alias [" + alias + "] during auto-discovery of a native-sql query"
+				);
+			}
+		}
+	}
+
+	private List<DomainResult<?>> collectDomainResults(
+			JdbcValuesMetadata jdbcResultsMetadata,
+			SessionFactoryImplementor sessionFactory,
+			int numberOfResults,
+			List<SqlSelection> sqlSelections,
+			DomainResultCreationStateImpl creationState) {
+		final List<DomainResult<?>> domainResults = new ArrayList<>( numberOfResults );
+		for ( int i = 0; i < numberOfResults; i++ ) {
+			final var domainResult =
+					buildDomainResult(
+							jdbcResultsMetadata,
+							sessionFactory,
+							resultBuilders == null
+									? null
+									: resultBuilders.get( i ),
+							i,
+							sqlSelections,
+							domainResults,
+							creationState
+					);
+			if ( domainResult.containsAnyNonScalarResults() ) {
+				creationState.disallowPositionalSelections();
+			}
+			domainResults.add( domainResult );
+		}
+		return domainResults;
+	}
+
+	private DomainResult<?> buildDomainResult(
+			JdbcValuesMetadata jdbcResultsMetadata,
+			SessionFactoryImplementor sessionFactory,
+			ResultBuilder resultBuilder,
+			int i,
+			List<SqlSelection> sqlSelections,
+			List<DomainResult<?>> domainResults,
+			DomainResultCreationStateImpl creationState) {
+		if ( resultBuilder == null ) {
+			return makeImplicitDomainResult(
+					i,
+					sqlSelections::add,
+					jdbcResultsMetadata,
+					sessionFactory
+			);
+		}
+		else {
+			return resultBuilder.buildResult(
+					jdbcResultsMetadata,
+					domainResults.size(),
+					creationState
+			);
+		}
+	}
+
 	private static void addColumns(Set<String> aliases, Set<String> knownDuplicateAliases, String[] columns) {
 		for ( int i = 0; i < columns.length; i++ ) {
 			addColumn( aliases, knownDuplicateAliases, columns[i] );
@@ -309,7 +339,9 @@ private DomainResult<?> makeImplicitDomainResult(
 
 		final String name = jdbcResultsMetadata.resolveColumnName( jdbcPosition );
 
-		final ResultSetMappingSqlSelection sqlSelection = new ResultSetMappingSqlSelection( valuesArrayPosition, (BasicValuedMapping) jdbcMapping );
+		final var sqlSelection =
+				new ResultSetMappingSqlSelection( valuesArrayPosition,
+						(BasicValuedMapping) jdbcMapping );
 		sqlSelectionConsumer.accept( sqlSelection );
 
 		return new BasicResult<>(
@@ -346,23 +378,23 @@ public int hashCode() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof ResultSetMappingImpl that ) ) {
 			return false;
 		}
-
-		final ResultSetMappingImpl that = (ResultSetMappingImpl) o;
-		if ( isDynamic ) {
+		else if ( isDynamic ) {
 			return that.isDynamic
-					&& Objects.equals( mappingIdentifier, that.mappingIdentifier )
-					&& Objects.equals( resultBuilders, that.resultBuilders )
-					&& Objects.equals( legacyFetchBuilders, that.legacyFetchBuilders );
+				&& Objects.equals( this.mappingIdentifier, that.mappingIdentifier )
+				&& Objects.equals( this.resultBuilders, that.resultBuilders )
+				&& Objects.equals( this.legacyFetchBuilders, that.legacyFetchBuilders );
 		}
 		else {
-			return !that.isDynamic && mappingIdentifier != null && mappingIdentifier.equals( that.mappingIdentifier );
+			return !that.isDynamic
+				&& mappingIdentifier != null
+				&& mappingIdentifier.equals( that.mappingIdentifier );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingSqlSelection.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingSqlSelection.java
index 544c885e89ee..6a08e5349a92 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingSqlSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/ResultSetMappingSqlSelection.java
@@ -7,7 +7,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.MappingModelExpressible;
+import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.sql.ast.SqlAstWalker;
 import org.hibernate.sql.ast.spi.SqlExpressionAccess;
 import org.hibernate.sql.ast.spi.SqlSelection;
@@ -24,18 +24,16 @@
  */
 public class ResultSetMappingSqlSelection implements SqlSelection, Expression, SqlExpressionAccess {
 	private final int valuesArrayPosition;
-	private final BasicValuedMapping valueMapping;
+	private final JdbcMapping valueMapping;
 	private final ValueExtractor<?> valueExtractor;
 
 	public ResultSetMappingSqlSelection(int valuesArrayPosition, BasicValuedMapping valueMapping) {
-		this.valuesArrayPosition = valuesArrayPosition;
-		this.valueMapping = valueMapping;
-		this.valueExtractor = valueMapping.getJdbcMapping().getJdbcValueExtractor();
+		this ( valuesArrayPosition, valueMapping.getJdbcMapping() );
 	}
 
 	public ResultSetMappingSqlSelection(int valuesArrayPosition, JdbcMapping jdbcMapping) {
 		this.valuesArrayPosition = valuesArrayPosition;
-		this.valueMapping = null;
+		this.valueMapping = jdbcMapping;
 		this.valueExtractor = jdbcMapping.getJdbcValueExtractor();
 	}
 
@@ -60,7 +58,7 @@ public Expression getExpression() {
 	}
 
 	@Override
-	public MappingModelExpressible<?> getExpressionType() {
+	public JdbcMappingContainer getExpressionType() {
 		return valueMapping;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/TableGroupImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/TableGroupImpl.java
index 3d66c9bf48b5..de16e794fd1c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/TableGroupImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/TableGroupImpl.java
@@ -57,10 +57,9 @@ public TableReference getTableReference(
 			NavigablePath navigablePath,
 			String tableExpression,
 			boolean resolve) {
-		if ( primaryTableReference.getTableReference( navigablePath , tableExpression, resolve ) != null ) {
-			return primaryTableReference;
-		}
-		return super.getTableReference( navigablePath, tableExpression, resolve );
+		return primaryTableReference.getTableReference( navigablePath, tableExpression, resolve ) == null
+				? super.getTableReference( navigablePath, tableExpression, resolve )
+				: primaryTableReference;
 	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderBasicPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderBasicPart.java
index 1d718499ce43..0ca9c312b9de 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderBasicPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderBasicPart.java
@@ -8,15 +8,12 @@
 import org.hibernate.engine.FetchTiming;
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
 import org.hibernate.metamodel.mapping.DiscriminatorMapping;
-import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.FetchBuilderBasicValued;
 import org.hibernate.query.results.MissingSqlSelectionException;
 import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.internal.ResultSetMappingSqlSelection;
 import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.basic.BasicFetch;
@@ -73,37 +70,21 @@ public BasicFetch<?> buildFetch(
 			NavigablePath fetchPath,
 			JdbcValuesMetadata jdbcResultsMetadata,
 			DomainResultCreationState domainResultCreationState) {
-		final DomainResultCreationStateImpl creationStateImpl = impl( domainResultCreationState );
+		final var creationStateImpl = impl( domainResultCreationState );
 
-		final String mappedTable = referencedModelPart.getContainingTableExpression();
+		final var tableReference =
+				creationStateImpl.getFromClauseAccess()
+						.getTableGroup( parent.getNavigablePath() )
+						.resolveTableReference( navigablePath, referencedModelPart,
+								referencedModelPart.getContainingTableExpression() );
 
-		final TableGroup tableGroup = creationStateImpl.getFromClauseAccess().getTableGroup( parent.getNavigablePath() );
-		final TableReference tableReference = tableGroup.resolveTableReference( navigablePath, referencedModelPart, mappedTable );
+		final int jdbcPosition = jdbcPosition( jdbcResultsMetadata, creationStateImpl );
+		final String selectedAlias =
+				selectionAlias == null
+						? jdbcResultsMetadata.resolveColumnName( jdbcPosition )
+						: selectionAlias;
 
-		final String selectedAlias;
-		final int jdbcPosition;
-		if ( selectionAlias != null ) {
-			try {
-				jdbcPosition = jdbcResultsMetadata.resolveColumnPosition( selectionAlias );
-			}
-			catch (Exception e) {
-				throw new MissingSqlSelectionException(
-						"ResultSet mapping specified selected-alias `" + selectionAlias
-								+ "` which was not part of the ResultSet",
-						e
-				);
-			}
-			selectedAlias = selectionAlias;
-		}
-		else {
-			if ( ! creationStateImpl.arePositionalSelectionsAllowed() ) {
-				throw new AssertionFailure( "Positional SQL selection resolution not allowed" );
-			}
-			jdbcPosition = creationStateImpl.getNumberOfProcessedSelections() + 1;
-			selectedAlias = jdbcResultsMetadata.resolveColumnName( jdbcPosition );
-		}
-
-		final JdbcMapping jdbcMapping =
+		final var jdbcMapping =
 				referencedModelPart instanceof DiscriminatorMapping discriminatorMapping
 						? discriminatorMapping.getUnderlyingJdbcMapping()
 						: referencedModelPart.getJdbcMapping();
@@ -125,19 +106,40 @@ public BasicFetch<?> buildFetch(
 		);
 	}
 
+	private int jdbcPosition(JdbcValuesMetadata jdbcResultsMetadata, DomainResultCreationStateImpl creationStateImpl) {
+		if ( selectionAlias != null ) {
+			try {
+				return jdbcResultsMetadata.resolveColumnPosition( selectionAlias );
+			}
+			catch (Exception e) {
+				throw new MissingSqlSelectionException(
+						"ResultSet mapping specified selected alias '" + selectionAlias
+								+ "' which was not part of the ResultSet",
+						e
+				);
+			}
+		}
+		else {
+			if ( !creationStateImpl.arePositionalSelectionsAllowed() ) {
+				throw new AssertionFailure( "Positional SQL selection resolution not allowed" );
+			}
+			return creationStateImpl.getNumberOfProcessedSelections() + 1;
+		}
+	}
+
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof CompleteFetchBuilderBasicPart that ) ) {
 			return false;
 		}
-
-		final CompleteFetchBuilderBasicPart that = (CompleteFetchBuilderBasicPart) o;
-		return navigablePath.equals( that.navigablePath )
-			&& referencedModelPart.equals( that.referencedModelPart )
-			&& Objects.equals( selectionAlias, that.selectionAlias );
+		else {
+			return navigablePath.equals( that.navigablePath )
+				&& referencedModelPart.equals( that.referencedModelPart )
+				&& Objects.equals( selectionAlias, that.selectionAlias );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java
index bc433191c1b8..ed0d285799a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEmbeddableValuedModelPart.java
@@ -11,7 +11,6 @@
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.FetchBuilder;
-import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
@@ -20,6 +19,7 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
 import static org.hibernate.query.results.internal.ResultsHelper.impl;
+import static org.hibernate.query.results.internal.ResultsHelper.resolveSqlExpression;
 
 /**
  * CompleteFetchBuilder for embeddable-valued ModelParts
@@ -72,11 +72,13 @@ public Fetch buildFetch(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			DomainResultCreationState domainResultCreationState) {
 		assert fetchPath.equals( navigablePath );
-		final DomainResultCreationStateImpl creationStateImpl = impl( domainResultCreationState );
-		final TableGroup tableGroup = creationStateImpl.getFromClauseAccess().getTableGroup( navigablePath.getParent() );
+		final var creationStateImpl = impl( domainResultCreationState );
+		final var tableGroup =
+				creationStateImpl.getFromClauseAccess()
+						.getTableGroup( navigablePath.getParent() );
 		modelPart.forEachSelectable(
-				(selectionIndex, selectableMapping) ->
-						sqlSelection( jdbcResultsMetadata, selectionIndex, selectableMapping, creationStateImpl, tableGroup )
+				(index, selectableMapping) ->
+						sqlSelection( jdbcResultsMetadata, index, selectableMapping, creationStateImpl, tableGroup )
 		);
 		return parent.generateFetchableFetch(
 				modelPart,
@@ -95,7 +97,7 @@ private void sqlSelection(
 			DomainResultCreationStateImpl creationStateImpl,
 			TableGroup tableGroup) {
 		creationStateImpl.resolveSqlSelection(
-				ResultsHelper.resolveSqlExpression(
+				resolveSqlExpression(
 						creationStateImpl,
 						jdbcResultsMetadata,
 						tableGroup.resolveTableReference( navigablePath, modelPart,
@@ -110,18 +112,18 @@ private void sqlSelection(
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !(object instanceof CompleteFetchBuilderEmbeddableValuedModelPart that ) ) {
 			return false;
 		}
-
-		final CompleteFetchBuilderEmbeddableValuedModelPart that = (CompleteFetchBuilderEmbeddableValuedModelPart) o;
-		return navigablePath.equals( that.navigablePath )
-			&& modelPart.equals( that.modelPart )
-			&& columnAliases.equals( that.columnAliases );
+		else {
+			return navigablePath.equals( that.navigablePath )
+				&& modelPart.equals( that.modelPart )
+				&& columnAliases.equals( that.columnAliases );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEntityValuedModelPart.java
index d45113652fef..76562a355f29 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEntityValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteFetchBuilderEntityValuedModelPart.java
@@ -9,7 +9,6 @@
 import org.hibernate.engine.FetchTiming;
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.mapping.ValuedModelPart;
-import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.FetchBuilder;
@@ -21,6 +20,7 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
 import static org.hibernate.query.results.internal.ResultsHelper.impl;
+import static org.hibernate.query.results.internal.ResultsHelper.resolveSqlExpression;
 
 /**
  * CompleteFetchBuilder for entity-valued ModelParts
@@ -73,8 +73,10 @@ public Fetch buildFetch(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			DomainResultCreationState domainResultCreationState) {
 		assert fetchPath.equals( navigablePath );
-		final DomainResultCreationStateImpl creationStateImpl = impl( domainResultCreationState );
-		final TableGroup tableGroup = creationStateImpl.getFromClauseAccess().getTableGroup( navigablePath.getParent() );
+		final var creationStateImpl = impl( domainResultCreationState );
+		final var tableGroup =
+				creationStateImpl.getFromClauseAccess()
+						.getTableGroup( navigablePath.getParent() );
 		modelPart.forEachSelectable(
 				(selectionIndex, selectableMapping) ->
 						sqlSelection( jdbcResultsMetadata, selectionIndex, selectableMapping, creationStateImpl, tableGroup )
@@ -96,7 +98,7 @@ private void sqlSelection(
 			DomainResultCreationStateImpl creationStateImpl,
 			TableGroup tableGroup) {
 		creationStateImpl.resolveSqlSelection(
-				ResultsHelper.resolveSqlExpression(
+				resolveSqlExpression(
 						creationStateImpl,
 						jdbcResultsMetadata,
 						tableGroup.resolveTableReference( navigablePath, (ValuedModelPart) modelPart,
@@ -111,18 +113,18 @@ private void sqlSelection(
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof CompleteFetchBuilderEntityValuedModelPart that ) ) {
 			return false;
 		}
-
-		final CompleteFetchBuilderEntityValuedModelPart that = (CompleteFetchBuilderEntityValuedModelPart) o;
-		return navigablePath.equals( that.navigablePath )
-			&& modelPart.equals( that.modelPart )
-			&& columnAliases.equals( that.columnAliases );
+		else {
+			return navigablePath.equals( that.navigablePath )
+				&& modelPart.equals( that.modelPart )
+				&& columnAliases.equals( that.columnAliases );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicModelPart.java
index adf33749e868..b2d091ef0666 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicModelPart.java
@@ -7,7 +7,6 @@
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
 import org.hibernate.query.results.ResultBuilder;
 import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
-import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.from.TableReference;
@@ -16,6 +15,7 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
 import static org.hibernate.query.results.internal.ResultsHelper.impl;
+import static org.hibernate.query.results.internal.ResultsHelper.resolveSqlExpression;
 
 /**
  * CompleteResultBuilder for basic-valued ModelParts
@@ -62,9 +62,10 @@ public BasicResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
-		final DomainResultCreationStateImpl creationStateImpl = impl( domainResultCreationState );
-		final TableReference tableReference = tableReference( creationStateImpl );
-		final SqlSelection sqlSelection = sqlSelection( jdbcResultsMetadata, creationStateImpl, tableReference );
+		final var creationStateImpl = impl( domainResultCreationState );
+		final var sqlSelection =
+				sqlSelection( jdbcResultsMetadata, creationStateImpl,
+						tableReference( creationStateImpl ) );
 		return new BasicResult<>(
 				sqlSelection.getValuesArrayPosition(),
 				columnAlias,
@@ -80,7 +81,7 @@ private SqlSelection sqlSelection(
 			DomainResultCreationStateImpl creationStateImpl,
 			TableReference tableReference) {
 		return creationStateImpl.resolveSqlSelection(
-				ResultsHelper.resolveSqlExpression(
+				resolveSqlExpression(
 						creationStateImpl,
 						jdbcResultsMetadata,
 						tableReference,
@@ -96,22 +97,23 @@ private SqlSelection sqlSelection(
 	private TableReference tableReference(DomainResultCreationStateImpl creationStateImpl) {
 		return creationStateImpl.getFromClauseAccess()
 				.getTableGroup( navigablePath.getParent() )
-				.resolveTableReference( navigablePath, modelPart, modelPart.getContainingTableExpression() );
+				.resolveTableReference( navigablePath, modelPart,
+						modelPart.getContainingTableExpression() );
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof CompleteResultBuilderBasicModelPart that ) ) {
 			return false;
 		}
-
-		final CompleteResultBuilderBasicModelPart that = (CompleteResultBuilderBasicModelPart) o;
-		return navigablePath.equals( that.navigablePath )
-				&& modelPart.equals( that.modelPart )
-				&& columnAlias.equals( that.columnAlias );
+		else {
+			return navigablePath.equals( that.navigablePath )
+					&& modelPart.equals( that.modelPart )
+					&& columnAlias.equals( that.columnAlias );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedConverted.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedConverted.java
index 7ef959977102..60c3ae9876ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedConverted.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedConverted.java
@@ -5,14 +5,11 @@
 package org.hibernate.query.results.internal.complete;
 
 import jakarta.persistence.AttributeConverter;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.query.results.ResultBuilder;
 import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.internal.ResultSetMappingSqlSelection;
-import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.resource.beans.spi.ManagedBean;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
@@ -24,6 +21,8 @@
 import java.util.Objects;
 
 import static org.hibernate.query.results.internal.ResultsHelper.impl;
+import static org.hibernate.query.results.internal.ResultsHelper.jdbcPositionToValuesArrayPosition;
+import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
 
 /**
  * ResultBuilder for scalar results defined via:<ul>
@@ -46,7 +45,7 @@ public CompleteResultBuilderBasicValuedConverted(
 			BasicValuedMapping underlyingMapping) {
 		this.explicitColumnName = explicitColumnName;
 		this.underlyingMapping = underlyingMapping;
-		final JavaType<?> relationalType =
+		final var relationalType =
 				underlyingMapping.getJdbcMapping()
 						.getJavaTypeDescriptor();
 		this.valueConverter = new AttributeConverterBean<>(
@@ -72,11 +71,12 @@ public BasicResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
-		final DomainResultCreationStateImpl creationStateImpl = impl( domainResultCreationState );
+		final var creationStateImpl = impl( domainResultCreationState );
 		final String columnName =
 				explicitColumnName != null
 						? explicitColumnName
-				: jdbcResultsMetadata.resolveColumnName( creationStateImpl.getNumberOfProcessedSelections() + 1 );
+						: jdbcResultsMetadata.resolveColumnName(
+								creationStateImpl.getNumberOfProcessedSelections() + 1 );
 		return new BasicResult<>(
 				sqlSelection( jdbcResultsMetadata, resultPosition, creationStateImpl, columnName )
 						.getValuesArrayPosition(),
@@ -94,38 +94,38 @@ private SqlSelection sqlSelection(
 			int resultPosition,
 			DomainResultCreationStateImpl creationStateImpl,
 			String columnName) {
-		final SessionFactoryImplementor sessionFactory = creationStateImpl.getSessionFactory();
 		return creationStateImpl.resolveSqlSelection(
 				creationStateImpl.resolveSqlExpression(
-						SqlExpressionResolver.createColumnReferenceKey( columnName ),
+						createColumnReferenceKey( columnName ),
 						processingState -> {
 							final int jdbcPosition =
 									explicitColumnName != null
 											? jdbcResultsMetadata.resolveColumnPosition( explicitColumnName )
 											: resultPosition + 1;
-							final int valuesArrayPosition = ResultsHelper.jdbcPositionToValuesArrayPosition( jdbcPosition );
+							final int valuesArrayPosition = jdbcPositionToValuesArrayPosition( jdbcPosition );
 							return new ResultSetMappingSqlSelection( valuesArrayPosition, underlyingMapping );
 						}
 				),
 				valueConverter.getRelationalJavaType(),
 				null,
-				sessionFactory.getTypeConfiguration()
+				creationStateImpl.getSessionFactory()
+						.getTypeConfiguration()
 		);
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof CompleteResultBuilderBasicValuedConverted<?, ?> that ) ) {
 			return false;
 		}
-
-		final CompleteResultBuilderBasicValuedConverted<?, ?> that = (CompleteResultBuilderBasicValuedConverted<?, ?>) o;
-		return Objects.equals( explicitColumnName, that.explicitColumnName )
+		else {
+			return Objects.equals( explicitColumnName, that.explicitColumnName )
 				&& underlyingMapping.equals( that.underlyingMapping )
 				&& valueConverter.equals( that.valueConverter );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedStandard.java
index cc44f6368022..aca2d976e682 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderBasicValuedStandard.java
@@ -8,8 +8,6 @@
 import org.hibernate.query.results.ResultBuilder;
 import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.internal.ResultSetMappingSqlSelection;
-import org.hibernate.query.results.internal.ResultsHelper;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
@@ -20,6 +18,8 @@
 import java.util.Objects;
 
 import static org.hibernate.query.results.internal.ResultsHelper.impl;
+import static org.hibernate.query.results.internal.ResultsHelper.jdbcPositionToValuesArrayPosition;
+import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
 
 /**
  * ResultBuilder for scalar results defined via:<ul>
@@ -40,7 +40,6 @@ public CompleteResultBuilderBasicValuedStandard(
 			String explicitColumnName,
 			BasicValuedMapping explicitType,
 			JavaType<?> explicitJavaType) {
-		//noinspection unchecked
 		assert explicitType == null
 			|| explicitType.getJdbcMapping().getJavaTypeDescriptor().getJavaTypeClass()
 				.isAssignableFrom( explicitJavaType.getJavaTypeClass() );
@@ -65,7 +64,7 @@ public BasicResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
-		final DomainResultCreationStateImpl creationStateImpl = impl( domainResultCreationState );
+		final var creationStateImpl = impl( domainResultCreationState );
 		final int jdbcPosition =
 				explicitColumnName != null
 						? jdbcResultsMetadata.resolveColumnPosition( explicitColumnName )
@@ -74,7 +73,7 @@ public BasicResult<?> buildResult(
 				explicitColumnName != null
 						? explicitColumnName
 						: jdbcResultsMetadata.resolveColumnName( jdbcPosition );
-		final SqlSelection sqlSelection =
+		final var sqlSelection =
 				sqlSelection( jdbcResultsMetadata, creationStateImpl, columnName, jdbcPosition );
 		return new BasicResult<>(
 				sqlSelection.getValuesArrayPosition(),
@@ -90,25 +89,13 @@ private SqlSelection sqlSelection(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			DomainResultCreationStateImpl creationStateImpl,
 			String columnName, int jdbcPosition) {
-		final TypeConfiguration typeConfiguration = creationStateImpl.getCreationContext().getTypeConfiguration();
+		final var typeConfiguration = creationStateImpl.getCreationContext().getTypeConfiguration();
 		return creationStateImpl.resolveSqlSelection(
 				creationStateImpl.resolveSqlExpression(
-						SqlExpressionResolver.createColumnReferenceKey( columnName ),
-						processingState -> {
-							final BasicValuedMapping basicType;
-							if ( explicitType != null ) {
-								basicType = explicitType;
-							}
-							else {
-								basicType = jdbcResultsMetadata.resolveType(
-										jdbcPosition,
-										explicitJavaType,
-										typeConfiguration
-								);
-							}
-							final int valuesArrayPosition = ResultsHelper.jdbcPositionToValuesArrayPosition( jdbcPosition );
-							return new ResultSetMappingSqlSelection( valuesArrayPosition, basicType );
-						}
+						createColumnReferenceKey( columnName ),
+						processingState ->
+								new ResultSetMappingSqlSelection( jdbcPositionToValuesArrayPosition( jdbcPosition ),
+										basicType( jdbcResultsMetadata, jdbcPosition, typeConfiguration ) )
 				),
 				explicitJavaType,
 				null,
@@ -116,18 +103,28 @@ private SqlSelection sqlSelection(
 		);
 	}
 
+	private BasicValuedMapping basicType(
+			JdbcValuesMetadata jdbcResultsMetadata,
+			int jdbcPosition,
+			TypeConfiguration typeConfiguration) {
+		return explicitType == null
+				? jdbcResultsMetadata.resolveType( jdbcPosition, explicitJavaType, typeConfiguration )
+				: explicitType;
+	}
+
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof CompleteResultBuilderBasicValuedStandard that ) ) {
 			return false;
 		}
-		final CompleteResultBuilderBasicValuedStandard that = (CompleteResultBuilderBasicValuedStandard) o;
-		return Objects.equals( explicitColumnName, that.explicitColumnName )
-			&& Objects.equals( explicitType, that.explicitType )
-			&& Objects.equals( explicitJavaType, that.explicitJavaType );
+		else {
+			return Objects.equals( explicitColumnName, that.explicitColumnName )
+				&& Objects.equals( explicitType, that.explicitType )
+				&& Objects.equals( explicitJavaType, that.explicitJavaType );
+		}
 }
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollectionStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollectionStandard.java
index 24ed425916d6..7c467fb96eec 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollectionStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderCollectionStandard.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.query.results.internal.complete;
 
-import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.EntityValuedModelPart;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
@@ -12,8 +11,6 @@
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.results.ResultBuilder;
 import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
-import org.hibernate.query.results.internal.FromClauseAccessImpl;
-import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlAliasBaseConstant;
 import org.hibernate.sql.ast.tree.from.TableGroup;
@@ -24,6 +21,7 @@
 import java.util.Arrays;
 
 import static org.hibernate.query.results.internal.ResultsHelper.impl;
+import static org.hibernate.query.results.internal.ResultsHelper.resolveSqlExpression;
 
 /**
  * @author Steve Ebersole
@@ -89,9 +87,9 @@ public DomainResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
-		final DomainResultCreationStateImpl creationStateImpl = impl( domainResultCreationState );
-		final FromClauseAccessImpl fromClauseAccess = creationStateImpl.getFromClauseAccess();
-		final TableGroup rootTableGroup = pluralAttributeDescriptor.createRootTableGroup(
+		final var creationStateImpl = impl( domainResultCreationState );
+		final var fromClauseAccess = creationStateImpl.getFromClauseAccess();
+		final var rootTableGroup = pluralAttributeDescriptor.createRootTableGroup(
 				false,
 				navigablePath,
 				tableAlias,
@@ -139,27 +137,32 @@ private void resolveSelections(
 			String[] columnNames,
 			JdbcValuesMetadata jdbcResultsMetadata,
 			DomainResultCreationStateImpl creationStateImpl) {
+		final var typeConfiguration =
+				creationStateImpl.getSessionFactory()
+						.getTypeConfiguration();
 		resolveSelections( modelPart, (selectionIndex, selectableMapping) ->
 				creationStateImpl.resolveSqlSelection(
-						ResultsHelper.resolveSqlExpression(
+						resolveSqlExpression(
 								creationStateImpl,
 								jdbcResultsMetadata,
-								tableGroup.resolveTableReference( selectableMapping.getContainingTableExpression() ),
+								tableGroup.resolveTableReference(
+										selectableMapping.getContainingTableExpression() ),
 								selectableMapping,
 								columnNames[selectionIndex]
 						),
 						selectableMapping.getJdbcMapping().getJdbcJavaType(),
 						null,
-						creationStateImpl.getSessionFactory().getTypeConfiguration()
+						typeConfiguration
 				) );
 	}
 
 	private static void resolveSelections(ModelPart modelPart, SelectableConsumer consumer) {
 		if ( modelPart instanceof EntityValuedModelPart entityValuedModelPart ) {
-			final EntityMappingType entityMappingType = entityValuedModelPart.getEntityMappingType();
+			final var entityMappingType = entityValuedModelPart.getEntityMappingType();
 			int index = entityMappingType.getIdentifierMapping().forEachSelectable( consumer );
-			if ( entityMappingType.getDiscriminatorMapping() != null ) {
-				index += entityMappingType.getDiscriminatorMapping().forEachSelectable( index, consumer );
+			final var discriminatorMapping = entityMappingType.getDiscriminatorMapping();
+			if ( discriminatorMapping != null ) {
+				index += discriminatorMapping.forEachSelectable( index, consumer );
 			}
 			entityMappingType.forEachSelectable( index, consumer );
 		}
@@ -169,21 +172,21 @@ private static void resolveSelections(ModelPart modelPart, SelectableConsumer co
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof CompleteResultBuilderCollectionStandard that ) ) {
 			return false;
 		}
-
-		final CompleteResultBuilderCollectionStandard that = (CompleteResultBuilderCollectionStandard) o;
-		return tableAlias.equals( that.tableAlias )
-			&& navigablePath.equals( that.navigablePath )
-			&& pluralAttributeDescriptor.equals( that.pluralAttributeDescriptor )
-			&& Arrays.equals( keyColumnNames, that.keyColumnNames )
-			&& Arrays.equals( indexColumnNames, that.indexColumnNames )
-			&& Arrays.equals( elementColumnNames, that.elementColumnNames );
+		else {
+			return tableAlias.equals( that.tableAlias )
+				&& navigablePath.equals( that.navigablePath )
+				&& pluralAttributeDescriptor.equals( that.pluralAttributeDescriptor )
+				&& Arrays.equals( keyColumnNames, that.keyColumnNames )
+				&& Arrays.equals( indexColumnNames, that.indexColumnNames )
+				&& Arrays.equals( elementColumnNames, that.elementColumnNames );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityJpa.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityJpa.java
index cd9a68f3f51e..1070adf3356c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityJpa.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityJpa.java
@@ -10,10 +10,8 @@
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.FetchBuilderBasicValued;
 import org.hibernate.query.results.ResultBuilder;
-import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.spi.SqlAliasBase;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetchable;
 import org.hibernate.sql.results.graph.entity.EntityResult;
@@ -58,7 +56,8 @@ public CompleteResultBuilderEntityJpa(
 		}
 		else {
 			// discriminated
-			assert !entityDescriptor.hasSubclasses() || discriminatorFetchBuilder != null;
+			assert !entityDescriptor.hasSubclasses()
+				|| discriminatorFetchBuilder != null;
 		}
 	}
 
@@ -83,24 +82,23 @@ public ResultBuilder cacheKeyInstance() {
 	}
 
 	@Override
-	public EntityResult buildResult(
+	public EntityResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
 		final String implicitAlias = entityDescriptor.getSqlAliasStem() + resultPosition;
-		final SqlAliasBase sqlAliasBase =
-				domainResultCreationState.getSqlAliasBaseManager().createSqlAliasBase( implicitAlias );
+		final var sqlAliasBase =
+				domainResultCreationState.getSqlAliasBaseManager()
+						.createSqlAliasBase( implicitAlias );
 
-		final DomainResultCreationStateImpl impl = ResultsHelper.impl( domainResultCreationState );
+		final var impl = ResultsHelper.impl( domainResultCreationState );
 		impl.disallowPositionalSelections();
-
 		impl.pushExplicitFetchMementoResolver( explicitFetchBuilderMap::get );
-
 		try {
 			// we just want it added to the registry
 			impl.getFromClauseAccess().resolveTableGroup(
 					navigablePath,
-					np -> entityDescriptor.createRootTableGroup(
+					path -> entityDescriptor.createRootTableGroup(
 							// since this is only used for result set mappings, the canUseInnerJoins value is irrelevant.
 							true,
 							navigablePath,
@@ -111,7 +109,7 @@ public EntityResult buildResult(
 					)
 			);
 
-			return new EntityResultImpl(
+			return new EntityResultImpl<>(
 					navigablePath,
 					entityDescriptor,
 					implicitAlias,
@@ -148,19 +146,19 @@ public int hashCode() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof CompleteResultBuilderEntityJpa that ) ) {
 			return false;
 		}
-
-		final CompleteResultBuilderEntityJpa that = (CompleteResultBuilderEntityJpa) o;
-		return navigablePath.equals( that.navigablePath )
-			&& entityDescriptor.equals( that.entityDescriptor )
-			&& lockMode == that.lockMode
-			&& Objects.equals( discriminatorFetchBuilder, that.discriminatorFetchBuilder )
-			&& explicitFetchBuilderMap.equals( that.explicitFetchBuilderMap );
+		else {
+			return navigablePath.equals( that.navigablePath )
+				&& entityDescriptor.equals( that.entityDescriptor )
+				&& lockMode == that.lockMode
+				&& Objects.equals( discriminatorFetchBuilder, that.discriminatorFetchBuilder )
+				&& explicitFetchBuilderMap.equals( that.explicitFetchBuilderMap );
+		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityStandard.java
index b6d0a3be35c6..d4f4960e0505 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderEntityStandard.java
@@ -11,7 +11,6 @@
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.FetchBuilderBasicValued;
 import org.hibernate.query.results.ResultBuilder;
-import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlAliasBaseConstant;
@@ -116,20 +115,18 @@ public ResultBuilder cacheKeyInstance() {
 	}
 
 	@Override
-	public EntityResult buildResult(
+	public EntityResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
-		final DomainResultCreationStateImpl impl = ResultsHelper.impl( domainResultCreationState );
+		final var impl = ResultsHelper.impl( domainResultCreationState );
 		impl.disallowPositionalSelections();
-
 		impl.pushExplicitFetchMementoResolver( explicitFetchBuilderMap::get );
-
 		try {
 			// we just want it added to the registry
 			impl.getFromClauseAccess().resolveTableGroup(
 					navigablePath,
-					np -> entityDescriptor.createRootTableGroup(
+					path -> entityDescriptor.createRootTableGroup(
 							// since this is only used for result set mappings, the canUseInnerJoins value is irrelevant.
 							true,
 							navigablePath,
@@ -140,7 +137,7 @@ public EntityResult buildResult(
 					)
 			);
 
-			return new EntityResultImpl(
+			return new EntityResultImpl<>(
 					navigablePath,
 					entityDescriptor,
 					tableAlias,
@@ -181,15 +178,15 @@ public boolean equals(Object o) {
 		if ( this == o ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( o instanceof CompleteResultBuilderEntityStandard that ) ) {
 			return false;
 		}
-
-		final CompleteResultBuilderEntityStandard that = (CompleteResultBuilderEntityStandard) o;
-		return navigablePath.equals( that.navigablePath )
-			&& entityDescriptor.equals( that.entityDescriptor )
-			&& lockMode == that.lockMode
-			&& Objects.equals( discriminatorFetchBuilder, that.discriminatorFetchBuilder )
-			&& explicitFetchBuilderMap.equals( that.explicitFetchBuilderMap );
+		else {
+			return navigablePath.equals( that.navigablePath )
+				&& entityDescriptor.equals( that.entityDescriptor )
+				&& lockMode == that.lockMode
+				&& Objects.equals( discriminatorFetchBuilder, that.discriminatorFetchBuilder )
+				&& explicitFetchBuilderMap.equals( that.explicitFetchBuilderMap );
+		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderInstantiation.java
index 431f5e802204..73df68f9526f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderInstantiation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/CompleteResultBuilderInstantiation.java
@@ -71,17 +71,17 @@ private List<ArgumentDomainResult<?>> argumentDomainResults(
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof CompleteResultBuilderInstantiation that ) ) {
 			return false;
 		}
-
-		final CompleteResultBuilderInstantiation that = (CompleteResultBuilderInstantiation) o;
-		return javaType.equals( that.javaType )
-			&& argumentResultBuilders.equals( that.argumentResultBuilders );
+		else {
+			return javaType.equals( that.javaType )
+				&& argumentResultBuilders.equals( that.argumentResultBuilders );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/DelayedFetchBuilderBasicPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/DelayedFetchBuilderBasicPart.java
index 81f30c3df763..c96d76f4b8e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/DelayedFetchBuilderBasicPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/DelayedFetchBuilderBasicPart.java
@@ -64,7 +64,6 @@ public BasicFetch<?> buildFetch(
 				null,
 				FetchTiming.DELAYED,
 				isEnhancedForLazyLoading,
-				domainResultCreationState,
 				false,
 				false
 		);
@@ -76,18 +75,18 @@ public List<String> getColumnAliases() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof DelayedFetchBuilderBasicPart that ) ) {
 			return false;
 		}
-
-		final DelayedFetchBuilderBasicPart that = (DelayedFetchBuilderBasicPart) o;
-		return isEnhancedForLazyLoading == that.isEnhancedForLazyLoading
-			&& navigablePath.equals( that.navigablePath )
-			&& referencedModelPart.equals( that.referencedModelPart );
+		else {
+			return isEnhancedForLazyLoading == that.isEnhancedForLazyLoading
+				&& navigablePath.equals( that.navigablePath )
+				&& referencedModelPart.equals( that.referencedModelPart );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/EntityResultImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/EntityResultImpl.java
index f9644544dd1b..7d761d3c0519 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/EntityResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/complete/EntityResultImpl.java
@@ -10,9 +10,7 @@
 import org.hibernate.LockMode;
 import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.metamodel.mapping.EntityValuedModelPart;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetch;
@@ -25,11 +23,12 @@
 import org.hibernate.sql.results.graph.entity.internal.EntityAssembler;
 import org.hibernate.sql.results.graph.entity.internal.EntityInitializerImpl;
 import org.hibernate.sql.results.graph.internal.ImmutableFetchList;
+import org.hibernate.type.descriptor.java.JavaType;
 
 /**
  * @author Steve Ebersole
  */
-public class EntityResultImpl implements EntityResult, InitializerProducer<EntityResultImpl> {
+public class EntityResultImpl<E> implements EntityResult<E>, InitializerProducer<EntityResultImpl<E>> {
 	private final NavigablePath navigablePath;
 	private final EntityValuedModelPart entityValuedModelPart;
 
@@ -46,20 +45,20 @@ public EntityResultImpl(
 			EntityValuedModelPart entityValuedModelPart,
 			String resultAlias,
 			LockMode lockMode,
-			Function<EntityResultImpl, BasicFetch<?>> discriminatorFetchBuilder,
+			Function<EntityResultImpl<E>, BasicFetch<?>> discriminatorFetchBuilder,
 			DomainResultCreationState creationState) {
 		this.navigablePath = navigablePath;
 		this.entityValuedModelPart = entityValuedModelPart;
 		this.resultAlias = resultAlias;
 
-		final SqlAstCreationState sqlAstCreationState = creationState.getSqlAstCreationState();
+		final var sqlAstCreationState = creationState.getSqlAstCreationState();
 		if ( resultAlias != null ) {
 			sqlAstCreationState.registerLockMode( resultAlias, lockMode );
 		}
-		sqlAstCreationState.getFromClauseAccess().resolveTableGroup(
-				navigablePath,
-				np ->
-						entityValuedModelPart.getEntityMappingType().getEntityPersister()
+		sqlAstCreationState.getFromClauseAccess()
+				.resolveTableGroup( navigablePath,
+						path -> entityValuedModelPart.getEntityMappingType()
+								.getEntityPersister()
 								.createRootTableGroup(
 										true,
 										navigablePath,
@@ -68,7 +67,7 @@ public EntityResultImpl(
 										() -> p -> {},
 										sqlAstCreationState
 								)
-		);
+				);
 
 		this.identifierFetch = creationState.visitIdentifierFetch( this );
 		this.discriminatorFetch = discriminatorFetchBuilder.apply( this );
@@ -120,7 +119,7 @@ public boolean containsCollectionFetches() {
 
 	@Override
 	public void collectValueIndexesToCache(BitSet valueIndexes) {
-		final EntityPersister entityPersister = entityValuedModelPart.getEntityMappingType().getEntityPersister();
+		final var entityPersister = entityValuedModelPart.getEntityMappingType().getEntityPersister();
 		identifierFetch.collectValueIndexesToCache( valueIndexes );
 		if ( !entityPersister.useShallowQueryCacheLayout() ) {
 			if ( discriminatorFetch != null ) {
@@ -134,7 +133,12 @@ else if ( entityPersister.storeDiscriminatorInShallowQueryCacheLayout() && discr
 	}
 
 	@Override
-	public EntityAssembler createResultAssembler(InitializerParent parent, AssemblerCreationState creationState) {
+	public JavaType<E> getResultJavaType() {
+		return (JavaType<E>) EntityResult.super.getResultJavaType();
+	}
+
+	@Override
+	public EntityAssembler<E> createResultAssembler(InitializerParent<?> parent, AssemblerCreationState creationState) {
 		return new EntityAssembler<>( getResultJavaType(),
 				creationState.resolveInitializer( this, parent, this )
 						.asEntityInitializer() );
@@ -142,7 +146,7 @@ public EntityAssembler createResultAssembler(InitializerParent parent, Assembler
 
 	@Override
 	public Initializer<?> createInitializer(
-			EntityResultImpl resultGraphNode,
+			EntityResultImpl<E> resultGraphNode,
 			InitializerParent<?> parent,
 			AssemblerCreationState creationState) {
 		return resultGraphNode.createInitializer( parent, creationState );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/AbstractFetchBuilderContainer.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/AbstractFetchBuilderContainer.java
index 2508f94d1967..4a9c1d222327 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/AbstractFetchBuilderContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/AbstractFetchBuilderContainer.java
@@ -7,7 +7,6 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.query.results.FetchBuilder;
@@ -18,7 +17,7 @@
  */
 public abstract class AbstractFetchBuilderContainer<T extends AbstractFetchBuilderContainer<T>>
 		implements DynamicFetchBuilderContainer {
-	private Map<Fetchable, FetchBuilder> fetchBuilderMap;
+	Map<Fetchable, FetchBuilder> fetchBuilderMap;
 
 	protected AbstractFetchBuilderContainer() {
 	}
@@ -29,7 +28,7 @@ protected AbstractFetchBuilderContainer(AbstractFetchBuilderContainer<T> origina
 			for ( var entry : original.fetchBuilderMap.entrySet() ) {
 				final var fetchBuilder =
 						entry.getValue() instanceof DynamicFetchBuilderStandard dynamicFetchBuilderStandard
-								? dynamicFetchBuilderStandard.cacheKeyInstance( this )
+								? dynamicFetchBuilderStandard.cacheKeyInstance()
 								: entry.getValue().cacheKeyInstance();
 				fetchBuilderMap.put( entry.getKey(), fetchBuilder );
 			}
@@ -91,20 +90,8 @@ public void addFetchBuilder(Fetchable fetchable, FetchBuilder fetchBuilder) {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
-			return true;
-		}
-		if ( o == null || getClass() != o.getClass() ) {
-			return false;
-		}
-
-		final var that = (AbstractFetchBuilderContainer<?>) o;
-		return Objects.equals( fetchBuilderMap, that.fetchBuilderMap );
-	}
+	public abstract boolean equals(Object object);
 
 	@Override
-	public int hashCode() {
-		return fetchBuilderMap != null ? fetchBuilderMap.hashCode() : 0;
-	}
+	public abstract int hashCode();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicFetchBuilderLegacy.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicFetchBuilderLegacy.java
index 621422ddac86..77aa7173051f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicFetchBuilderLegacy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicFetchBuilderLegacy.java
@@ -19,7 +19,6 @@
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.LegacyFetchBuilder;
 import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
-import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.spi.SqlAliasBaseConstant;
@@ -39,6 +38,7 @@
 import java.util.function.BiConsumer;
 
 import static org.hibernate.query.results.internal.ResultsHelper.impl;
+import static org.hibernate.query.results.internal.ResultsHelper.resolveSqlExpression;
 
 /**
  * @author Steve Ebersole
@@ -164,9 +164,11 @@ private Map<Fetchable, FetchBuilder> fetchBuilderMap() {
 			return null;
 		}
 		else {
-			final Map<Fetchable, FetchBuilder> fetchBuilderMap = new HashMap<>( this.fetchBuilderMap.size() );
+			final Map<Fetchable, FetchBuilder> fetchBuilderMap =
+					new HashMap<>( this.fetchBuilderMap.size() );
 			for ( var entry : this.fetchBuilderMap.entrySet() ) {
-				fetchBuilderMap.put( entry.getKey(), entry.getValue().cacheKeyInstance() );
+				fetchBuilderMap.put( entry.getKey(),
+						entry.getValue().cacheKeyInstance() );
 			}
 			return fetchBuilderMap;
 		}
@@ -182,7 +184,8 @@ public Fetch buildFetch(
 		final var ownerTableGroup = creationState.getFromClauseAccess().findByAlias( ownerTableAlias );
 		final var tableGroup = tableGroup( fetchPath, ownerTableGroup, creationState );
 		if ( lockMode != null ) {
-			domainResultCreationState.getSqlAstCreationState().registerLockMode( tableAlias, lockMode );
+			domainResultCreationState.getSqlAstCreationState()
+					.registerLockMode( tableAlias, lockMode );
 		}
 		if ( columnNames != null ) {
 			if ( fetchable instanceof EmbeddedAttributeMapping embeddedAttributeMapping ) {
@@ -202,8 +205,8 @@ public Fetch buildFetch(
 				);
 			}
 			else {
-				final ForeignKeyDescriptor keyDescriptor = getForeignKeyDescriptor( fetchable );
 				if ( !columnNames.isEmpty() ) {
+					final var keyDescriptor = getForeignKeyDescriptor( fetchable );
 					keyDescriptor.forEachSelectable( (selectionIndex, selectableMapping) -> {
 								resolveSqlSelection(
 										columnNames.get( selectionIndex ),
@@ -220,7 +223,9 @@ public Fetch buildFetch(
 					);
 				}
 			}
-			// We process the fetch builder such that it contains a resultBuilderEntity before calling this method in ResultSetMappingProcessor
+			// We process the fetch builder such that it contains a
+			// resultBuilderEntity before calling this method in
+			// ResultSetMappingProcessor
 			if ( resultBuilderEntity != null ) {
 				return resultBuilderEntity.buildFetch(
 						parent,
@@ -233,13 +238,7 @@ public Fetch buildFetch(
 		}
 		try {
 			creationState.pushExplicitFetchMementoResolver(
-					fetchable -> {
-						if ( fetchable != null ) {
-							return findFetchBuilder( fetchable );
-						}
-						return null;
-					}
-			);
+					fetchable -> fetchable == null ? null : findFetchBuilder( fetchable ) );
 			return parent.generateFetchableFetch(
 					fetchable,
 					parent.resolveNavigablePath( fetchable ),
@@ -305,7 +304,7 @@ private void resolveSqlSelection(
 			DomainResultCreationState domainResultCreationState) {
 		final var creationStateImpl = impl( domainResultCreationState );
 		creationStateImpl.resolveSqlSelection(
-				ResultsHelper.resolveSqlExpression(
+				resolveSqlExpression(
 						creationStateImpl,
 						jdbcResultsMetadata,
 						tableReference,
@@ -314,7 +313,8 @@ private void resolveSqlSelection(
 				),
 				selectableMapping.getJdbcMapping().getJdbcJavaType(),
 				null,
-				domainResultCreationState.getSqlAstCreationState().getCreationContext().getTypeConfiguration()
+				domainResultCreationState.getSqlAstCreationState()
+						.getCreationContext().getTypeConfiguration()
 		);
 	}
 
@@ -363,22 +363,22 @@ public void addFetchBuilder(Fetchable fetchable, FetchBuilder fetchBuilder) {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof DynamicFetchBuilderLegacy that ) ) {
 			return false;
 		}
-
-		final var that = (DynamicFetchBuilderLegacy) o;
-		return tableAlias.equals( that.tableAlias )
-			&& ownerTableAlias.equals( that.ownerTableAlias )
-			&& fetchable.equals( that.fetchable )
-			&& lockMode.equals( that.lockMode )
-			&& Objects.equals( columnNames, that.columnNames )
-			&& Objects.equals( fetchBuilderMap, that.fetchBuilderMap )
-			&& Objects.equals( resultBuilderEntity, that.resultBuilderEntity );
+		else {
+			return tableAlias.equals( that.tableAlias )
+				&& ownerTableAlias.equals( that.ownerTableAlias )
+				&& fetchable.equals( that.fetchable )
+				&& lockMode.equals( that.lockMode )
+				&& Objects.equals( columnNames, that.columnNames )
+				&& Objects.equals( fetchBuilderMap, that.fetchBuilderMap )
+				&& Objects.equals( resultBuilderEntity, that.resultBuilderEntity );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicFetchBuilderStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicFetchBuilderStandard.java
index 19bbd820ebe1..9ee109cce23f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicFetchBuilderStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicFetchBuilderStandard.java
@@ -26,6 +26,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.hibernate.query.results.internal.ResultsHelper.resolveSqlExpression;
+
 
 /**
  * @author Steve Ebersole
@@ -48,17 +50,8 @@ private DynamicFetchBuilderStandard(Fetchable fetchable, List<String> columnName
 
 	@Override
 	public DynamicFetchBuilderStandard cacheKeyInstance() {
-		return new DynamicFetchBuilderStandard(
-				fetchable,
-				List.copyOf( columnNames )
-		);
-	}
-
-	public DynamicFetchBuilderStandard cacheKeyInstance(DynamicFetchBuilderContainer container) {
-		return new DynamicFetchBuilderStandard(
-				fetchable,
-				List.copyOf( columnNames )
-		);
+		return new DynamicFetchBuilderStandard( fetchable,
+				List.copyOf( columnNames ) );
 	}
 
 	@Override
@@ -182,7 +175,7 @@ private SelectableConsumer getSelectableConsumer(
 			);
 			final String columnAlias = columnNames.get( selectionIndex );
 			sqlExpressionResolver.resolveSqlSelection(
-					ResultsHelper.resolveSqlExpression(
+					resolveSqlExpression(
 							creationStateImpl,
 							jdbcResultsMetadata,
 							tableReference,
@@ -191,7 +184,8 @@ private SelectableConsumer getSelectableConsumer(
 					),
 					selectableMapping.getJdbcMapping().getJdbcJavaType(),
 					null,
-					domainResultCreationState.getSqlAstCreationState().getCreationContext().getTypeConfiguration()
+					domainResultCreationState.getSqlAstCreationState()
+							.getCreationContext().getTypeConfiguration()
 			);
 		};
 	}
@@ -215,16 +209,16 @@ public int hashCode() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof DynamicFetchBuilderStandard that ) ) {
 			return false;
 		}
-
-		final var that = (DynamicFetchBuilderStandard) o;
-		return fetchable.equals( that.fetchable )
-			&& columnNames.equals( that.columnNames );
+		else {
+			return fetchable.equals( that.fetchable )
+				&& columnNames.equals( that.columnNames );
+		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderAttribute.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderAttribute.java
index 8fe16e80133b..c8c6a475f1b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderAttribute.java
@@ -9,7 +9,6 @@
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.internal.ResultSetMappingSqlSelection;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
@@ -20,6 +19,7 @@
 
 import static org.hibernate.query.results.internal.ResultsHelper.impl;
 import static org.hibernate.query.results.internal.ResultsHelper.jdbcPositionToValuesArrayPosition;
+import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
 
 /**
  * DynamicResultBuilder based on a named mapped attribute
@@ -77,7 +77,8 @@ public DomainResult<?> buildResult(
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
 		final var sqlSelection =
-				sqlSelection( jdbcResultsMetadata, domainResultCreationState, impl( domainResultCreationState ) );
+				sqlSelection( jdbcResultsMetadata, domainResultCreationState,
+						impl( domainResultCreationState ) );
 		return new BasicResult<>(
 				sqlSelection.getValuesArrayPosition(),
 				columnAlias,
@@ -94,7 +95,7 @@ private SqlSelection sqlSelection(
 			DomainResultCreationStateImpl domainResultCreationStateImpl) {
 		return domainResultCreationStateImpl.resolveSqlSelection(
 				domainResultCreationStateImpl.resolveSqlExpression(
-						SqlExpressionResolver.createColumnReferenceKey( columnAlias ),
+						createColumnReferenceKey( columnAlias ),
 						processingState -> {
 							final int jdbcPosition = jdbcResultsMetadata.resolveColumnPosition( columnAlias );
 							final int valuesArrayPosition = jdbcPositionToValuesArrayPosition( jdbcPosition );
@@ -108,19 +109,19 @@ private SqlSelection sqlSelection(
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof DynamicResultBuilderAttribute that) ) {
 			return false;
 		}
-
-		final var that = (DynamicResultBuilderAttribute) o;
-		return attributeMapping.equals( that.attributeMapping )
-			&& columnAlias.equals( that.columnAlias )
-			&& entityName.equals( that.entityName )
-			&& attributePath.equals( that.attributePath );
+		else {
+			return attributeMapping.equals( that.attributeMapping )
+				&& columnAlias.equals( that.columnAlias )
+				&& entityName.equals( that.entityName )
+				&& attributePath.equals( that.attributePath );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicConverted.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicConverted.java
index 7b80ff81fcf7..d6e4af149688 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicConverted.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicConverted.java
@@ -8,9 +8,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.query.results.internal.ResultSetMappingSqlSelection;
-import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.resource.beans.spi.ProvidedInstanceManagedBeanImpl;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
@@ -20,6 +18,9 @@
 
 import java.util.Objects;
 
+import static org.hibernate.query.results.internal.ResultsHelper.jdbcPositionToValuesArrayPosition;
+import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
+
 /**
  * A ResultBuilder for explicitly converted scalar results
  *
@@ -89,7 +90,7 @@ public BasicResult<?> buildResult(
 						: jdbcResultsMetadata.resolveColumnName( resultPosition + 1 );
 		final var sqlSelection = sqlExpressionResolver.resolveSqlSelection(
 				sqlExpressionResolver.resolveSqlExpression(
-						SqlExpressionResolver.createColumnReferenceKey( columnName ),
+						createColumnReferenceKey( columnName ),
 						state -> resultSetMappingSqlSelection( jdbcResultsMetadata, resultPosition, typeConfiguration )
 				),
 				basicValueConverter.getRelationalJavaType(),
@@ -109,7 +110,9 @@ public BasicResult<?> buildResult(
 	}
 
 	private ResultSetMappingSqlSelection resultSetMappingSqlSelection(
-			JdbcValuesMetadata jdbcResultsMetadata, int resultPosition, TypeConfiguration typeConfiguration) {
+			JdbcValuesMetadata jdbcResultsMetadata,
+			int resultPosition,
+			TypeConfiguration typeConfiguration) {
 		final int jdbcPosition =
 				columnAlias != null
 						? jdbcResultsMetadata.resolveColumnPosition( columnAlias )
@@ -119,23 +122,24 @@ private ResultSetMappingSqlSelection resultSetMappingSqlSelection(
 				basicValueConverter.getRelationalJavaType(),
 				typeConfiguration
 		);
-		final int valuesArrayPosition = ResultsHelper.jdbcPositionToValuesArrayPosition( jdbcPosition );
-		return new ResultSetMappingSqlSelection( valuesArrayPosition, (BasicValuedMapping) basicType );
+		return new ResultSetMappingSqlSelection(
+				jdbcPositionToValuesArrayPosition( jdbcPosition ),
+				(BasicValuedMapping) basicType
+		);
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof DynamicResultBuilderBasicConverted<?, ?> that ) ) {
 			return false;
 		}
-
-		final var that = (DynamicResultBuilderBasicConverted<?, ?>) o;
-
-		return Objects.equals( columnAlias, that.columnAlias )
-			&& basicValueConverter.equals( that.basicValueConverter );
+		else {
+			return Objects.equals( columnAlias, that.columnAlias )
+				&& basicValueConverter.equals( that.basicValueConverter );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicStandard.java
index 6f7d44c6c537..3aa75be75961 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderBasicStandard.java
@@ -7,8 +7,6 @@
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.results.internal.ResultSetMappingSqlSelection;
-import org.hibernate.query.results.internal.ResultsHelper;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
@@ -19,6 +17,9 @@
 
 import java.util.Objects;
 
+import static org.hibernate.query.results.internal.ResultsHelper.jdbcPositionToValuesArrayPosition;
+import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
+
 /**
  * Standard DynamicResultBuilder for basic values.
  *
@@ -119,10 +120,9 @@ public BasicResult<?> buildResult(
 		final var typeConfiguration = sqlAstCreationState.getCreationContext().getTypeConfiguration();
 		final var sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
 
-		final var expression = sqlExpressionResolver.resolveSqlExpression(
-				SqlExpressionResolver.createColumnReferenceKey( columnName ),
-				state -> resultSetMappingSqlSelection( jdbcResultsMetadata, typeConfiguration )
-		);
+		final var expression =
+				sqlExpressionResolver.resolveSqlExpression( createColumnReferenceKey( columnName ),
+						state -> resultSetMappingSqlSelection( jdbcResultsMetadata, typeConfiguration ) );
 
 		final JavaType<?> javaType;
 		final JavaType<?> jdbcJavaType;
@@ -165,29 +165,31 @@ private ResultSetMappingSqlSelection resultSetMappingSqlSelection(
 				columnPosition > 0
 						? columnPosition
 						: jdbcResultsMetadata.resolveColumnPosition( columnName );
-		final int valuesArrayPosition = ResultsHelper.jdbcPositionToValuesArrayPosition( jdbcPosition );
 		final var basicType =
 				explicitType != null
 						? explicitType
 						: jdbcResultsMetadata.resolveType( jdbcPosition, explicitJavaType, typeConfiguration );
-		return new ResultSetMappingSqlSelection( valuesArrayPosition, (BasicValuedMapping) basicType );
+		return new ResultSetMappingSqlSelection(
+				jdbcPositionToValuesArrayPosition( jdbcPosition ),
+				(BasicValuedMapping) basicType
+		);
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof DynamicResultBuilderBasicStandard that ) ) {
 			return false;
 		}
-
-		final var that = (DynamicResultBuilderBasicStandard) o;
-		return columnPosition == that.columnPosition
-			&& columnName.equals( that.columnName )
-			&& resultAlias.equals( that.resultAlias )
-			&& Objects.equals( explicitType, that.explicitType )
-			&& Objects.equals( explicitJavaType, that.explicitJavaType );
+		else {
+			return columnPosition == that.columnPosition
+				&& columnName.equals( that.columnName )
+				&& resultAlias.equals( that.resultAlias )
+				&& Objects.equals( explicitType, that.explicitType )
+				&& Objects.equals( explicitJavaType, that.explicitJavaType );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntity.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntity.java
index 4151660662ff..3e1ec5b232fb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntity.java
@@ -14,7 +14,7 @@
  */
 public interface DynamicResultBuilderEntity extends DynamicResultBuilder, ResultBuilderEntityValued {
 	@Override
-	EntityResult buildResult(
+	EntityResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState);
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntityCalculated.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntityCalculated.java
index a8a800a3f2a5..feb4613770a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntityCalculated.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntityCalculated.java
@@ -99,7 +99,7 @@ public DynamicResultBuilderEntityCalculated cacheKeyInstance() {
 	}
 
 	@Override
-	public EntityResult buildResult(
+	public EntityResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
@@ -119,7 +119,7 @@ public EntityResult buildResult(
 			domainResultCreationState.getSqlAstCreationState().registerLockMode( tableAlias, explicitLockMode );
 		}
 
-		return (EntityResult) entityMapping.createDomainResult(
+		return (EntityResult<?>) entityMapping.createDomainResult(
 				navigablePath,
 				tableGroup,
 				tableAlias,
@@ -128,19 +128,19 @@ public EntityResult buildResult(
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof DynamicResultBuilderEntityCalculated that ) ) {
 			return false;
 		}
-
-		final var that = (DynamicResultBuilderEntityCalculated) o;
-		return navigablePath.equals( that.navigablePath )
-			&& entityMapping.equals( that.entityMapping )
-			&& tableAlias.equals( that.tableAlias )
-			&& explicitLockMode == that.explicitLockMode;
+		else {
+			return navigablePath.equals( that.navigablePath )
+				&& entityMapping.equals( that.entityMapping )
+				&& tableAlias.equals( that.tableAlias )
+				&& explicitLockMode == that.explicitLockMode;
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntityStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntityStandard.java
index 568c3c99f39b..65b80f7c4fff 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntityStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderEntityStandard.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.query.results.internal.dynamic;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.AssertionFailure;
 import org.hibernate.LockMode;
 import org.hibernate.engine.FetchTiming;
@@ -16,7 +17,6 @@
 import org.hibernate.metamodel.mapping.internal.ManyToManyCollectionPart;
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.results.FetchBuilder;
-import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.query.results.internal.complete.CompleteFetchBuilder;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlAliasBaseConstant;
@@ -30,12 +30,13 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 
+import static java.util.Collections.addAll;
 import static org.hibernate.query.results.internal.ResultsHelper.impl;
+import static org.hibernate.query.results.internal.ResultsHelper.resolveSqlExpression;
 
 /**
  * @author Steve Ebersole
@@ -108,7 +109,7 @@ public NativeQuery.RootReturn addIdColumnAliases(String... aliases) {
 		if ( idColumnNames == null ) {
 			idColumnNames = new ArrayList<>( aliases.length );
 		}
-		Collections.addAll( idColumnNames, aliases );
+		addAll( idColumnNames, aliases );
 		return this;
 	}
 
@@ -128,12 +129,12 @@ public DynamicResultBuilderEntityStandard cacheKeyInstance() {
 	}
 
 	@Override
-	public EntityResult buildResult(
+	public EntityResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
 		return buildResultOrFetch(
-				(tableGroup) -> (EntityResult) entityMapping.createDomainResult(
+				(tableGroup) -> (EntityResult<?>) entityMapping.createDomainResult(
 						navigablePath,
 						tableGroup,
 						tableAlias,
@@ -182,11 +183,12 @@ private <T> T buildResultOrFetch(
 			collectionTableGroup = null;
 			elementNavigablePath = navigablePath;
 		}
-		final TableGroup tableGroup = fromClauseAccess.resolveTableGroup(
+		final var tableGroup = fromClauseAccess.resolveTableGroup(
 				elementNavigablePath,
-				np -> {
+				path -> {
 					if ( lockMode != null ) {
-						domainResultCreationState.getSqlAstCreationState().registerLockMode( tableAlias, lockMode );
+						domainResultCreationState.getSqlAstCreationState()
+								.registerLockMode( tableAlias, lockMode );
 					}
 					return entityMapping.createRootTableGroup(
 							true,
@@ -199,17 +201,8 @@ private <T> T buildResultOrFetch(
 				}
 		);
 		final var tableReference = tableGroup.getPrimaryTableReference();
-		final List<String> keyColumnAliases;
 		final var idFetchBuilder = findIdFetchBuilder();
-		if ( idColumnNames != null ) {
-			keyColumnAliases = idColumnNames;
-		}
-		else if ( idFetchBuilder != null ) {
-			keyColumnAliases = ( (DynamicFetchBuilder) idFetchBuilder ).getColumnAliases();
-		}
-		else {
-			keyColumnAliases = null;
-		}
+		final var keyColumnAliases = getKeyColumnAliases( idFetchBuilder );
 		if ( keyColumnAliases != null ) {
 			final ModelPart keyPart;
 			final TableGroup keyTableGroup;
@@ -221,30 +214,22 @@ else if ( idFetchBuilder != null ) {
 				else {
 					// In here, we know that the idColumnNames refer to the columns of the join table,
 					// so we also need to resolve selections for the element identifier columns
-					final var elementDescriptor = (ManyToManyCollectionPart) pluralAttributeMapping.getElementDescriptor();
+					final var elementDescriptor =
+							(ManyToManyCollectionPart)
+									pluralAttributeMapping.getElementDescriptor();
 					keyPart = elementDescriptor.getForeignKeyDescriptor().getKeyPart();
 					keyTableGroup = collectionTableGroup;
-					final List<String> idColumnAliases;
-					if ( idFetchBuilder instanceof DynamicFetchBuilder dynamicFetchBuilder ) {
-						idColumnAliases = dynamicFetchBuilder.getColumnAliases();
-					}
-					else if ( idFetchBuilder instanceof CompleteFetchBuilder completeFetchBuilder ) {
-						idColumnAliases = completeFetchBuilder.getColumnAliases();
-					}
-					else {
-						throw new AssertionFailure( "Unexpected fetch builder" );
-					}
-
-					entityMapping
-							.getIdentifierMapping()
-							.forEachSelectable( (selectionIndex, selectableMapping) -> resolveSqlSelection(
-									idColumnAliases.get( selectionIndex ),
-									tableReference,
-									selectableMapping,
-									jdbcResultsMetadata,
-									domainResultCreationState
-							)
-					);
+					final var idColumnAliases = getIdColumnAliases( idFetchBuilder );
+					entityMapping.getIdentifierMapping()
+							.forEachSelectable( (selectionIndex, selectableMapping) ->
+									resolveSqlSelection(
+											idColumnAliases.get( selectionIndex ),
+											tableReference,
+											selectableMapping,
+											jdbcResultsMetadata,
+											domainResultCreationState
+									)
+							);
 				}
 			}
 			else {
@@ -254,7 +239,8 @@ else if ( idFetchBuilder instanceof CompleteFetchBuilder completeFetchBuilder )
 
 			keyPart.forEachSelectable( (selectionIndex, selectableMapping) -> resolveSqlSelection(
 					keyColumnAliases.get( selectionIndex ),
-					keyTableGroup.resolveTableReference( selectableMapping.getContainingTableExpression() ),
+					keyTableGroup.resolveTableReference(
+							selectableMapping.getContainingTableExpression() ),
 					selectableMapping,
 					jdbcResultsMetadata,
 					domainResultCreationState
@@ -273,13 +259,7 @@ else if ( idFetchBuilder instanceof CompleteFetchBuilder completeFetchBuilder )
 
 		try {
 			creationState.pushExplicitFetchMementoResolver(
-					f -> {
-						if ( f != null ) {
-							return findFetchBuilder( f );
-						}
-						return null;
-					}
-			);
+					f -> f == null ? null : findFetchBuilder( f ) );
 			return resultOrFetchBuilder.apply( tableGroup );
 		}
 		finally {
@@ -287,10 +267,34 @@ else if ( idFetchBuilder instanceof CompleteFetchBuilder completeFetchBuilder )
 		}
 	}
 
+	private static List<String> getIdColumnAliases(FetchBuilder idFetchBuilder) {
+		if ( idFetchBuilder instanceof DynamicFetchBuilder dynamicFetchBuilder ) {
+			return dynamicFetchBuilder.getColumnAliases();
+		}
+		else if ( idFetchBuilder instanceof CompleteFetchBuilder completeFetchBuilder ) {
+			return completeFetchBuilder.getColumnAliases();
+		}
+		else {
+			throw new AssertionFailure( "Unexpected fetch builder" );
+		}
+	}
+
+	private @Nullable List<String> getKeyColumnAliases(FetchBuilder idFetchBuilder) {
+		if ( idColumnNames != null ) {
+			return idColumnNames;
+		}
+		else if ( idFetchBuilder != null ) {
+			return ( (DynamicFetchBuilder) idFetchBuilder).getColumnAliases();
+		}
+		else {
+			return null;
+		}
+	}
+
 	private static void resolveDiscriminatorSqlSelection(String columnAlias, TableReference tableReference, EntityDiscriminatorMapping discriminatorMapping, JdbcValuesMetadata jdbcResultsMetadata, DomainResultCreationState domainResultCreationState) {
 		final var creationStateImpl = impl( domainResultCreationState );
 		creationStateImpl.resolveSqlSelection(
-				ResultsHelper.resolveSqlExpression(
+				resolveSqlExpression(
 						creationStateImpl,
 						jdbcResultsMetadata,
 						tableReference,
@@ -316,7 +320,7 @@ private void resolveSqlSelection(
 			DomainResultCreationState domainResultCreationState) {
 		final var creationStateImpl = impl( domainResultCreationState );
 		creationStateImpl.resolveSqlSelection(
-				ResultsHelper.resolveSqlExpression(
+				resolveSqlExpression(
 						creationStateImpl,
 						jdbcResultsMetadata,
 						tableReference,
@@ -356,7 +360,7 @@ public NativeQuery.ReturnProperty addProperty(String propertyName) {
 
 	@Override
 	public int hashCode() {
-		int result = super.hashCode();
+		int result = fetchBuilderMap == null ? 0 : fetchBuilderMap.hashCode();
 		result = 31 * result + navigablePath.hashCode();
 		result = 31 * result + entityMapping.hashCode();
 		result = 31 * result + tableAlias.hashCode();
@@ -367,21 +371,21 @@ public int hashCode() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		if ( !( object instanceof DynamicResultBuilderEntityStandard that ) ) {
 			return false;
 		}
-
-		final var that = (DynamicResultBuilderEntityStandard) o;
-		return navigablePath.equals( that.navigablePath )
-			&& entityMapping.equals( that.entityMapping )
-			&& tableAlias.equals( that.tableAlias )
-			&& lockMode == that.lockMode
-			&& Objects.equals( idColumnNames, that.idColumnNames )
-			&& Objects.equals( discriminatorColumnName, that.discriminatorColumnName )
-			&& super.equals( o );
+		else {
+			return navigablePath.equals( that.navigablePath )
+				&& entityMapping.equals( that.entityMapping )
+				&& tableAlias.equals( that.tableAlias )
+				&& lockMode == that.lockMode
+				&& Objects.equals( idColumnNames, that.idColumnNames )
+				&& Objects.equals( discriminatorColumnName, that.discriminatorColumnName )
+				&& Objects.equals( fetchBuilderMap, that.fetchBuilderMap );
+		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderInstantiation.java
index 4285e43a0618..402d4ddcd2b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderInstantiation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/dynamic/DynamicResultBuilderInstantiation.java
@@ -34,17 +34,17 @@ public InstantiationArgument(DynamicResultBuilder argumentBuilder, String result
 		}
 
 		@Override
-		public boolean equals(Object o) {
-			if ( this == o ) {
+		public boolean equals(Object object) {
+			if ( this == object ) {
 				return true;
 			}
-			if ( o == null || getClass() != o.getClass() ) {
+			if ( !( object instanceof InstantiationArgument that ) ) {
 				return false;
 			}
-
-			final var that = (InstantiationArgument) o;
-			return argumentBuilder.equals( that.argumentBuilder )
-				&&  resultAlias.equals( that.resultAlias );
+			else {
+				return argumentBuilder.equals( that.argumentBuilder )
+					&&  resultAlias.equals( that.resultAlias );
+			}
 		}
 
 		@Override
@@ -65,7 +65,8 @@ public DynamicResultBuilderInstantiation(JavaType<J> javaType) {
 
 	private DynamicResultBuilderInstantiation(DynamicResultBuilderInstantiation<J> original) {
 		this.javaType = original.javaType;
-		final List<InstantiationArgument> arguments = new ArrayList<>( original.argumentResultBuilders.size() );
+		final List<InstantiationArgument> arguments =
+				new ArrayList<>( original.argumentResultBuilders.size() );
 		for ( var arg : original.argumentResultBuilders ) {
 			arguments.add( new InstantiationArgument( arg.argumentBuilder.cacheKeyInstance(), arg.resultAlias ) );
 		}
@@ -97,7 +98,8 @@ public DomainResult<?> buildResult(
 			throw new IllegalStateException( "DynamicResultBuilderInstantiation defined no arguments" );
 		}
 
-		final List<ArgumentDomainResult<?>> argumentDomainResults = new ArrayList<>( argumentResultBuilders.size() );
+		final List<ArgumentDomainResult<?>> argumentDomainResults =
+				new ArrayList<>( argumentResultBuilders.size() );
 		for ( int i = 0; i < argumentResultBuilders.size(); i++ ) {
 			argumentDomainResults.add( new ArgumentDomainResult<>(
 					argumentResultBuilders.get( i )
@@ -114,17 +116,17 @@ public DomainResult<?> buildResult(
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof DynamicResultBuilderInstantiation<?> that ) ) {
 			return false;
 		}
-
-		final var that = (DynamicResultBuilderInstantiation<?>) o;
-		return javaType.equals( that.javaType )
-			&& argumentResultBuilders.equals( that.argumentResultBuilders );
+		else {
+			return javaType.equals( that.javaType )
+				&& argumentResultBuilders.equals( that.argumentResultBuilders );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitAttributeFetchBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitAttributeFetchBuilder.java
index a1b31919fd07..56bac498d5e4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitAttributeFetchBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitAttributeFetchBuilder.java
@@ -51,17 +51,17 @@ public Fetch buildFetch(
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof ImplicitAttributeFetchBuilder that ) ) {
 			return false;
 		}
-
-		final ImplicitAttributeFetchBuilder that = (ImplicitAttributeFetchBuilder) o;
-		return navigablePath.equals( that.navigablePath )
-			&& attributeMapping.equals( that.attributeMapping );
+		else {
+			return navigablePath.equals( that.navigablePath )
+				&& attributeMapping.equals( that.attributeMapping );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderBasic.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderBasic.java
index 897c0a1c0c33..9dbe909e96ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderBasic.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderBasic.java
@@ -8,11 +8,9 @@
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.query.results.FetchBuilderBasicValued;
-import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.query.results.internal.ResultsHelper;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.SqlSelection;
-import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.Fetchable;
@@ -22,6 +20,7 @@
 import java.util.function.BiConsumer;
 
 import static org.hibernate.query.results.internal.ResultsHelper.impl;
+import static org.hibernate.query.results.internal.ResultsHelper.resolveSqlExpression;
 
 /**
  * @author Steve Ebersole
@@ -66,7 +65,7 @@ public BasicFetch<?> buildFetch(
 			);
 		}
 
-		final SqlSelection sqlSelection =
+		final var sqlSelection =
 				sqlSelection( parent, fetchPath, jdbcResultsMetadata, domainResultCreationState );
 		return new BasicFetch<>(
 				sqlSelection.getValuesArrayPosition(),
@@ -74,7 +73,6 @@ public BasicFetch<?> buildFetch(
 				fetchPath,
 				fetchable,
 				FetchTiming.IMMEDIATE,
-				domainResultCreationState,
 				!sqlSelection.isVirtual()
 		);
 	}
@@ -84,20 +82,20 @@ private SqlSelection sqlSelection(
 			NavigablePath fetchPath,
 			JdbcValuesMetadata jdbcResultsMetadata,
 			DomainResultCreationState domainResultCreationState) {
-		final DomainResultCreationStateImpl creationStateImpl = ResultsHelper.impl( domainResultCreationState );
-		final TableGroup parentTableGroup =
+		final var creationStateImpl = ResultsHelper.impl( domainResultCreationState );
+		final var parentTableGroup =
 				creationStateImpl.getFromClauseAccess()
 						.getTableGroup( parent.getNavigablePath() );
 		return creationStateImpl.resolveSqlSelection(
-				ResultsHelper.resolveSqlExpression(
+				resolveSqlExpression(
 						creationStateImpl,
 						jdbcResultsMetadata,
 						parentTableGroup.resolveTableReference( fetchPath, fetchable,
 								fetchable.getContainingTableExpression() ),
 						fetchable,
 						fetchable.isFormula()
-								// In case of a formula we look for a result set position with the fetchable name
-								? fetchable.getFetchableName()
+								// In case of a formula we look for a result set position with the selectable name
+								? fetchable.getSelectableName()
 								: fetchable.getSelectionExpression()
 				),
 				fetchable.getJdbcMapping().getJdbcJavaType(),
@@ -113,17 +111,17 @@ public String toString() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof ImplicitFetchBuilderBasic that ) ) {
 			return false;
 		}
-
-		final ImplicitFetchBuilderBasic that = (ImplicitFetchBuilderBasic) o;
-		return fetchPath.equals( that.fetchPath )
-			&& fetchable.equals( that.fetchable );
+		else {
+			return fetchPath.equals( that.fetchPath )
+				&& fetchable.equals( that.fetchable );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderDiscriminatedAssociation.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderDiscriminatedAssociation.java
index 88e4e30957a7..7a76541aade3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderDiscriminatedAssociation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderDiscriminatedAssociation.java
@@ -10,8 +10,6 @@
 import org.hibernate.query.results.FetchBuilder;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstJoinType;
-import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.FetchParent;
@@ -57,10 +55,10 @@ private void tableGroup(FetchParent parent, NavigablePath fetchPath, DomainResul
 		creationStateImpl.getFromClauseAccess().resolveTableGroup(
 				fetchPath,
 				navigablePath -> {
-					final TableGroup parentTableGroup =
+					final var parentTableGroup =
 							creationStateImpl.getFromClauseAccess()
 									.getTableGroup( parent.getNavigablePath() );
-					final TableGroupJoin tableGroupJoin = fetchable.createTableGroupJoin(
+					final var tableGroupJoin = fetchable.createTableGroupJoin(
 							fetchPath,
 							parentTableGroup,
 							null,
@@ -77,17 +75,17 @@ private void tableGroup(FetchParent parent, NavigablePath fetchPath, DomainResul
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof ImplicitFetchBuilderDiscriminatedAssociation that ) ) {
 			return false;
 		}
-
-		final ImplicitFetchBuilderDiscriminatedAssociation that = (ImplicitFetchBuilderDiscriminatedAssociation) o;
-		return fetchPath.equals( that.fetchPath )
-			&& fetchable.equals( that.fetchable );
+		else {
+			return fetchPath.equals( that.fetchPath )
+				&& fetchable.equals( that.fetchable );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEmbeddable.java
index 39d362249fc0..756bd9771301 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEmbeddable.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEmbeddable.java
@@ -9,8 +9,6 @@
 import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstJoinType;
-import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.FetchParent;
@@ -21,7 +19,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiConsumer;
-import java.util.function.Function;
 
 import static java.util.Collections.emptyMap;
 import static org.hibernate.internal.util.collections.CollectionHelper.linkedMapOfSize;
@@ -49,13 +46,13 @@ private static Map<Fetchable, FetchBuilder> fetchBuilderMap(
 			NavigablePath fetchPath,
 			EmbeddableValuedFetchable fetchable,
 			DomainResultCreationStateImpl creationStateImpl) {
-		final Function<Fetchable, FetchBuilder> fetchBuilderResolver =
+		final var fetchBuilderResolver =
 				creationStateImpl.getCurrentExplicitFetchMementoResolver();
 		final int size = fetchable.getNumberOfFetchables();
 		final Map<Fetchable, FetchBuilder> fetchBuilders = linkedMapOfSize( size );
 		for ( int i = 0; i < size; i++ ) {
-			final Fetchable subFetchable = fetchable.getFetchable( i );
-			final FetchBuilder explicitFetchBuilder = fetchBuilderResolver.apply( subFetchable );
+			final var subFetchable = fetchable.getFetchable( i );
+			final var explicitFetchBuilder = fetchBuilderResolver.apply( subFetchable );
 			fetchBuilders.put( subFetchable,
 					explicitFetchBuilder == null
 							? implicitFetchBuilder( fetchPath, subFetchable, creationStateImpl )
@@ -72,7 +69,7 @@ private ImplicitFetchBuilderEmbeddable(ImplicitFetchBuilderEmbeddable original)
 		}
 		else {
 			fetchBuilders = new HashMap<>( original.fetchBuilders.size() );
-			for ( Map.Entry<Fetchable, FetchBuilder> entry : original.fetchBuilders.entrySet() ) {
+			for ( var entry : original.fetchBuilders.entrySet() ) {
 				fetchBuilders.put( entry.getKey(), entry.getValue().cacheKeyInstance() );
 			}
 		}
@@ -89,7 +86,7 @@ public Fetch buildFetch(
 			NavigablePath fetchPath,
 			JdbcValuesMetadata jdbcResultsMetadata,
 			DomainResultCreationState creationState) {
-		final DomainResultCreationStateImpl creationStateImpl = impl( creationState );
+		final var creationStateImpl = impl( creationState );
 
 		// make sure the TableGroup is available
 		tableGroup( parent, fetchPath, creationStateImpl );
@@ -119,10 +116,10 @@ private void tableGroup(FetchParent parent, NavigablePath fetchPath, DomainResul
 		creationStateImpl.getFromClauseAccess().resolveTableGroup(
 				fetchPath,
 				navigablePath -> {
-					final TableGroup parentTableGroup =
+					final var parentTableGroup =
 							creationStateImpl.getFromClauseAccess()
 									.getTableGroup( parent.getNavigablePath() );
-					final TableGroupJoin tableGroupJoin = fetchable.createTableGroupJoin(
+					final var tableGroupJoin = fetchable.createTableGroupJoin(
 							fetchPath,
 							parentTableGroup,
 							null,
@@ -139,18 +136,18 @@ private void tableGroup(FetchParent parent, NavigablePath fetchPath, DomainResul
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof ImplicitFetchBuilderEmbeddable that ) ) {
 			return false;
 		}
-
-		final ImplicitFetchBuilderEmbeddable that = (ImplicitFetchBuilderEmbeddable) o;
-		return fetchPath.equals( that.fetchPath )
-			&& fetchable.equals( that.fetchable )
-			&& fetchBuilders.equals( that.fetchBuilders );
+		else {
+			return fetchPath.equals( that.fetchPath )
+				&& fetchable.equals( that.fetchable )
+				&& fetchBuilders.equals( that.fetchBuilders );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEntity.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEntity.java
index e0134e0290bc..51ffe474b1b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEntity.java
@@ -5,7 +5,6 @@
 package org.hibernate.query.results.internal.implicit;
 
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
-import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
 import org.hibernate.query.results.internal.Builders;
 import org.hibernate.query.results.FetchBuilder;
@@ -42,11 +41,10 @@ public ImplicitFetchBuilderEntity(
 			DomainResultCreationState creationState) {
 		this.fetchPath = fetchPath;
 		this.fetchable = fetchable;
-		final DomainResultCreationStateImpl creationStateImpl = impl( creationState );
-		final Function<Fetchable, FetchBuilder> fetchBuilderResolver = creationStateImpl.getCurrentExplicitFetchMementoResolver();
-		final ForeignKeyDescriptor foreignKeyDescriptor = fetchable.getForeignKeyDescriptor();
+		final var creationStateImpl = impl( creationState );
+		final var fetchBuilderResolver = creationStateImpl.getCurrentExplicitFetchMementoResolver();
+		final var foreignKeyDescriptor = fetchable.getForeignKeyDescriptor();
 		final String associationKeyPropertyName;
-		final NavigablePath associationKeyFetchPath;
 		final Fetchable associationKey;
 		if ( fetchable.getReferencedPropertyName() == null ) {
 			associationKeyPropertyName = fetchable.getEntityMappingType().getIdentifierMapping().getPartName();
@@ -59,8 +57,7 @@ public ImplicitFetchBuilderEntity(
 			}
 			associationKey = (Fetchable) fetchable.findSubPart( keyName );
 		}
-		final FetchBuilder explicitAssociationKeyFetchBuilder =
-				fetchBuilderResolver.apply( fetchable);
+		final var explicitAssociationKeyFetchBuilder = fetchBuilderResolver.apply( fetchable);
 		if ( explicitAssociationKeyFetchBuilder == null ) {
 			if ( foreignKeyDescriptor.getPartMappingType() instanceof EmbeddableMappingType embeddableType ) {
 				fetchBuilders = fetchBuilderMap(
@@ -87,8 +84,8 @@ private static Map<Fetchable, FetchBuilder> fetchBuilderMap(
 		final int size = embeddableValuedModelPart.getNumberOfFetchables();
 		final Map<Fetchable, FetchBuilder> fetchBuilders = linkedMapOfSize( size );
 		for ( int i = 0; i < size; i++ ) {
-			final Fetchable subFetchable = embeddableValuedModelPart.getFetchable( i );
-			final FetchBuilder explicitFetchBuilder = fetchBuilderResolver.apply( subFetchable );
+			final var subFetchable = embeddableValuedModelPart.getFetchable( i );
+			final var explicitFetchBuilder = fetchBuilderResolver.apply( subFetchable );
 			fetchBuilders.put( subFetchable,
 					explicitFetchBuilder == null
 							? Builders.implicitFetchBuilder( fetchPath, subFetchable, creationStateImpl )
@@ -105,7 +102,7 @@ private ImplicitFetchBuilderEntity(ImplicitFetchBuilderEntity original) {
 		}
 		else {
 			fetchBuilders = new HashMap<>( original.fetchBuilders.size() );
-			for ( Map.Entry<Fetchable, FetchBuilder> entry : original.fetchBuilders.entrySet() ) {
+			for ( var entry : original.fetchBuilders.entrySet() ) {
 				fetchBuilders.put( entry.getKey(), entry.getValue().cacheKeyInstance() );
 			}
 		}
@@ -134,22 +131,22 @@ public Fetch buildFetch(
 
 	@Override
 	public void visitFetchBuilders(BiConsumer<Fetchable, FetchBuilder> consumer) {
-		fetchBuilders.forEach( (k, v) -> consumer.accept( k, v ) );
+		fetchBuilders.forEach( consumer );
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof ImplicitFetchBuilderEntity that ) ) {
 			return false;
 		}
-
-		final ImplicitFetchBuilderEntity that = (ImplicitFetchBuilderEntity) o;
-		return fetchPath.equals( that.fetchPath )
-			&& fetchable.equals( that.fetchable )
-			&& fetchBuilders.equals( that.fetchBuilders );
+		else {
+			return fetchPath.equals( that.fetchPath )
+				&& fetchable.equals( that.fetchable )
+				&& fetchBuilders.equals( that.fetchBuilders );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEntityPart.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEntityPart.java
index d4834dfead00..df8f6984bdf2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEntityPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderEntityPart.java
@@ -48,17 +48,17 @@ public Fetch buildFetch(
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof ImplicitFetchBuilderEntityPart that ) ) {
 			return false;
 		}
-
-		final ImplicitFetchBuilderEntityPart that = (ImplicitFetchBuilderEntityPart) o;
-		return fetchPath.equals( that.fetchPath )
-			&& fetchable.equals( that.fetchable );
+		else {
+			return fetchPath.equals( that.fetchPath )
+				&& fetchable.equals( that.fetchable );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderPlural.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderPlural.java
index 9d1c170adef8..35b7b93e24b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderPlural.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitFetchBuilderPlural.java
@@ -51,17 +51,17 @@ public Fetch buildFetch(
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !(object instanceof ImplicitFetchBuilderPlural that ) ) {
 			return false;
 		}
-
-		final ImplicitFetchBuilderPlural that = (ImplicitFetchBuilderPlural) o;
-		return fetchPath.equals( that.fetchPath )
-			&& fetchable.equals( that.fetchable );
+		else {
+			return fetchPath.equals( that.fetchPath )
+				&& fetchable.equals( that.fetchable );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderBasic.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderBasic.java
deleted file mode 100644
index d0117600d753..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderBasic.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.query.results.internal.implicit;
-
-import org.hibernate.metamodel.mapping.BasicValuedModelPart;
-import org.hibernate.query.results.ResultBuilder;
-import org.hibernate.query.results.ResultBuilderBasicValued;
-import org.hibernate.query.results.internal.ResultsHelper;
-import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.results.graph.DomainResultCreationState;
-import org.hibernate.sql.results.graph.basic.BasicResult;
-import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
-
-/**
- * @author Steve Ebersole
- */
-public class ImplicitModelPartResultBuilderBasic
-		implements ImplicitModelPartResultBuilder, ResultBuilderBasicValued {
-	private final NavigablePath navigablePath;
-	private final BasicValuedModelPart modelPart;
-
-	public ImplicitModelPartResultBuilderBasic(NavigablePath navigablePath, BasicValuedModelPart modelPart) {
-		this.navigablePath = navigablePath;
-		this.modelPart = modelPart;
-	}
-
-	@Override
-	public Class<?> getJavaType() {
-		return modelPart.getExpressibleJavaType().getJavaTypeClass();
-	}
-
-	@Override
-	public ResultBuilder cacheKeyInstance() {
-		return this;
-	}
-
-	@Override
-	public BasicResult<?> buildResult(
-			JdbcValuesMetadata jdbcResultsMetadata,
-			int resultPosition,
-			DomainResultCreationState domainResultCreationState) {
-		final TableGroup tableGroup =
-				ResultsHelper.impl( domainResultCreationState ).getFromClauseAccess()
-						.getTableGroup( navigablePath.getParent() );
-		return (BasicResult<?>) modelPart.createDomainResult( navigablePath, tableGroup, null, domainResultCreationState );
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
-			return true;
-		}
-		if ( o == null || getClass() != o.getClass() ) {
-			return false;
-		}
-
-		final ImplicitModelPartResultBuilderBasic that = (ImplicitModelPartResultBuilderBasic) o;
-		return navigablePath.equals( that.navigablePath )
-			&& modelPart.equals( that.modelPart );
-	}
-
-	@Override
-	public int hashCode() {
-		int result = navigablePath.hashCode();
-		result = 31 * result + modelPart.hashCode();
-		return result;
-	}
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEmbeddable.java
deleted file mode 100644
index f467b6d64089..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEmbeddable.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.query.results.internal.implicit;
-
-import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
-import org.hibernate.query.results.ResultBuilder;
-import org.hibernate.query.results.ResultBuilderEmbeddable;
-import org.hibernate.query.results.internal.DomainResultCreationStateImpl;
-import org.hibernate.query.results.internal.ResultsHelper;
-import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.SqlAstJoinType;
-import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
-import org.hibernate.sql.results.graph.DomainResultCreationState;
-import org.hibernate.sql.results.graph.embeddable.EmbeddableResult;
-import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
-
-/**
- * @author Steve Ebersole
- */
-public class ImplicitModelPartResultBuilderEmbeddable
-		implements ImplicitModelPartResultBuilder, ResultBuilderEmbeddable {
-
-	private final NavigablePath navigablePath;
-	private final EmbeddableValuedModelPart modelPart;
-
-	public ImplicitModelPartResultBuilderEmbeddable(
-			NavigablePath navigablePath,
-			EmbeddableValuedModelPart modelPart) {
-		this.navigablePath = navigablePath;
-		this.modelPart = modelPart;
-	}
-
-	@Override
-	public Class<?> getJavaType() {
-		return modelPart.getJavaType().getJavaTypeClass();
-	}
-
-	@Override
-	public ResultBuilder cacheKeyInstance() {
-		return this;
-	}
-
-	@Override
-	public EmbeddableResult<?> buildResult(
-			JdbcValuesMetadata jdbcResultsMetadata,
-			int resultPosition,
-			DomainResultCreationState domainResultCreationState) {
-		final DomainResultCreationStateImpl creationStateImpl = ResultsHelper.impl( domainResultCreationState );
-		creationStateImpl.disallowPositionalSelections();
-		return (EmbeddableResult<?>) modelPart.createDomainResult(
-				navigablePath,
-				tableGroup( creationStateImpl ),
-				null,
-				domainResultCreationState
-		);
-
-	}
-
-	private TableGroup tableGroup(DomainResultCreationStateImpl creationStateImpl) {
-		return creationStateImpl.getFromClauseAccess().resolveTableGroup(
-				navigablePath,
-				np -> {
-					if ( navigablePath.getParent() == null ) {
-						throw new IllegalStateException(
-								"Could not determine LHS for implicit embeddable result builder - " + navigablePath
-						);
-					}
-
-					final TableGroup parentTableGroup =
-							creationStateImpl.getFromClauseAccess()
-									.getTableGroup( navigablePath.getParent() );
-
-					final TableGroupJoin tableGroupJoin = modelPart.createTableGroupJoin(
-							navigablePath,
-							parentTableGroup,
-							null,
-							null,
-							SqlAstJoinType.INNER,
-							true,
-							false,
-							creationStateImpl
-					);
-
-					parentTableGroup.addTableGroupJoin( tableGroupJoin );
-
-					return tableGroupJoin.getJoinedGroup();
-				}
-		);
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
-			return true;
-		}
-		if ( o == null || getClass() != o.getClass() ) {
-			return false;
-		}
-
-		final ImplicitModelPartResultBuilderEmbeddable that = (ImplicitModelPartResultBuilderEmbeddable) o;
-		return navigablePath.equals( that.navigablePath )
-				&& modelPart.equals( that.modelPart );
-	}
-
-	@Override
-	public int hashCode() {
-		int result = navigablePath.hashCode();
-		result = 31 * result + modelPart.hashCode();
-		return result;
-	}
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEntity.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEntity.java
index 7220165dd27c..6a1503efa557 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEntity.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitModelPartResultBuilderEntity.java
@@ -47,13 +47,13 @@ public ResultBuilder cacheKeyInstance() {
 	}
 
 	@Override
-	public EntityResult buildResult(
+	public EntityResult<?> buildResult(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			int resultPosition,
 			DomainResultCreationState domainResultCreationState) {
-		final DomainResultCreationStateImpl creationStateImpl = ResultsHelper.impl( domainResultCreationState );
+		final var creationStateImpl = ResultsHelper.impl( domainResultCreationState );
 		creationStateImpl.disallowPositionalSelections();
-		return (EntityResult) modelPart.createDomainResult(
+		return (EntityResult<?>) modelPart.createDomainResult(
 				navigablePath,
 				tableGroup( creationStateImpl ),
 				null,
@@ -64,34 +64,36 @@ public EntityResult buildResult(
 	private TableGroup tableGroup(DomainResultCreationStateImpl creationStateImpl) {
 		return creationStateImpl.getFromClauseAccess().resolveTableGroup(
 				navigablePath,
-				np ->
-						navigablePath.getParent() != null
-								? creationStateImpl.getFromClauseAccess().getTableGroup( navigablePath.getParent() )
-								: modelPart.getEntityMappingType().createRootTableGroup(
-										// since this is only used for result set mappings,
-										// the canUseInnerJoins value is irrelevant.
-										true,
-										navigablePath,
-										null,
-										null,
-										null,
-										creationStateImpl
-								)
+				path -> {
+					final var parentPath = navigablePath.getParent();
+					return parentPath != null
+							? creationStateImpl.getFromClauseAccess().getTableGroup( parentPath )
+							: modelPart.getEntityMappingType().createRootTableGroup(
+									// since this is only used for result set mappings,
+									// the canUseInnerJoins value is irrelevant.
+									true,
+									navigablePath,
+									null,
+									null,
+									null,
+									creationStateImpl
+							);
+				}
 		);
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
+	public boolean equals(Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof ImplicitModelPartResultBuilderEntity that ) ) {
 			return false;
 		}
-
-		final ImplicitModelPartResultBuilderEntity that = (ImplicitModelPartResultBuilderEntity) o;
-		return navigablePath.equals( that.navigablePath )
-			&& modelPart.equals( that.modelPart );
+		else {
+			return navigablePath.equals( that.navigablePath )
+				&& modelPart.equals( that.modelPart );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitResultClassBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitResultClassBuilder.java
index 3c71e8746bc8..794511ddaed6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitResultClassBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/results/internal/implicit/ImplicitResultClassBuilder.java
@@ -8,7 +8,6 @@
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.query.results.ResultBuilder;
 import org.hibernate.query.results.internal.ResultSetMappingSqlSelection;
-import org.hibernate.sql.ast.spi.SqlAstCreationState;
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.results.graph.DomainResult;
@@ -18,6 +17,8 @@
 import org.hibernate.type.BasicType;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import static org.hibernate.sql.ast.spi.SqlExpressionResolver.createColumnReferenceKey;
+
 /**
  * ResultBuilder for handling {@link NamedNativeQuery#resultClass()} when the
  * class does not refer to an entity
@@ -38,20 +39,20 @@ public DomainResult<?> buildResult(
 			DomainResultCreationState domainResultCreationState) {
 		assert resultPosition == 0;
 
-		final SqlAstCreationState sqlAstCreationState = domainResultCreationState.getSqlAstCreationState();
-		final TypeConfiguration typeConfiguration = sqlAstCreationState.getCreationContext().getTypeConfiguration();
-		final SqlExpressionResolver sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
+		final var sqlAstCreationState = domainResultCreationState.getSqlAstCreationState();
+		final var typeConfiguration = sqlAstCreationState.getCreationContext().getTypeConfiguration();
+		final var sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
 
 		final int jdbcResultPosition = 1;
 
 		final String columnName = jdbcResultsMetadata.resolveColumnName( jdbcResultPosition );
-		final BasicType<?> basicType = jdbcResultsMetadata.resolveType(
+		final var basicType = jdbcResultsMetadata.resolveType(
 				jdbcResultPosition,
 				typeConfiguration.getJavaTypeRegistry().resolveDescriptor( suppliedResultClass ),
 				typeConfiguration
 		);
 
-		final SqlSelection selection =
+		final var selection =
 				sqlSelection( resultPosition, sqlExpressionResolver, columnName, basicType, typeConfiguration );
 		return new BasicResult<>( selection.getValuesArrayPosition(), columnName, basicType );
 	}
@@ -64,9 +65,8 @@ private static SqlSelection sqlSelection(
 			TypeConfiguration typeConfiguration) {
 		return sqlExpressionResolver.resolveSqlSelection(
 				sqlExpressionResolver.resolveSqlExpression(
-						SqlExpressionResolver.createColumnReferenceKey( columnName ),
-						state ->
-								new ResultSetMappingSqlSelection( resultPosition, (BasicValuedMapping) basicType )
+						createColumnReferenceKey( columnName ),
+						state -> new ResultSetMappingSqlSelection( resultPosition, (BasicValuedMapping) basicType )
 				),
 				basicType.getMappedJavaType(),
 				null,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/specification/DeleteSpecification.java b/hibernate-core/src/main/java/org/hibernate/query/specification/DeleteSpecification.java
index a665d507979c..ebc87e62aa2a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/specification/DeleteSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/specification/DeleteSpecification.java
@@ -13,7 +13,6 @@
 /**
  * Specialization of {@link MutationSpecification} for programmatic customization
  * of delete queries.
- * <p>
  *
  * @param <T> The entity type which is the target of the mutation.
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/query/specification/QuerySpecification.java b/hibernate-core/src/main/java/org/hibernate/query/specification/QuerySpecification.java
index 8b7cb92374a2..26824fdedc5b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/specification/QuerySpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/specification/QuerySpecification.java
@@ -85,7 +85,7 @@ public interface QuerySpecification<T> {
 	 * Validate the query.
 	 *
 	 * @return {@code this} if everything is fine
-	 * @throws Exception if it ain't all good
+	 * @throws RuntimeException if it ain't all good
 	 */
 	QuerySpecification<T> validate(CriteriaBuilder builder);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/specification/SelectionSpecification.java b/hibernate-core/src/main/java/org/hibernate/query/specification/SelectionSpecification.java
index 3c7fca9b8bf8..65a86d1f299a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/specification/SelectionSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/specification/SelectionSpecification.java
@@ -275,6 +275,37 @@ default <X> SimpleProjectionSpecification<T,X> createProjection(SingularAttribut
 		return SimpleProjectionSpecification.create( this, attribute );
 	}
 
+	/**
+	 * Create a {@link SimpleProjectionSpecification} which projects
+	 * the number of results which match the specified restrictions.
+	 * The returned projection holds a reference to this specification,
+	 * and so mutation of this object also affects the projection.
+	 *
+	 * @return a new {@link SimpleProjectionSpecification}
+	 *
+	 * @since 7.3
+	 */
+	@Incubating
+	default SimpleProjectionSpecification<T,Long> createCountProjection() {
+		return SimpleProjectionSpecification.count( this );
+	}
+
+	/**
+	 * Create a {@link SimpleProjectionSpecification} which projects a
+	 * boolean value indicating whether any results match the specified
+	 * restrictions.
+	 * The returned projection holds a reference to this specification,
+	 * and so mutation of this object also affects the projection.
+	 *
+	 * @return a new {@link SimpleProjectionSpecification}
+	 *
+	 * @since 7.3
+	 */
+	@Incubating
+	default SimpleProjectionSpecification<T,Boolean> createExistsProjection() {
+		return SimpleProjectionSpecification.exists( this );
+	}
+
 	/**
 	 * Create a {@link SimpleProjectionSpecification} for the given
 	 * {@linkplain ProjectionSpecification#select(Path) compound path}.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/specification/SimpleProjectionSpecification.java b/hibernate-core/src/main/java/org/hibernate/query/specification/SimpleProjectionSpecification.java
index 819364dba20e..c74dce33e3bf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/specification/SimpleProjectionSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/specification/SimpleProjectionSpecification.java
@@ -15,6 +15,8 @@
 
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.query.restriction.Path;
+import org.hibernate.query.specification.internal.CountProjectionSpecificationImpl;
+import org.hibernate.query.specification.internal.ExistsProjectionSpecificationImpl;
 import org.hibernate.query.specification.internal.SimpleProjectionSpecificationImpl;
 
 /**
@@ -28,6 +30,16 @@
  * var projection = SimpleProjectionSpecification.create(specification, Book_.isbn);
  * var isbns = projection.createQuery(session).getResultList();
  * </pre>
+ * Alternatively, {@link #count} and {@link #exists} allow the number of results to be
+ * determined.
+ * <pre>
+ * var specification =
+ *         SelectionSpecification.create(Book.class)
+ *                 .restrict(Restriction.contains(Book_.title, "hibernate", false))
+ *                 .sort(Order.desc(Book_.title));
+ * var projection = SimpleProjectionSpecification.count(specification);
+ * var resultCount = projection.createQuery(session).getSingleResult();
+ * </pre>
  * <p>
  * Use of a {@link Path} allows joining to associated entities.
  * <pre>
@@ -75,6 +87,24 @@ static <T,X> SimpleProjectionSpecification<T,X> create(
 		return new SimpleProjectionSpecificationImpl<>( selectionSpecification, projectedAttribute );
 	}
 
+	/**
+	 * Create a new {@code ProjectionSpecification} which augments the given
+	 * {@link SelectionSpecification} with a {@code count(*)}.
+	 */
+	static <T> SimpleProjectionSpecification<T,Long> count(
+			SelectionSpecification<T> selectionSpecification) {
+		return new CountProjectionSpecificationImpl<>( selectionSpecification );
+	}
+
+	/**
+	 * Create a new {@code ProjectionSpecification} which augments the given
+	 * {@link SelectionSpecification} with an {@code exists()}.
+	 */
+	static <T> SimpleProjectionSpecification<T,Boolean> exists(
+			SelectionSpecification<T> selectionSpecification) {
+		return new ExistsProjectionSpecificationImpl<>( selectionSpecification );
+	}
+
 	@Override
 	SelectionQuery<X> createQuery(Session session);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/specification/internal/CountProjectionSpecificationImpl.java b/hibernate-core/src/main/java/org/hibernate/query/specification/internal/CountProjectionSpecificationImpl.java
new file mode 100644
index 000000000000..30be65beb1ff
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/query/specification/internal/CountProjectionSpecificationImpl.java
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.query.specification.internal;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQueryReference;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import org.hibernate.Session;
+import org.hibernate.SharedSessionContract;
+import org.hibernate.StatelessSession;
+import org.hibernate.query.SelectionQuery;
+import org.hibernate.query.restriction.Restriction;
+import org.hibernate.query.specification.QuerySpecification;
+import org.hibernate.query.specification.SelectionSpecification;
+import org.hibernate.query.specification.SimpleProjectionSpecification;
+import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * @author Gavin King
+ */
+public class CountProjectionSpecificationImpl<T> implements SimpleProjectionSpecification<T,Long>, TypedQueryReference<Long> {
+
+	private final SelectionSpecification<T> selectionSpecification;
+
+	public CountProjectionSpecificationImpl(SelectionSpecification<T> specification) {
+		this.selectionSpecification = specification;
+	}
+
+	@Override
+	public QuerySpecification<T> restrict(Restriction<? super T> restriction) {
+		throw new UnsupportedOperationException( "This is not supported yet!" );
+	}
+
+	@Override
+	public SelectionQuery<Long> createQuery(Session session) {
+		return session.createSelectionQuery( buildCriteria( session.getCriteriaBuilder() ) );
+	}
+
+	@Override
+	public SelectionQuery<Long> createQuery(StatelessSession session) {
+		return session.createSelectionQuery( buildCriteria( session.getCriteriaBuilder() ) );
+	}
+
+	@Override
+	public SelectionQuery<Long> createQuery(EntityManager entityManager) {
+		return entityManager.unwrap( SharedSessionContract.class )
+				.createQuery( buildCriteria( entityManager.getCriteriaBuilder() ) );
+	}
+
+	@Override
+	public CriteriaQuery<Long> buildCriteria(CriteriaBuilder builder) {
+		var impl = (SelectionSpecificationImpl<T>) selectionSpecification;
+		// TODO: handle HQL, existing criteria
+		final var tupleQuery =
+				(SqmSelectStatement<Long>)
+						builder.createQuery( getResultType() );
+		final var root = tupleQuery.from( impl.getResultType() );
+		// This cast is completely bogus
+		final var castStatement = (SqmSelectStatement<T>) tupleQuery;
+		impl.getSpecifications().forEach( spec -> spec.accept( castStatement, root ) );
+		tupleQuery.select( builder.count( root ) );
+		return tupleQuery;
+	}
+
+	@Override
+	public SimpleProjectionSpecification<T,Long> validate(CriteriaBuilder builder) {
+		selectionSpecification.validate( builder );
+		return this;
+	}
+
+	@Override
+	public TypedQueryReference<Long> reference() {
+		return this;
+	}
+
+	@Override
+	public String getName() {
+		return null;
+	}
+
+	@Override
+	public Class<Long> getResultType() {
+		return Long.class;
+	}
+
+	@Override
+	public Map<String, Object> getHints() {
+		return Collections.emptyMap();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/specification/internal/ExistsProjectionSpecificationImpl.java b/hibernate-core/src/main/java/org/hibernate/query/specification/internal/ExistsProjectionSpecificationImpl.java
new file mode 100644
index 000000000000..34ccc0296b5a
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/query/specification/internal/ExistsProjectionSpecificationImpl.java
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.query.specification.internal;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQueryReference;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import org.hibernate.Session;
+import org.hibernate.SharedSessionContract;
+import org.hibernate.StatelessSession;
+import org.hibernate.query.SelectionQuery;
+import org.hibernate.query.restriction.Restriction;
+import org.hibernate.query.specification.QuerySpecification;
+import org.hibernate.query.specification.SelectionSpecification;
+import org.hibernate.query.specification.SimpleProjectionSpecification;
+import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * @author Gavin King
+ */
+public class ExistsProjectionSpecificationImpl<T> implements SimpleProjectionSpecification<T,Boolean>, TypedQueryReference<Boolean> {
+
+	private final SelectionSpecification<T> selectionSpecification;
+
+	public ExistsProjectionSpecificationImpl(SelectionSpecification<T> specification) {
+		this.selectionSpecification = specification;
+	}
+
+	@Override
+	public QuerySpecification<T> restrict(Restriction<? super T> restriction) {
+		throw new UnsupportedOperationException( "This is not supported yet!" );
+	}
+
+	@Override
+	public SelectionQuery<Boolean> createQuery(Session session) {
+		return session.createSelectionQuery( buildCriteria( session.getCriteriaBuilder() ) );
+	}
+
+	@Override
+	public SelectionQuery<Boolean> createQuery(StatelessSession session) {
+		return session.createSelectionQuery( buildCriteria( session.getCriteriaBuilder() ) );
+	}
+
+	@Override
+	public SelectionQuery<Boolean> createQuery(EntityManager entityManager) {
+		return entityManager.unwrap( SharedSessionContract.class )
+				.createQuery( buildCriteria( entityManager.getCriteriaBuilder() ) );
+	}
+
+	@Override
+	public CriteriaQuery<Boolean> buildCriteria(CriteriaBuilder builder) {
+		var impl = (SelectionSpecificationImpl<T>) selectionSpecification;
+		// TODO: handle HQL, existing criteria
+		final var tupleQuery =
+				(SqmSelectStatement<Boolean>)
+						builder.createQuery( getResultType() );
+		final var subquery = tupleQuery.subquery( impl.getResultType() );
+		final var root = subquery.from( impl.getResultType() );
+		impl.getSpecifications().forEach( spec -> spec.accept( subquery, root ) );
+		subquery.select( root );
+		tupleQuery.select( builder.exists( subquery ) );
+		return tupleQuery;
+	}
+
+	@Override
+	public SimpleProjectionSpecification<T,Boolean> validate(CriteriaBuilder builder) {
+		selectionSpecification.validate( builder );
+		return this;
+	}
+
+	@Override
+	public TypedQueryReference<Boolean> reference() {
+		return this;
+	}
+
+	@Override
+	public String getName() {
+		return null;
+	}
+
+	@Override
+	public Class<Boolean> getResultType() {
+		return Boolean.class;
+	}
+
+	@Override
+	public Map<String, Object> getHints() {
+		return Collections.emptyMap();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/specification/internal/ProjectionSpecificationImpl.java b/hibernate-core/src/main/java/org/hibernate/query/specification/internal/ProjectionSpecificationImpl.java
index 61954c799819..e97c3e821e31 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/specification/internal/ProjectionSpecificationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/specification/internal/ProjectionSpecificationImpl.java
@@ -31,6 +31,8 @@
 import java.util.Map;
 import java.util.function.BiFunction;
 
+import static org.hibernate.internal.util.type.PrimitiveWrappers.cast;
+
 /**
  * @author Gavin King
  */
@@ -47,14 +49,14 @@ public ProjectionSpecificationImpl(SelectionSpecification<T> selectionSpecificat
 	public <X> Element<X> select(SingularAttribute<T, X> attribute) {
 		final int position = specifications.size();
 		specifications.add( (select, root) -> root.get( attribute ) );
-		return tuple -> (X) tuple[position];
+		return tuple -> cast( attribute.getJavaType(), tuple[position] );
 	}
 
 	@Override
 	public <X> Element<X> select(Path<T, X> path) {
 		final int position = specifications.size();
 		specifications.add( (select, root) -> (SqmPath<X>) path.path( root ) );
-		return tuple -> (X) tuple[position];
+		return tuple -> cast( path.getType(), tuple[position] );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/specification/internal/SelectionSpecificationImpl.java b/hibernate-core/src/main/java/org/hibernate/query/specification/internal/SelectionSpecificationImpl.java
index 1b767674def7..60105e35d787 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/specification/internal/SelectionSpecificationImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/specification/internal/SelectionSpecificationImpl.java
@@ -26,6 +26,7 @@
 import org.hibernate.query.sqm.internal.SqmSelectionQueryImpl;
 import org.hibernate.query.sqm.internal.SqmUtil;
 import org.hibernate.query.sqm.tree.from.SqmRoot;
+import org.hibernate.query.sqm.tree.select.AbstractSqmSelectQuery;
 import org.hibernate.query.sqm.tree.select.SqmOrderByClause;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
 import org.hibernate.type.descriptor.java.JavaType;
@@ -51,7 +52,7 @@ public class SelectionSpecificationImpl<T> implements SelectionSpecification<T>,
 	private final Class<T> resultType;
 	private final String hql;
 	private final CriteriaQuery<T> criteriaQuery;
-	private final List<BiConsumer<SqmSelectStatement<T>, SqmRoot<T>>> specifications = new ArrayList<>();
+	private final List<BiConsumer<AbstractSqmSelectQuery<T>, SqmRoot<T>>> specifications = new ArrayList<>();
 
 	public SelectionSpecificationImpl(Class<T> resultType) {
 		this.resultType = resultType;
@@ -91,7 +92,7 @@ public TypedQueryReference<T> reference() {
 		return this;
 	}
 
-	public List<BiConsumer<SqmSelectStatement<T>, SqmRoot<T>>> getSpecifications() {
+	public List<BiConsumer<AbstractSqmSelectQuery<T>, SqmRoot<T>>> getSpecifications() {
 		return specifications;
 	}
 
@@ -106,8 +107,12 @@ public SelectionSpecification<T> restrict(Restriction<? super T> restriction) {
 
 	@Override
 	public SelectionSpecification<T> augment(Augmentation<T> augmentation) {
-		specifications.add( (sqmStatement, root) ->
-				augmentation.augment( sqmStatement.nodeBuilder(), sqmStatement, root ) );
+		specifications.add( (sqmStatement, root) -> {
+			if ( !( sqmStatement instanceof SqmSelectStatement<T> selectStatement ) ) {
+				throw new IllegalStateException( "Cannot augment a subquery" );
+			}
+			augmentation.augment( sqmStatement.nodeBuilder(), selectStatement, root );
+		} );
 		return this;
 	}
 
@@ -143,7 +148,7 @@ public final SelectionSpecification<T> resort(List<? extends Order<? super T>> o
 		return this;
 	}
 
-	private static <T> void addOrder(Order<? super T> order, SqmSelectStatement<T> sqmStatement) {
+	private static <T> void addOrder(Order<? super T> order, AbstractSqmSelectQuery<T> sqmStatement) {
 		final var sortSpecification = SqmUtil.sortSpecification( sqmStatement, order );
 		final var querySpec = sqmStatement.getQuerySpec();
 		if ( querySpec.getOrderByClause() == null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java
index a82b490e1e55..1d4c73611180 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java
@@ -11,6 +11,7 @@
 import jakarta.persistence.Parameter;
 import jakarta.persistence.TemporalType;
 import jakarta.persistence.metamodel.Type;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Internal;
@@ -38,7 +39,6 @@
 import org.hibernate.query.criteria.JpaExpression;
 import org.hibernate.query.internal.QueryOptionsImpl;
 import org.hibernate.query.sqm.NodeBuilder;
-import org.hibernate.query.sqm.SqmExpressible;
 import org.hibernate.query.sqm.tree.expression.SqmLiteral;
 import org.hibernate.query.sqm.tree.expression.SqmParameter;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -51,10 +51,12 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
+import static java.lang.Math.round;
+import static java.util.Collections.unmodifiableSet;
 import static java.util.Locale.ROOT;
 import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
 import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE;
@@ -88,6 +90,8 @@
 import static org.hibernate.jpa.internal.util.ConfigurationHelper.getCacheMode;
 import static org.hibernate.jpa.internal.util.ConfigurationHelper.getInteger;
 import static org.hibernate.query.QueryLogging.QUERY_MESSAGE_LOGGER;
+import static org.hibernate.query.internal.QueryArguments.areInstances;
+import static org.hibernate.query.internal.QueryArguments.isInstance;
 
 /**
  * Base implementation of {@link CommonQueryContract}.
@@ -141,14 +145,16 @@ protected int getIntegerLiteral(JpaExpression<Number> expression, int defaultVal
 		if ( expression == null ) {
 			return defaultValue;
 		}
-		else if ( expression instanceof SqmLiteral<?> ) {
-			return ( (SqmLiteral<Number>) expression ).getLiteralValue().intValue();
+		else if ( expression instanceof SqmLiteral<Number> numericLiteral ) {
+			return numericLiteral.getLiteralValue().intValue();
 		}
-		else if ( expression instanceof Parameter<?> ) {
-			final Number parameterValue = getParameterValue( (Parameter<Number>) expression );
-			return parameterValue == null ? defaultValue : parameterValue.intValue();
+		else if ( expression instanceof SqmParameter<Number> parameterExpression ) {
+			final Number number = getParameterValue( parameterExpression );
+			return number == null ? defaultValue : number.intValue();
+		}
+		else {
+			throw new IllegalArgumentException( "Not an integer literal: " + expression );
 		}
-		throw new IllegalArgumentException( "Can't get integer literal value from: " + expression );
 	}
 
 	protected int getMaxRows(SqmSelectStatement<?> selectStatement, int size) {
@@ -168,11 +174,11 @@ protected int getMaxRows(SqmSelectStatement<?> selectStatement, int size) {
 	}
 
 	private Number fetchValue(JpaExpression<Number> expression) {
-		if ( expression instanceof SqmLiteral<?> ) {
-			return ((SqmLiteral<Number>) expression).getLiteralValue();
+		if ( expression instanceof SqmLiteral<Number> numericLiteral ) {
+			return numericLiteral.getLiteralValue();
 		}
-		else if ( expression instanceof SqmParameter<?> ) {
-			return getParameterValue( (Parameter<Number>) expression );
+		else if ( expression instanceof SqmParameter<Number> numericParameter ) {
+			return getParameterValue( numericParameter );
 		}
 		else {
 			throw new IllegalArgumentException( "Can't get max rows value from: " + expression );
@@ -282,7 +288,7 @@ public final boolean applyHint(String hintName, Object value) {
 					//fall through:
 				case HINT_SPEC_QUERY_TIMEOUT:
 					// convert milliseconds to seconds
-					int timeout = (int) Math.round( getInteger( value ).doubleValue() / 1000.0 );
+					final int timeout = (int) round( getInteger( value ).doubleValue() / 1000.0 );
 					applyTimeoutHint( timeout );
 					return true;
 				case HINT_COMMENT:
@@ -324,6 +330,9 @@ protected final boolean applySelectionHint(String hintName, Object value) {
 					queryOptions.setQueryPlanCachingEnabled( getBoolean( value ) );
 					return true;
 				case HINT_CACHEABLE:
+					if ( isHistorical() ) {
+						throw new IllegalStateException( "Query result set caching disallowed for historical query" );
+					}
 					queryOptions.setResultCachingEnabled( getBoolean( value ) );
 					return true;
 				case HINT_CACHE_REGION:
@@ -367,6 +376,10 @@ protected final boolean applySelectionHint(String hintName, Object value) {
 		}
 	}
 
+	boolean isHistorical() {
+		return getSession().getLoadQueryInfluencers().getTemporalIdentifier() != null;
+	}
+
 	protected void applyEntityGraphHint(GraphSemantic graphSemantic, Object value, String hintName) {
 		if ( value instanceof RootGraphImplementor<?> rootGraphImplementor ) {
 			applyGraph( rootGraphImplementor, graphSemantic );
@@ -621,15 +634,13 @@ public int getFirstResult() {
 	@Override
 	public abstract ParameterMetadataImplementor getParameterMetadata();
 
-	@SuppressWarnings({"unchecked", "rawtypes"})
 	public Set<Parameter<?>> getParameters() {
 		checkOpenNoRollback();
-		return (Set) getParameterMetadata().getRegistrations();
+		return unmodifiableSet( getParameterMetadata().getRegistrations() );
 	}
 
 	public QueryParameterImplementor<?> getParameter(String name) {
 		checkOpenNoRollback();
-
 		try {
 			return getParameterMetadata().getQueryParameter( name );
 		}
@@ -638,21 +649,20 @@ public QueryParameterImplementor<?> getParameter(String name) {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
 	public <T> QueryParameterImplementor<T> getParameter(String name, Class<T> type) {
 		checkOpenNoRollback();
-
 		try {
-			//noinspection rawtypes
-			final QueryParameterImplementor parameter = getParameterMetadata().getQueryParameter( name );
-			if ( !type.isAssignableFrom( parameter.getParameterType() ) ) {
+			final var parameter = getParameterMetadata().getQueryParameter( name );
+			final var parameterType = parameter.getParameterType();
+			if ( !type.isAssignableFrom( parameterType ) ) {
 				throw new IllegalArgumentException(
-						"The type [" + parameter.getParameterType().getName() +
-								"] associated with the parameter corresponding to name [" + name +
-								"] is not assignable to requested Java type [" + type.getName() + "]"
+						"Type specified for parameter named '" + name + "' is incompatible"
+						+ " (" + parameterType.getName() + " is not assignable to " + type.getName() + ")"
 				);
 			}
-			return parameter;
+			@SuppressWarnings("unchecked") // safe, just checked
+			var castParameter = (QueryParameterImplementor<T>) parameter;
+			return castParameter;
 		}
 		catch ( HibernateException e ) {
 			throw getExceptionConverter().convert( e );
@@ -661,7 +671,6 @@ public <T> QueryParameterImplementor<T> getParameter(String name, Class<T> type)
 
 	public QueryParameterImplementor<?> getParameter(int position) {
 		checkOpenNoRollback();
-
 		try {
 			return getParameterMetadata().getQueryParameter( position );
 		}
@@ -670,20 +679,20 @@ public QueryParameterImplementor<?> getParameter(int position) {
 		}
 	}
 
-	@SuppressWarnings( {"unchecked", "rawtypes"} )
 	public <T> QueryParameterImplementor<T> getParameter(int position, Class<T> type) {
 		checkOpenNoRollback();
-
 		try {
-			final QueryParameterImplementor parameter = getParameterMetadata().getQueryParameter( position );
-			if ( !type.isAssignableFrom( parameter.getParameterType() ) ) {
+			final var parameter = getParameterMetadata().getQueryParameter( position );
+			final var parameterType = parameter.getParameterType();
+			if ( !type.isAssignableFrom( parameterType ) ) {
 				throw new IllegalArgumentException(
-						"The type [" + parameter.getParameterType().getName() +
-								"] associated with the parameter corresponding to position [" + position +
-								"] is not assignable to requested Java type [" + type.getName() + "]"
+						"Type specified for parameter at position " + position + " is incompatible"
+						+ " (" + parameterType.getName() + " is not assignable to " + type.getName() + ")"
 				);
 			}
-			return parameter;
+			@SuppressWarnings("unchecked") // safe, just checked
+			var castParameter = (QueryParameterImplementor<T>) parameter;
+			return castParameter;
 		}
 		catch ( HibernateException e ) {
 			throw getExceptionConverter().convert( e );
@@ -696,6 +705,7 @@ public <T> QueryParameterImplementor<T> getParameter(int position, Class<T> type
 
 	@Internal // Made public to work around this bug: https://bugs.openjdk.org/browse/JDK-8340443
 	public abstract QueryParameterBindings getQueryParameterBindings();
+
 	protected abstract boolean resolveJdbcParameterTypeIfNecessary();
 
 	private <P> JavaType<P> getJavaType(Class<P> javaType) {
@@ -703,33 +713,45 @@ private <P> JavaType<P> getJavaType(Class<P> javaType) {
 				.resolveDescriptor( javaType );
 	}
 
-	protected <P> QueryParameterBinding<P> locateBinding(Parameter<P> parameter) {
-		if ( parameter instanceof QueryParameterImplementor<P> parameterImplementor ) {
-			return locateBinding( parameterImplementor );
+	protected QueryParameterBinding<?> locateBinding(Parameter<?> parameter) {
+		if ( parameter instanceof QueryParameterImplementor<?> parameterImplementor ) {
+			getCheckOpen();
+			return getQueryParameterBindings().getBinding( getQueryParameter( parameterImplementor ) );
 		}
-		else if ( parameter.getName() != null ) {
-			return locateBinding( parameter.getName() );
-		}
-		else if ( parameter.getPosition() != null ) {
-			return locateBinding( parameter.getPosition() );
+		else {
+			return locateBinding( parameter.getName(), parameter.getPosition() );
 		}
-
-		throw getExceptionConverter().convert(
-				new IllegalArgumentException( "Could not resolve binding for given parameter reference [" + parameter + "]" )
-		);
 	}
 
-	protected <P> QueryParameterBinding<P> locateBinding(QueryParameterImplementor<P> parameter) {
-		getCheckOpen();
-		return getQueryParameterBindings().getBinding( getQueryParameter( parameter ) );
+	private @NonNull QueryParameterBinding<?> locateBinding(String name, Integer position) {
+		final var bindings = getQueryParameterBindings();
+		if ( name != null ) {
+			final var binding = bindings.getBinding( name );
+			if ( binding == null ) {
+				// should never occur
+				throw new IllegalArgumentException( "No binding for given parameter named '" + name + "'" );
+			}
+			return binding;
+		}
+		else if ( position != null ) {
+			final var binding = bindings.getBinding( position );
+			if ( binding == null ) {
+				// should never occur
+				throw new IllegalArgumentException( "No binding for given parameter at position " + position );
+			}
+			return binding;
+		}
+		else {
+			throw new IllegalArgumentException( "Parameter must have either a name or a position" );
+		}
 	}
 
-	protected <P> QueryParameterBinding<P> locateBinding(String name) {
+	protected QueryParameterBinding<?> locateBinding(String name) {
 		getCheckOpen();
 		return getQueryParameterBindings().getBinding( name );
 	}
 
-	protected <P> QueryParameterBinding<P> locateBinding(int position) {
+	protected QueryParameterBinding<?> locateBinding(int position) {
 		getCheckOpen();
 		return getQueryParameterBindings().getBinding( position );
 	}
@@ -741,23 +763,24 @@ protected <P> QueryParameterImplementor<P> getQueryParameter(QueryParameterImple
 	public boolean isBound(Parameter<?> param) {
 		getCheckOpen();
 		final var parameter = getParameterMetadata().resolve( param );
-		return parameter != null && getQueryParameterBindings().isBound( getQueryParameter( parameter ) );
+		return parameter != null
+			&& getQueryParameterBindings().isBound( getQueryParameter( parameter ) );
 	}
 
 	public <T> T getParameterValue(Parameter<T> param) {
 		checkOpenNoRollback();
-
 		final var parameter = getParameterMetadata().resolve( param );
 		if ( parameter == null ) {
 			throw new IllegalArgumentException( "The parameter [" + param + "] is not part of this Query" );
 		}
-
-		final var binding = getQueryParameterBindings().getBinding( getQueryParameter( parameter ) );
+		final var binding =
+				getQueryParameterBindings()
+						.getBinding( getQueryParameter( parameter ) );
 		if ( binding == null || !binding.isBound() ) {
-			throw new IllegalStateException( "Parameter value not yet bound : " + param.toString() );
+			throw new IllegalStateException( "Parameter value not yet bound : " + param );
 		}
-
 		if ( binding.isMultiValued() ) {
+			// TODO: THIS IS UNSOUND, we should really throw in this case
 			//noinspection unchecked
 			return (T) binding.getBindValues();
 		}
@@ -768,54 +791,50 @@ public <T> T getParameterValue(Parameter<T> param) {
 
 	public Object getParameterValue(String name) {
 		checkOpenNoRollback();
-
-		final QueryParameterBinding<?> binding = getQueryParameterBindings().getBinding( name );
+		final var binding = getQueryParameterBindings().getBinding( name );
 		if ( !binding.isBound() ) {
-			throw new IllegalStateException( "The parameter [" + name + "] has not yet been bound" );
-		}
-
-		if ( binding.isMultiValued() ) {
-			return binding.getBindValues();
-		}
-		else {
-			return binding.getBindValue();
+			throw new IllegalStateException( "The parameter named '" + name + "' has no argument" );
 		}
+		return binding.isMultiValued() ? binding.getBindValues() : binding.getBindValue();
 	}
 
 	public Object getParameterValue(int position) {
 		checkOpenNoRollback();
-
-		final QueryParameterBinding<?> binding = getQueryParameterBindings().getBinding( position );
+		final var binding = getQueryParameterBindings().getBinding( position );
 		if ( !binding.isBound() ) {
-			throw new IllegalStateException( "The parameter [" + position + "] has not yet been bound" );
+			throw new IllegalStateException( "The parameter at position" + position + " has no argument" );
 		}
-
 		return binding.isMultiValued() ? binding.getBindValues() : binding.getBindValue();
 	}
+
 	@Override
 	public CommonQueryContract setParameter(String name, Object value) {
 		checkOpenNoRollback();
-
 		if ( value instanceof TypedParameterValue<?> typedParameterValue ) {
 			setTypedParameter( name, typedParameterValue );
 		}
 		else {
-			final QueryParameterBinding<Object> binding = getQueryParameterBindings().getBinding( name );
-			if ( multipleBinding( binding.getQueryParameter(), value )
-				&& value instanceof Collection<?> collectionValue
-				&& !isRegisteredAsBasicType( value.getClass() ) ) {
-				return setParameterList( name, collectionValue );
+			final var binding = getQueryParameterBindings().getBinding( name );
+			if ( multipleBinding( binding.getQueryParameter(), value ) ) {
+				setParameterList( name, (Collection<?>) value );
+			}
+			else {
+				binding.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
 			}
-			binding.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
 		}
-
 		return this;
 	}
 
-	private boolean multipleBinding(QueryParameter<Object> parameter, Object value){
-		if ( parameter.allowsMultiValuedBinding() ) {
+	private boolean multipleBinding(QueryParameter<?> parameter, Object value){
+		if ( parameter.allowsMultiValuedBinding()
+				&& value instanceof Collection<?> values
+				// this check only needed for some native queries
+				&& !isRegisteredAsBasicType( value.getClass() ) ) {
 			final var hibernateType = parameter.getHibernateType();
-			return hibernateType == null || value == null || isInstance( hibernateType, value );
+			return hibernateType == null
+				|| values.isEmpty()
+				|| !isInstance( hibernateType, value, getNodeBuilder() )
+				|| isInstance( hibernateType, values.iterator().next(), getNodeBuilder() );
 		}
 		else {
 			return false;
@@ -830,13 +849,7 @@ private <T> void setTypedParameter(int position, TypedParameterValue<T> typedVal
 		setParameter( position, typedValue.value(), typedValue.type() );
 	}
 
-	private boolean isInstance(Type<?> parameterType, Object value) {
-		final SqmExpressible<?> sqmExpressible = getNodeuilder().resolveExpressible( parameterType );
-		assert sqmExpressible != null;
-		return sqmExpressible.getExpressibleJavaType().isInstance( value );
-	}
-
-	private NodeBuilder getNodeuilder() {
+	private NodeBuilder getNodeBuilder() {
 		return getSessionFactory().getQueryEngine().getCriteriaBuilder();
 	}
 
@@ -854,31 +867,30 @@ public <P> CommonQueryContract setParameter(String name, P value, Class<P> javaT
 
 	@Override
 	public <P> CommonQueryContract setParameter(String name, P value, Type<P> type) {
-		this.<P>locateBinding( name ).setBindValue( value, (BindableType<P>) type );
+		locateBinding( name ).setBindValue( value, (BindableType<P>) type );
 		return this;
 	}
 
 	@Override @Deprecated(since = "7")
 	public CommonQueryContract setParameter(String name, Instant value, TemporalType temporalType) {
-		this.locateBinding( name ).setBindValue( value, temporalType );
+		locateBinding( name ).setBindValue( value, temporalType );
 		return this;
 	}
 
 	@Override
 	public CommonQueryContract setParameter(int position, Object value) {
 		checkOpenNoRollback();
-
 		if ( value instanceof TypedParameterValue<?> typedParameterValue ) {
 			setTypedParameter( position, typedParameterValue );
 		}
 		else {
-			final QueryParameterBinding<Object> binding = getQueryParameterBindings().getBinding( position );
-			if ( multipleBinding( binding.getQueryParameter(), value )
-				&& value instanceof Collection<?> collectionValue
-				&& !isRegisteredAsBasicType( value.getClass() ) ) {
-				return setParameterList( position, collectionValue );
+			final var binding = getQueryParameterBindings().getBinding( position );
+			if ( multipleBinding( binding.getQueryParameter(), value ) ) {
+				setParameterList( position, (Collection<?>) value );
+			}
+			else {
+				binding.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
 			}
-			binding.setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
 		}
 		return this;
 	}
@@ -901,13 +913,13 @@ public <P> CommonQueryContract setParameter(int position, P value, Class<P> java
 
 	@Override
 	public <P> CommonQueryContract setParameter(int position, P value, Type<P> type) {
-		this.<P>locateBinding( position ).setBindValue( value, (BindableType<P>) type );
+		locateBinding( position ).setBindValue( value, (BindableType<P>) type );
 		return this;
 	}
 
 	@Override @Deprecated(since = "7")
 	public CommonQueryContract setParameter(int position, Instant value, TemporalType temporalType) {
-		this.locateBinding( position ).setBindValue( value, temporalType );
+		locateBinding( position ).setBindValue( value, temporalType );
 		return this;
 	}
 
@@ -950,7 +962,14 @@ public <P> CommonQueryContract setParameter(Parameter<P> parameter, P value) {
 			}
 			@SuppressWarnings("unchecked") // safe, because we just checked
 			final var typedValue = (TypedParameterValue<P>) value;
-			setParameter( parameter, typedValue.value(), typedValue.type() );
+			final var castValue = typedValue.value();
+			final var castType = typedValue.type();
+			if ( parameter instanceof QueryParameter<P> queryParameter ) {
+				setParameter( queryParameter, castValue, castType );
+			}
+			else {
+				locateBinding( parameter ).setBindValue( castValue, castType );
+			}
 		}
 		else {
 			locateBinding( parameter ).setBindValue( value, resolveJdbcParameterTypeIfNecessary() );
@@ -958,23 +977,6 @@ public <P> CommonQueryContract setParameter(Parameter<P> parameter, P value) {
 		return this;
 	}
 
-	private <P> void setParameter(Parameter<P> parameter, P value, Type<P> type) {
-		if ( parameter instanceof QueryParameter<P> queryParameter ) {
-			setParameter( queryParameter, value, type );
-		}
-		else if ( value == null ) {
-			locateBinding( parameter ).setBindValue( null, (BindableType<P>) type );
-		}
-		else if ( value instanceof Collection ) {
-			//TODO: this looks wrong to me: how can value be both a P and a (Collection<P>)?
-			locateBinding( parameter ).setBindValues( (Collection<P>) value );
-		}
-		else {
-			locateBinding( parameter ).setBindValue( value, (BindableType<P>) type );
-		}
-	}
-
-
 	@Override @Deprecated
 	public CommonQueryContract setParameter(Parameter<Calendar> param, Calendar value, TemporalType temporalType) {
 		locateBinding( param ).setBindValue( value, temporalType );
@@ -1013,12 +1015,12 @@ public CommonQueryContract setParameter(int position, Date value, TemporalType t
 
 	@Override
 	public CommonQueryContract setParameterList(String name, @SuppressWarnings("rawtypes") Collection values) {
-		locateBinding( name ).setBindValues( values );
+		getQueryParameterBindings().getBinding( name ).setBindValues( values );
 		return this;
 	}
 
 	public <P> CommonQueryContract setParameterList(String name, Collection<? extends P> values, Class<P> javaType) {
-		final JavaType<P> javaDescriptor = getJavaType( javaType );
+		final var javaDescriptor = getJavaType( javaType );
 		if ( javaDescriptor == null ) {
 			setParameterList( name, values );
 		}
@@ -1028,19 +1030,31 @@ public <P> CommonQueryContract setParameterList(String name, Collection<? extend
 		return this;
 	}
 
-
 	@Override
 	public <P> CommonQueryContract setParameterList(String name, Collection<? extends P> values, Type<P> type) {
-		this.<P>locateBinding( name ).setBindValues( values, (BindableType<P>) type );
+		locateBinding( name ).setBindValues( values, (BindableType<P>) type );
 		return this;
 	}
 
 	@Override
 	public CommonQueryContract setParameterList(String name, Object[] values) {
-		locateBinding( name ).setBindValues( asList( values ) );
+		final var binding = getQueryParameterBindings().getBinding( name );
+		setParameterValues( values, binding );
 		return this;
 	}
 
+	private <P> void setParameterValues(Object[] values, QueryParameterBinding<P> binding) {
+		final var parameterType = binding.getBindType();
+		if ( parameterType != null
+				&& !areInstances( parameterType, values, getNodeBuilder() ) ) {
+			throw new QueryArgumentException( "Argument to query parameter has an incompatible type",
+					parameterType.getJavaType(), values.getClass().getComponentType(), values );
+		}
+		@SuppressWarnings("unchecked") // safe, just checked
+		final var castArray = (P[]) values;
+		binding.setBindValues( List.of( castArray ) );
+	}
+
 	@Override
 	public <P> CommonQueryContract setParameterList(String name, P[] values, Class<P> javaType) {
 		final var javaDescriptor = getJavaType( javaType );
@@ -1054,13 +1068,14 @@ public <P> CommonQueryContract setParameterList(String name, P[] values, Class<P
 	}
 
 	public <P> CommonQueryContract setParameterList(String name, P[] values, Type<P> type) {
-		this.<P>locateBinding( name ).setBindValues( asList( values ), (BindableType<P>) type );
+		locateBinding( name ).setBindValues( List.of( values ), (BindableType<P>) type );
 		return this;
 	}
 
 	@Override
 	public CommonQueryContract setParameterList(int position, @SuppressWarnings("rawtypes") Collection values) {
-		locateBinding( position ).setBindValues( values );
+		//TODO: type checking?
+		getQueryParameterBindings().getBinding( position ).setBindValues( values );
 		return this;
 	}
 
@@ -1098,13 +1113,14 @@ private <P> Type<P> getParamType(Class<P> javaType) {
 
 	@Override
 	public <P> CommonQueryContract setParameterList(int position, Collection<? extends P> values, Type<P> type) {
-		this.<P>locateBinding( position ).setBindValues( values, (BindableType<P>) type );
+		locateBinding( position ).setBindValues( values, (BindableType<P>) type );
 		return this;
 	}
 
 	@Override
 	public CommonQueryContract setParameterList(int position, Object[] values) {
-		locateBinding( position ).setBindValues( asList( values ) );
+		final var binding = getQueryParameterBindings().getBinding( position );
+		setParameterValues( values, binding );
 		return this;
 	}
 
@@ -1117,13 +1133,11 @@ public <P> CommonQueryContract setParameterList(int position, P[] values, Class<
 		else {
 			setParameterList( position, values, getParamType( javaType ) );
 		}
-
 		return this;
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public <P> CommonQueryContract setParameterList(int position, P[] values, Type<P> type) {
-		locateBinding( position ).setBindValues( asList( values ), (BindableType) type );
+		locateBinding( position ).setBindValues( List.of( values ), (BindableType<P>) type );
 		return this;
 	}
 
@@ -1154,7 +1168,7 @@ public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, Col
 
 	@Override
 	public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, P[] values) {
-		locateBinding( parameter ).setBindValues( values == null ? null : asList( values ) );
+		locateBinding( parameter ).setBindValues( List.of( values ) );
 		return this;
 	}
 
@@ -1167,13 +1181,12 @@ public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, P[]
 		else {
 			setParameterList( parameter, values, getParamType( javaType ) );
 		}
-
 		return this;
 	}
 
 	@Override
 	public <P> CommonQueryContract setParameterList(QueryParameter<P> parameter, P[] values, Type<P> type) {
-		locateBinding( parameter ).setBindValues( asList( values ), (BindableType<P>) type );
+		locateBinding( parameter ).setBindValues( List.of( values ), (BindableType<P>) type );
 		return this;
 	}
 
@@ -1183,7 +1196,8 @@ public CommonQueryContract setProperties(@SuppressWarnings("rawtypes") Map map)
 			final Object object = map.get( paramName );
 			if ( object == null ) {
 				if ( map.containsKey( paramName ) ) {
-					setParameter( paramName, null, determineType( paramName, null ) );
+					setParameter( paramName, null,
+							determineType( paramName, null ) );
 				}
 			}
 			else {
@@ -1194,7 +1208,8 @@ else if ( object instanceof Object[] array ) {
 					setParameterList( paramName, array );
 				}
 				else {
-					setParameter( paramName, object, determineType( paramName, object.getClass() ) );
+					setParameter( paramName, object,
+							determineType( paramName, object.getClass() ) );
 				}
 			}
 		}
@@ -1202,14 +1217,15 @@ else if ( object instanceof Object[] array ) {
 	}
 
 	protected <T> Type<T> determineType(String namedParam, Class<? extends T> retType) {
-		BindableType<?> type = locateBinding( namedParam ).getBindType();
+		var type = getQueryParameterBindings().getBinding( namedParam ).getBindType();
 		if ( type == null ) {
 			type = getParameterMetadata().getQueryParameter( namedParam ).getHibernateType();
 		}
 		if ( type == null && retType != null ) {
 			type = getSessionFactory().getMappingMetamodel().resolveParameterBindType( retType );
 		}
-		if ( retType!= null && !retType.isAssignableFrom( type.getJavaType() ) ) {
+		if ( retType != null && !retType.isAssignableFrom( type.getJavaType() ) ) {
+			// TODO: is this really the correct exception type?
 			throw new IllegalStateException( "Parameter not of expected type: " + retType.getName() );
 		}
 		//noinspection unchecked
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
index b6d2f7cc540f..6c5a5f188018 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
@@ -147,7 +147,7 @@ protected void applyOptions(NamedQueryMemento<?> memento) {
 
 	@Override
 	public List<R> list() {
-		final HashSet<String> fetchProfiles = beforeQueryHandlingFetchProfiles();
+		final var fetchProfiles = beforeQueryHandlingFetchProfiles();
 		boolean success = false;
 		try {
 			final List<R> result = doList();
@@ -174,22 +174,32 @@ protected HashSet<String> beforeQueryHandlingFetchProfiles() {
 
 	protected void beforeQuery() {
 		getQueryParameterBindings().validate();
-
 		final var session = getSession();
 		final var options = getQueryOptions();
-
 		session.prepareForQueryExecution( requiresTxn( options.getLockOptions().getLockMode() ) );
 		prepareForExecution();
+		prepareSessionFlushMode( session );
+		prepareSessionCacheMode( session );
+	}
 
-		assert sessionFlushMode == null;
-		assert sessionCacheMode == null;
 
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	protected void prepareSessionFlushMode(SharedSessionContractImplementor session) {
+		assert sessionFlushMode == null;
 		final var effectiveFlushMode = getQueryOptions().getFlushMode();
 		if ( effectiveFlushMode != null && session instanceof SessionImplementor statefulSession ) {
 			sessionFlushMode = statefulSession.getHibernateFlushMode();
 			statefulSession.setHibernateFlushMode( effectiveFlushMode );
 		}
+	}
 
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	protected void prepareSessionCacheMode(SharedSessionContractImplementor session) {
+		assert sessionCacheMode == null;
 		final var effectiveCacheMode = getCacheMode();
 		if ( effectiveCacheMode != null ) {
 			sessionCacheMode = session.getCacheMode();
@@ -292,19 +302,11 @@ public R getSingleResult() {
 
 	protected static <T> T uniqueElement(List<T> list) throws NonUniqueResultException {
 		final int size = list.size();
-		if ( size == 0 ) {
-			return null;
-		}
-		else {
-			final T first = list.get( 0 );
-			// todo (6.0) : add a setting here to control whether to perform this validation or not
-			for ( int i = 1; i < size; i++ ) {
-				if ( list.get( i ) != first ) {
-					throw new NonUniqueResultException( list.size() );
-				}
-			}
-			return first;
-		}
+		return switch ( size ) {
+			case 0 -> null;
+			case 1 -> list.get( 0 );
+			default -> throw new NonUniqueResultException( size );
+		};
 	}
 
 	@Override
@@ -578,6 +580,9 @@ public boolean isCacheable() {
 
 	@Override
 	public SelectionQuery<R> setCacheable(boolean cacheable) {
+		if ( cacheable && isHistorical() ) {
+			throw new IllegalStateException( "Query result set caching disallowed for historical query" );
+		}
 		getQueryOptions().setResultCachingEnabled( cacheable );
 		return this;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/ProcedureParameterMetadataImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/ProcedureParameterMetadataImplementor.java
index 4382ae09c303..25c86cac9e96 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/ProcedureParameterMetadataImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/ProcedureParameterMetadataImplementor.java
@@ -6,9 +6,25 @@
 
 import java.util.List;
 
+import jakarta.persistence.Parameter;
+import org.hibernate.procedure.spi.ParameterStrategy;
 import org.hibernate.procedure.spi.ProcedureParameterImplementor;
 
 public interface ProcedureParameterMetadataImplementor extends ParameterMetadataImplementor {
 
+	ParameterStrategy getParameterStrategy();
+
+	@Override
+	ProcedureParameterImplementor<?> getQueryParameter(String name);
+
+	@Override
+	ProcedureParameterImplementor<?> getQueryParameter(int positionLabel);
+
+	@Override
+	<P> ProcedureParameterImplementor<P> resolve(Parameter<P> parameter);
+
+	void registerParameter(ProcedureParameterImplementor<?> parameter);
+
 	List<? extends ProcedureParameterImplementor<?>> getRegistrationsAsList();
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java
index 703d64f0324a..0b1b0a6a2c67 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBinding.java
@@ -10,21 +10,35 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Incubating;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
+import org.hibernate.query.QueryArgumentException;
 import org.hibernate.query.QueryParameter;
 import org.hibernate.type.BindableType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 /**
- * The value/type binding information for a particular query parameter.  Supports
- * both single-valued and multivalued binds
+ * The value and type binding information for a particular query parameter.
+ * Can represent both single-valued and multivalued bindings of arguments
+ * to a parameter.
+ * <p>
+ * The operations of this interface attempt to assign argument values to
+ * the parameter of type {@code T}. If the argument cannot be coerced to
+ * {@code T}, the operation fails and throws {@link QueryArgumentException}.
+ *
+ * @param <T> The type of the query parameter
  *
  * @author Steve Ebersole
  */
 @Incubating
 public interface QueryParameterBinding<T> {
 	/**
-	 * Is any value (including {@code null}) bound?  Asked another way,
-	 * were any of the `#set` methods called?
+	 * The query parameter associated with this binding.
+	 */
+	QueryParameter<T> getQueryParameter();
+
+	/**
+	 * Is any argument (even a {@code null} argument) currently
+	 * bound to the parameter? That is, was one of the
+	 * {@link #setBindValue} or {@link #setBindValues} methods
+	 * execute successfully?
 	 */
 	boolean isBound();
 
@@ -33,88 +47,129 @@ public interface QueryParameterBinding<T> {
 	 */
 	boolean isMultiValued();
 
-	QueryParameter<T> getQueryParameter();
-
 	/**
-	 * Get the Type currently associated with this binding.
+	 * Get the type currently associated with this binding.
+	 * By default, this is the type inferred from the parameter.
+	 * It may be modified via a call to {@link #setBindValue} or
+	 * {@link #setBindValues}.
 	 *
-	 * @return The currently associated Type
+	 * @return The currently associated {@link BindableType}
 	 */
-	@Nullable BindableType<? super T> getBindType();
+	@Nullable BindableType<T> getBindType();
 
 	/**
-	 * If the parameter represents a temporal type, return the explicitly
-	 * specified precision - if one.
+	 * If the parameter is of a temporal type, return the explicitly
+	 * specified precision, if any.
 	 */
-	@Nullable TemporalType getExplicitTemporalPrecision();
+	@Nullable @SuppressWarnings("deprecation") TemporalType getExplicitTemporalPrecision();
 
 	/**
-	 * Sets the parameter binding value.  The inherent parameter type (if known) is assumed
+	 * Set argument. If the given value is a {@link Collection},
+	 * it might be interpreted as multiple arguments. Use the
+	 * inherent type of the parameter.
+	 *
+	 * @throws QueryArgumentException
+	 *        if the value cannot be bound to the parameter
 	 */
-	default void setBindValue(T value) {
+	default void setBindValue(Object value) {
 		setBindValue( value, false );
 	}
 
 	/**
-	 * Sets the parameter binding value.  The inherent parameter type (if known) is assumed.
-	 * The flag controls whether the parameter type should be resolved if necessary.
+	 * Set argument. If the given value is a {@link Collection},
+	 * it might be interpreted as multiple arguments. Use the
+	 * inherent type of the parameter.
+	 *
+	 * @param resolveJdbcTypeIfNecessary
+	 *        Controls whether the parameter type should be
+	 *        resolved if necessary.
+	 * @throws QueryArgumentException
+	 *        if the value cannot be bound to the parameter
 	 */
-	void setBindValue(T value, boolean resolveJdbcTypeIfNecessary);
+	void setBindValue(Object value, boolean resolveJdbcTypeIfNecessary);
 
 	/**
-	 * Sets the parameter binding value using the explicit Type.
-	 * @param value The bind value
-	 * @param clarifiedType The explicit Type to use
+	 * Set the argument, specifying an explicit {@link BindableType}.
+	 *
+	 * @param value The argument
+	 * @param clarifiedType The explicit type
 	 */
-	void setBindValue(T value, @Nullable BindableType<T> clarifiedType);
+	<A> void setBindValue(A value, @Nullable BindableType<A> clarifiedType);
 
 	/**
-	 * Sets the parameter binding value using the explicit TemporalType.
-	 * @param value The bind value
-	 * @param temporalTypePrecision The temporal type to use
+	 * Set the argument, specifying an explicit {@link TemporalType}.
+	 * If the given value is a {@link Collection}, it might be interpreted
+	 * as multiple arguments.
+	 *
+	 * @param value The argument
+	 * @param temporalTypePrecision The explicit temporal type
+	 * @throws QueryArgumentException
+	 *        if the value cannot be bound to the parameter
 	 */
-	void setBindValue(T value, TemporalType temporalTypePrecision);
+	void setBindValue(Object value, @SuppressWarnings("deprecation") TemporalType temporalTypePrecision);
 
 	/**
-	 * Get the value current bound.
+	 * Get the argument currently bound to the parameter.
 	 *
-	 * @return The currently bound value
+	 * @return The argument currently bound
+	 * @throws IllegalStateException
+	 *         if the parameter is multivalued
 	 */
 	T getBindValue();
 
 	/**
-	 * Sets the parameter binding values.  The inherent parameter type (if known) is assumed in regards to the
-	 * individual values.
-	 *  @param values The bind values
+	 * Attempt to set multiple arguments to the parameter. Use the
+	 * inherent type of the parameter.
 	 *
+	 * @param values The arguments
+	 * @throws IllegalArgumentException if the parameter is not multivalued
+	 * @throws QueryArgumentException
+	 *        if one of the values cannot be bound to the parameter
 	 */
-	void setBindValues(Collection<? extends T> values);
+	void setBindValues(Collection<?> values);
 
 	/**
-	 * Sets the parameter binding values using the explicit Type in regards to the individual values.
-	 * @param values The bind values
-	 * @param clarifiedType The explicit Type to use
+	 * Attempt to set multiple arguments to the parameter, specifying
+	 * an explicit {@link BindableType}.
+	 *
+	 * @param values The arguments
+	 * @param clarifiedType The explicit type
+	 * @throws IllegalArgumentException
+	 *         if the parameter is not multivalued
+	 * @throws QueryArgumentException
+	 *        if one of the values cannot be bound to the parameter
 	 */
-	void setBindValues(Collection<? extends T> values, BindableType<T> clarifiedType);
+	<A> void setBindValues(Collection<? extends A> values, BindableType<A> clarifiedType);
 
-	/**Sets the parameter binding value using the explicit TemporalType in regards to the individual values.
+	/**
+	 * Attempt to set multiple arguments to the parameter, specifying
+	 * an explicit {@link TemporalType}.
 	 *
-	 *  @param values The bind values
-	 * @param temporalTypePrecision The temporal type to use
+	 * @param values The arguments
+	 * @param temporalTypePrecision The explicit temporal type
+	 * @throws IllegalArgumentException
+	 *        if the parameter is not multivalued
+	 * @throws QueryArgumentException
+	 *        if one of the values cannot be bound to the parameter
 	 */
-	void setBindValues(Collection<? extends T> values, TemporalType temporalTypePrecision, TypeConfiguration typeConfiguration);
+	void setBindValues(
+			Collection<?> values,
+			@SuppressWarnings("deprecation")
+			TemporalType temporalTypePrecision);
 
 	/**
-	 * Get the values currently bound.
+	 * Get the arguments currently bound to the parameter.
 	 *
-	 * @return The currently bound values
+	 * @return The arguments currently bound
+	 * @throws IllegalArgumentException if the parameter is not multivalued
 	 */
 	Collection<? extends T> getBindValues();
 
 	/**
-	 * Returns the inferred mapping model expressible i.e. the model reference against which this parameter is compared.
+	 * Returns the inferred mapping model expressible, i.e.,
+	 * the model reference against which this parameter is compared.
 	 *
-	 * @return the inferred mapping model expressible or <code>null</code>
+	 * @return the inferred mapping model expressible or {@code null}
 	 */
 	@Nullable MappingModelExpressible<T> getType();
 
@@ -122,7 +177,7 @@ default void setBindValue(T value) {
 	 * Sets the mapping model expressible for this parameter.
 	 *
 	 * @param type The mapping model expressible
-	 * @return Whether the bind type was changed
+	 * @return Whether the binding type was actually changed
 	 */
 	boolean setType(@Nullable MappingModelExpressible<T> type);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java
deleted file mode 100644
index 83d1d482e522..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.query.spi;
-
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-
-import org.hibernate.query.QueryArgumentException;
-import org.hibernate.query.sqm.SqmBindableType;
-import org.hibernate.type.BindableType;
-import org.hibernate.type.BindingContext;
-import org.hibernate.type.descriptor.java.JavaType;
-
-import jakarta.persistence.TemporalType;
-
-/**
- * @author Andrea Boriero
- */
-public class QueryParameterBindingValidator {
-
-	public static final QueryParameterBindingValidator INSTANCE = new QueryParameterBindingValidator();
-
-	private QueryParameterBindingValidator() {
-	}
-
-	public void validate(BindableType<?> paramType, Object bind, BindingContext bindingContext) {
-		validate( paramType, bind, null, bindingContext );
-	}
-
-	public void validate(
-			BindableType<?> paramType,
-			Object bind,
-			TemporalType temporalPrecision,
-			BindingContext bindingContext) {
-		if ( bind == null || paramType == null ) {
-			// nothing we can check
-			return;
-		}
-
-		final SqmBindableType<?> sqmExpressible = bindingContext.resolveExpressible( paramType );
-		final Class<?> parameterJavaType =
-				paramType.getJavaType() != null
-						? paramType.getJavaType()
-						: sqmExpressible.getJavaType();
-
-		if ( parameterJavaType != null ) {
-			if ( bind instanceof Collection<?> collection
-					&& !Collection.class.isAssignableFrom( parameterJavaType ) ) {
-				// we have a collection passed in where we are expecting a non-collection.
-				// 		NOTE : this can happen in Hibernate's notion of "parameter list" binding
-				// 		NOTE2 : the case of a collection value and an expected collection (if that can even happen)
-				//			will fall through to the main check.
-				validateCollectionValuedParameterBinding(
-						parameterJavaType,
-						collection,
-						temporalPrecision
-				);
-			}
-			else if ( bind.getClass().isArray() ) {
-				validateArrayValuedParameterBinding(
-						parameterJavaType,
-						bind,
-						temporalPrecision
-				);
-			}
-			else if ( !isValidBindValue(
-					sqmExpressible.getExpressibleJavaType(),
-					parameterJavaType,
-					bind,
-					temporalPrecision
-			) ) {
-				throw new QueryArgumentException(
-						String.format(
-								"Argument [%s] of type [%s] did not match parameter type [%s (%s)]",
-								bind,
-								bind.getClass().getName(),
-								parameterJavaType.getName(),
-								extractName( temporalPrecision )
-						),
-						parameterJavaType,
-						bind
-				);
-			}
-		}
-		// else nothing we can check
-	}
-
-	private String extractName(TemporalType temporalType) {
-		return temporalType == null ? "n/a" : temporalType.name();
-	}
-
-	private void validateCollectionValuedParameterBinding(
-			Class<?> parameterType,
-			Collection<?> value,
-			TemporalType temporalType) {
-		// validate the elements...
-		for ( Object element : value ) {
-			if ( !isValidBindValue( parameterType, element, temporalType ) ) {
-				throw new QueryArgumentException(
-						String.format(
-								"Parameter value element [%s] did not match expected type [%s (%s)]",
-								element,
-								parameterType.getName(),
-								extractName( temporalType )
-						)
-						,
-						parameterType,
-						element
-				);
-			}
-		}
-	}
-
-	private static boolean isValidBindValue(
-			JavaType<?> expectedJavaType,
-			Class<?> expectedType,
-			Object value,
-			TemporalType temporalType) {
-		if ( value == null ) {
-			return true;
-		}
-		else if ( expectedJavaType.isInstance( value ) ) {
-			return true;
-		}
-		else if ( temporalType != null ) {
-			final boolean parameterDeclarationIsTemporal = Date.class.isAssignableFrom( expectedType )
-					|| Calendar.class.isAssignableFrom( expectedType );
-			final boolean bindIsTemporal = value instanceof Date
-					|| value instanceof Calendar;
-
-			return parameterDeclarationIsTemporal && bindIsTemporal;
-		}
-
-		return false;
-	}
-
-	private static boolean isValidBindValue(
-			Class<?> expectedType,
-			Object value,
-			TemporalType temporalType) {
-		if ( expectedType.isPrimitive() ) {
-			if ( expectedType == boolean.class ) {
-				return value instanceof Boolean;
-			}
-			else if ( expectedType == char.class ) {
-				return value instanceof Character;
-			}
-			else if ( expectedType == byte.class ) {
-				return value instanceof Byte;
-			}
-			else if ( expectedType == short.class ) {
-				return value instanceof Short;
-			}
-			else if ( expectedType == int.class ) {
-				return value instanceof Integer;
-			}
-			else if ( expectedType == long.class ) {
-				return value instanceof Long;
-			}
-			else if ( expectedType == float.class ) {
-				return value instanceof Float;
-			}
-			else if ( expectedType == double.class ) {
-				return value instanceof Double;
-			}
-			return false;
-		}
-		else if ( value == null) {
-			return true;
-		}
-		else if ( expectedType.isInstance( value ) ) {
-			return true;
-		}
-		else if ( temporalType != null ) {
-			final boolean parameterDeclarationIsTemporal = Date.class.isAssignableFrom( expectedType )
-					|| Calendar.class.isAssignableFrom( expectedType );
-			final boolean bindIsTemporal = value instanceof Date
-					|| value instanceof Calendar;
-
-			return parameterDeclarationIsTemporal && bindIsTemporal;
-		}
-
-		return false;
-	}
-
-	private void validateArrayValuedParameterBinding(
-			Class<?> parameterType,
-			Object value,
-			TemporalType temporalType) {
-		if ( !parameterType.isArray() ) {
-			throw new QueryArgumentException(
-					String.format(
-							"Encountered array-valued parameter binding, but was expecting [%s (%s)]",
-							parameterType.getName(),
-							extractName( temporalType )
-					),
-					parameterType,
-					value
-			);
-		}
-
-		if ( value.getClass().getComponentType().isPrimitive() ) {
-			// we have a primitive array.  we validate that the actual array has the component type (type of elements)
-			// we expect based on the component type of the parameter specification
-			if ( !parameterType.getComponentType().isAssignableFrom( value.getClass().getComponentType() ) ) {
-				throw new QueryArgumentException(
-						String.format(
-								"Primitive array-valued parameter bind value type [%s] did not match expected type [%s (%s)]",
-								value.getClass().getComponentType().getName(),
-								parameterType.getName(),
-								extractName( temporalType )
-						),
-						parameterType,
-						value
-				);
-			}
-		}
-		else {
-			// we have an object array.  Here we loop over the array and physically check each element against
-			// the type we expect based on the component type of the parameter specification
-			final Object[] array = (Object[]) value;
-			for ( Object element : array ) {
-				if ( !isValidBindValue( parameterType.getComponentType(), element, temporalType ) ) {
-					throw new QueryArgumentException(
-							String.format(
-									"Array-valued parameter value element [%s] did not match expected type [%s (%s)]",
-									element,
-									parameterType.getName(),
-									extractName( temporalType )
-							),
-							parameterType,
-							array
-					);
-				}
-			}
-		}
-	}
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java
index 782eecfc15ff..be32890f6251 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindings.java
@@ -58,7 +58,7 @@ default <P> QueryParameterBinding<P> getBinding(QueryParameter<P> parameter) {
 	 *
 	 * @return The binding, or {@code null} if not yet bound
 	 */
-	<P> QueryParameterBinding<P> getBinding(String name);
+	QueryParameterBinding<?> getBinding(String name);
 
 	/**
 	 * Access to the binding via position
@@ -67,7 +67,7 @@ default <P> QueryParameterBinding<P> getBinding(QueryParameter<P> parameter) {
 	 *
 	 * @return The binding, or {@code null} if not yet bound
 	 */
-	<P> QueryParameterBinding<P> getBinding(int position);
+	QueryParameterBinding<?> getBinding(int position);
 
 	/**
 	 * Validate the bindings.  Called just before execution
@@ -94,15 +94,14 @@ default <P> QueryParameterBinding<P> getBinding(QueryParameter<P> parameter) {
 	 *             Currently unused and can be safely removed.
 	 */
 	@Deprecated(forRemoval = true, since = "6.6")
-	@SuppressWarnings({"rawtypes", "unchecked"})
 	QueryParameterBindings NO_PARAM_BINDINGS = new QueryParameterBindings() {
 		@Override
-		public boolean isBound(QueryParameterImplementor parameter) {
+		public boolean isBound(QueryParameterImplementor<?> parameter) {
 			return false;
 		}
 
 		@Override
-		public QueryParameterBinding<?> getBinding(QueryParameterImplementor parameter) {
+		public <P> QueryParameterBinding<P> getBinding(QueryParameterImplementor<P> parameter) {
 			return null;
 		}
 
@@ -117,7 +116,7 @@ public QueryParameterBinding<?> getBinding(int position) {
 		}
 
 		@Override
-		public void visitBindings(BiConsumer action) {
+		public void visitBindings(BiConsumer<? super QueryParameter<?>, ? super QueryParameterBinding<?>> action) {
 		}
 
 		@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java
index 14aed357672e..93f2493b6ed4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java
@@ -16,7 +16,7 @@
  *
  * @author Christian Beikov
  */
-@Internal
+@Internal // used by Hibernate Reactive
 public class SqlOmittingQueryOptions extends DelegatingQueryOptions {
 
 	private final boolean omitLimit;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
index b960851b3c3a..6fae0b5323e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
@@ -127,7 +127,7 @@
 import static org.hibernate.internal.util.collections.CollectionHelper.makeCopy;
 import static org.hibernate.internal.util.collections.CollectionHelper.toSmallList;
 import static org.hibernate.internal.util.collections.CollectionHelper.toSmallMap;
-import static org.hibernate.internal.util.type.PrimitiveWrapperHelper.getDescriptorByPrimitiveType;
+import static org.hibernate.internal.util.type.PrimitiveWrappers.canonicalize;
 import static org.hibernate.jpa.HibernateHints.HINT_NATIVE_LOCK_MODE;
 import static org.hibernate.query.results.internal.Builders.resultClassBuilder;
 import static org.hibernate.query.results.ResultSetMapping.resolveResultSetMapping;
@@ -384,11 +384,7 @@ private boolean validConstructorFoundForResultType(Class<R> resultType, ResultSe
 	}
 
 	private static boolean constructorParameterMatches(ResultBuilder resultBuilder, Class<?> paramType) {
-		final var parameterClass =
-				paramType.isPrimitive()
-						? getDescriptorByPrimitiveType( paramType ).getWrapperClass()
-						: paramType;
-		return resultBuilder.getJavaType() == parameterClass;
+		return resultBuilder.getJavaType() == canonicalize( paramType );
 	}
 
 	protected <T> void setTupleTransformerForResultType(Class<T> resultClass) {
@@ -554,6 +550,14 @@ public boolean hasCallbackActions() {
 		return callback != null && callback.hasAfterLoadActions();
 	}
 
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	@Override
+	protected void resetCallback() {
+		callback = null;
+	}
+
 	@Override
 	public QueryParameterBindings getQueryParameterBindings() {
 		return parameterBindings;
@@ -722,14 +726,17 @@ protected void prepareForExecution() {
 				getSession().flush();
 			}
 			// Reset the callback before every execution
-			callback = null;
+			resetCallback();
 		}
 		// Otherwise, the application specified query spaces via the Hibernate
 		// SynchronizeableQuery and so the query will already perform a partial
 		// flush according to the defined query spaces - no need for a full flush.
 	}
 
-	private boolean shouldFlush() {
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	protected boolean shouldFlush() {
 		if ( getSession().isTransactionInProgress() ) {
 			final var flushMode = getQueryOptions().getFlushMode();
 			return switch ( flushMode == null ? getSession().getHibernateFlushMode() : flushMode ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java
index 0ed5efced51c..0780ce1cd8d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java
@@ -16,6 +16,7 @@
 import org.hibernate.LockMode;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.loader.internal.AliasConstantsHelper;
+import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
@@ -260,16 +261,19 @@ private List<String> columnNames(
 
 	private NavigablePath determineNavigablePath(LegacyFetchBuilder fetchBuilder) {
 		final var ownerResult = alias2Return.get( fetchBuilder.getOwnerAlias() );
-		final NavigablePath path;
+		final NavigablePath basePath;
 		if ( ownerResult instanceof NativeQuery.RootReturn rootReturn ) {
-			path = rootReturn.getNavigablePath();
+			basePath = rootReturn.getNavigablePath();
 		}
 		else if ( ownerResult instanceof DynamicFetchBuilderLegacy dynamicFetchBuilderLegacy ) {
-			path = determineNavigablePath( dynamicFetchBuilderLegacy );
+			basePath = determineNavigablePath( dynamicFetchBuilderLegacy );
 		}
 		else {
 			throw new AssertionFailure( "Unexpected fetch builder" );
 		}
+		final NavigablePath path = alias2CollectionPersister.containsKey( fetchBuilder.getOwnerAlias() )
+				? basePath.append( CollectionPart.Nature.ELEMENT.getName() )
+				: basePath;
 		return path.append( fetchBuilder.getFetchable().getFetchableName() );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
index bcf7134ccb6d..b0b634b50776 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/NodeBuilder.java
@@ -84,6 +84,7 @@
  * Adapts the JPA CriteriaBuilder to generate SQM nodes.
  *
  * @author Steve Ebersole
+ * @author Yoobin Yoon
  */
 public interface NodeBuilder extends HibernateCriteriaBuilder, SqmCreationContext {
 	default JpaMetamodel getDomainModel() {
@@ -246,6 +247,24 @@ <T> SqmExpression<T[]> arrayAgg(
 	@Override
 	<T> SqmExpression<T[]> arrayTrim(Expression<T[]> arrayExpression, Integer elementCount);
 
+	@Override
+	<T> SqmExpression<T[]> arrayReverse(Expression<T[]> arrayExpression);
+
+	@Override
+	<T> SqmExpression<T[]> arraySort(Expression<T[]> arrayExpression);
+
+	@Override
+	<T> SqmExpression<T[]> arraySort(Expression<T[]> arrayExpression, boolean descending);
+
+	@Override
+	<T> SqmExpression<T[]> arraySort(Expression<T[]> arrayExpression, Expression<Boolean> descendingExpression);
+
+	@Override
+	<T> SqmExpression<T[]> arraySort(Expression<T[]> arrayExpression, boolean descending, boolean nullsFirst);
+
+	@Override
+	<T> SqmExpression<T[]> arraySort(Expression<T[]> arrayExpression, Expression<Boolean> descendingExpression, Expression<Boolean> nullsFirstExpression);
+
 	@Override
 	<T> SqmExpression<T[]> arrayFill(Expression<T> elementExpression, Expression<Integer> elementCountExpression);
 
@@ -498,6 +517,32 @@ default <T> SqmPredicate arrayOverlapsNullable(T[] array1, Expression<T[]> array
 	@Override
 	<C extends Collection<?>> SqmExpression<C> collectionTrim(Expression<C> arrayExpression, Integer elementCount);
 
+	@Override
+	<C extends Collection<?>> SqmExpression<C> collectionReverse(Expression<C> collectionExpression);
+
+	@Override
+	<C extends Collection<?>> SqmExpression<C> collectionSort(Expression<C> collectionExpression);
+
+	@Override
+	<C extends Collection<?>> SqmExpression<C> collectionSort(Expression<C> collectionExpression, boolean descending);
+
+	@Override
+	<C extends Collection<?>> SqmExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			Expression<Boolean> descendingExpression);
+
+	@Override
+	<C extends Collection<?>> SqmExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			boolean descending,
+			boolean nullsFirst);
+
+	@Override
+	<C extends Collection<?>> SqmExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			Expression<Boolean> descendingExpression,
+			Expression<Boolean> nullsFirstExpression);
+
 	@Override
 	<T> SqmExpression<Collection<T>> collectionFill(Expression<T> elementExpression, Expression<Integer> elementCountExpression);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java
index b6634190173f..8416108acfa8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java
@@ -88,7 +88,7 @@ default SqmPathSource<?> getSubPathSource(String name) {
 	 * @throws IllegalArgumentException if the subPathSource is not found
 	 */
 	default SqmPathSource<?> getSubPathSource(String name, boolean subtypes) {
-		final SqmPathSource<?> subPathSource = findSubPathSource( name, subtypes );
+		final var subPathSource = findSubPathSource( name, subtypes );
 		if ( subPathSource == null ) {
 			throw new PathElementException(
 					String.format(
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownPathException.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownPathException.java
index adbb2223ccb2..d8959492b093 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownPathException.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/UnknownPathException.java
@@ -4,10 +4,7 @@
  */
 package org.hibernate.query.sqm;
 
-import java.util.Locale;
-
 import org.hibernate.query.PathException;
-import org.hibernate.query.sqm.tree.domain.SqmPath;
 
 /**
  * Indicates a failure to resolve an element of a path expression in HQL/JPQL.
@@ -34,16 +31,4 @@ public UnknownPathException(String message, String hql, Exception cause) {
 		super( message, hql, cause );
 	}
 
-
-	public static UnknownPathException unknownSubPath(SqmPath base, String name) {
-		return new UnknownPathException(
-				String.format(
-						Locale.ROOT,
-						"Could not resolve path element '%s' relative to '%s' (%s)",
-						name,
-						base.getReferencedPathSource().getPathType().getTypeName(),
-						base.getNavigablePath()
-				)
-		);
-	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java
index 0465d242a535..87426e00faa3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java
@@ -47,7 +47,7 @@ public SelfRenderingSqmAggregateFunction(
 
 	@Override
 	public SelfRenderingSqmAggregateFunction<T> copy(SqmCopyContext context) {
-		final SelfRenderingSqmAggregateFunction<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java
index ea201483a9c3..16a0720ded37 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java
@@ -59,7 +59,7 @@ public SelfRenderingSqmFunction(
 
 	@Override
 	public SelfRenderingSqmFunction<T> copy(SqmCopyContext context) {
-		final SelfRenderingSqmFunction<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java
index 0853d952cc82..f566f16cbd9d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java
@@ -63,7 +63,7 @@ public SelfRenderingSqmOrderedSetAggregateFunction(
 
 	@Override
 	public SelfRenderingSqmOrderedSetAggregateFunction<T> copy(SqmCopyContext context) {
-		final SelfRenderingSqmOrderedSetAggregateFunction<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java
index 07050852dc99..c1fcae0e7fe3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java
@@ -63,7 +63,7 @@ public SelfRenderingSqmSetReturningFunction(
 
 	@Override
 	public SelfRenderingSqmSetReturningFunction<T> copy(SqmCopyContext context) {
-		final SelfRenderingSqmSetReturningFunction<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java
index 242fa87c2e7d..3bddb3a703ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java
@@ -53,7 +53,7 @@ public SelfRenderingSqmWindowFunction(
 
 	@Override
 	public SelfRenderingSqmWindowFunction<T> copy(SqmCopyContext context) {
-		final SelfRenderingSqmWindowFunction<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionRegistry.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionRegistry.java
index f0bcc22354d6..55d0c7ad2c46 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionRegistry.java
@@ -34,15 +34,14 @@
  *
  * @author Steve Ebersole
  */
+@SuppressWarnings("UnusedReturnValue")
 public class SqmFunctionRegistry {
-//	private static final Logger LOG = Logger.getLogger( SqmFunctionRegistry.class );
 
 	private final CaseInsensitiveDictionary<SqmFunctionDescriptor> functionMap = new CaseInsensitiveDictionary<>();
 	private final CaseInsensitiveDictionary<SqmSetReturningFunctionDescriptor> setReturningFunctionMap = new CaseInsensitiveDictionary<>();
 	private final CaseInsensitiveDictionary<String> alternateKeyMap = new CaseInsensitiveDictionary<>();
 
 	public SqmFunctionRegistry() {
-//		LOG.trace( "SqmFunctionRegistry created" );
 	}
 
 	public Set<String> getValidFunctionKeys() {
@@ -82,18 +81,14 @@ public Stream<Map.Entry<String, SqmSetReturningFunctionDescriptor>> getSetReturn
 	 * Returns {@code null} if no such function is found.
 	 */
 	public @Nullable SqmFunctionDescriptor findFunctionDescriptor(String functionName) {
-		SqmFunctionDescriptor found = null;
-
 		final String alternateKeyResolution = alternateKeyMap.get( functionName );
 		if ( alternateKeyResolution != null ) {
-			found = functionMap.get( alternateKeyResolution );
-		}
-
-		if ( found == null ) {
-			found = functionMap.get( functionName );
+			final var function = functionMap.get( alternateKeyResolution );
+			if ( function != null ) {
+				return function;
+			}
 		}
-
-		return found;
+		return functionMap.get( functionName );
 	}
 
 	/**
@@ -102,7 +97,7 @@ public Stream<Map.Entry<String, SqmSetReturningFunctionDescriptor>> getSetReturn
 	 * @throws NoSuchElementException if no such function is found
 	 */
 	public SqmFunctionDescriptor getFunctionDescriptor(String functionName) {
-		final SqmFunctionDescriptor functionDescriptor = findFunctionDescriptor( functionName );
+		final var functionDescriptor = findFunctionDescriptor( functionName );
 		if ( functionDescriptor == null ) {
 			throw new NoSuchElementException( functionName );
 		}
@@ -114,18 +109,14 @@ public SqmFunctionDescriptor getFunctionDescriptor(String functionName) {
 	 * Returns {@code null} if no such function is found.
 	 */
 	public @Nullable SqmSetReturningFunctionDescriptor findSetReturningFunctionDescriptor(String functionName) {
-		SqmSetReturningFunctionDescriptor found = null;
-
 		final String alternateKeyResolution = alternateKeyMap.get( functionName );
 		if ( alternateKeyResolution != null ) {
-			found = setReturningFunctionMap.get( alternateKeyResolution );
-		}
-
-		if ( found == null ) {
-			found = setReturningFunctionMap.get( functionName );
+			final var function = setReturningFunctionMap.get( alternateKeyResolution );
+			if ( function != null ) {
+				return function;
+			}
 		}
-
-		return found;
+		return setReturningFunctionMap.get( functionName );
 	}
 
 	/**
@@ -134,7 +125,7 @@ public SqmFunctionDescriptor getFunctionDescriptor(String functionName) {
 	 * @throws NoSuchElementException if no such function is found
 	 */
 	public SqmSetReturningFunctionDescriptor getSetReturningFunctionDescriptor(String functionName) {
-		final SqmSetReturningFunctionDescriptor functionDescriptor = findSetReturningFunctionDescriptor( functionName );
+		final var functionDescriptor = findSetReturningFunctionDescriptor( functionName );
 		if ( functionDescriptor == null ) {
 			throw new NoSuchElementException( functionName );
 		}
@@ -145,14 +136,7 @@ public SqmSetReturningFunctionDescriptor getSetReturningFunctionDescriptor(Strin
 	 * Register a function descriptor by name
 	 */
 	public SqmFunctionDescriptor register(String registrationKey, SqmFunctionDescriptor function) {
-		final SqmFunctionDescriptor priorRegistration = functionMap.put( registrationKey, function );
-		// Incredibly verbose logging disabled
-//		LOG.tracef(
-//				"Registered SqmFunctionTemplate [%s] under %s; prior registration was %s",
-//				function,
-//				registrationKey,
-//				priorRegistration
-//		);
+		functionMap.put( registrationKey, function );
 		alternateKeyMap.remove( registrationKey );
 		return function;
 	}
@@ -161,13 +145,7 @@ public SqmFunctionDescriptor register(String registrationKey, SqmFunctionDescrip
 	 * Register a set-returning function descriptor by name
 	 */
 	public SqmSetReturningFunctionDescriptor register(String registrationKey, SqmSetReturningFunctionDescriptor function) {
-		final SqmSetReturningFunctionDescriptor priorRegistration = setReturningFunctionMap.put( registrationKey, function );
-//		LOG.tracef(
-//				"Registered SqmSetReturningFunctionTemplate [%s] under %s; prior registration was %s",
-//				function,
-//				registrationKey,
-//				priorRegistration
-//		);
+		setReturningFunctionMap.put( registrationKey, function );
 		alternateKeyMap.remove( registrationKey );
 		return function;
 	}
@@ -184,7 +162,7 @@ public SqmFunctionDescriptor registerPattern(String name, String pattern) {
 	 * Register a pattern-based descriptor by name and invariant return type.  Shortcut for building the descriptor
 	 * via {@link #patternDescriptorBuilder} accepting its defaults.
 	 */
-	public SqmFunctionDescriptor registerPattern(String name, String pattern, BasicType returnType) {
+	public SqmFunctionDescriptor registerPattern(String name, String pattern, BasicType<?> returnType) {
 		return patternDescriptorBuilder( name, pattern )
 				.setInvariantType( returnType )
 				.register();
@@ -232,7 +210,7 @@ public SqmFunctionDescriptor registerNamed(String name) {
 	 *
 	 * @param name The function name (and registration key)
 	 */
-	public SqmFunctionDescriptor registerNamed(String name, BasicType returnType) {
+	public SqmFunctionDescriptor registerNamed(String name, BasicType<?> returnType) {
 		return namedDescriptorBuilder( name, name ).setInvariantType( returnType ).register();
 	}
 
@@ -393,26 +371,24 @@ public SqmFunctionDescriptor registerNoArgs(String registrationKey, String name)
 		return noArgsBuilder( registrationKey, name ).register();
 	}
 
-	public SqmFunctionDescriptor registerNoArgs(String name, BasicType returnType) {
+	public SqmFunctionDescriptor registerNoArgs(String name, BasicType<?> returnType) {
 		return registerNoArgs( name, name, returnType );
 	}
 
-	public SqmFunctionDescriptor registerNoArgs(String registrationKey, String name, BasicType returnType) {
+	public SqmFunctionDescriptor registerNoArgs(String registrationKey, String name, BasicType<?> returnType) {
 		return noArgsBuilder( registrationKey, name )
 				.setInvariantType( returnType )
 				.register();
 	}
 
 	public SqmFunctionDescriptor wrapInJdbcEscape(String name, SqmFunctionDescriptor wrapped) {
-		final JdbcEscapeFunctionDescriptor wrapperTemplate = new JdbcEscapeFunctionDescriptor( name, wrapped );
+		final var wrapperTemplate = new JdbcEscapeFunctionDescriptor( name, wrapped );
 		register( name, wrapperTemplate );
 		return wrapperTemplate;
 	}
 
 	public void registerAlternateKey(String alternateKey, String mappedKey) {
 		assert functionMap.containsKey( mappedKey );
-		// Incredibly verbose logging disabled
-//		LOG.tracef( "Registering alternate key : %s -> %s", alternateKey, mappedKey );
 		alternateKeyMap.put( alternateKey, mappedKey );
 	}
 
@@ -423,7 +399,7 @@ public void registerAlternateKey(String alternateKey, String mappedKey) {
 	 */
 	public MultipatternSqmFunctionDescriptor registerNullaryUnaryPattern(
 			String name,
-			BasicType type,
+			BasicType<?> type,
 			String pattern0,
 			String pattern1,
 			FunctionParameterType parameterType,
@@ -547,8 +523,7 @@ private MultipatternSqmFunctionDescriptor registerPatterns(
 			FunctionParameterType[] parameterTypes,
 			TypeConfiguration typeConfiguration,
 			String... patterns) {
-		SqmFunctionDescriptor[] descriptors =
-				new SqmFunctionDescriptor[patterns.length];
+		final var descriptors = new SqmFunctionDescriptor[patterns.length];
 		for ( int i = 0; i < patterns.length; i++ ) {
 			String pattern = patterns[i];
 			if ( pattern != null ) {
@@ -561,7 +536,7 @@ private MultipatternSqmFunctionDescriptor registerPatterns(
 			}
 		}
 
-		MultipatternSqmFunctionDescriptor function =
+		final var function =
 				new MultipatternSqmFunctionDescriptor( name, descriptors, typeConfiguration, parameterTypes );
 		register( name, function );
 		return function;
@@ -573,8 +548,7 @@ private MultipatternSqmFunctionDescriptor registerPatterns(
 			FunctionParameterType[] parameterTypes,
 			TypeConfiguration typeConfiguration,
 			String... patterns) {
-		SqmFunctionDescriptor[] descriptors =
-				new SqmFunctionDescriptor[patterns.length];
+		final var descriptors = new SqmFunctionDescriptor[patterns.length];
 		for ( int i = 0; i < patterns.length; i++ ) {
 			String pattern = patterns[i];
 			if ( pattern != null ) {
@@ -587,7 +561,7 @@ private MultipatternSqmFunctionDescriptor registerPatterns(
 			}
 		}
 
-		MultipatternSqmFunctionDescriptor function =
+		final var function =
 				new MultipatternSqmFunctionDescriptor( name, descriptors, type, typeConfiguration, parameterTypes );
 		register( name, function );
 		return function;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
index 520cbf830274..1a9bfa01965d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
@@ -9,8 +9,8 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.spi.QueryParameterImplementor;
 import org.hibernate.query.sqm.tree.expression.JpaCriteriaParameter;
+import org.hibernate.query.sqm.tree.expression.SqmParameter;
 import org.hibernate.query.sqm.tree.expression.ValueBindJpaCriteriaParameter;
-import org.hibernate.type.BindableType;
 import org.hibernate.query.KeyedPage;
 import org.hibernate.query.KeyedResultList;
 import org.hibernate.query.Page;
@@ -20,7 +20,6 @@
 import org.hibernate.query.spi.HqlInterpretation;
 import org.hibernate.query.spi.MutableQueryOptions;
 import org.hibernate.query.spi.QueryOptions;
-import org.hibernate.query.spi.QueryParameterBinding;
 import org.hibernate.query.spi.QueryParameterBindings;
 import org.hibernate.query.spi.SelectQueryPlan;
 import org.hibernate.query.sqm.spi.NamedSqmQueryMemento;
@@ -98,65 +97,68 @@ protected void errorOrLogForPaginationWithCollectionFetch() {
 	}
 
 	public abstract SqmStatement<R> getSqmStatement();
-	protected abstract void setSqmStatement(SqmSelectStatement<R> statement);
+//	protected abstract void setSqmStatement(SqmSelectStatement<R> statement);
 	public abstract DomainParameterXref getDomainParameterXref();
 	public abstract TupleMetadata getTupleMetadata();
-
-	protected void copyParameterBindings(QueryParameterBindings oldParameterBindings) {
-		final var parameterBindings = getQueryParameterBindings();
-		oldParameterBindings.visitBindings( (queryParameter, binding) -> {
-			if ( binding.isBound() ) {
-				//noinspection unchecked
-				final var newBinding = (QueryParameterBinding<Object>) parameterBindings.getBinding( queryParameter );
-				//noinspection unchecked
-				final var bindType = (BindableType<Object>) binding.getBindType();
-				final var explicitTemporalPrecision = binding.getExplicitTemporalPrecision();
-				if ( binding.isMultiValued() ) {
-					final var bindValues = binding.getBindValues();
-					if ( explicitTemporalPrecision != null ) {
-						newBinding.setBindValues( bindValues, explicitTemporalPrecision, getTypeConfiguration() );
-					}
-					else if ( bindType != null ) {
-						newBinding.setBindValues( bindValues, bindType );
-					}
-					else {
-						newBinding.setBindValues( bindValues );
-					}
-				}
-				else {
-					final var bindValue = binding.getBindValue();
-					if ( explicitTemporalPrecision != null ) {
-						newBinding.setBindValue( bindValue, explicitTemporalPrecision );
-					}
-					else if ( bindType != null ) {
-						newBinding.setBindValue( bindValue, bindType );
-					}
-					else {
-						newBinding.setBindValue( bindValue );
-					}
-				}
-			}
-		} );
-
-		// Parameters might be created through HibernateCriteriaBuilder.value which we need to bind here
-		bindValueBindCriteriaParameters( getDomainParameterXref(), parameterBindings );
-	}
+//
+//	protected void copyParameterBindings(QueryParameterBindings oldParameterBindings) {
+//		final var parameterBindings = getQueryParameterBindings();
+//		oldParameterBindings.visitBindings( (queryParameter, binding) -> {
+//			if ( binding.isBound() ) {
+//				final var newBinding = parameterBindings.getBinding( queryParameter );
+//				final var bindType = (BindableType<?>) binding.getBindType();
+//				final var explicitTemporalPrecision = binding.getExplicitTemporalPrecision();
+//				if ( binding.isMultiValued() ) {
+//					final var bindValues = binding.getBindValues();
+//					if ( explicitTemporalPrecision != null ) {
+//						newBinding.setBindValues( bindValues, explicitTemporalPrecision, getTypeConfiguration() );
+//					}
+//					else if ( bindType != null ) {
+//						newBinding.setBindValues( bindValues, bindType );
+//					}
+//					else {
+//						newBinding.setBindValues( bindValues );
+//					}
+//				}
+//				else {
+//					final var bindValue = binding.getBindValue();
+//					if ( explicitTemporalPrecision != null ) {
+//						newBinding.setBindValue( bindValue, explicitTemporalPrecision );
+//					}
+//					else if ( bindType != null ) {
+//						newBinding.setBindValue( bindValue, bindType );
+//					}
+//					else {
+//						newBinding.setBindValue( bindValue );
+//					}
+//				}
+//			}
+//		} );
+//
+//		// Parameters might be created through HibernateCriteriaBuilder.value which we need to bind here
+//		bindValueBindCriteriaParameters( getDomainParameterXref(), parameterBindings );
+//	}
 
 	protected static void bindValueBindCriteriaParameters(
 			DomainParameterXref domainParameterXref,
 			QueryParameterBindings bindings) {
 		for ( var entry : domainParameterXref.getQueryParameters().entrySet() ) {
-			final var sqmParameter = entry.getValue().get( 0 );
-			if ( sqmParameter instanceof SqmJpaCriteriaParameterWrapper<?> wrapper ) {
-				@SuppressWarnings("unchecked")
-				final var criteriaParameter = (JpaCriteriaParameter<Object>) wrapper.getJpaCriteriaParameter();
-				if ( criteriaParameter instanceof ValueBindJpaCriteriaParameter<?> ) {
-					// Use the anticipated type for binding the value if possible
-					//noinspection unchecked
-					final var parameter = (QueryParameterImplementor<Object>) entry.getKey();
-					bindings.getBinding( parameter )
-							.setBindValue( criteriaParameter.getValue(), criteriaParameter.getAnticipatedType() );
-				}
+			bindValueToCriteriaParameter( bindings, entry.getKey(),
+					entry.getValue().get( 0 ) );
+		}
+	}
+
+	private static <T> void bindValueToCriteriaParameter(
+			QueryParameterBindings bindings,
+			QueryParameterImplementor<?> queryParameterImplementor,
+			SqmParameter<T> sqmParameter) {
+		if ( sqmParameter instanceof SqmJpaCriteriaParameterWrapper<T> wrapper ) {
+			final var criteriaParameter = wrapper.getJpaCriteriaParameter();
+			if ( criteriaParameter instanceof ValueBindJpaCriteriaParameter<T> ) {
+				// Use the anticipated type for binding the value if possible
+				bindings.getBinding( queryParameterImplementor )
+						.setBindValue( criteriaParameter.getValue(),
+								criteriaParameter.getAnticipatedType() );
 			}
 		}
 	}
@@ -164,11 +166,14 @@ protected static void bindValueBindCriteriaParameters(
 	@Override
 	protected <P> QueryParameterImplementor<P> getQueryParameter(QueryParameterImplementor<P> parameter) {
 		if ( parameter instanceof JpaCriteriaParameter<?> criteriaParameter ) {
-			final var parameterWrapper = getDomainParameterXref().getParameterResolutions()
-					.getJpaCriteriaParamResolutions()
-					.get( criteriaParameter );
+			final var parameterWrapper =
+					getDomainParameterXref().getParameterResolutions()
+							.getJpaCriteriaParamResolutions()
+							.get( criteriaParameter );
 			//noinspection unchecked
-			return (QueryParameterImplementor<P>) getDomainParameterXref().getQueryParameter( parameterWrapper );
+			return (QueryParameterImplementor<P>)
+					getDomainParameterXref()
+							.getQueryParameter( parameterWrapper );
 		}
 		else {
 			return parameter;
@@ -176,9 +181,9 @@ protected <P> QueryParameterImplementor<P> getQueryParameter(QueryParameterImple
 	}
 
 	public int @Nullable [] unnamedParameterIndices() {
-		final var domainParameterXref = getDomainParameterXref();
 		final var jpaCriteriaParamResolutions =
-				domainParameterXref.getParameterResolutions().getJpaCriteriaParamResolutions();
+				getDomainParameterXref().getParameterResolutions()
+						.getJpaCriteriaParamResolutions();
 		if ( jpaCriteriaParamResolutions.isEmpty() ) {
 			return null;
 		}
@@ -188,7 +193,8 @@ protected <P> QueryParameterImplementor<P> getQueryParameter(QueryParameterImple
 		}
 		final var unnamedParameterIndices = new int[maxId + 1];
 		for ( var entry : jpaCriteriaParamResolutions.entrySet() ) {
-			unnamedParameterIndices[entry.getValue().getCriteriaParameterId()] = entry.getValue().getUnnamedParameterId();
+			unnamedParameterIndices[entry.getValue().getCriteriaParameterId()] =
+					entry.getValue().getUnnamedParameterId();
 		}
 		return unnamedParameterIndices;
 	}
@@ -353,12 +359,14 @@ private TupleMetadata getTupleMetadata(List<SqmSelection<?>> selections) {
 	}
 
 	private static TupleElement<?>[] buildTupleElementArray(List<SqmSelection<?>> selections) {
-		if ( selections.size() == 1 ) {
+		final int selectionsSize = selections.size();
+		if ( selectionsSize == 1 ) {
 			final var selectableNode = selections.get( 0 ).getSelectableNode();
 			if ( selectableNode instanceof CompoundSelection<?> ) {
 				final var selectionItems = selectableNode.getSelectionItems();
-				final var elements = new TupleElement<?>[ selectionItems.size() ];
-				for ( int i = 0; i < selectionItems.size(); i++ ) {
+				final int itemsSize = selectionItems.size();
+				final var elements = new TupleElement<?>[itemsSize];
+				for ( int i = 0; i < itemsSize; i++ ) {
 					elements[i] = selectionItems.get( i );
 				}
 				return elements;
@@ -368,8 +376,8 @@ private static TupleElement<?>[] buildTupleElementArray(List<SqmSelection<?>> se
 			}
 		}
 		else {
-			final var elements = new TupleElement<?>[ selections.size() ];
-			for ( int i = 0; i < selections.size(); i++ ) {
+			final var elements = new TupleElement<?>[selectionsSize];
+			for ( int i = 0; i < selectionsSize; i++ ) {
 				elements[i] = selections.get( i ).getSelectableNode();
 			}
 			return elements;
@@ -377,12 +385,14 @@ private static TupleElement<?>[] buildTupleElementArray(List<SqmSelection<?>> se
 	}
 
 	private static String[] buildTupleAliasArray(List<SqmSelection<?>> selections) {
-		if ( selections.size() == 1 ) {
+		final int selectionsSize = selections.size();
+		if ( selectionsSize == 1 ) {
 			final var selectableNode = selections.get(0).getSelectableNode();
 			if ( selectableNode instanceof CompoundSelection<?> ) {
 				final var selectionItems = selectableNode.getSelectionItems();
-				final String[] elements = new String[ selectionItems.size() ];
-				for ( int i = 0; i < selectionItems.size(); i++ ) {
+				final int itemsSize = selectionItems.size();
+				final var elements = new String[itemsSize];
+				for ( int i = 0; i < itemsSize; i++ ) {
 					elements[i] = selectionItems.get( i ).getAlias();
 				}
 				return elements;
@@ -392,8 +402,8 @@ private static String[] buildTupleAliasArray(List<SqmSelection<?>> selections) {
 			}
 		}
 		else {
-			final String[] elements = new String[ selections.size() ];
-			for ( int i = 0; i < selections.size(); i++ ) {
+			final String[] elements = new String[selectionsSize];
+			for ( int i = 0; i < selectionsSize; i++ ) {
 				elements[i] = selections.get( i ).getAlias();
 			}
 			return elements;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
index 989c517f27d9..812fc1a0a0d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/ConcreteSqmSelectQueryPlan.java
@@ -22,7 +22,9 @@
 import org.hibernate.query.sqm.spi.SqmParameterMappingModelResolutionAccess;
 import org.hibernate.query.sqm.sql.internal.SqmParameterInterpretation;
 import org.hibernate.query.sqm.tree.expression.SqmParameter;
+import org.hibernate.query.sqm.tree.from.SqmRoot;
 import org.hibernate.query.sqm.tree.select.SqmDynamicInstantiation;
+import org.hibernate.query.sqm.tree.select.SqmQuerySpec;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
 import org.hibernate.query.sqm.tree.select.SqmSelection;
 import org.hibernate.sql.ast.tree.expression.Expression;
@@ -47,6 +49,7 @@
 import org.hibernate.sql.results.spi.RowTransformer;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -88,6 +91,7 @@ public ConcreteSqmSelectQueryPlan(
 				sqm.producesUniqueResults() && !containsCollectionFetches( queryOptions )
 						? ListResultsConsumer.UniqueSemantic.NONE
 						: ListResultsConsumer.UniqueSemantic.ALLOW;
+		final var rowTransformer = determineRowTransformer( sqm, resultType, tupleMetadata );
 		executeQueryInterpreter = (resultsConsumer, executionContext, sqmInterpretation, jdbcParameterBindings, skipPreFlush) -> {
 			final var session = executionContext.getSession();
 			final var jdbcSelect = sqmInterpretation.jdbcOperation();
@@ -103,7 +107,9 @@ public ConcreteSqmSelectQueryPlan(
 						jdbcSelect,
 						jdbcParameterBindings,
 						listInterpreterExecutionContext( hql, executionContext, jdbcSelect, subSelectFetchKeyHandler ),
-						determineRowTransformer( sqm, resultType, tupleMetadata, executionContext.getQueryOptions() ),
+						executionContext.getQueryOptions().getTupleTransformer() != null
+								? makeRowTransformerTupleTransformerAdapter( sqm, executionContext.getQueryOptions() )
+								: rowTransformer,
 						null,
 						resultCountEstimate( sqmInterpretation, jdbcParameterBindings ),
 						resultsConsumer
@@ -129,7 +135,9 @@ public ConcreteSqmSelectQueryPlan(
 						jdbcSelect,
 						jdbcParameterBindings,
 						listInterpreterExecutionContext( hql, executionContext, jdbcSelect, subSelectFetchKeyHandler ),
-						determineRowTransformer( sqm, resultType, tupleMetadata, executionContext.getQueryOptions() ),
+						executionContext.getQueryOptions().getTupleTransformer() != null
+								? makeRowTransformerTupleTransformerAdapter( sqm, executionContext.getQueryOptions() )
+								: rowTransformer,
 						(Class<R>) executionContext.getResultType(),
 						uniqueSemantic,
 						resultCountEstimate( sqmInterpretation, jdbcParameterBindings )
@@ -150,7 +158,9 @@ public ConcreteSqmSelectQueryPlan(
 						scrollMode,
 						jdbcParameterBindings,
 						new SqmJdbcExecutionContextAdapter( executionContext, jdbcSelect ),
-						determineRowTransformer( sqm, resultType, tupleMetadata, executionContext.getQueryOptions() ),
+						executionContext.getQueryOptions().getTupleTransformer() != null
+								? makeRowTransformerTupleTransformerAdapter( sqm, executionContext.getQueryOptions() )
+								: rowTransformer,
 						resultCountEstimate( sqmInterpretation, jdbcParameterBindings )
 				);
 			}
@@ -196,7 +206,21 @@ else if ( expression instanceof SqmParameterInterpretation parameterInterpretati
 	}
 
 	private static List<SqmSelection<?>> selections(SqmSelectStatement<?> sqm) {
-		return sqm.getQueryPart().getFirstQuerySpec().getSelectClause().getSelections();
+		final SqmQuerySpec<?> querySpec = sqm.getQueryPart().getFirstQuerySpec();
+		final List<SqmSelection<?>> selections = querySpec.getSelectClause().getSelections();
+		if ( selections == null || selections.isEmpty() ) {
+			final List<SqmRoot<?>> sqmRoots = querySpec.getFromClause().getRoots();
+			if ( sqmRoots == null || sqmRoots.isEmpty() ) {
+				throw new IllegalArgumentException( "Criteria did not define any query roots" );
+			}
+			if ( sqmRoots.size() != 1 ) {
+				throw new IllegalArgumentException( "Criteria has multiple query roots" );
+			}
+			return Collections.singletonList( new SqmSelection<>( sqmRoots.get( 0 ), null ) );
+		}
+		else {
+			return selections;
+		}
 	}
 
 	private static final Map<Class<?>, Class<?>> WRAPPERS
@@ -228,22 +252,35 @@ protected static <T> RowTransformer<T> determineRowTransformer(
 		if ( queryOptions.getTupleTransformer() != null ) {
 			return makeRowTransformerTupleTransformerAdapter( sqm, queryOptions );
 		}
-		else if ( resultClass == null || resultClass == Object.class ) {
+		else {
+			return determineRowTransformer( sqm, resultClass, tupleMetadata );
+		}
+	}
+
+	/**
+	 * If the result type of the query is {@link Tuple}, {@link Map}, {@link List},
+	 * or any record or class type with an appropriate constructor, then we attempt
+	 * to repackage the result tuple as an instance of the result type using an
+	 * appropriate {@link RowTransformer}.
+	 *
+	 * @param resultClass The requested result type of the query
+	 * @return A {@link RowTransformer} responsible for repackaging the result type
+	 */
+	protected static <T> RowTransformer<T> determineRowTransformer(
+			SqmSelectStatement<?> sqm,
+			Class<T> resultClass,
+			TupleMetadata tupleMetadata) {
+		if ( resultClass == null || resultClass == Object.class ) {
 			return RowTransformerStandardImpl.instance();
 		}
 		else {
 			final var selections = selections( sqm );
-			if ( selections == null ) {
-				throw new AssertionFailure( "No selections" );
-			}
-			else {
-				final var resultType = primitiveToWrapper( resultClass );
-				return switch ( selections.size() ) {
-					case 0 -> throw new AssertionFailure( "No selections" );
-					case 1 -> singleItemRowTransformer( sqm, tupleMetadata, selections.get( 0 ), resultType );
-					default -> multipleItemRowTransformer( sqm, tupleMetadata, resultType );
-				};
-			}
+			final var resultType = primitiveToWrapper( resultClass );
+			return switch ( selections.size() ) {
+				case 0 -> throw new AssertionFailure( "No selections" );
+				case 1 -> singleItemRowTransformer( sqm, tupleMetadata, selections.get( 0 ), resultType );
+				default -> multipleItemRowTransformer( sqm, tupleMetadata, resultType );
+			};
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java
index fb8b74af46b8..b9d9cbd5b22c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/DomainParameterXref.java
@@ -4,12 +4,7 @@
  */
 package org.hibernate.query.sqm.internal;
 
-import java.util.ArrayList;
-import java.util.IdentityHashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.query.internal.QueryParameterIdentifiedImpl;
 import org.hibernate.query.internal.QueryParameterNamedImpl;
 import org.hibernate.query.internal.QueryParameterPositionalImpl;
@@ -20,6 +15,13 @@
 import org.hibernate.query.sqm.tree.expression.SqmParameter;
 import org.hibernate.type.BasicCollectionType;
 
+import java.util.ArrayList;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import static java.util.Collections.emptyList;
 
 /**
@@ -29,67 +31,19 @@
  */
 public class DomainParameterXref {
 
-	public static final DomainParameterXref EMPTY = new DomainParameterXref(
-			new LinkedHashMap<>( 0 ),
-			new IdentityHashMap<>( 0 ),
-			SqmStatement.ParameterResolutions.empty()
-	);
+	public static final DomainParameterXref EMPTY = new DomainParameterXref();
 
 	/**
 	 * Create a DomainParameterXref for the parameters defined in the SQM statement
 	 */
 	public static DomainParameterXref from(SqmStatement<?> sqmStatement) {
-		final SqmStatement.ParameterResolutions parameterResolutions = sqmStatement.resolveParameters();
-		if ( parameterResolutions.getSqmParameters().isEmpty() ) {
-			return EMPTY;
-		}
-		else {
-			final int sqmParamCount = parameterResolutions.getSqmParameters().size();
-			final LinkedHashMap<QueryParameterImplementor<?>, List<SqmParameter<?>>> sqmParamsByQueryParam =
-					new LinkedHashMap<>( sqmParamCount );
-			final IdentityHashMap<SqmParameter<?>, QueryParameterImplementor<?>> queryParamBySqmParam =
-					new IdentityHashMap<>( sqmParamCount );
-
-			for ( SqmParameter<?> sqmParameter : parameterResolutions.getSqmParameters() ) {
-				if ( sqmParameter instanceof JpaCriteriaParameter ) {
-					// see discussion on `SqmJpaCriteriaParameterWrapper#accept`
-					throw new UnsupportedOperationException(
-							"Unexpected JpaCriteriaParameter in SqmStatement#getSqmParameters.  Criteria parameters " +
-							"should be represented as SqmJpaCriteriaParameterWrapper references in this collection"
-					);
-				}
-
-				final QueryParameterImplementor<?> queryParameter;
-				if ( sqmParameter.getName() != null ) {
-					queryParameter = QueryParameterNamedImpl.fromSqm( sqmParameter );
-				}
-				else if ( sqmParameter.getPosition() != null ) {
-					queryParameter = QueryParameterPositionalImpl.fromSqm( sqmParameter );
-				}
-				else if ( sqmParameter instanceof SqmJpaCriteriaParameterWrapper<?> criteriaParameter ) {
-					if ( sqmParameter.allowMultiValuedBinding()
-						&& sqmParameter.getExpressible() != null
-						&& sqmParameter.getExpressible().getSqmType() instanceof BasicCollectionType ) {
-						// The wrapper parameter was inferred to be of a basic collection type,
-						// so we disallow multivalued bindings, because binding a list of collections isn't useful
-						criteriaParameter.getJpaCriteriaParameter().disallowMultiValuedBinding();
-					}
-					queryParameter = QueryParameterIdentifiedImpl.fromSqm( criteriaParameter );
-				}
-				else {
-					throw new UnsupportedOperationException(
-							"Unexpected SqmParameter type : " + sqmParameter );
-				}
-
-				sqmParamsByQueryParam.computeIfAbsent( queryParameter, impl -> new ArrayList<>() ).add( sqmParameter );
-				queryParamBySqmParam.put( sqmParameter, queryParameter );
-			}
-
-			return new DomainParameterXref( sqmParamsByQueryParam, queryParamBySqmParam, parameterResolutions );
-		}
+		final var parameterResolutions = sqmStatement.resolveParameters();
+		final var parameters = parameterResolutions.getSqmParameters();
+		return parameters.isEmpty()
+				? EMPTY
+				: new DomainParameterXref( parameterResolutions, parameters );
 	}
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Instance state
 
@@ -100,28 +54,78 @@ else if ( sqmParameter instanceof SqmJpaCriteriaParameterWrapper<?> criteriaPara
 
 	private Map<SqmParameter<?>,List<SqmParameter<?>>> expansions;
 
-	private DomainParameterXref(
-			LinkedHashMap<QueryParameterImplementor<?>, List<SqmParameter<?>>> sqmParamsByQueryParam,
-			IdentityHashMap<SqmParameter<?>, QueryParameterImplementor<?>> queryParamBySqmParam,
-			SqmStatement.ParameterResolutions parameterResolutions) {
-		this.sqmParamsByQueryParam = sqmParamsByQueryParam;
-		this.queryParamBySqmParam = queryParamBySqmParam;
-		this.parameterResolutions = parameterResolutions;
+	private DomainParameterXref() {
+		sqmParamsByQueryParam = new LinkedHashMap<>( 0 );
+		queryParamBySqmParam = new IdentityHashMap<>( 0 );
+		parameterResolutions = SqmStatement.ParameterResolutions.empty();
 	}
 
-	public DomainParameterXref copy() {
+	private DomainParameterXref(DomainParameterXref that) {
+		sqmParamsByQueryParam = that.sqmParamsByQueryParam;
 		//noinspection unchecked
-		final var clone =
+		queryParamBySqmParam =
 				(IdentityHashMap<SqmParameter<?>, QueryParameterImplementor<?>>)
-						queryParamBySqmParam.clone();
-		return new DomainParameterXref( sqmParamsByQueryParam, clone, parameterResolutions );
+						that.queryParamBySqmParam.clone();
+		parameterResolutions = that.parameterResolutions;
+	}
+
+	private DomainParameterXref(
+			SqmStatement.ParameterResolutions resolutions,
+			Set<SqmParameter<?>> parameters) {
+		parameterResolutions = resolutions;
+		final int sqmParamCount = parameters.size();
+		sqmParamsByQueryParam = new LinkedHashMap<>( sqmParamCount );
+		queryParamBySqmParam = new IdentityHashMap<>( sqmParamCount );
+
+		for ( var parameter : parameters ) {
+			if ( parameter instanceof JpaCriteriaParameter ) {
+				// see discussion on `SqmJpaCriteriaParameterWrapper#accept`
+				throw new UnsupportedOperationException(
+						"Unexpected JpaCriteriaParameter (criteria parameters should be represented as SqmJpaCriteriaParameterWrapper references in this collection)"
+				);
+			}
+
+			final var queryParameter = fromSqm( parameter );
+			sqmParamsByQueryParam.computeIfAbsent( queryParameter, impl -> new ArrayList<>() )
+					.add( parameter );
+			queryParamBySqmParam.put( parameter, queryParameter );
+		}
+	}
+
+	private static @NonNull QueryParameterImplementor<?> fromSqm(SqmParameter<?> sqmParameter) {
+		if ( sqmParameter.getName() != null ) {
+			return QueryParameterNamedImpl.fromSqm( sqmParameter );
+		}
+		else if ( sqmParameter.getPosition() != null ) {
+			return QueryParameterPositionalImpl.fromSqm( sqmParameter );
+		}
+		else if ( sqmParameter instanceof SqmJpaCriteriaParameterWrapper<?> criteriaParameter ) {
+			if ( sqmParameter.allowMultiValuedBinding() ) {
+				final var expressible = sqmParameter.getExpressible();
+				if ( expressible != null && expressible.getSqmType() instanceof BasicCollectionType ) {
+					// The wrapper parameter was inferred to be of a basic
+					// collection type, so we disallow multivalued bindings,
+					// because binding a list of collections isn't useful
+					criteriaParameter.getJpaCriteriaParameter().disallowMultiValuedBinding();
+				}
+			}
+			return QueryParameterIdentifiedImpl.fromSqm( criteriaParameter );
+		}
+		else {
+			throw new UnsupportedOperationException( "Unexpected SqmParameter type: " + sqmParameter );
+		}
+	}
+
+	public DomainParameterXref copy() {
+		return new DomainParameterXref( this );
 	}
 
 	/**
 	 * Does this xref contain any parameters?
 	 */
 	public boolean hasParameters() {
-		return sqmParamsByQueryParam != null && ! sqmParamsByQueryParam.isEmpty();
+		return sqmParamsByQueryParam != null
+			&& ! sqmParamsByQueryParam.isEmpty();
 	}
 
 	/**
@@ -141,13 +145,6 @@ public int getSqmParameterCount() {
 		return queryParamBySqmParam.size();
 	}
 
-//	public int getNumberOfSqmParameters(QueryParameterImplementor<?> queryParameter) {
-//		final List<SqmParameter<?>> sqmParameters = sqmParamsByQueryParam.get( queryParameter );
-//		return sqmParameters == null
-//				? 0 // this should maybe be an exception instead
-//				: sqmParameters.size();
-//	}
-
 	public SqmStatement.ParameterResolutions getParameterResolutions() {
 		return parameterResolutions;
 	}
@@ -157,12 +154,9 @@ public List<SqmParameter<?>> getSqmParameters(QueryParameterImplementor<?> query
 	}
 
 	public QueryParameterImplementor<?> getQueryParameter(SqmParameter<?> sqmParameter) {
-		if ( sqmParameter instanceof QueryParameterImplementor<?> parameterImplementor ) {
-			return parameterImplementor;
-		}
-		else {
-			return queryParamBySqmParam.get( sqmParameter );
-		}
+		return sqmParameter instanceof QueryParameterImplementor<?> parameterImplementor
+				? parameterImplementor
+				: queryParamBySqmParam.get( sqmParameter );
 	}
 
 	public void addExpansion(
@@ -182,15 +176,15 @@ public List<SqmParameter<?>> getExpansions(SqmParameter<?> sqmParameter) {
 			return emptyList();
 		}
 		else {
-			final List<SqmParameter<?>> sqmParameters = expansions.get( sqmParameter );
+			final var sqmParameters = expansions.get( sqmParameter );
 			return sqmParameters == null ? emptyList() : sqmParameters;
 		}
 	}
 
 	public void clearExpansions() {
 		if ( expansions != null ) {
-			for ( List<SqmParameter<?>> expansionList : expansions.values() ) {
-				for ( SqmParameter<?> expansion : expansionList ) {
+			for ( var expansionList : expansions.values() ) {
+				for ( var expansion : expansionList ) {
 					queryParamBySqmParam.remove( expansion );
 				}
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyBasedPagination.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyBasedPagination.java
index ee7a6ee389dd..d9a7465f0bc1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyBasedPagination.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyBasedPagination.java
@@ -14,6 +14,7 @@
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.query.sqm.tree.from.SqmFrom;
+import org.hibernate.query.sqm.tree.from.SqmRoot;
 import org.hibernate.query.sqm.tree.predicate.SqmPredicate;
 import org.hibernate.query.sqm.tree.select.SqmQuerySpec;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -37,25 +38,33 @@ static <R> SqmSelectStatement<KeyedResult<R>> paginate(
 			SqmSelectStatement<KeyedResult<R>> statement, NodeBuilder builder) {
 		final SqmQuerySpec<?> querySpec = statement.getQuerySpec();
 		final List<? extends JpaSelection<?>> items = querySpec.getSelectClause().getSelectionItems();
-		if ( items.size() == 1 ) {
-			final JpaSelection<?> selected = items.get(0);
-			if ( selected instanceof SqmFrom<?, ?> root ) {
-				statement.orderBy( keyDefinition.stream().map( order -> sortSpecification( statement, order ) )
-						.collect( toList() ) );
-				statement.select( keySelection( keyDefinition, root, selected, builder ) );
-				if ( keyValues != null ) {
-					final SqmPredicate restriction = keyRestriction( keyDefinition, keyValues, root, builder );
-					final SqmPredicate queryWhere = querySpec.getRestriction();
-					statement.where( queryWhere == null ? restriction : builder.and( queryWhere, restriction ) );
+		final JpaSelection<?> selected = switch ( items.size() ) {
+			case 0 -> {
+				final List<SqmRoot<?>> sqmRoots = querySpec.getRootList();
+				if ( sqmRoots == null || sqmRoots.isEmpty() ) {
+					throw new IllegalArgumentException( "Query did not define any query roots" );
 				}
-				return statement;
+				if ( sqmRoots.size() != 1 ) {
+					throw new IllegalArgumentException( "Query has multiple query roots" );
+				}
+				yield sqmRoots.get( 0 );
 			}
-			else {
-				throw new IllegalQueryOperationException("Select item was not an entity type");
+			case 1 -> items.get( 0 );
+			default -> throw new IllegalQueryOperationException("Query has multiple items in the select list");
+		};
+		if ( selected instanceof SqmFrom<?, ?> root ) {
+			statement.orderBy( keyDefinition.stream().map( order -> sortSpecification( statement, order ) )
+					.collect( toList() ) );
+			statement.select( keySelection( keyDefinition, root, selected, builder ) );
+			if ( keyValues != null ) {
+				final SqmPredicate restriction = keyRestriction( keyDefinition, keyValues, root, builder );
+				final SqmPredicate queryWhere = querySpec.getRestriction();
+				statement.where( queryWhere == null ? restriction : builder.and( queryWhere, restriction ) );
 			}
+			return statement;
 		}
 		else {
-			throw new IllegalQueryOperationException("Query has multiple items in the select list");
+			throw new IllegalQueryOperationException("Select item was not an entity type");
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java
index ea8ce22e7bbe..bc7dd26a2c48 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SimpleDeleteQueryPlan.java
@@ -173,6 +173,7 @@ protected SqmTranslation<? extends MutationStatement> buildTranslation(SqmDmlSta
 					new UpdateStatement(
 							sqlDeleteAst,
 							targetTable,
+							sqlDeleteAst.getMutationTarget(),
 							sqlDeleteAst.getFromClause(),
 							Collections.singletonList( assignment ),
 							sqlDeleteAst.getRestriction(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
index c9678488ca50..9836a47b589c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
@@ -43,7 +43,6 @@
 import org.hibernate.jpa.spi.JpaCompliance;
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
 import org.hibernate.metamodel.mapping.EntityVersionMapping;
-import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.metamodel.model.domain.PersistentAttribute;
 import org.hibernate.metamodel.model.domain.internal.EntitySqmPathSource;
@@ -80,7 +79,6 @@
 import org.hibernate.query.sqm.SetOperator;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.query.sqm.SqmExpressible;
-import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.SqmQuerySource;
 import org.hibernate.query.common.TemporalUnit;
 import org.hibernate.query.sqm.TrimSpec;
@@ -92,7 +90,6 @@
 import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver;
 import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers;
 import org.hibernate.query.sqm.tree.SqmQuery;
-import org.hibernate.query.sqm.tree.SqmStatement;
 import org.hibernate.query.sqm.tree.SqmTypedNode;
 import org.hibernate.query.sqm.tree.cte.SqmCteStatement;
 import org.hibernate.query.sqm.tree.cte.SqmCteTableColumn;
@@ -143,7 +140,6 @@
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.descriptor.java.EnumJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import jakarta.persistence.Tuple;
@@ -168,6 +164,7 @@
 
 import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
 import static org.hibernate.internal.util.collections.CollectionHelper.determineProperSizing;
 import static org.hibernate.query.internal.QueryHelper.highestPrecedenceType;
@@ -181,6 +178,7 @@
  * using SQM nodes as the JPA Criteria nodes
  *
  * @author Steve Ebersole
+ * @author Yoobin Yoon
  */
 public class SqmCriteriaNodeBuilder implements NodeBuilder, Serializable {
 
@@ -218,7 +216,7 @@ public SqmCriteriaNodeBuilder(
 	private Map<Class<? extends HibernateCriteriaBuilder>, HibernateCriteriaBuilder> loadExtensions() {
 		// load registered criteria builder extensions
 		final Map<Class<? extends HibernateCriteriaBuilder>, HibernateCriteriaBuilder> extensions = new HashMap<>();
-		for ( CriteriaBuilderExtension extension : ServiceLoader.load( CriteriaBuilderExtension.class ) ) {
+		for ( var extension : ServiceLoader.load( CriteriaBuilderExtension.class ) ) {
 			extensions.put( extension.getRegistrationKey(), extension.extend( this ) );
 		}
 		return extensions;
@@ -267,7 +265,7 @@ public BasicType<Boolean> getBooleanType() {
 
 	@Override
 	public BasicType<Integer> getIntegerType() {
-		final BasicType<Integer> integerType = this.integerType;
+		final var integerType = this.integerType;
 		if ( integerType == null ) {
 			return this.integerType =
 					getTypeConfiguration().getBasicTypeRegistry()
@@ -278,7 +276,7 @@ public BasicType<Integer> getIntegerType() {
 
 	@Override
 	public BasicType<Long> getLongType() {
-		final BasicType<Long> longType = this.longType;
+		final var longType = this.longType;
 		if ( longType == null ) {
 			return this.longType =
 					getTypeConfiguration().getBasicTypeRegistry()
@@ -289,7 +287,7 @@ public BasicType<Long> getLongType() {
 
 	@Override
 	public BasicType<Character> getCharacterType() {
-		final BasicType<Character> characterType = this.characterType;
+		final var characterType = this.characterType;
 		if ( characterType == null ) {
 			return this.characterType =
 					getTypeConfiguration().getBasicTypeRegistry()
@@ -300,7 +298,7 @@ public BasicType<Character> getCharacterType() {
 
 	@Override
 	public BasicType<String> getStringType() {
-		final BasicType<String> stringType = this.stringType;
+		final var stringType = this.stringType;
 		if ( stringType == null ) {
 			return this.stringType =
 					getTypeConfiguration().getBasicTypeRegistry()
@@ -310,17 +308,19 @@ public BasicType<String> getStringType() {
 	}
 
 	public FunctionReturnTypeResolver getSumReturnTypeResolver() {
-		final FunctionReturnTypeResolver resolver = sumReturnTypeResolver;
+		final var resolver = sumReturnTypeResolver;
 		if ( resolver == null ) {
-			return this.sumReturnTypeResolver = new SumReturnTypeResolver( getTypeConfiguration() );
+			return sumReturnTypeResolver =
+					new SumReturnTypeResolver( getTypeConfiguration() );
 		}
 		return resolver;
 	}
 
 	public FunctionReturnTypeResolver getAvgReturnTypeResolver() {
-		final FunctionReturnTypeResolver resolver = avgReturnTypeResolver;
+		final var resolver = avgReturnTypeResolver;
 		if ( resolver == null ) {
-			return this.avgReturnTypeResolver = new AvgFunction.ReturnTypeResolver( getTypeConfiguration() );
+			return avgReturnTypeResolver =
+					new AvgFunction.ReturnTypeResolver( getTypeConfiguration() );
 		}
 		return resolver;
 	}
@@ -351,10 +351,9 @@ public <T> SqmSelectStatement<T> createQuery(Class<T> resultClass) {
 
 	@Override
 	public <T> SqmSelectStatement<T> createQuery(String hql, Class<T> resultClass) {
-		final SqmStatement<T> statement =
-				queryEngine.getHqlTranslator().translate( hql, resultClass );
-		if ( statement instanceof SqmSelectStatement ) {
-			return new SqmSelectStatement<>( (SqmSelectStatement<T>) statement );
+		if ( queryEngine.getHqlTranslator().translate( hql, resultClass )
+				instanceof SqmSelectStatement<T> selectStatement ) {
+			return new SqmSelectStatement<>( selectStatement );
 		}
 		else {
 			throw new IllegalArgumentException("Not a 'select' statement");
@@ -417,10 +416,16 @@ public <T> JpaCriteriaSelect<T> union(CriteriaSelect<? extends T> left, Criteria
 		if ( left instanceof Subquery<?> ) {
 			assert right instanceof Subquery<?>;
 			//noinspection unchecked
-			return setOperation( SetOperator.UNION, (Subquery<T>) left, (Subquery<T>) right );
+			return setOperation( SetOperator.UNION,
+					(Subquery<T>) left,
+					(Subquery<T>) right );
+		}
+		else {
+			//noinspection unchecked
+			return setOperation( SetOperator.UNION,
+					(JpaCriteriaQuery<T>) left,
+					(JpaCriteriaQuery<T>) right );
 		}
-		//noinspection unchecked
-		return setOperation( SetOperator.UNION, (JpaCriteriaQuery<T>) left, (JpaCriteriaQuery<T>) right );
 	}
 
 	@Override
@@ -435,8 +440,12 @@ public <T> CriteriaSelect<T> unionAll(CriteriaSelect<? extends T> left, Criteria
 			//noinspection unchecked
 			return setOperation( SetOperator.UNION_ALL, (Subquery<T>) left, (Subquery<T>) right );
 		}
-		//noinspection unchecked
-		return setOperation( SetOperator.UNION_ALL, (JpaCriteriaQuery<T>) left, (JpaCriteriaQuery<T>) right );
+		else {
+			//noinspection unchecked
+			return setOperation( SetOperator.UNION_ALL,
+					(JpaCriteriaQuery<T>) left,
+					(JpaCriteriaQuery<T>) right );
+		}
 	}
 
 	@Override
@@ -449,10 +458,16 @@ public <T> CriteriaSelect<T> except(CriteriaSelect<T> left, CriteriaSelect<?> ri
 		if ( left instanceof Subquery<?> ) {
 			assert right instanceof Subquery<?>;
 			//noinspection unchecked
-			return setOperation( SetOperator.EXCEPT, (Subquery<T>) left, (Subquery<T>) right );
+			return setOperation( SetOperator.EXCEPT,
+					(Subquery<T>) left,
+					(Subquery<T>) right );
+		}
+		else {
+			//noinspection unchecked
+			return setOperation( SetOperator.EXCEPT,
+					(JpaCriteriaQuery<T>) left,
+					(JpaCriteriaQuery<T>) right );
 		}
-		//noinspection unchecked
-		return setOperation( SetOperator.EXCEPT, (JpaCriteriaQuery<T>) left, (JpaCriteriaQuery<T>) right );
 	}
 
 	@Override
@@ -460,10 +475,16 @@ public <T> CriteriaSelect<T> exceptAll(CriteriaSelect<T> left, CriteriaSelect<?>
 		if ( left instanceof Subquery<?> ) {
 			assert right instanceof Subquery<?>;
 			//noinspection unchecked
-			return setOperation( SetOperator.EXCEPT_ALL, (Subquery<T>) left, (Subquery<T>) right );
+			return setOperation( SetOperator.EXCEPT_ALL,
+					(Subquery<T>) left,
+					(Subquery<T>) right );
+		}
+		else {
+			//noinspection unchecked
+			return setOperation( SetOperator.EXCEPT_ALL,
+					(JpaCriteriaQuery<T>) left,
+					(JpaCriteriaQuery<T>) right );
 		}
-		//noinspection unchecked
-		return setOperation( SetOperator.EXCEPT_ALL, (JpaCriteriaQuery<T>) left, (JpaCriteriaQuery<T>) right );
 	}
 
 	@Override
@@ -476,12 +497,12 @@ private <T> JpaCriteriaQuery<T> setOperation(
 			SetOperator operator,
 			CriteriaQuery<? extends T> criteriaQuery,
 			CriteriaQuery<?>... queries) {
-		final Class<T> resultType = (Class<T>) criteriaQuery.getResultType();
+		final var resultType = (Class<T>) criteriaQuery.getResultType();
 		final List<SqmQueryPart<T>> queryParts = new ArrayList<>( queries.length + 1 );
 		final Map<String, SqmCteStatement<?>> cteStatements = new LinkedHashMap<>();
-		final SqmSelectStatement<T> selectStatement = (SqmSelectStatement<T>) criteriaQuery;
+		final var selectStatement = (SqmSelectStatement<T>) criteriaQuery;
 		collectQueryPartsAndCtes( selectStatement, queryParts, cteStatements );
-		for ( CriteriaQuery<?> query : queries ) {
+		for ( var query : queries ) {
 			if ( query.getResultType() != resultType ) {
 				throw new IllegalArgumentException( "Result type of all operands must match" );
 			}
@@ -501,12 +522,12 @@ private <T> JpaSubQuery<T> setOperation(
 			SetOperator operator,
 			Subquery<? extends T> subquery,
 			Subquery<?>... queries) {
-		final Class<T> resultType = (Class<T>) subquery.getResultType();
-		final SqmQuery<T> parent = (SqmQuery<T>) subquery.getParent();
+		final var resultType = (Class<T>) subquery.getResultType();
+		final var parent = (SqmQuery<T>) subquery.getParent();
 		final List<SqmQueryPart<T>> queryParts = new ArrayList<>( queries.length + 1 );
 		final Map<String, SqmCteStatement<?>> cteStatements = new LinkedHashMap<>();
 		collectQueryPartsAndCtes( (SqmSelectQuery<T>) subquery, queryParts, cteStatements );
-		for ( Subquery<?> query : queries ) {
+		for ( var query : queries ) {
 			if ( query.getResultType() != resultType ) {
 				throw new IllegalArgumentException( "Result type of all operands must match" );
 			}
@@ -529,9 +550,9 @@ private <T> void collectQueryPartsAndCtes(
 			List<SqmQueryPart<T>> queryParts,
 			Map<String, SqmCteStatement<?>> cteStatements) {
 		queryParts.add( query.getQueryPart() );
-		for ( SqmCteStatement<?> cteStatement : query.getCteStatements() ) {
+		for ( var cteStatement : query.getCteStatements() ) {
 			final String name = cteStatement.getCteTable().getCteName();
-			final SqmCteStatement<?> old = cteStatements.put( name, cteStatement );
+			final var old = cteStatements.put( name, cteStatement );
 			if ( old != null && old != cteStatement ) {
 				throw new IllegalArgumentException(
 						String.format( "Different CTE with same name [%s] found in different set operands!", name )
@@ -547,7 +568,7 @@ public <X, T> SqmExpression<X> cast(JpaExpression<T> expression, Class<X> castTa
 
 	@Override
 	public <X, T> SqmExpression<X> cast(JpaExpression<T> expression, JpaCastTarget<X> castTarget) {
-		final SqmCastTarget<X> sqmCastTarget = (SqmCastTarget<X>) castTarget;
+		final var sqmCastTarget = (SqmCastTarget<X>) castTarget;
 		return getFunctionDescriptor( "cast" ).generateSqmExpression(
 				asList( (SqmTypedNode<?>) expression, sqmCastTarget ),
 				sqmCastTarget.getType(),
@@ -570,8 +591,10 @@ public <X> SqmCastTarget<X> castTarget(Class<X> castTargetJavaType, int precisio
 		return castTarget( castTargetJavaType, null, precision, scale );
 	}
 
-	private <X> SqmCastTarget<X> castTarget(Class<X> castTargetJavaType, @Nullable Long length, @Nullable Integer precision, @Nullable Integer scale) {
-		final BasicType<X> type = getTypeConfiguration().standardBasicTypeForJavaType( castTargetJavaType );
+	private <X> SqmCastTarget<X> castTarget(
+			Class<X> castTargetJavaType,
+			@Nullable Long length, @Nullable Integer precision, @Nullable Integer scale) {
+		final var type = getTypeConfiguration().standardBasicTypeForJavaType( castTargetJavaType );
 		return new SqmCastTarget<>( type, length, precision, scale, this );
 	}
 
@@ -588,12 +611,13 @@ public final SqmPredicate wrap(Expression<Boolean>... expressions) {
 		if ( expressions.length == 1 ) {
 			return wrap( expressions[0] );
 		}
-
-		final List<SqmPredicate> predicates = new ArrayList<>( expressions.length );
-		for ( Expression<Boolean> expression : expressions ) {
-			predicates.add( wrap( expression ) );
+		else {
+			final List<SqmPredicate> predicates = new ArrayList<>( expressions.length );
+			for ( var expression : expressions ) {
+				predicates.add( wrap( expression ) );
+			}
+			return new SqmJunctionPredicate( Predicate.BooleanOperator.AND, predicates, this );
 		}
-		return new SqmJunctionPredicate( Predicate.BooleanOperator.AND, predicates, this );
 	}
 
 	@Override
@@ -601,12 +625,13 @@ public SqmPredicate wrap(List<? extends Expression<Boolean>> restrictions) {
 		if ( restrictions.size() == 1 ) {
 			return wrap( restrictions.get( 0 ) );
 		}
-
-		final List<SqmPredicate> predicates = new ArrayList<>( restrictions.size() );
-		for ( Expression<Boolean> expression : restrictions ) {
-			predicates.add( wrap( expression ) );
+		else {
+			final List<SqmPredicate> predicates = new ArrayList<>( restrictions.size() );
+			for ( var expression : restrictions ) {
+				predicates.add( wrap( expression ) );
+			}
+			return new SqmJunctionPredicate( Predicate.BooleanOperator.AND, predicates, this );
 		}
-		return new SqmJunctionPredicate( Predicate.BooleanOperator.AND, predicates, this );
 	}
 
 	@Override @SuppressWarnings("unchecked")
@@ -620,8 +645,8 @@ public <T extends HibernateCriteriaBuilder> T unwrap(Class<T> clazz) {
 
 	@Override
 	public SqmPath<?> fk(Path<?> path) {
-		final SqmPath<?> sqmPath = (SqmPath<?>) path;
-		final SqmPathSource<?> toOneReference = sqmPath.getReferencedPathSource();
+		final var sqmPath = (SqmPath<?>) path;
+		final var toOneReference = sqmPath.getReferencedPathSource();
 		final boolean validToOneRef =
 				toOneReference.getBindableType() == Bindable.BindableType.SINGULAR_ATTRIBUTE
 						&& toOneReference instanceof EntitySqmPathSource;
@@ -685,9 +710,10 @@ private static <T> JpaCriteriaQuery<T> createUnionSet(
 			SetOperator operator,
 			CriteriaQuery<? extends T> left,
 			CriteriaQuery<? extends T> right) {
-		assert operator == SetOperator.UNION || operator == SetOperator.UNION_ALL;
-		final SqmSelectStatement<? extends T> leftSqm = (SqmSelectStatement<? extends T>) left;
-		final SqmSelectStatement<? extends T> rightSqm = (SqmSelectStatement<? extends T>) right;
+		assert operator == SetOperator.UNION
+			|| operator == SetOperator.UNION_ALL;
+		final var leftSqm = (SqmSelectStatement<? extends T>) left;
+		final var rightSqm = (SqmSelectStatement<? extends T>) right;
 
 		// SqmQueryGroup is the UNION ALL between the two
 		final SqmQueryGroup sqmQueryGroup = new SqmQueryGroup(
@@ -720,9 +746,10 @@ private static <T> JpaCriteriaQuery<T> createIntersectSet(
 			SetOperator operator,
 			CriteriaQuery<? super T> left,
 			CriteriaQuery<? super T> right) {
-		assert operator == SetOperator.INTERSECT || operator == SetOperator.INTERSECT_ALL;
-		final SqmSelectStatement<? extends T> leftSqm = (SqmSelectStatement<? extends T>) left;
-		final SqmSelectStatement<? extends T> rightSqm = (SqmSelectStatement<? extends T>) right;
+		assert operator == SetOperator.INTERSECT
+			|| operator == SetOperator.INTERSECT_ALL;
+		final var leftSqm = (SqmSelectStatement<? extends T>) left;
+		final var rightSqm = (SqmSelectStatement<? extends T>) right;
 
 		// SqmQueryGroup is the UNION ALL between the two
 		final SqmQueryGroup sqmQueryGroup = new SqmQueryGroup(
@@ -755,9 +782,10 @@ private static <T> JpaCriteriaQuery<T> createExceptSet(
 			SetOperator operator,
 			CriteriaQuery<T> left,
 			CriteriaQuery<?> right) {
-		assert operator == SetOperator.EXCEPT || operator == SetOperator.EXCEPT_ALL;
-		final SqmSelectStatement<? extends T> leftSqm = (SqmSelectStatement<? extends T>) left;
-		final SqmSelectStatement<? extends T> rightSqm = (SqmSelectStatement<? extends T>) right;
+		assert operator == SetOperator.EXCEPT
+			|| operator == SetOperator.EXCEPT_ALL;
+		final var leftSqm = (SqmSelectStatement<? extends T>) left;
+		final var rightSqm = (SqmSelectStatement<? extends T>) right;
 
 		// SqmQueryGroup is the UNION ALL between the two
 		final SqmQueryGroup sqmQueryGroup = new SqmQueryGroup(
@@ -933,7 +961,7 @@ public <R> SqmTuple<R> tuple(SqmExpressible<R> tupleType, SqmExpression<?>... ex
 	@Override @Deprecated(since = "7", forRemoval = true)
 	public <R> SqmTuple<R> tuple(Class<R> tupleType, List<? extends SqmExpression<?>> expressions) {
 		@SuppressWarnings("unchecked")
-		final SqmExpressible<R> expressibleType =
+		final var expressibleType =
 				tupleType == null || tupleType == Object[].class
 						? (SqmDomainType<R>) getTypeConfiguration().resolveTupleType( expressions )
 						: (SqmEmbeddableDomainType<R>) getDomainModel().embeddable( tupleType );
@@ -1019,7 +1047,7 @@ else if ( Map.class.equals( resultClass ) ) {
 	 */
 	private void checkMultiselect(List<? extends Selection<?>> selections) {
 		final HashSet<String> aliases = new HashSet<>( determineProperSizing( selections.size() ) );
-		for ( Selection<?> selection : selections ) {
+		for ( var selection : selections ) {
 			if ( selection.isCompoundSelection() ) {
 				final Class<?> javaType = selection.getJavaType();
 				if ( javaType.isArray() ) {
@@ -1052,7 +1080,7 @@ public <N extends Number> SqmExpression<Double> avg(Expression<N> argument) {
 	@Override
 	@SuppressWarnings("unchecked")
 	public <N extends Number> SqmExpression<N> sum(Expression<N> argument) {
-		final SqmTypedNode<N> typedNode = (SqmTypedNode<N>) argument;
+		final var typedNode = (SqmTypedNode<N>) argument;
 		return getFunctionDescriptor( "sum" ).generateSqmExpression(
 				typedNode,
 				(ReturnableType<N>) typedNode.getExpressible().getSqmType(),
@@ -1218,10 +1246,9 @@ public <T extends Number> JpaExpression<T> truncate(Expression<T> x, Integer n)
 
 	@Override
 	public <N extends Number> SqmExpression<N> neg(Expression<N> x) {
-		final SqmExpression<N> sqmExpression = (SqmExpression<N>) x;
 		return new SqmUnaryOperation<>(
 				UnaryArithmeticOperator.UNARY_MINUS,
-				sqmExpression,
+				(SqmExpression<N>) x,
 				getNodeBuilder()
 		);
 	}
@@ -1355,7 +1382,7 @@ private <N> SqmExpression<N> createSqmArithmeticNode(
 			BinaryArithmeticOperator operator,
 			SqmExpression<?> leftHandExpression,
 			SqmExpression<?> rightHandExpression) {
-		final SqmExpressible<?> arithmeticType =
+		final var arithmeticType =
 				getTypeConfiguration()
 						.resolveArithmeticType(
 								leftHandExpression.getNodeType(),
@@ -1550,17 +1577,16 @@ public <T> SqmLiteral<T> literal(@Nullable T value, @Nullable SqmExpression<? ex
 	}
 
 	private <T> SqmLiteral<T> createLiteral(T value, SqmBindableType<T> expressible) {
-		if ( expressible.getExpressibleJavaType().isInstance( value ) ) {
+		final var javaType = expressible.getExpressibleJavaType();
+		if ( javaType.isInstance( value ) ) {
 			return new SqmLiteral<>( value, expressible, this );
 		}
 		else {
 			// Just like in HQL, we allow coercion of literal values to the inferred type
-			final T coercedValue =
-					expressible.getExpressibleJavaType()
-							.coerce( value, this::getTypeConfiguration );
-			// ignore typeInferenceSource and fallback the value type
-			return expressible.getExpressibleJavaType().isInstance( coercedValue )
-					? new SqmLiteral<>( coercedValue, expressible, this )
+			final Object coercedValue = javaType.coerce( value );
+			// ignore typeInferenceSource and fall back to the value type
+			return javaType.isInstance( coercedValue )
+					? new SqmLiteral<>( javaType.cast( coercedValue ), expressible, this )
 					: literal( value );
 		}
 	}
@@ -1579,11 +1605,12 @@ else if ( value == null ) {
 	}
 
 	private <T> BasicType<T> resolveInferredType(T value) {
-		final TypeConfiguration typeConfiguration = getTypeConfiguration();
-		final Class<T> type = ReflectHelper.getClass( value );
-		final BasicType<T> result = typeConfiguration.getBasicTypeForJavaType( type );
+		final var typeConfiguration = getTypeConfiguration();
+		final var type = ReflectHelper.getClass( value );
+		final var result = typeConfiguration.getBasicTypeForJavaType( type );
 		if ( result == null && value instanceof Enum<?> enumValue ) {
-			return (BasicType<T>) resolveEnumType( typeConfiguration, enumValue );
+			return (BasicType<T>)
+					resolveEnumType( typeConfiguration, enumValue );
 		}
 		else {
 			return result;
@@ -1591,9 +1618,9 @@ private <T> BasicType<T> resolveInferredType(T value) {
 	}
 
 	private static <E extends Enum<E>> BasicType<E> resolveEnumType(TypeConfiguration configuration, Enum<E> enumValue) {
-		final EnumJavaType<E> javaType = new EnumJavaType<>( ReflectHelper.getClass( enumValue ) );
-		final JdbcType jdbcType = javaType.getRecommendedJdbcType( configuration.getCurrentBaseSqlTypeIndicators() );
-		return configuration.getBasicTypeRegistry().resolve( javaType, jdbcType );
+		final var enumJavaType = new EnumJavaType<>( ReflectHelper.getClass( enumValue ) );
+		final var jdbcType = enumJavaType.getRecommendedJdbcType( configuration.getCurrentBaseSqlTypeIndicators() );
+		return configuration.getBasicTypeRegistry().resolve( enumJavaType, jdbcType );
 	}
 
 	@Override
@@ -1617,27 +1644,29 @@ public MappingMetamodelImplementor getMappingMetamodel() {
 	@Override
 	public <T> List<? extends SqmExpression<T>> literals(T[] values) {
 		if ( values == null || values.length == 0 ) {
-			return Collections.emptyList();
+			return emptyList();
 		}
-
-		final List<SqmLiteral<T>> literals = new ArrayList<>();
-		for ( T value : values ) {
-			literals.add( literal( value ) );
+		else {
+			final List<SqmLiteral<T>> literals = new ArrayList<>();
+			for ( T value : values ) {
+				literals.add( literal( value ) );
+			}
+			return literals;
 		}
-		return literals;
 	}
 
 	@Override
 	public <T> List<? extends SqmExpression<T>> literals(List<T> values) {
 		if ( values == null || values.isEmpty() ) {
-			return Collections.emptyList();
+			return emptyList();
 		}
-
-		final List<SqmLiteral<T>> literals = new ArrayList<>();
-		for ( T value : values ) {
-			literals.add( literal( value ) );
+		else {
+			final List<SqmLiteral<T>> literals = new ArrayList<>();
+			for ( T value : values ) {
+				literals.add( literal( value ) );
+			}
+			return literals;
 		}
-		return literals;
 	}
 
 	@Override
@@ -1647,9 +1676,10 @@ public <T> SqmExpression<T> nullLiteral(Class<T> resultClass) {
 			return new SqmLiteralNull<>( this );
 		}
 		else {
-			final BasicType<T> basicTypeForJavaType = getTypeConfiguration().getBasicTypeForJavaType( resultClass );
+			final var basicTypeForJavaType =
+					getTypeConfiguration().getBasicTypeForJavaType( resultClass );
 			// if there's no basic type, it might be an entity type
-			final SqmBindableType<T> sqmExpressible =
+			final var sqmExpressible =
 					basicTypeForJavaType == null
 							? resolveExpressible( getDomainModel().managedType( resultClass ) )
 							: basicTypeForJavaType;
@@ -1692,9 +1722,9 @@ public <T> JpaCriteriaParameter<T> parameter(Class<T> paramClass) {
 
 	@Override
 	public <T> JpaCriteriaParameter<T> parameter(Class<T> paramClass, @Nullable String name) {
-		final BasicType<T> basicType = getTypeConfiguration().getBasicTypeForJavaType( paramClass );
-		boolean notBasic = basicType == null;
-		final BindableType<T> parameterType =
+		final var basicType = getTypeConfiguration().getBasicTypeForJavaType( paramClass );
+		final boolean notBasic = basicType == null;
+		final var parameterType =
 				notBasic && Collection.class.isAssignableFrom( paramClass )
 						// a Collection-valued, multi-valued parameter
 						? new MultiValueParameterType<>( (Class<T>) Collection.class )
@@ -1709,7 +1739,7 @@ public <T> JpaParameterExpression<List<T>> listParameter(Class<T> paramClass) {
 
 	@Override
 	public <T> JpaParameterExpression<List<T>> listParameter(Class<T> paramClass, @Nullable String name) {
-		final BindableType<List<T>> parameterType = new MultiValueParameterType<>( (Class<List<T>>) (Class) List.class );
+		final var parameterType = new MultiValueParameterType<>( (Class<List<T>>) (Class) List.class );
 		return new JpaCriteriaParameter<>( name, parameterType, true, this );
 	}
 
@@ -1725,10 +1755,8 @@ public SqmExpression<String> concat(List<Expression<String>> expressions) {
 
 	@Override
 	public SqmExpression<String> concat(Expression<String> x, Expression<String> y) {
-		final SqmExpression<String> xSqmExpression = (SqmExpression<String>) x;
-		final SqmExpression<String> ySqmExpression = (SqmExpression<String>) y;
 		return getFunctionDescriptor( "concat" ).generateSqmExpression(
-				asList( xSqmExpression, ySqmExpression ),
+				asList( (SqmExpression<String>) x, (SqmExpression<String>) y ),
 				null,
 				getQueryEngine()
 		);
@@ -1736,11 +1764,8 @@ public SqmExpression<String> concat(Expression<String> x, Expression<String> y)
 
 	@Override
 	public SqmExpression<String> concat(Expression<String> x, String y) {
-		final SqmExpression<String> xSqmExpression = (SqmExpression<String>) x;
-		final SqmExpression<String> ySqmExpression = value( y, xSqmExpression );
-
 		return getFunctionDescriptor( "concat" ).generateSqmExpression(
-				asList( xSqmExpression, ySqmExpression ),
+				asList( (SqmExpression<String>) x, value( y, (SqmExpression<String>) x ) ),
 				null,
 				getQueryEngine()
 		);
@@ -1748,11 +1773,8 @@ public SqmExpression<String> concat(Expression<String> x, String y) {
 
 	@Override
 	public SqmExpression<String> concat(String x, Expression<String> y) {
-		final SqmExpression<String> ySqmExpression = (SqmExpression<String>) y;
-		final SqmExpression<String> xSqmExpression = value( x, ySqmExpression );
-
 		return getFunctionDescriptor( "concat" ).generateSqmExpression(
-				asList( xSqmExpression, ySqmExpression ),
+				asList( value( x, (SqmExpression<String>) y ), (SqmExpression<String>) y ),
 				null,
 				getQueryEngine()
 		);
@@ -1760,11 +1782,8 @@ public SqmExpression<String> concat(String x, Expression<String> y) {
 
 	@Override
 	public SqmExpression<String> concat(String x, String y) {
-		final SqmExpression<String> xSqmExpression = value( x );
-		final SqmExpression<String> ySqmExpression = value( y, xSqmExpression );
-
 		return getFunctionDescriptor( "concat" ).generateSqmExpression(
-				asList( xSqmExpression, ySqmExpression ),
+				asList( value( x ), value( y, value( x ) ) ),
 				null,
 				getQueryEngine()
 		);
@@ -1913,23 +1932,10 @@ private SqmFunction<Integer> createLocateFunctionNode(
 			SqmExpression<String> source,
 			SqmExpression<String> pattern,
 			@Nullable SqmExpression<Integer> startPosition) {
-		final List<SqmTypedNode<?>> arguments;
-		if ( startPosition == null ) {
-			arguments = asList(
-					pattern,
-					source
-					);
-		}
-		else {
-			arguments = asList(
-					pattern,
-					source,
-					startPosition
-			);
-		}
-
 		return getFunctionDescriptor("locate").generateSqmExpression(
-				arguments,
+				startPosition == null
+						? asList( pattern, source )
+						: asList( pattern, source, startPosition ),
 				null,
 				getQueryEngine()
 		);
@@ -2039,7 +2045,7 @@ public SqmPath<?> version(Path<?> path) {
 
 	@Override
 	public <T> SqmFunction<T> function(String name, Class<T> type, Expression<?>[] args) {
-		final BasicType<T> resultType = getTypeConfiguration().standardBasicTypeForJavaType( type );
+		final var resultType = getTypeConfiguration().standardBasicTypeForJavaType( type );
 		return getFunctionTemplate( name, resultType ).generateSqmExpression(
 				expressionList( args ),
 				resultType,
@@ -2048,7 +2054,7 @@ public <T> SqmFunction<T> function(String name, Class<T> type, Expression<?>[] a
 	}
 
 	private <T> SqmFunctionDescriptor getFunctionTemplate(String name, BasicType<T> resultType) {
-		final SqmFunctionDescriptor functionTemplate = getFunctionDescriptor( name );
+		final var functionTemplate = getFunctionDescriptor( name );
 		if ( functionTemplate == null ) {
 			return new NamedSqmFunctionDescriptor(
 					name,
@@ -2065,14 +2071,15 @@ private <T> SqmFunctionDescriptor getFunctionTemplate(String name, BasicType<T>
 
 	private static List<SqmExpression<?>> expressionList(Expression<?>[] jpaExpressions) {
 		if ( jpaExpressions == null || jpaExpressions.length == 0 ) {
-			return Collections.emptyList();
+			return emptyList();
 		}
-
-		final ArrayList<SqmExpression<?>> sqmExpressions = new ArrayList<>();
-		for ( Expression<?> jpaExpression : jpaExpressions ) {
-			sqmExpressions.add( (SqmExpression<?>) jpaExpression );
+		else {
+			final ArrayList<SqmExpression<?>> sqmExpressions = new ArrayList<>();
+			for ( var jpaExpression : jpaExpressions ) {
+				sqmExpressions.add( (SqmExpression<?>) jpaExpression );
+			}
+			return sqmExpressions;
 		}
-		return sqmExpressions;
 	}
 
 	@Override
@@ -2127,8 +2134,11 @@ public <T> SqmExpression<T> value(@Nullable T value, @Nullable SqmExpression<? e
 		}
 	}
 
-	private <E> SqmExpression<? extends Collection<?>> collectionValue(Collection<E> value, SqmExpression<E> typeInferenceSource) {
-		return inlineValue( value ) ? collectionLiteral( value.toArray() ) : collectionValueParameter( value, typeInferenceSource );
+	private <E> SqmExpression<? extends Collection<?>> collectionValue(
+			Collection<E> value, SqmExpression<E> typeInferenceSource) {
+		return inlineValue( value )
+				? collectionLiteral( value.toArray() )
+				: collectionValueParameter( value, typeInferenceSource );
 	}
 
 	@Override
@@ -2166,15 +2176,16 @@ else if ( bindableType instanceof SqmExpressible<?> expressible ) {
 			@Nullable X value,
 			@Nullable SqmExpression<T> typeInferenceSource,
 			TypeConfiguration typeConfiguration) {
-
 		if ( typeInferenceSource != null ) {
 			if ( typeInferenceSource instanceof BindableType ) {
 				//noinspection unchecked
 				return (BindableType<T>) typeInferenceSource;
 			}
-			final SqmBindableType<T> nodeType = typeInferenceSource.getExpressible();
-			if ( nodeType != null ) {
-				return nodeType;
+			else {
+				final var nodeType = typeInferenceSource.getExpressible();
+				if ( nodeType != null ) {
+					return nodeType;
+				}
 			}
 		}
 
@@ -2195,36 +2206,44 @@ private <T> ValueBindJpaCriteriaParameter<T> valueParameter(@Nullable T value, @
 			final var widerType = (BindableType<? super T>) bindableType;
 			return new ValueBindJpaCriteriaParameter<>( widerType, value, this );
 		}
-		final T coercedValue =
-				resolveExpressible( bindableType ).getExpressibleJavaType()
-						.coerce( value, this::getTypeConfiguration );
-		// ignore typeInferenceSource and fall back the value type
-		if ( isInstance( bindableType, coercedValue ) ) {
-			@SuppressWarnings("unchecked") // safe, we just checked
-			final var widerType = (BindableType<? super T>) bindableType;
-			return new ValueBindJpaCriteriaParameter<>( widerType, coercedValue, this );
+		else {
+			final var javaType = resolveExpressible( bindableType ).getExpressibleJavaType();
+			final Object coercedValue = javaType.coerce( value );
+			// ignore typeInferenceSource and fall back to the value type
+			if ( isInstance( bindableType, coercedValue ) ) {
+				@SuppressWarnings("unchecked") // safe, we just checked
+				final var widerType = (BindableType<? super T>) bindableType;
+				return new ValueBindJpaCriteriaParameter<>( widerType, javaType.cast( coercedValue ), this );
+			}
+			else {
+				return new ValueBindJpaCriteriaParameter<>( getParameterBindType( value ), value, this );
+			}
 		}
-		return new ValueBindJpaCriteriaParameter<>( getParameterBindType( value ), value, this );
 	}
 
 	private <E> ValueBindJpaCriteriaParameter<? extends Collection<E>> collectionValueParameter(Collection<E> value, SqmExpression<E> elementTypeInferenceSource) {
-		BindableType<E> bindableType = null;
+		final var elementType =
+				resolveExpressible( bindableType( elementTypeInferenceSource ) )
+						.getSqmType();
+		if ( elementType == null ) {
+			throw new UnsupportedOperationException( "Can't infer collection type based on element expression: " + elementTypeInferenceSource );
+		}
+		final var collectionType = DdlTypeHelper.resolveListType( elementType, getTypeConfiguration() );
+		//noinspection unchecked
+		return new ValueBindJpaCriteriaParameter<>( (BasicType<Collection<E>>) collectionType, value, this );
+	}
+
+	private static <E> BindableType<E> bindableType(SqmExpression<E> elementTypeInferenceSource) {
 		if ( elementTypeInferenceSource != null ) {
 			if ( elementTypeInferenceSource instanceof BindableType ) {
 				//noinspection unchecked
-				bindableType = (BindableType<E>) elementTypeInferenceSource;
+				return (BindableType<E>) elementTypeInferenceSource;
 			}
 			else if ( elementTypeInferenceSource.getNodeType() != null ) {
-				bindableType = elementTypeInferenceSource.getNodeType();
+				return elementTypeInferenceSource.getNodeType();
 			}
 		}
-		final DomainType<E> elementType = resolveExpressible( bindableType ).getSqmType();
-		if ( elementType == null ) {
-			throw new UnsupportedOperationException( "Can't infer collection type based on element expression: " + elementTypeInferenceSource );
-		}
-		final BasicType<?> collectionType = DdlTypeHelper.resolveListType( elementType, getTypeConfiguration() );
-		//noinspection unchecked
-		return new ValueBindJpaCriteriaParameter<>( (BasicType<Collection<E>>) collectionType, value, this );
+		return null;
 	}
 
 	private <T> ValueBindJpaCriteriaParameter<T> valueParameter(T value) {
@@ -2287,16 +2306,11 @@ public <Y> SqmExpression<Y> nullif(Expression<Y> x, Y y) {
 	}
 
 	private <Y> SqmExpression<Y> createNullifFunctionNode(SqmExpression<Y> first, SqmExpression<Y> second) {
-		final SqmBindableType<? extends Y> bindableType =
-				highestPrecedenceType( first.getExpressible(), second.getExpressible() );
+		final var bindableType = highestPrecedenceType( first.getExpressible(), second.getExpressible() );
 		@SuppressWarnings("unchecked")
-		final ReturnableType<Y> resultType =
-				bindableType == null ? null : (ReturnableType<Y>) bindableType.getSqmType();
-		return getFunctionDescriptor( "nullif" ).generateSqmExpression(
-				asList( first, second ),
-				resultType,
-				getQueryEngine()
-		);
+		final var resultType = bindableType == null ? null : (ReturnableType<Y>) bindableType.getSqmType();
+		return getFunctionDescriptor( "nullif" )
+				.generateSqmExpression( asList( first, second ), resultType, getQueryEngine() );
 	}
 
 	private SqmFunctionDescriptor getFunctionDescriptor(String name) {
@@ -2350,12 +2364,13 @@ public SqmPredicate and(Predicate... restrictions) {
 		if ( restrictions == null || restrictions.length == 0 ) {
 			return conjunction();
 		}
-
-		final List<SqmPredicate> predicates = new ArrayList<>( restrictions.length );
-		for ( Predicate expression : restrictions ) {
-			predicates.add( (SqmPredicate) expression );
+		else {
+			final List<SqmPredicate> predicates = new ArrayList<>( restrictions.length );
+			for ( var expression : restrictions ) {
+				predicates.add( (SqmPredicate) expression );
+			}
+			return new SqmJunctionPredicate( Predicate.BooleanOperator.AND, predicates, this );
 		}
-		return new SqmJunctionPredicate( Predicate.BooleanOperator.AND, predicates, this );
 	}
 
 	@Override
@@ -2363,12 +2378,13 @@ public SqmPredicate and(List<Predicate> restrictions) {
 		if ( restrictions == null || restrictions.isEmpty() ) {
 			return conjunction();
 		}
-
-		final List<SqmPredicate> predicates = new ArrayList<>( restrictions.size() );
-		for ( Predicate expression : restrictions ) {
-			predicates.add( (SqmPredicate) expression );
+		else {
+			final List<SqmPredicate> predicates = new ArrayList<>( restrictions.size() );
+			for ( var expression : restrictions ) {
+				predicates.add( (SqmPredicate) expression );
+			}
+			return new SqmJunctionPredicate( Predicate.BooleanOperator.AND, predicates, this );
 		}
-		return new SqmJunctionPredicate( Predicate.BooleanOperator.AND, predicates, this );
 	}
 
 	@Override
@@ -2386,12 +2402,13 @@ public SqmPredicate or(Predicate... restrictions) {
 		if ( restrictions == null || restrictions.length == 0 ) {
 			return disjunction();
 		}
-
-		final List<SqmPredicate> predicates = new ArrayList<>( restrictions.length );
-		for ( Predicate expression : restrictions ) {
-			predicates.add( (SqmPredicate) expression );
+		else {
+			final List<SqmPredicate> predicates = new ArrayList<>( restrictions.length );
+			for ( var expression : restrictions ) {
+				predicates.add( (SqmPredicate) expression );
+			}
+			return new SqmJunctionPredicate( Predicate.BooleanOperator.OR, predicates, this );
 		}
-		return new SqmJunctionPredicate( Predicate.BooleanOperator.OR, predicates, this );
 	}
 
 	@Override
@@ -2399,12 +2416,13 @@ public SqmPredicate or(List<Predicate> restrictions) {
 		if ( restrictions == null || restrictions.isEmpty() ) {
 			return disjunction();
 		}
-
-		final List<SqmPredicate> predicates = new ArrayList<>( restrictions.size() );
-		for ( Predicate expression : restrictions ) {
-			predicates.add( (SqmPredicate) expression );
+		else {
+			final List<SqmPredicate> predicates = new ArrayList<>( restrictions.size() );
+			for ( var expression : restrictions ) {
+				predicates.add( (SqmPredicate) expression );
+			}
+			return new SqmJunctionPredicate( Predicate.BooleanOperator.OR, predicates, this );
 		}
-		return new SqmJunctionPredicate( Predicate.BooleanOperator.OR, predicates, this );
 	}
 
 	@Override
@@ -2465,13 +2483,11 @@ public <Y extends Comparable<? super Y>> SqmPredicate between(Expression<? exten
 
 	@Override
 	public <Y extends Comparable<? super Y>> SqmPredicate between(Expression<? extends Y> value, Y lower, Y upper) {
-		final SqmExpression<? extends Y> valueExpression = (SqmExpression<? extends Y>) value;
-		final SqmExpression<?> lowerExpr = value( lower, valueExpression );
-		final SqmExpression<?> upperExpr = value( upper, valueExpression );
+		final var valueExpression = (SqmExpression<? extends Y>) value;
 		return new SqmBetweenPredicate(
 				valueExpression,
-				lowerExpr,
-				upperExpr,
+				value( lower, valueExpression ),
+				value( upper, valueExpression ),
 				false,
 				this
 		);
@@ -2489,7 +2505,7 @@ public SqmPredicate equal(Expression<?> x, Expression<?> y) {
 
 	@Override
 	public SqmPredicate equal(Expression<?> x, Object y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.EQUAL,
@@ -2510,7 +2526,7 @@ public SqmPredicate notEqual(Expression<?> x, Expression<?> y) {
 
 	@Override
 	public SqmPredicate notEqual(Expression<?> x, Object y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.NOT_EQUAL,
@@ -2531,7 +2547,7 @@ public SqmPredicate distinctFrom(Expression<?> x, Expression<?> y) {
 
 	@Override
 	public SqmPredicate distinctFrom(Expression<?> x, Object y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.DISTINCT_FROM,
@@ -2552,7 +2568,7 @@ public SqmPredicate notDistinctFrom(Expression<?> x, Expression<?> y) {
 
 	@Override
 	public SqmPredicate notDistinctFrom(Expression<?> x, Object y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.NOT_DISTINCT_FROM,
@@ -2573,7 +2589,7 @@ public <Y extends Comparable<? super Y>> SqmPredicate greaterThan(Expression<? e
 
 	@Override
 	public <Y extends Comparable<? super Y>> SqmPredicate greaterThan(Expression<? extends Y> x, Y y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.GREATER_THAN,
@@ -2594,7 +2610,7 @@ public <Y extends Comparable<? super Y>> SqmPredicate greaterThanOrEqualTo(Expre
 
 	@Override
 	public <Y extends Comparable<? super Y>> SqmPredicate greaterThanOrEqualTo(Expression<? extends Y> x, Y y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.GREATER_THAN_OR_EQUAL,
@@ -2615,7 +2631,7 @@ public <Y extends Comparable<? super Y>> SqmPredicate lessThan(Expression<? exte
 
 	@Override
 	public <Y extends Comparable<? super Y>> SqmPredicate lessThan(Expression<? extends Y> x, Y y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.LESS_THAN,
@@ -2636,7 +2652,7 @@ public <Y extends Comparable<? super Y>> SqmPredicate lessThanOrEqualTo(Expressi
 
 	@Override
 	public <Y extends Comparable<? super Y>> SqmPredicate lessThanOrEqualTo(Expression<? extends Y> x, Y y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.LESS_THAN_OR_EQUAL,
@@ -2657,7 +2673,7 @@ public SqmPredicate gt(Expression<? extends Number> x, Expression<? extends Numb
 
 	@Override
 	public SqmPredicate gt(Expression<? extends Number> x, Number y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.GREATER_THAN,
@@ -2678,7 +2694,7 @@ public SqmPredicate ge(Expression<? extends Number> x, Expression<? extends Numb
 
 	@Override
 	public SqmPredicate ge(Expression<? extends Number> x, Number y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.GREATER_THAN_OR_EQUAL,
@@ -2699,7 +2715,7 @@ public SqmPredicate lt(Expression<? extends Number> x, Expression<? extends Numb
 
 	@Override
 	public SqmPredicate lt(Expression<? extends Number> x, Number y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.LESS_THAN,
@@ -2720,7 +2736,7 @@ public SqmPredicate le(Expression<? extends Number> x, Expression<? extends Numb
 
 	@Override
 	public SqmPredicate le(Expression<? extends Number> x, Number y) {
-		final SqmExpression<?> yExpr = value( y, (SqmExpression<?>) x );
+		final var yExpr = value( y, (SqmExpression<?>) x );
 		return new SqmComparisonPredicate(
 				(SqmExpression<?>) x,
 				ComparisonOperator.LESS_THAN_OR_EQUAL,
@@ -3029,7 +3045,7 @@ public <T> SqmInPredicate<T> in(Expression<? extends T> expression) {
 	@SuppressWarnings("unchecked")
 	public <T> SqmInPredicate<T> in(Expression<? extends T> expression, Expression<? extends T>... values) {
 		final List<SqmExpression<T>> listExpressions = new ArrayList<>( values.length );
-		for ( Expression<? extends T> value : values ) {
+		for ( var value : values ) {
 			listExpressions.add( (SqmExpression<T>) value );
 		}
 		return new SqmInListPredicate<>( (SqmExpression<T>) expression, listExpressions, this );
@@ -3038,7 +3054,7 @@ public <T> SqmInPredicate<T> in(Expression<? extends T> expression, Expression<?
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> SqmInPredicate<T> in(Expression<? extends T> expression, T... values) {
-		final SqmExpression<T> sqmExpression = (SqmExpression<T>) expression;
+		final var sqmExpression = (SqmExpression<T>) expression;
 		final List<SqmExpression<T>> listExpressions = new ArrayList<>( values.length );
 		for ( T value : values ) {
 			listExpressions.add( value( value, sqmExpression ) );
@@ -3049,7 +3065,7 @@ public <T> SqmInPredicate<T> in(Expression<? extends T> expression, T... values)
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> SqmInPredicate<T> in(Expression<? extends T> expression, Collection<T> values) {
-		final SqmExpression<T> sqmExpression = (SqmExpression<T>) expression;
+		final var sqmExpression = (SqmExpression<T>) expression;
 		final List<SqmExpression<T>> listExpressions = new ArrayList<>( values.size() );
 		for ( T value : values ) {
 			listExpressions.add( value( value, sqmExpression ) );
@@ -3129,7 +3145,7 @@ public <T> SqmFunction<T> sql(String pattern, Class<T> type, Expression<?>... ar
 
 	@Override
 	public SqmFunction<String> format(Expression<? extends TemporalAccessor> datetime, String pattern) {
-		final SqmFormat sqmFormat = new SqmFormat( pattern, getStringType(), this );
+		final var sqmFormat = new SqmFormat( pattern, getStringType(), this );
 		return getFunctionDescriptor( "format" ).generateSqmExpression(
 				asList( (SqmExpression<?>) datetime, sqmFormat ),
 				null,
@@ -3330,9 +3346,9 @@ public SqmFunction<String> overlay(
 			Expression<String> replacement,
 			Expression<Integer> start,
 			@Nullable Expression<Integer> length) {
-		SqmExpression<String> sqmString = (SqmExpression<String>) string;
-		SqmExpression<String> sqmReplacement = (SqmExpression<String>) replacement;
-		SqmExpression<Integer> sqmStart = (SqmExpression<Integer>) start;
+		final var sqmString = (SqmExpression<String>) string;
+		final var sqmReplacement = (SqmExpression<String>) replacement;
+		final var sqmStart = (SqmExpression<Integer>) start;
 		return getFunctionDescriptor( "overlay" ).generateSqmExpression(
 				( length == null
 						? asList( sqmString, sqmReplacement, sqmStart )
@@ -3403,9 +3419,9 @@ public SqmFunction<String> pad(
 			Expression<String> x,
 			Expression<Integer> length,
 			@Nullable Expression<Character> padChar) {
-		SqmExpression<String> source = (SqmExpression<String>) x;
-		SqmExpression<Integer> sqmLength = (SqmExpression<Integer>) length;
-		SqmTrimSpecification padSpec = new SqmTrimSpecification(
+		final var source = (SqmExpression<String>) x;
+		final var sqmLength = (SqmExpression<Integer>) length;
+		final var padSpec = new SqmTrimSpecification(
 				ts == null ? TrimSpec.TRAILING : fromCriteriaTrimSpec( ts ),
 				this
 		);
@@ -3884,24 +3900,21 @@ public <T> SqmExpression<T> functionWithinGroup(
 			@Nullable JpaPredicate filter,
 			@Nullable JpaWindow window,
 			Expression<?>... args) {
-		SqmOrderByClause withinGroupClause = new SqmOrderByClause();
+		final var withinGroupClause = new SqmOrderByClause();
 		if ( order != null ) {
 			withinGroupClause.addSortSpecification( (SqmSortSpecification) order );
 		}
-		SqmPredicate sqmFilter = filter != null ? (SqmPredicate) filter : null;
-		SqmExpression<T> function = getFunctionDescriptor( name ).generateOrderedSetAggregateSqmExpression(
-				expressionList( args ),
-				sqmFilter,
-				withinGroupClause,
-				null,
-				queryEngine
-		);
-		if ( window == null ) {
-			return function;
-		}
-		else {
-			return new SqmOver<>( function, (SqmWindow) window );
-		}
+		final var sqmFilter = filter != null ? (SqmPredicate) filter : null;
+		final SqmExpression<T> function =
+				getFunctionDescriptor( name )
+						.generateOrderedSetAggregateSqmExpression(
+								expressionList( args ),
+								sqmFilter,
+								withinGroupClause,
+								null,
+								queryEngine
+						);
+		return window == null ? function : new SqmOver<>( function, (SqmWindow) window );
 	}
 
 	@Override
@@ -4692,6 +4705,67 @@ public <T> SqmExpression<T[]> arrayTrim(
 		);
 	}
 
+	@Override
+	public <T> SqmExpression<T[]> arrayReverse(Expression<T[]> arrayExpression) {
+		return getFunctionDescriptor( "array_reverse" ).generateSqmExpression(
+				Collections.singletonList( (SqmExpression<?>) arrayExpression ),
+				null,
+				queryEngine
+		);
+	}
+
+	@Override
+	public <T> SqmExpression<T[]> arraySort(Expression<T[]> arrayExpression) {
+		return getFunctionDescriptor( "array_sort" ).generateSqmExpression(
+				Collections.singletonList( (SqmExpression<?>) arrayExpression ),
+				null,
+				queryEngine
+		);
+	}
+
+	@Override
+	public <T> SqmExpression<T[]> arraySort(Expression<T[]> arrayExpression, boolean descending) {
+		return getFunctionDescriptor( "array_sort" ).generateSqmExpression(
+				asList( (SqmExpression<?>) arrayExpression, value( descending ) ),
+				null,
+				queryEngine
+		);
+	}
+
+	@Override
+	public <T> SqmExpression<T[]> arraySort(Expression<T[]> arrayExpression, Expression<Boolean> descendingExpression) {
+		return getFunctionDescriptor( "array_sort" ).generateSqmExpression(
+				asList( (SqmExpression<?>) arrayExpression, (SqmExpression<?>) descendingExpression ),
+				null,
+				queryEngine
+		);
+	}
+
+	@Override
+	public <T> SqmExpression<T[]> arraySort(Expression<T[]> arrayExpression, boolean descending, boolean nullsFirst) {
+		return getFunctionDescriptor( "array_sort" ).generateSqmExpression(
+				asList( (SqmExpression<?>) arrayExpression, value( descending ), value( nullsFirst ) ),
+				null,
+				queryEngine
+		);
+	}
+
+	@Override
+	public <T> SqmExpression<T[]> arraySort(
+			Expression<T[]> arrayExpression,
+			Expression<Boolean> descendingExpression,
+			Expression<Boolean> nullsFirstExpression) {
+		return getFunctionDescriptor( "array_sort" ).generateSqmExpression(
+				asList(
+						(SqmExpression<?>) arrayExpression,
+						(SqmExpression<?>) descendingExpression,
+						(SqmExpression<?>) nullsFirstExpression
+				),
+				null,
+				queryEngine
+		);
+	}
+
 	@Override
 	public <T> SqmExpression<T[]> arrayTrim(Expression<T[]> arrayExpression, Integer elementCount) {
 		return getFunctionDescriptor( "array_trim" ).generateSqmExpression(
@@ -5378,6 +5452,74 @@ public <C extends Collection<?>> SqmExpression<C> collectionTrim(
 		);
 	}
 
+	@Override
+	public <C extends Collection<?>> SqmExpression<C> collectionReverse(Expression<C> collectionExpression) {
+		return getFunctionDescriptor( "array_reverse" ).generateSqmExpression(
+				Collections.singletonList( (SqmExpression<?>) collectionExpression ),
+				null,
+				queryEngine
+		);
+	}
+
+	@Override
+	public <C extends Collection<?>> SqmExpression<C> collectionSort(Expression<C> collectionExpression) {
+		return getFunctionDescriptor( "array_sort" ).generateSqmExpression(
+				Collections.singletonList( (SqmExpression<?>) collectionExpression ),
+				null,
+				queryEngine
+		);
+	}
+
+	@Override
+	public <C extends Collection<?>> SqmExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			boolean descending) {
+		return getFunctionDescriptor( "array_sort" ).generateSqmExpression(
+				asList( (SqmExpression<?>) collectionExpression, value( descending ) ),
+				null,
+				queryEngine
+		);
+	}
+
+	@Override
+	public <C extends Collection<?>> SqmExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			Expression<Boolean> descendingExpression) {
+		return getFunctionDescriptor( "array_sort" ).generateSqmExpression(
+				asList( (SqmExpression<?>) collectionExpression, (SqmExpression<?>) descendingExpression ),
+				null,
+				queryEngine
+		);
+	}
+
+	@Override
+	public <C extends Collection<?>> SqmExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			boolean descending,
+			boolean nullsFirst) {
+		return getFunctionDescriptor( "array_sort" ).generateSqmExpression(
+				asList( (SqmExpression<?>) collectionExpression, value( descending ), value( nullsFirst ) ),
+				null,
+				queryEngine
+		);
+	}
+
+	@Override
+	public <C extends Collection<?>> SqmExpression<C> collectionSort(
+			Expression<C> collectionExpression,
+			Expression<Boolean> descendingExpression,
+			Expression<Boolean> nullsFirstExpression) {
+		return getFunctionDescriptor( "array_sort" ).generateSqmExpression(
+				asList(
+						(SqmExpression<?>) collectionExpression,
+						(SqmExpression<?>) descendingExpression,
+						(SqmExpression<?>) nullsFirstExpression
+				),
+				null,
+				queryEngine
+		);
+	}
+
 	@Override
 	public <T> SqmExpression<Collection<T>> collectionFill(
 			Expression<T> elementExpression,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmInterpretationsKey.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmInterpretationsKey.java
index a3611784e15b..955bd59886f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmInterpretationsKey.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmInterpretationsKey.java
@@ -24,14 +24,14 @@ public final class SqmInterpretationsKey implements QueryInterpretationCache.Key
 	public static SqmInterpretationsKey createInterpretationsKey(InterpretationsKeySource keySource) {
 		if ( isCacheable ( keySource ) ) {
 			final Object query = keySource.getQueryStringCacheKey();
-			final int hashCode = query instanceof SqmStatement<?> statement ? statement.cacheHashCode() : query.hashCode();
 			return new SqmInterpretationsKey(
 					query,
 					keySource.unnamedParameterIndices(),
-					hashCode,
+					query instanceof SqmStatement<?> statement ? statement.cacheHashCode() : query.hashCode(),
 					keySource.getResultType(),
 					keySource.getQueryOptions().getLockOptions(),
-					memoryEfficientDefensiveSetCopy( keySource.getLoadQueryInfluencers().getEnabledFetchProfileNames() )
+					memoryEfficientDefensiveSetCopy( keySource.getLoadQueryInfluencers().getEnabledFetchProfileNames() ),
+					keySource.getLoadQueryInfluencers().getTemporalIdentifier() != null
 			);
 		}
 		else {
@@ -89,19 +89,22 @@ public static QueryInterpretationCache.Key generateNonSelectKey(InterpretationsK
 	private final Class<?> resultType;
 	private final LockOptions lockOptions;
 	private final Collection<String> enabledFetchProfiles;
+	private final boolean historical;
 	private final int hashCode;
 
 	private SqmInterpretationsKey(
 			Object query,
 			int @Nullable [] unnamedParameterIndices,
-			int hash,
+			int hashCode,
 			Class<?> resultType,
 			LockOptions lockOptions,
-			Collection<String> enabledFetchProfiles) {
+			Collection<String> enabledFetchProfiles,
+			boolean historical) {
+		this.historical = historical;
 		assert query.getClass() == String.class || query instanceof SqmStatement<?>;
 		this.query = query;
 		this.unnamedParameterIndices = unnamedParameterIndices;
-		this.hashCode = hash;
+		this.hashCode = hashCode;
 		this.resultType = resultType;
 		this.lockOptions = lockOptions;
 		this.enabledFetchProfiles = enabledFetchProfiles;
@@ -116,7 +119,8 @@ public QueryInterpretationCache.Key prepareForStore() {
 				resultType,
 				// Since lock options might be mutable, we need a copy for the cache key
 				lockOptions.makeDefensiveCopy(),
-				enabledFetchProfiles
+				enabledFetchProfiles,
+				historical
 		);
 	}
 
@@ -140,7 +144,8 @@ public boolean equals(Object other) {
 			&& Arrays.equals( this.unnamedParameterIndices, that.unnamedParameterIndices )
 			&& Objects.equals( this.resultType, that.resultType )
 			&& Objects.equals( this.lockOptions, that.lockOptions )
-			&& Objects.equals( this.enabledFetchProfiles, that.enabledFetchProfiles );
+			&& Objects.equals( this.enabledFetchProfiles, that.enabledFetchProfiles )
+			&& this.historical == that.historical;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmQueryImpl.java
index 6c93e3fca5e4..f7e2b839359a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmQueryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmQueryImpl.java
@@ -111,13 +111,13 @@ public class SqmQueryImpl<R>
 		implements SqmQueryImplementor<R>, InterpretationsKeySource, DomainQueryExecutionContext {
 
 	private final String hql;
-	private Object queryStringCacheKey;
-	private SqmStatement<R> sqm;
+	private final Object queryStringCacheKey;
+	private final SqmStatement<R> sqm;
 
-	private ParameterMetadataImplementor parameterMetadata;
-	private DomainParameterXref domainParameterXref;
+	private final ParameterMetadataImplementor parameterMetadata;
+	private final DomainParameterXref domainParameterXref;
 
-	private QueryParameterBindings parameterBindings;
+	private final QueryParameterBindings parameterBindings;
 
 	private final Class<R> resultType;
 	private final TupleMetadata tupleMetadata;
@@ -260,20 +260,20 @@ public SqmStatement<R> getSqmStatement() {
 		return sqm;
 	}
 
-	@Override
-	protected void setSqmStatement(SqmSelectStatement<R> sqm) {
-		this.sqm = sqm;
-		this.queryStringCacheKey = sqm;
-
-		final var oldParameterBindings = parameterBindings;
-		domainParameterXref = DomainParameterXref.from( sqm );
-		parameterMetadata =
-				domainParameterXref.hasParameters()
-						? new ParameterMetadataImpl( domainParameterXref.getQueryParameters() )
-						: ParameterMetadataImpl.EMPTY;
-		parameterBindings = parameterMetadata.createBindings( getSessionFactory() );
-		copyParameterBindings( oldParameterBindings );
-	}
+//	@Override
+//	protected void setSqmStatement(SqmSelectStatement<R> sqm) {
+//		this.sqm = sqm;
+//		this.queryStringCacheKey = sqm;
+//
+//		final var oldParameterBindings = parameterBindings;
+//		domainParameterXref = DomainParameterXref.from( sqm );
+//		parameterMetadata =
+//				domainParameterXref.hasParameters()
+//						? new ParameterMetadataImpl( domainParameterXref.getQueryParameters() )
+//						: ParameterMetadataImpl.EMPTY;
+//		parameterBindings = parameterMetadata.createBindings( getSessionFactory() );
+//		copyParameterBindings( oldParameterBindings );
+//	}
 
 	@Override
 	public DomainParameterXref getDomainParameterXref() {
@@ -516,28 +516,27 @@ protected int doExecuteUpdate() {
 	private NonSelectQueryPlan resolveNonSelectQueryPlan() {
 		// resolve (or make) the QueryPlan.
 
-		NonSelectQueryPlan queryPlan = null;
-
 		final var cacheKey = generateNonSelectKey( this );
 		final var interpretationCache = getInterpretationCache();
 		if ( cacheKey != null ) {
-			queryPlan = interpretationCache.getNonSelectQueryPlan( cacheKey );
-		}
-
-		if ( queryPlan == null ) {
-			queryPlan = buildNonSelectQueryPlan();
-			if ( cacheKey != null ) {
-				interpretationCache.cacheNonSelectQueryPlan( cacheKey, queryPlan );
+			final var queryPlan = interpretationCache.getNonSelectQueryPlan( cacheKey );
+			if ( queryPlan != null ) {
+				return queryPlan;
 			}
 		}
 
+
+		final var queryPlan = buildNonSelectQueryPlan();
+		if ( cacheKey != null ) {
+			interpretationCache.cacheNonSelectQueryPlan( cacheKey, queryPlan );
+		}
 		return queryPlan;
 	}
 
 	private NonSelectQueryPlan buildNonSelectQueryPlan() {
 		// to get here the SQM statement has already been validated to be
 		// a non-select variety...
-		final SqmStatement<R> sqmStatement = getSqmStatement();
+		final var sqmStatement = getSqmStatement();
 		if ( sqmStatement instanceof SqmDeleteStatement<?> ) {
 			return buildDeleteQueryPlan();
 		}
@@ -562,11 +561,11 @@ private NonSelectQueryPlan buildDeleteQueryPlan() {
 
 	private NonSelectQueryPlan buildConcreteDeleteQueryPlan(SqmDeleteStatement<?> deleteStatement) {
 		final var entityDomainType = deleteStatement.getTarget().getModel();
-		String entityDomainType1 = entityDomainType.getHibernateEntityName();
-		final var persister = getMappingMetamodel().getEntityDescriptor( entityDomainType1 );
+		final String entityName = entityDomainType.getHibernateEntityName();
+		final var persister = getMappingMetamodel().getEntityDescriptor( entityName );
 		final var multiTableStrategy = persister.getSqmMultiTableMutationStrategy();
 		return multiTableStrategy != null
-				// NOTE : MultiTableDeleteQueryPlan and SqmMultiTableMutationStrategy already handle soft-deletes internally
+				// NOTE: MultiTableDeleteQueryPlan and SqmMultiTableMutationStrategy already handle soft-deletes internally
 				? new MultiTableDeleteQueryPlan( deleteStatement, domainParameterXref, multiTableStrategy )
 				: new SimpleDeleteQueryPlan( persister, deleteStatement, domainParameterXref );
 	}
@@ -581,8 +580,8 @@ private NonSelectQueryPlan buildAggregatedDeleteQueryPlan(SqmDeleteStatement<?>[
 
 	private NonSelectQueryPlan buildUpdateQueryPlan() {
 		final var sqmUpdate = (SqmUpdateStatement<R>) getSqmStatement();
-		String entityDomainType = sqmUpdate.getTarget().getModel().getHibernateEntityName();
-		final var persister = getMappingMetamodel().getEntityDescriptor( entityDomainType );
+		final String entityName = sqmUpdate.getTarget().getModel().getHibernateEntityName();
+		final var persister = getMappingMetamodel().getEntityDescriptor( entityName );
 		final var multiTableStrategy = persister.getSqmMultiTableMutationStrategy();
 		return multiTableStrategy == null
 				? new SimpleNonSelectQueryPlan( sqmUpdate, domainParameterXref )
@@ -591,8 +590,8 @@ private NonSelectQueryPlan buildUpdateQueryPlan() {
 
 	private NonSelectQueryPlan buildInsertQueryPlan() {
 		final var sqmInsert = (SqmInsertStatement<R>) getSqmStatement();
-		String entityDomainType = sqmInsert.getTarget().getModel().getHibernateEntityName();
-		final var persister = getMappingMetamodel().getEntityDescriptor( entityDomainType );
+		final String entityName = sqmInsert.getTarget().getModel().getHibernateEntityName();
+		final var persister = getMappingMetamodel().getEntityDescriptor( entityName );
 		if ( useMultiTableInsert( persister, sqmInsert ) ) {
 			return new MultiTableInsertQueryPlan(
 					sqmInsert,
@@ -626,10 +625,11 @@ private boolean useMultiTableInsert(EntityPersister persister, SqmInsertStatemen
 		boolean useMultiTableInsert = persister.hasMultipleTables();
 		if ( !useMultiTableInsert && !isSimpleValuesInsert( sqmInsert, persister ) ) {
 			final var identifierGenerator = persister.getGenerator();
-			if ( identifierGenerator instanceof BulkInsertionCapableIdentifierGenerator
+			if ( identifierGenerator instanceof BulkInsertionCapableIdentifierGenerator bulkInsertionCapableGenerator
 					&& identifierGenerator instanceof OptimizableGenerator optimizableGenerator ) {
 				final var optimizer = optimizableGenerator.getOptimizer();
-				if ( optimizer != null && optimizer.getIncrementSize() > 1 ) {
+				if ( optimizer != null && optimizer.getIncrementSize() > 1
+					|| !bulkInsertionCapableGenerator.supportsBulkInsertionIdentifierGeneration() ) {
 					useMultiTableInsert = !hasIdentifierAssigned( sqmInsert, persister );
 				}
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java
index 073421682a0b..a01366873ae1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java
@@ -41,7 +41,6 @@
 import org.hibernate.query.hql.internal.NamedHqlQueryMementoImpl;
 import org.hibernate.query.internal.DelegatingDomainQueryExecutionContext;
 import org.hibernate.query.internal.ParameterMetadataImpl;
-import org.hibernate.type.BindableType;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
 import org.hibernate.query.spi.HqlInterpretation;
 import org.hibernate.query.spi.ParameterMetadataImplementor;
@@ -85,12 +84,12 @@
 public class SqmSelectionQueryImpl<R> extends AbstractSqmSelectionQuery<R>
 		implements SqmSelectionQueryImplementor<R>, InterpretationsKeySource {
 	private final String hql;
-	private Object queryStringCacheKey;
-	private SqmSelectStatement<R> sqm;
+	private final Object queryStringCacheKey;
+	private final SqmSelectStatement<R> sqm;
 
-	private ParameterMetadataImplementor parameterMetadata;
-	private DomainParameterXref domainParameterXref;
-	private QueryParameterBindings parameterBindings;
+	private final ParameterMetadataImplementor parameterMetadata;
+	private final DomainParameterXref domainParameterXref;
+	private final QueryParameterBindings parameterBindings;
 
 	private final Class<R> expectedResultType;
 	private final Class<?> resultType;
@@ -262,16 +261,14 @@ private <T> void setBindValues(QueryParameter<?> parameter, QueryParameterBindin
 		final var explicitTemporalPrecision = binding.getExplicitTemporalPrecision();
 		if ( explicitTemporalPrecision != null ) {
 			if ( binding.isMultiValued() ) {
-				parameterBinding.setBindValues( binding.getBindValues(), explicitTemporalPrecision,
-						getTypeConfiguration() );
+				parameterBinding.setBindValues( binding.getBindValues(), explicitTemporalPrecision );
 			}
 			else {
 				parameterBinding.setBindValue( binding.getBindValue(), explicitTemporalPrecision );
 			}
 		}
 		else {
-			//noinspection unchecked
-			final var bindType = (BindableType<T>) binding.getBindType();
+			final var bindType = binding.getBindType();
 			if ( binding.isMultiValued() ) {
 				parameterBinding.setBindValues( binding.getBindValues(), bindType );
 			}
@@ -324,20 +321,20 @@ public SqmSelectStatement<R> getSqmStatement() {
 		return sqm;
 	}
 
-	@Override
-	protected void setSqmStatement(SqmSelectStatement<R> sqm) {
-		this.sqm = sqm;
-		this.queryStringCacheKey = sqm;
-
-		final QueryParameterBindings oldParameterBindings = parameterBindings;
-		domainParameterXref = DomainParameterXref.from( sqm );
-		parameterMetadata =
-				domainParameterXref.hasParameters()
-						? new ParameterMetadataImpl( domainParameterXref.getQueryParameters() )
-						: ParameterMetadataImpl.EMPTY;
-		parameterBindings = parameterMetadata.createBindings( getSessionFactory() );
-		copyParameterBindings( oldParameterBindings );
-	}
+//	@Override
+//	protected void setSqmStatement(SqmSelectStatement<R> sqm) {
+//		this.sqm = sqm;
+//		this.queryStringCacheKey = sqm;
+//
+//		final QueryParameterBindings oldParameterBindings = parameterBindings;
+//		domainParameterXref = DomainParameterXref.from( sqm );
+//		parameterMetadata =
+//				domainParameterXref.hasParameters()
+//						? new ParameterMetadataImpl( domainParameterXref.getQueryParameters() )
+//						: ParameterMetadataImpl.EMPTY;
+//		parameterBindings = parameterMetadata.createBindings( getSessionFactory() );
+//		copyParameterBindings( oldParameterBindings );
+//	}
 
 	@Override
 	public DomainParameterXref getDomainParameterXref() {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java
index 4fc2e9f03a09..eebc07d6e8d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java
@@ -29,6 +29,7 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.JdbcMapping;
+import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.metamodel.mapping.ModelPartContainer;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
@@ -71,6 +72,7 @@
 import org.hibernate.query.sqm.tree.from.SqmFrom;
 import org.hibernate.query.sqm.tree.from.SqmJoin;
 import org.hibernate.query.sqm.tree.predicate.SqmPredicate;
+import org.hibernate.query.sqm.tree.select.AbstractSqmSelectQuery;
 import org.hibernate.query.sqm.tree.select.SqmQueryGroup;
 import org.hibernate.query.sqm.tree.select.SqmQueryPart;
 import org.hibernate.query.sqm.tree.select.SqmQuerySpec;
@@ -89,11 +91,13 @@
 import org.hibernate.sql.exec.spi.JdbcParametersList;
 import org.hibernate.type.BindableType;
 import org.hibernate.type.JavaObjectType;
+import org.hibernate.type.NullType;
 import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.spi.PrimitiveJavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.internal.BasicTypeImpl;
+import org.hibernate.type.internal.BindingTypeHelper;
 import org.hibernate.type.internal.ConvertedBasicTypeImpl;
 
 import jakarta.persistence.Tuple;
@@ -617,9 +621,9 @@ else if ( domainParamBinding.isMultiValued() ) {
 				}
 			}
 			else {
-				final var jdbcMapping = jdbcMapping( domainParamBinding );
+				final var bindingJdbcMapping = jdbcMapping( domainParamBinding );
 				final BasicValueConverter valueConverter =
-						jdbcMapping == null ? null : jdbcMapping.getValueConverter();
+						bindingJdbcMapping == null ? null : bindingJdbcMapping.getValueConverter();
 				if ( valueConverter != null ) {
 					final Object convertedValue =
 							valueConverter.toRelationalValue( domainParamBinding.getBindValue() );
@@ -627,6 +631,7 @@ else if ( domainParamBinding.isMultiValued() ) {
 						final var jdbcParams = jdbcParamsBinds.get( i );
 						assert jdbcParams.size() == 1;
 						final var jdbcParameter = jdbcParams.get( 0 );
+						final var jdbcMapping = BindingTypeHelper.resolveBindType( bindingJdbcMapping, jdbcParameter );
 						jdbcParameterBindings.addBinding( jdbcParameter,
 								new JdbcParameterBindingImpl( jdbcMapping, convertedValue ) );
 					}
@@ -638,6 +643,7 @@ else if ( domainParamBinding.isMultiValued() ) {
 							final var jdbcParams = jdbcParamsBinds.get( i );
 							for ( int j = 0; j < jdbcParams.size(); j++ ) {
 								final var jdbcParameter = jdbcParams.get( j );
+								final var jdbcMapping = BindingTypeHelper.resolveBindType( bindingJdbcMapping, jdbcParameter );
 								jdbcParameterBindings.addBinding( jdbcParameter,
 										new JdbcParameterBindingImpl( jdbcMapping, bindValue ) );
 							}
@@ -699,10 +705,23 @@ private static void createValueBindings(
 		if ( parameterType == null ) {
 			throw new SqlTreeCreationException( "Unable to interpret mapping-model type for Query parameter: " + domainParam );
 		}
+		final Bindable resolvedParameterType;
+		if ( parameterType instanceof NullType ) {
+			assert jdbcParams.size() == 1;
+			final JdbcMappingContainer expressionType = jdbcParams.get( 0 ).getExpressionType();
+			resolvedParameterType = expressionType == null
+					? parameterType
+					// If the parameter bind type is a NullType, which is a BasicValuedMapping,
+					// the JdbcParameters' expression type must be a BasicValuedMapping, which is a Bindable
+					: (Bindable) expressionType;
+		}
+		else {
+			resolvedParameterType = parameterType;
+		}
 		final int offset =
 				jdbcParameterBindings.registerParametersForEachJdbcValue(
-						bindValue( parameterType, bindValue, session ),
-						parameterType( domainParamBinding, parameterType ),
+						bindValue( resolvedParameterType, bindValue, session ),
+						parameterType( domainParamBinding, resolvedParameterType ),
 						jdbcParams,
 						session
 				);
@@ -858,14 +877,14 @@ public Map<JpaCriteriaParameter<?>, SqmJpaCriteriaParameterWrapper<?>> getJpaCri
 		}
 	}
 
-	public static SqmSortSpecification sortSpecification(SqmSelectStatement<?> sqm, Order<?> order) {
+	public static SqmSortSpecification sortSpecification(AbstractSqmSelectQuery<?> sqm, Order<?> order) {
 		final var items = sqm.getQuerySpec().getSelectClause().getSelectionItems();
 		final var selected = selectedNode( sqm, order ); // does validation by side effect!
 		return createSortSpecification( sqm, order, items, selected );
 	}
 
 	private static SqmSortSpecification createSortSpecification(
-			SqmSelectStatement<?> sqm, Order<?> order, List<SqmSelectableNode<?>> items, SqmSelectableNode<?> selected) {
+			AbstractSqmSelectQuery<?> sqm, Order<?> order, List<SqmSelectableNode<?>> items, SqmSelectableNode<?> selected) {
 		final var builder = sqm.nodeBuilder();
 		if ( order.entityClass() == null ) {
 			// ordering by an element of the select list
@@ -898,7 +917,7 @@ private static SqmSortSpecification createSortSpecification(
 		}
 	}
 
-	private static SqmSelectableNode<?> selectedNode(SqmSelectStatement<?> sqm, Order<?> order) {
+	private static SqmSelectableNode<?> selectedNode(AbstractSqmSelectQuery<?> sqm, Order<?> order) {
 		final int element = order.element();
 		if ( element < 1) {
 			throw new IllegalQueryOperationException("Cannot order by element " + element
@@ -961,7 +980,7 @@ public static Class<?> resolveExpressibleJavaTypeClass(final SqmExpression<?> ex
 	}
 
 	public static <X> SqmPredicate restriction(
-			SqmSelectStatement<X> sqmStatement,
+			AbstractSqmSelectQuery<X> sqmStatement,
 			Class<X> resultType,
 			Restriction<? super X> restriction) {
 		//noinspection unchecked
@@ -978,11 +997,7 @@ public static void validateCriteriaQuery(SqmQueryPart<?> queryPart) {
 				if ( sqmRoots == null || sqmRoots.isEmpty() ) {
 					throw new IllegalArgumentException( "Criteria did not define any query roots" );
 				}
-				// if there is a single root, use that as the selection
-				if ( sqmRoots.size() == 1 ) {
-					selectClause.add( sqmRoots.get( 0 ), null );
-				}
-				else {
+				if ( sqmRoots.size() != 1 ) {
 					throw new IllegalArgumentException( "Criteria has multiple query roots" );
 				}
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/TypecheckUtil.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/TypecheckUtil.java
index 46c3af8fb73f..c789c4911cef 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/TypecheckUtil.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/TypecheckUtil.java
@@ -36,6 +36,7 @@
 import java.time.temporal.TemporalAmount;
 import java.util.Objects;
 
+import static org.hibernate.internal.util.type.PrimitiveWrappers.canonicalize;
 import static org.hibernate.type.descriptor.java.JavaTypeHelper.isUnknown;
 
 /**
@@ -383,26 +384,12 @@ private static boolean isConvertedType(SqmExpressible<?> type) {
 		return type.getSqmType() instanceof ConvertedBasicType<?>;
 	}
 
-	private static Class<?> canonicalize(Class<?> lhs) {
-		return switch (lhs.getCanonicalName()) {
-			case "boolean" -> Boolean.class;
-			case "byte" -> Byte.class;
-			case "short" -> Short.class;
-			case "int" -> Integer.class;
-			case "long" -> Long.class;
-			case "float" -> Float.class;
-			case "double" -> Double.class;
-			case "char" -> Character.class;
-			default -> lhs;
-		};
-	}
-
 	private static boolean isMappedSuperclassTypeAssignable(
 			MappedSuperclassDomainType<?> lhsType,
 			EntityType<?> rhsType,
 			BindingContext bindingContext) {
 
-		for ( ManagedDomainType<?> candidate : lhsType.getSubTypes() ) {
+		for ( var candidate : lhsType.getSubTypes() ) {
 			if ( candidate instanceof EntityType<?> candidateEntityType
 					&& isEntityTypeAssignable( candidateEntityType, rhsType, bindingContext ) ) {
 				return true;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java
index 9d66ce48869e..1d683398789d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java
@@ -4,10 +4,6 @@
  */
 package org.hibernate.query.sqm.mutation.internal;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
@@ -44,18 +40,21 @@
 import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.sql.results.internal.RowTransformerArrayImpl;
 import org.hibernate.sql.results.internal.RowTransformerSingularReturnImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 import org.hibernate.sql.results.spi.RowTransformer;
-
 import org.jboss.logging.Logger;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Helper used to generate the SELECT for selection of an entity's identifier, here specifically intended to be used
  * as the SELECT portion of a multi-table SQM mutation
@@ -162,7 +161,7 @@ public static SqmSelectStatement<?> generateMatchingIdSelectStatement(
 	 * Centralized selection of ids matching the restriction of the DELETE
 	 * or UPDATE SQM query
 	 */
-	public static CacheableSqmInterpretation<SelectStatement, JdbcOperationQuerySelect> createMatchingIdsSelect(
+	public static CacheableSqmInterpretation<SelectStatement, JdbcSelect> createMatchingIdsSelect(
 			SqmDeleteOrUpdateStatement<?> sqmMutationStatement,
 			DomainParameterXref domainParameterXref,
 			DomainQueryExecutionContext executionContext,
@@ -215,7 +214,7 @@ public static CacheableSqmInterpretation<SelectStatement, JdbcOperationQuerySele
 		final SqmTranslation<SelectStatement> translation = translator.translate();
 		final JdbcServices jdbcServices = factory.getJdbcServices();
 		final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment();
-		final SqlAstTranslator<JdbcOperationQuerySelect> sqlAstSelectTranslator = jdbcEnvironment
+		final SqlAstTranslator<JdbcSelect> sqlAstSelectTranslator = jdbcEnvironment
 				.getSqlAstTranslatorFactory()
 				.buildSelectTranslator( factory, translation.getSqlAst() );
 
@@ -267,13 +266,13 @@ public static List<Object> selectMatchingIds(
 			DomainParameterXref domainParameterXref,
 			DomainQueryExecutionContext executionContext) {
 		final MutableObject<JdbcParameterBindings> jdbcParameterBindings = new MutableObject<>();
-		final CacheableSqmInterpretation<SelectStatement, JdbcOperationQuerySelect> interpretation =
+		final CacheableSqmInterpretation<SelectStatement, JdbcSelect> interpretation =
 				createMatchingIdsSelect( sqmMutationStatement, domainParameterXref, executionContext, jdbcParameterBindings );
 		return selectMatchingIds( interpretation, jdbcParameterBindings.get(), executionContext );
 	}
 
 	public static List<Object> selectMatchingIds(
-			CacheableSqmInterpretation<SelectStatement, JdbcOperationQuerySelect> interpretation,
+			CacheableSqmInterpretation<SelectStatement, JdbcSelect> interpretation,
 			JdbcParameterBindings jdbcParameterBindings,
 			DomainQueryExecutionContext executionContext) {
 		final RowTransformer<?> rowTransformer;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java
index 0352bfb705b0..d37343faea72 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java
@@ -4,6 +4,8 @@
  */
 package org.hibernate.query.sqm.mutation.internal;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -42,14 +44,20 @@
 import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.UnionSubclassEntityPersister;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.tree.AbstractUpdateOrDeleteStatement;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
+import org.hibernate.sql.ast.tree.update.Assignment;
+import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 
+import static java.util.Collections.singletonList;
+
 /**
  * @author Steve Ebersole
  */
@@ -171,36 +179,65 @@ private static void visitCollectionTableDeletes(
 			QueryOptions queryOptions,
 			Consumer<JdbcOperationQueryMutation> jdbcOperationConsumer) {
 		final String separateCollectionTable = attributeMapping.getSeparateCollectionTable();
+		// Skip deleting rows in collection tables if cascade delete is enabled
+		if ( separateCollectionTable == null || attributeMapping.getCollectionDescriptor().isCascadeDeleteEnabled() ) {
+			return;
+		}
 		final SessionFactoryImplementor sessionFactory = attributeMapping.getCollectionDescriptor().getFactory();
 		final JdbcServices jdbcServices = sessionFactory.getJdbcServices();
+		// element-collection or many-to-many - delete the collection-table row
+		final NamedTableReference tableReference = new NamedTableReference(
+			separateCollectionTable,
+			DeleteStatement.DEFAULT_ALIAS,
+			true
+		);
 
-		// Skip deleting rows in collection tables if cascade delete is enabled
-		if ( separateCollectionTable != null && !attributeMapping.getCollectionDescriptor().isCascadeDeleteEnabled() ) {
-			// element-collection or many-to-many - delete the collection-table row
-
-			final NamedTableReference tableReference = new NamedTableReference(
-					separateCollectionTable,
-					DeleteStatement.DEFAULT_ALIAS,
-					true
+		final AbstractUpdateOrDeleteStatement sqlAst;
+		if ( attributeMapping.getSoftDeleteMapping() != null ) {
+			final Assignment softDeleteAssignment = attributeMapping
+				.getSoftDeleteMapping()
+				.createSoftDeleteAssignment( tableReference );
+			sqlAst = new UpdateStatement(
+				tableReference,
+				singletonList( softDeleteAssignment ),
+				restrictionProducer.apply( tableReference, attributeMapping )
 			);
-
-			final DeleteStatement sqlAstDelete = new DeleteStatement(
-					tableReference,
-					restrictionProducer.apply( tableReference, attributeMapping )
+		}
+		else {
+			sqlAst = new DeleteStatement(
+				tableReference,
+				restrictionProducer.apply( tableReference, attributeMapping )
 			);
+		}
+		jdbcOperationConsumer.accept(
+			jdbcServices.getJdbcEnvironment()
+				.getSqlAstTranslatorFactory()
+				.buildMutationTranslator( sessionFactory, sqlAst )
+				.translate( jdbcParameterBindings, queryOptions )
+		);
+	}
 
-			jdbcOperationConsumer.accept(
-					jdbcServices.getJdbcEnvironment()
-							.getSqlAstTranslatorFactory()
-							.buildMutationTranslator( sessionFactory, sqlAstDelete )
-							.translate( jdbcParameterBindings, queryOptions )
-			);
+	/**
+	 * Returns the entity descriptors whose soft-delete tables need to be updated.
+	 * Only {@code TABLE_PER_CLASS} requires multiple targets (one per concrete
+	 * subtype table); other inheritance strategies share a single soft-delete table.
+	 */
+	public static List<EntityMappingType> softDeleteTargets(EntityMappingType entityDescriptor) {
+		if ( entityDescriptor.getEntityPersister() instanceof UnionSubclassEntityPersister ) {
+			// TABLE_PER_CLASS: each concrete subtype has its own table with the soft-delete column
+			final var targets = new ArrayList<EntityMappingType>();
+			targets.add( entityDescriptor );
+			targets.addAll( entityDescriptor.getSubMappingTypes() );
+			return targets;
+		}
+		else {
+			return singletonList( entityDescriptor );
 		}
 	}
 
 	public static boolean isId(JdbcMappingContainer type) {
-		return type instanceof EntityIdentifierMapping || type instanceof AttributeMapping attributeMapping
-														&& isPartOfId( attributeMapping );
+		return type instanceof EntityIdentifierMapping
+			|| type instanceof AttributeMapping attributeMapping && isPartOfId( attributeMapping );
 	}
 
 	public static boolean isPartOfId(AttributeMapping attributeMapping) {
@@ -211,7 +248,9 @@ public static boolean isPartOfId(AttributeMapping attributeMapping) {
 
 	public static void forEachSelectableMapping(String prefix, ModelPart modelPart, BiConsumer<String, SelectableMapping> consumer) {
 		if ( modelPart instanceof BasicValuedModelPart basicModelPart ) {
-			if ( basicModelPart.isInsertable() ) {
+			if ( basicModelPart.isInsertable()
+					|| modelPart instanceof AttributeMapping attributeMapping
+							&& isPartOfId( attributeMapping ) ) {
 				consumer.accept( prefix, basicModelPart );
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java
index d36d4c9b1892..59b3f969b731 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/AbstractCteMutationHandler.java
@@ -4,12 +4,6 @@
  */
 package org.hibernate.query.sqm.mutation.internal.cte;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
@@ -26,9 +20,9 @@
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
 import org.hibernate.query.sqm.internal.SqmUtil;
+import org.hibernate.query.sqm.mutation.internal.AbstractMutationHandler;
 import org.hibernate.query.sqm.mutation.internal.MatchingIdSelectionHelper;
 import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter;
-import org.hibernate.query.sqm.mutation.internal.AbstractMutationHandler;
 import org.hibernate.query.sqm.spi.SqmParameterMappingModelResolutionAccess;
 import org.hibernate.query.sqm.tree.SqmDeleteOrUpdateStatement;
 import org.hibernate.query.sqm.tree.expression.SqmExpression;
@@ -54,15 +48,21 @@
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectClause;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.sql.results.internal.RowTransformerSingularReturnImpl;
 import org.hibernate.sql.results.internal.SqlSelectionImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Defines how identifier values are selected from the updatable/deletable tables.
  *
@@ -76,7 +76,7 @@ public abstract class AbstractCteMutationHandler extends AbstractMutationHandler
 	private final Map<QueryParameterImplementor<?>, Map<SqmParameter<?>, List<JdbcParametersList>>> jdbcParamsXref;
 	private final Map<SqmParameter<?>, MappingModelExpressible<?>> resolvedParameterMappingModelTypes;
 
-	private final JdbcOperationQuerySelect select;
+	private final JdbcSelect select;
 
 	public AbstractCteMutationHandler(
 			CteTable cteTable,
@@ -140,7 +140,7 @@ public AbstractCteMutationHandler(
 		final List<DomainResult<?>> domainResults = new ArrayList<>( 1 );
 		final SelectStatement statement = new SelectStatement( querySpec, domainResults );
 		final JdbcServices jdbcServices = factory.getJdbcServices();
-		final SqlAstTranslator<JdbcOperationQuerySelect> translator = jdbcServices.getJdbcEnvironment()
+		final SqlAstTranslator<JdbcSelect> translator = jdbcServices.getJdbcEnvironment()
 				.getSqlAstTranslatorFactory()
 				.buildSelectTranslator( factory, statement );
 
@@ -232,7 +232,7 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 	}
 
 	// For Hibernate Reactive
-	protected JdbcOperationQuerySelect getSelect() {
+	protected JdbcSelect getSelect() {
 		return select;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java
index ffe734e4e842..e34122067812 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java
@@ -91,9 +91,9 @@
 import org.hibernate.sql.ast.tree.select.SortSpecification;
 import org.hibernate.sql.ast.tree.update.Assignment;
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.basic.BasicResult;
 import org.hibernate.sql.results.internal.RowTransformerSingularReturnImpl;
@@ -124,7 +124,7 @@ public class CteInsertHandler implements InsertHandler {
 	private final Map<QueryParameterImplementor<?>, Map<SqmParameter<?>, List<JdbcParametersList>>> jdbcParamsXref;
 	private final Map<SqmParameter<?>, MappingModelExpressible<?>> resolvedParameterMappingModelTypes;
 
-	private final JdbcOperationQuerySelect select;
+	private final JdbcSelect select;
 
 	public CteInsertHandler(
 			CteTable cteTable,
@@ -552,7 +552,7 @@ else if ( !assignsId && entityDescriptor.getGenerator().generatedOnExecution() )
 
 		// Execute the statement
 		final JdbcServices jdbcServices = factory.getJdbcServices();
-		final SqlAstTranslator<JdbcOperationQuerySelect> translator = jdbcServices.getJdbcEnvironment()
+		final SqlAstTranslator<JdbcSelect> translator = jdbcServices.getJdbcEnvironment()
 				.getSqlAstTranslatorFactory()
 				.buildSelectTranslator( factory, statement );
 
@@ -622,7 +622,7 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 	}
 
 	// For Hibernate Reactive
-	protected JdbcOperationQuerySelect getSelect() {
+	protected JdbcSelect getSelect() {
 		return select;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java
index 5605abe65843..ce9ae0b951ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertStrategy.java
@@ -24,80 +24,71 @@
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 
 
-/**
- * @asciidoc
- *
- * {@link SqmMultiTableInsertStrategy} implementation using SQL's modifiable CTE (Common Table Expression)
- * approach to perform the update/delete.  E.g. (using delete):
- *
- * This strategy will create a query like this:
- *
- * ```
- * with hte_entity as (
- * 	select *, next value for sequence from ...
- * ),
- * dml_cte_1 as (
- * 	insert into base_table select e.id, e.base from hte_entity e
- * 	returning id
- * ),
- * dml_cte_2 as (
- *  insert into sub_table select e.id, e.sub1 from hte_entity e
- * 	returning id
- * )
- * select count(*) from dml_cte_1
- * ```
- *
- * if the sequence generator has an optimizer, the optimizer is implemented in SQL like this:
- *
- * ```
- * with hte_entity_raw as (
- * 	select *, row_number() over() from ...
- * ),
- * rows_with_next_val(rn, val) as (
- *  -- then, fetch a sequence value for every row number that needs it
- *  select rn, next value for sequence FROM rows_needing_next_val
- *  where (e.rn-1) % [incrementSize] = 0
- * ),
- * hte_entity as (
- *  select e.*, t.val + (e.rn - t.rn) as id
- *  from hte_entity_raw e
- *  -- join the data against the generated sequence value, based on the row number group they belong to
- *  -- i.e. where the row number is within the increment size
- *  left join rows_with_next_val t ON e.rn - ((e.rn-1) % 10) = t.rn
- * ),
- * dml_cte_1 as (
- * 	insert into base_table select e.id, e.base from hte_entity e
- * 	returning id
- * ),
- * dml_cte_2 as (
- *  insert into sub_table select e.id, e.sub1 from hte_entity e
- * 	returning id
- * )
- * select count(*) from dml_cte_1
- * ```
- *
- * in case the id generator uses identity generation, a row number will be created which should ensure insert ordering
- *
- * ```
- * with hte_entity_raw as (
- * 	select *, row_number() over() from ...
- * ),
- * dml_cte_1 as (
- * 	insert into base_table select e.id, e.base from hte_entity_raw e
- * 	returning id, e.row_number
- * ),
- * with hte_entity as (
- * 	select * from hte_entity e join dml_cte_1 c on e.row_number = c.row_number
- * ),
- * dml_cte_2 as (
- *  insert into sub_table select c.id, e.sub1 from hte_entity e
- * 	returning id
- * )
- * select count(*) from dml_cte_1
- * ```
- *
- * @author Christian Beikov
- */
+/// [SqmMultiTableInsertStrategy] implementation using SQL's modifiable CTE (Common Table Expression)
+/// approach to perform the update/delete.  E.g. (using delete):
+///
+/// This strategy will create a query like this:
+/// ```sql
+/// with hte_entity as (
+/// 	select *, next value for sequence from ...
+/// ),
+/// dml_cte_1 as (
+/// 	insert into base_table select e.id, e.base from hte_entity e
+/// 	returning id
+/// ),
+/// dml_cte_2 as (
+///  insert into sub_table select e.id, e.sub1 from hte_entity e
+/// 	returning id
+/// )
+/// select count(*) from dml_cte_1
+/// ```
+/// if the sequence generator has an optimizer, the optimizer is implemented in SQL like this:
+/// ```sql
+/// with hte_entity_raw as (
+/// 	select *, row_number() over() from ...
+/// ),
+/// rows_with_next_val(rn, val) as (
+///  -- then, fetch a sequence value for every row number that needs it
+///  select rn, next value for sequence FROM rows_needing_next_val
+///  where (e.rn-1) % [incrementSize] = 0
+/// ),
+/// hte_entity as (
+///  select e.*, t.val + (e.rn - t.rn) as id
+///  from hte_entity_raw e
+///  -- join the data against the generated sequence value, based on the row number group they belong to
+///  -- i.e. where the row number is within the increment size
+///  left join rows_with_next_val t ON e.rn - ((e.rn-1) % 10) = t.rn
+/// ),
+/// dml_cte_1 as (
+/// 	insert into base_table select e.id, e.base from hte_entity e
+/// 	returning id
+/// ),
+/// dml_cte_2 as (
+///  insert into sub_table select e.id, e.sub1 from hte_entity e
+/// 	returning id
+/// )
+/// select count(*) from dml_cte_1
+/// ```
+/// in case the id generator uses identity generation, a row number will be created which should ensure insert ordering
+/// ```sql
+/// with hte_entity_raw as (
+/// 	select *, row_number() over() from ...
+/// ),
+/// dml_cte_1 as (
+/// 	insert into base_table select e.id, e.base from hte_entity_raw e
+/// 	returning id, e.row_number
+/// ),
+/// with hte_entity as (
+/// 	select * from hte_entity e join dml_cte_1 c on e.row_number = c.row_number
+/// ),
+/// dml_cte_2 as (
+///  insert into sub_table select c.id, e.sub1 from hte_entity e
+/// 	returning id
+/// )
+/// select count(*) from dml_cte_1
+/// ```
+///
+/// @author Christian Beikov
 public class CteInsertStrategy implements SqmMultiTableInsertStrategy {
 	public static final String SHORT_NAME = "cte";
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java
index 7d53030403bb..72eec6bc2ae3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteMutationStrategy.java
@@ -23,34 +23,29 @@
 import org.hibernate.sql.ast.tree.cte.CteTable;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 
-/**
- * @asciidoc
- *
- * {@link SqmMultiTableMutationStrategy} implementation using SQL's modifiable CTE (Common Table Expression)
- * approach to perform the update/delete.  E.g. (using delete):
- *
- * ````
- * with cte_id (id) as (
- *     select
- *         id
- *     from Person
- *     where condition
- * ), delete_1 as (
- *   delete
- *   from
- *   	Person
- *   where
- *   	(id) in (
- *   		select id
- *   		from cte_id
- *   	)
- *   returning id
- * )
- * select count(*) from cte_id
- * ````
- *
- * @author Christian Beikov
- */
+/// [SqmMultiTableMutationStrategy] implementation using SQL's modifiable CTE (Common Table Expression)
+/// approach to perform the update/delete.  E.g. (using delete):
+/// ```sql
+/// with cte_id (id) as (
+///     select
+///         id
+///     from Person
+///     where condition
+/// ), delete_1 as (
+///   delete
+///   from
+///   	Person
+///   where
+///   	(id) in (
+///   		select id
+///   		from cte_id
+///   	)
+///   returning id
+/// )
+/// select count(*) from cte_id
+/// ````
+///
+/// @author Christian Beikov
 public class CteMutationStrategy implements SqmMultiTableMutationStrategy {
 	public static final String SHORT_NAME = "cte";
 	public static final String ID_TABLE_NAME = "id_cte";
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteSoftDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteSoftDeleteHandler.java
index 2df88cf41b77..375c32a3e002 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteSoftDeleteHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteSoftDeleteHandler.java
@@ -6,6 +6,7 @@
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.MutableObject;
+import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.SoftDeleteMapping;
 import org.hibernate.metamodel.mapping.TableDetails;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
@@ -27,6 +28,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import static org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper.softDeleteTargets;
+
 /**
  * Specialized CteDeleteHandler for soft-delete handling
  *
@@ -50,8 +53,19 @@ protected void applyDmlOperations(
 			CteStatement idSelectCte,
 			SessionFactoryImplementor factory,
 			TableGroup updatingTableGroup) {
-		final SoftDeleteMapping softDeleteMapping = getEntityDescriptor().getSoftDeleteMapping();
-		final TableDetails softDeleteTable = getEntityDescriptor().getSoftDeleteTableDetails();
+		for ( var target : softDeleteTargets( getEntityDescriptor() ) ) {
+			addSoftDeleteCte( statement, idSelectCte, factory, updatingTableGroup, target );
+		}
+	}
+
+	private void addSoftDeleteCte(
+			CteContainer statement,
+			CteStatement idSelectCte,
+			SessionFactoryImplementor factory,
+			TableGroup updatingTableGroup,
+			EntityMappingType entityDescriptor) {
+		final SoftDeleteMapping softDeleteMapping = entityDescriptor.getSoftDeleteMapping();
+		final TableDetails softDeleteTable = entityDescriptor.getSoftDeleteTableDetails();
 		final CteTable dmlResultCte = new CteTable(
 				getCteTableName( softDeleteTable.getTableName() ),
 				idSelectCte.getCteTable().getCteColumns()
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/AbstractInlineHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/AbstractInlineHandler.java
index f31e0028fb97..8f532d58c44e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/AbstractInlineHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/AbstractInlineHandler.java
@@ -20,8 +20,8 @@
 import org.hibernate.query.sqm.tree.SqmDeleteOrUpdateStatement;
 import org.hibernate.query.sqm.tree.expression.SqmParameter;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 
 
 /**
@@ -34,7 +34,7 @@ public abstract class AbstractInlineHandler implements Handler {
 	private final MatchingIdRestrictionProducer matchingIdsPredicateProducer;
 	private final EntityPersister entityDescriptor;
 	private final DomainParameterXref domainParameterXref;
-	private final CacheableSqmInterpretation<SelectStatement, JdbcOperationQuerySelect> matchingIdsInterpretation;
+	private final CacheableSqmInterpretation<SelectStatement, JdbcSelect> matchingIdsInterpretation;
 
 	protected AbstractInlineHandler(
 			MatchingIdRestrictionProducer matchingIdsPredicateProducer,
@@ -95,7 +95,7 @@ protected DomainParameterXref getDomainParameterXref() {
 		return domainParameterXref;
 	}
 
-	protected CacheableSqmInterpretation<SelectStatement, JdbcOperationQuerySelect> getMatchingIdsInterpretation() {
+	protected CacheableSqmInterpretation<SelectStatement, JdbcSelect> getMatchingIdsInterpretation() {
 		return matchingIdsInterpretation;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java
index ca978cc991f2..5a833de31849 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java
@@ -9,16 +9,17 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.MutableInteger;
 import org.hibernate.internal.util.MutableObject;
+import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SoftDeleteMapping;
 import org.hibernate.metamodel.mapping.TableDetails;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
 import org.hibernate.query.sqm.mutation.internal.DeleteHandler;
 import org.hibernate.query.sqm.mutation.internal.MatchingIdSelectionHelper;
+import static org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper.softDeleteTargets;
 import org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper;
 import org.hibernate.query.sqm.tree.delete.SqmDeleteStatement;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
@@ -62,7 +63,9 @@ protected InlineDeleteHandler(
 
 		final SoftDeleteMapping softDeleteMapping = getEntityDescriptor().getSoftDeleteMapping();
 		if ( softDeleteMapping != null ) {
-			tableDeleters.add( createSoftDeleter() );
+			for ( var target : softDeleteTargets( getEntityDescriptor() ) ) {
+				tableDeleters.add( createSoftDeleter( target ) );
+			}
 		}
 		else {
 			// delete from the tables
@@ -124,8 +127,7 @@ protected InlineDeleteHandler(
 		this.tableDeleters = tableDeleters;
 	}
 
-	private TableDeleter createSoftDeleter() {
-		final EntityPersister entityDescriptor = getEntityDescriptor();
+	private TableDeleter createSoftDeleter(EntityMappingType entityDescriptor) {
 		final TableDetails softDeleteTable = entityDescriptor.getSoftDeleteTableDetails();
 		final SoftDeleteMapping softDeleteMapping = entityDescriptor.getSoftDeleteMapping();
 		assert softDeleteMapping != null;
@@ -194,6 +196,7 @@ protected JdbcOperationQueryMutation createMutation(TableDeleter tableDeleter, L
 			statement = new UpdateStatement(
 					updateStatement,
 					updateStatement.getTargetTable(),
+					updateStatement.getMutationTarget(),
 					updateStatement.getFromClause(),
 					updateStatement.getAssignments(),
 					Predicate.combinePredicates(
@@ -216,6 +219,7 @@ protected JdbcOperationQueryMutation createMutation(TableDeleter tableDeleter, L
 			statement = new DeleteStatement(
 					deleteStatement,
 					deleteStatement.getTargetTable(),
+					deleteStatement.getMutationTarget(),
 					deleteStatement.getFromClause(),
 					Predicate.combinePredicates(
 							deleteStatement.getRestriction(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java
index 233c32890c22..e89f4f6825a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java
@@ -439,7 +439,7 @@ private TableUpdater createTableUpdater(
 				);
 			}
 
-			insertSqlAst = new InsertSelectStatement( dmlTableReference );
+			insertSqlAst = new InsertSelectStatement( dmlTableReference, entityPersister );
 			insertSqlAst.addTargetColumnReferences( targetColumnReferences.toArray( new ColumnReference[0] ) );
 			insertSqlAst.setSourceSelectStatement( querySpec );
 		}
@@ -462,6 +462,7 @@ protected JdbcOperationQueryMutation createTableUpdate(
 		final UpdateStatement updateStatement = new UpdateStatement(
 				tableUpdater.updateStatement,
 				tableUpdater.updateStatement.getTargetTable(),
+				tableUpdater.updateStatement.getMutationTarget(),
 				tableUpdater.updateStatement.getFromClause(),
 				tableUpdater.updateStatement.getAssignments(),
 				Predicate.combinePredicates(
@@ -500,6 +501,7 @@ protected JdbcOperationQueryMutation createTableInsert(
 		final InsertSelectStatement insertStatement = new InsertSelectStatement(
 				tableUpdater.nullableInsert,
 				tableUpdater.nullableInsert.getTargetTable(),
+				tableUpdater.nullableInsert.getMutationTarget(),
 				tableUpdater.nullableInsert.getReturningColumns()
 		);
 		final QuerySpec originalQuerySpec = (QuerySpec) tableUpdater.nullableInsert.getSourceSelectStatement();
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java
index da2b5ec53728..51b3fa341044 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/ExecuteWithTemporaryTableHelper.java
@@ -5,19 +5,15 @@
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
 import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.temptable.TemporaryTable;
-import org.hibernate.dialect.temptable.TemporaryTableColumn;
 import org.hibernate.dialect.temptable.TemporaryTableHelper;
 import org.hibernate.dialect.temptable.TemporaryTableHelper.TemporaryTableCreationWork;
 import org.hibernate.dialect.temptable.TemporaryTableHelper.TemporaryTableDropWork;
-import org.hibernate.dialect.temptable.TemporaryTableSessionUidColumn;
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
-import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.jdbc.AbstractReturningWork;
+import org.hibernate.jdbc.AbstractWork;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.query.sqm.ComparisonOperator;
@@ -32,12 +28,10 @@
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.StandardTableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
 import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
-import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.exec.spi.ExecutionContext;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
@@ -45,7 +39,6 @@
 import org.hibernate.sql.results.internal.SqlSelectionImpl;
 
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
 import java.util.UUID;
@@ -68,30 +61,31 @@ public static CacheableSqmInterpretation<InsertSelectStatement, JdbcOperationQue
 			JdbcParameter sessionUidParameter,
 			JdbcParameterBindings jdbcParameterBindings,
 			ExecutionContext executionContext) {
-		final TableGroup mutatingTableGroup = sqmConverter.getMutatingTableGroup();
+		final var mutatingTableGroup = sqmConverter.getMutatingTableGroup();
 		final var mutatingEntityDescriptor = (EntityMappingType) mutatingTableGroup.getModelPart();
 
-		final NamedTableReference idTableReference = new NamedTableReference(
+		final var idTableReference = new NamedTableReference(
 				idTable.getTableExpression(),
 				InsertSelectStatement.DEFAULT_ALIAS
 		);
-		final InsertSelectStatement idTableInsert = new InsertSelectStatement( idTableReference );
+		final var idTableInsert = new InsertSelectStatement( idTableReference,
+				mutatingEntityDescriptor.getEntityPersister() );
 
 		for ( int i = 0; i < idTable.getColumns().size(); i++ ) {
-			final TemporaryTableColumn column = idTable.getColumns().get( i );
+			final var temporaryTableColumn = idTable.getColumns().get( i );
 			idTableInsert.addTargetColumnReferences(
 					new ColumnReference(
 							idTableReference,
-							column.getColumnName(),
+							temporaryTableColumn.getColumnName(),
 							// id columns cannot be formulas and cannot have custom read and write expressions
 							false,
 							null,
-							column.getJdbcMapping()
+							temporaryTableColumn.getJdbcMapping()
 					)
 			);
 		}
 
-		final QuerySpec matchingIdSelection = new QuerySpec( true, 1 );
+		final var matchingIdSelection = new QuerySpec( true, 1 );
 		idTableInsert.setSourceSelectStatement( matchingIdSelection );
 
 		matchingIdSelection.getFromClause().addRoot( mutatingTableGroup );
@@ -113,7 +107,6 @@ public static CacheableSqmInterpretation<InsertSelectStatement, JdbcOperationQue
 				}
 		);
 
-		final SharedSessionContractImplementor session = executionContext.getSession();
 		if ( idTable.getSessionUidColumn() != null ) {
 			final int jdbcPosition = matchingIdSelection.getSelectClause().getSqlSelections().size();
 			matchingIdSelection.getSelectClause().addSqlSelection(
@@ -123,40 +116,7 @@ public static CacheableSqmInterpretation<InsertSelectStatement, JdbcOperationQue
 
 		matchingIdSelection.applyPredicate( suppliedPredicate );
 
-		final var factory = session.getFactory();
-		final JdbcEnvironment jdbcEnvironment = factory.getJdbcServices().getJdbcEnvironment();
-		final LockOptions lockOptions = executionContext.getQueryOptions().getLockOptions();
-		final LockMode lockMode = lockOptions.getLockMode();
-		// Acquire a WRITE lock for the rows that are about to be modified
-		lockOptions.setLockMode( LockMode.WRITE );
-		// Visit the table joins and reset the lock mode if we encounter OUTER joins that are not supported
-		final QueryPart sourceSelectStatement = idTableInsert.getSourceSelectStatement();
-		if ( sourceSelectStatement != null
-			&& !jdbcEnvironment.getDialect().supportsOuterJoinForUpdate() ) {
-			sourceSelectStatement.visitQuerySpecs(
-					querySpec -> {
-						querySpec.getFromClause().visitTableJoins(
-								tableJoin -> {
-									if ( tableJoin.isInitialized()
-										&& tableJoin.getJoinType() != SqlAstJoinType.INNER ) {
-										lockOptions.setLockMode( lockMode );
-									}
-								}
-						);
-					}
-			);
-		}
-		final var jdbcInsert = jdbcEnvironment.getSqlAstTranslatorFactory()
-				.buildMutationTranslator( factory, idTableInsert )
-				.translate( jdbcParameterBindings, executionContext.getQueryOptions() );
-		lockOptions.setLockMode( lockMode );
-
-		return new CacheableSqmInterpretation<>(
-				idTableInsert,
-				jdbcInsert,
-				Map.of(),
-				Map.of()
-		);
+		return createTemporaryTableInsert( idTableInsert, jdbcParameterBindings, executionContext );
 	}
 
 	public static CacheableSqmInterpretation<InsertSelectStatement, JdbcOperationQueryMutation> createTemporaryTableInsert(
@@ -164,74 +124,67 @@ public static CacheableSqmInterpretation<InsertSelectStatement, JdbcOperationQue
 			JdbcParameterBindings jdbcParameterBindings,
 			ExecutionContext executionContext) {
 		final var factory = executionContext.getSession().getFactory();
-		final JdbcServices jdbcServices = factory.getJdbcServices();
-		final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment();
-		final LockOptions lockOptions = executionContext.getQueryOptions().getLockOptions();
-		final LockMode lockMode = lockOptions.getLockMode();
+		final var jdbcEnvironment = factory.getJdbcServices().getJdbcEnvironment();
+		final var lockOptions = executionContext.getQueryOptions().getLockOptions();
+		final var lockMode = lockOptions.getLockMode();
 		// Acquire a WRITE lock for the rows that are about to be modified
 		lockOptions.setLockMode( LockMode.WRITE );
 		// Visit the table joins and reset the lock mode if we encounter OUTER joins that are not supported
-		final QueryPart sourceSelectStatement = temporaryTableInsert.getSourceSelectStatement();
+		final var sourceSelectStatement = temporaryTableInsert.getSourceSelectStatement();
 		if ( sourceSelectStatement != null
 			&& !jdbcEnvironment.getDialect().supportsOuterJoinForUpdate() ) {
-			sourceSelectStatement.visitQuerySpecs(
-					querySpec -> {
-						querySpec.getFromClause().visitTableJoins(
-								tableJoin -> {
-									if ( tableJoin.isInitialized()
-										&& tableJoin.getJoinType() != SqlAstJoinType.INNER ) {
-										lockOptions.setLockMode( lockMode );
-									}
-								}
-						);
+			sourceSelectStatement.visitQuerySpecs( querySpec -> {
+				querySpec.getFromClause().visitTableJoins( tableJoin -> {
+					if ( tableJoin.isInitialized()
+						&& tableJoin.getJoinType() != SqlAstJoinType.INNER ) {
+						lockOptions.setLockMode( lockMode );
 					}
-			);
+				} );
+			} );
 		}
-		final var jdbcInsert = jdbcEnvironment.getSqlAstTranslatorFactory()
-				.buildMutationTranslator( factory, temporaryTableInsert )
-				.translate( jdbcParameterBindings, executionContext.getQueryOptions() );
 		lockOptions.setLockMode( lockMode );
 		return new CacheableSqmInterpretation<>(
 				temporaryTableInsert,
-				jdbcInsert,
+				jdbcEnvironment.getSqlAstTranslatorFactory()
+						.buildMutationTranslator( factory, temporaryTableInsert )
+						.translate( jdbcParameterBindings, executionContext.getQueryOptions() ),
 				Map.of(),
 				Map.of()
 		);
 	}
 
+	@Deprecated(forRemoval = true, since = "7.3") // no longer used
 	public static int saveIntoTemporaryTable(
 			InsertSelectStatement temporaryTableInsert,
 			JdbcParameterBindings jdbcParameterBindings,
 			ExecutionContext executionContext) {
 		final var factory = executionContext.getSession().getFactory();
-		final JdbcServices jdbcServices = factory.getJdbcServices();
-		final JdbcEnvironment jdbcEnvironment = jdbcServices.getJdbcEnvironment();
-		final LockOptions lockOptions = executionContext.getQueryOptions().getLockOptions();
-		final LockMode lockMode = lockOptions.getLockMode();
+		final var jdbcEnvironment = factory.getJdbcServices().getJdbcEnvironment();
+		final var lockOptions = executionContext.getQueryOptions().getLockOptions();
+		final var lockMode = lockOptions.getLockMode();
 		// Acquire a WRITE lock for the rows that are about to be modified
 		lockOptions.setLockMode( LockMode.WRITE );
 		// Visit the table joins and reset the lock mode if we encounter OUTER joins that are not supported
-		final QueryPart sourceSelectStatement = temporaryTableInsert.getSourceSelectStatement();
+		final var sourceSelectStatement = temporaryTableInsert.getSourceSelectStatement();
 		if ( sourceSelectStatement != null
 			&& !jdbcEnvironment.getDialect().supportsOuterJoinForUpdate() ) {
-			sourceSelectStatement.visitQuerySpecs(
-					querySpec -> {
-						querySpec.getFromClause().visitTableJoins(
-								tableJoin -> {
-									if ( tableJoin.isInitialized()
-										&& tableJoin.getJoinType() != SqlAstJoinType.INNER ) {
-										lockOptions.setLockMode( lockMode );
-									}
-								}
-						);
+			sourceSelectStatement.visitQuerySpecs( querySpec -> {
+				querySpec.getFromClause().visitTableJoins( tableJoin -> {
+					if ( tableJoin.isInitialized()
+						&& tableJoin.getJoinType() != SqlAstJoinType.INNER ) {
+						lockOptions.setLockMode( lockMode );
 					}
-			);
+				} );
+			} );
 		}
-		final var jdbcInsert = jdbcEnvironment.getSqlAstTranslatorFactory()
-						.buildMutationTranslator( factory, temporaryTableInsert )
-						.translate( jdbcParameterBindings, executionContext.getQueryOptions() );
 		lockOptions.setLockMode( lockMode );
-		return saveIntoTemporaryTable( jdbcInsert, jdbcParameterBindings, executionContext );
+		return saveIntoTemporaryTable(
+				jdbcEnvironment.getSqlAstTranslatorFactory()
+						.buildMutationTranslator( factory, temporaryTableInsert )
+						.translate( jdbcParameterBindings, executionContext.getQueryOptions() ),
+				jdbcParameterBindings,
+				executionContext
+		);
 	}
 
 	public static int saveIntoTemporaryTable(
@@ -253,7 +206,13 @@ public static QuerySpec createIdTableSelectQuerySpec(
 			JdbcParameter sessionUidParameter,
 			EntityMappingType entityDescriptor,
 			ExecutionContext executionContext) {
-		return createIdTableSelectQuerySpec( idTable, null, sessionUidParameter, entityDescriptor, executionContext );
+		return createIdTableSelectQuerySpec(
+				idTable,
+				null,
+				sessionUidParameter,
+				entityDescriptor,
+				executionContext
+		);
 	}
 
 	public static QuerySpec createIdTableSelectQuerySpec(
@@ -262,14 +221,14 @@ public static QuerySpec createIdTableSelectQuerySpec(
 			JdbcParameter sessionUidParameter,
 			EntityMappingType entityDescriptor,
 			ExecutionContext executionContext) {
-		final QuerySpec querySpec = new QuerySpec( false );
+		final var querySpec = new QuerySpec( false );
 
-		final NamedTableReference idTableReference = new NamedTableReference(
+		final var idTableReference = new NamedTableReference(
 				idTable.getTableExpression(),
 				TemporaryTable.DEFAULT_ALIAS,
 				true
 		);
-		final TableGroup idTableGroup = new StandardTableGroup(
+		final var idTableGroup = new StandardTableGroup(
 				true,
 				new NavigablePath( idTableReference.getTableExpression() ),
 				entityDescriptor,
@@ -282,7 +241,7 @@ public static QuerySpec createIdTableSelectQuerySpec(
 		querySpec.getFromClause().addRoot( idTableGroup );
 
 		applyIdTableSelections( querySpec, idTableReference, idTable, fkModelPart, entityDescriptor );
-		applyIdTableRestrictions( querySpec, idTableReference, idTable, sessionUidParameter, executionContext );
+		applyIdTableRestrictions( querySpec, idTableReference, idTable, sessionUidParameter );
 
 		return querySpec;
 	}
@@ -314,22 +273,20 @@ private static void applyIdTableSelections(
 			}
 		}
 		else {
-			fkModelPart.forEachSelectable(
-					(i, selectableMapping) -> {
-						querySpec.getSelectClause().addSqlSelection(
-								new SqlSelectionImpl(
-										i,
-										new ColumnReference(
-												tableReference,
-												selectableMapping.getSelectionExpression(),
-												false,
-												null,
-												selectableMapping.getJdbcMapping()
-										)
+			fkModelPart.forEachSelectable( (i, selectableMapping) -> {
+				querySpec.getSelectClause().addSqlSelection(
+						new SqlSelectionImpl(
+								i,
+								new ColumnReference(
+										tableReference,
+										selectableMapping.getSelectionExpression(),
+										false,
+										null,
+										selectableMapping.getJdbcMapping()
 								)
-						);
-					}
-			);
+						)
+				);
+			} );
 		}
 	}
 
@@ -337,17 +294,17 @@ private static void applyIdTableRestrictions(
 			QuerySpec querySpec,
 			TableReference idTableReference,
 			TemporaryTable idTable,
-			JdbcParameter sessionUidParameter,
-			ExecutionContext executionContext) {
-		if ( idTable.getSessionUidColumn() != null ) {
+			JdbcParameter sessionUidParameter) {
+		final var sessionUidColumn = idTable.getSessionUidColumn();
+		if ( sessionUidColumn != null ) {
 			querySpec.applyPredicate(
 					new ComparisonPredicate(
 							new ColumnReference(
 									idTableReference,
-									idTable.getSessionUidColumn().getColumnName(),
+									sessionUidColumn.getColumnName(),
 									false,
 									null,
-									idTable.getSessionUidColumn().getJdbcMapping()
+									sessionUidColumn.getJdbcMapping()
 							),
 							ComparisonOperator.EQUAL,
 							sessionUidParameter
@@ -362,7 +319,8 @@ public static void performBeforeTemporaryTableUseActions(
 			ExecutionContext executionContext) {
 		performBeforeTemporaryTableUseActions(
 				temporaryTable,
-				executionContext.getSession().getDialect().getTemporaryTableBeforeUseAction(),
+				executionContext.getSession().getDialect()
+						.getTemporaryTableBeforeUseAction(),
 				executionContext
 		);
 	}
@@ -383,36 +341,21 @@ private static boolean performBeforeTemporaryTableUseActions(
 			BeforeUseAction beforeUseAction,
 			ExecutionContext executionContext) {
 		final var factory = executionContext.getSession().getFactory();
-		final Dialect dialect = factory.getJdbcServices().getDialect();
-		if ( beforeUseAction == BeforeUseAction.CREATE ) {
-			final var temporaryTableCreationWork =
-					new TemporaryTableCreationWork( temporaryTable, factory );
-			final var ddlTransactionHandling = dialect.getTemporaryTableDdlTransactionHandling();
-			if ( ddlTransactionHandling == NONE ) {
-				return executionContext.getSession().doReturningWork( temporaryTableCreationWork );
-			}
-			else {
-				final var isolationDelegate =
-						executionContext.getSession().getJdbcCoordinator().getJdbcSessionOwner()
-								.getTransactionCoordinator().createIsolationDelegate();
-				return isolationDelegate.delegateWork( temporaryTableCreationWork,
-						ddlTransactionHandling == ISOLATE_AND_TRANSACT );
-			}
-		}
-		else {
-			return false;
-		}
+		final var dialect = factory.getJdbcServices().getDialect();
+		return beforeUseAction == BeforeUseAction.CREATE
+			&& doWork( executionContext, dialect,
+				new TemporaryTableCreationWork( temporaryTable, factory ) );
 	}
 
-	public static int[] loadInsertedRowNumbers(
-			TemporaryTable temporaryTable,
-			Function<SharedSessionContractImplementor, String> sessionUidAccess,
-			int rows,
-			ExecutionContext executionContext) {
-		final String sqlSelect =
-				createInsertedRowNumbersSelectSql( temporaryTable, sessionUidAccess, executionContext );
-		return loadInsertedRowNumbers( sqlSelect, temporaryTable, sessionUidAccess, rows, executionContext );
-	}
+//	public static int[] loadInsertedRowNumbers(
+//			TemporaryTable temporaryTable,
+//			Function<SharedSessionContractImplementor, String> sessionUidAccess,
+//			int rows,
+//			ExecutionContext executionContext) {
+//		final String sqlSelect =
+//				createInsertedRowNumbersSelectSql( temporaryTable, sessionUidAccess, executionContext );
+//		return loadInsertedRowNumbers( sqlSelect, temporaryTable, sessionUidAccess, rows, executionContext );
+//	}
 
 	public static int[] loadInsertedRowNumbers(
 			String sqlSelect,
@@ -420,9 +363,9 @@ public static int[] loadInsertedRowNumbers(
 			Function<SharedSessionContractImplementor, String> sessionUidAccess,
 			int rows,
 			ExecutionContext executionContext) {
-		final TemporaryTableSessionUidColumn sessionUidColumn = temporaryTable.getSessionUidColumn();
-		final SharedSessionContractImplementor session = executionContext.getSession();
-		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
+		final var sessionUidColumn = temporaryTable.getSessionUidColumn();
+		final var session = executionContext.getSession();
+		final var jdbcCoordinator = session.getJdbcCoordinator();
 		PreparedStatement preparedStatement = null;
 		try {
 			preparedStatement = jdbcCoordinator.getStatementPreparer().prepareStatement( sqlSelect );
@@ -435,8 +378,8 @@ public static int[] loadInsertedRowNumbers(
 						session
 				);
 			}
-			final ResultSet resultSet = jdbcCoordinator.getResultSetReturn().execute( preparedStatement, sqlSelect );
-			final int[] rowNumbers = new int[rows];
+			final var resultSet = jdbcCoordinator.getResultSetReturn().execute( preparedStatement, sqlSelect );
+			final var rowNumbers = new int[rows];
 			try {
 				int rowIndex = 0;
 				while (resultSet.next()) {
@@ -466,18 +409,19 @@ public static int[] loadInsertedRowNumbers(
 
 	public static String createInsertedRowNumbersSelectSql(
 			TemporaryTable temporaryTable,
-			Function<SharedSessionContractImplementor, String> sessionUidAccess,
 			ExecutionContext executionContext) {
-		final TemporaryTableSessionUidColumn sessionUidColumn = temporaryTable.getSessionUidColumn();
+		final var sessionUidColumn = temporaryTable.getSessionUidColumn();
 
-		final TemporaryTableColumn rowNumberColumn = temporaryTable.getColumns()
-				.get( temporaryTable.getColumns().size() - (sessionUidColumn == null ? 1 : 2 ) );
+		final var rowNumberColumn =
+				temporaryTable.getColumns()
+						.get( temporaryTable.getColumns().size() - (sessionUidColumn == null ? 1 : 2 ) );
 		assert rowNumberColumn != null;
 
-		final SharedSessionContractImplementor session = executionContext.getSession();
-		final SimpleSelect simpleSelect = new SimpleSelect( session.getFactory() )
-				.setTableName( temporaryTable.getQualifiedTableName() )
-				.addColumn( rowNumberColumn.getColumnName() );
+		final var session = executionContext.getSession();
+		final var simpleSelect =
+				new SimpleSelect( session.getFactory() )
+						.setTableName( temporaryTable.getQualifiedTableName() )
+						.addColumn( rowNumberColumn.getColumnName() );
 		if ( sessionUidColumn != null ) {
 			simpleSelect.addRestriction( sessionUidColumn.getColumnName() );
 		}
@@ -490,7 +434,7 @@ public static void performAfterTemporaryTableUseActions(
 			AfterUseAction afterUseAction,
 			ExecutionContext executionContext) {
 		final var factory = executionContext.getSession().getFactory();
-		final Dialect dialect = factory.getJdbcServices().getDialect();
+		final var dialect = factory.getJdbcServices().getDialect();
 		switch ( afterUseAction ) {
 			case CLEAN:
 				TemporaryTableHelper.cleanTemporaryTableRows(
@@ -501,18 +445,43 @@ public static void performAfterTemporaryTableUseActions(
 				);
 				break;
 			case DROP:
-				final var temporaryTableDropWork = new TemporaryTableDropWork( temporaryTable, factory );
-				final var ddlTransactionHandling = dialect.getTemporaryTableDdlTransactionHandling();
-				if ( ddlTransactionHandling == NONE ) {
-					executionContext.getSession().doWork( temporaryTableDropWork );
-				}
-				else {
-					final var isolationDelegate =
-							executionContext.getSession().getJdbcCoordinator().getJdbcSessionOwner()
-									.getTransactionCoordinator().createIsolationDelegate();
-					isolationDelegate.delegateWork( temporaryTableDropWork,
+				doWork( executionContext, dialect,
+						new TemporaryTableDropWork( temporaryTable, factory ) );
+		}
+	}
+
+	private static <T> T doWork(
+			ExecutionContext executionContext, Dialect dialect,
+			AbstractReturningWork<T> temporaryTableCreationWork) {
+		final var ddlTransactionHandling = dialect.getTemporaryTableDdlTransactionHandling();
+		if ( ddlTransactionHandling == NONE ) {
+			return executionContext.getSession().doReturningWork( temporaryTableCreationWork );
+		}
+		else {
+			// this branch is obsolete, since
+			// dialect.getTemporaryTableDdlTransactionHandling()
+			// now always returns NONE
+			return executionContext.getSession().getJdbcCoordinator().getJdbcSessionOwner()
+					.getTransactionCoordinator().createIsolationDelegate()
+					.delegateWork( temporaryTableCreationWork,
+							ddlTransactionHandling == ISOLATE_AND_TRANSACT );
+		}
+	}
+	private static void doWork(
+			ExecutionContext executionContext, Dialect dialect,
+			AbstractWork temporaryTableDropWork) {
+		final var ddlTransactionHandling = dialect.getTemporaryTableDdlTransactionHandling();
+		if ( ddlTransactionHandling == NONE ) {
+			executionContext.getSession().doWork( temporaryTableDropWork );
+		}
+		else {
+			// this branch is obsolete, since
+			// dialect.getTemporaryTableDdlTransactionHandling()
+			// now always returns NONE
+			executionContext.getSession().getJdbcCoordinator().getJdbcSessionOwner()
+					.getTransactionCoordinator().createIsolationDelegate()
+					.delegateWork( temporaryTableDropWork,
 							ddlTransactionHandling == ISOLATE_AND_TRANSACT );
-				}
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java
index f577c35aad04..c0b83f0a861c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedDeleteHandler.java
@@ -6,29 +6,21 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.dialect.temptable.TemporaryTable;
-import org.hibernate.dialect.temptable.TemporaryTableSessionUidColumn;
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.MutableObject;
-import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
-import org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.UnionSubclassEntityPersister;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.spi.QueryParameterImplementor;
 import org.hibernate.query.sqm.internal.CacheableSqmInterpretation;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
-import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
 import org.hibernate.query.sqm.internal.SqmUtil;
 import org.hibernate.query.sqm.mutation.internal.AbstractMutationHandler;
 import org.hibernate.query.sqm.mutation.internal.DeleteHandler;
 import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter;
-import org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper;
 import org.hibernate.query.sqm.mutation.internal.TableKeyExpressionCollector;
 import org.hibernate.query.sqm.mutation.spi.AfterUseAction;
 import org.hibernate.query.sqm.spi.SqmParameterMappingModelResolutionAccess;
@@ -38,13 +30,10 @@
 import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
-import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
 import org.hibernate.sql.ast.tree.from.MutatingTableReferenceGroupWrapper;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
-import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.from.UnionTableReference;
 import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
 import org.hibernate.sql.ast.tree.predicate.InSubQueryPredicate;
@@ -55,7 +44,6 @@
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
 import org.hibernate.sql.exec.spi.ExecutionContext;
-import org.hibernate.sql.exec.spi.JdbcMutationExecutor;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
@@ -69,6 +57,16 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import static org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper.buildColumnReferenceExpression;
+import static org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter.omittingLockingAndPaging;
+import static org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper.visitCollectionTableDeletes;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.createIdTableSelectQuerySpec;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.createMatchingIdsIntoIdTableInsert;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.performAfterTemporaryTableUseActions;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.performBeforeTemporaryTableUseActions;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.saveIntoTemporaryTable;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithoutIdTableHelper.createIdMatchingSubQuerySpec;
+
 /**
 * @author Steve Ebersole
 */
@@ -107,15 +105,13 @@ public TableBasedDeleteHandler(
 
 		this.sessionUidAccess = sessionUidAccess;
 
-		final TemporaryTableSessionUidColumn sessionUidColumn = idTable.getSessionUidColumn();
-		if ( sessionUidColumn == null ) {
-			this.sessionUidParameter = null;
-		}
-		else {
-			this.sessionUidParameter = new SqlTypedMappingJdbcParameter( sessionUidColumn );
-		}
+		final var sessionUidColumn = idTable.getSessionUidColumn();
+		this.sessionUidParameter =
+				sessionUidColumn == null
+						? null
+						: new SqlTypedMappingJdbcParameter( sessionUidColumn );
 
-		final MultiTableSqmMutationConverter converter = new MultiTableSqmMutationConverter(
+		final var converter = new MultiTableSqmMutationConverter(
 				getEntityDescriptor(),
 				sqmDelete,
 				sqmDelete.getTarget(),
@@ -126,14 +122,14 @@ public TableBasedDeleteHandler(
 				getSessionFactory().getSqlTranslationEngine()
 		);
 
-		final EntityPersister entityDescriptor =
+		final var entityDescriptor =
 				getSessionFactory().getMappingMetamodel()
 						.getEntityDescriptor( sqmDelete.getTarget().getEntityName() );
 		final String hierarchyRootTableName = entityDescriptor.getTableName();
 
-		final TableGroup deletingTableGroup = converter.getMutatingTableGroup();
+		final var deletingTableGroup = converter.getMutatingTableGroup();
 
-		final TableReference hierarchyRootTableReference = deletingTableGroup.resolveTableReference(
+		final var hierarchyRootTableReference = deletingTableGroup.resolveTableReference(
 				deletingTableGroup.getNavigablePath(),
 				hierarchyRootTableName
 		);
@@ -144,9 +140,9 @@ public TableBasedDeleteHandler(
 		//		2) we also inspect each ColumnReference that is part of the where-clause to see which
 		//			table it comes from.  if all of the referenced columns (if any at all) are from the root table
 		//			we can perform all of the deletes without using an id-table
-		final Predicate specifiedRestriction = converter.visitWhereClause( sqmDelete.getWhereClause() );
+		final var specifiedRestriction = converter.visitWhereClause( sqmDelete.getWhereClause() );
 
-		final PredicateCollector predicateCollector = new PredicateCollector( specifiedRestriction );
+		final var predicateCollector = new PredicateCollector( specifiedRestriction );
 		entityDescriptor.applyBaseRestrictions(
 				predicateCollector,
 				deletingTableGroup,
@@ -158,7 +154,7 @@ public TableBasedDeleteHandler(
 		);
 
 		converter.pruneTableGroupJoins();
-		final ColumnReferenceCheckingSqlAstWalker walker = new ColumnReferenceCheckingSqlAstWalker(
+		final var walker = new ColumnReferenceCheckingSqlAstWalker(
 				hierarchyRootTableReference.getIdentificationVariable()
 		);
 		if ( predicateCollector.getPredicate() != null ) {
@@ -169,16 +165,17 @@ public TableBasedDeleteHandler(
 		// The intermediate table has a FK to the root table, so we can't delete from the root table first
 		// Deleting from the intermediate table first also isn't possible,
 		// because that is the source for deletion in other tables, hence we need an id table
-		final boolean needsIdTable = !walker.isAllColumnReferencesFromIdentificationVariable()
-									|| entityDescriptor != entityDescriptor.getRootEntityDescriptor();
+		final boolean needsIdTable =
+				!walker.isAllColumnReferencesFromIdentificationVariable()
+						|| entityDescriptor != entityDescriptor.getRootEntityDescriptor();
 
-		final SqmJdbcExecutionContextAdapter executionContextAdapter = SqmJdbcExecutionContextAdapter.omittingLockingAndPaging( context );
+		final var executionContextAdapter = omittingLockingAndPaging( context );
 
 		this.domainParameterXref = domainParameterXref;
 		this.jdbcParamsXref = SqmUtil.generateJdbcParamsXref( domainParameterXref, converter );
 		this.resolvedParameterMappingModelTypes = converter.getSqmParameterMappingModelExpressibleResolutions();
 
-		final JdbcParameterBindings jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
+		final var jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
 				context.getQueryParameterBindings(),
 				domainParameterXref,
 				jdbcParamsXref,
@@ -200,50 +197,53 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 			);
 		}
 
-		this.idTableInsert = !needsIdTable ? null : ExecuteWithTemporaryTableHelper.createMatchingIdsIntoIdTableInsert(
-				converter,
-				predicateCollector.getPredicate(),
-				idTable,
-				sessionUidParameter,
-				jdbcParameterBindings,
-				executionContextAdapter
-		);
+		this.idTableInsert =
+				!needsIdTable
+						? null
+						: createMatchingIdsIntoIdTableInsert(
+								converter,
+								predicateCollector.getPredicate(),
+								idTable,
+								sessionUidParameter,
+								jdbcParameterBindings,
+								executionContextAdapter
+						);
 
 		final ArrayList<JdbcOperationQueryMutation> deletes = new ArrayList<>();
 		final ArrayList<JdbcOperationQueryMutation> collectionTableDeletes = new ArrayList<>();
 		if ( needsIdTable ) {
-			final QuerySpec idTableIdentifierSubQuery = ExecuteWithTemporaryTableHelper.createIdTableSelectQuerySpec(
+			final var idTableIdentifierSubQuery = createIdTableSelectQuerySpec(
 					idTable,
 					sessionUidParameter,
 					getEntityDescriptor(),
 					executionContextAdapter
 			);
 
-			SqmMutationStrategyHelper.visitCollectionTableDeletes(
+			visitCollectionTableDeletes(
 					getEntityDescriptor(),
 					(tableReference, attributeMapping) -> {
-						final ForeignKeyDescriptor fkDescriptor = attributeMapping.getKeyDescriptor();
+						final var foreignKeyDescriptor = attributeMapping.getKeyDescriptor();
 						final QuerySpec idTableFkSubQuery;
-						if ( fkDescriptor.getTargetPart().isEntityIdentifierMapping() ) {
+						if ( foreignKeyDescriptor.getTargetPart().isEntityIdentifierMapping() ) {
 							idTableFkSubQuery = idTableIdentifierSubQuery;
 						}
 						else {
-							idTableFkSubQuery = ExecuteWithTemporaryTableHelper.createIdTableSelectQuerySpec(
+							idTableFkSubQuery = createIdTableSelectQuerySpec(
 									idTable,
-									fkDescriptor.getTargetPart(),
+									foreignKeyDescriptor.getTargetPart(),
 									sessionUidParameter,
 									getEntityDescriptor(),
 									executionContextAdapter
 							);
 						}
 						return new InSubQueryPredicate(
-								MappingModelCreationHelper.buildColumnReferenceExpression(
+								buildColumnReferenceExpression(
 										new MutatingTableReferenceGroupWrapper(
 												new NavigablePath( attributeMapping.getRootPathName() ),
 												attributeMapping,
 												(NamedTableReference) tableReference
 										),
-										fkDescriptor,
+										foreignKeyDescriptor,
 										null,
 										getSessionFactory()
 								),
@@ -258,23 +258,26 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 			);
 
 			getEntityDescriptor().visitConstraintOrderedTables(
-					(tableExpression, tableKeyColumnVisitationSupplier) -> deletes.add( createTableDeleteUsingIdTable(
-							tableExpression,
-							tableKeyColumnVisitationSupplier,
-							idTableIdentifierSubQuery,
-							executionContextAdapter
-					) )
+					(tableExpression, tableKeyColumnVisitationSupplier) ->
+							deletes.add( createTableDeleteUsingIdTable(
+									tableExpression,
+									tableKeyColumnVisitationSupplier,
+									idTableIdentifierSubQuery,
+									executionContextAdapter
+							) )
 			);
 		}
 		else {
-			final EntityPersister rootEntityPersister = getEntityDescriptor().getEntityPersister();
+			final var rootEntityPersister = getEntityDescriptor().getEntityPersister();
 			final String rootTableName = rootEntityPersister.getTableName();
-			final NamedTableReference rootTableReference = (NamedTableReference) deletingTableGroup.resolveTableReference(
-					deletingTableGroup.getNavigablePath(),
-					rootTableName
-			);
+			final var rootTableReference =
+					(NamedTableReference)
+							deletingTableGroup.resolveTableReference(
+									deletingTableGroup.getNavigablePath(),
+									rootTableName
+							);
 
-			final QuerySpec matchingIdSubQuerySpec = ExecuteWithoutIdTableHelper.createIdMatchingSubQuerySpec(
+			final var matchingIdSubQuerySpec = createIdMatchingSubQuerySpec(
 					deletingTableGroup.getNavigablePath(),
 					rootTableReference,
 					predicateCollector.getPredicate(),
@@ -283,21 +286,21 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 					getSessionFactory()
 			);
 
-			SqmMutationStrategyHelper.visitCollectionTableDeletes(
+			visitCollectionTableDeletes(
 					getEntityDescriptor(),
 					(tableReference, attributeMapping) -> {
 						// No need for a predicate if there is no supplied predicate i.e. this is a full cleanup
 						if ( predicateCollector.getPredicate() == null ) {
 							return null;
 						}
-						final ForeignKeyDescriptor fkDescriptor = attributeMapping.getKeyDescriptor();
+						final var foreignKeyDescriptor = attributeMapping.getKeyDescriptor();
 						final QuerySpec idSelectFkSubQuery;
 						// todo (6.0): based on the location of the attribute mapping, we could prune the table group of the subquery
-						if ( fkDescriptor.getTargetPart().isEntityIdentifierMapping() ) {
+						if ( foreignKeyDescriptor.getTargetPart().isEntityIdentifierMapping() ) {
 							idSelectFkSubQuery = matchingIdSubQuerySpec;
 						}
 						else {
-							idSelectFkSubQuery = ExecuteWithoutIdTableHelper.createIdMatchingSubQuerySpec(
+							idSelectFkSubQuery = createIdMatchingSubQuerySpec(
 									deletingTableGroup.getNavigablePath(),
 									rootTableReference,
 									predicateCollector.getPredicate(),
@@ -307,13 +310,13 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 							);
 						}
 						return new InSubQueryPredicate(
-								MappingModelCreationHelper.buildColumnReferenceExpression(
+								buildColumnReferenceExpression(
 										new MutatingTableReferenceGroupWrapper(
 												new NavigablePath( attributeMapping.getRootPathName() ),
 												attributeMapping,
 												(NamedTableReference) tableReference
 										),
-										fkDescriptor,
+										foreignKeyDescriptor,
 										null,
 										getSessionFactory()
 								),
@@ -330,24 +333,17 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 			if ( rootTableReference instanceof UnionTableReference ) {
 				getEntityDescriptor().visitConstraintOrderedTables(
 						(tableExpression, tableKeyColumnVisitationSupplier) -> {
-							final NamedTableReference tableReference = new NamedTableReference(
-									tableExpression,
-									deletingTableGroup.getPrimaryTableReference().getIdentificationVariable()
-							);
-							final QuerySpec idMatchingSubQuerySpec;
-							// No need for a predicate if there is no supplied predicate i.e. this is a full cleanup
-							if ( predicateCollector.getPredicate() == null ) {
-								idMatchingSubQuerySpec = null;
-							}
-							else {
-								idMatchingSubQuerySpec = matchingIdSubQuerySpec;
-							}
 							deletes.add( createNonRootTableDeleteWithoutIdTable(
-									tableReference,
+									new NamedTableReference( tableExpression,
+											deletingTableGroup.getPrimaryTableReference()
+													.getIdentificationVariable() ),
 									tableKeyColumnVisitationSupplier,
 									converter.getSqlExpressionResolver(),
-									deletingTableGroup,
-									idMatchingSubQuerySpec,
+									predicateCollector.getPredicate() == null
+											// No need for a predicate if there is no supplied predicate
+											// i.e. this is a full cleanup
+											? null
+											: matchingIdSubQuerySpec,
 									jdbcParameterBindings,
 									executionContextAdapter
 							) );
@@ -358,25 +354,22 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 				getEntityDescriptor().visitConstraintOrderedTables(
 						(tableExpression, tableKeyColumnVisitationSupplier) -> {
 							if ( !tableExpression.equals( rootTableName ) ) {
-								final NamedTableReference tableReference = (NamedTableReference) deletingTableGroup.getTableReference(
-										deletingTableGroup.getNavigablePath(),
-										tableExpression,
-										true
-								);
-								final QuerySpec idMatchingSubQuerySpec;
-								// No need for a predicate if there is no supplied predicate i.e. this is a full cleanup
-								if ( predicateCollector.getPredicate() == null ) {
-									idMatchingSubQuerySpec = null;
-								}
-								else {
-									idMatchingSubQuerySpec = matchingIdSubQuerySpec;
-								}
+								final var tableReference =
+										(NamedTableReference)
+												deletingTableGroup.getTableReference(
+														deletingTableGroup.getNavigablePath(),
+														tableExpression,
+														true
+												);
 								deletes.add( createNonRootTableDeleteWithoutIdTable(
 										tableReference,
 										tableKeyColumnVisitationSupplier,
 										converter.getSqlExpressionResolver(),
-										deletingTableGroup,
-										idMatchingSubQuerySpec,
+										predicateCollector.getPredicate() == null
+												// No need for a predicate if there is no supplied predicate
+												// i.e. this is a full cleanup
+												? null
+												: matchingIdSubQuerySpec,
 										jdbcParameterBindings,
 										executionContextAdapter
 								) );
@@ -402,41 +395,27 @@ private JdbcOperationQueryMutation createTableDeleteUsingIdTable(
 			Supplier<Consumer<SelectableConsumer>> tableKeyColumnVisitationSupplier,
 			QuerySpec idTableSubQuery,
 			ExecutionContext executionContext) {
-		final TableKeyExpressionCollector keyColumnCollector = new TableKeyExpressionCollector( getEntityDescriptor() );
-		final NamedTableReference targetTable = new NamedTableReference(
-				tableExpression,
-				DeleteStatement.DEFAULT_ALIAS,
-				true
-		);
-
+		final var keyColumnCollector = new TableKeyExpressionCollector( getEntityDescriptor() );
+		final var targetTable =
+				new NamedTableReference( tableExpression, DeleteStatement.DEFAULT_ALIAS, true );
 		tableKeyColumnVisitationSupplier.get().accept(
 				(columnIndex, selection) -> {
 					assert selection.getContainingTableExpression().equals( tableExpression );
 					assert ! selection.isFormula();
 					assert selection.getCustomReadExpression() == null;
 					assert selection.getCustomWriteExpression() == null;
-
-					keyColumnCollector.apply(
-							new ColumnReference(
-									targetTable,
-									selection
-							)
-					);
+					keyColumnCollector.apply( new ColumnReference( targetTable, selection ) );
 				}
 		);
 
-		final InSubQueryPredicate predicate = new InSubQueryPredicate(
+		final var predicate = new InSubQueryPredicate(
 				keyColumnCollector.buildKeyExpression(),
 				idTableSubQuery,
 				false
 		);
 
-		final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
-
-		final JdbcServices jdbcServices = factory.getJdbcServices();
-
-		return jdbcServices.getJdbcEnvironment()
-				.getSqlAstTranslatorFactory()
+		final var factory = executionContext.getSession().getFactory();
+		return factory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
 				.buildMutationTranslator( factory, new DeleteStatement( targetTable, predicate ) )
 				.translate( JdbcParameterBindings.NO_BINDINGS, executionContext.getQueryOptions() );
 	}
@@ -447,13 +426,8 @@ private JdbcOperationQueryMutation createRootTableDeleteWithoutIdTable(
 			Predicate predicate,
 			JdbcParameterBindings jdbcParameterBindings,
 			ExecutionContext executionContext) {
-
-		final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
-
-		final JdbcServices jdbcServices = factory.getJdbcServices();
-
-		return jdbcServices.getJdbcEnvironment()
-				.getSqlAstTranslatorFactory()
+		final var factory = executionContext.getSession().getFactory();
+		return factory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
 				.buildMutationTranslator( factory, new DeleteStatement( rootTableReference, predicate ) )
 				.translate( jdbcParameterBindings, executionContext.getQueryOptions() );
 	}
@@ -462,20 +436,33 @@ private JdbcOperationQueryMutation createNonRootTableDeleteWithoutIdTable(
 			NamedTableReference targetTableReference,
 			Supplier<Consumer<SelectableConsumer>> tableKeyColumnVisitationSupplier,
 			SqlExpressionResolver sqlExpressionResolver,
-			TableGroup rootTableGroup,
 			QuerySpec matchingIdSubQuerySpec,
 			JdbcParameterBindings jdbcParameterBindings,
 			ExecutionContext executionContext) {
 		assert targetTableReference != null;
+		final var deleteTableReference =
+				new NamedTableReference(
+						targetTableReference.getTableExpression(),
+						DeleteStatement.DEFAULT_ALIAS,
+						true
+				);
+		final var sqlAstDelete =
+				new DeleteStatement( deleteTableReference,
+						tableDeletePredicate( tableKeyColumnVisitationSupplier, sqlExpressionResolver,
+								matchingIdSubQuerySpec, deleteTableReference ) );
+		final var factory = executionContext.getSession().getFactory();
+		return factory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
+				.buildMutationTranslator( factory, sqlAstDelete )
+				.translate( jdbcParameterBindings, executionContext.getQueryOptions() );
+	}
 
-		final NamedTableReference deleteTableReference = new NamedTableReference(
-				targetTableReference.getTableExpression(),
-				DeleteStatement.DEFAULT_ALIAS,
-				true
-		);
-		final Predicate tableDeletePredicate;
+	private @Nullable Predicate tableDeletePredicate(
+			Supplier<Consumer<SelectableConsumer>> tableKeyColumnVisitationSupplier,
+			SqlExpressionResolver sqlExpressionResolver,
+			QuerySpec matchingIdSubQuerySpec,
+			NamedTableReference deleteTableReference) {
 		if ( matchingIdSubQuerySpec == null ) {
-			tableDeletePredicate = null;
+			return null;
 		}
 		else {
 			/*
@@ -493,45 +480,25 @@ private JdbcOperationQueryMutation createNonRootTableDeleteWithoutIdTable(
 			tableKeyColumnVisitationSupplier.get().accept(
 					(columnIndex, selection) -> {
 						assert deleteTableReference.getTableReference( selection.getContainingTableExpression() ) != null;
-
-						final Expression expression = sqlExpressionResolver.resolveSqlExpression(
-								deleteTableReference,
-								selection
-						);
-
+						final var expression =
+								sqlExpressionResolver.resolveSqlExpression( deleteTableReference, selection );
 						deletingTableColumnRefs.add( (ColumnReference) expression );
 					}
 			);
 
-			final Expression deletingTableColumnRefsExpression;
-			if ( deletingTableColumnRefs.size() == 1 ) {
-				deletingTableColumnRefsExpression = deletingTableColumnRefs.get( 0 );
-			}
-			else {
-				deletingTableColumnRefsExpression = new SqlTuple( deletingTableColumnRefs, getEntityDescriptor().getIdentifierMapping() );
-			}
-
-			tableDeletePredicate = new InSubQueryPredicate(
-					deletingTableColumnRefsExpression,
+			return new InSubQueryPredicate(
+					deletingTableColumnRefs.size() == 1
+							? deletingTableColumnRefs.get( 0 )
+							: new SqlTuple( deletingTableColumnRefs, getEntityDescriptor().getIdentifierMapping() ),
 					matchingIdSubQuerySpec,
 					false
 			);
 		}
-
-		final DeleteStatement sqlAstDelete = new DeleteStatement( deleteTableReference, tableDeletePredicate );
-		final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
-
-		final JdbcServices jdbcServices = factory.getJdbcServices();
-
-		return jdbcServices.getJdbcEnvironment()
-				.getSqlAstTranslatorFactory()
-				.buildMutationTranslator( factory, sqlAstDelete )
-				.translate( jdbcParameterBindings, executionContext.getQueryOptions() );
 	}
 
 	@Override
 	public JdbcParameterBindings createJdbcParameterBindings(DomainQueryExecutionContext context) {
-		final JdbcParameterBindings jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
+		final var jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
 				context.getQueryParameterBindings(),
 				domainParameterXref,
 				jdbcParamsXref,
@@ -561,12 +528,12 @@ public boolean dependsOnParameterBindings() {
 		if ( idTableInsert != null && idTableInsert.jdbcOperation().dependsOnParameterBindings() ) {
 			return true;
 		}
-		for ( JdbcOperationQueryMutation delete : deletes ) {
+		for ( var delete : deletes ) {
 			if ( delete.dependsOnParameterBindings() ) {
 				return true;
 			}
 		}
-		for ( JdbcOperationQueryMutation delete : collectionTableDeletes ) {
+		for ( var delete : collectionTableDeletes ) {
 			if ( delete.dependsOnParameterBindings() ) {
 				return true;
 			}
@@ -580,12 +547,12 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
 			&& !idTableInsert.jdbcOperation().isCompatibleWith( jdbcParameterBindings, queryOptions ) ) {
 			return false;
 		}
-		for ( JdbcOperationQueryMutation delete : deletes ) {
+		for ( var delete : deletes ) {
 			if ( !delete.isCompatibleWith( jdbcParameterBindings, queryOptions ) ) {
 				return false;
 			}
 		}
-		for ( JdbcOperationQueryMutation delete : collectionTableDeletes ) {
+		for ( var delete : collectionTableDeletes ) {
 			if ( !delete.isCompatibleWith( jdbcParameterBindings, queryOptions ) ) {
 				return false;
 			}
@@ -601,21 +568,21 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 					getSqmStatement().getTarget().getModel().getName()
 			);
 		}
-		final SqmJdbcExecutionContextAdapter executionContext = SqmJdbcExecutionContextAdapter.omittingLockingAndPaging( context );
+		final var executionContext = omittingLockingAndPaging( context );
 		if ( idTableInsert != null ) {
-			ExecuteWithTemporaryTableHelper.performBeforeTemporaryTableUseActions(
+			performBeforeTemporaryTableUseActions(
 					idTable,
 					temporaryTableStrategy,
 					executionContext
 			);
 
 			try {
-				final int rows = ExecuteWithTemporaryTableHelper.saveIntoTemporaryTable(
+				final int rows = saveIntoTemporaryTable(
 						idTableInsert.jdbcOperation(),
 						jdbcParameterBindings,
 						executionContext
 				);
-				final JdbcParameterBindings sessionUidBindings = new JdbcParameterBindingsImpl( 1 );
+				final var sessionUidBindings = new JdbcParameterBindingsImpl( 1 );
 				if ( sessionUidParameter != null ) {
 					sessionUidBindings.addBinding(
 							sessionUidParameter,
@@ -625,9 +592,10 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 							)
 					);
 				}
-				final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
-				final JdbcMutationExecutor jdbcMutationExecutor = factory.getJdbcServices().getJdbcMutationExecutor();
-				for ( JdbcOperationQueryMutation delete : collectionTableDeletes ) {
+				final var jdbcMutationExecutor =
+						executionContext.getSession().getFactory()
+								.getJdbcServices().getJdbcMutationExecutor();
+				for ( var delete : collectionTableDeletes ) {
 					jdbcMutationExecutor.execute(
 							delete,
 							sessionUidBindings,
@@ -639,7 +607,7 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 							executionContext
 					);
 				}
-				for ( JdbcOperationQueryMutation delete : deletes ) {
+				for ( var delete : deletes ) {
 					jdbcMutationExecutor.execute(
 							delete,
 							sessionUidBindings,
@@ -654,7 +622,7 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 				return rows;
 			}
 			finally {
-				ExecuteWithTemporaryTableHelper.performAfterTemporaryTableUseActions(
+				performAfterTemporaryTableUseActions(
 						idTable,
 						sessionUidAccess,
 						getAfterUseAction(),
@@ -663,16 +631,15 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 			}
 		}
 		else {
-			final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
-			final JdbcMutationExecutor jdbcMutationExecutor = factory.getJdbcServices().getJdbcMutationExecutor();
-			for ( JdbcOperationQueryMutation delete : collectionTableDeletes ) {
+			final var jdbcMutationExecutor =
+					executionContext.getSession().getFactory()
+							.getJdbcServices().getJdbcMutationExecutor();
+			for ( var delete : collectionTableDeletes ) {
 				jdbcMutationExecutor.execute(
 						delete,
 						jdbcParameterBindings,
-						sql -> executionContext.getSession()
-								.getJdbcCoordinator()
-								.getStatementPreparer()
-								.prepareStatement( sql ),
+						sql -> executionContext.getSession().getJdbcCoordinator()
+								.getStatementPreparer().prepareStatement( sql ),
 						(integer, preparedStatement) -> {},
 						executionContext
 				);
@@ -680,14 +647,12 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 
 			if ( getEntityDescriptor() instanceof UnionSubclassEntityPersister ) {
 				int rows = 0;
-				for ( JdbcOperationQueryMutation delete : deletes ) {
+				for ( var delete : deletes ) {
 					rows += jdbcMutationExecutor.execute(
 							delete,
 							jdbcParameterBindings,
-							sql -> executionContext.getSession()
-									.getJdbcCoordinator()
-									.getStatementPreparer()
-									.prepareStatement( sql ),
+							sql -> executionContext.getSession().getJdbcCoordinator()
+									.getStatementPreparer().prepareStatement( sql ),
 							(integer, preparedStatement) -> {},
 							executionContext
 					);
@@ -696,14 +661,12 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 			}
 			else {
 				int rows = 0;
-				for ( JdbcOperationQueryMutation delete : deletes ) {
+				for ( var delete : deletes ) {
 					rows = jdbcMutationExecutor.execute(
 							delete,
 							jdbcParameterBindings,
-							sql -> executionContext.getSession()
-									.getJdbcCoordinator()
-									.getStatementPreparer()
-									.prepareStatement( sql ),
+							sql -> executionContext.getSession().getJdbcCoordinator()
+									.getStatementPreparer().prepareStatement( sql ),
 							(integer, preparedStatement) -> {},
 							executionContext
 					);
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java
index aa39b4c288c7..15345dc7af3e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedInsertHandler.java
@@ -4,45 +4,23 @@
  */
 package org.hibernate.query.sqm.mutation.internal.temptable;
 
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-import java.util.stream.IntStream;
-
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.dialect.temptable.TemporaryTable;
 import org.hibernate.dialect.temptable.TemporaryTableColumn;
-import org.hibernate.dialect.temptable.TemporaryTableSessionUidColumn;
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
 import org.hibernate.engine.FetchTiming;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.BeforeExecutionGenerator;
 import org.hibernate.generator.Generator;
 import org.hibernate.generator.OnExecutionGenerator;
-import org.hibernate.generator.values.GeneratedValues;
-import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
 import org.hibernate.id.BulkInsertionCapableIdentifierGenerator;
 import org.hibernate.id.OptimizableGenerator;
-import org.hibernate.id.enhanced.Optimizer;
 import org.hibernate.id.insert.Binder;
 import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate;
 import org.hibernate.internal.util.MutableObject;
-import org.hibernate.internal.util.collections.ArrayHelper;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping;
-import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
-import org.hibernate.metamodel.mapping.ModelPartContainer;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.SemanticException;
 import org.hibernate.query.SortDirection;
@@ -59,16 +37,13 @@
 import org.hibernate.query.sqm.mutation.internal.AbstractMutationHandler;
 import org.hibernate.query.sqm.mutation.internal.InsertHandler;
 import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter;
-import org.hibernate.query.sqm.mutation.internal.SqmInsertStrategyHelper;
 import org.hibernate.query.sqm.mutation.spi.AfterUseAction;
 import org.hibernate.query.sqm.spi.SqmParameterMappingModelResolutionAccess;
-import org.hibernate.query.sqm.sql.BaseSqmToSqlAstConverter;
 import org.hibernate.query.sqm.sql.internal.SqmPathInterpretation;
 import org.hibernate.query.sqm.tree.expression.SqmParameter;
 import org.hibernate.query.sqm.tree.insert.SqmInsertSelectStatement;
 import org.hibernate.query.sqm.tree.insert.SqmInsertStatement;
 import org.hibernate.query.sqm.tree.insert.SqmInsertValuesStatement;
-import org.hibernate.query.sqm.tree.insert.SqmValues;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
@@ -83,11 +58,9 @@
 import org.hibernate.sql.ast.tree.insert.Values;
 import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
-import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.ast.tree.select.SortSpecification;
-import org.hibernate.sql.ast.tree.update.Assignable;
 import org.hibernate.sql.ast.tree.update.Assignment;
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
@@ -95,20 +68,39 @@
 import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
 import org.hibernate.sql.exec.spi.ExecutionContext;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
-import org.hibernate.sql.exec.spi.JdbcParameterBinder;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.results.graph.basic.BasicFetch;
 import org.hibernate.sql.results.internal.SqlSelectionImpl;
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 import org.hibernate.type.BasicType;
-
-import org.hibernate.type.descriptor.ValueBinder;
 import org.jboss.logging.Logger;
 
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import java.util.stream.IntStream;
+
+import static java.util.Collections.singletonList;
 import static org.hibernate.generator.EventType.INSERT;
+import static org.hibernate.internal.util.collections.ArrayHelper.indexOf;
+import static org.hibernate.internal.util.collections.CollectionHelper.mapOfSize;
+import static org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter.omittingLockingAndPaging;
+import static org.hibernate.query.sqm.mutation.internal.SqmInsertStrategyHelper.createRowNumberingExpression;
 import static org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper.isId;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.createInsertedRowNumbersSelectSql;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.createTemporaryTableInsert;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.loadInsertedRowNumbers;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.performAfterTemporaryTableUseActions;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.performBeforeTemporaryTableUseActions;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.saveIntoTemporaryTable;
 
 /**
 * @author Christian Beikov
@@ -144,16 +136,15 @@ public TableBasedInsertHandler(
 		this.entityTable = entityTable;
 		this.sessionUidAccess = sessionUidAccess;
 
-		final TemporaryTableSessionUidColumn sessionUidColumn = entityTable.getSessionUidColumn();
-		if ( sessionUidColumn == null ) {
-			this.sessionUidParameter = null;
-		}
-		else {
-			this.sessionUidParameter = new SqlTypedMappingJdbcParameter( sessionUidColumn );
-		}
-		final SqmJdbcExecutionContextAdapter executionContext = SqmJdbcExecutionContextAdapter.omittingLockingAndPaging( context );
-		final MultiTableSqmMutationConverter sqmConverter = new MultiTableSqmMutationConverter(
-				getEntityDescriptor(),
+		final var sessionUidColumn = entityTable.getSessionUidColumn();
+		this.sessionUidParameter =
+				sessionUidColumn == null
+						? null
+						: new SqlTypedMappingJdbcParameter( sessionUidColumn );
+		final var executionContext = omittingLockingAndPaging( context );
+		final var entityDescriptor = getEntityDescriptor();
+		final var sqmConverter = new MultiTableSqmMutationConverter(
+				entityDescriptor,
 				sqmInsert,
 				sqmInsert.getTarget(),
 				domainParameterXref,
@@ -163,26 +154,27 @@ public TableBasedInsertHandler(
 				getSessionFactory().getSqlTranslationEngine()
 		);
 
-		final TableGroup insertingTableGroup = sqmConverter.getMutatingTableGroup();
+		final var insertingTableGroup = sqmConverter.getMutatingTableGroup();
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// visit the insertion target using our special converter, collecting
 		// information about the target paths
 
 		final List<Assignment> targetPathColumns = new ArrayList<>();
-		final NamedTableReference entityTableReference = new NamedTableReference(
+		final var entityTableReference = new NamedTableReference(
 				entityTable.getTableExpression(),
 				TemporaryTable.DEFAULT_ALIAS,
 				true
 		);
-		final InsertSelectStatement insertStatement = new InsertSelectStatement( entityTableReference );
+		final var insertStatement = new InsertSelectStatement( entityTableReference, getEntityDescriptor() );
 
-		final BaseSqmToSqlAstConverter.AdditionalInsertValues additionalInsertValues = sqmConverter.visitInsertionTargetPaths(
+		final var additionalInsertValues = sqmConverter.visitInsertionTargetPaths(
 				(assignable, columnReferences) -> {
-					final SqmPathInterpretation<?> pathInterpretation = (SqmPathInterpretation<?>) assignable;
-					final List<TemporaryTableColumn> columns =
-							entityTable.findTemporaryTableColumns( getEntityDescriptor(), pathInterpretation.getExpressionType() );
-					for ( TemporaryTableColumn column : columns ) {
+					final var pathInterpretation = (SqmPathInterpretation<?>) assignable;
+					final var columns =
+							entityTable.findTemporaryTableColumns( entityDescriptor,
+									pathInterpretation.getExpressionType() );
+					for ( var column : columns ) {
 						insertStatement.addTargetColumnReference( new ColumnReference(
 								entityTableReference,
 								column.getColumnName(),
@@ -192,7 +184,7 @@ public TableBasedInsertHandler(
 					targetPathColumns.add( new Assignment( assignable, (Expression) assignable ) );
 				},
 				sqmInsert,
-				getEntityDescriptor(),
+				entityDescriptor,
 				insertingTableGroup
 		);
 
@@ -200,35 +192,33 @@ public TableBasedInsertHandler(
 		// visit the where-clause using our special converter, collecting information
 		// about the restrictions
 
-		if ( sqmInsert instanceof SqmInsertSelectStatement ) {
-			final QueryPart queryPart = sqmConverter.visitQueryPart( ( (SqmInsertSelectStatement<?>) sqmInsert ).getSelectQueryPart() );
+		if ( sqmInsert instanceof SqmInsertSelectStatement<?> sqmInsertSelectStatement ) {
+			final var queryPart =
+					sqmConverter.visitQueryPart( sqmInsertSelectStatement.getSelectQueryPart() );
 			queryPart.visitQuerySpecs(
 					querySpec -> {
 						if ( additionalInsertValues.applySelections( querySpec, getSessionFactory() ) ) {
-							final TemporaryTableColumn rowNumberColumn = entityTable.getColumns()
+							final var rowNumberColumn = entityTable.getColumns()
 									.get( entityTable.getColumns().size() - ( sessionUidColumn == null ? 1 : 2 ) );
-							final ColumnReference columnReference = new ColumnReference(
+							final var columnReference = new ColumnReference(
 									(String) null,
 									rowNumberColumn.getColumnName(),
 									false,
 									null,
 									rowNumberColumn.getJdbcMapping()
 							);
-							insertStatement.getTargetColumns().set(
-									insertStatement.getTargetColumns().size() - 1,
-									columnReference
-							);
-							targetPathColumns.set(
-									targetPathColumns.size() - 1,
-									new Assignment( columnReference, columnReference )
-							);
+							insertStatement.getTargetColumns()
+									.set( insertStatement.getTargetColumns().size() - 1,
+											columnReference );
+							targetPathColumns.set( targetPathColumns.size() - 1,
+									new Assignment( columnReference, columnReference ) );
 						}
-						else if ( !(getEntityDescriptor().getGenerator() instanceof OnExecutionGenerator generator
-									&& generator.generatedOnExecution())
+						else if ( !( entityDescriptor.getGenerator() instanceof OnExecutionGenerator generator
+										&& generator.generatedOnExecution() )
 								&& !entityTable.isRowNumberGenerated() ) {
-							final TemporaryTableColumn rowNumberColumn = entityTable.getColumns()
+							final var rowNumberColumn = entityTable.getColumns()
 									.get( entityTable.getColumns().size() - ( sessionUidColumn == null ? 1 : 2 ) );
-							final ColumnReference columnReference = new ColumnReference(
+							final var columnReference = new ColumnReference(
 									(String) null,
 									rowNumberColumn.getColumnName(),
 									false,
@@ -237,28 +227,23 @@ else if ( !(getEntityDescriptor().getGenerator() instanceof OnExecutionGenerator
 							);
 							insertStatement.getTargetColumns().add( columnReference );
 							targetPathColumns.add( new Assignment( columnReference, columnReference ) );
-							querySpec.getSelectClause().addSqlSelection(
-									new SqlSelectionImpl(
-											0,
-											SqmInsertStrategyHelper.createRowNumberingExpression(
-													querySpec,
-													getSessionFactory()
-											)
-									)
-							);
+							querySpec.getSelectClause()
+									.addSqlSelection( new SqlSelectionImpl(0,
+											createRowNumberingExpression( querySpec, getSessionFactory() ) ) );
 						}
 						if ( sessionUidColumn != null ) {
-							final ColumnReference sessionUidColumnReference = new ColumnReference(
+							final var sessionUidColumnReference = new ColumnReference(
 									(String) null,
 									sessionUidColumn.getColumnName(),
 									false,
 									null,
 									sessionUidColumn.getJdbcMapping()
 							);
-							querySpec.getSelectClause().addSqlSelection( new SqlSelectionImpl(
-									insertStatement.getTargetColumns().size(),
-									sessionUidParameter
-							) );
+							querySpec.getSelectClause()
+									.addSqlSelection( new SqlSelectionImpl(
+											insertStatement.getTargetColumns().size(),
+											sessionUidParameter
+									) );
 							insertStatement.getTargetColumns().add( sessionUidColumnReference );
 							targetPathColumns.add( new Assignment( sessionUidColumnReference, sessionUidParameter ) );
 						}
@@ -269,13 +254,13 @@ else if ( !(getEntityDescriptor().getGenerator() instanceof OnExecutionGenerator
 		else {
 			// Add the row number column if there is one
 			final BasicType<?> rowNumberType;
-			if ( !(getEntityDescriptor().getGenerator() instanceof OnExecutionGenerator generator
-				&& generator.generatedOnExecution())
+			if ( !( entityDescriptor.getGenerator() instanceof OnExecutionGenerator generator
+						&& generator.generatedOnExecution() )
 				&& !entityTable.isRowNumberGenerated() ) {
-				final TemporaryTableColumn rowNumberColumn = entityTable.getColumns()
+				final var rowNumberColumn = entityTable.getColumns()
 						.get( entityTable.getColumns().size() - (sessionUidColumn == null ? 1 : 2) );
 				rowNumberType = (BasicType<?>) rowNumberColumn.getJdbcMapping();
-				final ColumnReference columnReference = new ColumnReference(
+				final var columnReference = new ColumnReference(
 						(String) null,
 						rowNumberColumn.getColumnName(),
 						false,
@@ -289,7 +274,7 @@ else if ( !(getEntityDescriptor().getGenerator() instanceof OnExecutionGenerator
 				rowNumberType = null;
 			}
 			if ( sessionUidColumn != null ) {
-				final ColumnReference sessionUidColumnReference = new ColumnReference(
+				final var sessionUidColumnReference = new ColumnReference(
 						(String) null,
 						sessionUidColumn.getColumnName(),
 						false,
@@ -299,19 +284,17 @@ else if ( !(getEntityDescriptor().getGenerator() instanceof OnExecutionGenerator
 				insertStatement.getTargetColumns().add( sessionUidColumnReference );
 				targetPathColumns.add( new Assignment( sessionUidColumnReference, sessionUidParameter ) );
 			}
-			final List<SqmValues> sqmValuesList = ( (SqmInsertValuesStatement<?>) sqmInsert ).getValuesList();
+			final var sqmValuesList = ( (SqmInsertValuesStatement<?>) sqmInsert ).getValuesList();
 			final List<Values> valuesList = new ArrayList<>( sqmValuesList.size() );
 			for ( int i = 0; i < sqmValuesList.size(); i++ ) {
-				final Values values = sqmConverter.visitValues( sqmValuesList.get( i ) );
+				final var values = sqmConverter.visitValues( sqmValuesList.get( i ) );
 				additionalInsertValues.applyValues( values );
 				if ( rowNumberType != null ) {
-					values.getExpressions().add(
-							new QueryLiteral<>(
-									rowNumberType.getJavaTypeDescriptor()
-											.wrap( i + 1, getSessionFactory().getWrapperOptions() ),
-									rowNumberType
-							)
-					);
+					values.getExpressions().add( new QueryLiteral<>(
+							rowNumberType.getJavaTypeDescriptor()
+									.wrap( i + 1, getSessionFactory().getWrapperOptions() ),
+							rowNumberType
+					) );
 				}
 				if ( sessionUidParameter != null ) {
 					values.getExpressions().add( sessionUidParameter );
@@ -320,36 +303,38 @@ else if ( !(getEntityDescriptor().getGenerator() instanceof OnExecutionGenerator
 			}
 			insertStatement.setValuesList( valuesList );
 		}
-		final ConflictClause conflictClause = sqmConverter.visitConflictClause( sqmInsert.getConflictClause() );
+		final var conflictClause = sqmConverter.visitConflictClause( sqmInsert.getConflictClause() );
 		sqmConverter.pruneTableGroupJoins();
 
 		boolean assignsId = false;
-		for ( Assignment assignment : targetPathColumns ) {
-			assignsId = assignsId || assignment.getAssignable() instanceof SqmPathInterpretation<?> pathInterpretation
-									&& isId( pathInterpretation.getExpressionType() );
+		for ( var assignment : targetPathColumns ) {
+			assignsId = assignsId
+						|| assignment.getAssignable() instanceof SqmPathInterpretation<?> pathInterpretation
+								&& isId( pathInterpretation.getExpressionType() );
 		}
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// cross-reference the TableReference by alias.  The TableGroup already
 		// cross-references it by name, but the ColumnReference only has the alias
 
-		final Map<String, TableReference> tableReferenceByAlias = CollectionHelper.mapOfSize( insertingTableGroup.getTableReferenceJoins().size() + 1 );
+		final Map<String, TableReference> tableReferenceByAlias =
+				mapOfSize( insertingTableGroup.getTableReferenceJoins().size() + 1 );
 		collectTableReference( insertingTableGroup.getPrimaryTableReference(), tableReferenceByAlias::put );
 		for ( int i = 0; i < insertingTableGroup.getTableReferenceJoins().size(); i++ ) {
 			collectTableReference( insertingTableGroup.getTableReferenceJoins().get( i ), tableReferenceByAlias::put );
 		}
 
-		final ModelPartContainer updatingModelPart = insertingTableGroup.getModelPart();
+		final var updatingModelPart = insertingTableGroup.getModelPart();
 		assert updatingModelPart instanceof EntityMappingType;
 
 		final Map<String, List<Assignment>> assignmentsByTable =
-				CollectionHelper.mapOfSize( insertingTableGroup.getTableReferenceJoins().size() + 1 );
+				mapOfSize( insertingTableGroup.getTableReferenceJoins().size() + 1 );
 
 		this.domainParameterXref = domainParameterXref;
 		this.jdbcParamsXref = SqmUtil.generateJdbcParamsXref( domainParameterXref, sqmConverter );
 		this.resolvedParameterMappingModelTypes = sqmConverter.getSqmParameterMappingModelExpressibleResolutions();
 
-		final JdbcParameterBindings jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
+		final var jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
 				context.getQueryParameterBindings(),
 				domainParameterXref,
 				jdbcParamsXref,
@@ -376,15 +361,14 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 		// segment the assignments by table-reference
 
 		for ( int i = 0; i < targetPathColumns.size(); i++ ) {
-			final Assignment assignment = targetPathColumns.get( i );
-			final Assignable assignable = assignment.getAssignable();
-			final List<ColumnReference> assignmentColumnRefs = assignable.getColumnReferences();
+			final var assignment = targetPathColumns.get( i );
+			final var assignable = assignment.getAssignable();
+			final var assignmentColumnRefs = assignable.getColumnReferences();
 
 			TableReference assignmentTableReference = null;
-
 			for ( int c = 0; c < assignmentColumnRefs.size(); c++ ) {
-				final ColumnReference columnReference = assignmentColumnRefs.get( c );
-				final TableReference tableReference = resolveTableReference( columnReference, tableReferenceByAlias );
+				final var columnReference = assignmentColumnRefs.get( c );
+				final var tableReference = resolveTableReference( columnReference, tableReferenceByAlias );
 
 				if ( assignmentTableReference != null && assignmentTableReference != tableReference ) {
 					throw new SemanticException( "Assignment referred to columns from multiple tables: " + i );
@@ -393,48 +377,51 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 			}
 
 			assignmentsByTable.computeIfAbsent(
-					assignmentTableReference == null ? null : assignmentTableReference.getTableId(),
+					assignmentTableReference == null
+							? null
+							: assignmentTableReference.getTableId(),
 					k -> new ArrayList<>() ).add( assignment );
 		}
 
-		this.temporaryTableInsert = ExecuteWithTemporaryTableHelper.createTemporaryTableInsert(
-				insertStatement,
-				jdbcParameterBindings,
-				executionContext
-		);
+		this.temporaryTableInsert =
+				createTemporaryTableInsert(
+						insertStatement,
+						jdbcParameterBindings,
+						executionContext
+				);
 
-		final int tableSpan = getEntityDescriptor().getTableSpan();
+		final int tableSpan = entityDescriptor.getTableSpan();
 		this.rootTableInserter = createRootTableInserter(
 				insertStatement,
 				insertingTableGroup,
 				conflictClause,
 				assignsId,
-				getEntityDescriptor().getTableName( 0 ),
-				getEntityDescriptor().getKeyColumns( 0 ),
+				entityDescriptor.getTableName( 0 ),
+				entityDescriptor.getKeyColumns( 0 ),
 				assignmentsByTable,
 				executionContext
 		);
 
 		final ArrayList<JdbcOperationQueryMutation> nonRootTableInserts = new ArrayList<>( tableSpan );
-		if ( getEntityDescriptor().hasDuplicateTables() ) {
-			final String[] insertedTables = new String[tableSpan];
-			insertedTables[0] = getEntityDescriptor().getTableName( 0 );
+		if ( entityDescriptor.hasDuplicateTables() ) {
+			final var insertedTables = new String[tableSpan];
+			insertedTables[0] = entityDescriptor.getTableName( 0 );
 			for ( int i = 1; i < tableSpan; i++ ) {
-				if ( getEntityDescriptor().isInverseTable( i ) ) {
+				if ( entityDescriptor.isInverseTable( i ) ) {
 					continue;
 				}
-				final String tableName = getEntityDescriptor().getTableName( i );
+				final String tableName = entityDescriptor.getTableName( i );
 				insertedTables[i] = tableName;
-				if ( ArrayHelper.indexOf( insertedTables, i, tableName ) != -1 ) {
+				if ( indexOf( insertedTables, i, tableName ) != -1 ) {
 					// Since secondary tables could appear multiple times, we have to skip duplicates
 					continue;
 				}
-				final JdbcOperationQueryMutation insert = createTableInsert(
+				final var insert = createTableInsert(
 						insertStatement,
 						insertingTableGroup,
 						tableName,
-						getEntityDescriptor().getKeyColumns( i ),
-						getEntityDescriptor().isNullableTable( i ),
+						entityDescriptor.getKeyColumns( i ),
+						entityDescriptor.isNullableTable( i ),
 						assignmentsByTable,
 						executionContext
 				);
@@ -445,12 +432,12 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 		}
 		else {
 			for ( int i = 1; i < tableSpan; i++ ) {
-				final JdbcOperationQueryMutation insert = createTableInsert(
+				final var insert = createTableInsert(
 						insertStatement,
 						insertingTableGroup,
-						getEntityDescriptor().getTableName( i ),
-						getEntityDescriptor().getKeyColumns( i ),
-						getEntityDescriptor().isNullableTable( i ),
+						entityDescriptor.getTableName( i ),
+						entityDescriptor.getKeyColumns( i ),
+						entityDescriptor.isNullableTable( i ),
 						assignmentsByTable,
 						executionContext
 				);
@@ -476,7 +463,7 @@ private void collectTableReference(
 	}
 
 	protected record RootTableInserter(
-			@Nullable JdbcOperationQuerySelect temporaryTableIdentitySelect,
+			@Nullable JdbcSelect temporaryTableIdentitySelect,
 			@Nullable JdbcOperationQueryMutation temporaryTableIdUpdate,
 			@Nullable String temporaryTableRowNumberSelectSql,
 			JdbcOperationQueryMutation rootTableInsert,
@@ -493,32 +480,32 @@ private RootTableInserter createRootTableInserter(
 			String[] keyColumns,
 			Map<String, List<Assignment>> assignmentsByTable,
 			ExecutionContext executionContext) {
-		final TableReference updatingTableReference = updatingTableGroup.getTableReference(
+		final var updatingTableReference = updatingTableGroup.getTableReference(
 				updatingTableGroup.getNavigablePath(),
 				tableExpression,
 				true
 		);
 
-		final Generator generator = getEntityDescriptor().getGenerator();
-		final List<Assignment> assignments = assignmentsByTable.get( tableExpression );
+		final var generator = getEntityDescriptor().getGenerator();
+		final var assignments = assignmentsByTable.get( tableExpression );
 		if ( !assignsId
-			&& (assignments == null || assignments.isEmpty())
+			&& ( assignments == null || assignments.isEmpty() )
 			&& !generator.generatedOnExecution()
-			&& (!(generator instanceof BulkInsertionCapableIdentifierGenerator)
-				|| ((BulkInsertionCapableIdentifierGenerator) generator).supportsBulkInsertionIdentifierGeneration()) ) {
+			&& ( !( generator instanceof BulkInsertionCapableIdentifierGenerator bulkInsertionCapable )
+					|| bulkInsertionCapable.supportsBulkInsertionIdentifierGeneration() ) ) {
 			throw new IllegalStateException( "There must be at least a single root table assignment" );
 		}
 
-		final NamedTableReference dmlTableReference = resolveUnionTableReference( updatingTableReference, tableExpression );
+		final var dmlTableReference = resolveUnionTableReference( updatingTableReference, tableExpression );
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// Create the SQL AST and convert it into a JdbcOperation
-		final QuerySpec querySpec = new QuerySpec( true );
-		final NamedTableReference temporaryTableReference = new NamedTableReference(
+		final var querySpec = new QuerySpec( true );
+		final var temporaryTableReference = new NamedTableReference(
 				translatedInsertStatement.getTargetTable().getTableExpression(),
 				"hte_tmp"
 		);
-		final TableGroupImpl temporaryTableGroup = new TableGroupImpl(
+		final var temporaryTableGroup = new TableGroupImpl(
 				updatingTableGroup.getNavigablePath(),
 				null,
 				temporaryTableReference,
@@ -530,29 +517,32 @@ private RootTableInserter createRootTableInserter(
 			querySpec.setFetchClauseExpression(
 					new QueryLiteral<>(
 							1,
-							executionContext.getSession().getFactory().getQueryEngine().getCriteriaBuilder().getIntegerType()
+							executionContext.getSession().getFactory().getQueryEngine()
+									.getCriteriaBuilder().getIntegerType()
 					),
 					FetchClauseType.ROWS_ONLY
 			);
 		}
-		final InsertSelectStatement insertStatement = new InsertSelectStatement( dmlTableReference );
+		final var insertStatement = new InsertSelectStatement( dmlTableReference, getEntityDescriptor() );
 		insertStatement.setConflictClause( conflictClause );
 		insertStatement.setSourceSelectStatement( querySpec );
-		applyAssignments( assignments, insertStatement, temporaryTableReference, getEntityDescriptor() );
-		final JdbcServices jdbcServices = getSessionFactory().getJdbcServices();
-		final SharedSessionContractImplementor session = executionContext.getSession();
-		final JdbcOperationQuerySelect temporaryTableIdentitySelect;
+		applyAssignments( assignments, insertStatement, temporaryTableReference );
+		final JdbcSelect temporaryTableIdentitySelect;
 		final JdbcOperationQueryMutation temporaryTableIdUpdate;
 		final String temporaryTableRowNumberSelectSql;
 		final JdbcOperationQueryMutation rootTableInsert;
 		final JdbcOperationQueryMutation temporaryTableIdentityUpdate;
 		final String rootTableInsertWithReturningSql;
+		final var sqlAstTranslatorFactory =
+				getSessionFactory().getJdbcServices()
+						.getJdbcEnvironment().getSqlAstTranslatorFactory();
 		if ( !assignsId && generator.generatedOnExecution() ) {
-			final BasicEntityIdentifierMapping identifierMapping =
-					(BasicEntityIdentifierMapping) getEntityDescriptor().getIdentifierMapping();
-			final QuerySpec idSelectQuerySpec = new QuerySpec( true );
+			final var identifierMapping =
+					(BasicEntityIdentifierMapping)
+							getEntityDescriptor().getIdentifierMapping();
+			final var idSelectQuerySpec = new QuerySpec( true );
 			idSelectQuerySpec.getFromClause().addRoot( temporaryTableGroup );
-			final ColumnReference columnReference = new ColumnReference(
+			final var columnReference = new ColumnReference(
 					(String) null,
 					TemporaryTable.ENTITY_TABLE_IDENTITY_COLUMN,
 					false,
@@ -568,7 +558,7 @@ private RootTableInserter createRootTableInserter(
 					)
 			);
 			if ( entityTable.getSessionUidColumn() != null ) {
-				final TemporaryTableColumn sessionUidColumn = entityTable.getSessionUidColumn();
+				final var sessionUidColumn = entityTable.getSessionUidColumn();
 				idSelectQuerySpec.applyPredicate( new ComparisonPredicate(
 						new ColumnReference(
 								temporaryTableReference,
@@ -581,24 +571,21 @@ private RootTableInserter createRootTableInserter(
 						sessionUidParameter
 				) );
 			}
-			final SelectStatement selectStatement = new SelectStatement(
-					idSelectQuerySpec,
-					Collections.singletonList(
-							new BasicFetch<>(
+			final var selectStatement =
+					new SelectStatement(
+							idSelectQuerySpec,
+							singletonList( new BasicFetch<>(
 									0,
 									null,
 									null,
 									identifierMapping,
 									FetchTiming.IMMEDIATE,
-									null,
 									false
-							)
-					)
-			);
-			temporaryTableIdentitySelect = jdbcServices.getJdbcEnvironment()
-					.getSqlAstTranslatorFactory()
-					.buildSelectTranslator( getSessionFactory(), selectStatement )
-					.translate( null, executionContext.getQueryOptions() );
+							) )
+					);
+			temporaryTableIdentitySelect =
+					sqlAstTranslatorFactory.buildSelectTranslator( getSessionFactory(), selectStatement )
+							.translate( null, executionContext.getQueryOptions() );
 			temporaryTableIdUpdate = null;
 			temporaryTableRowNumberSelectSql = null;
 
@@ -617,8 +604,8 @@ private RootTableInserter createRootTableInserter(
 			// to then insert into the target tables in once statement
 			if ( insertStatement.getTargetColumns().stream()
 					.noneMatch( c -> keyColumns[0].equals( c.getColumnExpression() ) ) ) {
-				final EntityIdentifierMapping identifierMapping = getEntityDescriptor().getIdentifierMapping();
-				final List<TemporaryTableColumn> primaryKeyTableColumns =
+				final var identifierMapping = getEntityDescriptor().getIdentifierMapping();
+				final var primaryKeyTableColumns =
 						getPrimaryKeyTableColumns( getEntityDescriptor(), entityTable );
 
 				final TemporaryTableColumn sessionUidColumn;
@@ -642,18 +629,18 @@ private RootTableInserter createRootTableInserter(
 					);
 				}
 				if ( needsIdentifierGeneration( generator, assignsId ) ) {
-					final BasicEntityIdentifierMapping basicIdentifierMapping = (BasicEntityIdentifierMapping) identifierMapping;
-					final JdbcParameter rootIdentity = new SqlTypedMappingJdbcParameter( basicIdentifierMapping );
+					final var basicIdentifierMapping = (BasicEntityIdentifierMapping) identifierMapping;
+					final var rootIdentity = new SqlTypedMappingJdbcParameter( basicIdentifierMapping );
 					final List<Assignment> temporaryTableAssignments = new ArrayList<>( 1 );
-					final ColumnReference idColumnReference = new ColumnReference( (String) null, basicIdentifierMapping );
+					final var idColumnReference = new ColumnReference( (String) null, basicIdentifierMapping );
 					temporaryTableAssignments.add( new Assignment( idColumnReference, rootIdentity ) );
 
 					final int rowNumberIndex =
 							entityTable.getColumns().size() - (entityTable.getSessionUidColumn() == null ? 1 : 2);
-					final TemporaryTableColumn rowNumberColumn = entityTable.getColumns().get( rowNumberIndex );
-					final JdbcParameter rowNumber = new SqlTypedMappingJdbcParameter( rowNumberColumn );
+					final var rowNumberColumn = entityTable.getColumns().get( rowNumberIndex );
+					final var rowNumber = new SqlTypedMappingJdbcParameter( rowNumberColumn );
 
-					final UpdateStatement updateStatement = new UpdateStatement(
+					final var updateStatement = new UpdateStatement(
 							temporaryTableReference,
 							temporaryTableAssignments,
 							Predicate.combinePredicates(
@@ -672,15 +659,11 @@ private RootTableInserter createRootTableInserter(
 							)
 					);
 
-					temporaryTableIdUpdate = jdbcServices.getJdbcEnvironment()
-							.getSqlAstTranslatorFactory()
-							.buildMutationTranslator( getSessionFactory(), updateStatement )
-							.translate( null, executionContext.getQueryOptions() );
-					temporaryTableRowNumberSelectSql = ExecuteWithTemporaryTableHelper.createInsertedRowNumbersSelectSql(
-							entityTable,
-							sessionUidAccess,
-							executionContext
-					);
+					temporaryTableIdUpdate =
+							sqlAstTranslatorFactory.buildMutationTranslator( getSessionFactory(), updateStatement )
+									.translate( null, executionContext.getQueryOptions() );
+					temporaryTableRowNumberSelectSql =
+							createInsertedRowNumbersSelectSql( entityTable, executionContext );
 				}
 				else {
 					temporaryTableIdUpdate = null;
@@ -716,7 +699,7 @@ private RootTableInserter createRootTableInserter(
 			}
 		}
 		if ( entityTable.getSessionUidColumn() != null ) {
-			final TemporaryTableColumn sessionUidColumn = entityTable.getSessionUidColumn();
+			final var sessionUidColumn = entityTable.getSessionUidColumn();
 			querySpec.applyPredicate( new ComparisonPredicate(
 					new ColumnReference(
 							temporaryTableReference,
@@ -730,26 +713,26 @@ private RootTableInserter createRootTableInserter(
 			) );
 		}
 
-		rootTableInsert = jdbcServices.getJdbcEnvironment()
-				.getSqlAstTranslatorFactory()
-				.buildMutationTranslator( getSessionFactory(), insertStatement )
-				.translate( null, executionContext.getQueryOptions() );
+		rootTableInsert =
+				sqlAstTranslatorFactory.buildMutationTranslator( getSessionFactory(), insertStatement )
+						.translate( null, executionContext.getQueryOptions() );
 
 		if ( !assignsId && generator.generatedOnExecution() ) {
-			final GeneratedValuesMutationDelegate insertDelegate = getEntityDescriptor().getInsertDelegate();
+			final var insertDelegate = getEntityDescriptor().getInsertDelegate();
 			// todo 7.0 : InsertGeneratedIdentifierDelegate will be removed once we're going to handle
 			//            generated values within the jdbc insert operaetion itself
-			final InsertGeneratedIdentifierDelegate identifierDelegate = (InsertGeneratedIdentifierDelegate) insertDelegate;
+			final var identifierDelegate = (InsertGeneratedIdentifierDelegate) insertDelegate;
 			rootTableInsertWithReturningSql = identifierDelegate.prepareIdentifierGeneratingInsert( rootTableInsert.getSqlString() );
-			final BasicEntityIdentifierMapping identifierMapping =
-					(BasicEntityIdentifierMapping) getEntityDescriptor().getIdentifierMapping();
+			final var identifierMapping =
+					(BasicEntityIdentifierMapping)
+							getEntityDescriptor().getIdentifierMapping();
 
-			final List<TemporaryTableColumn> primaryKeyTableColumns =
+			final var primaryKeyTableColumns =
 					getPrimaryKeyTableColumns( getEntityDescriptor(), entityTable );
 			assert primaryKeyTableColumns.size() == 1;
 
-			final JdbcParameter entityIdentity = new SqlTypedMappingJdbcParameter( identifierMapping );
-			final JdbcParameter rootIdentity = new SqlTypedMappingJdbcParameter( identifierMapping );
+			final var entityIdentity = new SqlTypedMappingJdbcParameter( identifierMapping );
+			final var rootIdentity = new SqlTypedMappingJdbcParameter( identifierMapping );
 			final List<Assignment> temporaryTableAssignments = new ArrayList<>( 1 );
 			temporaryTableAssignments.add(
 					new Assignment(
@@ -763,7 +746,7 @@ private RootTableInserter createRootTableInserter(
 							rootIdentity
 					)
 			);
-			final UpdateStatement updateStatement = new UpdateStatement(
+			final var updateStatement = new UpdateStatement(
 					temporaryTableReference,
 					temporaryTableAssignments,
 					new ComparisonPredicate(
@@ -779,10 +762,9 @@ private RootTableInserter createRootTableInserter(
 					)
 			);
 
-			temporaryTableIdentityUpdate = jdbcServices.getJdbcEnvironment()
-					.getSqlAstTranslatorFactory()
-					.buildMutationTranslator( getSessionFactory(), updateStatement )
-					.translate( null, executionContext.getQueryOptions() );
+			temporaryTableIdentityUpdate =
+					sqlAstTranslatorFactory.buildMutationTranslator( getSessionFactory(), updateStatement )
+							.translate( null, executionContext.getQueryOptions() );
 		}
 		else {
 			rootTableInsertWithReturningSql = null;
@@ -799,15 +781,14 @@ private RootTableInserter createRootTableInserter(
 	}
 
 	private boolean needsIdentifierGeneration(Generator identifierGenerator, boolean assignsId) {
-		if ( !assignsId && identifierGenerator instanceof OptimizableGenerator ) {
+		if ( !assignsId && identifierGenerator instanceof OptimizableGenerator optimizableGenerator ) {
 			// If the generator uses an optimizer or is not bulk insertion capable,
 			// we have to generate identifiers for the new rows, as that couldn't
 			// have been done via a SQL expression
-			final Optimizer optimizer = ( (OptimizableGenerator) identifierGenerator ).getOptimizer();
+			final var optimizer = optimizableGenerator.getOptimizer();
 			return optimizer != null && optimizer.getIncrementSize() > 1
-				|| identifierGenerator instanceof BulkInsertionCapableIdentifierGenerator
-					&& !( (BulkInsertionCapableIdentifierGenerator) identifierGenerator )
-					.supportsBulkInsertionIdentifierGeneration();
+				|| identifierGenerator instanceof BulkInsertionCapableIdentifierGenerator bulkInsertionCapable
+						&& !bulkInsertionCapable.supportsBulkInsertionIdentifierGeneration();
 		}
 		else {
 			return false;
@@ -822,38 +803,38 @@ private JdbcOperationQueryMutation createTableInsert(
 			boolean nullableTable,
 			Map<String, List<Assignment>> assignmentsByTable,
 			ExecutionContext executionContext) {
-		final TableReference updatingTableReference = updatingTableGroup.getTableReference(
+		final var updatingTableReference = updatingTableGroup.getTableReference(
 				updatingTableGroup.getNavigablePath(),
 				tableExpression,
 				true
 		);
 
-		final List<Assignment> assignments = assignmentsByTable.get( tableExpression );
+		final var assignments = assignmentsByTable.get( tableExpression );
 		if ( nullableTable && ( assignments == null || assignments.isEmpty() ) ) {
 			// no assignments for this table - skip it
 			return null;
 		}
-		final NamedTableReference dmlTargetTableReference = resolveUnionTableReference( updatingTableReference, tableExpression );
+		final var dmlTargetTableReference =
+				resolveUnionTableReference( updatingTableReference, tableExpression );
 
-		final QuerySpec querySpec = new QuerySpec( true );
-		final NamedTableReference temporaryTableReference = new NamedTableReference(
+		final var querySpec = new QuerySpec( true );
+		final var temporaryTableReference = new NamedTableReference(
 				translatedInsertStatement.getTargetTable().getTableExpression(),
 				"hte_tmp"
 		);
-		final TableGroupImpl temporaryTableGroup = new TableGroupImpl(
+		final var temporaryTableGroup = new TableGroupImpl(
 				updatingTableGroup.getNavigablePath(),
 				null,
 				temporaryTableReference,
 				getEntityDescriptor()
 		);
 		querySpec.getFromClause().addRoot( temporaryTableGroup );
-		final InsertSelectStatement insertStatement = new InsertSelectStatement( dmlTargetTableReference );
+		final var insertStatement = new InsertSelectStatement( dmlTargetTableReference, getEntityDescriptor() );
 		insertStatement.setSourceSelectStatement( querySpec );
-		applyAssignments( assignments, insertStatement, temporaryTableReference, getEntityDescriptor() );
-		if ( insertStatement.getTargetColumns()
-				.stream()
-				.noneMatch( c -> keyColumns[0].equals( c.getColumnExpression() ) ) ) {
-			final List<TemporaryTableColumn> primaryKeyTableColumns =
+		applyAssignments( assignments, insertStatement, temporaryTableReference );
+		if ( insertStatement.getTargetColumns().stream()
+				.noneMatch( column -> keyColumns[0].equals( column.getColumnExpression() ) ) ) {
+			final var primaryKeyTableColumns =
 					getPrimaryKeyTableColumns( getEntityDescriptor().getEntityPersister(), entityTable );
 			getEntityDescriptor().getIdentifierMapping().forEachSelectable( 0, (selectionIndex, selectableMapping) -> {
 				insertStatement.addTargetColumnReferences(
@@ -880,7 +861,7 @@ private JdbcOperationQueryMutation createTableInsert(
 		}
 
 		if ( entityTable.getSessionUidColumn() != null ) {
-			final TemporaryTableColumn sessionUidColumn = entityTable.getSessionUidColumn();
+			final var sessionUidColumn = entityTable.getSessionUidColumn();
 			querySpec.applyPredicate( new ComparisonPredicate(
 					new ColumnReference(
 							temporaryTableReference,
@@ -893,9 +874,8 @@ private JdbcOperationQueryMutation createTableInsert(
 					sessionUidParameter
 			) );
 		}
-		final JdbcServices jdbcServices = getSessionFactory().getJdbcServices();
-		return jdbcServices.getJdbcEnvironment()
-				.getSqlAstTranslatorFactory()
+		return getSessionFactory().getJdbcServices()
+				.getJdbcEnvironment().getSqlAstTranslatorFactory()
 				.buildMutationTranslator( getSessionFactory(), insertStatement )
 				.translate( null, executionContext.getQueryOptions() );
 	}
@@ -907,18 +887,22 @@ private List<TemporaryTableColumn> getPrimaryKeyTableColumns(EntityPersister ent
 		return entityTable.getColumns().subList( startIndex, endIndex );
 	}
 
-	private void applyAssignments(List<Assignment> assignments, InsertSelectStatement insertStatement, NamedTableReference temporaryTableReference, EntityPersister entityDescriptor) {
+	private void applyAssignments(
+			List<Assignment> assignments,
+			InsertSelectStatement insertStatement,
+			NamedTableReference temporaryTableReference) {
 		if ( assignments != null && !assignments.isEmpty() ) {
-			for ( Assignment assignment : assignments ) {
-				final Assignable assignable = assignment.getAssignable();
+			for ( var assignment : assignments ) {
+				final var assignable = assignment.getAssignable();
 				insertStatement.addTargetColumnReferences( assignable.getColumnReferences() );
-				final List<TemporaryTableColumn> columns = entityTable.findTemporaryTableColumns(
+				final var columns = entityTable.findTemporaryTableColumns(
 						getEntityDescriptor().getEntityPersister(),
-						((SqmPathInterpretation<?>) assignable).getExpressionType()
+						( (SqmPathInterpretation<?>) assignable ).getExpressionType()
 				);
-				for ( TemporaryTableColumn temporaryTableColumn : columns ) {
-					insertStatement.getSourceSelectStatement().getFirstQuerySpec().getSelectClause().addSqlSelection(
-							new SqlSelectionImpl(
+				for ( var temporaryTableColumn : columns ) {
+					insertStatement.getSourceSelectStatement()
+							.getFirstQuerySpec().getSelectClause()
+							.addSqlSelection( new SqlSelectionImpl(
 									new ColumnReference(
 											temporaryTableReference.getIdentificationVariable(),
 											temporaryTableColumn.getColumnName(),
@@ -926,8 +910,7 @@ private void applyAssignments(List<Assignment> assignments, InsertSelectStatemen
 											null,
 											temporaryTableColumn.getJdbcMapping()
 									)
-							)
-					);
+							) );
 				}
 			}
 		}
@@ -935,7 +918,7 @@ private void applyAssignments(List<Assignment> assignments, InsertSelectStatemen
 
 	@Override
 	public JdbcParameterBindings createJdbcParameterBindings(DomainQueryExecutionContext context) {
-		final JdbcParameterBindings jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
+		final var jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
 				context.getQueryParameterBindings(),
 				domainParameterXref,
 				jdbcParamsXref,
@@ -949,13 +932,9 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 				context.getSession()
 		);
 		if ( sessionUidParameter != null ) {
-			jdbcParameterBindings.addBinding(
-					sessionUidParameter,
-					new JdbcParameterBindingImpl(
-							entityTable.getSessionUidColumn().getJdbcMapping(),
-							UUID.fromString( sessionUidAccess.apply( context.getSession() ) )
-					)
-			);
+			jdbcParameterBindings.addBinding( sessionUidParameter,
+					new JdbcParameterBindingImpl( entityTable.getSessionUidColumn().getJdbcMapping(),
+							UUID.fromString( sessionUidAccess.apply( context.getSession() ) ) ) );
 		}
 		return jdbcParameterBindings;
 	}
@@ -980,7 +959,7 @@ public boolean dependsOnParameterBindings() {
 			&& rootTableInserter.temporaryTableIdentityUpdate.dependsOnParameterBindings() ) {
 			return true;
 		}
-		for ( JdbcOperationQueryMutation delete : nonRootTableInserts ) {
+		for ( var delete : nonRootTableInserts ) {
 			if ( delete.dependsOnParameterBindings() ) {
 				return true;
 			}
@@ -1008,7 +987,7 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
 			&& rootTableInserter.temporaryTableIdentityUpdate.isCompatibleWith( jdbcParameterBindings, queryOptions ) ) {
 			return true;
 		}
-		for ( JdbcOperationQueryMutation delete : nonRootTableInserts ) {
+		for ( var delete : nonRootTableInserts ) {
 			if ( !delete.isCompatibleWith( jdbcParameterBindings, queryOptions ) ) {
 				return false;
 			}
@@ -1023,7 +1002,8 @@ private TableReference resolveTableReference(
 			// This happens only for the special row_number column
 			return null;
 		}
-		final TableReference tableReferenceByQualifier = tableReferenceByAlias.get( columnReference.getQualifier() );
+		final var tableReferenceByQualifier =
+				tableReferenceByAlias.get( columnReference.getQualifier() );
 		if ( tableReferenceByQualifier != null ) {
 			return tableReferenceByQualifier;
 		}
@@ -1051,31 +1031,26 @@ public SqmInsertStatement<?> getSqmInsertStatement() {
 	@Override
 	public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecutionContext context) {
 		if ( LOG.isTraceEnabled() ) {
-			LOG.tracef(
-					"Starting multi-table insert execution - %s",
-					getSqmStatement().getTarget().getModel().getName()
-			);
+			LOG.tracef( "Starting multi-table insert execution - "
+					+ getSqmStatement().getTarget().getModel().getName() );
 		}
 
-		final SqmJdbcExecutionContextAdapter executionContext = SqmJdbcExecutionContextAdapter.omittingLockingAndPaging( context );
+		final var executionContext = omittingLockingAndPaging( context );
 		// NOTE: we could get rid of using a temporary table if the expressions in Values are "stable".
 		// But that is a non-trivial optimization that requires more effort
 		// as we need to split out individual inserts if we have a non-bulk capable optimizer
-		final boolean createdTable = ExecuteWithTemporaryTableHelper.performBeforeTemporaryTableUseActions(
-				entityTable,
-				temporaryTableStrategy,
-				executionContext
-		);
-
+		final boolean createdTable =
+				performBeforeTemporaryTableUseActions(
+						entityTable,
+						temporaryTableStrategy,
+						executionContext
+				);
 		try {
-			final int rows = ExecuteWithTemporaryTableHelper.saveIntoTemporaryTable(
-					temporaryTableInsert.jdbcOperation(),
-					jdbcParameterBindings,
-					executionContext
-			);
-
+			final int rows =
+					saveIntoTemporaryTable( temporaryTableInsert.jdbcOperation(),
+							jdbcParameterBindings, executionContext );
 			if ( rows != 0 ) {
-				final JdbcParameterBindings sessionUidBindings = new JdbcParameterBindingsImpl( 1 );
+				final var sessionUidBindings = new JdbcParameterBindingsImpl( 1 );
 				if ( sessionUidParameter != null ) {
 					sessionUidBindings.addBinding(
 							sessionUidParameter,
@@ -1086,14 +1061,15 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 					);
 				}
 
-				final int insertedRows = insertRootTable(
-						rows,
-						createdTable,
-						sessionUidBindings,
-						executionContext
-				);
+				final int insertedRows =
+						insertRootTable(
+								rows,
+								createdTable,
+								sessionUidBindings,
+								executionContext
+						);
 
-				for ( JdbcOperationQueryMutation nonRootTableInsert : nonRootTableInserts ) {
+				for ( var nonRootTableInsert : nonRootTableInserts ) {
 					insertTable(
 							nonRootTableInsert,
 							sessionUidBindings,
@@ -1106,7 +1082,7 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 			return rows;
 		}
 		finally {
-			ExecuteWithTemporaryTableHelper.performAfterTemporaryTableUseActions(
+			performAfterTemporaryTableUseActions(
 					entityTable,
 					sessionUidAccess,
 					getAfterUseAction(),
@@ -1120,16 +1096,16 @@ private int insertRootTable(
 			boolean rowNumberStartsAtOne,
 			JdbcParameterBindings sessionUidBindings,
 			SqmJdbcExecutionContextAdapter executionContext) {
-		final EntityPersister entityPersister = getEntityDescriptor().getEntityPersister();
-		final Generator generator = entityPersister.getGenerator();
-		final EntityIdentifierMapping identifierMapping = entityPersister.getIdentifierMapping();
+		final var entityPersister = getEntityDescriptor().getEntityPersister();
+		final var generator = entityPersister.getGenerator();
+		final var identifierMapping = entityPersister.getIdentifierMapping();
 
-		final SharedSessionContractImplementor session = executionContext.getSession();
-		final JdbcServices jdbcServices = session.getFactory().getJdbcServices();
+		final var session = executionContext.getSession();
+		final var jdbcServices = session.getFactory().getJdbcServices();
 
 		final Map<Object, Object> entityTableToRootIdentity;
 		if ( rootTableInserter.temporaryTableIdentitySelect != null ) {
-			final List<Object> list = jdbcServices.getJdbcSelectExecutor().list(
+			final var list = jdbcServices.getJdbcSelectExecutor().list(
 					rootTableInserter.temporaryTableIdentitySelect,
 					sessionUidBindings,
 					executionContext,
@@ -1139,21 +1115,17 @@ private int insertRootTable(
 					rows
 			);
 			entityTableToRootIdentity = new LinkedHashMap<>( list.size() );
-			for ( Object o : list ) {
-				entityTableToRootIdentity.put( o, null );
+			for ( Object object : list ) {
+				entityTableToRootIdentity.put( object, null );
 			}
 		}
 		else {
 			entityTableToRootIdentity = null;
 
 			if ( rootTableInserter.temporaryTableIdUpdate != null ) {
-				final BeforeExecutionGenerator beforeExecutionGenerator = (BeforeExecutionGenerator) generator;
-				final IntStream rowNumberStream = !rowNumberStartsAtOne
-						? IntStream.of( ExecuteWithTemporaryTableHelper.loadInsertedRowNumbers(
-						rootTableInserter.temporaryTableRowNumberSelectSql, entityTable, sessionUidAccess, rows,
-						executionContext ) )
-						: IntStream.range( 1, rows + 1 );
-				final JdbcParameterBindings updateBindings = new JdbcParameterBindingsImpl( 3 );
+				final var beforeExecutionGenerator = (BeforeExecutionGenerator) generator;
+				final var rowNumberStream = rowNumberStream( rows, rowNumberStartsAtOne, executionContext );
+				final var updateBindings = new JdbcParameterBindingsImpl( 3 );
 				if ( sessionUidParameter != null ) {
 					updateBindings.addBinding(
 							sessionUidParameter,
@@ -1163,10 +1135,10 @@ private int insertRootTable(
 							)
 					);
 				}
-				final List<JdbcParameterBinder> parameterBinders = rootTableInserter.temporaryTableIdUpdate.getParameterBinders();
-				final JdbcParameter rootIdentity = (JdbcParameter) parameterBinders.get( 0 );
-				final JdbcParameter rowNumber = (JdbcParameter) parameterBinders.get( 1 );
-				final BasicEntityIdentifierMapping basicIdentifierMapping = (BasicEntityIdentifierMapping) identifierMapping;
+				final var parameterBinders = rootTableInserter.temporaryTableIdUpdate.getParameterBinders();
+				final var rootIdentity = (JdbcParameter) parameterBinders.get( 0 );
+				final var rowNumber = (JdbcParameter) parameterBinders.get( 1 );
+				final var basicIdentifierMapping = (BasicEntityIdentifierMapping) identifierMapping;
 				rowNumberStream.forEach( rowNumberValue -> {
 					updateBindings.addBinding(
 							rowNumber,
@@ -1185,12 +1157,9 @@ private int insertRootTable(
 					final int updateCount = jdbcServices.getJdbcMutationExecutor().execute(
 							rootTableInserter.temporaryTableIdUpdate,
 							updateBindings,
-							sql -> session
-									.getJdbcCoordinator()
-									.getStatementPreparer()
+							sql -> session.getJdbcCoordinator().getStatementPreparer()
 									.prepareStatement( sql ),
-							(integer, preparedStatement) -> {
-							},
+							(integer, preparedStatement) -> {},
 							executionContext
 					);
 					assert updateCount == 1;
@@ -1199,14 +1168,14 @@ private int insertRootTable(
 		}
 
 		if ( rootTableInserter.rootTableInsertWithReturningSql != null ) {
-			final GeneratedValuesMutationDelegate insertDelegate = entityPersister.getEntityPersister().getInsertDelegate();
-			final BasicEntityIdentifierMapping basicIdentifierMapping = (BasicEntityIdentifierMapping) identifierMapping;
+			final var insertDelegate = entityPersister.getEntityPersister().getInsertDelegate();
+			final var basicIdentifierMapping = (BasicEntityIdentifierMapping) identifierMapping;
 			// todo 7.0 : InsertGeneratedIdentifierDelegate will be removed once we're going to handle
 			//            generated values within the jdbc insert operaetion itself
-			final InsertGeneratedIdentifierDelegate identifierDelegate = (InsertGeneratedIdentifierDelegate) insertDelegate;
-			final ValueBinder jdbcValueBinder = basicIdentifierMapping.getJdbcMapping().getJdbcValueBinder();
-			for ( Map.Entry<Object, Object> entry : entityTableToRootIdentity.entrySet() ) {
-				final GeneratedValues generatedValues = identifierDelegate.performInsertReturning(
+			final var identifierDelegate = (InsertGeneratedIdentifierDelegate) insertDelegate;
+			final var jdbcValueBinder = basicIdentifierMapping.getJdbcMapping().getJdbcValueBinder();
+			for ( var entry : entityTableToRootIdentity.entrySet() ) {
+				final var generatedValues = identifierDelegate.performInsertReturning(
 						rootTableInserter.rootTableInsertWithReturningSql,
 						session,
 						new Binder() {
@@ -1232,62 +1201,65 @@ public Object getEntity() {
 				final Object rootIdentity = generatedValues.getGeneratedValue( identifierMapping );
 				entry.setValue( rootIdentity );
 			}
-			final JdbcParameterBindings updateBindings = new JdbcParameterBindingsImpl( 2 );
-
-			final List<JdbcParameterBinder> parameterBinders = rootTableInserter.temporaryTableIdentityUpdate.getParameterBinders();
-			final JdbcParameter rootIdentity = (JdbcParameter) parameterBinders.get( 0 );
-			final JdbcParameter entityIdentity = (JdbcParameter) parameterBinders.get( 1 );
-			for ( Map.Entry<Object, Object> entry : entityTableToRootIdentity.entrySet() ) {
-				JdbcMapping jdbcMapping = basicIdentifierMapping.getJdbcMapping();
-				updateBindings.addBinding( entityIdentity, new JdbcParameterBindingImpl( jdbcMapping, entry.getKey() ) );
-				updateBindings.addBinding( rootIdentity, new JdbcParameterBindingImpl( jdbcMapping, entry.getValue() ) );
+			final var updateBindings = new JdbcParameterBindingsImpl( 2 );
+			final var parameterBinders = rootTableInserter.temporaryTableIdentityUpdate.getParameterBinders();
+			final var rootIdentity = (JdbcParameter) parameterBinders.get( 0 );
+			final var entityIdentity = (JdbcParameter) parameterBinders.get( 1 );
+			for ( var entry : entityTableToRootIdentity.entrySet() ) {
+				final var jdbcMapping = basicIdentifierMapping.getJdbcMapping();
+				updateBindings.addBinding( entityIdentity,
+						new JdbcParameterBindingImpl( jdbcMapping, entry.getKey() ) );
+				updateBindings.addBinding( rootIdentity,
+						new JdbcParameterBindingImpl( jdbcMapping, entry.getValue() ) );
 				jdbcServices.getJdbcMutationExecutor().execute(
 						rootTableInserter.temporaryTableIdentityUpdate,
 						updateBindings,
-						sql -> session
-								.getJdbcCoordinator()
-								.getStatementPreparer()
+						sql -> session.getJdbcCoordinator().getStatementPreparer()
 								.prepareStatement( sql ),
-						(integer, preparedStatement) -> {
-						},
+						(integer, preparedStatement) -> {},
 						executionContext
 				);
 			}
-
 			return entityTableToRootIdentity.size();
 		}
 		else {
 			return jdbcServices.getJdbcMutationExecutor().execute(
 					rootTableInserter.rootTableInsert,
 					sessionUidBindings,
-					sql -> session
-							.getJdbcCoordinator()
-							.getStatementPreparer()
+					sql -> session.getJdbcCoordinator().getStatementPreparer()
 							.prepareStatement( sql ),
-					(integer, preparedStatement) -> {
-					},
+					(integer, preparedStatement) -> {},
 					executionContext
 			);
 		}
 	}
 
+	private IntStream rowNumberStream(
+			int rows, boolean rowNumberStartsAtOne,
+			SqmJdbcExecutionContextAdapter executionContext) {
+		return !rowNumberStartsAtOne
+				? IntStream.of( loadInsertedRowNumbers(
+					rootTableInserter.temporaryTableRowNumberSelectSql,
+					entityTable, sessionUidAccess, rows, executionContext
+				) )
+				: IntStream.range( 1, rows + 1 );
+	}
+
 	private void insertTable(
 			JdbcOperationQueryMutation nonRootTableInsert,
 			JdbcParameterBindings sessionUidBindings,
 			ExecutionContext executionContext) {
-		final SharedSessionContractImplementor session = executionContext.getSession();
-		final JdbcServices jdbcServices = session.getFactory().getJdbcServices();
-		jdbcServices.getJdbcMutationExecutor().execute(
-				nonRootTableInsert,
-				sessionUidBindings,
-				sql -> executionContext.getSession()
-						.getJdbcCoordinator()
-						.getStatementPreparer()
-						.prepareStatement( sql ),
-				(integer, preparedStatement) -> {
-				},
-				executionContext
-		);
+		executionContext.getSession().getFactory().getJdbcServices()
+				.getJdbcMutationExecutor().execute(
+						nonRootTableInsert,
+						sessionUidBindings,
+						sql -> executionContext.getSession()
+								.getJdbcCoordinator()
+								.getStatementPreparer()
+								.prepareStatement( sql ),
+						(integer, preparedStatement) -> {},
+						executionContext
+				);
 	}
 
 	// For Hibernate Reactive
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedSoftDeleteHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedSoftDeleteHandler.java
index b78441d3779c..b844660398df 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedSoftDeleteHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedSoftDeleteHandler.java
@@ -6,16 +6,12 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.dialect.temptable.TemporaryTable;
-import org.hibernate.dialect.temptable.TemporaryTableSessionUidColumn;
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.MutableObject;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
-import org.hibernate.metamodel.mapping.TableDetails;
-import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.UnionSubclassEntityPersister;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.spi.QueryParameterImplementor;
@@ -26,6 +22,7 @@
 import org.hibernate.query.sqm.mutation.internal.AbstractMutationHandler;
 import org.hibernate.query.sqm.mutation.internal.DeleteHandler;
 import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter;
+import static org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper.softDeleteTargets;
 import org.hibernate.query.sqm.mutation.spi.AfterUseAction;
 import org.hibernate.query.sqm.spi.SqmParameterMappingModelResolutionAccess;
 import org.hibernate.query.sqm.tree.delete.SqmDeleteStatement;
@@ -39,15 +36,12 @@
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
 import org.hibernate.sql.ast.tree.predicate.InSubQueryPredicate;
-import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.sql.ast.tree.predicate.PredicateCollector;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
-import org.hibernate.sql.ast.tree.update.Assignment;
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.internal.SqlTypedMappingJdbcParameter;
-import org.hibernate.sql.exec.spi.JdbcMutationExecutor;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
@@ -62,6 +56,11 @@
 
 import static java.util.Collections.singletonList;
 import static org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter.omittingLockingAndPaging;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.createIdTableSelectQuerySpec;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.createMatchingIdsIntoIdTableInsert;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.performAfterTemporaryTableUseActions;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.performBeforeTemporaryTableUseActions;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.saveIntoTemporaryTable;
 
 /**
 * @author Steve Ebersole
@@ -81,7 +80,7 @@ public class TableBasedSoftDeleteHandler
 	private final @Nullable JdbcParameter sessionUidParameter;
 
 	private final @Nullable CacheableSqmInterpretation<InsertSelectStatement, JdbcOperationQueryMutation> idTableInsert;
-	private final JdbcOperationQueryMutation softDelete;
+	private final List<JdbcOperationQueryMutation> softDeletes;
 
 	public TableBasedSoftDeleteHandler(
 			SqmDeleteStatement<?> sqmDelete,
@@ -100,15 +99,13 @@ public TableBasedSoftDeleteHandler(
 
 		this.sessionUidAccess = sessionUidAccess;
 
-		final TemporaryTableSessionUidColumn sessionUidColumn = idTable.getSessionUidColumn();
-		if ( sessionUidColumn == null ) {
-			this.sessionUidParameter = null;
-		}
-		else {
-			this.sessionUidParameter = new SqlTypedMappingJdbcParameter( sessionUidColumn );
-		}
+		final var sessionUidColumn = idTable.getSessionUidColumn();
+		this.sessionUidParameter =
+				sessionUidColumn == null
+						? null
+						: new SqlTypedMappingJdbcParameter( sessionUidColumn );
 
-		final MultiTableSqmMutationConverter converter = new MultiTableSqmMutationConverter(
+		final var converter = new MultiTableSqmMutationConverter(
 				getEntityDescriptor(),
 				sqmDelete,
 				sqmDelete.getTarget(),
@@ -120,55 +117,57 @@ public TableBasedSoftDeleteHandler(
 		);
 
 
-		final String targetEntityName = sqmDelete.getTarget().getEntityName();
-		final EntityPersister targetEntityDescriptor =
+		final var targetEntityDescriptor =
 				getSessionFactory().getMappingMetamodel()
-						.getEntityDescriptor( targetEntityName );
+						.getEntityDescriptor( sqmDelete.getTarget().getEntityName() );
 
-		final EntityMappingType rootEntityDescriptor = targetEntityDescriptor.getRootEntityDescriptor();
+		final var rootEntityDescriptor = targetEntityDescriptor.getRootEntityDescriptor();
 
 		// determine if we need to use a sub-query for matching ids -
 		//		1. if the target is not the root we will
 		//		2. if the supplied predicate (if any) refers to columns from a table
 		//			other than the identifier table we will
-		final SqmJdbcExecutionContextAdapter executionContext = omittingLockingAndPaging( context );
-
-		final TableGroup deletingTableGroup = converter.getMutatingTableGroup();
-		final TableDetails softDeleteTable = rootEntityDescriptor.getSoftDeleteTableDetails();
-		final NamedTableReference rootTableReference = (NamedTableReference) deletingTableGroup.resolveTableReference(
-				deletingTableGroup.getNavigablePath(),
-				softDeleteTable.getTableName()
-		);
+		final var executionContext = omittingLockingAndPaging( context );
+
+		final var deletingTableGroup = converter.getMutatingTableGroup();
+		final var softDeleteTable = targetEntityDescriptor.getSoftDeleteTableDetails();
+		final var rootTableReference =
+				(NamedTableReference)
+						deletingTableGroup.resolveTableReference(
+								deletingTableGroup.getNavigablePath(),
+								softDeleteTable.getTableName()
+						);
 		assert rootTableReference != null;
 
-		// NOTE : `converter.visitWhereClause` already applies the soft-delete restriction
-		final Predicate specifiedRestriction = converter.visitWhereClause( sqmDelete.getWhereClause() );
+		// NOTE: `converter.visitWhereClause` already applies the soft-delete restriction
+		final var specifiedRestriction = converter.visitWhereClause( sqmDelete.getWhereClause() );
 
-		final PredicateCollector predicateCollector = new PredicateCollector( specifiedRestriction );
+		final var predicateCollector = new PredicateCollector( specifiedRestriction );
 		targetEntityDescriptor.applyBaseRestrictions(
 				predicateCollector,
 				deletingTableGroup,
 				true,
-				executionContext.getSession().getLoadQueryInfluencers().getEnabledFilters(),
+				executionContext.getSession()
+						.getLoadQueryInfluencers().getEnabledFilters(),
 				false,
 				null,
 				converter
 		);
 
 		converter.pruneTableGroupJoins();
-		final ColumnReferenceCheckingSqlAstWalker walker = new ColumnReferenceCheckingSqlAstWalker(
-				rootTableReference.getIdentificationVariable()
-		);
-		if ( predicateCollector.getPredicate() != null ) {
-			predicateCollector.getPredicate().accept( walker );
+		final var walker =
+				new ColumnReferenceCheckingSqlAstWalker(
+						rootTableReference.getIdentificationVariable() );
+		final var predicate = predicateCollector.getPredicate();
+		if ( predicate != null ) {
+			predicate.accept( walker );
 		}
 
-
 		this.domainParameterXref = domainParameterXref;
 		this.jdbcParamsXref = SqmUtil.generateJdbcParamsXref( domainParameterXref, converter );
 		this.resolvedParameterMappingModelTypes = converter.getSqmParameterMappingModelExpressibleResolutions();
 
-		final JdbcParameterBindings jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
+		final var jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
 				context.getQueryParameterBindings(),
 				domainParameterXref,
 				jdbcParamsXref,
@@ -181,22 +180,21 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 				context.getSession()
 		);
 		if ( sessionUidParameter != null ) {
-			jdbcParameterBindings.addBinding(
-					sessionUidParameter,
-					new JdbcParameterBindingImpl(
-							idTable.getSessionUidColumn().getJdbcMapping(),
-							UUID.fromString( sessionUidAccess.apply( context.getSession() ) )
-					)
-			);
+			jdbcParameterBindings.addBinding( sessionUidParameter,
+					new JdbcParameterBindingImpl( idTable.getSessionUidColumn().getJdbcMapping(),
+							UUID.fromString( sessionUidAccess.apply( context.getSession() ) ) ) );
 		}
 
-		final boolean needsSubQuery = !walker.isAllColumnReferencesFromIdentificationVariable()
-									|| targetEntityDescriptor != rootEntityDescriptor;
+		final boolean needsSubQuery =
+				!walker.isAllColumnReferencesFromIdentificationVariable()
+						|| targetEntityDescriptor != rootEntityDescriptor
+						|| targetEntityDescriptor.getEntityPersister() instanceof UnionSubclassEntityPersister;
 		if ( needsSubQuery ) {
-			if ( getSessionFactory().getJdbcServices().getDialect().supportsSubqueryOnMutatingTable() ) {
+			if ( getSessionFactory().getJdbcServices().getDialect()
+					.supportsSubqueryOnMutatingTable() ) {
 				this.idTableInsert = null;
-				this.softDelete = createDeleteWithSubQuery(
-						rootEntityDescriptor,
+				this.softDeletes = createDeletesWithSubQuery(
+						targetEntityDescriptor,
 						deletingTableGroup,
 						rootTableReference,
 						predicateCollector,
@@ -206,136 +204,132 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 				);
 			}
 			else {
-				this.idTableInsert = ExecuteWithTemporaryTableHelper.createMatchingIdsIntoIdTableInsert(
+				this.idTableInsert = createMatchingIdsIntoIdTableInsert(
 						converter,
-						predicateCollector.getPredicate(),
+						predicate,
 						idTable,
 						sessionUidParameter,
 						jdbcParameterBindings,
 						executionContext
 				);
-				this.softDelete = createDeleteUsingIdTable(
-						rootEntityDescriptor,
-						rootTableReference,
-						predicateCollector,
+				this.softDeletes = createDeletesUsingIdTable(
+						targetEntityDescriptor,
 						executionContext
 				);
 			}
 		}
 		else {
 			this.idTableInsert = null;
-			this.softDelete = createDirectDelete(
-					rootEntityDescriptor,
+			this.softDeletes = singletonList( createDirectDelete(
+					targetEntityDescriptor,
 					rootTableReference,
 					predicateCollector,
 					jdbcParameterBindings,
 					executionContext
-			);
+			) );
 		}
 
 		firstJdbcParameterBindingsConsumer.set( jdbcParameterBindings );
 	}
 
-	private JdbcOperationQueryMutation createDeleteUsingIdTable(
-			EntityMappingType rootEntityDescriptor,
-			NamedTableReference targetTableReference,
-			PredicateCollector predicateCollector,
+	private List<JdbcOperationQueryMutation> createDeletesUsingIdTable(
+			EntityMappingType targetEntityDescriptor,
 			SqmJdbcExecutionContextAdapter executionContext) {
-		final QuerySpec idTableIdentifierSubQuery = ExecuteWithTemporaryTableHelper.createIdTableSelectQuerySpec(
-				getIdTable(),
-				sessionUidParameter,
-				getEntityDescriptor(),
-				executionContext
-		);
-
-		final Assignment softDeleteAssignment = rootEntityDescriptor
-				.getSoftDeleteMapping()
-				.createSoftDeleteAssignment( targetTableReference );
-		final Expression idExpression = createIdExpression( rootEntityDescriptor, targetTableReference );
-		final UpdateStatement updateStatement = new UpdateStatement(
-				targetTableReference,
-				singletonList( softDeleteAssignment ),
-				new InSubQueryPredicate( idExpression, idTableIdentifierSubQuery, false )
-		);
-
-		final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
-
-		final JdbcServices jdbcServices = factory.getJdbcServices();
-
-		return jdbcServices.getJdbcEnvironment()
-				.getSqlAstTranslatorFactory()
-				.buildMutationTranslator( factory, updateStatement )
-				.translate( JdbcParameterBindings.NO_BINDINGS, executionContext.getQueryOptions() );
+		final var factory = executionContext.getSession().getFactory();
+		final var softDeleteMutations = new ArrayList<JdbcOperationQueryMutation>();
+		for ( var entityDescriptor : softDeleteTargets( targetEntityDescriptor ) ) {
+			final var tableDetails = entityDescriptor.getSoftDeleteTableDetails();
+			final var targetTableReference = new NamedTableReference(
+					tableDetails.getTableName(),
+					DeleteStatement.DEFAULT_ALIAS,
+					false
+			);
+			final var idTableIdentifierSubQuery = createIdTableSelectQuerySpec(
+					getIdTable(),
+					sessionUidParameter,
+					getEntityDescriptor(),
+					executionContext
+			);
+			final var softDeleteAssignment =
+					entityDescriptor.getSoftDeleteMapping()
+							.createSoftDeleteAssignment( targetTableReference );
+			final var idExpression = createIdExpression( entityDescriptor, targetTableReference );
+			final var updateStatement =
+					new UpdateStatement( targetTableReference, singletonList( softDeleteAssignment ),
+							new InSubQueryPredicate( idExpression, idTableIdentifierSubQuery, false ) );
+			softDeleteMutations.add( factory.getJdbcServices().getJdbcEnvironment()
+					.getSqlAstTranslatorFactory()
+					.buildMutationTranslator( factory, updateStatement )
+					.translate( JdbcParameterBindings.NO_BINDINGS, executionContext.getQueryOptions() ) );
+		}
+		return softDeleteMutations;
 	}
 
-	private static Expression createIdExpression(EntityMappingType rootEntityDescriptor, NamedTableReference targetTableReference) {
-		final TableDetails softDeleteTable = rootEntityDescriptor.getSoftDeleteTableDetails();
-		final TableDetails.KeyDetails keyDetails = softDeleteTable.getKeyDetails();
+	private static Expression createIdExpression(EntityMappingType entityDescriptor, NamedTableReference targetTableReference) {
+		final var keyDetails = entityDescriptor.getSoftDeleteTableDetails().getKeyDetails();
 		final List<Expression> idExpressions = new ArrayList<>( keyDetails.getColumnCount() );
-		keyDetails.forEachKeyColumn( (position, column) -> idExpressions.add(
-				new ColumnReference( targetTableReference, column )
-		) );
-		final Expression idExpression = idExpressions.size() == 1
+		keyDetails.forEachKeyColumn( (position, column) ->
+				idExpressions.add( new ColumnReference( targetTableReference, column ) ) );
+		return idExpressions.size() == 1
 				? idExpressions.get( 0 )
-				: new SqlTuple( idExpressions, rootEntityDescriptor.getIdentifierMapping() );
-		return idExpression;
+				: new SqlTuple( idExpressions,
+						entityDescriptor.getIdentifierMapping() );
 	}
 
-	private JdbcOperationQueryMutation createDeleteWithSubQuery(
-			EntityMappingType rootEntityDescriptor,
+	private List<JdbcOperationQueryMutation> createDeletesWithSubQuery(
+			EntityMappingType targetEntityDescriptor,
 			TableGroup deletingTableGroup,
 			NamedTableReference rootTableReference,
 			PredicateCollector predicateCollector,
 			JdbcParameterBindings jdbcParameterBindings,
 			MultiTableSqmMutationConverter converter,
 			SqmJdbcExecutionContextAdapter executionContext) {
-		final QuerySpec matchingIdSubQuery = new QuerySpec( false, 1 );
+		// Build the matching-ids subquery (shared across all UPDATE statements)
+		final var matchingIdSubQuery = new QuerySpec( false, 1 );
 		matchingIdSubQuery.getFromClause().addRoot( deletingTableGroup );
 
-		final TableDetails identifierTableDetails = rootEntityDescriptor.getIdentifierTableDetails();
-		final TableDetails.KeyDetails keyDetails = identifierTableDetails.getKeyDetails();
-
-		final NamedTableReference targetTable = new NamedTableReference(
-				identifierTableDetails.getTableName(),
-				DeleteStatement.DEFAULT_ALIAS,
-				false
-		);
-
-		final List<Expression> idExpressions = new ArrayList<>( keyDetails.getColumnCount() );
+		final var keyDetails = targetEntityDescriptor.getIdentifierTableDetails().getKeyDetails();
 		keyDetails.forEachKeyColumn( (position, column) -> {
-			final Expression columnReference = converter.getSqlExpressionResolver().resolveSqlExpression(
-					rootTableReference,
-					column
-			);
-			matchingIdSubQuery.getSelectClause().addSqlSelection(
-					new SqlSelectionImpl( position, columnReference )
-			);
-			idExpressions.add( new ColumnReference( targetTable, column ) );
+			final var columnReference =
+					converter.getSqlExpressionResolver()
+							.resolveSqlExpression( rootTableReference, column );
+			matchingIdSubQuery.getSelectClause()
+					.addSqlSelection( new SqlSelectionImpl( position, columnReference ) );
 		} );
-
 		matchingIdSubQuery.applyPredicate( predicateCollector.getPredicate() );
-		final Expression idExpression = idExpressions.size() == 1
-				? idExpressions.get( 0 )
-				: new SqlTuple( idExpressions, rootEntityDescriptor.getIdentifierMapping() );
 
-		final Assignment softDeleteAssignment = rootEntityDescriptor
-				.getSoftDeleteMapping()
-				.createSoftDeleteAssignment( targetTable );
-
-		final UpdateStatement updateStatement = new UpdateStatement(
-				targetTable,
-				singletonList( softDeleteAssignment ),
-				new InSubQueryPredicate( idExpression, matchingIdSubQuery, false )
-		);
-
-		final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
-
-		final JdbcServices jdbcServices = factory.getJdbcServices();
+		// Create one UPDATE per concrete soft-delete table
+		final var factory = executionContext.getSession().getFactory();
+		final var softDeleteMutations = new ArrayList<JdbcOperationQueryMutation>();
+		for ( var entityDescriptor : softDeleteTargets( targetEntityDescriptor ) ) {
+			final var tableDetails = entityDescriptor.getSoftDeleteTableDetails();
+			final var targetTable = new NamedTableReference(
+					tableDetails.getTableName(),
+					DeleteStatement.DEFAULT_ALIAS,
+					false
+			);
 
-		return jdbcServices.getJdbcEnvironment()
-				.getSqlAstTranslatorFactory()
-				.buildMutationTranslator( factory, updateStatement )
-				.translate( jdbcParameterBindings, executionContext.getQueryOptions() );
+			final List<Expression> idExpressions = new ArrayList<>( keyDetails.getColumnCount() );
+			keyDetails.forEachKeyColumn( (position, column) ->
+					idExpressions.add( new ColumnReference( targetTable, column ) ) );
+			final var idExpression =
+					idExpressions.size() == 1
+							? idExpressions.get( 0 )
+							: new SqlTuple( idExpressions, entityDescriptor.getIdentifierMapping() );
+
+			final var softDeleteAssignment =
+					entityDescriptor.getSoftDeleteMapping()
+							.createSoftDeleteAssignment( targetTable );
+
+			final var updateStatement =
+					new UpdateStatement( targetTable, singletonList( softDeleteAssignment ),
+							new InSubQueryPredicate( idExpression, matchingIdSubQuery, false ) );
+
+			softDeleteMutations.add( factory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
+					.buildMutationTranslator( factory, updateStatement )
+					.translate( jdbcParameterBindings, executionContext.getQueryOptions() ) );
+		}
+		return softDeleteMutations;
 	}
 
 	private JdbcOperationQueryMutation createDirectDelete(
@@ -344,29 +338,23 @@ private JdbcOperationQueryMutation createDirectDelete(
 			PredicateCollector predicateCollector,
 			JdbcParameterBindings jdbcParameterBindings,
 			SqmJdbcExecutionContextAdapter executionContext) {
-		final Assignment softDeleteAssignment = rootEntityDescriptor
-				.getSoftDeleteMapping()
-				.createSoftDeleteAssignment( rootTableReference );
-
-		final UpdateStatement updateStatement = new UpdateStatement(
-				rootTableReference,
-				singletonList( softDeleteAssignment ),
-				predicateCollector.getPredicate()
-		);
-
-		final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
+		final var softDeleteAssignment =
+				rootEntityDescriptor.getSoftDeleteMapping()
+						.createSoftDeleteAssignment( rootTableReference );
 
-		final JdbcServices jdbcServices = factory.getJdbcServices();
+		final var updateStatement =
+				new UpdateStatement( rootTableReference, singletonList( softDeleteAssignment ),
+						predicateCollector.getPredicate() );
 
-		return jdbcServices.getJdbcEnvironment()
-				.getSqlAstTranslatorFactory()
+		final var factory = executionContext.getSession().getFactory();
+		return factory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
 				.buildMutationTranslator( factory, updateStatement )
 				.translate( jdbcParameterBindings, executionContext.getQueryOptions() );
 	}
 
 	@Override
 	public JdbcParameterBindings createJdbcParameterBindings(DomainQueryExecutionContext context) {
-		final JdbcParameterBindings jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
+		final var jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
 				context.getQueryParameterBindings(),
 				domainParameterXref,
 				jdbcParamsXref,
@@ -380,13 +368,9 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 				context.getSession()
 		);
 		if ( sessionUidParameter != null ) {
-			jdbcParameterBindings.addBinding(
-					sessionUidParameter,
-					new JdbcParameterBindingImpl(
-							idTable.getSessionUidColumn().getJdbcMapping(),
-							UUID.fromString( sessionUidAccess.apply( context.getSession() ) )
-					)
-			);
+			jdbcParameterBindings.addBinding( sessionUidParameter,
+					new JdbcParameterBindingImpl( idTable.getSessionUidColumn().getJdbcMapping(),
+							UUID.fromString( sessionUidAccess.apply( context.getSession() ) ) ) );
 		}
 		return jdbcParameterBindings;
 	}
@@ -396,8 +380,10 @@ public boolean dependsOnParameterBindings() {
 		if ( idTableInsert != null && idTableInsert.jdbcOperation().dependsOnParameterBindings() ) {
 			return true;
 		}
-		if ( softDelete.dependsOnParameterBindings() ) {
-			return true;
+		for ( var softDelete : softDeletes ) {
+			if ( softDelete.dependsOnParameterBindings() ) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -408,8 +394,10 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
 			&& !idTableInsert.jdbcOperation().isCompatibleWith( jdbcParameterBindings, queryOptions ) ) {
 			return false;
 		}
-		if ( !softDelete.isCompatibleWith( jdbcParameterBindings, queryOptions ) ) {
-			return false;
+		for ( var softDelete : softDeletes ) {
+			if ( !softDelete.isCompatibleWith( jdbcParameterBindings, queryOptions ) ) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -417,51 +405,46 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
 	@Override
 	public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecutionContext context) {
 		if ( LOG.isTraceEnabled() ) {
-			LOG.tracef(
-					"Starting multi-table delete execution - %s",
-					getSqmStatement().getTarget().getModel().getName()
-			);
+			LOG.tracef( "Starting multi-table delete execution - "
+						+ getSqmStatement().getTarget().getModel().getName() );
 		}
-		final SqmJdbcExecutionContextAdapter executionContext = SqmJdbcExecutionContextAdapter.omittingLockingAndPaging( context );
-		final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
-		final JdbcMutationExecutor jdbcMutationExecutor = factory.getJdbcServices().getJdbcMutationExecutor();
+		final var executionContext = omittingLockingAndPaging( context );
+		final var jdbcMutationExecutor =
+				executionContext.getSession().getFactory()
+						.getJdbcServices().getJdbcMutationExecutor();
 		if ( idTableInsert != null ) {
-			ExecuteWithTemporaryTableHelper.performBeforeTemporaryTableUseActions(
+			performBeforeTemporaryTableUseActions(
 					idTable,
 					temporaryTableStrategy,
 					executionContext
 			);
 
 			try {
-				final int rows = ExecuteWithTemporaryTableHelper.saveIntoTemporaryTable(
+				final int rows = saveIntoTemporaryTable(
 						idTableInsert.jdbcOperation(),
 						jdbcParameterBindings,
 						executionContext
 				);
-				final JdbcParameterBindings sessionUidBindings = new JdbcParameterBindingsImpl( 1 );
+				final var sessionUidBindings = new JdbcParameterBindingsImpl( 1 );
 				if ( sessionUidParameter != null ) {
-					sessionUidBindings.addBinding(
-							sessionUidParameter,
-							new JdbcParameterBindingImpl(
-									sessionUidParameter.getExpressionType().getSingleJdbcMapping(),
-									UUID.fromString( sessionUidAccess.apply( executionContext.getSession() ) )
-							)
+					sessionUidBindings.addBinding( sessionUidParameter,
+							new JdbcParameterBindingImpl( sessionUidParameter.getExpressionType().getSingleJdbcMapping(),
+									UUID.fromString( sessionUidAccess.apply( executionContext.getSession() ) ) ) );
+				}
+				for ( var softDelete : softDeletes ) {
+					jdbcMutationExecutor.execute(
+							softDelete,
+							sessionUidBindings,
+							sql -> executionContext.getSession().getJdbcCoordinator()
+									.getStatementPreparer().prepareStatement( sql ),
+							(integer, preparedStatement) -> {},
+							executionContext
 					);
 				}
-				jdbcMutationExecutor.execute(
-						softDelete,
-						sessionUidBindings,
-						sql -> executionContext.getSession()
-								.getJdbcCoordinator()
-								.getStatementPreparer()
-								.prepareStatement( sql ),
-						(integer, preparedStatement) -> {},
-						executionContext
-				);
 				return rows;
 			}
 			finally {
-				ExecuteWithTemporaryTableHelper.performAfterTemporaryTableUseActions(
+				performAfterTemporaryTableUseActions(
 						idTable,
 						sessionUidAccess,
 						getAfterUseAction(),
@@ -470,16 +453,18 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 			}
 		}
 		else {
-			return jdbcMutationExecutor.execute(
-					softDelete,
-					jdbcParameterBindings,
-					sql -> executionContext.getSession()
-							.getJdbcCoordinator()
-							.getStatementPreparer()
-							.prepareStatement( sql ),
-					(integer, preparedStatement) -> {},
-					executionContext
-			);
+			int rows = 0;
+			for ( var softDelete : softDeletes ) {
+				rows += jdbcMutationExecutor.execute(
+						softDelete,
+						jdbcParameterBindings,
+						sql -> executionContext.getSession().getJdbcCoordinator()
+								.getStatementPreparer().prepareStatement( sql ),
+						(integer, preparedStatement) -> {},
+						executionContext
+				);
+			}
+			return rows;
 		}
 	}
 
@@ -489,8 +474,8 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 	}
 
 	// For Hibernate Reactive
-	protected JdbcOperationQueryMutation getSoftDelete() {
-		return softDelete;
+	protected List<JdbcOperationQueryMutation> getSoftDeletes() {
+		return softDeletes;
 	}
 
 	// For Hibernate Reactive
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java
index 32cb7f6423da..e3c01c1d5353 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/TableBasedUpdateHandler.java
@@ -6,14 +6,10 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.dialect.temptable.TemporaryTable;
-import org.hibernate.dialect.temptable.TemporaryTableSessionUidColumn;
 import org.hibernate.dialect.temptable.TemporaryTableStrategy;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.MutableObject;
-import org.hibernate.internal.util.collections.CollectionHelper;
-import org.hibernate.metamodel.MappingMetamodel;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SoftDeleteMapping;
@@ -26,7 +22,6 @@
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.query.sqm.internal.CacheableSqmInterpretation;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
-import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
 import org.hibernate.query.sqm.internal.SqmUtil;
 import org.hibernate.query.sqm.mutation.internal.AbstractMutationHandler;
 import org.hibernate.query.sqm.mutation.internal.MultiTableSqmMutationConverter;
@@ -78,6 +73,13 @@
 import java.util.function.Supplier;
 
 import static org.hibernate.internal.util.collections.CollectionHelper.mapOfSize;
+import static org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter.omittingLockingAndPaging;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.createIdTableSelectQuerySpec;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.createMatchingIdsIntoIdTableInsert;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.performAfterTemporaryTableUseActions;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.performBeforeTemporaryTableUseActions;
+import static org.hibernate.query.sqm.mutation.internal.temptable.ExecuteWithTemporaryTableHelper.saveIntoTemporaryTable;
+import static org.hibernate.sql.ast.tree.predicate.Predicate.combinePredicates;
 
 /**
 * @author Steve Ebersole
@@ -114,24 +116,22 @@ public TableBasedUpdateHandler(
 		this.forceDropAfterUse = forceDropAfterUse;
 		this.sessionUidAccess = sessionUidAccess;
 
-		final TemporaryTableSessionUidColumn sessionUidColumn = idTable.getSessionUidColumn();
-		if ( sessionUidColumn == null ) {
-			this.sessionUidParameter = null;
-		}
-		else {
-			this.sessionUidParameter = new SqlTypedMappingJdbcParameter( sessionUidColumn );
-		}
-		final SessionFactoryImplementor sessionFactory = getSessionFactory();
-		final MappingMetamodel domainModel = sessionFactory.getMappingMetamodel();
-		final EntityPersister entityDescriptor =
+		final var sessionUidColumn = idTable.getSessionUidColumn();
+		this.sessionUidParameter =
+				sessionUidColumn == null
+						? null
+						: new SqlTypedMappingJdbcParameter( sessionUidColumn );
+		final var sessionFactory = getSessionFactory();
+		final var domainModel = sessionFactory.getMappingMetamodel();
+		final var entityDescriptor =
 				domainModel.getEntityDescriptor( sqmUpdate.getTarget().getEntityName() );
 
 		final String rootEntityName = entityDescriptor.getRootEntityName();
-		final EntityPersister rootEntityDescriptor = domainModel.getEntityDescriptor( rootEntityName );
+		final var rootEntityDescriptor = domainModel.getEntityDescriptor( rootEntityName );
 
 		final String hierarchyRootTableName = rootEntityDescriptor.getTableName();
 
-		final MultiTableSqmMutationConverter converterDelegate = new MultiTableSqmMutationConverter(
+		final var converterDelegate = new MultiTableSqmMutationConverter(
 				entityDescriptor,
 				sqmUpdate,
 				sqmUpdate.getTarget(),
@@ -142,9 +142,9 @@ public TableBasedUpdateHandler(
 				sessionFactory.getSqlTranslationEngine()
 		);
 
-		final TableGroup updatingTableGroup = converterDelegate.getMutatingTableGroup();
+		final var updatingTableGroup = converterDelegate.getMutatingTableGroup();
 
-		final TableReference hierarchyRootTableReference = updatingTableGroup.resolveTableReference(
+		final var hierarchyRootTableReference = updatingTableGroup.resolveTableReference(
 				updatingTableGroup.getNavigablePath(),
 				hierarchyRootTableName
 		);
@@ -154,14 +154,14 @@ public TableBasedUpdateHandler(
 		// visit the set-clause using our special converter, collecting
 		// information about the assignments
 
-		final List<Assignment> assignments = converterDelegate.visitSetClause( sqmUpdate.getSetClause() );
+		final var assignments = converterDelegate.visitSetClause( sqmUpdate.getSetClause() );
 		converterDelegate.addVersionedAssignment( assignments::add, sqmUpdate );
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// visit the where-clause using our special converter, collecting information
 		// about the restrictions
 
-		final PredicateCollector predicateCollector = new PredicateCollector(
+		final var predicateCollector = new PredicateCollector(
 				converterDelegate.visitWhereClause( sqmUpdate.getWhereClause() )
 		);
 
@@ -181,36 +181,26 @@ public TableBasedUpdateHandler(
 		// cross-reference the TableReference by alias.  The TableGroup already
 		// cross-references it by name, bu the ColumnReference only has the alias
 
-		final Map<String, TableReference> tableReferenceByAlias = CollectionHelper.mapOfSize( updatingTableGroup.getTableReferenceJoins().size() + 1 );
+		final Map<String, TableReference> tableReferenceByAlias =
+				mapOfSize( updatingTableGroup.getTableReferenceJoins().size() + 1 );
 		collectTableReference( updatingTableGroup.getPrimaryTableReference(), tableReferenceByAlias::put );
 		for ( int i = 0; i < updatingTableGroup.getTableReferenceJoins().size(); i++ ) {
 			collectTableReference( updatingTableGroup.getTableReferenceJoins().get( i ), tableReferenceByAlias::put );
 		}
 
-		final SoftDeleteMapping softDeleteMapping = entityDescriptor.getSoftDeleteMapping();
-		final Predicate suppliedPredicate;
-		if ( softDeleteMapping != null ) {
-			final NamedTableReference rootTableReference = (NamedTableReference) updatingTableGroup.resolveTableReference(
-					updatingTableGroup.getNavigablePath(),
-					entityDescriptor.getIdentifierTableDetails().getTableName()
-			);
-			suppliedPredicate = Predicate.combinePredicates(
-					predicateCollector.getPredicate(),
-					softDeleteMapping.createNonDeletedRestriction( rootTableReference )
-			);
-		}
-		else {
-			suppliedPredicate = predicateCollector.getPredicate();
-		}
-
-		Map<TableReference, List<Assignment>> assignmentsByTable = mapOfSize( updatingTableGroup.getTableReferenceJoins().size() + 1 );
+		final var softDeleteMapping = entityDescriptor.getSoftDeleteMapping();
+		final var suppliedPredicate =
+				suppliedPredicate( softDeleteMapping, updatingTableGroup, entityDescriptor, predicateCollector );
 
+		final Map<TableReference, List<Assignment>> assignmentsByTable =
+				mapOfSize( updatingTableGroup.getTableReferenceJoins().size() + 1 );
 
 		this.domainParameterXref = domainParameterXref;
 		this.jdbcParamsXref = SqmUtil.generateJdbcParamsXref( domainParameterXref, converterDelegate );
-		this.resolvedParameterMappingModelTypes = converterDelegate.getSqmParameterMappingModelExpressibleResolutions();
+		this.resolvedParameterMappingModelTypes =
+				converterDelegate.getSqmParameterMappingModelExpressibleResolutions();
 
-		final JdbcParameterBindings jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
+		final var jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
 				context.getQueryParameterBindings(),
 				domainParameterXref,
 				jdbcParamsXref,
@@ -223,13 +213,9 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 				context.getSession()
 		);
 		if ( sessionUidParameter != null ) {
-			jdbcParameterBindings.addBinding(
-					sessionUidParameter,
-					new JdbcParameterBindingImpl(
-							idTable.getSessionUidColumn().getJdbcMapping(),
-							UUID.fromString( sessionUidAccess.apply( context.getSession() ) )
-					)
-			);
+			jdbcParameterBindings.addBinding( sessionUidParameter,
+					new JdbcParameterBindingImpl( idTable.getSessionUidColumn().getJdbcMapping(),
+							UUID.fromString( sessionUidAccess.apply( context.getSession() ) ) ) );
 		}
 
 
@@ -237,35 +223,24 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 		// segment the assignments by table-reference
 
 		for ( int i = 0; i < assignments.size(); i++ ) {
-			final Assignment assignment = assignments.get( i );
-			final List<ColumnReference> assignmentColumnRefs = assignment.getAssignable().getColumnReferences();
-
+			final var assignment = assignments.get( i );
+			final var assignmentColumnRefs = assignment.getAssignable().getColumnReferences();
 			TableReference assignmentTableReference = null;
-
 			for ( int c = 0; c < assignmentColumnRefs.size(); c++ ) {
-				final ColumnReference columnReference = assignmentColumnRefs.get( c );
-				final TableReference tableReference = resolveTableReference(
-						columnReference,
-						tableReferenceByAlias
-				);
-
+				final var columnReference = assignmentColumnRefs.get( c );
+				final var tableReference = resolveTableReference( columnReference, tableReferenceByAlias );
 				if ( assignmentTableReference != null && assignmentTableReference != tableReference ) {
-					throw new SemanticException( "Assignment referred to columns from multiple tables: " + assignment.getAssignable() );
+					throw new SemanticException( "Assignment referred to columns from multiple tables: "
+													+ assignment.getAssignable() );
 				}
-
 				assignmentTableReference = tableReference;
 			}
-
-			List<Assignment> assignmentsForTable = assignmentsByTable.get( assignmentTableReference );
-			if ( assignmentsForTable == null ) {
-				assignmentsForTable = new ArrayList<>();
-				assignmentsByTable.put( assignmentTableReference, assignmentsForTable );
-			}
-			assignmentsForTable.add( assignment );
+			assignmentsByTable.computeIfAbsent( assignmentTableReference, k -> new ArrayList<>() )
+					.add( assignment );
 		}
 
-		final SqmJdbcExecutionContextAdapter executionContext = SqmJdbcExecutionContextAdapter.omittingLockingAndPaging( context );
-		this.matchingIdsIntoIdTableInsert = ExecuteWithTemporaryTableHelper.createMatchingIdsIntoIdTableInsert(
+		final var executionContext = omittingLockingAndPaging( context );
+		this.matchingIdsIntoIdTableInsert = createMatchingIdsIntoIdTableInsert(
 				converterDelegate,
 				suppliedPredicate,
 				idTable,
@@ -274,7 +249,7 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 				executionContext
 		);
 
-		final QuerySpec idTableSubQuery = ExecuteWithTemporaryTableHelper.createIdTableSelectQuerySpec(
+		final var idTableSubQuery = createIdTableSelectQuerySpec(
 				idTable,
 				sessionUidParameter,
 				entityDescriptor,
@@ -298,9 +273,29 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 		firstJdbcParameterBindingsConsumer.set( jdbcParameterBindings );
 	}
 
+	private static Predicate suppliedPredicate(
+			SoftDeleteMapping softDeleteMapping,
+			TableGroup updatingTableGroup,
+			EntityPersister entityDescriptor,
+			PredicateCollector predicateCollector) {
+		if ( softDeleteMapping != null ) {
+			final var rootTableReference =
+					(NamedTableReference)
+							updatingTableGroup.resolveTableReference(
+									updatingTableGroup.getNavigablePath(),
+									entityDescriptor.getIdentifierTableDetails().getTableName()
+							);
+			return combinePredicates( predicateCollector.getPredicate(),
+					softDeleteMapping.createNonDeletedRestriction( rootTableReference ) );
+		}
+		else {
+			return predicateCollector.getPredicate();
+		}
+	}
+
 	@Override
 	public JdbcParameterBindings createJdbcParameterBindings(DomainQueryExecutionContext context) {
-		final JdbcParameterBindings jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
+		final var jdbcParameterBindings = SqmUtil.createJdbcParameterBindings(
 				context.getQueryParameterBindings(),
 				domainParameterXref,
 				jdbcParamsXref,
@@ -314,13 +309,9 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 				context.getSession()
 		);
 		if ( sessionUidParameter != null ) {
-			jdbcParameterBindings.addBinding(
-					sessionUidParameter,
-					new JdbcParameterBindingImpl(
-							idTable.getSessionUidColumn().getJdbcMapping(),
-							UUID.fromString( sessionUidAccess.apply( context.getSession() ) )
-					)
-			);
+			jdbcParameterBindings.addBinding( sessionUidParameter,
+					new JdbcParameterBindingImpl( idTable.getSessionUidColumn().getJdbcMapping(),
+							UUID.fromString( sessionUidAccess.apply( context.getSession() ) ) ) );
 		}
 		return jdbcParameterBindings;
 	}
@@ -330,11 +321,9 @@ public boolean dependsOnParameterBindings() {
 		if ( matchingIdsIntoIdTableInsert.jdbcOperation().dependsOnParameterBindings() ) {
 			return true;
 		}
-		for ( TableUpdater updater : tableUpdaters ) {
-			if ( updater.jdbcUpdate.dependsOnParameterBindings() ) {
-				return true;
-			}
-			if ( updater.jdbcInsert != null && updater.jdbcInsert.dependsOnParameterBindings() ) {
+		for ( var updater : tableUpdaters ) {
+			if ( updater.jdbcUpdate.dependsOnParameterBindings()
+				|| updater.jdbcInsert != null && updater.jdbcInsert.dependsOnParameterBindings() ) {
 				return true;
 			}
 		}
@@ -346,7 +335,7 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
 		if ( !matchingIdsIntoIdTableInsert.jdbcOperation().isCompatibleWith( jdbcParameterBindings, queryOptions ) ) {
 			return false;
 		}
-		for ( TableUpdater updater : tableUpdaters ) {
+		for ( var updater : tableUpdaters ) {
 			if ( !updater.jdbcUpdate.isCompatibleWith( jdbcParameterBindings, queryOptions ) ) {
 				return false;
 			}
@@ -361,7 +350,8 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
 	protected TableReference resolveTableReference(
 			ColumnReference columnReference,
 			Map<String, TableReference> tableReferenceByAlias) {
-		final TableReference tableReferenceByQualifier = tableReferenceByAlias.get( columnReference.getQualifier() );
+		final var tableReferenceByQualifier =
+				tableReferenceByAlias.get( columnReference.getQualifier() );
 		if ( tableReferenceByQualifier != null ) {
 			return tableReferenceByQualifier;
 		}
@@ -395,24 +385,28 @@ private TableUpdater createTableUpdater(
 		// set ...
 		// where `keyExpression` in ( `idTableSubQuery` )
 
-		final TableReference updatingTableReference = updatingTableGroup.getTableReference(
+		final var updatingTableReference = updatingTableGroup.getTableReference(
 				updatingTableGroup.getNavigablePath(),
 				tableExpression,
 				true
 		);
 
-		final List<Assignment> assignments = assignmentsByTable.get( updatingTableReference );
+		final var assignments = assignmentsByTable.get( updatingTableReference );
 		if ( assignments == null || assignments.isEmpty() ) {
 			// no assignments for this table - skip it
 			return null;
 		}
 
-		final NamedTableReference dmlTableReference = resolveUnionTableReference( updatingTableReference, tableExpression );
-		final JdbcServices jdbcServices = executionContext.getSession().getFactory().getJdbcServices();
-		final SqlAstTranslatorFactory sqlAstTranslatorFactory = jdbcServices.getJdbcEnvironment().getSqlAstTranslatorFactory();
+		final var dmlTableReference =
+				resolveUnionTableReference( updatingTableReference, tableExpression );
+		final var sqlAstTranslatorFactory =
+				executionContext.getSession().getFactory()
+						.getJdbcServices().getJdbcEnvironment()
+						.getSqlAstTranslatorFactory();
 
-		final Expression keyExpression =
-				resolveMutatingTableKeyExpression( tableExpression, tableKeyColumnVisitationSupplier );
+		final var keyExpression =
+				resolveMutatingTableKeyExpression( tableExpression,
+						tableKeyColumnVisitationSupplier );
 		return new TableUpdater(
 				createTableUpdate(
 						idTableSubQuery,
@@ -438,7 +432,7 @@ private TableUpdater createTableUpdater(
 	}
 
 	protected boolean isTableOptional(String tableExpression) {
-		final EntityPersister entityPersister = getEntityDescriptor().getEntityPersister();
+		final var entityPersister = getEntityDescriptor().getEntityPersister();
 		for ( int i = 0; i < entityPersister.getTableSpan(); i++ ) {
 			if ( tableExpression.equals( entityPersister.getTableName( i ) )
 				&& entityPersister.isNullableTable( i ) ) {
@@ -459,7 +453,7 @@ private JdbcOperationQueryMutation createTableInsert(
 			JdbcParameterBindings firstJdbcParameterBindings,
 			ExecutionContext executionContext) {
 
-		final SessionFactoryImplementor sessionFactory = executionContext.getSession().getFactory();
+		final var sessionFactory = executionContext.getSession().getFactory();
 		// Execute a query in the form -
 		//
 		// insert into <target> (...)
@@ -474,42 +468,46 @@ private JdbcOperationQueryMutation createTableInsert(
 		// Create a new QuerySpec for the "insert source" select query.  This
 		// is mostly a copy of the incoming `idTableSubQuery` along with the
 		// NOT-EXISTS predicate
-		final QuerySpec insertSourceSelectQuerySpec = makeInsertSourceSelectQuerySpec( idTableSubQuery );
+		final var insertSourceSelectQuerySpec = makeInsertSourceSelectQuerySpec( idTableSubQuery );
 
 		// create the `select 1 ...` sub-query and apply the not-exists predicate
-		final QuerySpec existsSubQuerySpec = createExistsSubQuerySpec( targetTableExpression, tableKeyColumnVisitationSupplier, idTableSubQuery, sessionFactory );
 		insertSourceSelectQuerySpec.applyPredicate(
 				new ExistsPredicate(
-						existsSubQuerySpec,
+						createExistsSubQuerySpec(
+								targetTableExpression,
+								tableKeyColumnVisitationSupplier,
+								idTableSubQuery,
+								sessionFactory
+						),
 						true,
-						sessionFactory.getTypeConfiguration().getBasicTypeForJavaType( Boolean.class )
+						sessionFactory.getTypeConfiguration()
+								.getBasicTypeForJavaType( Boolean.class )
 				)
 		);
 
 		// Collect the target column references from the key expressions
 		final List<ColumnReference> targetColumnReferences = new ArrayList<>();
-		if ( targetTableKeyExpression instanceof SqlTuple ) {
+		if ( targetTableKeyExpression instanceof SqlTuple sqlTuple ) {
+			final var expressions = sqlTuple.getExpressions();
 			//noinspection unchecked
-			targetColumnReferences.addAll( (Collection<? extends ColumnReference>) ( (SqlTuple) targetTableKeyExpression ).getExpressions() );
+			targetColumnReferences.addAll( (Collection<? extends ColumnReference>) expressions );
 		}
 		else {
 			targetColumnReferences.add( (ColumnReference) targetTableKeyExpression );
 		}
 
 		// And transform assignments to target column references and selections
-		for ( Assignment assignment : assignments ) {
+		for ( var assignment : assignments ) {
 			targetColumnReferences.addAll( assignment.getAssignable().getColumnReferences() );
-			insertSourceSelectQuerySpec.getSelectClause().addSqlSelection(
-					new SqlSelectionImpl( assignment.getAssignedValue() )
-			);
+			insertSourceSelectQuerySpec.getSelectClause()
+					.addSqlSelection( new SqlSelectionImpl( assignment.getAssignedValue() ) );
 		}
 
-		final InsertSelectStatement insertSqlAst = new InsertSelectStatement( targetTableReference );
+		final var insertSqlAst = new InsertSelectStatement( targetTableReference, getEntityDescriptor() );
 		insertSqlAst.addTargetColumnReferences( targetColumnReferences.toArray( new ColumnReference[0] ) );
 		insertSqlAst.setSourceSelectStatement( insertSourceSelectQuerySpec );
 
-		return sqlAstTranslatorFactory
-				.buildMutationTranslator( sessionFactory, insertSqlAst )
+		return sqlAstTranslatorFactory.buildMutationTranslator( sessionFactory, insertSqlAst )
 				.translate( firstJdbcParameterBindings, executionContext.getQueryOptions() );
 	}
 
@@ -518,29 +516,22 @@ protected QuerySpec createExistsSubQuerySpec(
 			Supplier<Consumer<SelectableConsumer>> tableKeyColumnVisitationSupplier,
 			QuerySpec idTableSubQuery,
 			SessionFactoryImplementor sessionFactory) {
-		final NamedTableReference existsTableReference = new NamedTableReference(
-				targetTableExpression,
-				"dml_"
-		);
+		final var existsTableReference =
+				new NamedTableReference( targetTableExpression, "dml_" );
 
 		// Prepare a not exists sub-query to avoid violating constraints
-		final QuerySpec existsSubQuerySpec = new QuerySpec( false );
-		existsSubQuerySpec.getSelectClause().addSqlSelection(
-				new SqlSelectionImpl(
-						new QueryLiteral<>(
-								1,
-								sessionFactory.getTypeConfiguration().getBasicTypeForJavaType( Integer.class )
-						)
-				)
-		);
-		existsSubQuerySpec.getFromClause().addRoot( new TableGroupImpl(
-				null,
-				null,
-				existsTableReference,
-				getEntityDescriptor()
-		) );
-
-		final TableKeyExpressionCollector existsKeyColumnCollector = new TableKeyExpressionCollector( getEntityDescriptor() );
+		final var existsSubQuerySpec = new QuerySpec( false );
+		existsSubQuerySpec.getSelectClause()
+				.addSqlSelection( new SqlSelectionImpl(
+						new QueryLiteral<>( 1,
+								sessionFactory.getTypeConfiguration()
+										.getBasicTypeForJavaType( Integer.class ) )
+				) );
+		existsSubQuerySpec.getFromClause()
+				.addRoot( new TableGroupImpl( null, null,
+						existsTableReference, getEntityDescriptor() ) );
+
+		final var existsKeyColumnCollector = new TableKeyExpressionCollector( getEntityDescriptor() );
 		tableKeyColumnVisitationSupplier.get().accept( (columnIndex, selection) -> {
 			assert selection.getContainingTableExpression().equals( targetTableExpression );
 			existsKeyColumnCollector.apply( new ColumnReference( existsTableReference, selection ) );
@@ -556,11 +547,13 @@ protected QuerySpec createExistsSubQuerySpec(
 	}
 
 	protected static QuerySpec makeInsertSourceSelectQuerySpec(QuerySpec idTableSubQuery) {
-		final QuerySpec idTableQuerySpec = new QuerySpec( true );
-		for ( TableGroup root : idTableSubQuery.getFromClause().getRoots() ) {
+		final var idTableQuerySpec = new QuerySpec( true );
+		final var fromClause = idTableSubQuery.getFromClause();
+		for ( var root : fromClause.getRoots() ) {
 			idTableQuerySpec.getFromClause().addRoot( root );
 		}
-		for ( SqlSelection sqlSelection : idTableSubQuery.getSelectClause().getSqlSelections() ) {
+		final var selectClause = idTableSubQuery.getSelectClause();
+		for ( var sqlSelection : selectClause.getSqlSelections() ) {
 			idTableQuerySpec.getSelectClause().addSqlSelection( sqlSelection );
 		}
 		idTableQuerySpec.applyPredicate( idTableSubQuery.getWhereClauseRestrictions() );
@@ -575,27 +568,21 @@ private JdbcOperationQueryMutation createTableUpdate(
 			SqlAstTranslatorFactory sqlAstTranslatorFactory,
 			JdbcParameterBindings firstJdbcParameterBindings,
 			Expression keyExpression) {
-		final UpdateStatement sqlAst = new UpdateStatement(
-				dmlTableReference,
-				assignments,
-				new InSubQueryPredicate( keyExpression, idTableSubQuery, false )
-		);
-
-		return sqlAstTranslatorFactory
-				.buildMutationTranslator( executionContext.getSession().getFactory(), sqlAst )
+		final var sqlAst =
+				new UpdateStatement( dmlTableReference, assignments,
+						new InSubQueryPredicate( keyExpression, idTableSubQuery, false ) );
+		return sqlAstTranslatorFactory.buildMutationTranslator( executionContext.getSession().getFactory(), sqlAst )
 				.translate( firstJdbcParameterBindings, executionContext.getQueryOptions() );
 	}
 
 	protected Expression resolveMutatingTableKeyExpression(String tableExpression, Supplier<Consumer<SelectableConsumer>> tableKeyColumnVisitationSupplier) {
-		final TableKeyExpressionCollector keyColumnCollector = new TableKeyExpressionCollector( getEntityDescriptor() );
-
+		final var keyColumnCollector = new TableKeyExpressionCollector( getEntityDescriptor() );
 		tableKeyColumnVisitationSupplier.get().accept(
 				(columnIndex, selection) -> {
 					assert selection.getContainingTableExpression().equals( tableExpression );
 					keyColumnCollector.apply( new ColumnReference( (String) null, selection ) );
 				}
 		);
-
 		return keyColumnCollector.buildKeyExpression();
 	}
 
@@ -605,7 +592,7 @@ protected Expression asExpression(SelectClause selectClause) {
 			return sqlSelections.get( 0 ).getExpression();
 		}
 		final List<Expression> expressions = new ArrayList<>( sqlSelections.size() );
-		for ( SqlSelection sqlSelection : sqlSelections ) {
+		for ( var sqlSelection : sqlSelections ) {
 			expressions.add( sqlSelection.getExpression() );
 		}
 		return new SqlTuple( expressions, null );
@@ -632,20 +619,20 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 			);
 		}
 
-		final SqmJdbcExecutionContextAdapter executionContext = SqmJdbcExecutionContextAdapter.omittingLockingAndPaging( context );
-		ExecuteWithTemporaryTableHelper.performBeforeTemporaryTableUseActions(
+		final var executionContext = omittingLockingAndPaging( context );
+		performBeforeTemporaryTableUseActions(
 				idTable,
 				temporaryTableStrategy,
 				executionContext
 		);
 
 		try {
-			final int rows = ExecuteWithTemporaryTableHelper.saveIntoTemporaryTable(
+			final int rows = saveIntoTemporaryTable(
 					matchingIdsIntoIdTableInsert.jdbcOperation(),
 					jdbcParameterBindings,
 					executionContext
 			);
-			for ( TableUpdater tableUpdater : tableUpdaters ) {
+			for ( var tableUpdater : tableUpdaters ) {
 				updateTable(
 						tableUpdater,
 						rows,
@@ -656,7 +643,7 @@ public int execute(JdbcParameterBindings jdbcParameterBindings, DomainQueryExecu
 			return rows;
 		}
 		finally {
-			ExecuteWithTemporaryTableHelper.performAfterTemporaryTableUseActions(
+			performAfterTemporaryTableUseActions(
 					idTable,
 					sessionUidAccess,
 					getAfterUseAction(),
@@ -670,36 +657,31 @@ private void updateTable(
 			int expectedUpdateCount,
 			JdbcParameterBindings jdbcParameterBindings,
 			ExecutionContext executionContext) {
-		if ( tableUpdater == null ) {
-			// no assignments for this table - skip it
-			return;
-		}
-		final int updateCount = executeMutation( tableUpdater.jdbcUpdate, jdbcParameterBindings, executionContext );
-
-		// We are done when the update count matches
-		if ( updateCount == expectedUpdateCount ) {
-			return;
-		}
-
-		// If the table is optional, execute an insert
-		if ( tableUpdater.jdbcInsert != null ) {
-			final int insertCount = executeMutation( tableUpdater.jdbcInsert, jdbcParameterBindings, executionContext );
-			assert insertCount + updateCount == expectedUpdateCount;
+		if ( tableUpdater != null ) {
+			final int updateCount =
+					executeMutation( tableUpdater.jdbcUpdate, jdbcParameterBindings, executionContext );
+			if ( updateCount != expectedUpdateCount ) {// If the table is optional, execute an insert
+				if ( tableUpdater.jdbcInsert != null ) {
+					final int insertCount =
+							executeMutation( tableUpdater.jdbcInsert, jdbcParameterBindings, executionContext );
+					assert insertCount + updateCount == expectedUpdateCount;
+				}
+			}
+			// Else we are done when the update count matches
 		}
+		// Else no assignments for this table - skip it
 	}
 
 	private int executeMutation(JdbcOperationQueryMutation jdbcUpdate, JdbcParameterBindings jdbcParameterBindings, ExecutionContext executionContext) {
-		return executionContext.getSession().getFactory().getJdbcServices().getJdbcMutationExecutor().execute(
-				jdbcUpdate,
-				jdbcParameterBindings,
-				sql -> executionContext.getSession()
-						.getJdbcCoordinator()
-						.getStatementPreparer()
-						.prepareStatement( sql ),
-				(integer, preparedStatement) -> {
-				},
-				executionContext
-		);
+		return executionContext.getSession().getFactory().getJdbcServices()
+				.getJdbcMutationExecutor().execute(
+						jdbcUpdate,
+						jdbcParameterBindings,
+						sql -> executionContext.getSession().getJdbcCoordinator()
+								.getStatementPreparer().prepareStatement( sql ),
+						(integer, preparedStatement) -> {},
+						executionContext
+				);
 	}
 
 	protected record TableUpdater(
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/package-info.java
index 84b3c6c3c56f..02ea1428618b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/temptable/package-info.java
@@ -3,17 +3,12 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 
-/**
- * Support for multi-table SQM mutation (insert, update, delete) operations using
- * a table to temporarily hold the matching ids.  There are 3 forms:
- *
- * 		* {@link org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy} uses
- * 			local temp tables as defined by the SQL spec
- * 		* {@link org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy} uses
- * 			global temp tables as defined by the SQL spec
- * 		* {@link org.hibernate.query.sqm.mutation.internal.temptable.PersistentTableMutationStrategy} uses normal table
- * 			managed by Hibernate.
- *
- * @asciidoc
- */
+/// Support for multi-table SQM mutation (insert, update, delete) operations using
+/// a table to temporarily hold the matching ids. There are 3 forms:
+/// * [org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy] uses
+/// 	local temp tables as defined by the SQL spec
+/// * [org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableMutationStrategy] uses
+/// 	global temp tables as defined by the SQL spec
+/// * [org.hibernate.query.sqm.mutation.internal.temptable.PersistentTableMutationStrategy] uses normal table
+/// 	managed by Hibernate.
 package org.hibernate.query.sqm.mutation.internal.temptable;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/package-info.java
index 7c5a4a05e4b9..08ba231e543c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/package-info.java
@@ -6,20 +6,20 @@
 /**
  * This package defines a semantic model of HQL queries.
  *
- * <h3>Semantic Query Model (SQM)</h3>
+ * <h2>Semantic Query Model (SQM)</h2>
  *
  * An SQM is a tree representing the semantic interpretation of a query.
  * It's "semantic" in the sense that it contains more information than a
  * simple syntax tree.
  *
- * <h3>HQL</h3>
+ * <h2>HQL</h2>
  *
  * HQL is interpreted as an SQM with the help of an ANTRL-generated parser.
  * The class {@link org.hibernate.query.hql.internal.SemanticQueryBuilder}
  * is responsible for visiting the syntax tree produced by the parser and
  * building an SQM.
  *
- * <h3>Criteria queries</h3>
+ * <h2>Criteria queries</h2>
  *
  * The SQM tree nodes directly implement the JPA criteria query contracts.
  * For example, {@link org.hibernate.query.sqm.tree.from.SqmFrom} implements
@@ -31,7 +31,7 @@
  * It instantiates SQM nodes and arranges them into SQM tree using the
  * standard operations for building a JPA criteria query.
  *
- * <h3>Transforming SQM to SQL</h3>
+ * <h2>Transforming SQM to SQL</h2>
  *
  * The package {@link org.hibernate.sql.ast} defines an AST representing
  * SQL. To generate SQL from SQM, we must transform the SQM tree to a
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/package-info.java
index 63a25f92097b..875bbaed9738 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/package-info.java
@@ -3,40 +3,33 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 
-/**
- * @asciidoc
- *
- * = Producing SQM
- *
- * This package defines support for producing SQM trees (see {@link org.hibernate.query.sqm.tree}).
- * The main entry point into producing an SQM tree is
- * {@link org.hibernate.query.hql.HqlTranslator}, which
- * can be obtained via
- * {@link org.hibernate.query.spi.QueryEngine} which in turn is obtained via
- * {@link org.hibernate.engine.spi.SessionFactoryImplementor#getQueryEngine()}.
- *
- *
- * == From HQL/JPQL
- *
- * `SemanticQueryProducer` defines just a single method for producing SQM based on HQL:
- * {@link org.hibernate.query.hql.HqlTranslator#translate}.
- * See {@link org.hibernate.query.hql.internal} for details
- *
- *
- * == From Criteria
- *
- * `SemanticQueryProducer` builds SQM directly.
- * See {@link org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder} for details
- *
- *
- * == Exceptions
- *
- * Generally, the interpretation will throw exceptions as one of 3 types:
- *
- *  * {@link org.hibernate.query.SemanticException} and derivatives represent problems with the
- *  		query itself.
- *  * {@link org.hibernate.query.sqm.ParsingException} and derivatives represent errors (potential
- *  		bugs) during parsing.
- *  * {@link org.hibernate.query.sqm.InterpretationException} represents an unexpected problem
- */
+/// # Producing SQM
+///
+/// This package defines support for producing SQM trees (see [org.hibernate.query.sqm.tree]).
+/// The main entry point into producing an SQM tree is
+/// [org.hibernate.query.hql.HqlTranslator], which
+/// can be obtained via
+/// [org.hibernate.query.spi.QueryEngine] which in turn is obtained via
+/// `getQueryEngine()`.
+///
+/// ## From HQL/JPQL
+///
+/// `SemanticQueryProducer` defines just a single method for producing SQM based on HQL:
+/// `translate()`.
+/// See [org.hibernate.query.hql.internal] for details
+///
+/// ## From Criteria
+///
+/// `SemanticQueryProducer` builds SQM directly.
+/// See [org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder] for details
+///
+/// ## Exceptions
+///
+/// Generally, the interpretation will throw exceptions as one of 3 types:
+///
+///  * [org.hibernate.query.SemanticException] and derivatives represent problems with the
+///  		query itself.
+///  * [org.hibernate.query.sqm.ParsingException] and derivatives represent errors (potential
+///  		bugs) during parsing.
+///  * [org.hibernate.query.sqm.InterpretationException] represents an unexpected problem
 package org.hibernate.query.sqm.produce;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java
index 7655f97522ab..31c7e1abcfcd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/SqmCreationHelper.java
@@ -11,9 +11,11 @@
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.model.domain.PluralPersistentAttribute;
 import org.hibernate.query.criteria.JpaPredicate;
+import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.query.sqm.tree.predicate.SqmJunctionPredicate;
 import org.hibernate.query.sqm.tree.predicate.SqmPredicate;
+import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType;
 import org.hibernate.spi.NavigablePath;
 
 import jakarta.persistence.criteria.Predicate;
@@ -85,18 +87,27 @@ else if ( alias == IMPLICIT_ALIAS ) {
 		return alias;
 	}
 
-	public static NavigablePath buildSubNavigablePath(SqmPath<?> lhs, String subNavigable, @Nullable String alias) {
+	public static NavigablePath buildParentNavigablePath(SqmPath<?> lhs, String subNavigable) {
 		if ( lhs == null ) {
 			throw new IllegalArgumentException(
 					"`lhs` cannot be null for a sub-navigable reference - " + subNavigable
 			);
 		}
-		NavigablePath navigablePath = lhs.getNavigablePath();
-		if ( lhs.getResolvedModel() instanceof PluralPersistentAttribute<?, ?, ?>
-				&& CollectionPart.Nature.fromName( subNavigable ) == null ) {
-			navigablePath = navigablePath.append( CollectionPart.Nature.ELEMENT.getName() );
+		final NavigablePath navigablePath = lhs.getNavigablePath();
+		final SqmPathSource<?> resolvedModel = lhs.getResolvedModel();
+		if ( ( resolvedModel instanceof PluralPersistentAttribute<?, ?, ?>
+			|| resolvedModel instanceof AnonymousTupleType<?> tupleType
+				&& tupleType.findSubPathSource( CollectionPart.Nature.ELEMENT.getName() ) != null )
+			&& CollectionPart.Nature.fromName( subNavigable ) == null ) {
+			return navigablePath.append( CollectionPart.Nature.ELEMENT.getName() );
+		}
+		else {
+			return navigablePath;
 		}
-		return buildSubNavigablePath( navigablePath, subNavigable, alias );
+	}
+
+	public static NavigablePath buildSubNavigablePath(SqmPath<?> lhs, String subNavigable, @Nullable String alias) {
+		return buildSubNavigablePath( buildParentNavigablePath( lhs, subNavigable ), subNavigable, alias );
 	}
 
 	public static SqmPredicate combinePredicates(SqmPredicate baseRestriction, List<Predicate> incomingRestrictions) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
index 07e04313402b..a5b255978b13 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
@@ -6,11 +6,13 @@
 
 import jakarta.persistence.TemporalType;
 import jakarta.persistence.metamodel.SingularAttribute;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.Internal;
 import org.hibernate.LockMode;
+import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.function.TimestampaddFunction;
 import org.hibernate.dialect.function.TimestampdiffFunction;
@@ -39,6 +41,7 @@
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
 import org.hibernate.metamodel.mapping.Bindable;
 import org.hibernate.metamodel.mapping.CollectionPart;
+import org.hibernate.metamodel.mapping.DiscriminatedAssociationModelPart;
 import org.hibernate.metamodel.mapping.DiscriminatorConverter;
 import org.hibernate.metamodel.mapping.DiscriminatorMapping;
 import org.hibernate.metamodel.mapping.DiscriminatorValueDetails;
@@ -60,7 +63,6 @@
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.mapping.SelectableMappings;
-import org.hibernate.metamodel.mapping.SoftDeleteMapping;
 import org.hibernate.metamodel.mapping.SqlExpressible;
 import org.hibernate.metamodel.mapping.SqlTypedMapping;
 import org.hibernate.metamodel.mapping.ValueMapping;
@@ -85,8 +87,8 @@
 import org.hibernate.metamodel.model.domain.internal.BasicSqmPathSource;
 import org.hibernate.metamodel.model.domain.internal.CompositeSqmPathSource;
 import org.hibernate.metamodel.model.domain.internal.EmbeddedSqmPathSource;
-import org.hibernate.metamodel.model.domain.internal.EntityDiscriminatorSqmPath;
 import org.hibernate.metamodel.model.domain.internal.EntityTypeImpl;
+import org.hibernate.persister.entity.DiscriminatorHelper;
 import org.hibernate.persister.entity.EntityNameUse;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.SemanticException;
@@ -105,7 +107,6 @@
 import org.hibernate.query.sqm.CastType;
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.query.sqm.DiscriminatorSqmPath;
-import org.hibernate.query.sqm.DynamicInstantiationNature;
 import org.hibernate.query.sqm.InterpretationException;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.query.sqm.SqmExpressible;
@@ -252,7 +253,6 @@
 import org.hibernate.query.sqm.tree.predicate.SqmWhereClause;
 import org.hibernate.query.sqm.tree.select.SqmAliasedNode;
 import org.hibernate.query.sqm.tree.select.SqmDynamicInstantiation;
-import org.hibernate.query.sqm.tree.select.SqmDynamicInstantiationArgument;
 import org.hibernate.query.sqm.tree.select.SqmDynamicInstantiationTarget;
 import org.hibernate.query.sqm.tree.select.SqmJpaCompoundSelection;
 import org.hibernate.query.sqm.tree.select.SqmOrderByClause;
@@ -443,6 +443,7 @@
 import static org.hibernate.boot.model.process.internal.InferredBasicValueResolver.resolveSqlTypeIndicators;
 import static org.hibernate.generator.EventType.INSERT;
 import static org.hibernate.internal.util.NullnessHelper.coalesceSuppliedValues;
+import static org.hibernate.metamodel.mapping.EntityDiscriminatorMapping.DISCRIMINATOR_ROLE_NAME;
 import static org.hibernate.query.QueryLogging.QUERY_MESSAGE_LOGGER;
 import static org.hibernate.query.common.TemporalUnit.EPOCH;
 import static org.hibernate.query.common.TemporalUnit.NANOSECOND;
@@ -694,19 +695,24 @@ public TypeConfiguration getTypeConfiguration() {
 		return creationContext.getTypeConfiguration();
 	}
 
+	private SessionFactoryOptions getSessionFactoryOptions() {
+		// TODO : FIX ME
+		return creationContext.getSessionFactory().getSessionFactoryOptions();
+	}
+
 	@Override
 	public int getPreferredSqlTypeCodeForBoolean() {
-		return creationContext.getSessionFactory().getSessionFactoryOptions().getPreferredSqlTypeCodeForBoolean();
+		return getSessionFactoryOptions().getPreferredSqlTypeCodeForBoolean();
 	}
 
 	@Override
 	public int getPreferredSqlTypeCodeForDuration() {
-		return creationContext.getSessionFactory().getSessionFactoryOptions().getPreferredSqlTypeCodeForDuration();
+		return getSessionFactoryOptions().getPreferredSqlTypeCodeForDuration();
 	}
 
 	@Override
 	public int getPreferredSqlTypeCodeForUuid() {
-		return creationContext.getSessionFactory().getSessionFactoryOptions().getPreferredSqlTypeCodeForUuid();
+		return getSessionFactoryOptions().getPreferredSqlTypeCodeForUuid();
 	}
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -862,6 +868,7 @@ public UpdateStatement visitUpdateStatement(SqmUpdateStatement<?> sqmStatement)
 			return new UpdateStatement(
 					cteContainer,
 					(NamedTableReference) rootTableGroup.getPrimaryTableReference(),
+					entityDescriptor,
 					fromClause,
 					assignments,
 					combinePredicates(
@@ -897,8 +904,7 @@ public void addVersionedAssignment(Consumer<Assignment> assignmentConsumer, SqmU
 		currentClauseStack.push( Clause.SET );
 		final EntityVersionMapping versionMapping = persister.getVersionMapping();
 		final List<ColumnReference> targetColumnReferences = BasicValuedPathInterpretation.from(
-				(SqmBasicValuedSimplePath<?>) sqmStatement.getRoot()
-						.get( versionMapping.getPartName() ),
+				(SqmBasicValuedSimplePath<?>) SqmExpressionHelper.get( sqmStatement.getRoot(), versionMapping.getPartName() ),
 				this,
 				jpaQueryComplianceEnabled
 		).getColumnReferences();
@@ -1126,6 +1132,7 @@ public DeleteStatement visitDeleteStatement(SqmDeleteStatement<?> statement) {
 			return new DeleteStatement(
 					cteContainer,
 					(NamedTableReference) rootTableGroup.getPrimaryTableReference(),
+					entityDescriptor,
 					fromClause,
 					combinePredicates(
 							suppliedPredicate,
@@ -1168,8 +1175,6 @@ public InsertStatement visitInsertSelectStatement(SqmInsertSelectStatement<?> sq
 						r -> new SqmAliasedNodePositionTracker(
 								r,
 								selectQueryPart.getFirstQuerySpec()
-										.getSelectClause()
-										.getSelections()
 						),
 						getCurrentClauseStack()::getCurrent
 				)
@@ -1193,6 +1198,7 @@ public InsertStatement visitInsertSelectStatement(SqmInsertSelectStatement<?> sq
 			insertStatement = new InsertSelectStatement(
 					cteContainer,
 					(NamedTableReference) rootTableGroup.getPrimaryTableReference(),
+					entityDescriptor,
 					emptyList()
 			);
 			additionalInsertValues = visitInsertionTargetPaths(
@@ -1294,6 +1300,7 @@ public InsertStatement visitInsertValuesStatement(SqmInsertValuesStatement<?> sq
 			final InsertSelectStatement insertStatement = new InsertSelectStatement(
 					cteContainer,
 					(NamedTableReference) rootTableGroup.getPrimaryTableReference(),
+					entityDescriptor,
 					emptyList()
 			);
 
@@ -1402,8 +1409,7 @@ else if ( localName.equals( versionAttributeName ) ) {
 		}
 		if ( needsVersionInsert ) {
 			final BasicValuedPathInterpretation<?> versionPath = BasicValuedPathInterpretation.from(
-					(SqmBasicValuedSimplePath<?>) sqmStatement.getTarget()
-							.get( versionAttributeName ),
+					(SqmBasicValuedSimplePath<?>) SqmExpressionHelper.get( sqmStatement.getTarget(), versionAttributeName ),
 					this,
 					jpaQueryComplianceEnabled
 			);
@@ -1425,7 +1431,7 @@ else if ( localName.equals( versionAttributeName ) ) {
 			);
 			targetColumnReferenceConsumer.accept( discriminatorPath, discriminatorPath.getColumnReferences() );
 			discriminatorExpression = new QueryLiteral<>(
-					entityDescriptor.getDiscriminatorValue(),
+					DiscriminatorHelper.toRelationalValue( entityDescriptor.getDiscriminatorValue() ),
 					discriminatorMapping
 			);
 
@@ -1632,12 +1638,12 @@ public Values visitValues(SqmValues sqmValues) {
 
 	@Override
 	public SelectStatement visitSelectStatement(SqmSelectStatement<?> statement) {
-		final CteContainer oldCteContainer = cteContainer;
-		final CteContainer cteContainer = this.visitCteContainer( statement );
-		final SqmStatement<?> oldSqmStatement = this.currentSqmStatement;
+		final var oldCteContainer = cteContainer;
+		final var cteContainer = this.visitCteContainer( statement );
+		final var oldSqmStatement = this.currentSqmStatement;
 
 		this.currentSqmStatement = statement;
-		final QueryPart queryPart = visitQueryPart( statement.getQueryPart() );
+		final var queryPart = visitQueryPart( statement.getQueryPart() );
 		final List<DomainResult<?>> domainResults = queryPart.isRoot() ? this.domainResults : emptyList();
 		try {
 			return new SelectStatement( cteContainer, queryPart, domainResults );
@@ -1651,30 +1657,24 @@ public SelectStatement visitSelectStatement(SqmSelectStatement<?> statement) {
 
 	@Override
 	public DynamicInstantiation<?> visitDynamicInstantiation(SqmDynamicInstantiation<?> sqmDynamicInstantiation) {
-		final SqmDynamicInstantiationTarget<?> instantiationTarget = sqmDynamicInstantiation.getInstantiationTarget();
-		final DynamicInstantiationNature instantiationNature = instantiationTarget.getNature();
-		final JavaType<?> targetTypeDescriptor = interpretInstantiationTarget( instantiationTarget );
-
-		final DynamicInstantiation<?> dynamicInstantiation =
-				new DynamicInstantiation<>( instantiationNature, targetTypeDescriptor );
-
-		for ( SqmDynamicInstantiationArgument<?> sqmArgument : sqmDynamicInstantiation.getArguments() ) {
+		final var instantiationTarget = sqmDynamicInstantiation.getInstantiationTarget();
+		final var dynamicInstantiation =
+				new DynamicInstantiation<>( instantiationTarget.getNature(),
+						interpretInstantiationTarget( instantiationTarget ) );
+		for ( var sqmArgument : sqmDynamicInstantiation.getArguments() ) {
 			if ( sqmArgument.getSelectableNode() instanceof SqmPath<?> sqmPath ) {
 				prepareForSelection( sqmPath );
 			}
-			final DomainResultProducer<?> argumentResultProducer = (DomainResultProducer<?>) sqmArgument.accept( this );
-
-			dynamicInstantiation.addArgument( sqmArgument.getAlias(), argumentResultProducer, this );
+			dynamicInstantiation.addArgument( sqmArgument.getAlias(),
+					(DomainResultProducer<?>) sqmArgument.accept( this ) );
 		}
-
 		dynamicInstantiation.complete();
-
 		return dynamicInstantiation;
 	}
 
-	private <X> JavaType<X> interpretInstantiationTarget(SqmDynamicInstantiationTarget<X> instantiationTarget) {
+	private JavaType<?> interpretInstantiationTarget(SqmDynamicInstantiationTarget<?> instantiationTarget) {
 		return getCreationContext().getTypeConfiguration().getJavaTypeRegistry()
-				.getDescriptor( switch ( instantiationTarget.getNature() ) {
+				.resolveDescriptor( switch ( instantiationTarget.getNature() ) {
 					case LIST -> List.class;
 					case MAP -> Map.class;
 					default -> instantiationTarget.getJavaType();
@@ -2038,7 +2038,7 @@ public QuerySpec visitQuerySpec(SqmQuerySpec<?> sqmQuerySpec) {
 					sqlQuerySpec,
 					getCurrentProcessingState(),
 					this,
-					resolver -> new SqmAliasedNodePositionTracker( resolver, sqmQuerySpec.getSelectClause().getSelections() ),
+					resolver -> new SqmAliasedNodePositionTracker( resolver, sqmQuerySpec ),
 					currentClauseStack::getCurrent,
 					deduplicateSelectionItems
 			);
@@ -2419,8 +2419,7 @@ else if ( statement.getQuerySource() == SqmQuerySource.CRITERIA && currentClause
 			// To avoid this issue, we determine the position and let the SqlAstTranslator handle the rest.
 			// Usually it will render `select ?, count(*) from dual group by 1` if supported
 			// or force rendering the parameter as literal instead so that the database can see the grouping is fine
-			final SqmQuerySpec<?> querySpec = getCurrentSqmQueryPart().getFirstQuerySpec();
-			sqmPosition = indexOfExpression( querySpec.getSelectClause().getSelections(), groupByClauseExpression );
+			sqmPosition = indexOfExpression( getCurrentSqmQueryPart().getFirstQuerySpec(), groupByClauseExpression );
 			path = null;
 		}
 		else {
@@ -2482,9 +2481,18 @@ private SqlSelectionExpression sqlSelectionExpression(SqlSelection selection) {
 		);
 	}
 
-	private int indexOfExpression(List<? extends SqmAliasedNode<?>> selections, SqmExpression<?> node) {
-		final int result = indexOfExpression( 0, selections, node );
-		return result < 0 ? -1 : result;
+	private int indexOfExpression(SqmQuerySpec<?> querySpec, SqmExpression<?> node) {
+		final List<? extends SqmAliasedNode<?>> selections = querySpec.getSelectClause().getSelections();
+		if ( selections.isEmpty() ) {
+			final List<SqmRoot<?>> sqmRoots = querySpec.getRootList();
+			// Otherwise it would have failed query validation before already
+			assert sqmRoots.size() == 1;
+			return node == sqmRoots.get( 0 ) ? 0 : -1;
+		}
+		else {
+			final int result = indexOfExpression( 0, selections, node );
+			return result < 0 ? -1 : result;
+		}
 	}
 
 	private int indexOfExpression(int offset, List<? extends SqmAliasedNode<?>> selections, SqmExpression<?> node) {
@@ -3273,12 +3281,15 @@ protected void registerTypeUsage(TableGroup tableGroup) {
 		// The AND junction allows to create an intersection of entity name lists of all sub-predicates
 		if ( tableGroup.getModelPart().getPartMappingType() instanceof EntityMappingType mappingType ) {
 			final EntityPersister persister = mappingType.getEntityPersister();
-			// Avoid resolving subclass tables for persisters with physical discriminators as we won't need them
-			if ( !persister.getDiscriminatorMapping().hasPhysicalColumn() ) {
+			if ( persister.isPolymorphic()
+					// Avoid resolving subclass tables for persisters with physical discriminators as we won't need them
+					&& persister.getDiscriminatorMapping() != null
+					&& !persister.getDiscriminatorMapping().hasPhysicalColumn() ) {
 				if ( getCurrentClauseStack().getCurrent() != Clause.WHERE
 						&& getCurrentClauseStack().getCurrent() != Clause.HAVING ) {
 					// Where and having clauses are handled specially with EntityNameUse.FILTER and pruning
-					registerEntityNameUsage( tableGroup, EntityNameUse.PROJECTION, persister.getEntityName(), true );
+					registerEntityNameUsage( tableGroup, EntityNameUse.PROJECTION, persister.getEntityName(),
+							true );
 				}
 				else {
 					final int subclassTableSpan = persister.getSubclassTableSpan();
@@ -3407,9 +3418,11 @@ private TableGroup consumeAttributeJoin(
 		final List<SqmTreatedFrom<?, ?, ?>> sqmTreats = sqmJoin.getSqmTreats();
 		final SqmPredicate joinPredicate;
 		final SqmPredicate[] treatPredicates;
+		final boolean discriminatedAssociationTreatJoin =
+				isDiscriminatedAssociationTreatJoin( sqmJoin, sqmTreats, modelPart );
 		final boolean hasPredicate;
 		if ( !sqmTreats.isEmpty() ) {
-			if ( sqmTreats.size() == 1 ) {
+			if ( sqmTreats.size() == 1 && !discriminatedAssociationTreatJoin ) {
 				// If there is only a single treat, combine the predicates just as they are
 				joinPredicate = SqmCreationHelper.combinePredicates(
 						sqmJoin.getJoinPredicate(),
@@ -3428,7 +3441,7 @@ private TableGroup consumeAttributeJoin(
 					treatPredicates[i] = p;
 					hasTreatPredicate = hasTreatPredicate || p != null;
 				}
-				hasPredicate = joinPredicate != null || hasTreatPredicate;
+				hasPredicate = joinPredicate != null || hasTreatPredicate || discriminatedAssociationTreatJoin;
 			}
 		}
 		else {
@@ -3508,16 +3521,25 @@ private TableGroup consumeAttributeJoin(
 				for ( int i = 0; i < treatPredicates.length; i++ ) {
 					final var treatType = (EntityDomainType<?>) sqmTreats.get( i ).getTreatTarget();
 					orPredicate.add( combinePredicates(
-							createTreatTypeRestriction( sqmJoin, treatType ),
+							discriminatedAssociationTreatJoin
+									? createDiscriminatedAssociationTreatTypeRestriction( joinedTableGroup, modelPart, treatType )
+									: createTreatTypeRestriction( sqmJoin, treatType ),
 							treatPredicates[i] == null ? null : visitNestedTopLevelPredicate( treatPredicates[i] )
 					) );
 				}
 				predicate = predicate != null ? combinePredicates( predicate, orPredicate ) : orPredicate;
 			}
 			joinForPredicate = determineJoinForPredicateApply( joinedTableGroupJoin );
+			if ( discriminatedAssociationTreatJoin
+					&& sqmJoinType == SqmJoinType.INNER
+					&& ( joinedTableGroup.isVirtual() || joinForPredicate.getJoinedGroup().isVirtual() ) ) {
+				// Predicates on the virtual join itself are not rendered, so for inner joins
+				// we can safely enforce the treat restriction as an equivalent query predicate.
+				additionalRestrictions = combinePredicates( additionalRestrictions, predicate );
+			}
 			// If translating the join predicate didn't initialize the table group,
 			// we can safely apply it on the collection table group instead
-			if ( joinForPredicate.getJoinedGroup().isInitialized() ) {
+			else if ( joinForPredicate.getJoinedGroup().isInitialized() ) {
 				joinForPredicate.applyPredicate( predicate );
 			}
 			else {
@@ -3547,6 +3569,15 @@ private TableGroup consumeAttributeJoin(
 		return joinedTableGroup;
 	}
 
+	private static boolean isDiscriminatedAssociationTreatJoin(
+			SqmAttributeJoin<?, ?> sqmJoin, List<SqmTreatedFrom<?, ?, ?>> sqmTreats, ModelPart modelPart) {
+		return !sqmTreats.isEmpty()
+			&& ( modelPart instanceof DiscriminatedAssociationModelPart
+				|| modelPart instanceof PluralAttributeMapping pluralAttributeMapping
+						&& pluralAttributeMapping.getElementDescriptor() instanceof DiscriminatedAssociationModelPart
+				|| sqmJoin.getNodeType() instanceof AnyMappingDomainType<?> );
+	}
+
 	private TableGroup consumeCrossJoin(SqmCrossJoin<?> sqmJoin, TableGroup lhsTableGroup, boolean transitive) {
 		final EntityPersister entityDescriptor = resolveEntityPersister( sqmJoin.getReferencedPathSource() );
 
@@ -3577,6 +3608,7 @@ private TableGroup consumeCrossJoin(SqmCrossJoin<?> sqmJoin, TableGroup lhsTable
 
 	private TableGroup consumeEntityJoin(SqmEntityJoin<?,?> sqmJoin, TableGroup lhsTableGroup, boolean transitive) {
 		final EntityPersister entityDescriptor = resolveEntityPersister( sqmJoin.getReferencedPathSource() );
+		final var loadQueryInfluencers = getLoadQueryInfluencers();
 
 		final SqlAstJoinType correspondingSqlJoinType = sqmJoin.getSqmJoinType().getCorrespondingSqlJoinType();
 		final TableGroup tableGroup = entityDescriptor.createRootTableGroup(
@@ -3598,8 +3630,7 @@ private TableGroup consumeEntityJoin(SqmEntityJoin<?,?> sqmJoin, TableGroup lhsT
 		final TableGroupJoin tableGroupJoin = new TableGroupJoin(
 				sqmJoin.getNavigablePath(),
 				correspondingSqlJoinType,
-				tableGroup,
-				null
+				tableGroup
 		);
 		lhsTableGroup.addTableGroupJoin( tableGroupJoin );
 
@@ -3607,18 +3638,15 @@ private TableGroup consumeEntityJoin(SqmEntityJoin<?,?> sqmJoin, TableGroup lhsT
 				tableGroupJoin::applyPredicate,
 				tableGroup,
 				true,
-				getLoadQueryInfluencers().getEnabledFilters(),
+				loadQueryInfluencers.getEnabledFilters(),
 				false,
 				null,
 				this
 		);
 
-		final SoftDeleteMapping softDeleteMapping = entityDescriptor.getSoftDeleteMapping();
-		if ( softDeleteMapping != null ) {
-			final Predicate softDeleteRestriction = softDeleteMapping.createNonDeletedRestriction(
-					tableGroup.resolveTableReference( softDeleteMapping.getTableName() )
-			);
-			tableGroupJoin.applyPredicate( softDeleteRestriction );
+		final var auxiliaryMapping = entityDescriptor.getAuxiliaryMapping();
+		if ( auxiliaryMapping != null ) {
+			auxiliaryMapping.applyPredicate( tableGroupJoin, loadQueryInfluencers );
 		}
 
 		if ( sqmJoin.getJoinPredicate() != null ) {
@@ -3678,8 +3706,7 @@ private TableGroup consumeDerivedJoin(SqmDerivedJoin<?> sqmJoin, TableGroup pare
 		final TableGroupJoin tableGroupJoin = new TableGroupJoin(
 				queryPartTableGroup.getNavigablePath(),
 				sqmJoin.getSqmJoinType().getCorrespondingSqlJoinType(),
-				queryPartTableGroup,
-				null
+				queryPartTableGroup
 		);
 		parentTableGroup.addTableGroupJoin( tableGroupJoin );
 
@@ -3713,8 +3740,7 @@ private TableGroup consumeFunctionJoin(SqmFunctionJoin<?> sqmJoin, TableGroup pa
 		final TableGroupJoin tableGroupJoin = new TableGroupJoin(
 				tableGroup.getNavigablePath(),
 				correspondingSqlJoinType,
-				tableGroup,
-				null
+				tableGroup
 		);
 		parentTableGroup.addTableGroupJoin( tableGroupJoin );
 
@@ -3746,8 +3772,7 @@ private TableGroup consumeCteJoin(SqmCteJoin<?> sqmJoin, TableGroup parentTableG
 		final TableGroupJoin tableGroupJoin = new TableGroupJoin(
 				tableGroup.getNavigablePath(),
 				correspondingSqlJoinType,
-				tableGroup,
-				null
+				tableGroup
 		);
 		parentTableGroup.addTableGroupJoin( tableGroupJoin );
 
@@ -4457,6 +4482,14 @@ else if ( actualModelPart instanceof AnonymousTupleTableGroupProducer tableGroup
 					);
 				}
 			}
+			else if ( actualModelPart instanceof DiscriminatedAssociationModelPart discriminatedAssociationModelPart ) {
+				result = DiscriminatedAssociationPathInterpretation.from(
+						navigablePath,
+						discriminatedAssociationModelPart,
+						tableGroup,
+						this
+				);
+			}
 			else {
 				throw new SemanticException(
 						"The SqmFrom node [" + path + "] can not be used in a context where the expression needs to " +
@@ -4579,8 +4612,11 @@ public Expression visitEmbeddableValuedPath(SqmEmbeddedValuedSimplePath<?> sqmPa
 
 	@Override
 	public Expression visitAnyValuedValuedPath(SqmAnyValuedSimplePath<?> sqmPath) {
+		final Clause currentClause = getCurrentClauseStack().getCurrent();
 		return withTreatRestriction(
-				prepareReusablePath( sqmPath, () -> DiscriminatedAssociationPathInterpretation.from( sqmPath, this ) ),
+				currentClause == Clause.INSERT || currentClause == Clause.SET
+						? DiscriminatedAssociationPathInterpretation.from( sqmPath, this )
+						: prepareReusablePath( sqmPath, () -> DiscriminatedAssociationPathInterpretation.from( sqmPath, this ) ),
 				sqmPath
 		);
 	}
@@ -5467,11 +5503,10 @@ private Set<String> determineEntityNamesForTreatTypeRestriction(
 			EntityMappingType partMappingType,
 			Map<String, EntityNameUse> entityNameUses) {
 		final Set<String> entityNameUsesSet = new HashSet<>( entityNameUses.size() );
-		for ( Map.Entry<String, EntityNameUse> entry : entityNameUses.entrySet() ) {
-			if ( entry.getValue() == EntityNameUse.PROJECTION ) {
-				continue;
+		for ( var entry : entityNameUses.entrySet() ) {
+			if ( entry.getValue() != EntityNameUse.PROJECTION ) {
+				entityNameUsesSet.add( entry.getKey() );
 			}
-			entityNameUsesSet.add( entry.getKey() );
 		}
 
 		if ( entityNameUsesSet.containsAll( partMappingType.getSubclassEntityNames() ) ) {
@@ -5482,14 +5517,10 @@ private Set<String> determineEntityNamesForTreatTypeRestriction(
 			// If the conjunct contains FILTER uses we can omit the treat type restriction
 			return emptySet();
 		}
+		final String partEntityName = partMappingType.getEntityName();
 		final String baseEntityNameToAdd;
-		if ( entityNameUsesSet.contains( partMappingType.getEntityName() ) ) {
-			if ( !partMappingType.isAbstract() ) {
-				baseEntityNameToAdd = partMappingType.getEntityName();
-			}
-			else {
-				baseEntityNameToAdd = null;
-			}
+		if ( entityNameUsesSet.contains( partEntityName ) ) {
+			baseEntityNameToAdd = partMappingType.isAbstract() ? null : partEntityName;
 			if ( entityNameUses.size() == 1 ) {
 				return emptySet();
 			}
@@ -5498,15 +5529,16 @@ private Set<String> determineEntityNamesForTreatTypeRestriction(
 			baseEntityNameToAdd = null;
 		}
 		final Set<String> entityNames = new HashSet<>( entityNameUsesSet.size() );
-		for ( Map.Entry<String, EntityNameUse> entityNameUse : entityNameUses.entrySet() ) {
+		for ( var entityNameUse : entityNameUses.entrySet() ) {
 			if ( entityNameUse.getValue() == EntityNameUse.TREAT ) {
 				final String entityName = entityNameUse.getKey();
-				final EntityPersister entityDescriptor = creationContext.getMappingMetamodel()
-						.findEntityDescriptor( entityName );
+				final var entityDescriptor =
+						creationContext.getMappingMetamodel()
+								.findEntityDescriptor( entityName );
 				if ( !entityDescriptor.isAbstract() ) {
 					entityNames.add( entityDescriptor.getEntityName() );
 				}
-				for ( EntityMappingType subMappingType : entityDescriptor.getSubMappingTypes() ) {
+				for ( var subMappingType : entityDescriptor.getSubMappingTypes() ) {
 					if ( !subMappingType.isAbstract() ) {
 						entityNames.add( subMappingType.getEntityName() );
 					}
@@ -5514,7 +5546,7 @@ private Set<String> determineEntityNamesForTreatTypeRestriction(
 			}
 		}
 		do {
-			entityNames.remove( partMappingType.getEntityName() );
+			entityNames.remove( partEntityName );
 			partMappingType = partMappingType.getSuperMappingType();
 		} while ( partMappingType != null );
 		if ( !entityNames.isEmpty() && baseEntityNameToAdd != null ) {
@@ -5523,6 +5555,63 @@ private Set<String> determineEntityNamesForTreatTypeRestriction(
 		return entityNames;
 	}
 
+	private Predicate createDiscriminatedAssociationTreatTypeRestriction(
+			TableGroup tableGroup,
+			ModelPart modelPart,
+			EntityDomainType<?> treatTarget) {
+		final var associationModelPart = resolveDiscriminatedAssociationModelPart( modelPart );
+		if ( associationModelPart == null ) {
+			return null;
+		}
+
+		final var entityDescriptor =
+				domainModel.findEntityDescriptor( treatTarget.getHibernateEntityName() );
+		final Set<String> entityNames =
+				entityDescriptor.isPolymorphic()
+						? entityDescriptor.getSubclassEntityNames()
+						: Set.of( entityDescriptor.getEntityName() );
+		final var discriminatorMapping = associationModelPart.getDiscriminatorMapping();
+		final var tableReference =
+				tableGroup.resolveTableReference( null,
+						discriminatorMapping.getContainingTableExpression() );
+		final var discriminatorColumn = new ColumnReference( tableReference, discriminatorMapping );
+		if ( entityNames.size() == 1 ) {
+			return new ComparisonPredicate(
+					discriminatorColumn,
+					ComparisonOperator.EQUAL,
+					discriminatorValueLiteral( discriminatorMapping,
+							entityNames.iterator().next() )
+			);
+		}
+		else {
+			final List<Expression> typeLiterals = new ArrayList<>( entityNames.size() );
+			for ( String entityName : entityNames ) {
+				typeLiterals.add( discriminatorValueLiteral( discriminatorMapping, entityName ) );
+			}
+			return new InListPredicate( discriminatorColumn, typeLiterals );
+		}
+	}
+
+	private static @NonNull QueryLiteral<Object> discriminatorValueLiteral(
+			DiscriminatorMapping discriminatorMapping, String entityName) {
+		return new QueryLiteral<>(
+				discriminatorMapping.getValueConverter()
+						.getDetailsForEntityName( entityName ).getValue(),
+				discriminatorMapping
+		);
+	}
+
+	private DiscriminatedAssociationModelPart resolveDiscriminatedAssociationModelPart(ModelPart modelPart) {
+		if ( modelPart instanceof DiscriminatedAssociationModelPart associationModelPart ) {
+			return associationModelPart;
+		}
+		if ( modelPart instanceof PluralAttributeMapping pluralAttributeMapping
+				&& pluralAttributeMapping.getElementDescriptor() instanceof DiscriminatedAssociationModelPart associationModelPart ) {
+			return associationModelPart;
+		}
+		return null;
+	}
+
 	private Set<String> determineEmbeddableNamesForTreatTypeRestriction(
 			EmbeddableMappingType embeddableMappingType,
 			Map<String, EntityNameUse> entityNameUses) {
@@ -5539,21 +5628,39 @@ private Set<String> determineEmbeddableNamesForTreatTypeRestriction(
 	}
 
 	private Predicate createTreatTypeRestriction(SqmPath<?> lhs, EntityDomainType<?> treatTarget) {
-		final EntityPersister entityDescriptor = domainModel.findEntityDescriptor( treatTarget.getHibernateEntityName() );
-		if ( entityDescriptor.isPolymorphic() && lhs.getNodeType() != treatTarget ) {
-			final Set<String> subclassEntityNames = entityDescriptor.getSubclassEntityNames();
-			return createTreatTypeRestriction( lhs, subclassEntityNames );
+		final var entityDescriptor = domainModel.findEntityDescriptor( treatTarget.getHibernateEntityName() );
+		final var nodeType = lhs.getNodeType();
+		final boolean polymorphic = entityDescriptor.isPolymorphic();
+		if ( nodeType instanceof AnyMappingDomainType<?>
+				&& SqmExpressionHelper.get( lhs, DISCRIMINATOR_ROLE_NAME )
+						instanceof AnyDiscriminatorSqmPath<?> ) {
+			return createTreatTypeRestriction(
+					lhs,
+					polymorphic
+							? entityDescriptor.getSubclassEntityNames()
+							: Set.of( entityDescriptor.getEntityName() )
+			);
+		}
+		else if ( polymorphic && nodeType != treatTarget ) {
+			return createTreatTypeRestriction( lhs,
+					entityDescriptor.getSubclassEntityNames() );
+		}
+		else {
+			return null;
 		}
-		return null;
 	}
 
 	private Predicate createTreatTypeRestriction(SqmPath<?> lhs, Set<String> subclassEntityNames) {
 		// Do what visitSelfInterpretingSqmPath does, except for calling preparingReusablePath
 		// as that would register a type usage for the table group that we don't want here
-		final EntityDiscriminatorSqmPath<?> discriminatorSqmPath = (EntityDiscriminatorSqmPath<?>) lhs.type();
+		final var discriminatorSqmPath =
+				(DiscriminatorSqmPath<?>)
+						SqmExpressionHelper.get( lhs, DISCRIMINATOR_ROLE_NAME );
 		registerTypeUsage( discriminatorSqmPath );
 		return createTreatTypeRestriction(
-				DiscriminatorPathInterpretation.from( discriminatorSqmPath, this ),
+				discriminatorSqmPath instanceof AnyDiscriminatorSqmPath<?> anyDiscriminatorSqmPath
+						? AnyDiscriminatorPathInterpretation.from( anyDiscriminatorSqmPath, this )
+						: DiscriminatorPathInterpretation.from( discriminatorSqmPath, this ),
 				subclassEntityNames,
 				false,
 				true
@@ -5592,12 +5699,26 @@ private Predicate createTreatTypeRestriction(
 
 	private Expression getTypeLiteral(SqmPathInterpretation<?> typeExpression, String typeName, boolean entity) {
 		if ( entity ) {
-			return new EntityTypeLiteral( domainModel.findEntityDescriptor( typeName ) );
+			if ( typeExpression instanceof AnyDiscriminatorPathInterpretation<?> ) {
+				final var discriminatorMapping = (DiscriminatorMapping) typeExpression.getExpressionType();
+				return new QueryLiteral<>(
+						discriminatorMapping.getValueConverter()
+								.getDetailsForEntityName( typeName )
+								.getValue(),
+						discriminatorMapping
+				);
+			}
+			else {
+				return new EntityTypeLiteral( domainModel.findEntityDescriptor( typeName ) );
+			}
 		}
 		else {
-			final EmbeddableDomainType<?> embeddable = creationContext.getJpaMetamodel().embeddable( typeName );
-			return new EmbeddableTypeLiteral( embeddable,
-					(BasicType<?>) typeExpression.getExpressionType().getSingleJdbcMapping() );
+			return new EmbeddableTypeLiteral(
+					creationContext.getJpaMetamodel().embeddable( typeName ),
+					(BasicType<?>)
+							typeExpression.getExpressionType()
+									.getSingleJdbcMapping()
+			);
 		}
 	}
 
@@ -5812,10 +5933,7 @@ else if ( Character.class.isAssignableFrom( valueConverter.getRelationalJavaType
 		// so we allow coercion between the number types
 		else if ( Number.class.isAssignableFrom( valueConverter.getRelationalJavaType().getJavaTypeClass() )
 				&& value instanceof Number ) {
-			return valueConverter.getRelationalJavaType().coerce(
-					value,
-					creationContext::getTypeConfiguration
-			);
+			return valueConverter.getRelationalJavaType().coerce( value );
 		}
 		else {
 			throw new SemanticException(
@@ -6152,14 +6270,14 @@ protected MappingModelExpressible<?> determineValueMapping(SqmParameter<?> sqmPa
 		else if ( paramType instanceof MappingModelExpressible<?> paramModelType ) {
 			final MappingModelExpressible<?> inferredValueMapping = getInferredValueMapping();
 			// Prefer the model part type instead of the bind type if possible as the model part type contains size information
-			if ( inferredValueMapping instanceof ModelPart ) {
-				final JdbcMapping paramJdbcMapping = paramModelType.getSingleJdbcMapping();
-				final JdbcMapping inferredJdbcMapping = inferredValueMapping.getSingleJdbcMapping();
+			if ( inferredValueMapping instanceof ModelPart inferredModelPart ) {
+				final JavaType<?> paramJavaType = ((SqmBindableType<?>) paramType).getExpressibleJavaType();
 				// Only use the inferred mapping as parameter type when the JavaType accepts values of the bind type
-				if ( ( inferredJdbcMapping.getMappedJavaType() == paramJdbcMapping.getMappedJavaType()
-						|| inferredJdbcMapping.getMappedJavaType().isWider( paramJdbcMapping.getMappedJavaType() ) )
+				if ( ( paramJavaType.getJavaTypeClass() == Object.class
+						|| inferredModelPart.getJavaType() == paramJavaType
+						|| inferredModelPart.getJavaType().isWider( paramJavaType ) )
 						// and the bind type is not explicit or the bind type has the same JDBC type
-						&& ( !bindingTypeExplicit || canUseInferredType( paramJdbcMapping, inferredJdbcMapping ) ) ) {
+						&& ( !bindingTypeExplicit || canUseInferredType( paramModelType, inferredValueMapping ) ) ) {
 					return resolveInferredValueMappingForParameter( inferredValueMapping );
 				}
 			}
@@ -6249,9 +6367,13 @@ else if ( paramSqmType instanceof SingularAttribute<?, ?> singularAttribute ) {
 		}
 	}
 
-	private static boolean canUseInferredType(JdbcMapping bindJdbcMapping, JdbcMapping inferredJdbcMapping) {
-		final JdbcType bindJdbcType = bindJdbcMapping.getJdbcType();
-		final JdbcType inferredJdbcType = inferredJdbcMapping.getJdbcType();
+	private static boolean canUseInferredType(MappingModelExpressible<?> bindType, MappingModelExpressible<?> inferredType) {
+		if ( inferredType.getJdbcTypeCount() != 1 ) {
+			// The inferred type is an embeddable or entity with embeddable id, which is more concrete
+			return true;
+		}
+		final JdbcType bindJdbcType = bindType.getSingleJdbcMapping().getJdbcType();
+		final JdbcType inferredJdbcType = inferredType.getSingleJdbcMapping().getJdbcType();
 		// If the bind type has a different JDBC type, we prefer that over the inferred type.
 		return bindJdbcType == inferredJdbcType
 			|| bindJdbcType instanceof ArrayJdbcType bindArrayType && inferredJdbcType instanceof ArrayJdbcType inferredArrayType
@@ -6781,12 +6903,12 @@ private Object transformDurationArithmetic(SqmBinaryArithmetic<?> expression) {
 					if ( lhs != expression.getLeftHandOperand() ) {
 						final SqmPath<?> temporalPath = (SqmPath<?>) expression.getLeftHandOperand();
 						baseNavigablePath = temporalPath.getNavigablePath().getParent();
-						offset = temporalPath.get( ZONE_OFFSET_NAME ).accept( this );
+						offset = SqmExpressionHelper.get( temporalPath, ZONE_OFFSET_NAME ).accept( this );
 					}
 					else if ( rhs != expression.getRightHandOperand() ) {
 						final SqmPath<?> temporalPath = (SqmPath<?>) expression.getRightHandOperand();
 						baseNavigablePath = temporalPath.getNavigablePath().getParent();
-						offset = temporalPath.get( ZONE_OFFSET_NAME ).accept( this );
+						offset = SqmExpressionHelper.get( temporalPath, ZONE_OFFSET_NAME ).accept( this );
 					}
 					else {
 						return result;
@@ -7825,19 +7947,44 @@ public Predicate visitMemberOfPredicate(SqmMemberOfPredicate predicate) {
 							this
 					)
 			);
+			subQuerySpec.applyPredicate(
+					new ComparisonPredicate(
+							toSingleExpression( subQuerySpec.getSelectClause().getSqlSelections(), lhs ),
+							ComparisonOperator.EQUAL,
+							lhs
+					)
+			);
+			subQuerySpec.getSelectClause().getSqlSelections().clear();
+			subQuerySpec.getSelectClause().addSqlSelection(
+					new SqlSelectionImpl( new QueryLiteral<>( 1, basicType( Integer.class ) ) )
+			);
 		}
 		finally {
 			popProcessingStateStack();
 		}
 
-		return new InSubQueryPredicate(
-				lhs,
+		return new ExistsPredicate(
 				new SelectStatement( subQuerySpec ),
 				predicate.isNegated(),
 				getBooleanType()
 		);
 	}
 
+	private Expression toSingleExpression(List<SqlSelection> sqlSelections, Expression inferenceSource) {
+		assert !sqlSelections.isEmpty();
+
+		if ( sqlSelections.size() == 1 ) {
+			return sqlSelections.get( 0 ).getExpression();
+		}
+		else {
+			final var expressions = new ArrayList<Expression>( sqlSelections.size() );
+			for ( SqlSelection sqlSelection : sqlSelections ) {
+				expressions.add( sqlSelection.getExpression() );
+			}
+			return new SqlTuple( expressions, (MappingModelExpressible<?>) inferenceSource.getExpressionType() );
+		}
+	}
+
 	@Override
 	public NegatedPredicate visitNegatedPredicate(SqmNegatedPredicate predicate) {
 		return new NegatedPredicate(
@@ -8842,10 +8989,29 @@ protected static class SqmAliasedNodePositionTracker implements SqlExpressionRes
 		private final List<SqlSelection>[] sqlSelectionsForSqmSelection;
 		private int index = -1;
 
-		@SuppressWarnings("unchecked")
+		public SqmAliasedNodePositionTracker(SqlExpressionResolver delegate, SqmQuerySpec<?> sqmQuerySpec) {
+			this( delegate, countSqmSelections( sqmQuerySpec ) );
+		}
+
 		public SqmAliasedNodePositionTracker(SqlExpressionResolver delegate, List<? extends SqmAliasedNode<?>> selections) {
+			this( delegate, selections.isEmpty() ? 1 : countIndividualSelections( selections ) );
+		}
+
+		@SuppressWarnings("unchecked")
+		public SqmAliasedNodePositionTracker(SqlExpressionResolver delegate, int sqmSelections) {
 			this.delegate = delegate;
-			this.sqlSelectionsForSqmSelection = new List[countIndividualSelections( selections )];
+			this.sqlSelectionsForSqmSelection = new List[sqmSelections];
+		}
+
+		private static int countSqmSelections(SqmQuerySpec<?> sqmQuerySpec) {
+			final List<SqmSelection<?>> selections = sqmQuerySpec.getSelectClause().getSelections();
+			if ( selections.isEmpty() ) {
+				assert sqmQuerySpec.getFromClause().getRoots().size() == 1;
+				return 1;
+			}
+			else {
+				return countIndividualSelections( selections );
+			}
 		}
 
 		private static int countIndividualSelections(List<? extends SqmAliasedNode<?>> selections) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatedAssociationPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatedAssociationPathInterpretation.java
index 57f54236d067..df6760728bb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatedAssociationPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatedAssociationPathInterpretation.java
@@ -30,33 +30,52 @@ public class DiscriminatedAssociationPathInterpretation<T> extends AbstractSqmPa
 	public static <T> DiscriminatedAssociationPathInterpretation<T> from(
 			SqmAnyValuedSimplePath<T> sqmPath,
 			SqmToSqlAstConverter converter) {
-		final TableGroup tableGroup = converter.getFromClauseAccess()
-			.findTableGroup( sqmPath.getLhs().getNavigablePath() );
+		final TableGroup tableGroup =
+				converter.getFromClauseAccess()
+						.findTableGroup( sqmPath.getLhs().getNavigablePath() );
+		final var mapping =
+				(DiscriminatedAssociationModelPart)
+						tableGroup.getModelPart().findSubPart(
+								sqmPath.getReferencedPathSource().getPathName(),
+								null
+						);
+		return new DiscriminatedAssociationPathInterpretation<>(
+				sqmPath.getNavigablePath(),
+				mapping,
+				tableGroup,
+				createSqlTuple( sqmPath.getNavigablePath(), mapping, tableGroup, converter )
+		);
+	}
 
-		final DiscriminatedAssociationModelPart mapping = (DiscriminatedAssociationModelPart ) tableGroup.getModelPart().findSubPart(
-				sqmPath.getReferencedPathSource().getPathName(),
-				null
+	public static <T> DiscriminatedAssociationPathInterpretation<T> from(
+			NavigablePath navigablePath,
+			DiscriminatedAssociationModelPart mapping,
+			TableGroup tableGroup,
+			SqmToSqlAstConverter converter) {
+		return new DiscriminatedAssociationPathInterpretation<>(
+				navigablePath,
+				mapping,
+				tableGroup,
+				createSqlTuple( navigablePath, mapping, tableGroup, converter )
 		);
+	}
 
+	private static SqlTuple createSqlTuple(
+			NavigablePath navigablePath,
+			DiscriminatedAssociationModelPart mapping,
+			TableGroup tableGroup,
+			SqmToSqlAstConverter converter) {
 		final List<Expression> tupleExpressions = new ArrayList<>();
-
 		mapping.forEachSelectable(
 				(selectionIndex, selectableMapping) -> {
-					final TableReference tableReference = tableGroup.resolveTableReference( sqmPath.getNavigablePath(), selectableMapping.getContainingTableExpression() );
-					final Expression expression = converter.getSqlExpressionResolver().resolveSqlExpression(
-							tableReference,
-							selectableMapping
-					);
-					tupleExpressions.add( expression );
+					final TableReference tableReference =
+							tableGroup.resolveTableReference( navigablePath,
+									selectableMapping.getContainingTableExpression() );
+					tupleExpressions.add( converter.getSqlExpressionResolver()
+							.resolveSqlExpression( tableReference, selectableMapping ) );
 				}
 		);
-
-		return new DiscriminatedAssociationPathInterpretation<T>(
-				sqmPath.getNavigablePath(),
-				mapping,
-				tableGroup,
-				new SqlTuple( tupleExpressions, mapping )
-		);
+		return new SqlTuple( tupleExpressions, mapping );
 	}
 
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java
index 71c704320281..4c1d005495b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java
@@ -46,7 +46,7 @@ public static <T> Expression from(
 		final SqmPath<?> lhs = sqmPath.getLhs();
 		final TableGroup tableGroup =
 				sqlAstCreationState.getFromClauseAccess()
-						.getTableGroup( lhs.getNavigablePath() );
+						.getTableGroup( sqmPath.getNavigablePath().getParent() );
 		EntityMappingType treatTarget = null;
 		if ( jpaQueryComplianceEnabled ) {
 			final MappingMetamodel mappingMetamodel =
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmDmlStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmDmlStatement.java
index 6e88b7a10c9c..a4a5a48dbdd5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmDmlStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmDmlStatement.java
@@ -25,6 +25,8 @@
 import java.util.Set;
 import java.util.function.Function;
 
+import static java.lang.Character.isAlphabetic;
+
 /**
  * @author Steve Ebersole
  */
@@ -56,17 +58,19 @@ public AbstractSqmDmlStatement(
 	}
 
 	protected Map<String, SqmCteStatement<?>> copyCteStatements(SqmCopyContext context) {
-		final Map<String, SqmCteStatement<?>> cteStatements = new LinkedHashMap<>( this.cteStatements.size() );
-		for ( Map.Entry<String, SqmCteStatement<?>> entry : this.cteStatements.entrySet() ) {
-			cteStatements.put( entry.getKey(), entry.getValue().copy( context ) );
+		final Map<String, SqmCteStatement<?>> copy =
+				new LinkedHashMap<>( cteStatements.size() );
+		for ( var entry : cteStatements.entrySet() ) {
+			copy.put( entry.getKey(), entry.getValue().copy( context ) );
 		}
-		return cteStatements;
+		return copy;
 	}
 
 	protected void putAllCtes(SqmCteContainer cteContainer) {
-		for ( SqmCteStatement<?> cteStatement : cteContainer.getCteStatements() ) {
-			if ( cteStatements.putIfAbsent( cteStatement.getCteTable().getCteName(), cteStatement ) != null ) {
-				throw new IllegalArgumentException( "A CTE with the label " + cteStatement.getCteTable().getCteName() + " already exists" );
+		for ( var cteStatement : cteContainer.getCteStatements() ) {
+			final String cteName = cteStatement.getCteTable().getCteName();
+			if ( cteStatements.putIfAbsent( cteName, cteStatement ) != null ) {
+				throw new IllegalArgumentException( "A CTE with the label " + cteName + " already exists" );
 			}
 		}
 	}
@@ -138,7 +142,7 @@ private String validateCteName(String name) {
 		if ( name == null || name.isBlank() ) {
 			throw new IllegalArgumentException( "Illegal empty CTE name" );
 		}
-		if ( !Character.isAlphabetic( name.charAt( 0 ) ) ) {
+		if ( !isAlphabetic( name.charAt( 0 ) ) ) {
 			throw new IllegalArgumentException(
 					String.format(
 							"Illegal CTE name [%s]. Names must start with an alphabetic character!",
@@ -150,7 +154,7 @@ private String validateCteName(String name) {
 	}
 
 	private <X> JpaCteCriteria<X> withInternal(String name, AbstractQuery<X> criteria) {
-		final SqmCteStatement<X> cteStatement = new SqmCteStatement<>(
+		final var cteStatement = new SqmCteStatement<>(
 				name,
 				(SqmSelectQuery<X>) criteria,
 				this,
@@ -167,7 +171,7 @@ private <X> JpaCteCriteria<X> withInternal(
 			AbstractQuery<X> baseCriteria,
 			boolean unionDistinct,
 			Function<JpaCteCriteria<X>, AbstractQuery<X>> recursiveCriteriaProducer) {
-		final SqmCteStatement<X> cteStatement = new SqmCteStatement<>(
+		final var cteStatement = new SqmCteStatement<>(
 				name,
 				(SqmSelectQuery<X>) baseCriteria,
 				unionDistinct,
@@ -199,7 +203,7 @@ public <U> SqmSubQuery<U> subquery(Class<U> type) {
 	protected void appendHqlCteString(StringBuilder sb, SqmRenderContext context) {
 		if ( !cteStatements.isEmpty() ) {
 			sb.append( "with " );
-			for ( SqmCteStatement<?> value : cteStatements.values() ) {
+			for ( var value : cteStatements.values() ) {
 				value.appendHqlString( sb, context );
 				sb.append( ", " );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java
index 82531d198607..44185863958d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java
@@ -60,7 +60,7 @@ protected AbstractSqmRestrictedDmlStatement(
 			return null;
 		}
 		else {
-			final SqmPredicate predicate = whereClause.getPredicate();
+			final var predicate = whereClause.getPredicate();
 			return new SqmWhereClause( predicate == null ? null : predicate.copy( context ), nodeBuilder() );
 		}
 	}
@@ -70,8 +70,8 @@ public SqmRoot<T> from(Class<T> entityClass) {
 	}
 
 	public SqmRoot<T> from(EntityType<T> entity) {
-		final EntityDomainType<T> entityDomainType = (EntityDomainType<T>) entity;
-		final SqmRoot<T> root = getTarget();
+		final var entityDomainType = (EntityDomainType<T>) entity;
+		final var root = getTarget();
 		if ( root.getModel() != entity ) {
 			throw new IllegalArgumentException(
 					String.format(
@@ -124,7 +124,7 @@ protected void setWhere(Predicate @Nullable ... restrictions) {
 		// Clear the current predicate if one is present
 		whereClause.setPredicate( null );
 		if ( restrictions != null ) {
-			for ( Predicate restriction : restrictions ) {
+			for ( var restriction : restrictions ) {
 				whereClause.applyPredicate( (SqmPredicate) restriction );
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmStatement.java
index be3d59fae475..83217d39c292 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmStatement.java
@@ -49,7 +49,7 @@ protected AbstractSqmStatement(
 		}
 		else {
 			final Set<SqmParameter<?>> parameters = new LinkedHashSet<>( this.parameters.size() );
-			for ( SqmParameter<?> parameter : this.parameters ) {
+			for ( var parameter : this.parameters ) {
 				parameters.add( parameter.copy( context ) );
 			}
 			return parameters;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java
index 4ab2ad036baa..dc476e8d841d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteStatement.java
@@ -147,7 +147,7 @@ private SqmCteStatement(
 
 	@Override
 	public SqmCteStatement<T> copy(SqmCopyContext context) {
-		final SqmCteStatement<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java
index d2ddd024a301..136783583b11 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/delete/SqmDeleteStatement.java
@@ -61,7 +61,7 @@ public SqmDeleteStatement(
 
 	@Override
 	public SqmDeleteStatement<T> copy(SqmCopyContext context) {
-		final SqmDeleteStatement<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java
index dac9754aa13d..f7fcfe07efa9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java
@@ -33,7 +33,6 @@
 import org.hibernate.query.hql.spi.SqmCreationState;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.SqmPathSource;
-import org.hibernate.query.sqm.spi.SqmCreationHelper;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.query.sqm.tree.SqmJoinType;
 import org.hibernate.query.sqm.tree.SqmRenderContext;
@@ -66,6 +65,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableList;
 import static org.hibernate.query.sqm.internal.SqmUtil.findCompatibleFetchJoin;
+import static org.hibernate.query.sqm.spi.SqmCreationHelper.buildRootNavigablePath;
 
 /**
  * Convenience base class for SqmFrom implementations
@@ -85,7 +85,6 @@ protected AbstractSqmFrom(
 			@Nullable String alias,
 			NodeBuilder nodeBuilder) {
 		super( navigablePath, referencedNavigable, lhs, nodeBuilder );
-
 		if ( lhs == null ) {
 			throw new IllegalArgumentException( "LHS cannot be null" );
 		}
@@ -100,7 +99,7 @@ protected AbstractSqmFrom(
 			@Nullable String alias,
 			NodeBuilder nodeBuilder) {
 		super(
-				SqmCreationHelper.buildRootNavigablePath( entityType.getHibernateEntityName(), alias ),
+				buildRootNavigablePath( entityType.getHibernateEntityName(), alias ),
 				(SqmEntityDomainType<T>) entityType,
 				null,
 				nodeBuilder
@@ -118,7 +117,6 @@ protected AbstractSqmFrom(
 			@Nullable String alias,
 			NodeBuilder nodeBuilder) {
 		super( navigablePath, entityType, null, nodeBuilder );
-
 		this.alias = alias;
 	}
 
@@ -136,20 +134,32 @@ protected void copyTo(AbstractSqmFrom<O, T> target, SqmCopyContext context) {
 		super.copyTo( target, context );
 		final var joins = this.joins;
 		if ( joins != null ) {
-			final ArrayList<SqmJoin<T, ?>> newJoins = new ArrayList<>( joins.size() );
-			for ( SqmJoin<T, ?> join : joins ) {
-				newJoins.add( join.copy( context ) );
-			}
-			target.joins = newJoins;
+			target.joins = copyJoins( context, joins );
 		}
 		final var treats = this.treats;
 		if ( treats != null ) {
-			final ArrayList<SqmTreatedFrom<?, ?, @Nullable ?>> newTreats = new ArrayList<>( treats.size() );
-			for ( SqmTreatedFrom<?,?,@Nullable ?> treat : treats ) {
-				newTreats.add( treat.copy( context ) );
-			}
-			target.treats = newTreats;
+			target.treats = copyTreats( context, treats );
+		}
+	}
+
+	private static ArrayList<SqmTreatedFrom<?, ?, @Nullable ?>> copyTreats(
+			SqmCopyContext context, List<SqmTreatedFrom<?, ?, @Nullable ?>> treats) {
+		final ArrayList<SqmTreatedFrom<?, ?, @Nullable ?>> newTreats =
+				new ArrayList<>( treats.size() );
+		for ( SqmTreatedFrom<?,?,@Nullable ?> treat : treats ) {
+			newTreats.add( treat.copy( context ) );
+		}
+		return newTreats;
+	}
+
+	private static <T> ArrayList<SqmJoin<T, ?>> copyJoins(
+			SqmCopyContext context, List<SqmJoin<T, ?>> joins) {
+		final ArrayList<SqmJoin<T, ?>> newJoins =
+				new ArrayList<>( joins.size() );
+		for ( var join : joins ) {
+			newJoins.add( join.copy( context ) );
 		}
+		return newJoins;
 	}
 
 	@Override
@@ -169,7 +179,7 @@ public SqmPath<?> resolvePathPart(
 			SqmCreationState creationState) {
 		// Try to resolve an existing attribute join without ON clause
 		SqmPath<?> resolvedPath = null;
-		for ( SqmJoin<?, ?> sqmJoin : getSqmJoins() ) {
+		for ( var sqmJoin : getSqmJoins() ) {
 			// We can only match singular joins here, as plural path parts are interpreted like sub-queries
 			if ( sqmJoin instanceof SqmSingularJoin<?, ?> attributeJoin
 					&& name.equals( sqmJoin.getReferencedPathSource().getPathName() ) ) {
@@ -202,7 +212,7 @@ public SqmPath<?> resolvePathPart(
 		if ( resolvedPath != null ) {
 			return resolvedPath;
 		}
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
@@ -233,22 +243,21 @@ public void addSqmJoin(SqmJoin<T, ?> join) {
 
 	@Internal
 	public void removeLeftFetchJoins() {
-		final List<SqmJoin<T, ?>> joins = this.joins;
+		final var joins = this.joins;
 		if ( joins != null ) {
 			for ( var join : new ArrayList<>( joins ) ) {
-				if ( join instanceof SqmAttributeJoin<T, ?> attributeJoin ) {
-					if ( attributeJoin.isFetched() ) {
-						if ( join.getSqmJoinType() == SqmJoinType.LEFT ) {
-							joins.remove( join );
-							final var orderedJoins = findRoot().getOrderedJoins();
-							if ( orderedJoins != null ) {
-								orderedJoins.remove( join );
-							}
-						}
-						else {
-							attributeJoin.clearFetched();
+				if ( join instanceof SqmAttributeJoin<T, ?> attributeJoin
+						&& attributeJoin.isFetched() ) {
+					if ( join.getSqmJoinType() == SqmJoinType.LEFT ) {
+						joins.remove( join );
+						final var orderedJoins = findRoot().getOrderedJoins();
+						if ( orderedJoins != null ) {
+							orderedJoins.remove( join );
 						}
 					}
+					else {
+						attributeJoin.clearFetched();
+					}
 				}
 			}
 		}
@@ -266,10 +275,11 @@ public void visitSqmJoins(Consumer<SqmJoin<T, ?>> consumer) {
 		return treats == null ? emptyList() : treats;
 	}
 
-	protected <S extends T, X extends SqmTreatedFrom<O,T,S>> @Nullable X findTreat(ManagedDomainType<S> targetType, @Nullable String alias) {
+	protected <S extends T, X extends SqmTreatedFrom<O,T,S>> @Nullable X findTreat(
+			ManagedDomainType<S> targetType, @Nullable String alias) {
 		if ( treats != null ) {
-			for ( SqmTreatedFrom<?, ?, @Nullable ?> treat : treats ) {
-				if ( treat.getModel() == targetType ) {
+			for ( var treat : treats ) {
+				if ( treat.getTreatTarget() == targetType ) {
 					if ( Objects.equals( treat.getExplicitAlias(), alias ) ) {
 						//noinspection unchecked
 						return (X) treat;
@@ -332,7 +342,7 @@ public <A> SqmSingularJoin<T, A> join(SingularAttribute<? super T, A> attribute)
 
 	@Override
 	public <A> SqmSingularJoin<T, A> join(SingularAttribute<? super T, A> attribute, JoinType jt) {
-		final SqmSingularJoin<T, A> join =
+		final var join =
 				buildSingularJoin( (SqmSingularPersistentAttribute<? super T, A>) attribute,
 						SqmJoinType.from( jt ), false );
 		addSqmJoin( join );
@@ -352,8 +362,8 @@ public <X> SqmEntityJoin<T, X> join(EntityDomainType<X> targetEntityDescriptor)
 	@Override
 	public <X> SqmEntityJoin<T, X> join(EntityDomainType<X> targetEntityDescriptor, SqmJoinType joinType) {
 		//noinspection unchecked
-		final SqmRoot<T> root = (SqmRoot<T>) findRoot();
-		final SqmEntityJoin<T, X> sqmEntityJoin = new SqmEntityJoin<>(
+		final var root = (SqmRoot<T>) findRoot();
+		final var sqmEntityJoin = new SqmEntityJoin<>(
 				targetEntityDescriptor,
 				generateAlias(),
 				joinType,
@@ -370,7 +380,7 @@ public <A> SqmBagJoin<T, A> join(CollectionAttribute<? super T, A> attribute) {
 
 	@Override
 	public <E> SqmBagJoin<T, E> join(CollectionAttribute<? super T, E> attribute, JoinType jt) {
-		final SqmBagJoin<T, E> join = buildBagJoin(
+		final var join = buildBagJoin(
 				(BagPersistentAttribute<? super T, E>) attribute,
 				SqmJoinType.from( jt ),
 				false
@@ -386,7 +396,7 @@ public <E> SqmSetJoin<T, E> join(SetAttribute<? super T, E> attribute) {
 
 	@Override
 	public <E> SqmSetJoin<T, E> join(SetAttribute<? super T, E> attribute, JoinType jt) {
-		final SqmSetJoin<T, E> join = buildSetJoin(
+		final var join = buildSetJoin(
 				(SetPersistentAttribute<? super T, E>) attribute,
 				SqmJoinType.from( jt ),
 				false
@@ -402,7 +412,7 @@ public <E> SqmListJoin<T, E> join(ListAttribute<? super T, E> attribute) {
 
 	@Override
 	public <E> SqmListJoin<T, E> join(ListAttribute<? super T, E> attribute, JoinType jt) {
-		final SqmListJoin<T, E> join = buildListJoin(
+		final var join = buildListJoin(
 				(ListPersistentAttribute<? super T, E>) attribute,
 				SqmJoinType.from( jt ),
 				false
@@ -418,7 +428,7 @@ public <K, V> SqmMapJoin<T, K, V> join(MapAttribute<? super T, K, V> attribute)
 
 	@Override
 	public <K, V> SqmMapJoin<T, K, V> join(MapAttribute<? super T, K, V> attribute, JoinType jt) {
-		final SqmMapJoin<T, K, V> join = buildMapJoin(
+		final var join = buildMapJoin(
 				(MapPersistentAttribute<? super T, K, V>) attribute,
 				SqmJoinType.from( jt ),
 				false
@@ -435,7 +445,7 @@ public <X, Y> SqmAttributeJoin<X, Y> join(String attributeName) {
 	@Override
 	@SuppressWarnings("unchecked")
 	public <X, Y> SqmAttributeJoin<X, Y> join(String attributeName, JoinType jt) {
-		final SqmPathSource<Y> subPathSource = (SqmPathSource<Y>)
+		final var subPathSource = (SqmPathSource<Y>)
 				getReferencedPathSource().getSubPathSource( attributeName );
 		return (SqmAttributeJoin<X, Y>) buildJoin( subPathSource, SqmJoinType.from( jt ), false );
 	}
@@ -448,10 +458,9 @@ public <X, Y> SqmBagJoin<X, Y> joinCollection(String attributeName) {
 	@Override
 	@SuppressWarnings("unchecked")
 	public <X, Y> SqmBagJoin<X, Y> joinCollection(String attributeName, JoinType jt) {
-		final SqmPathSource<?> joinedPathSource = getReferencedPathSource().getSubPathSource( attributeName );
-
+		final var joinedPathSource = getReferencedPathSource().getSubPathSource( attributeName );
 		if ( joinedPathSource instanceof BagPersistentAttribute ) {
-			final SqmBagJoin<T, Y> join = buildBagJoin(
+			final var join = buildBagJoin(
 					(BagPersistentAttribute<T, Y>) joinedPathSource,
 					SqmJoinType.from( jt ),
 					false
@@ -479,10 +488,9 @@ public <X, Y> SqmSetJoin<X, Y> joinSet(String attributeName) {
 	@Override
 	@SuppressWarnings("unchecked")
 	public <X, Y> SqmSetJoin<X, Y> joinSet(String attributeName, JoinType jt) {
-		final SqmPathSource<?> joinedPathSource = getReferencedPathSource().getSubPathSource( attributeName );
-
+		final var joinedPathSource = getReferencedPathSource().getSubPathSource( attributeName );
 		if ( joinedPathSource instanceof SetPersistentAttribute ) {
-			final SqmSetJoin<T, Y> join = buildSetJoin(
+			final var join = buildSetJoin(
 					(SetPersistentAttribute<T, Y>) joinedPathSource,
 					SqmJoinType.from( jt ),
 					false
@@ -510,10 +518,10 @@ public <X, Y> SqmListJoin<X, Y> joinList(String attributeName) {
 	@Override
 	@SuppressWarnings("unchecked")
 	public <X, Y> SqmListJoin<X, Y> joinList(String attributeName, JoinType jt) {
-		final SqmPathSource<?> joinedPathSource = getReferencedPathSource().getSubPathSource( attributeName );
+		final var joinedPathSource = getReferencedPathSource().getSubPathSource( attributeName );
 
 		if ( joinedPathSource instanceof ListPersistentAttribute ) {
-			final SqmListJoin<T, Y> join = buildListJoin(
+			final var join = buildListJoin(
 					(ListPersistentAttribute<T, Y>) joinedPathSource,
 					SqmJoinType.from( jt ),
 					false
@@ -541,10 +549,10 @@ public <X, K, V> SqmMapJoin<X, K, V> joinMap(String attributeName) {
 	@Override
 	@SuppressWarnings("unchecked")
 	public <X, K, V> SqmMapJoin<X, K, V> joinMap(String attributeName, JoinType jt) {
-		final SqmPathSource<?> joinedPathSource = getReferencedPathSource().getSubPathSource( attributeName );
+		final var joinedPathSource = getReferencedPathSource().getSubPathSource( attributeName );
 
 		if ( joinedPathSource instanceof MapPersistentAttribute<?, ?, ?> ) {
-			final SqmMapJoin<T, K, V> join = buildMapJoin(
+			final var join = buildMapJoin(
 					(MapPersistentAttribute<T, K, V>) joinedPathSource,
 					SqmJoinType.from( jt ),
 					false
@@ -582,8 +590,8 @@ public <Y> SqmEntityJoin<T, Y> join(Class<Y> entityJavaType, JoinType joinType)
 	@Override
 	public <Y> SqmEntityJoin<T, Y> join(EntityType<Y> entity, JoinType joinType) {
 		//noinspection unchecked
-		final SqmEntityJoin<T,Y> join =
-				new SqmEntityJoin<>( entity, generateAlias(), joinType, (SqmRoot<T>) findRoot() );
+		final var root = (SqmRoot<T>) findRoot();
+		final var join = new SqmEntityJoin<>( entity, generateAlias(), joinType, root );
 		addSqmJoin( join );
 		return join;
 	}
@@ -616,11 +624,11 @@ public <X> JpaDerivedJoin<X> join(Subquery<X> subquery, SqmJoinType joinType, bo
 	public <X> JpaDerivedJoin<X> join(Subquery<X> subquery, SqmJoinType joinType, boolean lateral, String alias) {
 		validateComplianceFromSubQuery();
 		//noinspection unchecked
-		final JpaDerivedJoin<X> join =
+		final var derivedJoin =
 				new SqmDerivedJoin<>( (SqmSubQuery<X>) subquery, alias, joinType, lateral, (SqmRoot<X>) findRoot() );
 		//noinspection unchecked
-		addSqmJoin( (SqmJoin<T, ?>) join );
-		return join;
+		addSqmJoin( (SqmJoin<T, ?>) derivedJoin );
+		return derivedJoin;
 	}
 
 	@Override
@@ -636,11 +644,11 @@ public <X> SqmJoin<?, X> join(JpaCteCriteria<X> cte, SqmJoinType joinType) {
 	public <X> SqmJoin<?, X> join(JpaCteCriteria<X> cte, SqmJoinType joinType, String alias) {
 		validateComplianceFromSubQuery();
 		//noinspection unchecked
-		final SqmJoin<?, X> join =
+		final var cteJoin =
 				new SqmCteJoin<>( ( SqmCteStatement<X> ) cte, alias, joinType, (SqmRoot<X>) findRoot() );
 		//noinspection unchecked
-		addSqmJoin( (SqmJoin<T, ?>) join );
-		return join;
+		addSqmJoin( (SqmJoin<T, ?>) cteJoin );
+		return cteJoin;
 	}
 
 	@Override
@@ -667,7 +675,7 @@ public <X> JpaFunctionJoin<X> join(JpaSetReturningFunction<X> function) {
 	public <X> JpaFunctionJoin<X> join(JpaSetReturningFunction<X> function, SqmJoinType joinType, boolean lateral) {
 		validateComplianceFromFunction();
 		//noinspection unchecked
-		final SqmFunctionJoin<X> join =
+		final var functionJoin =
 				new SqmFunctionJoin<>(
 						(SqmSetReturningFunction<X>) function,
 						generateAlias(),
@@ -675,8 +683,8 @@ public <X> JpaFunctionJoin<X> join(JpaSetReturningFunction<X> function, SqmJoinT
 						(SqmRoot<Object>) findRoot()
 				);
 		//noinspection unchecked
-		addSqmJoin( (SqmJoin<T, ?>) join );
-		return join;
+		addSqmJoin( (SqmJoin<T, ?>) functionJoin );
+		return functionJoin;
 	}
 
 	@Override
@@ -744,7 +752,7 @@ public <X> JpaCrossJoin<X> crossJoin(Class<X> entityJavaType) {
 
 	@Override
 	public <X> JpaCrossJoin<X> crossJoin(EntityDomainType<X> entity) {
-		final SqmCrossJoin<X> crossJoin =
+		final var crossJoin =
 				new SqmCrossJoin<>( (SqmEntityDomainType<X>) entity, generateAlias(), findRoot() );
 		// noinspection unchecked
 		addSqmJoin( (SqmJoin<T, ?>) crossJoin );
@@ -768,14 +776,13 @@ public <A> SqmSingularJoin<T,A> fetch(SingularAttribute<? super T, A> attribute)
 	@Override
 	public <A> SqmSingularJoin<T, A> fetch(SingularAttribute<? super T, A> attribute, JoinType jt) {
 		final var persistentAttribute = (SqmSingularPersistentAttribute<? super T, A>) attribute;
-		final SqmAttributeJoin<T, A> compatibleFetchJoin =
+		final var compatibleFetchJoin =
 				findCompatibleFetchJoin( this, persistentAttribute, SqmJoinType.from( jt ) );
 		if ( compatibleFetchJoin != null ) {
 			return (SqmSingularJoin<T, A>) compatibleFetchJoin;
 		}
 
-		final SqmSingularJoin<T, A> join =
-				buildSingularJoin( persistentAttribute, SqmJoinType.from( jt ), true );
+		final var join = buildSingularJoin( persistentAttribute, SqmJoinType.from( jt ), true );
 		addSqmJoin( join );
 		return join;
 	}
@@ -816,15 +823,14 @@ private <A> SqmAttributeJoin<T, A> buildJoin(
 			SqmJoinType joinType,
 			boolean fetched) {
 		if ( fetched ) {
-			final SqmAttributeJoin<T, A> compatibleFetchJoin =
+			final var compatibleFetchJoin =
 					findCompatibleFetchJoin( this, joinedPathSource, joinType );
 			if ( compatibleFetchJoin != null ) {
 				return compatibleFetchJoin;
 			}
 		}
 
-		final SqmAttributeJoin<T, A> sqmJoin =
-				buildAttributeJoin( joinedPathSource, joinType, fetched );
+		final var sqmJoin = buildAttributeJoin( joinedPathSource, joinType, fetched );
 		addSqmJoin( sqmJoin );
 		return sqmJoin;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmJoin.java
index f0bc2d5ceb4d..dbee0745575e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmJoin.java
@@ -57,20 +57,18 @@ public void setJoinPredicate(@Nullable SqmPredicate predicate) {
 			LOG.tracef(
 					"Setting join predicate [%s] (was [%s])",
 					predicate,
-					this.onClausePredicate == null ? "<null>" : this.onClausePredicate
+					onClausePredicate == null ? "<null>" : this.onClausePredicate
 			);
 		}
 
-		this.onClausePredicate = predicate;
+		onClausePredicate = predicate;
 	}
 
 	public void applyRestriction(SqmPredicate restriction) {
-		if ( this.onClausePredicate == null ) {
-			this.onClausePredicate = restriction;
-		}
-		else {
-			this.onClausePredicate = combinePredicates( onClausePredicate, restriction );
-		}
+		onClausePredicate =
+				onClausePredicate == null
+						? restriction
+						: combinePredicates( onClausePredicate, restriction );
 	}
 
 	protected void copyTo(AbstractSqmJoin<L, R> target, SqmCopyContext context) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java
index 41963d633b34..d8dab6a5801a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java
@@ -16,7 +16,6 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.AssertionFailure;
 import org.hibernate.metamodel.mapping.CollectionPart;
-import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.metamodel.model.domain.PersistentAttribute;
@@ -38,6 +37,7 @@
 
 import static java.util.Collections.emptyList;
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
+import static org.hibernate.metamodel.mapping.EntityDiscriminatorMapping.DISCRIMINATOR_ROLE_NAME;
 
 /**
  * @author Steve Ebersole
@@ -73,22 +73,27 @@ protected void copyTo(AbstractSqmPath<T> target, SqmCopyContext context) {
 
 	// meant for assertions only
 	private boolean navigablePathsMatch(AbstractSqmPath<T> target) {
-		final SqmPath<?> lhs = getLhsOrRoot();
-		final SqmPath<?> targetLhs = target.getLhsOrRoot();
+		final var lhs = getLhsOrRoot();
+		final var targetLhs = target.getLhsOrRoot();
 		return lhs == null && targetLhs == null
-			|| lhs != null && targetLhs != null
-				&& (lhs.getNavigablePath() == targetLhs.getNavigablePath()
-					|| getRoot( lhs ).getNodeType() instanceof SqmPolymorphicRootDescriptor
-				);
+			|| lhs != null && targetLhs != null && ( samePath( lhs, targetLhs ) || isPolymorphicRoot( lhs ) );
+	}
+
+	private static boolean samePath(SqmPath<?> lhs, SqmPath<?> targetLhs) {
+		return lhs.getNavigablePath() == targetLhs.getNavigablePath();
+	}
+
+	private boolean isPolymorphicRoot(SqmPath<?> lhs) {
+		return getRoot( lhs ).getNodeType() instanceof SqmPolymorphicRootDescriptor;
 	}
 
 	private @Nullable SqmPath<?> getLhsOrRoot() {
-		final SqmPath<?> lhs = getLhs();
+		final var lhs = getLhs();
 		return lhs != null ? lhs : findRoot();
 	}
 
 	private SqmPath<?> getRoot(SqmPath<?> lhs) {
-		final SqmPath<?> parent = lhs.getLhs();
+		final var parent = lhs.getLhs();
 		return parent == null ? lhs : getRoot( parent );
 	}
 
@@ -131,9 +136,9 @@ public void registerReusablePath(SqmPath<?> path) {
 			reusablePaths = new HashMap<>();
 		}
 		final String relativeName = path.getNavigablePath().getLocalName();
-		final SqmPath<?> previous = reusablePaths.put( relativeName, path );
+		final var previous = reusablePaths.put( relativeName, path );
 		if ( previous != null && previous != path ) {
-			throw new IllegalStateException( "Implicit-join path registration unexpectedly overrode previous registration - " + relativeName );
+			throw new IllegalStateException( "Implicit join path registration unexpectedly overrode previous registration - " + relativeName );
 		}
 	}
 
@@ -159,11 +164,12 @@ public SqmPathSource<T> getModel() {
 
 	@Override
 	public SqmPathSource<T> getResolvedModel() {
-		final SqmPathSource<T> pathSource = getReferencedPathSource();
-		final SqmPath<?> lhs = getLhs();
+		final var pathSource = getReferencedPathSource();
+		final var lhs = getLhs();
 		if ( pathSource.isGeneric() && lhs != null
 			&& lhs.getResolvedModel().getPathType() instanceof SqmManagedDomainType<?> lhsType ) {
-			final var concreteAttribute = lhsType.findConcreteGenericAttribute( pathSource.getPathName() );
+			final var concreteAttribute =
+					lhsType.findConcreteGenericAttribute( pathSource.getPathName() );
 			if ( concreteAttribute != null ) {
 				//noinspection unchecked
 				return (SqmPathSource<T>) concreteAttribute;
@@ -189,34 +195,31 @@ public SqmPathSource<T> getResolvedModel() {
 
 	@Override
 	public SqmExpression<Class<? extends T>> type() {
-		final SqmPathSource<T> referencedPathSource = getReferencedPathSource();
-		final SqmPathSource<?> subPathSource =
-				referencedPathSource.findSubPathSource( EntityDiscriminatorMapping.DISCRIMINATOR_ROLE_NAME );
+		final var referencedPathSource = getReferencedPathSource();
+		final var subPathSource =
+				referencedPathSource.findSubPathSource( DISCRIMINATOR_ROLE_NAME );
 		if ( subPathSource == null ) {
-			return new SqmLiteral<>(
-					referencedPathSource.getBindableJavaType(),
+			return new SqmLiteral<>( referencedPathSource.getBindableJavaType(),
 					nodeBuilder().getTypeConfiguration().getBasicTypeForJavaType( Class.class ),
-					nodeBuilder()
-			);
+					nodeBuilder() );
 		}
 		else {
 			@SuppressWarnings("unchecked")
 			final var discriminatorSource = (SqmPathSource<Class<? extends T>>) subPathSource;
-			return resolvePath( EntityDiscriminatorMapping.DISCRIMINATOR_ROLE_NAME, discriminatorSource );
+			return resolvePath( DISCRIMINATOR_ROLE_NAME, discriminatorSource );
 		}
 	}
 
 	@Override
 	public <Y> SqmPath<Y> get(String attributeName) {
 		@SuppressWarnings("unchecked")
-		final SqmPathSource<Y> subNavigable = (SqmPathSource<Y>) getResolvedModel().getSubPathSource( attributeName );
+		final var subNavigable = (SqmPathSource<Y>) getResolvedModel().getSubPathSource( attributeName );
 		return resolvePath( attributeName, subNavigable );
 	}
 
 	@Override
-	public <Y> SqmPath<Y> get(String attributeName, boolean includeSubtypes) {
-		@SuppressWarnings("unchecked")
-		final SqmPathSource<Y> subPathSource = (SqmPathSource<Y>)
+	public SqmPath<?> get(String attributeName, boolean includeSubtypes) {
+		final var subPathSource = (SqmPathSource<?>)
 				getResolvedModel().getSubPathSource( attributeName, includeSubtypes );
 		return resolvePath( attributeName, subPathSource );
 	}
@@ -227,11 +230,12 @@ protected <X> SqmPath<X> resolvePath(PersistentAttribute<?, X> attribute) {
 	}
 
 	protected <X> SqmPath<X> resolvePath(String attributeName, SqmPathSource<X> pathSource) {
-		final SqmPathSource<?> intermediatePathSource =
-				getResolvedModel().getIntermediatePathSource( pathSource );
+		final var intermediatePathSource =
+				getResolvedModel()
+						.getIntermediatePathSource( pathSource );
 		if ( reusablePaths == null ) {
 			reusablePaths = new HashMap<>();
-			final SqmPath<X> path = pathSource.createSqmPath( this, intermediatePathSource );
+			final var path = pathSource.createSqmPath( this, intermediatePathSource );
 			reusablePaths.put( attributeName, path );
 			return path;
 		}
@@ -244,28 +248,29 @@ protected <X> SqmPath<X> resolvePath(String attributeName, SqmPathSource<X> path
 	}
 
 	protected <S extends T> SqmTreatedPath<T, S> getTreatedPath(ManagedDomainType<S> treatTarget) {
-		final NavigablePath treat = getNavigablePath().treatAs( treatTarget.getTypeName() );
-		final SqmPath<?> lhs = castNonNull( getLhs() );
-		final SqmPath<?> reusablePath = lhs.getReusablePath( treat.getLocalName() );
-		//TODO: check this cast
-		@SuppressWarnings("unchecked")
-		final SqmTreatedPath<T, S> path = (SqmTreatedPath<T, S>) reusablePath;
+		final var treat = getNavigablePath().treatAs( treatTarget.getTypeName() );
+		final var lhs = castNonNull( getLhs() );
+		final var path = lhs.getReusablePath( treat.getLocalName() );
 		if ( path == null ) {
-			final SqmTreatedPath<T, S> treatedPath;
-			if ( treatTarget instanceof SqmEntityDomainType<S> entityDomainType ) {
-				treatedPath = new SqmTreatedEntityValuedSimplePath<>( this, entityDomainType, nodeBuilder() );
-			}
-			else if ( treatTarget instanceof SqmEmbeddableDomainType<S> embeddableDomainType ) {
-				treatedPath = new SqmTreatedEmbeddedValuedSimplePath<>( this, embeddableDomainType );
-			}
-			else {
-				throw new AssertionFailure( "Unrecognized treat target type: " + treatTarget.getTypeName() );
-			}
+			final var treatedPath = treat( treatTarget );
 			lhs.registerReusablePath( treatedPath );
 			return treatedPath;
 		}
 		else {
-			return path;
+			//TODO: check this cast
+			return (SqmTreatedPath<T, S>) path;
+		}
+	}
+
+	private <S extends T> SqmTreatedPath<T, S> treat(ManagedDomainType<S> treatTarget) {
+		if ( treatTarget instanceof SqmEntityDomainType<S> entityDomainType ) {
+			return new SqmTreatedEntityValuedSimplePath<>( this, entityDomainType, nodeBuilder() );
+		}
+		else if ( treatTarget instanceof SqmEmbeddableDomainType<S> embeddableDomainType ) {
+			return new SqmTreatedEmbeddedValuedSimplePath<>( this, embeddableDomainType );
+		}
+		else {
+			throw new AssertionFailure( "Unrecognized treat target type: " + treatTarget.getTypeName() );
 		}
 	}
 
@@ -304,10 +309,9 @@ public <S extends T> SqmTreatedPath<T, S> treatAs(EntityDomainType<S> treatTarge
 	 * and if not creates a copy of the navigable path with the correct parent.
 	 */
 	protected NavigablePath getNavigablePathCopy(SqmPath<?> parent) {
-		final NavigablePath realParentPath = getRealParentPath(
-				castNonNull( navigablePath.getRealParent() ),
-				parent.getNavigablePath()
-		);
+		final var realParentPath =
+				getRealParentPath( castNonNull( navigablePath.getRealParent() ),
+						parent.getNavigablePath() );
 		if ( realParentPath != null ) {
 			return realParentPath.append( navigablePath.getLocalName(), navigablePath.getAlias() );
 		}
@@ -315,38 +319,34 @@ protected NavigablePath getNavigablePathCopy(SqmPath<?> parent) {
 	}
 
 	private @Nullable NavigablePath getRealParentPath(NavigablePath realParent, NavigablePath parent) {
-		@Nullable NavigablePath realParentPath;
 		if ( parent == realParent ) {
-			realParentPath = null;
+			return null;
 		}
-		else if ( realParent instanceof EntityIdentifierNavigablePath entityIdentifierNavigablePath ) {
-			realParentPath = getRealParentPath( castNonNull( realParent.getRealParent() ), parent );
-			if ( realParentPath != null ) {
-				realParentPath = new EntityIdentifierNavigablePath(
-						realParentPath,
-						entityIdentifierNavigablePath.getIdentifierAttributeName()
-				);
+		else {
+			final var realParentParent = realParent.getRealParent();
+			if ( realParent instanceof EntityIdentifierNavigablePath entityIdentifierNavigablePath ) {
+				final var realParentPath = getRealParentPath( castNonNull( realParentParent ), parent );
+				return realParentPath != null
+						? new EntityIdentifierNavigablePath( realParentPath,
+								entityIdentifierNavigablePath.getIdentifierAttributeName() )
+						: null;
 			}
-		}
-		else if ( realParent.getAlias() == null && realParent instanceof TreatedNavigablePath ) {
-			// This might be an implicitly treated parent path, check with the non-treated parent
-			realParentPath = getRealParentPath( castNonNull( realParent.getRealParent() ), parent );
-			if ( realParentPath != null ) {
-				realParentPath = realParentPath.treatAs( realParent.getLocalName().substring( 1 ) );
+			else if ( realParent instanceof TreatedNavigablePath && realParent.getAlias() == null ) {
+				// This might be an implicitly treated parent path, check with the non-treated parent
+				final var realParentPath = getRealParentPath( castNonNull( realParentParent ), parent );
+				return realParentPath != null
+						? realParentPath.treatAs( realParent.getLocalName().substring( 1 ) )
+						: null;
 			}
-		}
-		else if ( CollectionPart.Nature.fromNameExact( realParent.getLocalName() ) != null ) {
-			if ( parent == realParent.getRealParent() ) {
-				realParentPath = null;
+			else if ( CollectionPart.Nature.fromNameExact( realParent.getLocalName() ) != null ) {
+				return parent == realParentParent
+						? null
+						: parent.append( realParent.getLocalName() );
 			}
 			else {
-				realParentPath = parent.append( realParent.getLocalName() );
+				return parent;
 			}
 		}
-		else {
-			realParentPath = parent;
-		}
-		return realParentPath;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSimplePath.java
index 5a2508e074d2..14acc0b67729 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmSimplePath.java
@@ -63,7 +63,7 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
 
 	@Override
 	public SqmPathSource<T> getReferencedPathSource() {
-		final SqmPathSource<T> pathSource = super.getReferencedPathSource();
+		final var pathSource = super.getReferencedPathSource();
 		return pathSource instanceof SqmSingularPersistentAttribute<?, T> attribute
 				? attribute.getSqmPathSource()
 				: pathSource;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java
index 0336e139d421..38a4755dec23 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/NonAggregatedCompositeSimplePath.java
@@ -32,13 +32,13 @@ public NonAggregatedCompositeSimplePath(
 
 	@Override
 	public NonAggregatedCompositeSimplePath<T> copy(SqmCopyContext context) {
-		final NonAggregatedCompositeSimplePath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
-		final SqmPath<?> lhsCopy = getLhs().copy( context );
-		final NonAggregatedCompositeSimplePath<T> path = context.registerCopy(
+		final var lhsCopy = getLhs().copy( context );
+		final var path = context.registerCopy(
 				this,
 				new NonAggregatedCompositeSimplePath<>(
 						getNavigablePathCopy( lhsCopy ),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmAnyValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmAnyValuedSimplePath.java
index a9cb529f5843..a9ecb6eb5602 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmAnyValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmAnyValuedSimplePath.java
@@ -42,13 +42,13 @@ public SqmAnyValuedSimplePath(
 
 	@Override
 	public SqmAnyValuedSimplePath<T> copy(SqmCopyContext context) {
-		final SqmAnyValuedSimplePath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
-		final SqmPath<?> lhsCopy = getLhs().copy( context );
-		final SqmAnyValuedSimplePath<T> path = context.registerCopy(
+		final var lhsCopy = getLhs().copy( context );
+		final var path = context.registerCopy(
 				this,
 				new SqmAnyValuedSimplePath<>(
 						getNavigablePathCopy( lhsCopy ),
@@ -97,7 +97,7 @@ public SqmPath<?> resolvePathPart(
 			String name,
 			boolean isTerminal,
 			SqmCreationState creationState) {
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java
index 56f0734df782..0261947e3b76 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBagJoin.java
@@ -51,12 +51,12 @@ protected SqmBagJoin(
 
 	@Override
 	public SqmBagJoin<O, E> copy(SqmCopyContext context) {
-		final SqmBagJoin<O, E> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmFrom<?, O> lhsCopy = getLhs().copy( context );
-		final SqmBagJoin<O, E> path = context.registerCopy(
+		final var lhsCopy = getLhs().copy( context );
+		final var path = context.registerCopy(
 				this,
 				new SqmBagJoin<>(
 						lhsCopy,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
index fd9da0ce5153..63a5e462e3a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
@@ -8,7 +8,6 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
-import org.hibernate.query.hql.spi.SqmPathRegistry;
 import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.query.sqm.UnknownPathException;
@@ -54,13 +53,13 @@ public SqmBasicValuedSimplePath(
 
 	@Override
 	public SqmBasicValuedSimplePath<T> copy(SqmCopyContext context) {
-		final SqmBasicValuedSimplePath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
-		final SqmPath<?> lhsCopy = getLhs().copy( context );
-		final SqmBasicValuedSimplePath<T> path = context.registerCopy(
+		final var lhsCopy = getLhs().copy( context );
+		final var path = context.registerCopy(
 				this,
 				new SqmBasicValuedSimplePath<>(
 						getNavigablePathCopy( lhsCopy ),
@@ -105,7 +104,7 @@ public SqmPath<?> resolveIndexedAccess(
 			SqmExpression<?> selector,
 			boolean isTerminal,
 			SqmCreationState creationState) {
-		final SqmPathRegistry pathRegistry =
+		final var pathRegistry =
 				creationState.getCurrentProcessingState().getPathRegistry();
 		final String alias = selector.toHqlString();
 		final NavigablePath navigablePath =
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedBagJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedBagJoin.java
index db109cab8805..70b1f411f211 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedBagJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedBagJoin.java
@@ -50,11 +50,11 @@ private SqmCorrelatedBagJoin(
 
 	@Override
 	public SqmCorrelatedBagJoin<O, T> copy(SqmCopyContext context) {
-		final SqmCorrelatedBagJoin<O, T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedBagJoin<O, T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedBagJoin<>(
 						getLhs().copy( context ),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCrossJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCrossJoin.java
index f0b3250a89fc..e3865dab2c08 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCrossJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCrossJoin.java
@@ -6,7 +6,6 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.query.hql.spi.SqmCreationProcessingState;
-import org.hibernate.query.hql.spi.SqmPathRegistry;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.query.sqm.tree.from.SqmCrossJoin;
@@ -45,11 +44,11 @@ private SqmCorrelatedCrossJoin(
 
 	@Override
 	public SqmCorrelatedCrossJoin<T> copy(SqmCopyContext context) {
-		final SqmCorrelatedCrossJoin<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedCrossJoin<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedCrossJoin<>(
 						getReferencedPathSource(),
@@ -85,7 +84,7 @@ public SqmRoot<T> getCorrelatedRoot() {
 
 	@Override
 	public SqmCorrelatedCrossJoin<T> makeCopy(SqmCreationProcessingState creationProcessingState) {
-		final SqmPathRegistry pathRegistry = creationProcessingState.getPathRegistry();
+		final var pathRegistry = creationProcessingState.getPathRegistry();
 		return new SqmCorrelatedCrossJoin<>(
 				getReferencedPathSource(),
 				getExplicitAlias(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCteJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCteJoin.java
index fdec8d254534..736874882396 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCteJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedCteJoin.java
@@ -51,11 +51,11 @@ private SqmCorrelatedCteJoin(
 
 	@Override
 	public SqmCorrelatedCteJoin<T> copy(SqmCopyContext context) {
-		final SqmCorrelatedCteJoin<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedCteJoin<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedCteJoin<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedJoin.java
index 31f4f204d265..730d2ba7331f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedJoin.java
@@ -55,11 +55,11 @@ private SqmCorrelatedDerivedJoin(
 
 	@Override
 	public SqmCorrelatedDerivedJoin<T> copy(SqmCopyContext context) {
-		final SqmCorrelatedDerivedJoin<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedDerivedJoin<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedDerivedJoin<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedRoot.java
index 9a1e35a0b96f..d31a92765f97 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedRoot.java
@@ -32,11 +32,11 @@ private SqmCorrelatedDerivedRoot(SqmRoot<T> correlationParent) {
 
 	@Override
 	public SqmCorrelatedDerivedRoot<T> copy(SqmCopyContext context) {
-		final SqmCorrelatedDerivedRoot<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedDerivedRoot<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedDerivedRoot<>( getCorrelationParent().copy( context ) )
 		);
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedRootJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedRootJoin.java
index 3e26123b3b11..a9507348376e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedRootJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedDerivedRootJoin.java
@@ -26,11 +26,11 @@ public SqmCorrelatedDerivedRootJoin(
 
 	@Override
 	public SqmCorrelatedDerivedRootJoin<T> copy(SqmCopyContext context) {
-		final SqmCorrelatedDerivedRootJoin<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedDerivedRootJoin<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedDerivedRootJoin<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedEntityJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedEntityJoin.java
index 3cc0ae64d453..10741af724a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedEntityJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedEntityJoin.java
@@ -7,7 +7,6 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.query.hql.spi.SqmCreationProcessingState;
-import org.hibernate.query.hql.spi.SqmPathRegistry;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.query.sqm.tree.SqmJoinType;
@@ -49,11 +48,11 @@ public SqmCorrelatedEntityJoin(
 
 	@Override
 	public SqmCorrelatedEntityJoin<L,R> copy(SqmCopyContext context) {
-		final SqmCorrelatedEntityJoin<L,R> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedEntityJoin<L,R> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedEntityJoin<>(
 						getReferencedPathSource(),
@@ -105,7 +104,7 @@ public SqmCorrelatedEntityJoin<L,R> createCorrelation() {
 
 	@Override
 	public SqmCorrelatedEntityJoin<L,R> makeCopy(SqmCreationProcessingState creationProcessingState) {
-		final SqmPathRegistry pathRegistry = creationProcessingState.getPathRegistry();
+		final var pathRegistry = creationProcessingState.getPathRegistry();
 		return new SqmCorrelatedEntityJoin<>(
 				getReferencedPathSource(),
 				getExplicitAlias(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedListJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedListJoin.java
index fc9b039bcca7..6b5804e61690 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedListJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedListJoin.java
@@ -50,11 +50,11 @@ private SqmCorrelatedListJoin(
 
 	@Override
 	public SqmCorrelatedListJoin<O, T> copy(SqmCopyContext context) {
-		final SqmCorrelatedListJoin<O, T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedListJoin<O, T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedListJoin<>(
 						getLhs().copy( context ),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedMapJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedMapJoin.java
index 0bb8c3b42bb2..9d07a56777b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedMapJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedMapJoin.java
@@ -50,11 +50,11 @@ private SqmCorrelatedMapJoin(
 
 	@Override
 	public SqmCorrelatedMapJoin<L, K, V> copy(SqmCopyContext context) {
-		final SqmCorrelatedMapJoin<L, K, V> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedMapJoin<L, K, V> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedMapJoin<>(
 						getLhs().copy( context ),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedPluralPartJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedPluralPartJoin.java
index 496c55a9c44d..1d5b2ebeed43 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedPluralPartJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedPluralPartJoin.java
@@ -33,11 +33,11 @@ public SqmCorrelatedPluralPartJoin(SqmPluralPartJoin<O, T> correlationParent) {
 
 	@Override
 	public SqmCorrelatedPluralPartJoin<O, T> copy(SqmCopyContext context) {
-		final SqmCorrelatedPluralPartJoin<O, T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedPluralPartJoin<O, T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedPluralPartJoin<>( correlationParent.copy( context ) )
 		);
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRoot.java
index 0d0824267277..40969d7fd864 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRoot.java
@@ -38,11 +38,11 @@ protected SqmCorrelatedRoot(NavigablePath navigablePath, SqmPathSource<T> refere
 
 	@Override
 	public SqmCorrelatedRoot<T> copy(SqmCopyContext context) {
-		final SqmCorrelatedRoot<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedRoot<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedRoot<>( correlationParent.copy( context ) )
 		);
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRootJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRootJoin.java
index 0a77643f4ee5..314d58fdbf2c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRootJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedRootJoin.java
@@ -28,11 +28,11 @@ public SqmCorrelatedRootJoin(
 
 	@Override
 	public SqmCorrelatedRootJoin<T> copy(SqmCopyContext context) {
-		final SqmCorrelatedRootJoin<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedRootJoin<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedRootJoin<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSetJoin.java
index 21abbcec1ecc..999ca4e304b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSetJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSetJoin.java
@@ -50,11 +50,11 @@ private SqmCorrelatedSetJoin(
 
 	@Override
 	public SqmCorrelatedSetJoin<O, T> copy(SqmCopyContext context) {
-		final SqmCorrelatedSetJoin<O, T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedSetJoin<O, T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedSetJoin<>(
 						getLhs().copy( context ),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularJoin.java
index 3db5f80c14eb..a83133c851d1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCorrelatedSingularJoin.java
@@ -50,11 +50,11 @@ private SqmCorrelatedSingularJoin(
 
 	@Override
 	public SqmCorrelatedSingularJoin<O, T> copy(SqmCopyContext context) {
-		final SqmCorrelatedSingularJoin<O, T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCorrelatedSingularJoin<O, T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCorrelatedSingularJoin<>(
 						getLhs().copy( context ),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCteRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCteRoot.java
index a1d5973902d9..850a56e27aed 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCteRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmCteRoot.java
@@ -54,11 +54,11 @@ protected SqmCteRoot(
 
 	@Override
 	public SqmCteRoot<T> copy(SqmCopyContext context) {
-		final SqmCteRoot<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCteRoot<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCteRoot<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java
index 05ea4470d4be..ba28e6da5df5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java
@@ -55,11 +55,11 @@ protected SqmDerivedRoot(
 
 	@Override
 	public SqmDerivedRoot<T> copy(SqmCopyContext context) {
-		final SqmDerivedRoot<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmDerivedRoot<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmDerivedRoot<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java
index cb46ed519897..c099cd2079c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java
@@ -13,7 +13,6 @@
 import org.hibernate.query.hql.spi.SqmCreationState;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.SqmBindableType;
-import org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder;
 import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.query.sqm.tree.SqmRenderContext;
@@ -38,32 +37,28 @@ public SqmElementAggregateFunction(SqmPluralValuedSimplePath<?> pluralDomainPath
 						.getElementPathSource()
 		);
 		this.functionName = functionName;
-		final SqmCriteriaNodeBuilder nodeBuilder = pluralDomainPath.nodeBuilder();
-		switch ( functionName ) {
-			case "sum":
-				//noinspection unchecked
-				this.returnableType = (ReturnableType<T>) nodeBuilder.getSumReturnTypeResolver()
-						.resolveFunctionReturnType(
-								null,
-								(SqmToSqlAstConverter) null,
-								List.of( pluralDomainPath ),
-								nodeBuilder.getTypeConfiguration()
-						);
-				break;
-			case "avg":
-				//noinspection unchecked
-				this.returnableType = (ReturnableType<T>) nodeBuilder.getAvgReturnTypeResolver()
-						.resolveFunctionReturnType(
-								null,
-								(SqmToSqlAstConverter) null,
-								List.of( pluralDomainPath ),
-								nodeBuilder.getTypeConfiguration()
-						);
-				break;
-			default:
-				this.returnableType = null;
-				break;
-		}
+		final var nodeBuilder = pluralDomainPath.nodeBuilder();
+		final var type = switch ( functionName ) {
+			case "sum" ->
+					nodeBuilder.getSumReturnTypeResolver()
+							.resolveFunctionReturnType(
+									null,
+									(SqmToSqlAstConverter) null,
+									List.of( pluralDomainPath ),
+									nodeBuilder.getTypeConfiguration()
+							);
+			case "avg" ->
+					nodeBuilder.getAvgReturnTypeResolver()
+							.resolveFunctionReturnType(
+									null,
+									(SqmToSqlAstConverter) null,
+									List.of( pluralDomainPath ),
+									nodeBuilder.getTypeConfiguration()
+							);
+			default -> null;
+		};
+		//noinspection unchecked
+		returnableType = (ReturnableType<T>) type;
 	}
 
 	@Override
@@ -87,14 +82,14 @@ public SqmElementAggregateFunction(SqmPluralValuedSimplePath<?> pluralDomainPath
 
 	@Override
 	public SqmElementAggregateFunction<T> copy(SqmCopyContext context) {
-		final SqmElementAggregateFunction<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
-		final SqmElementAggregateFunction<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
-				new SqmElementAggregateFunction<>(
+				new SqmElementAggregateFunction<T>(
 						getPluralDomainPath().copy( context ),
 						functionName
 				)
@@ -112,7 +107,7 @@ public SqmPath<?> resolvePathPart(
 			String name,
 			boolean isTerminal,
 			SqmCreationState creationState) {
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
index c84032b4457f..8e6ca7368536 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
@@ -49,13 +49,13 @@ public SqmEmbeddedValuedSimplePath(
 
 	@Override
 	public SqmEmbeddedValuedSimplePath<T> copy(SqmCopyContext context) {
-		final SqmEmbeddedValuedSimplePath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
 		final SqmPath<?> lhsCopy = getLhs().copy( context );
-		final SqmEmbeddedValuedSimplePath<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmEmbeddedValuedSimplePath<>(
 						getNavigablePathCopy( lhsCopy ),
@@ -86,7 +86,7 @@ public PersistenceType getPersistenceType() {
 
 	@Override
 	public SqmPath<?> resolvePathPart(String name, boolean isTerminal, SqmCreationState creationState) {
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java
index a3ba68ecf625..f2adc59d68a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEntityValuedSimplePath.java
@@ -28,13 +28,13 @@ public SqmEntityValuedSimplePath(
 
 	@Override
 	public SqmEntityValuedSimplePath<T> copy(SqmCopyContext context) {
-		final SqmEntityValuedSimplePath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
 		final SqmPath<?> lhsCopy = getLhs().copy( context );
-		final SqmEntityValuedSimplePath<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmEntityValuedSimplePath<>(
 						getNavigablePathCopy( lhsCopy ),
@@ -52,7 +52,7 @@ public SqmPath<?> resolvePathPart(
 			String name,
 			boolean isTerminal,
 			SqmCreationState creationState) {
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFkExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFkExpression.java
index 73f18ff4d2bd..3d3085f48431 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFkExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFkExpression.java
@@ -6,7 +6,6 @@
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
-import org.hibernate.metamodel.model.domain.DomainType;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.metamodel.model.domain.IdentifiableDomainType;
 import org.hibernate.query.hql.spi.SqmCreationState;
@@ -37,19 +36,22 @@ private SqmFkExpression(
 			SqmPath<?> toOnePath) {
 		super(
 				navigablePath,
-				(SqmPathSource<T>) castNonNull( pathDomainType( toOnePath ).getIdentifierDescriptor() ),
+				(SqmPathSource<T>)
+						castNonNull( pathDomainType( toOnePath )
+								.getIdentifierDescriptor() ),
 				toOnePath,
 				toOnePath.nodeBuilder()
 		);
 	}
 
 	private static IdentifiableDomainType<?> pathDomainType(SqmPath<?> toOnePath) {
-		final DomainType<?> domainType = toOnePath.getReferencedPathSource().getPathType();
-		if ( domainType instanceof IdentifiableDomainType<?> identifiableDomainType ) {
+		if ( toOnePath.getReferencedPathSource().getPathType()
+				instanceof IdentifiableDomainType<?> identifiableDomainType ) {
 			return identifiableDomainType;
 		}
 		else {
-			throw new IllegalArgumentException( "Invalid path provided to 'fk()' function: " + toOnePath.getNavigablePath() );
+			throw new IllegalArgumentException( "Invalid path provided to 'fk()' function: "
+												+ toOnePath.getNavigablePath() );
 		}
 	}
 
@@ -72,11 +74,11 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
 
 	@Override
 	public SqmFkExpression<T> copy(SqmCopyContext context) {
-		final SqmFkExpression<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmEntityValuedSimplePath<?> lhsCopy = (SqmEntityValuedSimplePath<?>) getLhs().copy( context );
+		final var lhsCopy = (SqmEntityValuedSimplePath<?>) getLhs().copy( context );
 		return context.registerCopy(
 				this,
 				new SqmFkExpression<>( getNavigablePathCopy( lhsCopy ), lhsCopy )
@@ -95,7 +97,7 @@ public <S extends T> SqmTreatedPath<T,S> treatAs(EntityDomainType<S> treatTarget
 
 	@Override
 	public SqmPath<?> resolvePathPart(String name, boolean isTerminal, SqmCreationState creationState) {
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionPath.java
index 3ed186cdae57..5f5035dc36b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionPath.java
@@ -10,8 +10,6 @@
 import org.hibernate.metamodel.model.domain.internal.BasicSqmPathSource;
 import org.hibernate.metamodel.model.domain.internal.EmbeddedSqmPathSource;
 import org.hibernate.query.hql.spi.SqmCreationState;
-import org.hibernate.query.hql.spi.SqmPathRegistry;
-import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.query.sqm.SqmPathSource;
@@ -21,13 +19,10 @@
 import org.hibernate.query.sqm.tree.SqmRenderContext;
 import org.hibernate.query.sqm.tree.expression.SqmExpression;
 import org.hibernate.query.sqm.tree.expression.SqmFunction;
-import org.hibernate.query.sqm.tree.from.SqmFrom;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.type.BasicPluralType;
-import org.hibernate.type.BasicType;
 
 import jakarta.persistence.metamodel.Bindable;
-import jakarta.persistence.metamodel.ManagedType;
 import jakarta.persistence.metamodel.Type;
 
 
@@ -52,17 +47,18 @@ private SqmFunctionPath(NavigablePath navigablePath, SqmFunction<?> function) {
 
 	private static <X> SqmPathSource<X> determinePathSource(NavigablePath navigablePath, SqmFunction<?> function) {
 		//noinspection unchecked
-		final SqmBindableType<X> nodeType = (SqmBindableType<X>) function.getNodeType();
+		final var nodeType = (SqmBindableType<X>) function.getNodeType();
 		if ( nodeType == null ) {
 			throw new IllegalArgumentException( "Null return type for function: " + function.getFunctionName() );
 		}
-		final Class<X> bindableJavaType = nodeType.getJavaType();
-		final ManagedType<X> managedType = function.nodeBuilder()
-				.getJpaMetamodel()
-				.findManagedType( bindableJavaType );
+		final var bindableJavaType = nodeType.getJavaType();
+		final var managedType =
+				function.nodeBuilder().getJpaMetamodel()
+						.findManagedType( bindableJavaType );
 		if ( managedType == null ) {
-			final BasicType<X> basicType = function.nodeBuilder().getTypeConfiguration()
-					.getBasicTypeForJavaType( bindableJavaType );
+			final var basicType =
+					function.nodeBuilder().getTypeConfiguration()
+							.getBasicTypeForJavaType( bindableJavaType );
 			if ( basicType == null ) {
 				throw new IllegalArgumentException( "Couldn't determine basic type for java type: " + bindableJavaType.getName() );
 			}
@@ -95,14 +91,15 @@ public SqmFunction<?> getFunction() {
 
 	@Override
 	public SqmFunctionPath<T> copy(SqmCopyContext context) {
-		final SqmFunctionPath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
-		final SqmFunctionPath<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
-				new SqmFunctionPath<>( getNavigablePath(), (SqmFunction<?>) function.copy( context ) )
+				new SqmFunctionPath<T>( getNavigablePath(),
+						(SqmFunction<?>) function.copy( context ) )
 		);
 		copyTo( path, context );
 		return path;
@@ -113,7 +110,7 @@ public SqmPath<?> resolvePathPart(
 			String name,
 			boolean isTerminal,
 			SqmCreationState creationState) {
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
@@ -123,20 +120,18 @@ public SqmPath<?> resolveIndexedAccess(
 			SqmExpression<?> selector,
 			boolean isTerminal,
 			SqmCreationState creationState) {
-		final SqmPathRegistry pathRegistry = creationState.getCurrentProcessingState().getPathRegistry();
-		final String alias = selector.toHqlString();
-		final NavigablePath navigablePath = getNavigablePath().append(
-				CollectionPart.Nature.ELEMENT.getName(),
-				alias
-		);
-		final SqmFrom<?, ?> indexedPath = pathRegistry.findFromByPath( navigablePath );
+		final var pathRegistry = creationState.getCurrentProcessingState().getPathRegistry();
+		final var navigablePath =
+				getNavigablePath().append( CollectionPart.Nature.ELEMENT.getName(),
+						selector.toHqlString() );
+		final var indexedPath = pathRegistry.findFromByPath( navigablePath );
 		if ( indexedPath != null ) {
 			return indexedPath;
 		}
 		if ( !( getReferencedPathSource().getPathType() instanceof BasicPluralType<?, ?> ) ) {
 			throw new UnsupportedOperationException( "Index access is only supported for basic plural types." );
 		}
-		final QueryEngine queryEngine = creationState.getCreationContext().getQueryEngine();
+		final var queryEngine = creationState.getCreationContext().getQueryEngine();
 		final SelfRenderingSqmFunction<?> result = queryEngine.getSqmFunctionRegistry()
 				.getFunctionDescriptor( "array_get" )
 				.generateSqmExpression(
@@ -144,7 +139,7 @@ public SqmPath<?> resolveIndexedAccess(
 						null,
 						queryEngine
 				);
-		final SqmFunctionPath<Object> path = new SqmFunctionPath<>( result );
+		final SqmFunctionPath<?> path = new SqmFunctionPath<>( result );
 		pathRegistry.register( path );
 		return path;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionRoot.java
index a0464f45fdde..32535c433619 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmFunctionRoot.java
@@ -53,11 +53,11 @@ protected SqmFunctionRoot(
 
 	@Override
 	public SqmFunctionRoot<E> copy(SqmCopyContext context) {
-		final SqmFunctionRoot<E> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmFunctionRoot<E> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmFunctionRoot<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java
index 268f7aa2e580..6baa4c16208b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java
@@ -14,7 +14,6 @@
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.query.sqm.SqmPathSource;
-import org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder;
 import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.query.sqm.tree.SqmRenderContext;
@@ -42,32 +41,28 @@ public SqmIndexAggregateFunction(SqmPluralValuedSimplePath<?> pluralDomainPath,
 								.getIndexPathSource()
 		);
 		this.functionName = functionName;
-		final SqmCriteriaNodeBuilder nodeBuilder = pluralDomainPath.nodeBuilder();
-		switch ( functionName ) {
-			case "sum":
-				//noinspection unchecked
-				this.returnableType = (ReturnableType<T>) nodeBuilder.getSumReturnTypeResolver()
-						.resolveFunctionReturnType(
-								null,
-								(SqmToSqlAstConverter) null,
-								List.of( pluralDomainPath.get( CollectionPart.Nature.INDEX.getName() ) ),
-								nodeBuilder.getTypeConfiguration()
-						);
-				break;
-			case "avg":
-				//noinspection unchecked
-				this.returnableType = (ReturnableType<T>) nodeBuilder.getAvgReturnTypeResolver()
-						.resolveFunctionReturnType(
-								null,
-								(SqmToSqlAstConverter) null,
-								List.of( pluralDomainPath.get( CollectionPart.Nature.INDEX.getName() ) ),
-								nodeBuilder.getTypeConfiguration()
-						);
-				break;
-			default:
-				this.returnableType = null;
-				break;
-		}
+		final var nodeBuilder = pluralDomainPath.nodeBuilder();
+		final var type = switch ( functionName ) {
+			case "sum" ->
+					nodeBuilder.getSumReturnTypeResolver()
+							.resolveFunctionReturnType(
+									null,
+									(SqmToSqlAstConverter) null,
+									List.of( pluralDomainPath.get( CollectionPart.Nature.INDEX.getName() ) ),
+									nodeBuilder.getTypeConfiguration()
+							);
+			case "avg" ->
+					nodeBuilder.getAvgReturnTypeResolver()
+							.resolveFunctionReturnType(
+									null,
+									(SqmToSqlAstConverter) null,
+									List.of( pluralDomainPath.get( CollectionPart.Nature.INDEX.getName() ) ),
+									nodeBuilder.getTypeConfiguration()
+							);
+			default -> null;
+		};
+		//noinspection unchecked
+		returnableType = (ReturnableType<T>) type;
 	}
 
 	@Override
@@ -91,14 +86,14 @@ public SqmIndexAggregateFunction(SqmPluralValuedSimplePath<?> pluralDomainPath,
 
 	@Override
 	public SqmIndexAggregateFunction<T> copy(SqmCopyContext context) {
-		final SqmIndexAggregateFunction<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
-		final SqmIndexAggregateFunction<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
-				new SqmIndexAggregateFunction<>(
+				new SqmIndexAggregateFunction<T>(
 						getPluralDomainPath().copy( context ),
 						functionName
 				)
@@ -116,7 +111,7 @@ public SqmPath<?> resolvePathPart(
 			String name,
 			boolean isTerminal,
 			SqmCreationState creationState) {
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexedCollectionAccessPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexedCollectionAccessPath.java
index b0191e880af8..8519d243c25d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexedCollectionAccessPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexedCollectionAccessPath.java
@@ -46,13 +46,13 @@ public SqmIndexedCollectionAccessPath(
 
 	@Override
 	public SqmIndexedCollectionAccessPath<T> copy(SqmCopyContext context) {
-		final SqmIndexedCollectionAccessPath<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
 		final SqmAttributeJoin<?, ?> lhsCopy = getLhs().copy( context );
-		final SqmIndexedCollectionAccessPath<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmIndexedCollectionAccessPath<T>(
 						getNavigablePathCopy( lhsCopy ),
@@ -78,7 +78,7 @@ public SqmPath<?> resolvePathPart(
 			String name,
 			boolean isTerminal,
 			SqmCreationState creationState) {
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java
index 8ec14102919a..0268f27bc865 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmListJoin.java
@@ -55,12 +55,12 @@ protected SqmListJoin(
 
 	@Override
 	public SqmListJoin<O, E> copy(SqmCopyContext context) {
-		final SqmListJoin<O, E> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 		final SqmFrom<?, O> lhsCopy = getLhs().copy( context );
-		final SqmListJoin<O, E> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmListJoin<>(
 						lhsCopy,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java
index b246031821ea..99ec573cc3fe 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java
@@ -56,7 +56,7 @@ public SqmMapEntryReference(
 
 	@Override
 	public SqmMapEntryReference<K, V> copy(SqmCopyContext context) {
-		final SqmMapEntryReference<K, V> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java
index 5491d2b8ba70..434f752961f1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapJoin.java
@@ -55,12 +55,12 @@ protected SqmMapJoin(
 
 	@Override
 	public SqmMapJoin<L, K, V> copy(SqmCopyContext context) {
-		final SqmMapJoin<L, K, V> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 		final SqmFrom<?, L> lhsCopy = getLhs().copy( context );
-		final SqmMapJoin<L, K, V> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmMapJoin<>(
 						lhsCopy,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java
index 40563779e159..7ea720558d49 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPath.java
@@ -164,7 +164,7 @@ default SqmPath<?> resolveIndexedAccess(
 	 *
 	 * @see SqmPathSource#findSubPathSource(String, boolean)
 	 */
-	default <Y> SqmPath<Y> get(String attributeName, boolean includeSubtypes) {
+	default SqmPath<?> get(String attributeName, boolean includeSubtypes) {
 		return get( attributeName );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java
index 2e6d88eae773..029d9ae48a5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralPartJoin.java
@@ -67,12 +67,12 @@ public boolean isImplicitlySelectable() {
 
 	@Override
 	public SqmPluralPartJoin<O, T> copy(SqmCopyContext context) {
-		final SqmPluralPartJoin<O, T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 		final SqmFrom<?, O> lhsCopy = getLhs().copy( context );
-		final SqmPluralPartJoin<O, T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmPluralPartJoin<>(
 						lhsCopy,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralValuedSimplePath.java
index 50bdcdffd36b..4aec559e33dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPluralValuedSimplePath.java
@@ -14,7 +14,6 @@
 import org.hibernate.query.NotIndexedCollectionException;
 import org.hibernate.query.PathException;
 import org.hibernate.query.hql.spi.SqmCreationState;
-import org.hibernate.query.hql.spi.SqmPathRegistry;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.SqmPathSource;
@@ -58,13 +57,13 @@ public SqmPluralValuedSimplePath(
 
 	@Override
 	public SqmPluralValuedSimplePath<C> copy(SqmCopyContext context) {
-		final SqmPluralValuedSimplePath<C> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
 		final SqmPath<?> lhsCopy = getLhs().copy( context );
-		final SqmPluralValuedSimplePath<C> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmPluralValuedSimplePath<>(
 						getNavigablePathCopy( lhsCopy ),
@@ -104,7 +103,7 @@ public SqmPath<?> resolvePathPart(
 					+ "' refers to a collection and so element attribute '" + name
 					+ "' may not be referenced directly (use element() function)" );
 		}
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
@@ -114,7 +113,7 @@ public SqmPath<?> resolveIndexedAccess(
 			SqmExpression<?> selector,
 			boolean isTerminal,
 			SqmCreationState creationState) {
-		final SqmPathRegistry pathRegistry = creationState.getCurrentProcessingState().getPathRegistry();
+		final var pathRegistry = creationState.getCurrentProcessingState().getPathRegistry();
 		final String alias = selector.toHqlString();
 		final NavigablePath navigablePath =
 				getParentNavigablePath()
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java
index df28f49f1af1..81007629b943 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSetJoin.java
@@ -53,12 +53,12 @@ protected SqmSetJoin(
 
 	@Override
 	public SqmSetJoin<O, E> copy(SqmCopyContext context) {
-		final SqmSetJoin<O, E> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 		final SqmFrom<?, O> lhsCopy = getLhs().copy( context );
-		final SqmSetJoin<O, E> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmSetJoin<>(
 						lhsCopy,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java
index a5300366ad8e..4de5cf5b8830 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmSingularJoin.java
@@ -12,7 +12,6 @@
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.SqmBindableType;
-import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
@@ -25,8 +24,6 @@
  */
 public class SqmSingularJoin<O,T> extends AbstractSqmAttributeJoin<O,T> implements SqmSingularValuedJoin<O,T> {
 
-	private final SqmSingularPersistentAttribute<? super O, T> attribute;
-
 	public SqmSingularJoin(
 			SqmFrom<?,O> lhs,
 			SqmSingularPersistentAttribute<? super O, T> joinedNavigable,
@@ -43,7 +40,6 @@ public SqmSingularJoin(
 				fetched,
 				nodeBuilder
 		);
-		attribute = joinedNavigable;
 	}
 
 	@Override
@@ -60,17 +56,16 @@ protected SqmSingularJoin(
 			boolean fetched,
 			NodeBuilder nodeBuilder) {
 		super( lhs, navigablePath, joinedNavigable, alias, joinType, fetched, nodeBuilder );
-		attribute = joinedNavigable;
 	}
 
 	@Override
 	public SqmSingularJoin<O, T> copy(SqmCopyContext context) {
-		final SqmSingularJoin<O, T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 		final SqmFrom<?, O> lhsCopy = getLhs().copy( context );
-		final SqmSingularJoin<O, T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmSingularJoin<>(
 						lhsCopy,
@@ -91,14 +86,9 @@ public SqmSingularJoin<O, T> copy(SqmCopyContext context) {
 		return getReferencedPathSource().getExpressible();
 	}
 
-	@Override
-	public SqmPathSource<T> getReferencedPathSource() {
-		return getModel().getSqmPathSource();
-	}
-
 	@Override
 	public SqmSingularPersistentAttribute<? super O, T> getModel() {
-		return attribute;
+		return (SqmSingularPersistentAttribute<? super O, T>) super.getModel();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedBagJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedBagJoin.java
index e91085a45730..76b1beb2a64f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedBagJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedBagJoin.java
@@ -78,11 +78,11 @@ private SqmTreatedBagJoin(
 
 	@Override
 	public SqmTreatedBagJoin<L, R, S> copy(SqmCopyContext context) {
-		final SqmTreatedBagJoin<L, R, S> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmTreatedBagJoin<L, R, S> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmTreatedBagJoin<>(
 						getNavigablePath(),
@@ -111,6 +111,11 @@ public TreatableDomainType<S> getTreatTarget() {
 		return treatTarget;
 	}
 
+	@Override
+	public SqmBagPersistentAttribute<L, S> getModel() {
+		return (SqmBagPersistentAttribute<L, S>) super.getReferencedPathSource();
+	}
+
 	@Override
 	public SqmTreatableDomainType<S> getReferencedPathSource() {
 		return treatTarget;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEmbeddedValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEmbeddedValuedSimplePath.java
index a69680b47fae..224fce35d086 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEmbeddedValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEmbeddedValuedSimplePath.java
@@ -55,11 +55,11 @@ private SqmTreatedEmbeddedValuedSimplePath(
 
 	@Override
 	public SqmTreatedEmbeddedValuedSimplePath<T, S> copy(SqmCopyContext context) {
-		final SqmTreatedEmbeddedValuedSimplePath<T, S> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmTreatedEmbeddedValuedSimplePath<T, S> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmTreatedEmbeddedValuedSimplePath<>(
 						getNavigablePath(),
@@ -104,7 +104,7 @@ public <X> X accept(SemanticQueryWalker<X> walker) {
 
 	@Override
 	public SqmPath<?> resolvePathPart(String name, boolean isTerminal, SqmCreationState creationState) {
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityJoin.java
index 202786f6d1ba..d2b5413df139 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityJoin.java
@@ -60,11 +60,11 @@ private SqmTreatedEntityJoin(
 
 	@Override
 	public SqmTreatedEntityJoin<L,R,S> copy(SqmCopyContext context) {
-		final SqmTreatedEntityJoin<L,R,S> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmTreatedEntityJoin<L,R,S> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmTreatedEntityJoin<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityValuedSimplePath.java
index 7081f2d5cef7..398ae2c8cf3c 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityValuedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedEntityValuedSimplePath.java
@@ -77,12 +77,12 @@ private SqmTreatedEntityValuedSimplePath(
 
 	@Override
 	public SqmTreatedEntityValuedSimplePath<T, S> copy(SqmCopyContext context) {
-		final SqmTreatedEntityValuedSimplePath<T, S> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
-		final SqmTreatedEntityValuedSimplePath<T, S> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmTreatedEntityValuedSimplePath<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedListJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedListJoin.java
index eea6d196161f..0fac5060badd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedListJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedListJoin.java
@@ -78,11 +78,11 @@ private SqmTreatedListJoin(
 
 	@Override
 	public SqmTreatedListJoin<O, T, S> copy(SqmCopyContext context) {
-		final SqmTreatedListJoin<O, T, S> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmTreatedListJoin<O, T, S> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmTreatedListJoin<>(
 						getNavigablePath(),
@@ -111,6 +111,11 @@ public TreatableDomainType<S> getTreatTarget() {
 		return treatTarget;
 	}
 
+	@Override
+	public SqmListPersistentAttribute<O, S> getModel() {
+		return (SqmListPersistentAttribute<O, S>) super.getReferencedPathSource();
+	}
+
 	@Override
 	public SqmTreatableDomainType<S> getReferencedPathSource() {
 		return treatTarget;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedMapJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedMapJoin.java
index 631a27f08278..9d9d0b4dc003 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedMapJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedMapJoin.java
@@ -77,11 +77,11 @@ private SqmTreatedMapJoin(
 
 	@Override
 	public SqmTreatedMapJoin<L, K, V, S> copy(SqmCopyContext context) {
-		final SqmTreatedMapJoin<L, K, V, S> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmTreatedMapJoin<L, K, V, S> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmTreatedMapJoin<>(
 						getNavigablePath(),
@@ -110,6 +110,11 @@ public TreatableDomainType<S> getTreatTarget() {
 		return treatTarget;
 	}
 
+	@Override
+	public SqmMapPersistentAttribute<L, K, S> getModel() {
+		return (SqmMapPersistentAttribute<L, K, S>) super.getReferencedPathSource();
+	}
+
 	@Override
 	public SqmTreatableDomainType<S> getReferencedPathSource() {
 		return treatTarget;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPluralPartJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPluralPartJoin.java
index 3d53621d86a3..29b3a19b7e90 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPluralPartJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedPluralPartJoin.java
@@ -18,12 +18,12 @@
  */
 @SuppressWarnings("rawtypes")
 public class SqmTreatedPluralPartJoin extends SqmPluralPartJoin implements SqmTreatedJoin {
-	private final SqmPluralPartJoin wrappedPath;
-	private final SqmEntityDomainType treatTarget;
+	private final SqmPluralPartJoin<?,?> wrappedPath;
+	private final SqmEntityDomainType<?> treatTarget;
 
 	public SqmTreatedPluralPartJoin(
-			SqmPluralPartJoin wrappedPath,
-			SqmEntityDomainType treatTarget,
+			SqmPluralPartJoin<?,?> wrappedPath,
+			SqmEntityDomainType<?> treatTarget,
 			@Nullable String alias) {
 		//noinspection unchecked
 		super(
@@ -41,8 +41,8 @@ public SqmTreatedPluralPartJoin(
 
 	private SqmTreatedPluralPartJoin(
 			NavigablePath navigablePath,
-			SqmPluralPartJoin wrappedPath,
-			SqmEntityDomainType treatTarget,
+			SqmPluralPartJoin<?,?> wrappedPath,
+			SqmEntityDomainType<?> treatTarget,
 			@Nullable String alias) {
 		//noinspection unchecked
 		super(
@@ -59,11 +59,11 @@ private SqmTreatedPluralPartJoin(
 
 	@Override
 	public SqmTreatedPluralPartJoin copy(SqmCopyContext context) {
-		final SqmTreatedPluralPartJoin existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmTreatedPluralPartJoin path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmTreatedPluralPartJoin(
 						getNavigablePath(),
@@ -77,22 +77,22 @@ public SqmTreatedPluralPartJoin copy(SqmCopyContext context) {
 	}
 
 	@Override
-	public SqmPluralPartJoin getWrappedPath() {
+	public SqmPluralPartJoin<?,?> getWrappedPath() {
 		return wrappedPath;
 	}
 
 	@Override
-	public EntityDomainType getTreatTarget() {
+	public EntityDomainType<?> getTreatTarget() {
 		return treatTarget;
 	}
 
 	@Override
-	public @NonNull SqmBindableType getNodeType() {
+	public @NonNull SqmBindableType<?> getNodeType() {
 		return treatTarget;
 	}
 
 	@Override
-	public SqmPathSource getReferencedPathSource() {
+	public SqmPathSource<?> getReferencedPathSource() {
 		return treatTarget;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedRoot.java
index 1279851a7657..bee6babd11b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedRoot.java
@@ -116,7 +116,7 @@ public SqmPath<?> resolvePathPart(
 			String name,
 			boolean isTerminal,
 			SqmCreationState creationState) {
-		final SqmPath<?> sqmPath = get( name, true );
+		final var sqmPath = get( name, true );
 		creationState.getProcessingStateStack().getCurrent().getPathRegistry().register( sqmPath );
 		return sqmPath;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSetJoin.java
index 05c249fed839..e877c15af7ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSetJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSetJoin.java
@@ -78,11 +78,11 @@ private SqmTreatedSetJoin(
 
 	@Override
 	public SqmTreatedSetJoin<O, T, S> copy(SqmCopyContext context) {
-		final SqmTreatedSetJoin<O, T, S> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmTreatedSetJoin<O, T, S> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmTreatedSetJoin<>(
 						getNavigablePath(),
@@ -111,6 +111,11 @@ public TreatableDomainType<S> getTreatTarget() {
 		return treatTarget;
 	}
 
+	@Override
+	public SqmSetPersistentAttribute<O, S> getModel() {
+		return (SqmSetPersistentAttribute<O, S>) super.getReferencedPathSource();
+	}
+
 	@Override
 	public SqmTreatableDomainType<S> getReferencedPathSource() {
 		return treatTarget;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSimplePath.java
index 63193e925e8d..505373053ddd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSimplePath.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSimplePath.java
@@ -78,12 +78,12 @@ private SqmTreatedSimplePath(
 
 	@Override
 	public SqmTreatedSimplePath<T, S> copy(SqmCopyContext context) {
-		final SqmTreatedSimplePath<T, S> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 
-		final SqmTreatedSimplePath<T, S> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmTreatedSimplePath<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSingularJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSingularJoin.java
index df52fec73f8c..d18c923c2caf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSingularJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmTreatedSingularJoin.java
@@ -80,11 +80,11 @@ private SqmTreatedSingularJoin(
 
 	@Override
 	public SqmTreatedSingularJoin<O, T, S> copy(SqmCopyContext context) {
-		final SqmTreatedSingularJoin<O, T, S> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmTreatedSingularJoin<O, T, S> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmTreatedSingularJoin<>(
 						getNavigablePath(),
@@ -113,6 +113,11 @@ public TreatableDomainType<S> getTreatTarget() {
 		return treatTarget;
 	}
 
+	@Override
+	public SqmSingularPersistentAttribute<? super O, S> getModel() {
+		return (SqmSingularPersistentAttribute<? super O, S>) super.getReferencedPathSource();
+	}
+
 	@Override
 	public SqmPathSource<S> getReferencedPathSource() {
 		return treatTarget;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmParameter.java
index 01723cd62a3a..e81e381b1124 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmParameter.java
@@ -4,7 +4,10 @@
  */
 package org.hibernate.query.sqm.tree.expression;
 
+import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.model.domain.PluralPersistentAttribute;
+import org.hibernate.query.sqm.SqmPathSource;
+import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType;
 import org.hibernate.type.BindableType;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.SqmBindableType;
@@ -31,9 +34,14 @@ public AbstractSqmParameter(
 	@Override
 	public void applyInferableType(@Nullable SqmBindableType<?> type) {
 		if ( type != null ) {
+			final SqmPathSource<?> pathSource;
 			if ( type instanceof PluralPersistentAttribute<?, ?, ?> pluralPersistentAttribute ) {
 				internalApplyInferableType( (SqmBindableType<?>) pluralPersistentAttribute.getElementType() );
 			}
+			else if ( type instanceof AnonymousTupleType<?> tupleType
+				&& (pathSource = tupleType.findSubPathSource( CollectionPart.Nature.ELEMENT.getName() ) ) != null ) {
+				internalApplyInferableType( pathSource.getExpressible() );
+			}
 			else {
 				internalApplyInferableType( type );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NumericTypeCategory.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NumericTypeCategory.java
index 0e1d8129a299..e3b11651bae4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NumericTypeCategory.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NumericTypeCategory.java
@@ -6,7 +6,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Locale;
 
 /**
  * @author Steve Ebersole
@@ -20,41 +19,25 @@ public enum NumericTypeCategory {
 	BIG_DECIMAL;
 
 	public <N extends Number> N parseLiteralValue(String value) {
-		switch ( this ) {
-			case INTEGER: {
+		return switch ( this ) {
+			case INTEGER ->
 				//noinspection unchecked
-				return (N) Integer.valueOf( value );
-			}
-			case LONG: {
+					(N) Integer.valueOf( value );
+			case LONG ->
 				//noinspection unchecked
-				return (N) Long.valueOf( value );
-			}
-			case BIG_INTEGER: {
+					(N) Long.valueOf( value );
+			case BIG_INTEGER ->
 				//noinspection unchecked
-				return (N) new BigInteger( value );
-			}
-			case DOUBLE: {
+					(N) new BigInteger( value );
+			case DOUBLE ->
 				//noinspection unchecked
-				return (N) Double.valueOf( value );
-			}
-			case FLOAT: {
+					(N) Double.valueOf( value );
+			case FLOAT ->
 				//noinspection unchecked
-				return (N) Float.valueOf( value );
-			}
-			case BIG_DECIMAL: {
+					(N) Float.valueOf( value );
+			case BIG_DECIMAL ->
 				//noinspection unchecked
-				return (N) new BigDecimal( value );
-			}
-			default: {
-				throw new IllegalStateException(
-						String.format(
-								Locale.ROOT,
-								"Unable to parse numeric literal value `%s` - %s",
-								value,
-								name()
-						)
-				);
-			}
-		}
+					(N) new BigDecimal( value );
+		};
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAny.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAny.java
index e1270c827e78..8a0b7ac7d523 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAny.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAny.java
@@ -38,7 +38,7 @@ public SqmAny(SqmSubQuery<T> subquery, NodeBuilder criteriaBuilder) {
 
 	@Override
 	public SqmAny<T> copy(SqmCopyContext context) {
-		final SqmAny<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAnyDiscriminatorValue.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAnyDiscriminatorValue.java
index b9675b66f913..ef8b45ffb9cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAnyDiscriminatorValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmAnyDiscriminatorValue.java
@@ -43,7 +43,7 @@ public BasicType<T> getDomainType(){
 
 	@Override
 	public SqmAnyDiscriminatorValue<T> copy(SqmCopyContext context) {
-		final SqmAnyDiscriminatorValue<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java
index 5e77fd159523..c98fca2883fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java
@@ -73,7 +73,7 @@ public SqmBinaryArithmetic(
 
 	@Override
 	public SqmBinaryArithmetic<T> copy(SqmCopyContext context) {
-		final SqmBinaryArithmetic<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java
index 20461b1fb63e..1044d8447914 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSearched.java
@@ -49,7 +49,7 @@ private SqmCaseSearched(@Nullable SqmBindableType<R> inherentType, int estimated
 
 	@Override
 	public SqmCaseSearched<R> copy(SqmCopyContext context) {
-		final SqmCaseSearched<R> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java
index 593bb0f69d58..a8aceefad745 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCaseSimple.java
@@ -55,7 +55,7 @@ private SqmCaseSimple(
 
 	@Override
 	public SqmCaseSimple<T, R> copy(SqmCopyContext context) {
-		final SqmCaseSimple<T, R> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java
index 979ba811c726..431676cee9b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCoalesce.java
@@ -49,7 +49,7 @@ public SqmCoalesce(@Nullable SqmBindableType<T> type, int numberOfArguments, Nod
 
 	@Override
 	public SqmCoalesce<T> copy(SqmCopyContext context) {
-		final SqmCoalesce<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDistinct.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDistinct.java
index ebd0ccc5f160..89c3af5cab83 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDistinct.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDistinct.java
@@ -28,7 +28,7 @@ public SqmDistinct(SqmExpression<T> expression, NodeBuilder builder) {
 
 	@Override
 	public SqmDistinct<T> copy(SqmCopyContext context) {
-		final SqmDistinct<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java
index 453b5a92b6e2..52fe2112efbc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java
@@ -47,7 +47,7 @@ public SqmEnumLiteral(
 
 	@Override
 	public SqmEnumLiteral<E> copy(SqmCopyContext context) {
-		final SqmEnumLiteral<E> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEvery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEvery.java
index ca9096abb773..df6449272146 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEvery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEvery.java
@@ -37,7 +37,7 @@ public SqmEvery(SqmSubQuery<T> subquery, NodeBuilder criteriaBuilder) {
 
 	@Override
 	public SqmEvery<T> copy(SqmCopyContext context) {
-		final SqmEvery<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java
index 23dab7e827c5..620b7cc93e9d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java
@@ -6,6 +6,7 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.metamodel.model.domain.internal.EmbeddedSqmPathSource;
+import org.hibernate.query.sqm.SqmPathSource;
 import org.hibernate.type.BindableType;
 import org.hibernate.type.BindingContext;
 import org.hibernate.query.common.TemporalUnit;
@@ -105,8 +106,8 @@ public static SqmExpression<?> getActualExpression(SqmExpression<?> expression)
 		if ( isCompositeTemporal( expression ) ) {
 			final SqmPath<?> path = (SqmPath<?>) expression;
 			return castNonNull( expression.getJavaTypeDescriptor() ).getJavaTypeClass() == OffsetTime.class
-					? path.get( OffsetTimeCompositeUserType.LOCAL_TIME_NAME )
-					: path.get( AbstractTimeZoneStorageCompositeUserType.INSTANT_NAME );
+					? get( path, OffsetTimeCompositeUserType.LOCAL_TIME_NAME )
+					: get( path, AbstractTimeZoneStorageCompositeUserType.INSTANT_NAME );
 		}
 		else {
 			return expression;
@@ -116,10 +117,10 @@ public static SqmExpression<?> getActualExpression(SqmExpression<?> expression)
 	public static SqmExpression<?> getOffsetAdjustedExpression(SqmExpression<?> expression) {
 		if ( isCompositeTemporal( expression ) ) {
 			final SqmPath<?> compositePath = (SqmPath<?>) expression;
-			final SqmPath<Object> temporalPath =
+			final SqmPath<?> temporalPath =
 					castNonNull( expression.getJavaTypeDescriptor() ).getJavaTypeClass() == OffsetTime.class
-							? compositePath.get( OffsetTimeCompositeUserType.LOCAL_TIME_NAME )
-							: compositePath.get( AbstractTimeZoneStorageCompositeUserType.INSTANT_NAME );
+							? get( compositePath, OffsetTimeCompositeUserType.LOCAL_TIME_NAME )
+							: get( compositePath, AbstractTimeZoneStorageCompositeUserType.INSTANT_NAME );
 			final NodeBuilder nodeBuilder = temporalPath.nodeBuilder();
 			return new SqmBinaryArithmetic<>(
 					BinaryArithmeticOperator.ADD,
@@ -139,6 +140,22 @@ public static SqmExpression<?> getOffsetAdjustedExpression(SqmExpression<?> expr
 		}
 	}
 
+	public static SqmPath<?> get(SqmPath<?> lhs, String attributeName) {
+		// Don't use SqmPath.get() to avoid mutating the SQM tree here, since the SQM tree is shared
+		final SqmPath<?> existingSqmPath = lhs.getReusablePath( attributeName );
+		if ( existingSqmPath != null ) {
+			return existingSqmPath;
+		}
+		else {
+			final SqmPathSource<?> referencedPathSource = lhs.getReferencedPathSource()
+					.getSubPathSource( attributeName );
+			return referencedPathSource.createSqmPath(
+					lhs,
+					lhs.getResolvedModel().getIntermediatePathSource( referencedPathSource )
+			);
+		}
+	}
+
 //	public static SqmPath<?> findPath(SqmExpression<?> expression, SqmExpressible<?> nodeType) {
 //		if ( nodeType != expression.getNodeType() ) {
 //			return null;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java
index f871671f8878..4427eee96927 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java
@@ -4,12 +4,10 @@
  */
 package org.hibernate.query.sqm.tree.expression;
 
-import java.lang.reflect.Field;
 import java.util.Locale;
 import java.util.Objects;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.hibernate.QueryException;
 import org.hibernate.query.hql.spi.SemanticPathPart;
 import org.hibernate.query.hql.spi.SqmCreationState;
 import org.hibernate.query.sqm.NodeBuilder;
@@ -36,18 +34,6 @@ public class SqmFieldLiteral<T> extends AbstractSqmExpression<T>
 	private final JavaType<T> fieldJavaType;
 	private final String fieldName;
 
-	public SqmFieldLiteral(
-			Field field,
-			JavaType<T> fieldJavaType,
-			NodeBuilder nodeBuilder){
-		this(
-				extractValue( field ),
-				fieldJavaType,
-				field.getName(),
-				nodeBuilder
-		);
-	}
-
 	public SqmFieldLiteral(
 			@Nullable T value,
 			JavaType<T> fieldJavaType,
@@ -64,21 +50,9 @@ public PersistenceType getPersistenceType() {
 		return BASIC;
 	}
 
-	// Checker Framework JDK seems to miss @Nullable for Field.get()
-	@SuppressWarnings("argument")
-	private static <T> @Nullable T extractValue(Field field) {
-		try {
-			//noinspection unchecked
-			return (T) field.get( null );
-		}
-		catch (IllegalAccessException e) {
-			throw new QueryException( "Could not access Field value for SqmFieldLiteral", e );
-		}
-	}
-
 	@Override
 	public SqmFieldLiteral<T> copy(SqmCopyContext context) {
-		final SqmFieldLiteral<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFunction.java
index b260a84d8749..c3585fe2296f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFunction.java
@@ -129,7 +129,7 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
 						hql.append( ' ' );
 						arguments.get( 1 ).appendHqlString( hql, context );
 						hql.append( " from " );
-						arguments.get( 3 ).appendHqlString( hql, context );
+						arguments.get( 2 ).appendHqlString( hql, context );
 						break;
 				}
 				hql.append( ')' );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmHqlNumericLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmHqlNumericLiteral.java
index dcb4754cfbe8..8a1c30a60dc4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmHqlNumericLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmHqlNumericLiteral.java
@@ -23,7 +23,7 @@
 
 /**
  * Used to model numeric literals found in HQL queries.
- * <p/>
+ * <p>
  * Used instead of {@link SqmLiteral} which would require parsing the
  * literal value to the specified number type to avoid loss of precision
  * due to Float and Double being non-exact types.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java
index 2e9a35ef9801..35851e900791 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJpaCriteriaParameterWrapper.java
@@ -46,7 +46,7 @@ public SqmJpaCriteriaParameterWrapper(
 
 	@Override
 	public SqmJpaCriteriaParameterWrapper<T> copy(SqmCopyContext context) {
-		final SqmJpaCriteriaParameterWrapper<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonNullBehavior.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonNullBehavior.java
index 7cab17b40b01..8bc7759db8a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonNullBehavior.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonNullBehavior.java
@@ -52,12 +52,7 @@ public <X> X accept(SemanticQueryWalker<X> walker) {
 
 	@Override
 	public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
-		if ( this == NULL ) {
-			hql.append( " null on null" );
-		}
-		else {
-			hql.append( " absent on null" );
-		}
+		hql.append( this == NULL ? " null on null" : " absent on null" );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java
index 5df34f9b30aa..db519eaf445f 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java
@@ -138,7 +138,7 @@ public JpaJsonTableFunction passing(String parameterName, Expression<?> expressi
 
 	@Override
 	public SqmJsonTableFunction<T> copy(SqmCopyContext context) {
-		final SqmJsonTableFunction<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonValueExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonValueExpression.java
index 5123d55348e1..48e778703c13 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonValueExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonValueExpression.java
@@ -99,7 +99,7 @@ private SqmJsonValueExpression(
 	}
 
 	public SqmJsonValueExpression<T> copy(SqmCopyContext context) {
-		final SqmJsonValueExpression<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteral.java
index ede9c60a6245..a271286ce9b2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteral.java
@@ -53,7 +53,7 @@ protected SqmLiteral(@Nullable SqmBindableType<T> inherentType, NodeBuilder node
 
 	@Override
 	public SqmLiteral<T> copy(SqmCopyContext context) {
-		final SqmLiteral<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEmbeddableType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEmbeddableType.java
index 0fc44ed3fed3..02f5dbe2be02 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEmbeddableType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEmbeddableType.java
@@ -45,7 +45,7 @@ public EmbeddableDomainType<T> getEmbeddableDomainType() {
 
 	@Override
 	public SqmLiteralEmbeddableType<T> copy(SqmCopyContext context) {
-		final SqmLiteralEmbeddableType<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEntityType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEntityType.java
index 4792516c1c95..75be501c5a3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEntityType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralEntityType.java
@@ -42,7 +42,7 @@ public SqmLiteralEntityType(SqmEntityDomainType<T> entityType, NodeBuilder nodeB
 
 	@Override
 	public SqmLiteralEntityType<T> copy(SqmCopyContext context) {
-		final SqmLiteralEntityType<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralNull.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralNull.java
index 8353603cfc4e..d4f05b1b9f3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralNull.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmLiteralNull.java
@@ -26,7 +26,7 @@ public SqmLiteralNull(@Nullable SqmBindableType<T> expressibleType, NodeBuilder
 
 	@Override
 	public SqmLiteralNull<T> copy(SqmCopyContext context) {
-		final SqmLiteralNull<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmModifiedSubQueryExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmModifiedSubQueryExpression.java
index 5cefb33c02e9..b385d1299a22 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmModifiedSubQueryExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmModifiedSubQueryExpression.java
@@ -53,7 +53,7 @@ public SqmModifiedSubQueryExpression(
 
 	@Override
 	public SqmModifiedSubQueryExpression<T> copy(SqmCopyContext context) {
-		final SqmModifiedSubQueryExpression<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedExpression.java
index 578e108979e9..d2cf343ace33 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedExpression.java
@@ -32,7 +32,7 @@ public SqmNamedExpression(SqmExpression<T> expression, String name) {
 
 	@Override
 	public SqmNamedExpression<T> copy(SqmCopyContext context) {
-		final SqmNamedExpression<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java
index 3b847e1df9d3..44f8605e4c16 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmNamedParameter.java
@@ -36,7 +36,7 @@ public SqmNamedParameter(
 
 	@Override
 	public SqmNamedParameter<T> copy(SqmCopyContext context) {
-		final SqmNamedParameter<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
@@ -75,7 +75,7 @@ public String getName() {
 
 	@Override
 	public SqmParameter<T> copy() {
-		return new SqmNamedParameter<>( getName(), allowMultiValuedBinding(), this.getNodeType(), nodeBuilder() );
+		return new SqmNamedParameter<>( getName(), allowMultiValuedBinding(), getNodeType(), nodeBuilder() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java
index d46895a9bd0c..b2e746a32acd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOver.java
@@ -63,7 +63,7 @@ public SqmOver(
 
 	@Override
 	public SqmOver<T> copy(SqmCopyContext context) {
-		final SqmOver<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOverflow.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOverflow.java
index 94a29334b9b9..8b50156714a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOverflow.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmOverflow.java
@@ -30,7 +30,7 @@ public SqmOverflow(SqmExpression<T> separatorExpression, @Nullable SqmExpression
 
 	@Override
 	public SqmOverflow<T> copy(SqmCopyContext context) {
-		final SqmOverflow<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java
index 915a506b3cb5..2fe415aeaedf 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java
@@ -32,7 +32,7 @@ public SqmParameterizedEntityType(SqmParameter<T> parameterExpression, NodeBuild
 
 	@Override
 	public SqmParameterizedEntityType<T> copy(SqmCopyContext context) {
-		final SqmParameterizedEntityType<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmPositionalParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmPositionalParameter.java
index cea1a470b3b3..24a9096ecea9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmPositionalParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmPositionalParameter.java
@@ -38,7 +38,7 @@ public SqmPositionalParameter(
 
 	@Override
 	public SqmPositionalParameter<T> copy(SqmCopyContext context) {
-		final SqmPositionalParameter<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSelfRenderingExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSelfRenderingExpression.java
index 3ba9155f13fa..387063aeb4d4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSelfRenderingExpression.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSelfRenderingExpression.java
@@ -30,7 +30,7 @@ public SqmSelfRenderingExpression(
 
 	@Override
 	public SqmSelfRenderingExpression<T> copy(SqmCopyContext context) {
-		final SqmSelfRenderingExpression<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSummarization.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSummarization.java
index ce744035a9a7..eedb11bfe222 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSummarization.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSummarization.java
@@ -31,7 +31,7 @@ public SqmSummarization(Kind kind, List<SqmExpression<?>> groupings, NodeBuilder
 
 	@Override
 	public SqmSummarization<T> copy(SqmCopyContext context) {
-		final SqmSummarization<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java
index f0917b6126e0..ea6ad1aef28b 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java
@@ -35,7 +35,7 @@ public SqmToDuration(
 
 	@Override
 	public SqmToDuration<T> copy(SqmCopyContext context) {
-		final SqmToDuration<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTuple.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTuple.java
index dc3d93543df0..4a71852f3151 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTuple.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmTuple.java
@@ -61,7 +61,7 @@ public SqmTuple(List<SqmExpression<?>> groupedExpressions, @Nullable SqmBindable
 
 	@Override
 	public SqmTuple<T> copy(SqmCopyContext context) {
-		final SqmTuple<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmUnaryOperation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmUnaryOperation.java
index 211fd039c889..7a73098017e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmUnaryOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmUnaryOperation.java
@@ -49,7 +49,7 @@ public SqmUnaryOperation(
 
 	@Override
 	public SqmUnaryOperation<T> copy(SqmCopyContext context) {
-		final SqmUnaryOperation<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java
index ba8de20e513f..6e17d367b172 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java
@@ -97,7 +97,7 @@ private static List<SqmTypedNode<?>> createArgumentsList(SqmExpression<String> x
 
 	@Override
 	public SqmXmlTableFunction<T> copy(SqmCopyContext context) {
-		final SqmXmlTableFunction<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/ValueBindJpaCriteriaParameter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/ValueBindJpaCriteriaParameter.java
index 6562bde5dd45..89736c09f9c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/ValueBindJpaCriteriaParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/ValueBindJpaCriteriaParameter.java
@@ -40,7 +40,7 @@ private ValueBindJpaCriteriaParameter(ValueBindJpaCriteriaParameter<T> original)
 
 	@Override
 	public ValueBindJpaCriteriaParameter<T> copy(SqmCopyContext context) {
-		final ValueBindJpaCriteriaParameter<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		return existing != null
 				? existing
 				: context.registerCopy( this, new ValueBindJpaCriteriaParameter<>( this ) );
@@ -59,26 +59,31 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
 	// but for equals/hashCode, use equals/hashCode of the underlying value, if available, from the nodes JavaType
 
 	@Override
-	public final boolean equals(@Nullable Object o) {
-		if ( this == o ) {
+	public final boolean equals(@Nullable Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o instanceof ValueBindJpaCriteriaParameter<?> that ) {
-			if ( value == null ) {
-				return that.value == null && Objects.equals( getNodeType(), that.getNodeType() );
+		else if ( object instanceof ValueBindJpaCriteriaParameter<?> that ) {
+			if ( this.value == null || that.value == null ) {
+				return this.value == that.value
+					&& Objects.equals( this.getNodeType(), that.getNodeType() );
 			}
-			final var javaType = getJavaTypeDescriptor();
-			if ( that.value != null ) {
-				if ( javaType != null ) {
-					//noinspection unchecked
-					return javaType.equals( that.getJavaTypeDescriptor() ) && javaType.areEqual( value, (T) that.value );
+			else {
+				final var thisJavaType = getJavaTypeDescriptor();
+				final var thatJavaType = that.getJavaTypeDescriptor();
+				if ( thisJavaType == null || thatJavaType == null ) {
+					return thisJavaType == thatJavaType
+						&& this.value.equals( that.value );
 				}
 				else {
-					return that.getJavaTypeDescriptor() == null && value.equals( that.value );
+					return thisJavaType.equals( thatJavaType )
+						&& thisJavaType.areEqual( value, thisJavaType.cast( that.value ) );
 				}
 			}
 		}
-		return false;
+		else {
+			return false;
+		}
 	}
 
 	@Override
@@ -86,7 +91,11 @@ public int hashCode() {
 		if ( value == null ) {
 			return 0;
 		}
-		final var javaType = getJavaTypeDescriptor();
-		return javaType == null ? value.hashCode() : javaType.extractHashCode( value );
+		else {
+			final var javaType = getJavaTypeDescriptor();
+			return javaType == null
+					? value.hashCode()
+					: javaType.extractHashCode( value );
+		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCrossJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCrossJoin.java
index 97a8ef98d811..b90d1059adb2 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCrossJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCrossJoin.java
@@ -9,7 +9,6 @@
 import org.hibernate.metamodel.model.domain.PersistentAttribute;
 import org.hibernate.query.criteria.JpaCrossJoin;
 import org.hibernate.query.hql.spi.SqmCreationProcessingState;
-import org.hibernate.query.hql.spi.SqmPathRegistry;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
 import org.hibernate.query.sqm.tree.SqmJoinType;
@@ -35,7 +34,7 @@
  *         for {@linkplain SqmCrossJoin} having only one type argument for the right-hand
  *         side.  To properly handle the type parameters in the hierarchy we would need to
  *         change this to accept type parameter for the left-handle side as well.
- *         <p/>
+ *         <p>
  *         Another option is to not make it a join as in `SqmJoin`.  Instead, model it
  *         as a root with its predicate(s) added to an internal `SqmPredicateCollection` (ansi join predicate)
  *         or to the query where clause (theta joins).
@@ -93,11 +92,11 @@ public SqmJoinType getSqmJoinType() {
 
 	@Override
 	public SqmCrossJoin<T> copy(SqmCopyContext context) {
-		final SqmCrossJoin<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmCrossJoin<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCrossJoin<>(
 						getNavigablePath(),
@@ -145,7 +144,7 @@ public SqmCorrelatedCrossJoin<T> createCorrelation() {
 	}
 
 	public SqmCrossJoin<T> makeCopy(SqmCreationProcessingState creationProcessingState) {
-		final SqmPathRegistry pathRegistry = creationProcessingState.getPathRegistry();
+		final var pathRegistry = creationProcessingState.getPathRegistry();
 		return new SqmCrossJoin<>(
 				getReferencedPathSource(),
 				getExplicitAlias(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCteJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCteJoin.java
index ffa77988f79e..8e8d50a1b62d 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCteJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmCteJoin.java
@@ -74,12 +74,12 @@ public boolean isImplicitlySelectable() {
 
 	@Override
 	public SqmCteJoin<T> copy(SqmCopyContext context) {
-		final SqmCteJoin<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 		//noinspection unchecked
-		final SqmCteJoin<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmCteJoin<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java
index 35d4efe519cd..7f81dcce5508 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java
@@ -97,12 +97,12 @@ public boolean isImplicitlySelectable() {
 
 	@Override
 	public SqmDerivedJoin<T> copy(SqmCopyContext context) {
-		final SqmDerivedJoin<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
 		//noinspection unchecked
-		final SqmDerivedJoin<T> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmDerivedJoin<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmEntityJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmEntityJoin.java
index e677689700bf..71fa83c1a766 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmEntityJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmEntityJoin.java
@@ -11,7 +11,6 @@
 import org.hibernate.query.criteria.JpaExpression;
 import org.hibernate.query.criteria.JpaPredicate;
 import org.hibernate.query.hql.spi.SqmCreationProcessingState;
-import org.hibernate.query.hql.spi.SqmPathRegistry;
 import org.hibernate.query.sqm.SemanticQueryWalker;
 import org.hibernate.query.sqm.spi.SqmCreationHelper;
 import org.hibernate.query.sqm.tree.SqmCopyContext;
@@ -76,11 +75,11 @@ public boolean isImplicitlySelectable() {
 
 	@Override
 	public SqmEntityJoin<L,R> copy(SqmCopyContext context) {
-		final SqmEntityJoin<L,R> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmEntityJoin<L,R> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmEntityJoin<>(
 						getNavigablePath(),
@@ -210,7 +209,7 @@ public SqmCorrelatedEntityJoin<L,R> createCorrelation() {
 	}
 
 	public SqmEntityJoin<L,R> makeCopy(SqmCreationProcessingState creationProcessingState) {
-		final SqmPathRegistry pathRegistry = creationProcessingState.getPathRegistry();
+		final var pathRegistry = creationProcessingState.getPathRegistry();
 		return new SqmEntityJoin<>(
 				getReferencedPathSource(),
 				getExplicitAlias(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFunctionJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFunctionJoin.java
index 660d80a6184e..e890562dded1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFunctionJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmFunctionJoin.java
@@ -45,7 +45,7 @@ public SqmFunctionJoin(
 			@Nullable String alias,
 			SqmJoinType joinType,
 			boolean lateral,
-			SqmRoot<Object> sqmRoot) {
+			SqmFrom<?, Object> sqmFrom) {
 		this(
 				SqmCreationHelper.buildRootNavigablePath( "<<derived>>", alias ),
 				function,
@@ -53,7 +53,7 @@ public SqmFunctionJoin(
 				function.getType(),
 				alias,
 				validateJoinType( joinType, lateral ),
-				sqmRoot
+				sqmFrom
 		);
 	}
 
@@ -64,14 +64,14 @@ public SqmFunctionJoin(
 			SqmPathSource<E> pathSource,
 			@Nullable String alias,
 			SqmJoinType joinType,
-			SqmRoot<Object> sqmRoot) {
+			SqmFrom<?, Object> sqmFrom) {
 		super(
 				navigablePath,
 				pathSource,
-				sqmRoot,
+				sqmFrom,
 				alias,
 				joinType,
-				sqmRoot.nodeBuilder()
+				sqmFrom.nodeBuilder()
 		);
 		this.function = function;
 		this.lateral = lateral;
@@ -97,12 +97,11 @@ public boolean isImplicitlySelectable() {
 
 	@Override
 	public SqmFunctionJoin<E> copy(SqmCopyContext context) {
-		final SqmFunctionJoin<E> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		//noinspection unchecked
-		final SqmFunctionJoin<E> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmFunctionJoin<>(
 						getNavigablePath(),
@@ -111,22 +110,13 @@ public SqmFunctionJoin<E> copy(SqmCopyContext context) {
 						getReferencedPathSource(),
 						getExplicitAlias(),
 						getSqmJoinType(),
-						(SqmRoot<Object>) findRoot().copy( context )
+						getParent().copy( context )
 				)
 		);
 		copyTo( path, context );
 		return path;
 	}
 
-	public SqmRoot<?> getRoot() {
-		return (SqmRoot<?>) (SqmFrom<?, ?>) castNonNull( super.getLhs() );
-	}
-
-	@Override
-	public SqmRoot<?> findRoot() {
-		return getRoot();
-	}
-
 	@Override
 	public SqmSetReturningFunction<E> getFunction() {
 		return function;
@@ -224,8 +214,7 @@ public <S extends E> SqmTreatedJoin<Object, E, S> treatAs(
 
 	@Override
 	public @NonNull SqmFrom<?, Object> getParent() {
-		//noinspection unchecked
-		return (SqmFrom<?, Object>) (SqmFrom<?, ?>) getRoot();
+		return castNonNull( super.getParent() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java
index 3b396a94e1a9..7050dd7cbfd4 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmRoot.java
@@ -73,11 +73,11 @@ protected SqmRoot(
 
 	@Override
 	public SqmRoot<E> copy(SqmCopyContext context) {
-		final SqmRoot<E> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmRoot<E> path = context.registerCopy(
+		final var path = context.registerCopy(
 				this,
 				new SqmRoot<>(
 						getNavigablePath(),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictClause.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictClause.java
index be4e281908e8..fc68a466ecd6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictClause.java
@@ -148,7 +148,7 @@ public NodeBuilder nodeBuilder() {
 
 	@Override
 	public SqmConflictClause<T> copy(SqmCopyContext context) {
-		final SqmConflictClause<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictUpdateAction.java
index 060eef3d369d..da5ecf4b0076 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictUpdateAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictUpdateAction.java
@@ -136,7 +136,7 @@ public NodeBuilder nodeBuilder() {
 
 	@Override
 	public SqmConflictUpdateAction<T> copy(SqmCopyContext context) {
-		final SqmConflictUpdateAction<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertSelectStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertSelectStatement.java
index 97177adfae92..e2c8cbbb7ed1 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertSelectStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertSelectStatement.java
@@ -75,7 +75,7 @@ private SqmInsertSelectStatement(
 
 	@Override
 	public SqmInsertSelectStatement<T> copy(SqmCopyContext context) {
-		final SqmInsertSelectStatement<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertValuesStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertValuesStatement.java
index 8f9198e689d0..4acd969d8c88 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertValuesStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertValuesStatement.java
@@ -74,7 +74,7 @@ private SqmInsertValuesStatement(
 
 	@Override
 	public SqmInsertValuesStatement<T> copy(SqmCopyContext context) {
-		final SqmInsertValuesStatement<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/ParameterCollector.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/ParameterCollector.java
index 06daf6d19313..302f12e476bc 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/ParameterCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/jpa/ParameterCollector.java
@@ -10,6 +10,8 @@
 import java.util.function.Consumer;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.query.sqm.SqmExpressible;
+import org.hibernate.query.sqm.tree.expression.SqmBinaryArithmetic;
 import org.hibernate.type.BindableType;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.query.sqm.SqmPathSource;
@@ -40,6 +42,7 @@
 import org.hibernate.query.sqm.tree.predicate.SqmTruthnessPredicate;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
 import org.hibernate.query.sqm.tree.select.SqmSortSpecification;
+import org.hibernate.type.JavaObjectType;
 
 /**
  * @author Steve Ebersole
@@ -137,16 +140,19 @@ public Object visitSetReturningFunction(SqmSetReturningFunction<?> sqmFunction)
 	}
 
 	private <T> @Nullable BindableType<T> getInferredParameterType(JpaCriteriaParameter<?> expression) {
-		BindableType<?> parameterType = null;
+		BindableType<?> parameterType = expression.getHibernateType();
+		// apply any inferred type
 		if ( inferenceBasis != null ) {
 			final SqmBindableType<?> expressible = inferenceBasis.getExpressible();
 			if ( expressible != null ) {
-				parameterType = expressible;
+				// unless the parameter has real typing information applied
+				if ( parameterType == null
+					|| ((SqmExpressible<?>) parameterType).getSqmType() == null
+					|| parameterType instanceof JavaObjectType ) {
+					parameterType = expressible;
+				}
 			}
 		}
-		if ( parameterType == null ) {
-			parameterType = expression.getHibernateType();
-		}
 		//noinspection unchecked
 		return (BindableType<T>) parameterType;
 	}
@@ -316,6 +322,13 @@ public Object visitIsTruePredicate(SqmTruthnessPredicate predicate) {
 		return predicate;
 	}
 
+	@Override
+	public Object visitBinaryArithmeticExpression(SqmBinaryArithmetic<?> expression) {
+		withTypeInference( expression.getRightHandOperand(), expression.getLeftHandOperand() );
+		withTypeInference( expression.getLeftHandOperand(), expression.getRightHandOperand() );
+		return expression;
+	}
+
 	@Override
 	public Object visitComparisonPredicate(SqmComparisonPredicate predicate) {
 		withTypeInference( predicate.getRightHandExpression(), predicate.getLeftHandExpression() );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java
index be145463d679..65123e6ee5e5 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInListPredicate.java
@@ -67,7 +67,7 @@ public SqmInListPredicate(
 
 	@Override
 	public SqmInListPredicate<T> copy(SqmCopyContext context) {
-		final SqmInListPredicate<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java
index 3cb9064939f4..ca73b4928d5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/predicate/SqmInSubQueryPredicate.java
@@ -57,7 +57,7 @@ public SqmInSubQueryPredicate(
 
 	@Override
 	public SqmInSubQueryPredicate<T> copy(SqmCopyContext context) {
-		final SqmInSubQueryPredicate<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java
index 996ba715ca3e..eb8006d81821 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/AbstractSqmSelectQuery.java
@@ -90,7 +90,7 @@ public AbstractSqmSelectQuery(
 
 	protected Map<String, SqmCteStatement<?>> copyCteStatements(SqmCopyContext context) {
 		final Map<String, SqmCteStatement<?>> copies = new LinkedHashMap<>( cteStatements.size() );
-		for ( Map.Entry<String, SqmCteStatement<?>> entry : cteStatements.entrySet() ) {
+		for ( var entry : cteStatements.entrySet() ) {
 			copies.put( entry.getKey(), entry.getValue().copy( context ) );
 		}
 		return copies;
@@ -181,7 +181,7 @@ private String validateCteName(String name) {
 	}
 
 	protected <X> JpaCteCriteria<X> withInternal(String name, AbstractQuery<X> criteria) {
-		final SqmCteStatement<X> cteStatement = new SqmCteStatement<>(
+		final var cteStatement = new SqmCteStatement<>(
 				name,
 				(SqmSelectQuery<X>) criteria,
 				this,
@@ -198,7 +198,7 @@ protected <X> JpaCteCriteria<X> withInternal(
 			AbstractQuery<X> baseCriteria,
 			boolean unionDistinct,
 			Function<JpaCteCriteria<X>, AbstractQuery<X>> recursiveCriteriaProducer) {
-		final SqmCteStatement<X> cteStatement = new SqmCteStatement<>(
+		final var cteStatement = new SqmCteStatement<>(
 				name,
 				(SqmSelectQuery<X>) baseCriteria,
 				unionDistinct,
@@ -247,7 +247,7 @@ public List<? extends JpaRoot<?>> getRootList() {
 	 * @see org.hibernate.query.criteria.JpaCriteriaQuery#getRoot(int, Class)
 	 */
 	public <E> JpaRoot<? extends E> getRoot(int position, Class<E> type) {
-		final List<SqmRoot<?>> rootList = getQuerySpec().getRootList();
+		final var rootList = getQuerySpec().getRootList();
 		if ( rootList.size() <= position ) {
 			throw new IllegalArgumentException( "Not enough root entities" );
 		}
@@ -258,7 +258,7 @@ public <E> JpaRoot<? extends E> getRoot(int position, Class<E> type) {
 	 * @see org.hibernate.query.criteria.JpaCriteriaQuery#getRoot(String, Class)
 	 */
 	public <E> JpaRoot<? extends E> getRoot(String alias, Class<E> type) {
-		for ( SqmRoot<?> root : getQuerySpec().getRootList() ) {
+		for ( var root : getQuerySpec().getRootList() ) {
 			final String rootAlias = root.getAlias();
 			if ( rootAlias != null && rootAlias.equals( alias ) ) {
 				return castRoot( root, type );
@@ -268,7 +268,7 @@ public <E> JpaRoot<? extends E> getRoot(String alias, Class<E> type) {
 	}
 
 	private static <E> JpaRoot<? extends E> castRoot(JpaRoot<?> root, Class<E> type) {
-		final Class<?> rootEntityType = root.getJavaType();
+		final var rootEntityType = root.getJavaType();
 		if ( rootEntityType == null ) {
 			throw new AssertionFailure( "Java type of root entity was null" );
 		}
@@ -277,7 +277,7 @@ private static <E> JpaRoot<? extends E> castRoot(JpaRoot<?> root, Class<E> type)
 												+ "' did not have the given type '" + type.getTypeName() + "'");
 		}
 		@SuppressWarnings("unchecked") // safe, we just checked
-		final JpaRoot<? extends E> result = (JpaRoot<? extends E>) root;
+		final var result = (JpaRoot<? extends E>) root;
 		return result;
 	}
 
@@ -296,20 +296,20 @@ public <X> SqmRoot<X> from(Class<X> entityClass) {
 	@Override
 	public <X> SqmDerivedRoot<X> from(Subquery<X> subquery) {
 		validateComplianceFromSubQuery();
-		final SqmDerivedRoot<X> root = new SqmDerivedRoot<>( (SqmSubQuery<X>) subquery, null );
+		final var root = new SqmDerivedRoot<>( (SqmSubQuery<X>) subquery, null );
 		addRoot( root );
 		return root;
 	}
 
 	public <X> JpaRoot<X> from(JpaCteCriteria<X> cte) {
-		final SqmCteRoot<X> root = new SqmCteRoot<>( ( SqmCteStatement<X> ) cte, null );
+		final var root = new SqmCteRoot<>( ( SqmCteStatement<X> ) cte, null );
 		addRoot( root );
 		return root;
 	}
 
 	@Override
 	public <X> JpaFunctionRoot<X> from(JpaSetReturningFunction<X> function) {
-		final SqmFunctionRoot<X> root = new SqmFunctionRoot<>( (SqmSetReturningFunction<X>) function, null );
+		final var root = new SqmFunctionRoot<>( (SqmSetReturningFunction<X>) function, null );
 		addRoot( root );
 		return root;
 	}
@@ -355,8 +355,8 @@ public SqmSelectQuery<T> distinct(boolean distinct) {
 
 	@Override
 	public @Nullable JpaSelection<T> getSelection() {
-		final SqmSelectClause selectClause = getQuerySpec().getSelectClause();
-		final List<SqmSelection<?>> selections = selectClause.getSelections();
+		final var selectClause = getQuerySpec().getSelectClause();
+		final var selections = selectClause.getSelections();
 		return (JpaSelection<T>) switch ( selections.size() ) {
 			case 0 -> null;
 			case 1 -> selections.get( 0 ).getSelectableNode();
@@ -438,7 +438,7 @@ public AbstractQuery<T> having(List<Predicate> restrictions) {
 	public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
 		if ( !cteStatements.isEmpty() ) {
 			hql.append( "with " );
-			for ( SqmCteStatement<?> value : cteStatements.values() ) {
+			for ( var value : cteStatements.values() ) {
 				value.appendHqlString( hql, context );
 				hql.append( ", " );
 			}
@@ -479,7 +479,7 @@ public int cacheHashCode() {
 
 	@SuppressWarnings("unchecked")
 	protected Selection<? extends T> getResultSelection(Selection<?>[] selections) {
-		final Class<T> resultType = getResultType();
+		final var resultType = getResultType();
 		if ( resultType == Object.class ) {
 			return switch ( selections.length ) {
 				case 0 -> throw new IllegalArgumentException( "Empty selections passed to criteria query typed as Object" );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiation.java
index 12cf9b69e5ce..c8e79168c930 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiation.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmDynamicInstantiation.java
@@ -5,7 +5,6 @@
 package org.hibernate.query.sqm.tree.select;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -23,11 +22,15 @@
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.query.sqm.tree.expression.SqmExpression;
 import org.hibernate.query.sqm.tree.jpa.AbstractJpaSelection;
+import org.hibernate.type.descriptor.java.DateJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import org.hibernate.type.descriptor.java.TemporalJavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.jboss.logging.Logger;
 
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.toList;
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 import static org.hibernate.query.sqm.DynamicInstantiationNature.CLASS;
@@ -157,7 +160,7 @@ public boolean checkInstantiation(TypeConfiguration typeConfiguration) {
 				if ( isConstructorCompatible( javaType, argTypes, typeConfiguration ) ) {
 					return true;
 				}
-				final List<SqmDynamicInstantiationArgument<?>> arguments = getArguments();
+				final var arguments = getArguments();
 				final List<String> aliases = new ArrayList<>( arguments.size() );
 				for ( var argument : arguments ) {
 					final String alias = argument.getAlias();
@@ -182,9 +185,18 @@ private List<Class<?>> argumentTypes() {
 		return getArguments().stream()
 				.map( arg -> {
 					final var expressible = arg.getExpressible();
-					return expressible != null && expressible.getExpressibleJavaType() != null ?
-							expressible.getExpressibleJavaType().getJavaTypeClass() :
-							Void.class;
+					if ( expressible != null ) {
+						final var expressibleJavaType = expressible.getExpressibleJavaType();
+						if ( expressibleJavaType != null ) {
+							return expressibleJavaType instanceof DateJavaType temporalJavaType
+									// Hack to accommodate a constructor with java.sql parameter
+									// types when the entity has java.util.Date as its field types.
+									// (This was requested in HHH-4179 and we fixed it by accident.)
+									? TemporalJavaType.resolveJavaTypeClass( temporalJavaType.getPrecision() )
+									: expressibleJavaType.getJavaTypeClass();
+						}
+					}
+					return Void.class;
 				} ).collect( toList() );
 	}
 
@@ -194,7 +206,7 @@ public boolean isFullyAliased() {
 
 	@Override
 	public SqmDynamicInstantiation<T> copy(SqmCopyContext context) {
-		final SqmDynamicInstantiation<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
@@ -227,7 +239,7 @@ public SqmDynamicInstantiationTarget<T> getInstantiationTarget() {
 	}
 
 	public List<SqmDynamicInstantiationArgument<?>> getArguments() {
-		return arguments == null ? Collections.emptyList() : Collections.unmodifiableList( arguments );
+		return arguments == null ? emptyList() : unmodifiableList( arguments );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java
index e4d6fedc05f7..e12f369b1732 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmJpaCompoundSelection.java
@@ -24,22 +24,18 @@
 
 import jakarta.persistence.criteria.Selection;
 
-/**
- * @asciidoctor
- *
- * Models either a `Tuple` or `Object[]` selection as defined by the
- * JPA Criteria API.
- *
- * @see org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder#tuple(Selection[])
- * @see jakarta.persistence.criteria.CriteriaBuilder#tuple(jakarta.persistence.criteria.Selection[])
- *
- * @see org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder#array(Selection[])
- * @see jakarta.persistence.criteria.CriteriaBuilder#array(jakarta.persistence.criteria.Selection[])
- *
- * @see org.hibernate.query.sqm.tree.expression.SqmTuple
- *
- * @author Steve Ebersole
- */
+/// Models either a `Tuple` or `Object[]` selection as defined by the
+/// JPA Criteria API.
+///
+/// @see org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder#tuple(Selection[])
+/// @see jakarta.persistence.criteria.CriteriaBuilder#tuple(jakarta.persistence.criteria.Selection[])
+///
+/// @see org.hibernate.query.sqm.internal.SqmCriteriaNodeBuilder#array(Selection[])
+/// @see jakarta.persistence.criteria.CriteriaBuilder#array(jakarta.persistence.criteria.Selection[])
+///
+/// @see org.hibernate.query.sqm.tree.expression.SqmTuple
+///
+/// @author Steve Ebersole
 public class SqmJpaCompoundSelection<T>
 		extends AbstractSqmExpression<T>
 		implements JpaCompoundSelection<T>, SqmExpressible<T> {
@@ -60,7 +56,7 @@ public SqmJpaCompoundSelection(
 
 	@Override
 	public SqmJpaCompoundSelection<T> copy(SqmCopyContext context) {
-		final SqmJpaCompoundSelection<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java
index bd61a0088b3b..f5017e192dbd 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQueryGroup.java
@@ -62,7 +62,7 @@ public SqmQueryGroup(
 
 	@Override
 	public SqmQueryPart<T> copy(SqmCopyContext context) {
-		final SqmQueryGroup<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java
index 325432fe867c..3533d8e13524 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmQuerySpec.java
@@ -98,7 +98,7 @@ public SqmQuerySpec(SqmQuerySpec<T> original, SqmCopyContext context) {
 
 	@Override
 	public SqmQuerySpec<T> copy(SqmCopyContext context) {
-		final SqmQuerySpec<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java
index 4de3b90080da..18782b6f52cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectStatement.java
@@ -122,7 +122,7 @@ private SqmSelectStatement(
 
 	@Override
 	public SqmSelectStatement<T> copy(SqmCopyContext context) {
-		final SqmSelectStatement<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		return existing != null ? existing : createCopy( context, getResultType() );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java
index 211d22610866..d291aa6f5ac9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java
@@ -35,7 +35,7 @@ public interface SqmSelectableNode<T> extends JpaSelection<T>, SqmTypedNode<T> {
 	SqmSelectableNode<T> copy(SqmCopyContext context);
 
 	default @Nullable Integer getTupleLength() {
-		final SqmBindableType<T> nodeType = getNodeType();
+		final SqmBindableType<T> nodeType = getExpressible();
 		final SqmDomainType<T> sqmType = nodeType == null ? null : nodeType.getSqmType();
 		return sqmType == null ? 1 : sqmType.getTupleLength();
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java
index 1d086f3bce81..b0bc52227bea 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSubQuery.java
@@ -150,7 +150,7 @@ private SqmSubQuery(
 
 	@Override
 	public SqmSubQuery<T> copy(SqmCopyContext context) {
-		final SqmSubQuery<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java
index 5e9b8e7905a0..981226432c4a 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmUpdateStatement.java
@@ -107,7 +107,7 @@ private SqmUpdateStatement(
 
 	@Override
 	public SqmUpdateStatement<T> copy(SqmCopyContext context) {
-		final SqmUpdateStatement<T> existing = context.getCopy( this );
+		final var existing = context.getCopy( this );
 		if ( existing != null ) {
 			return existing;
 		}
@@ -179,7 +179,7 @@ public void setSetClause(SqmSetClause setClause) {
 
 	@Override
 	public <Y, X extends Y> SqmUpdateStatement<T> set(SingularAttribute<? super T, Y> attribute, @Nullable X value) {
-		final SqmCriteriaNodeBuilder nodeBuilder = (SqmCriteriaNodeBuilder) nodeBuilder();
+		final var nodeBuilder = (SqmCriteriaNodeBuilder) nodeBuilder();
 		SqmPath<Y> sqmAttribute = getTarget().get( attribute );
 		applyAssignment( sqmAttribute, nodeBuilder.value( value, sqmAttribute) );
 		return this;
@@ -193,7 +193,7 @@ public <Y> SqmUpdateStatement<T> set(SingularAttribute<? super T, Y> attribute,
 
 	@Override
 	public <Y, X extends Y> SqmUpdateStatement<T> set(Path<Y> attribute, @Nullable X value) {
-		final SqmCriteriaNodeBuilder nodeBuilder = (SqmCriteriaNodeBuilder) nodeBuilder();
+		final var nodeBuilder = (SqmCriteriaNodeBuilder) nodeBuilder();
 		final SqmPath<Y> sqmAttribute = (SqmPath<Y>) attribute;
 		applyAssignment( sqmAttribute, nodeBuilder.value( value, sqmAttribute ) );
 		return this;
@@ -213,7 +213,7 @@ public SqmUpdateStatement<T> set(String attributeName, @Nullable Object value) {
 			expression = (SqmExpression) value;
 		}
 		else {
-			final SqmCriteriaNodeBuilder nodeBuilder = (SqmCriteriaNodeBuilder) nodeBuilder();
+			final var nodeBuilder = (SqmCriteriaNodeBuilder) nodeBuilder();
 			expression = nodeBuilder.value( value, sqmPath );
 		}
 		applyAssignment( sqmPath, expression );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicValuedModelPart.java
index 40266a57e163..76bda76cf1f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicValuedModelPart.java
@@ -65,7 +65,7 @@ public AnonymousTupleBasicValuedModelPart(
 				new SelectableMappingImpl(
 						"",
 						selectionExpression,
-						new SelectablePath( partName ),
+						null,
 						null,
 						null,
 						null,
@@ -326,7 +326,6 @@ public BasicFetch<?> generateFetch(
 				fetchablePath,
 				this,
 				fetchTiming,
-				creationState,
 				!sqlSelection.isVirtual()
 		);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddableValuedModelPart.java
index 4e3e700380dd..c05647eb1f49 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddableValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddableValuedModelPart.java
@@ -128,7 +128,7 @@ private Map<String, ModelPart> createModelParts(
 					sqmExpressible,
 					attributeType,
 					sqlTypedMappings,
-					selectionIndex,
+					selectionIndex + index,
 					selectionExpression + "_" + attribute.getName(),
 					attribute.getName(),
 					modelPartContainer.findSubPart( attribute.getName(), null ),
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEntityValuedModelPart.java
index 1cd2febb7912..67e4f3f6edf6 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEntityValuedModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEntityValuedModelPart.java
@@ -23,6 +23,7 @@
 import org.hibernate.metamodel.mapping.AttributeMappingsList;
 import org.hibernate.metamodel.mapping.AttributeMappingsMap;
 import org.hibernate.metamodel.mapping.CompositeIdentifierMapping;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.mapping.EntityAssociationMapping;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
@@ -262,8 +263,7 @@ public TableGroupJoin createTableGroupJoin(
 		final TableGroupJoin tableGroupJoin = new TableGroupJoin(
 				navigablePath,
 				joinType,
-				lazyTableGroup,
-				null
+				lazyTableGroup
 		);
 		lazyTableGroup.setTableGroupInitializerCallback(
 				createTableGroupInitializerCallback(
@@ -647,7 +647,7 @@ public EntityDiscriminatorMapping getDiscriminatorMapping() {
 	}
 
 	@Override
-	public Object getDiscriminatorValue() {
+	public DiscriminatorValue getDiscriminatorValue() {
 		return delegate.getEntityMappingType().getDiscriminatorValue();
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java b/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java
index 395b82a12bb0..8df8b1326eac 100644
--- a/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java
+++ b/hibernate-core/src/main/java/org/hibernate/relational/SchemaManager.java
@@ -10,7 +10,8 @@
 /**
  * Allows programmatic {@linkplain #exportMappedObjects schema export},
  * {@linkplain #validateMappedObjects schema validation},
- * {@linkplain #truncateMappedObjects data cleanup}, and
+ * {@linkplain #truncateMappedObjects data cleanup},
+ * {@linkplain #populate data population}, and
  * {@linkplain #dropMappedObjects schema cleanup} as a convenience for
  * writing tests.
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java
index c2133bf06433..750005e7d7f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/beans/internal/BeansMessageLogger.java
@@ -16,6 +16,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -34,7 +35,7 @@
 public interface BeansMessageLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".beans";
 
-	BeansMessageLogger BEANS_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BeansMessageLogger.class, LOGGER_NAME );
+	BeansMessageLogger BEANS_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), BeansMessageLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage( level = TRACE )
 	@Message(
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java
index c28826c335e2..aa6f0c2cb481 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/AbstractLogicalConnectionImplementor.java
@@ -147,11 +147,18 @@ protected static boolean determineInitialAutoCommitMode(Connection providedConne
 	}
 
 	@Override
-	public TransactionStatus getStatus(){
+	public TransactionStatus getStatus() {
 		return status;
 	}
 
 	protected boolean doConnectionsFromProviderHaveAutoCommitDisabled() {
 		return false;
 	}
+
+	@Override
+	public void markRollbackOnly() {
+		if ( status == TransactionStatus.ACTIVE ) {
+			status = TransactionStatus.MARKED_ROLLBACK;
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java
index a92125d364e6..dfcbc4127984 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionLogging.java
@@ -15,6 +15,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.hibernate.cfg.JdbcSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT;
 import static org.jboss.logging.Logger.Level.DEBUG;
@@ -34,7 +35,7 @@
 public interface LogicalConnectionLogging extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".resource.jdbc";
 	LogicalConnectionLogging CONNECTION_LOGGER = Logger.getMessageLogger(
-			MethodHandles.lookup(), LogicalConnectionLogging.class, LOGGER_NAME
+			MethodHandles.lookup(), LogicalConnectionLogging.class, LOGGER_NAME, Locale.ROOT
 	);
 
 	// ---- TRACE: lifecycle around JDBC transactions on logical connection ----
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java
index df53cb6f1970..6e2450c031a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java
@@ -255,15 +255,19 @@ public static LogicalConnectionManagedImpl deserialize(ObjectInputStream ois, Jd
 	@Override
 	public Connection close() {
 		if ( !closed ) {
-			getResourceRegistry().releaseResources();
-			CONNECTION_LOGGER.closingLogicalConnection( hashCode() );
 			try {
-				releaseConnectionIfNeeded();
+				getResourceRegistry().releaseResources();
 			}
 			finally {
-				// no matter what
-				closed = true;
-				CONNECTION_LOGGER.logicalConnectionClosed( hashCode() );
+				CONNECTION_LOGGER.closingLogicalConnection( hashCode() );
+				try {
+					releaseConnectionIfNeeded();
+				}
+				finally {
+					// no matter what
+					closed = true;
+					CONNECTION_LOGGER.logicalConnectionClosed( hashCode() );
+				}
 			}
 		}
 		return null;
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java
index cef982818fcd..b3e3fc13f7a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionProvidedImpl.java
@@ -10,6 +10,7 @@
 import java.sql.Connection;
 
 import static org.hibernate.resource.jdbc.internal.LogicalConnectionLogging.CONNECTION_LOGGER;
+
 import org.hibernate.resource.jdbc.ResourceRegistry;
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryLogger.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryLogger.java
index fa591dd617aa..02ffb5563c2b 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResourceRegistryLogger.java
@@ -16,6 +16,7 @@
 import java.lang.invoke.MethodHandles;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.TRACE;
 import static org.jboss.logging.Logger.Level.DEBUG;
@@ -40,7 +41,8 @@ public interface ResourceRegistryLogger extends BasicLogger {
 	ResourceRegistryLogger RESOURCE_REGISTRY_LOGGER = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			ResourceRegistryLogger.class,
-			LOGGER_NAME
+			LOGGER_NAME,
+			Locale.ROOT
 	);
 
 	@LogMessage(level = TRACE)
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResultsetsTrackingContainer.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResultsetsTrackingContainer.java
index 880124487568..1d61cceb6eec 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResultsetsTrackingContainer.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/ResultsetsTrackingContainer.java
@@ -11,7 +11,7 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 
-import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
+import static org.hibernate.engine.jdbc.JdbcLogging.JDBC_LOGGER;
 
 /**
  * We used to record Statement(s) and their associated ResultSet(s) in a Map
@@ -123,12 +123,7 @@ else if ( key_1 == statement ) {
 	}
 
 	private ResultSetsSet ensureWriteable(final ResultSetsSet value) {
-		if ( value == null || value == EMPTY) {
-			return new ResultSetsSet();
-		}
-		else {
-			return value;
-		}
+		return value == null || value == EMPTY ? new ResultSetsSet() : value;
 	}
 
 	//As it's a get "for removal" we won't be wrapping an EMPTY set
@@ -179,7 +174,7 @@ private boolean warnOnNotNull(ResultSetsSet existingEntry) {
 		// proxy/wrapper around the JDBC Statement,
 		// causing excessive logging here. See HHH-8210.
 		if ( existingEntry == null ) {
-			CORE_LOGGER.trace( "ResultSet statement was not registered (on register)" );
+			JDBC_LOGGER.resultSetStatementWasNotRegistered();
 		}
 		return true;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java
index ca4472aa7650..45fcebf63028 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/LogicalConnectionImplementor.java
@@ -83,4 +83,9 @@ public interface LogicalConnectionImplementor extends LogicalConnection {
 	 * @throws IOException Problem accessing stream
 	 */
 	void serialize(ObjectOutputStream oos) throws IOException;
+
+	/**
+	 * Mark the associated transaction as rollback-only.
+	 */
+	void markRollbackOnly();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java
index 5f1c4a4c094b..81746428efa0 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java
@@ -209,33 +209,32 @@ public void removeObserver(TransactionObserver observer) {
 	 */
 	public class TransactionDriverControlImpl implements TransactionDriver {
 		private final JdbcResourceTransaction jdbcResourceTransaction;
-		private boolean invalid;
-		private boolean rollbackOnly = false;
+//		private boolean invalid;
 
 		public TransactionDriverControlImpl(JdbcResourceTransaction jdbcResourceTransaction) {
 			this.jdbcResourceTransaction = jdbcResourceTransaction;
 		}
 
-		protected void invalidate() {
-			invalid = true;
-		}
+//		protected void invalidate() {
+//			invalid = true;
+//		}
 
 		@Override
 		public void begin() {
-			errorIfInvalid();
+//			errorIfInvalid();
 			jdbcResourceTransaction.begin();
 			JdbcResourceLocalTransactionCoordinatorImpl.this.afterBeginCallback();
 		}
 
-		protected void errorIfInvalid() {
-			if ( invalid ) {
-				throw new IllegalStateException( "Physical transaction delegate is no longer valid" );
-			}
-		}
+//		protected void errorIfInvalid() {
+//			if ( invalid ) {
+//				throw new IllegalStateException( "Physical transaction delegate is no longer valid" );
+//			}
+//		}
 
 		@Override
 		public void commit() {
-			if ( rollbackOnly ) {
+			if ( isRollbackOnly() ) {
 				commitRollbackOnly();
 			}
 			else {
@@ -243,6 +242,10 @@ public void commit() {
 			}
 		}
 
+		private boolean isRollbackOnly() {
+			return jdbcResourceTransaction.getStatus() == TransactionStatus.MARKED_ROLLBACK;
+		}
+
 		private void commitNoRollbackOnly() {
 			try {
 				beforeCompletionCallback();
@@ -277,23 +280,15 @@ private void commitRollbackOnly() {
 
 		@Override
 		public void rollback() {
-			try {
-				if ( rollbackOnly || jdbcResourceTransaction.getStatus() == TransactionStatus.ACTIVE ) {
-					jdbcResourceTransaction.rollback();
-					afterCompletionCallback( false );
-				}
-			}
-			finally {
-				rollbackOnly = false;
+			if ( isActive() ) {
+				jdbcResourceTransaction.rollback();
+				afterCompletionCallback( false );
 			}
 		}
 
 		@Override
 		public TransactionStatus getStatus() {
-			final var status = jdbcResourceTransaction.getStatus();
-			return rollbackOnly && status == TransactionStatus.ACTIVE
-					? TransactionStatus.MARKED_ROLLBACK
-					: status;
+			return jdbcResourceTransaction.getStatus();
 		}
 
 		@Override
@@ -303,7 +298,7 @@ public void markRollbackOnly() {
 					JDBC_LOGGER.jdbcTransactionMarkedForRollbackOnly(
 							new Exception( "exception just for purpose of providing stack trace" ) );
 				}
-				rollbackOnly = true;
+				jdbcResourceTransaction.markRollbackOnly();
 			}
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransaction.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransaction.java
index b88e8e2e6de3..411f2794f885 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransaction.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/spi/JdbcResourceTransaction.java
@@ -28,4 +28,9 @@ public interface JdbcResourceTransaction {
 	void rollback();
 
 	TransactionStatus getStatus();
+
+	/**
+	 * Mark this transaction for rollback.
+	 */
+	void markRollbackOnly();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java
index 554dd0d3efa9..a48f1485b4a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/JtaLogging.java
@@ -17,6 +17,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.TRACE;
 import static org.jboss.logging.Logger.Level.WARN;
@@ -37,7 +38,7 @@
 public interface JtaLogging extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".jta";
 
-	JtaLogging JTA_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JtaLogging.class, LOGGER_NAME );
+	JtaLogging JTA_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), JtaLogging.class, LOGGER_NAME, Locale.ROOT );
 
 	int NAMESPACE = 90007000;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationLogging.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationLogging.java
index b3d0a18a7515..0c8363fea921 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/internal/SynchronizationLogging.java
@@ -17,6 +17,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.ERROR;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -36,7 +37,7 @@ public interface SynchronizationLogging extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".synchronization";
 
 	SynchronizationLogging SYNCHRONIZATION_LOGGER = Logger.getMessageLogger(
-			MethodHandles.lookup(), SynchronizationLogging.class, LOGGER_NAME
+			MethodHandles.lookup(), SynchronizationLogging.class, LOGGER_NAME, Locale.ROOT
 	);
 
 	int NAMESPACE = 90008000;
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/package-info.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/package-info.java
index 187c8af04987..d86ec555d2b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/package-info.java
@@ -13,7 +13,7 @@
  * which is a {@link org.hibernate.service.Service} and available via the
  * {@link org.hibernate.boot.registry.StandardServiceRegistry}.
  *
- * <h3>Resource-local transaction</h3>
+ * <h2>Resource-local transaction</h2>
  *
  * A <em>resource-local</em> transaction is exposed to the application as an
  * instance of {@link org.hibernate.Transaction}, allowing full control over the
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java
index d99cd4a68bde..0b5ddc0c0095 100644
--- a/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/resource/transaction/spi/TransactionCoordinator.java
@@ -131,8 +131,9 @@ interface TransactionDriver {
 		void markRollbackOnly();
 
 		default boolean isActive() {
-			final TransactionStatus status = getStatus();
-			return status == ACTIVE || status == MARKED_ROLLBACK;
+			final var status = getStatus();
+			return status == ACTIVE
+				|| status == MARKED_ROLLBACK;
 		}
 
 		default boolean isActiveAndNoMarkedForRollback() {
diff --git a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java
index 520b0a26575e..518226e0e6b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java
@@ -72,6 +72,7 @@ protected void executeStatement() {
 			currentReturnState = buildCurrentReturnState( isResultSet );
 		}
 		catch (SQLException e) {
+			session.getJdbcCoordinator().afterFailedStatementExecution( e );
 			throw convert( e, "Error calling CallableStatement.getMoreResults" );
 		}
 		finally {
diff --git a/hibernate-core/src/main/java/org/hibernate/result/package-info.java b/hibernate-core/src/main/java/org/hibernate/result/package-info.java
index 90ce2bfdb695..39f522a0ffe9 100644
--- a/hibernate-core/src/main/java/org/hibernate/result/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/result/package-info.java
@@ -14,8 +14,7 @@
  *     which might be either a {@link org.hibernate.result.ResultSetOutput} or
  *     a {@link org.hibernate.result.UpdateCountOutput}.
  * </ul>
- * <p>
- * <pre>
+ * <pre>{@code
  *     Outputs outputs = ...;
  *     while ( outputs.goToNext() ) {
  *         final Output output = outputs.getCurrent();
@@ -26,6 +25,6 @@
  *             handleUpdateCountOutput( (UpdateCountOutput) output );
  *         }
  *     }
- * </pre>
+ * }</pre>
  */
 package org.hibernate.result;
diff --git a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
index c8bcee23f0fc..a1678cdb7ee7 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
@@ -37,6 +37,7 @@
 import org.hibernate.resource.beans.spi.ManagedBeanRegistryInitiator;
 import org.hibernate.resource.transaction.internal.TransactionCoordinatorBuilderInitiator;
 import org.hibernate.service.internal.SessionFactoryServiceRegistryFactoryInitiator;
+import org.hibernate.service.internal.TransactionIdentifierServiceInitiator;
 import org.hibernate.sql.ast.internal.ParameterMarkerStrategyInitiator;
 import org.hibernate.sql.results.jdbc.internal.JdbcValuesMappingProducerProviderInitiator;
 import org.hibernate.tool.schema.internal.SchemaManagementToolInitiator;
@@ -123,6 +124,9 @@ private static List<StandardServiceInitiator<?>> buildStandardServiceInitiatorLi
 		// JdbcServices
 		serviceInitiators.add( JdbcServicesInitiator.INSTANCE );
 
+		// TransactionIdentifierService
+		serviceInitiators.add( TransactionIdentifierServiceInitiator.INSTANCE );
+
 		// RefCursorSupport
 		serviceInitiators.add( RefCursorSupportInitiator.INSTANCE );
 
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
index 8270d686354e..e42bad5e4763 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
@@ -411,11 +411,11 @@ public synchronized void deRegisterChild(ServiceRegistryImplementor child) {
 		childRegistries.remove( child );
 		if ( childRegistries.isEmpty() ) {
 			if ( autoCloseRegistry ) {
-				SERVICE_LOGGER.trace( "Automatically destroying ServiceRegistry after deregistration of every child ServiceRegistry" );
+				SERVICE_LOGGER.destroyingServiceRegistry();
 				destroy();
 			}
 			else {
-				SERVICE_LOGGER.trace( "Skipping destroying ServiceRegistry after deregistration of every child ServiceRegistry" );
+				SERVICE_LOGGER.skippingDestroyingServiceRegistry();
 			}
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceLogger.java b/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceLogger.java
index be65f14508eb..853d57018b23 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/ServiceLogger.java
@@ -17,6 +17,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 import java.util.ServiceConfigurationError;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
@@ -39,7 +40,7 @@ public interface ServiceLogger extends BasicLogger {
 	String NAME = SubSystemLogging.BASE + ".service";
 
 	Logger LOGGER = Logger.getLogger( NAME );
-	ServiceLogger SERVICE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ServiceLogger.class, NAME );
+	ServiceLogger SERVICE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ServiceLogger.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = TRACE)
 	@Message(id = 10500, value = "Initializing service: %s")
@@ -77,4 +78,17 @@ public interface ServiceLogger extends BasicLogger {
 	@LogMessage(level = DEBUG)
 	@Message(id = 10455, value = "Adding integrator: %s")
 	void addingIntegrator(String name);
+
+
+	@LogMessage(level = DEBUG)
+	@Message( id = 10456, value = "Overriding existing service binding: %s" )
+	void overridingExistingBinding(String name);
+
+	@LogMessage(level = TRACE)
+	@Message(id = 10457, value = "Automatically destroying ServiceRegistry after deregistration of every child ServiceRegistry")
+	void destroyingServiceRegistry();
+
+	@LogMessage(level = TRACE)
+	@Message(id = 10458, value = "Skipping destroying ServiceRegistry after deregistration of every child ServiceRegistry")
+	void skippingDestroyingServiceRegistry();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/TransactionIdentifierServiceInitiator.java b/hibernate-core/src/main/java/org/hibernate/service/internal/TransactionIdentifierServiceInitiator.java
new file mode 100644
index 000000000000..fecade26c60a
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/service/internal/TransactionIdentifierServiceInitiator.java
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.service.internal;
+
+import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
+import org.hibernate.temporal.internal.TransactionIdentifierServiceImpl;
+import org.hibernate.temporal.spi.TransactionIdentifierService;
+
+import java.util.Map;
+
+/**
+ * A service that acts as a source of transaction identifiers.
+ *
+ * @author Gavin King
+ */
+public class TransactionIdentifierServiceInitiator implements StandardServiceInitiator<TransactionIdentifierService> {
+	public static final TransactionIdentifierServiceInitiator INSTANCE = new TransactionIdentifierServiceInitiator();
+
+	@Override
+	public Class<TransactionIdentifierService> getServiceInitiated() {
+		return TransactionIdentifierService.class;
+	}
+
+	@Override
+	public TransactionIdentifierService initiateService(Map<String, Object> configurationValues, ServiceRegistryImplementor registry) {
+		return new TransactionIdentifierServiceImpl(registry);
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceBinding.java b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceBinding.java
index 5396a3d1cec7..2a5bc94f9db4 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceBinding.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/spi/ServiceBinding.java
@@ -6,17 +6,17 @@
 
 import org.hibernate.service.Service;
 
-import org.jboss.logging.Logger;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import static org.hibernate.service.internal.ServiceLogger.SERVICE_LOGGER;
+
 /**
  * Models a binding for a particular service.
  *
  * @author Steve Ebersole
  */
 public final class ServiceBinding<R extends Service> {
-	private static final Logger LOG = Logger.getLogger( ServiceBinding.class );
 
 	public interface ServiceLifecycleOwner {
 		<R extends Service> R initiateService(ServiceInitiator<R> serviceInitiator);
@@ -63,10 +63,8 @@ public R getService() {
 	}
 
 	public void setService(R service) {
-		if ( this.service != null ) {
-			if ( LOG.isDebugEnabled() ) {
-				LOG.debug( "Overriding existing service binding [" + serviceRole.getName() + "]" );
-			}
+		if ( this.service != null && SERVICE_LOGGER.isDebugEnabled() ) {
+			SERVICE_LOGGER.overridingExistingBinding( serviceRole.getName() );
 		}
 		this.service = service;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java b/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java
index b8064539baf4..54c42ea0965a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java
@@ -121,7 +121,7 @@ public SimpleSelect addRestriction(String columnName) {
 
 	/**
 	 * Appends a restriction based on the comparison between {@code lhs} and {@code rhs}.
-	 * <p/>
+	 * <p>
 	 * The {@code rhs} is checked for parameter marker and processed via {@link ParameterMarkerStrategy}
 	 * if needed.
 	 */
@@ -215,6 +215,9 @@ private void applySelectClause(StringBuilder buf) {
 
 	private void applyFromClause(StringBuilder buf) {
 		buf.append( " from " ).append( dialect.appendLockHint( lockOptions, tableName ) );
+		if ( tableName.charAt( 0 ) == '(' ) {
+			buf.append( " r" );
+		}
 	}
 
 	private void applyWhereClause(StringBuilder buf) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/Template.java b/hibernate-core/src/main/java/org/hibernate/sql/Template.java
index c996addf10af..627b84ca5968 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/Template.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/Template.java
@@ -9,7 +9,7 @@
 import java.util.Locale;
 import java.util.Set;
 import java.util.StringTokenizer;
-import java.util.function.Function;
+import java.util.function.Predicate;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.type.spi.TypeConfiguration;
@@ -156,10 +156,18 @@ public static String renderWhereStringTemplate(
 		//      a parser for SQL, no matter how "special" your case is. What I mean by this is: don't write code which
 		//      attempts to recognize the grammar of SQL, not even little bits of SQL. Previous "enhancements" to this
 		//      function did not respect this concept and resulted in code which was fragile and unmaintainable. If
-		//      lookahead is truly necessary, use the lookahead() function provided below.
+		//      lookahead is truly necessary, use lookPastBlankTokens() with the pre-tokenized list.
 
 		final String symbols = PUNCTUATION + WHITESPACE + dialect.openQuote() + dialect.closeQuote();
-		final var tokens = new StringTokenizer( sql, symbols, true );
+
+		// Tokenize the entire SQL string once into a list so that lookahead is O(1) indexed
+		// access rather than the O(N) re-scan that StringTokenizer.countTokens() performs.
+		final var raw = new StringTokenizer( sql, symbols, true );
+		final var tokens = new ArrayList<String>();
+		while ( raw.hasMoreTokens() ) {
+			tokens.add( raw.nextToken() );
+		}
+		final int tokenCount = tokens.size();
 		final var result = new StringBuilder();
 
 		boolean quoted = false;
@@ -174,16 +182,12 @@ public static String renderWhereStringTemplate(
 		int inCast = -1;
 		int nestingLevel = 0;
 
-		boolean hasMore = tokens.hasMoreTokens();
-		String nextToken = hasMore ? tokens.nextToken() : null;
-		String token = null;
-		String previousToken;
-		while ( hasMore ) {
-			previousToken = token;
-			token = nextToken;
+		String previousToken = null;
+		for ( int i = 0; i < tokenCount; i++ ) {
+			String token = tokens.get(i);
 			String lcToken = token.toLowerCase(Locale.ROOT);
-			hasMore = tokens.hasMoreTokens();
-			nextToken = hasMore ? tokens.nextToken() : null;
+			final int nextIndex = i + 1;
+			final String nextToken = nextIndex < tokenCount ? tokens.get(nextIndex) : null;
 
 			boolean isQuoteCharacter = false;
 
@@ -296,14 +300,14 @@ else if ( isFetch( dialect, lcToken ) ) {
 			else if ( wasAfterFetch && FETCH_BIGRAMS.contains( lcToken ) ) {
 				processedToken = token;
 			}
-			else if ( isCurrent( lcToken, nextToken, sql, symbols, tokens ) ) {
+			else if ( isCurrent( lcToken, nextToken, tokens, nextIndex ) ) {
 				processedToken = token;
 				afterCurrent = true;
 			}
 			else if ( isBoolean( lcToken ) ) {
 				processedToken = dialect.toBooleanValueString( parseBoolean( token ) );
 			}
-			else if ( isFunctionCall( nextToken, sql, symbols, tokens ) ) {
+			else if ( isFunctionCall( nextToken, tokens, nextIndex ) ) {
 				if ( FUNCTION_WITH_FROM_KEYWORDS.contains( lcToken ) ) {
 					inExtractOrTrim = nestingLevel;
 				}
@@ -312,9 +316,8 @@ else if ( isFunctionCall( nextToken, sql, symbols, tokens ) ) {
 				}
 				processedToken = token;
 			}
-			else if ( isAliasableIdentifier( token, lcToken, nextToken,
-							sql, symbols, tokens, wasAfterCurrent,
-							dialect, typeConfiguration ) ) {
+			else if ( isAliasableIdentifier( token, lcToken, nextToken, tokens, nextIndex,
+							wasAfterCurrent, dialect, typeConfiguration ) ) {
 				processedToken = alias + '.' +  dialect.quote(token);
 			}
 			else {
@@ -329,6 +332,8 @@ else if ( isAliasableIdentifier( token, lcToken, nextToken,
 					&& !BEFORE_TABLE_KEYWORDS.contains( lcToken ) ) {
 				inFromClause = false;
 			}
+
+			previousToken = token;
 		}
 
 		return result.toString();
@@ -336,33 +341,32 @@ else if ( isAliasableIdentifier( token, lcToken, nextToken,
 
 	private static boolean isAliasableIdentifier(
 			String token, String lcToken, String nextToken,
-			String sql, String symbols, StringTokenizer tokens,
+			List<String> tokens, int nextIndex,
 			boolean wasAfterCurrent,
 			Dialect dialect, TypeConfiguration typeConfiguration) {
 		return isUnqualifiedIdentifier( token )
 			&& !isKeyword( lcToken, wasAfterCurrent, dialect, typeConfiguration )
-			&& !isLiteral( lcToken, nextToken, sql, symbols, tokens );
+			&& !isLiteral( lcToken, nextToken, tokens, nextIndex );
 	}
 
-	private static boolean isFunctionCall(
-			String nextToken,
-			String sql, String symbols, StringTokenizer tokens) {
+	private static boolean isFunctionCall(String nextToken, List<String> tokens, int nextIndex) {
 		if ( nextToken == null ) {
 			return false;
 		}
 		else {
 			return nextToken.isBlank()
-					? lookPastBlankTokens( sql, symbols, tokens, 1, "("::equals )
+					? lookPastBlankTokens( tokens, nextIndex, "("::equals )
 					: "(".equals( nextToken );
 		}
 	}
 
 	private static boolean isCurrent(
 			String lcToken, String nextToken,
-			String sql, String symbols, StringTokenizer tokens) {
+			List<String> tokens, int nextIndex) {
 		return "current".equals( lcToken )
+			&& nextToken != null
 			&& nextToken.isBlank()
-			&& lookPastBlankTokens( sql, symbols, tokens, 1, CURRENT_BIGRAMS::contains );
+			&& lookPastBlankTokens( tokens, nextIndex, CURRENT_BIGRAMS::contains );
 	}
 
 	private static boolean isFetch(Dialect dialect, String lcToken) {
@@ -376,7 +380,7 @@ private static boolean endsWithDot(String token) {
 
 	private static boolean isLiteral(
 			String lcToken, String next,
-			String sqlWhereString, String symbols, StringTokenizer tokens) {
+			List<String> tokens, int nextIndex) {
 		if ( next == null ) {
 			return false;
 		}
@@ -384,7 +388,7 @@ else if ( LITERAL_PREFIXES.contains( lcToken ) ) {
 			if ( next.isBlank() ) {
 				// we need to look ahead in the token stream
 				// to find the first non-blank token
-				return lookPastBlankTokens( sqlWhereString, symbols, tokens, 1,
+				return lookPastBlankTokens( tokens, nextIndex,
 						nextToken -> "'".equals(nextToken)
 								|| lcToken.equals("time") && "with".equals(nextToken)
 								|| lcToken.equals("timestamp") && "with".equals(nextToken)
@@ -399,40 +403,22 @@ else if ( LITERAL_PREFIXES.contains( lcToken ) ) {
 		}
 	}
 
-	private static boolean lookPastBlankTokens(
-			String sqlWhereString, String symbols, StringTokenizer tokens,
-			@SuppressWarnings("SameParameterValue") int skip,
-			Function<String, Boolean> check) {
-		final var lookahead = lookahead( sqlWhereString, symbols, tokens, skip );
-		if ( lookahead.hasMoreTokens() ) {
-			String nextToken;
-			do {
-				nextToken = lookahead.nextToken().toLowerCase(Locale.ROOT);
-			}
-			while ( nextToken.isBlank() && lookahead.hasMoreTokens() );
-			return check.apply( nextToken );
-		}
-		else {
-			return false;
-		}
-	}
-
 	/**
-	 * Clone the given token stream, returning a token stream which begins
-	 * from the next token.
+	 * Scan forward from {@code startIndex} in the pre-tokenized list, skipping blank tokens,
+	 * and apply {@code check} to the first non-blank token found. Returns {@code false} if the
+	 * end of the list is reached before a non-blank token is found.
 	 *
-	 * @param sql the full SQL we are scanning
-	 * @param symbols the delimiter symbols
-	 * @param tokens the current token stream
-	 * @param skip the number of tokens to skip
-	 * @return a cloned token stream
+	 * @param tokens the full pre-tokenized list
+	 * @param startIndex the index to begin scanning from (inclusive)
+	 * @param check the predicate to apply to the first non-blank token
 	 */
-	private static StringTokenizer lookahead(String sql, String symbols, StringTokenizer tokens, int skip) {
-		final var lookahead = new StringTokenizer( sql, symbols, true );
-		while ( lookahead.countTokens() > tokens.countTokens() + skip ) {
-			lookahead.nextToken();
+	private static boolean lookPastBlankTokens(
+			List<String> tokens, int startIndex, Predicate<String> check) {
+		int i = startIndex;
+		while ( i < tokens.size() && tokens.get(i).isBlank() ) {
+			i++;
 		}
-		return lookahead;
+		return i < tokens.size() && check.test( tokens.get(i).toLowerCase(Locale.ROOT) );
 	}
 
 	public static List<String> collectColumnNames(String sql, Dialect dialect, TypeConfiguration typeConfiguration) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java
index 8727488b9187..12604f6f74ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslatorFactory.java
@@ -8,7 +8,7 @@
 import org.hibernate.sql.ast.tree.MutationStatement;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.model.ast.TableMutation;
 import org.hibernate.sql.model.jdbc.JdbcMutationOperation;
 
@@ -21,7 +21,7 @@ public interface SqlAstTranslatorFactory {
 	/**
 	 * Builds a single-use select translator
 	 */
-	SqlAstTranslator<JdbcOperationQuerySelect> buildSelectTranslator(SessionFactoryImplementor sessionFactory, SelectStatement statement);
+	SqlAstTranslator<JdbcSelect> buildSelectTranslator(SessionFactoryImplementor sessionFactory, SelectStatement statement);
 
 	/**
 	 * Builds a single-use mutation translator
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/NonLockingClauseStrategy.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/NonLockingClauseStrategy.java
index 49c10c9f573c..a66a5aa2de90 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/NonLockingClauseStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/NonLockingClauseStrategy.java
@@ -40,6 +40,11 @@ public boolean containsOuterJoins() {
 		return false;
 	}
 
+	@Override
+	public boolean containsJoins() {
+		return false;
+	}
+
 	@Override
 	public void render(SqlAppender sqlAppender) {
 		// nothing to do
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/StandardLockingClauseStrategy.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/StandardLockingClauseStrategy.java
index 4f4425756190..7e2d37b0546a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/StandardLockingClauseStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/StandardLockingClauseStrategy.java
@@ -47,6 +47,7 @@ public class StandardLockingClauseStrategy extends AbstractLockingClauseStrategy
 	private final Timeout timeout;
 
 	private boolean queryHasOuterJoins = false;
+	private boolean queryHasJoins = false;
 
 	private Set<TableGroup> rootsToLock;
 	private Set<TableGroupJoin> joinsToLock;
@@ -73,6 +74,7 @@ public boolean registerRoot(TableGroup root) {
 			if ( CollectionHelper.isNotEmpty( root.getTableReferenceJoins() ) ) {
 				// joined inheritance and/or secondary tables - inherently has outer joins
 				queryHasOuterJoins = true;
+				queryHasJoins = true;
 			}
 		}
 
@@ -91,6 +93,7 @@ protected void trackRoot(TableGroup root) {
 	@Override
 	public boolean registerJoin(TableGroupJoin join) {
 		checkForOuterJoins( join );
+		queryHasJoins = true;
 		return super.registerJoin( join );
 	}
 
@@ -133,6 +136,11 @@ public boolean containsOuterJoins() {
 		return queryHasOuterJoins;
 	}
 
+	@Override
+	public boolean containsJoins() {
+		return queryHasJoins;
+	}
+
 	@Override
 	public void render(SqlAppender sqlAppender) {
 		renderLockFragment( sqlAppender );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TransactSQLLockingClauseStrategy.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TransactSQLLockingClauseStrategy.java
index ef9e626f03f4..ac39a220bc0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TransactSQLLockingClauseStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/internal/TransactSQLLockingClauseStrategy.java
@@ -25,6 +25,12 @@ public boolean containsOuterJoins() {
 		return false;
 	}
 
+	@Override
+	public boolean containsJoins() {
+		// not used for T-SQL dialects
+		return false;
+	}
+
 	@Override
 	public void render(SqlAppender sqlAppender) {
 		// not used for T-SQL dialects
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
index 2fe0d6e35eef..95b22419b59e 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
@@ -11,9 +11,11 @@
 import org.hibernate.LockOptions;
 import org.hibernate.Locking;
 import org.hibernate.Timeouts;
+import org.hibernate.temporal.TemporalTableStrategy;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.dialect.SelectItemReferenceStrategy;
+import org.hibernate.dialect.function.array.DdlTypeHelper;
 import org.hibernate.dialect.lock.spi.LockingSupport;
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
@@ -29,7 +31,8 @@
 import org.hibernate.metamodel.mapping.CollectionPart;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
-import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
+import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.metamodel.mapping.EntityRowIdMapping;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.JdbcMappingContainer;
 import org.hibernate.metamodel.mapping.MappingModelExpressible;
@@ -184,10 +187,13 @@
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.model.MutationOperation;
+import org.hibernate.sql.model.MutationTarget;
+import org.hibernate.sql.model.ast.ColumnValueBinding;
 import org.hibernate.sql.model.ast.ColumnValueParameter;
 import org.hibernate.sql.model.ast.ColumnWriteFragment;
 import org.hibernate.sql.model.ast.RestrictedTableMutation;
 import org.hibernate.sql.model.ast.TableMutation;
+import org.hibernate.sql.model.internal.OptionalTableInsert;
 import org.hibernate.sql.model.internal.OptionalTableUpdate;
 import org.hibernate.sql.model.internal.TableDeleteCustomSql;
 import org.hibernate.sql.model.internal.TableDeleteStandard;
@@ -205,9 +211,6 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
-import org.hibernate.type.descriptor.sql.DdlType;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
-import org.hibernate.type.spi.TypeConfiguration;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -962,6 +965,16 @@ protected void prepareLimitOffsetParameters() {
 		}
 	}
 
+	protected void renderColumnWrite(ColumnValueBinding selectionBinding) {
+		final ColumnWriteFragment valueExpression = selectionBinding.getValueExpression();
+		if ( valueExpression.getExpressionType().getJdbcType().isWriteExpressionTyped( getDialect() ) ) {
+			valueExpression.accept( this );
+		}
+		else {
+			renderCasted( valueExpression );
+		}
+	}
+
 	private static class OffsetJdbcParameter extends AbstractJdbcParameter {
 
 		public OffsetJdbcParameter(BasicType<Integer> type) {
@@ -1093,10 +1106,16 @@ protected void renderDeleteClause(DeleteStatement statement) {
 	}
 
 	protected void visitUpdateStatementOnly(UpdateStatement statement) {
+		final boolean supportsFromClause = dialect.supportsFromClauseInUpdate() || !hasNonTrivialFromClause( statement.getFromClause() );
 		renderUpdateClause( statement );
-		renderSetClause( statement.getAssignments() );
-		renderFromClauseAfterUpdateSet( statement );
-		if ( dialect.supportsFromClauseInUpdate() || !hasNonTrivialFromClause( statement.getFromClause() ) ) {
+		if ( supportsFromClause ) {
+			renderSetClause( statement.getAssignments() );
+			renderFromClauseAfterUpdateSet( statement );
+		}
+		else {
+			renderSetClauseEmulateScalarSubqueries( statement );
+		}
+		if ( supportsFromClause ) {
 			visitWhereClause( statement.getRestriction() );
 		}
 		else {
@@ -1105,6 +1124,66 @@ protected void visitUpdateStatementOnly(UpdateStatement statement) {
 		visitReturningColumns( statement.getReturningColumns() );
 	}
 
+	protected void renderSetClauseEmulateScalarSubqueries(UpdateStatement statement) {
+		appendSql(" set");
+
+		boolean first = true;
+		for (Assignment assignment : statement.getAssignments()) {
+			if (!first) {
+				appendSql(',');
+			}
+			first = false;
+			appendSql(' ');
+
+			final List<ColumnReference> columnReferences = assignment.getAssignable().getColumnReferences();
+			for (int i = 0; i < columnReferences.size(); i++) {
+				if (i > 0) {
+					appendSql(',');
+				}
+				columnReferences.get(i).appendColumnForWrite(this, null);
+			}
+
+			appendSql("=(");
+			createScalarSubquery(statement, assignment).accept(this);
+			appendSql(")");
+		}
+	}
+
+	private QuerySpec createScalarSubquery(UpdateStatement statement, Assignment assignment) {
+		final QuerySpec inlineView = new QuerySpec(false);
+		final SelectClause selectClause = inlineView.getSelectClause();
+
+		final Expression assignedValue = assignment.getAssignedValue();
+		selectClause.addSqlSelection(new SqlSelectionImpl(assignedValue));
+
+		for (TableGroup root : statement.getFromClause().getRoots()) {
+			if (statement.getTargetTable() == root.getPrimaryTableReference()) {
+				final TableGroup dmlTargetTableGroup = new StandardTableGroup(
+						true,
+						new NavigablePath("dual"),
+						null,
+						null,
+						new NamedTableReference(
+								getSessionFactory().getJdbcServices().getDialect().getDual(), "d_"),
+						null,
+						getSessionFactory());
+				inlineView.getFromClause().addRoot(dmlTargetTableGroup);
+				dmlTargetTableGroup.getTableReferenceJoins().addAll(root.getTableReferenceJoins());
+				for (TableGroupJoin tableGroupJoin : root.getTableGroupJoins()) {
+					dmlTargetTableGroup.addTableGroupJoin(tableGroupJoin);
+				}
+				for (TableGroupJoin tableGroupJoin : root.getNestedTableGroupJoins()) {
+					dmlTargetTableGroup.addNestedTableGroupJoin(tableGroupJoin);
+				}
+			}
+			else {
+				inlineView.getFromClause().addRoot(root);
+			}
+		}
+		inlineView.applyPredicate(statement.getRestriction());
+		return inlineView;
+	}
+
 	protected void renderUpdateClause(UpdateStatement updateStatement) {
 		appendSql( "update " );
 		final Stack<Clause> clauseStack = getClauseStack();
@@ -1175,6 +1254,7 @@ protected Predicate determineWhereClauseRestrictionWithJoinEmulation(
 			}
 			querySpec.applyPredicate(
 					createRowMatchingPredicate(
+							statement.getMutationTarget(),
 							dmlTargetTableGroup,
 							dmlTargetAlias,
 							dmlTargetTableGroup.getPrimaryTableReference().getIdentificationVariable()
@@ -1295,6 +1375,7 @@ protected void visitSetAssignmentEmulateJoin(Assignment assignment, UpdateStatem
 		querySpec.getSelectClause().addSqlSelection( new SqlSelectionImpl( valueExpression ) );
 		querySpec.applyPredicate(
 				createRowMatchingPredicate(
+						statement.getMutationTarget(),
 						dmlTargetTableGroup,
 						"dml_target_",
 						dmlTargetTableGroup.getPrimaryTableReference().getIdentificationVariable()
@@ -1318,7 +1399,7 @@ else if ( expressionType instanceof BasicValuedMapping basicValuedMapping ) {
 
 	protected void visitInsertStatementOnly(InsertSelectStatement statement) {
 		clauseStack.push( Clause.INSERT );
-		appendSql( "insert into " );
+		renderInsertCommand( statement );
 		renderDmlTargetTableExpression( statement.getTargetTable() );
 
 		appendSql( OPEN_PARENTHESIS );
@@ -1344,6 +1425,10 @@ protected void visitInsertStatementOnly(InsertSelectStatement statement) {
 		visitReturningColumns( statement.getReturningColumns() );
 	}
 
+	protected void renderInsertCommand(InsertSelectStatement statement) {
+		appendSql( "insert into " );
+	}
+
 	protected boolean isIntegerDivisionEmulationRequired(BinaryArithmeticExpression expression) {
 		return expression.getOperator() == DIVIDE_PORTABLE
 			&& jdbcType( expression.getLeftHandOperand() ).isInteger()
@@ -1463,11 +1548,19 @@ protected void visitUpdateStatementEmulateMerge(UpdateStatement statement) {
 		visitQueryPartTableReference( inlineView );
 		clauseStack.pop();
 		appendSql( " on " );
+		final TableGroup dmlTargetTableGroup = statement.getFromClause().getRoots().get( 0 );
+		assert dmlTargetTableGroup.getPrimaryTableReference() == statement.getTargetTable();
+		final EntityMappingType entityMappingType = dmlTargetTableGroup.getModelPart().asEntityMappingType();
+		final EntityRowIdMapping rowIdMapping = entityMappingType == null ? null : entityMappingType.getRowIdMapping();
 		final String rowIdExpression = dialect.rowId( null );
-		if ( rowIdExpression == null ) {
-			final TableGroup dmlTargetTableGroup = statement.getFromClause().getRoots().get( 0 );
-			assert dmlTargetTableGroup.getPrimaryTableReference() == statement.getTargetTable();
-			createRowMatchingPredicate( dmlTargetTableGroup, "t", "s" ).accept( this );
+		if ( rowIdMapping != null ) {
+			appendSql( "t." );
+			appendSql( rowIdMapping.getSelectionExpression() );
+			appendSql( "=s.c" );
+			appendSql( inlineView.getColumnNames().size() - 1 );
+		}
+		else if ( rowIdExpression == null ) {
+			createRowMatchingPredicate( statement.getMutationTarget(), dmlTargetTableGroup, "t", "s" ).accept( this );
 		}
 		else {
 			appendSql( "t." );
@@ -1516,15 +1609,21 @@ else if ( assignedValue instanceof SqlTuple sqlTuple ) {
 			}
 		}
 		if ( !correlated ) {
+			final TableGroup dmlTargetTableGroup = statement.getFromClause().getRoots().get( 0 );
+			assert dmlTargetTableGroup.getPrimaryTableReference() == statement.getTargetTable();
+			final EntityMappingType entityMappingType = dmlTargetTableGroup.getModelPart().asEntityMappingType();
+			final EntityRowIdMapping rowIdMapping =
+					entityMappingType == null ? null : entityMappingType.getRowIdMapping();
 			final String rowIdExpression = dialect.rowId( null );
-			if ( rowIdExpression == null ) {
-				final TableGroup dmlTargetTableGroup = statement.getFromClause().getRoots().get( 0 );
-				assert dmlTargetTableGroup.getPrimaryTableReference() == statement.getTargetTable();
-				final EntityIdentifierMapping identifierMapping = dmlTargetTableGroup.getModelPart()
-						.asEntityMappingType()
-						.getIdentifierMapping();
-				identifierMapping.forEachSelectable(
-						0,
+			if ( rowIdMapping != null ) {
+				selectClause.addSqlSelection( new SqlSelectionImpl(
+						new ColumnReference( statement.getTargetTable(), rowIdMapping )
+				) );
+				columnNames.add( "c" + columnNames.size() );
+			}
+			else if ( rowIdExpression == null ) {
+				final var identifierTableMapping = statement.getMutationTarget().getIdentifierTableMapping();
+				identifierTableMapping.getKeyDetails().forEachSelectable( 0,
 						(selectionIndex, selectableMapping) -> {
 							selectClause.addSqlSelection( new SqlSelectionImpl(
 									new ColumnReference( statement.getTargetTable(), selectableMapping )
@@ -2232,17 +2331,15 @@ else if ( renderRecursiveKeyword ) {
 
 	private void visitCteStatement(CteStatement cte) {
 		appendSql( cte.getCteTable().getTableExpression() );
-
-		appendSql( " (" );
-
-		renderCteColumns( cte );
-
-		appendSql( ") as " );
-
+		if ( dialect.supportsCteHeaderColumnList() ) {
+			appendSql( " (" );
+			renderCteColumns( cte );
+			appendSql( ")" );
+		}
+		appendSql( " as " );
 		if ( cte.getMaterialization() != CteMaterialization.UNDEFINED ) {
 			renderMaterializationHint( cte.getMaterialization() );
 		}
-
 		final boolean needsParenthesis = !( cte.getCteDefinition() instanceof SelectStatement )
 				|| ( (SelectStatement) cte.getCteDefinition() ).getQueryPart().isRoot();
 		if ( needsParenthesis ) {
@@ -2252,7 +2349,6 @@ private void visitCteStatement(CteStatement cte) {
 		if ( needsParenthesis ) {
 			appendSql( CLOSE_PARENTHESIS );
 		}
-
 		renderSearchClause( cte );
 		renderCycleClause( cte );
 	}
@@ -2275,52 +2371,51 @@ private boolean isRecursive(Collection<CteStatement> cteStatements) {
 		return false;
 	}
 
-	protected void renderCteColumns(CteStatement cte) {
-		String separator = "";
+	private List<String> determineCteColumnNames(CteStatement cte) {
+		final List<String> columnNames = new ArrayList<>();
 		if ( cte.getCteTable().getCteColumns() == null ) {
-			final List<String> columnExpressions = new ArrayList<>();
 			cte.getCteTable().getTableGroupProducer().visitSubParts(
 					modelPart -> modelPart.forEachSelectable(
 							0,
-							(index, mapping) -> columnExpressions.add( mapping.getSelectionExpression() )
+							(index, mapping) -> columnNames.add( mapping.getSelectionExpression() )
 					),
 					null
 			);
-			for ( String columnExpression : columnExpressions ) {
-				appendSql( separator );
-				appendSql( columnExpression );
-				separator = COMMA_SEPARATOR;
-			}
 		}
 		else {
 			for ( CteColumn cteColumn : cte.getCteTable().getCteColumns() ) {
-				appendSql( separator );
-				appendSql( cteColumn.getColumnExpression() );
-				separator = COMMA_SEPARATOR;
+				columnNames.add( cteColumn.getColumnExpression() );
 			}
 		}
 		if ( cte.isRecursive() ) {
-			if ( !dialect.supportsRecursiveSearchClause() ) {
-				if ( cte.getSearchColumn() != null ) {
-					appendSql( COMMA_SEPARATOR );
-					if ( cte.getSearchClauseKind() == CteSearchClauseKind.BREADTH_FIRST ) {
-						appendSql( determineDepthColumnName( cte ) );
-						appendSql( COMMA_SEPARATOR );
-					}
-					appendSql( cte.getSearchColumn().getColumnExpression() );
+			if ( !dialect.supportsRecursiveSearchClause() && cte.getSearchColumn() != null ) {
+				if ( cte.getSearchClauseKind() == CteSearchClauseKind.BREADTH_FIRST ) {
+					columnNames.add( determineDepthColumnName( cte ) );
 				}
+				columnNames.add( cte.getSearchColumn().getColumnExpression() );
 			}
-			if ( !dialect.supportsRecursiveCycleClause() ) {
-				if ( cte.getCycleMarkColumn() != null ) {
-					appendSql( COMMA_SEPARATOR );
-					appendSql( cte.getCycleMarkColumn().getColumnExpression() );
-				}
+			if ( !dialect.supportsRecursiveCycleClause() && cte.getCycleMarkColumn() != null ) {
+				columnNames.add( cte.getCycleMarkColumn().getColumnExpression() );
+			}
+			if ( (cte.getCycleMarkColumn() != null && !dialect.supportsRecursiveCycleClause())
+				|| (cte.getCyclePathColumn() != null && !dialect.supportsRecursiveCycleUsingClause()) ) {
+				columnNames.add( determineCyclePathColumnName( cte ) );
 			}
-			if ( cte.getCycleMarkColumn() != null && !dialect.supportsRecursiveCycleClause()
-					|| cte.getCyclePathColumn() != null && !dialect.supportsRecursiveCycleUsingClause() ) {
+		}
+		return columnNames;
+	}
+
+	protected void renderCteColumns(CteStatement cte) {
+		final List<String> columnNames = determineCteColumnNames( cte );
+		boolean first = true;
+		for ( String columnName : columnNames ) {
+			if ( first ) {
+				first = false;
+			}
+			else {
 				appendSql( COMMA_SEPARATOR );
-				appendSql( determineCyclePathColumnName( cte ) );
 			}
+			appendSql( columnName );
 		}
 	}
 
@@ -2393,9 +2488,21 @@ protected void visitCteDefinition(CteStatement cte) {
 		currentCteStatement = cte;
 		final Limit oldLimit = limit;
 		limit = null;
-		cte.getCteDefinition().accept( this );
-		currentCteStatement = oldCteStatement;
-		limit = oldLimit;
+		final boolean oldNeedsSelectAliases = needsSelectAliases;
+		final List<String> oldColumnAliases = columnAliases;
+		if ( !dialect.supportsCteHeaderColumnList() ) {
+			needsSelectAliases = true;
+			columnAliases = determineCteColumnNames( cte );
+		}
+		try {
+			cte.getCteDefinition().accept( this );
+		}
+		finally {
+			currentCteStatement = oldCteStatement;
+			limit = oldLimit;
+			needsSelectAliases = oldNeedsSelectAliases;
+			columnAliases = oldColumnAliases;
+		}
 	}
 
 	/**
@@ -3584,7 +3691,7 @@ else if ( needsQueryGroupWrapper ) {
 
 	private void renderQueryParts(QueryGroup queryGroup) {
 		final var queryParts = queryGroup.getQueryParts();
-		final String setOperatorString = ' ' + queryGroup.getSetOperator().sqlString() + ' ';
+		final String setOperatorString = ' ' + dialect.getSetOperatorSqlString( queryGroup.getSetOperator() ) + ' ';
 		String separator = "";
 		for ( int i = 0; i < queryParts.size(); i++ ) {
 			appendSql( separator );
@@ -3987,7 +4094,9 @@ protected void emulateTupleComparison(
 					appendSql( "exists (select " );
 					renderCommaSeparatedSelectExpression( lhsExpressions );
 					appendSql( getFromDualForSelectOnly() );
-					appendSql( " intersect select " );
+					appendSql( " " );
+					appendSql( getDialect().getSetOperatorSqlString( SetOperator.INTERSECT ) );
+					appendSql( " select " );
 					renderCommaSeparatedSelectExpression( rhsExpressions );
 					appendSql( getFromDualForSelectOnly() );
 					appendSql( CLOSE_PARENTHESIS );
@@ -4289,7 +4398,9 @@ protected void renderComparisonEmulateIntersect(Expression lhs, ComparisonOperat
 				clauseStack.push( Clause.SELECT );
 				visitSqlSelectExpression( lhs );
 				appendSql( getFromDualForSelectOnly() );
-				appendSql( " intersect select " );
+				appendSql( " " );
+				appendSql( dialect.getSetOperatorSqlString( SetOperator.INTERSECT ) );
+				appendSql( " select " );
 				visitSqlSelectExpression( rhs );
 				appendSql( getFromDualForSelectOnly() );
 				clauseStack.pop();
@@ -5776,6 +5887,7 @@ protected void renderFromClauseJoiningDmlTargetReference(UpdateStatement stateme
 			addAdditionalWherePredicate(
 					// Render the match predicate like `table.ctid=alias.ctid`
 					createRowMatchingPredicate(
+							statement.getMutationTarget(),
 							dmlTargetTableGroup,
 							statement.getTargetTable().getTableExpression(),
 							statement.getTargetTable().getIdentificationVariable()
@@ -5784,16 +5896,52 @@ protected void renderFromClauseJoiningDmlTargetReference(UpdateStatement stateme
 		}
 	}
 
+	/**
+	 * @deprecated Use {@link #createRowMatchingPredicate(MutationTarget, TableGroup, String, String)} instead
+	 */
+	@Deprecated(forRemoval = true, since = "7.4")
 	protected Predicate createRowMatchingPredicate(TableGroup dmlTargetTableGroup, String lhsAlias, String rhsAlias) {
+		return createRowMatchingPredicate(
+				(MutationTarget<?>) dmlTargetTableGroup.getModelPart().asEntityMappingType(),
+				dmlTargetTableGroup,
+				lhsAlias,
+				rhsAlias
+		);
+	}
+
+	protected Predicate createRowMatchingPredicate(
+			MutationTarget<?> mutationTarget,
+			TableGroup dmlTargetTableGroup,
+			String lhsAlias,
+			String rhsAlias) {
+		final EntityMappingType entityMappingType = dmlTargetTableGroup.getModelPart().asEntityMappingType();
+		final EntityRowIdMapping rowIdMapping = entityMappingType == null ? null : entityMappingType.getRowIdMapping();
 		final String rowIdExpression = dialect.rowId( null );
-		if ( rowIdExpression == null ) {
-			final EntityIdentifierMapping identifierMapping =
-					dmlTargetTableGroup.getModelPart().asEntityMappingType().getIdentifierMapping();
-			final int jdbcTypeCount = identifierMapping.getJdbcTypeCount();
+		if ( rowIdMapping != null ) {
+			return new ComparisonPredicate(
+					new ColumnReference(
+							lhsAlias,
+							rowIdMapping.getSelectionExpression(),
+							rowIdMapping.isFormula(),
+							rowIdMapping.getCustomReadExpression(),
+							rowIdMapping.getJdbcMapping()
+					),
+					ComparisonOperator.EQUAL,
+					new ColumnReference(
+							rhsAlias,
+							rowIdMapping.getSelectionExpression(),
+							rowIdMapping.isFormula(),
+							rowIdMapping.getCustomReadExpression(),
+							rowIdMapping.getJdbcMapping()
+					)
+			);
+		}
+		else if ( rowIdExpression == null ) {
+			final var identifierTableMapping = mutationTarget.getIdentifierTableMapping();
+			final int jdbcTypeCount = identifierTableMapping.getKeyDetails().getJdbcTypeCount();
 			final List<ColumnReference> targetExpressions = new ArrayList<>( jdbcTypeCount );
 			final List<ColumnReference> sourceExpressions = new ArrayList<>( jdbcTypeCount );
-			identifierMapping.forEachSelectable(
-					0,
+			identifierTableMapping.getKeyDetails().forEachSelectable(
 					(selectionIndex, selectableMapping) -> {
 						targetExpressions.add( new ColumnReference(
 								lhsAlias,
@@ -5814,11 +5962,11 @@ protected Predicate createRowMatchingPredicate(TableGroup dmlTargetTableGroup, S
 			return new ComparisonPredicate(
 					targetExpressions.size() == 1
 							? targetExpressions.get( 0 )
-							: new SqlTuple( targetExpressions, identifierMapping ),
+							: new SqlTuple( targetExpressions, null ),
 					ComparisonOperator.EQUAL,
 					sourceExpressions.size() == 1
 							? sourceExpressions.get( 0 )
-							: new SqlTuple( sourceExpressions, identifierMapping )
+							: new SqlTuple( sourceExpressions, null )
 			);
 		}
 		else {
@@ -6177,14 +6325,46 @@ protected boolean isCorrelated(CteStatement cteStatement) {
 			&& !selectStatement.getQueryPart().isRoot();
 	}
 
+	protected boolean hasCorrelatedSubquery(Statement statement, String targetAlias) {
+		return CorrelationChecker.hasCorrelation( statement, targetAlias );
+	}
+
+	protected boolean hasNestedCorrelation(Statement statement) {
+		return NestedCorrelationChecker.hasNestedCorrelation( statement );
+	}
+
+	protected boolean hasTargetTableCorrelation(MutationStatement statement) {
+		final String targetAlias = statement.getTargetTable().getIdentificationVariable();
+		return statement instanceof AbstractUpdateOrDeleteStatement
+				&& targetAlias != null
+				&& CorrelationChecker.hasCorrelation( statement, targetAlias );
+	}
+
 	protected boolean renderNamedTableReference(
 			NamedTableReference tableReference, LockMode lockMode) {
 		appendSql( tableReference.getTableExpression() );
 		registerAffectedTable( tableReference );
+		if ( renderAsOfClause( tableReference ) ) {
+			appendSql( WHITESPACE );
+			appendSql( dialect.getTemporalTableSupport().getAsOfOperator( getTemporalTableStrategy() ) );
+			appendSql( WHITESPACE );
+			tableReference.getAsOfTransactionIdentifier().accept( this );
+		}
 		renderTableReferenceIdentificationVariable( tableReference );
 		return false;
 	}
 
+	private boolean renderAsOfClause(NamedTableReference tableReference) {
+		return tableReference.getAsOfTransactionIdentifier() != null
+			&& sessionFactory.getTransactionIdentifierService().isIdentifierTypeInstant()
+			&& statementStack.getCurrent() instanceof SelectStatement
+			&& dialect.getTemporalTableSupport().useAsOfOperator( getTemporalTableStrategy() );
+	}
+
+	private TemporalTableStrategy getTemporalTableStrategy() {
+		return sessionFactory.getSessionFactoryOptions().getTemporalTableStrategy();
+	}
+
 	@Override
 	public void visitValuesTableReference(ValuesTableReference tableReference) {
 		append( '(' );
@@ -6923,45 +7103,7 @@ public void visitTrimSpecification(TrimSpecification trimSpecification) {
 
 	@Override
 	public void visitCastTarget(CastTarget castTarget) {
-		appendSql( getCastTypeName( castTarget, sessionFactory.getTypeConfiguration() ) );
-	}
-
-	public static String getSqlTypeName(SqlTypedMapping castTarget, TypeConfiguration typeConfiguration) {
-		if ( castTarget.getColumnDefinition() != null ) {
-			return castTarget.getColumnDefinition();
-		}
-		else {
-			final Size castTargetSize = castTarget.toSize();
-			final DdlTypeRegistry ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
-			final BasicType<?> expressionType = (BasicType<?>) castTarget.getJdbcMapping();
-			DdlType ddlType = ddlTypeRegistry.getDescriptor( expressionType.getJdbcType().getDdlTypeCode() );
-			if ( ddlType == null ) {
-				// this may happen when selecting a null value like `SELECT null from ...`
-				// some dbs need the value to be cast so not knowing the real type we fall back to INTEGER
-				ddlType = ddlTypeRegistry.getDescriptor( SqlTypes.INTEGER );
-			}
-
-			return ddlType.getTypeName( castTargetSize, expressionType, ddlTypeRegistry );
-		}
-	}
-
-	public static String getCastTypeName(SqlTypedMapping castTarget, TypeConfiguration typeConfiguration) {
-		if ( castTarget.getColumnDefinition() != null ) {
-			return castTarget.getColumnDefinition();
-		}
-		else {
-			final Size castTargetSize = castTarget.toSize();
-			final DdlTypeRegistry ddlTypeRegistry = typeConfiguration.getDdlTypeRegistry();
-			final BasicType<?> expressionType = (BasicType<?>) castTarget.getJdbcMapping();
-			DdlType ddlType = ddlTypeRegistry.getDescriptor( expressionType.getJdbcType().getDdlTypeCode() );
-			if ( ddlType == null ) {
-				// this may happen when selecting a null value like `SELECT null from ...`
-				// some dbs need the value to be cast so not knowing the real type we fall back to INTEGER
-				ddlType = ddlTypeRegistry.getDescriptor( SqlTypes.INTEGER );
-			}
-
-			return ddlType.getCastTypeName( castTargetSize, expressionType, ddlTypeRegistry );
-		}
+		appendSql( DdlTypeHelper.getCastTypeName( castTarget, sessionFactory.getTypeConfiguration() ) );
 	}
 
 	@Override
@@ -7489,7 +7631,17 @@ public void visitQueryLiteral(QueryLiteral<?> queryLiteral) {
 
 	@Override
 	public <N extends Number> void visitUnparsedNumericLiteral(UnparsedNumericLiteral<N> literal) {
-		appendSql( literal.getUnparsedLiteralValue() );
+		final String literalValue = literal.getUnparsedLiteralValue();
+		appendSql( literalValue );
+		switch ( literal.getTypeCategory() ) {
+			case FLOAT, DOUBLE:
+				// HQL literals like 1f should be rendered as 1.0
+				if ( literalValue.indexOf( '.' ) < 0
+					&& literalValue.indexOf( 'e' ) < 0
+					&& literalValue.indexOf( 'E' ) < 0 ) {
+					appendSql( ".0" );
+				}
+		}
 	}
 
 	private void visitLiteral(Literal literal) {
@@ -7692,41 +7844,16 @@ public void visitInListPredicate(InListPredicate inListPredicate) {
 			else if ( !dialect.supportsRowValueConstructorSyntaxInInList() ) {
 				// Some DBs like Oracle support tuples only for the IN subquery predicate
 				if ( dialect.supportsRowValueConstructorSyntaxInInSubQuery() && dialect.supportsValuesList() ) {
-					final int tupleSize = lhsTuple.getExpressionType().getJdbcTypeCount();
 					inListPredicate.getTestExpression().accept( this );
 					if ( inListPredicate.isNegated() ) {
 						appendSql( " not" );
 					}
-					appendSql( " in (select" );
-					char separator = ' ';
-					for ( int i = 0; i < tupleSize; i++ ) {
-						appendSql( separator );
-						appendSql( "v_.c" );
-						appendSql( i );
-						separator = ',';
-					}
-					appendSql( " from (values" );
-					separator = ' ';
-					for ( Expression expression : listExpressions ) {
-						appendSql( separator );
-						appendSql( OPEN_PARENTHESIS );
-						renderCommaSeparated( getSqlTuple( expression ).getExpressions() );
-						appendSql( CLOSE_PARENTHESIS );
-						separator = ',';
-					}
-					appendSql( CLOSE_PARENTHESIS );
-					appendSql( " v_" );
-					separator = '(';
-					for ( int i = 0; i < tupleSize; i++ ) {
-						appendSql( separator );
-						appendSql( "c" );
-						appendSql( i );
-						separator = ',';
-					}
-					appendSql( CLOSE_PARENTHESIS );
+					appendSql( " in (" );
+					renderExpressionsAsValuesSubquery( lhsTuple.getExpressionType().getJdbcTypeCount(), listExpressions );
 					appendSql( CLOSE_PARENTHESIS );
 				}
-				else if ( dialect.supportsRowValueConstructorSyntaxInInSubQuery() && dialect.supportsUnionAll() ) {
+				else if ( dialect.supportsRowValueConstructorSyntaxInInSubQuery() && dialect.supportsUnionAll()
+						&& preferUnionQueryForTupleInListPredicate() ) {
 					inListPredicate.getTestExpression().accept( this );
 					if ( inListPredicate.isNegated() ) {
 						appendSql( " not" );
@@ -7822,6 +7949,40 @@ else if ( dialect.supportsRowValueConstructorSyntaxInInSubQuery() && dialect.sup
 		}
 	}
 
+	protected boolean preferUnionQueryForTupleInListPredicate() {
+		return true;
+	}
+
+	protected void renderExpressionsAsValuesSubquery(int tupleSize, List<Expression> listExpressions) {
+		appendSql( "select" );
+		char separator = ' ';
+		for ( int i = 0; i < tupleSize; i++ ) {
+			appendSql( separator );
+			appendSql( "v_.c" );
+			appendSql( i );
+			separator = ',';
+		}
+		appendSql( " from (values" );
+		separator = ' ';
+		for ( Expression expression : listExpressions ) {
+			appendSql( separator );
+			appendSql( OPEN_PARENTHESIS );
+			renderCommaSeparated( SqlTupleContainer.getSqlTuple( expression ).getExpressions() );
+			appendSql( CLOSE_PARENTHESIS );
+			separator = ',';
+		}
+		appendSql( CLOSE_PARENTHESIS );
+		appendSql( " v_" );
+		separator = '(';
+		for ( int i = 0; i < tupleSize; i++ ) {
+			appendSql( separator );
+			appendSql( "c" );
+			appendSql( i );
+			separator = ',';
+		}
+		appendSql( CLOSE_PARENTHESIS );
+	}
+
 	private void appendInClauseSeparator(InListPredicate inListPredicate) {
 		appendSql( CLOSE_PARENTHESIS );
 		appendSql( inListPredicate.isNegated() ? " and " : " or " );
@@ -7904,89 +8065,101 @@ protected <X extends Expression> void emulateSubQueryRelationalRestrictionPredic
 			SubQueryRelationalRestrictionEmulationRenderer<X> renderer,
 			ComparisonOperator tupleComparisonOperator) {
 		final QueryPart queryPart = selectStatement.getQueryPart();
-		final QuerySpec subQuery;
 		if ( queryPart instanceof QuerySpec querySpec
 				&& queryPart.getFetchClauseExpression() == null
 				&& queryPart.getOffsetClauseExpression() == null ) {
-			subQuery = querySpec;
 			// We can only emulate the tuple subquery predicate as exists predicate when there are no limit/offsets
 			if ( negated ) {
 				appendSql( "not " );
 			}
+			appendSql( "exists" );
+			renderRelationalEmulationSubQuery(
+					querySpec,
+					lhsTuple,
+					renderer,
+					tupleComparisonOperator
+			);
+		}
+		else {
+			// TODO: We could use nested queries and use row numbers to emulate this
+			throw new IllegalArgumentException(
+					"Can't emulate relational tuple subquery predicate with limit/offset or set operations: " + predicate );
+		}
+	}
 
-			final QueryPart queryPartForRowNumbering = this.queryPartForRowNumbering;
-			final int queryPartForRowNumberingClauseDepth = this.queryPartForRowNumberingClauseDepth;
-			final boolean needsSelectAliases = this.needsSelectAliases;
-			try {
-				this.queryPartForRowNumbering = null;
-				this.queryPartForRowNumberingClauseDepth = -1;
-				this.needsSelectAliases = false;
-				queryPartStack.push( subQuery );
-				appendSql( "exists (" );
-				if ( !subQuery.getGroupByClauseExpressions().isEmpty()
-						|| subQuery.getHavingClauseRestrictions() != null ) {
-					// If we have a group by or having clause, we have to move the tuple comparison emulation to the HAVING clause.
-					// Also, we need to explicitly include the selections to avoid 'invalid HAVING clause' errors
-					visitSelectClause( subQuery.getSelectClause() );
-					visitFromClause( subQuery.getFromClause() );
-					visitWhereClause( subQuery.getWhereClauseRestrictions() );
-					visitGroupByClause( subQuery, SelectItemReferenceStrategy.EXPRESSION );
-
-					appendSql( " having " );
-					clauseStack.push( Clause.HAVING );
-					try {
-						renderer.renderComparison(
-								subQuery.getSelectClause().getSqlSelections(),
-								lhsTuple,
-								tupleComparisonOperator
-						);
-						final Predicate havingClauseRestrictions = subQuery.getHavingClauseRestrictions();
-						if ( havingClauseRestrictions != null ) {
-							appendSql( " and (" );
-							havingClauseRestrictions.accept( this );
-							appendSql( CLOSE_PARENTHESIS );
-						}
-					}
-					finally {
-						clauseStack.pop();
+	protected <X extends Expression> void renderRelationalEmulationSubQuery(
+			QuerySpec subQuery,
+			X lhsTuple,
+			SubQueryRelationalRestrictionEmulationRenderer<X> renderer,
+			ComparisonOperator tupleComparisonOperator) {
+		final QueryPart queryPartForRowNumbering = this.queryPartForRowNumbering;
+		final int queryPartForRowNumberingClauseDepth = this.queryPartForRowNumberingClauseDepth;
+		final boolean needsSelectAliases = this.needsSelectAliases;
+		try {
+			this.queryPartForRowNumbering = null;
+			this.queryPartForRowNumberingClauseDepth = -1;
+			this.needsSelectAliases = false;
+			queryPartStack.push( subQuery );
+			appendSql( OPEN_PARENTHESIS );
+			if ( !subQuery.getGroupByClauseExpressions().isEmpty()
+					|| subQuery.getHavingClauseRestrictions() != null ) {
+				// If we have a group by or having clause, we have to move the tuple comparison emulation to the HAVING clause.
+				// Also, we need to explicitly include the selections to avoid 'invalid HAVING clause' errors
+				visitSelectClause( subQuery.getSelectClause() );
+				visitFromClause( subQuery.getFromClause() );
+				visitWhereClause( subQuery.getWhereClauseRestrictions() );
+				visitGroupByClause( subQuery, SelectItemReferenceStrategy.EXPRESSION );
+
+				appendSql( " having " );
+				clauseStack.push( Clause.HAVING );
+				try {
+					renderer.renderComparison(
+							subQuery.getSelectClause().getSqlSelections(),
+							lhsTuple,
+							tupleComparisonOperator
+					);
+					final Predicate havingClauseRestrictions = subQuery.getHavingClauseRestrictions();
+					if ( havingClauseRestrictions != null ) {
+						appendSql( " and (" );
+						havingClauseRestrictions.accept( this );
+						appendSql( CLOSE_PARENTHESIS );
 					}
 				}
-				else {
-					// If we have no group by or having clause, we can move the tuple comparison emulation to the WHERE clause
-					appendSql( "select 1" );
-					visitFromClause( subQuery.getFromClause() );
-					appendSql( " where " );
-					clauseStack.push( Clause.WHERE );
-					try {
-						renderer.renderComparison(
-								subQuery.getSelectClause().getSqlSelections(),
-								lhsTuple,
-								tupleComparisonOperator
-						);
-						final Predicate whereClauseRestrictions = subQuery.getWhereClauseRestrictions();
-						if ( whereClauseRestrictions != null ) {
-							appendSql( " and (" );
-							whereClauseRestrictions.accept( this );
-							appendSql( CLOSE_PARENTHESIS );
-						}
-					}
-					finally {
-						clauseStack.pop();
-					}
+				finally {
+					clauseStack.pop();
 				}
-
-				appendSql( CLOSE_PARENTHESIS );
 			}
-			finally {
-				queryPartStack.pop();
-				this.queryPartForRowNumbering = queryPartForRowNumbering;
-				this.queryPartForRowNumberingClauseDepth = queryPartForRowNumberingClauseDepth;
-				this.needsSelectAliases = needsSelectAliases;
+			else {
+				// If we have no group by or having clause, we can move the tuple comparison emulation to the WHERE clause
+				appendSql( "select 1" );
+				visitFromClause( subQuery.getFromClause() );
+				appendSql( " where " );
+				clauseStack.push( Clause.WHERE );
+				try {
+					renderer.renderComparison(
+							subQuery.getSelectClause().getSqlSelections(),
+							lhsTuple,
+							tupleComparisonOperator
+					);
+					final Predicate whereClauseRestrictions = subQuery.getWhereClauseRestrictions();
+					if ( whereClauseRestrictions != null ) {
+						appendSql( " and (" );
+						whereClauseRestrictions.accept( this );
+						appendSql( CLOSE_PARENTHESIS );
+					}
+				}
+				finally {
+					clauseStack.pop();
+				}
 			}
+
+			appendSql( CLOSE_PARENTHESIS );
 		}
-		else {
-			// TODO: We could use nested queries and use row numbers to emulate this
-			throw new IllegalArgumentException( "Can't emulate IN predicate with tuples and limit/offset or set operations: " + predicate );
+		finally {
+			queryPartStack.pop();
+			this.queryPartForRowNumbering = queryPartForRowNumbering;
+			this.queryPartForRowNumberingClauseDepth = queryPartForRowNumberingClauseDepth;
+			this.needsSelectAliases = needsSelectAliases;
 		}
 	}
 
@@ -8004,68 +8177,79 @@ protected void emulateQuantifiedTupleSubQueryPredicate(
 			SqlTuple lhsTuple,
 			ComparisonOperator tupleComparisonOperator) {
 		final QueryPart queryPart = selectStatement.getQueryPart();
-		final QuerySpec subQuery;
 		if ( queryPart instanceof QuerySpec querySpec
 				&& queryPart.getFetchClauseExpression() == null
 				&& queryPart.getOffsetClauseExpression() == null ) {
-			subQuery = querySpec;
 			// We can only emulate the tuple subquery predicate comparing against the top element when there are no limit/offsets
 			lhsTuple.accept( this );
 			appendSql( tupleComparisonOperator.sqlText() );
+			renderQuantifiedEmulationSubQuery(
+					querySpec,
+					tupleComparisonOperator
+			);
+		}
+		else {
+			// TODO: We could use nested queries and use row numbers to emulate this
+			throw new IllegalArgumentException(
+					"Can't emulate quantified tuple subquery predicate with limit/offset or set operations: " + predicate );
+		}
+	}
 
-			final QueryPart queryPartForRowNumbering = this.queryPartForRowNumbering;
-			final int queryPartForRowNumberingClauseDepth = this.queryPartForRowNumberingClauseDepth;
-			final boolean needsSelectAliases = this.needsSelectAliases;
-			try {
-				this.queryPartForRowNumbering = null;
-				this.queryPartForRowNumberingClauseDepth = -1;
-				this.needsSelectAliases = false;
-				queryPartStack.push( subQuery );
-				appendSql( OPEN_PARENTHESIS );
-				visitSelectClause( subQuery.getSelectClause() );
-				visitFromClause( subQuery.getFromClause() );
-				visitWhereClause( subQuery.getWhereClauseRestrictions() );
-				visitGroupByClause( subQuery, dialect.getGroupBySelectItemReferenceStrategy() );
-				visitHavingClause( subQuery );
-
-				appendSql( " order by " );
-				final List<SqlSelection> sqlSelections = subQuery.getSelectClause().getSqlSelections();
-				final String order;
-				if ( tupleComparisonOperator == ComparisonOperator.LESS_THAN
-						|| tupleComparisonOperator == ComparisonOperator.LESS_THAN_OR_EQUAL ) {
-					// Default order is asc so we don't need to specify the order explicitly
-					order = "";
-				}
-				else {
-					order = " desc";
-				}
-				appendSql( '1' );
-				appendSql( order );
-				for ( int i = 1; i < sqlSelections.size(); i++ ) {
-					appendSql( COMMA_SEPARATOR_CHAR );
-					appendSql( i + 1 );
-					appendSql( order );
-				}
-				renderFetch(
-						new QueryLiteral<>( 1, getIntegerType() ),
-						null,
-						FetchClauseType.ROWS_ONLY
-				);
-				appendSql( CLOSE_PARENTHESIS );
+	protected void renderQuantifiedEmulationSubQuery(
+			QuerySpec subQuery,
+			ComparisonOperator tupleComparisonOperator) {
+		final QueryPart queryPartForRowNumbering = this.queryPartForRowNumbering;
+		final int queryPartForRowNumberingClauseDepth = this.queryPartForRowNumberingClauseDepth;
+		final boolean needsSelectAliases = this.needsSelectAliases;
+		try {
+			this.queryPartForRowNumbering = null;
+			this.queryPartForRowNumberingClauseDepth = -1;
+			this.needsSelectAliases = false;
+			queryPartStack.push( subQuery );
+			appendSql( OPEN_PARENTHESIS );
+			visitSelectClause( subQuery.getSelectClause() );
+			visitFromClause( subQuery.getFromClause() );
+			visitWhereClause( subQuery.getWhereClauseRestrictions() );
+			visitGroupByClause( subQuery, dialect.getGroupBySelectItemReferenceStrategy() );
+			visitHavingClause( subQuery );
+
+			appendSql( " order by " );
+			final List<SqlSelection> sqlSelections = subQuery.getSelectClause().getSqlSelections();
+			final String order;
+			if ( tupleComparisonOperator == ComparisonOperator.LESS_THAN
+					|| tupleComparisonOperator == ComparisonOperator.LESS_THAN_OR_EQUAL ) {
+				// Default order is asc so we don't need to specify the order explicitly
+				order = "";
 			}
-			finally {
-				queryPartStack.pop();
-				this.queryPartForRowNumbering = queryPartForRowNumbering;
-				this.queryPartForRowNumberingClauseDepth = queryPartForRowNumberingClauseDepth;
-				this.needsSelectAliases = needsSelectAliases;
+			else {
+				order = " desc";
 			}
+			appendSql( '1' );
+			appendSql( order );
+			for ( int i = 1; i < sqlSelections.size(); i++ ) {
+				appendSql( COMMA_SEPARATOR_CHAR );
+				appendSql( i + 1 );
+				appendSql( order );
+			}
+			renderFetchFirstRow();
+			appendSql( CLOSE_PARENTHESIS );
 		}
-		else {
-			// TODO: We could use nested queries and use row numbers to emulate this
-			throw new IllegalArgumentException( "Can't emulate in predicate with tuples and limit/offset or set operations: " + predicate );
+		finally {
+			queryPartStack.pop();
+			this.queryPartForRowNumbering = queryPartForRowNumbering;
+			this.queryPartForRowNumberingClauseDepth = queryPartForRowNumberingClauseDepth;
+			this.needsSelectAliases = needsSelectAliases;
 		}
 	}
 
+	protected void renderFetchFirstRow() {
+		renderFetch(
+				new QueryLiteral<>( 1, getIntegerType() ),
+				null,
+				FetchClauseType.ROWS_ONLY
+		);
+	}
+
 	@Override
 	public void visitExistsPredicate(ExistsPredicate existsPredicate) {
 		if ( existsPredicate.isNegated() ) {
@@ -8138,9 +8322,13 @@ public void visitLikePredicate(LikePredicate likePredicate) {
 
 	protected void renderLikePredicate(LikePredicate likePredicate) {
 		likePredicate.getPattern().accept( this );
-		if ( likePredicate.getEscapeCharacter() != null ) {
+		renderEscapeCharacter( likePredicate.getEscapeCharacter() );
+	}
+
+	protected void renderEscapeCharacter(Expression escapeCharacter) {
+		if ( escapeCharacter != null ) {
 			appendSql( " escape " );
-			likePredicate.getEscapeCharacter().accept( this );
+			escapeCharacter.accept( this );
 		}
 	}
 
@@ -8156,12 +8344,13 @@ protected void renderCaseInsensitiveLikeEmulation(Expression lhs, Expression rhs
 		appendSql( " like " );
 		appendSql( dialect.getLowercaseFunction() );
 		appendSql( OPEN_PARENTHESIS );
-		rhs.accept( this );
+		renderLikePattern(rhs, escapeCharacter);
 		appendSql( CLOSE_PARENTHESIS );
-		if ( escapeCharacter != null ) {
-			appendSql( " escape " );
-			escapeCharacter.accept( this );
-		}
+		renderEscapeCharacter(  escapeCharacter );
+	}
+
+	protected void renderLikePattern(Expression pattern, Expression escapeCharacter) {
+		pattern.accept( this );
 	}
 
 	protected void renderBackslashEscapedLikePattern(
@@ -8508,6 +8697,9 @@ private T translateTableMutation(TableMutation<?> mutation) {
 
 	@Override
 	public void visitStandardTableInsert(TableInsertStandard tableInsert) {
+		if ( tableInsert instanceof OptionalTableInsert ) {
+			throw new IllegalQueryOperationException( "Optional table insert is not supported" );
+		}
 		getCurrentClauseStack().push( Clause.INSERT );
 		try {
 			renderInsertInto( tableInsert );
@@ -8521,7 +8713,7 @@ public void visitStandardTableInsert(TableInsertStandard tableInsert) {
 		}
 	}
 
-	private void renderInsertInto(TableInsertStandard tableInsert) {
+	protected void renderInsertInto(TableInsertStandard tableInsert) {
 		applySqlComment( tableInsert.getMutationComment() );
 
 		if ( tableInsert.getNumberOfValueBindings() == 0 ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java
index 56065ad612e3..69628633586b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AggregateFunctionChecker.java
@@ -62,7 +62,12 @@ public class AggregateFunctionChecker extends AbstractSqlAstWalker {
 
 	private static final AggregateFunctionChecker INSTANCE = new AggregateFunctionChecker();
 
-	private static class AggregateFunctionException extends RuntimeException {}
+	private static class AggregateFunctionException extends RuntimeException {
+		@Override
+		public Throwable fillInStackTrace() {
+			return this;
+		}
+	}
 
 	public static boolean hasAggregateFunctions(Expression expression) {
 		try {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AliasCollector.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AliasCollector.java
deleted file mode 100644
index 376200a52ade..000000000000
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AliasCollector.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.sql.ast.spi;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.hibernate.sql.ast.tree.SqlAstNode;
-import org.hibernate.sql.ast.tree.from.FunctionTableReference;
-import org.hibernate.sql.ast.tree.from.NamedTableReference;
-import org.hibernate.sql.ast.tree.from.QueryPartTableReference;
-import org.hibernate.sql.ast.tree.from.TableReference;
-import org.hibernate.sql.ast.tree.from.ValuesTableReference;
-
-/**
- * A simple walker that checks for aggregate functions.
- *
- * @author Christian Beikov
- */
-public class AliasCollector extends AbstractSqlAstWalker {
-
-	private final Map<String, TableReference> tableReferenceMap = new HashMap<>();
-
-	public static Map<String, TableReference> getTableReferences(SqlAstNode node) {
-		final AliasCollector aliasCollector = new AliasCollector();
-		node.accept( aliasCollector );
-		return aliasCollector.tableReferenceMap;
-	}
-
-	@Override
-	public void visitNamedTableReference(NamedTableReference tableReference) {
-		tableReferenceMap.put( tableReference.getIdentificationVariable(), tableReference );
-	}
-
-	@Override
-	public void visitValuesTableReference(ValuesTableReference tableReference) {
-		tableReferenceMap.put( tableReference.getIdentificationVariable(), tableReference );
-	}
-
-	@Override
-	public void visitQueryPartTableReference(QueryPartTableReference tableReference) {
-		tableReferenceMap.put( tableReference.getIdentificationVariable(), tableReference );
-	}
-
-	@Override
-	public void visitFunctionTableReference(FunctionTableReference tableReference) {
-		tableReferenceMap.put( tableReference.getIdentificationVariable(), tableReference );
-	}
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/CorrelationChecker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/CorrelationChecker.java
new file mode 100644
index 000000000000..1919dbb13755
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/CorrelationChecker.java
@@ -0,0 +1,85 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.ast.spi;
+
+import org.hibernate.sql.ast.tree.MutationStatement;
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.delete.DeleteStatement;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.sql.ast.tree.update.UpdateStatement;
+
+/**
+ * A walker that checks if a SQL AST node contains a subquery that references a specific table alias.
+ *
+ * @author Yoobin Yoon
+ */
+public class CorrelationChecker extends AbstractSqlAstWalker {
+
+	private final String targetAlias;
+	private boolean inSubquery = false;
+
+	private static class CorrelationException extends RuntimeException {
+		@Override
+		public Throwable fillInStackTrace() {
+			return this;
+		}
+	}
+
+	public static boolean hasCorrelation(SqlAstNode node, String targetAlias) {
+		try {
+			node.accept( new CorrelationChecker( targetAlias ) );
+			return false;
+		}
+		catch (CorrelationException ex) {
+			return true;
+		}
+	}
+
+	public static boolean hasCorrelation(MutationStatement statement, String targetAlias) {
+		try {
+			if ( statement instanceof DeleteStatement deleteStatement ) {
+				if ( deleteStatement.getRestriction() != null ) {
+					deleteStatement.getRestriction().accept( new CorrelationChecker( targetAlias ) );
+				}
+			}
+			else if ( statement instanceof UpdateStatement updateStatement ) {
+				final CorrelationChecker visitor = new CorrelationChecker( targetAlias );
+				if ( updateStatement.getAssignments() != null ) {
+					for ( var assignment : updateStatement.getAssignments() ) {
+						assignment.getAssignedValue().accept( visitor );
+					}
+				}
+				if ( updateStatement.getRestriction() != null ) {
+					updateStatement.getRestriction().accept( visitor );
+				}
+			}
+			return false;
+		}
+		catch (CorrelationException ex) {
+			return true;
+		}
+	}
+
+	private CorrelationChecker(String targetAlias) {
+		this.targetAlias = targetAlias;
+	}
+
+	@Override
+	public void visitQuerySpec(QuerySpec querySpec) {
+		boolean wasInSubquery = inSubquery;
+		inSubquery = true;
+		super.visitQuerySpec( querySpec );
+		inSubquery = wasInSubquery;
+	}
+
+	@Override
+	public void visitColumnReference(ColumnReference columnReference) {
+		if ( inSubquery && targetAlias.equals( columnReference.getQualifier() ) ) {
+			throw new CorrelationException();
+		}
+		super.visitColumnReference( columnReference );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/FullJoinEmulation.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/FullJoinEmulation.java
new file mode 100644
index 000000000000..d19ebba16c13
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/FullJoinEmulation.java
@@ -0,0 +1,717 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.ast.spi;
+
+import java.util.ArrayList;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.function.Consumer;
+
+import jakarta.persistence.criteria.Nulls;
+import org.hibernate.Internal;
+import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.metamodel.mapping.EntityValuedModelPart;
+import org.hibernate.metamodel.mapping.ModelPartContainer;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.ValuedModelPart;
+import org.hibernate.query.SortDirection;
+import org.hibernate.sql.ast.Clause;
+import org.hibernate.sql.ast.SqlAstJoinType;
+import org.hibernate.sql.ast.tree.expression.CaseSearchedExpression;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.sql.ast.tree.expression.QueryLiteral;
+import org.hibernate.sql.ast.tree.expression.SqlTuple;
+import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.ast.tree.from.TableGroupJoin;
+import org.hibernate.sql.ast.tree.predicate.NullnessPredicate;
+import org.hibernate.sql.ast.tree.predicate.Predicate;
+import org.hibernate.sql.ast.tree.select.QueryGroup;
+import org.hibernate.sql.ast.tree.select.QueryPart;
+import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.sql.ast.tree.select.SelectClause;
+import org.hibernate.sql.ast.tree.select.SortSpecification;
+
+import static java.util.Collections.emptyList;
+import static org.hibernate.internal.util.collections.CollectionHelper.combine;
+import static org.hibernate.query.internal.NullPrecedenceHelper.isDefaultOrdering;
+import static org.hibernate.query.sqm.SetOperator.EXCEPT_ALL;
+import static org.hibernate.query.sqm.SetOperator.UNION_ALL;
+import static org.hibernate.sql.ast.SqlAstJoinType.INNER;
+import static org.hibernate.sql.ast.SqlAstJoinType.LEFT;
+import static org.hibernate.sql.ast.SqlAstJoinType.RIGHT;
+import static org.hibernate.sql.ast.spi.SqlAppender.COMMA_SEPARATOR;
+import static org.hibernate.sql.ast.spi.SqlAppender.NO_SEPARATOR;
+import static org.hibernate.sql.ast.tree.expression.SqlTupleContainer.getSqlTuple;
+import static org.hibernate.sql.ast.tree.predicate.Predicate.combinePredicates;
+
+/**
+ * Emulates ANSI {@code FULL JOIN} using set operators.
+ *
+ * @author Gavin King
+ */
+@Internal
+public final class FullJoinEmulation {
+
+	private final AbstractSqlAstTranslator<?> translator;
+	private List<FullJoinEmulationInfo> fullJoinEmulationInfos;
+	private List<FullJoinEmulationBranch> fullJoinEmulationBranches;
+	private QueryGroup fullJoinEmulationQueryGroup;
+	private List<Expression> fullJoinEmulationExtraSelections;
+	private IdentityHashMap<SortSpecification, int[]> fullJoinEmulationNullPrecedenceSelectionIndexes;
+	private boolean renderingFullJoinEmulationBranch;
+
+	public FullJoinEmulation(AbstractSqlAstTranslator<?> translator) {
+		this.translator = translator;
+	}
+
+	public boolean renderFullJoinEmulationBranchIfNeeded(QuerySpec querySpec, Consumer<QuerySpec> renderQuerySpec) {
+		final var branch = findFullJoinEmulationBranch( querySpec );
+		final boolean hasBranch = branch != null;
+		if ( hasBranch ) {
+			renderFullJoinEmulationBranch( querySpec, branch.joinSides(), renderQuerySpec );
+		}
+		return hasBranch;
+	}
+
+	public boolean emulateFullJoinWithUnionIfNeeded(QuerySpec querySpec) {
+		final var fullJoins = collectFullJoinEmulationInfos( querySpec );
+		final boolean hasFullJoins = !fullJoins.isEmpty();
+		if ( hasFullJoins ) {
+			emulateFullJoinWithUnion( querySpec, fullJoins );
+		}
+		return hasFullJoins;
+	}
+
+	public boolean renderSelectClauseIfNeeded(SelectClause selectClause) {
+		if ( renderingFullJoinEmulationBranch
+				&& fullJoinEmulationExtraSelections != null ) {
+			translator.getClauseStack().push( Clause.SELECT );
+			try {
+				translator.appendSql( "select " );
+				if ( selectClause.isDistinct() ) {
+					translator.appendSql( "distinct " );
+				}
+				translator.visitSqlSelections( selectClause );
+				translator.renderVirtualSelections( selectClause );
+				renderFullJoinEmulationAdditionalSelectItems( selectClause );
+			}
+			finally {
+				translator.getClauseStack().pop();
+			}
+			return true;
+		}
+		return false;
+	}
+
+	private void renderFullJoinEmulationOrderBy(List<SortSpecification> sortSpecifications) {
+		if ( sortSpecifications != null && !sortSpecifications.isEmpty() ) {
+			translator.appendSql( " order by " );
+			String separator = NO_SEPARATOR;
+			for ( SortSpecification sortSpecification : sortSpecifications ) {
+				translator.appendSql( separator );
+				renderFullJoinEmulationSortSpecification( sortSpecification );
+				separator = COMMA_SEPARATOR;
+			}
+		}
+	}
+
+	public boolean isFullJoinEmulationQueryPart(QueryPart queryPart) {
+		return queryPart instanceof QuerySpec querySpec
+			&& findFullJoinEmulationBranch( querySpec ) != null;
+	}
+
+	public boolean hasActiveFullJoinEmulation() {
+		return fullJoinEmulationInfos != null;
+	}
+
+	public int countRenderedSelectItemsIncludingEmulationSelections(QuerySpec querySpec) {
+		int count = countRenderedSelectItems( querySpec.getSelectClause() );
+		if ( fullJoinEmulationExtraSelections != null
+				&& isFullJoinEmulationQueryPart( querySpec ) ) {
+			count += fullJoinEmulationExtraSelections.size();
+		}
+		return count;
+	}
+
+	public void renderOrderByIfNeeded(
+			QueryPart queryPart,
+			List<SortSpecification> sortSpecifications,
+			Consumer<List<SortSpecification>> renderDefaultOrderBy) {
+		if ( !isFullJoinEmulationQueryPart( queryPart ) ) {
+			if ( isFullJoinEmulationOrderBy( queryPart, sortSpecifications ) ) {
+				renderFullJoinEmulationOrderBy( sortSpecifications );
+			}
+			else {
+				renderDefaultOrderBy.accept( sortSpecifications );
+			}
+		}
+	}
+
+	private boolean isFullJoinEmulationOrderBy(QueryPart queryPart, List<SortSpecification> sortSpecifications) {
+		return fullJoinEmulationBranches != null
+			&& ( queryPart == fullJoinEmulationQueryGroup
+				// Some dialects (e.g. Sybase ASE) render ORDER BY outside the query group scope.
+				|| fullJoinEmulationQueryGroup != null
+					&& sortSpecifications == fullJoinEmulationQueryGroup.getSortSpecifications() );
+	}
+
+	private void emulateFullJoinWithUnion(QuerySpec querySpec, List<FullJoinEmulationInfo> fullJoins) {
+		final var sortSpecifications = querySpec.getSortSpecifications();
+		final List<SortSpecification> preservedSortSpecifications =
+				sortSpecifications == null ? null : new ArrayList<>( sortSpecifications );
+		final var extraSelections =
+				collectFullJoinEmulationExtraSelections( querySpec,
+						countRenderedSelectItems( querySpec.getSelectClause() ) );
+		if ( !extraSelections.isEmpty() ) {
+			if ( querySpec.getSelectClause().isDistinct() // TODO: we could easily remove this limitation
+					|| !querySpec.getGroupByClauseExpressions().isEmpty()
+					|| querySpec.getHavingClauseRestrictions() != null ) {
+				throw new UnsupportedOperationException(
+						"Full join emulation requires order by expressions to be in the select list for grouped or distinct queries"
+				);
+			}
+			fullJoinEmulationExtraSelections = extraSelections;
+		}
+
+		final var emulationPlan = createFullJoinEmulationPlan( querySpec, fullJoins );
+		final var queryGroup = emulationPlan.queryGroup();
+		final var branches = emulationPlan.branches();
+
+		copyOrderAndOffsetFetch( querySpec, preservedSortSpecifications, queryGroup );
+
+		fullJoinEmulationInfos = fullJoins;
+		fullJoinEmulationBranches = branches;
+		fullJoinEmulationQueryGroup = queryGroup;
+		try {
+			queryGroup.accept( translator );
+		}
+		finally {
+			fullJoinEmulationInfos = null;
+			fullJoinEmulationBranches = null;
+			fullJoinEmulationQueryGroup = null;
+			fullJoinEmulationExtraSelections = null;
+			fullJoinEmulationNullPrecedenceSelectionIndexes = null;
+		}
+	}
+
+	private FullJoinEmulationPlan createFullJoinEmulationPlan(QuerySpec querySpec, List<FullJoinEmulationInfo> fullJoins) {
+		return translator.getDialect().supportsExceptAll()
+				? createExceptAllEmulationPlan( querySpec, fullJoins.size() )
+				: createNullnessPredicateEmulationPlan( querySpec, fullJoins );
+	}
+
+	private FullJoinEmulationPlan createExceptAllEmulationPlan(QuerySpec querySpec, int fullJoinCount) {
+		return createExceptAllEmulationPlan(
+				querySpec.isRoot() ? querySpec : querySpec.asRootQuery(),
+				fullJoinCount,
+				0,
+				new SqlAstJoinType[fullJoinCount],
+				querySpec.isRoot()
+		);
+	}
+
+	private FullJoinEmulationPlan createExceptAllEmulationPlan(
+			QuerySpec branchBase,
+			int fullJoinCount,
+			int index,
+			SqlAstJoinType[] joinSides,
+			boolean root) {
+		final List<? extends QueryPart> queryParts;
+		final QueryPart innerQueryPart;
+		final List<FullJoinEmulationBranch> branches;
+		if ( index + 1 == fullJoinCount ) {
+			joinSides[index] = LEFT;
+			final var left = createFullJoinEmulationBranch( branchBase, joinSides );
+			joinSides[index] = RIGHT;
+			final var right = createFullJoinEmulationBranch( branchBase, joinSides );
+			joinSides[index] = INNER;
+			final var inner = createFullJoinEmulationBranch( branchBase, joinSides );
+			branches = List.of( left, right, inner );
+			queryParts = List.of( left.querySpec(), right.querySpec() );
+			innerQueryPart = inner.querySpec();
+		}
+		else {
+			joinSides[index] = LEFT;
+			final var left = createExceptAllEmulationPlan( branchBase, fullJoinCount, index + 1, joinSides, false );
+			joinSides[index] = RIGHT;
+			final var right = createExceptAllEmulationPlan( branchBase, fullJoinCount, index + 1, joinSides, false );
+			joinSides[index] = INNER;
+			final var inner = createExceptAllEmulationPlan( branchBase, fullJoinCount, index + 1, joinSides, false );
+			queryParts = List.of( left.queryGroup(), right.queryGroup() );
+			innerQueryPart = inner.queryGroup();
+			branches = new ArrayList<>();
+			branches.addAll( left.branches() );
+			branches.addAll( right.branches() );
+			branches.addAll( inner.branches() );
+		}
+		final var unionAll = new QueryGroup( false, UNION_ALL, queryParts );
+		final var exceptAll = new QueryGroup( root, EXCEPT_ALL, List.of( unionAll, innerQueryPart ) );
+		return new FullJoinEmulationPlan( exceptAll, branches );
+	}
+
+	private FullJoinEmulationPlan createNullnessPredicateEmulationPlan(QuerySpec querySpec, List<FullJoinEmulationInfo> fullJoins) {
+		final var branches = createNullnessPredicateEmulationPlanBranches(
+				querySpec.isRoot()
+						? querySpec
+						: querySpec.asRootQuery(),
+				fullJoins,
+				0,
+				new SqlAstJoinType[fullJoins.size()],
+				null,
+				emptyList(),
+				false
+		);
+		return new FullJoinEmulationPlan(
+				new QueryGroup( querySpec.isRoot(), UNION_ALL,
+						branches.stream().map( FullJoinEmulationBranch::querySpec ).toList() ),
+				branches
+		);
+	}
+
+	private FullJoinEmulationBranch createFullJoinEmulationBranch(
+			QuerySpec branchBase,
+			SqlAstJoinType[] joinSides) {
+		final var branchQuery = branchBase.asSubQuery();
+		clearSortAndOffsetFetch( branchQuery );
+		return new FullJoinEmulationBranch( branchQuery, joinSides.clone() );
+	}
+
+	private List<FullJoinEmulationBranch> createNullnessPredicateEmulationPlanBranches(
+			QuerySpec branchBase,
+			List<FullJoinEmulationInfo> fullJoins,
+			int index,
+			SqlAstJoinType[] joinSides,
+			Predicate predicate,
+			List<Predicate> pendingLeftJoinNotNullPredicates,
+			boolean rightJoinSeen) {
+		if ( index == fullJoins.size() ) {
+			final var branchQuery = branchBase.asSubQuery();
+			clearSortAndOffsetFetch( branchQuery );
+			if ( predicate != null ) {
+				branchQuery.applyPredicate( predicate );
+			}
+			return List.of( new FullJoinEmulationBranch( branchQuery, joinSides.clone() ) );
+		}
+		else {
+			final var leftTableGroup = fullJoins.get( index ).leftTableGroup();
+			final var leftTableGroupNullnessPredicate = createTableGroupNullnessPredicate( leftTableGroup );
+			final var leftTableGroupNotNullnessPredicate = createTableGroupNotNullnessPredicate( leftTableGroup );
+
+			joinSides[index] = LEFT;
+			final var left = createNullnessPredicateEmulationPlanBranches(
+					branchBase,
+					fullJoins,
+					index + 1,
+					joinSides,
+					rightJoinSeen
+							? combinePredicates( predicate,
+									leftTableGroupNotNullnessPredicate )
+							: predicate,
+					rightJoinSeen
+							? emptyList()
+							: appendPredicate( pendingLeftJoinNotNullPredicates,
+									leftTableGroupNotNullnessPredicate ),
+					rightJoinSeen
+			);
+
+			joinSides[index] = RIGHT;
+			final var right = createNullnessPredicateEmulationPlanBranches(
+					branchBase,
+					fullJoins,
+					index + 1,
+					joinSides,
+					combinedRightPredicate( predicate,
+							pendingLeftJoinNotNullPredicates,
+							leftTableGroupNullnessPredicate ),
+					emptyList(),
+					true
+			);
+			return combine( left, right );
+		}
+	}
+
+	private static Predicate combinedRightPredicate(
+			Predicate predicate,
+			List<Predicate> pendingLeftJoinNotNullPredicates,
+			Predicate leftTableGroupNullnessPredicate) {
+		Predicate rightPredicate = combinePredicates( predicate, leftTableGroupNullnessPredicate );
+		for ( var pendingLeftJoinNotNullPredicate : pendingLeftJoinNotNullPredicates ) {
+			rightPredicate = combinePredicates( rightPredicate, pendingLeftJoinNotNullPredicate );
+		}
+		return rightPredicate;
+	}
+
+	private static void clearSortAndOffsetFetch(QuerySpec querySpec) {
+		final var sortSpecifications = querySpec.getSortSpecifications();
+		if ( sortSpecifications != null ) {
+			sortSpecifications.clear();
+		}
+		querySpec.setOffsetClauseExpression( null );
+		querySpec.setFetchClauseExpression( null, null );
+	}
+
+	private List<Predicate> appendPredicate(List<Predicate> predicates, Predicate predicate) {
+		final List<Predicate> combined = new ArrayList<>( predicates.size() + 1 );
+		combined.addAll( predicates );
+		combined.add( predicate );
+		return combined;
+	}
+
+	private void copyOrderAndOffsetFetch(
+			QuerySpec source,
+			List<SortSpecification> sortSpecifications,
+			QueryGroup target) {
+		if ( sortSpecifications != null ) {
+			for ( var sortSpecification : sortSpecifications ) {
+				target.addSortSpecification( sortSpecification );
+			}
+		}
+		final var offsetClauseExpression = source.getOffsetClauseExpression();
+		if ( offsetClauseExpression != null ) {
+			target.setOffsetClauseExpression( offsetClauseExpression );
+		}
+		final var fetchClauseExpression = source.getFetchClauseExpression();
+		if ( fetchClauseExpression != null ) {
+			target.setFetchClauseExpression( fetchClauseExpression, source.getFetchClauseType() );
+		}
+	}
+
+	private void renderFullJoinEmulationBranch(QuerySpec querySpec, SqlAstJoinType[] joinSides, Consumer<QuerySpec> renderQuerySpec) {
+		applyFullJoinJoinType( joinSides );
+		final boolean previousRenderingBranch = renderingFullJoinEmulationBranch;
+		renderingFullJoinEmulationBranch = true;
+		try {
+			if ( translator.getDialect().supportsDuplicateSelectItemsInQueryGroup() ) {
+				renderQuerySpec.accept( querySpec );
+			}
+			else {
+				translator.withRowNumbering( null, true,
+						() -> renderQuerySpec.accept( querySpec ) );
+			}
+		}
+		finally {
+			renderingFullJoinEmulationBranch = previousRenderingBranch;
+			restoreFullJoinJoinType();
+		}
+	}
+
+	private void applyFullJoinJoinType(SqlAstJoinType[] joinTypes) {
+		for ( int i = 0; i < fullJoinEmulationInfos.size(); i++ ) {
+			fullJoinEmulationInfos.get( i ).join().setJoinType( joinTypes[i] );
+		}
+	}
+
+	private void restoreFullJoinJoinType() {
+		for ( var info : fullJoinEmulationInfos ) {
+			info.join().setJoinType( info.originalJoinType() );
+		}
+	}
+
+	private void collectFullJoinEmulationInfos(TableGroup tableGroup, List<FullJoinEmulationInfo> fullJoins) {
+		collectFullJoinEmulationInfos( tableGroup, tableGroup.getTableGroupJoins(), fullJoins );
+		collectFullJoinEmulationInfos( tableGroup, tableGroup.getNestedTableGroupJoins(), fullJoins );
+	}
+
+	private List<FullJoinEmulationInfo> collectFullJoinEmulationInfos(QuerySpec querySpec) {
+		final var fromClause = querySpec.getFromClause();
+		if ( fromClause == null || fromClause.getRoots().isEmpty() ) {
+			return emptyList();
+		}
+		else {
+			final List<FullJoinEmulationInfo> fullJoins = new ArrayList<>();
+			for ( var root : fromClause.getRoots() ) {
+				collectFullJoinEmulationInfos( root, fullJoins );
+			}
+			return fullJoins;
+		}
+	}
+
+	private void collectFullJoinEmulationInfos(
+			TableGroup leftTableGroup,
+			List<TableGroupJoin> joins,
+			List<FullJoinEmulationInfo> fullJoins) {
+		for ( var join : joins ) {
+			if ( join.getJoinType() == SqlAstJoinType.FULL ) {
+				fullJoins.add( new FullJoinEmulationInfo( leftTableGroup, join ) );
+			}
+			final var joinedGroup = join.getJoinedGroup();
+			if ( joinedGroup != null ) {
+				collectFullJoinEmulationInfos( joinedGroup, fullJoins );
+			}
+		}
+	}
+
+	private Predicate createTableGroupNullnessPredicate(TableGroup tableGroup) {
+		return createValuedModelPartNullnessPredicate( tableGroup,
+				getValuedModelPart( tableGroup.getModelPart() ),
+				false );
+	}
+
+	private Predicate createTableGroupNotNullnessPredicate(TableGroup tableGroup) {
+		return createValuedModelPartNullnessPredicate( tableGroup,
+				getValuedModelPart( tableGroup.getModelPart() ),
+				true );
+	}
+
+	private static ValuedModelPart getValuedModelPart(ModelPartContainer modelPart) {
+		if ( modelPart instanceof EntityMappingType mappingType ) {
+			return mappingType.getIdentifierMapping();
+		}
+		else if ( modelPart instanceof EntityValuedModelPart entityValuedModelPart ) {
+			return entityValuedModelPart.getEntityMappingType().getIdentifierMapping();
+		}
+		else if ( modelPart instanceof PluralAttributeMapping pluralAttributeMapping ) {
+			return pluralAttributeMapping.getKeyDescriptor();
+		}
+		else if ( modelPart instanceof ValuedModelPart directValuedModelPart ) {
+			return directValuedModelPart;
+		}
+		else {
+			throw new UnsupportedOperationException(
+					"Full join emulation requires a table group with selectable columns but got: "
+					+ modelPart.getPartName()
+			);
+		}
+	}
+
+	private Predicate createValuedModelPartNullnessPredicate(
+			TableGroup tableGroup,
+			ValuedModelPart valuedModelPart,
+			boolean negated) {
+		final List<ColumnReference> columnReferences = new ArrayList<>( valuedModelPart.getJdbcTypeCount() );
+		valuedModelPart.forEachSelectable( (selectionIndex, selectableMapping) -> {
+			final var tableReference = tableGroup.resolveTableReference(
+					tableGroup.getNavigablePath(),
+					valuedModelPart,
+					selectableMapping.getContainingTableExpression()
+			);
+			columnReferences.add( new ColumnReference( tableReference, selectableMapping ) );
+		} );
+
+		return new NullnessPredicate( columnReferences.size() == 1
+				? columnReferences.get( 0 )
+				: new SqlTuple( columnReferences, valuedModelPart ),
+				negated );
+	}
+
+	private FullJoinEmulationBranch findFullJoinEmulationBranch(QuerySpec querySpec) {
+		if ( fullJoinEmulationBranches != null ) {
+			for ( var branch : fullJoinEmulationBranches ) {
+				if ( branch.querySpec() == querySpec ) {
+					return branch;
+				}
+			}
+		}
+		return null;
+	}
+
+	private void renderFullJoinEmulationSortSpecification(SortSpecification sortSpecification) {
+		final var tuple = getSqlTuple( sortSpecification.getSortExpression() );
+		final int[] sortSelectionIndexes = sortSpecification.getSortSelectionIndexes();
+		final int[] nullPrecedenceSelectionIndexes =
+				fullJoinEmulationNullPrecedenceSelectionIndexes == null
+						? null
+						: fullJoinEmulationNullPrecedenceSelectionIndexes.get( sortSpecification );
+		final int count = tuple == null ? 1 : tuple.getExpressions().size();
+		String separator = NO_SEPARATOR;
+		for ( int i = 0; i < count; i++ ) {
+			translator.appendSql( separator );
+			renderFullJoinEmulationSortExpression(
+					sortSpecification,
+					sortSelectionIndexes[i],
+					nullPrecedenceSelectionIndexes == null ? -1 : nullPrecedenceSelectionIndexes[i]
+			);
+			separator = COMMA_SEPARATOR;
+		}
+	}
+
+	private void renderFullJoinEmulationSortExpression(
+			SortSpecification sortSpecification,
+			int sortSelectionIndex,
+			int nullPrecedenceSelectionIndex) {
+		if ( sortSpecification.isIgnoreCase() ) {
+			throw new UnsupportedOperationException( "Full join emulation does not support ignore case ordering for union queries" );
+		}
+		if ( sortSelectionIndex < 0 ) {
+			throw new UnsupportedOperationException( "Full join emulation requires order by expressions to be in the select list for union queries" );
+		}
+
+		final var sortOrder = sortSpecification.getSortOrder();
+		final var nullPrecedence = resolveRenderedNullPrecedence( sortSpecification );
+		final boolean renderNullPrecedence = nullPrecedence != null;
+		final boolean supportsNullPrecedence = renderNullPrecedence && translator.getDialect().supportsNullPrecedence();
+		if ( renderNullPrecedence && !supportsNullPrecedence ) {
+			if ( nullPrecedenceSelectionIndex < 0 ) {
+				throw new IllegalStateException( "Full join emulation null precedence index is missing for union query ordering" );
+			}
+			translator.appendSql( nullPrecedenceSelectionIndex + 1 );
+			translator.appendSql( COMMA_SEPARATOR );
+		}
+
+		translator.appendSql( sortSelectionIndex + 1 );
+
+		if ( sortOrder == SortDirection.DESCENDING ) {
+			translator.appendSql( " desc" );
+		}
+		else if ( sortOrder == SortDirection.ASCENDING && renderNullPrecedence && supportsNullPrecedence ) {
+			translator.appendSql( " asc" );
+		}
+
+		if ( renderNullPrecedence && supportsNullPrecedence ) {
+			translator.appendSql( " nulls " );
+			translator.appendSql( nullPrecedence == Nulls.LAST ? "last" : "first" );
+		}
+	}
+
+	private void renderFullJoinEmulationAdditionalSelectItems(SelectClause selectClause) {
+		final boolean forceSelectAliases =
+				!translator.getDialect()
+						.supportsDuplicateSelectItemsInQueryGroup();
+		String separator =
+				countRenderedSelectItems( selectClause ) > 0
+						? COMMA_SEPARATOR
+						: NO_SEPARATOR;
+		final int aliasOffset = countRenderedSelectItems( selectClause );
+		int aliasIndex = 0;
+		for ( var extraExpression : fullJoinEmulationExtraSelections ) {
+			translator.appendSql( separator );
+			translator.renderSelectExpression( extraExpression );
+			if ( forceSelectAliases ) {
+				translator.appendSql( ' ' );
+				translator.appendSql( 'c' );
+				translator.appendSql( aliasOffset + aliasIndex );
+			}
+			aliasIndex++;
+			separator = COMMA_SEPARATOR;
+		}
+	}
+
+	public static int countRenderedSelectItems(SelectClause selectClause) {
+		int count = 0;
+		for ( var sqlSelection : selectClause.getSqlSelections() ) {
+			if ( !sqlSelection.isVirtual() ) {
+				final var tuple = getSqlTuple( sqlSelection.getExpression() );
+				if ( tuple != null ) {
+					count += tuple.getExpressions().size();
+				}
+				else {
+					count++;
+				}
+			}
+		}
+		return count;
+	}
+
+	private List<Expression> collectFullJoinEmulationExtraSelections(QuerySpec querySpec, int selectItemCount) {
+		final var sortSpecifications = querySpec.getSortSpecifications();
+		if ( sortSpecifications == null || sortSpecifications.isEmpty() ) {
+			return emptyList();
+		}
+		else {
+			final List<Expression> extraSelections = new ArrayList<>();
+			IdentityHashMap<SortSpecification, int[]> nullPrecedenceSelectionIndexes = null;
+			for ( var sortSpecification : sortSpecifications ) {
+				resolveSortSelectionIndexes( sortSpecification, selectItemCount, extraSelections );
+				final var nullPrecedence = resolveRenderedNullPrecedence( sortSpecification );
+				if ( nullPrecedence != null && !translator.getDialect().supportsNullPrecedence() ) {
+					if ( nullPrecedenceSelectionIndexes == null ) {
+						nullPrecedenceSelectionIndexes = new IdentityHashMap<>();
+					}
+					resolveSortNullPrecedenceSelectionIndexes(
+							sortSpecification,
+							nullPrecedence,
+							selectItemCount,
+							extraSelections,
+							nullPrecedenceSelectionIndexes
+					);
+				}
+			}
+			fullJoinEmulationNullPrecedenceSelectionIndexes = nullPrecedenceSelectionIndexes;
+			return extraSelections;
+		}
+	}
+
+	private void resolveSortSelectionIndexes(
+			SortSpecification sortSpecification,
+			int selectItemCount,
+			List<Expression> extraSelections) {
+		final int[] sortSelectionIndexes = sortSpecification.getSortSelectionIndexes();
+		final var expressions = getSortExpressions( sortSpecification );
+		for ( int i = 0; i < expressions.size(); i++ ) {
+			if ( sortSelectionIndexes[i] < 0 ) {
+				extraSelections.add( expressions.get( i ) );
+				sortSelectionIndexes[i] = selectItemCount + extraSelections.size() - 1;
+			}
+		}
+	}
+
+	private void resolveSortNullPrecedenceSelectionIndexes(
+			SortSpecification sortSpecification,
+			Nulls nullPrecedence,
+			int selectItemCount,
+			List<Expression> extraSelections,
+			IdentityHashMap<SortSpecification, int[]> nullPrecedenceSelectionIndexes) {
+		final var expressions = getSortExpressions( sortSpecification );
+		final int[] indexes = new int[expressions.size()];
+		for ( int i = 0; i < expressions.size(); i++ ) {
+			extraSelections.add( createSortNullPrecedenceEmulationExpression( expressions.get( i ), nullPrecedence ) );
+			indexes[i] = selectItemCount + extraSelections.size() - 1;
+		}
+		nullPrecedenceSelectionIndexes.put( sortSpecification, indexes );
+	}
+
+	private List<? extends Expression> getSortExpressions(SortSpecification sortSpecification) {
+		final var sortExpression = sortSpecification.getSortExpression();
+		final int[] sortSelectionIndexes = sortSpecification.getSortSelectionIndexes();
+		if ( sortSelectionIndexes == null ) {
+			throw new IllegalStateException( "SortSpecification is missing selection indexes" );
+		}
+		final var tuple = getSqlTuple( sortExpression );
+		final var expressions = tuple == null ? List.of( sortExpression ) : tuple.getExpressions();
+		if ( sortSelectionIndexes.length != expressions.size() ) {
+			throw new IllegalStateException( "SortSpecification selection indexes size mismatch" );
+		}
+		return expressions;
+	}
+
+	private Nulls resolveRenderedNullPrecedence(SortSpecification sortSpecification) {
+		final var sortOrder = sortSpecification.getSortOrder();
+		Nulls nullPrecedence = sortSpecification.getNullPrecedence();
+		if ( nullPrecedence == null || nullPrecedence == Nulls.NONE ) {
+			nullPrecedence =
+					translator.getSessionFactory().getSessionFactoryOptions()
+							.getDefaultNullPrecedence();
+		}
+		if ( nullPrecedence == null
+				|| isDefaultOrdering( nullPrecedence, sortOrder,
+						translator.getDialect().getNullOrdering() ) ) {
+			return null;
+		}
+		return nullPrecedence;
+	}
+
+	private Expression createSortNullPrecedenceEmulationExpression(Expression sortExpression, Nulls nullPrecedence) {
+		final var integerType = translator.getIntegerType();
+		return new CaseSearchedExpression(
+				integerType,
+				List.of( new CaseSearchedExpression.WhenFragment(
+						new NullnessPredicate( sortExpression ),
+						new QueryLiteral<>( nullPrecedence == Nulls.FIRST ? 0 : 1, integerType )
+				) ),
+				new QueryLiteral<>( nullPrecedence == Nulls.FIRST ? 1 : 0, integerType )
+		);
+	}
+
+	private record FullJoinEmulationInfo(TableGroup leftTableGroup, TableGroupJoin join, SqlAstJoinType originalJoinType) {
+		FullJoinEmulationInfo(TableGroup leftTableGroup, TableGroupJoin join) {
+			this( leftTableGroup, join, join.getJoinType() );
+		}
+	}
+
+	private record FullJoinEmulationPlan(QueryGroup queryGroup, List<FullJoinEmulationBranch> branches) {}
+
+	private record FullJoinEmulationBranch(QuerySpec querySpec, SqlAstJoinType[] joinSides) {}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/LockingClauseStrategy.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/LockingClauseStrategy.java
index 767562a79191..1e5297659bec 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/LockingClauseStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/LockingClauseStrategy.java
@@ -29,7 +29,7 @@
 /// @implSpec Note that this is also used to determine and track which
 /// tables to lock even for cases (T-SQL e.g.) where a "locking clause"
 /// per-se won't be used.  In such cases, only the first phase (along
-/// with [#shouldLockRoot] and [#shouldLockJoin]) have any impact.
+/// with `shouldLockRoot()` and `shouldLockJoin()`) have any impact.
 ///
 /// @see org.hibernate.dialect.Dialect#getLockingClauseStrategy
 /// @see org.hibernate.sql.exec.spi.JdbcSelectWithActionsBuilder
@@ -49,6 +49,10 @@ public interface LockingClauseStrategy {
 	/// of [roots][#registerRoot] and [joins][#registerJoin]
 	boolean containsOuterJoins();
 
+	/// Are any joins encountered during registration
+	/// of [roots][#registerRoot] and [joins][#registerJoin]
+	boolean containsJoins();
+
 	/// For cases where a locking clause is to be used,
 	/// render that locking clause.
 	void render(SqlAppender sqlAppender);
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/NestedCorrelationChecker.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/NestedCorrelationChecker.java
new file mode 100644
index 000000000000..4952fe8bf023
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/NestedCorrelationChecker.java
@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.ast.spi;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.hibernate.sql.ast.tree.SqlAstNode;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.ast.tree.select.QuerySpec;
+
+/**
+ * A walker that detects nested correlation where a deeper subquery references
+ * an intermediate subquery's table alias.
+ *
+ * @author Yoobin Yoon
+ */
+public class NestedCorrelationChecker extends AbstractSqlAstWalker {
+
+	private final Set<String> currentAliases = new HashSet<>();
+	protected List<String> currentLevelAliases;
+
+	protected static class NestedCorrelationException extends RuntimeException {
+		@Override
+		public Throwable fillInStackTrace() {
+			return this;
+		}
+	}
+
+	public static boolean hasNestedCorrelation(SqlAstNode node) {
+		try {
+			node.accept( new NestedCorrelationChecker() );
+			return false;
+		}
+		catch (NestedCorrelationException ex) {
+			return true;
+		}
+	}
+
+	@Override
+	public void visitQuerySpec(QuerySpec querySpec) {
+		if ( currentLevelAliases != null ) {
+			currentAliases.addAll( currentLevelAliases );
+		}
+		List<String> aliases = new ArrayList<>();
+		if ( querySpec.getFromClause() != null ) {
+			querySpec.getFromClause().visitTableReferences( tableReference -> {
+				String alias = tableReference.getIdentificationVariable();
+				if ( alias != null && !currentAliases.contains( alias ) ) {
+					aliases.add( alias );
+				}
+			} );
+		}
+
+		List<String> previousLevelAliases = currentLevelAliases;
+		currentLevelAliases = aliases;
+		super.visitQuerySpec( querySpec );
+		currentLevelAliases = previousLevelAliases;
+		if ( previousLevelAliases != null ) {
+			currentAliases.removeAll( previousLevelAliases );
+		}
+	}
+
+	@Override
+	public void visitColumnReference(ColumnReference columnReference) {
+		String qualifier = columnReference.getQualifier();
+		if ( qualifier != null && currentAliases.contains( qualifier ) ) {
+			throw new NestedCorrelationException();
+		}
+		super.visitColumnReference( columnReference );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/NestedOrTargetTableCorrelationVisitor.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/NestedOrTargetTableCorrelationVisitor.java
new file mode 100644
index 000000000000..9881b77e56bd
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/NestedOrTargetTableCorrelationVisitor.java
@@ -0,0 +1,63 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.ast.spi;
+
+import org.hibernate.sql.ast.tree.MutationStatement;
+import org.hibernate.sql.ast.tree.delete.DeleteStatement;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.ast.tree.update.UpdateStatement;
+
+/**
+ * A walker that detects both nested correlation and target table correlation in a single pass.
+ *
+ * @author Yoobin Yoon
+ */
+public class NestedOrTargetTableCorrelationVisitor extends NestedCorrelationChecker {
+
+	private final String targetAlias;
+
+	public static boolean hasCorrelation(MutationStatement statement) {
+		final String targetAlias = statement.getTargetTable().getIdentificationVariable();
+		if ( targetAlias == null ) {
+			return false;
+		}
+		try {
+			if ( statement instanceof DeleteStatement deleteStatement ) {
+				if ( deleteStatement.getRestriction() != null ) {
+					deleteStatement.getRestriction().accept( new NestedOrTargetTableCorrelationVisitor( targetAlias ) );
+				}
+			}
+			else if ( statement instanceof UpdateStatement updateStatement ) {
+				final NestedOrTargetTableCorrelationVisitor visitor = new NestedOrTargetTableCorrelationVisitor(
+						targetAlias );
+				if ( updateStatement.getAssignments() != null ) {
+					for ( var assignment : updateStatement.getAssignments() ) {
+						assignment.getAssignedValue().accept( visitor );
+					}
+				}
+				if ( updateStatement.getRestriction() != null ) {
+					updateStatement.getRestriction().accept( visitor );
+				}
+			}
+			return false;
+		}
+		catch (NestedCorrelationException ex) {
+			return true;
+		}
+	}
+
+	private NestedOrTargetTableCorrelationVisitor(String targetAlias) {
+		this.targetAlias = targetAlias;
+	}
+
+	@Override
+	public void visitColumnReference(ColumnReference columnReference) {
+		String qualifier = columnReference.getQualifier();
+		if ( currentLevelAliases != null && targetAlias.equals( qualifier ) ) {
+			throw new NestedCorrelationException();
+		}
+		super.visitColumnReference( columnReference );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ParameterMarkerStrategy.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ParameterMarkerStrategy.java
index 428d0d7f7321..9ef84bf50a91 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ParameterMarkerStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/ParameterMarkerStrategy.java
@@ -9,7 +9,7 @@
 
 /**
  * Strategy for generating parameter markers used in {@linkplain java.sql.PreparedStatement preparable} SQL strings.
- * <p/>
+ * <p>
  * Generally Hibernate will use the JDBC standard marker - {@code ?}.  Many JDBC drivers support the
  * use of the "native" marker syntax of the underlying database - e.g. {@code $n}, {@code ?n}, ...
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTranslatorWithMerge.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTranslatorWithMerge.java
index ee1cee398c5c..b2c5e1624b43 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTranslatorWithMerge.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTranslatorWithMerge.java
@@ -8,21 +8,19 @@
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.StringHelper;
+import org.hibernate.jdbc.Expectation;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.model.ast.ColumnValueBinding;
-import org.hibernate.sql.model.ast.ColumnWriteFragment;
 import org.hibernate.sql.model.internal.OptionalTableUpdate;
 import org.hibernate.sql.model.jdbc.MergeOperation;
 
 /**
  * Base for translators which support a full insert-or-update-or-delete (MERGE) command.
- * <p/>
+ * <p>
  * Use {@link #createMergeOperation(OptionalTableUpdate)} to translate an
  * {@linkplain OptionalTableUpdate} into an executable {@linkplain MergeOperation}
  * operation.
- * <p/>
- *
  *
  * @author Steve Ebersole
  */
@@ -39,20 +37,23 @@ public SqlAstTranslatorWithMerge(SessionFactoryImplementor sessionFactory, State
 	 */
 	public MergeOperation createMergeOperation(OptionalTableUpdate optionalTableUpdate) {
 		renderMergeStatement( optionalTableUpdate );
-
 		return new MergeOperation(
 				optionalTableUpdate.getMutatingTable().getTableMapping(),
 				optionalTableUpdate.getMutationTarget(),
 				getSql(),
+				expectation( optionalTableUpdate ),
 				getParameterBinders()
 		);
 	}
 
-//	@Override
-//	public void visitOptionalTableUpdate(OptionalTableUpdate tableUpdate) {
-//		renderMergeStatement(tableUpdate);
-//	}
-//
+	private static Expectation expectation(OptionalTableUpdate optionalTableUpdate) {
+		return optionalTableUpdate.getValueBindings().stream()
+					.anyMatch( ColumnValueBinding::isAttributeUpdatable )
+				? new Expectation.RowCount()
+				// Without updatable bindings, the merge affects 0 rows when matched
+				: new Expectation.OptionalRowCount();
+	}
+
 	/**
 	 * Renders the OptionalTableUpdate as a MERGE query.
 	 *
@@ -156,13 +157,7 @@ private void renderMergeUsingQuery(OptionalTableUpdate optionalTableUpdate) {
 	}
 
 	protected void renderMergeUsingQuerySelection(ColumnValueBinding selectionBinding) {
-		final ColumnWriteFragment valueExpression = selectionBinding.getValueExpression();
-		if ( valueExpression.getExpressionType().getJdbcType().isWriteExpressionTyped( getDialect() ) ) {
-			valueExpression.accept( this );
-		}
-		else {
-			renderCasted( valueExpression );
-		}
+		renderColumnWrite( selectionBinding );
 		appendSql( " " );
 		appendSql( selectionBinding.getColumnReference().getColumnExpression() );
 	}
@@ -202,11 +197,13 @@ protected void renderMergeInsert(OptionalTableUpdate optionalTableUpdate) {
 			keyBinding.getColumnReference().appendReadExpression( "s", valuesList::append );
 		}
 		for ( int i = 0; i < valueBindings.size(); i++ ) {
-			appendSql( ", " );
-			valuesList.append( ", " );
 			final ColumnValueBinding valueBinding = valueBindings.get( i );
-			appendSql( valueBinding.getColumnReference().getColumnExpression() );
-			valueBinding.getColumnReference().appendReadExpression( "s", valuesList::append );
+			if ( valueBinding.isAttributeInsertable() ) {
+				appendSql( ", " );
+				valuesList.append( ", " );
+				appendSql( valueBinding.getColumnReference().getColumnExpression() );
+				valueBinding.getColumnReference().appendReadExpression( "s", valuesList::append );
+			}
 		}
 
 		appendSql( ") values (" );
@@ -232,16 +229,24 @@ protected void renderMergeUpdate(OptionalTableUpdate optionalTableUpdate) {
 		final List<ColumnValueBinding> valueBindings = optionalTableUpdate.getValueBindings();
 		final List<ColumnValueBinding> optimisticLockBindings = optionalTableUpdate.getOptimisticLockBindings();
 
-		renderWhenMatched( optimisticLockBindings );
-		appendSql( " then update set " );
-		for ( int i = 0; i < valueBindings.size(); i++ ) {
-			final ColumnValueBinding binding = valueBindings.get( i );
-			if ( i > 0 ) {
-				appendSql( ", " );
+		if ( valueBindings.stream().anyMatch( ColumnValueBinding::isAttributeUpdatable ) ) {
+			renderWhenMatched( optimisticLockBindings );
+			appendSql( " then update set " );
+			boolean first = true;
+			for ( int i = 0; i < valueBindings.size(); i++ ) {
+				final ColumnValueBinding binding = valueBindings.get( i );
+				if ( binding.isAttributeUpdatable() ) {
+					if ( first ) {
+						first = false;
+					}
+					else {
+						appendSql( ", " );
+					}
+					binding.getColumnReference().appendColumnForWrite( this, null );
+					appendSql( "=" );
+					binding.getColumnReference().appendColumnForWrite( this, "s" );
+				}
 			}
-			binding.getColumnReference().appendColumnForWrite( this, null );
-			appendSql( "=" );
-			binding.getColumnReference().appendColumnForWrite( this, "s" );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTranslatorWithUpsert.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTranslatorWithUpsert.java
index b914a4270dab..d44336f35c02 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTranslatorWithUpsert.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlAstTranslatorWithUpsert.java
@@ -7,12 +7,12 @@
 import java.util.List;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.jdbc.Expectation;
 import org.hibernate.persister.entity.mutation.EntityTableMapping;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.ast.ColumnValueBinding;
-import org.hibernate.sql.model.ast.ColumnWriteFragment;
 import org.hibernate.sql.model.internal.OptionalTableUpdate;
 import org.hibernate.sql.model.jdbc.DeleteOrUpsertOperation;
 import org.hibernate.sql.model.jdbc.UpsertOperation;
@@ -37,6 +37,8 @@ public MutationOperation createMergeOperation(OptionalTableUpdate optionalTableU
 				optionalTableUpdate.getMutatingTable().getTableMapping(),
 				optionalTableUpdate.getMutationTarget(),
 				getSql(),
+				// Without value bindings, the upsert may have an update count of 0
+				expectation( optionalTableUpdate ),
 				getParameterBinders()
 		);
 
@@ -48,6 +50,14 @@ public MutationOperation createMergeOperation(OptionalTableUpdate optionalTableU
 		);
 	}
 
+	private static Expectation expectation(OptionalTableUpdate optionalTableUpdate) {
+		return optionalTableUpdate.getValueBindings().stream()
+					.anyMatch( ColumnValueBinding::isAttributeUpdatable )
+				? new Expectation.RowCount()
+				// Without updatable bindings, the merge affects 0 rows when matched
+				: new Expectation.OptionalRowCount();
+	}
+
 	protected void renderUpsertStatement(OptionalTableUpdate optionalTableUpdate) {
 		// template:
 		//
@@ -107,32 +117,20 @@ protected void renderMergeSource(OptionalTableUpdate optionalTableUpdate) {
 		appendSql( " values (" );
 
 		for ( int i = 0; i < keyBindings.size(); i++ ) {
-			final ColumnValueBinding keyBinding = keyBindings.get( i );
 			if ( i > 0 ) {
 				appendSql( ", " );
 				columnList.append( ", " );
 			}
+			final ColumnValueBinding keyBinding = keyBindings.get( i );
 			columnList.append( keyBinding.getColumnReference().getColumnExpression() );
-			final ColumnWriteFragment valueExpression = keyBinding.getValueExpression();
-			if ( valueExpression.getExpressionType().getJdbcType().isWriteExpressionTyped( getDialect() ) ) {
-				valueExpression.accept( this );
-			}
-			else {
-				renderCasted( valueExpression );
-			}
+			renderColumnWrite( keyBinding );
 		}
 		for ( int i = 0; i < valueBindings.size(); i++ ) {
 			appendSql( ", " );
 			columnList.append( ", " );
 			final ColumnValueBinding valueBinding = valueBindings.get( i );
 			columnList.append( valueBinding.getColumnReference().getColumnExpression() );
-			final ColumnWriteFragment valueExpression = valueBinding.getValueExpression();
-			if ( valueExpression.getExpressionType().getJdbcType().isWriteExpressionTyped( getDialect() ) ) {
-				valueExpression.accept( this );
-			}
-			else {
-				renderCasted( valueExpression );
-			}
+			renderColumnWrite( valueBinding );
 		}
 
 		appendSql( ") " );
@@ -187,11 +185,13 @@ protected void renderMergeInsert(OptionalTableUpdate optionalTableUpdate) {
 			keyBinding.getColumnReference().appendReadExpression( "s", valuesList::append );
 		}
 		for ( int i = 0; i < valueBindings.size(); i++ ) {
-			appendSql( ", " );
-			valuesList.append( ", " );
 			final ColumnValueBinding valueBinding = valueBindings.get( i );
-			appendSql( valueBinding.getColumnReference().getColumnExpression() );
-			valueBinding.getColumnReference().appendReadExpression( "s", valuesList::append );
+			if ( valueBinding.isAttributeInsertable() ) {
+				appendSql( ", " );
+				valuesList.append( ", " );
+				appendSql( valueBinding.getColumnReference().getColumnExpression() );
+				valueBinding.getColumnReference().appendReadExpression( "s", valuesList::append );
+			}
 		}
 
 		appendSql( ") values (" );
@@ -203,17 +203,25 @@ protected void renderMergeUpdate(OptionalTableUpdate optionalTableUpdate) {
 		final List<ColumnValueBinding> valueBindings = optionalTableUpdate.getValueBindings();
 		final List<ColumnValueBinding> optimisticLockBindings = optionalTableUpdate.getOptimisticLockBindings();
 
-		appendSql( "when matched then update set " );
-		for ( int i = 0; i < valueBindings.size(); i++ ) {
-			final ColumnValueBinding binding = valueBindings.get( i );
-			if ( i > 0 ) {
-				appendSql( ", " );
+		if ( valueBindings.stream().anyMatch( ColumnValueBinding::isAttributeUpdatable ) ) {
+			appendSql( "when matched then update set " );
+			boolean first = true;
+			for ( int i = 0; i < valueBindings.size(); i++ ) {
+				final ColumnValueBinding binding = valueBindings.get( i );
+				if ( binding.isAttributeUpdatable() ) {
+					if ( first ) {
+						first = false;
+					}
+					else {
+						appendSql( ", " );
+					}
+					binding.getColumnReference().appendColumnForWrite( this, "t" );
+					appendSql( "=" );
+					binding.getColumnReference().appendColumnForWrite( this, "s" );
+				}
 			}
-			binding.getColumnReference().appendColumnForWrite( this, "t" );
-			appendSql( "=" );
-			binding.getColumnReference().appendColumnForWrite( this, "s" );
+			renderMatchedWhere( optimisticLockBindings );
 		}
-		renderMatchedWhere( optimisticLockBindings );
 	}
 
 	private void renderMatchedWhere(List<ColumnValueBinding> optimisticLockBindings) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelection.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelection.java
index 2d070b3722d1..c1e5ee1965e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelection.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/SqlSelection.java
@@ -9,55 +9,36 @@
 import org.hibernate.sql.ast.tree.SqlAstNode;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
-import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
 import org.hibernate.sql.ast.SqlAstWalker;
 import org.hibernate.type.descriptor.ValueExtractor;
 
-/**
- * @asciidoclet
- *
- * Represents a selection at the SQL/JDBC level.  Essentially made up of:
- *
- * 		{@link #getJdbcValueExtractor}:: How to read a value from JDBC (conceptually similar to a method reference)
- * 		{@link #getValuesArrayPosition}:: The position for this selection in relation to the "JDBC values array" (see {@link RowProcessingState#getJdbcValue})
- * 		{@link #getJdbcResultSetIndex()}:: The position for this selection in relation to the JDBC object (ResultSet, etc)
- *
- *
- * @author Steve Ebersole
- */
+/// Represents a selection at the SQL/JDBC level.  Essentially made up of:
+/// * [#getJdbcValueExtractor()]: How to read a value from JDBC (conceptually similar to a method reference)
+/// * [#getValuesArrayPosition()]: The position for this selection in relation to the "JDBC values array" (see `getJdbcValue`)
+/// * [#getJdbcResultSetIndex()]: The position for this selection in relation to the JDBC object (ResultSet, etc)
+///
+/// @author Steve Ebersole
 public interface SqlSelection extends SqlAstNode {
-	/**
-	 * Get the extractor that can be used to extract JDBC values for this selection
-	 */
+	/// Get the extractor that can be used to extract JDBC values for this selection
 	ValueExtractor getJdbcValueExtractor();
 
-	/**
-	 * Get the position within the "JDBC values" array (0-based).  Negative indicates this is
-	 * not a "real" selection
-	 */
+	/// Get the position within the "JDBC values" array (0-based).  Negative indicates this is
+	/// not a "real" selection
 	int getValuesArrayPosition();
 
-	/**
-	 * Get the JDBC position (1-based)
-	 */
+	/// Get the JDBC position (1-based)
 	default int getJdbcResultSetIndex() {
 		return getValuesArrayPosition() + 1;
 	}
 
-	/**
-	 * The underlying expression.
-	 */
+	/// The underlying expression.
 	Expression getExpression();
 
-	/**
-	 * Get the type of the expression
-	 */
+	/// Get the type of the expression
 	JdbcMappingContainer getExpressionType();
 
-	/**
-	 * Whether this is a virtual or a real selection item.
-	 * Virtual selection items are not rendered into the SQL select clause.
-	 */
+	/// Whether this is a virtual or a real selection item.
+	/// Virtual selection items are not rendered into the SQL select clause.
 	boolean isVirtual();
 
 	void accept(SqlAstWalker sqlAstWalker);
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java
index 59cf7cc5c62d..a72adb7b93a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/StandardSqlAstTranslatorFactory.java
@@ -12,7 +12,7 @@
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 import org.hibernate.sql.model.ast.TableMutation;
 import org.hibernate.sql.model.jdbc.JdbcMutationOperation;
 
@@ -24,7 +24,7 @@
 public class StandardSqlAstTranslatorFactory implements SqlAstTranslatorFactory {
 
 	@Override
-	public SqlAstTranslator<JdbcOperationQuerySelect> buildSelectTranslator(SessionFactoryImplementor sessionFactory, SelectStatement statement) {
+	public SqlAstTranslator<JdbcSelect> buildSelectTranslator(SessionFactoryImplementor sessionFactory, SelectStatement statement) {
 		return buildTranslator( sessionFactory, statement );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractMutationStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractMutationStatement.java
index a01584b203df..73ef7b7f45a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractMutationStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractMutationStatement.java
@@ -9,6 +9,7 @@
 import org.hibernate.sql.ast.tree.cte.CteContainer;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
+import org.hibernate.sql.model.MutationTarget;
 
 /**
  * @author Christian Beikov
@@ -17,13 +18,24 @@ public abstract class AbstractMutationStatement extends AbstractStatement implem
 
 	private final NamedTableReference targetTable;
 	private final List<ColumnReference> returningColumns;
+	private final MutationTarget<?> mutationTarget;
 
+	@Deprecated(forRemoval = true, since = "7.3")
 	public AbstractMutationStatement(
 			CteContainer cteContainer,
 			NamedTableReference targetTable,
 			List<ColumnReference> returningColumns) {
+		this( cteContainer, targetTable, null, returningColumns );
+	}
+
+	public AbstractMutationStatement(
+			CteContainer cteContainer,
+			NamedTableReference targetTable,
+			MutationTarget<?> mutationTarget,
+			List<ColumnReference> returningColumns) {
 		super( cteContainer );
 		this.targetTable = targetTable;
+		this.mutationTarget = mutationTarget;
 		this.returningColumns = returningColumns;
 	}
 
@@ -36,4 +48,9 @@ public NamedTableReference getTargetTable() {
 	public List<ColumnReference> getReturningColumns() {
 		return returningColumns;
 	}
+
+	@Override
+	public MutationTarget<?> getMutationTarget() {
+		return mutationTarget;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractUpdateOrDeleteStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractUpdateOrDeleteStatement.java
index bddc40200406..d8ea3bed111c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractUpdateOrDeleteStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/AbstractUpdateOrDeleteStatement.java
@@ -12,6 +12,7 @@
 import org.hibernate.sql.ast.tree.from.FromClause;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
+import org.hibernate.sql.model.MutationTarget;
 
 public abstract class AbstractUpdateOrDeleteStatement extends AbstractMutationStatement {
 	private final FromClause fromClause;
@@ -32,6 +33,7 @@ public AbstractUpdateOrDeleteStatement(
 		this( null, targetTable, fromClause, restriction, returningColumns );
 	}
 
+	@Deprecated(forRemoval = true, since = "7.3")
 	public AbstractUpdateOrDeleteStatement(
 			CteContainer cteContainer,
 			NamedTableReference targetTable,
@@ -43,6 +45,18 @@ public AbstractUpdateOrDeleteStatement(
 		this.restriction = restriction;
 	}
 
+	public AbstractUpdateOrDeleteStatement(
+			CteContainer cteContainer,
+			NamedTableReference targetTable,
+			MutationTarget<?> mutationTarget,
+			FromClause fromClause,
+			Predicate restriction,
+			List<ColumnReference> returningColumns) {
+		super( cteContainer, targetTable, mutationTarget, returningColumns );
+		this.fromClause = fromClause;
+		this.restriction = restriction;
+	}
+
 	public FromClause getFromClause() {
 		return fromClause;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java
index 168feaae6a7d..3226f68a781c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java
@@ -8,6 +8,7 @@
 
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
+import org.hibernate.sql.model.MutationTarget;
 
 /**
  * Specialization of Statement for mutation (DML) statements
@@ -16,5 +17,8 @@
  */
 public interface MutationStatement extends Statement {
 	NamedTableReference getTargetTable();
+
+	MutationTarget<?> getMutationTarget();
+
 	List<ColumnReference> getReturningColumns();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java
index cef3b905becf..9b5f72c3df4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/SqlAstTreeLogger.java
@@ -13,6 +13,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 /**
  * Dedicated logger for rendering a SQL AST
@@ -32,6 +33,6 @@ public interface SqlAstTreeLogger extends BasicLogger {
 	/**
 	 * Static access to the logging instance
 	 */
-	SqlAstTreeLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), SqlAstTreeLogger.class, LOGGER_NAME );
+	SqlAstTreeLogger INSTANCE = Logger.getMessageLogger( MethodHandles.lookup(), SqlAstTreeLogger.class, LOGGER_NAME, Locale.ROOT );
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java
index 523431629b93..8ac7acd3fcef 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/Statement.java
@@ -11,7 +11,7 @@
  *
  * @author Steve Ebersole
  */
-public interface Statement {
+public interface Statement extends SqlAstNode {
 	/**
 	 * Visitation
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java
index 055ecf5ccbba..274b126f1afd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java
@@ -130,7 +130,6 @@ public static CteTable createIdTable(String cteName, PersistentClass persistentC
 			idName = "id";
 		}
 		final List<CteColumn> columns = new ArrayList<>( persistentClass.getIdentifier().getColumnSpan() );
-		final Metadata metadata = persistentClass.getIdentifier().getBuildingContext().getMetadataCollector();
 		forEachCteColumn( idName, persistentClass.getIdentifier(), columns::add );
 		return new CteTable( cteName, columns );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/delete/DeleteStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/delete/DeleteStatement.java
index 5e87a79e55b0..6821c0e20ea7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/delete/DeleteStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/delete/DeleteStatement.java
@@ -14,6 +14,7 @@
 import org.hibernate.sql.ast.tree.from.FromClause;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
+import org.hibernate.sql.model.MutationTarget;
 
 /**
  * @author Steve Ebersole
@@ -45,13 +46,24 @@ public DeleteStatement(
 		this( null, targetTable, fromClause, restriction, returningColumns );
 	}
 
+	@Deprecated(forRemoval = true, since = "7.3")
 	public DeleteStatement(
 			CteContainer cteContainer,
 			NamedTableReference targetTable,
 			FromClause fromClause,
 			Predicate restriction,
 			List<ColumnReference> returningColumns) {
-		super( cteContainer, targetTable, fromClause, restriction, returningColumns );
+		this( cteContainer, targetTable, null, fromClause, restriction, returningColumns );
+	}
+
+	public DeleteStatement(
+			CteContainer cteContainer,
+			NamedTableReference targetTable,
+			MutationTarget<?> mutationTarget,
+			FromClause fromClause,
+			Predicate restriction,
+			List<ColumnReference> returningColumns) {
+		super( cteContainer, targetTable, mutationTarget, fromClause, restriction, returningColumns );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnparsedNumericLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnparsedNumericLiteral.java
index 5db362cbd3c4..06a39d7340e8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnparsedNumericLiteral.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/UnparsedNumericLiteral.java
@@ -63,6 +63,10 @@ public String getUnparsedLiteralValue() {
 		return literalValue;
 	}
 
+	public NumericTypeCategory getTypeCategory() {
+		return typeCategory;
+	}
+
 	public JdbcMapping getJdbcMapping() {
 		return jdbcMapping;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AuxiliaryTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AuxiliaryTableReference.java
new file mode 100644
index 000000000000..ccf2cc3c9bf1
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/AuxiliaryTableReference.java
@@ -0,0 +1,57 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.ast.tree.from;
+
+import org.hibernate.spi.NavigablePath;
+
+/**
+ * Table reference that matches both an auxiliary table expression
+ * (history or audit table) and the current table expression.
+ */
+public class AuxiliaryTableReference extends NamedTableReference {
+	private final String currentTableExpression;
+
+	public AuxiliaryTableReference(
+			String auxiliaryTableExpression,
+			String currentTableExpression,
+			String identificationVariable) {
+		super( auxiliaryTableExpression, identificationVariable );
+		this.currentTableExpression = currentTableExpression;
+	}
+
+	public AuxiliaryTableReference(
+			String auxiliaryTableExpression,
+			String currentTableExpression,
+			String identificationVariable,
+			boolean isOptional) {
+		super( auxiliaryTableExpression, identificationVariable, isOptional );
+		this.currentTableExpression = currentTableExpression;
+	}
+
+	@Override
+	public TableReference getTableReference(
+			NavigablePath navigablePath,
+			String tableExpression,
+			boolean resolve) {
+		return currentTableExpression.equals( tableExpression )
+				? this
+				: super.getTableReference( navigablePath, tableExpression, resolve );
+	}
+
+	@Override
+	public TableReference resolveTableReference(
+			NavigablePath navigablePath,
+			String tableExpression) {
+		return currentTableExpression.equals( tableExpression )
+				? this
+				: super.resolveTableReference( navigablePath, tableExpression );
+	}
+
+	@Override
+	public boolean containsAffectedTableName(String requestedName) {
+		return super.containsAffectedTableName( requestedName )
+			|| currentTableExpression.equals( requestedName );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DelegatingTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DelegatingTableGroup.java
index ef6cbd3c3390..6bf007147ce6 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DelegatingTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/DelegatingTableGroup.java
@@ -156,7 +156,7 @@ public List<TableReferenceJoin> getTableReferenceJoins() {
 	}
 
 	@Override
-	public DomainResult createDomainResult(
+	public DomainResult<?> createDomainResult(
 			String resultVariable,
 			DomainResultCreationState creationState) {
 		return getTableGroup().createDomainResult( resultVariable, creationState );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java
index c433029b5d00..a51644dbd369 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/NamedTableReference.java
@@ -9,8 +9,15 @@
 import java.util.Locale;
 import java.util.function.Function;
 
+import org.hibernate.engine.spi.LoadQueryInfluencers;
+import org.hibernate.metamodel.mapping.AuditMapping;
+import org.hibernate.metamodel.mapping.AuxiliaryMapping;
+import org.hibernate.metamodel.mapping.TemporalMapping;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstWalker;
+import org.hibernate.sql.ast.tree.expression.Expression;
+import org.hibernate.sql.ast.tree.expression.SelfRenderingSqlFragmentExpression;
+import org.hibernate.sql.exec.internal.TemporalJdbcParameter;
 
 import static org.hibernate.internal.util.StringHelper.isEmpty;
 
@@ -23,6 +30,7 @@ public class NamedTableReference extends AbstractTableReference {
 	private final String tableExpression;
 
 	private String prunedTableExpression;
+	private Expression asOfTransactionIdentifier;
 
 	public NamedTableReference(
 			String tableExpression,
@@ -43,6 +51,46 @@ public String getTableExpression() {
 		return prunedTableExpression == null ? tableExpression : prunedTableExpression;
 	}
 
+	public void applyAuxiliaryTable(AuxiliaryMapping mapping, LoadQueryInfluencers influencers) {
+		if ( useAsOfOperator( influencers, mapping )
+				&& mapping.getTableName().equals( getTableExpression() ) ) {
+			final var dialect = influencers.getSessionFactory().getJdbcServices().getDialect();
+			if ( influencers.getTemporalIdentifier() == null
+					&& influencers.getSessionFactory().getTransactionIdentifierService()
+							.useServerTimestamp( dialect ) ) {
+				// we are querying current data,
+				// so we can use the server timestamp
+				asOfTransactionIdentifier =
+						new SelfRenderingSqlFragmentExpression( dialect.currentTimestamp(), mapping.getJdbcMapping() );
+			}
+			else if ( mapping instanceof TemporalMapping temporalMapping ) {
+				asOfTransactionIdentifier = new TemporalJdbcParameter( temporalMapping.getEndingColumnMapping() );
+			}
+			else if ( mapping instanceof AuditMapping auditMapping ) {
+				asOfTransactionIdentifier = new TemporalJdbcParameter( auditMapping.getTransactionIdMapping() );
+			}
+			else {
+				asOfTransactionIdentifier = null;
+			}
+		}
+	}
+
+	private boolean useAsOfOperator(LoadQueryInfluencers influencers, AuxiliaryMapping mapping) {
+		if ( mapping == null ) {
+			return false;
+		}
+		else {
+			final var sessionFactory = influencers.getSessionFactory();
+			return sessionFactory.getTransactionIdentifierService().isIdentifierTypeInstant()
+				&& sessionFactory.getJdbcServices().getDialect().getTemporalTableSupport()
+						.useAsOfOperator( sessionFactory.getSessionFactoryOptions().getTemporalTableStrategy() );
+		}
+	}
+
+	public Expression getAsOfTransactionIdentifier() {
+		return asOfTransactionIdentifier;
+	}
+
 	@Override
 	public String getTableId() {
 		return getTableExpression();
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/OneToManyTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/OneToManyTableGroup.java
index 91a13bc92d63..f4dfc7e6fd64 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/OneToManyTableGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/OneToManyTableGroup.java
@@ -152,7 +152,7 @@ public void visitNestedTableGroupJoins(Consumer<TableGroupJoin> consumer) {
 	}
 
 	@Override
-	public DomainResult createDomainResult(String resultVariable, DomainResultCreationState creationState) {
+	public DomainResult<?> createDomainResult(String resultVariable, DomainResultCreationState creationState) {
 		return elementTableGroup.createDomainResult( resultVariable, creationState );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoin.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoin.java
index 0f773ea06052..22930453a14b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoin.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableGroupJoin.java
@@ -100,7 +100,7 @@ public boolean isImplicit() {
 	}
 
 	@Override
-	public DomainResult createDomainResult(
+	public DomainResult<?> createDomainResult(
 			String resultVariable,
 			DomainResultCreationState creationState) {
 		return getJoinedGroup().createDomainResult( resultVariable, creationState );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java
index 307d7db588d9..c29bf328c754 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/insert/InsertSelectStatement.java
@@ -15,6 +15,7 @@
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.select.QueryPart;
+import org.hibernate.sql.model.MutationTarget;
 
 /**
  * todo (6.2) - Would much prefer to split insert-values and
@@ -33,19 +34,33 @@ public class InsertSelectStatement extends AbstractMutationStatement implements
 	private List<Values> valuesList = new ArrayList<>();
 	private ConflictClause conflictClause;
 
+	@Deprecated(forRemoval = true, since = "7.3")
 	public InsertSelectStatement(NamedTableReference targetTable) {
 		this( null, targetTable, Collections.emptyList() );
 	}
 
+	public InsertSelectStatement(NamedTableReference targetTable, MutationTarget<?> mutationTarget) {
+		this( null, targetTable, mutationTarget, Collections.emptyList() );
+	}
+
 	public InsertSelectStatement(NamedTableReference targetTable, List<ColumnReference> returningColumns) {
 		this( null, targetTable, returningColumns );
 	}
 
+	@Deprecated(forRemoval = true, since = "7.3")
+	public InsertSelectStatement(
+			CteContainer cteContainer,
+			NamedTableReference targetTable,
+			List<ColumnReference> returningColumns) {
+		this( cteContainer, targetTable, null, returningColumns );
+	}
+
 	public InsertSelectStatement(
 			CteContainer cteContainer,
 			NamedTableReference targetTable,
+			MutationTarget<?> mutationTarget,
 			List<ColumnReference> returningColumns) {
-		super( cteContainer, targetTable, returningColumns );
+		super( cteContainer, targetTable, mutationTarget, returningColumns );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java
index 3be3562b0ba1..db0fdef05ea1 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/QueryGroup.java
@@ -16,9 +16,9 @@
  */
 public class QueryGroup extends QueryPart {
 	private final SetOperator setOperator;
-	private final List<QueryPart> queryParts;
+	private final List<? extends QueryPart> queryParts;
 
-	public QueryGroup(boolean isRoot, SetOperator setOperator, List<QueryPart> queryParts) {
+	public QueryGroup(boolean isRoot, SetOperator setOperator, List<? extends QueryPart> queryParts) {
 		super( isRoot );
 		this.setOperator = setOperator;
 		this.queryParts = queryParts;
@@ -56,7 +56,7 @@ public SetOperator getSetOperator() {
 		return setOperator;
 	}
 
-	public List<QueryPart> getQueryParts() {
+	public List<? extends QueryPart> getQueryParts() {
 		return queryParts;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java
index 19ab5641ffd2..56d6fa8781cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/select/SortSpecification.java
@@ -11,6 +11,9 @@
 import org.hibernate.sql.ast.tree.expression.Expression;
 
 import jakarta.persistence.criteria.Nulls;
+import org.hibernate.sql.ast.tree.expression.SqlSelectionExpression;
+
+import static org.hibernate.sql.ast.tree.expression.SqlTupleContainer.getSqlTuple;
 
 /**
  * @author Steve Ebersole
@@ -20,6 +23,7 @@ public class SortSpecification implements SqlAstNode {
 	private final SortDirection sortOrder;
 	private final Nulls nullPrecedence;
 	private final boolean ignoreCase;
+	private final int[] sortSelectionIndexes;
 
 	public SortSpecification(Expression sortExpression, SortDirection sortOrder) {
 		this( sortExpression, sortOrder, Nulls.NONE, false );
@@ -45,6 +49,29 @@ public SortSpecification(Expression sortExpression, SortDirection sortOrder, Nul
 		this.sortOrder = sortOrder;
 		this.nullPrecedence = nullPrecedence;
 		this.ignoreCase = ignoreCase;
+		this.sortSelectionIndexes = sortSelectionIndexes( sortExpression );
+	}
+
+	private int[] sortSelectionIndexes(Expression expression) {
+		final var sqlTuple = getSqlTuple( expression );
+		if ( sqlTuple == null ) {
+			return new int[] { sortSelectionIndex( expression ) };
+		}
+		else {
+			final var expressions = sqlTuple.getExpressions();
+			final int size = expressions.size();
+			final int[] indexes = new int[size];
+			for ( int i = 0; i < size; i++ ) {
+				indexes[i] = sortSelectionIndex( expressions.get( i ) );
+			}
+			return indexes;
+		}
+	}
+
+	private int sortSelectionIndex(Expression expression) {
+		return expression instanceof SqlSelectionExpression selectionExpression
+				? selectionExpression.getSelection().getValuesArrayPosition()
+				: -1;
 	}
 
 	public Expression getSortExpression() {
@@ -63,6 +90,10 @@ public boolean isIgnoreCase() {
 		return ignoreCase;
 	}
 
+	public int[] getSortSelectionIndexes() {
+		return sortSelectionIndexes;
+	}
+
 	@Override
 	public void accept(SqlAstWalker sqlTreeWalker) {
 		sqlTreeWalker.visitSortSpecification( this );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/UpdateStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/UpdateStatement.java
index 345d07421030..556d5cdc6ab7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/UpdateStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/update/UpdateStatement.java
@@ -14,6 +14,7 @@
 import org.hibernate.sql.ast.tree.from.FromClause;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
+import org.hibernate.sql.model.MutationTarget;
 
 /**
  * @author Steve Ebersole
@@ -53,6 +54,7 @@ public UpdateStatement(
 		this( null, targetTable, fromClause, assignments, restriction, returningColumns );
 	}
 
+	@Deprecated(forRemoval = true, since = "7.3")
 	public UpdateStatement(
 			CteContainer cteContainer,
 			NamedTableReference targetTable,
@@ -60,7 +62,18 @@ public UpdateStatement(
 			List<Assignment> assignments,
 			Predicate restriction,
 			List<ColumnReference> returningColumns) {
-		super( cteContainer, targetTable, fromClause, restriction, returningColumns );
+		this( cteContainer, targetTable, null, fromClause, assignments, restriction, returningColumns );
+	}
+
+	public UpdateStatement(
+			CteContainer cteContainer,
+			NamedTableReference targetTable,
+			MutationTarget<?> mutationTarget,
+			FromClause fromClause,
+			List<Assignment> assignments,
+			Predicate restriction,
+			List<ColumnReference> returningColumns) {
+		super( cteContainer, targetTable, mutationTarget, fromClause, restriction, returningColumns );
 		this.assignments = assignments;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java
index a6da9c00c368..6eeba945c9ce 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/SqlExecLogger.java
@@ -15,6 +15,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 import java.util.Set;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
@@ -33,7 +34,7 @@
 public interface SqlExecLogger extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".sql.exec";
 
-	SqlExecLogger SQL_EXEC_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SqlExecLogger.class, LOGGER_NAME );
+	SqlExecLogger SQL_EXEC_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), SqlExecLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage(level = DEBUG)
 	@Message(id = 90004001, value = "Collection locking for collection table '%s' - %s")
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQuery.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQuery.java
index e111c2a17e7c..1c192f43dc3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcOperationQuery.java
@@ -90,9 +90,8 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
 		return true;
 	}
 
-	@SuppressWarnings("unchecked")
 	static <T> boolean equal(JdbcParameterBinding appliedBinding, JdbcParameterBinding binding, JavaType<T> type) {
 		return type.isInstance( appliedBinding.getBindValue() )
-			&& type.areEqual( (T) binding.getBindValue(), (T) appliedBinding.getBindValue() );
+			&& type.areEqual( type.cast( binding.getBindValue() ), type.cast( appliedBinding.getBindValue() ) );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java
index 145307528ddf..07f31227040a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java
@@ -9,7 +9,6 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.cache.MutableCacheKeyBuilder;
-import org.hibernate.engine.internal.CacheHelper;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.IndexedConsumer;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
@@ -166,12 +165,12 @@ public int forEachJdbcType(int offset, IndexedConsumer<JdbcMapping> action) {
 
 	@Override
 	public Object disassemble(Object value, SharedSessionContractImplementor session) {
-		return value;
+		return BasicValuedMapping.super.disassemble( value, session );
 	}
 
 	@Override
 	public void addToCacheKey(MutableCacheKeyBuilder cacheKey, Object value, SharedSessionContractImplementor session) {
-		CacheHelper.addBasicValueToCacheKey( cacheKey, value, getJdbcMapping(), session );
+		BasicValuedMapping.super.addToCacheKey( cacheKey, value, session );
 	}
 
 	@Override
@@ -185,16 +184,4 @@ public <X, Y> int forEachDisassembledJdbcValue(
 		valuesConsumer.consume( offset, x, y, value, jdbcMapping );
 		return getJdbcTypeCount();
 	}
-
-	@Override
-	public <X, Y> int forEachJdbcValue(
-			Object value,
-			int offset,
-			X x,
-			Y y,
-			JdbcValuesBiConsumer<X, Y> valuesConsumer,
-			SharedSessionContractImplementor session) {
-		valuesConsumer.consume( offset, x, y, value, jdbcMapping );
-		return getJdbcTypeCount();
-	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQuerySelect.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQuerySelect.java
index 9339d0a6ffec..2e38c2276092 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQuerySelect.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcOperationQuerySelect.java
@@ -7,6 +7,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
+import org.hibernate.sql.exec.internal.lock.LoadedValuesCollectorFactory;
 import org.hibernate.sql.exec.spi.ExecutionContext;
 import org.hibernate.sql.exec.spi.JdbcLockStrategy;
 import org.hibernate.sql.exec.spi.JdbcParameterBinder;
@@ -93,7 +94,7 @@ public int getMaxRows() {
 	}
 
 	@Override
-	public @Nullable LoadedValuesCollector getLoadedValuesCollector() {
+	public @Nullable LoadedValuesCollectorFactory getLoadedValuesCollectorFactory() {
 		return null;
 	}
 
@@ -102,7 +103,7 @@ public void performPreActions(StatementAccess jdbcStatementAccess, Connection jd
 	}
 
 	@Override
-	public void performPostAction(boolean succeeded, StatementAccess jdbcStatementAccess, Connection jdbcConnection, ExecutionContext executionContext) {
+	public void performPostActions(boolean succeeded, StatementAccess jdbcStatementAccess, Connection jdbcConnection, ExecutionContext executionContext, LoadedValuesCollector loadedValuesCollector) {
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java
index 39f9adcd5927..06be0ca6dbce 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectExecutorStandardImpl.java
@@ -125,6 +125,14 @@ private <T, R> T doExecuteQuery(
 			StatementCreator statementCreator,
 			ResultsConsumer<T, R> resultsConsumer) {
 
+		final var session = executionContext.getSession();
+		final var factory = session.getFactory();
+		final var logicalConnection = session.getJdbcCoordinator().getLogicalConnection();
+
+		final var connection = logicalConnection.getPhysicalConnection();
+		final var statementAccess = new StatementAccessImpl( connection, logicalConnection, factory );
+		jdbcSelect.performPreActions( statementAccess, connection, executionContext );
+
 		final var deferredResultSetAccess = new DeferredResultSetAccess(
 				jdbcSelect,
 				jdbcParameterBindings,
@@ -144,9 +152,6 @@ private <T, R> T doExecuteQuery(
 			rowTransformer = getRowTransformer( executionContext, jdbcValues );
 		}
 
-		final var session = executionContext.getSession();
-		final var factory = session.getFactory();
-
 		final boolean stats;
 		long startTime = 0;
 		final var statistics = factory.getStatistics();
@@ -186,8 +191,11 @@ public boolean shouldReturnProxies() {
 			}
 		};
 
+		final var loadedValuesCollector = jdbcSelect.getLoadedValuesCollectorFactory() == null
+				? null
+				: jdbcSelect.getLoadedValuesCollectorFactory().build();
 		final var valuesProcessingState = new JdbcValuesSourceProcessingStateStandardImpl(
-				jdbcSelect.getLoadedValuesCollector(),
+				loadedValuesCollector,
 				processingOptions,
 				executionContext
 		);
@@ -201,12 +209,6 @@ public boolean shouldReturnProxies() {
 
 		final var rowProcessingState = new RowProcessingStateStandardImpl( valuesProcessingState, executionContext, rowReader, jdbcValues );
 
-		final var logicalConnection = session.getJdbcCoordinator().getLogicalConnection();
-
-		final var connection = logicalConnection.getPhysicalConnection();
-		final var statementAccess = new StatementAccessImpl( connection, logicalConnection, factory );
-		jdbcSelect.performPreActions( statementAccess, connection, executionContext );
-
 		try {
 			final T result = resultsConsumer.consume(
 					jdbcValues,
@@ -217,7 +219,7 @@ public boolean shouldReturnProxies() {
 					rowReader
 			);
 
-			jdbcSelect.performPostAction( true, statementAccess, connection, executionContext );
+			jdbcSelect.performPostActions( true, statementAccess, connection, executionContext, loadedValuesCollector );
 
 			if ( stats ) {
 				logQueryStatistics( jdbcSelect, executionContext, startTime, result, statistics );
@@ -226,7 +228,7 @@ public boolean shouldReturnProxies() {
 			return result;
 		}
 		catch (RuntimeException e) {
-			jdbcSelect.performPostAction( false, statementAccess, connection, executionContext );
+			jdbcSelect.performPostActions( false, statementAccess, connection, executionContext, loadedValuesCollector );
 			throw e;
 		}
 	}
@@ -286,6 +288,7 @@ protected JdbcValues resolveJdbcValuesSource(
 
 		final QueryKey queryResultsCacheKey;
 		final List<?> cachedResults;
+		final String queryCacheRegionName;
 		if ( cacheable && cacheMode.isGetEnabled() ) {
 			SQL_EXEC_LOGGER.readingQueryResultCacheData( cacheMode.name() );
 			final Set<String> querySpaces = jdbcSelect.getAffectedTableNames();
@@ -298,6 +301,7 @@ protected JdbcValues resolveJdbcValuesSource(
 
 			final var queryCache = factory.getCache()
 					.getQueryResultsCache( queryOptions.getResultCacheRegionName() );
+			queryCacheRegionName = queryCache.getRegion().getName();
 
 			queryResultsCacheKey = QueryKey.from(
 					jdbcSelect.getSqlString(),
@@ -321,16 +325,6 @@ protected JdbcValues resolveJdbcValuesSource(
 			//
 			// todo (6.0) : if we go this route (^^), still beneficial to have an abstraction over different UpdateTimestampsCache-based
 			//		invalidation strategies - QueryCacheInvalidationStrategy
-
-			final var statistics = factory.getStatistics();
-			if ( statistics.isStatisticsEnabled() ) {
-				if ( cachedResults == null ) {
-					statistics.queryCacheMiss( queryIdentifier, queryCache.getRegion().getName() );
-				}
-				else {
-					statistics.queryCacheHit( queryIdentifier, queryCache.getRegion().getName() );
-				}
-			}
 		}
 		else {
 			SQL_EXEC_LOGGER.skippingReadingQueryResultCacheData(
@@ -338,6 +332,7 @@ protected JdbcValues resolveJdbcValuesSource(
 					cacheMode.name()
 			);
 			cachedResults = null;
+			queryCacheRegionName = null;
 			if ( cacheable && cacheMode.isPutEnabled() ) {
 				queryResultsCacheKey = QueryKey.from(
 						jdbcSelect.getSqlString(),
@@ -351,7 +346,7 @@ protected JdbcValues resolveJdbcValuesSource(
 			}
 		}
 
-		return resolveJdbcValues(
+		final var result = resolveJdbcValues(
 				queryIdentifier,
 				executionContext,
 				resultSetAccess,
@@ -361,6 +356,20 @@ protected JdbcValues resolveJdbcValuesSource(
 				session,
 				factory
 		);
+
+		if ( queryCacheRegionName != null ) {
+			final var statistics = factory.getStatistics();
+			if ( statistics.isStatisticsEnabled() ) {
+				if ( result instanceof JdbcValuesCacheHit ) {
+					statistics.queryCacheHit( queryIdentifier, queryCacheRegionName );
+				}
+				else {
+					statistics.queryCacheMiss( queryIdentifier, queryCacheRegionName );
+				}
+			}
+		}
+
+		return result;
 	}
 
 	private static AbstractJdbcValues resolveJdbcValues(
@@ -373,39 +382,49 @@ private static AbstractJdbcValues resolveJdbcValues(
 			SharedSessionContractImplementor session,
 			SessionFactoryImplementor factory) {
 		final var loadQueryInfluencers = session.getLoadQueryInfluencers();
-		if ( cachedResults == null ) {
-			final CachedJdbcValuesMetadata metadataForCache;
-			final JdbcValuesMapping jdbcValuesMapping;
-			if ( queryResultsCacheKey == null ) {
-				jdbcValuesMapping = mappingProducer.resolve( resultSetAccess, loadQueryInfluencers, factory );
-				metadataForCache = null;
+		// Try to use cached results if available
+		if ( cachedResults != null ) {
+			try {
+				final var valuesMetadata =
+						!cachedResults.isEmpty()
+							&& cachedResults.get( 0 ) instanceof JdbcValuesMetadata jdbcValuesMetadata
+								? jdbcValuesMetadata
+								: resultSetAccess;
+				final var resolvedMapping =
+						mappingProducer.resolve( valuesMetadata, loadQueryInfluencers, factory );
+				final var cacheHit = new JdbcValuesCacheHit( cachedResults, resolvedMapping );
+				if ( cacheHit.isCacheCompatible() ) {
+					return cacheHit;
+				}
+				// Cached data incompatible with the resolved mapping — fall through to re-execute
 			}
-			else {
-				// If we need to put the values into the cache, we need to be able to capture the JdbcValuesMetadata
-				final var capturingMetadata = new CapturingJdbcValuesMetadata( resultSetAccess );
-				jdbcValuesMapping = mappingProducer.resolve( capturingMetadata, loadQueryInfluencers, factory );
-				metadataForCache = capturingMetadata.resolveMetadataForCache();
+			catch (CachedJdbcValuesMetadata.CacheMetadataIncompleteException e) {
+				// Cached metadata doesn't cover all required columns — fall through to re-execute
 			}
-			return new JdbcValuesResultSetImpl(
-					resultSetAccess,
-					queryResultsCacheKey,
-					queryIdentifier,
-					executionContext.getQueryOptions(),
-					false,
-					jdbcValuesMapping,
-					metadataForCache,
-					executionContext
-			);
+		}
+		// Execute query (cache miss or insufficient cached data)
+		final CachedJdbcValuesMetadata metadataForCache;
+		final JdbcValuesMapping jdbcValuesMapping;
+		if ( queryResultsCacheKey == null ) {
+			jdbcValuesMapping = mappingProducer.resolve( resultSetAccess, loadQueryInfluencers, factory );
+			metadataForCache = null;
 		}
 		else {
-			final var valuesMetadata =
-					!cachedResults.isEmpty()
-						&& cachedResults.get( 0 ) instanceof JdbcValuesMetadata jdbcValuesMetadata
-							? jdbcValuesMetadata
-							: resultSetAccess;
-			return new JdbcValuesCacheHit( cachedResults,
-					mappingProducer.resolve( valuesMetadata, loadQueryInfluencers, factory ) );
+			// If we need to put the values into the cache, we need to be able to capture the JdbcValuesMetadata
+			final var capturingMetadata = new CapturingJdbcValuesMetadata( resultSetAccess );
+			jdbcValuesMapping = mappingProducer.resolve( capturingMetadata, loadQueryInfluencers, factory );
+			metadataForCache = capturingMetadata.resolveMetadataForCache( jdbcValuesMapping );
 		}
+		return new JdbcValuesResultSetImpl(
+				resultSetAccess,
+				queryResultsCacheKey,
+				queryIdentifier,
+				executionContext.getQueryOptions(),
+				false,
+				jdbcValuesMapping,
+				metadataForCache,
+				executionContext
+		);
 	}
 
 	private static CacheMode resolveCacheMode(ExecutionContext executionContext) {
@@ -488,8 +507,23 @@ public <J> BasicType<J> resolveType(
 			return basicType;
 		}
 
-		public CachedJdbcValuesMetadata resolveMetadataForCache() {
-			return columnNames == null ? null : new CachedJdbcValuesMetadata( columnNames, types );
+		public CachedJdbcValuesMetadata resolveMetadataForCache(JdbcValuesMapping jdbcValuesMapping) {
+			if ( columnNames == null ) {
+				return null;
+			}
+			// Fill in types from the mapping's SqlSelections for positions that
+			// were not captured during mapping resolution (e.g. entity results)
+			for ( var selection : jdbcValuesMapping.getSqlSelections() ) {
+				final int pos = selection.getValuesArrayPosition();
+				if ( types[pos] == null && selection.getExpressionType() != null ) {
+					types[pos] = (BasicType<?>) selection.getExpressionType().getSingleJdbcMapping();
+				}
+			}
+			return new CachedJdbcValuesMetadata(
+					columnNames,
+					types,
+					jdbcValuesMapping.getValueIndexesToCacheIndexes()
+			);
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectWithActions.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectWithActions.java
index 787a23e62a8c..8841d7c98fc0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectWithActions.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcSelectWithActions.java
@@ -16,6 +16,7 @@
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.exec.internal.lock.CollectionLockingAction;
 import org.hibernate.sql.exec.internal.lock.FollowOnLockingAction;
+import org.hibernate.sql.exec.internal.lock.LoadedValuesCollectorFactory;
 import org.hibernate.sql.exec.spi.ExecutionContext;
 import org.hibernate.sql.exec.spi.JdbcLockStrategy;
 import org.hibernate.sql.exec.spi.JdbcOperationQuery;
@@ -45,7 +46,7 @@ public class JdbcSelectWithActions implements JdbcOperationQuery, JdbcSelect {
 	private final JdbcOperationQuerySelect primaryOperation;
 
 	// Used by Hibernate Reactive
-	protected final LoadedValuesCollector loadedValuesCollector;
+	protected final LoadedValuesCollectorFactory loadedValuesCollectorFactory;
 	// Used by Hibernate Reactive
 	protected final PreAction[] preActions;
 	// Used by Hibernate Reactive
@@ -53,19 +54,19 @@ public class JdbcSelectWithActions implements JdbcOperationQuery, JdbcSelect {
 
 	public JdbcSelectWithActions(
 			JdbcOperationQuerySelect primaryOperation,
-			LoadedValuesCollector loadedValuesCollector,
+			LoadedValuesCollectorFactory loadedValuesCollectorFactory,
 			PreAction[] preActions,
 			PostAction[] postActions) {
 		this.primaryOperation = primaryOperation;
-		this.loadedValuesCollector = loadedValuesCollector;
+		this.loadedValuesCollectorFactory = loadedValuesCollectorFactory;
 		this.preActions = preActions;
 		this.postActions = postActions;
 	}
 
 	public JdbcSelectWithActions(
 			JdbcOperationQuerySelect primaryAction,
-			LoadedValuesCollector loadedValuesCollector) {
-		this( primaryAction, loadedValuesCollector, null, null );
+			LoadedValuesCollectorFactory loadedValuesCollectorFactory) {
+		this( primaryAction, loadedValuesCollectorFactory, null, null );
 	}
 
 	@Override
@@ -99,8 +100,8 @@ public int getMaxRows() {
 	}
 
 	@Override
-	public @Nullable LoadedValuesCollector getLoadedValuesCollector() {
-		return loadedValuesCollector;
+	public @Nullable LoadedValuesCollectorFactory getLoadedValuesCollectorFactory() {
+		return loadedValuesCollectorFactory;
 	}
 
 	@Override
@@ -115,17 +116,14 @@ public void performPreActions(StatementAccess jdbcStatementAccess, Connection jd
 	}
 
 	@Override
-	public void performPostAction(boolean succeeded, StatementAccess jdbcStatementAccess, Connection jdbcConnection, ExecutionContext executionContext) {
+	public void performPostActions(boolean succeeded, StatementAccess jdbcStatementAccess, Connection jdbcConnection, ExecutionContext executionContext, LoadedValuesCollector loadedValuesCollector) {
 		if ( postActions != null ) {
 			for ( int i = 0; i < postActions.length; i++ ) {
 				if ( succeeded || postActions[i].shouldRunAfterFail() ) {
-					postActions[i].performPostAction( jdbcStatementAccess, jdbcConnection, executionContext );
+					postActions[i].performPostAction( jdbcStatementAccess, jdbcConnection, executionContext, loadedValuesCollector );
 				}
 			}
 		}
-		if ( loadedValuesCollector != null ) {
-			loadedValuesCollector.clear();
-		}
 	}
 
 	@Override
@@ -163,7 +161,7 @@ public boolean isCompatibleWith(JdbcParameterBindings jdbcParameterBindings, Que
 
 	public static class Builder implements JdbcSelectWithActionsBuilder {
 		private JdbcOperationQuerySelect primaryAction;
-		private LoadedValuesCollector loadedValuesCollector;
+		private LoadedValuesCollectorFactory loadedValuesCollectorFactory;
 		protected List<PreAction> preActions;
 		protected List<PostAction> postActions;
 		protected LockTimeoutType lockTimeoutType;
@@ -180,10 +178,9 @@ public Builder setPrimaryAction(JdbcSelect primaryAction){
 			return this;
 		}
 
-		@SuppressWarnings("UnusedReturnValue")
 		@Override
-		public Builder setLoadedValuesCollector(LoadedValuesCollector loadedValuesCollector) {
-			this.loadedValuesCollector = loadedValuesCollector;
+		public JdbcSelectWithActionsBuilder setLoadedValuesCollectorFactory(LoadedValuesCollectorFactory loadedValuesCollectorFactory) {
+			this.loadedValuesCollectorFactory = loadedValuesCollectorFactory;
 			return this;
 		}
 
@@ -240,12 +237,12 @@ else if ( lockOptions.getScope() == Locking.Scope.INCLUDE_COLLECTIONS ) {
 				CollectionLockingAction.apply( lockOptions, lockingTarget, this );
 			}
 			if ( preActions == null && postActions == null ) {
-				assert loadedValuesCollector == null;
+				assert loadedValuesCollectorFactory == null;
 				return primaryAction;
 			}
 			final PreAction[] preActions = toPreActionArray( this.preActions );
 			final PostAction[] postActions = toPostActionArray( this.postActions );
-			return new JdbcSelectWithActions( primaryAction, loadedValuesCollector, preActions, postActions );
+			return new JdbcSelectWithActions( primaryAction, loadedValuesCollectorFactory, preActions, postActions );
 		}
 
 		/**
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/LockTimeoutHandler.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/LockTimeoutHandler.java
index 6a17cd64dd50..da09532166b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/LockTimeoutHandler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/LockTimeoutHandler.java
@@ -8,6 +8,7 @@
 import org.hibernate.dialect.lock.spi.ConnectionLockTimeoutStrategy;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.sql.exec.spi.ExecutionContext;
+import org.hibernate.sql.exec.spi.LoadedValuesCollector;
 import org.hibernate.sql.exec.spi.PostAction;
 import org.hibernate.sql.exec.spi.PreAction;
 import org.hibernate.sql.exec.spi.StatementAccess;
@@ -50,7 +51,7 @@ public void performPreAction(StatementAccess jdbcStatementAccess, Connection jdb
 	}
 
 	@Override
-	public void performPostAction(StatementAccess jdbcStatementAccess, Connection jdbcConnection, ExecutionContext executionContext) {
+	public void performPostAction(StatementAccess jdbcStatementAccess, Connection jdbcConnection, ExecutionContext executionContext, LoadedValuesCollector loadedValuesCollector) {
 		final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
 
 		// reset the timeout
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/TemporalJdbcParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/TemporalJdbcParameter.java
new file mode 100644
index 000000000000..fabde97349c2
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/TemporalJdbcParameter.java
@@ -0,0 +1,41 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.exec.internal;
+
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.SqlTypedMapping;
+import org.hibernate.sql.exec.ExecutionException;
+import org.hibernate.sql.exec.spi.ExecutionContext;
+import org.hibernate.sql.exec.spi.JdbcParameterBindings;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+/**
+ * JdbcParameter for temporal restrictions; bound via JdbcParameterBindings.
+ *
+ * @author Gavin King
+ */
+public class TemporalJdbcParameter extends SqlTypedMappingJdbcParameter {
+
+	public TemporalJdbcParameter(SqlTypedMapping sqlTypedMapping) {
+		super( sqlTypedMapping );
+	}
+
+	@Override
+	public void bindParameterValue(PreparedStatement statement, int startPosition, JdbcParameterBindings jdbcParamBindings, ExecutionContext executionContext)
+			throws SQLException {
+		final SharedSessionContractImplementor session = executionContext.getSession();
+		final Object temporalIdentifier = session.getLoadQueryInfluencers().getTemporalIdentifier();
+		final Object currentTransactionIdentifier = temporalIdentifier != null
+				? temporalIdentifier
+				: session.getCurrentTransactionIdentifier();
+		if ( currentTransactionIdentifier == null ) {
+			throw new ExecutionException( "JDBC parameter value not bound - " + this );
+		}
+		final Object bindValue = getJdbcMapping().convertToRelationalValue( currentTransactionIdentifier );
+		bindParameterValue( getJdbcMapping(), statement, bindValue, startPosition, executionContext );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/CollectionLockingAction.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/CollectionLockingAction.java
index c3e9a73f69ea..e08a03cd4d9c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/CollectionLockingAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/CollectionLockingAction.java
@@ -8,13 +8,10 @@
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.Locking;
-import org.hibernate.engine.spi.CollectionKey;
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper;
-import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.exec.spi.ExecutionContext;
 import org.hibernate.sql.exec.spi.JdbcSelectWithActionsBuilder;
@@ -23,11 +20,9 @@
 import org.hibernate.sql.exec.spi.StatementAccess;
 
 import java.sql.Connection;
-import java.util.ArrayList;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import static org.hibernate.sql.exec.SqlExecLogger.SQL_EXEC_LOGGER;
 
@@ -39,8 +34,6 @@
  * @author Steve Ebersole
  */
 public class CollectionLockingAction implements PostAction {
-	// Used by Hibernate Reactive
-	protected final LoadedValuesCollectorImpl loadedValuesCollector;
 	// Used by Hibernate Reactive
 	protected final LockMode lockMode;
 	// Used by Hibernate Reactive
@@ -48,10 +41,8 @@ public class CollectionLockingAction implements PostAction {
 
 	// Used by Hibernate Reactive
 	protected CollectionLockingAction(
-			LoadedValuesCollectorImpl loadedValuesCollector,
 			LockMode lockMode,
 			Timeout lockTimeout) {
-		this.loadedValuesCollector = loadedValuesCollector;
 		this.lockMode = lockMode;
 		this.lockTimeout = lockTimeout;
 	}
@@ -62,30 +53,32 @@ public static void apply(
 			JdbcSelectWithActionsBuilder jdbcSelectBuilder) {
 		assert lockOptions.getScope() == Locking.Scope.INCLUDE_COLLECTIONS;
 
-		final var loadedValuesCollector = resolveLoadedValuesCollector( lockingTarget );
-
 		// NOTE: we need to set this separately so that it can get incorporated into
 		// the JdbcValuesSourceProcessingState for proper callbacks
-		jdbcSelectBuilder.setLoadedValuesCollector( loadedValuesCollector );
+//		jdbcSelectBuilder.setLoadedValuesCollector( () -> resolveLoadedValuesCollector( lockingTarget ) );
+
+		jdbcSelectBuilder.setLoadedValuesCollectorFactory( resolveLoadedValuesCollectorFactory( lockingTarget) );
 
 		// additionally, add a post-action which uses the collected values.
 		jdbcSelectBuilder.appendPostAction( new CollectionLockingAction(
-				loadedValuesCollector,
 				lockOptions.getLockMode(),
 				lockOptions.getTimeout()
 		) );
 	}
 
+
+
 	@Override
 	public void performPostAction(
 			StatementAccess jdbcStatementAccess,
 			Connection jdbcConnection,
-			ExecutionContext executionContext) {
-		performPostAction( executionContext );
+			ExecutionContext executionContext,
+			LoadedValuesCollector loadedValuesCollector) {
+		performPostAction( executionContext, loadedValuesCollector );
 	}
 
 	// Used by Hibernate Reactive
-	protected void performPostAction(ExecutionContext executionContext) {
+	protected void performPostAction(ExecutionContext executionContext, LoadedValuesCollector loadedValuesCollector) {
 		LockingHelper.logLoadedValues( loadedValuesCollector );
 
 		final var session = executionContext.getSession();
@@ -139,8 +132,8 @@ protected void performPostAction(ExecutionContext executionContext) {
 	}
 
 	// Used by Hibernate Reactive
-	protected static LoadedValuesCollectorImpl resolveLoadedValuesCollector(QuerySpec lockingTarget) {
-		return new LoadedValuesCollectorImpl( lockingTarget.getRootPathsForLocking() );
+	protected static LoadedValuesCollectorFactory resolveLoadedValuesCollectorFactory(QuerySpec lockingTarget) {
+		return new LoadedValuesCollectorFactory( lockingTarget.getRootPathsForLocking() );
 	}
 
 	// Used by Hibernate Reactive
@@ -154,53 +147,4 @@ protected static Map<EntityMappingType, List<EntityKey>> segmentLoadedValues(Loa
 		return map;
 	}
 
-	// Used by Hibernate Reactive
-	protected static class LoadedValuesCollectorImpl implements LoadedValuesCollector {
-		private final Set<NavigablePath> pathsToLock;
-
-		private List<LoadedEntityRegistration> entitiesToLock;
-		private List<LoadedCollectionRegistration> collectionsToLock;
-
-		private LoadedValuesCollectorImpl(Set<NavigablePath> pathsToLock) {
-			this.pathsToLock = pathsToLock;
-		}
-
-		@Override
-		public void registerEntity(NavigablePath navigablePath, EntityMappingType entityDescriptor, EntityKey entityKey) {
-			if ( pathsToLock.contains( navigablePath ) ) {
-				if ( entitiesToLock == null ) {
-					entitiesToLock = new ArrayList<>();
-				}
-				entitiesToLock.add( new LoadedEntityRegistration( navigablePath, entityDescriptor, entityKey ) );
-			}
-		}
-
-		@Override
-		public void registerCollection(NavigablePath navigablePath, PluralAttributeMapping collectionDescriptor, CollectionKey collectionKey) {
-			if ( collectionsToLock == null ) {
-				collectionsToLock = new ArrayList<>();
-			}
-			collectionsToLock.add( new LoadedCollectionRegistration( navigablePath, collectionDescriptor, collectionKey ) );
-		}
-
-		@Override
-		public void clear() {
-			if ( entitiesToLock != null ) {
-				entitiesToLock.clear();
-			}
-			if ( collectionsToLock != null ) {
-				collectionsToLock.clear();
-			}
-		}
-
-		@Override
-		public List<LoadedEntityRegistration> getCollectedEntities() {
-			return entitiesToLock;
-		}
-
-		@Override
-		public List<LoadedCollectionRegistration> getCollectedCollections() {
-			return collectionsToLock;
-		}
-	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/FollowOnLockingAction.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/FollowOnLockingAction.java
index 8ea0f34dd624..7fd97a83e3c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/FollowOnLockingAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/FollowOnLockingAction.java
@@ -22,7 +22,6 @@
 import org.hibernate.query.internal.QueryOptionsImpl;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper;
-import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.spi.LockingClauseStrategy;
 import org.hibernate.sql.ast.tree.from.FromClause;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
@@ -33,8 +32,6 @@
 import org.hibernate.sql.exec.spi.StatementAccess;
 
 import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.List;
@@ -48,14 +45,11 @@
  * PostAction for a {@linkplain org.hibernate.sql.exec.internal.JdbcSelectWithActions} which
  * performs follow-on locking based on the loaded values.
  *
+ * @author Steve Ebersole
  * @implSpec Relies on the fact that {@linkplain LoadedValuesCollector} has
  * already applied filtering for things which actually need locked.
- *
- * @author Steve Ebersole
  */
 public class FollowOnLockingAction implements PostAction {
-	// Used by Hibernate Reactive
-	protected  final LoadedValuesCollectorImpl loadedValuesCollector;
 	private final LockMode lockMode;
 	private final Timeout lockTimeout;
 	// Used by Hibernate Reactive
@@ -63,11 +57,9 @@ public class FollowOnLockingAction implements PostAction {
 
 	// Used by Hibernate Reactive
 	protected FollowOnLockingAction(
-			LoadedValuesCollectorImpl loadedValuesCollector,
 			LockMode lockMode,
 			Timeout lockTimeout,
 			Locking.Scope lockScope) {
-		this.loadedValuesCollector = loadedValuesCollector;
 		this.lockMode = lockMode;
 		this.lockTimeout = lockTimeout;
 		this.lockScope = lockScope;
@@ -79,15 +71,12 @@ public static void apply(
 			LockingClauseStrategy lockingClauseStrategy,
 			JdbcSelectWithActionsBuilder jdbcSelectBuilder) {
 		final var fromClause = lockingTarget.getFromClause();
-		final var loadedValuesCollector = resolveLoadedValuesCollector( fromClause, lockingClauseStrategy );
-
 		// NOTE: we need to set this separately so that it can get incorporated into
 		// the JdbcValuesSourceProcessingState for proper callbacks
-		jdbcSelectBuilder.setLoadedValuesCollector( loadedValuesCollector );
+		jdbcSelectBuilder.setLoadedValuesCollectorFactory( resolveLoadedValuesCollectorFactory( fromClause, lockingClauseStrategy ) );
 
 		// additionally, add a post-action which uses the collected values.
 		jdbcSelectBuilder.appendPostAction( new FollowOnLockingAction(
-				loadedValuesCollector,
 				lockOptions.getLockMode(),
 				lockOptions.getTimeout(),
 				lockOptions.getScope()
@@ -98,7 +87,8 @@ public static void apply(
 	public void performPostAction(
 			StatementAccess jdbcStatementAccess,
 			Connection jdbcConnection,
-			ExecutionContext executionContext) {
+			ExecutionContext executionContext,
+			LoadedValuesCollector loadedValuesCollector) {
 		LockingHelper.logLoadedValues( loadedValuesCollector );
 
 		final var session = executionContext.getSession();
@@ -110,8 +100,8 @@ public void performPostAction(
 
 		try {
 			// collect registrations by entity type
-			final var entitySegments = segmentLoadedValues();
-			final var collectionSegments = segmentLoadedCollections();
+			final var entitySegments = segmentLoadedValues( loadedValuesCollector );
+			final var collectionSegments = segmentLoadedCollections( loadedValuesCollector );
 
 			// for each entity-type, prepare a locking select statement per table.
 			// this is based on the attributes for "state array" ordering purposes -
@@ -127,14 +117,9 @@ public void performPostAction(
 
 				// at this point, we have all the individual locking selects ready to go - execute them
 				final var lockingOptions = buildLockingOptions(
-						tableLocks,
-						entityDetailsMap,
-						entityMappingType,
-						effectiveEntityGraph,
-						entityKeys,
-						collectionSegments,
-						session,
-						executionContext );
+						tableLocks, entityDetailsMap, entityMappingType, effectiveEntityGraph, entityKeys,
+						collectionSegments, session, executionContext, loadedValuesCollector
+				);
 
 				tableLocks.forEach( (s, tableLock) ->
 						tableLock.performActions( entityDetailsMap, lockingOptions, session ) );
@@ -153,10 +138,11 @@ public QueryOptions buildLockingOptions(
 			Map<Object, EntityDetails> entityDetailsMap,
 			EntityMappingType entityMappingType,
 			EffectiveEntityGraph effectiveEntityGraph,
-			List<EntityKey>  entityKeys,
+			List<EntityKey> entityKeys,
 			Map<EntityMappingType, Map<PluralAttributeMapping, List<CollectionKey>>> collectionSegments,
 			SharedSessionContractImplementor session,
-			ExecutionContext executionContext) {
+			ExecutionContext executionContext,
+			LoadedValuesCollector loadedValuesCollector) {
 		if ( SQL_EXEC_LOGGER.isDebugEnabled() ) {
 			SQL_EXEC_LOGGER.startingFollowOnLockingProcess( entityMappingType.getEntityName() );
 		}
@@ -246,14 +232,14 @@ private QueryOptions buildLockingOptions(ExecutionContext executionContext) {
 	}
 
 	// Used by Hibernate Reactive
-	protected Map<EntityMappingType, List<EntityKey>> segmentLoadedValues() {
+	protected Map<EntityMappingType, List<EntityKey>> segmentLoadedValues(LoadedValuesCollector loadedValuesCollector) {
 		final Map<EntityMappingType, List<EntityKey>> map = new IdentityHashMap<>();
 		LockingHelper.segmentLoadedValues( loadedValuesCollector.getCollectedEntities(), map );
 		return map;
 	}
 
 	// Used by Hibernate Reactive
-	protected Map<EntityMappingType, Map<PluralAttributeMapping, List<CollectionKey>>> segmentLoadedCollections() {
+	protected Map<EntityMappingType, Map<PluralAttributeMapping, List<CollectionKey>>> segmentLoadedCollections(LoadedValuesCollector loadedValuesCollector) {
 		if ( lockScope == Locking.Scope.ROOT_ONLY ) {
 			return emptyMap();
 		}
@@ -281,62 +267,9 @@ protected TableLock createTableLock(TableDetails tableDetails, EntityMappingType
 	}
 
 	// Used by Hibernate Reactive
-	protected static LoadedValuesCollectorImpl resolveLoadedValuesCollector(
+	protected static LoadedValuesCollectorFactory resolveLoadedValuesCollectorFactory(
 			FromClause fromClause,
 			LockingClauseStrategy lockingClauseStrategy) {
-		return new LoadedValuesCollectorImpl( lockingClauseStrategy );
-	}
-
-	public static class LoadedValuesCollectorImpl implements LoadedValuesCollector {
-		private final Collection<NavigablePath> pathsToLock;
-
-		private List<LoadedEntityRegistration> entitiesToLock;
-		private List<LoadedCollectionRegistration> collectionsToLock;
-
-		public LoadedValuesCollectorImpl(LockingClauseStrategy lockingClauseStrategy) {
-			pathsToLock = LockingHelper.extractPathsToLock( lockingClauseStrategy );
-		}
-
-		@Override
-		public void registerEntity(NavigablePath navigablePath, EntityMappingType entityDescriptor, EntityKey entityKey) {
-			if ( pathsToLock.contains( navigablePath ) ) {
-				if ( entitiesToLock == null ) {
-					entitiesToLock = new ArrayList<>();
-				}
-				entitiesToLock.add(
-						new LoadedEntityRegistration( navigablePath, entityDescriptor, entityKey ) );
-			}
-		}
-
-		@Override
-		public void registerCollection(NavigablePath navigablePath, PluralAttributeMapping collectionDescriptor, CollectionKey collectionKey) {
-			if ( pathsToLock.contains( navigablePath ) ) {
-				if ( collectionsToLock == null ) {
-					collectionsToLock = new ArrayList<>();
-				}
-				collectionsToLock.add(
-						new LoadedCollectionRegistration( navigablePath, collectionDescriptor, collectionKey ) );
-			}
-		}
-
-		@Override
-		public void clear() {
-			if ( entitiesToLock != null ) {
-				entitiesToLock.clear();
-			}
-			if ( collectionsToLock != null ) {
-				collectionsToLock.clear();
-			}
-		}
-
-		@Override
-		public List<LoadedEntityRegistration> getCollectedEntities() {
-			return entitiesToLock;
-		}
-
-		@Override
-		public List<LoadedCollectionRegistration> getCollectedCollections() {
-			return collectionsToLock;
-		}
+		return new LoadedValuesCollectorFactory( lockingClauseStrategy.getPathsToLock() );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LoadedValuesCollectorFactory.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LoadedValuesCollectorFactory.java
new file mode 100644
index 000000000000..95daa78def6e
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LoadedValuesCollectorFactory.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.exec.internal.lock;
+
+import org.hibernate.spi.NavigablePath;
+
+import java.util.Collection;
+
+public class LoadedValuesCollectorFactory {
+	private final Collection<NavigablePath> pathsToLock;
+
+	public LoadedValuesCollectorFactory(Collection<NavigablePath> pathsToLock) {
+		this.pathsToLock = pathsToLock;
+	}
+
+	public LoadedValuesCollectorImpl build() {
+		return new LoadedValuesCollectorImpl( pathsToLock );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LoadedValuesCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LoadedValuesCollectorImpl.java
new file mode 100644
index 000000000000..d195d91f9bdd
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LoadedValuesCollectorImpl.java
@@ -0,0 +1,58 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.exec.internal.lock;
+
+import org.hibernate.engine.spi.CollectionKey;
+import org.hibernate.engine.spi.EntityKey;
+import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.spi.NavigablePath;
+import org.hibernate.sql.exec.spi.LoadedValuesCollector;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public class LoadedValuesCollectorImpl implements LoadedValuesCollector {
+	private final Collection<NavigablePath> pathsToLock;
+
+	private List<LoadedValuesCollector.LoadedEntityRegistration> entitiesToLock;
+	private List<LoadedValuesCollector.LoadedCollectionRegistration> collectionsToLock;
+
+	public LoadedValuesCollectorImpl(Collection<NavigablePath> pathsToLock) {
+		this.pathsToLock = pathsToLock;
+	}
+
+	public void registerEntity(NavigablePath navigablePath, EntityMappingType entityDescriptor, EntityKey entityKey) {
+		if ( pathsToLock.contains( navigablePath ) ) {
+			if ( entitiesToLock == null ) {
+				entitiesToLock = new ArrayList<>();
+			}
+			entitiesToLock.add(
+					new LoadedValuesCollector.LoadedEntityRegistration( navigablePath, entityDescriptor, entityKey ) );
+		}
+	}
+
+	public void registerCollection(NavigablePath navigablePath, PluralAttributeMapping collectionDescriptor, CollectionKey collectionKey) {
+		if ( collectionsToLock == null ) {
+			collectionsToLock = new ArrayList<>();
+		}
+		collectionsToLock.add(
+				new LoadedValuesCollector.LoadedCollectionRegistration( navigablePath, collectionDescriptor,
+						collectionKey ) );
+	}
+
+
+	@Override
+	public List<LoadedEntityRegistration> getCollectedEntities() {
+		return entitiesToLock == null ? Collections.emptyList() : entitiesToLock;
+	}
+
+	@Override
+	public List<LoadedCollectionRegistration> getCollectedCollections() {
+		return collectionsToLock == null ? Collections.emptyList() : collectionsToLock;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LockingHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LockingHelper.java
index c797737aaa01..fda75b6dd8bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LockingHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/LockingHelper.java
@@ -19,9 +19,6 @@
 import org.hibernate.query.internal.QueryOptionsImpl;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.query.sqm.ComparisonOperator;
-import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.SqlAstTranslator;
-import org.hibernate.sql.ast.spi.LockingClauseStrategy;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
@@ -42,7 +39,6 @@
 import org.hibernate.sql.results.spi.ListResultsConsumer;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -484,14 +480,6 @@ public static void logLoadedValues(LoadedValuesCollector collector) {
 		}
 	}
 
-	/**
-	 * Extracts all NavigablePaths to lock based on the {@linkplain LockingClauseStrategy locking strategy}
-	 * from the {@linkplain SqlAstTranslator SQL AST translator}.
-	 */
-	public static Collection<NavigablePath> extractPathsToLock(LockingClauseStrategy lockingClauseStrategy) {
-		return lockingClauseStrategy.getPathsToLock();
-	}
-
 	public static void segmentLoadedValues(List<LoadedValuesCollector.LoadedEntityRegistration> registrations, Map<EntityMappingType, List<EntityKey>> map) {
 		if ( registrations != null ) {
 			registrations.forEach( (registration) -> {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelect.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelect.java
index 9fb1f4d08631..841b0639b814 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelect.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelect.java
@@ -7,6 +7,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Incubating;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
+import org.hibernate.sql.exec.internal.lock.LoadedValuesCollectorFactory;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
 
 import java.sql.Connection;
@@ -26,16 +27,16 @@ public interface JdbcSelect extends PrimaryOperation, CacheableJdbcOperation {
 	int getMaxRows();
 
 	/**
-	 * Access to a collector of values loaded to be applied during the
+	 * Returns a Factory used to create a collector of values loaded to be applied during the
 	 * processing of the selection's results.
 	 * May be {@code null}.
 	 */
 	@Nullable
-	LoadedValuesCollector getLoadedValuesCollector();
+	LoadedValuesCollectorFactory getLoadedValuesCollectorFactory();
 
 	/**
 	 * Perform any pre-actions.
-	 * <p/>
+	 * <p>
 	 * Generally the pre-actions should use the passed {@code jdbcStatementAccess} to interact with the
 	 * database, although the {@code jdbcConnection} can be used to create specialized statements,
 	 * access the {@linkplain java.sql.DatabaseMetaData database metadata}, etc.
@@ -45,9 +46,8 @@ public interface JdbcSelect extends PrimaryOperation, CacheableJdbcOperation {
 	 * @param executionContext Access to contextual information useful while executing.
 	 */
 	void performPreActions(StatementAccess jdbcStatementAccess, Connection jdbcConnection, ExecutionContext executionContext);	/**
-
 	 * Perform any post-actions.
-	 * <p/>
+	 * <p>
 	 * Generally the post-actions should use the passed {@code jdbcStatementAccess} to interact with the
 	 * database, although the {@code jdbcConnection} can be used to create specialized statements,
 	 * access the {@linkplain java.sql.DatabaseMetaData database metadata}, etc.
@@ -56,11 +56,13 @@ public interface JdbcSelect extends PrimaryOperation, CacheableJdbcOperation {
 	 * @param jdbcStatementAccess Access to a JDBC Statement object which may be used to perform the action.
 	 * @param jdbcConnection The JDBC Connection.
 	 * @param executionContext Access to contextual information useful while executing.
+	 * @param loadedValuesCollector Access to the collector of values loaded as part of the primary operation.  This is useful for post-actions that need to know what was loaded in order to perform their work.
 	 */
-	void performPostAction(
+	void performPostActions(
 			boolean succeeded,
 			StatementAccess jdbcStatementAccess,
 			Connection jdbcConnection,
-			ExecutionContext executionContext);
+			ExecutionContext executionContext,
+			LoadedValuesCollector loadedValuesCollector);
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectWithActionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectWithActionsBuilder.java
index 6d01cf5a9059..0b75d57a4a82 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectWithActionsBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcSelectWithActionsBuilder.java
@@ -10,6 +10,8 @@
 import org.hibernate.dialect.lock.spi.LockingSupport;
 import org.hibernate.sql.ast.spi.LockingClauseStrategy;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
+import org.hibernate.sql.exec.internal.lock.LoadedValuesCollectorFactory;
+
 
 /// Contract used while building a [JdbcSelect] which might potentially
 /// include [pre-][PreAction] and/or [post-][PostAction] actions.
@@ -23,7 +25,8 @@ public interface JdbcSelectWithActionsBuilder {
 	JdbcSelectWithActionsBuilder setPrimaryAction(JdbcSelect primaryAction);
 
 	/// Collector of loaded values for post-processing.
-	JdbcSelectWithActionsBuilder setLoadedValuesCollector(LoadedValuesCollector loadedValuesCollector);
+	/// We need a factory of LoadedValuesCollectors, which will be instantiated for each query execution.
+	JdbcSelectWithActionsBuilder setLoadedValuesCollectorFactory(LoadedValuesCollectorFactory loadedValuesCollectorFactory);
 
 	///  Lock-timeout handling type.
 	JdbcSelectWithActionsBuilder setLockTimeoutType(LockTimeoutType lockTimeoutType);
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/LoadedValuesCollector.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/LoadedValuesCollector.java
index 613a355ea5d9..871e990b7847 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/LoadedValuesCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/LoadedValuesCollector.java
@@ -45,15 +45,6 @@ void registerCollection(
 			PluralAttributeMapping collectionDescriptor,
 			CollectionKey collectionKey);
 
-	/**
-	 * Clears the state of the collector.
-	 *
-	 * @implSpec In some cases, the collector may be cached as part of a
-	 * JdbcSelect being cached (see {@linkplain JdbcSelect#getLoadedValuesCollector()}.
-	 * This method allows clearing of the internal state after execution of the JdbcSelect.
-	 */
-	void clear();
-
 	/**
 	 * Access to all root entities loaded.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/PostAction.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/PostAction.java
index ff08def0d740..a1cadc2a250f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/PostAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/PostAction.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.sql.exec.spi;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Incubating;
 
 import java.sql.Connection;
@@ -16,7 +17,7 @@
 public interface PostAction extends SecondaryAction {
 	/**
 	 * Perform the action.
-	 * <p/>
+	 * <p>
 	 * Generally the action should use the passed {@code jdbcStatementAccess} to interact with the
 	 * database, although the {@code jdbcConnection} can be used to create specialized statements,
 	 * access the {@linkplain java.sql.DatabaseMetaData database metadata}, etc.
@@ -24,8 +25,9 @@ public interface PostAction extends SecondaryAction {
 	 * @param jdbcStatementAccess Access to a JDBC Statement object which may be used to perform the action.
 	 * @param jdbcConnection The JDBC Connection.
 	 * @param executionContext Access to contextual information useful while executing.
+	 * @param loadedValuesCollector Access to the collector of values loaded as part of the primary operation.  This is useful for post-actions that need to know what was loaded in order to perform their work.
 	 */
-	void performPostAction(StatementAccess jdbcStatementAccess, Connection jdbcConnection, ExecutionContext executionContext);
+	void performPostAction(StatementAccess jdbcStatementAccess, Connection jdbcConnection, ExecutionContext executionContext, @Nullable LoadedValuesCollector loadedValuesCollector);
 
 	/**
 	 * Should this post-action always be run even if the primary operation fails?
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/PreAction.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/PreAction.java
index f8fdb063b6b8..c4546faef070 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/PreAction.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/PreAction.java
@@ -16,7 +16,7 @@
 public interface PreAction extends SecondaryAction {
 	/**
 	 * Perform the action.
-	 * <p/>
+	 * <p>
 	 * Generally the action should use the passed {@code jdbcStatementAccess} to interact with the
 	 * database, although the {@code jdbcConnection} can be used to create specialized statements,
 	 * access the {@linkplain java.sql.DatabaseMetaData database metadata}, etc.
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/package-info.java
index c8e9f8d1f67f..bbdf6fac52a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/package-info.java
@@ -9,15 +9,15 @@
  * executed via the corresponding executor -
  * either {@linkplain org.hibernate.sql.exec.spi.JdbcSelectExecutor}
  * or {@linkplain org.hibernate.sql.exec.spi.JdbcMutationExecutor}.
- * <p/>
+ * <p>
  * For operations that return {@link java.sql.ResultSet}s, be sure to see
  * {@link org.hibernate.sql.results} which provides support for processing results
  * starting with {@link org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping}.
- * <p/>
+ * <p>
  * Also provides support for pessimistic locking as part of
  * {@linkplain org.hibernate.sql.exec.spi.JdbcSelect JDBC select} handling.  For details,
  * see {@linkplain org.hibernate.sql.exec.internal.JdbcSelectWithActions},
- * {@linkplain org.hibernate.sql.exec.spi.JdbcSelect#getLoadedValuesCollector()},
+ * {@linkplain org.hibernate.sql.exec.spi.JdbcSelect#getLoadedValuesCollectorFactory()},
  * {@linkplain org.hibernate.sql.exec.internal.lock.FollowOnLockingAction}
  * and friends.
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java
index 77bec869b1a7..a462844ef420 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ModelMutationLogging.java
@@ -8,6 +8,7 @@
 import org.hibernate.internal.log.SubSystemLogging;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
@@ -34,7 +35,7 @@ public interface ModelMutationLogging extends BasicLogger {
 
 	String NAME = SubSystemLogging.BASE + ".jdbc.mutation";
 
-	ModelMutationLogging MODEL_MUTATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ModelMutationLogging.class, NAME );
+	ModelMutationLogging MODEL_MUTATION_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ModelMutationLogging.class, NAME, Locale.ROOT );
 
 	@LogMessage(level = TRACE)
 	@Message(id = 90005101, value = "Static SQL for entity: %s")
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java b/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java
index 7f064ef47483..1af59dc918ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/TableMapping.java
@@ -9,7 +9,7 @@
 
 /**
  * Describes a table as far as Hibernate understands it from mapping details
- * <p/>
+ * <p>
  * Includes {@linkplain TableDetails basic details}, in addition to details
  * about the table in relation to a particular {@link MutationTarget}
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java
index e173e3a93cf7..74313b9d91c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueBinding.java
@@ -6,6 +6,7 @@
 
 import java.util.Objects;
 
+import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 
 /**
@@ -18,10 +19,14 @@
 public class ColumnValueBinding {
 	private final ColumnReference columnReference;
 	private final ColumnWriteFragment valueExpression;
+	private final boolean attributeInsertable;
+	private final boolean attributeUpdatable;
 
 	public ColumnValueBinding(ColumnReference columnReference, ColumnWriteFragment valueExpression) {
 		this.columnReference = columnReference;
 		this.valueExpression = valueExpression;
+		this.attributeInsertable = determineAttributeInsertable( valueExpression );
+		this.attributeUpdatable = determineAttributeUpdatable( valueExpression );
 	}
 
 	public ColumnReference getColumnReference() {
@@ -32,6 +37,26 @@ public ColumnWriteFragment getValueExpression() {
 		return valueExpression;
 	}
 
+	public boolean isAttributeInsertable() {
+		return attributeInsertable;
+	}
+
+	public boolean isAttributeUpdatable() {
+		return attributeUpdatable;
+	}
+
+	private static boolean determineAttributeInsertable(ColumnWriteFragment valueExpression) {
+		return valueExpression == null
+			|| !(valueExpression.getSqlTypedMapping() instanceof SelectableMapping selectableMapping)
+			|| selectableMapping.isInsertable();
+	}
+
+	private static boolean determineAttributeUpdatable(ColumnWriteFragment valueExpression) {
+		return valueExpression == null
+			|| !(valueExpression.getSqlTypedMapping() instanceof SelectableMapping selectableMapping)
+			|| selectableMapping.isUpdateable();
+	}
+
 	@Override
 	public String toString() {
 		return "ColumnValueBinding(" + valueExpression + ")";
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java
index 2c85811ac693..41908a704d59 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/ColumnValueParameter.java
@@ -23,6 +23,10 @@ public ColumnValueParameter(ColumnReference columnReference, ParameterUsage usag
 		this.usage = usage;
 	}
 
+	public ColumnValueParameter(ColumnReference columnReference) {
+		this( columnReference, ParameterUsage.SET );
+	}
+
 	@Override
 	public ColumnReference getColumnReference() {
 		return columnReference;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java
index 5e5d0af8d8e7..f1885c0a7085 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/AbstractTableUpdateBuilder.java
@@ -86,8 +86,7 @@ protected List<ColumnValueBinding> getLobValueBindings() {
 
 	@Override
 	public void addValueColumn(String columnWriteFragment, SelectableMapping selectableMapping) {
-		final ColumnValueBinding valueBinding = createValueBinding( columnWriteFragment, selectableMapping );
-
+		final var valueBinding = createValueBinding( columnWriteFragment, selectableMapping );
 		if ( selectableMapping.isLob() && getJdbcServices().getDialect().forceLobAsLastValue() ) {
 			if ( lobValueBindings == null ) {
 				lobValueBindings = new ArrayList<>();
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValueBindingBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValueBindingBuilder.java
index 90f9164f5812..8a95afd8e8ff 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValueBindingBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValueBindingBuilder.java
@@ -41,11 +41,7 @@ public static ColumnValueBinding createValueBinding(
 			MutatingTableReference mutatingTableReference,
 			ParameterUsage parameterUsage,
 			Consumer<Object> parameterConsumer) {
-		final ColumnReference columnReference = new ColumnReference(
-				mutatingTableReference,
-				selectableMapping.getSelectionExpression(),
-				selectableMapping.getJdbcMapping()
-		);
+		final ColumnReference columnReference = new ColumnReference( mutatingTableReference, selectableMapping );
 		final ColumnWriteFragment columnWriteFragment = buildWriteFragment(
 				writeExpression,
 				selectableMapping,
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValuesTableMutationBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValuesTableMutationBuilder.java
index 3a5950d9ac4f..f9813a5bf88d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValuesTableMutationBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/ColumnValuesTableMutationBuilder.java
@@ -36,10 +36,13 @@ public interface ColumnValuesTableMutationBuilder<M extends TableMutation<?>> ex
 	 * Add a column as part of the values list
 	 */
 	default void addValueColumn(SelectableMapping selectableMapping) {
-		addValueColumn(
-				selectableMapping.getWriteExpression(),
-				selectableMapping
-		);
+		if ( !selectableMapping.isFormula() ) {
+//		if ( selectableMapping.isInsertable() || selectableMapping.isUpdateable() ) {
+			addValueColumn(
+					selectableMapping.getWriteExpression(),
+					selectableMapping
+			);
+		}
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java
index 5be2521b0c71..8f1381a1841d 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/MutationGroupBuilder.java
@@ -73,7 +73,7 @@ public void forEachTableMutationBuilder(Consumer<TableMutationBuilder<?>> consum
 	public void accept(int selectionIndex, SelectableMapping selectableMapping) {
 		final EntityPersister entityPersister = mutationTarget.getTargetPart().getEntityPersister();
 		final String tableNameForMutation = entityPersister.physicalTableNameForMutation( selectableMapping );
-		final ColumnValuesTableMutationBuilder mutationBuilder = findTableDetailsBuilder( tableNameForMutation );
+		final ColumnValuesTableMutationBuilder<?> mutationBuilder = findTableDetailsBuilder( tableNameForMutation );
 		mutationBuilder.addValueColumn( selectableMapping );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMergeBuilder.java b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMergeBuilder.java
index 75054ef7e78d..754676cf0f34 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMergeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/ast/builder/TableMergeBuilder.java
@@ -12,7 +12,6 @@
 import org.hibernate.sql.model.ast.MutatingTableReference;
 import org.hibernate.sql.model.ast.RestrictedTableMutation;
 import org.hibernate.sql.model.internal.OptionalTableUpdate;
-import org.hibernate.sql.model.internal.TableUpdateNoSet;
 
 import java.util.List;
 
@@ -39,9 +38,6 @@ public TableMergeBuilder(
 	@Override
 	public RestrictedTableMutation<O> buildMutation() {
 		final List<ColumnValueBinding> valueBindings = combine( getValueBindings(), getKeyBindings(), getLobValueBindings() );
-		if ( valueBindings.isEmpty() ) {
-			return (RestrictedTableMutation<O>) new TableUpdateNoSet( getMutatingTable(), getMutationTarget() );
-		}
 
 		// TODO: add getMergeDetails()
 //		if ( getMutatingTable().getTableMapping().getUpdateDetails().getCustomSql() != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/internal/OptionalTableInsert.java b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/OptionalTableInsert.java
new file mode 100644
index 000000000000..99d1915ea41f
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/internal/OptionalTableInsert.java
@@ -0,0 +1,41 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.model.internal;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.sql.ast.tree.expression.ColumnReference;
+import org.hibernate.sql.model.MutationTarget;
+import org.hibernate.sql.model.ast.ColumnValueBinding;
+import org.hibernate.sql.model.ast.ColumnValueParameter;
+import org.hibernate.sql.model.ast.MutatingTableReference;
+
+import java.util.List;
+
+public class OptionalTableInsert extends TableInsertStandard {
+
+	private final @Nullable String constraintName;
+	private final List<String> constraintColumnNames;
+
+	public OptionalTableInsert(
+			MutatingTableReference mutatingTable,
+			MutationTarget<?> mutationTarget,
+			List<ColumnValueBinding> valueBindings,
+			List<ColumnReference> returningColumns,
+			List<ColumnValueParameter> parameters,
+			@Nullable String constraintName,
+			List<String> constraintColumnNames) {
+		super( mutatingTable, mutationTarget, valueBindings, returningColumns, parameters );
+		this.constraintName = constraintName;
+		this.constraintColumnNames = constraintColumnNames;
+	}
+
+	public @Nullable String getConstraintName() {
+		return constraintName;
+	}
+
+	public List<String> getConstraintColumnNames() {
+		return constraintColumnNames;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java
index d32499fcb939..5c79b164d034 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/AbstractJdbcMutation.java
@@ -45,10 +45,9 @@ public AbstractJdbcMutation(
 
 		this.jdbcValueDescriptors = arrayList( parameterBinders.size() );
 		for ( int i = 0; i < parameterBinders.size(); i++ ) {
-			final JdbcValueDescriptorImpl parameterDescriptor = new JdbcValueDescriptorImpl(
-					parameterBinders.get( i ),
-					expectation.getNumberOfParametersUsed() + i + 1
-			);
+			final var parameterDescriptor =
+					new JdbcValueDescriptorImpl( parameterBinders.get( i ),
+							expectation.getNumberOfParametersUsed() + i + 1 );
 			this.jdbcValueDescriptors.add( parameterDescriptor );
 		}
 	}
@@ -82,7 +81,7 @@ public List<JdbcParameterBinder> getParameterBinders() {
 	@Override
 	public JdbcValueDescriptor findValueDescriptor(String columnName, ParameterUsage usage) {
 		for ( int i = 0; i < jdbcValueDescriptors.size(); i++ ) {
-			final JdbcValueDescriptor descriptor = jdbcValueDescriptors.get( i );
+			final var descriptor = jdbcValueDescriptors.get( i );
 			if ( descriptor.getColumnName().equals( columnName )
 					&& descriptor.getUsage() == usage ) {
 				return descriptor;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/DeleteOrUpsertOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/DeleteOrUpsertOperation.java
index 5042cc87be35..06f69ea2ee65 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/DeleteOrUpsertOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/DeleteOrUpsertOperation.java
@@ -14,7 +14,6 @@
 import org.hibernate.engine.jdbc.mutation.internal.MutationQueryOptions;
 import org.hibernate.engine.jdbc.mutation.internal.PreparedStatementGroupSingleTable;
 import org.hibernate.engine.jdbc.mutation.spi.Binding;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.jdbc.Expectation;
 import org.hibernate.persister.entity.mutation.EntityMutationTarget;
@@ -41,8 +40,6 @@ public class DeleteOrUpsertOperation implements SelfExecutingUpdateOperation {
 
 	private final OptionalTableUpdate optionalTableUpdate;
 
-	private final Expectation expectation = getExpectation();
-
 	public DeleteOrUpsertOperation(
 			EntityMutationTarget mutationTarget,
 			EntityTableMapping tableMapping,
@@ -89,8 +86,7 @@ public void performMutation(
 			JdbcValueBindings jdbcValueBindings,
 			ValuesAnalysis valuesAnalysis,
 			SharedSessionContractImplementor session) {
-		final UpdateValuesAnalysis analysis = (UpdateValuesAnalysis) valuesAnalysis;
-
+		final var analysis = (UpdateValuesAnalysis) valuesAnalysis;
 		if ( analysis.getTablesWithNonNullValues().contains( tableMapping ) ) {
 			performUpsert( jdbcValueBindings, session );
 		}
@@ -103,7 +99,7 @@ public void performMutation(
 	private void performDelete(JdbcValueBindings jdbcValueBindings, SharedSessionContractImplementor session) {
 		MODEL_MUTATION_LOGGER.performingDelete( tableMapping.getTableName() );
 
-		final TableDeleteStandard upsertDeleteAst = new TableDeleteStandard(
+		final var upsertDeleteAst = new TableDeleteStandard(
 				optionalTableUpdate.getMutatingTable(),
 				mutationTarget,
 				"upsert delete",
@@ -112,7 +108,7 @@ private void performDelete(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 				emptyList()
 		);
 
-		final JdbcServices jdbcServices = session.getJdbcServices();
+		final var jdbcServices = session.getJdbcServices();
 		final var upsertDelete =
 				jdbcServices.getJdbcEnvironment().getSqlAstTranslatorFactory()
 						.buildModelMutationTranslator( upsertDeleteAst, session.getFactory() )
@@ -120,20 +116,22 @@ private void performDelete(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 		final var statementGroup = new PreparedStatementGroupSingleTable( upsertDelete, session );
 		final var statementDetails = statementGroup.resolvePreparedStatementDetails( tableMapping.getTableName() );
 		try {
-			final PreparedStatement upsertDeleteStatement = statementDetails.resolveStatement();
-			jdbcServices.getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
+			final var upsertDeleteStatement = statementDetails.resolveStatement();
+			final String sql = statementDetails.getSqlString();
+			jdbcServices.getSqlStatementLogger().logStatement( sql );
 			bindDeleteKeyValues( jdbcValueBindings, statementDetails, session );
-			final int rowCount = session.getJdbcCoordinator().getResultSetReturn()
-					.executeUpdate( upsertDeleteStatement, statementDetails.getSqlString() );
+			final int rowCount =
+					session.getJdbcCoordinator().getResultSetReturn()
+							.executeUpdate( upsertDeleteStatement, sql );
 			MODEL_MUTATION_LOGGER.upsertDeletedRowCount( rowCount, tableMapping.getTableName() );
 			try {
-				getExpectation().verifyOutcome( rowCount, upsertDeleteStatement, -1, statementDetails.getSqlString() );
+				getExpectation().verifyOutcome( rowCount, upsertDeleteStatement, -1, sql );
 			}
 			catch (SQLException e) {
 				throw jdbcServices.getSqlExceptionHelper().convert(
 						e,
 						"Unable to verify outcome for upsert delete",
-						statementDetails.getSqlString()
+						sql
 				);
 			}
 		}
@@ -146,14 +144,15 @@ private void bindDeleteKeyValues(
 			JdbcValueBindings jdbcValueBindings,
 			PreparedStatementDetails statementDetails,
 			SharedSessionContractImplementor session) {
-		final PreparedStatement statement = statementDetails.resolveStatement();
+		final var statement = statementDetails.resolveStatement();
 		int jdbcBindingPosition = 1;
-		for ( Binding binding : jdbcValueBindings.getBindingGroup( tableMapping.getTableName() ).getBindings() ) {
-			if ( binding.getValueDescriptor().getUsage() == ParameterUsage.RESTRICT ) {
+		for ( var binding : jdbcValueBindings.getBindingGroup( tableMapping.getTableName() ).getBindings() ) {
+			final var valueDescriptor = binding.getValueDescriptor();
+			if ( valueDescriptor.getUsage() == ParameterUsage.RESTRICT ) {
 				bindKeyValue(
 						jdbcBindingPosition++,
 						binding,
-						binding.getValueDescriptor(),
+						valueDescriptor,
 						statement,
 						statementDetails.getSqlString(),
 						tableMapping,
@@ -194,8 +193,8 @@ private void performUpsert(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 		final var statementGroup = new PreparedStatementGroupSingleTable( upsertOperation, session );
 		final var statementDetails = statementGroup.resolvePreparedStatementDetails( tableMapping.getTableName() );
 		try {
-			final PreparedStatement updateStatement = statementDetails.resolveStatement();
-			final JdbcServices jdbcServices = session.getJdbcServices();
+			final var updateStatement = statementDetails.resolveStatement();
+			final var jdbcServices = session.getJdbcServices();
 			jdbcServices.getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
 			jdbcValueBindings.beforeStatement( statementDetails );
 			final int rowCount =
@@ -233,6 +232,6 @@ public OptionalTableUpdate getOptionalTableUpdate() {
 	}
 
 	protected Expectation getExpectation() {
-		return new Expectation.RowCount();
+		return upsertOperation.getExpectation();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java
index 3cb98d805783..5c9b471c104f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/JdbcValueDescriptor.java
@@ -38,6 +38,6 @@ public interface JdbcValueDescriptor {
 
 	default boolean matches(String columnName, ParameterUsage usage) {
 		return getColumnName().equals( columnName )
-				&& getUsage() == usage;
+			&& getUsage() == usage;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/MergeOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/MergeOperation.java
index 0e1bf7d0dd94..ad7dabcd7ccd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/MergeOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/MergeOperation.java
@@ -23,7 +23,16 @@ public MergeOperation(
 			MutationTarget<?> mutationTarget,
 			String sql,
 			List<? extends JdbcParameterBinder> parameterBinders) {
-		super( tableDetails, mutationTarget, sql, false, new Expectation.RowCount(), parameterBinders );
+		this( tableDetails, mutationTarget, sql, new Expectation.RowCount(), parameterBinders );
+	}
+
+	public MergeOperation(
+			TableMapping tableDetails,
+			MutationTarget<?> mutationTarget,
+			String sql,
+			Expectation expectation,
+			List<? extends JdbcParameterBinder> parameterBinders) {
+		super( tableDetails, mutationTarget, sql, false, expectation, parameterBinders );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java
index 70362dc28fb4..73f09c0b1ecb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateOperation.java
@@ -4,14 +4,6 @@
  */
 package org.hibernate.sql.model.jdbc;
 
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-
 import org.hibernate.StaleStateException;
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.ParameterUsage;
@@ -21,12 +13,12 @@
 import org.hibernate.engine.jdbc.mutation.spi.Binding;
 import org.hibernate.engine.jdbc.mutation.spi.BindingGroup;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.jdbc.Expectation;
+import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.persister.entity.mutation.EntityMutationTarget;
 import org.hibernate.persister.entity.mutation.EntityTableMapping;
 import org.hibernate.persister.entity.mutation.UpdateValuesAnalysis;
@@ -36,8 +28,10 @@
 import org.hibernate.sql.model.SelfExecutingUpdateOperation;
 import org.hibernate.sql.model.TableMapping;
 import org.hibernate.sql.model.ValuesAnalysis;
+import org.hibernate.sql.model.ast.AbstractTableUpdate;
 import org.hibernate.sql.model.ast.ColumnValueBinding;
 import org.hibernate.sql.model.ast.ColumnValueParameter;
+import org.hibernate.sql.model.ast.ColumnWriteFragment;
 import org.hibernate.sql.model.ast.MutatingTableReference;
 import org.hibernate.sql.model.ast.TableDelete;
 import org.hibernate.sql.model.ast.TableInsert;
@@ -50,7 +44,15 @@
 import org.hibernate.sql.model.internal.TableUpdateCustomSql;
 import org.hibernate.sql.model.internal.TableUpdateStandard;
 
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
 import static org.hibernate.exception.ConstraintViolationException.ConstraintKind.UNIQUE;
+import static org.hibernate.internal.util.collections.CollectionHelper.arrayList;
 import static org.hibernate.sql.model.ModelMutationLogging.MODEL_MUTATION_LOGGER;
 
 /**
@@ -83,7 +85,7 @@ public OptionalTableUpdateOperation(
 		this.optimisticLockBindings = upsert.getOptimisticLockBindings();
 		this.parameters = upsert.getParameters();
 
-		this.jdbcValueDescriptors = CollectionHelper.arrayList( parameters.size() );
+		this.jdbcValueDescriptors = arrayList( parameters.size() );
 		for ( int i = 0; i < parameters.size(); i++ ) {
 			jdbcValueDescriptors.add( new JdbcValueDescriptorImpl( parameters.get( i ), i + 1 ) );
 		}
@@ -105,10 +107,26 @@ public TableMapping getTableDetails() {
 		return tableMapping;
 	}
 
+	public List<ColumnValueBinding> getValueBindings() {
+		return valueBindings;
+	}
+
+	public List<ColumnValueBinding> getKeyBindings() {
+		return keyBindings;
+	}
+
+	public List<ColumnValueBinding> getOptimisticLockBindings() {
+		return optimisticLockBindings;
+	}
+
+	public List<ColumnValueParameter> getParameters() {
+		return parameters;
+	}
+
 	@Override
 	public JdbcValueDescriptor findValueDescriptor(String columnName, ParameterUsage usage) {
 		for ( int i = 0; i < jdbcValueDescriptors.size(); i++ ) {
-			final JdbcValueDescriptor descriptor = jdbcValueDescriptors.get( i );
+			final var descriptor = jdbcValueDescriptors.get( i );
 			if ( descriptor.getColumnName().equals( columnName )
 					&& descriptor.getUsage() == usage ) {
 				return descriptor;
@@ -122,44 +140,16 @@ public void performMutation(
 			JdbcValueBindings jdbcValueBindings,
 			ValuesAnalysis incomingValuesAnalysis,
 			SharedSessionContractImplementor session) {
-		final UpdateValuesAnalysis valuesAnalysis = (UpdateValuesAnalysis) incomingValuesAnalysis;
+		final var valuesAnalysis = (UpdateValuesAnalysis) incomingValuesAnalysis;
 		if ( valuesAnalysis.getTablesNeedingUpdate().contains( tableMapping )
 				|| valuesAnalysis.getTablesNeedingDynamicUpdate().contains( tableMapping ) ) {
 			try {
-				if ( !valuesAnalysis.getTablesWithNonNullValues().contains( tableMapping ) ) {
-					// all the new values for this table were null - possibly delete the row
-					if ( valuesAnalysis.getTablesWithPreviousNonNullValues().contains( tableMapping ) ) {
-						performDelete( jdbcValueBindings, session );
-					}
+				if ( valuesAnalysis.getTablesWithNonNullValues().contains( tableMapping ) ) {
+					performUpdateOrInsert( jdbcValueBindings, session, valuesAnalysis );
 				}
-				else {
-					// there are some non-null values for the table - we need to update or insert the values.
-
-					// first, try the update and see if any row was affected
-					final boolean wasUpdated;
-					if ( valuesAnalysis.getTablesWithPreviousNonNullValues().contains( tableMapping ) ) {
-						// either
-						// 		1) not know if the values for this table were previously all null (because old values are not known)
-						//		2) the values for this table were previously had at least one non-null
-						wasUpdated = performUpdate( jdbcValueBindings, session );
-					}
-					else {
-						wasUpdated = false;
-					}
-
-					if ( !wasUpdated ) {
-						MODEL_MUTATION_LOGGER.upsertUpdateNoRowsPerformingInsert( tableMapping.getTableName() );
-						try {
-							performInsert( jdbcValueBindings, session );
-						}
-						catch (ConstraintViolationException cve) {
-							throw cve.getKind() == UNIQUE
-									// assume it was the primary key constraint which was violated,
-									// due to a new version of the row existing in the database
-									? new StaleStateException( mutationTarget.getRolePath(), cve )
-									: cve;
-						}
-					}
+				// all the new values for this table were null - possibly delete the row
+				else if ( valuesAnalysis.getTablesWithPreviousNonNullValues().contains( tableMapping ) ) {
+					performDelete( jdbcValueBindings, session );
 				}
 			}
 			finally {
@@ -168,10 +158,49 @@ public void performMutation(
 		}
 	}
 
+	private void performUpdateOrInsert(
+			JdbcValueBindings jdbcValueBindings,
+			SharedSessionContractImplementor session,
+			UpdateValuesAnalysis valuesAnalysis) {
+		// there are some non-null values for the table - we need to update or insert the values.
+		// first, try the update and see if any row was affected
+		final boolean wasUpdated;
+		if ( valuesAnalysis.getTablesWithPreviousNonNullValues().contains( tableMapping ) ) {
+			// either
+			// 		1) not know if the values for this table were previously all null (because old values are not known)
+			//		2) the values for this table were previously had at least one non-null
+			wasUpdated = performUpdate( jdbcValueBindings, session );
+		}
+		else {
+			wasUpdated = false;
+		}
+
+		if ( !wasUpdated ) {
+			MODEL_MUTATION_LOGGER.upsertUpdateNoRowsPerformingInsert( tableMapping.getTableName() );
+			try {
+				performInsert( jdbcValueBindings, session );
+			}
+			catch (ConstraintViolationException cve) {
+				if ( cve.getKind() == UNIQUE ) {
+					// Ignore primary key violation if the insert is composed of just the primary key
+					// or if we skipped the UPDATE attempt because no columns were updatable
+					if ( valueBindings.stream().anyMatch( ColumnValueBinding::isAttributeUpdatable ) ) {
+						// assume it was the primary key constraint which was violated,
+						// due to a new version of the row existing in the database
+						throw new StaleStateException( mutationTarget.getRolePath(), cve );
+					}
+				}
+				else {
+					throw cve;
+				}
+			}
+		}
+	}
+
 	private void performDelete(JdbcValueBindings jdbcValueBindings, SharedSessionContractImplementor session) {
-		final JdbcDeleteMutation jdbcDelete = createJdbcDelete( session );
-		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-		final PreparedStatement deleteStatement = createStatementDetails( jdbcDelete, jdbcCoordinator );
+		final var jdbcDelete = createJdbcDelete( session );
+		final var jdbcCoordinator = session.getJdbcCoordinator();
+		final var deleteStatement = createStatementDetails( jdbcDelete, jdbcCoordinator );
 		session.getJdbcServices().getSqlStatementLogger().logStatement( jdbcDelete.getSqlString() );
 		bindKeyValues( jdbcValueBindings, deleteStatement, jdbcDelete, session );
 		try {
@@ -189,7 +218,7 @@ private void bindKeyValues(
 			PreparedStatement statement,
 			JdbcDeleteMutation jdbcDelete,
 			SharedSessionContractImplementor session) {
-		final BindingGroup bindingGroup = jdbcValueBindings.getBindingGroup( tableMapping.getTableName() );
+		final var bindingGroup = jdbcValueBindings.getBindingGroup( tableMapping.getTableName() );
 		if ( bindingGroup == null ) {
 			throw new IllegalStateException(
 					String.format(
@@ -203,10 +232,10 @@ private void bindKeyValues(
 		int jdbcBindingPosition = 1;
 		boolean foundKeyBindings = false;
 		// leverage the fact that bindings are contiguous to avoid full nested iterations
-		final Iterator<ColumnValueBinding> keyBindingsItr = keyBindings.iterator();
-		bindings: for ( Binding binding : bindingGroup.getBindings() ) {
+		final var keyBindingsItr = keyBindings.iterator();
+		bindings: for ( var binding : bindingGroup.getBindings() ) {
 			// binding-position here is 1-based (JDBC)
-			final JdbcValueDescriptor valueDescriptor = jdbcValueDescriptors.get( binding.getPosition() - 1 );
+			final var valueDescriptor = jdbcValueDescriptors.get( binding.getPosition() - 1 );
 			// key bindings would have a usage of RESTRICT relative to the UPDATE
 			if ( valueDescriptor.getUsage() == ParameterUsage.RESTRICT ) {
 				while ( keyBindingsItr.hasNext() ) {
@@ -288,7 +317,7 @@ protected JdbcDeleteMutation createJdbcDelete(SharedSessionContractImplementor s
 			);
 		}
 
-		final SessionFactoryImplementor factory = session.getSessionFactory();
+		final var factory = session.getSessionFactory();
 		return factory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
 				.buildModelMutationTranslator( tableDelete, factory )
 				.translate( null, MutationQueryOptions.INSTANCE );
@@ -299,16 +328,23 @@ private boolean performUpdate(
 			SharedSessionContractImplementor session) {
 		MODEL_MUTATION_LOGGER.performingUpdate( tableMapping.getTableName() );
 
-		final JdbcServices jdbcServices = session.getJdbcServices();
-		final var statementGroup = new PreparedStatementGroupSingleTable( createJdbcUpdate( session ), session );
-		final var statementDetails = statementGroup.resolvePreparedStatementDetails( tableMapping.getTableName() );
+		final var jdbcServices = session.getJdbcServices();
+		final var updateValueBindings = getUpdatableValueBindings();
+		final var updateParameters = collectUpdateParameters( updateValueBindings );
+		final var statementDetails =
+				new PreparedStatementGroupSingleTable(
+						createJdbcUpdate( session, updateValueBindings, updateParameters ),
+						session
+				)
+						.resolvePreparedStatementDetails( tableMapping.getTableName() );
+		final String sql = statementDetails.getSqlString();
 		try {
-			final PreparedStatement updateStatement = statementDetails.resolveStatement();
-			jdbcServices.getSqlStatementLogger().logStatement( statementDetails.getSqlString() );
-			jdbcValueBindings.beforeStatement( statementDetails );
+			final var updateStatement = statementDetails.resolveStatement();
+			jdbcServices.getSqlStatementLogger().logStatement( sql );
+			bindUpdateValues( jdbcValueBindings, updateStatement, updateParameters, sql, session );
 			final int rowCount =
 					session.getJdbcCoordinator().getResultSetReturn()
-							.executeUpdate( updateStatement, statementDetails.getSqlString() );
+							.executeUpdate( updateStatement, sql );
 			if ( rowCount == 0 ) {
 				return false;
 			}
@@ -317,7 +353,7 @@ private boolean performUpdate(
 						rowCount,
 						updateStatement,
 						-1,
-						statementDetails.getSqlString()
+						sql
 				);
 				return true;
 			}
@@ -325,8 +361,8 @@ private boolean performUpdate(
 		catch (SQLException e) {
 			throw jdbcServices.getSqlExceptionHelper().convert(
 					e,
-					"Unable to execute mutation PreparedStatement against table `" + tableMapping.getTableName() + "`",
-					statementDetails.getSqlString()
+					"Unable to execute mutation PreparedStatement against table '" + tableMapping.getTableName() + "'",
+					sql
 			);
 		}
 		finally {
@@ -338,6 +374,15 @@ private boolean performUpdate(
 	 * Used by Hibernate Reactive
 	 */
 	protected JdbcMutationOperation createJdbcUpdate(SharedSessionContractImplementor session) {
+		final var updateValueBindings = getUpdatableValueBindings();
+		final var updateParameters = collectUpdateParameters( updateValueBindings );
+		return createJdbcUpdate( session, updateValueBindings, updateParameters );
+	}
+
+	private JdbcMutationOperation createJdbcUpdate(
+			SharedSessionContractImplementor session,
+			List<ColumnValueBinding> updateValueBindings,
+			List<ColumnValueParameter> updateParameters) {
 		final TableUpdate<JdbcMutationOperation> tableUpdate;
 		if ( tableMapping.getUpdateDetails() != null
 				&& tableMapping.getUpdateDetails().getCustomSql() != null ) {
@@ -345,10 +390,10 @@ protected JdbcMutationOperation createJdbcUpdate(SharedSessionContractImplemento
 					new MutatingTableReference( tableMapping ),
 					mutationTarget,
 					"upsert update for " + mutationTarget.getRolePath(),
-					valueBindings,
+					updateValueBindings,
 					keyBindings,
 					optimisticLockBindings,
-					parameters
+					updateParameters
 			);
 		}
 		else {
@@ -356,10 +401,10 @@ protected JdbcMutationOperation createJdbcUpdate(SharedSessionContractImplemento
 					new MutatingTableReference( tableMapping ),
 					mutationTarget,
 					"upsert update for " + mutationTarget.getRolePath(),
-					valueBindings,
+					updateValueBindings,
 					keyBindings,
 					optimisticLockBindings,
-					parameters
+					updateParameters
 			);
 		}
 
@@ -369,13 +414,14 @@ protected JdbcMutationOperation createJdbcUpdate(SharedSessionContractImplemento
 	}
 
 	private void performInsert(JdbcValueBindings jdbcValueBindings, SharedSessionContractImplementor session) {
-		final JdbcInsertMutation jdbcInsert = createJdbcInsert( session );
-		final JdbcServices jdbcServices = session.getJdbcServices();
-		final JdbcCoordinator jdbcCoordinator = session.getJdbcCoordinator();
-		final PreparedStatement insertStatement = createStatementDetails( jdbcInsert, jdbcCoordinator );
+		final var jdbcInsert = createJdbcOptionalInsert( session );
+		final var jdbcServices = session.getJdbcServices();
+		final var jdbcCoordinator = session.getJdbcCoordinator();
+		final var insertStatement = createStatementDetails( jdbcInsert, jdbcCoordinator );
+		final String sql = jdbcInsert.getSqlString();
 		try {
-			jdbcServices.getSqlStatementLogger().logStatement( jdbcInsert.getSqlString() );
-			final BindingGroup bindingGroup = jdbcValueBindings.getBindingGroup( tableMapping.getTableName() );
+			jdbcServices.getSqlStatementLogger().logStatement( sql );
+			final var bindingGroup = jdbcValueBindings.getBindingGroup( tableMapping.getTableName() );
 			if ( bindingGroup != null ) {
 				bindingGroup.forEachBinding( binding -> {
 					// Skip parameter bindings for e.g. optimistic version check
@@ -392,14 +438,26 @@ private void performInsert(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 							throw jdbcServices.getSqlExceptionHelper().convert(
 									e,
 									"Unable to bind parameter for upsert insert",
-									jdbcInsert.getSqlString()
+									sql
 							);
 						}
 					}
 				} );
 			}
-			jdbcCoordinator.getResultSetReturn()
-					.executeUpdate( insertStatement, jdbcInsert.getSqlString() );
+			final int rowCount = jdbcCoordinator.getResultSetReturn().executeUpdate( insertStatement, sql );
+			expectation.verifyOutcome(
+					rowCount,
+					insertStatement,
+					-1,
+					sql
+			);
+		}
+		catch (SQLException e) {
+			throw jdbcServices.getSqlExceptionHelper().convert(
+					e,
+					"Unable to execute mutation PreparedStatement against table '" + tableMapping.getTableName() + "'",
+					sql
+			);
 		}
 		finally {
 			jdbcCoordinator.getLogicalConnection().getResourceRegistry().release( insertStatement );
@@ -407,6 +465,13 @@ private void performInsert(JdbcValueBindings jdbcValueBindings, SharedSessionCon
 		}
 	}
 
+	/*
+	 * Used by Hibernate Reactive
+	 */
+	protected JdbcMutationOperation createJdbcOptionalInsert(SharedSessionContractImplementor session) {
+		return createJdbcInsert( session );
+	}
+
 	/*
 	 * Used by Hibernate Reactive
 	 */
@@ -431,7 +496,7 @@ protected JdbcInsertMutation createJdbcInsert(SharedSessionContractImplementor s
 			);
 		}
 
-		final SessionFactoryImplementor factory = session.getSessionFactory();
+		final var factory = session.getSessionFactory();
 		return factory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
 				.buildModelMutationTranslator( tableInsert, factory )
 				.translate( null, MutationQueryOptions.INSTANCE );
@@ -450,4 +515,132 @@ private static PreparedStatement createStatementDetails(
 	public String toString() {
 		return "OptionalTableUpdateOperation(" + tableMapping + ")";
 	}
+
+	private List<ColumnValueBinding> getUpdatableValueBindings() {
+		if ( !hasNonUpdatableBinding() ) {
+			return valueBindings;
+		}
+		else {
+			final List<ColumnValueBinding> updateBindings = arrayList( valueBindings.size() );
+			for ( var binding : valueBindings ) {
+				if ( binding.isAttributeUpdatable() ) {
+					updateBindings.add( binding );
+				}
+			}
+			if ( updateBindings.isEmpty() ) {
+				final var noOpBinding = buildNoOpBinding();
+				if ( noOpBinding != null ) {
+					updateBindings.add( noOpBinding );
+				}
+			}
+			return updateBindings;
+		}
+	}
+
+	private boolean hasNonUpdatableBinding() {
+		for ( var binding : valueBindings ) {
+			if ( !binding.isAttributeUpdatable() ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private ColumnValueBinding buildNoOpBinding() {
+		final var referenceBinding = getReferenceBinding();
+		if ( referenceBinding != null ) {
+			final var referenceExpression = referenceBinding.getValueExpression();
+			if ( referenceExpression != null
+					&& referenceExpression.getSqlTypedMapping()
+							instanceof SelectableMapping selectableMapping ) {
+				final var columnReference = referenceBinding.getColumnReference();
+				return new ColumnValueBinding(
+						columnReference,
+						new ColumnWriteFragment(
+								columnReference.getColumnExpression(),
+								selectableMapping
+						)
+				);
+			}
+		}
+		return null;
+	}
+
+	private ColumnValueBinding getReferenceBinding() {
+		if ( !keyBindings.isEmpty() ) {
+			return keyBindings.get( 0 );
+		}
+		else if ( !valueBindings.isEmpty() ) {
+			return valueBindings.get( 0 );
+		}
+		else {
+			return null;
+		}
+	}
+
+	private List<ColumnValueParameter> collectUpdateParameters(
+			List<ColumnValueBinding> updateValueBindings) {
+		return AbstractTableUpdate.collectParameters(
+				updateValueBindings,
+				keyBindings,
+				optimisticLockBindings
+		);
+	}
+
+	private void bindUpdateValues(
+			JdbcValueBindings jdbcValueBindings,
+			PreparedStatement statement,
+			List<ColumnValueParameter> updateParameters,
+			String sql,
+			SharedSessionContractImplementor session) {
+		final var bindingGroup =
+				jdbcValueBindings.getBindingGroup( tableMapping.getTableName() );
+		if ( bindingGroup == null ) {
+			throw new IllegalStateException(
+					String.format(
+							Locale.ROOT,
+							"No value bindings for table on update : %s",
+							tableMapping.getTableName()
+					)
+			);
+		}
+
+		int jdbcBindingPosition = 1;
+		for ( var parameter : updateParameters ) {
+			final var binding = findBinding( bindingGroup, parameter );
+			if ( binding == null ) {
+				throw new IllegalStateException(
+						String.format(
+								Locale.ROOT,
+								"Missing value binding for update : %s.%s (%s)",
+								tableMapping.getTableName(),
+								parameter.getColumnReference().getColumnExpression(),
+								parameter.getUsage()
+						)
+				);
+			}
+			try {
+				binding.getValueBinder()
+						.bind( statement, binding.getValue(), jdbcBindingPosition++, session );
+			}
+			catch (SQLException e) {
+				throw session.getJdbcServices().getSqlExceptionHelper().convert(
+						e,
+						"Unable to bind parameter for upsert update",
+						sql
+				);
+			}
+		}
+	}
+
+	private static Binding findBinding(BindingGroup bindingGroup, ColumnValueParameter parameter) {
+		final String columnName = parameter.getColumnReference().getColumnExpression();
+		for ( var binding : bindingGroup.getBindings() ) {
+			if ( binding.getValueDescriptor()
+					.matches( columnName, parameter.getUsage() ) ) {
+				return binding;
+			}
+		}
+		return null;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateWithOptionalRowCount.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateWithOptionalRowCount.java
new file mode 100644
index 000000000000..1519469d3e31
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateWithOptionalRowCount.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.model.jdbc;
+
+import org.hibernate.jdbc.Expectation;
+import org.hibernate.sql.model.internal.OptionalTableUpdate;
+
+/**
+ * An OptionalTableUpdate that uses Expectation.OptionalRowCount.
+ */
+public class OptionalTableUpdateWithOptionalRowCount extends OptionalTableUpdate {
+
+	public OptionalTableUpdateWithOptionalRowCount(OptionalTableUpdate original) {
+		super(
+				original.getMutatingTable(),
+				original.getMutationTarget(),
+				original.getValueBindings(),
+				original.getKeyBindings(),
+				original.getOptimisticLockBindings()
+		);
+	}
+
+	@Override
+	public Expectation getExpectation() {
+		return new Expectation.OptionalRowCount();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateWithUpsertOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateWithUpsertOperation.java
new file mode 100644
index 000000000000..58dbfa0123ae
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/OptionalTableUpdateWithUpsertOperation.java
@@ -0,0 +1,68 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.model.jdbc;
+
+import org.hibernate.engine.jdbc.mutation.internal.MutationQueryOptions;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.internal.util.collections.ArrayHelper;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.mutation.EntityMutationTarget;
+import org.hibernate.sql.model.ast.MutatingTableReference;
+import org.hibernate.sql.model.internal.OptionalTableInsert;
+import org.hibernate.sql.model.internal.OptionalTableUpdate;
+
+
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static org.hibernate.internal.util.collections.CollectionHelper.combine;
+
+/**
+ * Uses {@link org.hibernate.sql.model.internal.OptionalTableInsert} for the insert operation,
+ * to avoid primary key constraint violations when inserting only primary key columns.
+ */
+public class OptionalTableUpdateWithUpsertOperation extends OptionalTableUpdateOperation {
+
+	public OptionalTableUpdateWithUpsertOperation(
+			EntityMutationTarget mutationTarget,
+			OptionalTableUpdate upsert,
+			@SuppressWarnings("unused") SessionFactoryImplementor factory) {
+		super( mutationTarget, upsert, factory );
+	}
+
+	@Override
+	protected JdbcMutationOperation createJdbcOptionalInsert(SharedSessionContractImplementor session) {
+		final var tableDetails = getTableDetails();
+		final var insertDetails = tableDetails.getInsertDetails();
+		if ( insertDetails != null && insertDetails.getCustomSql() != null ) {
+			return super.createJdbcOptionalInsert( session );
+		}
+		else {
+			final var mutationTarget = (EntityPersister) getMutationTarget();
+			// Ignore a primary key violation on insert
+			final int tableIndex = ArrayHelper.indexOf( mutationTarget.getTableNames(), tableDetails.getTableName() );
+			final var tableInsert = new OptionalTableInsert(
+					new MutatingTableReference( tableDetails ),
+					getMutationTarget(),
+					combine( getValueBindings(), getKeyBindings() ),
+					emptyList(),
+					getParameters(),
+					null,
+					asList( mutationTarget.getKeyColumns( tableIndex ) )
+			);
+
+			final var factory = session.getSessionFactory();
+			return factory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory()
+					.buildModelMutationTranslator( tableInsert, factory )
+					.translate( null, MutationQueryOptions.INSTANCE );
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "OptionalTableUpdateWithUpsertOperation(" + getTableDetails() + ")";
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/UpsertOperation.java b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/UpsertOperation.java
index 6ba371d381c8..23b671724d4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/UpsertOperation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/model/jdbc/UpsertOperation.java
@@ -23,7 +23,16 @@ public UpsertOperation(
 			MutationTarget<?> mutationTarget,
 			String sql,
 			List<? extends JdbcParameterBinder> parameterBinders) {
-		super( tableDetails, mutationTarget, sql, false, new Expectation.RowCount(), parameterBinders );
+		this( tableDetails, mutationTarget, sql, new Expectation.RowCount(), parameterBinders );
+	}
+
+	public UpsertOperation(
+			TableMapping tableDetails,
+			MutationTarget<?> mutationTarget,
+			String sql,
+			Expectation expectation,
+			List<? extends JdbcParameterBinder> parameterBinders) {
+		super( tableDetails, mutationTarget, sql, false, expectation, parameterBinders );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java
index 78e94bf6b6d0..288090eb1e4c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/LoadingLogger.java
@@ -15,6 +15,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 
@@ -31,7 +32,7 @@
 public interface LoadingLogger extends BasicLogger {
 	String LOGGER_NAME = ResultsLogger.LOGGER_NAME + ".loading";
 
-	LoadingLogger LOADING_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LoadingLogger.class, LOGGER_NAME );
+	LoadingLogger LOADING_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), LoadingLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	static String subLoggerName(String subName) {
 		return LOGGER_NAME + "." + subName;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java b/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java
index a3fb5e0a438d..961ae8af6ecb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/ResultsLogger.java
@@ -13,18 +13,14 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
-
-/**
- * @asciidoc
- *
- * Logger for DomainResult related messages.  This includes messages related to:
- *
- * 		* creation of the DomainResult / Fetch nodes
- * 		* creation of Initializer / DomainResultAssembler delegates
- * 		* processing of values from JDBC and cache via Initializer / DomainResultAssembler
- *
- * @author Steve Ebersole
- */
+import java.util.Locale;
+
+/// Logger for DomainResult related messages. This includes messages related to:
+/// * creation of the DomainResult / Fetch nodes
+/// * creation of Initializer / DomainResultAssembler delegates
+/// * processing of values from JDBC and cache via Initializer / DomainResultAssembler
+///
+/// @author Steve Ebersole
 @MessageLogger( projectCode = "HHH" )
 @ValidIdRange( min = 90005001, max = 90005100 )
 @SubSystemLogging(
@@ -36,7 +32,7 @@ public interface ResultsLogger extends BasicLogger {
 	String LOGGER_NAME = SubSystemLogging.BASE + ".results";
 
 	Logger RESULTS_LOGGER = Logger.getLogger( LOGGER_NAME );
-	ResultsLogger RESULTS_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ResultsLogger.class, LOGGER_NAME );
+	ResultsLogger RESULTS_MESSAGE_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), ResultsLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	// todo (6.0) : make sure sql result processing classes use this logger
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java
index edf4cebe0b86..ece0bd7291f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/BiDirectionalFetch.java
@@ -8,54 +8,39 @@
 
 import org.hibernate.spi.NavigablePath;
 
-/**
- * @asciidoc
- *
- * Marker interface for Fetches that are actually references to
- * another fetch based on "normalized navigable path"
- *
- * The following query is used throughout the javadocs for these impls
- * to help describe what it going on and why certain methods do certain things.
- *
- *
- * ```
- * @Entity
- * class Person {
- *     ...
- *     @ManyToOne (mappedBy="owner")
- *     Address getAddress() {...}
- * }
- *
- * @Entity
- * class Address {
- *     ...
- *     @ManyToOne
- *     Person getOwner() {...}
- * }
- *
- * from Person p
- * 		join fetch p.address a
- * 		join fetch a.owner o
- * 		join fetch o.address oa
- * ```
- *
- *
- * Here we have one root result and 3 fetches.  2 of the fetches are bidirectional:
- *
- * 		`o`:: The paths `p` and `p.address.owner` (aliased as `o`) are the same table reference in SQL terms
- * 		`oa`:: The paths `p.address` and `p.address.owner.address` (aliased as `oa`) are again the same table reference
- *
- * @author Steve Ebersole
- */
+/// Marker interface for Fetches that are actually references to
+/// another fetch based on "normalized navigable path"
+/// The following query is used throughout the javadocs for these impls
+/// to help describe what it going on and why certain methods do certain things.
+/// ```
+/// @Entity
+/// class Person {
+///     ...
+///     @ManyToOne (mappedBy="owner")
+///     Address getAddress() {...}
+/// }
+///
+/// @Entity
+/// class Address {
+///     ...
+///     @ManyToOne
+///     Person getOwner() {...}
+/// }
+/// from Person p
+/// 		join fetch p.address a
+/// 		join fetch a.owner o
+/// 		join fetch o.address oa
+/// ```
+/// Here we have one root result and 3 fetches.  2 of the fetches are bidirectional:
+/// 		`o`:: The paths `p` and `p.address.owner` (aliased as `o`) are the same table reference in SQL terms
+/// 		`oa`:: The paths `p.address` and `p.address.owner.address` (aliased as `oa`) are again the same table reference
+///
+/// @author Steve Ebersole
 public interface BiDirectionalFetch extends Fetch {
-	/**
-	 * The NavigablePath for the DomainResult or Fetch that this Fetch refers to.
-	 *
-	 * For `o`, the referenced path is `p`.  For `oa`, it's `p.address`
-	 *
-	 * Different from {@link #getNavigablePath()} which returns this fetch's path, i.e.
-	 * `p.address.owner` and `p.address.owner.address` respectively
-	 */
+	/// The NavigablePath for the DomainResult or Fetch that this Fetch refers to.
+	/// For `o`, the referenced path is `p`.  For `oa`, it's `p.address`
+	/// Different from [#getNavigablePath()] which returns this fetch's path, i.e.
+	/// `p.address.owner` and `p.address.owner.address` respectively
 	NavigablePath getReferencedPath();
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java
index 6d1bb339c8fa..99f5a11b2b25 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java
@@ -15,7 +15,6 @@
 import org.hibernate.sql.results.graph.UnfetchedBasicPartResultAssembler;
 import org.hibernate.sql.results.graph.UnfetchedResultAssembler;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
-import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.Fetchable;
@@ -41,7 +40,6 @@ public BasicFetch(
 			NavigablePath fetchablePath,
 			BasicValuedModelPart valuedMapping,
 			FetchTiming fetchTiming,
-			DomainResultCreationState creationState,
 			boolean unwrapRowProcessingState) {
 		//noinspection unchecked
 		this(
@@ -52,7 +50,6 @@ public BasicFetch(
 				(BasicValueConverter<T, ?>) valuedMapping.getJdbcMapping().getValueConverter(),
 				fetchTiming,
 				true,
-				creationState,
 				false,
 				unwrapRowProcessingState
 		);
@@ -66,7 +63,6 @@ public BasicFetch(
 			BasicValueConverter<T, ?> valueConverter,
 			FetchTiming fetchTiming,
 			boolean canBasicPartFetchBeDelayed,
-			DomainResultCreationState creationState,
 			boolean coerceResultType,
 			boolean unwrapRowProcessingState) {
 		this.navigablePath = fetchablePath;
@@ -74,23 +70,18 @@ public BasicFetch(
 		this.fetchParent = fetchParent;
 		this.valuedMapping = valuedMapping;
 		this.fetchTiming = fetchTiming;
-		@SuppressWarnings("unchecked") final JavaType<T> javaType = (JavaType<T>) valuedMapping.getJavaType();
+		@SuppressWarnings("unchecked")
+		final var javaType = (JavaType<T>) valuedMapping.getJavaType();
 		// lazy basic attribute
 		if ( fetchTiming == FetchTiming.DELAYED && valuesArrayPosition == -1 ) {
-			if ( canBasicPartFetchBeDelayed ) {
-				this.assembler = new UnfetchedResultAssembler<>( javaType );
-			}
-			else {
-				this.assembler = new UnfetchedBasicPartResultAssembler( javaType );
-			}
+			this.assembler = canBasicPartFetchBeDelayed
+					? new UnfetchedResultAssembler<>( javaType )
+					: new UnfetchedBasicPartResultAssembler<>( javaType );
 		}
 		else {
-			if (coerceResultType) {
-				this.assembler = new CoercingResultAssembler<>( valuesArrayPosition, javaType, valueConverter, unwrapRowProcessingState );
-			}
-			else {
-				this.assembler = new BasicResultAssembler<>( valuesArrayPosition, javaType, valueConverter, unwrapRowProcessingState );
-			}
+			this.assembler = coerceResultType
+					? new CoercingResultAssembler<>( valuesArrayPosition, javaType, valueConverter, unwrapRowProcessingState )
+					: new BasicResultAssembler<>( valuesArrayPosition, javaType, valueConverter, unwrapRowProcessingState );
 		}
 	}
 
@@ -146,8 +137,8 @@ public String getResultVariable() {
 
 	@Override
 	public void collectValueIndexesToCache(BitSet valueIndexes) {
-		if ( assembler instanceof BasicResultAssembler ) {
-			valueIndexes.set( ( (BasicResultAssembler<T>) assembler ).valuesArrayPosition );
+		if ( assembler instanceof BasicResultAssembler<T> basicResultAssembler ) {
+			valueIndexes.set( basicResultAssembler.valuesArrayPosition );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java
index c25dee2ac2bf..94a498c7cb36 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java
@@ -53,32 +53,33 @@ public Object extractRawValue(RowProcessingState rowProcessingState) {
 	}
 
 	@Override
-	public J assemble(
-			RowProcessingState rowProcessingState) {
+	public J assemble(RowProcessingState rowProcessingState) {
 		final Object jdbcValue = extractRawValue( rowProcessingState );
 
 		if ( valueConverter != null ) {
-			if ( jdbcValue != null ) {
-				// the raw value type should be the converter's relational-JTD
-				if ( ! valueConverter.getRelationalJavaType().getJavaTypeClass().isInstance( jdbcValue ) ) {
-					throw new HibernateException(
-							String.format(
-									Locale.ROOT,
-									"Expecting raw JDBC value of type `%s`, but found `%s` : [%s]",
-									valueConverter.getRelationalJavaType().getTypeName(),
-									jdbcValue.getClass().getName(),
-									jdbcValue
-							)
-					);
-				}
+			if ( jdbcValue != null
+					// the raw value type should be the converter's relational-JTD
+					&& !valueConverter.getRelationalJavaType().isInstance( jdbcValue ) ) {
+				throw new HibernateException(
+						String.format(
+								Locale.ROOT,
+								"Expecting raw JDBC value of type `%s`, but found `%s` : [%s]",
+								valueConverter.getRelationalJavaType().getTypeName(),
+								jdbcValue.getClass().getName(),
+								jdbcValue
+						)
+				);
 			}
-
-			//noinspection unchecked,rawtypes
-			return (J) ( (BasicValueConverter) valueConverter ).toDomainValue( jdbcValue );
+			// Safe unchecked cast due to check above
+			@SuppressWarnings({"unchecked", "rawtypes"})
+			final Object domainValue =
+					( (BasicValueConverter) valueConverter )
+							.toDomainValue( jdbcValue );
+			return (J) domainValue;
+		}
+		else {
+			return (J) jdbcValue;
 		}
-
-		//noinspection unchecked
-		return (J) jdbcValue;
 	}
 
 	@Override
@@ -88,10 +89,9 @@ public void resolveState(RowProcessingState rowProcessingState) {
 
 	@Override
 	public JavaType<J> getAssembledJavaType() {
-		if ( valueConverter != null ) {
-			return valueConverter.getDomainJavaType();
-		}
-		return assembledJavaType;
+		return valueConverter != null
+				? valueConverter.getDomainJavaType()
+				: assembledJavaType;
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/CoercingResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/CoercingResultAssembler.java
index 91e9f003a081..6676eaad3fdd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/CoercingResultAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/CoercingResultAssembler.java
@@ -29,9 +29,6 @@ public CoercingResultAssembler(
 	 */
 	@Override
 	public Object extractRawValue(RowProcessingState rowProcessingState) {
-		return assembledJavaType.coerce(
-				super.extractRawValue( rowProcessingState ),
-				rowProcessingState.getSession()
-		);
+		return assembledJavaType.coerce( super.extractRawValue( rowProcessingState ) );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java
index 23232264aa22..f8dcef26c0c8 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java
@@ -8,6 +8,7 @@
 
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.spi.CollectionKey;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
@@ -249,4 +250,10 @@ public boolean hasLazySubInitializers() {
 	public boolean isResultInitializer() {
 		return isResultInitializer;
 	}
+
+	boolean isReadOnly(RowProcessingState rowProcessingState, SharedSessionContractImplementor session) {
+		final Boolean readOnly = rowProcessingState.getQueryOptions().isReadOnly();
+		return readOnly == null ? session.isDefaultReadOnly() : readOnly;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractImmediateCollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractImmediateCollectionInitializer.java
index c9b700fcd633..f85a71cf7e06 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractImmediateCollectionInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractImmediateCollectionInitializer.java
@@ -26,6 +26,8 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import static org.hibernate.internal.util.NullnessUtil.castNonNull;
+
 /**
  * Base support for CollectionInitializer implementations that represent
  * an immediate initialization of some sort (join, select, batch, sub-select)
@@ -141,7 +143,39 @@ public void resolveState(Data data) {
 	public void resolveFromPreviousRow(Data data) {
 		super.resolveFromPreviousRow( data );
 		if ( data.getState() == State.RESOLVED ) {
-			resolveKeySubInitializers( data );
+			// The state is resolved, so we know a collection instance exists
+			final PersistentCollection<?> collection = castNonNull( data.getCollectionInstance() );
+			if ( collection.wasInitialized() ) {
+				// The collection was an already initialized instance, so we can set this to initialized
+				// and just resolve sub-initializers
+				resolveFromPreviouslyInitializedInstance( data );
+			}
+			else {
+				resolveKeySubInitializers( data );
+			}
+		}
+	}
+
+	protected void resolveFromPreviouslyInitializedInstance(Data data) {
+		data.setState( State.INITIALIZED );
+		if ( data.shallowCached ) {
+			initializeShallowCached( data );
+		}
+		else {
+			resolveInstanceSubInitializers( data );
+		}
+		final var rowProcessingState = data.getRowProcessingState();
+		if ( rowProcessingState.needsResolveState() ) {
+			// Resolve the state of the identifier if result caching is enabled and this is not a query cache hit
+			if ( collectionKeyResultAssembler != null ) {
+				collectionKeyResultAssembler.resolveState( rowProcessingState );
+			}
+			if ( !getInitializingCollectionDescriptor().useShallowQueryCacheLayout() ) {
+				if ( collectionValueKeyResultAssembler != null ) {
+					collectionValueKeyResultAssembler.resolveState( rowProcessingState );
+				}
+				resolveCollectionContentState( rowProcessingState );
+			}
 		}
 	}
 
@@ -276,7 +310,8 @@ else if ( !data.shallowCached ) {
 					persistenceContext.addUninitializedCollection(
 							collectionDescriptor,
 							persistentCollection,
-							collectionKey.getKey()
+							collectionKey.getKey(),
+							isReadOnly( rowProcessingState, session )
 					);
 
 					if ( !data.shallowCached ) {
@@ -337,25 +372,7 @@ public void resolveInstance(Object instance, Data data) {
 			}
 			data.collectionValueKey = null;
 			if ( collection.wasInitialized() ) {
-				data.setState( State.INITIALIZED );
-				if ( data.shallowCached ) {
-					initializeShallowCached( data );
-				}
-				else {
-					resolveInstanceSubInitializers( data );
-				}
-				if ( rowProcessingState.needsResolveState() ) {
-					// Resolve the state of the identifier if result caching is enabled and this is not a query cache hit
-					if ( collectionKeyResultAssembler != null ) {
-						collectionKeyResultAssembler.resolveState( rowProcessingState );
-					}
-					if ( !getInitializingCollectionDescriptor().useShallowQueryCacheLayout() ) {
-						if ( collectionValueKeyResultAssembler != null ) {
-							collectionValueKeyResultAssembler.resolveState( rowProcessingState );
-						}
-						resolveCollectionContentState( rowProcessingState );
-					}
-				}
+				resolveFromPreviouslyInitializedInstance( data );
 			}
 			else {
 				if ( data.shallowCached ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractNonJoinCollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractNonJoinCollectionInitializer.java
index 82e88f3469fc..27ac128fe314 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractNonJoinCollectionInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/collection/internal/AbstractNonJoinCollectionInitializer.java
@@ -91,7 +91,8 @@ protected void resolveInstance(Data data, boolean isEager) {
 							final Object targetInstance = owningEntityInitializer.getTargetInstance( owningEntityData );
 							assert targetInstance != null;
 							collection.setOwner( targetInstance );
-							persistenceContext.addUninitializedCollection( collectionDescriptor, collection, key );
+							persistenceContext.addUninitializedCollection( collectionDescriptor, collection, key,
+									isReadOnly( rowProcessingState, session ) );
 							if ( isEager ) {
 								persistenceContext.addNonLazyCollection( collection );
 							}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableFetchImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableFetchImpl.java
index c476a4d41622..d5509f2447f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableFetchImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableFetchImpl.java
@@ -9,8 +9,6 @@
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstJoinType;
-import org.hibernate.sql.ast.spi.SqlSelection;
-import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.from.TableGroupProducer;
@@ -87,9 +85,9 @@ public AggregateEmbeddableFetchImpl(
 		final var sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
 		final var tableReference = tableGroup.getPrimaryTableReference();
 		final var selectableMapping = fetchContainer.getAggregateMapping();
-		final Expression expression = sqlExpressionResolver.resolveSqlExpression( tableReference, selectableMapping );
+		final var expression = sqlExpressionResolver.resolveSqlExpression( tableReference, selectableMapping );
 		final var typeConfiguration = sqlAstCreationState.getCreationContext().getTypeConfiguration();
-		final SqlSelection aggregateSelection = sqlExpressionResolver.resolveSqlSelection(
+		final var aggregateSelection = sqlExpressionResolver.resolveSqlSelection(
 				expression,
 				typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Object[].class ),
 				fetchParent,
@@ -139,8 +137,8 @@ public Fetchable getFetchedMapping() {
 	@Override
 	public NavigablePath resolveNavigablePath(Fetchable fetchable) {
 		if ( fetchable instanceof TableGroupProducer ) {
-			for ( TableGroupJoin tableGroupJoin : tableGroup.getTableGroupJoins() ) {
-				final NavigablePath navigablePath = tableGroupJoin.getNavigablePath();
+			for ( var tableGroupJoin : tableGroup.getTableGroupJoins() ) {
+				final var navigablePath = tableGroupJoin.getNavigablePath();
 				if ( tableGroupJoin.getJoinedGroup().isFetched()
 						&& fetchable.getFetchableName().equals( navigablePath.getLocalName() )
 						&& tableGroupJoin.getJoinedGroup().getModelPart() == fetchable
@@ -173,7 +171,9 @@ public EmbeddableInitializer<?> createInitializer(
 	}
 
 	@Override
-	public EmbeddableInitializer<?> createInitializer(InitializerParent<?> parent, AssemblerCreationState creationState) {
+	public EmbeddableInitializer<?> createInitializer(
+			InitializerParent<?> parent,
+			AssemblerCreationState creationState) {
 		return new AggregateEmbeddableInitializerImpl(
 				this,
 				discriminatorFetch,
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableResultImpl.java
index e1c2087da229..d758683d3cd1 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/AggregateEmbeddableResultImpl.java
@@ -4,21 +4,15 @@
  */
 package org.hibernate.sql.results.graph.embeddable.internal;
 
-import org.hibernate.internal.util.NullnessUtil;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstJoinType;
-import org.hibernate.sql.ast.spi.SqlSelection;
-import org.hibernate.sql.ast.tree.expression.Expression;
-import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.results.graph.AbstractFetchParent;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
-import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.FetchParent;
 import org.hibernate.sql.results.graph.Initializer;
 import org.hibernate.sql.results.graph.InitializerParent;
@@ -29,6 +23,7 @@
 import org.hibernate.sql.results.graph.internal.ImmutableFetchList;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 import static org.hibernate.sql.results.graph.embeddable.AggregateEmbeddableResultGraphNode.determineAggregateValuesArrayPositions;
 
 /**
@@ -63,15 +58,15 @@ public AggregateEmbeddableResultImpl(
 
 		final var sqlAstCreationState = creationState.getSqlAstCreationState();
 		final var fromClauseAccess = sqlAstCreationState.getFromClauseAccess();
-		final TableGroup tableGroup = fromClauseAccess.resolveTableGroup(
+		final var tableGroup = fromClauseAccess.resolveTableGroup(
 				getNavigablePath(),
 				np -> {
-					final EmbeddableValuedModelPart embeddedValueMapping =
+					final var embeddedValueMapping =
 							embeddedPartDescriptor.getEmbeddableTypeDescriptor()
 									.getEmbeddedValueMapping();
-					final TableGroup tg =
-							fromClauseAccess.findTableGroup( NullnessUtil.castNonNull( np.getParent() ).getParent() );
-					final TableGroupJoin tableGroupJoin = embeddedValueMapping.createTableGroupJoin(
+					final var tg =
+							fromClauseAccess.findTableGroup( castNonNull( np.getParent() ).getParent() );
+					final var tableGroupJoin = embeddedValueMapping.createTableGroupJoin(
 							np,
 							tg,
 							resultVariable,
@@ -89,12 +84,13 @@ public AggregateEmbeddableResultImpl(
 		final var sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
 		final var tableReference = tableGroup.getPrimaryTableReference();
 		final var selectableMapping = embeddedPartDescriptor.getEmbeddableTypeDescriptor().getAggregateMapping();
-		final Expression expression = sqlExpressionResolver.resolveSqlExpression( tableReference, selectableMapping );
+		final var expression = sqlExpressionResolver.resolveSqlExpression( tableReference, selectableMapping );
 		final var typeConfiguration = sqlAstCreationState.getCreationContext().getTypeConfiguration();
-		final SqlSelection aggregateSelection = sqlExpressionResolver.resolveSqlSelection(
+		final var aggregateSelection = sqlExpressionResolver.resolveSqlSelection(
 				expression,
 				// Using the Object[] type here, so that a different JDBC extractor is chosen
-				typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Object[].class ),
+				typeConfiguration.getJavaTypeRegistry()
+						.resolveDescriptor( Object[].class ),
 				null,
 				typeConfiguration
 		);
@@ -110,7 +106,7 @@ public int[] getAggregateValuesArrayPositions() {
 	}
 
 	private static boolean determineIfContainedAnyScalars(ImmutableFetchList fetches) {
-		for ( Fetch fetch : fetches ) {
+		for ( var fetch : fetches ) {
 			if ( fetch.containsAnyNonScalarResults() ) {
 				return true;
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableAssembler.java
index b3859c877b29..7353c0d0e0a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableAssembler.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableAssembler.java
@@ -30,8 +30,8 @@ public JavaType getAssembledJavaType() {
 
 	@Override
 	public Object assemble(RowProcessingState rowProcessingState) {
-		final InitializerData data = initializer.getData( rowProcessingState );
-		final Initializer.State state = data.getState();
+		final var data = initializer.getData( rowProcessingState );
+		final var state = data.getState();
 		if ( state == Initializer.State.UNINITIALIZED ) {
 			initializer.resolveKey( data );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableExpressionResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableExpressionResultImpl.java
index 962bda928a9b..6606d22c7eff 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableExpressionResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableExpressionResultImpl.java
@@ -9,16 +9,12 @@
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
 import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.spi.SqlAstCreationState;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
-import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
 import org.hibernate.sql.results.graph.AbstractFetchParent;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
-import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.Initializer;
 import org.hibernate.sql.results.graph.InitializerParent;
 import org.hibernate.sql.results.graph.InitializerProducer;
@@ -27,7 +23,6 @@
 import org.hibernate.sql.results.graph.embeddable.EmbeddableResultGraphNode;
 import org.hibernate.sql.results.graph.internal.ImmutableFetchList;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 /**
  * @author Steve Ebersole
@@ -48,15 +43,15 @@ public EmbeddableExpressionResultImpl(
 		this.fetchContainer = modelPart.getEmbeddableTypeDescriptor();
 		this.resultVariable = resultVariable;
 
-		final ImmutableFetchList.Builder fetches = new ImmutableFetchList.Builder( modelPart );
-		final EmbeddableMappingType mappingType = modelPart.getEmbeddableTypeDescriptor();
+		final var fetches = new ImmutableFetchList.Builder( modelPart );
+		final var mappingType = modelPart.getEmbeddableTypeDescriptor();
 		final int numberOfAttributeMappings = mappingType.getNumberOfAttributeMappings();
-		final SqlAstCreationState sqlAstCreationState = creationState.getSqlAstCreationState();
-		final TypeConfiguration typeConfiguration = sqlAstCreationState.getCreationContext().getTypeConfiguration();
-		final SqlExpressionResolver sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
+		final var sqlAstCreationState = creationState.getSqlAstCreationState();
+		final var typeConfiguration = sqlAstCreationState.getCreationContext().getTypeConfiguration();
+		final var sqlExpressionResolver = sqlAstCreationState.getSqlExpressionResolver();
 		for ( int i = 0; i < numberOfAttributeMappings; i++ ) {
-			final BasicAttributeMapping attribute = (BasicAttributeMapping) mappingType.getAttributeMapping( i );
-			final SqlSelection sqlSelection = sqlExpressionResolver.resolveSqlSelection(
+			final var attribute = (BasicAttributeMapping) mappingType.getAttributeMapping( i );
+			final var sqlSelection = sqlExpressionResolver.resolveSqlSelection(
 					sqlExpression.getExpressions().get( i ),
 					attribute.getJavaType(),
 					this,
@@ -69,7 +64,6 @@ public EmbeddableExpressionResultImpl(
 							resolveNavigablePath( attribute ),
 							attribute,
 							FetchTiming.IMMEDIATE,
-							creationState,
 							!sqlSelection.isVirtual()
 					)
 			);
@@ -80,7 +74,7 @@ public EmbeddableExpressionResultImpl(
 	}
 
 	private static boolean determineIfContainedAnyScalars(ImmutableFetchList fetches) {
-		for ( Fetch fetch : fetches ) {
+		for ( var fetch : fetches ) {
 			if ( fetch.containsAnyNonScalarResults() ) {
 				return true;
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java
index 23445bb15838..be0b5d814919 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableFetchImpl.java
@@ -13,11 +13,8 @@
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstJoinType;
-import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.from.TableGroupProducer;
-import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.predicate.NullnessPredicate;
 import org.hibernate.sql.results.graph.AbstractFetchParent;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
@@ -34,7 +31,6 @@
 import org.hibernate.sql.results.graph.embeddable.EmbeddableInitializer;
 import org.hibernate.sql.results.graph.embeddable.EmbeddableResultGraphNode;
 import org.hibernate.sql.results.graph.embeddable.EmbeddableValuedFetchable;
-import org.hibernate.type.BasicType;
 
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 
@@ -66,13 +62,15 @@ public EmbeddableFetchImpl(
 		this.fetchTiming = fetchTiming;
 		this.hasTableGroup = hasTableGroup;
 
-		this.tableGroup = creationState.getSqlAstCreationState().getFromClauseAccess().resolveTableGroup(
+		final var sqlAstCreationState = creationState.getSqlAstCreationState();
+
+		this.tableGroup = sqlAstCreationState.getFromClauseAccess().resolveTableGroup(
 				getNavigablePath(),
 				np -> {
-					final TableGroup lhsTableGroup = creationState.getSqlAstCreationState()
-							.getFromClauseAccess()
-							.findTableGroup( fetchParent.getNavigablePath() );
-					final TableGroupJoin tableGroupJoin = getReferencedMappingContainer().createTableGroupJoin(
+					final TableGroup lhsTableGroup =
+							sqlAstCreationState.getFromClauseAccess()
+									.findTableGroup( fetchParent.getNavigablePath() );
+					final var tableGroupJoin = getReferencedMappingContainer().createTableGroupJoin(
 							getNavigablePath(),
 							lhsTableGroup,
 							null,
@@ -80,7 +78,7 @@ public EmbeddableFetchImpl(
 							SqlAstJoinType.INNER,
 							true,
 							false,
-							creationState.getSqlAstCreationState()
+							sqlAstCreationState
 					);
 					lhsTableGroup.addTableGroupJoin( tableGroupJoin );
 					return tableGroupJoin.getJoinedGroup();
@@ -89,14 +87,17 @@ public EmbeddableFetchImpl(
 
 		this.discriminatorFetch = creationState.visitEmbeddableDiscriminatorFetch( this, false );
 		if ( fetchContainer.getAggregateMapping() != null ) {
-			final TableReference tableReference = tableGroup.resolveTableReference(
+			final var tableReference = tableGroup.resolveTableReference(
 					fetchContainer.getAggregateMapping().getContainingTableExpression() );
-			final Expression aggregateExpression = creationState.getSqlAstCreationState().getSqlExpressionResolver()
-					.resolveSqlExpression( tableReference, fetchContainer.getAggregateMapping() );
-			final BasicType<Boolean> booleanType = creationState.getSqlAstCreationState().getCreationContext()
-					.getTypeConfiguration().getBasicTypeForJavaType( Boolean.class );
-			this.nullIndicatorResult = new NullnessPredicate( aggregateExpression, false, booleanType )
-					.createDomainResult( null, creationState );
+			final var aggregateExpression =
+					sqlAstCreationState.getSqlExpressionResolver()
+							.resolveSqlExpression( tableReference, fetchContainer.getAggregateMapping() );
+			final var booleanType =
+					sqlAstCreationState.getCreationContext().getTypeConfiguration()
+							.getBasicTypeForJavaType( Boolean.class );
+			this.nullIndicatorResult =
+					new NullnessPredicate( aggregateExpression, false, booleanType )
+							.createDomainResult( null, creationState );
 		}
 		else {
 			this.nullIndicatorResult = null;
@@ -153,8 +154,8 @@ public Fetchable getFetchedMapping() {
 	@Override
 	public NavigablePath resolveNavigablePath(Fetchable fetchable) {
 		if ( fetchable instanceof TableGroupProducer ) {
-			for ( TableGroupJoin tableGroupJoin : tableGroup.getTableGroupJoins() ) {
-				final NavigablePath navigablePath = tableGroupJoin.getNavigablePath();
+			for ( var tableGroupJoin : tableGroup.getTableGroupJoins() ) {
+				final var navigablePath = tableGroupJoin.getNavigablePath();
 				if ( tableGroupJoin.getJoinedGroup().isFetched()
 						&& fetchable.getFetchableName().equals( navigablePath.getLocalName() )
 						&& tableGroupJoin.getJoinedGroup().getModelPart() == fetchable
@@ -195,8 +196,10 @@ public EmbeddableInitializer<?> createInitializer(InitializerParent<?> parent, A
 
 	@Override
 	public boolean appliesTo(GraphImplementor<?> graphImplementor, JpaMetamodel metamodel) {
-		// We use managedType here since this fetch could correspond to an entity type if the embeddable is an id-class
-		return GraphHelper.appliesTo( graphImplementor, metamodel.managedType( getResultJavaType().getTypeName() ) );
+		// We use managedType here since this fetch could correspond
+		// to an entity type if the embeddable is an @IdClass
+		return GraphHelper.appliesTo( graphImplementor,
+				metamodel.managedType( getResultJavaType().getTypeName() ) );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableForeignKeyResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableForeignKeyResultImpl.java
index ed5201bd37df..77379ae65d9f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableForeignKeyResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableForeignKeyResultImpl.java
@@ -88,9 +88,9 @@ public Fetch generateFetchableFetch(
 		final boolean shouldSelect;
 		if ( fetchable instanceof ToOneAttributeMapping toOne ) {
 			// We need to make sure to-ones are always delayed to avoid cycles while resolving entity keys
-			shouldSelect = selected && !creationState.isAssociationKeyVisited(
-					toOne.getForeignKeyDescriptor().getAssociationKey()
-			) && !ForeignKeyDescriptor.PART_NAME.equals( getNavigablePath().getLocalName() )
+			shouldSelect = selected
+					&& !creationState.isAssociationKeyVisited( toOne.getForeignKeyDescriptor().getAssociationKey() )
+					&& !ForeignKeyDescriptor.PART_NAME.equals( getNavigablePath().getLocalName() )
 					&& !ForeignKeyDescriptor.TARGET_PART_NAME.equals( getNavigablePath().getLocalName() );
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableResultImpl.java
index 31177d8a69ad..0251604497d3 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/EmbeddableResultImpl.java
@@ -11,17 +11,13 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
-import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
-import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.predicate.NullnessPredicate;
 import org.hibernate.sql.results.graph.AbstractFetchParent;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
-import org.hibernate.sql.results.graph.Fetch;
 import org.hibernate.sql.results.graph.Initializer;
 import org.hibernate.sql.results.graph.InitializerParent;
 import org.hibernate.sql.results.graph.InitializerProducer;
@@ -29,7 +25,6 @@
 import org.hibernate.sql.results.graph.embeddable.EmbeddableResult;
 import org.hibernate.sql.results.graph.embeddable.EmbeddableResultGraphNode;
 import org.hibernate.sql.results.graph.internal.ImmutableFetchList;
-import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.java.JavaType;
 
 /**
@@ -62,13 +57,13 @@ public EmbeddableResultImpl(
 		final var sqlAstCreationState = creationState.getSqlAstCreationState();
 		final var fromClauseAccess = sqlAstCreationState.getFromClauseAccess();
 
-		final TableGroup embeddableTableGroup = fromClauseAccess.resolveTableGroup(
+		final var embeddableTableGroup = fromClauseAccess.resolveTableGroup(
 				getNavigablePath(),
 				np -> {
 					final var embeddedValueMapping = modelPart.getEmbeddableTypeDescriptor().getEmbeddedValueMapping();
-					final TableGroup tableGroup =
+					final var tableGroup =
 							fromClauseAccess.findTableGroup( NullnessUtil.castNonNull( np.getParent() ).getParent() );
-					final TableGroupJoin tableGroupJoin = embeddedValueMapping.createTableGroupJoin(
+					final var tableGroupJoin = embeddedValueMapping.createTableGroupJoin(
 							np,
 							tableGroup,
 							resultVariable,
@@ -98,14 +93,15 @@ private DomainResult<Boolean> nullIndicatorResult(
 			SqlAstCreationState sqlAstCreationState) {
 		final var aggregateMapping = fetchContainer.getAggregateMapping();
 		if ( aggregateMapping != null ) {
-			final TableReference tableReference =
-					embeddableTableGroup.resolveTableReference( aggregateMapping.getContainingTableExpression() );
-			final Expression aggregateExpression =
+			final var tableReference =
+					embeddableTableGroup.resolveTableReference(
+							aggregateMapping.getContainingTableExpression() );
+			final var aggregateExpression =
 					sqlAstCreationState.getSqlExpressionResolver()
 							.resolveSqlExpression( tableReference, aggregateMapping );
-			final BasicType<Boolean> booleanType =
-					sqlAstCreationState.getCreationContext()
-							.getTypeConfiguration().getBasicTypeForJavaType( Boolean.class );
+			final var booleanType =
+					sqlAstCreationState.getCreationContext().getTypeConfiguration()
+							.getBasicTypeForJavaType( Boolean.class );
 			return new NullnessPredicate( aggregateExpression, false, booleanType )
 					.createDomainResult( null, creationState );
 		}
@@ -115,7 +111,7 @@ private DomainResult<Boolean> nullIndicatorResult(
 	}
 
 	private static boolean determineIfContainedAnyScalars(ImmutableFetchList fetches) {
-		for ( Fetch fetch : fetches ) {
+		for ( var fetch : fetches ) {
 			if ( fetch.containsAnyNonScalarResults() ) {
 				return true;
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NestedRowProcessingState.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NestedRowProcessingState.java
index 6503ab0bbf7c..fdb9647ed44b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NestedRowProcessingState.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/internal/NestedRowProcessingState.java
@@ -34,18 +34,14 @@ public NestedRowProcessingState(
 	public static NestedRowProcessingState wrap(
 			AggregateEmbeddableInitializerImpl aggregateEmbeddableInitializer,
 			RowProcessingState processingState) {
-		if ( processingState instanceof NestedRowProcessingState nestedRowProcessingState ) {
-			return new NestedRowProcessingState(
-					aggregateEmbeddableInitializer,
-					nestedRowProcessingState.processingState
-			);
-		}
-		return new NestedRowProcessingState( aggregateEmbeddableInitializer, processingState );
+		return processingState instanceof NestedRowProcessingState nestedState
+				? new NestedRowProcessingState( aggregateEmbeddableInitializer, nestedState.processingState )
+				: new NestedRowProcessingState( aggregateEmbeddableInitializer, processingState );
 	}
 
 	@Override
 	public Object getJdbcValue(int position) {
-		final Object[] jdbcValue = aggregateEmbeddableInitializer.getJdbcValues( processingState );
+		final var jdbcValue = aggregateEmbeddableInitializer.getJdbcValues( processingState );
 		return jdbcValue == null ? null : jdbcValue[position];
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java
index f7862d572647..1bb2e8795dd7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java
@@ -7,10 +7,8 @@
 import java.util.BitSet;
 
 import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.metamodel.mapping.EntityRowIdMapping;
 import org.hibernate.metamodel.mapping.EntityValuedModelPart;
 import org.hibernate.persister.entity.AbstractEntityPersister;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.results.graph.AbstractFetchParent;
@@ -42,34 +40,53 @@ public AbstractEntityResultGraphNode(EntityValuedModelPart referencedModelPart,
 
 	@Override
 	public void afterInitialize(FetchParent fetchParent, DomainResultCreationState creationState) {
-		final NavigablePath navigablePath = getNavigablePath();
-		final TableGroup entityTableGroup = creationState.getSqlAstCreationState().getFromClauseAccess()
-				.getTableGroup( navigablePath );
-		final EntityResultGraphNode entityResultGraphNode = (EntityResultGraphNode) fetchParent;
-		final Fetch idFetch = creationState.visitIdentifierFetch( entityResultGraphNode );
-		if ( navigablePath.getParent() == null && !creationState.forceIdentifierSelection() &&
-				( idFetch.asFetchParent() == null || !idFetch.asFetchParent().containsCollectionFetches() ) ) {
-			identifierFetch = null;
-		}
-		else {
-			identifierFetch = idFetch;
-		}
+		final var navigablePath = getNavigablePath();
+		final var entityTableGroup =
+				creationState.getSqlAstCreationState().getFromClauseAccess()
+						.getTableGroup( navigablePath );
 
+		final var entityResultGraphNode = (EntityResultGraphNode) fetchParent;
+		identifierFetch = identifierFetch( creationState, entityResultGraphNode, navigablePath );
 		discriminatorFetch = creationState.visitDiscriminatorFetch( entityResultGraphNode );
 
-		final EntityRowIdMapping rowIdMapping = getEntityValuedModelPart().getEntityMappingType().getRowIdMapping();
+		rowIdResult = rowIdResult( creationState, navigablePath, entityTableGroup );
+
+		super.afterInitialize( fetchParent, creationState );
+	}
+
+	private DomainResult<Object> rowIdResult(
+			DomainResultCreationState creationState,
+			NavigablePath navigablePath,
+			TableGroup entityTableGroup) {
+		final var rowIdMapping =
+				getEntityValuedModelPart().getEntityMappingType()
+						.getRowIdMapping();
 		if ( rowIdMapping == null ) {
-			rowIdResult = null;
+			return null;
 		}
 		else {
-			rowIdResult = rowIdMapping.createDomainResult(
+			return rowIdMapping.createDomainResult(
 					navigablePath.append( rowIdMapping.getRowIdName() ),
 					entityTableGroup,
 					AbstractEntityPersister.ROWID_ALIAS,
 					creationState
 			);
 		}
-		super.afterInitialize( fetchParent, creationState );
+	}
+
+	private Fetch identifierFetch(
+			DomainResultCreationState creationState,
+			EntityResultGraphNode entityResultGraphNode,
+			NavigablePath navigablePath) {
+		final var idFetch = creationState.visitIdentifierFetch( entityResultGraphNode );
+		if ( navigablePath.getParent() == null
+				&& !creationState.forceIdentifierSelection()
+				&& ( idFetch.asFetchParent() == null || !idFetch.asFetchParent().containsCollectionFetches() ) ) {
+			return null;
+		}
+		else {
+			return idFetch;
+		}
 	}
 
 	@Override
@@ -106,7 +123,7 @@ public DomainResult<Object> getRowIdResult() {
 
 	@Override
 	public void collectValueIndexesToCache(BitSet valueIndexes) {
-		final EntityPersister entityPersister = fetchContainer.getEntityMappingType().getEntityPersister();
+		final var entityPersister = fetchContainer.getEntityMappingType().getEntityPersister();
 		if ( identifierFetch != null ) {
 			identifierFetch.collectValueIndexesToCache( valueIndexes );
 		}
@@ -119,7 +136,8 @@ public void collectValueIndexesToCache(BitSet valueIndexes) {
 			}
 			super.collectValueIndexesToCache( valueIndexes );
 		}
-		else if ( entityPersister.storeDiscriminatorInShallowQueryCacheLayout() && discriminatorFetch != null ) {
+		else if ( entityPersister.storeDiscriminatorInShallowQueryCacheLayout()
+					&& discriminatorFetch != null ) {
 			discriminatorFetch.collectValueIndexesToCache( valueIndexes );
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResult.java
index 9c8af0fd2b08..1bd89f8be823 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResult.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResult.java
@@ -11,5 +11,5 @@
  *
  * @author Steve Ebersole
  */
-public interface EntityResult extends EntityResultGraphNode, DomainResult {
+public interface EntityResult<E> extends EntityResultGraphNode, DomainResult<E> {
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java
index 09cdf9e9f43c..b7b25be88a27 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java
@@ -252,11 +252,10 @@ private Object instanceWithUniqueKey(
 				// field to the interceptor. If we don't get one, we load the entity by unique key.
 				final var persistentAttributeInterceptable =
 						getPersistentAttributeInterceptable( rowProcessingState );
-				if ( persistentAttributeInterceptable != null ) {
-					final var persistentAttributeInterceptor =
-							(LazyAttributeLoadingInterceptor)
-									persistentAttributeInterceptable.$$_hibernate_getInterceptor();
-					persistentAttributeInterceptor.addLazyFieldByGraph( navigablePath.getLocalName() );
+				if ( (persistentAttributeInterceptable != null ) &&
+					(persistentAttributeInterceptable.$$_hibernate_getInterceptor()
+							instanceof LazyAttributeLoadingInterceptor lazyAttributeLoadingInterceptor) ) {
+					lazyAttributeLoadingInterceptor.addLazyFieldByGraph( navigablePath.getLocalName() );
 					instance = UNFETCHED_PROPERTY;
 				}
 				else {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java
index 0942f6639677..982435d3f4e0 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java
@@ -55,13 +55,12 @@ public EntityFetchJoinedImpl(
 		this.notFoundAction = toOneMapping.getNotFoundAction();
 		this.sourceAlias = tableGroup.getSourceAlias();
 		this.isAffectedByFilter = isAffectedByFilter;
-		this.entityResult = new EntityResultImpl(
+		this.entityResult = new EntityResultImpl<>(
 				navigablePath,
 				toOneMapping,
 				tableGroup,
 				null
 		);
-
 		this.entityResult.afterInitialize( this, creationState );
 	}
 
@@ -77,13 +76,12 @@ public EntityFetchJoinedImpl(
 		this.keyResult = null;
 		this.sourceAlias = tableGroup.getSourceAlias();
 		this.isAffectedByFilter = false;
-		this.entityResult = new EntityResultImpl(
+		this.entityResult = new EntityResultImpl<>(
 				navigablePath,
 				collectionPart,
 				tableGroup,
 				null
 		);
-
 		this.entityResult.afterInitialize( this, creationState );
 	}
 
@@ -174,7 +172,7 @@ public boolean hasTableGroup() {
 		return true;
 	}
 
-	public EntityResultImpl getEntityResult() {
+	public EntityResultImpl<?> getEntityResult() {
 		return entityResult;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java
index 60a1f9c825f1..c364268964cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java
@@ -12,6 +12,7 @@
 import org.hibernate.EntityFilterException;
 import org.hibernate.FetchNotFoundException;
 import org.hibernate.Hibernate;
+import org.hibernate.CacheMode;
 import org.hibernate.LockMode;
 import org.hibernate.StaleObjectStateException;
 import org.hibernate.WrongClassException;
@@ -1154,6 +1155,8 @@ private void resolveEntity(EntityInitializerData data, Object proxy) {
 	public void resolveInstance(EntityInitializerData data) {
 		if ( data.getState() == State.KEY_RESOLVED ) {
 			final var rowProcessingState = data.getRowProcessingState();
+			final var session = rowProcessingState.getSession();
+			final var persistenceContext = session.getPersistenceContextInternal();
 			data.setState( State.RESOLVED );
 			if ( data.entityKey == null ) {
 				assert identifierAssembler != null;
@@ -1165,7 +1168,7 @@ public void resolveInstance(EntityInitializerData data) {
 				resolveEntityKey( data, id );
 			}
 			data.entityHolder =
-					rowProcessingState.getSession().getPersistenceContextInternal()
+					persistenceContext
 							.claimEntityHolderIfPossible(
 									data.entityKey,
 									null,
@@ -1179,7 +1182,6 @@ public void resolveInstance(EntityInitializerData data) {
 			else {
 				resolveEntityInstance1( data );
 				if ( data.uniqueKeyAttributePath != null ) {
-					final var session = rowProcessingState.getSession();
 					final var concreteDescriptor = getConcreteDescriptor( data );
 					final var entityUniqueKey = new EntityUniqueKey(
 							concreteDescriptor.getEntityName(),
@@ -1188,8 +1190,7 @@ public void resolveInstance(EntityInitializerData data) {
 							data.uniqueKeyPropertyTypes[concreteDescriptor.getSubclassId()],
 							session.getFactory()
 					);
-					session.getPersistenceContextInternal()
-							.addEntity( entityUniqueKey, data.getInstance() );
+					persistenceContext.addEntity( entityUniqueKey, data.getInstance() );
 				}
 			}
 
@@ -1346,7 +1347,10 @@ protected void upgradeLockMode(EntityInitializerData data) {
 	protected boolean isProxyInstance(Object proxy) {
 		return proxy != null
 			&& ( proxy instanceof MapProxy
-				|| entityDescriptor.getJavaType().getJavaTypeClass().isInstance( proxy ) );
+					// do NOT use JavaType.isInstance() here; we're testing if the
+					// proxy itself is an instance of the given entity type, not if
+					// the underlying entity implementation is an instance
+					|| entityDescriptor.getJavaType().getJavaTypeClass().isInstance( proxy ) );
 	}
 
 	private boolean isExistingEntityInitialized(Object existingEntity) {
@@ -1520,9 +1524,17 @@ protected void updateInitializedEntityInstance(EntityInitializerData data) {
 		final var entityEntry = data.entityHolder.getEntityEntry();
 		final var loadedState = entityEntry.getLoadedState();
 		final var concreteAssemblers = assemblers[data.concreteDescriptor.getSubclassId()];
+		final Object[] state;
+		if ( loadedState != null ) {
+			state = loadedState;
+		}
+		else {
+			assert entityEntry.getStatus() == Status.READ_ONLY;
+			state = data.concreteDescriptor.getValues( data.entityInstanceForNotify );
+		}
 
-		for ( int i = 0; i < loadedState.length; i++ ) {
-			final var subInstance = loadedState[i];
+		for ( int i = 0; i < state.length; i++ ) {
+			final var subInstance = state[i];
 			final var assembler = concreteAssemblers[i];
 			if ( subInstance == UNFETCHED_PROPERTY
 				&& assembler != null
@@ -1530,7 +1542,7 @@ protected void updateInitializedEntityInstance(EntityInitializerData data) {
 				&& !(assembler instanceof UnfetchedCollectionAssembler) ) {
 				final var value = assembler.assemble( rowProcessingState );
 				if ( value != UNFETCHED_PROPERTY ) {
-					loadedState[i] = value;
+					state[i] = value;
 					data.concreteDescriptor.setValue( data.entityInstanceForNotify, i, value );
 				}
 			}
@@ -1541,7 +1553,7 @@ protected void updateInitializedEntityInstance(EntityInitializerData data) {
 				data,
 				session,
 				session.getPersistenceContextInternal(),
-				loadedState,
+				state,
 				entityEntry.getVersion()
 		);
 	}
@@ -1752,6 +1764,9 @@ private void putInCache(
 			Object version,
 			EntityDataAccess cacheAccess,
 			Object cacheKey, CacheEntry cacheEntry) {
+		final boolean minimalPutsEnabled =
+				session.getFactory().getSessionFactoryOptions().isMinimalPutsEnabled()
+						&& session.getCacheMode() != CacheMode.REFRESH;
 		final var eventListenerManager = session.getEventListenerManager();
 		boolean cacheContentChanged = false;
 		final var eventMonitor = session.getEventMonitor();
@@ -1763,8 +1778,7 @@ private void putInCache(
 					cacheKey,
 					data.concreteDescriptor.getCacheEntryStructure().structure( cacheEntry ),
 					version,
-					//useMinimalPuts( session, entityEntry )
-					false
+					minimalPutsEnabled
 			);
 		}
 		finally {
@@ -2112,7 +2126,7 @@ public boolean isHasLazyInitializingSubAssemblers() {
 		return assemblers;
 	}
 
-	protected @Nullable BasicResultAssembler<?> discriminatorAssembler() {
+	protected @Nullable BasicResultAssembler<?> getDiscriminatorAssembler() {
 		return discriminatorAssembler;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java
index b427b81f422b..8cd64cd79952 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java
@@ -8,7 +8,6 @@
 import org.hibernate.metamodel.mapping.EntityValuedModelPart;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.from.TableGroupProducer;
 import org.hibernate.sql.results.graph.AssemblerCreationState;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
@@ -19,6 +18,7 @@
 import org.hibernate.sql.results.graph.InitializerProducer;
 import org.hibernate.sql.results.graph.entity.AbstractEntityResultGraphNode;
 import org.hibernate.sql.results.graph.entity.EntityResult;
+import org.hibernate.type.descriptor.java.JavaType;
 
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 
@@ -27,8 +27,8 @@
  *
  * @author Steve Ebersole
  */
-public class EntityResultImpl extends AbstractEntityResultGraphNode
-		implements EntityResult, InitializerProducer<EntityResultImpl> {
+public class EntityResultImpl<E> extends AbstractEntityResultGraphNode
+		implements EntityResult<E>, InitializerProducer<EntityResultImpl<E>> {
 
 	private final TableGroup tableGroup;
 	private final String resultVariable;
@@ -46,8 +46,8 @@ public EntityResultImpl(
 	@Override
 	public NavigablePath resolveNavigablePath(Fetchable fetchable) {
 		if ( fetchable instanceof TableGroupProducer ) {
-			for ( TableGroupJoin tableGroupJoin : tableGroup.getTableGroupJoins() ) {
-				final NavigablePath navigablePath = tableGroupJoin.getNavigablePath();
+			for ( var tableGroupJoin : tableGroup.getTableGroupJoins() ) {
+				final var navigablePath = tableGroupJoin.getNavigablePath();
 				if ( tableGroupJoin.getJoinedGroup().isFetched()
 						&& fetchable.getFetchableName().equals( navigablePath.getLocalName() )
 						&& tableGroupJoin.getJoinedGroup().getModelPart() == fetchable
@@ -79,8 +79,13 @@ protected String getSourceAlias() {
 	}
 
 	@Override
-	public DomainResultAssembler createResultAssembler(
-			InitializerParent parent,
+	public JavaType<E> getResultJavaType() {
+		return (JavaType<E>) super.getResultJavaType();
+	}
+
+	@Override
+	public DomainResultAssembler<E> createResultAssembler(
+			InitializerParent<?> parent,
 			AssemblerCreationState creationState) {
 		return new EntityAssembler<>(
 				this.getResultJavaType(),
@@ -90,7 +95,7 @@ public DomainResultAssembler createResultAssembler(
 
 	@Override
 	public Initializer<?> createInitializer(
-			EntityResultImpl resultGraphNode,
+			EntityResultImpl<E> resultGraphNode,
 			InitializerParent<?> parent,
 			AssemblerCreationState creationState) {
 		return resultGraphNode.createInitializer( parent, creationState );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityFetch.java
new file mode 100644
index 000000000000..18f290767c51
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityFetch.java
@@ -0,0 +1,144 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.results.graph.entity.internal;
+
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+
+import org.hibernate.engine.FetchTiming;
+import org.hibernate.metamodel.mapping.DiscriminatedAssociationModelPart;
+import org.hibernate.metamodel.mapping.DiscriminatorValueDetails;
+import org.hibernate.metamodel.mapping.internal.DiscriminatedAssociationMapping;
+import org.hibernate.spi.NavigablePath;
+import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.results.graph.AssemblerCreationState;
+import org.hibernate.sql.results.graph.DomainResultAssembler;
+import org.hibernate.sql.results.graph.DomainResultCreationState;
+import org.hibernate.sql.results.graph.Fetch;
+import org.hibernate.sql.results.graph.FetchParent;
+import org.hibernate.sql.results.graph.Initializer;
+import org.hibernate.sql.results.graph.InitializerParent;
+import org.hibernate.sql.results.graph.InitializerProducer;
+import org.hibernate.sql.results.graph.entity.AbstractDiscriminatedEntityResultGraphNode;
+import org.hibernate.type.descriptor.java.JavaType;
+
+/**
+ * Join fetching of {@link org.hibernate.annotations.Any} mappings.
+ *
+ * @author Gavin King
+ */
+public class JoinedDiscriminatedEntityFetch extends AbstractDiscriminatedEntityResultGraphNode implements Fetch,
+		InitializerProducer<JoinedDiscriminatedEntityFetch> {
+	private final FetchTiming fetchTiming;
+	private final FetchParent fetchParent;
+	private final List<EntityResultImpl<?>> concreteEntityResults;
+
+	public JoinedDiscriminatedEntityFetch(
+			NavigablePath navigablePath,
+			JavaType<?> baseAssociationJtd,
+			DiscriminatedAssociationModelPart fetchedPart,
+			FetchTiming fetchTiming,
+			FetchParent fetchParent,
+			List<DiscriminatorValueDetails> valueDetails,
+			DomainResultCreationState creationState) {
+		super( navigablePath, fetchedPart, baseAssociationJtd );
+		this.fetchTiming = fetchTiming;
+		this.fetchParent = fetchParent;
+
+		afterInitialize( creationState );
+
+		final var fromClauseAccess = creationState.getSqlAstCreationState().getFromClauseAccess();
+		this.concreteEntityResults = new ArrayList<>( valueDetails.size() );
+		for ( DiscriminatorValueDetails valueDetail : valueDetails ) {
+			final var entityMapping = valueDetail.getIndicatedEntity();
+			final NavigablePath concretePath = DiscriminatedAssociationMapping.concreteEntityPath( navigablePath, entityMapping );
+			final TableGroup tableGroup = fromClauseAccess.getTableGroup( concretePath );
+			final var entityResult = new EntityResultImpl<>( concretePath, entityMapping, tableGroup, null );
+			entityResult.afterInitialize( entityResult, creationState );
+			concreteEntityResults.add( entityResult );
+		}
+	}
+
+	List<EntityResultImpl<?>> getConcreteEntityResults() {
+		return concreteEntityResults;
+	}
+
+	@Override
+	public FetchParent getFetchParent() {
+		return fetchParent;
+	}
+
+	@Override
+	public DiscriminatedAssociationModelPart getFetchedMapping() {
+		return getReferencedMappingContainer();
+	}
+
+	@Override
+	public FetchTiming getTiming() {
+		return fetchTiming;
+	}
+
+	@Override
+	public boolean hasTableGroup() {
+		return true;
+	}
+
+	@Override
+	public DomainResultAssembler<?> createAssembler(
+			InitializerParent<?> parent,
+			AssemblerCreationState creationState) {
+		return new EntityAssembler<>(
+				getReferencedMappingContainer().getJavaType(),
+				creationState.resolveInitializer( this, parent, this ).asEntityInitializer()
+		);
+	}
+
+	@Override
+	public Initializer<?> createInitializer(
+			JoinedDiscriminatedEntityFetch resultGraphNode,
+			InitializerParent<?> parent,
+			AssemblerCreationState creationState) {
+		return resultGraphNode.createInitializer( parent, creationState );
+	}
+
+	@Override
+	public Initializer<?> createInitializer(InitializerParent<?> parent, AssemblerCreationState creationState) {
+		return new JoinedDiscriminatedEntityInitializer(
+				parent,
+				getReferencedMappingType(),
+				getNavigablePath(),
+				getDiscriminatorValueFetch(),
+				getKeyValueFetch(),
+				fetchTiming == FetchTiming.IMMEDIATE,
+				false,
+				concreteEntityResults,
+				creationState
+		);
+	}
+
+	@Override
+	public boolean containsCollectionFetches() {
+		for ( var entityResult : concreteEntityResults ) {
+			if ( entityResult.containsCollectionFetches() ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public void collectValueIndexesToCache(BitSet valueIndexes) {
+		super.collectValueIndexesToCache( valueIndexes );
+		for ( var entityResult : concreteEntityResults ) {
+			entityResult.collectValueIndexesToCache( valueIndexes );
+		}
+	}
+
+	@Override
+	public FetchParent asFetchParent() {
+		return this;
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityInitializer.java
new file mode 100644
index 000000000000..4ce5fb3d989b
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityInitializer.java
@@ -0,0 +1,414 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.results.graph.entity.internal;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.NotFoundAction;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.metamodel.mapping.DiscriminatedAssociationModelPart;
+import org.hibernate.metamodel.mapping.DiscriminatorMapping;
+import org.hibernate.metamodel.mapping.internal.UnifiedAnyDiscriminatorConverter;
+import org.hibernate.sql.results.graph.AssemblerCreationState;
+import org.hibernate.sql.results.graph.DomainResultAssembler;
+import org.hibernate.sql.results.graph.Fetch;
+import org.hibernate.sql.results.graph.Initializer;
+import org.hibernate.sql.results.graph.InitializerData;
+import org.hibernate.sql.results.graph.InitializerParent;
+import org.hibernate.sql.results.graph.entity.EntityInitializer;
+import org.hibernate.sql.results.graph.internal.AbstractInitializer;
+import org.hibernate.spi.NavigablePath;
+import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import static org.hibernate.internal.log.LoggingHelper.toLoggableString;
+import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
+
+/**
+ * Join fetching of {@link org.hibernate.annotations.Any} mappings.
+ *
+ * @author Gavin King
+ */
+public class JoinedDiscriminatedEntityInitializer
+		extends AbstractInitializer<JoinedDiscriminatedEntityInitializer.JoinedDiscriminatedEntityInitializerData>
+		implements EntityInitializer<JoinedDiscriminatedEntityInitializer.JoinedDiscriminatedEntityInitializerData> {
+
+	protected final InitializerParent<?> parent;
+	private final NavigablePath navigablePath;
+	private final boolean isPartOfKey;
+	private final DiscriminatedAssociationModelPart fetchedPart;
+	private final boolean eager;
+	private final boolean resultInitializer;
+	private final DomainResultAssembler<?> discriminatorAssembler;
+	private final DomainResultAssembler<?> keyValueAssembler;
+	private final Map<String, EntityInitializer<?>> concreteInitializersByEntityName;
+	private final EntityInitializer<?>[] concreteInitializers;
+	private final boolean keyIsEager;
+	private final boolean hasLazySubInitializer;
+	// workaround for the fact that implicit discriminator mappings are not available
+	private final boolean allowMissingConcreteInitializer;
+
+	public static class JoinedDiscriminatedEntityInitializerData extends InitializerData {
+		protected EntityPersister concreteDescriptor;
+		protected Object entityIdentifier;
+		protected EntityInitializer<?> concreteInitializer;
+
+		public JoinedDiscriminatedEntityInitializerData(RowProcessingState rowProcessingState) {
+			super( rowProcessingState );
+		}
+	}
+
+	public JoinedDiscriminatedEntityInitializer(
+			InitializerParent<?> parent,
+			DiscriminatedAssociationModelPart fetchedPart,
+			NavigablePath fetchedNavigable,
+			Fetch discriminatorFetch,
+			Fetch keyFetch,
+			boolean eager,
+			boolean resultInitializer,
+			List<EntityResultImpl<?>> concreteEntityResults,
+			AssemblerCreationState creationState) {
+		super( creationState );
+		this.parent = parent;
+		this.fetchedPart = fetchedPart;
+		this.navigablePath = fetchedNavigable;
+		this.eager = eager;
+		this.resultInitializer = resultInitializer;
+
+		isPartOfKey = Initializer.isPartOfKey( fetchedNavigable, parent );
+		discriminatorAssembler = discriminatorFetch.createAssembler( this, creationState );
+		keyValueAssembler = keyFetch.createAssembler( this, creationState );
+		keyIsEager = keyValueAssembler.isEager();
+
+		final Map<String, EntityInitializer<?>> initializersByEntityName =
+				new LinkedHashMap<>( concreteEntityResults.size() );
+		final var initializers = new EntityInitializer<?>[concreteEntityResults.size()];
+		boolean lazySubInitializer = keyValueAssembler.hasLazySubInitializers();
+		for ( int i = 0; i < concreteEntityResults.size(); i++ ) {
+			final var entityResult = concreteEntityResults.get( i );
+			final var initializer = resolveEntityInitializer( entityResult, creationState );
+			initializers[i] = initializer;
+			initializersByEntityName.put(
+					entityResult.getEntityValuedModelPart().getEntityMappingType().getEntityName(),
+					initializer
+			);
+			lazySubInitializer = lazySubInitializer || initializer.hasLazySubInitializers();
+		}
+		concreteInitializers = initializers;
+		concreteInitializersByEntityName = initializersByEntityName;
+		hasLazySubInitializer = lazySubInitializer;
+		allowMissingConcreteInitializer =
+				hasImplicitDiscriminatorStrategy( fetchedPart.getDiscriminatorMapping() );
+	}
+
+	private EntityInitializer<?> resolveEntityInitializer(
+			EntityResultImpl<?> entityResult,
+			AssemblerCreationState creationState) {
+		return creationState.resolveInitializer(
+				entityResult.getNavigablePath(),
+				entityResult.getReferencedModePart(),
+				() -> new EntityInitializerImpl(
+						entityResult,
+						entityResult.getSourceAlias(),
+						entityResult.getIdentifierFetch(),
+						entityResult.getDiscriminatorFetch(),
+						null,
+						entityResult.getRowIdResult(),
+						NotFoundAction.EXCEPTION,
+						false,
+						this,
+						false,
+						creationState
+				)
+		).asEntityInitializer();
+	}
+
+	@Override
+	protected InitializerData createInitializerData(RowProcessingState rowProcessingState) {
+		return new JoinedDiscriminatedEntityInitializerData( rowProcessingState );
+	}
+
+	@Override
+	public @Nullable InitializerParent<?> getParent() {
+		return parent;
+	}
+
+	@Override
+	public DiscriminatedAssociationModelPart getInitializedPart() {
+		return fetchedPart;
+	}
+
+	@Override
+	public NavigablePath getNavigablePath() {
+		return navigablePath;
+	}
+
+	@Override
+	public void resolveKey(JoinedDiscriminatedEntityInitializerData data) {
+		if ( data.getState() == State.UNINITIALIZED ) {
+			final var rowProcessingState = data.getRowProcessingState();
+			final Object discriminatorValue = discriminatorAssembler.assemble( rowProcessingState );
+			if ( discriminatorValue == null ) {
+				data.setState( State.MISSING );
+				data.concreteDescriptor = null;
+				data.entityIdentifier = null;
+				data.concreteInitializer = null;
+				data.setInstance( null );
+				assert keyValueAssembler.assemble( rowProcessingState ) == null;
+			}
+			else {
+				data.concreteDescriptor =
+						fetchedPart.resolveDiscriminatorValue( discriminatorValue )
+								.getEntityPersister();
+				data.entityIdentifier = keyValueAssembler.assemble( rowProcessingState );
+				data.concreteInitializer = resolveConcreteInitializer( data.concreteDescriptor );
+				data.setState( State.KEY_RESOLVED );
+				if ( data.concreteInitializer != null ) {
+					data.concreteInitializer.resolveKey( rowProcessingState );
+				}
+			}
+		}
+	}
+
+	@Override
+	public void resolveFromPreviousRow(JoinedDiscriminatedEntityInitializerData data) {
+		if ( data.getState() == State.UNINITIALIZED ) {
+			if ( data.getInstance() == null ) {
+				data.setState( State.MISSING );
+			}
+			else {
+				final var initializer = keyValueAssembler.getInitializer();
+				if ( initializer != null ) {
+					initializer.resolveFromPreviousRow( data.getRowProcessingState() );
+				}
+				if ( data.concreteInitializer != null ) {
+					data.concreteInitializer.resolveFromPreviousRow( data.getRowProcessingState() );
+				}
+				data.setState( State.INITIALIZED );
+			}
+		}
+	}
+
+	@Override
+	public void resolveState(JoinedDiscriminatedEntityInitializerData data) {
+		final var rowProcessingState = data.getRowProcessingState();
+		discriminatorAssembler.resolveState( rowProcessingState );
+		keyValueAssembler.resolveState( rowProcessingState );
+		if ( data.concreteInitializer != null ) {
+			data.concreteInitializer.resolveState( rowProcessingState );
+		}
+	}
+
+	@Override
+	public void resolveInstance(JoinedDiscriminatedEntityInitializerData data) {
+		if ( data.getState() == State.KEY_RESOLVED ) {
+			final var concreteInitializer = data.concreteInitializer;
+			if ( concreteInitializer != null ) {
+				concreteInitializer.resolveInstance( data.getRowProcessingState() );
+				transferConcreteResolution( concreteInitializer, data );
+				if ( data.getInstance() != null || data.getState() == State.MISSING ) {
+					return;
+				}
+			}
+
+			data.setState( State.INITIALIZED );
+			data.setInstance( data.getRowProcessingState().getSession()
+					.internalLoad(
+							data.concreteDescriptor.getEntityName(),
+							data.entityIdentifier,
+							eager,
+							false
+					) );
+		}
+	}
+
+	@Override
+	public void resolveInstance(Object instance, JoinedDiscriminatedEntityInitializerData data) {
+		if ( instance == null ) {
+			data.setState( State.MISSING );
+			data.entityIdentifier = null;
+			data.concreteDescriptor = null;
+			data.concreteInitializer = null;
+			data.setInstance( null );
+		}
+		else {
+			final var rowProcessingState = data.getRowProcessingState();
+			resolveConcreteAssociation( instance, data, rowProcessingState.getSession() );
+			final var concreteInitializer = data.concreteInitializer;
+			if ( concreteInitializer != null ) {
+				concreteInitializer.resolveInstance( instance, rowProcessingState );
+				data.concreteDescriptor = concreteInitializer.getConcreteDescriptor( rowProcessingState );
+				data.entityIdentifier = concreteInitializer.getEntityIdentifier( rowProcessingState );
+				transferConcreteResolution( concreteInitializer, data );
+			}
+			else {
+				data.setInstance( instance );
+				if ( eager ) {
+					Hibernate.initialize( instance ); //TODO: don't love this
+				}
+				data.setState( State.INITIALIZED );
+			}
+
+			if ( keyIsEager ) {
+				final var initializer = keyValueAssembler.getInitializer();
+				assert initializer != null;
+				initializer.resolveInstance( data.entityIdentifier, rowProcessingState );
+			}
+			else if ( rowProcessingState.needsResolveState() ) {
+				discriminatorAssembler.resolveState( rowProcessingState );
+				keyValueAssembler.resolveState( rowProcessingState );
+			}
+		}
+	}
+
+	private void resolveConcreteAssociation(
+			Object instance,
+			JoinedDiscriminatedEntityInitializerData data,
+			SharedSessionContractImplementor session) {
+		final var lazyInitializer = extractLazyInitializer( instance );
+		if ( lazyInitializer == null ) {
+			data.concreteDescriptor = session.getEntityPersister( null, instance );
+			data.entityIdentifier = data.concreteDescriptor.getIdentifier( instance, session );
+		}
+		else {
+			data.concreteDescriptor =
+					lazyInitializer.isUninitialized()
+							? session.getFactory().getMappingMetamodel().getEntityDescriptor( lazyInitializer.getEntityName() )
+							: session.getEntityPersister( null, lazyInitializer.getImplementation() );
+			data.entityIdentifier = lazyInitializer.getInternalIdentifier();
+		}
+		data.concreteInitializer = resolveConcreteInitializer( data.concreteDescriptor );
+	}
+
+	@Override
+	public void initializeInstance(JoinedDiscriminatedEntityInitializerData data) {
+		if ( data.getState() == State.RESOLVED ) {
+			final var rowProcessingState = data.getRowProcessingState();
+			data.concreteInitializer.initializeInstance( rowProcessingState );
+			data.setInstance( data.concreteInitializer.getResolvedInstance( rowProcessingState ) );
+			data.setState( State.INITIALIZED );
+		}
+	}
+
+	private static boolean hasImplicitDiscriminatorStrategy(DiscriminatorMapping discriminatorMapping) {
+		return discriminatorMapping.getValueConverter() instanceof UnifiedAnyDiscriminatorConverter<?, ?> converter
+			&& converter.hasImplicitValueStrategy();
+	}
+
+	private @Nullable EntityInitializer<?> resolveConcreteInitializer(EntityPersister concreteDescriptor) {
+		final var concreteInitializer = concreteInitializersByEntityName.get( concreteDescriptor.getEntityName() );
+		if ( concreteInitializer == null && !allowMissingConcreteInitializer ) {
+			throw new IllegalStateException(
+					"Initializer for " + concreteDescriptor.getEntityName() + " is unexpectedly missing"
+			);
+		}
+		return concreteInitializer;
+	}
+
+	private void transferConcreteResolution(
+			EntityInitializer<?> concreteInitializer,
+			JoinedDiscriminatedEntityInitializerData data) {
+		final var rowProcessingState = data.getRowProcessingState();
+		final var state = concreteInitializer.getData( rowProcessingState ).getState();
+		data.setInstance( switch ( state ) {
+			case MISSING -> null;
+			case RESOLVED, INITIALIZED -> concreteInitializer.getResolvedInstance( rowProcessingState );
+			default -> throw new IllegalStateException( "Unexpected concrete initializer state: " + state );
+		} );
+		data.setState( state );
+	}
+
+	@Override
+	public void initializeInstanceFromParent(Object parentInstance, JoinedDiscriminatedEntityInitializerData data) {
+		final var attributeMapping = getInitializedPart().asAttributeMapping();
+		final Object instance =
+				attributeMapping != null
+						? attributeMapping.getValue( parentInstance )
+						: parentInstance;
+		data.entityIdentifier = null;
+		data.concreteDescriptor = null;
+		data.concreteInitializer = null;
+		if ( instance == null ) {
+			data.setState( State.MISSING );
+			data.setInstance( null );
+		}
+		else {
+			data.setInstance( instance );
+			final var rowProcessingState = data.getRowProcessingState();
+			resolveConcreteAssociation( instance, data, rowProcessingState.getSession() );
+			final var concreteInitializer = data.concreteInitializer;
+			if ( concreteInitializer != null ) {
+				concreteInitializer.initializeInstanceFromParent( instance, rowProcessingState );
+				data.concreteDescriptor = concreteInitializer.getConcreteDescriptor( rowProcessingState );
+				data.entityIdentifier = concreteInitializer.getEntityIdentifier( rowProcessingState );
+				transferConcreteResolution( concreteInitializer, data );
+			}
+			else {
+				data.setState( State.INITIALIZED );
+				if ( eager ) {
+					Hibernate.initialize( instance );
+				}
+			}
+		}
+	}
+
+	@Override
+	protected void forEachSubInitializer(BiConsumer<Initializer<?>, RowProcessingState> consumer, InitializerData data) {
+		final var keyInitializer = keyValueAssembler.getInitializer();
+		if ( keyInitializer != null ) {
+			consumer.accept( keyInitializer, data.getRowProcessingState() );
+		}
+		for ( var concreteInitializer : concreteInitializers ) {
+			consumer.accept( concreteInitializer, data.getRowProcessingState() );
+		}
+	}
+
+	@Override
+	public EntityPersister getEntityDescriptor() {
+		throw new UnsupportedOperationException( "Discriminated association has no static entity type" );
+	}
+
+	@Override
+	public EntityPersister getConcreteDescriptor(JoinedDiscriminatedEntityInitializerData data) {
+		return data.concreteDescriptor;
+	}
+
+	@Override
+	public @Nullable Object getEntityIdentifier(JoinedDiscriminatedEntityInitializerData data) {
+		return data.entityIdentifier;
+	}
+
+	@Override
+	public boolean isPartOfKey() {
+		return isPartOfKey;
+	}
+
+	@Override
+	public boolean isEager() {
+		return eager || keyIsEager;
+	}
+
+	@Override
+	public boolean hasLazySubInitializers() {
+		return hasLazySubInitializer;
+	}
+
+	@Override
+	public boolean isResultInitializer() {
+		return resultInitializer;
+	}
+
+	@Override
+	public String toString() {
+		return "JoinedDiscriminatedEntityInitializer("
+				+ toLoggableString( getNavigablePath() ) + ")";
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityResult.java
new file mode 100644
index 000000000000..2f7d1c99d175
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/JoinedDiscriminatedEntityResult.java
@@ -0,0 +1,110 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.sql.results.graph.entity.internal;
+
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+
+import org.hibernate.metamodel.mapping.DiscriminatedAssociationModelPart;
+import org.hibernate.metamodel.mapping.DiscriminatorValueDetails;
+import org.hibernate.metamodel.mapping.internal.DiscriminatedAssociationMapping;
+import org.hibernate.spi.NavigablePath;
+import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.results.graph.AssemblerCreationState;
+import org.hibernate.sql.results.graph.DomainResult;
+import org.hibernate.sql.results.graph.DomainResultAssembler;
+import org.hibernate.sql.results.graph.DomainResultCreationState;
+import org.hibernate.sql.results.graph.Initializer;
+import org.hibernate.sql.results.graph.InitializerParent;
+import org.hibernate.sql.results.graph.InitializerProducer;
+import org.hibernate.sql.results.graph.entity.AbstractDiscriminatedEntityResultGraphNode;
+import org.hibernate.type.descriptor.java.JavaType;
+
+public class JoinedDiscriminatedEntityResult<T> extends AbstractDiscriminatedEntityResultGraphNode
+		implements DomainResult<T>, InitializerProducer<JoinedDiscriminatedEntityResult<T>> {
+	private final String resultVariable;
+	private final List<EntityResultImpl<?>> concreteEntityResults;
+
+	public JoinedDiscriminatedEntityResult(
+			NavigablePath navigablePath,
+			JavaType<?> baseAssociationJtd,
+			DiscriminatedAssociationModelPart fetchedPart,
+			String resultVariable,
+			List<DiscriminatorValueDetails> valueDetails,
+			DomainResultCreationState creationState) {
+		super( navigablePath, fetchedPart, baseAssociationJtd );
+		this.resultVariable = resultVariable;
+
+		afterInitialize( creationState );
+
+		final var fromClauseAccess = creationState.getSqlAstCreationState().getFromClauseAccess();
+		this.concreteEntityResults = new ArrayList<>( valueDetails.size() );
+		for ( DiscriminatorValueDetails valueDetail : valueDetails ) {
+			final var entityMapping = valueDetail.getIndicatedEntity();
+			final NavigablePath concretePath = DiscriminatedAssociationMapping.concreteEntityPath( navigablePath, entityMapping );
+			final TableGroup tableGroup = fromClauseAccess.getTableGroup( concretePath );
+			final var entityResult = new EntityResultImpl<>( concretePath, entityMapping, tableGroup, null );
+			entityResult.afterInitialize( entityResult, creationState );
+			concreteEntityResults.add( entityResult );
+		}
+	}
+
+	@Override
+	public String getResultVariable() {
+		return resultVariable;
+	}
+
+	@Override
+	public DomainResultAssembler<T> createResultAssembler(
+			InitializerParent<?> parent,
+			AssemblerCreationState creationState) {
+		//noinspection unchecked
+		return new EntityAssembler(
+				getReferencedMappingContainer().getJavaType(),
+				creationState.resolveInitializer( this, parent, this ).asEntityInitializer()
+		);
+	}
+
+	@Override
+	public Initializer<?> createInitializer(
+			JoinedDiscriminatedEntityResult<T> resultGraphNode,
+			InitializerParent<?> parent,
+			AssemblerCreationState creationState) {
+		return resultGraphNode.createInitializer( parent, creationState );
+	}
+
+	@Override
+	public Initializer<?> createInitializer(InitializerParent<?> parent, AssemblerCreationState creationState) {
+		return new JoinedDiscriminatedEntityInitializer(
+				parent,
+				getReferencedMappingType(),
+				getNavigablePath(),
+				getDiscriminatorValueFetch(),
+				getKeyValueFetch(),
+				true,
+				true,
+				concreteEntityResults,
+				creationState
+		);
+	}
+
+	@Override
+	public boolean containsCollectionFetches() {
+		for ( var entityResult : concreteEntityResults ) {
+			if ( entityResult.containsCollectionFetches() ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public void collectValueIndexesToCache(BitSet valueIndexes) {
+		super.collectValueIndexesToCache( valueIndexes );
+		for ( var entityResult : concreteEntityResults ) {
+			entityResult.collectValueIndexesToCache( valueIndexes );
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiation.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiation.java
index 6ebfd95a82f0..6ca2cb334c34 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiation.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiation.java
@@ -7,7 +7,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.hibernate.query.sqm.DynamicInstantiationNature;
 import org.hibernate.query.sqm.sql.ConversionException;
@@ -18,17 +17,19 @@
 
 import org.jboss.logging.Logger;
 
+import static java.util.stream.Collectors.toList;
+
 /**
  * Represents a dynamic-instantiation (from an SQM query) as a DomainResultProducer
  *
  * @author Steve Ebersole
  */
-public class DynamicInstantiation<T> implements DomainResultProducer {
+public class DynamicInstantiation<T> implements DomainResultProducer<T> {
 	private static final Logger LOG = Logger.getLogger( DynamicInstantiation.class );
 
 	private final DynamicInstantiationNature nature;
 	private final JavaType<T> targetJavaType;
-	private List<DynamicInstantiationArgument> arguments;
+	private List<DynamicInstantiationArgument<?>> arguments;
 
 	private boolean argumentAdditionsComplete = false;
 
@@ -47,7 +48,7 @@ public JavaType<T> getTargetJavaType() {
 		return targetJavaType;
 	}
 
-	public void addArgument(String alias, DomainResultProducer<?> argumentResultProducer, DomainResultCreationState creationState) {
+	public void addArgument(String alias, DomainResultProducer<?> argumentResultProducer) {
 		if ( argumentAdditionsComplete ) {
 			throw new ConversionException( "Unexpected call to DynamicInstantiation#addAgument after previously complete" );
 		}
@@ -82,7 +83,7 @@ public void complete() {
 		argumentAdditionsComplete = true;
 	}
 
-	public List<DynamicInstantiationArgument> getArguments() {
+	public List<DynamicInstantiationArgument<?>> getArguments() {
 		return arguments;
 	}
 
@@ -92,17 +93,16 @@ public String toString() {
 	}
 
 	@Override
-	public DomainResult createDomainResult(
+	public DomainResult<T> createDomainResult(
 			String resultVariable,
 			DomainResultCreationState creationState) {
-		//noinspection unchecked
-		return new DynamicInstantiationResultImpl(
+		return new DynamicInstantiationResultImpl<>(
 				resultVariable,
 				getNature(),
 				getTargetJavaType(),
 				getArguments().stream()
 						.map( argument -> argument.buildArgumentDomainResult( creationState ) )
-						.collect( Collectors.toList() )
+						.collect( toList() )
 		);
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java
index 2d1f5d5438ec..cb5677668f48 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationArgument.java
@@ -6,7 +6,6 @@
 
 import org.hibernate.query.sqm.sql.BaseSqmToSqlAstConverter;
 import org.hibernate.query.sqm.sql.internal.DomainResultProducer;
-import org.hibernate.sql.ast.spi.SqlExpressionResolver;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 
 /**
@@ -26,9 +25,9 @@ public String getAlias() {
 	}
 
 	public ArgumentDomainResult<T> buildArgumentDomainResult(DomainResultCreationState creationState) {
-		final SqlExpressionResolver sqlExpressionResolver = creationState.getSqlAstCreationState()
-				.getCurrentProcessingState()
-				.getSqlExpressionResolver();
+		final var sqlExpressionResolver =
+				creationState.getSqlAstCreationState().getCurrentProcessingState()
+						.getSqlExpressionResolver();
 		if ( sqlExpressionResolver instanceof BaseSqmToSqlAstConverter.SqmAliasedNodeCollector ) {
 			if ( !( argumentResultProducer instanceof DynamicInstantiation<?> ) ) {
 				( (BaseSqmToSqlAstConverter.SqmAliasedNodeCollector) sqlExpressionResolver ).next();
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerConstructorImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerConstructorImpl.java
index 99a90e91f6a1..7e411f7429e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerConstructorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerConstructorImpl.java
@@ -40,7 +40,7 @@ public JavaType<R> getAssembledJavaType() {
 	@Override
 	public R assemble(RowProcessingState rowProcessingState) {
 		final int numberOfArgs = argumentReaders.size();
-		Object[] args = new Object[ numberOfArgs ];
+		final var args = new Object[ numberOfArgs ];
 		for ( int i = 0; i < numberOfArgs; i++ ) {
 			args[i] = argumentReaders.get( i ).assemble( rowProcessingState );
 		}
@@ -60,14 +60,14 @@ public R assemble(RowProcessingState rowProcessingState) {
 
 	@Override
 	public void resolveState(RowProcessingState rowProcessingState) {
-		for ( ArgumentReader<?> argumentReader : argumentReaders ) {
+		for ( var argumentReader : argumentReaders ) {
 			argumentReader.resolveState( rowProcessingState );
 		}
 	}
 
 	@Override
 	public <X> void forEachResultAssembler(BiConsumer<Initializer<?>, X> consumer, X arg) {
-		for ( ArgumentReader<?> argumentReader : argumentReaders ) {
+		for ( var argumentReader : argumentReaders ) {
 			argumentReader.forEachResultAssembler( consumer, arg );
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java
index cd842c71c7b3..e8e7b64f9dcb 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerInjectionImpl.java
@@ -4,16 +4,12 @@
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
-import java.beans.BeanInfo;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
 
+import org.hibernate.internal.util.beans.BeanInfo;
 import org.hibernate.internal.util.beans.BeanInfoHelper;
 import org.hibernate.query.sqm.sql.internal.InstantiationException;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
@@ -35,7 +31,7 @@ public DynamicInstantiationAssemblerInjectionImpl(
 			JavaType<T> target,
 			List<ArgumentReader<?>> argumentReaders) {
 		this.target = target;
-		final Class<?> targetJavaType = target.getJavaTypeClass();
+		final var targetJavaType = target.getJavaTypeClass();
 		final List<BeanInjection> beanInjections = new ArrayList<>( argumentReaders.size() );
 		BeanInfoHelper.visitBeanInfo(
 				targetJavaType,
@@ -58,20 +54,20 @@ private DynamicInstantiationAssemblerInjectionImpl(List<BeanInjection> beanInjec
 	}
 
 	private static BeanInjection injection(BeanInfo beanInfo, ArgumentReader<?> argument, Class<?> targetJavaType) {
-		final Class<?> argType = argument.getAssembledJavaType().getJavaTypeClass();
+		final var argType = argument.getAssembledJavaType().getJavaTypeClass();
 		final String alias = argument.getAlias();
 
 		// see if we can find a property with the given name...
-		for ( PropertyDescriptor propertyDescriptor : beanInfo.getPropertyDescriptors() ) {
+		for ( var propertyDescriptor : beanInfo.getPropertyDescriptors() ) {
 			if ( propertyMatches( alias, argType, propertyDescriptor ) ) {
-				final Method setter = propertyDescriptor.getWriteMethod();
+				final var setter = propertyDescriptor.getWriteMethod();
 				setter.setAccessible(true);
 				return new BeanInjection( new BeanInjectorSetter<>( setter ), argument );
 			}
 		}
 
 		// see if we can find a Field with the given name...
-		final Field field = findField( targetJavaType, alias, argType );
+		final var field = findField( targetJavaType, alias, argType );
 		if ( field != null ) {
 			return new BeanInjection( new BeanInjectorField<>( field ), argument );
 		}
@@ -92,7 +88,7 @@ public JavaType<T> getAssembledJavaType() {
 	public T assemble(RowProcessingState rowProcessingState) {
 		final T result;
 		try {
-			final Constructor<T> constructor = target.getJavaTypeClass().getDeclaredConstructor();
+			final var constructor = target.getJavaTypeClass().getDeclaredConstructor();
 			constructor.setAccessible( true );
 			result = constructor.newInstance();
 		}
@@ -101,7 +97,7 @@ public T assemble(RowProcessingState rowProcessingState) {
 			throw new InstantiationException( "Error instantiating class '"
 					+ target.getTypeName() + "' using default constructor: " + e.getMessage(), e );
 		}
-		for ( BeanInjection beanInjection : beanInjections ) {
+		for ( var beanInjection : beanInjections ) {
 			final Object assembled = beanInjection.getValueAssembler().assemble( rowProcessingState );
 			beanInjection.getBeanInjector().inject( result, assembled );
 		}
@@ -110,14 +106,14 @@ public T assemble(RowProcessingState rowProcessingState) {
 
 	@Override
 	public void resolveState(RowProcessingState rowProcessingState) {
-		for ( BeanInjection beanInjection : beanInjections ) {
+		for ( var beanInjection : beanInjections ) {
 			beanInjection.getValueAssembler().resolveState( rowProcessingState );
 		}
 	}
 
 	@Override
 	public <X> void forEachResultAssembler(BiConsumer<Initializer<?>, X> consumer, X arg) {
-		for ( BeanInjection beanInjection : beanInjections ) {
+		for ( var beanInjection : beanInjections ) {
 			beanInjection.getValueAssembler().forEachResultAssembler( consumer, arg );
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerListImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerListImpl.java
index ff44cbf5fb12..da4ad30545a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerListImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerListImpl.java
@@ -41,7 +41,7 @@ public JavaType<List<?>> getAssembledJavaType() {
 	public List<?> assemble(
 			RowProcessingState rowProcessingState) {
 		final ArrayList<Object> result = new ArrayList<>();
-		for ( ArgumentReader<?> argumentReader : argumentReaders ) {
+		for ( var argumentReader : argumentReaders ) {
 			result.add( argumentReader.assemble( rowProcessingState ) );
 		}
 		return result;
@@ -49,14 +49,14 @@ public List<?> assemble(
 
 	@Override
 	public void resolveState(RowProcessingState rowProcessingState) {
-		for ( ArgumentReader<?> argumentReader : argumentReaders ) {
+		for ( var argumentReader : argumentReaders ) {
 			argumentReader.resolveState( rowProcessingState );
 		}
 	}
 
 	@Override
 	public <X> void forEachResultAssembler(BiConsumer<Initializer<?>, X> consumer, X arg) {
-		for ( ArgumentReader<?> argumentReader : argumentReaders ) {
+		for ( var argumentReader : argumentReaders ) {
 			argumentReader.forEachResultAssembler( consumer, arg );
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java
index e6c5b1a34149..7252811a6764 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationAssemblerMapImpl.java
@@ -33,7 +33,7 @@ public DynamicInstantiationAssemblerMapImpl(
 		this.argumentReaders = argumentReaders;
 
 		final Set<String> aliases = new HashSet<>();
-		for ( ArgumentReader<?> argumentReader : argumentReaders ) {
+		for ( var argumentReader : argumentReaders ) {
 			if ( argumentReader.getAlias() == null ) {
 				throw new IllegalStateException( "alias for Map dynamic instantiation argument cannot be null" );
 			}
@@ -60,20 +60,16 @@ public JavaType<Map<?,?>> getAssembledJavaType() {
 	public Map<?,?> assemble(
 			RowProcessingState rowProcessingState) {
 		final HashMap<String,Object> result = new HashMap<>();
-
-		for ( ArgumentReader<?> argumentReader : argumentReaders ) {
-			result.put(
-					argumentReader.getAlias(),
-					argumentReader.assemble( rowProcessingState )
-			);
+		for ( var argumentReader : argumentReaders ) {
+			result.put( argumentReader.getAlias(),
+					argumentReader.assemble( rowProcessingState ) );
 		}
-
 		return result;
 	}
 
 	@Override
 	public void resolveState(RowProcessingState rowProcessingState) {
-		for ( ArgumentReader<?> argumentReader : argumentReaders ) {
+		for ( var argumentReader : argumentReaders ) {
 			argumentReader.resolveState( rowProcessingState );
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationResultImpl.java
index 3bee263d66d4..58294dad65ac 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationResultImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/DynamicInstantiationResultImpl.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.sql.results.graph.instantiation.internal;
 
-import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.HashSet;
@@ -18,9 +17,10 @@
 import org.hibernate.sql.results.graph.DomainResultAssembler;
 import org.hibernate.sql.results.graph.InitializerParent;
 import org.hibernate.sql.results.graph.instantiation.DynamicInstantiationResult;
+import org.hibernate.type.descriptor.java.DateJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
+import org.hibernate.type.descriptor.java.TemporalJavaType;
 import org.jboss.logging.Logger;
 
 import static java.util.stream.Collectors.toList;
@@ -63,7 +63,7 @@ public String getResultVariable() {
 	public boolean containsAnyNonScalarResults() {
 		//noinspection ForLoopReplaceableByForEach
 		for ( int i = 0; i < argumentResults.size(); i++ ) {
-			final ArgumentDomainResult<?> argumentResult = argumentResults.get( i );
+			final var argumentResult = argumentResults.get( i );
 			if ( argumentResult.containsAnyNonScalarResults() ) {
 				return true;
 			}
@@ -74,7 +74,7 @@ public boolean containsAnyNonScalarResults() {
 
 	@Override
 	public void collectValueIndexesToCache(BitSet valueIndexes) {
-		for ( ArgumentDomainResult<?> argumentResult : argumentResults ) {
+		for ( var argumentResult : argumentResults ) {
 			argumentResult.collectValueIndexesToCache( valueIndexes );
 		}
 	}
@@ -88,7 +88,7 @@ public DomainResultAssembler<R> createResultAssembler(InitializerParent<?> paren
 		final List<ArgumentReader<?>> argumentReaders = new ArrayList<>();
 
 		if ( argumentResults != null ) {
-			for ( ArgumentDomainResult<?> argumentResult : argumentResults ) {
+			for ( var argumentResult : argumentResults ) {
 				final String argumentAlias = argumentResult.getResultVariable();
 				if ( argumentAlias == null ) {
 					areAllArgumentsAliased = false;
@@ -155,19 +155,15 @@ private DomainResultAssembler<R> assembler(
 			List<String> duplicatedAliases,
 			List<ArgumentReader<?>> argumentReaders,
 			AssemblerCreationState creationState) {
-		final List<Class<?>> argumentTypes =
+		// find a constructor matching argument types
+		final var constructor = findMatchingConstructor(
+				javaType.getJavaTypeClass(),
 				argumentReaders.stream()
-						.map(reader -> reader.getAssembledJavaType().getJavaTypeClass())
-						.collect(toList());
-		final TypeConfiguration typeConfiguration =
+						.map( reader -> argumentClass( reader ) )
+						.collect( toList() ),
 				creationState.getSqlAstCreationContext()
 						.getMappingMetamodel()
-						.getTypeConfiguration();
-		// find a constructor matching argument types
-		final Constructor<R> constructor = findMatchingConstructor(
-				javaType.getJavaTypeClass(),
-				argumentTypes,
-				typeConfiguration
+						.getTypeConfiguration()
 		);
 		if ( constructor != null ) {
 			constructor.setAccessible( true );
@@ -200,6 +196,16 @@ private DomainResultAssembler<R> assembler(
 		return new DynamicInstantiationAssemblerInjectionImpl<>( javaType, argumentReaders );
 	}
 
+	private static Class<?> argumentClass(ArgumentReader<?> reader) {
+		final var assembledJavaType = reader.getAssembledJavaType();
+		return assembledJavaType instanceof DateJavaType temporalJavaType
+				// Hack to accommodate a constructor with java.sql parameter
+				// types when the entity has java.util.Date as its field types.
+				// (This was requested in HHH-4179 and we fixed it by accident.)
+				? TemporalJavaType.resolveJavaTypeClass( temporalJavaType.getPrecision() )
+				: assembledJavaType.getJavaTypeClass();
+	}
+
 	private List<String> signature() {
 		return argumentResults.stream()
 				.map( adt -> adt.getResultJavaType().getTypeName() )
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/InstantiationHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/InstantiationHelper.java
index faa0bf5813c2..a9b4ef2fd73b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/InstantiationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/instantiation/internal/InstantiationHelper.java
@@ -5,15 +5,14 @@
 package org.hibernate.sql.results.graph.instantiation.internal;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hibernate.internal.util.beans.BeanInfo;
 import org.hibernate.internal.util.beans.BeanInfoHelper;
+import org.hibernate.internal.util.beans.PropertyDescriptor;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.jboss.logging.Logger;
 
-import java.beans.BeanInfo;
-import java.beans.PropertyDescriptor;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.Type;
 import java.util.List;
 
 import static org.hibernate.query.sqm.tree.expression.Compatibility.areAssignmentCompatible;
@@ -47,7 +46,7 @@ public static boolean isInjectionCompatible(Class<?> targetJavaType, List<String
 	}
 
 	private static boolean checkArgument(Class<?> targetJavaType, BeanInfo beanInfo, String alias, Class<?> argType) {
-		for ( PropertyDescriptor propertyDescriptor : beanInfo.getPropertyDescriptors() ) {
+		for ( var propertyDescriptor : beanInfo.getPropertyDescriptors() ) {
 			if ( propertyMatches( alias, argType, propertyDescriptor ) ) {
 				return true;
 			}
@@ -63,7 +62,7 @@ public static boolean isConstructorCompatible(Class<?> javaClass, List<Class<?>>
 			Class<T> type,
 			List<Class<?>> argumentTypes,
 			TypeConfiguration typeConfiguration) {
-		for ( final Constructor<?> constructor : type.getDeclaredConstructors() ) {
+		for ( var constructor : type.getDeclaredConstructors() ) {
 			if ( isConstructorCompatible( constructor, argumentTypes, typeConfiguration ) ) {
 				//noinspection unchecked
 				return (Constructor<T>) constructor;
@@ -79,12 +78,12 @@ public static boolean isConstructorCompatible(
 		final var genericParameterTypes = constructor.getGenericParameterTypes();
 		if ( genericParameterTypes.length == argumentTypes.size() ) {
 			for (int i = 0; i < argumentTypes.size(); i++ ) {
-				final Type parameterType = genericParameterTypes[i];
+				final var parameterType = genericParameterTypes[i];
 				final var argumentType = argumentTypes.get( i );
 				final var type =
 						parameterType instanceof Class<?> classParameter
 								? classParameter
-								: typeConfiguration.getJavaTypeRegistry().getDescriptor( parameterType )
+								: typeConfiguration.getJavaTypeRegistry().resolveDescriptor( parameterType )
 										.getJavaTypeClass();
 				if ( !areAssignmentCompatible( type, argumentType ) ) {
 					if ( LOG.isDebugEnabled() ) {
@@ -107,7 +106,7 @@ public static boolean isConstructorCompatible(
 
 	static Field findField(Class<?> declaringClass, String name, Class<?> javaType) {
 		try {
-			final Field field = declaringClass.getDeclaredField( name );
+			final var field = declaringClass.getDeclaredField( name );
 			// field should never be null
 			if ( areAssignmentCompatible( field.getType(), javaType ) ) {
 				field.setAccessible( true );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java
index b0e9165b2d3f..1d69595866b5 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java
@@ -185,6 +185,9 @@ private static void addCollectionToCache(
 
 		// CollectionRegionAccessStrategy has no update, so avoid putting uncommitted data via putFromLoad
 		if ( isPutFromLoad( context, collectionDescriptor, entry ) ) {
+			final boolean minimalPutsEnabled =
+					factory.getSessionFactoryOptions().isMinimalPutsEnabled()
+							&& session.getCacheMode() != CacheMode.REFRESH;
 			final var eventListenerManager = session.getEventListenerManager();
 			final var eventMonitor = session.getEventMonitor();
 			final var cachePutEvent = eventMonitor.beginCachePutEvent();
@@ -196,8 +199,7 @@ private static void addCollectionToCache(
 						cacheKey,
 						collectionDescriptor.getCacheEntryStructure().structure( entry ),
 						version,
-						factory.getSessionFactoryOptions().isMinimalPutsEnabled()
-						&& session.getCacheMode() != CacheMode.REFRESH
+						minimalPutsEnabled
 				);
 			}
 			finally {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java
index 98022bb87422..6278cfd8d18f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/SqlSelectionImpl.java
@@ -19,25 +19,19 @@
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.java.JavaType;
 
-/**
- * @asciidoc
- *
- * ```
- * @Entity
- * class MyEntity {
- *     ...
- *     @Column ( name = "the_column", ... )
- *     public String getTheColumn() { ... }
- *
- *     @Convert ( ... )
- *     @Column ( name = "the_column", ... )
- *     ConvertedType getTheConvertedColumn() { ... }
- *
- * }
- * ```
- *
- * @author Steve Ebersole
- */
+/// ```
+/// @Entity
+/// class MyEntity {
+///     ...
+///     @Column ( name = "the_column", ... )
+///     public String getTheColumn() { ... }
+///     @Convert ( ... )
+///     @Column ( name = "the_column", ... )
+///     ConvertedType getTheConvertedColumn() { ... }
+/// }
+/// ```
+///
+/// @author Steve Ebersole
 public class SqlSelectionImpl implements SqlSelection, SqlExpressionAccess {
 	private final int jdbcPosition;
 	private final int valuesArrayPosition;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java
index d7da510ce28d..8041e9581a8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardEntityGraphTraversalStateImpl.java
@@ -56,32 +56,41 @@ public TraversalResult traverse(FetchParent fetchParent, Fetchable fetchable, bo
 
 		final GraphImplementor<?> previousContextRoot = currentGraphContext;
 		final AttributeNodeImplementor<?,?,?> attributeNode = appliesTo( fetchParent )
-				? currentGraphContext.findAttributeNode( fetchable.getFetchableName() )
+				? currentGraphContext.findNode( fetchable.getFetchableName() )
 				: null;
 
 		currentGraphContext = null;
 		final FetchStrategy fetchStrategy;
 		if ( attributeNode != null ) {
-			fetchStrategy = new FetchStrategy( FetchTiming.IMMEDIATE, true );
-			final Map<? extends Class<?>, ? extends SubGraphImplementor<?>> subgraphMap;
-			final Class<?> subgraphMapKey;
-			if ( fetchable instanceof PluralAttributeMapping pluralAttributeMapping ) {
-				if ( exploreKeySubgraph ) {
-					subgraphMap = attributeNode.getKeySubGraphs();
-					subgraphMapKey = getEntityCollectionPartJavaClass( pluralAttributeMapping.getIndexDescriptor() );
+			if ( attributeNode.isRemoved() ) {
+				fetchStrategy = graphSemantic == GraphSemantic.LOAD
+						? new FetchStrategy( FetchTiming.DELAYED, false )
+						: null;
+			}
+			else {
+				fetchStrategy = new FetchStrategy( FetchTiming.IMMEDIATE, true );
+				final Map<? extends Class<?>, ? extends SubGraphImplementor<?>> subgraphMap;
+				final Class<?> subgraphMapKey;
+				if ( fetchable instanceof PluralAttributeMapping pluralAttributeMapping ) {
+					if ( exploreKeySubgraph ) {
+						subgraphMap = attributeNode.getKeySubGraphs();
+						subgraphMapKey = getEntityCollectionPartJavaClass(
+								pluralAttributeMapping.getIndexDescriptor() );
+					}
+					else {
+						subgraphMap = attributeNode.getSubGraphs();
+						subgraphMapKey = getEntityCollectionPartJavaClass(
+								pluralAttributeMapping.getElementDescriptor() );
+					}
 				}
 				else {
+					assert !exploreKeySubgraph;
 					subgraphMap = attributeNode.getSubGraphs();
-					subgraphMapKey = getEntityCollectionPartJavaClass( pluralAttributeMapping.getElementDescriptor() );
+					subgraphMapKey = fetchable.getJavaType().getJavaTypeClass();
+				}
+				if ( subgraphMap != null && subgraphMapKey != null ) {
+					currentGraphContext = subgraphMap.get( subgraphMapKey );
 				}
-			}
-			else {
-				assert !exploreKeySubgraph;
-				subgraphMap = attributeNode.getSubGraphs();
-				subgraphMapKey = fetchable.getJavaType().getJavaTypeClass();
-			}
-			if ( subgraphMap != null && subgraphMapKey != null ) {
-				currentGraphContext = subgraphMap.get( subgraphMapKey );
 			}
 		}
 		else if ( graphSemantic == GraphSemantic.FETCH ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java
index 5b9901f60ca2..4499d498a896 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java
@@ -13,7 +13,6 @@
 import org.hibernate.sql.results.graph.DomainResultAssembler;
 import org.hibernate.sql.results.graph.Initializer;
 import org.hibernate.sql.results.graph.InitializerData;
-import org.hibernate.sql.results.graph.entity.EntityInitializer;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingResolution;
 import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
 import org.hibernate.sql.results.spi.RowReader;
@@ -25,7 +24,6 @@
 /**
  * @author Steve Ebersole
  */
-@SuppressWarnings("rawtypes")
 public class StandardRowReader<T> implements RowReader<T> {
 	private final DomainResultAssembler<?>[] resultAssemblers;
 	private final Initializer<InitializerData>[] resultInitializers;
@@ -36,7 +34,7 @@ public class StandardRowReader<T> implements RowReader<T> {
 	private final InitializerData[] sortedForResolveInstanceData;
 	private final boolean hasCollectionInitializers;
 	private final @Nullable RowTransformer<T> rowTransformer;
-	private final Class<T> domainResultJavaType;
+	private final @Nullable Class<T> domainResultJavaType;
 
 	private final ComponentType componentType;
 	private final Class<?> resultElementClass;
@@ -44,7 +42,7 @@ public class StandardRowReader<T> implements RowReader<T> {
 	public StandardRowReader(
 			JdbcValuesMappingResolution jdbcValuesMappingResolution,
 			RowTransformer<T> rowTransformer,
-			Class<T> domainResultJavaType) {
+			@Nullable Class<T> domainResultJavaType) {
 		this(
 				jdbcValuesMappingResolution.getDomainResultAssemblers(),
 				jdbcValuesMappingResolution.getResultInitializers(),
@@ -63,7 +61,7 @@ public StandardRowReader(
 			Initializer<?>[] sortedForResolveInitializers,
 			boolean hasCollectionInitializers,
 			RowTransformer<T> rowTransformer,
-			Class<T> domainResultJavaType) {
+			@Nullable Class<T> domainResultJavaType) {
 		this.resultAssemblers = resultAssemblers;
 		this.resultInitializers = (Initializer<InitializerData>[]) resultInitializers;
 		this.resultInitializersData = new InitializerData[resultInitializers.length];
@@ -72,11 +70,12 @@ public StandardRowReader(
 		this.sortedForResolveInstance = (Initializer<InitializerData>[]) sortedForResolveInitializers;
 		this.sortedForResolveInstanceData = new InitializerData[sortedForResolveInstance.length];
 		this.hasCollectionInitializers = hasCollectionInitializers;
-		this.rowTransformer = rowTransformer == RowTransformerArrayImpl.instance() && resultAssemblers.length != 1
+		this.rowTransformer =
+				rowTransformer == RowTransformerArrayImpl.instance() && resultAssemblers.length != 1
 				|| rowTransformer == RowTransformerStandardImpl.instance()
 				|| rowTransformer == RowTransformerSingularReturnImpl.instance() && resultAssemblers.length == 1
-				? null
-				: rowTransformer;
+					? null
+					: rowTransformer;
 		this.domainResultJavaType = domainResultJavaType;
 		if ( domainResultJavaType == null
 				|| domainResultJavaType == Object[].class
@@ -100,8 +99,8 @@ public Class<T> getDomainResultResultJavaType() {
 
 	@Override
 	public List<@Nullable JavaType<?>> getResultJavaTypes() {
-		List<JavaType<?>> javaTypes = new ArrayList<>( resultAssemblers.length );
-		for ( DomainResultAssembler resultAssembler : resultAssemblers ) {
+		final List<JavaType<?>> javaTypes = new ArrayList<>( resultAssemblers.length );
+		for ( var resultAssembler : resultAssemblers ) {
 			javaTypes.add( resultAssembler.getAssembledJavaType() );
 		}
 		return javaTypes;
@@ -114,15 +113,18 @@ public int getInitializerCount() {
 
 	@Override
 	public @Nullable EntityKey resolveSingleResultEntityKey(RowProcessingState rowProcessingState) {
-		final EntityInitializer<?> entityInitializer = resultInitializers.length == 0
-				? null
-				: resultInitializers[0].asEntityInitializer();
+		final var entityInitializer =
+				resultInitializers.length == 0
+						? null
+						: resultInitializers[0].asEntityInitializer();
 		if ( entityInitializer == null ) {
 			return null;
 		}
-		final EntityKey entityKey = entityInitializer.resolveEntityKeyOnly( rowProcessingState );
-		finishUpRow();
-		return entityKey;
+		else {
+			final var entityKey = entityInitializer.resolveEntityKeyOnly( rowProcessingState );
+			finishUpRow();
+			return entityKey;
+		}
 	}
 
 	@Override
@@ -131,36 +133,34 @@ public boolean hasCollectionInitializers() {
 	}
 
 	@Override
-	@AllowReflection
 	public T readRow(RowProcessingState rowProcessingState) {
-		coordinateInitializers( rowProcessingState );
+		coordinateInitializers();
+		final T result = getResult( rowProcessingState );
+		finishUpRow();
+		return result;
+	}
 
-		final T result;
+	@AllowReflection
+	@SuppressWarnings("unchecked")
+	private T getResult(RowProcessingState rowProcessingState) {
 		if ( componentType != ComponentType.OBJECT ) {
-			result = readPrimitiveRow( rowProcessingState );
+			return (T) readPrimitiveRow( rowProcessingState );
+		}
+		else if ( resultAssemblers.length == 1 && rowTransformer == null ) {
+			return (T) resultAssemblers[0].assemble( rowProcessingState );
 		}
 		else {
-			if ( resultAssemblers.length == 1 && rowTransformer == null ) {
-				//noinspection unchecked
-				result = (T) resultAssemblers[0].assemble( rowProcessingState );
-			}
-			else {
-				final Object[] resultRow = (Object[]) Array.newInstance( resultElementClass, resultAssemblers.length );
-				for ( int i = 0; i < resultAssemblers.length; i++ ) {
-					resultRow[i] = resultAssemblers[i].assemble( rowProcessingState );
-				}
-				//noinspection unchecked
-				result = rowTransformer == null
-						? (T) resultRow
-						: rowTransformer.transformRow( resultRow );
+			final var resultRow = (Object[]) Array.newInstance( resultElementClass, resultAssemblers.length );
+			for ( int i = 0; i < resultAssemblers.length; i++ ) {
+				resultRow[i] = resultAssemblers[i].assemble( rowProcessingState );
 			}
+			return rowTransformer == null
+					? (T) resultRow
+					: rowTransformer.transformRow( resultRow );
 		}
-
-		finishUpRow();
-		return result;
 	}
 
-	private T readPrimitiveRow(RowProcessingState rowProcessingState) {
+	private Object readPrimitiveRow(RowProcessingState rowProcessingState) {
 		// The following is ugly, but unfortunately necessary to not hurt performance.
 		// This implementation was micro-benchmarked and discussed with Francesco Nigro,
 		// who hinted that using this style instead of the reflective Array.getLength(), Array.set()
@@ -171,61 +171,61 @@ private T readPrimitiveRow(RowProcessingState rowProcessingState) {
 				for ( int i = 0; i < resultAssemblers.length; i++ ) {
 					resultBooleanRow[i] = (boolean) resultAssemblers[i].assemble( rowProcessingState );
 				}
-				return (T) resultBooleanRow;
+				return resultBooleanRow;
 			case BYTE:
 				final byte[] resultByteRow = new byte[resultAssemblers.length];
 				for ( int i = 0; i < resultAssemblers.length; i++ ) {
 					resultByteRow[i] = (byte) resultAssemblers[i].assemble( rowProcessingState );
 				}
-				return (T) resultByteRow;
+				return resultByteRow;
 			case CHAR:
 				final char[] resultCharRow = new char[resultAssemblers.length];
 				for ( int i = 0; i < resultAssemblers.length; i++ ) {
 					resultCharRow[i] = (char) resultAssemblers[i].assemble( rowProcessingState );
 				}
-				return (T) resultCharRow;
+				return resultCharRow;
 			case SHORT:
 				final short[] resultShortRow = new short[resultAssemblers.length];
 				for ( int i = 0; i < resultAssemblers.length; i++ ) {
 					resultShortRow[i] = (short) resultAssemblers[i].assemble( rowProcessingState );
 				}
-				return (T) resultShortRow;
+				return resultShortRow;
 			case INT:
 				final int[] resultIntRow = new int[resultAssemblers.length];
 				for ( int i = 0; i < resultAssemblers.length; i++ ) {
 					resultIntRow[i] = (int) resultAssemblers[i].assemble( rowProcessingState );
 				}
-				return (T) resultIntRow;
+				return resultIntRow;
 			case LONG:
 				final long[] resultLongRow = new long[resultAssemblers.length];
 				for ( int i = 0; i < resultAssemblers.length; i++ ) {
 					resultLongRow[i] = (long) resultAssemblers[i].assemble( rowProcessingState );
 				}
-				return (T) resultLongRow;
+				return resultLongRow;
 			case FLOAT:
 				final float[] resultFloatRow = new float[resultAssemblers.length];
 				for ( int i = 0; i < resultAssemblers.length; i++ ) {
 					resultFloatRow[i] = (float) resultAssemblers[i].assemble( rowProcessingState );
 				}
-				return (T) resultFloatRow;
+				return resultFloatRow;
 			case DOUBLE:
 				final double[] resultDoubleRow = new double[resultAssemblers.length];
 				for ( int i = 0; i < resultAssemblers.length; i++ ) {
 					resultDoubleRow[i] = (double) resultAssemblers[i].assemble( rowProcessingState );
 				}
-				return (T) resultDoubleRow;
+				return resultDoubleRow;
 			default:
 				throw new AssertionError( "Object should be handled specially" );
 		}
 	}
 
 	private void finishUpRow() {
-		for ( InitializerData data : initializersData ) {
+		for ( var data : initializersData ) {
 			data.setState( Initializer.State.UNINITIALIZED );
 		}
 	}
 
-	private void coordinateInitializers(RowProcessingState rowProcessingState) {
+	private void coordinateInitializers() {
 		for ( int i = 0; i < resultInitializers.length; i++ ) {
 			resultInitializers[i].resolveKey( resultInitializersData[i] );
 		}
@@ -244,7 +244,7 @@ private void coordinateInitializers(RowProcessingState rowProcessingState) {
 	@Override
 	public void startLoading(RowProcessingState processingState) {
 		for ( int i = 0; i < resultInitializers.length; i++ ) {
-			final Initializer<?> initializer = resultInitializers[i];
+			final var initializer = resultInitializers[i];
 			initializer.startLoading( processingState );
 			resultInitializersData[i] = initializer.getData( processingState );
 		}
@@ -305,7 +305,9 @@ else if ( resultType == float[].class) {
 			else if ( resultType == double[].class) {
 				return DOUBLE;
 			}
-			return OBJECT;
+			else {
+				return OBJECT;
+			}
 		}
 
 		public Class<?> getComponentType() {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java
index 2409c6c0d353..d47d6692e7b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleImpl.java
@@ -6,11 +6,13 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import jakarta.persistence.Tuple;
 import jakarta.persistence.TupleElement;
 
-import static org.hibernate.internal.util.type.PrimitiveWrapperHelper.getDescriptorByPrimitiveType;
+import static org.hibernate.internal.util.type.PrimitiveWrappers.cast;
+import static org.hibernate.internal.util.type.PrimitiveWrappers.isInstance;
 
 /**
  * Implementation of the JPA Tuple contract
@@ -27,7 +29,6 @@ public TupleImpl(TupleMetadata tupleMetadata, Object[] row) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X get(TupleElement<X> tupleElement) {
 		final Integer index = tupleMetadata.get( tupleElement );
 		if ( index == null ) {
@@ -36,15 +37,14 @@ public <X> X get(TupleElement<X> tupleElement) {
 			);
 		}
 		// index should be "in range" by nature of size check in ctor
-		return (X) row[index];
+		return cast( tupleElement.getJavaType(), row[index] );
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X get(String alias, Class<X> type) {
 		final Object untyped = get( alias );
 		if ( untyped != null ) {
-			if ( !elementTypeMatches( type, untyped ) ) {
+			if ( !isInstance( type, untyped ) ) {
 				throw new IllegalArgumentException(
 						String.format(
 								"Requested tuple value [alias=%s, value=%s] cannot be assigned to requested type [%s]",
@@ -55,12 +55,12 @@ public <X> X get(String alias, Class<X> type) {
 				);
 			}
 		}
-		return (X) untyped;
+		return cast( type, untyped );
 	}
 
 	@Override
 	public Object get(String alias) {
-		Integer index = tupleMetadata.get( alias );
+		final Integer index = tupleMetadata.get( alias );
 		if ( index == null ) {
 			throw new IllegalArgumentException(
 					"Given alias [" + alias + "] did not correspond to an element in the result tuple"
@@ -71,10 +71,9 @@ public Object get(String alias) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X get(int i, Class<X> type) {
 		final Object result = get( i );
-		if ( result != null && !elementTypeMatches( type, result ) ) {
+		if ( result != null && !isInstance( type, result ) ) {
 			throw new IllegalArgumentException(
 					String.format(
 							"Requested tuple value [index=%s, realType=%s] cannot be assigned to requested type [%s]",
@@ -84,7 +83,7 @@ public <X> X get(int i, Class<X> type) {
 					)
 			);
 		}
-		return (X) result;
+		return cast( type, result );
 	}
 
 	@Override
@@ -97,11 +96,6 @@ public Object get(int i) {
 		return row[i];
 	}
 
-	private <X> boolean elementTypeMatches(Class<X> type, Object untyped) {
-		return type.isInstance( untyped )
-			|| type.isPrimitive() && getDescriptorByPrimitiveType( type ).getWrapperClass().isInstance( untyped );
-	}
-
 	@Override
 	public Object[] toArray() {
 		return row;
@@ -116,4 +110,17 @@ public List<TupleElement<?>> getElements() {
 	public String toString() {
 		return Arrays.toString( row );
 	}
+
+	@Override
+	public boolean equals(Object obj) {
+		return obj instanceof TupleImpl that
+			&& Objects.equals( tupleMetadata.getAliases(),
+				that.tupleMetadata.getAliases() )
+			&& Arrays.equals( this.row, that.row );
+	}
+
+	@Override
+	public int hashCode() {
+		return Arrays.hashCode( row );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java
index f824e69e2cdd..c784f2d373f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/TupleMetadata.java
@@ -22,6 +22,7 @@
 public final class TupleMetadata {
 	private final TupleElement<?>[] elements;
 	private final String[] aliases;
+	private List<String> aliasList;
 	private Map<String, Integer> nameIndex;
 	private Map<TupleElement<?>, Integer> elementIndex;
 	private List<TupleElement<?>> list;
@@ -59,4 +60,11 @@ public List<TupleElement<?>> getList() {
 		}
 		return list;
 	}
+
+	public List<String> getAliases() {
+		if ( aliasList != null ) {
+			aliasList = List.of( aliases );
+		}
+		return aliasList;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractJdbcValues.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractJdbcValues.java
index 26f6f835cdcf..1433fa7383e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractJdbcValues.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractJdbcValues.java
@@ -21,9 +21,9 @@ public final boolean next(RowProcessingState rowProcessingState) {
 
 	@Override
 	public boolean previous(RowProcessingState rowProcessingState) {
-		// NOTE : we do not even bother interacting with the query-cache put manager because
-		//		this method is implicitly related to scrolling and caching of scrolled results
-		//		is not supported
+		// NOTE: we do not even bother interacting with the query-cache put manager because
+		//		 this method is implicitly related to scrolling and caching of scrolled results
+		//		 is not supported
 		return processPrevious( rowProcessingState );
 	}
 
@@ -31,9 +31,9 @@ public boolean previous(RowProcessingState rowProcessingState) {
 
 	@Override
 	public boolean scroll(int numberOfRows, RowProcessingState rowProcessingState) {
-		// NOTE : we do not even bother interacting with the query-cache put manager because
-		//		this method is implicitly related to scrolling and caching of scrolled results
-		//		is not supported
+		// NOTE: we do not even bother interacting with the query-cache put manager because
+		//		 this method is implicitly related to scrolling and caching of scrolled results
+		//		 is not supported
 		return processScroll( numberOfRows, rowProcessingState );
 	}
 
@@ -41,9 +41,9 @@ public boolean scroll(int numberOfRows, RowProcessingState rowProcessingState) {
 
 	@Override
 	public boolean position(int position, RowProcessingState rowProcessingState) {
-		// NOTE : we do not even bother interacting with the query-cache put manager because
-		//		this method is implicitly related to scrolling and caching of scrolled results
-		//		is not supported
+		// NOTE: we do not even bother interacting with the query-cache put manager because
+		//		 this method is implicitly related to scrolling and caching of scrolled results
+		//		 is not supported
 		return processPosition( position, rowProcessingState );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java
index 99184c081997..2154f395915c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java
@@ -17,7 +17,6 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
-import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.spi.TypeConfiguration;
 
 /**
@@ -108,27 +107,28 @@ public int getResultCountEstimate() {
 	@Override
 	public <J> BasicType<J> resolveType(int position, JavaType<J> explicitJavaType, TypeConfiguration typeConfiguration) {
 		try {
-			final ResultSetMetaData metaData = getResultSetMetaData();
-			final JdbcTypeRegistry registry = typeConfiguration.getJdbcTypeRegistry();
+			final var metaData = getResultSetMetaData();
+			final var registry = typeConfiguration.getJdbcTypeRegistry();
 			final String columnTypeName = metaData.getColumnTypeName( position );
 			final int columnType = metaData.getColumnType( position );
 			final int scale = metaData.getScale( position );
 			final int precision = metaData.getPrecision( position );
 			final int displaySize = metaData.getColumnDisplaySize( position );
-			final Dialect dialect = getDialect();
+			final var dialect = getDialect();
 			final int length = dialect.resolveSqlTypeLength( columnTypeName, columnType, precision, scale, displaySize );
-			final JdbcType resolvedJdbcType =
+			final var resolvedJdbcType =
 					dialect.resolveSqlTypeDescriptor( columnTypeName, columnType, length, scale, registry );
-			final JdbcType jdbcType =
+			final var jdbcType =
 					explicitJavaType == null
 							? resolvedJdbcType
 							: jdbcType( explicitJavaType, resolvedJdbcType, length, precision, scale, typeConfiguration );
 			// If there is an explicit JavaType, then prefer its recommended JDBC type
-			final JavaType<J> javaType =
+			final var javaType =
 					explicitJavaType == null
-							? jdbcType.getJdbcRecommendedJavaTypeMapping( length, scale, typeConfiguration )
+							? jdbcType.getRecommendedJavaType( length, scale, typeConfiguration )
 							: explicitJavaType;
-			return typeConfiguration.getBasicTypeRegistry().resolve( javaType, jdbcType );
+			return typeConfiguration.getBasicTypeRegistry()
+					.resolve( (JavaType<J>) javaType, jdbcType );
 		}
 		catch (SQLException e) {
 			throw getSqlExceptionHelper()
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/CachedJdbcValuesMetadata.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/CachedJdbcValuesMetadata.java
index ba45c9873eb1..dd8114f1dd0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/CachedJdbcValuesMetadata.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/CachedJdbcValuesMetadata.java
@@ -6,19 +6,30 @@
 
 import java.io.Serializable;
 
-import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 
+
 public final class CachedJdbcValuesMetadata implements JdbcValuesMetadata, Serializable {
 	private final String[] columnNames;
 	private final BasicType<?>[] types;
+	private final int[] valueIndexesToCacheIndexes;
 
-	public CachedJdbcValuesMetadata(String[] columnNames, BasicType<?>[] types) {
+	public CachedJdbcValuesMetadata(String[] columnNames, BasicType<?>[] types, int[] valueIndexesToCacheIndexes) {
 		this.columnNames = columnNames;
 		this.types = types;
+		this.valueIndexesToCacheIndexes = valueIndexesToCacheIndexes;
+	}
+
+	public int[] getValueIndexesToCacheIndexes() {
+		return valueIndexesToCacheIndexes;
+	}
+
+	public JavaType<?> getStoredJavaType(int columnIndex) {
+		final var type = types[columnIndex];
+		return type != null ? type.getJavaTypeDescriptor() : null;
 	}
 
 	@Override
@@ -28,18 +39,19 @@ public int getColumnCount() {
 
 	@Override
 	public int resolveColumnPosition(String columnName) {
-		final int position = ArrayHelper.indexOf( columnNames, columnName ) + 1;
-		if ( position == 0 ) {
-			throw new IllegalStateException( "Unexpected resolving of unavailable column: " + columnName );
+		for ( int i = 0; i < columnNames.length; i++ ) {
+			if ( columnName.equalsIgnoreCase( columnNames[i] ) ) {
+				return i + 1;
+			}
 		}
-		return position;
+		throw new CacheMetadataIncompleteException( "Column unavailable with name: " + columnName );
 	}
 
 	@Override
 	public String resolveColumnName(int position) {
 		final String name = columnNames[position - 1];
 		if ( name == null ) {
-			throw new IllegalStateException( "Unexpected resolving of unavailable column at position: " + position );
+			throw new CacheMetadataIncompleteException( "Column unavailable at position: " + position );
 		}
 		return name;
 	}
@@ -49,19 +61,26 @@ public <J> BasicType<J> resolveType(
 			int position,
 			JavaType<J> explicitJavaType,
 			TypeConfiguration typeConfiguration) {
-		final BasicType<?> type = types[position - 1];
+		final var type = types[position - 1];
 		if ( type == null ) {
-			throw new IllegalStateException( "Unexpected resolving of unavailable column at position: " + position );
+			throw new CacheMetadataIncompleteException( "Column unavailable at position: " + position );
 		}
 		if ( explicitJavaType == null || type.getJavaTypeDescriptor() == explicitJavaType ) {
 			//noinspection unchecked
 			return (BasicType<J>) type;
 		}
 		else {
-			return typeConfiguration.getBasicTypeRegistry().resolve(
-					explicitJavaType,
-					type.getJdbcType()
-			);
+			return typeConfiguration.getBasicTypeRegistry()
+					.resolve( explicitJavaType, type.getJdbcType() );
+		}
+	}
+
+	/**
+	 * Thrown when the cached metadata does not contain information for a requested column
+	 */
+	public static class CacheMetadataIncompleteException extends RuntimeException {
+		public CacheMetadataIncompleteException(String message) {
+			super( message );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java
index fde5c29cf3ce..4e5fc5ac2bbd 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java
@@ -4,19 +4,13 @@
  */
 package org.hibernate.sql.results.jdbc.internal;
 
-import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.pagination.NoopLimitHandler;
-import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
-import org.hibernate.engine.spi.SessionEventListenerManager;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.event.monitor.spi.DiagnosticEvent;
-import org.hibernate.event.monitor.spi.EventMonitor;
 import org.hibernate.query.spi.Limit;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.resource.jdbc.spi.JdbcSessionContext;
@@ -62,7 +56,7 @@ public DeferredResultSetAccess(
 			JdbcSelectExecutor.StatementCreator statementCreator,
 			int resultCountEstimate) {
 		super( executionContext.getSession() );
-		final JdbcServices jdbcServices = executionContext.getSession().getJdbcServices();
+		final var jdbcServices = executionContext.getSession().getJdbcServices();
 
 		this.jdbcParameterBindings = jdbcParameterBindings;
 		this.executionContext = executionContext;
@@ -71,7 +65,7 @@ public DeferredResultSetAccess(
 		this.sqlStatementLogger = jdbcServices.getSqlStatementLogger();
 		this.resultCountEstimate = resultCountEstimate;
 
-		final QueryOptions queryOptions = executionContext.getQueryOptions();
+		final var queryOptions = executionContext.getQueryOptions();
 		if ( queryOptions == null ) {
 			finalSql = jdbcSelect.getSqlString();
 			limit = null;
@@ -80,41 +74,54 @@ public DeferredResultSetAccess(
 		else {
 			// Note that limit and lock aren't set for SQM as that is applied during SQL rendering
 			// But for native queries, we have to adapt the SQL string
-			final Dialect dialect = jdbcServices.getDialect();
+			final var dialect = jdbcServices.getDialect();
 
 			final String sql = jdbcSelect.getSqlString();
 
 			limit = queryOptions.getLimit();
 			final boolean needsLimitHandler = needsLimitHandler( jdbcSelect );
 			limitHandler = needsLimitHandler ? dialect.getLimitHandler() : NoopLimitHandler.NO_LIMIT;
-			final String sqlWithLimit = !needsLimitHandler ? sql : limitHandler.processSql(
-					sql,
-					jdbcParameterBindings.getBindings().size(),
-					jdbcServices.getParameterMarkerStrategy(),
-					queryOptions
-			);
+			final String sqlWithLimit =
+					needsLimitHandler
+							? sqlWithLimit( jdbcParameterBindings, sql, jdbcServices, queryOptions )
+							: sql;
+
+			final String sqlWithLocking =
+					sqlWithLocking( jdbcSelect.getLockStrategy(), sqlWithLimit, queryOptions, dialect );
+
+			finalSql =
+					dialect.addSqlHintOrComment( sqlWithLocking, queryOptions,
+							executionContext.getSession().getFactory()
+									.getSessionFactoryOptions().isCommentsEnabled() );
+		}
+	}
 
-			final var lockOptions = queryOptions.getLockOptions();
-			final var jdbcLockStrategy = jdbcSelect.getLockStrategy();
-			final String sqlWithLocking;
-			if ( hasLocking( jdbcLockStrategy, lockOptions ) ) {
-				final boolean usesFollowOnLocking = useFollowOnLocking( jdbcLockStrategy, sqlWithLimit, queryOptions, lockOptions, dialect );
-				if ( usesFollowOnLocking ) {
-					sqlWithLocking = sqlWithLimit;
-				}
-				else {
-					sqlWithLocking = dialect.applyLocksToSql( sqlWithLimit, lockOptions, emptyMap() );
-				}
-			}
-			else {
-				sqlWithLocking = sqlWithLimit;
-			}
+	private String sqlWithLimit(
+			JdbcParameterBindings jdbcParameterBindings,
+			String sql,
+			JdbcServices jdbcServices,
+			QueryOptions queryOptions) {
+		return limitHandler.processSql(
+				sql,
+				jdbcParameterBindings.getBindings().size(),
+				jdbcServices.getParameterMarkerStrategy(),
+				queryOptions
+		);
+	}
 
-			final boolean commentsEnabled = executionContext.getSession()
-					.getFactory()
-					.getSessionFactoryOptions()
-					.isCommentsEnabled();
-			finalSql = dialect.addSqlHintOrComment( sqlWithLocking, queryOptions, commentsEnabled );
+	private static String sqlWithLocking(
+			JdbcLockStrategy jdbcLockStrategy,
+			String sqlWithLimit,
+			QueryOptions queryOptions,
+			Dialect dialect) {
+		final var lockOptions = queryOptions.getLockOptions();
+		if ( hasLocking( jdbcLockStrategy, lockOptions ) ) {
+			return useFollowOnLocking( jdbcLockStrategy, sqlWithLimit, queryOptions, lockOptions, dialect )
+					? sqlWithLimit
+					: dialect.applyLocksToSql( sqlWithLimit, lockOptions, emptyMap() );
+		}
+		else {
+			return sqlWithLimit;
 		}
 	}
 
@@ -221,7 +228,7 @@ protected void bindParameters(PreparedStatement preparedStatement) throws SQLExc
 	}
 
 	private void setQueryOptions(PreparedStatement preparedStatement) throws SQLException {
-		final QueryOptions queryOptions = executionContext.getQueryOptions();
+		final var queryOptions = executionContext.getQueryOptions();
 		// set options
 		if ( queryOptions != null ) {
 			final Integer fetchSize = queryOptions.getFetchSize();
@@ -238,10 +245,10 @@ private void setQueryOptions(PreparedStatement preparedStatement) throws SQLExce
 	}
 
 	private void executeQuery() {
-		final LogicalConnectionImplementor logicalConnection =
+		final var logicalConnection =
 				getPersistenceContext().getJdbcCoordinator().getLogicalConnection();
 
-		final SharedSessionContractImplementor session = executionContext.getSession();
+		final var session = executionContext.getSession();
 		try {
 			CORE_LOGGER.tracef( "Executing query to retrieve ResultSet: %s", finalSql );
 			// prepare the query
@@ -249,18 +256,22 @@ private void executeQuery() {
 
 			bindParameters( preparedStatement );
 
-			final SessionEventListenerManager eventListenerManager = session.getEventListenerManager();
+			final var eventListenerManager = session.getEventListenerManager();
 			long executeStartNanos = 0;
 			if ( sqlStatementLogger.getLogSlowQuery() > 0 ) {
 				executeStartNanos = System.nanoTime();
 			}
-			final EventMonitor eventMonitor = session.getEventMonitor();
-			final DiagnosticEvent jdbcPreparedStatementExecutionEvent =
+			final var eventMonitor = session.getEventMonitor();
+			final var jdbcPreparedStatementExecutionEvent =
 					eventMonitor.beginJdbcPreparedStatementExecutionEvent();
 			try {
 				eventListenerManager.jdbcExecuteStatementStart();
 				resultSet = wrapResultSet( preparedStatement.executeQuery() );
 			}
+			catch (SQLException exception) {
+				session.getJdbcCoordinator().afterFailedStatementExecution( exception );
+				throw exception;
+			}
 			finally {
 				eventMonitor.completeJdbcPreparedStatementExecutionEvent( jdbcPreparedStatementExecutionEvent, finalSql );
 				eventListenerManager.jdbcExecuteStatementEnd();
@@ -320,14 +331,9 @@ protected ResultSet wrapResultSet(ResultSet resultSet) throws SQLException {
 		return resultSet;
 	}
 
-	protected LockMode determineFollowOnLockMode(LockOptions lockOptions) {
-		return lockOptions.getLockMode();
-	}
-
 	@Override
 	public void release() {
-		final JdbcCoordinator jdbcCoordinator =
-				getPersistenceContext().getJdbcCoordinator();
+		final var jdbcCoordinator = getPersistenceContext().getJdbcCoordinator();
 		final LogicalConnectionImplementor logicalConnection = jdbcCoordinator.getLogicalConnection();
 		if ( resultSet != null ) {
 			logicalConnection.getResourceRegistry().release( resultSet, preparedStatement );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DirectResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DirectResultSetAccess.java
index bc2a40a3f88a..8a589ff38565 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DirectResultSetAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DirectResultSetAccess.java
@@ -25,7 +25,9 @@ public DirectResultSetAccess(
 		this.resultSetSource = resultSetSource;
 		this.resultSet = resultSet;
 
-		persistenceContext.getJdbcCoordinator().getLogicalConnection().getResourceRegistry()
+		persistenceContext.getJdbcCoordinator()
+				.getLogicalConnection()
+				.getResourceRegistry()
 				.register( resultSet, resultSetSource );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesCacheHit.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesCacheHit.java
index 45c7f0a037a8..75fc4f52873c 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesCacheHit.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesCacheHit.java
@@ -20,6 +20,7 @@ public class JdbcValuesCacheHit extends AbstractJdbcValues {
 	private final int numberOfRows;
 	private final JdbcValuesMapping resolvedMapping;
 	private final int[] valueIndexesToCacheIndexes;
+	private final boolean cacheCompatible;
 	private final int offset;
 	private final int resultCount;
 	private int position = -1;
@@ -27,56 +28,95 @@ public class JdbcValuesCacheHit extends AbstractJdbcValues {
 	public JdbcValuesCacheHit(List<?> cachedResults, JdbcValuesMapping resolvedMapping) {
 		// See QueryCachePutManagerEnabledImpl for what is being put into the cached results
 		this.cachedResults = cachedResults;
-		this.offset = !cachedResults.isEmpty() && cachedResults.get( 0 ) instanceof CachedJdbcValuesMetadata ? 1 : 0;
+		final CachedJdbcValuesMetadata metadata = !cachedResults.isEmpty()
+				&& cachedResults.get( 0 ) instanceof CachedJdbcValuesMetadata cachedMetadata
+						? cachedMetadata
+						: null;
+		this.offset = metadata != null ? 1 : 0;
 		this.numberOfRows = cachedResults.size() - offset - 1;
 		this.resultCount = cachedResults.isEmpty() ? 0 : (int) cachedResults.get( cachedResults.size() - 1 );
 		this.resolvedMapping = resolvedMapping;
-		this.valueIndexesToCacheIndexes = resolvedMapping.getValueIndexesToCacheIndexes();
+		if ( metadata != null ) {
+			this.cacheCompatible = isCacheCompatible( resolvedMapping, metadata );
+			this.valueIndexesToCacheIndexes = metadata.getValueIndexesToCacheIndexes();
+		}
+		else {
+			this.cacheCompatible = true;
+			this.valueIndexesToCacheIndexes = resolvedMapping.getValueIndexesToCacheIndexes();
+		}
+	}
+
+	/**
+	 * Checks whether the cached data is compatible with the reader's mapping,
+	 * by verifying that the Java types of cached values match the reader's expected types.
+	 *
+	 * @param resolvedMapping the current result type's mapping
+	 * @param metadata the cached metadata containing stored Java types
+	 */
+	private static boolean isCacheCompatible(
+			JdbcValuesMapping resolvedMapping,
+			CachedJdbcValuesMetadata metadata) {
+		for ( var selection : resolvedMapping.getSqlSelections() ) {
+			final int valueIndex = selection.getValuesArrayPosition();
+			final var storedJavaType = metadata.getStoredJavaType( valueIndex );
+			if ( storedJavaType == null
+					|| selection.getExpressionType().getSingleJdbcMapping().getJavaTypeDescriptor() != storedJavaType ) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Returns whether the cached data is compatible with the resolved mapping.
+	 * When {@code false}, the cache entry was populated by a query with a different
+	 * result type that either cached different columns or used incompatible Java types,
+	 * and needs to be re-populated.
+	 */
+	public boolean isCacheCompatible() {
+		return cacheCompatible;
 	}
 
 	@Override
 	protected boolean processNext(RowProcessingState rowProcessingState) {
-		// NOTE : explicitly skipping limit handling because the cached state ought
-		// 		already be the limited size since the cache key includes limits
-
+		// NOTE: explicitly skipping limit handling because the cached state ought
+		// 		 already be the limited size since the cache key includes limits
 		position++;
-
 		if ( position >= numberOfRows ) {
 			position = numberOfRows;
 			return false;
 		}
-
-		return true;
+		else {
+			return true;
+		}
 	}
 
 	@Override
 	protected boolean processPrevious(RowProcessingState rowProcessingState) {
-		// NOTE : explicitly skipping limit handling because the cached state ought
-		// 		already be the limited size since the cache key includes limits
-
+		// NOTE: explicitly skipping limit handling because the cached state ought
+		// 		 already be the limited size since the cache key includes limits
 		position--;
-
 		if ( position >= numberOfRows ) {
 			position = numberOfRows;
 			return false;
 		}
-
-		return true;
+		else {
+			return true;
+		}
 	}
 
 	@Override
 	protected boolean processScroll(int numberOfRows, RowProcessingState rowProcessingState) {
-		// NOTE : explicitly skipping limit handling because the cached state should
-		// 		already be the limited size since the cache key includes limits
-
+		// NOTE: explicitly skipping limit handling because the cached state should
+		// 		 already be the limited size since the cache key includes limits
 		position += numberOfRows;
-
 		if ( position >= this.numberOfRows ) {
 			position = this.numberOfRows;
 			return false;
 		}
-
-		return true;
+		else {
+			return true;
+		}
 	}
 
 	@Override
@@ -86,8 +126,8 @@ public int getPosition() {
 
 	@Override
 	protected boolean processPosition(int position, RowProcessingState rowProcessingState) {
-		// NOTE : explicitly skipping limit handling because the cached state should
-		// 		already be the limited size since the cache key includes limits
+		// NOTE: explicitly skipping limit handling because the cached state should
+		// 		 already be the limited size since the cache key includes limits
 
 		if ( position < 0 ) {
 			// we need to subtract it from `numberOfRows`
@@ -102,9 +142,10 @@ protected boolean processPosition(int position, RowProcessingState rowProcessing
 			this.position = numberOfRows;
 			return false;
 		}
-
-		this.position = position;
-		return true;
+		else {
+			this.position = position;
+			return true;
+		}
 	}
 
 	@Override
@@ -140,12 +181,9 @@ public void afterLast(RowProcessingState rowProcessingState) {
 
 	@Override
 	public boolean isLast(RowProcessingState rowProcessingState) {
-		if ( numberOfRows == 0 ) {
-			return position == 0;
-		}
-		else {
-			return position == numberOfRows - 1;
-		}
+		return numberOfRows == 0
+				? position == 0
+				: position == numberOfRows - 1;
 	}
 
 	@Override
@@ -154,9 +192,10 @@ public boolean last(RowProcessingState rowProcessingState) {
 			position = 0;
 			return false;
 		}
-
-		position = numberOfRows - 1;
-		return true;
+		else {
+			position = numberOfRows - 1;
+			return true;
+		}
 	}
 
 	@Override
@@ -176,9 +215,7 @@ public Object getCurrentRowValue(int valueIndex) {
 		}
 		final Object row = cachedResults.get( position + offset );
 		if ( row instanceof Object[] array ) {
-			return valueIndexesToCacheIndexes == null
-					? array[valueIndex]
-					: array[valueIndexesToCacheIndexes[valueIndex]];
+			return array[valueIndexesToCacheIndexes[valueIndex]];
 		}
 		else {
 			assert valueIndexesToCacheIndexes[valueIndex] == 0;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java
index a7af8c6dc243..5d7256703b43 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java
@@ -50,8 +50,8 @@ public JdbcValuesMapping resolve(
 		final List<SqlSelection> sqlSelections = resolvedMapping.getSqlSelections();
 		List<SqlSelection> resolvedSelections = null;
 		for ( int i = 0; i < sqlSelections.size(); i++ ) {
-			final SqlSelection sqlSelection = sqlSelections.get( i );
-			final SqlSelection resolvedSelection = sqlSelection.resolve( jdbcResultsMetadata, sessionFactory );
+			final var sqlSelection = sqlSelections.get( i );
+			final var resolvedSelection = sqlSelection.resolve( jdbcResultsMetadata, sessionFactory );
 			if ( resolvedSelection != sqlSelection ) {
 				if ( resolvedSelections == null ) {
 					resolvedSelections = new ArrayList<>( sqlSelections );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingResolutionImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingResolutionImpl.java
index fb54e6a4bdc6..2e7414d4ab93 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingResolutionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingResolutionImpl.java
@@ -22,7 +22,10 @@ public JdbcValuesMappingResolutionImpl(
 			DomainResultAssembler<?>[] domainResultAssemblers,
 			boolean hasCollectionInitializers,
 			InitializersList initializersList) {
-		this( domainResultAssemblers, getResultInitializers( domainResultAssemblers ), hasCollectionInitializers, initializersList );
+		this( domainResultAssemblers,
+				getResultInitializers( domainResultAssemblers ),
+				hasCollectionInitializers,
+				initializersList );
 	}
 
 	private JdbcValuesMappingResolutionImpl(
@@ -38,7 +41,7 @@ private JdbcValuesMappingResolutionImpl(
 
 	private static Initializer<?>[] getResultInitializers(DomainResultAssembler<?>[] resultAssemblers) {
 		final LinkedHashSet<Initializer<?>> initializers = new LinkedHashSet<>( resultAssemblers.length );
-		for ( DomainResultAssembler<?> resultAssembler : resultAssemblers ) {
+		for ( var resultAssembler : resultAssemblers ) {
 			resultAssembler.forEachResultAssembler( (initializer, list) -> list.add( initializer ), initializers );
 		}
 		return initializers.toArray(Initializer.EMPTY_ARRAY);
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesResultSetImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesResultSetImpl.java
index 0dd467d924e0..220aa8c37b70 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesResultSetImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesResultSetImpl.java
@@ -9,11 +9,8 @@
 import java.util.Arrays;
 import java.util.BitSet;
 
-import org.hibernate.JDBCException;
 import org.hibernate.QueryTimeoutException;
 import org.hibernate.cache.spi.QueryKey;
-import org.hibernate.cache.spi.QueryResultsCache;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.exception.DataException;
 import org.hibernate.exception.LockTimeoutException;
@@ -27,6 +24,8 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
 import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
 
+import static java.util.Arrays.copyOf;
+
 /**
  * {@link AbstractJdbcValues} implementation for a JDBC {@link ResultSet} as the source
  *
@@ -77,7 +76,7 @@ public JdbcValuesResultSetImpl(
 
 		final int rowSize = valuesMapping.getRowSize();
 		this.sqlSelections = new SqlSelection[rowSize];
-		for ( SqlSelection selection : valuesMapping.getSqlSelections() ) {
+		for ( var selection : valuesMapping.getSqlSelections() ) {
 			this.sqlSelections[selection.getValuesArrayPosition()] = selection;
 		}
 		this.initializedIndexes = new BitSet( rowSize );
@@ -127,11 +126,10 @@ private static QueryCachePutManager resolveQueryCachePutManager(
 			String queryIdentifier,
 			CachedJdbcValuesMetadata metadataForCache) {
 		if ( queryCacheKey != null ) {
-			final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
-			final QueryResultsCache queryCache = factory.getCache()
-					.getQueryResultsCache( queryOptions.getResultCacheRegionName() );
+			final var factory = executionContext.getSession().getFactory();
 			return new QueryCachePutManagerEnabledImpl(
-					queryCache,
+					factory.getCache()
+							.getQueryResultsCache( queryOptions.getResultCacheRegionName() ),
 					factory.getStatistics(),
 					queryCacheKey,
 					queryIdentifier,
@@ -300,18 +298,16 @@ private boolean advancePrevious() {
 	}
 
 	private boolean advance(final boolean hasResult) {
-		if ( ! hasResult ) {
-			return false;
+		if ( hasResult ) {
+			readCurrentRowValues();
 		}
-
-		readCurrentRowValues();
-		return true;
+		return hasResult;
 	}
 
 	private ExecutionException makeExecutionException(String message, SQLException cause) {
-		final JDBCException jdbcException =
-				executionContext.getSession().getJdbcServices().getSqlExceptionHelper()
-						.convert( cause, message );
+		final var jdbcException =
+				executionContext.getSession().getJdbcServices()
+						.getSqlExceptionHelper().convert( cause, message );
 		if ( jdbcException instanceof QueryTimeoutException
 				|| jdbcException instanceof DataException
 				|| jdbcException instanceof LockTimeoutException ) {
@@ -352,7 +348,7 @@ public void finishRowProcessing(RowProcessingState rowProcessingState, boolean w
 			}
 			final Object objectToCache;
 			if ( valueIndexesToCacheIndexes == null ) {
-				objectToCache = Arrays.copyOf( currentRowJdbcValues, currentRowJdbcValues.length );
+				objectToCache = copyOf( currentRowJdbcValues, currentRowJdbcValues.length );
 			}
 			else if ( rowToCacheSize < 1 ) {
 				if ( !wasAdded ) {
@@ -362,8 +358,8 @@ else if ( rowToCacheSize < 1 ) {
 				objectToCache = currentRowJdbcValues[-rowToCacheSize];
 			}
 			else {
-				final Object[] rowToCache = new Object[rowToCacheSize];
-				for ( int i = 0; i < currentRowJdbcValues.length; i++ ) {
+				final var rowToCache = new Object[rowToCacheSize];
+				for ( int i = 0; i < valueIndexesToCacheIndexes.length; i++ ) {
 					final int cacheIndex = valueIndexesToCacheIndexes[i];
 					if ( cacheIndex != -1 ) {
 						rowToCache[cacheIndex] = initializedIndexes.get( i ) ? currentRowJdbcValues[i] : null;
@@ -379,7 +375,7 @@ else if ( rowToCacheSize < 1 ) {
 	public Object getCurrentRowValue(int valueIndex) {
 		if ( !initializedIndexes.get( valueIndex ) ) {
 			initializedIndexes.set( valueIndex );
-			final SqlSelection sqlSelection = sqlSelections[valueIndex];
+			final var sqlSelection = sqlSelections[valueIndex];
 			final int index = sqlSelection.getJdbcResultSetIndex();
 			try {
 				currentRowJdbcValues[valueIndex] = sqlSelection.getJdbcValueExtractor().extract(
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java
index a45c3200e46f..0b77d5c813db 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java
@@ -12,7 +12,6 @@
 import org.hibernate.engine.spi.CollectionKey;
 import org.hibernate.engine.spi.EntityHolder;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.spi.PostLoadEvent;
 import org.hibernate.event.spi.PreLoadEvent;
 import org.hibernate.query.spi.QueryOptions;
@@ -46,7 +45,7 @@ public JdbcValuesSourceProcessingStateStandardImpl(
 		this.processingOptions = processingOptions;
 
 		if ( executionContext.getSession().isEventSource() ) {
-			final EventSource eventSource = executionContext.getSession().asEventSource();
+			final var eventSource = executionContext.getSession().asEventSource();
 			preLoadEvent = new PreLoadEvent( eventSource );
 			postLoadEvent = new PostLoadEvent( eventSource );
 		}
@@ -151,33 +150,19 @@ public SharedSessionContractImplementor getSession() {
 	public void finishUp(boolean registerSubselects) {
 		// now we can finalize loading collections
 		finishLoadingCollections();
-
 		getSession().getPersistenceContextInternal()
 				.postLoad( this,
 						registerSubselects ? executionContext::registerLoadingEntityHolder : null );
 	}
 
-	private boolean isReadOnly() {
-		if ( getQueryOptions().isReadOnly() != null ) {
-			return getQueryOptions().isReadOnly();
-		}
-		else if ( getSession() instanceof EventSource ) {
-			return getSession().isDefaultReadOnly();
-		}
-		else {
-			return false;
-		}
-	}
-
 	/**
 	 * For Hibernate Reactive
 	 */
 	public void finishLoadingCollections() {
 		if ( loadingCollectionMap != null ) {
-			for ( LoadingCollectionEntry loadingCollectionEntry : loadingCollectionMap.values() ) {
+			for ( var loadingCollectionEntry : loadingCollectionMap.values() ) {
 				loadingCollectionEntry.finishLoading( getExecutionContext() );
 			}
-
 			loadingCollectionMap = null;
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/StandardJdbcValuesMapping.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/StandardJdbcValuesMapping.java
index e83c28974af9..8d017dbeadbf 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/StandardJdbcValuesMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/StandardJdbcValuesMapping.java
@@ -6,6 +6,7 @@
 
 import java.util.BitSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Supplier;
 
 import org.hibernate.LockMode;
@@ -53,19 +54,23 @@ public StandardJdbcValuesMapping(
 			List<DomainResult<?>> domainResults) {
 		this.sqlSelections = sqlSelections;
 		this.domainResults = domainResults;
-
-		final int rowSize = sqlSelections.size();
-		final BitSet valueIndexesToCache = new BitSet( rowSize );
-		for ( DomainResult<?> domainResult : domainResults ) {
+		// The native query might select more columns than the number of selections,
+		// so we need to compute the effective row size from the max values array position
+		int maxPosition = -1;
+		boolean needsResolve = false;
+		for ( SqlSelection sqlSelection : sqlSelections ) {
+			maxPosition = Math.max( maxPosition, sqlSelection.getValuesArrayPosition() );
+			needsResolve = needsResolve
+					|| sqlSelection instanceof SqlSelectionImpl selection && selection.needsResolve();
+		}
+		final int rowSize = maxPosition + 1;
+		final var valueIndexesToCache = new BitSet( rowSize );
+		for ( var domainResult : domainResults ) {
 			domainResult.collectValueIndexesToCache( valueIndexesToCache );
 		}
 		final int[] valueIndexesToCacheIndexes = new int[rowSize];
 		int cacheIndex = 0;
-		boolean needsResolve = false;
-		for ( int i = 0; i < valueIndexesToCacheIndexes.length; i++ ) {
-			final SqlSelection sqlSelection = sqlSelections.get( i );
-			needsResolve = needsResolve
-					|| sqlSelection instanceof SqlSelectionImpl selection && selection.needsResolve();
+		for ( int i = 0; i < rowSize; i++ ) {
 			if ( valueIndexesToCache.get( i ) ) {
 				valueIndexesToCacheIndexes[i] = cacheIndex++;
 			}
@@ -114,7 +119,7 @@ public JdbcValuesMappingResolution resolveAssemblers(SessionFactoryImplementor s
 			return resolution;
 		}
 		else {
-			final AssemblerCreationStateImpl creationState =
+			final var creationState =
 					new AssemblerCreationStateImpl( this,
 							sessionFactory.getSqlTranslationEngine() );
 			final var domainResultAssemblers = resolveAssemblers( creationState );
@@ -132,7 +137,7 @@ private DomainResultAssembler<?>[] resolveAssemblers(AssemblerCreationState crea
 		final int size = domainResults.size();
 		final List<DomainResultAssembler<?>> assemblers = arrayList( size );
 		for ( int i = 0; i < size; i++ ) {
-			final DomainResultAssembler<?> resultAssembler =
+			final var resultAssembler =
 					domainResults.get( i )
 							.createResultAssembler( null, creationState );
 			assemblers.add( resultAssembler );
@@ -166,9 +171,9 @@ public AssemblerCreationStateImpl(
 		@Override
 		public boolean isDynamicInstantiation() {
 			if ( dynamicInstantiation == null ) {
-				dynamicInstantiation = jdbcValuesMapping.getDomainResults()
-						.stream()
-						.anyMatch( domainResult -> domainResult instanceof DynamicInstantiationResult );
+				dynamicInstantiation =
+						jdbcValuesMapping.getDomainResults().stream()
+								.anyMatch( domainResult -> domainResult instanceof DynamicInstantiationResult );
 			}
 			return dynamicInstantiation;
 		}
@@ -177,7 +182,7 @@ public boolean isDynamicInstantiation() {
 		public boolean containsMultipleCollectionFetches() {
 			if ( containsMultipleCollectionFetches == null ) {
 				int collectionFetchesCount = 0;
-				for ( DomainResult<?> domainResult : jdbcValuesMapping.getDomainResults() ) {
+				for ( var domainResult : jdbcValuesMapping.getDomainResults() ) {
 					if ( domainResult instanceof FetchParent fetchParent ) {
 						collectionFetchesCount += fetchParent.getCollectionFetchesCount();
 					}
@@ -226,16 +231,15 @@ public <T extends FetchParent> Initializer<?> resolveInitializer(
 				T resultGraphNode,
 				InitializerParent<?> parent,
 				InitializerProducer<T> producer) {
-			final Initializer<?> existing = initializerMap.get( navigablePath );
-			if ( existing != null ) {
-				if ( fetchedModelPart.getNavigableRole().equals(
+			final var existing = initializerMap.get( navigablePath );
+			if ( existing != null
+					&& Objects.equals( fetchedModelPart.getNavigableRole(),
 						existing.getInitializedPart().getNavigableRole() ) ) {
-					RESULTS_MESSAGE_LOGGER.tracef( "Returning previously-registered initializer: %s", existing );
-					return existing;
-				}
+				RESULTS_MESSAGE_LOGGER.tracef( "Returning previously-registered initializer: %s", existing );
+				return existing;
 			}
 
-			final Initializer<?> initializer = producer.createInitializer( resultGraphNode, parent, this );
+			final var initializer = producer.createInitializer( resultGraphNode, parent, this );
 			RESULTS_MESSAGE_LOGGER.tracef( "Registering initializer: %s", initializer );
 
 			if ( initializer instanceof AbstractImmediateCollectionInitializer ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java
index 1698411f91c7..b467d43e4a96 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ListResultsConsumer.java
@@ -10,7 +10,6 @@
 import java.util.Locale;
 
 import org.hibernate.HibernateException;
-import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.ResultListTransformer;
 import org.hibernate.sql.exec.spi.ExecutionContext;
@@ -20,7 +19,6 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.spi.EntityJavaType;
-import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -150,11 +148,11 @@ public List<R> consume(
 		rowReader.startLoading( rowProcessingState );
 
 		RuntimeException ex = null;
-		final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
+		final var persistenceContext = session.getPersistenceContextInternal();
 		persistenceContext.beforeLoad();
 		persistenceContext.getLoadContexts().register( jdbcValuesSourceProcessingState );
 		try {
-			final JavaType<R> domainResultJavaType = resolveDomainResultJavaType(
+			final var domainResultJavaType = resolveDomainResultJavaType(
 					rowReader.getDomainResultResultJavaType(),
 					rowReader.getResultJavaTypes(),
 					session.getTypeConfiguration()
@@ -162,7 +160,7 @@ public List<R> consume(
 
 			final boolean isEntityResultType = domainResultJavaType instanceof EntityJavaType;
 			final int initialCollectionSize = Math.min( jdbcValues.getResultCountEstimate(), INITIAL_COLLECTION_SIZE_LIMIT );
-			final Results<R> results = createResults( isEntityResultType, domainResultJavaType, initialCollectionSize );
+			final var results = createResults( isEntityResultType, domainResultJavaType, initialCollectionSize );
 			final int readRows = readRows( rowProcessingState, rowReader, isEntityResultType, results );
 			rowReader.finishUp( rowProcessingState );
 			jdbcValuesSourceProcessingState.finishUp( readRows > 1 );
@@ -209,13 +207,14 @@ private Results<R> createResults(
 			boolean isEntityResultType,
 			JavaType<R> domainResultJavaType,
 			int initialCollectionSize) {
-		if ( isEntityResultType
-			&& ( uniqueSemantic == UniqueSemantic.ALLOW || uniqueSemantic == UniqueSemantic.FILTER ) ) {
-			return new EntityResult<>( domainResultJavaType, initialCollectionSize );
-		}
-		else {
-			return new Results<>( domainResultJavaType, initialCollectionSize );
-		}
+		return isEntityResultType && isAllowOrFilter()
+				? new EntityResult<>( domainResultJavaType, initialCollectionSize )
+				: new Results<>( domainResultJavaType, initialCollectionSize );
+	}
+
+	private boolean isAllowOrFilter() {
+		return uniqueSemantic == UniqueSemantic.ALLOW
+			|| uniqueSemantic == UniqueSemantic.FILTER;
 	}
 
 	private int readRows(
@@ -223,17 +222,18 @@ private int readRows(
 			RowReader<R> rowReader,
 			boolean isEntityResultType,
 			Results<R> results) {
-		if ( uniqueSemantic == UniqueSemantic.FILTER
-				|| uniqueSemantic == UniqueSemantic.ASSERT && rowReader.hasCollectionInitializers()
-				|| uniqueSemantic == UniqueSemantic.ALLOW && isEntityResultType ) {
-			return readUnique( rowProcessingState, rowReader, results );
-		}
-		else if ( uniqueSemantic == UniqueSemantic.ASSERT ) {
-			return readUniqueAssert( rowProcessingState, rowReader, results );
-		}
-		else {
-			return read( rowProcessingState, rowReader, results );
-		}
+		return switch ( uniqueSemantic ) {
+			case FILTER ->
+					readUnique( rowProcessingState, rowReader, results );
+			case ASSERT -> rowReader.hasCollectionInitializers()
+					? readUnique( rowProcessingState, rowReader, results )
+					: readUniqueAssert( rowProcessingState, rowReader, results );
+			case ALLOW -> isEntityResultType
+					? readUnique( rowProcessingState, rowReader, results )
+					: read( rowProcessingState, rowReader, results );
+			case NONE, NEVER ->
+					read( rowProcessingState, rowReader, results );
+		};
 	}
 
 	private static <R> int read(
@@ -283,35 +283,32 @@ private static <R> int readUnique(
 		return readRows;
 	}
 
+	@SuppressWarnings("unchecked") //TODO: fix the unchecked casts
 	private JavaType<R> resolveDomainResultJavaType(
 			Class<R> domainResultResultJavaType,
 			List<@Nullable JavaType<?>> resultJavaTypes,
 			TypeConfiguration typeConfiguration) {
-		final JavaTypeRegistry javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
+		final var javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
 
 		if ( domainResultResultJavaType != null ) {
-			final JavaType<R> resultJavaType = javaTypeRegistry.resolveDescriptor( domainResultResultJavaType );
+			final var resultJavaType = javaTypeRegistry.resolveDescriptor( domainResultResultJavaType );
 			// Could be that the user requested a more general type than the actual type,
 			// so resolve the most concrete type since this type is used to determine equality of objects
-			if ( resultJavaTypes.size() == 1 && isMoreConcrete( resultJavaType, resultJavaTypes.get( 0 ) ) ) {
-				//noinspection unchecked
+			if ( resultJavaTypes.size() == 1
+					&& isMoreConcrete( resultJavaType, resultJavaTypes.get( 0 ) ) ) {
 				return (JavaType<R>) resultJavaTypes.get( 0 );
 			}
 			return resultJavaType;
 		}
 
 		if ( resultJavaTypes.size() == 1 ) {
-			final JavaType<?> firstJavaType = resultJavaTypes.get( 0 );
-			if ( firstJavaType == null ) {
-				return javaTypeRegistry.getDescriptor( Object.class );
-			}
-			else {
-				//noinspection unchecked
-				return (JavaType<R>) firstJavaType;
-			}
+			final var firstJavaType = resultJavaTypes.get( 0 );
+			return firstJavaType == null
+					? (JavaType<R>) javaTypeRegistry.resolveDescriptor( Object.class )
+					: (JavaType<R>) firstJavaType;
 		}
 		else {
-			return javaTypeRegistry.getDescriptor( Object[].class );
+			return (JavaType<R>) javaTypeRegistry.resolveDescriptor( Object[].class );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java
index 5bf7ff0e54bf..b2c36ca5c04a 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/LoadContexts.java
@@ -34,7 +34,7 @@ public void register(JdbcValuesSourceProcessingState state) {
 	}
 
 	public void deregister(JdbcValuesSourceProcessingState state) {
-		final JdbcValuesSourceProcessingState previous = jdbcValuesSourceProcessingStateStack.pop();
+		final var previous = jdbcValuesSourceProcessingStateStack.pop();
 		if ( previous != state ) {
 			throw new IllegalStateException( "Illegal pop() with non-matching JdbcValuesSourceProcessingState" );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ManagedResultConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ManagedResultConsumer.java
index 5dec8e2fec6a..c5688d4bd56f 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ManagedResultConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ManagedResultConsumer.java
@@ -5,7 +5,6 @@
 package org.hibernate.sql.results.spi;
 
 import org.hibernate.Incubating;
-import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.sql.results.internal.RowProcessingStateStandardImpl;
 import org.hibernate.sql.results.jdbc.spi.JdbcValues;
@@ -30,7 +29,7 @@ public Void consume(
 			JdbcValuesSourceProcessingState jdbcValuesSourceProcessingState,
 			RowProcessingStateStandardImpl rowProcessingState,
 			RowReader<Object> rowReader) {
-		final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
+		final var persistenceContext = session.getPersistenceContextInternal();
 		RuntimeException ex = null;
 		persistenceContext.beforeLoad();
 		persistenceContext.getLoadContexts().register( jdbcValuesSourceProcessingState );
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ScrollableResultsConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ScrollableResultsConsumer.java
index b0d6175ecdb2..a7dfc1194705 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ScrollableResultsConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ScrollableResultsConsumer.java
@@ -4,12 +4,10 @@
  */
 package org.hibernate.sql.results.spi;
 
-import java.util.List;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.scrollable.FetchingScrollableResultsImpl;
 import org.hibernate.internal.scrollable.ScrollableResultsImpl;
-import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.entity.EntityResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
 import org.hibernate.sql.results.jdbc.spi.JdbcValues;
@@ -73,9 +71,9 @@ public boolean canResultsBeCached() {
 	}
 
 	private boolean containsCollectionFetches(JdbcValuesMapping valuesMapping) {
-		final List<DomainResult<?>> domainResults = valuesMapping.getDomainResults();
-		for ( DomainResult<?> domainResult : domainResults ) {
-			if ( domainResult instanceof EntityResult entityResult && entityResult.containsCollectionFetches() ) {
+		for ( var domainResult : valuesMapping.getDomainResults() ) {
+			if ( domainResult instanceof EntityResult<?> entityResult
+					&& entityResult.containsCollectionFetches() ) {
 				return true;
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/SingleResultConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/SingleResultConsumer.java
index 398c91cd1141..15cba1b2fe4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/SingleResultConsumer.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/SingleResultConsumer.java
@@ -5,7 +5,6 @@
 package org.hibernate.sql.results.spi;
 
 import org.hibernate.Incubating;
-import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.sql.results.internal.RowProcessingStateStandardImpl;
@@ -38,7 +37,7 @@ public T consume(
 			JdbcValuesSourceProcessingState jdbcValuesSourceProcessingState,
 			RowProcessingStateStandardImpl rowProcessingState,
 			RowReader<T> rowReader) {
-		final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
+		final var persistenceContext = session.getPersistenceContextInternal();
 		RuntimeException ex = null;
 		persistenceContext.beforeLoad();
 		persistenceContext.getLoadContexts().register( jdbcValuesSourceProcessingState );
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/NaturalIdStatistics.java b/hibernate-core/src/main/java/org/hibernate/stat/NaturalIdStatistics.java
index 3604c5d4e1e6..655f8d5fac71 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/NaturalIdStatistics.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/NaturalIdStatistics.java
@@ -48,4 +48,11 @@ public interface NaturalIdStatistics extends CacheableDataStatistics, Serializab
 	 * the execution of this "natural id resolution" query
 	 */
 	long getExecutionMinTime();
+
+	/**
+	 * The number of times (since last Statistics clearing) that natural-id value
+	 * {@linkplain org.hibernate.metamodel.mapping.NaturalIdMapping#normalizeInput normalization}
+	 * has been performed.
+	 */
+	long getNormalizationCount();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java
index 843c2013f995..284efeb6cec9 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java
@@ -24,6 +24,7 @@ public class NaturalIdStatisticsImpl extends AbstractCacheableDataStatistics imp
 	private final AtomicLong executionMaxTime = new AtomicLong();
 	private final AtomicLong executionMinTime = new AtomicLong( Long.MAX_VALUE );
 	private final AtomicLong totalExecutionTime = new AtomicLong();
+	private final AtomicLong normalizationCount = new AtomicLong();
 
 	private final Lock readLock;
 	private final Lock writeLock;
@@ -81,6 +82,11 @@ public long getExecutionMinTime() {
 		return executionMinTime.get();
 	}
 
+	@Override
+	public long getNormalizationCount() {
+		return normalizationCount.get();
+	}
+
 	void queryExecuted(long time) {
 		// read lock is enough, concurrent updates are supported by the underlying type AtomicLong
 		// this only guards executed(long, long) to be called, when another thread is executing getExecutionAvgTime()
@@ -105,6 +111,10 @@ void queryExecuted(long time) {
 		}
 	}
 
+	void valueNormalized() {
+		normalizationCount.getAndIncrement();
+	}
+
 	@Override
 	public String toString() {
 		final var text = new StringBuilder()
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java
index ac256ff03224..249ee879e51a 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java
@@ -1044,4 +1044,9 @@ public Map<String, Long> getSlowQueries() {
 	public void slowQuery(String sql, long executionTime) {
 		slowQueries.merge( sql, executionTime, Math::max );
 	}
+
+	@Override
+	public void normalizeNaturalId(String entityName) {
+		getNaturalIdStatistics( entityName ).valueNormalized();
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java b/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java
index 28ec8450b033..6dac7eb0a69f 100644
--- a/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java
@@ -305,4 +305,8 @@ default Map<String, Long> getSlowQueries() {
 		//For backward compatibility
 		return emptyMap();
 	}
+
+	default void normalizeNaturalId(String entityName) {
+		//For backward compatibility
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/temporal/TemporalTableStrategy.java b/hibernate-core/src/main/java/org/hibernate/temporal/TemporalTableStrategy.java
new file mode 100644
index 000000000000..fb862f1d0741
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/temporal/TemporalTableStrategy.java
@@ -0,0 +1,74 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import org.hibernate.Incubating;
+
+
+/**
+ * Enumerates the possible mapping strategies for
+ * {@linkplain org.hibernate.annotations.Temporal temporal}
+ * entities and collections.
+ *
+ * @see org.hibernate.annotations.Temporal
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+@Incubating
+public enum TemporalTableStrategy {
+	/**
+	 * Use native ANSI SQL 2011-style temporal tables where they
+	 * are supported (Maria, SQL Server, Db2).
+	 */
+	NATIVE,
+	/**
+	 * Store historical data together with current data in one
+	 * table. The table does not have the usual foreign key
+	 * constraints that would exist for any non-temporal entity,
+	 * and so it is the responsibility of the application program
+	 * to maintain and enforce referential integrity.
+	 */
+	SINGLE_TABLE,
+	/**
+	 * Maintain two tables, one for current data and one for
+	 * historical data. The table for current data has all the
+	 * usual foreign key constraints that would exist for any
+	 * non-temporal entity; the table for historical data has
+	 * no foreign key constraints.
+	 * <ul>
+	 * <li>When a new entity instance is created, a row is
+	 *    inserted in both tables.
+	 * <li>When the instance is updated, its row in the table
+	 *     for current data is updated; but in the table for
+	 *     historical data, a new revision row is inserted and
+	 *     the previous revision row is marked as superseded by
+	 *     setting its
+	 *     {@link org.hibernate.annotations.Temporal#rowEnd
+	 *     row end} column to the current timestamp.
+	 * <li>When an entity instance is removed, its row in the
+	 *     table for current data is deleted; and the current
+	 *     revision row in the table for historical data is
+	 *     marked as superseded by setting its {@code row end}
+	 *     column.
+	 * </ul>
+	 * <p>Queries for current data are run against the table
+	 * for current data. Queries for historical data (that is,
+	 * any query in a session created using
+	 * {@link org.hibernate.engine.creation.CommonBuilder#asOf})
+	 * are executed against the table for historical
+	 * data.
+	 */
+	HISTORY_TABLE,
+	/**
+	 * Let us choose a temporal table mapping strategy for you
+	 * because YOLO. Selects {@link #HISTORY_TABLE} except on
+	 * databases with especially robust implementations of
+	 * {@link #NATIVE} temporal versioning. This is the default.
+	 * @see org.hibernate.dialect.temporal.TemporalTableSupport#getDefaultTemporalTableStrategy
+	 */
+	AUTO
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/temporal/internal/CurrentTimestampTransactionIdentifierSupplier.java b/hibernate-core/src/main/java/org/hibernate/temporal/internal/CurrentTimestampTransactionIdentifierSupplier.java
new file mode 100644
index 000000000000..1a01099b75bf
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/temporal/internal/CurrentTimestampTransactionIdentifierSupplier.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal.internal;
+
+import org.hibernate.SharedSessionContract;
+import org.hibernate.temporal.spi.TransactionIdentifierSupplier;
+
+import java.time.Instant;
+
+/**
+ * Simple implementation that queries the database current timestamp.
+ */
+public class CurrentTimestampTransactionIdentifierSupplier implements TransactionIdentifierSupplier<Instant> {
+	@Override
+	public Instant generateTransactionIdentifier(SharedSessionContract session) {
+		return session.createSelectionQuery( "select instant", Instant.class ).getSingleResult();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/temporal/internal/TransactionIdentifierServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/temporal/internal/TransactionIdentifierServiceImpl.java
new file mode 100644
index 000000000000..8f1dde450af0
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/temporal/internal/TransactionIdentifierServiceImpl.java
@@ -0,0 +1,145 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal.internal;
+
+import java.time.Instant;
+import java.util.Map;
+
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.SharedSessionContract;
+import org.hibernate.boot.registry.selector.spi.StrategySelector;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.temporal.spi.TransactionIdentifierService;
+import org.hibernate.temporal.spi.TransactionIdentifierSupplier;
+
+import static org.hibernate.cfg.StateManagementSettings.TRANSACTION_ID_SUPPLIER;
+import static org.hibernate.cfg.StateManagementSettings.USE_SERVER_TRANSACTION_TIMESTAMPS;
+import static org.hibernate.internal.util.GenericsHelper.erasedType;
+import static org.hibernate.internal.util.GenericsHelper.supertypeInstantiation;
+import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
+
+/**
+ * Default implementation of {@link TransactionIdentifierService}.
+ * <p>
+ * Produces current timestamps by calling {@link Instant#now()}.
+ *
+ * @see StateManagementSettings#TRANSACTION_ID_SUPPLIER
+ * @see StateManagementSettings#USE_SERVER_TRANSACTION_TIMESTAMPS
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+public class TransactionIdentifierServiceImpl implements TransactionIdentifierService, TransactionIdentifierSupplier<Instant> {
+
+	private final Class<?> identifierValueType;
+	private final TransactionIdentifierSupplier<?> identifierValueSupplier;
+	private final boolean useServerTransactionTimestamps;
+
+	public TransactionIdentifierServiceImpl(ServiceRegistry serviceRegistry) {
+		final var settings =
+				serviceRegistry.requireService( ConfigurationService.class )
+						.getSettings();
+		useServerTransactionTimestamps =
+				getBoolean( USE_SERVER_TRANSACTION_TIMESTAMPS, settings );
+		if ( useServerTransactionTimestamps ) {
+			if ( settings.containsKey( TRANSACTION_ID_SUPPLIER ) ) {
+				throw new MappingException( "Settings '"
+						+ USE_SERVER_TRANSACTION_TIMESTAMPS + "' and '"
+						+ TRANSACTION_ID_SUPPLIER + "' are mutually exclusive"
+				);
+			}
+			final var dialect = serviceRegistry.requireService( JdbcServices.class ).getDialect();
+			identifierValueSupplier = dialect.isCurrentTimestampStable()
+					? null
+					: new CurrentTimestampTransactionIdentifierSupplier();
+			identifierValueType = Instant.class;
+		}
+		else {
+			identifierValueSupplier =
+					transactionIdSupplier( settings,
+							serviceRegistry.requireService( StrategySelector.class ) );
+			@SuppressWarnings( "unchecked" ) // completely safe
+			final var supplierClass = (Class<TransactionIdentifierSupplier<?>>) identifierValueSupplier.getClass();
+			identifierValueType = resolveSuppliedType( supplierClass );
+		}
+	}
+
+	@Override
+	public Instant generateTransactionIdentifier(SharedSessionContract session) {
+		return Instant.now();
+	}
+
+	@Override
+	public boolean isIdentifierTypeInstant() {
+		return identifierValueType == Instant.class;
+	}
+
+	@Override
+	public Class<?> getIdentifierType() {
+		return identifierValueType;
+	}
+
+	@Override
+	public TransactionIdentifierSupplier<?> getIdentifierSupplier() {
+		return identifierValueSupplier;
+	}
+
+	@Override
+	public boolean useServerTimestamp(Dialect dialect) {
+		return useServerTransactionTimestamps
+			// when the current_timestamp function is
+			// "unstable" across calls in a given
+			// transaction, we need to cache it in the
+			// session across calls to the database
+			&& dialect.isCurrentTimestampStable();
+	}
+
+	private static Class<?> resolveSuppliedType(Class<? extends TransactionIdentifierSupplier<?>> supplierClass) {
+		final var supplierInstantiation = supertypeInstantiation( TransactionIdentifierSupplier.class, supplierClass );
+		if ( supplierInstantiation == null ) {
+			return null;
+		}
+		else {
+			final var typeArguments = supplierInstantiation.getActualTypeArguments();
+			return typeArguments.length == 0 ? null : erasedType( typeArguments[0] );
+		}
+	}
+
+	public TransactionIdentifierSupplier<?> transactionIdSupplier(
+			Map<String,Object> settings,
+			StrategySelector strategySelector) {
+		final Object setting = settings.get( TRANSACTION_ID_SUPPLIER );
+		if ( setting == null ) {
+			return this;
+		}
+		else if ( setting instanceof TransactionIdentifierSupplier<?> supplier ) {
+			return supplier;
+		}
+		else if ( setting instanceof Class<?> clazz ) {
+			if ( !TransactionIdentifierSupplier.class.isAssignableFrom( clazz ) ) {
+				throw new HibernateException(
+						"Setting '" + TRANSACTION_ID_SUPPLIER + "' must specify a '"
+								+ TransactionIdentifierSupplier.class.getName() + "' or a class name"
+				);
+			}
+			return strategySelector.resolveStrategy( TransactionIdentifierSupplier.class, clazz );
+		}
+		else if ( setting instanceof String name ) {
+			return strategySelector.resolveStrategy( TransactionIdentifierSupplier.class, name );
+		}
+		else {
+			throw new HibernateException(
+					"Setting '" + TRANSACTION_ID_SUPPLIER + "' must specify a '"
+							+ TransactionIdentifierSupplier.class.getName() + "' or a class name"
+			);
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/temporal/package-info.java b/hibernate-core/src/main/java/org/hibernate/temporal/package-info.java
new file mode 100644
index 000000000000..9560990c87ed
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/temporal/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Support for working with temporal or audited data.
+ */
+package org.hibernate.temporal;
diff --git a/hibernate-core/src/main/java/org/hibernate/temporal/spi/TransactionIdentifierService.java b/hibernate-core/src/main/java/org/hibernate/temporal/spi/TransactionIdentifierService.java
new file mode 100644
index 000000000000..f297b1638f59
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/temporal/spi/TransactionIdentifierService.java
@@ -0,0 +1,71 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal.spi;
+
+import org.hibernate.Incubating;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.service.Service;
+
+
+/**
+ * A source of transaction identifiers or timestamps for use
+ * with {@linkplain org.hibernate.annotations.Temporal temporal}
+ * or {@linkplain org.hibernate.annotations.Audited audited} data.
+ * <p>
+ * Transaction ids produced by the {@linkplain #getIdentifierSupplier
+ * supplier} must be distinct and monotonically increasing. Note,
+ * however, that unless the database is in serializable isolation
+ * mode, transactions themselves do not have a well-defined total
+ * order. Therefore, the transaction ids are ordered by the moment
+ * at which they are obtained; approximately, by the instant at
+ * which the transaction <em>started</em>. This must be taken into
+ * account when interpreting the results of historical queries
+ * against a temporal table or audit log. The historical changes
+ * cannot be linearized by transaction completion time, since the
+ * completion time of a transaction is never known when the records
+ * are written to the history table or audit log.
+ *
+ * @apiNote A transaction id or timestamp is assumed to be constant
+ * during a transaction. This service is not aware of transaction
+ * contexts, and so it is the responsibility of the client to ensure
+ * that the {@linkplain #getIdentifierSupplier supplier} is called
+ * no more than once in a transaction.
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+@Incubating
+public interface TransactionIdentifierService extends Service {
+	/**
+	 * The Java type of the transaction identifiers or timestamps.
+	 */
+	Class<?> getIdentifierType();
+
+	/**
+	 * A supplier of transaction identifiers or timestamps.
+	 *
+	 * @see StateManagementSettings#TRANSACTION_ID_SUPPLIER
+	 */
+	TransactionIdentifierSupplier<?> getIdentifierSupplier();
+
+	/**
+	 * Whether the stable timestamps assigned by the database server
+	 * so that multiple calls to {@code current_timestamp} in the
+	 * same transaction return the same value. When this is true,
+	 * we don't need to pass the transaction timestamp via a JDBC
+	 * parameter, and we don't need to cache its value in the session.
+	 *
+	 * @see StateManagementSettings#USE_SERVER_TRANSACTION_TIMESTAMPS
+	 * @see Dialect#isCurrentTimestampStable()
+	 */
+	boolean useServerTimestamp(Dialect dialect);
+
+	/**
+	 * Whether the transaction identifiers are actually timestamps.
+	 */
+	boolean isIdentifierTypeInstant();
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/temporal/spi/TransactionIdentifierSupplier.java b/hibernate-core/src/main/java/org/hibernate/temporal/spi/TransactionIdentifierSupplier.java
new file mode 100644
index 000000000000..752d0bf109a6
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/temporal/spi/TransactionIdentifierSupplier.java
@@ -0,0 +1,49 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal.spi;
+
+import org.hibernate.Incubating;
+import org.hibernate.SharedSessionContract;
+import org.hibernate.cfg.StateManagementSettings;
+
+
+/**
+ * A source of transaction identifiers or timestamps for use
+ * with {@linkplain org.hibernate.annotations.Temporal temporal}
+ * or {@linkplain org.hibernate.annotations.Audited audited} data.
+ * <p>
+ * Transaction ids produced by the {@linkplain #generateTransactionIdentifier
+ * supplier} must be distinct and monotonically increasing. Note,
+ * however, that unless the database is in serializable isolation
+ * mode, transactions themselves do not have a well-defined total
+ * order. Therefore, the transaction ids are ordered by the moment
+ * at which they are obtained; approximately, by the instant at
+ * which the transaction <em>started</em>. This must be taken into
+ * account when interpreting the results of historical queries
+ * against a temporal table or audit log. The historical changes
+ * cannot be linearized by transaction completion time, since the
+ * completion time of a transaction is never known when the records
+ * are written to the history table or audit log.
+ *
+ * @apiNote A transaction id or timestamp is assumed to be constant
+ * during a transaction. The supplier does not have to be aware of
+ * transaction contexts, and so it is the responsibility of the client
+ * to ensure that the {@linkplain #generateTransactionIdentifier supplier}
+ * is called no more than once in a transaction.
+ *
+ * @see StateManagementSettings#TRANSACTION_ID_SUPPLIER
+ *
+ * @author Gavin King
+ *
+ * @since 7.4
+ */
+@Incubating
+public interface TransactionIdentifierSupplier<T> {
+
+	/**
+	 * Generates the transaction identifier or timestamp for a transaction.
+	 */
+	T generateTransactionIdentifier(SharedSessionContract session);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/temporal/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/temporal/spi/package-info.java
new file mode 100644
index 000000000000..f9711a362c54
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/temporal/spi/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * SPI for integrating with a source of transaction identifiers
+ * for use with temporal or audited data.
+ *
+ * @see org.hibernate.temporal.spi.TransactionIdentifierService
+ */
+package org.hibernate.temporal.spi;
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
index ff47a9ac0537..5fbab4556ab1 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.tool.schema.extract.internal;
 
+import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -38,6 +39,10 @@ protected DatabaseMetaData getJdbcDatabaseMetaData() {
 		return getExtractionContext().getJdbcDatabaseMetaData();
 	}
 
+	Connection getConnection() {
+		return getExtractionContext().getJdbcConnection();
+	}
+
 	@Override
 	protected String getResultSetTableTypesPhysicalTableConstant() {
 		return "TABLE";
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorMySQLImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorMySQLImpl.java
index 397e84f39bcc..97920b4bc7fa 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorMySQLImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorMySQLImpl.java
@@ -26,7 +26,7 @@ public InformationExtractorMySQLImpl(ExtractionContext extractionContext) {
 	@Override
 	public NameSpaceForeignKeysInformation getForeignKeys(Identifier catalog, Identifier schema) {
 		final String tableSchema = determineTableSchema( catalog, schema );
-		try ( var preparedStatement = getExtractionContext().getJdbcConnection().prepareStatement( getForeignKeysSql( tableSchema ) )) {
+		try ( var preparedStatement = getConnection().prepareStatement( getForeignKeysSql( tableSchema ) ) ) {
 			if ( tableSchema != null ) {
 				preparedStatement.setString( 1, tableSchema );
 			}
@@ -67,7 +67,7 @@ join information_schema.referential_constraints b using (constraint_catalog, con
 	@Override
 	public NameSpaceIndexesInformation getIndexes(Identifier catalog, Identifier schema) {
 		final String tableSchema = determineTableSchema( catalog, schema );
-		try ( var preparedStatement = getExtractionContext().getJdbcConnection().prepareStatement( getIndexesSql( tableSchema ) )) {
+		try ( var preparedStatement = getConnection().prepareStatement( getIndexesSql( tableSchema ) ) ) {
 			if ( tableSchema != null ) {
 				preparedStatement.setString( 1, tableSchema );
 			}
@@ -107,7 +107,7 @@ private String getIndexesSql(String tableSchema) {
 	@Override
 	public NameSpacePrimaryKeysInformation getPrimaryKeys(Identifier catalog, Identifier schema) {
 		final String tableSchema = determineTableSchema( catalog, schema );
-		try ( var preparedStatement = getExtractionContext().getJdbcConnection().prepareStatement( getPrimaryKeysSql( tableSchema ) )) {
+		try ( var preparedStatement = getConnection().prepareStatement( getPrimaryKeysSql( tableSchema ) ) ) {
 			if ( tableSchema != null ) {
 				preparedStatement.setString( 1, tableSchema );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorPostgreSQLImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorPostgreSQLImpl.java
index 23ac29fe478c..ec397d562149 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorPostgreSQLImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorPostgreSQLImpl.java
@@ -33,7 +33,7 @@ public boolean supportsBulkForeignKeyRetrieval() {
 	@Override
 	public NameSpaceIndexesInformation getIndexes(Identifier catalog, Identifier schema) {
 		final String tableSchema = schema == null ? null : schema.getText();
-		try ( var preparedStatement = getExtractionContext().getJdbcConnection().prepareStatement( getIndexesSql( tableSchema ) )) {
+		try ( var preparedStatement = getConnection().prepareStatement( getIndexesSql( tableSchema ) ) ) {
 			if ( tableSchema != null ) {
 				preparedStatement.setString( 1, tableSchema );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java
index 259ee37955a4..b06bab53009b 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/AbstractSchemaMigrator.java
@@ -76,8 +76,8 @@ public void doMigration(
 			ExecutionOptions options,
 			ContributableMatcher contributableInclusionFilter,
 			TargetDescriptor targetDescriptor) {
-		final var sqlGenerationContext = sqlGenerationContext( metadata, options );
 		if ( !targetDescriptor.getTargetTypes().isEmpty() ) {
+			final var sqlGenerationContext = sqlGenerationContext( metadata, options );
 			final var jdbcContext = tool.resolveJdbcContext( options.getConfigurationValues() );
 			try ( var isolator = tool.getDdlTransactionIsolator( jdbcContext ) ) {
 				final var databaseInformation = buildDatabaseInformation( isolator, sqlGenerationContext );
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnDefinitions.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnDefinitions.java
index 944dff87d65a..282e6949021f 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnDefinitions.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnDefinitions.java
@@ -217,21 +217,36 @@ private static void appendColumnDefinition(
 				definition.append(" collate ").append( dialect.quoteCollation( collation ) );
 			}
 
+			final boolean requiresNotNullBeforeDefault = dialect.requiresNotNullBeforeDefault();
+			if ( requiresNotNullBeforeDefault ) {
+				if ( column.isNullable() ) {
+					definition.append( dialect.getNullColumnString( columnType ) );
+				}
+				else {
+					definition.append( " not null" );
+				}
+			}
+
 			final String defaultValue = column.getDefaultValue();
 			if ( defaultValue != null ) {
-				definition.append( " default " ).append( defaultValue );
+				definition.append( " default " ).append( dialect.getColumnDefaultString( defaultValue ) );
 			}
 
 			final String generatedAs = column.getGeneratedAs();
 			if ( generatedAs != null) {
 				definition.append( dialect.generatedAs( generatedAs ) );
+				if ( !dialect.supportsNotNullAfterGeneratedAs() ) {
+					return;
+				}
 			}
 
-			if ( column.isNullable() ) {
-				definition.append( dialect.getNullColumnString( columnType ) );
-			}
-			else {
-				definition.append( " not null" );
+			if ( !requiresNotNullBeforeDefault ) {
+				if ( column.isNullable() ) {
+					definition.append( dialect.getNullColumnString( columnType ) );
+				}
+				else {
+					definition.append( " not null" );
+				}
 			}
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnValue.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnValue.java
new file mode 100644
index 000000000000..7c07ebe3095f
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/ColumnValue.java
@@ -0,0 +1,173 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.schema.internal;
+
+import java.util.List;
+
+import org.hibernate.FetchMode;
+import org.hibernate.MappingException;
+import org.hibernate.boot.model.relational.Database;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.internal.util.collections.ArrayHelper;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Selectable;
+import org.hibernate.mapping.Table;
+import org.hibernate.mapping.Value;
+import org.hibernate.mapping.ValueVisitor;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.type.MappingContext;
+import org.hibernate.type.Type;
+
+public class ColumnValue implements Value {
+
+	private final Database database;
+	private final Table table;
+	private final Column column;
+	private final Type type;
+
+	public ColumnValue(Database database, Table table, Column column, Type type) {
+		this.database = database;
+		this.table = table;
+		this.column = column;
+		this.type = type;
+	}
+
+	@Override
+	public Value copy() {
+		return this;
+	}
+
+	@Override
+	public int getColumnSpan() {
+		return 1;
+	}
+
+	@Override
+	public List<Selectable> getSelectables() {
+		return List.of( column );
+	}
+
+	@Override
+	public List<Column> getColumns() {
+		return List.of( column );
+	}
+
+	@Override
+	public boolean hasColumns() {
+		return true;
+	}
+
+	@Override
+	public Type getType() {
+		return type;
+	}
+
+	@Override
+	public FetchMode getFetchMode() {
+		return null;
+	}
+
+	@Override
+	public Table getTable() {
+		return table;
+	}
+
+	@Override
+	public boolean hasFormula() {
+		return false;
+	}
+
+	@Override
+	public boolean isAlternateUniqueKey() {
+		return false;
+	}
+
+	@Override
+	public boolean isNullable() {
+		return false;
+	}
+
+	@Override
+	public boolean[] getColumnInsertability() {
+		return ArrayHelper.TRUE;
+	}
+
+	@Override
+	public boolean hasAnyInsertableColumns() {
+		return true;
+	}
+
+	@Override
+	public boolean[] getColumnUpdateability() {
+		return ArrayHelper.TRUE;
+	}
+
+	@Override
+	public boolean hasAnyUpdatableColumns() {
+		return true;
+	}
+
+	@Override
+	public void createForeignKey() {
+	}
+
+	@Override
+	public void createUniqueKey(MetadataBuildingContext context) {
+	}
+
+	@Override
+	public boolean isSimpleValue() {
+		return true;
+	}
+
+	@Override
+	public boolean isValid(MappingContext mappingContext) throws MappingException {
+		return false;
+	}
+
+	@Override
+	public void setTypeUsingReflection(String className, String propertyName) {
+	}
+
+	@Override
+	public Object accept(ValueVisitor visitor) {
+		return null;
+	}
+
+	@Override
+	public boolean isSame(Value value) {
+		return this == value;
+	}
+
+	@Override
+	public ServiceRegistry getServiceRegistry() {
+		return database.getServiceRegistry();
+	}
+
+	@Override
+	public boolean isColumnInsertable(int index) {
+		return true;
+	}
+
+	@Override
+	public boolean isColumnUpdateable(int index) {
+		return true;
+	}
+
+	@Override
+	public boolean isPartitionKey() {
+		return false;
+	}
+
+	@Override
+	public void setNonInsertable() {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void setNonUpdatable() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java
index a50505977429..a64fa6fe71cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardForeignKeyExporter.java
@@ -59,11 +59,11 @@ public String[] getSqlCreateStrings(ForeignKey foreignKey, Metadata metadata, Sq
 				new StringBuilder( dialect.getAlterTableString( sourceTableName ) )
 						.append( foreignKey.getKeyDefinition() != null
 								? dialect.getAddForeignKeyConstraintString(
-										foreignKey.getName(),
+										quotedConstraintName( foreignKey, metadata ),
 										foreignKey.getKeyDefinition()
 								)
 								: dialect.getAddForeignKeyConstraintString(
-										foreignKey.getName(),
+										quotedConstraintName( foreignKey, metadata ),
 										columnNames,
 										targetTableName,
 										targetColumnNames,
@@ -84,6 +84,11 @@ public String[] getSqlCreateStrings(ForeignKey foreignKey, Metadata metadata, Sq
 		return new String[] { buffer.toString() };
 	}
 
+	private String quotedConstraintName(ForeignKey foreignKey, Metadata metadata) {
+		return metadata.getDatabase().getJdbcEnvironment().getIdentifierHelper()
+				.toIdentifier( foreignKey.getName() ).render( dialect );
+	}
+
 	private static List<Column> getTargetColumns(ForeignKey foreignKey, int numberOfColumns) {
 		if ( foreignKey.isReferenceToPrimaryKey() ) {
 			final var primaryKey = foreignKey.getReferencedTable().getPrimaryKey();
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
index 1f5f17dd8c94..da44236e3ec8 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableExporter.java
@@ -118,6 +118,10 @@ public String[] getSqlCreateStrings(
 
 				applyTableCheck( table, createTable );
 
+				if ( isNotEmpty( table.getExtraDeclarations() ) ) {
+					createTable.append( ", " ).append( table.getExtraDeclarations() );
+				}
+
 				createTable.append( ')' );
 
 				createTable.append( extra );
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUserDefinedTypeExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUserDefinedTypeExporter.java
index 66bce88a7725..1a5260491243 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUserDefinedTypeExporter.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardUserDefinedTypeExporter.java
@@ -101,13 +101,15 @@ public String[] getSqlCreateStrings(
 	 */
 	protected void applyComments(UserDefinedObjectType udt, String formattedTypeName, List<String> sqlStrings) {
 		if ( dialect.supportsCommentOn() ) {
-			if ( udt.getComment() != null ) {
-				sqlStrings.add( "comment on type " + formattedTypeName + " is '" + udt.getComment() + "'" );
+			final String comment = udt.getComment();
+			if ( comment != null ) {
+				sqlStrings.add( "comment on type " + formattedTypeName + " is '" + comment + "'" );
 			}
 			for ( var column : udt.getColumns() ) {
 				final String columnComment = column.getComment();
 				if ( columnComment != null ) {
-					sqlStrings.add( "comment on column " + formattedTypeName + '.' + column.getQuotedName( dialect ) + " is '" + columnComment + "'" );
+					sqlStrings.add( "comment on column " + formattedTypeName + '.' + column.getQuotedName( dialect )
+									+ " is '" + columnComment + "'" );
 				}
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java
index 0d0ec6a2917d..81d410bfe0b8 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java
@@ -25,7 +25,7 @@
  */
 public class GenerationTargetToDatabase implements GenerationTarget {
 
-	private final DdlTransactionIsolator ddlTransactionIsolator;
+	public final DdlTransactionIsolator ddlTransactionIsolator;
 	private final boolean releaseAfterUse;
 
 	private Statement jdbcStatement;
@@ -70,6 +70,16 @@ public void beforeScript(ScriptSourceInput scriptSource) {
 
 	@Override
 	public void accept(String command) {
+		//TODO: temporary workaround DELETE ME
+		if ( ddlTransactionIsolator.getJdbcContext().getDialect().throttleDdl() ) {
+			try {
+				Thread.sleep( 20 );
+			}
+			catch (InterruptedException e) {
+				//ignore
+			}
+		}
+
 		getSqlStatementLogger().logStatement( command, FormatStyle.NONE.getFormatter() );
 		try {
 			final var statement = jdbcStatement();
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java
index 3155aa0792e4..039e92229634 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java
@@ -48,10 +48,9 @@ public List<String> extractCommands(Reader reader, Dialect dialect) {
 			return visitor.visitScript( scriptParseTree );
 		}
 		catch (Exception exception) {
-			if ( exception instanceof SqlScriptException sqlScriptException ) {
-				throw sqlScriptException;
-			}
-			throw new SqlScriptException( "Error during SQL script parsing", exception );
+			throw exception instanceof SqlScriptException sqlScriptException
+					? sqlScriptException
+					: new SqlScriptException( "Error during SQL script parsing", exception );
 		}
 	}
 
@@ -61,11 +60,11 @@ private static SqlScriptParser.ScriptContext buildScriptParseTree(Reader reader)
 	}
 
 	private static SqlScriptParser.ScriptContext buildScriptParseTree(SqlScriptLexer lexer) {
-		return buildScriptParseTree( lexer, new SqlScriptParser( new CommonTokenStream( lexer ) ) );
+		return buildScriptParseTree( new SqlScriptParser( new CommonTokenStream( lexer ) ) );
 	}
 
-	private static SqlScriptParser.ScriptContext buildScriptParseTree(SqlScriptLexer lexer, SqlScriptParser parser) {
-		// try to use SLL(k)-based parsing first - its faster
+	private static SqlScriptParser.ScriptContext buildScriptParseTree(SqlScriptParser parser) {
+		// try to use SLL(k)-based parsing first - it's faster
 		parser.getInterpreter().setPredictionMode( PredictionMode.SLL );
 		parser.removeErrorListeners();
 		parser.setErrorHandler( new BailErrorStrategy() );
@@ -74,9 +73,8 @@ private static SqlScriptParser.ScriptContext buildScriptParseTree(SqlScriptLexer
 		try {
 			return parser.script();
 		}
-		catch ( ParseCancellationException e) {
-			// reset the input token stream and parser state
-			lexer.reset();
+		catch ( ParseCancellationException e ) {
+			// reset the parser state (do not reset the input token stream)
 			parser.reset();
 
 			// fall back to LL(k)-based parsing
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java
index fd77867d283b..31165432325b 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java
@@ -777,7 +777,13 @@ private static Action databaseActionToUse(
 		}
 
 		public static Set<ActionGrouping> interpret(Metadata metadata, Map<?, ?> configuration) {
-			return interpret( metadata.getContributors(), configuration );
+			Set<String> contributors = metadata.getContributors();
+			if ( contributors.isEmpty() ) {
+				// even with no contributors (e.g. no entities), schema actions
+				// such as import.sql execution should still be processed
+				contributors = Set.of( "orm" );
+			}
+			return interpret( contributors, configuration );
 		}
 
 		@Deprecated(since = "7.2", forRemoval = true)
diff --git a/hibernate-core/src/main/java/org/hibernate/transform/package-info.java b/hibernate-core/src/main/java/org/hibernate/transform/package-info.java
index ca18195645d0..99b4f9e21fc7 100644
--- a/hibernate-core/src/main/java/org/hibernate/transform/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/transform/package-info.java
@@ -6,7 +6,7 @@
 /**
  * Defines strategies for post-processing criteria query
  * results into a form convenient to the application.
- * <p>
+ *
  * @apiNote This entire package is considered deprecated.  Use
  * {@link org.hibernate.query.TupleTransformer} and/or
  * {@link org.hibernate.query.ResultListTransformer}
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java b/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java
index ddaa61cdb263..79fe41043f8c 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/PropertyFactory.java
@@ -4,10 +4,6 @@
  */
 package org.hibernate.tuple;
 
-import org.hibernate.HibernateException;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.boot.spi.SessionFactoryOptions;
-import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementHelper;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.generator.Generator;
 import org.hibernate.mapping.PersistentClass;
@@ -26,6 +22,8 @@
 import org.hibernate.type.EntityType;
 import org.hibernate.type.Type;
 
+import static org.hibernate.bytecode.enhance.spi.interceptor.EnhancementHelper.includeInBaseFetchGroup;
+
 /**
  * @deprecated No direct replacement
  */
@@ -45,9 +43,8 @@ private PropertyFactory() {
 	public static IdentifierProperty buildIdentifierAttribute(
 			PersistentClass mappedEntity,
 			Generator generator) {
-		Type type = mappedEntity.getIdentifier().getType();
-		Property property = mappedEntity.getIdentifierProperty();
-
+		final var type = mappedEntity.getIdentifier().getType();
+		final var property = mappedEntity.getIdentifierProperty();
 		if ( property == null ) {
 			// this is a virtual id property...
 			return new IdentifierProperty(
@@ -82,9 +79,7 @@ public static VersionProperty buildVersionProperty(
 			int attributeNumber,
 			Property property,
 			boolean lazyAvailable) {
-
-		boolean lazy = lazyAvailable && property.isLazy();
-
+		final boolean lazy = lazyAvailable && property.isLazy();
 		return new VersionProperty(
 				persister,
 				sessionFactory,
@@ -127,9 +122,7 @@ public static NonIdentifierAttribute buildEntityBasedAttribute(
 			Property property,
 			boolean lazyAvailable,
 			RuntimeModelCreationContext creationContext) {
-		final Type type = property.getValue().getType();
-
-		final NonIdentifierAttributeNature nature = decode( type );
+		final var type = property.getValue().getType();
 
 		// we need to dirty check collections, since they can cause an owner
 		// version number increment
@@ -138,89 +131,82 @@ public static NonIdentifierAttribute buildEntityBasedAttribute(
 		// to update the cache (not the database), since in this case a null
 		// entity reference can lose information
 
-		boolean alwaysDirtyCheck = type.isAssociationType()
+		final boolean alwaysDirtyCheck = type.isAssociationType()
 				&& ( (AssociationType) type ).isAlwaysDirtyChecked();
 
-		SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions();
-		final boolean lazy = ! EnhancementHelper.includeInBaseFetchGroup(
+		final boolean lazy = !includeInBaseFetchGroup(
 				property,
 				lazyAvailable,
 				entityName -> {
-					final MetadataImplementor metadata = creationContext.getMetadata();
-					final PersistentClass entityBinding = metadata.getEntityBinding( entityName );
+					final var entityBinding =
+							creationContext.getMetadata()
+									.getEntityBinding( entityName );
 					assert entityBinding != null;
 					return entityBinding.hasSubclasses();
 				},
-				sessionFactoryOptions.isCollectionsInDefaultFetchGroupEnabled()
+				sessionFactory.getSessionFactoryOptions()
+						.isCollectionsInDefaultFetchGroupEnabled()
 		);
 
-		switch ( nature ) {
-			case BASIC: {
-				return new EntityBasedBasicAttribute(
-						persister,
-						sessionFactory,
-						attributeNumber,
-						property.getName(),
-						type,
-						new BaselineAttributeInformation.Builder()
-								.setLazy( lazy )
-								.setInsertable( property.isInsertable() )
-								.setUpdateable( property.isUpdatable() )
-								.setNullable( property.isOptional() )
-								.setDirtyCheckable( alwaysDirtyCheck || property.isUpdatable() )
-								.setVersionable( property.isOptimisticLocked() )
-								.setCascadeStyle( property.getCascadeStyle() )
-								.setOnDeleteAction( property.getOnDeleteAction() )
-								.setFetchMode( property.getValue().getFetchMode() )
-								.createInformation()
-				);
-			}
-			case COMPOSITE: {
-				return new EntityBasedCompositionAttribute(
-						persister,
-						sessionFactory,
-						attributeNumber,
-						property.getName(),
-						(CompositeType) type,
-						new BaselineAttributeInformation.Builder()
-								.setLazy( lazy )
-								.setInsertable( property.isInsertable() )
-								.setUpdateable( property.isUpdatable() )
-								.setNullable( property.isOptional() )
-								.setDirtyCheckable( alwaysDirtyCheck || property.isUpdatable() )
-								.setVersionable( property.isOptimisticLocked() )
-								.setCascadeStyle( property.getCascadeStyle() )
-								.setOnDeleteAction( property.getOnDeleteAction() )
-								.setFetchMode( property.getValue().getFetchMode() )
-								.createInformation()
-				);
-			}
-			case ENTITY:
-			case ANY:
-			case COLLECTION: {
-				return new EntityBasedAssociationAttribute(
-						persister,
-						sessionFactory,
-						attributeNumber,
-						property.getName(),
-						(AssociationType) type,
-						new BaselineAttributeInformation.Builder()
-								.setLazy( lazy )
-								.setInsertable( property.isInsertable() )
-								.setUpdateable( property.isUpdatable() )
-								.setNullable( property.isOptional() )
-								.setDirtyCheckable( alwaysDirtyCheck || property.isUpdatable() )
-								.setVersionable( property.isOptimisticLocked() )
-								.setCascadeStyle( property.getCascadeStyle() )
-								.setOnDeleteAction( property.getOnDeleteAction() )
-								.setFetchMode( property.getValue().getFetchMode() )
-								.createInformation()
-				);
-			}
-			default: {
-				throw new HibernateException( "Internal error" );
-			}
-		}
+		return switch ( decode( type ) ) {
+			case BASIC ->
+					new EntityBasedBasicAttribute(
+							persister,
+							sessionFactory,
+							attributeNumber,
+							property.getName(),
+							type,
+							new BaselineAttributeInformation.Builder()
+									.setLazy( lazy )
+									.setInsertable( property.isInsertable() )
+									.setUpdateable( property.isUpdatable() )
+									.setNullable( property.isOptional() )
+									.setDirtyCheckable( alwaysDirtyCheck || property.isUpdatable() )
+									.setVersionable( property.isOptimisticLocked() )
+									.setCascadeStyle( property.getCascadeStyle() )
+									.setOnDeleteAction( property.getOnDeleteAction() )
+									.setFetchMode( property.getValue().getFetchMode() )
+									.createInformation()
+					);
+			case COMPOSITE ->
+					new EntityBasedCompositionAttribute(
+							persister,
+							sessionFactory,
+							attributeNumber,
+							property.getName(),
+							(CompositeType) type,
+							new BaselineAttributeInformation.Builder()
+									.setLazy( lazy )
+									.setInsertable( property.isInsertable() )
+									.setUpdateable( property.isUpdatable() )
+									.setNullable( property.isOptional() )
+									.setDirtyCheckable( alwaysDirtyCheck || property.isUpdatable() )
+									.setVersionable( property.isOptimisticLocked() )
+									.setCascadeStyle( property.getCascadeStyle() )
+									.setOnDeleteAction( property.getOnDeleteAction() )
+									.setFetchMode( property.getValue().getFetchMode() )
+									.createInformation()
+					);
+			case ENTITY, ANY, COLLECTION ->
+					new EntityBasedAssociationAttribute(
+							persister,
+							sessionFactory,
+							attributeNumber,
+							property.getName(),
+							(AssociationType) type,
+							new BaselineAttributeInformation.Builder()
+									.setLazy( lazy )
+									.setInsertable( property.isInsertable() )
+									.setUpdateable( property.isUpdatable() )
+									.setNullable( property.isOptional() )
+									.setDirtyCheckable( alwaysDirtyCheck || property.isUpdatable() )
+									.setVersionable( property.isOptimisticLocked() )
+									.setCascadeStyle( property.getCascadeStyle() )
+									.setOnDeleteAction( property.getOnDeleteAction() )
+									.setFetchMode( property.getValue().getFetchMode() )
+									.createInformation()
+					);
+		};
 	}
 
 	private static NonIdentifierAttributeNature decode(Type type) {
@@ -240,5 +226,4 @@ else if ( type instanceof ComponentType ) {
 			return NonIdentifierAttributeNature.BASIC;
 		}
 	}
-
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java
index 6f9c4ce3c043..53fdc3d8283a 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/CompositeGeneratorBuilder.java
@@ -13,10 +13,9 @@
 import org.hibernate.generator.OnExecutionGenerator;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.Property;
-import org.hibernate.metamodel.mapping.EmbeddableMappingType;
-import org.hibernate.persister.entity.EntityPersister;
 
 import java.util.ArrayList;
+import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.List;
 
@@ -47,10 +46,11 @@ public void add(Generator generator) {
 		generators.add( generator );
 
 		if ( generator != null && generator.generatesSometimes() ) {
-			if ( generator.generatedOnExecution() ) {
+			if ( generator instanceof OnExecutionGenerator
+					&& generator.generatedOnExecution() ) {
 				hadOnExecutionGeneration = true;
 			}
-			else {
+			if ( generator instanceof BeforeExecutionGenerator ) {
 				hadBeforeExecutionGeneration = true;
 			}
 		}
@@ -58,10 +58,7 @@ public void add(Generator generator) {
 
 	public Generator build() {
 		if ( hadBeforeExecutionGeneration && hadOnExecutionGeneration ) {
-			throw new CompositeValueGenerationException(
-					"Composite attribute contained both on-execution and before-execution generators: "
-							+ mappingProperty.getName()
-			);
+			return createCompositeMixedTimingGenerator();
 		}
 		else if ( hadBeforeExecutionGeneration ) {
 			return createCompositeBeforeExecutionGenerator();
@@ -74,64 +71,103 @@ else if ( hadOnExecutionGeneration ) {
 		}
 	}
 
-	private OnExecutionGenerator createCompositeOnExecutionGenerator() {
-		final Component composite = (Component) mappingProperty.getValue();
+	private Generator createCompositeMixedTimingGenerator() {
+		final var onExecutionGenerator = createCompositeOnExecutionGenerator();
+		final var beforeExecutionGenerator = createCompositeBeforeExecutionGenerator();
+		final var eventTypes = EnumSet.noneOf( EventType.class );
+		eventTypes.addAll( onExecutionGenerator.getEventTypes() );
+		eventTypes.addAll( beforeExecutionGenerator.getEventTypes() );
+		return new CompositeOnAndBeforeExecutionGenerator(
+				eventTypes,
+				generators,
+				onExecutionGenerator,
+				beforeExecutionGenerator
+		);
+	}
+
+	private CompositeOnExecutionGenerator createCompositeOnExecutionGenerator() {
+		final var composite = (Component) mappingProperty.getValue();
+		final var properties = composite.getProperties();
+		final int columnSpan = composite.getColumnSpan();
 
-		// the base-line values for the aggregated OnExecutionGenerator we will build here.
-		final EnumSet<EventType> eventTypes = EnumSet.noneOf(EventType.class);
-		boolean referenceColumns = false;
-		boolean writable = false;
-		boolean mutable = false;
-		final String[] columnValues = new String[composite.getColumnSpan()];
+		final var eventTypes = EnumSet.noneOf( EventType.class );
+		for ( int i = 0; i < properties.size(); i++ ) {
+			final var generator = generators.get( i );
+			if ( generator != null && generator.generatesSometimes() ) {
+				eventTypes.addAll( generator.getEventTypes() );
+			}
+		}
 
-		// start building the aggregate values
+		final var columnValueDetailsByEvent =
+				new EnumMap<EventType, ColumnValueDetails>( EventType.class );
+		for ( var eventType : eventTypes ) {
+			columnValueDetailsByEvent.put( eventType,
+					new ColumnValueDetails( columnSpan ) );
+		}
+
+		boolean mutable = false;
 		int columnIndex = 0;
-		final List<Property> properties = composite.getProperties();
 		for ( int i = 0; i < properties.size(); i++ ) {
-			final Property property = properties.get(i);
-			final OnExecutionGenerator generator = (OnExecutionGenerator) generators.get(i);
-			if ( generator == null ) {
-				throw new CompositeValueGenerationException(
-						"Property of on-execution generated embeddable is not generated: "
-								+ mappingProperty.getName() + '.' + property.getName()
-				);
+			final var property = properties.get( i );
+			final int span = property.getColumnSpan();
+			final var generator = generators.get( i );
+			if ( generator != null ) {
+				mutable = mutable || generator.allowMutation();
 			}
-			eventTypes.addAll( generator.getEventTypes() );
-			if ( generator.referenceColumnsInSql( dialect ) ) {
-				// override base-line value
-				referenceColumns = true;
-				final String[] referencedColumnValues = generator.getReferencedColumnValues( dialect );
-				if ( referencedColumnValues != null ) {
-					final int span = property.getColumnSpan();
-					if ( referencedColumnValues.length != span ) {
-						throw new CompositeValueGenerationException(
-								"Mismatch between number of collected generated column values and number of columns for composite attribute: "
-										+ mappingProperty.getName() + '.' + property.getName()
-						);
+			if ( generator instanceof OnExecutionGenerator onExecutionGenerator
+					&& generator.generatedOnExecution() ) {
+				final var generatorEventTypes = generator.getEventTypes();
+				for ( var eventType : eventTypes ) {
+					final var details = columnValueDetailsByEvent.get( eventType );
+					if ( details != null ) {
+						if ( generatorEventTypes.contains( eventType ) ) {
+							if ( !onExecutionGenerator.referenceColumnsInSql( dialect, eventType ) ) {
+								details.excludeColumns( columnIndex, span );
+							}
+							else if ( onExecutionGenerator.writePropertyValue( eventType ) ) {
+								// leave the default parameter marker values in place
+							}
+							else {
+								final String[] referencedColumnValues =
+										onExecutionGenerator.getReferencedColumnValues( dialect, eventType );
+								if ( referencedColumnValues == null ) {
+									throw new CompositeValueGenerationException(
+											"Generated column values were not provided for composite attribute: "
+											+ mappingProperty.getName() + '.' + property.getName()
+									);
+								}
+								if ( referencedColumnValues.length != span ) {
+									throw new CompositeValueGenerationException(
+											"Mismatch between number of collected generated column values and number of columns for composite attribute: "
+											+ mappingProperty.getName() + '.' + property.getName()
+									);
+								}
+								details.setColumnValues( columnIndex, referencedColumnValues );
+							}
+						}
+						else if ( !onExecutionGenerator.allowMutation() ) {
+							details.excludeColumns( columnIndex, span );
+						}
 					}
-					arraycopy( referencedColumnValues, 0, columnValues, columnIndex, span );
-					columnIndex += span;
 				}
 			}
-			if ( generator.writePropertyValue() ) {
-				writable = true;
-			}
-			if ( generator.allowMutation() ) {
-				mutable = true;
-			}
+			columnIndex += span;
+		}
+
+		for ( var details : columnValueDetailsByEvent.values() ) {
+			details.finalizeDetails();
 		}
 
-		// then use the aggregated values to build an OnExecutionGenerator
-		return new CompositeOnExecutionGenerator( eventTypes, referenceColumns, columnValues, writable, mutable );
+		return new CompositeOnExecutionGenerator( eventTypes, columnValueDetailsByEvent, mutable );
 	}
 
-	private BeforeExecutionGenerator createCompositeBeforeExecutionGenerator() {
-		final Component composite = (Component) mappingProperty.getValue();
-		final EnumSet<EventType> eventTypes = EnumSet.noneOf(EventType.class);
-		final List<Property> properties = composite.getProperties();
+	private CompositeBeforeExecutionGenerator createCompositeBeforeExecutionGenerator() {
+		final var composite = (Component) mappingProperty.getValue();
+		final var eventTypes = EnumSet.noneOf(EventType.class);
+		final var properties = composite.getProperties();
 		for ( int i = 0; i < properties.size(); i++ ) {
-			final Generator generator = generators.get(i);
-			if ( generator != null ) {
+			final var generator = generators.get(i);
+			if ( generator instanceof BeforeExecutionGenerator ) {
 				eventTypes.addAll( generator.getEventTypes() );
 			}
 		}
@@ -140,23 +176,123 @@ private BeforeExecutionGenerator createCompositeBeforeExecutionGenerator() {
 
 	private record CompositeOnExecutionGenerator(
 			EnumSet<EventType> eventTypes,
-			boolean referenceColumnsInSql,
-			String[] columnValues,
-			boolean writePropertyValue,
+			EnumMap<EventType, ColumnValueDetails> columnValueDetailsByEvent,
 			boolean allowMutation)
 				implements OnExecutionGenerator {
+
+		@Override
+		public EnumSet<EventType> getEventTypes() {
+			return eventTypes;
+		}
+
 		@Override
 		public boolean referenceColumnsInSql(Dialect dialect) {
-			return referenceColumnsInSql;
+			for ( var details : columnValueDetailsByEvent.values() ) {
+				if ( details.hasIncludedColumns() ) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		@Override
+		public boolean referenceColumnsInSql(Dialect dialect, EventType eventType) {
+			final var details = columnValueDetailsByEvent.get( eventType );
+			return details != null && details.hasIncludedColumns();
+		}
+
+		@Override
+		public boolean writePropertyValue() {
+			for ( var details : columnValueDetailsByEvent.values() ) {
+				if ( details.needsValueBinding() ) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		@Override
+		public boolean writePropertyValue(EventType eventType) {
+			final var details = columnValueDetailsByEvent.get( eventType );
+			return details != null && details.needsValueBinding();
 		}
+
 		@Override
 		public String[] getReferencedColumnValues(Dialect dialect) {
-			return columnValues;
+			final var details = columnValueDetailsByEvent.get( EventType.INSERT );
+			return details != null
+					? details.columnValues()
+					: columnValueDetailsByEvent.values().iterator().next().columnValues();
 		}
 
 		@Override
-		public EnumSet<EventType> getEventTypes() {
-			return eventTypes;
+		public String[] getReferencedColumnValues(Dialect dialect, EventType eventType) {
+			final var details = columnValueDetailsByEvent.get( eventType );
+			return details == null ? null : details.columnValues();
+		}
+
+		@Override
+		public boolean[] getColumnInclusions(Dialect dialect, EventType eventType) {
+			final var details = columnValueDetailsByEvent.get( eventType );
+			return details == null ? null : details.columnInclusions();
+		}
+
+	}
+
+	private static final class ColumnValueDetails {
+		private final String[] columnValues;
+		private final boolean[] columnInclusions;
+		private boolean hasIncludedColumns;
+		private boolean needsValueBinding;
+
+		private ColumnValueDetails(int columnSpan) {
+			columnValues = new String[columnSpan];
+			columnInclusions = new boolean[columnSpan];
+			for ( int i = 0; i < columnSpan; i++ ) {
+				columnValues[i] = "?";
+				columnInclusions[i] = true;
+			}
+		}
+
+		private void excludeColumns(int start, int span) {
+			for ( int i = 0; i < span; i++ ) {
+				columnInclusions[start + i] = false;
+			}
+		}
+
+		private void setColumnValues(int start, String[] values) {
+			arraycopy( values, 0, columnValues, start, values.length );
+		}
+
+		private void finalizeDetails() {
+			boolean included = false;
+			boolean needsBinding = false;
+			for ( int i = 0; i < columnValues.length; i++ ) {
+				if ( columnInclusions[i] ) {
+					included = true;
+					if ( "?".equals( columnValues[i] ) ) {
+						needsBinding = true;
+					}
+				}
+			}
+			hasIncludedColumns = included;
+			needsValueBinding = needsBinding;
+		}
+
+		private boolean hasIncludedColumns() {
+			return hasIncludedColumns;
+		}
+
+		private boolean needsValueBinding() {
+			return needsValueBinding;
+		}
+
+		private String[] columnValues() {
+			return columnValues;
+		}
+
+		private boolean[] columnInclusions() {
+			return columnInclusions;
 		}
 	}
 
@@ -173,30 +309,32 @@ public EnumSet<EventType> getEventTypes() {
 		}
 		@Override
 		public Object generate(SharedSessionContractImplementor session, Object owner, Object currentValue, EventType eventType) {
-			final EntityPersister persister = session.getEntityPersister( entityName, owner );
+			final var persister = session.getEntityPersister( entityName, owner );
 			final int index = persister.getPropertyIndex( mappingProperty.getName() );
-			final EmbeddableMappingType descriptor =
+			final var descriptor =
 					persister.getAttributeMapping( index ).asEmbeddedAttributeMapping()
 							.getEmbeddableTypeDescriptor();
 			final int size = properties.size();
 			if ( currentValue == null ) {
-				final Object[] generatedValues = new Object[size];
+				final var generatedValues = new Object[size];
 				for ( int i = 0; i < size; i++ ) {
-					final Generator generator = generators.get( i );
-					if ( generator != null && generator.getEventTypes().contains( eventType ) ) {
-						generatedValues[i] = ((BeforeExecutionGenerator) generator)
-								.generate( session, owner, null, eventType );
+					final var generator = generators.get( i );
+					if ( generator instanceof BeforeExecutionGenerator beforeExecutionGenerator
+							&& generator.getEventTypes().contains( eventType )
+							&& generator.generatedBeforeExecution( owner, session ) ) {
+						generatedValues[i] = beforeExecutionGenerator.generate( session, owner, null, eventType );
 					}
 				}
 				return descriptor.getRepresentationStrategy().getInstantiator().instantiate( () -> generatedValues );
 			}
 			else {
 				for ( int i = 0; i < size; i++ ) {
-					final Generator generator = generators.get( i );
-					if ( generator != null && generator.getEventTypes().contains( eventType ) ) {
+					final var generator = generators.get( i );
+					if ( generator instanceof BeforeExecutionGenerator beforeExecutionGenerator
+							&& generator.getEventTypes().contains( eventType )
+							&& generator.generatedBeforeExecution( owner, session ) ) {
 						final Object value = descriptor.getValue( currentValue, i );
-						final Object generatedValue = ((BeforeExecutionGenerator) generator)
-								.generate( session, owner, value, eventType );
+						final Object generatedValue = beforeExecutionGenerator.generate( session, owner, value, eventType );
 						descriptor.setValue( currentValue, i, generatedValue );
 					}
 				}
@@ -205,6 +343,93 @@ public Object generate(SharedSessionContractImplementor session, Object owner, O
 		}
 	}
 
+	private record CompositeOnAndBeforeExecutionGenerator(
+			EnumSet<EventType> eventTypes,
+			List<Generator> generators,
+			CompositeOnExecutionGenerator onExecutionGenerator,
+			CompositeBeforeExecutionGenerator beforeExecutionGenerator)
+				implements OnExecutionGenerator, BeforeExecutionGenerator {
+
+		@Override
+		public EnumSet<EventType> getEventTypes() {
+			return eventTypes;
+		}
+
+		@Override
+		public boolean generatedOnExecution() {
+			return true;
+		}
+
+		@Override
+		public Object generate(SharedSessionContractImplementor session, Object owner, Object currentValue, EventType eventType) {
+			return beforeExecutionGenerator.generate( session, owner, currentValue, eventType );
+		}
+
+		@Override
+		public boolean generatedOnExecution(Object entity, SharedSessionContractImplementor session) {
+			for ( var generator : generators ) {
+				if ( generator instanceof OnExecutionGenerator
+						&& generator.generatesSometimes()
+						&& generator.generatedOnExecution( entity, session ) ) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		@Override
+		public boolean generatedBeforeExecution(Object entity, SharedSessionContractImplementor session) {
+			for ( var generator : generators ) {
+				if ( generator instanceof BeforeExecutionGenerator
+						&& generator.generatesSometimes()
+						&& generator.generatedBeforeExecution( entity, session ) ) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		@Override
+		public boolean referenceColumnsInSql(Dialect dialect) {
+			return onExecutionGenerator.referenceColumnsInSql( dialect );
+		}
+
+		@Override
+		public boolean referenceColumnsInSql(Dialect dialect, EventType eventType) {
+			return onExecutionGenerator.referenceColumnsInSql( dialect, eventType );
+		}
+
+		@Override
+		public boolean writePropertyValue() {
+			return onExecutionGenerator.writePropertyValue();
+		}
+
+		@Override
+		public boolean writePropertyValue(EventType eventType) {
+			return onExecutionGenerator.writePropertyValue( eventType );
+		}
+
+		@Override
+		public String[] getReferencedColumnValues(Dialect dialect) {
+			return onExecutionGenerator.getReferencedColumnValues( dialect );
+		}
+
+		@Override
+		public String[] getReferencedColumnValues(Dialect dialect, EventType eventType) {
+			return onExecutionGenerator.getReferencedColumnValues( dialect, eventType );
+		}
+
+		@Override
+		public boolean[] getColumnInclusions(Dialect dialect, EventType eventType) {
+			return onExecutionGenerator.getColumnInclusions( dialect, eventType );
+		}
+
+		@Override
+		public boolean allowMutation() {
+			return onExecutionGenerator.allowMutation();
+		}
+	}
+
 	private record DummyGenerator() implements Generator {
 		private static final Generator INSTANCE = new DummyGenerator();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
index 10bb21d96862..64af0265b625 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
@@ -28,6 +28,7 @@
 import org.hibernate.engine.spi.CascadeStyles;
 import org.hibernate.engine.spi.CascadingActions;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.generator.EventType;
 import org.hibernate.generator.Generator;
 import org.hibernate.generator.OnExecutionGenerator;
 import org.hibernate.generator.BeforeExecutionGenerator;
@@ -307,7 +308,8 @@ public EntityMetamodel(
 					}
 					if ( generator.generatesOnInsert() ) {
 						if ( generatedOnExecution ) {
-							propertyInsertability[i] = writePropertyValue( (OnExecutionGenerator) generator );
+							propertyInsertability[i] =
+									writePropertyValue( (OnExecutionGenerator) generator, EventType.INSERT );
 						}
 						foundPostInsertGeneratedValues = foundPostInsertGeneratedValues
 								|| generatedOnExecution;
@@ -320,7 +322,8 @@ else if ( !allowMutation ) {
 					}
 					if ( generator.generatesOnUpdate() ) {
 						if ( generatedOnExecution ) {
-							propertyUpdateability[i] = writePropertyValue( (OnExecutionGenerator) generator );
+							propertyUpdateability[i] =
+									writePropertyValue( (OnExecutionGenerator) generator, EventType.UPDATE );
 						}
 						foundPostUpdateGeneratedValues = foundPostInsertGeneratedValues
 								|| generatedOnExecution;
@@ -578,8 +581,8 @@ protected BytecodeEnhancementMetadata getBytecodeEnhancementMetadataPojo(Persist
 		);
 	}
 
-	private static boolean writePropertyValue(OnExecutionGenerator generator) {
-		final boolean writePropertyValue = generator.writePropertyValue();
+	private static boolean writePropertyValue(OnExecutionGenerator generator, EventType eventType) {
+		final boolean writePropertyValue = generator.writePropertyValue( eventType );
 		// TODO: move this validation somewhere else!
 //		if ( !writePropertyValue && generator instanceof BeforeExecutionGenerator ) {
 //			throw new HibernateException( "BeforeExecutionGenerator returned false from OnExecutionGenerator.writePropertyValue()" );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java b/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java
index d41f3de19ffc..5da4df670708 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java
@@ -14,7 +14,6 @@
 import java.util.Map;
 
 import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -55,18 +54,18 @@ public abstract class AbstractStandardBasicType<T>
 
 	public AbstractStandardBasicType(JdbcType jdbcType, JavaType<T> javaType) {
 		this.jdbcType = jdbcType;
-		this.sqlTypes = new int[] { jdbcType.getDdlTypeCode() };
 		this.javaType = javaType;
+		sqlTypes = new int[] { jdbcType.getDdlTypeCode() };
 
-		this.jdbcValueBinder = jdbcType.getBinder( javaType );
-		this.jdbcValueExtractor = jdbcType.getExtractor( javaType );
-		this.jdbcLiteralFormatter = jdbcType.getJdbcLiteralFormatter( javaType );
+		jdbcValueBinder = jdbcType.getBinder( javaType );
+		jdbcValueExtractor = jdbcType.getExtractor( javaType );
+		jdbcLiteralFormatter = jdbcType.getJdbcLiteralFormatter( javaType );
 
 		//A very simple dispatch optimisation, make these a constant:
-		this.javaTypeClass = javaType.getJavaTypeClass();
-		this.mutabilityPlan = javaType.getMutabilityPlan();
-		this.javatypeComparator = javaType.getComparator();
-		this.typeForEqualsHashCode = javaType.useObjectEqualsHashCode() ? null : this;
+		javaTypeClass = javaType.getJavaTypeClass();
+		mutabilityPlan = javaType.getMutabilityPlan();
+		javatypeComparator = javaType.getComparator();
+		typeForEqualsHashCode = javaType.useObjectEqualsHashCode() ? null : this;
 	}
 
 	@Override
@@ -94,7 +93,7 @@ public T fromString(CharSequence string) {
 	}
 
 	protected MutabilityPlan<T> getMutabilityPlan() {
-		return this.mutabilityPlan;
+		return mutabilityPlan;
 	}
 
 	@Override
@@ -174,7 +173,6 @@ public final boolean isEqual(Object x, Object y, SessionFactoryImplementor facto
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public boolean isEqual(Object one, Object another) {
 		if ( one == another ) {
 			return true;
@@ -186,19 +184,15 @@ else if ( typeForEqualsHashCode == null ) {
 			return one.equals( another );
 		}
 		else {
-			return javaType.areEqual( (T) one, (T) another );
+			return javaType.areEqual( javaType.cast( one ), javaType.cast(  another ) );
 		}
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public int getHashCode(Object x) {
-		if ( typeForEqualsHashCode == null ) {
-			return x.hashCode();
-		}
-		else {
-			return javaType.extractHashCode( (T) x );
-		}
+	public int getHashCode(Object object) {
+		return typeForEqualsHashCode == null
+				? object.hashCode()
+				: javaType.extractHashCode( javaType.cast( object ) );
 	}
 
 	@Override
@@ -212,9 +206,8 @@ public final int getHashCode(Object x, SessionFactoryImplementor factory) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public final int compare(Object x, Object y) {
-		return this.javatypeComparator.compare( (T) x, (T) y );
+		return this.javatypeComparator.compare( javaType.cast( x ) , javaType.cast( y )  );
 	}
 
 	@Override
@@ -228,9 +221,11 @@ public final boolean isDirty(Object old, Object current, boolean[] checkable, Sh
 	}
 
 	protected final boolean isDirty(Object old, Object current) {
-		// MutableMutabilityPlan.INSTANCE is a special plan for which we always have to assume the value is dirty,
-		// because we can't actually copy a value, but have no knowledge about the mutability of the java type
-		return getMutabilityPlan() == MutableMutabilityPlan.INSTANCE || !isSame( old, current );
+		// MutableMutabilityPlan.INSTANCE is a special plan for which we always
+		// have to assume the value is dirty, because we can't actually copy a
+		// value, but have no knowledge about the mutability of the java type
+		return getMutabilityPlan() == MutableMutabilityPlan.INSTANCE
+			|| !isSame( old, current );
 	}
 
 	@Override
@@ -247,22 +242,23 @@ public final void nullSafeSet(
 			PreparedStatement st,
 			Object value,
 			int index,
-			final SharedSessionContractImplementor session) throws SQLException {
-		//noinspection unchecked
-		nullSafeSet( st, (T) value, index, (WrapperOptions) session );
+			final SharedSessionContractImplementor session)
+				throws SQLException {
+		nullSafeSet( st, javaType.cast( value ) , index, (WrapperOptions) session );
 	}
 
-	protected void nullSafeSet(PreparedStatement st, T value, int index, WrapperOptions options) throws SQLException {
+	protected void nullSafeSet(PreparedStatement st, T value, int index, WrapperOptions options)
+			throws SQLException {
 		getJdbcValueBinder().bind( st, value, index, options );
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public final String toLoggableString(Object value, SessionFactoryImplementor factory) {
-		if ( value == LazyPropertyInitializer.UNFETCHED_PROPERTY || !Hibernate.isInitialized( value ) ) {
-			return  "<uninitialized>";
-		}
-		return javaType.extractLoggableRepresentation( (T) value );
+		return value == LazyPropertyInitializer.UNFETCHED_PROPERTY
+			|| !Hibernate.isInitialized( value )
+				? "<uninitialized>"
+				: javaType.extractLoggableRepresentation(
+						javaType.cast( javaType.coerce( value ) ) );
 	}
 
 	@Override
@@ -271,23 +267,17 @@ public final boolean isMutable() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public final Object deepCopy(Object value, SessionFactoryImplementor factory) {
-		return deepCopy( (T) value );
-	}
-
-	protected final T deepCopy(T value) {
-		return getMutabilityPlan().deepCopy( value );
+	public Object deepCopy(Object value, SessionFactoryImplementor factory) {
+		return getMutabilityPlan().deepCopy( javaType.cast( value ) );
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public final Serializable disassemble(Object value, SharedSessionContractImplementor session, Object owner) throws HibernateException {
-		return getMutabilityPlan().disassemble( (T) value, session );
+	public final Serializable disassemble(Object value, SharedSessionContractImplementor session, Object owner) {
+		return getMutabilityPlan().disassemble( javaType.cast( value ), session );
 	}
 
 	@Override
-	public final Object assemble(Serializable cached, SharedSessionContractImplementor session, Object owner) throws HibernateException {
+	public final Object assemble(Serializable cached, SharedSessionContractImplementor session, Object owner) {
 		return getMutabilityPlan().assemble( cached, session );
 	}
 
@@ -296,16 +286,14 @@ public final void beforeAssemble(Serializable cached, SharedSessionContractImple
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public final Object replace(Object original, Object target, SharedSessionContractImplementor session, Object owner, Map<Object, Object> copyCache) {
 		return original == null && target == null
 				? null
-				: javaType.getReplacement( (T) original, (T) target, session );
+				: javaType.getReplacement( javaType.cast( original ), javaType.cast( target ), session );
 
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public Object replace(
 			Object original,
 			Object target,
@@ -314,6 +302,9 @@ public Object replace(
 			Map<Object, Object> copyCache,
 			ForeignKeyDirection foreignKeyDirection) {
 		return ForeignKeyDirection.FROM_PARENT == foreignKeyDirection
+				// TODO: use cast() .. currently failing on embeddable discriminators where
+				//       the concrete class is passed in instead of its disciminator value
+//				? javaType.getReplacement( javaType.cast( original ) , javaType.cast( target ) , session )
 				? javaType.getReplacement( (T) original, (T) target, session )
 				: target;
 	}
@@ -325,20 +316,12 @@ public boolean canDoExtraction() {
 
 	@Override
 	public T extract(CallableStatement statement, int startIndex, final SharedSessionContractImplementor session) throws SQLException {
-		return getJdbcValueExtractor().extract(
-				statement,
-				startIndex,
-				session
-		);
+		return getJdbcValueExtractor().extract( statement, startIndex, session );
 	}
 
 	@Override
 	public T extract(CallableStatement statement, String paramName, final SharedSessionContractImplementor session) throws SQLException {
-		return getJdbcValueExtractor().extract(
-				statement,
-				paramName,
-				session
-		);
+		return getJdbcValueExtractor().extract( statement, paramName, session );
 	}
 
 	@Override
@@ -347,7 +330,8 @@ public void nullSafeSet(
 			Object value,
 			int index,
 			boolean[] settable,
-			SharedSessionContractImplementor session) throws SQLException {
+			SharedSessionContractImplementor session)
+				throws SQLException {
 
 	}
 
@@ -356,9 +340,8 @@ public void nullSafeSet(CallableStatement st, T value, String name, SharedSessio
 		nullSafeSet( st, value, name, (WrapperOptions) session );
 	}
 
-	@SuppressWarnings("unchecked")
 	protected final void nullSafeSet(CallableStatement st, Object value, String name, WrapperOptions options) throws SQLException {
-		getJdbcValueBinder().bind( st, (T) value, name, options );
+		getJdbcValueBinder().bind( st, javaType.cast( value ), name, options );
 	}
 
 	@Override
@@ -379,9 +362,8 @@ public CastType getCastType() {
 		// Due to that, we have to handle some conversions in wrap/unwrap of BooleanJavaType
 		// and the cast type determination here. Note that we interpret the converter in ConvertedBasicTypeImpl
 		// to properly determine the correct cast type
-		final JdbcType jdbcType = getJdbcType();
-		final int jdbcTypeCode = jdbcType.getDdlTypeCode();
-		switch ( jdbcTypeCode ) {
+		final var jdbcType = getJdbcType();
+		switch ( jdbcType.getDdlTypeCode() ) {
 			case Types.BIT:
 			case Types.SMALLINT:
 			case Types.TINYINT:
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AdjustableBasicType.java b/hibernate-core/src/main/java/org/hibernate/type/AdjustableBasicType.java
index c456e995651f..da9f9c0a38e3 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/AdjustableBasicType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/AdjustableBasicType.java
@@ -25,16 +25,16 @@ default <X> BasicType<X> resolveIndicatedType(JdbcTypeIndicators indicators, Jav
 					indicators,
 					domainJtd
 			);
-			if ( resolvedJdbcType != jdbcType ) {
+			if ( getJavaTypeDescriptor() != domainJtd || resolvedJdbcType != jdbcType ) {
 				return indicators.getTypeConfiguration().getBasicTypeRegistry()
-						.resolve( domainJtd, resolvedJdbcType, getName() );
+						.resolve( domainJtd, resolvedJdbcType );
 			}
 		}
 		else {
 			final int resolvedJdbcTypeCode = indicators.resolveJdbcTypeCode( jdbcType.getDefaultSqlTypeCode() );
-			if ( resolvedJdbcTypeCode != jdbcType.getDefaultSqlTypeCode() ) {
+			if ( getJavaTypeDescriptor() != domainJtd || resolvedJdbcTypeCode != jdbcType.getDefaultSqlTypeCode() ) {
 				return indicators.getTypeConfiguration().getBasicTypeRegistry()
-						.resolve( domainJtd, indicators.getJdbcType( resolvedJdbcTypeCode ), getName() );
+						.resolve( domainJtd, indicators.getJdbcType( resolvedJdbcTypeCode ) );
 			}
 		}
 		return (BasicType<X>) this;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/AnyType.java b/hibernate-core/src/main/java/org/hibernate/type/AnyType.java
index 714e511b8670..2eb9d8347485 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/AnyType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/AnyType.java
@@ -240,10 +240,44 @@ public boolean[] toColumnNullness(Object value, MappingContext mapping) {
 		return result;
 	}
 
+	@Override
+	public boolean isDirty(Object old, Object current, SharedSessionContractImplementor session)
+			throws HibernateException {
+		if ( isSame( old, current ) ) {
+			return false;
+		}
+		final String oldEntityName =
+				old == null ? null : session.bestGuessEntityName( old );
+		final String currentEntityName =
+				current == null ? null : session.bestGuessEntityName( current );
+
+		if ( !Objects.equals( oldEntityName, currentEntityName ) ) {
+			return true;
+		}
+
+		final Object oldId = old == null ? null : getIdentifier( oldEntityName, old, session );
+		final Object newId = current == null ? null : getIdentifier( currentEntityName, current, session );
+
+		return identifierType.isDirty( oldId, newId, session );
+	}
+
 	@Override
 	public boolean isDirty(Object old, Object current, boolean[] checkable, SharedSessionContractImplementor session)
 			throws HibernateException {
-		return isDirty( old, current, session );
+		if ( isSame( old, current ) ) {
+			return false;
+		}
+		final String oldEntityName =
+				old == null ? null : session.bestGuessEntityName( old );
+		final String currentEntityName =
+				current == null ? null : session.bestGuessEntityName( current );
+
+		final Object oldId = old == null ? null : getIdentifier( oldEntityName, old, session );
+		final Object newId = current == null ? null : getIdentifier( currentEntityName, current, session );
+
+		return checkable[0] && !Objects.equals( oldEntityName, currentEntityName )
+			|| identifierType.isDirty( oldId, newId, Arrays.copyOfRange( checkable, 1, checkable.length ),
+				session );
 	}
 
 	@Override
@@ -296,12 +330,9 @@ public String toLoggableString(Object value, SessionFactoryImplementor factory)
 			return "<uninitialized>";
 		}
 
-		final String entityName = factory.bestGuessEntityName(value);
-		final var descriptor =
-				entityName == null
-						? null
-						: factory.getMappingMetamodel().getEntityDescriptor( entityName );
-		return infoString( descriptor, value, factory );
+		final var persister = guessEntityPersister( value, factory );
+		final var id = persister == null ? null : persister.getIdentifier( value );
+		return infoString( persister, id, factory );
 	}
 
 	@Override
@@ -387,19 +418,23 @@ public Object[] getPropertyValues(Object component, SharedSessionContractImpleme
 		};
 	}
 
-	private Object getIdentifier(Object value, SharedSessionContractImplementor session) throws HibernateException {
+	private Object getIdentifier(String entityName, Object value, SharedSessionContractImplementor session) {
 		try {
-			return getEntityIdentifierIfNotUnsaved(
-					session.bestGuessEntityName( value ),
-					value,
-					session
-			);
+			return getEntityIdentifierIfNotUnsaved( entityName, value, session );
 		}
 		catch (TransientObjectException toe) {
 			return null;
 		}
 	}
 
+	private Object getIdentifier(Object value, SharedSessionContractImplementor session) throws HibernateException {
+		return getIdentifier(
+				session.bestGuessEntityName( value ),
+				value,
+				session
+		);
+	}
+
 	@Override
 	public void setPropertyValues(Object component, Object[] values) {
 		throw new UnsupportedOperationException();
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ArrayType.java b/hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
index 695f8ad614c5..d4e8d0711835 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
@@ -36,7 +36,7 @@ public class ArrayType extends CollectionType {
 	public ArrayType(String role, String propertyRef, Class<?> elementClass) {
 		super(role, propertyRef );
 		this.elementClass = elementClass;
-		arrayClass = Array.newInstance(elementClass, 0).getClass();
+		arrayClass = elementClass.arrayType();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java
index 963bb7b436c2..13502e29806b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java
@@ -6,34 +6,47 @@
 
 import java.util.Objects;
 
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.type.descriptor.java.AbstractArrayJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 
+import static java.lang.Character.toUpperCase;
+
 /**
  * A type that maps between {@link java.sql.Types#ARRAY ARRAY} and {@code T[]}
  *
  * @author Jordan Gigov
  * @author Christian Beikov
  */
-public class BasicArrayType<T,E>
+public final class BasicArrayType<T,E>
 		extends AbstractSingleColumnStandardBasicType<T>
 		implements AdjustableBasicType<T>, BasicPluralType<T, E> {
 
 	private final BasicType<E> baseDescriptor;
 	private final String name;
+	private final AbstractArrayJavaType<T,?> arrayTypeDescriptor;
 
 	public BasicArrayType(BasicType<E> baseDescriptor, JdbcType arrayJdbcType, JavaType<T> arrayTypeDescriptor) {
 		super( arrayJdbcType, arrayTypeDescriptor );
 		this.baseDescriptor = baseDescriptor;
 		this.name = determineArrayTypeName( baseDescriptor );
+		this.arrayTypeDescriptor =
+				arrayTypeDescriptor instanceof AbstractArrayJavaType<T, ?> arrayJavaType
+						? arrayJavaType
+						// this only happens with contributions from hibernate-vector
+						// because it passes in a PrimitiveByteArrayJavaType which is
+						// not an AbstractArrayJavaType (this might be a bug)
+						: null;
 	}
 
 	static String determineElementTypeName(BasicType<?> baseDescriptor) {
 		final String elementName = baseDescriptor.getName();
 		return switch ( elementName ) {
 			case "boolean", "byte", "char", "short", "int", "long", "float", "double" ->
-					Character.toUpperCase( elementName.charAt( 0 ) ) + elementName.substring( 1 );
+					toUpperCase( elementName.charAt( 0 ) )
+							+ elementName.substring( 1 );
 			default -> elementName;
 		};
 	}
@@ -59,20 +72,50 @@ protected boolean registerUnderJavaType() {
 
 	@Override
 	public <X> BasicType<X> resolveIndicatedType(JdbcTypeIndicators indicators, JavaType<X> domainJtd) {
-		// TODO: maybe fallback to some encoding by default if the DB doesn't support arrays natively?
-		//  also, maybe move that logic into the ArrayJdbcType
+		// TODO: maybe fall back to some encoding by default if
+		//      the database doesn't support arrays natively?
+		//      also, maybe move that logic into the ArrayJdbcType
 		//noinspection unchecked
 		return (BasicType<X>) this;
 	}
 
 	@Override
 	public boolean equals(Object object) {
-		return object == this || object.getClass() == BasicArrayType.class
-			&& Objects.equals( baseDescriptor, ( (BasicArrayType<?, ?>) object ).baseDescriptor );
+		return object == this
+			|| object instanceof BasicArrayType<?,?> arrayType // no subtypes
+			&& Objects.equals( baseDescriptor, arrayType.baseDescriptor );
 	}
 
 	@Override
 	public int hashCode() {
 		return baseDescriptor.hashCode();
 	}
+
+	// Methods required to support Horrible hack around the fact
+	// that java.sql.Timestamps in an array can be represented as
+	// instances of java.util.Date (Why do we even allow this?)
+
+	@Override
+	public boolean isEqual(Object one, Object another) {
+		if ( arrayTypeDescriptor == null ) {
+			// for hibernate-vector
+			return super.isEqual( one, another );
+		}
+		else if ( one == another ) {
+			return true;
+		}
+		else if ( one == null || another == null ) {
+			return false;
+		}
+		else {
+			return arrayTypeDescriptor.isEqual( one, another );
+		}
+	}
+
+	@Override
+	public Object deepCopy(Object value, SessionFactoryImplementor factory) {
+		return arrayTypeDescriptor == null
+				? super.deepCopy( value, factory ) // for hibernate-vector
+				: arrayTypeDescriptor.deepCopy( value );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java
index 3e202366a9ee..9b6d116b67ca 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java
@@ -6,6 +6,7 @@
 
 import java.io.Serializable;
 
+import jakarta.persistence.TemporalType;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
 
@@ -24,9 +25,10 @@ public final class BasicTypeReference<T> implements BindableType<T>, Serializabl
 	private final int sqlTypeCode;
 	private final BasicValueConverter<T, ?> converter;
 	private final boolean forceImmutable;
+	private final TemporalType precision;
 
 	public BasicTypeReference(String name, Class<? extends T> javaType, int sqlTypeCode) {
-		this(name, javaType, sqlTypeCode, null);
+		this( name, javaType, sqlTypeCode, null, null, false );
 	}
 
 	public BasicTypeReference(
@@ -34,13 +36,22 @@ public BasicTypeReference(
 			Class<? extends T> javaType,
 			int sqlTypeCode,
 			BasicValueConverter<T, ?> converter) {
-		this( name, javaType, sqlTypeCode, converter, false );
+		this( name, javaType, sqlTypeCode, null, converter, false );
+	}
+
+	public BasicTypeReference(
+			String name,
+			Class<? extends T> javaType,
+			int sqlTypeCode,
+			TemporalType precision) {
+		this( name, javaType, sqlTypeCode, precision, null, false );
 	}
 
 	private BasicTypeReference(
 			String name,
 			Class<? extends T> javaType,
 			int sqlTypeCode,
+			TemporalType precision,
 			BasicValueConverter<T, ?> converter,
 			boolean forceImmutable) {
 		this.name = name;
@@ -48,6 +59,7 @@ private BasicTypeReference(
 		this.javaType = (Class<T>) javaType;
 		this.sqlTypeCode = sqlTypeCode;
 		this.converter = converter;
+		this.precision = precision;
 		this.forceImmutable = forceImmutable;
 	}
 
@@ -73,6 +85,10 @@ public int getSqlTypeCode() {
 		return converter;
 	}
 
+	public TemporalType getPrecision() {
+		return precision;
+	}
+
 	public boolean isForceImmutable() {
 		return forceImmutable;
 	}
@@ -82,6 +98,7 @@ public BasicTypeReference<T> asImmutable() {
 				"imm_" + name,
 				javaType,
 				sqlTypeCode,
+				precision,
 				converter,
 				true
 		);
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
index b4603acc2217..7bfe4bc89249 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
@@ -5,6 +5,8 @@
 package org.hibernate.type;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
@@ -18,6 +20,7 @@
 import org.hibernate.type.descriptor.java.BasicPluralJavaType;
 import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
 import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.java.TemporalJavaType;
 import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
 import org.hibernate.type.descriptor.jdbc.ArrayJdbcType;
 import org.hibernate.type.descriptor.jdbc.DelegatingJdbcTypeIndicators;
@@ -35,6 +38,7 @@
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty;
+import static org.hibernate.internal.util.type.PrimitiveWrappers.canonicalize;
 
 /**
  * A registry of {@link BasicType} instances
@@ -49,6 +53,7 @@ public class BasicTypeRegistry implements Serializable {
 
 	private final Map<String, BasicType<?>> typesByName = new ConcurrentHashMap<>();
 	private final Map<String, BasicTypeReference<?>> typeReferencesByName = new ConcurrentHashMap<>();
+	private final Map<String, List<BasicTypeReference<?>>> typeReferencesByJavaTypeName = new ConcurrentHashMap<>();
 
 	public BasicTypeRegistry(TypeConfiguration typeConfiguration){
 		this.typeConfiguration = typeConfiguration;
@@ -89,24 +94,26 @@ else if ( !name.equals( typeReference.getName() ) ) {
 	}
 
 	private <T> BasicType<T> createBasicType(String name, BasicTypeReference<T> typeReference) {
-		final var javaType = getJavaTypeRegistry().resolveDescriptor( typeReference.getJavaType() );
+		var javaType = getJavaTypeRegistry().resolveDescriptor( typeReference.getJavaType() );
+		if ( javaType instanceof TemporalJavaType<T> temporalJavaType ) {
+			javaType = temporalJavaType.resolveTypeForPrecision( typeReference.getPrecision(), typeConfiguration  );
+		}
 		final var jdbcType = getJdbcTypeRegistry().getDescriptor( typeReference.getSqlTypeCode() );
 		final var createdType = createBasicType( typeReference, javaType, jdbcType );
 		typesByName.put( typeReference.getName(), createdType );
-		typesByName.put( name, createdType );
 		return createdType;
 	}
 
 	private static <T> BasicType<T> createBasicType(
 			BasicTypeReference<T> typeReference, JavaType<T> javaType, JdbcType jdbcType) {
 		final String name = typeReference.getName();
-		if ( typeReference.getConverter() == null ) {
+		final var converter = typeReference.getConverter();
+		if ( converter == null ) {
 			return typeReference.isForceImmutable()
 					? new ImmutableNamedBasicTypeImpl<>( javaType, jdbcType, name )
 					: new NamedBasicTypeImpl<>( javaType, jdbcType, name );
 		}
 		else {
-			final var converter = typeReference.getConverter();
 			assert javaType == converter.getDomainJavaType();
 			return typeReference.isForceImmutable()
 					? new CustomMutabilityConvertedBasicTypeImpl<>( name, jdbcType, converter,
@@ -120,8 +127,17 @@ private static <T> BasicType<T> createBasicType(
 	}
 
 	public <J> @Nullable BasicType<J> getRegisteredType(Class<J> javaType) {
-		//noinspection unchecked
-		return (BasicType<J>) getRegisteredType( javaType.getTypeName() );
+		final var type = getRegisteredType( javaType.getTypeName() );
+		if ( type!= null
+				// workaround for String keys which look like class names
+				&& canonicalize( javaType ) == type.getJavaType() ) {
+			@SuppressWarnings("unchecked") // safe, we just checked
+			final var castType = (BasicType<J>) type;
+			return castType;
+		}
+		else {
+			return null;
+		}
 	}
 
 	public @Nullable BasicType<?> getRegisteredArrayType(java.lang.reflect.Type javaElementType) {
@@ -129,16 +145,26 @@ private static <T> BasicType<T> createBasicType(
 	}
 
 	public <J> @Nullable BasicType<J> resolve(BasicTypeReference<J> basicTypeReference) {
-		//noinspection unchecked
-		return (BasicType<J>) getRegisteredType( basicTypeReference.getName() );
+		final var type = getRegisteredType( basicTypeReference.getName() );
+		if ( type!= null
+				// workaround for String keys which look like class names
+				&& basicTypeReference.getJavaType() == type.getJavaType() ) {
+			@SuppressWarnings("unchecked") // safe, we just checked
+			final var castType = (BasicType<J>) type;
+			return castType;
+		}
+		else {
+			return null;
+		}
 	}
 
 	public <J> BasicType<J> resolve(Class<J> javaType, int sqlTypeCode) {
 		return resolve( getJavaTypeRegistry().resolveDescriptor( javaType ), sqlTypeCode );
 	}
 
+	// no longer used
 	public BasicType<?> resolve(java.lang.reflect.Type javaType, int sqlTypeCode) {
-		return resolve( getJavaTypeRegistry().getDescriptor( javaType ), sqlTypeCode );
+		return resolve( getJavaTypeRegistry().resolveDescriptor( javaType ), sqlTypeCode );
 	}
 
 	public <J> BasicType<J> resolve(JavaType<J> javaType, int sqlTypeCode) {
@@ -255,29 +281,57 @@ private <J> BasicType<J> createIfUnregistered(
 		if ( registeredTypeMatches( javaType, jdbcType, registeredType ) ) {
 			return castNonNull( registeredType );
 		}
-		else {
-			final var createdType = creator.get();
-			register( javaType, jdbcType, createdType );
-			return createdType;
+		// Create an ad-hoc type since the java type doesn't come from the registry and is probably explicitly defined
+		else if ( typeConfiguration.getJavaTypeRegistry().resolveDescriptor( javaType.getJavaType() ) == javaType ) {
+			final var basicTypeReferences = typeReferencesByJavaTypeName.get( javaType.getTypeName() );
+			if ( basicTypeReferences != null && !basicTypeReferences.isEmpty() ) {
+				final var jdbcTypeRegistry = typeConfiguration.getJdbcTypeRegistry();
+				for ( var typeReference : basicTypeReferences ) {
+					if ( typeReference.getJavaType() == javaType.getJavaTypeClass() ) {
+						@SuppressWarnings("unchecked") // safe, we just checked
+						final var castTypeReference = (BasicTypeReference<J>) typeReference;
+						if ( jdbcTypeRegistry.getDescriptor( typeReference.getSqlTypeCode() ) == jdbcType ) {
+							final var basicType = typesByName.get( typeReference.getName() );
+							if ( registeredTypeMatches( javaType, jdbcType, basicType ) ) {
+								@SuppressWarnings("unchecked") // safe, we checked in registeredTypeMatches()
+								final var castType = (BasicType<J>) basicType;
+								return castType;
+							}
+							else {
+								return createBasicType( castTypeReference.getName(), castTypeReference );
+							}
+						}
+					}
+				}
+			}
 		}
+		return getOrRegister( javaType, jdbcType, creator.get() );
 	}
 
-	private static <J> boolean registeredTypeMatches(JavaType<J> javaType, JdbcType jdbcType, BasicType<J> registeredType) {
+	private static boolean registeredTypeMatches(JavaType<?> javaType, JdbcType jdbcType, @Nullable BasicType<?> registeredType) {
 		return registeredType != null
 			&& registeredType.getJdbcType() == jdbcType
 			&& registeredType.getMappedJavaType() == javaType;
 	}
 
-	private <J> void register(JavaType<J> javaType, JdbcType jdbcType, BasicType<J> createdType) {
-		if ( createdType != null ) {
-			// if we are still building mappings, register this adhoc
-			// type via a unique code. (This is to support Envers.)
-			try {
-				getBootstrapContext().registerAdHocBasicType( createdType );
+	private <J> BasicType<J> getOrRegister(JavaType<J> javaType, JdbcType jdbcType, BasicType<J> createdType) {
+		// if we are still building mappings, register this adhoc
+		// type via a unique code. (This is to support Envers.)
+		try {
+			final BootstrapContext bootstrapContext = getBootstrapContext();
+			final BasicType<J> existingAdHocBasicType = bootstrapContext.findAdHocBasicType( javaType, jdbcType );
+			if ( existingAdHocBasicType != null ) {
+				return existingAdHocBasicType;
 			}
-			catch (Exception ignore) {
+			else {
+				bootstrapContext.registerAdHocBasicType( createdType );
 			}
 		}
+		catch (Exception ignore) {
+			// todo: Should we also call register?
+//			register( createdType );
+		}
+		return createdType;
 	}
 
 	private BootstrapContext getBootstrapContext() {
@@ -333,7 +387,7 @@ public void addTypeReferenceRegistrationKey(String typeReferenceKey, String... a
 			throw new IllegalArgumentException( "Couldn't find type reference with name: " + typeReferenceKey );
 		}
 		for ( String additionalTypeReferenceKey : additionalTypeReferenceKeys ) {
-			typeReferencesByName.put( additionalTypeReferenceKey, basicTypeReference );
+			addTypeReference( additionalTypeReferenceKey, basicTypeReference );
 		}
 	}
 
@@ -383,7 +437,7 @@ public void addPrimeEntry(BasicTypeReference<?> type, String legacyTypeClassName
 
 		// Legacy name registration
 		if ( isNotEmpty( legacyTypeClassName ) ) {
-			typeReferencesByName.put( legacyTypeClassName, type );
+			addTypeReference( legacyTypeClassName, type );
 		}
 
 		// explicit registration keys
@@ -406,7 +460,8 @@ private void applyRegistrationKeys(BasicType<?> type, String[] keys) {
 				// Incredibly verbose logging disabled
 //				LOG.tracef( "Adding type registration %s -> %s", key, type );
 
-				final Type old = typesByName.put( key, type );
+//				final Type old =
+				typesByName.put( key, type );
 //				if ( old != null && old != type ) {
 //					LOG.tracef(
 //							"Type registration key [%s] overrode previous entry : `%s`",
@@ -427,18 +482,31 @@ private void applyRegistrationKeys(BasicTypeReference<?> type, String[] keys) {
 				// Incidentally, this might also help with map lookup efficiency.
 				key = key.intern();
 
-				// Incredibly verbose logging disabled
-//				LOG.tracef( "Adding type registration %s -> %s", key, type );
-
-				final BasicTypeReference<?> old = typeReferencesByName.put( key, type );
-//				if ( old != null && old != type ) {
-//					LOG.tracef(
-//							"Type registration key [%s] overrode previous entry : `%s`",
-//							key,
-//							old
-//					);
-//				}
+				addTypeReference( key, type );
 			}
 		}
 	}
+
+	private void addTypeReference(String name, BasicTypeReference<?> typeReference) {
+		// Incredibly verbose logging disabled
+//		LOG.tracef( "Adding type registration %s -> %s", key, type );
+
+//				final BasicTypeReference<?> old =
+				typeReferencesByName.put( name, typeReference );
+//		if ( old != null && old != type ) {
+//			LOG.tracef(
+//					"Type registration key [%s] overrode previous entry : `%s`",
+//					key,
+//					old
+//			);
+//		}
+
+		final var basicTypeReferences = typeReferencesByJavaTypeName.computeIfAbsent(
+				typeReference.getJavaType().getTypeName(),
+				s -> new ArrayList<>()
+		);
+		if ( !basicTypeReferences.contains( typeReference ) ) {
+			basicTypeReferences.add( typeReference );
+		}
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
index d60943cb7ba1..d6fbfdad154e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
@@ -27,7 +27,6 @@
 import org.hibernate.engine.spi.CollectionKey;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.internal.util.MarkerObject;
 import org.hibernate.metamodel.CollectionClassification;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.Joinable;
@@ -50,9 +49,6 @@
  */
 public abstract class CollectionType extends AbstractType implements AssociationType {
 
-	@Internal
-	public static final Object UNFETCHED_COLLECTION = new MarkerObject( "UNFETCHED COLLECTION" );
-
 	private final String role;
 	private final String foreignKeyPropertyName;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java b/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
index 8c2f14f57efc..4b9aed3fd203 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
@@ -22,25 +22,19 @@
 import org.hibernate.engine.spi.CascadeStyles;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.mapping.Component;
-import org.hibernate.mapping.Property;
-import org.hibernate.mapping.Value;
-import org.hibernate.metamodel.mapping.EmbeddableDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
-import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
 import org.hibernate.metamodel.spi.EmbeddableInstantiator;
-import org.hibernate.metamodel.spi.EmbeddableRepresentationStrategy;
-import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.query.sqm.tree.domain.SqmEmbeddableDomainType;
 import org.hibernate.type.descriptor.ValueExtractor;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.CompositeTypeImplementor;
 
 import static jakarta.persistence.metamodel.Type.PersistenceType.EMBEDDABLE;
+import static org.hibernate.internal.util.StringHelper.join;
 import static org.hibernate.internal.util.StringHelper.unqualify;
 import static org.hibernate.metamodel.mapping.EntityDiscriminatorMapping.DISCRIMINATOR_ROLE_NAME;
 
@@ -84,7 +78,7 @@ public ComponentType(Component component, int[] originalPropertyOrder, boolean m
 		this.isKey = component.isKey();
 		this.propertySpan = component.getPropertySpan();
 		this.originalPropertyOrder = originalPropertyOrder;
-		final Value discriminator = component.getDiscriminator();
+		final var discriminator = component.getDiscriminator();
 		final int length = propertySpan + (component.isPolymorphic() ? 1 : 0);
 		this.propertyNames = new String[length];
 		this.propertyTypes = new Type[length];
@@ -99,7 +93,7 @@ public ComponentType(Component component, int[] originalPropertyOrder, boolean m
 						.supportsCascadeDelete();
 
 		int i = 0;
-		for ( Property property : component.getProperties() ) {
+		for ( var property : component.getProperties() ) {
 			this.propertyNames[i] = property.getName();
 			this.propertyTypes[i] = property.getValue().getType();
 			this.propertyNullability[i] = property.isOptional();
@@ -148,7 +142,7 @@ public int getColumnSpan(MappingContext mapping) throws MappingException {
 	@Override
 	public int[] getSqlTypeCodes(MappingContext mappingContext) throws MappingException {
 		//Not called at runtime so doesn't matter if it's slow :)
-		final int[] sqlTypes = new int[getColumnSpan( mappingContext )];
+		final var sqlTypes = new int[getColumnSpan( mappingContext )];
 		int n = 0;
 		for ( int i = 0; i < propertySpan; i++ ) {
 			int[] subtypes = propertyTypes[i].getSqlTypeCodes( mappingContext );
@@ -180,8 +174,8 @@ public boolean isSame(Object x, Object y) throws HibernateException {
 			return true;
 		}
 		// null value and empty component are considered equivalent
-		final Object[] xvalues = getPropertyValues( x );
-		final Object[] yvalues = getPropertyValues( y );
+		final var xvalues = getPropertyValues( x );
+		final var yvalues = getPropertyValues( y );
 		for ( int i = 0; i < propertySpan; i++ ) {
 			if ( !propertyTypes[i].isSame( xvalues[i], yvalues[i] ) ) {
 				return false;
@@ -225,7 +219,8 @@ public int compare(final Object x, final Object y) {
 			return 0;
 		}
 		for ( int i = 0; i < propertySpan; i++ ) {
-			int propertyCompare = propertyTypes[i].compare( getPropertyValue( x, i ), getPropertyValue( y, i ) );
+			final int propertyCompare =
+					propertyTypes[i].compare( getPropertyValue( x, i ), getPropertyValue( y, i ) );
 			if ( propertyCompare != 0 ) {
 				return propertyCompare;
 			}
@@ -239,7 +234,8 @@ public int compare(Object x, Object y, SessionFactoryImplementor sessionFactory)
 			return 0;
 		}
 		for ( int i = 0; i < propertySpan; i++ ) {
-			int propertyCompare = propertyTypes[i].compare( getPropertyValue( x, i ), getPropertyValue( y, i ), sessionFactory );
+			final int propertyCompare =
+					propertyTypes[i].compare( getPropertyValue( x, i ), getPropertyValue( y, i ), sessionFactory );
 			if ( propertyCompare != 0 ) {
 				return propertyCompare;
 			}
@@ -298,9 +294,10 @@ public boolean isDirty(final Object x, final Object y, final boolean[] checkable
 			return false;
 		}
 		// null value and empty component are considered equivalent
+		final var context = session.getFactory().getRuntimeMetamodels();
 		int loc = 0;
 		for ( int i = 0; i < propertySpan; i++ ) {
-			int len = propertyTypes[i].getColumnSpan( session.getFactory().getRuntimeMetamodels() );
+			final int len = propertyTypes[i].getColumnSpan( context );
 			if ( len <= 1 ) {
 				final boolean dirty = ( len == 0 || checkable[loc] ) &&
 						propertyTypes[i].isDirty( getPropertyValue( x, i ), getPropertyValue( y, i ), session );
@@ -309,7 +306,7 @@ public boolean isDirty(final Object x, final Object y, final boolean[] checkable
 				}
 			}
 			else {
-				final boolean[] subcheckable = new boolean[len];
+				final var subcheckable = new boolean[len];
 				System.arraycopy( checkable, loc, subcheckable, 0, len );
 				final boolean dirty = propertyTypes[i].isDirty(
 						getPropertyValue( x, i ),
@@ -336,10 +333,11 @@ public boolean isModified(
 			return false;
 		}
 		// null value and empty components are considered equivalent
+		final var context = session.getFactory().getRuntimeMetamodels();
 		int loc = 0;
 		for ( int i = 0; i < propertySpan; i++ ) {
-			final int len = propertyTypes[i].getColumnSpan( session.getFactory().getRuntimeMetamodels() );
-			final boolean[] subcheckable = new boolean[len];
+			final int len = propertyTypes[i].getColumnSpan( context );
+			final var subcheckable = new boolean[len];
 			System.arraycopy( checkable, loc, subcheckable, 0, len );
 			if ( propertyTypes[i].isModified( getPropertyValue( old, i ),
 					getPropertyValue( current, i ), subcheckable, session ) ) {
@@ -354,10 +352,11 @@ public boolean isModified(
 	@Override
 	public void nullSafeSet(PreparedStatement st, Object value, int begin, SharedSessionContractImplementor session)
 			throws HibernateException, SQLException {
-		final Object[] subvalues = nullSafeGetValues( value );
+		final var context = session.getFactory().getRuntimeMetamodels();
+		final var subvalues = nullSafeGetValues( value );
 		for ( int i = 0; i < propertySpan; i++ ) {
 			propertyTypes[i].nullSafeSet( st, subvalues[i], begin, session );
-			begin += propertyTypes[i].getColumnSpan( session.getFactory().getRuntimeMetamodels() );
+			begin += propertyTypes[i].getColumnSpan( context );
 		}
 	}
 
@@ -369,10 +368,11 @@ public void nullSafeSet(
 			boolean[] settable,
 			SharedSessionContractImplementor session)
 			throws HibernateException, SQLException {
-		final Object[] subvalues = nullSafeGetValues( value );
+		final var context = session.getFactory().getRuntimeMetamodels();
+		final var subvalues = nullSafeGetValues( value );
 		int loc = 0;
 		for ( int i = 0; i < propertySpan; i++ ) {
-			int len = propertyTypes[i].getColumnSpan( session.getFactory().getRuntimeMetamodels() );
+			int len = propertyTypes[i].getColumnSpan( context );
 			//noinspection StatementWithEmptyBody
 			if ( len == 0 ) {
 				//noop
@@ -394,12 +394,9 @@ else if ( len == 1 ) {
 	}
 
 	private Object[] nullSafeGetValues(Object value) {
-		if ( value == null ) {
-			return new Object[propertySpan];
-		}
-		else {
-			return getPropertyValues( value );
-		}
+		return value == null
+				? new Object[ propertySpan ]
+				: getPropertyValues( value );
 	}
 
 	@Override
@@ -420,9 +417,9 @@ else if ( component instanceof Object[] array ) {
 			return array[i];
 		}
 		else {
-			final EmbeddableMappingType embeddableMappingType = embeddableTypeDescriptor();
+			final var embeddableMappingType = embeddableTypeDescriptor();
 			if ( embeddableMappingType.isPolymorphic() ) {
-				final EmbeddableMappingType.ConcreteEmbeddableType concreteEmbeddableType =
+				final var concreteEmbeddableType =
 						embeddableMappingType.findSubtypeBySubclass( component.getClass().getName() );
 				return concreteEmbeddableType.declaresAttribute( i )
 						? embeddableMappingType.getValue( component, i )
@@ -479,7 +476,7 @@ public String toLoggableString(Object value, SessionFactoryImplementor factory)
 		}
 		else {
 			final Map<String, String> result = new HashMap<>();
-			final Object[] values = getPropertyValues( value );
+			final var values = getPropertyValues( value );
 			for ( int i = 0; i < propertyTypes.length; i++ ) {
 				if ( values[i] == LazyPropertyInitializer.UNFETCHED_PROPERTY ) {
 					result.put( propertyNames[i], "<uninitialized>" );
@@ -503,7 +500,7 @@ public Object deepCopy(Object component, SessionFactoryImplementor factory) {
 			return null;
 		}
 		else {
-			final Object[] values = getPropertyValues( component );
+			final var values = getPropertyValues( component );
 			for ( int i = 0; i < propertySpan; i++ ) {
 				values[i] = propertyTypes[i].deepCopy( values[i], factory );
 			}
@@ -512,7 +509,7 @@ public Object deepCopy(Object component, SessionFactoryImplementor factory) {
 
 			//not absolutely necessary, but helps for some
 			//equals()/hashCode() implementations
-			final PropertyAccess parentAccess = mappingModelPart().getParentInjectionAttributePropertyAccess();
+			final var parentAccess = mappingModelPart().getParentInjectionAttributePropertyAccess();
 			if ( parentAccess != null ) {
 				parentAccess.getSetter().set( result, parentAccess.getGetter().get( component ) );
 			}
@@ -609,17 +606,18 @@ public Serializable disassemble(Object value, SharedSessionContractImplementor s
 			return null;
 		}
 		else {
-			final EmbeddableMappingType mappingType = embeddableTypeDescriptor();
+			final var mappingType = embeddableTypeDescriptor();
 			final boolean polymorphic = mappingType.isPolymorphic();
-			final Object[] values = new Object[propertySpan + (polymorphic ? 1 : 0)];
-			final Object[] propertyValues = getPropertyValues( value );
+			final var values = new Object[propertySpan + (polymorphic ? 1 : 0)];
+			final var propertyValues = getPropertyValues( value );
 			int i = 0;
 			for ( ; i < propertySpan; i++ ) {
 				values[i] = propertyTypes[i].disassemble( propertyValues[i], session, owner );
 			}
 			if ( polymorphic ) {
-				final EmbeddableDiscriminatorMapping discriminatorMapping = mappingType.getDiscriminatorMapping();
-				final Object discriminatorValue = discriminatorMapping.getDiscriminatorValue( value.getClass().getName() );
+				final var discriminatorMapping = mappingType.getDiscriminatorMapping();
+				final Object discriminatorValue =
+						discriminatorMapping.getDiscriminatorValue( value.getClass().getName() );
 				values[i] = discriminatorMapping.disassemble( discriminatorValue, session );
 			}
 			return values;
@@ -633,17 +631,18 @@ public Serializable disassemble(Object value, SessionFactoryImplementor sessionF
 			return null;
 		}
 		else {
-			final EmbeddableMappingType mappingType = embeddableTypeDescriptor();
+			final var mappingType = embeddableTypeDescriptor();
 			final boolean polymorphic = mappingType.isPolymorphic();
-			final Object[] values = new Object[propertySpan + (polymorphic ? 1 : 0)];
-			final Object[] propertyValues = getPropertyValues( value );
+			final var values = new Object[propertySpan + (polymorphic ? 1 : 0)];
+			final var propertyValues = getPropertyValues( value );
 			int i = 0;
 			for ( ; i < propertyTypes.length; i++ ) {
 				values[i] = propertyTypes[i].disassemble( propertyValues[i], sessionFactory );
 			}
 			if ( polymorphic ) {
-				final EmbeddableDiscriminatorMapping discriminatorMapping = mappingType.getDiscriminatorMapping();
-				final Object discriminatorValue = discriminatorMapping.getDiscriminatorValue( value.getClass().getName() );
+				final var discriminatorMapping = mappingType.getDiscriminatorMapping();
+				final Object discriminatorValue =
+						discriminatorMapping.getDiscriminatorValue( value.getClass().getName() );
 				values[i] = discriminatorMapping.disassemble( discriminatorValue, null );
 			}
 			return values;
@@ -657,22 +656,22 @@ public Object assemble(Serializable object, SharedSessionContractImplementor ses
 			return null;
 		}
 		else {
-			final EmbeddableMappingType mappingType = embeddableTypeDescriptor();
-			final Object[] values = (Object[]) object;
+			final var mappingType = embeddableTypeDescriptor();
+			final var values = (Object[]) object;
 			final boolean polymorphic = mappingType.isPolymorphic();
-			final Object[] assembled = new Object[values.length - ( polymorphic ? 1 : 0 )];
+			final var assembled = new Object[values.length - ( polymorphic ? 1 : 0 )];
 			int i = 0;
 			for ( ; i < assembled.length; i++ ) {
 				assembled[i] = propertyTypes[i].assemble( (Serializable) values[i], session, owner );
 			}
 
-			final EmbeddableRepresentationStrategy representation = mappingType.getRepresentationStrategy();
-			final EmbeddableInstantiator instantiator = polymorphic
+			final var representation = mappingType.getRepresentationStrategy();
+			final var instantiator = polymorphic
 					? representation.getInstantiatorForDiscriminator( values[i] )
 					: representation.getInstantiator();
 			final Object instance = instantiator.instantiate( () -> assembled );
 
-			final PropertyAccess parentInjectionAccess = mappingModelPart.getParentInjectionAttributePropertyAccess();
+			final var parentInjectionAccess = mappingModelPart.getParentInjectionAttributePropertyAccess();
 			if ( parentInjectionAccess != null ) {
 				parentInjectionAccess.getSetter().set( instance, owner );
 			}
@@ -693,12 +692,12 @@ public boolean[] getPropertyNullability() {
 
 	@Override
 	public boolean[] toColumnNullness(Object value, MappingContext mapping) {
-		final boolean[] result = new boolean[getColumnSpan( mapping )];
+		final var result = new boolean[getColumnSpan( mapping )];
 		if ( value != null ) {
-			final Object[] values = getPropertyValues( value ); //TODO!!!!!!!
+			final var values = getPropertyValues( value ); //TODO!!!!!!!
 			int loc = 0;
 			for ( int i = 0; i < propertyTypes.length; i++ ) {
-				final boolean[] propertyNullness = propertyTypes[i].toColumnNullness( values[i], mapping );
+				final var propertyNullness = propertyTypes[i].toColumnNullness( values[i], mapping );
 				System.arraycopy( propertyNullness, 0, result, loc, propertyNullness.length );
 				loc += propertyNullness.length;
 			}
@@ -713,7 +712,7 @@ public boolean isEmbedded() {
 
 	@Override
 	public int getPropertyIndex(String name) {
-		final String[] names = getPropertyNames();
+		final var names = getPropertyNames();
 		for ( int i = 0, max = names.length; i < max; i++ ) {
 			if ( names[i].equals( name ) ) {
 				return i;
@@ -721,7 +720,7 @@ public int getPropertyIndex(String name) {
 		}
 		throw new PropertyNotFoundException(
 				"Could not resolve attribute '" + name + "' of '" + getReturnedClassName() + "'"
-					+ " (must be one of '" + StringHelper.join("', '", names) + "')"
+					+ " (must be one of '" + join("', '", names) + "')"
 		);
 	}
 
@@ -741,13 +740,13 @@ public boolean canDoExtraction() {
 
 	@Override
 	public JdbcType getJdbcType() {
-		final SelectableMapping aggregateMapping = embeddableTypeDescriptor().getAggregateMapping();
+		final var aggregateMapping = embeddableTypeDescriptor().getAggregateMapping();
 		return aggregateMapping == null ? null : aggregateMapping.getJdbcMapping().getJdbcType();
 	}
 
 	private boolean determineIfProcedureParamExtractionCanBePerformed() {
-		for ( Type propertyType : propertyTypes ) {
-			if ( !(propertyType instanceof ProcedureParameterExtractionAware<?> parameterExtractionAware)
+		for ( var propertyType : propertyTypes ) {
+			if ( !( propertyType instanceof ProcedureParameterExtractionAware<?> parameterExtractionAware )
 					|| !parameterExtractionAware.canDoExtraction() ) {
 				return false;
 			}
@@ -769,7 +768,7 @@ public Object extract(CallableStatement statement, int startIndex, SharedSession
 			boolean notNull = false;
 			for ( int i = 0; i < propertySpan; i++ ) {
 				// we know this cast is safe from canDoExtraction
-				final Type propertyType = propertyTypes[i];
+				final var propertyType = propertyTypes[i];
 				final var extractionAware = (ProcedureParameterExtractionAware<?>) propertyType;
 				final Object value = extractionAware.extract( statement, currentIndex, session );
 				if ( value == null ) {
@@ -808,11 +807,12 @@ public Object extract(CallableStatement statement, String paramName, SharedSessi
 	}
 
 	private Object resolve(Object[] value) {
-		final EmbeddableMappingType mappingType = embeddableTypeDescriptor();
-		final EmbeddableRepresentationStrategy representation = mappingType.getRepresentationStrategy();
-		final EmbeddableInstantiator instantiator =
+		final var mappingType = embeddableTypeDescriptor();
+		final var representation = mappingType.getRepresentationStrategy();
+		final var instantiator =
 				mappingType.isPolymorphic()
-						// the discriminator here is the composite class because it gets converted to the domain type when extracted
+						// the discriminator here is the composite class because
+						// it gets converted to the domain type when extracted
 						? representation.getInstantiatorForClass( ((Class<?>) value[value.length - 1]).getName() )
 						: representation.getInstantiator();
 		return instantiator.instantiate( () -> value );
@@ -827,8 +827,8 @@ private ValueExtractor<?> jdbcValueExtractor() {
 	}
 
 	protected final EmbeddableInstantiator instantiator(Object compositeInstance) {
-		final EmbeddableMappingType mappingType = embeddableTypeDescriptor();
-		final EmbeddableRepresentationStrategy representationStrategy = mappingType.getRepresentationStrategy();
+		final var mappingType = embeddableTypeDescriptor();
+		final var representationStrategy = mappingType.getRepresentationStrategy();
 		if ( mappingType.isPolymorphic() ) {
 			final String compositeClassName =
 					compositeInstance != null
@@ -881,9 +881,8 @@ public EmbeddableValuedModelPart mappingModelPart() {
 	@Override
 	public Object replacePropertyValues(Object component, Object[] values, SharedSessionContractImplementor session)
 			throws HibernateException {
-		if ( !isMutable() ) {
-			return instantiator( component ).instantiate( () -> values );
-		}
-		return CompositeTypeImplementor.super.replacePropertyValues( component, values, session );
+		return isMutable()
+				? CompositeTypeImplementor.super.replacePropertyValues( component, values, session )
+				: instantiator( component ).instantiate( () -> values );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/CustomType.java b/hibernate-core/src/main/java/org/hibernate/type/CustomType.java
index 446157f45f9a..c2b82fc313f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/CustomType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/CustomType.java
@@ -93,7 +93,7 @@ public CustomType(UserType<J> userType, String[] registrationKeys, TypeConfigura
 		else {
 			// create a JdbcType adapter that uses the UserType binder/extract handling
 			jdbcType = new UserTypeJdbcTypeAdapter<>( userType, mappedJavaType );
-			jdbcJavaType = jdbcType.getJdbcRecommendedJavaTypeMapping( null, null, typeConfiguration );
+			jdbcJavaType = jdbcType.getRecommendedJavaType( null, null, typeConfiguration );
 			valueExtractor = jdbcType.getExtractor( mappedJavaType );
 			valueBinder = jdbcType.getBinder( mappedJavaType );
 			jdbcLiteralFormatter =
diff --git a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
index f0dcaff0c920..12cc140f8bb9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
@@ -461,7 +461,7 @@ private Object getUniqueKey(Object value, SharedSessionContractImplementor sessi
 		if ( lazyInitializer != null ) {
 			// If the value is a Proxy and the property access is field, the value returned by
 			// attributeMapping.getAttributeMetadata().getPropertyAccess().getGetter().get( object )
-			// is always null except for the id, we need the to use the proxy implementation to
+			// is always null except for the id, and we need to use the proxy implementation to
 			// extract the property value.
 			value = lazyInitializer.getImplementation();
 		}
@@ -530,7 +530,7 @@ private String loggableString(Object entity, EntityPersister persister) {
 			return associatedEntityName + "#" + entity;
 		}
 		else {
-			final StringBuilder result = new StringBuilder().append( associatedEntityName );
+			final var result = new StringBuilder().append( associatedEntityName );
 			if ( persister.hasIdentifierProperty() ) {
 				result.append( '#' ).append( identifierString( entity, persister ) );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java
index 225f03978915..77e1c5f045cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java
@@ -10,6 +10,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.collections.ArrayHelper;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.spi.ImplicitDiscriminatorStrategy;
 
 import java.sql.PreparedStatement;
@@ -26,13 +27,13 @@ public class MetaType extends AbstractType {
 
 	private final Type valueType;
 	private final ImplicitDiscriminatorStrategy implicitValueStrategy;
-	private final Map<Object,String> discriminatorValuesToEntityNameMap;
+	private final Map<DiscriminatorValue,String> discriminatorValuesToEntityNameMap;
 	private final Map<String,Object> entityNameToDiscriminatorValueMap;
 
 	public MetaType(
 			Type valueType,
 			ImplicitDiscriminatorStrategy implicitValueStrategy,
-			Map<Object,String> explicitValueMappings) {
+			Map<DiscriminatorValue,String> explicitValueMappings) {
 		this.valueType = valueType;
 		this.implicitValueStrategy = implicitValueStrategy;
 
@@ -61,7 +62,7 @@ public String[] getRegistrationKeys() {
 		return REGISTRATION_KEYS;
 	}
 
-	public Map<Object, String> getDiscriminatorValuesToEntityNameMap() {
+	public Map<DiscriminatorValue, String> getDiscriminatorValuesToEntityNameMap() {
 		return discriminatorValuesToEntityNameMap;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java b/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java
index 8c16770b3caf..85deda4063cc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypes.java
@@ -11,8 +11,6 @@
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.NClob;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -30,6 +28,7 @@
 import java.util.TimeZone;
 import java.util.UUID;
 
+import jakarta.persistence.TemporalType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 /**
@@ -345,13 +344,12 @@ private StandardBasicTypes() {
 	// Date / time data
 
 	/**
-	 * The standard Hibernate type for mapping {@link Duration} to JDBC {@link org.hibernate.type.SqlTypes#INTERVAL_SECOND INTERVAL_SECOND}
-	 * or {@link org.hibernate.type.SqlTypes#NUMERIC NUMERIC} as a fallback.
+	 * The standard Hibernate type for mapping {@link Duration} to JDBC {@link org.hibernate.type.SqlTypes#DURATION DURATION}.
 	 */
 	public static final BasicTypeReference<Duration> DURATION = new BasicTypeReference<>(
 			"Duration",
 			Duration.class,
-			SqlTypes.INTERVAL_SECOND
+			SqlTypes.DURATION
 	);
 
 	/**
@@ -494,8 +492,9 @@ private StandardBasicTypes() {
 	 */
 	public static final BasicTypeReference<Date> TIME = new BasicTypeReference<>(
 			"time",
-			Time.class,
-			SqlTypes.TIME
+			java.util.Date.class,
+			SqlTypes.TIME,
+			TemporalType.TIME
 	);
 
 	/**
@@ -504,8 +503,9 @@ private StandardBasicTypes() {
 	 */
 	public static final BasicTypeReference<Date> DATE = new BasicTypeReference<>(
 			"date",
-			java.sql.Date.class,
-			SqlTypes.DATE
+			java.util.Date.class,
+			SqlTypes.DATE,
+			TemporalType.DATE
 	);
 
 	/**
@@ -514,8 +514,42 @@ private StandardBasicTypes() {
 	 */
 	public static final BasicTypeReference<Date> TIMESTAMP = new BasicTypeReference<>(
 			"timestamp",
-			Timestamp.class,
-			SqlTypes.TIMESTAMP
+			java.util.Date.class,
+			SqlTypes.TIMESTAMP,
+			TemporalType.TIMESTAMP
+	);
+
+	/**
+	 * The standard Hibernate type for mapping {@link java.sql.Time} to JDBC
+	 * {@link org.hibernate.type.SqlTypes#TIMESTAMP TIMESTAMP}.
+	 */
+	public static final BasicTypeReference<java.sql.Time> SQL_TIME = new BasicTypeReference<>(
+			"sql_time",
+			java.sql.Time.class,
+			SqlTypes.TIME,
+			TemporalType.TIME
+	);
+
+	/**
+	 * The standard Hibernate type for mapping {@link java.sql.Date} to JDBC
+	 * {@link org.hibernate.type.SqlTypes#DATE DATE}.
+	 */
+	public static final BasicTypeReference<java.sql.Date> SQL_DATE = new BasicTypeReference<>(
+			"sql_date",
+			java.sql.Date.class,
+			SqlTypes.DATE,
+			TemporalType.DATE
+	);
+
+	/**
+	 * The standard Hibernate type for mapping {@link java.sql.Timestamp} to JDBC
+	 * {@link org.hibernate.type.SqlTypes#TIMESTAMP TIMESTAMP}.
+	 */
+	public static final BasicTypeReference<java.sql.Timestamp> SQL_TIMESTAMP = new BasicTypeReference<>(
+			"sql_timestamp",
+			java.sql.Timestamp.class,
+			SqlTypes.TIMESTAMP,
+			TemporalType.TIMESTAMP
 	);
 
 	/**
@@ -525,7 +559,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<Calendar> CALENDAR = new BasicTypeReference<>(
 			"calendar",
 			Calendar.class,
-			SqlTypes.TIMESTAMP
+			SqlTypes.TIMESTAMP,
+			TemporalType.TIMESTAMP
 	);
 
 	/**
@@ -535,7 +570,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<Calendar> CALENDAR_DATE = new BasicTypeReference<>(
 			"calendar_date",
 			Calendar.class,
-			SqlTypes.DATE
+			SqlTypes.DATE,
+			TemporalType.DATE
 	);
 
 	/**
@@ -545,7 +581,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<Calendar> CALENDAR_TIME = new BasicTypeReference<>(
 			"calendar_time",
 			Calendar.class,
-			SqlTypes.TIME
+			SqlTypes.TIME,
+			TemporalType.TIME
 	);
 
 
@@ -1174,21 +1211,42 @@ public static void prime(TypeConfiguration typeConfiguration) {
 				DATE,
 				"org.hibernate.type.DateType",
 				basicTypeRegistry,
-				"date", java.sql.Date.class.getName()
+				"date"
 		);
 
 		handle(
 				TIME,
 				"org.hibernate.type.TimeType",
 				basicTypeRegistry,
-				"time", java.sql.Time.class.getName()
+				"time"
 		);
 
 		handle(
 				TIMESTAMP,
 				"org.hibernate.type.TimestampType",
 				basicTypeRegistry,
-				"timestamp", java.sql.Timestamp.class.getName(), Date.class.getName()
+				"timestamp", Date.class.getName()
+		);
+
+		handle(
+				SQL_DATE,
+				null,
+				basicTypeRegistry,
+				"sql_date", java.sql.Date.class.getName()
+		);
+
+		handle(
+				SQL_TIME,
+				null,
+				basicTypeRegistry,
+				"sql_time", java.sql.Time.class.getName()
+		);
+
+		handle(
+				SQL_TIMESTAMP,
+				null,
+				basicTypeRegistry,
+				"sql_timestamp", java.sql.Timestamp.class.getName()
 		);
 
 		handle(
diff --git a/hibernate-core/src/main/java/org/hibernate/type/StandardConverter.java b/hibernate-core/src/main/java/org/hibernate/type/StandardConverter.java
index 638f4734c206..3f73be390ad4 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/StandardConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/StandardConverter.java
@@ -10,7 +10,7 @@
 
 /**
  * Marker for Hibernate supplied {@linkplain AttributeConverter converter} classes.
- * <p/>
+ * <p>
  * Also implements the Hibernate-specific BasicValueConverter contract
  *
  * @author Steve Ebersole
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ArrayConverter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ArrayConverter.java
index 0b7076ee3f47..715406a406df 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ArrayConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ArrayConverter.java
@@ -4,93 +4,87 @@
  */
 package org.hibernate.type.descriptor.converter.internal;
 
-import java.lang.reflect.Array;
-
 import org.hibernate.internal.build.AllowReflection;
+import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static java.lang.reflect.Array.newInstance;
+import static org.hibernate.internal.util.ReflectHelper.arrayClass;
+
 /**
  * Given a {@link BasicValueConverter} for array elements, handles conversion
  * to and from an array of the converted element type.
  *
  * @param <E> the unconverted element type
  * @param <F> the converted element type
- * @param <T> the unconverted array type
- * @param <S> the converted array type
+ * @param <T> the unconverted array type (same as {@code E[]})
  */
 @AllowReflection
-public class ArrayConverter<T, S, E, F> implements BasicValueConverter<T, S> {
+public class ArrayConverter<T, E, F> implements BasicValueConverter<T, F[]> {
 
 	private final BasicValueConverter<E, F> elementConverter;
 	private final JavaType<T> domainJavaType;
-	private final JavaType<S> relationalJavaType;
+	private final JavaType<F[]> relationalJavaType;
+	private final Class<E[]> arrayClass;
 
 	public ArrayConverter(
 			BasicValueConverter<E, F> elementConverter,
 			JavaType<T> domainJavaType,
-			JavaType<S> relationalJavaType) {
+			JavaType<F[]> relationalJavaType,
+			BasicType<E> elementType) {
 		this.elementConverter = elementConverter;
 		this.domainJavaType = domainJavaType;
 		this.relationalJavaType = relationalJavaType;
+		this.arrayClass = arrayClass( elementType.getJavaType() );
 	}
 
 	@Override
-	public T toDomainValue(S relationalForm) {
+	public T toDomainValue(F[] relationalForm) {
 		if ( relationalForm == null ) {
 			return null;
 		}
 		else {
-			final Class<E> elementClass = elementConverter.getDomainJavaType().getJavaTypeClass();
-			if ( relationalForm.getClass().getComponentType() == elementClass) {
-				//noinspection unchecked
-				return (T) relationalForm;
-			}
-			else {
-				//noinspection unchecked
-				return convertTo( (F[]) relationalForm, elementClass );
-			}
+			final var elementClass =
+					elementConverter.getDomainJavaType().getJavaTypeClass();
+			return relationalForm.getClass().getComponentType() == elementClass
+					? domainJavaType.cast( relationalForm )
+					: convertTo( relationalJavaType.cast( relationalForm ), elementClass );
 		}
 	}
 
 	private T convertTo(F[] relationalArray, Class<E> elementClass) {
 		//TODO: the following implementation only handles conversion between non-primitive arrays!
-		//noinspection unchecked
-		final E[] domainArray = (E[]) Array.newInstance( elementClass, relationalArray.length );
+		final var domainArray =
+				arrayClass.cast( newInstance( elementClass, relationalArray.length ) );
 		for ( int i = 0; i < relationalArray.length; i++ ) {
 			domainArray[i] = elementConverter.toDomainValue( relationalArray[i] );
 		}
-		//noinspection unchecked
-		return (T) domainArray;
+		return domainJavaType.cast( domainArray );
 	}
 
 	@Override
-	public S toRelationalValue(T domainForm) {
+	public F[] toRelationalValue(T domainForm) {
 		if ( domainForm == null ) {
 			return null;
 		}
 		else {
-			final Class<F> elementClass = elementConverter.getRelationalJavaType().getJavaTypeClass();
-			if ( domainForm.getClass().getComponentType() == elementClass) {
-				//noinspection unchecked
-				return (S) domainForm;
-			}
-			else {
-				//noinspection unchecked
-				return convertFrom((E[]) domainForm, elementClass);
-			}
+			final Class<F> elementClass =
+					elementConverter.getRelationalJavaType().getJavaTypeClass();
+			return domainForm.getClass().getComponentType() == elementClass
+					? relationalJavaType.cast( domainForm )
+					: convertFrom( arrayClass.cast( domainForm ), elementClass );
 		}
 	}
 
-	private S convertFrom(E[] domainArray, Class<F> elementClass) {
+	private F[] convertFrom(E[] domainArray, Class<F> elementClass) {
 		//TODO: the following implementation only handles conversion between non-primitive arrays!
-		//noinspection unchecked
-		final F[] relationalArray = (F[]) Array.newInstance( elementClass, domainArray.length );
+		final var relationalArray =
+				relationalJavaType.cast( newInstance( elementClass, domainArray.length ) );
 		for ( int i = 0; i < domainArray.length; i++ ) {
 			relationalArray[i] = elementConverter.toRelationalValue( domainArray[i] );
 		}
-		//noinspection unchecked
-		return (S) relationalArray;
+		return relationalArray;
 	}
 
 	@Override
@@ -99,7 +93,7 @@ public JavaType<T> getDomainJavaType() {
 	}
 
 	@Override
-	public JavaType<S> getRelationalJavaType() {
+	public JavaType<F[]> getRelationalJavaType() {
 		return relationalJavaType;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterBean.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterBean.java
index 51b9a3fb5909..0cdc917c1cda 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterBean.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterBean.java
@@ -74,14 +74,16 @@ private JavaType<O> getTypeDescriptor(
 	private MutabilityPlan<O> getMutabilityPlan(
 			ManagedBean<? extends AttributeConverter<O,R>> attributeConverterBean,
 			JpaAttributeConverterCreationContext context) {
-		final MutabilityPlan<O> mutabilityPlan =
+		final var mutabilityPlan =
 				RegistryHelper.INSTANCE.determineMutabilityPlan(
-						attributeConverterBean.getBeanClass(),
+						(java.lang.reflect.Type)
+								attributeConverterBean.getBeanClass(),
 						context.getTypeConfiguration()
 				);
+		//noinspection unchecked
 		return mutabilityPlan == null
 				? new AttributeConverterMutabilityPlan<>( this, true )
-				: mutabilityPlan;
+				: (MutabilityPlan<O>) mutabilityPlan;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ConverterHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ConverterHelper.java
index 5c2b3ca5d8b0..9b8622d8ba84 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ConverterHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/ConverterHelper.java
@@ -11,8 +11,8 @@
 import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
 
 
-import static org.hibernate.internal.util.GenericsHelper.extractClass;
-import static org.hibernate.internal.util.GenericsHelper.extractParameterizedType;
+import static org.hibernate.internal.util.GenericsHelper.erasedType;
+import static org.hibernate.internal.util.GenericsHelper.typeArguments;
 
 /**
  * @author Gavin King
@@ -21,28 +21,34 @@
 public class ConverterHelper {
 	public static <X, Y> BasicValueConverter<X, Y> createValueConverter(
 			AttributeConverter<X,Y> converter, JavaTypeRegistry registry) {
-		final var converterType = extractParameterizedType( converter.getClass(), AttributeConverter.class );
-		final var typeArguments = converterType.getActualTypeArguments();
-		final var domainJavaClass = extractClass( typeArguments[0] );
-		final var relationalJavaClass = extractClass( typeArguments[1] );
+		final var typeArguments =
+				typeArguments( AttributeConverter.class,
+						converter.getClass() );
+		@SuppressWarnings("unchecked") // perfectly safe
+		final var domainJavaClass = (Class<X>) erasedType( typeArguments[0] );
+		@SuppressWarnings("unchecked") // perfectly safe
+		final var relationalJavaClass = (Class<Y>) erasedType( typeArguments[1] );
 		return new AttributeConverterInstance<>(
 				converter,
-				registry.getDescriptor( domainJavaClass ),
-				registry.getDescriptor( relationalJavaClass )
+				registry.resolveDescriptor( domainJavaClass ),
+				registry.resolveDescriptor( relationalJavaClass )
 		);
 	}
 
 	public static <X, Y> JpaAttributeConverter<X, Y> createJpaAttributeConverter(
 			ManagedBean<? extends AttributeConverter<X,Y>> bean, JavaTypeRegistry registry) {
-		final var converterType = extractParameterizedType( bean.getBeanClass(), AttributeConverter.class );
-		final var typeArguments = converterType.getActualTypeArguments();
-		final var domainJavaClass = extractClass( typeArguments[0] );
-		final var relationalJavaClass = extractClass( typeArguments[1] );
+		final var typeArguments =
+				typeArguments( AttributeConverter.class,
+						bean.getBeanClass() );
+		@SuppressWarnings("unchecked") // perfectly safe
+		final var domainJavaClass = (Class<X>) erasedType( typeArguments[0] );
+		@SuppressWarnings("unchecked") // perfectly safe
+		final var relationalJavaClass = (Class<Y>) erasedType( typeArguments[1] );
 		return new AttributeConverterBean<>(
 				bean,
 				registry.resolveDescriptor( bean.getBeanClass() ),
-				registry.getDescriptor( domainJavaClass ),
-				registry.getDescriptor( relationalJavaClass )
+				registry.resolveDescriptor( domainJavaClass ),
+				registry.resolveDescriptor( relationalJavaClass )
 		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractArrayJavaType.java
index d7d1207db2bd..3a2fb269d8d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractArrayJavaType.java
@@ -19,7 +19,8 @@
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import static java.lang.reflect.Array.newInstance;
+
+import static org.hibernate.internal.util.ReflectHelper.arrayClass;
 
 @AllowReflection
 public abstract class AbstractArrayJavaType<T, E> extends AbstractClassJavaType<T>
@@ -97,8 +98,8 @@ <F> BasicType<T> createTypeUsingConverter(
 			ColumnTypeInformation columnTypeInformation,
 			JdbcTypeIndicators indicators,
 			BasicValueConverter<E, F> valueConverter) {
-		final var convertedElementClass = valueConverter.getRelationalJavaType().getJavaTypeClass();
-		final var convertedArrayClass = newInstance( convertedElementClass, 0 ).getClass();
+		final var convertedArrayClass =
+				arrayClass( valueConverter.getRelationalJavaType().getJavaTypeClass() );
 		final var relationalJavaType =
 				typeConfiguration.getJavaTypeRegistry()
 					.resolveDescriptor( convertedArrayClass );
@@ -106,7 +107,7 @@ <F> BasicType<T> createTypeUsingConverter(
 				elementType,
 				arrayJdbcType( typeConfiguration, elementType, columnTypeInformation, indicators ),
 				this,
-				new ArrayConverter<>( valueConverter, this, relationalJavaType )
+				new ArrayConverter<>( valueConverter, this, relationalJavaType, elementType )
 		);
 	}
 
@@ -123,4 +124,15 @@ BasicType<T> resolveType(
 						() -> new BasicArrayType<>( elementType, arrayJdbcType, arrayJavaType ) );
 	}
 
+	// Methods required to support Horrible hack around the fact
+	// that java.sql.Timestamps in an array can be represented as
+	// instances of java.util.Date (Why do we even allow this?)
+
+	public T deepCopy(Object value) {
+		return getMutabilityPlan().deepCopy( cast( value ) );
+	}
+
+	public boolean isEqual(Object one, Object another) {
+		return areEqual( cast( one ), cast( another) );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java
index 430bb9b04f6e..e84b29138fb7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java
@@ -81,7 +81,7 @@ public Class<T> getJavaType() {
 	}
 
 	@Override
-	public Class<T> getJavaTypeClass() {
+	public final Class<T> getJavaTypeClass() {
 		return getJavaType();
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalJavaType.java
index d1a0079326ce..ec59cf36a426 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractTemporalJavaType.java
@@ -33,7 +33,7 @@ public AbstractTemporalJavaType(
 	}
 
 	@Override
-	public final <X> TemporalJavaType<X> resolveTypeForPrecision(
+	public TemporalJavaType<T> resolveTypeForPrecision(
 			TemporalType precision,
 			TypeConfiguration typeConfiguration) {
 		if ( precision == null ) {
@@ -48,26 +48,25 @@ public final <X> TemporalJavaType<X> resolveTypeForPrecision(
 		}
 	}
 
-	private <X> TemporalJavaType<X> forMissingPrecision(TypeConfiguration typeConfiguration) {
-		//noinspection unchecked,rawtypes
-		return (TemporalJavaType) this;
+	private TemporalJavaType<T> forMissingPrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
-	protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
+	protected TemporalJavaType<T> forTimestampPrecision(TypeConfiguration typeConfiguration) {
 		throw new UnsupportedOperationException(
-				this + " as `jakarta.persistence.TemporalType.TIMESTAMP` not supported"
+				getTypeName() + " as TemporalType.TIMESTAMP not supported"
 		);
 	}
 
-	protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
+	protected TemporalJavaType<T> forDatePrecision(TypeConfiguration typeConfiguration) {
 		throw new UnsupportedOperationException(
-				this + " as `jakarta.persistence.TemporalType.DATE` not supported"
+				getTypeName() + " as TemporalType.DATE not supported"
 		);
 	}
 
-	protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
+	protected TemporalJavaType<T> forTimePrecision(TypeConfiguration typeConfiguration) {
 		throw new UnsupportedOperationException(
-				this + " as `jakarta.persistence.TemporalType.TIME` not supported"
+				getTypeName() + " as TemporalType.TIME not supported"
 		);
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayJavaType.java
index 15fc1675d5ec..8ecada319add 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayJavaType.java
@@ -111,7 +111,7 @@ public String extractLoggableRepresentation(T[] value) {
 	}
 
 	@Override
-	public boolean areEqual(T[] one, T[] another) {
+	public boolean areEqual(Object[] one, Object[] another) {
 		if ( one == null && another == null ) {
 			return true;
 		}
@@ -123,7 +123,13 @@ public boolean areEqual(T[] one, T[] another) {
 		}
 		int l = one.length;
 		for ( int i = 0; i < l; i++ ) {
-			if ( !getElementJavaType().areEqual( one[i], another[i] )) {
+			final var elementJavaType = getElementJavaType();
+			if ( !elementJavaType.areEqual(
+					// Horrible hack around the fact that java.sql.Timestamps
+					// can be represented as instances of java.util.Date
+					// (Why do we even allow this? We deprecated java.sql stuff!)
+					elementJavaType.cast( elementJavaType.coerce( one[i] ) ),
+					elementJavaType.cast( elementJavaType.coerce( another[i] ) ) ) ) {
 				return false;
 			}
 		}
@@ -256,24 +262,21 @@ public <X> X unwrap(T[] value, Class<X> type, WrapperOptions options) {
 		}
 
 		if ( type.isInstance( value ) ) {
-			//noinspection unchecked
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( type == byte[].class ) {
-			return (X) toBytes( value );
+			return type.cast( toBytes( value ) );
 		}
 		else if ( type == BinaryStream.class ) {
-			//noinspection unchecked
-			return (X) new ArrayBackedBinaryStream( toBytes( value ) );
+			return type.cast( new ArrayBackedBinaryStream( toBytes( value ) ) );
 		}
 		else if ( type.isArray() ) {
 		final var preferredJavaTypeClass = type.getComponentType();
-			final Object[] unwrapped = (Object[]) newInstance( preferredJavaTypeClass, value.length );
+			final var unwrapped = (Object[]) newInstance( preferredJavaTypeClass, value.length );
 			for ( int i = 0; i < value.length; i++ ) {
 				unwrapped[i] = getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options );
 			}
-			//noinspection unchecked
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 
 		throw unknownUnwrap( type );
@@ -296,52 +299,71 @@ public <X> T[] wrap(X value, WrapperOptions options) {
 			}
 		}
 
-		final var elementJavaType = getElementJavaType();
-		if ( value instanceof Object[] raw ) {
-			final var componentClass = elementJavaType.getJavaTypeClass();
-			//noinspection unchecked
-			final var wrapped = (T[]) newInstance( componentClass, raw.length );
-			if ( componentClass.isAssignableFrom( value.getClass().getComponentType() ) ) {
-				for (int i = 0; i < raw.length; i++) {
-					//noinspection unchecked
-					wrapped[i] = (T) raw[i];
-				}
-			}
-			else {
-				for ( int i = 0; i < raw.length; i++ ) {
-					wrapped[i] = elementJavaType.wrap( raw[i], options );
-				}
-			}
-			return wrapped;
+		if ( value instanceof Object[] array ) {
+			return wrapObjectArray( value, array, options );
 		}
 		else if ( value instanceof byte[] bytes ) {
 			return fromBytes( bytes );
 		}
 		else if ( value instanceof BinaryStream binaryStream ) {
-			// When the value is a BinaryStream, this is a deserialization request
+			// When the value is a BinaryStream,
+			// this is a deserialization request
 			return fromBytes( binaryStream.getBytes() );
 		}
-		else if ( elementJavaType.isInstance( value ) ) {
-			// Support binding a single element as parameter value
-			//noinspection unchecked
-			final var wrapped = (T[]) newInstance( elementJavaType.getJavaTypeClass(), 1 );
-			//noinspection unchecked
-			wrapped[0] = (T) value;
-			return wrapped;
-		}
 		else if ( value instanceof Collection<?> collection ) {
-			//noinspection unchecked
-			final var wrapped = (T[]) newInstance( elementJavaType.getJavaTypeClass(), collection.size() );
-			int i = 0;
-			for ( Object e : collection ) {
-				wrapped[i++] = elementJavaType.wrap( e, options );
-			}
-			return wrapped;
+			return wrapCollection( collection, options );
+		}
+		else if ( getElementJavaType().isInstance( value ) ) {
+			// Support binding a single element as a parameter value
+			return wrapSingleElement( value, options );
 		}
 
 		throw unknownWrap( value.getClass() );
 	}
 
+	private T[] wrapCollection(Collection<?> collection, WrapperOptions options) {
+		final var arrayClass = getJavaTypeClass();
+		final var elementJavaType = getElementJavaType();
+		final var wrapped = newArray( arrayClass, elementJavaType, collection.size() );
+		int i = 0;
+		for ( Object element : collection ) {
+			wrapped[i++] = elementJavaType.wrap( element, options );
+		}
+		return wrapped;
+	}
+
+	private < X> T[] wrapSingleElement(X value, WrapperOptions options) {
+		final var arrayClass = getJavaTypeClass();
+		final var elementJavaType = getElementJavaType();
+		final var wrapped = newArray( arrayClass, elementJavaType, 1 );
+		wrapped[0] = elementJavaType.wrap( value, options );
+		return wrapped;
+	}
+
+	private <X> T[] wrapObjectArray(X value, Object[] array, WrapperOptions options) {
+		final var arrayClass = getJavaTypeClass();
+		final var elementJavaType = getElementJavaType();
+		final var wrapped = newArray( arrayClass, elementJavaType, array.length );
+		// I suppose this code was there as an optimization,
+		// but it doesn't really look necessary to me
+//		if ( elementJavaType.getJavaTypeClass()
+//				.isAssignableFrom( value.getClass().getComponentType() ) ) {
+//			for ( int i = 0; i < array.length; i++) {
+//				wrapped[i] = elementJavaType.cast( array[i] );
+//			}
+//		}
+//		else {
+		for ( int i = 0; i < array.length; i++ ) {
+			wrapped[i] = elementJavaType.wrap( array[i], options );
+		}
+//		}
+		return wrapped;
+	}
+
+	private static <T> T[] newArray(Class<T[]> arrayClass, JavaType<T> elementJavaType, int length) {
+		return arrayClass.cast( newInstance( elementJavaType.getJavaTypeClass(), length ) );
+	}
+
 	private static <T> byte[] toBytes(T[] array) {
 		if ( array.getClass().getComponentType().isEnum() ) {
 			final byte[] bytes = new byte[array.length];
@@ -361,33 +383,52 @@ private static <T> byte[] toBytes(T[] array) {
 
 	private T[] fromBytes(byte[] bytes) {
 		final var elementClass = getElementJavaType().getJavaTypeClass();
+		final var arrayClass = getJavaTypeClass();
 		if ( elementClass.isEnum() ) {
-			final T[] enumConstants = elementClass.getEnumConstants();
-			final var array = (Object[]) newInstance( elementClass, bytes.length );
+			final var enumConstants = elementClass.getEnumConstants();
+			final var array = newArray( arrayClass, getElementJavaType(), bytes.length );
 			for (int i = 0; i < bytes.length; i++ ) {
 				// null enum value was encoded as -1
 				array[i] = bytes[i] == -1 ? null : enumConstants[bytes[i]];
 			}
-			//noinspection unchecked
-			return (T[]) array;
-
+			return array;
 		}
 		else {
 			// When the value is a byte[], this is a deserialization request
-			//noinspection unchecked
-			return (T[]) SerializationHelper.deserialize(bytes);
+			return arrayClass.cast( SerializationHelper.deserialize( bytes ) );
 		}
 	}
 
+	// Methods required to support Horrible hack around the fact
+	// that java.sql.Timestamps in an array can be represented as
+	// instances of java.util.Date (Why do we even allow this?)
+
+	@Override
+	public T[] deepCopy(Object value) {
+		final var mutabilityPlan =
+				(ArrayMutabilityPlan<T>)
+						super.getMutabilityPlan();
+		return mutabilityPlan.deepCopy( (Object[]) value );
+	}
+
+	@Override
+	public boolean isEqual(Object one, Object another) {
+		return areEqual( (Object[]) one, (Object[]) another );
+	}
+
 	@AllowReflection
 	private static class ArrayMutabilityPlan<T> implements MutabilityPlan<T[]> {
 
 		private final Class<T> componentClass;
 		private final MutabilityPlan<T> componentPlan;
+		private final Class<T[]> arrayClass;
+		private final JavaType<T> baseDescriptor;
 
 		public ArrayMutabilityPlan(JavaType<T> baseDescriptor) {
+			this.baseDescriptor = baseDescriptor;
 			this.componentClass = baseDescriptor.getJavaTypeClass();
 			this.componentPlan = baseDescriptor.getMutabilityPlan();
+			this.arrayClass = arrayClass( componentClass );
 		}
 
 		@Override
@@ -396,16 +437,21 @@ public boolean isMutable() {
 		}
 
 		@Override
-		public T[] deepCopy(T[] value) {
+		public T[] deepCopy(Object[] value) {
 			if ( value == null ) {
 				return null;
 			}
-			//noinspection unchecked
-			final T[] copy = (T[]) newInstance( componentClass, value.length );
-			for ( int i = 0; i < value.length; i ++ ) {
-				copy[ i ] = componentPlan.deepCopy( value[ i ] );
+			else {
+				final var copy = arrayClass.cast( newInstance( componentClass, value.length ) );
+				for ( int i = 0; i < value.length; i++ ) {
+					copy[i] = componentPlan.deepCopy(
+							// Horrible hack around the fact that java.sql.Timestamps
+							// can be represented as instances of java.util.Date
+							// (Why do we even allow this? We deprecated java.sql stuff!)
+							baseDescriptor.cast( baseDescriptor.coerce( value[i] ) ) );
+				}
+				return copy;
 			}
-			return copy;
 		}
 
 		@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayMutabilityPlan.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayMutabilityPlan.java
index 0298aff86f0d..6dddd6a5dcb0 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayMutabilityPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ArrayMutabilityPlan.java
@@ -3,34 +3,37 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.descriptor.java;
+
 import org.hibernate.internal.build.AllowReflection;
 
-import java.lang.reflect.Array;
+import static java.lang.reflect.Array.getLength;
+import static java.lang.reflect.Array.newInstance;
 
 /**
- * A mutability plan for arrays.  Specifically arrays of immutable element type; since the elements themselves
- * are immutable, a shallow copy is enough.
+ * A mutability plan for arrays. Specifically arrays of immutable element type;
+ * since the elements themselves are immutable, a shallow copy is enough.
  *
  * @author Steve Ebersole
  *
  * @deprecated Use {@link ImmutableObjectArrayMutabilityPlan#get()} for object arrays,
- * or implement a dedicated mutability plan for primitive arrays
- * (see for example {@link ShortPrimitiveArrayJavaType}'s mutability plan).
+ *             or implement a dedicated mutability plan for primitive arrays
+ *             (see for example {@link ShortPrimitiveArrayJavaType}'s mutability plan).
  */
-@Deprecated
+@Deprecated(forRemoval = true, since = "7.0")
 public class ArrayMutabilityPlan<T> extends MutableMutabilityPlan<T> {
 	public static final ArrayMutabilityPlan INSTANCE = new ArrayMutabilityPlan();
 
 	@SuppressWarnings({ "unchecked", "SuspiciousSystemArraycopy" })
 	@AllowReflection
 	public T deepCopyNotNull(T value) {
-		if ( ! value.getClass().isArray() ) {
+		final var valueClass = value.getClass();
+		if ( !valueClass.isArray() ) {
 			// ugh!  cannot find a way to properly define the type signature here
-			throw new IllegalArgumentException( "Value was not an array [" + value.getClass().getName() + "]" );
+			throw new IllegalArgumentException( "Value was not an array [" + valueClass.getName() + "]" );
 		}
-		final int length = Array.getLength( value );
-		T copy = (T) Array.newInstance( value.getClass().getComponentType(), length );
+		final int length = getLength( value );
+		final Object copy = newInstance( valueClass.getComponentType(), length );
 		System.arraycopy( value, 0, copy, 0, length );
-		return copy;
+		return (T) copy;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java
index 77eb3f485218..58032644ecda 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BasicJavaType.java
@@ -34,6 +34,7 @@ default JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
 
 	@Override
 	default T fromString(CharSequence string) {
-		throw new UnsupportedOperationException();
+		throw new UnsupportedOperationException( "Type " + getTypeName()
+						+ " does not support conversion from String");
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java
index 8accc2bf5555..4d6c75c1e10e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java
@@ -37,6 +37,11 @@ public boolean isInstance(Object value) {
 		return value instanceof BigDecimal;
 	}
 
+	@Override
+	public BigDecimal cast(Object value) {
+		return (BigDecimal) value;
+	}
+
 	@Override
 	public boolean areEqual(BigDecimal one, BigDecimal another) {
 		return one == another
@@ -48,37 +53,36 @@ public int extractHashCode(BigDecimal value) {
 		return value.intValue();
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(BigDecimal value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( BigDecimal.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( BigInteger.class.isAssignableFrom( type ) ) {
-			return (X) value.toBigIntegerExact();
+			return type.cast( value.toBigIntegerExact() );
 		}
 		if ( Byte.class.isAssignableFrom( type ) ) {
-			return (X) Byte.valueOf( value.byteValue() );
+			return type.cast( value.byteValue() );
 		}
 		if ( Short.class.isAssignableFrom( type ) ) {
-			return (X) Short.valueOf( value.shortValue() );
+			return type.cast( value.shortValue() );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.intValue() );
+			return type.cast( value.intValue() );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.longValue() );
+			return type.cast( value.longValue() );
 		}
 		if ( Double.class.isAssignableFrom( type ) ) {
-			return (X) Double.valueOf( value.doubleValue() );
+			return type.cast( value.doubleValue() );
 		}
 		if ( Float.class.isAssignableFrom( type ) ) {
-			return (X) Float.valueOf( value.floatValue() );
+			return type.cast( value.floatValue() );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -126,7 +130,7 @@ public int getDefaultSqlPrecision(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public <X> BigDecimal coerce(X value, CoercionContext coercionContext) {
+	public BigDecimal coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java
index 5f9eae0892c6..5b4a44bd0563 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java
@@ -39,43 +39,47 @@ public boolean isInstance(Object value) {
 		return value instanceof BigInteger;
 	}
 
+	@Override
+	public BigInteger cast(Object value) {
+		return (BigInteger) value;
+	}
+
 	@Override
 	public int extractHashCode(BigInteger value) {
 		return value.intValue();
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(BigInteger value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( BigInteger.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( BigDecimal.class.isAssignableFrom( type ) ) {
-			return (X) new BigDecimal( value );
+			return type.cast( new BigDecimal( value ) );
 		}
 		if ( Byte.class.isAssignableFrom( type ) ) {
-			return (X) Byte.valueOf( value.byteValue() );
+			return type.cast( Byte.valueOf( value.byteValue() ) );
 		}
 		if ( Short.class.isAssignableFrom( type ) ) {
-			return (X) Short.valueOf( value.shortValue() );
+			return type.cast( value.shortValue() );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.intValue() );
+			return type.cast( value.intValue() );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.longValue() );
+			return type.cast( value.longValue() );
 		}
 		if ( Double.class.isAssignableFrom( type ) ) {
-			return (X) Double.valueOf( value.doubleValue() );
+			return type.cast( value.doubleValue() );
 		}
 		if ( Float.class.isAssignableFrom( type ) ) {
-			return (X) Float.valueOf( value.floatValue() );
+			return type.cast( value.floatValue() );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -128,7 +132,7 @@ public int getDefaultSqlScale(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public <X> BigInteger coerce(X value, CoercionContext coercionContext) {
+	public BigInteger coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BlobJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BlobJavaType.java
index 22a6c5ed834c..823b664dd31d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BlobJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BlobJavaType.java
@@ -70,6 +70,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Blob;
 	}
 
+	@Override
+	public Blob cast(Object value) {
+		return (Blob) value;
+	}
+
 	@Override
 	public String extractLoggableRepresentation(Blob value) {
 		return value == null ? "null" : "{blob}";
@@ -109,7 +114,6 @@ public Blob getReplacement(Blob original, Blob target, SharedSessionContractImpl
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(Blob value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
@@ -117,17 +121,17 @@ public <X> X unwrap(Blob value, Class<X> type, WrapperOptions options) {
 
 		try {
 			if ( Blob.class.isAssignableFrom( type ) ) {
-				return (X) options.getLobCreator().toJdbcBlob( value );
+				return type.cast( options.getLobCreator().toJdbcBlob( value ) );
 			}
 			else if ( byte[].class.isAssignableFrom( type )) {
 				if (value instanceof BlobImplementer blobImplementer) {
 					// if the incoming Blob is a wrapper, just grab the bytes from its BinaryStream
-					return (X) blobImplementer.getUnderlyingStream().getBytes();
+					return type.cast( blobImplementer.getUnderlyingStream().getBytes() );
 				}
 				else {
 					try {
 						// otherwise extract the bytes from the stream manually
-						return (X) value.getBinaryStream().readAllBytes();
+						return type.cast( value.getBinaryStream().readAllBytes() );
 					}
 					catch ( IOException e ) {
 						throw new HibernateException( "IOException occurred reading a binary value", e );
@@ -136,20 +140,20 @@ else if ( byte[].class.isAssignableFrom( type )) {
 			}
 			else if ( BinaryStream.class.isAssignableFrom( type ) ) {
 				if (value instanceof BlobImplementer blobImplementer) {
-					return (X) blobImplementer.getUnderlyingStream();
+					return type.cast( blobImplementer.getUnderlyingStream() );
 				}
 				else {
-					return (X) new StreamBackedBinaryStream( value.getBinaryStream(), value.length() );
+					return type.cast( new StreamBackedBinaryStream( value.getBinaryStream(), value.length() ) );
 				}
 			}
 			else if ( InputStream.class.isAssignableFrom( type ) ) {
 				if (value instanceof BlobImplementer blobImplementer) {
 					// if the incoming Blob is a wrapper, just pass along its BinaryStream
-					return (X) blobImplementer.getUnderlyingStream().getInputStream();
+					return type.cast( blobImplementer.getUnderlyingStream().getInputStream() );
 				}
 				else {
 					// otherwise we need to build a BinaryStream...
-					return (X) value.getBinaryStream();
+					return type.cast( value.getBinaryStream() );
 				}
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
index 49466879b8a3..41553b340ab9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
@@ -10,6 +10,7 @@
 import org.hibernate.type.descriptor.java.spi.PrimitiveJavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 
+import static java.lang.Boolean.parseBoolean;
 import static java.lang.Character.toUpperCase;
 import static org.hibernate.internal.util.CharSequenceHelper.regionMatchesIgnoreCase;
 
@@ -28,6 +29,7 @@ public class BooleanJavaType extends AbstractClassJavaType<Boolean> implements
 	private final char characterValueFalse;
 
 	private final char characterValueTrueLC;
+	private final char characterValueFalseLC;
 
 	private final String stringValueTrue;
 	private final String stringValueFalse;
@@ -42,6 +44,7 @@ public BooleanJavaType(char characterValueTrue, char characterValueFalse) {
 		this.characterValueFalse = toUpperCase( characterValueFalse );
 
 		characterValueTrueLC = Character.toLowerCase( characterValueTrue );
+		characterValueFalseLC = Character.toLowerCase( characterValueFalse );
 
 		stringValueTrue = String.valueOf( characterValueTrue );
 		stringValueFalse = String.valueOf( characterValueFalse );
@@ -59,7 +62,7 @@ public String toString(Boolean value) {
 
 	@Override
 	public Boolean fromString(CharSequence string) {
-		return Boolean.valueOf( string.toString() );
+		return parseBoolean( string.toString() );
 	}
 
 	@Override
@@ -67,6 +70,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Boolean;
 	}
 
+	@Override
+	public Boolean cast(Object value) {
+		return (Boolean) value;
+	}
+
 	@Override
 	public Boolean fromEncodedString(CharSequence charSequence, int start, int end) {
 		return switch ( charSequence.charAt( start ) ) {
@@ -76,32 +84,31 @@ public Boolean fromEncodedString(CharSequence charSequence, int start, int end)
 		};
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public <X> X unwrap(Boolean value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Boolean.class.isAssignableFrom( type ) || type == Object.class ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( Byte.class.isAssignableFrom( type ) ) {
-			return (X) toByte( value );
+			return type.cast( toByte( value ) );
 		}
 		if ( Short.class.isAssignableFrom( type ) ) {
-			return (X) toShort( value );
+			return type.cast( toShort( value ) );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) toInteger( value );
+			return type.cast( toInteger( value ) );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) toLong( value );
+			return type.cast( toLong( value ) );
 		}
 		if ( Character.class.isAssignableFrom( type ) ) {
-			return (X) Character.valueOf( value ? characterValueTrue : characterValueFalse );
+			return type.cast( value ? characterValueTrue : characterValueFalse );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) (value ? stringValueTrue : stringValueFalse);
+			return type.cast( (value ? stringValueTrue : stringValueFalse) );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -118,16 +125,35 @@ public <X> Boolean wrap(X value, WrapperOptions options) {
 			return number.intValue() != 0;
 		}
 		if (value instanceof Character character) {
-			return isTrue( character );
+			if ( isTrue( character ) ) {
+				return true;
+			}
+			if ( isFalse( character ) ) {
+				return false;
+			}
+			throw new IllegalArgumentException( "Cannot convert Character value '" + character + "' to Boolean" );
 		}
 		if (value instanceof String string) {
-			return isTrue( string );
+			if ( isTrue( string ) ) {
+				return true;
+			}
+			if ( isFalse( string ) ) {
+				return false;
+			}
+			throw new IllegalArgumentException( "Cannot convert value '" + string + "' to Boolean" );
 		}
 		throw unknownWrap( value.getClass() );
 	}
 
 	private boolean isTrue(String strValue) {
-		return strValue != null && !strValue.isEmpty() && isTrue( strValue.charAt(0) );
+		return strValue != null
+			&& !strValue.isEmpty()
+			&& isTrue( strValue.charAt(0) );
+	}
+
+	private boolean isFalse(String strValue) {
+		return strValue != null
+			&& ( strValue.isEmpty() || isFalse( strValue.charAt(0) ) );
 	}
 
 	private boolean isTrue(char charValue) {
@@ -135,6 +161,11 @@ private boolean isTrue(char charValue) {
 			|| charValue == characterValueTrueLC;
 	}
 
+	private boolean isFalse(char charValue) {
+		return charValue == characterValueFalse
+			|| charValue == characterValueFalseLC;
+	}
+
 	public int toInt(Boolean value) {
 		return value ? 1 : 0;
 	}
@@ -194,18 +225,18 @@ public int getDefaultSqlScale(Dialect dialect, JdbcType jdbcType) {
 	public String getCheckCondition(String columnName, JdbcType jdbcType, BasicValueConverter<Boolean, ?> converter, Dialect dialect) {
 		if ( converter != null ) {
 			if ( jdbcType.isString() ) {
-				final Object falseValue = converter.toRelationalValue( false );
-				final Object trueValue = converter.toRelationalValue( true );
-				final String[] values = getPossibleStringValues( converter, falseValue, trueValue );
-				return dialect.getCheckCondition( columnName, values );
+				return dialect.getCheckCondition( columnName,
+						getPossibleStringValues( converter,
+								converter.toRelationalValue( false ),
+								converter.toRelationalValue( true ) ) );
 			}
 			else if ( jdbcType.isInteger() ) {
 				@SuppressWarnings("unchecked")
 				final var numericConverter = (BasicValueConverter<Boolean, ? extends Number>) converter;
-				final Number falseValue = numericConverter.toRelationalValue( false );
-				final Number trueValue = numericConverter.toRelationalValue( true );
-				final Long[] values = getPossibleNumericValues( numericConverter, falseValue, trueValue );
-				return dialect.getCheckCondition( columnName, values );
+				return dialect.getCheckCondition( columnName,
+						getPossibleNumericValues( numericConverter,
+								numericConverter.toRelationalValue( false ),
+								numericConverter.toRelationalValue( true ) ) );
 			}
 		}
 		return null;
@@ -221,7 +252,7 @@ private static Long[] getPossibleNumericValues(
 		}
 		catch ( NullPointerException ignored ) {
 		}
-		final Long[] values = new Long[nullValue != null ? 3 : 2];
+		final var values = new Long[nullValue != null ? 3 : 2];
 		values[0] = falseValue != null ? falseValue.longValue() : null;
 		values[1] = trueValue != null ? trueValue.longValue() : null;
 		if ( nullValue != null ) {
@@ -240,7 +271,7 @@ private static String[] getPossibleStringValues(
 		}
 		catch ( NullPointerException ignored ) {
 		}
-		final String[] values = new String[nullValue != null ? 3 : 2];
+		final var values = new String[nullValue != null ? 3 : 2];
 		values[0] = falseValue != null ? falseValue.toString() : null;
 		values[1] = trueValue != null ? trueValue.toString() : null;
 		if ( nullValue != null ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanPrimitiveArrayJavaType.java
index 182ca0db7c6d..f8e48bdef5df 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanPrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanPrimitiveArrayJavaType.java
@@ -106,7 +106,7 @@ public <X> X unwrap(boolean[] value, Class<X> type, WrapperOptions options) {
 		}
 
 		if ( type.isInstance( value ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( Object[].class.isAssignableFrom( type ) ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -114,16 +114,15 @@ else if ( Object[].class.isAssignableFrom( type ) ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				unwrapped[i] = getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 		else if ( type == byte[].class ) {
 			// byte[] can only be requested if the value should be serialized
-			return (X) SerializationHelper.serialize( value );
+			return type.cast( SerializationHelper.serialize( value ) );
 		}
 		else if ( type == BinaryStream.class ) {
 			// BinaryStream can only be requested if the value should be serialized
-			//noinspection unchecked
-			return (X) new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) );
+			return type.cast( new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) ) );
 		}
 		else if ( type.isArray() ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -131,7 +130,7 @@ else if ( type.isArray() ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				Array.set( unwrapped, i, getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options ) );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 
 		throw unknownUnwrap( type );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteArrayJavaType.java
index ed0ca91b2e74..fd62195b8cea 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteArrayJavaType.java
@@ -19,12 +19,20 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 
+import static java.lang.Byte.toUnsignedInt;
+import static java.lang.Integer.toHexString;
+
 /**
  * Descriptor for {@code Byte[]} handling, which disallows {@code null} elements.
- * This {@link JavaType} is useful if the domain model uses {@code Byte[]} and wants to map to {@link SqlTypes#VARBINARY}.
+ * This {@link JavaType} is useful if the domain model uses {@code Byte[]} and
+ * wants to map to {@link SqlTypes#VARBINARY}.
  *
  * @author Steve Ebersole
+ *
+ * @deprecated This kind of mapping is no longer required by the JPA specification.
+ * It makes more sense to use {@code byte[]} to represent {@code VARBINARY}.
  */
+@Deprecated(since = "7.3")
 public class ByteArrayJavaType extends AbstractClassJavaType<Byte[]> {
 	public static final ByteArrayJavaType INSTANCE = new ByteArrayJavaType();
 
@@ -35,7 +43,12 @@ public ByteArrayJavaType() {
 
 	@Override
 	public boolean isInstance(Object value) {
-		return value instanceof byte[];
+		return value instanceof Byte[];
+	}
+
+	@Override
+	public Byte[] cast(Object value) {
+		return (Byte[]) value;
 	}
 
 	@Override
@@ -57,22 +70,22 @@ public int extractHashCode(Byte[] bytes) {
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
 		// match legacy behavior
 		final var descriptor = indicators.getJdbcType( indicators.resolveJdbcTypeCode( SqlTypes.VARBINARY ) );
-		return descriptor instanceof AdjustableJdbcType
-				? ( (AdjustableJdbcType) descriptor ).resolveIndicatedType( indicators, this )
+		return descriptor instanceof AdjustableJdbcType jdbcType
+				? jdbcType.resolveIndicatedType( indicators, this )
 				: descriptor;
 	}
 
 	@Override
 	public String toString(Byte[] bytes) {
-		final StringBuilder buf = new StringBuilder();
+		final var string = new StringBuilder();
 		for ( Byte aByte : bytes ) {
-			final String hexStr = Integer.toHexString( Byte.toUnsignedInt(aByte) );
+			final String hexStr = toHexString( toUnsignedInt( aByte ) );
 			if ( hexStr.length() == 1 ) {
-				buf.append( '0' );
+				string.append( '0' );
 			}
-			buf.append( hexStr );
+			string.append( hexStr );
 		}
-		return buf.toString();
+		return string.toString();
 	}
 	@Override
 	public Byte[] fromString(CharSequence string) {
@@ -82,7 +95,7 @@ public Byte[] fromString(CharSequence string) {
 		if ( string.length() % 2 != 0 ) {
 			throw new IllegalArgumentException( "The string is not a valid string representation of a binary content." );
 		}
-		Byte[] bytes = new Byte[string.length() / 2];
+		final var bytes = new Byte[string.length() / 2];
 		for ( int i = 0; i < bytes.length; i++ ) {
 			final String hexStr = string.subSequence( i * 2, (i + 1) * 2 ).toString();
 			bytes[i] = (byte) Integer.parseInt( hexStr, 16 );
@@ -90,26 +103,25 @@ public Byte[] fromString(CharSequence string) {
 		return bytes;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public <X> X unwrap(Byte[] value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Byte[].class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( byte[].class.isAssignableFrom( type ) ) {
-			return (X) unwrapBytes( value );
+			return type.cast( unwrapBytes( value ) );
 		}
 		if ( InputStream.class.isAssignableFrom( type ) ) {
-			return (X) new ByteArrayInputStream( unwrapBytes( value ) );
+			return type.cast( new ByteArrayInputStream( unwrapBytes( value ) ) );
 		}
 		if ( BinaryStream.class.isAssignableFrom( type ) ) {
-			return (X) new ArrayBackedBinaryStream( unwrapBytes( value ) );
+			return type.cast( new ArrayBackedBinaryStream( unwrapBytes( value ) ) );
 		}
 		if ( Blob.class.isAssignableFrom( type ) ) {
-			return (X) options.getLobCreator().createBlob( unwrapBytes( value ) );
+			return type.cast( options.getLobCreator().createBlob( unwrapBytes( value ) ) );
 		}
 
 		throw unknownUnwrap( type );
@@ -144,7 +156,7 @@ private Byte[] wrapBytes(byte[] bytes) {
 		if ( bytes == null ) {
 			return null;
 		}
-		final Byte[] result = new Byte[bytes.length];
+		final var result = new Byte[bytes.length];
 		for ( int i = 0; i < bytes.length; i++ ) {
 			result[i] = bytes[i];
 		}
@@ -155,7 +167,7 @@ private byte[] unwrapBytes(Byte[] bytes) {
 		if ( bytes == null ) {
 			return null;
 		}
-		final byte[] result = new byte[bytes.length];
+		final var result = new byte[bytes.length];
 		for ( int i = 0; i < bytes.length; i++ ) {
 			result[i] = bytes[i];
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java
index 1052f2a58d3f..7e143c378b53 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ByteJavaType.java
@@ -49,32 +49,36 @@ public boolean isInstance(Object value) {
 		return value instanceof Byte;
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+	public Byte cast(Object value) {
+		return (Byte) value;
+	}
+
 	@Override
 	public <X> X unwrap(Byte value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Byte.class.isAssignableFrom( type ) || type == Object.class ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( Short.class.isAssignableFrom( type ) ) {
-			return (X) Short.valueOf( value.shortValue() );
+			return type.cast( value.shortValue() );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.intValue() );
+			return type.cast( value.intValue() );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.longValue() );
+			return type.cast( value.longValue() );
 		}
 		if ( Double.class.isAssignableFrom( type ) ) {
-			return (X) Double.valueOf( value.doubleValue() );
+			return type.cast( value.doubleValue() );
 		}
 		if ( Float.class.isAssignableFrom( type ) ) {
-			return (X) Float.valueOf( value.floatValue() );
+			return type.cast( value.floatValue() );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -132,7 +136,7 @@ public int getDefaultSqlScale(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public <X> Byte coerce(X value, CoercionContext coercionContext) {
+	public Byte coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java
index db5446e701ca..757345cb9875 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java
@@ -30,7 +30,7 @@ protected CalendarDateJavaType() {
 		super( Calendar.class, CalendarJavaType.CalendarMutabilityPlan.INSTANCE, CalendarComparator.INSTANCE );
 	}
 
-	@Override
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.DATE;
 	}
@@ -40,27 +40,28 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		return context.getJdbcType( Types.DATE );
 	}
 
-	@Override  @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) this;
+	@Override
+	protected TemporalJavaType<Calendar> forDatePrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
-	@Override  @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) CalendarJavaType.INSTANCE;
+	@Override
+	protected TemporalJavaType<Calendar> forTimestampPrecision(TypeConfiguration typeConfiguration) {
+		return CalendarJavaType.INSTANCE;
 	}
 
-	@Override  @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) CalendarTimeJavaType.INSTANCE;
+	@Override
+	protected TemporalJavaType<Calendar> forTimePrecision(TypeConfiguration typeConfiguration) {
+		return CalendarTimeJavaType.INSTANCE;
 	}
 
 	public String toString(Calendar value) {
-		return JdbcDateJavaType.INSTANCE.toString( value.getTime() );
+		return JdbcDateJavaType.INSTANCE.toString(
+				new java.sql.Date( value.getTime().getTime() ) );
 	}
 
 	public Calendar fromString(CharSequence string) {
-		Calendar result = new GregorianCalendar();
+		final var result = new GregorianCalendar();
 		result.setTime( JdbcDateJavaType.INSTANCE.fromString( string.toString() ) );
 		return result;
 	}
@@ -88,25 +89,39 @@ public int extractHashCode(Calendar value) {
 		return hashCode;
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+	public boolean isInstance(Object value) {
+		return value instanceof Calendar;
+	}
+
+	@Override
+	public Calendar cast(Object value) {
+		return (Calendar) value;
+	}
+
+	@Override
+	public Calendar coerce(Object value) {
+		return wrap( value, null );
+	}
+
 	public <X> X unwrap(Calendar value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Date( value.getTimeInMillis() );
+			return type.cast( new java.sql.Date( value.getTimeInMillis() ) );
 		}
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Time( value.getTimeInMillis() % 86_400_000 );
+			return type.cast( new java.sql.Time( value.getTimeInMillis() % 86_400_000 ) );
 		}
 		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Timestamp( value.getTimeInMillis() );
+			return type.cast( new java.sql.Timestamp( value.getTimeInMillis() ) );
 		}
 		if ( Date.class.isAssignableFrom( type ) ) {
-			return (X) new  Date( value.getTimeInMillis() );
+			return type.cast( new  Date( value.getTimeInMillis() ) );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java
index 3b23b21b162f..9d69570a57b9 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java
@@ -39,7 +39,7 @@ protected CalendarJavaType() {
 		super( Calendar.class, CalendarMutabilityPlan.INSTANCE, CalendarComparator.INSTANCE );
 	}
 
-	@Override
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.TIMESTAMP;
 	}
@@ -49,19 +49,19 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		return context.getJdbcType( Types.TIMESTAMP );
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) this;
+	@Override
+	protected TemporalJavaType<Calendar> forTimestampPrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) CalendarDateJavaType.INSTANCE;
+	@Override
+	protected TemporalJavaType<Calendar> forDatePrecision(TypeConfiguration typeConfiguration) {
+		return CalendarDateJavaType.INSTANCE;
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) CalendarTimeJavaType.INSTANCE;
+	@Override
+	protected TemporalJavaType<Calendar> forTimePrecision(TypeConfiguration typeConfiguration) {
+		return CalendarTimeJavaType.INSTANCE;
 	}
 
 	public String toString(Calendar value) {
@@ -69,7 +69,7 @@ public String toString(Calendar value) {
 	}
 
 	public Calendar fromString(CharSequence string) {
-		Calendar result = new GregorianCalendar();
+		final var result = new GregorianCalendar();
 		result.setTime( DateJavaType.INSTANCE.fromString( string.toString() ) );
 		return result;
 	}
@@ -105,25 +105,39 @@ public int extractHashCode(Calendar value) {
 		return hashCode;
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+	public boolean isInstance(Object value) {
+		return value instanceof Calendar;
+	}
+
+	@Override
+	public Calendar cast(Object value) {
+		return (Calendar) value;
+	}
+
+	@Override
+	public Calendar coerce(Object value) {
+		return wrap( value, null );
+	}
+
 	public <X> X unwrap(Calendar value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Date( value.getTimeInMillis() );
+			return type.cast( new java.sql.Date( value.getTimeInMillis() ) );
 		}
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Time( value.getTimeInMillis() % 86_400_000 );
+			return type.cast( new java.sql.Time( value.getTimeInMillis() % 86_400_000 ) );
 		}
 		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Timestamp( value.getTimeInMillis() );
+			return type.cast( new java.sql.Timestamp( value.getTimeInMillis() ) );
 		}
 		if ( java.util.Date.class.isAssignableFrom( type ) ) {
-			return (X) new  java.util.Date( value.getTimeInMillis() );
+			return type.cast( new java.util.Date( value.getTimeInMillis() ) );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -136,7 +150,7 @@ else if (value instanceof Calendar calendar) {
 			return calendar;
 		}
 		else if ( value instanceof java.util.Date date ) {
-			final Calendar cal = new GregorianCalendar();
+			final var cal = new GregorianCalendar();
 			cal.setTime( date );
 			return cal;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java
index 077c1fdb50c9..6fed6017fe7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.type.descriptor.java;
 
+import java.sql.Time;
 import java.sql.Types;
 import java.util.Calendar;
 import java.util.Date;
@@ -30,7 +31,7 @@ protected CalendarTimeJavaType() {
 		super( Calendar.class, CalendarJavaType.CalendarMutabilityPlan.INSTANCE, CalendarComparator.INSTANCE );
 	}
 
-	@Override
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.TIME;
 	}
@@ -40,27 +41,28 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		return context.getJdbcType( Types.TIME );
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) this;
+	@Override
+	protected TemporalJavaType<Calendar> forTimePrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) CalendarJavaType.INSTANCE;
+	@Override
+	protected TemporalJavaType<Calendar> forTimestampPrecision(TypeConfiguration typeConfiguration) {
+		return CalendarJavaType.INSTANCE;
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) CalendarDateJavaType.INSTANCE;
+	@Override
+	protected TemporalJavaType<Calendar> forDatePrecision(TypeConfiguration typeConfiguration) {
+		return CalendarDateJavaType.INSTANCE;
 	}
 
 	public String toString(Calendar value) {
-		return JdbcTimeJavaType.INSTANCE.toString( value.getTime() );
+		return JdbcTimeJavaType.INSTANCE.toString(
+				new Time( value.getTime().getTime() ) );
 	}
 
 	public Calendar fromString(CharSequence string) {
-		Calendar result = new GregorianCalendar();
+		final var result = new GregorianCalendar();
 		result.setTime( JdbcTimeJavaType.INSTANCE.fromString( string.toString() ) );
 		return result;
 	}
@@ -90,25 +92,24 @@ public int extractHashCode(Calendar value) {
 		return hashCode;
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(Calendar value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Date( value.getTimeInMillis() );
+			return type.cast( new java.sql.Date( value.getTimeInMillis() ) );
 		}
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Time( value.getTimeInMillis() % 86_400_000 );
+			return type.cast( new java.sql.Time( value.getTimeInMillis() % 86_400_000 ) );
 		}
 		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Timestamp( value.getTimeInMillis() );
+			return type.cast( new java.sql.Timestamp( value.getTimeInMillis() ) );
 		}
 		if ( Date.class.isAssignableFrom( type ) ) {
-			return (X) new  Date( value.getTimeInMillis() );
+			return type.cast( new  Date( value.getTimeInMillis() ) );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayJavaType.java
index 1f75125b1db2..b413f6f4b1a8 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayJavaType.java
@@ -20,10 +20,15 @@
 
 /**
  * Descriptor for {@code Character[]} handling, which disallows {@code null} elements.
- * This {@link JavaType} is useful if the domain model uses {@code Character[]} and wants to map to {@link SqlTypes#VARCHAR}.
+ * This {@link JavaType} is useful if the domain model uses {@code Character[]} and
+ * wants to map to {@link SqlTypes#VARCHAR}.
  *
  * @author Steve Ebersole
+ *
+ * @deprecated This kind of mapping is no longer required by the JPA specification. It
+ * makes more sense to use {@code char[]} or {@code String} to represent {@code VARCHAR}.
  */
+@Deprecated(since = "7.3")
 public class CharacterArrayJavaType extends AbstractClassJavaType<Character[]> {
 	public static final CharacterArrayJavaType INSTANCE = new CharacterArrayJavaType();
 
@@ -37,6 +42,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Character[];
 	}
 
+	@Override
+	public Character[] cast(Object value) {
+		return (Character[]) value;
+	}
+
 	@Override
 	public String toString(Character[] value) {
 		return new String( unwrapChars( value ) );
@@ -66,34 +76,33 @@ public int extractHashCode(Character[] chars) {
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
 		// match legacy behavior
 		final var descriptor = indicators.getJdbcType( indicators.resolveJdbcTypeCode( SqlTypes.VARCHAR ) );
-		return descriptor instanceof AdjustableJdbcType
-				? ( (AdjustableJdbcType) descriptor ).resolveIndicatedType( indicators, this )
+		return descriptor instanceof AdjustableJdbcType jdbcType
+				? jdbcType.resolveIndicatedType( indicators, this )
 				: descriptor;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public <X> X unwrap(Character[] value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Character[].class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) new String( unwrapChars( value ) );
+			return type.cast( new String( unwrapChars( value ) ) );
 		}
 		if ( NClob.class.isAssignableFrom( type ) ) {
-			return (X) options.getLobCreator().createNClob( new String( unwrapChars( value ) ) );
+			return type.cast( options.getLobCreator().createNClob( new String( unwrapChars( value ) ) ) );
 		}
 		if ( Clob.class.isAssignableFrom( type ) ) {
-			return (X) options.getLobCreator().createClob( new String( unwrapChars( value ) ) );
+			return type.cast( options.getLobCreator().createClob( new String( unwrapChars( value ) ) ) );
 		}
 		if ( Reader.class.isAssignableFrom( type ) ) {
-			return (X) new StringReader( new String( unwrapChars( value ) ) );
+			return type.cast( new StringReader( new String( unwrapChars( value ) ) ) );
 		}
 		if ( CharacterStream.class.isAssignableFrom( type ) ) {
-			return (X) new CharacterStreamImpl( new String( unwrapChars( value ) ) );
+			return type.cast( new CharacterStreamImpl( new String( unwrapChars( value ) ) ) );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -121,7 +130,7 @@ private Character[] wrapChars(char[] chars) {
 		if ( chars == null ) {
 			return null;
 		}
-		final Character[] result = new Character[chars.length];
+		final var result = new Character[chars.length];
 		for ( int i = 0; i < chars.length; i++ ) {
 			result[i] = chars[i];
 		}
@@ -132,7 +141,7 @@ private char[] unwrapChars(Character[] chars) {
 		if ( chars == null ) {
 			return null;
 		}
-		final char[] result = new char[chars.length];
+		final var result = new char[chars.length];
 		for ( int i = 0; i < chars.length; i++ ) {
 			result[i] = chars[i];
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterJavaType.java
index fe16e90592cc..817e8fca31bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterJavaType.java
@@ -45,20 +45,24 @@ public boolean isInstance(Object value) {
 		return value instanceof Character;
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+	public Character cast(Object value) {
+		return (Character) value;
+	}
+
 	@Override
 	public <X> X unwrap(Character value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Character.class.isAssignableFrom( type ) || type == Object.class ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		if ( Number.class.isAssignableFrom( type ) ) {
-			return (X) Short.valueOf( (short) value.charValue() );
+			return type.cast( (short) value.charValue() );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClassJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClassJavaType.java
index 02c0e203681a..90754167e741 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClassJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClassJavaType.java
@@ -26,6 +26,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Class;
 	}
 
+	@Override
+	public Class<?> cast(Object value) {
+		return (Class<?>) value;
+	}
+
 	@Override
 	public boolean useObjectEqualsHashCode() {
 		return true;
@@ -51,16 +56,15 @@ public Class<?> fromString(CharSequence string) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(Class<?> value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Class.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) toString( value );
+			return type.cast( toString( value ) );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobJavaType.java
index 398d7ee68491..2ff3bd8fb2ec 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobJavaType.java
@@ -52,6 +52,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Clob;
 	}
 
+	@Override
+	public Clob cast(Object value) {
+		return (Clob) value;
+	}
+
 	@Override
 	public String extractLoggableRepresentation(Clob value) {
 		return value == null ? "null" : "{clob}";
@@ -81,7 +86,6 @@ public Clob getReplacement(Clob original, Clob target, SharedSessionContractImpl
 				.mergeClob( original, target, session );
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(final Clob value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
@@ -89,36 +93,36 @@ public <X> X unwrap(final Clob value, Class<X> type, WrapperOptions options) {
 
 		try {
 			if ( Clob.class.isAssignableFrom( type ) ) {
-				return (X) options.getLobCreator().toJdbcClob( value );
+				return type.cast( options.getLobCreator().toJdbcClob( value ) );
 			}
 			else if ( String.class.isAssignableFrom( type ) ) {
 				if (value instanceof ClobImplementer clobImplementer) {
 					// if the incoming Clob is a wrapper, just grab the string from its CharacterStream
-					return (X) clobImplementer.getUnderlyingStream().asString();
+					return type.cast( clobImplementer.getUnderlyingStream().asString() );
 				}
 				else {
 					// otherwise extract the bytes from the stream manually
-					return (X) extractString( value.getCharacterStream() );
+					return type.cast( extractString( value.getCharacterStream() ) );
 				}
 			}
 			else if ( Reader.class.isAssignableFrom( type ) ) {
 				if (value instanceof ClobImplementer clobImplementer) {
 					// if the incoming NClob is a wrapper, just pass along its BinaryStream
-					return (X) clobImplementer.getUnderlyingStream().asReader();
+					return type.cast( clobImplementer.getUnderlyingStream().asReader() );
 				}
 				else {
 					// otherwise we need to build a CharacterStream...
-					return (X) value.getCharacterStream();
+					return type.cast( value.getCharacterStream() );
 				}
 			}
 			else if ( CharacterStream.class.isAssignableFrom( type ) ) {
 				if (value instanceof ClobImplementer clobImplementer) {
 					// if the incoming Clob is a wrapper, just pass along its CharacterStream
-					return (X) clobImplementer.getUnderlyingStream();
+					return type.cast( clobImplementer.getUnderlyingStream() );
 				}
 				else {
 					// otherwise we need to build a CharacterStream...
-					return (X) value.getCharacterStream();
+					return type.cast( value.getCharacterStream() );
 				}
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CurrencyJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CurrencyJavaType.java
index a2fa030de8fb..9799b675ea1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CurrencyJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CurrencyJavaType.java
@@ -27,6 +27,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Currency;
 	}
 
+	@Override
+	public Currency cast(Object value) {
+		return (Currency) value;
+	}
+
 	@Override
 	public boolean useObjectEqualsHashCode() {
 		return true;
@@ -42,16 +47,15 @@ public Currency fromString(CharSequence string) {
 		return Currency.getInstance( string.toString() );
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(Currency value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Currency.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.getCurrencyCode();
+			return type.cast( value.getCurrencyCode() );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateJavaType.java
index 430a8664a5f8..f6680becfc12 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateJavaType.java
@@ -4,18 +4,14 @@
  */
 package org.hibernate.type.descriptor.java;
 
+import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
-import java.time.format.DateTimeParseException;
-import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalAccessor;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 import jakarta.persistence.TemporalType;
 
-import org.hibernate.HibernateException;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.type.descriptor.WrapperOptions;
@@ -30,17 +26,54 @@
  */
 public class DateJavaType extends AbstractTemporalJavaType<Date> implements VersionJavaType<Date> {
 	public static final DateJavaType INSTANCE = new DateJavaType();
+	private final @SuppressWarnings("deprecation") TemporalType precision;
 
 	public static class DateMutabilityPlan extends MutableMutabilityPlan<Date> {
-		public static final DateMutabilityPlan INSTANCE = new DateMutabilityPlan();
+		@SuppressWarnings("deprecation")
+		public static final DateMutabilityPlan INSTANCE =
+				new DateMutabilityPlan( TemporalType.TIMESTAMP );
+
+		private final @SuppressWarnings("deprecation") TemporalType precision;
+
+		public DateMutabilityPlan(@SuppressWarnings("deprecation") TemporalType precision) {
+			this.precision = precision;
+		}
+
 		@Override
 		public Date deepCopyNotNull(Date value) {
-			return new Date( value.getTime() );
+			if ( value instanceof java.sql.Timestamp timestamp ) {
+				return JdbcTimestampJavaType.TimestampMutabilityPlan.INSTANCE.deepCopyNotNull( timestamp );
+			}
+			else if ( value instanceof java.sql.Date date ) {
+				return JdbcDateJavaType.DateMutabilityPlan.INSTANCE.deepCopyNotNull( date );
+			}
+			else if ( value instanceof java.sql.Time time ) {
+				return JdbcTimeJavaType.TimeMutabilityPlan.INSTANCE.deepCopyNotNull( time );
+			}
+			else {
+				return switch ( precision ) {
+					case TIMESTAMP -> toTimestamp( value );
+					case DATE -> toDate( value );
+					case TIME -> toTime( value );
+				};
+			}
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	public DateJavaType() {
 		super( Date.class, DateMutabilityPlan.INSTANCE );
+		this.precision = TemporalType.TIMESTAMP;
+	}
+
+	/**
+	 * A {@link Date} may be used to represent a date, time, or timestamp,
+	 * each of which have different semantics at the Java level. Therefore,
+	 * we distinguish these usages based on the given {@code TemporalType}.
+	 */
+	private DateJavaType(@SuppressWarnings("deprecation") TemporalType precision) {
+		super( Date.class, new DateMutabilityPlan( precision ) );
+		this.precision = precision;
 	}
 
 	@Override
@@ -49,53 +82,57 @@ public boolean isInstance(Object value) {
 	}
 
 	@Override
-	public TemporalType getPrecision() {
-		return TemporalType.TIMESTAMP;
+	public Date cast(Object value) {
+		return (Date) value;
 	}
 
 	@Override
-	public int getDefaultSqlPrecision(Dialect dialect, JdbcType jdbcType) {
-		// this "Date" is really a timestamp
-		return dialect.getDefaultTimestampPrecision();
+	public @SuppressWarnings("deprecation") TemporalType getPrecision() {
+		return precision;
 	}
 
 	@Override
-	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
-		return context.getJdbcType( Types.TIMESTAMP );
-	}
-
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) JdbcDateJavaType.INSTANCE;
+	public TemporalJavaType<Date> resolveTypeForPrecision(
+			@SuppressWarnings("deprecation") TemporalType precision,
+			TypeConfiguration typeConfiguration) {
+		return precision == null ? this : new DateJavaType( precision );
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) JdbcTimestampJavaType.INSTANCE;
+	@Override
+	public int getDefaultSqlPrecision(Dialect dialect, JdbcType jdbcType) {
+		return switch ( precision ) {
+			case TIMESTAMP -> JdbcTimestampJavaType.INSTANCE.getDefaultSqlPrecision( dialect, jdbcType );
+			case DATE -> JdbcDateJavaType.INSTANCE.getDefaultSqlPrecision( dialect, jdbcType );
+			case TIME -> JdbcTimeJavaType.INSTANCE.getDefaultSqlPrecision( dialect, jdbcType );
+		};
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) JdbcTimeJavaType.INSTANCE;
+	@Override
+	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
+		return context.getJdbcType( switch ( precision ) {
+			case TIMESTAMP -> Types.TIMESTAMP;
+			case DATE -> Types.DATE;
+			case TIME -> Types.TIME;
+		} );
 	}
 
 	@Override
 	public String toString(Date value) {
-		return JdbcTimestampJavaType.LITERAL_FORMATTER.format( value.toInstant() );
+//		return JdbcTimestampJavaType.LITERAL_FORMATTER.format( value.toInstant() );
+		return switch ( precision ) {
+			case TIMESTAMP -> JdbcTimestampJavaType.INSTANCE.toString( toTimestamp( value ) );
+			case DATE -> JdbcDateJavaType.INSTANCE.toString( toDate( value ) );
+			case TIME -> JdbcTimeJavaType.INSTANCE.toString( toTime( value ) );
+		};
 	}
 
 	@Override
 	public Date fromString(CharSequence string) {
-		try {
-			final TemporalAccessor accessor = JdbcTimestampJavaType.LITERAL_FORMATTER.parse( string );
-			return new Date(
-					accessor.getLong( ChronoField.INSTANT_SECONDS ) * 1000L
-							+ accessor.get( ChronoField.NANO_OF_SECOND ) / 1_000_000
-			);
-		}
-		catch ( DateTimeParseException pe) {
-			throw new HibernateException( "could not parse timestamp string" + string, pe );
-		}
+		return switch ( precision ) {
+			case TIMESTAMP -> JdbcTimestampJavaType.INSTANCE.fromString( string );
+			case DATE -> JdbcDateJavaType.INSTANCE.fromString( string );
+			case TIME -> JdbcTimeJavaType.INSTANCE.fromString( string );
+		};
 	}
 
 	@Override
@@ -103,79 +140,68 @@ public boolean areEqual(Date one, Date another) {
 		if ( one == another) {
 			return true;
 		}
-		return !( one == null || another == null ) && one.getTime() == another.getTime();
-
-	}
-
-	@Override
+		return one != null && another != null
+			&& switch ( precision ) {
+				case DATE -> JdbcDateJavaType.INSTANCE.areEqual( toDate( one ), toDate( another ) );
+				case TIME -> JdbcTimeJavaType.INSTANCE.areEqual( toTime( one ), toTime( another ) );
+				case TIMESTAMP ->
+						// emulate legacy behavior (good or not)
+						one instanceof Timestamp timestamp && another instanceof Timestamp anotherTimestamp
+							? JdbcTimestampJavaType.INSTANCE.areEqual( timestamp, anotherTimestamp )
+							: one.getTime() == another.getTime();
+			};
+	}
+
+	@Override @SuppressWarnings("deprecation")
 	public int extractHashCode(Date value) {
-		Calendar calendar = Calendar.getInstance();
+		var calendar = Calendar.getInstance();
 		calendar.setTime( value );
-		return CalendarJavaType.INSTANCE.extractHashCode( calendar );
+		int hashCode = 1;
+		if ( precision == TemporalType.TIMESTAMP ) {
+			hashCode = 31 * hashCode + calendar.get(Calendar.MILLISECOND);
+		}
+		if ( precision != TemporalType.DATE ) {
+			hashCode = 31 * hashCode + calendar.get(Calendar.SECOND);
+			hashCode = 31 * hashCode + calendar.get(Calendar.MINUTE);
+			hashCode = 31 * hashCode + calendar.get(Calendar.HOUR_OF_DAY);
+		}
+		if ( precision != TemporalType.TIME ) {
+			hashCode = 31 * hashCode + calendar.get(Calendar.DAY_OF_MONTH);
+			hashCode = 31 * hashCode + calendar.get(Calendar.MONTH);
+			hashCode = 31 * hashCode + calendar.get(Calendar.YEAR);
+		}
+		return hashCode;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public <X> X unwrap(Date value, Class<X> type, WrapperOptions options) {
-		if ( value == null ) {
-			return null;
-		}
-		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			final java.sql.Date rtn = value instanceof java.sql.Date
-					? ( java.sql.Date ) value
-					: new java.sql.Date( value.getTime() );
-			return (X) rtn;
-		}
-		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			final java.sql.Time rtn = value instanceof java.sql.Time
-					? ( java.sql.Time ) value
-					: new java.sql.Time( value.getTime() % 86_400_000 );
-			return (X) rtn;
-		}
-		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
-			final java.sql.Timestamp rtn = value instanceof Timestamp
-					? ( java.sql.Timestamp ) value
-					: new java.sql.Timestamp( value.getTime() );
-			return (X) rtn;
-		}
-		if ( Date.class.isAssignableFrom( type ) ) {
-			return (X) value;
-		}
-		if ( Calendar.class.isAssignableFrom( type ) ) {
-			final GregorianCalendar cal = new GregorianCalendar();
-			cal.setTimeInMillis( value.getTime() );
-			return (X) cal;
-		}
-		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.getTime() );
-		}
-		throw unknownUnwrap( type );
+		return switch ( precision ) {
+			case TIMESTAMP -> JdbcTimestampJavaType.INSTANCE.unwrap( toTimestamp( value ), type, options );
+			case DATE -> JdbcDateJavaType.INSTANCE.unwrap( toDate( value ), type, options );
+			case TIME -> JdbcTimeJavaType.INSTANCE.unwrap( toTime( value ), type, options );
+		};
 	}
+
 	@Override
 	public <X> Date wrap(X value, WrapperOptions options) {
-		if ( value == null ) {
-			return null;
-		}
-		if (value instanceof Date date) {
-			return date;
-		}
-
-		if (value instanceof Long longValue) {
-			return new Date( longValue );
-		}
-
-		if (value instanceof Calendar calendar) {
-			return new Date( calendar.getTimeInMillis() );
-		}
+		return switch ( precision ) {
+			case TIMESTAMP -> JdbcTimestampJavaType.INSTANCE.wrap( value, options );
+			case DATE -> JdbcDateJavaType.INSTANCE.wrap( value, options );
+			case TIME -> JdbcTimeJavaType.INSTANCE.wrap( value, options );
+		};
+	}
 
-		throw unknownWrap( value.getClass() );
+	@Override
+	public Object coerce(Object value) {
+		return wrap( value, null );
 	}
 
 	@Override
 	public boolean isWider(JavaType<?> javaType) {
-		return switch ( javaType.getTypeName() ) {
-			case "java.sql.Date", "java.sql.Timestamp", "java.util.Calendar" -> true;
-			default -> false;
+		return switch ( precision ) {
+			case TIMESTAMP -> JdbcTimestampJavaType.INSTANCE.isWider( javaType );
+			case DATE -> JdbcDateJavaType.INSTANCE.isWider( javaType );
+			case TIME -> JdbcTimeJavaType.INSTANCE.isWider( javaType );
 		};
 	}
 
@@ -195,4 +221,21 @@ public Date seed(
 			Integer precision, Integer scale, SharedSessionContractImplementor session) {
 		return Timestamp.from( ClockHelper.forPrecision( precision, session ).instant() );
 	}
+
+	private static Timestamp toTimestamp(Date date) {
+		return date instanceof Timestamp timestamp
+				? timestamp
+				: JdbcTimestampJavaType.wrapSqlTimestamp( date );
+	}
+
+	private static Time toTime(Date date) {
+		return date instanceof Time time
+				? time
+				: JdbcTimeJavaType.toTime( date );
+	}
+
+	private static java.sql.Date toDate(java.util.Date value) {
+		return JdbcDateJavaType.toDate( value );
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java
index 3bf60f6c2497..6ee06c11b55c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java
@@ -53,38 +53,42 @@ public boolean isInstance(Object value) {
 		return value instanceof Double;
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+	public Double cast(Object value) {
+		return (Double) value;
+	}
+
 	@Override
 	public <X> X unwrap(Double value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Double.class.isAssignableFrom( type ) || type == Object.class ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( Float.class.isAssignableFrom( type ) ) {
-			return (X) Float.valueOf( value.floatValue() );
+			return type.cast( value.floatValue() );
 		}
 		if ( Byte.class.isAssignableFrom( type ) ) {
-			return (X) Byte.valueOf( value.byteValue() );
+			return type.cast( value.byteValue() );
 		}
 		if ( Short.class.isAssignableFrom( type ) ) {
-			return (X) Short.valueOf( value.shortValue() );
+			return type.cast( value.shortValue() );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.intValue() );
+			return type.cast( value.intValue() );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.longValue() );
+			return type.cast( value.longValue() );
 		}
 		if ( BigInteger.class.isAssignableFrom( type ) ) {
-			return (X) BigInteger.valueOf( value.longValue() );
+			return type.cast( BigInteger.valueOf( value.longValue() ) );
 		}
 		if ( BigDecimal.class.isAssignableFrom( type ) ) {
-			return (X) BigDecimal.valueOf( value );
+			return type.cast( BigDecimal.valueOf( value ) );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -160,7 +164,7 @@ public int getDefaultSqlPrecision(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public <X> Double coerce(X value, CoercionContext coercionContext) {
+	public Double coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoublePrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoublePrimitiveArrayJavaType.java
index 0ed6cc8f997f..10218ee8a963 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoublePrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoublePrimitiveArrayJavaType.java
@@ -41,6 +41,11 @@ public boolean isInstance(Object value) {
 		return value instanceof double[];
 	}
 
+	@Override
+	public double[] cast(Object value) {
+		return (double[]) value;
+	}
+
 	@Override
 	public String extractLoggableRepresentation(double[] value) {
 		return value == null ? super.extractLoggableRepresentation( null ) : Arrays.toString( value );
@@ -106,7 +111,7 @@ public <X> X unwrap(double[] value, Class<X> type, WrapperOptions options) {
 		}
 
 		if ( type.isInstance( value ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( Object[].class.isAssignableFrom( type ) ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -114,16 +119,15 @@ else if ( Object[].class.isAssignableFrom( type ) ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				unwrapped[i] = getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 		else if ( type == byte[].class ) {
 			// byte[] can only be requested if the value should be serialized
-			return (X) SerializationHelper.serialize( value );
+			return type.cast( SerializationHelper.serialize( value ) );
 		}
 		else if ( type == BinaryStream.class ) {
 			// BinaryStream can only be requested if the value should be serialized
-			//noinspection unchecked
-			return (X) new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) );
+			return type.cast( new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) ) );
 		}
 		else if ( type.isArray() ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -131,7 +135,7 @@ else if ( type.isArray() ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				Array.set( unwrapped, i, getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options ) );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 
 		throw unknownUnwrap( type );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java
index fa26767f4f6f..801a3ca44402 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java
@@ -37,7 +37,6 @@ public class DurationJavaType extends AbstractClassJavaType<Duration> {
 	 * Singleton access
 	 */
 	public static final DurationJavaType INSTANCE = new DurationJavaType();
-	private static final BigDecimal BILLION = BigDecimal.ONE.movePointRight(9);
 
 	public DurationJavaType() {
 		super( Duration.class, ImmutableMutabilityPlan.instance() );
@@ -48,6 +47,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Duration;
 	}
 
+	@Override
+	public Duration cast(Object value) {
+		return (Duration) value;
+	}
+
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		return context.getTypeConfiguration()
@@ -88,28 +92,27 @@ public Duration fromString(CharSequence string) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(Duration duration, Class<X> type, WrapperOptions options) {
 		if ( duration == null ) {
 			return null;
 		}
 
 		if ( Duration.class.isAssignableFrom( type ) ) {
-			return (X) duration;
+			return type.cast( duration );
 		}
 
 		if ( BigDecimal.class.isAssignableFrom( type ) ) {
-			return (X) new BigDecimal( duration.getSeconds() )
+			return type.cast( new BigDecimal( duration.getSeconds() )
 					.movePointRight( 9 )
-					.add( new BigDecimal( duration.getNano() ) );
+					.add( new BigDecimal( duration.getNano() ) ) );
 		}
 
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) duration.toString();
+			return type.cast( duration.toString() );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( duration.toNanos() );
+			return type.cast( duration.toNanos() );
 		}
 
 		throw unknownUnwrap( type );
@@ -126,7 +129,7 @@ public <X> Duration wrap(X value, WrapperOptions options) {
 		}
 
 		if ( value instanceof BigDecimal decimal ) {
-			final BigDecimal[] secondsAndNanos = decimal.divideAndRemainder( BILLION );
+			final BigDecimal[] secondsAndNanos = decimal.divideAndRemainder( BigDecimalHolder.BILLION );
 			return Duration.ofSeconds(
 					secondsAndNanos[0].longValueExact(),
 					// use intValue() not intValueExact() here, because
@@ -176,4 +179,11 @@ public int getDefaultSqlScale(Dialect dialect, JdbcType jdbcType) {
 				: 0; // For non-interval types, we use the type numeric(21)
 
 	}
+
+	// Avoids initializing the BigDecimal class when not strictly necessary
+	// Initializing BigDecimal generates a lot of allocations
+	private static class BigDecimalHolder {
+
+		private static final BigDecimal BILLION = BigDecimal.valueOf(1_000_000_000L);
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java
index 6f8edb9dfe94..8273f2cf908d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/EnumJavaType.java
@@ -96,28 +96,31 @@ public T fromString(CharSequence string) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
 		if ( String.class.equals( type ) ) {
-			return (X) toName( value );
+			return type.cast( toName( value ) );
 		}
 		else if ( Long.class.equals( type ) ) {
-			return (X) toLong( value );
+			return type.cast( toLong( value ) );
 		}
 		else if ( Integer.class.equals( type ) ) {
-			return (X) toInteger( value );
+			return type.cast( toInteger( value ) );
 		}
 		else if ( Short.class.equals( type ) ) {
-			return (X) toShort( value );
+			return type.cast( toShort( value ) );
 		}
 		else if ( Byte.class.equals( type ) ) {
-			return (X) toByte( value );
+			return type.cast( toByte( value ) );
+		}
+		else if ( type.isInstance( value )) {
+			return type.cast( value );
+		}
+		else {
+			throw unknownUnwrap( type );
 		}
-		return (X) value;
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> T wrap(X value, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
@@ -140,8 +143,14 @@ else if ( value instanceof Byte byteValue ) {
 		else if ( value instanceof Number number ) {
 			return fromLong( number.longValue() );
 		}
+		else if ( getJavaType().isInstance( value ) ) {
+			return (T) value;
+		}
+		else if ( isInstance( value ) ) {
+			return cast( value );
+		}
 		else {
-		return (T) value;
+			throw unknownWrap( value.getClass() );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java
index 4a6c6e9e8f5d..458640f20522 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java
@@ -52,38 +52,42 @@ public boolean isInstance(Object value) {
 		return value instanceof Float;
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+	public Float cast(Object value) {
+		return (Float) value;
+	}
+
 	@Override
 	public <X> X unwrap(Float value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Float.class.isAssignableFrom( type ) || type == Object.class ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( Double.class.isAssignableFrom( type ) ) {
-			return (X) Double.valueOf( value.doubleValue() );
+			return type.cast( value.doubleValue() );
 		}
 		if ( Byte.class.isAssignableFrom( type ) ) {
-			return (X) Byte.valueOf( value.byteValue() );
+			return type.cast( value.byteValue() );
 		}
 		if ( Short.class.isAssignableFrom( type ) ) {
-			return (X) Short.valueOf( value.shortValue() );
+			return type.cast( value.shortValue() );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.intValue() );
+			return type.cast( value.intValue() );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.longValue() );
+			return type.cast( value.longValue() );
 		}
 		if ( BigInteger.class.isAssignableFrom( type ) ) {
-			return (X) BigInteger.valueOf( value.longValue() );
+			return type.cast( BigInteger.valueOf( value.longValue() ) );
 		}
 		if ( BigDecimal.class.isAssignableFrom( type ) ) {
-			return (X) BigDecimal.valueOf( value );
+			return type.cast( BigDecimal.valueOf( value ) );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -158,7 +162,7 @@ public int getDefaultSqlPrecision(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public <X> Float coerce(X value, CoercionContext coercionContext) {
+	public Float coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatPrimitiveArrayJavaType.java
index 25f431b6a114..bd67839519c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatPrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatPrimitiveArrayJavaType.java
@@ -41,6 +41,11 @@ public boolean isInstance(Object value) {
 		return value instanceof float[];
 	}
 
+	@Override
+	public float[] cast(Object value) {
+		return (float[]) value;
+	}
+
 	@Override
 	public String extractLoggableRepresentation(float[] value) {
 		return value == null ? super.extractLoggableRepresentation( null ) : Arrays.toString( value );
@@ -106,7 +111,7 @@ public <X> X unwrap(float[] value, Class<X> type, WrapperOptions options) {
 		}
 
 		if ( type.isInstance( value ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( Object[].class.isAssignableFrom( type ) ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -114,16 +119,15 @@ else if ( Object[].class.isAssignableFrom( type ) ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				unwrapped[i] = getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 		else if ( type == byte[].class ) {
 			// byte[] can only be requested if the value should be serialized
-			return (X) SerializationHelper.serialize( value );
+			return type.cast( SerializationHelper.serialize( value ) );
 		}
 		else if ( type == BinaryStream.class ) {
 			// BinaryStream can only be requested if the value should be serialized
-			//noinspection unchecked
-			return (X) new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) );
+			return type.cast( new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) ) );
 		}
 		else if ( type.isArray() ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -131,7 +135,7 @@ else if ( type.isArray() ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				Array.set( unwrapped, i, getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options ) );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 
 		throw unknownUnwrap( type );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InetAddressJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InetAddressJavaType.java
index 1d0d56a15d4c..1d742aa2cfd5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InetAddressJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InetAddressJavaType.java
@@ -51,20 +51,19 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
 		return indicators.getJdbcType( SqlTypes.INET );
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public <X> X unwrap(InetAddress value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( InetAddress.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( byte[].class.isAssignableFrom( type ) ) {
-			return (X) value.getAddress();
+			return type.cast( value.getAddress() );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.getHostAddress();
+			return type.cast( value.getHostAddress() );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java
index 5b78c6fa8e6f..9c75946c7b47 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java
@@ -48,23 +48,28 @@ public boolean isInstance(Object value) {
 	}
 
 	@Override
+	public Instant cast(Object value) {
+		return (Instant) value;
+	}
+
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.TIMESTAMP;
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) this;
+	@Override
+	protected TemporalJavaType<Instant> forDatePrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) this;
+	@Override
+	protected TemporalJavaType<Instant> forTimestampPrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) this;
+	@Override
+	protected TemporalJavaType<Instant> forTimePrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
 	@Override
@@ -88,22 +93,21 @@ public Instant fromString(CharSequence string) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(Instant instant, Class<X> type, WrapperOptions options) {
 		if ( instant == null ) {
 			return null;
 		}
 
 		if ( Instant.class.isAssignableFrom( type ) ) {
-			return (X) instant;
+			return type.cast( instant );
 		}
 
 		if ( OffsetDateTime.class.isAssignableFrom( type ) ) {
-			return (X) instant.atOffset( ZoneOffset.UTC );
+			return type.cast( instant.atOffset( ZoneOffset.UTC ) );
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			return (X) GregorianCalendar.from( instant.atZone( ZoneOffset.UTC ) );
+			return type.cast( GregorianCalendar.from( instant.atZone( ZoneOffset.UTC ) ) );
 		}
 
 		if ( Timestamp.class.isAssignableFrom( type ) ) {
@@ -119,27 +123,27 @@ public <X> X unwrap(Instant instant, Class<X> type, WrapperOptions options) {
 			 */
 			final ZonedDateTime zonedDateTime = instant.atZone( ZoneId.systemDefault() );
 			if ( zonedDateTime.getYear() < 1905 ) {
-				return (X) Timestamp.valueOf( zonedDateTime.toLocalDateTime() );
+				return type.cast( Timestamp.valueOf( zonedDateTime.toLocalDateTime() ) );
 			}
 			else {
-				return (X) Timestamp.from( instant );
+				return type.cast( Timestamp.from( instant ) );
 			}
 		}
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Date( instant.toEpochMilli() );
+			return type.cast( new java.sql.Date( instant.toEpochMilli() ) );
 		}
 
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			return (X) new java.sql.Time( instant.toEpochMilli() % 86_400_000 );
+			return type.cast( new java.sql.Time( instant.toEpochMilli() % 86_400_000 ) );
 		}
 
 		if ( Date.class.isAssignableFrom( type ) ) {
-			return (X) Date.from( instant );
+			return type.cast( Date.from( instant ) );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( instant.toEpochMilli() );
+			return type.cast( instant.toEpochMilli() );
 		}
 
 		throw unknownUnwrap( type );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java
index cd83479a604b..e6e3364f5e8b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java
@@ -49,38 +49,42 @@ public boolean isInstance(Object value) {
 		return value instanceof Integer;
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+	public Integer cast(Object value) {
+		return (Integer) value;
+	}
+
 	@Override
 	public <X> X unwrap(Integer value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Integer.class.isAssignableFrom( type ) || type == Object.class ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( Byte.class.isAssignableFrom( type ) ) {
-			return (X) Byte.valueOf( value.byteValue() );
+			return type.cast( value.byteValue() );
 		}
 		if ( Short.class.isAssignableFrom( type ) ) {
-			return (X) Short.valueOf( value.shortValue() );
+			return type.cast( value.shortValue() );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.longValue() );
+			return type.cast( value.longValue() );
 		}
 		if ( Double.class.isAssignableFrom( type ) ) {
-			return (X) Double.valueOf( value.doubleValue() );
+			return type.cast( value.doubleValue() );
 		}
 		if ( Float.class.isAssignableFrom( type ) ) {
-			return (X) Float.valueOf( value.floatValue() );
+			return type.cast( value.floatValue() );
 		}
 		if ( BigInteger.class.isAssignableFrom( type ) ) {
-			return (X) BigInteger.valueOf( value );
+			return type.cast( BigInteger.valueOf( value ) );
 		}
 		if ( BigDecimal.class.isAssignableFrom( type ) ) {
-			return (X) BigDecimal.valueOf( value );
+			return type.cast( BigDecimal.valueOf( value ) );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -148,7 +152,7 @@ public int getDefaultSqlScale(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public Integer coerce(Object value, CoercionContext coercionContext) {
+	public Integer coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerPrimitiveArrayJavaType.java
index 703e12cf1fbd..5bc19094ea44 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerPrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerPrimitiveArrayJavaType.java
@@ -41,6 +41,11 @@ public boolean isInstance(Object value) {
 		return value instanceof int[];
 	}
 
+	@Override
+	public int[] cast(Object value) {
+		return (int[]) value;
+	}
+
 	@Override
 	public String extractLoggableRepresentation(int[] value) {
 		return value == null ? super.extractLoggableRepresentation( null ) : Arrays.toString( value );
@@ -106,7 +111,7 @@ public <X> X unwrap(int[] value, Class<X> type, WrapperOptions options) {
 		}
 
 		if ( type.isInstance( value ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( Object[].class.isAssignableFrom( type ) ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -114,16 +119,15 @@ else if ( Object[].class.isAssignableFrom( type ) ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				unwrapped[i] = getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 		else if ( type == byte[].class ) {
 			// byte[] can only be requested if the value should be serialized
-			return (X) SerializationHelper.serialize( value );
+			return type.cast( SerializationHelper.serialize( value ) );
 		}
 		else if ( type == BinaryStream.class ) {
 			// BinaryStream can only be requested if the value should be serialized
-			//noinspection unchecked
-			return (X) new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) );
+			return type.cast( new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) ) );
 		}
 		else if ( type.isArray() ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -131,7 +135,7 @@ else if ( type.isArray() ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				Array.set( unwrapped, i, getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options ) );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 
 		throw unknownUnwrap( type );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java
index be7453a46d61..c248d76982de 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java
@@ -100,11 +100,31 @@ default String getTypeName() {
 	 * but some descriptors need specialized semantics, for example, the descriptors for
 	 * {@link JdbcDateJavaType java.sql.Date}, {@link JdbcTimeJavaType java.sql.Time}, and
 	 * {@link JdbcTimestampJavaType java.sql.Timestamp}.
+	 * <p>
+	 * For {@link org.hibernate.type.descriptor.java.spi.EntityJavaType}, this method
+	 * handles proxies in a semantically correct way, by checking the entity instance
+	 * underlying the proxy object.
 	 */
 	default boolean isInstance(Object value) {
 		return getJavaTypeClass().isInstance( value );
 	}
 
+	/**
+	 * Apply a simple type cast to the given value, without attempting any sort of
+	 * {@linkplain #coerce(Object) coercion} or {@linkplain #wrap wrapping}. This
+	 * method is provided as a convenient way to avoid an unchecked cast to a type
+	 * variable. Use {@code javaType.cast(value)} instead of {@code (T) value}
+	 * wherever possible.
+	 * <p>
+	 * Usually just {@link #getJavaTypeClass() getJavaTypeClass().}{@link Class#cast cast(value)},
+	 * but overridden in some cases as an "optimization". This optimization is
+	 * almost certainly unnecessary, and might even indeed be harmful, since
+	 * {@code Class.cast()} is an intrinsic.
+	 */
+	default T cast(Object value) {
+		return getJavaTypeClass().cast( value );
+	}
+
 	/**
 	 * Retrieve the {@linkplain MutabilityPlan mutability plan} for this Java type.
 	 */
@@ -113,12 +133,11 @@ default MutabilityPlan<T> getMutabilityPlan() {
 	}
 
 	default T getReplacement(T original, T target, SharedSessionContractImplementor session) {
-		if ( !getMutabilityPlan().isMutable() || target != null && areEqual( original, target ) ) {
-			return original;
-		}
-		else {
-			return getMutabilityPlan().deepCopy( original );
-		}
+		final var mutabilityPlan = getMutabilityPlan();
+		return !mutabilityPlan.isMutable()
+			|| target != null && areEqual( original, target )
+				? original
+				: mutabilityPlan.deepCopy( original );
 	}
 
 	/**
@@ -131,7 +150,7 @@ default T getDefaultValue() {
 	}
 
 	/**
-	 * Obtain the "recommended" {@link JdbcType SQL type descriptor}
+	 * Obtain the "recommended" {@linkplain JdbcType SQL type descriptor}
 	 * for this Java type. Often, but not always, the source of this
 	 * recommendation is the JDBC specification.
 	 *
@@ -312,13 +331,40 @@ default boolean isWider(JavaType<?> javaType) {
 	}
 
 	@FunctionalInterface
+	@Deprecated(forRemoval = true, since = "7.2")
 	interface CoercionContext {
 		TypeConfiguration getTypeConfiguration();
 	}
 
-	default <X> T coerce(X value, CoercionContext coercionContext) {
-		//noinspection unchecked
-		return (T) value;
+	/**
+	 * Coerce the given value to this type, if possible.
+	 * <p>
+	 * This method differs from {@link #wrap wrap()} in that it allows
+	 * simple, basic, implicit type conversions, and does not require
+	 * {@link WrapperOptions}. The {@code wrap()} method may be thought
+	 * of as offering explicitly requested type conversions driven by a
+	 * choice of {@link JdbcType}.
+	 * <p>
+	 * An implementation of this method reports failure in one of two
+	 * ways, by:
+	 * <ul>
+	 * <li>throwing {@link CoercionException}, or
+	 * <li>simply returning the given uncoerced value.
+	 * </ul>
+	 * <p>
+	 * Therefore, this method is declared to return {@link Object}.
+	 * In case immediate coercion is required, the following idiom
+	 * may be used:
+	 * <pre>javaType.cast(javaType.coerce(value))</pre>
+	 *
+	 * @param value The value to coerce
+	 * @return The coerced value, or the given value if no coercion was
+	 *         possible
+	 * @throws CoercionException if coercion fails
+	 */
+	@Incubating
+	default Object coerce(Object value) {
+		return value;
 	}
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java
index a60835ae643b..ebad46f62753 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcDateJavaType.java
@@ -6,13 +6,13 @@
 
 import java.sql.Types;
 import java.time.LocalDate;
-import java.time.LocalTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.DateTimeParseException;
+import java.time.temporal.TemporalAccessor;
 import java.util.Calendar;
-import java.util.Date;
+import java.sql.Date;
 import java.util.GregorianCalendar;
 
 import org.hibernate.HibernateException;
@@ -55,25 +55,28 @@ public JdbcDateJavaType() {
 		super( Date.class, DateMutabilityPlan.INSTANCE );
 	}
 
-	@Override
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.DATE;
 	}
 
 	@Override
 	public Class<Date> getJavaType() {
-		// wrong, but needed for backward compatibility
-		//noinspection unchecked, rawtypes
-		return (Class) java.sql.Date.class;
+		return java.sql.Date.class;
 	}
 
 	@Override
 	public boolean isInstance(Object value) {
 		// this check holds true for java.sql.Date as well
-		return value instanceof Date
+		return value instanceof java.util.Date
 			&& !( value instanceof java.sql.Time );
 	}
 
+	@Override
+	public Date cast(Object value) {
+		return (Date) value;
+	}
+
 	@Override
 	public boolean areEqual(Date one, Date another) {
 		if ( one == another ) {
@@ -110,81 +113,57 @@ public int extractHashCode(Date value) {
 	}
 
 	@Override
-	public Date coerce(Object value, CoercionContext coercionContext) {
+	public Date coerce(Object value) {
 		return wrap( value, null );
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
-	public Object unwrap(Date value, Class type, WrapperOptions options) {
+	public <X> X unwrap(Date value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 
 		if ( LocalDate.class.isAssignableFrom( type ) ) {
-			return unwrapLocalDate( value );
+			return type.cast( unwrapLocalDate( value ) );
 		}
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return unwrapSqlDate( value );
+			return type.cast( value );
 		}
 
 		if ( java.util.Date.class.isAssignableFrom( type ) ) {
-			return value;
+			return type.cast( value );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return unwrapDateEpoch( value );
+			return type.cast( toDateEpoch( value ) );
 		}
 
 		if ( String.class.isAssignableFrom( type ) ) {
-			return toString( value );
+			return type.cast( toString( value ) );
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
 			final var gregorianCalendar = new GregorianCalendar();
-			gregorianCalendar.setTimeInMillis( unwrapDateEpoch( value ) );
-			return gregorianCalendar;
+			gregorianCalendar.setTimeInMillis( toDateEpoch( value ) );
+			return type.cast( gregorianCalendar );
 		}
 
 		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
-			return new java.sql.Timestamp( unwrapDateEpoch( value ) );
+			return type.cast( new java.sql.Timestamp( toDateEpoch( value ) ) );
 		}
 
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			throw new IllegalArgumentException( "Illegal attempt to treat `java.sql.Date` as `java.sql.Time`" );
+			throw new IllegalArgumentException( "Illegal attempt to treat 'java.sql.Date' as 'java.sql.Time'" );
 		}
 
 		throw unknownUnwrap( type );
 	}
 
-	private LocalDate unwrapLocalDate(Date value) {
+	private LocalDate unwrapLocalDate(java.util.Date value) {
 		return value instanceof java.sql.Date date
 				? date.toLocalDate()
-				: new java.sql.Date( unwrapDateEpoch( value ) ).toLocalDate();
-	}
-
-	private java.sql.Date unwrapSqlDate(Date value) {
-		if ( value instanceof java.sql.Date date ) {
-			final long dateEpoch = toDateEpoch( date.getTime() );
-			return dateEpoch == date.getTime() ? date : new java.sql.Date( dateEpoch );
-		}
-		return new java.sql.Date( unwrapDateEpoch( value ) );
-
-	}
-
-	private static long unwrapDateEpoch(Date value) {
-		return toDateEpoch( value.getTime() );
-	}
-
-	private static long toDateEpoch(long value) {
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTimeInMillis( value );
-		calendar.set(Calendar.HOUR_OF_DAY, 0);
-		calendar.clear(Calendar.MINUTE);
-		calendar.clear(Calendar.SECOND);
-		calendar.clear(Calendar.MILLISECOND);
-		return calendar.getTimeInMillis();
+				: new java.sql.Date( toDateEpoch( value ) ).toLocalDate();
 	}
 
 	@Override
@@ -205,8 +184,8 @@ public Date wrap(Object value, WrapperOptions options) {
 			return new java.sql.Date( toDateEpoch( calendar.getTimeInMillis() ) );
 		}
 
-		if ( value instanceof Date date ) {
-			return unwrapSqlDate( date );
+		if ( value instanceof java.util.Date date ) {
+			return toDate( date );
 		}
 
 		if ( value instanceof LocalDate localDate ) {
@@ -216,16 +195,42 @@ public Date wrap(Object value, WrapperOptions options) {
 		throw unknownWrap( value.getClass() );
 	}
 
-	@Override
-	public String toString(Date value) {
-		if ( value instanceof java.sql.Date ) {
-			return LITERAL_FORMATTER.format( ( (java.sql.Date) value ).toLocalDate() );
+	static java.sql.Date toDate(java.util.Date value) {
+		if ( value instanceof java.sql.Date date ) {
+			final long millis = date.getTime();
+			final long dateEpoch = toDateEpoch( millis );
+			return dateEpoch == millis ? date : new java.sql.Date( dateEpoch );
 		}
 		else {
-			return LITERAL_FORMATTER.format( LocalDate.ofInstant( value.toInstant(), ZoneOffset.systemDefault() ) );
+			return new java.sql.Date( toDateEpoch( value ) );
 		}
 	}
 
+	static long toDateEpoch(java.util.Date value) {
+		return toDateEpoch( value.getTime() );
+	}
+
+	static long toDateEpoch(long value) {
+		final var calendar = Calendar.getInstance();
+		calendar.setTimeInMillis( value );
+		calendar.set(Calendar.HOUR_OF_DAY, 0);
+		calendar.clear(Calendar.MINUTE);
+		calendar.clear(Calendar.SECOND);
+		calendar.clear(Calendar.MILLISECOND);
+		return calendar.getTimeInMillis();
+	}
+
+	private static TemporalAccessor fromDate(java.util.Date value) {
+		return value instanceof java.sql.Date date
+				? date.toLocalDate()
+				: LocalDate.ofInstant( value.toInstant(), ZoneOffset.systemDefault() );
+	}
+
+	@Override
+	public String toString(Date value) {
+		return LITERAL_FORMATTER.format( fromDate( value ) );
+	}
+
 	@Override
 	public Date fromString(CharSequence string) {
 		try {
@@ -250,12 +255,7 @@ public Date fromEncodedString(CharSequence charSequence, int start, int end) {
 
 	@Override
 	public void appendEncodedString(SqlAppender sb, Date value) {
-		if ( value instanceof java.sql.Date ) {
-			LITERAL_FORMATTER.formatTo( ( (java.sql.Date) value ).toLocalDate(), sb );
-		}
-		else {
-			LITERAL_FORMATTER.formatTo( LocalTime.ofInstant( value.toInstant(), ZoneOffset.systemDefault() ), sb );
-		}
+		LITERAL_FORMATTER.formatTo( fromDate( value ), sb );
 	}
 
 	@Override
@@ -264,9 +264,8 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 	}
 
 	@Override
-	protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
-		//noinspection unchecked
-		return (TemporalJavaType<X>) this;
+	protected TemporalJavaType<Date> forDatePrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
 	public static class DateMutabilityPlan extends MutableMutabilityPlan<Date> {
@@ -274,12 +273,7 @@ public static class DateMutabilityPlan extends MutableMutabilityPlan<Date> {
 
 		@Override
 		public Date deepCopyNotNull(Date value) {
-			if ( value instanceof java.sql.Date ) {
-				return value;
-			}
-			else {
-				return new java.sql.Date( value.getTime() );
-			}
+			return new java.sql.Date( value.getTime() );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java
index 0ae67b8a4367..1d868df7fc70 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimeJavaType.java
@@ -37,7 +37,7 @@
  * to {@link Time} values.  This capability is shared with
  * {@link JdbcDateJavaType} and {@link JdbcTimestampJavaType}.
  */
-public class JdbcTimeJavaType extends AbstractTemporalJavaType<Date> {
+public class JdbcTimeJavaType extends AbstractTemporalJavaType<Time> {
 	public static final JdbcTimeJavaType INSTANCE = new JdbcTimeJavaType();
 
 	public static final DateTimeFormatter LITERAL_FORMATTER = DateTimeFormatter.ISO_LOCAL_TIME;
@@ -52,19 +52,17 @@ public class JdbcTimeJavaType extends AbstractTemporalJavaType<Date> {
 
 
 	public JdbcTimeJavaType() {
-		super( Date.class, TimeMutabilityPlan.INSTANCE );
+		super( Time.class, TimeMutabilityPlan.INSTANCE );
 	}
 
-	@Override
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.TIME;
 	}
 
 	@Override
-	public Class<Date> getJavaType() {
-		// wrong, but needed for backward compatibility
-		//noinspection unchecked, rawtypes
-		return (Class) java.sql.Time.class;
+	public Class<Time> getJavaType() {
+		return java.sql.Time.class;
 	}
 
 	@Override
@@ -75,7 +73,12 @@ public boolean isInstance(Object value) {
 	}
 
 	@Override
-	public int extractHashCode(Date value) {
+	public Time cast(Object value) {
+		return (Time) value;
+	}
+
+	@Override
+	public int extractHashCode(Time value) {
 		final var calendar = Calendar.getInstance();
 		calendar.setTime( value );
 		int hashCode = 1;
@@ -87,7 +90,7 @@ public int extractHashCode(Date value) {
 	}
 
 	@Override
-	public boolean areEqual(Date one, Date another) {
+	public boolean areEqual(Time one, Time another) {
 		if ( one == another ) {
 			return true;
 		}
@@ -112,60 +115,46 @@ public boolean areEqual(Date one, Date another) {
 	}
 
 	@Override
-	public Date coerce(Object value, CoercionContext coercionContext) {
+	public Time coerce(Object value) {
 		return wrap( value, null );
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
-	public Object unwrap(Date value, Class type, WrapperOptions options) {
+	public <X> X unwrap(Time value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 
 		if ( LocalTime.class.isAssignableFrom( type ) ) {
-			final Time time = value instanceof java.sql.Time
-					? (java.sql.Time) value
-					: new java.sql.Time( value.getTime() % 86_400_000 );
-			final var localTime = time.toLocalTime();
-			long millis = time.getTime() % 1000;
-			if ( millis == 0 ) {
-				return localTime;
-			}
-			if ( millis < 0 ) {
-				// The milliseconds for a Time could be negative,
-				// which usually means the time is in a different time zone
-				millis += 1_000L;
-			}
-			return localTime.with( ChronoField.NANO_OF_SECOND, millis * 1_000_000L );
+			return type.cast( unwrapLocalTime( value ) );
 		}
 
 		if ( Time.class.isAssignableFrom( type ) ) {
-			return value instanceof Time
-					? value
-					: new Time( value.getTime() % 86_400_000 );
+			return type.cast( value );
 		}
 
 		if ( Date.class.isAssignableFrom( type ) ) {
-			return value;
+			// SHOULD THROW!
+//			throw new IllegalArgumentException( "Illegal attempt to treat 'java.sql.Time' as 'java.sql.Date'" );
+			return type.cast( value );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return value.getTime();
+			return type.cast( value.getTime() );
 		}
 
 		if ( String.class.isAssignableFrom( type ) ) {
-			return toString( value );
+			return type.cast( toString( value ) );
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
 			final var gregorianCalendar = new GregorianCalendar();
 			gregorianCalendar.setTimeInMillis( value.getTime() );
-			return gregorianCalendar;
+			return type.cast( gregorianCalendar );
 		}
 
 		if ( java.sql.Timestamp.class.isAssignableFrom( type ) ) {
-			return new java.sql.Timestamp( value.getTime() );
+			return type.cast( new java.sql.Timestamp( value.getTime() ) );
 		}
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
@@ -175,8 +164,22 @@ public Object unwrap(Date value, Class type, WrapperOptions options) {
 		throw unknownUnwrap( type );
 	}
 
+	private static LocalTime unwrapLocalTime(Time value) {
+		final var localTime = value.toLocalTime();
+		long millis = value.getTime() % 1000;
+		if ( millis == 0 ) {
+			return localTime;
+		}
+		if ( millis < 0 ) {
+			// The milliseconds for a Time could be negative,
+			// which usually means the time is in a different time zone
+			millis += 1_000L;
+		}
+		return localTime.with( ChronoField.NANO_OF_SECOND, millis * 1_000_000L );
+	}
+
 	@Override
-	public Date wrap(Object value, WrapperOptions options) {
+	public Time wrap(Object value, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
@@ -186,11 +189,11 @@ public Date wrap(Object value, WrapperOptions options) {
 		}
 
 		if ( value instanceof Date date ) {
-			return new Time( date.getTime() % 86_400_000 );
+			return toTime( date );
 		}
 
 		if ( value instanceof LocalTime localTime ) {
-			final Time time = Time.valueOf( localTime );
+			final var time = Time.valueOf( localTime );
 			if ( localTime.getNano() == 0 ) {
 				return time;
 			}
@@ -209,18 +212,23 @@ public Date wrap(Object value, WrapperOptions options) {
 		throw unknownWrap( value.getClass() );
 	}
 
+	static Time toTime(Date date) {
+		return new Time( date.getTime() % 86_400_000 );
+	}
+
+	private static LocalTime fromDate(Date value) {
+		return value instanceof Time time
+				? time.toLocalTime()
+				: LocalTime.ofInstant( value.toInstant(), ZoneOffset.systemDefault() );
+	}
+
 	@Override
-	public String toString(Date value) {
-		if ( value instanceof java.sql.Time time ) {
-			return LITERAL_FORMATTER.format( time.toLocalTime() );
-		}
-		else {
-			return LITERAL_FORMATTER.format( LocalTime.ofInstant( value.toInstant(), ZoneOffset.systemDefault() ) );
-		}
+	public String toString(Time value) {
+		return LITERAL_FORMATTER.format( fromDate( value ) );
 	}
 
 	@Override
-	public Date fromString(CharSequence string) {
+	public Time fromString(CharSequence string) {
 		try {
 			final var temporalAccessor = LITERAL_FORMATTER.parse( string );
 			final var localTime = LocalTime.from( temporalAccessor );
@@ -234,10 +242,10 @@ public Date fromString(CharSequence string) {
 	}
 
 	@Override
-	public Date fromEncodedString(CharSequence charSequence, int start, int end) {
+	public Time fromEncodedString(CharSequence charSequence, int start, int end) {
 		try {
 			final var temporalAccessor = ENCODED_FORMATTER.parse( subSequence( charSequence, start, end ) );
-			return java.sql.Time.valueOf( temporalAccessor.query( LocalTime::from ) );
+			return Time.valueOf( temporalAccessor.query( LocalTime::from ) );
 		}
 		catch ( DateTimeParseException pe) {
 			throw new HibernateException( "could not parse time string " + subSequence( charSequence, start, end ), pe );
@@ -245,13 +253,8 @@ public Date fromEncodedString(CharSequence charSequence, int start, int end) {
 	}
 
 	@Override
-	public void appendEncodedString(SqlAppender sb, Date value) {
-		if ( value instanceof java.sql.Time time ) {
-			LITERAL_FORMATTER.formatTo( time.toLocalTime(), sb );
-		}
-		else {
-			LITERAL_FORMATTER.formatTo( LocalTime.ofInstant( value.toInstant(), ZoneOffset.systemDefault() ), sb );
-		}
+	public void appendEncodedString(SqlAppender sb, Time value) {
+		LITERAL_FORMATTER.formatTo( fromDate( value ), sb );
 	}
 
 	@Override
@@ -268,17 +271,15 @@ public int getDefaultSqlPrecision(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
-		//noinspection unchecked
-		return (TemporalJavaType<X>) this;
+	protected TemporalJavaType<Time> forTimePrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
-
-	public static class TimeMutabilityPlan extends MutableMutabilityPlan<Date> {
+	public static class TimeMutabilityPlan extends MutableMutabilityPlan<Time> {
 		public static final TimeMutabilityPlan INSTANCE = new TimeMutabilityPlan();
 
 		@Override
-		public Date deepCopyNotNull(Date value) {
+		public Time deepCopyNotNull(Time value) {
 			return new Time( value.getTime() );
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java
index 601b91699397..b9c63cfca8b7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java
@@ -4,9 +4,9 @@
  */
 package org.hibernate.type.descriptor.java;
 
+import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
-import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -29,6 +29,8 @@
 import org.hibernate.type.spi.TypeConfiguration;
 
 import static org.hibernate.internal.util.CharSequenceHelper.subSequence;
+import static org.hibernate.type.descriptor.java.JdbcDateJavaType.toDate;
+import static org.hibernate.type.descriptor.java.JdbcTimeJavaType.toTime;
 
 /**
  * Descriptor for {@link Timestamp} handling.
@@ -38,7 +40,8 @@
  * to {@link Timestamp} values.  This capability is shared with
  * {@link JdbcDateJavaType} and {@link JdbcTimeJavaType}.
  */
-public class JdbcTimestampJavaType extends AbstractTemporalJavaType<Date> implements VersionJavaType<Date> {
+public class JdbcTimestampJavaType extends AbstractTemporalJavaType<Timestamp>
+		implements VersionJavaType<Timestamp> {
 	public static final JdbcTimestampJavaType INSTANCE = new JdbcTimestampJavaType();
 
 	public static final String TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSSSSSSS";
@@ -55,120 +58,100 @@ public class JdbcTimestampJavaType extends AbstractTemporalJavaType<Date> implem
 			.withZone( ZoneId.from( ZoneOffset.UTC ) );
 
 	public JdbcTimestampJavaType() {
-		super( Date.class, TimestampMutabilityPlan.INSTANCE );
+		super( Timestamp.class, TimestampMutabilityPlan.INSTANCE );
 	}
 
 	@Override
-	public Class<Date> getJavaType() {
-		// wrong, but needed for backward compatibility
-		//noinspection unchecked, rawtypes
-		return (Class) java.sql.Timestamp.class;
+	public Class<Timestamp> getJavaType() {
+		return java.sql.Timestamp.class;
 	}
 
-	@Override
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.TIMESTAMP;
 	}
 
 	@Override
 	public boolean isInstance(Object value) {
-		// this check holds true for java.sql.Timestamp as well
-		return value instanceof Date;
+		return value instanceof Timestamp;
+	}
+
+	@Override
+	public Timestamp cast(Object value) {
+		return (Timestamp) value;
 	}
 
 	@Override
-	public boolean areEqual(Date one, Date another) {
+	public boolean areEqual(Timestamp one, Timestamp another) {
 		if ( one == another ) {
 			return true;
 		}
-		if ( one == null || another == null) {
+		else if ( one == null || another == null) {
 			return false;
 		}
-
-		long t1 = one.getTime();
-		long t2 = another.getTime();
-
-		boolean oneIsTimestamp = one instanceof Timestamp;
-		boolean anotherIsTimestamp = another instanceof Timestamp;
-
-		int n1 = oneIsTimestamp ? ( (Timestamp) one ).getNanos() : 0;
-		int n2 = anotherIsTimestamp ? ( (Timestamp) another ).getNanos() : 0;
-
-		if ( t1 != t2 ) {
+		else if ( one.getTime() != another.getTime() ) {
 			return false;
 		}
-
-		if ( oneIsTimestamp && anotherIsTimestamp ) {
+		else {
 			// both are Timestamps
-			int nn1 = n1 % 1000000;
-			int nn2 = n2 % 1000000;
+			final int nn1 = one.getNanos() % 1000000;
+			final int nn2 = another.getNanos() % 1000000;
 			return nn1 == nn2;
 		}
-		else {
-			// at least one is a plain old Date
-			return true;
-		}
 	}
 
 	@Override
-	public int extractHashCode(Date value) {
+	public int extractHashCode(Timestamp value) {
 		return Long.hashCode( value.getTime() / 1000 );
 	}
 
 	@Override
-	public Date coerce(Object value, CoercionContext coercionContext) {
+	public Timestamp coerce(Object value) {
 		return wrap( value, null );
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
-	public Object unwrap(Date value, Class type, WrapperOptions options) {
+	public <X> X unwrap(Timestamp value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 
 		if ( Timestamp.class.isAssignableFrom( type ) ) {
-			return value instanceof Timestamp
-					? (Timestamp) value
-					: new Timestamp( value.getTime() );
+			return type.cast( value );
+		}
+
+		if ( Time.class.isAssignableFrom( type ) ) {
+			return type.cast( toTime( value ) );
+		}
+
+		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
+			return type.cast( toDate( value ) );
 		}
 
-		if ( Date.class.isAssignableFrom( type ) ) {
-			return value;
+		if ( type.isInstance( value ) ) {
+			return type.cast( value );
 		}
 
 		if ( LocalDateTime.class.isAssignableFrom( type ) ) {
-			final Instant instant = value.toInstant();
-			return LocalDateTime.ofInstant( instant, ZoneId.systemDefault() );
+			final var instant = value.toInstant();
+			return type.cast( LocalDateTime.ofInstant( instant, ZoneId.systemDefault() ) );
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
 			final var gregorianCalendar = new GregorianCalendar();
 			gregorianCalendar.setTimeInMillis( value.getTime() );
-			return gregorianCalendar;
+			return type.cast( gregorianCalendar );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return value.getTime();
-		}
-
-		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return value instanceof java.sql.Date
-					? (java.sql.Date) value
-					: new java.sql.Date( value.getTime() );
-		}
-
-		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			return value instanceof java.sql.Time
-					? (java.sql.Time) value
-					: new java.sql.Time( value.getTime() % 86_400_000 );
+			return type.cast( value.getTime() );
 		}
 
 		throw unknownUnwrap( type );
 	}
 
 	@Override
-	public <X> Date wrap(X value, WrapperOptions options) {
+	public <X> Timestamp wrap(X value, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
@@ -177,7 +160,7 @@ public <X> Date wrap(X value, WrapperOptions options) {
 		}
 
 		if ( value instanceof Date date ) {
-			return new Timestamp( date.getTime() );
+			return wrapSqlTimestamp( date );
 		}
 
 		if ( value instanceof LocalDateTime localDateTime ) {
@@ -195,6 +178,10 @@ public <X> Date wrap(X value, WrapperOptions options) {
 		throw unknownWrap( value.getClass() );
 	}
 
+	static Timestamp wrapSqlTimestamp(Date date) {
+		return new Timestamp( date.getTime() );
+	}
+
 	@Override
 	public boolean isWider(JavaType<?> javaType) {
 		return switch ( javaType.getTypeName() ) {
@@ -204,12 +191,12 @@ public boolean isWider(JavaType<?> javaType) {
 	}
 
 	@Override
-	public String toString(Date value) {
+	public String toString(Timestamp value) {
 		return LITERAL_FORMATTER.format( value.toInstant() );
 	}
 
 	@Override
-	public Date fromString(CharSequence string) {
+	public Timestamp fromString(CharSequence string) {
 		try {
 			final var temporalAccessor = LITERAL_FORMATTER.parse( string );
 			final var timestamp = new Timestamp( temporalAccessor.getLong( ChronoField.INSTANT_SECONDS ) * 1000L );
@@ -222,23 +209,22 @@ public Date fromString(CharSequence string) {
 	}
 
 	@Override
-	public void appendEncodedString(SqlAppender sb, Date value) {
+	public void appendEncodedString(SqlAppender sb, Timestamp value) {
 		ENCODED_FORMATTER.formatTo( value.toInstant(), sb );
 	}
 
 	@Override
-	public Date fromEncodedString(CharSequence charSequence, int start, int end) {
+	public Timestamp fromEncodedString(CharSequence charSequence, int start, int end) {
 		try {
 			final var temporalAccessor = ENCODED_FORMATTER.parse( subSequence( charSequence, start, end ) );
-			final Timestamp timestamp;
 			if ( temporalAccessor.isSupported( ChronoField.INSTANT_SECONDS ) ) {
-				timestamp = new Timestamp( temporalAccessor.getLong( ChronoField.INSTANT_SECONDS ) * 1000L );
+				final var timestamp = new Timestamp( temporalAccessor.getLong( ChronoField.INSTANT_SECONDS ) * 1000L );
 				timestamp.setNanos( temporalAccessor.get( ChronoField.NANO_OF_SECOND ) );
+				return timestamp;
 			}
 			else {
-				timestamp = Timestamp.valueOf( LocalDateTime.from( temporalAccessor ) );
+				return Timestamp.valueOf( LocalDateTime.from( temporalAccessor ) );
 			}
-			return timestamp;
 		}
 		catch ( DateTimeParseException pe) {
 			throw new HibernateException( "could not parse timestamp string " + subSequence( charSequence, start, end ), pe );
@@ -250,14 +236,9 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		return context.getJdbcType( Types.TIMESTAMP );
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) this;
-	}
-
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) JdbcDateJavaType.INSTANCE;
+	@Override
+	protected TemporalJavaType<Timestamp> forTimestampPrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
 	@Override
@@ -266,8 +247,8 @@ public int getDefaultSqlPrecision(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public Date next(
-			Date current,
+	public Timestamp next(
+			Timestamp current,
 			Long length,
 			Integer precision,
 			Integer scale,
@@ -276,7 +257,7 @@ public Date next(
 	}
 
 	@Override
-	public Date seed(
+	public Timestamp seed(
 			Long length,
 			Integer precision,
 			Integer scale,
@@ -285,19 +266,14 @@ public Date seed(
 	}
 
 
-	public static class TimestampMutabilityPlan extends MutableMutabilityPlan<Date> {
+	public static class TimestampMutabilityPlan extends MutableMutabilityPlan<Timestamp> {
 		public static final TimestampMutabilityPlan INSTANCE = new TimestampMutabilityPlan();
 		@Override
-		public Date deepCopyNotNull(Date value) {
-			if ( value instanceof Timestamp timestamp ) {
-				// make sure to get the nanos
-				final var copy = new Timestamp( timestamp.getTime() );
-				copy.setNanos( timestamp.getNanos() );
-				return copy;
-			}
-			else {
-				return new Timestamp( value.getTime() );
-			}
+		public Timestamp deepCopyNotNull(Timestamp value) {
+			// make sure to get the nanos
+			final var copy = new Timestamp( value.getTime() );
+			copy.setNanos( value.getNanos() );
+			return copy;
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaType.java
index 93658de28f30..4b8f30d5ff11 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateJavaType.java
@@ -44,6 +44,11 @@ public boolean isInstance(Object value) {
 	}
 
 	@Override
+	public LocalDate cast(Object value) {
+		return (LocalDate) value;
+	}
+
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.DATE;
 	}
@@ -56,9 +61,8 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 	}
 
 	@Override
-	protected <X> TemporalJavaType<X> forDatePrecision(TypeConfiguration typeConfiguration) {
-		//noinspection unchecked
-		return (TemporalJavaType<X>) this;
+	protected TemporalJavaType<LocalDate> forDatePrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
 	@Override
@@ -77,47 +81,44 @@ public LocalDate fromString(CharSequence string) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(LocalDate value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 
 		if ( LocalDate.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return (X) java.sql.Date.valueOf( value );
+			return type.cast( java.sql.Date.valueOf( value ) );
 		}
 
 		final LocalDateTime localDateTime = value.atStartOfDay();
 
 		if ( Timestamp.class.isAssignableFrom( type ) ) {
-			/*
-			 * Workaround for HHH-13266 (JDK-8061577).
-			 * We could have done Timestamp.from( localDateTime.atZone( ZoneId.systemDefault() ).toInstant() ),
-			 * but on top of being more complex than the line below, it won't always work.
-			 * Timestamp.from() assumes the number of milliseconds since the epoch
-			 * means the same thing in Timestamp and Instant, but it doesn't, in particular before 1900.
-			 */
-			return (X) Timestamp.valueOf( localDateTime );
+			// Workaround for HHH-13266 (JDK-8061577).
+			// We could have done Timestamp.from( localDateTime.atZone( ZoneId.systemDefault() ).toInstant() ),
+			// but on top of being more complex than the line below, it won't always work.
+			// Timestamp.from() assumes the number of milliseconds since the epoch means the
+			// same thing in Timestamp and Instant, but it doesn't, in particular before 1900.
+			return type.cast( Timestamp.valueOf( localDateTime ) );
 		}
 
 		final var zonedDateTime = localDateTime.atZone( ZoneId.systemDefault() );
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			return (X) GregorianCalendar.from( zonedDateTime );
+			return type.cast( GregorianCalendar.from( zonedDateTime ) );
 		}
 
 		final var instant = zonedDateTime.toInstant();
 
 		if ( Date.class.equals( type ) ) {
-			return (X) Date.from( instant );
+			return type.cast( Date.from( instant ) );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( instant.toEpochMilli() );
+			return type.cast( instant.toEpochMilli() );
 		}
 
 		throw unknownUnwrap( type );
@@ -134,13 +135,11 @@ public <X> LocalDate wrap(X value, WrapperOptions options) {
 		}
 
 		if (value instanceof Timestamp timestamp) {
-			/*
-			 * Workaround for HHH-13266 (JDK-8061577).
-			 * We used to do LocalDateTime.ofInstant( ts.toInstant(), ZoneId.systemDefault() ).toLocalDate(),
-			 * but on top of being more complex than the line below, it won't always work.
-			 * ts.toInstant() assumes the number of milliseconds since the epoch
-			 * means the same thing in Timestamp and Instant, but it doesn't, in particular before 1900.
-			 */
+			// Workaround for HHH-13266 (JDK-8061577).
+			// We used to do LocalDateTime.ofInstant( ts.toInstant(), ZoneId.systemDefault() ).toLocalDate(),
+			// but on top of being more complex than the line below, it won't always work.
+			// ts.toInstant() assumes the number of milliseconds since the epoch means the
+			// same thing in Timestamp and Instant, but it doesn't, in particular before 1900.
 			return timestamp.toLocalDateTime().toLocalDate();
 		}
 
@@ -154,12 +153,9 @@ public <X> LocalDate wrap(X value, WrapperOptions options) {
 		}
 
 		if (value instanceof Date date) {
-			if (value instanceof java.sql.Date sqlDate) {
-				return sqlDate.toLocalDate();
-			}
-			else {
-				return Instant.ofEpochMilli( date.getTime() ).atZone( ZoneId.systemDefault() ).toLocalDate();
-			}
+			return value instanceof java.sql.Date sqlDate
+					? sqlDate.toLocalDate()
+					: Instant.ofEpochMilli( date.getTime() ).atZone( ZoneId.systemDefault() ).toLocalDate();
 		}
 
 		throw unknownWrap( value.getClass() );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaType.java
index 8a4d64752a54..5997989f1243 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalDateTimeJavaType.java
@@ -46,6 +46,11 @@ public boolean isInstance(Object value) {
 	}
 
 	@Override
+	public LocalDateTime cast(Object value) {
+		return (LocalDateTime) value;
+	}
+
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.TIMESTAMP;
 	}
@@ -57,9 +62,9 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 				: context.getJdbcType( Types.TIMESTAMP );
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) this;
+	@Override
+	protected TemporalJavaType<LocalDateTime> forTimestampPrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
 	@Override
@@ -78,49 +83,46 @@ public LocalDateTime fromString(CharSequence string) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(LocalDateTime value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 
 		if ( LocalDateTime.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 
 		if ( Timestamp.class.isAssignableFrom( type ) ) {
-			/*
-			 * Workaround for HHH-13266 (JDK-8061577).
-			 * We used to do Timestamp.from( value.atZone( ZoneId.systemDefault() ).toInstant() ),
-			 * but on top of being more complex than the line below, it won't always work.
-			 * Timestamp.from() assumes the number of milliseconds since the epoch
-			 * means the same thing in Timestamp and Instant, but it doesn't, in particular before 1900.
-			 */
-			return (X) Timestamp.valueOf( value );
+			// Workaround for HHH-13266 (JDK-8061577).
+			// We used to do Timestamp.from( value.atZone( ZoneId.systemDefault() ).toInstant() ),
+			// but on top of being more complex than the line below, it won't always work.
+			// Timestamp.from() assumes the number of milliseconds since the epoch means the
+			// same thing in Timestamp and Instant, but it doesn't, in particular before 1900.
+			return type.cast( Timestamp.valueOf( value ) );
 		}
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
 			final var instant = value.atZone( ZoneId.systemDefault() ).toInstant();
-			return (X) java.sql.Date.from( instant );
+			return type.cast( java.sql.Date.from( instant ) );
 		}
 
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
 			final var instant = value.atZone( ZoneId.systemDefault() ).toInstant();
-			return (X) java.sql.Time.from( instant );
+			return type.cast( java.sql.Time.from( instant ) );
 		}
 
 		if ( Date.class.isAssignableFrom( type ) ) {
 			final var instant = value.atZone( ZoneId.systemDefault() ).toInstant();
-			return (X) Date.from( instant );
+			return type.cast( Date.from( instant ) );
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			return (X) GregorianCalendar.from( value.atZone( ZoneId.systemDefault() ) );
+			return type.cast( GregorianCalendar.from( value.atZone( ZoneId.systemDefault() ) ) );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
 			final var instant = value.atZone( ZoneId.systemDefault() ).toInstant();
-			return (X) Long.valueOf( instant.toEpochMilli() );
+			return type.cast( instant.toEpochMilli() );
 		}
 
 		throw unknownUnwrap( type );
@@ -137,13 +139,11 @@ public <X> LocalDateTime wrap(X value, WrapperOptions options) {
 		}
 
 		if (value instanceof Timestamp timestamp) {
-			/*
-			 * Workaround for HHH-13266 (JDK-8061577).
-			 * We used to do LocalDateTime.ofInstant( ts.toInstant(), ZoneId.systemDefault() ),
-			 * but on top of being more complex than the line below, it won't always work.
-			 * ts.toInstant() assumes the number of milliseconds since the epoch
-			 * means the same thing in Timestamp and Instant, but it doesn't, in particular before 1900.
-			 */
+			// Workaround for HHH-13266 (JDK-8061577).
+			// We used to do LocalDateTime.ofInstant( ts.toInstant(), ZoneId.systemDefault() ),
+			// but on top of being more complex than the line below, it won't always work.
+			// ts.toInstant() assumes the number of milliseconds since the epoch means the
+			// same thing in Timestamp and Instant, but it doesn't, in particular before 1900.
 			return timestamp.toLocalDateTime();
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaType.java
index e7d981fbd723..99febba2a768 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocalTimeJavaType.java
@@ -22,12 +22,13 @@
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.type.SqlTypes;
-import org.hibernate.type.descriptor.DateTimeUtils;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import static org.hibernate.type.descriptor.DateTimeUtils.roundToPrecision;
+
 /**
  * Java type descriptor for the {@link LocalTime} type.
  *
@@ -49,6 +50,11 @@ public boolean isInstance(Object value) {
 	}
 
 	@Override
+	public LocalTime cast(Object value) {
+		return (LocalTime) value;
+	}
+
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.TIME;
 	}
@@ -61,9 +67,8 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 	}
 
 	@Override
-	protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
-		//noinspection unchecked
-		return (TemporalJavaType<X>) this;
+	protected TemporalJavaType<LocalTime> forTimePrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
 	@Override
@@ -82,48 +87,48 @@ public LocalTime fromString(CharSequence string) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(LocalTime value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 
 		if ( LocalTime.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 
 		if ( Time.class.isAssignableFrom( type ) ) {
 			final var time = Time.valueOf( value );
-			if ( value.getNano() == 0 ) {
-				return (X) time;
-			}
-			// Preserve milliseconds, which java.sql.Time supports
-			return (X) new Time( time.getTime() + DateTimeUtils.roundToPrecision( value.getNano(), 3 ) / 1000000 );
+			final int nanos = value.getNano();
+			return nanos == 0
+					? type.cast( time )
+					// Preserve milliseconds, which java.sql.Time supports
+					: type.cast( new Time( time.getTime() + roundToPrecision( nanos, 3 ) / 1000000 ) );
 		}
 
 		// Oracle documentation says to set the Date to January 1, 1970 when convert from
-		// a LocalTime to a Calendar.  IMO the same should hold true for converting to all
-		// the legacy Date/Time types...
-
+		// a LocalTime to a Calendar. IMO the same should hold true for converting to all
+		// the legacy Date/Time types.
 
-		final var zonedDateTime = value.atDate( LocalDate.of( 1970, 1, 1 ) ).atZone( ZoneId.systemDefault() );
+		final var zonedDateTime =
+				value.atDate( LocalDate.of( 1970, 1, 1 ) )
+						.atZone( ZoneId.systemDefault() );
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			return (X) GregorianCalendar.from( zonedDateTime );
+			return type.cast( GregorianCalendar.from( zonedDateTime ) );
 		}
 
 		final var instant = zonedDateTime.toInstant();
 
 		if ( Timestamp.class.isAssignableFrom( type ) ) {
-			return (X) Timestamp.from( instant );
+			return type.cast( Timestamp.from( instant ) );
 		}
 
 		if ( Date.class.equals( type ) ) {
-			return (X) Date.from( instant );
+			return type.cast( Date.from( instant ) );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( instant.toEpochMilli() );
+			return type.cast( instant.toEpochMilli() );
 		}
 
 		throw unknownUnwrap( type );
@@ -140,7 +145,7 @@ public <X> LocalTime wrap(X value, WrapperOptions options) {
 		}
 
 		if (value instanceof Time time) {
-			final LocalTime localTime = time.toLocalTime();
+			final var localTime = time.toLocalTime();
 			long millis = time.getTime() % 1000;
 			if ( millis == 0 ) {
 				return localTime;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleJavaType.java
index 3ab84ac054ca..4222987435b6 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LocaleJavaType.java
@@ -37,6 +37,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Locale;
 	}
 
+	@Override
+	public Locale cast(Object value) {
+		return (Locale) value;
+	}
+
 	@Override
 	public boolean useObjectEqualsHashCode() {
 		return true;
@@ -181,16 +186,15 @@ private void handleExtension(char[] chars, int start, int length, Locale.Builder
 		}
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(Locale value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Locale.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) (options.useLanguageTagForLocale() ? value.toLanguageTag() : value.toString());
+			return type.cast( (options.useLanguageTagForLocale() ? value.toLanguageTag() : value.toString()) );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongJavaType.java
index b44b0c871672..b7c6d57a2b73 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongJavaType.java
@@ -49,38 +49,42 @@ public boolean isInstance(Object value) {
 		return value instanceof Long;
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+	public Long cast(Object value) {
+		return (Long) value;
+	}
+
 	@Override
 	public <X> X unwrap(Long value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Long.class.isAssignableFrom( type ) || type == Object.class ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( Byte.class.isAssignableFrom( type ) ) {
-			return (X) Byte.valueOf( value.byteValue() );
+			return type.cast( value.byteValue() );
 		}
 		if ( Short.class.isAssignableFrom( type ) ) {
-			return (X) Short.valueOf( value.shortValue() );
+			return type.cast( value.shortValue() );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.intValue() );
+			return type.cast( value.intValue() );
 		}
 		if ( Double.class.isAssignableFrom( type ) ) {
-			return (X) Double.valueOf( value.doubleValue() );
+			return type.cast( value.doubleValue() );
 		}
 		if ( Float.class.isAssignableFrom( type ) ) {
-			return (X) Float.valueOf( value.floatValue() );
+			return type.cast( value.floatValue() );
 		}
 		if ( BigInteger.class.isAssignableFrom( type ) ) {
-			return (X) BigInteger.valueOf( value );
+			return type.cast( BigInteger.valueOf( value ) );
 		}
 		if ( BigDecimal.class.isAssignableFrom( type ) ) {
-			return (X) BigDecimal.valueOf( value );
+			return type.cast( BigDecimal.valueOf( value ) );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -114,7 +118,7 @@ public boolean isWider(JavaType<?> javaType) {
 	}
 
 	@Override
-	public <X> Long coerce(X value, CoercionContext coercionContext) {
+	public Long coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongPrimitiveArrayJavaType.java
index 9ba2fb465034..9a158499fd82 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongPrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/LongPrimitiveArrayJavaType.java
@@ -41,6 +41,11 @@ public boolean isInstance(Object value) {
 		return value instanceof long[];
 	}
 
+	@Override
+	public long[] cast(Object value) {
+		return (long[]) value;
+	}
+
 	@Override
 	public String extractLoggableRepresentation(long[] value) {
 		return value == null ? super.extractLoggableRepresentation( null ) : Arrays.toString( value );
@@ -106,7 +111,7 @@ public <X> X unwrap(long[] value, Class<X> type, WrapperOptions options) {
 		}
 
 		if ( type.isInstance( value ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( Object[].class.isAssignableFrom( type ) ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -114,16 +119,15 @@ else if ( Object[].class.isAssignableFrom( type ) ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				unwrapped[i] = getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 		else if ( type == byte[].class ) {
 			// byte[] can only be requested if the value should be serialized
-			return (X) SerializationHelper.serialize( value );
+			return type.cast( SerializationHelper.serialize( value ) );
 		}
 		else if ( type == BinaryStream.class ) {
 			// BinaryStream can only be requested if the value should be serialized
-			//noinspection unchecked
-			return (X) new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) );
+			return type.cast( new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) ) );
 		}
 		else if ( type.isArray() ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -131,7 +135,7 @@ else if ( type.isArray() ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				Array.set( unwrapped, i, getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options ) );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 
 		throw unknownUnwrap( type );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutableMutabilityPlan.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutableMutabilityPlan.java
index 43505f65a807..1d129e72daf1 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutableMutabilityPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/MutableMutabilityPlan.java
@@ -15,7 +15,12 @@
  */
 public abstract class MutableMutabilityPlan<T> implements MutabilityPlan<T> {
 
-	public static final MutableMutabilityPlan<Object> INSTANCE = new MutableMutabilityPlan<Object>() {
+	public static <T> MutableMutabilityPlan<T> instance() {
+		//noinspection unchecked
+		return INSTANCE;
+	}
+
+	public static final MutableMutabilityPlan INSTANCE = new MutableMutabilityPlan<>() {
 		@Override
 		protected Object deepCopyNotNull(Object value) {
 			return value;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobJavaType.java
index cfff735f39c5..8b8a5d012036 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/NClobJavaType.java
@@ -61,6 +61,11 @@ public boolean isInstance(Object value) {
 		return value instanceof NClob;
 	}
 
+	@Override
+	public NClob cast(Object value) {
+		return (NClob) value;
+	}
+
 	@Override
 	public String extractLoggableRepresentation(NClob value) {
 		return value == null ? "null" : "{nclob}";
@@ -90,7 +95,6 @@ public NClob getReplacement(NClob original, NClob target, SharedSessionContractI
 				.mergeNClob( original, target, session );
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(final NClob value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
@@ -98,36 +102,36 @@ public <X> X unwrap(final NClob value, Class<X> type, WrapperOptions options) {
 
 		try {
 			if ( NClob.class.isAssignableFrom( type ) ) {
-				return (X) options.getLobCreator().toJdbcNClob( value );
+				return type.cast( options.getLobCreator().toJdbcNClob( value ) );
 			}
 			else if ( String.class.isAssignableFrom( type ) ) {
 				if (value instanceof NClobImplementer clobImplementer) {
 					// if the incoming Clob is a wrapper, just get the underlying String.
-					return (X) clobImplementer.getUnderlyingStream().asString();
+					return type.cast( clobImplementer.getUnderlyingStream().asString() );
 				}
 				else {
 					// otherwise we need to extract the String.
-					return (X) extractString( value.getCharacterStream() );
+					return type.cast( extractString( value.getCharacterStream() ) );
 				}
 			}
 			else if ( Reader.class.isAssignableFrom( type ) ) {
 				if (value instanceof NClobImplementer clobImplementer) {
 					// if the incoming NClob is a wrapper, just pass along its CharacterStream
-					return (X) clobImplementer.getUnderlyingStream().asReader();
+					return type.cast( clobImplementer.getUnderlyingStream().asReader() );
 				}
 				else {
 					// otherwise we need to build a Reader...
-					return (X) value.getCharacterStream();
+					return type.cast( value.getCharacterStream() );
 				}
 			}
 			else if ( CharacterStream.class.isAssignableFrom( type ) ) {
 				if (value instanceof NClobImplementer clobImplementer) {
 					// if the incoming NClob is a wrapper, just pass along its CharacterStream
-					return (X) clobImplementer.getUnderlyingStream();
+					return type.cast( clobImplementer.getUnderlyingStream() );
 				}
 				else {
 					// otherwise we need to build a CharacterStream...
-					return (X) value.getCharacterStream();
+					return type.cast( value.getCharacterStream() );
 				}
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectArrayJavaType.java
index bdf4f8643bdc..12debbcf3249 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectArrayJavaType.java
@@ -29,6 +29,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Object[];
 	}
 
+	@Override
+	public Object[] cast(Object value) {
+		return (Object[]) value;
+	}
+
 	@Override
 	public String toString(Object[] value) {
 		final StringBuilder sb = new StringBuilder();
@@ -77,14 +82,13 @@ public int extractHashCode(Object[] objects) {
 		return hashCode;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public <X> X unwrap(Object[] value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Object[].class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectJavaType.java
index 885e227a1cad..8daa408337f3 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ObjectJavaType.java
@@ -29,10 +29,14 @@ public boolean isInstance(Object value) {
 		return true;
 	}
 
+	@Override
+	public Object cast(Object value) {
+		return value;
+	}
+
 	@Override
 	public <X> X unwrap(Object value, Class<X> type, WrapperOptions options) {
-		//noinspection unchecked
-		return (X) value;
+		return type.cast( value );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaType.java
index 8e8b36cc1d29..59c233ae3552 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetDateTimeJavaType.java
@@ -15,7 +15,6 @@
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalAccessor;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -69,21 +68,25 @@ public boolean isInstance(Object value) {
 	}
 
 	@Override
+	public OffsetDateTime cast(Object value) {
+		return (OffsetDateTime) value;
+	}
+
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.TIMESTAMP;
 	}
 
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators stdIndicators) {
-		if ( stdIndicators.isPreferJavaTimeJdbcTypesEnabled() ) {
-			return stdIndicators.getJdbcType( SqlTypes.OFFSET_DATE_TIME );
-		}
-		return stdIndicators.getJdbcType( stdIndicators.getDefaultZonedTimestampSqlType() );
+		return stdIndicators.isPreferJavaTimeJdbcTypesEnabled()
+				? stdIndicators.getJdbcType( SqlTypes.OFFSET_DATE_TIME )
+				: stdIndicators.getJdbcType( stdIndicators.getDefaultZonedTimestampSqlType() );
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) this;
+	@Override
+	protected TemporalJavaType<OffsetDateTime> forTimestampPrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
 	@Override
@@ -104,78 +107,78 @@ public OffsetDateTime fromString(CharSequence string) {
 	@Override
 	public OffsetDateTime fromEncodedString(CharSequence charSequence, int start, int end) {
 		try {
-			final TemporalAccessor temporalAccessor = PARSE_FORMATTER.parse( subSequence( charSequence, start, end ) );
-			if ( temporalAccessor.isSupported( ChronoField.OFFSET_SECONDS ) ) {
-				return OffsetDateTime.from( temporalAccessor );
-			}
-			else {
-				// For databases that don't have timezone support, we encode timestamps at UTC, so allow parsing that as well
-				return LocalDateTime.from( temporalAccessor ).atOffset( ZoneOffset.UTC );
-			}
+			final var temporalAccessor = PARSE_FORMATTER.parse( subSequence( charSequence, start, end ) );
+			return temporalAccessor.isSupported( ChronoField.OFFSET_SECONDS )
+					? OffsetDateTime.from( temporalAccessor )
+					// For databases that don't have timezone support,
+					// we encode timestamps at UTC, so allow parsing
+					: LocalDateTime.from( temporalAccessor ).atOffset( ZoneOffset.UTC );
 		}
 		catch ( DateTimeParseException pe) {
-			throw new HibernateException( "could not parse timestamp string " + subSequence( charSequence, start, end ), pe );
+			throw new HibernateException( "could not parse timestamp string "
+						+ subSequence( charSequence, start, end ), pe );
 		}
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(OffsetDateTime offsetDateTime, Class<X> type, WrapperOptions options) {
 		if ( offsetDateTime == null ) {
 			return null;
 		}
 
 		if ( OffsetDateTime.class.isAssignableFrom( type ) ) {
-			return (X) offsetDateTime;
+			return type.cast( offsetDateTime );
 		}
 
 		if ( ZonedDateTime.class.isAssignableFrom( type ) ) {
-			return (X) offsetDateTime.toZonedDateTime();
+			return type.cast( offsetDateTime.toZonedDateTime() );
 		}
 
 		if ( Instant.class.isAssignableFrom( type ) ) {
-			return (X) offsetDateTime.toInstant();
+			return type.cast( offsetDateTime.toInstant() );
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			return (X) GregorianCalendar.from( offsetDateTime.toZonedDateTime() );
+			return type.cast( GregorianCalendar.from( offsetDateTime.toZonedDateTime() ) );
 		}
 
 		if ( Timestamp.class.isAssignableFrom( type ) ) {
-			/*
-			 * This works around two bugs:
-			 * - HHH-13266 (JDK-8061577): around and before 1900,
-			 * the number of milliseconds since the epoch does not mean the same thing
-			 * for java.util and java.time, so conversion must be done using the year, month, day, hour, etc.
-			 * - HHH-13379 (JDK-4312621): after 1908 (approximately),
-			 * Daylight Saving Time introduces ambiguity in the year/month/day/hour/etc representation once a year
-			 * (on DST end), so conversion must be done using the number of milliseconds since the epoch.
-			 * - around 1905, both methods are equally valid, so we don't really care which one is used.
-			 */
+			// This works around two bugs:
+			// - HHH-13266 (JDK-8061577): around and before 1900,
+			//   the number of milliseconds since the epoch does not mean the same thing
+			//   for java.util and java.time, so conversion must be done using the year,
+			//   month, day, hour, etc.
+			// - HHH-13379 (JDK-4312621): after 1908 (approximately),
+			//   Daylight Saving Time introduces ambiguity in the year/month/day/hour/etc
+			//   representation once a year (on DST end), so conversion must be done using
+			//   the number of milliseconds since the epoch.
+			// - around 1905, both methods are equally valid, so we don't really care which
+			//   one is used.
 			if ( offsetDateTime.getYear() < 1905 ) {
-				return (X) Timestamp.valueOf(
-						offsetDateTime.atZoneSameInstant( ZoneId.systemDefault() ).toLocalDateTime()
-				);
+				return type.cast( Timestamp.valueOf(
+						offsetDateTime.atZoneSameInstant( ZoneId.systemDefault() )
+								.toLocalDateTime()
+				) );
 			}
 			else {
-				return (X) Timestamp.from( offsetDateTime.toInstant() );
+				return type.cast( Timestamp.from( offsetDateTime.toInstant() ) );
 			}
 		}
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return (X) java.sql.Date.from( offsetDateTime.toInstant() );
+			return type.cast( java.sql.Date.from( offsetDateTime.toInstant() ) );
 		}
 
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			return (X) java.sql.Time.from( offsetDateTime.toInstant() );
+			return type.cast( java.sql.Time.from( offsetDateTime.toInstant() ) );
 		}
 
 		if ( Date.class.isAssignableFrom( type ) ) {
-			return (X) Date.from( offsetDateTime.toInstant() );
+			return type.cast( Date.from( offsetDateTime.toInstant() ) );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( offsetDateTime.toInstant().toEpochMilli() );
+			return type.cast( offsetDateTime.toInstant().toEpochMilli() );
 		}
 
 		throw unknownUnwrap( type );
@@ -200,22 +203,20 @@ public <X> OffsetDateTime wrap(X value, WrapperOptions options) {
 		}
 
 		if (value instanceof Timestamp timestamp) {
-			/*
-			 * This works around two bugs:
-			 * - HHH-13266 (JDK-8061577): around and before 1900,
-			 * the number of milliseconds since the epoch does not mean the same thing
-			 * for java.util and java.time, so conversion must be done using the year, month, day, hour, etc.
-			 * - HHH-13379 (JDK-4312621): after 1908 (approximately),
-			 * Daylight Saving Time introduces ambiguity in the year/month/day/hour/etc representation once a year
-			 * (on DST end), so conversion must be done using the number of milliseconds since the epoch.
-			 * - around 1905, both methods are equally valid, so we don't really care which one is used.
-			 */
-			if ( timestamp.getYear() < 5 ) { // Timestamp year 0 is 1900
-				return timestamp.toLocalDateTime().atZone( ZoneId.systemDefault() ).toOffsetDateTime();
-			}
-			else {
-				return OffsetDateTime.ofInstant( timestamp.toInstant(), ZoneId.systemDefault() );
-			}
+			// This works around two bugs:
+			// - HHH-13266 (JDK-8061577): around and before 1900,
+			//   the number of milliseconds since the epoch does not mean the same thing
+			//   for java.util and java.time, so conversion must be done using the year,
+			//   month, day, hour, etc.
+			// - HHH-13379 (JDK-4312621): after 1908 (approximately),
+			//   Daylight Saving Time introduces ambiguity in the year/month/day/hour/etc
+			//   representation once a year (on DST end), so conversion must be done using
+			//   the number of milliseconds since the epoch.
+			// - around 1905, both methods are equally valid, so we don't really care which
+			//   one is used.
+			return timestamp.getYear() < 5 // Timestamp year 0 is 1900
+					? timestamp.toLocalDateTime().atZone( ZoneId.systemDefault() ).toOffsetDateTime()
+					: OffsetDateTime.ofInstant( timestamp.toInstant(), ZoneId.systemDefault() );
 		}
 
 		if (value instanceof Date date) {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaType.java
index 7d32af5f59ab..bc4964056872 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OffsetTimeJavaType.java
@@ -20,7 +20,6 @@
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.type.SqlTypes;
-import org.hibernate.type.descriptor.DateTimeUtils;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
@@ -28,6 +27,8 @@
 
 import jakarta.persistence.TemporalType;
 
+import static org.hibernate.type.descriptor.DateTimeUtils.roundToPrecision;
+
 /**
  * Java type descriptor for the {@link OffsetTime} type.
  *
@@ -49,22 +50,25 @@ public boolean isInstance(Object value) {
 	}
 
 	@Override
+	public OffsetTime cast(Object value) {
+		return (OffsetTime) value;
+	}
+
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.TIME;
 	}
 
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators stdIndicators) {
-		if ( stdIndicators.isPreferJavaTimeJdbcTypesEnabled() ) {
-			return stdIndicators.getJdbcType( SqlTypes.OFFSET_TIME );
-		}
-		return stdIndicators.getJdbcType( stdIndicators.getDefaultZonedTimeSqlType() );
+		return stdIndicators.isPreferJavaTimeJdbcTypesEnabled()
+				? stdIndicators.getJdbcType( SqlTypes.OFFSET_TIME )
+				: stdIndicators.getJdbcType( stdIndicators.getDefaultZonedTimeSqlType() );
 	}
 
 	@Override
-	protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
-		//noinspection unchecked
-		return (TemporalJavaType<X>) this;
+	protected TemporalJavaType<OffsetTime> forTimePrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
 	@Override
@@ -83,7 +87,6 @@ public OffsetTime fromString(CharSequence string) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(OffsetTime offsetTime, Class<X> type, WrapperOptions options) {
 		if ( offsetTime == null ) {
 			return null;
@@ -93,58 +96,56 @@ public <X> X unwrap(OffsetTime offsetTime, Class<X> type, WrapperOptions options
 		// (since PS.setObject() doesn't support passing a timezone)
 
 		if ( OffsetTime.class.isAssignableFrom( type ) ) {
-			return (X) offsetTime;
+			return type.cast( offsetTime );
 		}
 
 		if ( LocalTime.class.isAssignableFrom( type ) ) {
-			return (X) offsetTime.withOffsetSameInstant( getCurrentSystemOffset() ).toLocalTime();
+			return type.cast( offsetTime.withOffsetSameInstant( getCurrentSystemOffset() ).toLocalTime() );
 		}
 
 		if ( OffsetDateTime.class.isAssignableFrom( type ) ) {
-			return (X) offsetTime.atDate( LocalDate.EPOCH );
+			return type.cast( offsetTime.atDate( LocalDate.EPOCH ) );
 		}
 
 		// for legacy types, we assume that the JDBC timezone is passed to JDBC
 		// (since PS.setTime() and friends do accept a timezone passed as a Calendar)
 
-		final OffsetTime jdbcOffsetTime = offsetTime.withOffsetSameInstant( getCurrentJdbcOffset(options) );
+		final var jdbcOffsetTime = offsetTime.withOffsetSameInstant( getCurrentJdbcOffset(options) );
 
 		if ( Time.class.isAssignableFrom( type ) ) {
-			final Time time = Time.valueOf( jdbcOffsetTime.toLocalTime() );
-			if ( jdbcOffsetTime.getNano() == 0 ) {
-				return (X) time;
-			}
-			// Preserve milliseconds, which java.sql.Time supports
-			return (X) new Time( time.getTime() + DateTimeUtils.roundToPrecision( jdbcOffsetTime.getNano(), 3 ) / 1000000 );
+			final var time = Time.valueOf( jdbcOffsetTime.toLocalTime() );
+			final int nanos = jdbcOffsetTime.getNano();
+			return nanos == 0
+					? type.cast( time )
+					// Preserve milliseconds, which java.sql.Time supports
+					: type.cast( new Time( time.getTime() + roundToPrecision( nanos, 3 ) / 1000000 ) );
 		}
 
-		final OffsetDateTime jdbcOffsetDateTime = jdbcOffsetTime.atDate( LocalDate.EPOCH );
+		final var jdbcOffsetDateTime = jdbcOffsetTime.atDate( LocalDate.EPOCH );
 
 		if ( Timestamp.class.isAssignableFrom( type ) ) {
-			/*
-			 * Workaround for HHH-13266 (JDK-8061577).
-			 * Ideally we'd want to use Timestamp.from( jdbcOffsetDateTime.toInstant() ),
-			 * but this won't always work since Timestamp.from() assumes the number of
-			 * milliseconds since the epoch means the same thing in Timestamp and Instant,
-			 * but it doesn't, in particular before 1900.
-			 */
-			return (X) Timestamp.valueOf( jdbcOffsetDateTime.toLocalDateTime() );
+			// Workaround for HHH-13266 (JDK-8061577).
+			// Ideally, we'd want to use Timestamp.from( jdbcOffsetDateTime.toInstant() ),
+			// but this won't always work since Timestamp.from() assumes the number of
+			// milliseconds since the epoch means the same thing in Timestamp and Instant,
+			// but it doesn't, in particular before 1900.
+			return type.cast( Timestamp.valueOf( jdbcOffsetDateTime.toLocalDateTime() ) );
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			return (X) GregorianCalendar.from( jdbcOffsetDateTime.toZonedDateTime() );
+			return type.cast( GregorianCalendar.from( jdbcOffsetDateTime.toZonedDateTime() ) );
 		}
 
 		// for instants, we assume that the JDBC timezone, if any, is ignored
 
-		final Instant instant = offsetTime.atDate( LocalDate.EPOCH ).toInstant();
+		final var instant = offsetTime.atDate( LocalDate.EPOCH ).toInstant();
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( instant.toEpochMilli() );
+			return type.cast( instant.toEpochMilli() );
 		}
 
 		if ( Date.class.isAssignableFrom( type ) ) {
-			return (X) Date.from( instant );
+			return type.cast( Date.from( instant ) );
 		}
 
 		throw unknownUnwrap( type );
@@ -171,28 +172,26 @@ public <X> OffsetTime wrap(X value, WrapperOptions options) {
 			return offsetDateTime.toOffsetTime();
 		}
 
-		/*
-		 * Also, in order to fix HHH-13357, and to be consistent with the conversion to Time (see above),
-		 * we set the offset to the current offset of the JVM (OffsetDateTime.now().getOffset()).
-		 * This is different from setting the *zone* to the current *zone* of the JVM (ZoneId.systemDefault()),
-		 * since a zone has a varying offset over time,
-		 * thus the zone might have a different offset for the given timezone than it has for the current date/time.
-		 * For example, if the timestamp represents 1970-01-01TXX:YY,
-		 * and the JVM is set to use Europe/Paris as a timezone, and the current time is 2019-04-16-08:53,
-		 * then applying the JVM timezone to the timestamp would result in the offset +01:00,
-		 * but applying the JVM offset would result in the offset +02:00, since DST is in effect at 2019-04-16-08:53.
-		 *
-		 * Of course none of this would be a problem if we just stored the offset in the database,
-		 * but I guess there are historical reasons that explain why we don't.
-		 */
+		// Also, in order to fix HHH-13357, and to be consistent with the conversion to Time (see above),
+		// we set the offset to the current offset of the JVM (OffsetDateTime.now().getOffset()). This is
+		// different from setting the *zone* to the current *zone* of the JVM (ZoneId.systemDefault()),
+		// since a zone has a varying offset over time; thus the zone might have a different offset for the
+		// given timezone than it has for the current date/time. For example, if the timestamp represents
+		// 1970-01-01TXX:YY, and the JVM is set to use Europe/Paris as a timezone, and the current time is
+		// 2019-04-16-08:53, then applying the JVM timezone to the timestamp would result in the offset
+		// +01:00, but applying the JVM offset would result in the offset +02:00, since DST is in effect at
+		// 2019-04-16-08:53.
+		//
+		// Of course, none of this would be a problem if we just stored the offset in the database, but I
+		// guess there are historical reasons that explain why we don't.
 
 		// for legacy types, we assume that the JDBC timezone is passed to JDBC
 		// (since PS.setTime() and friends do accept a timezone passed as a Calendar)
 
 		if (value instanceof Time time) {
-			final OffsetTime offsetTime = time.toLocalTime()
-					.atOffset( getCurrentJdbcOffset( options) )
-					.withOffsetSameInstant( getCurrentSystemOffset() );
+			final var offsetTime =
+					time.toLocalTime().atOffset( getCurrentJdbcOffset( options) )
+							.withOffsetSameInstant( getCurrentSystemOffset() );
 			long millis = time.getTime() % 1000;
 			if ( millis == 0 ) {
 				return offsetTime;
@@ -206,13 +205,11 @@ public <X> OffsetTime wrap(X value, WrapperOptions options) {
 		}
 
 		if (value instanceof Timestamp timestamp) {
-			/*
-			 * Workaround for HHH-13266 (JDK-8061577).
-			 * Ideally we'd want to use OffsetDateTime.ofInstant( ts.toInstant(), ... ),
-			 * but this won't always work since ts.toInstant() assumes the number of
-			 * milliseconds since the epoch means the same thing in Timestamp and Instant,
-			 * but it doesn't, in particular before 1900.
-			 */
+			// Workaround for HHH-13266 (JDK-8061577).
+			// Ideally, we'd want to use OffsetDateTime.ofInstant( ts.toInstant(), ... ),
+			// but this won't always work since ts.toInstant() assumes the number of
+			// milliseconds since the epoch means the same thing in Timestamp and Instant,
+			// but it doesn't, in particular before 1900.
 			return timestamp.toLocalDateTime().toLocalTime().atOffset( getCurrentJdbcOffset(options) )
 					.withOffsetSameInstant( getCurrentSystemOffset() );
 		}
@@ -235,12 +232,10 @@ public <X> OffsetTime wrap(X value, WrapperOptions options) {
 	}
 
 	private static ZoneOffset getCurrentJdbcOffset(WrapperOptions options) {
-		if (  options.getJdbcTimeZone() != null ) {
-			return OffsetDateTime.now().atZoneSameInstant( options.getJdbcTimeZone().toZoneId() ).getOffset();
-		}
-		else {
-			return getCurrentSystemOffset();
-		}
+		final var jdbcTimeZone = options.getJdbcTimeZone();
+		return jdbcTimeZone != null
+				? OffsetDateTime.now().atZoneSameInstant( jdbcTimeZone.toZoneId() ).getOffset()
+				: getCurrentSystemOffset();
 	}
 
 	private static ZoneOffset getCurrentSystemOffset() {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveByteArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveByteArrayJavaType.java
index d68bec284276..bfaedc9b68dc 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveByteArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveByteArrayJavaType.java
@@ -37,6 +37,11 @@ public boolean isInstance(Object value) {
 		return value instanceof byte[];
 	}
 
+	@Override
+	public byte[] cast(Object value) {
+		return (byte[]) value;
+	}
+
 	@Override
 	public boolean areEqual(byte[] one, byte[] another) {
 		return one == another
@@ -99,29 +104,28 @@ public byte[] fromString(CharSequence string) {
 		return bytes;
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(byte[] value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( byte[].class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( InputStream.class.isAssignableFrom( type ) ) {
-			return (X) new ByteArrayInputStream( value );
+			return type.cast( new ByteArrayInputStream( value ) );
 		}
 		if ( BinaryStream.class.isAssignableFrom( type ) ) {
-			return (X) new ArrayBackedBinaryStream( value );
+			return type.cast( new ArrayBackedBinaryStream( value ) );
 		}
 		if ( Blob.class.isAssignableFrom( type ) ) {
-			return (X) options.getLobCreator().createBlob( value );
+			return type.cast( options.getLobCreator().createBlob( value ) );
 		}
 		if ( type.isAssignableFrom( Byte[].class ) ) {
 			final Byte[] array = new Byte[value.length];
 			for ( int i = 0; i < value.length; i++ ) {
 				array[i] = value[i];
 			}
-			return (X) array;
+			return type.cast( array );
 		}
 
 		throw unknownUnwrap( type );
@@ -160,10 +164,15 @@ else if ( value instanceof Byte[] array ) {
 		throw unknownWrap( value.getClass() );
 	}
 
+	@Override
+	public byte[] coerce(Object value) {
+		return wrap( value, null );
+	}
+
 	@Override
 	public byte[] seed(
 			Long length, Integer precision, Integer scale, SharedSessionContractImplementor session) {
-		// Note : simply returns null for seed() and next() as the only known
+		// Note: simply returns null for seed() and next() as the only known
 		// 		application of binary types for versioning is for use with the
 		// 		TIMESTAMP datatype supported by Sybase and SQL Server, which
 		// 		are completely db-generated values...
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayJavaType.java
index 33ccf0bcf506..7bcb1fca2908 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayJavaType.java
@@ -40,6 +40,11 @@ public boolean isInstance(Object value) {
 		return value instanceof char[];
 	}
 
+	@Override
+	public char[] cast(Object value) {
+		return (char[]) value;
+	}
+
 	@Override
 	public boolean areEqual(char[] one, char[] another) {
 		return one == another
@@ -55,28 +60,27 @@ public int extractHashCode(char[] chars) {
 		return hashCode;
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(char[] value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( char[].class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) new String( value );
+			return type.cast( new String( value ) );
 		}
 		if ( NClob.class.isAssignableFrom( type ) ) {
-			return (X) options.getLobCreator().createNClob( new String( value ) );
+			return type.cast( options.getLobCreator().createNClob( new String( value ) ) );
 		}
 		if ( Clob.class.isAssignableFrom( type ) ) {
-			return (X) options.getLobCreator().createClob( new String( value ) );
+			return type.cast( options.getLobCreator().createClob( new String( value ) ) );
 		}
 		if ( Reader.class.isAssignableFrom( type ) ) {
-			return (X) new StringReader( new String( value ) );
+			return type.cast( new StringReader( new String( value ) ) );
 		}
 		if ( CharacterStream.class.isAssignableFrom( type ) ) {
-			return (X) new CharacterStreamImpl( new String( value ) );
+			return type.cast( new CharacterStreamImpl( new String( value ) ) );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -105,7 +109,7 @@ else if ( value instanceof Character character ) {
 	}
 
 	@Override
-	public <X> char[] coerce(X value, CoercionContext coercionContext) {
+	public char[] coerce(Object value) {
 		return wrap( value, null );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/SerializableJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/SerializableJavaType.java
index 58bbd22656bb..8d8ee131d79c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/SerializableJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/SerializableJavaType.java
@@ -53,15 +53,9 @@ public SerializableJavaType(Class<T> type, MutabilityPlan<T> mutabilityPlan) {
 	}
 
 	private static <T> MutabilityPlan<T> createMutabilityPlan(Class<T> type) {
-		if ( type.isAnnotationPresent( Immutable.class ) ) {
-			return ImmutableMutabilityPlan.instance();
-		}
-		return (MutabilityPlan<T>) SerializableMutabilityPlan.INSTANCE;
-	}
-
-	@Override
-	public boolean isInstance(Object value) {
-		return value instanceof Serializable;
+		return type.isAnnotationPresent( Immutable.class )
+				? ImmutableMutabilityPlan.instance()
+				: (MutabilityPlan<T>) SerializableMutabilityPlan.INSTANCE;
 	}
 
 	@Override
@@ -97,31 +91,29 @@ public int extractHashCode(T value) {
 		return PrimitiveByteArrayJavaType.INSTANCE.extractHashCode( toBytes( value ) );
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		else if ( type.isInstance( value ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( byte[].class.isAssignableFrom( type ) ) {
-			return (X) toBytes( value );
+			return type.cast( toBytes( value ) );
 		}
 		else if ( InputStream.class.isAssignableFrom( type ) ) {
-			return (X) new ByteArrayInputStream( toBytes( value ) );
+			return type.cast( new ByteArrayInputStream( toBytes( value ) ) );
 		}
 		else if ( BinaryStream.class.isAssignableFrom( type ) ) {
-			return (X) new ArrayBackedBinaryStream( toBytes( value ) );
+			return type.cast( new ArrayBackedBinaryStream( toBytes( value ) ) );
 		}
 		else if ( Blob.class.isAssignableFrom( type ) ) {
-			return (X) options.getLobCreator().createBlob( toBytes( value ) );
+			return type.cast( options.getLobCreator().createBlob( toBytes( value ) ) );
 		}
 
 		throw unknownUnwrap( type );
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> T wrap(X value, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
@@ -140,8 +132,8 @@ else if (value instanceof Blob blob) {
 				throw new HibernateException( e );
 			}
 		}
-		else if ( getJavaTypeClass().isInstance( value ) ) {
-			return (T) value;
+		else if ( isInstance( value ) ) {
+			return cast( value );
 		}
 		throw unknownWrap( value.getClass() );
 	}
@@ -150,8 +142,7 @@ protected byte[] toBytes(T value) {
 		return SerializationHelper.serialize( value );
 	}
 
-	@SuppressWarnings("unchecked")
 	protected T fromBytes(byte[] bytes) {
-		return (T) SerializationHelper.deserialize( bytes, getJavaTypeClass().getClassLoader() );
+		return cast( SerializationHelper.deserialize( bytes, getJavaTypeClass().getClassLoader() ) );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortJavaType.java
index bfcb09054837..ad03c859e188 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortJavaType.java
@@ -48,6 +48,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Short;
 	}
 
+	@Override
+	public Short cast(Object value) {
+		return (Short) value;
+	}
+
 	@Override
 	public boolean isWider(JavaType<?> javaType) {
 		return switch ( javaType.getTypeName() ) {
@@ -56,32 +61,31 @@ public boolean isWider(JavaType<?> javaType) {
 		};
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public <X> X unwrap(Short value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( Short.class.isAssignableFrom( type ) || type == Object.class ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( Byte.class.isAssignableFrom( type ) ) {
-			return (X) Byte.valueOf( value.byteValue() );
+			return type.cast( value.byteValue() );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.intValue() );
+			return type.cast( value.intValue() );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.longValue() );
+			return type.cast( value.longValue() );
 		}
 		if ( Double.class.isAssignableFrom( type ) ) {
-			return (X) Double.valueOf( value.doubleValue() );
+			return type.cast( value.doubleValue() );
 		}
 		if ( Float.class.isAssignableFrom( type ) ) {
-			return (X) Float.valueOf( value.floatValue() );
+			return type.cast( value.floatValue() );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value.toString();
+			return type.cast( value.toString() );
 		}
 		throw unknownUnwrap( type );
 	}
@@ -139,7 +143,7 @@ public int getDefaultSqlScale(Dialect dialect, JdbcType jdbcType) {
 	}
 
 	@Override
-	public Short coerce(Object value, CoercionContext coercionContext) {
+	public Short coerce(Object value) {
 		if ( value == null ) {
 			return null;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortPrimitiveArrayJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortPrimitiveArrayJavaType.java
index 37b7cf758aac..cf0c853419c5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortPrimitiveArrayJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ShortPrimitiveArrayJavaType.java
@@ -41,6 +41,11 @@ public boolean isInstance(Object value) {
 		return value instanceof short[];
 	}
 
+	@Override
+	public short[] cast(Object value) {
+		return (short[]) value;
+	}
+
 	@Override
 	public String extractLoggableRepresentation(short[] value) {
 		return value == null ? super.extractLoggableRepresentation( null ) : Arrays.toString( value );
@@ -106,7 +111,7 @@ public <X> X unwrap(short[] value, Class<X> type, WrapperOptions options) {
 		}
 
 		if ( type.isInstance( value ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( Object[].class.isAssignableFrom( type ) ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -114,16 +119,15 @@ else if ( Object[].class.isAssignableFrom( type ) ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				unwrapped[i] = getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 		else if ( type == byte[].class ) {
 			// byte[] can only be requested if the value should be serialized
-			return (X) SerializationHelper.serialize( value );
+			return type.cast( SerializationHelper.serialize( value ) );
 		}
 		else if ( type == BinaryStream.class ) {
 			// BinaryStream can only be requested if the value should be serialized
-			//noinspection unchecked
-			return (X) new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) );
+			return type.cast( new ArrayBackedBinaryStream( SerializationHelper.serialize( value ) ) );
 		}
 		else if ( type.isArray() ) {
 			final Class<?> preferredJavaTypeClass = type.getComponentType();
@@ -131,7 +135,7 @@ else if ( type.isArray() ) {
 			for ( int i = 0; i < value.length; i++ ) {
 				Array.set( unwrapped, i, getElementJavaType().unwrap( value[i], preferredJavaTypeClass, options ) );
 			}
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 
 		throw unknownUnwrap( type );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/StringJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/StringJavaType.java
index d3ef4969aefd..a10b9fc29ac4 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/StringJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/StringJavaType.java
@@ -48,6 +48,11 @@ public boolean isInstance(Object value) {
 		return value instanceof String;
 	}
 
+	@Override
+	public String cast(Object value) {
+		return (String) value;
+	}
+
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators stdIndicators) {
 		final var typeConfiguration = stdIndicators.getTypeConfiguration();
@@ -65,37 +70,36 @@ else if ( stdIndicators.isNationalized() ) {
 		return super.getRecommendedJdbcType( stdIndicators );
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(String value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( byte[].class.isAssignableFrom( type ) ) {
-			return (X) value.getBytes( UTF_8 );
+			return type.cast( value.getBytes( UTF_8 ) );
 		}
 		if ( Reader.class.isAssignableFrom( type ) ) {
-			return (X) new StringReader( value );
+			return type.cast( new StringReader( value ) );
 		}
 		if ( CharacterStream.class.isAssignableFrom( type ) ) {
-			return (X) new CharacterStreamImpl( value );
+			return type.cast( new CharacterStreamImpl( value ) );
 		}
 		// Since NClob extends Clob, we need to check if type is an NClob
 		// before checking if type is a Clob. That will ensure that
 		// the correct type is returned.
 		if ( NClob.class.isAssignableFrom( type ) ) {
-			return (X) options.getLobCreator().createNClob( value );
+			return type.cast( options.getLobCreator().createNClob( value ) );
 		}
 		if ( Clob.class.isAssignableFrom( type ) ) {
-			return (X) options.getLobCreator().createClob( value );
+			return type.cast( options.getLobCreator().createClob( value ) );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) (Integer) Integer.parseInt( value );
+			return type.cast( Integer.parseInt( value ) );
 		}
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) (Long) Long.parseLong( value );
+			return type.cast( Long.parseLong( value ) );
 		}
 
 		throw unknownUnwrap( type );
@@ -143,7 +147,7 @@ public boolean isWider(JavaType<?> javaType) {
 	}
 
 	@Override
-	public <X> String coerce(X value, CoercionContext coercionContext) {
+	public String coerce(Object value) {
 		return wrap( value, null );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TemporalJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TemporalJavaType.java
index 26d30ffb9df0..376c8f974728 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TemporalJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TemporalJavaType.java
@@ -19,7 +19,9 @@
 @Incubating
 public interface TemporalJavaType<T> extends BasicJavaType<T> {
 
-	static int resolveJdbcTypeCode(TemporalType requestedTemporalPrecision) {
+	static int resolveJdbcTypeCode(
+			@SuppressWarnings("deprecation")
+			TemporalType requestedTemporalPrecision) {
 		return switch ( requestedTemporalPrecision ) {
 			case DATE -> Types.DATE;
 			case TIME -> Types.TIME;
@@ -27,7 +29,9 @@ static int resolveJdbcTypeCode(TemporalType requestedTemporalPrecision) {
 		};
 	}
 
-	static Class<?> resolveJavaTypeClass(TemporalType requestedTemporalPrecision) {
+	static Class<?> resolveJavaTypeClass(
+			@SuppressWarnings("deprecation")
+			TemporalType requestedTemporalPrecision) {
 		return switch ( requestedTemporalPrecision ) {
 			case DATE -> java.sql.Date.class;
 			case TIME -> java.sql.Time.class;
@@ -38,14 +42,15 @@ static Class<?> resolveJavaTypeClass(TemporalType requestedTemporalPrecision) {
 	/**
 	 * The precision represented by this type
 	 */
+	@SuppressWarnings("deprecation")
 	TemporalType getPrecision();
 
 	/**
 	 * Resolve the appropriate TemporalJavaType for the given precision
 	 * "relative" to this type.
 	 */
-	<X> TemporalJavaType<X> resolveTypeForPrecision(
-			TemporalType precision,
+	TemporalJavaType<T> resolveTypeForPrecision(
+			@SuppressWarnings("deprecation") TemporalType precision,
 			TypeConfiguration typeConfiguration);
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TimeZoneJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TimeZoneJavaType.java
index 3dbc3133724f..ca46bab84abe 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TimeZoneJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/TimeZoneJavaType.java
@@ -34,6 +34,11 @@ public boolean isInstance(Object value) {
 		return value instanceof TimeZone;
 	}
 
+	@Override
+	public TimeZone cast(Object value) {
+		return (TimeZone) value;
+	}
+
 	@Override
 	public boolean useObjectEqualsHashCode() {
 		return true;
@@ -47,16 +52,15 @@ public TimeZone fromString(CharSequence string) {
 		return TimeZone.getTimeZone( string.toString() );
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(TimeZone value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( TimeZone.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) toString( value );
+			return type.cast( toString( value ) );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java
index b8d0462f81b7..49c4c27a7b7d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java
@@ -32,6 +32,11 @@ public boolean isInstance(Object value) {
 		return value instanceof UUID;
 	}
 
+	@Override
+	public UUID cast(Object value) {
+		return (UUID) value;
+	}
+
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		return context.getJdbcType( context.getPreferredSqlTypeCodeForUuid() );
@@ -63,19 +68,18 @@ else if ( jdbcType.isBinary() ) {
 		return super.getDefaultSqlLength( dialect, jdbcType );
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(UUID value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( UUID.class.isAssignableFrom( type ) ) {
-			return (X) PassThroughTransformer.INSTANCE.transform( value );
+			return type.cast( PassThroughTransformer.INSTANCE.transform( value ) );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) ToStringTransformer.INSTANCE.transform( value );
+			return type.cast( ToStringTransformer.INSTANCE.transform( value ) );
 		}
 		if ( byte[].class.isAssignableFrom( type ) ) {
-			return (X) ToBytesTransformer.INSTANCE.transform( value );
+			return type.cast( ToBytesTransformer.INSTANCE.transform( value ) );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UrlJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UrlJavaType.java
index c111905a754a..2a20d74d9020 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UrlJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UrlJavaType.java
@@ -29,6 +29,11 @@ public boolean isInstance(Object value) {
 		return value instanceof URL;
 	}
 
+	@Override
+	public URL cast(Object value) {
+		return (URL) value;
+	}
+
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		return context.getJdbcType( SqlTypes.VARCHAR );
@@ -52,16 +57,15 @@ public URL fromString(CharSequence string) {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(URL value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( URL.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) toString( value );
+			return type.cast( toString( value ) );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/YearJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/YearJavaType.java
index 732d6b910d61..806e8e1094a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/YearJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/YearJavaType.java
@@ -28,6 +28,11 @@ public boolean isInstance(Object value) {
 		return value instanceof Year;
 	}
 
+	@Override
+	public Year cast(Object value) {
+		return (Year) value;
+	}
+
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		return context.getJdbcType( Types.INTEGER );
@@ -48,7 +53,6 @@ public Year fromString(CharSequence string) {
 		return string == null ? null : Year.parse( string, FORMATTER );
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public <X> X unwrap(Year value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
@@ -56,19 +60,19 @@ public <X> X unwrap(Year value, Class<X> type, WrapperOptions options) {
 		}
 
 		if ( type.isInstance( value ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.getValue() );
+			return type.cast( value.getValue() );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( value.getValue() );
+			return type.cast( (long) value.getValue() );
 		}
 
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) toString( value );
+			return type.cast( toString( value ) );
 		}
 
 		throw unknownUnwrap( type );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneIdJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneIdJavaType.java
index da51b52bf2e9..2fba480a7f6d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneIdJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneIdJavaType.java
@@ -29,6 +29,11 @@ public boolean isInstance(Object value) {
 		return value instanceof ZoneId;
 	}
 
+	@Override
+	public ZoneId cast(Object value) {
+		return (ZoneId) value;
+	}
+
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators indicators) {
 		return indicators.getJdbcType( Types.VARCHAR );
@@ -49,17 +54,16 @@ public ZoneId fromString(CharSequence string) {
 		return string == null ? null : ZoneId.of( string.toString() );
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public <X> X unwrap(ZoneId value, Class<X> type, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( ZoneId.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) toString( value );
+			return type.cast( toString( value ) );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneOffsetJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneOffsetJavaType.java
index ba78dba8a58c..1227e2162e9b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneOffsetJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZoneOffsetJavaType.java
@@ -37,6 +37,11 @@ public boolean isInstance(Object value) {
 		return value instanceof ZoneOffset;
 	}
 
+	@Override
+	public ZoneOffset cast(Object value) {
+		return (ZoneOffset) value;
+	}
+
 	@Override
 	public boolean useObjectEqualsHashCode() {
 		return true;
@@ -56,19 +61,18 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(ZoneOffset value, Class<X> type, WrapperOptions wrapperOptions) {
 		if ( value == null ) {
 			return null;
 		}
 		if ( ZoneOffset.class.isAssignableFrom( type ) ) {
-			return (X) value;
+			return type.cast( value );
 		}
 		if ( String.class.isAssignableFrom( type ) ) {
-			return (X) toString( value );
+			return type.cast( toString( value ) );
 		}
 		if ( Integer.class.isAssignableFrom( type ) ) {
-			return (X) Integer.valueOf( value.getTotalSeconds() );
+			return type.cast( value.getTotalSeconds() );
 		}
 		throw unknownUnwrap( type );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaType.java
index 22cde050e664..064aa31f93da 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ZonedDateTimeJavaType.java
@@ -48,21 +48,25 @@ public boolean isInstance(Object value) {
 	}
 
 	@Override
+	public ZonedDateTime cast(Object value) {
+		return (ZonedDateTime) value;
+	}
+
+	@Override @SuppressWarnings("deprecation")
 	public TemporalType getPrecision() {
 		return TemporalType.TIMESTAMP;
 	}
 
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators stdIndicators) {
-		if ( stdIndicators.isPreferJavaTimeJdbcTypesEnabled() ) {
-			return stdIndicators.getJdbcType( SqlTypes.ZONED_DATE_TIME );
-		}
-		return stdIndicators.getJdbcType( stdIndicators.getDefaultZonedTimestampSqlType() );
+		return stdIndicators.isPreferJavaTimeJdbcTypesEnabled()
+				? stdIndicators.getJdbcType( SqlTypes.ZONED_DATE_TIME )
+				: stdIndicators.getJdbcType( stdIndicators.getDefaultZonedTimestampSqlType() );
 	}
 
-	@Override @SuppressWarnings("unchecked")
-	protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
-		return (TemporalJavaType<X>) this;
+	@Override
+	protected TemporalJavaType<ZonedDateTime> forTimestampPrecision(TypeConfiguration typeConfiguration) {
+		return this;
 	}
 
 	@Override
@@ -81,63 +85,64 @@ public ZonedDateTime fromString(CharSequence string) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> X unwrap(ZonedDateTime zonedDateTime, Class<X> type, WrapperOptions options) {
 		if ( zonedDateTime == null ) {
 			return null;
 		}
 
 		if ( ZonedDateTime.class.isAssignableFrom( type ) ) {
-			return (X) zonedDateTime;
+			return type.cast( zonedDateTime );
 		}
 
 		if ( OffsetDateTime.class.isAssignableFrom( type ) ) {
-			return (X) OffsetDateTime.of( zonedDateTime.toLocalDateTime(), zonedDateTime.getOffset() );
+			return type.cast( OffsetDateTime.of( zonedDateTime.toLocalDateTime(), zonedDateTime.getOffset() ) );
 		}
 
 		if ( Instant.class.isAssignableFrom( type ) ) {
-			return (X) zonedDateTime.toInstant();
+			return type.cast( zonedDateTime.toInstant() );
 		}
 
 		if ( Calendar.class.isAssignableFrom( type ) ) {
-			return (X) GregorianCalendar.from( zonedDateTime );
+			return type.cast( GregorianCalendar.from( zonedDateTime ) );
 		}
 
 		if ( Timestamp.class.isAssignableFrom( type ) ) {
-			/*
-			 * This works around two bugs:
-			 * - HHH-13266 (JDK-8061577): around and before 1900,
-			 * the number of milliseconds since the epoch does not mean the same thing
-			 * for java.util and java.time, so conversion must be done using the year, month, day, hour, etc.
-			 * - HHH-13379 (JDK-4312621): after 1908 (approximately),
-			 * Daylight Saving Time introduces ambiguity in the year/month/day/hour/etc representation once a year
-			 * (on DST end), so conversion must be done using the number of milliseconds since the epoch.
-			 * - around 1905, both methods are equally valid, so we don't really care which one is used.
-			 */
+			// This works around two bugs:
+			// - HHH-13266 (JDK-8061577): around and before 1900,
+			//   the number of milliseconds since the epoch does not mean the same thing
+			//   for java.util and java.time, so conversion must be done using the year,
+			//   month, day, hour, etc.
+			// - HHH-13379 (JDK-4312621): after 1908 (approximately),
+			//   Daylight Saving Time introduces ambiguity in the year/month/day/hour/etc
+			//   representation once a year (on DST end), so conversion must be done using
+			//   the number of milliseconds since the epoch.
+			// - around 1905, both methods are equally valid, so we don't really care which
+			//   one is used.
 			if ( zonedDateTime.getYear() < 1905 ) {
-				return (X) Timestamp.valueOf(
-						zonedDateTime.withZoneSameInstant( ZoneId.systemDefault() ).toLocalDateTime()
-				);
+				return type.cast( Timestamp.valueOf(
+						zonedDateTime.withZoneSameInstant( ZoneId.systemDefault() )
+								.toLocalDateTime()
+				) );
 			}
 			else {
-				return (X) Timestamp.from( zonedDateTime.toInstant() );
+				return type.cast( Timestamp.from( zonedDateTime.toInstant() ) );
 			}
 		}
 
 		if ( java.sql.Date.class.isAssignableFrom( type ) ) {
-			return (X) java.sql.Date.from( zonedDateTime.toInstant() );
+			return type.cast( java.sql.Date.from( zonedDateTime.toInstant() ) );
 		}
 
 		if ( java.sql.Time.class.isAssignableFrom( type ) ) {
-			return (X) java.sql.Time.from( zonedDateTime.toInstant() );
+			return type.cast( java.sql.Time.from( zonedDateTime.toInstant() ) );
 		}
 
 		if ( Date.class.isAssignableFrom( type ) ) {
-			return (X) Date.from( zonedDateTime.toInstant() );
+			return type.cast( Date.from( zonedDateTime.toInstant() ) );
 		}
 
 		if ( Long.class.isAssignableFrom( type ) ) {
-			return (X) Long.valueOf( zonedDateTime.toInstant().toEpochMilli() );
+			return type.cast( zonedDateTime.toInstant().toEpochMilli() );
 		}
 
 		throw unknownUnwrap( type );
@@ -162,22 +167,20 @@ public <X> ZonedDateTime wrap(X value, WrapperOptions options) {
 		}
 
 		if (value instanceof Timestamp timestamp) {
-			/*
-			 * This works around two bugs:
-			 * - HHH-13266 (JDK-8061577): around and before 1900,
-			 * the number of milliseconds since the epoch does not mean the same thing
-			 * for java.util and java.time, so conversion must be done using the year, month, day, hour, etc.
-			 * - HHH-13379 (JDK-4312621): after 1908 (approximately),
-			 * Daylight Saving Time introduces ambiguity in the year/month/day/hour/etc representation once a year
-			 * (on DST end), so conversion must be done using the number of milliseconds since the epoch.
-			 * - around 1905, both methods are equally valid, so we don't really care which one is used.
-			 */
-			if ( timestamp.getYear() < 5 ) { // Timestamp year 0 is 1900
-				return timestamp.toLocalDateTime().atZone( ZoneId.systemDefault() );
-			}
-			else {
-				return timestamp.toInstant().atZone( ZoneId.systemDefault() );
-			}
+			// This works around two bugs:
+			// - HHH-13266 (JDK-8061577): around and before 1900,
+			//   the number of milliseconds since the epoch does not mean the same thing
+			//   for java.util and java.time, so conversion must be done using the year,
+			//   month, day, hour, etc.
+			// - HHH-13379 (JDK-4312621): after 1908 (approximately),
+			//   Daylight Saving Time introduces ambiguity in the year/month/day/hour/etc
+			//   representation once a year (on DST end), so conversion must be done using
+			//   the number of milliseconds since the epoch.
+			// - around 1905, both methods are equally valid, so we don't really care which
+			//   one is used.
+			return timestamp.getYear() < 5 // Timestamp year 0 is 1900
+					? timestamp.toLocalDateTime().atZone( ZoneId.systemDefault() )
+					: timestamp.toInstant().atZone( ZoneId.systemDefault() );
 		}
 
 		if (value instanceof Date date) {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/BasicCollectionJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/BasicCollectionJavaType.java
index c0206a382371..fbc44a99a3c1 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/BasicCollectionJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/BasicCollectionJavaType.java
@@ -355,21 +355,18 @@ public <X> X unwrap(C value, Class<X> type, WrapperOptions options) {
 		}
 
 		if ( type.isInstance( value ) ) {
-			//noinspection unchecked
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( type == byte[].class ) {
 			// byte[] can only be requested if the value should be serialized
-			return (X) SerializationHelper.serialize( asArrayList( value ) );
+			return type.cast( SerializationHelper.serialize( asArrayList( value ) ) );
 		}
 		else if ( type == BinaryStream.class ) {
 			// BinaryStream can only be requested if the value should be serialized
-			//noinspection unchecked
-			return (X) new ArrayBackedBinaryStream( SerializationHelper.serialize( asArrayList( value ) ) );
+			return type.cast( new ArrayBackedBinaryStream( SerializationHelper.serialize( asArrayList( value ) ) ) );
 		}
 		else if ( type == Object[].class ) {
-			//noinspection unchecked
-			return (X) value.toArray();
+			return type.cast( value.toArray() );
 		}
 		else if ( Object[].class.isAssignableFrom( type ) ) {
 			final var preferredJavaTypeClass = type.getComponentType();
@@ -379,13 +376,11 @@ else if ( Object[].class.isAssignableFrom( type ) ) {
 				unwrapped[i] = componentJavaType.unwrap( element, preferredJavaTypeClass, options );
 				i++;
 			}
-			//noinspection unchecked
-			return (X) unwrapped;
+			return type.cast( unwrapped );
 		}
 		else if ( type.isArray() ) {
 			final var preferredJavaTypeClass = type.getComponentType();
-			//noinspection unchecked
-			final X unwrapped = (X) newInstance( preferredJavaTypeClass, value.size() );
+			final X unwrapped = type.cast( newInstance( preferredJavaTypeClass, value.size() ) );
 			int i = 0;
 			for ( E element : value ) {
 				set( unwrapped, i, componentJavaType.unwrap( element, preferredJavaTypeClass, options ) );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/CollectionJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/CollectionJavaType.java
index 7eba1547090f..417f4f051977 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/CollectionJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/CollectionJavaType.java
@@ -6,7 +6,6 @@
 
 import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.util.Map;
 import java.util.Objects;
 
@@ -55,17 +54,18 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 	public JavaType<C> createJavaType(
 			ParameterizedType parameterizedType,
 			TypeConfiguration typeConfiguration) {
-		final Type[] typeArguments = parameterizedType.getActualTypeArguments();
+		final var typeArguments = parameterizedType.getActualTypeArguments();
 		final var registry = typeConfiguration.getJavaTypeRegistry();
 		return switch ( semantics.getCollectionClassification() ) {
 			case ARRAY -> {
 				final var arrayClass = (Class<?>) parameterizedType.getRawType();
-				yield (JavaType<C>) new ArrayJavaType<>( registry.resolveDescriptor( arrayClass.getComponentType() ) );
+				yield (JavaType<C>)
+						new ArrayJavaType<>( registry.resolveDescriptor( arrayClass.getComponentType() ) );
 			}
 			case BAG, ID_BAG, LIST, SET, SORTED_SET, ORDERED_SET ->
 					new BasicCollectionJavaType(
 							parameterizedType,
-							registry.getDescriptor( typeArguments[typeArguments.length-1] ),
+							registry.resolveDescriptor( typeArguments[typeArguments.length-1] ),
 							semantics
 					);
 			case MAP, ORDERED_MAP, SORTED_MAP ->
@@ -74,8 +74,8 @@ public JavaType<C> createJavaType(
 							parameterizedType,
 							new MapMutabilityPlan(
 									(MapSemantics) semantics,
-									registry.getDescriptor( typeArguments[0] ),
-									registry.getDescriptor( typeArguments[typeArguments.length-1] )
+									registry.resolveDescriptor( typeArguments[0] ),
+									registry.resolveDescriptor( typeArguments[typeArguments.length-1] )
 							)
 					);
 		};
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java
index b5d5613c9fcb..4082f6c39538 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java
@@ -48,8 +48,8 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		// When the column is mapped as XML array, the component type must be SQLXML
 		final Integer explicitJdbcTypeCode = context.getExplicitJdbcTypeCode();
 		if ( explicitJdbcTypeCode != null && explicitJdbcTypeCode == SqlTypes.XML_ARRAY
-				// Also prefer XML as the Dialect prefers XML arrays
-				|| context.getDialect().getPreferredSqlTypeCodeForArray() == SqlTypes.XML_ARRAY ) {
+				// Also prefer XML if the Dialect prefers XML arrays
+				|| explicitJdbcTypeCode == null && context.getDialect().getPreferredSqlTypeCodeForArray() == SqlTypes.XML_ARRAY ) {
 			final var descriptor = context.getJdbcType( SqlTypes.SQLXML );
 			if ( descriptor != null ) {
 				return descriptor;
@@ -67,23 +67,10 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		);
 	}
 
-	@Override
-	public String toString(T value) {
-		return value.toString();
-	}
-
-	@Override
-	public T fromString(CharSequence string) {
-		throw new UnsupportedOperationException(
-				"Conversion from String strategy not known for this Java type: " + getTypeName()
-		);
-	}
-
 	@Override
 	public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
 		if ( type.isAssignableFrom( getJavaTypeClass() ) ) {
-			//noinspection unchecked
-			return (X) value;
+			return type.cast( value );
 		}
 		throw new UnsupportedOperationException(
 				"Unwrap strategy not known for this Java type: " + getTypeName()
@@ -95,13 +82,15 @@ public <X> T wrap(X value, WrapperOptions options) {
 		if ( value == null ) {
 			return null;
 		}
-		if ( getJavaTypeClass().isInstance( value ) ) {
-			//noinspection unchecked
-			return (T) value;
+		else {
+			final var javaTypeClass = getJavaTypeClass();
+			if ( javaTypeClass.isInstance( value ) ) {
+				return javaTypeClass.cast( value );
+			}
+			throw new UnsupportedOperationException(
+					"Wrap strategy not known for this Java type: " + getTypeName()
+			);
 		}
-		throw new UnsupportedOperationException(
-				"Wrap strategy not known for this Java type: " + getTypeName()
-		);
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java
index 07114c69110f..b810d42f178f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EntityJavaType.java
@@ -11,6 +11,7 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 
+import static java.lang.System.identityHashCode;
 import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 
 /**
@@ -21,19 +22,22 @@
 public class EntityJavaType<T> extends AbstractClassJavaType<T> {
 
 	public EntityJavaType(Class<T> type, MutabilityPlan<T> mutabilityPlan) {
-		super( type, mutabilityPlan , IncomparableComparator.INSTANCE );
+		super( type, mutabilityPlan, IncomparableComparator.INSTANCE );
 	}
 
 	@Override
 	public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
-		throw new JdbcTypeRecommendationException(
-				"Could not determine recommended JdbcType for '" + getTypeName() + "'"
-		);
+		return context.getTypeConfiguration().getSessionFactory()
+				.getMappingMetamodel()
+				.getEntityDescriptor(getJavaTypeClass())
+				.getIdentifierDescriptor()
+				.getJavaType()
+				.getRecommendedJdbcType( context );
 	}
 
 	@Override
 	public int extractHashCode(T value) {
-		return System.identityHashCode( value );
+		return identityHashCode( value );
 	}
 
 	@Override
@@ -54,30 +58,32 @@ public boolean isInstance(Object value) {
 		}
 	}
 
-	@Override
-	public String toString(T value) {
-		return value.toString();
-	}
-
-	@Override
-	public T fromString(CharSequence string) {
-		throw new UnsupportedOperationException(
-				"Conversion from String strategy not known for this Java type: " + getTypeName()
-		);
-	}
-
 	@Override
 	public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
-		throw new UnsupportedOperationException(
-				"Unwrap strategy not known for this Java type: " + getTypeName()
-		);
+		final var id =
+				options.getSessionFactory().getMappingMetamodel()
+						.getEntityDescriptor( getJavaTypeClass() )
+						.getIdentifier( value );
+		if ( !type.isInstance( id ) ) {
+			throw new IllegalArgumentException( "Id not an instance of type " + type.getName() );
+		}
+		return type.cast( value );
 	}
 
 	@Override
 	public <X> T wrap(X value, WrapperOptions options) {
-		throw new UnsupportedOperationException(
-				"Wrap strategy not known for this Java type: " + getTypeName()
-		);
+		final var entityClass = getJavaTypeClass();
+		final var persister =
+				options.getSessionFactory().getMappingMetamodel()
+						.getEntityDescriptor( entityClass );
+		final var idType = persister.getIdentifierType().getReturnedClass();
+		if ( !idType.isInstance( value ) ) {
+			throw new IllegalArgumentException( "Not an instance of id type " + idType.getName() );
+		}
+		final var entity =
+				options.getSession()
+						.internalLoad( persister.getEntityName(), value, false, true );
+		return entityClass.cast( entity );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/FormatMapperBasedJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/FormatMapperBasedJavaType.java
index e2dc208d72b7..7f0d208c8bc1 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/FormatMapperBasedJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/FormatMapperBasedJavaType.java
@@ -65,13 +65,11 @@ public T fromString(CharSequence string) {
 	@Override
 	public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
 		if ( type.isAssignableFrom( getJavaTypeClass() ) ) {
-			//noinspection unchecked
-			return (X) value;
+			return type.cast( value );
 		}
 		else if ( type == String.class ) {
-			//noinspection unchecked
-			return (X) getFormatMapper( typeConfiguration )
-					.toString( value, this, options );
+			return type.cast( getFormatMapper( typeConfiguration )
+					.toString( value, this, options ) );
 		}
 		throw new UnsupportedOperationException(
 				"Unwrap strategy not known for this Java type: " + getTypeName()
@@ -80,9 +78,9 @@ else if ( type == String.class ) {
 
 	@Override
 	public <X> T wrap(X value, WrapperOptions options) {
-		if ( getJavaTypeClass().isInstance( value ) ) {
-			//noinspection unchecked
-			return (T) value;
+		final var javaTypeClass = getJavaTypeClass();
+		if ( javaTypeClass.isInstance( value ) ) {
+			return javaTypeClass.cast( value );
 		}
 		else if ( value instanceof String string ) {
 			return getFormatMapper( typeConfiguration )
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java
index 44e1bf3fa45f..fe24516b513e 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeBasicAdaptor.java
@@ -37,18 +37,6 @@ public boolean useObjectEqualsHashCode() {
 		return true;
 	}
 
-	@Override
-	public String toString(T value) {
-		return value.toString();
-	}
-
-	@Override
-	public T fromString(CharSequence string) {
-		throw new UnsupportedOperationException(
-				"Conversion from String strategy not known for this Java type: " + getTypeName()
-		);
-	}
-
 	@Override
 	public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
 		throw new UnsupportedOperationException(
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeRegistry.java
index d4f9a95dcc22..bc1e79b3b21d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/JavaTypeRegistry.java
@@ -4,6 +4,15 @@
  */
 package org.hibernate.type.descriptor.java.spi;
 
+import org.hibernate.Internal;
+import org.hibernate.type.descriptor.java.ArrayJavaType;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.java.MutabilityPlan;
+import org.hibernate.type.descriptor.java.MutableMutabilityPlan;
+import org.hibernate.type.spi.TypeConfiguration;
+import org.hibernate.type.spi.TypeConfigurationAware;
+import org.jboss.logging.Logger;
+
 import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -12,14 +21,8 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import org.hibernate.type.descriptor.java.ArrayJavaType;
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.java.MutabilityPlan;
-import org.hibernate.type.descriptor.java.MutableMutabilityPlan;
-import org.hibernate.type.spi.TypeConfiguration;
-import org.hibernate.type.spi.TypeConfigurationAware;
+import static org.hibernate.internal.util.type.PrimitiveWrappers.canonicalize;
 
-import org.jboss.logging.Logger;
 
 /**
  * A registry mapping {@link Class Java classes} to implementations
@@ -47,10 +50,11 @@ public JavaTypeRegistry(TypeConfiguration typeConfiguration) {
 
 	@Override
 	public void addBaselineDescriptor(JavaType<?> descriptor) {
-		if ( descriptor.getJavaType() == null ) {
+		final var javaType = descriptor.getJavaType();
+		if ( javaType == null ) {
 			throw new IllegalStateException( "Illegal to add BasicJavaType with null Java type" );
 		}
-		addBaselineDescriptor( descriptor.getJavaType(), descriptor );
+		addBaselineDescriptor( javaType, descriptor );
 	}
 
 	@Override
@@ -75,11 +79,12 @@ public void forEachDescriptor(Consumer<JavaType<?>> consumer) {
 	}
 
 	public void addDescriptor(JavaType<?> descriptor) {
-		final JavaType<?> old = descriptorsByTypeName.put( descriptor.getJavaType().getTypeName(), descriptor );
+		final var javaType = descriptor.getJavaType();
+		final var old = descriptorsByTypeName.put( javaType.getTypeName(), descriptor );
 		if ( old != null ) {
 			LOG.debugf(
 					"JavaTypeRegistry entry replaced : %s -> %s (was %s)",
-					descriptor.getJavaType(),
+					javaType,
 					descriptor,
 					old
 			);
@@ -87,7 +92,10 @@ public void addDescriptor(JavaType<?> descriptor) {
 		performInjections( descriptor );
 	}
 
-	@Deprecated(since = "7.2") // Due to unbound type parameter
+	// This method is terribly lacking in type safety but
+	// has wormed itself into so many clients that I can't
+	// easily do away with it right now
+	@Deprecated(since = "7.2") // Due to unbound type parameter and unchecked cast
 	public <T> JavaType<T> getDescriptor(Type javaType) {
 		//noinspection unchecked
 		return (JavaType<T>) resolveDescriptor( javaType );
@@ -97,14 +105,31 @@ public JavaType<?> findDescriptor(Type javaType) {
 		return descriptorsByTypeName.get( javaType.getTypeName() );
 	}
 
-	public <J> JavaType<J> findDescriptor(Class<J> javaType) {
-		//noinspection unchecked
-		return (JavaType<J>) findDescriptor( (Type) javaType );
+	public <J> JavaType<J> findDescriptor(Class<J> javaClass) {
+		final var cached = descriptorsByTypeName.get( javaClass.getTypeName() );
+		return cached == null ? null : checkCached( javaClass, cached );
 	}
 
 	public <J> JavaType<J> resolveDescriptor(Class<? extends J> javaType, Supplier<JavaType<J>> creator) {
-		//noinspection unchecked
-		return (JavaType<J>) resolveDescriptor( javaType.getTypeName(), creator );
+		final String javaTypeName = javaType.getTypeName();
+		final var cached = descriptorsByTypeName.get( javaTypeName );
+		if ( cached != null ) {
+			return checkCached( javaType, cached );
+		}
+		else {
+			final var created = creator.get();
+			final var cachedNew = descriptorsByTypeName.putIfAbsent( javaTypeName, created );
+			return cachedNew == null ? created : checkCached( javaType, cachedNew );
+		}
+	}
+
+	private static <J> JavaType<J> checkCached(Class<? extends J> javaClass, JavaType<?> cached) {
+		if ( cached.getJavaTypeClass() != canonicalize( javaClass ) ) {
+			throw new IllegalStateException( "Type registration was corrupted for: " + javaClass.getName() );
+		}
+		@SuppressWarnings("unchecked") // safe, we just checked
+		final var resolvedType = (JavaType<J>) cached;
+		return resolvedType;
 	}
 
 	@Deprecated(since = "7.2", forRemoval = true) // Can be private
@@ -115,8 +140,8 @@ private JavaType<?> resolveDescriptor(String javaTypeName, Supplier<? extends Ja
 		}
 		else {
 			final var created = creator.get();
-			descriptorsByTypeName.put( javaTypeName, created );
-			return created;
+			final var cachedNew = descriptorsByTypeName.putIfAbsent( javaTypeName, created );
+			return cachedNew == null ? created : cachedNew;
 		}
 	}
 
@@ -125,25 +150,18 @@ public JavaType<?> resolveDescriptor(Type javaType) {
 	}
 
 	public <J> JavaType<J> resolveDescriptor(Class<J> javaType) {
-		//noinspection unchecked
-		return (JavaType<J>) resolveDescriptor( javaType, JavaTypeRegistry::createMutabilityPlan );
+		return resolveDescriptor( javaType, JavaTypeRegistry::createMutabilityPlan );
 	}
 
 	public <J> JavaType<J> resolveDescriptor(JavaType<J> javaType) {
-		//noinspection unchecked
-		return (JavaType<J>) resolveDescriptor( javaType.getJavaTypeClass().getTypeName(), () -> javaType );
+		return resolveDescriptor( javaType.getJavaTypeClass(), () -> javaType );
 	}
 
 	private static MutabilityPlan<?> createMutabilityPlan(Type elementJavaType, TypeConfiguration typeConfiguration) {
-		final MutabilityPlan<?> determinedPlan = RegistryHelper.INSTANCE.determineMutabilityPlan(
-				elementJavaType,
-				typeConfiguration
-		);
-		if ( determinedPlan != null ) {
-			return determinedPlan;
-		}
+		final var determinedPlan =
+				RegistryHelper.INSTANCE.determineMutabilityPlan( elementJavaType, typeConfiguration );
+		return determinedPlan != null ? determinedPlan : MutableMutabilityPlan.instance();
 
-		return MutableMutabilityPlan.INSTANCE;
 	}
 
 	public <T> JavaType<T[]> resolveArrayDescriptor(Class<T> elementJavaType) {
@@ -153,10 +171,34 @@ public <T> JavaType<T[]> resolveArrayDescriptor(Class<T> elementJavaType) {
 						() -> createArrayTypeDescriptor( elementJavaType, JavaTypeRegistry::createMutabilityPlan) );
 	}
 
-	@Deprecated(since = "7.2", forRemoval = true) // Can be private
+	// WAS:
+//	public <T> JavaType<T[]> resolveArrayDescriptor(Class<T> elementJavaType) {
+//		return resolveDescriptor( arrayClass( elementJavaType ),
+//				() -> createArrayTypeDescriptor( elementJavaType, JavaTypeRegistry::createMutabilityPlan) );
+//	}
+
+	@Internal @FunctionalInterface
+	public interface MutabilityPlanCreator {
+		MutabilityPlan<?> create(Type elementJavaType, TypeConfiguration typeConfiguration);
+	}
+
+	@Internal // Can be demoted to private
+	public <J> JavaType<J> resolveDescriptor(
+			Class<J> javaType,
+			MutabilityPlanCreator mutabilityPlanCreator) {
+		//noinspection unchecked
+		return resolveDescriptor(
+				javaType,
+				() -> javaType.isArray()
+						? (JavaType<J>) createArrayTypeDescriptor( javaType.getComponentType(), mutabilityPlanCreator )
+						: createTypeDescriptor( javaType, mutabilityPlanCreator )
+		);
+	}
+
+	@Internal // Can be demoted to private
 	public JavaType<?> resolveDescriptor(
 			Type javaType,
-			BiFunction<Type, TypeConfiguration, MutabilityPlan<?>> mutabilityPlanCreator) {
+			MutabilityPlanCreator mutabilityPlanCreator) {
 		return resolveDescriptor(
 				javaType.getTypeName(),
 				() -> {
@@ -174,42 +216,71 @@ else if ( javaType instanceof Class<?> javaClass && javaClass.isArray() ) {
 		);
 	}
 
-	private <J> JavaType<J[]> createArrayTypeDescriptor(Class<J> elementJavaType, BiFunction<Type, TypeConfiguration, MutabilityPlan<?>> mutabilityPlanCreator) {
-		JavaType<J> elementTypeDescriptor = findDescriptor( elementJavaType );
+	private <J> JavaType<J[]> createArrayTypeDescriptor(
+			Class<J> elementJavaType,
+			MutabilityPlanCreator mutabilityPlanCreator) {
+		var elementTypeDescriptor = findDescriptor( elementJavaType );
 		if ( elementTypeDescriptor == null ) {
 			elementTypeDescriptor = createTypeDescriptor( elementJavaType, mutabilityPlanCreator );
 		}
 		return new ArrayJavaType<>( elementTypeDescriptor );
 	}
 
-	private <J> JavaType<J> createTypeDescriptor(Type javaType, BiFunction<Type, TypeConfiguration, MutabilityPlan<?>> mutabilityPlanCreator) {
+	private <J> JavaType<J> createTypeDescriptor(
+			Type javaType,
+			MutabilityPlanCreator mutabilityPlanCreator) {
 		//noinspection unchecked
 		return RegistryHelper.INSTANCE.createTypeDescriptor(
 				javaType,
-				() -> (MutabilityPlan<J>) mutabilityPlanCreator.apply( javaType, typeConfiguration ),
+				() -> (MutabilityPlan<J>)
+						mutabilityPlanCreator.create( javaType, typeConfiguration ),
 				typeConfiguration
 		);
 	}
 
-	public JavaType<?> resolveManagedTypeDescriptor(Type javaType) {
-		return resolveManagedTypeDescriptor( javaType, false );
+	public <J> JavaType<J> resolveManagedTypeDescriptor(Class<J> javaType) {
+		return resolveManagedTypeDescriptor( javaType, JavaTypeBasicAdaptor::new );
 	}
 
-	public <J> JavaType<J> resolveManagedTypeDescriptor(Class<J> javaType) {
-		//noinspection unchecked
-		return (JavaType<J>) resolveManagedTypeDescriptor( javaType, false );
+	public <J> JavaType<J> resolveEntityTypeDescriptor(Class<J> javaType) {
+		return resolveManagedTypeDescriptor( javaType, EntityJavaType::new );
 	}
 
-	public JavaType<?> resolveEntityTypeDescriptor(Type javaType) {
-		return resolveManagedTypeDescriptor( javaType, true );
+	private <J> JavaType<J> resolveManagedTypeDescriptor(
+			Class<J> javaType,
+			BiFunction<Class<J>, MutabilityPlan<J>, JavaType<J>> instantiate) {
+		return resolveDescriptor(
+				javaType,
+				() -> {
+					final var determinedPlan =
+							RegistryHelper.INSTANCE.determineMutabilityPlan( javaType, typeConfiguration );
+					return instantiate.apply(
+							javaType,
+							determinedPlan != null
+									? determinedPlan
+									: MutableMutabilityPlan.instance()
+					);
+				}
+		);
 	}
 
-	public <J> JavaType<J> resolveEntityTypeDescriptor(Class<J> javaType) {
-		//noinspection unchecked
-		return (JavaType<J>) resolveManagedTypeDescriptor( javaType, true );
+	// CAN BE REMOVED:
+
+	@Deprecated(since = "7.2", forRemoval = true) // no longer used
+	public JavaType<?> resolveManagedTypeDescriptor(Type javaType) {
+		return resolveManagedTypeDescriptor( javaType, JavaTypeBasicAdaptor::new );
 	}
 
-	private <J> JavaType<?> resolveManagedTypeDescriptor(Type javaType, boolean entity) {
+	@Deprecated(since = "7.2", forRemoval = true) // no longer used
+	public JavaType<?> resolveEntityTypeDescriptor(Type javaType) {
+		return resolveManagedTypeDescriptor( javaType, EntityJavaType::new );
+	}
+
+	@Deprecated(since = "7.2", forRemoval = true) // no longer used
+	@SuppressWarnings("unchecked")
+	private <J> JavaType<?> resolveManagedTypeDescriptor(
+			Type javaType,
+			BiFunction<Class<J>, MutabilityPlan<J>, JavaType<J>> instantiate) {
 		return resolveDescriptor(
 				javaType.getTypeName(),
 				() -> {
@@ -222,18 +293,14 @@ private <J> JavaType<?> resolveManagedTypeDescriptor(Type javaType, boolean enti
 						javaTypeClass = (Class<J>) parameterizedType.getRawType();
 					}
 
-					final MutabilityPlan<J> determinedPlan = RegistryHelper.INSTANCE.determineMutabilityPlan(
-							javaType,
-							typeConfiguration
-					);
-					final MutabilityPlan<J> mutabilityPlan =
+					final var determinedPlan =
+							RegistryHelper.INSTANCE.determineMutabilityPlan( javaTypeClass, typeConfiguration );
+					return instantiate.apply(
+							javaTypeClass,
 							determinedPlan != null
 									? determinedPlan
-									: (MutabilityPlan<J>) MutableMutabilityPlan.INSTANCE;
-
-					return entity
-							? new EntityJavaType<>( javaTypeClass, mutabilityPlan )
-							: new JavaTypeBasicAdaptor<>( javaTypeClass, mutabilityPlan );
+									: MutableMutabilityPlan.instance()
+					);
 				}
 		);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java
index 833cb7cb65b9..0690edf93de8 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/MapEntryJavaType.java
@@ -31,11 +31,6 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		throw new UnsupportedOperationException( "Unsupported attempt to resolve JDBC type for Map.Entry" );
 	}
 
-	@Override
-	public Map.Entry fromString(CharSequence string) {
-		throw new UnsupportedOperationException( "Unsupported attempt create Map.Entry from String" );
-	}
-
 	@Override
 	public <X> X unwrap(Map.Entry value, Class<X> type, WrapperOptions options) {
 		throw new UnsupportedOperationException( "Unsupported attempt to unwrap Map.Entry value" );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/RegistryHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/RegistryHelper.java
index 37f18bfd1473..1eda91306014 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/RegistryHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/RegistryHelper.java
@@ -12,6 +12,7 @@
 import org.hibernate.annotations.Immutable;
 import org.hibernate.annotations.Mutability;
 import org.hibernate.internal.util.ReflectHelper;
+import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.EnumJavaType;
 import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
 import org.hibernate.type.descriptor.java.JavaType;
@@ -36,27 +37,37 @@ public <J> JavaType<J> createTypeDescriptor(
 			Type javaType,
 			Supplier<MutabilityPlan<J>> fallbackMutabilityPlanResolver,
 			TypeConfiguration typeConfiguration) {
-		return createTypeDescriptor(
-				javaType,
-				(javaTypeClass) -> {
-					MutabilityPlan<J> mutabilityPlan = determineMutabilityPlan( javaType, typeConfiguration );
-					if ( mutabilityPlan == null ) {
-						mutabilityPlan = fallbackMutabilityPlanResolver.get();
-					}
-					return mutabilityPlan;
-				}
-		);
+		return createTypeDescriptor( determineJavaTypeClass( javaType ),
+				javaTypeClass -> mutabilityPlan( javaTypeClass, fallbackMutabilityPlanResolver, typeConfiguration ) );
 	}
 
-	public <J> MutabilityPlan<J> determineMutabilityPlan(Type javaType, TypeConfiguration typeConfiguration) {
-		final Class<J> javaTypeClass = determineJavaTypeClass( javaType );
+	public <J> JavaType<J> createTypeDescriptor(
+			Class<J> javaType,
+			Supplier<MutabilityPlan<J>> fallbackMutabilityPlanResolver,
+			TypeConfiguration typeConfiguration) {
+		return createTypeDescriptor( javaType,
+				javaTypeClass -> mutabilityPlan( javaTypeClass, fallbackMutabilityPlanResolver, typeConfiguration ) );
+	}
 
+	private <J> MutabilityPlan<J> mutabilityPlan(
+			Class<J> javaTypeClass,
+			Supplier<MutabilityPlan<J>> fallbackMutabilityPlanResolver,
+			TypeConfiguration typeConfiguration) {
+		var mutabilityPlan = determineMutabilityPlan( javaTypeClass, typeConfiguration );
+		return mutabilityPlan == null ? fallbackMutabilityPlanResolver.get() : mutabilityPlan;
+	}
+
+	public MutabilityPlan<?> determineMutabilityPlan(Type javaType, TypeConfiguration typeConfiguration) {
+		return determineMutabilityPlan( determineJavaTypeClass( javaType ), typeConfiguration );
+	}
+
+	public <J> MutabilityPlan<J> determineMutabilityPlan(Class<J> javaTypeClass, TypeConfiguration typeConfiguration) {
 		if ( javaTypeClass.isAnnotationPresent( Immutable.class ) ) {
 			return ImmutableMutabilityPlan.instance();
 		}
 
 		if ( javaTypeClass.isAnnotationPresent( Mutability.class ) ) {
-			final Mutability annotation = javaTypeClass.getAnnotation( Mutability.class );
+			final var annotation = javaTypeClass.getAnnotation( Mutability.class );
 			return typeConfiguration.createMutabilityPlan( annotation.value() );
 		}
 
@@ -67,29 +78,26 @@ public <J> MutabilityPlan<J> determineMutabilityPlan(Type javaType, TypeConfigur
 		if ( Serializable.class.isAssignableFrom( javaTypeClass ) ) {
 			return (MutabilityPlan<J>) SerializableJavaType.SerializableMutabilityPlan.INSTANCE;
 		}
-
 		return null;
 	}
 
-	private  <J> JavaType<J> createTypeDescriptor(
-			Type javaType,
-			Function<Class<J>,MutabilityPlan<J>> mutabilityPlanResolver) {
-		final Class<J> javaTypeClass = determineJavaTypeClass( javaType );
-
+	private <J> BasicJavaType<J> createTypeDescriptor(
+			Class<J> javaTypeClass,
+			Function<Class<J>, MutabilityPlan<J>> mutabilityPlanResolver) {
 		if ( javaTypeClass.isEnum() ) {
 			// enums are unequivocally immutable
 			//noinspection rawtypes, unchecked
 			return new EnumJavaType( javaTypeClass );
 		}
 
-		final MutabilityPlan<J> plan = mutabilityPlanResolver.apply( javaTypeClass );
+		final var plan = mutabilityPlanResolver.apply( javaTypeClass );
 
 		if ( Serializable.class.isAssignableFrom( javaTypeClass ) ) {
 			//noinspection rawtypes, unchecked
 			return new SerializableJavaType( javaTypeClass, plan );
 		}
 
-		return new UnknownBasicJavaType<>( javaType, plan );
+		return new UnknownBasicJavaType<>( javaTypeClass, plan );
 	}
 
 	private <J> Class<J> determineJavaTypeClass(Type javaType) {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java
index 96ec9049b3b7..a4bf77cb7c21 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/UnknownBasicJavaType.java
@@ -61,23 +61,10 @@ public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
 		);
 	}
 
-	@Override
-	public String toString(T value) {
-		return value.toString();
-	}
-
-	@Override
-	public T fromString(CharSequence string) {
-		throw new UnsupportedOperationException(
-				"Conversion from String strategy not known for this Java type: " + getTypeName()
-		);
-	}
-
 	@Override
 	public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
 		if ( type.isAssignableFrom( getJavaTypeClass() ) ) {
-			//noinspection unchecked
-			return (X) value;
+			return type.cast( value );
 		}
 		throw new UnsupportedOperationException(
 				"Unwrap strategy not known for this Java type: " + getTypeName()
@@ -86,9 +73,9 @@ public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
 
 	@Override
 	public <X> T wrap(X value, WrapperOptions options) {
-		if ( getJavaTypeClass().isInstance( value ) ) {
-			//noinspection unchecked
-			return (T) value;
+		final var javaTypeClass = getJavaTypeClass();
+		if ( javaTypeClass.isInstance( value ) ) {
+			return javaTypeClass.cast( value );
 		}
 		throw new UnsupportedOperationException(
 				"Wrap strategy not known for this Java type: " + getTypeName()
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcType.java
index 2c1e3f9b7b32..5c69dce933a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcType.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.type.descriptor.jdbc;
 
-import java.lang.reflect.Array;
 import java.lang.reflect.Type;
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
@@ -12,11 +11,11 @@
 import java.sql.SQLException;
 import java.sql.Types;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.build.AllowReflection;
-import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.type.BasicPluralType;
 import org.hibernate.type.descriptor.ValueBinder;
 import org.hibernate.type.descriptor.ValueExtractor;
@@ -27,12 +26,12 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.descriptor.jdbc.internal.JdbcLiteralFormatterArray;
-import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import org.hibernate.type.internal.BasicTypeImpl;
 import org.hibernate.type.internal.ParameterizedTypeImpl;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import static java.lang.reflect.Array.newInstance;
+import static java.lang.reflect.Array.get;
+import static java.lang.reflect.Array.getLength;
 import static org.hibernate.type.descriptor.jdbc.StructHelper.instantiate;
 
 /**
@@ -60,31 +59,31 @@ public JdbcType getElementJdbcType() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		final JavaType<?> elementJavaType =
-				elementJdbcType.getJdbcRecommendedJavaTypeMapping( precision, scale, typeConfiguration );
+		final var elementJavaType =
+				elementJdbcType.getRecommendedJavaType( precision, scale, typeConfiguration );
 		final var javaType =
 				typeConfiguration.getJavaTypeRegistry()
-						.resolveDescriptor( newInstance( elementJavaType.getJavaTypeClass(), 0 ).getClass() );
+						.resolveDescriptor( elementJavaType.getJavaTypeClass().arrayType() );
 		if ( javaType instanceof BasicPluralType<?, ?> ) {
-			//noinspection unchecked
-			return (JavaType<T>) javaType;
+			return javaType;
 		}
 		else {
-			//noinspection unchecked
-			return (JavaType<T>) javaType.createJavaType(
-					new ParameterizedTypeImpl( javaType.getJavaTypeClass(), new Type[0], null ),
-					typeConfiguration
-			);
+			final var parameterizedType =
+					new ParameterizedTypeImpl( javaType.getJavaTypeClass(),
+							new Type[0], null );
+			return javaType.createJavaType( parameterizedType, typeConfiguration );
 		}
 	}
 
 	protected static JavaType<?> elementJavaType(JavaType<?> javaTypeDescriptor) {
-		if ( javaTypeDescriptor instanceof ByteArrayJavaType || javaTypeDescriptor instanceof PrimitiveByteArrayJavaType ) {
-			// Special handling needed for Byte[] and byte[], because that would conflict with the VARBINARY mapping
+		if ( javaTypeDescriptor instanceof ByteArrayJavaType
+			|| javaTypeDescriptor instanceof PrimitiveByteArrayJavaType ) {
+			// Special handling needed for Byte[] and byte[],
+			// because that would conflict with the VARBINARY mapping
 			return ByteJavaType.INSTANCE;
 		}
 		else if ( javaTypeDescriptor instanceof BasicPluralJavaType<?> basicPluralJavaType ) {
@@ -112,11 +111,11 @@ protected String getElementTypeName(JavaType<?> javaType, SharedSessionContractI
 		if ( elementJdbcType instanceof StructuredJdbcType structJdbcType ) {
 			return structJdbcType.getStructTypeName();
 		}
-		final JavaType<?> elementJavaType = elementJavaType( javaType );
+		final var elementJavaType = elementJavaType( javaType );
 		final Size size =
 				session.getJdbcServices().getDialect().getSizeStrategy()
 						.resolveSize( elementJdbcType, elementJavaType, null, null, null );
-		final DdlTypeRegistry ddlTypeRegistry = session.getTypeConfiguration().getDdlTypeRegistry();
+		final var ddlTypeRegistry = session.getTypeConfiguration().getDdlTypeRegistry();
 		final String typeName =
 				ddlTypeRegistry.getDescriptor( elementJdbcType.getDdlTypeCode() )
 						.getTypeName( size, new BasicTypeImpl<>( elementJavaType, elementJdbcType), ddlTypeRegistry );
@@ -135,106 +134,125 @@ protected String getElementTypeName(JavaType<?> javaType, SharedSessionContractI
 		}
 	}
 
-	protected <T> Object[] getArray(BasicBinder<?> binder, ValueBinder<T> elementBinder, T value, WrapperOptions options)
-			throws SQLException {
-		final var elementJdbcType = ( (ArrayJdbcType) binder.getJdbcType() ).getElementJdbcType();
-		//noinspection unchecked
-		final JavaType<T> javaType = (JavaType<T>) binder.getJavaType();
+	protected <T,E> Object[] convertToArray(
+			BasicBinder<T> binder,
+			ValueBinder<E> elementBinder,
+			BasicPluralJavaType<E> pluralJavaType,
+			T value,
+			WrapperOptions options)
+					throws SQLException {
+		final var elementJdbcType = this.getElementJdbcType();
+		final var javaType = binder.getJavaType();
 		if ( elementJdbcType instanceof AggregateJdbcType ) {
-			final T[] domainObjects = (T[]) javaType.unwrap( value, Object[].class, options );
-			final Object[] objects = new Object[domainObjects.length];
+			final var domainObjects = javaType.unwrap( value, Object[].class, options );
+			final var objects = new Object[domainObjects.length];
 			for ( int i = 0; i < domainObjects.length; i++ ) {
 				if ( domainObjects[i] != null ) {
-					objects[i] = elementBinder.getBindValue( domainObjects[i], options );
+					final E element =
+							pluralJavaType.getElementJavaType()
+									.cast( domainObjects[i] );
+					objects[i] = elementBinder.getBindValue( element, options );
 				}
 			}
 			return objects;
 		}
 		else {
-			final var typeConfiguration = options.getTypeConfiguration();
-			final var underlyingJdbcType =
-					typeConfiguration.getJdbcTypeRegistry()
-							.getDescriptor( elementJdbcType.getDefaultSqlTypeCode() );
-			final Class<?> preferredJavaTypeClass = elementJdbcType.getPreferredJavaTypeClass( options );
-			final Class<?> elementJdbcJavaTypeClass =
-					preferredJavaTypeClass == null
-							? underlyingJdbcType.getJdbcRecommendedJavaTypeMapping(null, null, typeConfiguration )
-									.getJavaTypeClass()
-							: preferredJavaTypeClass;
-			final var arrayClass = (Class<? extends Object[]>)
-					newInstance( elementJdbcJavaTypeClass, 0 ).getClass();
+			final var arrayClass =
+					(Class<? extends Object[]>)
+							elementJdbcJavaTypeClass( options, elementJdbcType )
+									.arrayType();
 			return javaType.unwrap( value, arrayClass, options );
 		}
 	}
 
+	private static Class<?> elementJdbcJavaTypeClass(WrapperOptions options, JdbcType elementJdbcType) {
+		final var typeConfiguration = options.getTypeConfiguration();
+		final var preferredJavaTypeClass = elementJdbcType.getPreferredJavaTypeClass( options );
+		return preferredJavaTypeClass != null
+				? preferredJavaTypeClass
+				: typeConfiguration.getJdbcTypeRegistry()
+						.getDescriptor( elementJdbcType.getDefaultSqlTypeCode() )
+						.getRecommendedJavaType( null, null, typeConfiguration )
+						.getJavaTypeClass();
+	}
+
 	protected <X> X getArray(BasicExtractor<X> extractor, java.sql.Array array, WrapperOptions options)
 			throws SQLException {
-		final JavaType<X> javaType = extractor.getJavaType();
-		if (array != null
+		final var javaType = extractor.getJavaType();
+		return array != null
 			&& getElementJdbcType() instanceof AggregateJdbcType aggregateJdbcType
-			&& aggregateJdbcType.getEmbeddableMappingType() != null) {
+			&& aggregateJdbcType.getEmbeddableMappingType() != null
+				? javaType.wrap( toJavaArray( array, options, aggregateJdbcType ), options )
+				: javaType.wrap( array, options );
+	}
 
-			final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
-			final Object rawArray = array.getArray();
-			final Object[] domainObjects = new Object[Array.getLength( rawArray )];
-			for ( int i = 0; i < domainObjects.length; i++ ) {
-				final Object rawJdbcValue = Array.get( rawArray, i );
-				if ( rawJdbcValue == null ) {
-					domainObjects[i] = null;
-				}
-				else {
-					final Object[] aggregateRawValues = aggregateJdbcType.extractJdbcValues( rawJdbcValue, options );
-					final StructAttributeValues attributeValues =
-							StructHelper.getAttributeValues( embeddableMappingType, aggregateRawValues, options );
-					domainObjects[i] = instantiate( embeddableMappingType, attributeValues );
-				}
+	private static Object @NonNull [] toJavaArray(
+			java.sql.Array array,
+			WrapperOptions options,
+			AggregateJdbcType aggregateJdbcType)
+			throws SQLException {
+		final var embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
+		final Object rawArray = array.getArray();
+		final var domainObjects = new Object[ getLength( rawArray ) ];
+		for ( int i = 0; i < domainObjects.length; i++ ) {
+			final Object rawJdbcValue = get( rawArray, i );
+			if ( rawJdbcValue == null ) {
+				domainObjects[i] = null;
+			}
+			else {
+				final var aggregateRawValues = aggregateJdbcType.extractJdbcValues( rawJdbcValue, options );
+				domainObjects[i] = instantiate( embeddableMappingType,
+						StructHelper.getAttributeValues( embeddableMappingType, aggregateRawValues, options ) );
 			}
-			return javaType.wrap( domainObjects, options );
-		}
-		else {
-			return javaType.wrap( array, options );
 		}
+		return domainObjects;
 	}
 
 	@Override
 	public <X> ValueBinder<X> getBinder(final JavaType<X> javaTypeDescriptor) {
-		@SuppressWarnings("unchecked")
-		final BasicPluralJavaType<X> pluralJavaType = (BasicPluralJavaType<X>) javaTypeDescriptor;
-		final ValueBinder<X> elementBinder = elementJdbcType.getBinder( pluralJavaType.getElementJavaType() );
-		return new BasicBinder<>( javaTypeDescriptor, this ) {
+		return new Binder<>( javaTypeDescriptor,
+				(BasicPluralJavaType<?>) javaTypeDescriptor );
+	}
 
-			@Override
-			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
-				st.setArray( index, getArray( value, options ) );
-			}
+	private class Binder<X,E> extends BasicBinder<X> {
+		private final BasicPluralJavaType<E> pluralJavaType;
 
-			@Override
-			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
-					throws SQLException {
-				final java.sql.Array array = getArray( value, options );
-				try {
-					st.setObject( name, array, java.sql.Types.ARRAY );
-				}
-				catch (SQLException ex) {
-					throw new HibernateException( "JDBC driver does not support named parameters for setArray. Use positional.", ex );
-				}
-			}
+		private Binder(JavaType<X> javaType, BasicPluralJavaType<E> pluralJavaType) {
+			super( javaType, ArrayJdbcType.this );
+			this.pluralJavaType = pluralJavaType;
+		}
 
-			@Override
-			public Object getBindValue(X value, WrapperOptions options) throws SQLException {
-				return ( (ArrayJdbcType) getJdbcType() ).getArray( this, elementBinder, value, options );
+		@Override
+		protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
+				throws SQLException {
+			st.setArray( index, getArray( value, options ) );
+		}
+
+		@Override
+		protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+				throws SQLException {
+			final var array = getArray( value, options );
+			try {
+				st.setObject( name, array, Types.ARRAY );
+			}
+			catch (SQLException ex) {
+				throw new HibernateException(
+						"JDBC driver does not support named parameters for setArray. Use positional.", ex );
 			}
+		}
 
-			private java.sql.Array getArray(X value, WrapperOptions options) throws SQLException {
-				final ArrayJdbcType arrayJdbcType = (ArrayJdbcType) getJdbcType();
-				final Object[] objects = arrayJdbcType.getArray( this, elementBinder, value, options );
+		@Override
+		public Object[] getBindValue(X value, WrapperOptions options) throws SQLException {
+			final var elementBinder = getElementJdbcType().getBinder( pluralJavaType.getElementJavaType() );
+			return convertToArray( this, elementBinder, pluralJavaType, value, options );
+		}
 
-				final SharedSessionContractImplementor session = options.getSession();
-				final String typeName = arrayJdbcType.getElementTypeName( getJavaType(), session );
-				return session.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection()
-						.createArrayOf( typeName, objects );
-			}
-		};
+		private java.sql.Array getArray(X value, WrapperOptions options) throws SQLException {
+			final var session = options.getSession();
+			return session.getJdbcCoordinator().getLogicalConnection().getPhysicalConnection()
+					.createArrayOf( getElementTypeName( getJavaType(), session ),
+							getBindValue( value, options ) );
+		}
 	}
 
 	@Override
@@ -268,7 +286,9 @@ public String toString() {
 	}
 
 	/**
-	 * Check equality. Needed so that {@code ArrayJdbcType} in collections correctly match each other.
+	 * Check equality.
+	 * Needed so that {@code ArrayJdbcType} in collections correctly
+	 * match each other.
 	 * @return true if the two array types share the same element type
 	 */
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicBinder.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicBinder.java
index 32f142ec6a99..26805bf397f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicBinder.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicBinder.java
@@ -38,7 +38,8 @@ public BasicBinder(JavaType<J> javaType, JdbcType jdbcType) {
 	}
 
 	@Override
-	public final void bind(PreparedStatement st, J value, int index, WrapperOptions options) throws SQLException {
+	public final void bind(PreparedStatement st, J value, int index, WrapperOptions options)
+			throws SQLException {
 		if ( value == null ) {
 			if ( JdbcBindingLogging.LOGGER.isTraceEnabled() ) {
 				JdbcBindingLogging.logNullBinding(
@@ -61,7 +62,8 @@ public final void bind(PreparedStatement st, J value, int index, WrapperOptions
 	}
 
 	@Override
-	public final void bind(CallableStatement st, J value, String name, WrapperOptions options) throws SQLException {
+	public final void bind(CallableStatement st, J value, String name, WrapperOptions options)
+			throws SQLException {
 		if ( value == null ) {
 			if ( JdbcBindingLogging.LOGGER.isTraceEnabled() ) {
 				JdbcBindingLogging.logNullBinding(
@@ -85,8 +87,8 @@ public final void bind(CallableStatement st, J value, String name, WrapperOption
 
 	@Override
 	public Object getBindValue(J value, WrapperOptions options) throws SQLException {
-		final Class<?> preferredJavaTypeClass = jdbcType.getPreferredJavaTypeClass( options );
-		return preferredJavaTypeClass == null ? value : getJavaType().unwrap( value, preferredJavaTypeClass, options );
+		final var preferredClass = jdbcType.getPreferredJavaTypeClass( options );
+		return preferredClass == null ? value : getJavaType().unwrap( value, preferredClass, options );
 	}
 
 	/**
@@ -98,7 +100,8 @@ public Object getBindValue(J value, WrapperOptions options) throws SQLException
 	 *
 	 * @throws SQLException Indicates a problem binding to the prepared statement.
 	 */
-	protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+	protected void doBindNull(PreparedStatement st, int index, WrapperOptions options)
+			throws SQLException {
 		st.setNull( index, jdbcType.getJdbcTypeCode() );
 	}
 
@@ -111,7 +114,8 @@ protected void doBindNull(PreparedStatement st, int index, WrapperOptions option
 	 *
 	 * @throws SQLException Indicates a problem binding to the callable statement.
 	 */
-	protected void doBindNull(CallableStatement st, String name, WrapperOptions options) throws SQLException {
+	protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+			throws SQLException {
 		st.setNull( name, jdbcType.getJdbcTypeCode() );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java
index 1c349b53409a..f1dc0fb105be 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BasicExtractor.java
@@ -38,7 +38,8 @@ public JdbcType getJdbcType() {
 	}
 
 	@Override
-	public J extract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+	public J extract(ResultSet rs, int paramIndex, WrapperOptions options)
+			throws SQLException {
 		final J value = doExtract( rs, paramIndex, options );
 		if ( value == null || rs.wasNull() ) {
 			if ( JdbcExtractingLogging.LOGGER.isTraceEnabled() ) {
@@ -71,10 +72,12 @@ public J extract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQ
 	 *
 	 * @throws SQLException Indicates a problem access the result set
 	 */
-	protected abstract J doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException;
+	protected abstract J doExtract(ResultSet rs, int paramIndex, WrapperOptions options)
+			throws SQLException;
 
 	@Override
-	public J extract(CallableStatement statement, int paramIndex, WrapperOptions options) throws SQLException {
+	public J extract(CallableStatement statement, int paramIndex, WrapperOptions options)
+			throws SQLException {
 		final J value = doExtract( statement, paramIndex, options );
 		if ( value == null || statement.wasNull() ) {
 			if ( JdbcExtractingLogging.LOGGER.isTraceEnabled() ) {
@@ -109,10 +112,12 @@ public J extract(CallableStatement statement, int paramIndex, WrapperOptions opt
 	 *
 	 * @throws SQLException Indicates a problem accessing the parameter value
 	 */
-	protected abstract J doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException;
+	protected abstract J doExtract(CallableStatement statement, int index, WrapperOptions options)
+			throws SQLException;
 
 	@Override
-	public J extract(CallableStatement statement, String paramName, WrapperOptions options) throws SQLException {
+	public J extract(CallableStatement statement, String paramName, WrapperOptions options)
+			throws SQLException {
 		final J value = doExtract( statement, paramName, options );
 		if ( value == null || statement.wasNull() ) {
 			if ( JdbcExtractingLogging.LOGGER.isTraceEnabled() ) {
@@ -151,5 +156,6 @@ public J extract(CallableStatement statement, String paramName, WrapperOptions o
 	 *
 	 * @throws SQLException Indicates a problem accessing the parameter value
 	 */
-	protected abstract J doExtract(CallableStatement statement, String name, WrapperOptions options) throws SQLException;
+	protected abstract J doExtract(CallableStatement statement, String name, WrapperOptions options)
+			throws SQLException;
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BigIntJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BigIntJdbcType.java
index ad6d87804f06..272f3ae185e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BigIntJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BigIntJdbcType.java
@@ -34,11 +34,11 @@ public int getJdbcTypeCode() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Long.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Long.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BlobJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BlobJdbcType.java
index 2f04ef74e8e5..fcd47f4c1e9b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BlobJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BlobJdbcType.java
@@ -45,11 +45,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Blob.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Blob.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanJdbcType.java
index 675e7db3509f..db66220c9361 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanJdbcType.java
@@ -43,11 +43,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Boolean.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Boolean.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateJdbcType.java
index 55afae6cfca6..e08204bc420a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateJdbcType.java
@@ -49,14 +49,14 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
 		final var javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
 		return typeConfiguration.getCurrentBaseSqlTypeIndicators().preferJdbcDatetimeTypes()
-				? javaTypeRegistry.getDescriptor( Date.class )
-				: javaTypeRegistry.getDescriptor( LocalDate.class );
+				? javaTypeRegistry.resolveDescriptor( Date.class )
+				: javaTypeRegistry.resolveDescriptor( LocalDate.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DecimalJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DecimalJdbcType.java
index 6a44c758a799..b2d3966f3cb0 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DecimalJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DecimalJdbcType.java
@@ -45,11 +45,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( BigDecimal.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( BigDecimal.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DoubleJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DoubleJdbcType.java
index 9836964ca3c2..a6c6a94fc4af 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DoubleJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DoubleJdbcType.java
@@ -61,11 +61,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Double.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Double.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/FloatJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/FloatJdbcType.java
index b07f6cf7c43d..1e714b55c5a7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/FloatJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/FloatJdbcType.java
@@ -44,17 +44,17 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
 		if ( length != null ) {
 			int floatPrecision = typeConfiguration.getCurrentBaseSqlTypeIndicators().getDialect().getFloatPrecision();
 			if ( length <= floatPrecision ) {
-				return typeConfiguration.getJavaTypeRegistry().getDescriptor( Float.class );
+				return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Float.class );
 			}
 		}
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Double.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Double.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/IntegerJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/IntegerJdbcType.java
index 7f18e71c1217..82e877604b0f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/IntegerJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/IntegerJdbcType.java
@@ -44,11 +44,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Integer.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Integer.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java
index cadfedf8a669..498fced0c57c 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcType.java
@@ -90,8 +90,8 @@ default int getDefaultSqlTypeCode() {
 	}
 
 	/**
-	 * A {@linkplain SqlTypes JDBC type code} that identifies the SQL column type to
-	 * be used for schema generation.
+	 * A {@linkplain SqlTypes JDBC type code} that identifies the SQL column type
+	 * used for schema generation.
 	 * <p>
 	 * This value is passed to {@link DdlTypeRegistry#getTypeName(int, Size, Type)}
 	 * to obtain the SQL column type.
@@ -103,21 +103,40 @@ default int getDdlTypeCode() {
 		return getDefaultSqlTypeCode();
 	}
 
-	default <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
-			Integer precision,
-			Integer scale,
+	/**
+	 * The {@linkplain JavaType Java type} usually is used to represent values of
+	 * this JDBC type in the entity model of the data. Often, but not always, the
+	 * source of this recommendation is the JDBC specification.
+	 *
+	 * @since 7.2
+	 */
+	default JavaType<?> getRecommendedJavaType(
+			Integer precision, Integer scale,
 			TypeConfiguration typeConfiguration) {
 		// match legacy behavior
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor(
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor(
 				JdbcTypeJavaClassMappings.INSTANCE.determineJavaClassForJdbcTypeCode( getDefaultSqlTypeCode() )
 		);
 	}
 
 	/**
-	 * Obtain a {@linkplain JdbcLiteralFormatter formatter} object capable of rendering
-	 * values of the given {@linkplain JavaType Java type} as SQL literals of the type
-	 * represented by this object.
+	 * @deprecated Due to the unchecked cast to a generic type.
+	 *             Use {@link #getRecommendedJavaType}.
 	 */
+	@Deprecated(forRemoval = true, since = "7.2")
+	@SuppressWarnings("unchecked")
+	default <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+			Integer precision,
+			Integer scale,
+			TypeConfiguration typeConfiguration) {
+		return (JavaType<T>) getRecommendedJavaType( precision, scale, typeConfiguration );
+	}
+
+		/**
+		 * Obtain a {@linkplain JdbcLiteralFormatter formatter} object capable of rendering
+		 * values of the given {@linkplain JavaType Java type} as SQL literals of the type
+		 * represented by this object.
+		 */
 	// todo (6.0) : move to {@link org.hibernate.metamodel.mapping.JdbcMapping}?
 	default <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaType) {
 		return (appender, value, dialect, wrapperOptions) ->
@@ -185,9 +204,9 @@ default Expression wrapTopLevelSelectionExpression(Expression expression) {
 	 */
 	@Deprecated(forRemoval = true, since = "7.2")
 	default String wrapWriteExpression(String writeExpression, Dialect dialect) {
-		final StringBuilder sb = new StringBuilder( writeExpression.length() );
-		appendWriteExpression( writeExpression, new StringBuilderSqlAppender( sb ), dialect );
-		return sb.toString();
+		final var wrapped = new StringBuilder( writeExpression.length() );
+		appendWriteExpression( writeExpression, new StringBuilderSqlAppender( wrapped ), dialect );
+		return wrapped.toString();
 	}
 
 	/**
@@ -206,9 +225,9 @@ default void appendWriteExpression(String writeExpression, SqlAppender appender,
 	 */
 	@Incubating
 	default String wrapWriteExpression(String writeExpression, @Nullable Size size, Dialect dialect) {
-		final StringBuilder sb = new StringBuilder( writeExpression.length() );
-		appendWriteExpression( writeExpression, size, new StringBuilderSqlAppender( sb ), dialect );
-		return sb.toString();
+		final var wrapped = new StringBuilder( writeExpression.length() );
+		appendWriteExpression( writeExpression, size, new StringBuilderSqlAppender( wrapped ), dialect );
+		return wrapped.toString();
 	}
 
 	/**
@@ -231,7 +250,7 @@ default boolean isWriteExpressionTyped(Dialect dialect) {
 	}
 
 	default boolean isInteger() {
-		int typeCode = getDdlTypeCode();
+		final int typeCode = getDdlTypeCode();
 		return isIntegral(typeCode)
 			|| typeCode == BIT; //HIGHLY DUBIOUS!
 	}
@@ -257,7 +276,7 @@ default boolean isString() {
 	}
 
 	default boolean isStringLike() {
-		int ddlTypeCode = getDdlTypeCode();
+		final int ddlTypeCode = getDdlTypeCode();
 		return isCharacterOrClobType( ddlTypeCode )
 			|| isEnumType( ddlTypeCode );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java
index d40bd1822e2a..b41d72e89956 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeIndicators.java
@@ -314,8 +314,8 @@ default int getDefaultZonedTimeSqlType() {
 	 * @see SqlTypes#TIMESTAMP_UTC
 	 */
 	default int getDefaultZonedTimestampSqlType() {
-		final TemporalType temporalPrecision = getTemporalPrecision();
-		return switch (temporalPrecision == null ? TemporalType.TIMESTAMP : temporalPrecision) {
+		final var temporalPrecision = getTemporalPrecision();
+		return switch ( temporalPrecision == null ? TemporalType.TIMESTAMP : temporalPrecision ) {
 			case TIME -> getZonedTimeSqlType( getDefaultTimeZoneStorageStrategy() );
 			case DATE -> Types.DATE;
 			case TIMESTAMP ->
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeJavaClassMappings.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeJavaClassMappings.java
index 789bb5ebe2f8..35df1f6c9209 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeJavaClassMappings.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeJavaClassMappings.java
@@ -44,7 +44,7 @@
  */
 //TODO: Eventually, the plan is to have {@link org.hibernate.dialect.Dialect} and
 //      {@link java.sql.DatabaseMetaData#getTypeInfo()} contribute this information.
-public class JdbcTypeJavaClassMappings {
+public final class JdbcTypeJavaClassMappings {
 	private static final Logger LOG = Logger.getLogger( JdbcTypeJavaClassMappings.class );
 
 	public static final JdbcTypeJavaClassMappings INSTANCE = new JdbcTypeJavaClassMappings();
@@ -64,17 +64,18 @@ private JdbcTypeJavaClassMappings() {
 	 * and <em>TABLE B-4: Java Object Types Mapped to JDBC Types</em>, as well as some additional
 	 * "common sense" mappings.
 	 */
-	public int determineJdbcTypeCodeForJavaClass(Class<?> cls) {
-		Integer typeCode = javaClassToJdbcTypeCodeMap.get( cls );
+	public int determineJdbcTypeCodeForJavaClass(Class<?> type) {
+		final Integer typeCode = javaClassToJdbcTypeCodeMap.get( type );
 		if ( typeCode != null ) {
 			return typeCode;
 		}
-
-		int specialCode = cls.hashCode();
-		LOG.debug(
-				"JDBC type code mapping not known for class [" + cls.getName() + "]; using custom code [" + specialCode + "]"
-		);
-		return specialCode;
+		else {
+			final int specialCode = type.hashCode();
+			LOG.debug(
+					"JDBC type code mapping not known for class [" + type.getName() + "]; using custom code [" + specialCode + "]"
+			);
+			return specialCode;
+		}
 	}
 
 	/**
@@ -83,26 +84,19 @@ public int determineJdbcTypeCodeForJavaClass(Class<?> cls) {
 	 * These mappings are defined by <em>TABLE B-1: JDBC Types Mapped to Java Types</em>.
 	 */
 	public Class<?> determineJavaClassForJdbcTypeCode(Integer typeCode) {
-		Class<?> cls = jdbcTypeCodeToJavaClassMap.get( typeCode );
+		final var cls = jdbcTypeCodeToJavaClassMap.get( typeCode );
 		if ( cls != null ) {
 			return cls;
 		}
-
-		LOG.debugf(
-				"Java Class mapping not known for JDBC type code [%s]; using java.lang.Object",
-				typeCode
-		);
-		return Object.class;
-	}
-
-	/**
-	 * @see #determineJavaClassForJdbcTypeCode(Integer)
-	 */
-	public Class<?> determineJavaClassForJdbcTypeCode(int typeCode) {
-		return determineJavaClassForJdbcTypeCode( Integer.valueOf( typeCode ) );
+		else {
+			LOG.debugf(
+					"Java Class mapping not known for JDBC type code [%s]; using java.lang.Object",
+					typeCode
+			);
+			return Object.class;
+		}
 	}
 
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 	private static ConcurrentHashMap<Class<?>, Integer> buildJavaClassToJdbcTypeCodeMappings() {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringArrayJdbcType.java
index 039f6ecf5c2e..cdeeed8465e2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringArrayJdbcType.java
@@ -113,6 +113,27 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 						st.setString( name, json );
 					}
 				}
+
+				@Override
+				protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, index, options );
+					}
+					else {
+						st.setNull( index, SqlTypes.VARCHAR );
+					}
+				}
+
+				@Override
+				protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+						throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, name, options );
+					}
+					else {
+						st.setNull( name, SqlTypes.VARCHAR );
+					}
+				}
 			};
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringJdbcType.java
index 93d2a710f0ff..91bda6e666f2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonAsStringJdbcType.java
@@ -137,6 +137,27 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 						st.setString( name, json );
 					}
 				}
+
+				@Override
+				protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, index, options );
+					}
+					else {
+						st.setNull( index, SqlTypes.VARCHAR );
+					}
+				}
+
+				@Override
+				protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+						throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, name, options );
+					}
+					else {
+						st.setNull( name, SqlTypes.VARCHAR );
+					}
+				}
 			};
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java
index 7c9a85203947..e1ef5d4728f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java
@@ -5,6 +5,7 @@
 package org.hibernate.type.descriptor.jdbc;
 
 
+import java.lang.reflect.Array;
 import java.sql.SQLException;
 import java.util.AbstractCollection;
 import java.util.ArrayList;
@@ -214,8 +215,6 @@ private static <X> X consumeJsonDocumentItems(JsonDocumentReader reader, Embedda
 	 * @param returnEmbeddable do we return an Embeddable object or array of Objects
 	 * @param options wrappping options
 	 * @return the deserialized value
-	 * @param <X>
-	 * @throws SQLException
 	 */
 	public static <X> X deserialize(
 			EmbeddableMappingType embeddableMappingType,
@@ -380,7 +379,7 @@ public <T> T[] toArray(T[] a) {
 			//noinspection unchecked
 			final T[] r = a.length >= size
 					? a
-					: (T[]) java.lang.reflect.Array.newInstance( a.getClass().getComponentType(), size );
+					: (T[]) Array.newInstance( a.getClass().getComponentType(), size );
 			for (int i = 0; i < size; i++) {
 				//noinspection unchecked
 				r[i] = (T) array[i];
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonJdbcType.java
index 3126fec438d0..e778842daa35 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonJdbcType.java
@@ -73,7 +73,8 @@ public EmbeddableMappingType getEmbeddableMappingType() {
 		return embeddableMappingType;
 	}
 
-	protected <X> X fromString(String string, JavaType<X> javaType, WrapperOptions options) throws SQLException {
+	protected <X> X fromString(String string, JavaType<X> javaType, WrapperOptions options)
+			throws SQLException {
 		if ( string == null ) {
 			return null;
 		}
@@ -89,9 +90,10 @@ protected <X> X fromString(String string, JavaType<X> javaType, WrapperOptions o
 	}
 
 	@Override
-	public Object createJdbcValue(Object domainValue, WrapperOptions options) throws SQLException {
+	public Object createJdbcValue(Object domainValue, WrapperOptions options)
+			throws SQLException {
 		assert embeddableMappingType != null;
-		final StringJsonDocumentWriter writer = new StringJsonDocumentWriter();
+		final var writer = new StringJsonDocumentWriter();
 		try {
 			JsonGeneratingVisitor.INSTANCE.visit( embeddableMappingType, domainValue, options, writer );
 			return writer.getJson();
@@ -102,15 +104,17 @@ public Object createJdbcValue(Object domainValue, WrapperOptions options) throws
 	}
 
 	@Override
-	public Object[] extractJdbcValues(Object rawJdbcValue, WrapperOptions options) throws SQLException {
+	public Object[] extractJdbcValues(Object rawJdbcValue, WrapperOptions options)
+			throws SQLException {
 		assert embeddableMappingType != null;
-		return JsonHelper.deserialize( embeddableMappingType, new StringJsonDocumentReader( (String) rawJdbcValue ), false, options );
+		return JsonHelper.deserialize( embeddableMappingType,
+				new StringJsonDocumentReader( (String) rawJdbcValue ), false, options );
 	}
 
 	protected <X> String toString(X value, JavaType<X> javaType, WrapperOptions options) {
 		if ( embeddableMappingType != null ) {
 			try {
-				final StringJsonDocumentWriter writer = new StringJsonDocumentWriter();
+				final var writer = new StringJsonDocumentWriter();
 				JsonGeneratingVisitor.INSTANCE.visit( embeddableMappingType, value, options, writer );
 				return writer.getJson();
 			}
@@ -127,15 +131,13 @@ public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
 			@Override
 			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
 					throws SQLException {
-				final String json = ( (JsonJdbcType) getJdbcType() ).toString( value, getJavaType(), options );
-				st.setString( index, json );
+				st.setString( index, JsonJdbcType.this.toString( value, getJavaType(), options ) );
 			}
 
 			@Override
 			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
 					throws SQLException {
-				final String json = ( (JsonJdbcType) getJdbcType() ).toString( value, getJavaType(), options );
-				st.setString( name, json );
+				st.setString( name, JsonJdbcType.this.toString( value, getJavaType(), options ) );
 			}
 		};
 	}
@@ -144,17 +146,20 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 	public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
 		return new BasicExtractor<>( javaType, this ) {
 			@Override
-			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options)
+					throws SQLException {
 				return fromString( rs.getString( paramIndex ), getJavaType(), options );
 			}
 
 			@Override
-			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options)
+					throws SQLException {
 				return fromString( statement.getString( index ), getJavaType(), options );
 			}
 
 			@Override
-			protected X doExtract(CallableStatement statement, String name, WrapperOptions options) throws SQLException {
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
+					throws SQLException {
 				return fromString( statement.getString( name ), getJavaType(), options );
 			}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NClobJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NClobJdbcType.java
index 889b90ace661..0f631e1f0650 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NClobJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NClobJdbcType.java
@@ -5,7 +5,6 @@
 package org.hibernate.type.descriptor.jdbc;
 
 import java.sql.CallableStatement;
-import java.sql.Clob;
 import java.sql.NClob;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -46,12 +45,7 @@ public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
 			@Override
 			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
 				if ( options.getDialect().supportsNationalizedMethods() ) {
-					try {
-						return javaType.wrap( rs.getNClob( paramIndex ), options );
-					}
-					catch (AbstractMethodError e) {
-						return javaType.wrap( rs.getClob( paramIndex ), options );
-					}
+					return javaType.wrap( rs.getNClob( paramIndex ), options );
 				}
 				else {
 					return javaType.wrap( rs.getClob( paramIndex ), options );
@@ -167,6 +161,27 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 						st.setString( name, javaType.unwrap( value, String.class, options ) );
 					}
 				}
+
+				@Override
+				protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, index, options );
+					}
+					else {
+						st.setNull( index, Types.CLOB );
+					}
+				}
+
+				@Override
+				protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+						throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, name, options );
+					}
+					else {
+						st.setNull( name, Types.CLOB );
+					}
+				}
 			};
 		}
 		@Override
@@ -225,12 +240,7 @@ public <X> BasicBinder<X> getNClobBinder(final JavaType<X> javaType) {
 				protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
 						throws SQLException {
 					if ( options.getDialect().supportsNationalizedMethods() ) {
-						try {
-							st.setNClob( index, javaType.unwrap( value, NClob.class, options ) );
-						}
-						catch (AbstractMethodError e) {
-							st.setClob( index, javaType.unwrap( value, Clob.class, options ) );
-						}
+						st.setNClob( index, javaType.unwrap( value, NClob.class, options ) );
 					}
 					else {
 						st.setClob( index, javaType.unwrap( value, NClob.class, options ) );
@@ -247,6 +257,27 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 						st.setClob( name, javaType.unwrap( value, NClob.class, options ) );
 					}
 				}
+
+				@Override
+				protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, index, options );
+					}
+					else {
+						st.setNull( index, Types.CLOB );
+					}
+				}
+
+				@Override
+				protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+						throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, name, options );
+					}
+					else {
+						st.setNull( name, Types.CLOB );
+					}
+				}
 			};
 		}
 	};
@@ -288,6 +319,126 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 						st.setCharacterStream( name, characterStream.asReader(), characterStream.getLength() );
 					}
 				}
+
+				@Override
+				protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, index, options );
+					}
+					else {
+						st.setNull( index, Types.CLOB );
+					}
+				}
+
+				@Override
+				protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+						throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, name, options );
+					}
+					else {
+						st.setNull( name, Types.CLOB );
+					}
+				}
+			};
+		}
+	};
+
+	public static final NClobJdbcType STREAM_BINDING_EXTRACTING = new NClobJdbcType() {
+		@Override
+		public String toString() {
+			return "NClobTypeDescriptor(STREAM_BINDING_EXTRACTING)";
+		}
+
+		@Override
+		public Class<?> getPreferredJavaTypeClass(WrapperOptions options) {
+			return CharacterStream.class;
+		}
+
+		@Override
+		public <X> BasicBinder<X> getNClobBinder(final JavaType<X> javaType) {
+			return new BasicBinder<>( javaType, this ) {
+				@Override
+				protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options)
+						throws SQLException {
+					final var characterStream = javaType.unwrap( value, CharacterStream.class, options );
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						st.setNCharacterStream( index, characterStream.asReader(), characterStream.getLength() );
+					}
+					else {
+						st.setCharacterStream( index, characterStream.asReader(), characterStream.getLength() );
+					}
+				}
+
+				@Override
+				protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+						throws SQLException {
+					final var characterStream = javaType.unwrap( value, CharacterStream.class, options );
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						st.setNCharacterStream( name, characterStream.asReader(), characterStream.getLength() );
+					}
+					else {
+						st.setCharacterStream( name, characterStream.asReader(), characterStream.getLength() );
+					}
+				}
+
+				@Override
+				protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, index, options );
+					}
+					else {
+						st.setNull( index, Types.CLOB );
+					}
+				}
+
+				@Override
+				protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+						throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, name, options );
+					}
+					else {
+						st.setNull( name, Types.CLOB );
+					}
+				}
+			};
+		}
+
+		@Override
+		public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
+			return new BasicExtractor<>( javaType, this ) {
+				@Override
+				protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						return javaType.wrap( rs.getNCharacterStream( paramIndex ), options );
+					}
+					else {
+						return javaType.wrap( rs.getCharacterStream( paramIndex ), options );
+					}
+				}
+
+				@Override
+				protected X doExtract(CallableStatement statement, int index, WrapperOptions options)
+						throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						return javaType.wrap( statement.getNCharacterStream( index ), options );
+					}
+					else {
+						return javaType.wrap( statement.getCharacterStream( index ), options );
+					}
+				}
+
+				@Override
+				protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
+						throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						return javaType.wrap( statement.getNCharacterStream( name ), options );
+					}
+					else {
+						return javaType.wrap( statement.getCharacterStream( name ), options );
+					}
+				}
 			};
 		}
 	};
@@ -327,6 +478,27 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 						st.setString( name, javaType.unwrap( value, String.class, options ) );
 					}
 				}
+
+				@Override
+				protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, index, options );
+					}
+					else {
+						st.setNull( index, Types.CLOB );
+					}
+				}
+
+				@Override
+				protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+						throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, name, options );
+					}
+					else {
+						st.setNull( name, Types.CLOB );
+					}
+				}
 			};
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NVarcharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NVarcharJdbcType.java
index 0ad1134cb674..14f98e256824 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NVarcharJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NVarcharJdbcType.java
@@ -47,14 +47,14 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
 		if ( length != null && length == 1 ) {
-			return typeConfiguration.getJavaTypeRegistry().getDescriptor( Character.class );
+			return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Character.class );
 		}
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( String.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( String.class );
 	}
 
 	@Override
@@ -105,13 +105,7 @@ public <X> ValueBinder<X> getBinder(final JavaType<X> javaType) {
 			@Override
 			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
 				if ( options.getDialect().supportsNationalizedMethods() ) {
-					try {
-						st.setNString( index, javaType.unwrap( value, String.class, options ) );
-					}
-					// workaround for jTDS driver for Sybase
-					catch ( AbstractMethodError e ) {
-						st.setBytes( index, javaType.unwrap( value, byte[].class, options ) );
-					}
+					st.setNString( index, javaType.unwrap( value, String.class, options ) );
 				}
 				else {
 					st.setString( index, javaType.unwrap( value, String.class, options ) );
@@ -128,6 +122,27 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 					st.setString( name, javaType.unwrap( value, String.class, options ) );
 				}
 			}
+
+			@Override
+			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+				if ( options.getDialect().supportsNationalizedMethods() ) {
+					super.doBindNull( st, index, options );
+				}
+				else {
+					st.setNull( index, Types.VARCHAR );
+				}
+			}
+
+			@Override
+			protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+					throws SQLException {
+				if ( options.getDialect().supportsNationalizedMethods() ) {
+					super.doBindNull( st, name, options );
+				}
+				else {
+					st.setNull( name, Types.VARCHAR );
+				}
+			}
 		};
 	}
 
@@ -137,13 +152,7 @@ public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
 			@Override
 			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
 				if ( options.getDialect().supportsNationalizedMethods() ) {
-					try {
-						return javaType.wrap( rs.getNString( paramIndex ), options );
-					}
-					// workaround for jTDS driver for Sybase
-					catch ( AbstractMethodError e ) {
-						return javaType.wrap( rs.getBytes( paramIndex ), options );
-					}
+					return javaType.wrap( rs.getNString( paramIndex ), options );
 				}
 				else {
 					return javaType.wrap( rs.getString( paramIndex ), options );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectJdbcType.java
index cc7430aeec3d..c7d726f094c0 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectJdbcType.java
@@ -70,7 +70,6 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
 		if ( Serializable.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
 			return VarbinaryJdbcType.INSTANCE.getExtractor( javaType );
@@ -79,17 +78,17 @@ public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
 		return new BasicExtractor<>( javaType, this ) {
 			@Override
 			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
-				return (X) rs.getObject( paramIndex );
+				return javaType.cast( rs.getObject( paramIndex ) );
 			}
 
 			@Override
 			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
-				return (X) statement.getObject( index );
+				return javaType.cast( statement.getObject( index ) );
 			}
 
 			@Override
 			protected X doExtract(CallableStatement statement, String name, WrapperOptions options) throws SQLException {
-				return (X) statement.getObject( name );
+				return javaType.cast( statement.getObject( name ) );
 			}
 		};
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RealJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RealJdbcType.java
index 81f017dbee67..dd143137c8f7 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RealJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RealJdbcType.java
@@ -40,11 +40,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Float.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Float.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SmallIntJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SmallIntJdbcType.java
index 34c424082b46..8739c5560952 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SmallIntJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SmallIntJdbcType.java
@@ -44,11 +44,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Short.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Short.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SpannerLocalDateTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SpannerLocalDateTimeJdbcType.java
new file mode 100644
index 000000000000..ee579677f5b2
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SpannerLocalDateTimeJdbcType.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.type.descriptor.jdbc;
+
+
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.internal.GetObjectExtractor;
+import org.hibernate.type.descriptor.jdbc.internal.SetObjectBinder;
+
+import java.sql.Timestamp;
+
+public class SpannerLocalDateTimeJdbcType extends LocalDateTimeJdbcType {
+
+	public static final LocalDateTimeJdbcType INSTANCE = new SpannerLocalDateTimeJdbcType();
+
+	@Override
+	public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
+		return new SetObjectBinder<>( javaType, this, Timestamp.class, getDdlTypeCode() );
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
+		return new GetObjectExtractor<>( javaType, this, Timestamp.class );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SpannerLocalTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SpannerLocalTimeJdbcType.java
new file mode 100644
index 000000000000..30b5aa3b861b
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SpannerLocalTimeJdbcType.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.type.descriptor.jdbc;
+
+
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.internal.GetObjectExtractor;
+import org.hibernate.type.descriptor.jdbc.internal.SetObjectBinder;
+
+import java.sql.Timestamp;
+
+public class SpannerLocalTimeJdbcType extends LocalTimeJdbcType {
+
+	public static final LocalTimeJdbcType INSTANCE = new SpannerLocalTimeJdbcType();
+
+	@Override
+	public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
+		return new SetObjectBinder<>( javaType, this, Timestamp.class, getDdlTypeCode() );
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
+		return new GetObjectExtractor<>( javaType, this, Timestamp.class );
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SpannerTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SpannerTimeJdbcType.java
new file mode 100644
index 000000000000..b017689d0193
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SpannerTimeJdbcType.java
@@ -0,0 +1,83 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.type.descriptor.jdbc;
+
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.time.ZoneOffset;
+import java.util.Calendar;
+import java.util.TimeZone;
+
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+
+public class SpannerTimeJdbcType extends TimeJdbcType {
+
+	public static final TimeJdbcType INSTANCE = new SpannerTimeJdbcType();
+
+	private static final TimeZone DEFAULT_TIME_ZONE = TimeZone.getTimeZone( ZoneOffset.UTC );
+
+	@Override
+	public Class<?> getPreferredJavaTypeClass(WrapperOptions options) {
+		return Timestamp.class;
+	}
+
+	@Override
+	public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
+		return new BasicBinder<>(javaType, this) {
+			@Override
+			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
+				final Timestamp timestamp;
+				if (value instanceof Time time) {
+					timestamp = new Timestamp( time.getTime() );
+				}
+				else {
+					timestamp = javaType.unwrap( value, Timestamp.class, options );
+				}
+				st.setTimestamp( index, timestamp, Calendar.getInstance( DEFAULT_TIME_ZONE ) );
+			}
+
+			@Override
+			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+					throws SQLException {
+				final Timestamp timestamp;
+				if (value instanceof Time time) {
+					timestamp = new Timestamp( time.getTime() );
+				}
+				else {
+					timestamp = javaType.unwrap( value, Timestamp.class, options );
+				}
+				st.setTimestamp( name, timestamp, Calendar.getInstance( DEFAULT_TIME_ZONE ) );
+			}
+		};
+	}
+
+	@Override
+	public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
+		return new BasicExtractor<>(javaType, this) {
+			@Override
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+				return javaType.wrap( rs.getTimestamp( paramIndex, Calendar.getInstance( DEFAULT_TIME_ZONE ) ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
+				return javaType.wrap( statement.getTimestamp( index, Calendar.getInstance( DEFAULT_TIME_ZONE ) ), options );
+			}
+
+			@Override
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options) throws SQLException {
+				return javaType.wrap( statement.getTimestamp( name, Calendar.getInstance( DEFAULT_TIME_ZONE ) ), options );
+			}
+		};
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructHelper.java
index 445a779203df..f3e56499f8cf 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructHelper.java
@@ -302,8 +302,7 @@ private static <T> void injectCastJdbcValue(
 			Object relationalValue)
 			throws SQLException {
 		assert javaType.isInstance( relationalValue );
-		//noinspection unchecked
-		injectJdbcValue( jdbcValues, jdbcIndex, options, jdbcMapping, javaType, (T) relationalValue );
+		injectJdbcValue( jdbcValues, jdbcIndex, options, jdbcMapping, javaType, javaType.cast( relationalValue ) );
 	}
 
 	private static <T> void injectJdbcValue(
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructJdbcType.java
index 980a0028c470..43a643896f26 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/StructJdbcType.java
@@ -104,17 +104,13 @@ public EmbeddableMappingType getEmbeddableMappingType() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		if ( embeddableMappingType == null ) {
-			return typeConfiguration.getJavaTypeRegistry().getDescriptor( Object[].class );
-		}
-		else {
-			//noinspection unchecked
-			return (JavaType<T>) embeddableMappingType.getMappedJavaType();
-		}
+		return embeddableMappingType == null
+				? typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Object[].class )
+				: embeddableMappingType.getMappedJavaType();
 	}
 
 	@Override
@@ -208,8 +204,7 @@ private X getValue(Object object, WrapperOptions options) throws SQLException {
 						StructHelper.orderJdbcValues( embeddableMappingType, inverseOrderMapping, jdbcValues.clone(), jdbcValues );
 					}
 					wrapRawJdbcValues( embeddableMappingType, jdbcValues, 0, options );
-					//noinspection unchecked
-					return (X) jdbcValues;
+					return javaType.cast( jdbcValues );
 				}
 				assert embeddableMappingType != null && embeddableMappingType.getJavaType() == getJavaType();
 				final StructAttributeValues attributeValues = getAttributeValues(
@@ -218,8 +213,7 @@ private X getValue(Object object, WrapperOptions options) throws SQLException {
 						jdbcValues,
 						options
 				);
-				//noinspection unchecked
-				return (X) instantiate( embeddableMappingType, attributeValues );
+				return javaType.cast( instantiate( embeddableMappingType, attributeValues ) );
 			}
 		};
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeAsTimestampWithTimeZoneJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeAsTimestampWithTimeZoneJdbcType.java
index 0a0ab2e08eba..a8da092f901d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeAsTimestampWithTimeZoneJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeAsTimestampWithTimeZoneJdbcType.java
@@ -43,11 +43,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( OffsetTime.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( OffsetTime.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeJdbcType.java
index a31f17144629..cc3dba3719a3 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeJdbcType.java
@@ -49,14 +49,14 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
 		final var javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
 		return typeConfiguration.getCurrentBaseSqlTypeIndicators().preferJdbcDatetimeTypes()
-				? javaTypeRegistry.getDescriptor( Time.class )
-				: javaTypeRegistry.getDescriptor( LocalTime.class );
+				? javaTypeRegistry.resolveDescriptor( Time.class )
+				: javaTypeRegistry.resolveDescriptor( LocalTime.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsJdbcTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsJdbcTimeJdbcType.java
index 1dcd84870e45..ead44b9f8d3d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsJdbcTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsJdbcTimeJdbcType.java
@@ -59,11 +59,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( OffsetTime.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( OffsetTime.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsOffsetTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsOffsetTimeJdbcType.java
index 7f017d80b706..80871334f67a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsOffsetTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeUtcAsOffsetTimeJdbcType.java
@@ -55,11 +55,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( OffsetTime.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( OffsetTime.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeWithTimeZoneJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeWithTimeZoneJdbcType.java
index e4a286bb9531..301439227a94 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeWithTimeZoneJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeWithTimeZoneJdbcType.java
@@ -49,11 +49,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( OffsetTime.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( OffsetTime.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampJdbcType.java
index 43f1922633c6..636d6e0eebe5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampJdbcType.java
@@ -49,14 +49,14 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
 		final var javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
 		return typeConfiguration.getCurrentBaseSqlTypeIndicators().preferJdbcDatetimeTypes()
-				? javaTypeRegistry.getDescriptor( Timestamp.class )
-				: javaTypeRegistry.getDescriptor( LocalDateTime.class );
+				? javaTypeRegistry.resolveDescriptor( Timestamp.class )
+				: javaTypeRegistry.resolveDescriptor( LocalDateTime.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsInstantJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsInstantJdbcType.java
index 96008c8246d6..a11557091a4f 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsInstantJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsInstantJdbcType.java
@@ -57,11 +57,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Instant.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Instant.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsJdbcTimestampJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsJdbcTimestampJdbcType.java
index d0871a121e94..49d220330637 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsJdbcTimestampJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsJdbcTimestampJdbcType.java
@@ -58,11 +58,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Instant.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Instant.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsOffsetDateTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsOffsetDateTimeJdbcType.java
index 134fecc5d551..e5b41070e60a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsOffsetDateTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampUtcAsOffsetDateTimeJdbcType.java
@@ -56,11 +56,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Instant.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Instant.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneJdbcType.java
index 4a1604c4d427..a4119ba45057 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneJdbcType.java
@@ -48,11 +48,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( OffsetDateTime.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( OffsetDateTime.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntJdbcType.java
index e340be866863..63dc65e8bf4d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntJdbcType.java
@@ -47,11 +47,11 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Byte.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Byte.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarbinaryJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarbinaryJdbcType.java
index b8f588aa8908..e7bd6d448b40 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarbinaryJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarbinaryJdbcType.java
@@ -53,11 +53,11 @@ public int getJdbcTypeCode() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( byte[].class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( byte[].class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharJdbcType.java
index 7015b5a2c442..b9db43dafa89 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharJdbcType.java
@@ -46,12 +46,12 @@ public String toString() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
 		return typeConfiguration.getJavaTypeRegistry()
-				.getDescriptor( length != null && length == 1 ? Character.class : String.class );
+				.resolveDescriptor( length != null && length == 1 ? Character.class : String.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharUUIDJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharUUIDJdbcType.java
index 45510690f51b..d00988c70639 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharUUIDJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharUUIDJdbcType.java
@@ -40,7 +40,7 @@ public int getDefaultSqlTypeCode() {
 
 	@Override
 	public String toString() {
-		return "MariaDBUUIDJdbcType";
+		return "VarcharUUIDJdbcType";
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlArrayJdbcType.java
index 006718721ca9..ad66399bb35d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlArrayJdbcType.java
@@ -64,8 +64,7 @@ protected <X> X fromString(String string, JavaType<X> javaType, WrapperOptions o
 					options.getSession().getJdbcCoordinator().getLogicalConnection().getPhysicalConnection()
 							.createSQLXML();
 			sqlxml.setString( string );
-			//noinspection unchecked
-			return (X) sqlxml;
+			return javaType.cast( sqlxml );
 		}
 		return XmlHelper.arrayFromString( javaType, this, string, options );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringArrayJdbcType.java
index 337d38af5135..b1f412bde140 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringArrayJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringArrayJdbcType.java
@@ -120,6 +120,27 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 					st.setString( name, xml );
 				}
 			}
+
+			@Override
+			protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+				if ( options.getDialect().supportsNationalizedMethods() ) {
+					super.doBindNull( st, index, options );
+				}
+				else {
+					st.setNull( index, SqlTypes.VARCHAR );
+				}
+			}
+
+			@Override
+			protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+					throws SQLException {
+				if ( options.getDialect().supportsNationalizedMethods() ) {
+					super.doBindNull( st, name, options );
+				}
+				else {
+					st.setNull( name, SqlTypes.VARCHAR );
+				}
+			}
 		};
 	}
 
@@ -134,7 +155,7 @@ private XmlAsStringArrayJdbcType getXmlAsStringArrayJdbcType() {
 			@Override
 			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
 				final XmlAsStringArrayJdbcType jdbcType = getXmlAsStringArrayJdbcType();
-				final String value;
+				String value;
 				if ( jdbcType.nationalized && options.getDialect().supportsNationalizedMethods() ) {
 					value = rs.getNString( paramIndex );
 				}
@@ -148,7 +169,7 @@ protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) thro
 			protected X doExtract(CallableStatement statement, int index, WrapperOptions options)
 					throws SQLException {
 				final XmlAsStringArrayJdbcType jdbcType = getXmlAsStringArrayJdbcType();
-				final String value;
+				String value;
 				if ( jdbcType.nationalized && options.getDialect().supportsNationalizedMethods() ) {
 					value = statement.getNString( index );
 				}
@@ -162,7 +183,7 @@ protected X doExtract(CallableStatement statement, int index, WrapperOptions opt
 			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
 					throws SQLException {
 				final XmlAsStringArrayJdbcType jdbcType = getXmlAsStringArrayJdbcType();
-				final String value;
+				String value;
 				if ( jdbcType.nationalized && options.getDialect().supportsNationalizedMethods() ) {
 					value = statement.getNString( name );
 				}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringJdbcType.java
index d06d0b43b490..8a0ac8eed108 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlAsStringJdbcType.java
@@ -153,6 +153,27 @@ protected void doBind(CallableStatement st, X value, String name, WrapperOptions
 						st.setString( name, xml );
 					}
 				}
+
+				@Override
+				protected void doBindNull(PreparedStatement st, int index, WrapperOptions options) throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, index, options );
+					}
+					else {
+						st.setNull( index, SqlTypes.VARCHAR );
+					}
+				}
+
+				@Override
+				protected void doBindNull(CallableStatement st, String name, WrapperOptions options)
+						throws SQLException {
+					if ( options.getDialect().supportsNationalizedMethods() ) {
+						super.doBindNull( st, name, options );
+					}
+					else {
+						st.setNull( name, SqlTypes.VARCHAR );
+					}
+				}
 			};
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java
index ac139bfcaf54..ed1e4e16bfe5 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/XmlJdbcType.java
@@ -77,10 +77,9 @@ public Object[] extractJdbcValues(Object rawJdbcValue, WrapperOptions options) t
 	}
 
 	protected <X> String toString(X value, JavaType<X> javaType, WrapperOptions options) throws SQLException {
-		if ( embeddableMappingType != null ) {
-			return XmlHelper.toString( embeddableMappingType, value, options );
-		}
-		return options.getXmlFormatMapper().toString( value, javaType, options );
+		return embeddableMappingType != null
+				? XmlHelper.toString( embeddableMappingType, value, options )
+				: options.getXmlFormatMapper().toString( value, javaType, options );
 	}
 
 	protected <X> X fromString(String string, JavaType<X> javaType, WrapperOptions options) throws SQLException {
@@ -94,11 +93,11 @@ protected <X> X fromString(String string, JavaType<X> javaType, WrapperOptions o
 		}
 		if ( javaType.getJavaType() == SQLXML.class ) {
 			final SQLXML sqlxml =
-					options.getSession().getJdbcCoordinator().getLogicalConnection().getPhysicalConnection()
+					options.getSession().getJdbcCoordinator()
+							.getLogicalConnection().getPhysicalConnection()
 							.createSQLXML();
 			sqlxml.setString( string );
-			//noinspection unchecked
-			return (X) sqlxml;
+			return javaType.cast( sqlxml );
 		}
 		return options.getXmlFormatMapper().fromString( string, javaType, options );
 	}
@@ -112,44 +111,42 @@ public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
 	public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
 		return new BasicExtractor<>( javaType, this ) {
 			@Override
-			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options)
+					throws SQLException {
 				return getObject( rs.getSQLXML( paramIndex ), options );
 			}
 
 			@Override
-			protected X doExtract(CallableStatement statement, int index, WrapperOptions options) throws SQLException {
+			protected X doExtract(CallableStatement statement, int index, WrapperOptions options)
+					throws SQLException {
 				return getObject( statement.getSQLXML( index ), options );
 			}
 
 			@Override
-			protected X doExtract(CallableStatement statement, String name, WrapperOptions options) throws SQLException {
+			protected X doExtract(CallableStatement statement, String name, WrapperOptions options)
+					throws SQLException {
 				return getObject( statement.getSQLXML( name ), options );
 			}
 
 			private X getObject(SQLXML sqlxml, WrapperOptions options) throws SQLException {
 				return sqlxml == null ? null
-						: getXmlJdbcType().fromString( sqlxml.getString(), getJavaType(), options );
-			}
-
-			private XmlJdbcType getXmlJdbcType() {
-				return (XmlJdbcType) getJdbcType();
+						: XmlJdbcType.this.fromString( sqlxml.getString(), getJavaType(), options );
 			}
 		};
 	}
 
 	protected static class XmlValueBinder<X> extends BasicBinder<X> {
-		public XmlValueBinder(JavaType<X> javaType, JdbcType jdbcType) {
-			super( javaType, jdbcType );
-		}
+		private final XmlJdbcType jdbcType;
 
-		private XmlJdbcType getXmlJdbcType() {
-			return (XmlJdbcType) getJdbcType();
+		public XmlValueBinder(JavaType<X> javaType, XmlJdbcType jdbcType) {
+			super( javaType, jdbcType );
+			this.jdbcType = jdbcType;
 		}
 
-		private SQLXML getSqlxml(PreparedStatement st, X value, WrapperOptions options) throws SQLException {
-			final String xml = getXmlJdbcType().toString( value, getJavaType(), options );
-			SQLXML sqlxml = st.getConnection().createSQLXML();
-			sqlxml.setString( xml );
+		private SQLXML getSqlxml(PreparedStatement st, X value, WrapperOptions options)
+				throws SQLException {
+			final SQLXML sqlxml = st.getConnection().createSQLXML();
+			sqlxml.setString( jdbcType.toString( value, getJavaType(), options ) );
 			return sqlxml;
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/AbstractJavaTimeJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/AbstractJavaTimeJdbcType.java
index 6664fffa80da..2b859a4a1b19 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/AbstractJavaTimeJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/AbstractJavaTimeJdbcType.java
@@ -29,11 +29,11 @@ public Class<T> getPreferredJavaTypeClass(WrapperOptions options) {
 	}
 
 	@Override
-	public <X> JavaType<X> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( javaTimeType );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( javaTimeType );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/DelayedStructJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/DelayedStructJdbcType.java
index 8cba3c394859..730082cef19a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/DelayedStructJdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/internal/DelayedStructJdbcType.java
@@ -51,12 +51,11 @@ public String getStructTypeName() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		//noinspection unchecked
-		return (JavaType<T>) embeddableAggregateJavaType;
+		return embeddableAggregateJavaType;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/BasicJdbcLiteralFormatter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/BasicJdbcLiteralFormatter.java
index 038e86c56289..0048cbca97da 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/BasicJdbcLiteralFormatter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/spi/BasicJdbcLiteralFormatter.java
@@ -18,27 +18,24 @@ public BasicJdbcLiteralFormatter(JavaType<T> javaType) {
 		super( javaType );
 	}
 
-	@SuppressWarnings("unchecked")
 	protected <X> X unwrap(Object value, Class<X> unwrapType, WrapperOptions options) {
 		assert value != null;
 
 		// for performance reasons, avoid conversions if we can
 		if ( unwrapType.isInstance( value ) ) {
-			return (X) value;
+			return unwrapType.cast( value );
 		}
 		else {
-			final JavaType<T> javaType = getJavaType();
-			if ( !javaType.isInstance( value ) ) {
-				final T coerced = javaType.coerce( value, options::getTypeConfiguration );
-				if ( unwrapType.isInstance( coerced ) ) {
-					return (X) coerced;
-				}
-				else {
-					return javaType.unwrap( coerced, unwrapType, options );
-				}
+			final var javaType = getJavaType();
+			if ( javaType.isInstance( value ) ) {
+				final T castValue = javaType.cast( value );
+				return javaType.unwrap( castValue, unwrapType, options );
 			}
 			else {
-				return javaType.unwrap( (T) value, unwrapType, options );
+				final T coerced = javaType.cast( javaType.coerce( value ) );
+				return unwrapType.isInstance( coerced )
+						? unwrapType.cast( coerced )
+						: javaType.unwrap( coerced, unwrapType, options );
 			}
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java
index 99bdf16f0437..a6e463281143 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/CapacityDependentDdlType.java
@@ -7,10 +7,13 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.Function;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.Size;
+import org.hibernate.metamodel.mapping.SqlExpressible;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 
 /**
  * Descriptor for a SQL type.
@@ -125,7 +128,7 @@ public static Builder builder(
 			String typeNamePattern,
 			String castTypeName,
 			Dialect dialect) {
-		return builder( sqlTypeCode, lobKind, typeNamePattern, null, castTypeName, dialect );
+		return builder( sqlTypeCode, lobKind, typeNamePattern, (String) null, castTypeName, dialect );
 	}
 
 	public static Builder builder(
@@ -154,6 +157,16 @@ public static Builder builder(
 		return new Builder( sqlTypeCode, lobKind, typeNamePattern, castTypeNamePattern, castTypeName, dialect );
 	}
 
+	public static Builder builder(
+			int sqlTypeCode,
+			LobKind lobKind,
+			String typeNamePattern,
+			Function<Integer,String> parameterizedCastTypeName,
+			String castTypeName,
+			Dialect dialect) {
+		return new Builder( sqlTypeCode, lobKind, typeNamePattern, parameterizedCastTypeName, castTypeName, dialect );
+	}
+
 	public static class Builder {
 		private final int sqlTypeCode;
 		private final LobKind lobKind;
@@ -162,6 +175,7 @@ public static class Builder {
 		private final String castTypeName;
 		private final Dialect dialect;
 		private final List<TypeEntry> typeEntries;
+		private final Function<Integer,String> parameterizedCastTypeName;
 
 		private Builder(
 				int sqlTypeCode,
@@ -174,6 +188,24 @@ private Builder(
 			this.lobKind = lobKind;
 			this.typeNamePattern = typeNamePattern;
 			this.castTypeNamePattern = castTypeNamePattern;
+			this.parameterizedCastTypeName = null;
+			this.castTypeName = castTypeName;
+			this.dialect = dialect;
+			this.typeEntries = new ArrayList<>();
+		}
+
+		private Builder(
+				int sqlTypeCode,
+				LobKind lobKind,
+				String typeNamePattern,
+				Function<Integer,String> parameterizedCastTypeName,
+				String castTypeName,
+				Dialect dialect) {
+			this.sqlTypeCode = sqlTypeCode;
+			this.lobKind = lobKind;
+			this.typeNamePattern = typeNamePattern;
+			this.castTypeNamePattern = null;
+			this.parameterizedCastTypeName = parameterizedCastTypeName;
 			this.castTypeName = castTypeName;
 			this.dialect = dialect;
 			this.typeEntries = new ArrayList<>();
@@ -185,7 +217,16 @@ public Builder withTypeCapacity(long capacity, String typeNamePattern) {
 		}
 
 		public CapacityDependentDdlType build() {
-			return new CapacityDependentDdlType( this );
+			return parameterizedCastTypeName == null
+					? new CapacityDependentDdlType( this )
+					: new CapacityDependentDdlType( this ) {
+						@Override
+						public String getCastTypeName(Size columnSize, SqlExpressible type, DdlTypeRegistry ddlTypeRegistry) {
+							return columnSize.getLength() == null
+									? super.getCastTypeName( columnSize, type, ddlTypeRegistry )
+									: parameterizedCastTypeName.apply( columnSize.getLength().intValue() );
+						}
+					};
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java
index 599f9b8e64e6..bbbc0d686a25 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/DdlTypeImpl.java
@@ -107,7 +107,8 @@ public String getTypeName(Long size, Integer precision, Integer scale) {
 
 	@Override
 	public String getCastTypeName(JdbcType jdbcType, JavaType<?> javaType, Long length, Integer precision, Integer scale) {
-		if ( length == null && precision == null ) {
+		if ( length == null && precision == null
+				|| jdbcType.isInteger() ) {  // workaround for ordinal enums represented as TINYINT(255)
 			return getCastTypeName( jdbcType, javaType );
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeEnumDdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeEnumDdlTypeImpl.java
index 1ce1402b2208..d5df8fb9651a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeEnumDdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeEnumDdlTypeImpl.java
@@ -24,10 +24,8 @@
  * @author Gavin King
  */
 public class NamedNativeEnumDdlTypeImpl implements DdlType {
-	private final Dialect dialect;
 
 	public NamedNativeEnumDdlTypeImpl(Dialect dialect) {
-		this.dialect = dialect;
 	}
 
 	@Override
@@ -36,9 +34,9 @@ public int getSqlTypeCode() {
 		return NAMED_ENUM;
 	}
 
-	@Override @SuppressWarnings("unchecked")
+	@Override
 	public String getTypeName(Size columnSize, Type type, DdlTypeRegistry ddlTypeRegistry) {
-		return dialect.getEnumTypeDeclaration( (Class<? extends Enum<?>>) type.getReturnedClass() );
+		return type.getReturnedClass().getSimpleName();
 	}
 
 	@Override
@@ -53,11 +51,11 @@ public String getTypeName(Long size, Integer precision, Integer scale) {
 
 	@Override
 	public String getCastTypeName(JdbcType jdbcType, JavaType<?> javaType) {
-		return dialect.getEnumTypeDeclaration( (Class<? extends Enum<?>>) javaType.getJavaType() );
+		return javaType.getJavaTypeClass().getSimpleName();
 	}
 
 	@Override
 	public String getCastTypeName(JdbcType jdbcType, JavaType<?> javaType, Long length, Integer precision, Integer scale) {
-		return dialect.getEnumTypeDeclaration( (Class<? extends Enum<?>>) javaType.getJavaType() );
+		return javaType.getJavaTypeClass().getSimpleName();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeOrdinalEnumDdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeOrdinalEnumDdlTypeImpl.java
index 8779212c43b6..9aeb991840c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeOrdinalEnumDdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NamedNativeOrdinalEnumDdlTypeImpl.java
@@ -24,10 +24,8 @@
  * @author Gavin King
  */
 public class NamedNativeOrdinalEnumDdlTypeImpl implements DdlType {
-	private final Dialect dialect;
 
 	public NamedNativeOrdinalEnumDdlTypeImpl(Dialect dialect) {
-		this.dialect = dialect;
 	}
 
 	@Override
@@ -35,9 +33,9 @@ public int getSqlTypeCode() {
 		return NAMED_ORDINAL_ENUM;
 	}
 
-	@Override @SuppressWarnings("unchecked")
+	@Override
 	public String getTypeName(Size columnSize, Type type, DdlTypeRegistry ddlTypeRegistry) {
-		return dialect.getEnumTypeDeclaration( (Class<? extends Enum<?>>) type.getReturnedClass() );
+		return type.getReturnedClass().getSimpleName();
 	}
 
 	@Override
@@ -52,11 +50,11 @@ public String getTypeName(Long size, Integer precision, Integer scale) {
 
 	@Override
 	public String getCastTypeName(JdbcType jdbcType, JavaType<?> javaType) {
-		return dialect.getEnumTypeDeclaration( (Class<? extends Enum<?>>) javaType.getJavaType() );
+		return javaType.getJavaTypeClass().getSimpleName();
 	}
 
 	@Override
 	public String getCastTypeName(JdbcType jdbcType, JavaType<?> javaType, Long length, Integer precision, Integer scale) {
-		return dialect.getEnumTypeDeclaration( (Class<? extends Enum<?>>) javaType.getJavaType() );
+		return javaType.getJavaTypeClass().getSimpleName();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java
index f567b0892b74..9ace5b2aa431 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeEnumDdlTypeImpl.java
@@ -6,6 +6,7 @@
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.Size;
+import org.hibernate.metamodel.mapping.SqlExpressible;
 import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.converter.internal.EnumHelper;
 import org.hibernate.type.descriptor.java.JavaType;
@@ -37,7 +38,7 @@ public int getSqlTypeCode() {
 		return ENUM;
 	}
 
-	@Override @SuppressWarnings("unchecked")
+	@Override
 	public String getTypeName(Size columnSize, Type type, DdlTypeRegistry ddlTypeRegistry) {
 		return dialect.getEnumTypeDeclaration(
 				type.getReturnedClass().getSimpleName(),
@@ -58,11 +59,20 @@ public String getTypeName(Long size, Integer precision, Integer scale) {
 
 	@Override
 	public String getCastTypeName(JdbcType jdbcType, JavaType<?> javaType) {
-		return "varchar";
+		return getCastTypeName( null );
+	}
+
+	@Override
+	public String getCastTypeName(Size columnSize, SqlExpressible type, DdlTypeRegistry ddlTypeRegistry) {
+		return getCastTypeName( columnSize.getLength() );
 	}
 
 	@Override
 	public String getCastTypeName(JdbcType jdbcType, JavaType<?> javaType, Long length, Integer precision, Integer scale) {
-		return getTypeName( length, precision, scale );
+		return getCastTypeName( length );
+	}
+
+	public String getCastTypeName(Long length) {
+		return length == null ? "varchar" : "varchar(" + length + ")";
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeOrdinalEnumDdlTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeOrdinalEnumDdlTypeImpl.java
index 1a2badcb1a4d..2f99cfd57231 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeOrdinalEnumDdlTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/internal/NativeOrdinalEnumDdlTypeImpl.java
@@ -35,7 +35,7 @@ public int getSqlTypeCode() {
 		return ORDINAL_ENUM;
 	}
 
-	@Override @SuppressWarnings("unchecked")
+	@Override
 	public String getTypeName(Size columnSize, Type type, DdlTypeRegistry ddlTypeRegistry) {
 		return dialect.getEnumTypeDeclaration(
 				type.getReturnedClass().getSimpleName(),
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/spi/DdlTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/spi/DdlTypeRegistry.java
index 4996977e48d7..c394864b10a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/spi/DdlTypeRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/spi/DdlTypeRegistry.java
@@ -90,12 +90,62 @@ private void addSqlType(DdlType ddlType, int sqlTypeCode) {
 		for ( String rawTypeName : ddlType.getRawTypeNames() ) {
 			final Integer previousSqlTypeCode = sqlTypes.put( rawTypeName, sqlTypeCode );
 			// Prefer the standard code over a custom code for a certain type name
-			if ( previousSqlTypeCode != null && JdbcTypeNameMapper.isStandardTypeCode( previousSqlTypeCode ) ) {
+			if ( previousSqlTypeCode != null
+				&& JdbcTypeNameMapper.isStandardTypeCode( previousSqlTypeCode )
+				&& (!JdbcTypeNameMapper.isStandardTypeCode( sqlTypeCode ) || isBigger( previousSqlTypeCode, sqlTypeCode )) ) {
 				sqlTypes.put( rawTypeName, previousSqlTypeCode );
 			}
 		}
 	}
 
+	/**
+	 * Whether {@code typeCode1} is bigger than {@code typeCode2}.
+	 * For example, a BIGINT is bigger than INTEGER, but if types are "unrelated",
+	 * e.g. VARCHAR and BIGINT, then this method will always return {@code false}.
+	 */
+	private static boolean isBigger(int typeCode1, int typeCode2) {
+		return switch ( typeCode1 ) {
+			// Integer type hierarchy: TINYINT < SMALLINT < INTEGER < BIGINT
+			case SqlTypes.BIGINT -> typeCode2 == SqlTypes.INTEGER
+					|| typeCode2 == SqlTypes.SMALLINT
+					|| typeCode2 == SqlTypes.TINYINT;
+			case SqlTypes.INTEGER -> typeCode2 == SqlTypes.SMALLINT
+					|| typeCode2 == SqlTypes.TINYINT;
+			case SqlTypes.SMALLINT -> typeCode2 == SqlTypes.TINYINT;
+			// Floating point hierarchy: REAL/FLOAT < DOUBLE
+			case SqlTypes.DOUBLE -> typeCode2 == SqlTypes.REAL
+					|| typeCode2 == SqlTypes.FLOAT;
+			// Character type hierarchy: CHAR < VARCHAR < LONG32VARCHAR < CLOB
+			case SqlTypes.CLOB -> typeCode2 == SqlTypes.LONG32VARCHAR
+					|| typeCode2 == SqlTypes.VARCHAR
+					|| typeCode2 == SqlTypes.CHAR;
+			case SqlTypes.LONG32VARCHAR -> typeCode2 == SqlTypes.VARCHAR
+					|| typeCode2 == SqlTypes.CHAR;
+			case SqlTypes.VARCHAR -> typeCode2 == SqlTypes.CHAR;
+			// National character type hierarchy: NCHAR < NVARCHAR < LONG32NVARCHAR < NCLOB
+			case SqlTypes.NCLOB -> typeCode2 == SqlTypes.LONG32NVARCHAR
+					|| typeCode2 == SqlTypes.NVARCHAR
+					|| typeCode2 == SqlTypes.NCHAR;
+			case SqlTypes.LONG32NVARCHAR -> typeCode2 == SqlTypes.NVARCHAR
+					|| typeCode2 == SqlTypes.NCHAR;
+			case SqlTypes.NVARCHAR -> typeCode2 == SqlTypes.NCHAR;
+			// Binary type hierarchy: BINARY < VARBINARY < LONG32VARBINARY < BLOB
+			case SqlTypes.BLOB -> typeCode2 == SqlTypes.LONG32VARBINARY
+					|| typeCode2 == SqlTypes.VARBINARY
+					|| typeCode2 == SqlTypes.BINARY;
+			case SqlTypes.LONG32VARBINARY -> typeCode2 == SqlTypes.VARBINARY
+					|| typeCode2 == SqlTypes.BINARY;
+			case SqlTypes.VARBINARY -> typeCode2 == SqlTypes.BINARY;
+			// Temporal type hierarchy: DATE/TIME < TIMESTAMP < TIMESTAMP_WITH_TIMEZONE
+			case SqlTypes.TIMESTAMP_WITH_TIMEZONE -> typeCode2 == SqlTypes.TIMESTAMP
+					|| typeCode2 == SqlTypes.DATE
+					|| typeCode2 == SqlTypes.TIME;
+			case SqlTypes.TIMESTAMP -> typeCode2 == SqlTypes.DATE
+					|| typeCode2 == SqlTypes.TIME;
+			default -> false;
+		};
+	}
+
 	/**
 	 * Returns the {@link SqlTypes} type code for the given DDL raw type name, or
 	 * {@code null} if the type code cannot be determined from the registrations.
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/AbstractJsonFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/AbstractJsonFormatMapper.java
index eceee2682a1b..73c8881f0379 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/AbstractJsonFormatMapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/AbstractJsonFormatMapper.java
@@ -18,7 +18,7 @@ public abstract class AbstractJsonFormatMapper implements FormatMapper {
 	@Override
 	public final <T> T fromString(CharSequence charSequence, JavaType<T> javaType, WrapperOptions wrapperOptions) {
 		final Type type = javaType.getJavaType();
-		if ( type == String.class || type == Object.class ) {
+		if ( type == String.class ) {
 			return (T) charSequence.toString();
 		}
 		return fromString( charSequence, type );
@@ -27,7 +27,7 @@ public final <T> T fromString(CharSequence charSequence, JavaType<T> javaType, W
 	@Override
 	public final <T> String toString(T value, JavaType<T> javaType, WrapperOptions wrapperOptions) {
 		final Type type = javaType.getJavaType();
-		if ( type == String.class || type == Object.class ) {
+		if ( type == String.class ) {
 			return (String) value;
 		}
 		return toString( value, type );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentWriter.java b/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentWriter.java
index 99339fbbfb57..8d125dd8c95b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentWriter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentWriter.java
@@ -9,7 +9,6 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 
-import java.io.IOException;
 
 /**
  * JSON document producer.
@@ -34,14 +33,12 @@ public interface JsonDocumentWriter {
 	/**
 	 * Starts a new JSON array.
 	 * @return this instance
-	 * @throws IOException an I/O error roccured while starting the object.
 	 */
 	JsonDocumentWriter startArray();
 
 	/**
 	 * Ends a new JSON array.
 	 * @return this instance
-	 * @throws IOException an I/O error roccured while starting the object.
 	 */
 	JsonDocumentWriter endArray();
 
@@ -50,14 +47,12 @@ public interface JsonDocumentWriter {
 	 * @param key the element name.
 	 * @return this instance
 	 * @throws IllegalArgumentException key name does not follow JSON specification.
-	 * @throws IOException an I/O error occurred while starting the object.
 	 */
 	JsonDocumentWriter objectKey(String key);
 
 	/**
 	 * Adds a new JSON element null value.
 	 * @return this instance
-	 * @throws IOException an I/O error roccured while starting the object.
 	 */
 	JsonDocumentWriter nullValue();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/Jackson3JsonFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/Jackson3JsonFormatMapper.java
new file mode 100644
index 000000000000..7e9a0b3cca72
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/Jackson3JsonFormatMapper.java
@@ -0,0 +1,92 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.type.format.jackson;
+
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.format.AbstractJsonFormatMapper;
+import org.hibernate.type.format.FormatMapperCreationContext;
+import tools.jackson.core.JacksonException;
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.core.JsonParser;
+import tools.jackson.databind.JacksonModule;
+import tools.jackson.databind.cfg.MapperBuilder;
+import tools.jackson.databind.json.JsonMapper;
+
+import java.lang.reflect.Type;
+import java.util.List;
+
+/**
+ * @author Christian Beikov
+ * @author Yanming Zhou
+ * @author Nick Rayburn
+ */
+public final class Jackson3JsonFormatMapper extends AbstractJsonFormatMapper {
+
+	public static final String SHORT_NAME = "jackson3";
+
+	private final JsonMapper jsonMapper;
+
+	public Jackson3JsonFormatMapper() {
+		this( MapperBuilder.findModules( Jackson3JsonFormatMapper.class.getClassLoader() ) );
+	}
+
+	public Jackson3JsonFormatMapper(FormatMapperCreationContext creationContext) {
+		this( JacksonIntegration.loadJackson3Modules( creationContext ) );
+	}
+
+	private Jackson3JsonFormatMapper(List<JacksonModule> modules) {
+		this( JsonMapper.builderWithJackson2Defaults()
+				.addModules( modules )
+				.build()
+		);
+	}
+
+	public Jackson3JsonFormatMapper(JsonMapper jsonMapper) {
+		this.jsonMapper = jsonMapper;
+	}
+
+	@Override
+	public <T> void writeToTarget(T value, JavaType<T> javaType, Object target, WrapperOptions options)
+			throws JacksonException {
+		jsonMapper.writerFor( jsonMapper.constructType( javaType.getJavaType() ) )
+				.writeValue( (JsonGenerator) target, value );
+	}
+
+	@Override
+	public <T> T readFromSource(JavaType<T> javaType, Object source, WrapperOptions options) throws JacksonException {
+		return jsonMapper.readValue( (JsonParser) source, jsonMapper.constructType( javaType.getJavaType() ) );
+	}
+
+	@Override
+	public boolean supportsSourceType(Class<?> sourceType) {
+		return JsonParser.class.isAssignableFrom( sourceType );
+	}
+
+	@Override
+	public boolean supportsTargetType(Class<?> targetType) {
+		return JsonGenerator.class.isAssignableFrom( targetType );
+	}
+
+	@Override
+	public <T> T fromString(CharSequence charSequence, Type type) {
+		try {
+			return jsonMapper.readValue( charSequence.toString(), jsonMapper.constructType( type ) );
+		}
+		catch (JacksonException e) {
+			throw new IllegalArgumentException( "Could not deserialize string to java type: " + type, e );
+		}
+	}
+
+	@Override
+	public <T> String toString(T value, Type type) {
+		try {
+			return jsonMapper.writerFor( jsonMapper.constructType( type ) ).writeValueAsString( value );
+		}
+		catch (JacksonException e) {
+			throw new IllegalArgumentException( "Could not serialize object of java type: " + type, e );
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/Jackson3XmlFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/Jackson3XmlFormatMapper.java
new file mode 100644
index 000000000000..44814bfa435c
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/Jackson3XmlFormatMapper.java
@@ -0,0 +1,319 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.type.format.jackson;
+
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
+import org.hibernate.type.format.FormatMapper;
+import org.hibernate.type.format.FormatMapperCreationContext;
+import org.hibernate.type.internal.ParameterizedTypeImpl;
+import tools.jackson.core.JacksonException;
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.core.JsonParser;
+import tools.jackson.core.JsonToken;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.JacksonModule;
+import tools.jackson.databind.SerializationContext;
+import tools.jackson.databind.ValueDeserializer;
+import tools.jackson.databind.cfg.DateTimeFeature;
+import tools.jackson.databind.cfg.MapperBuilder;
+import tools.jackson.databind.module.SimpleModule;
+import tools.jackson.databind.ser.std.StdSerializer;
+import tools.jackson.dataformat.xml.XmlMapper;
+import tools.jackson.dataformat.xml.XmlWriteFeature;
+import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Christian Beikov
+ * @author Emmanuel Jannetti
+ * @author Nick Rayburn
+ */
+public final class Jackson3XmlFormatMapper implements FormatMapper {
+
+	public static final String SHORT_NAME = "jackson3-xml";
+	private final boolean legacyFormat;
+
+	private final XmlMapper xmlMapper;
+
+	public Jackson3XmlFormatMapper() {
+		this( true );
+	}
+
+	public Jackson3XmlFormatMapper(boolean legacyFormat) {
+		this(
+				createXmlMapper( MapperBuilder.findModules( Jackson3XmlFormatMapper.class.getClassLoader() ), legacyFormat ),
+				legacyFormat
+		);
+	}
+
+	public Jackson3XmlFormatMapper(FormatMapperCreationContext creationContext) {
+		this(
+				createXmlMapper(
+						JacksonIntegration.loadJackson3Modules( creationContext ),
+						creationContext.getBootstrapContext()
+								.getMetadataBuildingOptions()
+								.isXmlFormatMapperLegacyFormatEnabled()
+				),
+				creationContext.getBootstrapContext()
+						.getMetadataBuildingOptions()
+						.isXmlFormatMapperLegacyFormatEnabled()
+		);
+	}
+
+	public Jackson3XmlFormatMapper(XmlMapper xmlMapper) {
+		this( xmlMapper, false );
+	}
+
+	public Jackson3XmlFormatMapper(XmlMapper xmlMapper, boolean legacyFormat) {
+		this.xmlMapper = xmlMapper;
+		this.legacyFormat = legacyFormat;
+	}
+
+	private static XmlMapper createXmlMapper(List<JacksonModule> modules, boolean legacyFormat) {
+		final XmlMapper.Builder builder = XmlMapper.builderWithJackson2Defaults()
+				.disable( DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS )
+				.enable( XmlWriteFeature.WRITE_NULLS_AS_XSI_NIL )
+				.addModules( modules );
+		// Workaround for null vs empty string handling inside arrays,
+		// see: https://github.com/FasterXML/jackson-dataformat-xml/issues/344
+		final SimpleModule module = new SimpleModule();
+		module.addDeserializer( String[].class, new StringArrayDeserializer() );
+		if ( !legacyFormat ) {
+			module.addDeserializer( byte[].class, new ByteArrayDeserializer() );
+			module.addSerializer( byte[].class, new ByteArraySerializer() );
+		}
+		builder.addModule( module );
+		return builder.build();
+	}
+
+	@Override
+	public <T> T fromString(CharSequence charSequence, JavaType<T> javaType, WrapperOptions wrapperOptions) {
+		if ( javaType.getJavaType() == String.class || javaType.getJavaType() == Object.class ) {
+			return (T) charSequence.toString();
+		}
+		try {
+			if ( !legacyFormat ) {
+				if ( Map.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+					final Type keyType;
+					final Type elementType;
+					if ( javaType.getJavaType() instanceof ParameterizedType parameterizedType ) {
+						keyType = parameterizedType.getActualTypeArguments()[0];
+						elementType = parameterizedType.getActualTypeArguments()[1];
+					}
+					else {
+						keyType = Object.class;
+						elementType = Object.class;
+					}
+					final MapWrapper<?, ?> collectionWrapper = xmlMapper.readValue(
+							charSequence.toString(),
+							xmlMapper.constructType( new ParameterizedTypeImpl( MapWrapper.class,
+									new Type[] {keyType, elementType}, null ) )
+					);
+					final Map<Object, Object> map = new LinkedHashMap<>( collectionWrapper.entry.size() );
+					for ( EntryWrapper<?, ?> entry : collectionWrapper.entry ) {
+						map.put( entry.key, entry.value );
+					}
+					return javaType.wrap( map, wrapperOptions );
+				}
+				else if ( Collection.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+					final Type elementType =
+							javaType.getJavaType() instanceof ParameterizedType parameterizedType
+									? parameterizedType.getActualTypeArguments()[0]
+									: Object.class;
+					final CollectionWrapper<?> collectionWrapper = xmlMapper.readValue(
+							charSequence.toString(),
+							xmlMapper.constructType(
+									new ParameterizedTypeImpl( CollectionWrapper.class, new Type[] {elementType},
+											null ) )
+					);
+					return javaType.wrap( collectionWrapper.value, wrapperOptions );
+				}
+				else if ( javaType.getJavaTypeClass().isArray() ) {
+					final CollectionWrapper<?> collectionWrapper = xmlMapper.readValue(
+							charSequence.toString(),
+							xmlMapper.constructType( new ParameterizedTypeImpl( CollectionWrapper.class,
+									new Type[] {javaType.getJavaTypeClass().getComponentType()}, null ) )
+					);
+					return javaType.wrap( collectionWrapper.value, wrapperOptions );
+				}
+			}
+			return xmlMapper.readValue(
+					charSequence.toString(),
+					xmlMapper.constructType( javaType.getJavaType() )
+			);
+		}
+		catch (JacksonException e) {
+			throw new IllegalArgumentException( "Could not deserialize string to java type: " + javaType, e );
+		}
+	}
+
+	@Override
+	public <T> String toString(T value, JavaType<T> javaType, WrapperOptions wrapperOptions) {
+		if ( javaType.getJavaType() == String.class || javaType.getJavaType() == Object.class ) {
+			return (String) value;
+		}
+		if ( !legacyFormat ) {
+			if ( Map.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+				final Type keyType;
+				final Type elementType;
+				if ( javaType.getJavaType() instanceof ParameterizedType parameterizedType ) {
+					keyType = parameterizedType.getActualTypeArguments()[0];
+					elementType = parameterizedType.getActualTypeArguments()[1];
+				}
+				else {
+					keyType = Object.class;
+					elementType = Object.class;
+				}
+				final MapWrapper<Object, Object> mapWrapper = new MapWrapper<>();
+				for ( Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet() ) {
+					mapWrapper.entry.add( new EntryWrapper<>( entry.getKey(), entry.getValue() ) );
+				}
+				return writeValueAsString(
+						mapWrapper,
+						javaType,
+						new ParameterizedTypeImpl( MapWrapper.class, new Type[] {keyType, elementType}, null )
+				);
+			}
+			else if ( Collection.class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+				final Type elementType =
+						javaType.getJavaType() instanceof ParameterizedType parameterizedType
+								? parameterizedType.getActualTypeArguments()[0]
+								: Object.class;
+				return writeValueAsString(
+						new CollectionWrapper<>( (Collection<?>) value ),
+						javaType,
+						new ParameterizedTypeImpl( CollectionWrapper.class, new Type[] {elementType}, null )
+				);
+			}
+			else if ( javaType.getJavaTypeClass().isArray() ) {
+				final CollectionWrapper<Object> collectionWrapper;
+				if ( Object[].class.isAssignableFrom( javaType.getJavaTypeClass() ) ) {
+					collectionWrapper = new CollectionWrapper<>( Arrays.asList( (Object[]) value ) );
+				}
+				else {
+					// Primitive arrays get a special treatment
+					final int length = Array.getLength( value );
+					final List<Object> list = new ArrayList<>( length );
+					for ( int i = 0; i < length; i++ ) {
+						list.add( Array.get( value, i ) );
+					}
+					collectionWrapper = new CollectionWrapper<>( list );
+				}
+				return writeValueAsString(
+						collectionWrapper,
+						javaType,
+						new ParameterizedTypeImpl( CollectionWrapper.class,
+								new Type[] {javaType.getJavaTypeClass().getComponentType()}, null )
+				);
+			}
+		}
+		return writeValueAsString( value, javaType, javaType.getJavaType() );
+	}
+
+	private <T> String writeValueAsString(Object value, JavaType<T> javaType, Type type) {
+		try {
+			return xmlMapper.writerFor( xmlMapper.constructType( type ) ).writeValueAsString( value );
+		}
+		catch (JacksonException e) {
+			throw new IllegalArgumentException( "Could not serialize object of java type: " + javaType, e );
+		}
+	}
+
+	@JsonRootName(value = "Collection")
+	public static class CollectionWrapper<E> {
+		@JacksonXmlElementWrapper(useWrapping = false)
+		@JacksonXmlProperty(localName = "e")
+		Collection<E> value;
+
+		public CollectionWrapper() {
+			this.value = new ArrayList<>();
+		}
+
+		public CollectionWrapper(Collection<E> value) {
+			this.value = value;
+		}
+	}
+
+	@JsonRootName(value = "Map")
+	public static class MapWrapper<K, V> {
+		@JacksonXmlElementWrapper(useWrapping = false)
+		@JacksonXmlProperty(localName = "e")
+		Collection<EntryWrapper<K, V>> entry;
+
+		public MapWrapper() {
+			this.entry = new ArrayList<>();
+		}
+
+		public MapWrapper(Collection<EntryWrapper<K, V>> entry) {
+			this.entry = entry;
+		}
+	}
+
+	public static class EntryWrapper<K, V> {
+		@JacksonXmlProperty(localName = "k")
+		K key;
+		@JacksonXmlProperty(localName = "v")
+		V value;
+
+		public EntryWrapper() {
+		}
+
+		public EntryWrapper(K key, V value) {
+			this.key = key;
+			this.value = value;
+		}
+	}
+
+	private static class StringArrayDeserializer extends ValueDeserializer<String[]> {
+		@Override
+		public String[] deserialize(JsonParser jp, DeserializationContext deserializationContext) throws JacksonException {
+			final ArrayList<String> result = new ArrayList<>();
+			JsonToken token;
+			while ( ( token = jp.nextValue() ) != JsonToken.END_OBJECT ) {
+				if ( token.isScalarValue() ) {
+					result.add( jp.getValueAsString() );
+				}
+			}
+			return result.toArray( String[]::new );
+		}
+	}
+
+	private static class ByteArrayDeserializer extends ValueDeserializer<byte[]> {
+		@Override
+		public byte[] deserialize(JsonParser jp, DeserializationContext deserializationContext) throws JacksonException {
+			return PrimitiveByteArrayJavaType.INSTANCE.fromString( jp.getValueAsString() );
+		}
+	}
+
+	public static class ByteArraySerializer extends StdSerializer<byte[]> {
+
+		public ByteArraySerializer() {
+			super( byte[].class );
+		}
+
+		@Override
+		public boolean isEmpty(SerializationContext prov, byte[] value) {
+			return value.length == 0;
+		}
+
+		@Override
+		public void serialize(byte[] value, JsonGenerator g, SerializationContext provider) throws JacksonException {
+			g.writeString( PrimitiveByteArrayJavaType.INSTANCE.toString( value ) );
+		}
+	}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java
index 11bd31e78915..0d270e464b2b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonIntegration.java
@@ -9,6 +9,8 @@
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import tools.jackson.databind.JacksonModule;
+import tools.jackson.databind.cfg.MapperBuilder;
 
 import org.hibernate.type.format.FormatMapper;
 import org.hibernate.type.format.FormatMapperCreationContext;
@@ -21,6 +23,8 @@ public final class JacksonIntegration {
 	private static final boolean JACKSON_JSON_AVAILABLE = ableToLoadJacksonJSONMapper();
 	private static final boolean JACKSON_OSON_AVAILABLE = ableToLoadJacksonOSONFactory();
 
+	private static final boolean JACKSON3_XML_AVAILABLE = ableToLoadJackson3XMLMapper();
+	private static final boolean JACKSON3_JSON_AVAILABLE = ableToLoadJackson3JSONMapper();
 
 	private JacksonIntegration() {
 		//To not be instantiated: static helpers only
@@ -30,10 +34,18 @@ private static boolean ableToLoadJacksonJSONMapper() {
 		return canLoad( "com.fasterxml.jackson.databind.ObjectMapper" );
 	}
 
+	private static boolean ableToLoadJackson3JSONMapper() {
+		return canLoad( "tools.jackson.databind.json.JsonMapper" );
+	}
+
 	private static boolean ableToLoadJacksonXMLMapper() {
 		return canLoad( "com.fasterxml.jackson.dataformat.xml.XmlMapper" );
 	}
 
+	private static boolean ableToLoadJackson3XMLMapper() {
+		return canLoad( "tools.jackson.dataformat.xml.XmlMapper" );
+	}
+
 	/**
 	 * Checks that Jackson is available and that we have the Oracle OSON extension available
 	 * in the classpath.
@@ -50,11 +62,22 @@ private static boolean ableToLoadJacksonOSONFactory() {
 				: null;
 	}
 
+	public static @Nullable FormatMapper getXMLJackson3FormatMapperOrNull(FormatMapperCreationContext creationContext) {
+		return JACKSON3_XML_AVAILABLE
+				? new Jackson3XmlFormatMapper( creationContext )
+				: null;
+	}
+
 	public static @Nullable FormatMapper getJsonJacksonFormatMapperOrNull(FormatMapperCreationContext creationContext) {
 		return JACKSON_JSON_AVAILABLE
 				? new JacksonJsonFormatMapper( creationContext )
 				: null;
 	}
+	public static @Nullable FormatMapper getJsonJackson3FormatMapperOrNull(FormatMapperCreationContext creationContext) {
+		return JACKSON3_JSON_AVAILABLE
+				? new Jackson3JsonFormatMapper( creationContext )
+				: null;
+	}
 	public static @Nullable FormatMapper getOsonJacksonFormatMapperOrNull(FormatMapperCreationContext creationContext) {
 		return JACKSON_OSON_AVAILABLE
 				? new JacksonOsonFormatMapper( creationContext )
@@ -66,6 +89,11 @@ private static boolean ableToLoadJacksonOSONFactory() {
 				? new JacksonJsonFormatMapper()
 				: null;
 	}
+	public static @Nullable FormatMapper getJsonJackson3FormatMapperOrNull() {
+		return JACKSON3_JSON_AVAILABLE
+				? new Jackson3JsonFormatMapper()
+				: null;
+	}
 	public static @Nullable FormatMapper getOsonJacksonFormatMapperOrNull() {
 		return JACKSON_OSON_AVAILABLE
 				? new JacksonOsonFormatMapper()
@@ -117,4 +145,27 @@ static List<Module> loadModules(FormatMapperCreationContext creationContext) {
 		}
 		return ObjectMapper.findModules( classLoader );
 	}
+
+	static List<JacksonModule> loadJackson3Modules(FormatMapperCreationContext creationContext) {
+		final ClassLoader classLoader = JacksonIntegration.class.getClassLoader();
+		final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+		if ( contextClassLoader != null && classLoader != contextClassLoader ) {
+			try {
+				// The context class loader represents the application class loader in a Jakarta EE deployment.
+				// We have to check if the ObjectMapper that is visible to Hibernate ORM is the same that is visible
+				// to the application class loader. Only if it is, we can use the application class loader or rather
+				// our AggregatedClassLoader for loading Jackson Module via ServiceLoader, as otherwise the loaded
+				// Jackson Module instances would have a different class loader, leading to a ClassCastException.
+				if ( ObjectMapper.class == contextClassLoader.loadClass( "tools.jackson.databind.ObjectMapper" ) ) {
+					return creationContext.getBootstrapContext()
+							.getClassLoaderService()
+							.<List<JacksonModule>>workWithClassLoader( MapperBuilder::findModules );
+				}
+			}
+			catch (ClassNotFoundException | LinkageError e) {
+				// Ignore if the context/application class loader doesn't know Jackson classes
+			}
+		}
+		return MapperBuilder.findModules( classLoader );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbIntegration.java b/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbIntegration.java
new file mode 100644
index 000000000000..ea409a767f10
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/type/format/jaxb/JaxbIntegration.java
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.type.format.jaxb;
+
+import org.hibernate.type.format.FormatMapper;
+
+public class JaxbIntegration {
+
+	private static final boolean JAXB_XML_AVAILABLE = ableToLoadJakartaJaxb();
+
+	private static final JaxbXmlFormatMapper XML_FORMAT_MAPPER =
+			JAXB_XML_AVAILABLE ? new JaxbXmlFormatMapper( false ) : null;
+	private static final JaxbXmlFormatMapper LEGACY_XML_FORMAT_MAPPER =
+			JAXB_XML_AVAILABLE ? new JaxbXmlFormatMapper( true ) : null;
+
+	private static boolean ableToLoadJakartaJaxb() {
+		try {
+			//N.B. intentionally not using the context classloader
+			// as we're storing these in static references;
+			// IMO it's reasonable to expect that such dependencies are made reachable from the ORM classloader.
+			// (we can change this if it's more problematic than expected).
+			JaxbIntegration.class.getClassLoader().loadClass( "jakarta.xml.bind.JAXBContext" );
+			return true;
+		}
+		catch (ClassNotFoundException | LinkageError e) {
+			return false;
+		}
+	}
+
+	public static FormatMapper getJaxbXmlFormatMapperOrNull() {
+		return XML_FORMAT_MAPPER;
+	}
+
+	public static FormatMapper getJaxbLegacyXmlFormatMapperOrNull() {
+		return LEGACY_XML_FORMAT_MAPPER;
+	}
+
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/BasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/BasicTypeImpl.java
index f4854bcb6e72..a17b1406ef36 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/BasicTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/BasicTypeImpl.java
@@ -4,8 +4,6 @@
  */
 package org.hibernate.type.internal;
 
-import java.util.Locale;
-
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
 import org.hibernate.type.AdjustableBasicType;
@@ -25,14 +23,9 @@ public class BasicTypeImpl<J> extends AbstractSingleColumnStandardBasicType<J> i
 
 	public BasicTypeImpl(JavaType<J> jtd, JdbcType std) {
 		super( std, jtd );
-		name = String.format(
-				Locale.ROOT,
-				"%s@%s(%s,%s)",
-				EXTERNALIZED_PREFIX,
-				++count,
-				jtd.getJavaTypeClass().getName(),
-				std.getDefaultSqlTypeCode()
-		);
+		count++;
+		name = EXTERNALIZED_PREFIX + '@' + count + '(' + jtd.getJavaTypeClass()
+				.getName() + ',' + std.getDefaultSqlTypeCode() + ')';
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/BindingTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/type/internal/BindingTypeHelper.java
index e99538ad1875..afdd51e28844 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/BindingTypeHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/BindingTypeHelper.java
@@ -12,16 +12,17 @@
 import java.util.Calendar;
 
 import org.hibernate.metamodel.mapping.JdbcMapping;
+import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.type.BindableType;
 import org.hibernate.type.BindingContext;
-import org.hibernate.query.sqm.SqmExpressible;
+import org.hibernate.type.NullType;
 import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.type.descriptor.java.JavaTypeHelper;
 import org.hibernate.type.descriptor.java.TemporalJavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import jakarta.persistence.TemporalType;
 
+import static org.hibernate.type.descriptor.java.JavaTypeHelper.isTemporal;
 import static org.hibernate.type.descriptor.java.TemporalJavaType.resolveJavaTypeClass;
 import static org.hibernate.type.descriptor.java.TemporalJavaType.resolveJdbcTypeCode;
 
@@ -33,14 +34,14 @@ private BindingTypeHelper() {
 	}
 
 	public static <T> BindableType<T> resolveTemporalPrecision(
-			TemporalType precision,
+			@SuppressWarnings("deprecation") TemporalType precision,
 			BindableType<T> declaredParameterType,
 			BindingContext bindingContext) {
 		if ( precision != null ) {
-			final TemporalJavaType<T> temporalJtd = getTemporalJavaType( declaredParameterType, bindingContext );
+			final var temporalJtd = getTemporalJavaType( declaredParameterType, bindingContext );
 			if ( temporalJtd == null || temporalJtd.getPrecision() != precision ) {
-				final TypeConfiguration typeConfiguration = bindingContext.getTypeConfiguration();
-				final TemporalJavaType<T> temporalTypeForPrecision =
+				final var typeConfiguration = bindingContext.getTypeConfiguration();
+				final var temporalTypeForPrecision =
 						getTemporalTypeForPrecision( precision, temporalJtd, typeConfiguration );
 				return typeConfiguration.getBasicTypeRegistry()
 						.resolve( temporalTypeForPrecision, resolveJdbcTypeCode( precision ) );
@@ -50,11 +51,14 @@ public static <T> BindableType<T> resolveTemporalPrecision(
 	}
 
 	private static <T> TemporalJavaType<T> getTemporalTypeForPrecision(
-			TemporalType precision, TemporalJavaType<T> temporalJtd, TypeConfiguration typeConfiguration) {
+			@SuppressWarnings("deprecation") TemporalType precision,
+			TemporalJavaType<T> temporalJtd,
+			TypeConfiguration typeConfiguration) {
 		// Special case java.util.Date, because TemporalJavaType#resolveTypeForPrecision doesn't support widening,
 		// since the main purpose of that method is to determine the final java type based on the reflective type
 		// + the explicit @Temporal(TemporalType...) configuration
-		if ( temporalJtd == null || java.util.Date.class.isAssignableFrom( temporalJtd.getJavaTypeClass() ) ) {
+		if ( temporalJtd == null
+				|| java.util.Date.class.isAssignableFrom( temporalJtd.getJavaTypeClass() ) ) {
 			final var descriptor =
 					typeConfiguration.getJavaTypeRegistry()
 							.resolveDescriptor( resolveJavaTypeClass( precision ) );
@@ -69,32 +73,40 @@ private static <T> TemporalJavaType<T> getTemporalTypeForPrecision(
 	private static <T> TemporalJavaType<T> getTemporalJavaType(
 			BindableType<T> declaredParameterType, BindingContext bindingContext) {
 		if ( declaredParameterType != null ) {
-			final SqmExpressible<T> sqmExpressible = bindingContext.resolveExpressible( declaredParameterType );
-			if ( !( JavaTypeHelper.isTemporal( sqmExpressible.getExpressibleJavaType() ) ) ) {
+			final var javaType =
+					bindingContext.resolveExpressible( declaredParameterType )
+							.getExpressibleJavaType();
+			if ( !isTemporal( javaType ) ) {
 				throw new UnsupportedOperationException(
 						"Cannot treat non-temporal parameter type with temporal precision"
 				);
 			}
-			return (TemporalJavaType<T>) sqmExpressible.getExpressibleJavaType();
+			return (TemporalJavaType<T>) javaType;
 		}
 		else {
 			return null;
 		}
 	}
 
+	public static JdbcMapping resolveBindType(JdbcMapping baseType, JdbcParameter jdbcParameter) {
+		return baseType instanceof NullType && jdbcParameter.getExpressionType() != null
+				? jdbcParameter.getExpressionType().getSingleJdbcMapping()
+				: baseType;
+	}
+
 	public static JdbcMapping resolveBindType(
 			Object value,
 			JdbcMapping baseType,
 			TypeConfiguration typeConfiguration) {
-		if ( value == null || !JavaTypeHelper.isTemporal( baseType.getJdbcJavaType() ) ) {
+		if ( value == null || !isTemporal( baseType.getJdbcJavaType() ) ) {
 			return baseType;
 		}
 		else {
-			final Class<?> javaType = value.getClass();
-			final TemporalJavaType<?> temporalJavaType = (TemporalJavaType<?>) baseType.getJdbcJavaType();
-			final TemporalType temporalType = temporalJavaType.getPrecision();
-			final BindableType<?> bindableType = (BindableType<?>) baseType;
-			return switch ( temporalType ) {
+			final var javaType = value.getClass();
+			final var temporalJavaType = (TemporalJavaType<?>) baseType.getJdbcJavaType();
+			final var bindableType = (BindableType<?>) baseType;
+			// Cast individual arms of the switch to avoid a JDK 17 javac bug
+			return switch ( temporalJavaType.getPrecision() ) {
 				case TIMESTAMP -> (JdbcMapping) resolveTimestampTemporalTypeVariant( javaType, bindableType, typeConfiguration );
 				case DATE -> (JdbcMapping) resolveDateTemporalTypeVariant( javaType, bindableType, typeConfiguration );
 				case TIME -> (JdbcMapping) resolveTimeTemporalTypeVariant( javaType, bindableType, typeConfiguration );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/CompositeUserTypeJavaTypeWrapper.java b/hibernate-core/src/main/java/org/hibernate/type/internal/CompositeUserTypeJavaTypeWrapper.java
index d7454355bbfb..bc61a9cec25d 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/CompositeUserTypeJavaTypeWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/CompositeUserTypeJavaTypeWrapper.java
@@ -102,15 +102,12 @@ public J fromString(CharSequence string) {
 	@Override
 	public <X> X unwrap(J value, Class<X> type, WrapperOptions options) {
 		assert value == null || userType.returnedClass().isInstance( value );
-
-		//noinspection unchecked
-		return (X) value;
+		return type.cast( value );
 	}
 
 	@Override
 	public <X> J wrap(X value, WrapperOptions options) {
 //		assert value == null || userType.returnedClass().isInstance( value );
-
 		//noinspection unchecked
 		return (J) value;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/ParameterizedTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/ParameterizedTypeImpl.java
index b72de29aebcc..5d563f87aab2 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/ParameterizedTypeImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/ParameterizedTypeImpl.java
@@ -7,13 +7,12 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 import java.util.StringJoiner;
 
 import org.hibernate.models.spi.ParameterizedTypeDetails;
-import org.hibernate.models.spi.TypeDetails;
-import org.hibernate.models.spi.TypeVariableScope;
+
+import static org.hibernate.models.spi.TypeDetails.Kind.PARAMETERIZED_TYPE;
 
 public class ParameterizedTypeImpl implements ParameterizedType {
 
@@ -28,39 +27,33 @@ public ParameterizedTypeImpl(Type rawType, Type[] substTypeArgs, Type ownerType)
 	}
 
 	public static ParameterizedTypeImpl from(ParameterizedTypeDetails typeDetails) {
-		final java.lang.reflect.Type attributeType = typeDetails.determineRawClass().toJavaClass();
-
-		final List<TypeDetails> arguments = typeDetails.asParameterizedType().getArguments();
+		final var attributeType = typeDetails.determineRawClass().toJavaClass();
+		final var arguments = typeDetails.asParameterizedType().getArguments();
 		final int argumentsSize = arguments.size();
-		final java.lang.reflect.Type[] argumentTypes = new java.lang.reflect.Type[argumentsSize];
+		final var argumentTypes = new Type[argumentsSize];
 		for ( int i = 0; i < argumentsSize; i++ ) {
-			TypeDetails argument = arguments.get( i );
-			if ( argument.getTypeKind() == TypeDetails.Kind.PARAMETERIZED_TYPE ) {
-				argumentTypes[i] = from( argument.asParameterizedType() );
-			}
-			else {
-				argumentTypes[i] = argument.determineRawClass().toJavaClass();
-			}
-		}
-		final TypeVariableScope owner = typeDetails.asParameterizedType().getOwner();
-		final java.lang.reflect.Type ownerType;
-		if ( owner != null ) {
-			ownerType = owner.determineRawClass().toJavaClass();
-		}
-		else {
-			ownerType = null;
+			final var argument = arguments.get( i );
+			argumentTypes[i] =
+					argument.getTypeKind() == PARAMETERIZED_TYPE
+							? from( argument.asParameterizedType() )
+							: argument.determineRawClass().toJavaClass();
 		}
+		final var owner = typeDetails.asParameterizedType().getOwner();
+		final var ownerType = owner == null ? null : owner.determineRawClass().toJavaClass();
 		return new ParameterizedTypeImpl( attributeType, argumentTypes, ownerType );
 	}
 
+	@Override
 	public Type[] getActualTypeArguments() {
 		return substTypeArgs;
 	}
 
+	@Override
 	public Type getRawType() {
 		return rawType;
 	}
 
+	@Override
 	public Type getOwnerType() {
 		return ownerType;
 	}
@@ -84,42 +77,37 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		final StringBuilder sb = new StringBuilder();
+		final var typeExpression = new StringBuilder();
 		if ( ownerType != null ) {
-			sb.append( ownerType.getTypeName() );
-
-			sb.append( "$" );
-
+			typeExpression.append( ownerType.getTypeName() ).append( "$" );
 			if ( ownerType instanceof ParameterizedType parameterizedType ) {
-				// Find simple name of nested type by removing the
-				// shared prefix with owner.
-				sb.append(
-						rawType.getTypeName().replace(
-								parameterizedType.getRawType().getTypeName() + "$",
-								""
-						)
-				);
+				// Find the simple name of the nested type by
+				// removing the shared prefix with the outer type.
+				final int prefixLength =
+						parameterizedType.getRawType().getTypeName().length()
+						+ 1; // account for the '$' separator
+				typeExpression.append( rawType.getTypeName().substring( prefixLength ) );
 			}
 			else if ( rawType instanceof Class<?> clazz ) {
-				sb.append( clazz.getSimpleName() );
+				typeExpression.append( clazz.getSimpleName() );
 			}
 			else {
-				sb.append( rawType.getTypeName() );
+				typeExpression.append( rawType.getTypeName() );
 			}
 		}
 		else {
-			sb.append( rawType.getTypeName() );
+			typeExpression.append( rawType.getTypeName() );
 		}
 
 		if ( substTypeArgs != null ) {
-			final StringJoiner sj = new StringJoiner( ", ", "<", ">" );
-			sj.setEmptyValue( "" );
-			for ( Type t : substTypeArgs ) {
-				sj.add( t.getTypeName() );
+			final var argList = new StringJoiner( ", ", "<", ">" );
+			argList.setEmptyValue( "" );
+			for ( var type : substTypeArgs ) {
+				argList.add( type.getTypeName() );
 			}
-			sb.append( sj );
+			typeExpression.append( argList );
 		}
 
-		return sb.toString();
+		return typeExpression.toString();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java
index 7bc589fb4fdd..3dcdd99f22bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java
@@ -15,7 +15,6 @@
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
-import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.MutabilityPlan;
 import org.hibernate.type.descriptor.java.MutabilityPlanExposer;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
@@ -134,22 +133,20 @@ public <X> X unwrap(J value, Class<X> type, WrapperOptions options) {
 	private <X,R> X unwrap(J value, Class<X> type, BasicValueConverter<J, R> converter, WrapperOptions options) {
 		if ( value != null && !type.isInstance( value ) && converter != null ) {
 			final Object relationalValue = customType.convertToRelationalValue( value );
-			final JavaType<R> relationalJavaType = converter.getRelationalJavaType();
-			assert relationalJavaType.isInstance( relationalValue );
-			//noinspection unchecked
-			return relationalJavaType.unwrap( (R) relationalValue, type, options );
+			final var relationalJavaType = converter.getRelationalJavaType();
+			final var castValue = relationalJavaType.cast( relationalValue );
+			return relationalJavaType.unwrap( castValue, type, options );
 		}
 		else {
-			//noinspection unchecked
-			return (X) value;
+			return type.cast( value );
 		}
 	}
 
 	@Override
 	public <X> J wrap(X value, WrapperOptions options) {
-		final BasicValueConverter<J, ?> converter = customType.getValueConverter();
+		final var converter = customType.getValueConverter();
 		if ( value != null && !userType.returnedClass().isInstance( value ) && converter != null ) {
-			final JavaType<J> domainJavaType = converter.getDomainJavaType();
+			final var domainJavaType = converter.getDomainJavaType();
 			final Object domainValue = customType.convertToDomainValue( value );
 			assert domainJavaType.isInstance( value );
 			return domainJavaType.wrap( domainValue, options );
diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJdbcTypeAdapter.java b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJdbcTypeAdapter.java
index 4b46f66b3e7f..70660b1bc5ef 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJdbcTypeAdapter.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJdbcTypeAdapter.java
@@ -76,12 +76,11 @@ public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer length,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		//noinspection unchecked
-		return (JavaType<T>) javaType;
+		return javaType;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/package-info.java b/hibernate-core/src/main/java/org/hibernate/type/package-info.java
index 1816d7385541..a1ae72174c3a 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/package-info.java
@@ -13,7 +13,7 @@
  * importance to application developers, though it remains a very important
  * internal abstraction.
  *
- * <h3 id="basic">Basic types</h3>
+ * <h2 id="basic">Basic types</h2>
  *
  * For {@linkplain jakarta.persistence.Basic basic} types, we prefer to model the
  * type mapping in terms the combination of:
diff --git a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
index 81d57989d18c..5f374f98bbdf 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
@@ -83,6 +83,7 @@
 
 import static org.hibernate.id.uuid.LocalObjectUuidHelper.generateLocalObjectUuid;
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;
+import static org.hibernate.internal.util.type.PrimitiveWrappers.canonicalize;
 import static org.hibernate.query.sqm.internal.TypecheckUtil.isNumberArray;
 
 /**
@@ -265,7 +266,7 @@ public JpaCompliance getJpaCompliance() {
 	 */
 	@Internal
 	public Class<?> entityClassForEntityName(String entityName) {
-		return scope.entityClassForEntityName(entityName);
+		return scope.entityClassForEntityName( entityName );
 	}
 
 	@Override
@@ -364,7 +365,7 @@ public BasicType<?> resolveCastTargetType(String name) {
 			//won't work at all without some special casing in the Dialects
 //			case "uuid": return getBasicTypeForJavaType( UUID.class );
 			default: {
-				final BasicType<?> registeredBasicType = basicTypeRegistry.getRegisteredType( name );
+				final var registeredBasicType = basicTypeRegistry.getRegisteredType( name );
 				if ( registeredBasicType != null ) {
 					return registeredBasicType;
 				}
@@ -631,7 +632,6 @@ private Object readResolve() throws InvalidObjectException {
 					}
 				}
 			}
-
 			return this;
 		}
 
@@ -648,8 +648,9 @@ private Class<?> entityClassForEntityName(String entityName) {
 	private final ConcurrentMap<ArrayCacheKey, ArrayTupleType> arrayTuples = new ConcurrentHashMap<>();
 
 	public SqmBindableType<?> resolveTupleType(List<? extends SqmTypedNode<?>> typedNodes) {
-		final var components = new SqmBindableType<?>[typedNodes.size()];
-		for ( int i = 0; i < typedNodes.size(); i++ ) {
+		final int size = typedNodes.size();
+		final var components = new SqmBindableType<?>[size];
+		for ( int i = 0; i < size; i++ ) {
 			final var tupleElement = typedNodes.get(i);
 			final var sqmExpressible = tupleElement.getNodeType();
 			// keep null value for Named Parameters
@@ -657,9 +658,10 @@ public SqmBindableType<?> resolveTupleType(List<? extends SqmTypedNode<?>> typed
 				components[i] = QueryParameterJavaObjectType.INSTANCE;
 			}
 			else {
-				components[i] = sqmExpressible != null
-						? sqmExpressible
-						: castNonNull( getBasicTypeForJavaType( Object.class ) );
+				components[i] =
+						sqmExpressible == null
+								? castNonNull( getBasicTypeForJavaType( Object.class ) )
+								: sqmExpressible;
 			}
 		}
 		return arrayTuples.computeIfAbsent( new ArrayCacheKey( components ),
@@ -754,20 +756,44 @@ else if ( firstType==null && getSqlTemporalType( secondType ) != null ) {
 
 	private static boolean matchesJavaType(SqmExpressible<?> type, Class<?> javaType) {
 		assert javaType != null;
-		return type != null && javaType.isAssignableFrom( type.getRelationalJavaType().getJavaTypeClass() );
+		return type != null
+			&& javaType.isAssignableFrom( type.getRelationalJavaType().getJavaTypeClass() );
 	}
 
 
 	private final ConcurrentHashMap<Type, BasicType<?>> basicTypeByJavaType = new ConcurrentHashMap<>();
 
+	private static <J> BasicType<J> checkExisting(Class<J> javaClass, BasicType<?> existing) {
+		if ( existing.getJavaType() != canonicalize( javaClass ) ) {
+			throw new IllegalStateException( "Type registration was corrupted for: " + javaClass.getName() );
+		}
+		@SuppressWarnings("unchecked") // safe, we just checked
+		final var basicType = (BasicType<J>) existing;
+		return basicType;
+	}
+
+	@Deprecated(since = "7.2", forRemoval = true) // no longer used
 	public <J> @Nullable BasicType<J> getBasicTypeForGenericJavaType(Class<? super J> javaType, Type... typeArguments) {
 		//noinspection unchecked
-		return (BasicType<J>) getBasicTypeForJavaType( new ParameterizedTypeImpl( javaType, typeArguments, null ) );
+		return (BasicType<J>)
+				getBasicTypeForJavaType( new ParameterizedTypeImpl( javaType, typeArguments, null ) );
 	}
 
-	public <J> @Nullable BasicType<J> getBasicTypeForJavaType(Class<J> javaType) {
-		//noinspection unchecked
-		return (BasicType<J>) getBasicTypeForJavaType( (Type) javaType );
+	public <J> @Nullable BasicType<J> getBasicTypeForJavaType(Class<J> javaClass) {
+		final var existing = basicTypeByJavaType.get( javaClass );
+		if ( existing != null ) {
+			return checkExisting( javaClass, existing );
+		}
+		else {
+			final var registeredType = basicTypeRegistry.getRegisteredType( javaClass );
+			if ( registeredType != null ) {
+				basicTypeByJavaType.put( javaClass, registeredType );
+				return registeredType;
+			}
+			else {
+				return null;
+			}
+		}
 	}
 
 	public @Nullable BasicType<?> getBasicTypeForJavaType(Type javaType) {
@@ -787,65 +813,64 @@ private static boolean matchesJavaType(SqmExpressible<?> type, Class<?> javaType
 		}
 	}
 
-	public <J> BasicType<J> standardBasicTypeForJavaType(Class<J> javaType) {
-		if ( javaType == null ) {
-			return null;
-		}
-		else {
-			return standardBasicTypeForJavaType( javaType,
-					javaTypeDescriptor -> new BasicTypeImpl<>( javaTypeDescriptor,
-							javaTypeDescriptor.getRecommendedJdbcType( getCurrentBaseSqlTypeIndicators() ) ) );
-		}
+	public <J> BasicType<J> standardBasicTypeForJavaType(Class<J> javaClass) {
+		return javaClass == null ? null
+				: standardBasicTypeForJavaType( javaClass,
+						descriptor -> new BasicTypeImpl<>( descriptor,
+								descriptor.getRecommendedJdbcType(
+										getCurrentBaseSqlTypeIndicators() ) ) );
 	}
 
 	public BasicType<?> standardBasicTypeForJavaType(Type javaType) {
-		if ( javaType == null ) {
-			return null;
-		}
-		else {
-			return standardBasicTypeForJavaType( javaType,
-					javaTypeDescriptor -> new BasicTypeImpl<>( javaTypeDescriptor,
-							javaTypeDescriptor.getRecommendedJdbcType( getCurrentBaseSqlTypeIndicators() ) ) );
-		}
+		return javaType == null ? null
+				: standardBasicTypeForJavaType( javaType,
+						descriptor -> new BasicTypeImpl<>( descriptor,
+								descriptor.getRecommendedJdbcType(
+										getCurrentBaseSqlTypeIndicators() ) ) );
 	}
 
 	@Deprecated(since = "7.2", forRemoval = true) // Can be private
 	public <J> BasicType<J> standardBasicTypeForJavaType(
-			Class<J> javaType,
+			Class<J> javaClass,
 			Function<JavaType<J>, BasicType<J>> creator) {
-		if ( javaType == null ) {
+		if ( javaClass == null ) {
 			return null;
 		}
-		//noinspection unchecked
-		return (BasicType<J>) basicTypeByJavaType.computeIfAbsent(
-				javaType,
-				jt -> {
-					// See if one exists in the BasicTypeRegistry and use that one if so
-					final var registeredType = basicTypeRegistry.getRegisteredType( javaType );
-					return registeredType != null
-							? registeredType
-							: creator.apply( javaTypeRegistry.getDescriptor( javaType ) );
-				}
-		);
+		var existing = basicTypeByJavaType.get( javaClass );
+		if ( existing != null ) {
+			return checkExisting( javaClass, existing );
+		}
+		else {
+			// See if one exists in the BasicTypeRegistry and use that one if so
+			final var registeredType =
+					basicTypeRegistry.getRegisteredType( javaClass );
+			return registeredType == null
+					? creator.apply( javaTypeRegistry.resolveDescriptor( javaClass ) )
+					: registeredType;
+		}
 	}
 
-	@Deprecated(since = "7.2", forRemoval = true) // Due to weird signature
+	@Deprecated(since = "7.2", forRemoval = true) // Due to weird signature and unchecked cast
 	public <J> BasicType<?> standardBasicTypeForJavaType(
 			Type javaType,
 			Function<JavaType<J>, BasicType<J>> creator) {
 		if ( javaType == null ) {
 			return null;
 		}
-		return basicTypeByJavaType.computeIfAbsent(
-				javaType,
-				jt -> {
-					// See if one exists in the BasicTypeRegistry and use that one if so
-					final var registeredType = basicTypeRegistry.getRegisteredType( javaType );
-					return registeredType != null
-							? registeredType
-							: creator.apply( javaTypeRegistry.getDescriptor( javaType ) );
-				}
-		);
+		var existing = basicTypeByJavaType.get( javaType );
+		if ( existing != null ) {
+			return existing;
+		}
+		else {
+			// See if one exists in the BasicTypeRegistry and use that one if so
+			final var registeredType =
+					basicTypeRegistry.getRegisteredType( javaType );
+			//noinspection unchecked
+			return registeredType == null
+					? creator.apply( (JavaType<J>) // UNCHECKED CAST
+							javaTypeRegistry.resolveDescriptor( javaType ) )
+					: registeredType;
+		}
 	}
 
 	@SuppressWarnings("deprecation")
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/AnnotationBasedUserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/AnnotationBasedUserType.java
new file mode 100644
index 000000000000..ed1afc91b226
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/AnnotationBasedUserType.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.usertype;
+
+import org.hibernate.Incubating;
+
+import java.lang.annotation.Annotation;
+
+
+/**
+ * A {@link UserType} which receives parameters from a custom annotation.
+ * <p>
+ * Implementing this interface is the same as providing a constructor with the same
+ * signature as the {@link #initialize} method. But implementing this interface is
+ * slightly more typesafe.
+ * <p>
+ * For example, implementing {@code AnnotationBasedUserType<AnnotationType>} is the
+ * same as providing a constructor with this signature:
+ * <pre>
+ * public CustomTypeClass(AnnotationType config,
+ *                        UserTypeCreationContext creationContext)
+ * </pre>
+ * <p>
+ * where {@code CustomTypeClass} is the class that implements {@code UserType}, and
+ * {@code AnnotationType} is the custom annotation type used to configure the custom
+ * type. That is, it is an annotation type annotated
+ * {@link org.hibernate.annotations.Type @Type}.
+ * <pre>
+ * &#64;Type(CustomTypeClass.class)
+ * public &#64;interface AnnotationType { ... }
+ * </pre>
+ *
+ * @param <A> The user type annotation type supported by an implementation
+ * @param <J> The java type
+ *
+ * @author Yanming Zhou
+ *
+ * @since 7.3
+ */
+@Incubating
+public interface AnnotationBasedUserType<A extends Annotation, J> extends UserType<J> {
+	/**
+	 * Initializes this generation strategy for the given annotation instance.
+	 *
+	 * @param annotation an instance of the user type annotation type. Typically,
+	 *                   implementations will retrieve the annotation's attribute
+	 *                   values and store them in fields.
+	 * @param context a {@link UserTypeCreationContext}.
+	 * @throws org.hibernate.HibernateException in case an error occurred during initialization, e.g. if
+	 *                                          an implementation can't create a value for the given property type.
+	 */
+	void initialize(A annotation, UserTypeCreationContext context);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/ParameterizedType.java b/hibernate-core/src/main/java/org/hibernate/usertype/ParameterizedType.java
index 1de4569a92d3..1e6b1e278efe 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/ParameterizedType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/ParameterizedType.java
@@ -8,18 +8,57 @@
 
 /**
  * Support for parameterizable types. A {@link UserType} or {@link UserCollectionType}
- * may be made parameterizable by implementing this interface. Parameters for a type
- * may be set by using a nested type element for the property element in the mapping
- * file, or by defining a typedef.
+ * may be made parameterizable by implementing this interface. Arguments to parameters
+ * may be specified via {@link org.hibernate.annotations.Type#parameters}. In XML,
+ * parameters for a type may be set by using a nested type element for the property
+ * element in the mapping file, or by defining a typedef.
  *
  * @see org.hibernate.annotations.Type#parameters
  *
+ * @apiNote This interface provides little type safety, and results in verbosity
+ * at the use site. A much better approach is now provided by the possibility of
+ * declaring a {@link UserType} via an intermediate type annotation. Then the
+ * interface {@link AnnotationBasedUserType} provides a modernized alternative
+ * approach to defining configurable custom types.
+ * <p>For example, we could define a type annotation for the type {@code TimePeriod}:
+ * <pre>
+ * &#64;Type(PeriodType.class) // the type itself
+ * &#64;Target({METHOD, FIELD})
+ * &#64;Retention(RUNTIME)
+ * // the type annotation:
+ * public @interface TimePeriod {
+ *     // member specifying custom configuration
+ *     // affecting the behavior of the UserType:
+ *     boolean days() default false;
+ * }
+ * </pre>
+ * <p>Then the {@code UserType} implementation receives an instance of the type
+ * annotation in its constructor, or via {@link AnnotationBasedUserType#initialize}:
+ * <pre>
+ * static class PeriodType
+ *         implements AnnotationBasedUserType&lt;TimePeriod,Period&gt; {
+ *     private final boolean days;
+ *
+ *     // constructor configures the UserType from
+ *     // information in the annotation instance:
+ *     &#64;Override
+ *     void initialize(TimePeriod timePeriod,
+ *                     UserTypeCreationContext context) {
+ *         days = timePeriod.days();
+ *     }
+ *     // implementation of UserType operations:
+ *     ...
+ * }
+ * </pre>
+ * This interface will eventually be deprecated.
+ *
  * @author Michael Gloegl
  */
 public interface ParameterizedType {
 	/**
-	 * Gets called by Hibernate to pass the configured type parameters to
-	 * the implementation.
+	 * Called by Hibernate to pass the parameters
+	 * specified in the XML mapping file or by
+	 * {@link org.hibernate.annotations.Type#parameters}.
 	 */
 	void setParameterValues(Properties parameters);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java
index 96757961a1bf..d80f2b31ad76 100644
--- a/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java
@@ -116,6 +116,13 @@
  * And then use the {@code @TimePeriod} annotation to apply our {@code UserType}:
  * <pre>&#64;TimePeriod Period period;</pre>
  * <p>
+ * The {@code @TimePeriod} annotation might even have members:
+ * <pre>&#64;TimePeriod(precision=DAYS) Period period;</pre>
+ * <p>
+ * In this case, the implementation of {@code UserType} may declare a constructor
+ * which accepts the annotation type, and use the values assigned to the members
+ * to customize its behavior.
+ * <p>
  * Finally, we could ask for our custom type to be used by default:
  * <pre>&#64;TypeRegistration(basicClass = Period.class, userType = PeriodType.class)</pre>
  * <p>
@@ -142,7 +149,6 @@
  * <p>
  * A {@code UserType} is much more useful when the persistent attribute
  * type is mutable. For example:
- * <p>
  * <pre>
  * public class BitSetUserType implements UserType&lt;BitSet&gt; {
  *
@@ -206,9 +212,23 @@
  *     }
  * }
  * </pre>
+ * Every implementor of {@code UserType} must be immutable.
  * <p>
- * Every implementor of {@code UserType} must be immutable and must
- * declare a public default constructor.
+ * A custom type may receive parameters from its type annotation.
+ * The custom type may either:
+ * <ul>
+ * <li>implement {@link AnnotationBasedUserType}, and receive the
+ *     annotation as an argument to
+ *     {@link AnnotationBasedUserType#initialize},
+ * <li>declare a constructor with the same signature as
+ *     {@link AnnotationBasedUserType#initialize},
+ * <li>declare a constructor which accepts just the annotation instance,
+ *     or
+ * <li>declare a constructor which accepts just the {@link UserTypeCreationContext},
+ *     or
+ * <li>declare only a default constructor, in which case it does not
+ *     receive parameters.
+ * </ul>
  * <p>
  * A custom type implemented as a {@code UserType} is treated as a
  * non-composite value, and does not have persistent attributes which
@@ -235,6 +255,7 @@
  *
  * @see org.hibernate.type.Type
  * @see org.hibernate.type.CustomType
+ * @see org.hibernate.usertype.AnnotationBasedUserType
  *
  * @see org.hibernate.annotations.Type
  * @see org.hibernate.annotations.TypeRegistration
@@ -448,8 +469,9 @@ default Serializable disassemble(J value) {
 	 * @see org.hibernate.Cache
 	 */
 	default J assemble(Serializable cached, Object owner) {
-		if ( returnedClass().isInstance( cached) ) {
-			return deepCopy( (J) cached );
+		final var returnedClass = returnedClass();
+		if ( returnedClass.isInstance( cached ) ) {
+			return deepCopy( returnedClass.cast( cached ) );
 		}
 		else {
 			throw new UnsupportedOperationException( "User-defined type '"
diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeCreationContext.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeCreationContext.java
new file mode 100644
index 000000000000..d30b90cd112d
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/usertype/UserTypeCreationContext.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.usertype;
+
+import org.hibernate.Incubating;
+import org.hibernate.annotations.Type;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.models.spi.MemberDetails;
+import org.hibernate.service.ServiceRegistry;
+
+import java.util.Properties;
+
+/**
+ * Access to information useful during {@linkplain UserType} creation and initialization.
+ *
+ * @author Yanming Zhou
+ * @see AnnotationBasedUserType
+ *
+ * @since 7.3
+ */
+@Incubating
+public interface UserTypeCreationContext {
+	/**
+	 * Access to the {@link MetadataBuildingContext}.
+	 */
+	MetadataBuildingContext getBuildingContext();
+
+	/**
+	 * Access to available services.
+	 */
+	ServiceRegistry getServiceRegistry();
+
+	/**
+	 * Access to the {@link MemberDetails}.
+	 */
+	MemberDetails getMemberDetails();
+
+	/**
+	 * Access to the parameters.
+	 *
+	 * @see Type#parameters()
+	 */
+	Properties getParameters();
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/boot/models/AnnotationDescriptorMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/boot/models/AnnotationDescriptorMetadataTest.java
new file mode 100644
index 000000000000..8b4d5af9c8fa
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/boot/models/AnnotationDescriptorMetadataTest.java
@@ -0,0 +1,113 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.models;
+
+import java.lang.annotation.Annotation;
+import java.util.EnumSet;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+import org.hibernate.models.internal.AnnotationHelper;
+import org.hibernate.models.spi.AnnotationDescriptor;
+import org.hibernate.models.spi.AnnotationTarget;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class AnnotationDescriptorMetadataTest {
+
+	@Test
+	public void testHibernateAnnotationsMetadata() {
+		testAnnotationRegistry( "HibernateAnnotations", HibernateAnnotations::forEachAnnotation );
+	}
+
+	@Test
+	public void testJpaAnnotationsMetadata() {
+		testAnnotationRegistry( "JpaAnnotations", JpaAnnotations::forEachAnnotation );
+	}
+
+	@Test
+	public void testXmlAnnotationsMetadata() {
+		testAnnotationRegistry( "XmlAnnotations", XmlAnnotations::forEachAnnotation );
+	}
+
+	@Test
+	public void testDialectOverrideAnnotationsMetadata() {
+		testAnnotationRegistry( "DialectOverrideAnnotations", DialectOverrideAnnotations::forEachAnnotation );
+	}
+
+	private void testAnnotationRegistry(
+			String registryName,
+			Consumer<Consumer<AnnotationDescriptor<?>>> forEachAnnotation) {
+		final AtomicInteger count = new AtomicInteger();
+		final AtomicInteger failures = new AtomicInteger();
+		final StringBuilder errorLog = new StringBuilder();
+
+		forEachAnnotation.accept( descriptor -> {
+			count.incrementAndGet();
+			try {
+				verifyDescriptor( descriptor );
+			}
+			catch (AssertionError e) {
+				failures.incrementAndGet();
+				errorLog.append( "\n  - " ).append( e.getMessage() );
+			}
+		} );
+
+		if ( failures.get() > 0 ) {
+			fail( String.format(
+					"%s: %d of %d descriptors have incorrect metadata:%s",
+					registryName,
+					failures.get(),
+					count.get(),
+					errorLog
+			) );
+		}
+
+		System.out.printf( "%s: All %d descriptors verified successfully%n", registryName, count.get() );
+	}
+
+	private void verifyDescriptor(AnnotationDescriptor<?> descriptor) {
+		Class<? extends Annotation> annotationType = descriptor.getAnnotationType();
+		String annotationName = annotationType.getName();
+
+		EnumSet<AnnotationTarget.Kind> expectedTargets = AnnotationHelper.extractTargets(annotationType);
+		EnumSet<AnnotationTarget.Kind> actualTargets = descriptor.getAllowableTargets();
+
+		assertEquals(
+				expectedTargets,
+				actualTargets,
+				String.format(
+						"%s: Targets mismatch - expected %s but got %s",
+						annotationName,
+						formatTargets(expectedTargets),
+						formatTargets(actualTargets)
+				)
+		);
+
+		boolean expectedInherited = AnnotationHelper.isInherited(annotationType);
+		boolean actualInherited = descriptor.isInherited();
+
+		assertEquals(
+				expectedInherited,
+				actualInherited,
+				String.format(
+						"%s: Inherited mismatch - expected %s but got %s",
+						annotationName,
+						expectedInherited,
+						actualInherited
+				)
+		);
+	}
+
+	private String formatTargets(EnumSet<AnnotationTarget.Kind> targets) {
+		if (targets.size() == AnnotationTarget.Kind.values().length) {
+			return "ALL";
+		}
+		return targets.toString();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/DialectTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/DialectTest.java
index e2493286e83b..d45ec967a3c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/dialect/DialectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/dialect/DialectTest.java
@@ -24,21 +24,32 @@ static Stream<Arguments> _addQueryHints() {
 
 		final String hints = "MY_INDEX";
 		final String simpleQuery = "select COUNT(*) from TEST t1_0 where column1 = 'value'";
-		builder.add(
-			Arguments.of("Simple query : hint",
-				"select COUNT(*) from TEST t1_0  use index (MY_INDEX) where column1 = 'value'", simpleQuery, hints));
+		builder.add(Arguments.of("Simple query : hint",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX) where column1 = 'value'", simpleQuery, hints));
+		final String limitQuery = "select COUNT(*) from TEST t1_0 order by column1 limit 1";
+		builder.add(Arguments.of("Limit query : hint",
+				"select COUNT(*) from TEST t1_0 use index (MY_INDEX) order by column1 limit 1",
+				limitQuery, hints));
 		final String joinQueryUsing = "select COUNT(*) from TEST t1_0 join TEST2 t2_0 using(column2) where field = 'value'";
 		builder.add(Arguments.of("Join query with using : hint",
-			"select COUNT(*) from TEST t1_0  use index (MY_INDEX) join TEST2 t2_0 using(column2) where field = 'value'",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX) join TEST2 t2_0 using(column2) where field = 'value'",
 			joinQueryUsing, hints));
 		final String joinQueryOn = "select COUNT(*) from TEST t1_0 join TEST2 t2_0 on t1_0.column2 = t2_0.column2 where field = 'value'";
 		builder.add(Arguments.of("Join query with on : hint",
-			"select COUNT(*) from TEST t1_0  use index (MY_INDEX) join TEST2 t2_0 on t1_0.column2 = t2_0.column2 where field = 'value'",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX) join TEST2 t2_0 on t1_0.column2 = t2_0.column2 where field = 'value'",
 			joinQueryOn, hints));
 		final String leftJoinQuery = "select COUNT(*) from TEST t1_0 left join TEST2 t2_0 on t1_0.column2 = t2_0.column2 and t1_0.column3 = t2_0.column3 where field = 'value'";
 		builder.add(Arguments.of("Left join query with on : hint",
-			"select COUNT(*) from TEST t1_0  use index (MY_INDEX) left join TEST2 t2_0 on t1_0.column2 = t2_0.column2 and t1_0.column3 = t2_0.column3 where field = 'value'",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX) left join TEST2 t2_0 on t1_0.column2 = t2_0.column2 and t1_0.column3 = t2_0.column3 where field = 'value'",
 			leftJoinQuery, hints));
+		final String straightJoinQueryUsing = "select COUNT(*) from TEST t1_0 straight_join TEST2 t2_0 using(column2) where field = 'value'";
+		builder.add(Arguments.of("Straight join query with using : hint",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX) straight_join TEST2 t2_0 using(column2) where field = 'value'",
+			straightJoinQueryUsing, hints));
+		final String straightJoinQueryOn = "select COUNT(*) from TEST t1_0 straight_join TEST2 t2_0 on t1_0.column2 = t2_0.column2 where field = 'value'";
+		builder.add(Arguments.of("Straight join query with on : hint",
+			"select COUNT(*) from TEST t1_0 use index (MY_INDEX) straight_join TEST2 t2_0 on t1_0.column2 = t2_0.column2 where field = 'value'",
+			straightJoinQueryOn, hints));
 
 		return builder.build();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/internal/FilterImplSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/internal/FilterImplSerializationTest.java
new file mode 100644
index 000000000000..c91eb426f3da
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/internal/FilterImplSerializationTest.java
@@ -0,0 +1,71 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.internal;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.hibernate.engine.spi.FilterDefinition;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.internal.util.SerializationHelper;
+import org.hibernate.metamodel.mapping.JdbcMapping;
+import org.hibernate.type.StandardBasicTypes;
+import org.hibernate.type.spi.TypeConfiguration;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class FilterImplSerializationTest {
+
+	@Test
+	public void testValidateAfterDeserialize() throws Exception {
+		final FilterDefinition definition = buildDefinition();
+		final FilterImpl filter = new FilterImpl( definition );
+		filter.setParameter( "param", "value" );
+		filter.validate();
+
+		final FilterImpl deserialized = (FilterImpl) SerializationHelper.deserialize(
+				SerializationHelper.serialize( filter ),
+				FilterImpl.class.getClassLoader()
+		);
+
+		assertThat( readValidated( deserialized ) ).isFalse();
+
+		final SessionFactoryImplementor factory = mock( SessionFactoryImplementor.class );
+		when( factory.getFilterDefinition( "testFilter" ) ).thenReturn( definition );
+
+		deserialized.afterDeserialize( factory );
+
+		assertThat( readValidated( deserialized ) ).isTrue();
+		deserialized.setParameter( "param", "updated" );
+		assertThat( readValidated( deserialized ) ).isFalse();
+		deserialized.validate();
+		assertThat( readValidated( deserialized ) ).isTrue();
+		deserialized.setParameterList( "param", Arrays.asList( "list-value" ) );
+		assertThat( readValidated( deserialized ) ).isFalse();
+		deserialized.validate();
+		assertThat( readValidated( deserialized ) ).isTrue();
+	}
+
+	private static FilterDefinition buildDefinition() {
+		final TypeConfiguration typeConfiguration = new TypeConfiguration();
+		final JdbcMapping mapping =
+				typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.STRING );
+		final Map<String, JdbcMapping> paramMappings = new HashMap<>();
+		paramMappings.put( "param", mapping );
+		return new FilterDefinition( "testFilter", "col = :param", paramMappings );
+	}
+
+	private static boolean readValidated(FilterImpl filter) throws Exception {
+		final Field validatedField = FilterImpl.class.getDeclaredField( "validated" );
+		validatedField.setAccessible( true );
+		return validatedField.getBoolean( filter );
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/internal/util/SubSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/internal/util/SubSequenceTest.java
new file mode 100644
index 000000000000..9aa0e18bbb62
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/internal/util/SubSequenceTest.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.internal.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class SubSequenceTest {
+	@Test
+	public void subSequenceAllowsEmptyAtEnd() {
+		CharSequence sequence = new SubSequence("abc", 0, 3);
+		CharSequence empty = sequence.subSequence(3, 3);
+
+		assertThat(empty.toString()).isEmpty();
+		assertThat(empty.length()).isZero();
+	}
+
+	@Test
+	public void subSequenceRejectsEndBeforeStart() {
+		CharSequence sequence = new SubSequence("abc", 0, 3);
+
+		assertThatThrownBy(() -> sequence.subSequence(2, 1))
+				.isInstanceOf(StringIndexOutOfBoundsException.class);
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/EnumType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/EnumType.java
index 338c44fde74f..d04760f2a4f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/EnumType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/EnumType.java
@@ -175,11 +175,10 @@ private boolean isNationalized(ParameterType reader) {
 			|| reader!=null && getAnnotation( reader.getAnnotationsMethod(), Nationalized.class ) != null;
 	}
 
-	@SuppressWarnings("unchecked")
 	private <A extends Annotation> A getAnnotation(Annotation[] annotations, Class<A> annotationType) {
 		for ( Annotation annotation : annotations ) {
 			if ( annotationType.isInstance( annotation ) ) {
-				return (A) annotation;
+				return annotationType.cast( annotation );
 			}
 		}
 		return null;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java
index 6f54f0fb6914..8956ba23fff6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java
@@ -11,6 +11,7 @@
 
 import org.hibernate.HibernateException;
 
+import org.hibernate.event.spi.EventSource;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -38,7 +39,7 @@ public void cleanup(SessionFactoryScope scope) {
 	public void success(SessionFactoryScope scope) {
 		scope.inSession( session -> {
 			AtomicBoolean called = new AtomicBoolean( false );
-			session.getActionQueue().registerCallback(
+			session.unwrap( EventSource.class ).getActionQueue().registerCallback(
 					(success, session1) -> called.set(true) );
 			Assertions.assertFalse( called.get() );
 			scope.inTransaction( session, theSession -> theSession.persist(new SimpleEntity("jack")) );
@@ -57,7 +58,7 @@ public void success(SessionFactoryScope scope) {
 	public void failure(SessionFactoryScope scope) {
 		try {
 			scope.inSession( session -> {
-				session.getActionQueue().registerCallback(
+				session.unwrap( EventSource.class ).getActionQueue().registerCallback(
 						(success, session1) -> {throw new RuntimeException( "My exception" );} );
 				scope.inTransaction( session, theSession -> theSession.persist(new SimpleEntity("jack")) );
 			} );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java
index ed219c78421e..2f37a15108b7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java
@@ -11,6 +11,7 @@
 
 import org.hibernate.HibernateException;
 
+import org.hibernate.event.spi.EventSource;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -38,7 +39,7 @@ public void cleanup(SessionFactoryScope scope) {
 	public void success(SessionFactoryScope scope) {
 		scope.inSession( session -> {
 			AtomicBoolean called = new AtomicBoolean( false );
-			session.getActionQueue().registerCallback( s -> called.set(true) );
+			session.unwrap( EventSource.class ).getActionQueue().registerCallback( s -> called.set(true) );
 			Assertions.assertFalse( called.get() );
 			scope.inTransaction( session, theSession -> theSession.persist(new SimpleEntity("jack")) );
 			Assertions.assertTrue( called.get() );
@@ -57,7 +58,7 @@ public void success(SessionFactoryScope scope) {
 	public void failure(SessionFactoryScope scope) {
 		try {
 			scope.inSession( session -> {
-				session.getActionQueue().registerCallback( session1 -> {
+				session.unwrap( EventSource.class ).getActionQueue().registerCallback( session1 -> {
 					throw new RuntimeException( "My exception" );
 				} );
 				scope.inTransaction( session, theSession -> theSession.persist(new SimpleEntity("jack")) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/JtaCustomAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/JtaCustomAfterCompletionTest.java
index 3526e0285100..ece023baf083 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/JtaCustomAfterCompletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/JtaCustomAfterCompletionTest.java
@@ -10,8 +10,8 @@
 import org.hibernate.action.spi.AfterTransactionCompletionProcess;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.event.spi.EventSource;
 import org.hibernate.orm.test.jpa.transaction.JtaPlatformSettingProvider;
 import org.hibernate.testing.jta.TestingJtaPlatformImpl;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
@@ -54,7 +54,7 @@ public void success(EntityManagerFactoryScope scope) {
 		try {
 			TestingJtaPlatformImpl.INSTANCE.getTransactionManager().begin();
 			scope.inEntityManager( session -> {
-				session.unwrap( SessionImplementor.class ).getActionQueue()
+				session.unwrap( EventSource.class ).getActionQueue()
 						.registerCallback( new AfterTransactionCompletionProcess() {
 							@Override
 							public void doAfterTransactionCompletion(boolean success, SharedSessionContractImplementor session) {
@@ -91,7 +91,7 @@ public void rollback(EntityManagerFactoryScope scope) {
 			AtomicBoolean called = new AtomicBoolean( false );
 			TestingJtaPlatformImpl.INSTANCE.getTransactionManager().begin();
 			scope.inEntityManager( session -> {
-				session.unwrap( SessionImplementor.class ).getActionQueue()
+				session.unwrap( EventSource.class ).getActionQueue()
 						.registerCallback( new AfterTransactionCompletionProcess() {
 							@Override
 							public void doAfterTransactionCompletion(boolean success, SharedSessionContractImplementor session) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationUpdatedTimestampInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationUpdatedTimestampInEmbeddableDbTest.java
similarity index 74%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationUpdatedTimestampInEmbeddableTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationUpdatedTimestampInEmbeddableDbTest.java
index cacf40ba7a7e..9ac24b238565 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationUpdatedTimestampInEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationUpdatedTimestampInEmbeddableDbTest.java
@@ -4,8 +4,15 @@
  */
 package org.hibernate.orm.test.annotations;
 
-import jakarta.persistence.*;
+import java.time.LocalDateTime;
+
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
 import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.SourceType;
 import org.hibernate.annotations.UpdateTimestamp;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -14,18 +21,16 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.time.LocalDateTime;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DomainModel(
 		annotatedClasses = {
-				CreationUpdatedTimestampInEmbeddableTest.Event.class,
-				CreationUpdatedTimestampInEmbeddableTest.History.class,
+				CreationUpdatedTimestampInEmbeddableDbTest.Event.class,
+				CreationUpdatedTimestampInEmbeddableDbTest.History.class,
 		}
 )
 @SessionFactory
-class CreationUpdatedTimestampInEmbeddableTest {
+class CreationUpdatedTimestampInEmbeddableDbTest {
 
 	@BeforeEach
 	void setUp(SessionFactoryScope scope) {
@@ -45,8 +50,8 @@ void tearDown(SessionFactoryScope scope) {
 	@Test
 	void test(SessionFactoryScope scope) {
 		LocalDateTime created = scope.fromTransaction( session -> {
-			Event fruit = session.get( Event.class, 1L );
-			return fruit.history.created;
+			Event event = session.get( Event.class, 1L );
+			return event.history.created;
 		} );
 
 		scope.inTransaction( session -> {
@@ -57,7 +62,7 @@ void test(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Event event = session.get( Event.class, 1L );
 			assertThat( event.history.created ).isEqualTo( created );
-			assertThat( event.history.updated ).isNotEqualTo( created );
+			assertThat( event.history.updated ).isNotNull();
 			assertThat( event.name ).isEqualTo( "concert" );
 		} );
 	}
@@ -77,12 +82,10 @@ public static class Event {
 
 	@Embeddable
 	public static class History {
-		@Column
-		@CreationTimestamp
+		@CreationTimestamp(source = SourceType.DB)
 		public LocalDateTime created;
 
-		@Column
-		@UpdateTimestamp
+		@UpdateTimestamp(source = SourceType.DB)
 		public LocalDateTime updated;
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseTimestampsColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseTimestampsColumnTest.java
index 3c94d216e38a..0419471b3bc5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseTimestampsColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/DatabaseTimestampsColumnTest.java
@@ -6,7 +6,6 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.lang.reflect.Member;
 import java.util.Date;
 import java.util.EnumSet;
 
@@ -15,7 +14,6 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.EventTypeSets;
-import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.generator.OnExecutionGenerator;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
@@ -82,7 +80,7 @@ public Date getTimestamp() {
 	public static class TimestampValueGeneration implements OnExecutionGenerator {
 		private EnumSet<EventType> events;
 
-		public TimestampValueGeneration(Timestamp annotation, Member member, GeneratorCreationContext context) {
+		public TimestampValueGeneration(Timestamp annotation) {
 			events = EventTypeSets.fromArray( annotation.value() );
 		}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java
index 3c83cc3ecd29..13f628c07669 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java
@@ -8,9 +8,9 @@
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.List;
 import java.util.TimeZone;
 
 import jakarta.persistence.OptimisticLockException;
@@ -22,7 +22,6 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.OracleDialect;
-import org.hibernate.query.Query;
 import org.hibernate.type.StandardBasicTypes;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -37,8 +36,9 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
@@ -59,7 +59,7 @@
 )
 @SessionFactory
 public class EntityTest {
-	private DateFormat df = SimpleDateFormat.getDateTimeInstance( DateFormat.LONG, DateFormat.LONG );
+	private final DateFormat dateFormat = SimpleDateFormat.getDateTimeInstance( DateFormat.LONG, DateFormat.LONG );
 
 	@Test
 	public void testLoad(DomainModelScope domainModelScope, SessionFactoryScope sessionFactoryScope) throws Exception {
@@ -69,9 +69,9 @@ public void testLoad(DomainModelScope domainModelScope, SessionFactoryScope sess
 		sessionFactoryScope.inTransaction(
 				session -> {
 					Flight firstOne = new Flight();
-					firstOne.setId( Long.valueOf( 1 ) );
+					firstOne.setId( 1L );
 					firstOne.setName( "AF3202" );
-					firstOne.setDuration( new Long( 1000000 ) );
+					firstOne.setDuration( 1000000L );
 					firstOne.setDurationInSec( 2000 );
 					session.persist( firstOne );
 					session.flush();
@@ -81,12 +81,12 @@ public void testLoad(DomainModelScope domainModelScope, SessionFactoryScope sess
 		//read it
 		sessionFactoryScope.inTransaction(
 				session -> {
-					Flight firstOne = session.get( Flight.class, Long.valueOf( 1 ) );
+					Flight firstOne = session.get( Flight.class, 1L );
 					assertNotNull( firstOne );
-					assertEquals( Long.valueOf( 1 ), firstOne.getId() );
+					assertEquals( 1L, firstOne.getId() );
 					assertEquals( "AF3202", firstOne.getName() );
-					assertEquals( Long.valueOf( 1000000 ), firstOne.getDuration() );
-					assertFalse( 2000l == firstOne.getDurationInSec(), "Transient is not working" );
+					assertEquals( 1000000L, firstOne.getDuration() );
+					assertNotEquals( 2000L, firstOne.getDurationInSec(), "Transient is not working" );
 				}
 		);
 	}
@@ -97,9 +97,9 @@ public void testColumn(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					Flight firstOne = new Flight();
-					firstOne.setId( Long.valueOf( 1 ) );
+					firstOne.setId( 1L );
 					firstOne.setName( "AF3202" );
-					firstOne.setDuration( Long.valueOf( 1000000 ) );
+					firstOne.setDuration( 1000000L );
 					firstOne.setDurationInSec( 2000 );
 					session.persist( firstOne );
 					session.flush();
@@ -110,7 +110,7 @@ public void testColumn(SessionFactoryScope scope) {
 				session -> {
 					Transaction tx = session.beginTransaction();
 					Flight firstOne = new Flight();
-					firstOne.setId( Long.valueOf( 1 ) );
+					firstOne.setId( 1L );
 					firstOne.setName( null );
 
 					try {
@@ -127,8 +127,9 @@ public void testColumn(SessionFactoryScope scope) {
 		//insert an object and check that name is not updatable
 		scope.inTransaction(
 				session -> {
+					@SuppressWarnings("WriteOnlyObject")
 					Flight firstOne = new Flight();
-					firstOne.setId( Long.valueOf( 1 ) );
+					firstOne.setId( 1L );
 					firstOne.setName( "AF3202" );
 					firstOne.setTriggeredData( "should not be insertable" );
 				}
@@ -136,11 +137,11 @@ public void testColumn(SessionFactoryScope scope) {
 
 		scope.inTransaction(
 				session -> {
-					Flight firstOne = session.get( Flight.class, Long.valueOf( 1 ) );
+					Flight firstOne = session.get( Flight.class, 1L );
 					assertNotNull( firstOne );
-					assertEquals( Long.valueOf( 1 ), firstOne.getId() );
+					assertEquals( 1L, firstOne.getId() );
 					assertEquals( "AF3202", firstOne.getName() );
-					assertFalse( "should not be insertable".equals( firstOne.getTriggeredData() ) );
+					assertNotEquals( "should not be insertable", firstOne.getTriggeredData() );
 					firstOne.setName( "BA1234" );
 					firstOne.setTriggeredData( "should not be updatable" );
 				}
@@ -148,11 +149,11 @@ public void testColumn(SessionFactoryScope scope) {
 
 		scope.inTransaction(
 				session -> {
-					Flight firstOne = session.get( Flight.class, Long.valueOf( 1 ) );
+					Flight firstOne = session.get( Flight.class, 1L );
 					assertNotNull( firstOne );
-					assertEquals( Long.valueOf( 1 ), firstOne.getId() );
+					assertEquals( 1L, firstOne.getId() );
 					assertEquals( "AF3202", firstOne.getName() );
-					assertFalse( "should not be updatable".equals( firstOne.getTriggeredData() ) );
+					assertNotEquals( "should not be updatable", firstOne.getTriggeredData() );
 				}
 		);
 	}
@@ -163,13 +164,13 @@ public void testColumnUnique(SessionFactoryScope scope) {
 				session -> {
 					Transaction tx = session.beginTransaction();
 					Sky sky = new Sky();
-					sky.id = Long.valueOf( 2 );
+					sky.id = 2L;
 					sky.color = "blue";
 					sky.day = "monday";
 					sky.month = "January";
 
 					Sky sameSky = new Sky();
-					sameSky.id = Long.valueOf( 3 );
+					sameSky.id = 3L;
 					sameSky.color = "blue";
 					sky.day = "tuesday";
 					sky.month = "January";
@@ -197,19 +198,19 @@ public void testColumnUnique(SessionFactoryScope scope) {
 	public void testUniqueConstraint(SessionFactoryScope scope) {
 		int id = 5;
 		Sky sky = new Sky();
-		sky.id = Long.valueOf( id++ );
+		sky.id = (long) id++;
 		sky.color = "green";
 		sky.day = "monday";
 		sky.month = "March";
 
 		Sky otherSky = new Sky();
-		otherSky.id = Long.valueOf( id++ );
+		otherSky.id = (long) id++;
 		otherSky.color = "red";
 		otherSky.day = "friday";
 		otherSky.month = "March";
 
 		Sky sameSky = new Sky();
-		sameSky.id = Long.valueOf( id++ );
+		sameSky.id = (long) id++;
 		sameSky.color = "green";
 		sameSky.day = "monday";
 		sameSky.month = "March";
@@ -248,9 +249,9 @@ public void testVersion(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					Flight firstOne = new Flight();
-					firstOne.setId( Long.valueOf( 2 ) );
+					firstOne.setId( 2L );
 					firstOne.setName( "AF3202" );
-					firstOne.setDuration( Long.valueOf( 500 ) );
+					firstOne.setDuration( 500L );
 					session.persist( firstOne );
 					session.flush();
 				}
@@ -258,20 +259,20 @@ public void testVersion(SessionFactoryScope scope) {
 
 		//read it
 		Flight firstOne = scope.fromTransaction(
-				session -> session.get( Flight.class, Long.valueOf( 2 ) )
+				session -> session.get( Flight.class, 2L )
 		);
 
 		//read it again
 		Flight concurrentOne = scope.fromTransaction(
 				session -> {
-					Flight _concurrentOne = session.get( Flight.class, Long.valueOf( 2 ) );
-					_concurrentOne.setDuration( Long.valueOf( 1000 ) );
+					Flight _concurrentOne = session.get( Flight.class, 2L );
+					_concurrentOne.setDuration( 1000L );
 					return session.merge( _concurrentOne );
 				}
 		);
 
-		assertFalse( firstOne == concurrentOne );
-		assertFalse( firstOne.getVersion().equals( concurrentOne.getVersion() ) );
+		assertNotSame( firstOne, concurrentOne );
+		assertNotEquals( firstOne.getVersion(), concurrentOne.getVersion() );
 
 		//reattach the first one
 		scope.inSession(
@@ -284,10 +285,7 @@ public void testVersion(SessionFactoryScope scope) {
 						fail( "Optimistic locking should work" );
 					}
 					catch (OptimisticLockException expected) {
-						if ( expected.getCause() instanceof StaleStateException ) {
-							//expected
-						}
-						else {
+						if ( !(expected.getCause() instanceof StaleStateException) ) {
 							fail( "StaleStateException expected but is " + expected.getCause() );
 						}
 					}
@@ -303,7 +301,7 @@ public void testVersion(SessionFactoryScope scope) {
 	@Test
 	public void testFieldAccess(SessionFactoryScope scope) {
 		final Sky sky = new Sky();
-		sky.id = Long.valueOf( 1 );
+		sky.id = 1L;
 		sky.color = "black";
 		sky.area = "Paris";
 		sky.day = "23";
@@ -320,7 +318,7 @@ public void testFieldAccess(SessionFactoryScope scope) {
 					Sky _sky = session.get( Sky.class, sky.id );
 					assertNotNull( _sky );
 					assertEquals( "black", _sky.color );
-					assertFalse( "Paris".equals( _sky.area ) );
+					assertNotEquals( "Paris", _sky.area );
 				}
 		);
 	}
@@ -339,7 +337,7 @@ public void testEntityName(DomainModelScope domainModelScope, SessionFactoryScop
 
 		sessionFactoryScope.inTransaction(
 				session -> {
-					List result = session.createQuery( "from Corporation" ).list();
+					var result = session.createQuery( "from Corporation" ).list();
 					assertNotNull( result );
 					assertEquals( 1, result.size() );
 				}
@@ -350,9 +348,9 @@ public void testEntityName(DomainModelScope domainModelScope, SessionFactoryScop
 	@Test
 	public void testNonGetter(SessionFactoryScope scope) {
 		Flight airFrance = new Flight();
-		airFrance.setId( Long.valueOf( 747 ) );
+		airFrance.setId( 747L );
 		airFrance.setName( "Paris-Amsterdam" );
-		airFrance.setDuration( Long.valueOf( 10 ) );
+		airFrance.setDuration( 10L );
 		airFrance.setFactor( 25 );
 
 		scope.inTransaction(
@@ -363,8 +361,8 @@ public void testNonGetter(SessionFactoryScope scope) {
 				session -> {
 					Flight _airFrance = session.get( Flight.class, airFrance.getId() );
 					assertNotNull( _airFrance );
-					assertEquals( Long.valueOf( 10 ), _airFrance.getDuration() );
-					assertFalse( 25 == _airFrance.getFactor( false ) );
+					assertEquals( 10L, _airFrance.getDuration() );
+					assertNotEquals( 25, _airFrance.getFactor( false ) );
 					session.remove( _airFrance );
 				}
 		);
@@ -377,11 +375,11 @@ public void testTemporalType(SessionFactoryScope scope) {
 				: ZoneId.systemDefault();
 
 		Flight airFrance = new Flight();
-		airFrance.setId( Long.valueOf( 747 ) );
+		airFrance.setId( 747L );
 		airFrance.setName( "Paris-Amsterdam" );
-		airFrance.setDuration( Long.valueOf( 10 ) );
-		airFrance.setDepartureDate( Date.from(LocalDate.of( 2005, 06, 21 ).atStartOfDay(zoneId).toInstant()) );
-		airFrance.setAlternativeDepartureDate( new GregorianCalendar( 2006, 02, 03, 10, 00 ) );
+		airFrance.setDuration( 10L );
+		airFrance.setDepartureDate( Date.from(LocalDate.of( 2005, 6, 21 ).atStartOfDay(zoneId).toInstant()) );
+		airFrance.setAlternativeDepartureDate( new GregorianCalendar( 2006, Calendar.MARCH, 3, 10, 0 ) );
 		airFrance.getAlternativeDepartureDate().setTimeZone( TimeZone.getTimeZone( "GMT" ) );
 		airFrance.setBuyDate( new java.sql.Timestamp( 122367443 ) );
 		airFrance.setFactor( 25 );
@@ -392,15 +390,15 @@ public void testTemporalType(SessionFactoryScope scope) {
 
 		scope.inTransaction(
 				session -> {
-					Query q = session.createQuery( "from Flight f where f.departureDate = :departureDate" );
+					var q = session.createQuery( "from Flight f where f.departureDate = :departureDate" );
 					q.setParameter( "departureDate", airFrance.getDepartureDate(), StandardBasicTypes.DATE );
 					Flight copyAirFrance = (Flight) q.uniqueResult();
 					assertNotNull( copyAirFrance );
 					assertEquals(
-							Date.from(LocalDate.of( 2005, 06, 21 ).atStartOfDay(zoneId).toInstant()),
+							Date.from(LocalDate.of( 2005, 6, 21 ).atStartOfDay(zoneId).toInstant()),
 							copyAirFrance.getDepartureDate()
 					);
-					assertEquals( df.format( airFrance.getBuyDate() ), df.format( copyAirFrance.getBuyDate() ) );
+					assertEquals( dateFormat.format( airFrance.getBuyDate() ), dateFormat.format( copyAirFrance.getBuyDate() ) );
 
 					session.remove( copyAirFrance );
 				}
@@ -413,7 +411,7 @@ public void testBasic(SessionFactoryScope scope) throws Exception {
 				session -> {
 					Transaction tx = session.beginTransaction();
 					Flight airFrance = new Flight();
-					airFrance.setId( Long.valueOf( 747 ) );
+					airFrance.setId( 747L );
 					airFrance.setName( "Paris-Amsterdam" );
 					airFrance.setDuration( null );
 					try {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java
index 25b9db60a2e3..f57f76a8cb1a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/Sky.java
@@ -21,7 +21,7 @@
 public class Sky implements Serializable {
 	@Id
 	protected Long id;
-	@Column(unique = true, columnDefinition = "varchar(250)", nullable = false)
+	@Column(unique = true, length = 250, nullable = false)
 	protected String color;
 	@Column(name="`day`",nullable = false)
 	protected String day;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfStringTest.java
index 07d2bcc18868..e09e601e05aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/basic/ListOfStringTest.java
@@ -31,7 +31,7 @@ public class ListOfStringTest {
 		});
 
 	}
-	@Entity
+	@Entity(name = "Unbroken")
 	static class Unbroken {
 		@Id long id;
 		List<String> stringList; // this should be OK
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CollectionActionsValidationStatelessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CollectionActionsValidationStatelessTest.java
new file mode 100644
index 000000000000..c5d4e18a9b26
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/CollectionActionsValidationStatelessTest.java
@@ -0,0 +1,123 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.beanvalidation;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.constraints.Size;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@SessionFactory
+@DomainModel(annotatedClasses = {
+		CollectionActionsValidationStatelessTest.Author.class,
+		CollectionActionsValidationStatelessTest.Book.class,
+})
+@ServiceRegistry(settings = @Setting(name = AvailableSettings.JAKARTA_VALIDATION_MODE, value = "auto"))
+@Jira("https://hibernate.atlassian.net/browse/HHH-19843")
+public class CollectionActionsValidationStatelessTest {
+
+	@Test
+	void resultsInViolationConstraint(SessionFactoryScope scope) {
+		scope.inStatelessTransaction( session -> {
+			final ConstraintViolationException e = assertThrows( ConstraintViolationException.class, () -> {
+				ArrayList<Book> books = new ArrayList<>();
+				Author author = new Author( 1L, "first", "last", books );
+				Book book = new Book( 10L, "", author );
+				books.add( book );
+
+				session.upsertMultiple( List.of( author ) );
+			} );
+			assertThat( e.getConstraintViolations() ).hasSize( 1 );
+		} );
+	}
+
+	@Test
+	void noConstraintViolations(SessionFactoryScope scope) {
+		scope.inStatelessTransaction( session -> {
+			ArrayList<Book> books = new ArrayList<>();
+			Author author = new Author( 1L, "first", "last", books );
+			for ( int i = 0; i < 10; i++ ) {
+				Book book = new Book( 10L + i, "title #" + i, author );
+				books.add( book );
+			}
+
+			session.upsertMultiple( List.of( author ) );
+		} );
+	}
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+	}
+
+	@Table(name = "author")
+	@Entity
+	static class Author {
+
+		public Author() {
+		}
+
+		public Author(long id, String firstName, String lastName, List<Book> books) {
+			this.firstName = firstName;
+			this.lastName = lastName;
+			this.books = books;
+			this.id = id;
+		}
+
+		@Id
+		Long id;
+
+		String firstName;
+
+		String lastName;
+
+		@OneToMany
+		@JoinColumn(name = "bookId")
+		@Size(min = 10)
+		List<Book> books;
+
+	}
+
+	@Table(name = "book")
+	@Entity
+	static class Book {
+
+		public Book() {
+		}
+
+		public Book(long id, String title, Author author) {
+			this.id = id;
+			this.title = title;
+			this.author = author;
+		}
+
+		@Id
+		Long id;
+
+		String title;
+
+		@ManyToOne
+		Author author;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java
index fd8638f489d6..fb11a43bc0b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java
@@ -25,7 +25,7 @@ public abstract class AbstractEntity implements Serializable {
 	@GeneratedValue(strategy = GenerationType.IDENTITY, generator = "TIGER_GEN")
 	private Long id;
 	@Basic
-	@Column(unique = true, updatable = false, length = 36, columnDefinition = "char(36)")
+	@Column(unique = true, updatable = false, length = 36)
 	private String uuid;
 	@Column(updatable = false)
 	private Date created;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java
index 6c35b985c8b2..60266165bebe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java
@@ -25,7 +25,7 @@ public abstract class AbstractEntity implements Serializable {
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TIGER_GEN")
 	private Long id;
 	@Basic
-	@Column(unique = true, updatable = false, length = 36, columnDefinition = "char(36)")
+	@Column(unique = true, updatable = false, length = 36)
 	private String uuid;
 	@Column(updatable = false)
 	private Date created;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java
index 9daafd46e05b..3ae82d7c123c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java
@@ -23,7 +23,7 @@ public abstract class AbstractEntity implements Serializable {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 	@Basic
-	@Column(unique = true, updatable = false, length = 36, columnDefinition = "char(36)")
+	@Column(unique = true, updatable = false, length = 36)
 	private String uuid;
 	@Column(updatable = false)
 	private Date created;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java
index a71adfa80fad..1c8bb7ad89cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java
@@ -25,7 +25,7 @@ public abstract class AbstractEntity implements Serializable {
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TIGER_GEN")
 	private Long id;
 	@Basic
-	@Column(unique = true, updatable = false, length = 36, columnDefinition = "char(36)")
+	@Column(unique = true, updatable = false, length = 36)
 	private String uuid;
 	@Column(updatable = false)
 	private Date created;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java
index adb29cb26c3f..51c9cb071ceb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java
@@ -23,7 +23,7 @@ public abstract class AbstractEntity implements Serializable {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 	@Basic
-	@Column(unique = true, updatable = false, length = 36, columnDefinition = "char(36)")
+	@Column(unique = true, updatable = false, length = 36)
 	private String uuid;
 	@Column(updatable = false)
 	private Date created;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java
index 6b0738235b74..ae6d18281a75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java
@@ -25,7 +25,7 @@ public abstract class AbstractEntity implements Serializable {
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TIGER_GEN")
 	private Long id;
 	@Basic
-	@Column(unique = true, updatable = false, length = 36, columnDefinition = "char(36)")
+	@Column(unique = true, updatable = false, length = 36)
 	private String uuid;
 	@Column(updatable = false)
 	private Date created;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistJpaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistJpaTest.java
index ee7ed9528811..c4d5d75b967b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistJpaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistJpaTest.java
@@ -48,7 +48,7 @@ public class CascadePersistJpaTest {
 		});
 	}
 
-	@Entity
+	@Entity(name = "Parent")
 	static class Parent {
 		@Id
 		@GeneratedValue
@@ -58,7 +58,7 @@ static class Parent {
 				mappedBy = "parent")
 		Set<Child> children = new HashSet<>();
 	}
-	@Entity
+	@Entity(name = "Child")
 	static class Child {
 		@Id @GeneratedValue
 		private Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistSFTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistSFTest.java
index 8c5f3eac9d52..2d7e698b014d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistSFTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/persist/CascadePersistSFTest.java
@@ -44,7 +44,7 @@ public class CascadePersistSFTest {
 		});
 	}
 
-	@Entity
+	@Entity(name = "Parent")
 	static class Parent {
 		@Id
 		@GeneratedValue
@@ -54,7 +54,7 @@ static class Parent {
 				mappedBy = "parent")
 		Set<Child> children = new HashSet<>();
 	}
-	@Entity
+	@Entity(name = "Child")
 	static class Child {
 		@Id @GeneratedValue
 		private Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/PostgresCollateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/PostgresCollateTest.java
index fcd6e36f8e50..92bb5c0f3ba1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/PostgresCollateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collate/PostgresCollateTest.java
@@ -10,16 +10,19 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import org.hibernate.annotations.Collate;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 @SessionFactory
 @DomainModel(annotatedClasses = PostgresCollateTest.Message.class)
 @RequiresDialect(PostgreSQLDialect.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support COLLATE clause" )
 public class PostgresCollateTest {
 
 	@Test void test(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionAndCompositeKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionAndCompositeKeyTest.java
index a49e6ca5aff9..dd9575efce4d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionAndCompositeKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionAndCompositeKeyTest.java
@@ -12,6 +12,8 @@
 import org.hibernate.annotations.JdbcType;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.descriptor.jdbc.UUIDJdbcType;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -42,6 +44,7 @@
 @JiraKey("HHH-17964")
 @RequiresDialect( H2Dialect.class )
 @RequiresDialect( PostgreSQLDialect.class )
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsTableWithoutPrimaryKey.class )
 public class ElementCollectionAndCompositeKeyTest {
 
 	@BeforeEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java
index c44f6e4fef0b..4bc0d898ac81 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java
@@ -9,13 +9,16 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.sql.Types;
 import java.util.Date;
 import java.util.Locale;
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.community.dialect.AltibaseDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgresPlusDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.jdbc.Work;
@@ -110,7 +113,13 @@ public void execute(Connection connection) throws SQLException {
 			validateColumn( connection, "ID", java.sql.Types.DATE );
 
 			// timeData -> java.sql.Time (TIME)
-			validateColumn( connection, "TIMEDATA", java.sql.Types.TIME );
+			if (s.getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+				s.getJdbcServices().getDialect() instanceof SpannerDialect ) {
+				validateColumn( connection, "TIMEDATA", Types.TIMESTAMP );
+			}
+			else {
+				validateColumn( connection, "TIMEDATA", java.sql.Types.TIME );
+			}
 
 			// tsData -> java.sql.Timestamp (TIMESTAMP)
 			validateColumn( connection, "TSDATA", java.sql.Types.TIMESTAMP );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/OneToManyEmbeddableId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/OneToManyEmbeddableId.java
index 9332d2b2328b..74a6c53ca40f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/OneToManyEmbeddableId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/OneToManyEmbeddableId.java
@@ -12,8 +12,10 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.BeforeAll;
@@ -34,6 +36,7 @@
 		}
 )
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class OneToManyEmbeddableId {
 	private static final BigDecimal FIRST_CHILD_CODE = new BigDecimal( 2 );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java
index eefa756232c8..140fdd9653e7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java
@@ -100,6 +100,7 @@ public void testEntity(SessionFactoryScope scope) throws Exception {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsExpectedLobUsagePattern.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 	public void testVersioning(SessionFactoryScope scope) {
 		Forest forest = new Forest();
 		forest.setName( "Fontainebleau" );
@@ -190,7 +191,7 @@ public void testWhereClause(SessionFactoryScope scope) {
 
 		scope.inTransaction(
 				session -> {
-					List<Doctor> list = session.createSelectionQuery( "from " + Doctor.class.getName(), Doctor.class )
+					List<Doctor> list = session.createSelectionQuery( "from " + Doctor.class.getName() + " order by id", Doctor.class )
 							.getResultList();
 
 					assertThat( list.size() ).isEqualTo( 2 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndConvertorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndConvertorTest.java
new file mode 100644
index 000000000000..84cf7cc7fde6
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndConvertorTest.java
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.enumerated;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Convert;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+import java.util.Arrays;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+@DomainModel(
+		annotatedClasses = {
+				EnumeratedAndConvertorTest.TestEntity.class,
+		}
+)
+@SessionFactory
+@JiraKey(value = "HHH-20119")
+public class EnumeratedAndConvertorTest {
+
+	@Test
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					TestEntity entity = new TestEntity( 1l );
+					entity.setState( TestEnum.BAR );
+					session.persist( entity );
+				}
+		);
+
+		scope.inTransaction(
+				session -> {
+					TestEntity entity = session.get( TestEntity.class, 1l );
+					assertThat( entity ).isNotNull();
+					assertThat( entity.getState() ).isEqualTo( TestEnum.BAR );
+				}
+		);
+	}
+
+	public enum TestEnum {
+		FOO("Label for 'foo'"),
+		BAR("Label for 'bar'");
+
+		private final String value;
+
+		TestEnum(String value) {
+			this.value = value;
+		}
+	}
+
+	static class TestConvertor implements AttributeConverter<TestEnum, String> {
+		@Override
+		public String convertToDatabaseColumn(TestEnum attribute) {
+			return attribute.value;
+		}
+
+		@Override
+		public TestEnum convertToEntityAttribute(String s) {
+			return Arrays.stream( TestEnum.values() ).filter( v -> v.value.equals( s ) ).findFirst().get();
+		}
+	}
+
+	@Entity(name="TestEntity")
+	public static class TestEntity {
+
+		@Id
+		private long id;
+
+		@Convert(converter = TestConvertor.class)
+		private TestEnum state;
+
+		protected TestEntity() {}
+
+		public TestEntity(long id) {
+			this.id = id;
+		}
+
+		public TestEnum getState() {
+			return state;
+		}
+
+		public void setState(TestEnum state) {
+			this.state = state;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java
index db88b2b3026f..101ccc2b4df0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java
@@ -19,7 +19,6 @@
 import org.hibernate.cfg.Environment;
 import org.hibernate.testing.jdbc.SharedDriverManagerConnectionProvider;
 import org.hibernate.testing.orm.junit.BaseUnitTest;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -62,7 +61,6 @@ public void after() {
 
 	@Test
 	@JiraKey(value = "HHH-9897")
-	@FailureExpected(jiraKey = "HHH-9897")
 	public void testUseOfJoinColumnOrFormula() {
 		Metadata metadata = new MetadataSources( ssr )
 				.addAnnotatedClass( A.class )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaNativeQueryTest.java
new file mode 100644
index 000000000000..771a902ad907
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaNativeQueryTest.java
@@ -0,0 +1,238 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.formula;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.Formula;
+import org.hibernate.annotations.JoinColumnOrFormula;
+import org.hibernate.annotations.JoinColumnsOrFormulas;
+import org.hibernate.annotations.JoinFormula;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+@Jpa(
+		annotatedClasses = {
+				JoinFormulaNativeQueryTest.Post.class,
+				JoinFormulaNativeQueryTest.Comment.class,
+				JoinFormulaNativeQueryTest.CompositeIdComment.class
+		}
+)
+@RequiresDialect(value = H2Dialect.class, comment = "To avoid writing native queries for every dialect")
+@Jira("https://hibernate.atlassian.net/browse/HHH-20133")
+public class JoinFormulaNativeQueryTest {
+
+	@BeforeAll
+	protected void setUp(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			Post post = new Post();
+			post.setId( 1L );
+			entityManager.persist( post );
+
+			Comment comment1 = new Comment();
+			comment1.setId( 1L );
+			comment1.setPost( post );
+			entityManager.persist( comment1 );
+
+			Comment comment2 = new Comment();
+			comment2.setId( 2L );
+			comment2.setPost( post );
+			entityManager.persist( comment2 );
+
+			CompositeIdComment compositeIdComment1 = new CompositeIdComment();
+			compositeIdComment1.setId1( 1L );
+			compositeIdComment1.setId2( 1L );
+			compositeIdComment1.setPost( post );
+			entityManager.persist( compositeIdComment1 );
+
+			CompositeIdComment compositeIdComment2 = new CompositeIdComment();
+			compositeIdComment2.setId1( 2L );
+			compositeIdComment2.setId2( 2L );
+			compositeIdComment2.setPost( post );
+			entityManager.persist( compositeIdComment2 );
+		} );
+	}
+
+	@Test
+	public void testHqlQueryFormula(EntityManagerFactoryScope scope) {
+		List<Comment> resultList = scope.fromTransaction( entityManager ->
+				entityManager.createQuery( "SELECT c FROM Comment c", Comment.class ).getResultList()
+		);
+		assertThat( resultList ).hasSize( 2 );
+		assertThat( resultList.get( 0 ).getAce() ).isEqualTo( 1L );
+		assertThat( resultList.get( 1 ).getAce() ).isEqualTo( 1L );
+	}
+
+	@Test
+	public void testHqlQueryJoinFormula(EntityManagerFactoryScope scope) {
+		List<Post> resultList = scope.fromTransaction( entityManager ->
+				entityManager.createQuery( "SELECT p FROM Post p", Post.class ).getResultList()
+		);
+		assertThat( resultList ).hasSize( 1 );
+		assertThat( resultList.get( 0 ).getLatestComment() ).isNotNull();
+		assertThat( resultList.get( 0 ).getLatestComment().getId() ).isEqualTo( 2L );
+		assertThat( resultList.get( 0 ).getOldestComment() ).isNotNull();
+		assertThat( resultList.get( 0 ).getOldestComment().getId() ).isEqualTo( 1L );
+	}
+
+	@Test
+	public void testNativeQueryFormula(EntityManagerFactoryScope scope) {
+		//noinspection unchecked
+		List<Comment> resultList = scope.fromTransaction( entityManager ->
+				entityManager.createNativeQuery( "SELECT c.*, (SELECT 1 FROM DUAL) as ace FROM comment c",
+						Comment.class ).getResultList()
+		);
+		assertThat( resultList ).hasSize( 2 );
+		assertThat( resultList.get( 0 ).getAce() ).isEqualTo( 1L );
+		assertThat( resultList.get( 1 ).getAce() ).isEqualTo( 1L );
+	}
+
+	@Test
+	public void testNativeQueryJoinFormula(EntityManagerFactoryScope scope) {
+		//noinspection unchecked
+		List<Post> resultList = scope.fromTransaction( entityManager ->
+				entityManager.createNativeQuery(
+						"""
+								SELECT p.*,
+								(SELECT c.id FROM comment c WHERE c.post_id = p.id ORDER BY c.id ASC LIMIT 1) as oldestComment,
+								(SELECT c.id FROM comment c WHERE c.post_id = p.id ORDER BY c.id DESC LIMIT 1) as latestComment,
+								(SELECT c.id1 FROM composite_comment c WHERE c.post_id = p.id ORDER BY c.id1 ASC LIMIT 1) as compositeIdComment_0,
+								(SELECT c.id2 FROM composite_comment c WHERE c.post_id = p.id ORDER BY c.id2 ASC LIMIT 1) as compositeIdComment_1
+								FROM post p
+								""",
+						Post.class ).getResultList()
+		);
+		assertThat( resultList ).hasSize( 1 );
+		assertThat( resultList.get( 0 ).getLatestComment() ).isNotNull();
+		assertThat( resultList.get( 0 ).getLatestComment().getId() ).isEqualTo( 2L );
+		assertThat( resultList.get( 0 ).getOldestComment() ).isNotNull();
+		assertThat( resultList.get( 0 ).getOldestComment().getId() ).isEqualTo( 1L );
+	}
+
+	@Entity(name = "Post")
+	@Table(name = "post")
+	public static class Post {
+
+		@Id
+		private Long id;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@JoinFormula("(SELECT c.id FROM comment c WHERE c.post_id = id ORDER BY c.id DESC LIMIT 1)")
+		private Comment latestComment;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@JoinFormula("(SELECT c.id FROM comment c WHERE c.post_id = id ORDER BY c.id ASC LIMIT 1)")
+		private Comment oldestComment;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@JoinColumnsOrFormulas({
+				@JoinColumnOrFormula(formula = @JoinFormula("(SELECT c.id1 FROM composite_comment c WHERE c.post_id = id ORDER BY c.id1 ASC LIMIT 1)")),
+				@JoinColumnOrFormula(formula = @JoinFormula("(SELECT c.id2 FROM composite_comment c WHERE c.post_id = id ORDER BY c.id2 ASC LIMIT 1)"))
+		})
+		private CompositeIdComment compositeIdComment;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Comment getLatestComment() {
+			return latestComment;
+		}
+
+		public Comment getOldestComment() {
+			return oldestComment;
+		}
+	}
+
+	@Entity(name = "Comment")
+	@Table(name = "comment")
+	public static class Comment {
+
+		@Id
+		private Long id;
+
+		@Formula("(SELECT 1 FROM DUAL)")
+		private Long ace;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		private Post post;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Long getAce() {
+			return ace;
+		}
+
+		public Post getPost() {
+			return post;
+		}
+
+		public void setPost(Post post) {
+			this.post = post;
+		}
+
+	}
+
+	@Entity(name = "CompositeIdComment")
+	@Table(name = "composite_comment")
+	public static class CompositeIdComment {
+
+		@Id
+		private Long id1;
+		@Id
+		private Long id2;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		private Post post;
+
+		public Long getId1() {
+			return id1;
+		}
+
+		public void setId1(Long id1) {
+			this.id1 = id1;
+		}
+
+		public Long getId2() {
+			return id2;
+		}
+
+		public void setId2(Long id2) {
+			this.id2 = id2;
+		}
+
+		public Post getPost() {
+			return post;
+		}
+
+		public void setPost(Post post) {
+			this.post = post;
+		}
+
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericAbstractSubtypeSerializableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericAbstractSubtypeSerializableTest.java
new file mode 100644
index 000000000000..a44ea1cded24
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericAbstractSubtypeSerializableTest.java
@@ -0,0 +1,92 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.generics;
+
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.Serializable;
+import java.sql.Types;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(annotatedClasses = {
+		GenericAbstractSubtypeSerializableTest.GenericEntity.class,
+		GenericAbstractSubtypeSerializableTest.StringEntity.class,
+})
+@SessionFactory
+@Jira("https://hibernate.atlassian.net/browse/HHH-20101")
+public class GenericAbstractSubtypeSerializableTest {
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+	}
+
+	@Test
+	void testStringEntity(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			GenericEntity<String> genericEntity = new StringEntity();
+			genericEntity.setId( 1 );
+			genericEntity.setContent( "string_entity" );
+			genericEntity.setArrayContent( new String[] {"entry1", "entry2"} );
+			session.persist( genericEntity );
+		} );
+		scope.inSession( session -> {
+			GenericEntity<?> retrieved = session.find( GenericEntity.class, 1 );
+			assertThat( retrieved.getContent() ).isEqualTo( "string_entity" );
+			assertThat( (Object[]) retrieved.getArrayContent() ).containsExactly( "entry1", "entry2" );
+		} );
+	}
+
+	@Entity(name = "GenericEntity")
+	public abstract static class GenericEntity<T extends Serializable> {
+		@Id
+		private Integer id;
+
+		@Basic
+		private T content;
+
+		@Basic
+		@JdbcTypeCode(Types.VARBINARY)
+		private T[] arrayContent;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public T getContent() {
+			return content;
+		}
+
+		public void setContent(T content) {
+			this.content = content;
+		}
+
+		public T[] getArrayContent() {
+			return arrayContent;
+		}
+
+		public void setArrayContent(T[] arrayContent) {
+			this.arrayContent = arrayContent;
+		}
+	}
+
+	@Entity(name = "StringEntity")
+	static class StringEntity extends GenericEntity<String> {
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java
index bcf6bec3eacf..341e0425c964 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java
@@ -9,9 +9,11 @@
 import java.util.List;
 import java.util.Set;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -66,6 +68,7 @@ public void setUp(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class )
 	public void testIt(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
index 8177353b8046..e39657762588 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
@@ -13,8 +13,10 @@
 import org.hibernate.orm.test.annotations.id.generationmappings.sub.DedicatedSequenceEntity1;
 import org.hibernate.orm.test.annotations.id.generationmappings.sub.DedicatedSequenceEntity2;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -51,6 +53,7 @@
 		exportSchema = false
 )
 @ServiceRegistry(settings = @Setting(name =Environment.HBM2DDL_AUTO, value = ""))
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledSequences.class)
 public class NewGeneratorMappingsTest  {
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/IdentifierCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/IdentifierCollectionTest.java
index 03a230d848a1..5bfa0744b9d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/IdentifierCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/identifiercollection/IdentifierCollectionTest.java
@@ -4,9 +4,12 @@
  */
 package org.hibernate.orm.test.annotations.identifiercollection;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -21,6 +24,8 @@
 		}
 )
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner bug?" )
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "spanner emulator issue" )
 public class IdentifierCollectionTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java
index 684087a0ecd9..3923844a4dd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java
@@ -59,26 +59,53 @@ public CollectionClassification getSetting() {
 	@Test
 	public void testTableIndex(SessionFactoryScope scope) {
 		PersistentClass entity = scope.getMetadataImplementor().getEntityBinding( Car.class.getName() );
-		Iterator<UniqueKey> itr = entity.getTable().getUniqueKeys().values().iterator();
-		assertThat( itr.hasNext() ).isTrue();
-		UniqueKey uk = itr.next();
-		assertThat( itr.hasNext() ).isFalse();
-		assertThat( StringHelper.isNotEmpty( uk.getName() ) ).isTrue();
-		assertThat( uk.getColumnSpan() ).isEqualTo( 2 );
-		Column column = uk.getColumns().get( 0 );
-		assertThat( column.getName() ).isEqualTo( "brand" );
-		column = uk.getColumns().get( 1 );
-		assertThat( column.getName() ).isEqualTo( "producer" );
-		assertThat( uk.getTable() ).isSameAs( entity.getTable() );
-
+		var dialect = scope.getSessionFactory().getJdbcServices().getDialect();
+		if ( dialect.supportsUniqueConstraints() ) {
+			// if dialect supports unique constraints then validate unique key
+			Iterator<UniqueKey> itr = entity.getTable().getUniqueKeys().values().iterator();
+			assertThat( itr.hasNext() ).isTrue();
+			UniqueKey uk = itr.next();
+			assertThat( itr.hasNext() ).isFalse();
+			assertThat( StringHelper.isNotEmpty( uk.getName() ) ).isTrue();
+			assertThat( uk.getColumnSpan() ).isEqualTo( 2 );
+			Column column = uk.getColumns().get( 0 );
+			assertThat( column.getName() ).isEqualTo( "brand" );
+			column = uk.getColumns().get( 1 );
+			assertThat( column.getName() ).isEqualTo( "producer" );
+			assertThat( uk.getTable() ).isSameAs( entity.getTable() );
+		}
 
 		Iterator<Index> indexItr = entity.getTable().getIndexes().values().iterator();
-		assertThat( indexItr.hasNext() ).isTrue();
-		Index index = indexItr.next();
-		assertThat( indexItr.hasNext() ).isFalse();
+		Index index;
+		if ( dialect.supportsUniqueConstraints() ) {
+			// if dialect supports unique constraints, we don't have to check unique index
+			index  = indexItr.next();
+			assertThat( indexItr.hasNext() ).isFalse();
+		}
+		else {
+			// we need to check unique index along with Car_Idx
+			Index uniqueIndex;
+			var tmpIndex = indexItr.next();
+			assertThat( indexItr.hasNext() ).isTrue();
+			if ( tmpIndex.isUnique() ) {
+				uniqueIndex = tmpIndex;
+				index  = indexItr.next();
+			}
+			else {
+				index = tmpIndex;
+				uniqueIndex  = indexItr.next();
+			}
+			assertThat( StringHelper.isNotEmpty( uniqueIndex.getName() ) ).isTrue();
+			assertThat( uniqueIndex.getColumnSpan() ).isEqualTo( 2 );
+			var column = uniqueIndex.getColumns().get( 0 );
+			assertThat( column.getName() ).isEqualTo( "brand" );
+			column = uniqueIndex.getColumns().get( 1 );
+			assertThat( column.getName() ).isEqualTo( "producer" );
+			assertThat( uniqueIndex.getTable() ).isSameAs( entity.getTable() );
+		}
 		assertThat( index.getName() ).isEqualTo( "Car_idx" );
 		assertThat( index.getColumnSpan() ).isEqualTo( 1 );
-		column = index.getColumns().iterator().next();
+		var column = index.getColumns().iterator().next();
 		assertThat( column.getName() ).isEqualTo( "since" );
 		assertThat( index.getTable() ).isSameAs( entity.getTable() );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java
index 5480d788fcbc..75c3c35ead86 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/Currency.java
@@ -3,7 +3,6 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.indexcoll;
-import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
@@ -25,7 +24,6 @@ public void setId(Integer id) {
 	}
 
 
-	@Column
 	private String currency;
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceAssociationTest.java
new file mode 100644
index 000000000000..fcf70af5ab69
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SingleTableInheritanceAssociationTest.java
@@ -0,0 +1,220 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.inheritance;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Jpa(
+		annotatedClasses = {
+				SingleTableInheritanceAssociationTest.Contract.class,
+				SingleTableInheritanceAssociationTest.ContractTypeA.class,
+				SingleTableInheritanceAssociationTest.ContractTypeB.class,
+				SingleTableInheritanceAssociationTest.Annex.class,
+				SingleTableInheritanceAssociationTest.AnnexTypeA.class,
+				SingleTableInheritanceAssociationTest.AnnexTypeB.class,
+				SingleTableInheritanceAssociationTest.Attachment.class,
+		}
+)
+@JiraKey(value = "HHH-15969")
+public class SingleTableInheritanceAssociationTest {
+
+	@BeforeAll
+	public void setUp(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					// ContractTypeA <- AnnexTypeA <- Attachment
+					ContractTypeA contractA = new ContractTypeA();
+					entityManager.persist( contractA );
+					AnnexTypeA annexA = new AnnexTypeA();
+					annexA.setContract( contractA );
+					entityManager.persist( annexA );
+					Attachment attachmentA = new Attachment();
+					attachmentA.setAnnex( annexA );
+					entityManager.persist( attachmentA );
+					// ContractTypeB <- AnnexTypeB <- Attachment
+					ContractTypeB contractB = new ContractTypeB();
+					entityManager.persist( contractB );
+					AnnexTypeB annexB = new AnnexTypeB();
+					annexB.setContract( contractB );
+					entityManager.persist( annexB );
+					Attachment attachmentB = new Attachment();
+					attachmentB.setAnnex( annexB );
+					entityManager.persist( attachmentB );
+				}
+		);
+	}
+
+	@Test
+	public void testQuery(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					List<Attachment> attachments = entityManager
+							.createQuery( "select a from Attachment a", Attachment.class )
+							.getResultList();
+					assertThat( attachments ).hasSize( 2 );
+				}
+		);
+	}
+
+	@Entity(name = "Contract")
+	@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+	public static class Contract {
+		@Id
+		@GeneratedValue
+		private Long id;
+		@OneToMany(mappedBy = "contract")
+		private Set<Attachment> attachments;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Set<Attachment> getAttachments() {
+			return attachments;
+		}
+
+		public void setAttachments(Set<Attachment> attachments) {
+			this.attachments = attachments;
+		}
+	}
+
+	@Entity(name = "ContractTypeA")
+	public static class ContractTypeA extends Contract {
+		@OneToMany(mappedBy = "contract")
+		private Set<AnnexTypeA> annexes;
+
+		public Set<AnnexTypeA> getAnnexes() {
+			return annexes;
+		}
+
+		public void setAnnexes(Set<AnnexTypeA> annexes) {
+			this.annexes = annexes;
+		}
+	}
+
+	@Entity(name = "ContractTypeB")
+	public static class ContractTypeB extends Contract {
+		@OneToMany(mappedBy = "contract")
+		private Set<AnnexTypeB> annexes;
+
+		public Set<AnnexTypeB> getAnnexes() {
+			return annexes;
+		}
+
+		public void setAnnexes(Set<AnnexTypeB> annexes) {
+			this.annexes = annexes;
+		}
+	}
+
+	@Entity(name = "Annex")
+	@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+	public static class Annex {
+		@Id
+		@GeneratedValue
+		private Long id;
+		@OneToMany(mappedBy = "annex")
+		private Set<Attachment> attachments;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Set<Attachment> getAttachments() {
+			return attachments;
+		}
+
+		public void setAttachments(Set<Attachment> attachments) {
+			this.attachments = attachments;
+		}
+	}
+
+	@Entity(name = "AnnexTypeA")
+	public static class AnnexTypeA extends Annex {
+		@ManyToOne
+		private ContractTypeA contract;
+
+		public ContractTypeA getContract() {
+			return contract;
+		}
+
+		public void setContract(ContractTypeA contract) {
+			this.contract = contract;
+		}
+	}
+
+	@Entity(name = "AnnexTypeB")
+	public static class AnnexTypeB extends Annex {
+		@ManyToOne
+		private ContractTypeB contract;
+
+		public ContractTypeB getContract() {
+			return contract;
+		}
+
+		public void setContract(ContractTypeB contract) {
+			this.contract = contract;
+		}
+	}
+
+	@Entity(name = "Attachment")
+	public static class Attachment {
+		@Id
+		@GeneratedValue
+		private Long id;
+		@ManyToOne
+		private Contract contract;
+		@ManyToOne
+		private Annex annex;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Contract getContract() {
+			return contract;
+		}
+
+		public void setContract(Contract contract) {
+			this.contract = contract;
+		}
+
+		public Annex getAnnex() {
+			return annex;
+		}
+
+		public void setAnnex(Annex annex) {
+			this.annex = annex;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/TablePerClassColumnDuplicationCheckTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/TablePerClassColumnDuplicationCheckTest.java
new file mode 100644
index 000000000000..d36e22113ac7
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/TablePerClassColumnDuplicationCheckTest.java
@@ -0,0 +1,97 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.inheritance;
+
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.SecondaryTable;
+import jakarta.persistence.SecondaryTables;
+
+import org.hibernate.annotations.SecondaryRow;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.DomainModelScope;
+import org.hibernate.testing.orm.junit.Jira;
+import org.junit.jupiter.api.Test;
+
+@DomainModel(annotatedClasses = {
+		TablePerClassColumnDuplicationCheckTest.Pool.class, TablePerClassColumnDuplicationCheckTest.SwimmingPool.class
+})
+@Jira("https://hibernate.atlassian.net/browse/HHH-12678")
+public class TablePerClassColumnDuplicationCheckTest {
+
+	@Test
+	public void test(DomainModelScope scope) {
+		scope.getDomainModel().validate();
+	}
+
+	@Entity
+	@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
+	public static class Pool {
+		@Id
+		private Integer id;
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+	}
+
+	@Embeddable
+	public static class PoolAddress {
+		@Column(table = "POOL_ADDRESS")
+		private String address;
+
+		public String getAddress() {
+			return address;
+		}
+
+		public void setAddress(String address) {
+			this.address = address;
+		}
+	}
+
+	@Entity
+	@SecondaryTables({
+			@SecondaryTable(name = "POOL_ADDRESS"), @SecondaryTable(name = "POOL_ADDRESS_2")
+	})
+	@SecondaryRow(table = "POOL_ADDRESS", optional = true)
+	@SecondaryRow(table = "POOL_ADDRESS_2", optional = true, owned = false)
+	public static class SwimmingPool extends Pool {
+
+		@Embedded
+		private PoolAddress address;
+
+		@Embedded
+		@AttributeOverride(name = "address", column = @Column(table = "POOL_ADDRESS_2"))
+		private PoolAddress secondaryAddress;
+
+		public PoolAddress getAddress() {
+			return address;
+		}
+
+		public void setAddress(PoolAddress address) {
+			this.address = address;
+		}
+
+		public PoolAddress getSecondaryAddress() {
+			return secondaryAddress;
+		}
+
+		public void setSecondaryAddress(PoolAddress secondaryAddress) {
+			this.secondaryAddress = secondaryAddress;
+		}
+
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java
index 829ddeb1130f..0c62b8ce866b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/Cat.java
@@ -25,7 +25,7 @@
 		indexes = {@Index(name = "secondname", columnList = "secondName"),
 				@Index(name = "nameindex", columnList = "name")},
 		comment = "My cat table")
-@SecondaryTable(name = "`Cat nbr1`",
+@SecondaryTable(name = "`Cat_nbr1`",
 		indexes = @Index(name = "story1index", columnList = "storyPart1"))
 @SecondaryTable(name = "Cat2",
 		uniqueConstraints = @UniqueConstraint(columnNames = {"storyPart2"}),
@@ -76,7 +76,7 @@ public void setSecondName(String secondName) {
 //		lifes = collection;
 //	}
 
-	@Column(table = "`Cat nbr1`")
+	@Column(table = "`Cat_nbr1`")
 	public String getStoryPart1() {
 		return storyPart1;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneJoinTableForeignKeyNullabilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneJoinTableForeignKeyNullabilityTest.java
new file mode 100644
index 000000000000..dbcf5a96a87d
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneJoinTableForeignKeyNullabilityTest.java
@@ -0,0 +1,91 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.manytoone;
+
+import java.util.List;
+import java.util.Locale;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.testing.util.ServiceRegistryUtil;
+import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@BaseUnitTest
+public class ManyToOneJoinTableForeignKeyNullabilityTest {
+	private StandardServiceRegistry ssr;
+
+	@BeforeEach
+	public void setUp() {
+		ssr = ServiceRegistryUtil.serviceRegistry();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		if ( ssr != null ) {
+			StandardServiceRegistryBuilder.destroy( ssr );
+		}
+	}
+
+	@Test
+	public void testJoinTableForeignKeyColumnIsNotNull() {
+		final var metadata = (MetadataImplementor)
+				new MetadataSources( ssr )
+						.addAnnotatedClass( Author.class )
+						.addAnnotatedClass( Publisher.class )
+						.buildMetadata();
+		metadata.orderColumns( true );
+		metadata.validate();
+
+		final List<String> commands =
+				new SchemaCreatorImpl( ssr )
+						.generateCreationCommands( metadata, false );
+
+		final String createTableString =
+				metadata.getDatabase().getDialect().getCreateTableString().toLowerCase( Locale.ROOT );
+		String found = null;
+		for ( String command : commands ) {
+			final String lowerCaseCommand = command.toLowerCase( Locale.ROOT );
+			if ( lowerCaseCommand.contains( createTableString )
+				&& lowerCaseCommand.contains( "authorpublisher" ) ) {
+				found = lowerCaseCommand;
+				break;
+			}
+		}
+		assertNotNull( found );
+
+		assertTrue( found.matches( ".*\"?publisher_id\"?\\s+[^,]*(\\(\\d+,\\d+\\)\\s+)?\\bnot\\s+null\\b.*" ) );
+	}
+
+	@Entity(name = "Author")
+	public static class Author {
+		@Id
+		private String ssn;
+
+		@ManyToOne
+		@JoinTable(name = "AuthorPublisher")
+		private Publisher publisher;
+	}
+
+	@Entity(name = "Publisher")
+	public static class Publisher {
+		@Id
+		private Long id;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
index 8071f6bb6c92..9dc7d52505ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java
@@ -10,8 +10,10 @@
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SQLServerDialect;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
@@ -152,6 +154,7 @@ public void testReferencedColumnNameBelongsToEmbeddedIdOfReferencedEntity(Sessio
 	@SkipForDialect( dialectClass = OracleDialect.class, reason = "Oracle do not support 'substring' function JDBC escape" )
 	@SkipForDialect( dialectClass = InformixDialect.class, reason = "Informix does not support 'substring' function JDBC escape" )
 	@SkipForDialect( dialectClass = AltibaseDialect.class, reason = " Altibase char type returns with trailing spaces")
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsJdbcEscapes.class)
 	public void testManyToOneFromNonPkToNonPk(SessionFactoryScope scope) {
 		// also tests usage of the stand-alone @JoinFormula annotation
 		// (i.e. not wrapped within @JoinColumnsOrFormulas)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Product.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Product.java
index 81a9dd14c3d3..4f2b0d8652c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Product.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoonewithformula/Product.java
@@ -28,8 +28,7 @@ public class Product implements Serializable
 	@Id
 	public Integer id;
 
-	@Column(name="product_idnf", length=18, nullable=false, unique=true,
-		columnDefinition="char(18)")
+	@Column(name="product_idnf", length=18, nullable=false, unique=true)
 	public String productIdnf;
 
 	@Column(name="description", nullable=false)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java
index a0f7bfc5c169..f545254a90d2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/AccountBase.java
@@ -17,8 +17,8 @@
 @MappedSuperclass
 public abstract class AccountBase {
 	@Id
-	@org.hibernate.annotations.GenericGenerator(name = "generator::Account", strategy = "increment")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "generator::Account")
+	@org.hibernate.annotations.GenericGenerator(name = "generator_Account", strategy = "increment")
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "generator_Account")
 	@Column(name = "ACC_ID")
 	private Long id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdNullTest.java
new file mode 100644
index 000000000000..a5c4c8b1925a
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdNullTest.java
@@ -0,0 +1,169 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.mapsid;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapsId;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import org.hibernate.id.IdentifierGenerationException;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@SessionFactory
+@DomainModel(
+	annotatedClasses = {
+		MapsEmbeddedIdNullTest.Level0.class,
+		MapsEmbeddedIdNullTest.Level1.class,
+		MapsEmbeddedIdNullTest.Level2.class,
+		MapsEmbeddedIdNullTest.Level1NoMapsId.class,
+		MapsEmbeddedIdNullTest.Level1OneToOne.class,
+		MapsEmbeddedIdNullTest.Level1NoMapsIdOneToOne.class,
+	})
+@Jira( "https://hibernate.atlassian.net/browse/HHH-19056" )
+public class MapsEmbeddedIdNullTest {
+	@Test void test(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			Level0 level0 = new Level0();
+			Level2 level2 = new Level2();
+			Level1 level1 = new Level1( level0, level2 );
+			level0.level1s.add( level1 );
+			s.persist( level0 );
+		} );
+		scope.inTransaction( s -> {
+			Level0 level0 = new Level0();
+			Level2 level2 = new Level2();
+			Level1OneToOne level1 = new Level1OneToOne( level0, level2 );
+			s.persist( level1 );
+		} );
+
+		assertThrows( IdentifierGenerationException.class, () ->
+			scope.inTransaction( s -> {
+				Level0 level0 = new Level0();
+				Level2 level2 = new Level2();
+				Level1NoMapsId level1NoMapsId = new Level1NoMapsId();
+				level1NoMapsId.level0 = level0;
+				level1NoMapsId.level2 = level2;
+				s.persist( level1NoMapsId );
+			} )
+		);
+		assertThrows( IdentifierGenerationException.class, () ->
+			scope.inTransaction( s -> {
+				Level0 level0 = new Level0();
+				Level2 level2 = new Level2();
+				Level1NoMapsIdOneToOne level1 = new Level1NoMapsIdOneToOne();
+				level1.level0 = level0;
+				level1.level2 = level2;
+				s.persist( level1 );
+			} )
+		);
+	}
+
+	@Entity(name = "Level0")
+	public static class Level0 {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		@OneToMany(mappedBy = "level0", cascade = CascadeType.ALL)
+		private List<Level1> level1s = new ArrayList<>();
+	}
+	@Entity(name = "Level1")
+	public static class Level1 {
+		@EmbeddedId
+		Level1PK id;
+		@MapsId("level0Id")
+		@ManyToOne
+		private Level0 level0;
+		@MapsId("level2Id")
+		@ManyToOne(cascade = CascadeType.ALL)
+		private Level2 level2;
+
+		public Level1() {
+		}
+		public Level1(Level0 level0, Level2 level2) {
+			super();
+			this.level0 = level0;
+			this.level2 = level2;
+		}
+	}
+	@Entity(name = "Level1OneToOne")
+	public static class Level1OneToOne {
+		@EmbeddedId
+		Level1PK id;
+		@OneToOne
+		@MapsId("level0Id")
+		private Level0 level0;
+		@OneToOne
+		@MapsId("level2Id")
+		private Level2 level2;
+
+		public Level1OneToOne() {
+		}
+		public Level1OneToOne(Level0 level0, Level2 level2) {
+			super();
+			this.level0 = level0;
+			this.level2 = level2;
+		}
+	}
+	@Entity(name = "Level1NoMapsId")
+	public static class Level1NoMapsId {
+		@EmbeddedId
+		Level1PK id;
+		@ManyToOne
+		private Level0 level0;
+		@ManyToOne(cascade = CascadeType.ALL)
+		private Level2 level2;
+	}
+	@Entity(name = "Level1NoMapsIdOneToOne")
+	public static class Level1NoMapsIdOneToOne {
+		@EmbeddedId
+		Level1PK id;
+		@ManyToOne
+		private Level0 level0;
+		@ManyToOne(cascade = CascadeType.ALL)
+		private Level2 level2;
+	}
+	@Entity(name = "Level2")
+	public static class Level2 {
+		@Id
+		@GeneratedValue
+		private Integer id;
+	}
+	public static class Level1PK {
+		private Integer level0Id;
+		private Integer level2Id;
+
+		@Override
+		public final boolean equals(Object o) {
+			if ( !(o instanceof Level1PK level1PK) ) {
+				return false;
+			}
+
+			return Objects.equals( level0Id, level1PK.level0Id )
+				&& Objects.equals( level2Id, level1PK.level2Id );
+		}
+
+		@Override
+		public int hashCode() {
+			int result = Objects.hashCode( level0Id );
+			result = 31 * result + Objects.hashCode( level2Id );
+			return result;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdToIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdToIdClassTest.java
new file mode 100644
index 000000000000..b5ee17c2dd08
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsEmbeddedIdToIdClassTest.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.mapsid;
+
+import jakarta.persistence.*;
+import org.hibernate.orm.test.annotations.mapsid.MapsEmbeddedIdToIdClassTest_.Dependent_;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+@Jpa(annotatedClasses =
+		{MapsEmbeddedIdToIdClassTest.Employee.class,
+		MapsEmbeddedIdToIdClassTest.Dependent.class})
+class MapsEmbeddedIdToIdClassTest {
+
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Employee employee = new Employee();
+			employee.id = 1;
+			employee.id2 = 2;
+			employee.name = "X";
+			session.persist( employee );
+			Dependent dependent = new Dependent();
+			dependent.name = "Y";
+			dependent.employee = employee;
+			session.persist( dependent );
+		} );
+	}
+
+	static class EmployeeId {
+		long id;
+		long id2;
+	}
+
+	@Entity(name = "Employee")
+	@IdClass(EmployeeId.class)
+	static class Employee {
+		@Id
+		long id;
+
+		@Id
+		long id2;
+
+		String name;
+	}
+
+	static class DependentId {
+		String name;
+		EmployeeId empId;
+	}
+
+	@Entity(name = "Dependent")
+	@IdClass(DependentId.class)
+	static class Dependent {
+		@Id
+		String name;
+
+		@EmbeddedId
+		EmployeeId empId;
+
+		@MapsId(Dependent_.EMP_ID)
+		@ManyToOne
+		Employee employee;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsSimpleIdToIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsSimpleIdToIdClassTest.java
new file mode 100644
index 000000000000..db6c2b75cc2c
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mapsid/MapsSimpleIdToIdClassTest.java
@@ -0,0 +1,61 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.mapsid;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapsId;
+import org.hibernate.orm.test.annotations.mapsid.MapsSimpleIdToIdClassTest_.Dependent_;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+@Jpa(annotatedClasses =
+		{MapsSimpleIdToIdClassTest.Employee.class,
+		MapsSimpleIdToIdClassTest.Dependent.class})
+class MapsSimpleIdToIdClassTest {
+
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Employee employee = new Employee();
+			employee.id = 1;
+			employee.name = "X";
+			session.persist( employee );
+			Dependent dependent = new Dependent();
+			dependent.name = "Y";
+			dependent.employee = employee;
+			session.persist( dependent );
+		} );
+	}
+
+	@Entity(name = "Employee")
+	static class Employee {
+		@Id
+		long id;
+
+		String name;
+	}
+
+	static class DependentId {
+		String name;
+		long empId;
+	}
+
+	@Entity(name = "Dependent")
+	@IdClass(DependentId.class)
+	static class Dependent {
+		@Id
+		String name;
+
+		@Id
+		long empId;
+
+		@MapsId(Dependent_.EMP_ID)
+		@ManyToOne
+		Employee employee;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java
index 692f6e0f9cb8..e73c7a4da152 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/LongKeyNamingStrategyTest.java
@@ -61,12 +61,31 @@ public void testWithCustomNamingStrategy() {
 				.iterator().next();
 		assertThat( foreignKey.getName() ).isEqualTo( "FK_way_longer_than_the_30_char" );
 
-		var uniqueKey = metadata.getEntityBinding( Address.class.getName() ).getTable().getUniqueKeys().values()
-				.iterator().next();
-		assertThat( uniqueKey.getName() ).isEqualTo( "UK_way_longer_than_the_30_char" );
-
-		var index = metadata.getEntityBinding( Address.class.getName() ).getTable().getIndexes().values().iterator()
-				.next();
+		var uniqueKeys = metadata.getEntityBinding( Address.class.getName() ).getTable().getUniqueKeys().values();
+		org.hibernate.mapping.Index index = null;
+		if ( !uniqueKeys.isEmpty() ) {
+			var uniqueKey = uniqueKeys.iterator().next();
+			assertThat( uniqueKey.getName() ).isEqualTo( "UK_way_longer_than_the_30_char" );
+			index = metadata.getEntityBinding( Address.class.getName() ).getTable().getIndexes().values().iterator()
+					.next();
+		}
+		else {
+			var indexes = metadata.getEntityBinding( Address.class.getName() ).getTable().getIndexes().values();
+			assertThat( indexes.size() ).isEqualTo( 2 );
+
+			org.hibernate.mapping.Index uniqueIndex = null;
+			for ( var idx: indexes ) {
+				if ( idx.isUnique() ) {
+					uniqueIndex = idx;
+				}
+				else {
+					index = idx;
+				}
+			}
+			assertThat( uniqueIndex ).isNotNull();
+			assertThat( uniqueIndex.getName() ).isEqualTo( "UK_way_longer_than_the_30_char" );
+		}
+		assertThat( index ).isNotNull();
 		assertThat( index.getName() ).isEqualTo( "IDX_way_longer_than_the_30_cha" );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java
index 9bf628ad25e3..00e0077055db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java
@@ -63,16 +63,39 @@ public void testWithCustomNamingStrategy() {
 				.applyImplicitNamingStrategy( new LongIdentifierNamingStrategy() )
 				.build();
 
-		var uniqueKey = metadata.getEntityBinding( Address.class.getName() ).getTable().getUniqueKeys().values()
-				.iterator().next();
-		assertThat( uniqueKey.getName() ).isEqualTo( expectedUniqueKeyName() );
+		var dialect = metadata.getDatabase().getDialect();
+		if ( dialect.supportsUniqueConstraints() ) {
+			var uniqueKey = metadata.getEntityBinding( Address.class.getName() ).getTable().getUniqueKeys().values()
+					.iterator().next();
+			assertThat( uniqueKey.getName() ).isEqualTo( expectedUniqueKeyName() );
+		}
 
 		var foreignKey = metadata.getEntityBinding( Address.class.getName() ).getTable().getForeignKeyCollection()
 				.iterator().next();
 		assertThat( foreignKey.getName() ).isEqualTo( expectedForeignKeyName() );
 
-		var index = metadata.getEntityBinding( Address.class.getName() ).getTable().getIndexes().values().iterator()
-				.next();
+		org.hibernate.mapping.Index index = null;
+		if ( dialect.supportsUniqueConstraints() ) {
+			index = metadata.getEntityBinding( Address.class.getName() ).getTable().getIndexes().values().iterator()
+					.next();
+		}
+		else {
+			var indexes = metadata.getEntityBinding( Address.class.getName() ).getTable().getIndexes().values();
+			assertThat( indexes.size() ).isEqualTo( 2 );
+
+			org.hibernate.mapping.Index uniqueIndex = null;
+			for ( var idx: indexes ) {
+				if ( idx.isUnique() ) {
+					uniqueIndex = idx;
+				}
+				else {
+					index = idx;
+				}
+			}
+			assertThat( uniqueIndex ).isNotNull();
+			assertThat( uniqueIndex.getName() ).isEqualTo( expectedUniqueKeyName() );
+		}
+		assertThat( index ).isNotNull();
 		assertThat( index.getName() ).isEqualTo( expectedIndexName() );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java
deleted file mode 100644
index 7ef314b20d22..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/A.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.annotations.naturalid;
-
-import java.util.HashSet;
-import java.util.Set;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Version;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.NaturalId;
-import org.hibernate.annotations.NaturalIdCache;
-
-/**
- * @author Guenther Demetz
- */
-@Entity
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-@NaturalIdCache
-public class A {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.TABLE)
-	private long oid;
-
-	@Version
-	private int version;
-
-	@Column
-	@NaturalId(mutable = false)
-	private String name;
-
-	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-	@org.hibernate.annotations.OptimisticLock(excluded = true)
-	@jakarta.persistence.OneToMany(mappedBy = "a")
-	private Set<D> ds = new HashSet<D>();
-
-	@jakarta.persistence.OneToOne
-	private D singleD = null;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Set<D> getDs() {
-		return ds;
-	}
-
-	public void setDs(Set<D> ds) {
-		this.ds = ds;
-	}
-
-	public D getSingleD() {
-		return singleD;
-	}
-
-	public void setSingleD(D singleD) {
-		this.singleD = singleD;
-	}
-
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java
deleted file mode 100644
index 1254fac4e0ce..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/Citizen.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.annotations.naturalid;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-
-import org.hibernate.annotations.NaturalId;
-import org.hibernate.annotations.NaturalIdCache;
-
-/**
- * @author Emmanuel Bernard
- */
-@Entity
-@NaturalIdCache
-public class Citizen {
-	@Id
-	private Integer id;
-	private String firstname;
-	private String lastname;
-	@NaturalId
-	@ManyToOne
-	private State state;
-	@NaturalId
-	private String ssn;
-
-	public Citizen() {
-	}
-
-	public Citizen(Integer id, String firstname, String lastname, State state, String ssn) {
-		this.id = id;
-		this.firstname = firstname;
-		this.lastname = lastname;
-		this.state = state;
-		this.ssn = ssn;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getFirstname() {
-		return firstname;
-	}
-
-	public void setFirstname(String firstname) {
-		this.firstname = firstname;
-	}
-
-	public String getLastname() {
-		return lastname;
-	}
-
-	public void setLastname(String lastname) {
-		this.lastname = lastname;
-	}
-
-	public State getState() {
-		return state;
-	}
-
-	public void setState(State state) {
-		this.state = state;
-	}
-
-	public String getSsn() {
-		return ssn;
-	}
-
-	public void setSsn(String ssn) {
-		this.ssn = ssn;
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java
deleted file mode 100644
index 49c2e1ddf8f3..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/D.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.annotations.naturalid;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Version;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
-/**
- * @author Guenther Demetz
- */
-@Entity
-@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
-public class D {
-	@Id
-	@GeneratedValue(strategy = GenerationType.TABLE)
-	public long oid;
-
-	@Version
-	private int version;
-
-	@jakarta.persistence.ManyToOne(fetch = FetchType.LAZY)
-	private A a = null;
-
-	@jakarta.persistence.OneToOne(mappedBy = "singleD")
-	private A singleA = null;
-
-	public A getA() {
-		return a;
-	}
-
-	public void setA(A a) {
-		this.a = a;
-	}
-
-	public A getSingleA() {
-		return singleA;
-	}
-
-	public void setSingleA(A singleA) {
-		this.singleA = singleA;
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java
deleted file mode 100644
index 53730932a71d..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnManyToOne.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.annotations.naturalid;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-
-import org.hibernate.annotations.NaturalId;
-import org.hibernate.annotations.NaturalIdCache;
-
-/**
- * Test case for NaturalId annotation - ANN-750
- *
- * @author Emmanuel Bernard
- * @author Hardy Ferentschik
- */
-@Entity
-@NaturalIdCache
-class NaturalIdOnManyToOne {
-
-	@Id
-	@GeneratedValue
-	int id;
-
-	@NaturalId
-	@ManyToOne
-	Citizen citizen;
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Citizen getCitizen() {
-		return citizen;
-	}
-
-	public void setCitizen(Citizen citizen) {
-		this.citizen = citizen;
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyJoinTableSetPrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyJoinTableSetPrimaryKeyTest.java
new file mode 100644
index 000000000000..a0ccf77c16d2
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyJoinTableSetPrimaryKeyTest.java
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.onetomany;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.testing.util.ServiceRegistryUtil;
+import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.OneToMany;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.AssertionsKt.assertNotNull;
+
+@BaseUnitTest
+public class OneToManyJoinTableSetPrimaryKeyTest {
+	private StandardServiceRegistry ssr;
+
+	@BeforeEach
+	public void setUp() {
+		ssr = ServiceRegistryUtil.serviceRegistry();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		if ( ssr != null ) {
+			StandardServiceRegistryBuilder.destroy( ssr );
+		}
+	}
+
+	@Test
+	public void testJoinTablePrimaryKeyUsesOnlyTargetForeignKey() {
+		final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
+				.addAnnotatedClass( Publisher.class )
+				.addAnnotatedClass( Author.class )
+				.buildMetadata();
+		metadata.orderColumns( true );
+		metadata.validate();
+
+		final List<String> commands = new SchemaCreatorImpl( ssr ).generateCreationCommands( metadata, false );
+		final String createTableString =
+				metadata.getDatabase().getDialect().getCreateTableString().toLowerCase( Locale.ROOT );
+		final String joinTableCreateCommand;
+		String found = null;
+		for ( String command : commands ) {
+			final String lowerCaseCommand = command.toLowerCase( Locale.ROOT );
+			if ( lowerCaseCommand.contains( createTableString )
+				&& lowerCaseCommand.contains( "publishedauthors" ) ) {
+				found = lowerCaseCommand;
+				break;
+			}
+		}
+		assertNotNull( found );
+
+		assertThat( found )
+				.containsPattern( "\"?publisher_id\"?\\s+[^,]*(\\(\\d+,\\d+\\)\\s+)?\\bnot\\s+null\\b" )
+				.containsPattern( "\"?authors_ssn\"?\\s+[^,]*\\bnot\\s+null\\b" )
+				.containsPattern( "\\bprimary\\s+key\\s*\\(\\s*\"?authors_ssn\"?\\s*\\)" )
+				.doesNotContainPattern( "\"?authors_ssn\"?\\s+[^,]*\\bunique\\b" )
+				.doesNotContainPattern(
+						"\\bprimary\\s+key\\s*\\(\\s*\"?publisher_id\"?\\s*,\\s*\"?authors_ssn\"?\\s*\\)"
+				);
+	}
+
+	@Entity(name = "Publisher")
+	public static class Publisher {
+		@Id
+		private Long id;
+
+		@OneToMany
+		@JoinTable(name = "PublishedAuthors")
+		private Set<Author> authors;
+	}
+
+	@Entity(name = "Author")
+	public static class Author {
+		@Id
+		private String ssn;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java
index 2a516a07ec11..054979348b85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java
@@ -17,6 +17,7 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.PersistentClass;
@@ -35,6 +36,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SettingProvider;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -108,6 +110,7 @@ public void afterEach(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerDialect.class, reason = "columnDefinition varchar(30) is not supported by Spanner" )
 	public void testColumnDefinitionPropagation(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dictionary.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dictionary.java
index 9349eda7d18d..7873e33958d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dictionary.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/Dictionary.java
@@ -33,7 +33,7 @@
 		}
 )
 @NamedNativeQuery(name = "all.dictionaries",
-		query = "select id, name, editor, disc as \"type\" from Dictionary",
+		query = "select id, name, editor, disc as type from Dictionary",
 		resultSetMapping = "dictionary")
 public class Dictionary {
 	private Integer id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java
index 6902becac8cb..fb386a7bcc4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java
@@ -19,6 +19,8 @@
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.Query;
 import org.hibernate.stat.Statistics;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.StandardBasicTypes;
 
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -321,6 +323,7 @@ public void testPackageQueries(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTimestampWithDateComparison.class)
 	public void testClassQueries(SessionFactoryScope scope) {
 		Night n = new Night();
 		Calendar c = new GregorianCalendar();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java
index b52478318de6..4ddbd3cc243d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryListParametersWithFetchSubSelectTest.java
@@ -71,7 +71,7 @@ public void simpleTest(SessionFactoryScope scope) {
 			List<Parent> results = query.getResultList();
 			assertThat( results )
 					.allSatisfy( parent -> assertThat( Hibernate.isInitialized( parent.getChildren() ) ).isTrue() )
-					.extracting( Parent::getId ).containsExactly( 0, 1, 2 );
+					.extracting( Parent::getId ).containsExactlyInAnyOrder( 0, 1, 2 );
 		} );
 
 		// If we get here, children were initialized eagerly.
@@ -93,19 +93,19 @@ public void reusingQueryWithFewerNamedParameters(SessionFactoryScope scope) {
 			List<Parent> results = query.getResultList();
 			assertThat( results )
 					.allSatisfy( parent -> assertThat( Hibernate.isInitialized( parent.getChildren() ) ).isTrue() )
-					.extracting( Parent::getId ).containsExactly( 0, 1, 2, 3 );
+					.extracting( Parent::getId ).containsExactlyInAnyOrder( 0, 1, 2, 3 );
 
 			query.setParameter( "ids", Arrays.asList( 4, 5, 6 ) );
 			results = query.getResultList();
 			assertThat( results )
 					.allSatisfy( parent -> assertThat( Hibernate.isInitialized( parent.getChildren() ) ).isTrue() )
-					.extracting( Parent::getId ).containsExactly( 4, 5, 6 );
+					.extracting( Parent::getId ).containsExactlyInAnyOrder( 4, 5, 6 );
 
 			query.setParameter( "ids", Arrays.asList( 7, 8 ) );
 			results = query.getResultList();
 			assertThat( results )
 					.allSatisfy( parent -> assertThat( Hibernate.isInitialized( parent.getChildren() ) ).isTrue() )
-					.extracting( Parent::getId ).containsExactly( 7, 8 );
+					.extracting( Parent::getId ).containsExactlyInAnyOrder( 7, 8 );
 		} );
 
 		// If we get here, children were initialized eagerly.
@@ -128,19 +128,19 @@ public void reusingQueryWithFewerOrdinalParameters(SessionFactoryScope scope) {
 			List<Parent> results = query.getResultList();
 			assertThat( results )
 					.allSatisfy( parent -> assertThat( Hibernate.isInitialized( parent.getChildren() ) ).isTrue() )
-					.extracting( Parent::getId ).containsExactly( 0, 1, 2, 3 );
+					.extracting( Parent::getId ).containsExactlyInAnyOrder( 0, 1, 2, 3 );
 
 			query.setParameter( 1, Arrays.asList( 4, 5, 6 ) );
 			results = query.getResultList();
 			assertThat( results )
 					.allSatisfy( parent -> assertThat( Hibernate.isInitialized( parent.getChildren() ) ).isTrue() )
-					.extracting( Parent::getId ).containsExactly( 4, 5, 6 );
+					.extracting( Parent::getId ).containsExactlyInAnyOrder( 4, 5, 6 );
 
 			query.setParameter( 1, Arrays.asList( 7, 8 ) );
 			results = query.getResultList();
 			assertThat( results )
 					.allSatisfy( parent -> assertThat( Hibernate.isInitialized( parent.getChildren() ) ).isTrue() )
-					.extracting( Parent::getId ).containsExactly( 7, 8 );
+					.extracting( Parent::getId ).containsExactlyInAnyOrder( 7, 8 );
 		} );
 
 		// If we get here, children were initialized eagerly.
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/constraints/ManyToOneRefColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/constraints/ManyToOneRefColumnNameTest.java
index ba70ddac7afe..614c8d7f1202 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/constraints/ManyToOneRefColumnNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/constraints/ManyToOneRefColumnNameTest.java
@@ -100,7 +100,7 @@ class ManyToOneRefColumnNameTest {
 		}
 	}
 
-	@Entity
+	@Entity(name = "That")
 	static class That {
 		@Id @GeneratedValue
 		long id;
@@ -112,7 +112,7 @@ static class That {
 		int compositeKeyTwo;
 	}
 
-	@Entity
+	@Entity(name = "This")
 	static class This {
 		@Id @GeneratedValue
 		long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/constraints/OneToManyRefColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/constraints/OneToManyRefColumnNameTest.java
index 272520546e00..8a2cbbe0c610 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/constraints/OneToManyRefColumnNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/constraints/OneToManyRefColumnNameTest.java
@@ -66,13 +66,13 @@ class OneToManyRefColumnNameTest {
 
 		assertThrows( ConstraintViolationException.class, () ->
 				scope.inTransaction( em -> {
-					em.createQuery( "update OneToManyRefColumnNameTest$That set singleKey = 'goodbye'" ).executeUpdate();
+					em.createQuery( "update That set singleKey = 'goodbye'" ).executeUpdate();
 				} )
 		);
 
 		assertThrows( ConstraintViolationException.class, () ->
 				scope.inTransaction( em -> {
-					em.createQuery( "update OneToManyRefColumnNameTest$That set compositeKeyOne = 69" ).executeUpdate();
+					em.createQuery( "update That set compositeKeyOne = 69" ).executeUpdate();
 				} )
 		);
 	}
@@ -131,7 +131,7 @@ class OneToManyRefColumnNameTest {
 		}
 	}
 
-	@Entity
+	@Entity(name = "That")
 	static class That {
 		@Id @GeneratedValue
 		long id;
@@ -152,7 +152,7 @@ static class That {
 		Set<This> theseOnCompositeKey = new HashSet<>();
 	}
 
-	@Entity
+	@Entity(name = "This")
 	static class This {
 		@Id @GeneratedValue
 		long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Clothes.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Clothes.java
index 35b96e259b21..94bfbd0ba852 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Clothes.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Clothes.java
@@ -5,7 +5,6 @@
 package org.hibernate.orm.test.annotations.referencedcolumnname;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.Column;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
@@ -15,7 +14,6 @@
 @Entity
 public class Clothes {
 	private Integer id;
-	@Column(name = "`type`")
 	private String type;
 	private String flavor;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Luggage.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Luggage.java
index 280666c3af30..d97e0085774e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Luggage.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/Luggage.java
@@ -8,7 +8,6 @@
 import java.util.HashSet;
 import java.util.Set;
 import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
@@ -22,7 +21,6 @@
 public class Luggage implements Serializable {
 	private Integer id;
 	private String owner;
-	@Column(name = "`type`")
 	private String type;
 	private Set<Clothes> hasInside = new HashSet<>();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Building.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Building.java
index 067c1633535c..55890e14e203 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Building.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Building.java
@@ -15,6 +15,7 @@ public class Building {
 
 	public Long height;
 
+	@ManyToOne(optional = false)
 	private Room room;
 
 	public Long getHeight() {
@@ -25,7 +26,6 @@ public void setHeight(Long height) {
 		this.height = height;
 	}
 
-	@ManyToOne(optional = false)
 	public Room getRoom() {
 		return room;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/House.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/House.java
index 1f4e238553fc..d9bb06f5624f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/House.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/House.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
-import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
@@ -17,12 +16,11 @@
 @Entity
 @Table(uniqueConstraints = {@UniqueConstraint(name = "uniqueWithInherited", columnNames = {"room_id", "cost"} )})
 public class House extends Building {
-	@Column(nullable = false)
+	@Id
 	public Long id;
 	@NotNull
 	public Integer cost;
 
-	@Id
 	public Long getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Room.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Room.java
index 5718d8e4a49c..203a52ab1f01 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Room.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/Room.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
-import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
@@ -13,6 +12,7 @@
  */
 @Entity
 public class Room {
+	@Id
 	private Long id;
 
 	private String name;
@@ -25,8 +25,6 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	@Id
-	@Column(nullable = false)
 	public Long getId() {
 		return id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java
index 02c46ed5024d..c828e518de8a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java
@@ -62,8 +62,14 @@ else if ( table.getName().equals( "UniqueNoNameB" ) ) {
 			assertThat( tableA != null && tableB != null )
 					.describedAs( "Could not find the expected tables." )
 					.isTrue();
-			assertThat( tableA.getUniqueKeys().values().iterator().next().getName() )
-					.isNotEqualTo( tableB.getUniqueKeys().values().iterator().next().getName() );
+			if ( !tableA.getUniqueKeys().isEmpty() ) {
+				assertThat( tableA.getUniqueKeys().values().iterator().next().getName() )
+						.isNotEqualTo( tableB.getUniqueKeys().values().iterator().next().getName() );
+			}
+			else {
+				assertThat( tableA.getIndexes().values().iterator().next().getName() )
+						.isNotEqualTo( tableB.getIndexes().values().iterator().next().getName() );
+			}
 		}
 		finally {
 			StandardServiceRegistryBuilder.destroy( ssr );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OrmXmlGeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OrmXmlGeneratedTest.java
new file mode 100644
index 000000000000..e5f134418498
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OrmXmlGeneratedTest.java
@@ -0,0 +1,52 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.various;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.generator.EventType;
+import org.hibernate.mapping.GeneratorCreator;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.testing.ServiceRegistryBuilder;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.testing.util.uuid.IdGeneratorCreationContext;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@BaseUnitTest
+class OrmXmlGeneratedTest {
+
+	@Test
+	void testOrmXmlDefinedGenerated() {
+		StandardServiceRegistry ssr = ServiceRegistryBuilder.buildServiceRegistry();
+
+		try {
+			MetadataSources ms = new MetadataSources( ssr );
+			ms.addResource( "org/hibernate/orm/test/annotations/generated/ormXml/orm.xml" );
+
+			Metadata metadata = ms.buildMetadata();
+
+			PersistentClass entityBinding = metadata.getEntityBinding( Tractor.class.getName() );
+			GeneratorCreator generator = entityBinding
+					.getProperty( "serialNumber" )
+					.getValueGeneratorCreator();
+
+			assertThat( generator )
+					.extracting( creator -> creator.createGenerator(
+							new IdGeneratorCreationContext( (MetadataImplementor) metadata, entityBinding.getRootClass() )
+					) )
+					.satisfies( gen ->
+							assertThat( gen.getEventTypes() )
+									.containsExactly( EventType.INSERT, EventType.UPDATE, EventType.FORCE_INCREMENT )
+					);
+		}
+		finally {
+			ServiceRegistryBuilder.destroy( ssr );
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/TimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/TimestampTest.java
index efa56c34d3c8..114eed0092d9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/TimestampTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/TimestampTest.java
@@ -4,71 +4,45 @@
  */
 package org.hibernate.orm.test.annotations.various;
 
-import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
-import org.hibernate.testing.orm.junit.BaseUnitTest;
-import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.hibernate.type.BasicType;
-import org.hibernate.type.BasicTypeReference;
-import org.hibernate.type.StandardBasicTypes;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import java.sql.Timestamp;
+import java.util.Date;
+
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * Test for the @Timestamp annotation.
  *
  * @author Hardy Ferentschik
  */
-@BaseUnitTest
+@SessionFactory
+@DomainModel(annotatedClasses = {VMTimestamped.class, DBTimestamped.class})
 public class TimestampTest {
-	private StandardServiceRegistry ssr;
-	private MetadataImplementor metadata;
-
-	@BeforeAll
-	public void setUp() {
-		ssr = ServiceRegistryUtil.serviceRegistry();
-		metadata = (MetadataImplementor) new MetadataSources( ssr )
-				.addAnnotatedClass( VMTimestamped.class )
-				.addAnnotatedClass( DBTimestamped.class )
-				.getMetadataBuilder()
-				.build();
-	}
-
-	@AfterAll
-	public void tearDown() {
-		if ( ssr != null ) {
-			StandardServiceRegistryBuilder.destroy( ssr );
-		}
-	}
-
-	@Test
-	public void testTimestampSourceIsVM() throws Exception {
-		assertTimestampSource( VMTimestamped.class, StandardBasicTypes.TIMESTAMP );
-	}
-
-	@Test
-	public void testTimestampSourceIsDB() throws Exception {
-		assertTimestampSource( DBTimestamped.class, StandardBasicTypes.TIMESTAMP );
-	}
-
-	private void assertTimestampSource(Class<?> clazz, BasicTypeReference<?> typeReference) throws Exception {
-		assertTimestampSource( clazz, metadata.getTypeConfiguration().getBasicTypeRegistry().resolve( typeReference ) );
-	}
+	@Test void test(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			var vmTimestamped = new VMTimestamped();
+			session.persist( vmTimestamped );
+			var dbTimestamped = new DBTimestamped();
+			session.persist( dbTimestamped );
+			session.flush();
+			assertNotNull( vmTimestamped.getLastUpdate() );
+			assertNotNull( dbTimestamped.getLastUpdate() );
+			assertInstanceOf( Date.class, vmTimestamped.getLastUpdate() );
+			assertInstanceOf( Timestamp.class, dbTimestamped.getLastUpdate() );
+		} );
+		scope.inTransaction( session -> {
+			var vmTimestamped = session.find(VMTimestamped.class, 1);
+			var dbTimestamped = session.find(DBTimestamped.class, 1);
+			assertNotNull( vmTimestamped.getLastUpdate() );
+			assertNotNull( dbTimestamped.getLastUpdate() );
+			assertInstanceOf( Timestamp.class, vmTimestamped.getLastUpdate() );
+			assertInstanceOf( Timestamp.class, dbTimestamped.getLastUpdate() );
+		} );
 
-	private void assertTimestampSource(Class<?> clazz, BasicType<?> basicType) throws Exception {
-		PersistentClass persistentClass = metadata.getEntityBinding( clazz.getName() );
-		assertThat( persistentClass ).isNotNull();
-		Property versionProperty = persistentClass.getVersion();
-		assertThat( versionProperty ).isNotNull();
-		assertThat( versionProperty.getType() )
-				.describedAs( "Wrong timestamp type" )
-				.isEqualTo( basicType );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Tractor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Tractor.java
new file mode 100644
index 000000000000..4c2b50d71251
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Tractor.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.annotations.various;
+
+public class Tractor {
+
+	public Long id;
+	public String model;
+	public int serialNumber;
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java
index a28cde47d26e..7354f5da9516 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTest.java
@@ -8,8 +8,10 @@
 import java.util.List;
 
 import org.hibernate.Transaction;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.persister.collection.BasicCollectionPersister;
 
@@ -37,6 +39,8 @@
 		}
 )
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support table name with spaces" )
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner doesn't support table name with spaces" )
 public class Ejb3XmlTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/AnyTypeDirtyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/AnyTypeDirtyTest.java
new file mode 100644
index 000000000000..f98cf0159f10
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/AnyTypeDirtyTest.java
@@ -0,0 +1,197 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.SessionFactory;
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.AnyKeyJavaClass;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static jakarta.persistence.CascadeType.ALL;
+import static jakarta.persistence.FetchType.LAZY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Expected behavior:
+ * <p>
+ * Hibernate must not consider an {@link org.hibernate.annotations.Any} association
+ * dirty when the referenced entity has not logically changed.
+ * </p>
+ *
+ * <p>
+ * In particular, replacing a proxy obtained via
+ * {@link jakarta.persistence.EntityManager#getReference(Class, Object)} with its
+ * underlying implementation instance must not trigger dirty checking, as both
+ * references represent the same persistent entity.
+ * </p>
+ *
+ * <p>
+ * The presence of a proxy versus a non-proxy instance is an implementation detail
+ * and must not result in an SQL {@code UPDATE} during flush.
+ * </p>
+ *
+ * <p>
+ * This test asserts that no {@code UPDATE} statements are executed when flushing
+ * the persistence context, using a {@code SQLStatementInspector}.
+ * </p>
+ *
+ * @author Vincent Bouthinon
+ * @author Utsav Mehta
+ * @see org.hibernate.annotations.Any
+ * @see jakarta.persistence.EntityManager#getReference(Class, Object)
+ * @see org.hibernate.testing.jdbc.SQLStatementInspector
+ */
+@Jpa(annotatedClasses = {
+		AnyTypeDirtyTest.Formulaire.class,
+		AnyTypeDirtyTest.Operation.class},
+		useCollectingStatementInspector = true)
+@JiraKey("HHH-20020")
+public class AnyTypeDirtyTest {
+
+	@AfterAll
+	public void tearDown(EntityManagerFactoryScope scope) {
+		scope.getEntityManagerFactory()
+				.unwrap( SessionFactory.class)
+				.getSchemaManager()
+				.truncateMappedObjects();
+	}
+
+	@Test
+	void isNotDirty(EntityManagerFactoryScope scope) {
+		final SQLStatementInspector sql = scope.getCollectingStatementInspector();
+
+		Long idFormulaire = scope.fromTransaction( entityManager -> {
+			Formulaire formulaire = new Formulaire();
+			formulaire.addToOperations( new Operation() );
+			entityManager.persist( formulaire );
+			entityManager.flush();
+			entityManager.clear();
+			return formulaire.getId();
+		} );
+
+		sql.clear();
+
+		scope.inTransaction( entityManager -> {
+			Formulaire formulaireProxy = entityManager.getReference( Formulaire.class, idFormulaire );
+			formulaireProxy.addToOperations( new Operation() );
+			entityManager.merge( formulaireProxy );
+			entityManager.flush();
+		} );
+
+		sql.assertNoUpdate();
+
+		scope.inTransaction( entityManager -> {
+			Formulaire reloaded =
+					entityManager.find( Formulaire.class, idFormulaire );
+			assertEquals( 2, reloaded.operations.size() );
+			for ( Operation op : reloaded.operations ) {
+				assertEquals( reloaded, op.getFormulaire(),
+						"The @Any association should still point to the correct Formulaire" );
+			}
+		} );
+	}
+
+	@Test
+	void isDirtyWhenAssociationChanges(EntityManagerFactoryScope scope) {
+		final SQLStatementInspector sql = scope.getCollectingStatementInspector();
+
+		Long id1 = scope.fromTransaction( entityManager -> {
+			Formulaire f1 = new Formulaire();
+			entityManager.persist( f1 );
+			return f1.getId();
+		} );
+
+		Long id2 = scope.fromTransaction( entityManager -> {
+			Formulaire f2 = new Formulaire();
+			entityManager.persist( f2 );
+			return f2.getId();
+		} );
+
+		Long opId = scope.fromTransaction( entityManager -> {
+			Operation op = new Operation();
+			op.setFormulaire( entityManager.getReference( Formulaire.class, id1 ) );
+			entityManager.persist( op );
+			entityManager.flush();
+
+			sql.clear();
+
+			op.setFormulaire( entityManager.getReference( Formulaire.class, id2 ) );
+			entityManager.flush();
+			return op.id;
+		} );
+
+		sql.assertUpdate();
+
+		scope.inTransaction( entityManager -> {
+			Operation reloaded =
+					entityManager.find( Operation.class, opId );
+
+			Formulaire associated = (Formulaire) reloaded.getFormulaire();
+			assertEquals( id2, associated.getId(),
+					"The @Any association should now point to the updated Formulaire" );
+		} );
+	}
+
+	@Entity(name = "formulaire")
+	@Table(name = "formulaire")
+	public static class Formulaire {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@OneToMany(cascade = ALL, fetch = LAZY)
+		@Fetch(FetchMode.SUBSELECT)
+		protected Set<Operation> operations = new HashSet<>();
+
+		public boolean addToOperations(Operation operation) {
+			operation.setFormulaire( this );
+			return operations.add( operation );
+		}
+		public Long getId() {
+			return id;
+		}
+	}
+
+	@Entity(name = "operation")
+	@Table(name = "toperation")
+	public static class Operation {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@Any(fetch = LAZY)
+		@AnyKeyJavaClass(Long.class)
+		@JoinColumn(name = "FORMULAIRE_ID")
+		@Column(name = "FORMULAIRE_ROLE")
+		private Object formulaire;
+
+		public Object getFormulaire() {
+			return formulaire;
+		}
+
+		public void setFormulaire(Object formulaire) {
+			this.formulaire = formulaire;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/AnyTypeFlushToLoggableStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/AnyTypeFlushToLoggableStringTest.java
new file mode 100644
index 000000000000..ecbce2efa8bb
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/AnyTypeFlushToLoggableStringTest.java
@@ -0,0 +1,80 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import org.hibernate.internal.CoreMessageLogger;
+import org.jboss.logging.Logger;
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.testing.logger.LogLevelContext.withLevel;
+
+
+/**
+ * Test case reproducing an issue in EntityPrinter.logEntities during logFlushResults,
+ * where a HibernateException is thrown while attempting to wrap an entity as a String.
+ * <p>
+ * The failure occurs when an @Any association uses a String identifier via @AnyKeyJavaClass(String.class),
+ * leading Hibernate to incorrectly attempt a conversion using StringJavaType.
+ *
+ * @author Vincent Bouthinon
+ * @author Utsav Mehta
+ */
+@Jpa(annotatedClasses = {AnyTypeFlushToLoggableStringTest.Book.class})
+@JiraKey("HHH-20229")
+class AnyTypeFlushToLoggableStringTest {
+
+	@Test
+	void testLogEntityWithAnyKeyJavaClassAsString(EntityManagerFactoryScope scope) {
+		try (
+				var l1 = withLevel( CoreMessageLogger.NAME, Logger.Level.DEBUG );
+		) {
+			scope.inTransaction(
+					entityManager -> {
+						Book book = new Book();
+						Book origin = new Book();
+						book.setOrigin( origin );
+						entityManager.persist( origin );
+						entityManager.persist( book );
+						entityManager.flush();
+						entityManager.clear();
+					}
+			);
+		}
+	}
+
+	@Entity(name = "book")
+	public static class Book {
+
+		@Id
+		@GeneratedValue
+		private String id;
+
+		@Any
+		@AnyKeyJavaClass(String.class)
+		@JoinColumn(name = "origin_id")
+		@Column(name = "origin_type")
+		@AnyDiscriminatorValue(discriminator = "BOOK", entity = Book.class)
+		private Object origin;
+
+		public Object getOrigin() {
+			return origin;
+		}
+
+		public void setOrigin(Object origin) {
+			this.origin = origin;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyCascadeAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyCascadeAttributeTest.java
new file mode 100644
index 000000000000..922292fe87eb
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyCascadeAttributeTest.java
@@ -0,0 +1,217 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any.annotations;
+
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@DomainModel(
+		annotatedClasses = {
+				PropertySetWithCascade.class,
+				IntegerProperty.class,
+				StringProperty.class
+		}
+)
+@SessionFactory
+@JiraKey( "HHH-19971" )
+public class AnyCascadeAttributeTest {
+
+	@AfterEach
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	@Test
+	public void testManyToAnyCascadePersist(SessionFactoryScope scope) {
+		// Persist parent only, children should cascade
+		scope.inTransaction( session -> {
+			PropertySetWithCascade set = new PropertySetWithCascade( "test" );
+			set.setSomeProperty( new StringProperty( "name", "alex" ) );
+			set.addGeneralProperty( new IntegerProperty( "age", 23 ) );
+			session.persist( set );
+
+		} );
+
+		// Verify children were persisted via cascade
+		scope.inTransaction( session -> {
+			PropertySetWithCascade result = session
+					.createQuery( "select s from PropertySetWithCascade s where name = :name", PropertySetWithCascade.class )
+					.setParameter( "name", "test" )
+					.uniqueResult();
+			assertNotNull( result );
+			assertNotNull( result.getSomeProperty() );
+			assertEquals( "alex", result.getSomeProperty().asString() );
+			assertEquals( 1, result.getGeneralProperties().size() );
+			assertEquals( "23", result.getGeneralProperties().get( 0 ).asString());
+		} );
+	}
+
+	@Test
+	public void testAnyCascadePersist(SessionFactoryScope scope) {
+		// Persist parent with @Any child - should cascade
+		scope.inTransaction( session -> {
+
+			PropertySetWithCascade set = new PropertySetWithCascade( "any-test" );
+			set.setSomeProperty( new IntegerProperty("score", 100) );
+			session.persist( set );
+
+		} );
+
+		scope.inTransaction( session -> {
+			PropertySetWithCascade result = session
+					.createQuery( "select s from PropertySetWithCascade s where name = :name", PropertySetWithCascade.class )
+					.setParameter( "name", "any-test" )
+					.uniqueResult();
+			assertNotNull( result );
+			assertNotNull( result.getSomeProperty() );
+			assertInstanceOf( IntegerProperty.class, result.getSomeProperty() );
+			assertEquals( "100", result.getSomeProperty().asString());
+		} );
+	}
+
+	@Test
+	public void testAnyCascadeMerge(SessionFactoryScope scope) {
+		Integer setId = scope.fromTransaction( session -> {
+			PropertySetWithCascade set = new PropertySetWithCascade( "merge-test" );
+			set.setSomeProperty( new StringProperty( "key", "original" ) );
+			session.persist( set );
+			return set.getId();
+		} );
+
+		scope.inTransaction( session -> {
+			PropertySetWithCascade set = session.find( PropertySetWithCascade.class, setId );
+			( (StringProperty) set.getSomeProperty() ).setValue( "updated" );
+			session.merge( set );
+		} );
+
+		scope.inTransaction( session -> {
+			PropertySetWithCascade result = session.find( PropertySetWithCascade.class, setId );
+			assertNotNull( result.getSomeProperty() );
+			assertEquals( "updated", result.getSomeProperty().asString() );
+		} );
+	}
+
+	@Test
+	public void testManyToAnyCascadeMerge(SessionFactoryScope scope) {
+		Integer setId = scope.fromTransaction( session -> {
+			PropertySetWithCascade set = new PropertySetWithCascade( "many-merge-test" );
+			set.addGeneralProperty( new StringProperty( "key", "original" ) );
+			session.persist( set );
+			return set.getId();
+		} );
+
+		scope.inTransaction( session -> {
+			PropertySetWithCascade set = session.find( PropertySetWithCascade.class, setId );
+			( (StringProperty) set.getGeneralProperties().get( 0 ) ).setValue( "updated" );
+			session.merge( set );
+		} );
+
+		scope.inTransaction( session -> {
+			PropertySetWithCascade result = session.find( PropertySetWithCascade.class, setId );
+			assertEquals( 1, result.getGeneralProperties().size() );
+			assertEquals( "updated", result.getGeneralProperties().get( 0 ).asString() );
+		} );
+	}
+
+	@Test
+	public void testAnyCascadeRemove(SessionFactoryScope scope) {
+		Integer[] ids = new Integer[2];
+
+		scope.inTransaction( session -> {
+			PropertySetWithCascade set = new PropertySetWithCascade( "remove-test" );
+			StringProperty prop = new StringProperty( "key", "value" );
+			set.setSomeProperty( prop );
+			session.persist( set );
+			ids[0] = set.getId();
+		} );
+
+		// get the property id before removal
+		Integer propId = scope.fromTransaction( session -> {
+			PropertySetWithCascade set = session.find( PropertySetWithCascade.class, ids[0] );
+			return ( (StringProperty) set.getSomeProperty() ).getId();
+		} );
+
+		scope.inTransaction( session -> {
+			PropertySetWithCascade set = session.find( PropertySetWithCascade.class, ids[0] );
+			session.remove( set );
+		} );
+
+		scope.inTransaction( session -> {
+			assertNull( session.find( PropertySetWithCascade.class, ids[0] ) );
+			assertNull( session.find( StringProperty.class, propId ) );
+		} );
+	}
+
+	@Test
+	public void testManyToAnyCascadeRemove(SessionFactoryScope scope) {
+		Integer setId = scope.fromTransaction( session -> {
+			PropertySetWithCascade set = new PropertySetWithCascade( "many-remove-test" );
+			set.addGeneralProperty( new IntegerProperty( "count", 5 ) );
+			session.persist( set );
+			return set.getId();
+		} );
+
+		Integer propId = scope.fromTransaction( session -> {
+			PropertySetWithCascade set = session.find( PropertySetWithCascade.class, setId );
+			return ( (IntegerProperty) set.getGeneralProperties().get( 0 ) ).getId();
+		} );
+
+		scope.inTransaction( session -> {
+			PropertySetWithCascade set = session.find( PropertySetWithCascade.class, setId );
+			session.remove( set );
+		} );
+
+		scope.inTransaction( session -> {
+			assertNull( session.find( PropertySetWithCascade.class, setId ) );
+			assertNull( session.find( IntegerProperty.class, propId ) );
+		} );
+	}
+
+	@Test
+	public void testAnyCascadeRefresh(SessionFactoryScope scope) {
+		Integer setId = scope.fromTransaction( session -> {
+			PropertySetWithCascade set = new PropertySetWithCascade( "refresh-test" );
+			set.setSomeProperty( new StringProperty( "key", "value" ) );
+			session.persist( set );
+			return set.getId();
+		} );
+
+		scope.inTransaction( session -> {
+			PropertySetWithCascade set = session.find( PropertySetWithCascade.class, setId );
+			// dirty the child in-memory without flushing
+			( (StringProperty) set.getSomeProperty() ).setValue( "dirty" );
+			// refresh should reload from DB, cascading to child
+			session.refresh( set );
+			assertEquals( "value", set.getSomeProperty().asString() );
+		} );
+	}
+
+	@Test
+	public void testManyToAnyCascadeRefresh(SessionFactoryScope scope) {
+		Integer setId = scope.fromTransaction( session -> {
+			PropertySetWithCascade set = new PropertySetWithCascade( "many-refresh-test" );
+			set.addGeneralProperty( new IntegerProperty( "count", 10 ) );
+			session.persist( set );
+			return set.getId();
+		} );
+
+		scope.inTransaction( session -> {
+			PropertySetWithCascade set = session.find( PropertySetWithCascade.class, setId );
+			( (IntegerProperty) set.getGeneralProperties().get( 0 ) ).setValue( 999 );
+			session.refresh( set );
+			assertEquals( "10", set.getGeneralProperties().get( 0 ).asString() );
+		} );
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyNullabilityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyNullabilityTest.java
index da81c8f127a8..4c77cd85b0c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyNullabilityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/AnyNullabilityTest.java
@@ -102,6 +102,7 @@ public static class IntegerProperty implements Property<Integer> {
 
 		private String name;
 
+		@Column( name = "property_value" )
 		private Integer value;
 
 		public Long getId() {
@@ -138,6 +139,7 @@ public static class StringProperty implements Property<String> {
 
 		private String name;
 
+		@Column( name = "property_value" )
 		private String value;
 
 		public Long getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySetWithCascade.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySetWithCascade.java
new file mode 100644
index 000000000000..19e4f92e0f70
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/annotations/PropertySetWithCascade.java
@@ -0,0 +1,89 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any.annotations;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
+import org.hibernate.annotations.ManyToAny;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table( name = "property_set_cascade" )
+public class PropertySetWithCascade {
+
+	private Integer id;
+	private String name;
+	private Property someProperty;
+	private List<Property> generalProperties = new ArrayList<>();
+
+	public PropertySetWithCascade() {}
+	public PropertySetWithCascade(String name) {
+		this.name = name;
+	}
+
+	@ManyToAny(cascade = jakarta. persistence.CascadeType.ALL)
+	@Column( name = "property_type" )
+	@AnyKeyJavaClass( Integer.class )
+	@AnyDiscriminatorValue( discriminator = "S", entity = StringProperty.class )
+	@AnyDiscriminatorValue( discriminator = "I", entity = IntegerProperty.class )
+	@JoinTable(
+			name = "obj_properties_cascade",
+			joinColumns = @JoinColumn( name = "obj_id" ),
+			inverseJoinColumns = @JoinColumn( name = "property_id" ) )
+	public List<Property> getGeneralProperties() {
+		return generalProperties;
+	}
+
+	public void setGeneralProperties(List<Property> generalProperties) {
+		this.generalProperties = generalProperties;
+	}
+
+	@Id
+	@GeneratedValue
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Any(cascade = jakarta.persistence.CascadeType.ALL)
+	@Column( name = "property_type" )
+	@AnyKeyJavaClass( Integer.class )
+	@AnyDiscriminatorValue( discriminator = "S", entity = StringProperty.class )
+	@AnyDiscriminatorValue( discriminator = "I", entity = IntegerProperty.class )
+	@JoinColumn( name = "property_id" )
+	public Property getSomeProperty() {
+		return someProperty;
+	}
+
+	public void setSomeProperty(Property someProperty) {
+		this.someProperty = someProperty;
+	}
+
+	public void addGeneralProperty(Property property) {
+		this.generalProperties.add( property );
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinAnyTest.java
new file mode 100644
index 000000000000..996372634286
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinAnyTest.java
@@ -0,0 +1,227 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any.fetch;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+@SessionFactory(useCollectingStatementInspector = true)
+@DomainModel(annotatedClasses = {JoinAnyTest.AnyThing.class,
+		JoinAnyTest.SomeThing.class, JoinAnyTest.SomeOtherThing.class})
+class JoinAnyTest {
+
+	@BeforeEach
+	void cleanup(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	@Test
+	void testJoin(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var anyThing = new AnyThing();
+			var someThing = new SomeThing();
+			someThing.description = "Some thing";
+			anyThing.anything = someThing;
+			s.persist( someThing );
+			s.persist( anyThing );
+			var anyThingElse = new AnyThing();
+			var otherThing = new SomeOtherThing();
+			anyThingElse.anything = otherThing;
+			s.persist( otherThing );
+			s.persist( anyThingElse );
+			var emptyThing = new AnyThing();
+			s.persist( emptyThing );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+		statementInspector.clear();
+
+		scope.inTransaction( s -> {
+			var results =
+					s.createQuery( "select a, b from AnyThing a join a.anything b order by a.id",
+									Object[].class )
+						.getResultList();
+			assertEquals( 3, results.size() );
+			var result1 = results.get( 0 );
+			var anyThing1 = (AnyThing) result1[0];
+			assertInstanceOf( SomeThing.class, anyThing1.anything );
+			assertInstanceOf( SomeThing.class, result1[1] );
+			var someThing = (SomeThing) result1[1];
+			assertEquals( "Some thing", someThing.getDescription() );
+			assertSame( someThing, anyThing1.anything );
+			var result2 = results.get( 1 );
+			var anyThing2 = (AnyThing) result2[0];
+			assertInstanceOf( SomeOtherThing.class, anyThing2.anything );
+			assertInstanceOf( SomeOtherThing.class, result2[1] );
+			var someOtherThing = (SomeOtherThing) result2[1];
+			assertSame( someOtherThing, anyThing2.anything );
+			var result3 = results.get( 2 );
+			var anyThing3 = (AnyThing) result3[0];
+			assertNull( result3[1] );
+			assertNull( anyThing3.anything );
+		} );
+		assertEquals( 1, statementInspector.getSqlQueries().size() );
+	}
+
+	@Test
+	void testJoinSelectAssociation(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var anyThing = new AnyThing();
+			var someThing = new SomeThing();
+			someThing.description = "Some thing";
+			anyThing.anything = someThing;
+			s.persist( someThing );
+			s.persist( anyThing );
+			var anyThingElse = new AnyThing();
+			var otherThing = new SomeOtherThing();
+			anyThingElse.anything = otherThing;
+			s.persist( otherThing );
+			s.persist( anyThingElse );
+			var emptyThing = new AnyThing();
+			s.persist( emptyThing );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+		statementInspector.clear();
+
+		scope.inTransaction( s -> {
+			var results = s.createQuery(
+					"select b from AnyThing a join a.anything b order by a.id",
+					Object.class
+			).getResultList();
+			assertEquals( 3, results.size() );
+			assertInstanceOf( SomeThing.class, results.get( 0 ) );
+			assertEquals( "Some thing", ( (SomeThing) results.get( 0 ) ).getDescription() );
+			assertInstanceOf( SomeOtherThing.class, results.get( 1 ) );
+			assertNull( results.get( 2 ) );
+		} );
+		assertEquals( 1, statementInspector.getSqlQueries().size() );
+	}
+
+	@Test
+	void testJoinTreat(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var anyThing = new AnyThing();
+			var someThing = new SomeThing();
+			someThing.description = "Some thing";
+			anyThing.anything = someThing;
+			s.persist( someThing );
+			s.persist( anyThing );
+			var anyThingElse = new AnyThing();
+			var otherThing = new SomeOtherThing();
+			anyThingElse.anything = otherThing;
+			s.persist( otherThing );
+			s.persist( anyThingElse );
+			var emptyThing = new AnyThing();
+			s.persist( emptyThing );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+		statementInspector.clear();
+
+		scope.inTransaction( s -> {
+			var results = s.createQuery(
+					"select a, b from AnyThing a join treat(a.anything as SomeThing) b order by a.id",
+					Object[].class
+			).getResultList();
+			assertEquals( 1, results.size() );
+			var result = results.get( 0 );
+			var anyThing = (AnyThing) result[0];
+			assertInstanceOf( SomeThing.class, anyThing.anything );
+			assertInstanceOf( SomeThing.class, result[1] );
+			var someThing = (SomeThing) result[1];
+			assertEquals( "Some thing", someThing.getDescription() );
+			assertSame( someThing, anyThing.anything );
+		} );
+		assertEquals( 1, statementInspector.getSqlQueries().size() );
+	}
+
+	@Test
+	void testJoinTreatSelectAssociation(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var anyThing = new AnyThing();
+			var someThing = new SomeThing();
+			someThing.description = "Some thing";
+			anyThing.anything = someThing;
+			s.persist( someThing );
+			s.persist( anyThing );
+			var anyThingElse = new AnyThing();
+			var otherThing = new SomeOtherThing();
+			anyThingElse.anything = otherThing;
+			s.persist( otherThing );
+			s.persist( anyThingElse );
+			var emptyThing = new AnyThing();
+			s.persist( emptyThing );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+		statementInspector.clear();
+
+		scope.inTransaction( s -> {
+			var results = s.createQuery(
+					"select b from AnyThing a join treat(a.anything as SomeThing) b order by a.id",
+					SomeThing.class
+			).getResultList();
+			assertEquals( 1, results.size() );
+			assertEquals( "Some thing", results.get( 0 ).getDescription() );
+		} );
+		assertEquals( 1, statementInspector.getSqlQueries().size() );
+	}
+
+	@Entity(name = "AnyThing")
+	static class AnyThing {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@Any(fetch = FetchType.LAZY)
+		@AnyKeyJavaClass(Long.class)
+		@JoinColumn(name = "ANYTHING_ID")
+		@Column(name = "ANYTHING_TYPE")
+		@AnyDiscriminatorValue(
+				discriminator = "SomeThing",
+				entity = SomeThing.class)
+		@AnyDiscriminatorValue(
+				discriminator = "SomeOtherThing",
+				entity = SomeOtherThing.class)
+		Thing anything;
+	}
+
+	static class Thing {
+	}
+
+	@Entity(name = "SomeThing")
+	static class SomeThing extends Thing {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		String description;
+
+		public String getDescription() {
+			return description;
+		}
+	}
+
+	@Entity(name = "SomeOtherThing")
+	static class SomeOtherThing extends Thing {
+		@Id
+		@GeneratedValue
+		Long id;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchAnyAndOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchAnyAndOneToManyTest.java
new file mode 100644
index 000000000000..1fb46625572a
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchAnyAndOneToManyTest.java
@@ -0,0 +1,190 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any.fetch;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.hibernate.Hibernate.isInitialized;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests that {@code resolveFromPreviousRow} works correctly for join-fetched
+ * {@link Any @Any} associations. When an owner entity has both a join-fetched
+ * {@code @Any} and a join-fetched collection, the result set contains multiple
+ * rows for the same owner. On the second and subsequent rows, the owner
+ * initializer reuses the previous row and calls {@code resolveFromPreviousRow}
+ * on the {@code @Any} initializer rather than re-resolving it from scratch.
+ */
+@SessionFactory(useCollectingStatementInspector = true)
+@DomainModel(annotatedClasses = {
+		JoinFetchAnyAndOneToManyTest.Owner.class,
+		JoinFetchAnyAndOneToManyTest.Item.class,
+		JoinFetchAnyAndOneToManyTest.SomeThing.class,
+		JoinFetchAnyAndOneToManyTest.SomeOtherThing.class})
+class JoinFetchAnyAndOneToManyTest {
+
+	@BeforeEach
+	void cleanup(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	@Test
+	void testJoinFetchAnyWithCollection(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var owner = new Owner();
+			var child = new SomeThing();
+			child.description = "Some thing";
+			owner.child = child;
+			s.persist( child );
+			for ( int i = 1; i <= 3; i++ ) {
+				var item = new Item();
+				item.name = "item-" + i;
+				item.owner = owner;
+				owner.items.add( item );
+			}
+			s.persist( owner );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var owners = s.createQuery(
+					"from Owner o join fetch o.child join fetch o.items",
+					Owner.class
+			).getResultList();
+			assertEquals( 1, owners.size() );
+			var owner = owners.get( 0 );
+			assertTrue( isInitialized( owner.child ) );
+			assertTrue( isInitialized( owner.items ) );
+			assertInstanceOf( SomeThing.class, owner.child );
+			assertEquals( "Some thing", ((SomeThing) owner.child).description );
+			assertEquals( 3, owner.items.size() );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+	}
+
+	@Test
+	void testJoinFetchPolymorphicAnyWithCollection(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var owner1 = new Owner();
+			var child1 = new SomeThing();
+			child1.description = "Some thing";
+			owner1.child = child1;
+			s.persist( child1 );
+			for ( int i = 1; i <= 2; i++ ) {
+				var item = new Item();
+				item.name = "owner1-item-" + i;
+				item.owner = owner1;
+				owner1.items.add( item );
+			}
+			s.persist( owner1 );
+
+			var owner2 = new Owner();
+			var child2 = new SomeOtherThing();
+			owner2.child = child2;
+			s.persist( child2 );
+			for ( int i = 1; i <= 2; i++ ) {
+				var item = new Item();
+				item.name = "owner2-item-" + i;
+				item.owner = owner2;
+				owner2.items.add( item );
+			}
+			s.persist( owner2 );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var owners = s.createQuery(
+					"from Owner o join fetch o.child join fetch o.items order by o.id",
+					Owner.class
+			).getResultList();
+			assertEquals( 2, owners.size() );
+			var owner1 = owners.get( 0 );
+			var owner2 = owners.get( 1 );
+			assertTrue( isInitialized( owner1.child ) );
+			assertTrue( isInitialized( owner1.items ) );
+			assertInstanceOf( SomeThing.class, owner1.child );
+			assertEquals( "Some thing", ((SomeThing) owner1.child).description );
+			assertEquals( 2, owner1.items.size() );
+			assertTrue( isInitialized( owner2.child ) );
+			assertTrue( isInitialized( owner2.items ) );
+			assertInstanceOf( SomeOtherThing.class, owner2.child );
+			assertEquals( 2, owner2.items.size() );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+	}
+
+	@Entity(name = "Owner")
+	static class Owner {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@Any(fetch = FetchType.LAZY)
+		@AnyKeyJavaClass(Long.class)
+		@JoinColumn(name = "CHILD_ID")
+		@Column(name = "CHILD_TYPE")
+		@AnyDiscriminatorValue(
+				discriminator = "SomeThing",
+				entity = SomeThing.class)
+		@AnyDiscriminatorValue(
+				discriminator = "SomeOtherThing",
+				entity = SomeOtherThing.class)
+		Thing child;
+
+		@OneToMany(mappedBy = "owner", cascade = CascadeType.ALL)
+		List<Item> items = new ArrayList<>();
+	}
+
+	@Entity(name = "Item")
+	static class Item {
+		@Id
+		@GeneratedValue
+		Long id;
+		String name;
+		@ManyToOne
+		Owner owner;
+	}
+
+	static class Thing {
+	}
+
+	@Entity(name = "SomeThing")
+	static class SomeThing extends Thing {
+		@Id
+		@GeneratedValue
+		Long id;
+		String description;
+	}
+
+	@Entity(name = "SomeOtherThing")
+	static class SomeOtherThing extends Thing {
+		@Id
+		@GeneratedValue
+		Long id;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchAnyQueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchAnyQueryCacheTest.java
new file mode 100644
index 000000000000..24b8016f2a61
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchAnyQueryCacheTest.java
@@ -0,0 +1,237 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any.fetch;
+
+import java.util.List;
+
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+
+import org.hibernate.Session;
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.FetchProfile;
+import org.hibernate.cfg.CacheSettings;
+import org.hibernate.stat.Statistics;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.Hibernate.isInitialized;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@DomainModel(
+		annotatedClasses = {
+				JoinFetchAnyQueryCacheTest.Purchase.class,
+				JoinFetchAnyQueryCacheTest.CardPayment.class,
+				JoinFetchAnyQueryCacheTest.CashPayment.class,
+				JoinFetchAnyQueryCacheTest.Currency.class
+		}
+)
+@ServiceRegistry(
+		settings = {
+				@Setting(name = CacheSettings.USE_SECOND_LEVEL_CACHE, value = "true"),
+				@Setting(name = CacheSettings.USE_QUERY_CACHE, value = "true"),
+				@Setting(name = CacheSettings.QUERY_CACHE_LAYOUT, value = "shallow")
+		}
+)
+@SessionFactory(generateStatistics = true, useCollectingStatementInspector = true)
+class JoinFetchAnyQueryCacheTest {
+
+	private static final String CARD_PAYMENT_CURRENCY_PROFILE = "card-payment-currency";
+	private static final String HQL = "select p from Purchase p join fetch p.payment order by p.id";
+
+	@AfterEach
+	void cleanup(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+		scope.getSessionFactory().getCache().evictAllRegions();
+		scope.getSessionFactory().getStatistics().clear();
+	}
+
+	@Test
+	void testShallowQueryCacheHitInitializesNestedFetchUnderAnyAssociation(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final Currency eur = new Currency( 1L, "EUR" );
+			final CardPayment cardPayment = new CardPayment( 1L, eur, "4111111111111111" );
+			final CashPayment cashPayment = new CashPayment( 2L, "store credit" );
+			session.persist( eur );
+			session.persist( cardPayment );
+			session.persist( cashPayment );
+			session.persist( new Purchase( 1L, cardPayment ) );
+			session.persist( new Purchase( 2L, cashPayment ) );
+		} );
+
+		final Statistics statistics = scope.getSessionFactory().getStatistics();
+		final var statementInspector = scope.getCollectingStatementInspector();
+
+		statistics.clear();
+		statementInspector.clear();
+
+		final List<Purchase> firstRunPurchases = scope.fromTransaction( session -> {
+			session.enableFetchProfile( CARD_PAYMENT_CURRENCY_PROFILE );
+			return findPurchases( session );
+		} );
+		assertEquals( 1, statementInspector.getSqlQueries().size() );
+		assertGraphLoaded( firstRunPurchases );
+
+		assertEquals( 0, statistics.getQueryCacheHitCount() );
+		assertEquals( 1, statistics.getQueryCacheMissCount() );
+		assertEquals( 1, statistics.getQueryCachePutCount() );
+
+		statistics.clear();
+		statementInspector.clear();
+
+		final List<Purchase> secondRunPurchases = scope.fromTransaction( session -> {
+			session.enableFetchProfile( CARD_PAYMENT_CURRENCY_PROFILE );
+			return findPurchases( session );
+		} );
+
+		assertEquals( 0, statementInspector.getSqlQueries().size() );
+		assertEquals( 1, statistics.getQueryCacheHitCount() );
+		assertEquals( 0, statistics.getQueryCacheMissCount() );
+		assertEquals( 0, statistics.getQueryCachePutCount() );
+		assertEquals( 0, statistics.getQueryStatistics( HQL ).getExecutionCount() );
+		assertGraphLoaded( secondRunPurchases );
+	}
+
+	private static List<Purchase> findPurchases(Session session) {
+		return session.createSelectionQuery( HQL, Purchase.class )
+				.setCacheable( true )
+				.getResultList();
+	}
+
+	private static void assertGraphLoaded(List<Purchase> purchases) {
+		assertEquals( 2, purchases.size() );
+
+		final Purchase cardPurchase = purchases.get( 0 );
+		assertTrue( isInitialized( cardPurchase.payment ) );
+		assertInstanceOf( CardPayment.class, cardPurchase.payment );
+		final CardPayment cardPayment = (CardPayment) cardPurchase.payment;
+		assertNotNull( cardPayment. getCurrency(), "Shallow query-cache hit lost CardPayment.currency" );
+		assertTrue( isInitialized( cardPayment.getCurrency() ) );
+		assertEquals( "EUR", cardPayment.getCurrency().getCode() );
+
+		final Purchase cashPurchase = purchases.get( 1 );
+		assertTrue( isInitialized( cashPurchase.payment ) );
+		assertInstanceOf( CashPayment.class, cashPurchase.payment );
+	}
+
+	@Entity(name = "Purchase")
+	@Cacheable
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	static class Purchase {
+		@Id
+		Long id;
+
+		@Any(fetch = FetchType.LAZY)
+		@AnyKeyJavaClass(Long.class)
+		@JoinColumn(name = "PAYMENT_ID")
+		@Column(name = "PAYMENT_TYPE")
+		@AnyDiscriminatorValue(discriminator = "CARD", entity = CardPayment.class)
+		@AnyDiscriminatorValue(discriminator = "CASH", entity = CashPayment.class)
+		Payment payment;
+
+		Purchase() {
+		}
+
+		Purchase(Long id, Payment payment) {
+			this.id = id;
+			this.payment = payment;
+		}
+	}
+
+	interface Payment {
+	}
+
+	@Entity(name = "CardPayment")
+	@Cacheable
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	@FetchProfile(
+			name = CARD_PAYMENT_CURRENCY_PROFILE,
+			fetchOverrides = @FetchProfile.FetchOverride(
+					entity = CardPayment.class,
+					association = "currency",
+					mode = FetchMode.JOIN
+			)
+	)
+	static class CardPayment implements Payment {
+		@Id
+		Long id;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		Currency currency;
+
+		String cardNumber;
+
+		public Currency getCurrency() {
+			return currency;
+		}
+
+		CardPayment() {
+		}
+
+		CardPayment(Long id, Currency currency, String cardNumber) {
+			this.id = id;
+			this.currency = currency;
+			this.cardNumber = cardNumber;
+		}
+	}
+
+	@Entity(name = "CashPayment")
+	@Cacheable
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	static class CashPayment implements Payment {
+		@Id
+		Long id;
+
+		String label;
+
+		CashPayment() {
+		}
+
+		CashPayment(Long id, String label) {
+			this.id = id;
+			this.label = label;
+		}
+	}
+
+	@Entity(name = "Currency")
+	@Cacheable
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	static class Currency {
+		@Id
+		Long id;
+
+		String code;
+
+		String getCode() {
+			return code;
+		}
+
+		Currency() {
+		}
+
+		Currency(Long id, String code) {
+			this.id = id;
+			this.code = code;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchAnyTest.java
new file mode 100644
index 000000000000..7dde6a8f6684
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchAnyTest.java
@@ -0,0 +1,237 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any.fetch;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.Hibernate.isInitialized;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory(useCollectingStatementInspector = true)
+@DomainModel(annotatedClasses = {JoinFetchAnyTest.AnyThing.class,
+		JoinFetchAnyTest.SomeThing.class, JoinFetchAnyTest.SomeOtherThing.class})
+class JoinFetchAnyTest {
+
+	@BeforeEach
+	void cleanup(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	@Test void testJoinFetch(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var anyThing = new AnyThing();
+			var someThing = new SomeThing();
+			someThing.description = "Some thing";
+			anyThing.anything = someThing;
+			s.persist( someThing );
+			s.persist( anyThing );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+
+		// join fetch
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var singleResult =
+					s.createQuery( "from AnyThing a join fetch a.anything", AnyThing.class )
+							.getSingleResult();
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeThing.class, singleResult.anything );
+			assertEquals( "Some thing", ((SomeThing) singleResult.anything).description );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var graph = s.createEntityGraph( AnyThing.class );
+			graph.addAttributeNode( JoinFetchAnyTest_.AnyThing_.anything );
+			var singleResult = s.find( graph, 1L );
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeThing.class, singleResult.anything );
+			assertEquals( "Some thing", ((SomeThing) singleResult.anything).description );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+
+		// no join fetch
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var singleResult =
+					s.createQuery( "from AnyThing a", AnyThing.class )
+							.getSingleResult();
+			assertFalse( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeThing.class, singleResult.anything );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+			assertEquals( "Some thing", ((SomeThing) singleResult.anything).getDescription() );
+			assertEquals( 2, statementInspector.getSqlQueries().size() );
+		} );
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var graph = s.createEntityGraph( AnyThing.class );
+			var singleResult = s.find( graph, 1L );
+			assertFalse( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeThing.class, singleResult.anything );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+			assertEquals( "Some thing", ((SomeThing) singleResult.anything).getDescription() );
+			assertEquals( 2, statementInspector.getSqlQueries().size() );
+		} );
+	}
+
+	@Test void testPolymorphicJoinFetch(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var anyThing = new AnyThing();
+			var someThing = new SomeThing();
+			someThing.description = "Some thing";
+			anyThing.anything = someThing;
+			s.persist( someThing );
+			s.persist( anyThing );
+			var anyThingElse = new AnyThing();
+			var otherThing = new SomeOtherThing();
+			anyThingElse.anything = otherThing;
+			s.persist( otherThing );
+			s.persist( anyThingElse );
+			var emptyThing = new AnyThing();
+			s.persist( emptyThing );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+
+		// join fetch
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var results =
+					s.createQuery( "from AnyThing a join fetch a.anything order by a.id", AnyThing.class )
+							.getResultList();
+			assertEquals( 3, results.size() );
+			AnyThing anyThing = results.get( 0 );
+			AnyThing anyThingElse = results.get( 1 );
+			AnyThing emptyThing = results.get( 2 );
+			assertTrue( isInitialized( anyThing.anything ) );
+			assertInstanceOf( SomeThing.class, anyThing.anything );
+			assertTrue( isInitialized( anyThingElse.anything ) );
+			assertInstanceOf( SomeOtherThing.class, anyThingElse.anything );
+			assertTrue( isInitialized( emptyThing.anything ) );
+			assertNull( emptyThing.anything );
+		} );
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var graph = s.createEntityGraph( AnyThing.class );
+			graph.addAttributeNode( JoinFetchAnyTest_.AnyThing_.anything );
+			var singleResult = s.find( graph, 1L );
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeThing.class, singleResult.anything );
+			assertEquals( "Some thing", ((SomeThing) singleResult.anything).description );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var graph = s.createEntityGraph( AnyThing.class );
+			graph.addAttributeNode( JoinFetchAnyTest_.AnyThing_.anything );
+			var singleResult = s.find( graph, 2L );
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeOtherThing.class, singleResult.anything );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var graph = s.createEntityGraph( AnyThing.class );
+			graph.addAttributeNode( JoinFetchAnyTest_.AnyThing_.anything );
+			var singleResult = s.find( graph, 3L );
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertNull( singleResult.anything );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+	}
+
+	@Test
+	void testJoinFetchInitializesExistingLazyProxyOnManagedParent(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var anyThing = new AnyThing();
+			var someThing = new SomeThing();
+			someThing.description = "Some thing";
+			anyThing.anything = someThing;
+			s.persist( someThing );
+			s.persist( anyThing );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			final AnyThing managed = s.find( AnyThing.class, 1L );
+			assertFalse( isInitialized( managed.anything ) );
+			assertInstanceOf( SomeThing.class, managed.anything );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+
+			statementInspector.clear();
+
+			final AnyThing fetched = s.createQuery(
+					"from AnyThing a join fetch a.anything where a.id = :id",
+					AnyThing.class
+			).setParameter( "id", managed.id ).getSingleResult();
+
+			assertSame( managed, fetched );
+			assertSame( managed.anything, fetched.anything );
+			assertTrue( isInitialized( managed.anything ) );
+			assertEquals( "Some thing", ( (SomeThing) fetched.anything ).getDescription() );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+	}
+
+	@Entity(name = "AnyThing")
+	static class AnyThing {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@Any(fetch = FetchType.LAZY)
+		@AnyKeyJavaClass(Long.class)
+		@JoinColumn(name = "ANYTHING_ID")
+		@Column(name = "ANYTHING_TYPE")
+		@AnyDiscriminatorValue(
+				discriminator = "SomeThing",
+				entity = SomeThing.class)
+		@AnyDiscriminatorValue(
+				discriminator = "SomeOtherThing",
+				entity = SomeOtherThing.class)
+		Thing anything;
+	}
+
+	static class Thing {
+	}
+
+	@Entity(name = "SomeThing")
+	static class SomeThing extends Thing {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		String description;
+
+		public String getDescription() {
+			return description;
+		}
+	}
+
+	@Entity(name = "SomeOtherThing")
+	static class SomeOtherThing extends Thing {
+		@Id
+		@GeneratedValue
+		Long id;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchEagerAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchEagerAnyTest.java
new file mode 100644
index 000000000000..808957c00aa5
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchEagerAnyTest.java
@@ -0,0 +1,178 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any.fetch;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.Hibernate.isInitialized;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory(useCollectingStatementInspector = true)
+@DomainModel(annotatedClasses = {JoinFetchEagerAnyTest.AnyThing.class,
+		JoinFetchEagerAnyTest.SomeThing.class, JoinFetchEagerAnyTest.SomeOtherThing.class})
+class JoinFetchEagerAnyTest {
+
+	@BeforeEach
+	void cleanup(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	@Test void testJoinFetch(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var anyThing = new AnyThing();
+			var someThing = new SomeThing();
+			someThing.description = "Some thing";
+			anyThing.anything = someThing;
+			s.persist( someThing );
+			s.persist( anyThing );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+
+		// join fetch
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var singleResult =
+					s.createQuery( "from AnyThing a join fetch a.anything", AnyThing.class )
+							.getSingleResult();
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeThing.class, singleResult.anything );
+			assertEquals( "Some thing", ((SomeThing) singleResult.anything).description );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var graph = s.createEntityGraph( AnyThing.class );
+			graph.addAttributeNode( JoinFetchEagerAnyTest_.AnyThing_.anything );
+			var singleResult = s.find( graph, 1L );
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeThing.class, singleResult.anything );
+			assertEquals( "Some thing", ((SomeThing) singleResult.anything).description );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+
+		// no join fetch
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var singleResult =
+					s.createQuery( "from AnyThing a", AnyThing.class )
+							.getSingleResult();
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeThing.class, singleResult.anything );
+			assertEquals( 2, statementInspector.getSqlQueries().size() );
+			assertEquals( "Some thing", ((SomeThing) singleResult.anything).getDescription() );
+		} );
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var graph = s.createEntityGraph( AnyThing.class );
+			var singleResult = s.find( graph, 1L );
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeThing.class, singleResult.anything );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+			assertEquals( "Some thing", ((SomeThing) singleResult.anything).getDescription() );
+		} );
+	}
+
+	@Test void testPolymorphicJoinFetch(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			var anyThing = new AnyThing();
+			var someThing = new SomeThing();
+			someThing.description = "Some thing";
+			anyThing.anything = someThing;
+			s.persist( someThing );
+			s.persist( anyThing );
+			var anyThingElse = new AnyThing();
+			var otherThing = new SomeOtherThing();
+			anyThingElse.anything = otherThing;
+			s.persist( otherThing );
+			s.persist( anyThingElse );
+		} );
+		final var statementInspector = scope.getCollectingStatementInspector();
+
+		// join fetch
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var results =
+					s.createQuery( "from AnyThing a join fetch a.anything order by a.id", AnyThing.class )
+							.getResultList();
+			AnyThing anyThing = results.get( 0 );
+			AnyThing anyThingElse = results.get( 1 );
+			assertTrue( isInitialized( anyThing.anything ) );
+			assertInstanceOf( SomeThing.class, anyThing.anything );
+			assertTrue( isInitialized( anyThingElse.anything ) );
+			assertInstanceOf( SomeOtherThing.class, anyThingElse.anything );
+		} );
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var singleResult = s.find( AnyThing.class, 1L );
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeThing.class, singleResult.anything );
+			assertEquals( "Some thing", ((SomeThing) singleResult.anything).description );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+		statementInspector.clear();
+		scope.inTransaction( s -> {
+			var singleResult = s.find( AnyThing.class, 2L );
+			assertTrue( isInitialized( singleResult.anything ) );
+			assertInstanceOf( SomeOtherThing.class, singleResult.anything );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		} );
+	}
+
+	@Entity(name = "AnyThing")
+	static class AnyThing {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@Any
+		@AnyKeyJavaClass(Long.class)
+		@JoinColumn(name = "ANYTHING_ID")
+		@Column(name = "ANYTHING_TYPE")
+		@AnyDiscriminatorValue(
+				discriminator = "SomeThing",
+				entity = SomeThing.class)
+		@AnyDiscriminatorValue(
+				discriminator = "SomeOtherThing",
+				entity = SomeOtherThing.class)
+		Thing anything;
+	}
+
+	static class Thing {
+	}
+
+	@Entity(name = "SomeThing")
+	static class SomeThing extends Thing {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		String description;
+
+		public String getDescription() {
+			return description;
+		}
+	}
+
+	@Entity(name = "SomeOtherThing")
+	static class SomeOtherThing extends Thing {
+		@Id
+		@GeneratedValue
+		Long id;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchManyToAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchManyToAnyTest.java
new file mode 100644
index 000000000000..7b1e89b31e68
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinFetchManyToAnyTest.java
@@ -0,0 +1,126 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any.fetch;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
+import org.hibernate.annotations.ManyToAny;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory(useCollectingStatementInspector = true)
+@DomainModel(annotatedClasses = {JoinFetchManyToAnyTest.Parent.class,
+		JoinFetchManyToAnyTest.NormalChild.class, JoinFetchManyToAnyTest.SpecialChild.class})
+class JoinFetchManyToAnyTest {
+	@BeforeEach
+	void cleanup(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	@Entity(name = "Parent")
+	static class Parent {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@ManyToAny(fetch = FetchType.LAZY)
+		@AnyKeyJavaClass(Long.class)
+		@Column(name = "child_type")
+		@AnyDiscriminatorValue(
+				discriminator = "Normal",
+				entity = NormalChild.class)
+		@AnyDiscriminatorValue(
+				discriminator = "Special",
+				entity = SpecialChild.class)
+		@JoinTable(name = "parent_child",
+				joinColumns = @JoinColumn(name = "child_id"),
+				inverseJoinColumns = @JoinColumn(name = "parent_id"))
+		Set<Child> children;
+	}
+	interface Child {}
+	@Entity(name = "NormalChild")
+	static class NormalChild implements Child {
+		@Id
+		@GeneratedValue
+		Long id;
+		int intValue;
+	}
+	@Entity(name = "SpecialChild")
+	static class SpecialChild implements Child {
+		@Id
+		@GeneratedValue
+		Long id;
+		String strValue;
+	}
+
+	@Test
+	void test(SessionFactoryScope scope) {
+		final var statementInspector = scope.getCollectingStatementInspector();
+		scope.inTransaction( s1 -> {
+			final Parent parent = new Parent();
+			final NormalChild normalChild = new NormalChild();
+			normalChild.intValue = 1;
+			final SpecialChild specialChild = new SpecialChild();
+			specialChild.strValue = "special";
+			parent.children = Set.of( normalChild, specialChild );
+			s1.persist( parent );
+			s1.persist( normalChild );
+			s1.persist( specialChild );
+		} );
+		statementInspector.clear();
+		scope.inTransaction(s -> {
+			Parent parent = s.createQuery("from Parent", Parent.class).getSingleResult();
+			assertFalse( Hibernate.isInitialized( parent.children ) );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+			assertEquals( 2, parent.children.size() );
+			assertTrue( Hibernate.isInitialized( parent.children ) );
+			assertEquals( 2, statementInspector.getSqlQueries().size() );
+		});
+		statementInspector.clear();
+		scope.inTransaction(s -> {
+			Parent parent = s.createQuery("from Parent left join fetch children", Parent.class).getSingleResult();
+			assertTrue( Hibernate.isInitialized( parent.children ) );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+			assertEquals( 2, parent.children.size() );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		});
+		statementInspector.clear();
+		scope.inTransaction(s -> {
+			Parent parent = s.find(Parent.class, 1L);
+			assertFalse( Hibernate.isInitialized( parent.children ) );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+			assertEquals( 2, parent.children.size() );
+			assertTrue( Hibernate.isInitialized( parent.children ) );
+			assertEquals( 2, statementInspector.getSqlQueries().size() );
+		});
+		statementInspector.clear();
+		scope.inTransaction(s -> {
+			var graph = s.createEntityGraph(Parent.class);
+			graph.addAttributeNode( JoinFetchManyToAnyTest_.Parent_.children );
+			Parent parent = s.find(graph, 1L);
+			assertTrue( Hibernate.isInitialized( parent.children ) );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+			assertEquals( 2, parent.children.size() );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+		});
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinManyToAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinManyToAnyTest.java
new file mode 100644
index 000000000000..925f0e6d7d37
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/fetch/JoinManyToAnyTest.java
@@ -0,0 +1,200 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.any.fetch;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
+import org.hibernate.annotations.ManyToAny;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory(useCollectingStatementInspector = true)
+@DomainModel(annotatedClasses = {JoinManyToAnyTest.Parent.class,
+		JoinManyToAnyTest.NormalChild.class, JoinManyToAnyTest.SpecialChild.class})
+class JoinManyToAnyTest {
+	@BeforeEach
+	void cleanup(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	@Entity(name = "Parent")
+	static class Parent {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@ManyToAny(fetch = FetchType.LAZY)
+		@AnyKeyJavaClass(Long.class)
+		@Column(name = "child_type")
+		@AnyDiscriminatorValue(
+				discriminator = "Normal",
+				entity = NormalChild.class)
+		@AnyDiscriminatorValue(
+				discriminator = "Special",
+				entity = SpecialChild.class)
+		@JoinTable(name = "parent_child",
+				joinColumns = @JoinColumn(name = "child_id"),
+				inverseJoinColumns = @JoinColumn(name = "parent_id"))
+		Set<Child> children;
+	}
+	interface Child {}
+	@Entity(name = "NormalChild")
+	static class NormalChild implements Child {
+		@Id
+		@GeneratedValue
+		Long id;
+		int intValue;
+	}
+	@Entity(name = "SpecialChild")
+	static class SpecialChild implements Child {
+		@Id
+		@GeneratedValue
+		Long id;
+		String strValue;
+	}
+
+	@Test
+	void testJoin(SessionFactoryScope scope) {
+		final var statementInspector = scope.getCollectingStatementInspector();
+		prepareTestData( scope );
+		statementInspector.clear();
+
+		scope.inTransaction( s -> {
+			final List<Object[]> results = s.createQuery(
+					"select p, c from Parent p join p.children c",
+					Object[].class
+			).getResultList();
+			assertEquals( 2, results.size() );
+
+			final Parent parent = (Parent) results.get( 0 )[0];
+			assertFalse( Hibernate.isInitialized( parent.children ) );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+
+			assertSame( parent, results.get( 1 )[0] );
+
+			final Object child1 = results.get( 0 )[1];
+			final Object child2 = results.get( 1 )[1];
+			assertTrue(
+					( child1 instanceof NormalChild && child2 instanceof SpecialChild )
+							|| ( child1 instanceof SpecialChild && child2 instanceof NormalChild )
+			);
+
+			assertEquals( 2, parent.children.size() );
+			assertEquals( 2, statementInspector.getSqlQueries().size() );
+			assertTrue( parent.children.contains( child1 ) );
+			assertTrue( parent.children.contains( child2 ) );
+		} );
+	}
+
+	@Test
+	void testJoinSelectAssociation(SessionFactoryScope scope) {
+		final var statementInspector = scope.getCollectingStatementInspector();
+		prepareTestData( scope );
+		statementInspector.clear();
+
+		scope.inTransaction( s -> {
+			final List<Object> results = s.createQuery(
+					"select c from Parent p join p.children c",
+					Object.class
+			).getResultList();
+			assertEquals( 2, results.size() );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+
+			final NormalChild normalChild = results.stream()
+					.filter( NormalChild.class::isInstance )
+					.map( NormalChild.class::cast )
+					.findFirst()
+					.orElseThrow();
+			final SpecialChild specialChild = results.stream()
+					.filter( SpecialChild.class::isInstance )
+					.map( SpecialChild.class::cast )
+					.findFirst()
+					.orElseThrow();
+
+			assertInstanceOf( NormalChild.class, normalChild );
+			assertEquals( 1, normalChild.intValue );
+			assertInstanceOf( SpecialChild.class, specialChild );
+			assertEquals( "special", specialChild.strValue );
+		} );
+	}
+
+	@Test
+	void testJoinTreat(SessionFactoryScope scope) {
+		final var statementInspector = scope.getCollectingStatementInspector();
+		prepareTestData( scope );
+		statementInspector.clear();
+
+		scope.inTransaction( s -> {
+			final List<Object[]> results = s.createQuery(
+					"select p, c from Parent p join treat(p.children as NormalChild) c",
+					Object[].class
+			).getResultList();
+			assertEquals( 1, results.size() );
+
+			final Parent parent = (Parent) results.get( 0 )[0];
+			assertFalse( Hibernate.isInitialized( parent.children ) );
+			assertEquals( 1, statementInspector.getSqlQueries().size() );
+
+			assertInstanceOf( NormalChild.class, results.get( 0 )[1] );
+			final NormalChild normalChild = (NormalChild) results.get( 0 )[1];
+			assertEquals( 1, normalChild.intValue );
+
+			assertEquals( 2, parent.children.size() );
+			assertEquals( 2, statementInspector.getSqlQueries().size() );
+			assertTrue( parent.children.contains( normalChild ) );
+		} );
+	}
+
+	@Test
+	void testJoinTreatSelectAssociation(SessionFactoryScope scope) {
+		final var statementInspector = scope.getCollectingStatementInspector();
+		prepareTestData( scope );
+		statementInspector.clear();
+
+		scope.inTransaction( s -> {
+			final List<NormalChild> results = s.createQuery(
+					"select c from Parent p join treat(p.children as NormalChild) c",
+					NormalChild.class
+			).getResultList();
+			assertEquals( 1, results.size() );
+			assertEquals( 1, results.get( 0 ).intValue );
+		} );
+		assertEquals( 1, statementInspector.getSqlQueries().size() );
+	}
+
+	private void prepareTestData(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			final Parent parent = new Parent();
+			final NormalChild normalChild = new NormalChild();
+			normalChild.intValue = 1;
+			final SpecialChild specialChild = new SpecialChild();
+			specialChild.strValue = "special";
+			parent.children = Set.of( normalChild, specialChild );
+			s.persist( parent );
+			s.persist( normalChild );
+			s.persist( specialChild );
+		} );
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/AnyTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/AnyTypeTest.java
index 777dc1d26978..f695e8d7ca25 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/AnyTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml/AnyTypeTest.java
@@ -4,9 +4,6 @@
  */
 package org.hibernate.orm.test.any.xml;
 
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.query.SemanticException;
-
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
@@ -18,15 +15,15 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hibernate.cfg.CacheSettings.USE_SECOND_LEVEL_CACHE;
 
 /**
  * @author Steve Ebersole
  */
 @SuppressWarnings("JUnitMalformedDeclaration")
 @JiraKey(value = "HHH-1663")
-@ServiceRegistry( settings = @Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false" ) )
+@ServiceRegistry( settings = @Setting( name = USE_SECOND_LEVEL_CACHE, value = "false" ) )
 @DomainModel( xmlMappings = "org/hibernate/orm/test/any/xml/Person.xml")
 @SessionFactory
 public class AnyTypeTest {
@@ -59,32 +56,4 @@ public void testStoredData(SessionFactoryScope scope) {
 				}
 		);
 	}
-
-	@Test
-	public void testJoinFetchOfAnAnyTypeAttribute(SessionFactoryScope scope) {
-
-		// Query translator should dis-allow join fetching of an <any/> mapping.  Let's make sure it does...
-
-		scope.inTransaction(
-				session -> {
-					try {
-						session.createQuery( "select p from Person p join fetch p.data" ).list();
-					}
-					catch (SemanticException e) {
-						// expected
-						validateAnyJoinException( e );
-					}
-					catch (IllegalArgumentException e) {
-						// expected with JPA exception wrapping
-						assertThat( e.getCause(), instanceOf( SemanticException.class ) );
-						final SemanticException semanticException = (SemanticException) e.getCause();
-						validateAnyJoinException( semanticException );
-					}
-				}
-		);
-	}
-
-	private static void validateAnyJoinException(SemanticException e) {
-		assertThat( e.getMessage(), is( "An @Any attribute cannot be join fetched" ) );
-	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml2/AnyEagerXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml2/AnyEagerXmlTest.java
index d8ff6976469a..0c6bb2e6d510 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml2/AnyEagerXmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml2/AnyEagerXmlTest.java
@@ -73,7 +73,7 @@ public void testFetchEagerManyToAny(SessionFactoryScope scope) {
 					.createQuery( "from NamedAnyContainer", NamedAnyContainer.class )
 					.uniqueResult();
 
-			assertThat( sqlCollector.getSqlQueries() ).hasSize( 4 );
+			assertThat( sqlCollector.getSqlQueries() ).hasSize( 2 );
 
 			assertThat( result ).isNotNull();
 			assertThat( result.getSpecificProperty() ).isNull();
@@ -84,7 +84,7 @@ public void testFetchEagerManyToAny(SessionFactoryScope scope) {
 			assertThat( result.getGeneralProperties().stream().map( NamedProperty::getName ) )
 					.containsOnly( "name", "age" );
 
-			assertThat( sqlCollector.getSqlQueries() ).hasSize( 4 );
+			assertThat( sqlCollector.getSqlQueries() ).hasSize( 2 );
 		} );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml2/AnyLazyXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml2/AnyLazyXmlTest.java
index 0b4cd6cca0e7..28ba934c4ad7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml2/AnyLazyXmlTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/xml2/AnyLazyXmlTest.java
@@ -83,7 +83,7 @@ public void testFetchEagerManyToAny(SessionFactoryScope scope) {
 			Assertions.assertThat( result.getGeneralProperties().stream().map( NamedProperty::getName ) )
 					.containsOnly( "name", "age" );
 
-			Assertions.assertThat( sqlCollector.getSqlQueries() ).hasSize( 4 );
+			Assertions.assertThat( sqlCollector.getSqlQueries() ).hasSize( 2 );
 		} );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ExplicitIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ExplicitIdentifierTest.java
new file mode 100644
index 000000000000..4a79dd752977
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ExplicitIdentifierTest.java
@@ -0,0 +1,165 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.associations;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+
+import static jakarta.persistence.GenerationType.SEQUENCE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@SessionFactory
+@DomainModel(annotatedClasses = {
+		ExplicitIdentifierTest.PersonExplicit.class,
+		ExplicitIdentifierTest.PersonImplicit.class
+})
+@ServiceRegistry(
+		settings = {
+				@Setting(name = AvailableSettings.PHYSICAL_NAMING_STRATEGY,
+						value = "org.hibernate.orm.test.associations.ExplicitIdentifierTest$CustomPhysicalNamingStrategy")
+		}
+)
+@JiraKey("HHH-14584")
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledSequences.class )
+public class ExplicitIdentifierTest {
+
+	@Test
+	void testImplicitIdentifier(SessionFactoryScope scope) {
+
+		// implicit named objects have a prefix
+
+		scope.inTransaction( session -> {
+			PersonImplicit personImplicit = new PersonImplicit();
+			personImplicit.name = "implicit";
+			session.persist( personImplicit );
+		} );
+
+		scope.inTransaction( session -> {
+
+			assertEquals( "implicit", session.createNativeQuery(
+							"select COLUMN_name from TABLE_PersonImplicit",
+							String.class )
+					.getSingleResult() );
+
+			if ( session.getDialect().getSequenceSupport().supportsSequences() ) {
+				assertEquals( 51, session.createNativeQuery(
+						session.getDialect().getSequenceSupport()
+								.getSequenceNextValString( "SEQUENCE_TABLE_PersonImplicit_SEQ" ),
+						Integer.class ).getSingleResult() );
+			}
+			else {
+				assertEquals( 51, session.createNativeQuery(
+						"select next_val from TABLE_TABLE_PersonImplicit_SEQ",
+						Integer.class ).getSingleResult() );
+			}
+		} );
+	}
+
+	@Test
+	void testExplicitIdentifier(SessionFactoryScope scope) {
+
+		// explicit named object don't have a prefix
+
+		scope.inTransaction( session -> {
+			PersonExplicit personExplicit = new PersonExplicit();
+			personExplicit.name = "explicit";
+			session.persist( personExplicit );
+		} );
+
+		scope.inTransaction( session -> {
+
+			assertEquals( "explicit", session.createNativeQuery(
+							"select name from PersonExplicit",
+							String.class )
+					.getSingleResult() );
+
+			if ( session.getDialect().getSequenceSupport().supportsSequences() ) {
+				assertEquals( 51, session.createNativeQuery(
+						session.getDialect().getSequenceSupport()
+								.getSequenceNextValString( "person_explicit_seq" ),
+						Integer.class ).getSingleResult() );
+			}
+			else {
+				assertEquals( 51, session.createNativeQuery(
+						"select next_val from person_explicit_seq",
+						Integer.class ).getSingleResult() );
+			}
+		} );
+	}
+
+	@AfterAll
+	public void dropTestData(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	@Entity(name = "PersonImplicit")
+	public static class PersonImplicit {
+
+		@Id
+		@GeneratedValue
+		long id;
+
+		@Column
+		String name;
+	}
+
+	@Entity(name = "PersonExplicit")
+	@Table(name = "PersonExplicit")
+	public static class PersonExplicit {
+
+		@Id
+		@GeneratedValue(
+				strategy = SEQUENCE,
+				generator = "person_sequence"
+		)
+		@SequenceGenerator(name = "person_sequence", sequenceName = "person_explicit_seq")
+		long id;
+
+		@Column(name = "name")
+		String name;
+	}
+
+	public static class CustomPhysicalNamingStrategy extends PhysicalNamingStrategyStandardImpl {
+
+		@Override
+		public Identifier toPhysicalTableName(Identifier logicalName, JdbcEnvironment jdbcEnvironment) {
+			return logicalName.isExplicit() ? logicalName
+					: jdbcEnvironment.getIdentifierHelper().toIdentifier( "TABLE_" + logicalName,
+							logicalName.isQuoted() );
+		}
+
+		@Override
+		public Identifier toPhysicalSequenceName(Identifier logicalName, JdbcEnvironment jdbcEnvironment) {
+			return logicalName.isExplicit() ? logicalName
+					: jdbcEnvironment.getIdentifierHelper().toIdentifier( "SEQUENCE_" + logicalName,
+							logicalName.isQuoted() );
+		}
+
+		@Override
+		public Identifier toPhysicalColumnName(Identifier logicalName, JdbcEnvironment jdbcEnvironment) {
+			return logicalName.isExplicit() ? logicalName
+					: jdbcEnvironment.getIdentifierHelper().toIdentifier( "COLUMN_" + logicalName,
+							logicalName.isQuoted() );
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/FieldWithUnderscoreTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/FieldWithUnderscoreTest.java
index 56ffc3843ca8..82b3f3423ef8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/FieldWithUnderscoreTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/FieldWithUnderscoreTest.java
@@ -4,9 +4,11 @@
  */
 package org.hibernate.orm.test.associations;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -24,12 +26,17 @@ public class FieldWithUnderscoreTest {
 
 	@Entity(name = "A")
 	static class A {
-		@Id Long _id;
+		@Id
+		@Column(name = "id")
+		Long _id;
 
 	}
 	@Entity(name = "B")
 	static class B {
-		@Id Long _id;
+		@Id
+		@Column(name = "id")
+		Long _id;
+		@JoinColumn(name = "relation_a")
 		@ManyToOne(fetch = FetchType.LAZY) A _a;
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneUniqueKeyReferenceWithCustomIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneUniqueKeyReferenceWithCustomIdTest.java
index 7546cecaf989..0ef1e84d0592 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneUniqueKeyReferenceWithCustomIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/ManyToOneUniqueKeyReferenceWithCustomIdTest.java
@@ -80,7 +80,7 @@ public void setUser(User user) {
 		}
 	}
 
-	@Entity(name = "_User")
+	@Entity(name = "Users")
 	static class User {
 		@Id
 		@Type(CustomIdType.class)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnySubClassAccessPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnySubClassAccessPropertyTest.java
index 856d3939cea0..a991d199d41a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnySubClassAccessPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/associations/any/ManyToAnySubClassAccessPropertyTest.java
@@ -123,11 +123,11 @@ public static class Person {
 		private Integer id;
 	}
 
-	@Entity
+	@Entity(name = "DogHandler")
 	public static class DogHandler extends Person {
 	}
 
-	@Entity
+	@Entity(name = "Military")
 	public static class Military extends Person {
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java
index a0471e83b5b4..0f5c8dd02a7b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchOptimisticLockingTest.java
@@ -13,7 +13,9 @@
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -45,6 +47,7 @@
 				@Setting(name = AvailableSettings.DIALECT_NATIVE_PARAM_MARKERS, value = "false")
 		}
 )
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 public class BatchOptimisticLockingTest {
 
 	private final ExecutorService executorService = Executors.newSingleThreadExecutor();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java
index e5b530269e63..483e1e9377d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchPostLoadTest.java
@@ -66,7 +66,7 @@ public void testIt(EntityManagerFactoryScope scope) {
 		);
 	}
 
-	@Entity
+	@Entity(name = "MyEntity1")
 	public static class MyEntity1 {
 		@Id
 		private Long id;
@@ -103,7 +103,7 @@ public void test() {
 		}
 	}
 
-	@Entity
+	@Entity(name = "MyEntity2")
 	@BatchSize(size = 100)
 	public static class MyEntity2 {
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection2Test.java
index 7a4ab4015922..e5ecf744c910 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchSubselectCollection2Test.java
@@ -165,7 +165,7 @@ public void testSelectEntityDWithJoins(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					List<EntityD> entityDs = session.createQuery(
-							"from EntityD d  left join fetch d.openingB left join fetch d.closingB" ).list();
+							"from EntityD d  left join fetch d.openingB left join fetch d.closingB order by d.id" ).list();
 					assertThat( entityDs.size() ).isEqualTo( 2 );
 					EntityD entityD = entityDs.get( 0 );
 					assertThat( entityD ).isNotNull();
@@ -180,7 +180,7 @@ public void testSelectEntityDWithJoins(SessionFactoryScope scope) {
 	public void testSelectEntityD(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
-					List<EntityD> entitiesD = session.createQuery( "select d from EntityD d", EntityD.class )
+					List<EntityD> entitiesD = session.createQuery( "select d from EntityD d order by d.id", EntityD.class )
 							.getResultList();
 					assertThat( entitiesD ).hasSize( 2 );
 					EntityB entityB = entitiesD.get( 0 ).getOpeningB();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java
index cbca3791f65a..1a1e62242aac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java
@@ -13,10 +13,13 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.SpannerDialect;
 
 /**
  * This is how to do batch processing in Hibernate. Remember to enable JDBC batch updates, or this test will take a
@@ -33,6 +36,7 @@
 public class BatchTest {
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Long running test on emulator")
 	public void testBatchInsertUpdate(SessionFactoryScope factoryScope) {
 		long start = System.currentTimeMillis();
 		final int N = 5000; //26 secs with batch flush, 26 without
@@ -66,8 +70,9 @@ public void doBatchInsertUpdate(int nEntities, int nBeforeFlush, SessionFactoryS
 			session.setCacheMode( CacheMode.IGNORE );
 			for ( int i = 0; i < nEntities; i++ ) {
 				DataPoint dp = new DataPoint();
-				dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, RoundingMode.DOWN ) );
-				dp.setY( BigDecimal.valueOf( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, RoundingMode.DOWN ) );
+				final int scale = getScale( session.getDialect() );
+				dp.setX( new BigDecimal( i * 0.1d ).setScale( scale, RoundingMode.DOWN ) );
+				dp.setY( BigDecimal.valueOf( Math.cos( dp.getX().doubleValue() ) ).setScale( scale, RoundingMode.DOWN ) );
 				session.persist( dp );
 				if ( ( i + 1 ) % nBeforeFlush == 0 ) {
 					session.flush();
@@ -109,4 +114,12 @@ public void doBatchInsertUpdate(int nEntities, int nBeforeFlush, SessionFactoryS
 			}
 		} );
 	}
+
+	private int getScale(Dialect dialect) {
+		// Spanner NUMERIC type supports scale up to 9
+		if ( dialect instanceof SpannerDialect ) {
+			return 9;
+		}
+		return 19;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java
index a761bf59298b..fcd99d3a1cd9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchUpdateAndVersionTest.java
@@ -16,8 +16,10 @@
 import org.hibernate.dialect.MariaDBDialect;
 import org.hibernate.exception.SnapshotIsolationException;
 import org.hibernate.exception.TransactionSerializationException;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -93,6 +95,7 @@ public void testUpdate(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 	public void testFailedUpdate(SessionFactoryScope scope) {
 		scope.getSessionFactory().getSchemaManager().truncate();
 		scope.inTransaction(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java
index 3b2326de70b9..99cc4a6e8b24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/EagerManyToOneBatchTest.java
@@ -76,7 +76,7 @@ public void testSelect(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					List<Child> children = session
-							.createQuery( "select c from Child as c ", Child.class )
+							.createQuery( "select c from Child as c order by c.id", Child.class )
 							.getResultList();
 					// Child->parent is an eager manyToOne, so the queries to retrieve this association are executed immediately
 					// we have 2 more queries executed instead of 3 due to the DEFAULT_BATCH_FETCH_SIZE value
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java
index 09a0debbf507..a31a44f184cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/LazyManyToOneBatchTest.java
@@ -76,7 +76,7 @@ public void testSelect(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					List<Child> children = session
-							.createQuery( "select c from Child as c ", Child.class )
+							.createQuery( "select c from Child as c order by c.id", Child.class )
 							.getResultList();
 					statementInspector.assertExecutedCount( 1 );
 					assertEquals( 4, children.size() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTest.java
index d550dcda8d52..7645b1d910b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTest.java
@@ -9,6 +9,7 @@
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.internal.util.collections.CollectionHelper;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -16,6 +17,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -31,6 +33,7 @@
 @ServiceRegistry(
 		settings = @Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "false")
 )
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "temporary disable, taking too long to complete")
 public class DynamicBatchFetchTest {
 	private static int currentId = 1;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneStreamTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneStreamTest.java
index b00cfad10048..c24d4dacf84a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneStreamTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneStreamTest.java
@@ -99,7 +99,7 @@ public void testGetResultStreamCollect(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					Query<Child> query = session
-							.createQuery( "select c from Child as c ", Child.class );
+							.createQuery( "select c from Child as c order by c.id", Child.class );
 					try (Stream<Child> resultStream = query.getResultStream()) {
 
 						List<Child> children = resultStream.collect( Collectors.toList() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneTest.java
index 73aa1505045e..826f5d46801b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/EagerManyToOneTest.java
@@ -67,7 +67,7 @@ public void testGetResultList(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					Query<Child> query = session
-							.createQuery( "select c from Child as c ", Child.class );
+							.createQuery("select c from Child as c order by c.id", Child.class);
 					List<Child> resultList = query.getResultList();
 					assertThat( sqlStatementInterceptor.getSqlQueries().size() ).isEqualTo( 2 );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneTest.java
index 5c856a1c5e6c..f45d82f2c405 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/LazyManyToOneTest.java
@@ -68,7 +68,7 @@ public void testGetResultList(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					Query<Child> query = session
-							.createQuery( "select c from Child as c ", Child.class );
+							.createQuery("select c from Child as c order by c.id", Child.class);
 					List<Child> resultList = query.getResultList();
 					assertThat( sqlStatementInterceptor.getSqlQueries().size() ).isEqualTo( 1 );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java
index 73552994cb38..89f23bf66fe0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java
@@ -18,7 +18,6 @@
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.ClassLoaderAccess;
-import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.config.spi.ConfigurationService;
@@ -32,6 +31,8 @@
 import org.hibernate.resource.beans.spi.BeanInstanceProducer;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.type.BasicType;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.internal.BasicTypeImpl;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.jboss.jandex.IndexView;
@@ -68,8 +69,6 @@ public class BootstrapContextTesting implements BootstrapContext {
 
 	private boolean isJpaBootstrap;
 
-	private final ClassmateContext classmateContext;
-
 	private ScanOptions scanOptions;
 	private ScanEnvironment scanEnvironment;
 	private Object scannerSetting;
@@ -87,7 +86,6 @@ public BootstrapContextTesting(
 			StandardServiceRegistry serviceRegistry,
 			MetadataBuildingOptions metadataBuildingOptions) {
 		this.serviceRegistry = serviceRegistry;
-		this.classmateContext = new ClassmateContext();
 		this.metadataBuildingOptions = metadataBuildingOptions;
 
 		this.classLoaderService = serviceRegistry.getService( ClassLoaderService.class );
@@ -191,11 +189,6 @@ public ClassLoaderAccess getClassLoaderAccess() {
 		return classLoaderAccess;
 	}
 
-	@Override
-	public ClassmateContext getClassmateContext() {
-		return classmateContext;
-	}
-
 	@Override
 	public ArchiveDescriptorFactory getArchiveDescriptorFactory() {
 		return archiveDescriptorFactory;
@@ -256,9 +249,22 @@ public <T> BasicTypeImpl<T> resolveAdHocBasicType(String key) {
 		return (BasicTypeImpl<T>) adHocBasicTypeRegistrations.get( key );
 	}
 
+	@Override
+	public <T> BasicType<T> findAdHocBasicType(JavaType<T> javaType, JdbcType jdbcType) {
+		for ( BasicType<?> basicType : adHocBasicTypeRegistrations.values() ) {
+			if ( basicType.getClass() == BasicTypeImpl.class
+				&& basicType.getJavaTypeDescriptor() == javaType
+				&& basicType.getJdbcType() == jdbcType ) {
+				//noinspection unchecked
+				return (BasicType<T>) basicType;
+			}
+		}
+
+		return null;
+	}
+
 	@Override
 	public void release() {
-		classmateContext.release();
 		classLoaderAccess.release();
 
 		scanOptions = null;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/ReflectiveTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/ReflectiveTypeTests.java
index ad243a037c49..0a998c918436 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/ReflectiveTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/hbm/type/ReflectiveTypeTests.java
@@ -14,12 +14,10 @@
 import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.BooleanJavaType;
 import org.hibernate.type.descriptor.java.ClobJavaType;
+import org.hibernate.type.descriptor.java.DateJavaType;
 import org.hibernate.type.descriptor.java.DoubleJavaType;
 import org.hibernate.type.descriptor.java.InstantJavaType;
 import org.hibernate.type.descriptor.java.IntegerJavaType;
-import org.hibernate.type.descriptor.java.JdbcDateJavaType;
-import org.hibernate.type.descriptor.java.JdbcTimeJavaType;
-import org.hibernate.type.descriptor.java.JdbcTimestampJavaType;
 import org.hibernate.type.descriptor.java.ShortJavaType;
 import org.hibernate.type.descriptor.java.StringJavaType;
 import org.hibernate.type.descriptor.java.UUIDJavaType;
@@ -72,9 +70,9 @@ private void verify(RootClass rootClass) {
 		verify( rootClass, "theUrl", UrlJavaType.class, SqlTypes.VARCHAR );
 		verify( rootClass, "theClob", ClobJavaType.class, SqlTypes.CLOB );
 		verify( rootClass, "theInstant", InstantJavaType.class, SqlTypes.INSTANT );
-		verify( rootClass, "theDate", JdbcDateJavaType.class, SqlTypes.DATE );
-		verify( rootClass, "theTime", JdbcTimeJavaType.class, SqlTypes.TIME );
-		verify( rootClass, "theTimestamp", JdbcTimestampJavaType.class, SqlTypes.TIMESTAMP );
+		verify( rootClass, "theDate", DateJavaType.class, SqlTypes.DATE );
+		verify( rootClass, "theTime", DateJavaType.class, SqlTypes.TIME );
+		verify( rootClass, "theTimestamp", DateJavaType.class, SqlTypes.TIMESTAMP );
 	}
 
 	private static void verify(RootClass rootClass, String attributeName, Class<? extends BasicJavaType<?>> expectedJavaType, int expectedJdbcTypeCode) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java
index 4195e60d802f..b7f1c52431bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java
@@ -10,6 +10,8 @@
 import org.hibernate.annotations.Any;
 import org.hibernate.annotations.AnyDiscriminator;
 import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
 import org.hibernate.boot.internal.AnyKeyType;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.boot.model.source.internal.annotations.AdditionalManagedResourcesImpl;
@@ -77,6 +79,10 @@ void testSimpleAnyAttribute(ServiceRegistryScope scope) {
 		final JoinColumn keyColumn = associationField.getAnnotationUsage( JoinColumn.class, ModelsContext );
 		assertThat( keyColumn ).isNotNull();
 		assertThat( keyColumn.name() ).isEqualTo( "association_fk" );
+
+		final Cascade cascadeAnn = associationField.getDirectAnnotationUsage( Cascade.class );
+		assertThat( cascadeAnn ).isNotNull();
+		assertThat( cascadeAnn.value() ).containsExactly( CascadeType.ALL );
 	}
 
 	@Entity(name="Entity1")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToAnyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToAnyTests.java
new file mode 100644
index 000000000000..a521037d2c70
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToAnyTests.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.boot.models.xml.attr;
+
+import java.util.List;
+
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
+import org.hibernate.annotations.ManyToAny;
+import org.hibernate.boot.model.process.spi.ManagedResources;
+import org.hibernate.boot.model.source.internal.annotations.AdditionalManagedResourcesImpl;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.ClassDetailsRegistry;
+import org.hibernate.models.spi.FieldDetails;
+import org.hibernate.models.spi.ModelsContext;
+
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.ServiceRegistryScope;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hibernate.orm.test.boot.models.SourceModelTestHelper.createBuildingContext;
+
+/**
+ * @author Awantika Shinde
+ */
+@ServiceRegistry
+public class ManyToAnyTests {
+	@Test
+	@SuppressWarnings("JUnitMalformedDeclaration")
+	void testSimpleManyToAnyAttribute(ServiceRegistryScope scope) {
+		final StandardServiceRegistry serviceRegistry = scope.getRegistry();
+		final ManagedResources managedResources = new AdditionalManagedResourcesImpl.Builder()
+				.addLoadedClasses( Entity1.class )
+				.addLoadedClasses( Entity2.class )
+				.addXmlMappings( "mappings/models/attr/many-to-any/simple.xml" )
+				.build();
+
+		final ModelsContext modelsContext = createBuildingContext( managedResources, serviceRegistry );
+		final ClassDetailsRegistry classDetailsRegistry = modelsContext.getClassDetailsRegistry();
+
+		final ClassDetails entity3ClassDetails = classDetailsRegistry.resolveClassDetails( Entity3.class.getName() );
+
+		final FieldDetails associationsField = entity3ClassDetails.findFieldByName( "associations" );
+		assertThat( associationsField ).isNotNull();
+
+		final ManyToAny manyToAnyAnn = associationsField.getDirectAnnotationUsage( ManyToAny.class );
+		assertThat( manyToAnyAnn ).isNotNull();
+
+		final Cascade cascadeAnn = associationsField.getDirectAnnotationUsage( Cascade.class );
+		assertThat( cascadeAnn ).isNotNull();
+		assertThat( cascadeAnn.value() ).containsExactly( CascadeType.ALL );
+	}
+
+	@Entity(name = "Entity1")
+	@Table(name = "Entity1")
+	public static class Entity1 {
+		@Id
+		private Integer id;
+		private String name;
+	}
+
+	@Entity(name = "Entity2")
+	@Table(name = "Entity2")
+	public static class Entity2 {
+		@Id
+		private Integer id;
+		private String name;
+	}
+
+	@Entity(name = "Entity3")
+	@Table(name = "Entity3")
+	public static class Entity3 {
+		@Id
+		private Integer id;
+		private String name;
+		private List<Object> associations;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/JoinColumnProcessingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/JoinColumnProcessingTests.java
new file mode 100644
index 000000000000..f70180ceed80
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/override/JoinColumnProcessingTests.java
@@ -0,0 +1,81 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.boot.models.xml.override;
+
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+import org.hibernate.mapping.Collection;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.DomainModelScope;
+import org.hibernate.testing.orm.junit.Jira;
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/// The report (HHH-15510) states that `@JoinColumn` defined on the class
+/// is not processed when the class is "mapped" using XML - the class is
+/// really more just "specified" via XML.
+///
+/// @author Steve Ebersole
+@DomainModel(
+		xmlMappings = "org/hibernate/orm/test/jpa/xml/joincolumn-processing.xml"
+)
+@Jira( "https://hibernate.atlassian.net/browse/HHH-15510" )
+public class JoinColumnProcessingTests {
+	@Test
+	void verifyModel(DomainModelScope modelScope) {
+		final var postBinding = modelScope.getEntityBinding( Post.class );
+
+		final var poster = postBinding.getProperty( "poster" );
+		final var posterValue = (org.hibernate.mapping.ManyToOne) poster.getValue();
+		assertThat( posterValue.getColumns() ).hasSize( 1 );
+		assertThat( posterValue.getColumns().get( 0 ).getName() ).isEqualTo( "poster_fk" );
+
+		final var tags = postBinding.getProperty( "tags" );
+		final var tagsValue = (Collection) tags.getValue();
+		assertThat( tagsValue.getCollectionTable().getName() ).isEqualTo( "post_tags" );
+		assertThat( tagsValue.getKey().getColumns() ).hasSize( 1 );
+		assertThat( tagsValue.getKey().getColumns().get( 0 ).getName() ).isEqualTo( "post_fk" );
+		assertThat( tagsValue.getKey().isCascadeDeleteEnabled() ).isTrue();
+		assertThat( tagsValue.getElement().getColumns() ).hasSize( 1 );
+		assertThat( tagsValue.getElement().getColumns().get( 0 ).getName() ).isEqualTo( "txt" );
+	}
+
+	@Entity(name="Person")
+	@Table(name="persons")
+	public static class Person {
+		@Id
+		private Integer id;
+		private String name;
+	}
+
+	@Entity(name="Post")
+	@Table(name="posts")
+	public static class Post {
+		@Id
+		private Integer id;
+		private String name;
+		@ManyToOne
+		@JoinColumn(name="poster_fk")
+		private Person poster;
+		@ElementCollection
+		@CollectionTable(name = "post_tags",
+				joinColumns = @JoinColumn(name = "post_fk")
+		)
+		@OnDelete(action = OnDeleteAction.CASCADE)
+		@Column(name = "txt")
+		private Set<String> tags;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java
index 1af343759877..e9270f91a350 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/SimpleEntityTypeResolutionsTests.java
@@ -4,8 +4,8 @@
  */
 package org.hibernate.orm.test.bootstrap.binding.annotations.basics;
 
-import java.sql.Timestamp;
 import java.time.Instant;
+import java.util.Date;
 import java.util.Iterator;
 
 import jakarta.persistence.TemporalType;
@@ -59,7 +59,7 @@ public void testIt(DomainModelScope scope) {
 				case "someDate": {
 					assertThat(
 							propertyResolution.getDomainJavaType().getJavaTypeClass(),
-							sameInstance( Timestamp.class )
+							sameInstance( Date.class )
 					);
 					assertThat( propertyValue.getTemporalPrecision(), is( TemporalType.TIMESTAMP ) );
 					break;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java
index e7ba5d58b268..c0c2c85dd38d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java
@@ -771,4 +771,39 @@ public void testTransientMergeComponentParent(SessionFactoryScope scope) {
 		);
 	}
 
+	@Test
+	public void testUpsert(SessionFactoryScope scope) {
+		Person person = new Person();
+		person.id = 12;
+		Address a = new Address();
+		Country c = new Country();
+		Country bornCountry = new Country();
+		c.setIso2( "DM" );
+		c.setName( "Matt Damon Land" );
+		bornCountry.setIso2( "US" );
+		bornCountry.setName( "United States of America" );
+
+		a.address1 = "colorado street";
+		a.city = "Springfield";
+		a.country = c;
+		person.address = a;
+		person.bornIn = bornCountry;
+		person.name = "Homer";
+
+		scope.inStatelessTransaction( session -> session.upsert( person ) );
+
+		scope.inTransaction( session -> {
+			Person p = session.get( Person.class, person.id );
+			assertNotNull( p );
+			assertNotNull( p.address );
+			assertEquals( "Springfield", p.address.city );
+			assertEquals( (Integer) 1, p.address.formula );
+
+			assertNotNull( p.address.country );
+			assertEquals( "DM", p.address.country.getIso2() );
+			assertNotNull( p.bornIn );
+			assertEquals( "US", p.bornIn.getIso2() );
+			assertEquals( (Integer) 2, p.addressBis.formula );
+		} );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateLoadingTestAction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateLoadingTestAction.java
index 4c546829d9a1..f1313307b5d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateLoadingTestAction.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateLoadingTestAction.java
@@ -14,9 +14,9 @@
 
 import org.hibernate.SessionFactory;
 import org.hibernate.jpa.boot.spi.Bootstrap;
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
 import jakarta.persistence.EntityManagerFactory;
+import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase.TestingPersistenceUnitDescriptorImpl;
 
 /**
  * A Runnable which initializes an EntityManagerFactory;
@@ -30,9 +30,9 @@ public class HibernateLoadingTestAction extends NotLeakingTestAction implements
 	@Override
 	public final void run() {
 		super.run(); //for basic sanity self-check
-		final Map config = new HashMap();
+		final Map<String,Object> config = new HashMap<>();
 		EntityManagerFactory emf = Bootstrap.getEntityManagerFactoryBuilder(
-				new BaseEntityManagerFunctionalTestCase.TestingPersistenceUnitDescriptorImpl( getClass().getSimpleName() ) {
+				new TestingPersistenceUnitDescriptorImpl( getClass().getSimpleName() ) {
 					@Override
 					public boolean isExcludeUnlistedClasses() {
 						return true;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java
index 96282cf8fd79..d301fb931fd6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java
@@ -24,7 +24,6 @@
 import org.hibernate.boot.archive.scan.spi.Scanner;
 import org.hibernate.boot.archive.spi.InputStreamAccess;
 import org.hibernate.boot.jaxb.internal.MappingBinder;
-import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.process.internal.ManagedResourcesImpl;
 import org.hibernate.boot.model.process.internal.ScanningCoordinator;
@@ -68,7 +67,6 @@ public class ScanningCoordinatorTest {
 	private ManagedResourcesImpl managedResources = Mockito.mock( ManagedResourcesImpl.class );
 	private ScanResult scanResult = Mockito.mock( ScanResult.class );
 	private BootstrapContext bootstrapContext = Mockito.mock( BootstrapContext.class );
-	private ClassmateContext classmateContext = new ClassmateContext();
 	private XmlMappingBinderAccess xmlMappingBinderAccess = Mockito.mock( XmlMappingBinderAccess.class );
 	private MappingBinder mappingBinder = Mockito.mock( MappingBinder.class );
 	private MetadataBuildingOptions metadataBuildingOptions = Mockito.mock( MetadataBuildingOptions.class );
@@ -87,7 +85,6 @@ public void init() {
 		Mockito.reset( classLoaderService );
 
 		when( bootstrapContext.getScanEnvironment() ).thenReturn( scanEnvironment );
-		when( bootstrapContext.getClassmateContext() ).thenReturn( classmateContext );
 		when( bootstrapContext.getServiceRegistry() ).thenReturn( serviceRegistry );
 		when( bootstrapContext.getMetadataBuildingOptions() ).thenReturn( metadataBuildingOptions );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaToolingAutoActionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaToolingAutoActionTests.java
index 931295afdde6..b6cea4461468 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaToolingAutoActionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaToolingAutoActionTests.java
@@ -4,13 +4,18 @@
  */
 package org.hibernate.orm.test.bootstrap.schema;
 
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.hibernate.tool.schema.Action;
 import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.ActionGrouping;
 import org.junit.jupiter.api.Test;
 
 import java.util.Properties;
+import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -30,4 +35,23 @@ public void testLegacySettingAsAction() {
 		assertThat( actionGrouping.databaseAction() ).isEqualTo( Action.CREATE_DROP );
 
 	}
+
+	@Test
+	public void testSchemaActionsWithNoEntities() {
+		final Properties props = new Properties();
+		props.put( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
+
+		try (StandardServiceRegistryImpl serviceRegistry = ServiceRegistryUtil.serviceRegistry()) {
+			// build metadata with no entity classes
+			final Metadata metadata = new MetadataSources( serviceRegistry ).buildMetadata();
+			assertThat( metadata.getContributors() ).isEmpty();
+
+			final Set<ActionGrouping> groupings = ActionGrouping.interpret( metadata, props );
+			assertThat( groupings ).isNotEmpty();
+
+			final ActionGrouping grouping = groupings.iterator().next();
+			assertThat( grouping.databaseAction() ).isEqualTo( Action.CREATE_DROP );
+			assertThat( grouping.scriptAction() ).isEqualTo( Action.NONE );
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/OracleInlineMutationStrategyIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/OracleInlineMutationStrategyIdTest.java
index 597934960680..32e32d6980a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/OracleInlineMutationStrategyIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bulkid/OracleInlineMutationStrategyIdTest.java
@@ -5,6 +5,7 @@
 package org.hibernate.orm.test.bulkid;
 
 import org.hibernate.dialect.CockroachDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 
 /**
@@ -17,6 +18,7 @@
 		dialectClass = CockroachDialect.class,
 		reason = "Amount of rows lengthens the transaction time, leading to retry errors on CockroachDB: https://www.cockroachlabs.com/docs/v24.3/transaction-retry-error-reference.html#retry_commit_deadline_exceeded"
 )
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "temporary disable, taking too long to complete")
 public class OracleInlineMutationStrategyIdTest extends InlineMutationStrategyIdTest {
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/ReEnhancementTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/ReEnhancementTests.java
index 469f4548ce3f..0996aec1e875 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/ReEnhancementTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhance/version/ReEnhancementTests.java
@@ -4,6 +4,14 @@
  */
 package org.hibernate.orm.test.bytecode.enhance.version;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import net.bytebuddy.description.type.TypeDefinition;
+import net.bytebuddy.dynamic.ClassFileLocator;
+import net.bytebuddy.dynamic.ClassFileLocator.Compound;
+import net.bytebuddy.dynamic.ClassFileLocator.ForClassLoader;
+import net.bytebuddy.pool.TypePool;
 import org.hibernate.bytecode.enhance.VersionMismatchException;
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl;
 import org.hibernate.bytecode.enhance.internal.bytebuddy.FeatureMismatchException;
@@ -11,10 +19,14 @@
 import org.hibernate.bytecode.enhance.spi.Enhancer;
 import org.hibernate.bytecode.internal.bytebuddy.ByteBuddyState;
 import org.hibernate.bytecode.spi.ByteCodeHelper;
+import org.hibernate.engine.spi.Managed;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -92,16 +104,55 @@ public boolean doBiDirectionalAssociationManagement() {
 		}
 	}
 
-	private void attemptEnhancement(Class<?> clazz, Enhancer enhancer) {
+	@ParameterizedTest
+	@ValueSource(classes = {MappedSuper.class, EntityClass.class})
+	void testAlreadyEnhancedEntitiesShouldNotGetEnhancedAgain(Class<?> testClass) {
+		final var enhancementContext = new DefaultEnhancementContext();
+		final var byteBuddyState = new ByteBuddyState();
+		final var enhancer = new EnhancerImpl( enhancementContext, byteBuddyState );
+
+		final var firstRoundEnhancement = attemptEnhancement( testClass, enhancer );
+		final var secondRoundEnhancement = enhancer.enhance( testClass.getName(), firstRoundEnhancement );
+
+		// Enhancer returns null if it decides that the class is already enhanced.
+		assertThat( secondRoundEnhancement ).isNull();
+
+		try (final var enhancedClassLocator = ClassFileLocator.Simple.of( testClass.getName(), firstRoundEnhancement );
+			final var classLoaderLocator = ForClassLoader.of( ReEnhancementTests.class.getClassLoader() );
+			final var locator = new Compound( enhancedClassLocator, classLoaderLocator )) {
+
+			final var typePool = TypePool.Default.of( locator );
+			final var typeDescription = typePool.describe( testClass.getName() ).resolve();
+
+			assertThat( typeDescription.getInterfaces().stream()
+					.map( TypeDefinition::asErasure ) )
+					.anySatisfy( it -> it.isAssignableFrom( Managed.class ) );
+		}
+		catch (IOException e) {
+			throw new UncheckedIOException( e );
+		}
+	}
+
+	private byte[] attemptEnhancement(Class<?> clazz, Enhancer enhancer) {
 		final String classFileName = clazz.getName().replace( '.', '/' ) + ".class";
 		try (InputStream classFileStream = clazz.getClassLoader().getResourceAsStream( classFileName ) ) {
 			final byte[] originalBytes = ByteCodeHelper.readByteCode( classFileStream );
-			enhancer.enhance( clazz.getName(), originalBytes );
+			return enhancer.enhance( clazz.getName(), originalBytes );
 		}
 		catch (IOException e) {
 			throw new RuntimeException( e );
 		}
 	}
 
+	@MappedSuperclass
+	static abstract class MappedSuper {
+		@Id
+		private Long id;
+	}
 
+	@Entity
+	static class EntityClass {
+		@Id
+		private Long id;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/UnsupportedEnhancementStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/UnsupportedEnhancementStrategyTest.java
index e28f6abaa755..b51d7e3840e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/UnsupportedEnhancementStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/access/UnsupportedEnhancementStrategyTest.java
@@ -55,20 +55,20 @@ public void fail() throws IOException {
 		assertThatThrownBy( () -> doEnhance( SomeEntity.class, context ) ).isInstanceOf( EnhancementException.class )
 				.hasMessageContainingAll(
 						String.format(
-								"Enhancement of [%s] failed because no field named [%s] could be found for property accessor method [%s].",
+								"Enhancement of [%s] failed because no underlying field named [%s] exists for property accessor method [%s]",
 								SomeEntity.class.getName(),
 								"propertyMethod",
 								"getPropertyMethod"
-						), "To fix this, make sure all property accessor methods have a matching field."
+						), "ensure all property accessor methods have a matching field"
 				);
 		assertThatThrownBy( () -> doEnhance( SomeOtherEntity.class, context ) ).isInstanceOf( EnhancementException.class )
 				.hasMessageContainingAll(
 					String.format(
-							"Enhancement of [%s] failed because no field named [%s] could be found for property accessor method [%s].",
+							"Enhancement of [%s] failed because no underlying field named [%s] exists for property accessor method [%s]",
 							SomeOtherEntity.class.getName(),
 							"propertyMethod",
 							"setPropertyMethod"
-					), "To fix this, make sure all property accessor methods have a matching field."
+					), "ensure all property accessor methods have a matching field"
 			);
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/BidirectionalOneToOneWithNonAggregateIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/BidirectionalOneToOneWithNonAggregateIdTest.java
index 1c27c8df0ed6..a503f25dce93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/BidirectionalOneToOneWithNonAggregateIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/BidirectionalOneToOneWithNonAggregateIdTest.java
@@ -81,7 +81,7 @@ public static class Entity1 {
 		protected int id;
 
 		@Version
-		@Column(name = "lock_version", nullable = false, columnDefinition = "smallint")
+		@Column(name = "lock_version", nullable = false)
 		protected int lockVersion;
 
 		@OneToOne(fetch = LAZY, cascade = ALL, orphanRemoval = true, mappedBy = "parent")
@@ -113,7 +113,7 @@ public static class Entity2 {
 		@Id
 		@OneToOne(fetch = LAZY, optional = false)
 		@LazyGroup("owner")
-		@JoinColumn(name = "parentid", nullable = false, updatable = false, columnDefinition = "smallint")
+		@JoinColumn(name = "parentid", nullable = false, updatable = false)
 		@Fetch(SELECT)
 		protected Entity1 parent;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/DefaultConstructorEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/DefaultConstructorEnhancementTest.java
new file mode 100644
index 000000000000..d1ee81e0ee3c
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/DefaultConstructorEnhancementTest.java
@@ -0,0 +1,60 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.bytecode.enhancement.basic;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@BytecodeEnhanced
+@SessionFactory
+@DomainModel(annotatedClasses = DefaultConstructorEnhancementTest.Person.class )
+public class DefaultConstructorEnhancementTest {
+
+	@Test
+	public void testDefaultConstructorAdded() {
+		// Check if the default constructor exists for Person
+		try {
+			Assertions.assertNotNull( Person.class.getConstructor() );
+		}
+		catch (NoSuchMethodException e) {
+			Assertions.fail( "Default constructor should have been added to Person by bytecode enhancement" );
+		}
+	}
+
+	@Test
+	public void testPersistAndLoad(SessionFactoryScope scope) {
+		Person person = new Person( "Gavin" );
+		person.id = 1L;
+		scope.inTransaction( session -> {
+			session.persist( person );
+		} );
+
+		scope.inTransaction( session -> {
+			Person loadedPerson = session.find( Person.class, 1L );
+			Assertions.assertNotNull( loadedPerson );
+			Assertions.assertEquals( "Gavin", loadedPerson.name );
+		} );
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+		@Id
+		Long id;
+
+		final String name;
+
+		// No default constructor
+		public Person(String name) {
+			this.name = name;
+		}
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/FancyDefaultConstructorEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/FancyDefaultConstructorEnhancementTest.java
new file mode 100644
index 000000000000..3efbb2164251
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/FancyDefaultConstructorEnhancementTest.java
@@ -0,0 +1,115 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.bytecode.enhancement.basic;
+
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Version;
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@BytecodeEnhanced
+@SessionFactory
+@DomainModel(annotatedClasses = { FancyDefaultConstructorEnhancementTest.Person.class,
+		FancyDefaultConstructorEnhancementTest.Address.class,
+		FancyDefaultConstructorEnhancementTest.BaseEntity.class })
+public class FancyDefaultConstructorEnhancementTest {
+
+	@Test
+	public void testDefaultConstructorAdded() {
+		// Check if the default constructor exists for Person
+		try {
+			Assertions.assertNotNull( Person.class.getConstructor() );
+		}
+		catch (NoSuchMethodException e) {
+			Assertions.fail( "Default constructor should have been added to Person by bytecode enhancement" );
+		}
+
+		// Check if the default constructor exists for Address
+		try {
+			Assertions.assertNotNull( Address.class.getConstructor() );
+		}
+		catch (NoSuchMethodException e) {
+			Assertions.fail( "Default constructor should have been added to Address by bytecode enhancement" );
+		}
+
+		// Check if the default constructor exists for BaseEntity
+		try {
+			Assertions.assertNotNull( BaseEntity.class.getConstructor() );
+		}
+		catch (NoSuchMethodException e) {
+			Assertions.fail( "Default constructor should have been added to BaseEntity by bytecode enhancement" );
+		}
+	}
+
+	@Test
+	public void testPersistAndLoad(SessionFactoryScope scope) {
+		Person person = new Person( "Gavin", "Main St", "12345" );
+		person.id = 1L;
+		person.version = 1;
+
+		scope.inTransaction( session -> {
+			session.persist( person );
+		} );
+
+		scope.inTransaction( session -> {
+			Person loadedPerson = session.find( Person.class, 1L );
+			Assertions.assertNotNull( loadedPerson );
+			Assertions.assertEquals( "Gavin", loadedPerson.name );
+			Assertions.assertNotNull( loadedPerson.address );
+			Assertions.assertEquals( "Main St", loadedPerson.address.street );
+			Assertions.assertEquals( "12345", loadedPerson.address.zip );
+			Assertions.assertEquals( 1, loadedPerson.version );
+		} );
+	}
+
+	@MappedSuperclass
+	public static class BaseEntity {
+		@Version
+		int version;
+
+		// No default constructor
+		public BaseEntity(int version) {
+			this.version = version;
+		}
+	}
+
+	@Entity(name = "Person")
+	public static class Person extends BaseEntity {
+		@Id
+		Long id;
+
+		final String name;
+
+		@Embedded
+		final Address address;
+
+		// No default constructor
+		public Person(String name, String street, String zip) {
+			super(0);
+			this.name = name;
+			this.address = new Address(street, zip);
+		}
+	}
+
+	@Embeddable
+	public static class Address {
+		final String street;
+		final String zip;
+
+		// No default constructor
+		public Address(String street, String zip) {
+			this.street = street;
+			this.zip = zip;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/HandleVersionNumbersInitializedToNegativeValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/HandleVersionNumbersInitializedToNegativeValueTests.java
index fd9ec2bf4b72..8d985c1a31b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/HandleVersionNumbersInitializedToNegativeValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/batch/HandleVersionNumbersInitializedToNegativeValueTests.java
@@ -48,7 +48,7 @@ void hhh18883Test(SessionFactoryScope scope) {
 	}
 
 
-	@Entity
+	@Entity(name = "RootEntity")
 	@Table
 	public static class RootEntity {
 
@@ -115,7 +115,7 @@ public int hashCode() {
 		}
 	}
 
-	@Entity
+	@Entity(name = "ChildEntity")
 	@Table
 	public static class ChildEntity {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/collection/DetachedCollectionInitializationJoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/collection/DetachedCollectionInitializationJoinFetchTest.java
index 5fd059dbeeaa..9a9d53a596b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/collection/DetachedCollectionInitializationJoinFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/collection/DetachedCollectionInitializationJoinFetchTest.java
@@ -69,6 +69,14 @@ public void testInitializedDetachedInstance(SessionFactoryScope scope) {
 		} );
 	}
 
+	@Test
+	public void testExistingPersistentInstance(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final var entityA = session.find( EntityA.class, 1L );
+			fetchQuery( new ArrayList<>( entityA.getB() ), session );
+		} );
+	}
+
 	@BeforeEach
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/collection/DetachedNonJoinedCollectionInitializationJoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/collection/DetachedNonJoinedCollectionInitializationJoinFetchTest.java
index 836cbf45e6ef..40df08d61fc1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/collection/DetachedNonJoinedCollectionInitializationJoinFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/detached/collection/DetachedNonJoinedCollectionInitializationJoinFetchTest.java
@@ -71,6 +71,14 @@ public void testInitializedDetachedInstance(SessionFactoryScope scope) {
 		} );
 	}
 
+	@Test
+	public void testExistingPersistentInstance(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final var entityA = session.find( EntityA.class, 1L );
+			fetchQuery( new ArrayList<>( entityA.getB() ), session );
+		} );
+	}
+
 	@BeforeEach
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java
index 681c6520197f..1cbae6239819 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.bytecode.enhancement.dirty;
 
+import jakarta.persistence.CollectionTable;
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -80,6 +81,7 @@ static class StringsEntity {
 		Long id;
 
 		@ElementCollection
+		@CollectionTable(name = "SOME_STRINGS")
 		List<String> someStrings;
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingMixedAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingMixedAccessTest.java
new file mode 100644
index 000000000000..61a4b548cb90
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingMixedAccessTest.java
@@ -0,0 +1,127 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.bytecode.enhancement.dirty;
+
+import org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils;
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Access;
+import jakarta.persistence.AccessType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+
+/**
+ * Test for HHH-19917: Bytecode-enhanced dirty tracking fails for mixed access
+ * properties.
+ */
+@JiraKey("HHH-19917")
+@DomainModel(annotatedClasses = {
+		DirtyTrackingMixedAccessTest.DataTypes.class,
+		DirtyTrackingMixedAccessTest.PropertyDefaultEntity.class
+})
+@SessionFactory
+@BytecodeEnhanced
+public class DirtyTrackingMixedAccessTest {
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+	}
+
+
+	@Test
+	public void testFieldDefaultWithPropertyAccessOverride(SessionFactoryScope scope) {
+		scope.inTransaction(s -> {
+			DataTypes d1 = new DataTypes();
+			d1.id = 1;
+			d1.setIntData2(100);
+			s.persist(d1);
+		});
+
+		scope.inTransaction(s -> {
+			DataTypes d1 = s.get(DataTypes.class, 1);
+			EnhancerTestUtils.clearDirtyTracking(d1);
+			d1.setIntData2(200);
+			EnhancerTestUtils.checkDirtyTracking(d1, "intData2");
+			d1.setIntData2(100);
+			EnhancerTestUtils.checkDirtyTracking(d1, "intData2");
+		});
+	}
+
+	@Test
+	public void testPropertyDefaultWithFieldAccessOverride(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			PropertyDefaultEntity e = new PropertyDefaultEntity();
+			e.setId( 2 );
+			e.setName( "original" );
+			s.persist( e );
+		} );
+		scope.inTransaction( s -> {
+			PropertyDefaultEntity e = s.get( PropertyDefaultEntity.class, 2 );
+			EnhancerTestUtils.clearDirtyTracking( e );
+			e.setName( "updated" );
+			EnhancerTestUtils.checkDirtyTracking( e, "name" );
+		} );
+	}
+
+	@Entity
+	@Table(name = "DataTypes")
+	@Access(AccessType.FIELD)
+	public static class DataTypes {
+		@Id
+		protected int id;
+
+		@Transient
+		private int intData2;
+
+		@Access(AccessType.PROPERTY)
+		@Column(name = "INTDATA2")
+		public int getIntData2() {
+			return intData2;
+		}
+
+		public void setIntData2(int intData2) {
+			this.intData2 = intData2;
+		}
+	}
+
+	/**
+	 * Vice-versa case: class default is PROPERTY, field overrides with @Access(FIELD),
+	 * and getter is @Transient to avoid duplicate mapping.
+	 */
+	@Entity
+	@Table(name = "PropertyDefaultEntity")
+	@Access(AccessType.PROPERTY)
+	public static class PropertyDefaultEntity {
+		@Id
+		@Access(AccessType.FIELD)
+		@Column(name = "ENTITY_ID")
+		private int id;
+		private String name;
+		@Transient
+		public int getId() {
+			return id;
+		}
+		public void setId(int id) {
+			this.id = id;
+		}
+		@Column(name = "NAME_COL")
+		public String getName() {
+			return name;
+		}
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DynamicUpdateTest.java
index a9f7b711d4c4..8850e993db9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DynamicUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DynamicUpdateTest.java
@@ -74,7 +74,7 @@ public void testSetAttribute(SessionFactoryScope scope) {
 		);
 	}
 
-	@Entity
+	@Entity(name = "Payment")
 	@DynamicUpdate
 	public static class Payment {
 
@@ -131,7 +131,7 @@ public void setTransactionNumber(String transactionNumber) {
 		}
 	}
 
-	@Entity
+	@Entity(name = "StuffToPay")
 	@DynamicUpdate
 	public static class StuffToPay {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/graph/FetchGraphReadOnlyNpeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/graph/FetchGraphReadOnlyNpeTest.java
new file mode 100644
index 000000000000..a6b9d43946cd
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/graph/FetchGraphReadOnlyNpeTest.java
@@ -0,0 +1,161 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.bytecode.enhancement.graph;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Subgraph;
+import org.hibernate.Hibernate;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.jpa.HibernateHints;
+import org.hibernate.jpa.SpecHints;
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(annotatedClasses = {
+		FetchGraphReadOnlyNpeTest.Account.class,
+		FetchGraphReadOnlyNpeTest.Assignment.class,
+		FetchGraphReadOnlyNpeTest.UserName.class
+})
+@SessionFactory
+// We need to disable max fetch depth to trigger the original problem
+@ServiceRegistry(settings = {@Setting(name = AvailableSettings.MAX_FETCH_DEPTH, value = "")})
+@BytecodeEnhanced
+@Jira("https://hibernate.atlassian.net/browse/HHH-20251")
+public class FetchGraphReadOnlyNpeTest {
+
+	@BeforeAll
+	void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final var userName1 = new UserName( 1L );
+			final var userName2 = new UserName( 2L );
+			session.persist( userName1 );
+			session.persist( userName2 );
+
+			final var account = new Account( 1L, userName1 );
+			session.persist( account );
+
+			// Assignment 1 references userName2, Assignment 2 references userName1 (same as Account)
+			session.persist( new Assignment( 1L, account, userName2 ) );
+			session.persist( new Assignment( 2L, account, userName1 ) );
+		} );
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+	}
+
+	@Test
+	void testHibernateBugWithQuery(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final var query = session.createQuery( "select a from Account a where a.id = :id", Account.class )
+					.setParameter( "id", 1L )
+					.setHint( HibernateHints.HINT_READ_ONLY, true )
+					.setHint( SpecHints.HINT_SPEC_FETCH_GRAPH, createFetchGraph( session ) );
+			final var account = query.getSingleResult();
+
+			assertThat( account.id ).isEqualTo( 1L );
+
+			// userName should be fetched via the graph
+			assertThat( Hibernate.isInitialized( account.userName ) ).isTrue();
+			assertThat( account.userName.id ).isEqualTo( 1L );
+
+			// assignments should be fetched via the graph
+			assertThat( Hibernate.isInitialized( account.assignments ) ).isTrue();
+			assertThat( account.assignments ).hasSize( 2 );
+			for ( Assignment assignment : account.assignments ) {
+				assertThat( Hibernate.isInitialized( assignment.userName ) ).isTrue();
+			}
+		} );
+	}
+
+	private EntityGraph<Account> createFetchGraph(SessionImplementor session) {
+		final EntityGraph<Account> fetchGraph = session.createEntityGraph( Account.class );
+		fetchGraph.addSubgraph( "userName" );
+		final Subgraph<Assignment> assignmentSubgraph = fetchGraph.addSubgraph( "assignments" );
+		assignmentSubgraph.addSubgraph( "userName" );
+		return fetchGraph;
+	}
+
+	@Entity(name = "Account")
+	public static class Account {
+		@Id
+		protected Long id;
+
+		@OneToOne(fetch = FetchType.LAZY)
+		private UserName userName;
+
+		@OneToMany(fetch = FetchType.LAZY, mappedBy = "account")
+		private Set<Assignment> assignments = new HashSet<>();
+
+		public Account() {
+		}
+
+		public Account(Long id, UserName userName) {
+			this.id = id;
+			this.userName = userName;
+		}
+	}
+
+	@Entity(name = "UserName")
+	public static class UserName {
+		@Id
+		protected Long id;
+
+		@OneToOne(mappedBy = "userName", fetch = FetchType.LAZY)
+		private Account account;
+
+		@OneToOne(mappedBy = "userName", fetch = FetchType.LAZY)
+		private Assignment assignment;
+
+		public UserName() {
+		}
+
+		public UserName(Long id) {
+			this.id = id;
+		}
+	}
+
+	@Entity(name = "Assignment")
+	public static class Assignment {
+		@Id
+		protected Long id;
+
+		@OneToOne
+		private UserName userName;
+
+		@ManyToOne
+		private Account account;
+
+		public Assignment() {
+		}
+
+		public Assignment(Long id, Account account, UserName userName) {
+			this.id = id;
+			this.account = account;
+			this.userName = userName;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java
index 40038a426aac..6dfd37da2674 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy.HHH_10708;
 
+import jakarta.persistence.CollectionTable;
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -109,6 +110,7 @@ void setId(Long id) {
 			this.id = id;
 		}
 
+		@CollectionTable(name = "NAMES")
 		@ElementCollection
 		Set<String> getNames() {
 			return Collections.unmodifiableSet( names );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java
index f67af020dc37..54ca354ffccf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.bytecode.enhancement.lazy;
 
+import jakarta.persistence.CollectionTable;
 import org.hibernate.cfg.AvailableSettings;
 
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
@@ -118,6 +119,7 @@ static class ItemField implements Item {
 		@MapKeyColumn( name = "NAME" )
 		@Lob
 		@Column( name = "PARAM_VAL", length = 65535 )
+		@CollectionTable(name = "ITEM_FIELD_PARAMETERS")
 		private Map<String, String> parameters = new HashMap<>();
 
 		@Override
@@ -149,6 +151,7 @@ public void setName(String name) {
 		@Lob
 		@Column( name = "PARAM_VAL", length = 65535 )
 		@Override
+		@CollectionTable(name = "ITEM_PROPERTY_PARAMETERS")
 		public Map<String, String> getParameters() {
 			return parameterMap;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java
index e89b416985b1..2fb9f1cb82ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java
@@ -7,6 +7,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
+import jakarta.persistence.CollectionTable;
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -71,9 +73,11 @@ static class StringsEntity {
 
 		String text;
 
+		@CollectionTable(name = "SOME_STRINGS")
 		@ElementCollection(fetch = FetchType.EAGER)
 		List<String> someStrings;
 
+		@CollectionTable(name = "SOME_STRINGS_TWO")
 		@ElementCollection(fetch = FetchType.EAGER)
 		List<String> someStrings2;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsNotInLazyFetchGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsNotInLazyFetchGroupTest.java
index 04a0783314cd..96d846e2706f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsNotInLazyFetchGroupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsNotInLazyFetchGroupTest.java
@@ -8,6 +8,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import jakarta.persistence.CollectionTable;
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -70,9 +71,11 @@ static class StringsEntity {
 
 		String text;
 
+		@CollectionTable(name = "SOME_STRINGS")
 		@ElementCollection(fetch = FetchType.EAGER)
 		List<String> someStrings;
 
+		@CollectionTable(name = "SOME_STRINGS_TWO")
 		@ElementCollection(fetch = FetchType.EAGER)
 		List<String> someStrings2;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/HHH20253Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/HHH20253Test.java
new file mode 100644
index 000000000000..0d787354bd7f
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/HHH20253Test.java
@@ -0,0 +1,211 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static jakarta.persistence.CascadeType.ALL;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hibernate.graph.GraphSemantic.FETCH;
+
+/**
+ * @author Wander Winkelhorst
+ */
+
+@JiraKey( "HHH-20253" )
+@DomainModel(
+		annotatedClasses = {
+				HHH20253Test.CompanyEntity.class,
+				HHH20253Test.CompanyEmails.class,
+				HHH20253Test.Item.class
+		}
+)
+@ServiceRegistry
+@SessionFactory
+@BytecodeEnhanced
+@EnhancementOptions( lazyLoading = true )
+class HHH20253Test {
+
+	@Test
+	void testWithFetchGraph(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			var sqlStatementInspector = scope.getCollectingStatementInspector();
+			sqlStatementInspector.clear();
+			var query = session.createQuery( "select e from Item e", Item.class )
+					.setFetchSize( 10 );
+
+			var graph = session.createEntityGraph( Item.class );
+			graph.addAttributeNode("company");
+			query.applyGraph( graph, FETCH );
+
+			var resultList = query.list();
+			assertThat( resultList ).isNotEmpty();
+		} );
+	}
+
+	@BeforeEach
+	void prepareTestData(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+
+					CompanyEntity company1 = new CompanyEntity();
+					company1.setCompanyEmails( new CompanyEmails( company1 ) );
+					session.persist( company1 );
+
+					CompanyEntity company2 = new CompanyEntity();
+					company2.setCompanyEmails( new CompanyEmails( company2 ) );
+					company2.setParent( company1 );
+					session.persist( company2 );
+
+					Item item1 = new Item();
+					item1.setCompany( company2 );
+					session.persist( item1 );
+
+					Item item2 = new Item();
+					item2.setCompany( company1 );
+					session.persist( item2 );
+
+					session.flush();
+					session.clear();
+				}
+		);
+	}
+
+	@AfterEach
+	void clearTestData(SessionFactoryScope scope){
+		scope.getSessionFactory().getSchemaManager().truncate();
+	}
+
+	@Entity(name = "CompanyEntity")
+	static class CompanyEntity {
+
+		@Id
+		@GeneratedValue
+		@Column(name = "id", nullable = false)
+		private Long id;
+
+		@OneToOne(mappedBy = "company", cascade = ALL, orphanRemoval = true)
+		private CompanyEmails companyEmails;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@JoinColumn(name = "parent_company_id")
+		private CompanyEntity parent;
+
+		public CompanyEntity getParent() {
+			return parent;
+		}
+
+		public void setParent(CompanyEntity parent) {
+			this.parent = parent;
+		}
+
+		@Override
+		public String toString() {
+			return "RootEntity#" + id;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public void setCompanyEmails(CompanyEmails companyEmails) {
+			this.companyEmails = companyEmails;
+		}
+	}
+
+	@Entity(name = "CompanyEmails")
+	static class CompanyEmails {
+
+		@Id
+		@GeneratedValue
+		@Column(name = "id", nullable = false)
+		private Long id;
+
+		@OneToOne
+		@JoinColumn(name = "company_id")
+		private CompanyEntity company;
+
+		public CompanyEmails() {
+		}
+
+		public CompanyEmails(CompanyEntity company) {
+			this.company = company;
+		}
+
+		public CompanyEntity getCompany() {
+			return company;
+		}
+
+		public void setCompany(CompanyEntity company) {
+			this.company = company;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+	}
+
+	@Entity(name = "Item")
+	static class Item {
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String name;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		private CompanyEntity company;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public CompanyEntity getCompany() {
+			return company;
+		}
+
+		public void setCompany(CompanyEntity company) {
+			this.company = company;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java
index b85b29d3b862..49e57248263d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java
@@ -142,7 +142,7 @@ public void setUpData(SessionFactoryScope scope) {
 
 		scope.inTransaction( session -> {
 					// Add "not found" associations
-					session.createNativeQuery( "update Employee set employer_id = id" ).executeUpdate();
+					session.createNativeQuery( "update Employee set employer_id = id where 1=1" ).executeUpdate();
 				}
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java
index 05a2b47c24bf..b3a757b7e2ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java
@@ -129,7 +129,7 @@ public void setUpData(SessionFactoryScope scope) {
 
 		scope.inTransaction( session -> {
 					// Add "not found" associations
-					session.createNativeQuery( "update Employee set employer_id = 0 ").executeUpdate();
+					session.createNativeQuery( "update Employee set employer_id = 0 where 1=1").executeUpdate();
 				}
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java
index c3da7dcd6e44..d9b6b17646e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java
@@ -150,7 +150,7 @@ public void setUpData(SessionFactoryScope scope) {
 
 		scope.inTransaction( session -> {
 					// Add "not found" associations
-					session.createNativeQuery( "update Employee set employer_id = id" ).executeUpdate();
+					session.createNativeQuery( "update Employee set employer_id = id where 1=1" ).executeUpdate();
 				}
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java
index 9d5cce33cbfa..79557cb753d1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/NoProxyFactoryTests.java
@@ -11,7 +11,6 @@
 
 import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
-import org.hibernate.testing.logger.LoggerInspectionRule;
 import org.hibernate.testing.logger.Triggerable;
 
 
@@ -21,8 +20,9 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.junit.Rule;
+import org.hibernate.testing.orm.logger.LoggerInspectionExtension;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
@@ -41,8 +41,9 @@
 @BytecodeEnhanced
 @EnhancementOptions(lazyLoading = true)
 public class NoProxyFactoryTests {
-	@Rule
-	public LoggerInspectionRule logInspection = new LoggerInspectionRule( CORE_LOGGER );
+	@RegisterExtension
+	public LoggerInspectionExtension logInspection =
+			LoggerInspectionExtension.builder().setLogger( CORE_LOGGER ).build();
 
 	/**
 	 * See org.hibernate.internal.CoreMessageLogger#unableToCreateProxyFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanRemovalTest.java
index acd42242617b..d9ee57961f00 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanRemovalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanRemovalTest.java
@@ -85,7 +85,7 @@ public static class Entity1 {
 		protected int id;
 
 		@Version
-		@Column(name = "lock_version", nullable = false, columnDefinition = "smallint")
+		@Column(name = "lock_version", nullable = false)
 		protected int lockVersion;
 
 		@OneToOne(fetch = LAZY, cascade = ALL, orphanRemoval = true, mappedBy = "parent")
@@ -117,7 +117,7 @@ public static class Entity2 {
 		@Id
 		@OneToOne(fetch = LAZY, optional = false)
 		@LazyGroup("owner")
-		@JoinColumn(name = "parentid", nullable = false, updatable = false, columnDefinition = "smallint")
+		@JoinColumn(name = "parentid", nullable = false, updatable = false)
 		@Fetch(SELECT)
 		protected Entity1 parent;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/superclass/MappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/superclass/MappedSuperclassTest.java
index d4c7e785c8e7..8695cc9fb0aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/superclass/MappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/superclass/MappedSuperclassTest.java
@@ -68,7 +68,7 @@ public LocalDateTime value() {
 		}
 	}
 
-	@Entity
+	@Entity(name = "MyEntity")
 	public static class MyEntity extends MappedBase {
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CachedReadOnlyArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CachedReadOnlyArrayTest.java
index 0a0b5c88ad17..d735fbda019b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CachedReadOnlyArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CachedReadOnlyArrayTest.java
@@ -30,7 +30,7 @@ void testReadFromCache(EntityManagerFactoryScope scope) {
 	}
 
 	@Immutable
-	@Entity
+	@Entity(name = "Publication")
 	@Cache(usage = READ_ONLY)
 	static class Publication {
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java
index 457729993ee8..4903568a5c02 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java
@@ -149,7 +149,7 @@ public void testCollectionCacheEvictionUpdate(SessionFactoryScope scope) {
 		} );
 	}
 
-	@Entity(name = "People")
+	@Entity(name = "CachedPeople")
 	@Table(name = "people_group")
 	@Cacheable
 	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
@@ -163,7 +163,7 @@ public static class People {
 		private List<Person> people = new ArrayList<Person>();
 	}
 
-	@Entity(name = "Person")
+	@Entity(name = "CachedPerson")
 	@Table(name = "person")
 	@Cacheable
 	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/FullLayoutQueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/FullLayoutQueryCacheTest.java
index abfe9ed220e4..df3c737fbe72 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/FullLayoutQueryCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/FullLayoutQueryCacheTest.java
@@ -116,8 +116,8 @@ private void deleteEntitiesSilently(SessionFactoryScope scope) {
 									Statement stmt = null;
 									try {
 										stmt = connection.createStatement();
-										stmt.executeUpdate( "DELETE FROM SecondEntity" );
-										stmt.executeUpdate( "DELETE FROM FirstEntity" );
+										stmt.executeUpdate( "DELETE FROM SecondEntity where 1=1" );
+										stmt.executeUpdate( "DELETE FROM FirstEntity where 1=1" );
 									}
 									finally {
 										if ( stmt != null ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java
index cae41abb8bb8..666960cf80c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java
@@ -7,8 +7,10 @@
 import org.hibernate.LockMode;
 import org.hibernate.cache.internal.CollectionCacheInvalidator;
 import org.hibernate.cfg.Environment;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -103,6 +105,7 @@ public void testDefaultLockModeOnCollectionInitialization(SessionFactoryScope sc
 
 	@JiraKey(value = "HHH-9764")
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsConcurrentTransactions.class )
 	public void testDefaultLockModeOnEntityLoad(SessionFactoryScope scope) {
 
 		// first evict user
@@ -137,6 +140,7 @@ public void testDefaultLockModeOnEntityLoad(SessionFactoryScope scope) {
 
 	@JiraKey(value = "HHH-9764")
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsConcurrentTransactions.class )
 	public void testReadLockModeOnEntityLoad(SessionFactoryScope scope) {
 
 		// first evict user
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonstrictReadWriteMinimalPutsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonstrictReadWriteMinimalPutsTest.java
new file mode 100644
index 000000000000..585d95aa7753
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/NonstrictReadWriteMinimalPutsTest.java
@@ -0,0 +1,91 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.cache;
+
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+import org.hibernate.CacheMode;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DomainModel(annotatedClasses = NonstrictReadWriteMinimalPutsTest.CacheableItem.class)
+@SessionFactory(generateStatistics = true)
+@ServiceRegistry(
+		settings = {
+				@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true"),
+				@Setting(name = AvailableSettings.USE_MINIMAL_PUTS, value = "true"),
+				@Setting(name = AvailableSettings.CACHE_REGION_FACTORY,
+						value = "org.hibernate.testing.cache.CachingRegionFactory")
+		}
+)
+class NonstrictReadWriteMinimalPutsTest {
+
+	@Test
+	void testMinimalPutsAreApplied(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+
+		scope.inTransaction( session -> session.persist( new CacheableItem( 1L, "one" ) ) );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.PUT );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.PUT );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.IGNORE );
+		} );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.NORMAL );
+		} );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.GET );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.REFRESH );
+		} );
+
+		assertEquals( 2, statistics.getSecondLevelCachePutCount() );
+	}
+
+	@Entity(name = "CacheableItem")
+	@Cacheable
+	@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+	public static class CacheableItem {
+		@Id
+		private Long id;
+		private String name;
+
+		public CacheableItem() {
+		}
+
+		public CacheableItem(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/PendingBulkOperationCleanupActionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/PendingBulkOperationCleanupActionTest.java
index 38a6b063e272..5264c43f4d9e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/PendingBulkOperationCleanupActionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/PendingBulkOperationCleanupActionTest.java
@@ -25,8 +25,10 @@
 
 import org.hibernate.testing.cache.CachingRegionFactory;
 import org.hibernate.testing.cache.MapStorageAccessImpl;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -92,6 +94,7 @@ public void after(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class )
 	public void testUpdateCachedEntity(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session ->
@@ -107,6 +110,7 @@ public void testUpdateCachedEntity(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class )
 	public void testPendingBulkOperationActionsAreExecutedWhenSessionIsClosed(SessionFactoryScope scope) {
 		scope.inSession(
 				session ->
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReadOnlyMinimalPutsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReadOnlyMinimalPutsTest.java
new file mode 100644
index 000000000000..a70467058e5d
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReadOnlyMinimalPutsTest.java
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.cache;
+
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.CacheMode;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DomainModel(annotatedClasses = ReadOnlyMinimalPutsTest.CacheableItem.class)
+@SessionFactory(generateStatistics = true)
+@ServiceRegistry(
+		settings = {
+				@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true"),
+				@Setting(name = AvailableSettings.USE_MINIMAL_PUTS, value = "true"),
+				@Setting(name = AvailableSettings.CACHE_REGION_FACTORY,
+						value = "org.hibernate.testing.cache.CachingRegionFactory")
+		}
+)
+class ReadOnlyMinimalPutsTest {
+
+	@Test
+	void testMinimalPutsAreApplied(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+
+		scope.inTransaction( session -> session.persist( new CacheableItem( 1L, "one" ) ) );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.PUT );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.PUT );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.IGNORE );
+		} );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.NORMAL );
+		} );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.GET );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.REFRESH );
+		} );
+
+		assertEquals( 2, statistics.getSecondLevelCachePutCount() );
+	}
+
+	@Entity(name = "CacheableItem")
+	@Cacheable
+	@Cache(usage = CacheConcurrencyStrategy.READ_ONLY)
+	public static class CacheableItem {
+		@Id
+		private Long id;
+		private String name;
+
+		public CacheableItem() {
+		}
+
+		public CacheableItem(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReadWriteMinimalPutsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReadWriteMinimalPutsTest.java
new file mode 100644
index 000000000000..7be6ed0d931f
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReadWriteMinimalPutsTest.java
@@ -0,0 +1,118 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.cache;
+
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Version;
+import org.hibernate.CacheMode;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DomainModel(annotatedClasses = ReadWriteMinimalPutsTest.CacheableItem.class)
+@SessionFactory(generateStatistics = true)
+@ServiceRegistry(
+		settings = {
+				@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true"),
+				@Setting(name = AvailableSettings.USE_MINIMAL_PUTS, value = "true"),
+				@Setting(name = AvailableSettings.CACHE_REGION_FACTORY,
+						value = "org.hibernate.testing.cache.CachingRegionFactory")
+		}
+)
+class ReadWriteMinimalPutsTest {
+
+	@Test
+	void testMinimalPutsAreApplied(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+
+		scope.inTransaction( session -> session.persist( new CacheableItem( 1L, "one" ) ) );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.PUT );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.PUT );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.IGNORE );
+		} );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.NORMAL );
+		} );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.GET );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			// we actually don't refresh, since we know it's not stale (via version)
+			session.find( CacheableItem.class, 1L, CacheMode.REFRESH );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			// sneaky update
+			session.runWithConnection( (Connection connection) ->
+					connection.prepareStatement(
+							"UPDATE CacheableItem SET name = 'two', version=version+1 WHERE id = 1" )
+							.executeUpdate() );
+		} );
+
+		scope.inTransaction( session -> {
+			session.find( CacheableItem.class, 1L, CacheMode.NORMAL );
+		} );
+
+		assertEquals( 1, statistics.getSecondLevelCachePutCount() );
+
+		scope.inTransaction( session -> {
+			// this time there is something to refresh!
+			session.find( CacheableItem.class, 1L, CacheMode.REFRESH );
+		} );
+
+		assertEquals( 2, statistics.getSecondLevelCachePutCount() );
+
+	}
+
+	@Entity(name = "CacheableItem")
+	@Cacheable
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	public static class CacheableItem {
+		@Id
+		private Long id;
+		@Version
+		private Integer version;
+		private String name;
+
+		public CacheableItem() {
+		}
+
+		public CacheableItem(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java
index 4ebf8e3fc3e9..fd099203ee56 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingAndBatchTest.java
@@ -77,7 +77,7 @@ public void testIt(EntityManagerFactoryScope scope) {
 		);
 	}
 
-	@Entity
+	@Entity(name = "MyEntity1")
 	@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 	public static class MyEntity1 {
 		@Id()
@@ -126,7 +126,7 @@ public void test() {
 		}
 	}
 
-	@Entity
+	@Entity(name = "MyEntity2")
 	@BatchSize(size = 100)
 	public static class MyEntity2 {
 		@Id()
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithTriggerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithTriggerTest.java
index 7b29da48e849..bc16d14b71f9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithTriggerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithTriggerTest.java
@@ -9,6 +9,7 @@
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
@@ -16,6 +17,7 @@
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,6 +39,7 @@
 		}
 )
 @RequiresDialect(value = PostgreSQLDialect.class, comment = "To write a trigger only once")
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support triggers")
 public class CachingWithTriggerTest {
 
 	private static final String TRIGGER = "begin NEW.lastUpdatedAt = current_timestamp; return NEW; end;";
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java
index ddc2fe178956..df4775c12032 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java
@@ -83,7 +83,7 @@ private void updateStatuses(final SessionImplementor session) {
 				Statement stmnt = null;
 				try {
 					stmnt = session.getJdbcCoordinator().getStatementPreparer().createStatement();
-					stmnt.execute( "UPDATE T_JOB SET JOB_STATUS = 1" );
+					stmnt.execute( "UPDATE T_JOB SET JOB_STATUS = 1 where 1=1" );
 				}
 				finally {
 					if ( stmnt != null ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Address.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Address.java
index 249a43325db5..a6383931ba14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Address.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Address.java
@@ -9,7 +9,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 
-@Entity
+@Entity(name = "CircularAddress")
 public class Address {
 	@Id
 	@GeneratedValue
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java
index 3f2c16d10f83..6ed827482639 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/CascadeDeleteTest.java
@@ -38,7 +38,7 @@ public void setUp(SessionFactoryScope scope) {
 	public void testDelete(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
-					session.createSelectionQuery( "from Person", Person.class )
+					session.createSelectionQuery( "from CircularPerson", Person.class )
 							.list().forEach( session::remove );
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Person.java
index 7723353e7d10..24d4873e1693 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Person.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/delete/Person.java
@@ -17,7 +17,7 @@
 import org.hibernate.annotations.OptimisticLockType;
 import org.hibernate.annotations.OptimisticLocking;
 
-@Entity
+@Entity(name = "CircularPerson")
 @OptimisticLocking(type = OptimisticLockType.DIRTY)
 @DynamicUpdate
 public class Person {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java
deleted file mode 100644
index 07b0cb332db1..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java
+++ /dev/null
@@ -1,1414 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.cfg.persister;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.hibernate.Filter;
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
-import org.hibernate.MappingException;
-import org.hibernate.annotations.OnDeleteAction;
-import org.hibernate.bytecode.internal.BytecodeEnhancementMetadataNonPojoImpl;
-import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
-import org.hibernate.cache.spi.access.CollectionDataAccess;
-import org.hibernate.cache.spi.access.EntityDataAccess;
-import org.hibernate.cache.spi.access.NaturalIdDataAccess;
-import org.hibernate.cache.spi.entry.CacheEntry;
-import org.hibernate.cache.spi.entry.CacheEntryStructure;
-import org.hibernate.collection.spi.CollectionSemantics;
-import org.hibernate.collection.spi.PersistentCollection;
-import org.hibernate.engine.internal.MutableEntityEntryFactory;
-import org.hibernate.engine.spi.CascadeStyle;
-import org.hibernate.engine.spi.EntityEntryFactory;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.generator.Generator;
-import org.hibernate.generator.values.GeneratedValues;
-import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
-import org.hibernate.id.IdentifierGenerator;
-import org.hibernate.persister.filter.FilterAliasGenerator;
-import org.hibernate.internal.util.IndexedConsumer;
-import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
-import org.hibernate.mapping.Collection;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.metamodel.mapping.AttributeMapping;
-import org.hibernate.metamodel.mapping.AttributeMappingsList;
-import org.hibernate.metamodel.mapping.AttributeMappingsMap;
-import org.hibernate.metamodel.mapping.DiscriminatorType;
-import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
-import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
-import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.metamodel.mapping.EntityRowIdMapping;
-import org.hibernate.metamodel.mapping.EntityVersionMapping;
-import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.ModelPart;
-import org.hibernate.metamodel.mapping.NaturalIdMapping;
-import org.hibernate.metamodel.mapping.SelectableMapping;
-import org.hibernate.metamodel.mapping.TableDetails;
-import org.hibernate.metamodel.model.domain.NavigableRole;
-import org.hibernate.metamodel.spi.EntityRepresentationStrategy;
-import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.entity.UniqueKeyEntry;
-import org.hibernate.persister.entity.mutation.DeleteCoordinator;
-import org.hibernate.persister.entity.mutation.EntityTableMapping;
-import org.hibernate.persister.entity.mutation.InsertCoordinator;
-import org.hibernate.persister.entity.mutation.UpdateCoordinator;
-import org.hibernate.persister.spi.PersisterClassResolver;
-import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
-import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
-import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.spi.SqlAstCreationState;
-import org.hibernate.sql.ast.spi.SqlSelection;
-import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.predicate.Predicate;
-import org.hibernate.sql.model.ast.builder.MutationGroupBuilder;
-import org.hibernate.sql.results.graph.DomainResult;
-import org.hibernate.sql.results.graph.DomainResultCreationState;
-import org.hibernate.tuple.entity.EntityMetamodel;
-import org.hibernate.type.BasicType;
-import org.hibernate.type.CollectionType;
-import org.hibernate.type.Type;
-import org.hibernate.type.descriptor.java.JavaType;
-
-/**
- * @author Emmanuel Bernard
- */
-public class GoofyPersisterClassProvider implements PersisterClassResolver {
-	@Override
-	public Class<? extends EntityPersister> getEntityPersisterClass(PersistentClass metadata) {
-		return NoopEntityPersister.class;
-	}
-
-	@Override
-	public Class<? extends CollectionPersister> getCollectionPersisterClass(Collection metadata) {
-		return NoopCollectionPersister.class;
-	}
-
-	public static class NoopEntityPersister implements EntityPersister {
-
-		public NoopEntityPersister(
-				final PersistentClass persistentClass,
-				final EntityDataAccess cacheAccessStrategy,
-				final NaturalIdDataAccess naturalIdRegionAccessStrategy,
-				final RuntimeModelCreationContext creationContext) {
-			throw new GoofyException(NoopEntityPersister.class);
-		}
-
-		@Override
-		public boolean managesColumns(String[] columnNames) {
-			return false;
-		}
-
-		@Override
-		public NavigableRole getNavigableRole() {
-			return null;
-		}
-
-		@Override
-		public BytecodeEnhancementMetadata getInstrumentationMetadata() {
-			return new BytecodeEnhancementMetadataNonPojoImpl( null );
-		}
-
-		@Override
-		public void postInstantiate() throws MappingException {
-
-		}
-
-		@Override
-		public SessionFactoryImplementor getFactory() {
-			return null;
-		}
-
-		@Override
-		public EntityEntryFactory getEntityEntryFactory() {
-			return MutableEntityEntryFactory.INSTANCE;
-		}
-
-		@Override
-		public String getRootEntityName() {
-			return null;
-		}
-
-		@Override
-		public String getEntityName() {
-			return null;
-		}
-
-		@Override
-		public @Nullable String getJpaEntityName() {
-			return null;
-		}
-
-		@Override
-		public TableDetails getMappedTableDetails() {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public TableDetails getIdentifierTableDetails() {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public void forEachTableDetails(Consumer<TableDetails> consumer) {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public ModelPart findSubPart(
-				String name, EntityMappingType targetType) {
-			return null;
-		}
-
-		@Override
-		public void visitSubParts(Consumer<ModelPart> consumer, EntityMappingType targetType) {
-
-		}
-
-		@Override
-		public <T> DomainResult<T> createDomainResult(
-				NavigablePath navigablePath,
-				TableGroup tableGroup,
-				String resultVariable,
-				DomainResultCreationState creationState) {
-			return null;
-		}
-
-		@Override
-		public void applySqlSelections(
-				NavigablePath navigablePath, TableGroup tableGroup, DomainResultCreationState creationState) {
-
-		}
-
-		@Override
-		public void applySqlSelections(
-				NavigablePath navigablePath,
-				TableGroup tableGroup,
-				DomainResultCreationState creationState,
-				BiConsumer<SqlSelection, JdbcMapping> selectionConsumer) {
-
-		}
-
-		@Override
-		public JdbcMapping getJdbcMapping(int index) {
-			throw new IndexOutOfBoundsException( index );
-		}
-
-		@Override
-		public int forEachJdbcType(
-				int offset, IndexedConsumer<JdbcMapping> action) {
-			return 0;
-		}
-
-		@Override
-		public Object disassemble(Object value, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public <X, Y> int forEachDisassembledJdbcValue(
-				Object value,
-				int offset,
-				X x,
-				Y y,
-				JdbcValuesBiConsumer<X, Y> valuesConsumer,
-				SharedSessionContractImplementor session) {
-			return 0;
-		}
-
-		@Override
-		public boolean isExplicitPolymorphism() {
-			return false;
-		}
-
-		@Override
-		public SqmMultiTableMutationStrategy getSqmMultiTableMutationStrategy() {
-			return null;
-		}
-
-		@Override
-		public SqmMultiTableInsertStrategy getSqmMultiTableInsertStrategy() {
-			return null;
-		}
-
-		@Override
-		public AttributeMapping findDeclaredAttributeMapping(String name) {
-			return null;
-		}
-
-		@Override
-		public AttributeMappingsMap getDeclaredAttributeMappings() {
-			return null;
-		}
-
-		@Override
-		public void visitDeclaredAttributeMappings(Consumer<? super AttributeMapping> action) {
-
-		}
-
-		@Override
-		public EntityMetamodel getEntityMetamodel() {
-			return null;
-		}
-
-		@Override
-		public boolean isSubclassEntityName(String entityName) {
-			return false;
-		}
-
-		@Override
-		public String[] getPropertySpaces() {
-			return new String[0];
-		}
-
-		@Override
-		public Serializable[] getQuerySpaces() {
-			return new Serializable[0];
-		}
-
-		@Override
-		public boolean hasProxy() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCollections() {
-			return false;
-		}
-
-		@Override
-		public boolean hasMutableProperties() {
-			return false;
-		}
-
-		@Override
-		public boolean hasSubselectLoadableCollections() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCollectionNotReferencingPK() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCascades() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCascadeDelete() {
-			return false;
-		}
-
-		@Override
-		public boolean hasToOnes() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCascadePersist() {
-			return false;
-		}
-
-		@Override
-		public boolean hasOwnedCollections() {
-			return false;
-		}
-
-		@Override
-		public boolean isMutable() {
-			return false;
-		}
-
-		@Override
-		public boolean isInherited() {
-			return false;
-		}
-
-		@Override
-		public boolean isIdentifierAssignedByInsert() {
-			return false;
-		}
-
-		@Override
-		public Type getPropertyType(String propertyName) throws MappingException {
-			return null;
-		}
-
-		@Override
-		public int[] findDirty(Object[] currentState, Object[] previousState, Object owner, SharedSessionContractImplementor session) {
-			return new int[0];
-		}
-
-		@Override
-		public int[] findModified(Object[] old, Object[] current, Object object, SharedSessionContractImplementor session) {
-			return new int[0];
-		}
-
-		@Override
-		public boolean hasIdentifierProperty() {
-			return false;
-		}
-
-		@Override
-		public boolean canExtractIdOutOfEntity() {
-			return false;
-		}
-
-		@Override
-		public boolean isVersioned() {
-			return false;
-		}
-
-		@Override
-		public BasicType<?> getVersionType() {
-			return null;
-		}
-
-		@Override
-		public int getVersionPropertyIndex() {
-			return 0;
-		}
-
-		@Override
-		public boolean hasNaturalIdentifier() {
-			return false;
-		}
-
-		@Override
-		public int[] getNaturalIdentifierProperties() {
-			return new int[0];
-		}
-
-		@Override
-		public Object[] getNaturalIdentifierSnapshot(Object id, SharedSessionContractImplementor session) {
-			return new Object[0];
-		}
-
-		@Override
-		public Serializable loadEntityIdByNaturalId(
-				Object[] naturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public IdentifierGenerator getIdentifierGenerator() {
-			return null;
-		}
-
-		@Override
-		public boolean hasLazyProperties() {
-			return false;
-		}
-
-		@Override
-		public Object load(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public Object load(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public List<?> multiLoad(Object[] ids, SharedSessionContractImplementor session, MultiIdLoadOptions loadOptions) {
-			return Collections.emptyList();
-		}
-
-		@Override
-		public void lock(Object id, Object version, Object object, LockMode lockMode, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public void lock(Object id, Object version, Object object, LockOptions lockOptions, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public InsertCoordinator getInsertCoordinator() {
-			return null;
-		}
-
-		@Override
-		public UpdateCoordinator getUpdateCoordinator() {
-			return null;
-		}
-
-		@Override
-		public DeleteCoordinator getDeleteCoordinator() {
-			return null;
-		}
-
-		@Override
-		public Type[] getPropertyTypes() {
-			return new Type[0];
-		}
-
-		@Override
-		public String[] getPropertyNames() {
-			return new String[0];
-		}
-
-		@Override
-		public boolean[] getPropertyInsertability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean[] getPropertyUpdateability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean[] getPropertyCheckability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean[] getPropertyNullability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean[] getPropertyVersionability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean[] getPropertyLaziness() {
-			return new boolean[0];
-		}
-
-		@Override
-		public CascadeStyle[] getPropertyCascadeStyles() {
-			return new CascadeStyle[0];
-		}
-
-		@Override
-		public Type getIdentifierType() {
-			return null;
-		}
-
-		@Override
-		public String getIdentifierPropertyName() {
-			return null;
-		}
-
-		@Override
-		public boolean isCacheInvalidationRequired() {
-			return false;
-		}
-
-		@Override
-		public boolean isLazyPropertiesCacheable() {
-			return false;
-		}
-
-		@Override
-		public boolean canReadFromCache() {
-			return false;
-		}
-
-		@Override
-		public boolean canWriteToCache() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCache() {
-			return false;
-		}
-
-		@Override
-		public EntityDataAccess getCacheAccessStrategy() {
-			return null;
-		}
-
-		@Override
-		public boolean hasNaturalIdCache() {
-			return false;
-		}
-
-		@Override
-		public NaturalIdDataAccess getNaturalIdCacheAccessStrategy() {
-			return null;
-		}
-
-		@Override
-		public CacheEntryStructure getCacheEntryStructure() {
-			return null;
-		}
-
-		@Override
-		public CacheEntry buildCacheEntry(
-				Object entity, Object[] state, Object version, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public boolean isSelectBeforeUpdateRequired() {
-			return false;
-		}
-
-		@Override
-		public Object[] getDatabaseSnapshot(Object id, SharedSessionContractImplementor session) throws HibernateException {
-			return new Object[0];
-		}
-
-		@Override
-		public Object getIdByUniqueKey(Object key, String uniquePropertyName, SharedSessionContractImplementor session) {
-			throw new UnsupportedOperationException( "not supported" );
-		}
-
-		@Override
-		public Object getCurrentVersion(Object id, SharedSessionContractImplementor session) throws HibernateException {
-			return null;
-		}
-
-		@Override
-		public Object forceVersionIncrement(Object id, Object currentVersion, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public boolean isInstrumented() {
-			return false;
-		}
-
-		@Override
-		public boolean hasInsertGeneratedProperties() {
-			return false;
-		}
-
-		@Override
-		public boolean hasUpdateGeneratedProperties() {
-			return false;
-		}
-
-		@Override
-		public boolean isVersionPropertyGenerated() {
-			return false;
-		}
-
-		@Override
-		public void afterInitialize(Object entity, SharedSessionContractImplementor session) {
-
-		}
-
-		@Override
-		public void afterReassociate(Object entity, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public Object createProxy(Object id, SharedSessionContractImplementor session) throws HibernateException {
-			return null;
-		}
-
-		@Override
-		public Boolean isTransient(Object object, SharedSessionContractImplementor session) throws HibernateException {
-			return null;
-		}
-
-		@Override
-		public Object[] getPropertyValuesToInsert(Object object, Map mergeMap, SharedSessionContractImplementor session) {
-			return new Object[0];
-		}
-
-		@Override
-		public void processInsertGeneratedProperties(Object id, Object entity, Object[] state, GeneratedValues generatedValues, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public void processUpdateGeneratedProperties(Object id, Object entity, Object[] state, GeneratedValues generatedValues, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public Class<?> getMappedClass() {
-			return null;
-		}
-
-		@Override
-		public Class<?> getConcreteProxyClass() {
-			return null;
-		}
-
-		@Override
-		public void setPropertyValues(Object object, Object[] values) {
-		}
-
-		@Override
-		public void setPropertyValue(Object object, int i, Object value) {
-		}
-
-		@Override
-		public Object[] getPropertyValues(Object object) {
-			return new Object[0];
-		}
-
-		@Override
-		public Object getPropertyValue(Object object, int i) {
-			return null;
-		}
-
-		@Override
-		public Object getPropertyValue(Object object, String propertyName) {
-			return null;
-		}
-
-		@Override
-		public Serializable getIdentifier(Object entity, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public void setIdentifier(Object entity, Object id, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public Object getVersion(Object object) {
-			return null;
-		}
-
-		@Override
-		public Object instantiate(Object id, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public boolean isInstance(Object object) {
-			return false;
-		}
-
-		@Override
-		public boolean hasUninitializedLazyProperties(Object object) {
-			return false;
-		}
-
-		@Override
-		public void resetIdentifier(Object entity, Object currentId, Object currentVersion, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public EntityPersister getSubclassEntityPersister(Object instance, SessionFactoryImplementor factory) {
-			return null;
-		}
-
-		@Override
-		public FilterAliasGenerator getFilterAliasGenerator(String rootAlias) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		@Override
-		public EntityPersister getEntityPersister() {
-			return this;
-		}
-
-		@Override
-		public EntityIdentifierMapping getIdentifierMapping() {
-			return null;
-		}
-
-		@Override
-		public EntityVersionMapping getVersionMapping() {
-			return null;
-		}
-
-		@Override
-		public EntityRowIdMapping getRowIdMapping() {
-			return null;
-		}
-
-		@Override
-		public void visitConstraintOrderedTables(ConstraintOrderedTableConsumer consumer) {
-
-		}
-
-		@Override
-		public EntityDiscriminatorMapping getDiscriminatorMapping() {
-			return null;
-		}
-
-		@Override
-		public Object getDiscriminatorValue() {
-			return null;
-		}
-
-		@Override
-		public NaturalIdMapping getNaturalIdMapping() {
-			return null;
-		}
-
-		@Override
-		public boolean isTypeOrSuperType(EntityMappingType targetType) {
-			return targetType == this;
-		}
-
-		@Override
-		public EntityRepresentationStrategy getRepresentationStrategy() {
-			return null;
-		}
-
-		@Override
-		public int[] resolveAttributeIndexes(String[] attributeNames) {
-			return null;
-		}
-
-		@Override
-		public boolean canUseReferenceCacheEntries() {
-			return false;
-		}
-
-		@Override
-		public boolean useShallowQueryCacheLayout() {
-			return false;
-		}
-
-		@Override
-		public boolean storeDiscriminatorInShallowQueryCacheLayout() {
-			return false;
-		}
-
-		@Override
-		public boolean hasFilterForLoadByKey() {
-			return false;
-		}
-
-		@Override
-		public Iterable<UniqueKeyEntry> uniqueKeyEntries() {
-			return Collections.emptyList();
-		}
-
-		@Override
-		public String getSelectByUniqueKeyString(String propertyName) {
-			return null;
-		}
-
-		@Override
-		public String getSelectByUniqueKeyString(String[] propertyNames, String[] columnNames) {
-			return null;
-		}
-
-		@Override
-		public String[] getRootTableKeyColumnNames() {
-			return new String[0];
-		}
-
-		@Override
-		public String getIdentitySelectString() {
-			return null;
-		}
-
-		@Override
-		public String[] getIdentifierColumnNames() {
-			return new String[0];
-		}
-
-		@Override
-		public boolean isAffectedByEnabledFilters(LoadQueryInfluencers influencers, boolean onlyApplyForLoadByKeyFilters) {
-			return false;
-		}
-
-		@Override
-		public boolean isAffectedByEntityGraph(LoadQueryInfluencers influencers) {
-			return false;
-		}
-
-		@Override
-		public boolean isAffectedByEnabledFetchProfiles(LoadQueryInfluencers influencers) {
-			return false;
-		}
-
-		@Override
-		public AttributeMappingsList getAttributeMappings() {
-			return null;
-		}
-
-		@Override
-		public void forEachAttributeMapping(Consumer<? super AttributeMapping> action) {
-
-		}
-
-		@Override
-		public JavaType getMappedJavaType() {
-			return null;
-		}
-
-		@Override
-		public EntityMappingType getTargetPart() {
-			return null;
-		}
-
-		@Override
-		public void forEachMutableTable(Consumer<EntityTableMapping> consumer) {
-
-		}
-
-		@Override
-		public void forEachMutableTableReverse(Consumer<EntityTableMapping> consumer) {
-
-		}
-
-		@Override
-		public String getIdentifierTableName() {
-			return null;
-		}
-
-		@Override
-		public EntityTableMapping getIdentifierTableMapping() {
-			return null;
-		}
-
-		@Override
-		public ModelPart getIdentifierDescriptor() {
-			return null;
-		}
-
-		@Override
-		public GeneratedValuesMutationDelegate getInsertDelegate() {
-			return null;
-		}
-
-		@Override
-		public GeneratedValuesMutationDelegate getUpdateDelegate() {
-			return null;
-		}
-
-		@Override
-		public String getTableName() {
-			return "";
-		}
-
-		@Override
-		public String[] getIdentifierAliases(String suffix) {
-			return new String[0];
-		}
-
-		@Override
-		public String getRootTableName() {
-			return "";
-		}
-
-		@Override
-		public String[] getRootTableIdentifierColumnNames() {
-			return new String[0];
-		}
-
-		@Override
-		public String getVersionColumnName() {
-			return "";
-		}
-
-		@Override
-		public String[] getPropertyAliases(String suffix, int i) {
-			return new String[0];
-		}
-
-		@Override
-		public String getDiscriminatorAlias(String suffix) {
-			return "";
-		}
-
-		@Override
-		public String getDiscriminatorColumnName() {
-			return "";
-		}
-
-		@Override
-		public Type getDiscriminatorType() {
-			return null;
-		}
-
-		@Override
-		public boolean hasRowId() {
-			return false;
-		}
-
-		@Override
-		public String[] getSubclassPropertyColumnAliases(String propertyName, String suffix) {
-			return new String[0];
-		}
-
-		@Override
-		public String[] getPropertyColumnNames(String propertyPath) {
-			return new String[0];
-		}
-
-		@Override
-		public String selectFragment(String alias, String suffix) {
-			return "";
-		}
-
-		@Override
-		public DiscriminatorType<?> getDiscriminatorDomainType() {
-			return null;
-		}
-
-		@Override
-		public String[] toColumns(String propertyName) {
-			return new String[0];
-		}
-
-		@Override
-		public boolean[] getNonLazyPropertyUpdateability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean hasMultipleTables() {
-			return false;
-		}
-
-		@Override
-		public String[] getTableNames() {
-			return new String[0];
-		}
-
-		@Override
-		public String getTableName(int j) {
-			return "";
-		}
-
-		@Override
-		public String[] getKeyColumns(int j) {
-			return new String[0];
-		}
-
-		@Override
-		public int getTableSpan() {
-			return 0;
-		}
-
-		@Override
-		public boolean isInverseTable(int j) {
-			return false;
-		}
-
-		@Override
-		public boolean isNullableTable(int j) {
-			return false;
-		}
-
-		@Override
-		public boolean hasDuplicateTables() {
-			return false;
-		}
-
-		@Override
-		public int getSubclassTableSpan() {
-			return 0;
-		}
-
-		@Override
-		public String getSubclassTableName(int j) {
-			return "";
-		}
-
-		@Override
-		public String getTableNameForColumn(String columnName) {
-			return "";
-		}
-
-		@Override
-		public String[] getSubclassPropertyColumnNames(int i) {
-			return new String[0];
-		}
-
-		@Override
-		public int countSubclassProperties() {
-			return 0;
-		}
-
-		@Override
-		public boolean isSharedColumn(String columnExpression) {
-			return false;
-		}
-
-		@Override
-		public String[][] getConstraintOrderedTableKeyColumnClosure() {
-			return new String[0][];
-		}
-
-		@Override
-		public EntityTableMapping[] getTableMappings() {
-			return new EntityTableMapping[0];
-		}
-
-		@Override
-		public String physicalTableNameForMutation(SelectableMapping selectableMapping) {
-			return "";
-		}
-
-		@Override
-		public void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
-
-		}
-
-		@Override
-		public void addSoftDeleteToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
-
-		}
-
-		@Override
-		public String getAttributeMutationTableName(int i) {
-			return "";
-		}
-
-		@Override
-		public boolean isPolymorphic() {
-			return false;
-		}
-
-		@Override
-		public boolean isDynamicUpdate() {
-			return false;
-		}
-
-		@Override
-		public boolean isDynamicInsert() {
-			return false;
-		}
-
-		@Override
-		public OnDeleteAction[] getPropertyOnDeleteActions() {
-			return new OnDeleteAction[0];
-		}
-
-		@Override
-		public Generator[] getGenerators() {
-			return new Generator[0];
-		}
-
-		@Override
-		public boolean hasImmutableNaturalId() {
-			return false;
-		}
-
-		@Override
-		public boolean isNaturalIdentifierInsertGenerated() {
-			return false;
-		}
-
-		@Override
-		public boolean isLazy() {
-			return false;
-		}
-
-		@Override
-		public int getPropertySpan() {
-			return 0;
-		}
-
-		@Override
-		public boolean hasPreInsertGeneratedProperties() {
-			return false;
-		}
-
-		@Override
-		public boolean hasPreUpdateGeneratedProperties() {
-			return false;
-		}
-	}
-
-	public static class NoopCollectionPersister implements CollectionPersister {
-
-		public NoopCollectionPersister(
-				Collection collectionBinding,
-				CollectionDataAccess cacheAccessStrategy,
-				RuntimeModelCreationContext creationContext) {
-			throw new GoofyException(NoopCollectionPersister.class);
-		}
-
-		@Override
-		public NavigableRole getNavigableRole() {
-			return null;
-		}
-
-		public void initialize(Object key, SharedSessionContractImplementor session) throws HibernateException {
-			//To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean hasCache() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public CollectionDataAccess getCacheAccessStrategy() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public CacheEntryStructure getCacheEntryStructure() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		@Override
-		public boolean useShallowQueryCacheLayout() {
-			return false;
-		}
-
-		public CollectionType getCollectionType() {
-			throw new UnsupportedOperationException();
-		}
-
-		public Type getKeyType() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public Type getIndexType() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public Type getElementType() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public Class<?> getElementClass() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean isPrimitiveArray() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean isArray() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean isOneToMany() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean isManyToMany() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean hasIndex() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean isLazy() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean isInverse() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public void remove(Object id, SharedSessionContractImplementor session) throws HibernateException {
-			//To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public void recreate(PersistentCollection<?> collection, Object key, SharedSessionContractImplementor session)
-				throws HibernateException {
-			//To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public void deleteRows(PersistentCollection<?> collection, Object key, SharedSessionContractImplementor session)
-				throws HibernateException {
-			//To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public void updateRows(PersistentCollection<?> collection, Object key, SharedSessionContractImplementor session)
-				throws HibernateException {
-			//To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public void insertRows(PersistentCollection<?> collection, Object key, SharedSessionContractImplementor session)
-				throws HibernateException {
-			//To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public String getRole() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public EntityPersister getOwnerEntityPersister() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public IdentifierGenerator getIdentifierGenerator() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public Type getIdentifierType() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean hasOrphanDelete() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean hasOrdering() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean hasManyToManyOrdering() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public String[] getCollectionSpaces() {
-			return new String[0];  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean isCascadeDeleteEnabled() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean isVersioned() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean isMutable() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public void postInstantiate() throws MappingException {
-			//To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public SessionFactoryImplementor getFactory() {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean isAffectedByEnabledFilters(SharedSessionContractImplementor session) {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public String[] getKeyColumnAliases(String suffix) {
-			return new String[0];  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public String[] getIndexColumnAliases(String suffix) {
-			return new String[0];  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public String[] getElementColumnAliases(String suffix) {
-			return new String[0];  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public String getIdentifierColumnAlias(String suffix) {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public int getSize(Object key, SharedSessionContractImplementor session) {
-			return 0;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean indexExists(Object key, Object index, SharedSessionContractImplementor session) {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public boolean elementExists(Object key, Object element, SharedSessionContractImplementor session) {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		public Object getElementByIndex(Object key, Object index, SharedSessionContractImplementor session, Object owner) {
-			return null;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		@Override
-		public String getMappedByProperty() {
-			return null;
-		}
-
-		@Override
-		public Comparator<?> getSortingComparator() {
-			return null;
-		}
-
-		@Override
-		public CollectionSemantics<?,?> getCollectionSemantics() {
-			return null;
-		}
-
-		@Override
-		public void applyBaseManyToManyRestrictions(Consumer<Predicate> predicateConsumer, TableGroup tableGroup, boolean useQualifier, Map<String, Filter> enabledFilters, Set<String> treatAsDeclarations, SqlAstCreationState creationState) {
-
-		}
-
-		@Override
-		public void processQueuedOps(PersistentCollection<?> collection, Object key, SharedSessionContractImplementor session)
-				throws HibernateException {
-		}
-
-		@Override
-		public void applyFilterRestrictions(
-				Consumer<Predicate> predicateConsumer,
-				TableGroup tableGroup,
-				boolean useQualifier,
-				Map<String, Filter> enabledFilters,
-				boolean onlyApplyLoadByKeyFilters,
-				SqlAstCreationState creationState) {
-
-		}
-
-		@Override
-		public void applyBaseRestrictions(Consumer<Predicate> predicateConsumer, TableGroup tableGroup, boolean useQualifier, Map<String, Filter> enabledFilters, Set<String> treatAsDeclarations, SqlAstCreationState creationState) {
-
-		}
-
-		@Override
-		public void applyBaseRestrictions(
-				Consumer<Predicate> predicateConsumer,
-				TableGroup tableGroup,
-				boolean useQualifier,
-				Map<String, Filter> enabledFilters,
-				boolean onlyApplyLoadByKeyFilters,
-				Set<String> treatAsDeclarations,
-				SqlAstCreationState creationState) {
-
-		}
-
-		@Override
-		public boolean hasWhereRestrictions() {
-			return false;
-		}
-
-		@Override
-		public void applyWhereRestrictions(Consumer<Predicate> predicateConsumer, TableGroup tableGroup, boolean useQualifier, SqlAstCreationState creationState) {
-
-		}
-
-		@Override
-		public String getIdentifierColumnName() {
-			return "";
-		}
-
-		@Override
-		public String getTableName() {
-			return "";
-		}
-
-		@Override
-		public String selectFragment(String alias, String columnSuffix) {
-			return "";
-		}
-
-		@Override
-		public String[] getCollectionPropertyColumnAliases(String propertyName, String string) {
-			return new String[0];
-		}
-
-		@Override
-		public EntityPersister getElementPersister() {
-			return null;
-		}
-
-
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java
deleted file mode 100644
index 82f8a23b44df..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.cfg.persister;
-
-import org.hibernate.MappingException;
-import org.hibernate.SessionFactory;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.internal.SessionFactoryRegistry;
-import org.hibernate.persister.spi.PersisterClassResolver;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.testing.orm.junit.BaseUnitTest;
-import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
-
-/**
- * @author Emmanuel Bernard
- */
-@BaseUnitTest
-public class PersisterClassProviderTest {
-
-	@Test
-	public void testPersisterClassProvider() {
-		org.hibernate.internal.SessionFactoryRegistry.INSTANCE.clearRegistrations();
-		Configuration cfg = new Configuration();
-		cfg.addAnnotatedClass( Gate.class );
-		ServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder()
-				.applySettings( cfg.getProperties() )
-				.build();
-		//no exception as the GoofyPersisterClassProvider is not set
-		SessionFactory sessionFactory;
-		try {
-			sessionFactory = cfg.buildSessionFactory( serviceRegistry );
-			sessionFactory.close();
-		}
-		finally {
-			StandardServiceRegistryBuilder.destroy( serviceRegistry );
-		}
-
-		serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder()
-				.applySettings( cfg.getProperties() )
-				.addService( PersisterClassResolver.class, new GoofyPersisterClassProvider() )
-				.build();
-		cfg = new Configuration();
-		cfg.addAnnotatedClass( Gate.class );
-		try {
-			sessionFactory = cfg.buildSessionFactory( serviceRegistry );
-			sessionFactory.close();
-			fail( "The entity persister should be overridden" );
-		}
-		catch (MappingException e) {
-			// expected
-			assertThat( e.getCause() ).isInstanceOf( GoofyException.class );
-		}
-		finally {
-			StandardServiceRegistryBuilder.destroy( serviceRegistry );
-		}
-
-		assertThat( SessionFactoryRegistry.INSTANCE.hasRegistrations() ).isFalse();
-
-		cfg = new Configuration();
-		cfg.addAnnotatedClass( Portal.class );
-		cfg.addAnnotatedClass( Window.class );
-		serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder()
-				.applySettings( cfg.getProperties() )
-				.addService( PersisterClassResolver.class, new GoofyPersisterClassProvider() )
-				.build();
-		try {
-			sessionFactory = cfg.buildSessionFactory( serviceRegistry );
-			sessionFactory.close();
-			fail( "The collection persister should be overridden but not the entity persister" );
-		}
-		catch (MappingException e) {
-			// expected
-			assertThat( e.getCause() ).isInstanceOf( GoofyException.class );
-		}
-		finally {
-			StandardServiceRegistryBuilder.destroy( serviceRegistry );
-		}
-
-
-		cfg = new Configuration();
-		cfg.addAnnotatedClass( Tree.class );
-		cfg.addAnnotatedClass( Palmtree.class );
-		serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder()
-				.applySettings( cfg.getProperties() )
-				.addService( PersisterClassResolver.class, new GoofyPersisterClassProvider() )
-				.build();
-		try {
-			sessionFactory = cfg.buildSessionFactory( serviceRegistry );
-			sessionFactory.close();
-			fail( "The entity persisters should be overridden in a class hierarchy" );
-		}
-		catch (MappingException e) {
-			// expected
-			assertThat( e.getCause() ).isInstanceOf( GoofyException.class );
-		}
-		finally {
-			StandardServiceRegistryBuilder.destroy( serviceRegistry );
-		}
-
-		assertThat( SessionFactoryRegistry.INSTANCE.hasRegistrations() ).isFalse();
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java
index 6ea9cd468e4c..5afbdbbbbf14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java
@@ -27,10 +27,10 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cid/Customer.hbm.xml",
-				"org/hibernate/orm/test/cid/Order.hbm.xml",
-				"org/hibernate/orm/test/cid/LineItem.hbm.xml",
-				"org/hibernate/orm/test/cid/Product.hbm.xml"
+				"org/hibernate/orm/test/cid/Customer.orm.xml",
+				"org/hibernate/orm/test/cid/Order.orm.xml",
+				"org/hibernate/orm/test/cid/LineItem.orm.xml",
+				"org/hibernate/orm/test/cid/Product.orm.xml"
 		}
 )
 @SessionFactory(useCollectingStatementInspector = true)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/EmbeddedIdInParameterBindingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/EmbeddedIdInParameterBindingTest.java
index 83f29afcfe38..fb75103c60ba 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/EmbeddedIdInParameterBindingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/EmbeddedIdInParameterBindingTest.java
@@ -87,7 +87,7 @@ public void testQueryWithWhereClauseContainingInOperatorWithListOfParametersValu
 				session -> {
 					List<Delivery> deliveries = session.createQuery( "from Delivery d where d.locationId in ?1",
 									Delivery.class )
-							.setParameter( 1, List.of( verbania, schnitzel ) )
+							.setParameter( 1, List.of( verbania, hallein ) )
 							.getResultList();
 					assertThat( deliveries.size() ).isEqualTo( 2 );
 					assertThat( deliveries ).contains( pizza );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/CollectionInImmutableEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/CollectionInImmutableEmbeddableTest.java
new file mode 100644
index 000000000000..c65f1cb704c1
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/CollectionInImmutableEmbeddableTest.java
@@ -0,0 +1,117 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.collection;
+
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+
+@DomainModel(
+		annotatedClasses = {
+				CollectionInImmutableEmbeddableTest.MainEntity.class,
+				CollectionInImmutableEmbeddableTest.ImmutableEmbeddable.class,
+				CollectionInImmutableEmbeddableTest.OtherEntity.class,
+		}
+)
+@SessionFactory
+public class CollectionInImmutableEmbeddableTest {
+
+	@Test
+	@Jira("https://hibernate.atlassian.net/browse/HHH-20273")
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					var mainEntity = new MainEntity( 1, "main1" );
+					var other1 = new OtherEntity( 1, "other1" );
+					mainEntity.embeddable.otherEntities.add( other1 );
+					session.persist( other1 );
+					session.persist( mainEntity );
+					session.flush();
+
+					var other2 = new OtherEntity( 2, "other2" );
+					session.persist( other2 );
+					mainEntity.embeddable = new ImmutableEmbeddable( new HashSet<>() );
+					mainEntity.embeddable.otherEntities.add( other1 );
+					mainEntity.embeddable.otherEntities.add( other2 );
+				}
+		);
+	}
+
+	@Entity(name = "Customer")
+	public static class MainEntity {
+		@Id
+		public Integer id;
+
+		public String name;
+
+		@Embedded
+		public ImmutableEmbeddable embeddable = new ImmutableEmbeddable( new HashSet<>() );
+
+		public MainEntity() {
+		}
+
+		public MainEntity(int id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public ImmutableEmbeddable getEmbeddable() {
+			return embeddable;
+		}
+
+		public void setEmbeddable(ImmutableEmbeddable embeddable) {
+			this.embeddable = embeddable;
+		}
+	}
+
+	@Embeddable
+	public record ImmutableEmbeddable(
+			@OneToMany
+			Set<OtherEntity> otherEntities) {
+	}
+
+	@Entity(name = "OtherEntity")
+	public static class OtherEntity {
+		@Id
+		public Integer id;
+
+		public String description;
+
+		public OtherEntity() {
+		}
+
+		public OtherEntity(Integer id, String description) {
+			this.id = id;
+			this.description = description;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public String getDescription() {
+			return description;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/CollectionOneToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/CollectionOneToManySizeTest.java
index c8d8712da1ff..f93d2c52c3a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/CollectionOneToManySizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/basic/CollectionOneToManySizeTest.java
@@ -70,7 +70,7 @@ public void prepareData(SessionFactoryScope scope) {
 		);
 	}
 
-	@Entity
+	@Entity(name = "CollectionOrder")
 	public static class Order {
 		@Id
 		Long id;
@@ -79,7 +79,7 @@ public static class Order {
 		Set<OrderItem> orderItems;
 	}
 
-	@Entity
+	@Entity(name = "OrderItem")
 	public static class OrderItem {
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java
index d1895e95e72c..5cc6ca81b973 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java
@@ -24,8 +24,10 @@
 import org.hibernate.engine.spi.CollectionEntry;
 
 import org.hibernate.exception.LockTimeoutException;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
@@ -97,6 +99,7 @@ public void testCopyPersistentCollectionReferenceBeforeFlush(SessionFactoryScope
 	@JiraKey("HHH-9518")
 	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "The select triggered by the merge just hang without any exception")
 	@SkipForDialect(dialectClass = CockroachDialect.class, reason = "The merge in the second session causes a deadlock")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 	public void testCopyPersistentCollectionReferenceAfterFlush(SessionFactoryScope scope) {
 		Parent p = new Parent();
 		Child c = new Child();
@@ -140,6 +143,7 @@ public void testCopyPersistentCollectionReferenceAfterFlush(SessionFactoryScope
 
 	@Test
 	@JiraKey(value = "HHH-9518")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 	public void testCopyUninitializedCollectionReferenceAfterGet(SessionFactoryScope scope) {
 		Parent parent = new Parent();
 		Child c = new Child();
@@ -179,6 +183,7 @@ public void testCopyUninitializedCollectionReferenceAfterGet(SessionFactoryScope
 
 	@Test
 	@JiraKey(value = "HHH-9518")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 	public void testCopyInitializedCollectionReferenceAfterGet(SessionFactoryScope scope) {
 		Parent parent = new Parent();
 		Child c = new Child();
@@ -223,6 +228,7 @@ public void testCopyInitializedCollectionReferenceAfterGet(SessionFactoryScope s
 
 	@Test
 	@JiraKey(value = "HHH-9518")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 	public void testCopyInitializedCollectionReferenceToNewEntityCollectionRoleAfterGet(SessionFactoryScope scope) {
 		Parent parent = new Parent();
 		Child c = new Child();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleListTest.java
index b3b63c3fc339..35e5ccf256ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleListTest.java
@@ -11,8 +11,10 @@
 import jakarta.persistence.OrderColumn;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.Setting;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
@@ -26,6 +28,7 @@
 		properties = @Setting(name = STATEMENT_BATCH_SIZE, value = "5"))
 @SkipForDialect(dialectClass = MariaDBDialect.class)
 @SkipForDialect(dialectClass = CockroachDialect.class, reason = "CockroachDB uses SERIALIZABLE isolation, and does not support this")
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 public class StaleListTest {
 	@Test void test1(EntityManagerFactoryScope scope) {
 		var entity = new StaleListTestEntity();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleMapTest.java
index 2765fd99c2f8..1a8128f479d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleMapTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleMapTest.java
@@ -10,8 +10,10 @@
 import jakarta.persistence.Id;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.Setting;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
@@ -25,6 +27,7 @@
 		properties = @Setting(name = STATEMENT_BATCH_SIZE, value = "5"))
 @SkipForDialect(dialectClass = MariaDBDialect.class)
 @SkipForDialect(dialectClass = CockroachDialect.class, reason = "CockroachDB uses SERIALIZABLE isolation, and does not support this")
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 public class StaleMapTest {
 	@Test void test1(EntityManagerFactoryScope scope) {
 		var entity = new StaleMapTestEntity();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleOneToManyListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleOneToManyListTest.java
index 617db98aad1b..60b5b4cf2933 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleOneToManyListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleOneToManyListTest.java
@@ -12,9 +12,11 @@
 import jakarta.persistence.OrderColumn;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.Setting;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
@@ -29,6 +31,7 @@
 		properties = @Setting(name = STATEMENT_BATCH_SIZE, value = "5"))
 @SkipForDialect(dialectClass = MariaDBDialect.class)
 @SkipForDialect(dialectClass = CockroachDialect.class, reason = "CockroachDB uses SERIALIZABLE isolation, and does not support this")
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 public class StaleOneToManyListTest {
 	@Test void test1(EntityManagerFactoryScope scope) {
 		var entity = new StaleListTestParent();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleSetTest.java
index f0ca0688a5a2..4c07f69b9867 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/stale/StaleSetTest.java
@@ -9,8 +9,10 @@
 import jakarta.persistence.Id;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.Setting;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
@@ -24,6 +26,7 @@
 		properties = @Setting(name = STATEMENT_BATCH_SIZE, value = "5"))
 @SkipForDialect(dialectClass = MariaDBDialect.class)
 @SkipForDialect(dialectClass = CockroachDialect.class, reason = "CockroachDB uses SERIALIZABLE isolation, and does not support this")
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 public class StaleSetTest {
 	@Test void test(EntityManagerFactoryScope scope) {
 		var entity = new StaleSetTestEntity();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java
index 3270a6648c25..b919165c6155 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java
@@ -9,9 +9,11 @@
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.MySQLDialect;
 
 import org.hibernate.community.dialect.TiDBDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -25,6 +27,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.number.IsCloseTo.closeTo;
 import static org.junit.Assert.assertThat;
 
@@ -35,6 +38,7 @@
 @SessionFactory
 @SkipForDialect(dialectClass = MySQLDialect.class, reason = "MySQL doesn't support casting to a VARCHAR(255)")
 @SkipForDialect(dialectClass = TiDBDialect.class, reason = "TiDB doesn't support casting to a VARCHAR(255)")
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner doesn't support casting to a VARCHAR(255)")
 public class ColumnTransformerTest {
 	public static final double ERROR = 0.01d;
 
@@ -96,13 +100,13 @@ public void testCollectionTransformations(SessionFactoryScope scope) {
 							.createQuery( "select s from Staff s join fetch s.integers where s.id = :id", Staff.class )
 							.setParameter( "id", 12 )
 							.uniqueResult();
-					assertThat( staffWithElements.getIntegers(), contains( 1, 2, 3, 4 ) );
+					assertThat( staffWithElements.getIntegers(), containsInAnyOrder( 1, 2, 3, 4 ) );
 
 					final Staff staffWithElements2 = session
 							.createQuery( "select s from Staff s join fetch s.integers2 where s.id = :id", Staff.class )
 							.setParameter( "id", 16 )
 							.uniqueResult();
-					assertThat( staffWithElements2.getIntegers2(), contains( 5, 6, 7, 8 ) );
+					assertThat( staffWithElements2.getIntegers2(), containsInAnyOrder( 5, 6, 7, 8 ) );
 				}
 		);
 	}
@@ -153,7 +157,12 @@ public void testStoredValues(SessionFactoryScope scope) {
 							.createNativeQuery( sqlString )
 							.getResultList();
 
-					assertThat( results, contains( 1-20, 2-20, 3-20, 4-20 ) );
+					if (scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ) {
+						assertThat( results, containsInAnyOrder( 1L - 20, 2L - 20, 3L - 20, 4L - 20 ) );
+					}
+					else {
+						assertThat( results, contains( 1 - 20, 2 - 20, 3 - 20, 4 - 20 ) );
+					}
 				}
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentInstantiatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentInstantiatorTest.java
index 31040424dbdd..f81c4c6c6864 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentInstantiatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentInstantiatorTest.java
@@ -9,13 +9,12 @@
 
 import org.hibernate.annotations.Instantiator;
 import org.hibernate.annotations.Struct;
-import org.hibernate.dialect.OracleDialect;
-import org.hibernate.dialect.PostgreSQLDialect;
 
 import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
 import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -37,8 +36,7 @@
 )
 @DomainModel(annotatedClasses = StructComponentInstantiatorTest.RecordStructHolder.class)
 @SessionFactory
-@RequiresDialect(PostgreSQLDialect.class)
-@RequiresDialect(OracleDialect.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsUserDefinedTypes.class )
 public class StructComponentInstantiatorTest {
 
 	@BeforeEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java
index ba70059896fc..baf5c6931e94 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java
@@ -47,6 +47,13 @@ protected void applySettings(StandardServiceRegistryBuilder builder) {
 		builder.applySetting( Environment.GENERATE_STATISTICS, "true" );
 	}
 
+	@Test
+	void testJoining() {
+		sessionFactory().inTransaction( (session) -> {
+			session.createQuery( "select u from User u join u.person p" ).list();
+		} );
+	}
+
 	@Override
 	public MetadataImplementor produceModel(StandardServiceRegistry serviceRegistry) {
 		MetadataImplementor metadata = super.produceModel( serviceRegistry );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java
index d9791e5d4cc2..696bbb7e958f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java
@@ -7,7 +7,9 @@
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -22,6 +24,7 @@
 		xmlMappings = "org/hibernate/orm/test/compositeelement/Parent.hbm.xml"
 )
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsJdbcEscapes.class )
 public class CompositeElementTest {
 
 	@AfterEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyIdClassFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyIdClassFKTest.java
index 3208f5d3a77c..bae543926829 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyIdClassFKTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyIdClassFKTest.java
@@ -8,8 +8,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterAll;
@@ -35,6 +37,7 @@
 		OneToManyIdClassFKTest.Location.class
 } )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-16274" )
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class )
 public class OneToManyIdClassFKTest {
 	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest.java
index 93ecabe7b05d..95d1f4233d5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest.java
@@ -14,6 +14,7 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.HANADialect;
@@ -39,7 +40,7 @@ public class ConstraintInterpretationTest {
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
 				// DB2 and Informix error messages don't contain the primary key constraint name
-				if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof InformixDialect) ) {
+				if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof InformixDialect) && !(scope.getDialect() instanceof SpannerPostgreSQLDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );
 				}
 			}
@@ -66,7 +67,7 @@ public class ConstraintInterpretationTest {
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
 				// DB2 error message doesn't contain constraint or column name
-				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
+				if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof SpannerPostgreSQLDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );
 				}
 			}
@@ -82,7 +83,7 @@ public class ConstraintInterpretationTest {
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.UNIQUE, cve.getKind() );
 				// DB2 error message doesn't contain unique constraint name
-				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
+				if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof SpannerPostgreSQLDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );
 				}
 			}
@@ -97,7 +98,7 @@ public class ConstraintInterpretationTest {
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.CHECK, cve.getKind() );
 				// CockroachDB error messages don't contain the check constraint name
-				if ( !(scope.getDialect() instanceof CockroachDialect) ) {
+				if ( !(scope.getDialect() instanceof CockroachDialect) && !(scope.getDialect() instanceof SpannerPostgreSQLDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "namecheck" ) );
 				}
 			}
@@ -112,7 +113,7 @@ public class ConstraintInterpretationTest {
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.FOREIGN_KEY, cve.getKind() );
 				// HANA error messages don't contain the foreign key constraint name
-				if ( !(scope.getDialect() instanceof HANADialect) ) {
+				if ( !(scope.getDialect() instanceof HANADialect) && !(scope.getDialect() instanceof SpannerPostgreSQLDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id2to1fk" ) );
 				}
 			}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest2.java
index 11f92f02eb60..7f5d257377c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest2.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintInterpretationTest2.java
@@ -14,6 +14,7 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.HANADialect;
@@ -38,7 +39,7 @@ public class ConstraintInterpretationTest2 {
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
 				// DB2 and Informix error messages don't contain the primary key constraint name
-				if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof InformixDialect) ) {
+				if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof InformixDialect) && !(scope.getDialect() instanceof SpannerPostgreSQLDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "id" ) );
 				}
 			}
@@ -65,7 +66,7 @@ public class ConstraintInterpretationTest2 {
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.NOT_NULL, cve.getKind() );
 				// DB2 error message doesn't contain constraint or column name
-				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
+				if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof SpannerPostgreSQLDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "name" ) );
 				}
 			}
@@ -81,7 +82,7 @@ public class ConstraintInterpretationTest2 {
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.UNIQUE, cve.getKind() );
 				// DB2 error message doesn't contain unique constraint name
-				if ( !(scope.getDialect() instanceof DB2Dialect) ) {
+				if ( !(scope.getDialect() instanceof DB2Dialect) && !(scope.getDialect() instanceof SpannerPostgreSQLDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().contains( "ssnuk" ) );
 				}
 			}
@@ -97,7 +98,7 @@ public class ConstraintInterpretationTest2 {
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.CHECK, cve.getKind() );
 				// CockroachDB error messages don't contain the check constraint name
-				if ( !(scope.getDialect() instanceof CockroachDialect) ) {
+				if ( !(scope.getDialect() instanceof CockroachDialect) && !(scope.getDialect() instanceof SpannerPostgreSQLDialect) ) {
 					assertTrue( cve.getConstraintName().toLowerCase().endsWith( "namecheck" ) );
 				}
 			}
@@ -112,7 +113,7 @@ public class ConstraintInterpretationTest2 {
 			catch (ConstraintViolationException cve) {
 				assertEquals( ConstraintViolationException.ConstraintKind.FOREIGN_KEY, cve.getKind() );
 				// HANA error messages don't contain the foreign key constraint name
-				if ( !(scope.getDialect() instanceof HANADialect) ) {
+				if ( !(scope.getDialect() instanceof HANADialect) && !(scope.getDialect() instanceof SpannerPostgreSQLDialect) ) {
 					assertTrue(  cve.getConstraintName().toLowerCase().endsWith( "id2to1fk" ) );
 				}
 			}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java
index 59ca8ea899db..8b3a20e59dd8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ConstraintTest.java
@@ -15,6 +15,7 @@
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Index;
 import org.hibernate.mapping.UniqueKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -99,6 +100,13 @@ else if ( column.getName().equals( "explicit_jpa" ) ) {
 						assertThat( uk.getName() ).isEqualTo( EXPLICIT_UK_NAME );
 					}
 				}
+
+				for ( Index index: table.getIndexes().values() ) {
+					if (index.isUnique()) {
+						assertThat( index.getName().length() ).isLessThanOrEqualTo( MAX_NAME_LENGTH );
+						foundCount++;
+					}
+				}
 			}
 
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedJpaComplianceTest.java
index a1ee7a547aeb..3ba8d4a10b38 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedJpaComplianceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedJpaComplianceTest.java
@@ -64,7 +64,7 @@ void testRegular(EntityManagerFactoryScope scope) {
 		} );
 	}
 
-	@Entity
+	@Entity(name = "Restaurant")
 	static class Restaurant {
 		@Id
 		@GeneratedValue
@@ -72,7 +72,7 @@ static class Restaurant {
 		String name;
 	}
 
-	@Entity
+	@Entity(name = "RestaurantWithCompositeKey")
 	@IdClass(value = RestaurantPK.class)
 	static class RestaurantWithCompositeKey {
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedOptionalityViolationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedOptionalityViolationTest.java
index b590a86f0801..231f4f5ee349 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedOptionalityViolationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedOptionalityViolationTest.java
@@ -49,7 +49,7 @@ void testRemoveDetachedProxy(SessionFactoryScope scope) {
 		scope.inTransaction( s -> assertNull( s.find( Thing.class, thing.id ) ) );
 	}
 
-	@Entity
+	@Entity(name = "Thing")
 	static class Thing {
 		@GeneratedValue
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedTest.java
index 337412c0d1db..839ecd59354b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletedetached/DeleteDetachedTest.java
@@ -74,7 +74,7 @@ public class DeleteDetachedTest {
 		});
 		scope.inTransaction(s -> assertNull(s.find(Thing.class, thing.id)));
 	}
-	@Entity
+	@Entity(name = "Thing")
 	static class Thing {
 		@GeneratedValue @Id long id;
 		@Version int version;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
index c8fb684e1f4e..64212829577b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
@@ -48,7 +48,7 @@ protected void assertGenerateExpectedSql(String expected, String sql) {
 	protected abstract LimitHandler getLimitHandler();
 
 	protected Limit getLimit() {
-		return new Limit(0, 10);
+		return new Limit(null, 10);
 	}
 
 	protected String getLimitClause() {
@@ -62,9 +62,13 @@ protected String getLimitClause() {
 			}
 			else if (hasFirstRow(limit)) {
 				return " offset " + (oflh.supportsVariableLimit() ? "?" : String.valueOf(limit.getFirstRow())) + " rows";
-			} else {
+			}
+			else if (hasMaxRows(limit)) {
 				return " fetch first " + (oflh.supportsVariableLimit() ? "?" : String.valueOf(limit.getMaxRows())) + " rows only";
 			}
+			else {
+				return "";
+			}
 		}
 		return " limit ?";
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
index d49ff139c8b6..fa57d97ca570 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
@@ -4,29 +4,15 @@
  */
 package org.hibernate.orm.test.dialect;
 
-import java.sql.BatchUpdateException;
-import java.sql.CallableStatement;
-import java.sql.SQLException;
-
 import org.hibernate.JDBCException;
 import org.hibernate.Length;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.PessimisticLockException;
-import org.hibernate.boot.model.naming.Identifier;
-import org.hibernate.boot.model.relational.QualifiedName;
-import org.hibernate.boot.model.relational.QualifiedSequenceName;
-import org.hibernate.boot.model.relational.QualifiedTableName;
-import org.hibernate.boot.model.relational.SqlStringGenerationContext;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.QueryTimeoutException;
-import org.hibernate.dialect.unique.AlterTableUniqueDelegate;
+import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.exception.LockAcquisitionException;
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
-import org.hibernate.mapping.Table;
-import org.hibernate.mapping.UniqueKey;
-
 import org.hibernate.metamodel.mapping.internal.SqlTypedMappingImpl;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
@@ -34,14 +20,17 @@
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.junit.jupiter.api.Test;
-
 import org.mockito.Mockito;
 
-import static org.hamcrest.core.Is.is;
+import java.sql.BatchUpdateException;
+import java.sql.CallableStatement;
+import java.sql.SQLException;
+
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
@@ -137,23 +126,6 @@ public void testGetAlterTableString() {
 		assertEquals("alter table if exists table_name", dialect.getAlterTableString( "table_name" ));
 	}
 
-	@Test
-	@JiraKey( value = "HHH-16252" )
-	public void testAlterTableDropConstraintString() {
-		PostgreSQLDialect dialect = new PostgreSQLDialect();
-		AlterTableUniqueDelegate alterTable = new AlterTableUniqueDelegate( dialect );
-		final Table table = new Table( "orm", "table_name" );
-		final UniqueKey uniqueKey = new UniqueKey( table );
-		uniqueKey.setName( "unique_something" );
-		final String sql = alterTable.getAlterTableToDropUniqueKeyCommand(
-				uniqueKey,
-				null,
-				new MockSqlStringGenerationContext()
-		);
-
-		assertEquals("alter table if exists table_name drop constraint if exists unique_something", sql );
-	}
-
 	@Test
 	@JiraKey( value = "HHH-18780" )
 	public void testTextVsVarchar() {
@@ -190,62 +162,4 @@ public void testTextVsVarchar() {
 		assertEquals("cast(null as text)", textNullString);
 	}
 
-	private static class MockSqlStringGenerationContext implements SqlStringGenerationContext {
-
-		@Override
-		public Dialect getDialect() {
-			return null;
-		}
-
-		@Override
-		public Identifier toIdentifier(String text) {
-			return null;
-		}
-
-		@Override
-		public Identifier getDefaultCatalog() {
-			return null;
-		}
-
-		@Override
-		public Identifier catalogWithDefault(Identifier explicitCatalogOrNull) {
-			return null;
-		}
-
-		@Override
-		public Identifier getDefaultSchema() {
-			return null;
-		}
-
-		@Override
-		public Identifier schemaWithDefault(Identifier explicitSchemaOrNull) {
-			return null;
-		}
-
-		@Override
-		public String format(QualifiedTableName qualifiedName) {
-			return qualifiedName.getTableName().render();
-		}
-
-		@Override
-		public String format(QualifiedSequenceName qualifiedName) {
-			return null;
-		}
-
-		@Override
-		public String format(QualifiedName qualifiedName) {
-			return null;
-		}
-
-		@Override
-		public String formatWithoutCatalog(QualifiedSequenceName qualifiedName) {
-			return null;
-		}
-
-		@Override
-		public boolean isMigration() {
-			return false;
-		}
-	}
-
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/PostgreSQLTruncRoundFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/PostgreSQLTruncRoundFunctionTest.java
index 00f2cfec83ce..b45307b64afd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/PostgreSQLTruncRoundFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/PostgreSQLTruncRoundFunctionTest.java
@@ -6,6 +6,7 @@
 
 import java.math.BigDecimal;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 
@@ -37,7 +38,13 @@ public void tearDown(SessionFactoryScope scope) {
 	@RequiresDialect(PostgreSQLDialect.class)
 	@RequiresDialect(value = CockroachDialect.class, majorVersion = 22, minorVersion = 2, comment = "CockroachDB didn't support the two-argument trunc before version 22.2")
 	public void testTrunc(SessionFactoryScope scope) {
-		testFunction( scope, "trunc", "floor" );
+		if (scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ) {
+			// Spanner supports two arguments trunc
+			testFunction( scope, "trunc", "trunc" );
+		}
+		else {
+			testFunction( scope, "trunc", "floor" );
+		}
 	}
 
 	@Test
@@ -90,7 +97,13 @@ private void testFunction(SessionFactoryScope scope, String function, String wor
 							BigDecimal.class
 					).getSingleResult().compareTo( new BigDecimal( "1.78" ) )
 			);
-			assertTrue( sqlStatementInspector.getSqlQueries().get( 0 ).contains( function ) );
+			if (function.equals("round") && scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ) {
+				// Spanner round doesn't support two arguments
+				assertTrue( sqlStatementInspector.getSqlQueries().get( 0 ).contains( workaround ) );
+			}
+			else {
+				assertTrue( sqlStatementInspector.getSqlQueries().get( 0 ).contains( function ) );
+			}
 		} );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java
index 809144179140..6faf0168ea17 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java
@@ -39,6 +39,7 @@
  */
 @JiraKey(value = "HHH-12973")
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSequences.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportPooledSequences.class)
 public class SequenceInformationTest extends
 		EntityManagerFactoryBasedFunctionalTest {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/HHH11866Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/HHH11866Test.java
index 4d552465fe9b..bfee79ef44ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/HHH11866Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/HHH11866Test.java
@@ -21,12 +21,11 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.internal.util.beans.BeanInfo;
+import org.hibernate.internal.util.beans.BeanInfoHelper;
+import org.hibernate.internal.util.beans.PropertyDescriptor;
 import org.junit.jupiter.api.Test;
 
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -138,19 +137,14 @@ public static abstract class SelfDirtyCheckingEntity {
 		private final Set<String> dirtyProperties = new LinkedHashSet<>();
 
 		public SelfDirtyCheckingEntity() {
-			try {
-				BeanInfo beanInfo = Introspector.getBeanInfo( getClass() );
-				PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
-				for ( PropertyDescriptor descriptor : descriptors ) {
-					Method setter = descriptor.getWriteMethod();
-					if ( setter != null ) {
-						setterToPropertyMap.put( setter.getName(), descriptor.getName() );
-					}
+			BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( getClass(), null );
+			PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+			for ( PropertyDescriptor descriptor : descriptors ) {
+				Method setter = descriptor.getWriteMethod();
+				if ( setter != null ) {
+					setterToPropertyMap.put( setter.getName(), descriptor.getName() );
 				}
 			}
-			catch (IntrospectionException e) {
-				throw new IllegalStateException( e );
-			}
 		}
 
 		public Set<String> getDirtyProperties() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableSameNestedNameSelectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableSameNestedNameSelectionTest.java
new file mode 100644
index 000000000000..93e99dad023b
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableSameNestedNameSelectionTest.java
@@ -0,0 +1,222 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.embeddable;
+
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Tuple;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(annotatedClasses = {
+		EmbeddableSameNestedNameSelectionTest.Material.class,
+		EmbeddableSameNestedNameSelectionTest.Weight.class,
+		EmbeddableSameNestedNameSelectionTest.Length.class
+})
+@SessionFactory
+@Jira("https://hibernate.atlassian.net/browse/HHH-19962")
+@Jira("https://hibernate.atlassian.net/browse/HHH-19985")
+public class EmbeddableSameNestedNameSelectionTest {
+
+	@Test
+	void testPlainEntity(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final var result = session.createSelectionQuery( "from Material", Material.class )
+					.getSingleResult();
+			assertThat( result.getWeight().getValue() ).isEqualTo( "10" );
+			assertThat( result.getLength().getValue() ).isEqualTo( "2" );
+		} );
+	}
+
+	@Test
+	void testSubqueryEmbedded(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final var result = session.createSelectionQuery(
+					"select q.weight as weight, q.length as length from (select m.weight as weight, m.length as length from Material m) q",
+					Tuple.class
+			).getSingleResult();
+			assertEmbeddedTuple( result );
+		} );
+	}
+
+	@Test
+	void testEmbedded(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final var result = session.createSelectionQuery(
+					"select m.weight as weight, m.length as length from Material m",
+					Tuple.class
+			).getSingleResult();
+			assertEmbeddedTuple( result );
+		} );
+	}
+
+	private void assertEmbeddedTuple(Tuple result) {
+		final var weight = result.get( "weight", Weight.class );
+		assertThat( weight.getValue() ).isEqualTo( "10" );
+		assertThat( weight.getUnit() ).isEqualTo( WeightUnit.KILOGRAM );
+		final var length = result.get( "length", Length.class );
+		assertThat( length.getValue() ).isEqualTo( "2" );
+		assertThat( length.getUnit() ).isEqualTo( LengthUnit.METER );
+	}
+
+	@Test
+	void testSubqueryScalar(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final var result = session.createSelectionQuery(
+					"select q.weight, q.weight_unit, q.length, q.length_unit from "
+					+ "(select m.weight.value as weight, m.weight.unit as weight_unit, m.length.value as length, m.length.unit as length_unit from Material m) q",
+					Tuple.class
+			).getSingleResult();
+			assertScalarTuple( result );
+		} );
+	}
+
+	@Test
+	void testScalar(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final var result = session.createSelectionQuery(
+					"select m.weight.value, m.weight.unit, m.length.value, m.length.unit from Material m",
+					Tuple.class
+			).getSingleResult();
+			assertScalarTuple( result );
+		} );
+	}
+
+	private void assertScalarTuple(Tuple result) {
+		assertThat( result.get( 0, String.class ) ).isEqualTo( "10" );
+		assertThat( result.get( 1, WeightUnit.class ) ).isEqualTo( WeightUnit.KILOGRAM );
+		assertThat( result.get( 2, String.class ) ).isEqualTo( "2" );
+		assertThat( result.get( 3, LengthUnit.class ) ).isEqualTo( LengthUnit.METER );
+	}
+
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> session.persist(
+				new Material( 1L, new Weight( "10", WeightUnit.KILOGRAM ), new Length( "2", LengthUnit.METER ) )
+		) );
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+	}
+
+	@Entity(name = "Material")
+	static class Material {
+		@Id
+		private Long id;
+
+		@Embedded
+		@AttributeOverrides({
+				@AttributeOverride(name = "value", column = @Column(name = "weight_value")),
+				@AttributeOverride(name = "unit", column = @Column(name = "weight_unit")),
+		})
+		private Weight weight;
+
+		@Embedded
+		@AttributeOverrides({
+				@AttributeOverride(name = "value", column = @Column(name = "length_value")),
+				@AttributeOverride(name = "unit", column = @Column(name = "length_unit")),
+		})
+		private Length length;
+
+		public Material() {
+		}
+
+		public Material(Long id, Weight weight, Length length) {
+			this.id = id;
+			this.weight = weight;
+			this.length = length;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public Weight getWeight() {
+			return weight;
+		}
+
+		public void setWeight(Weight weight) {
+			this.weight = weight;
+		}
+
+		public Length getLength() {
+			return length;
+		}
+
+		public void setLength(Length length) {
+			this.length = length;
+		}
+	}
+
+	@Embeddable
+	static class Weight {
+		private String value;
+
+		private WeightUnit unit;
+
+		public Weight() {
+		}
+
+		public Weight(String value, WeightUnit unit) {
+			this.value = value;
+			this.unit = unit;
+		}
+
+		public String getValue() {
+			return value;
+		}
+
+		public WeightUnit getUnit() {
+			return unit;
+		}
+	}
+
+	enum WeightUnit {
+		KILOGRAM,
+		POUND
+	}
+
+	@Embeddable
+	static class Length {
+		private String value;
+
+		private LengthUnit unit;
+
+		public Length() {
+		}
+
+		public Length(String value, LengthUnit unit) {
+			this.value = value;
+			this.unit = unit;
+		}
+
+		public String getValue() {
+			return value;
+		}
+
+		public LengthUnit getUnit() {
+			return unit;
+		}
+	}
+
+	enum LengthUnit {
+		METER,
+		FOOT
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithJavaTypeTest.java
index b077457e9ea6..a241312e6899 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithJavaTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableWithJavaTypeTest.java
@@ -48,10 +48,10 @@ public void injectSessionFactoryScope(SessionFactoryScope scope) {
 	@ValueSource(strings = {
 			"select z from EntityEmbedCustom z where embedCustom.value=:datum",
 			"select z from EntityEmbedCustom z where :datum=embedCustom.value",
-			"select z from EntityEmbedCustom z where embedCustom=:datum", // this query failed with the bug
-			"select z from EntityEmbedCustom z where :datum=embedCustom",
+			"select z from EntityEmbedCustom z where embedCustom.value=:datum", // this query failed with the bug
+			"select z from EntityEmbedCustom z where :datum=embedCustom.value",
 			"select z from EntityEmbedCustom z where embedCustom.value in (:datum)",
-			"select z from EntityEmbedCustom z where embedCustom in (:datum)" // failed as well
+			"select z from EntityEmbedCustom z where embedCustom.value in (:datum)" // failed as well
 	})
 	void hhh18898Test_embedCustom(String hql) {
 
@@ -81,10 +81,10 @@ void hhh18898Test_embedCustom(String hql) {
 	@ValueSource(strings = {
 			"select z from EntityEmbedNative z where embedNative.value=:datum",
 			"select z from EntityEmbedNative z where :datum=embedNative.value",
-			"select z from EntityEmbedNative z where embedNative=:datum", // this query failed with the bug
-			"select z from EntityEmbedNative z where :datum=embedNative",
+			"select z from EntityEmbedNative z where embedNative.value=:datum", // this query failed with the bug
+			"select z from EntityEmbedNative z where :datum=embedNative.value",
 			"select z from EntityEmbedNative z where embedNative.value in (:datum)",
-			"select z from EntityEmbedNative z where embedNative in (:datum)" // failed as well
+			"select z from EntityEmbedNative z where embedNative.value in (:datum)" // failed as well
 	})
 	void hhh18898Test_embedSingle(String hql) {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAttributeNodesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAttributeNodesTest.java
index 068068d5221e..99416d5b8e4d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAttributeNodesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAttributeNodesTest.java
@@ -12,9 +12,11 @@
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -38,6 +40,7 @@
 		}
 )
 @JiraKey("HHH-16885")
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class EntityGraphAttributeNodesTest {
 
 	private final static Integer HUMAN_ID = 1;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java
index 24d7e2b38073..2a9d6db1e37d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/ast/EntityGraphLoadPlanBuilderTest.java
@@ -24,6 +24,7 @@
 import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.from.FromClause;
 import org.hibernate.sql.ast.tree.from.LazyTableGroup;
 import org.hibernate.sql.ast.tree.from.StandardVirtualTableGroup;
@@ -383,6 +384,7 @@ private <T> SelectStatement buildSqlSelectAst(
 				loadQueryInfluencers,
 				new LockOptions( READ ),
 				jdbcParameter -> {},
+				new SqlAliasBaseManager(),
 				scope.getSessionFactory()
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/AbstractClassLevelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/AbstractClassLevelTests.java
new file mode 100644
index 000000000000..8a497a577acd
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/AbstractClassLevelTests.java
@@ -0,0 +1,104 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.entitygraph.named.parsed;
+
+import org.hibernate.DuplicateMappingException;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.model.internal.InvalidNamedEntityGraphParameterException;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.orm.test.entitygraph.named.parsed.entity.BadRootClassEntity;
+import org.hibernate.orm.test.entitygraph.named.parsed.entity.Book;
+import org.hibernate.orm.test.entitygraph.named.parsed.entity.DomesticPublishingHouse;
+import org.hibernate.orm.test.entitygraph.named.parsed.entity.Duplicator;
+import org.hibernate.orm.test.entitygraph.named.parsed.entity.ForeignPublishingHouse;
+import org.hibernate.orm.test.entitygraph.named.parsed.entity.Isbn;
+import org.hibernate.orm.test.entitygraph.named.parsed.entity.Person;
+import org.hibernate.orm.test.entitygraph.named.parsed.entity.Publisher;
+import org.hibernate.orm.test.entitygraph.named.parsed.entity.PublishingHouse;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.DomainModelScope;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.ServiceRegistryScope;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.orm.test.entitygraph.parser.AssertionHelper.assertBasicAttributes;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * Test for Hibernate's {@link org.hibernate.annotations.NamedEntityGraph @NamedEntityGraph}
+ *
+ * @author Steve Ebersole
+ */
+@SuppressWarnings("JUnitMalformedDeclaration")
+public abstract class AbstractClassLevelTests {
+
+	@Test
+	@DomainModel(annotatedClasses = {
+			Book.class,
+			Person.class,
+			Publisher.class,
+			PublishingHouse.class,
+			DomesticPublishingHouse.class,
+			ForeignPublishingHouse.class,
+			Isbn.class
+
+	})
+	@SessionFactory(exportSchema = false)
+	void testRegistrations(SessionFactoryScope factoryScope) {
+		final SessionFactoryImplementor sessionFactory = factoryScope.getSessionFactory();
+
+		assertBasicAttributes( sessionFactory.findEntityGraphByName( "book-title-isbn" ), "title", "isbn" );
+
+		assertBasicAttributes(
+				sessionFactory.findEntityGraphByName( "book-title-isbn-author" ),
+				"title",
+				"isbn",
+				"author"
+		);
+
+		assertBasicAttributes(
+				sessionFactory.findEntityGraphByName( "book-title-isbn-editor" ),
+				"title",
+				"isbn",
+				"editor"
+		);
+
+		assertBasicAttributes(
+				sessionFactory.findEntityGraphByName( "publishing-house-bio" ),
+				"name",
+				"ceo",
+				"boardMembers"
+		);
+	}
+
+	@Test
+	@DomainModel(annotatedClasses = BadRootClassEntity.class)
+	void testRootEntityDifferentFromEntityMarkedWithAnnotation(DomainModelScope modelScope) {
+		final MetadataImplementor domainModel = modelScope.getDomainModel();
+
+		try (org.hibernate.SessionFactory sessionFactory = domainModel.buildSessionFactory()) {
+			fail( "Expecting an exception" );
+		}
+		catch (InvalidNamedEntityGraphParameterException expected) {
+		}
+	}
+
+	@Test
+	@ServiceRegistry
+	void testDuplicateNames(ServiceRegistryScope registryScope) {
+		final MetadataSources metadataSources = new MetadataSources( registryScope.getRegistry() )
+				.addAnnotatedClasses( Duplicator.class );
+		try {
+			metadataSources.buildMetadata();
+			fail( "Expecting a failure" );
+		}
+		catch (DuplicateMappingException expected) {
+		}
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/AbstractPackageLevelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/AbstractPackageLevelTests.java
new file mode 100644
index 000000000000..39f34fd01327
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/AbstractPackageLevelTests.java
@@ -0,0 +1,46 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.entitygraph.named.parsed;
+
+import org.hibernate.DuplicateMappingException;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.orm.test.entitygraph.named.parsed.pckgwithgraphnameduplication.Duplicator;
+
+import org.hibernate.testing.orm.junit.ServiceRegistryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.hibernate.orm.test.entitygraph.parser.AssertionHelper.assertBasicAttributes;
+
+
+/**
+ * @author Steve Ebersole
+ */
+@SuppressWarnings("JUnitMalformedDeclaration")
+public abstract class AbstractPackageLevelTests {
+	protected static void assertBasicGraph(SessionFactoryImplementor sessionFactory, String name, String... names) {
+		RootGraphImplementor<?> graph = sessionFactory.findEntityGraphByName( name );
+		assertThat( graph.getName() ).isEqualTo( name );
+		assertBasicAttributes( graph, names );
+	}
+
+	@Test
+	void testDuplication(ServiceRegistryScope registryScope) {
+		final StandardServiceRegistry serviceRegistry = registryScope.getRegistry();
+		try {
+			new MetadataSources( serviceRegistry )
+					.addAnnotatedClass( Duplicator.class )
+					.addPackage( "org.hibernate.orm.test.entitygraph.named.parsed.pckgwithgraphnameduplication" )
+					.buildMetadata();
+			fail( "Expected an exception" );
+		}
+		catch (DuplicateMappingException expected) {
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/ClassLevelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/ClassLevelTests.java
index 2051af3f2f86..d0ff442e3fa9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/ClassLevelTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/ClassLevelTests.java
@@ -4,87 +4,12 @@
  */
 package org.hibernate.orm.test.entitygraph.named.parsed;
 
-import org.hibernate.DuplicateMappingException;
-import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.graph.InvalidGraphException;
-import org.hibernate.orm.test.entitygraph.named.parsed.entity.Book;
-import org.hibernate.orm.test.entitygraph.named.parsed.entity.DomesticPublishingHouse;
-import org.hibernate.orm.test.entitygraph.named.parsed.entity.Duplicator;
-import org.hibernate.orm.test.entitygraph.named.parsed.entity.ForeignPublishingHouse;
-import org.hibernate.orm.test.entitygraph.named.parsed.entity.InvalidParsedGraphEntity;
-import org.hibernate.orm.test.entitygraph.named.parsed.entity.Isbn;
-import org.hibernate.orm.test.entitygraph.named.parsed.entity.Person;
-import org.hibernate.orm.test.entitygraph.named.parsed.entity.Publisher;
-import org.hibernate.orm.test.entitygraph.named.parsed.entity.PublishingHouse;
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.DomainModelScope;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.ServiceRegistryScope;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.junit.jupiter.api.Test;
-
-import static org.hibernate.orm.test.entitygraph.parser.AssertionHelper.assertBasicAttributes;
-import static org.junit.jupiter.api.Assertions.fail;
-
-/**
- * Test for Hibernate's {@link org.hibernate.annotations.NamedEntityGraph @NamedEntityGraph}
- *
- * @author Steve Ebersole
- */
-@SuppressWarnings("JUnitMalformedDeclaration")
-public class ClassLevelTests {
-
-	@Test
-	@DomainModel(annotatedClasses = {
-			Book.class,
-			Person.class,
-			Publisher.class,
-			PublishingHouse.class,
-			DomesticPublishingHouse.class,
-			ForeignPublishingHouse.class,
-			Isbn.class
+import org.hibernate.cfg.AvailableSettings;
 
-	})
-	@SessionFactory(exportSchema = false)
-	void testRegistrations(SessionFactoryScope factoryScope) {
-		final SessionFactoryImplementor sessionFactory = factoryScope.getSessionFactory();
-
-		assertBasicAttributes( sessionFactory.findEntityGraphByName( "book-title-isbn" ), "title", "isbn" );
-		assertBasicAttributes( sessionFactory.findEntityGraphByName( "book-title-isbn-author" ), "title", "isbn", "author" );
-		assertBasicAttributes( sessionFactory.findEntityGraphByName( "book-title-isbn-editor" ), "title", "isbn", "editor" );
-
-		assertBasicAttributes( sessionFactory.findEntityGraphByName( "publishing-house-bio" ), "name",  "ceo", "boardMembers" );
-	}
-
-	@Test
-	@DomainModel(annotatedClasses = InvalidParsedGraphEntity.class)
-	void testInvalidParsedGraph(DomainModelScope modelScope) {
-		final MetadataImplementor domainModel = modelScope.getDomainModel();
-		try {
-			try (org.hibernate.SessionFactory sessionFactory = domainModel.buildSessionFactory()) {
-				fail( "Expecting an exception" );
-			}
-			catch (InvalidGraphException expected) {
-			}
-		}
-		catch (InvalidGraphException expected) {
-		}
-	}
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.Setting;
 
-	@Test
-	@ServiceRegistry
-	void testDuplicateNames(ServiceRegistryScope registryScope) {
-		final MetadataSources metadataSources = new MetadataSources( registryScope.getRegistry() )
-				.addAnnotatedClasses( Duplicator.class );
-		try {
-			metadataSources.buildMetadata();
-			fail( "Expecting a failure" );
-		}
-		catch (DuplicateMappingException expected) {
-		}
-	}
+@ServiceRegistry(settings = @Setting(name = AvailableSettings.GRAPH_PARSER_MODE, value = "modern"))
+public class ClassLevelTests extends AbstractClassLevelTests {
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/LegacySyntaxClassLevelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/LegacySyntaxClassLevelTests.java
new file mode 100644
index 000000000000..bdf0d6922138
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/LegacySyntaxClassLevelTests.java
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.entitygraph.named.parsed;
+
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.graph.InvalidGraphException;
+import org.hibernate.orm.test.entitygraph.named.parsed.entity.InvalidParsedGraphEntity;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.DomainModelScope;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+@ServiceRegistry(settings = @Setting(name = AvailableSettings.GRAPH_PARSER_MODE, value = "legacy"))
+public class LegacySyntaxClassLevelTests extends AbstractClassLevelTests {
+	@Test
+	@DomainModel(annotatedClasses = InvalidParsedGraphEntity.class)
+	void testInvalidParsedGraph(DomainModelScope modelScope) {
+		final MetadataImplementor domainModel = modelScope.getDomainModel();
+		try {
+			try (org.hibernate.SessionFactory sessionFactory = domainModel.buildSessionFactory()) {
+				fail( "Expecting an exception" );
+			}
+			catch (InvalidGraphException expected) {
+			}
+		}
+		catch (InvalidGraphException expected) {
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/LegacySyntaxPackageLevelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/LegacySyntaxPackageLevelTests.java
new file mode 100644
index 000000000000..8fe6ac35c750
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/LegacySyntaxPackageLevelTests.java
@@ -0,0 +1,56 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.entitygraph.named.parsed;
+
+import org.hibernate.boot.model.internal.InvalidNamedEntityGraphParameterException;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.orm.test.entitygraph.named.parsed.pkg.Book;
+import org.hibernate.orm.test.entitygraph.named.parsed.pkg.Isbn;
+import org.hibernate.orm.test.entitygraph.named.parsed.pkg.Person;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.DomainModelScope;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+@ServiceRegistry(settings = @Setting(name = AvailableSettings.GRAPH_PARSER_MODE, value = "legacy"))
+public class LegacySyntaxPackageLevelTests extends AbstractPackageLevelTests {
+
+	@Test
+	@DomainModel(
+			annotatedClasses = { Book.class, Isbn.class, Person.class },
+			annotatedPackageNames = "org.hibernate.orm.test.entitygraph.named.parsed.pkg"
+	)
+	@SessionFactory(exportSchema = false)
+	void testDiscovery(SessionFactoryScope factoryScope) {
+		final SessionFactoryImplementor sessionFactory = factoryScope.getSessionFactory();
+
+		assertBasicGraph( sessionFactory, "book-title-isbn", "title", "isbn" );
+		assertBasicGraph( sessionFactory, "book-title-isbn-author", "title", "isbn", "author" );
+		assertBasicGraph( sessionFactory, "book-title-isbn-editor", "title", "isbn", "editor" );
+		assertBasicGraph( sessionFactory, "book-title-with-root-attribute", "title" );
+		assertBasicGraph( sessionFactory, "book-title-with-root-attribute-and-type-indicator", "title" );
+	}
+
+	@Test
+	@DomainModel(
+			annotatedClasses = Person.class,
+			annotatedPackageNames = "org.hibernate.orm.test.entitygraph.named.parsed.pkg2"
+	)
+	void testInvalid(DomainModelScope modelScope) {
+		try (org.hibernate.SessionFactory sessionFactory = modelScope.getDomainModel().buildSessionFactory()) {
+			fail( "Expected an exception" );
+		}
+		catch (InvalidNamedEntityGraphParameterException expected) {
+		}
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/PackageLevelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/PackageLevelTests.java
index 97ef1080c219..fa9048f6a1c0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/PackageLevelTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/PackageLevelTests.java
@@ -4,78 +4,47 @@
  */
 package org.hibernate.orm.test.entitygraph.named.parsed;
 
-import org.hibernate.DuplicateMappingException;
-import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.model.internal.InvalidNamedEntityGraphParameterException;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.graph.InvalidGraphException;
-import org.hibernate.graph.spi.RootGraphImplementor;
-import org.hibernate.orm.test.entitygraph.named.parsed.pkg.Book;
-import org.hibernate.orm.test.entitygraph.named.parsed.pkg.Duplicator;
-import org.hibernate.orm.test.entitygraph.named.parsed.pkg.Isbn;
-import org.hibernate.orm.test.entitygraph.named.parsed.pkg.Person;
+import org.hibernate.orm.test.entitygraph.named.parsed.pkg3.Book;
+import org.hibernate.orm.test.entitygraph.named.parsed.pkg3.Person;
+
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.DomainModelScope;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
-import static org.hibernate.orm.test.entitygraph.parser.AssertionHelper.assertBasicAttributes;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-/**
- * @author Steve Ebersole
- */
-@SuppressWarnings("JUnitMalformedDeclaration")
-public class PackageLevelTests {
+@ServiceRegistry(settings = @Setting(name = AvailableSettings.GRAPH_PARSER_MODE, value = "modern"))
+public class PackageLevelTests extends AbstractPackageLevelTests {
+
 	@Test
 	@DomainModel(
-			annotatedClasses = { Book.class, Isbn.class, Person.class },
-			annotatedPackageNames = "org.hibernate.orm.test.entitygraph.named.parsed.pkg"
+			annotatedPackageNames = "org.hibernate.orm.test.entitygraph.named.parsed.pkg2"
 	)
-	@SessionFactory(exportSchema = false)
-	void testDiscovery(SessionFactoryScope factoryScope) {
-		final SessionFactoryImplementor sessionFactory = factoryScope.getSessionFactory();
-
-		assertBasicGraph( sessionFactory, "book-title-isbn", "title", "isbn" );
-		assertBasicGraph( sessionFactory, "book-title-isbn-author", "title", "isbn", "author" );
-		assertBasicGraph( sessionFactory, "book-title-isbn-editor", "title", "isbn", "editor" );
-	}
-
-	private static void assertBasicGraph(SessionFactoryImplementor sessionFactory, String name, String... names) {
-		RootGraphImplementor<?> graph = sessionFactory.findEntityGraphByName( name );
-		assertEquals( name, graph.getName() );
-		assertBasicAttributes( graph, names );
-	}
-
-	@Test
-	@ServiceRegistry
-	void testDuplication(ServiceRegistryScope registryScope) {
-		final StandardServiceRegistry serviceRegistry = registryScope.getRegistry();
-		try {
-			new MetadataSources( serviceRegistry )
-					.addAnnotatedClass( Duplicator.class )
-					.addPackage( "org.hibernate.orm.test.entitygraph.named.parsed.pkg" )
-					.buildMetadata();
+	void givenModernGraphParserModeShouldThrowExceptionWhenUsingAnnotationsWithoutRootAttribute(DomainModelScope modelScope) {
+		try (org.hibernate.SessionFactory sessionFactory = modelScope.getDomainModel().buildSessionFactory()) {
 			fail( "Expected an exception" );
 		}
-		catch (DuplicateMappingException expected) {
+		catch (InvalidNamedEntityGraphParameterException expected) {
 		}
 	}
 
 	@Test
 	@DomainModel(
-			annotatedClasses = Person.class,
-			annotatedPackageNames = "org.hibernate.orm.test.entitygraph.named.parsed.pkg2"
+			annotatedClasses = { Book.class, Person.class },
+			annotatedPackageNames = "org.hibernate.orm.test.entitygraph.named.parsed.pkg3"
 	)
-	void testInvalid(DomainModelScope modelScope) {
-		try (org.hibernate.SessionFactory sessionFactory = modelScope.getDomainModel().buildSessionFactory()) {
-			fail( "Expected an exception" );
-		}
-		catch (InvalidGraphException expected) {
-		}
+	@SessionFactory(exportSchema = false)
+	void givenModernGraphParserModeShouldParseGraphCorrectlyWhenRootAttributeIsValid(SessionFactoryScope factoryScope) {
+		final SessionFactoryImplementor sessionFactory = factoryScope.getSessionFactory();
+
+		assertBasicGraph( sessionFactory, "book-title-with-root-attribute", "title" );
+		assertBasicGraph( sessionFactory, "book-title-author-editor-with-root-attribute", "title", "author", "editor" );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/entity/BadRootClassEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/entity/BadRootClassEntity.java
new file mode 100644
index 000000000000..5d0b1c2d7cd3
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/entity/BadRootClassEntity.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.entitygraph.named.parsed.entity;
+
+
+import org.hibernate.annotations.NamedEntityGraph;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+@Entity(name = "BadRootClassEntity")
+@Table(name = "BadRootClassEntity")
+@NamedEntityGraph(root = Book.class, name = "bad-root", graph = "name")
+public class BadRootClassEntity {
+	@Id
+	private Integer id;
+	private String name;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/entity/GraphWithRootClassEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/entity/GraphWithRootClassEntity.java
new file mode 100644
index 000000000000..8dcf720e7ac5
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/entity/GraphWithRootClassEntity.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.entitygraph.named.parsed.entity;
+
+import org.hibernate.annotations.NamedEntityGraph;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+
+@Entity(name = "GraphWithRootClassEntity")
+@Table(name = "GraphWithRootClassEntity")
+@NamedEntityGraph(root = GraphWithRootClassEntity.class, name = "valid-root-on-annotation", graph = "name")
+public class GraphWithRootClassEntity {
+	@Id
+	private Integer id;
+	private String name;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/package-info.java
index 69e50c2adc2b..cc08bcd63baa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Testing of Hibernate's {@linkplain org.hibernate.annotations.NamedEntityGraph}.
- * <p/>
+ * <p>
  * We really only test the discovery and basic interpretation of the
  * annotations here, since robust testing of the application of graphs
  * is handled elsewhere.
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg/Duplicator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pckgwithgraphnameduplication/Duplicator.java
similarity index 81%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg/Duplicator.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pckgwithgraphnameduplication/Duplicator.java
index 266c3388bd75..47d1b4386219 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg/Duplicator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pckgwithgraphnameduplication/Duplicator.java
@@ -2,18 +2,19 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.entitygraph.named.parsed.pkg;
+package org.hibernate.orm.test.entitygraph.named.parsed.pckgwithgraphnameduplication;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Basic;
+
 import org.hibernate.annotations.NamedEntityGraph;
 
 /**
  * @author Steve Ebersole
  */
 @Entity
-@NamedEntityGraph( name = "duplicated-name", graph = "name")
+@NamedEntityGraph(name = "duplicated-name", graph = "name")
 public class Duplicator {
 	@Id
 	private Integer id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pckgwithgraphnameduplication/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pckgwithgraphnameduplication/package-info.java
new file mode 100644
index 000000000000..22f4097ad12d
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pckgwithgraphnameduplication/package-info.java
@@ -0,0 +1,9 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+
+@NamedEntityGraph(root = Duplicator.class, name = "duplicated-name", graph = "name")
+package org.hibernate.orm.test.entitygraph.named.parsed.pckgwithgraphnameduplication;
+
+import org.hibernate.annotations.NamedEntityGraph;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg/package-info.java
index c0dfa7ae3ed0..a5b0a69d6273 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg/package-info.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg/package-info.java
@@ -7,10 +7,12 @@
  * @author Steve Ebersole
  */
 
-@NamedEntityGraph( name = "book-title-isbn", graph = "Book: title, isbn")
-@NamedEntityGraph( name = "book-title-isbn-author", graph = "Book: title, isbn, author")
-@NamedEntityGraph( name = "book-title-isbn-editor", graph = "Book: title, isbn, editor")
-@NamedEntityGraph( name = "duplicated-name", graph = "Book: title")
+@NamedEntityGraph(name = "book-title-isbn", graph = "Book: title, isbn")
+@NamedEntityGraph(name = "book-title-isbn-author", graph = "Book: title, isbn, author")
+@NamedEntityGraph(name = "book-title-isbn-editor", graph = "Book: title, isbn, editor")
+@NamedEntityGraph(name = "duplicated-name", graph = "Book: title")
+@NamedEntityGraph(root = Book.class, name = "book-title-with-root-attribute", graph = "title")
+@NamedEntityGraph(root = Book.class, name = "book-title-with-root-attribute-and-type-indicator", graph = "Book: title")
 package org.hibernate.orm.test.entitygraph.named.parsed.pkg;
 
 import org.hibernate.annotations.NamedEntityGraph;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg3/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg3/Book.java
new file mode 100644
index 000000000000..a3ef9e8d1ef8
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg3/Book.java
@@ -0,0 +1,26 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.entitygraph.named.parsed.pkg3;
+
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+
+@Entity
+public class Book {
+	@Id
+	private Integer id;
+	private String title;
+
+	@ManyToOne
+	@JoinColumn(name = "author_fk")
+	Person author;
+
+	@ManyToOne
+	@JoinColumn(name = "editor_fk")
+	Person editor;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg3/Person.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg3/Person.java
new file mode 100644
index 000000000000..1d07faceabd9
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg3/Person.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.entitygraph.named.parsed.pkg3;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+@Entity
+public class Person {
+	@Id
+	private Integer id;
+	private String name;
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg3/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg3/package-info.java
new file mode 100644
index 000000000000..90c91a5787b2
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/named/parsed/pkg3/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+
+
+@NamedEntityGraph(root = Book.class, name = "book-title-with-root-attribute", graph = "title")
+@NamedEntityGraph(root = Book.class, name = "book-title-author-editor-with-root-attribute", graph = "title, author, editor")
+package org.hibernate.orm.test.entitygraph.named.parsed.pkg3;
+
+import org.hibernate.annotations.NamedEntityGraph;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphParserTest.java
new file mode 100644
index 000000000000..54316908f7cf
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphParserTest.java
@@ -0,0 +1,250 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.entitygraph.parser;
+
+import jakarta.persistence.AttributeNode;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.Subgraph;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.graph.GraphParser;
+import org.hibernate.graph.spi.AttributeNodeImplementor;
+import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.graph.spi.SubGraphImplementor;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+/**
+ * A unit test of {@link GraphParser}.
+ *
+ * @author asusnjar
+ */
+public abstract class AbstractEntityGraphParserTest extends AbstractEntityGraphTest {
+
+	@Test
+	public void testNullParsing(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> graph = parseGraph( null, scope );
+		assertThat( graph ).isNull();
+	}
+
+	@Test
+	public void testOneBasicAttributeParsing(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "name", scope );
+		AssertionHelper.assertBasicAttributes( graph, "name" );
+	}
+
+	@Test
+	public void testTwoBasicAttributesParsing(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "name, description", scope );
+		AssertionHelper.assertBasicAttributes( graph, "name", "description" );
+	}
+
+	@Test
+	public void testLinkParsing(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "linkToOne(name, description)", scope );
+		assertThat( graph ).isNotNull();
+
+		List<AttributeNode<?>> attrs = graph.getAttributeNodes();
+		assertThat( attrs ).isNotNull();
+
+		assertThat( attrs.size() ).isEqualTo( 1 );
+		AttributeNode<?> node = attrs.get( 0 );
+		assertThat( node ).isNotNull();
+		assertThat( node.getAttributeName() ).isEqualTo( "linkToOne" );
+		AssertionHelper.assertNullOrEmpty( node.getKeySubgraphs() );
+		@SuppressWarnings("rawtypes")
+		Map<Class, Subgraph> sub = node.getSubgraphs();
+		AssertionHelper.assertBasicAttributes( sub.get( GraphParsingTestEntity.class ), "name", "description" );
+	}
+
+	@Test
+	public void testMapKeyParsing(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "map.key(name, description)", scope );
+		assertThat( graph ).isNotNull();
+		List<AttributeNode<?>> attrs = graph.getAttributeNodes();
+		assertThat( attrs ).isNotNull();
+		assertThat( attrs.size() ).isEqualTo( 1 );
+		AttributeNode<?> node = attrs.get( 0 );
+		assertThat( node ).isNotNull();
+		assertThat( node.getAttributeName() ).isEqualTo( "map" );
+		AssertionHelper.assertNullOrEmpty( node.getSubgraphs() );
+		@SuppressWarnings("rawtypes")
+		Map<Class, Subgraph> sub = node.getKeySubgraphs();
+		AssertionHelper.assertBasicAttributes( sub.get( GraphParsingTestEntity.class ), "name", "description" );
+	}
+
+	@Test
+	public void testMapValueParsing(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "map.value(name, description)", scope );
+		assertThat( graph ).isNotNull();
+		List<AttributeNode<?>> attrs = graph.getAttributeNodes();
+		assertThat( attrs ).isNotNull();
+		assertThat( attrs.size() ).isEqualTo( 1 );
+		AttributeNode<?> node = attrs.get( 0 );
+		assertThat( node ).isNotNull();
+		assertThat( node.getAttributeName() ).isEqualTo( "map" );
+		AssertionHelper.assertNullOrEmpty( node.getKeySubgraphs() );
+		@SuppressWarnings("rawtypes")
+		Map<Class, Subgraph> sub = node.getSubgraphs();
+		AssertionHelper.assertBasicAttributes( sub.get( GraphParsingTestEntity.class ), "name", "description" );
+	}
+
+	@Test
+	public void testMixParsingWithMaps(EntityManagerFactoryScope scope) {
+		String g = " name , linkToOne ( description, map . key ( name ) , map . value ( description ) , name ) , description , map . key ( name , description ) , map . value ( description ) ";
+		g = g.replace( " ", "       " );
+		for ( int i = 1; i <= 2; i++, g = g.replace( " ", "" ) ) {
+			EntityGraph<GraphParsingTestEntity> graph = parseGraph( g, scope );
+			AssertionHelper.assertBasicAttributes( graph, "name", "description" );
+
+			AttributeNode<?> linkToOne = AssertionHelper.getAttributeNodeByName( graph, "linkToOne", true );
+			AssertionHelper.assertNullOrEmpty( linkToOne.getKeySubgraphs() );
+			@SuppressWarnings("rawtypes")
+			Map<Class, Subgraph> linkToOneSubgraphs = linkToOne.getSubgraphs();
+			@SuppressWarnings("rawtypes")
+			Subgraph linkToOneRoot = linkToOneSubgraphs.get( GraphParsingTestEntity.class );
+			AssertionHelper.assertBasicAttributes( linkToOneRoot, "name", "description" );
+
+			AttributeNode<?> linkToOneMap = AssertionHelper.getAttributeNodeByName( linkToOneRoot, "map", true );
+			@SuppressWarnings("rawtypes")
+			Map<Class, Subgraph> linkToOneMapKeySubgraphs = linkToOneMap.getKeySubgraphs();
+			@SuppressWarnings("rawtypes")
+			Subgraph linkToOneMapKeyRoot = linkToOneMapKeySubgraphs.get( GraphParsingTestEntity.class );
+			AssertionHelper.assertBasicAttributes( linkToOneMapKeyRoot, "name" );
+			@SuppressWarnings("rawtypes")
+			Map<Class, Subgraph> linkToOneMapSubgraphs = linkToOneMap.getSubgraphs();
+			@SuppressWarnings("rawtypes")
+			Subgraph linkToOneMapRoot = linkToOneMapSubgraphs.get( GraphParsingTestEntity.class );
+			AssertionHelper.assertBasicAttributes( linkToOneMapRoot, "description" );
+
+			AttributeNode<?> map = AssertionHelper.getAttributeNodeByName( graph, "map", true );
+			@SuppressWarnings("rawtypes")
+			Map<Class, Subgraph> mapKeySubgraphs = map.getKeySubgraphs();
+			@SuppressWarnings("rawtypes")
+			Subgraph mapKeyRoot = mapKeySubgraphs.get( GraphParsingTestEntity.class );
+			AssertionHelper.assertBasicAttributes( mapKeyRoot, "name", "description" );
+			@SuppressWarnings("rawtypes")
+			Map<Class, Subgraph> mapSubgraphs = map.getSubgraphs();
+			@SuppressWarnings("rawtypes")
+			Subgraph mapRoot = mapSubgraphs.get( GraphParsingTestEntity.class );
+			AssertionHelper.assertBasicAttributes( mapRoot, "description" );
+		}
+	}
+
+	@Test
+	public void testMixParsingWithSimplifiedMaps(EntityManagerFactoryScope scope) {
+		String g = " name , linkToOne ( description, map . key ( name )  , name ) , description , map . value ( description, name ) ";
+		g = g.replace( " ", "       " );
+		for ( int i = 1; i <= 2; i++, g = g.replace( " ", "" ) ) {
+			EntityGraph<GraphParsingTestEntity> graph = parseGraph( g, scope );
+			AssertionHelper.assertBasicAttributes( graph, "name", "description" );
+
+			AttributeNode<?> linkToOne = AssertionHelper.getAttributeNodeByName( graph, "linkToOne", true );
+			AssertionHelper.assertNullOrEmpty( linkToOne.getKeySubgraphs() );
+			@SuppressWarnings("rawtypes")
+			Map<Class, Subgraph> linkToOneSubgraphs = linkToOne.getSubgraphs();
+			@SuppressWarnings("rawtypes")
+			Subgraph linkToOneRoot = linkToOneSubgraphs.get( GraphParsingTestEntity.class );
+			AssertionHelper.assertBasicAttributes( linkToOneRoot, "name", "description" );
+
+			AttributeNode<?> linkToOneMap = AssertionHelper.getAttributeNodeByName( linkToOneRoot, "map", true );
+			@SuppressWarnings("rawtypes")
+			Map<Class, Subgraph> linkToOneMapKeySubgraphs = linkToOneMap.getKeySubgraphs();
+			@SuppressWarnings("rawtypes")
+			Subgraph linkToOneMapKeyRoot = linkToOneMapKeySubgraphs.get( GraphParsingTestEntity.class );
+			AssertionHelper.assertBasicAttributes( linkToOneMapKeyRoot, "name" );
+
+			AttributeNode<?> map = AssertionHelper.getAttributeNodeByName( graph, "map", true );
+			@SuppressWarnings("rawtypes")
+			Map<Class, Subgraph> mapSubgraphs = map.getSubgraphs();
+			@SuppressWarnings("rawtypes")
+			Subgraph mapRoot = mapSubgraphs.get( GraphParsingTestEntity.class );
+			AssertionHelper.assertBasicAttributes( mapRoot, "description", "name" );
+		}
+	}
+
+	@Test
+	public void testHHH10378IsNotFixedYet(EntityManagerFactoryScope scope) {
+		scope.inEntityManager(
+				entityManager -> {
+					RootGraphImplementor<GraphParsingTestEntity> graph = ((SessionImplementor) entityManager)
+							.createEntityGraph( GraphParsingTestEntity.class );
+					final SubGraphImplementor<GraphParsingTestSubEntity> subGraph = graph.addSubGraph(
+							"linkToOne",
+							GraphParsingTestSubEntity.class
+					);
+
+					assertThat( GraphParsingTestSubEntity.class ).isEqualTo( subGraph.getGraphedType().getJavaType() );
+
+					final AttributeNodeImplementor<?, ?, ?> subTypeAttrNode = subGraph.findOrCreateAttributeNode(
+							"sub" );
+					assert subTypeAttrNode != null;
+				}
+		);
+	}
+
+	@Test
+	public void testHHH12696MapSubgraphsKeyFirst(EntityManagerFactoryScope scope) {
+		scope.inEntityManager(
+				entityManager -> {
+					EntityGraph<GraphParsingTestEntity> graph = entityManager
+							.createEntityGraph( GraphParsingTestEntity.class );
+
+					final String mapAttributeName = "map";
+					Subgraph<GraphParsingTestEntity> keySubgraph = graph.addKeySubgraph( mapAttributeName );
+					Subgraph<GraphParsingTestEntity> valueSubgraph = graph.addSubgraph( mapAttributeName );
+
+					checkMapKeyAndValueSubgraphs( graph, mapAttributeName, keySubgraph, valueSubgraph );
+				}
+		);
+	}
+
+	private void checkMapKeyAndValueSubgraphs(
+			EntityGraph<GraphParsingTestEntity> graph,
+			final String mapAttributeName,
+			Subgraph<GraphParsingTestEntity> keySubgraph,
+			Subgraph<GraphParsingTestEntity> valueSubgraph) {
+		int count = 0;
+		for ( AttributeNode<?> node : graph.getAttributeNodes() ) {
+			if ( mapAttributeName.equals( node.getAttributeName() ) ) {
+				count++;
+				@SuppressWarnings("rawtypes")
+				Map<Class, Subgraph> keySubgraphs = node.getKeySubgraphs();
+				assertThat( !keySubgraphs.isEmpty() )
+						.describedAs( "Missing the key subgraph" )
+						.isTrue();
+				assertThat( keySubgraphs.get( GraphParsingTestEntity.class ) ).isSameAs( keySubgraph );
+
+				@SuppressWarnings("rawtypes")
+				Map<Class, Subgraph> valueSubgraphs = node.getSubgraphs();
+				assertThat( !valueSubgraphs.isEmpty() )
+						.describedAs( "Missing the value subgraph" )
+						.isTrue();
+				assertThat( valueSubgraphs.get( GraphParsingTestEntity.class ) ).isSameAs( valueSubgraph );
+			}
+		}
+		assertThat( count ).isEqualTo( 1 );
+	}
+
+	@Test
+	public void testHHH12696MapSubgraphsValueFirst(EntityManagerFactoryScope scope) {
+		scope.inEntityManager(
+				entityManager -> {
+					EntityGraph<GraphParsingTestEntity> graph = entityManager
+							.createEntityGraph( GraphParsingTestEntity.class );
+
+					final String mapAttributeName = "map";
+					Subgraph<GraphParsingTestEntity> valueSubgraph = graph.addSubgraph( mapAttributeName );
+					Subgraph<GraphParsingTestEntity> keySubgraph = graph.addKeySubgraph( mapAttributeName );
+
+					checkMapKeyAndValueSubgraphs( graph, mapAttributeName, keySubgraph, valueSubgraph );
+				}
+		);
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java
index 863ebcb4505f..62ebda376582 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/EntityGraphParserTest.java
@@ -4,180 +4,42 @@
  */
 package org.hibernate.orm.test.entitygraph.parser;
 
-import jakarta.persistence.AttributeNode;
-import jakarta.persistence.EntityGraph;
-import jakarta.persistence.Subgraph;
-import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.graph.GraphParser;
+import java.util.List;
+
+import org.hibernate.UnknownEntityTypeException;
+import org.hibernate.cfg.GraphParserSettings;
 import org.hibernate.graph.spi.AttributeNodeImplementor;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.graph.spi.SubGraphImplementor;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
-import java.util.Map;
-
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-/**
- * A unit test of {@link GraphParser}.
- *
- * @author asusnjar
- */
-public class EntityGraphParserTest extends AbstractEntityGraphTest {
-
-	@Test
-	public void testNullParsing(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> graph = parseGraph( null, scope );
-		assertThat( graph ).isNull();
-	}
-
-	@Test
-	public void testOneBasicAttributeParsing(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "name", scope );
-		AssertionHelper.assertBasicAttributes( graph, "name" );
-	}
-
-	@Test
-	public void testTwoBasicAttributesParsing(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "name, description", scope );
-		AssertionHelper.assertBasicAttributes( graph, "name", "description" );
-	}
-
-	@Test
-	public void testLinkParsing(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "linkToOne(name, description)", scope );
-		assertThat( graph ).isNotNull();
-
-		List<AttributeNode<?>> attrs = graph.getAttributeNodes();
-		assertThat( attrs ).isNotNull();
-
-		assertThat( attrs.size() ).isEqualTo( 1 );
-		AttributeNode<?> node = attrs.get( 0 );
-		assertThat( node ).isNotNull();
-		assertThat( node.getAttributeName() ).isEqualTo( "linkToOne" );
-		AssertionHelper.assertNullOrEmpty( node.getKeySubgraphs() );
-		@SuppressWarnings("rawtypes")
-		Map<Class, Subgraph> sub = node.getSubgraphs();
-		AssertionHelper.assertBasicAttributes( sub.get( GraphParsingTestEntity.class ), "name", "description" );
-	}
-
-	@Test
-	public void testMapKeyParsing(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "map.key(name, description)", scope );
-		assertThat( graph ).isNotNull();
-		List<AttributeNode<?>> attrs = graph.getAttributeNodes();
-		assertThat( attrs ).isNotNull();
-		assertThat( attrs.size() ).isEqualTo( 1 );
-		AttributeNode<?> node = attrs.get( 0 );
-		assertThat( node ).isNotNull();
-		assertThat( node.getAttributeName() ).isEqualTo( "map" );
-		AssertionHelper.assertNullOrEmpty( node.getSubgraphs() );
-		@SuppressWarnings("rawtypes")
-		Map<Class, Subgraph> sub = node.getKeySubgraphs();
-		AssertionHelper.assertBasicAttributes( sub.get( GraphParsingTestEntity.class ), "name", "description" );
-	}
-
-	@Test
-	public void testMapValueParsing(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "map.value(name, description)", scope );
-		assertThat( graph ).isNotNull();
-		List<AttributeNode<?>> attrs = graph.getAttributeNodes();
-		assertThat( attrs ).isNotNull();
-		assertThat( attrs.size() ).isEqualTo( 1 );
-		AttributeNode<?> node = attrs.get( 0 );
-		assertThat( node ).isNotNull();
-		assertThat( node.getAttributeName() ).isEqualTo( "map" );
-		AssertionHelper.assertNullOrEmpty( node.getKeySubgraphs() );
-		@SuppressWarnings("rawtypes")
-		Map<Class, Subgraph> sub = node.getSubgraphs();
-		AssertionHelper.assertBasicAttributes( sub.get( GraphParsingTestEntity.class ), "name", "description" );
-	}
-
-	@Test
-	public void testMixParsingWithMaps(EntityManagerFactoryScope scope) {
-		String g = " name , linkToOne ( description, map . key ( name ) , map . value ( description ) , name ) , description , map . key ( name , description ) , map . value ( description ) ";
-		g = g.replace( " ", "       " );
-		for ( int i = 1; i <= 2; i++, g = g.replace( " ", "" ) ) {
-			EntityGraph<GraphParsingTestEntity> graph = parseGraph( g, scope );
-			AssertionHelper.assertBasicAttributes( graph, "name", "description" );
-
-			AttributeNode<?> linkToOne = AssertionHelper.getAttributeNodeByName( graph, "linkToOne", true );
-			AssertionHelper.assertNullOrEmpty( linkToOne.getKeySubgraphs() );
-			@SuppressWarnings("rawtypes")
-			Map<Class, Subgraph> linkToOneSubgraphs = linkToOne.getSubgraphs();
-			@SuppressWarnings("rawtypes")
-			Subgraph linkToOneRoot = linkToOneSubgraphs.get( GraphParsingTestEntity.class );
-			AssertionHelper.assertBasicAttributes( linkToOneRoot, "name", "description" );
-
-			AttributeNode<?> linkToOneMap = AssertionHelper.getAttributeNodeByName( linkToOneRoot, "map", true );
-			@SuppressWarnings("rawtypes")
-			Map<Class, Subgraph> linkToOneMapKeySubgraphs = linkToOneMap.getKeySubgraphs();
-			@SuppressWarnings("rawtypes")
-			Subgraph linkToOneMapKeyRoot = linkToOneMapKeySubgraphs.get( GraphParsingTestEntity.class );
-			AssertionHelper.assertBasicAttributes( linkToOneMapKeyRoot, "name" );
-			@SuppressWarnings("rawtypes")
-			Map<Class, Subgraph> linkToOneMapSubgraphs = linkToOneMap.getSubgraphs();
-			@SuppressWarnings("rawtypes")
-			Subgraph linkToOneMapRoot = linkToOneMapSubgraphs.get( GraphParsingTestEntity.class );
-			AssertionHelper.assertBasicAttributes( linkToOneMapRoot, "description" );
-
-			AttributeNode<?> map = AssertionHelper.getAttributeNodeByName( graph, "map", true );
-			@SuppressWarnings("rawtypes")
-			Map<Class, Subgraph> mapKeySubgraphs = map.getKeySubgraphs();
-			@SuppressWarnings("rawtypes")
-			Subgraph mapKeyRoot = mapKeySubgraphs.get( GraphParsingTestEntity.class );
-			AssertionHelper.assertBasicAttributes( mapKeyRoot, "name", "description" );
-			@SuppressWarnings("rawtypes")
-			Map<Class, Subgraph> mapSubgraphs = map.getSubgraphs();
-			@SuppressWarnings("rawtypes")
-			Subgraph mapRoot = mapSubgraphs.get( GraphParsingTestEntity.class );
-			AssertionHelper.assertBasicAttributes( mapRoot, "description" );
+@Jpa(
+		annotatedClasses = {
+				GraphParsingTestEntity.class,
+				GraphParsingTestSubEntity.class
+		},
+		integrationSettings = {
+				@Setting(name = GraphParserSettings.GRAPH_PARSER_MODE, value = "modern")
 		}
-	}
-
-	@Test
-	public void testMixParsingWithSimplifiedMaps(EntityManagerFactoryScope scope) {
-		String g = " name , linkToOne ( description, map . key ( name )  , name ) , description , map . value ( description, name ) ";
-		g = g.replace( " ", "       " );
-		for ( int i = 1; i <= 2; i++, g = g.replace( " ", "" ) ) {
-			EntityGraph<GraphParsingTestEntity> graph = parseGraph( g, scope );
-			AssertionHelper.assertBasicAttributes( graph, "name", "description" );
+)
+public class EntityGraphParserTest extends AbstractEntityGraphParserTest {
 
-			AttributeNode<?> linkToOne = AssertionHelper.getAttributeNodeByName( graph, "linkToOne", true );
-			AssertionHelper.assertNullOrEmpty( linkToOne.getKeySubgraphs() );
-			@SuppressWarnings("rawtypes")
-			Map<Class, Subgraph> linkToOneSubgraphs = linkToOne.getSubgraphs();
-			@SuppressWarnings("rawtypes")
-			Subgraph linkToOneRoot = linkToOneSubgraphs.get( GraphParsingTestEntity.class );
-			AssertionHelper.assertBasicAttributes( linkToOneRoot, "name", "description" );
-
-			AttributeNode<?> linkToOneMap = AssertionHelper.getAttributeNodeByName( linkToOneRoot, "map", true );
-			@SuppressWarnings("rawtypes")
-			Map<Class, Subgraph> linkToOneMapKeySubgraphs = linkToOneMap.getKeySubgraphs();
-			@SuppressWarnings("rawtypes")
-			Subgraph linkToOneMapKeyRoot = linkToOneMapKeySubgraphs.get( GraphParsingTestEntity.class );
-			AssertionHelper.assertBasicAttributes( linkToOneMapKeyRoot, "name" );
-
-			AttributeNode<?> map = AssertionHelper.getAttributeNodeByName( graph, "map", true );
-			@SuppressWarnings("rawtypes")
-			Map<Class, Subgraph> mapSubgraphs = map.getSubgraphs();
-			@SuppressWarnings("rawtypes")
-			Subgraph mapRoot = mapSubgraphs.get( GraphParsingTestEntity.class );
-			AssertionHelper.assertBasicAttributes( mapRoot, "description", "name" );
-		}
-	}
 
 	@Test
-	public void testLinkSubtypeParsing(EntityManagerFactoryScope scope) {
+	public void testLinkSubtypeParsingWithNewSyntax(EntityManagerFactoryScope scope) {
 		RootGraphImplementor<GraphParsingTestEntity> graph = parseGraph(
-				"linkToOne(name, description), linkToOne(GraphParsingTestSubEntity: sub)", scope );
+				"linkToOne(name, description), linkToOne:GraphParsingTestSubEntity(sub)", scope );
 		assertThat( graph ).isNotNull();
 
 		List<? extends AttributeNodeImplementor<?, ?, ?>> attrs = graph.getAttributeNodeList();
 		assertThat( attrs ).isNotNull();
-		assertThat( attrs.size() ).isEqualTo( 1 );
+		assertThat( attrs ).hasSize( 1 );
 
 		AttributeNodeImplementor<?, ?, ?> linkToOneNode = attrs.get( 0 );
 		assertThat( linkToOneNode ).isNotNull();
@@ -192,82 +54,52 @@ public void testLinkSubtypeParsing(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
-	public void testHHH10378IsNotFixedYet(EntityManagerFactoryScope scope) {
-		scope.inEntityManager(
-				entityManager -> {
-					RootGraphImplementor<GraphParsingTestEntity> graph = ((SessionImplementor) entityManager)
-							.createEntityGraph( GraphParsingTestEntity.class );
-					final SubGraphImplementor<GraphParsingTestSubEntity> subGraph = graph.addSubGraph(
-							"linkToOne",
-							GraphParsingTestSubEntity.class
-					);
+	public void testSubtypeAndTwoBasicAttributesParsing(EntityManagerFactoryScope scope) {
+		var graph = parseGraph( "name, :GraphParsingTestSubEntity(sub), description", scope );
+		assertThat( graph ).isNotNull();
 
-					assertThat( GraphParsingTestSubEntity.class ).isEqualTo( subGraph.getGraphedType().getJavaType() );
+		AssertionHelper.assertBasicAttributes( graph, "name", "description" );
 
-					final AttributeNodeImplementor<?, ?, ?> subTypeAttrNode = subGraph.findOrCreateAttributeNode(
-							"sub" );
-					assert subTypeAttrNode != null;
-				}
-		);
+		var treatedSubgraphs = graph.getTreatedSubgraphs();
+		assertThat( treatedSubgraphs ).hasSize( 1 );
 
+
+		var subEntityGraph = treatedSubgraphs.get( GraphParsingTestSubEntity.class );
+		var subEntityGraphAttributes = subEntityGraph.getAttributeNodes();
+		assertThat( subEntityGraphAttributes ).isNotNull();
+		assertThat( subEntityGraphAttributes ).hasSize( 1 );
+
+		var subEntityGraphAttributeNode = subEntityGraphAttributes.get( 0 );
+		assertThat( subEntityGraphAttributeNode ).isNotNull();
+		assertThat( subEntityGraphAttributeNode.getAttributeName() ).isEqualTo( "sub" );
 	}
 
 	@Test
-	public void testHHH12696MapSubgraphsKeyFirst(EntityManagerFactoryScope scope) {
-		scope.inEntityManager(
-				entityManager -> {
-					EntityGraph<GraphParsingTestEntity> graph = entityManager
-							.createEntityGraph( GraphParsingTestEntity.class );
+	public void testSubtypeParsing(EntityManagerFactoryScope scope) {
+		var graph = parseGraph( ":GraphParsingTestSubEntity(sub)", scope );
+		assertThat( graph ).isNotNull();
 
-					final String mapAttributeName = "map";
-					Subgraph<GraphParsingTestEntity> keySubgraph = graph.addKeySubgraph( mapAttributeName );
-					Subgraph<GraphParsingTestEntity> valueSubgraph = graph.addSubgraph( mapAttributeName );
+		var treatedSubgraphs = graph.getTreatedSubgraphs();
+		assertThat( treatedSubgraphs ).hasSize( 1 );
 
-					checkMapKeyAndValueSubgraphs( graph, mapAttributeName, keySubgraph, valueSubgraph );
-				}
-		);
-	}
+		var subEntityGraph = treatedSubgraphs.get( GraphParsingTestSubEntity.class );
+		var subEntityGraphAttributes = subEntityGraph.getAttributeNodes();
 
-	private void checkMapKeyAndValueSubgraphs(
-			EntityGraph<GraphParsingTestEntity> graph,
-			final String mapAttributeName,
-			Subgraph<GraphParsingTestEntity> keySubgraph,
-			Subgraph<GraphParsingTestEntity> valueSubgraph) {
-		int count = 0;
-		for ( AttributeNode<?> node : graph.getAttributeNodes() ) {
-			if ( mapAttributeName.equals( node.getAttributeName() ) ) {
-				count++;
-				@SuppressWarnings("rawtypes")
-				Map<Class, Subgraph> keySubgraphs = node.getKeySubgraphs();
-				assertThat( !keySubgraphs.isEmpty() )
-						.describedAs( "Missing the key subgraph" )
-						.isTrue();
-				assertThat( keySubgraphs.get( GraphParsingTestEntity.class ) ).isSameAs( keySubgraph );
+		assertThat( subEntityGraphAttributes ).isNotNull();
+		assertThat( subEntityGraphAttributes ).hasSize( 1 );
 
-				@SuppressWarnings("rawtypes")
-				Map<Class, Subgraph> valueSubgraphs = node.getSubgraphs();
-				assertThat( !valueSubgraphs.isEmpty() )
-						.describedAs( "Missing the value subgraph" )
-						.isTrue();
-				assertThat( valueSubgraphs.get( GraphParsingTestEntity.class ) ).isSameAs( valueSubgraph );
-			}
-		}
-		assertThat( count ).isEqualTo( 1 );
+		var attributeNode = subEntityGraphAttributes.get( 0 );
+		assertThat( attributeNode ).isNotNull();
+		assertThat( attributeNode.getAttributeName() ).isEqualTo( "sub" );
 	}
 
-	@Test
-	public void testHHH12696MapSubgraphsValueFirst(EntityManagerFactoryScope scope) {
-		scope.inEntityManager(
-				entityManager -> {
-					EntityGraph<GraphParsingTestEntity> graph = entityManager
-							.createEntityGraph( GraphParsingTestEntity.class );
 
-					final String mapAttributeName = "map";
-					Subgraph<GraphParsingTestEntity> valueSubgraph = graph.addSubgraph( mapAttributeName );
-					Subgraph<GraphParsingTestEntity> keySubgraph = graph.addKeySubgraph( mapAttributeName );
-
-					checkMapKeyAndValueSubgraphs( graph, mapAttributeName, keySubgraph, valueSubgraph );
-				}
+	@Test
+	public void testWithSubTypeThatNotExist(EntityManagerFactoryScope scope) {
+		assertThrows(
+				UnknownEntityTypeException.class,
+				() -> parseGraph( ":SubTypeThatNotExist(sub)", scope )
 		);
+
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/LegacySyntaxEntityGraphParserTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/LegacySyntaxEntityGraphParserTest.java
new file mode 100644
index 000000000000..5165b043baa5
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/LegacySyntaxEntityGraphParserTest.java
@@ -0,0 +1,54 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.entitygraph.parser;
+
+import java.util.List;
+
+import org.hibernate.cfg.GraphParserSettings;
+import org.hibernate.graph.spi.AttributeNodeImplementor;
+import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.graph.spi.SubGraphImplementor;
+
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+@Jpa(
+		annotatedClasses = {
+				GraphParsingTestEntity.class,
+				GraphParsingTestSubEntity.class
+		},
+		integrationSettings = {
+				@Setting(name = GraphParserSettings.GRAPH_PARSER_MODE, value = "legacy")
+		}
+)
+public class LegacySyntaxEntityGraphParserTest extends AbstractEntityGraphParserTest {
+
+	@Test
+	public void testLinkSubtypeParsing(EntityManagerFactoryScope scope) {
+		RootGraphImplementor<GraphParsingTestEntity> graph = parseGraph(
+				"linkToOne(name, description), linkToOne(GraphParsingTestSubEntity: sub)", scope );
+		assertThat( graph ).isNotNull();
+
+		List<? extends AttributeNodeImplementor<?, ?, ?>> attrs = graph.getAttributeNodeList();
+		assertThat( attrs ).isNotNull();
+		assertThat( attrs.size() ).isEqualTo( 1 );
+
+		AttributeNodeImplementor<?, ?, ?> linkToOneNode = attrs.get( 0 );
+		assertThat( linkToOneNode ).isNotNull();
+		assertThat( linkToOneNode.getAttributeName() ).isEqualTo( "linkToOne" );
+
+		AssertionHelper.assertNullOrEmpty( linkToOneNode.getKeySubgraphs() );
+
+		final SubGraphImplementor<?> subgraph = linkToOneNode.getSubGraphs().get( GraphParsingTestSubEntity.class );
+		assertThat( subgraph ).isNotNull();
+
+		AssertionHelper.assertBasicAttributes( subgraph, "sub" );
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java
index 7b47e24db020..51386b2f66f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java
@@ -64,6 +64,7 @@ public void testIntegrityViolation(SessionFactoryScope scope) {
 						}
 						catch (ConstraintViolationException ignore) {
 							// expected outcome
+							session.getTransaction().setRollbackOnly();
 						}
 						finally {
 							releaseStatement( session, ps );
@@ -129,6 +130,7 @@ public void testNotNullConstraint(SessionFactoryScope scope) {
 						}
 						catch (ConstraintViolationException ignore) {
 							// expected outcome
+							session.getTransaction().setRollbackOnly();
 						}
 						finally {
 							releaseStatement( session, ps );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java
index c33f267da55f..665693ff9e2f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/BaseJpaOrNativeBootstrapFunctionalTestCase.java
@@ -95,7 +95,7 @@ void prepareState() {
 	private void buildEntityManagerFactory() {
 		log.trace( "Building EntityManagerFactory" );
 
-		final Properties properties = buildProperties();
+		final Map<String, Object> properties = PropertiesHelper.map( buildProperties() );
 		properties.put( AvailableSettings.LOADED_CLASSES, List.of( getAnnotatedClasses() ) );
 		ServiceRegistryUtil.applySettings( properties );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndQueryJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndQueryJoinTest.java
new file mode 100644
index 000000000000..64fe7a5d5915
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/FetchModeSubselectAndQueryJoinTest.java
@@ -0,0 +1,101 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.fetch;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Tuple;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(
+		annotatedClasses = {
+				FetchModeSubselectAndQueryJoinTest.Node.class,
+				FetchModeSubselectAndQueryJoinTest.Element.class
+		}
+)
+@SessionFactory
+@JiraKey( "HHH-19949" )
+public class FetchModeSubselectAndQueryJoinTest {
+
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					Node basik = new Node( "Child" );
+					basik.elements.add( new Element( basik ) );
+					basik.elements.add( new Element( basik ) );
+					session.persist( basik );
+				}
+		);
+	}
+
+	@Test
+	public void tesSelect(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					List<Tuple> results = session.createSelectionQuery(
+							"select distinct n, e from Node n join n.elements e ", Tuple.class ).getResultList();
+					assertThat( results ).hasSize( 2 );
+				}
+		);
+	}
+
+	@Entity(name = "Element")
+	@Table(name = "Element")
+	public static class Element {
+		@Id
+		@GeneratedValue
+		Integer id;
+
+		@ManyToOne
+		Node node;
+
+		public Element(Node node) {
+			this.node = node;
+		}
+
+		Element() {
+		}
+	}
+
+	@Entity(name = "Node")
+	@Table(name = "Node")
+	public static class Node {
+
+		@Id
+		@GeneratedValue
+		Integer id;
+		String string;
+
+		@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST, mappedBy = "node")
+		@Fetch(FetchMode.SUBSELECT)
+		List<Element> elements = new ArrayList<>();
+
+		public Node(String string) {
+			this.string = string;
+		}
+
+		Node() {
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java
index 2cf35a581da4..5d663d9b8362 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java
@@ -7,6 +7,7 @@
 import jakarta.persistence.criteria.JoinType;
 import org.hibernate.Hibernate;
 import org.hibernate.cache.spi.entry.CollectionCacheEntry;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
@@ -18,6 +19,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.jboss.logging.Logger;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -88,6 +90,7 @@ public void releaseTestData(SessionFactoryScope factoryScope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnionInSubquery.class)
+	@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner requires explicit UNION ALL or UNION DISTINCT" )
 	public void testSqlSyntaxOfFiltersWithUnions(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			session.enableFilter( "unioned" );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AlwaysFlushTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AlwaysFlushTest.java
index 5792935cbb68..8080f288d6bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AlwaysFlushTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/AlwaysFlushTest.java
@@ -40,7 +40,7 @@ public class AlwaysFlushTest {
 	@Test
 	public void testFlushSQL(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
-			entityManager.createNativeQuery("delete from Person").executeUpdate();
+			entityManager.createNativeQuery("delete from Person where 1=1").executeUpdate();
 		});
 
 		factoryScope.inTransaction( entityManager -> {
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 b8307b73bc2d..7bcbe27ce6c5 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
@@ -67,7 +67,7 @@ public void testFlushAllowingOutOfTransactionUpdateOperations(SessionFactoryScop
 	@SessionFactory
 	public void testNativeQueryAllowingOutOfTransactionUpdateOperations(SessionFactoryScope factoryScope) {
 		factoryScope.inSession( (session) -> {
-			session.createNativeQuery( "delete from MY_ENTITY" ).executeUpdate();
+			session.createNativeQuery( "delete from MY_ENTITY where 1=1" ).executeUpdate();
 		} );
 	}
 
@@ -78,7 +78,7 @@ public void testNativeQueryAllowingOutOfTransactionUpdateOperations(SessionFacto
 	@SessionFactory
 	public void testNativeQueryDisallowingOutOfTransactionUpdateOperations(SessionFactoryScope factoryScope) {
 		factoryScope.inSession( (session) -> {
-			session.createNativeQuery( "delete from MY_ENTITY" ).executeUpdate();
+			session.createNativeQuery( "delete from MY_ENTITY where 1=1" ).executeUpdate();
 		} );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java
index 2eedb535db73..fa4a2c2e7015 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java
@@ -12,6 +12,7 @@
 import org.hibernate.engine.spi.ActionQueue;
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.spi.EventType;
 import org.hibernate.event.spi.PreUpdateEvent;
 import org.hibernate.event.spi.PreUpdateEventListener;
@@ -59,7 +60,7 @@ public void testAutoflushIsRequired(SessionFactoryScope factoryScope) {
 			Assertions.assertTrue( publisher.getAuthors().isEmpty() );
 
 			final PersistenceContext persistenceContext = session.getPersistenceContext();
-			final ActionQueue actionQueue = session.getActionQueue();
+			final ActionQueue actionQueue = session.unwrap( EventSource.class ).getActionQueue();
 			Assertions.assertEquals( 1, persistenceContext.getCollectionEntriesSize() );
 			Assertions.assertEquals( 1, persistenceContext.getCollectionsByKey().size() );
 			Assertions.assertTrue( persistenceContext.getCollectionEntries().containsKey( publisher.getAuthors() ) );
@@ -145,7 +146,7 @@ record Ids (Long publisherId, Long unrelatedEntityId ) {
 			Assertions.assertTrue( publisher.getAuthors().isEmpty() );
 
 			final PersistenceContext persistenceContext = s.getPersistenceContext();
-			final ActionQueue actionQueue = s.getActionQueue();
+			final ActionQueue actionQueue = s.unwrap( EventSource.class ).getActionQueue();
 			Assertions.assertEquals( 1, persistenceContext.getCollectionEntriesSize() );
 			Assertions.assertEquals( 1, persistenceContext.getCollectionsByKey().size() );
 			Assertions.assertTrue( persistenceContext.getCollectionEntries().containsKey( publisher.getAuthors() ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/ForeignKeyColumnSortingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/ForeignKeyColumnSortingTests.java
index f5a2c275a226..b5b8607239ed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/ForeignKeyColumnSortingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/foreignkeys/sorting/ForeignKeyColumnSortingTests.java
@@ -6,8 +6,10 @@
 
 import java.math.BigDecimal;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
@@ -19,6 +21,7 @@
  */
 @DomainModel(annotatedClasses = { A.class, B.class })
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class ForeignKeyColumnSortingTests {
 	@Test
 	@Jira( "https://hibernate.atlassian.net/browse/HHH-16514" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAggregateTest.java
index f1faea74a561..48d439da7875 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAggregateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayAggregateTest.java
@@ -12,6 +12,7 @@
 import org.hibernate.boot.spi.AdditionalMappingContributor;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.type.OracleArrayJdbcType;
 import org.hibernate.dialect.OracleDialect;
@@ -80,7 +81,7 @@ public void contribute(
 						jdbcTypeRegistry.getDescriptor( SqlTypes.VARCHAR ),
 						"StringArray"
 				).addAuxiliaryDatabaseObjects(
-						new ArrayJavaType<>( javaTypeRegistry.getDescriptor( String.class ) ),
+						new ArrayJavaType<>( javaTypeRegistry.resolveDescriptor( String.class ) ),
 						null,
 						Size.nil(),
 						metadata.getDatabase(),
@@ -142,6 +143,7 @@ public void testWithNull(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayComparison.class )
 	public void testCompareAgainstArray(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			List<Integer> results = em.createQuery( "select 1 where array('abc','def',null) is not distinct from (select array_agg(e.theString) within group (order by e.theString asc nulls last) from EntityOfBasics e)", Integer.class )
@@ -177,6 +179,7 @@ public void testNonExistingArrayType(SessionFactoryScope scope) {
 	@Test
 	@Jira("https://hibernate.atlassian.net/browse/HHH-19681")
 	@RequiresDialect(PostgreSQLDialect.class)
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support VALUES list in FROM clause")
 	public void testJsonBJdbcArray(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			String sql = "select groupId, array_agg(json_values) " +
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorTest.java
index 8d8daa373e4f..84429a1b89f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayConstructorTest.java
@@ -52,6 +52,7 @@ public void cleanup(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testEmpty(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			List<EntityWithArrays> results = em.createQuery( "from EntityWithArrays e where e.theArray = array()", EntityWithArrays.class )
@@ -62,6 +63,7 @@ public void testEmpty(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNonExisting(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			//tag::hql-array-example[]
@@ -107,6 +109,7 @@ public void testNodeBuilderCollection(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testArrayConstructorSyntaxEmpty(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			List<EntityWithArrays> results = em.createQuery( "from EntityWithArrays e where e.theArray = []", EntityWithArrays.class )
@@ -117,6 +120,7 @@ public void testArrayConstructorSyntaxEmpty(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testArrayConstructorSyntaxNonEmpty(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			//tag::hql-array-hql-example[]
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayContainsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayContainsTest.java
index 41f88b493504..ec627613b50b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayContainsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayContainsTest.java
@@ -74,6 +74,7 @@ public void testDoesNotContain(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature =  DialectFeatureChecks.SupportsArrayContainsNullable.class)
 	public void testNodeBuilderArray(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final NodeBuilder cb = (NodeBuilder) em.getCriteriaBuilder();
@@ -103,6 +104,7 @@ public void testNodeBuilderArray(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature =  DialectFeatureChecks.SupportsArrayContainsNullable.class)
 	public void testNodeBuilderCollection(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final NodeBuilder cb = (NodeBuilder) em.getCriteriaBuilder();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayReverseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayReverseTest.java
new file mode 100644
index 000000000000..2d37fa8fafd4
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayReverseTest.java
@@ -0,0 +1,142 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.function.array;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.hibernate.query.criteria.JpaCriteriaQuery;
+import org.hibernate.query.criteria.JpaRoot;
+import org.hibernate.query.sqm.NodeBuilder;
+
+import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
+import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Tuple;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * @author Yoobin Yoon
+ */
+@JiraKey("HHH-19826")
+@DomainModel(annotatedClasses = EntityWithArrays.class)
+@SessionFactory
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsStructuralArrays.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayReverse.class)
+@BootstrapServiceRegistry(integrators = SharedDriverManagerTypeCacheClearingIntegrator.class)
+public class ArrayReverseTest {
+
+	@BeforeEach
+	public void prepareData(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			em.persist( new EntityWithArrays( 1L, new String[] {} ) );
+			em.persist( new EntityWithArrays( 2L, new String[] { "abc", "def", null } ) );
+			em.persist( new EntityWithArrays( 3L, null ) );
+		} );
+	}
+
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+	}
+
+	@Test
+	public void testReverse(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			//tag::hql-array-reverse-example[]
+			List<Tuple> results = em.createQuery(
+							"select e.id, array_reverse(e.theArray) from EntityWithArrays e order by e.id",
+							Tuple.class
+					)
+					.getResultList();
+			//end::hql-array-reverse-example[]
+			assertEquals( 3, results.size() );
+			assertEquals( 1L, results.get( 0 ).get( 0 ) );
+			assertArrayEquals( new String[] {}, results.get( 0 ).get( 1, String[].class ) );
+			assertEquals( 2L, results.get( 1 ).get( 0 ) );
+			assertArrayEquals( new String[] { null, "def", "abc" }, results.get( 1 ).get( 1, String[].class ) );
+			assertEquals( 3L, results.get( 2 ).get( 0 ) );
+			assertNull( results.get( 2 ).get( 1, String[].class ) );
+		} );
+	}
+
+	@Test
+	public void testReverseSingleElement(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			em.persist( new EntityWithArrays( 4L, new String[] { "single" } ) );
+		} );
+		scope.inSession( em -> {
+			List<Tuple> results = em.createQuery(
+							"select e.id, array_reverse(e.theArray) from EntityWithArrays e where e.id = 4",
+							Tuple.class
+					)
+					.getResultList();
+			assertEquals( 1, results.size() );
+			assertEquals( 4L, results.get( 0 ).get( 0 ) );
+			assertArrayEquals( new String[] { "single" }, results.get( 0 ).get( 1, String[].class ) );
+		} );
+	}
+
+	@Test
+	public void testReverseDuplicates(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			em.persist( new EntityWithArrays( 5L, new String[] { "a", "b", "a", "c", "a" } ) );
+		} );
+		scope.inSession( em -> {
+			List<Tuple> results = em.createQuery(
+							"select e.id, array_reverse(e.theArray) from EntityWithArrays e where e.id = 5",
+							Tuple.class
+					)
+					.getResultList();
+			assertEquals( 1, results.size() );
+			assertEquals( 5L, results.get( 0 ).get( 0 ) );
+			assertArrayEquals( new String[] { "a", "c", "a", "b", "a" }, results.get( 0 ).get( 1, String[].class ) );
+		} );
+	}
+
+	@Test
+	public void testNodeBuilderArray(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			final NodeBuilder cb = (NodeBuilder) em.getCriteriaBuilder();
+			final JpaCriteriaQuery<Tuple> cq = cb.createTupleQuery();
+			final JpaRoot<EntityWithArrays> root = cq.from( EntityWithArrays.class );
+			cq.multiselect(
+					root.get( "id" ),
+					cb.arrayReverse( root.<String[]>get( "theArray" ) ),
+					cb.arrayReverse( root.get( "theArray" ) )
+			);
+			em.createQuery( cq ).getResultList();
+
+		} );
+	}
+
+	@Test
+	public void testNodeBuilderCollection(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			final NodeBuilder cb = (NodeBuilder) em.getCriteriaBuilder();
+			final JpaCriteriaQuery<Tuple> cq = cb.createTupleQuery();
+			final JpaRoot<EntityWithArrays> root = cq.from( EntityWithArrays.class );
+			cq.multiselect(
+					root.get( "id" ),
+					cb.collectionReverse( root.<Collection<String>>get( "theCollection" ) ),
+					cb.collectionReverse( root.get( "theCollection" ) )
+			);
+			em.createQuery( cq ).getResultList();
+		} );
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySortTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySortTest.java
new file mode 100644
index 000000000000..461e38c951e1
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArraySortTest.java
@@ -0,0 +1,196 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.function.array;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.hibernate.query.criteria.JpaCriteriaQuery;
+import org.hibernate.query.criteria.JpaRoot;
+import org.hibernate.query.sqm.NodeBuilder;
+
+import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
+import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Tuple;
+
+import static org.hibernate.testing.orm.junit.DialectFeatureChecks.SupportsStructuralArrays;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * @author Yoobin Yoon
+ */
+@JiraKey("HHH-19826")
+@DomainModel(annotatedClasses = EntityWithArrays.class)
+@SessionFactory
+@RequiresDialectFeature(feature = SupportsStructuralArrays.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArraySort.class)
+@BootstrapServiceRegistry(integrators = SharedDriverManagerTypeCacheClearingIntegrator.class)
+public class ArraySortTest {
+
+	@BeforeEach
+	public void prepareData(SessionFactoryScope scope) {
+		scope.inTransaction( em -> {
+			em.persist( new EntityWithArrays( 1L, new String[] { "banana", "apple", "cherry" } ) );
+			em.persist( new EntityWithArrays( 2L, null ) );
+			em.persist( new EntityWithArrays( 3L, new String[] {} ) );
+			em.persist( new EntityWithArrays( 4L, new String[] { "banana", null, "apple" } ) );
+		} );
+	}
+
+	@AfterEach
+	public void cleanup(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+	}
+
+	@Test
+	public void testArraySortAscending(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			//tag::hql-array-sort-example[]
+			List<String[]> results = em.createQuery(
+					"select array_sort(e.theArray) from EntityWithArrays e order by e.id",
+					String[].class
+			).getResultList();
+			//end::hql-array-sort-example[]
+			assertEquals( 4, results.size() );
+			assertArrayEquals( new String[] { "apple", "banana", "cherry" }, results.get( 0 ) );
+			assertNull( results.get( 1 ) );
+			assertArrayEquals( new String[] {}, results.get( 2 ) );
+			assertArrayEquals( new String[] { "apple", "banana", null }, results.get( 3 ) );
+		} );
+	}
+
+	@Test
+	public void testArraySortAscendingExplicit(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			List<String[]> results = em.createQuery(
+					"select array_sort(e.theArray, false) from EntityWithArrays e order by e.id",
+					String[].class
+			).getResultList();
+			assertEquals( 4, results.size() );
+			assertArrayEquals( new String[] { "apple", "banana", "cherry" }, results.get( 0 ) );
+			assertNull( results.get( 1 ) );
+			assertArrayEquals( new String[] {}, results.get( 2 ) );
+			assertArrayEquals( new String[] { "apple", "banana", null }, results.get( 3 ) );
+		} );
+	}
+
+	@Test
+	public void testArraySortDescending(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			List<String[]> results = em.createQuery(
+					"select array_sort(e.theArray, true) from EntityWithArrays e order by e.id",
+					String[].class
+			).getResultList();
+			assertEquals( 4, results.size() );
+			assertArrayEquals( new String[] { "cherry", "banana", "apple" }, results.get( 0 ) );
+			assertNull( results.get( 1 ) );
+			assertArrayEquals( new String[] {}, results.get( 2 ) );
+			assertArrayEquals( new String[] { null, "banana", "apple" }, results.get( 3 ) );
+		} );
+	}
+
+	@Test
+	public void testArraySortDescendingNullsLast(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			//tag::hql-array-sort-descending-nulls-last-example[]
+			List<String[]> results = em.createQuery(
+					"select array_sort(e.theArray, true, false) from EntityWithArrays e order by e.id",
+					String[].class
+			).getResultList();
+			//end::hql-array-sort-descending-nulls-last-example[]
+			assertEquals( 4, results.size() );
+			assertArrayEquals( new String[] { "cherry", "banana", "apple" }, results.get( 0 ) );
+			assertNull( results.get( 1 ) );
+			assertArrayEquals( new String[] {}, results.get( 2 ) );
+			assertArrayEquals( new String[] { "banana", "apple", null }, results.get( 3 ) );
+		} );
+	}
+
+	@Test
+	public void testArraySortWithParameters(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			List<String[]> results = em.createQuery(
+							"select array_sort(e.theArray, :desc, :nullsFirst) from EntityWithArrays e order by e.id",
+							String[].class
+					)
+					.setParameter( "desc", true )
+					.setParameter( "nullsFirst", false )
+					.getResultList();
+
+			assertEquals( 4, results.size() );
+			assertArrayEquals( new String[] { "cherry", "banana", "apple" }, results.get( 0 ) );
+			assertNull( results.get( 1 ) );
+			assertArrayEquals( new String[] {}, results.get( 2 ) );
+			assertArrayEquals( new String[] { "banana", "apple", null }, results.get( 3 ) );
+		} );
+	}
+
+	@Test
+	public void testArraySortAscendingNullsFirst(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			List<String[]> results = em.createQuery(
+					"select array_sort(e.theArray, false, true) from EntityWithArrays e order by e.id",
+					String[].class
+			).getResultList();
+			assertEquals( 4, results.size() );
+			assertArrayEquals( new String[] { "apple", "banana", "cherry" }, results.get( 0 ) );
+			assertNull( results.get( 1 ) );
+			assertArrayEquals( new String[] {}, results.get( 2 ) );
+			assertArrayEquals( new String[] { null, "apple", "banana" }, results.get( 3 ) );
+		} );
+	}
+
+	@Test
+	public void testNodeBuilderArray(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			final NodeBuilder cb = (NodeBuilder) em.getCriteriaBuilder();
+			final JpaCriteriaQuery<Tuple> cq = cb.createTupleQuery();
+			final JpaRoot<EntityWithArrays> root = cq.from( EntityWithArrays.class );
+			cq.multiselect(
+					root.get( "id" ),
+					cb.arraySort( root.<String[]>get( "theArray" ) ),
+					cb.arraySort( root.get( "theArray" ) ),
+					cb.arraySort( root.<String[]>get( "theArray" ), true ),
+					cb.arraySort( root.get( "theArray" ), cb.literal( false ) ),
+					cb.arraySort( root.<String[]>get( "theArray" ), true, false ),
+					cb.arraySort( root.get( "theArray" ), cb.literal( true ), cb.literal( false ) )
+			);
+			em.createQuery( cq ).getResultList();
+
+		} );
+	}
+
+	@Test
+	public void testNodeBuilderCollection(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			final NodeBuilder cb = (NodeBuilder) em.getCriteriaBuilder();
+			final JpaCriteriaQuery<Tuple> cq = cb.createTupleQuery();
+			final JpaRoot<EntityWithArrays> root = cq.from( EntityWithArrays.class );
+			cq.multiselect(
+					root.get( "id" ),
+					cb.collectionSort( root.<Collection<String>>get( "theCollection" ) ),
+					cb.collectionSort( root.get( "theCollection" ) ),
+					cb.collectionSort( root.<Collection<String>>get( "theCollection" ), true ),
+					cb.collectionSort( root.get( "theCollection" ), cb.literal( false ) ),
+					cb.collectionSort( root.<Collection<String>>get( "theCollection" ), true, false ),
+					cb.collectionSort( root.get( "theCollection" ), cb.literal( true ), cb.literal( false ) )
+			);
+			em.createQuery( cq ).getResultList();
+
+		} );
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayToStringWithArrayAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayToStringWithArrayAggregateTest.java
index d1f42210c1e9..77214c4f0905 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayToStringWithArrayAggregateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayToStringWithArrayAggregateTest.java
@@ -74,6 +74,7 @@ public void test(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 19, reason = "Oracle bug in version 19")
 	@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 21, reason = "Oracle bug in version 21")
 	public void testWithCte(SessionFactoryScope scope) {
 		scope.inSession( em -> {
@@ -132,7 +133,7 @@ public void setTitle(String title) {
 	}
 
 	// Needed for Oracle
-	@Entity
+	@Entity(name = "Dummy")
 	static class Dummy {
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayTrimTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayTrimTest.java
index fd695e1efea9..b79776ff5f77 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayTrimTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/array/ArrayTrimTest.java
@@ -8,9 +8,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
-import org.hibernate.dialect.PostgreSQLDialect;
-import org.hibernate.dialect.PostgresPlusDialect;
 import org.hibernate.query.criteria.JpaCriteriaQuery;
 import org.hibernate.query.criteria.JpaRoot;
 import org.hibernate.query.sqm.NodeBuilder;
@@ -23,7 +22,6 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
-import org.hibernate.testing.orm.junit.VersionMatchMode;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -86,9 +84,8 @@ public void testTrimAll(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = PostgreSQLDialect.class, majorVersion = 14, versionMatchMode = VersionMatchMode.OLDER, reason = "The PostgreSQL emulation for version < 14 doesn't throw an error")
-	@SkipForDialect(dialectClass = PostgresPlusDialect.class, majorVersion = 14, versionMatchMode = VersionMatchMode.OLDER, reason = "The PostgreSQL emulation for version < 14 doesn't throw an error")
 	@SkipForDialect(dialectClass = CockroachDialect.class, reason = "The Cockroach emulation doesn't throw an error")
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner PG doesn't throw an error")
 	public void testTrimOutOfRange(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			try {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonArrayUnnestTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonArrayUnnestTest.java
index 4de63833bd44..46b5370b07c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonArrayUnnestTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonArrayUnnestTest.java
@@ -13,6 +13,7 @@
 import org.hibernate.query.criteria.JpaRoot;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.tree.SqmJoinType;
+import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.type.SqlTypes;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
@@ -45,19 +46,21 @@
 @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsStructuralArrays.class)
 @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsUnnest.class)
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonAggregate.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsJsonTable.class )
 public class JsonArrayUnnestTest {
 
 	@BeforeEach
 	public void prepareData(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
-			em.persist( new Book( 1L, "book1", new Publisher[0], List.of() ) );
+			em.persist( new Book( 1L, "book1", null, new Publisher[0], List.of() ) );
 			em.persist( new Book(
 					2L,
 					"book2",
-					new Publisher[] { new Publisher( "abc" ), null, new Publisher( "def" ) },
+					new Publisher( "abc", List.of( "a", "b" ) ),
+					new Publisher[] { new Publisher( "abc", List.of( "a", "b" ) ), null, new Publisher( "def", List.of( "c", "d" ) ) },
 					Arrays.asList( new Label( "k1", "v1" ), null, new Label( "k2", "v2" ) )
 			) );
-			em.persist( new Book( 3L, "book3", null, null ) );
+			em.persist( new Book( 3L, "book3", null, null, null ) );
 		} );
 	}
 
@@ -186,6 +189,33 @@ public void testNodeBuilderUnnestOrdinality(SessionFactoryScope scope) {
 		} );
 	}
 
+	@Test
+	@Jira("https://hibernate.atlassian.net/browse/HHH-20326")
+	public void testJoinNested(SessionFactoryScope scope) {
+		scope.inSession( em -> {
+			List<Tuple> results = em.createQuery(
+							"select e.id, p.name, g " +
+							"from Book e " +
+							"join e.mainPublisher p " +
+							"join p.genres g " +
+							"order by e.id",
+							Tuple.class
+					)
+					.getResultList();
+
+			// 1 row with 2 genres
+			assertEquals( 2, results.size() );
+
+			assertEquals( 2L, results.get( 0 ).get( 0 ) );
+			assertEquals( "abc", results.get( 0 ).get( 1 ) );
+			assertEquals( "a", results.get( 0 ).get( 2 ) );
+
+			assertEquals( 2L, results.get( 1 ).get( 0 ) );
+			assertEquals( "abc", results.get( 1 ).get( 1 ) );
+			assertEquals( "b", results.get( 1 ).get( 2 ) );
+		} );
+	}
+
 	private void assertTupleEquals(Tuple tuple, long id, String publisherName, String labelName, String labelValue) {
 		assertEquals( id, tuple.get( 0 ) );
 		assertEquals( publisherName, tuple.get( 1 ) );
@@ -207,6 +237,8 @@ public static class Book {
 
 		private String title;
 
+		@JdbcTypeCode(SqlTypes.JSON)
+		private Publisher mainPublisher;
 		@JdbcTypeCode(SqlTypes.JSON_ARRAY)
 		private Publisher[] publishers;
 		@JdbcTypeCode(SqlTypes.JSON_ARRAY)
@@ -215,9 +247,10 @@ public static class Book {
 		public Book() {
 		}
 
-		public Book(Long id, String title, Publisher[] publishers, List<Label> labels) {
+		public Book(Long id, String title, Publisher mainPublisher, Publisher[] publishers, List<Label> labels) {
 			this.id = id;
 			this.title = title;
+			this.mainPublisher = mainPublisher;
 			this.publishers = publishers;
 			this.labels = labels;
 		}
@@ -227,12 +260,15 @@ public Book(Long id, String title, Publisher[] publishers, List<Label> labels) {
 	public static class Publisher {
 
 		private String name;
+		@JdbcTypeCode(SqlTypes.JSON_ARRAY)
+		private List<String> genres;
 
 		public Publisher() {
 		}
 
-		public Publisher(String name) {
+		public Publisher(String name, List<String> genres) {
 			this.name = name;
+			this.genres = genres;
 		}
 
 		public String getName() {
@@ -242,6 +278,14 @@ public String getName() {
 		public void setName(String name) {
 			this.name = name;
 		}
+
+		public List<String> getGenres() {
+			return genres;
+		}
+
+		public void setGenres(List<String> genres) {
+			this.genres = genres;
+		}
 	}
 
 	@Embeddable
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonQueryTest.java
index 346649f4018c..98f4519ac86d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonQueryTest.java
@@ -10,7 +10,6 @@
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.cfg.QuerySettings;
-import org.hibernate.dialect.MariaDBDialect;
 import org.hibernate.sql.exec.ExecutionException;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
@@ -20,7 +19,6 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -94,7 +92,7 @@ public void testWithWrapper(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB reports the error 4038 as warning and simply returns null")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonFunctionErrorBehavior.class)
 	public void testOnError(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			try {
@@ -113,7 +111,7 @@ public void testOnError(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsJsonValueErrorBehavior.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonFunctionErrorBehavior.class)
 	public void testOnEmpty(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			try {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonValueTest.java
index 00f303f8d0d8..75442e7436bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonValueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/json/JsonValueTest.java
@@ -10,7 +10,6 @@
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.cfg.QuerySettings;
-import org.hibernate.dialect.MariaDBDialect;
 import org.hibernate.sql.exec.ExecutionException;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
@@ -20,7 +19,6 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -94,7 +92,7 @@ public void testReturning(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = MariaDBDialect.class, reason = "MariaDB reports the error 4038 as warning and simply returns null")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonFunctionErrorBehavior.class)
 	public void testOnError(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			try {
@@ -113,7 +111,7 @@ public void testOnError(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsJsonValueErrorBehavior.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonFunctionErrorBehavior.class)
 	public void testOnEmpty(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			try {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/function/srf/CustomSetReturningFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/function/srf/CustomSetReturningFunctionTest.java
index a6cfb5fffcf9..5379c3cc1d9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/function/srf/CustomSetReturningFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/function/srf/CustomSetReturningFunctionTest.java
@@ -15,6 +15,7 @@
 import org.hibernate.boot.spi.AdditionalMappingContributor;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.OracleDialect;
@@ -63,6 +64,7 @@
 @RequiresDialect(SQLServerDialect.class)
 @RequiresDialect(SybaseASEDialect.class)
 @RequiresDialect(HANADialect.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support custom set returning function")
 public class CustomSetReturningFunctionTest implements AdditionalMappingContributor, FunctionContributor {
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/GeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/GeneratedTest.java
index b8aa6e3d9384..8373ddff0019 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/GeneratedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/generated/GeneratedTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.generatedkeys.generated;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.MySQLDialect;
@@ -46,6 +47,7 @@
 @RequiresDialect(DB2Dialect.class)
 @RequiresDialect(SQLServerDialect.class)
 @SkipForDialect(dialectClass = TiDBDialect.class, reason = "TiDB does not support triggers")
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support triggers")
 public class GeneratedTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityNoGeneratedKeysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityNoGeneratedKeysTest.java
new file mode 100644
index 000000000000..4590d097ba33
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityNoGeneratedKeysTest.java
@@ -0,0 +1,181 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.generatedkeys.identity;
+
+import jakarta.persistence.TransactionRequiredException;
+import org.hibernate.dialect.OracleDialect;
+import org.hibernate.dialect.SybaseASEDialect;
+import org.hibernate.stat.spi.StatisticsImplementor;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * @author Steve Ebersole
+ */
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class)
+@DomainModel(
+		xmlMappings = "org/hibernate/orm/test/generatedkeys/identity/MyEntity.hbm.xml"
+)
+@SessionFactory(
+		generateStatistics = true
+)
+@ServiceRegistry(settings = @Setting(name = "hibernate.jdbc.use_get_generated_keys", value = "false"))
+public class IdentityNoGeneratedKeysTest {
+
+	@Test
+	@SkipForDialect(dialectClass = OracleDialect.class,
+			reason = "'hibernate.jdbc.use_get_generated_keys' was disabled and the dialect does not support selecting the last generated identity")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class) // no clue why this fails
+	public void testIdentityColumnGeneratedIds(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					MyEntity myEntity = new MyEntity( "test" );
+					session.persist( myEntity );
+					assertThat( myEntity.getId() )
+							.describedAs( "identity column did not force immediate insert" )
+							.isNotNull();
+					session.remove( myEntity );
+				}
+		);
+	}
+
+	@Test
+	public void testPersistOutsideTransaction(SessionFactoryScope scope) {
+		scope.inSession(
+				session -> {
+					try {
+						StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
+						long initialInsertCount = statistics.getEntityInsertCount();
+						MyEntity myEntity2 = new MyEntity( "test-persist" );
+						session.persist( myEntity2 );
+						assertThat( statistics.getEntityInsertCount() )
+								.describedAs( "persist on identity column not delayed" )
+								.isEqualTo( initialInsertCount );
+						assertThat( myEntity2.getId() ).isNull();
+
+						// an explicit flush should cause execution of the delayed insertion
+						session.flush();
+						fail( "TransactionRequiredException required upon flush" );
+					}
+					catch (TransactionRequiredException ex) {
+						// expected
+					}
+				}
+		);
+	}
+
+	@Test
+	public void testPersistOutsideTransactionCascadedToNonInverseCollection(SessionFactoryScope scope) {
+		StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
+
+		long initialInsertCount = statistics.getEntityInsertCount();
+		scope.inSession(
+				session -> {
+					try {
+						MyEntity myEntity = new MyEntity( "test-persist" );
+						myEntity.getNonInverseChildren().add( new MyChild( "test-child-persist-non-inverse" ) );
+						session.persist( myEntity );
+						assertThat( statistics.getEntityInsertCount() )
+								.describedAs( "persist on identity column not delayed" )
+								.isEqualTo( initialInsertCount );
+						assertThat( myEntity.getId() ).isNull();
+						session.flush();
+						fail( "TransactionRequiredException required upon flush" );
+					}
+					catch (TransactionRequiredException ex) {
+						// expected
+					}
+				}
+		);
+	}
+
+	@Test
+	public void testPersistOutsideTransactionCascadedToInverseCollection(SessionFactoryScope scope) {
+		StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
+
+		long initialInsertCount = statistics.getEntityInsertCount();
+		scope.inSession(
+				session -> {
+					try {
+						MyEntity myEntity2 = new MyEntity( "test-persist-2" );
+						MyChild child = new MyChild( "test-child-persist-inverse" );
+						myEntity2.getInverseChildren().add( child );
+						child.setInverseParent( myEntity2 );
+						session.persist( myEntity2 );
+						assertThat( statistics.getEntityInsertCount() )
+								.describedAs( "persist on identity column not delayed" )
+								.isEqualTo( initialInsertCount );
+						assertThat( myEntity2.getId() ).isNull();
+						session.flush();
+						fail( "TransactionRequiredException expected upon flush." );
+					}
+					catch (TransactionRequiredException ex) {
+						// expected
+					}
+				}
+		);
+	}
+
+	@Test
+	public void testPersistOutsideTransactionCascadedToManyToOne(SessionFactoryScope scope) {
+		StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
+
+		long initialInsertCount = statistics.getEntityInsertCount();
+		scope.inSession(
+				session -> {
+					try {
+						MyEntity myEntity = new MyEntity( "test-persist" );
+						myEntity.setSibling( new MySibling( "test-persist-sibling-out" ) );
+						session.persist( myEntity );
+						assertThat( statistics.getEntityInsertCount() )
+								.describedAs( "persist on identity column not delayed" )
+								.isEqualTo( initialInsertCount );
+						assertThat( myEntity.getId() ).isNull();
+						session.flush();
+						fail( "TransactionRequiredException expected upon flush." );
+					}
+					catch (TransactionRequiredException ex) {
+						// expected
+					}
+				}
+		);
+	}
+
+	@Test
+	public void testPersistOutsideTransactionCascadedFromManyToOne(SessionFactoryScope scope) {
+		StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
+
+		long initialInsertCount = statistics.getEntityInsertCount();
+		scope.inSession(
+				session -> {
+					try {
+						MyEntity myEntity2 = new MyEntity( "test-persist-2" );
+						MySibling sibling = new MySibling( "test-persist-sibling-in" );
+						sibling.setEntity( myEntity2 );
+						session.persist( sibling );
+						assertThat( statistics.getEntityInsertCount() )
+								.describedAs( "persist on identity column not delayed" )
+								.isEqualTo( initialInsertCount );
+						assertThat( myEntity2.getId() ).isNull();
+						session.flush();
+						fail( "TransactionRequiredException expected upon flush." );
+					}
+					catch (TransactionRequiredException ex) {
+						// expected
+					}
+				}
+		);
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.java
index e72ca228f80e..77a1322eba98 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/select/SelectGeneratorTest.java
@@ -9,6 +9,7 @@
 import java.nio.file.Files;
 import java.util.EnumSet;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.OracleDialect;
@@ -43,6 +44,7 @@
 @RequiresDialect(DB2Dialect.class)
 @RequiresDialect(SQLServerDialect.class)
 @SkipForDialect(dialectClass = TiDBDialect.class, reason = "TiDB does not support triggers")
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support triggers")
 public class SelectGeneratorTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/SelectGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/SelectGeneratorTest.java
index d8a21c908689..39938392019e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/SelectGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/selectannotated/SelectGeneratorTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.generatedkeys.selectannotated;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.MySQLDialect;
@@ -46,6 +47,7 @@
 @RequiresDialect(DB2Dialect.class)
 @RequiresDialect(SQLServerDialect.class)
 @SkipForDialect(dialectClass = TiDBDialect.class, reason = "TiDB does not support triggers")
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support triggers")
 public class SelectGeneratorTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java
index f25b1fe047e9..9cf0ff4ccd36 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java
@@ -4,20 +4,20 @@
  */
 package org.hibernate.orm.test.graph;
 
-import jakarta.persistence.AttributeNode;
 import jakarta.persistence.EntityGraph;
-import jakarta.persistence.Subgraph;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.graph.EntityGraphs;
 import org.hibernate.graph.GraphParser;
 import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.metamodel.model.domain.EntityDomainType;
+import org.hibernate.orm.test.graph.entity.GraphParsingTestEntity;
+import org.hibernate.orm.test.graph.entity.GraphParsingTestSubentity;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
 
 
 @Jpa(
@@ -38,69 +38,182 @@ protected <T> RootGraphImplementor<GraphParsingTestEntity> parseGraph(String gra
 		return parseGraph( GraphParsingTestEntity.class, graphString, scope );
 	}
 
-	private <C extends Collection<?>> void assertNullOrEmpty(C collection) {
-		if ( collection != null ) {
-			assertThat( collection).hasSize( 0 );
-		}
+
+	private <T> void checkMerge(EntityManagerFactoryScope scope, Class<T> rootType, EntityGraph<T> expected, EntityGraph<T>... graphs) {
+		scope.inEntityManager(
+				entityManager -> {
+					EntityGraph<T> actual = EntityGraphs.merge( entityManager, rootType, graphs );
+					assertThat( EntityGraphs.areEqual( expected, actual ) ).isTrue();
+				}
+		);
 	}
 
-	protected <M extends Map<?, ?>> void assertNullOrEmpty(M map) {
-		if ( map != null ) {
-			assertThat( map.size()).isEqualTo( 0 );
-		}
+	@SafeVarargs
+	private void checkMerge(EntityManagerFactoryScope scope, EntityGraph<GraphParsingTestEntity> expected, EntityGraph<GraphParsingTestEntity>... graphs) {
+		checkMerge( scope, GraphParsingTestEntity.class, expected, graphs );
 	}
 
-	protected void assertBasicAttributes(EntityGraph<?> graph, String... names) {
-		assertThat( graph ).isNotNull();
-		assertBasicAttributes( graph.getAttributeNodes(), names );
+	@Test
+	public void testSameBasicsEqual(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> g = parseGraph( "name, description ", scope );
+		assertThat( EntityGraphs.areEqual( g, g ) ).isTrue();
 	}
 
-	protected void assertBasicAttributes(Subgraph<?> graph, String... names) {
-		assertThat( graph ).isNotNull();
-		assertBasicAttributes( graph.getAttributeNodes(), names );
+	@Test
+	public void testEqualBasicsEqual(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "name, description ", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "description, name ", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
 	}
 
-	private void assertBasicAttributes(List<AttributeNode<?>> attrs, String... names) {
-		if ( (names == null) || (names.length == 0) ) {
-			assertNullOrEmpty( attrs );
-		}
-		else {
-			assertThat( attrs ).isNotNull();
-			assertThat( names.length).isLessThanOrEqualTo( attrs.size() );
-
-			for ( String name : names ) {
-				AttributeNode<?> node = null;
-				for ( AttributeNode<?> candidate : attrs ) {
-					if ( candidate.getAttributeName().equals( name ) ) {
-						node = candidate;
-						break;
-					}
-				}
-				assertThat( node ).isNotNull();
-				assertNullOrEmpty( node.getKeySubgraphs() );
-				assertNullOrEmpty( node.getSubgraphs() );
-			}
-		}
+	@Test
+	public void testDifferentBasicsEqual1(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "name, description ", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "description ", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
 	}
 
-	protected AttributeNode<?> getAttributeNodeByName(EntityGraph<?> graph, String name, boolean required) {
-		return getAttributeNodeByName( graph.getAttributeNodes(), name, required );
+	@Test
+	public void testDifferentBasicsEqual2(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "name ", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "description ", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
 	}
 
-	protected AttributeNode<?> getAttributeNodeByName(Subgraph<?> graph, String name, boolean required) {
-		return getAttributeNodeByName( graph.getAttributeNodes(), name, required );
+	@Test
+	public void testEqualLinksEqual1(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "linkToOne(name, description)", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "linkToOne(description, name)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
 	}
 
-	private AttributeNode<?> getAttributeNodeByName(List<AttributeNode<?>> attrs, String name, boolean required) {
-		for ( AttributeNode<?> attr : attrs ) {
-			if ( name.equals( attr.getAttributeName() ) ) {
-				return attr;
-			}
-		}
-		if ( required ) {
-			fail( "Required attribute not found." );
-		}
-		return null;
+	@Test
+	public void testDifferentLinksEqual1(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "linkToOne(name, description)", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "linkToOne(description)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
+	}
+
+	@Test
+	public void testDifferentLinksEqual2(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "linkToOne(name)", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "linkToOne(description)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
+	}
+
+	@Test
+	public void testEqualMapKeysEqual(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.key(name, description)", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.key(description, name)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
+	}
+
+	@Test
+	public void testDifferentMapKeysEqual1(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.key(name, description)", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.key(description)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
+	}
+
+	@Test
+	public void testDifferentMapKeysEqual2(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.key(name)", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.key(description)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
+	}
+
+	@Test
+	public void testEqualMapValuesEqual(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.value(name, description)", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.value(description, name)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
+	}
+
+	@Test
+	public void testDifferentMapValuesEqual1(EntityManagerFactoryScope scop) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.value(name, description)", scop );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.value(description)", scop );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
+	}
+
+	@Test
+	public void testDifferentMapValuesEqual2(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.value(name)", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.value(description)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
+	}
+
+	@Test
+	public void testEqualComplexGraphsEqual(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph(
+				"map.key(name, description), name, linkToOne(description), description", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph(
+				"description, map.key(description, name), name, linkToOne(description)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
+	}
+
+	@Test
+	public void testDifferentComplexGraphsEqual(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph(
+				"map.key(name, description), name, linkToOne(description), description", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph(
+				"description, map.value(description, name), name, linkToOne(description)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
+	}
+
+	@Test
+	public void testNullsEqual() {
+		assertThat( EntityGraphs.areEqual( null, (EntityGraph<GraphParsingTestEntity>) null ) ).isTrue();
+	}
+
+	@Test
+	public void testNullAndNonNullEqual(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "name ", scope );
+		assertThat( EntityGraphs.areEqual( graph, null ) ).isFalse();
+		assertThat( EntityGraphs.areEqual( null, graph ) ).isFalse();
+	}
+
+	@Test
+	public void testBasicMerge(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> g1 = parseGraph( "name", scope );
+		EntityGraph<GraphParsingTestEntity> g2 = parseGraph( "description", scope );
+		EntityGraph<GraphParsingTestEntity> expected = parseGraph( "name, description ", scope );
+		checkMerge( scope, expected, g1, g2 );
+	}
+
+	@Test
+	public void testLinkMerge(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> g1 = parseGraph( "linkToOne(name)", scope );
+		EntityGraph<GraphParsingTestEntity> g2 = parseGraph( "linkToOne(description)", scope );
+		EntityGraph<GraphParsingTestEntity> expected = parseGraph( "linkToOne(name, description) ", scope );
+		checkMerge( scope, expected, g1, g2 );
+	}
+
+	@Test
+	public void testMapKeyMerge(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> g1 = parseGraph( "map.key(name)", scope );
+		EntityGraph<GraphParsingTestEntity> g2 = parseGraph( "map.key(description)", scope );
+		EntityGraph<GraphParsingTestEntity> expected = parseGraph( "map.key(name, description) ", scope );
+		checkMerge( scope, expected, g1, g2 );
+	}
+
+	@Test
+	public void testMapValueMerge(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> g1 = parseGraph( "map.value(name)", scope );
+		EntityGraph<GraphParsingTestEntity> g2 = parseGraph( "map.value(description)", scope );
+		EntityGraph<GraphParsingTestEntity> expected = parseGraph( "map.value(name, description) ", scope );
+		checkMerge( scope, expected, g1, g2 );
+	}
+
+	@Test
+	@JiraKey(value = "HHH-14264")
+	public void testRootGraphAppliesToChildEntityClass(EntityManagerFactoryScope scope) {
+		RootGraphImplementor<GraphParsingTestEntity> rootGraphImplementor = parseGraph( GraphParsingTestEntity.class,
+				"name, description", scope );
+		EntityDomainType<?> entity = scope.getEntityManagerFactory().unwrap( SessionFactoryImplementor.class )
+				.getJpaMetamodel()
+				.entity( (Class<?>) GraphParsingTestSubentity.class );
+		assertThat( rootGraphImplementor.appliesTo( entity ) ).isTrue();
 	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java
index f4d919fae75c..6f0c18111ab5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java
@@ -4,210 +4,48 @@
  */
 package org.hibernate.orm.test.graph;
 
-import jakarta.persistence.EntityGraph;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.cfg.GraphParserSettings;
 import org.hibernate.graph.EntityGraphs;
-import org.hibernate.graph.spi.RootGraphImplementor;
-import org.hibernate.metamodel.model.domain.EntityDomainType;
+import org.hibernate.orm.test.graph.entity.GraphParsingTestEntity;
+
+import org.hibernate.orm.test.graph.entity.GraphParsingTestSubentity;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.JiraKey;
+
+import jakarta.persistence.EntityGraph;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class EntityGraphsTest extends AbstractEntityGraphTest {
-
-	private <T> void checkMerge(EntityManagerFactoryScope scope, Class<T> rootType, EntityGraph<T> expected, EntityGraph<T>... graphs) {
-		scope.inEntityManager(
-				entityManager -> {
-					EntityGraph<T> actual = EntityGraphs.merge( entityManager, rootType, graphs );
-					assertThat( EntityGraphs.areEqual( expected, actual ) ).isTrue();
-				}
-		);
-	}
-
-	@SafeVarargs
-	private void checkMerge(EntityManagerFactoryScope scope, EntityGraph<GraphParsingTestEntity> expected, EntityGraph<GraphParsingTestEntity>... graphs) {
-		checkMerge( scope, GraphParsingTestEntity.class, expected, graphs );
-	}
-
-	@Test
-	public void testSameBasicsEqual(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> g = parseGraph( "name, description ", scope );
-		assertThat( EntityGraphs.areEqual( g, g ) ).isTrue();
-	}
-
-	@Test
-	public void testEqualBasicsEqual(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "name, description ", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "description, name ", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
-	}
-
-	@Test
-	public void testDifferentBasicsEqual1(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "name, description ", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "description ", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
-	}
-
-	@Test
-	public void testDifferentBasicsEqual2(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "name ", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "description ", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
-	}
 
-	@Test
-	public void testEqualLinksEqual1(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "linkToOne(name, description)", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "linkToOne(description, name)", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
-	}
+@Jpa(
+		annotatedClasses = {
+				GraphParsingTestEntity.class,
+				GraphParsingTestSubentity.class
+		},
+		integrationSettings = {
+				@Setting(name = GraphParserSettings.GRAPH_PARSER_MODE, value = "modern")
+		}
+)
+public class EntityGraphsTest extends AbstractEntityGraphTest {
 
 	@Test
 	public void testEqualLinksWithSubclassesEqual(EntityManagerFactoryScope scope) {
 		EntityGraph<GraphParsingTestEntity> a = parseGraph(
-				"linkToOne(name), linkToOne(GraphParsingTestSubentity:description)", scope );
+				"linkToOne(name), linkToOne:GraphParsingTestSubentity(description)", scope );
 		EntityGraph<GraphParsingTestEntity> b = parseGraph(
-				"linkToOne(GraphParsingTestSubentity:description), linkToOne(name)", scope );
+				"linkToOne:GraphParsingTestSubentity(description), linkToOne(name)", scope );
 		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
 	}
 
-	@Test
-	public void testDifferentLinksEqual1(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "linkToOne(name, description)", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "linkToOne(description)", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
-	}
-
-	@Test
-	public void testDifferentLinksEqual2(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "linkToOne(name)", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "linkToOne(description)", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
-	}
-
 	@Test
 	public void testDifferentLinksEqual3(EntityManagerFactoryScope scope) {
 		EntityGraph<GraphParsingTestEntity> a = parseGraph(
-				"linkToOne(name), linkToOne(GraphParsingTestSubentity:description)", scope );
+				"linkToOne(name), linkToOne:GraphParsingTestSubentity(description)", scope );
 		EntityGraph<GraphParsingTestEntity> b = parseGraph( "linkToOne(name, description)", scope );
 		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
 	}
 
-	@Test
-	public void testEqualMapKeysEqual(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.key(name, description)", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.key(description, name)", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
-	}
 
-	@Test
-	public void testDifferentMapKeysEqual1(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.key(name, description)", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.key(description)", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
-	}
-
-	@Test
-	public void testDifferentMapKeysEqual2(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.key(name)", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.key(description)", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
-	}
-
-	@Test
-	public void testEqualMapValuesEqual(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.value(name, description)", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.value(description, name)", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
-	}
-
-	@Test
-	public void testDifferentMapValuesEqual1(EntityManagerFactoryScope scop) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.value(name, description)", scop );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.value(description)", scop );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
-	}
-
-	@Test
-	public void testDifferentMapValuesEqual2(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph( "map.value(name)", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph( "map.value(description)", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
-	}
-
-	@Test
-	public void testEqualComplexGraphsEqual(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph(
-				"map.key(name, description), name, linkToOne(description), description", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph(
-				"description, map.key(description, name), name, linkToOne(description)", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
-	}
-
-	@Test
-	public void testDifferentComplexGraphsEqual(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> a = parseGraph(
-				"map.key(name, description), name, linkToOne(description), description", scope );
-		EntityGraph<GraphParsingTestEntity> b = parseGraph(
-				"description, map.value(description, name), name, linkToOne(description)", scope );
-		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
-	}
-
-	@Test
-	public void testNullsEqual(EntityManagerFactoryScope scope) {
-		assertThat( EntityGraphs.areEqual( null, (EntityGraph<GraphParsingTestEntity>) null ) ).isTrue();
-	}
-
-	@Test
-	public void testNullAndNonNullEqual(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> graph = parseGraph( "name ", scope );
-		assertThat( EntityGraphs.areEqual( graph, null ) ).isFalse();
-		assertThat( EntityGraphs.areEqual( null, graph ) ).isFalse();
-	}
-
-	@Test
-	public void testBasicMerge(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> g1 = parseGraph( "name", scope );
-		EntityGraph<GraphParsingTestEntity> g2 = parseGraph( "description", scope );
-		EntityGraph<GraphParsingTestEntity> expected = parseGraph( "name, description ", scope );
-		checkMerge( scope, expected, g1, g2 );
-	}
-
-	@Test
-	public void testLinkMerge(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> g1 = parseGraph( "linkToOne(name)", scope );
-		EntityGraph<GraphParsingTestEntity> g2 = parseGraph( "linkToOne(description)", scope );
-		EntityGraph<GraphParsingTestEntity> expected = parseGraph( "linkToOne(name, description) ", scope );
-		checkMerge( scope, expected, g1, g2 );
-	}
-
-	@Test
-	public void testMapKeyMerge(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> g1 = parseGraph( "map.key(name)", scope );
-		EntityGraph<GraphParsingTestEntity> g2 = parseGraph( "map.key(description)", scope );
-		EntityGraph<GraphParsingTestEntity> expected = parseGraph( "map.key(name, description) ", scope );
-		checkMerge( scope, expected, g1, g2 );
-	}
-
-	@Test
-	public void testMapValueMerge(EntityManagerFactoryScope scope) {
-		EntityGraph<GraphParsingTestEntity> g1 = parseGraph( "map.value(name)", scope );
-		EntityGraph<GraphParsingTestEntity> g2 = parseGraph( "map.value(description)", scope );
-		EntityGraph<GraphParsingTestEntity> expected = parseGraph( "map.value(name, description) ", scope );
-		checkMerge( scope, expected, g1, g2 );
-	}
-
-	@Test
-	@JiraKey(value = "HHH-14264")
-	public void testRootGraphAppliesToChildEntityClass(EntityManagerFactoryScope scope) {
-		RootGraphImplementor<GraphParsingTestEntity> rootGraphImplementor = parseGraph( GraphParsingTestEntity.class,
-				"name, description", scope );
-		EntityDomainType<?> entity = scope.getEntityManagerFactory().unwrap( SessionFactoryImplementor.class )
-				.getJpaMetamodel()
-				.entity( (Class<?>) GraphParsingTestSubentity.class );
-		assertThat( rootGraphImplementor.appliesTo( entity ) ).isTrue();
-	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/LegacySyntaxEntityGraphsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/LegacySyntaxEntityGraphsTest.java
new file mode 100644
index 000000000000..7d47068f896e
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/LegacySyntaxEntityGraphsTest.java
@@ -0,0 +1,52 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.graph;
+
+
+import org.hibernate.cfg.GraphParserSettings;
+import org.hibernate.graph.EntityGraphs;
+import org.hibernate.orm.test.graph.entity.GraphParsingTestEntity;
+
+import org.hibernate.orm.test.graph.entity.GraphParsingTestSubentity;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+
+
+import jakarta.persistence.EntityGraph;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Jpa(
+		annotatedClasses = {
+				GraphParsingTestEntity.class,
+				GraphParsingTestSubentity.class
+		},
+		integrationSettings = {
+				@Setting(name = GraphParserSettings.GRAPH_PARSER_MODE, value = "legacy")
+		}
+)
+public class LegacySyntaxEntityGraphsTest extends AbstractEntityGraphTest {
+
+
+	@Test
+	public void testEqualLinksWithSubclassesEqual(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph(
+				"linkToOne(name), linkToOne(GraphParsingTestSubentity: description)", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph(
+				"linkToOne(GraphParsingTestSubentity: description), linkToOne(name)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isTrue();
+	}
+
+	@Test
+	public void testDifferentLinksEqual3(EntityManagerFactoryScope scope) {
+		EntityGraph<GraphParsingTestEntity> a = parseGraph(
+				"linkToOne(name), linkToOne(GraphParsingTestSubentity: description)", scope );
+		EntityGraph<GraphParsingTestEntity> b = parseGraph( "linkToOne(name, description)", scope );
+		assertThat( EntityGraphs.areEqual( a, b ) ).isFalse();
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/entity/GraphParsingTestEntity.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/graph/entity/GraphParsingTestEntity.java
index 1b0091a3746c..d5b85440a482 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/entity/GraphParsingTestEntity.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.graph;
+package org.hibernate.orm.test.graph.entity;
 
 import java.util.Map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/entity/GraphParsingTestSubentity.java
similarity index 89%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/graph/entity/GraphParsingTestSubentity.java
index e84a55a4c092..e136a64f8968 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/GraphParsingTestSubentity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/entity/GraphParsingTestSubentity.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.graph;
+package org.hibernate.orm.test.graph.entity;
 
 import jakarta.persistence.Basic;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java
index 017fc416f159..287c70000cd3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hbm/collectionpk/CollectionPkTest.java
@@ -47,7 +47,8 @@ public void testSet() {
 		verifyPkNameUsed(
 				"org/hibernate/orm/test/hbm/collectionpk/person_set.hbm.xml",
 				"primary key (group, name)",
-				"primary key (\"group\", name)"
+				"primary key (\"group\", name)",
+				"primary key (`group`, name)"
 		);
 	}
 
@@ -70,7 +71,8 @@ public void testMap() {
 		verifyPkNameUsed(
 				"org/hibernate/orm/test/hbm/collectionpk/person_map.hbm.xml",
 				"primary key (group, locale)",
-				"primary key (\"group\", locale)"
+				"primary key (\"group\", locale)",
+				"primary key (`group`, locale)"
 		);
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java
index f1a6d8121017..d7f0229e7529 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java
@@ -106,10 +106,10 @@
 				"/org/hibernate/orm/test/hql/VariousKeywordPropertyEntity.hbm.xml",
 				"/org/hibernate/orm/test/hql/Constructor.hbm.xml",
 				"/org/hibernate/orm/test/batchfetch/ProductLine.xml",
-				"/org/hibernate/orm/test/cid/Customer.hbm.xml",
-				"/org/hibernate/orm/test/cid/Order.hbm.xml",
-				"/org/hibernate/orm/test/cid/LineItem.hbm.xml",
-				"/org/hibernate/orm/test/cid/Product.hbm.xml",
+				"/org/hibernate/orm/test/cid/Customer.orm.xml",
+				"/org/hibernate/orm/test/cid/Order.orm.xml",
+				"/org/hibernate/orm/test/cid/LineItem.orm.xml",
+				"/org/hibernate/orm/test/cid/Product.orm.xml",
 				"/org/hibernate/orm/test/any/xml/Properties.xml",
 				"/org/hibernate/orm/test/legacy/Commento.hbm.xml",
 				"/org/hibernate/orm/test/legacy/Marelo.hbm.xml"
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java
index 3921a8886613..20232a2213d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java
@@ -11,6 +11,7 @@
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.generator.Generator;
 import org.hibernate.id.BulkInsertionCapableIdentifierGenerator;
@@ -65,6 +66,7 @@
 		}
 )
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "temporary skip, high memory usage of spanner emulator")
 public class BulkManipulationTest {
 
 	@AfterEach
@@ -358,7 +360,7 @@ public void testSimpleNativeQueryManipulations(SessionFactoryScope factoryScope)
 
 		// deletes
 		factoryScope.inTransaction( (session) -> {
-			int deleteCount = session.createNativeQuery( "delete from Truck" ).executeUpdate();
+			int deleteCount = session.createNativeQuery( "delete from Truck where 1=1" ).executeUpdate();
 			assertEquals( 1, deleteCount );
 
 			List<?> l = session.createQuery( "from Vehicle" ).list();
@@ -378,7 +380,7 @@ public void testSimpleNativeQueryManipulations(SessionFactoryScope factoryScope)
 					.setParameter( "owner", "Joe" )
 					.executeUpdate() );
 
-			session.createNativeQuery( "delete from Pickup" ).executeUpdate();
+			session.createNativeQuery( "delete from Pickup where 1=1" ).executeUpdate();
 			l = session.createQuery( "from Vehicle" ).list();
 			assertEquals( 0, l.size() );
 		} );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DmlSelfReferencingSubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DmlSelfReferencingSubqueryTest.java
new file mode 100644
index 000000000000..0e8501baef54
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/DmlSelfReferencingSubqueryTest.java
@@ -0,0 +1,420 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.hql;
+
+import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.dialect.MySQLDialect;
+
+import org.hibernate.testing.orm.domain.StandardDomainModel;
+import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author Yoobin Yoon
+ */
+@JiraKey("HHH-18040")
+@DomainModel(standardModels = StandardDomainModel.GAMBIT)
+@RequiresDialect(MySQLDialect.class)
+@RequiresDialect(MariaDBDialect.class)
+@SessionFactory
+public class DmlSelfReferencingSubqueryTest {
+
+	@BeforeEach
+	void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			EntityOfBasics e1 = new EntityOfBasics( 1 );
+			e1.setTheString( "A" );
+			e1.setTheInteger( 100 );
+			session.persist( e1 );
+
+			EntityOfBasics e2 = new EntityOfBasics( 2 );
+			e2.setTheString( "B" );
+			e2.setTheInteger( 200 );
+			session.persist( e2 );
+
+			EntityOfBasics e3 = new EntityOfBasics( 3 );
+			e3.setTheString( "C" );
+			e3.setTheInteger( 300 );
+			session.persist( e3 );
+
+			EntityOfBasics e4 = new EntityOfBasics( 4 );
+			e4.setTheString( "D" );
+			e4.setTheInteger( 150 );
+			session.persist( e4 );
+		} );
+	}
+
+	@AfterEach
+	void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			session.createMutationQuery( "delete from EntityOfBasics" ).executeUpdate();
+		} );
+	}
+
+	@Test
+	void testDeleteWithExistsSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where exists (select 1 from EntityOfBasics e2 where e2.theInteger > e.theInteger)"
+			).executeUpdate();
+
+			assertEquals( 3, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 1, count );
+		} );
+	}
+
+	@Test
+	void testDeleteWithNotExistsSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where not exists (select 1 from EntityOfBasics e2 where e2.theInteger > e.theInteger)"
+			).executeUpdate();
+
+			assertEquals( 1, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 3, count );
+		} );
+	}
+
+	@Test
+	void testUpdateWithExistsSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int updated = session.createMutationQuery(
+					"update EntityOfBasics e set e.theInteger = e.theInteger * 2 where exists (select 1 from EntityOfBasics e2 where e2.theInteger < e.theInteger)"
+			).executeUpdate();
+
+			assertEquals( 3, updated );
+		} );
+
+		scope.inTransaction( session -> {
+			Integer value100 = session.createSelectionQuery(
+					"select e.theInteger from EntityOfBasics e where e.id = 1", Integer.class
+			).getSingleResult();
+			assertEquals( 100, value100 );
+
+			Integer value200 = session.createSelectionQuery(
+					"select e.theInteger from EntityOfBasics e where e.id = 2", Integer.class
+			).getSingleResult();
+			assertEquals( 400, value200 );
+		} );
+	}
+
+	@Test
+	void testDeleteWithInSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where e.theInteger in (select e2.theInteger from EntityOfBasics e2 where e2.theInteger < 200)"
+			).executeUpdate();
+
+			assertEquals( 2, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 2, count );
+		} );
+	}
+
+	@Test
+	void testDeleteWithNotInSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where e.theInteger not in (select e2.theInteger from EntityOfBasics e2 where e2.theInteger < 200)"
+			).executeUpdate();
+
+			assertEquals( 2, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 2, count );
+		} );
+	}
+
+	@Test
+	void testUpdateWithInSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int updated = session.createMutationQuery(
+					"update EntityOfBasics e set e.theInteger = 0 where e.theString in (select e2.theString from EntityOfBasics e2 where e2.theInteger >= 200)"
+			).executeUpdate();
+
+			assertEquals( 2, updated );
+		} );
+
+		scope.inTransaction( session -> {
+			Long countZero = session.createSelectionQuery(
+					"select count(*) from EntityOfBasics e where e.theInteger = 0", Long.class
+			).getSingleResult();
+			assertEquals( 2, countZero );
+		} );
+	}
+
+	@Test
+	void testDeleteWithScalarSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where e.theInteger < (select avg(e2.theInteger) from EntityOfBasics e2)"
+			).executeUpdate();
+
+			assertEquals( 2, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 2, count );
+		} );
+	}
+
+	@Test
+	void testDeleteWithAnySubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where e.theInteger > any (select e2.theInteger from EntityOfBasics e2 where e2.theInteger < 200)"
+			).executeUpdate();
+
+			assertEquals( 3, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 1, count );
+		} );
+	}
+
+	@Test
+	void testDeleteWithAllSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where e.theInteger > all (select e2.theInteger from EntityOfBasics e2 where e2.theInteger < 200)"
+			).executeUpdate();
+
+			assertEquals( 2, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 2, count );
+		} );
+	}
+
+	@Test
+	void testDeleteWithCorrelatedSubquery(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where e.theInteger = (select max(e2.theInteger) from EntityOfBasics e2 where e2.theString = e.theString)"
+			).executeUpdate();
+
+			assertEquals( 4, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 0, count );
+		} );
+	}
+
+	@Test
+	void testUpdateWithNestedCorrelatedSubqueryInSetClause(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int updated = session.createMutationQuery(
+					"update EntityOfBasics e1 " +
+							"set e1.theInteger = (" +
+							"  select coalesce(max(e2.theInteger), 0) from EntityOfBasics e2 " +
+							"  where e2.theInteger < (" +
+							"    select avg(e3.theInteger) from EntityOfBasics e3 " +
+							"    where e3.theString = e2.theString" +
+							"  )" +
+							") " +
+							"where e1.id = 1"
+			).executeUpdate();
+
+			assertEquals( 1, updated );
+		} );
+	}
+
+	@Test
+	void testDeleteWithTupleInSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where (e.id, e.theInteger) in (select e2.id, e2.theInteger from EntityOfBasics e2 where e2.theInteger < 200)"
+			).executeUpdate();
+
+			assertEquals( 2, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 2, count );
+		} );
+	}
+
+	@Test
+	void testDeleteWithTupleInGroupBySubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where (e.theString, e.theInteger) in (" +
+							"  select e2.theString, max(e2.theInteger) from EntityOfBasics e2 " +
+							"  group by e2.theString" +
+							")"
+			).executeUpdate();
+
+			assertEquals( 4, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 0, count );
+		} );
+	}
+
+	@Test
+	void testDeleteWithTupleInGroupByHavingSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			EntityOfBasics e5 = new EntityOfBasics( 5 );
+			e5.setTheString( "A" );
+			e5.setTheInteger( 50 );
+			session.persist( e5 );
+		} );
+
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where (e.theString, e.theInteger) in (" +
+							"  select e2.theString, max(e2.theInteger) from EntityOfBasics e2 " +
+							"  group by e2.theString " +
+							"  having count(*) > 1" +
+							")"
+			).executeUpdate();
+
+			assertEquals( 1, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 4, count );
+		} );
+	}
+
+	@Test
+	void testDeleteWithTupleComparisonSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where (e.id, e.theInteger) < all (select e2.id, e2.theInteger from EntityOfBasics e2 where e2.theInteger > 200)"
+			).executeUpdate();
+
+			assertEquals( 2, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 2, count );
+		} );
+	}
+
+	@Test
+	void testUpdateWithTupleInSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int updated = session.createMutationQuery(
+					"update EntityOfBasics e set e.theInteger = 0 where (e.theString, e.theInteger) in (select e2.theString, e2.theInteger from EntityOfBasics e2 where e2.theInteger >= 200)"
+			).executeUpdate();
+
+			assertEquals( 2, updated );
+		} );
+
+		scope.inTransaction( session -> {
+			Long countZero = session.createSelectionQuery(
+					"select count(*) from EntityOfBasics e where e.theInteger = 0", Long.class
+			).getSingleResult();
+			assertEquals( 2, countZero );
+		} );
+	}
+
+	@Test
+	void testUpdateWithSetClauseSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int updated = session.createMutationQuery(
+					"update EntityOfBasics e set e.theInteger = (select max(e2.theInteger) from EntityOfBasics e2) where e.theInteger < 200"
+			).executeUpdate();
+
+			assertEquals( 2, updated );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery(
+					"select count(*) from EntityOfBasics where theInteger = 300", Long.class
+			).getSingleResult();
+			assertEquals( 3, count );
+		} );
+	}
+
+	@Test
+	void testDeleteWithNestedSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int deleted = session.createMutationQuery(
+					"delete from EntityOfBasics e where e.theInteger > (" +
+							"  select avg(e2.theInteger) from EntityOfBasics e2 " +
+							"  where e2.theInteger < (select max(e3.theInteger) from EntityOfBasics e3)" +
+							")"
+			).executeUpdate();
+
+			assertEquals( 2, deleted );
+		} );
+
+		scope.inTransaction( session -> {
+			long count = session.createSelectionQuery( "select count(*) from EntityOfBasics", Long.class )
+					.getSingleResult();
+			assertEquals( 2, count );
+		} );
+	}
+
+	@Test
+	void testUpdateWithNestedSubqueryReferencingSameTable(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			int updated = session.createMutationQuery(
+					"update EntityOfBasics e set e.theInteger = 104 where e.theInteger > (" +
+							"  select avg(e2.theInteger) from EntityOfBasics e2 " +
+							"  where e2.theInteger < (select max(e3.theInteger) from EntityOfBasics e3)" +
+							")"
+			).executeUpdate();
+
+			assertEquals( 2, updated );
+		} );
+
+		scope.inTransaction( session -> {
+			Long count104 = session.createSelectionQuery(
+					"select count(*) from EntityOfBasics e where e.theInteger = 104", Long.class
+			).getSingleResult();
+			assertEquals( 2, count104 );
+		} );
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLInsertAndUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLInsertAndUpdateTest.java
new file mode 100644
index 000000000000..0f2670026090
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLInsertAndUpdateTest.java
@@ -0,0 +1,196 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.hql;
+
+import org.hibernate.testing.orm.domain.userguide.Account;
+import org.hibernate.testing.orm.domain.userguide.AddressType;
+import org.hibernate.testing.orm.domain.userguide.Call;
+import org.hibernate.testing.orm.domain.userguide.CreditCardPayment;
+import org.hibernate.testing.orm.domain.userguide.Person;
+import org.hibernate.testing.orm.domain.userguide.Phone;
+import org.hibernate.testing.orm.domain.userguide.PhoneType;
+import org.hibernate.testing.orm.domain.userguide.WireTransferPayment;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Test class for all HQL tests involving Insert or Update.
+ *
+ * @author Loïc Lefèvre
+ */
+@SuppressWarnings({"unused", "JUnitMalformedDeclaration", "removal", "deprecation"})
+@DomainModel(annotatedClasses = {
+		Person.class,
+		Phone.class,
+		Call.class,
+		Account.class,
+		CreditCardPayment.class,
+		WireTransferPayment.class
+})
+@SessionFactory
+public class HQLInsertAndUpdateTest {
+	@AfterEach
+	void dropTestData(SessionFactoryScope factoryScope) {
+		factoryScope.dropData();
+	}
+
+	@BeforeEach
+	public void createTestData(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (entityManager) -> {
+			Person person1 = new Person("John Doe");
+			person1.setNickName("JD");
+			person1.setAddress("Earth");
+			person1.setCreatedOn( LocalDateTime.of(2000, 1, 1, 0, 0, 0)) ;
+			person1.getAddresses().put( AddressType.HOME, "Home address");
+			person1.getAddresses().put(AddressType.OFFICE, "Office address");
+			entityManager.persist(person1);
+
+			Person person2 = new Person("Mrs. John Doe");
+			person2.setAddress("Earth");
+			person2.setCreatedOn(LocalDateTime.of(2000, 1, 2, 12, 0, 0)) ;
+			entityManager.persist(person2);
+
+			Person person3 = new Person("Dr_ John Doe");
+			entityManager.persist(person3);
+
+			Phone phone1 = new Phone("123-456-7890");
+			phone1.setId(1L);
+			phone1.setType( PhoneType.MOBILE);
+			person1.addPhone(phone1);
+			phone1.getRepairTimestamps().add(LocalDateTime.of(2005, 1, 1, 12, 0, 0));
+			phone1.getRepairTimestamps().add(LocalDateTime.of(2006, 1, 1, 12, 0, 0));
+
+			Call call11 = new Call();
+			call11.setDuration(12);
+			call11.setTimestamp(LocalDateTime.of(2000, 1, 1, 0, 0, 0));
+
+			Call call12 = new Call();
+			call12.setDuration(33);
+			call12.setTimestamp(LocalDateTime.of(2000, 1, 1, 1, 0, 0));
+
+			phone1.addCall(call11);
+			phone1.addCall(call12);
+
+			Phone phone2 = new Phone("098-765-4321");
+			phone2.setId(2L);
+			phone2.setType(PhoneType.LAND_LINE);
+
+			Phone phone3 = new Phone("098-765-4320");
+			phone3.setId(3L);
+			phone3.setType(PhoneType.LAND_LINE);
+
+			person2.addPhone(phone2);
+			person2.addPhone(phone3);
+
+			Account account1 = new Account();
+			account1.setOwner(person1);
+			entityManager.persist(account1);
+
+			Account account2 = new Account();
+			account1.setOwner(person2);
+			entityManager.persist(account2);
+
+			CreditCardPayment creditCardPayment = new CreditCardPayment();
+			creditCardPayment.setCompleted(true);
+			creditCardPayment.setAmount( BigDecimal.ZERO);
+			creditCardPayment.setPerson(person1);
+			creditCardPayment.setCardNumber("1234-1234-1234-1234");
+			creditCardPayment.setAccount(account1);
+			call11.setPayment(creditCardPayment);
+
+			WireTransferPayment wireTransferPayment = new WireTransferPayment();
+			wireTransferPayment.setCompleted(true);
+			wireTransferPayment.setAmount(BigDecimal.valueOf(100));
+			wireTransferPayment.setPerson(person2);
+			wireTransferPayment.setAccount(account2);
+			call12.setPayment(wireTransferPayment);
+
+			entityManager.persist(creditCardPayment);
+			entityManager.persist(wireTransferPayment);
+		} );
+	}
+
+	@Test
+	public void hql_insert_example(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( entityManager -> {
+			//tag::hql-insert-example[]
+			entityManager.createQuery(
+				"insert Person (id, name) " +
+				"values (100L, 'Jane Doe')")
+			.executeUpdate();
+			//end::hql-insert-example[]
+		});
+	}
+
+	@Test
+	public void hql_multi_insert_example(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( entityManager -> {
+			//tag::hql-insert-example[]
+			entityManager.createQuery(
+				"insert Person (id, name) " +
+				"values (101L, 'J A Doe III'), " +
+				"(102L, 'J X Doe'), " +
+				"(103L, 'John Doe, Jr')")
+			.executeUpdate();
+			//end::hql-insert-example[]
+		});
+	}
+
+	@Test
+	public void hql_insert_with_sequence_example(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( entityManager -> {
+			entityManager.createQuery(
+				"insert Person (name) values ('Jane Doe2')" )
+			.executeUpdate();
+		});
+	}
+
+	@Test
+	public void hql_update_example(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( entityManager -> {
+			//tag::hql-update-example[]
+			entityManager.createQuery(
+				"update Person set nickName = 'Nacho' " +
+				"where name = 'Ignacio'")
+			.executeUpdate();
+			//end::hql-update-example[]
+		});
+	}
+
+	@Test
+	public void test_hql_group_by_example_4(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( entityManager -> {
+
+			Call call11 = new Call();
+			call11.setDuration(10);
+			call11.setTimestamp(LocalDateTime.of(2000, 1, 1, 0, 0, 0));
+
+			Phone phone = entityManager.createQuery("select p from Phone p where p.calls is empty ", Phone.class).getResultList().get(0);
+
+			phone.addCall(call11);
+			entityManager.flush();
+			entityManager.clear();
+
+			List<Object[]> personTotalCallDurations = entityManager.createQuery(
+							"select p, sum(c.duration) " +
+							"from Call c " +
+							"join c.phone p " +
+							"group by p", Object[].class)
+					.getResultList();
+			assertEquals(2, personTotalCallDurations.size());
+		});
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLTest.java
index 7994df88d6e8..d65157d16fda 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HQLTest.java
@@ -20,6 +20,7 @@
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.query.QueryProducer;
 import org.hibernate.testing.orm.domain.userguide.Account;
@@ -42,7 +43,7 @@
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.StandardBasicTypes;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
@@ -63,7 +64,10 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
+ * HQL Insert and Update tests can be found inside {@code HQLInsertAndUpdateTest}.
+ *
  * @author Vlad Mihalcea
+ * @author Loïc Lefèvre
  */
 @SuppressWarnings({"unused", "JUnitMalformedDeclaration", "removal", "deprecation"})
 @DomainModel(annotatedClasses = {
@@ -79,10 +83,10 @@ public class HQLTest {
 
 	@AfterEach
 	void dropTestData(SessionFactoryScope factoryScope) {
-		factoryScope.dropData();
+		// factoryScope.dropData();
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void createTestData(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (entityManager) -> {
 			Person person1 = new Person("John Doe");
@@ -228,53 +232,6 @@ public void test_hql_select_no_from(SessionFactoryScope factoryScope) {
 		});
 	}
 
-	@Test
-	public void hql_update_example(SessionFactoryScope factoryScope) {
-		factoryScope.inTransaction( entityManager -> {
-			//tag::hql-update-example[]
-			entityManager.createQuery(
-				"update Person set nickName = 'Nacho' " +
-				"where name = 'Ignacio'")
-			.executeUpdate();
-			//end::hql-update-example[]
-		});
-	}
-
-	@Test
-	public void hql_insert_example(SessionFactoryScope factoryScope) {
-		factoryScope.inTransaction( entityManager -> {
-			//tag::hql-insert-example[]
-			entityManager.createQuery(
-				"insert Person (id, name) " +
-				"values (100L, 'Jane Doe')")
-			.executeUpdate();
-			//end::hql-insert-example[]
-		});
-	}
-
-	@Test
-	public void hql_multi_insert_example(SessionFactoryScope factoryScope) {
-		factoryScope.inTransaction( entityManager -> {
-			//tag::hql-insert-example[]
-			entityManager.createQuery(
-				"insert Person (id, name) " +
-				"values (101L, 'J A Doe III'), " +
-				"(102L, 'J X Doe'), " +
-				"(103L, 'John Doe, Jr')")
-			.executeUpdate();
-			//end::hql-insert-example[]
-		});
-	}
-
-	@Test
-	public void hql_insert_with_sequence_example(SessionFactoryScope factoryScope) {
-		factoryScope.inTransaction( entityManager -> {
-			entityManager.createQuery(
-				"insert Person (name) values ('Jane Doe2')" )
-			.executeUpdate();
-		});
-	}
-
 	@Test
 	public void hql_select_simplest_jpql_fqn_example(SessionFactoryScope  factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
@@ -1724,6 +1681,7 @@ public void test_hql_sqrt_function_example(SessionFactoryScope factoryScope) {
 	@Test
 	@SkipForDialect(dialectClass = SQLServerDialect.class)
 	@SkipForDialect(dialectClass = DerbyDialect.class, reason = "Comparisons between 'DATE' and 'TIMESTAMP' are not supported")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTimestampWithDateComparison.class)
 	public void test_hql_current_date_function_example(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
 			//tag::hql-current-date-function-example[]
@@ -1786,6 +1744,7 @@ public void test_hql_current_timestamp_function_example(SessionFactoryScope fact
 	}
 
 	@Test
+	@RequiresDialectFeature( feature =  DialectFeatureChecks.SupportsVarSampFunction.class )
 	public void test_var_function_example(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
 			//tag::hql-native-function-example[]
@@ -1895,7 +1854,7 @@ public void test_hql_str_function_example_sql_server(SessionFactoryScope factory
 	@Test
 	public void test_hql_collection_expressions_example_1(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
-			Call call = entityManager.createQuery("select c from Call c", Call.class).getResultList().get(1);
+			Call call = entityManager.createQuery("select c from Call c order by c.id desc", Call.class).getResultList().get(0);
 			//tag::hql-collection-expressions-example[]
 			List<Phone> phones = entityManager.createQuery(
 				"select p " +
@@ -1912,7 +1871,7 @@ public void test_hql_collection_expressions_example_1(SessionFactoryScope factor
 	@Test
 	public void test_hql_collection_expressions_example_2(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
-			Call call = entityManager.createQuery("select c from Call c", Call.class).getResultList().get(0);
+			Call call = entityManager.createQuery("select c from Call c order by c.id asc", Call.class).getResultList().get(0);
 			//tag::hql-collection-expressions-example[]
 
 			List<Phone> phones = entityManager.createQuery(
@@ -2000,6 +1959,7 @@ public void test_hql_collection_expressions_example_6(SessionFactoryScope factor
 
 	@Test
 	@SkipForDialect(dialectClass = DerbyDialect.class, reason = "Comparisons between 'DATE' and 'TIMESTAMP' are not supported")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTimestampWithDateComparison.class)
 	public void test_hql_collection_expressions_example_8(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
 			//tag::hql-collection-expressions-all-example[]
@@ -2440,6 +2400,7 @@ public void test_hql_relational_comparisons_example_2(SessionFactoryScope factor
 	@RequiresDialect(H2Dialect.class)
 	@RequiresDialect(PostgreSQLDialect.class)
 	@RequiresDialect(MySQLDialect.class)
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsTimestampComparison.class )
 	public void test_hql_relational_comparisons_example_3(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
 			//tag::hql-relational-comparisons-example[]
@@ -2609,6 +2570,7 @@ public void test_hql_like_predicate_example_2(SessionFactoryScope factoryScope)
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerDialect.class, reason = "temporary skip")
 	public void test_hql_like_predicate_escape_example(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
 			//tag::hql-like-predicate-escape-example[]
@@ -2644,6 +2606,7 @@ public void test_hql_between_predicate_example_1(SessionFactoryScope factoryScop
 	@RequiresDialect(H2Dialect.class)
 	@RequiresDialect(PostgreSQLDialect.class)
 	@RequiresDialect(MySQLDialect.class)
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsTimestampComparison.class )
 	public void test_hql_between_predicate_example_2(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
 			//tag::hql-between-predicate-example[]
@@ -2914,30 +2877,6 @@ public void test_hql_group_by_example_3(SessionFactoryScope factoryScope) {
 		});
 	}
 
-	@Test
-	public void test_hql_group_by_example_4(SessionFactoryScope factoryScope) {
-		factoryScope.inTransaction( entityManager -> {
-
-			Call call11 = new Call();
-			call11.setDuration(10);
-			call11.setTimestamp(LocalDateTime.of(2000, 1, 1, 0, 0, 0));
-
-			Phone phone = entityManager.createQuery("select p from Phone p where p.calls is empty ", Phone.class).getResultList().get(0);
-
-			phone.addCall(call11);
-			entityManager.flush();
-			entityManager.clear();
-
-			List<Object[]> personTotalCallDurations = entityManager.createQuery(
-				"select p, sum(c.duration) " +
-				"from Call c " +
-				"join c.phone p " +
-				"group by p", Object[].class)
-			.getResultList();
-			assertEquals(2, personTotalCallDurations.size());
-		});
-	}
-
 	@Test
 	public void test_hql_group_by_having_example(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlParserMemoryUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlParserMemoryUsageTest.java
index 495a00eeba0d..d7d5abcb3ad4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlParserMemoryUsageTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/HqlParserMemoryUsageTest.java
@@ -88,7 +88,7 @@ public void testParserMemoryUsage(SessionFactoryScope scope) {
 		// and after the fix it dropped to 170 - 250 MB
 		final long memoryUsage = MemoryUsageUtil.estimateMemoryUsage( () -> hqlTranslator.translate( HQL, Long.class ) );
 		System.out.println( "Memory Consumption: " + (memoryUsage / 1024) + " KB" );
-		assertTrue( memoryUsage < 256_000_000, "Parsing of queries consumes too much memory (" + ( memoryUsage / 1024 ) + " KB), when at most 256 MB are expected" );
+		assertTrue( memoryUsage < 260_000_000, "Parsing of queries consumes too much memory (" + ( memoryUsage / 1024 ) + " KB), when at most 256 MB are expected" );
 	}
 
 	@Entity(name = "Address")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapJoinKeyValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapJoinKeyValueTests.java
index b97c24fbfab8..459168401f4c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapJoinKeyValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapJoinKeyValueTests.java
@@ -100,7 +100,7 @@ static class Book {
 		Map<Language, Book> translations;
 	}
 
-	@Entity
+	@Entity(name = "Language")
 	static class Language {
 		@Id
 		String id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java
index 3fdfdc50434e..45cabc140e67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterIsNullTest.java
@@ -70,7 +70,7 @@ public void testEmptyCollectionParam(SessionFactoryScope scope) {
 			}
 			catch (Exception e) {
 				assertThat( e ).isInstanceOf( IllegalArgumentException.class );
-				assertThat( e.getMessage() ).contains( "Parameter value", "did not match expected type" );
+				assertThat( e.getMessage() ).contains( "Argument to query parameter has an incompatible type", "is not assignable to" );
 			}
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionSelectClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionSelectClauseTest.java
index b980683b51eb..2b6ff784a861 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionSelectClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionSelectClauseTest.java
@@ -9,6 +9,7 @@
 import jakarta.persistence.Tuple;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.FunctionContributor;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators;
 import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
@@ -16,6 +17,7 @@
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.StandardBasicTypes;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
@@ -35,6 +37,7 @@
 ) )
 @DomainModel(annotatedClasses = PostgreSQLFunctionSelectClauseTest.Book.class)
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support functions")
 public class PostgreSQLFunctionSelectClauseTest {
 	@BeforeEach
 	void setUp(SessionFactoryScope factoryScope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionWhereClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionWhereClauseTest.java
index 3258011790b6..e266559f4ab1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionWhereClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/PostgreSQLFunctionWhereClauseTest.java
@@ -7,12 +7,14 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import org.hibernate.boot.model.FunctionContributor;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -31,6 +33,7 @@
 ) )
 @DomainModel( annotatedClasses = PostgreSQLFunctionWhereClauseTest.Book.class )
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support functions")
 public class PostgreSQLFunctionWhereClauseTest {
 	@BeforeEach
 	void setUp(SessionFactoryScope factoryScope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QueryComparingAssociationToNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QueryComparingAssociationToNullTest.java
index 9b4e1db5c9fa..79f10c6493e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QueryComparingAssociationToNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QueryComparingAssociationToNullTest.java
@@ -9,6 +9,7 @@
 import org.hibernate.community.dialect.DerbyDialect;
 
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -34,6 +35,7 @@
 @JiraKey("HHH-16974")
 @SkipForDialect( dialectClass = DerbyDialect.class, reason = "it does not like '= null'")
 @SkipForDialect( dialectClass = InformixDialect.class, reason = "it does not like '= null'")
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "it does not like '= null'")
 public class QueryComparingAssociationToNullTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QuotedIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QuotedIdentifierTest.java
index 626ee9ca2e94..8344b598ac2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QuotedIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/QuotedIdentifierTest.java
@@ -7,6 +7,8 @@
 import java.util.List;
 
 import org.hibernate.annotations.processing.Exclude;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 
@@ -16,6 +18,7 @@
 import jakarta.persistence.Tuple;
 import jakarta.persistence.TypedQuery;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +32,8 @@
 @Exclude
 @DomainModel(annotatedClasses = QuotedIdentifierTest.Person.class)
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support creating tables with spaces")
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner doesn't support creating tables with spaces")
 public class QuotedIdentifierTest {
 
 	@BeforeEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java
index e564699e6eec..ee357fb9f72c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java
@@ -7,7 +7,6 @@
 import org.hibernate.Hibernate;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
-import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.community.dialect.DerbyDialect;
 
@@ -96,7 +95,7 @@ public void testUknownPathFailure(SessionFactoryScope scope) {
 
 	@Test
 	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 15, versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "HHH-5229")
-	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA only supports forward-only cursors.")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsBackwardsScrollableResultSets.class)
 	public void testScrollingJoinFetchesEmptyResultSet(SessionFactoryScope scope) {
 		scope.inTransaction(
 				s -> {
@@ -164,7 +163,7 @@ public void testScrollingJoinFetchesEmptyResultSet(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTemporaryTable.class)
-	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA only supports forward-only cursors")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsBackwardsScrollableResultSets.class)
 	public void testScrollingJoinFetchesSingleRowResultSet(SessionFactoryScope scope) {
 
 		scope.inTransaction(
@@ -315,7 +314,7 @@ public void testScrollingJoinFetchesForward(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTemporaryTable.class)
-	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA only supports forward-only cursors.")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsBackwardsScrollableResultSets.class)
 	public void testScrollingJoinFetchesReverse(SessionFactoryScope scope) {
 		TestData data = new TestData();
 		data.prepare( scope );
@@ -343,7 +342,7 @@ public void testScrollingJoinFetchesReverse(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTemporaryTable.class)
-	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA only supports forward-only cursors.")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsBackwardsScrollableResultSets.class)
 	public void testScrollingJoinFetchesWithNext(SessionFactoryScope scope) {
 		TestData data = new TestData();
 		data.prepare( scope );
@@ -375,7 +374,7 @@ public void testScrollingJoinFetchesWithNext(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTemporaryTable.class)
-	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA only supports forward-only cursors.")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsBackwardsScrollableResultSets.class)
 	public void testScrollingNoJoinFetchesWithNext(SessionFactoryScope scope) {
 		TestData data = new TestData();
 		data.prepare( scope );
@@ -407,7 +406,7 @@ public void testScrollingNoJoinFetchesWithNext(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTemporaryTable.class)
-	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA only supports forward-only cursors.")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsBackwardsScrollableResultSets.class)
 	public void testScrollingJoinFetchesPositioning(SessionFactoryScope scope) {
 		TestData data = new TestData();
 		data.prepare( scope );
@@ -475,7 +474,7 @@ public void testScrollingJoinFetchesPositioning(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTemporaryTable.class)
-	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA only supports forward-only cursors.")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsBackwardsScrollableResultSets.class)
 	public void testScrollingNoJoinFetchesPositioning(SessionFactoryScope scope) {
 		TestData data = new TestData();
 		data.prepare( scope );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SingleSelectionArrayResultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SingleSelectionArrayResultTest.java
index e99c9b54d8b6..d40aaa894e14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SingleSelectionArrayResultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SingleSelectionArrayResultTest.java
@@ -8,6 +8,7 @@
 
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.Query;
 import org.hibernate.query.SelectionQuery;
@@ -81,7 +82,12 @@ public void testNativeQueryObjectResult(String ql, Object arg1, Object arg2, Ses
 			if ( arg1 instanceof String ) {
 				query.setParameter( (String) arg1, arg2 );
 			}
-			assertThat( query.getSingleResult() ).isInstanceOf( Integer.class ).isEqualTo( 1 );
+			if (scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect) {
+				assertThat( query.getSingleResult() ).isInstanceOf( Long.class ).isEqualTo( 1L );
+			}
+			else {
+				assertThat( query.getSingleResult() ).isInstanceOf( Integer.class ).isEqualTo( 1 );
+			}
 		} );
 	}
 
@@ -126,7 +132,7 @@ public void testNativeQueryArrayResult(String ql, Object arg1, Object arg2, Sess
 			if ( arg1 instanceof String ) {
 				query.setParameter( (String) arg1, arg2 );
 			}
-			assertThat( query.getSingleResult() ).containsExactly( 1 );
+			assertThat( query.getSingleResult() ).containsAnyOf( 1, 1L );
 		} );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java
index 0eef5c88b5b7..e25492b7c067 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/SubQueryTest.java
@@ -21,6 +21,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * NOTE : some subquery related tests still exist in other test classes in the suite.
  * This is a later attempt to create a more targeted set of subquery related tests.
@@ -81,8 +83,8 @@ and exists( from r.branch.leaves as s where s.leafName = 'leaf1')
 			Root rootQueried = session.createQuery( qry, Root.class ).uniqueResult();
 			Assertions.assertEquals( "root name", rootQueried.rootName );
 			Assertions.assertEquals( "branch", rootQueried.branch.branchName );
-			Assertions.assertEquals( "leaf1", rootQueried.branch.leaves.get( 0 ).leafName );
-			Assertions.assertEquals( "leaf2", rootQueried.branch.leaves.get( 1 ).leafName );
+			assertThat(List.of( rootQueried.branch.leaves.get( 0 ).leafName, rootQueried.branch.leaves.get( 1 ).leafName) )
+					.containsExactlyInAnyOrder( "leaf1", "leaf2" );
 		} );
 
 		sessions.inTransaction( (session) -> {
@@ -103,8 +105,8 @@ where exists( from r.branch.leaves as s where r.branch.branchName = 'branch'
 			var rootQueried = session.createQuery( qry, Root.class ).uniqueResult();
 			Assertions.assertEquals( "root name", rootQueried.rootName );
 			Assertions.assertEquals( "branch", rootQueried.branch.branchName );
-			Assertions.assertEquals( "leaf1", rootQueried.branch.leaves.get( 0 ).leafName );
-			Assertions.assertEquals( "leaf2", rootQueried.branch.leaves.get( 1 ).leafName );
+			assertThat(List.of( rootQueried.branch.leaves.get( 0 ).leafName, rootQueried.branch.leaves.get( 1 ).leafName) )
+					.containsExactlyInAnyOrder( "leaf1", "leaf2" );
 		} );
 
 		sessions.inTransaction( (session) -> {
@@ -115,8 +117,8 @@ where exists( from Root r1 where r1.branch.branchName = r.branch.branchName and
 			var rootQueried = session.createQuery( qry, Root.class ).uniqueResult();
 			Assertions.assertEquals( "root name", rootQueried.rootName );
 			Assertions.assertEquals( "branch", rootQueried.branch.branchName );
-			Assertions.assertEquals( "leaf1", rootQueried.branch.leaves.get( 0 ).leafName );
-			Assertions.assertEquals( "leaf2", rootQueried.branch.leaves.get( 1 ).leafName );
+			assertThat(List.of( rootQueried.branch.leaves.get( 0 ).leafName, rootQueried.branch.leaves.get( 1 ).leafName) )
+					.containsExactlyInAnyOrder( "leaf1", "leaf2" );
 		} );
 
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java
index f7acb9c7a1de..b4746ba19390 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/NonUniqueIdTest.java
@@ -10,8 +10,10 @@
 
 import org.hibernate.HibernateException;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterAll;
@@ -27,6 +29,7 @@
 		annotatedClasses = NonUniqueIdTest.Category.class
 )
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsTableWithoutPrimaryKey.class )
 public class NonUniqueIdTest {
 
 	@BeforeAll
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java
index 4b562f0db901..bee5cc978dde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/PooledHiLoSequenceIdentifierTest.java
@@ -102,7 +102,7 @@ private void insertNewRow(Session session) {
 				connection -> {
 					PreparedStatement statement = null;
 					try {
-						statement = connection.prepareStatement( "INSERT INTO sequenceIdentifier VALUES (?,?)" );
+						statement = connection.prepareStatement( "INSERT INTO sequenceIdentifier (id, name) VALUES (?,?)" );
 						statement.setObject(
 								1,
 								((BeforeExecutionGenerator) sfi.getMappingMetamodel().getEntityDescriptor( SequenceIdentifier.class).getGenerator())
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceStyleGeneratorBehavesLikeSequenceHiloGeneratorWithZeroIncrementSizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceStyleGeneratorBehavesLikeSequenceHiloGeneratorWithZeroIncrementSizeTest.java
index 7212beb6fb7f..3f27abb2162b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceStyleGeneratorBehavesLikeSequenceHiloGeneratorWithZeroIncrementSizeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/SequenceStyleGeneratorBehavesLikeSequenceHiloGeneratorWithZeroIncrementSizeTest.java
@@ -26,6 +26,7 @@
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.Value;
 import org.hibernate.service.ServiceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.Type;
 
@@ -45,6 +46,7 @@
  * @author Andrea Boriero
  */
 @RequiresDialectFeature(feature = SupportsSequences.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportSelectPreviousSequence.class )
 @BaseUnitTest
 public class SequenceStyleGeneratorBehavesLikeSequenceHiloGeneratorWithZeroIncrementSizeTest {
 	private static final String TEST_SEQUENCE = "test_sequence";
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomGeneratorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomGeneratorTests.java
index c37640fdbf1d..619c686817dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomGeneratorTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/custom/CustomGeneratorTests.java
@@ -19,7 +19,7 @@
 
 @DomainModel( annotatedClasses = TheEntity.class )
 @SessionFactory
-@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSequences.class )
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledSequences.class )
 public class CustomGeneratorTests {
 	@Test
 	public void verifyModel(DomainModelScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java
index a86666da3845..cf7ce6bf70ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/PostgreSQLSequenceGeneratorWithSerialTest.java
@@ -15,12 +15,14 @@
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.id.SequenceMismatchStrategy;
 import org.hibernate.testing.logger.Triggerable;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.orm.logger.LoggerInspectionExtension;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
@@ -40,6 +42,7 @@
  */
 @JiraKey(value = "HHH-12973")
 @RequiresDialect(value = PostgreSQLDialect.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support DROP TABLE with CASCADE")
 public class PostgreSQLSequenceGeneratorWithSerialTest extends EntityManagerFactoryBasedFunctionalTest {
 
 	@RegisterExtension
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java
index 011fde18d1f7..49097a00c895 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyDefaultExceptionTest.java
@@ -77,6 +77,7 @@ protected Class<?>[] getAnnotatedClasses() {
 	@Override
 	protected void addConfigOptions(Map options) {
 		options.put( AvailableSettings.HBM2DDL_AUTO, "none" );
+		options.put(AvailableSettings.PREFERRED_POOLED_OPTIMIZER, "pooled");
 	}
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java
index c208e90405dc..30b1ba48cbe2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/hhh12973/SequenceMismatchStrategyLogTest.java
@@ -84,6 +84,7 @@ protected Class<?>[] getAnnotatedClasses() {
 	protected void addConfigOptions(Map options) {
 		options.put( AvailableSettings.HBM2DDL_AUTO, "none" );
 		options.put( AvailableSettings.SEQUENCE_INCREMENT_SIZE_MISMATCH_STRATEGY, "log" );
+		options.put( AvailableSettings.PREFERRED_POOLED_OPTIMIZER, "pooled" );
 		triggerable.reset();
 		assertFalse( triggerable.wasTriggered() );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java
index 61b07d26b5e0..1b5ccea4d422 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/NegativeValueSequenceTest.java
@@ -22,8 +22,10 @@
 import org.hibernate.id.enhanced.SequenceStyleGenerator;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.logger.Triggerable;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.logger.LoggerInspectionExtension;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
@@ -39,6 +41,7 @@
 /**
  * @author Gail Badner
  */
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledSequences.class )
 public class NegativeValueSequenceTest {
 	@RegisterExtension
 	public LoggerInspectionExtension logInspection =
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJdbcType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJdbcType.java
index 844ac5775c43..6a64c9e4bd22 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJdbcType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/InetJdbcType.java
@@ -17,11 +17,11 @@ public class InetJdbcType extends PostgreSQLInetJdbcType {
 	public static final InetJdbcType INSTANCE = new InetJdbcType();
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( Inet.class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Inet.class );
 	}
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/UuidAggregationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/UuidAggregationTest.java
index 1bc5a5b6dc44..649ded0fc074 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/UuidAggregationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/UuidAggregationTest.java
@@ -4,11 +4,13 @@
  */
 package org.hibernate.orm.test.id.uuid;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import java.util.UUID;
@@ -16,6 +18,7 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(annotatedClasses = EntityOfBasics.class)
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Aggregate functions doesn't work with UUID")
 public class UuidAggregationTest {
 	@Test
 	@JiraKey(value = "HHH-15495")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassCtorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassCtorTests.java
new file mode 100644
index 000000000000..5cbdca038147
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassCtorTests.java
@@ -0,0 +1,45 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.idclass;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Steve Ebersole
+ */
+@DomainModel(annotatedClasses = {IdClassCtorTests.SystemUser.class, IdClassCtorTests.SystemUserId.class})
+@SessionFactory
+public class IdClassCtorTests {
+	@Test
+	void testIdClassRecordUsage(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.find( SystemUser.class, new SystemUserId( "payroll", "admin" ) );
+			session.createQuery( "from SystemUser u where u.privileges % 2 = 0" ).list();
+		} );
+	}
+
+	@Entity(name="SystemUser")
+	@Table(name="SystemUser")
+	@IdClass( SystemUserId.class )
+	public static class SystemUser {
+		@Id
+		private String systemName;
+		@Id
+		private String userName;
+		@Column(name = "privs")
+		private int privileges;
+	}
+
+	public record SystemUserId(String systemName, String userName) {
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java
index a24c9e850ecd..81bc6c7ff652 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java
@@ -56,7 +56,7 @@ public void testCreate(SessionFactoryScope scope) {
 		);
 	}
 
-	@Entity
+	@Entity(name = "Task")
 	public static class Task {
 
 		@Id
@@ -74,7 +74,7 @@ public Task(TaskText text) {
 		}
 	}
 
-	@Entity
+	@Entity(name = "TaskText")
 	@IdClass(TaskText.TaskTextPK.class)
 	public static class TaskText {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java
index 40695cab50cd..1608be0fb497 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java
@@ -4,7 +4,9 @@
  */
 package org.hibernate.orm.test.idgen.biginteger.increment;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -17,6 +19,7 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(xmlMappings = "org/hibernate/orm/test/idgen/biginteger/increment/Mapping.hbm.xml")
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class BigIntegerIncrementGeneratorTest {
 	@Test
 	public void testBasics(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java
index 6bdcb6d935e9..ed8487403ec7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java
@@ -20,6 +20,7 @@
 @DomainModel(xmlMappings = "org/hibernate/orm/test/idgen/biginteger/sequence/Mapping.hbm.xml")
 @SessionFactory
 @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSequences.class )
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class BigIntegerSequenceGeneratorTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java
index b7b093171047..ae56553ce15e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/auto/AutoGenerationTypeTests.java
@@ -31,7 +31,9 @@
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.orm.test.idgen.n_ative.GeneratorSettingsImpl;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.FailureExpectedExtension;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -49,6 +51,7 @@
 @ExtendWith( FailureExpectedExtension.class )
 public class AutoGenerationTypeTests {
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledSequences.class )
 	public void testAutoDefaults() {
 		try (final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry()) {
 			final Metadata metadata = new MetadataSources( ssr )
@@ -58,7 +61,7 @@ public void testAutoDefaults() {
 
 			final PersistentClass entityBinding = metadata.getEntityBinding( Entity1.class.getName() );
 			final KeyValue idMapping = entityBinding.getRootClass().getIdentifier();
-			Dialect dialect = new H2Dialect();
+			Dialect dialect = metadata.getDatabase().getDialect();
 			final SequenceStyleGenerator generator = (SequenceStyleGenerator) idMapping.createGenerator( dialect, entityBinding.getRootClass());
 			final DatabaseStructure database1Structure = generator.getDatabaseStructure();
 
@@ -70,6 +73,7 @@ public void testAutoDefaults() {
 
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledSequences.class )
 	public void testAutoGeneratedValueGenerator() {
 		try (final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry()) {
 			final Metadata metadata = new MetadataSources( ssr )
@@ -79,7 +83,7 @@ public void testAutoGeneratedValueGenerator() {
 
 			final PersistentClass entityBinding = metadata.getEntityBinding( Entity2.class.getName() );
 			final KeyValue idMapping = entityBinding.getRootClass().getIdentifier();
-			Dialect dialect = new H2Dialect();
+			Dialect dialect = metadata.getDatabase().getDialect();
 			final SequenceStyleGenerator generator = (SequenceStyleGenerator) idMapping.createGenerator(
 					dialect,
 					entityBinding.getRootClass(),
@@ -95,6 +99,7 @@ public void testAutoGeneratedValueGenerator() {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledSequences.class )
 	public void testCollectionId() {
 		try (final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry()) {
 			final Metadata metadata = new MetadataSources( ssr )
@@ -110,7 +115,7 @@ public void testCollectionId() {
 			final Property theTwos = entity1Binding.getProperty( "theTwos" );
 			final IdentifierBag idBagMapping = (IdentifierBag) theTwos.getValue();
 			final KeyValue collectionIdMapping = idBagMapping.getIdentifier();
-			Dialect dialect = new H2Dialect();
+			Dialect dialect = metadata.getDatabase().getDialect();
 			final SequenceStyleGenerator generator = (SequenceStyleGenerator) collectionIdMapping.createGenerator( dialect, null);
 			final DatabaseStructure idBagIdGeneratorDbStructure = generator.getDatabaseStructure();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/EmbeddedIdMixedGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/EmbeddedIdMixedGenerationTests.java
new file mode 100644
index 000000000000..18fb67a95c5b
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/EmbeddedIdMixedGenerationTests.java
@@ -0,0 +1,62 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.idgen.mixed;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Table;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsIdentityColumns.class )
+@Jpa(annotatedClasses = EmbeddedIdMixedGenerationTests.Animal.class)
+class EmbeddedIdMixedGenerationTests {
+
+	@Test void test(EntityManagerFactoryScope scope) {
+		var id = scope.fromTransaction( em -> {
+			Animal animal = new Animal();
+			em.persist( animal );
+			return animal;
+		} ).idWithSubId;
+		scope.inTransaction( em -> {
+			Animal animal = em.find( Animal.class, id );
+			assertEquals( 1, animal.idWithSubId.id );
+			assertEquals( 1, animal.idWithSubId.subId );
+		} );
+
+		var id2 = scope.fromTransaction( em -> {
+			Animal animal = new Animal();
+			animal.idWithSubId = new IdWithSubId();
+			em.persist( animal );
+			return animal;
+		} ).idWithSubId;
+		scope.inTransaction( em -> {
+			Animal animal = em.find( Animal.class, id2 );
+			assertEquals( 2, animal.idWithSubId.id );
+			assertEquals( 2, animal.idWithSubId.subId );
+		} );
+	}
+
+	@Entity
+	@Table(name = "animals")
+	static class Animal {
+		@EmbeddedId IdWithSubId idWithSubId;
+	}
+	static class IdWithSubId {
+		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		private Long id;
+		@GeneratedValue(strategy = GenerationType.SEQUENCE)
+		@Column(name = "sub_id")
+		private Long subId;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/IdClassMixedGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/IdClassMixedGenerationTests.java
new file mode 100644
index 000000000000..4ed19946ae8c
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/IdClassMixedGenerationTests.java
@@ -0,0 +1,60 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.idgen.mixed;
+
+import jakarta.persistence.*;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsIdentityColumns.class )
+@Jpa(annotatedClasses = IdClassMixedGenerationTests.Animal.class)
+class IdClassMixedGenerationTests {
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Animal animal = new Animal( 1L );
+			em.persist( animal );
+			assertEquals( 1, animal.id );
+			assertEquals( 1, animal.subId );
+		} );
+		scope.inTransaction( em -> {
+			Animal animal = em.find( Animal.class, new IdWithSubId( 1L, 1L ) );
+			assertEquals( 1, animal.id );
+			assertEquals( 1, animal.subId );
+		} );
+	}
+
+	@Entity
+	@Table(name = "animals")
+	@IdClass(IdWithSubId.class)
+	static class Animal {
+		@Id
+		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		private Long id;
+		@Id
+		@Column(name = "sub_id")
+		private Long subId;
+
+		Animal(Long subId) {
+			this.subId = subId;
+		}
+
+		Animal() {
+		}
+	}
+	static class IdWithSubId {
+		private Long id;
+		private Long subId;
+		IdWithSubId() {}
+		IdWithSubId(long l, long l1) {
+			this.id = l;
+			this.subId = l1;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTimingEmbeddableGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTimingEmbeddableGeneratorsTest.java
new file mode 100644
index 000000000000..674c481d04bf
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTimingEmbeddableGeneratorsTest.java
@@ -0,0 +1,121 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.idgen.mixed;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
+@DomainModel(
+		annotatedClasses = {
+				MixedTimingEmbeddableGeneratorsTest.Event.class,
+				MixedTimingEmbeddableGeneratorsTest.History.class,
+		}
+)
+@SessionFactory
+class MixedTimingEmbeddableGeneratorsTest {
+
+	@AfterEach
+	void dropTestData(SessionFactoryScope factoryScope) {
+		factoryScope.dropData();
+	}
+
+	@Test
+	void test(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Event event = new Event();
+			event.id = 1L;
+			event.name = "conference";
+			session.persist( event );
+		} );
+
+		LocalDateTime created = scope.fromTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			return event.history.created;
+		} );
+
+		scope.inTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			event.name = "concert";
+		} );
+
+		scope.inTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			assertThat( event.history.created ).isEqualTo( created );
+			assertThat( event.history.updated ).isNotEqualTo( created );
+			assertThat( event.name ).isEqualTo( "concert" );
+		} );
+	}
+
+	@Test
+	void test2(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Event event = new Event();
+			event.id = 1L;
+			event.name = "conference";
+			event.history = new History();
+			event.history.notes = "inserted";
+			session.persist( event );
+		} );
+
+		LocalDateTime created = scope.fromTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			assertEquals( "inserted", event.history.notes );
+			return event.history.created;
+		} );
+
+		scope.inTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			event.name = "concert";
+			event.history.notes = "updated";
+		} );
+
+		scope.inTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			assertEquals( created, event.history.created );
+			assertNotEquals( created, event.history.updated );
+			assertEquals( "updated", event.history.notes );
+			assertEquals( "concert", event.name );
+		} );
+	}
+
+
+	@Entity(name = "Event")
+	public static class Event {
+
+		@Id
+		public Long id;
+
+		public String name;
+
+		@Embedded
+		public History history;
+
+	}
+
+	@Embeddable
+	public static class History {
+		@Column
+		@CreationTimestamp
+		public LocalDateTime created;
+
+		@Column
+		@UpdateTimestamp
+		public LocalDateTime updated;
+
+		public String notes;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/MixedTimingGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTimingGeneratorsTest.java
similarity index 99%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/MixedTimingGeneratorsTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTimingGeneratorsTest.java
index c7cebb1e130c..220539bee7bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/MixedTimingGeneratorsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTimingGeneratorsTest.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.idgen.userdefined;
+package org.hibernate.orm.test.idgen.mixed;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTypeEmbeddableGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTypeEmbeddableGeneratorsTest.java
new file mode 100644
index 000000000000..e7d3c99163d3
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTypeEmbeddableGeneratorsTest.java
@@ -0,0 +1,129 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.idgen.mixed;
+
+import java.time.LocalDateTime;
+
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.SpannerDialect;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.SourceType;
+import org.hibernate.annotations.UpdateTimestamp;
+import org.hibernate.generator.internal.CurrentTimestampGeneration;
+import org.hibernate.orm.test.annotations.MutableClock;
+import org.hibernate.orm.test.annotations.MutableClockSettingProvider;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SettingProvider;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DomainModel(
+		annotatedClasses = {
+				MixedTypeEmbeddableGeneratorsTest.Event.class,
+				MixedTypeEmbeddableGeneratorsTest.History.class,
+		}
+)
+@SessionFactory( useCollectingStatementInspector = true )
+@ServiceRegistry(
+		settingProviders = @SettingProvider(
+				settingName = CurrentTimestampGeneration.CLOCK_SETTING_NAME,
+				provider = MutableClockSettingProvider.class
+		)
+)
+class MixedTypeEmbeddableGeneratorsTest {
+
+	private MutableClock clock;
+
+	@BeforeEach
+	void setUp(SessionFactoryScope scope) {
+		clock = CurrentTimestampGeneration.getClock( scope.getSessionFactory() );
+		clock.reset();
+	}
+
+	@Test
+	void testMixedTiming(SessionFactoryScope scope) {
+		final var statementInspector = scope.getCollectingStatementInspector();
+
+		statementInspector.clear();
+		scope.inTransaction( session -> {
+			Event event = new Event();
+			event.id = 1L;
+			event.name = "conference";
+			event.history = new History();
+			session.persist( event );
+		} );
+
+		assertEquals( "insert into Event (created,updated,name,id) values (%s,?,?,?)"
+						.formatted( getDialect( scope ).currentTimestamp() ),
+				statementInspector.getSqlQueries().get( 0 ) );
+
+		final LocalDateTime[] timestamps = scope.fromTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			assertThat( event.history.created ).isNotNull();
+			assertThat( event.history.updated ).isNotNull();
+			return new LocalDateTime[] { event.history.created, event.history.updated };
+		} );
+
+		clock.tick();
+
+		statementInspector.clear();
+		scope.inTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			event.name = "concert";
+		} );
+
+		if ( getDialect( scope ) instanceof SpannerDialect ) {
+			assertEquals( "update Event e1_0 set e1_0.updated=?,e1_0.name=? where e1_0.id=?",
+					statementInspector.getSqlQueries().get( 1 ) );
+		}
+		else {
+			assertEquals( "update Event set updated=?,name=? where id=?",
+					statementInspector.getSqlQueries().get( 1 ) );
+		}
+
+		scope.inTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			assertThat( event.history.created ).isEqualTo( timestamps[0] );
+			assertThat( event.history.updated ).isAfter( timestamps[1] );
+			assertThat( event.name ).isEqualTo( "concert" );
+		} );
+	}
+
+	@Entity(name = "Event")
+	public static class Event {
+		@Id
+		public Long id;
+
+		public String name;
+
+		@Embedded
+		public History history;
+	}
+
+	@Embeddable
+	public static class History {
+		@CreationTimestamp(source = SourceType.DB)
+		public LocalDateTime created;
+
+		@UpdateTimestamp(source = SourceType.VM)
+		public LocalDateTime updated;
+	}
+
+	private static Dialect getDialect(SessionFactoryScope scope) {
+		return scope.getSessionFactory().getJdbcServices().getJdbcEnvironment().getDialect();
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTypeEmbeddableGeneratorsTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTypeEmbeddableGeneratorsTest2.java
new file mode 100644
index 000000000000..2013f935fe88
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTypeEmbeddableGeneratorsTest2.java
@@ -0,0 +1,122 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.idgen.mixed;
+
+import java.time.LocalDateTime;
+
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.SpannerDialect;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.SourceType;
+import org.hibernate.annotations.UpdateTimestamp;
+import org.hibernate.generator.internal.CurrentTimestampGeneration;
+import org.hibernate.orm.test.annotations.MutableClockSettingProvider;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SettingProvider;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DomainModel(
+		annotatedClasses = {
+				MixedTypeEmbeddableGeneratorsTest2.Event.class,
+				MixedTypeEmbeddableGeneratorsTest2.History.class,
+		}
+)
+@SessionFactory( useCollectingStatementInspector = true )
+@ServiceRegistry(
+		settingProviders = @SettingProvider(
+				settingName = CurrentTimestampGeneration.CLOCK_SETTING_NAME,
+				provider = MutableClockSettingProvider.class
+		)
+)
+class MixedTypeEmbeddableGeneratorsTest2 {
+
+	@Test
+	void testMixedTiming(SessionFactoryScope scope) throws InterruptedException {
+		final var statementInspector = scope.getCollectingStatementInspector();
+
+		statementInspector.clear();
+		scope.inTransaction( session -> {
+			Event event = new Event();
+			event.id = 1L;
+			event.name = "conference";
+			event.history = new History();
+			session.persist( event );
+		} );
+
+		assertEquals( "insert into Event (created,updated,name,id) values (?,%s,?,?)"
+						.formatted( getDialect( scope ).currentTimestamp() ),
+				statementInspector.getSqlQueries().get( 0 ) );
+
+		final LocalDateTime[] timestamps = scope.fromTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			assertThat( event.history.created ).isNotNull();
+			assertThat( event.history.updated ).isNotNull();
+			return new LocalDateTime[] { event.history.created, event.history.updated };
+		} );
+
+		// Sleep a while to let the database clock tick
+		Thread.sleep( 1000 );
+
+		statementInspector.clear();
+		scope.inTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			event.name = "concert";
+		} );
+
+		if ( getDialect( scope ) instanceof SpannerDialect ) {
+			assertEquals( "update Event e1_0 set e1_0.created=?,e1_0.updated=%s,e1_0.name=? where e1_0.id=?"
+							.formatted( getDialect( scope ).currentTimestamp() ),
+					statementInspector.getSqlQueries().get( 1 ) );
+		}
+		else {
+			assertEquals( "update Event set created=?,updated=%s,name=? where id=?"
+							.formatted( getDialect( scope ).currentTimestamp() ),
+					statementInspector.getSqlQueries().get( 1 ) );
+		}
+
+		scope.inTransaction( session -> {
+			Event event = session.get( Event.class, 1L );
+			assertThat( event.history.created ).isEqualTo( timestamps[0] );
+			assertThat( event.history.updated ).isAfter( timestamps[1] );
+			assertThat( event.name ).isEqualTo( "concert" );
+		} );
+	}
+
+	@Entity(name = "Event")
+	public static class Event {
+		@Id
+		public Long id;
+
+		public String name;
+
+		@Embedded
+		public History history;
+	}
+
+	@Embeddable
+	public static class History {
+		@CreationTimestamp(source = SourceType.VM)
+		public LocalDateTime created;
+
+		@UpdateTimestamp(source = SourceType.DB)
+		public LocalDateTime updated;
+	}
+
+	private static Dialect getDialect(SessionFactoryScope scope) {
+		return scope.getSessionFactory().getJdbcServices().getJdbcEnvironment().getDialect();
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTypeEntityGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTypeEntityGeneratorsTest.java
new file mode 100644
index 000000000000..2a41dfb50de1
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MixedTypeEntityGeneratorsTest.java
@@ -0,0 +1,95 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.idgen.mixed;
+
+import java.time.LocalDateTime;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.SourceType;
+import org.hibernate.annotations.UpdateTimestamp;
+import org.hibernate.generator.internal.CurrentTimestampGeneration;
+import org.hibernate.orm.test.annotations.MutableClock;
+import org.hibernate.orm.test.annotations.MutableClockSettingProvider;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SettingProvider;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel( annotatedClasses = MixedTypeEntityGeneratorsTest.Event.class )
+@SessionFactory
+@ServiceRegistry(
+		settingProviders = @SettingProvider(
+				settingName = CurrentTimestampGeneration.CLOCK_SETTING_NAME,
+				provider = MutableClockSettingProvider.class
+		)
+)
+class MixedTypeEntityGeneratorsTest {
+
+	private MutableClock clock;
+
+	@BeforeEach
+	void setUp(SessionFactoryScope scope) {
+		clock = CurrentTimestampGeneration.getClock( scope.getSessionFactory() );
+		clock.reset();
+	}
+
+	@AfterEach
+	void tearDown(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	@Test
+	void testMixedGenerators(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Event event = new Event();
+			event.id = 1L;
+			event.name = "conference";
+			session.persist( event );
+		} );
+
+		final LocalDateTime[] timestamps = scope.fromTransaction( session -> {
+			Event event = session.find( Event.class, 1L );
+			assertThat( event.createdOn ).isNotNull();
+			assertThat( event.updatedOn ).isNotNull();
+			return new LocalDateTime[] { event.createdOn, event.updatedOn };
+		} );
+
+		clock.tick();
+
+		scope.inTransaction( session -> {
+			Event event = session.find( Event.class, 1L );
+			event.name = "concert";
+		} );
+
+		scope.inTransaction( session -> {
+			Event event = session.find( Event.class, 1L );
+			assertThat( event.createdOn ).isEqualTo( timestamps[0] );
+			assertThat( event.updatedOn ).isAfter( timestamps[1] );
+		} );
+	}
+
+	@Entity(name = "Event")
+	public static class Event {
+		@Id
+		public Long id;
+
+		public String name;
+
+		@CreationTimestamp(source = SourceType.DB)
+		public LocalDateTime createdOn;
+
+		@UpdateTimestamp(source = SourceType.VM)
+		public LocalDateTime updatedOn;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MoreIdClassMixedGenerationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MoreIdClassMixedGenerationTests.java
new file mode 100644
index 000000000000..625187a607da
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/mixed/MoreIdClassMixedGenerationTests.java
@@ -0,0 +1,60 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.idgen.mixed;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsIdentityColumns.class )
+@Jpa(annotatedClasses = MoreIdClassMixedGenerationTests.Animal.class)
+class MoreIdClassMixedGenerationTests {
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Animal animal = new Animal();
+			em.persist( animal );
+			assertEquals( 1, animal.id );
+			assertEquals( 1, animal.subId );
+		} );
+		scope.inTransaction( em -> {
+			Animal animal = em.find( Animal.class, new IdWithSubId( 1L, 1L ) );
+			assertEquals( 1, animal.id );
+			assertEquals( 1, animal.subId );
+		} );
+	}
+
+	@Entity
+	@Table(name = "animals")
+	@IdClass(IdWithSubId.class)
+	static class Animal {
+		@Id
+		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		private Long id;
+		@Id
+		@GeneratedValue(strategy = GenerationType.SEQUENCE)
+		@Column(name = "sub_id")
+		private Long subId;
+	}
+	static class IdWithSubId {
+		private Long id;
+		private Long subId;
+		IdWithSubId() {}
+		IdWithSubId(long l, long l1) {
+			this.id = l;
+			this.subId = l1;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/local/NativeGeneratorClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/local/NativeGeneratorClassTest.java
index 4ecaa6175dc3..009c8045eec3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/local/NativeGeneratorClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/local/NativeGeneratorClassTest.java
@@ -51,7 +51,7 @@ void test(DomainModelScope domainModelScope, SessionFactoryScope scope) {
 		assertThat( generator ).isInstanceOf( NativeGenerator.class );
 	}
 
-	@Entity
+	@Entity(name = "NativeEntity")
 	@org.hibernate.annotations.NativeGenerator
 	public static class NativeEntity {
 		@Id @GeneratedValue
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/local/NativeGeneratorMemberTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/local/NativeGeneratorMemberTest.java
index 64c7a943daeb..355caf80e064 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/local/NativeGeneratorMemberTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/local/NativeGeneratorMemberTest.java
@@ -50,7 +50,7 @@ void dropTestData(SessionFactoryScope factoryScope) {
 		assertThat( generator ).isInstanceOf( NativeGenerator.class );
 	}
 
-	@Entity
+	@Entity(name = "NativeEntity")
 	public static class NativeEntity {
 		@Id @GeneratedValue
 		@org.hibernate.annotations.NativeGenerator
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/pkg/NativeGeneratorPackageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/pkg/NativeGeneratorPackageTest.java
index bbfa18b49ac3..de3aa98f3745 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/pkg/NativeGeneratorPackageTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/n_ative/pkg/NativeGeneratorPackageTest.java
@@ -50,7 +50,7 @@ void test(DomainModelScope domainModelScope, SessionFactoryScope scope) {
 		assertThat( generator ).isInstanceOf( NativeGenerator.class );
 	}
 
-	@Entity
+	@Entity(name = "NativeEntity")
 	public static class NativeEntity {
 		@Id @GeneratedValue
 		long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/IdGeneratorTypeWithBeanContainerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/IdGeneratorTypeWithBeanContainerTest.java
index 3b61b35d9bc3..1f314aa494c9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/IdGeneratorTypeWithBeanContainerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/IdGeneratorTypeWithBeanContainerTest.java
@@ -47,7 +47,7 @@ void dropTestData(SessionFactoryScope factoryScope) {
 		assertThat(entity.id, is(SimpleBeanContainer.INITIAL_VALUE));
 	}
 
-	@Entity
+	@Entity(name = "SimpleEntity")
 	public static class SimpleEntity {
 		@Id @SimpleId
 		long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableDirtinessCheckingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableDirtinessCheckingTests.java
new file mode 100644
index 000000000000..16448777cf41
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableDirtinessCheckingTests.java
@@ -0,0 +1,88 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.immutable;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.Immutable;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Steve Ebersole
+ */
+@DomainModel(annotatedClasses = ImmutableDirtinessCheckingTests.ReferenceData.class)
+@SessionFactory
+public class ImmutableDirtinessCheckingTests {
+	@Test
+	void testDirtyCheckingBehavior(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var data = session.find( ReferenceData.class, 1 );
+			data.setName( "another value" );
+			nameAccessCount = 0;
+			session.flush();
+			assertThat( nameAccessCount ).isEqualTo( 0 );
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			var data = session.find( ReferenceData.class, 1 );
+			assertThat( data.getName() ).isEqualTo( "initial value" );
+		} );
+	}
+
+	@BeforeEach
+	void prepareTestData(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.persist( new ReferenceData( 1, "initial value" ) );
+		} );
+	}
+
+	@Test
+	void dropTestData(SessionFactoryScope factoryScope) {
+		factoryScope.dropData();
+	}
+
+	private static int nameAccessCount = 0;
+
+	@Entity(name="ReferenceData")
+	@Table(name="ReferenceData")
+	@Immutable
+	public static class ReferenceData {
+		private Integer id;
+		private String name;
+
+		public ReferenceData() {
+		}
+
+		public ReferenceData(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		@Id
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			nameAccessCount++;
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java
index 3f18085653dc..20689ea96ab3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java
@@ -6,7 +6,6 @@
 
 import java.util.Iterator;
 
-import org.hibernate.LockMode;
 import org.hibernate.StaleObjectStateException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
@@ -28,7 +27,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -167,10 +165,6 @@ public void testCreateWithNonEmptyManyToManyCollectionOfExisting(SessionFactoryS
 
 		scope.inTransaction(
 				s -> {
-					assertThrows(IllegalArgumentException.class,
-								() -> s.lock( c, LockMode.NONE ),
-								"Given entity is not associated with the persistence context"
-					);
 					Plan p = new Plan( "plan" );
 					p.addContract( s.get(Contract.class, c.getId()) );
 					s.persist( p );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableAbstractDiscriminatorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableAbstractDiscriminatorTests.java
new file mode 100644
index 000000000000..49054f1672f9
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableAbstractDiscriminatorTests.java
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.inheritance;
+
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.ServiceRegistryScope;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests that abstract classes within the hierarchy do not need {@linkplain DiscriminatorValue}
+ *
+ * @author Steve Ebersole
+ */
+@Jira( "https://hibernate.atlassian.net/browse/HHH-5798" )
+@ServiceRegistry
+public class SingleTableAbstractDiscriminatorTests {
+	@Test
+	void testCompliantModel(ServiceRegistryScope registryScope) {
+		var model = new MetadataSources( registryScope.getRegistry() )
+				.addAnnotatedClasses( Top.class, Middle.class, Bottom.class )
+				.buildMetadata();
+		try (var sf = (SessionFactoryImplementor) model.buildSessionFactory()) {
+		}
+	}
+
+	@Test
+	void testNonCompliantModel(ServiceRegistryScope registryScope) {
+		// technically, according to JPA, this one should fail -
+		//
+		// 		> The DiscriminatorValue annotation can only be specified on a concrete entity class.
+		//
+		// we do not validate this though
+		var model = new MetadataSources( registryScope.getRegistry() )
+				.addAnnotatedClasses( Root.class, Trunk.class, Branch.class )
+				.buildMetadata();
+		try (var sf = (SessionFactoryImplementor) model.buildSessionFactory()) {
+		}
+	}
+
+	@Entity
+	@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+	@DiscriminatorColumn
+	public static abstract class Top {
+		@Id
+		private Integer id;
+		private String name;
+	}
+
+	@Entity
+	public static abstract class Middle extends Top {
+	}
+
+	@Entity
+	@DiscriminatorValue( "B" )
+	public static class Bottom extends Middle {
+	}
+
+	@Entity
+	@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+	@DiscriminatorColumn
+	public static abstract class Root {
+		@Id
+		private Integer id;
+		private String name;
+	}
+
+	@Entity
+	@DiscriminatorValue( "illegal" )
+	public static abstract class Trunk extends Root {
+	}
+
+	@Entity
+	@DiscriminatorValue( "b" )
+	public static class Branch extends Trunk {
+		@Id
+		private Integer id;
+		private String name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclassTests.java
index d74b9eb9df1b..feaddfc7210a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclassTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentMappedSuperclassTests.java
@@ -101,7 +101,7 @@ public void testFindBySubclass(SessionFactoryScope scope) {
 	public void testQueryByRootClass(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			//noinspection removal
-			final List<Employee> employees = session.createQuery( "from Employee", Employee.class )
+			final List<Employee> employees = session.createQuery( "from Employee order by name", Employee.class )
 					.getResultList();
 			assertEquals( 2, employees.size() );
 			assertThat( employees.get( 0 ), instanceOf( Editor.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTableTests.java
index 4862bce3cc11..62688c43ad53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTableTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentSingleTableTests.java
@@ -90,7 +90,7 @@ public void testFindBySubclass(SessionFactoryScope scope) {
 	public void testQueryByRootClass(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			//noinspection removal
-			var employees = session.createQuery( "from Employee", Employee.class )
+			var employees = session.createQuery( "from Employee order by name", Employee.class )
 					.getResultList();
 			assertEquals( 2, employees.size() );
 			assertThat( employees.get( 0 ), instanceOf( Editor.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddableTests.java
index a5cbcae3d049..3245b4c42061 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddableTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/TransientOverrideAsPersistentWithEmbeddableTests.java
@@ -93,7 +93,7 @@ public void testQueryByRootClass(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			//noinspection removal
 			var employees = session
-					.createQuery( "from Employee", Employee.class )
+					.createQuery( "from Employee order by name", Employee.class )
 					.getResultList();
 			assertEquals( 2, employees.size() );
 			assertThat( employees.get( 0 ), instanceOf( Editor.class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableAndGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableAndGenericsTest.java
index 87c1806eb87b..1b90a442fe24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableAndGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/SingleTableAndGenericsTest.java
@@ -20,25 +20,31 @@
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.Table;
 
+import java.util.Map;
+
 import static jakarta.persistence.InheritanceType.SINGLE_TABLE;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.hibernate.type.SqlTypes.JSON;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @DomainModel(
 		annotatedClasses = {
 				// the order is important to reproduce the issue
 				SingleTableAndGenericsTest.B.class,
 				SingleTableAndGenericsTest.A.class,
+				SingleTableAndGenericsTest.C.class,
 		}
 )
 @SessionFactory
 @JiraKey("HHH-17644")
+@JiraKey("HHH-19978")
 public class SingleTableAndGenericsTest {
 
 	@Test
 	public void testIt(SessionFactoryScope scope) {
-		String payload = "{\"book\": \"1\"}";
+		Map<String,String> payload = Map.of("book","1");
 		String aId = "1";
+		String cId = "2";
 
 		scope.inTransaction(
 				session -> {
@@ -46,6 +52,11 @@ public void testIt(SessionFactoryScope scope) {
 					a.setId( aId );
 					session.persist( a );
 					a.setPayload( payload );
+
+					C c = new C();
+					c.setId( cId );
+					session.persist( c );
+					c.setPayload( "{\"book\":\"2\"}" );
 				}
 		);
 
@@ -53,9 +64,35 @@ public void testIt(SessionFactoryScope scope) {
 				session -> {
 					A a = session.find( A.class, aId );
 					assertThat( a ).isNotNull();
-					String payload1 = a.getPayload();
+					Map<?,?> payload1 = a.getPayload();
+					assertThat( payload1 ).isNotNull();
+					assertTrue( payload1.containsKey("book") );
+
+					C c = session.find( C.class, cId );
+					assertThat( c ).isNotNull();
+					String payload2 = c.getPayload();
+					assertThat( payload2 ).isNotNull();
+					assertThat( payload2 ).contains( "book" );
+					assertThat( payload2 ).contains( "2" );
+				}
+		);
+
+		scope.inTransaction(
+				session -> {
+					Object aPayload = session.createQuery( "select a.payload from A a where a.id = :id").setParameter( "id", aId ).getSingleResult();
+					assertThat( aPayload ).isNotNull();
+					assertThat( aPayload ).isInstanceOf( Map.class );
+					Map<?,?> payload1 = (Map<?, ?>) aPayload;
 					assertThat( payload1 ).isNotNull();
-					assertThat( payload1 ).contains( "book" );
+					assertTrue( payload1.containsKey("book") );
+
+					Object cPayload = session.createQuery( "select c.payload from C c where c.id = :id").setParameter( "id", cId ).getSingleResult();
+					assertThat( cPayload ).isNotNull();
+					assertThat( cPayload ).isInstanceOf( String.class );
+					String payload2 = (String) cPayload;
+					assertThat( payload2 ).isNotNull();
+					assertThat( payload2 ).contains( "book" );
+					assertThat( payload2 ).contains( "2" );
 				}
 		);
 	}
@@ -91,8 +128,13 @@ public void setPayload(T payload) {
 		}
 	}
 
-	@Entity(name = "C")
+	@Entity(name = "A")
 	@DiscriminatorValue("child")
-	public static class A extends B<String> {
+	public static class A extends B<Map<?,?>> {
+	}
+
+	@Entity(name = "C")
+	@DiscriminatorValue("child2")
+	public static class C extends B<String> {
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/JoinInheritanceSelectJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/JoinInheritanceSelectJoinTest.java
index 5175d98b0b08..6e2b88223090 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/JoinInheritanceSelectJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/embeddable/JoinInheritanceSelectJoinTest.java
@@ -14,7 +14,6 @@
 import jakarta.persistence.InheritanceType;
 import jakarta.persistence.ManyToMany;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -58,7 +57,6 @@ public void teardown(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@FailureExpected(jiraKey = "HHH-19607")
 	void testSelect(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			List<Child> children = session
@@ -73,7 +71,6 @@ void testSelect(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@FailureExpected(jiraKey = "HHH-19607")
 	void testSelectWithParameters(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			List<Child> children = session
@@ -88,6 +85,106 @@ void testSelectWithParameters(SessionFactoryScope scope) {
 		} );
 	}
 
+	@Test
+	void testSelectEmbeddedPropertyDirectly(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			List<Child> children = session
+					.createSelectionQuery(
+							"SELECT c FROM Child c LEFT JOIN c.parents p WHERE p.address.street = 'Via Milano'",
+							Child.class
+					)
+					.getResultList();
+
+			assertThat( children.size() ).isEqualTo( 1 );
+		} );
+	}
+
+	@Test
+	void testSelectInheritedSimpleProperty(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			List<Child> children = session
+					.createSelectionQuery(
+							"SELECT c FROM Child c LEFT JOIN c.parents p WHERE p.name = 'Luigi'",
+							Child.class
+					)
+					.getResultList();
+
+			assertThat( children.size() ).isEqualTo( 1 );
+		} );
+	}
+
+	@Test
+	void testSelectEmbeddedAsResult(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			List<Address> addresses = session
+					.createSelectionQuery(
+							"SELECT p.address FROM Child c LEFT JOIN c.parents p WHERE p.address IS NOT NULL",
+							Address.class
+					)
+					.getResultList();
+
+			assertThat( addresses.size() ).isEqualTo( 1 );
+			assertThat( addresses.get( 0 ).getStreet() ).isEqualTo( "Via Milano" );
+		} );
+	}
+
+	@Test
+	void testSelectWithOrderByInheritedProperty(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			List<Child> children = session
+					.createSelectionQuery(
+							"SELECT c FROM Child c LEFT JOIN c.parents p ORDER BY p.name",
+							Child.class
+					)
+					.getResultList();
+
+			assertThat( children.size() ).isEqualTo( 1 );
+		} );
+	}
+
+	@Test
+	void testSelectWithOrderByEmbeddedProperty(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			List<Child> children = session
+					.createSelectionQuery(
+							"SELECT c FROM Child c LEFT JOIN c.parents p ORDER BY p.address.city",
+							Child.class
+					)
+					.getResultList();
+
+			assertThat( children.size() ).isEqualTo( 1 );
+		} );
+	}
+
+	@Test
+	void testSelectWithJoinFetch(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			List<Child> children = session
+					.createSelectionQuery(
+							"SELECT c FROM Child c LEFT JOIN FETCH c.parents p WHERE p.address IS NOT NULL",
+							Child.class
+					)
+					.getResultList();
+
+			assertThat( children.size() ).isEqualTo( 1 );
+			assertThat( children.get( 0 ).getParents() ).hasSize( 1 );
+		} );
+	}
+
+	@Test
+	void testSelectMultipleConditionsOnInheritedProperties(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			List<Child> children = session
+					.createSelectionQuery(
+							"SELECT c FROM Child c LEFT JOIN c.parents p WHERE p.name = 'Luigi' AND p.address.city = 'Roma'",
+							Child.class
+					)
+					.getResultList();
+
+			assertThat( children.size() ).isEqualTo( 1 );
+		} );
+	}
+
 	@Entity(name = "Child")
 	public static class Child {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/MappedSuperclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/MappedSuperclassInheritanceTest.java
index a3e8f4b049b2..59e51549a608 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/MappedSuperclassInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/hhh16711/MappedSuperclassInheritanceTest.java
@@ -49,7 +49,7 @@ public void testNew(EntityManagerFactoryScope scope) {
 	@JiraKey( value = "HHH-16711")
 	public void testSelect(EntityManagerFactoryScope scope) {
 		scope.inTransaction(entityManager -> {
-			entityManager.createNativeQuery("INSERT INTO inheriting VALUES ('myId', 'myName')").executeUpdate();
+			entityManager.createNativeQuery("INSERT INTO inheriting (id, name) VALUES ('myId', 'myName')").executeUpdate();
 		});
 
 		scope.inTransaction(entityManager -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithJoinedInheritanceTest.java
index 119ae08808d0..dc002a5cb990 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithJoinedInheritanceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/join/AttributeJoinWithJoinedInheritanceTest.java
@@ -68,7 +68,7 @@ public void testLeftJoinSelectFk(SessionFactoryScope scope) {
 		scope.inTransaction( s -> {
 			final List<Integer> resultList = s.createQuery(
 					"select ce.id " +
-							"from RootOne r left join r.child ce ",
+							"from RootOne r left join r.child ce order by r.id",
 					Integer.class
 			).getResultList();
 			assertEquals( 2, resultList.size() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java
index eb25f5919624..4886340434ce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java
@@ -80,10 +80,12 @@ public void testReferenceItself() {
 				new Batch( "insert into Placeholder (name,id) values (?,?)", 2 ),
 				new Batch( List.of(
 						"insert into Parameter (name,parent_id,TYPE,id) values (?,?," + literal( "INPUT" ) + ",?)",
-						"insert into \"Parameter\" (name,\"parent_id\",TYPE,id) values (?,?," + literal( "INPUT" ) + ",?)" ) ),
+						"insert into \"Parameter\" (name,\"parent_id\",TYPE,id) values (?,?," + literal( "INPUT" ) + ",?)",
+						"insert into `Parameter` (name,`parent_id`,TYPE,id) values (?,?," + literal( "INPUT" ) + ",?)" ) ),
 				new Batch( List.of(
 						"insert into Parameter (name,parent_id,TYPE,id) values (?,?," + literal( "OUTPUT" ) + ",?)",
-						"insert into \"Parameter\" (name,\"parent_id\",TYPE,id) values (?,?," + literal( "OUTPUT" ) + ",?)" ),
+						"insert into \"Parameter\" (name,\"parent_id\",TYPE,id) values (?,?," + literal( "OUTPUT" ) + ",?)",
+						"insert into `Parameter` (name,`parent_id`,TYPE,id) values (?,?," + literal( "OUTPUT" ) + ",?)" ),
 						3 )
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/merge/MergeAuditingInterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/merge/MergeAuditingInterceptorTest.java
index 30a571500e0a..fdd844f77a9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/merge/MergeAuditingInterceptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/merge/MergeAuditingInterceptorTest.java
@@ -36,7 +36,7 @@ void test(EntityManagerFactoryScope scope) {
 		} );
 	}
 
-	@Entity
+	@Entity(name = "Thing")
 	static class Thing {
 		@Id
 		@GeneratedValue
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/merge/MergeInterceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/merge/MergeInterceptionTest.java
index 181fffa59a9b..712d6b1c2c23 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/merge/MergeInterceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/merge/MergeInterceptionTest.java
@@ -51,7 +51,7 @@ void test(EntityManagerFactoryScope scope) {
 			assertEquals( 2, thing.names.size() );
 		} );
 	}
-	@Entity
+	@Entity(name = "Thing")
 	static class Thing {
 		@Id @GeneratedValue
 		private Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/beans/BeanInfoHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/beans/BeanInfoHelperTest.java
new file mode 100644
index 000000000000..c7fd8ea585c8
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/internal/util/beans/BeanInfoHelperTest.java
@@ -0,0 +1,360 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.internal.util.beans;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.hibernate.internal.util.beans.BeanInfo;
+import org.hibernate.internal.util.beans.BeanInfoHelper;
+import org.hibernate.internal.util.beans.PropertyDescriptor;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests for {@link BeanInfoHelper} and related bean introspection classes.
+ */
+@BaseUnitTest
+public class BeanInfoHelperTest {
+
+	@Test
+	public void testSimpleBean() {
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( SimpleBean.class, null );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		// Should find the "name" property
+		PropertyDescriptor nameProp = byName.get( "name" );
+		assertNotNull( nameProp, "Should find 'name' property" );
+		assertNotNull( nameProp.getReadMethod(), "Should have getter for 'name'" );
+		assertNotNull( nameProp.getWriteMethod(), "Should have setter for 'name'" );
+		assertEquals( "getName", nameProp.getReadMethod().getName() );
+		assertEquals( "setName", nameProp.getWriteMethod().getName() );
+
+		// Should find the "age" property
+		PropertyDescriptor ageProp = byName.get( "age" );
+		assertNotNull( ageProp, "Should find 'age' property" );
+		assertNotNull( ageProp.getReadMethod(), "Should have getter for 'age'" );
+		assertNotNull( ageProp.getWriteMethod(), "Should have setter for 'age'" );
+	}
+
+	@Test
+	public void testBooleanProperty() {
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( BooleanBean.class, null );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		// Should find "active" property with isActive() getter
+		PropertyDescriptor activeProp = byName.get( "active" );
+		assertNotNull( activeProp, "Should find 'active' property" );
+		assertNotNull( activeProp.getReadMethod(), "Should have getter for 'active'" );
+		assertEquals( "isActive", activeProp.getReadMethod().getName() );
+		assertNotNull( activeProp.getWriteMethod(), "Should have setter for 'active'" );
+	}
+
+	@Test
+	public void testInheritedProperties() {
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( ChildBean.class, null );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		// Should find inherited "name" property from SimpleBean
+		PropertyDescriptor nameProp = byName.get( "name" );
+		assertNotNull( nameProp, "Should find inherited 'name' property" );
+
+		// Should find child-specific "description" property
+		PropertyDescriptor descProp = byName.get( "description" );
+		assertNotNull( descProp, "Should find 'description' property" );
+	}
+
+	@Test
+	public void testStopClass() {
+		// With stopClass = SimpleBean.class, we should only get ChildBean's own properties
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( ChildBean.class, SimpleBean.class );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		// Should NOT find inherited "name" property
+		assertNull( byName.get( "name" ), "Should not find inherited 'name' property when using stopClass" );
+
+		// Should find child-specific "description" property
+		PropertyDescriptor descProp = byName.get( "description" );
+		assertNotNull( descProp, "Should find 'description' property" );
+	}
+
+	@Test
+	public void testPropertyWithUpperCaseAcronym() {
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( AcronymBean.class, null );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		// URL property should be named "URL" (both chars uppercase, not decapitalized)
+		PropertyDescriptor urlProp = byName.get( "URL" );
+		assertNotNull( urlProp, "Should find 'URL' property" );
+		assertEquals( "getURL", urlProp.getReadMethod().getName() );
+	}
+
+	@Test
+	public void testVisitBeanInfo() {
+		// Test the delegate pattern
+		boolean[] visited = { false };
+
+		BeanInfoHelper.visitBeanInfo( SimpleBean.class, beanInfo -> {
+			visited[0] = true;
+			PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+			assertTrue( descriptors.length > 0, "Should have at least one property" );
+		} );
+
+		assertTrue( visited[0], "Delegate should have been called" );
+	}
+
+	@Test
+	public void testVisitBeanInfoWithReturn() {
+		// Test the returning delegate pattern
+		int propertyCount = BeanInfoHelper.visitBeanInfo( SimpleBean.class,
+				beanInfo -> beanInfo.getPropertyDescriptors().length );
+
+		assertTrue( propertyCount >= 2, "Should have at least 2 properties (name and age)" );
+	}
+
+	@Test
+	public void testReadOnlyProperty() {
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( ReadOnlyBean.class, null );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		PropertyDescriptor idProp = byName.get( "id" );
+		assertNotNull( idProp, "Should find 'id' property" );
+		assertNotNull( idProp.getReadMethod(), "Should have getter for 'id'" );
+		assertNull( idProp.getWriteMethod(), "Should NOT have setter for 'id'" );
+	}
+
+	@Test
+	public void testWriteOnlyProperty() {
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( WriteOnlyBean.class, null );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		PropertyDescriptor passwordProp = byName.get( "password" );
+		assertNotNull( passwordProp, "Should find 'password' property" );
+		assertNull( passwordProp.getReadMethod(), "Should NOT have getter for 'password'" );
+		assertNotNull( passwordProp.getWriteMethod(), "Should have setter for 'password'" );
+	}
+
+	@Test
+	public void testGetClassNotExposedAsProperty() {
+		// Object.getClass() should NOT be exposed as a "class" property
+		// because we stop introspection at Object.class
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( SimpleBean.class, null );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		assertNull( byName.get( "class" ), "Object.getClass() should NOT be exposed as a property" );
+	}
+
+	@Test
+	public void testSingleCharacterPropertyName() {
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( SingleCharBean.class, null );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		// getX() should produce property "x"
+		PropertyDescriptor xProp = byName.get( "x" );
+		assertNotNull( xProp, "Should find 'x' property" );
+		assertEquals( "getX", xProp.getReadMethod().getName() );
+	}
+
+	@Test
+	public void testCovariantReturnType() {
+		// Child overrides getter with more specific return type
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( CovariantChild.class, null );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		PropertyDescriptor valueProp = byName.get( "value" );
+		assertNotNull( valueProp, "Should find 'value' property" );
+		// Should use the child's getter (more specific type)
+		assertEquals( Integer.class, valueProp.getReadMethod().getReturnType() );
+	}
+
+	@Test
+	public void testOverloadedSetters() {
+		// When multiple setters exist with same name but different param types,
+		// we accept finding any one of them (implementation takes first found)
+		BeanInfo beanInfo = BeanInfoHelper.getBeanInfo( OverloadedSetterBean.class, null );
+		PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
+
+		Map<String, PropertyDescriptor> byName = toMap( descriptors );
+
+		PropertyDescriptor valueProp = byName.get( "value" );
+		assertNotNull( valueProp, "Should find 'value' property" );
+		assertNotNull( valueProp.getWriteMethod(), "Should have a setter" );
+		// We accept any setter - just verify one was found
+		assertEquals( "setValue", valueProp.getWriteMethod().getName() );
+	}
+
+	@Test
+	public void testCachingReturnsSameInstance() {
+		// When stopClass is null, results should be cached
+		BeanInfo first = BeanInfoHelper.getBeanInfo( SimpleBean.class, null );
+		BeanInfo second = BeanInfoHelper.getBeanInfo( SimpleBean.class, null );
+
+		// Should return the same cached instance
+		assertSame( first, second, "BeanInfo should be cached and return same instance" );
+	}
+
+	@Test
+	public void testNonNullStopClassNotCached() {
+		// When stopClass is non-null, results are not cached (rare case)
+		BeanInfo first = BeanInfoHelper.getBeanInfo( ChildBean.class, SimpleBean.class );
+		BeanInfo second = BeanInfoHelper.getBeanInfo( ChildBean.class, SimpleBean.class );
+
+		// These may or may not be the same instance - just verify they work correctly
+		Map<String, PropertyDescriptor> props1 = toMap( first.getPropertyDescriptors() );
+		Map<String, PropertyDescriptor> props2 = toMap( second.getPropertyDescriptors() );
+
+		assertEquals( props1.keySet(), props2.keySet(), "Should have same properties" );
+	}
+
+	private static Map<String, PropertyDescriptor> toMap(final PropertyDescriptor[] descriptors) {
+		Map<String, PropertyDescriptor> map = new HashMap<>();
+		for ( PropertyDescriptor pd : descriptors ) {
+			map.put( pd.getName(), pd );
+		}
+		return map;
+	}
+
+	// Test beans
+
+	public static class SimpleBean {
+		private String name;
+		private int age;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public int getAge() {
+			return age;
+		}
+
+		public void setAge(int age) {
+			this.age = age;
+		}
+	}
+
+	public static class BooleanBean {
+		private boolean active;
+
+		public boolean isActive() {
+			return active;
+		}
+
+		public void setActive(boolean active) {
+			this.active = active;
+		}
+	}
+
+	public static class ChildBean extends SimpleBean {
+		private String description;
+
+		public String getDescription() {
+			return description;
+		}
+
+		public void setDescription(String description) {
+			this.description = description;
+		}
+	}
+
+	public static class AcronymBean {
+		private String url;
+
+		public String getURL() {
+			return url;
+		}
+
+		public void setURL(String url) {
+			this.url = url;
+		}
+	}
+
+	public static class ReadOnlyBean {
+		private final Long id = 1L;
+
+		public Long getId() {
+			return id;
+		}
+	}
+
+	public static class WriteOnlyBean {
+		private String password;
+
+		public void setPassword(String password) {
+			this.password = password;
+		}
+	}
+
+	public static class SingleCharBean {
+		private int x;
+
+		public int getX() {
+			return x;
+		}
+
+		public void setX(int x) {
+			this.x = x;
+		}
+	}
+
+	public static class CovariantParent {
+		public Number getValue() {
+			return 0;
+		}
+	}
+
+	public static class CovariantChild extends CovariantParent {
+		@Override
+		public Integer getValue() {
+			return 42;
+		}
+	}
+
+	public static class OverloadedSetterBean {
+		private Object value;
+
+		public Object getValue() {
+			return value;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		public void setValue(Integer value) {
+			this.value = value;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java
index 0b8b7f339163..9d09a751db3e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java
@@ -259,6 +259,7 @@ public static class Entity4 {
 	}
 
 	@SuppressWarnings("unused")
+	@Table(name = "Entity5")
 	public static class Entity5 {
 		private Integer id;
 		private String name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/isdirty/IsDirtyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/isdirty/IsDirtyTest.java
index 7e2e31065b8a..a62a74951095 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/isdirty/IsDirtyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/isdirty/IsDirtyTest.java
@@ -88,7 +88,7 @@ public class IsDirtyTest {
 			assertTrue( session.isDirty() );
 		} );
 	}
-	@Entity
+	@Entity(name = "X")
 	static class X {
 		@Id @GeneratedValue
 		Long id;
@@ -98,7 +98,7 @@ static class X {
 		@ElementCollection
 		Set<String> strings = new HashSet<>();
 	}
-	@Entity
+	@Entity(name = "Y")
 	static class Y {
 		@Id @GeneratedValue
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java
index 7541045366a6..b9e50e675b8c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/JdbcCoordinatorTest.java
@@ -4,7 +4,7 @@
  */
 package org.hibernate.orm.test.jdbc;
 
-import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.annotations.processing.GenericDialect;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.engine.jdbc.batch.spi.Batch;
@@ -15,7 +15,6 @@
 import org.hibernate.resource.jdbc.spi.JdbcEventHandler;
 import org.hibernate.resource.jdbc.spi.JdbcSessionContext;
 import org.hibernate.resource.jdbc.spi.JdbcSessionOwner;
-import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.service.ServiceRegistry;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -24,6 +23,8 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
+import static org.hibernate.cfg.JdbcSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT;
+import static org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode.IMMEDIATE_ACQUISITION_AND_HOLD;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.eq;
@@ -45,36 +46,34 @@ public void testConnectionClose()
 
 		JdbcSessionOwner sessionOwner = Mockito.mock( JdbcSessionOwner.class );
 
-		JdbcConnectionAccess jdbcConnectionAccess = Mockito.mock(
-				JdbcConnectionAccess.class );
+		JdbcConnectionAccess jdbcConnectionAccess = Mockito.mock( JdbcConnectionAccess.class );
 		when( jdbcConnectionAccess.obtainConnection() ).thenReturn( connection );
-		when( jdbcConnectionAccess.supportsAggressiveRelease() ).thenReturn(
-				false );
+		when( jdbcConnectionAccess.supportsAggressiveRelease() ).thenReturn( false );
 
 		JdbcSessionContext sessionContext = Mockito.mock( JdbcSessionContext.class );
 		when( sessionOwner.getJdbcSessionContext() ).thenReturn( sessionContext );
-		when( sessionOwner.getJdbcConnectionAccess() ).thenReturn(
-				jdbcConnectionAccess );
+		when( sessionOwner.getJdbcConnectionAccess() ).thenReturn( jdbcConnectionAccess );
 
 		ServiceRegistry serviceRegistry = Mockito.mock( ServiceRegistry.class );
-		when( sessionContext.getPhysicalConnectionHandlingMode() ).thenReturn(
-				PhysicalConnectionHandlingMode.IMMEDIATE_ACQUISITION_AND_HOLD );
+		when( sessionContext.getPhysicalConnectionHandlingMode() )
+				.thenReturn( IMMEDIATE_ACQUISITION_AND_HOLD );
 
 		JdbcEventHandler jdbcEventHandler = Mockito.mock( JdbcEventHandler.class );
 		when( sessionContext.getEventHandler() ).thenReturn( jdbcEventHandler );
 
 		JdbcServices jdbcServices = Mockito.mock( JdbcServices.class );
+		when( jdbcServices.getDialect() ).thenReturn( new GenericDialect() );
+		when ( sessionContext.getJdbcServices() ).thenReturn( jdbcServices );
 
 		ConfigurationService configurationService = Mockito.mock( ConfigurationService.class );
-		when( serviceRegistry.getService( eq( ConfigurationService.class ) ) ).thenReturn(
-				configurationService );
-		when( configurationService.getSetting( eq( AvailableSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT ), same( StandardConverters.BOOLEAN), eq( false )) )
+		when( serviceRegistry.getService( eq( ConfigurationService.class ) ) )
+				.thenReturn( configurationService );
+		when( configurationService.getSetting( eq( CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT ), same( StandardConverters.BOOLEAN), eq( false )) )
 				.thenReturn( false );
 
 		SqlExceptionHelper sqlExceptionHelper = Mockito.mock( SqlExceptionHelper.class );
-		when( jdbcServices.getSqlExceptionHelper() ).thenReturn(
-				sqlExceptionHelper );
-		when(sessionOwner.getSqlExceptionHelper()).thenReturn( sqlExceptionHelper );
+		when( jdbcServices.getSqlExceptionHelper() ).thenReturn( sqlExceptionHelper );
+		when( sessionOwner.getSqlExceptionHelper() ).thenReturn( sqlExceptionHelper );
 		JdbcCoordinatorImpl jdbcCoordinator = new JdbcCoordinatorImpl(
 				null,
 				sessionOwner,
@@ -82,8 +81,7 @@ public void testConnectionClose()
 		);
 
 		Batch currentBatch = Mockito.mock( Batch.class );
-		Field currentBatchField = JdbcCoordinatorImpl.class.getDeclaredField(
-				"currentBatch" );
+		Field currentBatchField = JdbcCoordinatorImpl.class.getDeclaredField( "currentBatch" );
 		currentBatchField.setAccessible( true );
 		currentBatchField.set( jdbcCoordinator, currentBatch );
 
@@ -96,7 +94,8 @@ public void testConnectionClose()
 		catch (Exception expected) {
 			assertEquals( IllegalStateException.class, expected.getClass() );
 		}
-		verify( jdbcConnectionAccess, times( 1 ) ).releaseConnection( same(
-				connection ) );
+		verify( jdbcConnectionAccess,
+				times( 1 ) )
+				.releaseConnection( same( connection ) );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/PostgresTransactionStatusTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/PostgresTransactionStatusTest.java
new file mode 100644
index 000000000000..704a67c3f0a6
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/PostgresTransactionStatusTest.java
@@ -0,0 +1,73 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.jdbc;
+
+import org.hibernate.JDBCException;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.resource.transaction.spi.TransactionStatus;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * Test that PostgreSQL transactions are marked as rollback-only when an SQLException occurs.
+ */
+@DomainModel
+@SessionFactory
+@RequiresDialect(PostgreSQLDialect.class)
+public class PostgresTransactionStatusTest {
+	@Test
+	public void testPostgresTransactionStatusOnException(SessionFactoryScope factoryScope) {
+		factoryScope.inSession( session -> {
+			session.getTransaction().begin();
+			// Execute work that throws SQLException
+			try {
+				session.doWork( connection -> {
+					try ( var statement = connection.createStatement() ) {
+						statement.execute( "select * from non_existent_table" );
+					}
+				} );
+				fail( "Should have thrown JDBCException" );
+			}
+			catch (JDBCException e) {
+				// Expected
+			}
+
+			assertEquals( TransactionStatus.MARKED_ROLLBACK,
+					session.getTransaction().getStatus() );
+
+			session.getTransaction().rollback();
+		} );
+	}
+
+	@Test
+	public void testPostgresTransactionStatusOnStatelessSessionException(SessionFactoryScope factoryScope) {
+		factoryScope.inStatelessSession( session -> {
+			session.getTransaction().begin();
+			// Execute work that throws SQLException
+			try {
+				session.doWork( connection -> {
+					try ( var statement = connection.createStatement() ) {
+						statement.execute( "select * from non_existent_table" );
+					}
+				} );
+				fail( "Should have thrown JDBCException" );
+			}
+			catch (JDBCException e) {
+				// Expected
+			}
+
+			assertEquals( TransactionStatus.MARKED_ROLLBACK,
+					session.getTransaction().getStatus() );
+
+			session.getTransaction().rollback();
+		} );
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java
index 7445e73407c9..468b581f8c3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BasicConnectionTest.java
@@ -9,6 +9,8 @@
 import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.resource.jdbc.ResourceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
@@ -44,6 +46,7 @@ public void testExceptionHandling(SessionFactoryScope factoryScope) {
 	@Test
 	@SkipForDialect(dialectClass = DerbyDialect.class,
 			reason = "Derby can't drop tables that are still referred to from open ResultSets")
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsTableWithoutPrimaryKey.class )
 	public void testBasicJdbcUsage(SessionFactoryScope factoryScope) throws JDBCException {
 		factoryScope.inSession( (session) -> {
 			var jdbcCoordinator = session.getJdbcCoordinator();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java
index b904ba0495df..f0f23279440d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/internal/BatchingTest.java
@@ -17,6 +17,8 @@
 import org.hibernate.orm.test.common.JournalingBatchObserver;
 import org.hibernate.sql.model.MutationType;
 import org.hibernate.sql.model.jdbc.JdbcValueDescriptor;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.type.StandardBasicTypes;
@@ -32,6 +34,7 @@
  * @author Brett Meyer
  */
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsTableWithoutPrimaryKey.class )
 public class BatchingTest implements BatchKey {
 	private final String SANDBOX_TBL = "SANDBOX_JDBC_TST";
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/FullJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/FullJoinTest.java
new file mode 100644
index 000000000000..a3adbc479fae
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/FullJoinTest.java
@@ -0,0 +1,151 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.join;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import org.hibernate.dialect.SybaseASEDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsFullJoin.class)
+@Jpa(annotatedClasses =
+		{FullJoinTest.Thing.class,
+		FullJoinTest.OtherThing.class})
+class FullJoinTest {
+	@Test
+	void test(EntityManagerFactoryScope scope) {
+		prepareData( scope );
+		scope.inTransaction( session -> {
+			var result1 =
+					session.createQuery( "select t, o from Thing t full join t.otherThing o", Object[].class )
+							.getResultList();
+			assertEquals( 3, result1.size() );
+			var result2 =
+					session.createQuery( "select t, o from OtherThing o full join o.things t", Object[].class )
+							.getResultList();
+			assertEquals( 3, result2.size() );
+		} );
+	}
+
+	@Test
+	void testNullsLastOrderBy(EntityManagerFactoryScope scope) {
+		prepareData( scope );
+		scope.inTransaction( session -> {
+			final var result =
+					session.createQuery(
+							"select t.id, o.id from Thing t full join t.otherThing o order by t.id nulls last, o.id",
+							Object[].class
+					).getResultList();
+			assertEquals( 3, result.size() );
+			assertNotNull( result.get( 0 )[0] );
+			assertNotNull( result.get( 1 )[0] );
+			assertTrue(
+					( (Number) result.get( 0 )[0] ).longValue() < ( (Number) result.get( 1 )[0] ).longValue()
+			);
+			assertNull( result.get( 2 )[0] );
+			assertNotNull( result.get( 2 )[1] );
+		} );
+	}
+
+	@Test
+	void testSybaseNullPrecedenceAliasCounting(EntityManagerFactoryScope scope) {
+		prepareData( scope );
+		scope.inTransaction( session -> {
+			final var result =
+					session.createQuery(
+							"select t.id from Thing t full join t.otherThing o order by t.id nulls last",
+							Long.class
+					).getResultList();
+			assertEquals( 3, result.size() );
+			assertNull( result.get( 2 ) );
+		} );
+	}
+
+	@Test
+	@SkipForDialect(dialectClass = SybaseASEDialect.class,
+			reason = "Sybase does not allow union within subquery")
+	void testNestedFullJoinInSubquery(EntityManagerFactoryScope scope) {
+		prepareData( scope );
+		scope.inTransaction( session -> {
+			final var result =
+					session.createQuery(
+							"""
+									select t.id from Thing t
+										full join t.otherThing o
+										where exists (select 1 from Thing t2 full join t2.otherThing o2 where o2.id is null)
+									""",
+							Long.class
+					).getResultList();
+			assertEquals( 3, result.size() );
+		} );
+	}
+
+	@Test
+	void testNestedScalarSubqueryWithOuterFullJoinOrderBy(EntityManagerFactoryScope scope) {
+		prepareData( scope );
+		scope.inTransaction( session -> {
+			final var result =
+					session.createQuery(
+							"""
+									select t.id from Thing t full join t.otherThing o
+										where t.id = (select max(t2.id) from Thing t2)
+										order by o.id
+									""",
+							Long.class
+					).getResultList();
+			assertEquals( 1, result.size() );
+			assertNotNull( result.get( 0 ) );
+		} );
+	}
+
+	private void prepareData(EntityManagerFactoryScope scope) {
+		scope.inTransaction( session -> {
+			session.createNativeQuery( "delete from OtherThing_Thing where 1=1" ).executeUpdate();
+			session.createQuery( "delete from Thing" ).executeUpdate();
+			session.createQuery( "delete from OtherThing" ).executeUpdate();
+
+			Thing thing = new Thing();
+			OtherThing otherThing = new OtherThing();
+			thing.otherThing = otherThing;
+			otherThing.things.add( thing );
+			session.persist( thing );
+			session.persist( otherThing );
+			session.persist( new Thing() );
+			session.persist( new OtherThing() );
+		} );
+	}
+
+	@Entity(name = "Thing")
+	static class Thing {
+		@Id @GeneratedValue
+		Long id;
+		String name;
+		@ManyToOne
+		OtherThing otherThing;
+	}
+	@Entity(name = "OtherThing")
+	static class OtherThing {
+		@Id @GeneratedValue
+		Long id;
+		@OneToMany
+		Set<Thing> things = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java
index dc3125db9f17..1c3650cd2534 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java
@@ -147,7 +147,7 @@ private void doWork(final Session s) {
 				new AbstractWork() {
 					@Override
 					public void execute(Connection connection) throws SQLException {
-						try (PreparedStatement ps = connection.prepareStatement( "delete from t_user" )) {
+						try (PreparedStatement ps = connection.prepareStatement( "delete from t_user where 1=1" )) {
 							ps.execute();
 						}
 					}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java
index 9bbcff756009..d5ba888343cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java
@@ -14,6 +14,7 @@
 import jakarta.persistence.Table;
 
 import org.hibernate.community.dialect.AltibaseDialect;
+import org.hibernate.metamodel.mapping.DiscriminatorValue.Literal;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.JoinedSubclassEntityPersister;
 
@@ -51,14 +52,14 @@ public void metadataAssertions(SessionFactoryScope scope) {
 		final JoinedSubclassEntityPersister dogPersister = assertTyping( JoinedSubclassEntityPersister.class, p );
 		assertEquals( "string", dogPersister.getDiscriminatorType().getName() );
 		assertEquals( "type", dogPersister.getDiscriminatorColumnName() );
-		assertEquals( "dog", dogPersister.getDiscriminatorValue() );
+		assertEquals( new Literal("dog"), dogPersister.getDiscriminatorValue() );
 
 		p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Cat.class.getName());
 		assertNotNull( p );
 		final JoinedSubclassEntityPersister catPersister = assertTyping( JoinedSubclassEntityPersister.class, p );
 		assertEquals( "string", catPersister.getDiscriminatorType().getName() );
 		assertEquals( "type", catPersister.getDiscriminatorColumnName() );
-		assertEquals( "cat", catPersister.getDiscriminatorValue() );
+		assertEquals( new Literal("cat"), catPersister.getDiscriminatorValue() );
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java
index b8603e1ef7f4..b41d68990d85 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java
@@ -25,6 +25,7 @@
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
+import static org.hibernate.metamodel.mapping.DiscriminatorValue.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -57,14 +58,14 @@ public void metadataAssertions(SessionFactoryScope scope) {
 		final JoinedSubclassEntityPersister dogPersister = assertTyping( JoinedSubclassEntityPersister.class, p );
 		assertEquals( "integer", dogPersister.getDiscriminatorType().getName() );
 		assertEquals( "clazz_", dogPersister.getDiscriminatorColumnName() );
-		assertTrue( Integer.class.isInstance( dogPersister.getDiscriminatorValue() ) );
+		assertTrue( dogPersister.getDiscriminatorValue() instanceof Literal l && l.value() instanceof Integer );
 
 		p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Cat.class.getName());
 		assertNotNull( p );
 		final JoinedSubclassEntityPersister catPersister = assertTyping( JoinedSubclassEntityPersister.class, p );
 		assertEquals( "integer", catPersister.getDiscriminatorType().getName() );
 		assertEquals( "clazz_", catPersister.getDiscriminatorColumnName() );
-		assertTrue( Integer.class.isInstance( catPersister.getDiscriminatorValue() ) );
+		assertTrue( catPersister.getDiscriminatorValue() instanceof Literal l && l.value() instanceof Integer );
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java
index e1a07cf2524f..d13e33e042d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java
@@ -6,6 +6,7 @@
 
 import org.hibernate.boot.model.internal.AnnotatedDiscriminatorColumn;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.JoinedSubclassEntityPersister;
 
@@ -59,7 +60,7 @@ public void metadataAssertions(SessionFactoryScope scope) {
 				AnnotatedDiscriminatorColumn.DEFAULT_DISCRIMINATOR_COLUMN_NAME,
 				dogPersister.getDiscriminatorColumnName()
 		);
-		assertEquals( "Dog", dogPersister.getDiscriminatorValue() );
+		assertEquals( new DiscriminatorValue.Literal("Dog"), dogPersister.getDiscriminatorValue() );
 
 		p = scope.getSessionFactory().getMappingMetamodel().getEntityDescriptor(Cat.class.getName());
 		assertNotNull( p );
@@ -72,7 +73,7 @@ public void metadataAssertions(SessionFactoryScope scope) {
 				AnnotatedDiscriminatorColumn.DEFAULT_DISCRIMINATOR_COLUMN_NAME,
 				catPersister.getDiscriminatorColumnName()
 		);
-		assertEquals( "Cat", catPersister.getDiscriminatorValue() );
+		assertEquals( new DiscriminatorValue.Literal("Cat"), catPersister.getDiscriminatorValue() );
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java
index 13149c0d2b65..e883d9cf2035 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java
@@ -25,6 +25,7 @@
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.jpa.HibernatePersistenceProvider;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
@@ -196,8 +197,8 @@ public ClassTransformer getClassTransformer() {
 		}
 	}
 
-	protected Map<Object,Object> buildSettings() {
-		final Map<Object,Object> settings = getConfig();
+	protected Map<String,Object> buildSettings() {
+		final Map<String,Object> settings = getConfig();
 		addMappings( settings );
 		if ( createSchema() ) {
 			settings.put( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
@@ -207,7 +208,7 @@ protected Map<Object,Object> buildSettings() {
 		return settings;
 	}
 
-	protected void addMappings(Map<Object,Object> settings) {
+	protected void addMappings(Map<String,Object> settings) {
 		final String[] mappings = getMappings();
 		if ( mappings != null ) {
 			settings.put( AvailableSettings.HBM_XML_FILES, String.join( ",", mappings ) );
@@ -220,8 +221,8 @@ protected String[] getMappings() {
 		return NO_MAPPINGS;
 	}
 
-	protected Map<Object,Object> getConfig() {
-		final Map<Object, Object> config = Environment.getProperties();
+	protected Map<String,Object> getConfig() {
+		final Map<String, Object> config = PropertiesHelper.map( Environment.getProperties() );
 
 		config.put( AvailableSettings.CLASSLOADERS, getClass().getClassLoader() );
 
@@ -246,7 +247,7 @@ protected Map<Object,Object> getConfig() {
 		return config;
 	}
 
-	protected void addConfigOptions(Map<Object,Object> options) {
+	protected void addConfigOptions(Map<String,Object> options) {
 	}
 
 	protected static final Class<?>[] NO_CLASSES = new Class[0];
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java
index 84001c3c01b8..525f92b1d3fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java
@@ -62,8 +62,8 @@ protected void addConfigOptions(Map options) {
 	}
 
 	@Override
-	public Map<Class, String> getCachedClasses() {
-		Map<Class, String> result = new HashMap<>();
+	public Map<Class<?>, String> getCachedClasses() {
+		Map<Class<?>, String> result = new HashMap<>();
 		result.put( Item.class, "read-write" );
 		return result;
 	}
@@ -307,13 +307,11 @@ public void testGet() throws Exception {
 	@Test
 	public void testGetProperties() {
 		inEntityManager( entityManager -> {
-			Map<String, Object> properties = entityManager.getProperties();
-			assertNotNull( properties );
-			assertThrows(
-					UnsupportedOperationException.class,
-					() -> properties.put( "foo", "bar" )
-			);
-			assertTrue( properties.containsKey( HibernateHints.HINT_FLUSH_MODE ) );
+			assertNotNull( entityManager.getProperties() );
+			assertTrue( entityManager.getProperties().containsKey( HibernateHints.HINT_FLUSH_MODE ) );
+			// according to Javadoc, getProperties() returns mutable copy
+			entityManager.getProperties().put( "foo", "bar" );
+			assertFalse( entityManager.getProperties().containsKey( "foo" ) );
 		} );
 	}
 
@@ -411,7 +409,7 @@ public void testEntityNotFoundException() {
 			w.setSerial( "0324" );
 			entityManager.persist( w );
 			Wallet wallet = entityManager.find( Wallet.class, w.getSerial() );
-			entityManager.createNativeQuery( "delete from Wallet" ).executeUpdate();
+			entityManager.createNativeQuery( "delete from Wallet where 1=1" ).executeUpdate();
 			assertThrows(
 					EntityNotFoundException.class,
 					() -> entityManager.refresh( wallet ),
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java
index e4fbd7cf95e8..dcdd2ad346e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java
@@ -26,15 +26,11 @@
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.Setting;
 
+import org.jboss.logging.Logger;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.LoggerConfig;
-
+import static org.hibernate.testing.logger.LogLevelContext.withLevel;
 
 @JiraKey(value = "HHH-13244")
 @Jpa(
@@ -77,26 +73,13 @@ public void setUp(EntityManagerFactoryScope scope) {
 	@Test
 	@JiraKey(value = "HHH-13244")
 	public void testJpaComplianceProxyWithDebug(EntityManagerFactoryScope scope) {
-		LoggerContext context = (LoggerContext) LogManager.getContext( false );
-		Configuration configuration = context.getConfiguration();
-
 		//This could be replaced with setting the root logger level, or the "org.hibernate" logger to debug.
 		//These are simply the narrowest log settings that trigger the bug
-		LoggerConfig entityLogger = configuration.getLoggerConfig( "org.hibernate.internal.util.EntityPrinter");
-		LoggerConfig listenerLogger = configuration.getLoggerConfig("org.hibernate.event.internal.AbstractFlushingEventListener");
-
-		Level oldEntityLogLevel = entityLogger.getLevel();
-		Level oldListenerLogLevel = listenerLogger.getLevel();
-
-		entityLogger.setLevel(Level.DEBUG);
-		listenerLogger.setLevel(Level.DEBUG);
-		try {
+		try (var epc = withLevel( "org.hibernate.internal.util.EntityPrinter", Logger.Level.DEBUG );
+			var afelc = withLevel( "org.hibernate.event.internal.AbstractFlushingEventListener", Logger.Level.DEBUG )) {
 			scope.inTransaction(
-					entityManager -> entityManager.find( MvnoBillingAgreement.class, 1)
+					entityManager -> entityManager.find( MvnoBillingAgreement.class, 1 )
 			);
-		} finally {
-			entityLogger.setLevel(oldEntityLogLevel);
-			listenerLogger.setLevel(oldListenerLogLevel);
 		}
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.java
index 6de1f5bb3a46..bc4304fa61aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.java
@@ -13,8 +13,8 @@
  * @author Steve Ebersole
  */
 public class SettingsGenerator {
-	public static Map generateSettings(Object... keysAndValues) {
-		final Map settings = ServiceRegistryUtil.createBaseSettings();
+	public static Map<String,Object> generateSettings(Object... keysAndValues) {
+		final Map<String,Object> settings = ServiceRegistryUtil.createBaseSettings();
 
 		if ( keysAndValues != null ) {
 			if ( keysAndValues.length %2 != 0 ) {
@@ -23,7 +23,7 @@ public static Map generateSettings(Object... keysAndValues) {
 
 
 			for ( int i = 0; i < keysAndValues.length; ) {
-				settings.put( keysAndValues[i], keysAndValues[i+1] );
+				settings.put( keysAndValues[i].toString(), keysAndValues[i+1] );
 				i+=2;
 			}
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java
index a137262d3696..3b6c45f46b41 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java
@@ -28,7 +28,7 @@ public static EntityManagerFactory generateEntityManagerFactory(PersistenceUnitD
 		return generateEntityManagerFactory( descriptor, SettingsGenerator.generateSettings( settings ) );
 	}
 
-	public static EntityManagerFactory generateEntityManagerFactory(PersistenceUnitDescriptor descriptor, Map settings) {
+	public static EntityManagerFactory generateEntityManagerFactory(PersistenceUnitDescriptor descriptor, Map<String,Object> settings) {
 		return Bootstrap.getEntityManagerFactoryBuilder( descriptor, settings ).build();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java
index 1cf62f88aae3..cdfd9bc23ef3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PrivateConstructorEnhancerTest.java
@@ -22,7 +22,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 @DomainModel(
 		annotatedClasses = {
@@ -55,76 +54,41 @@ void tearDown(SessionFactoryScope scope) {
 	@Test
 	public void testFindEntity(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
-			try {
-				Country country = session.find( Country.class, this.country.id );
-
-				assertNotNull( country.getName(), "Romania" );
-				fail( "Should have thrown exception" );
-			}
-			catch (Exception expected) {
-				assertTrue( expected.getMessage().contains( "No default constructor for entity" ) );
-			}
+			Country country = session.find( Country.class, this.country.id );
+			assertNotNull( country.getName(), "Romania" );
 		} );
 	}
 
 	@Test
 	public void testGetReferenceEntity(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
-			try {
-				Country country = session.getReference( Country.class, this.country.id );
-
-				assertNotNull( country.getName(), "Romania" );
-				fail( "Should have thrown exception" );
-			}
-			catch (Exception expected) {
-				assertTrue( expected.getMessage().contains( "No default constructor for entity" ) );
-			}
+			Country country = session.getReference( Country.class, this.country.id );
+			assertNotNull( country.getName(), "Romania" );
 		} );
 	}
 
 	@Test
 	public void testLoadProxyAssociation(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
-			try {
-				Person person = session.find( Person.class, this.person.id );
-
-				assertNotNull( person.getCountry().getName(), "Romania" );
-				fail( "Should have thrown exception" );
-			}
-			catch (Exception expected) {
-				assertTrue( expected.getMessage().contains( "No default constructor for entity" ) );
-			}
+			Person person = session.find( Person.class, this.person.id );
+			assertNotNull( person.getCountry().getName(), "Romania" );
 		} );
 	}
 
 	@Test
 	public void testListEntity(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
-			try {
-				List<Person> persons = session.createQuery( "select p from Person p", Person.class ).getResultList();
-				assertTrue( persons.stream().anyMatch( p -> p.getCountry().getName().equals( "Romania" ) ) );
-
-				fail( "Should have thrown exception" );
-			}
-			catch (Exception expected) {
-				assertTrue( expected.getMessage().contains( "No default constructor for entity" ) );
-			}
+			List<Person> persons = session.createQuery( "select p from Person p", Person.class ).getResultList();
+			assertTrue( persons.stream().anyMatch( p -> p.getCountry().getName().equals( "Romania" ) ) );
 		} );
 	}
 
 	@Test
 	public void testListJoinFetchEntity(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
-			try {
-				List<Person> persons = session.createQuery( "select p from Person p join fetch p.country", Person.class )
-						.getResultList();
-				assertTrue( persons.stream().anyMatch( p -> p.getCountry().getName().equals( "Romania" ) ) );
-
-				fail( "Should have thrown exception" );
-			}
-			catch (Exception expected) {
-				assertTrue( expected.getMessage().contains( "No default constructor for entity" ) );
-			}
+			List<Person> persons = session.createQuery( "select p from Person p join fetch p.country", Person.class )
+					.getResultList();
+			assertTrue( persons.stream().anyMatch( p -> p.getCountry().getName().equals( "Romania" ) ) );
 		} );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java
index 16664f25825e..d5b40b93ee70 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/multicircle/AbstractEntity.java
@@ -22,7 +22,7 @@ public abstract class AbstractEntity implements Serializable {
 	@GeneratedValue
 	private Long id;
 	@Basic
-	@Column(unique = true, updatable = false, length = 36, columnDefinition = "char(36)")
+	@Column(unique = true, updatable = false, length = 36)
 	private String uuid;
 	@Column(updatable = false)
 	private Date created;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaToBigDecimalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaToBigDecimalTest.java
index b015ea3d692d..f3e15e391fdd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaToBigDecimalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/CriteriaToBigDecimalTest.java
@@ -6,19 +6,16 @@
 
 import java.math.BigDecimal;
 
+import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Expression;
-import jakarta.persistence.criteria.Path;
-import jakarta.persistence.criteria.Root;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -44,53 +41,86 @@ public void tearDown(EntityManagerFactoryScope scope) {
 	public void testToBigDecimal(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
-					final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
-
-					final CriteriaQuery<BigDecimal> query = criteriaBuilder.createQuery( BigDecimal.class );
-
-					final Root<Person> person = query.from( Person.class );
-
-					final Path<BigDecimal> ageAttribute = person.get( "age" );
-
-					final Expression<BigDecimal> prod = criteriaBuilder.prod(
-							ageAttribute,
-							new BigDecimal( "5.5" )
-					);
-
+					final var criteriaBuilder = entityManager.getCriteriaBuilder();
+					final var query = criteriaBuilder.createQuery( BigDecimal.class );
+					final var person = query.from( Person.class );
+					final var ageAttribute = person.get( CriteriaToBigDecimalTest_.Person_.ageAsBigDecimal );
+					final var prod = criteriaBuilder.prod( ageAttribute, new BigDecimal( "5.5" ) );
 					query.select( criteriaBuilder.toBigDecimal( prod ) );
-
 					query.where( criteriaBuilder.equal( ageAttribute, 20 ) );
-
 					BigDecimal result = entityManager.createQuery( query ).getSingleResult();
+					assertEquals( new BigDecimal( "110.0" ).stripTrailingZeros(), result.stripTrailingZeros() );
+				}
+		);
+	}
 
+	@Test
+	@SkipForDialect( dialectClass = InformixDialect.class,
+			reason = "Informix has needs a CAST here") // TODO: add the CAST automatically
+	public void testToBigDecimal1(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					final var criteriaBuilder = entityManager.getCriteriaBuilder();
+					final var query = criteriaBuilder.createQuery( BigDecimal.class );
+					final var person = query.from( Person.class );
+					final var ageAttribute = person.get( CriteriaToBigDecimalTest_.Person_.age );
+					final var prod = criteriaBuilder.prod( ageAttribute, new BigDecimal( "5.5" ) );
+					query.select( criteriaBuilder.toBigDecimal( prod ) );
+					query.where( criteriaBuilder.equal( ageAttribute, 20 ) );
+					BigDecimal result = entityManager.createQuery( query ).getSingleResult();
 					assertEquals( new BigDecimal( "110.0" ).stripTrailingZeros(), result.stripTrailingZeros() );
 				}
 		);
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = InformixDialect.class,
+			reason = "Informix has needs a CAST here") // TODO: add the CAST automatically
 	public void testToBigDecimal2(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
-					final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
-
-					final CriteriaQuery<BigDecimal> query = criteriaBuilder.createQuery( BigDecimal.class );
-
-					final Root<Person> person = query.from( Person.class );
-
-					final Path<BigDecimal> ageAttribute = person.get( "age" );
-
-					final Expression<BigDecimal> prod = criteriaBuilder.prod(
-							ageAttribute,
-							new BigDecimal( "5.501" )
-					);
-
+					final var criteriaBuilder = entityManager.getCriteriaBuilder();
+					final var query = criteriaBuilder.createQuery( BigDecimal.class );
+					final var person = query.from( Person.class );
+					final var ageAttribute = person.get( CriteriaToBigDecimalTest_.Person_.age );
+					final var prod = criteriaBuilder.prod( ageAttribute, new BigDecimal( "5.501" ) );
 					query.select( criteriaBuilder.toBigDecimal( prod ) );
-
 					query.where( criteriaBuilder.equal( ageAttribute, 20 ) );
+					BigDecimal result = entityManager.createQuery( query ).getSingleResult();
+					assertEquals( new BigDecimal( "110.02" ).stripTrailingZeros(), result.stripTrailingZeros() );
+				}
+		);
+	}
 
+	@Test
+	public void testCastToBigDecimal1(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					final var criteriaBuilder = entityManager.getCriteriaBuilder();
+					final var query = criteriaBuilder.createQuery( BigDecimal.class );
+					final var person = query.from( Person.class );
+					final var ageAttribute = person.get( CriteriaToBigDecimalTest_.Person_.age ).cast( BigDecimal.class );
+					final var prod = criteriaBuilder.prod( ageAttribute, new BigDecimal( "5.5" ) );
+					query.select( criteriaBuilder.toBigDecimal( prod ) );
+					query.where( criteriaBuilder.equal( ageAttribute, 20 ) );
 					BigDecimal result = entityManager.createQuery( query ).getSingleResult();
+					assertEquals( new BigDecimal( "110.0" ).stripTrailingZeros(), result.stripTrailingZeros() );
+				}
+		);
+	}
 
+	@Test
+	public void testCastToBigDecimal2(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					final var criteriaBuilder = entityManager.getCriteriaBuilder();
+					final var query = criteriaBuilder.createQuery( BigDecimal.class );
+					final var person = query.from( Person.class );
+					final var ageAttribute = person.get( CriteriaToBigDecimalTest_.Person_.age ).cast( BigDecimal.class );
+					final var prod = criteriaBuilder.prod( ageAttribute, new BigDecimal( "5.501" ) );
+					query.select( criteriaBuilder.toBigDecimal( prod ) );
+					query.where( criteriaBuilder.equal( ageAttribute, 20 ) );
+					BigDecimal result = entityManager.createQuery( query ).getSingleResult();
 					assertEquals( new BigDecimal( "110.02" ).stripTrailingZeros(), result.stripTrailingZeros() );
 				}
 		);
@@ -100,13 +130,11 @@ public void testToBigDecimal2(EntityManagerFactoryScope scope) {
 	public void testToBigDecimal3(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
-					final CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
-					final CriteriaQuery<Object> query = criteriaBuilder.createQuery();
-					final Root<Person> person = query.from( Person.class );
-					query.select( criteriaBuilder.sum( person.get( "ageAsBigDecimal" ), 1 ) );
-
-					BigDecimal result = (BigDecimal) entityManager.createQuery( query ).getSingleResult();
-
+					final var criteriaBuilder = entityManager.getCriteriaBuilder();
+					final var query = criteriaBuilder.createQuery();
+					final var person = query.from( Person.class );
+					query.select( criteriaBuilder.sum( person.get( CriteriaToBigDecimalTest_.Person_.ageAsBigDecimal ), 1 ) );
+					var result = (BigDecimal) entityManager.createQuery( query ).getSingleResult();
 					assertEquals( new BigDecimal( "21" ), result.stripTrailingZeros() );
 				}
 		);
@@ -116,10 +144,10 @@ public void testToBigDecimal3(EntityManagerFactoryScope scope) {
 	public void testToBigDecimal4(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
-					BigDecimal result = (BigDecimal) entityManager.createQuery( "select p.ageAsBigDecimal + :val from Person p" )
-							.setParameter( "val", 1 )
-							.getSingleResult();
-
+					BigDecimal result = (BigDecimal)
+							entityManager.createQuery( "select p.ageAsBigDecimal + :val from Person p" )
+									.setParameter( "val", 1 )
+									.getSingleResult();
 					assertEquals( new BigDecimal( "21" ), result.stripTrailingZeros() );
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/NamedQueryTest.java
index 92db3024ae10..de5c718aa73d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/NamedQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/NamedQueryTest.java
@@ -9,6 +9,8 @@
 
 import org.hibernate.cfg.AvailableSettings;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.Setting;
@@ -91,9 +93,16 @@ public void testNativeWithMaxResults(EntityManagerFactoryScope scope) {
 					namedQuery.setMaxResults( 2 );
 					assertEquals( 2, namedQuery.getMaxResults() );
 
-					final List<Integer> ids = namedQuery.getResultList();
-					assertEquals( 2, ids.size() );
-					assertThat( ids, hasItems( 1, 2 ) );
+					if (scope.getDialect() instanceof SpannerPostgreSQLDialect || scope.getDialect() instanceof SpannerDialect ) {
+						// Spanner doesn't support integer column type
+						final List<Long> ids = namedQuery.getResultList();
+						assertEquals( 2, ids.size() );
+						assertThat( ids, hasItems( 1L, 2L ) );
+					} else {
+						final List<Integer> ids = namedQuery.getResultList();
+						assertEquals( 2, ids.size() );
+						assertThat( ids, hasItems( 1, 2 ) );
+					}
 				} );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/PersistenceUnitNameTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/PersistenceUnitNameTests.java
index a7e04bd9f952..b6e753f2e208 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/PersistenceUnitNameTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/PersistenceUnitNameTests.java
@@ -62,11 +62,11 @@ private static EntityManagerFactory loadFactory(String name, ServiceRegistryScop
 	}
 
 	@SuppressWarnings("deprecation")
-	private static Map<?,?> buildSettings(ServiceRegistryScope scope) {
-		final ConfigurationService service = scope.getRegistry().getService( ConfigurationService.class );
+	private static Map<String,Object> buildSettings(ServiceRegistryScope scope) {
+		final var service = scope.getRegistry().getService( ConfigurationService.class );
 		assert service != null;
 		final Map<String, Object> allSettings = service.getSettings();
-		final HashMap<Object, Object> settings = new HashMap<>();
+		final Map<String, Object> settings = new HashMap<>();
 		settings.put( JdbcSettings.DRIVER, allSettings.get( JdbcSettings.DRIVER ) );
 		settings.put( JdbcSettings.USER, allSettings.get( JdbcSettings.USER ) );
 		settings.put( JdbcSettings.PASS, allSettings.get( JdbcSettings.PASS ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaRestrictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaRestrictionTest.java
index 2e18854ab1c0..9d6203c89b8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaRestrictionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaRestrictionTest.java
@@ -68,7 +68,8 @@ class CriteriaRestrictionTest {
 				}
 		);
 	}
-	@Entity static class Doc {
+	@Entity(name = "Doc")
+	static class Doc {
 		@Id
 		@GeneratedValue
 		UUID uuid;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java
index d03db16a5992..d94a5f9ffe03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ObjectParameterTypeForEmbeddableTest.java
@@ -97,7 +97,7 @@ public void testSettingParameterOfTypeWrongType(EntityManagerFactoryScope scope)
 						)
 		);
 
-		assertThat( thrown.getMessage() ).contains( "did not match parameter type" );
+		assertThat( thrown.getMessage() ).contains( "incompatible type" );
 	}
 
 	@Entity(name = "TestEntity")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java
index 488cdca7ce29..ccfa9ddf9d51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java
@@ -15,6 +15,8 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
@@ -44,6 +46,7 @@ public class ParameterTest {
 	@Test
 	@SkipForDialect(dialectClass = InformixDialect.class,
 			reason = "Blobs are not allowed in this expression")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testPrimitiveArrayParameterBinding(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
 			CriteriaQuery<MultiTypedBasicAttributesEntity> criteria = em.getCriteriaBuilder()
@@ -62,6 +65,7 @@ public void testPrimitiveArrayParameterBinding(SessionFactoryScope scope) {
 	@Test
 	@SkipForDialect(dialectClass = InformixDialect.class,
 			reason = "Blobs are not allowed in this expression")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNonPrimitiveArrayParameterBinding(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
 			CriteriaQuery<MultiTypedBasicAttributesEntity> criteria = em.getCriteriaBuilder()
@@ -144,6 +148,7 @@ public void testParameterInParameterList2(SessionFactoryScope scope) {
 	@JiraKey("HHH-17912")
 	@SkipForDialect(dialectClass = InformixDialect.class,
 			reason = "Blobs are not allowed in this expression")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testAttributeEqualListParameter(SessionFactoryScope scope) {
 		scope.inTransaction( em -> {
 			final CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java
index 50e1cb974a0b..c6e9289d8044 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java
@@ -33,6 +33,7 @@
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * @author Andrea Boriero
@@ -156,6 +157,7 @@ public void testJoinOnTreatedRoot(EntityManagerFactoryScope scope) {
 					cb.equal(
 							treatedRoot.<Book, Author>join("author").<String>get("name"),
 							"Andrea Camilleri"));
+			criteria.orderBy( cb.asc( root.get( "id" ) ) );
 			final List<Item> resultList = entityManager.createQuery( criteria.select( treatedRoot ) ).getResultList();
 			final Item item = resultList.get( 0 );
 			assertThat( item, instanceOf(Book.class) );
@@ -195,6 +197,22 @@ root.<Bid, Item> join("item"), Book.class)
 		} );
 	}
 
+	@Test
+	@JiraKey( value = "HHH-20224")
+	public void testCachedTreatedJoin(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+			CriteriaQuery<Bid> query = cb.createQuery( Bid.class );
+			Root<Bid> bid = query.from( Bid.class );
+
+			final Join<Bid, Book> item = bid.join( "item" );
+
+			// Assert that caching works correctly
+			Join<Bid, Book> treat = cb.treat( item, Book.class );
+			assertSame( treat, cb.treat( item, Book.class ) );
+		} );
+	}
+
 	@Entity(name = "Item")
 	@Inheritance(strategy = InheritanceType.JOINED)
 	public static class Item {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java
index 15bf889274f7..d2b03eb22309 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java
@@ -296,7 +296,7 @@ public void treatRootSingleTableInheritance(EntityManagerFactoryScope scope) {
 		);
 	}
 
-	@Entity
+	@Entity(name = "Person")
 	@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 	public static class Person {
 		private Long id;
@@ -328,11 +328,11 @@ public void setName(String name) {
 		}
 	}
 
-	@Entity
+	@Entity(name = "Father")
 	public static class Father extends Person {
 	}
 
-	@Entity
+	@Entity(name = "Mother")
 	public static class Mother extends Person {
 
 		public Mother() {
@@ -343,7 +343,7 @@ public Mother(Long id, String name) {
 		}
 	}
 
-	@Entity
+	@Entity(name = "Grandmother")
 	public static class Grandmother extends Mother {
 		public Grandmother() {
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CriteriaAsExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CriteriaAsExpressionTest.java
index 8f4beb4663f2..adbc2db4bce9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CriteriaAsExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/CriteriaAsExpressionTest.java
@@ -8,6 +8,7 @@
 import java.math.BigInteger;
 import java.util.List;
 
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.orm.test.jpa.metamodel.Product;
@@ -76,6 +77,7 @@ public void tearDown(EntityManagerFactoryScope scope) {
 	@JiraKey("HHH-5755")
 	@SkipForDialect(dialectClass = SybaseDialect.class )
 	@SkipForDialect(dialectClass = SybaseASEDialect.class )
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner requires explicit casting for INT64 to STRING comparisons")
 	public void testAsToString(EntityManagerFactoryScope scope) {
 		SQLStatementInspector statementInspector = (SQLStatementInspector) scope.getStatementInspector();
 		statementInspector.clear();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java
index 40d19982466b..8fd8f9379da5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java
@@ -14,12 +14,12 @@
 import jakarta.persistence.criteria.Root;
 
 import org.hibernate.ScrollableResults;
-import org.hibernate.dialect.HANADialect;
 import org.hibernate.query.Query;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
-import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -54,7 +54,7 @@ public void tearDown(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA only supports forward-only cursors")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsBackwardsScrollableResultSets.class)
 	public void testWithScroll(EntityManagerFactoryScope scope) {
 		// Creates data necessary for test
 		Long facilityId = populate(scope);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeBindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeBindTest.java
index a00551b930ce..d97e6d1c115a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeBindTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeBindTest.java
@@ -20,8 +20,8 @@
 public class CriteriaLiteralHandlingModeBindTest extends AbstractCriteriaLiteralHandlingModeTest {
 
 	@Override
-	protected Map getConfig() {
-		Map config = super.getConfig();
+	protected Map<String, Object> getConfig() {
+		Map<String, Object> config = super.getConfig();
 		config.put(
 				AvailableSettings.CRITERIA_VALUE_HANDLING_MODE,
 				ValueHandlingMode.BIND
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameLowercaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameLowercaseTest.java
index 77df75377ebe..ed36a7579bbe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameLowercaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameLowercaseTest.java
@@ -18,8 +18,8 @@
 public class CriteriaLiteralHandlingModeInlineShortNameLowercaseTest extends AbstractCriteriaLiteralHandlingModeTest {
 
 	@Override
-	protected Map getConfig() {
-		Map config = super.getConfig();
+	protected Map<String, Object> getConfig() {
+		Map<String, Object> config = super.getConfig();
 		config.put(
 				AvailableSettings.CRITERIA_VALUE_HANDLING_MODE,
 				"inline"
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameUppercaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameUppercaseTest.java
index 95b778037cf0..fcb7aa7af842 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameUppercaseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineShortNameUppercaseTest.java
@@ -18,8 +18,8 @@
 public class CriteriaLiteralHandlingModeInlineShortNameUppercaseTest extends AbstractCriteriaLiteralHandlingModeTest {
 
 	@Override
-	protected Map getConfig() {
-		Map config = super.getConfig();
+	protected Map<String, Object> getConfig() {
+		Map<String, Object> config = super.getConfig();
 		config.put(
 				AvailableSettings.CRITERIA_VALUE_HANDLING_MODE,
 				"INLINE"
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineTest.java
index c7ed2c096060..8d057b6bd059 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/CriteriaLiteralHandlingModeInlineTest.java
@@ -19,8 +19,8 @@
 public class CriteriaLiteralHandlingModeInlineTest extends AbstractCriteriaLiteralHandlingModeTest {
 
 	@Override
-	protected Map getConfig() {
-		Map config = super.getConfig();
+	protected Map<String, Object> getConfig() {
+		Map<String, Object> config = super.getConfig();
 		config.put(
 				AvailableSettings.CRITERIA_VALUE_HANDLING_MODE,
 				ValueHandlingMode.INLINE
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/MySQLCriteriaLiteralHandlingModeInlineTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/MySQLCriteriaLiteralHandlingModeInlineTest.java
index 8fd90d9ec9b2..2f71327825ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/MySQLCriteriaLiteralHandlingModeInlineTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/MySQLCriteriaLiteralHandlingModeInlineTest.java
@@ -19,8 +19,8 @@
 public class MySQLCriteriaLiteralHandlingModeInlineTest extends AbstractCriteriaLiteralHandlingModeTest {
 
 	@Override
-	protected Map getConfig() {
-		Map config = super.getConfig();
+	protected Map<String, Object> getConfig() {
+		Map<String, Object> config = super.getConfig();
 		config.put(
 				AvailableSettings.CRITERIA_VALUE_HANDLING_MODE,
 				ValueHandlingMode.INLINE
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java
index bb0dd96bba6c..153a1e48e3cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java
@@ -267,7 +267,7 @@ public void testOnLoadCallInInterceptor() {
 	}
 
 
-	protected Map basicSettings() {
+	protected Map<String, Object> basicSettings() {
 		return SettingsGenerator.generateSettings(
 				AvailableSettings.HBM2DDL_AUTO, "create-drop",
 				AvailableSettings.DIALECT, DialectContext.getDialect().getClass().getName(),
@@ -275,7 +275,7 @@ protected Map basicSettings() {
 		);
 	}
 
-	private void buildEntityManagerFactory(Map settings) {
+	private void buildEntityManagerFactory(Map<String,Object> settings) {
 		entityManagerFactory = Bootstrap
 			.getEntityManagerFactoryBuilder( new PersistenceUnitDescriptorAdapter(), settings )
 			.build();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java
deleted file mode 100644
index da167ba4738c..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java
+++ /dev/null
@@ -1,1163 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.jpa.ejb3configuration;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
-import org.hibernate.MappingException;
-import org.hibernate.annotations.OnDeleteAction;
-import org.hibernate.bytecode.internal.BytecodeEnhancementMetadataNonPojoImpl;
-import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
-import org.hibernate.cache.spi.access.EntityDataAccess;
-import org.hibernate.cache.spi.access.NaturalIdDataAccess;
-import org.hibernate.cache.spi.entry.CacheEntry;
-import org.hibernate.cache.spi.entry.CacheEntryStructure;
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.engine.internal.MutableEntityEntryFactory;
-import org.hibernate.engine.spi.CascadeStyle;
-import org.hibernate.engine.spi.EntityEntryFactory;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.generator.Generator;
-import org.hibernate.generator.values.GeneratedValues;
-import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
-import org.hibernate.id.IdentifierGenerator;
-import org.hibernate.persister.filter.FilterAliasGenerator;
-import org.hibernate.internal.util.IndexedConsumer;
-import org.hibernate.jpa.boot.spi.Bootstrap;
-import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
-import org.hibernate.mapping.Collection;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.metamodel.mapping.AttributeMapping;
-import org.hibernate.metamodel.mapping.AttributeMappingsList;
-import org.hibernate.metamodel.mapping.AttributeMappingsMap;
-import org.hibernate.metamodel.mapping.DiscriminatorType;
-import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
-import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
-import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.metamodel.mapping.EntityRowIdMapping;
-import org.hibernate.metamodel.mapping.EntityVersionMapping;
-import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.ModelPart;
-import org.hibernate.metamodel.mapping.NaturalIdMapping;
-import org.hibernate.metamodel.mapping.SelectableMapping;
-import org.hibernate.metamodel.mapping.TableDetails;
-import org.hibernate.metamodel.model.domain.NavigableRole;
-import org.hibernate.metamodel.spi.EntityRepresentationStrategy;
-import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
-import org.hibernate.orm.test.jpa.SettingsGenerator;
-import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.entity.UniqueKeyEntry;
-import org.hibernate.persister.entity.mutation.DeleteCoordinator;
-import org.hibernate.persister.entity.mutation.EntityTableMapping;
-import org.hibernate.persister.entity.mutation.InsertCoordinator;
-import org.hibernate.persister.entity.mutation.UpdateCoordinator;
-import org.hibernate.persister.internal.PersisterClassResolverInitiator;
-import org.hibernate.persister.spi.PersisterClassResolver;
-import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
-import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
-import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.spi.SqlSelection;
-import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.model.ast.builder.MutationGroupBuilder;
-import org.hibernate.sql.results.graph.DomainResult;
-import org.hibernate.sql.results.graph.DomainResultCreationState;
-import org.hibernate.tuple.entity.EntityMetamodel;
-import org.hibernate.type.BasicType;
-import org.hibernate.type.Type;
-import org.hibernate.type.descriptor.java.JavaType;
-
-import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter;
-import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.PersistenceException;
-
-/**
- * @author Emmanuel Bernard
- */
-public class PersisterClassProviderTest {
-	@Test
-	public void testPersisterClassProvider() {
-		Map settings = SettingsGenerator.generateSettings(
-				PersisterClassResolverInitiator.IMPL_NAME, GoofyPersisterClassProvider.class,
-				AvailableSettings.LOADED_CLASSES, Arrays.asList( Bell.class )
-		);
-		ServiceRegistryUtil.applySettings( settings );
-		try {
-			EntityManagerFactory entityManagerFactory = Bootstrap.getEntityManagerFactoryBuilder(
-					new PersistenceUnitDescriptorAdapter(),
-					settings
-			).build();
-			entityManagerFactory.close();
-		}
-		catch ( PersistenceException e ) {
-			Assertions.assertNotNull( e.getCause() );
-			Assertions.assertNotNull( e.getCause().getCause() );
-			Assertions.assertEquals( GoofyException.class, e.getCause().getCause().getClass() );
-
-		}
-	}
-
-	public static class GoofyPersisterClassProvider implements PersisterClassResolver {
-		@Override
-		public Class<? extends EntityPersister> getEntityPersisterClass(PersistentClass metadata) {
-			return GoofyProvider.class;
-		}
-
-		@Override
-		public Class<? extends CollectionPersister> getCollectionPersisterClass(Collection metadata) {
-			return null;
-		}
-	}
-
-	public static class GoofyProvider implements EntityPersister {
-
-		@SuppressWarnings( {"UnusedParameters"})
-		public GoofyProvider(
-				PersistentClass persistentClass,
-				EntityDataAccess entityDataAccessstrategy,
-				NaturalIdDataAccess naturalIdRegionAccessStrategy,
-				RuntimeModelCreationContext creationContext) {
-			throw new GoofyException();
-		}
-
-		@Override
-		public BytecodeEnhancementMetadata getInstrumentationMetadata() {
-			return new BytecodeEnhancementMetadataNonPojoImpl( getEntityName() );
-		}
-
-		@Override
-		public void postInstantiate() throws MappingException {
-
-		}
-
-		@Override
-		public SessionFactoryImplementor getFactory() {
-			return null;
-		}
-
-		@Override
-		public NavigableRole getNavigableRole() {
-			return null;
-		}
-
-		@Override
-		public EntityEntryFactory getEntityEntryFactory() {
-			return MutableEntityEntryFactory.INSTANCE;
-		}
-
-		@Override
-		public String getRootEntityName() {
-			return null;
-		}
-
-		@Override
-		public String getEntityName() {
-			return null;
-		}
-
-		@Override
-		public @Nullable String getJpaEntityName() {
-			return null;
-		}
-
-		@Override
-		public TableDetails getMappedTableDetails() {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public TableDetails getIdentifierTableDetails() {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public void forEachTableDetails(Consumer<TableDetails> consumer) {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public ModelPart findSubPart(
-				String name, EntityMappingType targetType) {
-			return null;
-		}
-
-		@Override
-		public void visitSubParts(Consumer<ModelPart> consumer, EntityMappingType targetType) {
-
-		}
-
-		@Override
-		public <T> DomainResult<T> createDomainResult(
-				NavigablePath navigablePath,
-				TableGroup tableGroup,
-				String resultVariable,
-				DomainResultCreationState creationState) {
-			return null;
-		}
-
-		@Override
-		public void applySqlSelections(
-				NavigablePath navigablePath, TableGroup tableGroup, DomainResultCreationState creationState) {
-
-		}
-
-		@Override
-		public void applySqlSelections(
-				NavigablePath navigablePath,
-				TableGroup tableGroup,
-				DomainResultCreationState creationState,
-				BiConsumer<SqlSelection, JdbcMapping> selectionConsumer) {
-
-		}
-
-		@Override
-		public JdbcMapping getJdbcMapping(int index) {
-			throw new IndexOutOfBoundsException( index );
-		}
-
-		@Override
-		public int forEachJdbcType(
-				int offset, IndexedConsumer<JdbcMapping> action) {
-			return 0;
-		}
-
-		@Override
-		public Object disassemble(Object value, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public <X, Y> int forEachDisassembledJdbcValue(
-				Object value,
-				int offset,
-				X x,
-				Y y,
-				JdbcValuesBiConsumer<X, Y> valuesConsumer,
-				SharedSessionContractImplementor session) {
-			return 0;
-		}
-
-		@Override
-		public boolean isExplicitPolymorphism() {
-			return false;
-		}
-
-		@Override
-		public SqmMultiTableMutationStrategy getSqmMultiTableMutationStrategy() {
-			return null;
-		}
-
-		@Override
-		public SqmMultiTableInsertStrategy getSqmMultiTableInsertStrategy() {
-			return null;
-		}
-
-		@Override
-		public AttributeMapping findDeclaredAttributeMapping(String name) {
-			return null;
-		}
-
-		@Override
-		public AttributeMappingsMap getDeclaredAttributeMappings() {
-			return null;
-		}
-
-		@Override
-		public void visitDeclaredAttributeMappings(Consumer<? super AttributeMapping> action) {
-
-		}
-
-		@Override
-		public EntityMetamodel getEntityMetamodel() {
-			return null;
-		}
-
-		@Override
-		public boolean isSubclassEntityName(String entityName) {
-			return false;
-		}
-
-		@Override
-		public String[] getPropertySpaces() {
-			return new String[0];
-		}
-
-		@Override
-		public Serializable[] getQuerySpaces() {
-			return new Serializable[0];
-		}
-
-		@Override
-		public boolean hasProxy() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCollections() {
-			return false;
-		}
-
-		@Override
-		public boolean hasMutableProperties() {
-			return false;
-		}
-
-		@Override
-		public boolean hasSubselectLoadableCollections() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCollectionNotReferencingPK() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCascades() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCascadeDelete() {
-			return false;
-		}
-
-		@Override
-		public boolean hasToOnes() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCascadePersist() {
-			return false;
-		}
-
-		@Override
-		public boolean hasOwnedCollections() {
-			return false;
-		}
-
-		@Override
-		public boolean isMutable() {
-			return false;
-		}
-
-		@Override
-		public boolean isInherited() {
-			return false;
-		}
-
-		@Override
-		public boolean isIdentifierAssignedByInsert() {
-			return false;
-		}
-
-		@Override
-		public Type getPropertyType(String propertyName) throws MappingException {
-			return null;
-		}
-
-		@Override
-		public int[] findDirty(Object[] currentState, Object[] previousState, Object owner, SharedSessionContractImplementor session) {
-			return new int[0];
-		}
-
-		@Override
-		public int[] findModified(Object[] old, Object[] current, Object object, SharedSessionContractImplementor session) {
-			return new int[0];
-		}
-
-		@Override
-		public boolean hasIdentifierProperty() {
-			return false;
-		}
-
-		@Override
-		public boolean canExtractIdOutOfEntity() {
-			return false;
-		}
-
-		@Override
-		public boolean isVersioned() {
-			return false;
-		}
-
-		public Comparator getVersionComparator() {
-			return null;
-		}
-
-		@Override
-		public BasicType<?> getVersionType() {
-			return null;
-		}
-
-		@Override
-		public int getVersionPropertyIndex() {
-			return 0;
-		}
-
-		@Override
-		public boolean hasNaturalIdentifier() {
-			return false;
-		}
-
-		@Override
-		public int[] getNaturalIdentifierProperties() {
-			return new int[0];
-		}
-
-		@Override
-		public Object[] getNaturalIdentifierSnapshot(Object id, SharedSessionContractImplementor session) {
-			return new Object[0];
-		}
-
-		@Override
-		public Serializable loadEntityIdByNaturalId(Object[] naturalIdValues, LockOptions lockOptions,
-				SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public boolean hasNaturalIdCache() {
-			return false;
-		}
-
-		@Override
-		public NaturalIdDataAccess getNaturalIdCacheAccessStrategy() {
-			return null;
-		}
-
-		@Override
-		public IdentifierGenerator getIdentifierGenerator() {
-			return null;
-		}
-
-		@Override
-		public boolean hasLazyProperties() {
-			return false;
-		}
-
-		@Override
-		public Object load(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public Object load(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public List multiLoad(Object[] ids, SharedSessionContractImplementor session, MultiIdLoadOptions loadOptions) {
-			return Collections.emptyList();
-		}
-
-		@Override
-		public void lock(Object id, Object version, Object object, LockMode lockMode, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public void lock(Object id, Object version, Object object, LockOptions lockOptions, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public InsertCoordinator getInsertCoordinator() {
-			return null;
-		}
-
-		@Override
-		public UpdateCoordinator getUpdateCoordinator() {
-			return null;
-		}
-
-		@Override
-		public DeleteCoordinator getDeleteCoordinator() {
-			return null;
-		}
-
-		@Override
-		public Type[] getPropertyTypes() {
-			return new Type[0];
-		}
-
-		@Override
-		public String[] getPropertyNames() {
-			return new String[0];
-		}
-
-		@Override
-		public boolean[] getPropertyInsertability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean[] getPropertyUpdateability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean[] getPropertyCheckability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean[] getPropertyNullability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean[] getPropertyVersionability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean[] getPropertyLaziness() {
-			return new boolean[0];
-		}
-
-		@Override
-		public CascadeStyle[] getPropertyCascadeStyles() {
-			return new CascadeStyle[0];
-		}
-
-		@Override
-		public Type getIdentifierType() {
-			return null;
-		}
-
-		@Override
-		public String getIdentifierPropertyName() {
-			return null;
-		}
-
-		@Override
-		public boolean isCacheInvalidationRequired() {
-			return false;
-		}
-
-		@Override
-		public boolean isLazyPropertiesCacheable() {
-			return false;
-		}
-
-		@Override
-		public boolean canReadFromCache() {
-			return false;
-		}
-
-		@Override
-		public boolean canWriteToCache() {
-			return false;
-		}
-
-		@Override
-		public boolean hasCache() {
-			return false;
-		}
-
-		@Override
-		public EntityDataAccess getCacheAccessStrategy() {
-			return null;
-		}
-
-		@Override
-		public CacheEntryStructure getCacheEntryStructure() {
-			return null;
-		}
-
-		@Override
-		public boolean isSelectBeforeUpdateRequired() {
-			return false;
-		}
-
-		@Override
-		public Object[] getDatabaseSnapshot(Object id, SharedSessionContractImplementor session) throws HibernateException {
-			return new Object[0];
-		}
-
-		@Override
-		public Object getIdByUniqueKey(Object key, String uniquePropertyName, SharedSessionContractImplementor session) {
-			throw new UnsupportedOperationException( "Not supported" );
-		}
-
-		@Override
-		public Object getCurrentVersion(Object id, SharedSessionContractImplementor session) throws HibernateException {
-			return null;
-		}
-
-		@Override
-		public Object forceVersionIncrement(Object id, Object currentVersion, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public boolean isInstrumented() {
-			return false;
-		}
-
-		@Override
-		public boolean hasInsertGeneratedProperties() {
-			return false;
-		}
-
-		@Override
-		public boolean hasUpdateGeneratedProperties() {
-			return false;
-		}
-
-		@Override
-		public boolean isVersionPropertyGenerated() {
-			return false;
-		}
-
-		@Override
-		public void afterInitialize(Object entity, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public void afterReassociate(Object entity, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public Object createProxy(Object id, SharedSessionContractImplementor session) throws HibernateException {
-			return null;
-		}
-
-		@Override
-		public Boolean isTransient(Object object, SharedSessionContractImplementor session) throws HibernateException {
-			return null;
-		}
-
-		@Override
-		public Object[] getPropertyValuesToInsert(Object object, Map mergeMap, SharedSessionContractImplementor session) {
-			return new Object[0];
-		}
-
-		@Override
-		public void processInsertGeneratedProperties(Object id, Object entity, Object[] state, GeneratedValues generatedValues, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public void processUpdateGeneratedProperties(Object id, Object entity, Object[] state, GeneratedValues generatedValues, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public Class getMappedClass() {
-			return null;
-		}
-
-		@Override
-		public Class getConcreteProxyClass() {
-			return null;
-		}
-
-		@Override
-		public void setPropertyValues(Object object, Object[] values) {
-		}
-
-		@Override
-		public void setPropertyValue(Object object, int i, Object value) {
-		}
-
-		@Override
-		public Object[] getPropertyValues(Object object) {
-			return new Object[0];
-		}
-
-		@Override
-		public Object getPropertyValue(Object object, int i) {
-			return null;
-		}
-
-		@Override
-		public Object getPropertyValue(Object object, String propertyName) {
-			return null;
-		}
-
-		@Override
-		public Serializable getIdentifier(Object entity, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public void setIdentifier(Object entity, Object id, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public Object getVersion(Object object) {
-			return null;
-		}
-
-		@Override
-		public Object instantiate(Object id, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public boolean isInstance(Object object) {
-			return false;
-		}
-
-		@Override
-		public boolean hasUninitializedLazyProperties(Object object) {
-			return false;
-		}
-
-		@Override
-		public void resetIdentifier(Object entity, Object currentId, Object currentVersion, SharedSessionContractImplementor session) {
-		}
-
-		@Override
-		public EntityPersister getSubclassEntityPersister(Object instance, SessionFactoryImplementor factory) {
-			return null;
-		}
-
-		@Override
-		public EntityRepresentationStrategy getRepresentationStrategy() {
-			return null;
-		}
-
-		@Override
-		public FilterAliasGenerator getFilterAliasGenerator(String rootAlias) {
-			return null;
-		}
-
-		@Override
-		public int[] resolveAttributeIndexes(String[] attributeNames) {
-			return new int[0];
-		}
-
-		@Override
-		public boolean canUseReferenceCacheEntries() {
-			return false;  //To change body of implemented methods use File | Settings | File Templates.
-		}
-
-		@Override
-		public boolean useShallowQueryCacheLayout() {
-			return false;
-		}
-
-		@Override
-		public boolean storeDiscriminatorInShallowQueryCacheLayout() {
-			return false;
-		}
-
-		@Override
-		public boolean hasFilterForLoadByKey() {
-			return false;
-		}
-
-		@Override
-		public Iterable<UniqueKeyEntry> uniqueKeyEntries() {
-			return Collections.emptyList();
-		}
-
-		@Override
-		public String getSelectByUniqueKeyString(String propertyName) {
-			return null;
-		}
-
-		@Override
-		public String getSelectByUniqueKeyString(String[] propertyNames, String[] columnNames) {
-			return null;
-		}
-
-		@Override
-		public String[] getRootTableKeyColumnNames() {
-			return new String[0];
-		}
-
-		@Override
-		public String getIdentitySelectString() {
-			return null;
-		}
-
-		@Override
-		public String[] getIdentifierColumnNames() {
-			return new String[0];
-		}
-
-		@Override
-		public CacheEntry buildCacheEntry(Object entity, Object[] state, Object version, SharedSessionContractImplementor session) {
-			return null;
-		}
-
-		@Override
-		public EntityPersister getEntityPersister() {
-			return this;
-		}
-
-		@Override
-		public boolean isAffectedByEnabledFilters(LoadQueryInfluencers influencers, boolean onlyApplyForLoadByKeyFilters) {
-			return false;
-		}
-
-		@Override
-		public boolean isAffectedByEntityGraph(LoadQueryInfluencers influencers) {
-			return false;
-		}
-
-		@Override
-		public boolean isAffectedByEnabledFetchProfiles(LoadQueryInfluencers influencers) {
-			return false;
-		}
-
-		@Override
-		public EntityIdentifierMapping getIdentifierMapping() {
-			return null;
-		}
-
-		@Override
-		public EntityVersionMapping getVersionMapping() {
-			return null;
-		}
-
-		@Override
-		public EntityRowIdMapping getRowIdMapping() {
-			return null;
-		}
-
-		@Override
-		public void visitConstraintOrderedTables(ConstraintOrderedTableConsumer consumer) {
-
-		}
-
-		@Override
-		public EntityDiscriminatorMapping getDiscriminatorMapping() {
-			return null;
-		}
-
-		@Override
-		public Object getDiscriminatorValue() {
-			return null;
-		}
-
-		@Override
-		public NaturalIdMapping getNaturalIdMapping() {
-			return null;
-		}
-
-		@Override
-		public boolean isTypeOrSuperType(EntityMappingType targetType) {
-			return targetType == this;
-		}
-
-		@Override
-		public AttributeMappingsList getAttributeMappings() {
-			return null;
-		}
-
-		@Override
-		public void forEachAttributeMapping(Consumer<? super AttributeMapping> action) {
-
-		}
-
-		@Override
-		public JavaType getMappedJavaType() {
-			return null;
-		}
-
-		@Override
-		public EntityMappingType getTargetPart() {
-			return null;
-		}
-
-		@Override
-		public void forEachMutableTable(Consumer<EntityTableMapping> consumer) {
-
-		}
-
-		@Override
-		public void forEachMutableTableReverse(Consumer<EntityTableMapping> consumer) {
-
-		}
-
-		@Override
-		public String getIdentifierTableName() {
-			return null;
-		}
-
-		@Override
-		public EntityTableMapping getIdentifierTableMapping() {
-			return null;
-		}
-
-		@Override
-		public ModelPart getIdentifierDescriptor() {
-			return null;
-		}
-
-		@Override
-		public GeneratedValuesMutationDelegate getInsertDelegate() {
-			return null;
-		}
-
-		@Override
-		public GeneratedValuesMutationDelegate getUpdateDelegate() {
-			return null;
-		}
-
-		@Override
-		public String getTableName() {
-			return "";
-		}
-
-		@Override
-		public String[] getIdentifierAliases(String suffix) {
-			return new String[0];
-		}
-
-		@Override
-		public String getRootTableName() {
-			return "";
-		}
-
-		@Override
-		public String[] getRootTableIdentifierColumnNames() {
-			return new String[0];
-		}
-
-		@Override
-		public String getVersionColumnName() {
-			return "";
-		}
-
-		@Override
-		public String[] getPropertyAliases(String suffix, int i) {
-			return new String[0];
-		}
-
-		@Override
-		public String getDiscriminatorAlias(String suffix) {
-			return "";
-		}
-
-		@Override
-		public String getDiscriminatorColumnName() {
-			return "";
-		}
-
-		@Override
-		public Type getDiscriminatorType() {
-			return null;
-		}
-
-		@Override
-		public boolean hasRowId() {
-			return false;
-		}
-
-		@Override
-		public String[] getSubclassPropertyColumnAliases(String propertyName, String suffix) {
-			return new String[0];
-		}
-
-		@Override
-		public String[] getPropertyColumnNames(String propertyPath) {
-			return new String[0];
-		}
-
-		@Override
-		public String selectFragment(String alias, String suffix) {
-			return "";
-		}
-
-		@Override
-		public DiscriminatorType<?> getDiscriminatorDomainType() {
-			return null;
-		}
-
-		@Override
-		public String[] toColumns(String propertyName) {
-			return new String[0];
-		}
-
-		@Override
-		public boolean[] getNonLazyPropertyUpdateability() {
-			return new boolean[0];
-		}
-
-		@Override
-		public boolean hasMultipleTables() {
-			return false;
-		}
-
-		@Override
-		public String[] getTableNames() {
-			return new String[0];
-		}
-
-		@Override
-		public String getTableName(int j) {
-			return "";
-		}
-
-		@Override
-		public String[] getKeyColumns(int j) {
-			return new String[0];
-		}
-
-		@Override
-		public int getTableSpan() {
-			return 0;
-		}
-
-		@Override
-		public boolean isInverseTable(int j) {
-			return false;
-		}
-
-		@Override
-		public boolean isNullableTable(int j) {
-			return false;
-		}
-
-		@Override
-		public boolean hasDuplicateTables() {
-			return false;
-		}
-
-		@Override
-		public int getSubclassTableSpan() {
-			return 0;
-		}
-
-		@Override
-		public String getSubclassTableName(int j) {
-			return "";
-		}
-
-		@Override
-		public String getTableNameForColumn(String columnName) {
-			return "";
-		}
-
-		@Override
-		public String[] getSubclassPropertyColumnNames(int i) {
-			return new String[0];
-		}
-
-		@Override
-		public int countSubclassProperties() {
-			return 0;
-		}
-
-		@Override
-		public boolean isSharedColumn(String columnExpression) {
-			return false;
-		}
-
-		@Override
-		public String[][] getConstraintOrderedTableKeyColumnClosure() {
-			return new String[0][];
-		}
-
-		@Override
-		public EntityTableMapping[] getTableMappings() {
-			return new EntityTableMapping[0];
-		}
-
-		@Override
-		public String physicalTableNameForMutation(SelectableMapping selectableMapping) {
-			return "";
-		}
-
-		@Override
-		public void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
-
-		}
-
-		@Override
-		public void addSoftDeleteToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
-
-		}
-
-		@Override
-		public String getAttributeMutationTableName(int i) {
-			return "";
-		}
-
-		@Override
-		public boolean managesColumns(String[] columnNames) {
-			return false;
-		}
-
-		@Override
-		public boolean isPolymorphic() {
-			return false;
-		}
-
-		@Override
-		public boolean isDynamicUpdate() {
-			return false;
-		}
-
-		@Override
-		public boolean isDynamicInsert() {
-			return false;
-		}
-
-		@Override
-		public OnDeleteAction[] getPropertyOnDeleteActions() {
-			return new OnDeleteAction[0];
-		}
-
-		@Override
-		public Generator[] getGenerators() {
-			return new Generator[0];
-		}
-
-		@Override
-		public boolean hasImmutableNaturalId() {
-			return false;
-		}
-
-		@Override
-		public boolean isNaturalIdentifierInsertGenerated() {
-			return false;
-		}
-
-		@Override
-		public boolean isLazy() {
-			return false;
-		}
-
-		@Override
-		public int getPropertySpan() {
-			return 0;
-		}
-
-		@Override
-		public boolean hasPreInsertGeneratedProperties() {
-			return false;
-		}
-
-		@Override
-		public boolean hasPreUpdateGeneratedProperties() {
-			return false;
-		}
-	}
-
-	public static class GoofyException extends RuntimeException {
-
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeNullCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeNullCollectionTest.java
index c5586efc96df..d9227e41baa5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeNullCollectionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/emops/MergeNullCollectionTest.java
@@ -36,7 +36,7 @@ class MergeNullCollectionTest {
 			assertEquals(0, em.find( Thing.class, thing.id ).strings.size());
 		});
 	}
-	@Entity
+	@Entity(name = "Thing")
 	static class Thing {
 		@Id
 		long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/FindOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/FindOptionsTest.java
index 099e58f0a47c..e890e646dd09 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/FindOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/FindOptionsTest.java
@@ -20,10 +20,10 @@
 import org.hibernate.Session;
 import org.hibernate.annotations.FetchProfile;
 import org.hibernate.annotations.FetchProfileOverride;
-import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
-import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -35,10 +35,9 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 @Jpa(annotatedClasses = FindOptionsTest.MyEntity.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsLockTimeouts.class )
 public class FindOptionsTest {
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "Informix disallows FOR UPDATE with multi-table queries")
 	void test(EntityManagerFactoryScope scope) {
 		MyEntity hello = new MyEntity("Hello");
 		scope.getEntityManagerFactory()
@@ -116,7 +115,7 @@ void test(EntityManagerFactoryScope scope) {
 				});
 	}
 
-	@Entity
+	@Entity(name = "MyEntity")
 	@FetchProfile(name = "hello world")
 	public static class MyEntity {
 		@Id @GeneratedValue long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/LockOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/LockOptionsTest.java
index 5d2c3890d903..bf7135b37f2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/LockOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/LockOptionsTest.java
@@ -14,8 +14,10 @@
 import org.hibernate.HibernateException;
 import org.hibernate.annotations.FetchProfile;
 import org.hibernate.annotations.FetchProfileOverride;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -26,6 +28,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 @Jpa(annotatedClasses = LockOptionsTest.MyEntity.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsLockTimeouts.class )
 public class LockOptionsTest {
 	@Test
 	void test(EntityManagerFactoryScope scope) {
@@ -72,7 +75,7 @@ void test(EntityManagerFactoryScope scope) {
 				});
 	}
 
-	@Entity
+	@Entity(name = "MyEntity")
 	@FetchProfile(name = "hello world")
 	public static class MyEntity {
 		@Id @GeneratedValue long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/RefreshOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/RefreshOptionsTest.java
index 6966ef3c3c9f..58482d0e3147 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/RefreshOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/findoptions/RefreshOptionsTest.java
@@ -16,8 +16,10 @@
 import org.hibernate.LockMode;
 import org.hibernate.annotations.FetchProfile;
 import org.hibernate.annotations.FetchProfileOverride;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -30,6 +32,7 @@
 @Jpa(annotatedClasses = RefreshOptionsTest.MyEntity.class)
 public class RefreshOptionsTest {
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsLockTimeouts.class)
 	void test(EntityManagerFactoryScope scope) {
 		MyEntity hello = new MyEntity("Hello");
 		scope.getEntityManagerFactory()
@@ -75,7 +78,7 @@ void test(EntityManagerFactoryScope scope) {
 				});
 	}
 
-	@Entity
+	@Entity(name = "RefOptMyEntity")
 	@FetchProfile(name = "hello world")
 	public static class MyEntity {
 		@Id @GeneratedValue long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/AttributeNodeRemovalTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/AttributeNodeRemovalTests.java
new file mode 100644
index 000000000000..42c3ae538391
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/AttributeNodeRemovalTests.java
@@ -0,0 +1,352 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.jpa.graphs;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.hibernate.Hibernate;
+import org.hibernate.graph.GraphSemantic;
+import org.hibernate.graph.spi.RootGraphImplementor;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Steve Ebersole
+ */
+@DomainModel(annotatedClasses = {
+		AttributeNodeRemovalTests.Post.class,
+		AttributeNodeRemovalTests.Person.class,
+		AttributeNodeRemovalTests.Forum.class
+})
+@SessionFactory
+@Jira("https://hibernate.atlassian.net/browse/HHH-19567")
+public class AttributeNodeRemovalTests {
+	@BeforeEach
+	void setUp(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			final Person me = new Person( 1, "me" );
+			final Person you = new Person( 2, "you" );
+			final Person he = new Person( 3, "he" );
+			session.persist( me );
+			session.persist( you );
+			session.persist( he );
+
+			final Forum fiction = new Forum( 1, "Fiction" );
+			final Forum nonFiction = new Forum( 2, "Non-Fiction" );
+			session.persist( fiction );
+			session.persist( nonFiction );
+
+			session.persist( new Post( 1, "A Tale of Fairy", "Once upon a time...", fiction, you ) );
+			session.persist( new Post( 2, "The Meaning of Life", "You only get one shot...", nonFiction, he ) );
+			session.persist( new Post( 3, "Tales From Seaside", "The sun will come out...", fiction, me ) );
+		} );
+	}
+
+	@AfterEach
+	void tearDown(SessionFactoryScope factoryScope) {
+		factoryScope.dropData();
+	}
+
+	@Test
+	void testGraphBaseline(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var entityGraph = session.createEntityGraph( Post.class );
+			var post = session.find( entityGraph, 1 );
+
+			assertThat( Hibernate.isPropertyInitialized( post, "author" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getAuthor() ) ).isTrue();
+
+			assertThat( Hibernate.isPropertyInitialized( post, "forum" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getForum() ) ).isFalse();
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			var entityGraph = session.createEntityGraph( Post.class );
+			var post = session.find( entityGraph, 1, GraphSemantic.FETCH );
+
+			assertThat( Hibernate.isPropertyInitialized( post, "author" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getAuthor() ) ).isFalse();
+
+			assertThat( Hibernate.isPropertyInitialized( post, "forum" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getForum() ) ).isFalse();
+		} );
+	}
+
+	@Test
+	void testAddLazyAttribute(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var entityGraph = session.createEntityGraph( Post.class );
+			entityGraph.addAttributeNodes( "forum" );
+			var post = session.find( entityGraph, 1 );
+
+			assertThat( Hibernate.isPropertyInitialized( post, "author" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getAuthor() ) ).isTrue();
+
+			assertThat( Hibernate.isPropertyInitialized( post, "forum" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getForum() ) ).isTrue();
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			var entityGraph = session.createEntityGraph( Post.class );
+			entityGraph.addAttributeNodes( "forum" );
+			var post = session.find( entityGraph, 1, GraphSemantic.FETCH );
+
+			assertThat( Hibernate.isPropertyInitialized( post, "author" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getAuthor() ) ).isFalse();
+
+			assertThat( Hibernate.isPropertyInitialized( post, "forum" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getForum() ) ).isTrue();
+		} );
+	}
+
+	@Test
+	void testRemoveLazyAttribute(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var entityGraph = session.createEntityGraph( Post.class );
+			entityGraph.removeAttributeNode( "forum" );
+			var post = session.find( entityGraph, 1 );
+
+			assertThat( Hibernate.isPropertyInitialized( post, "author" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getAuthor() ) ).isTrue();
+
+			assertThat( Hibernate.isPropertyInitialized( post, "forum" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getForum() ) ).isFalse();
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			var entityGraph = session.createEntityGraph( Post.class );
+			entityGraph.removeAttributeNode( "forum" );
+			var post = session.find( entityGraph, 1, GraphSemantic.FETCH );
+
+			assertThat( Hibernate.isPropertyInitialized( post, "author" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getAuthor() ) ).isFalse();
+
+			assertThat( Hibernate.isPropertyInitialized( post, "forum" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getForum() ) ).isFalse();
+		} );
+	}
+
+	@Test
+	void testAddEagerAttribute(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var entityGraph = session.createEntityGraph( Post.class );
+			entityGraph.addAttributeNode( "author" );
+			var post = session.find( entityGraph, 1 );
+
+			assertThat( Hibernate.isPropertyInitialized( post, "author" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getAuthor() ) ).isTrue();
+
+			assertThat( Hibernate.isPropertyInitialized( post, "forum" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getForum() ) ).isFalse();
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			var entityGraph = session.createEntityGraph( Post.class );
+			entityGraph.addAttributeNode( "author" );
+			var post = session.find( entityGraph, 1, GraphSemantic.FETCH );
+
+			assertThat( Hibernate.isPropertyInitialized( post, "author" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getAuthor() ) ).isTrue();
+
+			assertThat( Hibernate.isPropertyInitialized( post, "forum" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getForum() ) ).isFalse();
+		} );
+	}
+
+	@Test
+	void testRemoveEagerAttribute(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var entityGraph = session.createEntityGraph( Post.class );
+			entityGraph.removeAttributeNode( "author" );
+			var post = session.find( entityGraph, 1 );
+
+			assertThat( Hibernate.isPropertyInitialized( post, "author" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getAuthor() ) ).isFalse();
+
+			assertThat( Hibernate.isPropertyInitialized( post, "forum" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getForum() ) ).isFalse();
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			var entityGraph = session.createEntityGraph( Post.class );
+			entityGraph.removeAttributeNode( "author" );
+			var post = session.find( entityGraph, 1, GraphSemantic.FETCH );
+
+			// here we should fall back to mapped fetch strategy
+			assertThat( Hibernate.isPropertyInitialized( post, "author" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getAuthor() ) ).isTrue();
+
+			assertThat( Hibernate.isPropertyInitialized( post, "forum" ) ).isTrue();
+			assertThat( Hibernate.isInitialized( post.getForum() ) ).isFalse();
+		} );
+	}
+
+	@Test
+	void testGraphApi(SessionFactoryScope factoryScope) {
+		final RootGraphImplementor<Post> entityGraph = factoryScope.getSessionFactory().createEntityGraph( Post.class );
+
+		// assertions based on the empty
+		assertThat( entityGraph.getAttributeNodes() ).isEmpty();
+		assertThat( entityGraph.getAttributeNodeList() ).isEmpty();
+		assertThat( entityGraph.getNodes() ).isEmpty();
+		assertThat( entityGraph.getAttributeNode( "author" ) ).isNull();
+		assertThat( entityGraph.getAttributeNode( "forum" ) ).isNull();
+		assertThat( entityGraph.findNode( "author" ) ).isNull();
+		assertThat( entityGraph.findNode( "forum" ) ).isNull();
+
+		// assertions based on the added "author" node
+		entityGraph.addAttributeNode( "author" );
+		assertThat( entityGraph.getAttributeNodes() ).isNotEmpty();
+		assertThat( entityGraph.getAttributeNodeList() ).isNotEmpty();
+		assertThat( entityGraph.getNodes() ).isNotEmpty();
+		assertThat( entityGraph.getAttributeNode( "author" ) ).isNotNull();
+		assertThat( entityGraph.getAttributeNode( "forum" ) ).isNull();
+		assertThat( entityGraph.findNode( "author" ) ).isNotNull();
+		assertThat( entityGraph.findNode( "author" ).isRemoved() ).isFalse();
+		assertThat( entityGraph.findNode( "forum" ) ).isNull();
+
+		// assertions based on the removed "author" node
+		entityGraph.removeAttributeNode( "author" );
+		assertThat( entityGraph.getAttributeNodes() ).isEmpty();
+		assertThat( entityGraph.getAttributeNodeList() ).isEmpty();
+		assertThat( entityGraph.getNodes() ).isEmpty();
+		assertThat( entityGraph.getAttributeNode( "author" ) ).isNull();
+		assertThat( entityGraph.getAttributeNode( "forum" ) ).isNull();
+		assertThat( entityGraph.findNode( "author" ) ).isNotNull();
+		assertThat( entityGraph.findNode( "author" ).isRemoved() ).isTrue();
+		assertThat( entityGraph.findNode( "forum" ) ).isNull();
+	}
+
+	@Entity(name="Person")
+	@Table(name="persons")
+	public static class Person {
+		@Id
+		private Integer id;
+		private String name;
+
+		protected Person() {
+		}
+
+		public Person(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	@Entity(name="Forum")
+	@Table(name="forums")
+	public static class Forum {
+		@Id
+		private Integer id;
+		private String name;
+
+		protected Forum() {
+		}
+
+		public Forum(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	@Entity(name="Post")
+	@Table(name="posts")
+	public static class Post {
+		@Id
+		private Integer id;
+		private String title;
+		@Lob
+		private String body;
+		@ManyToOne(fetch = FetchType.LAZY)
+		@JoinColumn(name="forum_fk")
+		private Forum forum;
+		@ManyToOne(fetch = FetchType.EAGER)
+		@JoinColumn(name="author_fk")
+		private Person author;
+
+		protected Post() {
+		}
+
+		public Post(Integer id, String title, String body, Forum forum, Person author) {
+			this.id = id;
+			this.title = title;
+			this.body = body;
+			this.forum = forum;
+			this.author = author;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public String getTitle() {
+			return title;
+		}
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
+
+		public String getBody() {
+			return body;
+		}
+
+		public void setBody(String body) {
+			this.body = body;
+		}
+
+		public Forum getForum() {
+			return forum;
+		}
+
+		public void setForum(Forum forum) {
+			this.forum = forum;
+		}
+
+		public Person getAuthor() {
+			return author;
+		}
+
+		public void setAuthor(Person author) {
+			this.author = author;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java
index 4ad0c65e2c22..9187e17d44a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/AssignedInitialValueTableGeneratorConfiguredTest.java
@@ -13,6 +13,8 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.TableGenerator;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.Session;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
@@ -58,6 +60,7 @@ public void testTheFirstGeneratedIdIsEqualToTableGeneratorInitialValuePlusOne(En
 	}
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledOptimizer.class )
 	public void testTheGeneratedIdValuesAreCorrect(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
@@ -76,7 +79,7 @@ public void testTheGeneratedIdValuesAreCorrect(EntityManagerFactoryScope scope)
 							connection -> {
 								try (Statement statement = connection.createStatement()) {
 									ResultSet resultSet = statement.executeQuery(
-											"select product_id from table_identifier" );
+											"select product_id from table_identifier order by product_id" );
 									resultSet.next();
 									int productIdValue = resultSet.getInt( 1 );
 									assertThat( productIdValue, is( 12 ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java
index 182af7a57443..69c9a590d7d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/identifier/DefaultInitialValueTableGeneratorConfiguredTest.java
@@ -13,6 +13,8 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.TableGenerator;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.Session;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
@@ -58,6 +60,7 @@ public void testTheFirstGeneratedIdIsEqualToTableGeneratorInitialValuePlusOne(En
 	}
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledOptimizer.class )
 	public void testTheGeneratedIdValuesAreCorrect(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingTests.java
index 02a882b31e75..17fa16116d0d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingTests.java
@@ -13,6 +13,7 @@
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
 import org.hibernate.tool.schema.Action;
@@ -171,7 +172,7 @@ public List<String> getManagedClassNames() {
 
 		final EntityManagerFactoryBuilder emfBuilder = Bootstrap.getEntityManagerFactoryBuilder(
 				puDescriptor,
-				settings,
+				PropertiesHelper.map( settings ),
 				(mergedSettings) -> mergedSettings.getConfigurationValues().clear()
 		);
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java
index dc1516b09f87..3d940d2a70e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java
@@ -81,6 +81,7 @@ protected void tearDown() {
 	 */
 	@Test
 	@SkipForDialect(dialectClass = CockroachDialect.class, reason = "Cockroach uses SERIALIZABLE by default and fails to acquire a write lock after a TX in between committed changes to a row")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 	public void testLockModeTypeRead() {
 		if ( !readCommittedIsolationMaintained( "ejb3 lock tests" ) ) {
 			return;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java
index 85ccd2f50e29..cd7a5591c3a6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockExceptionTests.java
@@ -10,9 +10,9 @@
 import org.hibernate.Timeouts;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.exception.LockAcquisitionException;
 import org.hibernate.orm.test.jpa.model.AbstractJPATest;
@@ -22,6 +22,7 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
 import org.hibernate.testing.transaction.TransactionUtil2;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
@@ -53,7 +54,8 @@ protected void tearDown() {
 
 	@Test
 	@JiraKey( value = "HHH-8786" )
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "no failure")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 	public void testLockTimeoutFind() {
 		final Item item = new Item( "find" );
 
@@ -95,7 +97,8 @@ public void testLockTimeoutFind() {
 
 	@Test
 	@SkipForDialect(dialectClass = CockroachDialect.class, reason = "Cockroach uses SERIALIZABLE by default and seems to fail reading a row that is exclusively locked by a different TX")
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Cursor must be on simple SELECT for FOR UPDATE")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 	public void testLockTimeoutRefresh() {
 		final Item item = new Item( "refresh" );
 
@@ -138,7 +141,8 @@ public void testLockTimeoutRefresh() {
 
 	@Test
 	@SkipForDialect(dialectClass = CockroachDialect.class, reason = "Cockroach uses SERIALIZABLE by default and seems to fail reading a row that is exclusively locked by a different TX")
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "no failure")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 	public void testLockTimeoutLock() {
 		final Item item = new Item( "lock" );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java
index 84444c876bed..f9e0e63d0977 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java
@@ -35,12 +35,15 @@
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SQLServerDialect;
 
+import org.hibernate.dialect.SybaseASEDialect;
+import org.hibernate.dialect.lock.PessimisticEntityLockException;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
 import org.hibernate.testing.transaction.TransactionUtil;
 import org.hibernate.testing.util.ExceptionUtil;
 import org.junit.jupiter.api.AfterEach;
@@ -90,6 +93,7 @@ public void afterEach() {
 
 	@Test
 	@SkipForDialect( dialectClass = CockroachDialect.class )
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNoWait.class )
 	public void testFindWithTimeoutHint() {
 		final Lock lock = new Lock();
 		lock.setName( "name" );
@@ -113,10 +117,12 @@ public void testFindWithTimeoutHint() {
 
 	@Test
 	@JiraKey( value = "HHH-7252" )
-	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsLockTimeouts.class,
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNoWait.class,
 							comment = "Test verifies proper exception throwing when a lock timeout is specified.",
 							jiraKey = "HHH-7252" )
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase close socket after lock timeout occurred")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 	public void testFindWithPessimisticWriteLockTimeoutException() {
 		assertTimeout( Duration.ofSeconds(5), () -> {
 			Lock lock = new Lock();
@@ -146,7 +152,12 @@ public void testFindWithPessimisticWriteLockTimeoutException() {
 							lte.getCause();
 						}
 						catch (PessimisticLockException pe) {
-							fail( "Find with immediate timeout should have thrown LockTimeoutException." );
+							// Per spec, the Hibernate LockTimeoutException is wrapped into a PessimisticLockException
+							// if the transaction was marked for rollback
+							if ( !entityManager.getTransaction().getRollbackOnly()
+								|| !(pe.getCause() instanceof org.hibernate.exception.LockTimeoutException) ) {
+								fail( "Find with immediate timeout should have thrown LockTimeoutException." );
+							}
 						}
 						catch (PersistenceException pe) {
 							log.info(
@@ -165,10 +176,12 @@ public void testFindWithPessimisticWriteLockTimeoutException() {
 
 	@Test
 	@JiraKey( value = "HHH-13364" )
-	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsLockTimeouts.class,
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNoWait.class,
 			comment = "Test verifies proper exception throwing when a lock timeout is specified for Query#getSingleResult.",
 			jiraKey = "HHH-13364" )
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase close socket after lock timeout occurred")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 	public void testQuerySingleResultPessimisticWriteLockTimeoutException() {
 		assertTimeout( Duration.ofSeconds(5), () -> {
 			Lock lock = new Lock();
@@ -198,7 +211,12 @@ public void testQuerySingleResultPessimisticWriteLockTimeoutException() {
 							lte.getCause();
 						}
 						catch (PessimisticLockException pe) {
-							fail( "Find with immediate timeout should have thrown LockTimeoutException." );
+							// Per spec, the Hibernate LockTimeoutException is wrapped into a PessimisticLockException
+							// if the transaction was marked for rollback
+							if ( !entityManager.getTransaction().getRollbackOnly()
+								|| !(pe.getCause() instanceof org.hibernate.exception.LockTimeoutException) ) {
+								fail( "Find with immediate timeout should have thrown LockTimeoutException." );
+							}
 						}
 						catch (PersistenceException pe) {
 							log.info(
@@ -216,10 +234,12 @@ public void testQuerySingleResultPessimisticWriteLockTimeoutException() {
 
 	@Test
 	@JiraKey( value = "HHH-13364" )
-	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsLockTimeouts.class,
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNoWait.class,
 			comment = "Test verifies proper exception throwing when a lock timeout is specified for Query#getResultList.",
 			jiraKey = "HHH-13364" )
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase close socket after lock timeout occurred")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 	public void testQueryResultListPessimisticWriteLockTimeoutException() {
 		assertTimeout( Duration.ofSeconds(5), () -> {
 			Lock lock = new Lock();
@@ -249,7 +269,12 @@ public void testQueryResultListPessimisticWriteLockTimeoutException() {
 							lte.getCause();
 						}
 						catch (PessimisticLockException pe) {
-							fail( "Find with immediate timeout should have thrown LockTimeoutException." );
+							// Per spec, the Hibernate LockTimeoutException is wrapped into a PessimisticLockException
+							// if the transaction was marked for rollback
+							if ( !entityManager.getTransaction().getRollbackOnly()
+								|| !(pe.getCause() instanceof org.hibernate.exception.LockTimeoutException) ) {
+								fail( "Find with immediate timeout should have thrown LockTimeoutException." );
+							}
 						}
 						catch (PersistenceException pe) {
 							log.info(
@@ -272,6 +297,8 @@ public void testQueryResultListPessimisticWriteLockTimeoutException() {
 			comment = "Test verifies proper exception throwing when a lock timeout is specified for NamedQuery#getResultList.",
 			jiraKey = "HHH-13364" )
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase close socket after lock timeout occurred")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 	public void testNamedQueryResultListPessimisticWriteLockTimeoutException() {
 		assertTimeout( Duration.ofSeconds(5), () -> {
 			Lock lock = new Lock();
@@ -298,7 +325,12 @@ public void testNamedQueryResultListPessimisticWriteLockTimeoutException() {
 							lte.getCause();
 						}
 						catch (PessimisticLockException pe) {
-							fail( "Find with immediate timeout should have thrown LockTimeoutException." );
+							// Per spec, the Hibernate LockTimeoutException is wrapped into a PessimisticLockException
+							// if the transaction was marked for rollback
+							if ( !entityManager.getTransaction().getRollbackOnly()
+								|| !(pe.getCause() instanceof org.hibernate.exception.LockTimeoutException) ) {
+								fail( "Find with immediate timeout should have thrown LockTimeoutException." );
+							}
 						}
 						catch (PersistenceException pe) {
 							log.info(
@@ -405,10 +437,9 @@ public void testUpdateWithPessimisticReadLockWithoutNoWait() {
 	}
 
 	protected String updateStatement() {
-		if( SQLServerDialect.class.isAssignableFrom( getDialect().getClass() ) ) {
-			return "UPDATE Lock_ WITH(NOWAIT) SET name = :name where id = :id";
-		}
-		return "UPDATE Lock_ SET name = :name where id = :id";
+		return SQLServerDialect.class.isAssignableFrom( getDialect().getClass() )
+				? "UPDATE Lock_ WITH(NOWAIT) SET name = :name where id = :id"
+				: "UPDATE Lock_ SET name = :name where id = :id";
 	}
 
 	@Test
@@ -896,6 +927,17 @@ public void testContendedPessimisticWriteLockNoWait() throws Exception {
 								log.info( "testContendedPessimisticWriteLockNoWait: (BG) got expected timeout exception" );
 								timedOut.set( true );
 							}
+							catch (PessimisticLockException pe) {
+								// Per spec, the Hibernate LockTimeoutException is wrapped into a PessimisticLockException
+								// if the transaction was marked for rollback
+								if ( _entityManager.getTransaction().getRollbackOnly()
+									&& pe.getCause() instanceof PessimisticEntityLockException cause
+									&& cause.getCause() instanceof org.hibernate.exception.LockTimeoutException) {
+									// success
+									log.info( "testContendedPessimisticWriteLockNoWait: (BG) got expected timeout exception" );
+									timedOut.set( true );
+								}
+							}
 							catch ( Throwable e ) {
 								log.info( "Expected LockTimeoutException but got unexpected exception", e );
 							}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java
index a343627e6612..9c0dacf13628 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java
@@ -5,6 +5,7 @@
 package org.hibernate.orm.test.jpa.lock;
 
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 
@@ -26,6 +27,7 @@
  */
 @RequiresDialect(PostgreSQLDialect.class)
 @SkipForDialect(dialectClass = CockroachDialect.class, reason = "https://github.com/cockroachdb/cockroach/issues/41335")
+@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support pg_sleep function")
 @JiraKey( value = "HHH-13493")
 @Jpa(
 		integrationSettings = {@Setting(name = HINT_SPEC_QUERY_TIMEOUT, value = "500")}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/OptimisticLockTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/OptimisticLockTests.java
index 67dd0f2911cc..0a748c654c8e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/OptimisticLockTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/OptimisticLockTests.java
@@ -6,7 +6,7 @@
 
 import jakarta.persistence.LockModeType;
 import org.hibernate.engine.spi.ActionQueue;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.event.spi.EventSource;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -37,7 +37,7 @@ public void testNoVersionCheckAfterRemove(SessionFactoryScope sessions) {
 		assertThat( created.getVersion() ).isEqualTo( 0 );
 
 		final Lockable locked = sessions.fromTransaction( (session) -> {
-			final ActionQueue actionQueue = session.unwrap( SessionImplementor.class ).getActionQueue();
+			final ActionQueue actionQueue = session.unwrap( EventSource.class ).getActionQueue();
 			assertThat( actionQueue.hasBeforeTransactionActions() ).isFalse();
 
 			final Lockable loaded = session.createQuery( "from Lockable", Lockable.class )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java
index 423ee585bc0e..0201cfc88292 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java
@@ -9,7 +9,7 @@
 import org.hibernate.LockMode;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.SQLServerDialect;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.event.spi.EventSource;
 import org.hibernate.query.NativeQuery;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
@@ -211,7 +211,7 @@ public void testOptimisticOverall(EntityManagerFactoryScope scope) {
 					.setLockMode( LockModeType.OPTIMISTIC )
 					.getSingleResult();
 			assertEquals( initial, reread.getVersion() );
-			assertTrue( em.unwrap( SessionImplementor.class ).getActionQueue().hasBeforeTransactionActions() );
+			assertTrue( em.unwrap( EventSource.class ).getActionQueue().hasBeforeTransactionActions() );
 			return reread.getId();
 		} );
 		scope.inTransaction( em -> {
@@ -234,7 +234,7 @@ public void testOptimisticSpecific(EntityManagerFactoryScope scope) {
 					.setHint( HINT_NATIVE_LOCK_MODE, LockModeType.OPTIMISTIC )
 					.getSingleResult();
 			assertEquals( initial, reread.getVersion() );
-			assertTrue( em.unwrap( SessionImplementor.class ).getActionQueue().hasBeforeTransactionActions() );
+			assertTrue( em.unwrap( EventSource.class ).getActionQueue().hasBeforeTransactionActions() );
 			return reread.getId();
 		} );
 		scope.inTransaction( em -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java
index a01e4a54dbda..511ba918fc10 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java
@@ -41,6 +41,7 @@
  * @author Steve Ebersole
  */
 @RequiresDialectFeature(feature = DialectFeatureChecks.DoesReadCommittedCauseWritersToBlockReadersCheck.class, reverse = true)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 public class RepeatableReadTest extends AbstractJPATest {
 
 	private final SQLServerSnapshotIsolationConnectionProvider connectionProvider = new SQLServerSnapshotIsolationConnectionProvider();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java
index e8b8fca6fa94..d1861883849c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java
@@ -15,12 +15,14 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
 import org.hibernate.testing.transaction.TransactionUtil;
 import org.hibernate.testing.util.ExceptionUtil;
 import org.junit.jupiter.api.AfterEach;
@@ -37,8 +39,10 @@
 /**
  * @author Andrea Boriero
  */
-@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsLockTimeouts.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNoWait.class)
 @SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase does not close Statement after lock timeout")
+@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+		versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 public class StatementIsClosedAfterALockExceptionTest extends EntityManagerFactoryBasedFunctionalTest {
 
 	private static final PreparedStatementSpyConnectionProvider CONNECTION_PROVIDER = new PreparedStatementSpyConnectionProvider();
@@ -46,8 +50,8 @@ public class StatementIsClosedAfterALockExceptionTest extends EntityManagerFacto
 	private Integer lockId;
 
 	@Override
-	protected Map getConfig() {
-		Map config = super.getConfig();
+	protected Map<String, Object> getConfig() {
+		Map<String, Object> config = super.getConfig();
 		// We can't use a shared connection provider if we use TransactionUtil.setJdbcTimeout because that is set on the connection level
 		config.put(
 			org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java
index 7c178a5e8ccc..db49ba81c5bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/EmbeddedTypeTest.java
@@ -4,8 +4,7 @@
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
-import java.sql.Date;
-
+import jakarta.persistence.metamodel.SingularAttribute;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
@@ -13,7 +12,6 @@
 
 import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.ManagedType;
-import jakarta.persistence.metamodel.SingularAttribute;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -30,9 +28,9 @@ public class EmbeddedTypeTest {
 	@Test
 	@JiraKey(value = "HHH-6896")
 	public void ensureComponentsReturnedAsManagedType(EntityManagerFactoryScope scope) {
-		ManagedType<ShelfLife> managedType = scope.getEntityManagerFactory()
-				.getMetamodel()
-				.managedType( ShelfLife.class );
+		ManagedType<ShelfLife> managedType =
+				scope.getEntityManagerFactory().getMetamodel()
+						.managedType( ShelfLife.class );
 		// the issue was in regards to throwing an exception, but also check for nullness
 		assertNotNull( managedType );
 	}
@@ -42,11 +40,22 @@ public void ensureComponentsReturnedAsManagedType(EntityManagerFactoryScope scop
 	public void testSingularAttributeAccessByName(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
-					SingularAttribute soldDate_ = entityManager.getMetamodel().embeddable( ShelfLife.class )
-							.getSingularAttribute( "soldDate" );
-					assertEquals( Date.class, soldDate_.getJavaType() );
-					assertEquals( Date.class, soldDate_.getType().getJavaType() );
-					assertEquals( Date.class, soldDate_.getJavaType() );
+					var soldDate_ =
+							entityManager.getMetamodel().embeddable( ShelfLife.class )
+									.getSingularAttribute( "soldDate" );
+					assertEquals( java.sql.Date.class, soldDate_.getJavaType() );
+					assertEquals( java.sql.Date.class, soldDate_.getType().getJavaType() );
+				}
+		);
+	}
+
+	@Test
+	public void testSingularAttributeAccess(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					SingularAttribute<ShelfLife, java.sql.Date> soldDate = ShelfLife_.soldDate;
+					assertEquals( java.sql.Date.class, soldDate.getJavaType() );
+					assertEquals( java.sql.Date.class, soldDate.getType().getJavaType() );
 				}
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java
index cc56b100ecdc..6aa4954a2677 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/MappedSuperclassType2Test.java
@@ -45,17 +45,13 @@ public List<String> getManagedClassNames() {
 			}
 		};
 
-		final Map settings = ServiceRegistryUtil.createBaseSettings();
+		final Map<String,Object> settings = ServiceRegistryUtil.createBaseSettings();
 		settings.put( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
 
-		EntityManagerFactory emf = Bootstrap.getEntityManagerFactoryBuilder( pu, settings ).build();
-		try {
+		try ( EntityManagerFactory emf = Bootstrap.getEntityManagerFactoryBuilder( pu, settings ).build() ) {
 			ManagedType<SomeMappedSuperclass> type = emf.getMetamodel().managedType( SomeMappedSuperclass.class );
 			// the issue was in regards to throwing an exception, but also check for nullness
 			assertNotNull( type );
 		}
-		finally {
-			emf.close();
-		}
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java
index 373744d9f883..14dc8856e79d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java
@@ -55,7 +55,7 @@ public void testReattachEntityToSessionWithJpaComplianceProxy() {
 						entityManager.getReference( Workload.class, _workloadId )
 		);
 
-		Map settings = buildSettings();
+		Map<String,Object> settings = buildSettings();
 		settings.put( AvailableSettings.JPA_PROXY_COMPLIANCE, Boolean.TRUE.toString() );
 		settings.put( AvailableSettings.HBM2DDL_AUTO, "none" );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java
index 43beb51ea771..4e45f0c10ce2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java
@@ -6,6 +6,8 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+
+import jakarta.persistence.EntityExistsException;
 import jakarta.persistence.PersistenceException;
 import jakarta.persistence.RollbackException;
 
@@ -177,7 +179,7 @@ public void testCreateExceptionWithGeneratedId(EntityManagerFactoryScope scope)
 						entityManager.persist( dupe );
 						fail();
 					}
-					catch (PersistenceException poe) {
+					catch (EntityExistsException eee) {
 						//verify that an exception is thrown!
 					}
 					finally {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java
index 2f6f658d0220..5e0974dd368c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java
@@ -23,7 +23,9 @@
 import jakarta.persistence.Temporal;
 import jakarta.persistence.TemporalType;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.OracleDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.SkipForDialect;
@@ -35,6 +37,8 @@
  * @author Steve Ebersole
  */
 @SkipForDialect(dialectClass = OracleDialect.class, matchSubTypes = true, reason = "https://hibernate.atlassian.net/browse/HHH-10323")
+@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support integer column. Added a test seperately")
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner doesn't support integer column. Added a test seperately")
 @Jpa(annotatedClasses = {ConstructorResultNativeQueryTest.Person.class})
 public class ConstructorResultNativeQueryTest {
 	@Entity( name = "Person" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CriteriaUpdateWithParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CriteriaUpdateWithParametersTest.java
index b7a97d81280b..455990db6f7f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CriteriaUpdateWithParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CriteriaUpdateWithParametersTest.java
@@ -4,6 +4,8 @@
  */
 package org.hibernate.orm.test.jpa.query;
 
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
@@ -18,6 +20,7 @@
 import jakarta.persistence.metamodel.EntityType;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.junit.jupiter.api.Test;
 
@@ -104,6 +107,23 @@ public void testCriteriaUpdate3(EntityManagerFactoryScope scope) {
 		} );
 	}
 
+	@Test
+	@Jira("https://hibernate.atlassian.net/browse/HHH-20297")
+	public void testCriteriaUpdate4(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			// test with the same cb.value( "1" ) parameter instance
+			final HibernateCriteriaBuilder cb = (HibernateCriteriaBuilder) em.getCriteriaBuilder();
+			final CriteriaUpdate<Process> cu = cb.createCriteriaUpdate( Process.class );
+			final Root<Process> root = cu.from( Process.class );
+			final Expression<String> newValue = cb.value( "1" );
+			final Path<String> name = root.get( "name" );
+			final Path<String> ageString = root.get( "ageString" );
+			cu.set( name, newValue );
+			cu.set( ageString, newValue );
+			em.createQuery( cu ).executeUpdate();
+		} );
+	}
+
 	private static <X> Expression<? extends X> cast(Expression<?> expression) {
 		//noinspection unchecked
 		return (Expression<? extends X>) expression;
@@ -134,7 +154,7 @@ public Integer getAge() {
 		}
 	}
 
-	@Entity
+	@Entity(name = "Process")
 	public static class Process {
 		@Id
 		@GeneratedValue
@@ -143,8 +163,22 @@ public static class Process {
 		// All attributes below are necessary to reproduce the issue
 
 		private String name;
+		@Convert(converter = IntegerConverter.class)
+		private String ageString;
 
 		@Lob
 		private byte[] payload;
 	}
+
+	public static class IntegerConverter implements AttributeConverter<String, Integer> {
+		@Override
+		public Integer convertToDatabaseColumn(String attribute) {
+			return attribute == null ? null : Integer.parseInt( attribute );
+		}
+
+		@Override
+		public String convertToEntityAttribute(Integer dbData) {
+			return dbData == null ? null : dbData.toString();
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java
index 5066d43ec9fd..e5e882f45bd2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java
@@ -219,7 +219,7 @@ public void testSelectNamedNativeQueryWithQueryHintUsingIndex(EntityManagerFacto
 					statementInspector.assertExecutedCount(1);
 
 					statementInspector.assertExecuted(
-							"/* COMMENT_SELECT_INDEX_game_title */ select g1_0.id,g1_0.title from game g1_0  use index (idx_game_id) where g1_0.title=?"
+							"/* COMMENT_SELECT_INDEX_game_title */ select g1_0.id,g1_0.title from game g1_0 use index (idx_game_id) where g1_0.title=?"
 					);
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryJoinTest.java
index da6503a2c3df..1c3074da17c2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryJoinTest.java
@@ -12,8 +12,10 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -33,6 +35,7 @@
 )
 @SessionFactory
 @JiraKey("HHH-19524")
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class)
 public class NativeQueryJoinTest {
 
 	private static final long ORDER_ID = 1L;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java
index b203061dbe07..52cca59d75b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java
@@ -17,6 +17,7 @@
 import jakarta.validation.constraints.Size;
 
 import org.hibernate.Session;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.query.NativeQuery;
@@ -25,6 +26,7 @@
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -124,6 +126,7 @@ public void testConflictWithSessionNativeQuery(EntityManagerFactoryScope scope)
 	// Add RequiresDialect be Cockroach version 201
 	@RequiresDialect( value = PostgreSQLDialect.class )
 	@RequiresDialect( value = CockroachDialect.class, majorVersion = 20, minorVersion = 1 )
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner does not support Recursive WITH expressions" )
 	public void testCteNativeQueryOrdinalParameter(EntityManagerFactoryScope scope) {
 
 		Node root1 = new Node();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java
index 999af3715739..47d07e2342ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java
@@ -18,6 +18,7 @@
 import org.hibernate.community.dialect.FirebirdDialect;
 import org.hibernate.community.dialect.GaussDBDialect;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.community.dialect.TiDBDialect;
 import org.hibernate.dialect.AbstractTransactSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
@@ -30,6 +31,7 @@
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.PostgresPlusDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
@@ -115,16 +117,24 @@ public void cleanup(EntityManagerFactoryScope scope) {
 
 	@Test
 	@SkipForDialect(dialectClass = OracleDialect.class, reason = "Oracle maps integer types to number")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner maps integer types to bigint")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner maps integer types to bigint")
 	public void smallintType(EntityManagerFactoryScope scope) {
 		doTest( scope, SmallintEntity.class, (short)32767 );
 	}
 
 	@Test
-	public void integerTypes(EntityManagerFactoryScope scope) {
-		doTest( scope, BigintEntity.class, 9223372036854775807L );
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner maps integer types to bigint")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner maps integer types to bigint")
+	public void integerType(EntityManagerFactoryScope scope) {
 		doTest( scope, IntegerEntity.class, 2147483647 );
 	}
 
+	@Test
+	public void bigIntegerType(EntityManagerFactoryScope scope) {
+		doTest( scope, BigintEntity.class, 9223372036854775807L );
+	}
+
 	@Test
 	public void doubleType(EntityManagerFactoryScope scope) {
 		doTest( scope, DoubleEntity.class, 445146115151.45845 );
@@ -161,6 +171,8 @@ public void bitType(EntityManagerFactoryScope scope) {
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase maps tinyint to smallint")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "informix maps tinyint to smallint")
 	@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "type:resolved.Turns tinyints into shorts in result sets and advertises the type as short in the metadata")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner maps integer types to bigint")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner maps integer types to bigint")
 	public void tinyintType(EntityManagerFactoryScope scope) {
 		doTest( scope, TinyintEntity.class, (byte)127 );
 	}
@@ -169,6 +181,7 @@ public void tinyintType(EntityManagerFactoryScope scope) {
 	@SkipForDialect(dialectClass = H2Dialect.class, reason = "Turns floats into doubles in result sets and advertises the type as double in the metadata")
 	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "Turns floats into doubles in result sets and advertises the type as double in the metadata")
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Turns floats into doubles in result sets and advertises the type as double in the metadata")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner maps float types to double (float64)")
 	public void floatType(EntityManagerFactoryScope scope) {
 		doTest( scope, FloatEntity.class, 15516.125f );
 	}
@@ -191,6 +204,7 @@ public void realType(EntityManagerFactoryScope scope) {
 	@SkipForDialect(dialectClass = FirebirdDialect.class, reason = "Value is too big for the maximum allowed precision of Firebird")
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Value is too big for the maximum allowed precision of Altibase")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "The scale exceeds the maximum precision specified")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "The value too big for standard Spanner Numeric precision limits (38.9)")
 	public void numericType(EntityManagerFactoryScope scope) {
 		doTest( scope, NumericEntity.class, new BigDecimal( "5464384284258458485484848458.48465843584584684" ) );
 	}
@@ -204,6 +218,7 @@ public void numericType(EntityManagerFactoryScope scope) {
 	@SkipForDialect(dialectClass = FirebirdDialect.class, reason = "Value is too big for the maximum allowed precision of Firebird")
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Value is too big for the maximum allowed precision of Altibase")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "The scale exceeds the maximum precision specified")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "The value too big for standard Spanner Numeric precision limits (38.9)")
 	public void decimalType(EntityManagerFactoryScope scope) {
 		doTest( scope, DecimalEntity.class, new BigDecimal( "5464384284258458485484848458.48465843584584684" )  );
 	}
@@ -225,6 +240,8 @@ public void longCharType(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner maps char types to varchar" )
+	@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner maps char types to varchar" )
 	public void charType(EntityManagerFactoryScope scope) {
 		doTest( scope, CharEntity.class, 'c' );
 	}
@@ -284,7 +301,9 @@ public void dateTimeTypes(EntityManagerFactoryScope scope) {
 		);
 
 		doTest( scope, DateEntity.class, new java.sql.Date( zonedDateTime.toInstant().toEpochMilli() ) );
-		doTest( scope, TimeEntity.class, new Time( zonedDateTime.toLocalTime().toNanoOfDay() / 1000 ) );
+		if (!(scope.getDialect() instanceof SpannerPostgreSQLDialect || scope.getDialect() instanceof SpannerDialect)) {
+			doTest( scope, TimeEntity.class, new Time( zonedDateTime.toLocalTime().toNanoOfDay() / 1000 ) );
+		}
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java
index 2cce06b26dc1..15fbe362f409 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java
@@ -11,7 +11,9 @@
 import org.hibernate.community.dialect.GaussDBDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgresPlusDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.SkipForDialect;
@@ -31,7 +33,12 @@ public class NativeQueryWithDatetimesTest {
 	@Test void test(EntityManagerFactoryScope scope) {
 		scope.inTransaction(s -> s.persist(new Datetimes()));
 		Object[] result = scope.fromTransaction(s -> (Object[]) s.createNativeQuery("select ctime, cdate, cdatetime from tdatetimes", Object[].class).getSingleResult());
-		assertInstanceOf(LocalTime.class, result[0]);
+		if (scope.getDialect() instanceof SpannerPostgreSQLDialect || scope.getDialect() instanceof SpannerDialect ) {
+			assertInstanceOf( LocalDateTime.class, result[0] );
+		}
+		else {
+			assertInstanceOf( LocalTime.class, result[0] );
+		}
 		assertInstanceOf(LocalDate.class, result[1]);
 		assertInstanceOf(LocalDateTime.class, result[2]);
 //		result = scope.fromTransaction(s -> (Object[]) s.createNativeQuery("select current_time, current_date, current_timestamp from tdatetimes", Object[].class).getSingleResult());
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java
index 80932e0088fd..fb82b2599cf8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java
@@ -43,7 +43,7 @@ public void setParameterWithWrongTypeShouldThrowIllegalArgumentException(EntityM
 		scope.inEntityManager( entityManager -> {
 			Assertions.assertThrows(
 					IllegalArgumentException.class,
-					() -> entityManager.createQuery( "select e from TestEntity e where e.id = :id" ).setParameter( "id", 1 )
+					() -> entityManager.createQuery( "select e from TestEntity e where e.id = :id" ).setParameter( "id", "X" )
 			);
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java
index 05f8358037d2..c3fb3d4fc2a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java
@@ -30,10 +30,12 @@
 import org.hibernate.orm.test.jpa.Item;
 import org.hibernate.orm.test.jpa.Wallet;
 import org.hibernate.stat.Statistics;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -861,6 +863,7 @@ public void testNativeQueryByResultSet(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTimestampWithDateComparison.class)
 	public void testExplicitPositionalParameter(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
 			Wallet w = new Wallet();
@@ -889,7 +892,7 @@ public void testTemporalTypeBinding(EntityManagerFactoryScope scope) {
 
 			TypedQuery<Wallet> query = entityManager.createQuery( "select w from " + Wallet.class.getName() + " w where w.marketEntrance = :me", Wallet.class );
 			Parameter<Date> parameter = query.getParameter( "me", Date.class );
-			assertEquals( java.sql.Timestamp.class, parameter.getParameterType() );
+			assertEquals( java.util.Date.class, parameter.getParameterType() );
 
 			query.setParameter( "me", new Date() );
 			query.setParameter( "me", new Date(), TemporalType.DATE );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/SpannerPostgreSQLConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/SpannerPostgreSQLConstructorResultNativeQueryTest.java
new file mode 100644
index 000000000000..13789faf3f6f
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/SpannerPostgreSQLConstructorResultNativeQueryTest.java
@@ -0,0 +1,191 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.jpa.query;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.ColumnResult;
+import jakarta.persistence.ConstructorResult;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedNativeQueries;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.persistence.SqlResultSetMappings;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Date;
+import java.util.List;
+
+import static org.hibernate.testing.orm.junit.ExtraAssertions.assertTyping;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author Steve Ebersole
+ */
+@RequiresDialect(SpannerPostgreSQLDialect.class)
+@RequiresDialect(SpannerDialect.class)
+@Jpa(annotatedClasses = {SpannerPostgreSQLConstructorResultNativeQueryTest.Person.class})
+public class SpannerPostgreSQLConstructorResultNativeQueryTest {
+	@Entity( name = "Person" )
+	@SqlResultSetMappings(
+			value = {
+					@SqlResultSetMapping(
+							name = "person-id-and-name",
+							classes = {
+									@ConstructorResult(
+											targetClass = Person.class,
+											columns = {
+													@ColumnResult( name = "id" ),
+													@ColumnResult( name = "p_name" )
+											}
+									)
+							}
+					),
+					@SqlResultSetMapping(
+							name = "person-id-and-name2",
+							classes = {
+									@ConstructorResult(
+											targetClass = Person.class,
+											columns = {
+													@ColumnResult( name = "id" ),
+													@ColumnResult( name = "p_name" )
+											}
+									),
+									@ConstructorResult(
+											targetClass = Person.class,
+											columns = {
+													@ColumnResult( name = "id2" ),
+													@ColumnResult( name = "p_name2" )
+											}
+									)
+							}
+					),
+					@SqlResultSetMapping(
+							name = "person-id-and-name-and-weight",
+							classes = {
+									@ConstructorResult(
+											targetClass = Person.class,
+											columns = {
+													@ColumnResult( name = "id" ),
+													@ColumnResult( name = "p_name" ),
+													@ColumnResult( name = "p_weight", type=String.class )
+											}
+									)
+							}
+					)
+			}
+	)
+	@NamedNativeQueries(
+			value = {
+				@NamedNativeQuery(
+						name = "person-id-and-name",
+						query = "select p.id, p.p_name from person p order by p.p_name",
+						resultSetMapping = "person-id-and-name"
+				),
+				@NamedNativeQuery(
+						name = "person-id-and-name2",
+						query = "select p.id, p.p_name, p.id as id2, p.p_name as p_name2 from person p order by p.p_name",
+						resultSetMapping = "person-id-and-name2"
+				),
+				@NamedNativeQuery(
+						name = "person-id-and-name-and-weight",
+						query = "select p.id, p.p_name, p.p_weight from person p order by p.p_name",
+						resultSetMapping = "person-id-and-name-and-weight"
+				)
+			}
+	)
+	@Table(name = "person")
+	public static class Person {
+		@Id
+		@Column(name = "id")
+		private Long id;
+		@Column( name = "p_name" )
+		private String name;
+		@Temporal( TemporalType.TIMESTAMP )
+		private Date birthDate;
+		@Column( name = "p_weight" )
+		private int weight;
+
+		public Person() {
+		}
+
+		public Person(Long id, String name, Date birthDate) {
+			this.id = id;
+			this.name = name;
+			this.birthDate = birthDate;
+		}
+
+		public Person(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Person(Long id, String name, String weight) {
+			this.id = id;
+			this.name = name;
+			this.weight = Integer.valueOf(weight);
+		}
+	}
+
+	@AfterEach
+	public void cleanup(EntityManagerFactoryScope scope) {
+		scope.getEntityManagerFactory().getSchemaManager().truncate();
+	}
+
+	@Test
+	public void testConstructorResultNativeQuery(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			em.persist( new Person( 1L, "John", new Date() ) );
+		} );
+
+		scope.inTransaction( em -> {
+			List results = em.createNativeQuery(
+					"select p.id, p.p_name from person p order by p.p_name",
+					"person-id-and-name"
+			).getResultList();
+			assertEquals( 1, results.size() );
+			assertTyping( Person.class, results.get( 0 ) );
+		} );
+	}
+
+
+	@Test
+	public void testMultipleConstructorResultNativeQuery(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			em.persist( new Person( 1L, "John", new Date() ) );
+		} );
+
+		scope.inTransaction( em -> {
+			List results = em.createNamedQuery( "person-id-and-name2" ).getResultList();
+			assertEquals( 1, results.size() );
+			Object[] result = assertTyping( Object[].class, results.get( 0 ) );
+			assertEquals( 2, result.length );
+			assertTyping( Person.class, result[0] );
+			assertTyping( Person.class, result[1] );
+		} );
+	}
+
+	@Test
+	public void testConstructorResultNativeQuerySpecifyingType(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			em.persist( new Person( 1L, "John", "85" ) );
+		} );
+
+		scope.inTransaction( em -> {
+			List results = em.createNamedQuery( "person-id-and-name-and-weight" ).getResultList();
+			assertEquals( 1, results.size() );
+			assertTyping( Person.class, results.get( 0 ) );
+		} );
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java
index ba31a26b1a47..f8403f139ae0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/JpaSchemaGeneratorTest.java
@@ -38,14 +38,14 @@ public String getScriptFolderPath() {
 	}
 
 	@Override
-	public Class[] getAnnotatedClasses() {
+	public Class<?>[] getAnnotatedClasses() {
 		return new Class[] { Item.class };
 	}
 
 	@Test
 	@JiraKey(value = "HHH-8271")
 	public void testSqlLoadScriptSourceClasspath() {
-		Map<Object, Object> settings = buildSettings();
+		Map<String, Object> settings = buildSettings();
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "create-drop" );
 		settings.put( AvailableSettings.HBM2DDL_LOAD_SCRIPT_SOURCE, getLoadSqlScript() );
 		doTest( settings );
@@ -55,7 +55,7 @@ public void testSqlLoadScriptSourceClasspath() {
 	@Test
 	@JiraKey(value = "HHH-8271")
 	public void testSqlLoadScriptSourceUrl() {
-		Map<Object, Object> settings = buildSettings();
+		Map<String, Object> settings = buildSettings();
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "create-drop" );
 		settings.put( AvailableSettings.HBM2DDL_LOAD_SCRIPT_SOURCE, getResourceUrlString( getLoadSqlScript() ) );
 		doTest( settings );
@@ -64,7 +64,7 @@ public void testSqlLoadScriptSourceUrl() {
 	@Test
 	@JiraKey(value = "HHH-8271")
 	public void testSqlCreateScriptSourceClasspath() {
-		Map<Object, Object> settings = buildSettings();
+		Map<String,Object> settings = buildSettings();
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "create-drop" );
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_CREATE_SOURCE, "metadata-then-script" );
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCRIPT_SOURCE, getCreateSqlScript() );
@@ -74,7 +74,7 @@ public void testSqlCreateScriptSourceClasspath() {
 	@Test
 	@JiraKey(value = "HHH-8271")
 	public void testSqlCreateScriptSourceUrl() {
-		Map<Object, Object> settings = buildSettings();
+		Map<String,Object> settings = buildSettings();
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "create-drop" );
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_CREATE_SOURCE, "metadata-then-script" );
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_CREATE_SCRIPT_SOURCE, getResourceUrlString( getCreateSqlScript() ) );
@@ -85,7 +85,7 @@ public void testSqlCreateScriptSourceUrl() {
 	@Test
 	@JiraKey(value = "HHH-8271")
 	public void testSqlDropScriptSourceClasspath() {
-		Map<Object, Object> settings = buildSettings();
+		Map<String,Object> settings = buildSettings();
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_DROP_SOURCE, "metadata-then-script" );
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "drop" );
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_DROP_SCRIPT_SOURCE, getDropSqlScript() );
@@ -95,7 +95,7 @@ public void testSqlDropScriptSourceClasspath() {
 	@Test
 	@JiraKey(value = "HHH-8271")
 	public void testSqlDropScriptSourceUrl() {
-		Map<Object, Object> settings = buildSettings();
+		Map<String,Object> settings = buildSettings();
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_DROP_SOURCE, "metadata-then-script" );
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "drop" );
 		settings.put( AvailableSettings.JAKARTA_HBM2DDL_DROP_SCRIPT_SOURCE, getResourceUrlString( getDropSqlScript() ) );
@@ -143,7 +143,7 @@ protected String toFilePath(String relativePath) {
 		return getResourceUrlString( Thread.currentThread().getContextClassLoader(), relativePath, URL::getFile );
 	}
 
-	private void doTest(Map<Object, Object> settings) {
+	private void doTest(Map<String, Object> settings) {
 		// We want a fresh db after emf close
 		// Unfortunately we have to use this dirty hack because the db seems not to be closed otherwise
 		settings.put( "hibernate.connection.url", "jdbc:h2:mem:db-schemagen" + schemagenNumber++
@@ -152,19 +152,13 @@ private void doTest(Map<Object, Object> settings) {
 				buildPersistenceUnitDescriptor(),
 				settings
 		);
-		EntityManagerFactory emf = emfb.build();
-		try {
-			EntityManager em = emf.createEntityManager();
-			try {
+		try ( EntityManagerFactory emf = emfb.build() ) {
+			try ( EntityManager em = emf.createEntityManager() ) {
 				Assertions.assertNotNull( em.find( Item.class, encodedName() ) );
 				Assertions.assertNotNull( em.find( Item.class, "multi-file-test" ) );
 			}
-			finally {
-				em.close();
-			}
 		}
 		finally {
-			emf.close();
 			emfb.cancel();
 		}
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java
index 13da0c9ccc35..8b2fdb601946 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java
@@ -17,9 +17,10 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
+import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase.TestingPersistenceUnitDescriptorImpl;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 
@@ -42,15 +43,15 @@ public class SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest {
 
 	private EntityManagerFactoryBuilder entityManagerFactoryBuilder;
 
-	protected Map getConfig() {
-		final Map<Object, Object> config = Environment.getProperties();
+	protected Map<String, Object> getConfig() {
+		final Map<String, Object> config = PropertiesHelper.map( Environment.getProperties() );
 		ServiceRegistryUtil.applySettings( config );
 		config.put( JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, createSchema.toPath() );
 		config.put( JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET, dropSchema.toPath() );
 		config.put( JAKARTA_HBM2DDL_SCRIPTS_ACTION, "drop-and-create" );
-		ArrayList<Class> classes = new ArrayList<Class>();
+		ArrayList<Class<?>> classes = new ArrayList<>();
 
-		classes.addAll( Arrays.asList( new Class[] {TestEntity.class} ) );
+		classes.addAll( Arrays.asList( new Class<?>[] {TestEntity.class} ) );
 		config.put( AvailableSettings.LOADED_CLASSES, classes );
 		return config;
 	}
@@ -63,7 +64,7 @@ public void setUp() throws IOException {
 		dropSchema.deleteOnExit();
 
 		entityManagerFactoryBuilder = Bootstrap.getEntityManagerFactoryBuilder(
-				new BaseEntityManagerFunctionalTestCase.TestingPersistenceUnitDescriptorImpl( getClass().getSimpleName() ),
+				new TestingPersistenceUnitDescriptorImpl( getClass().getSimpleName() ),
 				getConfig()
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java
index c87c46bce0be..4cd708633fea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaDatabaseFileGenerationFailureTest.java
@@ -13,6 +13,7 @@
 import org.hibernate.community.dialect.GaussDBDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.PostgresPlusDialect;
+import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
 import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
@@ -122,15 +123,15 @@ private PersistenceUnitDescriptor buildPersistenceUnitDescriptor() {
 		return new EntityManagerFactoryBasedFunctionalTest.TestingPersistenceUnitDescriptorImpl( getClass().getSimpleName() );
 	}
 
-	private Map getConfig() {
-		final Map<Object, Object> config = Environment.getProperties();
+	private Map<String, Object> getConfig() {
+		final Map<String, Object> config = PropertiesHelper.map( Environment.getProperties() );
 		ServiceRegistryUtil.applySettings( config );
 		config.put( AvailableSettings.JAKARTA_HBM2DDL_CONNECTION, connection );
 		config.put( AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION, "drop" );
 		config.put( AvailableSettings.HBM2DDL_HALT_ON_ERROR, true );
-		ArrayList<Class> classes = new ArrayList<>();
+		ArrayList<Class<?>> classes = new ArrayList<>();
 
-		classes.addAll( Arrays.asList( new Class[] { TestEntity.class } ) );
+		classes.addAll( Arrays.asList( new Class<?>[] { TestEntity.class } ) );
 		config.put( AvailableSettings.LOADED_CLASSES, classes );
 		return config;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java
index 98e850c52eea..9bb083b01587 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationFailureTest.java
@@ -13,6 +13,7 @@
 import org.hibernate.community.dialect.GaussDBDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.PostgresPlusDialect;
+import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
 import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
@@ -115,15 +116,15 @@ private PersistenceUnitDescriptor buildPersistenceUnitDescriptor() {
 		return new EntityManagerFactoryBasedFunctionalTest.TestingPersistenceUnitDescriptorImpl( getClass().getSimpleName() );
 	}
 
-	private Map getConfig() {
-		final Map<Object, Object> config = Environment.getProperties();
+	private Map<String, Object> getConfig() {
+		final Map<String, Object> config = PropertiesHelper.map( Environment.getProperties() );
 		ServiceRegistryUtil.applySettings( config );
 		config.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET, writer );
 		config.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "drop-and-create" );
 		config.put( AvailableSettings.HBM2DDL_HALT_ON_ERROR, "true" );
-		ArrayList<Class> classes = new ArrayList<>();
+		ArrayList<Class<?>> classes = new ArrayList<>();
 
-		classes.addAll( Arrays.asList( new Class[] { TestEntity.class } ) );
+		classes.addAll( Arrays.asList( new Class<?>[] { TestEntity.class } ) );
 		config.put( AvailableSettings.LOADED_CLASSES, classes );
 		return config;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java
index 7820bac6fd22..1b2abe345e65 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaScriptFileGenerationTest.java
@@ -18,6 +18,7 @@
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
+import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
 import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
@@ -105,15 +106,15 @@ private PersistenceUnitDescriptor buildPersistenceUnitDescriptor() {
 		return new EntityManagerFactoryBasedFunctionalTest.TestingPersistenceUnitDescriptorImpl( getClass().getSimpleName() );
 	}
 
-	private Map getConfig() {
-		final Map<Object, Object> config = Environment.getProperties();
+	private Map<String, Object> getConfig() {
+		final Map<String, Object> config = PropertiesHelper.map( Environment.getProperties() );
 		ServiceRegistryUtil.applySettings( config );
 		config.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, createSchema.toPath() );
 		config.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET, dropSchema.toPath() );
 		config.put( AvailableSettings.JAKARTA_HBM2DDL_SCRIPTS_ACTION, "drop-and-create" );
-		ArrayList<Class> classes = new ArrayList<Class>();
+		ArrayList<Class<?>> classes = new ArrayList<>();
 
-		classes.addAll( Arrays.asList( new Class[] {TestEntity.class} ) );
+		classes.addAll( Arrays.asList( new Class<?>[] {TestEntity.class} ) );
 		config.put( AvailableSettings.LOADED_CLASSES, classes );
 		return config;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java
index 56297f0cdc88..e8dc6b6dc812 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java
@@ -26,8 +26,8 @@ public String getScriptFolderPath() {
 	}
 
 	@Override
-	protected Map buildSettings() {
-		Map settings = super.buildSettings();
+	protected Map<String,Object> buildSettings() {
+		Map<String,Object> settings = super.buildSettings();
 		settings.put( AvailableSettings.HBM2DDL_CHARSET_NAME, "ISO-8859-1" );
 		return settings;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java
index a77b175f59c5..9c3118bdd9fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java
@@ -25,8 +25,8 @@ public String getScriptFolderPath() {
 	}
 
 	@Override
-	protected Map buildSettings() {
-		Map settings = super.buildSettings();
+	protected Map<String,Object> buildSettings() {
+		Map<String,Object> settings = super.buildSettings();
 		settings.put( AvailableSettings.HBM2DDL_CHARSET_NAME, "ISO-8859-1" );
 		return settings;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java
index f1ebcd1aa240..61cac0eacd8f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java
@@ -16,8 +16,8 @@ public class SchemaCreateDropWithHbm2DdlCharsetNameTest extends
 		SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest {
 
 	@Override
-	protected Map getConfig() {
-		Map settings = super.getConfig();
+	protected Map<String, Object> getConfig() {
+		Map<String, Object> settings = super.getConfig();
 		settings.put( AvailableSettings.HBM2DDL_CHARSET_NAME, "ISO-8859-1" );
 		return settings;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java
index 5219ef168565..de13bbdff1f0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java
@@ -83,10 +83,10 @@ public void testRowAddedForNullValueInSubclassTable() {
 	public void cleanupData() {
 		doInJPA(
 				this::entityManagerFactory, entityManager -> {
-					entityManager.createNativeQuery( "delete from Details" ).executeUpdate();
-					entityManager.createNativeQuery( "delete from MoreDetails" ).executeUpdate();
-					entityManager.createNativeQuery( "delete from AnEntitySubclass" ).executeUpdate();
-					entityManager.createNativeQuery( "delete from AnEntity" ).executeUpdate();
+					entityManager.createNativeQuery( "delete from Details where 1=1" ).executeUpdate();
+					entityManager.createNativeQuery( "delete from MoreDetails where 1=1" ).executeUpdate();
+					entityManager.createNativeQuery( "delete from AnEntitySubclass where 1=1" ).executeUpdate();
+					entityManager.createNativeQuery( "delete from AnEntity where 1=1" ).executeUpdate();
 				}
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java
index af759e34fe83..1a4350aa9790 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java
@@ -117,13 +117,7 @@ public void testEntityWithBadDataInSubclassSecondaryTableIgnored() {
 
 	@AfterEach
 	public void cleanupData() {
-		doInJPA(
-				this::entityManagerFactory, entityManager -> {
-					entityManager.createNativeQuery( "delete from Details" ).executeUpdate();
-					entityManager.createNativeQuery( "delete from MoreDetails" ).executeUpdate();
-					entityManager.createNativeQuery( "delete from AnEntity" ).executeUpdate();
-				}
-		);
+		entityManagerFactory().unwrap( org.hibernate.SessionFactory.class ).getSchemaManager().truncate();
 	}
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java
index 1028e3b96800..7db0d5beebfb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/temporal/TemporalTypeTest.java
@@ -14,21 +14,29 @@
 import jakarta.persistence.Temporal;
 import jakarta.persistence.TemporalType;
 
-import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.boot.model.FunctionContributions;
+import org.hibernate.boot.model.FunctionContributor;
+import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DomainModel;
 
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
 /**
  * @author Brett Meyer
  */
-@Jpa(annotatedClasses = {
-		TemporalTypeTest.DataPoint.class
-})
+@BootstrapServiceRegistry(
+		javaServices =
+		@BootstrapServiceRegistry.JavaService(role = FunctionContributor.class,
+				impl = TemporalTypeTest.MyFunctionContributor.class)
+)
+@DomainModel(annotatedClasses = TemporalTypeTest.DataPoint.class)
+@SessionFactory
 public class TemporalTypeTest {
 
 	@Test
-	public void testTemporalType(EntityManagerFactoryScope scope) {
+	public void testTemporalType(SessionFactoryScope scope) {
 		Date date = new Date();
 		Calendar calendar = Calendar.getInstance();
 		scope.inTransaction(
@@ -53,12 +61,12 @@ public void testTemporalType(EntityManagerFactoryScope scope) {
 		doTest(scope, "calendar2", calendar);
 	}
 
-	private void doTest(EntityManagerFactoryScope scope, String property, Object obj) {
+	private void doTest(SessionFactoryScope scope, String property, Object obj) {
 		doTest( scope, property, obj, TemporalType.DATE );
 		doTest( scope, property, obj, TemporalType.TIMESTAMP );
 	}
 
-	private void doTest(EntityManagerFactoryScope scope, String property, Object obj, TemporalType temporalType) {
+	private void doTest(SessionFactoryScope scope, String property, Object obj, TemporalType temporalType) {
 		scope.inTransaction(
 				entityManager -> {
 					Query query = entityManager.createQuery("from DataPoint where " + property + " = :obj");
@@ -72,6 +80,43 @@ private void doTest(EntityManagerFactoryScope scope, String property, Object obj
 		);
 	}
 
+	@Test
+	public void testTemporalTypeCalendar(SessionFactoryScope scope) {
+		Calendar calendar = Calendar.getInstance();
+		Date date = calendar.getTime();
+		scope.inTransaction(
+				entityManager -> {
+					DataPoint dp = new DataPoint();
+					dp.date1 = date;
+					dp.date2 = date;
+					dp.calendar1 = calendar;
+					dp.calendar2 = calendar;
+					entityManager.persist( dp );
+				}
+		);
+//		 Trigger initialization of BasicType for the Calendar and GregorianCalendar Java type
+		var typeConfiguration = scope.getSessionFactory().getTypeConfiguration();
+		typeConfiguration.getBasicTypeForJavaType( Calendar.class );
+		// Instead of doing this, it's also possible to provoke the bug by binding another calendar parameter
+		typeConfiguration.getBasicTypeRegistry().getRegisteredType( "java.util.GregorianCalendar" );
+		scope.inTransaction(
+				entityManager -> {
+					Query query = entityManager.createQuery("from DataPoint dp where my_function(:cal) = 1")
+							.setParameter("cal", calendar, TemporalType.TIMESTAMP);
+					query.getResultList();
+				}
+		);
+		scope.inTransaction(
+				entityManager -> {
+					Query query = entityManager.createQuery("from DataPoint dp where my_function(:cal) = 1")
+							.setParameter("cal", calendar, TemporalType.TIMESTAMP);
+					query.getResultList();
+				}
+		);
+	}
+
+
+
 	@Entity(name = "DataPoint")
 	public static class DataPoint {
 		@Id @GeneratedValue
@@ -89,4 +134,14 @@ public static class DataPoint {
 		@Temporal( TemporalType.TIMESTAMP )
 		public Calendar calendar2;
 	}
+
+	public static class MyFunctionContributor implements FunctionContributor {
+		@Override
+		public void contributeFunctions(FunctionContributions functionContributions) {
+			functionContributions.getFunctionRegistry().patternDescriptorBuilder( "my_function", "1" )
+					.setExactArgumentCount( 1 )
+					.setInvariantType( functionContributions.getTypeConfiguration().getBasicTypeForJavaType( Integer.class ) )
+					.register();
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java
index fa6a1c0a2f19..415029ddec4a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java
@@ -53,7 +53,7 @@ public void setUp() {
 		transactionFailureTrigger = new AtomicBoolean();
 		connectionIsOpen = new AtomicBoolean();
 
-		final Map settings = basicSettings();
+		final Map<String, Object> settings = basicSettings();
 		emf = Bootstrap.getEntityManagerFactoryBuilder( new PersistenceUnitDescriptorAdapter(), settings ).build();
 	}
 
@@ -112,9 +112,8 @@ public void assertConnectionIsReleasedIfRollbackFails() {
 		assertFalse( connectionIsOpen.get(), "The connection was not released" );
 	}
 
-	private Map basicSettings() {
+	private Map<String, Object> basicSettings() {
 		return SettingsGenerator.generateSettings(
-				Environment.HBM2DDL_AUTO, "create-drop",
 				Environment.DIALECT, DialectContext.getDialect().getClass().getName(),
 				Environment.CONNECTION_PROVIDER, ProxyConnectionProvider.class.getName()
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionTimeoutTest.java
index f1bd22763a88..ff87979b887b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionTimeoutTest.java
@@ -6,6 +6,7 @@
 
 import java.math.BigDecimal;
 
+import jakarta.persistence.PersistenceException;
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.AbstractTransactSQLDialect;
@@ -28,12 +29,10 @@
 import org.junit.jupiter.api.function.ThrowingConsumer;
 
 import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.LockTimeoutException;
 import jakarta.persistence.ParameterMode;
 import jakarta.persistence.QueryTimeoutException;
 import jakarta.transaction.Status;
-import jakarta.transaction.TransactionManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -72,7 +71,7 @@ public void testHSQL(EntityManagerFactoryScope scope) throws Throwable {
 	}
 
 	@Test
-	@RequiresDialect(PostgreSQLDialect.class)
+	@RequiresDialect(value = PostgreSQLDialect.class, matchSubTypes = false)
 	@RequiresDialect(CockroachDialect.class)
 	public void testPostgreSQL(EntityManagerFactoryScope scope) throws Throwable {
 		test( scope, entityManager -> {
@@ -119,13 +118,13 @@ public void testDB2(EntityManagerFactoryScope scope) throws Throwable {
 	}
 
 	private void test(EntityManagerFactoryScope scope, ThrowingConsumer<EntityManager> consumer) throws Throwable {
-		TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager();
-		EntityManagerFactory entityManagerFactory = scope.getEntityManagerFactory();
+		var transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager();
+		var entityManagerFactory = scope.getEntityManagerFactory();
 
 		transactionManager.setTransactionTimeout( 2 );
 		transactionManager.begin();
 
-		try (EntityManager entityManager = entityManagerFactory.createEntityManager()) {
+		try (var entityManager = entityManagerFactory.createEntityManager()) {
 			entityManager.joinTransaction();
 			consumer.accept( entityManager );
 		}
@@ -135,8 +134,14 @@ private void test(EntityManagerFactoryScope scope, ThrowingConsumer<EntityManage
 		catch (HibernateException ex) {
 			assertThat( ex.getMessage() ).isEqualTo( "Transaction was rolled back in a different thread" );
 		}
+		catch (PersistenceException pe) {
+			// PostgreSQL, Cockroach
+			assertThat( pe.getCause() ).isInstanceOf( org.hibernate.QueryTimeoutException.class );
+
+		}
 		finally {
-			assertThat( transactionManager.getStatus() ).isIn( Status.STATUS_ROLLEDBACK, Status.STATUS_ROLLING_BACK, Status.STATUS_MARKED_ROLLBACK );
+			assertThat( transactionManager.getStatus() )
+					.isIn( Status.STATUS_ROLLEDBACK, Status.STATUS_ROLLING_BACK, Status.STATUS_MARKED_ROLLBACK );
 			transactionManager.rollback();
 		}
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/NoDefaultOptimisticLockAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/NoDefaultOptimisticLockAnnotationTest.java
index 425937965357..40a2192401cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/NoDefaultOptimisticLockAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/NoDefaultOptimisticLockAnnotationTest.java
@@ -54,7 +54,8 @@ void test(EntityManagerFactoryScope scope) {
 			consumer.getConsumerItems().add( inventory );
 		} );
 
-		statementInspector.assertIsInsert( 1 );
+		// Might generate select statement for sequence, so assert insert happens rather than assert the first query is an insert
+		statementInspector.assertInsertCount(1);
 		statementInspector.assertNoUpdate();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java
deleted file mode 100644
index 114c99f08a05..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java
+++ /dev/null
@@ -1,1216 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.legacy;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
-import org.hibernate.HibernateException;
-import org.hibernate.LockMode;
-import org.hibernate.LockOptions;
-import org.hibernate.MappingException;
-import org.hibernate.bytecode.internal.BytecodeEnhancementMetadataNonPojoImpl;
-import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
-import org.hibernate.cache.spi.access.EntityDataAccess;
-import org.hibernate.cache.spi.access.NaturalIdDataAccess;
-import org.hibernate.cache.spi.entry.CacheEntry;
-import org.hibernate.cache.spi.entry.CacheEntryStructure;
-import org.hibernate.cache.spi.entry.StandardCacheEntryImpl;
-import org.hibernate.cache.spi.entry.UnstructuredCacheEntry;
-import org.hibernate.engine.internal.MutableEntityEntryFactory;
-import org.hibernate.engine.spi.CascadeStyle;
-import org.hibernate.engine.spi.EntityEntryFactory;
-import org.hibernate.engine.spi.LoadQueryInfluencers;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.event.spi.EventSource;
-import org.hibernate.generator.values.GeneratedValues;
-import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
-import org.hibernate.id.IdentifierGenerator;
-import org.hibernate.id.UUIDHexGenerator;
-import org.hibernate.persister.filter.FilterAliasGenerator;
-import org.hibernate.persister.filter.internal.StaticFilterAliasGenerator;
-import org.hibernate.internal.util.IndexedConsumer;
-import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.metamodel.mapping.AttributeMapping;
-import org.hibernate.metamodel.mapping.AttributeMappingsList;
-import org.hibernate.metamodel.mapping.AttributeMappingsMap;
-import org.hibernate.metamodel.mapping.DiscriminatorType;
-import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
-import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
-import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.metamodel.mapping.EntityRowIdMapping;
-import org.hibernate.metamodel.mapping.EntityVersionMapping;
-import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.metamodel.mapping.ModelPart;
-import org.hibernate.metamodel.mapping.NaturalIdMapping;
-import org.hibernate.metamodel.mapping.SelectableMapping;
-import org.hibernate.metamodel.mapping.TableDetails;
-import org.hibernate.metamodel.model.domain.NavigableRole;
-import org.hibernate.metamodel.spi.EntityRepresentationStrategy;
-import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.entity.UniqueKeyEntry;
-import org.hibernate.persister.entity.mutation.DeleteCoordinator;
-import org.hibernate.persister.entity.mutation.EntityTableMapping;
-import org.hibernate.persister.entity.mutation.InsertCoordinator;
-import org.hibernate.persister.entity.mutation.UpdateCoordinator;
-import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
-import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
-import org.hibernate.spi.NavigablePath;
-import org.hibernate.sql.ast.spi.SqlSelection;
-import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.model.MutationOperationGroup;
-import org.hibernate.sql.model.ast.builder.MutationGroupBuilder;
-import org.hibernate.sql.results.graph.DomainResult;
-import org.hibernate.sql.results.graph.DomainResultCreationState;
-import org.hibernate.tuple.entity.EntityMetamodel;
-import org.hibernate.type.BasicType;
-import org.hibernate.type.Type;
-import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.descriptor.java.StringJavaType;
-import org.hibernate.type.descriptor.jdbc.VarcharJdbcType;
-import org.hibernate.type.internal.BasicTypeImpl;
-
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-public 	class CustomPersister extends EntityMetamodel implements EntityPersister {
-
-	private static final Hashtable<Object,Object> INSTANCES = new Hashtable<>();
-	private static final IdentifierGenerator GENERATOR = new UUIDHexGenerator();
-
-	private final SessionFactoryImplementor factory;
-
-	@SuppressWarnings("UnusedParameters")
-	public CustomPersister(
-			PersistentClass model,
-			EntityDataAccess cacheAccessStrategy,
-			NaturalIdDataAccess naturalIdRegionAccessStrategy,
-			RuntimeModelCreationContext creationContext) {
-		super( model, creationContext );
-		this.factory = creationContext.getSessionFactory();
-	}
-
-	public boolean hasLazyProperties() {
-		return false;
-	}
-
-	public boolean isInherited() {
-		return false;
-	}
-
-	public SessionFactoryImplementor getFactory() {
-		return factory;
-	}
-
-	@Override
-	public NavigableRole getNavigableRole() {
-		return new NavigableRole( getEntityName() );
-	}
-
-	@Override
-	public EntityEntryFactory getEntityEntryFactory() {
-		return MutableEntityEntryFactory.INSTANCE;
-	}
-
-	@Override
-	public Class<?> getMappedClass() {
-		return Custom.class;
-	}
-
-	public void postInstantiate() throws MappingException {}
-
-	public String getEntityName() {
-		return Custom.class.getName();
-	}
-
-	@Override
-	public @Nullable String getJpaEntityName() {
-		return Custom.class.getSimpleName();
-	}
-
-	@Override
-	public TableDetails getMappedTableDetails() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public TableDetails getIdentifierTableDetails() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public void forEachTableDetails(Consumer<TableDetails> consumer) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public ModelPart findSubPart(
-			String name, EntityMappingType targetType) {
-		return null;
-	}
-
-	@Override
-	public void visitSubParts(Consumer<ModelPart> consumer, EntityMappingType targetType) {
-
-	}
-
-	@Override
-	public <T> DomainResult<T> createDomainResult(
-			NavigablePath navigablePath,
-			TableGroup tableGroup,
-			String resultVariable,
-			DomainResultCreationState creationState) {
-		return null;
-	}
-
-	@Override
-	public void applySqlSelections(
-			NavigablePath navigablePath, TableGroup tableGroup, DomainResultCreationState creationState) {
-
-	}
-
-	@Override
-	public void applySqlSelections(
-			NavigablePath navigablePath,
-			TableGroup tableGroup,
-			DomainResultCreationState creationState,
-			BiConsumer<SqlSelection, JdbcMapping> selectionConsumer) {
-
-	}
-
-	@Override
-	public JdbcMapping getJdbcMapping(int index) {
-		throw new IndexOutOfBoundsException( index );
-	}
-
-	@Override
-	public int forEachJdbcType(
-			int offset, IndexedConsumer<JdbcMapping> action) {
-		return 0;
-	}
-
-	@Override
-	public Object disassemble(Object value, SharedSessionContractImplementor session) {
-		return null;
-	}
-
-	@Override
-	public <X, Y> int forEachDisassembledJdbcValue(
-			Object value,
-			int offset,
-			X x,
-			Y y,
-			JdbcValuesBiConsumer<X, Y> valuesConsumer,
-			SharedSessionContractImplementor session) {
-		return 0;
-	}
-
-	@Override
-	public boolean isExplicitPolymorphism() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public SqmMultiTableMutationStrategy getSqmMultiTableMutationStrategy() {
-		return null;
-	}
-
-	@Override
-	public SqmMultiTableInsertStrategy getSqmMultiTableInsertStrategy() {
-		return null;
-	}
-
-	@Override
-	public AttributeMapping findDeclaredAttributeMapping(String name) {
-		return null;
-	}
-
-	@Override
-	public AttributeMappingsMap getDeclaredAttributeMappings() {
-		return null;
-	}
-
-	@Override
-	public void visitDeclaredAttributeMappings(Consumer<? super AttributeMapping> action) {
-
-	}
-
-	public boolean isSubclassEntityName(String entityName) {
-		return Custom.class.getName().equals(entityName);
-	}
-
-	public boolean hasProxy() {
-		return false;
-	}
-
-	public boolean hasCollections() {
-		return false;
-	}
-
-	public boolean hasCascades() {
-		return false;
-	}
-
-	@Override
-	public boolean hasCascadeDelete() {
-		return false;
-	}
-
-	@Override
-	public boolean hasToOnes() {
-		return false;
-	}
-
-	@Override
-	public boolean hasCascadePersist() {
-		return false;
-	}
-
-	@Override
-	public boolean hasOwnedCollections() {
-		return false;
-	}
-
-	public boolean isMutable() {
-		return true;
-	}
-
-	public boolean isSelectBeforeUpdateRequired() {
-		return false;
-	}
-
-	public boolean isIdentifierAssignedByInsert() {
-		return false;
-	}
-
-	public Boolean isTransient(Object object, SharedSessionContractImplementor session) {
-		return ( (Custom) object ).id==null;
-	}
-
-	@Override
-	public Object[] getPropertyValuesToInsert(Object object, Map mergeMap, SharedSessionContractImplementor session) {
-		return getPropertyValues( object );
-	}
-
-	public void processInsertGeneratedProperties(Object id, Object entity, Object[] state, GeneratedValues generatedValues, SharedSessionContractImplementor session) {
-	}
-
-	public void processUpdateGeneratedProperties(Object id, Object entity, Object[] state, GeneratedValues generatedValues, SharedSessionContractImplementor session) {
-	}
-
-	@Override
-	public Class<?> getConcreteProxyClass() {
-		return Custom.class;
-	}
-
-	@Override
-	public void setPropertyValues(Object object, Object[] values) {
-		setPropertyValue( object, 0, values[0] );
-	}
-
-	@Override
-	public void setPropertyValue(Object object, int i, Object value) {
-		( (Custom) object ).setName( (String) value );
-	}
-
-	@Override
-	public Object[] getPropertyValues(Object object) throws HibernateException {
-		Custom c = (Custom) object;
-		return new Object[] { c.getName() };
-	}
-
-	@Override
-	public Object getPropertyValue(Object object, int i) throws HibernateException {
-		return ( (Custom) object ).getName();
-	}
-
-	@Override
-	public Object getPropertyValue(Object object, String propertyName) throws HibernateException {
-		return ( (Custom) object ).getName();
-	}
-
-	@Override
-	public Serializable getIdentifier(Object entity, SharedSessionContractImplementor session) {
-		return ( (Custom) entity ).id;
-	}
-
-	@Override
-	public void setIdentifier(Object entity, Object id, SharedSessionContractImplementor session) {
-		( (Custom) entity ).id = (String) id;
-	}
-
-	@Override
-	public Object getVersion(Object object) throws HibernateException {
-		return null;
-	}
-
-	@Override
-	public Object instantiate(Object id, SharedSessionContractImplementor session) {
-		Custom c = new Custom();
-		c.id = (String) id;
-		return c;
-	}
-
-	@Override
-	public boolean isInstance(Object object) {
-		return object instanceof Custom;
-	}
-
-	@Override
-	public boolean hasUninitializedLazyProperties(Object object) {
-		return false;
-	}
-
-	@Override
-	public void resetIdentifier(Object entity, Object currentId, Object currentVersion, SharedSessionContractImplementor session) {
-		( ( Custom ) entity ).id = ( String ) currentId;
-	}
-
-	public EntityPersister getSubclassEntityPersister(Object instance, SessionFactoryImplementor factory) {
-		return this;
-	}
-
-	public int[] findDirty(
-		Object[] x,
-		Object[] y,
-		Object owner,
-		SharedSessionContractImplementor session) throws HibernateException {
-		if ( !Objects.equals( x[0], y[0] ) ) {
-			return new int[] { 0 };
-		}
-		else {
-			return null;
-		}
-	}
-
-	public int[] findModified(
-		Object[] x,
-		Object[] y,
-		Object owner,
-		SharedSessionContractImplementor session) throws HibernateException {
-		if ( !Objects.equals( x[0], y[0] ) ) {
-			return new int[] { 0 };
-		}
-		else {
-			return null;
-		}
-	}
-
-	/**
-	 * @see EntityPersister#hasIdentifierProperty()
-	 */
-	public boolean hasIdentifierProperty() {
-		return true;
-	}
-
-	/**
-	 * @see EntityPersister#isVersioned()
-	 */
-	public boolean isVersioned() {
-		return false;
-	}
-
-	/**
-	 * @see EntityPersister#getVersionType()
-	 */
-	public BasicType<?> getVersionType() {
-		return null;
-	}
-
-	/**
-	 * @see EntityPersister#getVersionPropertyIndex()
-	 */
-	public int getVersionPropertyIndex() {
-		return 0;
-	}
-
-	/**
-	 * @see EntityPersister#getIdentifierGenerator()
-	 */
-	public IdentifierGenerator getIdentifierGenerator()
-	throws HibernateException {
-		return GENERATOR;
-	}
-
-	/**
-	 * @see EntityPersister#load(Object, Object, LockOptions, SharedSessionContractImplementor)
-	 */
-	public Object load(
-			Object id,
-			Object optionalObject,
-			LockOptions lockOptions,
-			SharedSessionContractImplementor session
-	) throws HibernateException {
-		return load(id, optionalObject, lockOptions.getLockMode(), session);
-	}
-
-	@Override
-	public List<?> multiLoad(Object[] ids, SharedSessionContractImplementor session, MultiIdLoadOptions loadOptions) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @see EntityPersister#load(Object, Object, LockMode, SharedSessionContractImplementor)
-	 */
-	public Object load(
-			Object id,
-			Object optionalObject,
-			LockMode lockMode,
-			SharedSessionContractImplementor session) {
-
-		throw new UnsupportedOperationException();
-//
-//		// fails when optional object is supplied
-//
-//		Custom clone = null;
-//		Custom obj = (Custom) INSTANCES.get(id);
-//		if (obj!=null) {
-//			clone = (Custom) obj.clone();
-//			TwoPhaseLoad.addUninitializedEntity(
-//					session.generateEntityKey( id, this ),
-//					clone,
-//					this,
-//					LockMode.NONE,
-//					session
-//			);
-//			TwoPhaseLoad.postHydrate(
-//					this,
-//					id,
-//					new String[] { obj.getName() },
-//					null,
-//					clone,
-//					LockMode.NONE,
-//					session
-//			);
-//			TwoPhaseLoad.initializeEntity(
-//					clone,
-//					false,
-//					session,
-//					new PreLoadEvent( (EventSource) session )
-//			);
-//			TwoPhaseLoad.afterInitialize( clone, session );
-//			TwoPhaseLoad.postLoad( clone, session, new PostLoadEvent( (EventSource) session ) );
-//		}
-//		return clone;
-	}
-
-	/**
-	 * @see EntityPersister#lock(Object, Object, Object, LockMode, EventSource)
-	 */
-	@Override
-	public void lock(
-			Object id,
-			Object version,
-			Object object,
-			LockOptions lockOptions,
-			SharedSessionContractImplementor session
-	) throws HibernateException {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @see EntityPersister#lock(Object, Object, Object, LockMode, EventSource)
-	 */
-	public void lock(
-			Object id,
-			Object version,
-			Object object,
-			LockMode lockMode,
-			SharedSessionContractImplementor session
-	) throws HibernateException {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public InsertCoordinator getInsertCoordinator() {
-		return new InsertCoordinator() {
-			@Override
-			public @Nullable GeneratedValues insert(
-					Object entity,
-					Object[] values,
-					SharedSessionContractImplementor session) {
-				throw new UnsupportedOperationException();
-			}
-
-			@Override
-			public @Nullable GeneratedValues insert(
-					Object entity,
-					Object id,
-					Object[] values,
-					SharedSessionContractImplementor session) {
-				INSTANCES.put( id, ( (Custom) entity ).clone() );
-				return null;
-			}
-
-			@Override
-			public MutationOperationGroup getStaticMutationOperationGroup() {
-				return null;
-			}
-		};
-	}
-
-	@Override
-	public UpdateCoordinator getUpdateCoordinator() {
-		return new UpdateCoordinator() {
-			@Override
-			public @Nullable GeneratedValues update(
-					Object entity,
-					Object id,
-					Object rowId,
-					Object[] values,
-					Object oldVersion,
-					Object[] incomingOldValues,
-					int[] dirtyAttributeIndexes,
-					boolean hasDirtyCollection,
-					SharedSessionContractImplementor session) {
-				INSTANCES.put( id, ( (Custom) entity ).clone() );
-				return null;
-			}
-
-			@Override
-			public void forceVersionIncrement(
-					Object id,
-					Object currentVersion,
-					Object nextVersion,
-					SharedSessionContractImplementor session) {
-			}
-
-			@Override
-			public MutationOperationGroup getStaticMutationOperationGroup() {
-				return null;
-			}
-		};
-	}
-
-	@Override
-	public DeleteCoordinator getDeleteCoordinator() {
-		return new DeleteCoordinator() {
-			@Override
-			public void delete(Object entity, Object id, Object version, SharedSessionContractImplementor session) {
-				INSTANCES.remove( id );
-			}
-
-			@Override
-			public MutationOperationGroup getStaticMutationOperationGroup() {
-				return null;
-			}
-		};
-	}
-
-	private static final BasicType<String> STRING_TYPE = new BasicTypeImpl<>(
-			StringJavaType.INSTANCE,
-			VarcharJdbcType.INSTANCE
-	);
-	private static final Type[] TYPES = new Type[] { STRING_TYPE };
-	private static final String[] NAMES = new String[] { "name" };
-	private static final boolean[] MUTABILITY = new boolean[] { true };
-	private static final boolean[] GENERATION = new boolean[] { false };
-
-	public Type[] getPropertyTypes() {
-		return TYPES;
-	}
-
-	public String[] getPropertyNames() {
-		return NAMES;
-	}
-
-	public CascadeStyle[] getPropertyCascadeStyles() {
-		return null;
-	}
-
-	public Type getIdentifierType() {
-		return STRING_TYPE;
-	}
-
-	public String getIdentifierPropertyName() {
-		return "id";
-	}
-
-	public boolean hasCache() {
-		return false;
-	}
-
-	public EntityDataAccess getCacheAccessStrategy() {
-		return null;
-	}
-
-	public boolean hasNaturalIdCache() {
-		return false;
-	}
-
-	public NaturalIdDataAccess getNaturalIdCacheAccessStrategy() {
-		return null;
-	}
-
-	public String getRootEntityName() {
-		return "CUSTOMS";
-	}
-
-	public String[] getPropertySpaces() {
-		return new String[] { "CUSTOMS" };
-	}
-
-	public Serializable[] getQuerySpaces() {
-		return new String[] { "CUSTOMS" };
-	}
-
-	public boolean[] getPropertyUpdateability() {
-		return MUTABILITY;
-	}
-
-	public boolean[] getPropertyCheckability() {
-		return MUTABILITY;
-	}
-
-	public boolean[] getPropertyInsertability() {
-		return MUTABILITY;
-	}
-
-	public boolean canExtractIdOutOfEntity() {
-		return true;
-	}
-
-	public Type getPropertyType(String propertyName) {
-		throw new UnsupportedOperationException();
-	}
-
-	public Object createProxy(Object id, SharedSessionContractImplementor session)
-		throws HibernateException {
-		throw new UnsupportedOperationException("no proxy for this class");
-	}
-
-	public Object getCurrentVersion(
-			Object id,
-			SharedSessionContractImplementor session)
-		throws HibernateException {
-
-		return INSTANCES.get(id);
-	}
-
-	@Override
-	public Object forceVersionIncrement(Object id, Object currentVersion, SharedSessionContractImplementor session)
-			throws HibernateException {
-		return null;
-	}
-
-	@Override
-	public boolean[] getPropertyNullability() {
-		return MUTABILITY;
-	}
-
-	@Override
-	public boolean isCacheInvalidationRequired() {
-		return false;
-	}
-
-	@Override
-	public void afterInitialize(Object entity, SharedSessionContractImplementor session) {
-	}
-
-	@Override
-	public void afterReassociate(Object entity, SharedSessionContractImplementor session) {
-	}
-
-	@Override
-	public Object[] getDatabaseSnapshot(Object id, SharedSessionContractImplementor session) throws HibernateException {
-		return null;
-	}
-
-	@Override
-	public Object getIdByUniqueKey(Object key, String uniquePropertyName, SharedSessionContractImplementor session) {
-		throw new UnsupportedOperationException( "not supported" );
-	}
-
-	@Override
-	public boolean[] getPropertyVersionability() {
-		return MUTABILITY;
-	}
-
-	@Override
-	public CacheEntryStructure getCacheEntryStructure() {
-		return UnstructuredCacheEntry.INSTANCE;
-	}
-
-	@Override
-	public CacheEntry buildCacheEntry(
-			Object entity, Object[] state, Object version, SharedSessionContractImplementor session) {
-		return new StandardCacheEntryImpl(
-				state,
-				this,
-				version,
-				session,
-				entity
-		);
-	}
-
-	@Override
-	public boolean hasSubselectLoadableCollections() {
-		return false;
-	}
-
-	@Override
-	public boolean hasCollectionNotReferencingPK() {
-		return false;
-	}
-
-	@Override
-	public int[] getNaturalIdentifierProperties() {
-		return null;
-	}
-
-	@Override
-	public boolean hasNaturalIdentifier() {
-		return false;
-	}
-
-	@Override
-	public boolean hasMutableProperties() {
-		return false;
-	}
-
-	@Override
-	public boolean isInstrumented() {
-		return false;
-	}
-
-	@Override
-	public boolean hasInsertGeneratedProperties() {
-		return false;
-	}
-
-	@Override
-	public boolean hasUpdateGeneratedProperties() {
-		return false;
-	}
-
-	@Override
-	public boolean[] getPropertyLaziness() {
-		return null;
-	}
-
-	@Override
-	public boolean isLazyPropertiesCacheable() {
-		return true;
-	}
-
-	@Override
-	public boolean canReadFromCache() {
-		return false;
-	}
-
-	@Override
-	public boolean canWriteToCache() {
-		return false;
-	}
-
-	@Override
-	public boolean isVersionPropertyGenerated() {
-		return false;
-	}
-
-	@Override
-	public Object[] getNaturalIdentifierSnapshot(Object id, SharedSessionContractImplementor session) throws HibernateException {
-		return null;
-	}
-
-	@Override
-	public Serializable loadEntityIdByNaturalId(Object[] naturalIdValues, LockOptions lockOptions,
-			SharedSessionContractImplementor session) {
-		return null;
-	}
-
-	@Override
-	public EntityMetamodel getEntityMetamodel() {
-		return this;
-	}
-
-	@Override
-	public BytecodeEnhancementMetadata getInstrumentationMetadata() {
-		return new BytecodeEnhancementMetadataNonPojoImpl( getEntityName() );
-	}
-
-	@Override
-	public FilterAliasGenerator getFilterAliasGenerator(String rootAlias) {
-		return new StaticFilterAliasGenerator(rootAlias);
-	}
-
-	@Override
-	public EntityPersister getEntityPersister() {
-		return this;
-	}
-
-	@Override
-	public EntityIdentifierMapping getIdentifierMapping() {
-		return null;
-	}
-
-	@Override
-	public EntityVersionMapping getVersionMapping() {
-		return null;
-	}
-
-	@Override
-	public EntityRowIdMapping getRowIdMapping() {
-		return null;
-	}
-
-	@Override
-	public void visitConstraintOrderedTables(ConstraintOrderedTableConsumer consumer) {
-
-	}
-
-	@Override
-	public EntityDiscriminatorMapping getDiscriminatorMapping() {
-		return null;
-	}
-
-	@Override
-	public Object getDiscriminatorValue() {
-		return null;
-	}
-
-	@Override
-	public NaturalIdMapping getNaturalIdMapping() {
-		return null;
-	}
-
-	@Override
-	public boolean isTypeOrSuperType(EntityMappingType targetType) {
-		return targetType == this;
-	}
-
-	@Override
-	public EntityRepresentationStrategy getRepresentationStrategy() {
-		return null;
-	}
-
-	@Override
-	public int[] resolveAttributeIndexes(String[] attributeNames) {
-		return null;
-	}
-
-	@Override
-	public boolean canUseReferenceCacheEntries() {
-		return false;  //To change body of implemented methods use File | Settings | File Templates.
-	}
-
-	@Override
-	public boolean useShallowQueryCacheLayout() {
-		return false;
-	}
-
-	@Override
-	public boolean storeDiscriminatorInShallowQueryCacheLayout() {
-		return false;
-	}
-
-	@Override
-	public boolean hasFilterForLoadByKey() {
-		return false;
-	}
-
-	@Override
-	public Iterable<UniqueKeyEntry> uniqueKeyEntries() {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public String getSelectByUniqueKeyString(String propertyName) {
-		return null;
-	}
-
-	@Override
-	public String getSelectByUniqueKeyString(String[] propertyNames, String[] columnNames) {
-		return null;
-	}
-
-	@Override
-	public String getIdentitySelectString() {
-		return null;
-	}
-
-	@Override
-	public String[] getIdentifierColumnNames() {
-		return new String[0];
-	}
-
-	@Override
-	public String[] getRootTableKeyColumnNames() {
-		return new String[0];
-	}
-
-	@Override
-	public boolean isAffectedByEntityGraph(LoadQueryInfluencers loadQueryInfluencers) {
-		return loadQueryInfluencers.getEffectiveEntityGraph().getGraph() != null;
-	}
-
-	@Override
-	public boolean isAffectedByEnabledFetchProfiles(LoadQueryInfluencers loadQueryInfluencers) {
-		return false;
-	}
-
-	@Override
-	public boolean isAffectedByEnabledFilters(LoadQueryInfluencers influencers, boolean onlyApplyForLoadByKeyFilters) {
-		return false;
-	}
-
-	@Override
-	public AttributeMappingsList getAttributeMappings() {
-		return null;
-	}
-
-	@Override
-	public void forEachAttributeMapping(Consumer<? super AttributeMapping> action) {
-
-	}
-
-	@Override
-	public JavaType getMappedJavaType() {
-		return null;
-	}
-
-	@Override
-	public EntityMappingType getTargetPart() {
-		return null;
-	}
-
-	@Override
-	public void forEachMutableTable(Consumer<EntityTableMapping> consumer) {
-
-	}
-
-	@Override
-	public void forEachMutableTableReverse(Consumer<EntityTableMapping> consumer) {
-
-	}
-
-	@Override
-	public String getIdentifierTableName() {
-		return null;
-	}
-
-	@Override
-	public EntityTableMapping getIdentifierTableMapping() {
-		return null;
-	}
-
-	@Override
-	public ModelPart getIdentifierDescriptor() {
-		return null;
-	}
-
-	@Override
-	public GeneratedValuesMutationDelegate getInsertDelegate() {
-		return null;
-	}
-
-	@Override
-	public GeneratedValuesMutationDelegate getUpdateDelegate() {
-		return null;
-	}
-
-	@Override
-	public String getTableName() {
-		return "";
-	}
-
-	@Override
-	public String[] getIdentifierAliases(String suffix) {
-		return new String[0];
-	}
-
-	@Override
-	public String getRootTableName() {
-		return "";
-	}
-
-	@Override
-	public String[] getRootTableIdentifierColumnNames() {
-		return new String[0];
-	}
-
-	@Override
-	public String getVersionColumnName() {
-		return "";
-	}
-
-	@Override
-	public String[] getPropertyAliases(String suffix, int i) {
-		return new String[0];
-	}
-
-	@Override
-	public String getDiscriminatorAlias(String suffix) {
-		return "";
-	}
-
-	@Override
-	public String getDiscriminatorColumnName() {
-		return "";
-	}
-
-	@Override
-	public Type getDiscriminatorType() {
-		return null;
-	}
-
-	@Override
-	public boolean hasRowId() {
-		return false;
-	}
-
-	@Override
-	public String[] getSubclassPropertyColumnAliases(String propertyName, String suffix) {
-		return new String[0];
-	}
-
-	@Override
-	public String[] getPropertyColumnNames(String propertyPath) {
-		return new String[0];
-	}
-
-	@Override
-	public String selectFragment(String alias, String suffix) {
-		return "";
-	}
-
-	@Override
-	public DiscriminatorType<?> getDiscriminatorDomainType() {
-		return null;
-	}
-
-	@Override
-	public String[] toColumns(String propertyName) {
-		return new String[0];
-	}
-
-	@Override
-	public boolean[] getNonLazyPropertyUpdateability() {
-		return new boolean[0];
-	}
-
-	@Override
-	public boolean hasMultipleTables() {
-		return false;
-	}
-
-	@Override
-	public String[] getTableNames() {
-		return new String[0];
-	}
-
-	@Override
-	public String getTableName(int j) {
-		return "";
-	}
-
-	@Override
-	public String[] getKeyColumns(int j) {
-		return new String[0];
-	}
-
-	@Override
-	public int getTableSpan() {
-		return 0;
-	}
-
-	@Override
-	public boolean isInverseTable(int j) {
-		return false;
-	}
-
-	@Override
-	public boolean isNullableTable(int j) {
-		return false;
-	}
-
-	@Override
-	public boolean hasDuplicateTables() {
-		return false;
-	}
-
-	@Override
-	public int getSubclassTableSpan() {
-		return 0;
-	}
-
-	@Override
-	public String getSubclassTableName(int j) {
-		return "";
-	}
-
-	@Override
-	public String getTableNameForColumn(String columnName) {
-		return "";
-	}
-
-	@Override
-	public String[] getSubclassPropertyColumnNames(int i) {
-		return new String[0];
-	}
-
-	@Override
-	public int countSubclassProperties() {
-		return 0;
-	}
-
-	@Override
-	public boolean isSharedColumn(String columnExpression) {
-		return false;
-	}
-
-	@Override
-	public String[][] getConstraintOrderedTableKeyColumnClosure() {
-		return new String[0][];
-	}
-
-	@Override
-	public EntityTableMapping[] getTableMappings() {
-		return new EntityTableMapping[0];
-	}
-
-	@Override
-	public String physicalTableNameForMutation(SelectableMapping selectableMapping) {
-		return "";
-	}
-
-	@Override
-	public void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
-
-	}
-
-	@Override
-	public void addSoftDeleteToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
-
-	}
-
-	@Override
-	public String getAttributeMutationTableName(int i) {
-		return "";
-	}
-
-	@Override
-	public boolean managesColumns(String[] columnNames) {
-		return false;
-	}
-
-	@Override
-	public boolean hasPreInsertGeneratedProperties() {
-		return false;
-	}
-
-	@Override
-	public boolean hasPreUpdateGeneratedProperties() {
-		return false;
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadingSmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadingSmokeTests.java
index b08bdfbb1d5e..9c135e437b6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadingSmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadingSmokeTests.java
@@ -80,7 +80,7 @@ public void deleteTestData(SessionFactoryScope scope) {
 				session -> {
 					session.doWork(
 							connection -> {
-								connection.prepareStatement( "delete from BasicEntity" ).execute();
+								connection.prepareStatement( "delete from BasicEntity where 1=1" ).execute();
 							}
 					);
 				}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java
index dbdc5d4a2148..436601b535b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java
@@ -22,6 +22,7 @@
 import org.hibernate.loader.ast.internal.LoaderSelectBuilder;
 import org.hibernate.metamodel.MappingMetamodel;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
@@ -74,15 +75,16 @@ public void baseline(SessionFactoryScope scope) {
 				new LockOptions(),
 				jdbcParameter -> {
 				},
+				new SqlAliasBaseManager(),
 				sessionFactory
 		);
 
 		assertThat( sqlAst.getDomainResultDescriptors().size(), is( 1 ) );
 
-		final DomainResult domainResult = sqlAst.getDomainResultDescriptors().get( 0 );
+		final DomainResult<?> domainResult = sqlAst.getDomainResultDescriptors().get( 0 );
 		assertThat( domainResult, instanceOf( EntityResult.class ) );
 
-		final EntityResult entityResult = (EntityResult) domainResult;
+		final EntityResult<?> entityResult = (EntityResult<?>) domainResult;
 		final ImmutableFetchList fetches = entityResult.getFetches();
 
 		// name + both lists
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleEntityGraphTest.java
index 4bf66471097b..c9d9833ed3a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleEntityGraphTest.java
@@ -49,7 +49,7 @@ public class FindMultipleEntityGraphTest {
 			assertTrue(Hibernate.isInitialized(all.get(1).owner));
 		});
 	}
-	@Entity
+	@Entity(name = "Record")
 	static class Record {
 		@Id Long id;
 		String message;
@@ -66,7 +66,7 @@ static class Record {
 		Record() {
 		}
 	}
-	@Entity
+	@Entity(name = "Owner")
 	static class Owner {
 		@Id String name;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleFetchProfileTest.java
index 512d68e559d9..d5f80827f2bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleFetchProfileTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleFetchProfileTest.java
@@ -51,7 +51,7 @@ public class FindMultipleFetchProfileTest {
 			assertTrue(Hibernate.isInitialized(all.get(1).owner));
 		});
 	}
-	@Entity
+	@Entity(name = "Record")
 	@FetchProfile(name = "withOwner")
 	static class Record {
 		@Id Long id;
@@ -70,7 +70,7 @@ static class Record {
 		Record() {
 		}
 	}
-	@Entity
+	@Entity(name = "Owner")
 	static class Owner {
 		@Id String name;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleFromCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleFromCacheTest.java
index af2cb21d6c47..499034f9409d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleFromCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMultipleFromCacheTest.java
@@ -52,7 +52,8 @@ public class FindMultipleFromCacheTest {
 		assertEquals( 2,
 				scope.getSessionFactory().getStatistics().getSecondLevelCacheHitCount() );
 	}
-	@Entity @Cacheable
+	@Entity(name = "Record")
+	@Cacheable
 	static class Record {
 		@Id Long id;
 		String message;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMutipleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMutipleTest.java
index 9c758697a571..f8b67cd38a4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMutipleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/FindMutipleTest.java
@@ -46,7 +46,7 @@ public class FindMutipleTest {
 			assertSame(record, all.get(0));
 		});
 	}
-	@Entity
+	@Entity(name = "Record")
 	static class Record {
 		@Id Long id;
 		String message;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/GetMultipleEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/GetMultipleEntityGraphTest.java
index 751473f13941..49d0326cf8b3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/GetMultipleEntityGraphTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/GetMultipleEntityGraphTest.java
@@ -49,7 +49,7 @@ public class GetMultipleEntityGraphTest {
 			assertTrue(Hibernate.isInitialized(all.get(1).owner));
 		});
 	}
-	@Entity
+	@Entity(name = "Record")
 	static class Record {
 		@Id Long id;
 		String message;
@@ -66,7 +66,7 @@ static class Record {
 		Record() {
 		}
 	}
-	@Entity
+	@Entity(name = "Owner")
 	static class Owner {
 		@Id String name;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadLockingTest.java
index 7b7a75820816..8e77a369c22e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadLockingTest.java
@@ -17,8 +17,10 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -150,6 +152,7 @@ public void tearDown(SessionFactoryScope scope) {
 
 	// (1) simple Id entity w/ pessimistic read lock
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSelectLocking.class )
 	void testMultiLoadSimpleIdEntityPessimisticReadLock(SessionFactoryScope scope) {
 		final String lockString = scope.getSessionFactory()
 				.getJdbcServices()
@@ -188,6 +191,7 @@ void testMultiLoadSimpleIdEntityPessimisticReadLock(SessionFactoryScope scope) {
 
 	// (2) composite Id entity w/ pessimistic read lock (one of the entities already in L1C)
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSelectLocking.class )
 	void testMultiLoadCompositeIdEntityPessimisticReadLockAlreadyInSession(SessionFactoryScope scope) {
 		final String lockString = scope.getSessionFactory()
 				.getJdbcServices()
@@ -244,6 +248,7 @@ void testMultiLoadCompositeIdEntityPessimisticReadLockAlreadyInSession(SessionFa
 
 	// (3) simple Id entity w/ pessimistic write lock (one in L1C & some in L2C)
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSelectLocking.class )
 	public void testMultiLoadSimpleIdEntityPessimisticWriteLockSomeInL1CAndSomeInL2C(SessionFactoryScope scope) {
 		final Integer userInL2CId = userIds.get(0);
 		final Integer userInL1CId = userIds.get(1);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiNaturalIdLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiNaturalIdLoadTest.java
index d80206460219..e98ac8ec7352 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiNaturalIdLoadTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiNaturalIdLoadTest.java
@@ -22,8 +22,11 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -82,14 +85,12 @@ public void testBasicUnorderedMultiLoad(SessionFactoryScope scope) {
 							.multiLoad( "Entity1","Entity2","Entity3","Entity4","Entity5" );
 					assertEquals( 5, results.size() );
 
+					Set<Integer> ids = new HashSet<>( Arrays.asList( 1, 2, 3, 4, 5 ) );
 					Iterator<SimpleNaturalIdEntity> it = results.iterator();
-					for ( int i = 1; i <= 5; i++ ) {
-						SimpleNaturalIdEntity se= it.next();
-						if ( i == se.getId() ) {
-							it.remove();
-						}
+					for ( SimpleNaturalIdEntity se: results ) {
+						ids.remove( se.getId() );
 					}
-					assertEquals( 0, results.size() );
+					assertEquals( 0, ids.size() );
 
 					final int paramCount = StringHelper.countUnquoted(
 							statementInspector.getSqlQueries().get( 0 ),
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/InflaterInputStreamBlobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/InflaterInputStreamBlobTest.java
index 3db1c09b4335..6f9d211c43f1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/InflaterInputStreamBlobTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/InflaterInputStreamBlobTest.java
@@ -86,7 +86,7 @@ private static byte[] getRandomBytes() {
 		return bytes;
 	}
 
-	@Entity
+	@Entity(name = "TestEntity")
 	public static class TestEntity {
 
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobEntity.java
index 3e65a0b59b5f..d46adf916391 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobEntity.java
@@ -6,6 +6,8 @@
 
 import java.sql.Blob;
 
+import jakarta.persistence.Access;
+import jakarta.persistence.AccessType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -32,6 +34,7 @@ public void setId(Long id) {
 
 	@Lob
 	@Column(length = BLOB_LENGTH)
+	@Access( AccessType.FIELD )
 	private Blob blob;
 
 	public Blob getBlob() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java
index 942031c6d8e7..6b87f4cfa662 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java
@@ -9,6 +9,7 @@
 import java.sql.SQLException;
 import java.util.List;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.query.Query;
 
@@ -17,6 +18,7 @@
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -98,6 +100,7 @@ public void testHqlQuery(SessionFactoryScope scope) {
 	@Test
 	@JiraKey(value = "HHH-11477")
 	@RequiresDialect(PostgreSQLDialect.class)
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support lo_get function")
 	public void testUsingStringLobAnnotatedPropertyInNativeQuery(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			final List<TestEntity> results = session.createNativeQuery(
@@ -127,6 +130,7 @@ public void testUsingStringLobAnnotatedPropertyInNativeQuery(SessionFactoryScope
 	@Test
 	@JiraKey(value = "HHH-11477")
 	@RequiresDialect(PostgreSQLDialect.class)
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support lo_get function")
 	public void testSelectStringLobAnnotatedInNativeQuery(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			final List<String> results = session.createNativeQuery(
@@ -145,6 +149,7 @@ public void testSelectStringLobAnnotatedInNativeQuery(SessionFactoryScope scope)
 	@Test
 	@JiraKey(value = "HHH-11477")
 	@RequiresDialect(PostgreSQLDialect.class)
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support lo_get function")
 	public void testUsingLobPropertyInNativeQuery(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			final List<String> results = session.createNativeQuery(
@@ -163,6 +168,7 @@ public void testUsingLobPropertyInNativeQuery(SessionFactoryScope scope) {
 	@Test
 	@JiraKey(value = "HHH-11477")
 	@RequiresDialect(PostgreSQLDialect.class)
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support lo_get function")
 	public void testSelectClobPropertyInNativeQuery(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			final List<byte[]> results = session.createNativeQuery(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java
index 3aa60a33b8ad..b678accbbb9a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/PostgreSqlLobStringTest.java
@@ -9,6 +9,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -16,6 +17,7 @@
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -97,6 +99,7 @@ public void testBadClobDataSavedAsStringFails(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support lo_get function")
 	public void testBadClobDataSavedAsStringWorksAfterUpdate(SessionFactoryScope scope) {
 		scope.inTransaction(session -> session.doWork( connection -> {
 			try (Statement statement = connection.createStatement()) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/CurrentTimestampVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/CurrentTimestampVersionTest.java
index 0b13cd9e1206..e76ebe383568 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/CurrentTimestampVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/CurrentTimestampVersionTest.java
@@ -47,7 +47,7 @@ void tearDown(EntityManagerFactoryScope factoryScope) {
 		// TODO: assert some stuff about the timestamp values
 	}
 
-	@Entity
+	@Entity(name = "Timestamped")
 	static class Timestamped {
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/ExplicitLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/ExplicitLockingTest.java
index de44d88ab7ab..c313f7448e15 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/ExplicitLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/ExplicitLockingTest.java
@@ -20,10 +20,12 @@
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.query.Query;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.jboss.logging.Logger;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -58,6 +60,7 @@ public void tearDown(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsLockTimeouts.class )
 	public void testJPALockTimeout(EntityManagerFactoryScope scope) {
 		Person p = scope.fromTransaction( entityManager -> {
 			Person person = new Person("John Doe");
@@ -104,6 +107,7 @@ public void testJPALockScope(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature =  DialectFeatureChecks.SupportNoWait.class )
 	public void testSessionLock(EntityManagerFactoryScope scope) {
 		final SQLStatementInspector sqlCollector = scope.getCollectingStatementInspector();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritancePessimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritancePessimisticLockingTest.java
index 4db38615b436..0965cad012e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritancePessimisticLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritancePessimisticLockingTest.java
@@ -12,11 +12,9 @@
 import jakarta.persistence.InheritanceType;
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.Version;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.Jpa;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -57,8 +55,6 @@ public void tearDown(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "Informix disallows FOR UPDATE with multi-table queries")
 	public void findWithLock(EntityManagerFactoryScope scope) {
 		scope.inTransaction(entityManager -> {
 			BaseThing t = entityManager.find( BaseThing.class, 1L, LockModeType.PESSIMISTIC_WRITE );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java
index 312a0ed98c8a..14a4c82d1efc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java
@@ -232,6 +232,7 @@ public void testRefreshWithExplicitLowerLevelLockMode() {
 	@Test
 	@JiraKey(value = "HHH-12257")
 	@SkipForDialect( dialectClass = CockroachDialect.class )
+	@RequiresDialectFeature( feature =  DialectFeatureChecks.SupportNoWait.class )
 	public void testRefreshWithExplicitHigherLevelLockMode1() {
 		doInHibernate( this::sessionFactory, session -> {
 						A a = session.find( A.class, id );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedAndCascadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedAndCascadingTest.java
index ed945bad6525..273e3fcff8fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedAndCascadingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedAndCascadingTest.java
@@ -6,10 +6,8 @@
 
 import org.hibernate.Hibernate;
 
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -57,8 +55,6 @@ public void tearDown(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "Informix disallows FOR UPDATE with multi-table queries")
 	public void testRefreshBeforeRead(EntityManagerFactoryScope scope) {
 		scope.inTransaction(entityManager -> {
 			var m = entityManager.find( MainEntity.class, 0L );
@@ -104,8 +100,6 @@ public void testRefresh(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "Informix disallows FOR UPDATE with multi-table queries")
 	public void testRefreshAfterRead(EntityManagerFactoryScope scope) {
 		scope.inTransaction(entityManager -> {
 			var m = entityManager.find( MainEntity.class, 0L );
@@ -129,8 +123,6 @@ public void testRefreshAfterRead(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "Informix disallows FOR UPDATE with multi-table queries")
 	public void testRefreshLockMode(EntityManagerFactoryScope scope) {
 		scope.inTransaction(entityManager -> {
 			var m = entityManager.find( MainEntity.class, 0L );
@@ -156,8 +148,6 @@ public void testRefreshLockMode(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "Informix disallows FOR UPDATE with multi-table queries")
 	public void testFindWithLockMode(EntityManagerFactoryScope scope) {
 		scope.inTransaction(session -> {
 			var mainEntity = session.find( MainEntity.class, 0L, LockModeType.PESSIMISTIC_WRITE );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedTest.java
index 18d889ee975d..f35ca3e7c8a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshReferencedTest.java
@@ -7,11 +7,9 @@
 
 import org.hibernate.Hibernate;
 
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -120,8 +118,6 @@ public void testRefreshAfterRead(EntityManagerFactoryScope scope) {
 
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "Informix disallows FOR UPDATE with multi-table queries")
 	public void testFindWithLockMode(EntityManagerFactoryScope scope) {
 		scope.inTransaction(session -> {
 			var mainEntity = session.find( MainEntity.class, 0L, LockModeType.PESSIMISTIC_WRITE );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockingBasedOnSelectClauseTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockingBasedOnSelectClauseTests.java
index 6d08cc2dc872..93f1f6620627 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockingBasedOnSelectClauseTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockingBasedOnSelectClauseTests.java
@@ -12,14 +12,18 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import org.hibernate.dialect.HSQLDialect;
+import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
 import org.hibernate.testing.orm.transaction.TransactionUtil;
 import org.hibernate.testing.util.ast.HqlHelper;
 import org.hibernate.testing.util.ast.LoadingAstHelper;
@@ -59,6 +63,10 @@ void tearDown(SessionFactoryScope factoryScope) {
 
 	@Test
 	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "See https://sourceforge.net/p/hsqldb/bugs/1734/")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsConcurrentTransactions.class )
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSelectLocking.class )
 	void testBasicHqlUsage(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			session.createQuery( "select b.author from Book b" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticAndPessimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticAndPessimisticLockTest.java
index 89876e8b49cc..4fdeec464579 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticAndPessimisticLockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticAndPessimisticLockTest.java
@@ -11,8 +11,10 @@
 import org.hibernate.LockMode;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
@@ -33,6 +35,7 @@
 @SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 11, minorVersion = 6, microVersion = 2,
 		versionMatchMode = VersionMatchMode.SAME_OR_NEWER,
 		reason = "MariaDB will throw an error DB_RECORD_CHANGED when acquiring a lock on a record that have changed")
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 public class OptimisticAndPessimisticLockTest {
 
 	public Stream<LockMode> pessimisticLockModes() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockModeTest.java
index 9a6b30726c28..f925bd9a4ad9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockModeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockModeTest.java
@@ -14,7 +14,9 @@
 import org.hibernate.dialect.lock.OptimisticEntityLockException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,6 +36,7 @@
 @JiraKey( value = "HHH-5275")
 //@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 15,
 //		reason = "skip this test on Sybase ASE 15.5, but run it on 15.7, see HHH-6820")
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 public class OptimisticLockModeTest extends BaseSessionFactoryFunctionalTest {
 
 	private Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTest.java
index 738d3fdec3ef..76640c7cc230 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/OptimisticLockTest.java
@@ -11,8 +11,10 @@
 import org.hibernate.annotations.OptimisticLock;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.orm.junit.VersionMatchMode;
 import org.jboss.logging.Logger;
@@ -24,6 +26,7 @@
  */
 @SuppressWarnings("JUnitMalformedDeclaration")
 @Jpa(annotatedClasses = OptimisticLockTest.Phone.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 public class OptimisticLockTest {
 	private static final Logger log = Logger.getLogger( OptimisticLockTest.class );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java
index 390cd906d537..1bed17da477c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockTimeoutTest.java
@@ -11,8 +11,10 @@
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.query.Query;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -44,6 +46,7 @@ void tearDown(SessionFactoryScope factoryScope) {
 	@RequiresDialect(OracleDialect.class)
 	@RequiresDialect(PostgreSQLDialect.class)
 	@RequiresDialect(SQLServerDialect.class)
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNoWait.class )
 	public void testNoWait(SessionFactoryScope factoryScope) {
 		final SQLStatementInspector sqlCollector = factoryScope.getCollectingStatementInspector();
 		sqlCollector.clear();
@@ -64,6 +67,7 @@ public void testNoWait(SessionFactoryScope factoryScope) {
 	@Test
 	@RequiresDialect(OracleDialect.class)
 	@RequiresDialect(PostgreSQLDialect.class)
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSkipLocked.class )
 	public void testSkipLocked(SessionFactoryScope factoryScope) {
 		final SQLStatementInspector sqlCollector = factoryScope.getCollectingStatementInspector();
 		sqlCollector.clear();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockWithAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockWithAliasTest.java
index 8ea284bab4fa..5111bc41ad0a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockWithAliasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/PessimisticWriteLockWithAliasTest.java
@@ -6,9 +6,11 @@
 
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -49,6 +51,7 @@ void tearDown(SessionFactoryScope factoryScope) {
 	@JiraKey("HHH-12866")
 	@RequiresDialect(OracleDialect.class)
 	@RequiresDialect(PostgreSQLDialect.class)
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSelectLocking.class )
 	public void testSetLockModeWithAlias(SessionFactoryScope factoryScope) {
 		var sqlCollector = factoryScope.getCollectingStatementInspector();
 		sqlCollector.clear();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/SelectLockingInDifferentThreadsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/SelectLockingInDifferentThreadsTest.java
new file mode 100644
index 000000000000..2d2b5c247919
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/SelectLockingInDifferentThreadsTest.java
@@ -0,0 +1,193 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.locking;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.OneToMany;
+import org.hibernate.Session;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+@SessionFactory
+@DomainModel(
+		annotatedClasses = {
+				SelectLockingInDifferentThreadsTest.Parent.class,
+				SelectLockingInDifferentThreadsTest.Child.class
+		}
+)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
+public class SelectLockingInDifferentThreadsTest {
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		createEntities( scope );
+		for ( int i = 0; i < 3; i++ ) {
+			selectEntities( scope );
+		}
+	}
+
+	private void selectEntities(SessionFactoryScope scope) {
+		SessionImplementor session1 = scope.getSessionFactory().openSession();
+		SessionImplementor session2 = scope.getSessionFactory().openSession();
+
+		SelectParentPessimisticLock selectParent1 = new SelectParentPessimisticLock( 1L, session1 );
+		SelectParentPessimisticLock selectParent2 = new SelectParentPessimisticLock( 2L, session2 );
+
+		try {
+			selectParent1.start();
+			selectParent2.start();
+
+			selectParent1.join();
+			selectParent2.join();
+		}
+		catch (InterruptedException e) {
+			throw new RuntimeException( e );
+		}
+		finally {
+			session1.close();
+			session2.close();
+		}
+
+		assertThat( selectParent1.getE() ).isNull();
+		assertThat( selectParent2.getE() ).isNull();
+
+		assertThat( selectParent1.getParent() ).isNotNull();
+		assertThat( selectParent1.getParent().getId() ).isEqualTo( 1L );
+		assertThat( selectParent2.getParent() ).isNotNull();
+		assertThat( selectParent2.getParent().getId() ).isEqualTo( 2L );
+	}
+
+	private static void createEntities(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					Parent parent = new Parent( 1L, "parent" );
+					parent.addChild( new Child( 4L, "child1" ) );
+					session.persist( parent );
+
+					Parent parent2 = new Parent( 2L, "parent2" );
+					parent2.addChild( new Child( 5L, "child2" ) );
+					session.persist( parent2 );
+				}
+		);
+	}
+
+	private static class SelectParentPessimisticLock extends Thread {
+
+		private final Long parentId;
+		private final Session session;
+		private Parent parent;
+		private Exception e;
+
+		public SelectParentPessimisticLock(Long parentId, Session session) {
+			this.parentId = parentId;
+			this.session = session;
+		}
+
+		@Override
+		public void run() {
+			session.inTransaction( transaction -> {
+				try {
+					this.parent = session.find( Parent.class, parentId, LockModeType.PESSIMISTIC_WRITE );
+				}
+				catch (Exception e) {
+					this.e = e;
+				}
+			} );
+		}
+
+		public Exception getE() {
+			return e;
+		}
+
+		public Parent getParent() {
+			return parent;
+		}
+	}
+
+	@Entity(name = "Parent")
+	public static class Parent {
+
+		@Id
+		protected Long id;
+
+		protected String name;
+
+		@OneToMany(cascade = {CascadeType.REMOVE, CascadeType.PERSIST}, fetch = FetchType.EAGER)
+		Collection<Child> children = new ArrayList<>();
+
+		public Parent() {
+
+		}
+
+		public Parent(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public Collection<Child> getChildren() {
+			return children;
+		}
+
+		public void addChild(Child child) {
+			children.add( child );
+		}
+	}
+
+	@Entity(name = "Child")
+	public static class Child {
+
+		@Id
+		protected Long id;
+
+		protected String name;
+
+		public Child() {
+		}
+
+		public Child(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeNoWaitLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeNoWaitLockTest.java
index c215a9bfbe2c..919f49cbdfe7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeNoWaitLockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/UpgradeNoWaitLockTest.java
@@ -10,12 +10,10 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import org.hibernate.LockMode;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -31,8 +29,6 @@
 		}
 )
 @SessionFactory
-@SkipForDialect(dialectClass = InformixDialect.class,
-		reason = "Cursor must be on simple SELECT for FOR UPDATE")
 public class UpgradeNoWaitLockTest {
 
 	@AfterEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/FollowOnLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/FollowOnLockingTest.java
index 2e55033c5f5b..c93caba405f5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/FollowOnLockingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/jpa/FollowOnLockingTest.java
@@ -8,7 +8,6 @@
 import java.util.concurrent.TimeUnit;
 
 import org.hibernate.community.dialect.AltibaseDialect;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.OracleDialect;
@@ -39,7 +38,6 @@
 @SkipForDialect(dialectClass = CockroachDialect.class, reason = "Cockroach allows the concurrent access but cancels one or both transactions at the end")
 @SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 11, reason = "Timeouts don't work on Oracle 11 when using a driver other than ojdbc6, but we can't test with that driver")
 @SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase does not support timeout in statement level")
-@SkipForDialect(dialectClass = InformixDialect.class, reason = "Test requires REPEATABLE_READ (and then it passes)")
 //@ServiceRegistry(settings = @Setting(name = AvailableSettings.ISOLATION, value = "REPEATABLE_READ"))
 @Disabled("Work on HHH-19336 (lock scope) is affecting this test in ways I can't figure out yet.  For now, don't run it")
 public class FollowOnLockingTest {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ConnectionLockTimeoutTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ConnectionLockTimeoutTests.java
index 146ccd40896d..3fc798239659 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ConnectionLockTimeoutTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ConnectionLockTimeoutTests.java
@@ -6,11 +6,15 @@
 
 import jakarta.persistence.Timeout;
 import org.hibernate.Timeouts;
+import org.hibernate.JDBCException;
+import org.hibernate.QueryTimeoutException;
 import org.hibernate.community.dialect.GaussDBDialect;
+import org.hibernate.community.dialect.TiDBDialect;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.dialect.lock.spi.ConnectionLockTimeoutStrategy;
 import org.hibernate.dialect.lock.spi.LockingSupport;
+import org.hibernate.exception.LockTimeoutException;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
@@ -19,7 +23,19 @@
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
+import java.sql.SQLException;
+import java.time.Duration;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
@@ -35,7 +51,7 @@ void testSimpleUsage(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> session.doWork( (conn) -> {
 			final int expectedInitialValue;
 			if ( session.getDialect() instanceof MySQLDialect ) {
-				expectedInitialValue = 50;
+				expectedInitialValue = 50_000;
 			}
 			else if ( session.getDialect() instanceof GaussDBDialect ) {
 				expectedInitialValue = 20 * 60 * 1000;
@@ -67,6 +83,91 @@ else if ( session.getDialect() instanceof GaussDBDialect ) {
 		} ) );
 	}
 
+	/**
+	 * Tests that lock_timeout values are correctly handled despite PostgreSQL
+	 * canonical formatting (e.g., "60s" displayed as "1min").
+	 */
+	@Test
+	void testCanonicalLockTimeoutFormat(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> session.doWork( (conn) -> {
+			final int expectedInitialValue;
+			if ( session.getDialect() instanceof MySQLDialect ) {
+				expectedInitialValue = 50_000;
+			}
+			else if ( session.getDialect() instanceof GaussDBDialect ) {
+				expectedInitialValue = 20 * 60 * 1000;
+			}
+			else {
+				expectedInitialValue = Timeouts.WAIT_FOREVER_MILLI;
+			}
+
+			final LockingSupport lockingSupport = session.getDialect().getLockingSupport();
+			final ConnectionLockTimeoutStrategy connectionStrategy = lockingSupport.getConnectionLockTimeoutStrategy();
+			final Timeout initialLockTimeout = connectionStrategy.getLockTimeout( conn, session.getFactory() );
+			assertThat( initialLockTimeout.milliseconds() ).isEqualTo( expectedInitialValue );
+
+			List<Duration> durs;
+			if ( session.getDialect() instanceof TiDBDialect ) {
+				// The supported values are between 1 and 3600 seconds
+				// 3600 means infinite, so it is special
+				durs = List.of(
+					Duration.ofSeconds(1),
+					Duration.ofSeconds(2),
+					Duration.ofSeconds(59),
+					Duration.ofMinutes(1),
+					Duration.ofMinutes(2),
+					Duration.ofMinutes(59)
+				);
+			}
+			else if ( session.getDialect() instanceof MySQLDialect || session.getDialect() instanceof SybaseDialect ) {
+				// The minimum value of innodb_lock_wait_timeout in MySQL is 1 second.
+				// Sybase can configure lock timeouts only in seconds
+				durs = List.of(
+					Duration.ofSeconds(1),
+					Duration.ofSeconds(2),
+					Duration.ofSeconds(59),
+					Duration.ofMinutes(1),
+					Duration.ofMinutes(2),
+					Duration.ofMinutes(59),
+					Duration.ofHours(1),
+					Duration.ofHours(2),
+					Duration.ofHours(23),
+					Duration.ofDays(1)
+				);
+			} else {
+				durs = List.of(
+					Duration.ofMillis(1),
+					Duration.ofMillis(2),
+					Duration.ofMillis(999),
+					Duration.ofSeconds(1),
+					Duration.ofSeconds(2),
+					Duration.ofSeconds(59),
+					Duration.ofMinutes(1),
+					Duration.ofMinutes(2),
+					Duration.ofMinutes(59),
+					Duration.ofHours(1),
+					Duration.ofHours(2),
+					Duration.ofHours(23),
+					Duration.ofDays(1)
+				);
+			}
+
+			try {
+				for ( Duration dur : durs ) {
+					int timeoutInMillis = (int) dur.toMillis();
+					Timeout timeout = Timeout.milliseconds( timeoutInMillis );
+					connectionStrategy.setLockTimeout( timeout, conn, session.getFactory() );
+
+					Timeout adjustedLockTimeout = connectionStrategy.getLockTimeout( conn, session.getFactory() );
+					assertThat( adjustedLockTimeout.milliseconds() ).isEqualTo( timeoutInMillis );
+				}
+			}
+			finally {
+				connectionStrategy.setLockTimeout( Timeout.milliseconds( expectedInitialValue ), conn, session.getFactory() );
+			}
+		} ) );
+	}
+
 	@Test
 	void testSkipLocked(SessionFactoryScope factoryScope) {
 		// this is never supported
@@ -84,14 +185,10 @@ void testSkipLocked(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
-	@SkipForDialect(
-			dialectClass = MySQLDialect.class,
-			reason = "The docs claim 0 is a valid value as 'no wait'; but in my testing, after setting to 0 we get back 1"
-	)
 	@SkipForDialect(
 			dialectClass = SybaseDialect.class,
 			matchSubTypes = true,
-			reason = "Sybase docs say no-wait is supported, but after setting no-wait -1 is returned.  And it unfortunately does not fail setting as no-wait."
+			reason = "Selecting @@lock_timeout unfortunately returns -1 instead of 0 after calling set lock wait 0. testLockNoWait ensures it works correctly though"
 	)
 	void testNoWait(SessionFactoryScope factoryScope) {
 		// this is dependent on the Dialect's ConnectionLockTimeoutType
@@ -101,12 +198,7 @@ void testNoWait(SessionFactoryScope factoryScope) {
 			final ConnectionLockTimeoutStrategy connectionStrategy = lockingSupport.getConnectionLockTimeoutStrategy();
 			final ConnectionLockTimeoutStrategy.Level lockTimeoutType = connectionStrategy.getSupportedLevel();
 			final int initialValue;
-			if ( session.getDialect() instanceof MySQLDialect ) {
-				initialValue = 50;
-			}
-			else {
-				initialValue = Timeouts.WAIT_FOREVER_MILLI;
-			}
+			initialValue = Timeouts.WAIT_FOREVER_MILLI;
 
 			try {
 				connectionStrategy.setLockTimeout( Timeouts.NO_WAIT, conn, session.getFactory() );
@@ -128,4 +220,227 @@ void testNoWait(SessionFactoryScope factoryScope) {
 			}
 		} ) );
 	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.IsJtds.class, reverse = true, comment = "Seems jTDS has a bug?")
+	@DomainModel(annotatedClasses = Names.class)
+	@SessionFactory
+	void testLockWaitTimeout(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.persist( new Names( 1, "foo" ) );
+		} );
+
+		final CountDownLatch updateLatch = new CountDownLatch( 1 );
+		final CountDownLatch blockLatch = new CountDownLatch( 1 );
+
+		Runnable c1 = () -> {
+			factoryScope.inTransaction( (session) -> session.doWork( (conn) -> {
+				try {
+					assertFalse( conn.getAutoCommit() );
+					conn.prepareStatement("update names set name='aaa' where id=1").executeUpdate();
+					updateLatch.countDown();
+
+					boolean latchSet = blockLatch.await( 7, TimeUnit.SECONDS );
+					assertTrue( latchSet, "background test thread finished (lock timeout is broken)" );
+
+					conn.rollback();
+				}
+				catch (InterruptedException|SQLException e) {
+					throw new RuntimeException( e );
+				}
+			} ) );
+		};
+
+		Runnable c2 = () -> {
+			factoryScope.inTransaction( (session) -> session.doWork( (conn) -> {
+				final ConnectionLockTimeoutStrategy connectionStrategy = session.getDialect().getLockingSupport().getConnectionLockTimeoutStrategy();
+				final Timeout previousTimeout = connectionStrategy.getLockTimeout( conn, session.getFactory() );
+				connectionStrategy.setLockTimeout( Timeout.seconds( 1 ), conn, session.getFactory() );
+				try {
+					boolean latchSet = updateLatch.await( 10, TimeUnit.SECONDS );
+					assertTrue( latchSet, "Update didn't occur within 10 seconds. System overload?" );
+
+					conn.prepareStatement("update names set name='bbb' where id=1").executeUpdate();
+					fail( "Concurrent update didn't fail with a lock timeout" );
+				}
+				catch (SQLException e) {
+					final JDBCException jdbcException = session.getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert( e, "" );
+					if ( !(jdbcException instanceof LockTimeoutException) && !(jdbcException instanceof QueryTimeoutException) ) {
+						throw new AssertionError( "Expected timeout exception", jdbcException );
+					}
+				}
+				catch (InterruptedException e) {
+					throw new RuntimeException( e );
+				}
+				finally {
+					// Postgres doesn't allow setting a lock timeout on an aborted transaction.
+					try {
+						connectionStrategy.setLockTimeout( previousTimeout, conn, session.getFactory() );
+					}
+					catch (JDBCException ignore) {}
+					blockLatch.countDown();
+				}
+			} ) );
+		};
+
+		ExecutorService executor = Executors.newFixedThreadPool(2);
+		try {
+			Future<?> f1 = executor.submit( c1 );
+			Future<?> f2 = executor.submit( c2 );
+
+			f1.get();
+			f2.get();
+		} catch (ExecutionException|InterruptedException e) {
+			throw new RuntimeException( e );
+		} finally {
+			executor.shutdown();
+		}
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.IsJtds.class, reverse = true, comment = "Seems jTDS has a bug?")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsExtendedConnectionLockTimeouts.class)
+	@DomainModel(annotatedClasses = Names.class)
+	@SessionFactory
+	void testLockNoWait(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.persist( new Names( 1, "foo" ) );
+		} );
+
+		final CountDownLatch updateLatch = new CountDownLatch( 1 );
+		final CountDownLatch blockLatch = new CountDownLatch( 1 );
+
+		Runnable c1 = () -> {
+			factoryScope.inTransaction( (session) -> session.doWork( (conn) -> {
+				try {
+					assertFalse( conn.getAutoCommit() );
+					conn.prepareStatement("update names set name='aaa' where id=1").executeUpdate();
+					updateLatch.countDown();
+
+					boolean latchSet = blockLatch.await( 4, TimeUnit.SECONDS );
+					assertTrue( latchSet, "background test thread finished (lock timeout is broken)" );
+
+					conn.rollback();
+				}
+				catch (InterruptedException|SQLException e) {
+					throw new RuntimeException( e );
+				}
+			} ) );
+		};
+
+		Runnable c2 = () -> {
+			factoryScope.inTransaction( (session) -> session.doWork( (conn) -> {
+				final ConnectionLockTimeoutStrategy connectionStrategy = session.getDialect().getLockingSupport().getConnectionLockTimeoutStrategy();
+				final Timeout previousTimeout = connectionStrategy.getLockTimeout( conn, session.getFactory() );
+				connectionStrategy.setLockTimeout( Timeout.milliseconds( Timeouts.NO_WAIT_MILLI ), conn, session.getFactory() );
+				try {
+					boolean latchSet = updateLatch.await( 10, TimeUnit.SECONDS );
+					assertTrue( latchSet, "Update didn't occur within 10 seconds. System overload?" );
+
+					conn.prepareStatement("update names set name='bbb' where id=1").executeUpdate();
+					fail( "Concurrent update didn't fail with a lock timeout" );
+				}
+				catch (SQLException e) {
+					final JDBCException jdbcException = session.getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert( e, "" );
+					if ( !(jdbcException instanceof LockTimeoutException) && !(jdbcException instanceof QueryTimeoutException) ) {
+						throw new AssertionError( "Expected timeout exception", jdbcException );
+					}
+				}
+				catch (InterruptedException e) {
+					throw new RuntimeException( e );
+				}
+				finally {
+					// Postgres doesn't allow setting a lock timeout on an aborted transaction.
+					try {
+						connectionStrategy.setLockTimeout( previousTimeout, conn, session.getFactory() );
+					}
+					catch (JDBCException ignore) {}
+					blockLatch.countDown();
+				}
+			} ) );
+		};
+
+		ExecutorService executor = Executors.newFixedThreadPool(2);
+		try {
+			Future<?> f1 = executor.submit( c1 );
+			Future<?> f2 = executor.submit( c2 );
+
+			f1.get();
+			f2.get();
+		} catch (ExecutionException|InterruptedException e) {
+			throw new RuntimeException( e );
+		} finally {
+			executor.shutdown();
+		}
+	}
+
+	@Test
+	@DomainModel(annotatedClasses = Names.class)
+	@SessionFactory
+	void testLockWaitForever(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.persist( new Names( 1, "foo" ) );
+		} );
+
+		final CountDownLatch updateLatch = new CountDownLatch( 1 );
+		final CountDownLatch blockLatch = new CountDownLatch( 1 );
+
+		Runnable c1 = () -> {
+			factoryScope.inTransaction( (session) -> session.doWork( (conn) -> {
+				try {
+					assertFalse( conn.getAutoCommit() );
+					conn.prepareStatement("update names set name='aaa' where id=1").executeUpdate();
+					updateLatch.countDown();
+
+					boolean latchSet = blockLatch.await( 7, TimeUnit.SECONDS );
+					assertFalse( latchSet, "background test thread finished (lock timeout is broken)" );
+
+					conn.rollback();
+				}
+				catch (InterruptedException|SQLException e) {
+					throw new RuntimeException( e );
+				}
+			} ) );
+		};
+
+		Runnable c2 = () -> {
+			factoryScope.inTransaction( (session) -> session.doWork( (conn) -> {
+				final ConnectionLockTimeoutStrategy connectionStrategy = session.getDialect().getLockingSupport().getConnectionLockTimeoutStrategy();
+				final Timeout previousTimeout = connectionStrategy.getLockTimeout( conn, session.getFactory() );
+				connectionStrategy.setLockTimeout( Timeout.milliseconds( Timeouts.WAIT_FOREVER_MILLI ), conn, session.getFactory() );
+				try {
+					boolean latchSet = updateLatch.await( 10, TimeUnit.SECONDS );
+					assertTrue( latchSet, "Update didn't occur within 10 seconds. System overload?" );
+
+					conn.prepareStatement("update names set name='bbb' where id=1").executeUpdate();
+
+					conn.rollback();
+				}
+				catch (InterruptedException e) {
+					throw new RuntimeException( e );
+				}
+				finally {
+					// Postgres doesn't allow setting a lock timeout on an aborted transaction.
+					try {
+						connectionStrategy.setLockTimeout( previousTimeout, conn, session.getFactory() );
+					}
+					catch (JDBCException ignore) {}
+					blockLatch.countDown();
+				}
+			} ) );
+		};
+
+		ExecutorService executor = Executors.newFixedThreadPool(2);
+		try {
+			Future<?> f1 = executor.submit( c1 );
+			Future<?> f2 = executor.submit( c2 );
+
+			f1.get();
+			f2.get();
+		} catch (ExecutionException|InterruptedException e) {
+			throw new RuntimeException( e );
+		} finally {
+			executor.shutdown();
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/FollowOnLockingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/FollowOnLockingTests.java
index 38d2ac19cdcd..36b9472dd49f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/FollowOnLockingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/FollowOnLockingTests.java
@@ -10,7 +10,9 @@
 import org.hibernate.dialect.lock.PessimisticLockStyle;
 import org.hibernate.jpa.HibernateHints;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -29,6 +31,7 @@
 @DomainModel(annotatedClasses = {Book.class, Person.class, Publisher.class, Report.class})
 @SessionFactory(useCollectingStatementInspector = true)
 @Tag("db-locking")
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSelectLocking.class )
 public class FollowOnLockingTests {
 	@BeforeEach
 	void createTestData(SessionFactoryScope factoryScope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/LockedRowsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/LockedRowsTests.java
index 09936208ff1c..7c00ef20a71d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/LockedRowsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/LockedRowsTests.java
@@ -7,8 +7,8 @@
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.Timeout;
 import org.hibernate.PessimisticLockException;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.CockroachDialect;
+import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.dialect.lock.PessimisticEntityLockException;
 import org.hibernate.jpa.SpecHints;
 import org.hibernate.testing.orm.AsyncExecutor;
@@ -19,6 +19,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
@@ -67,10 +68,10 @@ void dropTestData(SessionFactoryScope factoryScope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportNoWait.class)
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "no failure")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 	void testFindNoWait(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
-			assert session.getDialect().supportsNoWait();
 			session.find(Book.class,1, PESSIMISTIC_WRITE);
 
 			factoryScope.inTransaction( (session2) -> {
@@ -86,8 +87,9 @@ void testFindNoWait(SessionFactoryScope factoryScope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportNoWait.class)
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "no failure")
 	@SkipForDialect(dialectClass = CockroachDialect.class, reason = "Seems FOR UPDATE locks might block read accesses of other TXs")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 	void testLockNoWait(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			session.find(Book.class,1, PESSIMISTIC_WRITE);
@@ -106,6 +108,7 @@ void testLockNoWait(SessionFactoryScope factoryScope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSkipLocked.class)
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE supports SKIP_LOCKED only with PESSIMISTIC_READ")
 	void testQuerySkipLocked(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session1) -> {
 			session1.find(Book.class,1, PESSIMISTIC_WRITE);
@@ -124,7 +127,7 @@ void testQuerySkipLocked(SessionFactoryScope factoryScope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSkipLocked.class)
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "no failure")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "Sybase ASE supports SKIP_LOCKED only with PESSIMISTIC_READ")
 	void testFindSkipLocked(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			session.find(Book.class,1, PESSIMISTIC_WRITE);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/Names.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/Names.java
new file mode 100644
index 000000000000..25e29871afb0
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/Names.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.locking.options;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+/**
+ * @author Daniël van Eeden
+ */
+@Entity
+@Table(name = "names")
+public class Names {
+	@Id
+	private Integer id;
+	private String name;
+
+	public Names() {
+	}
+
+	public Names(Integer id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ScopeAndSecondaryTableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ScopeAndSecondaryTableTests.java
index 586047f889cf..535f31975972 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ScopeAndSecondaryTableTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ScopeAndSecondaryTableTests.java
@@ -6,6 +6,7 @@
 
 import jakarta.persistence.LockModeType;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -13,6 +14,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
 import org.hibernate.testing.orm.transaction.TransactionUtil;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -42,7 +44,10 @@ void dropTestData(SessionFactoryScope factoryScope) {
 
 	@Test
 	@RequiresDialectFeature(feature=DialectFeatureChecks.SupportsLockingJoins.class, comment = "Come back and rework this to account for follow-on testing")
+	@RequiresDialectFeature(feature=DialectFeatureChecks.SupportsConcurrentTransactions.class)
 	@SkipForDialect( dialectClass = InformixDialect.class, reason = "Cursor must be on simple SELECT for FOR UPDATE")
+	@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+			versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
 	void simpleTest(SessionFactoryScope factoryScope) {
 		final SQLStatementInspector sqlCollector = factoryScope.getCollectingStatementInspector();
 		factoryScope.inTransaction( (session) -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ScopeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ScopeTests.java
index 83d9481612cc..253538c00095 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ScopeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/ScopeTests.java
@@ -6,10 +6,10 @@
 
 import org.hibernate.EnabledFetchProfile;
 import org.hibernate.Hibernate;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.HSQLDialect;
+import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.dialect.lock.spi.OuterJoinLockingType;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -18,6 +18,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
@@ -43,6 +44,9 @@
 @Jira( "https://hibernate.atlassian.net/browse/HHH-19336" )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-19459" )
 @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSelectLocking.class )
+@SkipForDialect(dialectClass = SybaseASEDialect.class, majorVersion = 16, minorVersion = 0, microVersion = 2,
+		versionMatchMode = VersionMatchMode.SAME_OR_OLDER, reason = "holdlock isn't the same as updating a row. Bug in our Sybase ASE version?")
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsConcurrentTransactions.class )
 @Tag("db-locking")
 public class ScopeTests {
 	@BeforeEach
@@ -56,7 +60,6 @@ void dropTestData(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "update does not block")
 	void testFind(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			final Book theTalisman = session.find( Book.class, 3, PESSIMISTIC_WRITE );
@@ -69,7 +72,6 @@ void testFind(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "update does not block")
 	void testFindWithExtended(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			final Book theTalisman = session.find( Book.class, 3, PESSIMISTIC_WRITE, EXTENDED );
@@ -84,7 +86,6 @@ void testFindWithExtended(SessionFactoryScope factoryScope) {
 	@Test
 	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "See https://sourceforge.net/p/hsqldb/bugs/1734/")
 	@SkipForDialect(dialectClass = H2Dialect.class, reason = "H2 seems to not extend locks across joins")
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Cursor must be on simple SELECT for FOR UPDATE")
 	void testFindWithExtendedAndFetch(SessionFactoryScope factoryScope) {
 
 		// note that this is not strictly spec compliant as it says EXTENDED should extend
@@ -106,7 +107,6 @@ void testFindWithExtendedAndFetch(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "update does not block")
 	void testLock(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			final Book theTalisman = session.find( Book.class, 3 );
@@ -121,7 +121,6 @@ void testLock(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "update does not block")
 	void testLockWithExtended(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			final Book theTalisman = session.find( Book.class, 3 );
@@ -136,7 +135,6 @@ void testLockWithExtended(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "update does not block")
 	void testRefresh(SessionFactoryScope factoryScope) {
 
 		factoryScope.inTransaction( (session) -> {
@@ -152,7 +150,6 @@ void testRefresh(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "update does not block")
 	void testRefreshWithExtended(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			final Book theTalisman = session.find( Book.class, 3 );
@@ -168,7 +165,6 @@ void testRefreshWithExtended(SessionFactoryScope factoryScope) {
 
 	@Test
 	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "See https://sourceforge.net/p/hsqldb/bugs/1734/")
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Cursor must be on simple SELECT for FOR UPDATE")
 	void testEagerFind(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			final Report report = session.find( Report.class, 2, PESSIMISTIC_WRITE );
@@ -179,7 +175,6 @@ void testEagerFind(SessionFactoryScope factoryScope) {
 	@Test
 	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "See https://sourceforge.net/p/hsqldb/bugs/1734/")
 	@SkipForDialect(dialectClass = H2Dialect.class, reason = "H2 seems to not extend locks across joins")
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Cursor must be on simple SELECT for FOR UPDATE")
 	void testEagerFindWithExtended(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			final Report report = session.find( Report.class, 2, PESSIMISTIC_WRITE, EXTENDED );
@@ -206,7 +201,6 @@ private boolean willAggressivelyLockJoinedTables(Dialect dialect) {
 	@Test
 	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "See https://sourceforge.net/p/hsqldb/bugs/1734/")
 	@SkipForDialect(dialectClass = H2Dialect.class, reason = "H2 seems to not extend locks across joins")
-	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Cursor must be on simple SELECT for FOR UPDATE")
 	void testEagerFindWithFetchScope(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
 			final Report report = session.find( Report.class, 2, PESSIMISTIC_WRITE, INCLUDE_FETCHES );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarningTest.java
index 15515e076fe3..cede4a6e8d6e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarningTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/warning/LockNoneWarningTest.java
@@ -17,11 +17,13 @@
 
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Logger;
 import org.hibernate.testing.orm.junit.LoggingInspections;
 import org.hibernate.testing.orm.junit.LoggingInspectionsScope;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -48,6 +50,7 @@
 })
 @DomainModel(annotatedClasses = {LockNoneWarningTest.Item.class, LockNoneWarningTest.Bid.class})
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class LockNoneWarningTest {
 	@BeforeEach
 	void setUp(SessionFactoryScope factoryScope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java
index c0f22abc6236..9e855b0a329c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyBidirectionalTest.java
@@ -15,13 +15,10 @@
 
 import org.hibernate.annotations.NaturalId;
 
-import org.hibernate.community.dialect.TiDBDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.ImplicitListAsBagProvider;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.SettingProvider;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -75,8 +72,6 @@ public void testRemoveOwnerSide(EntityManagerFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = TiDBDialect.class, reason = "TiDB do not support FK violation checking")
-	@FailureExpected(jiraKey = "HHH-12239")
 	public void testRemoveMappedBySide(EntityManagerFactoryScope scope) {
 		Address _address1 = scope.fromTransaction( entityManager -> {
 			Person person1 = new Person( "ABC-123" );
@@ -98,7 +93,7 @@ public void testRemoveMappedBySide(EntityManagerFactoryScope scope) {
 
 		scope.inTransaction( entityManager -> {
 			Address address1 = entityManager.find( Address.class, _address1.id );
-
+			address1.owners.forEach(owner -> owner.addresses.remove( address1));
 			entityManager.remove( address1 );
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java
index f640d02c0e1d..f86f5867370a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java
@@ -9,7 +9,9 @@
 
 import org.hibernate.dialect.MariaDBDialect;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
@@ -53,6 +55,7 @@ public void testIndexFunctionOnManyToManyMap(SessionFactoryScope scope) {
 
 	@Test
 	@SkipForDialect( dialectClass = MariaDBDialect.class, reason = "HHH-18433")
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class )
 	public void testIndexFormulaMap(SessionFactoryScope scope) {
 		User turin = new User( "turin", "tiger" );
 		scope.inTransaction(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingModelAccessTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingModelAccessTests.java
index 2242e063486c..35abbe28a9fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingModelAccessTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/MappingModelAccessTests.java
@@ -9,6 +9,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.MappingMetamodel;
+import org.hibernate.metamodel.mapping.DiscriminatorValue;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -89,9 +90,9 @@ void testJoinedSubclassInheritance(SessionFactoryScope scope) {
 		assertThat( discriminatorMapping.getJdbcMapping().getJavaTypeDescriptor().getJavaTypeClass() ).isEqualTo( Class.class );
 		assertThat( discriminatorMapping.getJdbcMapping().getJdbcJavaType().getJavaTypeClass() ).isEqualTo( Integer.class );
 
-		assertThat( paymentMapping.getDiscriminatorValue() ).isEqualTo( 0 );
-		assertThat( cashPaymentMapping.getDiscriminatorValue() ).isEqualTo( 1 );
-		assertThat( cardPaymentMapping.getDiscriminatorValue() ).isEqualTo( 2 );
+		assertThat( paymentMapping.getDiscriminatorValue() ).isEqualTo( new DiscriminatorValue.Literal(0) );
+		assertThat( cashPaymentMapping.getDiscriminatorValue() ).isEqualTo( new DiscriminatorValue.Literal(1) );
+		assertThat( cardPaymentMapping.getDiscriminatorValue() ).isEqualTo( new DiscriminatorValue.Literal(2) );
 
 		assertThat( discriminatorMapping.resolveDiscriminatorValue( 0 ).getIndicatedEntity() ).isEqualTo( paymentMapping );
 		assertThat( discriminatorMapping.resolveDiscriminatorValue( 1 ).getIndicatedEntity() ).isEqualTo( cashPaymentMapping );
@@ -119,9 +120,9 @@ void testSingleTableInheritance(SessionFactoryScope scope) {
 		assertThat( discriminatorMapping.getJdbcMapping().getJavaTypeDescriptor().getJavaTypeClass() ).isEqualTo( Class.class );
 		assertThat( discriminatorMapping.getJdbcMapping().getJdbcJavaType().getJavaTypeClass() ).isEqualTo( String.class );
 
-		assertThat( vendorMapping.getDiscriminatorValue() ).isEqualTo( "Vendor" );
-		assertThat( domesticVendorMapping.getDiscriminatorValue() ).isEqualTo( "domestic" );
-		assertThat( foreignVendorMapping.getDiscriminatorValue() ).isEqualTo( "foreign" );
+		assertThat( vendorMapping.getDiscriminatorValue() ).isEqualTo( new DiscriminatorValue.Literal("Vendor") );
+		assertThat( domesticVendorMapping.getDiscriminatorValue() ).isEqualTo( new DiscriminatorValue.Literal("domestic") );
+		assertThat( foreignVendorMapping.getDiscriminatorValue() ).isEqualTo( new DiscriminatorValue.Literal("foreign") );
 
 		assertThat( discriminatorMapping.resolveDiscriminatorValue( "Vendor" ).getIndicatedEntity() ).isEqualTo( vendorMapping );
 		assertThat( discriminatorMapping.resolveDiscriminatorValue( "domestic" ).getIndicatedEntity() ).isEqualTo( domesticVendorMapping );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/AccessTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/AccessTypeTest.java
new file mode 100644
index 000000000000..c4b92e968eaa
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/AccessTypeTest.java
@@ -0,0 +1,81 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.access;
+
+import jakarta.persistence.*;
+import jakarta.persistence.metamodel.EntityType;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.time.LocalDateTime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+
+@Jpa(annotatedClasses = AccessTypeTest.SomeEntity.class)
+class AccessTypeTest {
+	@Test void test(EntityManagerFactoryScope scope) {
+		EntityType<SomeEntity> someEntityType =
+				scope.getEntityManagerFactory().getMetamodel()
+						.entity( SomeEntity.class );
+		assertEquals( 4, someEntityType.getAttributes().size() );
+		assertEquals( 2, someEntityType.getDeclaredAttributes().size() );
+		assertInstanceOf( Method.class,
+				someEntityType.getId( String.class ).getJavaMember() );
+		assertInstanceOf( Method.class,
+				someEntityType.getSingularAttribute( "created", LocalDateTime.class )
+						.getJavaMember() );
+		assertInstanceOf( Field.class,
+				someEntityType.getDeclaredSingularAttribute( "name", String.class )
+						.getJavaMember() );
+		assertInstanceOf( Field.class,
+				someEntityType.getDeclaredSingularAttribute( "count", Integer.class )
+						.getJavaMember() );
+	}
+
+	@MappedSuperclass
+	@Access(AccessType.PROPERTY)
+	static abstract class Base {
+		@Id
+		@Column(name = "some_entity_id") //optional
+		public abstract String getId();
+		public abstract void setId(String id);
+
+		public abstract LocalDateTime getCreated();
+		public abstract void setCreated(LocalDateTime created);
+	}
+
+	@Entity
+	static class SomeEntity extends Base {
+		String id;
+		LocalDateTime created;
+
+		@Basic(optional = false)
+		String name;
+
+		int count;
+
+		@Override
+		public String getId() {
+			return id;
+		}
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		@Override
+		public LocalDateTime getCreated() {
+			return created;
+		}
+
+		@Override
+		public void setCreated(LocalDateTime created) {
+			this.created = created;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/MySqlArrayOfTimestampsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/MySqlArrayOfTimestampsTest.java
index 4829c0608978..b996924b5c67 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/MySqlArrayOfTimestampsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/MySqlArrayOfTimestampsTest.java
@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.util.Calendar;
@@ -109,10 +108,6 @@ public void testDate(SessionFactoryScope scope) {
 		} );
 	}
 
-	private static final LocalDateTime SUMMER = LocalDate.of( 2024, 6, 20 ).atStartOfDay();
-	private static final LocalDateTime WINTER = LocalDate.of( 2023, 12, 22 ).atStartOfDay();
-	private static final LocalDate EPOCH = LocalDate.of( 1970, Month.JANUARY, 1 );
-
 	private static final TimeZone[] TEST_TIME_ZONES = Stream.of(
 			"Africa/Monrovia",
 			"Europe/Zagreb",
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNoBinder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNoBinder.java
index 58cbde115fc2..2f5cedea7fed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNoBinder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/YesNoBinder.java
@@ -24,10 +24,7 @@ public void bind(
 			PersistentClass persistentClass,
 			Property property) {
 		( (SimpleValue) property.getValue() ).setJpaAttributeConverterDescriptor(
-				ConverterDescriptors.of(
-						YesNoConverter.INSTANCE,
-						buildingContext.getBootstrapContext().getClassmateContext()
-				)
+				ConverterDescriptors.of( YesNoConverter.INSTANCE )
 		);
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/ResultCheckBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/ResultCheckBinderTest.java
index b0d75c76c906..3fb512aa7453 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/ResultCheckBinderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/attributebinder/typebinder/ResultCheckBinderTest.java
@@ -21,7 +21,7 @@ public class ResultCheckBinderTest {
 		scope.inStatelessTransaction(s -> s.delete(entity) );
 	}
 	@NoResultCheck
-	@jakarta.persistence.Entity
+	@jakarta.persistence.Entity(name = "Entity")
 	static class Entity {
 		@Id long id;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteArrayMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteArrayMappingTests.java
index ed8d77521e19..6fa46f643892 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteArrayMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteArrayMappingTests.java
@@ -35,6 +35,8 @@
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isOneOf;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Steve Ebersole
@@ -76,7 +78,7 @@ public void verifyMappings(SessionFactoryScope scope) {
 			else {
 				assertThat(
 						jdbcMapping.getJdbcType().getDdlTypeCode(),
-						isOneOf( SqlTypes.ARRAY, SqlTypes.JSON, SqlTypes.SQLXML, SqlTypes.VARBINARY, SqlTypes.LONG32VARCHAR )
+						isOneOf( SqlTypes.ARRAY, SqlTypes.JSON, SqlTypes.SQLXML, SqlTypes.VARBINARY, SqlTypes.LONG32VARCHAR, SqlTypes.LONG32NVARCHAR, SqlTypes.CLOB, SqlTypes.NCLOB )
 				);
 			}
 		}
@@ -115,6 +117,14 @@ public void verifyMappings(SessionFactoryScope scope) {
 		);
 	}
 
+	@Test
+	public void testIsInstance() {
+		final ByteArrayJavaType javaType = ByteArrayJavaType.INSTANCE;
+
+		assertTrue( javaType.isInstance(new Byte[0]) );
+		assertFalse( javaType.isInstance(new byte[0]) );
+	}
+
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
 		scope.getSessionFactory().getSchemaManager().truncate();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayMappingTests.java
index 1b3812e1c816..f6bc20860d5b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayMappingTests.java
@@ -72,7 +72,7 @@ public void verifyMappings(SessionFactoryScope scope) {
 			else {
 				assertThat(
 						jdbcMapping.getJdbcType().getDdlTypeCode(),
-						isOneOf( SqlTypes.ARRAY, SqlTypes.JSON, SqlTypes.SQLXML, SqlTypes.VARBINARY, SqlTypes.LONG32VARCHAR )
+						isOneOf( SqlTypes.ARRAY, SqlTypes.JSON, SqlTypes.SQLXML, SqlTypes.VARBINARY, SqlTypes.LONG32VARCHAR, SqlTypes.LONG32NVARCHAR, SqlTypes.CLOB, SqlTypes.NCLOB )
 				);
 			}
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayNationalizedMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayNationalizedMappingTests.java
index 5918535957e5..d82f6c7c580f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayNationalizedMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CharacterArrayNationalizedMappingTests.java
@@ -79,7 +79,7 @@ public void verifyMappings(SessionFactoryScope scope) {
 			else {
 				assertThat(
 						jdbcMapping.getJdbcType().getDdlTypeCode(),
-						isOneOf( SqlTypes.ARRAY, SqlTypes.JSON, SqlTypes.SQLXML, SqlTypes.VARBINARY, SqlTypes.LONG32VARCHAR )
+						isOneOf( SqlTypes.ARRAY, SqlTypes.JSON, SqlTypes.SQLXML, SqlTypes.VARBINARY, SqlTypes.LONG32VARCHAR, SqlTypes.LONG32NVARCHAR, SqlTypes.CLOB, SqlTypes.NCLOB )
 				);
 			}
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/DatePrecisionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/DatePrecisionTests.java
index d10326b6980d..c5b706f1c5ca 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/DatePrecisionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/DatePrecisionTests.java
@@ -4,8 +4,6 @@
  */
 package org.hibernate.orm.test.mapping.basic;
 
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.Instant;
 import java.util.Date;
@@ -47,7 +45,7 @@ public void verifyMapping(SessionFactoryScope scope) {
 			final JdbcMapping jdbcMapping = attribute.getJdbcMapping();
 			final TemporalJavaType jtd = (TemporalJavaType) jdbcMapping.getJavaTypeDescriptor();
 			assertThat(jtd, is(attribute.getJavaType()));
-			assertThat(jtd.getJavaTypeClass(), equalTo(Timestamp.class));
+			assertThat(jtd.getJavaTypeClass(), equalTo(Date.class));
 			assertThat(jtd.getPrecision(), equalTo(TemporalType.TIMESTAMP));
 			assertThat( jdbcMapping.getJdbcType().getJdbcTypeCode(), equalTo( Types.TIMESTAMP));
 		}
@@ -57,7 +55,7 @@ public void verifyMapping(SessionFactoryScope scope) {
 			final JdbcMapping jdbcMapping = attribute.getJdbcMapping();
 			final TemporalJavaType jtd = (TemporalJavaType) jdbcMapping.getJavaTypeDescriptor();
 			assertThat(jtd, is(attribute.getJavaType()));
-			assertThat(jtd.getJavaTypeClass(), equalTo(java.sql.Date.class));
+			assertThat(jtd.getJavaTypeClass(), equalTo(Date.class));
 			assertThat(jtd.getPrecision(), equalTo(TemporalType.DATE));
 			assertThat( jdbcMapping.getJdbcType().getJdbcTypeCode(), equalTo( Types.DATE));
 		}
@@ -67,7 +65,7 @@ public void verifyMapping(SessionFactoryScope scope) {
 			final JdbcMapping jdbcMapping = attribute.getJdbcMapping();
 			final TemporalJavaType jtd = (TemporalJavaType) jdbcMapping.getJavaTypeDescriptor();
 			assertThat(jtd, is(attribute.getJavaType()));
-			assertThat(jtd.getJavaTypeClass(), equalTo(Time.class));
+			assertThat(jtd.getJavaTypeClass(), equalTo(Date.class));
 			assertThat(jtd.getPrecision(), equalTo(TemporalType.TIME));
 			assertThat( jdbcMapping.getJdbcType().getJdbcTypeCode(), equalTo( Types.TIME));
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/DurationMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/DurationMappingTests.java
index 650fa4d87004..cd048bd123ab 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/DurationMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/DurationMappingTests.java
@@ -16,6 +16,8 @@
 import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.jdbc.AdjustableJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
@@ -44,6 +46,7 @@
  * 	2.2.21. Duration
  * 		By default, Hibernate maps Duration to the NUMERIC SQL type.
  */
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIntervalSecondType.class)
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.PREFERRED_DURATION_JDBC_TYPE, value = "INTERVAL_SECOND"))
 public class DurationMappingTests {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InetAddressMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InetAddressMappingTests.java
index 31da26be053f..8ae8b69f1489 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InetAddressMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/InetAddressMappingTests.java
@@ -40,7 +40,7 @@
 		reason = "Driver or DB omit trailing zero bytes of a varbinary, making this test fail intermittently")
 @SkipForDialect( dialectClass = InformixDialect.class,
 		reason = "Blobs are not allowed in this expression (with a column of type BYTE)")
-public class InetAddressMappingTests {
+	public class InetAddressMappingTests {
 
 	@Test
 	public void verifyMappings(SessionFactoryScope scope) throws Exception {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonJavaTimeMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonJavaTimeMappingTests.java
new file mode 100644
index 000000000000..8e6fa85d941e
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonJavaTimeMappingTests.java
@@ -0,0 +1,148 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.basic;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
+import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.Serializable;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isA;
+import static org.hamcrest.Matchers.nullValue;
+
+@DomainModel(annotatedClasses = JsonJavaTimeMappingTests.EntityWithJson.class)
+@SessionFactory
+public abstract class JsonJavaTimeMappingTests {
+
+	@ServiceRegistry(settings = @Setting(name = AvailableSettings.JSON_FORMAT_MAPPER, value = "jackson"))
+	public static class Jackson extends JsonJavaTimeMappingTests {
+
+		public Jackson() {
+			super();
+		}
+	}
+
+	@ServiceRegistry(settings = @Setting(name = AvailableSettings.JSON_FORMAT_MAPPER, value = "jackson3"))
+	public static class Jackson3 extends JsonJavaTimeMappingTests {
+
+		public Jackson3() {
+			super();
+		}
+	}
+
+	private final JavaTime javaTime;
+
+	protected JsonJavaTimeMappingTests() {
+		final var localDate = LocalDate.of( 2025, 12, 1 );
+		final var localTime = LocalTime.of( 9, 9, 42 );
+		final var localDateTime = LocalDateTime.of( localDate, localTime );
+		final var instant = localDateTime.atZone( ZoneId.of( "Europe/Paris" ) ).toInstant();
+		final var duration = Duration.ofHours( 3 ).plusMinutes( 14 );
+		javaTime = new JavaTime( instant, localDateTime, localDate, localTime, duration );
+	}
+
+	@BeforeEach
+	public void setup(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					session.persist( new EntityWithJson( 1, javaTime ) );
+				}
+		);
+	}
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+	}
+
+	@Test
+	public void verifyMappings(SessionFactoryScope scope) {
+		final MappingMetamodelImplementor mappingMetamodel = scope.getSessionFactory()
+				.getRuntimeMetamodels()
+				.getMappingMetamodel();
+		final EntityPersister entityDescriptor = mappingMetamodel.findEntityDescriptor( EntityWithJson.class );
+		final JdbcTypeRegistry jdbcTypeRegistry = mappingMetamodel.getTypeConfiguration().getJdbcTypeRegistry();
+
+		final BasicAttributeMapping stringMapAttribute = (BasicAttributeMapping) entityDescriptor.findAttributeMapping(
+				"javaTime" );
+
+		assertThat( stringMapAttribute.getJavaType().getJavaTypeClass(), equalTo( JavaTime.class ) );
+
+		final JdbcType jsonType = jdbcTypeRegistry.getDescriptor( SqlTypes.JSON );
+		assertThat( stringMapAttribute.getJdbcMapping().getJdbcType(), isA( jsonType.getClass() ) );
+	}
+
+	@Test
+	public void verifyReadWorks(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					EntityWithJson entityWithJson = session.find( EntityWithJson.class, 1 );
+					assertThat( entityWithJson.javaTime, is( javaTime ) );
+				}
+		);
+	}
+
+	@Test
+	public void verifyMergeWorks(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> session.merge( new EntityWithJson( 2, null ) )
+		);
+
+		scope.inTransaction(
+				(session) -> {
+					EntityWithJson entityWithJson = session.find( EntityWithJson.class, 2 );
+					assertThat( entityWithJson.javaTime, is( nullValue() ) );
+				}
+		);
+	}
+
+	public record JavaTime(Instant instant, LocalDateTime localDateTime, LocalDate localDate, LocalTime localTime,
+						Duration duration) implements Serializable {
+	}
+
+	@Entity(name = "EntityWithJson")
+	@Table(name = "EntityWithJson")
+	public static class EntityWithJson {
+		@Id
+		private Integer id;
+
+		@JdbcTypeCode(SqlTypes.JSON)
+		private JavaTime javaTime;
+
+		public EntityWithJson() {
+		}
+
+		public EntityWithJson(Integer id, JavaTime javaTime) {
+			this.id = id;
+			this.javaTime = javaTime;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonMappingTests.java
index 7f5ecf8be859..5d68077fa3fe 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/JsonMappingTests.java
@@ -11,11 +11,14 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.criteria.CriteriaUpdate;
 import jakarta.persistence.criteria.Root;
+import org.assertj.core.api.AssertionsForClassTypes;
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SybaseDialect;
@@ -42,8 +45,12 @@
 import java.nio.charset.StandardCharsets;
 import java.sql.Blob;
 import java.sql.Clob;
+import java.util.ArrayDeque;
+import java.util.Dictionary;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
+import java.util.Queue;
 import java.util.Set;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -53,12 +60,14 @@
 import static org.hamcrest.Matchers.isOneOf;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
+import static org.hibernate.type.SqlTypes.JSON;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Christian Beikov
  * @author Yanming Zhou
  */
-@DomainModel(annotatedClasses = JsonMappingTests.EntityWithJson.class)
+@DomainModel(annotatedClasses = {JsonMappingTests.EntityWithJson.class, JsonMappingTests.EntityWithObjectJson.class})
 @SessionFactory
 public abstract class JsonMappingTests {
 
@@ -76,6 +85,83 @@ public static class Jackson extends JsonMappingTests {
 		public Jackson() {
 			super( false );
 		}
+
+		@Test
+		@JiraKey( "https://hibernate.atlassian.net/browse/HHH-19969" )
+		public void jsonMappedToObjectTest(SessionFactoryScope scope) {
+			scope.inTransaction(
+					session -> {
+						var entity = new EntityWithObjectJson();
+						entity.id = 1L;
+						entity.json = Map.of("a", 1, "b", 2);
+						session.persist(entity);
+
+						entity = new EntityWithObjectJson();
+						entity.id = 2L;
+						entity.json = List.<Object>of("c", 11, 22, "d");
+						session.persist(entity);
+
+						entity = new EntityWithObjectJson();
+						entity.id = 3L;
+						entity.json = Set.<Object>of("s1", 2, "s3");
+						session.persist(entity);
+
+						entity = new EntityWithObjectJson();
+						entity.id = 4L;
+						Queue<Integer> ad = new ArrayDeque<>();
+						ad.add(2);
+						ad.add(1);
+						ad.add(3);
+						entity.json = ad;
+						session.persist(entity);
+
+						entity = new EntityWithObjectJson();
+						entity.id = 5L;
+						Dictionary<Integer, String> ht = new Hashtable<>();
+						ht.put(1, "one");
+						ht.put(2, "two");
+						ht.put(3, "three");
+						entity.json = ht;
+						session.persist(entity);
+					}
+			);
+			scope.inTransaction(
+					session -> {
+						var entity = session.find( EntityWithObjectJson.class, 1L );
+						AssertionsForClassTypes.assertThat( entity ).isNotNull();
+						AssertionsForClassTypes.assertThat( entity.json ).isInstanceOf( Map.class );
+						assertEquals( 2, ((Map<?,?>)entity.json).size() );
+
+						entity = session.find( EntityWithObjectJson.class, 2L );
+						AssertionsForClassTypes.assertThat( entity ).isNotNull();
+						AssertionsForClassTypes.assertThat( entity.json ).isInstanceOf( List.class );
+						assertEquals( 4, ((List<?>)entity.json).size() );
+
+						entity = session.find( EntityWithObjectJson.class, 3L );
+						AssertionsForClassTypes.assertThat( entity ).isNotNull();
+						AssertionsForClassTypes.assertThat( entity.json ).isInstanceOf( List.class );
+						assertEquals( 3, ((List<?>)entity.json).size() );
+
+						entity = session.find( EntityWithObjectJson.class, 4L );
+						AssertionsForClassTypes.assertThat( entity ).isNotNull();
+						AssertionsForClassTypes.assertThat( entity.json ).isInstanceOf( List.class );
+						assertEquals( 3, ((List<?>)entity.json).size() );
+
+						entity = session.find( EntityWithObjectJson.class, 5L );
+						AssertionsForClassTypes.assertThat( entity ).isNotNull();
+						AssertionsForClassTypes.assertThat( entity.json ).isInstanceOf( Map.class );
+						assertEquals( 3, ((Map<?,?>)entity.json).size() );
+					}
+			);
+		}
+	}
+
+	@ServiceRegistry(settings = @Setting(name = AvailableSettings.JSON_FORMAT_MAPPER, value = "jackson3"))
+	public static class Jackson3 extends JsonMappingTests {
+
+		public Jackson3() {
+			super( false );
+		}
 	}
 
 	private final Map<String, String> stringMap;
@@ -147,6 +233,7 @@ public void verifyReadWorks(SessionFactoryScope scope) {
 					assertThat( entityWithJson.objectMap, is( objectMap ) );
 					assertThat( entityWithJson.list, is( list ) );
 					assertThat( entityWithJson.jsonNode, is( nullValue() ) );
+					assertThat( entityWithJson.jackson3JsonNode, is( nullValue() ) );
 					assertThat( entityWithJson.jsonValue, is( nullValue() ) );
 				}
 		);
@@ -168,6 +255,7 @@ public void verifyMergeWorks(SessionFactoryScope scope) {
 					assertThat( entityWithJson.list, is( nullValue() ) );
 					assertThat( entityWithJson.jsonString, is( nullValue() ) );
 					assertThat( entityWithJson.jsonNode, is( nullValue() ) );
+					assertThat( entityWithJson.jackson3JsonNode, is( nullValue() ) );
 					assertThat( entityWithJson.jsonValue, is( nullValue() ) );
 					assertThat( entityWithJson.complexMap, is( nullValue() ) );
 				}
@@ -204,6 +292,8 @@ public void verifyDirtyChecking(SessionFactoryScope scope) {
 			reason = "Altibase doesn't support comparing CLOBs with the = operator")
 	@SkipForDialect(dialectClass = InformixDialect.class,
 			reason = "Blobs are not allowed in this expression")
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support comparing JSONB type")
+	@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner doesn't support comparing JSON type")
 	public void verifyComparisonWorks(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -228,15 +318,13 @@ public void verifyComparisonWorks(SessionFactoryScope scope) {
 							.get( 0 );
 					final String jsonText;
 					try {
-						if ( nativeJson instanceof Blob ) {
-							final Blob blob = (Blob) nativeJson;
+						if ( nativeJson instanceof Blob blob ) {
 							jsonText = new String(
 									blob.getBytes( 1L, (int) blob.length() ),
 									StandardCharsets.UTF_8
 							);
 						}
-						else if ( nativeJson instanceof Clob ) {
-							final Clob jsonClob = (Clob) nativeJson;
+						else if ( nativeJson instanceof Clob jsonClob ) {
 							jsonText = jsonClob.getSubString( 1L, (int) jsonClob.length() );
 						}
 						else {
@@ -301,6 +389,9 @@ public static class EntityWithJson {
 		@JdbcTypeCode( SqlTypes.JSON )
 		private JsonNode jsonNode;
 
+		@JdbcTypeCode( SqlTypes.JSON )
+		private tools.jackson.databind.JsonNode jackson3JsonNode;
+
 		@JdbcTypeCode( SqlTypes.JSON )
 		private JsonValue jsonValue;
 
@@ -363,4 +454,21 @@ public int hashCode() {
 			return string != null ? string.hashCode() : 0;
 		}
 	}
+
+	@Entity(name = "EntityWithObjectJson")
+	public static class EntityWithObjectJson {
+		@Id
+		long id;
+
+		@JdbcTypeCode(JSON)
+		Object json;
+
+		public EntityWithObjectJson() {
+		}
+
+		public EntityWithObjectJson(long id, Object json) {
+			this.id = id;
+			this.json = json;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NationalizedJsonMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NationalizedJsonMappingTests.java
new file mode 100644
index 000000000000..9109ba796ba5
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NationalizedJsonMappingTests.java
@@ -0,0 +1,160 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.basic;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.annotations.Nationalized;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.NationalizationSupport;
+import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
+import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsNationalizedData.class)
+public class NationalizedJsonMappingTests {
+
+	private static final String UNICODE_JSON = "{\"name\": \"🦑 Unicode Test 🦑\"}";
+
+	private static void verifyMapping(SessionFactoryScope scope, Class<?> entityClass, String attributeName, boolean expectNationalized) {
+		final MappingMetamodelImplementor mappingMetamodel = scope.getSessionFactory()
+				.getRuntimeMetamodels()
+				.getMappingMetamodel();
+		final EntityPersister entityDescriptor = mappingMetamodel.findEntityDescriptor( entityClass );
+
+		final BasicAttributeMapping attribute = (BasicAttributeMapping) entityDescriptor.findAttributeMapping(
+				attributeName );
+		final JdbcType jdbcType = attribute.getJdbcMapping().getJdbcType();
+
+		// skip verify when database use native JSON type
+		if ( jdbcType.isString() ) {
+			final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
+			final int expectedTypeCode = expectNationalized || dialect.getNationalizationSupport() == NationalizationSupport.EXPLICIT
+					? SqlTypes.NVARCHAR
+					: SqlTypes.VARCHAR;
+
+			assertThat( "Nationalized flag mismatch for " + entityClass.getSimpleName(),
+					jdbcType.getJdbcTypeCode(), is( expectedTypeCode ) );
+		}
+	}
+
+	private static void verifyJson(String actual, String expected) {
+		assertThat( "JSON should not be null", actual, notNullValue() );
+		try {
+			final ObjectMapper mapper = new ObjectMapper();
+			final JsonNode actualNode = mapper.readTree( actual );
+			final JsonNode expectedNode = mapper.readTree( expected );
+			assertThat( actualNode, is( expectedNode ) );
+		}
+		catch (JsonProcessingException e) {
+			throw new RuntimeException( e );
+		}
+	}
+
+	@Test
+	@DomainModel(annotatedClasses = {PlainJsonEntity.class})
+	@SessionFactory
+	public void testDefaultJsonIntegrity(SessionFactoryScope scope) {
+		verifyMapping( scope, PlainJsonEntity.class, "jsonData", false );
+
+		scope.inTransaction( session -> {
+			PlainJsonEntity entity = new PlainJsonEntity();
+			entity.id = 1;
+			entity.jsonData = UNICODE_JSON;
+			session.persist( entity );
+		} );
+
+		scope.inSession( session -> {
+			PlainJsonEntity retrieved = session.find( PlainJsonEntity.class, 1 );
+
+			verifyJson( retrieved.jsonData, UNICODE_JSON );
+		} );
+	}
+
+	@Test
+	@DomainModel(annotatedClasses = {NationalizedJsonEntity.class})
+	@SessionFactory
+	public void testNationalizedJsonIntegrity(SessionFactoryScope scope) {
+		verifyMapping( scope, NationalizedJsonEntity.class, "jsonData", true );
+
+		scope.inTransaction( session -> {
+			NationalizedJsonEntity entity = new NationalizedJsonEntity();
+			entity.id = 1;
+			entity.jsonData = UNICODE_JSON;
+			session.persist( entity );
+		} );
+
+		scope.inSession( session -> {
+			NationalizedJsonEntity retrieved = session.find( NationalizedJsonEntity.class, 1 );
+			verifyJson( retrieved.jsonData, UNICODE_JSON );
+		} );
+	}
+
+	@Test
+	@DomainModel(annotatedClasses = {JsonEntity.class})
+	@ServiceRegistry(settings = {
+			@Setting(name = AvailableSettings.USE_NATIONALIZED_CHARACTER_DATA, value = "true")
+	})
+	@SessionFactory
+	public void testGlobalNationalizedJsonIntegrity(SessionFactoryScope scope) {
+		verifyMapping( scope, JsonEntity.class, "jsonData", true );
+
+		scope.inTransaction( session -> {
+			JsonEntity entity = new JsonEntity();
+			entity.id = 1;
+			entity.jsonData = UNICODE_JSON;
+			session.persist( entity );
+		} );
+
+		scope.inSession( session -> {
+			JsonEntity retrieved = session.find( JsonEntity.class, 1 );
+			verifyJson( retrieved.jsonData, UNICODE_JSON );
+		} );
+	}
+
+	@Entity(name = "PlainJsonEntity")
+	public static class PlainJsonEntity {
+		@Id
+		Integer id;
+		@JdbcTypeCode(SqlTypes.JSON)
+		String jsonData;
+	}
+
+	@Entity(name = "NationalizedJsonEntity")
+	public static class NationalizedJsonEntity {
+		@Id
+		Integer id;
+		@JdbcTypeCode(SqlTypes.JSON)
+		@Nationalized
+		String jsonData;
+	}
+
+	@Entity(name = "JsonEntity")
+	public static class JsonEntity {
+		@Id
+		Integer id;
+		@JdbcTypeCode(SqlTypes.JSON)
+		String jsonData;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PolymorphicJsonTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PolymorphicJsonTests.java
index 3c7436bdb2c3..12d70c275e43 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PolymorphicJsonTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/PolymorphicJsonTests.java
@@ -50,6 +50,13 @@ public Jackson() {
 		}
 	}
 
+	@ServiceRegistry(settings = @Setting(name = AvailableSettings.JSON_FORMAT_MAPPER, value = "jackson3"))
+	public static class Jackson3 extends PolymorphicJsonTests {
+
+		public Jackson3() {
+		}
+	}
+
 	@BeforeEach
 	public void setup(SessionFactoryScope scope) {
 		scope.inTransaction(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/XmlMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/XmlMappingTests.java
index b88fbf140bed..46243bf4d06b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/XmlMappingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/XmlMappingTests.java
@@ -68,6 +68,14 @@ public Jackson() {
 		}
 	}
 
+	@ServiceRegistry(settings = @Setting(name = AvailableSettings.XML_FORMAT_MAPPER, value = "jackson3-xml"))
+	public static class Jackson3 extends XmlMappingTests {
+
+		public Jackson3() {
+			super( false );
+		}
+	}
+
 
 	private final Map<String, StringNode> stringMap;
 	private final Map<StringNode, StringNode> objectMap;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java
index c8604cab145b..601bfc781421 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetHelper.java
@@ -16,7 +16,7 @@ public class BitSetHelper {
 	public static String bitSetToString(BitSet bitSet) {
 		StringBuilder builder = new StringBuilder();
 		for (long token : bitSet.toLongArray()) {
-			if (builder.length() > 0) {
+			if ( !builder.isEmpty() ) {
 				builder.append(DELIMITER);
 			}
 			builder.append(Long.toString(token, 2));
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetMetaUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetMetaUserTypeTest.java
new file mode 100644
index 000000000000..d63d23624dab
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetMetaUserTypeTest.java
@@ -0,0 +1,139 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.basic.bitset;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.ColumnResult;
+import jakarta.persistence.ConstructorResult;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.SqlResultSetMapping;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.Type;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.Test;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.BitSet;
+
+import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
+import static org.junit.Assert.assertEquals;
+
+
+public class BitSetMetaUserTypeTest extends BaseCoreFunctionalTestCase {
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] {
+			Product.class
+		};
+	}
+
+	@Test
+	public void test() {
+
+		BitSet bitSet = BitSet.valueOf(new long[] {1, 2, 3});
+
+		doInHibernate(this::sessionFactory, session -> {
+			Product product = new Product();
+			product.setId(1);
+			product.setBitSet(bitSet);
+			session.persist(product);
+		});
+
+		doInHibernate(this::sessionFactory, session -> {
+			Product product = session.get(Product.class, 1);
+			assertEquals(bitSet, product.getBitSet());
+		});
+	}
+
+	@Test
+	public void testNativeQuery() {
+		BitSet bitSet = BitSet.valueOf(new long[] {1, 2, 3});
+
+		doInHibernate(this::sessionFactory, session -> {
+			Product product = new Product();
+			product.setId(1);
+			product.setBitSet(bitSet);
+			session.persist(product);
+		});
+
+		doInHibernate(this::sessionFactory, session -> {
+			Product product = session.createNamedQuery(
+					"find_person_by_bitset", Product.class)
+					.setParameter("id", 1L)
+					.getSingleResult();
+
+			assertEquals(bitSet, product.getBitSet());
+		});
+	}
+
+	@Override
+	protected boolean isCleanupTestDataRequired() {
+		return true;
+	}
+
+	@Type(BitSetUserType.class)
+	@Retention(RetentionPolicy.RUNTIME)
+	@interface BitSetType {}
+
+	@NamedNativeQuery(
+		name = "find_person_by_bitset",
+		query =
+			"SELECT " +
+			"   pr.id AS pr_id, " +
+			"   pr.bitset_col AS pr_bitset " +
+			"FROM products pr " +
+			"WHERE pr.id = :id",
+		resultSetMapping = "Person"
+	)
+	@SqlResultSetMapping(
+		name = "Person",
+		classes = @ConstructorResult(
+			targetClass = Product.class,
+			columns = {
+				@ColumnResult(name = "pr_id"),
+				@ColumnResult(name = "pr_bitset", type = BitSetUserType.class)
+			}
+		)
+	)
+	@Entity(name = "Product")
+	@Table(name = "products")
+	public static class Product {
+
+		@Id
+		private Integer id;
+
+		@BitSetType
+		@Column(name = "bitset_col")
+		private BitSet bitSet;
+
+		public Product() {
+		}
+
+		public Product(Number id, BitSet bitSet) {
+			this.id = id.intValue();
+			this.bitSet = bitSet;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public BitSet getBitSet() {
+			return bitSet;
+		}
+
+		public void setBitSet(BitSet bitSet) {
+			this.bitSet = bitSet;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetRegisteredUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetRegisteredUserTypeTest.java
index e3b9a8e73a8a..481c1eef34ee 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetRegisteredUserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetRegisteredUserTypeTest.java
@@ -74,8 +74,8 @@ public void testNativeQuery(SessionFactoryScope scope) {
 		name = "find_person_by_bitset",
 		query =
 			"SELECT " +
-			"   pr.id AS \"pr.id\", " +
-			"   pr.bitset_col AS \"pr.bitset\" " +
+			"   pr.id AS pr_id, " +
+			"   pr.bitset_col AS pr_bitset " +
 			"FROM Product pr " +
 			"WHERE pr.id = :id",
 		resultSetMapping = "Person"
@@ -85,8 +85,8 @@ public void testNativeQuery(SessionFactoryScope scope) {
 		classes = @ConstructorResult(
 			targetClass = Product.class,
 			columns = {
-				@ColumnResult(name = "pr.id"),
-				@ColumnResult(name = "pr.bitset", type = BitSetUserType.class)
+				@ColumnResult(name = "pr_id"),
+				@ColumnResult(name = "pr_bitset", type = BitSetUserType.class)
 			}
 		)
 	)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserTypeTest.java
index d99b913d10ed..b24a958af67d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/BitSetUserTypeTest.java
@@ -92,8 +92,8 @@ public void testNativeQuery(SessionFactoryScope scope) {
 		name = "find_person_by_bitset",
 		query =
 			"SELECT " +
-			"   pr.id AS \"pr.id\", " +
-			"   pr.bitset_col AS \"pr.bitset\" " +
+			"   pr.id AS pr_id, " +
+			"   pr.bitset_col AS pr_bitset " +
 			"FROM Product pr " +
 			"WHERE pr.id = :id",
 		resultSetMapping = "Person"
@@ -103,8 +103,8 @@ public void testNativeQuery(SessionFactoryScope scope) {
 		classes = @ConstructorResult(
 			targetClass = Product.class,
 			columns = {
-				@ColumnResult(name = "pr.id"),
-				@ColumnResult(name = "pr.bitset", type = BitSetUserType.class)
+				@ColumnResult(name = "pr_id"),
+				@ColumnResult(name = "pr_bitset", type = BitSetUserType.class)
 			}
 		)
 	)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/MetaUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/MetaUserTypeTest.java
new file mode 100644
index 000000000000..426f3ff63956
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/bitset/MetaUserTypeTest.java
@@ -0,0 +1,311 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.basic.bitset;
+
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.Parameter;
+import org.hibernate.annotations.Type;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.usertype.AnnotationBasedUserType;
+import org.hibernate.usertype.UserType;
+import org.hibernate.usertype.UserTypeCreationContext;
+import org.junit.jupiter.api.Test;
+
+import java.io.Serializable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.reflect.Field;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.time.Period;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static java.lang.Integer.parseInt;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.sql.Types.VARCHAR;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Jpa(annotatedClasses = {MetaUserTypeTest.Thing.class, MetaUserTypeTest.SecondThing.class,
+		MetaUserTypeTest.ThirdThing.class, MetaUserTypeTest.FourthThing.class, MetaUserTypeTest.Things.class})
+public class MetaUserTypeTest {
+
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Thing thing = new Thing();
+			thing.period = Period.of( 1, 2, 3 );
+			thing.days = Period.ofDays( 42 );
+			em.persist( thing );
+		} );
+		scope.inTransaction( em -> {
+			Thing thing = em.find( Thing.class, 1 );
+			assertEquals( Period.of( 1, 2, 3 ), thing.period );
+			assertEquals( Period.ofDays( 42 ), thing.days );
+		} );
+
+		scope.inTransaction( em -> {
+			SecondThing thing = new SecondThing();
+			thing.period = Period.of( 1, 2, 3 );
+			thing.days = Period.ofDays( 42 );
+			em.persist( thing );
+		} );
+		scope.inTransaction( em -> {
+			SecondThing thing = em.find( SecondThing.class, 1 );
+			assertEquals( Period.of( 1, 2, 3 ), thing.period );
+			assertEquals( Period.ofDays( 42 ), thing.days );
+		} );
+
+		scope.inTransaction( em -> {
+			ThirdThing thing = new ThirdThing();
+			thing.period = Period.of( 1, 2, 3 );
+			thing.days = Period.ofDays( 42 );
+			em.persist( thing );
+		} );
+		scope.inTransaction( em -> {
+			ThirdThing thing = em.find( ThirdThing.class, 1 );
+			assertEquals( Period.of( 1, 2, 3 ), thing.period );
+			assertEquals( Period.ofDays( 42 ), thing.days );
+		} );
+
+		scope.inTransaction( em -> {
+			FourthThing thing = new FourthThing();
+			thing.period = Period.of( 1, 2, 3 );
+			thing.days = Period.ofDays( 42 );
+			em.persist( thing );
+		} );
+		scope.inTransaction( em -> {
+			FourthThing thing = em.find( FourthThing.class, 1 );
+			assertEquals( Period.of( 1, 2, 3 ), thing.period );
+			assertEquals( Period.ofDays( 42 ), thing.days );
+		} );
+	}
+
+	@Test void testCollection(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Things things = new Things();
+			things.periods.add( Period.of( 1, 2, 3 ) );
+			things.days.add( Period.ofDays( 42 ) );
+			em.persist( things );
+		} );
+		scope.inTransaction( em -> {
+			Things things = em.find( Things.class, 1 );
+			assertEquals( Period.of( 1, 2, 3 ), things.periods.get( 0 ) );
+			assertEquals( Period.ofDays( 42 ), things.days.get( 0 ) );
+		} );
+	}
+
+	@Entity(name = "Thing")
+	static class Thing {
+		@Id @GeneratedValue
+		long id;
+		@TimePeriod
+		Period period;
+		@TimePeriod(days = true)
+		Period days;
+	}
+
+	@Entity(name = "SecondThing")
+	static class SecondThing {
+		@Id @GeneratedValue
+		long id;
+		@SecondTimePeriod
+		Period period;
+		@SecondTimePeriod(days = true)
+		Period days;
+	}
+
+	@Entity(name = "ThirdThing")
+	static class ThirdThing {
+		@Id @GeneratedValue
+		long id;
+		@ThirdTimePeriod
+		Period period;
+		@ThirdTimePeriod(days = true)
+		Period days;
+	}
+
+	@Entity(name = "FourthThing")
+	static class FourthThing {
+		@Id @GeneratedValue
+		long id;
+		@FourthTimePeriod
+		Period period;
+		@FourthTimePeriod(days = true)
+		Period days;
+	}
+
+	@Entity(name = "Things")
+	static class Things {
+		@Id @GeneratedValue
+		long id;
+		@TimePeriod
+		@ElementCollection
+		@CollectionTable(name = "Periods")
+		List<Period> periods = new ArrayList<>();
+		@TimePeriod(days = true)
+		@ElementCollection
+		@CollectionTable(name = "Days")
+		List<Period> days = new ArrayList<>();
+	}
+
+	@Type(PeriodType.class)
+	@Target({METHOD, FIELD})
+	@Retention(RUNTIME)
+	public @interface TimePeriod {
+		boolean days() default false;
+	}
+
+	@Type(SecondPeriodType.class)
+	@Target({METHOD, FIELD})
+	@Retention(RUNTIME)
+	public @interface SecondTimePeriod {
+		boolean days() default false;
+	}
+
+	@Type(ThirdPeriodType.class)
+	@Target({METHOD, FIELD})
+	@Retention(RUNTIME)
+	public @interface ThirdTimePeriod {
+		boolean days() default false;
+	}
+
+	@Type(value = FourthPeriodType.class, parameters = @Parameter(name="foo", value ="bar"))
+	@Target({METHOD, FIELD})
+	@Retention(RUNTIME)
+	public @interface FourthTimePeriod {
+		boolean days() default false;
+	}
+
+	static class PeriodType extends AbstractPeriodType {
+
+		PeriodType(TimePeriod timePeriod) {
+			super(timePeriod.days());
+		}
+
+	}
+
+	static class SecondPeriodType extends AbstractPeriodType {
+
+		SecondPeriodType(UserTypeCreationContext context) {
+			super( ( (Field) context.getMemberDetails().toJavaMember() ).getAnnotation( SecondTimePeriod.class ).days() );
+		}
+
+	}
+
+	static class ThirdPeriodType extends AbstractPeriodType {
+
+		ThirdPeriodType(ThirdTimePeriod timePeriod, UserTypeCreationContext context) {
+			super(timePeriod.days());
+			if ( !timePeriod.equals( ( (Field) context.getMemberDetails().toJavaMember() ).getAnnotation( ThirdTimePeriod.class ) )) {
+				throw new IllegalArgumentException(context.getMemberDetails().toJavaMember() + " should be annotated with " + timePeriod);
+			}
+		}
+
+	}
+
+	static class FourthPeriodType extends AbstractPeriodType implements AnnotationBasedUserType<FourthTimePeriod, Period> {
+
+		FourthPeriodType() {
+			super(false);
+		}
+
+		@Override
+		public void initialize(FourthTimePeriod timePeriod, UserTypeCreationContext context) {
+			days = timePeriod.days();
+			if ( !timePeriod.equals( ( (Field) context.getMemberDetails().toJavaMember() ).getAnnotation( FourthTimePeriod.class ) )) {
+				// only for validation
+				throw new IllegalArgumentException(context.getMemberDetails().toJavaMember() + " should be annotated with " + timePeriod);
+			}
+			assertEquals( "bar", context.getParameters().get("foo") );
+		}
+	}
+
+	static abstract class AbstractPeriodType implements UserType<Period> {
+		boolean days;
+
+		AbstractPeriodType(boolean days) {
+			this.days = days;
+		}
+
+		@Override
+		public int getSqlType() {
+			return VARCHAR;
+		}
+
+		@Override
+		public Class<Period> returnedClass() {
+			return Period.class;
+		}
+
+		@Override
+		public boolean equals(Period x, Period y) {
+			return Objects.equals(x, y);
+		}
+
+		@Override
+		public int hashCode(Period x) {
+			return x.hashCode();
+		}
+
+		@Override
+		public Period nullSafeGet(ResultSet rs, int position, WrapperOptions options)
+				throws SQLException {
+			String string = rs.getString(position);
+			if ( rs.wasNull() ) {
+				return null;
+			}
+			else if ( days ) {
+				return Period.ofDays( parseInt( string ) );
+			}
+			else {
+				return Period.parse( string );
+			}
+		}
+
+		@Override
+		public void nullSafeSet(PreparedStatement st, Period value, int index, WrapperOptions options)
+				throws SQLException {
+			if ( value == null ) {
+				st.setNull(index, VARCHAR);
+			}
+			else if ( days ) {
+				st.setString(index, Integer.toString(value.getDays()));
+			}
+			else {
+				st.setString(index, value.toString());
+			}
+		}
+
+		@Override
+		public boolean isMutable() {
+			return false;
+		}
+
+		@Override
+		public Period deepCopy(Period value) {
+			return value; // Period is immutable
+		}
+
+		@Override
+		public Serializable disassemble(Period period) {
+			return period; // Period is immutable
+		}
+
+		@Override
+		public Period assemble(Serializable cached, Object owner) {
+			return (Period) cached; // Period is immutable
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ArrayTest.java
index 564e78a9e05b..07c81136d0f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ArrayTest.java
@@ -7,28 +7,36 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
-import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
+import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
 /**
  * @author Vlad Mihalcea
  */
-@Jpa( annotatedClasses = {ArrayTest.Person.class} )
+@SessionFactory
+@DomainModel( annotatedClasses = {ArrayTest.Person.class} )
+@BootstrapServiceRegistry(
+		// Clear the type cache, otherwise we might run into ORA-21700: object does not exist or is marked for delete
+		integrators = SharedDriverManagerTypeCacheClearingIntegrator.class
+)
 public class ArrayTest {
 
 	@Test
-	public void testLifecycle(EntityManagerFactoryScope scope) {
-		scope.inTransaction( entityManager -> {
+	public void testLifecycle(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
 			Person person = new Person(1L);
 			String[] phones = new String[2];
 			phones[0] = "028-234-9876";
 			phones[1] = "072-122-9876";
 			person.setPhones(phones);
-			entityManager.persist(person);
+			session.persist(person);
 		});
-		scope.inTransaction( entityManager -> {
-			Person person = entityManager.find(Person.class, 1L);
+		scope.inTransaction( session -> {
+			Person person = session.find(Person.class, 1L);
 			String[] phones = new String[1];
 			phones[0] = "072-122-9876";
 			person.setPhones(phones);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOneToManyTest.java
new file mode 100644
index 000000000000..b02d92f30aee
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/BidirectionalOneToManyTest.java
@@ -0,0 +1,122 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.collections;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@Jpa( annotatedClasses = {BidirectionalOneToManyTest.Organization.class, BidirectionalOneToManyTest.User.class} )
+@Jira("https://hibernate.atlassian.net/browse/HHH-19963")
+public class BidirectionalOneToManyTest {
+
+	@Test
+	public void testParentNotTreatedAsBidirectional(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			Organization o3 = new Organization( 3L, "o3", null, new ArrayList<>() );
+			Organization o1 = new Organization( 1L, "o1", null, new ArrayList<>( Arrays.asList( o3 )) );
+			Organization o2 = new Organization( 2L, "o2", o1, new ArrayList<>() );
+			entityManager.persist(o3);
+			entityManager.persist(o1);
+			entityManager.persist(o2);
+
+			User u1 = new User( 1L, o2 );
+			User u2 = new User( 2L, o2 );
+			entityManager.persist(u1);
+			entityManager.persist(u2);
+		});
+
+		scope.inTransaction( entityManager -> {
+			User user1 = entityManager.find(User.class, 1L);
+			Organization ou3 = entityManager.find(Organization.class, 3L);
+			assertNull( ou3.getParentOrganization(), "Parent of o3 is null");
+			assertEquals(0, ou3.getPredecessorOrganizations().size(), "Predecessors of o3 is empty");
+		});
+	}
+
+	@Entity(name = "Organization")
+	public static class Organization {
+
+		@Id
+		private Long id;
+		private String name;
+
+		@ManyToOne(fetch = FetchType.EAGER)
+		@JoinColumn(name = "parentorganization_objectId")
+		private Organization parentOrganization;
+
+		@ManyToMany(fetch = FetchType.EAGER)
+		@JoinTable(name = "organization_predecessor")
+		private List<Organization> predecessorOrganizations = new ArrayList<>();
+
+		public Organization() {
+		}
+
+		public Organization(Long id, String name, Organization parentOrganization, List<Organization> predecessorOrganizations) {
+			this.id = id;
+			this.name = name;
+			this.parentOrganization = parentOrganization;
+			this.predecessorOrganizations = predecessorOrganizations;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public Organization getParentOrganization() {
+			return parentOrganization;
+		}
+
+		public List<Organization> getPredecessorOrganizations() {
+			return predecessorOrganizations;
+		}
+	}
+
+	@Entity(name = "User")
+	@Table(name = "usr_tbl")
+	public static class User {
+
+		@Id
+		private Long id;
+		@ManyToOne(fetch = FetchType.EAGER)
+		private Organization organization;
+
+		public User() {
+		}
+
+		public User(Long id, Organization organization) {
+			this.id = id;
+			this.organization = organization;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public Organization getOrganization() {
+			return organization;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionSetNullableUniqueKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionSetNullableUniqueKeyTest.java
new file mode 100644
index 000000000000..747970d00b82
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ElementCollectionSetNullableUniqueKeyTest.java
@@ -0,0 +1,145 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.collections;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OrderColumn;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.SpannerDialect;
+import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.util.ServiceRegistryUtil;
+import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@BaseUnitTest
+@SkipForDialect( dialectClass = SybaseDialect.class, matchSubTypes = true,
+		reason = "Sybase does not support unique constraints on nullable columns" )
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+		reason = "Spanner automatically creates primary key if it doesn't exist")
+@SkipForDialect( dialectClass = SpannerDialect.class,
+		reason = "Spanner automatically creates primary key if it doesn't exist")
+public class ElementCollectionSetNullableUniqueKeyTest {
+	private StandardServiceRegistry ssr;
+
+	@BeforeEach
+	public void setUp() {
+		ssr = ServiceRegistryUtil.serviceRegistry();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		if ( ssr != null ) {
+			StandardServiceRegistryBuilder.destroy( ssr );
+		}
+	}
+
+	@Test
+	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix treats two nulls as equal, which is why we don't create a unique constraint")
+	void createsUniqueKeyForSetAndPrimaryKeyForOrderedList() {
+		final var metadata = (MetadataImplementor)
+				new MetadataSources( ssr )
+						.addAnnotatedClass( Book.class )
+						.buildMetadata();
+		metadata.orderColumns( true );
+		metadata.validate();
+
+		final List<String> commands =
+				new SchemaCreatorImpl( ssr )
+						.generateCreationCommands( metadata, false );
+
+		final Dialect dialect = metadata.getDatabase().getDialect();
+		final String topicsTableCreateCommand = findCreateTableCommand( dialect, commands, "book_topics" );
+		assertNotNull( topicsTableCreateCommand );
+
+		assertThat( topicsTableCreateCommand )
+				.containsPattern( "\"?book_isbn\"?\\s+[^,]*\\bnot\\s+null\\b" )
+				.doesNotContainPattern( "\\bprimary\\s+key\\b" );
+		assertTrue( hasUniqueTupleDefinition( commands, "book_topics", "book_isbn", "topics" ) );
+
+		final String commentsTableCreateCommand = findCreateTableCommand( dialect, commands, "book_comments" );
+		assertNotNull( commentsTableCreateCommand );
+
+		assertThat( commentsTableCreateCommand )
+				.containsPattern( "\"?book_isbn\"?\\s+[^,]*\\bnot\\s+null\\b" )
+				.containsPattern( "\"?comments_order\"?\\s+.*\\bnot\\s+null\\b.*\\bcheck\\s" )
+				.containsPattern( "\\bcheck\\s*\\(\\s*\\(?\\s*\"?comments_order\"?\\s*>=\\s*0\\s*\\)?\\s*\\)" )
+				.containsPattern(
+						"\\bprimary\\s+key\\s*\\(\\s*(?:\"?book_isbn\"?\\s*,\\s*\"?comments_order\"?|\"?comments_order\"?\\s*,\\s*\"?book_isbn\"?)\\s*\\)"
+				)
+				.doesNotContainPattern( "\\bunique\\s*\\(\\s*\"?book_isbn\"?\\s*,\\s*\"?comments\"?\\s*\\)" );
+		assertFalse( hasUniqueTupleDefinition( commands, "book_comments", "book_isbn", "comments" ) );
+	}
+
+	private static String findCreateTableCommand(Dialect dialect, List<String> commands, String tableName) {
+		final String createTableString = dialect.getCreateTableString().toLowerCase( Locale.ROOT );
+		for ( String command : commands ) {
+			final String lowerCaseCommand = command.toLowerCase( Locale.ROOT );
+			if ( lowerCaseCommand.contains( createTableString ) && lowerCaseCommand.contains( tableName ) ) {
+				return lowerCaseCommand;
+			}
+		}
+		return null;
+	}
+
+	private static boolean hasUniqueTupleDefinition(
+			List<String> commands,
+			String tableName,
+			String firstColumn,
+			String secondColumn) {
+		final String uniqueConstraintPattern = "\\bunique\\s*\\(\\s*" + columnPattern( firstColumn )
+				+ "\\s*,\\s*" + columnPattern( secondColumn ) + "\\s*\\)";
+		final String uniqueIndexPattern = "\\bcreate\\s+unique(?:\\s+\\w+)*\\s+index\\b[^\\(]*\\(\\s*"
+				+ columnPattern( firstColumn ) + "\\s*,\\s*" + columnPattern( secondColumn ) + "\\s*\\)";
+
+		for ( String command : commands ) {
+			final String lowerCaseCommand = command.toLowerCase( Locale.ROOT );
+			if ( lowerCaseCommand.contains( tableName )
+					&& ( lowerCaseCommand.matches( ".*" + uniqueConstraintPattern + ".*" )
+						|| lowerCaseCommand.matches( ".*" + uniqueIndexPattern + ".*" ) ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private static String columnPattern(String columnName) {
+		return "[\"`\\[]?" + columnName + "[\"`\\]]?";
+	}
+
+	@Entity(name = "Book")
+	public static class Book {
+		@Id
+		private String isbn;
+
+		@ElementCollection
+		private Set<String> topics;
+
+		@ElementCollection
+		@OrderColumn
+		private List<String> comments;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyTypeTest.java
index 7492310e1015..ea2fe1f1bf75 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapKeyTypeTest.java
@@ -66,7 +66,7 @@ public void testLifecycle() {
 
 		EntityManagerFactory entityManagerFactory = null;
 		try {
-			Map settings = buildSettings();
+			Map<String, Object> settings = buildSettings();
 			settings.put(
 				AvailableSettings.LOADED_CLASSES,
 				Collections.singletonList(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterDefinitionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterDefinitionTest.java
index 149a044509e9..8d5f70fd6ac5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterDefinitionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterDefinitionTest.java
@@ -6,8 +6,6 @@
 
 import jakarta.persistence.AttributeConverter;
 import org.hibernate.boot.model.convert.internal.ConverterDescriptors;
-import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
-import org.hibernate.testing.boot.BootstrapContextImpl;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -18,7 +16,8 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.hibernate.internal.util.GenericsHelper.erasedType;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @JiraKey(value = "HHH-8854")
 class AttributeConverterDefinitionTest {
@@ -26,13 +25,8 @@ class AttributeConverterDefinitionTest {
 	@MethodSource("arguments")
 	@ParameterizedTest
 	void test(Class<? extends AttributeConverter<?, ?>> attributeConverterClass, Class<?> expectedType) {
-		try (BootstrapContextImpl bootstrapContext = new BootstrapContextImpl()) {
-			final ConverterDescriptor<?,?> converterDescriptor =
-					ConverterDescriptors.of( attributeConverterClass,
-							bootstrapContext.getClassmateContext() );
-			assertThat( converterDescriptor.getDomainValueResolvedType().getErasedType() )
-					.isEqualTo( expectedType );
-		}
+		final var converterDescriptor = ConverterDescriptors.of( attributeConverterClass );
+		assertEquals( expectedType, erasedType( converterDescriptor.getDomainValueResolvedType() ) );
 	}
 
 	private static Stream<Arguments> arguments() {
@@ -67,7 +61,7 @@ public static class AttrConverterPlainExtendedImplements extends AttrConverterPl
 			implements AttributeConverter<LocalDate, String> {
 	}
 
-	public static interface AttrConverterSameType<T> extends AttributeConverter<T, T> {
+	public interface AttrConverterSameType<T> extends AttributeConverter<T, T> {
 	}
 
 	public static class AttrConverterSameTypeImpl implements AttrConverterSameType<String> {
@@ -83,7 +77,7 @@ public String convertToEntityAttribute(String dbData) {
 		}
 	}
 
-	public static interface DelegatingAttributeConverter<T, V> extends AttributeConverter<T, V> {
+	public interface DelegatingAttributeConverter<T, V> extends AttributeConverter<T, V> {
 		AttributeConverter<T, V> delegate();
 
 		@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java
index 85e1e5be68b5..bc9a79e27d35 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java
@@ -10,32 +10,23 @@
 import java.time.Instant;
 
 import org.hibernate.IrrelevantEntity;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.model.convert.internal.ConverterDescriptors;
-import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.ConfigHelper;
 import org.hibernate.mapping.BasicValue;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.metamodel.mapping.JdbcMapping;
-import org.hibernate.resource.beans.spi.ManagedBean;
-import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.type.AbstractStandardBasicType;
 import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.java.EnumJavaType;
 import org.hibernate.type.descriptor.java.StringJavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
-import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.internal.ConvertedBasicTypeImpl;
 
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -71,13 +62,13 @@
 public class AttributeConverterTest {
 	@Test
 	public void testErrorInstantiatingConverterClass() {
-		Configuration cfg = new Configuration();
+		var cfg = new Configuration();
 		ServiceRegistryUtil.applySettings( cfg.getStandardServiceRegistryBuilder() );
 		try {
 			cfg.addAttributeConverter( BlowsUpConverter.class );
-			try ( final SessionFactoryImplementor sessionFactory = (SessionFactoryImplementor) cfg.buildSessionFactory() ) {
-				final ManagedBeanRegistry managedBeanRegistry = sessionFactory.getManagedBeanRegistry();
-				final ManagedBean<BlowsUpConverter> converterBean = managedBeanRegistry.getBean( BlowsUpConverter.class );
+			try ( final var sessionFactory = (SessionFactoryImplementor) cfg.buildSessionFactory() ) {
+				final var managedBeanRegistry = sessionFactory.getManagedBeanRegistry();
+				final var converterBean = managedBeanRegistry.getBean( BlowsUpConverter.class );
 				converterBean.getBeanInstance();
 				fail( "expecting an exception" );
 			}
@@ -108,25 +99,22 @@ public String convertToEntityAttribute(String dbData) {
 
 	@Test
 	public void testBasicOperation() {
-		try ( StandardServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistry()) {
-			final MetadataBuildingContext buildingContext = new MetadataBuildingContextTestingImpl( serviceRegistry );
-			final JdbcTypeRegistry jdbcTypeRegistry = buildingContext.getBootstrapContext()
+		try ( var serviceRegistry = ServiceRegistryUtil.serviceRegistry()) {
+			final var buildingContext = new MetadataBuildingContextTestingImpl( serviceRegistry );
+			final var jdbcTypeRegistry = buildingContext.getBootstrapContext()
 					.getTypeConfiguration()
 					.getJdbcTypeRegistry();
-			final BasicValue basicValue = new BasicValue( buildingContext );
+			final var basicValue = new BasicValue( buildingContext );
 			basicValue.setJpaAttributeConverterDescriptor(
-					ConverterDescriptors.of(
-							new StringClobConverter(),
-							new ClassmateContext()
-					)
+					ConverterDescriptors.of( new StringClobConverter() )
 			);
 			basicValue.setTypeUsingReflection( IrrelevantEntity.class.getName(), "name" );
 
-			final Type type = basicValue.getType();
+			final var type = basicValue.getType();
 			assertNotNull( type );
 			assertThat( type, instanceOf( ConvertedBasicTypeImpl.class ) );
 
-			final JdbcMapping jdbcMapping = (JdbcMapping) type;
+			final var jdbcMapping = (JdbcMapping) type;
 
 			assertThat( jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass(), equalTo( String.class ) );
 
@@ -137,19 +125,19 @@ public void testBasicOperation() {
 
 	@Test
 	public void testNonAutoApplyHandling() {
-		final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
+		final var ssr = ServiceRegistryUtil.serviceRegistry();
 
 		try {
-			MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
+			var metadata = (MetadataImplementor) new MetadataSources( ssr )
 					.addAnnotatedClass( Tester.class )
 					.getMetadataBuilder()
 					.applyAttributeConverter( NotAutoAppliedConverter.class, false )
 					.build();
 
-			PersistentClass tester = metadata.getEntityBinding( Tester.class.getName() );
-			Property nameProp = tester.getProperty( "name" );
-			SimpleValue nameValue = (SimpleValue) nameProp.getValue();
-			Type type = nameValue.getType();
+			var tester = metadata.getEntityBinding( Tester.class.getName() );
+			var nameProp = tester.getProperty( "name" );
+			var nameValue = (SimpleValue) nameProp.getValue();
+			var type = nameValue.getType();
 			assertNotNull( type );
 			if ( ConvertedBasicTypeImpl.class.isInstance( type ) ) {
 				fail( "AttributeConverter with autoApply=false was auto applied" );
@@ -163,28 +151,28 @@ public void testNonAutoApplyHandling() {
 
 	@Test
 	public void testBasicConverterApplication() {
-		final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
+		final var ssr = ServiceRegistryUtil.serviceRegistry();
 
 		try {
-			final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
+			final var metadata = (MetadataImplementor) new MetadataSources( ssr )
 					.addAnnotatedClass( Tester.class )
 					.getMetadataBuilder()
 					.applyAttributeConverter( StringClobConverter.class, true )
 					.build();
-			final JdbcTypeRegistry jdbcTypeRegistry = metadata.getTypeConfiguration()
+			final var jdbcTypeRegistry = metadata.getTypeConfiguration()
 					.getJdbcTypeRegistry();
 
-			final PersistentClass tester = metadata.getEntityBinding( Tester.class.getName() );
-			final Property nameProp = tester.getProperty( "name" );
-			final BasicValue nameValue = (BasicValue) nameProp.getValue();
-			final Type type = nameValue.getType();
+			final var tester = metadata.getEntityBinding( Tester.class.getName() );
+			final var nameProp = tester.getProperty( "name" );
+			final var nameValue = (BasicValue) nameProp.getValue();
+			final var type = nameValue.getType();
 			assertNotNull( type );
 
 			assertThat( type, instanceOf( ConvertedBasicTypeImpl.class ) );
 
-			final JdbcMapping jdbcMapping = (JdbcMapping) type;
+			final var jdbcMapping = (JdbcMapping) type;
 			assertThat( jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass(), Matchers.equalTo( String.class ) );
-			final JdbcType jdbcType = jdbcMapping.getJdbcType();
+			final var jdbcType = jdbcMapping.getJdbcType();
 			assertThat( jdbcType, is( jdbcTypeRegistry.getDescriptor( Types.CLOB ) ) );
 		}
 		finally {
@@ -195,30 +183,30 @@ public void testBasicConverterApplication() {
 	@Test
 	@JiraKey(value = "HHH-8462")
 	public void testBasicOrmXmlConverterApplication() {
-		final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
+		final var ssr = ServiceRegistryUtil.serviceRegistry();
 
 		try {
-			MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
+			var metadata = (MetadataImplementor) new MetadataSources( ssr )
 					.addAnnotatedClass( Tester.class )
 					.addURL( ConfigHelper.findAsResource( "org/hibernate/test/converter/orm.xml" ) )
 					.getMetadataBuilder()
 					.build();
-			final JdbcTypeRegistry jdbcTypeRegistry = metadata.getTypeConfiguration()
+			final var jdbcTypeRegistry = metadata.getTypeConfiguration()
 					.getJdbcTypeRegistry();
 
-			PersistentClass tester = metadata.getEntityBinding( Tester.class.getName() );
-			Property nameProp = tester.getProperty( "name" );
-			BasicValue nameValue = (BasicValue) nameProp.getValue();
-			Type type = nameValue.getType();
+			var tester = metadata.getEntityBinding( Tester.class.getName() );
+			var nameProp = tester.getProperty( "name" );
+			var nameValue = (BasicValue) nameProp.getValue();
+			var type = nameValue.getType();
 			assertNotNull( type );
 			assertThat( type, instanceOf( ConvertedBasicTypeImpl.class ) );
 
-			final JdbcMapping jdbcMapping = (JdbcMapping) type;
+			final var jdbcMapping = (JdbcMapping) type;
 
 			assertThat( jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass(), equalTo( String.class ) );
 			assertThat( jdbcMapping.getJdbcJavaType().getJavaTypeClass(), equalTo( Clob.class ) );
 
-			final JdbcType jdbcType = jdbcMapping.getJdbcType();
+			final var jdbcType = jdbcMapping.getJdbcType();
 			assertThat( jdbcType, is( jdbcTypeRegistry.getDescriptor( Types.CLOB ) ) );
 		}
 		finally {
@@ -229,32 +217,32 @@ public void testBasicOrmXmlConverterApplication() {
 	@Test
 	@JiraKey(value = "HHH-14881")
 	public void testBasicOrmXmlConverterWithOrmXmlPackage() {
-		final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
+		final var ssr = ServiceRegistryUtil.serviceRegistry();
 
 		try {
-			MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
+			var metadata = (MetadataImplementor) new MetadataSources( ssr )
 					.addAnnotatedClass( Tester.class )
 					.addURL( ConfigHelper.findAsResource( "org/hibernate/test/converter/package.xml" ) )
 					.getMetadataBuilder()
 					.build();
-			final JdbcTypeRegistry jdbcTypeRegistry = metadata.getTypeConfiguration()
+			final var jdbcTypeRegistry = metadata.getTypeConfiguration()
 					.getJdbcTypeRegistry();
 
-			PersistentClass tester = metadata.getEntityBinding( Tester.class.getName() );
-			Property nameProp = tester.getProperty( "name" );
-			SimpleValue nameValue = (SimpleValue) nameProp.getValue();
-			Type type = nameValue.getType();
+			var tester = metadata.getEntityBinding( Tester.class.getName() );
+			var nameProp = tester.getProperty( "name" );
+			var nameValue = (SimpleValue) nameProp.getValue();
+			var type = nameValue.getType();
 			assertNotNull( type );
 			if ( !ConvertedBasicTypeImpl.class.isInstance( type ) ) {
 				fail( "AttributeConverter not applied" );
 			}
 
-			final JdbcMapping jdbcMapping = (JdbcMapping) type;
+			final var jdbcMapping = (JdbcMapping) type;
 
 			assertThat( jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass(), equalTo( String.class ) );
 			assertThat( jdbcMapping.getJdbcJavaType().getJavaTypeClass(), equalTo( Clob.class ) );
 
-			final JdbcType sqlTypeDescriptor = jdbcMapping.getJdbcType();
+			final var sqlTypeDescriptor = jdbcMapping.getJdbcType();
 			assertThat( sqlTypeDescriptor, is( jdbcTypeRegistry.getDescriptor( Types.CLOB ) ) );
 		}
 		finally {
@@ -268,23 +256,23 @@ public void testBasicConverterDisableApplication() {
 		final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
 
 		try {
-			MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
+			var metadata = (MetadataImplementor) new MetadataSources( ssr )
 					.addAnnotatedClass( Tester2.class )
 					.getMetadataBuilder()
 					.applyAttributeConverter( StringClobConverter.class, true )
 					.build();
-			final JdbcTypeRegistry jdbcTypeRegistry = metadata.getTypeConfiguration()
+			final var jdbcTypeRegistry = metadata.getTypeConfiguration()
 					.getJdbcTypeRegistry();
 
-			PersistentClass tester = metadata.getEntityBinding( Tester2.class.getName() );
-			Property nameProp = tester.getProperty( "name" );
-			SimpleValue nameValue = (SimpleValue) nameProp.getValue();
-			Type type = nameValue.getType();
+			var tester = metadata.getEntityBinding( Tester2.class.getName() );
+			var nameProp = tester.getProperty( "name" );
+			var nameValue = (SimpleValue) nameProp.getValue();
+			var type = nameValue.getType();
 			assertNotNull( type );
 			if ( ConvertedBasicTypeImpl.class.isInstance( type ) ) {
 				fail( "AttributeConverter applied (should not have been)" );
 			}
-			AbstractStandardBasicType basicType = assertTyping( AbstractStandardBasicType.class, type );
+			var basicType = assertTyping( AbstractStandardBasicType.class, type );
 			assertSame( StringJavaType.INSTANCE, basicType.getJavaTypeDescriptor() );
 			assertEquals( jdbcTypeRegistry.getDescriptor( Types.VARCHAR ), basicType.getJdbcType() );
 		}
@@ -295,15 +283,15 @@ public void testBasicConverterDisableApplication() {
 
 	@Test
 	public void testBasicUsage() {
-		Configuration cfg = new Configuration();
+		var cfg = new Configuration();
 		ServiceRegistryUtil.applySettings( cfg.getStandardServiceRegistryBuilder() );
 		cfg.addAttributeConverter( IntegerToVarcharConverter.class, false );
 		cfg.addAnnotatedClass( Tester4.class );
 		cfg.setProperty( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
 		cfg.setProperty( AvailableSettings.GENERATE_STATISTICS, "true" );
 
-		try (SessionFactory sf = cfg.buildSessionFactory()) {
-			Session session = sf.openSession();
+		try (var sf = cfg.buildSessionFactory()) {
+			var session = sf.openSession();
 			session.beginTransaction();
 			session.persist( new Tester4( 1L, "steve", 200 ) );
 			session.getTransaction().commit();
@@ -337,21 +325,21 @@ public void testBasicUsage() {
 	@Test
 	@JiraKey( value = "HHH-14206" )
 	public void testPrimitiveTypeConverterAutoApplied() {
-		final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
+		final var ssr = ServiceRegistryUtil.serviceRegistry();
 
 		try {
-			final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
+			final var metadata = (MetadataImplementor) new MetadataSources( ssr )
 					.addAnnotatedClass( Tester5.class )
 					.getMetadataBuilder()
 					.applyAttributeConverter( IntegerToVarcharConverter.class, true )
 					.build();
-			final JdbcTypeRegistry jdbcTypeRegistry = metadata.getTypeConfiguration()
+			final var jdbcTypeRegistry = metadata.getTypeConfiguration()
 					.getJdbcTypeRegistry();
 
-			final PersistentClass tester = metadata.getEntityBinding( Tester5.class.getName() );
-			final Property codeProp = tester.getProperty( "code" );
-			final BasicValue nameValue = (BasicValue) codeProp.getValue();
-			Type type = nameValue.getType();
+			final var tester = metadata.getEntityBinding( Tester5.class.getName() );
+			final var codeProp = tester.getProperty( "code" );
+			final var nameValue = (BasicValue) codeProp.getValue();
+			var type = nameValue.getType();
 			assertNotNull( type );
 			assertThat( type, instanceOf( ConvertedBasicTypeImpl.class ) );
 
@@ -368,15 +356,15 @@ public void testPrimitiveTypeConverterAutoApplied() {
 
 	@Test
 	public void testBasicTimestampUsage() {
-		Configuration cfg = new Configuration();
+		var cfg = new Configuration();
 		ServiceRegistryUtil.applySettings( cfg.getStandardServiceRegistryBuilder() );
 		cfg.addAttributeConverter( InstantConverter.class, false );
 		cfg.addAnnotatedClass( IrrelevantInstantEntity.class );
 		cfg.setProperty( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
 		cfg.setProperty( AvailableSettings.GENERATE_STATISTICS, "true" );
 
-		try (SessionFactory sf = cfg.buildSessionFactory()) {
-			Session session = sf.openSession();
+		try (var sf = cfg.buildSessionFactory()) {
+			var session = sf.openSession();
 			session.beginTransaction();
 			session.persist( new IrrelevantInstantEntity( 1L ) );
 			session.getTransaction().commit();
@@ -401,38 +389,38 @@ public void testBasicTimestampUsage() {
 	@Test
 	@JiraKey(value = "HHH-8866")
 	public void testEnumConverter() {
-		final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
+		final var ssr = ServiceRegistryUtil.serviceRegistryBuilder()
 				.applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" )
 				.build();
 
 		try {
-			MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
+			var metadata = (MetadataImplementor) new MetadataSources( ssr )
 					.addAnnotatedClass( EntityWithConvertibleField.class )
 					.getMetadataBuilder()
 					.applyAttributeConverter( ConvertibleEnumConverter.class, true )
 					.build();
-			final JdbcTypeRegistry jdbcTypeRegistry = metadata.getTypeConfiguration()
+			final var jdbcTypeRegistry = metadata.getTypeConfiguration()
 					.getJdbcTypeRegistry();
 
 			// first lets validate that the converter was applied...
-			final PersistentClass tester = metadata.getEntityBinding( EntityWithConvertibleField.class.getName() );
-			final Property nameProp = tester.getProperty( "convertibleEnum" );
-			final BasicValue nameValue = (BasicValue) nameProp.getValue();
-			final Type type = nameValue.getType();
+			final var tester = metadata.getEntityBinding( EntityWithConvertibleField.class.getName() );
+			final var nameProp = tester.getProperty( "convertibleEnum" );
+			final var nameValue = (BasicValue) nameProp.getValue();
+			final var type = nameValue.getType();
 			assertNotNull( type );
 			assertThat( type, instanceOf( ConvertedBasicTypeImpl.class ) );
 
-			final JdbcMapping jdbcMapping = (JdbcMapping) type;
+			final var jdbcMapping = (JdbcMapping) type;
 
 			assertThat( jdbcMapping.getJavaTypeDescriptor(), instanceOf( EnumJavaType.class ) );
 			assertThat( jdbcMapping.getJdbcType(), is( jdbcTypeRegistry.getDescriptor( Types.VARCHAR ) ) );
 
 			// then lets build the SF and verify its use...
-			final SessionFactory sf = metadata.buildSessionFactory();
+			final var sf = metadata.buildSessionFactory();
 			try {
-				Session s = sf.openSession();
+				var s = sf.openSession();
 				s.getTransaction().begin();
-				EntityWithConvertibleField entity = new EntityWithConvertibleField();
+				var entity = new EntityWithConvertibleField();
 				entity.setId( "ID" );
 				entity.setConvertibleEnum( ConvertibleEnum.VALUE );
 				String entityID = entity.getId();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java
index 82a1548aee97..42fd47ea2e2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/QueryTest.java
@@ -19,6 +19,8 @@
 import jakarta.persistence.Table;
 
 import org.hibernate.HibernateException;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.query.NativeQuery;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -71,7 +73,13 @@ public void testNativeQueryResult(SessionFactoryScope scope) {
 			assertThat( results ).hasSize( 1 );
 
 			final Object[] values = results.get( 0 );
-			assertThat( values[0] ).isEqualTo( 1 );
+			if( scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+				scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect) {
+				assertThat( values[0] ).isEqualTo( 1L );
+			}
+			else {
+				assertThat( values[0] ).isEqualTo( 1 );
+			}
 			assertThat( values[1] ).isEqualTo( SALARY );
 		} );
 	}
@@ -85,7 +93,13 @@ public void testNativeQueryResultWithResultClass(SessionFactoryScope scope) {
 			assertThat( results ).hasSize( 1 );
 
 			final Object[] values = results.get( 0 );
-			assertThat( values[0] ).isEqualTo( 1 );
+			if( scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+				scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect ) {
+				assertThat( values[0] ).isEqualTo( 1L );
+			}
+			else {
+				assertThat( values[0] ).isEqualTo( 1 );
+			}
 			assertThat( values[1] ).isEqualTo( SALARY );
 		} );
 	}
@@ -100,7 +114,13 @@ public void testAutoAppliedConverterAsNativeQueryResult(SessionFactoryScope scop
 			assertThat( results ).hasSize( 1 );
 
 			final Object[] values = results.get( 0 );
-			assertThat( values[0] ).isEqualTo( 1 );
+			if( scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+				scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect) {
+				assertThat( values[0] ).isEqualTo( 1L );
+			}
+			else {
+				assertThat( values[0] ).isEqualTo( 1 );
+			}
 			assertThat( values[1] ).isEqualTo( EXPECTED_NON_CONVERTED );
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java
index f2461f5480f8..6b8f27602f26 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java
@@ -20,6 +20,7 @@
 import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.java.StringJavaType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
+import org.hibernate.type.internal.BasicTypeImpl;
 import org.hibernate.type.internal.ConvertedBasicTypeImpl;
 
 import org.junit.jupiter.api.Test;
@@ -66,10 +67,27 @@ public void testDefinitionAtAttributeLevel(ServiceRegistryScope scope) {
 
 		PersistentClass pc = metadata.getEntityBinding( TheEntity.class.getName() );
 		BasicType<?> type = (BasicType<?>) pc.getProperty( "it" ).getType();
+		assertTyping( BasicTypeImpl.class, type ); // Should not be ConvertedBasicTypeImpl in particular
 		assertTyping( StringJavaType.class, type.getJavaTypeDescriptor() );
 		assertTyping( jdbcTypeRegistry.getDescriptor( Types.VARCHAR ).getClass(), type.getJdbcType() );
 	}
 
+	/**
+	 * A baseline test, with an explicit @Convert annotation at entity level that should be in effect
+	 */
+	@Test
+	public void baselineAtEntityLevel(ServiceRegistryScope scope) {
+		Metadata metadata = new MetadataSources( scope.getRegistry() )
+				.addAnnotatedClass( TheEntity2.class )
+				.buildMetadata();
+
+		PersistentClass pc = metadata.getEntityBinding( TheEntity2.class.getName() );
+		Type type = pc.getProperty( "it" ).getType();
+		ConvertedBasicTypeImpl adapter = assertTyping( ConvertedBasicTypeImpl.class, type );
+		final JpaAttributeConverter converter = (JpaAttributeConverter) adapter.getValueConverter();
+		assertTrue( SillyStringConverter.class.isAssignableFrom( converter.getConverterJavaType().getJavaTypeClass() ) );
+	}
+
 	/**
 	 * Test outcome of applying overrides via orm.xml, specifically at the entity level
 	 */
@@ -85,6 +103,7 @@ public void testDefinitionAtEntityLevel(ServiceRegistryScope scope) {
 
 		PersistentClass pc = metadata.getEntityBinding( TheEntity2.class.getName() );
 		BasicType<?> type = (BasicType<?>) pc.getProperty( "it" ).getType();
+		assertTyping( BasicTypeImpl.class, type ); // Should not be ConvertedBasicTypeImpl in particular
 		assertTyping( StringJavaType.class, type.getJavaTypeDescriptor() );
 		assertTyping( jdbcTypeRegistry.getDescriptor( Types.VARCHAR ).getClass(), type.getJdbcType() );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java
index 20a01a05e3a5..91d8d6e57eb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java
@@ -51,7 +51,7 @@ protected void performAssertions(
 			);
 
 			assertThat(
-					bootTypeConfiguration.getJavaTypeRegistry().getDescriptor( PayloadWrapper.class ),
+					bootTypeConfiguration.getJavaTypeRegistry().resolveDescriptor( PayloadWrapper.class ),
 					sameInstance( PayloadWrapperJavaType.INSTANCE )
 			);
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java
index 81a948601425..0c26edbb947c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java
@@ -12,18 +12,13 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
-import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.model.convert.internal.ConverterDescriptors;
-import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.internal.util.StringHelper;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.mapping.Property;
 import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter;
 import org.hibernate.type.internal.ConvertedBasicTypeImpl;
 
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.boot.BootstrapContextImpl;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 import org.junit.jupiter.api.Test;
@@ -45,21 +40,15 @@ public class ParameterizedAttributeConverterParameterTypeTest {
 	@Test
 	@JiraKey(value = "HHH-8804")
 	public void testGenericTypeParameters() {
-		final BootstrapContextImpl bootstrapContext = new BootstrapContextImpl();
-		try {
-			final ConverterDescriptor<List<String>, Integer> converterDescriptor =
-					ConverterDescriptors.of( CustomAttributeConverter.class,
-							bootstrapContext.getClassmateContext() );
-			assertEquals( List.class, converterDescriptor.getDomainValueResolvedType().getErasedType() );
-		} finally {
-			bootstrapContext.close();
-		}
+		final var converterDescriptor = ConverterDescriptors.of( CustomAttributeConverter.class );
+		assertEquals( "java.util.List<java.lang.String>",
+				converterDescriptor.getDomainValueResolvedType().getTypeName() );
 	}
 
 	@Test
 	@JiraKey( value = "HHH-10050" )
 	public void testNestedTypeParameterAutoApplication(ServiceRegistryScope scope) {
-		final Metadata metadata = new MetadataSources( scope.getRegistry() )
+		final var metadata = new MetadataSources( scope.getRegistry() )
 				.addAnnotatedClass( SampleEntity.class )
 				.getMetadataBuilder()
 				.applyAttributeConverter( IntegerListConverter.class )
@@ -67,25 +56,25 @@ public void testNestedTypeParameterAutoApplication(ServiceRegistryScope scope) {
 				.build();
 
 		// lets make sure the auto-apply converters were applied properly...
-		PersistentClass pc = metadata.getEntityBinding( SampleEntity.class.getName() );
+		var pc = metadata.getEntityBinding( SampleEntity.class.getName() );
 
 		{
-			Property prop = pc.getProperty( "someStrings" );
-			ConvertedBasicTypeImpl type = assertTyping(
+			var property = pc.getProperty( "someStrings" );
+			var type = assertTyping(
 					ConvertedBasicTypeImpl.class,
-					prop.getType()
+					property.getType()
 			);
-			JpaAttributeConverter converter = (JpaAttributeConverter) type.getValueConverter();
+			var converter = (JpaAttributeConverter) type.getValueConverter();
 			assertTrue( StringListConverter.class.isAssignableFrom( converter.getConverterJavaType().getJavaTypeClass() ) );
 		}
 
 		{
-			Property prop = pc.getProperty( "someIntegers" );
-			ConvertedBasicTypeImpl type = assertTyping(
+			var property = pc.getProperty( "someIntegers" );
+			var type = assertTyping(
 					ConvertedBasicTypeImpl.class,
-					prop.getType()
+					property.getType()
 			);
-			JpaAttributeConverter converter = (JpaAttributeConverter) type.getValueConverter();
+			var converter = (JpaAttributeConverter) type.getValueConverter();
 			assertTrue( IntegerListConverter.class.isAssignableFrom( converter.getConverterJavaType().getJavaTypeClass() ) );
 		}
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/EnablementTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/EnablementTests.java
index d2f9bceb3cf3..41e99b5a4637 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/EnablementTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/EnablementTests.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
-import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.Property;
 
@@ -27,18 +26,18 @@ public void verifyMapping(DomainModelScope scope) {
 			{
 				final Property property = descriptor.getProperty( "thing1" );
 				final BasicValue valueMapping = (BasicValue) property.getValue();
-				final ConverterDescriptor converterDescriptor = valueMapping.getJpaAttributeConverterDescriptor();
+				final var converterDescriptor = valueMapping.getJpaAttributeConverterDescriptor();
 				assertThat( converterDescriptor ).isNotNull();
 				assertThat( converterDescriptor.getAttributeConverterClass() ).isEqualTo( Thing1Converter.class );
-				assertThat( converterDescriptor.getDomainValueResolvedType().getErasedType() ).isEqualTo( Thing1.class );
+				assertThat( converterDescriptor.getDomainValueResolvedType() ).isEqualTo( Thing1.class );
 			}
 			{
 				final Property property = descriptor.getProperty( "thing2" );
 				final BasicValue valueMapping = (BasicValue) property.getValue();
-				final ConverterDescriptor converterDescriptor = valueMapping.getJpaAttributeConverterDescriptor();
+				final var converterDescriptor = valueMapping.getJpaAttributeConverterDescriptor();
 				assertThat( converterDescriptor ).isNotNull();
 				assertThat( converterDescriptor.getAttributeConverterClass() ).isEqualTo( Thing2Converter.class );
-				assertThat( converterDescriptor.getDomainValueResolvedType().getErasedType() ).isEqualTo( Thing2.class );
+				assertThat( converterDescriptor.getDomainValueResolvedType() ).isEqualTo( Thing2.class );
 			}
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/ExplicitDomainTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/ExplicitDomainTypeTests.java
index cef8505fc101..5ca1cafc7ca6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/ExplicitDomainTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/registrations/ExplicitDomainTypeTests.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.orm.test.mapping.converted.converter.registrations;
 
-import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.Property;
 
@@ -24,10 +23,10 @@ public void verifyMapping(DomainModelScope domainModelScope) {
 		domainModelScope.withHierarchy( AnotherEntity.class, (descriptor) -> {
 			final Property property = descriptor.getProperty( "thing" );
 			final BasicValue valueMapping = (BasicValue) property.getValue();
-			final ConverterDescriptor converterDescriptor = valueMapping.getJpaAttributeConverterDescriptor();
+			final var converterDescriptor = valueMapping.getJpaAttributeConverterDescriptor();
 			assertThat( converterDescriptor ).isNotNull();
 			assertThat( converterDescriptor.getAttributeConverterClass() ).isEqualTo( Thing1Converter.class );
-			assertThat( converterDescriptor.getDomainValueResolvedType().getErasedType() ).isEqualTo( Thing.class );
+			assertThat( converterDescriptor.getDomainValueResolvedType() ).isEqualTo( Thing.class );
 		} );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/ConvertedEnumCheckConstraintsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/ConvertedEnumCheckConstraintsTests.java
index 7146fec907ff..98bb7bc42e5a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/ConvertedEnumCheckConstraintsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/ConvertedEnumCheckConstraintsTests.java
@@ -92,6 +92,7 @@ void verifyCheckConstraints(SessionFactoryScope scope) {
 				fail( "Expecting a failure" );
 			}
 			catch (SQLException expected) {
+				session.getTransaction().setRollbackOnly();
 			}
 		} ) );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableArrayTest.java
index 1b596eb9f76f..3d8350ff3e24 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableArrayTest.java
@@ -19,8 +19,13 @@
 import java.util.UUID;
 
 import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.FailureExpected;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
@@ -110,37 +115,40 @@ public void testDomainResult(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@FailureExpected(jiraKey = "HHH-18717", reason = "Requires array functions to work with JSON_ARRAY")
+	// Full support requires, HHH-18717 array functions to work with JSON_ARRAY
+	@RequiresDialect(value = H2Dialect.class)
+	@RequiresDialect(value = PostgreSQLDialect.class)
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support decode function")
 	public void testSelectionItems(SessionFactoryScope scope) {
 		scope.inSession(
 				session -> {
 					List<Tuple> tuples = session.createQuery(
 							"select " +
-									"b.aggregateArray[0].theInt," +
-									"b.aggregateArray[0].theDouble," +
-									"b.aggregateArray[0].theBoolean," +
-									"b.aggregateArray[0].theNumericBoolean," +
-									"b.aggregateArray[0].theStringBoolean," +
-									"b.aggregateArray[0].theString," +
-									"b.aggregateArray[0].theInteger," +
-									"b.aggregateArray[0].theUrl," +
-									"b.aggregateArray[0].theClob," +
-									"b.aggregateArray[0].theBinary," +
-									"b.aggregateArray[0].theDate," +
-									"b.aggregateArray[0].theTime," +
-									"b.aggregateArray[0].theTimestamp," +
-									"b.aggregateArray[0].theInstant," +
-									"b.aggregateArray[0].theUuid," +
-									"b.aggregateArray[0].gender," +
-									"b.aggregateArray[0].convertedGender," +
-									"b.aggregateArray[0].ordinalGender," +
-									"b.aggregateArray[0].theDuration," +
-									"b.aggregateArray[0].theLocalDateTime," +
-									"b.aggregateArray[0].theLocalDate," +
-									"b.aggregateArray[0].theLocalTime," +
-									"b.aggregateArray[0].theZonedDateTime," +
-									"b.aggregateArray[0].theOffsetDateTime," +
-									"b.aggregateArray[0].mutableValue " +
+									"b.aggregateArray[1].theInt," +
+									"b.aggregateArray[1].theDouble," +
+									"b.aggregateArray[1].theBoolean," +
+									"b.aggregateArray[1].theNumericBoolean," +
+									"b.aggregateArray[1].theStringBoolean," +
+									"b.aggregateArray[1].theString," +
+									"b.aggregateArray[1].theInteger," +
+									"b.aggregateArray[1].theUrl," +
+									"b.aggregateArray[1].theClob," +
+									"b.aggregateArray[1].theBinary," +
+									"b.aggregateArray[1].theDate," +
+									"b.aggregateArray[1].theTime," +
+									"b.aggregateArray[1].theTimestamp," +
+									"b.aggregateArray[1].theInstant," +
+									"b.aggregateArray[1].theUuid," +
+									"b.aggregateArray[1].gender," +
+									"b.aggregateArray[1].convertedGender," +
+									"b.aggregateArray[1].ordinalGender," +
+									"b.aggregateArray[1].theDuration," +
+									"b.aggregateArray[1].theLocalDateTime," +
+									"b.aggregateArray[1].theLocalDate," +
+									"b.aggregateArray[1].theLocalTime," +
+									"b.aggregateArray[1].theZonedDateTime," +
+									"b.aggregateArray[1].theOffsetDateTime," +
+									"b.aggregateArray[1].mutableValue " +
 									"from JsonArrayHolder b where b.id = 1",
 							Tuple.class
 					).getResultList();
@@ -203,7 +211,7 @@ public void testUpdateAggregate(SessionFactoryScope scope) {
 	public void testUpdateAggregateMember(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
-					session.createMutationQuery( "update JsonArrayHolder b set b.aggregateArray[0].theString = null where b.id = 1" ).executeUpdate();
+					session.createMutationQuery( "update JsonArrayHolder b set b.aggregateArray[1].theString = null where b.id = 1" ).executeUpdate();
 					EmbeddableAggregate[] struct = EmbeddableAggregate.createAggregateArray1();
 					struct[0].setTheString( null );
 					EmbeddableAggregate.assertArraysEquals( struct, session.find( JsonArrayHolder.class, 1L ).getAggregateArray() );
@@ -216,7 +224,7 @@ public void testUpdateAggregateMember(SessionFactoryScope scope) {
 	public void testUpdateMultipleAggregateMembers(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
-					session.createMutationQuery( "update JsonArrayHolder b set b.aggregateArray.theString = null, b.aggregateArray[0].theUuid = null" ).executeUpdate();
+					session.createMutationQuery( "update JsonArrayHolder b set b.aggregateArray.theString = null, b.aggregateArray[1].theUuid = null" ).executeUpdate();
 					EmbeddableAggregate[] struct = EmbeddableAggregate.createAggregateArray1();
 					struct[0].setTheString( null );
 					struct[0].setTheUuid( null );
@@ -233,31 +241,31 @@ public void testUpdateAllAggregateMembers(SessionFactoryScope scope) {
 					EmbeddableAggregate[] struct = EmbeddableAggregate.createAggregateArray1();
 					session.createMutationQuery(
 									"update JsonArrayHolder b set " +
-											"b.aggregateArray[0].theInt = :theInt," +
-											"b.aggregateArray[0].theDouble = :theDouble," +
-											"b.aggregateArray[0].theBoolean = :theBoolean," +
-											"b.aggregateArray[0].theNumericBoolean = :theNumericBoolean," +
-											"b.aggregateArray[0].theStringBoolean = :theStringBoolean," +
-											"b.aggregateArray[0].theString = :theString," +
-											"b.aggregateArray[0].theInteger = :theInteger," +
-											"b.aggregateArray[0].theUrl = :theUrl," +
-											"b.aggregateArray[0].theClob = :theClob," +
-											"b.aggregateArray[0].theBinary = :theBinary," +
-											"b.aggregateArray[0].theDate = :theDate," +
-											"b.aggregateArray[0].theTime = :theTime," +
-											"b.aggregateArray[0].theTimestamp = :theTimestamp," +
-											"b.aggregateArray[0].theInstant = :theInstant," +
-											"b.aggregateArray[0].theUuid = :theUuid," +
-											"b.aggregateArray[0].gender = :gender," +
-											"b.aggregateArray[0].convertedGender = :convertedGender," +
-											"b.aggregateArray[0].ordinalGender = :ordinalGender," +
-											"b.aggregateArray[0].theDuration = :theDuration," +
-											"b.aggregateArray[0].theLocalDateTime = :theLocalDateTime," +
-											"b.aggregateArray[0].theLocalDate = :theLocalDate," +
-											"b.aggregateArray[0].theLocalTime = :theLocalTime," +
-											"b.aggregateArray[0].theZonedDateTime = :theZonedDateTime," +
-											"b.aggregateArray[0].theOffsetDateTime = :theOffsetDateTime," +
-											"b.aggregateArray[0].mutableValue = :mutableValue " +
+											"b.aggregateArray[1].theInt = :theInt," +
+											"b.aggregateArray[1].theDouble = :theDouble," +
+											"b.aggregateArray[1].theBoolean = :theBoolean," +
+											"b.aggregateArray[1].theNumericBoolean = :theNumericBoolean," +
+											"b.aggregateArray[1].theStringBoolean = :theStringBoolean," +
+											"b.aggregateArray[1].theString = :theString," +
+											"b.aggregateArray[1].theInteger = :theInteger," +
+											"b.aggregateArray[1].theUrl = :theUrl," +
+											"b.aggregateArray[1].theClob = :theClob," +
+											"b.aggregateArray[1].theBinary = :theBinary," +
+											"b.aggregateArray[1].theDate = :theDate," +
+											"b.aggregateArray[1].theTime = :theTime," +
+											"b.aggregateArray[1].theTimestamp = :theTimestamp," +
+											"b.aggregateArray[1].theInstant = :theInstant," +
+											"b.aggregateArray[1].theUuid = :theUuid," +
+											"b.aggregateArray[1].gender = :gender," +
+											"b.aggregateArray[1].convertedGender = :convertedGender," +
+											"b.aggregateArray[1].ordinalGender = :ordinalGender," +
+											"b.aggregateArray[1].theDuration = :theDuration," +
+											"b.aggregateArray[1].theLocalDateTime = :theLocalDateTime," +
+											"b.aggregateArray[1].theLocalDate = :theLocalDate," +
+											"b.aggregateArray[1].theLocalTime = :theLocalTime," +
+											"b.aggregateArray[1].theZonedDateTime = :theZonedDateTime," +
+											"b.aggregateArray[1].theOffsetDateTime = :theOffsetDateTime," +
+											"b.aggregateArray[1].mutableValue = :mutableValue " +
 											"where b.id = 2"
 							)
 							.setParameter( "theInt", struct[0].getTheInt() )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableTest.java
index 5373a60577e9..985cc78f6ed1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonEmbeddableTest.java
@@ -19,6 +19,7 @@
 import java.util.UUID;
 
 import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -27,6 +28,7 @@
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.SqlTypes;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -122,6 +124,7 @@ public void testDomainResult(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support decode function" )
 	public void testSelectionItems(SessionFactoryScope scope) {
 		scope.inSession(
 				session -> {
@@ -238,6 +241,7 @@ public void testUpdateMultipleAggregateMembers(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonComponentUpdate.class)
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support encode function" )
 	public void testUpdateAllAggregateMembers(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonWithArrayEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonWithArrayEmbeddableTest.java
index 6865cab05e34..9ab71c86d0df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonWithArrayEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/JsonWithArrayEmbeddableTest.java
@@ -5,8 +5,6 @@
 package org.hibernate.orm.test.mapping.embeddable;
 
 import java.net.URL;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -173,8 +171,8 @@ public void testSelectionItems(SessionFactoryScope scope) {
 					struct.setTheClob( tuple.get( 8, String[].class ) );
 					struct.setTheBinary( tuple.get( 9, byte[][].class ) );
 					struct.setTheDate( tuple.get( 10, Date[].class ) );
-					struct.setTheTime( tuple.get( 11, Time[].class ) );
-					struct.setTheTimestamp( tuple.get( 12, Timestamp[].class ) );
+					struct.setTheTime( tuple.get( 11, Date[].class ) );
+					struct.setTheTimestamp( tuple.get( 12, Date[].class ) );
 					struct.setTheInstant( tuple.get( 13, Instant[].class ) );
 					struct.setTheUuid( tuple.get( 14, UUID[].class ) );
 					struct.setGender( tuple.get( 15, EntityOfBasics.Gender[].class ) );
@@ -228,6 +226,7 @@ public void testUpdateAggregateMember(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonComponentUpdate.class)
+	@SkipForDialect(dialectClass = OracleDialect.class, majorVersion = 19, reason = "Oracle bug: ORA-03113 database connection closed by peer")
 	public void testUpdateMultipleAggregateMembers(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedJsonEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedJsonEmbeddableTest.java
index 44a6071d663e..f8ab39bb3c5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedJsonEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedJsonEmbeddableTest.java
@@ -20,6 +20,7 @@
 import java.util.UUID;
 
 import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -28,6 +29,7 @@
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.SqlTypes;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -125,6 +127,7 @@ public void testDomainResult(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support decode function" )
 	public void testSelectionItems(SessionFactoryScope scope) {
 		scope.inSession(
 				session -> {
@@ -314,6 +317,7 @@ public void testUpdateMultipleAggregateMembers(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsJsonComponentUpdate.class)
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support encode function" )
 	public void testUpdateAllAggregateMembers(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java
index 72b0c72279a8..89e84c5325b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructEmbeddableTest.java
@@ -42,8 +42,9 @@
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
 import org.hibernate.testing.orm.domain.gambit.MutableValue;
 import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -76,9 +77,7 @@
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.COLUMN_ORDERING_STRATEGY, value = "legacy"))
 @DomainModel(annotatedClasses = NestedStructEmbeddableTest.StructHolder.class)
 @SessionFactory
-@RequiresDialect( PostgreSQLDialect.class )
-@RequiresDialect( OracleDialect.class )
-@RequiresDialect( DB2Dialect.class )
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsUserDefinedTypes.class )
 public class NestedStructEmbeddableTest implements AdditionalMappingContributor {
 
 	@Override
@@ -566,8 +565,6 @@ public void testFunction(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = PostgreSQLDialect.class, majorVersion = 10, reason = "Procedures were only introduced in version 11")
-	@SkipForDialect(dialectClass = PostgresPlusDialect.class, majorVersion = 10, reason = "Procedures were only introduced in version 11")
 	@SkipForDialect(dialectClass = DB2Dialect.class, reason = "DB2 does not support struct types in procedures")
 	public void testProcedure(SessionFactoryScope scope) {
 		scope.inTransaction(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructWithArrayEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructWithArrayEmbeddableTest.java
index 02b63aa5b456..0274c606648c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructWithArrayEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedStructWithArrayEmbeddableTest.java
@@ -5,8 +5,6 @@
 package org.hibernate.orm.test.mapping.embeddable;
 
 import java.net.URL;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -25,6 +23,8 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.SqlTypes;
 
 import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
@@ -70,6 +70,7 @@
 )
 @DomainModel(annotatedClasses = NestedStructWithArrayEmbeddableTest.StructHolder.class)
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsUserDefinedTypes.class )
 public class NestedStructWithArrayEmbeddableTest {
 
 	@BeforeEach
@@ -201,8 +202,8 @@ public void testSelectionItems(SessionFactoryScope scope) {
 					struct.setTheClob( tuple.get( 8, String[].class ) );
 					struct.setTheBinary( tuple.get( 9, byte[][].class ) );
 					struct.setTheDate( tuple.get( 10, Date[].class ) );
-					struct.setTheTime( tuple.get( 11, Time[].class ) );
-					struct.setTheTimestamp( tuple.get( 12, Timestamp[].class ) );
+					struct.setTheTime( tuple.get( 11, Date[].class ) );
+					struct.setTheTimestamp( tuple.get( 12, Date[].class ) );
 					struct.setTheInstant( tuple.get( 13, Instant[].class ) );
 					struct.setTheUuid( tuple.get( 14, UUID[].class ) );
 					struct.setGender( tuple.get( 15, EntityOfBasics.Gender[].class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayEmptyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayEmptyTest.java
index 1a14be3a1d8f..d0e18d9d3b32 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayEmptyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayEmptyTest.java
@@ -9,12 +9,11 @@
 import jakarta.persistence.Id;
 import org.hibernate.annotations.Struct;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.dialect.OracleDialect;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
 import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -37,8 +36,7 @@
 )
 @DomainModel(annotatedClasses = StructEmbeddableArrayEmptyTest.StructHolder.class)
 @SessionFactory
-@RequiresDialect( PostgreSQLDialect.class )
-@RequiresDialect( OracleDialect.class )
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsUserDefinedTypes.class )
 public class StructEmbeddableArrayEmptyTest {
 
 	@BeforeEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java
index cff8d60eb124..072bb19c3e14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableArrayTest.java
@@ -29,6 +29,7 @@
 import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
@@ -83,6 +84,7 @@
 @SessionFactory
 @RequiresDialect( PostgreSQLDialect.class )
 @RequiresDialect( OracleDialect.class )
+@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner PostgreSQL doesn't support stored procedures")
 public class StructEmbeddableArrayTest implements AdditionalMappingContributor {
 
 	@Override
@@ -506,8 +508,6 @@ public void testFunction(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = PostgreSQLDialect.class, majorVersion = 10, reason = "Procedures were only introduced in version 11")
-	@SkipForDialect(dialectClass = PostgresPlusDialect.class, majorVersion = 10, reason = "Procedures were only introduced in version 11")
 	public void testProcedure(SessionFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java
index 478a21c35100..a071808d6800 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructEmbeddableTest.java
@@ -41,8 +41,9 @@
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
 import org.hibernate.testing.orm.domain.gambit.MutableValue;
 import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -74,10 +75,8 @@
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.COLUMN_ORDERING_STRATEGY, value = "legacy"))
 @DomainModel(annotatedClasses = StructEmbeddableTest.StructHolder.class)
 @SessionFactory
-@RequiresDialect( PostgreSQLDialect.class )
-@RequiresDialect( OracleDialect.class )
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsUserDefinedTypes.class )
 @SkipForDialect(dialectClass = OracleDialect.class, reason = "Waiting for the fix of a bug that prevent creation of INTERVALDS from Duration")
-@RequiresDialect( DB2Dialect.class )
 public class StructEmbeddableTest implements AdditionalMappingContributor {
 
 	@Override
@@ -525,8 +524,6 @@ public void testFunction(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = PostgreSQLDialect.class, majorVersion = 10, reason = "Procedures were only introduced in version 11")
-	@SkipForDialect(dialectClass = PostgresPlusDialect.class, majorVersion = 10, reason = "Procedures were only introduced in version 11")
 	@SkipForDialect(dialectClass = DB2Dialect.class, reason = "DB2 does not support struct types in procedures")
 	public void testProcedure(SessionFactoryScope scope) {
 		scope.inTransaction(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java
index 6c1b7b4e5ef8..1bb88a2442c8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/StructWithArrayEmbeddableTest.java
@@ -5,8 +5,6 @@
 package org.hibernate.orm.test.mapping.embeddable;
 
 import java.net.URL;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -40,9 +38,10 @@
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
 import org.hibernate.testing.orm.domain.gambit.MutableValue;
 import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -63,8 +62,6 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 @JiraKey("HHH-15862")
-@RequiresDialect( PostgreSQLDialect.class )
-@RequiresDialect( OracleDialect.class )
 @BootstrapServiceRegistry(
 		javaServices = @BootstrapServiceRegistry.JavaService(
 				role = AdditionalMappingContributor.class,
@@ -77,6 +74,7 @@
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.COLUMN_ORDERING_STRATEGY, value = "legacy"))
 @DomainModel(annotatedClasses = StructWithArrayEmbeddableTest.StructHolder.class)
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsUserDefinedTypes.class )
 public class StructWithArrayEmbeddableTest implements AdditionalMappingContributor {
 	@Override
 	public void contribute(
@@ -326,8 +324,8 @@ public void testSelectionItems(SessionFactoryScope scope) {
 					struct.setTheClob( tuple.get( 8, String[].class ) );
 					struct.setTheBinary( tuple.get( 9, byte[][].class ) );
 					struct.setTheDate( tuple.get( 10, Date[].class ) );
-					struct.setTheTime( tuple.get( 11, Time[].class ) );
-					struct.setTheTimestamp( tuple.get( 12, Timestamp[].class ) );
+					struct.setTheTime( tuple.get( 11, Date[].class ) );
+					struct.setTheTimestamp( tuple.get( 12, Date[].class ) );
 					struct.setTheInstant( tuple.get( 13, Instant[].class ) );
 					struct.setTheUuid( tuple.get( 14, UUID[].class ) );
 					struct.setGender( tuple.get( 15, EntityOfBasics.Gender[].class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/XmlWithArrayEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/XmlWithArrayEmbeddableTest.java
index 44c9597df506..0a82e2c98cec 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/XmlWithArrayEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/XmlWithArrayEmbeddableTest.java
@@ -29,8 +29,6 @@
 import org.junit.jupiter.api.Test;
 
 import java.net.URL;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -171,8 +169,8 @@ public void testSelectionItems(SessionFactoryScope scope) {
 					struct.setTheClob( tuple.get( 8, String[].class ) );
 					struct.setTheBinary( tuple.get( 9, byte[][].class ) );
 					struct.setTheDate( tuple.get( 10, Date[].class ) );
-					struct.setTheTime( tuple.get( 11, Time[].class ) );
-					struct.setTheTimestamp( tuple.get( 12, Timestamp[].class ) );
+					struct.setTheTime( tuple.get( 11, Date[].class ) );
+					struct.setTheTimestamp( tuple.get( 12, Date[].class ) );
 					struct.setTheInstant( tuple.get( 13, Instant[].class ) );
 					struct.setTheUuid( tuple.get( 14, UUID[].class ) );
 					struct.setGender( tuple.get( 15, EntityOfBasics.Gender[].class ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java
index 112ee6c695b8..e01dd97c077d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/CharEnumerateValueTests.java
@@ -97,6 +97,7 @@ void verifyCheckConstraints(SessionFactoryScope scope) {
 				fail( "Expecting a failure" );
 			}
 			catch (SQLException expected) {
+				session.getTransaction().setRollbackOnly();
 			}
 		} ) );
 	}
@@ -119,6 +120,7 @@ void verifyCheckConstraints2(SessionFactoryScope scope) {
 				fail( "Expecting a failure" );
 			}
 			catch (SQLException expected) {
+				session.getTransaction().setRollbackOnly();
 			}
 		} ) );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java
index 40822bd7f378..789a16f09050 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/EnumeratedValueTests.java
@@ -96,6 +96,7 @@ void verifyCheckConstraints(SessionFactoryScope scope) {
 				fail( "Expecting a failure" );
 			}
 			catch (SQLException expected) {
+				session.getTransaction().setRollbackOnly();
 			}
 
 			try (PreparedStatement statement = connection.prepareStatement( "insert into persons (id, status) values (?, ?)" ) ) {
@@ -106,6 +107,7 @@ void verifyCheckConstraints(SessionFactoryScope scope) {
 				fail( "Expecting a failure" );
 			}
 			catch (SQLException expected) {
+				session.getTransaction().setRollbackOnly();
 			}
 		} ) );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java
index 2330bcba3e6d..22408f7b4fb7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/enumeratedvalue/NamedEnumEnumerateValueTests.java
@@ -12,6 +12,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SybaseDialect;
@@ -44,6 +45,8 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @RequiresDialect(value = PostgreSQLDialect.class)
 @RequiresDialect(value = OracleDialect.class, majorVersion = 23)
+@RequiresDialect(value = H2Dialect.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsNamedEnum.class)
 public class NamedEnumEnumerateValueTests {
 	@Test
 	@DomainModel(annotatedClasses = Person.class)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaFromHbmTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaFromHbmTests.java
index f1c94b26b7e2..e033da304807 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaFromHbmTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaFromHbmTests.java
@@ -13,6 +13,8 @@
 import org.hibernate.mapping.Formula;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Selectable;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -31,6 +33,7 @@
  */
 @DomainModel( xmlMappings = "org/hibernate/orm/test/mapping/formula/EntityOfFormulas.hbm.xml")
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsJdbcEscapes.class )
 public class FormulaFromHbmTests {
 	@Test
 	public void mappingAssertions(DomainModelScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java
index a947d9373f7c..b512de1ec763 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java
@@ -21,7 +21,9 @@
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -122,6 +124,10 @@ public static class Account {
 				override = @Formula("cast(rate * 100 as decimal(10,2)) || '%'"))
 		@DialectOverride.Formula(dialect = InformixDialect.class,
 				override = @Formula("trim(concat(to_char(rate * 100,'#&.&&'), '%'))"))
+		@DialectOverride.Formula(dialect = SpannerPostgreSQLDialect.class,
+				override = @Formula("cast(rate * 100 as varchar) || '%'"))
+		@DialectOverride.Formula(dialect = SpannerDialect.class,
+				override = @Formula("cast(rate * 100 as string) || '%'"))
 		private String ratePercent;
 
 		public Long getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java
index b439d341db1d..f3bf4bc5de27 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedAnnotationTests.java
@@ -9,6 +9,7 @@
 import org.hibernate.HibernateError;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Generated;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.generator.EventType;
 
@@ -16,6 +17,7 @@
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,6 +35,7 @@
 @DomainModel( annotatedClasses = GeneratedAnnotationTests.AuditedEntity.class )
 @SessionFactory
 @RequiresDialect(value = PostgreSQLDialect.class, comment = "To write a trigger only once")
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support triggers")
 public class GeneratedAnnotationTests {
 
 	private static final String TRIGGER = "begin NEW.lastUpdatedAt = current_timestamp; return NEW; end;";
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedByDbOnForcedIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedByDbOnForcedIncrementTest.java
index 221d96831965..416de1f6cd49 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedByDbOnForcedIncrementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedByDbOnForcedIncrementTest.java
@@ -39,7 +39,7 @@ class GeneratedByDbOnForcedIncrementTest {
 		} );
 		assertTrue( persisted.updated.isBefore( updated.updated ) );
 	}
-	@Entity
+	@Entity(name = "WithUpdateTimestamp")
 	static class WithUpdateTimestamp {
 		@Id long id;
 		@Version long version;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedOnForcedIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedOnForcedIncrementTest.java
index 62b416b34725..e05a0abf7c60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedOnForcedIncrementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratedOnForcedIncrementTest.java
@@ -34,7 +34,7 @@ class GeneratedOnForcedIncrementTest {
 		} );
 		assertTrue( persisted.updated.isBefore( updated.updated ) );
 	}
-	@Entity
+	@Entity(name = "WithUpdateTimestamp")
 	static class WithUpdateTimestamp {
 		@Id long id;
 		@Version long version;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratorTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratorTypeTest.java
index 94267a1bb0f3..c8a8dfdf009d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratorTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/GeneratorTypeTest.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.orm.test.mapping.generated;
 
-import java.lang.reflect.Member;
 import java.util.EnumSet;
 
 import org.hibernate.annotations.ValueGenerationType;
@@ -12,7 +11,6 @@
 import org.hibernate.generator.BeforeExecutionGenerator;
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.EventTypeSets;
-import org.hibernate.generator.GeneratorCreationContext;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
@@ -85,7 +83,7 @@ public String get() {
 	public static class LoggedUserGenerator implements BeforeExecutionGenerator {
 		private final EnumSet<EventType> events;
 
-		public LoggedUserGenerator(CurrentUserGeneration annotation, Member member, GeneratorCreationContext context) {
+		public LoggedUserGenerator(CurrentUserGeneration annotation) {
 			this.events = EventTypeSets.fromArray( annotation.timing() );
 		}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/MetaGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/MetaGeneratorTest.java
new file mode 100644
index 000000000000..414c3b012c41
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/MetaGeneratorTest.java
@@ -0,0 +1,223 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.generated;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.IdGeneratorType;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.generator.AnnotationBasedGenerator;
+import org.hibernate.generator.GeneratorCreationContext;
+import org.hibernate.id.IdentifierGenerator;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author Yanming Zhou
+ */
+@Jpa(annotatedClasses = {MetaGeneratorTest.Thing.class, MetaGeneratorTest.SecondThing.class,
+		MetaGeneratorTest.ThirdThing.class, MetaGeneratorTest.FourthThing.class, MetaGeneratorTest.FifthThing.class})
+public class MetaGeneratorTest {
+
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Thing thing = new Thing();
+			em.persist( thing );
+			assertEquals( 1, thing.id );
+			thing = new Thing();
+			em.persist( thing );
+			assertEquals( 2, thing.id );
+		} );
+
+		scope.inTransaction( em -> {
+			SecondThing thing = new SecondThing();
+			em.persist( thing );
+			assertEquals( 2, thing.id );
+			thing = new SecondThing();
+			em.persist( thing );
+			assertEquals( 3, thing.id );
+		} );
+
+		scope.inTransaction( em -> {
+			ThirdThing thing = new ThirdThing();
+			em.persist( thing );
+			assertEquals( 3, thing.id );
+			thing = new ThirdThing();
+			em.persist( thing );
+			assertEquals( 4, thing.id );
+		} );
+
+		scope.inTransaction( em -> {
+			FourthThing thing = new FourthThing();
+			em.persist( thing );
+			assertEquals( 4, thing.id );
+			thing = new FourthThing();
+			em.persist( thing );
+			assertEquals( 5, thing.id );
+		} );
+
+		scope.inTransaction( em -> {
+			FifthThing thing = new FifthThing();
+			em.persist( thing );
+			assertEquals( 5, thing.id );
+			thing = new FifthThing();
+			em.persist( thing );
+			assertEquals( 6, thing.id );
+		} );
+	}
+
+	@Entity(name = "Thing")
+	static class Thing {
+		@Id @Sequence
+		long id;
+	}
+
+	@Entity(name = "SecondThing")
+	static class SecondThing {
+		@Id @SecondSequence(initial = 2)
+		long id;
+	}
+
+	@Entity(name = "ThirdThing")
+	static class ThirdThing {
+		@Id @ThirdSequence(initial = 3)
+		long id;
+	}
+
+	@Entity(name = "FourthThing")
+	static class FourthThing {
+		@Id @FourthSequence(initial = 4)
+		long id;
+	}
+
+	@Entity(name = "FifthThing")
+	static class FifthThing {
+		@Id @FifthSequence(initial = 5)
+		long id;
+	}
+
+	@IdGeneratorType(SequenceGenerator.class)
+	@Target({METHOD, FIELD})
+	@Retention(RUNTIME)
+	public @interface Sequence {
+		long initial() default 1;
+	}
+
+	@IdGeneratorType(SecondSequenceGenerator.class)
+	@Target({METHOD, FIELD})
+	@Retention(RUNTIME)
+	public @interface SecondSequence{
+		long initial() default 1;
+	}
+
+	@IdGeneratorType(ThirdSequenceGenerator.class)
+	@Target({METHOD, FIELD})
+	@Retention(RUNTIME)
+	public @interface ThirdSequence {
+		long initial() default 1;
+	}
+
+	@IdGeneratorType(FourthSequenceGenerator.class)
+	@Target({METHOD, FIELD})
+	@Retention(RUNTIME)
+	public @interface FourthSequence {
+		long initial() default 1;
+	}
+
+	@IdGeneratorType(FifthSequenceGenerator.class)
+	@Target({METHOD, FIELD})
+	@Retention(RUNTIME)
+	public @interface FifthSequence {
+		long initial() default 1;
+	}
+
+	static class SequenceGenerator extends AbstractSequenceGenerator {
+
+		SequenceGenerator(Sequence sequence) {
+			super(sequence.initial());
+		}
+
+	}
+
+	static class SecondSequenceGenerator extends AbstractSequenceGenerator {
+
+		SecondSequenceGenerator(GeneratorCreationContext context) {
+			super( ( (Field) context.getMemberDetails().toJavaMember() ).getAnnotation( SecondSequence.class ).initial() );
+		}
+
+	}
+
+	static class ThirdSequenceGenerator extends AbstractSequenceGenerator {
+
+		ThirdSequenceGenerator(ThirdSequence sequence, GeneratorCreationContext context) {
+			super(sequence.initial());
+			if ( !sequence.equals( ( (Field) context.getMemberDetails().toJavaMember() ).getAnnotation( ThirdSequence.class ) )) {
+				throw new IllegalArgumentException(context.getMemberDetails().toJavaMember() + " should be annotated with " + sequence);
+			}
+		}
+
+	}
+
+	static class FourthSequenceGenerator extends AbstractSequenceGenerator implements AnnotationBasedGenerator<FourthSequence> {
+
+		FourthSequenceGenerator() {
+			super(0);
+		}
+
+		@Override
+		public void initialize(FourthSequence sequence, GeneratorCreationContext context) {
+			initial = sequence.initial();
+			if ( !sequence.equals( ( (Field) context.getMemberDetails().toJavaMember() ).getAnnotation( FourthSequence.class ) )) {
+				// only for validation
+				throw new IllegalArgumentException(context.getMemberDetails().toJavaMember() + " should be annotated with " + sequence);
+			}
+		}
+	}
+
+	/**
+	 * test for deprecated signature (eventually remove)
+	 */
+	static class FifthSequenceGenerator extends AbstractSequenceGenerator implements AnnotationBasedGenerator<FifthSequence> {
+
+		FifthSequenceGenerator() {
+			super(0);
+		}
+
+		@SuppressWarnings( "removal" )
+		@Override
+		public void initialize(FifthSequence sequence, Member member, GeneratorCreationContext context) {
+			initial = sequence.initial();
+			if ( !member.equals( context.getMemberDetails().toJavaMember() ) ) {
+				// only for validation
+				throw new IllegalArgumentException(context.getMemberDetails().toJavaMember() + " should be equal to " + member);
+			}
+		}
+	}
+
+	static abstract class AbstractSequenceGenerator implements IdentifierGenerator {
+
+		long initial;
+
+		AbstractSequenceGenerator(long initial) {
+			this.initial = initial;
+		}
+
+		@Override
+		public Object generate(SharedSessionContractImplementor session, Object object) {
+			return initial++;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticValueGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticValueGenerator.java
index 7215fd0c8e44..f80c391e0999 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticValueGenerator.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/StaticValueGenerator.java
@@ -4,13 +4,11 @@
  */
 package org.hibernate.orm.test.mapping.generated;
 
-import java.lang.reflect.Member;
 import java.util.EnumSet;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.BeforeExecutionGenerator;
 import org.hibernate.generator.EventType;
-import org.hibernate.generator.GeneratorCreationContext;
 
 /**
  * @author Steve Ebersole
@@ -19,7 +17,7 @@ public class StaticValueGenerator implements BeforeExecutionGenerator {
 	private final String staticValue;
 	private final EnumSet<EventType> events;
 
-	public StaticValueGenerator(StaticGeneration annotation, Member member, GeneratorCreationContext context) {
+	public StaticValueGenerator(StaticGeneration annotation) {
 		this.staticValue = annotation.value();
 		this.events = toEnumSet( annotation.event() );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java
index 358f9e5e99b1..5312aa731216 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/always/GeneratedAlwaysTest.java
@@ -7,20 +7,21 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import org.hibernate.annotations.DialectOverride;
 import org.hibernate.annotations.GeneratedColumn;
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.dialect.PostgreSQLDialect;
-import org.hibernate.dialect.PostgresPlusDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
-import org.hibernate.testing.orm.junit.VersionMatchMode;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -37,10 +38,9 @@
 @SkipForDialect(dialectClass = HSQLDialect.class)
 @SkipForDialect(dialectClass = DerbyDialect.class)
 @SkipForDialect(dialectClass = SybaseASEDialect.class)
-@SkipForDialect(dialectClass = PostgreSQLDialect.class, majorVersion = 11, versionMatchMode = VersionMatchMode.SAME_OR_OLDER) // 'generated always' was added in 12
-@SkipForDialect(dialectClass = PostgresPlusDialect.class, majorVersion = 11, versionMatchMode = VersionMatchMode.SAME_OR_OLDER) // 'generated always' was added in 12
 @SkipForDialect(dialectClass = AltibaseDialect.class, reason = "generated always is not supported in Altibase")
 @SkipForDialect(dialectClass = InformixDialect.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class GeneratedAlwaysTest {
 
 	@Test
@@ -73,6 +73,8 @@ public static class OrderLine {
 		private BigDecimal total;
 		@Column(name = "discountedTotal")
 		@GeneratedColumn(value = "unitPrice*quantity*(1.0-discount/100.0)")
+		@DialectOverride.GeneratedColumn(dialect = SpannerDialect.class,
+				override = @GeneratedColumn(value = "CAST(unitPrice*quantity*(1.0-discount/100.0) AS NUMERIC)"))
 		private BigDecimal discounted;
 
 		public OrderLine() {}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/GeneratedWritableDelegateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/GeneratedWritableDelegateTest.java
index c9b202b463cd..056c7819a07e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/GeneratedWritableDelegateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/delegate/GeneratedWritableDelegateTest.java
@@ -5,6 +5,7 @@
 package org.hibernate.orm.test.mapping.generated.delegate;
 
 import org.hibernate.annotations.Generated;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
 import org.hibernate.id.insert.AbstractReturningDelegate;
@@ -17,6 +18,7 @@
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -40,6 +42,7 @@
 } )
 @SessionFactory
 @RequiresDialect( value = PostgreSQLDialect.class, comment = "To write a trigger only once" )
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support triggers")
 @Jira( "https://hibernate.atlassian.net/browse/HHH-10921" )
 public class GeneratedWritableDelegateTest {
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java
index 1c5ea552a999..45bb0dd84400 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DefaultTest.java
@@ -9,7 +9,9 @@
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Generated;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -26,6 +28,7 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(annotatedClasses = DefaultTest.OrderLine.class)
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class DefaultTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java
index fd9335d21a1b..0f139081a434 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/DynamicDefaultTest.java
@@ -8,7 +8,9 @@
 import jakarta.persistence.Id;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -24,6 +26,7 @@
  */
 @DomainModel(annotatedClasses = DynamicDefaultTest.OrderLine.class)
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class DynamicDefaultTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/ImmutableDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/ImmutableDefaultTest.java
index 86b93f69b444..53112c09f69e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/ImmutableDefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/ImmutableDefaultTest.java
@@ -9,7 +9,9 @@
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Generated;
 import org.hibernate.annotations.Immutable;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -25,6 +27,7 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(annotatedClasses = ImmutableDefaultTest.OrderLine.class)
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class ImmutableDefaultTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java
index 2c57b8abb88c..3f55d69578c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/OverriddenDefaultTest.java
@@ -11,7 +11,9 @@
 import org.hibernate.annotations.Generated;
 import org.hibernate.dialect.H2Dialect;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -28,6 +30,7 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(annotatedClasses = OverriddenDefaultTest.OrderLine.class)
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class OverriddenDefaultTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java
index a4b7579a388e..fdf49ba55929 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/RefreshTest.java
@@ -8,7 +8,9 @@
 import jakarta.persistence.Id;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -23,6 +25,7 @@
  */
 @DomainModel(annotatedClasses = RefreshTest.OrderLine.class)
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class RefreshTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedValueGeneration.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedValueGeneration.java
index 8ffd795de609..1e5de4739c8f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedValueGeneration.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/temporals/ProposedGeneratedValueGeneration.java
@@ -4,13 +4,11 @@
  */
 package org.hibernate.orm.test.mapping.generated.temporals;
 
-import java.lang.reflect.Member;
 import java.util.EnumSet;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.EventTypeSets;
-import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.generator.OnExecutionGenerator;
 import org.hibernate.internal.util.StringHelper;
 
@@ -25,7 +23,7 @@ public class ProposedGeneratedValueGeneration implements OnExecutionGenerator {
 	private final EnumSet<EventType> timing;
 	private final String defaultValue;
 
-	public ProposedGeneratedValueGeneration(ProposedGenerated annotation, Member member, GeneratorCreationContext context) {
+	public ProposedGeneratedValueGeneration(ProposedGenerated annotation) {
 		timing = EventTypeSets.fromArray( annotation.timing() );
 		defaultValue = StringHelper.nullIfEmpty( annotation.sqlDefaultValue() );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generics/compositeid/CompositeIdWithGenericPartInMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generics/compositeid/CompositeIdWithGenericPartInMappedSuperclassTest.java
index 5717572c8486..4377de459013 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generics/compositeid/CompositeIdWithGenericPartInMappedSuperclassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generics/compositeid/CompositeIdWithGenericPartInMappedSuperclassTest.java
@@ -34,7 +34,7 @@ void test(SessionFactoryScope scope) {
 		scope.inSession( s -> s.createQuery( "from SampleEntity", SampleEntity.class ).getResultList() );
 	}
 
-	@Entity
+	@Entity(name = "SampleCompositeIdEntity")
 	@IdClass(SampleCompositeIdEntity.AdditionalIdEntityId.class)
 	static class SampleCompositeIdEntity extends SampleSuperclass<Long> {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh18829/AutoGeneratedIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh18829/AutoGeneratedIdClassTest.java
index ef4255be6ff7..2b9d43b61f13 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh18829/AutoGeneratedIdClassTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/hhh18829/AutoGeneratedIdClassTest.java
@@ -76,7 +76,7 @@ public void innerEntityClassTest(SessionFactoryScope sessionFactoryScope)
 		assertEquals( "1600 Pennsylvania Avenue", employee.address );
 	}
 
-	@Entity
+	@Entity(name = "AutoGeneratedIdClassTest_Inner")
 	static class Inner {
 		@Id
 		String empName;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdTest.java
index 88cd8244dbb0..cabead6bfbe1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/MutableNaturalIdTest.java
@@ -6,16 +6,15 @@
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-
-import org.hibernate.Session;
+import org.hibernate.KeyType;
+import org.hibernate.NaturalIdSynchronization;
 import org.hibernate.annotations.NaturalId;
-
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * @author Vlad Mihalcea
@@ -35,32 +34,32 @@ public void test(EntityManagerFactoryScope scope) {
 		});
 		scope.inTransaction( entityManager -> {
 			//tag::naturalid-mutable-synchronized-example[]
-			//tag::naturalid-mutable-example[]
-			Author author = entityManager
-				.unwrap(Session.class)
-				.bySimpleNaturalId(Author.class)
-				.load("john@acme.com");
-			//end::naturalid-mutable-example[]
+			Author author = entityManager.find( Author.class,
+					"john@acme.com",
+					KeyType.NATURAL );
 
+			// change the natural id value
 			author.setEmail("john.doe@acme.com");
 
-			assertNull(
-				entityManager
-					.unwrap(Session.class)
-					.bySimpleNaturalId(Author.class)
-					.setSynchronizationEnabled(false)
-					.load("john.doe@acme.com")
-			);
-
-			assertSame(author,
-				entityManager
-					.unwrap(Session.class)
-					.bySimpleNaturalId(Author.class)
-					.setSynchronizationEnabled(true)
-					.load("john.doe@acme.com")
-			);
-			//end::naturalid-mutable-example[]
-
+			// since there has been no flush,
+			// the internal resolution cache
+			// does not know about the change -
+			// without synchronization, we will
+			// get a miss.
+
+			Author author2 = entityManager.find( Author.class,
+					"john.doe@acme.com",
+					KeyType.NATURAL,
+					NaturalIdSynchronization.DISABLED );
+			assertNull( author2 );
+
+			// with synchronization (the default),
+			// however, we will get correct results.
+
+			Author author3 = entityManager.find( Author.class,
+					"john.doe@acme.com",
+					KeyType.NATURAL );
+			assertEquals( author, author3 );
 			//end::naturalid-mutable-synchronized-example[]
 		});
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/PartitionKeyAndVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/PartitionKeyAndVersionTest.java
new file mode 100644
index 000000000000..4b14b39649e9
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/PartitionKeyAndVersionTest.java
@@ -0,0 +1,89 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.identifier;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Version;
+import org.hibernate.annotations.PartitionKey;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+@DomainModel(
+		annotatedClasses = {
+				PartitionKeyAndVersionTest.TestEntity.class
+		}
+)
+@SessionFactory
+@JiraKey(value = "HHH-20287")
+public class PartitionKeyAndVersionTest {
+
+	private static final Long ENTITY_ID = 1L;
+
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			session.persist( new TestEntity( ENTITY_ID, 1 ) );
+		} );
+	}
+
+	@Test
+	public void testSetOnlyTheVersion(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			TestEntity testEntity = session.find( TestEntity.class, ENTITY_ID );
+			testEntity.setVersion( testEntity.getVersion() + 1 );
+		} );
+	}
+
+	@Test
+	public void testForceIncrement(SessionFactoryScope scope) {
+		scope.inTransaction( session ->
+				session.find( TestEntity.class, ENTITY_ID, LockModeType.OPTIMISTIC_FORCE_INCREMENT )
+		);
+	}
+
+	@Entity(name = "TestEntity")
+	public static class TestEntity {
+		@Id
+		public Long id;
+
+		@PartitionKey
+		public int partitionKey;
+
+		@Version
+		public int version;
+
+		public String name;
+
+		public TestEntity() {
+		}
+
+		public TestEntity(Long id, int partitionKey) {
+			this.id = id;
+			this.partitionKey = partitionKey;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public int getPartitionKey() {
+			return partitionKey;
+		}
+
+		public int getVersion() {
+			return version;
+		}
+
+		public void setVersion(int version) {
+			this.version = version;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleNaturalIdTest.java
index e3484a35099e..6317be0c5dc7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/SimpleNaturalIdTest.java
@@ -7,13 +7,21 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
+import jakarta.persistence.Timeout;
+import org.hibernate.KeyType;
+import org.hibernate.LockMode;
 import org.hibernate.Session;
 import org.hibernate.annotations.NaturalId;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
@@ -56,6 +64,30 @@ public void test(EntityManagerFactoryScope scope) {
 		});
 	}
 
+	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsLockTimeouts.class )
+	void testLoading(EntityManagerFactoryScope scope) {
+		scope.inTransaction( (entityManager) -> {
+			//tag::naturalid-loading-example[]
+			var book = entityManager.find( Book.class,
+					"978-9730228236",
+					KeyType.NATURAL,
+					LockMode.PESSIMISTIC_WRITE,
+					Timeout.seconds( 1 ) );
+			var books = entityManager.unwrap( Session.class ).findMultiple( Book.class,
+					List.of("978-9730228236"),
+					KeyType.NATURAL,
+					LockMode.PESSIMISTIC_WRITE,
+					Timeout.seconds( 1 ) );
+			//end::naturalid-loading-example[]
+		} );
+	}
+
+	@AfterEach
+	void tearDown(EntityManagerFactoryScope scope) {
+		scope.dropData();
+	}
+
 	//tag::naturalid-simple-basic-attribute-mapping-example[]
 	@Entity(name = "Book")
 	public static class Book {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/CompositeInheritanceFailTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/CompositeInheritanceFailTest.java
index ede98a79273b..e0e9178b7b08 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/CompositeInheritanceFailTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/CompositeInheritanceFailTest.java
@@ -87,11 +87,11 @@ public String getOid() {
 
 	}
 
-	@Entity
+	@Entity(name = "DummyEntity")
 	public static class DummyEntity extends TupAbstractEntity {
 	}
 
-	@Entity
+	@Entity(name = "TestEntity")
 	@IdClass(CompositeIdClass.class)
 	public static class TestEntity extends TupAbstractEntity {
 
@@ -117,7 +117,7 @@ public CompositeIdClass getCompositeId() {
 
 	}
 
-	@Entity
+	@Entity(name = "Test2Entity")
 	@IdClass(CompositeId2Class.class)
 	public static class Test2Entity extends TupAbstractEntity {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/CompositeInheritanceWorkingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/CompositeInheritanceWorkingTest.java
index 2a3c81603785..377d4ee4648b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/CompositeInheritanceWorkingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/identifier/composite/CompositeInheritanceWorkingTest.java
@@ -93,11 +93,11 @@ public long getTanum() {
 		}
 	}
 
-	@Entity
+	@Entity(name = "DummyEntity")
 	public static class DummyEntity extends TupAbstractEntity {
 	}
 
-	@Entity
+	@Entity(name = "FooEntity")
 	@IdClass(CompositeIdClass.class)
 	public static class FooEntity extends TupAbstractEntity {
 
@@ -123,7 +123,7 @@ public CompositeIdClass getCompositeId() {
 
 	}
 
-	@Entity
+	@Entity(name = "Test2Entity")
 	@IdClass(CompositeId2Class.class)
 	public static class Test2Entity extends TupAbstractEntity {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java
index 75e32b28091c..f6c228afe18c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java
@@ -5,10 +5,6 @@
 package org.hibernate.orm.test.mapping.inheritance.discriminator;
 
 import java.math.BigDecimal;
-import java.util.List;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Root;
 
 import org.hibernate.Hibernate;
 import org.hibernate.proxy.HibernateProxy;
@@ -24,6 +20,7 @@
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -38,6 +35,7 @@
 		xmlMappings = "org/hibernate/orm/test/mapping/inheritance/discriminator/Person.hbm.xml"
 )
 @SessionFactory
+@SuppressWarnings("deprecation")
 public class DiscriminatorTest {
 
 	@AfterEach
@@ -87,8 +85,9 @@ public void testDiscriminatorSubclass(SessionFactoryScope scope) {
 					assertThat( s.createQuery( "from Person p where p.class = Customer" ).list().size(), is( 1 ) );
 					s.clear();
 
-					List<Customer> customers = s.createQuery( "from Customer c left join fetch c.salesperson" ).list();
-					for ( Customer c : customers ) {
+					var customers = s.createQuery( "from Customer c left join fetch c.salesperson" ).list();
+					for ( var customer : customers ) {
+						var c = (Customer) customer;
 						assertTrue( Hibernate.isInitialized( c.getSalesperson() ) );
 						assertThat( c.getSalesperson().getName(), is( "Mark" ) );
 					}
@@ -96,7 +95,8 @@ public void testDiscriminatorSubclass(SessionFactoryScope scope) {
 					s.clear();
 
 					customers = s.createQuery( "from Customer" ).list();
-					for ( Customer c : customers ) {
+					for ( var customer : customers ) {
+						var c = (Customer) customer;
 						assertFalse( Hibernate.isInitialized( c.getSalesperson() ) );
 						assertThat( c.getSalesperson().getName(), is( "Mark" ) );
 					}
@@ -164,22 +164,22 @@ public void testQuerySubclassAttribute(SessionFactoryScope scope) {
 					q.setSalary( new BigDecimal( 1000 ) );
 					s.persist( q );
 
-					List result = s.createQuery( "from Person where salary > 100" ).list();
-					assertEquals( result.size(), 1 );
+					var result = s.createQuery( "from Person where salary > 100" ).list();
+					assertEquals( 1, result.size() );
 					assertSame( result.get( 0 ), q );
 
 					result = s.createQuery( "from Person where salary > 100 or name like 'E%'" ).list();
-					assertEquals( result.size(), 2 );
+					assertEquals( 2, result.size() );
 
-					CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
-					CriteriaQuery<Person> criteria = criteriaBuilder.createQuery( Person.class );
-					Root<Person> root = criteria.from( Person.class );
+					var criteriaBuilder = s.getCriteriaBuilder();
+					var criteria = criteriaBuilder.createQuery( Person.class );
+					var root = criteria.from( Person.class );
 					criteria.where( criteriaBuilder.gt( criteriaBuilder.treat( root, Employee.class ).get( "salary" ), new BigDecimal( 100 ) ) );
 					result = s.createQuery( criteria ).list();
 //					result = s.createCriteria(Person.class)
 //							.add( Property.forName( "salary").gt( new BigDecimal( 100) ) )
 //							.list();
-					assertEquals( result.size(), 1 );
+					assertEquals( 1, result.size() );
 					assertSame( result.get( 0 ), q );
 
 					//TODO: make this work:
@@ -210,14 +210,14 @@ public void testLoadSuperclassProxyPolymorphicAccess(SessionFactoryScope scope)
 				s -> {
 					// load the superclass proxy.
 					Person pLoad = s.getReference( Person.class, e.getId() );
-					assertTrue( pLoad instanceof HibernateProxy );
+					assertInstanceOf( HibernateProxy.class, pLoad );
 					Person pGet = s.get( Person.class, e.getId() );
 					Person pQuery = (Person) s.createQuery( "from Person where id = :id" )
 							.setParameter( "id", e.getId() )
 							.uniqueResult();
-					CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
-					CriteriaQuery<Person> criteria = criteriaBuilder.createQuery( Person.class );
-					Root<Person> root = criteria.from( Person.class );
+					var criteriaBuilder = s.getCriteriaBuilder();
+					var criteria = criteriaBuilder.createQuery( Person.class );
+					var root = criteria.from( Person.class );
 					criteria.where( criteriaBuilder.equal( root.get( "id" ), e.getId() ) );
 					Person pCriteria = s.createQuery( criteria ).uniqueResult();
 //		Person pCriteria = ( Person ) s.createCriteria( Person.class )
@@ -237,14 +237,14 @@ public void testLoadSuperclassProxyPolymorphicAccess(SessionFactoryScope scope)
 				s -> {
 					// load the superclass proxy.
 					Person pLoad = s.getReference( Person.class, e.getId() );
-					assertTrue( pLoad instanceof HibernateProxy );
+					assertInstanceOf( HibernateProxy.class, pLoad );
 					Person pGet = s.get( Person.class, e.getId() );
 					Person pQuery = (Person) s.createQuery( "from Person where id = :id" )
 							.setParameter( "id", e.getId() )
 							.uniqueResult();
-					CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
-					CriteriaQuery<Employee> criteria = criteriaBuilder.createQuery( Employee.class );
-					Root<Employee> root = criteria.from( Employee.class );
+					var criteriaBuilder = s.getCriteriaBuilder();
+					var criteria = criteriaBuilder.createQuery( Employee.class );
+					var root = criteria.from( Employee.class );
 					criteria.where( criteriaBuilder.equal( root.get( "id" ), e.getId() ) );
 					Employee pCriteria = s.createQuery( criteria ).uniqueResult();
 //		Person pCriteria = ( Person ) s.createCriteria( Person.class )
@@ -281,16 +281,16 @@ public void testLoadSuperclassProxyEvictPolymorphicAccess(SessionFactoryScope sc
 				s -> {
 					// load the superclass proxy.
 					Person pLoad = s.getReference( Person.class, e.getId() );
-					assertTrue( pLoad instanceof HibernateProxy );
+					assertInstanceOf( HibernateProxy.class, pLoad );
 					// evict the proxy
 					s.evict( pLoad );
 					Employee pGet = (Employee) s.get( Person.class, e.getId() );
 					Employee pQuery = (Employee) s.createQuery( "from Person where id = :id" )
 							.setParameter( "id", e.getId() )
 							.uniqueResult();
-					CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
-					CriteriaQuery<Person> criteria = criteriaBuilder.createQuery( Person.class );
-					Root<Person> root = criteria.from( Person.class );
+					var criteriaBuilder = s.getCriteriaBuilder();
+					var criteria = criteriaBuilder.createQuery( Person.class );
+					var root = criteria.from( Person.class );
 					criteria.where( criteriaBuilder.equal( root.get( "id" ), e.getId() ) );
 
 					Employee pCriteria = (Employee) s.createQuery( criteria ).uniqueResult();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java
index 1d71226f5277..995211703974 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/GlobalJavaTimeJdbcTypeTests.java
@@ -13,12 +13,14 @@
 
 import org.hibernate.cfg.MappingSettings;
 import org.hibernate.community.dialect.AltibaseDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.PersistentClass;
@@ -113,6 +115,7 @@ void testInstant(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner JDBC driver setObject does not accept LocalDateTime")
 	void testLocalDateTime(SessionFactoryScope scope) {
 		final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
 		final LocalDateTime start = adjustToDefaultPrecision( LocalDateTime.now(), dialect );
@@ -176,6 +179,7 @@ void testLocalDate(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = OracleDialect.class, reason = "Oracle drivers truncate fractional seconds from the LocalTime")
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA time type does not support fractional seconds")
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase drivers truncate fractional seconds from the LocalTime")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner JDBC driver setObject does not accept LocalTime")
 	void testLocalTime(SessionFactoryScope scope) {
 		final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
 		final LocalTime startTime = adjustToPrecision( LocalTime.now(), 0, dialect );
@@ -207,6 +211,8 @@ void testLocalTime(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialect(value = PostgreSQLDialect.class)
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "Spanner PostgreSQL does not support WITH expressions for INSERT statements")
 	void testArray(SessionFactoryScope scope) {
 		final var offsetDateTime = OffsetDateTime.parse("1977-07-24T12:34:56+02:00");
 		scope.inTransaction( session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java
index 864f6f282a61..1d5451c0e365 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/javatime/JavaTimeJdbcTypeTests.java
@@ -18,6 +18,7 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.OracleDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.PersistentClass;
@@ -112,6 +113,7 @@ void testInstant(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner JDBC driver setObject does not accept LocalDateTime")
 	void testLocalDateTime(SessionFactoryScope scope) {
 		final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
 		final LocalDateTime start = adjustToDefaultPrecision( LocalDateTime.now(), dialect );
@@ -175,6 +177,7 @@ void testLocalDate(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = OracleDialect.class, reason = "Oracle drivers truncate fractional seconds from the LocalTime")
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA time type does not support fractional seconds")
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase drivers truncate fractional seconds from the LocalTime")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner JDBC driver setObject does not accept LocalTime")
 	void testLocalTime(SessionFactoryScope scope) {
 		final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
 		final LocalTime startTime = adjustToPrecision( LocalTime.now(), 0, dialect );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaBidiTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaBidiTest.java
new file mode 100644
index 000000000000..7a3e0999d2a5
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaBidiTest.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.joinformula;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import org.hibernate.annotations.JoinFormula;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Jpa(annotatedClasses =
+		{JoinFormulaBidiTest.Parent.class,
+		JoinFormulaBidiTest.Child.class})
+@JiraKey("HHH-15492")
+class JoinFormulaBidiTest {
+	@Test
+	void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			var parent = new Parent();
+			parent.name = "Parent";
+			em.persist(parent);
+			var child = new Child();
+			child.parentId = parent.id;
+			parent.children.add(child);
+			em.persist(child);
+		} );
+		scope.inTransaction( em -> {
+			Parent parent = em.find( Parent.class, 1L );
+			assertEquals(1, parent.children.size());
+			assertEquals(1L, parent.children.iterator().next().parentId);
+		} );
+		scope.inTransaction( em -> {
+			Parent parent =
+					em.createQuery( "from Parent p join fetch p.children where p.id = 1", Parent.class )
+							.getSingleResult();
+			assertEquals(1, parent.children.size());
+			assertEquals(1L, parent.children.iterator().next().parentId);
+		} );
+	}
+	@Entity(name = "Parent")
+	static class Parent {
+		@Id @GeneratedValue
+		long id;
+		String name;
+		@OneToMany(mappedBy = "parent")
+		Set<Child> children = new HashSet<>();
+	}
+	@Entity(name = "Child")
+	static class Child {
+		@Id
+		long id;
+		long parentId;
+		@ManyToOne
+		@JoinFormula( "abs(parentId)" )
+		Parent parent;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaCompositeBidiTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaCompositeBidiTest.java
new file mode 100644
index 000000000000..406ae180fe1f
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaCompositeBidiTest.java
@@ -0,0 +1,81 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.joinformula;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import org.hibernate.annotations.JoinColumnOrFormula;
+import org.hibernate.annotations.JoinFormula;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Jpa(annotatedClasses =
+		{JoinFormulaCompositeBidiTest.Parent.class,
+		JoinFormulaCompositeBidiTest.Child.class})
+@JiraKey("HHH-15492")
+class JoinFormulaCompositeBidiTest {
+	@Test
+	void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			var parent = new Parent();
+			parent.name = "Parent";
+			parent.region = 'A';
+			em.persist(parent);
+			var child = new Child();
+			child.parentId = parent.id;
+			child.region = 'A';
+			parent.children.add(child);
+			em.persist(child);
+		} );
+		scope.inTransaction( em -> {
+			Parent parent = em.find( Parent.class, new ParentId(1L, 'A') );
+			assertEquals(1, parent.children.size());
+			assertEquals(1L, parent.children.iterator().next().parentId);
+		} );
+		scope.inTransaction( em -> {
+			Parent parent =
+					em.createQuery( "from Parent p join fetch p.children where p.id = 1", Parent.class )
+							.getSingleResult();
+			assertEquals(1, parent.children.size());
+			assertEquals(1L, parent.children.iterator().next().parentId);
+		} );
+	}
+	record ParentId(long id, char region) {}
+	@Entity(name = "Parent")
+	@IdClass(ParentId.class)
+	static class Parent {
+		@Id @GeneratedValue
+		long id;
+		String name;
+		@Id
+		char region;
+		@OneToMany(mappedBy = "parent")
+		Set<Child> children = new HashSet<>();
+	}
+	@Entity(name = "Child")
+	static class Child {
+		@Id
+		long id;
+		long parentId;
+		char region;
+		@ManyToOne
+		@JoinColumnOrFormula(formula = @JoinFormula("abs(parentId)"))
+		@JoinColumnOrFormula(column = @JoinColumn(name = "region",
+				insertable = false, updatable = false))
+		Parent parent;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaCompositeUnidiTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaCompositeUnidiTest.java
new file mode 100644
index 000000000000..23fa1b5ff0c2
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaCompositeUnidiTest.java
@@ -0,0 +1,89 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.joinformula;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import org.hibernate.annotations.JoinColumnOrFormula;
+import org.hibernate.annotations.JoinFormula;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Jpa(annotatedClasses = JoinFormulaCompositeUnidiTest.Thing.class)
+@JiraKey("HHH-12997")
+class JoinFormulaCompositeUnidiTest {
+
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			Thing rootThing = new Thing();
+			rootThing.name = "0";
+			rootThing.depth = 0;
+
+			Thing childThing1 = new Thing();
+			childThing1.name = "1";
+			childThing1.depth = 1;
+			rootThing.childThings.add( childThing1 );
+
+			Thing childThing2 = new Thing();
+			childThing2.name = "2";
+			childThing2.depth = 1;
+			rootThing.childThings.add( childThing2 );
+
+			entityManager.persist( rootThing );
+			entityManager.persist( childThing1 );
+			entityManager.persist( childThing2 );
+		} );
+		scope.inTransaction( entityManager -> {
+			Thing rootThing = entityManager.find(Thing.class, new ParentId("0", 0));
+			assertEquals(2, rootThing.childThings.size());
+		} );
+		scope.inTransaction( entityManager -> {
+			Thing rootThing =
+					entityManager.createQuery("from Thing t join fetch childThings where t.name = '0'", Thing.class)
+							.getSingleResult();
+			assertEquals(2, rootThing.childThings.size());
+		} );
+		scope.inTransaction( entityManager -> {
+			Thing rootThing = entityManager.find(Thing.class, new ParentId("0", 0));
+			Thing childThing = entityManager.find(Thing.class, new ParentId("1", 1));
+			rootThing.childThings.remove( childThing );
+		} );
+		scope.inTransaction( entityManager -> {
+			Thing rootThing = entityManager.find(Thing.class, new ParentId("0", 0));
+			assertEquals(1, rootThing.childThings.size());
+		} );
+	}
+
+	record ParentId(String name, int depth) {}
+
+	@Entity(name = "Thing")
+	@IdClass(ParentId.class)
+	public static class Thing {
+
+		@Id
+		String name;
+		@Id
+		int depth;
+
+		@OneToMany(fetch = FetchType.LAZY)
+		@JoinColumnOrFormula(column = @JoinColumn(name = "parent_name",
+				referencedColumnName = "name"))
+		@JoinColumnOrFormula(formula = @JoinFormula(value = "depth-1",
+				referencedColumnName = "depth"))
+		Set<Thing> childThings = new HashSet<>();
+
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaUnidiTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaUnidiTest.java
new file mode 100644
index 000000000000..a2e5ba1c0483
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/joinformula/JoinFormulaUnidiTest.java
@@ -0,0 +1,83 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.joinformula;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.JoinFormula;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Jpa(annotatedClasses = JoinFormulaUnidiTest.Thing.class)
+@JiraKey("HHH-12997")
+class JoinFormulaUnidiTest {
+
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			Thing rootThing = new Thing();
+			rootThing.name = "a";
+			entityManager.persist( rootThing );
+
+			Thing childThing1 = new Thing();
+			childThing1.name = "b";
+			childThing1.parentName = "A";
+			entityManager.persist( childThing1 );
+
+			Thing childThing2 = new Thing();
+			childThing2.name = "c";
+			childThing2.parentName = "A";
+			entityManager.persist( childThing2 );
+		} );
+		scope.inTransaction( entityManager -> {
+			Thing rootThing = entityManager.find( Thing.class, "a");
+			assertEquals(2, rootThing.childThings.size());
+		} );
+		scope.inTransaction( entityManager -> {
+			Thing rootThing =
+					entityManager.createQuery("from Thing t join fetch childThings where t.name = 'a'", Thing.class)
+							.getSingleResult();
+			assertEquals(2, rootThing.childThings.size());
+		} );
+		scope.inTransaction( entityManager -> {
+			Thing rootThing = entityManager.find( Thing.class, "a");
+			Thing childThing = entityManager.find( Thing.class, "b");
+			rootThing.childThings.remove( childThing );
+		} );
+		scope.inTransaction( entityManager -> {
+			Thing rootThing = entityManager.find( Thing.class, "a");
+			assertEquals(2, rootThing.childThings.size());
+		} );
+		scope.inTransaction( entityManager -> {
+			Thing childThing = entityManager.find( Thing.class, "b");
+			childThing.parentName = null;
+		} );
+		scope.inTransaction( entityManager -> {
+			Thing rootThing = entityManager.find( Thing.class, "a");
+			assertEquals(1, rootThing.childThings.size());
+		} );
+	}
+
+	@Entity(name = "Thing")
+	public static class Thing {
+
+		@Id
+		private String name;
+
+		@Column(name = "parent_name")
+		private String parentName;
+
+		@OneToMany(fetch = FetchType.LAZY)
+		@JoinFormula(value = "lower(parent_name)",
+				referencedColumnName = "name")
+		private Set<Thing> childThings = new HashSet<>();
+
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/BadTargetTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/BadTargetTests.java
new file mode 100644
index 000000000000..c8d96889e501
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/BadTargetTests.java
@@ -0,0 +1,164 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.manytoone;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import org.hibernate.MappingException;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.ServiceRegistryScope;
+import org.junit.jupiter.api.Test;
+
+
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+/**
+ * @author Steve Ebersole
+ */
+@SuppressWarnings("JUnitMalformedDeclaration")
+@Jira( "https://hibernate.atlassian.net/browse/HHH-7202" )
+@ServiceRegistry
+public class BadTargetTests {
+	@Test
+	void testToOne(ServiceRegistryScope registryScope) {
+		var model = (MetadataImplementor) new MetadataSources( registryScope.getRegistry() )
+				.addAnnotatedClasses( Foo.class, Bar.class, Baz.class )
+				.buildMetadata();
+		try (var sf = model.buildSessionFactory()) {
+			fail( "Expecting a failure" );
+		}
+		catch (MappingException expected) {
+		}
+	}
+
+	@Test
+	void testToMany(ServiceRegistryScope registryScope) {
+		var model = (MetadataImplementor) new MetadataSources( registryScope.getRegistry() )
+				.addAnnotatedClasses( Brazos.class, Bar.class, Baz.class )
+				.buildMetadata();
+		try (var sf = model.buildSessionFactory()) {
+			fail( "Expecting a failure" );
+		}
+		catch (MappingException expected) {
+			assertThat( expected.getMessage() ).startsWith( "Plural attribute [" );
+			assertThat( expected.getMessage() ).contains( "Brazos.bars] was mapped with targetEntity=`" );
+		}
+	}
+
+	@Test
+	void testToManyGetter(ServiceRegistryScope registryScope) {
+		var model = (MetadataImplementor) new MetadataSources( registryScope.getRegistry() )
+				.addAnnotatedClasses( Brazos2.class, Bar.class, Baz.class )
+				.buildMetadata();
+		try (var sf = model.buildSessionFactory()) {
+			fail( "Expecting a failure" );
+		}
+		catch (MappingException expected) {
+			assertThat( expected.getMessage() ).startsWith( "Plural attribute [" );
+			assertThat( expected.getMessage() ).contains( "Brazos2.bars] was mapped with targetEntity=`" );
+		}
+	}
+
+	@Entity
+	public static class Foo {
+		@Id
+		private Integer id;
+		private String name;
+		@ManyToOne(targetEntity = Baz.class)
+		@JoinColumn(name = "bar_fk")
+		private Bar bar;
+
+		public Foo() {
+		}
+
+		public Foo(Integer id, String name, Bar bar) {
+			this.id = id;
+			this.name = name;
+			this.bar = bar;
+		}
+	}
+
+	@Entity
+	public static class Bar {
+		@Id
+		private Integer id;
+		private String name;
+
+		public Bar() {
+		}
+
+		public Bar(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
+
+	@Entity
+	public static class Baz {
+		@Id
+		private Integer id;
+		private String name;
+	}
+
+	@Entity
+	public static class Brazos {
+		@Id
+		private Integer id;
+		private String name;
+		@OneToMany(targetEntity = Baz.class)
+		@JoinColumn(name = "bar_fk")
+		private Set<Bar> bars;
+
+		public Brazos() {
+		}
+	}
+
+	@Entity
+	public static class Brazos2 {
+		private Integer id;
+		private String name;
+		private Set<Bar> bars;
+
+		public Brazos2() {
+		}
+
+		@Id
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@OneToMany(targetEntity = Baz.class)
+		@JoinColumn(name = "bar_fk")
+		public Set<Bar> getBars() {
+			return bars;
+		}
+
+		public void setBars(Set<Bar> bars) {
+			this.bars = bars;
+		}
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableCompositeIdTest.java
index eff59b3e38ef..e3a84e5a784c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableCompositeIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableCompositeIdTest.java
@@ -36,7 +36,7 @@
 /**
  * Asserts the runtime model descriptors related to the inverse side
  * of a many-to-one with join-table.
- * <p/>
+ * <p>
  * This tests simple keys.  See {@link InverseManyToOneJoinTableSimpleIdTest} for
  * simple id testing
  *
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableSimpleIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableSimpleIdTest.java
index 5036f1344fce..8a075c435c20 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableSimpleIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableSimpleIdTest.java
@@ -33,7 +33,7 @@
 /**
  * Asserts the runtime model descriptors related to the inverse side
  * of a many-to-one with join-table.
- * <p/>
+ * <p>
  * This tests simple keys.  See {@link InverseManyToOneJoinTableCompositeIdTest} for
  * composite id testing
  *
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ByteArrayNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/ByteArrayNaturalIdTest.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ByteArrayNaturalIdTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/ByteArrayNaturalIdTest.java
index 9d1231edb930..6ae19e04cccf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ByteArrayNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/ByteArrayNaturalIdTest.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.annotations.naturalid;
+package org.hibernate.orm.test.mapping.naturalid;
 
 import org.hibernate.annotations.NaturalId;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/LoadByNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/LoadByNaturalIdTest.java
index ebde39c3d614..8cc68b0a70e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/LoadByNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/LoadByNaturalIdTest.java
@@ -5,17 +5,27 @@
 package org.hibernate.orm.test.mapping.naturalid;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
+import jakarta.persistence.Timeout;
+import org.hibernate.KeyType;
+import org.hibernate.LockMode;
+import org.hibernate.OrderingMode;
+import org.hibernate.ReadOnlyMode;
+import org.hibernate.RemovalsMode;
+import org.hibernate.SessionCheckMode;
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.loader.ast.spi.NaturalIdLoader;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.CascadeType;
@@ -26,6 +36,9 @@
 import jakarta.persistence.OneToMany;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 @DomainModel(
 		annotatedClasses = {
@@ -42,8 +55,9 @@ public class LoadByNaturalIdTest {
 	private static final Long CHILD_ID = 1l;
 	private static final String CHILD_NAME = "Filippo";
 
-	@BeforeAll
+	@BeforeEach
 	public void setUp(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
 		scope.inTransaction(
 				session -> {
 					Parent parent = new Parent( PARENT_ID, PARENT_NAME );
@@ -98,6 +112,78 @@ public void testResolveIdToNaturalId(SessionFactoryScope scope) {
 		);
 	}
 
+	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsLockTimeouts.class )
+	void testFindOptions(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.find( Parent.class, "Luigi",
+					KeyType.NATURAL,
+					LockMode.PESSIMISTIC_WRITE,
+					Timeout.seconds( 1 ),
+					ReadOnlyMode.READ_ONLY );
+			session.findMultiple( Parent.class, List.of("Luigi"),
+					KeyType.NATURAL,
+					LockMode.PESSIMISTIC_WRITE,
+					Timeout.seconds( 1 ),
+					ReadOnlyMode.READ_ONLY );
+		} );
+	}
+
+	@Test
+	void testFindMultipleOptions(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var multiple = session.findMultiple(
+					Parent.class,
+					List.of( "Luigi", "Filippo" ),
+					KeyType.NATURAL,
+					SessionCheckMode.ENABLED,
+					OrderingMode.UNORDERED,
+					RemovalsMode.EXCLUDE
+			);
+			assertEquals( 1, multiple.size() );
+		} );
+		factoryScope.inTransaction( (session) -> {
+			session.remove( session.find( Parent.class, "Luigi", KeyType.NATURAL ) );
+			var multiple = session.findMultiple(
+					Parent.class,
+					List.of( "Luigi", "Filippo" ),
+					KeyType.NATURAL,
+					SessionCheckMode.ENABLED,
+					OrderingMode.UNORDERED,
+					RemovalsMode.EXCLUDE
+			);
+			assertEquals( 0, multiple.size() );
+		} );
+	}
+
+	@Test
+	void testFindMultipleOptions2(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var multiple = session.findMultiple(
+					Parent.class,
+					List.of( "Luigi", "Filippo" ),
+					KeyType.NATURAL,
+					SessionCheckMode.ENABLED,
+					RemovalsMode.REPLACE
+			);
+			assertEquals( 2, multiple.size() );
+			assertNotNull( multiple.get(0) );
+			assertNull( multiple.get(1) );
+		} );
+		factoryScope.inTransaction( (session) -> {
+			session.remove( session.find( Parent.class, "Luigi", KeyType.NATURAL ) );
+			var multiple = session.findMultiple(
+					Parent.class,
+					List.of( "Luigi", "Filippo" ),
+					KeyType.NATURAL,
+					SessionCheckMode.ENABLED,
+					RemovalsMode.REPLACE
+			);
+			assertEquals( 2, multiple.size() );
+			assertNull( multiple.get(0) );
+			assertNull( multiple.get(1) );
+		} );
+	}
 
 	private static NaturalIdLoader<?> getNaturalIdLoader(Class clazz, SessionImplementor session) {
 		return session.getFactory()
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdAndAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdAndAssociationTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdAndAssociationTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdAndAssociationTest.java
index a1b96cc424ef..bc3daaedeaff 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdAndAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdAndAssociationTest.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.annotations.naturalid;
+package org.hibernate.orm.test.mapping.naturalid;
 
 import java.math.BigDecimal;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdOnSingleManyToOneTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdOnSingleManyToOneTest.java
index 3a93b7da7492..804c67c3f1a5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdOnSingleManyToOneTest.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.annotations.naturalid;
+package org.hibernate.orm.test.mapping.naturalid;
 
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.NaturalIdCache;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdTest.java
similarity index 81%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdTest.java
index f9d265ddee84..5472a3223246 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdTest.java
@@ -2,12 +2,18 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.annotations.naturalid;
+package org.hibernate.orm.test.mapping.naturalid;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
 import org.hibernate.Session;
+import org.hibernate.annotations.NaturalId;
+import org.hibernate.annotations.NaturalIdCache;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.NaturalIdMapping;
 import org.hibernate.query.Query;
@@ -33,7 +39,7 @@
  */
 @SuppressWarnings("JUnitMalformedDeclaration")
 @ServiceRegistry(settings = @Setting(name = USE_QUERY_CACHE, value = "true"))
-@DomainModel( annotatedClasses = { Citizen.class, State.class, NaturalIdOnManyToOne.class } )
+@DomainModel( annotatedClasses = { NaturalIdTest.Citizen.class, NaturalIdTest.State.class, NaturalIdTest.NaturalIdOnManyToOne.class } )
 @SessionFactory
 public class NaturalIdTest {
 	@AfterEach
@@ -298,4 +304,142 @@ private State getState(Session s, String name) {
 		query.setCacheable( true );
 		return query.list().get( 0 );
 	}
+
+	/**
+	 * @author Emmanuel Bernard
+	 */
+	@Entity(name = "State")
+	public static class State {
+		@Id
+		private Integer id;
+		private String name;
+
+		public State() {
+		}
+
+		public State(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	/**
+	 * @author Emmanuel Bernard
+	 */
+	@Entity(name = "Citizen")
+	@NaturalIdCache
+	public static class Citizen {
+		@Id
+		private Integer id;
+		private String firstname;
+		private String lastname;
+		@NaturalId
+		@ManyToOne
+		private State state;
+		@NaturalId
+		private String ssn;
+
+		public Citizen() {
+		}
+
+		public Citizen(Integer id, String firstname, String lastname, State state, String ssn) {
+			this.id = id;
+			this.firstname = firstname;
+			this.lastname = lastname;
+			this.state = state;
+			this.ssn = ssn;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getFirstname() {
+			return firstname;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public String getLastname() {
+			return lastname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		public State getState() {
+			return state;
+		}
+
+		public void setState(State state) {
+			this.state = state;
+		}
+
+		public String getSsn() {
+			return ssn;
+		}
+
+		public void setSsn(String ssn) {
+			this.ssn = ssn;
+		}
+	}
+
+	/**
+	 * Test case for NaturalId annotation - ANN-750
+	 *
+	 * @author Emmanuel Bernard
+	 * @author Hardy Ferentschik
+	 */
+	@Entity(name = "NaturalIdOnManyToOne")
+	@NaturalIdCache
+	static
+	class NaturalIdOnManyToOne {
+
+		@Id
+		@GeneratedValue
+		int id;
+
+		@NaturalId
+		@ManyToOne
+		Citizen citizen;
+
+		public int getId() {
+			return id;
+		}
+
+		public void setId(int id) {
+			this.id = id;
+		}
+
+		public Citizen getCitizen() {
+			return citizen;
+		}
+
+		public void setCitizen(Citizen citizen) {
+			this.citizen = citizen;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdUniqueConstraintNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdUniqueConstraintNameTest.java
similarity index 54%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdUniqueConstraintNameTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdUniqueConstraintNameTest.java
index 5be303072725..cdae28eb5223 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/NaturalIdUniqueConstraintNameTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/NaturalIdUniqueConstraintNameTest.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.annotations.naturalid;
+package org.hibernate.orm.test.mapping.naturalid;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -10,6 +10,7 @@
 import jakarta.persistence.UniqueConstraint;
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.mapping.Index;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
@@ -31,16 +32,28 @@ public void testNaturalIdUsesUniqueConstraintName(ServiceRegistryScope registryS
 				.addAnnotatedClasses( getAnnotatedClasses() )
 				.buildMetadata();
 
-		var uniqueKeys = metadata.getEntityBinding( City1.class.getName() )
-				.getTable()
-				.getUniqueKeys();
+		var table = metadata.getEntityBinding( City1.class.getName() )
+				.getTable();
 
-		// The unique key should not be duplicated for NaturalID + UniqueConstraint.
-		assertEquals( 1, uniqueKeys.size() );
+		if (metadata.getDatabase().getDialect().supportsUniqueConstraints()) {
+			var uniqueKeys = table.getUniqueKeys();
 
-		// The unique key should use the name specified in UniqueConstraint.
-		var uniqueKey = uniqueKeys.values().iterator().next();
-		assertEquals( "UK_zipCode_city", uniqueKey.getName() );
+			// The unique key should not be duplicated for NaturalID + UniqueConstraint.
+			assertEquals( 1, uniqueKeys.size() );
+
+			// The unique key should use the name specified in UniqueConstraint.
+			var uniqueKey = uniqueKeys.values().iterator().next();
+			assertEquals( "UK_zipCode_city", uniqueKey.getName() );
+		}
+		else {
+			var uniqueIndexes = table.getIndexes().values().stream().filter( Index::isUnique ).toList();
+
+			// The unique key should not be duplicated for NaturalID + UniqueConstraint.
+			assertEquals( 1, uniqueIndexes.size() );
+
+			// The unique key should use the name specified in UniqueConstraint.
+			assertEquals( "UK_zipCode_city", uniqueIndexes.get( 0 ).getName() );
+		}
 	}
 
 	@Test
@@ -49,17 +62,32 @@ public void testNaturalIdUsesExplicitColumns(ServiceRegistryScope registryScope)
 				.addAnnotatedClasses( getAnnotatedClasses() )
 				.buildMetadata();
 
-		var uniqueKeys = metadata.getEntityBinding( City2.class.getName() )
-				.getTable()
-				.getUniqueKeys();
+		var table = metadata.getEntityBinding( City1.class.getName() )
+				.getTable();
+
+		if (metadata.getDatabase().getDialect().supportsUniqueConstraints()) {
+			var uniqueKeys = table.getUniqueKeys();
 
-		// The unique key should not be duplicated for NaturalID + UniqueConstraint.
-		assertEquals( 1, uniqueKeys.size() );
+			// The unique key should not be duplicated for NaturalID + UniqueConstraint.
+			assertEquals( 1, uniqueKeys.size() );
+
+			// The unique key should use the name specified in UniqueConstraint.
+			var uniqueKey = uniqueKeys.values().iterator().next();
+			assertEquals( "zipCode", uniqueKey.getColumns().get( 0 ).getName() );
+			assertEquals( "city", uniqueKey.getColumns().get( 1 ).getName() );
+		}
+		else {
+			var uniqueIndexes = table.getIndexes().values().stream().filter( Index::isUnique ).toList();
+
+			// The unique key should not be duplicated for NaturalID + UniqueConstraint.
+			assertEquals( 1, uniqueIndexes.size() );
+
+			// The unique key should use the name specified in UniqueConstraint.
+			var uniqueIndex = uniqueIndexes.get( 0 );
+			assertEquals( "zipCode", uniqueIndex.getColumns().get( 0 ).getName() );
+			assertEquals( "city", uniqueIndex.getColumns().get( 1 ).getName() );
+		}
 
-		// The unique key should use the name specified in UniqueConstraint.
-		var uniqueKey = uniqueKeys.values().iterator().next();
-		assertEquals( "zipCode", uniqueKey.getColumns().get( 0 ).getName() );
-		assertEquals( "city", uniqueKey.getColumns().get( 1 ).getName() );
 	}
 
 	@Entity(name = "City1")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/XRefTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/XRefTests.java
new file mode 100644
index 000000000000..dc9c36724ce1
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/XRefTests.java
@@ -0,0 +1,330 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.naturalid;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.Table;
+import org.hibernate.StaleObjectStateException;
+import org.hibernate.annotations.NaturalId;
+import org.hibernate.annotations.NaturalIdCache;
+import org.hibernate.cache.internal.NaturalIdCacheKey;
+import org.hibernate.cache.spi.CacheImplementor;
+import org.hibernate.cache.spi.support.AbstractReadWriteAccess;
+import org.hibernate.cache.spi.support.DomainDataRegionTemplate;
+import org.hibernate.cfg.CacheSettings;
+import org.hibernate.engine.internal.NaturalIdResolutionsImpl;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.hibernate.KeyType.NATURAL;
+
+/// Tests for [org.hibernate.engine.spi.NaturalIdResolutions]
+///
+/// @author Steve Ebersole
+@SuppressWarnings("JUnitMalformedDeclaration")
+@ServiceRegistry(settings = @Setting( name = CacheSettings.USE_SECOND_LEVEL_CACHE, value = "true" ) )
+@DomainModel(annotatedClasses = {
+		XRefTests.Another.class,
+		XRefTests.Book.class,
+		XRefTests.Bookmark.class,
+		XRefTests.Pen.class
+})
+@SessionFactory(useCollectingStatementInspector = true)
+public class XRefTests {
+	public static final String BOOK_ISBN = "123-4567-890";
+	public static final String BOOKMARK_SKU = "98-abc-7654-def";
+	public static final String PEN_SKU = "98-xyz-7234";
+
+	@Test
+	void testLocalResolution(SessionFactoryScope factoryScope) {
+		final SQLStatementInspector sqlCollector = factoryScope.getCollectingStatementInspector();
+		sqlCollector.clear();
+
+		factoryScope.inTransaction( (session) -> {
+			final NaturalIdResolutionsImpl naturalIdResolutions = (NaturalIdResolutionsImpl) session.getPersistenceContext().getNaturalIdResolutions();
+			assertThat( naturalIdResolutions.getEntityResolutions( Book.class ) ).isNull();
+
+			session.find( XRefTests.Book.class, BOOK_ISBN, NATURAL );
+			assertThat( sqlCollector.getSqlQueries() ).hasSize( 1 );
+			verifyLocalResolution( Book.class, BOOK_ISBN, 1, session );
+
+			sqlCollector.clear();
+
+			session.find( XRefTests.Book.class, BOOK_ISBN, NATURAL );
+			assertThat( sqlCollector.getSqlQueries() ).isEmpty();
+			verifyLocalResolution( Book.class, BOOK_ISBN, 1, session );
+		} );
+	}
+
+	@Test
+	void testLocalResolutionWithCache(SessionFactoryScope factoryScope) {
+		final SQLStatementInspector sqlCollector = factoryScope.getCollectingStatementInspector();
+		sqlCollector.clear();
+
+		factoryScope.getSessionFactory().getCache().evictAllRegions();
+
+		factoryScope.inTransaction( (session) -> {
+			verifyEmptyLocalResolution( Bookmark.class, session );
+			verifyEmptyCacheResolution( Bookmark.class, BOOKMARK_SKU, session );
+
+			session.find( Bookmark.class, BOOKMARK_SKU, NATURAL );
+			assertThat( sqlCollector.getSqlQueries() ).hasSize( 1 );
+			verifyLocalResolution( Bookmark.class, BOOKMARK_SKU, 1, session );
+			verifyCacheResolution( Bookmark.class, BOOKMARK_SKU, 1, session );
+
+			sqlCollector.clear();
+
+			session.find( Bookmark.class, BOOKMARK_SKU, NATURAL );
+			assertThat( sqlCollector.getSqlQueries() ).isEmpty();
+			verifyLocalResolution( Bookmark.class, BOOKMARK_SKU, 1, session );
+			verifyCacheResolution( Bookmark.class, BOOKMARK_SKU, 1, session );
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			verifyCacheResolution( Bookmark.class, BOOKMARK_SKU, 1, session );
+			verifyEmptyLocalResolution( Bookmark.class, session );
+		} );
+	}
+
+	@Test
+	void testLocalResolutionWithMutableCache(SessionFactoryScope factoryScope) {
+		final SQLStatementInspector sqlCollector = factoryScope.getCollectingStatementInspector();
+		sqlCollector.clear();
+
+		factoryScope.getSessionFactory().getCache().evictAllRegions();
+
+		factoryScope.inTransaction( (session) -> {
+			verifyEmptyLocalResolution( Pen.class, session );
+			verifyEmptyCacheResolution( Pen.class, PEN_SKU, session );
+
+			session.find( XRefTests.Pen.class, PEN_SKU, NATURAL );
+			assertThat( sqlCollector.getSqlQueries() ).hasSize( 1 );
+			verifyLocalResolution( Pen.class, PEN_SKU, 1, session );
+			verifyCacheResolution( Pen.class, PEN_SKU, 1, session );
+
+			sqlCollector.clear();
+
+			session.find( XRefTests.Pen.class, PEN_SKU, NATURAL );
+			assertThat( sqlCollector.getSqlQueries() ).isEmpty();
+			verifyLocalResolution( Pen.class, PEN_SKU, 1, session );
+			verifyCacheResolution( Pen.class, PEN_SKU, 1, session );
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			verifyCacheResolution( Pen.class, PEN_SKU, 1, session );
+			verifyEmptyLocalResolution( Pen.class, session );
+		} );
+	}
+
+	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
+	void testCrossRefManagementWithMutation(SessionFactoryScope factoryScope) {
+		final SQLStatementInspector sqlCollector = factoryScope.getCollectingStatementInspector();
+		sqlCollector.clear();
+
+		final String updatedSku = "987-123-654";
+		factoryScope.inTransaction( (session) -> {
+			verifyCacheResolution( Pen.class, PEN_SKU, 1, session );
+			verifyEmptyLocalResolution( Pen.class, session );
+
+			session.find( Pen.class, PEN_SKU, NATURAL );
+			verifyLocalResolution( Pen.class, PEN_SKU, 1, session );
+
+			factoryScope.inTransaction( (session2) -> {
+				session2.find( Pen.class, 1 ).sku = updatedSku;
+			} );
+
+			// the point here -
+			//		1. The local (Session) cache maintains repeatable-read
+			//		2. The shared (L2C) cache sees the updated xref
+			verifyLocalResolution( Pen.class, PEN_SKU, 1, session );
+			verifyCacheResolution( Pen.class, updatedSku, 1, session );
+
+			sqlCollector.clear();
+
+			session.find( Pen.class, PEN_SKU, NATURAL );
+			assertThat( sqlCollector.getSqlQueries() ).isEmpty();
+			verifyLocalResolution( Pen.class, PEN_SKU, 1, session );
+			verifyCacheResolution( Pen.class, updatedSku, 1, session );
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			var nonExistent = session.find( Pen.class, PEN_SKU, NATURAL );
+			assertThat( nonExistent ).isNull();
+
+			var updated = session.find( Pen.class, updatedSku, NATURAL );
+			assertThat( updated ).isNotNull();
+
+			verifyLocalResolution( Pen.class, updatedSku, 1, session );
+			verifyCacheResolution( Pen.class, updatedSku, 1, session );
+		} );
+	}
+
+	private void verifyEmptyLocalResolution(Class<?> entityType, SessionImplementor session) {
+		final NaturalIdResolutionsImpl naturalIdResolutions = (NaturalIdResolutionsImpl) session.getPersistenceContext().getNaturalIdResolutions();
+		assertThat( naturalIdResolutions.getEntityResolutions( entityType ) ).isNull();
+	}
+
+	private void verifyLocalResolution(Class<?> entityType, String naturalId, int id, SessionImplementor session) {
+		final NaturalIdResolutionsImpl naturalIdResolutions = (NaturalIdResolutionsImpl) session.getPersistenceContext().getNaturalIdResolutions();
+
+		var entityResolutions = naturalIdResolutions.getEntityResolutions( entityType );
+		assertThat( entityResolutions ).isNotNull();
+		assertThat( entityResolutions.getResolutionByPk( id ).getNaturalIdValue() ).isEqualTo( naturalId );
+		assertThat( entityResolutions.getIdResolutionByNaturalId( naturalId ) ).isEqualTo( id );
+	}
+
+	private void verifyEmptyCacheResolution(Class<?> entityType, Object naturalId, SessionImplementor session) {
+		final CacheImplementor cache = session.getSessionFactory().getCache();
+		final DomainDataRegionTemplate region = (DomainDataRegionTemplate) cache.getRegion( entityType.getName() + "##NaturalId" );
+		// region should get created on bootstrap
+		assertThat( region ).isNotNull();
+		// however, we should have no cached resolutions
+		assertThat( region.getCacheStorageAccess().contains( naturalId ) ).isFalse();
+	}
+
+	private void verifyCacheResolution(Class<?> entityType, String naturalId, int id, SessionImplementor session) {
+		final CacheImplementor cache = session.getSessionFactory().getCache();
+		final DomainDataRegionTemplate region = (DomainDataRegionTemplate) cache.getRegion( entityType.getName() + "##NaturalId" );
+		var storage = region.getCacheStorageAccess();
+		var entityDescriptor = session.getFactory().getMappingMetamodel().getEntityDescriptor( entityType.getName() );
+		var resolutionKey = NaturalIdCacheKey.from( naturalId, entityDescriptor, entityDescriptor.getEntityName(), session );
+		var resolution = (AbstractReadWriteAccess.Item) storage.getFromCache( resolutionKey, session );
+		assertThat( resolution.getValue() ).isEqualTo( id );
+	}
+
+	@Test
+	void testDeletionInOtherSession(SessionFactoryScope factoryScope) {
+		var created = factoryScope.fromTransaction( (session) -> {
+			var other = new Another( "something" );
+			session.persist( other );
+			return other;
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			var b = session.getReference( Another.class, created.id );
+			session.remove( b );
+		} );
+
+		created.name = "something else";
+		try {
+			factoryScope.inTransaction( (session) -> {
+				session.merge( created );
+			} );
+			fail( "Expecting OptimisticLockException / StaleObjectStateException" );
+		}
+		catch (OptimisticLockException expected) {
+			assertThat( expected.getCause() ).isInstanceOf( StaleObjectStateException.class );
+		}
+	}
+
+	@BeforeEach
+	void createTestData(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.persist( new Book( 1, "The Grapes of Wrath", BOOK_ISBN ) );
+			session.persist( new Bookmark( 1, "The Keeper", BOOKMARK_SKU ) );
+			session.persist( new Pen( 1, "G2", PEN_SKU ) );
+		} );
+	}
+
+	@AfterEach
+	void dropTestData(SessionFactoryScope factoryScope) {
+		factoryScope.dropData();
+	}
+
+	@SuppressWarnings({"FieldCanBeLocal", "unused"})
+	@Entity(name="Book")
+	@Table(name="books")
+	public static class Book {
+		@Id
+		private Integer id;
+		private String title;
+		@NaturalId
+		private String isbn;
+
+		public Book() {
+		}
+
+		public Book(Integer id, String title, String isbn) {
+			this.id = id;
+			this.title = title;
+			this.isbn = isbn;
+		}
+	}
+
+	@SuppressWarnings({"FieldCanBeLocal", "unused"})
+	@Entity(name="Bookmark")
+	@Table(name="bookmarks")
+	@NaturalIdCache
+	public static class Bookmark {
+		@Id
+		private Integer id;
+		private String manufacturer;
+		@NaturalId
+		private String sku;
+
+		public Bookmark() {
+		}
+
+		public Bookmark(Integer id, String manufacturer, String sku) {
+			this.id = id;
+			this.manufacturer = manufacturer;
+			this.sku = sku;
+		}
+	}
+
+	@SuppressWarnings({"FieldCanBeLocal", "unused"})
+	@Entity(name="Pen")
+	@Table(name="pens")
+	@NaturalIdCache
+	public static class Pen {
+		@Id
+		private Integer id;
+		private String manufacturer;
+		@NaturalId(mutable = true)
+		private String sku;
+
+		public Pen() {
+		}
+
+		public Pen(Integer id, String manufacturer, String sku) {
+			this.id = id;
+			this.manufacturer = manufacturer;
+			this.sku = sku;
+		}
+	}
+
+	@Entity(name="Another")
+	@Table(name="others")
+	public static class Another {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		@NaturalId
+		private String name;
+
+		public Another() {
+		}
+
+		public Another(String name) {
+			this.name = name;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/caching/BasicNaturalIdCachingTests.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/caching/BasicNaturalIdCachingTests.java
index e9684ce967ef..3e04e7ef4e43 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/BasicNaturalIdCachingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/caching/BasicNaturalIdCachingTests.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.mapping.naturalid;
+package org.hibernate.orm.test.mapping.naturalid.caching;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/caching/CompoundNaturalIdCacheTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/caching/CompoundNaturalIdCacheTest.java
index a0b936a1e53c..b316186d0da4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/caching/CompoundNaturalIdCacheTest.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.mapping.naturalid.compound;
+package org.hibernate.orm.test.mapping.naturalid.caching;
 
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.NaturalIdCache;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/A.java
similarity index 91%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/A.java
index 83db358bd2a0..acf614cc12e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/A.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/A.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.annotations.naturalid.cid;
+package org.hibernate.orm.test.mapping.naturalid.cid;
 
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AId.java
similarity index 92%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AId.java
index ff541adae413..f67d4b93115d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/AId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AId.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.annotations.naturalid.cid;
+package org.hibernate.orm.test.mapping.naturalid.cid;
 
 import jakarta.persistence.Embeddable;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AnnotatedCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AnnotatedCompositeIdAndNaturalIdTest.java
deleted file mode 100644
index 6f295c80c616..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AnnotatedCompositeIdAndNaturalIdTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.mapping.naturalid.cid;
-
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.Setting;
-
-import static org.hibernate.cfg.AvailableSettings.GENERATE_STATISTICS;
-import static org.hibernate.cfg.AvailableSettings.USE_QUERY_CACHE;
-import static org.hibernate.cfg.AvailableSettings.USE_SECOND_LEVEL_CACHE;
-
-/**
- * @author Donnchadh O Donnabhain
- */
-@ServiceRegistry(
-		settings = {
-				@Setting( name = USE_SECOND_LEVEL_CACHE, value = "false" ),
-				@Setting( name = USE_QUERY_CACHE, value = "false" ),
-				@Setting( name = GENERATE_STATISTICS, value = "false" )
-		}
-)
-@DomainModel( annotatedClasses = { Account.class, AccountId.class } )
-@SessionFactory
-public class AnnotatedCompositeIdAndNaturalIdTest extends AbstractCompositeIdAndNaturalIdTest {
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/EmbeddedAndNaturalIdTest.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/EmbeddedAndNaturalIdTest.java
index ec9dab76b108..6ccf9c994b43 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/EmbeddedAndNaturalIdTest.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.annotations.naturalid.cid;
+package org.hibernate.orm.test.mapping.naturalid.cid;
 
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/HbmCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/HbmCompositeIdAndNaturalIdTest.java
deleted file mode 100644
index a710d7611fd3..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/HbmCompositeIdAndNaturalIdTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.mapping.naturalid.cid;
-
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.ServiceRegistry;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.Setting;
-
-import static org.hibernate.cfg.AvailableSettings.GENERATE_STATISTICS;
-import static org.hibernate.cfg.AvailableSettings.USE_QUERY_CACHE;
-import static org.hibernate.cfg.AvailableSettings.USE_SECOND_LEVEL_CACHE;
-
-/**
- * @author Donnchadh O Donnabhain
- */
-@ServiceRegistry(
-		settings = {
-				@Setting( name = USE_SECOND_LEVEL_CACHE, value = "false" ),
-				@Setting( name = USE_QUERY_CACHE, value = "false" ),
-				@Setting( name = GENERATE_STATISTICS, value = "false" )
-		}
-)
-@DomainModel( xmlMappings = "org/hibernate/orm/test/mapping/naturalid/cid/Account.hbm.xml" )
-@SessionFactory
-public class HbmCompositeIdAndNaturalIdTest extends AbstractCompositeIdAndNaturalIdTest {
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/AbstractCompositeIdAndNaturalIdTest.java
similarity index 75%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/AbstractCompositeIdAndNaturalIdTest.java
index 648ce07f23eb..cd4421da71e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/AbstractCompositeIdAndNaturalIdTest.java
@@ -2,40 +2,40 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.mapping.naturalid.cid;
+package org.hibernate.orm.test.mapping.naturalid.composite;
 
 import org.hibernate.metamodel.mapping.AttributeMetadata;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.SingularAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.SimpleNaturalIdMapping;
 import org.hibernate.persister.entity.EntityPersister;
-
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author Steve Ebersole
  */
 public abstract class AbstractCompositeIdAndNaturalIdTest {
 	@Test
-	@JiraKey( value = "HHH-10360")
+	@JiraKey(value = "HHH-10360")
 	public void testNaturalIdNullability(SessionFactoryScope scope) {
-		final EntityMappingType accountMapping = scope.getSessionFactory().getRuntimeMetamodels().getEntityMappingType( Account.class );
+		final EntityMappingType accountMapping = scope.getSessionFactory().getRuntimeMetamodels()
+				.getEntityMappingType( Account.class );
 		final SingularAttributeMapping shortCodeMapping = ((SimpleNaturalIdMapping) accountMapping.getNaturalIdMapping()).getAttribute();
 		final AttributeMetadata shortCodeMetadata = shortCodeMapping.getAttributeMetadata();
 		assertThat( shortCodeMetadata.isNullable(), is( false ) );
 
 		final EntityPersister rootEntityPersister = accountMapping.getRootEntityDescriptor().getEntityPersister();
 		final int shortCodeLegacyPropertyIndex = rootEntityPersister.getPropertyIndex( "shortCode" );
-		assertThat( shortCodeLegacyPropertyIndex, is ( 0 ) );
-		assertThat( rootEntityPersister.getPropertyNullability()[ shortCodeLegacyPropertyIndex ], is( false ) );
+		assertThat( shortCodeLegacyPropertyIndex, is( 0 ) );
+		assertThat( rootEntityPersister.getPropertyNullability()[shortCodeLegacyPropertyIndex], is( false ) );
 	}
 
 	public static final String NATURAL_ID_VALUE = "testAcct";
@@ -45,7 +45,8 @@ public void prepareTestData(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
 					// prepare some test data...
-					Account account = new Account( new AccountId( 1 ), NATURAL_ID_VALUE );
+					Account account = new Account(
+							new AccountId( 1 ), NATURAL_ID_VALUE );
 					session.persist( account );
 				}
 		);
@@ -60,7 +61,8 @@ public void cleanUpTestData(SessionFactoryScope scope) {
 	public void testNaturalIdCriteria(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
-					final Account account = session.bySimpleNaturalId( Account.class ).load( NATURAL_ID_VALUE );
+					final Account account = session.bySimpleNaturalId(
+							Account.class ).load( NATURAL_ID_VALUE );
 					assertThat( account, notNullValue() );
 				}
 		);
@@ -70,13 +72,15 @@ public void testNaturalIdCriteria(SessionFactoryScope scope) {
 	public void testNaturalIdApi(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
-					final Account account = session.bySimpleNaturalId( Account.class ).load( NATURAL_ID_VALUE );
+					final Account account = session.bySimpleNaturalId(
+							Account.class ).load( NATURAL_ID_VALUE );
 					assertThat( account, notNullValue() );
 				}
 		);
 		scope.inTransaction(
 				(session) -> {
-					final Account account = session.byNaturalId( Account.class ).using( "shortCode", NATURAL_ID_VALUE ).load();
+					final Account account = session.byNaturalId(
+							Account.class ).using( "shortCode", NATURAL_ID_VALUE ).load();
 					assertThat( account, notNullValue() );
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/Account.java
similarity index 86%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/Account.java
index 5f9c8c6c1c9d..e3c089a2495e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/Account.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/Account.java
@@ -2,25 +2,24 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.mapping.naturalid.cid;
+package org.hibernate.orm.test.mapping.naturalid.composite;
 
 import jakarta.persistence.Basic;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
-
 import org.hibernate.annotations.NaturalId;
 
 /**
  * @author Donnchadh O Donnabhain
  */
 @Entity
-@Table( name = "t_acct" )
+@Table(name = "t_acct")
 public class Account {
 	@EmbeddedId
 	private AccountId accountId;
 
-	@Basic( optional = false )
+	@Basic(optional = false)
 	@NaturalId
 	private String shortCode;
 
@@ -31,9 +30,11 @@ public Account(AccountId accountId, String shortCode) {
 		this.accountId = accountId;
 		this.shortCode = shortCode;
 	}
+
 	public String getShortCode() {
 		return shortCode;
 	}
+
 	public AccountId getAccountId() {
 		return accountId;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/AccountId.java
similarity index 75%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/AccountId.java
index 6a8e518a8e45..5d58e1b5471f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AccountId.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/AccountId.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.mapping.naturalid.cid;
+package org.hibernate.orm.test.mapping.naturalid.composite;
 
 import jakarta.persistence.Embeddable;
 
@@ -20,24 +20,31 @@ protected AccountId() {
 	public AccountId(int id) {
 		this.id = id;
 	}
+
 	public int intValue() {
 		return id;
 	}
+
 	@Override
 	public int hashCode() {
 		return id;
 	}
+
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
+		if ( this == obj ) {
 			return true;
-		if (obj == null)
+		}
+		if ( obj == null ) {
 			return false;
-		if (getClass() != obj.getClass())
+		}
+		if ( getClass() != obj.getClass() ) {
 			return false;
+		}
 		AccountId other = (AccountId) obj;
-		if (other != null && id != other.id)
+		if ( other != null && id != other.id ) {
 			return false;
+		}
 		return true;
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/AnnotatedCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/AnnotatedCompositeIdAndNaturalIdTest.java
new file mode 100644
index 000000000000..038aded0b596
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/AnnotatedCompositeIdAndNaturalIdTest.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.naturalid.composite;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.Setting;
+
+import static org.hibernate.cfg.CacheSettings.USE_QUERY_CACHE;
+import static org.hibernate.cfg.CacheSettings.USE_SECOND_LEVEL_CACHE;
+import static org.hibernate.cfg.StatisticsSettings.GENERATE_STATISTICS;
+
+/**
+ * @author Donnchadh O Donnabhain
+ */
+@ServiceRegistry(
+		settings = {
+				@Setting(name = USE_SECOND_LEVEL_CACHE, value = "false"),
+				@Setting(name = USE_QUERY_CACHE, value = "false"),
+				@Setting(name = GENERATE_STATISTICS, value = "false")
+		}
+)
+@DomainModel(annotatedClasses = {Account.class, AccountId.class})
+@SessionFactory
+public class AnnotatedCompositeIdAndNaturalIdTest extends AbstractCompositeIdAndNaturalIdTest {
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompoundNaturalIdTest.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompoundNaturalIdTest.java
index 34b0c207bdcf..6be001610726 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompoundNaturalIdTest.java
@@ -2,11 +2,12 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.mapping.naturalid.compound;
+package org.hibernate.orm.test.mapping.naturalid.composite;
 
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.CockroachDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaQuery;
 
@@ -47,6 +48,7 @@
 		dialectClass = CockroachDialect.class,
 		reason = "On CockroachDB the difference between simple and compound natural id is very high"
 )
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "temporary disable, taking too long to complete")
 public class CompoundNaturalIdTest {
 
 	private static final int OBJECT_NUMBER = 2000;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompoundNaturalIdTests.java
similarity index 77%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompoundNaturalIdTests.java
index fc1e6aed6a7e..597874c7fe36 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/CompoundNaturalIdTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/CompoundNaturalIdTests.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.mapping.naturalid;
+package org.hibernate.orm.test.mapping.naturalid.composite;
 
 import java.util.HashMap;
 import java.util.List;
@@ -13,10 +13,10 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
+import org.hibernate.KeyType;
 import org.hibernate.NaturalIdLoadAccess;
 import org.hibernate.NaturalIdMultiLoadAccess;
 import org.hibernate.annotations.NaturalId;
-import org.hibernate.loader.ast.spi.NaturalIdLoadOptions;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.metamodel.MappingMetamodel;
@@ -102,30 +102,31 @@ public void testProcessing(DomainModelScope domainModelScope, SessionFactoryScop
 
 	@Test
 	public void testGetReference(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					final NaturalIdLoadAccess<Account> loadAccess = session.byNaturalId( Account.class );
-					loadAccess.using( "system", "matrix" );
-					loadAccess.using( "username", "neo" );
-					verifyEntity( loadAccess.getReference() );
-				}
-		);
-
-		scope.inTransaction(
-				session -> {
-					final MappingMetamodel mappingMetamodel = session.getFactory().getRuntimeMetamodels().getMappingMetamodel();
-					final EntityPersister accountMapping = mappingMetamodel.findEntityDescriptor( Account.class );
-					final NaturalIdMapping naturalIdMapping = accountMapping.getNaturalIdMapping();
-
-					// test load by array
-					Object id = accountMapping.getNaturalIdLoader().resolveNaturalIdToId( VALUE_ARRAY, session );
-					assertThat( id, is( 1 ) );
-
-					// and by Map
-					id = accountMapping.getNaturalIdLoader().resolveNaturalIdToId( VALUE_MAP, session );
-					assertThat( id, is( 1 ) );
-				}
-		);
+		scope.inTransaction(session -> {
+			final MappingMetamodel mappingMetamodel = session.getFactory().getRuntimeMetamodels().getMappingMetamodel();
+			final EntityPersister accountMapping = mappingMetamodel.findEntityDescriptor( Account.class );
+			final NaturalIdMapping naturalIdMapping = accountMapping.getNaturalIdMapping();
+
+			// test load by array
+			var id = accountMapping.getNaturalIdLoader().resolveNaturalIdToId(
+					naturalIdMapping.normalizeInput( VALUE_ARRAY ),
+					session
+			);
+			assertThat( id, is( 1 ) );
+
+			// and by Map
+			id = accountMapping.getNaturalIdLoader().resolveNaturalIdToId(
+					naturalIdMapping.normalizeInput( VALUE_MAP ),
+					session
+			);
+			assertThat( id, is( 1 ) );
+
+			// finally, by the deprecated loader access contract
+			final NaturalIdLoadAccess<Account> loadAccess = session.byNaturalId( Account.class );
+			loadAccess.using( "system", "matrix" );
+			loadAccess.using( "username", "neo" );
+			verifyEntity( loadAccess.getReference() );
+		} );
 	}
 
 	public void verifyEntity(Account accountRef) {
@@ -137,29 +138,22 @@ public void verifyEntity(Account accountRef) {
 
 	@Test
 	public void testLoad(SessionFactoryScope scope) {
-		scope.inTransaction(
-				session -> {
-					final Account account = session.byNaturalId( Account.class )
-							.using( "system", "matrix" )
-							.using( "username", "neo" )
-							.load();
-					verifyEntity( account );
-				}
-		);
-
-		scope.inTransaction(
-				session -> {
-					final MappingMetamodel mappingMetamodel = session.getFactory().getRuntimeMetamodels().getMappingMetamodel();
-					final EntityPersister accountMapping = mappingMetamodel.findEntityDescriptor( Account.class );
-					final NaturalIdMapping naturalIdMapping = accountMapping.getNaturalIdMapping();
-
-					// test load by array
-					accountMapping.getNaturalIdLoader().load( VALUE_ARRAY, NaturalIdLoadOptions.NONE, session );
-
-					// and by Map
-					accountMapping.getNaturalIdLoader().load( VALUE_MAP, NaturalIdLoadOptions.NONE, session );
-				}
-		);
+		scope.inTransaction(session -> {
+			// test load by array
+			var account = session.find( Account.class, VALUE_ARRAY, KeyType.NATURAL );
+			verifyEntity( account );
+
+			// and by Map
+			account = session.find( Account.class, VALUE_MAP, KeyType.NATURAL );
+			verifyEntity( account );
+
+			// finally, using the deprecated load-access contract
+			account = session.byNaturalId( Account.class )
+					.using( "system", "matrix" )
+					.using( "username", "neo" )
+					.load();
+			verifyEntity( account );
+		} );
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/HbmCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/HbmCompositeIdAndNaturalIdTest.java
new file mode 100644
index 000000000000..9777c254e062
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/composite/HbmCompositeIdAndNaturalIdTest.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.naturalid.composite;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.Setting;
+
+import static org.hibernate.cfg.CacheSettings.USE_QUERY_CACHE;
+import static org.hibernate.cfg.CacheSettings.USE_SECOND_LEVEL_CACHE;
+import static org.hibernate.cfg.StatisticsSettings.GENERATE_STATISTICS;
+
+/**
+ * @author Donnchadh O Donnabhain
+ */
+@ServiceRegistry(
+		settings = {
+				@Setting(name = USE_SECOND_LEVEL_CACHE, value = "false"),
+				@Setting(name = USE_QUERY_CACHE, value = "false"),
+				@Setting(name = GENERATE_STATISTICS, value = "false")
+		}
+)
+@DomainModel(xmlMappings = "mappings/natural-id/composite/Account.hbm.xml")
+@SessionFactory
+public class HbmCompositeIdAndNaturalIdTest extends AbstractCompositeIdAndNaturalIdTest {
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java
deleted file mode 100644
index ae019d64bd85..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/CompoundNaturalIdMappingTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.mapping.naturalid.compound;
-
-import java.util.List;
-
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.boot.spi.MetadataImplementor;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.metamodel.mapping.NaturalIdMapping;
-import org.hibernate.metamodel.mapping.SingularAttributeMapping;
-
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
-/**
- * @author Steve Ebersole
- */
-@JiraKey(value = "HHH-11255")
-public class CompoundNaturalIdMappingTest {
-
-	@Test
-	public void test() {
-		final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
-
-		try {
-			Metadata meta = new MetadataSources( ssr )
-					.addAnnotatedClass( PostalCarrier.class )
-					.addAnnotatedClass( Country.class )
-					.buildMetadata();
-			( (MetadataImplementor) meta ).orderColumns( false );
-			( (MetadataImplementor) meta ).validate();
-
-			final SessionFactoryImplementor sessionFactory = (SessionFactoryImplementor) meta.buildSessionFactory();
-
-			try {
-				final EntityMappingType entityMappingType = sessionFactory.getRuntimeMetamodels().getEntityMappingType( PostalCarrier.class );
-				final NaturalIdMapping naturalIdMapping = entityMappingType.getNaturalIdMapping();
-				final List<SingularAttributeMapping> naturalIdAttributes = naturalIdMapping.getNaturalIdAttributes();
-
-				assertThat( naturalIdAttributes.size(), is( 2 ) );
-				assertThat( naturalIdAttributes.get( 0 ).getAttributeName(), is( "code" ) );
-				assertThat( naturalIdAttributes.get( 1 ).getAttributeName(), is( "country" ) );
-			}
-			finally {
-				sessionFactory.close();
-			}
-		}
-		finally {
-			StandardServiceRegistryBuilder.destroy( ssr );
-		}
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java
deleted file mode 100644
index c56d96b38fc3..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/Country.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.mapping.naturalid.compound;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-
-/**
- * @author Steve Ebersole
- */
-@Entity
-public class Country {
-	@Id
-	private Integer id;
-	private String isoCode;
-	private String name;
-
-	public Country() {
-	}
-
-	public Country(Integer id, String isoCode, String name) {
-		this.id = id;
-		this.isoCode = isoCode;
-		this.name = name;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	private void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getIsoCode() {
-		return isoCode;
-	}
-
-	public void setIsoCode(String isoCode) {
-		this.isoCode = isoCode;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java
deleted file mode 100644
index da8d2494ff06..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/compound/PostalCarrier.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.mapping.naturalid.compound;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-
-import org.hibernate.annotations.NaturalId;
-
-/**
- * @author Steve Ebersole
- */
-@Entity(name = "PostalCarrier")
-public class PostalCarrier {
-	@Id
-	private Long id;
-
-	@NaturalId
-	@ManyToOne
-	private Country country;
-
-	@NaturalId
-	private String code;
-
-
-	public PostalCarrier() {
-	}
-
-	public PostalCarrier(long id, String code, Country country) {
-		this.id = id;
-		this.code = code;
-		this.country = country;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Country getCountry() {
-		return country;
-	}
-
-	public void setCountry(Country country) {
-		this.country = country;
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/idclass/SimpleNaturalIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/idclass/SimpleNaturalIdClassTests.java
new file mode 100644
index 000000000000..96db6c2af88f
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/idclass/SimpleNaturalIdClassTests.java
@@ -0,0 +1,244 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.naturalid.idclass;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.hibernate.KeyType;
+import org.hibernate.annotations.NaturalId;
+import org.hibernate.annotations.NaturalIdClass;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * @author Steve Ebersole
+ */
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel(annotatedClasses = {
+		SimpleNaturalIdClassTests.OrderKey.class,
+		SimpleNaturalIdClassTests.Customer.class,
+		SimpleNaturalIdClassTests.Order.class,
+		SimpleNaturalIdClassTests.SystemUserKey.class,
+		SimpleNaturalIdClassTests.User.class,
+		SimpleNaturalIdClassTests.SystemUser.class
+})
+@Jira( "https://hibernate.atlassian.net/browse/HHH-16383" )
+@SessionFactory(generateStatistics = true)
+public class SimpleNaturalIdClassTests {
+	@BeforeEach
+	void setUp(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.persist( new SystemUser( 1, "steve", "ci", "abc" ) );
+			session.persist( new User( 1, "steve", "def" ) );
+
+			final Customer billys = new Customer( 1, "bILLY bOB'S Steak House and Grill and Bar and Sushi" );
+			session.persist( billys );
+
+			final Order billys1001 = new Order( 1, billys, 1001, Instant.now() );
+			session.persist( billys1001 );
+		} );
+	}
+
+	@AfterEach
+	void tearDown(SessionFactoryScope factoryScope) {
+		factoryScope.dropData();
+	}
+
+	@Test
+	void testFindBySimple(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var result = session.find( User.class, "steve", KeyType.NATURAL );
+			assertEquals( 1, result.id );
+		} );
+	}
+
+	@Test
+	void testFindMultipleBySimple(SessionFactoryScope factoryScope) {
+		// baseline
+		factoryScope.inTransaction( (session) -> {
+			var results = session.findMultiple( User.class, List.of( 1, 2 ), KeyType.IDENTIFIER );
+			assertThat( results ).hasSize( 2 );
+			assertEquals( 1,  results.get( 0 ).id );
+			assertNull( results.get( 1 ) );
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			var results = session.findMultiple( User.class, List.of( "steve", "john" ), KeyType.NATURAL );
+			assertThat( results ).hasSize( 2 );
+			assertEquals( 1,  results.get( 0 ).id );
+			assertNull( results.get( 1 ) );
+		} );
+	}
+
+	@Test
+	void testFindByClass(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var result = session.find( SystemUser.class, new SystemUserKey("steve", "ci"), KeyType.NATURAL );
+			assertEquals( 1, result.id );
+		} );
+	}
+
+	@Test
+	void testFindMultipleByClass(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var results = session.findMultiple( SystemUser.class, List.of( new SystemUserKey("steve", "ci") ), KeyType.NATURAL );
+			assertThat( results ).hasSize( 1 );
+			assertEquals( 1,  results.get( 0 ).id );
+		} );
+	}
+
+	@Test
+	void testNormalization(SessionFactoryScope factoryScope) {
+		var stats = factoryScope.getSessionFactory().getStatistics();
+		stats.clear();
+
+		factoryScope.inTransaction( (session) -> {
+			session.find( SystemUser.class, new SystemUserKey("ci", "steve"), KeyType.NATURAL );
+			assertEquals( 1, stats.getNaturalIdStatistics( SystemUser.class.getName() ).getNormalizationCount() );
+		} );
+	}
+
+	@Test
+	void testFindByClassWithToOne(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			// the current reality is that we need a reference to the associated entity
+			// rather than just its id
+			var customer = session.getReference( Customer.class, 1 );
+			session.find( Order.class, new OrderKey(customer, 1001), KeyType.NATURAL );
+		} );
+	}
+
+	@Test
+	void testFindByCompositeNaturalIdForms(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			// by idclass is tested in other methods...
+
+			var customer = session.getReference( Customer.class, 1 );
+
+			// by map
+			session.find( SystemUser.class, Map.of( "system", "ci", "username", "steve" ), KeyType.NATURAL );
+			session.find( Order.class, Map.of( "customer", customer, "invoiceNumber", 1001), KeyType.NATURAL );
+
+			// by array
+			session.find( SystemUser.class, new Object[] {"ci","steve"}, KeyType.NATURAL );
+			session.find( Order.class, new Object[] {customer,1001}, KeyType.NATURAL );
+		} );
+	}
+
+	@SuppressWarnings("FieldCanBeLocal")
+	@Entity(name="User")
+	@Table(name="t_users")
+	public static class User {
+		@Id
+		private Integer id;
+		@NaturalId
+		private String username;
+		private String stuff;
+
+		public User() {
+		}
+
+		public User(Integer id, String username, String stuff) {
+			this.id = id;
+			this.username = username;
+			this.stuff = stuff;
+		}
+	}
+
+	public record SystemUserKey(String system, String username) {
+	}
+
+	@SuppressWarnings("FieldCanBeLocal")
+	//tag::naturalidclass-mapping-example[]
+	@Entity(name="SystemUser")
+	@Table(name="t_sys_users")
+	@NaturalIdClass(SystemUserKey.class)
+	public static class SystemUser {
+		@Id
+		private Integer id;
+		@NaturalId
+		@Column(name = "sys")
+		private String system;
+		@NaturalId
+		private String username;
+	//end::naturalidclass-mapping-example[]
+		private String stuff;
+
+		public SystemUser() {
+		}
+
+		public SystemUser(Integer id, String system, String username, String stuff) {
+			this.id = id;
+			this.system = system;
+			this.username = username;
+			this.stuff = stuff;
+		}
+	//tag::naturalidclass-mapping-example[]
+	}
+	//end::naturalidclass-mapping-example[]
+
+	@SuppressWarnings("FieldCanBeLocal")
+	@Entity(name="Customer")
+	@Table(name="customers")
+	public static class Customer {
+		@Id
+		private Integer id;
+		private String name;
+
+		public Customer() {
+		}
+
+		public Customer(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
+
+	public record OrderKey(Customer customer, int invoiceNumber) {
+	}
+
+	@SuppressWarnings("FieldCanBeLocal")
+	@Entity(name="Order")
+	@Table(name="orders")
+	@NaturalIdClass(OrderKey.class)
+	public static class Order {
+		@Id
+		private Integer id;
+		@NaturalId
+		@ManyToOne
+		@JoinColumn(name = "customer_fk")
+		private Customer customer;
+		@NaturalId
+		int invoiceNumber;
+		private Instant timestamp;
+
+		public Order() {
+		}
+
+		public Order(Integer id, Customer customer, int invoiceNumber, Instant timestamp) {
+			this.id = id;
+			this.customer = customer;
+			this.invoiceNumber = invoiceNumber;
+			this.timestamp = timestamp;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java
index 81716bff10c8..978352d75d69 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java
@@ -41,7 +41,7 @@
 				@Setting( name = Environment.GENERATE_STATISTICS, value = "true" )
 		}
 )
-@DomainModel( xmlMappings = "org/hibernate/orm/test/mapping/naturalid/immutable/ParentChildWithManyToOne.hbm.xml" )
+@DomainModel( xmlMappings = "mappings/natural-id/immutable/ParentChildWithManyToOne.hbm.xml" )
 @SessionFactory
 public class ImmutableManyToOneNaturalIdHbmTest {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java
index 1280a47e1bbf..0802b0ebe7b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java
@@ -6,6 +6,7 @@
 
 import jakarta.persistence.PersistenceException;
 
+import org.hibernate.KeyType;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.AttributeMapping;
@@ -22,6 +23,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -38,7 +40,7 @@
 				@Setting( name = AvailableSettings.GENERATE_STATISTICS, value = "true" )
 		}
 )
-@DomainModel( xmlMappings = "org/hibernate/orm/test/mapping/naturalid/immutable/User.hbm.xml" )
+@DomainModel( xmlMappings = "mappings/natural-id/immutable/User.hbm.xml" )
 @SessionFactory
 public class ImmutableNaturalIdTest {
 	@AfterEach
@@ -83,6 +85,34 @@ public void testNaturalIdCheck(SessionFactoryScope scope) {
 		}
 	}
 
+	@Test
+	public void testNaturalIdCheckManaged(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					final User user = new User( "steve", "superSecret" );
+					session.persist( user );
+				}
+		);
+
+		scope.inTransaction( (session) -> {
+			var user = session.find( User.class, "steve", KeyType.NATURAL );
+
+			// try to change the natural-id... should error on flush
+			user.setUserName( "Steve" );
+
+			try {
+				session.flush();
+				fail();
+			}
+			catch (PersistenceException expected) {
+				assertThat( expected ).hasMessageContainingAll(
+						"An immutable natural identifier",
+						"was altered"
+				);
+			}
+		} );
+	}
+
 	@Test
 	public void testNaturalIdCache(SessionFactoryScope scope) {
 		final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalKeyLookupTest.java
similarity index 79%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalKeyLookupTest.java
index c1bcbc477388..1e11b4739830 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalKeyLookupTest.java
@@ -2,10 +2,21 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.annotations.naturalid;
+package org.hibernate.orm.test.mapping.naturalid.immutable;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.FlushModeType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Version;
 import org.hibernate.Session;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.NaturalId;
+import org.hibernate.annotations.NaturalIdCache;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.RootGraph;
@@ -19,6 +30,9 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import static org.hibernate.cfg.CacheSettings.USE_QUERY_CACHE;
 import static org.hibernate.cfg.StatisticsSettings.GENERATE_STATISTICS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,7 +46,10 @@
 		@Setting(name=GENERATE_STATISTICS, value="true"),
 		@Setting(name=USE_QUERY_CACHE, value="true")
 })
-@DomainModel(annotatedClasses = {A.class, D.class})
+@DomainModel(annotatedClasses = {
+		ImmutableNaturalKeyLookupTest.A.class,
+		ImmutableNaturalKeyLookupTest.D.class
+})
 @SessionFactory
 public class ImmutableNaturalKeyLookupTest {
 	@AfterEach
@@ -282,5 +299,86 @@ private A fetchA(Session s, String fetch) {
 		return a;
 	}
 
+	@Entity(name = "A")
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	@NaturalIdCache
+	public static class A {
+
+		@Id
+		@GeneratedValue(strategy = GenerationType.TABLE)
+		private long oid;
+
+		@Version
+		private int version;
+
+		@Column
+		@NaturalId(mutable = false)
+		private String name;
+
+		@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+		@org.hibernate.annotations.OptimisticLock(excluded = true)
+		@jakarta.persistence.OneToMany(mappedBy = "a")
+		private Set<D> ds = new HashSet<D>();
+
+		@jakarta.persistence.OneToOne
+		private D singleD = null;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public Set<D> getDs() {
+			return ds;
+		}
+
+		public void setDs(Set<D> ds) {
+			this.ds = ds;
+		}
+
+		public D getSingleD() {
+			return singleD;
+		}
 
+		public void setSingleD(D singleD) {
+			this.singleD = singleD;
+		}
+
+	}
+
+	@Entity(name = "D")
+	@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+	public static class D {
+		@Id
+		@GeneratedValue(strategy = GenerationType.TABLE)
+		public long oid;
+
+		@Version
+		private int version;
+
+		@jakarta.persistence.ManyToOne(fetch = FetchType.LAZY)
+		private A a = null;
+
+		@jakarta.persistence.OneToOne(mappedBy = "singleD")
+		private A singleA = null;
+
+		public A getA() {
+			return a;
+		}
+
+		public void setA(A a) {
+			this.a = a;
+		}
+
+		public A getSingleA() {
+			return singleA;
+		}
+
+		public void setSingleA(A singleA) {
+			this.singleA = singleA;
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java
index 36a5cf0671dd..0eb64bf26d93 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java
@@ -5,6 +5,7 @@
 package org.hibernate.orm.test.mapping.naturalid.mutable;
 
 import org.hibernate.HibernateException;
+import org.hibernate.KeyType;
 import org.hibernate.LockMode;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -20,15 +21,17 @@
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
+import java.util.Map;
 
 import static org.hibernate.cfg.AvailableSettings.GENERATE_STATISTICS;
 import static org.hibernate.cfg.AvailableSettings.USE_QUERY_CACHE;
 import static org.hibernate.cfg.AvailableSettings.USE_SECOND_LEVEL_CACHE;
+import static org.junit.Assert.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * @author Gavin King
@@ -40,7 +43,7 @@
 				@Setting( name = GENERATE_STATISTICS, value = "true" ),
 		}
 )
-@DomainModel( xmlMappings = "org/hibernate/orm/test/mapping/naturalid/mutable/User.hbm.xml" )
+@DomainModel( xmlMappings = "mappings/natural-id/mutable/User.hbm.xml" )
 @SessionFactory
 public class MutableNaturalIdTest {
 
@@ -58,7 +61,7 @@ public void testNaturalIdNullability(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		scope.dropData();
 	}
 
 	@Test
@@ -362,4 +365,76 @@ public void testEviction(SessionFactoryScope scope) {
 				}
 		);
 	}
+
+	@Test
+	@JiraKey("HHH-7287")
+	public void testModificationInOtherSession(SessionFactoryScope factoryScope) {
+		var id = factoryScope.fromTransaction( (session) -> {
+			User u = new User( "gavin", "hb", "secret" );
+			session.persist( u );
+			return u.getId();
+		} );
+
+		// Use transactionless session
+		factoryScope.inSession( (session) -> {
+			// this loads the state into this `session`
+			var byNaturalId = session.byNaturalId( User.class ).using( "name", "gavin" ).using( "org", "hb" ).load();
+			assertNotNull( byNaturalId );
+
+			// CHANGE natural-id values in another session
+			factoryScope.inTransaction( (otherSession) -> {
+				var u = otherSession.find( User.class, id );
+				u.setOrg( "zz" );
+			} );
+			// CHANGE APPLIED
+
+			byNaturalId = session.byNaturalId( User.class )
+					.using( "name", "gavin" )
+					.using( "org", "hb" ).load();
+			assertNotNull( byNaturalId );
+
+			// the internal query will 'see' the new values, because isolation level < SERIALIZABLE
+			var byNaturalId2 = session.byNaturalId( User.class )
+					.using( "name", "gavin" )
+					.using( "org", "zz" ).load();
+			assertSame( byNaturalId, byNaturalId2 );
+
+			// this fails, that's the bug
+			assertNotNull( session.byNaturalId( User.class ).using( "name", "gavin" ).using( "org", "hb" ).load());
+		} );
+	}
+
+	@Test
+	@JiraKey("HHH-7287")
+	public void testModificationInOtherSession2(SessionFactoryScope factoryScope) {
+		var id = factoryScope.fromTransaction( (session) -> {
+			User u = new User( "gavin", "hb", "secret" );
+			session.persist( u );
+			return u.getId();
+		} );
+
+		// Use transactionless session
+		factoryScope.inSession( (session) -> {
+			// this loads the state into this `session`
+			var byNaturalId = session.find( User.class, Map.of("name", "gavin", "org", "hb"), KeyType.NATURAL );
+			assertNotNull( byNaturalId );
+
+			// CHANGE natural-id values in another session
+			factoryScope.inTransaction( (otherSession) -> {
+				var u = otherSession.find( User.class, id );
+				u.setOrg( "zz" );
+			} );
+			// CHANGE APPLIED
+
+			byNaturalId = session.find( User.class, Map.of("name", "gavin", "org", "hb"), KeyType.NATURAL );
+			assertNotNull( byNaturalId );
+
+			// the internal query will 'see' the new values, because isolation level < SERIALIZABLE
+			var byNaturalId2 = session.find( User.class, Map.of("name", "gavin", "org", "zz"), KeyType.NATURAL );
+			assertSame( byNaturalId, byNaturalId2 );
+
+			// this fails, that's the bug
+			assertNotNull( session.find( User.class, Map.of("name", "gavin", "org", "hb"), KeyType.NATURAL ) );
+		} );
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java
index 63e698c6bf7d..15f2c2ac96c6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/nullable/NullableNaturalIdTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.mapping.naturalid.nullable;
 
+import org.hibernate.KeyType;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.NaturalIdMapping;
 import org.hibernate.metamodel.mapping.SingularAttributeMapping;
@@ -14,6 +15,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.is;
@@ -28,7 +30,7 @@
  */
 @DomainModel(
 		annotatedClasses = { A.class, B.class, C.class, D.class },
-		xmlMappings = "/org/hibernate/orm/test/mapping/naturalid/nullable/User.hbm.xml"
+		xmlMappings = "mappings/natural-id/nullable/User.hbm.xml"
 )
 @SessionFactory
 public class NullableNaturalIdTest {
@@ -197,6 +199,22 @@ public void testUniqueAssociation(SessionFactoryScope scope) {
 		);
 	}
 
+	@Test
+	void testNullability(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.persist( new C( 1, null ) );
+			session.persist( new C( 2, "something" ) );
+		} );
+
+		factoryScope.inTransaction( (session) -> {
+			final C c1 = session.find( C.class, null, KeyType.NATURAL );
+			Assertions.assertEquals( 1, c1.oid );
+
+			final C c2 = session.find( C.class, "something", KeyType.NATURAL );
+			Assertions.assertEquals( 2, c2.oid );
+		} );
+	}
+
 	@Test
 	public void testNaturalIdQuerySupportingNullValues(SessionFactoryScope scope) {
 		scope.inTransaction(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedOwnerInDoubleEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedOwnerInDoubleEmbeddableTest.java
new file mode 100644
index 000000000000..f40428f19f6c
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneEmbeddedOwnerInDoubleEmbeddableTest.java
@@ -0,0 +1,182 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.onetoone;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@JiraKey(value = "HHH-20010")
+@DomainModel(
+		annotatedClasses = {
+				OneToOneEmbeddedOwnerInNestedEmbeddableTest.EntityA.class,
+				OneToOneEmbeddedOwnerInNestedEmbeddableTest.EntityC.class,
+		}
+)
+@SessionFactory
+class OneToOneEmbeddedOwnerInNestedEmbeddableTest {
+
+	@BeforeEach
+	void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final EntityC entityC = new EntityC( 1 );
+			final EntityA entityA = new EntityA( 1, entityC );
+			entityC.setEntityA( entityA );
+			session.persist( entityC );
+			session.persist( entityA );
+		} );
+	}
+
+	@AfterEach
+	void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+	}
+
+	@Test
+	void testLoadByPrimaryKey(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final EntityA entityA = session.find( EntityA.class, 1 );
+			assertNotNull( entityA );
+			assertNotNull( entityA.getEmbedded1() );
+			assertNotNull( entityA.getEmbedded1().getEmbedded2() );
+			assertNotNull( entityA.getEmbedded1().getEmbedded2().getEntityC() );
+			assertEquals( 1, entityA.getEmbedded1().getEmbedded2().getEntityC().getId() );
+		} );
+	}
+
+	@Test
+	void testLoadEntityCByPrimaryKey(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final EntityC entityC = session.find( EntityC.class, 1 );
+			assertNotNull( entityC );
+			assertEquals( 1, entityC.getId() );
+		} );
+	}
+
+	@Test
+	void testLoadViaQuery(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final EntityA entityA = session.createQuery(
+							"from EntityA a where a.id = :id", EntityA.class )
+					.setParameter( "id", 1 )
+					.getSingleResultOrNull();
+			assertNotNull( entityA );
+			assertNotNull( entityA.getEmbedded1().getEmbedded2().getEntityC() );
+		} );
+	}
+
+	@Entity(name = "EntityA")
+	@Table(name = "entity_a_hhh20010")
+	public static class EntityA {
+
+		@Id
+		private Integer id;
+
+		@Embedded
+		private Embedded1 embedded1;
+
+		public EntityA() {
+		}
+
+		public EntityA(Integer id, EntityC entityC) {
+			this.id = id;
+			final Embedded2 emb2 = new Embedded2();
+			emb2.setEntityC( entityC );
+			final Embedded1 emb1 = new Embedded1();
+			emb1.setEmbedded2( emb2 );
+			this.embedded1 = emb1;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public Embedded1 getEmbedded1() {
+			return embedded1;
+		}
+
+		public void setEmbedded1(Embedded1 embedded1) {
+			this.embedded1 = embedded1;
+		}
+	}
+
+	@Embeddable
+	public static class Embedded1 {
+
+		@Embedded
+		private Embedded2 embedded2;
+
+		public Embedded2 getEmbedded2() {
+			return embedded2;
+		}
+
+		public void setEmbedded2(Embedded2 embedded2) {
+			this.embedded2 = embedded2;
+		}
+	}
+
+	@Embeddable
+	public static class Embedded2 {
+
+		@OneToOne(cascade = CascadeType.PERSIST)
+		@JoinColumn(name = "entity_c_id")
+		private EntityC entityC;
+
+		public EntityC getEntityC() {
+			return entityC;
+		}
+
+		public void setEntityC(EntityC entityC) {
+			this.entityC = entityC;
+		}
+	}
+
+	@Entity(name = "EntityC")
+	@Table(name = "entity_c_hhh20010")
+	public static class EntityC {
+
+		@Id
+		private Integer id;
+
+		@OneToOne(mappedBy = "embedded1.embedded2.entityC", fetch = FetchType.LAZY)
+		private EntityA entityA;
+
+		public EntityC() {
+		}
+
+		public EntityC(Integer id) {
+			this.id = id;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public EntityA getEntityA() {
+			return entityA;
+		}
+
+		public void setEntityA(EntityA entityA) {
+			this.entityA = entityA;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/UnownedOneToOneJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/UnownedOneToOneJoinedInheritanceTest.java
new file mode 100644
index 000000000000..709a6fe4af28
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/UnownedOneToOneJoinedInheritanceTest.java
@@ -0,0 +1,131 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.mapping.onetoone;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.OneToOne;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+
+@Jpa(
+		annotatedClasses = {
+				UnownedOneToOneJoinedInheritanceTest.Owner.class,
+				UnownedOneToOneJoinedInheritanceTest.Vehicle.class,
+				UnownedOneToOneJoinedInheritanceTest.Car.class,
+				UnownedOneToOneJoinedInheritanceTest.Person.class
+		}
+)
+@Jira("https://hibernate.atlassian.net/browse/HHH-9499")
+public class UnownedOneToOneJoinedInheritanceTest {
+
+	@Test
+	public void testModel(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			Car car = new Car();
+			car.setId( 1L );
+
+			Person person = new Person();
+			person.setId( 2L );
+			person.setVehicle( car );
+
+			entityManager.persist( car );
+			entityManager.persist( person );
+		} );
+
+		scope.inTransaction( entityManager -> {
+			Person person = entityManager.find( Person.class, 2L );
+			assertNotNull( person, "Person should be found" );
+			assertNotNull( person.getVehicle(), "Vehicle reference should not be null" );
+			assertEquals( 1L, person.getVehicle().getId(), "Vehicle should have correct id" );
+
+			Car car = entityManager.find( Car.class, 1L );
+			assertNotNull( car, "Car should be found" );
+			assertNotNull( car.getOwner(), "Owner reference should not be null" );
+			assertEquals( 2L, car.getOwner().getId(), "Owner should have correct id" );
+
+			assertEquals( person, car.getOwner(), "Owner should be the same Person" );
+		} );
+	}
+
+	@Entity(name = "Owner")
+	@Inheritance(strategy = InheritanceType.JOINED)
+	public static abstract class Owner {
+		@Id
+		private Long id;
+
+		@OneToOne
+		private Vehicle vehicle;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Vehicle getVehicle() {
+			return vehicle;
+		}
+
+		public void setVehicle(Vehicle vehicle) {
+			this.vehicle = vehicle;
+		}
+	}
+
+	@Entity(name = "Vehicle")
+	@Inheritance(strategy = InheritanceType.JOINED)
+	public static abstract class Vehicle {
+		@Id
+		private Long id;
+
+		@OneToOne(mappedBy = "vehicle")
+		private Owner owner;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Owner getOwner() {
+			return owner;
+		}
+
+		public void setOwner(Owner owner) {
+			this.owner = owner;
+		}
+	}
+
+	@Entity(name = "Car")
+	public static class Car extends Vehicle {
+		@OneToOne(mappedBy = "vehicle")
+		private Person person;
+
+		public Person getPerson() {
+			return person;
+		}
+
+		public void setPerson(Person person) {
+			this.person = person;
+		}
+	}
+
+	@Entity(name = "Person")
+	public static class Person extends Owner {
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/NullablePrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/NullablePrimaryKeyTest.java
index 37743ae36fe2..a0cd7e0e88c7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/NullablePrimaryKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/primarykey/NullablePrimaryKeyTest.java
@@ -4,16 +4,13 @@
  */
 package org.hibernate.orm.test.mapping.onetoone.primarykey;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Properties;
 
-import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.SQLServerDialect;
-import org.hibernate.service.ServiceRegistry;
 import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
 
 import org.hibernate.testing.ServiceRegistryBuilder;
@@ -34,25 +31,22 @@ public class NullablePrimaryKeyTest {
 	@Test
 	public void testGeneratedSql() {
 
-		Map settings = new HashMap();
+		var settings = new Properties();
 		settings.putAll( Environment.getProperties() );
 		settings.put( AvailableSettings.DIALECT, SQLServerDialect.class.getName() );
 
-		ServiceRegistry serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( settings );
+		var serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( settings );
 
 		try {
-			MetadataSources ms = new MetadataSources( serviceRegistry );
+			var ms = new MetadataSources( serviceRegistry );
 			ms.addAnnotatedClass( Address.class );
 			ms.addAnnotatedClass( Person.class );
+			final List<String> commands =
+					new SchemaCreatorImpl( serviceRegistry )
+							.generateCreationCommands( ms.buildMetadata(), false );
 
-			final Metadata metadata = ms.buildMetadata();
-			final List<String> commands = new SchemaCreatorImpl( serviceRegistry ).generateCreationCommands(
-					metadata,
-					false
-			);
-			String expectedMappingTableSql = "create table personAddress (address_id bigint, " +
-					"person_id bigint not null, primary key (person_id))";
-
+			String expectedMappingTableSql =
+					"create table personAddress (address_id bigint not null, person_id bigint not null, primary key (person_id))";
 			assertEquals( expectedMappingTableSql, commands.get( 2 ), "Wrong SQL" );
 		}
 		catch (Exception e) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJdbcType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJdbcType.java
index 991bc3c33d49..30755f8ffc1f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJdbcType.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayJdbcType.java
@@ -29,8 +29,8 @@ public int getJdbcTypeCode() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(Integer precision, Integer scale, TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( String[].class );
+	public JavaType<?> getRecommendedJavaType(Integer precision, Integer scale, TypeConfiguration typeConfiguration) {
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( String[].class );
 	}
 
 	private final ValueBinder<String[]> binder = new BasicBinder<String[]>( StringArrayJavaType.INSTANCE, this ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/format/XmlFormatterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/format/XmlFormatterTest.java
index 82d68b587630..98ddde22998b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/format/XmlFormatterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/format/XmlFormatterTest.java
@@ -13,6 +13,7 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.format.FormatMapper;
+import org.hibernate.type.format.jackson.Jackson3XmlFormatMapper;
 import org.hibernate.type.format.jackson.JacksonXmlFormatMapper;
 import org.hibernate.type.format.jaxb.JaxbXmlFormatMapper;
 import org.hibernate.type.internal.ParameterizedTypeImpl;
@@ -61,7 +62,7 @@ public void injectSessionFactoryScope(SessionFactoryScope scope) {
 	}
 
 	private static Stream<Arguments> formatMappers() {
-		return Stream.of( new JaxbXmlFormatMapper( false ), new JacksonXmlFormatMapper( false ) )
+		return Stream.of( new JaxbXmlFormatMapper( false ), new JacksonXmlFormatMapper( false ), new Jackson3XmlFormatMapper( false ) )
 				.map( Arguments::of );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java
index 29ee5e6ad8c3..213e8cd965bf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/BooleanJavaTypeDescriptorTest.java
@@ -7,6 +7,7 @@
 import jakarta.persistence.AttributeConverter;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.type.NumericBooleanConverter;
 import org.hibernate.type.TrueFalseConverter;
@@ -92,7 +93,7 @@ public void testWrapShouldReturnFalseWhenFStringGiven() {
 		assertFalse(result);
 	}
 
-	@Test
+	@Test @FailureExpected // this was historically allowed
 	public void testWrapShouldReturnFalseWhenRandomStringGiven() {
 		// given
 		// when
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java
index 7f007c7b2c84..ac353c2bf2fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/CoercionTests.java
@@ -70,62 +70,62 @@ public void testCoercibleDetection(SessionFactoryScope scope) {
 	}
 
 	private void checkDoubleConversions(JavaType<Double> doubleType, SessionImplementor session) {
-		assertThat( doubleType.coerce( (double) 1, session ) ).isEqualTo( 1.0 );
-		assertThat( doubleType.coerce( 1F, session ) ).isEqualTo( 1.0 );
-		assertThat( doubleType.coerce( doubleValue, session ) ).isEqualTo( doubleValue );
-		assertThat( doubleType.coerce( floatValue, session ) ).isEqualTo( doubleValue );
+		assertThat( doubleType.coerce( (double) 1 ) ).isEqualTo( 1.0 );
+		assertThat( doubleType.coerce( 1F ) ).isEqualTo( 1.0 );
+		assertThat( doubleType.coerce( doubleValue ) ).isEqualTo( doubleValue );
+		assertThat( doubleType.coerce( floatValue ) ).isEqualTo( doubleValue );
 
-		assertThat( doubleType.coerce( largeFloatValue, session ) ).isEqualTo( largeFloatValue );
+		assertThat( doubleType.coerce( largeFloatValue ) ).isEqualTo( Double.valueOf( largeFloatValue ) );
 
-		assertThat( doubleType.coerce( shortValue, session ) ).isEqualTo( 1.0 );
-		assertThat( doubleType.coerce( byteValue, session ) ).isEqualTo( 1.0 );
-		assertThat( doubleType.coerce( longValue, session ) ).isEqualTo( 1.0 );
+		assertThat( doubleType.coerce( shortValue ) ).isEqualTo( 1.0 );
+		assertThat( doubleType.coerce( byteValue ) ).isEqualTo( 1.0 );
+		assertThat( doubleType.coerce( longValue ) ).isEqualTo( 1.0 );
 
-		assertThat( doubleType.coerce( BigInteger.ONE, session ) ).isEqualTo( 1.0 );
-		assertThat( doubleType.coerce( BigDecimal.ONE, session ) ).isEqualTo( 1.0 );
+		assertThat( doubleType.coerce( BigInteger.ONE ) ).isEqualTo( 1.0 );
+		assertThat( doubleType.coerce( BigDecimal.ONE ) ).isEqualTo( 1.0 );
 
 		// negative checks
 	}
 
 	private void checkIntegerConversions(JavaType<Integer> integerType, SessionImplementor session) {
-		assertThat( integerType.coerce( intValue, session ) ).isEqualTo( intValue );
+		assertThat( integerType.coerce( intValue ) ).isEqualTo( intValue );
 
-		assertThat( integerType.coerce( shortValue, session ) ).isEqualTo( intValue );
-		assertThat( integerType.coerce( byteValue, session ) ).isEqualTo( intValue );
+		assertThat( integerType.coerce( shortValue ) ).isEqualTo( intValue );
+		assertThat( integerType.coerce( byteValue ) ).isEqualTo( intValue );
 
-		assertThat( integerType.coerce( longValue, session ) ).isEqualTo( intValue );
+		assertThat( integerType.coerce( longValue ) ).isEqualTo( intValue );
 
-		assertThat( integerType.coerce( (double) 1, session ) ).isEqualTo( intValue );
-		assertThat( integerType.coerce( 1F, session ) ).isEqualTo( intValue );
+		assertThat( integerType.coerce( (double) 1 ) ).isEqualTo( intValue );
+		assertThat( integerType.coerce( 1F ) ).isEqualTo( intValue );
 
-		assertThat( integerType.coerce( BigInteger.ONE, session ) ).isEqualTo( intValue );
-		assertThat( integerType.coerce( BigDecimal.ONE, session ) ).isEqualTo( intValue );
+		assertThat( integerType.coerce( BigInteger.ONE ) ).isEqualTo( intValue );
+		assertThat( integerType.coerce( BigDecimal.ONE ) ).isEqualTo( intValue );
 
 		// negative checks
-		checkDisallowedConversion( () -> integerType.coerce( largeLongValue, session ) );
-		checkDisallowedConversion( () -> integerType.coerce( largeFloatValue, session ) );
-		checkDisallowedConversion( () -> integerType.coerce( doubleValue, session ) );
-		checkDisallowedConversion( () -> integerType.coerce( floatValue, session ) );
+		checkDisallowedConversion( () -> integerType.coerce( largeLongValue ) );
+		checkDisallowedConversion( () -> integerType.coerce( largeFloatValue ) );
+		checkDisallowedConversion( () -> integerType.coerce( doubleValue ) );
+		checkDisallowedConversion( () -> integerType.coerce( floatValue ) );
 	}
 
 	private void checkLongConversions(JavaType<Long> longType, SessionImplementor session) {
-		assertThat( longType.coerce( longValue, session ) ).isEqualTo( longValue );
-		assertThat( longType.coerce( largeLongValue, session ) ).isEqualTo( largeLongValue );
+		assertThat( longType.coerce( longValue ) ).isEqualTo( longValue );
+		assertThat( longType.coerce( largeLongValue ) ).isEqualTo( largeLongValue );
 
-		assertThat( longType.coerce( intValue, session ) ).isEqualTo( longValue );
-		assertThat( longType.coerce( shortValue, session ) ).isEqualTo( longValue );
-		assertThat( longType.coerce( byteValue, session ) ).isEqualTo( longValue );
+		assertThat( longType.coerce( intValue ) ).isEqualTo( longValue );
+		assertThat( longType.coerce( shortValue ) ).isEqualTo( longValue );
+		assertThat( longType.coerce( byteValue ) ).isEqualTo( longValue );
 
-		assertThat( longType.coerce( (double) 1, session ) ).isEqualTo( longValue );
-		assertThat( longType.coerce( 1F, session ) ).isEqualTo( longValue );
+		assertThat( longType.coerce( (double) 1 ) ).isEqualTo( longValue );
+		assertThat( longType.coerce( 1F ) ).isEqualTo( longValue );
 
-		assertThat( longType.coerce( BigInteger.ONE, session ) ).isEqualTo( longValue );
-		assertThat( longType.coerce( BigDecimal.ONE, session ) ).isEqualTo( longValue );
+		assertThat( longType.coerce( BigInteger.ONE ) ).isEqualTo( longValue );
+		assertThat( longType.coerce( BigDecimal.ONE ) ).isEqualTo( longValue );
 
 		// negative checks
-		checkDisallowedConversion( () -> longType.coerce( largeFloatValue, session ) );
-		checkDisallowedConversion( () -> longType.coerce( doubleValue, session ) );
-		checkDisallowedConversion( () -> longType.coerce( floatValue, session ) );
+		checkDisallowedConversion( () -> longType.coerce( largeFloatValue ) );
+		checkDisallowedConversion( () -> longType.coerce( doubleValue ) );
+		checkDisallowedConversion( () -> longType.coerce( floatValue ) );
 	}
 
 	private void checkDisallowedConversion(CoercionHelper.Coercer<?> callback) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimeJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimeJavaTypeDescriptorTest.java
index 64d47f32a57a..48cc68889c5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimeJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimeJavaTypeDescriptorTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.mapping.type.java;
 
+import java.sql.Time;
 import java.util.Date;
 
 import org.hibernate.type.descriptor.java.JdbcTimeJavaType;
@@ -11,17 +12,18 @@
 /**
  * @author Owen Farrell
  */
-public class JdbcTimeJavaTypeDescriptorTest extends AbstractDescriptorTest<Date> {
-	final Date original = new Date();
-	final Date copy = new Date( original.getTime() );
-	final Date different = new Date( original.getTime() + 500L);
+public class JdbcTimeJavaTypeDescriptorTest extends AbstractDescriptorTest<Time> {
+	Date now = new Date();
+	final Time original = new Time( now.getHours(), now.getMinutes(), now.getSeconds() );
+	final Time copy = new Time( original.getTime() );
+	final Time different = new Time( now.getHours(), now.getMinutes(), now.getSeconds() + 3 );
 
 	public JdbcTimeJavaTypeDescriptorTest() {
 		super( JdbcTimeJavaType.INSTANCE );
 	}
 
 	@Override
-	protected Data<Date> getTestData() {
+	protected Data<Time> getTestData() {
 		return new Data<>( original, copy, different );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimestampJavaTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimestampJavaTypeTest.java
index b9492831205c..f794ad98d884 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimestampJavaTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/JdbcTimestampJavaTypeTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.mapping.type.java;
 
+import java.sql.Timestamp;
 import java.util.Date;
 
 import org.hibernate.type.descriptor.java.JdbcTimestampJavaType;
@@ -11,17 +12,17 @@
 /**
  * @author Owen Farrell
  */
-public class JdbcTimestampJavaTypeTest extends AbstractDescriptorTest<Date> {
-	final Date original = new Date();
-	final Date copy = new Date( original.getTime() );
-	final Date different = new Date( original.getTime() + 500L);
+public class JdbcTimestampJavaTypeTest extends AbstractDescriptorTest<Timestamp> {
+	final Timestamp original = new Timestamp( new Date().getTime() );
+	final Timestamp copy = new Timestamp( original.getTime() );
+	final Timestamp different = new Timestamp( original.getTime() + 500L);
 
 	public JdbcTimestampJavaTypeTest() {
 		super( JdbcTimestampJavaType.INSTANCE );
 	}
 
 	@Override
-	protected Data<Date> getTestData() {
+	protected Data<Timestamp> getTestData() {
 		return new Data<>( original, copy, different );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/BidirectionalOneToManyMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/BidirectionalOneToManyMergeTest.java
index c3312afc1d21..c7c53188b85d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/BidirectionalOneToManyMergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/BidirectionalOneToManyMergeTest.java
@@ -54,7 +54,7 @@ public void testMerge(EntityManagerFactoryScope scope) {
 		} );
 	}
 
-	@Entity
+	@Entity(name = "Post")
 	public static class Post {
 
 		@Id
@@ -114,7 +114,7 @@ public Post removeComment(PostComment comment) {
 		}
 	}
 
-	@Entity
+	@Entity(name = "PostComment")
 	public static class PostComment {
 
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/OwnedCollectionMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/OwnedCollectionMergeTest.java
new file mode 100644
index 000000000000..04a8ffe18a2e
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/OwnedCollectionMergeTest.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.merge;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.hibernate.Hibernate.isInitialized;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Jpa(annotatedClasses = {OwnedCollectionMergeTest.Child.class,
+		OwnedCollectionMergeTest.Parent.class})
+class OwnedCollectionMergeTest {
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Parent parent = new Parent();
+			em.persist( parent );
+			Child child = new Child();
+			parent.children = new HashSet<>();
+			parent.children.add( child );
+			em.persist( child );
+		} );
+		Parent p = scope.fromTransaction( em -> {
+			return em.find( Parent.class, 1 );
+		} );
+		assertFalse( isInitialized( p.children ) );
+		scope.inTransaction( em -> {
+			Parent parent = em.merge( p );
+			assertFalse( isInitialized( parent.children ) );
+		} );
+		p.children = null;
+		scope.inTransaction( em -> {
+			Parent parent = em.merge( p );
+			assertTrue( isInitialized( parent.children ) );
+			assertTrue( parent.children.isEmpty() );
+		} );
+	}
+
+	@Entity(name="Parent")
+	static class Parent {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@OneToMany(fetch = FetchType.LAZY)
+		Set<Child> children;
+	}
+
+	@Entity(name="Child")
+	static class Child {
+		@Id
+		@GeneratedValue
+		Long id;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/merge/UnownedCollectionMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/UnownedCollectionMergeTest.java
new file mode 100644
index 000000000000..48299ce8440a
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/merge/UnownedCollectionMergeTest.java
@@ -0,0 +1,72 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.merge;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import org.hibernate.collection.spi.PersistentSet;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+
+import static org.hibernate.Hibernate.isInitialized;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Jpa(annotatedClasses = {UnownedCollectionMergeTest.Child.class,
+		UnownedCollectionMergeTest.Parent.class})
+class UnownedCollectionMergeTest {
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Parent parent = new Parent();
+			em.persist( parent );
+			Child child = new Child();
+			child.parent = parent;
+			em.persist( child );
+		} );
+		Parent p = scope.fromTransaction( em -> {
+			return em.find( Parent.class, 1 );
+		} );
+		assertFalse( isInitialized( p.children ) );
+		scope.inTransaction( em -> {
+			Parent parent = em.merge( p );
+			assertFalse( isInitialized( parent.children ) );
+		} );
+		p.children = null;
+		scope.inTransaction( em -> {
+			Parent parent = em.merge( p );
+			assertFalse( isInitialized( parent.children ) );
+			assertTrue( ((PersistentSet<?>) parent.children).hasQueuedOperations() );
+			assertTrue( parent.children.isEmpty() );
+		} );
+	}
+
+	@Entity(name="Parent")
+	static class Parent {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@OneToMany(mappedBy = "parent",
+				fetch = FetchType.LAZY)
+		Set<Child> children;
+	}
+
+	@Entity(name="Child")
+	static class Child {
+		@Id
+		@GeneratedValue
+		Long id;
+
+		@ManyToOne
+		Parent parent;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/AdditionalMappingContributorAttributeConverterRegistrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/AdditionalMappingContributorAttributeConverterRegistrationTest.java
new file mode 100644
index 000000000000..1643c9ed8b33
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/AdditionalMappingContributorAttributeConverterRegistrationTest.java
@@ -0,0 +1,122 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.metamodel;
+
+import jakarta.persistence.*;
+import org.hibernate.boot.ResourceStreamLocator;
+import org.hibernate.boot.spi.AdditionalMappingContributions;
+import org.hibernate.boot.spi.AdditionalMappingContributor;
+import org.hibernate.boot.spi.InFlightMetadataCollector;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.testing.orm.junit.*;
+import org.junit.jupiter.api.Test;
+
+@SessionFactory
+@BootstrapServiceRegistry(
+		javaServices = @BootstrapServiceRegistry.JavaService(
+				role = AdditionalMappingContributor.class,
+				impl = AdditionalMappingContributorAttributeConverterRegistrationTest.Hibernate7AdditionalMappingContributor.class
+		)
+)
+@DomainModel(annotatedClasses = {
+		AdditionalMappingContributorAttributeConverterRegistrationTest.BooleanTestPOJO.class,
+		AdditionalMappingContributorAttributeConverterRegistrationTest.TestConverter.class
+})
+@JiraKey("HHH-20199")
+public class AdditionalMappingContributorAttributeConverterRegistrationTest {
+
+	@Test
+	public void emptyUnitTestMethodToVerifyStartUp(SessionFactoryScope scope) {
+	}
+
+
+	@Entity(name = "BooleanTestPOJO")
+	public static class BooleanTestPOJO {
+
+		@Id
+		@Column
+		private Long id;
+		@Column
+		private Boolean test;
+
+		@Column
+		private String code;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Boolean getTest() {
+			return test;
+		}
+
+		public void setTest(Boolean test) {
+			this.test = test;
+		}
+
+		public String getCode() {
+			return code;
+		}
+
+		public void setCode(String code) {
+			this.code = code;
+		}
+	}
+
+	@Converter
+	public static class TestConverter implements AttributeConverter<Boolean, String> {
+
+		public TestConverter() {
+
+		}
+
+		@Override
+		public String convertToDatabaseColumn(Boolean attribute) {
+			if (attribute == null) {
+				return null;
+			}
+			return attribute ? "Y" : "N";
+		}
+
+		@Override
+		public Boolean convertToEntityAttribute(String dbData) {
+			if (dbData == null) {
+				return null;
+			}
+			return "Y".equals(dbData);
+		}
+	}
+
+	@Entity
+	public static class TestAdditionalMappingContributorEntity {
+		@Id
+		private Long id;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+	}
+
+	public static class Hibernate7AdditionalMappingContributor implements AdditionalMappingContributor {
+
+		@Override
+		public void contribute(AdditionalMappingContributions contributions, InFlightMetadataCollector metadata, ResourceStreamLocator resourceStreamLocator, MetadataBuildingContext buildingContext) {
+// Skip if already registered
+			if (metadata.getEntityBinding(TestAdditionalMappingContributorEntity.class.getName()) != null) {
+				return;
+			}
+			contributions.contributeEntity(buildingContext.getBootstrapContext().getClassLoaderAccess().classForName(TestAdditionalMappingContributorEntity.class.getName()));
+		}
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/BaseEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/BaseEntity.java
new file mode 100644
index 000000000000..7c6e8226e841
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/BaseEntity.java
@@ -0,0 +1,32 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.metamodel.generics.embeddedid;
+
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public abstract class BaseEntity<ID> {
+	@EmbeddedId
+	private ID id;
+
+	private String name;
+
+	public BaseEntity() {
+	}
+
+	public BaseEntity(ID id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+
+	public ID getId() {
+		return id;
+	}
+
+	public String getName() {
+		return name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/EmployeeEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/EmployeeEntity.java
new file mode 100644
index 000000000000..7038062ff059
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/EmployeeEntity.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.metamodel.generics.embeddedid;
+
+import jakarta.persistence.Entity;
+
+@Entity
+public class EmployeeEntity extends BaseEntity<EmployeeId> {
+	private Integer employeeNumber;
+
+	public EmployeeEntity() {
+	}
+
+	public EmployeeEntity(EmployeeId id, String name, Integer employeeNumber) {
+		super( id, name );
+		this.employeeNumber = employeeNumber;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/EmployeeId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/EmployeeId.java
new file mode 100644
index 000000000000..763f5ff8d8ce
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/EmployeeId.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.metamodel.generics.embeddedid;
+
+import jakarta.persistence.Embeddable;
+
+@Embeddable
+public class EmployeeId {
+	private String employeeCode;
+	private PersonId personId;
+
+	public EmployeeId() {
+	}
+
+	public EmployeeId(String employeeCode, PersonId personId) {
+		this.employeeCode = employeeCode;
+		this.personId = personId;
+	}
+
+	public String getEmployeeCode() {
+		return employeeCode;
+	}
+
+	public PersonId getPersonId() {
+		return personId;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/GenericEmbeddedIdMetamodelTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/GenericEmbeddedIdMetamodelTest.java
new file mode 100644
index 000000000000..e4725a52d15c
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/GenericEmbeddedIdMetamodelTest.java
@@ -0,0 +1,79 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.metamodel.generics.embeddedid;
+
+import jakarta.persistence.criteria.Path;
+import org.hibernate.SessionFactory;
+import org.hibernate.query.sqm.tree.domain.SqmPath;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+/**
+ * @author Marco Belladelli
+ */
+@Jpa(annotatedClasses = {
+		BaseEntity.class,
+		PersonEntity.class,
+		PersonId.class,
+		EmployeeEntity.class,
+		EmployeeId.class,
+})
+public class GenericEmbeddedIdMetamodelTest {
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	@Test
+	public void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			var criteriaBuilder = entityManager.getCriteriaBuilder();
+			var query = criteriaBuilder.createQuery( EmployeeEntity.class );
+
+			var employee = query.from( EmployeeEntity.class );
+			var person = query.from( PersonEntity.class );
+
+			final Path employeeId = employee.get( EmployeeEntity_.id );
+			// The Path.getModel() method returns the generic (Object) type, whereas our getResolvedModel()
+			// returns the correct EmployeeId type.
+			assertThat( employeeId.getModel().getBindableJavaType() ).isEqualTo( Object.class );
+			assertThat( ((SqmPath<?>) employeeId).getResolvedModel().getBindableJavaType() ).isEqualTo( EmployeeId.class );
+			final Path employeePersonId = employeeId.get( EmployeeId_.personId );
+			assertThat( employeePersonId.getModel().getBindableJavaType() ).isEqualTo( PersonId.class );
+			final var personId = person.get( PersonEntity_.id );
+			// Same as before: generic vs resolved type
+			assertThat( personId.getModel().getBindableJavaType() ).isEqualTo( Object.class );
+			assertThat( ((SqmPath<?>) employeeId).getResolvedModel().getBindableJavaType() ).isEqualTo( EmployeeId.class );
+
+			var equal = criteriaBuilder.equal(
+					employeePersonId,
+					personId
+			);
+
+			query.select( employee ).where( equal );
+
+			final var result = entityManager.createQuery( query ).getSingleResult();
+			assertThat( result.getName() ).isEqualTo( "Employee One" );
+			assertThat( result.getId().getPersonId().getIdentifier() ).isEqualTo( 1L );
+		} );
+	}
+
+	@BeforeAll
+	public void setUp(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			entityManager.persist( new PersonEntity( new PersonId( 1L ), "Person One" ) );
+			entityManager.persist( new PersonEntity( new PersonId( 2L ), "Person Two" ) );
+			entityManager.persist(
+					new EmployeeEntity( new EmployeeId( "E001", new PersonId( 1L ) ), "Employee One", 1001 ) );
+		} );
+	}
+
+	@AfterAll
+	public void tearDown(EntityManagerFactoryScope scope) {
+		scope.getEntityManagerFactory().unwrap( SessionFactory.class ).getSchemaManager().truncateMappedObjects();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/PersonEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/PersonEntity.java
new file mode 100644
index 000000000000..1990aa9996a6
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/PersonEntity.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.metamodel.generics.embeddedid;
+
+import jakarta.persistence.Entity;
+
+@Entity
+public class PersonEntity extends BaseEntity<PersonId> {
+	public PersonEntity() {
+	}
+
+	public PersonEntity(PersonId id, String name) {
+		super( id, name );
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/PersonId.java b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/PersonId.java
new file mode 100644
index 000000000000..0420dabe3c9f
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/metamodel/generics/embeddedid/PersonId.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.metamodel.generics.embeddedid;
+
+import jakarta.persistence.Embeddable;
+
+@Embeddable
+public class PersonId {
+	private Long identifier;
+
+	public PersonId() {
+	}
+
+	public PersonId(Long identifier) {
+		this.identifier = identifier;
+	}
+
+	public Long getIdentifier() {
+		return identifier;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/CredentialsBasedMultitenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/CredentialsBasedMultitenancyTest.java
new file mode 100644
index 000000000000..2b88e3667514
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/CredentialsBasedMultitenancyTest.java
@@ -0,0 +1,100 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.multitenancy;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
+import org.hibernate.context.spi.TenantCredentialsMapper;
+import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import static org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER;
+import static org.hibernate.cfg.MultiTenancySettings.MULTI_TENANT_CREDENTIALS_MAPPER;
+import static org.hibernate.cfg.MultiTenancySettings.MULTI_TENANT_IDENTIFIER_RESOLVER;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Jpa(annotatedClasses = {CredentialsBasedMultitenancyTest.Person.class},
+		integrationSettings =
+				{@Setting(name = MULTI_TENANT_CREDENTIALS_MAPPER,
+						value = "org.hibernate.orm.test.multitenancy.CredentialsBasedMultitenancyTest$MyMapper"),
+				@Setting(name = MULTI_TENANT_IDENTIFIER_RESOLVER,
+						value = "org.hibernate.orm.test.multitenancy.CredentialsBasedMultitenancyTest$MyResolver"),
+				@Setting(name = CONNECTION_PROVIDER,
+						value = "org.hibernate.orm.test.multitenancy.CredentialsBasedMultitenancyTest$MyConnectionProvider")})
+@JiraKey("HHH-19559")
+public class CredentialsBasedMultitenancyTest {
+	private static String currentTenantIdentifier;
+	private static int tenantConnectionsAcquired;
+
+	@Test void test(EntityManagerFactoryScope scope) {
+		currentTenantIdentifier = "hello";
+		scope.inTransaction( session -> {
+			Person person = new Person();
+			person.ssn = "123456789";
+			person.name = "Gavin";
+			session.persist( person );
+		} );
+		assertEquals( 1, tenantConnectionsAcquired );
+		currentTenantIdentifier = "goodbye";
+		scope.inTransaction( session -> {
+			Person person = new Person();
+			person.ssn = "987654321";
+			person.name = "Steve";
+			session.persist( person );
+		} );
+		assertEquals( 2, tenantConnectionsAcquired );
+	}
+
+	@Entity(name = "PersonForTenant")
+	static class Person {
+		@Id
+		String ssn;
+		private String name;
+	}
+
+	public static class MyResolver implements CurrentTenantIdentifierResolver<String> {
+		@Override
+		public @NonNull String resolveCurrentTenantIdentifier() {
+			return currentTenantIdentifier;
+		}
+
+		@Override
+		public boolean validateExistingCurrentSessions() {
+			return false;
+		}
+	}
+
+	public static class MyMapper implements TenantCredentialsMapper<String> {
+		@Override
+		public @NonNull String user(@NonNull String tenantIdentifier) {
+			return tenantIdentifier;
+		}
+
+		@Override
+		public @NonNull String password(@NonNull String tenantIdentifier) {
+			return tenantIdentifier;
+		}
+	}
+
+	public static class MyConnectionProvider extends DriverManagerConnectionProvider {
+		@Override
+		public Connection getConnection(String user, String password) throws SQLException {
+			assertEquals( user, currentTenantIdentifier );
+			assertEquals( password, currentTenantIdentifier );
+			tenantConnectionsAcquired ++;
+			return getConnection();
+		}
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/SchemaBasedMultitenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/SchemaBasedMultitenancyTest.java
index 73b92354c0b2..437d234b148c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/SchemaBasedMultitenancyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/SchemaBasedMultitenancyTest.java
@@ -8,6 +8,7 @@
 import jakarta.persistence.Id;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
 import org.hibernate.context.spi.TenantSchemaMapper;
 import org.hibernate.dialect.SQLServerDialect;
@@ -34,6 +35,7 @@
 				@Setting(name = MULTI_TENANT_IDENTIFIER_RESOLVER,
 						value = "org.hibernate.orm.test.multitenancy.SchemaBasedMultitenancyTest$MyResolver")})
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportSchemaCreation.class)
+@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner JDBC driver does not support setSchema")
 @SkipForDialect(dialectClass = SQLServerDialect.class, reason = "Warning: setSchema is a no-op in this driver version")
 @SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "getSchema() method not implemented by jTDS")
 @SkipForDialect(dialectClass = InformixDialect.class, reason = "setSchema() method is a noop")
@@ -45,20 +47,26 @@ public class SchemaBasedMultitenancyTest {
 		var schemaManager = (SchemaManager) scope.getEntityManagerFactory().getSchemaManager();
 		createSchema( schemaManager, "HELLO" );
 		createSchema( schemaManager, "GOODBYE" );
-		currentTenantIdentifier = "hello";
-		scope.inTransaction( session -> {
-			Person person = new Person();
-			person.ssn = "123456789";
-			person.name = "Gavin";
-			session.persist( person );
-		} );
-		scope.inTransaction( session -> {
-			assertNotNull( session.find( Person.class, "123456789" ) );
-		} );
-		currentTenantIdentifier = "goodbye";
-		scope.inTransaction( session -> {
-			assertNull( session.find( Person.class, "123456789" ) );
-		} );
+		try {
+			currentTenantIdentifier = "hello";
+			scope.inTransaction( session -> {
+				Person person = new Person();
+				person.ssn = "123456789";
+				person.name = "Gavin";
+				session.persist( person );
+			} );
+			scope.inTransaction( session -> {
+				assertNotNull( session.find( Person.class, "123456789" ) );
+			} );
+			currentTenantIdentifier = "goodbye";
+			scope.inTransaction( session -> {
+				assertNull( session.find( Person.class, "123456789" ) );
+			} );
+		}
+		finally {
+			schemaManager.forSchema( "HELLO" ).drop( true );
+			schemaManager.forSchema( "GOODBYE" ).drop( true );
+		}
 	}
 
 	private static void createSchema(SchemaManager schemaManager, String schemaName) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nullargs/DetachedEntityManagerArgumentsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nullargs/DetachedEntityManagerArgumentsTest.java
index c8f10d88b069..227859375bea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/nullargs/DetachedEntityManagerArgumentsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nullargs/DetachedEntityManagerArgumentsTest.java
@@ -32,7 +32,7 @@ class DetachedEntityManagerArgumentsTest {
 					c.accept( thing );
 				}
 				catch ( IllegalArgumentException e ) {
-					assertTrue( e.getMessage().startsWith( "Given entity is not associated with the persistence context" ) );
+					assertTrue( e.getMessage().contains( "Given entity is not associated with the persistence context" ) );
 				}
 			} );
 		} );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nullargs/DetachedSessionArgumentsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nullargs/DetachedSessionArgumentsTest.java
index 714bc666dca9..3dd77f8b88eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/nullargs/DetachedSessionArgumentsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nullargs/DetachedSessionArgumentsTest.java
@@ -38,7 +38,7 @@ class DetachedSessionArgumentsTest {
 					c.accept( thing );
 				}
 				catch ( IllegalArgumentException e ) {
-					assertTrue( e.getMessage().startsWith( "Given entity is not associated with the persistence context" ) );
+					assertTrue( e.getMessage().contains( "Given entity is not associated with the persistence context" ) );
 				}
 			} );
 		} );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteSetNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteSetNullTest.java
index 3126e5aab44e..4204afaeab78 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteSetNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/ToOneOnDeleteSetNullTest.java
@@ -10,11 +10,13 @@
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -30,6 +32,7 @@
 		}
 )
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support ON DELETE SET DEFAULT")
 public class ToOneOnDeleteSetNullTest {
 
 	@AfterEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondeletecascade/OnDeleteManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondeletecascade/OnDeleteManyToOneTest.java
index 77423443de9a..9bc86d1a35d8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondeletecascade/OnDeleteManyToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondeletecascade/OnDeleteManyToOneTest.java
@@ -83,7 +83,7 @@ public void tearDown(EntityManagerFactoryScope scope) {
 		scope.getEntityManagerFactory().getSchemaManager().truncate();
 	}
 
-	@Entity
+	@Entity(name = "Parent")
 	static class Parent {
 		@Id
 		long id;
@@ -91,7 +91,7 @@ static class Parent {
 		Set<Child> children = new HashSet<>();
 	}
 
-	@Entity
+	@Entity(name = "Child")
 	static class Child {
 		@Id
 		long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondeletecascade/OnDeleteOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondeletecascade/OnDeleteOneToManyTest.java
index ee4b2e07a904..67af90c7d893 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondeletecascade/OnDeleteOneToManyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondeletecascade/OnDeleteOneToManyTest.java
@@ -85,7 +85,7 @@ public void tearDown(EntityManagerFactoryScope scope) {
 		scope.getEntityManagerFactory().getSchemaManager().truncate();
 	}
 
-	@Entity
+	@Entity(name = "Parent")
 	static class Parent {
 		@Id
 		long id;
@@ -95,7 +95,7 @@ static class Parent {
 		Set<Child> children = new HashSet<>();
 	}
 
-	@Entity
+	@Entity(name = "Child")
 	static class Child {
 		@Id
 		long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java
index 22a5d96c10b8..51254da87e60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest.java
@@ -7,8 +7,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
@@ -36,6 +38,7 @@
 )
 @SessionFactory
 @JiraKey(value = "HHH-16272")
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class )
 public class RefreshWithPropertyAccessAndCollectionMapManipulationInSetterMethodTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeExplicitInitialVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeExplicitInitialVersionTest.java
index cbed1763d590..01c3e4fef97c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeExplicitInitialVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeExplicitInitialVersionTest.java
@@ -43,7 +43,7 @@ public class MergeExplicitInitialVersionTest {
 		assertEquals(g2.version, 1);
 	}
 
-	@Entity
+	@Entity(name = "E")
 	static class E {
 		@Id
 		@GeneratedValue
@@ -53,7 +53,7 @@ static class E {
 		String text;
 	}
 
-	@Entity
+	@Entity(name = "F")
 	static class F {
 		@Id
 		long id = 5;
@@ -62,7 +62,7 @@ static class F {
 		String text;
 	}
 
-	@Entity
+	@Entity(name = "G")
 	static class G {
 		@Id
 		@GeneratedValue
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java
index c9527f510f4e..b5ce1eb9880a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java
@@ -5,8 +5,6 @@
 package org.hibernate.orm.test.ops;
 
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
 
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
@@ -82,7 +80,7 @@ public void testMergeStaleVersionFails(SessionFactoryScope scope) {
 	}
 
 	@Test
-	public void testMergeBidiPrimayKeyOneToOne(SessionFactoryScope scope) {
+	public void testMergeBidiPrimaryKeyOneToOne(SessionFactoryScope scope) {
 //		scope.getSessionFactory().close();
 		Person p = new Person( "steve" );
 		scope.inTransaction(
@@ -98,7 +96,7 @@ public void testMergeBidiPrimayKeyOneToOne(SessionFactoryScope scope) {
 
 		Person person = scope.fromTransaction(
 				session ->
-						(Person) session.merge( p )
+						session.merge( p )
 		);
 
 		assertInsertCount( 0, scope );
@@ -128,7 +126,7 @@ public void testMergeBidiForeignKeyOneToOne(SessionFactoryScope scope) {
 		p.getAddress().setStreetAddress( "321 Main" );
 		Person person = scope.fromTransaction(
 				session ->
-						(Person) session.merge( p )
+						session.merge( p )
 		);
 
 		assertInsertCount( 0, scope );
@@ -199,7 +197,7 @@ public void testNoExtraUpdatesOnMergeWithCollection(SessionFactoryScope scope) {
 		// into this new session; this should cause no updates...
 		Node p = scope.fromTransaction(
 				session ->
-						(Node) session.merge( parent )
+						session.merge( parent )
 		);
 
 		assertUpdateCount( 0, scope );
@@ -235,7 +233,7 @@ public void testNoExtraUpdatesOnMergeVersioned(SessionFactoryScope scope) {
 		// into this new session; this should cause no updates...
 		VersionedEntity mergedEntity = scope.fromTransaction(
 				session ->
-						(VersionedEntity) session.merge( entity )
+						session.merge( entity )
 		);
 
 		assertUpdateCount( 0, scope );
@@ -280,7 +278,7 @@ public void testNoExtraUpdatesOnMergeVersionedWithCollection(SessionFactoryScope
 
 				scope.fromTransaction(
 						session ->
-								(VersionedEntity) session.merge( parent )
+								session.merge( parent )
 				);
 
 		assertUpdateCount( 0, scope );
@@ -356,7 +354,7 @@ public void testNoExtraUpdatesOnPersistentMergeVersionedWithCollection(SessionFa
 					);
 					persistentParent.setName( "new name" );
 					persistentParent.getChildren().add( new VersionedEntity( "child2", "new child" ) );
-					persistentParent = (VersionedEntity) session.merge( persistentParent );
+					persistentParent = session.merge( persistentParent );
 
 				}
 		);
@@ -482,7 +480,7 @@ public void testMergeDeepTreeWithGeneratedId(SessionFactoryScope scope) {
 					NumberedNode grandchild = new NumberedNode( "grandchild" );
 					r.addChild( child );
 					child.addChild( grandchild );
-					return (NumberedNode) session.merge( r );
+					return session.merge( r );
 				}
 		);
 
@@ -498,7 +496,7 @@ public void testMergeDeepTreeWithGeneratedId(SessionFactoryScope scope) {
 
 		NumberedNode node = scope.fromTransaction(
 				session ->
-						(NumberedNode) session.merge( root )
+						session.merge( root )
 		);
 
 		assertInsertCount( 1, scope );
@@ -630,7 +628,7 @@ public void testMergeManaged(SessionFactoryScope scope) {
 
 					session.beginTransaction();
 					assertThat(
-							getNumneredNodeRowCount( session ),
+							getNumberedNodeRowCount( session ),
 							is( 2L )
 					);
 				}
@@ -639,7 +637,7 @@ public void testMergeManaged(SessionFactoryScope scope) {
 		cleanup( scope );
 	}
 
-	private Long getNumneredNodeRowCount(Session s) {
+	private Long getNumberedNodeRowCount(Session s) {
 		CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
 		CriteriaQuery<Long> criteria = criteriaBuilder.createQuery( Long.class );
 		Root<NumberedNode> root = criteria.from( NumberedNode.class );
@@ -662,10 +660,11 @@ public void testMergeManagedUninitializedCollection(SessionFactoryScope scope) {
 		NumberedNode newRoot = new NumberedNode( "root" );
 		newRoot.setId( root.getId() );
 
-		scope.inTransaction(
+		scope.inSession(
 				session -> {
+					session.getTransaction().begin();
 					NumberedNode r = session.get( NumberedNode.class, root.getId() );
-					Set managedChildren = r.getChildren();
+					var managedChildren = r.getChildren();
 					assertFalse( Hibernate.isInitialized( managedChildren ) );
 					newRoot.setChildren( managedChildren );
 					assertSame( r, session.merge( newRoot ) );
@@ -677,11 +676,12 @@ public void testMergeManagedUninitializedCollection(SessionFactoryScope scope) {
 					assertUpdateCount( 0, scope );
 					assertDeleteCount( 0, scope );
 
-					session.beginTransaction();
+					session.getTransaction().begin();
 					assertThat(
-							getNumneredNodeRowCount( session ),
+							getNumberedNodeRowCount( session ),
 							is( 2L )
 					);
+					session.getTransaction().commit();
 				}
 		);
 
@@ -703,10 +703,11 @@ public void testMergeManagedInitializedCollection(SessionFactoryScope scope) {
 		NumberedNode newRoot = new NumberedNode( "root" );
 		newRoot.setId( r.getId() );
 
-		scope.inTransaction(
+		scope.inSession(
 				session -> {
+					session.getTransaction().begin();
 					NumberedNode root = session.get( NumberedNode.class, r.getId() );
-					Set managedChildren = root.getChildren();
+					var managedChildren = root.getChildren();
 					Hibernate.initialize( managedChildren );
 					assertTrue( Hibernate.isInitialized( managedChildren ) );
 					newRoot.setChildren( managedChildren );
@@ -721,9 +722,10 @@ public void testMergeManagedInitializedCollection(SessionFactoryScope scope) {
 
 					session.beginTransaction();
 					assertThat(
-							getNumneredNodeRowCount( session ),
+							getNumberedNodeRowCount( session ),
 							is( 2L )
 					);
+					session.getTransaction().commit();
 				}
 		);
 
@@ -738,7 +740,7 @@ public void testRecursiveMergeTransient(SessionFactoryScope scope) {
 				session -> {
 					Employer jboss = new Employer();
 					Employee gavin = new Employee();
-					jboss.setEmployees( new ArrayList() );
+					jboss.setEmployees( new ArrayList<>() );
 					jboss.getEmployees().add( gavin );
 					session.merge( jboss );
 					session.flush();
@@ -799,7 +801,7 @@ public void testMergeManyToManyWithCollectionDeference(SessionFactoryScope scope
 		//   1) create a new List reference to represent the competitors
 		Competition competition2 = scope.fromTransaction(
 				session -> {
-					List newComp = new ArrayList();
+					var newComp = new ArrayList<>();
 					Competitor originalCompetitor = (Competitor) competition.getCompetitors().get( 0 );
 					originalCompetitor.setName( "Name2" );
 					newComp.add( originalCompetitor );
@@ -807,7 +809,7 @@ public void testMergeManyToManyWithCollectionDeference(SessionFactoryScope scope
 					//   2) set that new List reference unto the Competition reference
 					competition.setCompetitors( newComp );
 					//   3) attempt the merge
-					return (Competition) session.merge( competition );
+					return session.merge( competition );
 				}
 		);
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java
index b562adeabe10..10a48b97d528 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java
@@ -84,7 +84,7 @@ public void setCascadingChildren(Set cascadingChildren) {
 
 	private Date generateCurrentDate() {
 		// Note : done as java.sql.Date mainly to work around issue with
-		// MySQL and its lack of milli-second precision on its DATETIME
+		// MySQL and its lack of millisecond precision on its DATETIME
 		// and TIMESTAMP datatypes.
 		return new Date( new java.util.Date().getTime() );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java
index ee5c07634e32..d779d3e67ec1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java
@@ -41,6 +41,7 @@
 		xmlMappings = "org/hibernate/orm/test/optlock/Document.hbm.xml"
 )
 @SessionFactory
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 public class OptimisticLockTest {
 
 	@AfterEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java
index 8fd514a6a893..227c3cd6d88f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/EmbeddedIdOrderByAndAggregateFunctionTest.java
@@ -4,12 +4,11 @@
  */
 package org.hibernate.orm.test.orderby;
 
-import org.hibernate.dialect.H2Dialect;
-import org.hibernate.dialect.PostgreSQLDialect;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
@@ -32,8 +31,7 @@
 public class EmbeddedIdOrderByAndAggregateFunctionTest {
 
 	@Test
-	@RequiresDialect(PostgreSQLDialect.class)
-	@RequiresDialect(H2Dialect.class)
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsFunctionalDependencyAnalysis.class )
 	public void testSelectWithOrderAndGroupBy(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java
index 18dc4495b400..be4c7e170cde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderby/OrderByAndAggregateFunctionTest.java
@@ -7,9 +7,11 @@
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
@@ -32,6 +34,7 @@ public class OrderByAndAggregateFunctionTest {
 	@Test
 	@RequiresDialect(PostgreSQLDialect.class)
 	@RequiresDialect(H2Dialect.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsFunctionalDependencyAnalysis.class)
 	public void testSelectWithOrderAndGroupBy(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java
index 802c79a72de4..47459e2be70a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orderupdates/OrderUpdatesTest.java
@@ -114,7 +114,7 @@ public void removeChild(Child child) {
 		}
 	}
 
-	@Entity(name = "Chil;d")
+	@Entity(name = "Child")
 	@IdClass(Key.class)
 	public static class Child {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java
index c93cec56ae66..77908fa74bce 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/PaginationTest.java
@@ -12,6 +12,8 @@
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
 
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.query.NativeQuery;
 import org.hibernate.query.Query;
 import org.hibernate.Session;
@@ -195,6 +197,14 @@ private NativeQuery generateBaseSQLQuery(Session session) {
 				.addEntity( DataPoint.class );
 	}
 
+	private int getScale(Dialect dialect) {
+		// Spanner NUMERIC type supports scale up to 9
+		if ( dialect instanceof SpannerDialect ) {
+			return 9;
+		}
+		return 19;
+	}
+
 	@BeforeEach
 	public void prepareTestData(SessionFactoryScope scope) {
 		scope.inTransaction(
@@ -202,10 +212,11 @@ public void prepareTestData(SessionFactoryScope scope) {
 					for ( int i = 0; i < NUMBER_OF_TEST_ROWS; i++ ) {
 						DataPoint dataPoint = new DataPoint();
 						dataPoint.setSequence( i );
-						BigDecimal x = new BigDecimal( i * 0.1d ).setScale( 19, RoundingMode.DOWN );
+						final int scale = getScale( session.getDialect() );
+						BigDecimal x = new BigDecimal( i * 0.1d ).setScale( scale, RoundingMode.DOWN );
 						dataPoint.setX( x );
 						dataPoint.setY( new BigDecimal( Math.cos( x.doubleValue() ) ).setScale(
-								19,
+								scale,
 								RoundingMode.DOWN
 						) );
 						dataPoint.setDescription( "Description: " + i % 5 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/paging/keybased/KeyBasedPagingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/paging/keybased/KeyBasedPagingTest.java
index 7267b313d29c..29da0aa984e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/paging/keybased/KeyBasedPagingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/paging/keybased/KeyBasedPagingTest.java
@@ -11,7 +11,10 @@
 import org.hibernate.query.Page;
 import org.hibernate.query.SelectionQuery;
 
+import org.hibernate.query.criteria.HibernateCriteriaBuilder;
+import org.hibernate.query.criteria.JpaCriteriaQuery;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
@@ -153,6 +156,18 @@ public class KeyBasedPagingTest {
 		});
 	}
 
+	@Test
+	@Jira("https://hibernate.atlassian.net/browse/HHH-20283")
+	void testCriteria(SessionFactoryScope scope) {
+		scope.inSession(session -> {
+			HibernateCriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
+			JpaCriteriaQuery<Person> query = criteriaBuilder.createQuery( Person.class );
+			query.from( Person.class );
+			session.createSelectionQuery( query )
+					.getKeyedResultList( Page.first( 5 ).keyedBy( Order.asc( Person.class, "ssn" ) ) );
+		});
+	}
+
 	@Entity(name = "Person")
 	static class Person {
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FindMultipleDocTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FindMultipleDocTests.java
index 4fe3b027c7f3..f54867f06c51 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FindMultipleDocTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/FindMultipleDocTests.java
@@ -11,6 +11,7 @@
 import org.hibernate.OrderingMode;
 import org.hibernate.SessionCheckMode;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -77,6 +78,22 @@ void testReplaceRemovals(SessionFactoryScope factoryScope) {
 		} );
 	}
 
+	@Test @FailureExpected(reason = "REPLACE has no effect with DISABLED at least for now")
+	void testReplaceRemovalsNoSessionCheck(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.remove( session.find( Person.class, 5 ) );
+
+			List<Person> persons = session.findMultiple(
+					Person.class,
+					List.of(1,2,3,4,5),
+					RemovalsMode.REPLACE,
+					OrderingMode.UNORDERED
+			);
+			assertThat( persons ).hasSize( 5 );
+			assertThat( persons ).containsNull();
+		} );
+	}
+
 	@Test
 	void testIncludeRemovals(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
@@ -94,6 +111,92 @@ void testIncludeRemovals(SessionFactoryScope factoryScope) {
 		} );
 	}
 
+	@Test
+	void testExcludeRemovalsUnordered(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.remove( session.find( Person.class, 5 ) );
+
+			List<Person> persons = session.findMultiple(
+					Person.class,
+					List.of(1,2,3,4,5),
+					SessionCheckMode.ENABLED,
+					RemovalsMode.EXCLUDE,
+					OrderingMode.UNORDERED
+			);
+			assertThat( persons ).hasSize( 4 );
+			assertThat( persons ).doesNotContainNull();
+		} );
+		factoryScope.inTransaction( (session) -> {
+			session.remove( session.find( Person.class, 2 ) );
+
+			List<Person> persons = session.findMultiple(
+					Person.class,
+					List.of(1,2,3,4,5),
+					SessionCheckMode.ENABLED,
+					RemovalsMode.EXCLUDE,
+					OrderingMode.UNORDERED
+			);
+			assertThat( persons ).hasSize( 3 );
+			assertThat( persons ).doesNotContainNull();
+		} );
+	}
+
+	@Test @FailureExpected(reason = "EXCLUDE has no effect with DISABLED at least for now")
+	void testExcludeRemovalsUnorderedNoSessionCheck(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.remove( session.find( Person.class, 5 ) );
+
+			List<Person> persons = session.findMultiple(
+					Person.class,
+					List.of(1,2,3,4,5),
+					RemovalsMode.EXCLUDE,
+					OrderingMode.UNORDERED
+			);
+			assertThat( persons ).hasSize( 4 );
+			assertThat( persons ).doesNotContainNull();
+		} );
+		factoryScope.inTransaction( (session) -> {
+			session.remove( session.find( Person.class, 2 ) );
+
+			List<Person> persons = session.findMultiple(
+					Person.class,
+					List.of(1,2,3,4,5),
+					RemovalsMode.EXCLUDE,
+					OrderingMode.UNORDERED
+			);
+			assertThat( persons ).hasSize( 3 );
+			assertThat( persons ).doesNotContainNull();
+		} );
+	}
+
+	@Test @FailureExpected(reason = "EXCLUDE incompatible with ORDERED at least for now")
+	void testExcludeRemovalsOrdered(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			session.remove( session.find( Person.class, 5 ) );
+
+			List<Person> persons = session.findMultiple(
+					Person.class,
+					List.of(1,2,3,4,5),
+					SessionCheckMode.ENABLED,
+					RemovalsMode.EXCLUDE
+			);
+			assertThat( persons ).hasSize( 4 );
+			assertThat( persons ).doesNotContainNull();
+		} );
+		factoryScope.inTransaction( (session) -> {
+			session.remove( session.find( Person.class, 2 ) );
+
+			List<Person> persons = session.findMultiple(
+					Person.class,
+					List.of(1,2,3,4,5),
+					SessionCheckMode.ENABLED,
+					RemovalsMode.EXCLUDE
+			);
+			assertThat( persons ).hasSize( 3 );
+			assertThat( persons ).doesNotContainNull();
+		} );
+	}
+
 	@Test
 	void testOrderedRemovals(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/InstanceIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/InstanceIdentityTest.java
index 184d60fc593a..99ddda095be1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/InstanceIdentityTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/InstanceIdentityTest.java
@@ -99,7 +99,7 @@ public void testPersistentCollections(SessionFactoryScope scope) {
 
 		scope.inSession( session -> {
 			final EntityWithCollections entity = session.find( EntityWithCollections.class, 1 );
-			assertThat( entity.getStringList() ).hasSize( 3 ).containsExactly( "one", "two", "three" );
+			assertThat( entity.getStringList() ).hasSize( 3 ).containsExactlyInAnyOrder( "one", "two", "three" );
 			assertThat( entity.getEntityMap() ).isEmpty();
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/PersistenceContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/PersistenceContextTest.java
index 30c1dd3855cc..1d4454a3b379 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/pc/PersistenceContextTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pc/PersistenceContextTest.java
@@ -240,7 +240,7 @@ public void test(EntityManagerFactoryScope scope) {
 
 			session.doWork( connection -> {
 				try (Statement statement = connection.createStatement()) {
-					statement.executeUpdate( "UPDATE Person SET name = UPPER(name)" );
+					statement.executeUpdate( "UPDATE Person SET name = UPPER(name) where 1=1" );
 				}
 			} );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java
index d4e1c04f9275..7347f74e5a5e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/DB2StoredProcedureTest.java
@@ -4,20 +4,15 @@
  */
 package org.hibernate.orm.test.procedure;
 
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
 
 import org.hibernate.Session;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.DB2Dialect;
-import org.hibernate.procedure.ProcedureCall;
-import org.hibernate.procedure.ProcedureParameter;
 import org.hibernate.result.Output;
 import org.hibernate.result.ResultSetOutput;
 import org.hibernate.type.NumericBooleanConverter;
@@ -42,12 +37,12 @@
 import jakarta.persistence.NamedStoredProcedureQuery;
 import jakarta.persistence.ParameterMode;
 import jakarta.persistence.StoredProcedureParameter;
-import jakarta.persistence.StoredProcedureQuery;
 import jakarta.persistence.Table;
 import org.hamcrest.MatcherAssert;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.core.Is.is;
+import static org.hibernate.cfg.QuerySettings.QUERY_PASS_PROCEDURE_PARAMETER_NAMES;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -65,7 +60,7 @@
 				DB2StoredProcedureTest.IdHolder.class,
 				DB2StoredProcedureTest.Address.class,
 		},
-		properties = @Setting(name = AvailableSettings.QUERY_PASS_PROCEDURE_PARAMETER_NAMES, value = "true")
+		properties = @Setting(name = QUERY_PASS_PROCEDURE_PARAMETER_NAMES, value = "true")
 )
 @RequiresDialect( value = DB2Dialect.class )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-18332" )
@@ -78,7 +73,7 @@ public class DB2StoredProcedureTest {
 	@Test
 	public void testStoredProcedureOutParameter(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-			final StoredProcedureQuery query = entityManager.createStoredProcedureQuery( "sp_count_phones" );
+			final var query = entityManager.createStoredProcedureQuery( "sp_count_phones" );
 			query.registerStoredProcedureParameter( 1, Long.class, ParameterMode.IN );
 			query.registerStoredProcedureParameter( 2, Long.class, ParameterMode.OUT );
 
@@ -94,7 +89,7 @@ public void testStoredProcedureOutParameter(EntityManagerFactoryScope scope) {
 	@Jira( "https://hibernate.atlassian.net/browse/HHH-18302" )
 	public void testStoredProcedureNamedParameters(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-			final StoredProcedureQuery query = entityManager.createStoredProcedureQuery( "sp_count_phones" );
+			final var query = entityManager.createStoredProcedureQuery( "sp_count_phones" );
 			query.registerStoredProcedureParameter( "personId", Long.class, ParameterMode.IN );
 			query.registerStoredProcedureParameter( "phoneCount", Long.class, ParameterMode.OUT );
 
@@ -109,7 +104,7 @@ public void testStoredProcedureNamedParameters(EntityManagerFactoryScope scope)
 	@Test
 	public void testStoredProcedureRefCursor(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-			final StoredProcedureQuery query = entityManager.createStoredProcedureQuery( "sp_person_phones" );
+			final var query = entityManager.createStoredProcedureQuery( "sp_person_phones" );
 			query.registerStoredProcedureParameter( 1, Long.class, ParameterMode.IN );
 			query.registerStoredProcedureParameter( 2, Class.class, ParameterMode.REF_CURSOR );
 			query.setParameter( 1, 1L );
@@ -123,14 +118,10 @@ public void testStoredProcedureRefCursor(EntityManagerFactoryScope scope) {
 	@Test
 	public void testHibernateProcedureCallRefCursor(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-			final Session session = entityManager.unwrap( Session.class );
-
-			final ProcedureCall call = session.createStoredProcedureCall( "sp_person_phones" );
-			final ProcedureParameter<Long> inParam = call.registerParameter(
-					1,
-					Long.class,
-					ParameterMode.IN
-			);
+			final var session = entityManager.unwrap( Session.class );
+
+			final var call = session.createStoredProcedureCall( "sp_person_phones" );
+			final var inParam = call.registerParameter( 1, Long.class, ParameterMode.IN );
 			call.setParameter( inParam, 1L );
 			call.registerParameter( 2, Class.class, ParameterMode.REF_CURSOR );
 
@@ -154,13 +145,13 @@ public void testStoredProcedureReturnValue(EntityManagerFactoryScope scope) {
 	@Test
 	public void testFunctionCallWithJdbc(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-			final Session session = entityManager.unwrap( Session.class );
+			final var session = entityManager.unwrap( Session.class );
 			session.doWork( connection -> {
-				try (final PreparedStatement function = connection.prepareStatement(
+				try (final var function = connection.prepareStatement(
 						"select * from table(fn_person_and_phones( ? ))" )) {
 					function.setInt( 1, 1 );
 					function.execute();
-					try (final ResultSet resultSet = function.getResultSet()) {
+					try (final var resultSet = function.getResultSet()) {
 						while ( resultSet.next() ) {
 							assertThat( resultSet.getLong( 1 ) ).isInstanceOf( Long.class );
 							assertThat( resultSet.getString( 2 ) ).isInstanceOf( String.class );
@@ -174,14 +165,14 @@ public void testFunctionCallWithJdbc(EntityManagerFactoryScope scope) {
 	@Test
 	public void testSysRefCursorAsOutParameter(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-			final StoredProcedureQuery function = entityManager.createNamedStoredProcedureQuery( "singleRefCursor" );
+			final var function = entityManager.createNamedStoredProcedureQuery( "singleRefCursor" );
 
 			function.execute();
 
 			assertFalse( function.hasMoreResults() );
 			Long value = null;
 
-			try (final ResultSet resultSet = (ResultSet) function.getOutputParameterValue( 1 )) {
+			try (final var resultSet = (ResultSet) function.getOutputParameterValue( 1 )) {
 				while ( resultSet.next() ) {
 					value = resultSet.getLong( 1 );
 				}
@@ -197,14 +188,14 @@ public void testSysRefCursorAsOutParameter(EntityManagerFactoryScope scope) {
 	@Test
 	public void testOutAndSysRefCursorAsOutParameter(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-			final StoredProcedureQuery function = entityManager.createNamedStoredProcedureQuery( "outAndRefCursor" );
+			final var function = entityManager.createNamedStoredProcedureQuery( "outAndRefCursor" );
 
 			function.execute();
 
 			assertFalse( function.hasMoreResults() );
 			Long value = null;
 
-			try (final ResultSet resultSet = (ResultSet) function.getOutputParameterValue( 1 )) {
+			try (final var resultSet = (ResultSet) function.getOutputParameterValue( 1 )) {
 				while ( resultSet.next() ) {
 					value = resultSet.getLong( 1 );
 				}
@@ -218,15 +209,16 @@ public void testOutAndSysRefCursorAsOutParameter(EntityManagerFactoryScope scope
 	}
 
 	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-18332" )
 	public void testBindParameterAsHibernateType(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
-			final StoredProcedureQuery query = entityManager.createStoredProcedureQuery( "sp_phone_validity" )
+			final var query = entityManager.createStoredProcedureQuery( "sp_phone_validity" )
 					.registerStoredProcedureParameter( 1, NumericBooleanConverter.class, ParameterMode.IN )
 					.registerStoredProcedureParameter( 2, Class.class, ParameterMode.REF_CURSOR )
 					.setParameter( 1, true );
 
 			query.execute();
-			final List phones = query.getResultList();
+			final List<?> phones = query.getResultList();
 			assertEquals( 1, phones.size() );
 			assertEquals( "123-456-7890", phones.get( 0 ) );
 		} );
@@ -246,13 +238,13 @@ public void testBindParameterAsHibernateType(EntityManagerFactoryScope scope) {
 		} );
 
 		scope.inTransaction( entityManager -> {
-			final StoredProcedureQuery query = entityManager.createStoredProcedureQuery( "sp_votes" )
+			final var query = entityManager.createStoredProcedureQuery( "sp_votes" )
 					.registerStoredProcedureParameter( 1, YesNoConverter.class, ParameterMode.IN )
 					.registerStoredProcedureParameter( 2, Class.class, ParameterMode.REF_CURSOR )
 					.setParameter( 1, true );
 
 			query.execute();
-			final List votes = query.getResultList();
+			final List<?> votes = query.getResultList();
 			assertEquals( 1, votes.size() );
 			assertEquals( 1, ( (Number) votes.get( 0 ) ).intValue() );
 		} );
@@ -263,7 +255,7 @@ public void testBindParameterAsHibernateType(EntityManagerFactoryScope scope) {
 	public void testStoredProcedureInAndOutAndRefCursorParameters(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
-					StoredProcedureQuery query = entityManager.createStoredProcedureQuery( "sp_get_address_by_street_city" );
+					var query = entityManager.createStoredProcedureQuery( "sp_get_address_by_street_city" );
 					query.registerStoredProcedureParameter( "street_in", String.class, ParameterMode.IN );
 					query.registerStoredProcedureParameter( "city_in", String.class, ParameterMode.IN );
 					query.registerStoredProcedureParameter( "rec_out", ResultSet.class, ParameterMode.REF_CURSOR );
@@ -271,7 +263,7 @@ public void testStoredProcedureInAndOutAndRefCursorParameters(EntityManagerFacto
 					query.setParameter( "street_in", STREET )
 							.setParameter( "city_in", CITY );
 					query.execute();
-					ResultSet rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
+					var rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
 					try {
 						Assertions.assertTrue( rs.next() );
 						MatcherAssert.assertThat( rs.getString( "street" ), is( STREET ) );
@@ -290,7 +282,7 @@ public void testStoredProcedureInAndOutAndRefCursorParameters(EntityManagerFacto
 	public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrationOrder(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
-					StoredProcedureQuery query = entityManager.createStoredProcedureQuery( "sp_get_address_by_street_city" );
+					var query = entityManager.createStoredProcedureQuery( "sp_get_address_by_street_city" );
 					query.registerStoredProcedureParameter( "city_in", String.class, ParameterMode.IN );
 					query.registerStoredProcedureParameter( "street_in", String.class, ParameterMode.IN );
 					query.registerStoredProcedureParameter( "rec_out", ResultSet.class, ParameterMode.REF_CURSOR );
@@ -298,7 +290,7 @@ public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrati
 					query.setParameter( "street_in", STREET )
 							.setParameter( "city_in", CITY );
 					query.execute();
-					ResultSet rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
+					var rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
 					try {
 						Assertions.assertTrue( rs.next() );
 						MatcherAssert.assertThat( rs.getString( "street" ), is( STREET ) );
@@ -317,7 +309,7 @@ public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrati
 	public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrationOrder2(EntityManagerFactoryScope scope) {
 		scope.inTransaction(
 				entityManager -> {
-					StoredProcedureQuery query = entityManager.createStoredProcedureQuery( "sp_get_address_by_street_city" );
+					var query = entityManager.createStoredProcedureQuery( "sp_get_address_by_street_city" );
 					query.registerStoredProcedureParameter( "rec_out", ResultSet.class, ParameterMode.REF_CURSOR );
 					query.registerStoredProcedureParameter( "city_in", String.class, ParameterMode.IN );
 					query.registerStoredProcedureParameter( "street_in", String.class, ParameterMode.IN );
@@ -325,7 +317,7 @@ public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrati
 					query.setParameter( "street_in", STREET )
 							.setParameter( "city_in", CITY );
 					query.execute();
-					ResultSet rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
+					var rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
 					try {
 						Assertions.assertTrue( rs.next() );
 						MatcherAssert.assertThat( rs.getString( "street" ), is( STREET ) );
@@ -342,8 +334,8 @@ public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrati
 
 	@BeforeAll
 	public void prepareSchema(EntityManagerFactoryScope scope) {
-		scope.inTransaction( (entityManager) -> entityManager.unwrap( Session.class ).doWork( (connection) -> {
-			try (final Statement statement = connection.createStatement()) {
+		scope.inTransaction( entityManager -> entityManager.unwrap( Session.class ).doWork( connection -> {
+			try (final var statement = connection.createStatement()) {
 				statement.executeUpdate(
 						"CREATE OR REPLACE PROCEDURE sp_count_phones(  " +
 								"   IN personId INT,  " +
@@ -474,7 +466,7 @@ public void prepareSchema(EntityManagerFactoryScope scope) {
 
 	@BeforeEach
 	public void setUp(EntityManagerFactoryScope scope){
-		scope.inTransaction( (entityManager) -> {
+		scope.inTransaction( entityManager -> {
 			final Person person1 = new Person( 1L, "John Doe" );
 			person1.setNickName( "JD" );
 			person1.setAddress( "Earth" );
@@ -500,10 +492,10 @@ public void setUp(EntityManagerFactoryScope scope){
 
 	@AfterAll
 	public void cleanUpSchema(EntityManagerFactoryScope scope) {
-		scope.inEntityManager( (em) -> {
-			final Session session = em.unwrap( Session.class );
+		scope.inEntityManager( entityManager -> {
+			final var session = entityManager.unwrap( Session.class );
 			session.doWork( connection -> {
-				try (final Statement statement = connection.createStatement()) {
+				try (final var statement = connection.createStatement()) {
 					statement.executeUpdate( "DROP PROCEDURE sp_count_phones" );
 					statement.executeUpdate( "DROP PROCEDURE sp_person_phones" );
 					statement.executeUpdate( "DROP FUNCTION fn_count_phones" );
@@ -522,11 +514,10 @@ public void cleanUpSchema(EntityManagerFactoryScope scope) {
 
 	@AfterEach
 	public void cleanData(EntityManagerFactoryScope scope) {
-		scope.inTransaction( (em) -> {
-			final List<Person> people = em.createQuery( "from Person", Person.class ).getResultList();
-			people.forEach( em::remove );
-
-			em.createQuery( "delete Address" ).executeUpdate();
+		scope.inTransaction( entityManager -> {
+			final List<Person> people = entityManager.createQuery( "from Person", Person.class ).getResultList();
+			people.forEach( entityManager::remove );
+			entityManager.createQuery( "delete Address" ).executeUpdate();
 		} );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java
index 68e09cc4e0af..0879dfab9c80 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java
@@ -408,10 +408,7 @@ public void testStoredProcedureNullParameterHibernateWithoutSettingTheParameter(
 				fail( "Should have thrown exception" );
 			}
 			catch (IllegalArgumentException e) {
-				assertEquals(
-						"The parameter at position [1] was not set! You need to call the setParameter method.",
-						e.getMessage()
-				);
+				assertTrue( e.getMessage().contains( "parameter at position 1" ) );
 			}
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java
index 0aef95778b52..54ebf0a592a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java
@@ -12,6 +12,7 @@
 import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.model.relational.NamedAuxiliaryDatabaseObject;
 import org.hibernate.boot.model.relational.Namespace;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.PostgresPlusDialect;
 import org.hibernate.jpa.HibernateHints;
@@ -21,6 +22,7 @@
 import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.StandardBasicTypes;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,14 +37,17 @@
 import java.time.ZoneOffset;
 import java.util.Set;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Vlad Mihalcea
  */
 @RequiresDialect(PostgreSQLDialect.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support stored procedures")
 public class PostgreSQLFunctionProcedureTest extends EntityManagerFactoryBasedFunctionalTest {
 
 	@Override
@@ -186,7 +191,7 @@ public void testFunctionProcedureOutParameter() {
 
 			query.execute();
 			Long phoneCount = (Long) query.getSingleResult();
-			assertThat( phoneCount ).isEqualTo( 2 );
+			assertEquals( 2, phoneCount );
 		} );
 	}
 
@@ -199,7 +204,7 @@ public void testFunctionProcedureRefCursor() {
 
 			query.setParameter( 1, 1L );
 
-			assertThat( query.getResultList() ).hasSize( 2 );
+			assertEquals( 2, query.getResultList().size() );
 		} );
 	}
 
@@ -213,7 +218,7 @@ public void testFunctionProcedureRefCursorOld() {
 
 			query.setParameter( 2, 1L );
 
-			assertThat( query.getResultList() ).hasSize( 2 );
+			assertEquals( 2, query.getResultList().size() );
 		} );
 	}
 
@@ -236,7 +241,7 @@ public void testFunctionWithJDBC() {
 					}
 				}
 			} );
-			assertThat( phoneCount ).isEqualTo( 2 );
+			assertEquals( 2, phoneCount );
 		} );
 	}
 
@@ -270,7 +275,7 @@ public void testSysRefCursorAsOutParameter() {
 			catch (Exception e) {
 				fail( e.getMessage() );
 			}
-			assertThat( value ).isEqualTo( 1 );
+			assertEquals( 1, value );
 
 
 			StoredProcedureQuery function = entityManager.createStoredProcedureQuery( "singleRefCursor" );
@@ -280,7 +285,7 @@ public void testSysRefCursorAsOutParameter() {
 
 			value = (Integer) function.getSingleResult();
 
-			assertThat( value ).isEqualTo( 1 );
+			assertEquals( 1, value );
 		} );
 	}
 
@@ -294,7 +299,7 @@ public void testSysRefCursorAsOutParameterOld() {
 
 			function.execute();
 
-			assertThat( function.hasMoreResults() ).isFalse();
+			assertFalse( function.hasMoreResults() );
 
 			Integer value = null;
 			try (ResultSet resultSet = (ResultSet) function.getOutputParameterValue( 1 )) {
@@ -306,7 +311,7 @@ public void testSysRefCursorAsOutParameterOld() {
 				fail( e.getMessage() );
 			}
 
-			assertThat( value ).isEqualTo( 1 );
+			assertEquals( 1, value );
 		} );
 	}
 
@@ -323,7 +328,7 @@ public void testFunctionProcedureNullParameterHibernate() {
 
 			Boolean result = (Boolean) procedureCall.getSingleResult();
 
-			assertThat( result ).isTrue();
+			assertTrue( result );
 		} );
 
 		inTransaction( entityManager -> {
@@ -335,7 +340,7 @@ public void testFunctionProcedureNullParameterHibernate() {
 
 			Boolean result = (Boolean) procedureCall.getSingleResult();
 
-			assertThat( result ).isFalse();
+			assertFalse( result );
 		} );
 	}
 
@@ -352,7 +357,7 @@ public void testFunctionProcedureNullParameterHibernateWithoutEnablePassingNulls
 
 			Boolean result = (Boolean) procedureCall.getSingleResult();
 
-			assertThat( result ).isTrue();
+			assertTrue( result );
 		} );
 	}
 
@@ -369,7 +374,6 @@ public void testFunctionProcedureNullParameterHibernateWithoutSettingTheParamete
 					procedureCall.execute();
 				} ) );
 
-		assertThat( exception.getMessage() )
-				.isEqualTo( "The parameter named [param] was not set! You need to call the setParameter method." );
+		assertTrue( exception.getMessage().contains( "parameter named 'param'" ) );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLStoredProcedureTest.java
index 60befa8191cf..445a175dba2b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLStoredProcedureTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLStoredProcedureTest.java
@@ -12,12 +12,17 @@
 import java.sql.Types;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.util.Date;
 import java.util.List;
 
+import jakarta.persistence.TemporalType;
 import org.hibernate.Session;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.procedure.ProcedureCall;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.StandardBasicTypes;
 
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
@@ -26,7 +31,6 @@
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -39,10 +43,10 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Vlad Mihalcea
@@ -56,6 +60,7 @@
 		properties = @Setting( name = AvailableSettings.QUERY_PASS_PROCEDURE_PARAMETER_NAMES, value = "true")
 )
 @RequiresDialect(value = PostgreSQLDialect.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support stored procedures")
 public class PostgreSQLStoredProcedureTest {
 
 	private static final String CITY = "London";
@@ -230,10 +235,7 @@ public void testStoredProcedureNullParameterHibernateWithoutSettingTheParameter(
 				fail( "Should have thrown exception" );
 			}
 			catch (IllegalArgumentException e) {
-				assertEquals(
-						"The parameter named [param] was not set! You need to call the setParameter method.",
-						e.getMessage()
-				);
+				assertTrue( e.getMessage().contains( "parameter named 'param'" ) );
 			}
 		} );
 	}
@@ -253,7 +255,7 @@ public void testStoredProcedureInAndOutAndRefCursorParameters(EntityManagerFacto
 					query.execute();
 					ResultSet rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
 					try {
-						Assertions.assertTrue( rs.next() );
+						assertTrue( rs.next() );
 						assertThat( rs.getString( "street" ), is( STREET ) );
 						assertThat( rs.getString( "city" ), is( CITY ) );
 						assertThat( rs.getString( "zip" ), is( ZIP ) );
@@ -280,7 +282,7 @@ public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrati
 					query.execute();
 					ResultSet rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
 					try {
-						Assertions.assertTrue( rs.next() );
+						assertTrue( rs.next() );
 						assertThat( rs.getString( "street" ), is( STREET ) );
 						assertThat( rs.getString( "city" ), is( CITY ) );
 						assertThat( rs.getString( "zip" ), is( ZIP ) );
@@ -307,7 +309,7 @@ public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrati
 					query.execute();
 					ResultSet rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
 					try {
-						Assertions.assertTrue( rs.next() );
+						assertTrue( rs.next() );
 						assertThat( rs.getString( "street" ), is( STREET ) );
 						assertThat( rs.getString( "city" ), is( CITY ) );
 						assertThat( rs.getString( "zip" ), is( ZIP ) );
@@ -319,6 +321,24 @@ public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrati
 		);
 	}
 
+	@Test
+	@RequiresDialect(value = PostgreSQLDialect.class, majorVersion = 14, comment = "Stored procedure OUT parameters are only supported since version 14")
+	@Jira("https://hibernate.atlassian.net/browse/HHH-20281")
+	public void testStoredProcedureTemporalTypeDateParameter(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					StoredProcedureQuery procedureCall = entityManager.createStoredProcedureQuery( "sp_has_person_created_before" );
+					procedureCall.registerStoredProcedureParameter( 1, Date.class, ParameterMode.IN );
+					procedureCall.registerStoredProcedureParameter( 2, Boolean.class, ParameterMode.INOUT );
+					procedureCall.setParameter( 1, new Date(), TemporalType.DATE );
+					procedureCall.setParameter( 2, null );
+
+					procedureCall.execute();
+					assertThat( procedureCall.getOutputParameterValue( 2 ), is( true ) );
+				}
+		);
+	}
+
 	@BeforeEach
 	public void prepareSchema(EntityManagerFactoryScope scope) {
 		scope.inTransaction( (entityManager) -> entityManager.unwrap( Session.class ).doWork( (connection) -> {
@@ -391,6 +411,21 @@ public void prepareSchema(EntityManagerFactoryScope scope) {
 								" $BODY$ " +
 								" LANGUAGE plpgsql"
 				);
+				statement.executeUpdate(
+						"CREATE OR REPLACE PROCEDURE sp_has_person_created_before (" +
+						" IN created_on_in date, " +
+						" INOUT result boolean) " +
+						" AS" +
+						" $BODY$ " +
+						" BEGIN" +
+						" SELECT true into result " +
+						" FROM Person p " +
+						" WHERE " +
+						" p.createdOn <= created_on_in;" +
+						" END; " +
+						" $BODY$ " +
+						" LANGUAGE plpgsql"
+				);
 			}
 			catch (SQLException e) {
 				System.err.println( "Error exporting procedure and function definitions to Oracle database : " + e.getMessage() );
@@ -433,6 +468,7 @@ public void cleanUpSchema(EntityManagerFactoryScope scope) {
 					statement.executeUpdate( "DROP PROCEDURE singleRefCursor(refcursor)" );
 					statement.executeUpdate( "DROP PROCEDURE sp_is_null(varchar, boolean)" );
 					statement.executeUpdate( "DROP PROCEDURE sp_get_address_by_street_city(varchar,varchar,refcursor)" );
+					statement.executeUpdate( "DROP PROCEDURE sp_has_person_created_before (date, boolean)" );
 				}
 				catch (SQLException ignore) {
 				}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java
index a91a8b931a1e..eb9ebcb9af58 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/procedure/StoredProcedureParameterTypeTest.java
@@ -452,7 +452,7 @@ public void testTypedParameterValueInParameterWithNotSpecifiedType(SessionFactor
 						procedureCall.setParameter( 1, TypedParameterValue.of( StandardBasicTypes.INTEGER, 1 ) );
 					}
 					catch (IllegalArgumentException e) {
-						assertTrue( e.getMessage().contains( "was not of specified type" ) );
+						assertTrue( e.getMessage().contains( "incompatible" ) );
 					}
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java
index 09b6687c0735..9770accf0c9c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/DetachedProxyAsQueryParameterTest.java
@@ -5,7 +5,6 @@
 package org.hibernate.orm.test.proxy;
 
 import org.hibernate.Hibernate;
-import org.hibernate.LazyInitializationException;
 import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -23,7 +22,6 @@
 import jakarta.persistence.ManyToOne;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @DomainModel(
 		annotatedClasses = {
@@ -71,24 +69,17 @@ public void testQuery(SessionFactoryScope scope) {
 		scope.inSession(
 				session -> {
 					session.createQuery(
-									"select d from Department d where d = :department" )
+							"select d from Department d where d = :department" )
 							.setParameter( "department", employee.getDepartment() ).list();
 				}
 		);
 
 
-		assertThrows(
-				LazyInitializationException.class, () -> {
-					scope.inSession(
-							session -> {
-								// In order to validate the parameter and check that it is an instance of SpecialDepartment
-								// the Department proxy have to be initialized but being a detached instance
-								// a LazyInitializationException is thrown
-								session.createQuery(
-										"select d from SpecialDepartment d where d = :department"
-								).setParameter( "department", employee.getDepartment() ).list();
-							}
-					);
+		scope.inSession(
+				session -> {
+					session.createQuery(
+							"select d from SpecialDepartment d where d = :department" )
+							.setParameter( "department", employee.getDepartment() ).list();
 				}
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java
index 65aa651e4adc..c54e925246a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java
@@ -11,7 +11,9 @@
 import org.hibernate.internal.util.SerializationHelper;
 import org.hibernate.orm.test.annotations.embeddables.Investor;
 import org.hibernate.orm.test.annotations.embeddables.InvestorTypeContributor;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
 
@@ -31,6 +33,7 @@
  *
  * @author Marcel Overdijk
  */
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class MultipleSessionFactoriesProxyTest {
 
 	private SessionFactory produceSessionFactory() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/DetachedEntityParameterAutoFlushVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/DetachedEntityParameterAutoFlushVersionTest.java
new file mode 100644
index 000000000000..bb01861345f6
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/DetachedEntityParameterAutoFlushVersionTest.java
@@ -0,0 +1,144 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.query;
+
+import java.util.List;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
+
+import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(
+		annotatedClasses = {
+				DetachedEntityParameterAutoFlushVersionTest.Trustee.class,
+				DetachedEntityParameterAutoFlushVersionTest.Customer.class
+		}
+)
+@SessionFactory
+@BytecodeEnhanced
+@JiraKey("HHH-20320")
+public class DetachedEntityParameterAutoFlushVersionTest {
+
+	@Test
+	void reproducesDetachedEntityWithNullVersionDuringAutoFlush(SessionFactoryScope scope) {
+		Long customerId = scope.fromTransaction( session -> {
+			Trustee trustee = new Trustee();
+			trustee.setName("trustee");
+			session.persist(trustee);
+
+			Customer customer = new Customer();
+			customer.setName("customer");
+			customer.setTrustee(trustee);
+			session.persist(customer);
+
+			return customer.id;
+		});
+
+		// Create a detached entity by fetching it in a separate transaction
+		// This should naturally create the condition that triggers the bug
+		Trustee detachedTrustee = scope.fromTransaction( session ->
+				session.createQuery("SELECT c FROM Customer c WHERE c.id = :id", Customer.class)
+						.setParameter("id", customerId)
+						.getSingleResult()
+						.trustee
+		);
+
+		// The bug is now fixed - this should work without throwing PropertyValueException
+		scope.inTransaction( session -> {
+			// Modify a managed entity to trigger auto-flush
+			Customer managedCustomer = session.find(Customer.class, customerId);
+			managedCustomer.setName("updated");
+
+			// This query should work now - previously failed in 7.2 with PropertyValueException
+			List<Customer> customers = session.createQuery(
+							"select c from Customer c where c.trustee = :trustee",
+							Customer.class
+					)
+					.setParameter("trustee", detachedTrustee)
+					.list();
+
+			assertThat(customers).hasSize(1);
+		});
+	}
+
+	@Entity(name = "Trustee")
+	@Table(name = "detached_param_trustee")
+	public static class Trustee {
+		@Id
+		@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trustee_seq")
+		@SequenceGenerator(name = "trustee_seq", sequenceName = "trustee_seq", allocationSize = 1)
+		public Long id;
+		@Version
+		public Long version;
+		public String name;
+
+		public Long getId() {
+			return id;
+		}
+
+		public Long getVersion() {
+			return version;
+		}
+
+		public void setVersion(Long version) {
+			this.version = version;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	@Entity(name = "Customer")
+	@Table(name = "detached_param_customer")
+	public static class Customer {
+		@Id
+		@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "customer_seq")
+		@SequenceGenerator(name = "customer_seq", sequenceName = "customer_seq", allocationSize = 1)
+		public Long id;
+		public String name;
+		@ManyToOne(fetch = FetchType.LAZY)
+		public Trustee trustee;
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public Trustee getTrustee() {
+			return trustee;
+		}
+
+		public void setTrustee(Trustee trustee) {
+			this.trustee = trustee;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathsGroupByOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathsGroupByOrderByTest.java
index fbb5426fe637..3291131ebb60 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathsGroupByOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/EntityValuedPathsGroupByOrderByTest.java
@@ -4,8 +4,10 @@
  */
 package org.hibernate.orm.test.query;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterAll;
@@ -30,6 +32,7 @@
 		EntityValuedPathsGroupByOrderByTest.EntityB.class
 } )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-16409" )
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsFunctionalDependencyAnalysis.class )
 public class EntityValuedPathsGroupByOrderByTest {
 	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ManyToManyGroupByOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ManyToManyGroupByOrderByTest.java
index a01af2c4601c..d9d7b31340cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ManyToManyGroupByOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ManyToManyGroupByOrderByTest.java
@@ -7,10 +7,12 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -110,6 +112,7 @@ public void testSelectAssociationId(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "ORDER BY clause expression references o1_1.id which is not visible after SELECT DISTINCT")
 	public void testDistinctAndAggregates(SessionFactoryScope scope) {
 		// explicit join distinct
 		scope.inTransaction( session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/MappedSuperclassAttributeInMultipleSubtypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/MappedSuperclassAttributeInMultipleSubtypesTest.java
index 88f4f16d2726..17a47574b204 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/MappedSuperclassAttributeInMultipleSubtypesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/MappedSuperclassAttributeInMultipleSubtypesTest.java
@@ -13,6 +13,8 @@
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -37,6 +39,7 @@
 } )
 @SessionFactory
 @Jira( "https://hibernate.atlassian.net/browse/HHH-17491" )
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner lacks implicit type coercion between INT64 and FLOAT64, which fails for shared columns in single-table inheritance with conflicting types")
 public class MappedSuperclassAttributeInMultipleSubtypesTest {
 	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryConstructorErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryConstructorErrorTest.java
new file mode 100644
index 000000000000..609845e63e8a
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryConstructorErrorTest.java
@@ -0,0 +1,71 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.query;
+
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Reproducer for HHH-20261:
+ * Poor error messages when mapping native-query results to
+ * a custom class/record whose constructor does not match,
+ * or when multiple constructors match.
+ */
+@DomainModel
+@SessionFactory
+@Jira("https://hibernate.atlassian.net/browse/HHH-20261")
+public class NativeQueryConstructorErrorTest {
+
+	@Test
+	@RequiresDialect(H2Dialect.class)
+	public void testConstructorMismatch(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Exception ex = assertThrows( Exception.class,
+					() -> session.createNativeQuery( "select 'hello' as id, 'abc' as name", MiniInfo.class )
+							.getSingleResult() );
+
+			String msg = ex.getMessage();
+
+			assertTrue( msg.contains(
+					"Could not instantiate query result type - expected 'MiniInfo(Integer, int)' but found 'MiniInfo(String, String)' in 'org.hibernate.orm.test.query.NativeQueryConstructorErrorTest$MiniInfo' due to: argument type mismatch" ) );
+		} );
+	}
+
+	@Test
+	@RequiresDialect(H2Dialect.class)
+	public void testMultipleMatchingConstructors(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Exception ex = assertThrows( Exception.class,
+					() -> session.createNativeQuery( "select 1 as id, 'abc' as name", Ambiguous.class )
+							.getSingleResult() );
+
+			String msg = ex.getMessage();
+
+			assertTrue( msg.contains( "Result class must have exactly one constructor with 2 parameters - found " ) );
+			assertTrue( msg.contains( "Ambiguous(Object, Object)" ) );
+			assertTrue( msg.contains( "Ambiguous(Number, CharSequence)" ) );
+
+		} );
+	}
+
+	public record MiniInfo(Integer id, int age) {
+	}
+
+	public static class Ambiguous {
+		public Ambiguous(Number id, CharSequence name) {
+		}
+
+		public Ambiguous(Object id, Object name) {
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java
index c605d3ed04f6..3f2752c849cc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java
@@ -69,14 +69,14 @@ public void testFullLimitOffsetOnNativeQuery(SessionFactoryScope scope) {
 	public void testPartialLimitOffsetOnNativeQuery(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
-					List<Long> l = session.createNativeQuery( "select id from Person where name like :name", Long.class)
+					List<Long> l = session.createNativeQuery( "select id from Person where name like :name order by id", Long.class)
 							.setParameter("name", "J%")
 							.setFirstResult(1)
 							.getResultList();
 					assertEquals( 2, l.get( 0 ) );
 					assertEquals( 4, l.size() );
 
-					l = session.createNativeQuery( "select id from Person where name like :name", Long.class)
+					l = session.createNativeQuery( "select id from Person where name like :name order by id", Long.class)
 							.setParameter("name", "J%")
 							.setMaxResults( 3 )
 							.getResultList();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryNestedTreeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryNestedTreeTest.java
new file mode 100644
index 000000000000..e5e2396b5ad1
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryNestedTreeTest.java
@@ -0,0 +1,108 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.query;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+/**
+ * This reproduces an issue in Hibernate 6 parsing native queries.
+ */
+@DomainModel(
+		annotatedClasses = {
+				NativeQueryNestedTreeTest.Tree.class,
+				NativeQueryNestedTreeTest.Forest.class
+		}
+)
+@SessionFactory
+@Jira("https://hibernate.atlassian.net/browse/HHH-18871")
+public class NativeQueryNestedTreeTest {
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		// We want to make sure 'Could not locate TableGroup' no longer is thrown
+		assertDoesNotThrow( () -> scope.inTransaction( session ->
+				session.createNativeQuery( """
+								select {t.*}, {t2.*}, {t3.*}
+								from tree t
+								inner join tree t2 on t2.parent_id = t.id
+								inner join tree t3 on t3.parent_id = t2.id
+								""", Tree.class )
+						.addEntity( "t", Tree.class )
+						.addJoin( "t2", "t.children" )
+						.addJoin( "t3", "t2.children" )
+						.list()
+		) );
+
+		assertDoesNotThrow( () -> scope.inTransaction( session ->
+				session.createNativeQuery( """
+								select {t.*}, {t2.*}, {t3.*}, {t4.*}
+								from tree t
+								inner join tree t2 on t2.parent_id = t.id
+								inner join tree t3 on t3.parent_id = t2.id
+								inner join tree t4 on t4.parent_id = t3.id
+								""", Tree.class )
+						.addEntity( "t", Tree.class )
+						.addJoin( "t2", "t.children" )
+						.addJoin( "t3", "t2.children" )
+						.addJoin( "t4", "t3.children" )
+						.list()
+		) );
+
+		assertDoesNotThrow( () -> scope.inTransaction( session ->
+				session.createNativeQuery( """
+								select {f.*}, {t.*}, {t2.*}
+								from forest f
+								inner join tree t on t.parent_id is null
+								inner join tree t2 on t2.parent_id = t.id
+								""", Forest.class )
+						.addEntity( "f", Forest.class )
+						.addJoin( "t", "f.trees" )
+						.addJoin( "t2", "t.children" )
+						.list()
+		) );
+	}
+
+	@Entity(name = "Tree")
+	@Table(name = "tree")
+	public static class Tree {
+		@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+		@JoinColumn(name = "parent_id")
+		private Tree parent;
+		@OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+		private Set<Tree> children = new HashSet<>();
+		@Id
+		@GeneratedValue
+		private long id;
+	}
+
+	@Entity(name = "Forest")
+	@Table(name = "forest")
+	public static class Forest {
+		@Id
+		@GeneratedValue
+		private Long id;
+		@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+		@JoinColumn(name = "forest_id")
+		private Set<Tree> trees = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java
index 1d21218a4260..9d4639df6131 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQuerySchemaPlaceholderTest.java
@@ -54,7 +54,7 @@ public void testUpdate(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					NativeQuery<Tuple> nativeQuery = session.createNativeQuery(
-							"UPDATE {h-schema}TestEntity SET name = 'updated_test'"
+							"UPDATE {h-schema}TestEntity SET name = 'updated_test' WHERE id = 1"
 					);
 					nativeQuery.executeUpdate();
 				}
@@ -71,7 +71,7 @@ public void testUpdate(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					NativeQuery<Tuple> nativeQuery = session.createNativeQuery(
-							"UPDATE {h-schema}TestEntity SET name = '{updated_test'"
+							"UPDATE {h-schema}TestEntity SET name = '{updated_test' where id = 1"
 					);
 					nativeQuery.executeUpdate();
 				}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithParenthesesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithParenthesesTest.java
index 17b3b2c97196..22fd1f11bb97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithParenthesesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryWithParenthesesTest.java
@@ -6,6 +6,7 @@
 
 import org.hibernate.community.dialect.FirebirdDialect;
 
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -30,6 +31,7 @@
 public class NativeQueryWithParenthesesTest {
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "spanner requires explicit UNION ALL or UNION DISTINCT")
 	public void testParseParentheses(SessionFactoryScope scope) {
 		scope.inTransaction(
 				entityManager ->
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java
index 0d364dc7c367..7ed275b2a5f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java
@@ -12,6 +12,7 @@
 import org.hibernate.dialect.AbstractTransactSQLDialect;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.dialect.OracleDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -44,7 +45,7 @@ public class QueryTimeOutTest extends BaseSessionFactoryFunctionalTest {
 
 	private static final PreparedStatementSpyConnectionProvider CONNECTION_PROVIDER =
 			new PreparedStatementSpyConnectionProvider();
-	private static final String QUERY = "update AnEntity set name='abc'";
+	private static final String QUERY = "update AnEntity set name='abc' where 1=1";
 	private String expectedSqlQuery;
 
 	@Override
@@ -68,22 +69,25 @@ public void before() {
 				.getDescriptor(
 						Types.VARCHAR
 				);
-		final String baseQuery;
+		String baseQuery;
 		if ( DialectContext.getDialect() instanceof OracleDialect ) {
-			baseQuery = "update AnEntity ae1_0 set ae1_0.name=?";
+			baseQuery = "update AnEntity ae1_0 set ae1_0.name=? where 1=1";
 		}
 		else if ( DialectContext.getDialect() instanceof SybaseDialect ) {
-			baseQuery = "update AnEntity set name=? from AnEntity ae1_0";
+			baseQuery = "update AnEntity set name=? from AnEntity ae1_0 where 1=1";
 		}
 		else if ( DialectContext.getDialect() instanceof AbstractTransactSQLDialect ) {
-			baseQuery = "update ae1_0 set name=? from AnEntity ae1_0";
+			baseQuery = "update ae1_0 set name=? from AnEntity ae1_0 where 1=1";
+		}
+		else if ( DialectContext.getDialect() instanceof SpannerDialect ) {
+			baseQuery = "update AnEntity ae1_0 set name=? where 1=1";
 		}
 		else if ( DialectContext.getDialect()
 						.getDmlTargetColumnQualifierSupport() == DmlTargetColumnQualifierSupport.NONE ) {
-			baseQuery = "update AnEntity set name=?";
+			baseQuery = "update AnEntity set name=? where 1=1";
 		}
 		else {
-			baseQuery = "update AnEntity ae1_0 set name=?";
+			baseQuery = "update AnEntity ae1_0 set name=? where 1=1";
 		}
 		expectedSqlQuery = baseQuery.replace(
 				"?",
@@ -96,6 +100,7 @@ else if ( DialectContext.getDialect()
 		);
 	}
 
+
 	@Test
 	@JiraKey(value = "HHH-12075")
 	public void testCreateQuerySetTimeout() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/RightJoinNullnessPredicateQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/RightJoinNullnessPredicateQueryTest.java
index 320350602f3f..61d75f3044e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/RightJoinNullnessPredicateQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/RightJoinNullnessPredicateQueryTest.java
@@ -76,6 +76,20 @@ public void testFullJoinIsNull(SessionFactoryScope scope) {
 		} );
 	}
 
+	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsFullJoin.class )
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsExceptAll.class )
+	public void testFullJoinLiteralSelectionRetainsDuplicates(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final List<Integer> result = session.createQuery(
+					"select 1 from MainEntity m full join m.related r",
+					Integer.class
+			).getResultList();
+			assertThat( result ).hasSize( 3 );
+			assertThat( result ).containsOnly( 1 );
+		} );
+	}
+
 	@Test
 	public void testDereferenceIsNotNull(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java
index d25671390faf..355404b89132 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/ToHqlStringTest.java
@@ -8,7 +8,6 @@
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.junit.jupiter.api.Test;
 
@@ -135,6 +134,20 @@ public void testCriteriaWithFunctionTakingTwoArguments(EntityManagerFactoryScope
 		);
 	}
 
+	@Test
+	@JiraKey("HHH-19075")
+	public void testTrimWithThreeArgumentsToHqlString(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					Query query = entityManager.createQuery(
+							"select trim(trailing '_' from t.name) from TestEntity t"
+					);
+					String hqlString = ( (SqmQuery<?>) query ).getSqmStatement().toHqlString();
+					assertThat( hqlString, containsString( "trim(TRAILING '_' from t.name)" ) );
+				}
+		);
+	}
+
 	public static class TestDto {
 		@Id
 		public Integer id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CountQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CountQueryTests.java
index 5a8268494759..a85caff9bfa2 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CountQueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CountQueryTests.java
@@ -434,7 +434,7 @@ public static abstract class LogSupport {
 		private String s;
 	}
 
-	@Entity
+	@Entity(name = "Contract")
 	@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 	public static class Contract extends LogSupport {
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java
index f86997a0d555..a3fd9bd08968 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaBuilderNonStandardFunctionsTest.java
@@ -17,6 +17,8 @@
 import jakarta.persistence.criteria.ParameterExpression;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaExpression;
 import org.hibernate.query.common.TemporalUnit;
@@ -135,6 +137,7 @@ public void testSql(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialect(PostgreSQLDialect.class)
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner PostgreSQL does not support inet type")
 	public void testSqlCustomType(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
@@ -158,6 +161,7 @@ public void testSqlCustomType(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsFormat.class)
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner FORMAT_DATE does not support time specifiers for DATE types")
 	public void testFormatWithJavaUtilDate(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
@@ -320,6 +324,7 @@ public void testRepeat(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialect(PostgreSQLDialect.class)
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner PostgreSQL does not support collation")
 	public void testCollatePostgreSQL(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
@@ -450,21 +455,26 @@ public void testDegrees(SessionFactoryScope scope) {
 
 	@Test
 	@JiraKey("HHH-16185")
+	@JiraKey("HHH-20113")
 	public void testNumericTruncFunction(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			final CriteriaBuilder cb = session.getCriteriaBuilder();
 			final CriteriaQuery<Tuple> query = cb.createTupleQuery();
 			query.multiselect(
 					cb.function( "trunc", Float.class, cb.literal( 32.92345f ) ),
-					cb.function( "truncate", Float.class, cb.literal( 32.92345f ) ),
-					cb.function( "trunc", Float.class, cb.literal( 32.92345f ), cb.literal( 3 ) ),
+					cb.function( "truncate", Float.class, cb.parameter( Float.class, "floatValue" ) ),
+					cb.function( "trunc", Float.class, cb.parameter( Float.class, "floatValue" ), cb.parameter( Integer.class, "decimals" ) ),
 					cb.function( "truncate", Float.class, cb.literal( 32.92345f ), cb.literal( 3 ) ),
-					cb.function( "trunc", Double.class, cb.literal( 32.92345d ) ),
+					cb.function( "trunc", Double.class, cb.parameter( Double.class, "doubleValue" ) ),
 					cb.function( "truncate", Double.class, cb.literal( 32.92345d ) ),
 					cb.function( "trunc", Double.class, cb.literal( 32.92345d ), cb.literal( 3 ) ),
-					cb.function( "truncate", Double.class, cb.literal( 32.92345d ), cb.literal( 3 ) )
+					cb.function( "truncate", Double.class, cb.parameter( Double.class, "doubleValue" ), cb.parameter( Integer.class, "decimals" ) )
 			);
-			final Tuple result = session.createQuery( query ).getSingleResult();
+			final Tuple result = session.createQuery( query )
+					.setParameter( "floatValue", 32.92345f  )
+					.setParameter( "doubleValue", 32.92345d  )
+					.setParameter( "decimals", 3 )
+					.getSingleResult();
 			assertEquals( 32f, result.get( 0 ) );
 			assertEquals( 32f, result.get( 1 ) );
 			assertEquals( 32.923f, result.get( 2 ) );
@@ -479,6 +489,7 @@ public void testNumericTruncFunction(SessionFactoryScope scope) {
 	@Test
 	@JiraKey("HHH-16130")
 	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsDateTimeTruncation.class )
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Emulator bug in date_trunc")
 	public void testDateTruncFunction(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaIdVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaIdVersionTest.java
index 97ec709470e6..ffd02be0d124 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaIdVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaIdVersionTest.java
@@ -68,7 +68,7 @@ void testPath(SessionFactoryScope scope) {
 		} );
 	}
 
-	@Entity
+	@Entity(name = "Thing")
 	static class Thing {
 		@Id
 		long id = 2;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaMultiselectGroupByAndOrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaMultiselectGroupByAndOrderByTest.java
index 9b0103fd277d..0648f3787488 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaMultiselectGroupByAndOrderByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaMultiselectGroupByAndOrderByTest.java
@@ -15,8 +15,10 @@
 import org.hibernate.query.criteria.JpaDerivedRoot;
 import org.hibernate.query.criteria.JpaSubQuery;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
@@ -47,6 +49,7 @@
 		CriteriaMultiselectGroupByAndOrderByTest.Secondary.class,
 } )
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsFunctionalDependencyAnalysis.class )
 public class CriteriaMultiselectGroupByAndOrderByTest {
 	@BeforeEach
 	public void setUp(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTypeValidationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTypeValidationTests.java
index accfa93466c9..5a90e7550838 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTypeValidationTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaTypeValidationTests.java
@@ -53,6 +53,20 @@ public void testHhh17001(SessionFactoryScope scope) {
 		);
 	}
 
+	@Test
+	@JiraKey( "HHH-20313" )
+	public void testCompareDoubleToInteger(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					final HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
+					final CriteriaQuery<Parent> cq = cb.createQuery(Parent.class);
+					final Root<Parent> root = cq.from(Parent.class);
+					cq.where( cb.lt( root.get( "price" ), cb.prod( cb.literal( 54 ), 2 ) ) );
+					session.createQuery(cq).getResultList();
+				}
+		);
+	}
+
 
 	@Entity(name = "Parent")
 	public static class Parent {
@@ -60,6 +74,7 @@ public static class Parent {
 		private Long id;
 
 		private String name;
+		private Double price;
 
 		@OneToMany(mappedBy = "parent", fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
 		private Set<Child> children = new HashSet<>();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java
index a00b9cedcd33..62d8c1b9e8b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaWindowFunctionTest.java
@@ -285,6 +285,7 @@ public void testReusableWindow(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix bug when a parameter is used inside of sum() that has an over() clause")
 	public void testSumWithFilterAndWindow(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectionSpecificationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectionSpecificationTest.java
new file mode 100644
index 000000000000..ab0d8aabaa85
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SelectionSpecificationTest.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.query.criteria;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.orm.test.query.criteria.SelectionSpecificationTest_.Person_;
+import org.hibernate.query.restriction.Restriction;
+import org.hibernate.query.specification.SelectionSpecification;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses = SelectionSpecificationTest.Person.class)
+public class SelectionSpecificationTest {
+
+	@Test
+	public void testCountAndExists(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Person person = new Person();
+			person.id = 1L;
+			person.name = "Gavin";
+			session.persist( person );
+			person = new Person();
+			person.id = 2L;
+			person.name = "Steve";
+			session.persist( person );
+		} );
+
+		scope.inTransaction( session -> {
+			var spec = SelectionSpecification.create( Person.class );
+
+			assertEquals( 2L,
+					spec.createCountProjection().createQuery( session ).getSingleResult() );
+			assertTrue( spec.createExistsProjection().createQuery( session ).getSingleResult() );
+
+			spec.restrict( Restriction.equal( Person_.name, "Gavin" ) );
+
+			assertEquals( 1L,
+					spec.createCountProjection().createQuery( session ).getSingleResult() );
+			assertTrue( spec.createExistsProjection().createQuery( session ).getSingleResult() );
+
+			spec.restrict( Restriction.equal( Person_.name, "Emmanuel" ) );
+
+			assertEquals( 0L,
+					spec.createCountProjection().createQuery( session ).getSingleResult() );
+
+			assertFalse( spec.createExistsProjection().createQuery( session ).getSingleResult() );
+		} );
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+		@Id
+		Long id;
+
+		String name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java
index 6e638a496a06..63d2a4b9e14c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/SubQueryTests.java
@@ -7,7 +7,9 @@
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 
 import org.hibernate.testing.orm.domain.gambit.BasicEntity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -23,6 +25,7 @@
  */
 @DomainModel( annotatedClasses = BasicEntity.class )
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsAllQuantifiedSubqueriesWithComparison.class )
 public class SubQueryTests {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java
index 3f9209d8750e..ccb4d435d795 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFilterClauseTest.java
@@ -85,7 +85,7 @@ public void prepareData(SessionFactoryScope scope) {
 
 	@AfterAll
 	public void tearDown(SessionFactoryScope scope) {
-		scope.dropData();
+		// scope.dropData();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java
index 8b16e0a25de0..e5c9fa6b3a2c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AggregateFunctionsWithSubSelectTest.java
@@ -23,7 +23,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -41,7 +41,7 @@
 )
 @SessionFactory
 public class AggregateFunctionsWithSubSelectTest {
-	@BeforeEach
+	@BeforeAll
 	protected void prepareTest(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -68,7 +68,7 @@ protected void prepareTest(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java
index 62eef70d46a8..48acca091924 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CastNullSelectExpressionTest.java
@@ -14,7 +14,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -89,7 +89,7 @@ public void testSelectNull(SessionFactoryScope scope) {
 		);
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void createTestData(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -104,7 +104,7 @@ public void createTestData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity( name= "Person" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CollateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CollateTests.java
index 5eba1b57de89..abc2064d3937 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CollateTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CollateTests.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.query.hql;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
@@ -14,6 +15,7 @@
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -47,7 +49,9 @@ public void prepareData(SessionFactoryScope scope) {
 		);
 	}
 
-	@Test @RequiresDialect(PostgreSQLDialect.class)
+	@Test
+	@RequiresDialect(PostgreSQLDialect.class)
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support COLLATE clause" )
 	public void testCollatePostgreSQL(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java
index a9d25d9411ca..57e4b7a133ea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/CountExpressionTest.java
@@ -11,12 +11,10 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.MapKeyColumn;
 import jakarta.persistence.OneToMany;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -93,8 +91,8 @@ public void testCountDistinctExpression(SessionFactoryScope scope) {
 
 	@Test
 	@JiraKey(value = "HHH-11042")
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "Informix allows only one column in count(distinct)")
+//	@SkipForDialect(dialectClass = InformixDialect.class,
+//			reason = "Informix allows only one column in count(distinct)")
 	public void testCountDistinctTuple(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			List results = session.createQuery(
@@ -117,8 +115,8 @@ public void testCountDistinctTuple(SessionFactoryScope scope) {
 
 	@Test
 	@JiraKey(value = "HHH-11042")
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "Informix allows only one column in count(distinct)")
+//	@SkipForDialect(dialectClass = InformixDialect.class,
+//			reason = "Informix allows only one column in count(distinct)")
 	public void testCountDistinctTupleSanity(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			// A simple concatenation of tuple arguments would produce a distinct count of 1 in this case
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DistinctFromTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DistinctFromTest.java
index a86ffdf62741..736f4059ca64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DistinctFromTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DistinctFromTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.query.hql;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.SybaseDialect;
 
 import org.hibernate.testing.orm.domain.StandardDomainModel;
@@ -25,6 +26,7 @@
 @ServiceRegistry
 @DomainModel(standardModels = StandardDomainModel.GAMBIT)
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support IS DISTINCT FROM")
 public class DistinctFromTest {
 
 	@BeforeAll
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java
index fc50575f745a..481b6ccf88f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java
@@ -15,7 +15,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -68,7 +68,7 @@ public void testAsParameterReuseInWhereClause2(SessionFactoryScope scope) {
 		);
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -84,7 +84,7 @@ public void setUp(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity(name = "Person")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java
index 2b88b279e27c..89f01395d923 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddedIdTest.java
@@ -15,7 +15,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -32,7 +32,7 @@
 @SessionFactory
 public class EmbeddedIdTest {
 
-	@BeforeEach
+	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
 			final Person person = new Person( 1, "Chris" );
@@ -46,7 +46,7 @@ public void setUp(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java
index 28a1a2c33ef0..03e49a37ee14 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java
@@ -38,7 +38,7 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.core.Is.is;
@@ -279,7 +279,7 @@ public void testEntityCrossJoinWithoutPredicate(SessionFactoryScope scope) {
 		);
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void createTestData(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -295,11 +295,11 @@ public void createTestData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity(name = "Customer")
-	@Table(name = "`a:customer`")
+	@Table(name = "`a_customer`")
 	public static class Customer {
 		private Integer id;
 		private String name;
@@ -331,7 +331,7 @@ public void setName(String name) {
 	}
 
 	@Entity(name = "FinancialRecord")
-	@Table(name = "`a:financial_record`")
+	@Table(name = "`a_financial_record`")
 	public static class FinancialRecord {
 		private Integer id;
 		private Customer customer;
@@ -375,7 +375,7 @@ public void setLastUpdateBy(String lastUpdateBy) {
 	}
 
 	@Entity(name = "User")
-	@Table(name = "`a:user`")
+	@Table(name = "`a_user`")
 	public static class User {
 		private Integer id;
 		private String username;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FloatLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FloatLiteralTest.java
new file mode 100644
index 000000000000..d19e9d47a2e7
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FloatLiteralTest.java
@@ -0,0 +1,30 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.query.hql;
+
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Jpa(useCollectingStatementInspector = true)
+class FloatLiteralTest {
+	@Test void test(EntityManagerFactoryScope scope) {
+		final SQLStatementInspector statementInspector = scope.getCollectingStatementInspector();
+		statementInspector.clear();
+		scope.inEntityManager( em -> {
+			Object halfFloat = em.createQuery( "select 1f/2f" ).getSingleResult();
+			assertEquals(0.5f, halfFloat);
+			Object halfDouble = em.createQuery( "select 1d/2d" ).getSingleResult();
+			assertEquals(0.5d, halfDouble);
+		} );
+		for ( String sql : statementInspector.getSqlQueries() ) {
+			assertTrue( sql.replaceAll( "\\s+", "" ).contains( "(1.0/2.0)" ) );
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java
index fc9d35739246..77c33fb1afc6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionAndEnumsTest.java
@@ -11,7 +11,7 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
@@ -31,7 +31,7 @@
 public class FunctionAndEnumsTest {
 
 
-	@BeforeEach
+	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java
index 4f05ed67cb75..cf4502f1e602 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/FunctionTests.java
@@ -12,6 +12,7 @@
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.community.dialect.FirebirdDialect;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.community.dialect.DerbyDialect;
@@ -25,6 +26,7 @@
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.PostgresPlusDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.community.dialect.TiDBDialect;
@@ -592,6 +594,7 @@ public void testRoundTruncFunctions(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsDateTimeTruncation.class )
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Emulator bug with date_trunc")
 	public void testDateTruncFunction(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -621,6 +624,7 @@ public void testDateTruncFunction(SessionFactoryScope scope) {
 	@Test
 	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsDateTimeTruncation.class )
 	@SkipForDialect(dialectClass = OracleDialect.class, reason = "See HHH-16442, Oracle trunc() throws away the timezone")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Emulator bug")
 	public void testDateTruncWithOffsetFunction(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -1187,6 +1191,7 @@ public void testCastFunctionWithLength(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "HSQL interprets string as hex literal and produces error")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "No cast from varchar to byte")
 	@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "GaussDB bytea doesn't have a length")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner bytea doesn't have a length")
 	public void testCastBinaryWithLength(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -1202,6 +1207,7 @@ public void testCastBinaryWithLength(SessionFactoryScope scope) {
 	@Test
 	@SkipForDialect(dialectClass = DerbyDialect.class, reason = "Derby doesn't support casting varchar to binary")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix does not support binary literals")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner does not support casting with length")
 	public void testCastBinaryWithLengthForOracle(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -1217,6 +1223,7 @@ public void testCastBinaryWithLengthForOracle(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = PostgresPlusDialect.class, reason = "PostgresPlus bytea doesn't have a length")
 	@SkipForDialect(dialectClass = CockroachDialect.class, reason = "CockroachDB bytes doesn't have a length")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix does not support binary literals")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner does not support casting with length")
 	public void testCastBinaryWithLengthForDerby(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -1328,9 +1335,17 @@ public void testAggregateFunctions(SessionFactoryScope scope) {
 	}
 
 	@Test
-	public void testStatisticalFunctions(SessionFactoryScope scope) {
+	public void testSampleStatisticalFunctions(SessionFactoryScope scope) {
 		scope.inTransaction(
-				session -> session.createQuery( "select var_samp(e.theDouble), var_pop(abs(e.theDouble)), stddev_samp(e.theDouble), stddev_pop(e.theDouble) from EntityOfBasics e", Object[].class)
+				session -> session.createQuery( "select var_samp(e.theDouble), stddev_samp(e.theDouble) from EntityOfBasics e", Object[].class)
+						.list()
+		);
+	}
+
+	@Test
+	public void testPopulationStatisticalFunctions(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> session.createQuery( "select var_pop(abs(e.theDouble)), stddev_pop(e.theDouble) from EntityOfBasics e", Object[].class)
 						.list()
 		);
 	}
@@ -1454,6 +1469,7 @@ public void testTimestampAddDiffFunctions(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = MariaDBDialect.class)
 	@SkipForDialect(dialectClass = TiDBDialect.class)
 	@SkipForDialect(dialectClass = CockroachDialect.class, reason = "unsupported binary operator: <timestamptz> - <date>")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "date and timestamp are not compatible")
 	public void testDateAddDiffFunctions(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -1484,6 +1500,8 @@ public void testDatediffFunctionMySQL(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerDialect.class,
+			reason = "spanner timestamp_add/timestamp_diff doesn't support year/month")
 	public void testIntervalAddExpressions(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -1532,6 +1550,8 @@ public void testAddNanosecondsToTime(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerDialect.class,
+			reason = "spanner timestamp_add/timestamp_diff doesn't support year/month")
 	public void testIntervalSubExpressions(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -1759,6 +1779,7 @@ public void testDurationLiterals(SessionFactoryScope scope) {
 	@SkipForDialect( dialectClass = TiDBDialect.class, reason = "Bug in the TiDB timestampadd function (https://github.com/pingcap/tidb/issues/41052)")
 	@SkipForDialect( dialectClass = AltibaseDialect.class, reason = "Altibase returns 2025-03-31 as a result of select {2024-02-29} + 13 month")
 	@SkipForDialect( dialectClass = FirebirdDialect.class, reason = "Firebird returns 2025-03-31 as a result of select {2024-02-29} + 13 month")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner bug in current_date which is not considering timezone")
 	public void testDurationArithmetic(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -1829,6 +1850,36 @@ public void testDurationArithmeticOverflowing(SessionFactoryScope scope) {
 		);
 	}
 
+	@Test
+	public void testParameterArithmetic(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.createQuery( "select :dt + 1 day" )
+							.setParameter( "dt", LocalDateTime.now() )
+							.getSingleResult();
+					assertEquals( 2,
+							session.createQuery( "select :i + 1" )
+									.setParameter( "i", 1)
+									.getSingleResult() );
+					assertEquals( 3,
+							session.createQuery( "select 1 + :i" )
+									.setParameter( "i", 2)
+									.getSingleResult() );
+					// informix pads with a lot of spaces
+					if ( !(scope.getSessionFactory().getJdbcServices().getDialect() instanceof InformixDialect)) {
+						assertEquals( "hello world",
+								session.createQuery( "select :greet || ' world'" )
+										.setParameter( "greet", "hello")
+										.getSingleResult() );
+						assertEquals( "hello world",
+								session.createQuery( "select 'hello ' || :name" )
+										.setParameter( "name", "world" )
+										.getSingleResult() );
+					}
+				}
+		);
+	}
+
 	@Test
 	public void testDurationArithmeticWithLiterals(SessionFactoryScope scope) {
 		scope.inTransaction(
@@ -1971,6 +2022,8 @@ public void testTimeDurationArithmeticWrapAroundWithLiterals(SessionFactoryScope
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "Spanner bug in current_date which is not considering timezone")
 	public void testDateDurationArithmeticWithLiterals(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -2067,6 +2120,8 @@ public void testIntervalDiffExpressions(SessionFactoryScope scope) {
 	@Test
 	@SkipForDialect(dialectClass = PostgresPlusDialect.class,
 			reason = "PT47H59M59.999999S instead of PT48H")
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "PT47H59M59.999999S instead of PT48H")
 	public void testIntervalDiffExpressionsWithAssertions(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -2086,6 +2141,7 @@ public void testIntervalDiffExpressionsWithAssertions(SessionFactoryScope scope)
 			reason = "trivial rounding error")
 	@SkipForDialect(dialectClass = InformixDialect.class,
 			reason = "Overflow occurred on a datetime or interval operation")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "rounding error in Spanner")
 	public void testMoreIntervalDiffExpressions(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -2106,6 +2162,8 @@ public void testMoreIntervalDiffExpressions(SessionFactoryScope scope) {
 			reason = "unsupported binary operator: <date> - <timestamp(6)>")
 	@SkipForDialect(dialectClass = InformixDialect.class,
 			reason = "Intervals or datetimes are incompatible for the operation")
+	@SkipForDialect(dialectClass = SpannerDialect.class,
+			reason = "Spanner date - timestamp not compatible")
 	public void testIntervalDiffExpressionsDifferentTypes(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -2492,6 +2550,18 @@ public void testIn(SessionFactoryScope scope) {
 							session.createQuery("select 1 where 1 in (:list)", Integer.class)
 									.setParameterList("list",List.of())
 									.list().size() );
+					assertEquals( 1,
+							session.createQuery("select 1 where 1 in (:list)", Integer.class)
+									.setParameter("list",List.of(1))
+									.list().size() );
+					assertEquals( 0,
+							session.createQuery("select 1 where 1 in (:list)", Integer.class)
+									.setParameter("list",List.of())
+									.list().size() );
+					assertEquals( 0,
+							session.createQuery("select 1 where 1 in (:list)", Integer.class)
+									.setParameter("list",null)
+									.list().size() );
 					assertEquals( 1,
 							session.createQuery("select 1 where 1 in :list", Integer.class)
 									.setParameterList("list",List.of(1,2))
@@ -2535,6 +2605,7 @@ public void testMaxOverUnion(SessionFactoryScope scope) {
 
 	@Test
 	@SkipForDialect(dialectClass = DerbyDialect.class)
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTimestampComparison.class)
 	public void testBetweenDates(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -2697,6 +2768,7 @@ public void testColumnFunction(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner JDBC driver currently doesn't support reading UUID column as bytes")
 	public void testUUIDColumnFunction(SessionFactoryScope scope) {
 		scope.inTransaction(s -> {
 			byte[] bytes = s.createSelectionQuery("select column(e.theuuid as binary) from EntityOfBasics e", byte[].class)
@@ -2706,7 +2778,9 @@ public void testUUIDColumnFunction(SessionFactoryScope scope) {
 		});
 	}
 
-	@Test @RequiresDialect(PostgreSQLDialect.class)
+	@Test
+	@RequiresDialect(PostgreSQLDialect.class)
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support ctid column")
 	public void testCtidColumnFunction(SessionFactoryScope scope) {
 		scope.inTransaction(s -> {
 			String string = s.createSelectionQuery("select column(e.ctid as String) from EntityOfBasics e", String.class)
@@ -2735,12 +2809,27 @@ public void testSha256Function(SessionFactoryScope scope) {
 			catch (NoSuchAlgorithmException e) {
 				throw new RuntimeException( e );
 			}
-			bytes = s.createSelectionQuery("select md5('hello')", byte[].class).getSingleResult();
-			try {
-				assertArrayEquals( MessageDigest.getInstance( "MD5" ).digest("hello".getBytes()), bytes );
-			}
-			catch (NoSuchAlgorithmException e) {
-				throw new RuntimeException( e );
+		});
+	}
+
+	@Test
+	@RequiresDialect(PostgreSQLDialect.class)
+	@RequiresDialect(MySQLDialect.class)
+	@RequiresDialect(OracleDialect.class)
+	@RequiresDialect(value = DB2Dialect.class, majorVersion = 11)
+	@RequiresDialect(SQLServerDialect.class)
+	@RequiresDialect(H2Dialect.class)
+	@RequiresDialect(HANADialect.class)
+	@RequiresDialect(CockroachDialect.class)
+	@RequiresDialect(value = FirebirdDialect.class, majorVersion = 4)
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support the md5 function")
+	public void testMd5Function(SessionFactoryScope scope) {
+		scope.inTransaction(s -> {
+			byte[] bytes = s.createSelectionQuery("select md5('hello')", byte[].class).getSingleResult();
+				try {
+					assertArrayEquals(MessageDigest.getInstance("MD5").digest("hello".getBytes()), bytes);
+				} catch (NoSuchAlgorithmException e) {
+				throw new RuntimeException(e);
 			}
 		});
 	}
@@ -2748,6 +2837,8 @@ public void testSha256Function(SessionFactoryScope scope) {
 	@Test
 	@SkipForDialect(dialectClass = SybaseASEDialect.class)
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix does not support binary literals")
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "Spanner doesn't support encode/decode functions")
 	public void testHexFunction(SessionFactoryScope scope) {
 		scope.inTransaction(s -> {
 			assertEquals( "DEADBEEF",
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java
index 192cd24a849b..83a39f4c8fb1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java
@@ -16,7 +16,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -109,7 +109,7 @@ public void testGroupByMultipleAliases(SessionFactoryScope scope) {
 		} );
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void prepareData(SessionFactoryScope scope) {
 		scope.inTransaction( (em) -> {
 			Contact entity1 = new Contact( 123, new Contact.Name( "Johnny", "Lawrence" ), Contact.Gender.MALE, LocalDate.of(1970, 1, 1) );
@@ -119,7 +119,7 @@ public void prepareData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java
index af1a03899ac3..1a1cdfd3c1d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HHH17416Test.java
@@ -16,7 +16,7 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 @JiraKey(value = "HHH-17416")
@@ -33,14 +33,14 @@ protected Class<?>[] getAnnotatedClasses() {
 		return new Class<?>[] {Person.class};
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void setup() {
 		inTransaction(session -> session.persist(person));
 	}
 
 	@AfterEach
 	public void teardown() {
-		sessionFactoryScope().getSessionFactory().getSchemaManager().truncate();
+		// sessionFactoryScope().getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java
index 38b491c8cf87..864fed03b65f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/HqlUnionTest.java
@@ -15,7 +15,7 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Entity;
@@ -35,7 +35,7 @@
 @SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix does not support order by in subqueries")
 public class HqlUnionTest {
 
-	@BeforeEach
+	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -52,7 +52,7 @@ public void setUp(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictOnConstraintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictOnConstraintTest.java
index 4f25883ba759..2377736ecda8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictOnConstraintTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictOnConstraintTest.java
@@ -10,6 +10,7 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
 import org.hibernate.community.dialect.DerbyDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.MySQLDialect;
@@ -20,12 +21,15 @@
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @SessionFactory
 @DomainModel(annotatedClasses = InsertConflictOnConstraintTest.Constrained.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+		reason = "ON CONFLICT DO UPDATE with constraint name is not supported")
 public class InsertConflictOnConstraintTest {
 
 	@RequiresDialect(PostgreSQLDialect.class)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java
index dd0d0c42d02f..01b162eeeccd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictTests.java
@@ -8,7 +8,9 @@
 
 import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.community.dialect.GaussDBDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaConflictClause;
@@ -59,13 +61,16 @@ public void cleanupData(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "ON CONFLICT clause with empty conflict target in INSERT statement is not supported")
+	@SkipForDialect( dialectClass = SpannerDialect.class, reason = "UNIMPLEMENTED: ON CONFLICT clause with empty conflict target in INSERT statement is not supported in Emulator")
 	public void testOnConflictDoNothing(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					int updated = session.createMutationQuery(
 							"insert into BasicEntity (id, data) " +
-									"values (1, 'John') " +
-									"on conflict do nothing"
+							"values (1, 'John') " +
+							"on conflict do nothing"
 					).executeUpdate();
 					if ( scope.getSessionFactory().getJdbcServices().getDialect() instanceof MySQLDialect ) {
 						// Since JDBC set the MySQL CLIENT_FOUND_ROWS flag, the updated count is 1 even if values didn't change
@@ -111,6 +116,8 @@ public void testOnConflictDoUpdate(SessionFactoryScope scope) {
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUpsertOrMerge.class)
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "MATCHED does not support AND condition")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "Spanner does not support predicates (WHERE clause) in conflict clauses")
 	public void testOnConflictDoUpdateWithWhere(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -146,6 +153,8 @@ else if ( scope.getSessionFactory().getJdbcServices().getDialect() instanceof Ga
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUpsertOrMerge.class)
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "MATCHED does not support AND condition")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "Spanner does not support predicates (WHERE clause) in conflict clauses")
 	public void testOnConflictDoUpdateWithWhereCriteria(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -185,6 +194,10 @@ else if ( scope.getSessionFactory().getJdbcServices().getDialect() instanceof Ga
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerDialect.class,
+			reason = "Cloud Spanner does not support ON CONFLICT clauses for INSERT ... SELECT statements")
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "ON CONFLICT clause with empty conflict target in INSERT statement is not supported")
 	public void testOnConflictDoNothingMultiTable(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -211,6 +224,8 @@ public void testOnConflictDoNothingMultiTable(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUpsertOrMerge.class)
+	@SkipForDialect( dialectClass = SpannerDialect.class,
+			reason = "Cloud Spanner does not support ON CONFLICT clauses for INSERT ... SELECT statements")
 	@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "MERGE into a table that has a self-referential FK does not work")
 	public void testOnConflictDoUpdateMultiTable(SessionFactoryScope scope) {
 		scope.inTransaction(
@@ -239,8 +254,12 @@ public void testOnConflictDoUpdateMultiTable(SessionFactoryScope scope) {
 
 	@Test
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUpsertOrMerge.class)
+	@SkipForDialect( dialectClass = SpannerDialect.class,
+			reason = "Cloud Spanner does not support ON CONFLICT clauses for INSERT ... SELECT statements")
 	@SkipForDialect(dialectClass = SybaseASEDialect.class, reason = "MERGE into a table that has a self-referential FK does not work")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "MATCHED does not support AND condition")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "Spanner does not support predicates (WHERE clause) in conflict clauses")
 	public void testOnConflictDoUpdateWithWhereMultiTable(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictWithCriteriaCopyTreeEnabledTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictWithCriteriaCopyTreeEnabledTests.java
index 5df94e23a97d..42a8ee991f95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictWithCriteriaCopyTreeEnabledTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertConflictWithCriteriaCopyTreeEnabledTests.java
@@ -8,6 +8,8 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Tuple;
 import org.hibernate.cfg.QuerySettings;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaInsertSelect;
 import org.hibernate.query.criteria.JpaCriteriaInsertValues;
@@ -18,6 +20,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 
@@ -32,6 +35,9 @@
 )
 @SessionFactory
 @JiraKey("HHH-19314")
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+		reason = "ON CONFLICT clause with empty conflict target in INSERT statement is not supported")
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "UNIMPLEMENTED: ON CONFLICT clause with empty conflict target in INSERT statement is not supported in Emulator")
 public class InsertConflictWithCriteriaCopyTreeEnabledTests {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectLegacyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectLegacyTest.java
new file mode 100644
index 000000000000..d3e58a0233ba
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectLegacyTest.java
@@ -0,0 +1,82 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.query.hql;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.id.enhanced.LegacyNamingStrategy;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@DomainModel(
+		annotatedClasses = {
+				InsertSelectLegacyTest.Person.class,
+				InsertSelectLegacyTest.Document.class
+		}
+)
+@ServiceRegistry(
+		settings = {
+				@Setting(name = AvailableSettings.SHOW_SQL, value = "true"),
+				@Setting(name = AvailableSettings.FORMAT_SQL, value = "true"),
+				@Setting(name = AvailableSettings.ID_DB_STRUCTURE_NAMING_STRATEGY,
+						value = LegacyNamingStrategy.STRATEGY_NAME)
+		}
+)
+@SessionFactory
+public class InsertSelectLegacyTest {
+
+	@Test
+	@JiraKey(value = "HHH-18835")
+	void testInsertSelect(SessionFactoryScope scope) {
+
+		scope.inTransaction( session -> {
+			Person person = new Person();
+			person.name = "Peter";
+			session.persist( person );
+
+			session.createMutationQuery(
+							"insert into Document(name,owner) select concat(p.name,'s document'), p from Person p" )
+					.executeUpdate();
+
+			Document document = session.createQuery( "select d from Document d", Document.class ).getSingleResult();
+			assertNotNull( document );
+			assertEquals( "Peters document", document.name );
+		} );
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		@GeneratedValue
+		Long id;
+
+		String name;
+	}
+
+	@Entity(name = "Document")
+	public static class Document {
+
+		@Id
+		@GeneratedValue
+		Long id;
+
+		String name;
+
+		@ManyToOne
+		Person owner;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java
index 2027a277ee4b..e27e83982fbf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/InsertSelectTests.java
@@ -4,7 +4,9 @@
  */
 package org.hibernate.orm.test.query.hql;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.community.dialect.DerbyDialect;
+import org.hibernate.dialect.SpannerDialect;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
@@ -67,6 +69,8 @@ public void testInsertSelectGeneratedAssigned(SessionFactoryScope scope) {
 	@JiraKey( value = "HHH-15531")
 	@SkipForDialect(dialectClass = DerbyDialect.class, reason = "Derby doesn't really support window functions, " +
 			"but this requires the use of a dense_rank window function. We could emulate this, but don't think it's worth it")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support dense_rank or row_number")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner doesn't support dense_rank or row_number")
 	public void testInsertSelectDistinct(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java
index d090c0779f65..037df2b722bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/IsEmptyPredicateTest.java
@@ -17,7 +17,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -59,7 +59,7 @@ public void testEmptinessPredicatesWithJoin(SessionFactoryScope scope) {
 		} );
 	}
 
-	@BeforeEach
+	@BeforeAll
 	protected void prepareTestData(SessionFactoryScope scope) {
 		scope.inTransaction( (session) -> {
 			Person personaWithoutNickname = new Person();
@@ -81,7 +81,7 @@ protected void prepareTestData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity(name = "Person")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java
index de7d8b59a913..72c319fe9a5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LikeEscapeDefaultTest.java
@@ -17,7 +17,7 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,7 +31,7 @@
 )
 @SessionFactory
 public class LikeEscapeDefaultTest {
-	@BeforeEach
+	@BeforeAll
 	public void prepareData(SessionFactoryScope scope) {
 		scope.inTransaction(
 				em -> {
@@ -47,7 +47,7 @@ public void prepareData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java
index 95eaf9358960..7a6af91cbd4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/MultiValuedParameterTest.java
@@ -17,10 +17,12 @@
 import org.hibernate.testing.orm.domain.contacts.Contact;
 import org.hibernate.testing.orm.domain.contacts.ContactsDomainModel;
 import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Entity;
@@ -33,6 +35,7 @@
 /**
  * @author Andrea Boriero
  */
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNumericPrimaryKey.class )
 public class MultiValuedParameterTest extends BaseSessionFactoryFunctionalTest {
 
 	@Override
@@ -42,7 +45,7 @@ protected void applyMetadataSources(MetadataSources metadataSources) {
 		metadataSources.addAnnotatedClass( EntityWithNumericId.class );
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void prepareData() {
 		inTransaction(
 				session -> {
@@ -121,7 +124,7 @@ void testMultiValuedBigDecimals() {
 
 	@AfterEach
 	public void cleanupData() {
-		sessionFactoryScope().getSessionFactory().getSchemaManager().truncate();
+		// sessionFactoryScope().getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity( name = "EntityWithNumericId" )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java
index 0cf9a9923e8a..3410b2d96d03 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java
@@ -18,7 +18,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -55,7 +55,7 @@ public void testQueryWithSingleParameters(SessionFactoryScope scope) {
 		);
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -66,7 +66,7 @@ public void setUp(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Entity(name = "VideoGame")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java
index 2c6150620a5f..549be91f9e57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java
@@ -18,7 +18,7 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
@@ -61,7 +61,7 @@ public class OrderByTests {
 	Human zoo2Director2;
 
 
-	@BeforeEach
+	@BeforeAll
 	private void createData(SessionFactoryScope scope) {
 		stateProvince = new StateProvince();
 		stateProvince.setName( "IL" );
@@ -144,7 +144,7 @@ private void createData(SessionFactoryScope scope) {
 
 	@AfterEach
 	private void cleanupData(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+		// scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java
index 42faeadd4f95..b97899b23b5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderedSetAggregateTest.java
@@ -20,7 +20,7 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Tuple;
@@ -36,7 +36,7 @@
 @SessionFactory
 public class OrderedSetAggregateTest {
 
-	@BeforeEach
+	@BeforeAll
 	public void prepareData(SessionFactoryScope scope) {
 		scope.inTransaction(
 				em -> {
@@ -95,7 +95,7 @@ public void prepareData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java
index c85e0617afdf..2845927f0922 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationTest.java
@@ -14,6 +14,8 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 /**
  * @author Andrea Boriero
  */
@@ -40,6 +42,17 @@ public void testSetParameterWithArrayWithNullElement(SessionFactoryScope scope)
 		);
 	}
 
+	@Test
+	public void testSetParameterWithArrayWithNullElementWrongType(SessionFactoryScope scope) {
+		// SimpleEntity#id is of type Integer
+		assertThrows( IllegalArgumentException.class, () ->
+				scope.inTransaction( (session) ->
+						session.createQuery( "from EntityWithBasicArray e where e.strings = :p" )
+								.setParameter( "p", new Integer[]{null, 1} )
+				)
+		);
+	}
+
 	@Entity(name = "EntityWithBasicArray")
 	public static class EntityWithBasicArray {
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/RegexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/RegexTest.java
index 315d53af2d68..eaf2baa8b87c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/RegexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/RegexTest.java
@@ -4,8 +4,8 @@
  */
 package org.hibernate.orm.test.query.hql;
 
-import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java
index ffd34a8c55a5..a9bc6b85755c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java
@@ -15,7 +15,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -34,7 +34,7 @@
 @SessionFactory
 public class ScrollableTest {
 
-	@BeforeEach
+	@BeforeAll
 	public void prepareTest(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			session.persist( new MyEntity( 1L, "entity_1" ) );
@@ -44,7 +44,7 @@ public void prepareTest(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void cleanupTest(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+		// scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java
index daa04e995cb6..39059e0b1b05 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java
@@ -15,6 +15,7 @@
 
 import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.CockroachDialect;
+import org.hibernate.dialect.SpannerDialect;
 
 import org.hamcrest.number.IsCloseTo;
 import org.hibernate.testing.orm.domain.StandardDomainModel;
@@ -400,6 +401,8 @@ public void testStrFunction(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerDialect.class,
+			reason = "spanner timestamp_add/timestamp_diff doesn't support year/month")
 	public void testIntervalAddExpressions(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -436,6 +439,8 @@ public void testIntervalAddExpressions(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = SpannerDialect.class,
+			reason = "spanner timestamp_add/timestamp_diff doesn't support year/month")
 	public void testIntervalSubExpressions(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -571,6 +576,7 @@ public void testIntervalDiffExpressions(SessionFactoryScope scope) {
 			reason = "unsupported binary operator: <date> - <timestamp(6)>")
 	@SkipForDialect(dialectClass = InformixDialect.class,
 			reason = "Intervals or datetimes are incompatible for the operation")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "date and timestamp are not compatible")
 	public void testIntervalDiffExpressionsDifferentTypes(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java
index e45db73753e2..337a1d6c2a1d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java
@@ -14,7 +14,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -38,7 +38,7 @@ public void testSubqueryLimitOffset(SessionFactoryScope scope) {
 				} );
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -67,6 +67,6 @@ public void setUp(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java
index e8b0a81e89e4..811481b1954b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java
@@ -16,7 +16,7 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -99,7 +99,7 @@ public void testExists(SessionFactoryScope scope) {
 		);
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -129,6 +129,6 @@ public void setUp(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java
index 1d8f5738129c..18b9f7d2245f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ToOneFetchAndJoinTest.java
@@ -14,7 +14,7 @@
 import org.hibernate.orm.test.hql.fetchAndJoin.Entity2;
 import org.hibernate.orm.test.hql.fetchAndJoin.Entity3;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -112,7 +112,7 @@ public void testExplicitJoinAfterFetchJoins(SessionFactoryScope scope) {
 		);
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void setupData(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -139,6 +139,6 @@ public void setupData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void cleanupData(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TruncConvertedDatetimeAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TruncConvertedDatetimeAttributeTest.java
index a9a4b9a272db..068ed78a6150 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TruncConvertedDatetimeAttributeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TruncConvertedDatetimeAttributeTest.java
@@ -13,12 +13,14 @@
 import java.util.Date;
 import java.util.GregorianCalendar;
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -53,6 +55,7 @@ public void tearDown(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Emulator bug with date_trunc")
 	public void testTruncSelection(SessionFactoryScope scope) {
 		scope.inSession( session -> {
 			assertThat( session.createQuery(
@@ -67,6 +70,7 @@ public void testTruncSelection(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTimestampWithDateComparison.class)
 	public void testTruncComparison(SessionFactoryScope scope) {
 		scope.inSession( session -> {
 			assertThat( session.createQuery(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java
index ab8a59ee80ad..9b1d76027d2e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java
@@ -12,7 +12,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -45,7 +45,7 @@ public void testSelectTuple(SessionFactoryScope scope) {
 		);
 	}
 
-	@BeforeEach
+	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -64,6 +64,6 @@ public void setUp(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UnionAllSelectNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UnionAllSelectNullTest.java
index 778317bb10f5..c42972917286 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UnionAllSelectNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/UnionAllSelectNullTest.java
@@ -12,7 +12,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
@@ -31,7 +31,7 @@
 @JiraKey("HHH-18720")
 class UnionAllSelectNullTest {
 
-	@BeforeEach
+	@BeforeAll
 	public void setUp(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -43,7 +43,7 @@ public void setUp(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java
index 27e96b2ea2c5..a09db2b9d9d3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WindowFunctionTest.java
@@ -20,7 +20,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.TypedQuery;
@@ -38,7 +38,7 @@
 @SessionFactory
 public class WindowFunctionTest {
 
-	@BeforeEach
+	@BeforeAll
 	public void prepareData(SessionFactoryScope scope) {
 		scope.inTransaction(
 				em -> {
@@ -97,7 +97,7 @@ public void prepareData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java
index 14189a88d178..51bc343e77e8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/WithClauseJoinRewriteTest.java
@@ -78,7 +78,7 @@ public void setName(String name) {
 			this.name = name;
 		}
 
-		@ManyToMany( targetEntity = AbstractConfigurationObject.class, fetch = FetchType.LAZY, cascade = {} )
+		@ManyToMany(fetch = FetchType.LAZY, cascade = {})
 		public Set<ConfigurationObject> getUses () {
 			return uses;
 		}
@@ -87,7 +87,7 @@ public void setUses(Set<ConfigurationObject> uses) {
 			this.uses = uses;
 		}
 
-		@ManyToMany ( targetEntity = AbstractConfigurationObject.class, fetch = FetchType.LAZY, mappedBy = "uses", cascade = {} )
+		@ManyToMany(fetch = FetchType.LAZY, mappedBy = "uses", cascade = {})
 		public Set<ConfigurationObject> getUsedBy () {
 			return usedBy;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/XmlFunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/XmlFunctionTests.java
index 238dcea705ff..d8d96a63139d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/XmlFunctionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/XmlFunctionTests.java
@@ -36,7 +36,7 @@
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Entity;
@@ -62,7 +62,7 @@ public class XmlFunctionTests {
 
 	XmlHolder entity;
 
-	@BeforeEach
+	@BeforeAll
 	public void prepareData(SessionFactoryScope scope) {
 		scope.inTransaction(
 				em -> {
@@ -104,7 +104,7 @@ public void prepareData(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void cleanupData(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		// scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java
index fbb4a0113905..1ac2c9d34afa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java
@@ -19,22 +19,15 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
-import org.junit.jupiter.api.AfterAll;
+import org.jboss.logging.Logger;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.LoggerConfig;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hibernate.testing.logger.LogLevelContext.withLevel;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -48,77 +41,54 @@
 @DomainModel(annotatedClasses = { TestEntity.class, AggregateEntity.class })
 @SessionFactory(generateStatistics = true)
 public class QueryResultCacheTests {
-	private final LoggerContext context = (LoggerContext) LogManager.getContext( false );
-	private final Configuration configuration = context.getConfiguration();
-	private final LoggerConfig resultsLoggerConfig = configuration.getLoggerConfig( ResultsLogger.LOGGER_NAME );
-	private final LoggerConfig execLoggerConfig = configuration.getLoggerConfig( SqlExecLogger.LOGGER_NAME );
-	private final LoggerConfig cacheLoggerConfig = configuration.getLoggerConfig( SecondLevelCacheLogger.LOGGER_NAME );
-
-	Logger resultsLogger = LogManager.getLogger( ResultsLogger.LOGGER_NAME );
-
-	private Level originalResultsLevel;
-	private Level originalExecLevel;
-	private Level originalCacheLevel;
-
-	@BeforeAll
-	public void setUpLogger() {
-		originalResultsLevel = resultsLoggerConfig.getLevel();
-		resultsLoggerConfig.setLevel( Level.TRACE );
-
-		originalExecLevel = execLoggerConfig.getLevel();
-		execLoggerConfig.setLevel( Level.TRACE );
 
-		originalCacheLevel = cacheLoggerConfig.getLevel();
-		cacheLoggerConfig.setLevel( Level.TRACE );
-	}
-
-	@AfterAll
-	public void resetLogger() {
-		resultsLoggerConfig.setLevel( originalResultsLevel );
-		execLoggerConfig.setLevel( originalExecLevel );
-		cacheLoggerConfig.setLevel( originalCacheLevel );
-	}
+	Logger resultsLogger = ResultsLogger.RESULTS_LOGGER;
 
 	@Test
 	public void testScalarCaching(SessionFactoryScope scope) {
-		final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
-		statistics.clear();
+		try (var l1 = withLevel( ResultsLogger.LOGGER_NAME, Logger.Level.TRACE );
+			var l2 = withLevel( SqlExecLogger.LOGGER_NAME, Logger.Level.TRACE );
+			var l3 = withLevel( SecondLevelCacheLogger.LOGGER_NAME, Logger.Level.TRACE );) {
 
-		assertThat( statistics.getPrepareStatementCount(), is( 0L ) );
+			final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
+			statistics.clear();
 
-		final String hql = "select e.id, e.name from TestEntity e order by e.id";
+			assertThat( statistics.getPrepareStatementCount(), is( 0L ) );
 
-		scope.inTransaction(
-				session -> {
-					resultsLogger.debug( "First query ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
+			final String hql = "select e.id, e.name from TestEntity e order by e.id";
 
-					final List values = session.createQuery( hql )
-							.setCacheable( true )
-							.setCacheMode( CacheMode.NORMAL )
-							.setCacheRegion( "scalar-region" )
-							.list();
+			scope.inTransaction(
+					session -> {
+						resultsLogger.debug( "First query ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
 
-					assertThat( statistics.getPrepareStatementCount(), is( 1L ) );
+						final List values = session.createQuery( hql )
+								.setCacheable( true )
+								.setCacheMode( CacheMode.NORMAL )
+								.setCacheRegion( "scalar-region" )
+								.list();
 
-					verifyScalarResults( values );
-				}
-		);
+						assertThat( statistics.getPrepareStatementCount(), is( 1L ) );
 
-		scope.inTransaction(
-				session -> {
-					resultsLogger.debug( "Second query ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
+						verifyScalarResults( values );
+					}
+			);
 
-					final List values = session.createQuery( hql )
-							.setCacheable( true )
-							.setCacheMode( CacheMode.NORMAL )
-							.setCacheRegion( "scalar-region" )
-							.list();
+			scope.inTransaction(
+					session -> {
+						resultsLogger.debug( "Second query ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
 
-					assertThat( statistics.getPrepareStatementCount(), is( 1L ) );
+						final List values = session.createQuery( hql )
+								.setCacheable( true )
+								.setCacheMode( CacheMode.NORMAL )
+								.setCacheRegion( "scalar-region" )
+								.list();
 
-					verifyScalarResults( values );
-				}
-		);
+						assertThat( statistics.getPrepareStatementCount(), is( 1L ) );
+
+						verifyScalarResults( values );
+					}
+			);
+		}
 	}
 
 	private void verifyScalarResults(List values) {
@@ -133,44 +103,48 @@ private void verifyScalarResults(List values) {
 
 	@Test
 	public void testJoinFetchCaching(SessionFactoryScope scope) {
-		final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
-		statistics.clear();
+		try (var l1 = withLevel( ResultsLogger.LOGGER_NAME, Logger.Level.TRACE );
+			var l2 = withLevel( SqlExecLogger.LOGGER_NAME, Logger.Level.TRACE );
+			var l3 = withLevel( SecondLevelCacheLogger.LOGGER_NAME, Logger.Level.TRACE );) {
+			final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics();
+			statistics.clear();
 
-		assertThat( statistics.getPrepareStatementCount(), is( 0L ) );
+			assertThat( statistics.getPrepareStatementCount(), is( 0L ) );
 
-		final String hql = "select e from AggregateEntity e join fetch e.value1 join fetch e.value2";
+			final String hql = "select e from AggregateEntity e join fetch e.value1 join fetch e.value2";
 
-		scope.inTransaction(
-				session -> {
-					resultsLogger.debug( "First query ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
+			scope.inTransaction(
+					session -> {
+						resultsLogger.debug( "First query ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
 
-					final List<AggregateEntity> values = session.createQuery( hql, AggregateEntity.class )
-							.setCacheable( true )
-							.setCacheMode( CacheMode.NORMAL )
-							.setCacheRegion( "fetch-region" )
-							.list();
+						final List<AggregateEntity> values = session.createQuery( hql, AggregateEntity.class )
+								.setCacheable( true )
+								.setCacheMode( CacheMode.NORMAL )
+								.setCacheRegion( "fetch-region" )
+								.list();
 
-					verifyFetchResults( values );
+						verifyFetchResults( values );
 
-					assertThat( statistics.getPrepareStatementCount(), is( 1L ) );
-				}
-		);
+						assertThat( statistics.getPrepareStatementCount(), is( 1L ) );
+					}
+			);
 
-		scope.inTransaction(
-				session -> {
-					resultsLogger.debug( "Second query ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
+			scope.inTransaction(
+					session -> {
+						resultsLogger.debug( "Second query ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
 
-					final List<AggregateEntity> values = session.createQuery( hql, AggregateEntity.class )
-							.setCacheable( true )
-							.setCacheMode( CacheMode.NORMAL )
-							.setCacheRegion( "fetch-region" )
-							.list();
+						final List<AggregateEntity> values = session.createQuery( hql, AggregateEntity.class )
+								.setCacheable( true )
+								.setCacheMode( CacheMode.NORMAL )
+								.setCacheRegion( "fetch-region" )
+								.list();
 
-					verifyFetchResults( values );
+						verifyFetchResults( values );
 
-					assertThat( statistics.getPrepareStatementCount(), is( 1L ) );
-				}
-		);
+						assertThat( statistics.getPrepareStatementCount(), is( 1L ) );
+					}
+			);
+		}
 	}
 
 	private void verifyFetchResults(List<AggregateEntity> values) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java
index f3109088c03c..00e593e2aaea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java
@@ -16,7 +16,9 @@
 
 import jakarta.persistence.LockModeType;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.H2Dialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
 
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
@@ -302,7 +304,13 @@ public void testHbmMappingScalarComplete(SessionFactoryScope scope) {
 					assertThat( result, notNullValue() );
 					assertThat( result, instanceOf( Object[].class ) );
 					final Object[] values = result;
-					assertThat( values[ 0 ], is( 1 ) );;
+					if (scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+						scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect ) {
+						// Spanner always stores the integer types as INT64/BIGINT
+						assertThat( values[ 0 ], is( 1L ) );
+					} else {
+						assertThat( values[ 0 ], is( 1 ) );
+					}
 					assertThat( values[ 1 ], is( "hi" ) );
 					assertThat( values[ 2 ], is( "there" ) );
 				}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java
index 73074ca96f03..44c67f7edfc9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/SimpleEntityWithNamedMappings.java
@@ -35,7 +35,7 @@
 		classes = @ConstructorResult(
 				targetClass = SimpleEntityWithNamedMappings.DropDownDto.class,
 				columns = {
-						@ColumnResult( name = "id" ),
+						@ColumnResult( name = "id", type = Integer.class ),
 						@ColumnResult( name = "name" )
 				}
 		)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java
index cd6b3d0a0fa9..ad9d73715f0e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/returns/ScrollableResultsTests.java
@@ -10,15 +10,15 @@
 
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
-import org.hibernate.dialect.HANADialect;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.query.Query;
 
 import org.hibernate.testing.orm.domain.gambit.BasicEntity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -52,7 +52,7 @@ public void cleanUpTestData(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA supports only ResultSet.TYPE_FORWARD_ONLY")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsBackwardsScrollableResultSets.class)
 	public void testCursorPositioning(SessionFactoryScope scope) {
 		// create an extra row so we can better test cursor positioning
 		scope.inTransaction(
@@ -262,22 +262,24 @@ private static <R> void verifyScroll(Query<R> query, Consumer<R> validator) {
 		}
 
 		final SessionImplementor session = (SessionImplementor) query.getSession();
-		// HANA supports only ResultSet.TYPE_FORWARD_ONLY
-		if ( !( session.getFactory().getJdbcServices().getDialect() instanceof HANADialect ) ) {
-			try (final ScrollableResults<R> results = query.scroll( ScrollMode.SCROLL_INSENSITIVE )) {
-				assertThat( results.next(), is( true ) );
-				validator.accept( results.get() );
-			}
-
-			try (final ScrollableResults<R> results = query.scroll( ScrollMode.SCROLL_SENSITIVE )) {
-				assertThat( results.next(), is( true ) );
-				validator.accept( results.get() );
-			}
-
-			try (final ScrollableResults<R> results = query.scroll( ScrollMode.SCROLL_INSENSITIVE )) {
-				assertThat( results.next(), is( true ) );
-				validator.accept( results.get() );
-			}
+		// HANA and Spanner support only ResultSet.TYPE_FORWARD_ONLY
+		if ( session.getDialect().defaultScrollMode() == ScrollMode.FORWARD_ONLY ) {
+			return;
+		}
+
+		try (final ScrollableResults<R> results = query.scroll( ScrollMode.SCROLL_INSENSITIVE )) {
+			assertThat( results.next(), is( true ) );
+			validator.accept( results.get() );
+		}
+
+		try (final ScrollableResults<R> results = query.scroll( ScrollMode.SCROLL_SENSITIVE )) {
+			assertThat( results.next(), is( true ) );
+			validator.accept( results.get() );
+		}
+
+		try (final ScrollableResults<R> results = query.scroll( ScrollMode.SCROLL_INSENSITIVE )) {
+			assertThat( results.next(), is( true ) );
+			validator.accept( results.get() );
 		}
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java
index 084ba369f417..867d5507892c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java
@@ -11,10 +11,12 @@
 import java.util.List;
 
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
@@ -72,9 +74,16 @@ public void fullyImplicitTest(SessionFactoryScope scope) {
 					final Object[] values = (Object[]) result;
 					assertThat( values.length, is(3 ) );
 
-					assertThat( values[ 0 ], is( STRING_VALUE ) );
-					assertThat( values[ 1 ], is( 2 ) );
-					assertThat( values[ 2 ], is( 1 ) );
+					assertThat( values[0], is( STRING_VALUE ) );
+					if (scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+						scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect ) {
+						assertThat( values[1], is( 2L ) );
+						assertThat( values[2], is( 1L ) );
+					}
+					else {
+						assertThat( values[1], is( 2 ) );
+						assertThat( values[2], is( 1 ) );
+					}
 				}
 		);
 	}
@@ -125,9 +134,16 @@ public void explicitOrderTest(SessionFactoryScope scope) {
 					final Object[] values = (Object[]) result;
 					assertThat( values.length, is(3 ) );
 
-					assertThat( values[ 0 ], is( 1 ) );
-					assertThat( values[ 1 ], is( 2 ) );
-					assertThat( values[ 2 ], is( STRING_VALUE ) );
+					if (scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+						scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect) {
+						assertThat( values[0], is( 1L ) );
+						assertThat( values[1], is( 2L ) );
+					}
+					else {
+						assertThat( values[0], is( 1 ) );
+						assertThat( values[1], is( 2 ) );
+					}
+					assertThat( values[2], is( STRING_VALUE ) );
 				}
 		);
 	}
@@ -153,7 +169,13 @@ public void explicitEnumTypeTest(SessionFactoryScope scope) {
 					final Object[] values = (Object[]) result;
 					assertThat( values.length, is(3 ) );
 
-					assertThat( values[ 0 ], is( 1 ) );
+					if (scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+						scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect) {
+						assertThat( values[0], is( 1L ) );
+					}
+					else {
+						assertThat( values[0], is( 1 ) );
+					}
 					assertThat( values[ 1 ], is( "MALE" ) );
 					assertThat( values[ 2 ], matchesOrdinal( EntityOfBasics.Gender.FEMALE ) );
 				}
@@ -176,7 +198,13 @@ public void explicitEnumTypeTest(SessionFactoryScope scope) {
 					final Object[] values = (Object[]) result;
 					assertThat( values.length, is(3 ) );
 
-					assertThat( values[ 0 ], is( 1 ) );
+					if ( scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+						scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect) {
+						assertThat( values[0], is( 1L ) );
+					}
+					else {
+						assertThat( values[0], is( 1 ) );
+					}
 					assertThat( values[ 1 ], is( EntityOfBasics.Gender.MALE ) );
 					assertThat( values[ 2 ], is( EntityOfBasics.Gender.FEMALE ) );
 				}
@@ -195,9 +223,15 @@ public void explicitConversionTest(SessionFactoryScope scope) {
 					assertThat( results.size(), is( 1 ) );
 
 					final Object result = results.get( 0 );
-					assertThat( result, instanceOf( Character.class ) );
-
-					assertThat( result, is( 'O' ) );
+					if (scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+						scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect) {
+						assertThat( result, instanceOf( String.class ) );
+						assertThat( result, is( "O" ) );
+					}
+					else {
+						assertThat( result, instanceOf( Character.class ) );
+						assertThat( result, is( 'O' ) );
+					}
 				}
 		);
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java
index 6344162339e6..e5efa4765dfb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/SynchronizedSpaceTests.java
@@ -97,7 +97,7 @@ private void checkUseCase(
 		checkUseCase(
 				scope,
 				(session) -> {
-					final Query nativeQuery = session.createNativeQuery( "update " + table + " set name = 'updated'" );
+					final Query nativeQuery = session.createNativeQuery( "update " + table + " set name = 'updated' where 1=1" );
 					updateQueryConfigurer.accept( nativeQuery );
 					return nativeQuery;
 				},
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java
index 70c1f4921f97..3cc3f2e00b97 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/BasicSelectionQueryTests.java
@@ -13,17 +13,17 @@
 import jakarta.persistence.Tuple;
 
 import org.hibernate.ScrollMode;
-import org.hibernate.dialect.HANADialect;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.query.IllegalSelectQueryException;
 import org.hibernate.query.SelectionQuery;
 
 import org.hibernate.testing.orm.domain.StandardDomainModel;
 import org.hibernate.testing.orm.domain.contacts.Contact;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -38,7 +38,7 @@
 		annotatedClasses = BasicSelectionQueryTests.DummyEntity.class
 )
 @SessionFactory
-@SkipForDialect( dialectClass = HANADialect.class, reason = "HANA does not support scrollable results")
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsBackwardsScrollableResultSets.class)
 public class BasicSelectionQueryTests {
 	@Test
 	public void typedEntitySelectTest(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/BasicMutationQueryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/BasicMutationQueryTests.java
index 7dcc79b93c45..d66821b8dbed 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/BasicMutationQueryTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/BasicMutationQueryTests.java
@@ -36,7 +36,7 @@ void basicHqlDeleteTest(SessionFactoryScope scope) {
 	@Test
 	void basicNativeDeleteTest(SessionFactoryScope scope) {
 		scope.inTransaction( (session) -> {
-			session.createNativeMutationQuery( "delete from contacts" ).executeUpdate();
+			session.createNativeMutationQuery( "delete from contacts where 1=1" ).executeUpdate();
 		} );
 	}
 
@@ -98,7 +98,7 @@ void basicUnequivocallyInvalidNamedNativeDeleteTest(SessionFactoryScope scope) {
 	)
 	@NamedNativeQuery(
 			name = "valid-native",
-			query = "delete from contacts"
+			query = "delete from contacts where 1=1"
 	)
 	@NamedNativeQuery(
 			name = "invalid-native",
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java
index 4b21421868fa..288780b1dd95 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/mutation/multitable/IdSelectionTests.java
@@ -12,6 +12,7 @@
 import org.hibernate.query.internal.QueryParameterBindingsImpl;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.query.spi.QueryParameterBinding;
 import org.hibernate.query.spi.QueryParameterBindings;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.mutation.internal.MatchingIdSelectionHelper;
@@ -61,7 +62,8 @@ public void testSecondaryTableRestrictedOnRootTable(SessionFactoryScope scope) {
 				parameterMetadata,
 				scope.getSessionFactory()
 		);
-		domainParamBindings.getBinding( "n" ).setBindValue( "abc" );
+		((QueryParameterBinding) domainParamBindings.getBinding( "n" ))
+				.setBindValue( "abc" );
 
 		scope.inTransaction(
 				session -> {
@@ -86,7 +88,8 @@ public void testSecondaryTableRestrictedOnNonRootTable(SessionFactoryScope scope
 				parameterMetadata,
 				scope.getSessionFactory()
 		);
-		domainParamBindings.getBinding( "d" ).setBindValue( "123" );
+		((QueryParameterBinding) domainParamBindings.getBinding( "d" ))
+				.setBindValue( "123" );
 
 		scope.inTransaction(
 				session -> {
@@ -111,7 +114,8 @@ public void testJoinedSubclassRestrictedOnRootTable(SessionFactoryScope scope) {
 				parameterMetadata,
 				scope.getSessionFactory()
 		);
-		domainParamBindings.getBinding( "n" ).setBindValue( "Acme" );
+		((QueryParameterBinding) domainParamBindings.getBinding( "n" ))
+				.setBindValue( "Acme" );
 
 		scope.inTransaction(
 				session -> {
@@ -136,7 +140,8 @@ public void testJoinedSubclassRestrictedOnNonPrimaryRootTable(SessionFactoryScop
 				parameterMetadata,
 				scope.getSessionFactory()
 		);
-		domainParamBindings.getBinding( "n" ).setBindValue( "Acme" );
+		((QueryParameterBinding) domainParamBindings.getBinding( "n" ))
+				.setBindValue( "Acme" );
 
 		scope.inTransaction(
 				session -> {
@@ -161,7 +166,8 @@ public void testJoinedSubclassRestrictedOnPrimaryNonRootTable(SessionFactoryScop
 				parameterMetadata,
 				scope.getSessionFactory()
 		);
-		domainParamBindings.getBinding( "v" ).setBindValue( "123" );
+		((QueryParameterBinding) domainParamBindings.getBinding( "v" ))
+				.setBindValue( "123" );
 
 		scope.inTransaction(
 				session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCollectionReloadCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCollectionReloadCacheTest.java
index 6d7025317531..c1793c759a0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCollectionReloadCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCollectionReloadCacheTest.java
@@ -9,6 +9,8 @@
 import java.util.Set;
 import java.util.UUID;
 
+import jakarta.persistence.Access;
+import jakarta.persistence.AccessType;
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -414,6 +416,7 @@ static class Major {
 		private UUID id;
 
 		@Column( name = "name_col" )
+		@Access( AccessType.FIELD )
 		private String name;
 
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/NativeQueryCacheMixedReturnTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/NativeQueryCacheMixedReturnTypeTest.java
new file mode 100644
index 000000000000..2bf6fbcfd59a
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/NativeQueryCacheMixedReturnTypeTest.java
@@ -0,0 +1,556 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.querycache;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Tuple;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.stat.Statistics;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(annotatedClasses = {
+		NativeQueryCacheMixedReturnTypeTest.TestUser.class,
+		NativeQueryCacheMixedReturnTypeTest.TestUserProfile.class,
+		NativeQueryCacheMixedReturnTypeTest.TestUserLongAge.class
+})
+@SessionFactory(generateStatistics = true)
+@ServiceRegistry(settings = {
+		@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true"),
+		@Setting(name = AvailableSettings.USE_QUERY_CACHE, value = "true")
+})
+@RequiresDialect(H2Dialect.class)
+@Jira("https://hibernate.atlassian.net/browse/HHH-20231")
+public class NativeQueryCacheMixedReturnTypeTest {
+
+	private static final String NATIVE_QUERY_EXTRA_COLS_LAST =
+			"select u1.id, u1.name, u1.email, u1.age, u1.address, u1.phone, u1.extra_col1, u1.extra_col2 from test_user u1";
+	private static final String NATIVE_QUERY_EXTRA_COLS_FIRST =
+			"select u1.extra_col1, u1.extra_col2, u1.id, u1.name, u1.email, u1.age, u1.address, u1.phone from test_user u1";
+	private static final String NATIVE_QUERY_EXTRA_COLS_SCATTERED =
+			"select u1.id, u1.extra_col1, u1.name, u1.email, u1.extra_col2, u1.age, u1.address, u1.phone from test_user u1";
+	private static final String NATIVE_QUERY_ENTITY_COLS =
+			"select u1.id, u1.name, u1.email, u1.age, u1.address, u1.phone from test_user u1";
+
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			// Add extra columns to the table that are not mapped in the entity
+			session.createNativeMutationQuery( "alter table test_user add column if not exists extra_col1 varchar(50)" )
+					.executeUpdate();
+			session.createNativeMutationQuery( "alter table test_user add column if not exists extra_col2 varchar(50)" )
+					.executeUpdate();
+
+			// Insert test data with extra columns
+			session.createNativeMutationQuery(
+							"insert into test_user (id, name, email, age, address, phone, extra_col1, extra_col2) values "
+							+ "(1, 'john', 'john@test.com', 30, 'ny', '123456', 'ext1', 'ext2')" )
+					.executeUpdate();
+		} );
+	}
+
+	@AfterEach
+	public void cleanCache(SessionFactoryScope scope) {
+		scope.getSessionFactory().getCache().evictQueryRegions();
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+	}
+
+	@Test
+	public void testEntityThenTuple(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query with entity return type - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_LAST, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with Tuple return type - cached data is incompatible (entity cached
+		// fewer columns), so re-executes and re-populates the cache with complete data
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_LAST, Tuple.class );
+			query.setCacheable( true );
+			final var tuple = query.getSingleResult();
+			assertTestUserTuple( tuple );
+			assertThat( tuple.get( "extra_col1", String.class ) ).isEqualTo( "ext1" );
+			assertThat( tuple.get( "extra_col2", String.class ) ).isEqualTo( "ext2" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Third query with Tuple return type - reads from the re-populated cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_LAST, Tuple.class );
+			query.setCacheable( true );
+			final var tuple = query.getSingleResult();
+			assertTestUserTuple( tuple );
+			assertThat( tuple.get( "extra_col1", String.class ) ).isEqualTo( "ext1" );
+			assertThat( tuple.get( "extra_col2", String.class ) ).isEqualTo( "ext2" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	@Test
+	public void testTupleThenEntity(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query with Tuple return type - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_LAST, Tuple.class );
+			query.setCacheable( true );
+			final var tuple = query.getSingleResult();
+			assertTestUserTuple( tuple );
+			assertThat( tuple.get( "extra_col1", String.class ) ).isEqualTo( "ext1" );
+			assertThat( tuple.get( "extra_col2", String.class ) ).isEqualTo( "ext2" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with entity return type - reads from the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_LAST, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	@Test
+	public void testEntityThenTupleSameColumnCount(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query with entity return type - populates the cache.
+		// The query selects exactly the entity-mapped columns, so cached row size
+		// matches the column count (no extra columns).
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_ENTITY_COLS, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with Tuple return type - same column count as entity, cached data
+		// should be compatible
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_ENTITY_COLS, Tuple.class );
+			query.setCacheable( true );
+			assertTestUserTuple( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	@Test
+	public void testEntityThenTupleExtraColsFirst(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query with entity return type - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_FIRST, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with Tuple return type - cached data is incompatible (entity cached
+		// fewer columns), so re-executes and re-populates the cache with complete data
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_FIRST, Tuple.class );
+			query.setCacheable( true );
+			final var tuple = query.getSingleResult();
+			assertTestUserTuple( tuple );
+			assertThat( tuple.get( "extra_col1", String.class ) ).isEqualTo( "ext1" );
+			assertThat( tuple.get( "extra_col2", String.class ) ).isEqualTo( "ext2" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Third query with Tuple return type - reads from the re-populated cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_FIRST, Tuple.class );
+			query.setCacheable( true );
+			final var tuple = query.getSingleResult();
+			assertTestUserTuple( tuple );
+			assertThat( tuple.get( "extra_col1", String.class ) ).isEqualTo( "ext1" );
+			assertThat( tuple.get( "extra_col2", String.class ) ).isEqualTo( "ext2" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	@Test
+	public void testTupleThenEntityExtraColsFirst(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query with Tuple return type - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_FIRST, Tuple.class );
+			query.setCacheable( true );
+			final var tuple = query.getSingleResult();
+			assertTestUserTuple( tuple );
+			assertThat( tuple.get( "extra_col1", String.class ) ).isEqualTo( "ext1" );
+			assertThat( tuple.get( "extra_col2", String.class ) ).isEqualTo( "ext2" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with entity return type - reads from the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_FIRST, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	@Test
+	public void testEntityThenTupleExtraColsScattered(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query with entity return type - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_SCATTERED, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with Tuple return type - cached data is incompatible (entity cached
+		// fewer columns), so re-executes and re-populates the cache with complete data
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_SCATTERED, Tuple.class );
+			query.setCacheable( true );
+			final var tuple = query.getSingleResult();
+			assertTestUserTuple( tuple );
+			assertThat( tuple.get( "extra_col1", String.class ) ).isEqualTo( "ext1" );
+			assertThat( tuple.get( "extra_col2", String.class ) ).isEqualTo( "ext2" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Third query with Tuple return type - reads from the re-populated cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_SCATTERED, Tuple.class );
+			query.setCacheable( true );
+			final var tuple = query.getSingleResult();
+			assertTestUserTuple( tuple );
+			assertThat( tuple.get( "extra_col1", String.class ) ).isEqualTo( "ext1" );
+			assertThat( tuple.get( "extra_col2", String.class ) ).isEqualTo( "ext2" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	@Test
+	public void testTupleThenEntityExtraColsScattered(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query with Tuple return type - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_SCATTERED, Tuple.class );
+			query.setCacheable( true );
+			final var tuple = query.getSingleResult();
+			assertTestUserTuple( tuple );
+			assertThat( tuple.get( "extra_col1", String.class ) ).isEqualTo( "ext1" );
+			assertThat( tuple.get( "extra_col2", String.class ) ).isEqualTo( "ext2" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with entity return type - reads from the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_SCATTERED, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	@Test
+	public void testUserProfileThenTestUser(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query with TestUserProfile (maps extra_col1, not age) - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_SCATTERED, TestUserProfile.class );
+			query.setCacheable( true );
+			final var profile = query.getSingleResult();
+			assertThat( profile.name ).isEqualTo( "john" );
+			assertThat( profile.email ).isEqualTo( "john@test.com" );
+			assertThat( profile.extraCol1 ).isEqualTo( "ext1" );
+			assertThat( profile.address ).isEqualTo( "ny" );
+			assertThat( profile.phone ).isEqualTo( "123456" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with TestUser (maps age, not extra_col1) - stored mapping is
+		// incompatible (no entry for age position), so re-executes and re-populates
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_SCATTERED, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+	}
+
+	@Test
+	public void testTestUserThenUserProfile(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query with TestUser (maps age, not extra_col1) - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_SCATTERED, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with TestUserProfile (maps extra_col1, not age) - stored mapping is
+		// incompatible (no entry for extra_col1 position), so re-executes and re-populates
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_SCATTERED, TestUserProfile.class );
+			query.setCacheable( true );
+			final var profile = query.getSingleResult();
+			assertThat( profile.name ).isEqualTo( "john" );
+			assertThat( profile.email ).isEqualTo( "john@test.com" );
+			assertThat( profile.extraCol1 ).isEqualTo( "ext1" );
+			assertThat( profile.address ).isEqualTo( "ny" );
+			assertThat( profile.phone ).isEqualTo( "123456" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+	}
+
+	private static void assertQueryCacheStatistics(Statistics statistics, int hits, int misses, int puts) {
+		assertThat( statistics.getQueryCacheHitCount() ).isEqualTo( hits );
+		assertThat( statistics.getQueryCacheMissCount() ).isEqualTo( misses );
+		assertThat( statistics.getQueryCachePutCount() ).isEqualTo( puts );
+		statistics.clear();
+	}
+
+	private static void assertTestUser(TestUser user) {
+		assertThat( user.name ).isEqualTo( "john" );
+		assertThat( user.email ).isEqualTo( "john@test.com" );
+		assertThat( user.age ).isEqualTo( 30 );
+		assertThat( user.address ).isEqualTo( "ny" );
+		assertThat( user.phone ).isEqualTo( "123456" );
+	}
+
+	private static void assertTestUserTuple(Tuple tuple) {
+		assertThat( tuple.get( "name", String.class ) ).isEqualTo( "john" );
+		assertThat( tuple.get( "email", String.class ) ).isEqualTo( "john@test.com" );
+		assertThat( tuple.get( "age", Integer.class ) ).isEqualTo( 30 );
+		assertThat( tuple.get( "address", String.class ) ).isEqualTo( "ny" );
+		assertThat( tuple.get( "phone", String.class ) ).isEqualTo( "123456" );
+	}
+
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// Tests for same SQL with compatible but different scalar Java types.
+	// When the cached value's Java type differs from the reader's expected type,
+	// the cache hit is treated as incompatible and the query is re-executed.
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+	@Test
+	public void testScalarIntegerThenLong(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		final String nativeQuery = "select u1.age from test_user u1";
+
+		// First query with Integer result type - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( nativeQuery, Integer.class );
+			query.setCacheable( true );
+			assertThat( query.getSingleResult() ).isEqualTo( 30 );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with Long result type - same SQL, same position, different Java type.
+		// Cached data has incompatible type, so re-executes and re-populates the cache.
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( nativeQuery, Long.class );
+			query.setCacheable( true );
+			assertThat( query.getSingleResult() ).isEqualTo( 30L );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Third query with Long result type - now reads from the re-populated cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( nativeQuery, Long.class );
+			query.setCacheable( true );
+			assertThat( query.getSingleResult() ).isEqualTo( 30L );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	@Test
+	public void testScalarLongThenInteger(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		final String nativeQuery = "select u1.age from test_user u1";
+
+		// First query with Long result type - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( nativeQuery, Long.class );
+			query.setCacheable( true );
+			assertThat( query.getSingleResult() ).isEqualTo( 30L );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with Integer result type - cached data has incompatible type,
+		// so re-executes and re-populates the cache.
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( nativeQuery, Integer.class );
+			query.setCacheable( true );
+			assertThat( query.getSingleResult() ).isEqualTo( 30 );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Third query with Integer result type - now reads from the re-populated cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( nativeQuery, Integer.class );
+			query.setCacheable( true );
+			assertThat( query.getSingleResult() ).isEqualTo( 30 );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// Test for entities with the same columns but different Java types.
+	// TestUser maps age as Integer, TestUserLongAge maps age as Long.
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+	@Test
+	public void testEntityIntegerAgeThenEntityLongAge(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query with TestUser (age as Integer) - populates the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_ENTITY_COLS, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getSingleResult() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query with TestUserLongAge (age as Long) - same SQL, same columns,
+		// but age is mapped with a different Java type. Cached data has incompatible type,
+		// so re-executes and re-populates the cache.
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_ENTITY_COLS, TestUserLongAge.class );
+			query.setCacheable( true );
+			final var user = query.getSingleResult();
+			assertThat( user.name ).isEqualTo( "john" );
+			assertThat( user.email ).isEqualTo( "john@test.com" );
+			assertThat( user.age ).isEqualTo( 30L );
+			assertThat( user.address ).isEqualTo( "ny" );
+			assertThat( user.phone ).isEqualTo( "123456" );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Third query with TestUserLongAge - now reads from the re-populated cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_ENTITY_COLS, TestUserLongAge.class );
+			query.setCacheable( true );
+			final var user = query.getSingleResult();
+			assertThat( user.age ).isEqualTo( 30L );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	@Entity(name = "TestUser")
+	@Table(name = "test_user")
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	public static class TestUser {
+		@Id
+		Long id;
+		String name;
+		String email;
+		Integer age;
+		String address;
+		String phone;
+	}
+
+	@Entity(name = "TestUserProfile")
+	@Table(name = "test_user")
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	public static class TestUserProfile {
+		@Id
+		Long id;
+		String name;
+		String email;
+		@Column(name = "extra_col1")
+		String extraCol1;
+		// Does NOT map age — different column subset than TestUser
+		String address;
+		String phone;
+	}
+
+	@Entity(name = "TestUserLongAge")
+	@Table(name = "test_user")
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	public static class TestUserLongAge {
+		@Id
+		Long id;
+		String name;
+		String email;
+		Long age;
+		String address;
+		String phone;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/NativeQueryCacheWithExtraColumnsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/NativeQueryCacheWithExtraColumnsTest.java
new file mode 100644
index 000000000000..4ce05ad2d6e5
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/NativeQueryCacheWithExtraColumnsTest.java
@@ -0,0 +1,273 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.querycache;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Tuple;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.stat.Statistics;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(annotatedClasses = NativeQueryCacheWithExtraColumnsTest.TestUser.class)
+@SessionFactory(generateStatistics = true)
+@ServiceRegistry(settings = {
+		@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true"),
+		@Setting(name = AvailableSettings.USE_QUERY_CACHE, value = "true")
+})
+@Jira("https://hibernate.atlassian.net/browse/HHH-20176")
+@RequiresDialect(H2Dialect.class)
+public class NativeQueryCacheWithExtraColumnsTest {
+
+	private static final String NATIVE_QUERY = "SELECT u1.* FROM TEST_USER u1, TEST_USER u2 WHERE u2.ID = u1.ID";
+
+	private static final String NATIVE_QUERY_EXTRA_COLS_FIRST =
+			"SELECT u1.EXTRA_COL1, u1.EXTRA_COL2, u1.ID, u1.NAME, u1.EMAIL, u1.AGE, u1.ADDRESS, u1.PHONE"
+			+ " FROM TEST_USER u1";
+
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			// Add extra columns to the table that are not mapped in the entity
+			session.createNativeMutationQuery( "ALTER TABLE TEST_USER ADD COLUMN IF NOT EXISTS EXTRA_COL1 VARCHAR(50)" )
+					.executeUpdate();
+			session.createNativeMutationQuery( "ALTER TABLE TEST_USER ADD COLUMN IF NOT EXISTS EXTRA_COL2 VARCHAR(50)" )
+					.executeUpdate();
+
+			// Insert test data with extra columns
+			session.createNativeMutationQuery(
+							"INSERT INTO TEST_USER (ID, NAME, EMAIL, AGE, ADDRESS, PHONE, EXTRA_COL1, EXTRA_COL2) VALUES "
+							+ "(1, 'john', 'john@test.com', 30, 'ny', '123456', 'ext1', 'ext2')" )
+					.executeUpdate();
+		} );
+	}
+
+	@AfterEach
+	public void cleanCache(SessionFactoryScope scope) {
+		scope.getSessionFactory().getCache().evictQueryRegions();
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+	}
+
+	@Test
+	public void testNativeQueryWithCacheAndExtraColumns(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query - should populate the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getResultList() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query - should use the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getResultList() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	private static void assertTestUser(List<TestUser> users) {
+		assertThat( users ).hasSize( 1 );
+		final var user = users.get( 0 );
+		assertThat( user.getName() ).isEqualTo( "john" );
+		assertThat( user.getEmail() ).isEqualTo( "john@test.com" );
+		assertThat( user.getAge() ).isEqualTo( 30 );
+		assertThat( user.getAddress() ).isEqualTo( "ny" );
+		assertThat( user.getPhone() ).isEqualTo( "123456" );
+	}
+
+	@Test
+	public void testNativeQueryWithCacheAndTupleResult(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query - should populate the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY, Tuple.class );
+			query.setCacheable( true );
+			assertTestUserTuple( query.getResultList() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query - should use the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY, Tuple.class );
+			query.setCacheable( true );
+			assertTestUserTuple( query.getResultList() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	private static void assertTestUserTuple(List<Tuple> tuples) {
+		assertThat( tuples ).hasSize( 1 );
+		final var tuple = tuples.get( 0 );
+		assertThat( tuple.get( "NAME", String.class ) ).isEqualTo( "john" );
+		assertThat( tuple.get( "EMAIL", String.class ) ).isEqualTo( "john@test.com" );
+		assertThat( tuple.get( "AGE", Integer.class ) ).isEqualTo( 30 );
+		assertThat( tuple.get( "ADDRESS", String.class ) ).isEqualTo( "ny" );
+		assertThat( tuple.get( "PHONE", String.class ) ).isEqualTo( "123456" );
+		assertThat( tuple.get( "EXTRA_COL1", String.class ) ).isEqualTo( "ext1" );
+		assertThat( tuple.get( "EXTRA_COL2", String.class ) ).isEqualTo( "ext2" );
+	}
+
+	@Test
+	public void testExtraColumnsBefore(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query - should populate the cache (works fine, reads from live ResultSet)
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_FIRST, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getResultList() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query - should use the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_FIRST, TestUser.class );
+			query.setCacheable( true );
+			assertTestUser( query.getResultList() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	@Test
+	public void testExtraColumnsBeforeTuple(SessionFactoryScope scope) {
+		final var statistics = scope.getSessionFactory().getStatistics();
+		statistics.clear();
+
+		// First query - should populate the cache (works fine, reads from live ResultSet)
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_FIRST, Tuple.class );
+			query.setCacheable( true );
+			assertTestUserTuple( query.getResultList() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 0, 1, 1 );
+
+		// Second query - should use the cache
+		scope.inSession( session -> {
+			final var query = session.createNativeQuery( NATIVE_QUERY_EXTRA_COLS_FIRST, Tuple.class );
+			query.setCacheable( true );
+			assertTestUserTuple( query.getResultList() );
+		} );
+
+		assertQueryCacheStatistics( statistics, 1, 0, 0 );
+	}
+
+	private static void assertQueryCacheStatistics(Statistics statistics, int hits, int misses, int puts) {
+		assertThat( statistics.getQueryCacheHitCount() ).isEqualTo( hits );
+		assertThat( statistics.getQueryCacheMissCount() ).isEqualTo( misses );
+		assertThat( statistics.getQueryCachePutCount() ).isEqualTo( puts );
+		statistics.clear();
+	}
+
+	@Entity(name = "TestUser")
+	@Table(name = "TEST_USER")
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	public static class TestUser {
+		@Id
+		@Column(name = "ID")
+		private Long id;
+
+		@Column(name = "NAME")
+		private String name;
+
+		@Column(name = "EMAIL")
+		private String email;
+
+		@Column(name = "AGE")
+		private Integer age;
+
+		@Column(name = "ADDRESS")
+		private String address;
+
+		@Column(name = "PHONE")
+		private String phone;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String getEmail() {
+			return email;
+		}
+
+		public void setEmail(String email) {
+			this.email = email;
+		}
+
+		public Integer getAge() {
+			return age;
+		}
+
+		public void setAge(Integer age) {
+			this.age = age;
+		}
+
+		public String getAddress() {
+			return address;
+		}
+
+		public void setAddress(String address) {
+			this.address = address;
+		}
+
+		public String getPhone() {
+			return phone;
+		}
+
+		public void setPhone(String phone) {
+			this.phone = phone;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ForeignKeyNameQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ForeignKeyNameQuotingTest.java
new file mode 100644
index 000000000000..5afbf4c832a6
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ForeignKeyNameQuotingTest.java
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.quote;
+
+import jakarta.persistence.CheckConstraint;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+import static org.hibernate.cfg.MappingSettings.GLOBALLY_QUOTED_IDENTIFIERS;
+
+@Jpa(annotatedClasses = ForeignKeyNameQuotingTest.Self.class, exportSchema = false,
+		integrationSettings = @Setting(name = GLOBALLY_QUOTED_IDENTIFIERS, value = "true"))
+class ForeignKeyNameQuotingTest {
+	@Test void test(EntityManagerFactoryScope scope) {
+		scope.getEntityManagerFactory().getSchemaManager().create( true );
+	}
+	@Entity
+	@Table(uniqueConstraints = @UniqueConstraint(columnNames = "myself", name = "myuniqueself" ),
+		indexes = @Index(columnList = "uuid,self", name = "myindex"),
+		check = @CheckConstraint(name="checkmyself", constraint = "myself not null"))
+	static class Self {
+		@Id @GeneratedValue
+		UUID uuid;
+		@ManyToOne
+		@JoinColumn(name = "myself",
+				foreignKey = @ForeignKey(name = "myownself"))
+		Self self;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java
index 0745de1b67df..f73ee1df1cde 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteGlobalTest.java
@@ -4,12 +4,11 @@
  */
 package org.hibernate.orm.test.quote;
 
-import java.util.Iterator;
-
 import org.hibernate.Transaction;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Index;
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.UniqueKey;
 
@@ -21,7 +20,10 @@
 import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -48,19 +50,31 @@ public class QuoteGlobalTest {
 	@Test
 	@JiraKey(value = "HHH-7890")
 	public void testQuotedUniqueConstraint(SessionFactoryScope scope) {
-		Iterator<UniqueKey> itr = scope.getMetadataImplementor().getEntityBinding(Person.class.getName())
-				.getTable().getUniqueKeys().values().iterator();
-		while ( itr.hasNext() ) {
-			UniqueKey uk = itr.next();
-			assertEquals( 1, uk.getColumns().size() );
-			assertEquals( "name", uk.getColumn( 0 ).getName() );
+		if ( scope.getSessionFactory().getJdbcServices().getDialect().supportsUniqueConstraints() ) {
+			for ( UniqueKey uk :
+					scope.getMetadataImplementor().getEntityBinding( Person.class.getName() )
+							.getTable().getUniqueKeys().values() ) {
+				assertEquals( 1, uk.getColumns().size() );
+				assertTrue( uk.getColumn( 0 ).isQuoted() );
+				assertEquals( "name", uk.getColumn( 0 ).getName() );
+				return;
+			}
+		}
+		else {
+			Index uniqueIndex = scope.getMetadataImplementor().getEntityBinding( Person.class.getName() )
+					.getTable().getIndexes().values().stream().filter( Index::isUnique ).findAny().orElse(  null );
+			assertNotNull(  uniqueIndex );
+			List<Column> columns = uniqueIndex.getColumns();
+			assertEquals( 1, columns.size() );
+			assertTrue( columns.get( 0 ).isQuoted() );
+			assertEquals( "name", columns.get( 0 ).getName() );
 			return;
 		}
 		fail( "GLOBALLY_QUOTED_IDENTIFIERS caused the unique key creation to fail." );
 	}
 
 	@Test
-	public void testQuoteManytoMany(SessionFactoryScope scope) {
+	public void testQuoteManyToMany(SessionFactoryScope scope) {
 		scope.inSession(
 				session -> {
 					try {
@@ -96,17 +110,15 @@ public void testQuoteManytoMany(SessionFactoryScope scope) {
 	@Test
 	@JiraKey(value = "HHH-8520")
 	public void testHbmQuoting(SessionFactoryScope scope) {
-		final MetadataImplementor metadataImplementor = scope.getMetadataImplementor();
+		final var metadataImplementor = scope.getMetadataImplementor();
 		doTestHbmQuoting( DataPoint.class, metadataImplementor );
 		doTestHbmQuoting( AssociatedDataPoint.class, metadataImplementor );
 	}
 
-	private void doTestHbmQuoting(Class clazz, MetadataImplementor metadataImplementor) {
+	private void doTestHbmQuoting(Class<?> clazz, MetadataImplementor metadataImplementor) {
 		Table table = metadataImplementor.getEntityBinding( clazz.getName() ).getTable();
 		assertTrue( table.isQuoted() );
-		Iterator itr = table.getColumns().iterator();
-		while ( itr.hasNext() ) {
-			Column column = (Column) itr.next();
+		for ( Column column : table.getColumns() ) {
 			assertTrue( column.isQuoted() );
 		}
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java
index acc2122456f1..3810d555d027 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java
@@ -149,7 +149,7 @@ static abstract class Item {
 		@Column(name = "`ID`")
 		protected long id;
 
-		@Column(name = "_id")
+		@Column(name = "id_")
 		protected long _id;
 
 		@ManyToOne(fetch = FetchType.LAZY)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ReferencedColumnQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ReferencedColumnQuotingTest.java
new file mode 100644
index 000000000000..d12c53876b9d
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ReferencedColumnQuotingTest.java
@@ -0,0 +1,197 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.quote;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.cfg.MappingSettings.GLOBALLY_QUOTED_IDENTIFIERS;
+
+@DomainModel(
+		annotatedClasses = {
+				ReferencedColumnQuotingTest.User.class,
+				ReferencedColumnQuotingTest.Position2.class,
+				ReferencedColumnQuotingTest.JobPosition.class,
+				ReferencedColumnQuotingTest.Job2Position.class
+		}
+)
+@SessionFactory
+@ServiceRegistry(
+		settings = @Setting(name = GLOBALLY_QUOTED_IDENTIFIERS, value = "true")
+)
+@Jira("https://hibernate.atlassian.net/browse/HHH-9035")
+public class ReferencedColumnQuotingTest {
+
+	@Test
+	public void testExplicitQuoting(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					User user = new User();
+					user.id = 1L;
+					user.name = "User 1";
+					session.persist(user);
+					Position2 position = new Position2();
+					position.id = 1L;
+					position.name = "Position 1";
+					position.user = user;
+					session.persist(position);
+				}
+		);
+	}
+
+	@Entity
+	@IdClass(Job2PositionId.class)
+	public static class Job2Position {
+		Long id;
+		JobPosition pos;
+		@Id
+		public Long getId() {
+			return this.id;
+		}
+		public void setId(Long id) {
+			this.id = id;
+		}
+		@Id
+		@ManyToOne
+		@JoinColumn(name = "`User+id`", referencedColumnName = "`User+id`")
+		@JoinColumn(name = "`Position+id`", referencedColumnName = "`Position+id`")
+		@JoinColumn(name = "`JobPosition+id`", referencedColumnName = "`JobPosition+id`")
+		public JobPosition getPos() {
+			return this.pos;
+		}
+		public void setPos(JobPosition pos) {
+			this.pos = pos;
+		}
+	}
+
+	public static class Job2PositionId {
+		Long id;
+		JobPositionId pos;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public JobPositionId getPos() {
+			return pos;
+		}
+
+		public void setPos(JobPositionId pos) {
+			this.pos = pos;
+		}
+	}
+
+	@Entity
+	@Table(name = "JOB+Position")
+	@IdClass(JobPositionId.class)
+	public static class JobPosition {
+		@Id
+		@Column(name = "`JobPosition+id`")
+		Long id;
+		@ManyToOne
+		@JoinColumn(name = "`User+id`", referencedColumnName = "`User+id`")
+		@Id
+		User user;
+		@ManyToOne
+		@JoinColumn(name = "`User+id`", referencedColumnName = "`User+id`")
+		@JoinColumn(name = "`Position+id`", referencedColumnName = "`Position+id`")
+		Position2 position;
+		@Id
+		@Column(name = "`Position+id`")
+		Long positionId;
+	}
+
+	public static class JobPositionId {
+		Long id;
+		Long user;
+		Long positionId;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Long getUser() {
+			return user;
+		}
+
+		public void setUser(Long user) {
+			this.user = user;
+		}
+
+		public Long getPositionId() {
+			return positionId;
+		}
+
+		public void setPositionId(Long positionId) {
+			this.positionId = positionId;
+		}
+	}
+
+	@Entity
+	@Table(name = "Position")
+	@IdClass(PositionId.class)
+	public static class Position2 {
+		@Id
+		@Column(name = "`Position+id`")
+		Long id;
+		@Column(name = "position++name")
+		String name;
+		@ManyToOne
+		@JoinColumn(name = "`User+id`", referencedColumnName = "`User+id`")
+		@Id
+		User user;
+	}
+
+	public static class PositionId {
+		Long id;
+		Long user;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Long getUser() {
+			return user;
+		}
+
+		public void setUser(Long user) {
+			this.user = user;
+		}
+	}
+
+	@Entity
+	@Table(name = "User")
+	public static class User {
+		@Id
+		@Column(name = "User+id")
+		Long id;
+		@Column(name = "Name")
+		String name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ReferencedColumnQuotingTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ReferencedColumnQuotingTest2.java
new file mode 100644
index 000000000000..f39b85ec649f
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ReferencedColumnQuotingTest2.java
@@ -0,0 +1,197 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.quote;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.cfg.MappingSettings.GLOBALLY_QUOTED_IDENTIFIERS;
+
+@DomainModel(
+		annotatedClasses = {
+				ReferencedColumnQuotingTest2.User.class,
+				ReferencedColumnQuotingTest2.Position2.class,
+				ReferencedColumnQuotingTest2.JobPosition.class,
+				ReferencedColumnQuotingTest2.Job2Position.class
+		}
+)
+@SessionFactory
+@ServiceRegistry(
+		settings = @Setting(name = GLOBALLY_QUOTED_IDENTIFIERS, value = "true")
+)
+@Jira("https://hibernate.atlassian.net/browse/HHH-9035")
+public class ReferencedColumnQuotingTest2 {
+
+	@Test
+	public void testExplicitQuoting(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					User user = new User();
+					user.id = 1L;
+					user.name = "User 1";
+					session.persist(user);
+					Position2 position = new Position2();
+					position.id = 1L;
+					position.name = "Position 1";
+					position.user = user;
+					session.persist(position);
+				}
+		);
+	}
+
+	@Entity
+	@IdClass(Job2PositionId.class)
+	public static class Job2Position {
+		Long id;
+		JobPosition pos;
+		@Id
+		public Long getId() {
+			return this.id;
+		}
+		public void setId(Long id) {
+			this.id = id;
+		}
+		@Id
+		@ManyToOne
+		@JoinColumn(name = "User+id", referencedColumnName = "User+id")
+		@JoinColumn(name = "Position+id", referencedColumnName = "Position+id")
+		@JoinColumn(name = "JobPosition+id", referencedColumnName = "JobPosition+id")
+		public JobPosition getPos() {
+			return this.pos;
+		}
+		public void setPos(JobPosition pos) {
+			this.pos = pos;
+		}
+	}
+
+	public static class Job2PositionId {
+		Long id;
+		JobPositionId pos;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public JobPositionId getPos() {
+			return pos;
+		}
+
+		public void setPos(JobPositionId pos) {
+			this.pos = pos;
+		}
+	}
+
+	@Entity
+	@Table(name = "JOB+Position")
+	@IdClass(JobPositionId.class)
+	public static class JobPosition {
+		@Id
+		@Column(name = "JobPosition+id")
+		Long id;
+		@ManyToOne
+		@JoinColumn(name = "User+id", referencedColumnName = "User+id")
+		@Id
+		User user;
+		@ManyToOne
+		@JoinColumn(name = "User+id", referencedColumnName = "User+id")
+		@JoinColumn(name = "Position+id", referencedColumnName = "Position+id")
+		Position2 position;
+		@Id
+		@Column(name = "Position+id")
+		Long positionId;
+	}
+
+	public static class JobPositionId {
+		Long id;
+		Long user;
+		Long positionId;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Long getUser() {
+			return user;
+		}
+
+		public void setUser(Long user) {
+			this.user = user;
+		}
+
+		public Long getPositionId() {
+			return positionId;
+		}
+
+		public void setPositionId(Long positionId) {
+			this.positionId = positionId;
+		}
+	}
+
+	@Entity
+	@Table(name = "Position")
+	@IdClass(PositionId.class)
+	public static class Position2 {
+		@Id
+		@Column(name = "Position+id")
+		Long id;
+		@Column(name = "position++name")
+		String name;
+		@ManyToOne
+		@JoinColumn(name = "User+id", referencedColumnName = "User+id")
+		@Id
+		User user;
+	}
+
+	public static class PositionId {
+		Long id;
+		Long user;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Long getUser() {
+			return user;
+		}
+
+		public void setUser(Long user) {
+			this.user = user;
+		}
+	}
+
+	@Entity
+	@Table(name = "User")
+	public static class User {
+		@Id
+		@Column(name = "User+id")
+		Long id;
+		@Column(name = "Name")
+		String name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ReferencedColumnQuotingTest3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ReferencedColumnQuotingTest3.java
new file mode 100644
index 000000000000..9331f804a44d
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/ReferencedColumnQuotingTest3.java
@@ -0,0 +1,194 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.quote;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.junit.jupiter.api.Test;
+
+
+@DomainModel(
+		annotatedClasses = {
+				ReferencedColumnQuotingTest3.User.class,
+				ReferencedColumnQuotingTest3.Position2.class,
+				ReferencedColumnQuotingTest3.JobPosition.class,
+				ReferencedColumnQuotingTest3.Job2Position.class
+		}
+)
+@SessionFactory
+@Jira("https://hibernate.atlassian.net/browse/HHH-9035")
+@SkipForDialect(dialectClass = MariaDBDialect.class)
+public class ReferencedColumnQuotingTest3 {
+
+	@Test
+	public void testExplicitQuoting(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					User user = new User();
+					user.id = 1L;
+					user.name = "User 1";
+					session.persist(user);
+					Position2 position = new Position2();
+					position.id = 1L;
+					position.name = "Position 1";
+					position.user = user;
+					session.persist(position);
+				}
+		);
+	}
+
+	@Entity
+	@IdClass(Job2PositionId.class)
+	public static class Job2Position {
+		Long id;
+		JobPosition pos;
+		@Id
+		public Long getId() {
+			return this.id;
+		}
+		public void setId(Long id) {
+			this.id = id;
+		}
+		@Id
+		@ManyToOne
+		@JoinColumn(name = "`User+id`", referencedColumnName = "`User+id`")
+		@JoinColumn(name = "`Position+id`", referencedColumnName = "`Position+id`")
+		@JoinColumn(name = "`JobPosition+id`", referencedColumnName = "`JobPosition+id`")
+		public JobPosition getPos() {
+			return this.pos;
+		}
+		public void setPos(JobPosition pos) {
+			this.pos = pos;
+		}
+	}
+
+	public static class Job2PositionId {
+		Long id;
+		JobPositionId pos;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public JobPositionId getPos() {
+			return pos;
+		}
+
+		public void setPos(JobPositionId pos) {
+			this.pos = pos;
+		}
+	}
+
+	@Entity
+	@Table(name = "JOB+Position")
+	@IdClass(JobPositionId.class)
+	public static class JobPosition {
+		@Id
+		@Column(name = "`JobPosition+id`")
+		Long id;
+		@ManyToOne
+		@JoinColumn(name = "`User+id`", referencedColumnName = "`User+id`")
+		@Id
+		User user;
+		@ManyToOne
+		@JoinColumn(name = "`User+id`", referencedColumnName = "`User+id`")
+		@JoinColumn(name = "`Position+id`", referencedColumnName = "`Position+id`")
+		Position2 position;
+		@Id
+		@Column(name = "`Position+id`")
+		Long positionId;
+	}
+
+	public static class JobPositionId {
+		Long id;
+		Long user;
+		Long positionId;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Long getUser() {
+			return user;
+		}
+
+		public void setUser(Long user) {
+			this.user = user;
+		}
+
+		public Long getPositionId() {
+			return positionId;
+		}
+
+		public void setPositionId(Long positionId) {
+			this.positionId = positionId;
+		}
+	}
+
+	@Entity
+	@Table(name = "Position")
+	@IdClass(PositionId.class)
+	public static class Position2 {
+		@Id
+		@Column(name = "`Position+id`")
+		Long id;
+		@Column(name = "position++name")
+		String name;
+		@ManyToOne
+		@JoinColumn(name = "`User+id`", referencedColumnName = "`User+id`")
+		@Id
+		User user;
+	}
+
+	public static class PositionId {
+		Long id;
+		Long user;
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public Long getUser() {
+			return user;
+		}
+
+		public void setUser(Long user) {
+			this.user = user;
+		}
+	}
+
+	@Entity
+	@Table(name = "`User`")
+	public static class User {
+		@Id
+		@Column(name = "`User+id`")
+		Long id;
+		@Column(name = "Name")
+		String name;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/AbstractReadOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/AbstractReadOnlyTest.java
index b46200284d4e..55d9b09e5723 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/AbstractReadOnlyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/AbstractReadOnlyTest.java
@@ -55,4 +55,9 @@ protected void assertDeleteCount(int expected, SessionFactoryScope scope) {
 		int deletes = (int) scope.getSessionFactory().getStatistics().getEntityDeleteCount();
 		assertEquals( expected, deletes, "unexpected delete counts" );
 	}
+
+	protected int getScale(SessionFactoryScope scope) {
+		// spanner numeric datatype only supports scale up to 9
+		return scope.getSessionFactory().getJdbcServices().getDialect() instanceof org.hibernate.dialect.SpannerDialect ? 9 : 19;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyCollectionTest.java
new file mode 100644
index 000000000000..c1cbe9b17ff2
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyCollectionTest.java
@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.readonly;
+
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.PersistenceException;
+import org.hibernate.ReadOnlyMode;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses = {ReadOnlyCollectionTest.ModifiableEntity.class})
+class ReadOnlyCollectionTest {
+	@Test void test(SessionFactoryScope scope) {
+		UUID uuid = scope.fromTransaction( session -> {
+			var entity = new ModifiableEntity();
+			entity.strings.add( "foo" );
+			session.persist( entity );
+			return entity.uuid;
+		} );
+		assertThrows( PersistenceException.class, () -> scope.inTransaction( session -> {
+			var entity =
+					session.find( ModifiableEntity.class, uuid,
+							ReadOnlyMode.READ_ONLY );
+			assertTrue( session.isReadOnly( entity ) );
+			assertEquals( List.of( "foo" ), entity.strings );
+			entity.strings.add( "bar" );
+		} ) );
+		assertThrows( PersistenceException.class, () -> scope.inTransaction( session -> {
+			var entity =
+					session.find( ModifiableEntity.class, uuid,
+							ReadOnlyMode.READ_ONLY );
+			assertEquals( List.of( "foo" ), entity.strings );
+			entity.strings.clear();
+		} ) );
+		assertThrows( PersistenceException.class, () ->
+				scope.inTransaction( session -> {
+			var entity =
+					session.find( ModifiableEntity.class, uuid,
+							ReadOnlyMode.READ_ONLY );
+			assertEquals( List.of( "foo" ), entity.strings );
+			entity.strings = null;
+		} ) );
+		scope.inTransaction( session -> {
+			var entity =
+					session.find( ModifiableEntity.class, uuid,
+							ReadOnlyMode.READ_ONLY );
+			assertEquals( List.of( "foo" ), entity.strings );
+		} );
+	}
+	@Entity(name = "ModifiableEntity")
+	static class ModifiableEntity {
+		@GeneratedValue
+		@Id UUID uuid;
+		double numericValue;
+		@ElementCollection
+		@CollectionTable(name = "STRINGS")
+		List<String> strings = new ArrayList<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java
index 7ae48f5fe2ff..1469f75d60b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java
@@ -79,8 +79,8 @@ public void testReadOnlyViaSessionDoesNotInit(SessionFactoryScope scope) {
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( dpOrig.getDescription(), dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -126,8 +126,8 @@ public void testReadOnlyViaLazyInitializerDoesNotInit(SessionFactoryScope scope)
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( dpOrig.getDescription(), dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -213,8 +213,8 @@ public void testReadOnlyViaSessionNoChangeAfterInit(SessionFactoryScope scope) {
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( dpOrig.getDescription(), dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -303,8 +303,8 @@ public void testReadOnlyViaLazyInitializerNoChangeAfterInit(SessionFactoryScope
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( dpOrig.getDescription(), dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -342,8 +342,8 @@ public void testReadOnlyViaSessionBeforeInit(SessionFactoryScope scope) {
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( dpOrig.getDescription(), dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -381,8 +381,8 @@ public void testModifiableViaSessionBeforeInit(SessionFactoryScope scope) {
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( "changed", dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -430,8 +430,8 @@ public void testReadOnlyViaSessionBeforeInitByModifiableQuery(SessionFactoryScop
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( dpOrig.getDescription(), dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -477,8 +477,8 @@ public void testReadOnlyViaSessionBeforeInitByReadOnlyQuery(SessionFactoryScope
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( dpOrig.getDescription(), dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -522,8 +522,8 @@ public void testModifiableViaSessionBeforeInitByModifiableQuery(SessionFactorySc
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( "changed", dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -567,8 +567,8 @@ public void testModifiableViaSessionBeforeInitByReadOnlyQuery(SessionFactoryScop
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( "changed", dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -610,8 +610,8 @@ public void testReadOnlyViaLazyInitializerBeforeInit(SessionFactoryScope scope)
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( dpOrig.getDescription(), dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -652,8 +652,8 @@ public void testModifiableViaLazyInitializerBeforeInit(SessionFactoryScope scope
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( "changed", dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -695,8 +695,8 @@ public void testReadOnlyViaLazyInitializerAfterInit(SessionFactoryScope scope) {
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( dpOrig.getDescription(), dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -737,8 +737,8 @@ public void testModifiableViaLazyInitializerAfterInit(SessionFactoryScope scope)
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( "changed", dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -784,8 +784,8 @@ public void testModifyToReadOnlyToModifiableIsUpdated(SessionFactoryScope scope)
 						DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 						assertEquals( dpOrig.getId(), dp.getId() );
 						assertEquals( dpOrig.getDescription(), dp.getDescription() );
-						assertEquals( dpOrig.getX(), dp.getX() );
-						assertEquals( dpOrig.getY(), dp.getY() );
+						assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+						assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 
 						assertEquals( "changed", dp.getDescription() );
 						// should fail due to HHH-4642
@@ -844,8 +844,8 @@ public void testReadOnlyModifiedToModifiableIsUpdated(SessionFactoryScope scope)
 						DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 						assertEquals( dpOrig.getId(), dp.getId() );
 						assertEquals( dpOrig.getDescription(), dp.getDescription() );
-						assertEquals( dpOrig.getX(), dp.getX() );
-						assertEquals( dpOrig.getY(), dp.getY() );
+						assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+						assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 
 						assertEquals( "changed", dp.getDescription() );
 						// should fail due to HHH-4642
@@ -904,8 +904,8 @@ public void testReadOnlyChangedEvictedMerge(SessionFactoryScope scope) {
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( "changed", dp.getDescription() );
 					assertEquals( dpOrig.getId(), dp.getId() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -947,8 +947,8 @@ public void testReadOnlyToModifiableInitWhenModifiedIsUpdated(SessionFactoryScop
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( "changed", dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -993,8 +993,8 @@ public void testReadOnlyInitToModifiableModifiedIsUpdated(SessionFactoryScope sc
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( "changed", dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -1036,8 +1036,8 @@ public void testReadOnlyModifiedMerge(SessionFactoryScope scope) {
 					DataPoint dp = session.get( DataPoint.class, dpOrig.getId() );
 					assertEquals( dpOrig.getId(), dp.getId() );
 					assertEquals( dpOrig.getDescription(), dp.getDescription() );
-					assertEquals( dpOrig.getX(), dp.getX() );
-					assertEquals( dpOrig.getY(), dp.getY() );
+					assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+					assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 					session.remove( dp );
 				}
 		);
@@ -1085,8 +1085,8 @@ public void testReadOnlyRefresh(SessionFactoryScope scope) {
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
 		dp.setDescription( "original" );
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
@@ -1129,8 +1129,8 @@ public void testReadOnlyRefreshDeleted(SessionFactoryScope scope) {
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
 		dp.setDescription( "original" );
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
@@ -1247,8 +1247,8 @@ public void testReadOnlyProxyMergeDetachedProxyWithChange(SessionFactoryScope sc
 		dp = s.get( DataPoint.class, dpOrig.getId() );
 		assertEquals( dpOrig.getId(), dp.getId() );
 		assertEquals( dpOrig.getDescription(), dp.getDescription() );
-		assertEquals( dpOrig.getX(), dp.getX() );
-		assertEquals( dpOrig.getY(), dp.getY() );
+		assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+		assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 		s.remove( dp );
 		s.getTransaction().commit();
 		s.close();
@@ -1297,8 +1297,8 @@ public void testReadOnlyProxyInitMergeDetachedProxyWithChange(SessionFactoryScop
 		dp = s.get( DataPoint.class, dpOrig.getId() );
 		assertEquals( dpOrig.getId(), dp.getId() );
 		assertEquals( dpOrig.getDescription(), dp.getDescription() );
-		assertEquals( dpOrig.getX(), dp.getX() );
-		assertEquals( dpOrig.getY(), dp.getY() );
+		assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+		assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 		s.remove( dp );
 		s.getTransaction().commit();
 		s.close();
@@ -1347,8 +1347,8 @@ public void testReadOnlyProxyMergeDetachedEntityWithChange(SessionFactoryScope s
 		dp = s.get( DataPoint.class, dpOrig.getId() );
 		assertEquals( dpOrig.getId(), dp.getId() );
 		assertEquals( dpOrig.getDescription(), dp.getDescription() );
-		assertEquals( dpOrig.getX(), dp.getX() );
-		assertEquals( dpOrig.getY(), dp.getY() );
+		assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+		assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 		s.remove( dp );
 		s.getTransaction().commit();
 		s.close();
@@ -1398,8 +1398,8 @@ public void testReadOnlyProxyInitMergeDetachedEntityWithChange(SessionFactorySco
 		dp = s.get( DataPoint.class, dpOrig.getId() );
 		assertEquals( dpOrig.getId(), dp.getId() );
 		assertEquals( dpOrig.getDescription(), dp.getDescription() );
-		assertEquals( dpOrig.getX(), dp.getX() );
-		assertEquals( dpOrig.getY(), dp.getY() );
+		assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+		assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 		s.remove( dp );
 		s.getTransaction().commit();
 		s.close();
@@ -1445,8 +1445,8 @@ public void testReadOnlyEntityMergeDetachedProxyWithChange(SessionFactoryScope s
 		dp = s.get( DataPoint.class, dpOrig.getId() );
 		assertEquals( dpOrig.getId(), dp.getId() );
 		assertEquals( dpOrig.getDescription(), dp.getDescription() );
-		assertEquals( dpOrig.getX(), dp.getX() );
-		assertEquals( dpOrig.getY(), dp.getY() );
+		assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+		assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 		s.remove( dp );
 		s.getTransaction().commit();
 		s.close();
@@ -1489,8 +1489,8 @@ public void testSetReadOnlyInTwoTransactionsSameSession(SessionFactoryScope scop
 		dp = s.get( DataPoint.class, dpOrig.getId() );
 		assertEquals( dpOrig.getId(), dp.getId() );
 		assertEquals( dpOrig.getDescription(), dp.getDescription() );
-		assertEquals( dpOrig.getX(), dp.getX() );
-		assertEquals( dpOrig.getY(), dp.getY() );
+		assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+		assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 		s.remove( dp );
 		s.getTransaction().commit();
 		s.close();
@@ -1533,8 +1533,8 @@ public void testSetReadOnlyBetweenTwoTransactionsSameSession(SessionFactoryScope
 		dp = s.get( DataPoint.class, dpOrig.getId() );
 		assertEquals( dpOrig.getId(), dp.getId() );
 		assertEquals( "changed", dp.getDescription() );
-		assertEquals( dpOrig.getX(), dp.getX() );
-		assertEquals( dpOrig.getY(), dp.getY() );
+		assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+		assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 		s.remove( dp );
 		s.getTransaction().commit();
 		s.close();
@@ -1583,8 +1583,8 @@ public void testSetModifiableBetweenTwoTransactionsSameSession(SessionFactorySco
 		dp = s.get( DataPoint.class, dpOrig.getId() );
 		assertEquals( dpOrig.getId(), dp.getId() );
 		assertEquals( "changed again", dp.getDescription() );
-		assertEquals( dpOrig.getX(), dp.getX() );
-		assertEquals( dpOrig.getY(), dp.getY() );
+		assertEquals( 0, dpOrig.getX().compareTo( dp.getX() ) );
+		assertEquals( 0, dpOrig.getY().compareTo( dp.getY() ) );
 		s.remove( dp );
 		s.getTransaction().commit();
 		s.close();
@@ -1890,8 +1890,8 @@ private DataPoint createDataPoint(CacheMode cacheMode, SessionFactoryScope scope
 		s.setCacheMode( cacheMode );
 		s.beginTransaction();
 		DataPoint dp = new DataPoint();
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		dp.setDescription( "original" );
 		s.persist( dp );
 		s.getTransaction().commit();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java
index 004050843018..2f204ed7dc6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java
@@ -49,8 +49,8 @@ public void testReadOnlyOnProxies(SessionFactoryScope scope) {
 		s.setCacheMode( CacheMode.IGNORE );
 		s.beginTransaction();
 		DataPoint dp = new DataPoint();
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		dp.setDescription( "original" );
 		s.persist( dp );
 		long dpId = dp.getId();
@@ -90,8 +90,8 @@ public void testReadOnlySessionDefaultQueryScroll(SessionFactoryScope scope) {
 		Transaction t = s.beginTransaction();
 		for ( int i = 0; i < 100; i++ ) {
 			DataPoint dp = new DataPoint();
-			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 			s.persist( dp );
 		}
 		t.commit();
@@ -130,8 +130,8 @@ public void testReadOnlySessionModifiableQueryScroll(SessionFactoryScope scope)
 		Transaction t = s.beginTransaction();
 		for ( int i = 0; i < 100; i++ ) {
 			DataPoint dp = new DataPoint();
-			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 			s.persist( dp );
 		}
 		t.commit();
@@ -170,8 +170,8 @@ public void testModifiableSessionReadOnlyQueryScroll(SessionFactoryScope scope)
 		Transaction t = s.beginTransaction();
 		for ( int i = 0; i < 100; i++ ) {
 			DataPoint dp = new DataPoint();
-			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 			s.persist( dp );
 		}
 		t.commit();
@@ -210,8 +210,8 @@ public void testModifiableSessionDefaultQueryReadOnlySessionScroll(SessionFactor
 		Transaction t = s.beginTransaction();
 		for ( int i = 0; i < 100; i++ ) {
 			DataPoint dp = new DataPoint();
-			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 			s.persist( dp );
 		}
 		t.commit();
@@ -252,8 +252,8 @@ public void testQueryReadOnlyScroll(SessionFactoryScope scope) {
 		DataPoint dp = null;
 		for ( int i = 0; i < 100; i++ ) {
 			dp = new DataPoint();
-			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 			s.persist( dp );
 		}
 		t.commit();
@@ -329,8 +329,8 @@ public void testQueryModifiableScroll(SessionFactoryScope scope) {
 		DataPoint dp = null;
 		for ( int i = 0; i < 100; i++ ) {
 			dp = new DataPoint();
-			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 			s.persist( dp );
 		}
 		t.commit();
@@ -404,8 +404,8 @@ public void testReadOnlyRefresh(SessionFactoryScope scope) {
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
 		dp.setDescription( "original" );
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
@@ -448,8 +448,8 @@ public void testReadOnlyProxyRefresh(SessionFactoryScope scope) {
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
 		dp.setDescription( "original" );
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
@@ -504,8 +504,8 @@ public void testReadOnlyDelete(SessionFactoryScope scope) {
 		s.setCacheMode( CacheMode.IGNORE );
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
@@ -536,8 +536,8 @@ public void testReadOnlyGetModifyAndDelete(SessionFactoryScope scope) {
 		s.setCacheMode( CacheMode.IGNORE );
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
@@ -569,8 +569,8 @@ public void testReadOnlyModeWithExistingModifiableEntity(SessionFactoryScope sco
 		DataPoint dp = null;
 		for ( int i = 0; i < 100; i++ ) {
 			dp = new DataPoint();
-			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 			s.persist( dp );
 		}
 		t.commit();
@@ -621,8 +621,8 @@ public void testModifiableModeWithExistingReadOnlyEntity(SessionFactoryScope sco
 		DataPoint dp = null;
 		for ( int i = 0; i < 100; i++ ) {
 			dp = new DataPoint();
-			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 			s.persist( dp );
 		}
 		t.commit();
@@ -705,8 +705,8 @@ public void testMergeWithReadOnlyEntity(SessionFactoryScope scope) {
 		s.setCacheMode( CacheMode.IGNORE );
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
@@ -739,8 +739,8 @@ public void testMergeWithReadOnlyProxy(SessionFactoryScope scope) {
 		s.setCacheMode( CacheMode.IGNORE );
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java
index f9b596b0fccd..ef2be6cb35bd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java
@@ -42,9 +42,8 @@ public void testReadOnlyOnProxies(SessionFactoryScope scope) {
 		long dpId = scope.fromTransaction(
 				session -> {
 					DataPoint dp = new DataPoint();
-					dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-					dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale(
-							19,
+					dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+					dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ),
 							BigDecimal.ROUND_DOWN
 					) );
 					dp.setDescription( "original" );
@@ -94,9 +93,8 @@ public void testReadOnlyMode(SessionFactoryScope scope) {
 				session -> {
 					for ( int i = 0; i < 100; i++ ) {
 						DataPoint dp = new DataPoint();
-						dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-						dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale(
-								19,
+						dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+						dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ),
 								BigDecimal.ROUND_DOWN
 						) );
 						session.persist( dp );
@@ -160,9 +158,8 @@ public void testReadOnlyModeAutoFlushOnQuery(SessionFactoryScope scope) {
 					DataPoint dpFirst = null;
 					for ( int i = 0; i < 100; i++ ) {
 						DataPoint dp = new DataPoint();
-						dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-						dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale(
-								19,
+						dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+						dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ),
 								BigDecimal.ROUND_DOWN
 						) );
 						session.persist( dp );
@@ -200,9 +197,8 @@ public void testSaveReadOnlyModifyInSaveTransaction(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					d.setDescription( "original" );
-					d.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-					d.setY( new BigDecimal( Math.cos( d.getX().doubleValue() ) ).setScale(
-							19,
+					d.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+					d.setY( new BigDecimal( Math.cos( d.getX().doubleValue() ) ).setScale( getScale( scope ),
 							BigDecimal.ROUND_DOWN
 					) );
 					session.persist( d );
@@ -261,9 +257,8 @@ public void testReadOnlyRefresh(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					d.setDescription( "original" );
-					d.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-					d.setY( new BigDecimal( Math.cos( d.getX().doubleValue() ) ).setScale(
-							19,
+					d.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+					d.setY( new BigDecimal( Math.cos( d.getX().doubleValue() ) ).setScale( getScale( scope ),
 							BigDecimal.ROUND_DOWN
 					) );
 					session.persist( d );
@@ -320,8 +315,8 @@ public void testReadOnlyDelete(SessionFactoryScope scope) {
 		Session s = openSession( scope );
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
@@ -357,8 +352,8 @@ public void testReadOnlyGetModifyAndDelete(SessionFactoryScope scope) {
 		Session s = openSession( scope );
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
@@ -397,8 +392,8 @@ public void testReadOnlyModeWithExistingModifiableEntity(SessionFactoryScope sco
 		DataPoint dp = null;
 		for ( int i = 0; i < 100; i++ ) {
 			dp = new DataPoint();
-			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 			s.persist( dp );
 		}
 		t.commit();
@@ -459,8 +454,8 @@ public void testModifiableModeWithExistingReadOnlyEntity(SessionFactoryScope sco
 		DataPoint dp = null;
 		for ( int i = 0; i < 100; i++ ) {
 			dp = new DataPoint();
-			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+			dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 			s.persist( dp );
 		}
 		t.commit();
@@ -566,8 +561,8 @@ public void testMergeWithReadOnlyEntity(SessionFactoryScope scope) {
 		Session s = openSession( scope );
 		Transaction t = s.beginTransaction();
 		DataPoint dp = new DataPoint();
-		dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) );
-		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) );
+		dp.setX( new BigDecimal( 0.1d ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
+		dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( getScale( scope ), BigDecimal.ROUND_DOWN ) );
 		s.persist( dp );
 		t.commit();
 		s.close();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java
index 21a9a7014fc6..b7bce8a9d847 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java
@@ -247,7 +247,7 @@ public void testSetReadOnlyUpdateSetModifiable(SessionFactoryScope scope) {
 		);
 	}
 
-	@Test
+	@Test @FailureExpected
 	public void testAddNewChildToReadOnlyParent(SessionFactoryScope scope) {
 		VersionedNode p = createVersionNode( "parent", "parent", scope );
 
@@ -280,7 +280,7 @@ public void testAddNewChildToReadOnlyParent(SessionFactoryScope scope) {
 		);
 	}
 
-	@Test
+	@Test @FailureExpected
 	public void testUpdateParentWithNewChildCommitWithReadOnlyParent(SessionFactoryScope scope) {
 		VersionedNode p = createVersionNode( "parent", "parent", scope );
 
@@ -322,7 +322,7 @@ public void testUpdateParentWithNewChildCommitWithReadOnlyParent(SessionFactoryS
 		assertDeleteCount( 2, scope );
 	}
 
-	@Test
+	@Test @FailureExpected
 	public void testMergeDetachedParentWithNewChildCommitWithReadOnlyParent(SessionFactoryScope scope) {
 		VersionedNode p = createVersionNode( "parent", "parent", scope );
 
@@ -364,7 +364,7 @@ public void testMergeDetachedParentWithNewChildCommitWithReadOnlyParent(SessionF
 		assertDeleteCount( 2, scope );
 	}
 
-	@Test
+	@Test @FailureExpected
 	public void testGetParentMakeReadOnlyThenMergeDetachedParentWithNewChildC(SessionFactoryScope scope) {
 		VersionedNode p = createVersionNode( "parent", "parent", scope );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReplicasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReplicasTest.java
index 00497638cf0c..c59bd1157951 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReplicasTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReplicasTest.java
@@ -109,7 +109,7 @@ public void closeReadOnlyConnection(Connection connection) throws SQLException {
 		}
 	}
 
-	@Entity
+	@Entity(name = "Thing")
 	static class Thing {
 		@Id
 		Long id = 2L;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java
index 60be282638b2..b37897d1c7db 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/EmbeddableInstantiatorTest.java
@@ -89,7 +89,7 @@ public Object instantiate(ValueAccess valueAccess) {
 		}
 	}
 
-	@Entity
+	@Entity(name = "Wrapper")
 	public static class Wrapper {
 
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/GenericEmbeddedIdRecordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/GenericEmbeddedIdRecordTest.java
index 8a0acc046974..cde2a23051d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/GenericEmbeddedIdRecordTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/GenericEmbeddedIdRecordTest.java
@@ -49,7 +49,7 @@ public record GenericEmbeddedId<T>(@ManyToOne(fetch = FetchType.EAGER)
 									T referencedEntity) {
 	}
 
-	@Entity
+	@Entity(name = "MainEntity")
 	public static class MainEntity {
 
 		@EmbeddedId
@@ -60,7 +60,7 @@ public static class MainEntity {
 
 	}
 
-	@Entity
+	@Entity(name = "ReferencedEntity")
 	public static class ReferencedEntity {
 
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordStructEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordStructEmbeddableTest.java
index 8d3b906bd24e..3d90996b73d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordStructEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordStructEmbeddableTest.java
@@ -8,13 +8,12 @@
 
 import org.hibernate.annotations.Struct;
 import org.hibernate.dialect.DB2Dialect;
-import org.hibernate.dialect.OracleDialect;
-import org.hibernate.dialect.PostgreSQLDialect;
 
 import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
 import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -36,9 +35,7 @@
 )
 @DomainModel(annotatedClasses = RecordStructEmbeddableTest.RecordStructHolder.class)
 @SessionFactory
-@RequiresDialect(PostgreSQLDialect.class)
-@RequiresDialect(OracleDialect.class)
-@RequiresDialect(DB2Dialect.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsUserDefinedTypes.class )
 public class RecordStructEmbeddableTest {
 
 	@BeforeEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java
index 8b15b9c2e386..24aa9d1e6857 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/LogicalConnectionTestingImpl.java
@@ -13,6 +13,7 @@
  */
 public class LogicalConnectionTestingImpl extends LogicalConnectionProvidedImpl {
 	public LogicalConnectionTestingImpl() throws Exception {
-		super( DatabaseConnectionInfo.INSTANCE.makeConnection(), new ResourceRegistryStandardImpl() );
+		super( DatabaseConnectionInfo.INSTANCE.makeConnection(),
+				new ResourceRegistryStandardImpl() );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java
index 79c0b5364b0e..106d9b59e546 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/SkipAutoCommitTest.java
@@ -53,8 +53,8 @@ protected Connection actualConnection() throws SQLException {
 		};
 
 	@Override
-	protected Map getConfig() {
-		Map config = super.getConfig();
+	protected Map<String, Object> getConfig() {
+		Map<String, Object> config = super.getConfig();
 
 		config.put( AvailableSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT, Boolean.TRUE );
 		config.put( AvailableSettings.CONNECTION_PROVIDER, connectionProvider );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/ResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/ResultTransformerTest.java
index 2224f8946496..22fc8df8d095 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/ResultTransformerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resulttransformer/ResultTransformerTest.java
@@ -5,8 +5,8 @@
 package org.hibernate.orm.test.resulttransformer;
 
 
+import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
-import org.hibernate.dialect.HANADialect;
 import org.hibernate.query.Query;
 import org.hibernate.transform.ResultTransformer;
 
@@ -59,9 +59,9 @@ public void testResultTransformerIsAppliedToScrollableResults(SessionFactoryScop
 			);
 
 			try (ScrollableResults sr = q.scroll()) {
-				// HANA supports only ResultSet.TYPE_FORWARD_ONLY and
+				// HANA and Spanner supports only ResultSet.TYPE_FORWARD_ONLY and
 				// does not support java.sql.ResultSet.first()
-				if ( scope.getSessionFactory().getJdbcServices().getDialect() instanceof HANADialect ) {
+				if ( scope.getSessionFactory().getJdbcServices().getDialect().defaultScrollMode() == ScrollMode.FORWARD_ONLY) {
 					sr.next();
 				}
 				else {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerResyncSequencesPooledLoTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerResyncSequencesPooledLoTest.java
index 392a2db5d108..d91abad44bcb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerResyncSequencesPooledLoTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerResyncSequencesPooledLoTest.java
@@ -8,7 +8,9 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.SequenceGenerator;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -21,6 +23,7 @@
 @SessionFactory
 @DomainModel(annotatedClasses = SchemaManagerResyncSequencesPooledLoTest.EntityWithSequence.class)
 @ServiceRegistry(settings = @Setting(name = PREFERRED_POOLED_OPTIMIZER, value = "pooled-lo"))
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledOptimizer.class )
 class SchemaManagerResyncSequencesPooledLoTest {
 	@Test void test(SessionFactoryScope scope) {
 		var schemaManager = scope.getSessionFactory().getSchemaManager();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerResyncSequencesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerResyncSequencesTest.java
index e4db780d2cc6..375aa7b49775 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerResyncSequencesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemamanager/SchemaManagerResyncSequencesTest.java
@@ -8,7 +8,9 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.SequenceGenerator;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
@@ -17,6 +19,7 @@
 
 @SessionFactory
 @DomainModel(annotatedClasses = SchemaManagerResyncSequencesTest.EntityWithSequence.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportPooledSequences.class)
 class SchemaManagerResyncSequencesTest {
 	@Test void test(SessionFactoryScope scope) {
 		var schemaManager = scope.getSessionFactory().getSchemaManager();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/PrimaryKeyColumnOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/PrimaryKeyColumnOrderTest.java
index 3d1483dd2d7b..b4291d23f880 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/PrimaryKeyColumnOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/PrimaryKeyColumnOrderTest.java
@@ -73,7 +73,9 @@ public void setUp(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
-		scope.dropData();
+		scope.inTransaction( session ->
+				session.createNativeQuery( "drop table TEST_ENTITY " ).executeUpdate()
+		);
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java
index bf5af4076aeb..f6f4b2ce09a1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteDefaultSchemaTest.java
@@ -20,9 +20,11 @@
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.tool.hbm2ddl.SchemaUpdate;
 import org.hibernate.tool.schema.TargetType;
 
@@ -91,6 +93,7 @@ protected void tearDown() {
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support - in schema name" )
 	public void testDefaultSchema() throws IOException {
 		File output = File.createTempFile( "update_script", ".sql" );
 		output.deleteOnExit();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java
index 726065d0c8d3..76450fc5ac84 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/AlterTableQuoteSpecifiedSchemaTest.java
@@ -19,9 +19,11 @@
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.tool.hbm2ddl.SchemaUpdate;
 import org.hibernate.tool.schema.TargetType;
 
@@ -47,6 +49,7 @@
 @RequiresDialect(value = PostgreSQLDialect.class)
 @RequiresDialect(value = SQLServerDialect.class, majorVersion = 11)
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportSchemaCreation.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support - in schema name" )
 public class AlterTableQuoteSpecifiedSchemaTest extends AbstractAlterTableQuoteSchemaTest {
 
 	@BeforeEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java
index 102d0fa1ef7c..166e135a55d0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/MigrationTest.java
@@ -10,14 +10,20 @@
 import jakarta.persistence.Table;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.hbm2ddl.SchemaUpdate;
 import org.hibernate.tool.schema.TargetType;
 import org.junit.jupiter.api.Test;
 
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
 import java.util.EnumSet;
+import java.util.Locale;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -72,6 +78,7 @@ public void testSimpleColumnAddition(ServiceRegistryScope registryScope) {
 	}
 
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportAlterColumnType.class)
 	public void testSimpleColumnTypeChange(ServiceRegistryScope registryScope) {
 		String resource1 = "org/hibernate/orm/test/schemaupdate/1_Version.hbm.xml";
 		String resource4 = "org/hibernate/orm/test/schemaupdate/4_Version.hbm.xml";
@@ -109,6 +116,7 @@ public void testSimpleColumnTypeChange(ServiceRegistryScope registryScope) {
 		);
 
 		assertEquals( 0, v2schemaUpdate.getExceptions().size() );
+		assertColumnLength( registryScope, "Version", "description", 500 );
 
 		new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), v2metadata );
 
@@ -177,5 +185,43 @@ public static class PersonInfo {
 		private Integer id;
 	}
 
+	private void assertColumnLength(ServiceRegistryScope registryScope, String tableName, String columnName, int expectedLength) {
+		final var connectionProvider = registryScope.getRegistry().requireService( ConnectionProvider.class );
+		try {
+			final var connection = connectionProvider.getConnection();
+			try {
+				final var metaData = connection.getMetaData();
+				final String tablePattern = toMetadataIdentifier( metaData, tableName );
+				final String columnPattern = toMetadataIdentifier( metaData, columnName );
+
+				int actualLength = -1;
+				try ( var resultSet = metaData.getColumns( null, null, tablePattern, columnPattern ) ) {
+					while ( resultSet.next() ) {
+						actualLength = Math.max( actualLength, resultSet.getInt( "COLUMN_SIZE" ) );
+					}
+				}
+				assertEquals(
+						expectedLength,
+						actualLength,
+						"Unexpected column length for " + tableName + "." + columnName
+				);
+			}
+			finally {
+				connectionProvider.closeConnection( connection );
+			}
+		}
+		catch (SQLException e) {
+			throw new RuntimeException( e );
+		}
+	}
 
+	private String toMetadataIdentifier(DatabaseMetaData metaData, String identifier) throws SQLException {
+		if ( metaData.storesUpperCaseIdentifiers() ) {
+			return identifier.toUpperCase( Locale.ROOT );
+		}
+		if ( metaData.storesLowerCaseIdentifiers() ) {
+			return identifier.toLowerCase( Locale.ROOT );
+		}
+		return identifier;
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java
index 434cf2655234..47339462473a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/PostgreSQLMultipleSchemaSequenceTest.java
@@ -13,6 +13,7 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.Environment;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator;
@@ -22,6 +23,7 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.schema.TargetType;
@@ -46,6 +48,7 @@
  */
 @RequiresDialect(PostgreSQLDialect.class)
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportSchemaCreation.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support DROP...CASCADE")
 public class PostgreSQLMultipleSchemaSequenceTest {
 	private static final String extraSchemaName = "extra_schema_sequence_validation";
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java
index b1046ec5f8d3..eb37dca74670 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java
@@ -16,6 +16,7 @@
 import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.community.dialect.DerbyDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.Setting;
@@ -39,6 +40,8 @@
 		reason = "AltibaseDialect has autoQuoteKeywords enabled, so it is far more resistant to the reserved keyword usage.")
 @SkipForDialect(dialectClass = InformixDialect.class,
 		reason = "Informix is far more resistant to the reserved keyword usage.")
+@SkipForDialect(dialectClass = SpannerDialect.class,
+		reason = "SpannerDialect has autoQuoteKeywords enabled, so it is far more resistant to the reserved keyword usage.")
 @Jpa(
 		annotatedClasses = SchemaMigratorHaltOnErrorTest.From.class,
 		integrationSettings = {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java
index 75b87ba7c421..8483a29721e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateHaltOnErrorTest.java
@@ -11,6 +11,7 @@
 import org.hibernate.community.dialect.FirebirdDialect;
 import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.DB2Dialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.DomainModelScope;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
@@ -38,6 +39,8 @@
 		reason = "AltibaseDialect has autoQuoteKeywords enabled, so it is far more resistant to the reserved keyword usage.")
 @SkipForDialect(dialectClass = InformixDialect.class,
 		reason = "Informix is far more resistant to the reserved keyword usage.")
+@SkipForDialect(dialectClass = SpannerDialect.class,
+		reason = "SpannerDialect has autoQuoteKeywords enabled, so it is far more resistant to the reserved keyword usage.")
 @ServiceRegistry
 @DomainModel(annotatedClasses = SchemaUpdateHaltOnErrorTest.From.class)
 public class SchemaUpdateHaltOnErrorTest {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java
index c0ec5530941f..709fd3591cbb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateTest.java
@@ -23,8 +23,10 @@
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.community.dialect.TiDBDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
@@ -139,6 +141,8 @@ public void tearsDown(DomainModelScope modelScope) {
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support storing two tables with the name differs only by case")
+	@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner doesn't support storing two tables with the name differs only by case")
 	public void testSchemaUpdateAndValidation(DomainModelScope modelScope) throws Exception {
 		if ( skip ) {
 			SkipLog.reportSkip( "skipping test because quoted names are not case-sensitive." );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java
index 3a467c88db19..5a4a6c478f57 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateWithFunctionIndexTest.java
@@ -10,10 +10,12 @@
 import jakarta.persistence.Index;
 import jakarta.persistence.Table;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.DomainModelScope;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -42,6 +44,7 @@
 })
 @DomainModel(annotatedClasses = SchemaUpdateWithFunctionIndexTest.MyEntity.class)
 @SessionFactory
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsTableWithoutPrimaryKey.class )
 public class SchemaUpdateWithFunctionIndexTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java
index 166f36f9c3f1..217ac91503fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SpannerSchemaCreationColumnTypesTest.java
@@ -71,7 +71,7 @@ public void testSchemaCreation() throws Exception {
 
 		final String fileContent = new String( Files.readAllBytes( output.toPath() ) );
 
-		assertThat(fileContent.toLowerCase( Locale.ROOT )).contains( "create table test_entity_table" );
+		assertThat(fileContent.toLowerCase(Locale.ROOT)).contains("create table test_entity_table");
 		assertThat(fileContent.toLowerCase( Locale.ROOT )).contains( "id int64 not null" );
 		assertThat(fileContent.toLowerCase( Locale.ROOT )).contains( "name_column string(255)" );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java
index 8a482ec22811..56c1d1068802 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idbag/IdBagSequenceTest.java
@@ -52,7 +52,6 @@ public void testIdBagSequenceGeneratorIsCreated(
 				.execute( EnumSet.of( TargetType.SCRIPT ), metadata );
 
 		String fileContent = new String( Files.readAllBytes( scriptFile.toPath() ) );
-		MatcherAssert.assertThat( fileContent.toLowerCase().contains( "create sequence seq_child_id" ), is( true ) );
+		MatcherAssert.assertThat( fileContent.toLowerCase().contains( "create sequence seq_child_id" ) || fileContent.toLowerCase().contains( "create sequence if not exists seq_child_id" ), is( true ) );
 	}
-
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorIncrementTest.java
index d6ac6f37578a..b321e5b4f2b6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorIncrementTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/idgenerator/SequenceGeneratorIncrementTest.java
@@ -38,6 +38,7 @@
 
 @BaseUnitTest
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsSequences.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportPooledSequences.class )
 public class SequenceGeneratorIncrementTest {
 	private File output;
 	private ServiceRegistry ssr;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java
index a7f6451a7773..210ad08976f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/inheritance/tableperclass/SchemaCreationTest.java
@@ -66,6 +66,8 @@ public void testUniqueConstraintIsCorrectlyGenerated(
 			isUniqueConstraintCreated = isUniqueConstraintCreated
 					|| statement.startsWith("create unique index")
 						&& statement.contains("category (code)")
+					|| statement.startsWith("create unique null_filtered index")
+						&& statement.contains("category (code)")
 					|| statement.startsWith("create unique nonclustered index")
 					&& statement.contains("category (code)")
 					|| statement.startsWith("alter table if exists category add constraint ")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/options/OptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/options/OptionsTest.java
index c2a53d3f7c00..6008425e267a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/options/OptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/options/OptionsTest.java
@@ -15,22 +15,57 @@
 import jakarta.persistence.SchemaValidationException;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.dialect.PostgreSQLDialect;
-import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
-import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.engine.jdbc.internal.Formatter;
+import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
+import org.hibernate.service.spi.ServiceContributor;
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
-@Jpa(annotatedClasses = OptionsTest.WithOptions.class,
-		useCollectingStatementInspector = true)
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hibernate.cfg.JdbcSettings.FORMAT_SQL;
+import static org.hibernate.cfg.JdbcSettings.HIGHLIGHT_SQL;
+import static org.hibernate.cfg.JdbcSettings.LOG_SLOW_QUERY;
+import static org.hibernate.cfg.JdbcSettings.SHOW_SQL;
+import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
+import static org.hibernate.internal.util.config.ConfigurationHelper.getLong;
+
+@DomainModel(annotatedClasses = OptionsTest.WithOptions.class)
+@SessionFactory
+@ServiceRegistry(serviceContributors = OptionsTest.CollectingSqlStatementLoggerServiceContributor.class)
 @RequiresDialect(value = PostgreSQLDialect.class, majorVersion = 14)
 public class OptionsTest {
-	@Test void test(EntityManagerFactoryScope scope) throws SchemaValidationException {
-		SchemaManager schemaManager = scope.getEntityManagerFactory().getSchemaManager();
+	@Test void test(SessionFactoryScope scope) throws SchemaValidationException {
+		final CollectingSqlStatementLogger statementInspector =
+				(CollectingSqlStatementLogger) scope.getSessionFactory().getJdbcServices().getSqlStatementLogger();
+		final SchemaManager schemaManager = scope.getSessionFactory().getSchemaManager();
 		schemaManager.drop(true);
-		schemaManager.create(true);
-		schemaManager.validate();
+		statementInspector.clear();
+
+		try {
+			schemaManager.create( true );
+			assertThat( statementInspector.getStatements().size() ).isEqualTo( 3 );
+			assertThat( statementInspector.getStatements().get( 0 ) ).contains( " compression pglz" );
+			assertThat( statementInspector.getStatements().get( 0 ) ).contains( " deferrable" );
+			assertThat( statementInspector.getStatements().get( 1 ) ).contains( " nulls distinct" );
+			assertThat( statementInspector.getStatements().get( 2 ) ).contains( " match full" );
+
+			schemaManager.validate();
+		}
+		finally {
+			schemaManager.drop( true );
+		}
 	}
+
 	@Entity
 	@Table(name = "TableWithOptions",
 			indexes = @Index(columnList = "name", options = "nulls distinct"),
@@ -46,4 +81,43 @@ static class WithOptions {
 		@JoinColumn(foreignKey = @ForeignKey(name = "ToOther", options = "match full"))
 		WithOptions other;
 	}
+
+	public static class CollectingSqlStatementLogger extends SqlStatementLogger {
+
+		private final List<String> statements = new ArrayList<>();
+
+		public CollectingSqlStatementLogger(boolean logToStdout, boolean format, boolean highlight, long logSlowQuery) {
+			super( logToStdout, format, highlight, logSlowQuery );
+		}
+
+		@Override
+		public void logStatement(String statement, Formatter formatter) {
+			statements.add( statement );
+			super.logStatement( statement, formatter );
+		}
+
+		public List<String> getStatements() {
+			return statements;
+		}
+
+		public void clear() {
+			statements.clear();
+		}
+	}
+
+	public static class CollectingSqlStatementLoggerServiceContributor implements ServiceContributor {
+		@Override
+		public void contribute(StandardServiceRegistryBuilder serviceRegistryBuilder) {
+			final Map<String, Object> configValues = serviceRegistryBuilder.getSettings();
+			final boolean showSQL = getBoolean( SHOW_SQL, configValues );
+			final boolean formatSQL = getBoolean( FORMAT_SQL, configValues );
+			final boolean highlightSQL = getBoolean( HIGHLIGHT_SQL, configValues );
+			final long logSlowQuery = getLong( LOG_SLOW_QUERY, configValues, -2 );
+
+			serviceRegistryBuilder.addService(
+					SqlStatementLogger.class,
+					new CollectingSqlStatementLogger( showSQL, formatSQL, highlightSQL, logSlowQuery )
+			);
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/SequenceGeneratorOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/SequenceGeneratorOptionsTest.java
index 07198b446fcc..d69fbb618c0c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/SequenceGeneratorOptionsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/sequencegenerator/SequenceGeneratorOptionsTest.java
@@ -77,7 +77,9 @@ private static boolean tableSequenceStatementContainsOptions(
 		for ( int i = 0; i < fileContent.length; i++ ) {
 			String statement = fileContent[i].toUpperCase( Locale.ROOT );
 			if ( dialect.getSequenceSupport().supportsSequences() ) {
-				if ( statement.contains( "CREATE SEQUENCE " + sequenceName.toUpperCase( Locale.ROOT ) ) ) {
+				String upperSequenceName = sequenceName.toUpperCase( Locale.ROOT );
+				if ( statement.contains( "CREATE SEQUENCE " + upperSequenceName )
+						|| statement.contains( "CREATE SEQUENCE IF NOT EXISTS " + upperSequenceName ) ) {
 					if ( statement.contains( options.toUpperCase( Locale.ROOT ) ) ) {
 						return true;
 					}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/CompositePrimaryKeyColumnOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/CompositePrimaryKeyColumnOrderTest.java
index e97f02caa658..ace741a4640f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/CompositePrimaryKeyColumnOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/CompositePrimaryKeyColumnOrderTest.java
@@ -49,7 +49,7 @@ public List<String> getManagedClassNames() {
 			}
 		};
 
-		Map<Object, Object> settings = Map.of( AvailableSettings.HBM2DDL_AUTO, "create" );
+		Map<String, Object> settings = Map.of( AvailableSettings.HBM2DDL_AUTO, "create" );
 		EntityManagerFactoryBuilder emfBuilder = Bootstrap.getEntityManagerFactoryBuilder( puDescriptor, settings );
 
 		Path ddlScript = tempDir.resolve( "ddl.sql" );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintColumnOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintColumnOrderTest.java
index 26919a3bc9ff..964bff64f2d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintColumnOrderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintColumnOrderTest.java
@@ -47,7 +47,7 @@ public List<String> getManagedClassNames() {
 			}
 		};
 
-		Map<Object, Object> settings = Map.of( AvailableSettings.HBM2DDL_AUTO, "create" );
+		Map<String, Object> settings = Map.of( AvailableSettings.HBM2DDL_AUTO, "create" );
 		EntityManagerFactoryBuilder emfBuilder = Bootstrap.getEntityManagerFactoryBuilder( puDescriptor, settings );
 
 		Path ddlScript = tempDir.resolve( "ddl.sql" );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java
index 5ac7a5dc9860..4e897b3b2109 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java
@@ -125,6 +125,10 @@ private boolean checkDropConstraint(
 			String tableName,
 			Dialect dialect,
 			File scriptFile) throws IOException {
+		if ( !dialect.supportsUniqueConstraints() ) {
+			return isMatching( "drop index( if exists)? " + tableName + ".uk.*", scriptFile );
+		}
+
 		String regex = dialect.getAlterTableString( tableName ) + ' ' + dialect.getDropUniqueKeyString();
 		if ( dialect.supportsIfExistsBeforeConstraintName() ) {
 			regex += " if exists";
@@ -138,7 +142,7 @@ private boolean checkDropConstraint(
 	}
 
 	private boolean checkDropIndex(File scriptFile) throws IOException {
-		String regex = "drop index test_entity_item.uk.*";
+		String regex = "drop index( if exists)? test_entity_item.uk.*";
 		return isMatching( regex, scriptFile );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java
index d74e71168cab..f05d21a45433 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintGenerationTest.java
@@ -84,7 +84,10 @@ private boolean isUniqueConstraintGenerated(
 			Dialect dialect,
 			File scriptFile) throws IOException {
 		final String regex;
-		if ( dialect.getUniqueDelegate() instanceof CreateTableUniqueDelegate ) {
+		if ( !dialect.supportsUniqueConstraints() ) {
+			regex = dialect.getCreateIndexString( true ) + " .* on " + tableName + " \\(" + columnName +"\\);";
+		}
+		else if ( dialect.getUniqueDelegate() instanceof CreateTableUniqueDelegate ) {
 			regex = dialect.getCreateTableString() + " " + tableName + " .* " + columnName + " .+ unique.*\\)"
 					+ dialect.getTableTypeString().toLowerCase() + ";";
 		}
@@ -109,7 +112,7 @@ private boolean isCreateUniqueIndexGenerated(
 			String tableName,
 			String columnName,
 			File scriptFile) throws IOException {
-		String regex = "create unique (nonclustered )?index uk.* on " + tableName
+		String regex = "create unique (nonclustered |null_filtered )?index uk.* on " + tableName
 				+ " \\(" + columnName + "\\)( where .*| exclude null keys)?;";
 		final String fileContent = new String( Files.readAllBytes( scriptFile.toPath() ) ).toLowerCase();
 		final String[] split = fileContent.split( System.lineSeparator() );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/DurationValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/DurationValidationTest.java
index b524d71224e4..805f4aad02dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/DurationValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/DurationValidationTest.java
@@ -15,9 +15,9 @@
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.dialect.H2Dialect;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.schema.JdbcMetadataAccessStrategy;
 import org.hibernate.tool.schema.SourceType;
@@ -35,7 +35,6 @@
 
 import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -50,8 +49,7 @@
 
 @JiraKey("HHH-17293")
 @BaseUnitTest
-@RequiresDialect(PostgreSQLDialect.class)
-@RequiresDialect(H2Dialect.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsIntervalSecondType.class )
 public class DurationValidationTest implements ExecutionOptions {
 	private StandardServiceRegistry ssr;
 	private MetadataImplementor metadata;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SQLServerJsonValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SQLServerJsonValidationTest.java
new file mode 100644
index 000000000000..44dbabf360d7
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SQLServerJsonValidationTest.java
@@ -0,0 +1,82 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.schemavalidation;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.cfg.MappingSettings;
+import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.testing.jdbc.JdbcUtils;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.DomainModelScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.ServiceRegistryScope;
+import org.hibernate.tool.hbm2ddl.SchemaValidator;
+import org.hibernate.type.SqlTypes;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+@JiraKey("HHH-20092")
+@RequiresDialect(SQLServerDialect.class)
+@ServiceRegistry(
+		settings = @org.hibernate.testing.orm.junit.Setting(
+				name = MappingSettings.USE_NATIONALIZED_CHARACTER_DATA,
+				value = "true"
+		)
+)
+public class SQLServerJsonValidationTest {
+
+	@BeforeEach
+	void setUp(ServiceRegistryScope registryScope) {
+		JdbcUtils.withConnection( registryScope.getRegistry(), connection -> {
+			try (var statement = connection.createStatement()) {
+				try {
+					statement.execute( "drop table Foo" );
+				}
+				catch (Exception ignore) {
+				}
+				statement.execute(
+						"""
+							create table Foo (
+								id integer not null,
+								jsonField nvarchar(max),
+								primary key (id)
+							)
+							"""
+				);
+			}
+		} );
+	}
+
+	@AfterEach
+	void tearDown(ServiceRegistryScope registryScope) {
+		JdbcUtils.withConnection( registryScope.getRegistry(), connection -> {
+			try (var statement = connection.createStatement()) {
+				statement.execute( "drop table Foo" );
+			}
+		} );
+	}
+
+	@Test
+	@DomainModel(annotatedClasses = SQLServerJsonValidationTest.Foo.class)
+	public void testSchemaValidation(DomainModelScope modelScope) {
+		new SchemaValidator().validate( modelScope.getDomainModel() );
+	}
+
+	@Entity(name = "Foo")
+	@Table(name = "Foo")
+	public static class Foo {
+		@Id
+		public Integer id;
+
+		@JdbcTypeCode(SqlTypes.JSON)
+		public String jsonField;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java
index e792f1d52ca3..3057fa32cb64 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java
@@ -10,6 +10,7 @@
 import jakarta.persistence.Table;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.testing.jdbc.JdbcUtils;
@@ -19,6 +20,7 @@
 import org.hibernate.testing.orm.junit.ServiceRegistryFunctionalTesting;
 import org.hibernate.testing.orm.junit.ServiceRegistryProducer;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.hbm2ddl.SchemaValidator;
 import org.hibernate.tool.schema.JdbcMetadataAccessStrategy;
@@ -46,6 +48,7 @@
 @MethodSource("extractorStrategies")
 @ServiceRegistryFunctionalTesting
 @DomainModel(annotatedClasses = ViewValidationTest.TestEntity.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support DROP...CASCADE")
 public class ViewValidationTest implements ServiceRegistryProducer {
 	static List<JdbcMetadataAccessStrategy> extractorStrategies() {
 		return List.of(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/HHH18813Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/HHH18813Test.java
index 741bd8bf3199..bb9daa4c795f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/HHH18813Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/HHH18813Test.java
@@ -101,7 +101,7 @@ public void setC(Long c) {
 		}
 	}
 
-	@Entity
+	@Entity(name = "SecondaryTableEntityBase")
 	@Inheritance(strategy = InheritanceType.JOINED)
 	public static class SecondaryTableEntityBase {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/BulkDeleteOwnerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/BulkDeleteOwnerTest.java
new file mode 100644
index 000000000000..51224eb9216c
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/BulkDeleteOwnerTest.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.softdelete.collections;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.SoftDelete;
+import org.hibernate.annotations.SoftDeleteType;
+import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.type.YesNoConverter;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SessionFactory
+@DomainModel( annotatedClasses = { BulkDeleteOwnerTest.Employee.class } )
+@Jira( "https://hibernate.atlassian.net/browse/HHH-19192" )
+public class BulkDeleteOwnerTest {
+	@Test void test(SessionFactoryScope scope) {
+		final SQLStatementInspector sqlInspector = scope.getCollectingStatementInspector();
+		sqlInspector.clear();
+		scope.inTransaction( session -> {
+			session.createMutationQuery( "delete Employee where id = 1" ).executeUpdate();
+			assertThat( sqlInspector.getSqlQueries() ).hasSize( 2 );
+			assertThat( sqlInspector.getSqlQueries().get( 0 ) ).containsAnyOf( "deleted='Y'", "deleted=N'Y'" );
+		} );
+	}
+
+	@Entity(name = "Employee")
+	@SoftDelete( strategy = SoftDeleteType.TIMESTAMP, columnName = "deleted_at" )
+	public static class Employee {
+		@Id
+		long id;
+		@ElementCollection
+		@SoftDelete( columnName = "deleted", converter = YesNoConverter.class )
+		private List<String> accolades;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/FetchLoadableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/FetchLoadableTests.java
index 98d55b3693a6..2f1690a097be 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/FetchLoadableTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/collections/FetchLoadableTests.java
@@ -4,7 +4,6 @@
  */
 package org.hibernate.orm.test.softdelete.collections;
 
-import java.sql.Statement;
 import java.util.HashSet;
 import java.util.List;
 
@@ -59,12 +58,7 @@ void createTestData(SessionFactoryScope scope) {
 
 	@AfterEach
 	void dropTestData(SessionFactoryScope scope) {
-		scope.inTransaction( (session) -> session.doWork( (connection) -> {
-			final Statement statement = connection.createStatement();
-			statement.execute( "delete from batch_loadables" );
-			statement.execute( "delete from subselect_loadables" );
-			statement.execute( "delete from coll_owner2" );
-		} ) );
+		scope.dropData();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/discovery/secondary/JoinedSubclassSoftDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/discovery/secondary/JoinedSubclassSoftDeleteTests.java
index 6de72d4ee2cb..2effd52695e5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/discovery/secondary/JoinedSubclassSoftDeleteTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/discovery/secondary/JoinedSubclassSoftDeleteTests.java
@@ -42,11 +42,7 @@ void createTestData(SessionFactoryScope scope) {
 
 	@AfterEach
 	void dropTestData(SessionFactoryScope scope) {
-		scope.inTransaction( (session) -> session.doWork( (connection) -> {
-			final Statement statement = connection.createStatement();
-			statement.execute( "delete from joined_sub" );
-			statement.execute( "delete from joined_root" );
-		} ) );
+		scope.getSessionFactory().getSchemaManager().truncate();
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/inheritance/SoftDeleteTablePerClassInlineTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/inheritance/SoftDeleteTablePerClassInlineTest.java
new file mode 100644
index 000000000000..f026740a0bbe
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/inheritance/SoftDeleteTablePerClassInlineTest.java
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.softdelete.inheritance;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.query.sqm.mutation.internal.inline.InlineMutationStrategy;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SettingProvider;
+
+/**
+ * Runs the same {@link SoftDeleteTablePerClassTest} scenarios using
+ * {@link InlineMutationStrategy} instead of the default mutation strategy.
+ */
+@DomainModel(annotatedClasses = {
+		SoftDeleteTablePerClassTest.Book.class,
+		SoftDeleteTablePerClassTest.SpellBook.class,
+		SoftDeleteTablePerClassTest.DarkSpellBook.class,
+		SoftDeleteTablePerClassTest.Novel.class
+})
+@SessionFactory
+@ServiceRegistry(settingProviders = {
+		@SettingProvider(
+				settingName = AvailableSettings.QUERY_MULTI_TABLE_MUTATION_STRATEGY,
+				provider = SoftDeleteTablePerClassInlineTest.InlineMutationStrategyProvider.class
+		)
+})
+public class SoftDeleteTablePerClassInlineTest extends SoftDeleteTablePerClassTest {
+
+	public static class InlineMutationStrategyProvider
+			implements SettingProvider.Provider<String> {
+		@Override
+		public String getSetting() {
+			return InlineMutationStrategy.class.getName();
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/inheritance/SoftDeleteTablePerClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/inheritance/SoftDeleteTablePerClassTest.java
new file mode 100644
index 000000000000..64a6ce325b17
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/inheritance/SoftDeleteTablePerClassTest.java
@@ -0,0 +1,248 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.softdelete.inheritance;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
+import jakarta.persistence.Tuple;
+import org.hibernate.annotations.SoftDelete;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.type.YesNoConverter;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
+@DomainModel(annotatedClasses = {
+		SoftDeleteTablePerClassTest.Book.class,
+		SoftDeleteTablePerClassTest.SpellBook.class,
+		SoftDeleteTablePerClassTest.DarkSpellBook.class,
+		SoftDeleteTablePerClassTest.Novel.class
+})
+@SessionFactory
+public class SoftDeleteTablePerClassTest {
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			session.persist( new SpellBook( 1, "Necronomicon", true ) );
+			session.persist( new SpellBook( 2, "Book of Shadows", false ) );
+			session.persist( new Novel( 3, "The Hobbit", "Fantasy" ) );
+			session.persist( new DarkSpellBook( 4, "Book of Vile Darkness", true, "Necromancy" ) );
+			session.persist( new DarkSpellBook( 5, "Necronomicon Ex-Mortis", true, "Dark Arts" ) );
+			session.persist( new Novel( 6, "1984", "Dystopian" ) );
+			session.persist( new DarkSpellBook( 7, "Grimoire of Shadows", true, "Illusion" ) );
+		} );
+		// Soft-delete via HQL bulk delete
+		scope.inTransaction( session -> {
+			// direct subclass delete
+			session.createMutationQuery( "delete from SpellBook where id = :id" )
+					.setParameter( "id", 1 )
+					.executeUpdate();
+			// root-level polymorphic delete targeting a nested subclass
+			session.createMutationQuery( "delete from Book where id = :id" )
+					.setParameter( "id", 5 )
+					.executeUpdate();
+			// mid-level polymorphic delete: SpellBook query targeting a DarkSpellBook row
+			session.createMutationQuery( "delete from SpellBook where id = :id" )
+					.setParameter( "id", 7 )
+					.executeUpdate();
+		} );
+		// Soft-delete via session.remove()
+		scope.inTransaction( session -> {
+			final var novel = session.find( Novel.class, 6 );
+			session.remove( novel );
+		} );
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+	}
+
+	@Test
+	@SkipForDialect( dialectClass = SpannerDialect.class,
+			reason = "Spanner JDBC driver currently doesn't support returning correct precision in the result metadata" )
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "Spanner JDBC driver currently doesn't support returning correct precision in the result metadata")
+	void testDeletedFlagsAreSetCorrectly(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			// SpellBook(1) soft-deleted via HQL, SpellBook(2) active
+			assertThat( session.createNativeQuery(
+					"select title, deleted from " + SpellBook.TABLE_NAME + " order by id", Tuple.class
+			).getResultList() )
+					.extracting( t -> t.get( "title" ), t -> t.get( "deleted" ) )
+					.containsExactly( tuple( "Necronomicon", 'Y' ), tuple( "Book of Shadows", 'N' ) );
+
+			// DarkSpellBook(5) deleted via root-level "delete from Book",
+			// DarkSpellBook(7) deleted via mid-level "delete from SpellBook",
+			// DarkSpellBook(4) active
+			assertThat( session.createNativeQuery(
+					"select title, deleted from " + DarkSpellBook.TABLE_NAME + " order by id", Tuple.class
+			).getResultList() )
+					.extracting( t -> t.get( "title" ), t -> t.get( "deleted" ) )
+					.containsExactly(
+							tuple( "Book of Vile Darkness", 'N' ),
+							tuple( "Necronomicon Ex-Mortis", 'Y' ),
+							tuple( "Grimoire of Shadows", 'Y' )
+					);
+
+			// Novel(6) soft-deleted via session.remove(), Novel(3) active
+			assertThat( session.createNativeQuery(
+					"select title, deleted from " + Novel.TABLE_NAME + " order by id", Tuple.class
+			).getResultList() )
+					.extracting( t -> t.get( "title" ), t -> t.get( "deleted" ) )
+					.containsExactly( tuple( "The Hobbit", 'N' ), tuple( "1984", 'Y' ) );
+		} );
+	}
+
+	@Test
+	void testQueriesExcludeSoftDeletedEntities(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			// find() returns null for all soft-deleted entities
+			assertThat( session.find( SpellBook.class, 1 ) ).isNull();
+			assertThat( session.find( DarkSpellBook.class, 5 ) ).isNull();
+			assertThat( session.find( Book.class, 6 ) ).isNull();
+			assertThat( session.find( DarkSpellBook.class, 7 ) ).isNull();
+
+			// Polymorphic root query
+			assertThat( session.createSelectionQuery( "from Book", Book.class ).getResultList() )
+					.extracting( Book::getTitle )
+					.containsExactlyInAnyOrder( "Book of Shadows", "The Hobbit", "Book of Vile Darkness" );
+
+			// Mid-level subclass query
+			assertThat( session.createSelectionQuery( "from SpellBook", SpellBook.class ).getResultList() )
+					.extracting( Book::getTitle )
+					.containsExactlyInAnyOrder( "Book of Shadows", "Book of Vile Darkness" );
+
+			// Leaf subclass query
+			assertThat( session.createSelectionQuery( "from DarkSpellBook", DarkSpellBook.class ).getResultList() )
+					.extracting( Book::getTitle )
+					.containsExactly( "Book of Vile Darkness" );
+
+			// Sibling subclass query
+			assertThat( session.createSelectionQuery( "from Novel", Novel.class ).getResultList() )
+					.extracting( Novel::getGenre )
+					.containsExactly( "Fantasy" );
+		} );
+	}
+
+	@Entity(name = "Book")
+	@Table(name = Book.TABLE_NAME)
+	@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
+	@SoftDelete(converter = YesNoConverter.class)
+	public static class Book {
+		private static final String TABLE_NAME = "book_table";
+
+		@Id
+		private Integer id;
+		private String title;
+
+		public Book() {
+		}
+
+		public Book(Integer id, String title) {
+			this.id = id;
+			this.title = title;
+		}
+
+		public Integer getId() {
+			return id;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public String getTitle() {
+			return title;
+		}
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
+	}
+
+	@Entity(name = "SpellBook")
+	@Table(name = SpellBook.TABLE_NAME)
+	public static class SpellBook extends Book {
+		private static final String TABLE_NAME = "spell_book_table";
+
+		private boolean forbidden;
+
+		public SpellBook() {
+		}
+
+		public SpellBook(Integer id, String title, boolean forbidden) {
+			super( id, title );
+			this.forbidden = forbidden;
+		}
+
+		public boolean isForbidden() {
+			return forbidden;
+		}
+
+		public void setForbidden(boolean forbidden) {
+			this.forbidden = forbidden;
+		}
+	}
+
+	@Entity(name = "DarkSpellBook")
+	@Table(name = DarkSpellBook.TABLE_NAME)
+	public static class DarkSpellBook extends SpellBook {
+		private static final String TABLE_NAME = "dark_spell_book_table";
+
+		private String school;
+
+		public DarkSpellBook() {
+		}
+
+		public DarkSpellBook(Integer id, String title, boolean forbidden, String school) {
+			super( id, title, forbidden );
+			this.school = school;
+		}
+
+		public String getSchool() {
+			return school;
+		}
+
+		public void setSchool(String school) {
+			this.school = school;
+		}
+	}
+
+	@Entity(name = "Novel")
+	@Table(name = Novel.TABLE_NAME)
+	public static class Novel extends Book {
+		private static final String TABLE_NAME = "novel_table";
+
+		private String genre;
+
+		public Novel() {
+		}
+
+		public Novel(Integer id, String title, String genre) {
+			super( id, title );
+			this.genre = genre;
+		}
+
+		public String getGenre() {
+			return genre;
+		}
+
+		public void setGenre(String genre) {
+			this.genre = genre;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/timestamp/UsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/timestamp/UsageTests.java
index 34a09fe98949..6b16de92dc05 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/timestamp/UsageTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/timestamp/UsageTests.java
@@ -8,6 +8,7 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.dialect.SpannerDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -49,12 +50,22 @@ void testUsage(SessionFactoryScope sessions) {
 		} );
 		// the SELECT + the 2 UPDATES
 		assertThat( sqlCollector.getSqlQueries() ).hasSize( 3 );
-		assertThat( sqlCollector.getSqlQueries().get( 1 ) ).contains( "update employee_accolades " );
-		assertThat( sqlCollector.getSqlQueries().get( 1 ) ).contains( "set deleted_on=" );
-		assertThat( sqlCollector.getSqlQueries().get( 1 ) ).contains( "and deleted_on is null" );
-		assertThat( sqlCollector.getSqlQueries().get( 2 ) ).contains( "update employees " );
-		assertThat( sqlCollector.getSqlQueries().get( 2 ) ).contains( "set deleted_at=" );
-		assertThat( sqlCollector.getSqlQueries().get( 2 ) ).contains( "deleted_at is null" );
+		if ( sessions.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect ) {
+			assertThat( sqlCollector.getSqlQueries().get( 1 ) ).contains( "update employee_accolades " );
+			assertThat( sqlCollector.getSqlQueries().get( 1 ) ).contains( "set e1_0.deleted_on=" );
+			assertThat( sqlCollector.getSqlQueries().get( 1 ) ).contains( "e1_0.deleted_on is null" );
+			assertThat( sqlCollector.getSqlQueries().get( 2 ) ).contains( "update employees " );
+			assertThat( sqlCollector.getSqlQueries().get( 2 ) ).contains( "set e1_0.deleted_at=" );
+			assertThat( sqlCollector.getSqlQueries().get( 2 ) ).contains( "e1_0.deleted_at is null" );
+		}
+		else {
+			assertThat( sqlCollector.getSqlQueries().get( 1 ) ).contains( "update employee_accolades " );
+			assertThat( sqlCollector.getSqlQueries().get( 1 ) ).contains( "set deleted_on=" );
+			assertThat( sqlCollector.getSqlQueries().get( 1 ) ).contains( "and deleted_on is null" );
+			assertThat( sqlCollector.getSqlQueries().get( 2 ) ).contains( "update employees " );
+			assertThat( sqlCollector.getSqlQueries().get( 2 ) ).contains( "set deleted_at=" );
+			assertThat( sqlCollector.getSqlQueries().get( 2 ) ).contains( "deleted_at is null" );
+		}
 
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// Make sure the "middle" employee is removed (load)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java
index 180d35649268..91e86533c44b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SQLTest.java
@@ -7,6 +7,7 @@
 import jakarta.persistence.PersistenceException;
 import jakarta.persistence.Tuple;
 import org.hibernate.Session;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
@@ -28,9 +29,12 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.StandardBasicTypes;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.junit.jupiter.api.BeforeAll;
+import org.hibernate.dialect.SpannerDialect;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -442,6 +446,9 @@ public void test_sql_hibernate_entity_associations_query_one_to_many_join_exampl
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "Spanner fails with ambiguous ID columns")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner fails with ambiguous ID columns")
 	public void test_sql_jpa_multi_entity_query_example(EntityManagerFactoryScope scope) {
 		assertThrows( NonUniqueDiscoveredSqlAliasException.class, () -> scope.inTransaction( entityManager -> {
 			//tag::sql-jpa-multi-entity-query-example[]
@@ -456,6 +463,9 @@ public void test_sql_jpa_multi_entity_query_example(EntityManagerFactoryScope sc
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "Spanner fails with ambiguous ID columns")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner fails with ambiguous ID columns")
 	public void test_sql_hibernate_multi_entity_query_example(EntityManagerFactoryScope scope) {
 		try {
 			scope.inTransaction( entityManager -> {
@@ -503,7 +513,7 @@ public void test_sql_hibernate_dto_query_example(EntityManagerFactoryScope scope
 			Session session = entityManager.unwrap( Session.class );
 			//tag::sql-hibernate-dto-query-example[]
 			List<PersonSummaryDTO> dtos = session.createNativeQuery(
-							"SELECT p.id as \"id\", p.name as \"name\" " +
+							"SELECT p.id as id, p.name as name " +
 							"FROM Person p", Tuple.class )
 					.setTupleTransformer(
 							(tuple, aliases) -> {
@@ -520,6 +530,9 @@ public void test_sql_hibernate_dto_query_example(EntityManagerFactoryScope scope
 	}
 
 	@Test
+	@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+			reason = "Spanner fails with ambiguous ID columns")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner fails with ambiguous ID columns")
 	public void test_sql_hibernate_inheritance_query_example(EntityManagerFactoryScope scope) {
 		scope.inTransaction( entityManager -> {
 			Session session = entityManager.unwrap( Session.class );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SpaceShip.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SpaceShip.java
index 93b46f5298ca..55eae7a73b4b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SpaceShip.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/SpaceShip.java
@@ -26,7 +26,7 @@
 	@NamedNativeQuery(name = "find_all_spaceships",
 		query =
 			"SELECT " +
-			"   name as \"name\", " +
+			"   name as name, " +
 			"   model, " +
 			"   speed, " +
 			"   lname as lastn, " +
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java
index 8e728d7c9597..e4098b9313c3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java
@@ -9,6 +9,7 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
@@ -163,6 +164,7 @@ public void testDialectGetColumnAliasExtractor(SessionFactoryScope scope) {
 	@JiraKey("HHH-16697")
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase sum(39.74) returns Float",
 			matchSubTypes = true)
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner sum(39.74) returns Double")
 	public void testAggregateQueryAutoDiscovery(SessionFactoryScope scope) {
 		User u = new User( "steve" );
 		scope.inTransaction(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/op/FollowOnLockingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/op/FollowOnLockingTests.java
index e1d624408a70..9edb31c64f55 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/op/FollowOnLockingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/op/FollowOnLockingTests.java
@@ -23,7 +23,9 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.lock.PessimisticLockStyle;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -50,6 +52,7 @@
 		FollowOnLockingTests.Customer.class
 } )
 @SessionFactory(useCollectingStatementInspector = true)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsSelectLocking.class )
 public class FollowOnLockingTests {
 
 	/**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java
index 108918471a8a..15bf215fbe4d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyAndAssociationTest.java
@@ -6,8 +6,10 @@
 
 import org.hibernate.annotations.PartitionKey;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterAll;
@@ -53,6 +55,7 @@ public void tearDown(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class )
 	public void testUpdate(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			final SalesContact contact = session.find( SalesContact.class, 1L );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java
index e37c9ae5f0be..820d9ea73e37 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PartitionKeyTests.java
@@ -27,11 +27,11 @@
 public class PartitionKeyTests {
 	@Test
 	public void test(SessionFactoryScope scope) {
-		final SQLStatementInspector inspector = scope.getCollectingStatementInspector();
+		final var inspector = scope.getCollectingStatementInspector();
 
 		// update
 		scope.inTransaction( (session) -> {
-			final PartitionedEntity entity = session.find( PartitionedEntity.class, 1 );
+			final var entity = session.find( PartitionedEntity.class, 1 );
 			inspector.clear();
 			entity.setName( "The One" );
 		} );
@@ -39,13 +39,35 @@ public void test(SessionFactoryScope scope) {
 
 		// delete
 		scope.inTransaction( (session) -> {
-			final PartitionedEntity entity = session.find( PartitionedEntity.class, 1 );
+			final var entity = session.find( PartitionedEntity.class, 1 );
 			inspector.clear();
 			session.remove( entity );
 		} );
 		checkWherePredicate( inspector );
 	}
 
+	@Test
+	public void testStatelessUpdate(SessionFactoryScope scope) {
+		final var inspector = scope.getCollectingStatementInspector();
+
+		try ( var statelessSession = scope.getSessionFactory().openStatelessSession() ) {
+			final var tx = statelessSession.beginTransaction();
+			final var entity = statelessSession.get( PartitionedEntity.class, 1 );
+			inspector.clear();
+			entity.setName( "The One" );
+			statelessSession.update( entity );
+			tx.commit();
+		}
+
+		checkWherePredicate( inspector );
+
+		scope.inTransaction( session -> {
+			inspector.clear();
+			final var entity = session.find( PartitionedEntity.class, 1 );
+			assertThat( entity.getName() ).isEqualTo( "The One" );
+		} );
+	}
+
 	private void checkWherePredicate(SQLStatementInspector inspector) {
 		assertThat( inspector.getSqlQueries() ).hasSize( 1 );
 		assertThat( inspector.getSqlQueries().get( 0 ) ).contains( "tenant_id=?" );
@@ -75,7 +97,6 @@ public static class PartitionedEntity {
 		private String name;
 
 		protected PartitionedEntity() {
-			// for use by Hibernate
 		}
 
 		public PartitionedEntity(Integer id, Integer tenantId, String name) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PostgresPartitionedTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PostgresPartitionedTableTest.java
index 3ea4f295c840..994a319d20ac 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PostgresPartitionedTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/partition/PostgresPartitionedTableTest.java
@@ -9,11 +9,13 @@
 import jakarta.persistence.Table;
 import org.hibernate.annotations.PartitionKey;
 import org.hibernate.cfg.SchemaToolingSettings;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -29,6 +31,7 @@
 						value = "org/hibernate/orm/test/sql/partition/postgrespartitions-drop.sql"),
 				@Setting(name = SchemaToolingSettings.JAKARTA_HBM2DDL_DROP_SOURCE,
 						value = "script-then-metadata")})
+@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support PARTITION BY in create table")
 class PostgresPartitionedTableTest {
 	@Test void test(EntityManagerFactoryScope scope) {
 		scope.inTransaction( session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java
index 0fccc39b9db5..38733a3ce42e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java
@@ -9,7 +9,9 @@
 import org.hibernate.cache.spi.CacheImplementor;
 import org.hibernate.cfg.AvailableSettings;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -41,6 +43,7 @@
 @ServiceRegistry(
 		settings = @Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true")
 )
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class 	)
 public class NativeQuerySyncSpaceCachingTest {
 
 	@BeforeEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/EagerCollectionInStatelessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/EagerCollectionInStatelessTest.java
index 23019e8c33c4..4e8e40935492 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/EagerCollectionInStatelessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/EagerCollectionInStatelessTest.java
@@ -56,7 +56,7 @@ void test(SessionFactoryScope scope) {
 		});
 	}
 
-	@Entity
+	@Entity(name = "WithEagerCollection")
 	static class WithEagerCollection {
 		@Id long id = 69L;
 		@ElementCollection(fetch = EAGER)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetMultipleFromCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetMultipleFromCacheTest.java
index f279fdab0248..bd0f02b382f7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetMultipleFromCacheTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetMultipleFromCacheTest.java
@@ -43,7 +43,8 @@ public class GetMultipleFromCacheTest {
 		assertEquals( 2,
 				scope.getSessionFactory().getStatistics().getSecondLevelCacheHitCount() );
 	}
-	@Entity @Cacheable
+	@Entity(name = "Record")
+	@Cacheable
 	static class Record {
 		@Id Long id;
 		String message;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetMultipleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetMultipleTest.java
index f72f9acac3b2..6dff5ba18eda 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetMultipleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/GetMultipleTest.java
@@ -45,7 +45,7 @@ public class GetMultipleTest {
 		});
 
 	}
-	@Entity
+	@Entity(name = "Record")
 	static class Record {
 		@Id Long id;
 		String message;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCallbacksTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCallbacksTest.java
index 2cb02b653181..f070ef4234a8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCallbacksTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessCallbacksTest.java
@@ -39,7 +39,7 @@ public class StatelessCallbacksTest {
 		});
 	}
 
-	@Entity
+	@Entity(name = "WithCallbacks")
 	static class WithCallbacks {
 		boolean prePersist = false;
 		boolean preUpdate = false;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionMultipleOpsSubsequentBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionMultipleOpsSubsequentBatchTest.java
new file mode 100644
index 000000000000..53b1b6f4e4e1
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionMultipleOpsSubsequentBatchTest.java
@@ -0,0 +1,252 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.stateless;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for verifying that subsequent calls to *Multiple operations
+ * execute their batches immediately, not deferred until transaction commit.
+ */
+@DomainModel(annotatedClasses = {
+		StatelessSessionMultipleOpsSubsequentBatchTest.Person.class
+})
+@SessionFactory(useCollectingStatementInspector = true)
+@Jira("https://hibernate.atlassian.net/browse/HHH-20065")
+public class StatelessSessionMultipleOpsSubsequentBatchTest {
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+	}
+
+	@Test
+	public void testInsertMultipleSubsequentBatch(SessionFactoryScope scope) {
+		final var inspector = scope.getCollectingStatementInspector();
+		inspector.clear();
+
+		// First batch: 5 entities
+		final var firstBatch = new ArrayList<Person>();
+		for ( int i = 0; i < 5; i++ ) {
+			firstBatch.add( new Person( i, "first_" + i ) );
+		}
+
+		// Second batch: 3 entities (different count)
+		final var secondBatch = new ArrayList<Person>();
+		for ( int i = 5; i < 8; i++ ) {
+			secondBatch.add( new Person( i, "second_" + i ) );
+		}
+
+		scope.inStatelessTransaction( session -> {
+			session.insertMultiple( firstBatch );
+			assertThat( inspector.getSqlQueries() )
+					.as( "First batch should be executed immediately after insertMultiple call in a single query" )
+					.hasSize( 1 );
+			// Verify first batch entities were inserted immediately
+			for ( int i = 0; i < 5; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).as( "Entity %d should exist after first batch", i ).isNotNull();
+				assertThat( p.name ).isEqualTo( "first_" + i );
+			}
+			inspector.clear();
+
+			session.insertMultiple( secondBatch );
+			assertThat( inspector.getSqlQueries() )
+					.as( "Second batch should be executed immediately, not deferred" )
+					.hasSize( 1 );
+			// Verify second batch entities were inserted immediately
+			for ( int i = 5; i < 8; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).as( "Entity %d should exist after second batch", i ).isNotNull();
+				assertThat( p.name ).isEqualTo( "second_" + i );
+			}
+		} );
+	}
+
+	@Test
+	public void testUpdateMultipleSubsequentBatch(SessionFactoryScope scope) {
+		// Initialize 8 entities
+		final var people = initPeople( 8, scope );
+
+		final var inspector = scope.getCollectingStatementInspector();
+		inspector.clear();
+
+		// First batch: update 5 entities
+		final var firstBatch = people.subList( 0, 5 );
+		for ( final var p : firstBatch ) {
+			p.name = "first_" + p.id;
+		}
+
+		// Second batch: update 3 entities (different count)
+		final var secondBatch = people.subList( 5, 8 );
+		for ( final var p : secondBatch ) {
+			p.name = "second_" + p.id;
+		}
+
+		scope.inStatelessTransaction( session -> {
+			session.updateMultiple( firstBatch );
+			assertThat( inspector.getSqlQueries() )
+					.as( "First batch should be executed immediately after updateMultiple call in a single query" )
+					.hasSize( 1 );
+			// Verify first batch entities were updated immediately
+			for ( int i = 0; i < 5; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).as( "Entity %d should exist", i ).isNotNull();
+				assertThat( p.name ).isEqualTo( "first_" + i );
+			}
+			// Verify second batch entities still have original names
+			for ( int i = 5; i < 8; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).as( "Entity %d should exist", i ).isNotNull();
+				assertThat( p.name ).isEqualTo( "person_ " + i );
+			}
+			inspector.clear();
+
+			session.updateMultiple( secondBatch );
+			assertThat( inspector.getSqlQueries() )
+					.as( "Second batch should be executed immediately, not deferred" )
+					.hasSize( 1 );
+			// Verify second batch entities were updated immediately
+			for ( int i = 5; i < 8; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).as( "Entity %d should exist", i ).isNotNull();
+				assertThat( p.name ).isEqualTo( "second_" + i );
+			}
+		} );
+	}
+
+	@Test
+	public void testDeleteMultipleSubsequentBatch(SessionFactoryScope scope) {
+		// Initialize 8 entities
+		final var people = initPeople( 8, scope );
+
+		final var inspector = scope.getCollectingStatementInspector();
+		inspector.clear();
+
+		// First batch: delete 5 entities
+		final var firstBatch = people.subList( 0, 5 );
+
+		// Second batch: delete 3 entities (different count)
+		final var secondBatch = people.subList( 5, 8 );
+
+		scope.inStatelessTransaction( session -> {
+			session.deleteMultiple( firstBatch );
+			assertThat( inspector.getSqlQueries() )
+					.as( "First batch should be executed immediately after deleteMultiple call in a single query" )
+					.hasSize( 1 );
+			// Verify first batch entities were deleted immediately
+			for ( int i = 0; i < 5; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).as( "Entity %d should be deleted after first batch", i ).isNull();
+			}
+			// Verify second batch entities still exist
+			for ( int i = 5; i < 8; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).as( "Entity %d should still exist before second batch", i ).isNotNull();
+			}
+			inspector.clear();
+
+			session.deleteMultiple( secondBatch );
+			assertThat( inspector.getSqlQueries() )
+					.as( "Second batch should be executed immediately, not deferred" )
+					.hasSize( 1 );
+			// Verify second batch entities were deleted immediately
+			for ( int i = 5; i < 8; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).as( "Entity %d should be deleted after second batch", i ).isNull();
+			}
+		} );
+	}
+
+	@Test
+	public void testUpsertMultipleSubsequentBatch(SessionFactoryScope scope) {
+		// Initialize 5 entities
+		initPeople( 5, scope );
+
+		// First batch: 5 entities (mix of update and insert)
+		final var firstBatch = new ArrayList<Person>();
+		for ( int i = 3; i < 8; i++ ) {
+			firstBatch.add( new Person( i, "first_" + i ) );
+		}
+
+		// Second batch: 3 entities (different count, mix of update and insert)
+		final var secondBatch = new ArrayList<Person>();
+		for ( int i = 6; i < 9; i++ ) {
+			secondBatch.add( new Person( i, "second_" + i ) );
+		}
+
+		scope.inStatelessTransaction( session -> {
+			session.upsertMultiple( firstBatch );
+			// Verify state after first batch: ids 0-2 original, 3-7 from first batch
+			for ( int i = 0; i < 8; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).as( "Entity %d should exist after first batch", i ).isNotNull();
+				if ( i < 3 ) {
+					assertThat( p.name ).isEqualTo( "person_ " + i );
+				}
+				else {
+					assertThat( p.name ).isEqualTo( "first_" + i );
+				}
+			}
+			// Verify entity 8 doesn't exist yet
+			assertThat( session.get( Person.class, 8 ) )
+					.as( "Entity 8 should not exist before second batch" )
+					.isNull();
+
+			session.upsertMultiple( secondBatch );
+			// Verify state after second batch: ids 0-2 original, 3-5 from first batch, 6-8 from second batch
+			for ( int i = 0; i < 9; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).as( "Entity %d should exist after second batch", i ).isNotNull();
+				if ( i < 3 ) {
+					assertThat( p.name ).isEqualTo( "person_ " + i );
+				}
+				else if ( i < 6 ) {
+					assertThat( p.name ).isEqualTo( "first_" + i );
+				}
+				else {
+					assertThat( p.name ).isEqualTo( "second_" + i );
+				}
+			}
+		} );
+	}
+
+	private static List<Person> initPeople(int count, SessionFactoryScope scope) {
+		final var people = new ArrayList<Person>();
+		for ( int i = 0; i < count; i++ ) {
+			final var p = new Person( i, "person_ " + i );
+			people.add( p );
+		}
+		scope.inStatelessTransaction( session -> session.insertMultiple( people ) );
+		return people;
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+		@Id
+		public Integer id;
+		public String name;
+
+		public Person() {
+		}
+
+		public Person(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionMultipleOpsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionMultipleOpsTest.java
new file mode 100644
index 000000000000..0b50660b6fd8
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionMultipleOpsTest.java
@@ -0,0 +1,160 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.stateless;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DomainModel(annotatedClasses = {
+		StatelessSessionMultipleOpsTest.Person.class
+})
+@SessionFactory(useCollectingStatementInspector = true)
+@Jira("https://hibernate.atlassian.net/browse/HHH-20065")
+public class StatelessSessionMultipleOpsTest {
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+	}
+
+	@Test
+	public void testInsertMultiple(SessionFactoryScope scope) {
+		final var inspector = scope.getCollectingStatementInspector();
+		inspector.clear();
+
+		final var count = 5;
+		final var people = new ArrayList<Person>();
+		for ( int i = 0; i < count; i++ ) {
+			people.add( new Person( i, "person_ " + i ) );
+		}
+
+		scope.inStatelessTransaction( session -> {
+			session.insertMultiple( people );
+
+			assertThat( inspector.getSqlQueries() )
+					.as( "Should have batched insert into single statement preparation" )
+					.hasSize( 1 );
+
+			for ( int i = 0; i < count; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).isNotNull().extracting( "name" ).isEqualTo( "person_ " + i );
+			}
+		} );
+	}
+
+	@Test
+	public void testUpdateMultiple(SessionFactoryScope scope) {
+		final var count = 5;
+		final var people = initPeople( count, scope );
+
+		final var inspector = scope.getCollectingStatementInspector();
+		inspector.clear();
+
+		for ( final var p : people ) {
+			p.name = "Updated " + p.id;
+		}
+
+		scope.inStatelessTransaction( session -> {
+			session.updateMultiple( people );
+
+			assertThat( inspector.getSqlQueries() )
+					.as( "Should have batched update into single statement preparation" )
+					.hasSize( 1 );
+
+			for ( int i = 0; i < count; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).isNotNull().extracting( "name" ).isEqualTo( "Updated " + i );
+			}
+		} );
+	}
+
+	@Test
+	public void testDeleteMultiple(SessionFactoryScope scope) {
+		final var count = 5;
+		final var people = initPeople( count, scope );
+
+		final var inspector = scope.getCollectingStatementInspector();
+		inspector.clear();
+
+		scope.inStatelessTransaction( session -> {
+			session.deleteMultiple( people );
+
+			assertThat( inspector.getSqlQueries() )
+					.as( "Should have batched delete into single statement preparation" )
+					.hasSize( 1 );
+
+			for ( int i = 0; i < count; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).isNull();
+			}
+		} );
+	}
+
+	@Test
+	public void testUpsertMultiple(SessionFactoryScope scope) {
+		final var initialCount = 5;
+		final var people = initPeople( initialCount, scope );
+
+		final var finalCount = 8;
+		{
+			// Update existing
+			var i = 0;
+			for ( final var p : people ) {
+				p.name = "updated_" + i++;
+			}
+
+			// Add new
+			for ( ; i < finalCount; i++ ) {
+				people.add( new Person( i, "new_" + i ) );
+			}
+		}
+
+		scope.inStatelessTransaction( session -> {
+			session.upsertMultiple( people );
+
+			for ( int i = 0; i < finalCount; i++ ) {
+				final var p = session.get( Person.class, i );
+				assertThat( p ).isNotNull().extracting( "name" )
+						.isEqualTo( i < initialCount ? "updated_" + i : "new_" + i );
+			}
+		} );
+	}
+
+	private static List<Person> initPeople(int count, SessionFactoryScope scope) {
+		final var people = new ArrayList<Person>();
+		for ( int i = 0; i < count; i++ ) {
+			final var p = new Person( i, "person_ " + i );
+			people.add( p );
+		}
+		scope.inStatelessTransaction( session -> session.insertMultiple( people ) );
+		return people;
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+		@Id
+		public Integer id;
+		public String name;
+
+		public Person() {
+		}
+
+		public Person(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java
index ca13effe6d9d..08ec6fa86fc5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java
@@ -12,7 +12,9 @@
 import org.hibernate.ScrollMode;
 import org.hibernate.Transaction;
 
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -131,6 +133,7 @@ public void testGetNull(SessionFactoryScope scope) {
 	}
 
 	@Test
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class )
 	public void testHqlBulk(SessionFactoryScope scope) {
 		scope.inStatelessSession(
 				statelessSession -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertNaturalIdTest.java
new file mode 100644
index 000000000000..db1d33217a7a
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertNaturalIdTest.java
@@ -0,0 +1,72 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.stateless;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.NaturalId;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@SessionFactory
+@DomainModel(annotatedClasses = UpsertNaturalIdTest.Natural.class)
+@JiraKey( "HHH-18742" )
+@JiraKey( "HHH-20155" )
+@JiraKey( "HHH-20154" )
+class UpsertNaturalIdTest {
+	@Test
+	void test(SessionFactoryScope scope) {
+		var natural = new Natural();
+		natural.id = 69;
+		natural.code = "000";
+		natural.text = "Lorem ipsum";
+		natural.uuid = UUID.randomUUID();
+		scope.inStatelessTransaction( s -> {
+			s.upsert( natural );
+		} );
+		scope.inStatelessTransaction( s -> {
+			Natural nat = s.get( Natural.class, 69 );
+			assertEquals("000", nat.code);
+			assertEquals( "Lorem ipsum", nat.text );
+			assertNotNull( nat.uuid );
+		} );
+		scope.inStatelessTransaction( s -> {
+			natural.uuid = null;
+			natural.text = "Lorem ipsum dolor sit amet";
+			s.upsert( natural );
+		} );
+		scope.inStatelessTransaction( s -> {
+			Natural nat = s.get( Natural.class, 69 );
+			assertEquals("000", nat.code);
+			assertEquals( "Lorem ipsum dolor sit amet", nat.text );
+			assertNotNull( nat.uuid );
+		} );
+		scope.inStatelessTransaction( s -> {
+			natural.code = "001";
+			s.upsert( natural );
+		} );
+		scope.inStatelessTransaction( s -> {
+			Natural nat = s.get( Natural.class, 69 );
+			assertEquals("000", nat.code);
+		} );
+	}
+	@Entity(name = "UpsertNatural")
+	static class Natural {
+		@Id long id;
+		@NaturalId String code;
+		String text;
+		@Column(updatable = false)
+		UUID uuid;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertTest.java
index c18aa232c08e..44fd0b57bff1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertTest.java
@@ -6,6 +6,8 @@
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 import org.hibernate.dialect.MariaDBDialect;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
@@ -18,9 +20,15 @@
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @SessionFactory(useCollectingStatementInspector = true)
-@DomainModel(annotatedClasses = UpsertTest.Record.class)
+@DomainModel(annotatedClasses = {
+		UpsertTest.Record.class,
+		UpsertTest.IdOnly.class,
+		UpsertTest.IdOnlyIntermediate.class,
+		UpsertTest.IdOnlySubtype.class
+})
 public class UpsertTest {
 	@Test void test(SessionFactoryScope scope) {
 		scope.getSessionFactory().getSchemaManager().truncate();
@@ -96,6 +104,40 @@ public class UpsertTest {
 		scope.inStatelessTransaction(s-> assertDoesNotThrow(() -> s.upsert(new Record(123L,null, null))) );
 	}
 
+	@Test void testIdOnly(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new IdOnly(123L));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertNotNull(s.get( IdOnly.class,123L));
+		});
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new IdOnly(123L));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertNotNull(s.get( IdOnly.class,123L));
+		});
+	}
+
+	@Test void testIdOnlySubtype(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncate();
+
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new IdOnlySubtype(123L));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertNotNull(s.get( IdOnlySubtype.class,123L));
+		});
+		scope.inStatelessTransaction(s-> {
+			s.upsert(new IdOnlySubtype(123L));
+		});
+		scope.inStatelessTransaction(s-> {
+			assertNotNull(s.get( IdOnlySubtype.class,123L));
+		});
+	}
+
 	@Entity(name = "Record")
 	static class Record {
 		@Id Long id;
@@ -116,4 +158,39 @@ static class Record {
 		Record() {
 		}
 	}
+
+	@Entity(name = "IdOnly")
+	@Inheritance(strategy = InheritanceType.JOINED)
+	static class IdOnly {
+		@Id Long id;
+
+		IdOnly(Long id) {
+			this.id = id;
+		}
+
+		IdOnly() {
+		}
+	}
+
+	@Entity(name = "IdOnlyIntermediate")
+	static class IdOnlyIntermediate extends IdOnly {
+		IdOnlyIntermediate(Long id) {
+			super( id );
+		}
+
+		IdOnlyIntermediate() {
+		}
+	}
+
+	@Entity(name = "IdOnlySubtype")
+	static class IdOnlySubtype extends IdOnlyIntermediate {
+		String name;
+
+		IdOnlySubtype(Long id) {
+			super( id );
+		}
+
+		IdOnlySubtype() {
+		}
+	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertWithDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertWithDiscriminatorTest.java
new file mode 100644
index 000000000000..0b2562fe45a0
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/UpsertWithDiscriminatorTest.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.stateless;
+
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@SessionFactory
+@DomainModel(annotatedClasses =
+		{UpsertWithDiscriminatorTest.X.class,
+		UpsertWithDiscriminatorTest.Y.class,
+		UpsertWithDiscriminatorTest.Z.class})
+@JiraKey( "HHH-18742" )
+@JiraKey( "HHH-20155" )
+class UpsertWithDiscriminatorTest {
+	@Test void test(SessionFactoryScope scope) {
+		scope.getSessionFactory().inStatelessTransaction( s -> {
+			s.upsert( new X() );
+			s.upsert( new Y() );
+			s.upsert( new Z() );
+		});
+		scope.getSessionFactory().inStatelessTransaction( s -> {
+			var results = s.createQuery( "from X order by id asc", X.class ).getResultList();
+			assertEquals( X.class, results.get(0).getClass() );
+			assertEquals( Y.class, results.get(1).getClass() );
+			assertEquals( Z.class, results.get(2).getClass() );
+		});
+		scope.getSessionFactory().inStatelessTransaction( s -> {
+			s.upsert( new X() );
+			s.upsert( new Y() );
+			s.upsert( new Z() );
+		});
+	}
+
+	@Entity(name = "X")
+	@DiscriminatorValue("X")
+	static class X {
+		@Id
+		long id;
+	}
+	@Entity(name = "Y")
+	@DiscriminatorValue("Y")
+	static class Y extends X {
+		{
+			id = 1;
+		}
+	}
+	@Entity(name = "Z")
+	@DiscriminatorValue("Z")
+	static class Z extends X {
+		{
+			id = 2;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/shared/SimpleSharedStatelessSessionBuildingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/shared/SimpleSharedStatelessSessionBuildingTests.java
index 39764908cb59..6bbb89e18bc4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/shared/SimpleSharedStatelessSessionBuildingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/shared/SimpleSharedStatelessSessionBuildingTests.java
@@ -135,9 +135,9 @@ void testUsage(SessionFactoryScope factoryScope) {
 				session.insert( new Something( 2, "first" ) );
 				assertSame( session.getTransaction(), statelessSession.getTransaction() );
 				assertSame( ((StatelessSessionImplementor) session).getJdbcCoordinator(),
-						((StatelessSessionImplementor) statelessSession).getJdbcCoordinator() );
+						statelessSession.getJdbcCoordinator() );
 				assertSame( ((StatelessSessionImplementor) session).getTransactionCompletionCallbacksImplementor(),
-						((StatelessSessionImplementor) statelessSession).getTransactionCompletionCallbacksImplementor() );
+						statelessSession.getTransactionCompletionCallbacksImplementor() );
 			}
 		} );
 		assertThat( sqlCollector.getSqlQueries() ).hasSize( 1 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/AuthorAnnotated.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/AuthorAnnotated.java
new file mode 100644
index 000000000000..494c68450059
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/AuthorAnnotated.java
@@ -0,0 +1,52 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.subselect;
+
+import java.util.Set;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "author")
+public class AuthorAnnotated {
+	@Id
+	private int id;
+
+	@Column(nullable = false)
+	private String name;
+
+	@OneToMany
+	@JoinColumn(name = "author_id", referencedColumnName = "id")
+	private Set<BookSubselectView> books;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Set<BookSubselectView> getBooks() {
+		return books;
+	}
+
+	public void setBooks(Set<BookSubselectView> books) {
+		this.books = books;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/BookAnnotated.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/BookAnnotated.java
new file mode 100644
index 000000000000..ad2e24d8fe44
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/BookAnnotated.java
@@ -0,0 +1,46 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.subselect;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "book")
+public class BookAnnotated {
+	@Id
+	private int id;
+
+	private String title;
+
+	@Column(name = "author_id")
+	private int authorId;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public int getAuthorId() {
+		return authorId;
+	}
+
+	public void setAuthorId(int authorId) {
+		this.authorId = authorId;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/BookSubselectView.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/BookSubselectView.java
new file mode 100644
index 000000000000..3cf36505616c
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/BookSubselectView.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.subselect;
+
+import java.io.Serializable;
+
+import org.hibernate.annotations.Immutable;
+import org.hibernate.annotations.Subselect;
+import org.hibernate.annotations.Synchronize;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+@Entity
+@Immutable
+@Subselect("SELECT b.author_id, b.title, b.id FROM book b join author a on b.author_id = a.id")
+@Synchronize({"book", "author"})
+public class BookSubselectView implements Serializable {
+	@Id
+	private int id;
+
+	@Column(name = "author_id")
+	private int authorId;
+
+	private String title;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public int getAuthorId() {
+		return authorId;
+	}
+
+	public void setAuthorId(int authorId) {
+		this.authorId = authorId;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectAliasPostgresTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectAliasPostgresTest.java
new file mode 100644
index 000000000000..a11f56ef50da
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectAliasPostgresTest.java
@@ -0,0 +1,62 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.subselect;
+
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.dialect.PostgreSQLDialect;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+@JiraKey(value = "HHH-12590")
+@RequiresDialect(PostgreSQLDialect.class)
+@DomainModel(annotatedClasses = {AuthorAnnotated.class, BookAnnotated.class, BookSubselectView.class})
+@SessionFactory
+public class SubselectAliasPostgresTest {
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	@Test
+	public void testSubselect(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			AuthorAnnotated author = new AuthorAnnotated();
+			author.setName( "Camilleri" );
+			author.setId( 1 );
+			session.persist( author );
+
+			BookAnnotated book = new BookAnnotated();
+			book.setId( 2 );
+			book.setAuthorId( 1 );
+			book.setTitle( "Il sognaglio" );
+			session.persist( book );
+
+			BookAnnotated book2 = new BookAnnotated();
+			book2.setId( 3 );
+			book2.setAuthorId( 1 );
+			book2.setTitle( "Il casellante" );
+			session.persist( book2 );
+		} );
+
+		scope.inTransaction( session -> {
+			AuthorAnnotated author = session.find( AuthorAnnotated.class, 1 );
+
+			PersistentCollection<?> booksCollection = (PersistentCollection<?>) author.getBooks();
+			int size = booksCollection.getSize();
+
+			assertThat( size, is( 2 ) );
+		} );
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java
index 5bc565ff22de..a6b920b79f0b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java
@@ -7,9 +7,11 @@
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -25,6 +27,7 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(xmlMappings = "org/hibernate/orm/test/subselect/Beings.hbm.xml")
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner requires explicit UNION ALL or UNION DISTINCT" )
 public class SubselectTest {
 	@AfterEach
 	void tearDown(SessionFactoryScope factoryScope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/FractionalSecondsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/FractionalSecondsTests.java
index ac69a5ca9192..9d506996f5d5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/FractionalSecondsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/FractionalSecondsTests.java
@@ -17,6 +17,7 @@
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.community.dialect.FirebirdDialect;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.dialect.Dialect;
@@ -26,6 +27,7 @@
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.PostgresPlusDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.mapping.BasicValue;
@@ -131,6 +133,8 @@ void testUsage(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase does not support specifying a precision on timestamps")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix only supports precision from 1 to 5")
 	@SkipForDialect(dialectClass = FirebirdDialect.class, reason = "Firebird does not support specifying a precision on timestamps")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support specifying precision on timestamps")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner doesn't support specifying precision on timestamps")
 	void testUsage0(SessionFactoryScope scope) {
 		final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
 		final Instant start;
@@ -162,6 +166,8 @@ void testUsage0(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = SybaseDialect.class, reason = "Because... Sybase...", matchSubTypes = true)
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase does not support specifying a precision on timestamps")
 	@SkipForDialect(dialectClass = FirebirdDialect.class, reason = "Firebird does not support specifying a precision on timestamps")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support specifying precision on timestamps")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner doesn't support specifying precision on timestamps")
 	void testUsage3(SessionFactoryScope scope) {
 		final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
 		final Instant start;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/JavaTimeFractionalSecondsTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/JavaTimeFractionalSecondsTests.java
index c7b7f9da370e..ce11f586b5a0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/JavaTimeFractionalSecondsTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/JavaTimeFractionalSecondsTests.java
@@ -18,6 +18,7 @@
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.community.dialect.FirebirdDialect;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.dialect.Dialect;
@@ -27,6 +28,7 @@
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.PostgresPlusDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.mapping.BasicValue;
@@ -133,6 +135,8 @@ void testUsage(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase does not support specifying a precision on timestamps")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix only supports precision from 1 to 5")
 	@SkipForDialect(dialectClass = FirebirdDialect.class, reason = "Firebird does not support specifying a precision on timestamps")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support specifying precision on timestamps")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner doesn't support specifying precision on timestamps")
 	void testUsage0(SessionFactoryScope scope) {
 		final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
 		final Instant start;
@@ -164,6 +168,8 @@ void testUsage0(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = SybaseDialect.class, reason = "Because... Sybase...", matchSubTypes = true)
 	@SkipForDialect(dialectClass = AltibaseDialect.class, reason = "Altibase does not support specifying a precision on timestamps")
 	@SkipForDialect(dialectClass = FirebirdDialect.class, reason = "Firebird does not support specifying a precision on timestamps")
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support specifying precision on timestamps")
+	@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner doesn't support specifying precision on timestamps")
 	void testUsage3(SessionFactoryScope scope) {
 		final Dialect dialect = scope.getSessionFactory().getJdbcServices().getDialect();
 		final Instant start;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java
index ca077a3fb851..302608d43c29 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java
@@ -10,7 +10,9 @@
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Generated;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.query.Query;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.StandardBasicTypes;
 
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
@@ -102,7 +104,9 @@ public void testTime(SessionFactoryScope scope) {
 		);
 	}
 
+	// TODO(spanner): Reenable this test once Spanner bug is fixed
 	@Test
+	@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner has a bug with current_timestamp and default")
 	public void testTimeGeneratedByColumnDefault(SessionFactoryScope scope) {
 		final Entity eOrig = new Entity();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeCustomTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeCustomTimeZoneTest.java
index 86dda038ec57..5be0c42f31bc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeCustomTimeZoneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimeCustomTimeZoneTest.java
@@ -18,6 +18,8 @@
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 
 import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider;
@@ -36,6 +38,10 @@
  */
 @SkipForDialect(dialectClass = InformixDialect.class,
 	reason = "Informix JDBC driver seems to misinterpret the JDBC time zone")
+@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class,
+		reason = "Spanner PG sends UTC as Timezone for Time types to avoid timezone issues")
+@SkipForDialect(dialectClass = SpannerDialect.class,
+		reason = "Spanner sends UTC as Timezone for Time types to avoid timezone issues")
 public class JdbcTimeCustomTimeZoneTest
 		extends BaseSessionFactoryFunctionalTest {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java
index 8c84cfcb3698..22f9300a5e9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/JdbcTimestampWithoutUTCTimeZoneTest.java
@@ -12,6 +12,7 @@
 
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
@@ -32,6 +33,8 @@
  * @author Vlad Mihalcea
  */
 @RequiresDialect(value = PostgreSQLDialect.class)
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class,
+		reason = "Spanner PG timezone doesn't depend on JVM timezone")
 public class JdbcTimestampWithoutUTCTimeZoneTest extends BaseSessionFactoryFunctionalTest {
 
 	private TimeZoneConnectionProvider connectionProvider;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/AutoZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/AutoZonedTest.java
index f484a2df54d1..7200c115c861 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/AutoZonedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/AutoZonedTest.java
@@ -80,7 +80,7 @@ else if ( dialect.getDefaultTimestampPrecision() == 6 ) {
 		});
 	}
 
-	@Entity
+	@Entity(name = "Zoned")
 	public static class Zoned {
 		@Id
 		@GeneratedValue Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/ColumnZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/ColumnZonedTest.java
index 2acda5e10304..f15ff49f7754 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/ColumnZonedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/ColumnZonedTest.java
@@ -80,7 +80,7 @@ else if ( dialect.getDefaultTimestampPrecision() == 6 ) {
 		});
 	}
 
-	@Entity
+	@Entity(name = "Zoned")
 	public static class Zoned {
 		@Id
 		@GeneratedValue Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/DefaultZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/DefaultZonedTest.java
index 1997c26c9302..30a7cc11aace 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/DefaultZonedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/DefaultZonedTest.java
@@ -83,7 +83,7 @@ else if ( dialect.getDefaultTimestampPrecision() == 6 ) {
 		});
 	}
 
-	@Entity
+	@Entity(name = "Zoned")
 	public static class Zoned {
 		@Id
 		@GeneratedValue Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java
index 19f454016e89..fb818cfe1977 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java
@@ -82,7 +82,7 @@ else if ( dialect.getDefaultTimestampPrecision() == 6 ) {
 		});
 	}
 
-	@Entity
+	@Entity(name = "Zoned")
 	public static class Zoned {
 		@Id
 		@GeneratedValue Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java
index 18e2f0504531..af51b055af21 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java
@@ -11,7 +11,6 @@
 import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -280,8 +279,6 @@ public void testConcurrentCachedQueries(SessionFactoryScope scope) throws Except
 	)
 	@SkipForDialect(dialectClass = CockroachDialect.class,
 			reason = "Cockroach uses SERIALIZABLE by default and seems to fail reading a row that is exclusively locked by a different TX")
-	@SkipForDialect(dialectClass = InformixDialect.class,
-			reason = "Informix simply fails to obtain the lock with 'Could not do a physical-order read to fetch next row'")
 	public void testConcurrentCachedDirtyQueries(SessionFactoryScope scope) throws Exception {
 		final TransactionManager transactionManager = TestingJtaPlatformImpl.INSTANCE.getTransactionManager();
 		try {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java
index 644e88634ce4..533ec151b776 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java
@@ -17,6 +17,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.event.spi.EventSource;
 import org.hibernate.testing.jta.TestingJtaBootstrap;
 import org.hibernate.testing.jta.TestingJtaPlatformImpl;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -77,7 +78,7 @@ public void testAfterCompletionCallbackExecutedAfterTransactionTimeout(SessionFa
 				// Register before and after callback handlers
 				// The before causes the original thread to wait until Reaper aborts the transaction
 				// The after tracks whether it is invoked since this test is to guarantee it is called
-				final ActionQueue actionQueue = session.getActionQueue();
+				final ActionQueue actionQueue = session.unwrap( EventSource.class ).getActionQueue();
 				actionQueue.registerCallback( new AfterCallbackCompletionHandler() );
 				actionQueue.registerCallback( new BeforeCallbackCompletionHandler() );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java
index 383bc5469938..811122c2af9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/internal/CheckForExistingForeignKeyTest.java
@@ -113,6 +113,11 @@ public Identifier toIdentifier(String text, boolean quoted) {
 			return null;
 		}
 
+		@Override
+		public Identifier toIdentifier(String text, boolean quoted, boolean isExplicit) {
+			return null;
+		}
+
 		@Override
 		public Identifier applyGlobalQuoting(String text) {
 			return null;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicListTest.java
index 2ef9dc20373a..e9ac54f59ff0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicListTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicListTest.java
@@ -25,6 +25,8 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.BasicType;
 import org.junit.jupiter.api.AfterEach;
@@ -115,6 +117,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			//noinspection removal
@@ -145,6 +148,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicSortedSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicSortedSetTest.java
index 20ec53c46e23..eabacfc2be71 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicSortedSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BasicSortedSetTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.type;
 
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -27,6 +28,8 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.BasicType;
 import org.junit.jupiter.api.AfterEach;
@@ -116,6 +119,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithIntegerSortedSet> tq = em.createNamedQuery( "TableWithIntegerSortedSet.JPQL.getByData", TableWithIntegerSortedSet.class );
@@ -144,6 +148,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayTest.java
index 298412149e41..f473ac160b31 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayTest.java
@@ -120,6 +120,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 	scope.inSession( em -> {
 			TypedQuery<TableWithBooleanArrays> tq = em.createNamedQuery( "TableWithBooleanArrays.JPQL.getByData", TableWithBooleanArrays.class );
@@ -149,6 +150,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
@@ -180,6 +182,7 @@ public void testNativeQueryUntyped(SessionFactoryScope scope) {
 	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsStructuralArrays.class)
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayComparison.class )
 	public void testLiteral(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final HibernateCriteriaBuilder cb = em.getCriteriaBuilder();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayToStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayToStringTest.java
index 2c4e13531279..3d4ada70a1e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayToStringTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BooleanArrayToStringTest.java
@@ -7,6 +7,7 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import org.hibernate.dialect.OracleDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
@@ -31,6 +32,7 @@
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTypedArrays.class)
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayToString.class)
 @SkipForDialect( dialectClass = OracleDialect.class, reason = "External driver fix required")
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner ARRAY_TO_STRING does not support boolean arrays directly" )
 @Jira( value = "https://hibernate.atlassian.net/browse/HHH-18765" )
 public class BooleanArrayToStringTest {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/DateArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/DateArrayTest.java
index 443fbcfa3890..0b88bd62c754 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/DateArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/DateArrayTest.java
@@ -132,6 +132,7 @@ public void testQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "Seems that comparing date[] through JDBC is buggy. ERROR: operator does not exist: timestamp without time zone[] = date[]")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithDateArrays> tq = em.createNamedQuery( "TableWithDateArrays.JPQL.getByData", TableWithDateArrays.class );
@@ -162,6 +163,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = PostgresPlusDialect.class, reason = "Seems that comparing date[] through JDBC is buggy. ERROR: operator does not exist: timestamp without time zone[] = date[]")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
 	@SkipForDialect( dialectClass = GaussDBDialect.class, reason = "type:resolved.Seems that comparing date[] through JDBC is buggy. ERROR: operator does not exist: timestamp without time zone[] = date[]")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/DdlTypeRegistryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/DdlTypeRegistryTest.java
new file mode 100644
index 000000000000..e2e6c76fac34
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/DdlTypeRegistryTest.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.type;
+
+import org.hibernate.dialect.DB2Dialect;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RequiresDialect(DB2Dialect.class)
+@SessionFactory
+public class DdlTypeRegistryTest {
+
+	@Test
+	@Jira("https://hibernate.atlassian.net/browse/HHH-20259")
+	public void testKeepBiggest(SessionFactoryScope scope) {
+		final DdlTypeRegistry ddlTypeRegistry = scope.getSessionFactory().getTypeConfiguration().getDdlTypeRegistry();
+		assertThat( ddlTypeRegistry.getSqlTypeCode( "smallint" ) ).isEqualTo( SqlTypes.SMALLINT );
+	}
+
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/DoubleArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/DoubleArrayTest.java
index 46330e5749f9..ab6b487442d4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/DoubleArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/DoubleArrayTest.java
@@ -125,6 +125,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithDoubleArrays> tq = em.createNamedQuery( "TableWithDoubleArrays.JPQL.getByData", TableWithDoubleArrays.class );
@@ -153,6 +154,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumArrayTest.java
index 7fb9bce656cb..e6298a300c74 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumArrayTest.java
@@ -22,6 +22,8 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.BasicType;
 import org.junit.jupiter.api.AfterEach;
@@ -116,6 +118,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithEnumArrays> tq = em.createNamedQuery( "TableWithEnumArrays.JPQL.getByData", TableWithEnumArrays.class );
@@ -146,6 +149,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = DerbyDialect.class )
 	@SkipForDialect(dialectClass = DB2Dialect.class )
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetConverterTest.java
index ab04e70feff8..b54eca40d220 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetConverterTest.java
@@ -32,6 +32,8 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.BasicType;
 import org.junit.jupiter.api.AfterEach;
@@ -122,6 +124,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithEnumSetConverter> tq = em.createNamedQuery( "TableWithEnumSetConverter.JPQL.getByData", TableWithEnumSetConverter.class );
@@ -150,6 +153,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetTest.java
index 1f263df3aded..3bcf98620e53 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/EnumSetTest.java
@@ -25,6 +25,8 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.BasicType;
 import org.junit.jupiter.api.AfterEach;
@@ -118,6 +120,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithEnumSet> tq = em.createNamedQuery( "TableWithEnumSet.JPQL.getByData", TableWithEnumSet.class );
@@ -146,6 +149,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/FloatArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/FloatArrayTest.java
index ff41dca55e9f..e5ce7cd5a1e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/FloatArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/FloatArrayTest.java
@@ -13,6 +13,7 @@
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
 
 import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
@@ -54,6 +55,7 @@
 )
 @DomainModel(annotatedClasses = FloatArrayTest.TableWithFloatArrays.class)
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner jdbc driver currently doesn't accept float arrays for float64 type")
 public class FloatArrayTest {
 
 	private BasicType<Float[]> arrayType;
@@ -116,6 +118,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithFloatArrays> tq = em.createNamedQuery( "TableWithFloatArrays.JPQL.getByData", TableWithFloatArrays.class );
@@ -144,6 +147,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/IntegerArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/IntegerArrayTest.java
index b3ff222d5ff9..deebe5ae8430 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/IntegerArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/IntegerArrayTest.java
@@ -5,6 +5,7 @@
 package org.hibernate.orm.test.type;
 
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HANADialect;
@@ -13,6 +14,7 @@
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
 
 import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
@@ -113,6 +115,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithIntegerArrays> tq = em.createNamedQuery( "TableWithIntegerArrays.JPQL.getByData", TableWithIntegerArrays.class );
@@ -141,6 +144,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
@@ -163,7 +167,14 @@ public void testNativeQueryUntyped(SessionFactoryScope scope) {
 			Query q = em.createNamedQuery( "TableWithIntegerArrays.Native.getByIdUntyped" );
 			q.setParameter( "id", 2L );
 			Object[] tuple = (Object[]) q.getSingleResult();
-			assertThat( tuple[1], is( new Integer[] { 512, 112, null, 0 } ) );
+			if (scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+				scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect ) {
+				// Spanner doesn't support smallint, tinyint, integer types. It supports only bigint type.
+				assertThat( tuple[1], is( new Long[] { 512L, 112L, null, 0L } ) );
+			}
+			else {
+				assertThat( tuple[1], is( new Integer[] { 512, 112, null, 0 } ) );
+			}
 		} );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongArrayTest.java
index d6961e10fe2b..6466acf3853e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongArrayTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.type;
 
+
 import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.Dialect;
@@ -118,6 +119,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithLongArrays> tq = em.createNamedQuery( "TableWithLongArrays.JPQL.getByData", TableWithLongArrays.class );
@@ -146,6 +148,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java
index b158d39cc1d7..718d3631db3e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongListTypeContributorTest.java
@@ -10,11 +10,13 @@
 import jakarta.persistence.Table;
 import org.hibernate.boot.model.TypeContributions;
 import org.hibernate.boot.model.TypeContributor;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.type.AbstractSingleColumnStandardBasicType;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.AbstractClassJavaType;
@@ -33,6 +35,7 @@
 		annotatedClasses = LongListTypeContributorTest.SpecialItem.class
 )
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner does not varchar column definition" )
 public class LongListTypeContributorTest {
 	@AfterEach
 	void tearDown(SessionFactoryScope factoryScope) {
@@ -59,7 +62,7 @@ public void testParameterRegisteredCollection(SessionFactoryScope factoryScope)
 		} );
 
 		factoryScope.inTransaction( em -> {
-			SpecialItem item = (SpecialItem) em.createNativeQuery(
+			SpecialItem item = em.createNativeQuery(
 							"SELECT * FROM special_table WHERE long_list = :longList", SpecialItem.class )
 					.setParameter( "longList", longList )
 					.getSingleResult();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongNullTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongNullTest.java
index 1cd2d485de57..0312db17957b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongNullTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/LongNullTest.java
@@ -57,7 +57,7 @@ public void testNonNull(SessionFactoryScope scope) {
 		assertArrayEquals( expected.bfield, actual.bfield );
 	}
 
-	@Entity
+	@Entity(name = "Foo")
 	public static final class Foo {
 		@Id
 		@GeneratedValue
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondNoScaleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondNoScaleTest.java
index 347806fabb49..df77aa10318b 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondNoScaleTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondNoScaleTest.java
@@ -8,6 +8,8 @@
 
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.SqlTypes;
 
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -26,6 +28,7 @@
 @SessionFactory
 @DomainModel(annotatedClasses = { PostgresIntervalSecondNoScaleTest.TestEntity.class })
 @RequiresDialect(PostgreSQLDialect.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsIntervalSecondType.class )
 @JiraKey("HHH-17520")
 public class PostgresIntervalSecondNoScaleTest {
 	@AfterEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondTest.java
index 2bf8d5545d47..3e38082e78eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondTest.java
@@ -15,6 +15,8 @@
 import org.hibernate.dialect.type.PostgreSQLIntervalSecondJdbcType;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.NumericJdbcType;
@@ -42,6 +44,7 @@
 @DomainModel(annotatedClasses = { PostgresIntervalSecondTest.EntityWithIntervalSecondDuration.class })
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.PREFERRED_DURATION_JDBC_TYPE, value = "NUMERIC"))
 @RequiresDialect(PostgreSQLDialect.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsIntervalSecondType.class )
 public class PostgresIntervalSecondTest {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresNamedEnumTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresNamedEnumTest.java
index 4535c8fbdbe6..410344523a82 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresNamedEnumTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresNamedEnumTest.java
@@ -7,9 +7,12 @@
 import java.util.Locale;
 
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 
 @RequiresDialect(PostgreSQLDialect.class)
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsNamedEnum.class )
 public class PostgresNamedEnumTest extends AbstractNamedEnumTest {
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/ShortArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/ShortArrayTest.java
index 1257592d5c7a..af8092dcaefc 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/ShortArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/ShortArrayTest.java
@@ -5,6 +5,7 @@
 package org.hibernate.orm.test.type;
 
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HANADialect;
@@ -13,6 +14,7 @@
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
 
 import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
@@ -113,6 +115,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithShortArrays> tq = em.createNamedQuery( "TableWithShortArrays.JPQL.getByData", TableWithShortArrays.class );
@@ -141,6 +144,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
@@ -163,7 +167,14 @@ public void testNativeQueryUntyped(SessionFactoryScope scope) {
 			Query q = em.createNamedQuery( "TableWithShortArrays.Native.getByIdUntyped" );
 			q.setParameter( "id", 2L );
 			Object[] tuple = (Object[]) q.getSingleResult();
-			assertThat( tuple[1], is( new Short[] { 512, 112, null, 0 } ) );
+			if ( scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerPostgreSQLDialect ||
+				scope.getSessionFactory().getJdbcServices().getDialect() instanceof SpannerDialect ) {
+				// Spanner doesn't support smallint, tinyint, integer types. It supports only bigint type.
+				assertThat( tuple[1], is( new Long[] {512L, 112L, null, 0L} ) );
+			}
+			else {
+				assertThat( tuple[1], is( new Short[] {512, 112, null, 0} ) );
+			}
 		} );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/StringArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/StringArrayTest.java
index b6858cb34faa..c50010766423 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/StringArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/StringArrayTest.java
@@ -111,6 +111,7 @@ public void testQueryById(SessionFactoryScope scope) {
 	@Test
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithStringArrays> tq = em.createNamedQuery( "TableWithStringArrays.Native.getById", TableWithStringArrays.class );
@@ -139,6 +140,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeArrayTest.java
index 6f9902db8160..3372a562033f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimeArrayTest.java
@@ -4,9 +4,12 @@
  */
 package org.hibernate.orm.test.type;
 
+import java.time.LocalDate;
 import java.time.LocalTime;
+import java.time.ZoneOffset;
 
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HANADialect;
@@ -15,6 +18,7 @@
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
 
 import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
@@ -55,6 +59,7 @@
 )
 @DomainModel(annotatedClasses = TimeArrayTest.TableWithTimeArrays.class)
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner jdbc driver currently doesn't support time arrays")
 public class TimeArrayTest {
 
 	private LocalTime time1;
@@ -127,6 +132,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayComparison.class )
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithTimeArrays> tq = em.createNamedQuery( "TableWithTimeArrays.JPQL.getByData", TableWithTimeArrays.class );
@@ -155,6 +161,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayComparison.class )
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
@@ -188,6 +195,17 @@ public void testNativeQueryUntyped(SessionFactoryScope scope) {
 						} )
 				);
 			}
+			else if ( dialect instanceof SpannerPostgreSQLDialect ) {
+				LocalDate localDate = LocalDate.of( 1970, 1, 1 );
+				assertThat(
+						tuple[1],
+						is( new Object[] {
+								localDate.atTime( time1 ).atOffset( ZoneOffset.UTC ),
+								localDate.atTime( time2 ).atOffset( ZoneOffset.UTC ),
+								localDate.atTime( time3 ).atOffset( ZoneOffset.UTC )
+						} )
+				);
+			}
 			else {
 				assertThat(
 						tuple[1],
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimestampArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimestampArrayTest.java
index a23b3f765dd2..ea3a0b72b926 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimestampArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TimestampArrayTest.java
@@ -6,8 +6,11 @@
 
 import java.time.LocalDateTime;
 import java.time.Month;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HANADialect;
@@ -16,6 +19,7 @@
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
 
 import org.hibernate.testing.jdbc.SharedDriverManagerTypeCacheClearingIntegrator;
@@ -132,6 +136,7 @@ public void testQueryById(SessionFactoryScope scope) {
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus ")
 	@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 6,
 			reason = "Bug in MariaDB https://jira.mariadb.org/browse/MDEV-21530")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			TypedQuery<TableWithTimestampArrays> tq = em.createNamedQuery( "TableWithTimestampArrays.JPQL.getByData", TableWithTimestampArrays.class );
@@ -160,6 +165,7 @@ public void testNativeQueryById(SessionFactoryScope scope) {
 	@SkipForDialect(dialectClass = HANADialect.class, reason = "HANA requires a special function to compare LOBs")
 	@SkipForDialect(dialectClass = MySQLDialect.class, matchSubTypes = true, reason = "MySQL supports distinct from through a special operator")
 	@SkipForDialect(dialectClass = InformixDialect.class, reason = "Informix can't compare LOBs")
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsArrayComparison.class)
 	public void testNativeQuery(SessionFactoryScope scope) {
 		scope.inSession( em -> {
 			final Dialect dialect = em.getDialect();
@@ -193,6 +199,17 @@ public void testNativeQueryUntyped(SessionFactoryScope scope) {
 						} )
 				);
 			}
+			else if ( dialect instanceof SpannerPostgreSQLDialect || dialect instanceof SpannerDialect ) {
+				// Spanner always stores timestamp with timezone. So it always returns the date time with the timezone
+				assertThat(
+						tuple[1],
+						is( new OffsetDateTime[] {
+								OffsetDateTime.of(time1, ZoneOffset.UTC ),
+								OffsetDateTime.of(time2, ZoneOffset.UTC),
+								OffsetDateTime.of(time3, ZoneOffset.UTC)
+						} )
+				);
+			}
 			else {
 				assertThat(
 						tuple[1],
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TypeTest.java
index 21c79f555a42..2c0606d45e12 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/TypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/TypeTest.java
@@ -9,6 +9,7 @@
 import org.hibernate.internal.util.SerializationHelper;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeReference;
 import org.hibernate.type.SerializableType;
 import org.hibernate.type.StandardBasicTypes;
@@ -298,14 +299,14 @@ public void testTimeType() {
 	@Test
 	public void testDates() {
 		final long now = System.currentTimeMillis();
-		final java.util.Date original = new java.util.Date( now );
-		final java.util.Date copy = new java.util.Date( now );
-		final java.util.Date different = new java.util.Date( now + 9999 );
-		final java.util.Date different2 = new java.util.Date( now + ( 1000L * 60L * 60L * 24L * 365L ) );
-
-		runBasicTests( StandardBasicTypes.TIME, original, copy, different );
-		runBasicTests( StandardBasicTypes.TIMESTAMP, original, copy, different );
-		runBasicTests( StandardBasicTypes.DATE, original, copy, different2 );
+		final var original = new java.util.Date( now );
+		final var copy = new java.util.Date( now );
+		final var different = new java.util.Date( now + 9999 );
+		final var different2 = new java.util.Date( now + ( 1000L * 60L * 60L * 24L * 365L ) );
+
+		runBasicTestsWithCoercion( StandardBasicTypes.TIME, original, copy, different );
+		runBasicTestsWithCoercion( StandardBasicTypes.TIMESTAMP, original, copy, different );
+		runBasicTestsWithCoercion( StandardBasicTypes.DATE, original, copy, different2 );
 	}
 
 	@Test
@@ -317,6 +318,23 @@ public void testTimeZoneType() {
 		runBasicTests( StandardBasicTypes.TIMEZONE, original, copy, different );
 	}
 
+	protected <T> void runBasicTestsWithCoercion(
+			BasicTypeReference<T> basicTypeReference,
+			T original,
+			T copy,
+			T different) {
+		BasicType<?> type =
+				new TypeConfiguration()
+						.getBasicTypeRegistry()
+						.getRegisteredType( basicTypeReference.getName() );
+		runBasicTests(
+				type,
+				type.getJavaTypeDescriptor().coerce(original),
+				type.getJavaTypeDescriptor().coerce(copy),
+				type.getJavaTypeDescriptor().coerce(different)
+		);
+	}
+
 	protected <T> void runBasicTests(
 			BasicTypeReference<T> basicTypeReference,
 			T original,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java
index 5c5e6dc5907f..a6267d8c2f2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/VarbinaryArrayTest.java
@@ -14,6 +14,8 @@
 import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.SqlTypes;
 
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -224,6 +226,7 @@ <T> void queryById(String propertyName, long id, T value, Function<EntityWithArr
 			reason = "For some reason, HANA can't intersect VARBINARY values, but funnily can do a union...")
 	@SkipForDialect(dialectClass = InformixDialect.class,
 			reason = "The statement failed because binary large objects are not allowed in the Union, Intersect, or Minus queries")
+	@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsArrayComparison.class )
 	<T> void queryByData(String propertyName, long id, T value, Function<EntityWithArrays, T> getter,
 			SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java
index bc12dff8bacc..24d089d8cd89 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/LiteralRenderingTest.java
@@ -95,6 +95,7 @@ public static List<Object> literalValues() throws Exception {
 	public void testIdVersionFunctions(Object literalValue, SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
+
 					HibernateCriteriaBuilder cb = session.getCriteriaBuilder();
 					JpaCriteriaQuery<Object> query = cb.createQuery();
 					query.from( BasicEntity.class );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/TypeContributionOrdinalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/TypeContributionOrdinalTest.java
new file mode 100644
index 000000000000..c053ffd25a47
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/usertype/TypeContributionOrdinalTest.java
@@ -0,0 +1,81 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.type.contributor.usertype;
+
+import org.hibernate.boot.model.TypeContributions;
+import org.hibernate.boot.model.TypeContributor;
+import org.hibernate.service.ServiceRegistry;
+
+import org.hibernate.testing.orm.junit.BootstrapServiceRegistry;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+
+import org.hibernate.type.descriptor.jdbc.VarcharJdbcType;
+import org.hibernate.type.spi.TypeConfiguration;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test to assert that service loaded types are processed in ascending ordinal order
+ *
+ * @author Steven Barendregt
+ */
+@DomainModel
+@SessionFactory
+@BootstrapServiceRegistry(
+		javaServices = {
+				@BootstrapServiceRegistry.JavaService(role = TypeContributor.class, impl = TypeContributionOrdinalTest.HigherOrdinalServiceLoadedVarcharTypeContributor.class),
+				@BootstrapServiceRegistry.JavaService(role = TypeContributor.class, impl = TypeContributionOrdinalTest.ServiceLoadedVarcharTypeContributor.class)
+		}
+)
+public class TypeContributionOrdinalTest {
+
+	@Test
+	@Jira(value = "https://hibernate.atlassian.net/issues/HHH-19247")
+	public void testHigherOrdinalServiceLoadedCustomUserTypeTakesPrecedence(SessionFactoryScope scope) {
+		final TypeConfiguration typeConfigurations = scope.getSessionFactory()
+				.getMappingMetamodel()
+				.getTypeConfiguration();
+		Assertions.assertInstanceOf(
+				HigherOrdinalServiceLoadedVarcharTypeContributor.HigherOrdinalExtendedVarcharJdbcType.class,
+				typeConfigurations.getJdbcTypeRegistry().findDescriptor( 12 )
+		);
+	}
+
+	public static class ServiceLoadedVarcharTypeContributor implements TypeContributor {
+
+		@Override
+		public void contribute(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+			typeContributions.contributeJdbcType( ExtendedVarcharJdbcType.INSTANCE );
+		}
+
+		public static class ExtendedVarcharJdbcType extends VarcharJdbcType {
+
+			public static final ExtendedVarcharJdbcType INSTANCE = new ExtendedVarcharJdbcType();
+		}
+
+	}
+
+	public static class HigherOrdinalServiceLoadedVarcharTypeContributor implements TypeContributor {
+
+		@Override
+		public void contribute(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+			typeContributions.contributeJdbcType( HigherOrdinalExtendedVarcharJdbcType.INSTANCE );
+		}
+
+		@Override
+		public int ordinal() {
+			return 2000;
+		}
+
+		public static class HigherOrdinalExtendedVarcharJdbcType extends VarcharJdbcType {
+
+			public static final HigherOrdinalExtendedVarcharJdbcType INSTANCE = new HigherOrdinalExtendedVarcharJdbcType();
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcDateJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcDateJavaTypeDescriptorTest.java
index 4579323cb731..61c8a8a06dfd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcDateJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcDateJavaTypeDescriptorTest.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @BaseUnitTest
 public class JdbcDateJavaTypeDescriptorTest {
@@ -23,9 +24,6 @@ public class JdbcDateJavaTypeDescriptorTest {
 	public void testToString() {
 		final JdbcDateJavaType javaType = JdbcDateJavaType.INSTANCE;
 
-		final String utilDate = javaType.toString( new java.util.Date( 0 ) );
-		assertThat( utilDate ).isEqualTo( "1970-01-01" );
-
 		final String sqlDate = javaType.toString( new java.sql.Date( 0 ) );
 		assertThat( sqlDate ).isEqualTo( "1970-01-01" );
 	}
@@ -34,8 +32,8 @@ public void testToString() {
 	public void testIsInstance() {
 		final JdbcDateJavaType javaType = JdbcDateJavaType.INSTANCE;
 
-		javaType.isInstance( new java.sql.Date( 0 ) );
-		javaType.isInstance( new java.util.Date( 0 ) );
+		assertTrue( javaType.isInstance(new java.sql.Date(0)) );
+		assertTrue( javaType.isInstance(new java.util.Date(0)) );
 	}
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcTimeJavaTypeDescriptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcTimeJavaTypeDescriptorTest.java
index 3da4f796f2ea..6547eabebd4e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcTimeJavaTypeDescriptorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/descriptor/java/JdbcTimeJavaTypeDescriptorTest.java
@@ -8,9 +8,7 @@
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.ZoneOffset;
-import java.util.Date;
 
-import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.JdbcTimeJavaType;
 
 import org.hibernate.testing.orm.junit.BaseUnitTest;
@@ -25,7 +23,7 @@ public class JdbcTimeJavaTypeDescriptorTest {
 	@Test
 	@JiraKey("HHH-17229")
 	public void testUnwrap() {
-		final JavaType<Date> javaType = JdbcTimeJavaType.INSTANCE;
+		final var javaType = JdbcTimeJavaType.INSTANCE;
 
 		final Time sqlTime = new Time(
 				LocalDate.EPOCH.atTime( LocalTime.of( 0, 1, 2, 0 ) )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/AbstractParametersBuilder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/AbstractParametersBuilder.java
index 41a320007e93..7d2e5454fb9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/AbstractParametersBuilder.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/AbstractParametersBuilder.java
@@ -6,6 +6,7 @@
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.H2Dialect;
+import org.hibernate.dialect.SpannerDialect;
 
 import java.time.ZoneId;
 import java.util.ArrayList;
@@ -82,6 +83,11 @@ protected final boolean isNanosecondPrecisionSupported() {
 
 	protected final B add(ZoneId defaultJvmTimeZone, D testData) {
 		for ( Class<? extends AbstractRemappingH2Dialect> remappingDialectClass : remappingDialectClasses ) {
+			if ( forcedJdbcTimeZone != null && dialect instanceof SpannerDialect ) {
+				// Spanner TIMESTAMP represents an absolute instant and is always interpreted as UTC;
+				// using a different JDBC timezone can produce undesired results when reading/writing values, so we skip these tests.
+				continue;
+			}
 			addParam( defaultJvmTimeZone, forcedJdbcTimeZone, remappingDialectClass, testData );
 		}
 
@@ -106,6 +112,11 @@ private void addParam(
 	}
 
 	protected Iterable<? extends ZoneId> getHibernateJdbcTimeZonesToTest() {
+		if ( dialect instanceof SpannerDialect ) {
+			// Spanner TIMESTAMP represents an absolute instant and is always interpreted as UTC.
+			// To avoid undesired timezone conversions, do not override the JDBC timezone, or explicitly use UTC.
+			return List.of( ZoneId.of( "UTC" ) );
+		}
 		return Arrays.asList( Timezones.ZONE_GMT, Timezones.ZONE_OSLO );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTest.java
index f339222fa642..dd90f39f59cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalDateTest.java
@@ -20,6 +20,7 @@
 import jakarta.persistence.Id;
 
 import jakarta.persistence.Table;
+import org.hibernate.community.dialect.TiDBDialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.H2Dialect;
@@ -58,7 +59,12 @@
 @SkipForDialect(dialectClass = HANADialect.class,
 		reason = "HANA systematically returns the wrong date when the JVM default timezone is not UTC")
 @SkipForDialect(dialectClass = MySQLDialect.class,
-		reason = "HHH-13582: MySQL ConnectorJ 8.x returns the wrong date"
+		reason = "HHH-13582: MySQL Connector/J 8.x returns the wrong date"
+				+ " when the JVM default timezone is different from the server timezone:"
+				+ " https://bugs.mysql.com/bug.php?id=91112"
+)
+@SkipForDialect(dialectClass = TiDBDialect.class,
+		reason = "HHH-13582: MySQL Connector/J 8.x returns the wrong date"
 				+ " when the JVM default timezone is different from the server timezone:"
 				+ " https://bugs.mysql.com/bug.php?id=91112"
 )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalTimeTest.java
index 4fdde7c53ac5..a1153fc819c5 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/LocalTimeTest.java
@@ -9,6 +9,7 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
+import org.hibernate.community.dialect.TiDBDialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.HANADialect;
@@ -59,7 +60,7 @@ protected static List<Parameter<LocalTime, LocalTimeData>> testData() {
 				.add( 0, 19, 31, 0, Timezones.ZONE_AMSTERDAM )
 				.skippedForDialects(
 						// MySQL/Mariadb cannot store values equal to epoch exactly, or less, in a timestamp.
-						Arrays.asList( MySQLDialect.class, MariaDBDialect.class ),
+						Arrays.asList( MySQLDialect.class, MariaDBDialect.class, TiDBDialect.class ),
 						b -> b
 								.add( 0, 0, 0, 0, Timezones.ZONE_GMT )
 								.add( 0, 0, 0, 0, Timezones.ZONE_OSLO )
@@ -166,6 +167,12 @@ protected Object extractJdbcValue(
 					+ " (typically 1969-12-31), even though the time is always right."
 					+ " Since java.sql.Time holds the whole timestamp, not just the time,"
 					+ " its equals() method ends up returning false in this test.")
+	@SkipForDialect(dialectClass = TiDBDialect.class,
+			reason = "HHH-13580 MySQL seems to store the whole timestamp, not just the time,"
+					+ " which for some timezones results in a date other than 1970-01-01 being returned"
+					+ " (typically 1969-12-31), even though the time is always right."
+					+ " Since java.sql.Time holds the whole timestamp, not just the time,"
+					+ " its equals() method ends up returning false in this test.")
 	@SkipForDialect(dialectClass = HSQLDialect.class,
 			reason = "Timezone issue?")
 	public void writeThenNativeRead(SessionFactoryScope factoryScope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetTimeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetTimeTest.java
index 2ad2a34730a5..7d3a3c91d695 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/temporal/OffsetTimeTest.java
@@ -27,6 +27,7 @@
 import jakarta.persistence.Table;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.community.dialect.TiDBDialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.H2Dialect;
@@ -78,7 +79,7 @@ public static List<Parameter<OffsetTime,DataImpl>> testData() {
 				.add( 0, 19, 31, 0, "+00:19:32", ZONE_AMSTERDAM )
 				.skippedForDialects(
 						// MySQL/Mariadb cannot store values equal to epoch exactly, or less, in a timestamp.
-						Arrays.asList( MySQLDialect.class, MariaDBDialect.class ),
+						Arrays.asList( MySQLDialect.class, MariaDBDialect.class, TiDBDialect.class ),
 						b -> b
 								.add( 0, 0, 0, 0, "+01:00", ZONE_GMT )
 								.add( 0, 0, 0, 0, "+00:00", ZONE_GMT )
@@ -210,6 +211,12 @@ protected Object extractJdbcValue(
 					+ " (typically 1969-12-31), even though the time is always right."
 					+ " Since java.sql.Time holds the whole timestamp, not just the time,"
 					+ " its equals() method ends up returning false in this test.")
+	@SkipForDialect(dialectClass = TiDBDialect.class,
+			reason = "HHH-13580 MySQL seems to store the whole timestamp, not just the time,"
+					+ " which for some timezones results in a date other than 1970-01-01 being returned"
+					+ " (typically 1969-12-31), even though the time is always right."
+					+ " Since java.sql.Time holds the whole timestamp, not just the time,"
+					+ " its equals() method ends up returning false in this test.")
 	@SkipForDialect(dialectClass = HSQLDialect.class,
 			reason = "Timezone issue?")
 	@SkipForDialect(dialectClass = H2Dialect.class,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java
index 959f0ea96b9d..cb8a7c9416eb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/CharInNativeQueryTest.java
@@ -5,10 +5,13 @@
 package org.hibernate.orm.test.typedescriptor;
 
 
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -24,6 +27,8 @@
 		annotatedClasses = Issue.class
 )
 @SessionFactory
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support char(8)")
+@SkipForDialect( dialectClass = SpannerDialect.class, reason = "Spanner doesn't support char(8)")
 public class CharInNativeQueryTest {
 
 	@BeforeEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java
index 31dce07c96df..27c7d21da397 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringHelperTest.java
@@ -130,4 +130,38 @@ private String generateOrdinalParameters(int startPosition, int endPosition) {
 		return builder.toString();
 	}
 
+	@Test
+	public void testDecapitalize() {
+		// Null and empty strings should be returned as-is (same instance)
+		assertNull( StringHelper.decapitalize( null ) );
+		assertSame( "", StringHelper.decapitalize( "" ) );
+
+		// Single character strings
+		assertEquals( "x", StringHelper.decapitalize( "X" ) );
+		assertEquals( "x", StringHelper.decapitalize( "x" ) );
+
+		// Normal capitalized names should have first char lowercased
+		assertEquals( "fooBah", StringHelper.decapitalize( "FooBah" ) );
+		assertEquals( "name", StringHelper.decapitalize( "Name" ) );
+		assertEquals( "getString", StringHelper.decapitalize( "GetString" ) );
+
+		// Special case: when both first and second chars are uppercase,
+		// the string should remain unchanged (JavaBeans spec) - same instance returned
+		String url = "URL";
+		assertSame( url, StringHelper.decapitalize( url ) );
+		assertEquals( "ID", StringHelper.decapitalize( "ID" ) );
+		assertEquals( "XMLParser", StringHelper.decapitalize( "XMLParser" ) );
+
+		// Already lowercase strings should return same instance (optimization)
+		String lowercase = "alreadylowercase";
+		assertSame( lowercase, StringHelper.decapitalize( lowercase ) );
+
+		// Edge case: single uppercase char
+		assertEquals( "a", StringHelper.decapitalize( "A" ) );
+
+		// Edge case: single lowercase char should return same instance
+		String singleLower = "a";
+		assertSame( singleLower, StringHelper.decapitalize( singleLower ) );
+	}
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/view/ViewTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/view/ViewTest.java
index db2afa4768ef..bce37d961477 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/view/ViewTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/view/ViewTest.java
@@ -7,9 +7,11 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import java.util.UUID;
@@ -19,6 +21,7 @@
 
 @SessionFactory
 @DomainModel(annotatedClasses = {ViewTest.Table.class, ViewTest.View.class, ViewTest.Summary.class})
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner requires SQL SECURITY clause for views")
 public class ViewTest {
 
 	@Test void test(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java
index c3a261acf2be..f9e83666480f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyManyToManyNonUniqueIdWhereTest.java
@@ -16,10 +16,12 @@
 import org.hibernate.annotations.SQLJoinTableRestriction;
 import org.hibernate.annotations.SQLRestriction;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -49,6 +51,7 @@
 		LazyManyToManyNonUniqueIdWhereTest.Size.class
 })
 @SessionFactory
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner does not support varchar in column definition")
 public class LazyManyToManyNonUniqueIdWhereTest {
 	@BeforeAll
 	public void createSchema(SessionFactoryScope factoryScope) {
@@ -75,7 +78,7 @@ MAIN_CODE varchar(10) not null,
 							ASSOCIATION_CODE varchar(10) not null,
 							primary key (MAIN_ID, MAIN_CODE, ASSOCIATION_ID, ASSOCIATION_CODE)
 						)""" );
-				statement.executeUpdate("""
+				statement.executeUpdate( """
 						create table MATERIAL_RATINGS(
 							MATERIAL_ID integer not null,
 							RATING_ID integer not null,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java
index 149ed4be9a96..fef0413188b9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/LazyOneToManyNonUniqueIdWhereTest.java
@@ -17,6 +17,8 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -46,6 +48,7 @@
 		LazyOneToManyNonUniqueIdWhereTest.Size.class
 })
 @SessionFactory
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner does not support varchar in column definition")
 public class LazyOneToManyNonUniqueIdWhereTest {
 	@BeforeEach
 	void createSchema(SessionFactoryScope factoryScope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java
index 0ccfca436ae8..abba7480586f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyElementCollectionBasicNonUniqueIdWhereTest.java
@@ -10,12 +10,15 @@
 import java.util.Set;
 
 import org.hibernate.Hibernate;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -31,6 +34,11 @@
 @RequiresDialect(H2Dialect.class)
 @DomainModel(xmlMappings = "hbm/where/LazyElementCollectionBasicNonUniqueIdWhereTest.hbm.xml")
 @SessionFactory(exportSchema = false)
+@ServiceRegistry(
+	settings = {
+		@Setting(name = AvailableSettings.TRANSFORM_HBM_XML, value = "true")
+	}
+)
 public class LazyElementCollectionBasicNonUniqueIdWhereTest {
 	@BeforeAll
 	static void createSchema(SessionFactoryScope factoryScope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java
index 744fb6b5e9af..69f6f0b976b0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java
@@ -10,6 +10,8 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -30,6 +32,7 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(xmlMappings = "hbm/where/LazyManyToManyNonUniqueIdNotFoundWhereTest.hbm.xml")
 @SessionFactory
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner does not support varchar in column definition")
 public class LazyManyToManyNonUniqueIdNotFoundWhereTest {
 	@AfterAll
 	static void dropSchema(SessionFactoryScope factoryScope) {
@@ -67,7 +70,7 @@ create table BUILDING_RATINGS(
 							RATING_ID integer not null,
 							primary key (BUILDING_ID, RATING_ID)
 						)""" );
-				statement.executeUpdate("""
+				statement.executeUpdate( """
 						create table MATERIAL_RATINGS(
 							MATERIAL_ID integer not null,
 							RATING_ID integer not null,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java
index 311b672816d4..beb503f5c723 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdWhereTest.java
@@ -9,6 +9,8 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -33,6 +35,7 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(xmlMappings = "hbm/where/LazyManyToManyNonUniqueIdWhereTest.hbm.xml")
 @SessionFactory
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner does not support varchar in column definition")
 public class LazyManyToManyNonUniqueIdWhereTest {
 
 	@BeforeAll
@@ -60,7 +63,7 @@ MAIN_CODE varchar(10) not null,
 							ASSOCIATION_CODE varchar(10) not null,
 							primary key (MAIN_ID, MAIN_CODE, ASSOCIATION_ID, ASSOCIATION_CODE)
 						)""" );
-				statement.executeUpdate("""
+				statement.executeUpdate( """
 						create table MATERIAL_RATINGS(
 							MATERIAL_ID integer not null,
 							RATING_ID integer not null,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java
index f658a6896682..748d7e472a6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyOneToManyNonUniqueIdWhereTest.java
@@ -9,6 +9,8 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.dialect.SpannerDialect;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -33,6 +35,7 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @DomainModel(xmlMappings = "hbm/where/LazyOneToManyNonUniqueIdWhereTest.hbm.xml")
 @SessionFactory
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner does not support varchar in column definition")
 public class LazyOneToManyNonUniqueIdWhereTest {
 	@BeforeAll
 	public void createSchema(SessionFactoryScope factoryScope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/temporal/AuditEntityTest.java b/hibernate-core/src/test/java/org/hibernate/temporal/AuditEntityTest.java
new file mode 100644
index 000000000000..47ffaf2550ef
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/temporal/AuditEntityTest.java
@@ -0,0 +1,128 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Version;
+import org.hibernate.SharedSessionContract;
+import org.hibernate.annotations.Audited;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.temporal.spi.TransactionIdentifierSupplier;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+@SessionFactory
+@DomainModel(annotatedClasses = AuditEntityTest.AuditEntity.class)
+@ServiceRegistry(settings = @Setting(name = StateManagementSettings.TRANSACTION_ID_SUPPLIER,
+		value = "org.hibernate.temporal.AuditEntityTest$TxIdSupplier"))
+class AuditEntityTest {
+	private static int currentTxId;
+
+	public static class TxIdSupplier implements TransactionIdentifierSupplier<Integer> {
+		@Override
+		public Integer generateTransactionIdentifier(SharedSessionContract session) {
+			return ++currentTxId;
+		}
+	}
+
+	@Test
+	void test(SessionFactoryScope scope) {
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					AuditEntity entity = new AuditEntity();
+					entity.id = 1L;
+					entity.text = "hello";
+					entity.stringSet.add( "hello" );
+					session.persist( entity );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					AuditEntity entity = session.find( AuditEntity.class, 1L );
+					entity.text = "goodbye";
+					entity.stringSet.add( "goodbye" );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					AuditEntity entity = session.find( AuditEntity.class, 1L );
+					session.remove( entity );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					AuditEntity entity = session.find( AuditEntity.class, 1L );
+					assertNull( entity );
+				}
+		);
+		try ( var s = scope.getSessionFactory().withOptions().atTransaction(0).open() ) {
+			AuditEntity entity = s.find( AuditEntity.class, 1L );
+			assertNull( entity );
+			AuditEntity result =
+					s.createSelectionQuery( "from AuditEntity where id = 1", AuditEntity.class )
+							.getSingleResultOrNull();
+			assertNull( result );
+		}
+		try ( var s = scope.getSessionFactory().withOptions().atTransaction(1).open() ) {
+			AuditEntity entity = s.find( AuditEntity.class, 1L );
+			assertEquals( "hello", entity.text);
+			assertEquals( Set.of("hello"), entity.stringSet);
+			AuditEntity result =
+					s.createSelectionQuery( "from AuditEntity where id = 1", AuditEntity.class )
+							.getSingleResultOrNull();
+			assertSame( entity, result );
+		}
+		try ( var s = scope.getSessionFactory().withOptions().atTransaction(2).open() ) {
+			AuditEntity entity = s.find( AuditEntity.class, 1L );
+			assertEquals( "goodbye", entity.text);
+			assertEquals( Set.of("hello","goodbye"), entity.stringSet );
+			AuditEntity result =
+					s.createSelectionQuery( "from AuditEntity where id = 1", AuditEntity.class )
+							.getSingleResultOrNull();
+			assertSame( entity, result );
+		}
+		try ( var s = scope.getSessionFactory().withOptions().atTransaction(3).open() ) {
+			AuditEntity entity = s.find( AuditEntity.class, 1L );
+			assertNull( entity );
+			AuditEntity result =
+					s.createSelectionQuery( "from AuditEntity where id = 1", AuditEntity.class )
+							.getSingleResultOrNull();
+			assertNull( result );
+		}
+		try ( var s = scope.getSessionFactory().withOptions().atTransaction(4).open() ) {
+			AuditEntity entity = s.find( AuditEntity.class, 1L );
+			assertNull( entity );
+			AuditEntity result =
+					s.createSelectionQuery( "from AuditEntity where id = 1", AuditEntity.class )
+							.getSingleResultOrNull();
+			assertNull( result );
+		}
+	}
+	@Audited
+	@Entity(name = "AuditEntity")
+	static class AuditEntity {
+		@Id
+		long id;
+		String text;
+		@Version
+		int version;
+		@Audited
+		@ElementCollection
+		Set<String> stringSet = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityHistoryServerSideTest.java b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityHistoryServerSideTest.java
new file mode 100644
index 000000000000..d382065746a8
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityHistoryServerSideTest.java
@@ -0,0 +1,378 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Version;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Temporal;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses =
+		{TemporalEntityHistoryServerSideTest.TemporalEntity4.class,
+		TemporalEntityHistoryServerSideTest.TemporalChild4.class})
+@ServiceRegistry(settings = {@Setting(name = StateManagementSettings.TEMPORAL_TABLE_STRATEGY, value = "HISTORY_TABLE"),
+		@Setting(name = StateManagementSettings.USE_SERVER_TRANSACTION_TIMESTAMPS, value = "true")})
+@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 11, versionMatchMode = VersionMatchMode.OLDER, reason = "See https://jira.mariadb.org/browse/MDEV-39230")
+class TemporalEntityHistoryServerSideTest {
+
+	@Test void test(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = new TemporalEntity4();
+					entity.id = 1L;
+					entity.text = "hello";
+					entity.strings.add( "x" );
+					session.persist( entity );
+					TemporalChild4 child = new TemporalChild4();
+					child.id = 1L;
+					child.text = "world";
+					child.parent = entity;
+					session.persist( child );
+				}
+		);
+		Thread.sleep( 250 );
+		var instant = getInstant( scope );
+		Thread.sleep( 250 );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					entity.text = "goodbye";
+					entity.strings.add( "y" );
+					entity.children.get(0).text = "world!";
+					TemporalChild4 friend = new TemporalChild4();
+					friend.id = 5L;
+					friend.text = "friend";
+					session.persist( friend );
+					entity.children.get(0).friends.add( friend );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					assertEquals( 2, entity.strings.size() );
+					assertEquals( 1, entity.children.get(0).friends.size() );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity =
+							session.createSelectionQuery( "from TemporalEntity4 where id=1", TemporalEntity4.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity =
+							session.createSelectionQuery( "from TemporalEntity4 p left join fetch p.children c where p.id=1", TemporalEntity4.class )
+									.getSingleResult();
+					assertTrue( Hibernate.isInitialized(entity.children) );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					var friends =
+							session.createSelectionQuery( "select f from TemporalEntity4 p join p.children c join c.friends f where p.id=1", TemporalChild4.class )
+									.getResultCount();
+					assertEquals( 1, friends );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				assertEquals( 1, entity.strings.size() );
+				assertEquals( 0, entity.children.get(0).friends.size() );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity =
+						session.createSelectionQuery( "from TemporalEntity4 where id=1", TemporalEntity4.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity =
+						session.createSelectionQuery( "from TemporalEntity4 p left join fetch p.children c where p.id=1", TemporalEntity4.class )
+								.getSingleResult();
+				assertTrue( Hibernate.isInitialized(entity.children) );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				var friends =
+						session.createSelectionQuery( "select f from TemporalEntity4 p join p.children c join c.friends f where p.id=1", TemporalChild4.class )
+								.getResultCount();
+				assertEquals( 0, friends );
+			} );
+		}
+		Thread.sleep( 250 );
+		var nextInstant = getInstant( scope );
+		Thread.sleep( 250 );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					entity.strings.remove( "x" );
+					entity.strings.add( "z" );
+					entity.children.get(0).friends.clear();
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					assertEquals( Set.of("y", "z"), entity.strings );
+					assertEquals( 0, entity.children.get(0).friends.size() );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+						assertEquals( Set.of( "x" ), entity.strings );
+						assertEquals( 0, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(nextInstant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+						assertEquals( Set.of( "x", "y" ), entity.strings );
+						assertEquals( 1, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					session.remove( entity.children.get(0) );
+					session.remove( entity );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	@Test void testStateless(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity4 entity = new TemporalEntity4();
+					entity.id = 2L;
+					entity.text = "hello";
+					session.insert( entity );
+				}
+		);
+		Thread.sleep( 250 );
+		var instant = getInstant( scope );
+		Thread.sleep( 250 );
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+					entity.text = "goodbye";
+					session.update( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+					assertEquals( "goodbye", entity.text );
+					entity =
+							session.createSelectionQuery( "from TemporalEntity4 where id=2", TemporalEntity4.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+				assertEquals( "hello", entity.text );
+				entity =
+						session.createSelectionQuery( "from TemporalEntity4 where id=2", TemporalEntity4.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+					session.delete( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+
+	@Test void testCollections(SessionFactoryScope scope) throws InterruptedException {
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = new TemporalEntity4();
+			entity.id = 3L;
+			entity.text = "hello";
+			entity.strings.add( "x" );
+			entity.strings.add( "y" );
+			entity.strings.add( "z" );
+			entity.map.put( "a", "A" );
+			entity.map.put( "b", "B" );
+			entity.list.add( "M" );
+			entity.list.add( "N" );
+			s.persist( entity );
+		} );
+		var instant = getInstant( scope );
+		Thread.sleep( 250 );
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = s.find( TemporalEntity4.class, 3L);
+			assertEquals( Set.of("x", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "b", "B"), entity.map );
+			assertEquals( List.of("M", "N"), entity.list );
+			entity.strings.add( "w" );
+			entity.map.put( "c", "C" );
+			entity.list.add( "K" );
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = s.find( TemporalEntity4.class, 3L);
+			assertEquals( Set.of("w", "x", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "b", "B", "c", "C"), entity.map );
+			assertEquals( List.of("M", "N", "K"), entity.list );
+			entity.strings.remove( "x" );
+			entity.map.remove( "b" );
+			entity.list.remove( "N" );
+			entity.list.add( 0, "P" );
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = s.find( TemporalEntity4.class, 3L);
+			assertEquals( Set.of("w", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "c", "C"), entity.map );
+			assertEquals( List.of("P", "M", "K"), entity.list );
+			entity.strings.remove( "z" );
+			entity.strings.add( "v" );
+			entity.map.put( "c", "CC" );
+			entity.map.put( "a", "AA" );
+			entity.list.set( 2, "L" );
+			entity.list.set( 0, "Q" );
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = s.find( TemporalEntity4.class, 3L);
+			assertEquals( Set.of("v", "w", "y"), entity.strings );
+			assertEquals( Map.of("a", "AA", "c", "CC"), entity.map );
+			assertEquals( List.of("Q", "M", "L"), entity.list );
+			entity.strings = null;
+			entity.map = null;
+			entity.list = null;
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = s.find(TemporalEntity4.class, 3L);
+			assertEquals( Set.of(), entity.strings );
+			assertEquals( Map.of(), entity.map );
+			assertEquals( List.of(), entity.list );
+			s.remove( entity );
+		} );
+		try (var s = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			s.inTransaction( tx -> {
+				TemporalEntity4 entity = s.find( TemporalEntity4.class, 3L);
+				assertEquals( Set.of("x", "y", "z"), entity.strings );
+				assertEquals( Map.of("a", "A", "b", "B"), entity.map );
+				assertEquals( List.of("M", "N"), entity.list );
+			} );
+		}
+	}
+
+	private static Instant getInstant(SessionFactoryScope scope) {
+		return scope.getSessionFactory().fromSession(
+				s -> s.createSelectionQuery( "select instant", Instant.class ).getSingleResult() );
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalEntity4")
+	static class TemporalEntity4 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@OneToMany(mappedBy = "parent")
+		List<TemporalChild4> children = new ArrayList<>();
+		@Temporal
+		@ElementCollection
+		Set<String> strings = new HashSet<>();
+		@Temporal
+		@ElementCollection
+		Map<String,String> map = new HashMap<>();
+		@Temporal
+		@ElementCollection
+		@OrderColumn
+		List<String> list = new ArrayList<>();
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalChild4")
+	static class TemporalChild4 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@ManyToOne @JoinColumn
+		TemporalEntity4 parent;
+
+		@Temporal @ManyToMany
+		Set<TemporalChild4> friends = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityHistoryTest.java b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityHistoryTest.java
new file mode 100644
index 000000000000..4b8905dc372a
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityHistoryTest.java
@@ -0,0 +1,429 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Version;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Temporal;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses =
+		{TemporalEntityHistoryTest.TemporalEntity4.class,
+		TemporalEntityHistoryTest.TemporalChild4.class})
+@ServiceRegistry(settings = @Setting(name = StateManagementSettings.TEMPORAL_TABLE_STRATEGY, value = "HISTORY_TABLE"))
+@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 11, versionMatchMode = VersionMatchMode.OLDER, reason = "See https://jira.mariadb.org/browse/MDEV-39230")
+class TemporalEntityHistoryTest {
+
+	@Test void test(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = new TemporalEntity4();
+					entity.id = 1L;
+					entity.text = "hello";
+					entity.strings.add( "x" );
+					entity.excluded = 1L;
+					session.persist( entity );
+					TemporalChild4 child = new TemporalChild4();
+					child.id = 1L;
+					child.text = "world";
+					child.parent = entity;
+					session.persist( child );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					assertEquals( 1L, entity.excluded );
+					entity.excluded = 2L;
+				}
+		);
+		Thread.sleep( 250 );
+		var instant = Instant.now();
+		Thread.sleep( 250 );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					assertEquals( 2L, entity.excluded );
+					entity.text = "goodbye";
+					entity.strings.add( "y" );
+					entity.children.get(0).text = "world!";
+					entity.excluded = 5L;
+					TemporalChild4 friend = new TemporalChild4();
+					friend.id = 5L;
+					friend.text = "friend";
+					session.persist( friend );
+					entity.children.get(0).friends.add( friend );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 5L, entity.excluded );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					assertEquals( 2, entity.strings.size() );
+					assertEquals( 1, entity.children.get(0).friends.size() );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity =
+							session.createSelectionQuery( "from TemporalEntity4 where id=1", TemporalEntity4.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity =
+							session.createSelectionQuery( "from TemporalEntity4 p left join fetch p.children c where p.id=1", TemporalEntity4.class )
+									.getSingleResult();
+					assertTrue( Hibernate.isInitialized(entity.children) );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					var friends =
+							session.createSelectionQuery( "select f from TemporalEntity4 p join p.children c join c.friends f where p.id=1", TemporalChild4.class )
+									.getResultCount();
+					assertEquals( 1, friends );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+				assertEquals( "hello", entity.text );
+				assertEquals( 2L, entity.excluded );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				assertEquals( 1, entity.strings.size() );
+				assertEquals( 0, entity.children.get(0).friends.size() );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity =
+						session.createSelectionQuery( "from TemporalEntity4 where id=1", TemporalEntity4.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity =
+						session.createSelectionQuery( "from TemporalEntity4 p left join fetch p.children c where p.id=1", TemporalEntity4.class )
+								.getSingleResult();
+				assertTrue( Hibernate.isInitialized(entity.children) );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				var friends =
+						session.createSelectionQuery( "select f from TemporalEntity4 p join p.children c join c.friends f where p.id=1", TemporalChild4.class )
+								.getResultCount();
+				assertEquals( 0, friends );
+			} );
+		}
+		Thread.sleep( 250 );
+		var nextInstant = Instant.now();
+		Thread.sleep( 250 );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					entity.strings.remove( "x" );
+					entity.strings.add( "z" );
+					entity.children.get(0).friends.clear();
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					assertEquals( Set.of("y", "z"), entity.strings );
+					assertEquals( 0, entity.children.get(0).friends.size() );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+						assertEquals( Set.of( "x" ), entity.strings );
+						assertEquals( 0, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(nextInstant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+						assertEquals( Set.of( "x", "y" ), entity.strings );
+						assertEquals( 1, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					session.remove( entity.children.get(0) );
+					session.remove( entity );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity = session.find( TemporalEntity4.class, 1L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	@Test void testStateless(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity4 entity = new TemporalEntity4();
+					entity.id = 2L;
+					entity.text = "hello";
+					session.insert( entity );
+				}
+		);
+		Thread.sleep( 250 );
+		var instant = Instant.now();
+		Thread.sleep( 250 );
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+					entity.text = "goodbye";
+					session.update( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+					assertEquals( "goodbye", entity.text );
+					entity =
+							session.createSelectionQuery( "from TemporalEntity4 where id=2", TemporalEntity4.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+				assertEquals( "hello", entity.text );
+				entity =
+						session.createSelectionQuery( "from TemporalEntity4 where id=2", TemporalEntity4.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+					session.delete( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity4 entity = session.get( TemporalEntity4.class, 2L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+
+	@Test void testCollections(SessionFactoryScope scope) throws InterruptedException {
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = new TemporalEntity4();
+			entity.id = 3L;
+			entity.text = "hello";
+			entity.strings.add( "x" );
+			entity.strings.add( "y" );
+			entity.strings.add( "z" );
+			entity.map.put( "a", "A" );
+			entity.map.put( "b", "B" );
+			entity.list.add( "M" );
+			entity.list.add( "N" );
+			s.persist( entity );
+		} );
+		var instant = Instant.now();
+		Thread.sleep( 250 );
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = s.find( TemporalEntity4.class, 3L);
+			assertEquals( Set.of("x", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "b", "B"), entity.map );
+			assertEquals( List.of("M", "N"), entity.list );
+			entity.strings.add( "w" );
+			entity.map.put( "c", "C" );
+			entity.list.add( "K" );
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = s.find( TemporalEntity4.class, 3L);
+			assertEquals( Set.of("w", "x", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "b", "B", "c", "C"), entity.map );
+			assertEquals( List.of("M", "N", "K"), entity.list );
+			entity.strings.remove( "x" );
+			entity.map.remove( "b" );
+			entity.list.remove( "N" );
+			entity.list.add( 0, "P" );
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = s.find( TemporalEntity4.class, 3L);
+			assertEquals( Set.of("w", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "c", "C"), entity.map );
+			assertEquals( List.of("P", "M", "K"), entity.list );
+			entity.strings.remove( "z" );
+			entity.strings.add( "v" );
+			entity.map.put( "c", "CC" );
+			entity.map.put( "a", "AA" );
+			entity.list.set( 2, "L" );
+			entity.list.set( 0, "Q" );
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = s.find( TemporalEntity4.class, 3L);
+			assertEquals( Set.of("v", "w", "y"), entity.strings );
+			assertEquals( Map.of("a", "AA", "c", "CC"), entity.map );
+			assertEquals( List.of("Q", "M", "L"), entity.list );
+			entity.strings = null;
+			entity.map = null;
+			entity.list = null;
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity4 entity = s.find(TemporalEntity4.class, 3L);
+			assertEquals( Set.of(), entity.strings );
+			assertEquals( Map.of(), entity.map );
+			assertEquals( List.of(), entity.list );
+			s.remove( entity );
+		} );
+		try (var s = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			s.inTransaction( tx -> {
+				TemporalEntity4 entity = s.find( TemporalEntity4.class, 3L);
+				assertEquals( Set.of("x", "y", "z"), entity.strings );
+				assertEquals( Map.of("a", "A", "b", "B"), entity.map );
+				assertEquals( List.of("M", "N"), entity.list );
+			} );
+		}
+	}
+
+	@Test void testUpsert(SessionFactoryScope scope) {
+		scope.inStatelessTransaction( s -> {
+			TemporalEntity4 entity = new TemporalEntity4();
+			entity.id = 7L;
+			entity.text = "hello";
+			entity.strings.add( "x" );
+			entity.strings.add( "y" );
+			entity.strings.add( "z" );
+			entity.map.put( "a", "A" );
+			entity.map.put( "b", "B" );
+			entity.list.add( "M" );
+			entity.list.add( "N" );
+			s.upsert( entity );
+		} );
+		TemporalEntity4 entity1 = scope.getSessionFactory().fromStatelessTransaction( s -> {
+			TemporalEntity4 entity = s.get( TemporalEntity4.class, 7L );
+			s.fetch( entity.strings );
+			s.fetch( entity.map );
+			s.fetch( entity.list );
+			assertEquals( "hello", entity.text );
+			assertEquals( Set.of( "x", "y", "z" ), entity.strings );
+			assertEquals( Map.of( "a", "A", "b", "B" ), entity.map );
+			assertEquals( List.of( "M", "N" ), entity.list );
+			return entity;
+		} );
+		entity1.text = "goodbye";
+		entity1.strings.add( "w" );
+		entity1.map.put( "c", "C" );
+		scope.inStatelessTransaction( s -> {
+			s.upsert( entity1 );
+		} );
+		scope.inStatelessTransaction( s -> {
+			TemporalEntity4 entity = s.get( TemporalEntity4.class, 7L );
+			s.fetch( entity.strings );
+			s.fetch( entity.map );
+			s.fetch( entity.list );
+			assertEquals( "goodbye", entity.text );
+			assertEquals( Set.of( "w", "x", "y", "z" ), entity.strings );
+			assertEquals( Map.of( "a", "A", "b", "B", "c", "C" ), entity.map );
+			assertEquals( List.of( "M", "N" ), entity.list );
+		} );
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalEntity4")
+	static class TemporalEntity4 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@OneToMany(mappedBy = "parent")
+		List<TemporalChild4> children = new ArrayList<>();
+		@Temporal
+		@ElementCollection
+		Set<String> strings = new HashSet<>();
+		@Temporal
+		@ElementCollection
+		Map<String,String> map = new HashMap<>();
+		@Temporal
+		@ElementCollection
+		@OrderColumn
+		List<String> list = new ArrayList<>();
+		@Temporal.Excluded
+		long excluded;
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalChild4")
+	static class TemporalChild4 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@ManyToOne @JoinColumn
+		TemporalEntity4 parent;
+
+		@Temporal @ManyToMany
+		Set<TemporalChild4> friends = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityNativeTest.java b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityNativeTest.java
new file mode 100644
index 000000000000..8d86d1e0c668
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityNativeTest.java
@@ -0,0 +1,300 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Version;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Temporal;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.dialect.DB2Dialect;
+import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses =
+		{TemporalEntityNativeTest.TemporalEntity.class,
+		TemporalEntityNativeTest.TemporalChild.class})
+@ServiceRegistry(settings = @Setting(name = StateManagementSettings.TEMPORAL_TABLE_STRATEGY, value = "NATIVE"))
+@RequiresDialect(MariaDBDialect.class)
+@RequiresDialect(DB2Dialect.class)
+@RequiresDialect(SQLServerDialect.class)
+class TemporalEntityNativeTest {
+
+	public static final int PAUSE = 500;
+
+	@SkipForDialect(dialectClass = SQLServerDialect.class)
+	@Test void test(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = new TemporalEntity();
+					entity.id = 1L;
+					entity.text = "hello";
+					entity.strings.add( "x" );
+					session.persist( entity );
+					TemporalChild child = new TemporalChild();
+					child.id = 1L;
+					child.text = "world";
+					child.parent = entity;
+					session.persist( child );
+				}
+		);
+		Thread.sleep( PAUSE );
+		var instant = getInstant( scope );
+		Thread.sleep( PAUSE );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					entity.text = "goodbye";
+					entity.strings.add( "y" );
+					entity.children.get(0).text = "world!";
+					TemporalChild friend = new TemporalChild();
+					friend.id = 5L;
+					friend.text = "friend";
+					session.persist( friend );
+					entity.children.get(0).friends.add( friend );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					assertEquals( 2, entity.strings.size() );
+					assertEquals( 1, entity.children.get(0).friends.size() );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity =
+							session.createSelectionQuery( "from TemporalEntity where id=1", TemporalEntity.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity =
+							session.createSelectionQuery( "from TemporalEntity p left join fetch p.children c where p.id=1", TemporalEntity.class )
+									.getSingleResult();
+					assertTrue( Hibernate.isInitialized(entity.children) );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					var friends =
+							session.createSelectionQuery( "select f from TemporalEntity p join p.children c join c.friends f where p.id=1", TemporalChild.class )
+									.getResultCount();
+					assertEquals( 1, friends );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				assertEquals( 1, entity.strings.size() );
+				assertEquals( 0, entity.children.get(0).friends.size() );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity =
+						session.createSelectionQuery( "from TemporalEntity where id=1", TemporalEntity.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity =
+						session.createSelectionQuery( "from TemporalEntity p left join fetch p.children c where p.id=1", TemporalEntity.class )
+								.getSingleResult();
+				assertTrue( Hibernate.isInitialized(entity.children) );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				var friends =
+						session.createSelectionQuery( "select f from TemporalEntity p join p.children c join c.friends f where p.id=1", TemporalChild.class )
+								.getResultCount();
+				assertEquals( 0, friends );
+			} );
+		}
+		Thread.sleep( PAUSE );
+		var nextInstant = getInstant( scope );
+		Thread.sleep( PAUSE );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					entity.strings.remove( "x" );
+					entity.strings.add( "z" );
+					entity.children.get(0).friends.clear();
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					assertEquals( Set.of("y", "z"), entity.strings );
+					assertEquals( 0, entity.children.get(0).friends.size() );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+						assertEquals( Set.of( "x" ), entity.strings );
+						assertEquals( 0, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(nextInstant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+						assertEquals( Set.of( "x", "y" ), entity.strings );
+						assertEquals( 1, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					session.remove( entity.children.get(0) );
+					session.remove( entity );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	@Test void testStateless(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity entity = new TemporalEntity();
+					entity.id = 2L;
+					entity.text = "hello";
+					session.insert( entity );
+				}
+		);
+		Thread.sleep( PAUSE );
+		var instant = getInstant( scope );
+		Thread.sleep( PAUSE );
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+					entity.text = "goodbye";
+					session.update( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+					assertEquals( "goodbye", entity.text );
+					entity =
+							session.createSelectionQuery( "from TemporalEntity where id=2", TemporalEntity.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+				assertEquals( "hello", entity.text );
+				entity =
+						session.createSelectionQuery( "from TemporalEntity where id=2", TemporalEntity.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+					session.delete( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	private static Instant getInstant(SessionFactoryScope scope) {
+		return scope.getSessionFactory().fromSession(
+				s -> s.createSelectionQuery( "select instant", Instant.class ).getSingleResult() );
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalEntity")
+	static class TemporalEntity {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@OneToMany(mappedBy = "parent")
+		List<TemporalChild> children = new ArrayList<>();
+		@Temporal
+		@ElementCollection
+		Set<String> strings = new HashSet<>();
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalChild")
+	static class TemporalChild {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@ManyToOne @JoinColumn
+		TemporalEntity parent;
+
+		@Temporal @ManyToMany
+		Set<TemporalChild> friends = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityOracleNativeTest.java b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityOracleNativeTest.java
new file mode 100644
index 000000000000..196840e47216
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityOracleNativeTest.java
@@ -0,0 +1,300 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Version;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Temporal;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.dialect.OracleDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses =
+		{TemporalEntityOracleNativeTest.TemporalEntity5.class,
+		TemporalEntityOracleNativeTest.TemporalChild5.class})
+@ServiceRegistry(settings = @Setting(name = StateManagementSettings.TEMPORAL_TABLE_STRATEGY, value = "NATIVE"))
+@RequiresDialect(OracleDialect.class)
+@Disabled
+class TemporalEntityOracleNativeTest {
+
+	@Test void test(SessionFactoryScope scope) throws InterruptedException {
+		pause( scope );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity5 entity = new TemporalEntity5();
+					entity.id = 1L;
+					entity.text = "hello";
+					entity.strings.add( "x" );
+					session.persist( entity );
+					TemporalChild5 child = new TemporalChild5();
+					child.id = 1L;
+					child.text = "world";
+					child.parent = entity;
+					session.persist( child );
+				}
+		);
+		pause( scope );
+		var instant = getInstant( scope );
+		pause( scope );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity5 entity = session.find( TemporalEntity5.class, 1L );
+					entity.text = "goodbye";
+					entity.strings.add( "y" );
+					entity.children.get(0).text = "world!";
+					TemporalChild5 friend = new TemporalChild5();
+					friend.id = 5L;
+					friend.text = "friend";
+					session.persist( friend );
+					entity.children.get(0).friends.add( friend );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity5 entity = session.find( TemporalEntity5.class, 1L );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					assertEquals( 2, entity.strings.size() );
+					assertEquals( 1, entity.children.get(0).friends.size() );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity5 entity =
+							session.createSelectionQuery( "from TemporalEntity5 where id=1", TemporalEntity5.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity5 entity =
+							session.createSelectionQuery( "from TemporalEntity5 p left join fetch p.children c where p.id=1", TemporalEntity5.class )
+									.getSingleResult();
+					assertTrue( Hibernate.isInitialized(entity.children) );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					var friends =
+							session.createSelectionQuery( "select f from TemporalEntity5 p join p.children c join c.friends f where p.id=1", TemporalChild5.class )
+									.getResultCount();
+					assertEquals( 1, friends );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity5 entity = session.find( TemporalEntity5.class, 1L );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				assertEquals( 1, entity.strings.size() );
+				assertEquals( 0, entity.children.get(0).friends.size() );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity5 entity =
+						session.createSelectionQuery( "from TemporalEntity5 where id=1", TemporalEntity5.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity5 entity =
+						session.createSelectionQuery( "from TemporalEntity5 p left join fetch p.children c where p.id=1", TemporalEntity5.class )
+								.getSingleResult();
+				assertTrue( Hibernate.isInitialized(entity.children) );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				var friends =
+						session.createSelectionQuery( "select f from TemporalEntity5 p join p.children c join c.friends f where p.id=1", TemporalChild5.class )
+								.getResultCount();
+				assertEquals( 0, friends );
+			} );
+		}
+		pause( scope );
+		var nextInstant = getInstant( scope );
+		pause( scope );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity5 entity = session.find( TemporalEntity5.class, 1L );
+					entity.strings.remove( "x" );
+					entity.strings.add( "z" );
+					entity.children.get(0).friends.clear();
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity5 entity = session.find( TemporalEntity5.class, 1L );
+					assertEquals( Set.of("y", "z"), entity.strings );
+					assertEquals( 0, entity.children.get(0).friends.size() );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity5 entity = session.find( TemporalEntity5.class, 1L );
+						assertEquals( Set.of( "x" ), entity.strings );
+						assertEquals( 0, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(nextInstant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity5 entity = session.find( TemporalEntity5.class, 1L );
+						assertEquals( Set.of( "x", "y" ), entity.strings );
+						assertEquals( 1, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity5 entity = session.find( TemporalEntity5.class, 1L );
+					session.remove( entity.children.get(0) );
+					session.remove( entity );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity5 entity = session.find( TemporalEntity5.class, 1L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity5 entity = session.find( TemporalEntity5.class, 1L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	private static void pause(SessionFactoryScope scope) throws InterruptedException {
+//		scope.inSession( s -> s.doWork( connection -> connection.createStatement().execute( "ALTER SYSTEM checkpoint" ) ) );
+		Thread.sleep( 4_000 );
+	}
+
+	@Test void testStateless(SessionFactoryScope scope) throws InterruptedException {
+		pause( scope );
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity5 entity = new TemporalEntity5();
+					entity.id = 2L;
+					entity.text = "hello";
+					session.insert( entity );
+				}
+		);
+		pause( scope );
+		var instant = getInstant( scope );
+		pause( scope );
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity5 entity = session.get( TemporalEntity5.class, 2L );
+					entity.text = "goodbye";
+					session.update( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity5 entity = session.get( TemporalEntity5.class, 2L );
+					assertEquals( "goodbye", entity.text );
+					entity =
+							session.createSelectionQuery( "from TemporalEntity5 where id=2", TemporalEntity5.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity5 entity = session.get( TemporalEntity5.class, 2L );
+				assertEquals( "hello", entity.text );
+				entity =
+						session.createSelectionQuery( "from TemporalEntity5 where id=2", TemporalEntity5.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity5 entity = session.get( TemporalEntity5.class, 2L );
+					session.delete( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity5 entity = session.get( TemporalEntity5.class, 2L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity5 entity = session.get( TemporalEntity5.class, 2L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	private static Instant getInstant(SessionFactoryScope scope) {
+		return scope.fromSession( s -> s.createQuery( "select instant", Instant.class ).getSingleResult() );
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalEntity5")
+	static class TemporalEntity5 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@OneToMany(mappedBy = "parent")
+		List<TemporalChild5> children = new ArrayList<>();
+		@Temporal
+		@ElementCollection
+		Set<String> strings = new HashSet<>();
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalChild5")
+	static class TemporalChild5 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@ManyToOne @JoinColumn
+		TemporalEntity5 parent;
+
+		@Temporal @ManyToMany
+		Set<TemporalChild5> friends = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityPartitionedTest.java b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityPartitionedTest.java
new file mode 100644
index 000000000000..ab27faa0f6ba
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityPartitionedTest.java
@@ -0,0 +1,301 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Version;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Temporal;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses =
+		{TemporalEntityPartitionedTest.TemporalEntity3.class,
+		TemporalEntityPartitionedTest.TemporalChild3.class})
+@ServiceRegistry(settings = @Setting(name = StateManagementSettings.TEMPORAL_TABLE_STRATEGY, value = "SINGLE_TABLE"))
+@SkipForDialect( dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner doesn't support PARTITION BY")
+@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 11, versionMatchMode = VersionMatchMode.OLDER, reason = "See https://jira.mariadb.org/browse/MDEV-39230")
+class TemporalEntityPartitionedTest {
+
+	@Test void test(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity3 entity = new TemporalEntity3();
+					entity.id = 1L;
+					entity.text = "hello";
+					entity.strings.add( "x" );
+					session.persist( entity );
+					TemporalChild3 child = new TemporalChild3();
+					child.id = 1L;
+					child.text = "world";
+					child.parent = entity;
+					session.persist( child );
+				}
+		);
+		var instant = Instant.now();
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity3 entity = session.find( TemporalEntity3.class, 1L );
+					entity.text = "goodbye";
+					entity.strings.add( "y" );
+					entity.children.get(0).text = "world!";
+					TemporalChild3 friend = new TemporalChild3();
+					friend.id = 5L;
+					friend.text = "friend";
+					session.persist( friend );
+					entity.children.get(0).friends.add( friend );
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity3 entity = session.find( TemporalEntity3.class, 1L );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					assertEquals( 2, entity.strings.size() );
+					assertEquals( 1, entity.children.get(0).friends.size() );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity3 entity =
+							session.createSelectionQuery( "from TemporalEntity3 where id=1", TemporalEntity3.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity3 entity =
+							session.createSelectionQuery( "from TemporalEntity3 p left join fetch p.children c where p.id=1", TemporalEntity3.class )
+									.getSingleResult();
+					assertTrue( Hibernate.isInitialized(entity.children) );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					var friends =
+							session.createSelectionQuery( "select f from TemporalEntity3 p join p.children c join c.friends f where p.id=1", TemporalChild3.class )
+									.getResultCount();
+					assertEquals( 1, friends );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity3 entity = session.find( TemporalEntity3.class, 1L );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				assertEquals( 1, entity.strings.size() );
+				assertEquals( 0, entity.children.get(0).friends.size() );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity3 entity =
+						session.createSelectionQuery( "from TemporalEntity3 where id=1", TemporalEntity3.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity3 entity =
+						session.createSelectionQuery( "from TemporalEntity3 p left join fetch p.children c where p.id=1", TemporalEntity3.class )
+								.getSingleResult();
+				assertTrue( Hibernate.isInitialized(entity.children) );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				var friends =
+						session.createSelectionQuery( "select f from TemporalEntity3 p join p.children c join c.friends f where p.id=1", TemporalChild3.class )
+								.getResultCount();
+				assertEquals( 0, friends );
+			} );
+		}
+		var nextInstant = Instant.now();
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity3 entity = session.find( TemporalEntity3.class, 1L );
+					entity.strings.remove( "x" );
+					entity.strings.add( "z" );
+					entity.children.get(0).friends.clear();
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity3 entity = session.find( TemporalEntity3.class, 1L );
+					assertEquals( Set.of("y", "z"), entity.strings );
+					assertEquals( 0, entity.children.get(0).friends.size() );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity3 entity = session.find( TemporalEntity3.class, 1L );
+						assertEquals( Set.of( "x" ), entity.strings );
+						assertEquals( 0, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(nextInstant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity3 entity = session.find( TemporalEntity3.class, 1L );
+						assertEquals( Set.of( "x", "y" ), entity.strings );
+						assertEquals( 1, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity3 entity = session.find( TemporalEntity3.class, 1L );
+					session.remove( entity );
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity3 entity = session.find( TemporalEntity3.class, 1L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity3 entity = session.find( TemporalEntity3.class, 1L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	@Test void testStateless(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity3 entity = new TemporalEntity3();
+					entity.id = 2L;
+					entity.text = "hello";
+					session.insert( entity );
+				}
+		);
+		var instant = Instant.now();
+		awaitOracleClockTick();
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity3 entity = session.get( TemporalEntity3.class, 2L );
+					entity.text = "goodbye";
+					session.update( entity );
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity3 entity = session.get( TemporalEntity3.class, 2L );
+					assertEquals( "goodbye", entity.text );
+					entity =
+							session.createSelectionQuery( "from TemporalEntity3 where id=2", TemporalEntity3.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity3 entity = session.get( TemporalEntity3.class, 2L );
+				assertEquals( "hello", entity.text );
+				entity =
+						session.createSelectionQuery( "from TemporalEntity3 where id=2", TemporalEntity3.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity3 entity = session.get( TemporalEntity3.class, 2L );
+					session.delete( entity );
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity3 entity = session.get( TemporalEntity3.class, 2L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity3 entity = session.get( TemporalEntity3.class, 2L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	private static void awaitOracleClockTick() throws InterruptedException {
+		// Since the nanosecond resolution clock on the database might be slightly off compared to the JVM clock,
+		// wait some time after doing an insert/update to allow a following "as of period for system_time current_timestamp"
+		// query to actually see the changes
+		Thread.sleep( 100 );
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Temporal.HistoryPartitioning
+	@Entity(name = "TemporalEntity3")
+	static class TemporalEntity3 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@OneToMany(mappedBy = "parent")
+		List<TemporalChild3> children = new ArrayList<>();
+		@Temporal @Temporal.HistoryPartitioning
+		@ElementCollection
+		Set<String> strings = new HashSet<>();
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Temporal.HistoryPartitioning
+	@Entity(name = "TemporalChild3")
+	static class TemporalChild3 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@ManyToOne @JoinColumn
+		TemporalEntity3 parent;
+
+		@Temporal @Temporal.HistoryPartitioning
+		@ManyToMany
+		Set<TemporalChild3> friends = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityServerSideTest.java b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityServerSideTest.java
new file mode 100644
index 000000000000..b1120d54377f
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityServerSideTest.java
@@ -0,0 +1,293 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Version;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Temporal;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses =
+		{TemporalEntityServerSideTest.TemporalEntity2.class,
+		TemporalEntityServerSideTest.TemporalChild2.class})
+@ServiceRegistry(settings = {@Setting(name = StateManagementSettings.TEMPORAL_TABLE_STRATEGY, value = "SINGLE_TABLE"),
+		@Setting(name = StateManagementSettings.USE_SERVER_TRANSACTION_TIMESTAMPS, value = "true")})
+@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 11, versionMatchMode = VersionMatchMode.OLDER, reason = "See https://jira.mariadb.org/browse/MDEV-39230")
+class TemporalEntityServerSideTest {
+
+	@Test void test(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity2 entity = new TemporalEntity2();
+					entity.id = 1L;
+					entity.text = "hello";
+					entity.strings.add( "x" );
+					session.persist( entity );
+					TemporalChild2 child = new TemporalChild2();
+					child.id = 1L;
+					child.text = "world";
+					child.parent = entity;
+					session.persist( child );
+				}
+		);
+		Thread.sleep( 250 );
+		var instant = getInstant( scope );
+		Thread.sleep( 250 );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity2 entity = session.find( TemporalEntity2.class, 1L );
+					entity.text = "goodbye";
+					entity.strings.add( "y" );
+					entity.children.get(0).text = "world!";
+					TemporalChild2 friend = new TemporalChild2();
+					friend.id = 5L;
+					friend.text = "friend";
+					session.persist( friend );
+					entity.children.get(0).friends.add( friend );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity2 entity = session.find( TemporalEntity2.class, 1L );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					assertEquals( 2, entity.strings.size() );
+					assertEquals( 1, entity.children.get(0).friends.size() );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity2 entity =
+							session.createSelectionQuery( "from TemporalEntity2 where id=1", TemporalEntity2.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity2 entity =
+							session.createSelectionQuery( "from TemporalEntity2 p left join fetch p.children c where p.id=1", TemporalEntity2.class )
+									.getSingleResult();
+					assertTrue( Hibernate.isInitialized(entity.children) );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					var friends =
+							session.createSelectionQuery( "select f from TemporalEntity2 p join p.children c join c.friends f where p.id=1", TemporalChild2.class )
+									.getResultCount();
+					assertEquals( 1, friends );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity2 entity = session.find( TemporalEntity2.class, 1L );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				assertEquals( 1, entity.strings.size() );
+				assertEquals( 0, entity.children.get(0).friends.size() );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity2 entity =
+						session.createSelectionQuery( "from TemporalEntity2 where id=1", TemporalEntity2.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity2 entity =
+						session.createSelectionQuery( "from TemporalEntity2 p left join fetch p.children c where p.id=1", TemporalEntity2.class )
+								.getSingleResult();
+				assertTrue( Hibernate.isInitialized(entity.children) );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				var friends =
+						session.createSelectionQuery( "select f from TemporalEntity2 p join p.children c join c.friends f where p.id=1", TemporalChild2.class )
+								.getResultCount();
+				assertEquals( 0, friends );
+			} );
+		}
+		Thread.sleep( 250 );
+		var nextInstant = getInstant( scope );
+		Thread.sleep( 250 );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity2 entity = session.find( TemporalEntity2.class, 1L );
+					entity.strings.remove( "x" );
+					entity.strings.add( "z" );
+					entity.children.get(0).friends.clear();
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity2 entity = session.find( TemporalEntity2.class, 1L );
+					assertEquals( Set.of("y", "z"), entity.strings );
+					assertEquals( 0, entity.children.get(0).friends.size() );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity2 entity = session.find( TemporalEntity2.class, 1L );
+						assertEquals( Set.of( "x" ), entity.strings );
+						assertEquals( 0, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(nextInstant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity2 entity = session.find( TemporalEntity2.class, 1L );
+						assertEquals( Set.of( "x", "y" ), entity.strings );
+						assertEquals( 1, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity2 entity = session.find( TemporalEntity2.class, 1L );
+					session.remove( entity );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity2 entity = session.find( TemporalEntity2.class, 1L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity2 entity = session.find( TemporalEntity2.class, 1L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	@Test void testStateless(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity2 entity = new TemporalEntity2();
+					entity.id = 2L;
+					entity.text = "hello";
+					session.insert( entity );
+				}
+		);
+		Thread.sleep( 250 );
+		var instant = getInstant( scope );
+		Thread.sleep( 250 );
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity2 entity = session.get( TemporalEntity2.class, 2L );
+					entity.text = "goodbye";
+					session.update( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity2 entity = session.get( TemporalEntity2.class, 2L );
+					assertEquals( "goodbye", entity.text );
+					entity =
+							session.createSelectionQuery( "from TemporalEntity2 where id=2", TemporalEntity2.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity2 entity = session.get( TemporalEntity2.class, 2L );
+				assertEquals( "hello", entity.text );
+				entity =
+						session.createSelectionQuery( "from TemporalEntity2 where id=2", TemporalEntity2.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity2 entity = session.get( TemporalEntity2.class, 2L );
+					session.delete( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity2 entity = session.get( TemporalEntity2.class, 2L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity2 entity = session.get( TemporalEntity2.class, 2L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	private static Instant getInstant(SessionFactoryScope scope) {
+		return scope.getSessionFactory().fromSession(
+				s -> s.createSelectionQuery( "select instant", Instant.class ).getSingleResult() );
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalEntity2")
+	static class TemporalEntity2 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@OneToMany(mappedBy = "parent")
+		List<TemporalChild2> children = new ArrayList<>();
+		@Temporal
+		@ElementCollection
+		Set<String> strings = new HashSet<>();
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalChild2")
+	static class TemporalChild2 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@ManyToOne @JoinColumn
+		TemporalEntity2 parent;
+
+		@Temporal @ManyToMany
+		Set<TemporalChild2> friends = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntitySqlServerNativeTest.java b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntitySqlServerNativeTest.java
new file mode 100644
index 000000000000..393a187004c9
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntitySqlServerNativeTest.java
@@ -0,0 +1,281 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Version;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Temporal;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses =
+		{TemporalEntitySqlServerNativeTest.TemporalEntity.class,
+		TemporalEntitySqlServerNativeTest.TemporalChild.class})
+@ServiceRegistry(settings = @Setting(name = StateManagementSettings.TEMPORAL_TABLE_STRATEGY, value = "NATIVE"))
+@RequiresDialect(SQLServerDialect.class)
+class TemporalEntitySqlServerNativeTest {
+
+	public static final int PAUSE = 500;
+
+	@Test void test(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = new TemporalEntity();
+					entity.id = 1L;
+					entity.text = "hello";
+					session.persist( entity );
+					TemporalChild child = new TemporalChild();
+					child.id = 1L;
+					child.text = "world";
+					child.parent = entity;
+					session.persist( child );
+				}
+		);
+		Thread.sleep( PAUSE );
+		var instant = getInstant( scope );
+		Thread.sleep( PAUSE );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					entity.text = "goodbye";
+					entity.children.get(0).text = "world!";
+					TemporalChild friend = new TemporalChild();
+					friend.id = 5L;
+					friend.text = "friend";
+					session.persist( friend );
+					entity.children.get(0).friends.add( friend );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					assertEquals( 1, entity.children.get(0).friends.size() );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity =
+							session.createSelectionQuery( "from TemporalEntity where id=1", TemporalEntity.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity =
+							session.createSelectionQuery( "from TemporalEntity p left join fetch p.children c where p.id=1", TemporalEntity.class )
+									.getSingleResult();
+					assertTrue( Hibernate.isInitialized(entity.children) );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					var friends =
+							session.createSelectionQuery( "select f from TemporalEntity p join p.children c join c.friends f where p.id=1", TemporalChild.class )
+									.getResultCount();
+					assertEquals( 1, friends );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				assertEquals( 0, entity.children.get(0).friends.size() );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity =
+						session.createSelectionQuery( "from TemporalEntity where id=1", TemporalEntity.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity =
+						session.createSelectionQuery( "from TemporalEntity p left join fetch p.children c where p.id=1", TemporalEntity.class )
+								.getSingleResult();
+				assertTrue( Hibernate.isInitialized(entity.children) );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				var friends =
+						session.createSelectionQuery( "select f from TemporalEntity p join p.children c join c.friends f where p.id=1", TemporalChild.class )
+								.getResultCount();
+				assertEquals( 0, friends );
+			} );
+		}
+		Thread.sleep( PAUSE );
+		var nextInstant = getInstant( scope );
+		Thread.sleep( PAUSE );
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					entity.children.get(0).friends.clear();
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					assertEquals( 0, entity.children.get(0).friends.size() );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+						assertEquals( 0, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(nextInstant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+						assertEquals( 1, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					session.remove( entity.children.get(0) );
+					session.remove( entity );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity = session.find( TemporalEntity.class, 1L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	@Test void testStateless(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity entity = new TemporalEntity();
+					entity.id = 2L;
+					entity.text = "hello";
+					session.insert( entity );
+				}
+		);
+		Thread.sleep( PAUSE );
+		var instant = getInstant( scope );
+		Thread.sleep( PAUSE );
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+					entity.text = "goodbye";
+					session.update( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+					assertEquals( "goodbye", entity.text );
+					entity =
+							session.createSelectionQuery( "from TemporalEntity where id=2", TemporalEntity.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+				assertEquals( "hello", entity.text );
+				entity =
+						session.createSelectionQuery( "from TemporalEntity where id=2", TemporalEntity.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+					session.delete( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity entity = session.get( TemporalEntity.class, 2L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	private static Instant getInstant(SessionFactoryScope scope) {
+		return scope.getSessionFactory().fromSession(
+				s -> s.createSelectionQuery( "select instant", Instant.class ).getSingleResult() );
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalEntity")
+	static class TemporalEntity {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@OneToMany(mappedBy = "parent")
+		List<TemporalChild> children = new ArrayList<>();
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalChild")
+	static class TemporalChild {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@ManyToOne @JoinColumn
+		TemporalEntity parent;
+
+		@Temporal @ManyToMany
+		Set<TemporalChild> friends = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityTest.java b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityTest.java
new file mode 100644
index 000000000000..65cba5166b9c
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityTest.java
@@ -0,0 +1,444 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Version;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Temporal;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.dialect.MariaDBDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.VersionMatchMode;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses =
+		{TemporalEntityTest.TemporalEntity1.class,
+		TemporalEntityTest.TemporalChild1.class})
+@ServiceRegistry(settings = @Setting(name = StateManagementSettings.TEMPORAL_TABLE_STRATEGY, value = "SINGLE_TABLE"))
+@SkipForDialect(dialectClass = MariaDBDialect.class, majorVersion = 10, minorVersion = 11, versionMatchMode = VersionMatchMode.OLDER, reason = "See https://jira.mariadb.org/browse/MDEV-39230")
+class TemporalEntityTest {
+
+	@Test void test(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = new TemporalEntity1();
+					entity.id = 1L;
+					entity.text = "hello";
+					entity.strings.add( "x" );
+					entity.excluded = 1L;
+					session.persist( entity );
+					TemporalChild1 child = new TemporalChild1();
+					child.id = 1L;
+					child.text = "world";
+					child.parent = entity;
+					session.persist( child );
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					assertEquals( 1L, entity.excluded );
+					entity.excluded = 2L;
+				}
+		);
+		var instant = Instant.now();
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					assertEquals( 2L, entity.excluded );
+					entity.text = "goodbye";
+					entity.excluded = 5L;
+					entity.strings.add( "y" );
+					entity.children.get(0).text = "world!";
+					TemporalChild1 friend = new TemporalChild1();
+					friend.id = 5L;
+					friend.text = "friend";
+					session.persist( friend );
+					entity.children.get(0).friends.add( friend );
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 5L, entity.excluded );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					assertEquals( 2, entity.strings.size() );
+					assertEquals( 1, entity.children.get(0).friends.size() );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity =
+							session.createSelectionQuery( "from TemporalEntity1 where id=1", TemporalEntity1.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity =
+							session.createSelectionQuery( "from TemporalEntity1 p left join fetch p.children c where p.id=1", TemporalEntity1.class )
+									.getSingleResult();
+					assertTrue( Hibernate.isInitialized(entity.children) );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					var friends =
+							session.createSelectionQuery( "select f from TemporalEntity1 p join p.children c join c.friends f where p.id=1", TemporalChild1.class )
+									.getResultCount();
+					assertEquals( 1, friends );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+				assertEquals( "hello", entity.text );
+				assertEquals( 2L, entity.excluded );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				assertEquals( 1, entity.strings.size() );
+				assertEquals( 0, entity.children.get(0).friends.size() );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity =
+						session.createSelectionQuery( "from TemporalEntity1 where id=1", TemporalEntity1.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity =
+						session.createSelectionQuery( "from TemporalEntity1 p left join fetch p.children c where p.id=1", TemporalEntity1.class )
+								.getSingleResult();
+				assertTrue( Hibernate.isInitialized(entity.children) );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				var friends =
+						session.createSelectionQuery( "select f from TemporalEntity1 p join p.children c join c.friends f where p.id=1", TemporalChild1.class )
+								.getResultCount();
+				assertEquals( 0, friends );
+			} );
+		}
+		var nextInstant = Instant.now();
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					entity.strings.remove( "x" );
+					entity.strings.add( "z" );
+					entity.children.get(0).friends.clear();
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					assertEquals( Set.of("y", "z"), entity.strings );
+					assertEquals( 0, entity.children.get(0).friends.size() );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+						assertEquals( Set.of( "x" ), entity.strings );
+						assertEquals( 0, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		try (var session = scope.getSessionFactory().withOptions().asOf(nextInstant).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+						assertEquals( Set.of( "x", "y" ), entity.strings );
+						assertEquals( 1, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					session.remove( entity );
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	@Test void testStateless(SessionFactoryScope scope) throws InterruptedException {
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity1 entity = new TemporalEntity1();
+					entity.id = 2L;
+					entity.text = "hello";
+					session.insert( entity );
+				}
+		);
+		var instant = Instant.now();
+		awaitOracleClockTick();
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+					entity.text = "goodbye";
+					session.update( entity );
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+					assertEquals( "goodbye", entity.text );
+					entity =
+							session.createSelectionQuery( "from TemporalEntity1 where id=2", TemporalEntity1.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+				assertEquals( "hello", entity.text );
+				entity =
+						session.createSelectionQuery( "from TemporalEntity1 where id=2", TemporalEntity1.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+					session.delete( entity );
+				}
+		);
+		awaitOracleClockTick();
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().asOf(instant).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	@Test void testCollections(SessionFactoryScope scope) throws InterruptedException {
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = new TemporalEntity1();
+			entity.id = 3L;
+			entity.text = "hello";
+			entity.strings.add( "x" );
+			entity.strings.add( "y" );
+			entity.strings.add( "z" );
+			entity.map.put( "a", "A" );
+			entity.map.put( "b", "B" );
+			entity.list.add( "M" );
+			entity.list.add( "N" );
+			s.persist( entity );
+		} );
+		var instant = Instant.now();
+		awaitOracleClockTick();
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+			assertEquals( Set.of("x", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "b", "B"), entity.map );
+			assertEquals( List.of("M", "N"), entity.list );
+			entity.strings.add( "w" );
+			entity.map.put( "c", "C" );
+			entity.list.add( "K" );
+		} );
+		awaitOracleClockTick();
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+			assertEquals( Set.of("w", "x", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "b", "B", "c", "C"), entity.map );
+			assertEquals( List.of("M", "N", "K"), entity.list );
+			entity.strings.remove( "x" );
+			entity.map.remove( "b" );
+			entity.list.remove( "N" );
+			entity.list.add( 0, "P" );
+		} );
+		awaitOracleClockTick();
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+			assertEquals( Set.of("w", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "c", "C"), entity.map );
+			assertEquals( List.of("P", "M", "K"), entity.list );
+			entity.strings.remove( "z" );
+			entity.strings.add( "v" );
+			entity.map.put( "c", "CC" );
+			entity.map.put( "a", "AA" );
+			entity.list.set( 2, "L" );
+			entity.list.set( 0, "Q" );
+		} );
+		awaitOracleClockTick();
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+			assertEquals( Set.of("v", "w", "y"), entity.strings );
+			assertEquals( Map.of("a", "AA", "c", "CC"), entity.map );
+			assertEquals( List.of("Q", "M", "L"), entity.list );
+			entity.strings = null;
+			entity.map = null;
+			entity.list = null;
+		} );
+		awaitOracleClockTick();
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+			assertEquals( Set.of(), entity.strings );
+			assertEquals( Map.of(), entity.map );
+			assertEquals( List.of(), entity.list );
+			s.remove( entity );
+		} );
+		awaitOracleClockTick();
+		try (var s = scope.getSessionFactory().withOptions().asOf(instant).open()) {
+			s.inTransaction( tx -> {
+				TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+				assertEquals( Set.of("x", "y", "z"), entity.strings );
+				assertEquals( Map.of("a", "A", "b", "B"), entity.map );
+				assertEquals( List.of("M", "N"), entity.list );
+			} );
+		}
+	}
+
+	@Test void testUpsert(SessionFactoryScope scope) throws InterruptedException {
+		scope.inStatelessTransaction( s -> {
+			TemporalEntity1 entity = new TemporalEntity1();
+			entity.id = 7L;
+			entity.text = "hello";
+			entity.strings.add( "x" );
+			entity.strings.add( "y" );
+			entity.strings.add( "z" );
+			entity.map.put( "a", "A" );
+			entity.map.put( "b", "B" );
+			entity.list.add( "M" );
+			entity.list.add( "N" );
+			s.upsert( entity );
+		} );
+		awaitOracleClockTick();
+		TemporalEntity1 entity1 = scope.getSessionFactory().fromStatelessTransaction( s -> {
+			TemporalEntity1 entity = s.get( TemporalEntity1.class, 7L );
+			s.fetch( entity.strings );
+			s.fetch( entity.map );
+			s.fetch( entity.list );
+			assertEquals( "hello", entity.text );
+			assertEquals( Set.of( "x", "y", "z" ), entity.strings );
+			assertEquals( Map.of( "a", "A", "b", "B" ), entity.map );
+			assertEquals( List.of( "M", "N" ), entity.list );
+			return entity;
+		} );
+		entity1.text = "goodbye";
+		entity1.strings.add( "w" );
+		entity1.map.put( "c", "C" );
+		scope.inStatelessTransaction( s -> {
+			s.upsert( entity1 );
+		} );
+		awaitOracleClockTick();
+		scope.inStatelessTransaction( s -> {
+			TemporalEntity1 entity = s.get( TemporalEntity1.class, 7L );
+			s.fetch( entity.strings );
+			s.fetch( entity.map );
+			s.fetch( entity.list );
+			assertEquals( "goodbye", entity.text );
+			assertEquals( Set.of( "w", "x", "y", "z" ), entity.strings );
+			assertEquals( Map.of( "a", "A", "b", "B", "c", "C" ), entity.map );
+			assertEquals( List.of( "M", "N" ), entity.list );
+		} );
+	}
+
+	private static void awaitOracleClockTick() throws InterruptedException {
+		// Since the nanosecond resolution clock on the database might be slightly off compared to the JVM clock,
+		// wait some time after doing an insert/update to allow a following "as of period for system_time current_timestamp"
+		// query to actually see the changes
+		Thread.sleep( 100 );
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalEntity1")
+	static class TemporalEntity1 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@OneToMany(mappedBy = "parent")
+		List<TemporalChild1> children = new ArrayList<>();
+		@Temporal
+		@ElementCollection
+		Set<String> strings = new HashSet<>();
+		@Temporal
+		@ElementCollection
+		Map<String,String> map = new HashMap<>();
+		@Temporal
+		@ElementCollection
+		@OrderColumn
+		List<String> list = new ArrayList<>();
+		@Temporal.Excluded
+		long excluded;
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalChild1")
+	static class TemporalChild1 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@ManyToOne @JoinColumn
+		TemporalEntity1 parent;
+
+		@Temporal @ManyToMany
+		Set<TemporalChild1> friends = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityTxIdTest.java b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityTxIdTest.java
new file mode 100644
index 000000000000..bf8607fc2b91
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/temporal/TemporalEntityTxIdTest.java
@@ -0,0 +1,393 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.temporal;
+
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Version;
+import org.hibernate.Hibernate;
+import org.hibernate.SharedSessionContract;
+import org.hibernate.annotations.Temporal;
+import org.hibernate.cfg.StateManagementSettings;
+import org.hibernate.temporal.spi.TransactionIdentifierSupplier;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SessionFactory
+@DomainModel(annotatedClasses =
+		{TemporalEntityTxIdTest.TemporalEntity1.class,
+		TemporalEntityTxIdTest.TemporalChild1.class})
+@ServiceRegistry(settings = {@Setting(name = StateManagementSettings.TEMPORAL_TABLE_STRATEGY, value = "SINGLE_TABLE"),
+		@Setting(name = StateManagementSettings.TRANSACTION_ID_SUPPLIER,
+				value = "org.hibernate.temporal.TemporalEntityTxIdTest$TxIdSupplier")})
+class TemporalEntityTxIdTest {
+
+	private static int currentTxId;
+
+	public static class TxIdSupplier implements TransactionIdentifierSupplier<Integer> {
+		@Override
+		public Integer generateTransactionIdentifier(SharedSessionContract session) {
+			return ++currentTxId;
+		}
+	}
+
+	@Test void test(SessionFactoryScope scope) {
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = new TemporalEntity1();
+					entity.id = 1L;
+					entity.text = "hello";
+					entity.strings.add( "x" );
+					entity.excluded = 1L;
+					session.persist( entity );
+					TemporalChild1 child = new TemporalChild1();
+					child.id = 1L;
+					child.text = "world";
+					child.parent = entity;
+					session.persist( child );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					assertEquals( 1L, entity.excluded );
+					entity.excluded = 2L;
+				}
+		);
+
+		var txId = currentTxId;
+
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					assertEquals( 2L, entity.excluded );
+					entity.text = "goodbye";
+					entity.excluded = 5L;
+					entity.strings.add( "y" );
+					entity.children.get(0).text = "world!";
+					TemporalChild1 friend = new TemporalChild1();
+					friend.id = 5L;
+					friend.text = "friend";
+					session.persist( friend );
+					entity.children.get(0).friends.add( friend );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 5L, entity.excluded );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					assertEquals( 2, entity.strings.size() );
+					assertEquals( 1, entity.children.get(0).friends.size() );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity =
+							session.createSelectionQuery( "from TemporalEntity1 where id=1", TemporalEntity1.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity =
+							session.createSelectionQuery( "from TemporalEntity1 p left join fetch p.children c where p.id=1", TemporalEntity1.class )
+									.getSingleResult();
+					assertTrue( Hibernate.isInitialized(entity.children) );
+					assertEquals( "goodbye", entity.text );
+					assertEquals( 1, entity.children.size() );
+					assertEquals( "world!", entity.children.get(0).text );
+					var friends =
+							session.createSelectionQuery( "select f from TemporalEntity1 p join p.children c join c.friends f where p.id=1", TemporalChild1.class )
+									.getResultCount();
+					assertEquals( 1, friends );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().atTransaction(txId).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+				assertEquals( "hello", entity.text );
+				assertEquals( 2L, entity.excluded );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				assertEquals( 1, entity.strings.size() );
+				assertEquals( 0, entity.children.get(0).friends.size() );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().atTransaction(txId).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity =
+						session.createSelectionQuery( "from TemporalEntity1 where id=1", TemporalEntity1.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		try (var session = scope.getSessionFactory().withOptions().atTransaction(txId).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity =
+						session.createSelectionQuery( "from TemporalEntity1 p left join fetch p.children c where p.id=1", TemporalEntity1.class )
+								.getSingleResult();
+				assertTrue( Hibernate.isInitialized(entity.children) );
+				assertEquals( "hello", entity.text );
+				assertEquals( 1, entity.children.size() );
+				assertEquals( "world", entity.children.get(0).text );
+				var friends =
+						session.createSelectionQuery( "select f from TemporalEntity1 p join p.children c join c.friends f where p.id=1", TemporalChild1.class )
+								.getResultCount();
+				assertEquals( 0, friends );
+			} );
+		}
+
+		var nextTxId = currentTxId;
+
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					entity.strings.remove( "x" );
+					entity.strings.add( "z" );
+					entity.children.get(0).friends.clear();
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					assertEquals( Set.of("y", "z"), entity.strings );
+					assertEquals( 0, entity.children.get(0).friends.size() );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().atTransaction(txId).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+						assertEquals( Set.of( "x" ), entity.strings );
+						assertEquals( 0, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		try (var session = scope.getSessionFactory().withOptions().atTransaction(nextTxId).open()) {
+			scope.getSessionFactory().inTransaction(
+					tx -> {
+						TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+						assertEquals( Set.of( "x", "y" ), entity.strings );
+						assertEquals( 1, entity.children.get( 0 ).friends.size() );
+					}
+			);
+		}
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					session.remove( entity );
+				}
+		);
+		scope.getSessionFactory().inTransaction(
+				session -> {
+					TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withOptions().atTransaction(txId).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity = session.find( TemporalEntity1.class, 1L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	@Test void testStateless(SessionFactoryScope scope) {
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity1 entity = new TemporalEntity1();
+					entity.id = 2L;
+					entity.text = "hello";
+					session.insert( entity );
+				}
+		);
+
+		var txId = currentTxId;
+
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+					entity.text = "goodbye";
+					session.update( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+					assertEquals( "goodbye", entity.text );
+					entity =
+							session.createSelectionQuery( "from TemporalEntity1 where id=2", TemporalEntity1.class )
+									.getSingleResult();
+					assertEquals( "goodbye", entity.text );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().atTransaction(txId).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+				assertEquals( "hello", entity.text );
+				entity =
+						session.createSelectionQuery( "from TemporalEntity1 where id=2", TemporalEntity1.class )
+								.getSingleResult();
+				assertEquals( "hello", entity.text );
+			} );
+		}
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+					session.delete( entity );
+				}
+		);
+		scope.getSessionFactory().inStatelessTransaction(
+				session -> {
+					TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+					assertNull( entity );
+				}
+		);
+		try (var session = scope.getSessionFactory().withStatelessOptions().atTransaction(txId).open()) {
+			session.inTransaction( tx -> {
+				TemporalEntity1 entity = session.get( TemporalEntity1.class, 2L );
+				assertEquals( "hello", entity.text );
+			} );
+		}
+	}
+
+	@Test void testCollections(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = new TemporalEntity1();
+			entity.id = 3L;
+			entity.text = "hello";
+			entity.strings.add( "x" );
+			entity.strings.add( "y" );
+			entity.strings.add( "z" );
+			entity.map.put( "a", "A" );
+			entity.map.put( "b", "B" );
+			entity.list.add( "M" );
+			entity.list.add( "N" );
+			s.persist( entity );
+		} );
+
+		var txId = currentTxId;
+
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+			assertEquals( Set.of("x", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "b", "B"), entity.map );
+			assertEquals( List.of("M", "N"), entity.list );
+			entity.strings.add( "w" );
+			entity.map.put( "c", "C" );
+			entity.list.add( "K" );
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+			assertEquals( Set.of("w", "x", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "b", "B", "c", "C"), entity.map );
+			assertEquals( List.of("M", "N", "K"), entity.list );
+			entity.strings.remove( "x" );
+			entity.map.remove( "b" );
+			entity.list.remove( "N" );
+			entity.list.add( 0, "P" );
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+			assertEquals( Set.of("w", "y", "z"), entity.strings );
+			assertEquals( Map.of("a", "A", "c", "C"), entity.map );
+			assertEquals( List.of("P", "M", "K"), entity.list );
+			entity.strings.remove( "z" );
+			entity.strings.add( "v" );
+			entity.map.put( "c", "CC" );
+			entity.map.put( "a", "AA" );
+			entity.list.set( 2, "L" );
+			entity.list.set( 0, "Q" );
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+			assertEquals( Set.of("v", "w", "y"), entity.strings );
+			assertEquals( Map.of("a", "AA", "c", "CC"), entity.map );
+			assertEquals( List.of("Q", "M", "L"), entity.list );
+			entity.strings = null;
+			entity.map = null;
+			entity.list = null;
+		} );
+		scope.inTransaction( s -> {
+			TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+			assertEquals( Set.of(), entity.strings );
+			assertEquals( Map.of(), entity.map );
+			assertEquals( List.of(), entity.list );
+			s.remove( entity );
+		} );
+		try (var s = scope.getSessionFactory().withOptions().atTransaction(txId).open()) {
+			s.inTransaction( tx -> {
+				TemporalEntity1 entity = s.find(TemporalEntity1.class, 3L);
+				assertEquals( Set.of("x", "y", "z"), entity.strings );
+				assertEquals( Map.of("a", "A", "b", "B"), entity.map );
+				assertEquals( List.of("M", "N"), entity.list );
+			} );
+		}
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalEntity1")
+	static class TemporalEntity1 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@OneToMany(mappedBy = "parent")
+		List<TemporalChild1> children = new ArrayList<>();
+		@Temporal
+		@ElementCollection
+		Set<String> strings = new HashSet<>();
+		@Temporal
+		@ElementCollection
+		Map<String,String> map = new HashMap<>();
+		@Temporal
+		@ElementCollection
+		@OrderColumn
+		List<String> list = new ArrayList<>();
+		@Temporal.Excluded
+		long excluded;
+	}
+
+	@Temporal(rowStart = "effective_from", rowEnd = "effective_to")
+	@Entity(name = "TemporalChild1")
+	static class TemporalChild1 {
+		@Id
+		long id;
+		@Version
+		int version;
+		String text;
+		@ManyToOne @JoinColumn
+		TemporalEntity1 parent;
+
+		@Temporal @ManyToMany
+		Set<TemporalChild1> friends = new HashSet<>();
+	}
+}
diff --git a/hibernate-core/src/test/resources/hibernate.properties b/hibernate-core/src/test/resources/hibernate.properties
index 5c1c93c51c58..c4d0f3eeebd3 100644
--- a/hibernate-core/src/test/resources/hibernate.properties
+++ b/hibernate-core/src/test/resources/hibernate.properties
@@ -30,3 +30,7 @@ hibernate.session.events.log=true
 hibernate.query.mutation_strategy.global_temporary.drop_tables=true
 
 #hibernate.transform_hbm_xml.enabled=true
+
+# This flag is indented for testing. This option should not be enabled in production
+hibernate.dialect.spanner.use_integer_for_primary_key=true
+hibernate.dialect.spanner.use_emulator=true
diff --git a/hibernate-core/src/test/resources/log4j2.properties b/hibernate-core/src/test/resources/log4j2.properties
index 0960534771ea..84010a786b11 100644
--- a/hibernate-core/src/test/resources/log4j2.properties
+++ b/hibernate-core/src/test/resources/log4j2.properties
@@ -137,7 +137,8 @@ logger.stat.level=trace
 ###############################################################################
 ## Log a list of functions registered by the Dialect
 
-org.hibernate.HQL_FUNCTIONS=info
+logger.hql-functions.name=org.hibernate.HQL_FUNCTIONS
+logger.hql-functions.level=info
 
 ###############################################################################
 ## Hibernate's JUnit extensions (hibernate-testing)
diff --git a/hibernate-core/src/test/resources/mappings/models/attr/many-to-any/simple.xml b/hibernate-core/src/test/resources/mappings/models/attr/many-to-any/simple.xml
new file mode 100644
index 000000000000..d09e1e72943c
--- /dev/null
+++ b/hibernate-core/src/test/resources/mappings/models/attr/many-to-any/simple.xml
@@ -0,0 +1,35 @@
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 version="7.0">
+    <package>org.hibernate.orm.test.boot.models.xml.attr</package>
+
+    <entity class="ManyToAnyTests$Entity3" metadata-complete="true" access="FIELD">
+        <attributes>
+            <id name="id"/>
+            <basic name="name"/>
+            <many-to-any name="associations">
+                <discriminator>
+                    <type>INTEGER</type>
+                    <column name="association_type"/>
+                    <mapping value="1">ManyToAnyTests$Entity1</mapping>
+                    <mapping value="2">ManyToAnyTests$Entity2</mapping>
+                </discriminator>
+                <key>
+                    <type>integer</type>
+                    <column name="association_fk"/>
+                </key>
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+                <join-table name="entity3_associations">
+                    <join-column name="entity3_fk"/>
+                    <inverse-join-column name="association_fk"/>
+                </join-table>
+            </many-to-any>
+        </attributes>
+    </entity>
+</entity-mappings>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/cid/Account.hbm.xml b/hibernate-core/src/test/resources/mappings/natural-id/composite/Account.hbm.xml
similarity index 94%
rename from hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/cid/Account.hbm.xml
rename to hibernate-core/src/test/resources/mappings/natural-id/composite/Account.hbm.xml
index f629b1b3c0c8..39819682a3f7 100644
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/cid/Account.hbm.xml
+++ b/hibernate-core/src/test/resources/mappings/natural-id/composite/Account.hbm.xml
@@ -5,7 +5,7 @@
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.hibernate.orm.test.mapping.naturalid.cid" default-access="field">
+<hibernate-mapping package="org.hibernate.orm.test.mapping.naturalid.composite" default-access="field">
   <class name="Account" table="accounts" >
      <composite-id name="accountId">
         <key-property name="id"/>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/immutable/ParentChildWithManyToOne.hbm.xml b/hibernate-core/src/test/resources/mappings/natural-id/immutable/ParentChildWithManyToOne.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/immutable/ParentChildWithManyToOne.hbm.xml
rename to hibernate-core/src/test/resources/mappings/natural-id/immutable/ParentChildWithManyToOne.hbm.xml
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/immutable/User.hbm.xml b/hibernate-core/src/test/resources/mappings/natural-id/immutable/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/immutable/User.hbm.xml
rename to hibernate-core/src/test/resources/mappings/natural-id/immutable/User.hbm.xml
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/mutable/User.hbm.xml b/hibernate-core/src/test/resources/mappings/natural-id/mutable/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/mutable/User.hbm.xml
rename to hibernate-core/src/test/resources/mappings/natural-id/mutable/User.hbm.xml
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/nullable/User.hbm.xml b/hibernate-core/src/test/resources/mappings/natural-id/nullable/User.hbm.xml
similarity index 100%
rename from hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/naturalid/nullable/User.hbm.xml
rename to hibernate-core/src/test/resources/mappings/natural-id/nullable/User.hbm.xml
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/generated/ormXml/orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/generated/ormXml/orm.xml
new file mode 100644
index 000000000000..6b91fa2599d9
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/annotations/generated/ormXml/orm.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 version="7.0">
+
+    <entity name="tractor" class="org.hibernate.orm.test.annotations.various.Tractor" access="FIELD" metadata-complete="true">
+        <attributes>
+            <id name="id" />
+            <basic name="model"/>
+            <basic name="serialNumber">
+                <generated>ALWAYS</generated>
+            </basic>
+        </attributes>
+    </entity>
+</entity-mappings>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Customer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Customer.hbm.xml
deleted file mode 100644
index 19d52b72fd58..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Customer.hbm.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<!--
-
-  This mapping demonstrates how to map a collection
-  <key> to one of the primary key columns of an
-  associated child class with a composite key. This
-  is very useful for legacy data!
-     
--->
-
-<hibernate-mapping package="org.hibernate.orm.test.cid">
-
-    <class name="Customer">
-    
-    	<id name="customerId"
-    		length="10">
-    		<generator class="assigned"/>
-    	</id>
-
-    	<property name="name" not-null="true" length="100"/>
-    	<property name="address" not-null="true" length="200"/>
-
-    	<list name="orders"
-    		inverse="true"
-    		cascade="persist, merge">
-    		<key column="customerId"/>
-    		<index column="orderNumber"/>
-    		<one-to-many class="Order"/>
-    	</list>
-
-	</class>
-
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Customer.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Customer.orm.xml
new file mode 100644
index 000000000000..08668d811156
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Customer.orm.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+		<!--
+          ~ SPDX-License-Identifier: Apache-2.0
+          ~ Copyright Red Hat Inc. and Hibernate Authors
+          -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0" >
+	<package>org.hibernate.orm.test.cid</package>
+
+	<!--
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+
+-->
+	<entity class="Customer">
+		<table name="Customer"/>
+		<attributes>
+			<id name="customerId">
+				<column length="10"/>
+				<generated-value generator="assigned"/>
+			</id>
+			<basic name="name">
+				<column nullable="false" length="100"/>
+			</basic>
+			<basic name="address">
+				<column nullable="false" length="200"/>
+			</basic>
+			<one-to-many name="orders" target-entity="Order" mapped-by="customer">
+				<order-column name="orderNumber"/>
+				<cascade>
+					<cascade-persist/>
+					<cascade-merge/>
+				</cascade>
+			</one-to-many>
+		</attributes>
+	</entity>
+</entity-mappings>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/LineItem.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/LineItem.hbm.xml
deleted file mode 100644
index eee46a2e491a..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/LineItem.hbm.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<!--
-
-  This mapping demonstrates 
-  
-     (1) composite keys and many-to-one associations on 
-         composite keys
-      
-     (2) use of insert="false" update="false" on an
-         association mapping, when the foreign key is
-         also part of the primary key
-     
--->
-
-<hibernate-mapping package="org.hibernate.orm.test.cid">
-
-    <class name="LineItem">
-    	
-    	<composite-id name="id" 
-    		class="LineItem$Id">
-    		<key-property name="customerId" length="10"/>
-    		<key-property name="orderNumber"/>
-    		<key-property name="productId" length="10"/>
-    	</composite-id>
-    	
-    	<property name="quantity"/>
-    	
-    	<many-to-one name="order"
-    		insert="false"
-			update="false" 
-			not-null="true">
-			<column name="customerId"/>
-			<column name="orderNumber"/>
-		</many-to-one>
-    	
-    	<many-to-one name="product"
-    		insert="false"
-			update="false" 
-			not-null="true"
-			column="productId"/>
-			
-    </class>
- 	
-
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/LineItem.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/LineItem.orm.xml
new file mode 100644
index 000000000000..c2f6e36e8760
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/LineItem.orm.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0" >
+	<package>org.hibernate.orm.test.cid</package>
+	<!--
+
+  This mapping demonstrates
+
+     (1) composite keys and many-to-one associations on
+         composite keys
+
+     (2) use of insert="false" update="false" on an
+         association mapping, when the foreign key is
+         also part of the primary key
+
+-->
+
+	<entity class="LineItem">
+		<attributes>
+			<embedded-id name="id" />
+
+			<basic name="quantity"/>
+			<many-to-one name="order" target-entity="Order" fetch="LAZY">
+				<join-column name="customerId" insertable="false" updatable="false" nullable="false"/>
+				<join-column name="orderNumber" insertable="false" updatable="false" nullable="false"/>
+			</many-to-one>
+			<many-to-one name="product" target-entity="Product" fetch="LAZY">
+				<join-column name="productId" insertable="false" updatable="false" nullable="false"/>
+			</many-to-one>
+		</attributes>
+	</entity>
+
+	<embeddable class="LineItem$Id">
+		<attributes>
+			<basic name="customerId">
+				<column length="10"/>
+			</basic>
+			<basic name="orderNumber"/>
+			<basic name="productId">
+				<column length="10"/>
+			</basic>
+		</attributes>
+	</embeddable>
+</entity-mappings>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Order.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Order.hbm.xml
deleted file mode 100644
index 4e982bec6ea2..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Order.hbm.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.orm.test.cid">
-
-<!-- 
-
-  This mapping demonstrates 
-  
-     (1) composite keys and one-to-many associations on 
-         composite keys
-      
-     (2) use of insert="false" update="false" on an
-         association mapping, when the foreign key is
-         also part of the primary key
-         
-     (3) use of a derived property which performs a
-         subselect against associated tables
-         
-     (4) use of <synchronize/> to ensure that auto-flush
-         works correctly for an entity with a property
-         derived from other tables
-         
-     
--->
-
-    <class name="Order" table="CustomerOrder">
-    	<synchronize table="LineItem"/>
-    	<synchronize table="Product"/>
-    	
-    	<composite-id name="id" 
-    		class="Order$Id">
-    		<key-property name="customerId" length="10"/>
-    		<key-property name="orderNumber"/>
-    	</composite-id>
-    	
-    	<property name="orderDate" 
-    		type="calendar_date"
-    		not-null="true"/>
-    	
-    	<property name="total" 
-    		formula="( select sum(li.quantity*p.cost) from LineItem li, Product p where li.productId = p.productId and li.customerId = customerId and li.orderNumber = orderNumber )"/>
-    	
-    	<many-to-one name="customer"
-    		column="customerId"
-    		insert="false"
-			update="false" 
-			not-null="true"/>
-			
-    	<bag name="lineItems"
-    		fetch="join" 
-    		lazy="false"
-    		inverse="true"
-    		cascade="persist, merge">
-    		<key>
-    			<column name="customerId"/>
-    			<column name="orderNumber"/>
-    		</key>
-    		<one-to-many class="LineItem"/>
-    	</bag>
-    	
-    </class>
- 	
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Order.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Order.orm.xml
new file mode 100644
index 000000000000..94c140a1275e
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Order.orm.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0" >
+	<package>org.hibernate.orm.test.cid</package>
+	<!--
+
+  This mapping demonstrates
+
+     (1) composite keys and one-to-many associations on
+         composite keys
+
+     (2) use of insert="false" update="false" on an
+         association mapping, when the foreign key is
+         also part of the primary key
+
+     (3) use of a derived property which performs a
+         subselect against associated tables
+
+     (4) use of <synchronize/> to ensure that auto-flush
+         works correctly for an entity with a property
+         derived from other tables
+
+
+-->
+
+	<entity class="Order">
+		<table name="CustomerOrder"/>
+		<synchronize table="LineItem"/>
+		<synchronize table="Product"/>
+		<attributes>
+			<embedded-id name="id" />
+			<basic name="orderDate" >
+				<column nullable="false" />
+				<temporal>DATE</temporal>
+			</basic>
+			<basic name="total">
+				<formula>( select sum(li.quantity*p.cost) from LineItem li, Product p where li.productId = p.productId and li.customerId = customerId and li.orderNumber = orderNumber )</formula>
+			</basic>
+			<many-to-one name="customer" target-entity="Customer" fetch="LAZY">
+				<join-column name="customerId" insertable="false" updatable="false" nullable="false" />
+			</many-to-one>
+			<one-to-many name="lineItems" target-entity="LineItem" mapped-by="order" fetch="EAGER" fetch-mode="JOIN" >
+				<cascade>
+					<cascade-persist/>
+					<cascade-merge/>
+				</cascade>
+			</one-to-many>
+		</attributes>
+	</entity>
+
+	<embeddable class="Order$Id">
+		<attributes>
+			<basic name="customerId">
+				<column length="10"/>
+			</basic>
+			<basic name="orderNumber"/>
+		</attributes>
+	</embeddable>
+</entity-mappings>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Product.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Product.hbm.xml
deleted file mode 100644
index bfae7253254f..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Product.hbm.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.orm.test.cid">
-
-<!-- 
-
-  This mapping demonstrates 
-
-     (1) use of a derived property which performs a
-         subselect against an associated table
-         
-     (2) use of <synchronize/> to ensure that auto-flush
-         works correctly for an entity with a property
-         derived from another table
-         
-     
--->
-
-    <class name="Product">
-    	<synchronize table="LineItem"/>
-    
-    	<id name="productId"
-    		length="10">
-    		<generator class="assigned"/>
-    	</id>
-    	
-    	<property name="description" 
-    		not-null="true" 
-    		length="200"/>
-    	<property name="price" length="3" column="cost"/>
-    	<property name="numberAvailable"/>
-    	
-    	<property name="numberOrdered"
-    		formula="( select sum(li.quantity) from LineItem li where li.productId = productId )"/>
-	</class>
-
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Product.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Product.orm.xml
new file mode 100644
index 000000000000..db939ca48815
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cid/Product.orm.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0" >
+	<package>org.hibernate.orm.test.cid</package>
+	<!--
+
+  This mapping demonstrates
+
+     (1) use of a derived property which performs a
+         subselect against an associated table
+
+     (2) use of <synchronize/> to ensure that auto-flush
+         works correctly for an entity with a property
+         derived from another table
+
+
+-->
+	<entity class="Product">
+		<synchronize table="LineItem"/>
+		<attributes>
+			<id name="productId">
+				<column length="10"/>
+				<generated-value generator="assigned"/>
+			</id>
+			<basic name="description">
+				<column nullable="false" length="200"/>
+			</basic>
+			<basic name="price">
+				<column name="cost" length="3"/>
+			</basic>
+			<basic name="numberAvailable"/>
+			<basic name="numberOrdered">
+				<formula>( select sum(li.quantity) from LineItem li where li.productId = productId )</formula>
+			</basic>
+		</attributes>
+	</entity>
+</entity-mappings>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/join/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/join/Person.hbm.xml
index 8d094693fc91..94994bde1179 100644
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/join/Person.hbm.xml
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/join/Person.hbm.xml
@@ -47,7 +47,7 @@
 				write="? * 2.54E0"/>
 		</property>        
 
-        <join table="address">
+        <join table="person_address">
             <key column="address_id"/>
             <property name="address"/>
             <property name="zip"/>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/joincolumn-processing.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/joincolumn-processing.xml
new file mode 100644
index 000000000000..b088b0327341
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/joincolumn-processing.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
+                 version="2.0">
+    <entity class="org.hibernate.orm.test.boot.models.xml.override.JoinColumnProcessingTests$Person"/>
+    <entity class="org.hibernate.orm.test.boot.models.xml.override.JoinColumnProcessingTests$Post"/>
+</entity-mappings>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/legacy/Custom.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/legacy/Custom.hbm.xml
deleted file mode 100644
index 235473abc802..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/legacy/Custom.hbm.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping default-lazy="false">
-
-    <class name="org.hibernate.orm.test.legacy.Custom" persister="org.hibernate.orm.test.legacy.CustomPersister">
-        <id type="string" name="id" column="id_" length="64" unsaved-value="null" access="field">
-            <generator class="uuid.hex"/>
-        </id>
-
-        <property name="name"/>
-    </class>
-
-</hibernate-mapping>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/quote/DataPoint.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/quote/DataPoint.hbm.xml
index 393a55b0afa0..a62e3607ddd7 100644
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/quote/DataPoint.hbm.xml
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/quote/DataPoint.hbm.xml
@@ -45,11 +45,11 @@
 			<generator class="native" />
 		</id>
 		
-		<many-to-one name="manyToOne" column="o2mid" class="DataPoint"/>
+		<many-to-one name="manyToOne" column="o2mid" class="AssociatedDataPoint"/>
         
         <set name="manyToMany" table="m2mjointable" inverse="true">
             <key/>
-            <many-to-many class="DataPoint"/>
+            <many-to-many class="AssociatedDataPoint"/>
         </set>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/hibernate-envers/hibernate-envers.gradle b/hibernate-envers/hibernate-envers.gradle
index 368ec3a61b62..60c6d2801cc3 100644
--- a/hibernate-envers/hibernate-envers.gradle
+++ b/hibernate-envers/hibernate-envers.gradle
@@ -54,15 +54,16 @@ configurations {
     }
 }
 
-tasks.withType( Test.class ).each { test ->
+tasks.withType( Test.class ).configureEach { test ->
     // see GradleParallelTestingResolver for how the test worker id is resolved in JDBC configs
     if ( project.db == "h2" || project.db == "hsqldb" || project.db == "pgsql_ci" || project.db == "edb_ci"
             || project.db == "oracle_ci" || project.db == "oracle_xe_ci" || project.db == "mysql_ci" || project.db == "mariadb_ci"
-            || project.db == "db2_ci" || project.db == "mssql_ci" || project.db == "cockroachdb" ) {
+            || project.db == "db2_ci" || project.db == "mssql_ci" || project.db == "cockroachdb" || project.db == "hana_ci"
+            || project.db == "tidb" ) {
         // Most systems have multi-threading and maxing out a core on both threads will hurt performance
         // Also, as soon as we hit 16+ threads, the returns are diminishing, so divide by 4
         def threadCount = Runtime.runtime.availableProcessors()
-        def testThreads = project.getProperties().get( "test.threads" )
+        def testThreads = project.findProperty( "test.threads" )
         if ( testThreads == null ) {
             testThreads = threadCount >= 16 ? threadCount.intdiv( 4 ) : (threadCount.intdiv( 2 ) ?: 1)
         }
@@ -74,9 +75,31 @@ tasks.withType( Test.class ).each { test ->
     }
     else if ( project.db == "oracle_test_pilot_database" ) {
         // Since Oracle TestPilot databases run on separate machines, use all threads for testing
+        test.maxParallelForks = Runtime.runtime.availableProcessors() * 2
+        test.systemProperty 'maxParallelForks', test.maxParallelForks
+    }
+    else if ( project.db == "hana_cloud" ) {
+        // Since HANA Cloud databases run on separate machines, use all threads for testing
         test.maxParallelForks = Runtime.runtime.availableProcessors()
         test.systemProperty 'maxParallelForks', test.maxParallelForks
     }
+    else if ( project.db == "spannerpgsql" || project.db == "spanner" ) {
+        def threadCount = Runtime.runtime.availableProcessors()
+        def testThreads = project.findProperty( "test.threads" )
+        if ( testThreads == null ) {
+            def dbCount = threadCount.intdiv( 2 ) ?: 1
+            if ( dbCount > 8 ) {
+                testThreads = 4
+            } else {
+                testThreads = dbCount.intdiv( 2 ) ?: 1
+            }
+        }
+        else {
+            testThreads = Integer.parseInt( testThreads.toString() )
+        }
+        test.maxParallelForks = Math.min( testThreads, 4 )
+        test.systemProperty 'maxParallelForks', test.maxParallelForks
+    }
 }
 
 sourcesJar {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java
index ad37e71bce18..2abaf628a8d5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/EnversBootLogger.java
@@ -14,6 +14,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.INFO;
 
@@ -33,7 +34,8 @@ public interface EnversBootLogger extends BasicLogger {
 	EnversBootLogger BOOT_LOGGER = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			EnversBootLogger.class,
-			LOGGER_NAME
+			LOGGER_NAME,
+			Locale.ROOT
 	);
 
 	boolean TRACE_ENABLED = BOOT_LOGGER.isTraceEnabled();
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java
index ac25e10e24ed..5f85da14c12f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java
@@ -12,6 +12,7 @@
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.envers.boot.spi.EnversMetadataBuildingContext;
 import org.hibernate.envers.configuration.Configuration;
+import org.hibernate.envers.configuration.internal.ClassesAuditingData;
 import org.hibernate.envers.configuration.internal.MappingCollector;
 import org.hibernate.envers.configuration.internal.metadata.AuditEntityConfigurationRegistry;
 import org.hibernate.envers.configuration.internal.metadata.AuditEntityNameRegister;
@@ -33,6 +34,7 @@ public class EnversMetadataBuildingContextImpl implements EnversMetadataBuilding
 	private final ObjectNameNormalizer objectNameNormalizer;
 	private final AuditEntityNameRegister auditEntityNameRegistry;
 	private final AuditEntityConfigurationRegistry auditEntityConfigurationRegistry;
+	private final ClassesAuditingData classesAuditingData;
 
 	public EnversMetadataBuildingContextImpl(
 			Configuration configuration,
@@ -45,6 +47,7 @@ public EnversMetadataBuildingContextImpl(
 		this.mappingCollector = mappingCollector;
 		this.auditEntityNameRegistry = new AuditEntityNameRegister();
 		this.auditEntityConfigurationRegistry = new AuditEntityConfigurationRegistry();
+		this.classesAuditingData = new ClassesAuditingData();
 
 		this.objectNameNormalizer = new ObjectNameNormalizer(this);
 	}
@@ -118,4 +121,9 @@ public AuditEntityNameRegister getAuditEntityNameRegistry() {
 	public AuditEntityConfigurationRegistry getAuditEntityConfigurationRegistry() {
 		return auditEntityConfigurationRegistry;
 	}
+
+	@Override
+	public ClassesAuditingData getClassesAuditingData() {
+		return classesAuditingData;
+	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/RootPersistentEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/RootPersistentEntity.java
index 321299c9f071..86266cd2f6e4 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/RootPersistentEntity.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/model/RootPersistentEntity.java
@@ -161,7 +161,12 @@ else if (id instanceof JaxbHbmCompositeIdType) {
 		}
 
 		if ( discriminator != null ) {
-			entity.setDiscriminator( discriminator.build() );
+			var value = discriminator.build();
+			if (getPersistentClass() != null) {
+				value.setInsert( getPersistentClass().isDiscriminatorInsertable() );
+				value.setForce( getPersistentClass().isForceDiscriminator() );
+			}
+			entity.setDiscriminator( value );
 		}
 
 		if ( !StringTools.isEmpty( discriminatorValue ) ) {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java
index 77f2b776860a..201f5619785d 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java
@@ -6,6 +6,7 @@
 
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.envers.configuration.Configuration;
+import org.hibernate.envers.configuration.internal.ClassesAuditingData;
 import org.hibernate.envers.configuration.internal.MappingCollector;
 import org.hibernate.envers.configuration.internal.metadata.AuditEntityConfigurationRegistry;
 import org.hibernate.envers.configuration.internal.metadata.AuditEntityNameRegister;
@@ -32,4 +33,6 @@ public interface EnversMetadataBuildingContext extends MetadataBuildingContext {
 	AuditEntityNameRegister getAuditEntityNameRegistry();
 
 	AuditEntityConfigurationRegistry getAuditEntityConfigurationRegistry();
+
+	ClassesAuditingData getClassesAuditingData();
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java
index 0d8a057b2d27..dd7ccfd2befb 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java
@@ -38,7 +38,8 @@ public class ClassesAuditingData {
 	private static final EnversMessageLogger LOG = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			EnversMessageLogger.class,
-			ClassesAuditingData.class.getName()
+			ClassesAuditingData.class.getName(),
+			Locale.ROOT
 	);
 
 	private final Map<String, ClassAuditingData> entityNameToAuditingData = new HashMap<>();
@@ -61,6 +62,10 @@ public Collection<ClassAuditingData> getAllClassAuditedData() {
 		return persistentClassToAuditingData.values();
 	}
 
+	public ClassAuditingData getClassAuditingData(String entityName) {
+		return entityNameToAuditingData.get( entityName );
+	}
+
 	/**
 	 * After all meta-data is read, updates calculated fields. This includes:
 	 * <ul>
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java
index de7a713eb3ee..fb92871652be 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java
@@ -38,7 +38,7 @@ public EntitiesConfigurations configure(EnversMetadataBuildingContext metadataBu
 		final Iterator<PersistentClass> classes = GraphTopologicalSort.sort( new PersistentClassGraphDefiner( metadata ) )
 				.iterator();
 
-		final ClassesAuditingData classesAuditingData = new ClassesAuditingData();
+		final ClassesAuditingData classesAuditingData = metadataBuildingContext.getClassesAuditingData();
 
 		// Reading metadata from annotations
 		final AnnotationsMetadataReader reader = new AnnotationsMetadataReader( metadataBuildingContext );
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractMetadataGenerator.java
index 6d933834aa60..8f0b40b76f5c 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AbstractMetadataGenerator.java
@@ -193,7 +193,7 @@ protected void throwUnsupportedTypeException(Type type, String entityName, Strin
 		);
 	}
 
-	private boolean isRelationNotAudited(PropertyAuditingData propertyAuditingData) {
+	protected boolean isRelationNotAudited(PropertyAuditingData propertyAuditingData) {
 		return RelationTargetAuditMode.NOT_AUDITED.equals( propertyAuditingData.getRelationTargetAuditMode() );
 	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java
index 01b9ad30af9d..6f1b1a5d8dda 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java
@@ -52,7 +52,8 @@ public final class AuditMetadataGenerator extends AbstractMetadataGenerator {
 	private static final EnversMessageLogger LOG = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			EnversMessageLogger.class,
-			AuditMetadataGenerator.class.getName()
+			AuditMetadataGenerator.class.getName(),
+			Locale.ROOT
 	);
 
 	private final EnversMetadataBuildingContext metadataBuildingContext;
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java
index 20eb74a6df16..360b0ee105c2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMappedByResolver.java
@@ -4,26 +4,27 @@
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
-import java.lang.invoke.MethodHandles;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-
 import org.hibernate.envers.boot.EnversMappingException;
+import org.hibernate.envers.boot.spi.EnversMetadataBuildingContext;
+import org.hibernate.envers.configuration.internal.metadata.reader.AuditedPropertiesHolder;
+import org.hibernate.envers.configuration.internal.metadata.reader.ClassAuditingData;
+import org.hibernate.envers.configuration.internal.metadata.reader.ComponentAuditingData;
 import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData;
 import org.hibernate.envers.internal.EnversMessageLogger;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.KeyValue;
-import org.hibernate.mapping.ManyToOne;
-import org.hibernate.mapping.OneToMany;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.Table;
-
 import org.jboss.logging.Logger;
 
+import java.lang.invoke.MethodHandles;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
 /**
  * Helper class that provides a way to resolve the {@code mappedBy} attribute for collections.
  *
@@ -34,21 +35,43 @@ public class CollectionMappedByResolver {
 	private static final EnversMessageLogger LOG = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			EnversMessageLogger.class,
-			CollectionMappedByResolver.class.getName()
+			CollectionMappedByResolver.class.getName(),
+			Locale.ROOT
 	);
 
-	public static String resolveMappedBy(Collection collection, PropertyAuditingData propertyAuditingData) {
-		final PersistentClass referencedClass = getReferenceCollectionClass( collection );
+	public static String resolveMappedBy(
+			String entityName,
+			Collection collection,
+			PropertyAuditingData propertyAuditingData,
+			String referencedEntityName,
+			EnversMetadataBuildingContext buildingContext) {
+		final var referencedClass = getReferencedClass( referencedEntityName, buildingContext );
 		final ResolverContext resolverContext = new ResolverContext( collection, propertyAuditingData );
-		return getMappedBy( referencedClass, resolverContext );
+		return getMappedBy( entityName, referencedClass, resolverContext, buildingContext );
 	}
 
-	public static String resolveMappedBy(Table collectionTable, PersistentClass referencedClass, PropertyAuditingData propertyAuditingData) {
-		return getMappedBy( referencedClass, new ResolverContext( collectionTable, propertyAuditingData ) );
+	public static String resolveMappedBy(
+			String entityName,
+			Table collectionTable,
+			PropertyAuditingData propertyAuditingData,
+			String referencedEntityName,
+			EnversMetadataBuildingContext buildingContext) {
+		final var referencedClass = getReferencedClass( referencedEntityName, buildingContext );
+		return getMappedBy(
+				entityName,
+				referencedClass,
+				new ResolverContext( collectionTable, propertyAuditingData ),
+				buildingContext
+		);
 	}
 
-	public static boolean isMappedByKey(Collection collection, String mappedBy) {
-		final PersistentClass referencedClass = getReferenceCollectionClass( collection );
+	public static boolean isMappedByKey(
+			Collection collection,
+			String mappedBy,
+			String referencedEntityName,
+			EnversMetadataBuildingContext buildingContext) {
+		final PersistentClass referencedClass = getReferencedClass( referencedEntityName,
+				buildingContext ).getPersistentClass();
 		if ( referencedClass != null ) {
 			final String keyMappedBy = searchMappedByKey( referencedClass, collection );
 			return mappedBy.equals( keyMappedBy );
@@ -56,7 +79,11 @@ public static boolean isMappedByKey(Collection collection, String mappedBy) {
 		return false;
 	}
 
-	private static String getMappedBy(PersistentClass referencedClass, ResolverContext resolverContext) {
+	private static String getMappedBy(
+			String entityName,
+			ClassAuditingData referencedClass,
+			ResolverContext resolverContext,
+			EnversMetadataBuildingContext buildingContext) {
 		// If there's an @AuditMappedBy specified, returning it directly.
 		final String auditMappedBy = resolverContext.propertyAuditingData.getAuditMappedBy();
 		if ( auditMappedBy != null ) {
@@ -70,13 +97,15 @@ private static String getMappedBy(PersistentClass referencedClass, ResolverConte
 			LOG.debugf(
 					"Going to search the mapped by attribute for %s in superclasses of entity: %s",
 					resolverContext.propertyAuditingData.getName(),
-					referencedClass.getClassName()
+					referencedClass.getEntityName()
 			);
 
-			PersistentClass tempClass = referencedClass;
-			while ( mappedBy == null && tempClass.getSuperclass() != null ) {
-				LOG.debugf( "Searching in superclass: %s", tempClass.getSuperclass().getClassName() );
-				mappedBy = searchMappedBy( tempClass.getSuperclass(), resolverContext );
+			PersistentClass tempClass = referencedClass.getPersistentClass().getSuperclass();
+			while ( mappedBy == null && tempClass != null ) {
+				final var superclassName = tempClass.getEntityName();
+				LOG.debugf( "Searching in superclass: %s", superclassName );
+				final var auditingData = buildingContext.getClassesAuditingData().getClassAuditingData( superclassName );
+				mappedBy = searchMappedBy( auditingData, resolverContext );
 				tempClass = tempClass.getSuperclass();
 			}
 		}
@@ -84,10 +113,12 @@ private static String getMappedBy(PersistentClass referencedClass, ResolverConte
 		if ( mappedBy == null ) {
 			throw new EnversMappingException(
 					String.format(
-							Locale.ENGLISH,
-							"Unable to read mapped by attribute for %s in %s!",
+							Locale.ROOT,
+							"Could not resolve mapped by property for association [%s.%s] in the referenced entity [%s],"
+							+ " please ensure that the association is audited on both sides.",
+							entityName,
 							resolverContext.propertyAuditingData.getName(),
-							referencedClass.getClassName()
+							referencedClass.getEntityName()
 					)
 			);
 		}
@@ -95,49 +126,64 @@ private static String getMappedBy(PersistentClass referencedClass, ResolverConte
 		return mappedBy;
 	}
 
-	private static String searchMappedBy(PersistentClass persistentClass, ResolverContext resolverContext) {
+	private static String searchMappedBy(ClassAuditingData referencedClass, ResolverContext resolverContext) {
 		if ( resolverContext.getCollection() != null ) {
-			return searchMappedBy( persistentClass, resolverContext.getCollection() );
+			return searchMappedBy( referencedClass, resolverContext.getCollection() );
 		}
-		return searchMappedBy( persistentClass, resolverContext.getTable() );
+		return searchMappedBy( referencedClass, resolverContext.getTable() );
 	}
 
-	private static String searchMappedBy(PersistentClass referencedClass, Collection collectionValue) {
-		final List<Property> assocClassProps = referencedClass.getProperties();
+	private static String searchMappedBy(ClassAuditingData referencedClass, Collection collectionValue) {
+		final var persistentClass = referencedClass.getPersistentClass();
+		final List<Property> assocClassProps = referencedClass.getPersistentClass().getProperties();
 		for ( Property property : assocClassProps ) {
 			final List<Selectable> assocClassSelectables = property.getValue().getSelectables();
 			final List<Selectable> collectionKeySelectables = collectionValue.getKey().getSelectables();
 			if ( Objects.equals( assocClassSelectables, collectionKeySelectables ) ) {
-				return property.getName();
+				final var propertyName = property.getName();
+				// We need to check if the property is audited as well
+				return referencedClass.contains( propertyName ) ? propertyName : null;
 			}
 		}
 		// HHH-7625
 		// Support ToOne relations with mappedBy that point to an @IdClass key property.
-		return searchMappedByKey( referencedClass, collectionValue );
+		return searchMappedByKey( persistentClass, collectionValue );
 	}
 
-	private static String searchMappedBy(PersistentClass referencedClass, Table collectionTable) {
-		return searchMappedBy( referencedClass.getProperties(), collectionTable );
+	private static String searchMappedBy(ClassAuditingData referencedClass, Table collectionTable) {
+		return searchMappedBy( referencedClass, referencedClass.getPersistentClass().getProperties(), collectionTable );
 	}
 
-	private static String searchMappedBy(List<Property> properties, Table collectionTable) {
+	private static String searchMappedBy(AuditedPropertiesHolder propertiesHolder, List<Property> properties, Table collectionTable) {
 		for ( Property property : properties ) {
 			if ( property.getValue() instanceof Collection ) {
 				// The equality is intentional. We want to find a collection property with the same collection table.
 				//noinspection ObjectEquality
-				if ( ( (Collection) property.getValue() ).getCollectionTable() == collectionTable ) {
-					return property.getName();
+				if ( ((Collection) property.getValue()).getCollectionTable() == collectionTable ) {
+					final var propertyName = property.getName();
+					// We need to check if the property is audited as well
+					return propertiesHolder.contains( propertyName ) ? propertyName : null;
 				}
 			}
-			else if ( property.getValue() instanceof Component ) {
+			else if ( property.getValue() instanceof Component component ) {
 				// HHH-12240
 				// Should we find an embeddable, we should traverse it as well to see if the collection table
 				// happens to be an attribute inside the embeddable rather than directly on the entity.
-				final Component component = (Component) property.getValue();
-
-				final String mappedBy = searchMappedBy( component.getProperties(), collectionTable );
-				if ( mappedBy != null ) {
-					return property.getName() + "_" + mappedBy;
+				final var componentName = property.getName();
+				final var componentData = propertiesHolder.getPropertyAuditingData( componentName );
+				if ( componentData == null ) {
+					// If the component is not audited, no need to check sub-properties
+					return null;
+				}
+				else {
+					final String mappedBy = searchMappedBy(
+							(ComponentAuditingData) componentData,
+							component.getProperties(),
+							collectionTable
+					);
+					if ( mappedBy != null ) {
+						return property.getName() + "_" + mappedBy;
+					}
 				}
 			}
 		}
@@ -161,18 +207,8 @@ private static String searchMappedByKey(PersistentClass referencedClass, Collect
 		return null;
 	}
 
-	private static PersistentClass getReferenceCollectionClass(Collection collectionValue) {
-		PersistentClass referencedClass = null;
-		if ( collectionValue.getElement() instanceof OneToMany ) {
-			final OneToMany oneToManyValue = (OneToMany) collectionValue.getElement();
-			referencedClass = oneToManyValue.getAssociatedClass();
-		}
-		else if ( collectionValue.getElement() instanceof ManyToOne ) {
-			// Case for bidirectional relation with @JoinTable on the owning @ManyToOne side.
-			final ManyToOne manyToOneValue = (ManyToOne) collectionValue.getElement();
-			referencedClass = manyToOneValue.getMetadata().getEntityBinding( manyToOneValue.getReferencedEntityName() );
-		}
-		return referencedClass;
+	private static ClassAuditingData getReferencedClass(String className, EnversMetadataBuildingContext buildingContext) {
+		return buildingContext.getClassesAuditingData().getClassAuditingData( className );
 	}
 
 	private static class ResolverContext {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java
index eaca0f59fff6..0a8407123f68 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java
@@ -178,6 +178,7 @@ else if ( hasNotAuditedEntityConfiguration( referencedEntityName ) ) {
 						referencedEntityName,
 						prefixedMapper,
 						true,
+						false,
 						false
 				);
 			}
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java
index 004204e82f05..db9abb6005cd 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/JoinColumnCollectionMetadataGenerator.java
@@ -30,6 +30,7 @@
 import org.jboss.logging.Logger;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 /**
  * An implementation of {@link AbstractCollectionMetadataGenerator} that builds collection metadata
@@ -42,7 +43,8 @@ public class JoinColumnCollectionMetadataGenerator extends AbstractCollectionMet
 	private static final EnversMessageLogger LOG = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			EnversMessageLogger.class,
-			JoinColumnCollectionMetadataGenerator.class.getName()
+			JoinColumnCollectionMetadataGenerator.class.getName(),
+			Locale.ROOT
 	);
 
 	public JoinColumnCollectionMetadataGenerator(
@@ -54,19 +56,27 @@ public JoinColumnCollectionMetadataGenerator(
 
 	@Override
 	public void addCollection(CollectionMetadataContext context) {
+		final var referencingEntityName = context.getReferencingEntityName();
 		LOG.debugf(
 				"Adding audit mapping for property %s.%s: one-to-many collection, using a join column on the referenced entity",
-				context.getReferencingEntityName(),
+				referencingEntityName,
 				context.getPropertyName()
 		);
 
 		final Collection collection = context.getCollection();
 		final PropertyAuditingData propertyAuditingData = context.getPropertyAuditingData();
-		final String mappedBy = CollectionMappedByResolver.resolveMappedBy( collection, propertyAuditingData );
+		final var referencedEntityName = context.getReferencedEntityName();
+		final String mappedBy = CollectionMappedByResolver.resolveMappedBy(
+				referencingEntityName,
+				collection,
+				propertyAuditingData,
+				referencedEntityName,
+				getMetadataBuildingContext()
+		);
 
 		final IdMappingData referencedIdMapping = getReferencedIdMappingData(
-				context.getReferencingEntityName(),
-				context.getReferencedEntityName(),
+				referencingEntityName,
+				referencedEntityName,
 				propertyAuditingData,
 				false
 		);
@@ -78,7 +88,7 @@ public void addCollection(CollectionMetadataContext context) {
 		final MiddleIdData referencingIdData = createMiddleIdData(
 				referencingIdMapping,
 				mappedBy + "_",
-				context.getReferencingEntityName()
+				referencingEntityName
 		);
 
 		// And for the referenced side. The prefixed mapper won't be used (as this collection isn't persisted
@@ -86,7 +96,7 @@ public void addCollection(CollectionMetadataContext context) {
 		final MiddleIdData referencedIdData = createMiddleIdData(
 				referencedIdMapping,
 				null,
-				context.getReferencedEntityName()
+				referencedEntityName
 		);
 
 		// Generating the element mapping.
@@ -102,18 +112,18 @@ public void addCollection(CollectionMetadataContext context) {
 		final RelationQueryGenerator queryGenerator = new OneAuditEntityQueryGenerator(
 				getMetadataBuildingContext().getConfiguration(),
 				referencingIdData,
-				context.getReferencedEntityName(),
+				referencedEntityName,
 				referencedIdData,
 				context.getCollection().getElement() instanceof ComponentType,
 				mappedBy,
-				CollectionMappedByResolver.isMappedByKey( collection, mappedBy ),
+				CollectionMappedByResolver.isMappedByKey( collection, mappedBy, referencedEntityName, getMetadataBuildingContext() ),
 				getOrderByCollectionRole( collection, collection.getOrderBy() )
 		);
 
 		// Creating common mapper data.
 		final CommonCollectionMapperData commonCollectionMapperData = createCommonCollectionMapperData(
 				context,
-				context.getReferencedEntityName(),
+				referencedEntityName,
 				referencingIdData,
 				queryGenerator
 		);
@@ -126,7 +136,7 @@ public void addCollection(CollectionMetadataContext context) {
 			final String auditMappedBy = getAddOneToManyAttachedAuditMappedBy( context );
 
 			fakeBidirectionalRelationMapper = getBidirectionalRelationMapper(
-					context.getReferencingEntityName(),
+					referencingEntityName,
 					referencingIdMapping,
 					auditMappedBy
 			);
@@ -153,7 +163,7 @@ public void addCollection(CollectionMetadataContext context) {
 		referencingEntityConfiguration.addToManyNotOwningRelation(
 				context.getPropertyName(),
 				mappedBy,
-				context.getReferencedEntityName(),
+				referencedEntityName,
 				referencingIdData.getPrefixedMapper(),
 				fakeBidirectionalRelationMapper,
 				fakeBidirectionalRelationIndexMapper,
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java
index 29506046884c..84d797ae50ed 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MiddleTableCollectionMetadataGenerator.java
@@ -21,11 +21,11 @@
 import org.hibernate.envers.internal.tools.StringTools;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.OneToMany;
-import org.hibernate.mapping.PersistentClass;
 
 import org.jboss.logging.Logger;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 /**
  * An implementation of {@link AbstractCollectionMetadataGenerator} that builds collection metadata
@@ -38,7 +38,8 @@ public class MiddleTableCollectionMetadataGenerator extends AbstractCollectionMe
 	private static final EnversMessageLogger LOG = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			EnversMessageLogger.class,
-			MiddleTableCollectionMetadataGenerator.class.getName()
+			MiddleTableCollectionMetadataGenerator.class.getName(),
+			Locale.ROOT
 	);
 
 	public MiddleTableCollectionMetadataGenerator(
@@ -50,9 +51,10 @@ public MiddleTableCollectionMetadataGenerator(
 
 	@Override
 	public void addCollection(CollectionMetadataContext context) {
+		final var referencingEntityName = context.getReferencingEntityName();
 		LOG.debugf(
 				"Adding audit mapping for property %s.%s: collection with a join table",
-				context.getReferencingEntityName(),
+				referencingEntityName,
 				context.getPropertyName()
 		);
 
@@ -93,6 +95,7 @@ public void addCollection(CollectionMetadataContext context) {
 		// Getting the id-mapping data of the referencing entity (the entity that "owns" this collection).
 		final EntityConfiguration referencingEntityConfiguration = context.getReferencingEntityConfiguration();
 		final IdMappingData referencingIdMapping = referencingEntityConfiguration.getIdMappingData();
+		final var referencedEntityName = context.getReferencedEntityName();
 
 		// Only valid for an inverse relation; null otherwise.
 		String mappedBy;
@@ -104,25 +107,26 @@ public void addCollection(CollectionMetadataContext context) {
 		if ( context.getCollection().isInverse() ) {
 			// If the relation is inverse, then referencedEntityName is not null.
 			mappedBy = CollectionMappedByResolver.resolveMappedBy(
+					referencingEntityName,
 					context.getCollection().getCollectionTable(),
-					getReferencedEntityMapping( context ),
-					context.getPropertyAuditingData()
+					context.getPropertyAuditingData(),
+					referencedEntityName,
+					getMetadataBuildingContext()
 			);
 			referencingPrefixRelated = mappedBy + "_";
-			referencedPrefix = StringTools.getLastComponent( context.getReferencedEntityName() );
+			referencedPrefix = StringTools.getLastComponent( referencedEntityName );
 		}
 		else {
-
 			mappedBy = null;
-			referencingPrefixRelated = StringTools.getLastComponent( context.getReferencingEntityName() ) + "_";
-			referencedPrefix = context.getReferencedEntityName() == null ? "element" : context.getPropertyName();
+			referencingPrefixRelated = StringTools.getLastComponent( referencingEntityName ) + "_";
+			referencedPrefix = referencedEntityName == null ? "element" : context.getPropertyName();
 		}
 
 		// Storing the id data of the referencing entity: original mapper, prefixed mapper and entity name.
 		final MiddleIdData referencingIdData = createMiddleIdData(
 				referencingIdMapping,
 				referencingPrefixRelated,
-				context.getReferencingEntityName()
+				referencingEntityName
 		);
 
 		// Creating a query generator builder, to which additional id data will be added, in case this collection
@@ -255,10 +259,6 @@ private boolean isRevisionTypeInId(CollectionMetadataContext context) {
 		return isEmbeddableElementType( context ) || isLobMapElementType( context );
 	}
 
-	private PersistentClass getReferencedEntityMapping(CollectionMetadataContext context) {
-		return getMetadataBuildingContext().getMetadataCollector().getEntityBinding( context.getReferencedEntityName() );
-	}
-
 	private void storeMiddleEntityRelationInformation(
 			CollectionMetadataContext context,
 			String mappedBy,
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java
index 955a7aa1bc7c..d0375201d33f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java
@@ -4,10 +4,14 @@
  */
 package org.hibernate.envers.configuration.internal.metadata;
 
+import java.util.Locale;
+
 import org.hibernate.envers.boot.EnversMappingException;
 import org.hibernate.envers.boot.model.AttributeContainer;
 import org.hibernate.envers.boot.spi.EnversMetadataBuildingContext;
 import org.hibernate.envers.RelationTargetNotFoundAction;
+import org.hibernate.envers.configuration.internal.metadata.reader.AuditedPropertiesHolder;
+import org.hibernate.envers.configuration.internal.metadata.reader.ComponentAuditingData;
 import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData;
 import org.hibernate.envers.internal.entities.EntityConfiguration;
 import org.hibernate.envers.internal.entities.IdMappingData;
@@ -62,7 +66,8 @@ public void addToOne(
 				referencedEntityName,
 				relMapper,
 				insertable,
-				shouldIgnoreNotFoundRelation( propertyAuditingData, value )
+				shouldIgnoreNotFoundRelation( propertyAuditingData, value ),
+				isRelationNotAudited( propertyAuditingData )
 		);
 
 		// If the property isn't insertable, checking if this is not a "fake" bidirectional many-to-one relationship,
@@ -115,19 +120,29 @@ public void addOneToOneNotOwning(
 			throw new EnversMappingException( "An audited relation to a non-audited entity " + entityName + "!" );
 		}
 
+		final var referencedEntityName = propertyValue.getReferencedEntityName();
+		final var propertyName = propertyAuditingData.getName();
+		checkMappedByAudited(
+				entityName,
+				propertyName,
+				referencedEntityName,
+				owningReferencePropertyName,
+				getMetadataBuildingContext().getClassesAuditingData().getClassAuditingData( referencedEntityName )
+		);
+
 		final String lastPropertyPrefix = MappingTools.createToOneRelationPrefix( owningReferencePropertyName );
-		final String referencedEntityName = propertyValue.getReferencedEntityName();
 
 		// Generating the id mapper for the relation
 		final IdMapper ownedIdMapper = ownedIdMapping.getIdMapper().prefixMappedProperties( lastPropertyPrefix );
 
 		// Storing information about this relation
-		getAuditedEntityConfiguration( entityName ).addToOneNotOwningRelation(
-				propertyAuditingData.getName(),
+		configuration.addToOneNotOwningRelation(
+				propertyName,
 				owningReferencePropertyName,
 				referencedEntityName,
 				ownedIdMapper,
-				MappingTools.ignoreNotFound( value )
+				MappingTools.ignoreNotFound( value ),
+				isRelationNotAudited( propertyAuditingData )
 		);
 
 		// Adding mapper for the id
@@ -144,6 +159,31 @@ public void addOneToOneNotOwning(
 		);
 	}
 
+	private static void checkMappedByAudited(
+			String entityName,
+			String associationName,
+			String referencedEntityName,
+			String referencedPropertyName,
+			AuditedPropertiesHolder propertiesHolder) {
+		final var split = referencedPropertyName.split( "\\.", 2 );
+		final var auditingData = propertiesHolder.getPropertyAuditingData( split[0] );
+		if ( auditingData == null ) {
+			throw new EnversMappingException( String.format(
+					Locale.ROOT,
+					"Could not resolve mapped by property [%s] for association [%s.%s] in the referenced entity [%s],"
+							+ " please ensure that the association is audited on both sides.",
+					referencedPropertyName,
+					entityName,
+					associationName,
+					referencedEntityName
+			) );
+		}
+		else if ( split.length > 1 ) {
+			// mapped by is a nested component property
+			checkMappedByAudited( entityName, associationName, referencedEntityName, split[1], (ComponentAuditingData) auditingData );
+		}
+	}
+
 	void addOneToOnePrimaryKeyJoinColumn(
 			PropertyAuditingData propertyAuditingData,
 			Value value,
@@ -170,7 +210,8 @@ void addOneToOnePrimaryKeyJoinColumn(
 				referencedEntityName,
 				relMapper,
 				insertable,
-				MappingTools.ignoreNotFound( value )
+				MappingTools.ignoreNotFound( value ),
+				isRelationNotAudited( propertyAuditingData )
 		);
 
 		// Adding mapper for the id
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java
index ddfc633d41fe..fa717d0d40cc 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java
@@ -10,7 +10,7 @@
  * Implementations hold other audited properties.
  *
  * @author Adam Warski (adam at warski dot org)
- * @author Hern&aacut;n Chanfreau
+ * @author Hern&aacute;n Chanfreau
  * @author Chris Cranford
  */
 public interface AuditedPropertiesHolder {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java
index 0146d14d3208..284c4f644889 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java
@@ -59,7 +59,7 @@
  *
  * @author Adam Warski (adam at warski dot org)
  * @author Erik-Berndt Scheper
- * @author Hern&aacut;n Chanfreau
+ * @author Hern&aacute;n Chanfreau
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  * @author Michal Skowronek (mskowr at o2 dot pl)
  * @author Lukasz Zuchowski (author at zuchos dot com)
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java
index 0fa9d52e1132..d72163c67c75 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java
@@ -18,7 +18,7 @@
  *
  * @author Adam Warski (adam at warski dot org)
  * @author Sebastian Komander
- * @author Hern&aacut;n Chanfreau
+ * @author Hern&aacute;n Chanfreau
  * @author Chris Cranford
  */
 public class ClassAuditingData implements AuditedPropertiesHolder {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java
index 46fb0b83517c..37b325bf6c43 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java
@@ -16,7 +16,7 @@
 /**
  * Reads the audited properties for components.
  *
- * @author Hern&aacut;n Chanfreau
+ * @author Hern&aacute;n Chanfreau
  * @author Michal Skowronek (mskowr at o2 dot pl)
  * @author Chris Cranford
  */
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java
index 0f66b9054c56..7ff96848e773 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java
@@ -14,7 +14,7 @@
  * Audit mapping meta-data for component.
  *
  * @author Adam Warski (adam at warski dot org)
- * @author Hern&aacut;n Chanfreau
+ * @author Hern&aacute;n Chanfreau
  * @author Chris Cranford
  */
 public class ComponentAuditingData extends PropertyAuditingData implements AuditedPropertiesHolder {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java
index 353f594cc53d..70f4b6b0c8cc 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java
@@ -147,9 +147,8 @@ protected Serializable initializeCollection(AbstractCollectionEvent event) {
 	protected boolean shouldGenerateRevision(AbstractCollectionEvent event) {
 		final String entityName = event.getAffectedOwnerEntityName();
 		if ( getEnversService().getEntitiesConfigurations().isVersioned( entityName ) ) {
-			final CollectionEntry collectionEntry = getCollectionEntry( event );
-			final boolean isInverse = collectionEntry.getLoadedPersister().isInverse();
-			final boolean isOneToMany = collectionEntry.getLoadedPersister() instanceof OneToManyPersister;
+			final boolean isInverse = event.getCollectionPersister().isInverse();
+			final boolean isOneToMany = event.getCollectionPersister() instanceof OneToManyPersister;
 			if ( isInverse || isOneToMany ) {
 				return getEnversService().getConfig().isGenerateRevisionsForCollections();
 			}
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java
index 1caf7a4b609c..eca48aa1dde0 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java
@@ -27,12 +27,14 @@ public EnversPostCollectionRecreateEventListenerImpl(EnversService enversService
 
 	@Override
 	public void onPostRecreateCollection(PostCollectionRecreateEvent event) {
-		final CollectionEntry collectionEntry = getCollectionEntry( event );
-		if ( !collectionEntry.getLoadedPersister().isInverse() ) {
-			onCollectionAction( event, event.getCollection(), null, collectionEntry );
-		}
-		else {
-			onCollectionActionInversed( event, event.getCollection(), null, collectionEntry );
+		if ( shouldGenerateRevision( event ) ) {
+			final CollectionEntry collectionEntry = getCollectionEntry( event );
+			if ( !collectionEntry.getLoadedPersister().isInverse() ) {
+				onCollectionAction( event, event.getCollection(), null, collectionEntry );
+			}
+			else {
+				onCollectionActionInversed( event, event.getCollection(), null, collectionEntry );
+			}
 		}
 	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java
index 1044d887acf3..e599b8b5957f 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java
@@ -30,20 +30,22 @@ public EnversPreCollectionRemoveEventListenerImpl(EnversService enversService) {
 
 	@Override
 	public void onPreRemoveCollection(PreCollectionRemoveEvent event) {
-		final CollectionEntry collectionEntry = getCollectionEntry( event );
-		if ( collectionEntry != null ) {
-			if ( !collectionEntry.getLoadedPersister().isInverse() ) {
-				Serializable oldColl = collectionEntry.getSnapshot();
-				if ( !event.getCollection().wasInitialized() && shouldGenerateRevision( event ) ) {
-					// In case of uninitialized collection we need a fresh snapshot to properly calculate audit data.
-					oldColl = initializeCollection( event );
+		if ( shouldGenerateRevision( event ) ) {
+			final CollectionEntry collectionEntry = getCollectionEntry( event );
+			if ( collectionEntry != null ) {
+				if ( !collectionEntry.getLoadedPersister().isInverse() ) {
+					Serializable oldColl = collectionEntry.getSnapshot();
+					if ( !event.getCollection().wasInitialized() && shouldGenerateRevision( event ) ) {
+						// In case of uninitialized collection we need a fresh snapshot to properly calculate audit data.
+						oldColl = initializeCollection( event );
+					}
+					onCollectionAction( event, null, oldColl, collectionEntry );
 				}
-				onCollectionAction( event, null, oldColl, collectionEntry );
-			}
-			else {
-				// HHH-7510 - Avoid LazyInitializationException when global_with_modified_flag = true
-				if ( getEnversService().getConfig().isModifiedFlagsEnabled() ) {
-					initializeCollection( event );
+				else {
+					// HHH-7510 - Avoid LazyInitializationException when global_with_modified_flag = true
+					if ( getEnversService().getConfig().isModifiedFlagsEnabled() ) {
+						initializeCollection( event );
+					}
 				}
 			}
 		}
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java
index c2049a9b1859..66962ad73d82 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java
@@ -27,12 +27,15 @@ public EnversPreCollectionUpdateEventListenerImpl(EnversService enversService) {
 
 	@Override
 	public void onPreUpdateCollection(PreCollectionUpdateEvent event) {
-		final CollectionEntry collectionEntry = getCollectionEntry( event );
-		if ( !collectionEntry.getLoadedPersister().isInverse() ) {
-			onCollectionAction( event, event.getCollection(), collectionEntry.getSnapshot(), collectionEntry );
-		}
-		else {
-			onCollectionActionInversed( event, event.getCollection(), collectionEntry.getSnapshot(), collectionEntry );
+		if ( shouldGenerateRevision( event ) ) {
+			final CollectionEntry collectionEntry = getCollectionEntry( event );
+			if ( !collectionEntry.getLoadedPersister().isInverse() ) {
+				onCollectionAction( event, event.getCollection(), collectionEntry.getSnapshot(), collectionEntry );
+			}
+			else {
+				onCollectionActionInversed( event, event.getCollection(), collectionEntry.getSnapshot(),
+						collectionEntry );
+			}
 		}
 	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java
index 3b3f64736bdb..506a3f90b479 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversLogging.java
@@ -7,6 +7,7 @@
 import org.jboss.logging.Logger;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 /**
  * Sad when you need helpers for generating loggers...
@@ -25,7 +26,7 @@ public static EnversMessageLogger messageLogger(Class classNeedingLogging) {
 	}
 
 	public static EnversMessageLogger messageLogger(String loggerName) {
-		return Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger .class, loggerName );
+		return Logger.getMessageLogger( MethodHandles.lookup(), EnversMessageLogger .class, loggerName, Locale.ROOT );
 	}
 
 	public static Logger logger(Class<?> classNeedingLogging) {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java
index 36c2f7bc8df6..4137d83faae6 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java
@@ -54,7 +54,8 @@ public void addToOneRelation(
 			String toEntityName,
 			IdMapper idMapper,
 			boolean insertable,
-			boolean ignoreNotFound) {
+			boolean ignoreNotFound,
+			boolean targetNotAudited) {
 		relations.put(
 				fromPropertyName,
 				RelationDescription.toOne(
@@ -66,7 +67,8 @@ public void addToOneRelation(
 						null,
 						null,
 						insertable,
-						ignoreNotFound
+						ignoreNotFound,
+						targetNotAudited
 				)
 		);
 	}
@@ -76,7 +78,8 @@ public void addToOneNotOwningRelation(
 			String mappedByPropertyName,
 			String toEntityName,
 			IdMapper idMapper,
-			boolean ignoreNotFound) {
+			boolean ignoreNotFound,
+			boolean targetNotAudited) {
 		relations.put(
 				fromPropertyName,
 				RelationDescription.toOne(
@@ -88,7 +91,8 @@ public void addToOneNotOwningRelation(
 						null,
 						null,
 						true,
-						ignoreNotFound
+						ignoreNotFound,
+						targetNotAudited
 				)
 		);
 	}
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java
index 3ff3e7ba9199..9de221bd4f68 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java
@@ -124,7 +124,8 @@ private void replaceNonAuditIdProxies(Map versionsEntity, Number revision) {
 											enversService.getConfig().getRevisionTypePropertyName()
 									)
 							),
-							enversService
+							enversService,
+							false
 					);
 					originalId.put(
 							key,
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java
index edadb20a0138..04fc92e6c7d5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java
@@ -18,6 +18,7 @@ public class RelationDescription {
 	private final String toEntityName;
 	private final String mappedByPropertyName;
 	private final boolean ignoreNotFound;
+	private final boolean targetNotAudited;
 	private final IdMapper idMapper;
 	private final PropertyMapper fakeBidirectionalRelationMapper;
 	private final PropertyMapper fakeBidirectionalRelationIndexMapper;
@@ -37,10 +38,11 @@ public static RelationDescription toOne(
 			PropertyMapper fakeBidirectionalRelationMapper,
 			PropertyMapper fakeBidirectionalRelationIndexMapper,
 			boolean insertable,
-			boolean ignoreNotFound) {
+			boolean ignoreNotFound,
+			boolean targetNotAudited) {
 		return new RelationDescription(
 				fromPropertyName, relationType, toEntityName, mappedByPropertyName, idMapper,
-				fakeBidirectionalRelationMapper, fakeBidirectionalRelationIndexMapper, null, null, null, insertable, ignoreNotFound, false
+				fakeBidirectionalRelationMapper, fakeBidirectionalRelationIndexMapper, null, null, null, insertable, ignoreNotFound, targetNotAudited, false
 		);
 	}
 
@@ -60,10 +62,10 @@ public static RelationDescription toMany(
 		// Envers populates collections by executing dedicated queries. Special handling of
 		// @NotFound(action = NotFoundAction.IGNORE) can be omitted in such case as exceptions
 		// (e.g. EntityNotFoundException, ObjectNotFoundException) are never thrown.
-		// Therefore assigning false to ignoreNotFound.
+		// Therefore assigning false to ignoreNotFound and targetNotAudited.
 		return new RelationDescription(
 				fromPropertyName, relationType, toEntityName, mappedByPropertyName, idMapper, fakeBidirectionalRelationMapper,
-				fakeBidirectionalRelationIndexMapper, referencingIdData, referencedIdData, auditMiddleEntityName, insertable, false, indexed
+				fakeBidirectionalRelationIndexMapper, referencingIdData, referencedIdData, auditMiddleEntityName, insertable, false, false, indexed
 		);
 	}
 
@@ -80,12 +82,14 @@ private RelationDescription(
 			String auditMiddleEntityName,
 			boolean insertable,
 			boolean ignoreNotFound,
+			boolean targetNotAudited,
 			boolean indexed) {
 		this.fromPropertyName = fromPropertyName;
 		this.relationType = relationType;
 		this.toEntityName = toEntityName;
 		this.mappedByPropertyName = mappedByPropertyName;
 		this.ignoreNotFound = ignoreNotFound;
+		this.targetNotAudited = targetNotAudited;
 		this.idMapper = idMapper;
 		this.fakeBidirectionalRelationMapper = fakeBidirectionalRelationMapper;
 		this.fakeBidirectionalRelationIndexMapper = fakeBidirectionalRelationIndexMapper;
@@ -117,6 +121,10 @@ public boolean isIgnoreNotFound() {
 		return ignoreNotFound;
 	}
 
+	public boolean isTargetNotAudited() {
+		return targetNotAudited;
+	}
+
 	public IdMapper getIdMapper() {
 		return idMapper;
 	}
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java
index fbf846884cd1..7b4701527c5a 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTimestampData.java
@@ -30,7 +30,8 @@ public String getTypeName() {
 	public boolean isTimestampDate() {
 		return "date".equals( typeName )
 				|| "time".equals( typeName )
-				|| "timestamp".equals( typeName );
+				|| "timestamp".equals( typeName )
+				|| typeName.contains( "java.util.Date" );
 	}
 
 	public boolean isTimestampLocalDateTime() {
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java
index 3312585d327f..3a64f15bbeba 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java
@@ -28,17 +28,18 @@ public static Object loadImmediate(
 			Object entityId,
 			Number revision,
 			boolean removed,
-			EnversService enversService) {
-		if ( enversService.getEntitiesConfigurations().getNotVersionEntityConfiguration( entityName ) == null ) {
+			EnversService enversService,
+			boolean isTargetNotAudited) {
+		if ( isTargetNotAudited || enversService.getEntitiesConfigurations().getNotVersionEntityConfiguration( entityName ) != null ) {
+			// Not audited relation, look up entity with Hibernate.
+			return versionsReader.getSessionImplementor().immediateLoad( entityName, entityId );
+		}
+		else {
 			// Audited relation, look up entity with Envers.
 			// When user traverses removed entities graph, do not restrict revision type of referencing objects
 			// to ADD or MOD (DEL possible). See HHH-5845.
 			return versionsReader.find( entityClass, entityName, entityId, revision, removed );
 		}
-		else {
-			// Not audited relation, look up entity with Hibernate.
-			return versionsReader.getSessionImplementor().immediateLoad( entityName, entityId );
-		}
 	}
 
 	/**
@@ -51,14 +52,15 @@ public static Object createProxy(
 			Object entityId,
 			Number revision,
 			boolean removed,
-			EnversService enversService) {
+			EnversService enversService,
+			boolean isTargetNotAudited) {
 		final EntityPersister persister = versionsReader.getSessionImplementor()
 				.getFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor( entityName );
 		return persister.createProxy(
 				entityId,
-				new ToOneDelegateSessionImplementor( versionsReader, entityClass, entityId, revision, removed, enversService )
+				new ToOneDelegateSessionImplementor( versionsReader, entityClass, entityId, revision, removed, enversService, isTargetNotAudited )
 		);
 	}
 
@@ -73,14 +75,15 @@ public static Object createProxyOrLoadImmediate(
 			Object entityId,
 			Number revision,
 			boolean removed,
-			EnversService enversService) {
+			EnversService enversService,
+			boolean isTargetNotAudited) {
 		final EntityPersister persister = versionsReader.getSessionImplementor()
 				.getFactory()
 				.getMappingMetamodel()
 				.getEntityDescriptor( entityName );
 		if ( persister.hasProxy() ) {
-			return createProxy( versionsReader, entityClass, entityName, entityId, revision, removed, enversService );
+			return createProxy( versionsReader, entityClass, entityName, entityId, revision, removed, enversService, isTargetNotAudited );
 		}
-		return loadImmediate( versionsReader, entityClass, entityName, entityId, revision, removed, enversService );
+		return loadImmediate( versionsReader, entityClass, entityName, entityId, revision, removed, enversService, isTargetNotAudited );
 	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java
index 63fc88456c25..f940b27ee958 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java
@@ -8,12 +8,12 @@
 import org.hibernate.envers.RevisionType;
 import org.hibernate.envers.boot.internal.EnversService;
 import org.hibernate.envers.internal.entities.PropertyData;
+import org.hibernate.envers.internal.entities.RelationDescription;
 import org.hibernate.envers.internal.entities.mapper.id.IdMapper;
 import org.hibernate.envers.internal.reader.AuditReaderImplementor;
 import org.hibernate.envers.internal.tools.EntityTools;
 import org.hibernate.envers.internal.tools.query.Parameters;
 import org.hibernate.persister.entity.EntityPersister;
-import org.jboss.logging.Logger;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,7 +27,6 @@
  * @author Luke Chen
  */
 public class ToOneIdMapper extends AbstractToOneMapper {
-	private static final Logger log = Logger.getLogger( ToOneIdMapper.class );
 	private final IdMapper delegate;
 	private final String referencedEntityName;
 	private final boolean nonInsertableFake;
@@ -61,9 +60,7 @@ public boolean mapToMapFromEntity(
 
 		delegate.mapToMapFromEntity( newData, entity );
 
-		for ( Map.Entry<String, Object> entry : newData.entrySet() ) {
-			data.put( entry.getKey(), entry.getValue() );
-		}
+		data.putAll( newData );
 
 		return checkModified( session, newObj, oldObj );
 	}
@@ -150,7 +147,8 @@ public Object nullSafeMapToEntityFromMap(
 			}
 			else {
 				final EntityInfo referencedEntity = getEntityInfo( enversService, referencedEntityName );
-				if ( isIgnoreNotFound( enversService, referencedEntity, data, primaryKey ) ) {
+				final RelationDescription relationDescription = getRelationDescription( enversService, data, primaryKey );
+				if ( isIgnoreNotFound( relationDescription ) ) {
 					// Eagerly loading referenced entity to silence potential (in case of proxy)
 					// EntityNotFoundException or ObjectNotFoundException. Assigning null reference.
 					value = ToOneEntityLoader.loadImmediate(
@@ -160,7 +158,8 @@ public Object nullSafeMapToEntityFromMap(
 							entityId,
 							revision,
 							RevisionType.DEL.equals( data.get( enversService.getConfig().getRevisionTypePropertyName() ) ),
-							enversService
+							enversService,
+							isTargetNotAudited( relationDescription )
 					);
 				}
 				else {
@@ -171,7 +170,8 @@ public Object nullSafeMapToEntityFromMap(
 							entityId,
 							revision,
 							RevisionType.DEL.equals( data.get( enversService.getConfig().getRevisionTypePropertyName() ) ),
-							enversService
+							enversService,
+							isTargetNotAudited( relationDescription )
 					);
 				}
 			}
@@ -188,24 +188,35 @@ public void addMiddleEqualToQuery(
 		delegate.addNullableIdsEqualToQuery( parameters, prefix1, delegate, prefix2 );
 	}
 
-	// todo: is referenced entity needed any longer?
-	private boolean isIgnoreNotFound(
+	private boolean isIgnoreNotFound(RelationDescription relationDescription) {
+		if ( relationDescription == null ) {
+			// HHH-11215 - Fix for NPE when Embeddable with ManyToOne inside ElementCollection
+			// an embeddable in an element-collection
+			// todo: perhaps the mapper should account for this instead?
+			return true;
+		}
+		return relationDescription.isIgnoreNotFound();
+	}
+
+	private boolean isTargetNotAudited(RelationDescription relationDescription) {
+		if ( relationDescription == null ) {
+			return false;
+		}
+		return relationDescription.isTargetNotAudited();
+	}
+
+	private RelationDescription getRelationDescription(
 			EnversService enversService,
-			EntityInfo referencedEntity,
 			Map data,
 			Object primaryKey) {
 		final String referencingEntityName = enversService.getEntitiesConfigurations()
 				.getEntityNameForVersionsEntityName( (String) data.get( "$type$" ) );
 
 		if ( referencingEntityName == null && primaryKey == null ) {
-			// HHH-11215 - Fix for NPE when Embeddable with ManyToOne inside ElementCollection
-			// an embeddable in an element-collection
-			// todo: perhaps the mapper should account for this instead?
-			return true;
+			return null;
 		}
 
 		return enversService.getEntitiesConfigurations()
-				.getRelationDescription( referencingEntityName, getPropertyData().getName() )
-				.isIgnoreNotFound();
+				.getRelationDescription( referencingEntityName, getPropertyData().getName() );
 	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java
index 4525b9f18400..50ce52860ffd 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java
@@ -23,6 +23,7 @@ public class ToOneDelegateSessionImplementor extends AbstractDelegateSessionImpl
 	private final Number revision;
 	private final boolean removed;
 	private final EnversService enversService;
+	private final boolean isTargetNotAudited;
 
 	public ToOneDelegateSessionImplementor(
 			AuditReaderImplementor versionsReader,
@@ -30,7 +31,8 @@ public ToOneDelegateSessionImplementor(
 			Object entityId,
 			Number revision,
 			boolean removed,
-			EnversService enversService) {
+			EnversService enversService,
+			boolean isTargetNotAudited) {
 		super( versionsReader.getSessionImplementor() );
 		this.versionsReader = versionsReader;
 		this.entityClass = entityClass;
@@ -38,6 +40,7 @@ public ToOneDelegateSessionImplementor(
 		this.revision = revision;
 		this.removed = removed;
 		this.enversService = enversService;
+		this.isTargetNotAudited = isTargetNotAudited;
 	}
 
 	@Override
@@ -49,7 +52,8 @@ public Object doImmediateLoad(String entityName) throws HibernateException {
 				entityId,
 				revision,
 				removed,
-				enversService
+				enversService,
+				isTargetNotAudited
 		);
 	}
 }
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java
index 8cc3e95bc579..46f38eac99c1 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java
@@ -5,6 +5,7 @@
 package org.hibernate.envers.internal.reader;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 import java.util.Map;
 
 import org.hibernate.envers.internal.EnversMessageLogger;
@@ -26,7 +27,8 @@ public class FirstLevelCache {
 	private static final EnversMessageLogger LOG = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			EnversMessageLogger.class,
-			FirstLevelCache.class.getName()
+			FirstLevelCache.class.getName(),
+			Locale.ROOT
 	);
 
 	/**
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ConcurrentReferenceHashMap.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ConcurrentReferenceHashMap.java
index 33cabe60f3f4..47cff5dc2db5 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ConcurrentReferenceHashMap.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ConcurrentReferenceHashMap.java
@@ -75,7 +75,6 @@
  * {@code Hashtable} in programs that rely on its thread safety but not on
  * its synchronization details.
  * <p>
- * <p>
  * Retrieval operations (including {@code get}) generally do not block, so
  * may overlap with update operations (including {@code put} and
  * {@code remove}). Retrievals reflect the results of the most recently
@@ -88,7 +87,6 @@
  * {@link java.util.ConcurrentModificationException}. However, iterators are designed to
  * be used by only one thread at a time.
  * <p>
- * <p>
  * The allowed concurrency among update operations is guided by the optional
  * {@code concurrencyLevel} constructor argument (default {@code 16}),
  * which is used as a hint for internal sizing. The table is internally
@@ -105,15 +103,12 @@
  * possible, it is a good idea to provide estimates of expected table sizes in
  * constructors.
  * <p>
- * <p>
  * This class and its views and iterators implement all of the <em>optional</em>
  * methods of the {@link Map} and {@link Iterator} interfaces.
  * <p>
- * <p>
  * Like {@link java.util.Hashtable} but unlike {@link java.util.HashMap}, this class does
  * <em>not</em> allow {@code null} to be used as a key or value.
  * <p>
- * <p>
  * This class is a member of the <a href="{@docRoot}/../technotes/guides/collections/index.html">
  * Java Collections Framework</a>.
  *
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditDefaultTrackingTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditDefaultTrackingTest.java
index 38c2c5038d79..c36226e53037 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditDefaultTrackingTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditDefaultTrackingTest.java
@@ -23,7 +23,6 @@
 
 import java.util.Arrays;
 import java.util.Date;
-import java.util.Map;
 
 
 /**
@@ -66,7 +65,7 @@ public void testLifecycle() {
 	}
 
 	private EntityManagerFactory buildEntityManagerFactory() {
-		Map<Object, Object> settings = buildSettings();
+		var settings = buildSettings();
 		settings.put(
 				AvailableSettings.LOADED_CLASSES,
 				Arrays.asList( ApplicationCustomer.class, CustomTrackingRevisionEntity.class )
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTest.java
index fd8ef835f28d..b0bccd00a120 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTest.java
@@ -28,7 +28,6 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -98,7 +97,7 @@ public void test() {
 	}
 
 	private EntityManagerFactory buildEntityManagerFactory() {
-		Map<Object, Object> settings = buildSettings();
+		var settings = buildSettings();
 		settings.put(
 				AvailableSettings.LOADED_CLASSES,
 				Arrays.asList(
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java
index 9668f9c1b688..816de8df13c4 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java
@@ -33,7 +33,6 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -101,7 +100,7 @@ public void testLifecycle() {
 	}
 
 	private EntityManagerFactory buildEntityManagerFactory() {
-		Map<Object, Object> settings = buildSettings();
+		var settings = buildSettings();
 		settings.put(
 				AvailableSettings.LOADED_CLASSES,
 				Arrays.asList(
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java
index 625ecced7465..2711c572b6ba 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java
@@ -24,18 +24,17 @@ public class Component3 {
 	private String str1;
 
 	@AttributeOverrides({
-								@AttributeOverride(name = "key", column = @Column(name = "audComp_key")),
-								@AttributeOverride(name = "value", column = @Column(name = "audComp_value")),
-								@AttributeOverride(name = "description", column = @Column(name = "audComp_description"))
+								@AttributeOverride(name = "key", column = @Column(name = "audComp_key", length = 50)),
+								@AttributeOverride(name = "value", column = @Column(name = "audComp_value", length = 50)),
+								@AttributeOverride(name = "description", column = @Column(name = "audComp_description", length = 50))
 						})
 	private Component4 auditedComponent;
 
 	@NotAudited
 	@AttributeOverrides({
-								@AttributeOverride(name = "key", column = @Column(name = "notAudComp_key")),
-								@AttributeOverride(name = "value", column = @Column(name = "notAudComp_value")),
-								@AttributeOverride(name = "description",
-												column = @Column(name = "notAudComp_description"))
+								@AttributeOverride(name = "key", column = @Column(name = "notAudComp_key", length = 50)),
+								@AttributeOverride(name = "value", column = @Column(name = "notAudComp_value", length = 50)),
+								@AttributeOverride(name = "description", column = @Column(name = "notAudComp_description", length = 50))
 						})
 	private Component4 nonAuditedComponent;
 
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NationalizedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NationalizedTest.java
new file mode 100644
index 000000000000..75a3406de224
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/NationalizedTest.java
@@ -0,0 +1,65 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.integration.basic;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.Nationalized;
+import org.hibernate.community.dialect.DerbyDialect;
+import org.hibernate.dialect.DB2Dialect;
+import org.hibernate.dialect.HANADialect;
+import org.hibernate.dialect.OracleDialect;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.envers.Audited;
+import org.hibernate.mapping.Table;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.DomainModelScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.type.StandardBasicTypes;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
+import static org.hibernate.boot.model.naming.Identifier.toIdentifier;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@JiraKey(value = "HHH-19976")
+@DomainModel(annotatedClasses = {NationalizedTest.NationalizedEntity.class})
+@SessionFactory
+@SkipForDialect(dialectClass = OracleDialect.class)
+@SkipForDialect(dialectClass = PostgreSQLDialect.class, matchSubTypes = true, reason = "@Lob field in HQL predicate fails with error about text = bigint")
+@SkipForDialect(dialectClass = HANADialect.class, matchSubTypes = true, reason = "HANA doesn't support comparing LOBs with the = operator")
+@SkipForDialect(dialectClass = SybaseDialect.class, matchSubTypes = true, reason = "Sybase doesn't support comparing LOBs with the = operator")
+@SkipForDialect(dialectClass = DB2Dialect.class, matchSubTypes = true, reason = "DB2 jdbc driver doesn't support setNString")
+@SkipForDialect(dialectClass = DerbyDialect.class, matchSubTypes = true, reason = "Derby jdbc driver doesn't support setNString")
+public class NationalizedTest {
+
+	@Test
+	public void testMetadataBindings(DomainModelScope scope) {
+		final var domainModel = scope.getDomainModel();
+
+		assertThrows( AssertionFailedError.class, () -> {
+			final Table auditTable = domainModel.getEntityBinding( NationalizedEntity.class.getName() + "_AUD" )
+					.getTable();
+
+			final org.hibernate.mapping.Column colDef = auditTable.getColumn( toIdentifier( "nationalizedString" ) );
+			assertEquals( StandardBasicTypes.NSTRING.getName(), colDef.getTypeName() );
+		} );
+	}
+
+	@Entity(name = "NationalizedEntity")
+	@Audited
+	public static class NationalizedEntity {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		@Nationalized
+		private String nationalizedString;
+	}
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java
index 658648eae585..bede87996743 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/DetachedMultipleCollectionChangeTest.java
@@ -4,9 +4,9 @@
  */
 package org.hibernate.orm.test.envers.integration.collection;
 
+
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.Query;
-import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.envers.AuditReaderFactory;
@@ -21,6 +21,8 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -39,8 +41,7 @@
 @JiraKey(value = "HHH-6349")
 @SkipForDialect(dialectClass = OracleDialect.class,
 		reason = "Oracle does not support identity key generation")
-@SkipForDialect(dialectClass = AltibaseDialect.class,
-		reason = "Altibase does not support identity key generation")
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class)
 @EnversTest
 @Jpa(annotatedClasses = {
 		MultipleCollectionEntity.class,
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java
index 4e7b6d931df0..18de458a890c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapLobTest.java
@@ -12,6 +12,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Lob;
 
+import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.community.dialect.DerbyDialect;
@@ -44,6 +45,7 @@
 @SkipForDialect(dialectClass = SybaseDialect.class, matchSubTypes = true, reason = "Sybase doesn't support comparing LOBs with the = operator")
 @SkipForDialect(dialectClass = DB2Dialect.class, matchSubTypes = true, reason = "DB2 jdbc driver doesn't support setNString")
 @SkipForDialect(dialectClass = DerbyDialect.class, matchSubTypes = true, reason = "Derby jdbc driver doesn't support setNString")
+@SkipForDialect(dialectClass = InformixDialect.class, reason = "It's not possible to compare blobs with simple equality operators")
 public class StringMapLobTest {
 	@BeforeClassTemplate
 	public void initData(EntityManagerFactoryScope scope) {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java
index 3dde7e9a6af9..bf991254cf3c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/StringMapNationalizedLobTest.java
@@ -13,6 +13,7 @@
 import jakarta.persistence.Lob;
 
 import org.hibernate.annotations.Nationalized;
+import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.community.dialect.DerbyDialect;
@@ -45,6 +46,7 @@
 @SkipForDialect(dialectClass = SybaseDialect.class, matchSubTypes = true, reason = "Sybase doesn't support comparing LOBs with the = operator")
 @SkipForDialect(dialectClass = DB2Dialect.class, matchSubTypes = true, reason = "DB2 jdbc driver doesn't support setNString")
 @SkipForDialect(dialectClass = DerbyDialect.class, matchSubTypes = true, reason = "Derby jdbc driver doesn't support setNString")
+@SkipForDialect(dialectClass = InformixDialect.class, reason = "It's not possible to compare blobs with simple equality operators")
 public class StringMapNationalizedLobTest {
 	@BeforeClassTemplate
 	public void initData(EntityManagerFactoryScope scope) {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java
index 2c72a767af94..282a0744092e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/mapkey/ComponentMapKey.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.collection.mapkey;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.util.Arrays;
 
@@ -23,6 +27,7 @@
 /**
  * @author Adam Warski (adam at warski dot org)
  */
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class)
 @EnversTest
 @Jpa(annotatedClasses = {ComponentMapKeyEntity.class, ComponentTestEntity.class})
 public class ComponentMapKey {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumType.java
index e077434751c8..0c2e69257484 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/customtype/EnumType.java
@@ -116,7 +116,9 @@ else if ( reader != null ) {
 			enumClass = (Class<T>) reader.getReturnedClass().asSubclass( Enum.class );
 		}
 
-		final JavaType<T> descriptor = typeConfiguration.getJavaTypeRegistry().getDescriptor( enumClass );
+		final JavaType<T> descriptor =
+				typeConfiguration.getJavaTypeRegistry()
+						.resolveDescriptor( enumClass );
 		enumJavaType = (EnumJavaType<T>) descriptor;
 
 		if ( parameters.containsKey( TYPE ) ) {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/RecordFieldEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/RecordFieldEntityTest.java
index b6967d6a89ab..9dc5fe84f7b8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/RecordFieldEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/data/RecordFieldEntityTest.java
@@ -3,6 +3,8 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.data;
+import jakarta.persistence.Table;
+
 
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
@@ -64,6 +66,7 @@ public void setFoo(String foo) {
 
 	@Entity
 	@Audited
+	@Table(name = "WithRecord")
 	static class WithRecord {
 		@Id
 		private Integer id;
@@ -86,6 +89,7 @@ static WithRecord of(int id, String foo, String bar) {
 
 	@Entity
 	@Audited
+	@Table(name = "WithoutRecord")
 	static class WithoutRecord {
 		@Id
 		private Integer id;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java
index 848fef82db34..5639c2e073d8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/generated/SimpleEntity.java
@@ -4,10 +4,10 @@
  */
 package org.hibernate.orm.test.envers.integration.generated;
 
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Generated;
 import org.hibernate.envers.Audited;
 
-import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
@@ -25,7 +25,7 @@ public class SimpleEntity {
 	private String data;
 
 	@Generated
-	@Column(columnDefinition = "integer default 1")
+	@ColumnDefault("1")
 	private int caseNumberInsert;
 
 	public Integer getId() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/dynamic/DefaultNamed.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/dynamic/DefaultNamed.java
new file mode 100644
index 000000000000..074ff0234b66
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/dynamic/DefaultNamed.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.integration.inheritance.single.dynamic;
+
+import org.hibernate.envers.Audited;
+
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+
+@Entity
+@Audited
+@DiscriminatorValue("not null")
+public class DefaultNamed extends Named {
+
+	protected DefaultNamed() {
+	}
+
+	protected DefaultNamed(String name, String type) {
+		super(name, type);
+	}
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/dynamic/DynamicDiscriminatorTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/dynamic/DynamicDiscriminatorTest.java
new file mode 100644
index 000000000000..041bce3fde5e
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/dynamic/DynamicDiscriminatorTest.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.integration.inheritance.single.dynamic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.type;
+
+import org.hibernate.envers.AuditReaderFactory;
+import org.hibernate.envers.query.AuditEntity;
+import org.hibernate.testing.envers.junit.EnversTest;
+import org.hibernate.testing.orm.junit.BeforeClassTemplate;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+@JiraKey(value = "HHH-20317")
+@EnversTest
+@Jpa(annotatedClasses = {
+		Named.class,
+		DefaultNamed.class
+})
+class DynamicDiscriminatorTest {
+
+	@BeforeClassTemplate
+	void initData(EntityManagerFactoryScope scope) {
+		var parent = new DefaultNamed( "Bob", "PERSON" );
+		parent.setDescription( "Test" );
+		scope.inTransaction( em -> em.persist( parent ) );
+	}
+
+	@Test
+	void testDiscriminatorOptionsAreReflected(EntityManagerFactoryScope scope) throws Exception {
+		scope.inTransaction( em -> {
+			var query = em.createQuery( "from Named where name=?1", Named.class );
+			query.setParameter( 1, "Bob" );
+
+			var result = query.getResultList();
+			assertThat( result ).hasSize( 1 ).element( 0 ).satisfies( named -> {
+				assertThat( named.getName() ).isEqualTo( "Bob" );
+				assertThat( named.getType() ).isEqualTo( "PERSON" );
+				assertThat( named ).isExactlyInstanceOf( DefaultNamed.class );
+			} );
+
+			result.get(0).setDescription( "Updated test" );
+		} );
+
+		scope.inTransaction( em -> {
+			var revisionReader = AuditReaderFactory.get( em );
+			var revisions = revisionReader.getRevisions( Named.class, "Bob" );
+
+			var result = revisionReader.createQuery().forEntitiesAtRevision( Named.class, revisions.get( 0 ) )
+					.add( AuditEntity.id().eq( "Bob" ) ).getSingleResult();
+
+			assertThat( result ).isExactlyInstanceOf( DefaultNamed.class ).asInstanceOf( type( DefaultNamed.class ) )
+					.satisfies( named -> {
+						assertThat( named.getType() ).isEqualTo( "PERSON" );
+						assertThat( named.getDescription() ).isEqualTo( "Test" );
+					} );
+		} );
+	}
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/dynamic/Named.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/dynamic/Named.java
new file mode 100644
index 000000000000..95c2ff8cc69d
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/inheritance/single/dynamic/Named.java
@@ -0,0 +1,61 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.integration.inheritance.single.dynamic;
+
+import static jakarta.persistence.InheritanceType.SINGLE_TABLE;
+
+import org.hibernate.annotations.DiscriminatorOptions;
+import org.hibernate.envers.Audited;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+
+@Entity
+@Audited
+@Inheritance(strategy = SINGLE_TABLE)
+@DiscriminatorColumn(name = "type")
+@DiscriminatorOptions(insert = false)
+public abstract class Named {
+
+	@Id
+	private final String name;
+
+	@Column
+	@Audited
+	private final String type;
+
+	@Column
+	@Audited
+	private String description;
+
+	protected Named() {
+		name = null;
+		type = null;
+	}
+
+	protected Named(String name, String type) {
+		this.name = name;
+		this.type = type;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByNotAuditedToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByNotAuditedToManyTest.java
new file mode 100644
index 000000000000..70558f85f7bc
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/MappedByNotAuditedToManyTest.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.integration.manytomany;
+
+import java.util.List;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.NotAudited;
+import org.hibernate.envers.boot.EnversMappingException;
+
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.util.ServiceRegistryUtil;
+import org.junit.Test;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
+@Jira("https://hibernate.atlassian.net/browse/HHH-19897")
+public class MappedByNotAuditedToManyTest {
+	@Test
+	public void testMappingException() {
+		final Configuration cfg = new Configuration().addAnnotatedClasses( ToManyParent.class, ToManyChild.class );
+		ServiceRegistryUtil.applySettings( cfg.getStandardServiceRegistryBuilder() );
+		final var enversMappingException = assertThrows(
+				"Expecting EnversMappingException to be thrown due to @NotAudited on owning side of bidirectional association",
+				EnversMappingException.class,
+				cfg::buildSessionFactory
+		);
+		assertThat( enversMappingException ).hasMessageContainingAll(
+				"Could not resolve mapped by property for association",
+				"parents"
+		);
+	}
+
+	@Entity(name = "ToOneEntity")
+	@Audited
+	static class ToManyParent {
+		@Id
+		private Long id;
+
+		private String parentData;
+
+		@ManyToMany
+		@NotAudited
+		private List<ToManyChild> children;
+	}
+
+	@Entity(name = "ToOneChild")
+	@Audited
+	static class ToManyChild {
+		@Id
+		private Long id;
+
+		private String childData;
+
+		@OneToMany(mappedBy = "children")
+		private List<ToManyParent> parents;
+	}
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java
index c61cdbd33474..46ba828a4b03 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/sametable/BasicSametable.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.manytomany.sametable;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.sql.Types;
 import java.util.Arrays;
@@ -29,6 +33,7 @@
  *
  * @author Adam Warski (adam at warski dot org)
  */
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTableWithoutPrimaryKey.class)
 @EnversTest
 @Jpa(annotatedClasses = {ParentEntity.class, Child1Entity.class, Child2Entity.class})
 public class BasicSametable {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/MappedByNotAuditedManyToOneTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/MappedByNotAuditedManyToOneTest.java
new file mode 100644
index 000000000000..db3483759407
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/bidirectional/MappedByNotAuditedManyToOneTest.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.integration.manytoone.bidirectional;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.NotAudited;
+import org.hibernate.envers.boot.EnversMappingException;
+
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.util.ServiceRegistryUtil;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
+@Jira("https://hibernate.atlassian.net/browse/HHH-19897")
+public class MappedByNotAuditedManyToOneTest {
+	@Test
+	public void testMappingException() {
+		final Configuration cfg = new Configuration().addAnnotatedClasses( ToOneParent.class, ToOneChild.class );
+		ServiceRegistryUtil.applySettings( cfg.getStandardServiceRegistryBuilder() );
+		final var enversMappingException = assertThrows(
+				"Expecting EnversMappingException to be thrown due to @NotAudited on owning side of bidirectional association",
+				EnversMappingException.class,
+				cfg::buildSessionFactory
+		);
+		assertThat( enversMappingException ).hasMessageContainingAll(
+				"Could not resolve mapped by property for association",
+				"parents"
+		);
+	}
+
+	@Entity(name = "ToOneEntity")
+	@Audited
+	static class ToOneParent {
+		@Id
+		private Long id;
+
+		private String parentData;
+
+		@ManyToOne
+		@NotAudited
+		private ToOneChild child;
+	}
+
+	@Entity(name = "ToOneChild")
+	@Audited
+	static class ToOneChild {
+		@Id
+		private Long id;
+
+		private String childData;
+
+		@OneToMany(mappedBy = "child")
+		private List<ToOneParent> parents;
+	}
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/metamodel/RevisionEntitiesMetamodelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/metamodel/RevisionEntitiesMetamodelTest.java
index 25468c8a084f..e2140ee69236 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/metamodel/RevisionEntitiesMetamodelTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/metamodel/RevisionEntitiesMetamodelTest.java
@@ -32,6 +32,7 @@
 
 import java.lang.invoke.MethodHandles;
 import java.time.Instant;
+import java.util.Locale;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -52,7 +53,8 @@ public void setUp() {
 		logger = Logger.getMessageLogger(
 				MethodHandles.lookup(),
 				CoreMessageLogger.class,
-				MetadataContext.class.getName()
+				MetadataContext.class.getName(),
+				Locale.ROOT
 		);
 		// HHH-17612 - Injecting the class_ type field fails
 		t1 = new TriggerOnPrefixLogListener( "HHH015007: Illegal argument on static metamodel field injection" );
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java
index 6c508eed22a4..367e6208a0e7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/HasChangedComponentMapKey.java
@@ -4,6 +4,8 @@
  */
 package org.hibernate.orm.test.envers.integration.modifiedflags;
 
+
+
 import java.util.List;
 
 import org.hibernate.envers.AuditReaderFactory;
@@ -16,6 +18,8 @@
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.Setting;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 
 import org.junit.jupiter.api.Test;
 
@@ -27,6 +31,7 @@
  * @author Adam Warski (adam at warski dot org)
  * @author Michal Skowronek (mskowr at o2 dot pl)
  */
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class)
 @Jpa(integrationSettings = @Setting(name = EnversSettings.GLOBAL_WITH_MODIFIED_FLAG, value = "true"),
 		annotatedClasses = {ComponentMapKeyEntity.class, ComponentTestEntity.class})
 public class HasChangedComponentMapKey extends AbstractModifiedFlagsEntityTest {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/MappedByNotAuditedOneToOneTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/MappedByNotAuditedOneToOneTest.java
new file mode 100644
index 000000000000..c819903c735b
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetoone/bidirectional/MappedByNotAuditedOneToOneTest.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.integration.onetoone.bidirectional;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.NotAudited;
+import org.hibernate.envers.boot.EnversMappingException;
+
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.util.ServiceRegistryUtil;
+import org.junit.Test;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
+
+@Jira("https://hibernate.atlassian.net/browse/HHH-19897")
+public class MappedByNotAuditedOneToOneTest {
+	@Test
+	public void testMappingException() {
+		final Configuration cfg = new Configuration().addAnnotatedClasses( ToOneParent.class, ToOneChild.class );
+		ServiceRegistryUtil.applySettings( cfg.getStandardServiceRegistryBuilder() );
+		final var enversMappingException = assertThrows(
+				"Expecting EnversMappingException to be thrown due to @NotAudited on owning side of bidirectional association",
+				EnversMappingException.class,
+				cfg::buildSessionFactory
+		);
+		assertThat( enversMappingException ).hasMessageContainingAll(
+				"Could not resolve mapped by property [child] for association",
+				"parent"
+		);
+	}
+
+	@Entity(name = "ToOneEntity")
+	@Audited
+	static class ToOneParent {
+		@Id
+		private Long id;
+
+		private String parentData;
+
+		@OneToOne
+		@NotAudited
+		private ToOneChild child;
+	}
+
+	@Entity(name = "ToOneChild")
+	@Audited
+	static class ToOneChild {
+		@Id
+		private Long id;
+
+		private String childData;
+
+		@OneToOne(mappedBy = "child")
+		private ToOneParent parent;
+	}
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java
index d58b6a42bdad..e3b90e1753e0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/CustomRevEntityQuery.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.query;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.util.List;
 
@@ -28,6 +32,8 @@
 		StrIntTestEntity.class,
 		CustomRevEntity.class
 })
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 public class CustomRevEntityQuery {
 	private Integer id1;
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedRelationTargetNotFoundActionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedRelationTargetNotFoundActionTest.java
new file mode 100644
index 000000000000..227ac845b723
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/NotAuditedRelationTargetNotFoundActionTest.java
@@ -0,0 +1,255 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.integration.query;
+
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import org.hibernate.envers.AuditReaderFactory;
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.RelationTargetAuditMode;
+import org.hibernate.envers.RelationTargetNotFoundAction;
+import org.hibernate.testing.envers.junit.EnversTest;
+import org.hibernate.testing.orm.junit.BeforeClassTemplate;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * Tests that {@link org.hibernate.envers.RelationTargetNotFoundAction} works correctly when combined with
+ * {@link RelationTargetAuditMode#NOT_AUDITED}. When the target entity is deleted, the behavior depends on
+ * the configured action: ERROR throws {@link jakarta.persistence.EntityNotFoundException}, while IGNORE
+ * returns null.
+ *
+ * To allow deletion of Child entities without foreign key constraint violations, the relationship uses
+ * {@link jakarta.persistence.ConstraintMode#NO_CONSTRAINT} to prevent database foreign key creation.
+ *
+ * @author Minjae Seon
+ */
+@JiraKey(value = "HHH-19861")
+@Jpa(annotatedClasses = {
+		NotAuditedRelationTargetNotFoundActionTest.ParentWithError.class,
+		NotAuditedRelationTargetNotFoundActionTest.ParentWithIgnore.class,
+		NotAuditedRelationTargetNotFoundActionTest.Child.class
+})
+@EnversTest
+public class NotAuditedRelationTargetNotFoundActionTest {
+	private Long childForErrorId;
+	private Long childForIgnoreId;
+	private Long parentWithErrorId;
+	private Long parentWithIgnoreId;
+
+	@Entity(name = "Child")
+	@Audited
+	public static class Child {
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String name;
+
+		public Child() {
+		}
+
+		public Child(String name) {
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	@Entity(name = "ParentWithError")
+	@Audited
+	public static class ParentWithError {
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String content;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@JoinColumn(name = "child_id", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+		@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED, targetNotFoundAction = RelationTargetNotFoundAction.ERROR)
+		private Child child;
+
+		public ParentWithError() {
+		}
+
+		public ParentWithError(String content, Child child) {
+			this.content = content;
+			this.child = child;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getContent() {
+			return content;
+		}
+
+		public void setContent(String content) {
+			this.content = content;
+		}
+
+		public Child getChild() {
+			return child;
+		}
+
+		public void setChild(Child child) {
+			this.child = child;
+		}
+	}
+
+	@Entity(name = "ParentWithIgnore")
+	@Audited
+	public static class ParentWithIgnore {
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String content;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@JoinColumn(name = "child_id", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+		@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED, targetNotFoundAction = RelationTargetNotFoundAction.IGNORE)
+		private Child child;
+
+		public ParentWithIgnore() {
+		}
+
+		public ParentWithIgnore(String content, Child child) {
+			this.content = content;
+			this.child = child;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getContent() {
+			return content;
+		}
+
+		public void setContent(String content) {
+			this.content = content;
+		}
+
+		public Child getChild() {
+			return child;
+		}
+
+		public void setChild(Child child) {
+			this.child = child;
+		}
+	}
+
+	@BeforeClassTemplate
+	public void initData(EntityManagerFactoryScope scope) {
+		// Revision 1: Create children and parents
+		scope.inTransaction( em -> {
+			final Child childForError = new Child( "Child for Error" );
+			em.persist( childForError );
+
+			final Child childForIgnore = new Child( "Child for Ignore" );
+			em.persist( childForIgnore );
+
+			final ParentWithError parentWithError = new ParentWithError( "Initial content with error", childForError );
+			em.persist( parentWithError );
+
+			final ParentWithIgnore parentWithIgnore = new ParentWithIgnore( "Initial content with ignore", childForIgnore );
+			em.persist( parentWithIgnore );
+
+			this.childForErrorId = childForError.getId();
+			this.childForIgnoreId = childForIgnore.getId();
+			this.parentWithErrorId = parentWithError.getId();
+			this.parentWithIgnoreId = parentWithIgnore.getId();
+		});
+	}
+
+	@Test
+	public void testLoadParentWithErrorAfterChildDeleted(EntityManagerFactoryScope scope) {
+		// Delete the child entity that ParentWithError references
+		scope.inTransaction( em -> {
+			final Child childForError = em.find( Child.class, this.childForErrorId );
+			em.remove( childForError );
+		});
+
+		// Try to load parent's audit history with ERROR action
+		// This should throw EntityNotFoundException
+		scope.inTransaction( em -> {
+			final ParentWithError parent = AuditReaderFactory.get( em ).find( ParentWithError.class, this.parentWithErrorId, 1 );
+
+			assertNotNull( parent );
+			assertEquals( "Initial content with error", parent.getContent() );
+
+			// Try to access the child - should throw EntityNotFoundException
+			try {
+				Child childRef = parent.getChild();
+				// Access a property to trigger lazy loading
+				childRef.getName();
+				fail( "Should have thrown EntityNotFoundException" );
+			}
+			catch ( EntityNotFoundException e ) {
+				// Expected behavior
+			}
+		});
+	}
+
+	@Test
+	public void testLoadParentWithIgnoreAfterChildDeleted(EntityManagerFactoryScope scope) {
+		// Delete the child entity that ParentWithIgnore references
+		scope.inTransaction( em -> {
+			final Child childForIgnore = em.find( Child.class, this.childForIgnoreId );
+			em.remove( childForIgnore );
+		});
+
+		// Try to load parent's audit history with IGNORE action
+		// This should not throw EntityNotFoundException and return null
+		scope.inTransaction( em -> {
+			final ParentWithIgnore parent = AuditReaderFactory.get( em ).find( ParentWithIgnore.class, this.parentWithIgnoreId, 1 );
+			assertNotNull( parent );
+			assertEquals( "Initial content with ignore", parent.getContent() );
+
+			// Try to access the child - should return null
+			Child childRef = parent.getChild();
+			assertNull( childRef );
+		});
+	}
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RelationTargetNotAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RelationTargetNotAuditedTest.java
new file mode 100644
index 000000000000..29f43fc42095
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/RelationTargetNotAuditedTest.java
@@ -0,0 +1,199 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.integration.query;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import org.hibernate.envers.AuditReaderFactory;
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.RelationTargetAuditMode;
+import org.hibernate.testing.envers.junit.EnversTest;
+import org.hibernate.testing.orm.junit.BeforeClassTemplate;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * Tests that {@link RelationTargetAuditMode#NOT_AUDITED} works correctly when loading audit history.
+ * When a relation is marked with NOT_AUDITED mode, the target entity is loaded from the current
+ * table rather than from audit tables, so changes to the target entity are visible when querying
+ * historical revisions.
+ *
+ * @author Minjae Seon
+ */
+@JiraKey(value = "HHH-19861")
+@Jpa(annotatedClasses = {
+		RelationTargetNotAuditedTest.Parent.class,
+		RelationTargetNotAuditedTest.Child.class
+})
+@EnversTest
+public class RelationTargetNotAuditedTest {
+	private Long childId;
+	private Long parentId;
+
+	@Entity(name = "Child")
+	@Audited
+	public static class Child {
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String name;
+
+		public Child() {
+		}
+
+		public Child(String name) {
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	@Entity(name = "Parent")
+	@Audited
+	public static class Parent {
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		private String content;
+
+		@ManyToOne(fetch = FetchType.LAZY)
+		@Audited(targetAuditMode = RelationTargetAuditMode.NOT_AUDITED)
+		private Child child;
+
+		public Parent() {
+		}
+
+		public Parent(String content, Child child) {
+			this.content = content;
+			this.child = child;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getContent() {
+			return content;
+		}
+
+		public void setContent(String content) {
+			this.content = content;
+		}
+
+		public Child getChild() {
+			return child;
+		}
+
+		public void setChild(Child child) {
+			this.child = child;
+		}
+	}
+
+	@BeforeClassTemplate
+	public void initData(EntityManagerFactoryScope scope) {
+		// Revision 1: Create child and parent
+		scope.inTransaction( em -> {
+			final Child child = new Child( "Child 1" );
+			em.persist( child );
+
+			final Parent parent = new Parent( "Initial content", child );
+			em.persist( parent );
+
+
+			this.childId = child.getId();
+			this.parentId = parent.getId();
+		});
+
+		// Revision 2: Update parent content
+		scope.inTransaction( em -> {
+			final Parent parent = em.find( Parent.class, this.parentId );
+			parent.setContent( "Updated content" );
+		});
+
+		// Revision 3: Update child name (should not create audit record for parent)
+		scope.inTransaction( em -> {
+			final Child child = em.find( Child.class, this.childId );
+			child.setName( "Child 1 Updated" );
+		});
+	}
+
+	@Test
+	public void testLoadParentAtRevision1(EntityManagerFactoryScope scope) {
+		scope.inEntityManager( em -> {
+			final Parent parent = AuditReaderFactory.get( em ).find( Parent.class, this.parentId, 1 );
+
+			assertNotNull( parent );
+			assertEquals( "Initial content", parent.getContent() );
+			assertNotNull( parent.getChild() );
+			assertEquals( this.childId, parent.getChild().getId() );
+			// Child should be loaded from current table, so it should have the updated name
+			assertEquals( "Child 1 Updated", parent.getChild().getName() );
+		});
+	}
+
+	@Test
+	public void testLoadParentAtRevision2(EntityManagerFactoryScope scope) {
+		scope.inEntityManager( em -> {
+			final Parent parent = AuditReaderFactory.get( em ).find( Parent.class, this.parentId, 2 );
+
+			assertNotNull( parent );
+			assertEquals( "Updated content", parent.getContent() );
+			assertNotNull( parent.getChild() );
+			assertEquals( childId, parent.getChild().getId() );
+			// Child should be loaded from current table
+			assertEquals( "Child 1 Updated", parent.getChild().getName() );
+		});
+	}
+
+	@Test
+	public void testQueryParentRevisions(EntityManagerFactoryScope scope) {
+		scope.inEntityManager( em -> {
+			final List<Number> revisions = AuditReaderFactory.get( em ).getRevisions( Parent.class, this.parentId );
+
+			// Parent should have 2 revisions (creation and update)
+			assertEquals( 2, revisions.size() );
+		});
+	}
+
+	@Test
+	public void testQueryChildRevisions(EntityManagerFactoryScope scope) {
+		scope.inEntityManager( em -> {
+			final List<Number> revisions = AuditReaderFactory.get( em ).getRevisions( Child.class, this.childId );
+
+			// Child should have 2 revisions (creation and update)
+			assertEquals( 2, revisions.size() );
+		});
+	}
+}
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java
index 0e96a397625f..9fae1fec19d8 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Custom.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -30,6 +34,8 @@
 /**
  * @author Adam Warski (adam at warski dot org)
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, CustomRevEntity.class})
 public class Custom {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java
index a308f8f9e6a5..d8c51c5aec11 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomBoxed.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.util.Arrays;
 import java.util.Date;
@@ -27,6 +31,8 @@
 /**
  * @author Adam Warski (adam at warski dot org)
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, CustomBoxedRevEntity.class})
 public class CustomBoxed {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java
index 36da72508820..5ea934e548f2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomColumnMapping.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.util.Arrays;
 import java.util.Date;
@@ -28,6 +32,8 @@
  *
  * @author Adam Warski (adam at warski dot org)
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, CustomRevEntityColumnMapping.class})
 public class CustomColumnMapping {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java
index 436bcc23b29b..f303b7a48731 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomDate.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.util.Arrays;
 import java.util.Date;
@@ -27,6 +31,8 @@
 /**
  * @author Adam Warski (adam at warski dot org)
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, CustomDateRevEntity.class})
 public class CustomDate {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomInstantRevEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomInstantRevEntityTest.java
index 5fd13fe7ffc5..1f64afe1e3a2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomInstantRevEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomInstantRevEntityTest.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.time.Instant;
 import java.util.Arrays;
@@ -27,6 +31,8 @@
 /**
  * @author Chris Cranford
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, CustomInstantRevEntity.class})
 public class CustomInstantRevEntityTest {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java
index abb95cf6acd3..ec9d14a9c11b 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomNoListener.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.util.Arrays;
 
@@ -21,6 +25,8 @@
 /**
  * @author Adam Warski (adam at warski dot org)
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, CustomDataRevEntity.class})
 public class CustomNoListener {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java
index e6c0c7239803..8d79bb62cce2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/CustomPropertyAccess.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.util.Arrays;
 import java.util.Date;
@@ -27,6 +31,8 @@
 /**
  * @author Adam Warski (adam at warski dot org)
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, CustomPropertyAccessRevEntity.class})
 public class CustomPropertyAccess {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java
index fea9df347cc6..7ba40e91370e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/Listener.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.util.Arrays;
 import java.util.Date;
@@ -27,6 +31,8 @@
 /**
  * @author Adam Warski (adam at warski dot org)
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, ListenerRevEntity.class})
 public class Listener {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java
index 862879bcdc1a..e2b4dd41e56a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LocalDateTimeTest.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -29,6 +33,8 @@
  * @author Chris Cranford
  */
 @JiraKey(value = "HHH-10496")
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, CustomLocalDateTimeRevEntity.class})
 public class LocalDateTimeTest {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java
index 681965585601..4b6cd1c76bab 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/LongRevNumber.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -23,6 +27,8 @@
 /**
  * @author Adam Warski (adam at warski dot org)
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, LongRevNumberRevEntity.class})
 public class LongRevNumber {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java
index 553de2f7842d..95410391147c 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/RevisionNumberOverflowTest.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -43,6 +47,8 @@
  * @author Chris Cranford
  */
 @JiraKey(value = "HHH-6615")
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {StrTestEntity.class, RevisionNumberOverflowTest.CustomCappedRevEntity.class})
 public class RevisionNumberOverflowTest {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java
index 3a0119af0466..3106a041bbc0 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import org.hibernate.envers.ModifiedEntityNames;
 import org.hibernate.envers.configuration.EnversSettings;
@@ -20,6 +24,8 @@
  *
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @DomainModel(annotatedClasses = {StrTestEntity.class, StrIntTestEntity.class, AnnotatedTrackingRevisionEntity.class})
 @ServiceRegistry(settings = @Setting(name = EnversSettings.TRACK_ENTITIES_CHANGED_IN_REVISION, value = "false"))
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java
index 32d1dccce39c..feb89ec1a983 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.envers.EntityTrackingRevisionListener;
@@ -31,6 +35,8 @@
  *
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
+// TableGenerator uses a separate transaction to allocate identifiers, requiring concurrent transactions.
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsConcurrentTransactions.class)
 @EnversTest
 @Jpa(annotatedClasses = {
 		ModifiedEntityTypeEntity.class,
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java
index 0bb7917bcf17..d45786f30232 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java
@@ -3,6 +3,11 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
+
+import org.hibernate.testing.orm.junit.SkipForDialect;
+
 
 import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.envers.CrossTypeRevisionChangesReader;
@@ -38,6 +43,8 @@
  *
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
+@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner uses bit-reversed sequences which break assumptions")
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner uses bit-reversed sequences which break assumptions")
 @EnversTest
 @DomainModel(annotatedClasses = {StrTestEntity.class, StrIntTestEntity.class})
 @ServiceRegistry(settings = @Setting(name = EnversSettings.TRACK_ENTITIES_CHANGED_IN_REVISION, value = "true"))
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java
index ef2bc0d7c051..b7695c28338a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java
@@ -3,6 +3,11 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.reventity.trackmodifiedentities;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
+import org.hibernate.dialect.SpannerDialect;
+
+import org.hibernate.testing.orm.junit.SkipForDialect;
+
 
 import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity;
@@ -26,6 +31,8 @@
  *
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */
+@SkipForDialect(dialectClass = SpannerPostgreSQLDialect.class, reason = "Spanner uses bit-reversed sequences which break assumptions")
+@SkipForDialect(dialectClass = SpannerDialect.class, reason = "Spanner uses bit-reversed sequences which break assumptions")
 @EnversTest
 @DomainModel(annotatedClasses = {StrTestEntity.class, StrIntTestEntity.class, ExtendedRevisionEntity.class})
 @ServiceRegistry(settings = @Setting(name = EnversSettings.TRACK_ENTITIES_CHANGED_IN_REVISION, value = "false"))
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java
index d20c35202068..72c323a18482 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/RevisionEndTimestampTypeTest.java
@@ -20,7 +20,7 @@
 import org.hibernate.type.BasicType;
 import org.junit.jupiter.api.Test;
 
-import java.sql.Timestamp;
+import java.util.Date;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -46,6 +46,6 @@ public void testRevisionEndTimestampIsLongType(DomainModelScope scope) {
 
 		final Property property = clazz.getProperty("REVEND_TSTMP");
 		assertInstanceOf(BasicType.class, property.getType());
-		assertEquals(Timestamp.class, ((BasicType) property.getType()).getJavaType());
+		assertEquals(Date.class, ((BasicType<?>) property.getType()).getJavaType());
 	}
 }
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java
index 589bcf6b8137..2c7e535489f2 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import java.sql.Types;
 import java.util.Arrays;
@@ -41,6 +45,7 @@
  *
  * @author Erik-Berndt Scheper
  */
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTableWithoutPrimaryKey.class)
 @EnversTest(auditStrategies = ValidityAuditStrategy.class)
 @Jpa(
 		annotatedClasses = {
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java
index 4e9996d3c749..79562e74993d 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/strategy/ValidityAuditStrategyRevEndTsTest.java
@@ -3,6 +3,10 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.envers.integration.strategy;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.Query;
@@ -44,6 +48,7 @@
  *
  * @author Erik-Berndt Scheper
  */
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsTableWithoutPrimaryKey.class)
 @EnversTest(auditStrategies = ValidityAuditStrategy.class)
 @Jpa(
 		annotatedClasses = {ParentEntity.class, Child1Entity.class, Child2Entity.class},
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/stateless/CollectionStatelessSessionTests.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/stateless/CollectionStatelessSessionTests.java
new file mode 100644
index 000000000000..404912aad675
--- /dev/null
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/stateless/CollectionStatelessSessionTests.java
@@ -0,0 +1,78 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.envers.stateless;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.envers.Audited;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+@DomainModel(annotatedClasses = {
+		// mappings
+		CollectionStatelessSessionTests.EntityA.class, CollectionStatelessSessionTests.EntityB.class, CollectionStatelessSessionTests.EntityC.class},
+		xmlMappings = {})
+@ServiceRegistry(settings = {
+		// For your own convenience to see generated queries:
+		@Setting(name = AvailableSettings.SHOW_SQL, value = "true"),
+		@Setting(name = AvailableSettings.FORMAT_SQL, value = "true")})
+@SessionFactory
+public class CollectionStatelessSessionTests {
+
+	@Test
+	@Jira("https://hibernate.atlassian.net/browse/HHH-19818")
+	void statelessInsert(SessionFactoryScope scope) throws Exception {
+		scope.inStatelessTransaction( action -> {
+			action.insert( new EntityA() );
+		} );
+	}
+
+	@Entity(name = "ENTITY_A")
+	@Table(name = "ENTITY_A")
+	public static class EntityA {
+		@Id
+		@GeneratedValue(strategy = GenerationType.AUTO)
+		@Column(name = "ID")
+		Integer id;
+
+		@OneToMany
+		@JoinColumn(name = "ENTITY_A")
+		Collection<EntityB> children = new ArrayList<>();
+	}
+
+	@Entity(name = "ENTITY_B")
+	@Table(name = "ENTITY_B")
+	public static class EntityB {
+		@Id
+		@GeneratedValue(strategy = GenerationType.AUTO)
+		@Column(name = "ID")
+		Integer id;
+	}
+
+	@Entity(name = "ENTITY_C")
+	@Audited
+	@Table(name = "ENTITY_C")
+	public static class EntityC {
+		@Id
+		@GeneratedValue(strategy = GenerationType.AUTO)
+		@Column(name = "ID")
+		Integer id;
+	}
+}
diff --git a/hibernate-envers/src/test/resources/hibernate.properties b/hibernate-envers/src/test/resources/hibernate.properties
index bbb68aa7e4a2..9118642f4213 100644
--- a/hibernate-envers/src/test/resources/hibernate.properties
+++ b/hibernate-envers/src/test/resources/hibernate.properties
@@ -26,3 +26,6 @@ hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFa
 hibernate.service.allow_crawling=false
 ## make sure we use bag semantics for "implicit" List mappings
 hibernate.mapping.default_list_semantics=bag
+
+# This flag is indented for testing. This option should not be enabled in production
+hibernate.dialect.spanner.use_integer_for_primary_key=true
diff --git a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java
index 8f6625a0278a..00f4fd93735d 100644
--- a/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java
+++ b/hibernate-graalvm/src/main/java/org/hibernate/graalvm/internal/StaticClassLists.java
@@ -15,7 +15,7 @@
  */
 final class StaticClassLists {
 
-	public static Class[] typesNeedingAllConstructorsAccessible() {
+	public static Class<?>[] typesNeedingAllConstructorsAccessible() {
 		return new Class[] {
 				//The CoreMessageLogger is sometimes looked up without it necessarily being a field, so we're
 				//not processing it the same way as other Logger lookups.
@@ -28,7 +28,7 @@ public static Class[] typesNeedingAllConstructorsAccessible() {
 		};
 	}
 
-	public static Class[] typesNeedingDefaultConstructorAccessible() {
+	public static Class<?>[] typesNeedingDefaultConstructorAccessible() {
 		return new Class[] {
 				//Various well known needs:
 				org.hibernate.resource.transaction.backend.jdbc.internal.JdbcResourceLocalTransactionCoordinatorBuilderImpl.class,
@@ -39,7 +39,7 @@ public static Class[] typesNeedingDefaultConstructorAccessible() {
 		};
 	}
 
-	public static Class[] typesNeedingArrayCopy() {
+	public static Class<?>[] typesNeedingArrayCopy() {
 		return new Class[] {
 				//Eventlisteners need to be registered for reflection to allow creation via Array#newInstance ;
 				// types need to be in synch with those declared in org.hibernate.event.spi.EventType
diff --git a/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/StaticClassListsTest.java b/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/StaticClassListsTest.java
index d8f41a81f9a3..eaf13c835d53 100644
--- a/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/StaticClassListsTest.java
+++ b/hibernate-graalvm/src/test/java/org/hibernate/graalvm/internal/StaticClassListsTest.java
@@ -7,9 +7,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hibernate.graalvm.internal.JandexTestUtils.findConcreteNamedImplementors;
 
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -35,7 +32,7 @@ public class StaticClassListsTest {
 	private static Index hibernateIndex;
 
 	@BeforeAll
-	public static void index() throws IOException {
+	public static void index() {
 		hibernateIndex = JandexTestUtils.indexJar( Session.class );
 	}
 
@@ -178,15 +175,16 @@ enum TypesNeedingArrayCopy_Category {
 		EVENT_LISTENER_INTERFACES {
 			@Override
 			Stream<Class<?>> classes() {
-				return EventType.values().stream().map( EventType::baseListenerInterface )
-						.map( c -> Array.newInstance( c, 0 ).getClass() );
+				return EventType.values().stream()
+						.map( EventType::baseListenerInterface )
+						.map( Class::arrayType );
 			}
 		},
 		MISC {
 			@Override
 			Stream<Class<?>> classes() {
 				// NOTE: Please avoid putting anything here, it's really a last resort.
-				// Ideally you'd rather add new categories with their own way of listing classes,
+				// Ideally, you'd rather add new categories with their own way of listing classes,
 				// like in EVENT_LISTENER_INTERFACES.
 				// Putting anything here is running the risk of forgetting
 				// why it was necessary in the first place...
@@ -204,9 +202,9 @@ class BasicConstructorsAvailable {
 
 		@Test
 		void checkNonDefaultConstructorsCanBeLoaded() {
-			Class[] classes = StaticClassLists.typesNeedingAllConstructorsAccessible();
-			for ( Class c : classes ) {
-				Constructor[] declaredConstructors = c.getDeclaredConstructors();
+			var classes = StaticClassLists.typesNeedingAllConstructorsAccessible();
+			for ( var c : classes ) {
+				var declaredConstructors = c.getDeclaredConstructors();
 				Assert.assertTrue( declaredConstructors.length > 0 );
 				if ( declaredConstructors.length == 1 ) {
 					//If there's only one, let's check that this class wasn't placed in the wrong cathegory:
@@ -217,19 +215,19 @@ void checkNonDefaultConstructorsCanBeLoaded() {
 
 		@Test
 		void checkDefaultConstructorsAreAvailable() {
-			Class[] classes = StaticClassLists.typesNeedingDefaultConstructorAccessible();
-			for ( Class c : classes ) {
-				Constructor constructor = ReflectHelper.getDefaultConstructor( c );
+			var classes = StaticClassLists.typesNeedingDefaultConstructorAccessible();
+			for ( var c : classes ) {
+				var constructor = ReflectHelper.getDefaultConstructor( c );
 				Assert.assertNotNull( "Failed for class: " + c.getName(), constructor );
 			}
 		}
 
 		@Test
 		public void checkArraysAreArrays() {
-			Class[] classes = StaticClassLists.typesNeedingArrayCopy();
-			for ( Class c : classes ) {
+			var classes = StaticClassLists.typesNeedingArrayCopy();
+			for ( var c : classes ) {
 				Assert.assertTrue( "Wrong category for type: " + c.getName(), c.isArray() );
-				Constructor[] constructors = c.getConstructors();
+				var constructors = c.getConstructors();
 				Assert.assertEquals( 0, constructors.length );
 			}
 		}
diff --git a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java
index 00f7b24468a1..3b7ce2be237a 100644
--- a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java
+++ b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java
@@ -23,6 +23,7 @@
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 
+import static org.hibernate.cfg.JdbcSettings.LOGIN_TIMEOUT;
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationNiceName;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getCatalog;
 import static org.hibernate.engine.jdbc.connections.internal.DatabaseConnectionInfoImpl.getDriverName;
@@ -34,6 +35,7 @@
 import static org.hibernate.hikaricp.internal.HikariConfigurationUtil.loadConfiguration;
 import static org.hibernate.internal.log.ConnectionInfoLogger.CONNECTION_INFO_LOGGER;
 import static org.hibernate.internal.util.StringHelper.isBlank;
+import static org.hibernate.internal.util.config.ConfigurationHelper.getInteger;
 
 /**
  * {@link ConnectionProvider} based on HikariCP connection pool.
@@ -70,6 +72,10 @@ public void configure(Map<String, Object> configuration) throws HibernateExcepti
 			CONNECTION_INFO_LOGGER.configureConnectionPool( "HikariCP" );
 			hikariConfig = loadConfiguration( configuration );
 			hikariDataSource = new HikariDataSource( hikariConfig );
+			final Integer loginTimeout = getInteger( LOGIN_TIMEOUT, configuration );
+			if ( loginTimeout != null ) {
+				hikariDataSource.setLoginTimeout( loginTimeout );
+			}
 		}
 		catch (Exception e) {
 			CONNECTION_INFO_LOGGER.unableToInstantiateConnectionPool( e );
diff --git a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariConfigurationUtil.java b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariConfigurationUtil.java
index 2a2774523c04..d75906cd4e24 100644
--- a/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariConfigurationUtil.java
+++ b/hibernate-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariConfigurationUtil.java
@@ -9,11 +9,12 @@
 
 import org.hibernate.cfg.HikariCPSettings;
 import org.hibernate.cfg.JdbcSettings;
-import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
 
 import com.zaxxer.hikari.HikariConfig;
 
 import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.consumeSetting;
+import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.extractIsolation;
+import static org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator.toIsolationConnectionConstantName;
 
 /**
  * Utility class to map Hibernate properties to HikariCP configuration properties.
@@ -32,7 +33,7 @@ public class HikariConfigurationUtil {
 	 * @return a HikariConfig
 	 */
 	public static HikariConfig loadConfiguration(Map<String,Object> properties) {
-		final Properties hikariProps = new Properties();
+		final var hikariProps = new Properties();
 		copyProperty( JdbcSettings.AUTOCOMMIT, properties, "autoCommit", hikariProps );
 
 		copyProperty( JdbcSettings.POOL_SIZE, properties, "maximumPoolSize", hikariProps );
@@ -78,7 +79,8 @@ public static HikariConfig loadConfiguration(Map<String,Object> properties) {
 		for ( var entry : properties.entrySet() ) {
 			final String key = entry.getKey();
 			if ( key.startsWith( CONFIG_PREFIX ) ) {
-				hikariProps.setProperty( key.substring( CONFIG_PREFIX.length() ), entry.getValue().toString() );
+				hikariProps.setProperty( key.substring( CONFIG_PREFIX.length() ),
+						entry.getValue().toString() );
 			}
 		}
 
@@ -100,10 +102,10 @@ private static void copyProperty(Map<String,Object> src, String dstKey, Properti
 	}
 
 	private static void copyIsolationSetting(Map<String,Object> props, Properties hikariProps) {
-		final Integer isolation = ConnectionProviderInitiator.extractIsolation( props );
+		final Integer isolation = extractIsolation( props );
 		if ( isolation != null ) {
 			hikariProps.put( "transactionIsolation",
-					ConnectionProviderInitiator.toIsolationConnectionConstantName( isolation ) );
+					toIsolationConnectionConstantName( isolation ) );
 		}
 	}
 
diff --git a/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle b/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle
index 57203b29a176..2270ec5e5860 100644
--- a/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle
+++ b/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle
@@ -7,11 +7,6 @@ plugins {
 	id "local.java-module"
 }
 
-def skipJacoco = project.hasProperty('skipJacoco') ? project.getProperty('skipJacoco').toBoolean() : false
-if (!skipJacoco) {
-	plugins.apply('jacoco')
-}
-
 description = 'Integration tests for running Hibernate ORM in the Java module path'
 
 // See https://docs.gradle.org/6.7.1/userguide/java_testing.html#blackbox_integration_testing
@@ -36,3 +31,13 @@ test {
 	useJUnitPlatform()
 }
 
+tasks.withType(JavaCompile).configureEach {
+    // NOTE: we override the compiler args here since we don't want to include
+    //  the `--limit-modules` defined in the `local.java-module`.
+    //  This module is specific to module path testing and we require much much more than what's
+    //  defined in the `local.java-module` (e.g. we need JPA or ORM modules as well as things like logging etc.)
+    //
+    //  We also are dropping the JBoss logging arg from the list since the tests do not have loggers that require
+    //  impl generation.
+    options.compilerArgs = [ ]
+}
diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheAccessImpl.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheAccessImpl.java
index d2a6705ec7c5..6efe2c643915 100644
--- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheAccessImpl.java
+++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/internal/JCacheAccessImpl.java
@@ -14,15 +14,14 @@
  *
  * @author Steve Ebersole
  */
-@SuppressWarnings("unchecked")
 public class JCacheAccessImpl implements DomainDataStorageAccess {
-	private final Cache underlyingCache;
+	private final Cache<Object,Object> underlyingCache;
 
-	public JCacheAccessImpl(Cache underlyingCache) {
+	public JCacheAccessImpl(Cache<Object,Object> underlyingCache) {
 		this.underlyingCache = underlyingCache;
 	}
 
-	public Cache getUnderlyingCache() {
+	public Cache<Object,Object> getUnderlyingCache() {
 		return underlyingCache;
 	}
 
diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java
index 1b7296610fce..f02620cd7d92 100644
--- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java
+++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java
@@ -24,6 +24,8 @@
 import org.hibernate.stat.Statistics;
 
 import org.hibernate.testing.orm.junit.ExtraAssertions;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -195,6 +197,7 @@ public void testStaleWritesLeaveCacheConsistent() {
 	}
 
 	@Test
+	@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsPrimaryKeyUpdate.class)
 	public void testGeneralUsage() {
 		EventManager mgr = new EventManager( sessionFactory() );
 		Statistics stats = sessionFactory().getStatistics();
diff --git a/hibernate-jcache/src/test/resources/hibernate.properties b/hibernate-jcache/src/test/resources/hibernate.properties
index 4ee0e72dd66d..f8d983366a5e 100644
--- a/hibernate-jcache/src/test/resources/hibernate.properties
+++ b/hibernate-jcache/src/test/resources/hibernate.properties
@@ -15,3 +15,6 @@ hibernate.connection.pool_size 2
 hibernate.cache.region_prefix hibernate.test
 
 hibernate.service.allow_crawling=false
+
+# This flag is intended for testing. This option should not be enabled in production
+hibernate.dialect.spanner.use_integer_for_primary_key=true
diff --git a/hibernate-platform/hibernate-platform.gradle b/hibernate-platform/hibernate-platform.gradle
index e77740259bf9..eff4a8eb727c 100644
--- a/hibernate-platform/hibernate-platform.gradle
+++ b/hibernate-platform/hibernate-platform.gradle
@@ -9,28 +9,54 @@ description = 'Platform (BOM) for Hibernate ORM dependencies'
 dependencies {
     constraints {
         api project( ":hibernate-core" )
+        api "org.hibernate:hibernate-core:$version"
         api project( ":hibernate-testing" )
+        api "org.hibernate:hibernate-testing:$version"
 
         api project( ":hibernate-envers" )
+        api "org.hibernate:hibernate-envers:$version"
         api project( ":hibernate-spatial" )
+        api "org.hibernate:hibernate-spatial:$version"
         api project( ":hibernate-vector" )
+        api "org.hibernate:hibernate-vector:$version"
 
         api project( ":hibernate-community-dialects" )
+        api "org.hibernate:hibernate-community-dialects:$version"
         api project( ":hibernate-scan-jandex" )
 
         api project( ":hibernate-agroal" )
+        api "org.hibernate:hibernate-agroal:$version"
         api project( ":hibernate-c3p0" )
+        api "org.hibernate:hibernate-c3p0:$version"
         api project( ":hibernate-hikaricp" )
+        api "org.hibernate:hibernate-hikaricp:$version"
 
         api project( ":hibernate-jcache" )
+        api "org.hibernate:hibernate-jcache:$version"
 
         api project( ":hibernate-micrometer" )
+        api "org.hibernate:hibernate-micrometer:$version"
         api project( ":hibernate-graalvm")
+        api "org.hibernate:hibernate-graalvm:$version"
 
         api project( ":hibernate-processor" )
+        api "org.hibernate:hibernate-processor:$version"
         api project( ":hibernate-gradle-plugin" )
         api project( ":hibernate-maven-plugin" )
         api project( ":hibernate-ant" )
+        api "org.hibernate:hibernate-ant:$version"
+
+        api project( ":hibernate-assistant" )
+        api "org.hibernate:hibernate-assistant:$version"
+
+        api project( ":hibernate-reveng" )
+        api "org.hibernate:hibernate-reveng:$version"
+
+        // Not all JDK implementations support JFR
+        if ( "OpenJDK Runtime Environment".equals( System.getProperty( "java.runtime.name" ) ) ) {
+            api project(":hibernate-jfr")
+            api "org.hibernate:hibernate-jfr:$version"
+        }
 
         api libs.hibernateModels
 
@@ -43,7 +69,6 @@ dependencies {
         runtime libs.byteBuddy
         runtime libs.byteBuddyAgent
         runtime libs.jandex
-        runtime libs.classmate
 
         runtime jakartaLibs.jaxb
         runtime jakartaLibs.jaxbApi
@@ -66,8 +91,8 @@ dependencies {
 
 
 tasks.register("releasePrepare") {
-    group "release-prepare"
-    description "See :release:releasePrepare for details."
+    group = "release-prepare"
+    description = "See :release:releasePrepare for details."
 
     dependsOn tasks.generateMetadataFileForPublishedArtifactsPublication
     dependsOn tasks.generatePomFileForPublishedArtifactsPublication
diff --git a/hibernate-spatial/hibernate-spatial.gradle b/hibernate-spatial/hibernate-spatial.gradle
index 6c621b3a76fd..4787c2ae90f6 100644
--- a/hibernate-spatial/hibernate-spatial.gradle
+++ b/hibernate-spatial/hibernate-spatial.gradle
@@ -22,7 +22,6 @@ dependencies {
 
 	testImplementation jakartaLibs.validation
 	testImplementation libs.jandex
-	testImplementation libs.classmate
 	testImplementation testLibs.validator
 	testImplementation 'org.dom4j:dom4j:2.1.3@jar'
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java
index 7d218c37197b..0d4fe184eabb 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/HSMessageLogger.java
@@ -14,6 +14,7 @@
 import org.jboss.logging.annotations.ValidIdRange;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
@@ -34,7 +35,7 @@ public interface HSMessageLogger extends BasicLogger {
 
 	String LOGGER_NAME = "org.hibernate.spatial";
 
-	HSMessageLogger SPATIAL_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HSMessageLogger.class, LOGGER_NAME );
+	HSMessageLogger SPATIAL_MSG_LOGGER = Logger.getMessageLogger( MethodHandles.lookup(), HSMessageLogger.class, LOGGER_NAME, Locale.ROOT );
 
 	@LogMessage(level = INFO)
 	@Message(value = "Hibernate Spatial integration enabled: %s", id = 80000001)
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java
index 462b65719431..fe6eaf109637 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialFunction.java
@@ -7,7 +7,7 @@
 /**
  * Spatial functions that users generally expect in a database.
  * <p>
- * <p>The javadoc contains references to these specifications.</p>
+ * The javadoc contains references to these specifications.
  * <ul>
  * <li>OpenGIS Simple Features Specification for SQL, rev. 1.1  (OGC 99-049)</li>
  * </ul>
@@ -148,15 +148,15 @@ public enum SpatialFunction {
 	/**
 	 * the distance within function
 	 * <p>
-	 * <p>The semantics are those of Postgis function ST_Dwithin (geom1, geom2, distance) : boolean. It returns true
-	 * if geom1 and geom2 are within the specified distance of one another (in units of the spatial reference system).</p>
+	 * The semantics are those of Postgis function ST_Dwithin (geom1, geom2, distance) : boolean. It returns true
+	 * if geom1 and geom2 are within the specified distance of one another (in units of the spatial reference system).
 	 */
 	dwithin( "common" ),
 
 	/**
 	 * the transform function
 	 * <p>
-	 * <p>The semantics are those of the Postgis function ST_Transform(geometry, srid) : geometry. It returns new geometry
+	 * The semantics are those of the Postgis function ST_Transform(geometry, srid) : geometry. It returns new geometry
 	 * with its coordinates transformed to the spatial reference system referenced by the srid parameter.
 	 */
 	transform( "common" ),
@@ -169,7 +169,7 @@ public enum SpatialFunction {
 	/**
 	 * The filter function
 	 * <p>
-	 * <p>Corresponds to the Oracle Spatial's "SDO_FILTER" function, or the "&amp;&amp;" operator of PostGIS.
+	 * Corresponds to the Oracle Spatial's "SDO_FILTER" function, or the "&amp;&amp;" operator of PostGIS.
 	 */
 	filter( "filter" ),
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialRelation.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialRelation.java
index f805193c4def..e7f27c01c037 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialRelation.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialRelation.java
@@ -7,8 +7,8 @@
 /**
  * Enumerates the supported spatial relations.
  * <p>
- * <p>Most of these relations are defined in "OpenGIS Simple Features Specification for SQL, rev. 1.1  (OGC 99-049),
- * section 2.1.13.3. "</p>
+ * Most of these relations are defined in "OpenGIS Simple Features Specification for SQL, rev. 1.1  (OGC 99-049),
+ * section 2.1.13.3. "
  *
  * @author Karel Maesen
  * @deprecated Will be removed in 6
@@ -59,7 +59,7 @@ public interface SpatialRelation {
 	/**
 	 * The bounding box of the first geometry intersects the bounding box of the second
 	 * <p>
-	 * <p>This relation is not defined in OGC 99-049, it corresponds to the Postgis '&amp;&amp;' operator.</p>
+	 * This relation is not defined in OGC 99-049, it corresponds to the Postgis '&amp;&amp;' operator.
 	 */
 	public static int FILTER = 8;
 
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java
index 6de7a6e64b7b..c11c9292713e 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/H2GISWkb.java
@@ -10,6 +10,7 @@
 import java.io.InputStream;
 import java.lang.invoke.MethodHandles;
 import java.sql.Blob;
+import java.util.Locale;
 
 import org.hibernate.HibernateException;
 import org.hibernate.spatial.HSMessageLogger;
@@ -33,8 +34,8 @@
 /**
  * A utility class to serialize from/to H2GIS WKB's.
  * <p>
- * <p>Note: this utility makes it unnecessary to have a dependency on GeoDB. As long as GeoDB is
- * not available in common maven repositories, such a dependency is to be avoided.</p>
+ * Note: this utility makes it unnecessary to have a dependency on GeoDB. As long as GeoDB is
+ * not available in common maven repositories, such a dependency is to be avoided.
  *
  * @author Karel Maesen, Geovise BVBA
  */
@@ -43,7 +44,8 @@ public class H2GISWkb {
 	private static final HSMessageLogger LOGGER = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			HSMessageLogger.class,
-			H2GISWkb.class.getName()
+			H2GISWkb.class.getName(),
+			Locale.ROOT
 	);
 
 	private H2GISWkb() {
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/package-info.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/package-info.java
index 483bc5c009f4..ea47d56aedcd 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/package-info.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/h2gis/package-info.java
@@ -5,7 +5,7 @@
 
 /**
  * This package contains the H2GIS Dialect extensions for the {@linkplain org.hibernate.dialect.H2Dialect}.
- * <p/>
+ * <p>
  * For more information on H2GIS, see <a href="http://www.h2gis.org/">the H2GIS website</a>.
  */
 package org.hibernate.spatial.dialect.h2gis;
diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java
index 949926c056ee..721b2c507151 100644
--- a/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java
+++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialService.java
@@ -12,6 +12,7 @@
 import org.jboss.logging.Logger;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 /**
  * Central service for spatial integration
@@ -29,7 +30,8 @@ public class SpatialService implements Service {
 	private static final HSMessageLogger log = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			HSMessageLogger.class,
-			SpatialService.class.getName()
+			SpatialService.class.getName(),
+			Locale.ROOT
 	);
 
 	private boolean integrationEnabled;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java
index f65087fd3d9b..1e733b18e56b 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/dialect/hana/TestHANASpatialFunctions.java
@@ -37,7 +37,8 @@ public class TestHANASpatialFunctions extends SpatialFunctionalTestCase {
 	private static final HSMessageLogger LOG = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			HSMessageLogger.class,
-			TestHANASpatialFunctions.class.getName()
+			TestHANASpatialFunctions.class.getName(),
+			Locale.ROOT
 	);
 
 	protected HANAExpectationsFactory hanaExpectationsFactory;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java
index 3d22db64f146..ba21cda660df 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/AbstractExpectationsFactory.java
@@ -8,6 +8,7 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.Locale;
 
 import org.hibernate.spatial.HSMessageLogger;
 
@@ -43,7 +44,8 @@ public abstract class AbstractExpectationsFactory {
 	private static final HSMessageLogger LOG = Logger.getMessageLogger(
 			MethodHandles.lookup(),
 			HSMessageLogger.class,
-			AbstractExpectationsFactory.class.getName()
+			AbstractExpectationsFactory.class.getName(),
+			Locale.ROOT
 	);
 	private final static int TEST_SRID = 4326;
 	private static final int MAX_BYTE_LEN = 1024;
diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java
index 452fc84007ed..a3d09bced78b 100644
--- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java
+++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java
@@ -48,7 +48,7 @@ public void testConverterUsage() {
 
 				final TypeConfiguration typeConfiguration = sessionFactory.getMappingMetamodel().getTypeConfiguration();
 
-				assertThat( typeConfiguration.getJavaTypeRegistry().getDescriptor( Geometry.class ) )
+				assertThat( typeConfiguration.getJavaTypeRegistry().resolveDescriptor( Geometry.class ) )
 						.isSameAs( GeolatteGeometryJavaType.GEOMETRY_INSTANCE );
 
 				// todo (5.3) : what to assert wrt to SqlTypeDescriptor?  Anything?
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java b/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java
index 26f4499a88f3..ebb5caeec23e 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java
@@ -43,6 +43,11 @@ public boolean isMatch(Dialect dialect) {
 
 	public static class SupportsIdentityColumns implements DialectCheck {
 		public boolean isMatch(Dialect dialect) {
+			if ( dialect instanceof org.hibernate.community.dialect.SpannerPostgreSQLDialect ) {
+				// Spanner supports identity columns but it doesn't support returning integer type since
+				// Spanner supports only bit reversed positive
+				return false;
+			}
 			return dialect.getIdentityColumnSupport().supportsIdentityColumns();
 		}
 	}
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java
index 5643f82181c8..af0d98d93281 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java
@@ -16,7 +16,6 @@
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.ClassLoaderAccess;
-import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.jpa.spi.MutableJpaCompliance;
@@ -28,6 +27,8 @@
 import org.hibernate.resource.beans.spi.BeanInstanceProducer;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.type.BasicType;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import java.util.Collection;
@@ -119,11 +120,6 @@ public ClassLoaderAccess getClassLoaderAccess() {
 		return delegate.getClassLoaderAccess();
 	}
 
-	@Override
-	public ClassmateContext getClassmateContext() {
-		return delegate.getClassmateContext();
-	}
-
 	@Override
 	public ArchiveDescriptorFactory getArchiveDescriptorFactory() {
 		return delegate.getArchiveDescriptorFactory();
@@ -183,6 +179,11 @@ public <T> BasicType<T> resolveAdHocBasicType(String key) {
 		return null;
 	}
 
+	@Override
+	public <T> BasicType<T> findAdHocBasicType(JavaType<T> javaType, JdbcType jdbcType) {
+		return null;
+	}
+
 	@Override
 	public void release() {
 		delegate.release();
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
index be6692912152..d849b558a80c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
@@ -57,11 +57,25 @@
 import org.junit.platform.engine.support.hierarchical.EngineExecutionContext;
 import org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine;
 import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
 
 public class BytecodeEnhancedTestEngine extends HierarchicalTestEngine<JupiterEngineExecutionContext> {
 
+	private static final Class<?> LAUNCHER_STORE_FACADE_BEFORE_JUNIT_5_14;
 	public static final String ENHANCEMENT_EXTENSION_ENGINE_ENABLED = "hibernate.testing.bytecode.enhancement.extension.engine.enabled";
 
+	static {
+		Class<?> launcherStoreFacadeBeforeJunit514 = null;
+		try {
+			// The class was moved to a different package in 5.14
+			launcherStoreFacadeBeforeJunit514 = Class.forName( "org.junit.jupiter.engine.descriptor.LauncherStoreFacade" );
+		}
+		catch (ClassNotFoundException e) {
+			// ignore
+		}
+		LAUNCHER_STORE_FACADE_BEFORE_JUNIT_5_14 = launcherStoreFacadeBeforeJunit514;
+	}
+
 	public static boolean isEnabled() {
 		return "true".equalsIgnoreCase( System.getProperty( ENHANCEMENT_EXTENSION_ENGINE_ENABLED, "false" ) );
 	}
@@ -264,6 +278,24 @@ protected JupiterEngineExecutionContext createExecutionContext(ExecutionRequest
 		catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
 			// Ignore errors as they are probably due to version mismatches and try the 5.13 way
 		}
+		if ( LAUNCHER_STORE_FACADE_BEFORE_JUNIT_5_14 != null ) {
+			try {
+				// Try constructing the JupiterEngineExecutionContext the way it was done in 5.13 and before
+				final Constructor<JupiterEngineExecutionContext> constructorV5_12 = JupiterEngineExecutionContext.class
+						.getConstructor( EngineExecutionListener.class, JupiterConfiguration.class, LAUNCHER_STORE_FACADE_BEFORE_JUNIT_5_14 );
+				final Constructor<?> launcherStoreFacadeConstructor =
+						LAUNCHER_STORE_FACADE_BEFORE_JUNIT_5_14.getConstructor( NamespacedHierarchicalStore.class );
+				return constructorV5_12.newInstance(
+						request.getEngineExecutionListener(),
+						this.getJupiterConfiguration( request ),
+						launcherStoreFacadeConstructor.newInstance( request.getStore() )
+				);
+			}
+			catch (NoSuchMethodException | InstantiationException | IllegalAccessException |
+				InvocationTargetException e) {
+				// Ignore errors as they are probably due to version mismatches and try the 5.13 way
+			}
+		}
 
 		return new JupiterEngineExecutionContext(
 				request.getEngineExecutionListener(),
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/MapStorageAccessImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/MapStorageAccessImpl.java
index 0d749bbe4730..f1a867756b86 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/MapStorageAccessImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/MapStorageAccessImpl.java
@@ -17,14 +17,11 @@
  * @author Steve Ebersole
  */
 public class MapStorageAccessImpl implements DomainDataStorageAccess {
-	private ConcurrentMap data;
+	private ConcurrentMap<Object,Object> data;
 
 	@Internal
 	public Object getFromData(Object key) {
-		if ( data == null ) {
-			return null;
-		}
-		return data.get( key );
+		return data == null ? null : data.get( key );
 	}
 
 	@Override
@@ -38,14 +35,13 @@ public Object getFromCache(Object key, SharedSessionContractImplementor session)
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public void putIntoCache(Object key, Object value, SharedSessionContractImplementor session) {
 		getOrMakeDataMap().put( key, value );
 	}
 
-	protected ConcurrentMap getOrMakeDataMap() {
+	protected ConcurrentMap<Object,Object> getOrMakeDataMap() {
 		if ( data == null ) {
-			data = new ConcurrentHashMap();
+			data = new ConcurrentHashMap<>();
 		}
 		return data;
 	}
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/OracleDatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/OracleDatabaseCleaner.java
index 6e0f0fd0c439..ab2a0f9a9e71 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/OracleDatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/OracleDatabaseCleaner.java
@@ -62,6 +62,17 @@ public void clearAllSchemas(Connection connection) {
 		cachedTruncateTableSqlPerSchema.clear();
 		cachedConstraintDisableSqlPerSchema.clear();
 		cachedConstraintEnableSqlPerSchema.clear();
+		clearSchema0(
+				connection,
+				statement -> {
+					try {
+						return statement.executeQuery("SELECT 'ALTER TABLE ' || table_name || ' NO FLASHBACK ARCHIVE' FROM user_flashback_archive_tables");
+					}
+					catch (SQLException e) {
+						throw new RuntimeException( "Could not clear schema", e );
+					}
+				}
+		);
 		clearSchema0(
 				connection,
 				statement -> {
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/SQLServerDatabaseCleaner.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/SQLServerDatabaseCleaner.java
index 118db052b808..a137bdf2cfb0 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/SQLServerDatabaseCleaner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/SQLServerDatabaseCleaner.java
@@ -65,6 +65,13 @@ public void clearAllSchemas(Connection c) {
 				sqls.add( rs.getString( 1 ) );
 			}
 
+			rs = s.executeQuery(
+					"SELECT 'ALTER TABLE [' + TABLE_SCHEMA + '].[' + TABLE_NAME + ']' + ' SET (SYSTEM_VERSIONING = OFF)' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' " +
+					"AND EXISTS (SELECT 1 FROM sys.tables t JOIN sys.schemas s ON t.schema_id = s.schema_id WHERE t.is_ms_shipped = 0 AND s.name = TABLE_SCHEMA AND t.name = TABLE_NAME AND t.TEMPORAL_TYPE = 2 )" );
+			while ( rs.next() ) {
+				sqls.add( rs.getString( 1 ) );
+			}
+
 			rs = s.executeQuery(
 					"SELECT 'DROP TABLE [' + TABLE_SCHEMA + '].[' + TABLE_NAME + ']' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' " +
 							"AND EXISTS (SELECT 1 FROM sys.tables t JOIN sys.schemas s ON t.schema_id = s.schema_id WHERE t.is_ms_shipped = 0 AND s.name = TABLE_SCHEMA AND t.name = TABLE_NAME)" );
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInspector.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInspector.java
index 01a8d5eac4e9..140b7eefdfef 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInspector.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInspector.java
@@ -146,4 +146,9 @@ public void assertHasQueryMatching(String queryPattern) {
 				.isNotEmpty()
 				.anySatisfy( sql -> Assertions.assertThat( sql.toLowerCase( Locale.ROOT ) ).matches( queryPattern ) );
 	}
+
+	public void assertInsertCount(long expected) {
+		long actual = sqlQueries.stream().filter(s -> s.toLowerCase(Locale.ROOT).startsWith("insert")).count();
+		assertEquals("Number of executed insert statements", expected, actual);
+	}
 }
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java
index 23a2b3aff598..526dd6f1e355 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java
@@ -7,7 +7,6 @@
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -169,14 +168,7 @@ protected void sortMethods(List<FrameworkMethod> computedTestMethods) {
 		if ( CollectionHelper.isEmpty( computedTestMethods ) ) {
 			return;
 		}
-		Collections.sort(
-				computedTestMethods, new Comparator<FrameworkMethod>() {
-					@Override
-					public int compare(FrameworkMethod o1, FrameworkMethod o2) {
-						return o1.getName().compareTo( o2.getName() );
-					}
-				}
-		);
+		computedTestMethods.sort( Comparator.comparing( FrameworkMethod::getName ) );
 	}
 
 	protected List<FrameworkMethod> doComputation() {
@@ -184,7 +176,7 @@ protected List<FrameworkMethod> doComputation() {
 		final List<FrameworkMethod> methods = super.computeTestMethods();
 
 		// Now process that full list of test methods and build our custom result
-		final List<FrameworkMethod> result = new ArrayList<FrameworkMethod>();
+		final List<FrameworkMethod> result = new ArrayList<>();
 		final boolean doValidation = Boolean.getBoolean( Helper.VALIDATE_FAILURE_EXPECTED );
 		int testCount = 0;
 
@@ -230,7 +222,7 @@ public Class<? extends Annotation> annotationType() {
 		}
 	}
 
-	private static Dialect dialect = determineDialect();
+	private static final Dialect dialect = determineDialect();
 
 	private static Dialect determineDialect() {
 		try {
@@ -429,7 +421,7 @@ protected Ignore convertSkipToIgnore(FrameworkMethod frameworkMethod) {
 			for ( RequiresDialectFeature requiresDialectFeature : requiresDialectFeatures ) {
 				try {
 					for ( Class<? extends DialectCheck> checkClass : requiresDialectFeature.value() ) {
-						if ( !checkClass.newInstance().isMatch( dialect ) ) {
+						if ( !checkClass.getDeclaredConstructor().newInstance().isMatch( dialect ) ) {
 							return buildIgnore( requiresDialectFeature );
 						}
 					}
@@ -479,9 +471,6 @@ private boolean isDialectMatchingRequired(Collection<RequiresDialect> requiresDi
 			if ( foundMatch ) {
 				break;
 			}
-			if ( foundMatch ) {
-				break;
-			}
 		}
 		return foundMatch;
 	}
@@ -557,29 +546,29 @@ private Ignore buildIgnore(RequiresDialect requiresDialect) {
 	}
 
 	private Ignore buildIgnore(Collection<RequiresDialect> requiresDialects) {
-		String ignoreMessage = "";
+		StringBuilder ignoreMessage = new StringBuilder();
 		for ( RequiresDialect requiresDialect : requiresDialects ) {
-			ignoreMessage += getIgnoreMessage(
+			ignoreMessage.append( getIgnoreMessage(
 					"@RequiresDialect non-match",
 					requiresDialect.comment(),
 					requiresDialect.jiraKey()
-			);
-			ignoreMessage += System.lineSeparator();
+			) );
+			ignoreMessage.append( System.lineSeparator() );
 		}
-		return new IgnoreImpl( ignoreMessage );
+		return new IgnoreImpl( ignoreMessage.toString() );
 	}
 
 	private Ignore buildIgnore2(Collection<org.hibernate.testing.orm.junit.RequiresDialect> requiresDialects) {
-		String ignoreMessage = "";
+		StringBuilder ignoreMessage = new StringBuilder();
 		for ( org.hibernate.testing.orm.junit.RequiresDialect requiresDialect : requiresDialects ) {
-			ignoreMessage += getIgnoreMessage(
+			ignoreMessage.append( getIgnoreMessage(
 					"@RequiresDialect non-match",
 					requiresDialect.comment(),
 					null
-			);
-			ignoreMessage += System.lineSeparator();
+			) );
+			ignoreMessage.append( System.lineSeparator() );
 		}
-		return new IgnoreImpl( ignoreMessage );
+		return new IgnoreImpl( ignoreMessage.toString() );
 	}
 
 	private Ignore buildIgnore(RequiresDialectFeature requiresDialectFeature) {
@@ -600,7 +589,7 @@ private Ignore buildIgnore(org.hibernate.testing.orm.junit.RequiresDialectFeatur
 
 	private boolean isMatch(Class<? extends Skip.Matcher> condition) {
 		try {
-			Skip.Matcher matcher = condition.newInstance();
+			Skip.Matcher matcher = condition.getDeclaredConstructor().newInstance();
 			return matcher.isMatch();
 		}
 		catch (Exception e) {
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4J2DelegatingLogger.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/DelegatingLogger.java
similarity index 60%
rename from hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4J2DelegatingLogger.java
rename to hibernate-testing/src/main/java/org/hibernate/testing/logger/DelegatingLogger.java
index 814c51dc8e92..d4621e95fbc9 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4J2DelegatingLogger.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/DelegatingLogger.java
@@ -4,44 +4,31 @@
  */
 package org.hibernate.testing.logger;
 
+import org.apache.logging.log4j.LogManager;
+import org.jboss.logging.Logger;
+
 import java.text.MessageFormat;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.jboss.logging.Logger;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.LoggingException;
-import org.apache.logging.log4j.message.MessageFormatMessageFactory;
-import org.apache.logging.log4j.message.StringFormattedMessage;
-import org.apache.logging.log4j.spi.AbstractLogger;
-
 /**
  * A {@code Logger} implementation which delegates to Log4J2 but makes it possible
  * to test for events being logged (not logged).
  *
  * @author Sanne Grinovero (C) 2015 Red Hat Inc.
  */
-public final class Log4J2DelegatingLogger extends Logger {
+public final class DelegatingLogger extends Logger {
 
-	private final AbstractLogger logger;
-	private final MessageFormatMessageFactory messageFactory;
+	private final Logger delegate;
 
 	// Synchronize access on the field
 	private final List<LogListener> enabledListeners = new LinkedList<>();
 	private final AtomicBoolean interceptEnabled = new AtomicBoolean( false );
 
-	Log4J2DelegatingLogger(final String name) {
-		super( name );
-		org.apache.logging.log4j.Logger logger = LogManager.getLogger( name );
-		if ( !( logger instanceof AbstractLogger ) ) {
-			throw new LoggingException( "The logger for [" + name + "] does not extend AbstractLogger. Actual logger: " + logger
-					.getClass()
-					.getName() );
-		}
-		this.logger = (AbstractLogger) logger;
-		this.messageFactory = new MessageFormatMessageFactory();
+	DelegatingLogger(final Logger logger) {
+		super( logger.getName() );
+		this.delegate = logger;
 	}
 
 	void registerListener(LogListener newListener) {
@@ -62,7 +49,7 @@ void clearAllListeners() {
 
 	@Override
 	public boolean isEnabled(final Level level) {
-		return this.logger.isEnabled( translate( level ) );
+		return this.delegate.isEnabled( level );
 	}
 
 	@Override
@@ -72,29 +59,21 @@ protected void doLog(
 			final Object message,
 			final Object[] parameters,
 			final Throwable thrown) {
-		final org.apache.logging.log4j.Level translatedLevel = translate( level );
 		if ( interceptEnabled.get() ) {
 			intercept(
 					level,
-					parameters == null || parameters.length == 0 ?
+					(parameters == null || parameters.length == 0) ?
 							String.valueOf( message ) :
 							MessageFormat.format( String.valueOf( message ), parameters ),
 					thrown
 			);
 		}
-		if ( !this.logger.isEnabled( translatedLevel ) ) {
+
+		if ( !this.delegate.isEnabled( level ) ) {
 			return;
 		}
-		try {
-			this.logger.logMessage( loggerClassName, translatedLevel, null,
-					( parameters == null || parameters.length == 0 ) ?
-							this.messageFactory.newMessage( message ) :
-							this.messageFactory.newMessage( String.valueOf( message ), parameters ),
-					thrown
-			);
-		}
-		catch (Throwable ignored) {
-		}
+
+		this.delegate.log( loggerClassName, level, message, parameters, thrown );
 	}
 
 	private void intercept(Level level, String renderedMessage, Throwable thrown) {
@@ -112,24 +91,16 @@ protected void doLogf(
 			final String format,
 			final Object[] parameters,
 			final Throwable thrown) {
-		final org.apache.logging.log4j.Level translatedLevel = translate( level );
+
 		if ( interceptEnabled.get() ) {
 			intercept( level, parameters == null ? format : String.format( format, parameters ), thrown );
 		}
-		if ( !logger.isEnabled( translatedLevel ) ) {
+
+		if ( !delegate.isEnabled( level ) ) {
 			return;
 		}
-		try {
-			this.logger.logMessage(
-					loggerClassName,
-					translatedLevel,
-					null,
-					new StringFormattedMessage( format, parameters ),
-					thrown
-			);
-		}
-		catch (Throwable ignored) {
-		}
+
+		this.delegate.logf( loggerClassName, level, thrown, format, parameters );
 	}
 
 	private static org.apache.logging.log4j.Level translate(final Level level) {
@@ -150,9 +121,20 @@ private static org.apache.logging.log4j.Level translate(final Level level) {
 				return org.apache.logging.log4j.Level.DEBUG;
 			case TRACE:
 				return org.apache.logging.log4j.Level.TRACE;
+			default:
+				return org.apache.logging.log4j.Level.INFO;
 		}
+	}
 
-		return org.apache.logging.log4j.Level.ALL;
+	org.apache.logging.log4j.Level getLevel() {
+		return LogManager.getLogger( getName() ).getLevel();
 	}
 
+	void setLevel(org.apache.logging.log4j.Level level) {
+		org.apache.logging.log4j.core.config.Configurator.setLevel( getName(), level );
+	}
+
+	void setLevel(Level level) {
+		setLevel( translate( level ) );
+	}
 }
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogInspectionHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogInspectionHelper.java
index eebfc3c9baff..9331ea5133c3 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogInspectionHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogInspectionHelper.java
@@ -31,7 +31,7 @@ public static void clearAllListeners(BasicLogger log) {
 		convertType( log ).clearAllListeners();
 	}
 
-	private static Log4J2DelegatingLogger convertType(BasicLogger log) {
+	private static DelegatingLogger convertType(BasicLogger log) {
 		if ( log instanceof DelegatingBasicLogger wrapper) {
 			//Most loggers generated via the annotation processor are of this type
 			try {
@@ -41,13 +41,13 @@ private static Log4J2DelegatingLogger convertType(BasicLogger log) {
 				throw new RuntimeException( cause );
 			}
 		}
-		if ( ! ( log instanceof Log4J2DelegatingLogger ) ) {
+		if ( ! ( log instanceof DelegatingLogger) ) {
 			throw new AssertionFailure( "Unexpected log type: JBoss Logger didn't register the custom TestableLoggerProvider as logger provider" );
 		}
-		return (Log4J2DelegatingLogger) log;
+		return (DelegatingLogger) log;
 	}
 
-	private static Log4J2DelegatingLogger extractFromWrapper(DelegatingBasicLogger wrapper) throws Exception {
+	private static DelegatingLogger extractFromWrapper(DelegatingBasicLogger wrapper) throws Exception {
 		Field field = DelegatingBasicLogger.class.getDeclaredField( "log" );
 		field.setAccessible( true );
 		Object object = field.get( wrapper );
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogLevelContext.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogLevelContext.java
new file mode 100644
index 000000000000..577e36783496
--- /dev/null
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/LogLevelContext.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.testing.logger;
+
+import org.hibernate.Incubating;
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Assertions;
+
+@Incubating
+public class LogLevelContext implements AutoCloseable {
+
+	private final String name;
+	private final org.apache.logging.log4j.Level originalLevel;
+
+	private LogLevelContext(String name, Logger.Level targetLevel) {
+		this.name = name;
+		this.originalLevel = getLogLevel( name );
+		doSetRuntimeLevel( name, targetLevel );
+	}
+
+	public static LogLevelContext withLevel(Class<?> loggerName, Logger.Level level) {
+		return withLevel( loggerName.getName(), level );
+	}
+
+	public static LogLevelContext withLevel(String loggerName, Logger.Level level) {
+		return new LogLevelContext( loggerName, level );
+	}
+
+	@Override
+	public void close() {
+		doSetRuntimeLevel( name, originalLevel );
+	}
+
+	private static void doSetRuntimeLevel(String name, Object level) {
+		Assertions.assertNotNull( name );
+		Assertions.assertNotNull( level );
+		Object logger = Logger.getLogger( name );
+		if ( logger instanceof DelegatingLogger dl ) {
+			if ( level instanceof Logger.Level l ) {
+				dl.setLevel( l );
+			}
+			else if ( level instanceof org.apache.logging.log4j.Level l ) {
+				dl.setLevel( l );
+			}
+			else {
+				throw new AssertionError( "Unexpected logger level type: " + level.getClass().getName() );
+			}
+		}
+		else {
+			throw new AssertionError( "Unexpected logger type: " + logger.getClass()
+					.getName() + ". Logger must be: " + DelegatingLogger.class.getName() );
+		}
+	}
+
+	private static org.apache.logging.log4j.Level getLogLevel(String name) {
+		Object logger = Logger.getLogger( name );
+		if ( logger instanceof DelegatingLogger dl ) {
+			return dl.getLevel();
+		}
+		return org.apache.logging.log4j.Level.INFO;
+	}
+}
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/logger/TestableLoggerProvider.java b/hibernate-testing/src/main/java/org/hibernate/testing/logger/TestableLoggerProvider.java
index 0ae5131c62ce..2aa20fc3a61f 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/logger/TestableLoggerProvider.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/logger/TestableLoggerProvider.java
@@ -4,25 +4,29 @@
  */
 package org.hibernate.testing.logger;
 
-import java.util.HashMap;
+import org.jboss.logging.Log4j2LoggerProvider;
+import org.jboss.logging.Logger;
+import org.jboss.logging.LoggerProvider;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.jboss.logging.Logger;
-
-import org.apache.logging.log4j.ThreadContext;
-
 /**
  * A {@code LoggerProvider} for JBoss Logger.
  * See also META-INF/services/org.jboss.logging.LoggerProvider
  *
  * @author Sanne Grinovero (C) 2015 Red Hat Inc.
  */
-public class TestableLoggerProvider implements org.jboss.logging.LoggerProvider {
+public class TestableLoggerProvider implements LoggerProvider {
 
 	//We LEAK Logger instances: good only for testing as we know the set of categories is limited in practice
-	private static final ConcurrentMap<String,Logger> reuseLoggerInstances = new ConcurrentHashMap<>();
+	private static final ConcurrentMap<String, Logger> reuseLoggerInstances = new ConcurrentHashMap<>();
+	private final LoggerProvider delegate;
+
+	public TestableLoggerProvider() {
+		delegate = new Log4j2LoggerProvider();
+	}
 
 	// Maintainer note:
 	// Except the next method, which is adjusted to return our own Log4DelegatingLogger
@@ -33,7 +37,7 @@ public class TestableLoggerProvider implements org.jboss.logging.LoggerProvider
 	public Logger getLogger(final String name) {
 		Logger logger = reuseLoggerInstances.get( name );
 		if ( logger == null ) {
-			logger = new Log4J2DelegatingLogger( "".equals( name ) ? "ROOT" : name );
+			logger = new DelegatingLogger( delegate.getLogger( "".equals( name ) ? "ROOT" : name ) );
 			Logger previous = reuseLoggerInstances.putIfAbsent( name, logger );
 			if ( previous != null ) {
 				return previous;
@@ -44,67 +48,61 @@ public Logger getLogger(final String name) {
 
 	@Override
 	public void clearMdc() {
-		ThreadContext.clearMap();
+		delegate.clearMdc();
 	}
 
 	@Override
 	public Object putMdc(String key, Object value) {
-		try {
-			return ThreadContext.get( key );
-		}
-		finally {
-			ThreadContext.put( key, String.valueOf( value ) );
-		}
+		return delegate.putMdc( key, value );
 	}
 
 	@Override
 	public Object getMdc(String key) {
-		return ThreadContext.get( key );
+		return delegate.getMdc( key );
 	}
 
 	@Override
 	public void removeMdc(String key) {
-		ThreadContext.remove( key );
+		delegate.removeMdc( key );
 	}
 
 	@Override
 	public Map<String, Object> getMdcMap() {
-		return new HashMap<>( ThreadContext.getImmutableContext() );
+		return delegate.getMdcMap();
 	}
 
 	@Override
 	public void clearNdc() {
-		ThreadContext.clearStack();
+		delegate.clearNdc();
 	}
 
 	@Override
 	public String getNdc() {
-		return ThreadContext.peek();
+		return delegate.getNdc();
 	}
 
 	@Override
 	public int getNdcDepth() {
-		return ThreadContext.getDepth();
+		return delegate.getNdcDepth();
 	}
 
 	@Override
 	public String popNdc() {
-		return ThreadContext.pop();
+		return delegate.popNdc();
 	}
 
 	@Override
 	public String peekNdc() {
-		return ThreadContext.peek();
+		return delegate.peekNdc();
 	}
 
 	@Override
 	public void pushNdc(String message) {
-		ThreadContext.push( message );
+		delegate.pushNdc( message );
 	}
 
 	@Override
 	public void setNdcMaxDepth(int maxDepth) {
-		ThreadContext.trim( maxDepth );
+		delegate.setNdcMaxDepth( maxDepth );
 	}
-
 }
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Person.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Person.java
index 8c26f2befed4..aab188ca1b71 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Person.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/userguide/Person.java
@@ -71,12 +71,12 @@
 		name = "find_person_by_name",
 		query =
 				"select " +
-						"   p.id AS \"id\", " +
-						"   p.name AS \"name\", " +
-						"   p.nick_name AS \"nick_name\", " +
-						"   p.address AS \"address\", " +
-						"   p.created_on AS \"created_on\", " +
-						"   p.version AS \"version\" " +
+						"   p.id AS id, " +
+						"   p.name AS name, " +
+						"   p.nick_name AS nick_name, " +
+						"   p.address AS address, " +
+						"   p.created_on AS created_on, " +
+						"   p.version AS version " +
 						"from Person p " +
 						"where p.name LIKE :name",
 		resultClass = Person.class
@@ -87,16 +87,16 @@
 		name = "find_person_with_phones_by_name",
 		query =
 				"select " +
-						"   pr.id AS \"pr.id\", " +
-						"   pr.name AS \"pr.name\", " +
-						"   pr.nick_name AS \"pr.nick_name\", " +
-						"   pr.address AS \"pr.address\", " +
-						"   pr.created_on AS \"pr.created_on\", " +
-						"   pr.version AS \"pr.version\", " +
-						"   ph.id AS \"ph.id\", " +
-						"   ph.person_id AS \"ph.person_id\", " +
-						"   ph.phone_number AS \"ph.number\", " +
-						"   ph.phone_type AS \"ph.type\" " +
+						"   pr.id AS pr_id, " +
+						"   pr.name AS pr_name, " +
+						"   pr.nick_name AS pr_nick_name, " +
+						"   pr.address AS pr_address, " +
+						"   pr.created_on AS pr_created_on, " +
+						"   pr.version AS pr_version, " +
+						"   ph.id AS ph_id, " +
+						"   ph.person_id AS ph_person_id, " +
+						"   ph.phone_number AS ph_number, " +
+						"   ph.phone_type AS ph_type " +
 						"from Person pr " +
 						"join Phone ph ON pr.id = ph.person_id " +
 						"where pr.name LIKE :name",
@@ -110,21 +110,21 @@
 				@EntityResult(
 						entityClass = Person.class,
 						fields = {
-								@FieldResult( name = "id", column = "pr.id" ),
-								@FieldResult( name = "name", column = "pr.name" ),
-								@FieldResult( name = "nickName", column = "pr.nick_name" ),
-								@FieldResult( name = "address", column = "pr.address" ),
-								@FieldResult( name = "createdOn", column = "pr.created_on" ),
-								@FieldResult( name = "version", column = "pr.version" ),
+								@FieldResult( name = "id", column = "pr_id" ),
+								@FieldResult( name = "name", column = "pr_name" ),
+								@FieldResult( name = "nickName", column = "pr_nick_name" ),
+								@FieldResult( name = "address", column = "pr_address" ),
+								@FieldResult( name = "createdOn", column = "pr_created_on" ),
+								@FieldResult( name = "version", column = "pr_version" ),
 						}
 				),
 				@EntityResult(
 						entityClass = Phone.class,
 						fields = {
-								@FieldResult( name = "id", column = "ph.id" ),
-								@FieldResult( name = "person", column = "ph.person_id" ),
-								@FieldResult( name = "number", column = "ph.number" ),
-								@FieldResult( name = "type", column = "ph.type" ),
+								@FieldResult( name = "id", column = "ph_id" ),
+								@FieldResult( name = "person", column = "ph_person_id" ),
+								@FieldResult( name = "number", column = "ph_number" ),
+								@FieldResult( name = "type", column = "ph_type" ),
 						}
 				)
 		}
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AfterClassTemplate.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AfterClassTemplate.java
index 09fa3e27633e..c815e1a69487 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AfterClassTemplate.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/AfterClassTemplate.java
@@ -13,7 +13,7 @@
 
 /**
  * Similar to JUnit's {@link org.junit.jupiter.api.AfterAll} but called after
- * each template invocation in a {@link @ClassTemplate} test class.
+ * each template invocation in a {@link org.junit.jupiter.api.ClassTemplate} test class.
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/BeforeClassTemplate.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/BeforeClassTemplate.java
index a6d0089bfafd..510afa07967b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/BeforeClassTemplate.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/BeforeClassTemplate.java
@@ -13,7 +13,7 @@
 
 /**
  * Similar to JUnit's {@link org.junit.jupiter.api.BeforeAll} but called before
- * each template invocation in a {@link @ClassTemplate} test class.
+ * each template invocation in a {@link org.junit.jupiter.api.ClassTemplate} test class.
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java
index b6e415441cbd..c462cf58b996 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java
@@ -7,6 +7,7 @@
 import jakarta.persistence.AttributeConverter;
 import org.hibernate.DuplicateMappingException;
 import org.hibernate.MappingException;
+import org.hibernate.ScrollMode;
 import org.hibernate.Timeouts;
 import org.hibernate.annotations.CollectionTypeRegistration;
 import org.hibernate.boot.SessionFactoryBuilder;
@@ -43,15 +44,18 @@
 import org.hibernate.boot.spi.NaturalIdUniqueKeyBinder;
 import org.hibernate.boot.spi.PropertyData;
 import org.hibernate.boot.spi.SecondPass;
+import org.hibernate.cfg.MappingSettings;
 import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.community.dialect.FirebirdDialect;
 import org.hibernate.community.dialect.GaussDBDialect;
 import org.hibernate.community.dialect.InformixDialect;
+import org.hibernate.community.dialect.SpannerPostgreSQLDialect;
 import org.hibernate.community.dialect.TiDBDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
+import org.hibernate.dialect.FunctionalDependencyAnalysisSupportImpl;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.HSQLDialect;
@@ -121,6 +125,7 @@
  *
  * @author Hardy Ferentschik
  * @author Steve Ebersole
+ * @author Yoobin Yoon
  */
 abstract public class DialectFeatureChecks {
 	public static class SupportsSequences implements DialectFeatureCheck {
@@ -159,6 +164,55 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsNamedEnum implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return definesDdlType( dialect, SqlTypes.NAMED_ENUM );
+		}
+	}
+
+	public static class SupportPooledSequences implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return dialect.getSequenceSupport().supportsPooledSequences();
+		}
+	}
+
+	public static class SupportPooledOptimizer implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return !"none".equals( dialect.getDefaultProperties().get( MappingSettings.PREFERRED_POOLED_OPTIMIZER ) );
+		}
+	}
+
+	public static class SupportsJdbcEscapes implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return !(dialect instanceof SpannerPostgreSQLDialect || dialect instanceof SpannerDialect);
+		}
+	}
+
+	public static class SupportsNumericPrimaryKey implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return !(dialect instanceof SpannerPostgreSQLDialect);
+		}
+	}
+
+	public static class SupportsFunctionalDependencyAnalysis implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return dialect.getFunctionalDependencyAnalysisSupport() != FunctionalDependencyAnalysisSupportImpl.NONE;
+		}
+	}
+
+	public static class SupportsAllQuantifiedSubqueriesWithComparison implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return !(dialect instanceof SpannerPostgreSQLDialect);
+		}
+	}
+
 	public static class UsesInputStreamToInsertBlob implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return dialect.useInputStreamToInsertBlob();
@@ -167,6 +221,11 @@ public boolean apply(Dialect dialect) {
 
 	public static class SupportsIdentityColumns implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
+			if ( dialect instanceof SpannerPostgreSQLDialect || dialect instanceof SpannerDialect ) {
+				// Spanner supports identity columns but it doesn't support returning integer type since
+				// Spanner supports only bit reversed positive.
+				return false;
+			}
 			return dialect.getIdentityColumnSupport().supportsIdentityColumns();
 		}
 	}
@@ -207,6 +266,26 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsConcurrentTransactions implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			// Currently Spanner Emulator doesn't allow concurrent modifications
+			return !(dialect instanceof SpannerPostgreSQLDialect || dialect instanceof SpannerDialect);
+		}
+	}
+
+	public static class SupportSelectPreviousSequence implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			try {
+				dialect.getSequenceSupport().getSelectSequencePreviousValString( "" );
+				return true;
+			}
+			catch (RuntimeException e) {
+				return false;
+			}
+		}
+	}
+
 	public static class SupportsCascadeDeleteCheck implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return dialect.supportsCascadeDelete();
@@ -268,6 +347,7 @@ public static class SupportsJdbcDriverProxying implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return !( dialect instanceof DB2Dialect
 					|| dialect instanceof DerbyDialect
+					|| dialect instanceof SpannerPostgreSQLDialect
 					|| dialect instanceof FirebirdDialect );
 		}
 	}
@@ -298,7 +378,15 @@ public boolean apply(Dialect dialect) {
 
 	public static class SupportsLockTimeouts implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return dialect.supportsLockTimeouts();
+			return dialect.getLockingSupport().getMetadata().getLockTimeoutType( Timeouts.ONE_SECOND ) != LockTimeoutType.NONE;
+		}
+	}
+
+	public static class SupportsNoWait implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return dialect.getLockingSupport()
+					.getMetadata()
+					.getLockTimeoutType( Timeouts.NO_WAIT ) != LockTimeoutType.NONE;
 		}
 	}
 
@@ -320,6 +408,21 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsExtendedConnectionLockTimeouts implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return dialect.getLockingSupport().getConnectionLockTimeoutStrategy().getSupportedLevel()
+				== ConnectionLockTimeoutStrategy.Level.EXTENDED;
+		}
+	}
+
+	public static class SupportsBackwardsScrollableResultSets implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return dialect.defaultScrollMode() != ScrollMode.FORWARD_ONLY;
+		}
+	}
+
 	public static class SupportsSelectLocking implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			final PessimisticLockStyle lockStyle = dialect
@@ -332,19 +435,19 @@ public boolean apply(Dialect dialect) {
 
 	public static class SupportsSkipLocked implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return dialect.supportsSkipLocked();
+			return dialect.getLockingSupport().getMetadata().getLockTimeoutType( Timeouts.SKIP_LOCKED ) != LockTimeoutType.NONE;
 		}
 	}
 
 	public static class SupportNoWait implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return dialect.supportsNoWait();
+			return dialect.getLockingSupport().getMetadata().getLockTimeoutType( Timeouts.NO_WAIT ) != LockTimeoutType.NONE;
 		}
 	}
 
 	public static class SupportsWait implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return dialect.supportsWait();
+			return dialect.getLockingSupport().getMetadata().getLockTimeoutType( Timeouts.ONE_SECOND ) != LockTimeoutType.NONE;
 		}
 	}
 
@@ -381,6 +484,12 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportAlterColumnType implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return dialect.supportsAlterColumnType();
+		}
+	}
+
 	public static class SupportFollowOnLocking implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return dialect.useFollowOnLocking( null, null );
@@ -415,7 +524,7 @@ public static class SupportsGroupByRollup implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return dialect instanceof DB2Dialect
 				|| dialect instanceof OracleDialect
-				|| dialect instanceof PostgreSQLDialect
+				|| (dialect instanceof PostgreSQLDialect && !(dialect instanceof SpannerPostgreSQLDialect))
 				|| dialect instanceof SQLServerDialect
 				|| dialect instanceof DerbyDialect
 				|| dialect instanceof MySQLDialect && !(dialect instanceof TiDBDialect)
@@ -427,7 +536,7 @@ public static class SupportsGroupByGroupingSets implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return dialect instanceof DB2Dialect
 				|| dialect instanceof OracleDialect
-				|| dialect instanceof PostgreSQLDialect
+				|| (dialect instanceof PostgreSQLDialect && !(dialect instanceof SpannerPostgreSQLDialect))
 				|| dialect instanceof SQLServerDialect;
 		}
 	}
@@ -460,7 +569,7 @@ public boolean apply(Dialect dialect) {
 	public static class SupportsCharCodeConversion implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			// Derby doesn't support the `ASCII` or `CHR` functions
-			return !( dialect instanceof DerbyDialect );
+			return !( dialect instanceof DerbyDialect || dialect instanceof SpannerPostgreSQLDialect);
 		}
 	}
 
@@ -481,7 +590,7 @@ public boolean apply(Dialect dialect) {
 
 	public static class SupportsCteInsertStrategy implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return dialect instanceof PostgreSQLDialect
+			return (dialect instanceof PostgreSQLDialect && !(dialect instanceof SpannerPostgreSQLDialect))
 				|| dialect instanceof DB2Dialect
 				|| dialect instanceof GaussDBDialect;
 		}
@@ -606,27 +715,13 @@ public boolean apply(Dialect dialect) {
 
 	public static class SupportsInverseDistributionFunctions implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return dialect instanceof H2Dialect
-				|| dialect instanceof PostgreSQLDialect
-				|| dialect instanceof HANADialect
-				|| dialect instanceof CockroachDialect
-				|| dialect instanceof DB2Dialect db2 && db2.getDB2Version().isSameOrAfter( 11 )
-				|| dialect instanceof OracleDialect
-				|| dialect instanceof SpannerDialect
-				|| dialect instanceof SQLServerDialect;
+			return definesFunction( dialect, "percentile_disc" );
 		}
 	}
 
 	public static class SupportsHypotheticalSetFunctions implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return dialect instanceof H2Dialect
-				|| dialect instanceof PostgreSQLDialect
-				|| dialect instanceof HANADialect
-				|| dialect instanceof CockroachDialect
-				|| dialect instanceof DB2Dialect db2 && db2.getDB2Version().isSameOrAfter( 11 )
-				|| dialect instanceof OracleDialect
-				|| dialect instanceof SpannerDialect
-				|| dialect instanceof SQLServerDialect;
+			return definesFunction( dialect, "percent_rank" );
 		}
 	}
 
@@ -653,21 +748,19 @@ public boolean apply(Dialect dialect) {
 
 	public static class SupportsFullJoin implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return !( dialect instanceof H2Dialect
-					|| dialect instanceof MySQLDialect
-					|| dialect instanceof SybaseDialect
-					|| dialect instanceof DerbyDialect );
+			return !( dialect instanceof DerbyDialect );
+		}
+	}
+
+	public static class SupportsExceptAll implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return dialect.supportsExceptAll();
 		}
 	}
 
 	public static class SupportsMedian implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return !( dialect instanceof MySQLDialect && !(dialect instanceof MariaDBDialect)
-					|| dialect instanceof SybaseDialect
-					|| dialect instanceof DerbyDialect
-					|| dialect instanceof FirebirdDialect
-					|| dialect instanceof InformixDialect
-					|| dialect instanceof DB2Dialect db2 && db2.getDB2Version().isBefore( 11 ) );
+			return definesFunction( dialect, "median" );
 		}
 	}
 
@@ -823,7 +916,8 @@ public boolean apply(Dialect dialect) {
 			return definesFunction( dialect, "json_query" )
 				&& !( dialect instanceof SQLServerDialect )
 				&& !( dialect instanceof H2Dialect )
-				&& !( dialect instanceof CockroachDialect );
+				&& !( dialect instanceof CockroachDialect )
+				&& !( dialect instanceof SpannerDialect );
 		}
 	}
 
@@ -839,21 +933,29 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsJsonArrayGet implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return definesFunction(dialect, "array_get");
+		}
+	}
+
 	public static class SupportsJsonObject implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return definesFunction( dialect, "json_object" );
 		}
 	}
 
-	public static class SupportsJsonValueErrorBehavior implements DialectFeatureCheck {
+	public static class SupportsJsonFunctionErrorBehavior implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return definesFunction( dialect, "json_value" )
 				// H2 emulation doesn't support error behavior
 				&& !( dialect instanceof H2Dialect )
-				// MariaDB simply doesn't support the on error and on empty clauses
+				// MariaDB reports the error 4038 as warning and simply returns null
 				&& !( dialect instanceof MariaDBDialect )
 				// Cockroach doesn't have a native json_value function
 				&& !( dialect instanceof CockroachDialect )
+				// Spanner does not support ON ERROR or ON EMPTY clauses
+				&& !( dialect instanceof SpannerDialect )
 				// PostgreSQL added support for native json_value in version 17
 				&& !( dialect instanceof PostgreSQLDialect && dialect.getVersion().isBefore( 17 ) );
 		}
@@ -965,19 +1067,23 @@ public boolean apply(Dialect dialect) {
 
 	public static class SupportsUnnest implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return definesSetReturningFunction( dialect, "unnest" );
+			return definesSetReturningFunction( dialect, "unnest" ) && !(dialect instanceof TiDBDialect);
 		}
 	}
 
 	public static class SupportsGenerateSeries implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
+			if (dialect instanceof SpannerPostgreSQLDialect) {
+				// TODO(spanner): Current limitation of Spanner
+				return false;
+			}
 			return definesSetReturningFunction( dialect, "generate_series" );
 		}
 	}
 
 	public static class SupportsJsonTable implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
-			return definesSetReturningFunction( dialect, "json_table" );
+			return definesSetReturningFunction( dialect, "json_table" ) && !(dialect instanceof TiDBDialect);
 		}
 	}
 
@@ -987,6 +1093,36 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsArrayComparison implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return !(dialect instanceof SpannerPostgreSQLDialect || dialect instanceof SpannerDialect);
+		}
+	}
+
+	public static class SupportsTableWithoutPrimaryKey implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return !(dialect instanceof SpannerPostgreSQLDialect || dialect instanceof SpannerDialect);
+		}
+	}
+
+	public static class SupportsVarSampFunction implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return definesFunction( dialect, "var_samp" );
+		}
+	}
+
+	public static class SupportsPrimaryKeyUpdate implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return !(dialect instanceof SpannerPostgreSQLDialect || dialect instanceof SpannerDialect);
+		}
+	}
+
+	public static class SupportsUserDefinedTypes implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return definesDdlType( dialect, SqlTypes.STRUCT );
+		}
+	}
+
 	public static class SupportsArrayAgg implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return definesFunction( dialect, "array_agg" );
@@ -1017,6 +1153,12 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsArrayContainsNullable implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return definesFunction( dialect, "array_contains_nullable" );
+		}
+	}
+
 	public static class SupportsArrayFill implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return definesFunction( dialect, "array_fill" );
@@ -1107,12 +1249,30 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsArrayReverse implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return definesFunction( dialect, "array_reverse" );
+		}
+	}
+
+	public static class SupportsArraySort implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return definesFunction( dialect, "array_sort" );
+		}
+	}
+
 	public static class SupportsRegexpLike implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return definesFunction( dialect, "regexp_like" );
 		}
 	}
 
+	public static class SupportsIntervalSecondType implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return definesDdlType( dialect, SqlTypes.INTERVAL_SECOND );
+		}
+	}
+
 	public static class SupportsVectorType implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return definesDdlType( dialect, SqlTypes.VECTOR );
@@ -1282,8 +1442,9 @@ public boolean apply(Dialect dialect) {
 	}
 
 	public static class SupportsUpsertOrMerge implements DialectFeatureCheck {
+		@Override
 		public boolean apply(Dialect dialect) {
-			return !( dialect instanceof DerbyDialect );
+			return !(dialect instanceof DerbyDialect);
 		}
 	}
 
@@ -1310,6 +1471,20 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsTimestampComparison implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return !(dialect instanceof SpannerPostgreSQLDialect);
+		}
+	}
+
+	public static class SupportsTimestampWithDateComparison implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return !( dialect instanceof SpannerDialect || dialect instanceof SpannerPostgreSQLDialect );
+		}
+	}
+
 	private static final HashMap<Dialect, FakeFunctionContributions> FUNCTION_CONTRIBUTIONS = new HashMap<>();
 
 	public static boolean definesFunction(Dialect dialect, String functionName) {
@@ -1562,7 +1737,8 @@ public Table addTable(
 				String name,
 				String subselect,
 				boolean isAbstract,
-				MetadataBuildingContext buildingContext) {
+				MetadataBuildingContext buildingContext,
+				boolean isExplicit) {
 			return null;
 		}
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryBasedFunctionalTest.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryBasedFunctionalTest.java
index 06b297ab7603..b0b6d3aab913 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryBasedFunctionalTest.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryBasedFunctionalTest.java
@@ -19,6 +19,7 @@
 import org.hibernate.bytecode.spi.ClassTransformer;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
+import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.jpa.HibernatePersistenceProvider;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
@@ -102,8 +103,8 @@ protected Class<?>[] getAnnotatedClasses() {
 		return NO_CLASSES;
 	}
 
-	protected Map<Object, Object> buildSettings() {
-		Map<Object, Object> settings = getConfig();
+	protected Map<String, Object> buildSettings() {
+		Map<String, Object> settings = getConfig();
 		applySettings( settings );
 
 		if ( exportSchema() ) {
@@ -126,19 +127,19 @@ public void afterAll() {
 	}
 
 
-	protected Map<Object, Object> getConfig() {
-		Map<Object, Object> config = Environment.getProperties();
+	protected Map<String, Object> getConfig() {
+		Map<String, Object> config = PropertiesHelper.map( Environment.getProperties() );
 		ArrayList<Class<?>> classes = new ArrayList<>();
 
 		classes.addAll( Arrays.asList( getAnnotatedClasses() ) );
 		config.put( AvailableSettings.LOADED_CLASSES, classes );
-		for ( Map.Entry<Class, String> entry : getCachedClasses().entrySet() ) {
+		for ( Map.Entry<Class<?>, String> entry : getCachedClasses().entrySet() ) {
 			config.put(
 					AvailableSettings.CLASS_CACHE_PREFIX + "." + entry.getKey().getName(),
 					entry.getValue()
 			);
 		}
-		for ( Map.Entry<String, String> entry : getCachedCollections().entrySet() ) {
+		for ( var entry : getCachedCollections().entrySet() ) {
 			config.put(
 					AvailableSettings.COLLECTION_CACHE_PREFIX + "." + entry.getKey(),
 					entry.getValue()
@@ -158,14 +159,14 @@ protected Map<Object, Object> getConfig() {
 		return config;
 	}
 
-	protected void applySettings(Map<Object, Object> settings) {
+	protected void applySettings(Map<String, Object> settings) {
 		String[] mappings = getMappings();
 		if ( mappings != null ) {
 			settings.put( AvailableSettings.HBM_XML_FILES, String.join( ",", mappings ) );
 		}
 	}
 
-	public Map<Class, String> getCachedClasses() {
+	public Map<Class<?>, String> getCachedClasses() {
 		return new HashMap<>();
 	}
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java
index abeb8d2dfca8..e36735d8c72b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/transaction/TransactionUtil.java
@@ -10,18 +10,22 @@
 import java.util.function.Function;
 import jakarta.persistence.EntityManager;
 
+import jakarta.persistence.PessimisticLockException;
 import jakarta.persistence.QueryTimeoutException;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.SharedSessionContract;
+import org.hibernate.Timeouts;
 import org.hibernate.Transaction;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.dialect.lock.spi.LockTimeoutType;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 
 import org.hibernate.engine.spi.StatelessSessionImplementor;
 import org.hibernate.exception.ConstraintViolationException;
+import org.hibernate.exception.LockTimeoutException;
 import org.hibernate.testing.orm.AsyncExecutor;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.jboss.logging.Logger;
@@ -64,7 +68,7 @@ public static <R> R fromTransaction(EntityManager entityManager, Function<Entity
 	}
 
 	private static <T> void wrapInTransaction(SharedSessionContract session, T actionInput, Consumer<T> action) {
-		final Transaction txn = session.beginTransaction();
+		final var txn = session.beginTransaction();
 		log.trace( "Started transaction" );
 
 		try {
@@ -192,6 +196,12 @@ public static void deleteRow(SessionFactoryScope factoryScope, String tableName,
 					fail( "Expecting update to " + tableName + " to succeed, but failed due to async timeout (presumably due to locks)", re.getCause() );
 				}
 			}
+			else if ( re.getCause() instanceof PessimisticLockException ple
+					&& ple.getCause() instanceof LockTimeoutException ) {
+				if ( !expectingToBlock ) {
+					fail( "Expecting update to " + tableName + " to succeed, but failed due to async timeout (presumably due to locks)", re.getCause() );
+				}
+			}
 			else if ( re.getCause() instanceof ConstraintViolationException cve ) {
 				throw cve;
 			}
@@ -203,7 +213,7 @@ else if ( re.getCause() instanceof ConstraintViolationException cve ) {
 
 	public static void assertRowLock(SessionFactoryScope factoryScope, String tableName, String columnName, String idColumn, Number id, boolean expectingToBlock) {
 		final Dialect dialect = factoryScope.getSessionFactory().getJdbcServices().getDialect();
-		final boolean skipLocked = dialect.getLockingSupport().getMetadata().supportsSkipLocked();
+		final boolean skipLocked = dialect.getLockingSupport().getMetadata().getLockTimeoutType( Timeouts.SKIP_LOCKED ) != LockTimeoutType.NONE;
 		// SQL Server readpast hint doesn't really work unfortunately
 		if ( skipLocked && !( dialect instanceof SQLServerDialect ) ) {
 			factoryScope.inTransaction( (session) -> {
@@ -248,6 +258,12 @@ else if ( !expectingToBlock && resultSize == 0 ) {
 						fail( "Expecting update to " + tableName + " to succeed, but failed due to async timeout (presumably due to locks)", re.getCause() );
 					}
 				}
+				else if ( re.getCause() instanceof PessimisticLockException ple
+						&& ple.getCause() instanceof LockTimeoutException ) {
+					if ( !expectingToBlock ) {
+						fail( "Expecting update to " + tableName + " to succeed, but failed due to async timeout (presumably due to locks)", re.getCause() );
+					}
+				}
 				else if ( re.getCause() instanceof ConstraintViolationException cve ) {
 					throw cve;
 				}
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/ast/HqlHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/ast/HqlHelper.java
index e3f93cd99048..fa07a980efb3 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/ast/HqlHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/ast/HqlHelper.java
@@ -38,11 +38,11 @@
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.internal.JdbcOperationQueryDelete;
-import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.internal.JdbcOperationQueryUpdate;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
+import org.hibernate.sql.exec.spi.JdbcSelect;
 
 /// Utilities for helping test HQL translation
 ///
@@ -190,7 +190,7 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 		}
 	}
 
-	private static class SqmSelectInterpreter<R> extends SqmInterpreter<R, SqmSelectStatement<R>, SelectStatement, JdbcOperationQuerySelect> {
+	private static class SqmSelectInterpreter<R> extends SqmInterpreter<R, SqmSelectStatement<R>, SelectStatement, JdbcSelect> {
 		public SqmSelectInterpreter(
 				String hql,
 				SessionFactoryImplementor sessionFactory) {
@@ -214,7 +214,7 @@ protected SqmTranslator<SelectStatement> createSqmTranslator(
 		}
 
 		@Override
-		protected SqlAstTranslator<JdbcOperationQuerySelect> createSqlAstTranslator(
+		protected SqlAstTranslator<JdbcSelect> createSqlAstTranslator(
 				SqmTranslation<SelectStatement> sqmTranslation) {
 			final SqlAstTranslatorFactory sqlAstTranslatorFactory = sessionFactory
 					.getJdbcServices()
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/ast/LoadingAstHelper.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/ast/LoadingAstHelper.java
index 5d7769923b00..95625f2f7360 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/util/ast/LoadingAstHelper.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/util/ast/LoadingAstHelper.java
@@ -11,6 +11,7 @@
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.sql.ast.spi.SqlAliasBaseManager;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
@@ -56,6 +57,7 @@ public static <I> LoaderTranslation translateLoading(
 				new LoadQueryInfluencers( sessionFactory ),
 				LockOptions.NONE,
 				jdbcParameters::add,
+				new SqlAliasBaseManager(),
 				sessionFactory
 		);
 		var sqlAstTranslator = sessionFactory
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/logger/DelegatingLoggerLevelTest.java b/hibernate-testing/src/test/java/org/hibernate/testing/logger/DelegatingLoggerLevelTest.java
new file mode 100644
index 000000000000..f956350f2f24
--- /dev/null
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/logger/DelegatingLoggerLevelTest.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.testing.logger;
+
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hibernate.testing.logger.LogLevelContext.withLevel;
+
+class DelegatingLoggerLevelTest {
+
+	static Logger SOME_LOGGER = Logger.getLogger( DelegatingLoggerLevelTest.class );
+
+	String STRING_LOGGER_NAME = "logger.name.as.string";
+	Logger SOME_OTHER_LOGGER = Logger.getLogger( STRING_LOGGER_NAME );
+
+	@Test
+	void classStaticLogger() {
+		assertThat( SOME_LOGGER.isEnabled( Logger.Level.DEBUG ) ).isFalse();
+		assertThat( SOME_LOGGER.isEnabled( Logger.Level.FATAL ) ).isTrue();
+
+		try (var ignored = withLevel( DelegatingLoggerLevelTest.class, Logger.Level.DEBUG )) {
+			assertThat( SOME_LOGGER.isEnabled( Logger.Level.DEBUG ) ).isTrue();
+			assertThat( SOME_LOGGER.isEnabled( Logger.Level.FATAL ) ).isTrue();
+		}
+
+		assertThat( SOME_LOGGER.isEnabled( Logger.Level.DEBUG ) ).isFalse();
+		assertThat( SOME_LOGGER.isEnabled( Logger.Level.FATAL ) ).isTrue();
+	}
+
+	@Test
+	void stringLogger() {
+		assertThat( SOME_OTHER_LOGGER.isEnabled( Logger.Level.DEBUG ) ).isFalse();
+		assertThat( SOME_OTHER_LOGGER.isEnabled( Logger.Level.INFO ) ).isFalse();
+		assertThat( SOME_OTHER_LOGGER.isEnabled( Logger.Level.FATAL ) ).isTrue();
+
+		try (var ignored = withLevel( STRING_LOGGER_NAME, Logger.Level.INFO )) {
+			assertThat( SOME_OTHER_LOGGER.isEnabled( Logger.Level.DEBUG ) ).isFalse();
+			assertThat( SOME_OTHER_LOGGER.isEnabled( Logger.Level.INFO ) ).isTrue();
+			assertThat( SOME_OTHER_LOGGER.isEnabled( Logger.Level.FATAL ) ).isTrue();
+		}
+
+		assertThat( SOME_OTHER_LOGGER.isEnabled( Logger.Level.DEBUG ) ).isFalse();
+		assertThat( SOME_OTHER_LOGGER.isEnabled( Logger.Level.INFO ) ).isFalse();
+		assertThat( SOME_OTHER_LOGGER.isEnabled( Logger.Level.FATAL ) ).isTrue();
+	}
+}
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java
index 2506854e06f6..13ddd7f531e2 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java
@@ -28,7 +28,7 @@ public class LogDelegationTest {
 
 	@Test
 	public void testLogDelegationIsActivated() {
-		assertThat( LOG, instanceOf( Log4J2DelegatingLogger.class ) );
+		assertThat( LOG, instanceOf( DelegatingLogger.class ) );
 	}
 
 	@Test
diff --git a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java
index 8bb5fd05a2a8..d5fa3fda169e 100644
--- a/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java
+++ b/hibernate-testing/src/test/java/org/hibernate/testing/logger/LoggingRuleTest.java
@@ -12,6 +12,7 @@
 import org.junit.Test;
 
 import java.lang.invoke.MethodHandles;
+import java.util.Locale;
 
 /**
  * Example usage for the JUnit rule to assert logging events
@@ -23,12 +24,12 @@ public class LoggingRuleTest {
 
 	//Taking this specific logger as a representative example of a Logger
 	//(The purpose of this test is not to log but to exercise the logger methods)
-	private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LoggingRuleTest.class.getName() );
+	private static final CoreMessageLogger LOG = Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LoggingRuleTest.class.getName(), Locale.ROOT );
 
 	//We'll generally not be able to access the same LOG *instance* so make sure a fresh lookup
 	//from Logger#getMessageLogger will work fine as well
 	@Rule
-	public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LoggingRuleTest.class.getName() ) );
+	public LoggerInspectionRule logInspection = new LoggerInspectionRule( Logger.getMessageLogger( MethodHandles.lookup(), CoreMessageLogger.class, LoggingRuleTest.class.getName(), Locale.ROOT ) );
 
 	@Test
 	public void testRule() {
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/SparseDoubleVector.java b/hibernate-vector/src/main/java/org/hibernate/vector/SparseDoubleVector.java
index ab3c6fb412dd..97bf3cb19fa0 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/SparseDoubleVector.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/SparseDoubleVector.java
@@ -21,6 +21,9 @@ public class SparseDoubleVector extends AbstractSparseVector<Double> {
 	private double[] data = EMPTY_FLOAT_ARRAY;
 
 	public SparseDoubleVector(int size) {
+		if ( size <= 0 ) {
+			throw new IllegalArgumentException( "size must be greater than zero" );
+		}
 		this.size = size;
 	}
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/SparseFloatVector.java b/hibernate-vector/src/main/java/org/hibernate/vector/SparseFloatVector.java
index 9f13f8bb2097..5f812535525a 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/SparseFloatVector.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/SparseFloatVector.java
@@ -21,6 +21,9 @@ public class SparseFloatVector extends AbstractSparseVector<Float> {
 	private float[] data = EMPTY_FLOAT_ARRAY;
 
 	public SparseFloatVector(int size) {
+		if ( size <= 0 ) {
+			throw new IllegalArgumentException( "size must be greater than zero" );
+		}
 		this.size = size;
 	}
 
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/CockroachFunctionContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/CockroachFunctionContributor.java
index ca4f7acca60d..11075f39d290 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/CockroachFunctionContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/CockroachFunctionContributor.java
@@ -17,13 +17,13 @@ public void contributeFunctions(FunctionContributions functionContributions) {
 		if ( dialect instanceof CockroachDialect && dialect.getVersion().isSameOrAfter( 24, 2 ) ) {
 			final VectorFunctionFactory vectorFunctionFactory = new VectorFunctionFactory( functionContributions );
 
-			vectorFunctionFactory.cosineDistance( "?1<=>?2" );
-			vectorFunctionFactory.euclideanDistance( "?1<->?2" );
-			vectorFunctionFactory.euclideanSquaredDistance( "(?1<->?2)^2" );
+			vectorFunctionFactory.cosineDistance( "(?1<=>?2)" );
+			vectorFunctionFactory.euclideanDistance( "(?1<->?2)" );
+			vectorFunctionFactory.euclideanSquaredDistance( "((?1<->?2)^2)" );
 			vectorFunctionFactory.l1Distance( "l1_distance(?1,?2)" );
 
-			vectorFunctionFactory.innerProduct( "(?1<#>?2)*-1" );
-			vectorFunctionFactory.negativeInnerProduct( "?1<#>?2" );
+			vectorFunctionFactory.innerProduct( "((?1<#>?2)*-1)" );
+			vectorFunctionFactory.negativeInnerProduct( "(?1<#>?2)" );
 
 			vectorFunctionFactory.vectorDimensions();
 			vectorFunctionFactory.vectorNorm();
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/CockroachTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/CockroachTypeContributor.java
index 4680b984c17d..f80c1b90d3dc 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/CockroachTypeContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/CockroachTypeContributor.java
@@ -47,7 +47,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							floatBasicType,
 							genericVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR.getName()
 			);
@@ -55,7 +55,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							floatVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT32.getName()
 			);
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/DB2VectorTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/DB2VectorTypeContributor.java
index 83a2a62d1b3c..ab843cc31936 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/DB2VectorTypeContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/DB2VectorTypeContributor.java
@@ -48,7 +48,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							floatBasicType,
 							genericVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR.getName()
 			);
@@ -56,7 +56,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							floatVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT32.getName()
 			);
@@ -64,7 +64,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.BYTE ),
 							byteVectorJdbcType,
-							javaTypeRegistry.getDescriptor( byte[].class )
+							javaTypeRegistry.resolveDescriptor( byte[].class )
 					),
 					StandardBasicTypes.VECTOR_INT8.getName()
 			);
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/HANAVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/HANAVectorJdbcType.java
index 9c204d91ae71..30b1f2f5be89 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/HANAVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/HANAVectorJdbcType.java
@@ -45,11 +45,11 @@ public int getDefaultSqlTypeCode() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( float[].class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( float[].class );
 	}
 
 	@Override
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/HANAVectorTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/HANAVectorTypeContributor.java
index 599e416312bc..8723047ac9af 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/HANAVectorTypeContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/HANAVectorTypeContributor.java
@@ -46,7 +46,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							floatBasicType,
 							genericVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR.getName()
 			);
@@ -54,7 +54,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							floatVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT32.getName()
 			);
@@ -77,7 +77,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 						new BasicArrayType<>(
 								basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 								float16VectorJdbcType,
-								javaTypeRegistry.getDescriptor( float[].class )
+								javaTypeRegistry.resolveDescriptor( float[].class )
 						),
 						StandardBasicTypes.VECTOR_FLOAT16.getName()
 				);
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/MariaDBTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/MariaDBTypeContributor.java
index b56662a1185d..22c16d8e6576 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/MariaDBTypeContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/MariaDBTypeContributor.java
@@ -45,7 +45,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							floatBasicType,
 							genericVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR.getName()
 			);
@@ -53,7 +53,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							floatVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT32.getName()
 			);
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/MariaDBVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/MariaDBVectorJdbcType.java
index b72cd7538c30..1f377158bb8b 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/MariaDBVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/MariaDBVectorJdbcType.java
@@ -40,11 +40,11 @@ public int getDefaultSqlTypeCode() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( float[].class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( float[].class );
 	}
 
 	@Override
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/MySQLTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/MySQLTypeContributor.java
index d6bbfeba9528..18c93371242b 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/MySQLTypeContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/MySQLTypeContributor.java
@@ -45,7 +45,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							floatBasicType,
 							genericVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR.getName()
 			);
@@ -53,7 +53,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							floatVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT32.getName()
 			);
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/MySQLVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/MySQLVectorJdbcType.java
index 71095bfce147..94acbd20a24d 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/MySQLVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/MySQLVectorJdbcType.java
@@ -43,11 +43,11 @@ public int getDefaultSqlTypeCode() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( float[].class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( float[].class );
 	}
 
 	@Override
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/OracleVectorTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/OracleVectorTypeContributor.java
index 4e6347b97dfe..c8b337e8f4ab 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/OracleVectorTypeContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/OracleVectorTypeContributor.java
@@ -85,7 +85,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							genericVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR.getName()
 			);
@@ -93,7 +93,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							floatVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT32.getName()
 			);
@@ -101,7 +101,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.DOUBLE ),
 							doubleVectorJdbcType,
-							javaTypeRegistry.getDescriptor( double[].class )
+							javaTypeRegistry.resolveDescriptor( double[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT64.getName()
 			);
@@ -109,7 +109,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.BYTE ),
 							byteVectorJdbcType,
-							javaTypeRegistry.getDescriptor( byte[].class )
+							javaTypeRegistry.resolveDescriptor( byte[].class )
 					),
 					StandardBasicTypes.VECTOR_INT8.getName()
 			);
@@ -117,7 +117,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.BYTE ),
 							bitVectorJdbcType,
-							javaTypeRegistry.getDescriptor( byte[].class )
+							javaTypeRegistry.resolveDescriptor( byte[].class )
 					),
 					StandardBasicTypes.VECTOR_BINARY.getName()
 			);
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGBinaryVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGBinaryVectorJdbcType.java
index 6117483fab9c..49cce8bf4de5 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGBinaryVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGBinaryVectorJdbcType.java
@@ -45,11 +45,11 @@ public <T> JdbcLiteralFormatter<T> getJdbcLiteralFormatter(JavaType<T> javaTypeD
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( byte[].class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( byte[].class );
 	}
 
 //	@Override
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGSparseFloatVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGSparseFloatVectorJdbcType.java
index b7243e1d234f..253bf2872d01 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGSparseFloatVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGSparseFloatVectorJdbcType.java
@@ -39,11 +39,11 @@ public int getDefaultSqlTypeCode() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( float[].class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( float[].class );
 	}
 
 	@Override
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorFunctionContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorFunctionContributor.java
index 66306832861d..1da8255f3143 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorFunctionContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorFunctionContributor.java
@@ -24,15 +24,15 @@ public void contributeFunctions(FunctionContributions functionContributions) {
 		if ( dialect instanceof PostgreSQLDialect ) {
 			final VectorFunctionFactory vectorFunctionFactory = new VectorFunctionFactory( functionContributions );
 
-			vectorFunctionFactory.cosineDistance( "?1<=>?2" );
-			vectorFunctionFactory.euclideanDistance( "?1<->?2" );
-			vectorFunctionFactory.euclideanSquaredDistance( "(?1<->?2)^2" );
+			vectorFunctionFactory.cosineDistance( "(?1<=>?2)" );
+			vectorFunctionFactory.euclideanDistance( "(?1<->?2)" );
+			vectorFunctionFactory.euclideanSquaredDistance( "((?1<->?2)^2)" );
 			vectorFunctionFactory.l1Distance( "l1_distance(?1,?2)" );
-			vectorFunctionFactory.hammingDistance( "?1<~>?2" );
-			vectorFunctionFactory.jaccardDistance( "?1<%>?2" );
+			vectorFunctionFactory.hammingDistance( "(?1<~>?2)" );
+			vectorFunctionFactory.jaccardDistance( "(?1<%>?2)" );
 
-			vectorFunctionFactory.innerProduct( "(?1<#>?2)*-1" );
-			vectorFunctionFactory.negativeInnerProduct( "?1<#>?2" );
+			vectorFunctionFactory.innerProduct( "((?1<#>?2)*-1)" );
+			vectorFunctionFactory.negativeInnerProduct( "(?1<#>?2)" );
 
 			final TypeConfiguration typeConfiguration = functionContributions.getTypeConfiguration();
 			functionContributions.getFunctionRegistry()
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorJdbcType.java
index 1dc0d917f228..e21498916f03 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorJdbcType.java
@@ -41,11 +41,11 @@ public int getDefaultSqlTypeCode() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( float[].class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( float[].class );
 	}
 
 	@Override
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorTypeContributor.java
index 352bc4bb28ad..cbca1c9eaf42 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorTypeContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/PGVectorTypeContributor.java
@@ -66,7 +66,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							floatBasicType,
 							genericVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR.getName()
 			);
@@ -74,7 +74,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							floatVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT32.getName()
 			);
@@ -82,7 +82,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							float16VectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT16.getName()
 			);
@@ -90,7 +90,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.BYTE ),
 							bitVectorJdbcType,
-							javaTypeRegistry.getDescriptor( byte[].class )
+							javaTypeRegistry.resolveDescriptor( byte[].class )
 					),
 					StandardBasicTypes.VECTOR_BINARY.getName()
 			);
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SQLServerCastingVectorJdbcType.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SQLServerCastingVectorJdbcType.java
index c496ca4a8125..228fc7ec1531 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SQLServerCastingVectorJdbcType.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SQLServerCastingVectorJdbcType.java
@@ -48,11 +48,11 @@ public int getDefaultSqlTypeCode() {
 	}
 
 	@Override
-	public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(
+	public JavaType<?> getRecommendedJavaType(
 			Integer precision,
 			Integer scale,
 			TypeConfiguration typeConfiguration) {
-		return typeConfiguration.getJavaTypeRegistry().getDescriptor( float[].class );
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor( float[].class );
 	}
 
 	@Override
diff --git a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SQLServerTypeContributor.java b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SQLServerTypeContributor.java
index 9c095e51871c..86ef700c87ac 100644
--- a/hibernate-vector/src/main/java/org/hibernate/vector/internal/SQLServerTypeContributor.java
+++ b/hibernate-vector/src/main/java/org/hibernate/vector/internal/SQLServerTypeContributor.java
@@ -59,7 +59,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							floatBasicType,
 							genericVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR.getName()
 			);
@@ -67,7 +67,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
 					new BasicArrayType<>(
 							basicTypeRegistry.resolve( StandardBasicTypes.FLOAT ),
 							floatVectorJdbcType,
-							javaTypeRegistry.getDescriptor( float[].class )
+							javaTypeRegistry.resolveDescriptor( float[].class )
 					),
 					StandardBasicTypes.VECTOR_FLOAT32.getName()
 			);
diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/SparseByteVectorUnitTest.java b/hibernate-vector/src/test/java/org/hibernate/vector/SparseByteVectorUnitTest.java
index 9fc656be8801..5658da17ad70 100644
--- a/hibernate-vector/src/test/java/org/hibernate/vector/SparseByteVectorUnitTest.java
+++ b/hibernate-vector/src/test/java/org/hibernate/vector/SparseByteVectorUnitTest.java
@@ -9,6 +9,7 @@
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class SparseByteVectorUnitTest {
 
@@ -51,4 +52,14 @@ public void testFromDenseVectorList() {
 		final SparseByteVector bytes = new SparseByteVector( List.of( (byte) 0, (byte) 3, (byte) 0 ) );
 		assertArrayEquals( new Object[] {(byte) 0, (byte) 3, (byte) 0}, bytes.toArray() );
 	}
+
+	@Test
+	public void testSizeValidation() {
+		assertThrows( IllegalArgumentException.class, () -> new SparseByteVector( 0 ) );
+	}
+
+	@Test
+	public void testNegativeSizeValidation() {
+		assertThrows( IllegalArgumentException.class, () -> new SparseByteVector( -1 ) );
+	}
 }
diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/SparseDoubleVectorUnitTest.java b/hibernate-vector/src/test/java/org/hibernate/vector/SparseDoubleVectorUnitTest.java
index adf14bb2cef2..680d3b24d2c4 100644
--- a/hibernate-vector/src/test/java/org/hibernate/vector/SparseDoubleVectorUnitTest.java
+++ b/hibernate-vector/src/test/java/org/hibernate/vector/SparseDoubleVectorUnitTest.java
@@ -9,6 +9,7 @@
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class SparseDoubleVectorUnitTest {
 
@@ -51,4 +52,14 @@ public void testFromDenseVectorList() {
 		final SparseDoubleVector doubles = new SparseDoubleVector( List.of( (double) 0, (double) 3, (double) 0 ) );
 		assertArrayEquals( new Object[] {(double) 0, (double) 3, (double) 0}, doubles.toArray() );
 	}
+
+	@Test
+	public void testSizeValidation() {
+		assertThrows( IllegalArgumentException.class, () -> new SparseDoubleVector( 0 ) );
+	}
+
+	@Test
+	public void testNegativeSizeValidation() {
+		assertThrows( IllegalArgumentException.class, () -> new SparseDoubleVector( -1 ) );
+	}
 }
diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/SparseFloatVectorUnitTest.java b/hibernate-vector/src/test/java/org/hibernate/vector/SparseFloatVectorUnitTest.java
index 20eb1dd3c3f8..f44cad4fef94 100644
--- a/hibernate-vector/src/test/java/org/hibernate/vector/SparseFloatVectorUnitTest.java
+++ b/hibernate-vector/src/test/java/org/hibernate/vector/SparseFloatVectorUnitTest.java
@@ -9,6 +9,7 @@
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class SparseFloatVectorUnitTest {
 
@@ -51,4 +52,14 @@ public void testFromDenseVectorList() {
 		final SparseFloatVector floats = new SparseFloatVector( List.of( (float) 0, (float) 3, (float) 0 ) );
 		assertArrayEquals( new Object[] {(float) 0, (float) 3, (float) 0}, floats.toArray() );
 	}
+
+	@Test
+	public void testSizeValidation() {
+		assertThrows( IllegalArgumentException.class, () -> new SparseFloatVector( 0 ) );
+	}
+
+	@Test
+	public void testNegativeSizeValidation() {
+		assertThrows( IllegalArgumentException.class, () -> new SparseFloatVector( -1 ) );
+	}
 }
diff --git a/hibernate-vector/src/test/java/org/hibernate/vector/VectorTestHelper.java b/hibernate-vector/src/test/java/org/hibernate/vector/VectorTestHelper.java
index 3edc584d1315..091bb51de414 100644
--- a/hibernate-vector/src/test/java/org/hibernate/vector/VectorTestHelper.java
+++ b/hibernate-vector/src/test/java/org/hibernate/vector/VectorTestHelper.java
@@ -268,7 +268,7 @@ public static String vectorSparseStringLiteral(float[] vector, SessionImplemento
 		final TypeConfiguration typeConfiguration = sessionFactory.getTypeConfiguration();
 		final JdbcLiteralFormatter<SparseFloatVector> literalFormatter = typeConfiguration.getJdbcTypeRegistry()
 				.getDescriptor( SqlTypes.SPARSE_VECTOR_FLOAT32 )
-				.getJdbcLiteralFormatter( typeConfiguration.getJavaTypeRegistry().getDescriptor( SparseFloatVector.class ) );
+				.getJdbcLiteralFormatter( typeConfiguration.getJavaTypeRegistry().resolveDescriptor( SparseFloatVector.class ) );
 		final String jdbcLiteral = literalFormatter.toJdbcLiteral(
 				new SparseFloatVector( vector ),
 				sessionFactory.getJdbcServices().getDialect(),
@@ -284,7 +284,7 @@ public static String vectorSparseStringLiteral(double[] vector, SessionImplement
 		final TypeConfiguration typeConfiguration = sessionFactory.getTypeConfiguration();
 		final JdbcLiteralFormatter<SparseDoubleVector> literalFormatter = typeConfiguration.getJdbcTypeRegistry()
 				.getDescriptor( SqlTypes.SPARSE_VECTOR_FLOAT64 )
-				.getJdbcLiteralFormatter( typeConfiguration.getJavaTypeRegistry().getDescriptor( SparseDoubleVector.class ) );
+				.getJdbcLiteralFormatter( typeConfiguration.getJavaTypeRegistry().resolveDescriptor( SparseDoubleVector.class ) );
 		final String jdbcLiteral = literalFormatter.toJdbcLiteral(
 				new SparseDoubleVector( vector ),
 				sessionFactory.getJdbcServices().getDialect(),
@@ -300,7 +300,7 @@ public static String vectorSparseStringLiteral(byte[] vector, SessionImplementor
 		final TypeConfiguration typeConfiguration = sessionFactory.getTypeConfiguration();
 		final JdbcLiteralFormatter<SparseByteVector> literalFormatter = typeConfiguration.getJdbcTypeRegistry()
 				.getDescriptor( SqlTypes.SPARSE_VECTOR_INT8 )
-				.getJdbcLiteralFormatter( typeConfiguration.getJavaTypeRegistry().getDescriptor( SparseByteVector.class ) );
+				.getJdbcLiteralFormatter( typeConfiguration.getJavaTypeRegistry().resolveDescriptor( SparseByteVector.class ) );
 		final String jdbcLiteral = literalFormatter.toJdbcLiteral(
 				new SparseByteVector( vector ),
 				sessionFactory.getJdbcServices().getDialect(),
diff --git a/local-build-plugins/build.gradle b/local-build-plugins/build.gradle
index c26a961d1c5a..15a7242b6721 100644
--- a/local-build-plugins/build.gradle
+++ b/local-build-plugins/build.gradle
@@ -5,7 +5,7 @@
 plugins {
 	id "java-gradle-plugin"
 	id 'groovy-gradle-plugin'
-	id "com.diffplug.spotless" version "7.0.4"
+	id "com.diffplug.spotless" version "8.3.0"
 }
 
 repositories {
@@ -14,30 +14,30 @@ repositories {
 
 group = 'org.hibernate.build'
 version = '1.0.0-SNAPSHOT'
-buildDir = "target"
+layout.buildDirectory.set(file("target"))
 
 dependencies {
 	implementation gradleApi()
 
 	implementation "jakarta.inject:jakarta.inject-api:2.0.1"
 
-	implementation "org.glassfish.jaxb:jaxb-xjc:4.0.6"
+	implementation "org.glassfish.jaxb:jaxb-xjc:4.0.7"
 	implementation "org.patrodyne.jvnet:hisrc-basicjaxb-tools:2.2.1"
 	implementation "org.patrodyne.jvnet:hisrc-basicjaxb-plugins:2.2.1"
 
-	implementation 'io.smallrye:jandex:3.5.2'
+	implementation 'io.smallrye:jandex:3.5.3'
 	implementation 'org.apache.httpcomponents:httpclient:4.5.14'
 	implementation 'jakarta.json.bind:jakarta.json.bind-api:2.0.0'
 	implementation 'jakarta.json:jakarta.json-api:2.0.2'
 	implementation 'org.eclipse:yasson:2.0.4'
-	implementation 'org.jsoup:jsoup:1.21.1'
+	implementation 'org.jsoup:jsoup:1.22.1'
 
-	implementation "de.thetaphi:forbiddenapis:3.9"
+	implementation "de.thetaphi:forbiddenapis:3.10"
 
-	implementation "org.apache.maven:maven-embedder:3.9.10"
-	implementation "org.apache.maven:maven-compat:3.9.10"
-	implementation "org.apache.maven.resolver:maven-resolver-connector-basic:1.9.23"
-	implementation "org.apache.maven.resolver:maven-resolver-transport-http:1.9.23"
+	implementation "org.apache.maven:maven-embedder:3.9.14"
+	implementation "org.apache.maven:maven-compat:3.9.14"
+	implementation "org.apache.maven.resolver:maven-resolver-connector-basic:1.9.27"
+	implementation "org.apache.maven.resolver:maven-resolver-transport-http:1.9.27"
 	implementation "org.slf4j:slf4j-simple:1.7.36"
 }
 
diff --git a/local-build-plugins/gradle/wrapper/gradle-wrapper.jar b/local-build-plugins/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 033e24c4cdf4..000000000000
Binary files a/local-build-plugins/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/local-build-plugins/gradle/wrapper/gradle-wrapper.properties b/local-build-plugins/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 9f4197d5f4b9..000000000000
--- a/local-build-plugins/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/local-build-plugins/gradlew b/local-build-plugins/gradlew
deleted file mode 100644
index fcb6fca147c0..000000000000
--- a/local-build-plugins/gradlew
+++ /dev/null
@@ -1,248 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"
diff --git a/local-build-plugins/gradlew.bat b/local-build-plugins/gradlew.bat
deleted file mode 100644
index 93e3f59f135d..000000000000
--- a/local-build-plugins/gradlew.bat
+++ /dev/null
@@ -1,92 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/local-build-plugins/src/main/groovy/local.code-quality.gradle b/local-build-plugins/src/main/groovy/local.code-quality.gradle
index 64f4f46b46d5..f485b4891d19 100644
--- a/local-build-plugins/src/main/groovy/local.code-quality.gradle
+++ b/local-build-plugins/src/main/groovy/local.code-quality.gradle
@@ -112,6 +112,7 @@ dependencies {
 }
 
 checkerFramework {
+    version = "dependencies"
     excludeTests = true
     skipCheckerFramework = !gradle.startParameter.taskNames.contains("ciCheck")
     checkers = [
diff --git a/local-build-plugins/src/main/groovy/local.databases.gradle b/local-build-plugins/src/main/groovy/local.databases.gradle
index ab8d6578dda6..236beda160dc 100644
--- a/local-build-plugins/src/main/groovy/local.databases.gradle
+++ b/local-build-plugins/src/main/groovy/local.databases.gradle
@@ -7,6 +7,7 @@ ext {
     // this `db` property is defined in gradle.properties and so we assume it is always available
     assert project.hasProperty('db')
     db = project.getProperty('db')
+    dbVersion = project.getProperty('dbVersion')
     dbHost = System.getProperty( 'dbHost', 'localhost' )
     dbService = System.getProperty( 'dbService', '' )
     dbPassword = System.getProperty( 'dbPassword', '' ).replace('"', '')
@@ -55,17 +56,6 @@ ext {
 //                        'jdbc.datasource' : 'org.apache.derby.jdbc.EmbeddedDataSource',
                     'connection.init_sql' : ''
             ],
-            pgsql : [
-                    'db.dialect' : 'org.hibernate.dialect.PostgreSQLDialect',
-                    'jdbc.driver': 'org.postgresql.Driver',
-                    'jdbc.user'  : 'hibernate_orm_test',
-                    'jdbc.pass'  : 'hibernate_orm_test',
-                    // Disable prepared statement caching due to https://www.postgresql.org/message-id/CAEcMXhmmRd4-%2BNQbnjDT26XNdUoXdmntV9zdr8%3DTu8PL9aVCYg%40mail.gmail.com
-                    'jdbc.url'   : 'jdbc:postgresql://' + dbHost + '/hibernate_orm_test?preparedStatementCacheQueries=0&escapeSyntaxCallMode=callIfNoReturn',
-                    'jdbc.datasource' : 'org.postgresql.Driver',
-//                        'jdbc.datasource' : 'org.postgresql.ds.PGSimpleDataSource',
-                    'connection.init_sql' : ''
-            ],
             pgsql_ci : [
                     'db.dialect' : 'org.hibernate.dialect.PostgreSQLDialect',
                     'jdbc.driver': 'org.postgresql.Driver',
@@ -130,16 +120,6 @@ ext {
                     'jdbc.datasource' : 'com.teradata.jdbc.TeraDriver',
                     'connection.init_sql' : ''
             ],
-            mysql : [
-                    'db.dialect' : 'org.hibernate.dialect.MySQLDialect',
-                    'jdbc.driver': 'com.mysql.cj.jdbc.Driver',
-                    'jdbc.user'  : 'hibernateormtest',
-                    'jdbc.pass'  : 'hibernateormtest',
-                    'jdbc.url'   : 'jdbc:mysql://' + dbHost + '/hibernate_orm_test',
-                    'jdbc.datasource' : 'com.mysql.jdbc.Driver',
-//                        'jdbc.datasource' : 'com.mysql.cj.jdbc.MysqlDataSource',
-                    'connection.init_sql' : ''
-            ],
             mysql_ci : [
                     'db.dialect' : 'org.hibernate.dialect.MySQLDialect',
                     'jdbc.driver': 'com.mysql.cj.jdbc.Driver',
@@ -150,16 +130,6 @@ ext {
 //                        'jdbc.datasource' : 'com.mysql.cj.jdbc.MysqlDataSource',
                     'connection.init_sql' : ''
             ],
-            mariadb : [
-                    'db.dialect' : 'org.hibernate.dialect.MariaDBDialect',
-                    'jdbc.driver': 'org.mariadb.jdbc.Driver',
-                    'jdbc.user'  : 'hibernate_orm_test',
-                    'jdbc.pass'  : 'hibernate_orm_test',
-                    'jdbc.url'   : 'jdbc:mariadb://' + dbHost + '/hibernate_orm_test',
-                    'jdbc.datasource' : 'org.mariadb.jdbc.Driver',
-//                        'jdbc.datasource' : 'org.mariadb.jdbc.MariaDbDataSource',
-                    'connection.init_sql' : ''
-            ],
             mariadb_ci : [
                     'db.dialect' : 'org.hibernate.dialect.MariaDBDialect',
                     'jdbc.driver': 'org.mariadb.jdbc.Driver',
@@ -171,25 +141,15 @@ ext {
                     'connection.init_sql' : ''
             ],
             tidb : [
-                    'db.dialect' : 'org.hibernate.dialect.TiDBDialect',
-                    'jdbc.driver': 'com.mysql.jdbc.Driver',
+                    'db.dialect' : 'org.hibernate.community.dialect.TiDBDialect',
+                    'jdbc.driver': 'com.mysql.cj.jdbc.Driver',
                     'jdbc.user'  : 'hibernate_orm_test',
                     'jdbc.pass'  : 'hibernate_orm_test',
-                    'jdbc.url'   : 'jdbc:mysql://' + dbHost + ':4000/hibernate_orm_test',
-                    'jdbc.datasource' : 'com.mysql.jdbc.Driver',
+                    'jdbc.url'   : 'jdbc:mysql://' + dbHost + ':4000/hibernate_orm_test_$worker?readOnlyPropagatesToServer=false',
+                    'jdbc.datasource' : 'com.mysql.cj.jdbc.Driver',
 //                        'jdbc.datasource' : 'com.mysql.cj.jdbc.MysqlDataSource',
                     'connection.init_sql' : ''
             ],
-            oracle : [
-                    'db.dialect' : 'org.hibernate.dialect.OracleDialect',
-                    'jdbc.driver': 'oracle.jdbc.OracleDriver',
-                    'jdbc.user'  : 'hibernate_orm_test',
-                    'jdbc.pass'  : 'hibernate_orm_test',
-                    'jdbc.url'   : 'jdbc:oracle:thin:@' + dbHost + ':1521/xepdb1',
-                    'jdbc.datasource' : 'oracle.jdbc.OracleDriver',
-//                        'jdbc.datasource' : 'oracle.jdbc.datasource.impl.OracleDataSource',
-                    'connection.init_sql' : ''
-            ],
             oracle_ci : [
                     'db.dialect' : 'org.hibernate.dialect.OracleDialect',
                     'jdbc.driver': 'oracle.jdbc.OracleDriver',
@@ -299,16 +259,6 @@ ext {
                     'jdbc.datasource' : 'oracle.jdbc.OracleDriver',
                     'connection.init_sql' : ''
             ],
-            mssql : [
-                    'db.dialect' : 'org.hibernate.dialect.SQLServerDialect',
-                    'jdbc.driver': 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
-                    'jdbc.user'  : 'hibernate_orm_test',
-                    'jdbc.pass'  : 'hibernate_orm_test',
-                    'jdbc.url'   : 'jdbc:sqlserver://' + dbHost + ';instance=SQLEXPRESS;databaseName=hibernate_orm_test;trustServerCertificate=true',
-                    'jdbc.datasource' : 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
-//                        'jdbc.datasource' : 'com.microsoft.sqlserver.jdbc.SQLServerDataSource',
-                    'connection.init_sql' : ''
-            ],
             mssql_ci : [
                     'db.dialect' : 'org.hibernate.dialect.SQLServerDialect',
                     'jdbc.driver': 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
@@ -324,7 +274,8 @@ ext {
                     'jdbc.driver': 'com.informix.jdbc.IfxDriver',
                     'jdbc.user'  : 'informix',
                     'jdbc.pass'  : 'in4mix',
-                    'jdbc.url'   : 'jdbc:informix-sqli://' + dbHost + ':9088/dev:INFORMIXSERVER=informix;user=informix;password=in4mix;DBDATE=Y4MD-;DELIMIDENT=Y;DB_LOCALE=en_US.utf8',
+                    // IFX_LOCK_MODE_WAIT=-1 makes Informix behave like other databases i.e. block and wait for a lock. Default behavior is nowait
+                    'jdbc.url'   : 'jdbc:informix-sqli://' + dbHost + ':9088/dev:INFORMIXSERVER=informix;user=informix;password=in4mix;DBDATE=Y4MD-;DELIMIDENT=Y;DB_LOCALE=en_US.utf8;IFX_LOCK_MODE_WAIT=-1',
                     'jdbc.datasource' : 'com.informix.jdbc.IfxDriver',
 //                        'jdbc.datasource' : 'com.informix.jdbcx.IfxDataSource',
                     'connection.init_sql' : ''
@@ -352,7 +303,7 @@ ext {
             hana_cloud : [
                     'db.dialect' : 'org.hibernate.dialect.HANADialect',
                     'jdbc.driver': 'com.sap.db.jdbc.Driver',
-                    'jdbc.user'  : 'HIBERNATE_TEST',
+                    'jdbc.user'  : 'hibernate_orm_test_$worker',
                     'jdbc.pass'  : 'H1bernate_test',
                     // Disable prepared statement caching due to https://help.sap.com/viewer/0eec0d68141541d1b07893a39944924e/2.0.04/en-US/78f2163887814223858e4369d18e2847.html
                     'jdbc.url'   : 'jdbc:sap://' + dbHost + ':443/?encrypt=true&validateCertificate=false&statementCacheSize=0',
@@ -363,7 +314,7 @@ ext {
             hana_ci : [
                     'db.dialect' : 'org.hibernate.dialect.HANADialect',
                     'jdbc.driver': 'com.sap.db.jdbc.Driver',
-                    'jdbc.user'  : 'SYSTEM',
+                    'jdbc.user'  : 'hibernate_orm_test_$worker',
                     'jdbc.pass'  : 'H1bernate_test',
                     // Disable prepared statement caching due to https://help.sap.com/viewer/0eec0d68141541d1b07893a39944924e/2.0.04/en-US/78f2163887814223858e4369d18e2847.html
                     'jdbc.url'   : 'jdbc:sap://' + dbHost + ':39017/?statementCacheSize=0',
@@ -406,5 +357,24 @@ ext {
                     'jdbc.url'   : 'jdbc:Altibase://' + dbHost + ':20300/mydb?force_clob_bind=true',
                     'jdbc.datasource' : 'Altibase.jdbc.driver.AltibaseDriver'
             ],
+            spanner : [
+                    'db.dialect'      : 'org.hibernate.dialect.SpannerDialect',
+                    'jdbc.driver'     : 'com.google.cloud.spanner.jdbc.JdbcDriver',
+                    'jdbc.user'       : '',        // Not used by Spanner
+                    'jdbc.pass'       : '',        // Not used by Spanner
+                    'connection.init_sql' : '',
+                    // autoConfigEmulator=true creates the necessary instances and DBs if they don't exist already
+                    'jdbc.url'        : 'jdbc:cloudspanner://' + dbHost + ':901$worker/projects/orm-test-project/instances/orm-test-instance/databases/orm-test-db?autoConfigEmulator=true;lenient=true;unknownLength=255',
+                    'jdbc.datasource' : 'com.google.cloud.spanner.jdbc.JdbcDriver'
+            ],
+            spannerpgsql : [
+                    'db.dialect' : 'org.hibernate.community.dialect.SpannerPostgreSQLDialect',
+                    'jdbc.driver': 'com.google.cloud.spanner.jdbc.JdbcDriver',
+                    'jdbc.user'  : 'root',
+                    'jdbc.pass'  : '',
+                    'jdbc.url'   : 'jdbc:cloudspanner://' + dbHost + ':901$worker/projects/orm-test-project/instances/orm-test-instance/databases/orm-test-db?lenient=true;autoconfigemulator=true;dialect=postgresql;defaultsequencekind=bit_reversed_positive;unknownLength=255;',
+                    'jdbc.datasource': 'com.google.cloud.spanner.jdbc.JdbcDriver',
+                    'connection.init_sql' : '',
+            ],
     ]
 }
diff --git a/local-build-plugins/src/main/groovy/local.java-module.gradle b/local-build-plugins/src/main/groovy/local.java-module.gradle
index e8ad687c6206..913a34d36e4f 100644
--- a/local-build-plugins/src/main/groovy/local.java-module.gradle
+++ b/local-build-plugins/src/main/groovy/local.java-module.gradle
@@ -20,6 +20,11 @@ plugins {
     id "project-report"
 }
 
+def skipJacoco = project.hasProperty('skipJacoco') ? project.getProperty('skipJacoco').toBoolean() : false
+if (!skipJacoco) {
+    plugins.apply('jacoco')
+}
+
 def hibernateVersion = ormBuildDetails.hibernateVersion
 def jpaVersion = ormBuildDetails.jpaVersion
 
@@ -30,11 +35,11 @@ sourceSets {
     test {
         resources {
             configure( srcDir('src/test/resources') ) {
-                filter {
-                    include '*.properties'
-                    include '*.xml'
-                    include '**/*.properties'
-                    include '**/*.xml'
+            filter {
+                include '*.properties'
+                include '*.xml'
+                include '**/*.properties'
+                include '**/*.xml'
                 }
             }
         }
@@ -49,6 +54,7 @@ dependencies {
     compileOnly jdbcLibs.oracle
     compileOnly (jdbcLibs.oracleJdbcJacksonOsonExtension) {
         exclude group: 'com.oracle.database.jdbc', module: 'ojdbc8'
+        exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
     }
 
     // JUnit dependencies made up of:
@@ -77,6 +83,7 @@ dependencies {
     testRuntimeOnly jdbcLibs.gaussdb
     testRuntimeOnly jdbcLibs.sybase
     testRuntimeOnly jdbcLibs.teradata
+    testRuntimeOnly jdbcLibs.spanner
     testRuntimeOnly rootProject.fileTree(dir: 'drivers', include: '*.jar')
 
     // Since both the DB2 driver and HANA have a package "net.jpountz" we have to add dependencies conditionally
@@ -103,6 +110,7 @@ dependencies {
         testRuntimeOnly jdbcLibs.oracleXmlParser
         testRuntimeOnly (jdbcLibs.oracleJdbcJacksonOsonExtension) {
             exclude group: 'com.oracle.database.jdbc', module: 'ojdbc8'
+            exclude group: 'jakarta.persistence', module: 'jakarta.persistence-api'
         }
     }
     else if ( db.startsWith( 'altibase' ) ) {
@@ -146,6 +154,8 @@ tasks.withType( JavaCompile ).configureEach {
     options.forkOptions.memoryMaximumSize = '896m'
 
     options.compilerArgs += [
+            // Limit observable modules to prevent accidental dependency on java.desktop (HHH-20148) and other non essential modules
+            '--limit-modules', 'java.base,java.compiler,java.instrument,java.management,java.naming,java.rmi,java.sql,java.transaction.xa,java.xml,jdk.compiler,jdk.jfr,java.sql.rowset',
             // disable adding @Generated annotation in the logger impls to make
             // the logging annotation processor create the same sources each time.
             "-Aorg.jboss.logging.tools.addGeneratedAnnotation=false"
@@ -178,12 +188,12 @@ processTestResources {
         }
         copy {
             from file( 'src/test/resources' )
-            into file( "${buildDir}/resources/test" )
+            into layout.buildDirectory.dir("resources/test").get().asFile
             exclude 'src/test/resources/hibernate.properties'
         }
         copy {
             from file( 'src/test/resources/hibernate.properties' )
-            into file( "${buildDir}/resources/test" )
+            into layout.buildDirectory.dir("resources/test").get().asFile
             filter( ReplaceTokens, tokens: dbBundle[db] )
         }
     }
@@ -193,7 +203,7 @@ processTestResources {
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Testing
 
-tasks.withType( Test.class ).each { test ->
+tasks.withType( Test.class ).configureEach { test ->
     test.useJUnitPlatform()
 
     // Byteman needs this property to be set, https://developer.jboss.org/thread/274997
@@ -214,7 +224,7 @@ tasks.withType( Test.class ).each { test ->
     test.systemProperties['hibernate.testing.bytecode.enhancement.extension.engine.enabled'] = true
     test.systemProperties['hibernate.test.validatefailureexpected'] = true
     test.systemProperties['hibernate.highlight_sql'] = false
-    test.systemProperties += System.properties.findAll { it.key.startsWith( "hibernate." ) }
+    test.systemProperties += providers.systemPropertiesPrefixedBy("hibernate.").get()
 
     test.enableAssertions = true
 
@@ -228,9 +238,29 @@ tasks.withType( Test.class ).each { test ->
             excludeTestsMatching project.property('excludeTests').toString()
         }
     }
+    if (!skipJacoco) {
+        def coverageReportSuffix = providers.gradleProperty('db').orElse('default')
+                .flatMap { db ->
+                    // Oracle DBs tested on OTP are all using the same db name no matter the version...
+                    // this would be a problem for creating/merging Jacoco reports, hence:
+                    if ("oracle_test_pilot_database" == db) {
+                        return providers.environmentVariable("RDBMS").orElse(db)
+                    } else {
+                        return providers.provider { db }
+                    }
+                }
+        def javaVersion = JavaVersion.current().majorVersion
+        test.jacoco {
+            destinationFile = layout.buildDirectory.file(
+                    coverageReportSuffix.map { db -> "jacoco/report-${db}-jdk${javaVersion}.exec" }
+            ).get().asFile
+        }
+    }
 }
 
 test {
+    inputs.property( "dbVersion", dbVersion )
+
     // Keep system properties in sync with gradle.properties!
     systemProperty 'user.language', 'en'
     systemProperty 'user.country', 'US'
@@ -243,8 +273,8 @@ test {
         // Log a statement for each test.
         // Used in the Travis build so that Travis doesn't end up panicking because there's no output for a long time.
         testLogging {
-            displayGranularity 1
-            events "passed", "skipped", "failed"
+            displayGranularity = 1
+            events = ["passed", "skipped", "failed"]
             exceptionFormat = 'full'
         }
     }
@@ -253,7 +283,7 @@ test {
 // Attach tools JAR to the classpath for byteman tests
 final File toolsJar = file("${System.getProperty('java.home')}/../lib/tools.jar")
 if ( toolsJar.exists() ) {
-    dependencies{
+    dependencies {
         testImplementation files( toolsJar )
     }
 }
@@ -268,7 +298,7 @@ java {
     withSourcesJar()
 }
 
-tasks.withType(Jar).configureEach {
+tasks.withType(Jar).configureEach {jarTask ->
     manifest {
         attributes(
                 // Basic JAR manifest attributes
@@ -288,41 +318,38 @@ tasks.withType(Jar).configureEach {
                 'Bundle-Vendor': 'Hibernate.org',
                 'Bundle-DocURL': "https://hibernate.org/orm/releases/${hibernateVersion.family}"
         )
+        if ("jar".equals(jarTask.name)) {
+            attributes(
+                    // Java 9 module name
+                    'Automatic-Module-Name': java9ModuleName,
+
+                    // BND Plugin instructions (for OSGi):
+                    '-reproducible': true,
+                    '-noextraheaders': true,
+                    'Bundle-Name': project.name,
+                    'Bundle-SymbolicName': java9ModuleName,
+                    // This is overridden in some sub-projects
+                    'Import-Package': [
+                            // Temporarily support JTA 1.1 -- Karaf and other frameworks still
+                            // use it.  Without this, the plugin generates [1.2,2).
+                            'javax.transaction;version="[1.1,2)"',
+                            // Also import every package referenced in the code
+                            // (note that '*' is resolved at build time to a list of packages)
+                            '*'
+                    ].join( ',' ),
+                    '-exportcontents': "*;version=${project.version}"
+            )
+        }
     }
-}
-
-tasks.named("jar") {
-    manifest {
-        attributes(
-                // Java 9 module name
-                'Automatic-Module-Name': java9ModuleName,
-
-                // BND Plugin instructions (for OSGi):
-                '-reproducible': true,
-                '-noextraheaders': true,
-                'Bundle-Name': project.name,
-                'Bundle-SymbolicName': java9ModuleName,
-                // This is overridden in some sub-projects
-                'Import-Package': [
-                        // Temporarily support JTA 1.1 -- Karaf and other frameworks still
-                        // use it.  Without this, the plugin generates [1.2,2).
-                        'javax.transaction;version="[1.1,2)"',
-                        // Also import every package referenced in the code
-                        // (note that '*' is resolved at build time to a list of packages)
-                        '*'
-                ].join( ',' ),
-                '-exportcontents': "*;version=${project.version}"
-        )
-    }
-    metaInf {
-        from(rootProject.projectDir, {
-            include "LICENSE.txt"
-        })
+    if ("jar".equals(jarTask.name)) {
+        metaInf {
+            from(rootProject.projectDir, {
+                include "LICENSE.txt"
+            })
+        }
     }
 }
 
-
-
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Reproducible Builds
 
@@ -343,5 +370,10 @@ configurations.configureEach {
         if (details.requested.group == "net.bytebuddy" && details.requested.name == 'byte-buddy-agent') {
             details.useVersion libs.versions.byteBuddy.get()
         }
+
+        // Force all 'checker-qual' (RUNTIME) requests to instead use 'checker-qual-android' (CLASS)
+        if (details.requested.group == 'org.checkerframework' && details.requested.name == 'checker-qual') {
+            details.useTarget("org.checkerframework:checker-qual-android:${details.requested.version}")
+        }
     }
 }
diff --git a/local-build-plugins/src/main/groovy/local.javadoc.gradle b/local-build-plugins/src/main/groovy/local.javadoc.gradle
index fbd6ee37e912..7a3773a4c5d5 100644
--- a/local-build-plugins/src/main/groovy/local.javadoc.gradle
+++ b/local-build-plugins/src/main/groovy/local.javadoc.gradle
@@ -11,7 +11,7 @@ configurations {
 }
 
 dependencies {
-    themezip 'org.hibernate.infra:hibernate-asciidoctor-theme:6.1.1.Final@zip'
+    themezip 'org.hibernate.infra:hibernate-asciidoctor-theme:6.1.2.Final@zip'
 }
 
 def unpackThemeTask = tasks.register('unpackTheme', Copy) {
@@ -66,7 +66,9 @@ tasks.withType(Javadoc).configureEach {
         use = true
         quiet()
 
-        addBooleanOption('Xdoclint:none', true)
+        addBooleanOption('Xdoclint:all,-missing', true)
+        // uncomment the `Werror` to get a bit more failures ;)
+        // addBooleanOption('Werror', true)
 
         header = "<div id=\"toggleContainer\"></div>"
         addStringOption '-add-script', rootThemeDir.dir('resources').file('theme-switch.js').asFile.absolutePath
diff --git a/local-build-plugins/src/main/groovy/local.publishing-group-relocation.gradle b/local-build-plugins/src/main/groovy/local.publishing-group-relocation.gradle
index 4243ab9b618d..4b15e76efc08 100644
--- a/local-build-plugins/src/main/groovy/local.publishing-group-relocation.gradle
+++ b/local-build-plugins/src/main/groovy/local.publishing-group-relocation.gradle
@@ -26,4 +26,18 @@ publishingExtension.publications.create("groupRelocation", MavenPublication) {
             }
         }
     }
-}
\ No newline at end of file
+}
+
+// this should to stay, even if the publishing of
+// relocation artifacts gets stopped at some point
+// it ensures for Gradle consumers that you do not have
+// a pre-relocation artifact and a post-relocation artifact
+// in the same resolvable configuration
+configurations
+        .matching { it.name in ['apiElements', 'runtimeElements'] }
+        .configureEach {
+            outgoing {
+                capability("$project.group:$project.name:$project.version")
+                capability("$oldGroupId:$project.name:$project.version")
+            }
+        }
diff --git a/local-build-plugins/src/main/groovy/local.publishing-java-module.gradle b/local-build-plugins/src/main/groovy/local.publishing-java-module.gradle
index 78423d787db3..2fa2403b4c4c 100644
--- a/local-build-plugins/src/main/groovy/local.publishing-java-module.gradle
+++ b/local-build-plugins/src/main/groovy/local.publishing-java-module.gradle
@@ -9,13 +9,6 @@ plugins {
     id "local.code-quality"
 }
 
-// Ideally this should be in `local.java-module.gradle`,
-// but we need to skip this in hibernate-gradle-plugin.
-def skipJacoco = project.hasProperty('skipJacoco') ? project.getProperty('skipJacoco').toBoolean() : false
-if (!skipJacoco) {
-    plugins.apply('jacoco')
-}
-
 configurations {
     javadocSources {
         description = "All Java sources for the project's Javadoc"
@@ -27,10 +20,57 @@ configurations {
 
 dependencies {
     javadocSources sourceSets.main.allJava.filter { file ->
-        !file.path.contains( "/internal/" )
+        !(file.path.contains("/internal/")
+                || file.path.contains("/org/hibernate/boot/jaxb/")
+                || file.path.contains("/org/hibernate/tuple/")
+                || file.path.contains("/org/hibernate/grammars/hql/")
+        )
     }
+
+    // align artifacts natively when consuming through Gradle
+    api platform(project(":hibernate-platform"))
+}
+
+def moduleVersionAlignmentDependencies = configurations.dependencyScope("moduleVersionAlignmentDependencies") {
+    dependencies.add(project.dependencies.create(project) { transitive = false })
+    dependencies.add(project.dependencies.create(project.dependencies.platform(project(":hibernate-platform"))))
+}
+def moduleVersionAlignment = configurations.resolvable("moduleVersionAlignment") {
+    extendsFrom(moduleVersionAlignmentDependencies.get())
 }
+def verifyModuleVersionAlignment = tasks.register("verifyModuleVersionAlignment") {
+    group = "verification"
+    description = "Verify module version alignment"
 
+    def rootComponent = moduleVersionAlignment.flatMap {
+        it.incoming.getResolutionResult().rootComponent
+    }
+    def projectPath = project.path
+
+    doLast {
+        if (!rootComponent
+                .get()
+                .dependencies
+                .find {
+                    it instanceof ResolvedDependencyResult &&
+                            it.selected.id instanceof ProjectComponentIdentifier &&
+                            it.selected.id.projectPath == ":hibernate-platform"
+                }
+                .selected
+                .dependencies
+                .any {
+                    it instanceof ResolvedDependencyResult &&
+                            it.constraint &&
+                            it.selected.id instanceof ProjectComponentIdentifier &&
+                            it.selected.id.projectPath == projectPath
+                }) {
+            throw new GradleException(":hibernate-platform is missing dependency on $projectPath")
+        }
+    }
+}
+tasks.named("check") {
+    dependsOn(verifyModuleVersionAlignment)
+}
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Publishing
@@ -56,12 +96,3 @@ def releasePrepareTask = tasks.register("releasePrepare") {
     // used by JReleaser during the release process
     dependsOn tasks.publishAllPublicationsToStagingRepository
 }
-
-// used from the h2 CI job
-tasks.register("preVerifyRelease") {
-    group = "release-prepare"
-    description = "Delegates to `releasePrepare` task"
-
-    dependsOn releasePrepareTask
-}
-
diff --git a/local-build-plugins/src/main/groovy/local.publishing.gradle b/local-build-plugins/src/main/groovy/local.publishing.gradle
index d5bc77b1b947..d62e9a79d971 100644
--- a/local-build-plugins/src/main/groovy/local.publishing.gradle
+++ b/local-build-plugins/src/main/groovy/local.publishing.gradle
@@ -7,12 +7,6 @@ plugins {
     id "maven-publish"
 }
 
-// Disable Gradle module metadata publishing until we know what we want.
-// https://docs.gradle.org/6.0.1/userguide/publishing_gradle_module_metadata.html#sub:disabling-gmm-publication
-tasks.withType(GenerateModuleMetadata).configureEach {
-    enabled = false
-}
-
 if ( !project.description ) {
     project.description = "The Hibernate ORM $project.name module"
 }
diff --git a/local-build-plugins/src/main/java/org/hibernate/build/OrmBuildDetails.java b/local-build-plugins/src/main/java/org/hibernate/build/OrmBuildDetails.java
index 991d4e0fbf6a..cf8593af9bf3 100644
--- a/local-build-plugins/src/main/java/org/hibernate/build/OrmBuildDetails.java
+++ b/local-build-plugins/src/main/java/org/hibernate/build/OrmBuildDetails.java
@@ -9,6 +9,7 @@
 
 import javax.inject.Inject;
 import java.io.File;
+import java.util.Objects;
 
 import static org.hibernate.build.HibernateVersion.fromVersionFile;
 
@@ -22,6 +23,7 @@ public abstract class OrmBuildDetails {
 	private final JpaVersion jpaVersion;
 
 	private final String databaseName;
+	private final String databaseVersion;
 
 	@Inject
 	public OrmBuildDetails(Project project) {
@@ -33,6 +35,7 @@ public OrmBuildDetails(Project project) {
 		jpaVersion = JpaVersion.from( project );
 
 		databaseName = (String) project.property( "db" );
+		databaseVersion = Objects.requireNonNullElse( (String) project.findProperty( "dbVersion" ), "latest" );
 	}
 
 	public Provider<File> getVersionFileAccess() {
@@ -70,4 +73,13 @@ public String getJpaVersionNameOsgi() {
 	public String getDatabaseName() {
 		return databaseName;
 	}
+
+	public String getDatabaseVersion() {
+		return databaseVersion;
+	}
+
+	public String getDatabaseTag() {
+		final String dbSuffix = databaseVersion == null ? "" : ("-" + databaseVersion);
+		return getDatabaseName() + dbSuffix;
+	}
 }
diff --git a/local-build-plugins/src/main/java/org/hibernate/build/aspects/ModuleAspect.java b/local-build-plugins/src/main/java/org/hibernate/build/aspects/ModuleAspect.java
index b4ef3dd97789..af7f70a678a3 100644
--- a/local-build-plugins/src/main/java/org/hibernate/build/aspects/ModuleAspect.java
+++ b/local-build-plugins/src/main/java/org/hibernate/build/aspects/ModuleAspect.java
@@ -32,6 +32,7 @@ public void apply(Project target) {
 
 		target.getExtensions().add( "jakartaJpaVersion", ormBuildDetails.getJpaVersionNameOsgi() );
 		target.getExtensions().add( "db", ormBuildDetails.getDatabaseName() );
+		target.getExtensions().add( "dbVersion", ormBuildDetails.getDatabaseVersion() );
 
 		target.getConfigurations().configureEach( (files) -> {
 			files.exclude( Map.of( "group", "xml-apis", "module", "xml-apis" ) );
diff --git a/local-build-plugins/src/main/java/org/hibernate/build/xjc/XjcListenerImpl.java b/local-build-plugins/src/main/java/org/hibernate/build/xjc/XjcListenerImpl.java
index 6c6a94f38385..1942953fe937 100644
--- a/local-build-plugins/src/main/java/org/hibernate/build/xjc/XjcListenerImpl.java
+++ b/local-build-plugins/src/main/java/org/hibernate/build/xjc/XjcListenerImpl.java
@@ -5,7 +5,7 @@
 package org.hibernate.build.xjc;
 
 import com.sun.tools.xjc.XJCListener;
-import org.gradle.api.Project;
+import org.gradle.api.logging.Logger;
 import org.xml.sax.SAXParseException;
 
 /**
@@ -15,12 +15,12 @@
  */
 public class XjcListenerImpl extends XJCListener {
 	private final String schemaName;
-	private final Project project;
+	private final Logger logger;
 	private boolean hadErrors;
 
-	public XjcListenerImpl(String schemaName, Project project) {
+	public XjcListenerImpl(String schemaName, Logger logger) {
 		this.schemaName = schemaName;
-		this.project = project;
+		this.logger = logger;
 	}
 
 	public boolean hadErrors() {
@@ -29,33 +29,33 @@ public boolean hadErrors() {
 
 	@Override
 	public void generatedFile(String fileName, int current, int total) {
-		project.getLogger().info( "XJC generated file ({}) : {}", schemaName, fileName );
+		logger.info( "XJC generated file ({}) : {}", schemaName, fileName );
 	}
 
 	@Override
 	public void message(String msg) {
-		project.getLogger().info( "XJC message ({}) : {}", schemaName, msg );
+		logger.info( "XJC message ({}) : {}", schemaName, msg );
 	}
 
 	@Override
 	public void info(SAXParseException exception) {
-		project.getLogger().info( "XJC info ({})", schemaName, exception );
+		logger.info( "XJC info ({})", schemaName, exception );
 	}
 
 	@Override
 	public void warning(SAXParseException exception) {
-		project.getLogger().warn( "XJC warning ({})",schemaName,  exception );
+		logger.warn( "XJC warning ({})",schemaName,  exception );
 	}
 
 	@Override
 	public void error(SAXParseException exception) {
 		hadErrors = true;
-		project.getLogger().error( "XJC error ({})", schemaName, exception );
+		logger.error( "XJC error ({})", schemaName, exception );
 	}
 
 	@Override
 	public void fatalError(SAXParseException exception) {
 		hadErrors = true;
-		project.getLogger().error( "XJC fatal error ({})", schemaName, exception );
+		logger.error( "XJC fatal error ({})", schemaName, exception );
 	}
 }
diff --git a/local-build-plugins/src/main/java/org/hibernate/build/xjc/XjcTask.java b/local-build-plugins/src/main/java/org/hibernate/build/xjc/XjcTask.java
index de38970a8d47..677dc16d00b9 100644
--- a/local-build-plugins/src/main/java/org/hibernate/build/xjc/XjcTask.java
+++ b/local-build-plugins/src/main/java/org/hibernate/build/xjc/XjcTask.java
@@ -8,6 +8,7 @@
 import com.sun.tools.xjc.Driver;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.FileSystemOperations;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.SetProperty;
@@ -20,6 +21,7 @@
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.TaskAction;
 
+import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Set;
@@ -30,7 +32,7 @@
  * @author Steve Ebersole
  */
 @CacheableTask
-public class XjcTask extends DefaultTask {
+public abstract class XjcTask extends DefaultTask {
 	private final Property<String> schemaName;
 	private final DirectoryProperty outputDirectory;
 	private final RegularFileProperty xsdFile;
@@ -49,6 +51,9 @@ public XjcTask() {
 		schemaName.convention( xsdFile.map( regularFile -> regularFile.getAsFile().getName() ) );
 	}
 
+	@Inject
+	protected abstract FileSystemOperations getFileSystemOperations();
+
 	@Internal
 	public Property<String> getSchemaName() {
 		return schemaName;
@@ -78,9 +83,9 @@ public DirectoryProperty getOutputDirectory() {
 
 	@TaskAction
 	public void generateJaxbBindings() {
-		getProject().delete( outputDirectory.get().getAsFileTree() );
+		getFileSystemOperations().delete( spec -> spec.delete( outputDirectory.get().getAsFileTree() ) );
 
-		final XjcListenerImpl listener = new XjcListenerImpl( schemaName.get(), getProject() );
+		final XjcListenerImpl listener = new XjcListenerImpl( schemaName.get(), getLogger() );
 		final String[] args = buildXjcArgs();
 
 		try {
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrHelper.java b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrHelper.java
index 1ec73679fe41..f9d6891e7d03 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrHelper.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrHelper.java
@@ -11,7 +11,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 
-import org.gradle.api.Project;
+import org.gradle.api.logging.Logger;
 
 /**
  * This is intended to deal with <a href="https://github.com/antlr/antlr4/issues/2634">this Antlr issue</a>
@@ -31,12 +31,12 @@ private AntlrHelper() {
 	 *
 	 * @param generationDirectory The (temp) directory where we did the generation, including package directory structure
 	 * @param outputDirectory The {@code $buildDir/generated/sources/antlr} subdirectory (including package directory structure) into which to copy the fixed files.
-	 * @param project The Gradle project ref
+	 * @param logger The Gradle's context aware task logger
 	 */
 	public static void stripSillyGeneratedFromLines(
 			File generationDirectory,
 			File outputDirectory,
-			Project project) {
+			Logger logger) {
 		final File[] generatedJavaFiles = generationDirectory.listFiles( (dir, name) -> name.endsWith( ".java" ) );
 		if ( generatedJavaFiles == null ) {
 			// warn?
@@ -44,15 +44,15 @@ public static void stripSillyGeneratedFromLines(
 		}
 
 		for ( int i = 0; i < generatedJavaFiles.length; i++ ) {
-			stripSillyGeneratedFromLineFromFile( generatedJavaFiles[i], outputDirectory, project );
+			stripSillyGeneratedFromLineFromFile( generatedJavaFiles[i], outputDirectory, logger );
 		}
 	}
 
 	private static void stripSillyGeneratedFromLineFromFile(
 			File generatedJavaFile,
 			File outputDirectory,
-			Project project) {
-		project.getLogger().lifecycle( "Stripping silly generated-from line from {} into {}",
+			Logger logger) {
+		logger.lifecycle( "Stripping silly generated-from line from {} into {}",
 				generatedJavaFile.getAbsolutePath(),
 				outputDirectory.getAbsolutePath() );
 
@@ -73,7 +73,7 @@ private static void stripSillyGeneratedFromLineFromFile(
 			}
 		}
 		catch (IOException e) {
-			project.getLogger().lifecycle( "Unable to remove the generated-from line added by Antlr to the generated file: {}", e.getMessage() );
+			logger.lifecycle( "Unable to remove the generated-from line added by Antlr to the generated file: {}", e.getMessage() );
 		}
 	}
 }
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrPlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrPlugin.java
index fb135ec77e77..705aaf859038 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrPlugin.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/AntlrPlugin.java
@@ -71,6 +71,15 @@ private void populateGrammars(AntlrSpec antlrSpec) {
 				}
 		);
 
+		antlrSpec.getGrammarDescriptors().create(
+				"deprecated-graph",
+				(grammarDescriptor) -> {
+					grammarDescriptor.getPackageName().set( GRAPH_PKG );
+					grammarDescriptor.getLexerFileName().set( "GraphLanguageLexer.g4" );
+					grammarDescriptor.getParserFileName().set( "LegacyGraphLanguageParser.g4" );
+				}
+		);
+
 		antlrSpec.getGrammarDescriptors().create(
 				"graph",
 				(grammarDescriptor) -> {
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarGenerationTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarGenerationTask.java
index 9a50f5544eb8..43dedaf804d2 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarGenerationTask.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/antlr/SplitGrammarGenerationTask.java
@@ -5,10 +5,12 @@
 package org.hibernate.orm.antlr;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import javax.inject.Inject;
 
 import org.gradle.api.DefaultTask;
+import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.Directory;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.Provider;
@@ -36,6 +38,9 @@ public abstract class SplitGrammarGenerationTask extends DefaultTask {
 	private final Provider<Directory> generationDirectory;
 	private final Provider<Directory> outputDirectory;
 
+	private final Configuration antlrConfiguration;
+	private final Path projectDir;
+
 	@Inject
 	public SplitGrammarGenerationTask(
 			SplitGrammarDescriptor grammarDescriptor,
@@ -65,6 +70,9 @@ public SplitGrammarGenerationTask(
 			final Directory outputBaseDirectory = antlrSpec.getOutputBaseDirectory().get();
 			return outputBaseDirectory.dir( grammarDescriptor.getPackageName().get().replace( '.', '/' ) );
 		} );
+
+		antlrConfiguration = getProject().getConfigurations().getByName( "antlr" );
+		projectDir = getProject().getProjectDir().getAbsoluteFile().toPath();
 	}
 
 	@InputFile
@@ -100,14 +108,14 @@ public void generateLexerAndParser() {
 		generateLexer( generationDir );
 		generateParser( generationDir );
 
-		stripSillyGeneratedFromLines( generationDir, outputDir, getProject() );
+		stripSillyGeneratedFromLines( generationDir, outputDir, getLogger() );
 	}
 
 
 	private void generateLexer(File outputDir) {
 		final File lexerFile = getLexerGrammarFile().get().getAsFile();
 
-		getProject().getLogger().lifecycle(
+		getLogger().lifecycle(
 				"Starting Antlr lexer grammar generation `{}` : `{}` -> `{}`",
 				grammarDescriptor.getName(),
 				lexerFile.getAbsolutePath(),
@@ -118,9 +126,9 @@ private void generateLexer(File outputDir) {
 		execOperations.javaexec(
 				(javaExecSpec) -> {
 					javaExecSpec.getMainClass().set( "org.antlr.v4.Tool" );
-					javaExecSpec.classpath( getProject().getConfigurations().getByName( "antlr" ) );
+					javaExecSpec.classpath( antlrConfiguration );
 					javaExecSpec.args(
-							"-o", getProject().relativePath( outputDir.getAbsolutePath() ),
+							"-o", projectDir.relativize( outputDir.toPath() ),
 							"-long-messages",
 							lexerFile.getAbsolutePath()
 					);
@@ -131,7 +139,7 @@ private void generateLexer(File outputDir) {
 	private void generateParser(File outputDir) {
 		final File parserFile = getParserGrammarFile().get().getAsFile();
 
-		getProject().getLogger().lifecycle(
+		getLogger().lifecycle(
 				"Starting Antlr parser grammar generation `{}` : `{}` -> `{}`",
 				grammarDescriptor.getName(),
 				parserFile.getAbsolutePath(),
@@ -142,9 +150,9 @@ private void generateParser(File outputDir) {
 		execOperations.javaexec(
 				(javaExecSpec) -> {
 					javaExecSpec.getMainClass().set( "org.antlr.v4.Tool" );
-					javaExecSpec.classpath( getProject().getConfigurations().named( "antlr" ) );
+					javaExecSpec.classpath( antlrConfiguration );
 					javaExecSpec.args(
-							"-o", getProject().relativePath( outputDir.getAbsolutePath() ),
+							"-o", projectDir.relativize( outputDir.toPath() ),
 							"-long-messages",
 							parserFile.getAbsolutePath()
 					);
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/db/DatabaseServicePlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/db/DatabaseServicePlugin.java
index 379dd5415186..617159ebc2d1 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/db/DatabaseServicePlugin.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/db/DatabaseServicePlugin.java
@@ -27,7 +27,7 @@ public void apply(Project project) {
 				DatabaseService.class,
 				spec -> spec.getMaxParallelUsages().set( 1 )
 		);
-		final String database = (String) project.getProperties().get( "db" );
+		final String database = (String) project.findProperty( "db" );
 
 		// H2 and HSQLDB are in-memory, so there is no sharing that needs to be avoided
 		if ( database != null && !"h2".equals( database ) && !"hsqldb".equals( database ) ) {
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/env/EnvironmentSettingsPlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/env/EnvironmentSettingsPlugin.java
index 3274a5aac971..b0b4327283cd 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/env/EnvironmentSettingsPlugin.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/env/EnvironmentSettingsPlugin.java
@@ -22,7 +22,9 @@ public void apply(Settings settings) {
 		final JpaVersion jpaVersion = JpaVersion.from( settings );
 		settings.getExtensions().add( "jpaVersion", jpaVersion );
 		settings.getExtensions().add( JpaVersion.EXT_KEY, jpaVersion.getOsgiName() );
-		settings.getExtensions().add( "db", Objects.requireNonNullElse( getP( settings, "db" ), "h2" ) );
+		final String dbVersion = getP( settings, "dbVersion" );
+		final String dbSuffix = dbVersion == null ? "" : ("-" + dbVersion);
+		settings.getExtensions().add( "db", Objects.requireNonNullElse( getP( settings, "db" ), "h2" ) + dbSuffix );
 		String ciNode = getP( settings, "ci.node" );
 		if ( ciNode != null ) {
 			settings.getExtensions().add( "ci.node", ciNode );
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/post/LoggingReportTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/post/LoggingReportTask.java
index d6a0d92fe7b7..69a9310d90b9 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/post/LoggingReportTask.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/post/LoggingReportTask.java
@@ -118,7 +118,7 @@ public void generateLoggingReport() {
 
 	private IdRange calculateIdRange(AnnotationInstance msgLoggerAnnUsage, SubSystem subSystem) {
 		final ClassInfo loggerClassInfo = msgLoggerAnnUsage.target().asClass();
-		getProject().getLogger().lifecycle( "MessageLogger (`{}`) missing id-range", loggerClassInfo.simpleName() );
+		getLogger().lifecycle( "MessageLogger (`{}`) missing id-range", loggerClassInfo.simpleName() );
 
 		final List<AnnotationInstance> messageAnnUsages = loggerClassInfo.annotations( MSG_ANN_NAME );
 		if ( messageAnnUsages.isEmpty() ) {
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/properties/AsciiDocWriter.java b/local-build-plugins/src/main/java/org/hibernate/orm/properties/AsciiDocWriter.java
index 2f4e3be27de7..7e8f0e63b373 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/properties/AsciiDocWriter.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/properties/AsciiDocWriter.java
@@ -14,7 +14,6 @@
 import java.util.Map;
 import java.util.SortedSet;
 
-import org.gradle.api.Project;
 import org.gradle.api.file.RegularFile;
 
 /**
@@ -25,8 +24,7 @@ public class AsciiDocWriter {
 	public static void writeToFile(
 			String anchorNameBase,
 			Map<SettingsDocSection, SortedSet<SettingDescriptor>> settingDescriptorMap,
-			RegularFile outputFile,
-			Project project) {
+			RegularFile outputFile) {
 		final File outputFileAsFile = outputFile.getAsFile();
 		try {
 			Files.createDirectories( outputFileAsFile.getParentFile().toPath() );
@@ -36,7 +34,7 @@ public static void writeToFile(
 		}
 
 		try ( FileWriter fileWriter = new FileWriter( outputFileAsFile ) ) {
-			write( anchorNameBase, settingDescriptorMap, fileWriter, project );
+			write( anchorNameBase, settingDescriptorMap, fileWriter );
 		}
 		catch (IOException e) {
 			throw new RuntimeException( "Failed to produce asciidoc output for collected properties", e );
@@ -46,8 +44,7 @@ public static void writeToFile(
 	private static void write(
 			String anchorNameBase,
 			Map<SettingsDocSection, SortedSet<SettingDescriptor>> settingDescriptorMap,
-			FileWriter writer,
-			Project project) throws IOException {
+			FileWriter writer) throws IOException {
 		for ( Map.Entry<SettingsDocSection, SortedSet<SettingDescriptor>> entry : settingDescriptorMap.entrySet() ) {
 			final SettingsDocSection sectionDescriptor = entry.getKey();
 			final SortedSet<SettingDescriptor> sectionSettingDescriptors = entry.getValue();
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocExtension.java b/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocExtension.java
index f3609fe06ea0..a3df42fc7763 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocExtension.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocExtension.java
@@ -43,7 +43,7 @@ public SettingsDocExtension(Project project) {
 
 	/**
 	 * The local directory which contains the Javadoc to be processed.
-	 * <p/>
+	 * <p>
 	 * Defaults to {@code ${build-dir}/javadocs}
 	 */
 	public DirectoryProperty getJavadocDirectory() {
@@ -53,7 +53,7 @@ public DirectoryProperty getJavadocDirectory() {
 	/**
 	 * The base URL for the published doc server.  This is used to
 	 * replace local hrefs with hrefs on the doc sever
-	 * <p/>
+	 * <p>
 	 * Defaults to {@code https://docs.hibernate.org/orm}
 	 */
 	public Property<String> getPublishedDocsUrl() {
@@ -91,7 +91,7 @@ public void sections(Closure<NamedDomainObjectContainer<SettingsDocSection>> clo
 
 	/**
 	 * The file where the settings doc should be written
-	 * <p/>
+	 * <p>
 	 * Defaults to {@code ${build-dir}/asciidoc/fragments/config-settings.adoc}
 	 */
 	public RegularFileProperty getOutputFile() {
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocGenerationTask.java b/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocGenerationTask.java
index 4e7ab98ca5d7..1643d59e4341 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocGenerationTask.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/properties/SettingsDocGenerationTask.java
@@ -36,12 +36,15 @@ public class SettingsDocGenerationTask extends DefaultTask {
 
 	private final RegularFileProperty outputFile;
 
+	private final OrmBuildDetails buildDetails;
+
 	@Inject
 	public SettingsDocGenerationTask(SettingsDocExtension dslExtension, Project project) {
 		setGroup( TASK_GROUP_NAME );
 		setDescription( "Collects descriptions of Hibernate configuration properties in preparation for inclusion in the User Guide" );
 
-		getInputs().property( "ormVersion", getProject().getExtensions().getByType( OrmBuildDetails.class ).getHibernateVersion() );
+		buildDetails = getProject().getExtensions().getByType( OrmBuildDetails.class );
+		getInputs().property( "ormVersion", buildDetails.getHibernateVersion() );
 
 		javadocDirectory = project.getObjects().directoryProperty();
 		javadocDirectory.convention( dslExtension.getJavadocDirectory() );
@@ -88,7 +91,7 @@ public RegularFileProperty getOutputFile() {
 	public void generateSettingsDocumentation() {
 		final String publishedJavadocUrl = publishedDocsUrl.get()
 				+ "/"
-				+ getProject().getExtensions().getByType( OrmBuildDetails.class ).getHibernateVersionFamily()
+				+ buildDetails.getHibernateVersionFamily()
 				+ "/javadocs/";
 
 		AsciiDocWriter.writeToFile(
@@ -98,8 +101,7 @@ public void generateSettingsDocumentation() {
 						sections.getAsMap(),
 						publishedJavadocUrl
 				),
-				outputFile.get(),
-				getProject()
+				outputFile.get()
 		);
 	}
 }
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JavaModulePlugin.java b/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JavaModulePlugin.java
index a343182cdb9e..ac9d58f186cd 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JavaModulePlugin.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JavaModulePlugin.java
@@ -123,7 +123,7 @@ public void execute(Test testTask) {
 				if ( project.hasProperty( "test.jdk.launcher.args" ) ) {
 					testTask.jvmArgs(
 							Arrays.asList(
-								project.getProperties().get( "test.jdk.launcher.args" ).toString().split( " " )
+								project.property( "test.jdk.launcher.args" ).toString().split( " " )
 							)
 					);
 				}
diff --git a/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionConfig.java b/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionConfig.java
index c87b8e631fdb..d6b9b7a776db 100644
--- a/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionConfig.java
+++ b/local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionConfig.java
@@ -217,12 +217,12 @@ public static JavaLanguageVersion extractVersion(Settings settings, String prope
 	}
 
 	public static JavaLanguageVersion extractVersion(Project project, String propertyName) {
-		final Object projectProp = project.getProperties().get( propertyName );
+		final Object projectProp = project.findProperty( propertyName );
 		if ( projectProp != null ) {
 			return JavaLanguageVersion.of( projectProp.toString() );
 		}
 
-		final Object sysProp = System.getProperties().get( propertyName );
+		final Object sysProp = System.getProperty( propertyName );
 		if ( sysProp != null ) {
 			return JavaLanguageVersion.of( sysProp.toString() );
 		}
diff --git a/migration-guide.adoc b/migration-guide.adoc
index 8e5c7d93d5f4..b574f8cfe09c 100644
--- a/migration-guide.adoc
+++ b/migration-guide.adoc
@@ -2,7 +2,7 @@
 :toc2:
 :sectanchors:
 :toclevels: 4
-:version: 7.2
+:version: 7.4
 :docsBase: https://docs.jboss.org/hibernate/orm
 :versionDocBase: {docsBase}/{version}
 :userGuideBase: {versionDocBase}/userguide/html_single/Hibernate_User_Guide.html
@@ -22,11 +22,6 @@ earlier versions, see any other pertinent migration guides as well.
 
 See the link:{releaseSeriesBase}[website] for the list of requirements for the {version} series.
 
-[[requirements-building]]
-=== Building
-
-Starting with version 7.2, Gradle 9 and Java 25 are required to build the project.
-However, the produced artifacts are still compatible with Java 17 and the produced Gradle plugin is still compatible with Gradle 8.
 
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,50 +43,6 @@ See the link:{releaseSeriesBase}#whats-new[website] for the list of new features
 
 This section describes changes to contracts (classes, interfaces, methods, etc.) which are considered https://hibernate.org/community/compatibility-policy/#api[API].
 
-[[contains]]
-=== Session.contains(String,Object) deprecated
-
-The method `contains(String,Object)` of `Session` was deprecated.
-Use `contains(Object)` instead.
-
-[[noInterceptor]]
-== SharedSessionBuilder.noInterceptor()
-
-The behavior of `SharedSessionBuilder.noInterceptor()` was changed to reflect its documented semantics.
-
-[[jpa]]
-=== @Jpa (hibernate-testing)
-
-The following methods have been removed from the `@Jpa` test utility, located in the hibernate-testing project:
-
-- `jpaComplianceEnabled()`
-- `queryComplianceEnabled()`
-- `transactionComplianceEnabled()`
-- `closedComplianceEnabled()`
-- `orderByMappingComplianceEnabled()`
-- `proxyComplianceEnabled()`
-- `cacheComplianceEnabled()`
-- `generatorScopeComplianceEnabled()`
-- `loadByIdComplianceEnabled()`
-
-The default value for these settings is still `false`.
-
-To indicate a specific flag setting, or to override the generic value that was set with `JpaComplianceSettings.JPA_COMPLIANCE`, `@Jpa` 's `integrationSettings` array should be used.
-
-Example:
-
-```
-@Jpa(annotatedClasses =
-	...,
-	integrationSettings = {
-		// set all jpa compliance flags to true
-		@Setting(name = JpaComplianceSettings.JPA_COMPLIANCE, value = "true"),
-		// override or set a specific flag value to false
-		@Setting(name = JpaComplianceSettings.JPA_PROXY_COMPLIANCE, value = "false")
-	}
-)
-```
-
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // SPI changes
@@ -102,23 +53,6 @@ Example:
 
 This section describes changes to contracts (classes, interfaces, methods, etc.) which are considered https://hibernate.org/community/compatibility-policy/#spi[SPI].
 
-[[registry-generic-signatures]]
-=== Registry Generic Signatures
-
-Some operations of `TypeConfiguration`, `JavaTypeRegistry`, and `BasicTypeRegistry` had previously used unbound type parameters in the return type. The generic signatures of these methods have been changed for improved type safety.
-
-
-[[AzureSQLServerDialect]]
-=== AzureSQLServerDialect Deprecation
-
-`org.hibernate.dialect.AzureSQLServerDialect` was deprecated; use `org.hibernate.dialect.SQLServerDialect` instead.
-
-[IMPORTANT]
-====
-If you set `hibernate.boot.allow_jdbc_metadata_access=false` for offline startup,
-remember to also set the targeted database version through `jakarta.persistence.database-product-version` - this would be 16.0 for SQL Server 2022 or 17.0 for SQL Server 2025.
-====
-
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Changes in Behavior
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -126,80 +60,38 @@ remember to also set the targeted database version through `jakarta.persistence.
 [[behavior-changes]]
 == Changes in Behavior
 
-[[child-session-flush-close]]
-=== Child Session Flush/Close Behavior
-
-`Session` and `StatelessSession` which share transactional context with a parent now have slightly different semantics in regard to flushing and closing -
-
-* when the parent is flushed, the child is flushed
-* when the parent is closed, the child is closed
-
-[NOTE]
-====
-This led to a change in triggering of flush events for both -
-
-* `SessionEventListener` registrations
-* JFR events
-
-In both cases, the events are now triggered regardless of whether any entities or collections were actually flushed.
-Each already carried the number of entities and the number of collections which were actually flushed.
-Previously, when no entities and no collections were flushed to the database no event was generated; the event is now generated and both values will be zero.
+This section describes changes in behavior that applications should be aware of.
 
-Interestingly, this now also aligns with handling for auto-flush events which already always triggered these events.
-====
 
+=== MySQL default max fetch depth
 
-[[child-session-no-interceptor]]
-=== Child Session No-Interceptor Behavior
+Previously, `MySQLDialect` defined a dialect-level default value of `2` for the
+`hibernate.max_fetch_depth` configuration property.
 
-The behavior of `noInterceptor()` for `SharedSessionBuilder` and (the new) `SharedStatelessSessionBuilder` was aligned with the preexisting semantics of this method on `SessionBuilder` and `StatelessSessionBuilder`.
-The previous behavior may be recovered by calling `noSessionInterceptorCreation()`.
+As of Hibernate ORM {version}, this dialect-specific default has been removed.
+MySQL now behaves consistently with other dialects and relies on Hibernate’s
+general defaults or explicit user configuration.
 
-[[test-util-bytecodeenhanced-engine]]
-=== JUnit `BytecodeEnhancedTestEngine`
+Applications that relied on the previous implicit default should explicitly set
+`hibernate.max_fetch_depth` if required.
 
-With this version, `BytecodeEnhancedTestEngine` will be disabled by default.
-To be able to run the tests annotated with `@BytecodeEnhanced`, this engine has to be explicitly enabled via a system property:
+=== Join fetching for eager @Any mappings
 
-[source, properties]
-----
-hibernate.testing.bytecode.enhancement.extension.engine.enabled=true
-----
+An `@Any` discriminated association mapping defaults to `fetch=EAGER`.
+Previously, such eager `@Any` associations were always fetched using a separate
+`SELECT` statement, which was inefficient. Eager `@Any` associations are now
+join fetched by default when an entity is loaded by id.
 
-For a Maven-based project this can be done as part of the failsafe/surefire plugin configuration:
+=== Schema actions now executed even without mapped entities
 
-[source, xml]
-----
-<plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-surefire-plugin</artifactId>
-    <configuration>
-        <systemPropertyVariables>
-            <hibernate.testing.bytecode.enhancement.extension.engine.enabled>true</hibernate.testing.bytecode.enhancement.extension.engine.enabled>
-            <!-- Any other system properties required by your tests -->
-        </systemPropertyVariables>
-        <!-- The rest of the testing plugin configuration -->
-        <!-- ... -->
-    </configuration>
-</plugin>
-----
+Previously, if a persistence unit had no `@Entity` classes, all schema management
+actions (including `import.sql` execution) were silently skipped, even when explicitly
+configured via `hbm2ddl.auto` or `jakarta.persistence.schema-generation.database.action`.
 
-While for a Gradle-based project this can be done in multiple ways, it essentially comes down to configuring the
-link:https://docs.gradle.org/current/dsl/org.gradle.api.tasks.testing.Test.html#org.gradle.api.tasks.testing.Test:systemProperties[`systemProperties`]
-of a `Test` task:
-
-[source, groovy]
-----
-tasks.withType(Test.class) {
-    // Enable bytecode enhanced engine:
-    systemProperties.systemProperties['hibernate.testing.bytecode.enhancement.extension.engine.enabled'] = true
-    // Any other test task configurations
-    // ...
-}
-----
-
-Also, this engine is expected to only work with the exact version of JUnit that `org.hibernate.orm:hibernate-testing` depends on.
-While it may work with other versions as well, there is no guarantee of that.
+As of Hibernate {version}, schema actions are now processed regardless of whether any entities
+are mapped. This is the correct behavior, but it means that applications which have an
+`import.sql` file on the classpath by accident may now see it executed when it was
+previously ignored.
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // DDL changes
@@ -211,15 +103,15 @@ While it may work with other versions as well, there is no guarantee of that.
 This section describes changes to DDL generated by the schema export tooling.
 Such changes typically do not impact programs using a relational schema managed externally to Hibernate.
 
+=== Unique constraints for `@ElementCollection` sets
 
-[[dependency-changes]]
-== Changes in Dependencies
+A unique constraint is now added to the table mapped by an `@ElementCollection` set where appropriate.
 
-This section describes changes to dependencies used by Hibernate ORM.
+=== `@CreationTimestamp` and `@UpdateTimestamp` columns inferred not-null
 
-[[junit6]]
-=== JUnit 6 update
+A column mapped by a `@CreationTimestamp` or `@UpdateTimestamp` generator now has a `NOT NULL` constraint added automatically.
+
+[[dependency-changes]]
+== Changes in Dependencies
 
-Hibernate ORM test utils distributed as `org.hibernate.orm:hibernate-testing` are now based on JUnit 6.0.
-In general, this update is compatible with previous JUnit 5 versions unless the tests depended on the
-<<test-util-bytecodeenhanced-engine,@BytecodeEnhanced extension>>.
+This section describes changes to dependencies used by Hibernate ORM.
\ No newline at end of file
diff --git a/nightly.Jenkinsfile b/nightly.Jenkinsfile
index 2a42268fc7de..50cb60807f6a 100644
--- a/nightly.Jenkinsfile
+++ b/nightly.Jenkinsfile
@@ -28,12 +28,13 @@ stage('Configure') {
 		new BuildEnvironment( dbName: 'hsqldb_2_6' ),
 		new BuildEnvironment( dbName: 'mysql_8_0' ),
 		new BuildEnvironment( dbName: 'mariadb_10_6' ),
-		new BuildEnvironment( dbName: 'postgresql_13' ),
-		new BuildEnvironment( dbName: 'edb_13' ),
+		new BuildEnvironment( dbName: 'postgresql_14' ),
+		new BuildEnvironment( dbName: 'edb_14' ),
 		new BuildEnvironment( dbName: 'db2_11_5' ), // Unfortunately there is no SQL Server 11.1 image, but 11.5 should mostly have feature parity
 		new BuildEnvironment( dbName: 'mssql_2017' ), // Unfortunately there is no SQL Server 2008 image, so we have to test with 2017
 // 		new BuildEnvironment( dbName: 'sybase_16' ), // There only is a Sybase ASE 16 image, so no pint in testing that nightly
 		new BuildEnvironment( dbName: 'sybase_jconn' ),
+		new BuildEnvironment( dbName: 'informix' ),
 		// Long running databases
 		new BuildEnvironment( dbName: 'cockroachdb', node: 'cockroachdb', longRunning: true ),
 		new BuildEnvironment( dbName: 'hana_cloud', dbLockableResource: 'hana-cloud', dbLockResourceAsHost: true )
@@ -115,12 +116,12 @@ stage('Build') {
 									sh "./docker_db.sh mariadb_10_6"
 									state[buildEnv.tag]['containerName'] = "mariadb"
 									break;
-								case "postgresql_13":
-									sh "./docker_db.sh postgresql_13"
+								case "postgresql_14":
+									sh "./docker_db.sh postgresql_14"
 									state[buildEnv.tag]['containerName'] = "postgres"
 									break;
-								case "edb_13":
-									sh "./docker_db.sh edb_13"
+								case "edb_14":
+									sh "./docker_db.sh edb_14"
 									state[buildEnv.tag]['containerName'] = "edb"
 									break;
 								case "db2_11_5":
@@ -130,6 +131,13 @@ stage('Build') {
 									state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
 										" -Ptest.threads=1"
 									break;
+								case "informix":
+									sh "./docker_db.sh informix"
+									state[buildEnv.tag]['containerName'] = "informix"
+									// Disable parallel testing
+									state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
+										" -Ptest.threads=1"
+									break;
 								case "mssql_2017":
 									sh "./docker_db.sh mssql_2017"
 									state[buildEnv.tag]['containerName'] = "mssql"
diff --git a/release/README.adoc b/release/README.adoc
index 7748b8c7f005..567abd2a33b7 100644
--- a/release/README.adoc
+++ b/release/README.adoc
@@ -3,7 +3,7 @@
 
 == Where is the information
 
-If you're looking for information about how to release Hibernate ORM, see link:/MAINTAINERS.md[MAINTAINERS.md]
+If you're looking for information about how to release Hibernate ORM, see link:../MAINTAINERS.md[MAINTAINERS.md]
 
 If you're looking for information about how releases are implemented technically, read on.
 
diff --git a/release/release.gradle b/release/release.gradle
index c188dc447ea1..85bd4d7ae6e5 100644
--- a/release/release.gradle
+++ b/release/release.gradle
@@ -26,7 +26,7 @@ tasks.build.enabled = false
 //		2. generate and place all the artifacts in the staging directory (see local.publishing-java-module)
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-tasks.register("releasePrepare") {
+def releasePrepareTask = tasks.register("releasePrepare") {
     group = "release-prepare"
     description = "Scripted release 'Release Prepare' stage"
 
diff --git a/reporting/reporting.gradle b/reporting/reporting.gradle
new file mode 100644
index 000000000000..7109728f49ba
--- /dev/null
+++ b/reporting/reporting.gradle
@@ -0,0 +1,47 @@
+plugins {
+    id "local.module"
+    id 'jacoco-report-aggregation'
+}
+
+description = 'Reporting module'
+
+ext {
+    projectsToIncludeWhenAggregatingCoverage = [
+            'hibernate-agroal',
+            'hibernate-c3p0',
+            'hibernate-community-dialects',
+            'hibernate-core',
+            'hibernate-envers',
+            'hibernate-graalvm',
+            'hibernate-hikaricp',
+            'hibernate-jcache',
+            'hibernate-jfr',
+            'hibernate-micrometer',
+            'hibernate-scan-jandex',
+            'hibernate-spatial',
+            'hibernate-testing',
+            'hibernate-vector',
+            // Tooling:
+            'hibernate-ant',
+            'hibernate-assistant',
+            'hibernate-gradle-plugin',
+            'hibernate-maven-plugin',
+            'hibernate-processor',
+            'hibernate-reveng'
+    ]
+}
+
+tasks.register('mergeCodeCoverageReport', JacocoReport) {
+    executionData fileTree(rootProject.layout.projectDirectory.asFile).include("**/target/jacoco/*.exec")
+    parent.subprojects.each { Project subProject ->
+        if ( project.projectsToIncludeWhenAggregatingCoverage.contains( subProject.name ) ) {
+            sourceSets  subProject.sourceSets.main
+        }
+    }
+
+    reports {
+        xml.required = true
+    }
+
+    dependsOn rootProject.subprojects.collect { p -> p.tasks.matching { it.name == 'compileJava' } }
+}
diff --git a/settings.gradle b/settings.gradle
index 03a875daf7bb..3a91881b6c71 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 plugins {
     id 'org.hibernate.orm.build.env-settings'
     id 'org.hibernate.orm.build.jdks-settings'
-    id 'com.gradle.develocity' version '4.0.2'
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.3'
+    id 'com.gradle.develocity' version '4.3.2'
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.4.0'
 }
 
 dependencyResolutionManagement {
@@ -36,7 +36,7 @@ dependencyResolutionManagement {
 			}
             // Needed for the SNAPSHOT versions of Jakarta Persistence
             maven {
-                url "https://jakarta.oss.sonatype.org/content/repositories/snapshots/"
+                url "https://central.sonatype.com/repository/maven-snapshots/"
             }
 		}
 
@@ -76,18 +76,18 @@ dependencyResolutionManagement {
             def antlrVersion = version "antlr", "4.13.2"
             // WARNING: When upgrading to a version of bytebuddy that supports a new bytecode version,
             // make sure to remove the now unnecessary net.bytebuddy.experimental=true in relevant CI jobs (Jenkinsfile).
-            def byteBuddyVersion = version "byteBuddy", "1.17.8"
-            def checkerFrameworkVersion = version "checkerFramework", "3.52.0"
-            def classmateVersion = version "classmate", "1.7.1"
-            def geolatteVersion = version "geolatte", "1.10"
-            def hibernateModelsVersion = version "hibernateModels", "1.0.1"
+            def byteBuddyVersion = version "byteBuddy", "1.18.8"
+            def checkerFrameworkVersion = version "checkerFramework", "3.53.1"
+            def geolatteVersion = version "geolatte", "1.11"
+            def hibernateModelsVersion = version "hibernateModels", "1.1.1"
             def jandexVersion = version "jandex", "3.3.2"
             def jacksonVersion = version "jackson", "2.19.4"
+            def jackson3Version = version "jackson3", "3.0.3"
             def jbossLoggingVersion = version "jbossLogging", "3.6.1.Final"
             def jbossLoggingToolVersion = version "jbossLoggingTool", "3.0.4.Final"
 
             def agroalVersion = version "agroal", "2.8"
-            def c3poVersion = version "c3p0", "0.11.2"
+            def c3poVersion = version "c3p0", "0.12.0"
             def hikaricpVersion = version "hikaricp", "7.0.2"
 
             def jcacheVersion = version "jcache", "1.1.1"
@@ -113,12 +113,14 @@ dependencyResolutionManagement {
             library( "hibernateModels", "org.hibernate.models", "hibernate-models" ).versionRef( hibernateModelsVersion )
             library( "hibernateModelsJandex", "org.hibernate.models", "hibernate-models-jandex" ).versionRef( hibernateModelsVersion )
             library( "jandex", "io.smallrye", "jandex" ).versionRef( jandexVersion )
-            library( "classmate", "com.fasterxml", "classmate" ).versionRef( classmateVersion )
 
             library( "jackson", "com.fasterxml.jackson.core", "jackson-databind" ).versionRef( jacksonVersion )
             library( "jacksonXml", "com.fasterxml.jackson.dataformat", "jackson-dataformat-xml" ).versionRef( jacksonVersion )
             library( "jacksonJsr310", "com.fasterxml.jackson.datatype", "jackson-datatype-jsr310" ).versionRef( jacksonVersion )
 
+            library( "jackson3", "tools.jackson.core", "jackson-databind" ).versionRef( jackson3Version )
+            library( "jackson3Xml", "tools.jackson.dataformat", "jackson-dataformat-xml" ).versionRef( jackson3Version )
+
             library( "agroal", "io.agroal", "agroal-api" ).versionRef( agroalVersion )
             library( "agroalPool", "io.agroal", "agroal-pool" ).versionRef( agroalVersion )
             library( "c3p0", "com.mchange", "c3p0" ).versionRef( c3poVersion )
@@ -132,6 +134,10 @@ dependencyResolutionManagement {
             library( "micrometer", "io.micrometer", "micrometer-core" ).versionRef( micrometerVersion )
 
             library( "ant", "org.apache.ant", "ant" ).versionRef( antVersion )
+
+            library( "commonsCollections4", "org.apache.commons", "commons-collections4" ).version( "4.5.0" )
+            library( "eclipseJdtCore", "org.eclipse.jdt", "org.eclipse.jdt.core" ).version( "3.42.0" )
+            library( "freemarker", "org.freemarker", "freemarker" ).version( "2.3.34" )
         }
         jakartaLibs {
             // `jakartaJpaVersion` comes from the local-build-plugins to allow for command-line overriding of the JPA version to use
@@ -164,6 +170,7 @@ dependencyResolutionManagement {
             library( "inject", "jakarta.inject", "jakarta.inject-api" ).versionRef( injectVersion )
             library( "jaxbApi", "jakarta.xml.bind", "jakarta.xml.bind-api" ).versionRef( jaxbApiVersion )
             library( "jaxb", "org.glassfish.jaxb", "jaxb-runtime" ).versionRef( jaxbRuntimeVersion )
+            library( "ejb", "jakarta.ejb", "jakarta.ejb-api" ).version( "4.0.1" )
         }
         testLibs {
             def junitJupiterVersion = version "junitJupiter", "6.0.1"
@@ -175,7 +182,7 @@ dependencyResolutionManagement {
             def bytemanVersion = version "byteman", "4.0.24"
             def jbossJtaVersion = version "jbossJta", "7.3.3.Final"
             def jbossTxSpiVersion = version "jbossTxSpi", "8.0.0.Final"
-            def log4jVersion = version "log4j", "2.24.3"
+            def log4jVersion = version "log4j", "2.25.4"
             def mockitoVersion = version "mockito", "5.20.0"
             def shrinkwrapVersion = version "shrinkwrap", "1.2.6"
             def shrinkwrapDescriptorsVersion = version "shrinkwrapDescriptors", "2.0.0"
@@ -216,6 +223,8 @@ dependencyResolutionManagement {
             library( "weld", "org.jboss.weld.se", "weld-se-shaded" ).versionRef( weldVersion )
 
             library( "jfrUnit", "org.moditect.jfrunit", "jfrunit-core" ).versionRef( jfrUnitVersion )
+
+            library( "logbackClassic", "ch.qos.logback", "logback-classic" ).version( "1.5.18" )
         }
         jdbcLibs {
             def h2Version = version "h2", overrideableVersion( "gradle.libs.versions.h2", "2.4.240" )
@@ -224,13 +233,13 @@ dependencyResolutionManagement {
             def derbyVersion = version "derby", overrideableVersion( "gradle.libs.versions.derby", "10.17.1.0" )
             def firebirdVersion = version "firebird", "6.0.3"
             def hanaVersion = version "hana", "2.26.11"
-            def h2gisVersion = version "h2gis", overrideableVersion( "gradle.libs.versions.h2gis", "2.2.3" )
+            def h2gisVersion = version "h2gis", overrideableVersion( "gradle.libs.versions.h2gis", "2.2.4" )
             def hsqldbVersion = version "hsqldb", overrideableVersion( "gradle.libs.versions.hsqldb", "2.7.4" )
             def informixVersion = version "informix", "15.0.0.2"
             def mariadbVersion = version "mariadb", "3.5.5"
             def mssqlVersion = version "mssql", "13.2.1.jre11"
-            def mysqlVersion = version "mysql", "9.5.0"
-            def oracleVersion = version "oracle", "23.26.0.0.0"
+            def mysqlVersion = version "mysql", "9.6.0"
+            def oracleVersion = version "oracle", "23.26.1.0.0"
             def oracleJacksonOsonExtension = version "oracleJacksonOsonExtension", "1.0.4"
             def pgsqlVersion = version "pgsql", "42.7.8"
             def edbVersion = version "edb", "42.7.3.3"
@@ -239,6 +248,7 @@ dependencyResolutionManagement {
             def teradataVersion = version "teradata",  "20.00.00.51"
             def tidbVersion = version "tidb", mysqlVersion
             def altibaseVersion = version "altibase", "7.3.0.1.1"
+            def spannerVersion = version "spanner", "2.38.0"
 
             library( "h2", "com.h2database", "h2" ).versionRef( h2Version )
             library( "h2gis", "org.orbisgis", "h2gis" ).versionRef( h2gisVersion )
@@ -264,16 +274,23 @@ dependencyResolutionManagement {
             library( "informix", "com.ibm.informix", "jdbc" ).versionRef( informixVersion )
             library( "firebird", "org.firebirdsql.jdbc", "jaybird" ).versionRef( firebirdVersion )
             library( "altibase", "com.altibase", "altibase-jdbc" ).versionRef( altibaseVersion )
+            library( "spanner", "com.google.cloud", "google-cloud-spanner-jdbc" ).versionRef( spannerVersion )
         }
         mavenLibs {
-            def mavenCoreVersion = version "mavenCore", "3.9.9"
-            def mavenVersion = version "maven", "3.9.9"
-            def mavenPluginToolsVersion = version "mavenPluginTools", "3.15.1"
+            def mavenVersion = version "maven", "3.9.14"
+            def mavenPluginToolsVersion = version "mavenPluginTools", "3.15.2"
+            def mavenResolverVersion = version "mavenResolver", "1.9.27"
 
-            library( "mavenCore", "org.apache.maven", "maven-core" ).versionRef( mavenCoreVersion )
+            library( "mavenCore", "org.apache.maven", "maven-core" ).versionRef( mavenVersion )
             library( "mavenArtifact", "org.apache.maven", "maven-artifact" ).versionRef( mavenVersion )
             library( "mavenPlugin", "org.apache.maven", "maven-plugin-api" ).versionRef( mavenVersion )
+            library( "mavenEmbedder", "org.apache.maven", "maven-embedder" ).versionRef( mavenVersion )
+            library( "mavenCompat", "org.apache.maven", "maven-compat" ).versionRef( mavenVersion )
             library( "mavenPluginTools", "org.apache.maven.plugin-tools", "maven-plugin-annotations" ).versionRef( mavenPluginToolsVersion )
+            library( "mavenPluginToolsAnnotations", "org.apache.maven.plugin-tools", "maven-plugin-tools-annotations" ).versionRef( mavenPluginToolsVersion )
+            library( "mavenSharedFileManagement", "org.apache.maven.shared", "file-management" ).version( "3.2.0" )
+            library( "mavenResolverTransportHttp", "org.apache.maven.resolver", "maven-resolver-transport-http" ).versionRef( mavenResolverVersion )
+            library( "mavenResolverConnectorBasic", "org.apache.maven.resolver", "maven-resolver-connector-basic" ).versionRef( mavenResolverVersion )
         }
         buildscriptLibs {
             def forbiddenapisversion = version "forbiddenapis", "3.8"
@@ -337,6 +354,7 @@ include 'local-build-asciidoctor-extensions'
 
 include 'documentation'
 include 'release'
+include 'reporting'
 
 // Not all JDK implementations support JFR
 if ( "OpenJDK Runtime Environment".equals( System.getProperty( "java.runtime.name" ) ) ) {
@@ -358,6 +376,12 @@ project(':hibernate-maven-plugin').projectDir = new File(rootProject.projectDir,
 include 'hibernate-ant'
 project(':hibernate-ant').projectDir = new File(rootProject.projectDir, "tooling/hibernate-ant")
 
+include 'hibernate-assistant'
+project(':hibernate-assistant').projectDir = new File(rootProject.projectDir, "tooling/hibernate-assistant")
+
+include 'hibernate-reveng'
+project(':hibernate-reveng').projectDir = new File(rootProject.projectDir, "tooling/hibernate-reveng")
+
 rootProject.children.each { project ->
     project.buildFileName = "${project.name}.gradle"
     assert project.projectDir.isDirectory()
diff --git a/shared/javadoc/overview.html b/shared/javadoc/overview.html
index 27d6b71f17c0..1bfa70dc241d 100644
--- a/shared/javadoc/overview.html
+++ b/shared/javadoc/overview.html
@@ -4,7 +4,7 @@
   -->
 <body>
 
-<h2>Hibernate ORM Javadocs</h2>
+<h1>Hibernate ORM Javadocs</h1>
 
 <p>
     Hibernate is a library for object/relation mapping (ORM). It provides:
@@ -28,7 +28,7 @@ <h2>Hibernate ORM Javadocs</h2>
     </li>
 </ul>
 
-<h3>Native API</h3>
+<h2>Native API</h2>
 
 <p>
     Along with {@link org.hibernate.SessionFactory} and {@link org.hibernate.Session}, applications
@@ -52,7 +52,7 @@ <h3>Native API</h3>
     <li>{@link org.hibernate.relational.SchemaManager} to execute DDL in tests.</li>
 </ul>
 
-<h3>JPA</h3>
+<h2>JPA</h2>
 
 <p>
     The JPA interfaces are defined by the JPA specification. For details see the latest
@@ -100,7 +100,7 @@ <h3>JPA</h3>
     <li>{@link org.hibernate.metamodel.model.domain} packages extensions to {@link jakarta.persistence.metamodel}.</li>
 </ul>
 
-<h3>Mapping annotations</h3>
+<h2>Mapping annotations</h2>
 
 <p>
     The mapping annotations defined by the JPA specification provide a foundation for expressing
@@ -115,7 +115,7 @@ <h3>Mapping annotations</h3>
     The full power of Hibernate can only be unlocked via judicious use of these extra annotations.
 </p>
 
-<h3>XML-based mappings</h3>
+<h2>XML-based mappings</h2>
 
 Annotation-based mappings are the best choice for most users, but Hibernate offers XML-based
 mappings as an alternative.
@@ -136,7 +136,7 @@ <h3>XML-based mappings</h3>
     </li>
 </ul>
 
-<h3>Bootstrapping Hibernate</h3>
+<h2>Bootstrapping Hibernate</h2>
 
 <p>
     There are four basic ways to obtain an instance of Hibernate:
@@ -172,7 +172,7 @@ <h3>Bootstrapping Hibernate</h3>
     to use a tiny handful of them.
 </p>
 
-<h3>Annotations driving compile-time tooling</h3>
+<h2>Annotations driving compile-time tooling</h2>
 
 <p>
     The annotations defined by {@link org.hibernate.annotations.processing} instruct the Metamodel
@@ -180,9 +180,8 @@ <h3>Annotations driving compile-time tooling</h3>
     time}, and to automatically generate the implementation of
     {@linkplain org.hibernate.annotations.processing.Find finder methods} and
     {@linkplain org.hibernate.annotations.processing.HQL query methods}.
-<p>
 
-<h3>Popular extension points</h3>
+<h2>Popular extension points</h2>
 
 <p>
     Hibernate offers an enormous wealth of extension points for customizing almost any aspect of
@@ -239,7 +238,7 @@ <h3>Popular extension points</h3>
     {@link org.hibernate.integrator.spi} and  {@link org.hibernate.event.spi}.
 </p>
 
-<h3>Package categories</h3>
+<h2>Package categories</h2>
 
 <p>
     The organization of code into packages is based on the following classification:
@@ -267,11 +266,11 @@ <h3>Package categories</h3>
     </li>
 </ul>
 
-<h3>More information</h3>
+<h2>More information</h2>
 
 <p>
     Complete documentation may be found online at
     <a href="http://hibernate.org/orm/documentation">http://hibernate.org/orm/documentation/</a>.
 </p>
 
-</body>
\ No newline at end of file
+</body>
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 000000000000..784573cdb391
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,130 @@
+sonar.host.url=https://sonarcloud.io
+sonar.organization=hibernate
+sonar.projectKey=hibernate_hibernate-orm
+sonar.projectName=Hibernate ORM
+sonar.projectDescription=Idiomatic persistence for Java and relational databases.
+
+sonar.language=java
+sonar.sourceEncoding=UTF-8
+
+sonar.modules=hibernate-agroal,hibernate-c3p0,hibernate-community-dialects,hibernate-core,hibernate-envers,hibernate-graalvm,hibernate-hikaricp,hibernate-jcache,hibernate-jfr,hibernate-micrometer,hibernate-scan-jandex,hibernate-spatial,hibernate-testing,hibernate-vector,hibernate-ant,hibernate-assistant,hibernate-gradle-plugin,hibernate-maven-plugin,hibernate-reveng,metamodel-generator
+
+hibernate-agroal.sonar.projectName=Hibernate ORM - Agroal
+hibernate-agroal.sonar.projectBaseDir=hibernate-agroal
+hibernate-agroal.sonar.sources=src/main/java
+hibernate-agroal.sonar.tests=src/test/java
+hibernate-agroal.sonar.java.binaries=target/classes/java/main
+
+hibernate-c3p0.sonar.projectName=Hibernate ORM - c3p0
+hibernate-c3p0.sonar.projectBaseDir=hibernate-c3p0
+hibernate-c3p0.sonar.sources=src/main/java
+hibernate-c3p0.sonar.tests=src/test/java
+hibernate-c3p0.sonar.java.binaries=target/classes/java/main
+
+hibernate-community-dialects.sonar.projectName=Hibernate ORM - Community Dialects
+hibernate-community-dialects.sonar.projectBaseDir=hibernate-community-dialects
+hibernate-community-dialects.sonar.sources=src/main/java
+hibernate-community-dialects.sonar.tests=src/test/java
+hibernate-community-dialects.sonar.java.binaries=target/classes/java/main
+
+hibernate-core.sonar.projectName=Hibernate ORM - Core
+hibernate-core.sonar.projectBaseDir=hibernate-core
+hibernate-core.sonar.sources=src/main/java
+hibernate-core.sonar.tests=src/test/java
+hibernate-core.sonar.java.binaries=target/classes/java/main
+
+hibernate-envers.sonar.projectName=Hibernate ORM - Envers
+hibernate-envers.sonar.projectBaseDir=hibernate-envers
+hibernate-envers.sonar.sources=src/main/java
+hibernate-envers.sonar.tests=src/test/java
+hibernate-envers.sonar.java.binaries=target/classes/java/main
+
+hibernate-graalvm.sonar.projectName=Hibernate ORM - GraalVM
+hibernate-graalvm.sonar.projectBaseDir=hibernate-graalvm
+hibernate-graalvm.sonar.sources=src/main/java
+hibernate-graalvm.sonar.tests=src/test/java
+hibernate-graalvm.sonar.java.binaries=target/classes/java/main
+
+hibernate-hikaricp.sonar.projectName=Hibernate ORM - HikariCP
+hibernate-hikaricp.sonar.projectBaseDir=hibernate-hikaricp
+hibernate-hikaricp.sonar.sources=src/main/java
+hibernate-hikaricp.sonar.tests=src/test/java
+hibernate-hikaricp.sonar.java.binaries=target/classes/java/main
+
+hibernate-jcache.sonar.projectName=Hibernate ORM - JCache
+hibernate-jcache.sonar.projectBaseDir=hibernate-jcache
+hibernate-jcache.sonar.sources=src/main/java
+hibernate-jcache.sonar.tests=src/test/java
+hibernate-jcache.sonar.java.binaries=target/classes/java/main
+
+hibernate-jfr.sonar.projectName=Hibernate ORM - JFR
+hibernate-jfr.sonar.projectBaseDir=hibernate-jfr
+hibernate-jfr.sonar.sources=src/main/java
+hibernate-jfr.sonar.tests=src/test/java
+hibernate-jfr.sonar.java.binaries=target/classes/java/main
+
+hibernate-micrometer.sonar.projectName=Hibernate ORM - Micrometer
+hibernate-micrometer.hibernate-micrometer.sonar.projectBaseDir=hibernate-micrometer
+hibernate-micrometer.sonar.sources=src/main/java
+hibernate-micrometer.sonar.tests=src/test/java
+hibernate-micrometer.sonar.java.binaries=target/classes/java/main
+
+hibernate-scan-jandex.sonar.projectName=Hibernate ORM - Scan Jandex
+hibernate-scan-jandex.sonar.projectBaseDir=hibernate-scan-jandex
+hibernate-scan-jandex.sonar.sources=src/main/java
+hibernate-scan-jandex.sonar.java.binaries=target/classes/java/main
+
+hibernate-spatial.sonar.projectName=Hibernate ORM - Spatial
+hibernate-spatial.sonar.projectBaseDir=hibernate-spatial
+hibernate-spatial.sonar.sources=src/main/java
+hibernate-spatial.sonar.tests=src/test/java
+hibernate-spatial.sonar.java.binaries=target/classes/java/main
+
+hibernate-testing.sonar.projectName=Hibernate ORM - Testing
+hibernate-testing.sonar.projectBaseDir=hibernate-testing
+hibernate-testing.sonar.sources=src/main/java
+hibernate-testing.sonar.tests=src/test/java
+hibernate-testing.sonar.java.binaries=target/classes/java/main
+
+hibernate-vector.sonar.projectName=Hibernate ORM - Vector
+hibernate-vector.sonar.projectBaseDir=hibernate-vector
+hibernate-vector.sonar.sources=src/main/java
+hibernate-vector.sonar.tests=src/test/java
+hibernate-vector.sonar.java.binaries=target/classes/java/main
+
+# Tooling:
+hibernate-ant.sonar.projectName=Hibernate ORM - Ant
+hibernate-ant.sonar.projectBaseDir=tooling/hibernate-ant
+hibernate-ant.sonar.sources=src/main/java
+hibernate-ant.sonar.tests=src/test/java
+hibernate-ant.sonar.java.binaries=target/classes/java/main
+
+hibernate-assistant.sonar.projectName=Hibernate ORM - Assistant
+hibernate-assistant.sonar.projectBaseDir=tooling/hibernate-assistant
+hibernate-assistant.sonar.sources=src/main/java
+hibernate-assistant.sonar.tests=src/test/java
+hibernate-assistant.sonar.java.binaries=target/classes/java/main
+
+hibernate-gradle-plugin.sonar.projectName=Hibernate ORM - Gradle Plugin
+hibernate-gradle-plugin.sonar.projectBaseDir=tooling/hibernate-gradle-plugin
+hibernate-gradle-plugin.sonar.sources=src/main/java
+hibernate-gradle-plugin.sonar.tests=src/test/java
+hibernate-gradle-plugin.sonar.java.binaries=target/classes/java/main
+
+hibernate-maven-plugin.sonar.projectName=Hibernate ORM - Maven Plugin
+hibernate-maven-plugin.sonar.projectBaseDir=tooling/hibernate-maven-plugin
+hibernate-maven-plugin.sonar.sources=src/main/java
+hibernate-maven-plugin.sonar.tests=src/test/java
+hibernate-maven-plugin.sonar.java.binaries=target/classes/java/main
+
+hibernate-reveng.sonar.projectName=Hibernate ORM - Reverse Engineering
+hibernate-reveng.sonar.projectBaseDir=tooling/hibernate-reveng
+hibernate-reveng.sonar.sources=src/main/java
+hibernate-reveng.sonar.tests=src/test/java
+hibernate-reveng.sonar.java.binaries=target/classes/java/main
+
+metamodel-generator.sonar.projectName=Hibernate ORM - Metamodel Generator (Annotation processor)
+metamodel-generator.sonar.projectBaseDir=tooling/metamodel-generator
+metamodel-generator.sonar.sources=src/main/java
+metamodel-generator.sonar.tests=src/test/java
+metamodel-generator.sonar.java.binaries=target/classes/java/main
diff --git a/tooling/hibernate-ant/hibernate-ant.gradle b/tooling/hibernate-ant/hibernate-ant.gradle
index a6af63b9a823..e0f6344ec30e 100644
--- a/tooling/hibernate-ant/hibernate-ant.gradle
+++ b/tooling/hibernate-ant/hibernate-ant.gradle
@@ -7,8 +7,37 @@ plugins {
 
 description = 'Annotation Processor to generate JPA 2 static metamodel classes'
 
+sourceSets {
+    legacyTest {
+        compileClasspath += sourceSets.main.output
+        runtimeClasspath += sourceSets.main.output
+    }
+}
+
+configurations {
+    legacyTestImplementation.extendsFrom testImplementation
+    legacyTestRuntimeOnly.extendsFrom testRuntimeOnly
+}
+
 dependencies {
     compileOnly libs.ant
-    implementation project( ':hibernate-core' )
+    implementation project(':hibernate-core')
+    api project(':hibernate-reveng')
     testImplementation libs.ant
-}
\ No newline at end of file
+    testRuntimeOnly project(':hibernate-scan-jandex')
+}
+
+tasks.register('legacyTest', Test) {
+    description = 'Runs legacy tests.'
+    group = 'verification'
+    testClassesDirs = sourceSets.legacyTest.output.classesDirs
+    classpath = sourceSets.legacyTest.runtimeClasspath
+    useJUnitPlatform()
+}
+
+tasks.forbiddenApisLegacyTest {
+    enabled = false
+}
+
+test.dependsOn legacyTest
+
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/AntHibernateTool/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/AntHibernateTool/TestCase.java
new file mode 100644
index 000000000000..675ef2a3d294
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/AntHibernateTool/TestCase.java
@@ -0,0 +1,158 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.AntHibernateTool;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testHbm2DDLLogic() {
+
+		String[] resources = { "Hbm2DDLLogic.xml", "TopDown.hbm.xml" };
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "Hbm2DDLLogic.xml");
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File topDown = new File(destinationDir, "org/hibernate/tool/hbm2x/ant/TopDown.java");
+		File onlyDrop = new File(destinationDir, "onlydrop.sql");
+		File onlyCreate = new File(destinationDir, "onlycreate.sql");
+		File dropAndCreate = new File(destinationDir, "dropandcreate.sql");
+		File update = new File(destinationDir, "update.sql");
+
+		assertFalse(topDown.exists());
+		assertFalse(onlyDrop.exists());
+		assertFalse(onlyCreate.exists());
+		assertFalse(dropAndCreate.exists());
+		assertFalse(update.exists());
+
+		project.executeTarget("testHbm2DDLLogic");
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"), log);
+
+		assertTrue(topDown.exists());
+
+		assertTrue(onlyDrop.exists());
+		assertNull( FileUtil.findFirstString("create", onlyDrop));
+		assertNotNull(FileUtil.findFirstString("drop", onlyDrop));
+
+		assertTrue(onlyCreate.exists());
+		assertNull(FileUtil.findFirstString("drop", onlyCreate));
+		assertNotNull(FileUtil.findFirstString("create", onlyCreate));
+		assertNotNull(FileUtil.findFirstString("---", onlyCreate));
+
+		assertTrue(dropAndCreate.exists());
+		assertNotNull(FileUtil.findFirstString("drop", dropAndCreate));
+		assertNotNull(FileUtil.findFirstString("create", dropAndCreate));
+		assertNotNull(FileUtil.findFirstString("---", dropAndCreate));
+
+		assertTrue(update.exists());
+		assertNotNull(FileUtil.findFirstString("create", update));
+		assertNotNull(FileUtil.findFirstString("---", update));
+
+	}
+
+	@Test
+	public void testHbm2DDLUpdateExecution() {
+
+		String[] resources = { "Hbm2DDLUpdateExecution.xml", "TopDown.hbm.xml" };
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "Hbm2DDLUpdateExecution.xml");
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File topDown = new File(destinationDir, "org/hibernate/tool/hbm2x/ant/TopDown.java");
+		File onlyDrop = new File(destinationDir, "onlydrop.sql");
+		File update1 = new File(destinationDir, "update1.sql");
+		File update2 = new File(destinationDir, "update2.sql");
+
+		assertFalse(topDown.exists());
+		assertFalse(onlyDrop.exists());
+		assertFalse(update1.exists());
+		assertFalse(update2.exists());
+
+		project.executeTarget("testantcfgUpdateExecuted");
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"), log);
+
+		assertTrue(topDown.exists());
+		assertTrue(onlyDrop.exists());
+		assertTrue(update1.exists());
+		assertNotNull(FileUtil.findFirstString("create", update1));
+		assertTrue(update2.exists());
+		assertEquals(0, update2.length());
+	}
+
+	@Test
+	public void testHbm2DDLExportExecution() {
+
+		String[] resources = { "Hbm2DDLExportExecution.xml", "TopDown.hbm.xml" };
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "Hbm2DDLExportExecution.xml");
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File export = new File(destinationDir, "export.sql");
+		File update = new File(destinationDir, "update.sql");
+		File onlydrop = new File(destinationDir, "onlydrop.sql");
+
+		assertFalse(export.exists());
+		assertFalse(update.exists());
+		assertFalse(onlydrop.exists());
+
+		project.executeTarget("testantcfgExportExecuted");
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"), log);
+
+		assertTrue(export.exists());
+		assertTrue(update.exists());
+		assertNotNull(FileUtil.findFirstString("create", export));
+		// if export is executed, update should be empty
+		assertEquals(0, update.length());
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmNoError/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmNoError/TestCase.java
new file mode 100644
index 000000000000..8d2b82938476
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmNoError/TestCase.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Cfg2HbmNoError;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testCfg2HbmNoError() {
+
+		String[] resources = new String[] {"build.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File hbmxml = new File(destinationDir, "VerySimpleTable.hbm.xml");
+		assertFalse(hbmxml.exists());
+
+		project.executeTarget("testCfg2HbmNoError");
+
+		assertTrue(hbmxml.exists());
+		assertTrue( FileUtil
+				.findFirstString("class", hbmxml)
+				.contains("VerySimpleTable"));
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/Strategy.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/Strategy.java
new file mode 100644
index 000000000000..4e429e60e39a
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/Strategy.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Cfg2HbmWithCustomReverseNamingStrategy;
+
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.strategy.AbstractStrategy;
+
+public class Strategy extends AbstractStrategy {
+
+	public String tableToClassName(TableIdentifier tableIdentifier) {
+		return "foo.Bar";
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/TestCase.java
new file mode 100644
index 000000000000..3378e82bea79
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/TestCase.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Cfg2HbmWithCustomReverseNamingStrategy;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testCfg2HbmWithCustomReverseNamingStrategy() {
+
+		String[] resources = new String[] {"build.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File hbmxml = new File(destinationDir, "foo/Bar.hbm.xml");
+		assertFalse(hbmxml.exists());
+
+		project.executeTarget("testCfg2HbmWithCustomReverseNamingStrategy");
+
+		assertTrue(hbmxml.exists());
+		assertTrue( FileUtil
+				.findFirstString("class", hbmxml)
+				.contains("foo.Bar"));
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithInvalidReverseNamingStrategy/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithInvalidReverseNamingStrategy/TestCase.java
new file mode 100644
index 000000000000..de015f2cf4bb
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithInvalidReverseNamingStrategy/TestCase.java
@@ -0,0 +1,70 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Cfg2HbmWithInvalidReverseNamingStrategy;
+
+import org.apache.tools.ant.BuildException;
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testCfg2HbmWithInvalidReverseNamingStrategy() {
+
+		String[] resources = new String[] {"build.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		try {
+
+			project.executeTarget("testCfg2HbmWithInvalidReverseNamingStrategy");
+			fail("A BuildException should happen!");
+
+		} catch (BuildException e) {
+
+			assertTrue(e
+					.getMessage()
+					.contains("A strategy of class 'invalid.Strategy' could not be created"));
+
+		}
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithPackageName/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithPackageName/TestCase.java
new file mode 100644
index 000000000000..8744e8a44cc6
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithPackageName/TestCase.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Cfg2HbmWithPackageName;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue( destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testCfg2HbmWithPackageName() {
+
+		String[] resources = new String[] {"build.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File hbmxml = new File(destinationDir, "foo/bar/VerySimpleTable.hbm.xml");
+		assertFalse(hbmxml.exists());
+
+		project.executeTarget("testCfg2HbmWithPackageName");
+
+		assertTrue(hbmxml.exists());
+		assertTrue( FileUtil
+				.findFirstString("class", hbmxml)
+				.contains("foo.bar.VerySimpleTable"));
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/Strategy.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/Strategy.java
new file mode 100644
index 000000000000..d8821c6eddea
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/Strategy.java
@@ -0,0 +1,22 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Cfg2HbmWithPackageNameAndReverseNamingStrategy;
+
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.strategy.AbstractStrategy;
+
+public class Strategy extends AbstractStrategy {
+
+	public String columnToPropertyName(TableIdentifier table, String columnName) {
+	if ("NAME".equals(columnName)) {
+		return "barName";
+	}
+	else {
+		return super.columnToPropertyName(table, columnName);
+	}
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/TestCase.java
new file mode 100644
index 000000000000..9d88565ea846
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/TestCase.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Cfg2HbmWithPackageNameAndReverseNamingStrategy;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testCfg2HbmWithPackageNameAndReverseNamingStrategy() {
+
+		String[] resources = new String[] {"build.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File hbmxml = new File(destinationDir, "foo/Bar.hbm.xml");
+		assertFalse(hbmxml.exists());
+
+		project.executeTarget("testCfg2HbmWithPackageNameAndReverseNamingStrategy");
+
+		assertTrue(hbmxml.exists());
+		assertTrue( FileUtil
+				.findFirstString("class", hbmxml)
+				.contains("foo.Bar"));
+		assertTrue(FileUtil
+				.findFirstString("property", hbmxml)
+				.contains("barName"));
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java
new file mode 100644
index 000000000000..64f5d16f8208
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.EJB3Configuration;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testEJB3ConfigurationFailureExpected() {
+
+		String[] resources = new String[] {"build.xml", "hibernate.cfg.xml", "persistence.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File ejb3 = new File(destinationDir, "ejb3.sql");
+		assertFalse(ejb3.exists());
+
+		project.executeTarget("testEJB3Configuration");
+
+		assertTrue(ejb3.exists());
+		assertNotNull( FileUtil.findFirstString("create", ejb3));
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Exception/Dialect.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Exception/Dialect.java
new file mode 100644
index 000000000000..c5561f73822e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Exception/Dialect.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Exception;
+
+import org.hibernate.dialect.DatabaseVersion;
+
+public class Dialect extends org.hibernate.dialect.Dialect {
+	public Dialect() {
+		super((DatabaseVersion)null);
+	}
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Exception/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Exception/TestCase.java
new file mode 100644
index 000000000000..648240838397
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Exception/TestCase.java
@@ -0,0 +1,58 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Exception;
+
+import org.apache.tools.ant.BuildException;
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+	}
+
+	@Test
+	public void testException() {
+
+		String[] resources = new String[] {"build.xml", "hibernate.properties", "TopDown.hbm.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		try {
+
+			project.executeTarget("testException");
+			fail("An exception should occur");
+
+		} catch (BuildException e) {
+			assertTrue(e.getMessage().contains("Error while processing Entity"), e.getMessage());
+
+		}
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/GenericExport/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/GenericExport/TestCase.java
new file mode 100644
index 000000000000..3ddb7304832c
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/GenericExport/TestCase.java
@@ -0,0 +1,91 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.GenericExport;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testGenericExport() {
+
+		String[] resources = new String[] {"build.xml", "TopDown.hbm.xml", "generic-class.ftl"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File xTopDownJava = new File(destinationDir, "Xorg/hibernate/tool/hbm2x/ant/TopDown.java");
+		assertFalse(xTopDownJava.exists());
+
+		File topDownJava = new File(destinationDir, "org/hibernate/tool/hbm2x/ant/TopDown.java");
+		assertFalse(topDownJava.exists());
+
+		File topDownQuote = new File(destinationDir, "org/hibernate/tool/hbm2x/ant/TopDown.quote");
+		assertFalse(topDownQuote.exists());
+
+		File topDownPojo = new File(destinationDir, "org/hibernate/tool/hbm2x/ant/TopDown.pojo");
+		assertFalse(topDownPojo.exists());
+
+		project.executeTarget("testGenericExport");
+
+		assertTrue(xTopDownJava.exists());
+		assertTrue( FileUtil
+				.findFirstString("TopDown", xTopDownJava)
+				.contains("TopDown generated by hbm2java"));
+
+		assertTrue(topDownJava.exists());
+		assertTrue(FileUtil
+				.findFirstString("TopDown", topDownJava)
+				.contains("TopDown generated by hbm2java"));
+
+		assertTrue(topDownQuote.exists());
+		assertTrue(FileUtil
+				.findFirstString("TopDown", topDownQuote)
+				.contains("pojo=TopDown"));
+
+		assertTrue(topDownPojo.exists());
+		assertTrue(FileUtil
+				.findFirstString("TopDown", topDownPojo)
+				.contains("TopDown generated by hbm2java"));
+	}
+
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Hbm2JavaConfiguration/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Hbm2JavaConfiguration/TestCase.java
new file mode 100644
index 000000000000..03e3bd5368f1
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Hbm2JavaConfiguration/TestCase.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Hbm2JavaConfiguration;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testHbm2JavaConfiguration() {
+
+		String[] resources = new String[] {"build.xml", "SomeClass.hbm.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File someClass = new File(destinationDir, "SomeClass.java");
+		assertFalse(someClass.exists());
+
+		project.executeTarget("testHbm2JavaConfiguration");
+
+		assertTrue(someClass.exists());
+		assertTrue( FileUtil
+				.findFirstString("SomeClass", someClass)
+				.contains("SomeClass generated by hbm2java"));
+		assertNotNull(FileUtil.findFirstString("@Entity", someClass));
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/TestCase.java
new file mode 100644
index 000000000000..84a70776e6c2
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/TestCase.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Hbm2JavaEJB3Configuration;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testHbm2JavaConfiguration() {
+
+		String[] resources = new String[] {"build.xml", "SomeClass.hbm.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File someClass = new File(destinationDir, "SomeClass.java");
+		assertFalse(someClass.exists());
+
+		project.executeTarget("testHbm2JavaEJB3Configuration");
+
+		assertTrue(someClass.exists());
+		assertTrue( FileUtil
+				.findFirstString("SomeClass", someClass)
+				.contains("SomeClass generated by hbm2java"));
+		assertNotNull(FileUtil.findFirstString("@Entity", someClass));
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/HbmLint/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/HbmLint/TestCase.java
new file mode 100644
index 000000000000..bc4c97453948
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/HbmLint/TestCase.java
@@ -0,0 +1,93 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.HbmLint;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testHbmLint() {
+
+		String[] resources = new String[] {"build.xml", "SchemaIssues.hbm.xml", "hibernate.cfg.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File hbmLintResult = new File(destinationDir, "hbmlint-result.txt");
+		assertFalse(hbmLintResult.exists());
+
+		project.executeTarget("testHbmLint");
+
+		assertTrue(hbmLintResult.exists());
+
+		assertTrue( FileUtil
+				.findFirstString("BadType", hbmLintResult)
+				.contains("SCHEMA_TABLE_MISSING"));
+
+		assertTrue(FileUtil
+				.findFirstString("Category", hbmLintResult)
+				.contains("SCHEMA_TABLE_MISSING"));
+
+		assertTrue(FileUtil
+				.findFirstString("Column", hbmLintResult)
+				.contains("SCHEMA_TABLE_MISSING"));
+
+		assertTrue(FileUtil
+				.findFirstString("does_not_exist", hbmLintResult)
+				.contains("SCHEMA_TABLE_MISSING"));
+
+		assertTrue(FileUtil
+				.findFirstString("hilo_table", hbmLintResult)
+				.contains("SCHEMA_TABLE_MISSING"));
+
+		assertTrue(FileUtil
+				.findFirstString("MissingTable", hbmLintResult)
+				.contains("SCHEMA_TABLE_MISSING"));
+
+		assertTrue(FileUtil
+				.findFirstString("MISSING_ID_GENERATOR", hbmLintResult)
+				.contains("does_not_exist"));
+
+	}
+
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/SomeUserType.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/SomeUserType.java
new file mode 100644
index 000000000000..9eb9c5f08d55
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/SomeUserType.java
@@ -0,0 +1,16 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.JDBCConfigWithRevEngXml;
+
+import org.hibernate.usertype.UserType;
+
+public class SomeUserType implements UserType<String>{
+
+	@Override public int getSqlType() { return 0; }
+	@Override public Class<String> returnedClass() { return null; }
+	@Override public String deepCopy(String value) { return null; }
+	@Override public boolean isMutable() { return false; }
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/TestCase.java
new file mode 100644
index 000000000000..ae50e8e70b3c
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/TestCase.java
@@ -0,0 +1,72 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.JDBCConfigWithRevEngXml;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testJDBCConfigWithRevEngXml() {
+
+		String[] resources = new String[] {"build.xml", "hibernate.reveng.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File bottomUp = new File(destinationDir, "foo/BottomUp.java");
+		assertFalse(bottomUp.exists());
+
+		project.executeTarget("testJDBCConfigWithRevEngXml");
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"), log);
+
+		assertTrue(bottomUp.exists());
+		assertTrue( FileUtil
+				.findFirstString("good", bottomUp)
+				.contains("Boolean"));
+		assertTrue(FileUtil
+				.findFirstString("something", bottomUp)
+				.contains("SomeUserType"));
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JDBCConfiguration/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JDBCConfiguration/TestCase.java
new file mode 100644
index 000000000000..a41489f7ab18
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JDBCConfiguration/TestCase.java
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.JDBCConfiguration;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testJDBCConfiguration() {
+
+		String[] resources = new String[] {"JDBCConfiguration.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "JDBCConfiguration.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+		File templatesDir = new File(resourcesDir, "templates");
+		assertTrue(templatesDir.mkdir());
+		File pojoTemplateDir = new File(templatesDir, "pojo");
+		assertTrue(pojoTemplateDir.mkdir());
+		ResourceUtil.createResources(this, new String[] { "Pojo.ftl" }, pojoTemplateDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File noTemplate = new File(destinationDir, "no-template/BottomUp.java");
+		File withTemplate = new File(destinationDir, "with-template/BottomUp.java");
+		File cfgxml = new File(destinationDir, "cfgxml/hibernate.cfg.xml");
+
+		assertFalse(noTemplate.exists());
+		assertFalse(withTemplate.exists());
+		assertFalse(cfgxml.exists());
+
+		project.executeTarget("testJDBCConfiguration");
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"), log);
+
+		assertTrue(noTemplate.exists());
+		assertTrue( FileUtil
+				.findFirstString("public", noTemplate)
+				.contains("BottomUp"));
+
+		assertTrue(withTemplate.exists());
+		assertTrue(FileUtil
+				.findFirstString("template", withTemplate)
+				.contains("/** Made by a template in your neighborhood */"));
+
+		assertTrue(cfgxml.exists());
+		assertTrue(FileUtil
+				.findFirstString("mapping", cfgxml)
+				.contains("BottomUp.hbm.xml"));
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JPABogusPUnit/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JPABogusPUnit/TestCase.java
new file mode 100644
index 000000000000..d8c3c54dc772
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JPABogusPUnit/TestCase.java
@@ -0,0 +1,71 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.JPABogusPUnit;
+
+import org.apache.tools.ant.BuildException;
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testJPABogusPUnit() {
+
+		String[] resources = new String[] {"build.xml", "hibernate.cfg.xml", "persistence.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File ejb3 = new File(destinationDir, "ejb3.sql");
+		assertFalse(ejb3.exists());
+
+		try {
+			project.executeTarget("testJPABogusPUnit");
+			fail("The Bogus unit was accepted");
+		} catch (BuildException e) {
+			String log = AntUtil.getLog(project);
+			assertTrue(log.contains("Persistence unit not found: 'shouldnotbethere'"), log);
+		}
+
+		assertFalse(ejb3.exists());
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java
new file mode 100644
index 000000000000..55e5e3b5fa17
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.JPAPUnit;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testJPAPUnit() {
+
+		String[] resources = new String[] {"build.xml", "hibernate.cfg.xml", "persistence.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File ejb3 = new File(destinationDir, "ejb3.sql");
+		assertFalse(ejb3.exists());
+
+		project.executeTarget("testJPAPUnit");
+
+		assertTrue(ejb3.exists());
+		assertNotNull( FileUtil.findFirstString("create", ejb3));
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/TestCase.java
new file mode 100644
index 000000000000..79be7f6fcedc
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/TestCase.java
@@ -0,0 +1,71 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.JPAPropertyOverridesPUnit;
+
+import org.apache.tools.ant.BuildException;
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testJPAPUnit() {
+
+		String[] resources = new String[] {"build.xml", "hibernate.cfg.xml", "persistence.xml", "jpaoverrides.properties"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File ejb3 = new File(destinationDir, "ejb3.sql");
+		assertFalse(ejb3.exists());
+
+		try {
+			project.executeTarget("testJPAPropertyOverridesPUnit");
+			fail("property overrides not accepted");
+		} catch (BuildException e) {
+			// should happen
+			assertTrue(e.getMessage().contains("FAKEDialect"));
+		}
+
+		assertFalse(ejb3.exists());
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JavaFormatter/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JavaFormatter/TestCase.java
new file mode 100644
index 000000000000..54526e5f01ae
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/JavaFormatter/TestCase.java
@@ -0,0 +1,186 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.JavaFormatter;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.hibernate.tool.reveng.api.java.DefaultJavaPrettyPrinterStrategy;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+	}
+
+	@Test
+	public void testJavaFormatFile() {
+
+		String[] resources = new String[] {"build.xml", "formatting/SimpleOne.java"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File simpleOne = new File(destinationDir, "formatting/SimpleOne.java");
+		assertFalse(simpleOne.exists());
+
+		project.executeTarget("copyfiles");
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"));
+
+		assertTrue(simpleOne.exists());
+		assertFalse( FileUtil
+				.findFirstString("public", simpleOne)
+				.contains("SimpleOne"));
+
+		DefaultJavaPrettyPrinterStrategy formatter = new DefaultJavaPrettyPrinterStrategy();
+		formatter.formatFile( simpleOne );
+
+		assertTrue(FileUtil
+				.findFirstString("public", simpleOne)
+				.contains("SimpleOne"));
+
+	}
+
+	@Test
+	public void testJavaJdk5FormatFile() {
+
+		String[] resources = new String[] {"build.xml", "formatting/Simple5One.java"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File simple5One = new File(destinationDir, "formatting/Simple5One.java");
+		assertFalse(simple5One.exists());
+
+		project.executeTarget("copyfiles");
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"));
+
+		assertTrue(simple5One.exists());
+		assertFalse(FileUtil
+				.findFirstString("public", simple5One)
+				.contains("Simple5One"));
+
+		project.executeTarget("copyfiles");
+
+		assertFalse(log.contains("Exception"));
+
+		DefaultJavaPrettyPrinterStrategy formatter = new DefaultJavaPrettyPrinterStrategy();
+		assertTrue(
+				formatter.formatFile(simple5One),
+				"formatting should pass when using default settings");
+
+		assertTrue(FileUtil
+				.findFirstString("public", simple5One)
+				.contains("Simple5One"));
+	}
+
+	@Test
+	public void testAntFormatTask() {
+
+		String[] resources = new String[] {"build.xml", "formatting/SimpleOne.java"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File simpleOne = new File(destinationDir, "formatting/SimpleOne.java");
+		assertFalse(simpleOne.exists());
+
+		project.executeTarget("copyfiles");
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"));
+
+		assertTrue(simpleOne.exists());
+		assertFalse(FileUtil
+				.findFirstString("public", simpleOne)
+				.contains("SimpleOne"));
+
+		project.executeTarget("formatfiles");
+
+		assertTrue(FileUtil
+				.findFirstString("public", simpleOne)
+				.contains("SimpleOne"));
+
+	}
+
+	@Test
+	public void testConfig() {
+
+		String[] resources = new String[] {"build.xml", "formatting/SimpleOne.java", "formatting/Simple5One.java", "emptyconfig.properties"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File simpleOne = new File(destinationDir, "formatting/SimpleOne.java");
+		assertFalse(simpleOne.exists());
+		File simple5One = new File(destinationDir, "formatting/Simple5One.java");
+		assertFalse(simple5One.exists());
+
+		project.executeTarget("copyfiles");
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"));
+
+		assertTrue(simpleOne.exists());
+		assertTrue(simple5One.exists());
+
+		assertFalse(FileUtil
+				.findFirstString("public", simpleOne)
+				.contains("SimpleOne"));
+		assertFalse(FileUtil
+				.findFirstString("public", simple5One)
+				.contains("Simple5One"));
+
+		project.executeTarget("formatfiles");
+		log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"));
+
+		assertTrue(FileUtil
+				.findFirstString("public", simpleOne)
+				.contains("SimpleOne"));
+		assertTrue(FileUtil
+				.findFirstString("public", simple5One)
+				.contains("Simple5One"));
+
+		assertTrue(simpleOne.delete());
+		assertTrue(simple5One.delete());
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/NoConfig/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/NoConfig/TestCase.java
new file mode 100644
index 000000000000..dc81865c152a
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/NoConfig/TestCase.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.NoConfig;
+
+import org.apache.tools.ant.BuildException;
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+	}
+
+	@Test
+	public void testNoConfig() {
+
+		String[] resources = new String[] {"build.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File generatedSchema = new File(destinationDir, "generated-schema.sql");
+		assertFalse(generatedSchema.exists());
+
+		try {
+
+			project.executeTarget("testNoConfig");
+			fail("Exception should happen");
+
+		} catch (BuildException e) {
+
+			assertTrue(e.getMessage().contains("No configuration specified"));
+
+		}
+
+		assertFalse(generatedSchema.exists());
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/NoConnInfoExport/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/NoConnInfoExport/TestCase.java
new file mode 100644
index 000000000000..abec86911c9f
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/NoConnInfoExport/TestCase.java
@@ -0,0 +1,57 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.NoConnInfoExport;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		destinationDir.mkdir();
+		resourcesDir = new File(outputFolder, "resources");
+		resourcesDir.mkdir();
+	}
+
+	@Test
+	public void testNoConnInfoExport() {
+
+		String[] resources = new String[] {"build.xml", "hibernate.cfg.xml", "TopDown.hbm.xml", "hibernate.properties"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File noConnInfo = new File(destinationDir, "noConnInfo.sql");
+		assertFalse(noConnInfo.exists());
+
+		project.executeTarget("testNoConnInfoExport");
+
+		assertTrue(noConnInfo.exists());
+		assertTrue( FileUtil
+				.findFirstString("create", noConnInfo)
+				.contains("create table TopDown (id bigint not null, name varchar(255), primary key (id));"));
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/NoExporters/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/NoExporters/TestCase.java
new file mode 100644
index 000000000000..bd611eb22d64
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/NoExporters/TestCase.java
@@ -0,0 +1,56 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.NoExporters;
+
+import org.apache.tools.ant.BuildException;
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+	}
+
+	@Test
+	public void testNoConnInfoExport() {
+
+		String[] resources = new String[] {"build.xml", "hibernate.properties"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		try {
+
+			project.executeTarget("testNoExporters");
+			fail("should have failed with no exporters!");
+
+		} catch (BuildException e) {
+
+			// should happen!
+			assertTrue(e.getMessage().contains("No exporters specified"));
+
+		}
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Properties/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Properties/TestCase.java
new file mode 100644
index 000000000000..3277973be95b
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Properties/TestCase.java
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Properties;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testProperties() {
+
+		String[] resources = new String[] {"build.xml", "SomeClass.hbm.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+		File templatesDir = new File(resourcesDir, "templates");
+		assertTrue(templatesDir.mkdir());
+		File pojoTemplateDir = new File(templatesDir, "pojo");
+		assertTrue(pojoTemplateDir.mkdir());
+		ResourceUtil.createResources(this, new String[] { "Pojo.ftl" }, pojoTemplateDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File file = new File(destinationDir, "SomeClass.java");
+		assertFalse(file.exists());
+
+		project.executeTarget("testProperties");
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"), log);
+
+		assertTrue(file.exists());
+
+		assertTrue( FileUtil
+				.findFirstString("hbm2java.weirdAl", file)
+				.contains("foo3"));
+		assertTrue(FileUtil
+				.findFirstString("ant.project.name", file)
+				.contains("PropertiesTest"));
+		assertTrue(FileUtil
+				.findFirstString("foo.weirdAl", file)
+				.contains("does not exist"));
+		assertTrue(FileUtil
+				.findFirstString("bar", file)
+				.contains("foo2"));
+		assertTrue(FileUtil
+				.findFirstString("file", file)
+				.contains("some.file"));
+		assertTrue(FileUtil
+				.findFirstString("value", file)
+				.contains("some value"));
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Query/ObjectResult.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Query/ObjectResult.java
new file mode 100644
index 000000000000..a9a354423f4c
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Query/ObjectResult.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Query;
+
+public class ObjectResult {
+
+	public String id;
+	public int length;
+
+	@Override
+	public String toString() {
+		return "ObjectResult(id:" + id + ",length:" + length + ")";
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Query/SerializableResult.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Query/SerializableResult.java
new file mode 100644
index 000000000000..ebc649febd3a
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Query/SerializableResult.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Query;
+
+import java.io.Serializable;
+
+public class SerializableResult implements Serializable {
+
+	public String id;
+	public int length;
+
+	@Override
+	public String toString() {
+		return "SerializableResult(id:" + id + ",length:" + length + ")";
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Query/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Query/TestCase.java
new file mode 100644
index 000000000000..d78d183ea2e3
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/Query/TestCase.java
@@ -0,0 +1,80 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.Query;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testQuery() {
+
+		String[] resources = new String[] {"build.xml", "hibernate.cfg.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+		ResourceUtil.createResources(this, new String[] { "/hibernate.properties" }, resourcesDir);
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File hqlQuery = new File(destinationDir, "hqlQuery.txt");
+		assertFalse(hqlQuery.exists());
+		File textQuery = new File(destinationDir, "textQuery.txt");
+		assertFalse(textQuery.exists());
+
+		project.executeTarget("testQuery");
+
+		assertTrue(hqlQuery.exists());
+		assertTrue( FileUtil
+				.findFirstString("First", hqlQuery)
+				.contains("SerializableResult(id:First,length:1023)"));
+		assertTrue(FileUtil
+				.findFirstString("Third", hqlQuery)
+				.contains("ObjectResult(id:Third,length:4095)"));
+
+		assertTrue(textQuery.exists());
+		assertTrue(FileUtil
+				.findFirstString("First", textQuery)
+				.contains("SerializableResult(id:First,length:1023)"));
+		assertNull(FileUtil.findFirstString("Third", textQuery));
+
+	}
+
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/SchemaExportWarning/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/SchemaExportWarning/TestCase.java
new file mode 100644
index 000000000000..b350b5825880
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/SchemaExportWarning/TestCase.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.SchemaExportWarning;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testSchemaExport() {
+
+		String[] resources = new String[] {"build.xml", "TopDown.hbm.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File schemaExport = new File(destinationDir, "schemaexport.sql");
+		assertFalse(schemaExport.exists());
+
+		project.executeTarget("testSchemaExportWarning");
+
+		assertTrue(schemaExport.exists());
+		assertTrue( FileUtil
+				.findFirstString("drop", schemaExport)
+				.contains("TopDown"));
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"));
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/SchemaUpdateWarning/TestCase.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/SchemaUpdateWarning/TestCase.java
new file mode 100644
index 000000000000..68c232dd2336
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/SchemaUpdateWarning/TestCase.java
@@ -0,0 +1,71 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.SchemaUpdateWarning;
+
+import org.hibernate.tool.ant.test.utils.AntUtil;
+import org.hibernate.tool.ant.test.utils.FileUtil;
+import org.hibernate.tool.ant.test.utils.JdbcUtil;
+import org.hibernate.tool.ant.test.utils.ResourceUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File destinationDir = null;
+	private File resourcesDir = null;
+
+	@BeforeEach
+	public void setUp() {
+		destinationDir = new File(outputFolder, "destination");
+		assertTrue(destinationDir.mkdir());
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testSchemaUpdateWarning() {
+
+		String[] resources = new String[] {"build.xml", "TopDown.hbm.xml"};
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		File buildFile = new File(resourcesDir, "build.xml");
+
+		AntUtil.Project project = AntUtil.createProject(buildFile);
+		project.setProperty("destinationDir", destinationDir.getAbsolutePath());
+		project.setProperty("resourcesDir", resourcesDir.getAbsolutePath());
+
+		File schemaUpdate = new File(destinationDir, "schemaupdate.sql");
+		assertFalse(schemaUpdate.exists());
+
+		project.executeTarget("testSchemaUpdateWarning");
+
+		assertTrue(schemaUpdate.exists());
+		assertTrue( FileUtil
+				.findFirstString("create", schemaUpdate)
+				.contains("TopDown"));
+
+		String log = AntUtil.getLog(project);
+		assertFalse(log.contains("Exception"));
+		assertTrue(log.contains("Hibernate Core SchemaUpdate"));
+		assertTrue(log.contains("tools.hibernate.org"));
+
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/AntUtil.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/AntUtil.java
new file mode 100644
index 000000000000..e38af7dd81a9
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/AntUtil.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.test.utils;
+
+import org.apache.tools.ant.BuildEvent;
+import org.apache.tools.ant.ProjectHelper;
+
+import java.io.File;
+
+public class AntUtil {
+
+	public static class Project extends org.apache.tools.ant.Project {
+		StringBuffer logBuffer;
+		public void executeTarget(String targetName) {
+				logBuffer = new StringBuffer();
+				addBuildListener(new BuildListener(this));
+				super.executeTarget(targetName);
+		}
+	}
+
+	public static Project createProject(File buildFile) {
+		Project project = new Project();
+		project.init();
+		ProjectHelper projectHelper = ProjectHelper.getProjectHelper();
+		projectHelper.parse(project, buildFile);
+		return project;
+	}
+
+	public static String getLog(Project project) {
+		return project.logBuffer.toString();
+	}
+
+	private static class BuildListener implements org.apache.tools.ant.BuildListener {
+		private final Project project;
+		public BuildListener(Project project) {
+			this.project = project;
+		}
+		public void buildStarted(BuildEvent event) {}
+		public void buildFinished(BuildEvent event) {}
+		public void targetStarted(BuildEvent event) {}
+		public void targetFinished(BuildEvent event) {}
+		public void taskStarted(BuildEvent event) {}
+		public void taskFinished(BuildEvent event) {}
+
+		public void messageLogged(BuildEvent event) {
+			if ( event.getPriority() > Project.MSG_DEBUG) {
+				return;
+			}
+			project.logBuffer.append(event.getMessage() + "\n");
+		}
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/ConnectionProvider.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/ConnectionProvider.java
new file mode 100644
index 000000000000..3d5db150dc99
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/ConnectionProvider.java
@@ -0,0 +1,275 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.test.utils;
+
+import org.hibernate.engine.jdbc.connections.internal.UserSuppliedConnectionProviderImpl;
+
+import java.io.Serial;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.RowIdLifetime;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+
+public class ConnectionProvider extends UserSuppliedConnectionProviderImpl {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	private static final Connection CONNECTION = new Connection();
+	private static final DatabaseMetaData DATABASE_META_DATA = new DatabaseMetaData();
+
+	@Override public java.sql.Connection getConnection() { return CONNECTION; }
+
+	@Override public void closeConnection(java.sql.Connection conn) {}
+
+	private static class Connection implements java.sql.Connection {
+		@Override public <T> T unwrap(Class<T> iface) { return null; }
+		@Override public boolean isWrapperFor(Class<?> iface) { return false; }
+		@Override public Statement createStatement() { return null; }
+		@Override public PreparedStatement prepareStatement(String sql) { return null; }
+		@Override public CallableStatement prepareCall(String sql) { return null; }
+		@Override public String nativeSQL(String sql) { return null; }
+		@Override public void setAutoCommit(boolean autoCommit) {}
+		@Override public boolean getAutoCommit() { return false; }
+		@Override public void commit() {}
+		@Override public void rollback() {}
+		@Override public void close() {}
+		@Override public boolean isClosed() { return false; }
+		@Override public DatabaseMetaData getMetaData() { return DATABASE_META_DATA; }
+		@Override public void setReadOnly(boolean readOnly) {}
+		@Override public boolean isReadOnly() { return false; }
+		@Override public void setCatalog(String catalog) {}
+		@Override public String getCatalog() { return null; }
+		@Override public void setTransactionIsolation(int level) {}
+		@Override public int getTransactionIsolation() { return java.sql.Connection.TRANSACTION_NONE; }
+		@Override public SQLWarning getWarnings() { return null; }
+		@Override public void clearWarnings() {}
+		@Override public Statement createStatement(int resultSetType, int resultSetConcurrency) { return null; }
+		@Override public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) { return null; }
+		@Override public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) { return null; }
+		@Override public Map<String, Class<?>> getTypeMap() { return null; }
+		@Override public void setTypeMap(Map<String, Class<?>> map) {}
+		@Override public void setHoldability(int holdability) {}
+		@Override public int getHoldability() { return 0; }
+		@Override public Savepoint setSavepoint() { return null; }
+		@Override public Savepoint setSavepoint(String name) { return null; }
+		@Override public void rollback(Savepoint savepoint) {}
+		@Override public void releaseSavepoint(Savepoint savepoint) {}
+		@Override public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) { return null; }
+		@Override public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) { return null; }
+		@Override public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) { return null; }
+		@Override public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) { return null; }
+		@Override public PreparedStatement prepareStatement(String sql, int[] columnIndexes) { return null; }
+		@Override public PreparedStatement prepareStatement(String sql, String[] columnNames) { return null; }
+		@Override public Clob createClob() { return null; }
+		@Override public Blob createBlob() { return null; }
+		@Override public NClob createNClob() { return null; }
+		@Override public SQLXML createSQLXML() { return null; }
+		@Override public boolean isValid(int timeout) { return false;}
+		@Override public void setClientInfo(String name, String value) {}
+		@Override public void setClientInfo(Properties properties) {}
+		@Override public String getClientInfo(String name) { return null; }
+		@Override public Properties getClientInfo() { return null; }
+		@Override public Array createArrayOf(String typeName, Object[] elements) { return null; }
+		@Override public Struct createStruct(String typeName, Object[] attributes) { return null; }
+		@Override public void setSchema(String schema) {}
+		@Override public String getSchema() { return null; }
+		@Override public void abort(Executor executor) {}
+		@Override public void setNetworkTimeout(Executor executor, int milliseconds) {}
+		@Override public int getNetworkTimeout() { return 0; }
+	}
+
+	private static class DatabaseMetaData implements java.sql.DatabaseMetaData {
+		@Override public <T> T unwrap(Class<T> iface) { return null; }
+		@Override public boolean isWrapperFor(Class<?> iface) { return false; }
+		@Override public boolean allProceduresAreCallable() { return false; }
+		@Override public boolean allTablesAreSelectable() { return false; }
+		@Override public String getURL() { return null; }
+		@Override public String getUserName() { return null; }
+		@Override public boolean isReadOnly() { return false; }
+		@Override public boolean nullsAreSortedHigh() { return false; }
+		@Override public boolean nullsAreSortedLow() { return false; }
+		@Override public boolean nullsAreSortedAtStart() { return false; }
+		@Override public boolean nullsAreSortedAtEnd() { return false; }
+		@Override public String getDatabaseProductName() { return null; }
+		@Override public String getDatabaseProductVersion() { return ""; }
+		@Override public String getDriverName() { return null; }
+		@Override public String getDriverVersion() { return null; }
+		@Override public int getDriverMajorVersion() { return 0; }
+		@Override public int getDriverMinorVersion() { return 0; }
+		@Override public boolean usesLocalFiles() { return false; }
+		@Override public boolean usesLocalFilePerTable() { return false; }
+		@Override public boolean supportsMixedCaseIdentifiers() { return false; }
+		@Override public boolean storesUpperCaseIdentifiers() { return false; }
+		@Override public boolean storesLowerCaseIdentifiers() { return false; }
+		@Override public boolean storesMixedCaseIdentifiers() { return false; }
+		@Override public boolean supportsMixedCaseQuotedIdentifiers() { return false; }
+		@Override public boolean storesUpperCaseQuotedIdentifiers() { return false; }
+		@Override public boolean storesLowerCaseQuotedIdentifiers() { return false; }
+		@Override public boolean storesMixedCaseQuotedIdentifiers() { return false; }
+		@Override public String getIdentifierQuoteString() { return null; }
+		@Override public String getSQLKeywords() { return null; }
+		@Override public String getNumericFunctions() { return null; }
+		@Override public String getStringFunctions() { return null; }
+		@Override public String getSystemFunctions() { return null; }
+		@Override public String getTimeDateFunctions() { return null; }
+		@Override public String getSearchStringEscape() { return null; }
+		@Override public String getExtraNameCharacters() { return null; }
+		@Override public boolean supportsAlterTableWithAddColumn() { return false; }
+		@Override public boolean supportsAlterTableWithDropColumn() { return false; }
+		@Override public boolean supportsColumnAliasing() { return false; }
+		@Override public boolean nullPlusNonNullIsNull() { return false; }
+		@Override public boolean supportsConvert() { return false; }
+		@Override public boolean supportsConvert(int fromType, int toType) { return false; }
+		@Override public boolean supportsTableCorrelationNames() { return false; }
+		@Override public boolean supportsDifferentTableCorrelationNames() { return false; }
+		@Override public boolean supportsExpressionsInOrderBy() { return false; }
+		@Override public boolean supportsOrderByUnrelated() { return false; }
+		@Override public boolean supportsGroupBy() { return false; }
+		@Override public boolean supportsGroupByUnrelated() { return false; }
+		@Override public boolean supportsGroupByBeyondSelect() { return false; }
+		@Override public boolean supportsLikeEscapeClause() { return false; }
+		@Override public boolean supportsMultipleResultSets() { return false; }
+		@Override public boolean supportsMultipleTransactions() { return false; }
+		@Override public boolean supportsNonNullableColumns() { return false; }
+		@Override public boolean supportsMinimumSQLGrammar() { return false; }
+		@Override public boolean supportsCoreSQLGrammar() { return false; }
+		@Override public boolean supportsExtendedSQLGrammar() { return false; }
+		@Override public boolean supportsANSI92EntryLevelSQL() { return false; }
+		@Override public boolean supportsANSI92IntermediateSQL() { return false; }
+		@Override public boolean supportsANSI92FullSQL() { return false; }
+		@Override public boolean supportsIntegrityEnhancementFacility() { return false; }
+		@Override public boolean supportsOuterJoins() { return false; }
+		@Override public boolean supportsFullOuterJoins() { return false; }
+		@Override public boolean supportsLimitedOuterJoins() { return false; }
+		@Override public String getSchemaTerm() { return null; }
+		@Override public String getProcedureTerm() { return null; }
+		@Override public String getCatalogTerm() { return null; }
+		@Override public boolean isCatalogAtStart() { return false; }
+		@Override public String getCatalogSeparator() { return null; }
+		@Override public boolean supportsSchemasInDataManipulation() { return false; }
+		@Override public boolean supportsSchemasInProcedureCalls() { return false; }
+		@Override public boolean supportsSchemasInTableDefinitions() { return false; }
+		@Override public boolean supportsSchemasInIndexDefinitions() { return false; }
+		@Override public boolean supportsSchemasInPrivilegeDefinitions() { return false; }
+		@Override public boolean supportsCatalogsInDataManipulation() { return false; }
+		@Override public boolean supportsCatalogsInProcedureCalls() { return false; }
+		@Override public boolean supportsCatalogsInTableDefinitions() { return false; }
+		@Override public boolean supportsCatalogsInIndexDefinitions() { return false; }
+		@Override public boolean supportsCatalogsInPrivilegeDefinitions() { return false; }
+		@Override public boolean supportsPositionedDelete() { return false; }
+		@Override public boolean supportsPositionedUpdate() { return false; }
+		@Override public boolean supportsSelectForUpdate() { return false; }
+		@Override public boolean supportsStoredProcedures() { return false; }
+		@Override public boolean supportsSubqueriesInComparisons() { return false; }
+		@Override public boolean supportsSubqueriesInExists() { return false; }
+		@Override public boolean supportsSubqueriesInIns() { return false; }
+		@Override public boolean supportsSubqueriesInQuantifieds() { return false; }
+		@Override public boolean supportsCorrelatedSubqueries() { return false; }
+		@Override public boolean supportsUnion() { return false; }
+		@Override public boolean supportsUnionAll() { return false; }
+		@Override public boolean supportsOpenCursorsAcrossCommit() { return false; }
+		@Override public boolean supportsOpenCursorsAcrossRollback() { return false; }
+		@Override public boolean supportsOpenStatementsAcrossCommit() { return false; }
+		@Override public boolean supportsOpenStatementsAcrossRollback() { return false; }
+		@Override public int getMaxBinaryLiteralLength() { return 0; }
+		@Override public int getMaxCharLiteralLength() { return 0; }
+		@Override public int getMaxColumnNameLength() { return 0; }
+		@Override public int getMaxColumnsInGroupBy() { return 0; }
+		@Override public int getMaxColumnsInIndex() { return 0; }
+		@Override public int getMaxColumnsInOrderBy() { return 0; }
+		@Override public int getMaxColumnsInSelect() { return 0; }
+		@Override public int getMaxColumnsInTable() { return 0; }
+		@Override public int getMaxConnections() { return 0; }
+		@Override public int getMaxCursorNameLength() { return 0; }
+		@Override public int getMaxIndexLength() { return 0; }
+		@Override public int getMaxSchemaNameLength() { return 0; }
+		@Override public int getMaxProcedureNameLength() { return 0; }
+		@Override public int getMaxCatalogNameLength() { return 0; }
+		@Override public int getMaxRowSize() { return 0; }
+		@Override public boolean doesMaxRowSizeIncludeBlobs() { return false; }
+		@Override public int getMaxStatementLength() { return 0; }
+		@Override public int getMaxStatements() { return 0; }
+		@Override public int getMaxTableNameLength() { return 0; }
+		@Override public int getMaxTablesInSelect() { return 0; }
+		@Override public int getMaxUserNameLength() { return 0; }
+		@Override public int getDefaultTransactionIsolation() { return 0; }
+		@Override public boolean supportsTransactions() { return false; }
+		@Override public boolean supportsTransactionIsolationLevel(int level) { return false; }
+		@Override public boolean supportsDataDefinitionAndDataManipulationTransactions() { return false; }
+		@Override public boolean supportsDataManipulationTransactionsOnly() { return false; }
+		@Override public boolean dataDefinitionCausesTransactionCommit() { return false; }
+		@Override public boolean dataDefinitionIgnoredInTransactions() { return false; }
+		@Override public ResultSet getProcedures(String catalog, String schemaPattern, String procedureNamePattern) { return null; }
+		@Override public ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern, String columnNamePattern) { return null; }
+		@Override public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) { return null; }
+		@Override public ResultSet getSchemas() { return null; }
+		@Override public ResultSet getCatalogs() { return null; }
+		@Override public ResultSet getTableTypes() { return null; }
+		@Override public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) { return null; }
+		@Override public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) { return null; }
+		@Override public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern) { return null; }
+		@Override public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) { return null; }
+		@Override public ResultSet getVersionColumns(String catalog, String schema, String table) { return null; }
+		@Override public ResultSet getPrimaryKeys(String catalog, String schema, String table) { return null; }
+		@Override public ResultSet getImportedKeys(String catalog, String schema, String table) { return null; }
+		@Override public ResultSet getExportedKeys(String catalog, String schema, String table) { return null; }
+		@Override public ResultSet getCrossReference(String parentCatalog, String parentSchema, String parentTable, String foreignCatalog, String foreignSchema, String foreignTable) { return null; }
+		@Override public ResultSet getTypeInfo() { return null; }
+		@Override public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) { return null; }
+		@Override public boolean supportsResultSetType(int type) { return false; }
+		@Override public boolean supportsResultSetConcurrency(int type, int concurrency) { return false; }
+		@Override public boolean ownUpdatesAreVisible(int type) { return false; }
+		@Override public boolean ownDeletesAreVisible(int type) { return false; }
+		@Override public boolean ownInsertsAreVisible(int type) { return false; }
+		@Override public boolean othersUpdatesAreVisible(int type) { return false; }
+		@Override public boolean othersDeletesAreVisible(int type) { return false; }
+		@Override public boolean othersInsertsAreVisible(int type) { return false; }
+		@Override public boolean updatesAreDetected(int type) { return false; }
+		@Override public boolean deletesAreDetected(int type) { return false; }
+		@Override public boolean insertsAreDetected(int type) { return false; }
+		@Override public boolean supportsBatchUpdates() { return false; }
+		@Override public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) { return null; }
+		@Override public Connection getConnection() { return CONNECTION; }
+		@Override public boolean supportsSavepoints() { return false; }
+		@Override public boolean supportsNamedParameters() { return false; }
+		@Override public boolean supportsMultipleOpenResults() { return false; }
+		@Override public boolean supportsGetGeneratedKeys() { return false; }
+		@Override public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern) { return null; }
+		@Override public ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern) {return null;}
+		@Override public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, String attributeNamePattern) { return null; }
+		@Override public boolean supportsResultSetHoldability(int holdability) { return false; }
+		@Override public int getResultSetHoldability() { return 0; }
+		@Override public int getDatabaseMajorVersion() { return 0; }
+		@Override public int getDatabaseMinorVersion() { return 0; }
+		@Override public int getJDBCMajorVersion() { return 0; }
+		@Override public int getJDBCMinorVersion() { return 0; }
+		@Override public int getSQLStateType() { return DatabaseMetaData.sqlStateSQL; }
+		@Override public boolean locatorsUpdateCopy() { return false; }
+		@Override public boolean supportsStatementPooling() { return false; }
+		@Override public RowIdLifetime getRowIdLifetime() { return null; }
+		@Override public ResultSet getSchemas(String catalog, String schemaPattern) { return null; }
+		@Override public boolean supportsStoredFunctionsUsingCallSyntax() { return false; }
+		@Override public boolean autoCommitFailureClosesAllResultSets() { return false; }
+		@Override public ResultSet getClientInfoProperties() { return null; }
+		@Override public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) { return null; }
+		@Override public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern) { return null; }
+		@Override public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) { return null; }
+		@Override public boolean generatedKeyAlwaysReturned() { return false; }
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/Dialect.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/Dialect.java
new file mode 100644
index 000000000000..222acf63f3a4
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/Dialect.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.test.utils;
+
+import org.hibernate.dialect.DatabaseVersion;
+
+public class Dialect extends org.hibernate.dialect.Dialect {
+	public Dialect() {
+		super((DatabaseVersion)null);
+	}
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/FileUtil.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/FileUtil.java
new file mode 100644
index 000000000000..03516164aa80
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/FileUtil.java
@@ -0,0 +1,51 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.test.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class FileUtil {
+
+	static public String findFirstString(String string, File file) {
+		String str;
+		try {
+			BufferedReader in = new BufferedReader(new FileReader(file) );
+			while ( (str = in.readLine() ) != null ) {
+				if(str.contains(string)) {
+					break;
+				}
+			}
+			in.close();
+		}
+		catch (IOException e) {
+			throw new RuntimeException("trouble with searching in " + file,e);
+		}
+		return str;
+	}
+
+	static public void generateNoopComparator(File sourceFolder) throws IOException {
+		File file = new File(sourceFolder.getAbsolutePath() + "/comparator/NoopComparator.java");
+		assertTrue(file.getParentFile().mkdirs());
+		FileWriter fileWriter = new FileWriter(file);
+		PrintWriter pw = new PrintWriter(fileWriter);
+		pw.println("package comparator;                                ");
+		pw.println("import java.util.Comparator;                       ");
+		pw.println("public class NoopComparator implements Comparator {");
+		pw.println("	public int compare(Object o1, Object o2) {     ");
+		pw.println("		return 0;                                  ");
+		pw.println("	}                                              ");
+		pw.println("}                                                  ");
+		pw.flush();
+		pw.close();
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/JdbcUtil.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/JdbcUtil.java
new file mode 100644
index 000000000000..42de80e787a6
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/JdbcUtil.java
@@ -0,0 +1,204 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.test.utils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Properties;
+
+public class JdbcUtil {
+
+	static HashMap<Object, Connection> CONNECTION_TABLE = new HashMap<>();
+
+	/**
+	 * Obtain the database connection properties.
+	 *
+	 * @param test object residing in the package of an optional alternate hibernate.properties.
+	 *             Set null for the default hibernate.properties.
+	 */
+	public static Properties getConnectionProperties(Object test) {
+		Properties properties = new Properties();
+		InputStream inputStream = null;
+		if (test != null) {
+			inputStream = getAlternateHibernateProperties(test);
+		}
+		if (inputStream == null) {
+			inputStream = Thread
+					.currentThread()
+					.getContextClassLoader()
+					.getResourceAsStream("hibernate.properties");
+		}
+		try {
+			properties.load(inputStream);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+		Properties connectionProperties = new Properties();
+		connectionProperties.put(
+				"url",
+				properties.getProperty("hibernate.connection.url"));
+		connectionProperties.put(
+				"user",
+				properties.getProperty("hibernate.connection.username"));
+		connectionProperties.put(
+				"password",
+				properties.getProperty("hibernate.connection.password"));
+		return connectionProperties;
+	}
+
+	public static InputStream getAlternateHibernateProperties(Object test) {
+		return ResourceUtil.resolveResourceLocation(
+				test.getClass(), "hibernate.properties");
+	}
+
+	/**
+	 * Create a database connection associated  with a test object.
+	 *
+	 * @param test object as key to stored connection. Test object package may also contain
+	 *             an optional hibernate.properties.
+	 */
+	public static void establishJdbcConnection(Object test) {
+		try {
+			CONNECTION_TABLE.put(test, createJdbcConnection(test));
+		} catch (SQLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static void releaseJdbcConnection(Object test) {
+		Connection connection = CONNECTION_TABLE.get(test);
+		CONNECTION_TABLE.remove(test);
+		try {
+			connection.close();
+		} catch (SQLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static void executeSql(Object test, String[] sqls) {
+		try {
+			executeSql(CONNECTION_TABLE.get(test), sqls);
+		} catch (SQLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static String toIdentifier(Object test, String string) {
+		Connection connection = CONNECTION_TABLE.get(test);
+		try {
+			DatabaseMetaData databaseMetaData = connection.getMetaData();
+			if (databaseMetaData.storesLowerCaseIdentifiers()) {
+				return string.toLowerCase();
+			} else if (databaseMetaData.storesUpperCaseIdentifiers()) {
+				return string.toUpperCase();
+			} else {
+				return string;
+			}
+		} catch (SQLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static boolean isDatabaseOnline(Object test) {
+		boolean result = false;
+		try {
+			Connection connection = createJdbcConnection(test);
+			result = connection.isValid(1);
+			connection.commit();
+			connection.close();
+		} catch (SQLException e) {
+			// this will happen when the connection cannot be created
+		}
+		return result;
+	}
+
+	/**
+	 * Establish a connection and execute create.sql.
+	 *
+	 * @param test residing in the package of create.sql and optional alternate hibernate.properties.
+	 */
+	public static void createDatabase(Object test) {
+		establishJdbcConnection(test);
+		executeSql(test, getSqls(test, "create.sql"));
+	}
+
+	/**
+	 * Using an established connection, execute data.sql.
+	 *
+	 * @param test residing in the package of data.sql resource.
+	 */
+	public static void populateDatabase(Object test) {
+		executeSql(test, getSqls(test, "data.sql"));
+	}
+
+	/**
+	 * Using an established connection, execute drop.sql.
+	 *
+	 * @param test residing in the package of drop.sql resource.
+	 */
+	public static void dropDatabase(Object test) {
+		executeSql(test, getSqls(test, "drop.sql"));
+		releaseJdbcConnection(test);
+	}
+
+	private static String[] getSqls(Object test, String scriptName) {
+		String[] result = new String[]{};
+		InputStream inputStream = ResourceUtil.resolveResourceLocation(test.getClass(), scriptName);
+		if (inputStream != null) {
+			BufferedReader bufferedReader =
+					new BufferedReader(new InputStreamReader(inputStream));
+			try {
+				String line;
+				ArrayList<String> lines = new ArrayList<>();
+				while ((line = bufferedReader.readLine()) != null) {
+					if (!line.trim().startsWith("#")) {
+						lines.add(line);
+					}
+				}
+				result = lines.toArray(new String[0]);
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Obtain a connection to a database.
+	 *
+	 * @param test object as key to stored connection. Test object package may also contain
+	 *             an optional hibernate.properties.
+	 */
+	private static Connection createJdbcConnection(Object test)
+			throws SQLException {
+		Properties connectionProperties = getConnectionProperties(test);
+		String connectionUrl = (String) connectionProperties.remove("url");
+		return DriverManager
+				.getDriver(connectionUrl)
+				.connect(connectionUrl, connectionProperties);
+	}
+
+	private static void executeSql(Connection connection, String[] sqls)
+			throws SQLException {
+		Statement statement = connection.createStatement();
+		for (String sql : sqls) {
+			statement.execute(sql);
+		}
+		if (!connection.getAutoCommit()) {
+			connection.commit();
+		}
+		statement.close();
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/ResourceUtil.java b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/ResourceUtil.java
new file mode 100644
index 000000000000..7afd37782e45
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/java/org/hibernate/tool/ant/test/utils/ResourceUtil.java
@@ -0,0 +1,61 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.test.utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+
+public class ResourceUtil {
+
+	public static void createResources(Object test, String[] resources, File resourcesDir) {
+		try {
+			for (String resource : resources) {
+				InputStream inputStream = resolveResourceLocation(test.getClass(), resource);
+				File resourceFile = new File(resourcesDir, resource);
+				File parent = resourceFile.getParentFile();
+				if (!parent.exists()) {
+					if (!parent.mkdirs()) throw new AssertionError();
+				}
+				Files.copy(inputStream, resourceFile.toPath());
+			}
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static InputStream resolveResourceLocation(Class<?> testClass, String resourceName) {
+		InputStream result;
+		if (resourceName.startsWith("/")) {
+			result = testClass.getResourceAsStream(resourceName);
+		} else {
+			result = resolveRelativeResourceLocation(testClass, resourceName);
+		}
+		return result;
+	}
+
+	public static File resolveResourceFile(Class<?> testClass, String resourceName) {
+		String path = testClass.getPackage().getName().replace('.', File.separatorChar);
+		URL resourceUrl = testClass.getClassLoader().getResource(path + File.separatorChar
+																+ resourceName);
+		assert resourceUrl != null;
+		return new File(resourceUrl.getFile());
+	}
+
+	private static String getRelativeResourcesRoot(Class<?> testClass) {
+		return '/' + testClass.getPackage().getName().replace('.', '/') + '/';
+	}
+
+	private static InputStream resolveRelativeResourceLocation(Class<?> testClass, String resourceName) {
+		InputStream result = testClass.getResourceAsStream(getRelativeResourcesRoot(testClass) + resourceName);
+		if (result == null && testClass.getSuperclass() != Object.class) {
+			result = resolveRelativeResourceLocation(testClass.getSuperclass(), resourceName);
+		}
+		return result;
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/hibernate.properties b/tooling/hibernate-ant/src/legacyTest/resources/hibernate.properties
new file mode 100644
index 000000000000..ad629a198040
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/hibernate.properties
@@ -0,0 +1,25 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.dialect org.hibernate.dialect.H2Dialect
+hibernate.connection.driver_class org.h2.Driver
+hibernate.connection.username sa
+hibernate.connection.password  
+hibernate.connection.url jdbc:h2:mem:test
+
+hibernate.default_schema PUBLIC
+hibernate.default_catalog TEST
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/Hbm2DDLExportExecution.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/Hbm2DDLExportExecution.xml
new file mode 100644
index 000000000000..2ec79a4a0127
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/Hbm2DDLExportExecution.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="Hbm2DDLExportExecutionTest">
+
+	<target name="testantcfgExportExecuted">
+
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask" />
+
+		<hibernatetool destdir="${destinationDir}">
+				
+			<configuration namingstrategy="org.hibernate.cfg.ImprovedNamingStrategy">
+				<fileset file="${resourcesDir}/TopDown.hbm.xml" />
+			</configuration>
+
+			<hbm2java />
+			<hbm2ddl drop="true" create="false" export="true" outputfilename="onlydrop.sql" format="true" />
+			<hbm2ddl export="true" update="false" outputfilename="export.sql" format="true" />
+			<hbm2ddl export="false" update="true" outputfilename="update.sql" format="true" />
+			<hbm2ddl drop="true" create="false" export="true" />
+			<hbm2doc />
+
+		</hibernatetool>
+
+	</target>
+	
+</project>
+
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/Hbm2DDLLogic.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/Hbm2DDLLogic.xml
new file mode 100644
index 000000000000..d42fd139b5a6
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/Hbm2DDLLogic.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="Hbm2DDLLogicTest">
+
+	<target name="testHbm2DDLLogic">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask" />
+
+		<hibernatetool destdir="${destinationDir}">
+		
+			<configuration namingstrategy="org.hibernate.cfg.ImprovedNamingStrategy">
+				<fileset file="${resourcesDir}/TopDown.hbm.xml" />
+			</configuration>
+			
+			<hbm2java />
+
+			<!-- this one is executed, security clean up-->
+			<hbm2ddl drop="true" create="false" export="true" outputfilename="onlydrop.sql" format="true" />
+			
+			<!-- allow to test creation of script file + delimiter + non execution (test will fail if executed because of crappy delimiter) -->
+			<hbm2ddl drop="false" create="true" export="false" outputfilename="onlycreate.sql" format="true" delimiter="---"/>
+			<hbm2ddl drop="true" create="false" export="false" outputfilename="onlydrop.sql" format="true" />
+			<hbm2ddl drop="true" create="true" export="false" outputfilename="dropandcreate.sql" format="true" delimiter="---"/>
+			<hbm2ddl export="false" update="true" outputfilename="update.sql" format="true" delimiter="---"/>
+			
+			<!-- this one is executed, security clean up, could be easily removed-->
+			<hbm2ddl drop="true" create="false" export="true" outputfilename="onlydrop.sql" format="true" />
+			<hbm2doc />
+
+		</hibernatetool>
+
+	</target>
+		
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/Hbm2DDLUpdateExecution.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/Hbm2DDLUpdateExecution.xml
new file mode 100644
index 000000000000..a103f90f2717
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/Hbm2DDLUpdateExecution.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="Hbm2DDLLogicUpdateExecutionTest">
+		
+	<target name="testantcfgUpdateExecuted">
+
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask" />
+
+		<hibernatetool destdir="${destinationDir}">
+		
+			<configuration namingstrategy="org.hibernate.cfg.ImprovedNamingStrategy">
+				<fileset file="${resourcesDir}/TopDown.hbm.xml"/>
+			</configuration>
+
+			<hbm2java />
+			<hbm2ddl drop="true" create="false" export="true" outputfilename="onlydrop.sql" format="true" />
+			<hbm2ddl export="true" update="true" outputfilename="update1.sql" format="true" />
+			<hbm2ddl export="false" update="true" outputfilename="update2.sql" format="true" />
+			<hbm2ddl drop="true" create="false" export="true" />
+			<hbm2doc />
+
+		</hibernatetool>
+
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml
new file mode 100644
index 000000000000..8b538fd9f66b
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/AntHibernateTool/TopDown.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
+		<id name="id" type="long">
+			<generator class="assigned"></generator>
+		</id>
+		<property name="name" type="string"></property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmNoError/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmNoError/build.xml
new file mode 100644
index 000000000000..2344bab75b97
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmNoError/build.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="Cfg2HbmNoErrorTest">
+
+	<target name="testCfg2HbmNoError">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+
+		<hibernatetool>
+			
+			<jdbcconfiguration propertyfile="${resourcesDir}/hibernate.properties" />
+			
+			<hbm2hbmxml destdir="${destinationDir}" />
+			
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmNoError/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmNoError/create.sql
new file mode 100644
index 000000000000..93378e6c0a59
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmNoError/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ CREATE TABLE VERY_SIMPLE_TABLE ( ID INT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID) )
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 1, 'A Row')
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 2, 'Another Row')
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmNoError/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmNoError/drop.sql
new file mode 100644
index 000000000000..46adb370538e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmNoError/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DELETE FROM VERY_SIMPLE_TABLE WHERE ID > 0
+DROP TABLE VERY_SIMPLE_TABLE
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/build.xml
new file mode 100644
index 000000000000..130c6d84f3a2
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/build.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="Cfg2HbmWithCustomReverseNamingStrategyTest">
+
+	<target name="testCfg2HbmWithCustomReverseNamingStrategy">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+
+		<hibernatetool>
+			
+			<jdbcconfiguration 
+				propertyfile="${resourcesDir}/hibernate.properties" 
+				reversestrategy="org.hibernate.tool.ant.Cfg2HbmWithCustomReverseNamingStrategy.Strategy"/>
+			
+			<hbm2hbmxml destdir="${destinationDir}" />
+			
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/create.sql
new file mode 100644
index 000000000000..93378e6c0a59
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ CREATE TABLE VERY_SIMPLE_TABLE ( ID INT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID) )
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 1, 'A Row')
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 2, 'Another Row')
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/drop.sql
new file mode 100644
index 000000000000..46adb370538e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithCustomReverseNamingStrategy/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DELETE FROM VERY_SIMPLE_TABLE WHERE ID > 0
+DROP TABLE VERY_SIMPLE_TABLE
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithInvalidReverseNamingStrategy/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithInvalidReverseNamingStrategy/build.xml
new file mode 100644
index 000000000000..fd5d06984d89
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithInvalidReverseNamingStrategy/build.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="Cfg2HbmWithInvalidReverseNamingStrategyTest">
+
+	<target name="testCfg2HbmWithInvalidReverseNamingStrategy">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+
+		<hibernatetool>
+			
+			<jdbcconfiguration 
+				propertyfile="${resourcesDir}/hibernate.properties" 
+				reversestrategy="invalid.Strategy"/>
+			
+			<hbm2hbmxml destdir="${destinationDir}" />
+			
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageName/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageName/build.xml
new file mode 100644
index 000000000000..49dc11ec58b9
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageName/build.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="Cfg2HbmWithPackageNameTest">
+
+	<target name="testCfg2HbmWithPackageName">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+
+		<hibernatetool>
+			
+			<jdbcconfiguration 
+				propertyfile="${resourcesDir}/hibernate.properties" 
+				packageName="foo.bar" />
+			
+			<hbm2hbmxml destdir="${destinationDir}" />
+			
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageName/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageName/create.sql
new file mode 100644
index 000000000000..93378e6c0a59
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageName/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ CREATE TABLE VERY_SIMPLE_TABLE ( ID INT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID) )
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 1, 'A Row')
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 2, 'Another Row')
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageName/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageName/drop.sql
new file mode 100644
index 000000000000..46adb370538e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageName/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DELETE FROM VERY_SIMPLE_TABLE WHERE ID > 0
+DROP TABLE VERY_SIMPLE_TABLE
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/build.xml
new file mode 100644
index 000000000000..085cca9885f9
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/build.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="Cfg2HbmWithPackageNameAndReverseNamingStrategyTest">
+
+	<target name="testCfg2HbmWithPackageNameAndReverseNamingStrategy">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+
+		<hibernatetool>
+			
+			<jdbcconfiguration 
+				propertyfile="${resourcesDir}/hibernate.properties" 
+				packageName="foo"
+				reversestrategy="org.hibernate.tool.ant.Cfg2HbmWithPackageNameAndReverseNamingStrategy.Strategy" />
+			
+			<hbm2hbmxml destdir="${destinationDir}" />
+			
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/create.sql
new file mode 100644
index 000000000000..2020099bbbd4
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ CREATE TABLE BAR ( ID INT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID) )
+ INSERT INTO BAR VALUES ( 1, 'A Row')
+ INSERT INTO BAR VALUES ( 2, 'Another Row')
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/drop.sql
new file mode 100644
index 000000000000..928be9d35589
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Cfg2HbmWithPackageNameAndReverseNamingStrategy/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DELETE FROM BAR WHERE ID > 0
+DROP TABLE BAR
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/build.xml
new file mode 100644
index 000000000000..c5d7ce0f7c4a
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/build.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="EJB3ConfigurationTest">
+
+	<target name="testEJB3Configuration">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask" />
+
+		<hibernatetool>
+			<jdbcconfiguration propertyfile="${resourcesDir}/hibernate.properties" />
+			<hbm2java ejb3="true" jdk5="true" destdir="${destinationDir}/ejb3/src" />
+		</hibernatetool>
+
+		<mkdir dir="${destinationDir}/ejb3/classes" />
+		<javac fork="true" srcdir="${destinationDir}/ejb3/src" destdir="${destinationDir}/ejb3/classes" />
+
+		<copy file="${resourcesDir}/persistence.xml" tofile="${destinationDir}/ejb3/classes/META-INF/persistence.xml" />
+		<copy file="${resourcesDir}/hibernate.cfg.xml" tofile="${destinationDir}/ejb3/classes/hibernate.cfg.xml" />
+
+		<hibernatetool destdir="${destinationDir}">
+			<jpaconfiguration/>
+			<classpath>
+				<path location="${destinationDir}/ejb3/classes" />
+			</classpath>
+			<hbm2ddl export="false" outputfilename="ejb3.sql" />
+		</hibernatetool>
+
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/create.sql
new file mode 100644
index 000000000000..93378e6c0a59
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ CREATE TABLE VERY_SIMPLE_TABLE ( ID INT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID) )
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 1, 'A Row')
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 2, 'Another Row')
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/drop.sql
new file mode 100644
index 000000000000..46adb370538e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DELETE FROM VERY_SIMPLE_TABLE WHERE ID > 0
+DROP TABLE VERY_SIMPLE_TABLE
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/hibernate.cfg.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/hibernate.cfg.xml
new file mode 100644
index 000000000000..2dac8e599633
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/hibernate.cfg.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-configuration PUBLIC
+	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+	"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+	<session-factory>
+		<property name="show_sql">true</property>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/persistence.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/persistence.xml
new file mode 100644
index 000000000000..b49b094d6c5f
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/EJB3Configuration/persistence.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- example of reference to a cfg.xml file -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+   version="1.0">
+   <persistence-unit name="ejb3test" transaction-type="RESOURCE_LOCAL">
+      <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+      <properties>
+         <property name="hibernate.ejb.cfgfile" value="/hibernate.cfg.xml"/>
+      </properties>
+   </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Exception/TopDown.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Exception/TopDown.hbm.xml
new file mode 100644
index 000000000000..8b538fd9f66b
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Exception/TopDown.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
+		<id name="id" type="long">
+			<generator class="assigned"></generator>
+		</id>
+		<property name="name" type="string"></property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Exception/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Exception/build.xml
new file mode 100644
index 000000000000..5da74ba56db0
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Exception/build.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="ExceptionTest">
+
+	<target name="testException">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+		
+		<hibernatetool destdir="${destinationDir}" templatepath="${resourcesDir}">
+			
+			<configuration propertyfile="${resourcesDir}/hibernate.properties">
+				<fileset file="${resourcesDir}/TopDown.hbm.xml" />
+			</configuration>
+
+			<hbmtemplate 
+				template="template.ftl" 
+				filepattern="{package-name}/{class-name}.error" />
+
+		</hibernatetool>
+		
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Exception/hibernate.properties b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Exception/hibernate.properties
new file mode 100644
index 000000000000..6d5bdf055f53
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Exception/hibernate.properties
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.dialect org.hibernate.tool.ant.Exception.Dialect
+hibernate.connection.provider_class org.hibernate.tool.ant.test.utils.ConnectionProvider
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml
new file mode 100644
index 000000000000..8b538fd9f66b
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/GenericExport/TopDown.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
+		<id name="id" type="long">
+			<generator class="assigned"></generator>
+		</id>
+		<property name="name" type="string"></property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/GenericExport/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/GenericExport/build.xml
new file mode 100644
index 000000000000..d3b4f46273dc
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/GenericExport/build.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="GenericExportTest">
+
+	<target name="testGenericExport">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+		
+		<hibernatetool 
+			destdir="${destinationDir}" 
+			templatepath="${resourcesDir}">
+			
+			<configuration propertyfile="${resourcesDir}/hibernate.properties">
+				<fileset file="${resourcesDir}/TopDown.hbm.xml"/>
+			</configuration>
+
+			<hbmtemplate 
+				template="pojo/Pojo.ftl"
+				filepattern="X{package-name}/{class-name}.java" 
+				foreach="entity">
+				<property key="jdk5" value="false" />
+				<property key="ejb3" value="false" />
+			</hbmtemplate>
+
+		    <hbm2java />
+
+     		<hbmtemplate 
+				template="generic-class.ftl" 
+				filepattern="{package-name}/{class-name}.quote" />
+			
+			<hbmtemplate 
+				exporterclass="org.hibernate.tool.reveng.internal.export.java.JavaExporter"
+				filepattern="{package-name}/{class-name}.pojo" /> 
+			
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/GenericExport/generic-class.ftl b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/GenericExport/generic-class.ftl
new file mode 100644
index 000000000000..b5a44236406e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/GenericExport/generic-class.ftl
@@ -0,0 +1,27 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+name=<#if item?if_exists>${item.getName()}</#if>
+pojo=${pojo.getDeclarationName()}
+unsetproperty=${unsetProperty?if_exists}
+proptest=${proptest?if_exists}
+hibernatetool.booleanProperty=${.data_model["hibernatetool.booleanProperty"]?if_exists?string}
+booleanProperty=${booleanProperty?if_exists?string}
+<#if booleanProperty?exists && !booleanProperty>booleanWasTrue=true</#if>
+myTool.value=<#if myTool?exists>${myTool.unqualify("myTool.value")}</#if>
+<#if refproperty?exists>
+<#assign inline= refproperty?interpret>
+refproperty=<@inline/>
+</#if>
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml
new file mode 100644
index 000000000000..dbd20a3faa42
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/SomeClass.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="SomeClass">
+		<id name="id" type="long">
+			<generator class="assigned"></generator>
+		</id>
+		<property name="name" type="string"></property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/build.xml
new file mode 100644
index 000000000000..eb97fc9baa6e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaConfiguration/build.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="Hbm2JavaConfigurationTest">
+
+	<target name="testHbm2JavaConfiguration">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+		
+		<hibernatetool destdir="${destinationDir}">
+			
+			<configuration propertyfile="${resourcesDir}/hibernate.properties">
+				<fileset dir="${resourcesDir}">
+					<include name="SomeClass.hbm.xml" />
+				</fileset>
+			</configuration>
+
+			<hbm2java jdk5="true" />
+			
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml
new file mode 100644
index 000000000000..dbd20a3faa42
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/SomeClass.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="SomeClass">
+		<id name="id" type="long">
+			<generator class="assigned"></generator>
+		</id>
+		<property name="name" type="string"></property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/build.xml
new file mode 100644
index 000000000000..3cee72fc4e17
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Hbm2JavaEJB3Configuration/build.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="Hbm2JavaEJB3ConfigurationTest">
+
+	<target name="testHbm2JavaEJB3Configuration">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+		
+		<hibernatetool destdir="${destinationDir}">
+			
+			<configuration propertyfile="${resourcesDir}/hibernate.properties">
+				<fileset dir="${resourcesDir}">
+					<include name="SomeClass.hbm.xml" />
+				</fileset>
+			</configuration>
+
+			<hbm2java ejb3="true" />
+			
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml
new file mode 100644
index 000000000000..7c5bb3ec4d5c
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/Column.hbm.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml">
+<!-- 
+  This mapping demonstrates basic attributes of the mapping document
+
+     (1) Simple id and properties        
+     (2) Id generation with no arguments.
+-->
+    <class name="org.hibernate.mapping.Column">
+        <id name="name">
+        	<generator class="assigned"/>    		
+    	</id>
+    	
+    	<property name="length" 
+    		type="int">
+    		  
+    		</property>
+    			</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/SchemaIssues.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/SchemaIssues.hbm.xml
new file mode 100644
index 000000000000..f1bdbf9c7554
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/SchemaIssues.hbm.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbmlint">
+
+    <class name="Category">    
+    	<id name="id" type="int">
+    		<generator class="enhanced-sequence">
+    			<param name="sequence_name">should_be_there</param>
+    		</generator>
+    	</id>	
+		<property name="name" type="string"/>		
+	</class>
+
+    <class name="BadType">   
+    	<id name="id" type="int">
+    		<generator class="enhanced-table">
+    			<param name="table_name">does_not_exist</param>
+    		</generator>
+    	</id>		
+		<property name="name" type="text"/>		
+	</class>
+
+	<class name="MissingTable">
+		<id name="id" type="long">
+    		<generator class="enhanced-table">
+    			<param name="table_name">hilo_table</param>
+    		</generator>
+    	</id>		
+	</class>	
+	
+</hibernate-mapping>
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/build.xml
new file mode 100644
index 000000000000..b4572efce2d0
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/build.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="HbmLintTest">
+
+	<target name="testHbmLint">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+
+		<hibernatetool destdir="${destinationDir}">
+
+			<configuration 
+					propertyfile="${resourcesDir}/hibernate.properties" 
+					configurationfile="${resourcesDir}/hibernate.cfg.xml">
+				<fileset file="${resourcesDir}/SchemaIssues.hbm.xml"/>
+			</configuration>
+
+			<hbmlint/>
+
+		</hibernatetool>
+
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/create.sql
new file mode 100644
index 000000000000..93378e6c0a59
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ CREATE TABLE VERY_SIMPLE_TABLE ( ID INT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID) )
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 1, 'A Row')
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 2, 'Another Row')
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/drop.sql
new file mode 100644
index 000000000000..46adb370538e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DELETE FROM VERY_SIMPLE_TABLE WHERE ID > 0
+DROP TABLE VERY_SIMPLE_TABLE
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/hibernate.cfg.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/hibernate.cfg.xml
new file mode 100644
index 000000000000..e3e5e9d42a45
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/HbmLint/hibernate.cfg.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-configuration PUBLIC
+	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+	"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+	<session-factory>	    	    
+		<property name="show_sql">true</property>
+		<!-- Drop and re-create the database schema on startup -->
+        <property name="hibernate.hbm2ddl.auto">create</property>
+		<mapping resource="org/hibernate/tool/ant/HbmLint/Column.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/build.xml
new file mode 100644
index 000000000000..f7f2689e1f9d
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/build.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="JDBCConfigWithRevEngXmlTest">
+
+	<target name="testJDBCConfigWithRevEngXml">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+		
+		<hibernatetool destdir="${destinationDir}">
+			
+			<jdbcconfiguration 
+				propertyfile="${resourcesDir}/hibernate.properties" 
+				packagename="foo" 
+				revengfile="${resourcesDir}/hibernate.reveng.xml" />
+
+			<hbm2java />
+			
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/create.sql
new file mode 100644
index 000000000000..d61997f7a485
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/create.sql
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE BOTTOM_UP (ID INT NOT NULL, NAME VARCHAR(255), SOMETHING VARCHAR(20), GOOD VARCHAR(1), PRIMARY KEY (ID))
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/drop.sql
new file mode 100644
index 000000000000..f2afec2e78bf
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/drop.sql
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE BOTTOM_UP
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/hibernate.reveng.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/hibernate.reveng.xml
new file mode 100644
index 000000000000..ae71893aa8db
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfigWithRevEngXml/hibernate.reveng.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-reverse-engineering SYSTEM "https://hibernate.org/dtd/hibernate-reverse-engineering-3.0.dtd" >
+
+<hibernate-reverse-engineering>
+
+	<type-mapping>
+ 		<sql-type 
+ 			jdbc-type="VARCHAR" 
+ 			length='20' 
+ 			hibernate-type="org.hibernate.tool.ant.JDBCConfigWithRevEngXml.SomeUserType" /> 
+		<sql-type jdbc-type="VARCHAR" length='1' hibernate-type="yes_no" />
+	</type-mapping>
+
+</hibernate-reverse-engineering>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/JDBCConfiguration.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/JDBCConfiguration.xml
new file mode 100644
index 000000000000..049f6b91b708
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/JDBCConfiguration.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="JDBCConfigurationTest">
+
+	<target name="testJDBCConfiguration">
+
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask" />
+
+		<hibernatetool>
+			
+			<jdbcconfiguration 
+				propertyfile="${resourcesDir}/hibernate.properties" 
+				detectManyToMany="true" 
+				detectoptimisticlock="true"/>
+
+			<hbm2java destdir="${destinationDir}/no-template"/> 
+			
+	     	<hbm2java 
+	     		templatepath="${resourcesDir}/templates" 
+	     		destdir="${destinationDir}/with-template"/>
+			
+			<hbm2cfgxml destdir="${destinationDir}/cfgxml"/> 
+			
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/Pojo.ftl b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/Pojo.ftl
new file mode 100644
index 000000000000..1d7595d051ef
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/Pojo.ftl
@@ -0,0 +1,16 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+/** Made by a template in your neighborhood */
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/create.sql
new file mode 100644
index 000000000000..e4aeedb33fb4
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/create.sql
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE BOTTOM_UP (ID INT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID))
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/drop.sql
new file mode 100644
index 000000000000..f2afec2e78bf
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JDBCConfiguration/drop.sql
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE BOTTOM_UP
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/build.xml
new file mode 100644
index 000000000000..723bf5726cc4
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/build.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="JPABogusPUnitTest">
+
+	<target name="testJPABogusPUnit">
+
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask" /> 
+
+		<hibernatetool>
+			<jdbcconfiguration propertyfile="${resourcesDir}/hibernate.properties" />
+			<hbm2java ejb3="true" jdk5="true" destdir="${destinationDir}/ejb3/src" />
+		</hibernatetool>
+
+		<mkdir dir="${destinationDir}/ejb3/classes" />
+		<javac fork="true" srcdir="${destinationDir}/ejb3/src" destdir="${destinationDir}/ejb3/classes" />
+
+		<copy file="${resourcesDir}/persistence.xml" tofile="${destinationDir}/ejb3/classes/META-INF/persistence.xml" />
+		<copy file="${resourcesDir}/hibernate.cfg.xml" tofile="${destinationDir}/ejb3/classes/ejb3test-hibernate.cfg.xml" />
+
+		<hibernatetool destdir="${destinationDir}">
+			<jpaconfiguration persistenceunit="shouldnotbethere"/>
+			<classpath>
+				<path location="${build.dir}/ejb3/classes" />
+			</classpath>
+			<hbm2ddl export="false" outputfilename="ejb3.sql" />
+		</hibernatetool>
+
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/create.sql
new file mode 100644
index 000000000000..93378e6c0a59
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ CREATE TABLE VERY_SIMPLE_TABLE ( ID INT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID) )
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 1, 'A Row')
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 2, 'Another Row')
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/drop.sql
new file mode 100644
index 000000000000..46adb370538e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DELETE FROM VERY_SIMPLE_TABLE WHERE ID > 0
+DROP TABLE VERY_SIMPLE_TABLE
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/hibernate.cfg.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/hibernate.cfg.xml
new file mode 100644
index 000000000000..2dac8e599633
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/hibernate.cfg.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-configuration PUBLIC
+	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+	"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+	<session-factory>
+		<property name="show_sql">true</property>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/persistence.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/persistence.xml
new file mode 100644
index 000000000000..b49b094d6c5f
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPABogusPUnit/persistence.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- example of reference to a cfg.xml file -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+   version="1.0">
+   <persistence-unit name="ejb3test" transaction-type="RESOURCE_LOCAL">
+      <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+      <properties>
+         <property name="hibernate.ejb.cfgfile" value="/hibernate.cfg.xml"/>
+      </properties>
+   </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/build.xml
new file mode 100644
index 000000000000..b1706313c565
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/build.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="JPAPunitTest">
+
+	<target name="testJPAPUnit">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+
+		<hibernatetool>
+			<jdbcconfiguration propertyfile="${resourcesDir}/hibernate.properties" />
+			<hbm2java ejb3="true" jdk5="true" destdir="${destinationDir}/ejb3/src" />
+		</hibernatetool>
+
+		<mkdir dir="${destinationDir}/ejb3/classes" />
+		<javac fork="true" srcdir="${destinationDir}/ejb3/src" destdir="${destinationDir}/ejb3/classes" />
+
+		<copy file="${resourcesDir}/persistence.xml" tofile="${destinationDir}/ejb3/classes/META-INF/persistence.xml" />
+		<copy file="${resourcesDir}/hibernate.cfg.xml" tofile="${destinationDir}/ejb3/classes/hibernate.cfg.xml" />
+
+		<hibernatetool destdir="${destinationDir}">
+			<jpaconfiguration persistenceunit="ejb3test"/>
+			<classpath>
+				<path location="${destinationDir}/ejb3/classes" />
+			</classpath>
+			<hbm2ddl export="false" outputfilename="ejb3.sql" />
+		</hibernatetool>
+		
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/create.sql
new file mode 100644
index 000000000000..93378e6c0a59
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ CREATE TABLE VERY_SIMPLE_TABLE ( ID INT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID) )
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 1, 'A Row')
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 2, 'Another Row')
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/drop.sql
new file mode 100644
index 000000000000..46adb370538e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DELETE FROM VERY_SIMPLE_TABLE WHERE ID > 0
+DROP TABLE VERY_SIMPLE_TABLE
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/hibernate.cfg.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/hibernate.cfg.xml
new file mode 100644
index 000000000000..2dac8e599633
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/hibernate.cfg.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-configuration PUBLIC
+	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+	"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+	<session-factory>
+		<property name="show_sql">true</property>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/persistence.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/persistence.xml
new file mode 100644
index 000000000000..f0a5ceb89e96
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPUnit/persistence.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- example of reference to a cfg.xml file -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+   version="1.0">
+   <persistence-unit name="ejb3test" transaction-type="RESOURCE_LOCAL">
+      <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+      <properties>
+         <property name="hibernate.ejb.cfgfile" value="/hibernate.cfg.xml"/>
+       </properties>
+   </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/build.xml
new file mode 100644
index 000000000000..2df073bb3924
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/build.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="JPAPropertyOverridesPUnitTest">
+
+	<target name="testJPAPropertyOverridesPUnit">
+
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+
+		<hibernatetool>
+			<jdbcconfiguration propertyfile="${resourcesDir}/hibernate.properties" />
+			<hbm2java ejb3="true" jdk5="true" destdir="${destinationDir}/ejb3/src" />
+		</hibernatetool>
+
+		<mkdir dir="${destinationDir}/ejb3/classes" />
+		<javac fork="true" srcdir="${destinationDir}/ejb3/src" destdir="${destinationDir}/ejb3/classes" />
+
+		<copy file="${resourcesDir}/persistence.xml" tofile="${destinationDir}/ejb3/classes/META-INF/persistence.xml" />
+		<copy file="${resourcesDir}/hibernate.cfg.xml" tofile="${destinationDir}/ejb3/classes/hibernate.cfg.xml" />
+
+		<hibernatetool destdir="${destinationDir}">
+			<jpaconfiguration persistenceunit="ejb3test" propertyfile="${resourcesDir}/jpaoverrides.properties"/>
+			<classpath>
+				<path location="${destinationDir}/ejb3/classes" />
+			</classpath>
+			<hbm2ddl export="false" outputfilename="ejb3.sql" />
+		</hibernatetool>
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/create.sql
new file mode 100644
index 000000000000..93378e6c0a59
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ CREATE TABLE VERY_SIMPLE_TABLE ( ID INT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID) )
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 1, 'A Row')
+ INSERT INTO VERY_SIMPLE_TABLE VALUES ( 2, 'Another Row')
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/drop.sql
new file mode 100644
index 000000000000..46adb370538e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DELETE FROM VERY_SIMPLE_TABLE WHERE ID > 0
+DROP TABLE VERY_SIMPLE_TABLE
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/hibernate.cfg.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/hibernate.cfg.xml
new file mode 100644
index 000000000000..2dac8e599633
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/hibernate.cfg.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-configuration PUBLIC
+	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+	"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+	<session-factory>
+		<property name="show_sql">true</property>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/jpaoverrides.properties b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/jpaoverrides.properties
new file mode 100644
index 000000000000..70691ab42da1
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/jpaoverrides.properties
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+# only used to test jpa overrides being picked up
+hibernate.dialect FAKEDialect
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/persistence.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/persistence.xml
new file mode 100644
index 000000000000..b49b094d6c5f
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JPAPropertyOverridesPUnit/persistence.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- example of reference to a cfg.xml file -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+   version="1.0">
+   <persistence-unit name="ejb3test" transaction-type="RESOURCE_LOCAL">
+      <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+      <properties>
+         <property name="hibernate.ejb.cfgfile" value="/hibernate.cfg.xml"/>
+      </properties>
+   </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/build.xml
new file mode 100644
index 000000000000..9f6b5299f63f
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/build.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="javaformattest">
+<!-- 	<property name="build.dir" location="../../target/javaformattest" />
+	<property name="target.dir" location="../../target"/>
+	<property name="test-classes" location="${target.dir}/test-classes"/>
+	<property file="${test-classes}/hibernate.properties" />
+	<property file="${test-classes}/hibernate.properties" /> 
+
+
+
+	<path id="tasks.classpath">
+		<pathelement path="${test-classes}" />
+		<pathelement path="${target.dir}/classes" />
+	</path> 
+	
+	<target name="cleanup">
+		<delete dir="${build.dir}"/>
+	</target> -->
+	
+	<target name="copyfiles">
+		
+		<copy todir="${destinationDir}">
+		  	<fileset dir="${resourcesDir}" includes="formatting/**/*"/>
+		</copy>
+			
+	</target>
+	
+
+	<target name="formatfiles">		
+
+		<taskdef 
+			name="javaformatter" 
+			classname="org.hibernate.tool.ant.JavaFormatterTask"/>
+				
+		<javaformatter> 
+		   <fileset dir="${destinationDir}">
+		   	   <include name="formatting/**/*"/>
+		   	</fileset>
+		</javaformatter>
+			
+	</target>
+
+</project>
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/emptyconfig.properties b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/emptyconfig.properties
new file mode 100644
index 000000000000..99590521ea30
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/emptyconfig.properties
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+## this file is intentionally left blank
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/formatting/Simple5One.java b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/formatting/Simple5One.java
new file mode 100644
index 000000000000..3221f3b68380
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/formatting/Simple5One.java
@@ -0,0 +1,26 @@
+/*
+ * Hibernate Tools, Tooling for your Hibernate Projects
+ *
+ * Copyright 2004-2025 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package formatting;
+
+@Override // intentional that his will give compile error.
+public 
+  class 
+    Simple5One {
+
+	
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/formatting/SimpleOne.java b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/formatting/SimpleOne.java
new file mode 100644
index 000000000000..e85693caaf02
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/JavaFormatter/formatting/SimpleOne.java
@@ -0,0 +1,25 @@
+/*
+ * Hibernate Tools, Tooling for your Hibernate Projects
+ *
+ * Copyright 2004-2025 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package formatting;
+
+public 
+  class 
+    SimpleOne {
+
+	
+}
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConfig/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConfig/build.xml
new file mode 100644
index 000000000000..a2492d6e164c
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConfig/build.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="NoConfigTest">
+
+	<target name="testNoConfig" description="hbm2ddl without connection info">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+		
+		<hibernatetool destdir="${destinationDir}">
+						 
+			<hbm2ddl 
+				drop="true" 
+				create="true" 
+				export="true" 
+				outputfilename="generated-schema.sql" 
+				delimiter=";" 
+				format="true" /> 
+			
+		</hibernatetool>
+		
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/TopDown.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/TopDown.hbm.xml
new file mode 100644
index 000000000000..8b538fd9f66b
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/TopDown.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
+		<id name="id" type="long">
+			<generator class="assigned"></generator>
+		</id>
+		<property name="name" type="string"></property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/build.xml
new file mode 100644
index 000000000000..2d366693db08
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/build.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="NoConnInfoExportTest">
+
+	<target name="testNoConnInfoExport" description="hbm2ddl without connection info">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+		
+		<hibernatetool destdir="${destinationDir}">
+			
+			<configuration
+					propertyFile="${resourcesDir}/hibernate.properties"
+					configurationfile="${resourcesDir}/hibernate.cfg.xml">
+				<fileset file="${resourcesDir}/TopDown.hbm.xml" />
+			</configuration>
+			
+			<hbm2ddl haltonerror="true" export="false" outputfilename="noConnInfo.sql" />
+			
+		</hibernatetool>
+		
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/hibernate.cfg.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/hibernate.cfg.xml
new file mode 100644
index 000000000000..3530ff20a79d
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/hibernate.cfg.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-configuration PUBLIC
+		"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+		"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+   <session-factory name="context">
+        <property name="hibernate.connection.driver_class">org.h2.Driver</property>
+        <property name="hibernate.dialect">org.hibernate.tool.ant.test.utils.Dialect</property>
+        <property name="hibernate.connection.provider_class">org.hibernate.tool.ant.test.utils.ConnectionProvider</property>
+    </session-factory>
+</hibernate-configuration>
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/hibernate.properties b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/hibernate.properties
new file mode 100644
index 000000000000..2e86ae66b31b
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoConnInfoExport/hibernate.properties
@@ -0,0 +1,3 @@
+hibernate.connection.url
+hibernate.default_schema  
+hibernate.default_catalog
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoExporters/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoExporters/build.xml
new file mode 100644
index 000000000000..db43fd02e30a
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoExporters/build.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="NoExportersTest">
+
+	<target name="testNoExporters" description="tool without any exporters - should fail">
+		
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+		
+		<hibernatetool>
+			
+			<jdbcconfiguration 
+				propertyfile="${resourcesDir}/hibernate.properties" 
+				packageName="org.h3.test" 
+				reversestrategy="org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy" />
+		
+		</hibernatetool>
+		
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoExporters/hibernate.properties b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoExporters/hibernate.properties
new file mode 100644
index 000000000000..7d0d56a6fcdb
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/NoExporters/hibernate.properties
@@ -0,0 +1,17 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Properties/Pojo.ftl b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Properties/Pojo.ftl
new file mode 100644
index 000000000000..913c2f2c6a4c
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Properties/Pojo.ftl
@@ -0,0 +1,21 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+hbm2java.weirdAl: ${.data_model["hbm2java.weirdAl"]}
+ant.project.name: ${.data_model["ant.project.name"]}
+<#if !.data_model["foo.weirdAl"]?exists>foo.weirdAl does not exist</#if>
+bar: ${bar}
+file: ${file}
+value: ${value}
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Properties/SomeClass.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Properties/SomeClass.hbm.xml
new file mode 100644
index 000000000000..dbd20a3faa42
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Properties/SomeClass.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="SomeClass">
+		<id name="id" type="long">
+			<generator class="assigned"></generator>
+		</id>
+		<property name="name" type="string"></property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Properties/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Properties/build.xml
new file mode 100644
index 000000000000..23eabd8c5bbe
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Properties/build.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="PropertiesTest">
+
+	<target name="testProperties">
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+
+		<property name="foo.weirdAl" value="foo1" />
+		<property name="bar" value="foo2"/>
+		<property name="hbm2java.weirdAl" value="foo3" />
+
+		<hibernatetool destdir="${destinationDir}">
+			<configuration propertyfile="${resourcesDir}/hibernate.properties">
+				<fileset dir="${resourcesDir}">
+					<include name="SomeClass.hbm.xml" />
+				</fileset>
+			</configuration>
+
+			<hbm2java jdk5="true" templatepath="${resourcesDir}/templates">
+				<propertyset>
+					<propertyref builtin="commandline" />
+					<propertyref name="bar" /> 
+					<propertyref prefix="hbm2java" /> 
+				</propertyset>
+				<property key="file" file="some.file" />
+				<property key="value" value="some value" />
+			</hbm2java>
+		</hibernatetool>
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/build.xml
new file mode 100644
index 000000000000..42abf8010f49
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/build.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="QueryTest">
+
+	<target name="testQuery" description="test the query tasks">
+		<taskdef 
+			name="hibernatetool" 
+			classname="org.hibernate.tool.ant.HibernateToolTask"/>
+		
+		<hibernatetool destdir="${destinationDir}">
+			
+			<configuration 
+				propertyfile="${resourcesDir}/hibernate.properties" 
+				configurationfile="${resourcesDir}/hibernate.cfg.xml" />
+			
+			<query destfile="hqlQuery.txt">
+				<hql>from java.lang.Object</hql>
+  			    <hql>from java.io.Serializable</hql>
+			</query>
+			
+		    <query destfile="textQuery.txt">from java.io.Serializable</query>	
+			
+		</hibernatetool>
+		
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/create.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/create.sql
new file mode 100644
index 000000000000..fdce751d0ff1
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/create.sql
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ CREATE TABLE SERIALIZABLE_RESULT ( ID VARCHAR(255) NOT NULL, LENGTH INT NOT NULL, PRIMARY KEY (ID) )
+ INSERT INTO SERIALIZABLE_RESULT VALUES ( 'First', 1023)
+ INSERT INTO SERIALIZABLE_RESULT VALUES ( 'Second', 2047)
+ CREATE TABLE OBJECT_RESULT ( ID VARCHAR(255) NOT NULL, LENGTH INT NOT NULL, PRIMARY KEY (ID) )
+ INSERT INTO OBJECT_RESULT VALUES ( 'Third', 4095)
+ INSERT INTO OBJECT_RESULT VALUES ( 'Fourth', 8181)
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/drop.sql
new file mode 100644
index 000000000000..69ebfb20f67c
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/drop.sql
@@ -0,0 +1,21 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DELETE FROM SERIALIZABLE_RESULT
+DROP TABLE SERIALIZABLE_RESULT
+DELETE FROM OBJECT_RESULT
+DROP TABLE OBJECT_RESULT
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/hibernate.cfg.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/hibernate.cfg.xml
new file mode 100644
index 000000000000..83443c50c18b
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/hibernate.cfg.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-configuration PUBLIC
+	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+	"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+	<session-factory>	    	    
+		<mapping resource="/org/hibernate/tool/ant/Query/query.hbm.xml"/>
+	</session-factory>
+</hibernate-configuration>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/query.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/query.hbm.xml
new file mode 100644
index 000000000000..0e1b5271dd14
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/Query/query.hbm.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.ant.Query">
+<!-- 
+  This mapping demonstrates basic attributes of the mapping document
+
+     (1) Simple id and properties        
+     (2) Id generation with no arguments.
+-->
+    <class name="SerializableResult" table="SERIALIZABLE_RESULT">
+        <id name="id" access="field">
+        		<generator class="assigned"/>    		
+    		</id>   	
+    		<property name="length" type="int" access="field"/>   		  
+    </class>
+
+    <class name="ObjectResult" table="OBJECT_RESULT">
+        <id name="id" access="field">
+        		<generator class="assigned"/>    		
+    		</id>   	
+    		<property name="length" type="int" access="field"/>   		  
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaExportWarning/TopDown.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaExportWarning/TopDown.hbm.xml
new file mode 100644
index 000000000000..8b538fd9f66b
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaExportWarning/TopDown.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
+		<id name="id" type="long">
+			<generator class="assigned"></generator>
+		</id>
+		<property name="name" type="string"></property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaExportWarning/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaExportWarning/build.xml
new file mode 100644
index 000000000000..8157b86bc916
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaExportWarning/build.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="SchemaExportWarningTest">
+
+	<target name="testSchemaExportWarning">
+		
+		<taskdef 
+			name="schemaexport"
+			classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" />
+		
+		 <schemaexport 
+			 	drop="true" 
+			 	quiet="false" 
+			 	text="false" 
+		 		delimiter=";"
+			 	output="${destinationDir}/schemaexport.sql">
+			 	
+			<fileset file="${resourcesDir}/TopDown.hbm.xml" />
+			 	
+	 	</schemaexport>
+			
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaUpdateWarning/TopDown.hbm.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaUpdateWarning/TopDown.hbm.xml
new file mode 100644
index 000000000000..8b538fd9f66b
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaUpdateWarning/TopDown.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="org.hibernate.tool.hbm2x.ant.TopDown">
+		<id name="id" type="long">
+			<generator class="assigned"></generator>
+		</id>
+		<property name="name" type="string"></property>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaUpdateWarning/build.xml b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaUpdateWarning/build.xml
new file mode 100644
index 000000000000..88c08ef95801
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaUpdateWarning/build.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE project>
+<project name="SchemaUpdateWarningTest">
+
+	<target name="testSchemaUpdateWarning">
+		
+		<taskdef 
+			name="schemaupdate" 
+			classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask" />
+		
+		 <schemaupdate 
+		 		quiet="false" 
+		 		text="false" 
+		 		outputfile="${destinationDir}/schemaupdate.sql" >
+		 	
+			<fileset file="${resourcesDir}/TopDown.hbm.xml" />
+
+		</schemaupdate>
+			
+	</target>
+	
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaUpdateWarning/drop.sql b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaUpdateWarning/drop.sql
new file mode 100644
index 000000000000..771e8951e94e
--- /dev/null
+++ b/tooling/hibernate-ant/src/legacyTest/resources/org/hibernate/tool/ant/SchemaUpdateWarning/drop.sql
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE TopDown
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ConfigurationTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ConfigurationTask.java
new file mode 100644
index 000000000000..c0d8c77c065a
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ConfigurationTask.java
@@ -0,0 +1,134 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileSet;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @author max
+ *
+ */
+public class ConfigurationTask extends Task {
+
+	List<FileSet> fileSets = new ArrayList<FileSet>();
+	MetadataDescriptor metadataDescriptor;
+	File configurationFile;
+	File propertyFile;
+	protected String entityResolver;
+
+	public ConfigurationTask() {
+		setDescription( "Standard Configuration" );
+	}
+
+	public void addConfiguredFileSet(FileSet fileSet) {
+		fileSets.add( fileSet );
+	}
+
+	public final MetadataDescriptor getMetadataDescriptor() {
+		if ( metadataDescriptor == null ) {
+			metadataDescriptor = createMetadataDescriptor();
+		}
+		return metadataDescriptor;
+	}
+
+	protected MetadataDescriptor createMetadataDescriptor() {
+		return MetadataDescriptorFactory
+				.createNativeDescriptor(
+						configurationFile,
+						getFiles(),
+						loadPropertiesFile() );
+	}
+
+	protected Properties loadPropertiesFile() {
+		if ( propertyFile != null ) {
+			Properties properties = new Properties(); // TODO: should we "inherit" from the ant projects properties ?
+			try (FileInputStream is = new FileInputStream( propertyFile )) {
+				properties.load( is );
+				return properties;
+			}
+			catch (FileNotFoundException e) {
+				throw new BuildException( propertyFile + " not found.", e );
+			}
+			catch (IOException e) {
+				throw new BuildException( "Problem while loading " + propertyFile, e );
+			}
+		}
+		else {
+			return null;
+		}
+	}
+
+
+	protected File[] getFiles() {
+
+		List<File> files = new LinkedList<File>();
+		for ( FileSet fs : fileSets ) {
+
+			DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+
+			String[] dsFiles = ds.getIncludedFiles();
+			for ( String dsFile : dsFiles ) {
+				File f = new File( dsFile );
+				if ( !f.isFile() ) {
+					f = new File( ds.getBasedir(), dsFile );
+				}
+
+				files.add( f );
+			}
+		}
+
+		return files.toArray( new File[0] );
+	}
+
+
+	public File getConfigurationFile() {
+		return configurationFile;
+	}
+
+	public void setConfigurationFile(File configurationFile) {
+		this.configurationFile = configurationFile;
+	}
+
+	public File getPropertyFile() {
+		return propertyFile;
+	}
+
+	public void setPropertyFile(File propertyFile) {
+		this.propertyFile = propertyFile;
+	}
+
+	public void setEntityResolver(String entityResolverName) {
+		this.entityResolver = entityResolverName;
+	}
+
+	public void setNamingStrategy(String namingStrategy) {
+		log("setting unused naming strategy: " + namingStrategy);
+	}
+
+	@Override
+	public Object clone() throws CloneNotSupportedException {
+		ConfigurationTask ct = (ConfigurationTask) super.clone();
+		ct.fileSets.addAll( this.fileSets );
+		ct.metadataDescriptor = this.metadataDescriptor;
+		ct.propertyFile = this.propertyFile;
+		ct.entityResolver = this.entityResolver;
+		return ct;
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ExporterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ExporterTask.java
new file mode 100644
index 000000000000..831fab886d35
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ExporterTask.java
@@ -0,0 +1,98 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.PropertySet;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * @author max
+ *
+ * Is not actually a ant task, but simply just a task part of a HibernateToolTask
+ *
+ */
+public abstract class ExporterTask {
+
+	// refactor out so not dependent on Ant ?
+	protected HibernateToolTask parent;
+	Properties properties;
+	private Path templatePath;
+
+	public ExporterTask(HibernateToolTask parent) {
+		this.parent = parent;
+		this.properties = new Properties();
+	}
+
+
+	public void execute() {
+
+		Exporter exporter = configureExporter(createExporter() );
+		exporter.start();
+
+	}
+
+	protected abstract Exporter createExporter();
+
+	public File getDestdir() {
+		File destdir = (File)this.properties.get(ExporterConstants.DESTINATION_FOLDER);
+		if(destdir==null) {
+			return parent.getDestDir();
+		}
+		else {
+			return destdir;
+		}
+	}
+	public void setDestdir(File destdir) {
+		this.properties.put(ExporterConstants.DESTINATION_FOLDER, destdir);
+	}
+
+	public void setTemplatePath(Path path) {
+		templatePath = path;
+	}
+
+	public void validateParameters() {
+		if(getDestdir()==null) {
+			throw new BuildException("destdir must be set, either locally or on <hibernatetool>");
+		}
+	}
+
+	public void addConfiguredPropertySet(PropertySet ps) {
+		properties.putAll(ps.getProperties());
+	}
+
+	public void addConfiguredProperty(Environment.Variable property) {
+		properties.put(property.getKey(), property.getValue());
+	}
+
+	protected Path getTemplatePath() {
+		if(templatePath==null) {
+			return parent.getTemplatePath();
+		}
+		else {
+			return templatePath;
+		}
+	}
+
+
+	abstract String getName();
+
+	protected Exporter configureExporter(Exporter exporter) {
+		Properties prop = new Properties();
+		prop.putAll(parent.getProperties());
+		prop.putAll(properties);
+		exporter.getProperties().putAll(prop);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, parent.getMetadataDescriptor());
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, getDestdir());
+		exporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, getTemplatePath().list());
+		return exporter;
+	}
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/GenericExporterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/GenericExporterTask.java
new file mode 100644
index 000000000000..9b672d29a9c2
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/GenericExporterTask.java
@@ -0,0 +1,80 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+/**
+ * @author max
+ *
+ */
+public class GenericExporterTask extends ExporterTask {
+
+	public GenericExporterTask(HibernateToolTask parent) {
+		super(parent);
+	}
+
+	String templateName;
+	String exporterClass;
+	String filePattern;
+	String forEach;
+
+	/**
+	 * The FilePattern defines the pattern used to generate files.
+	 * @param filePattern
+	 */
+	public void setFilePattern(String filePattern) {
+		this.filePattern = filePattern;
+	}
+
+	public void setForEach(String forEach) {
+		this.forEach = forEach;
+	}
+
+	public void setTemplate(String templateName) {
+		this.templateName = templateName;
+	}
+
+	public void setExporterClass(String exporterClass) {
+		this.exporterClass = exporterClass;
+	}
+
+	protected Exporter createExporter() {
+		if (exporterClass == null) {
+			return ExporterFactory.createExporter(ExporterType.GENERIC);
+		}
+		else {
+			return ExporterFactory.createExporter(exporterClass);
+		}
+	}
+
+	protected Exporter configureExporter(Exporter exp) {
+		super.configureExporter(exp);
+		if (templateName != null) {
+			exp.getProperties().put(ExporterConstants.TEMPLATE_NAME, templateName);
+		}
+		if (filePattern != null) {
+			exp.getProperties().put(ExporterConstants.FILE_PATTERN, filePattern);
+		}
+		if (forEach != null) {
+			exp.getProperties().put(ExporterConstants.FOR_EACH, forEach);
+		}
+		return exp;
+	}
+
+	public String getName() {
+		StringBuffer buf = new StringBuffer("generic exporter");
+		if(exporterClass!=null) {
+			buf.append( "class: " + exporterClass);
+		}
+		if(templateName!=null) {
+			buf.append( "template: " + templateName);
+		}
+		return buf.toString();
+	}
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2CfgXmlExporterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2CfgXmlExporterTask.java
new file mode 100644
index 000000000000..2b79d9cdb0fe
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2CfgXmlExporterTask.java
@@ -0,0 +1,37 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+public class Hbm2CfgXmlExporterTask extends ExporterTask {
+
+	private boolean ejb3;
+
+	public Hbm2CfgXmlExporterTask(HibernateToolTask parent) {
+		super(parent);
+	}
+
+	public Exporter createExporter() {
+		return ExporterFactory.createExporter(ExporterType.CFG);
+	}
+
+	public void setEjb3(boolean ejb3) {
+		this.ejb3 = ejb3;
+	}
+
+	public String getName() {
+		return "hbm2cfgxml (Generates hibernate.cfg.xml)";
+	}
+
+	protected Exporter configureExporter(Exporter exporter) {
+		super.configureExporter( exporter );
+		exporter.getProperties().setProperty("ejb3", ""+ejb3);
+		return exporter;
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2DAOExporterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2DAOExporterTask.java
new file mode 100644
index 000000000000..af777e9c1ec1
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2DAOExporterTask.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+/**
+ * @author Dennis Byrne
+ */
+public class Hbm2DAOExporterTask extends Hbm2JavaExporterTask {
+
+	public Hbm2DAOExporterTask(HibernateToolTask parent) {
+		super(parent);
+	}
+
+	protected Exporter createExporter() {
+		Exporter result = ExporterFactory.createExporter(ExporterType.DAO);
+		result.getProperties().putAll(parent.getProperties());
+		result.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, parent.getMetadataDescriptor());
+		result.getProperties().put(ExporterConstants.DESTINATION_FOLDER, getDestdir());
+		return result;
+	}
+
+	public String getName() {
+		return "hbm2dao (Generates a set of DAOs)";
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2DDLExporterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2DDLExporterTask.java
new file mode 100644
index 000000000000..d1aa3484af8e
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2DDLExporterTask.java
@@ -0,0 +1,116 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+/**
+ * @author max
+ *
+ */
+public class Hbm2DDLExporterTask extends ExporterTask {
+
+	boolean exportToDatabase = true;
+	boolean scriptToConsole = true;
+	boolean schemaUpdate = false;
+	String delimiter = ";";
+	boolean drop = false;
+	boolean create = true;
+	boolean format = false;
+
+	String outputFileName = null;
+	private boolean haltOnError = false;
+
+	public Hbm2DDLExporterTask(HibernateToolTask parent) {
+		super(parent);
+	}
+
+	public String getName() {
+		return "hbm2ddl (Generates database schema)";
+	}
+
+	protected Exporter configureExporter(Exporter exp) {
+		Exporter exporter = super.configureExporter( exp );
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, exportToDatabase);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, scriptToConsole);
+		exporter.getProperties().put(ExporterConstants.SCHEMA_UPDATE, schemaUpdate);
+		exporter.getProperties().put(ExporterConstants.DELIMITER, delimiter);
+		exporter.getProperties().put(ExporterConstants.DROP_DATABASE, drop);
+		exporter.getProperties().put(ExporterConstants.CREATE_DATABASE, create);
+		exporter.getProperties().put(ExporterConstants.FORMAT, format);
+		if (outputFileName == null) {
+			exporter.getProperties().remove(ExporterConstants.OUTPUT_FILE_NAME);
+		}
+		else {
+			exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, outputFileName);
+		}
+		exporter.getProperties().put(ExporterConstants.HALT_ON_ERROR, haltOnError);
+		return exporter;
+	}
+
+	protected Exporter createExporter() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().putAll(parent.getProperties());
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, parent.getProperties());
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, parent.getDestDir());
+		return exporter;
+	}
+
+
+	public void setExport(boolean export) {
+		exportToDatabase = export;
+	}
+
+	/**
+	 * Run SchemaUpdate instead of SchemaExport
+	 */
+	public void setUpdate(boolean update) {
+		this.schemaUpdate = update;
+	}
+
+	/**
+	 * Output sql to console ? (default true)
+	 */
+	public void setConsole(boolean console) {
+		this.scriptToConsole = console;
+	}
+
+	/**
+	 * Format the generated sql
+	 */
+	public void setFormat(boolean format) {
+		this.format = format;
+	}
+
+	/**
+	 * File out put name (default: empty)
+	 */
+	public void setOutputFileName(String fileName) {
+		outputFileName = fileName;
+	}
+
+	public void setDrop(boolean drop) {
+		this.drop = drop;
+	}
+
+	public void setCreate(boolean create) {
+		this.create = create;
+	}
+
+	public void setDelimiter(String delimiter) {
+		this.delimiter = delimiter;
+	}
+
+	public String getDelimiter() {
+		return delimiter;
+	}
+
+	public void setHaltonerror(boolean haltOnError) {
+		this.haltOnError  = haltOnError;
+	}
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2DocExporterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2DocExporterTask.java
new file mode 100644
index 000000000000..9b42253f065c
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2DocExporterTask.java
@@ -0,0 +1,24 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+public class Hbm2DocExporterTask extends ExporterTask {
+
+	public Hbm2DocExporterTask(HibernateToolTask parent) {
+		super(parent);
+	}
+
+	public String getName() {
+		return "hbm2doc (Generates html schema documentation)";
+	}
+
+	protected Exporter createExporter() {
+		return ExporterFactory.createExporter(ExporterType.DOC);
+	}
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2HbmXmlExporterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2HbmXmlExporterTask.java
new file mode 100644
index 000000000000..c2b013f16678
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2HbmXmlExporterTask.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+@Deprecated(forRemoval = true)
+public class Hbm2HbmXmlExporterTask extends ExporterTask {
+
+	public Hbm2HbmXmlExporterTask(HibernateToolTask parent) {
+		super(parent);
+	}
+
+	protected Exporter createExporter() {
+		parent.log( "The hbm2hbmxml exporter task is deprecated and will be removed in a future version. "
+				+ "Use the hbm2java exporter task to generate annotated Java entities instead.",
+				org.apache.tools.ant.Project.MSG_WARN );
+		return ExporterFactory.createExporter(ExporterType.HBM);
+	}
+
+	public String getName() {
+		return "hbm2hbmxml (Generates a set of hbm.xml files)";
+	}
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2JavaExporterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2JavaExporterTask.java
new file mode 100644
index 000000000000..02027228de1d
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/Hbm2JavaExporterTask.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+/**
+ * @author max
+ *
+ */
+public class Hbm2JavaExporterTask extends ExporterTask {
+
+	boolean ejb3 = true;
+
+	boolean jdk5 = true;
+
+	public Hbm2JavaExporterTask(HibernateToolTask parent) {
+		super( parent );
+	}
+
+	public void setEjb3(boolean b) {
+		ejb3 = b;
+	}
+
+	public void setJdk5(boolean b) {
+		jdk5 = b;
+	}
+
+	protected Exporter configureExporter(Exporter exp) {
+		super.configureExporter( exp );
+		exp.getProperties().setProperty("ejb3", ""+ejb3);
+		exp.getProperties().setProperty("jdk5", ""+jdk5);
+		return exp;
+	}
+
+	protected Exporter createExporter() {
+		return ExporterFactory.createExporter(ExporterType.JAVA);
+	}
+
+	public String getName() {
+		return "hbm2java (Generates a set of .java files)";
+	}
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/HbmLintExporterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/HbmLintExporterTask.java
new file mode 100644
index 000000000000..829111aebdf1
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/HbmLintExporterTask.java
@@ -0,0 +1,26 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+public class HbmLintExporterTask extends ExporterTask {
+
+	public HbmLintExporterTask(HibernateToolTask parent) {
+		super( parent );
+	}
+
+	protected Exporter createExporter() {
+		return ExporterFactory.createExporter(ExporterType.HBM_LINT);
+	}
+
+
+	String getName() {
+		return "hbmlint (scans mapping for errors)";
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/HibernateToolTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/HibernateToolTask.java
new file mode 100644
index 000000000000..5d73ff9c9fef
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/HibernateToolTask.java
@@ -0,0 +1,291 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.PropertySet;
+import org.hibernate.tool.ant.util.ExceptionUtil;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.internal.util.StringUtil;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @author max
+ *
+ */
+public class HibernateToolTask extends Task {
+
+	ConfigurationTask configurationTask;
+	File destDir;
+	List<ExporterTask> generators = new ArrayList<ExporterTask>();
+	Path classPath;
+	Path templatePath;
+	Properties properties = new Properties();
+
+	public HibernateToolTask() {
+		super();
+	}
+
+	private void checkConfiguration() {
+		if(configurationTask!=null) {
+			throw new BuildException("Only a single configuration is allowed.");
+		}
+	}
+
+	public ConfigurationTask createConfiguration() {
+		checkConfiguration();
+		configurationTask = new ConfigurationTask();
+		return configurationTask;
+	}
+
+
+	public JDBCConfigurationTask createJDBCConfiguration() {
+		checkConfiguration();
+		configurationTask = new JDBCConfigurationTask();
+		return (JDBCConfigurationTask) configurationTask;
+	}
+
+	public JPAConfigurationTask createJpaConfiguration() {
+		checkConfiguration();
+		configurationTask = new JPAConfigurationTask();
+		return (JPAConfigurationTask) configurationTask;
+	}
+
+	public ExporterTask createHbm2DDL() {
+		ExporterTask generator = new Hbm2DDLExporterTask(this);
+		addGenerator( generator );
+		return generator;
+	}
+
+	public ExporterTask createHbmTemplate() {
+		ExporterTask generator = new GenericExporterTask(this);
+		addGenerator( generator );
+		return generator;
+	}
+
+	public ExporterTask createHbm2CfgXml() {
+		ExporterTask generator = new Hbm2CfgXmlExporterTask(this);
+		addGenerator( generator );
+
+		return generator;
+	}
+
+	protected void addGenerator(ExporterTask generator) {
+		generators.add(generator);
+	}
+
+	public ExporterTask createHbm2Java() {
+		ExporterTask generator = new Hbm2JavaExporterTask(this);
+		addGenerator( generator );
+		return generator;
+	}
+
+	public ExporterTask createHbm2HbmXml() {
+		ExporterTask generator= new Hbm2HbmXmlExporterTask(this);
+		addGenerator( generator );
+		return generator;
+	}
+
+	public ExporterTask createHbm2Doc() {
+		ExporterTask generator= new Hbm2DocExporterTask(this);
+		addGenerator( generator );
+		return generator;
+	}
+
+	/*public ExporterTask createHbm2Jsf(){
+		ExporterTask generator= new Hbm2JsfGeneratorTask(this);
+		generators.add(generator);
+		return generator;
+	}*/
+
+	public ExporterTask createHbm2DAO(){
+		ExporterTask generator= new Hbm2DAOExporterTask(this);
+		addGenerator( generator );
+		return generator;
+	}
+
+
+	public QueryExporterTask createQuery() {
+		QueryExporterTask generator = new QueryExporterTask(this);
+		generators.add(generator);
+		return generator;
+	}
+
+	public HbmLintExporterTask createHbmLint() {
+		HbmLintExporterTask generator = new HbmLintExporterTask(this);
+		generators.add(generator);
+		return generator;
+	}
+
+
+	/**
+	 * Set the classpath to be used when running the Java class
+	 *
+	 * @param s an Ant Path object containing the classpath.
+	 */
+	public void setClasspath(Path s) {
+		classPath = s;
+	}
+
+
+	/**
+	 * Adds a path to the classpath.
+	 *
+	 * @return created classpath
+	 */
+	public Path createClasspath() {
+		classPath = new Path(getProject() );
+		return classPath;
+	}
+
+
+	public void execute() {
+		if(configurationTask==null) {
+			throw new BuildException("No configuration specified. <" + getTaskName() + "> must have one of the following: <configuration>, <jpaconfiguration>, <annotationconfiguration> or <jdbcconfiguration>");
+		}
+		log("Executing Hibernate Tool with a " + configurationTask.getDescription() );
+		validateParameters();
+		Iterator<ExporterTask> iterator = generators.iterator();
+
+		try (AntClassLoader loader = getProject().createClassLoader(classPath)) {
+			ExporterTask generatorTask = null;
+			int count = 1;
+			try {
+				ClassLoader classLoader = this.getClass().getClassLoader();
+				loader.setParent(classLoader ); // if this is not set, classes from the taskdef cannot be found - which is crucial for e.g. annotations.
+				loader.setThreadContextLoader();
+
+				while (iterator.hasNext() ) {
+					generatorTask = iterator.next();
+					log(count++ + ". task: " + generatorTask.getName() );
+					generatorTask.execute();
+				}
+			}
+			catch (RuntimeException re) {
+				reportException(re, count, generatorTask);
+			}
+			finally {
+				loader.resetThreadContextLoader();
+				loader.cleanup();
+			}
+		}
+	}
+
+	private void reportException(Throwable re, int count, ExporterTask generatorTask) {
+		log("An exception occurred while running exporter #" + count + ":" + generatorTask, Project.MSG_ERR);
+		log("To get the full stack trace run ant with -verbose", Project.MSG_ERR);
+
+		log(re.toString(), Project.MSG_ERR);
+		StringBuilder ex = new StringBuilder();
+		Throwable cause = re.getCause();
+		while(cause!=null) {
+			ex.append(cause.toString()).append("\n");
+			if(cause==cause.getCause()) {
+				break; // we reached the top.
+			}
+			else {
+				cause=cause.getCause();
+			}
+		}
+		if(!StringUtil.isEmptyOrNull(ex.toString())) {
+			log(ex.toString(), Project.MSG_ERR);
+		}
+
+		String newbieMessage = ExceptionUtil.getProblemSolutionOrCause(re);
+		if(newbieMessage!=null) {
+			log(newbieMessage);
+		}
+
+		if(re instanceof BuildException) {
+			throw (BuildException)re;
+		}
+		else {
+			throw new BuildException(re, getLocation());
+		}
+	}
+
+	private void validateParameters() {
+		if(generators.isEmpty()) {
+			throw new BuildException("No exporters specified in <hibernatetool>. There has to be at least one specified. An exporter is e.g. <hbm2java> or <hbmtemplate>. See documentation for details.", getLocation());
+		}
+		else {
+			for (ExporterTask generatorTask : generators) {
+				generatorTask.validateParameters();
+			}
+		}
+	}
+
+	public File getDestDir() {
+		return destDir;
+	}
+
+	public void setDestDir(File file) {
+		destDir = file;
+	}
+
+	public MetadataDescriptor getMetadataDescriptor() {
+		return configurationTask.getMetadataDescriptor();
+	}
+
+	public void setTemplatePath(Path path) {
+		templatePath = path;
+	}
+
+	public Path getTemplatePath() {
+		if(templatePath==null) {
+			templatePath = new Path(getProject()); // empty path
+		}
+		return templatePath;
+	}
+
+	public Properties getProperties() {
+		Properties p = new Properties();
+		p.putAll(getMetadataDescriptor().getProperties());
+		p.putAll(properties);
+		return p;
+	}
+
+	public void addConfiguredPropertySet(PropertySet ps) {
+		properties.putAll(ps.getProperties());
+	}
+
+	public void addConfiguredProperty(Environment.Variable property) {
+		String key = property.getKey();
+		String value = property.getValue();
+		if (key==null) {
+			log( "Ignoring unnamed task property", Project.MSG_WARN );
+			return;
+		}
+		if (value==null){
+			//This is legal in ANT, make sure we warn properly:
+			log( "Ignoring task property '" +key+"' as no value was specified", Project.MSG_WARN );
+			return;
+		}
+		properties.put( key, value );
+	}
+
+	@Override
+	public Object clone() throws CloneNotSupportedException {
+		HibernateToolTask htt = (HibernateToolTask) super.clone();
+		htt.configurationTask = this.configurationTask;
+		htt.destDir = this.destDir;
+		htt.generators.addAll(this.generators);
+		htt.classPath = this.classPath;
+		htt.templatePath = this.templatePath;
+		htt.properties.putAll(this.properties);
+		return htt;
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JDBCConfigurationTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JDBCConfigurationTask.java
new file mode 100644
index 000000000000..67509c315931
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JDBCConfigurationTask.java
@@ -0,0 +1,133 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.types.Path;
+import org.hibernate.boot.cfgxml.internal.ConfigLoader;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.tool.reveng.api.metadata.MetadataConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategyFactory;
+
+import java.io.File;
+import java.util.Map;
+import java.util.Properties;
+
+
+/**
+ * @author max
+ * @author <a href='mailto:the_mindstorm@evolva.ro'>Alexandru Popescu</a>
+ */
+public class JDBCConfigurationTask extends ConfigurationTask {
+
+	boolean preferBasicCompositeIds = true;
+
+	String reverseEngineeringStrategyClass;
+	String packageName;
+	Path revengFiles;
+
+	boolean detectOneToOne = true;
+	boolean detectManyToMany = true;
+	boolean detectOptimisticLock = true;
+
+	public JDBCConfigurationTask() {
+		setDescription("JDBC Configuration (for reverse engineering)");
+	}
+	protected MetadataDescriptor createMetadataDescriptor() {
+		Properties properties = loadProperties();
+		RevengStrategy res = createReverseEngineeringStrategy();
+		properties.put(MetadataConstants.PREFER_BASIC_COMPOSITE_IDS, preferBasicCompositeIds);
+		return MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(
+						res,
+						properties);
+	}
+
+	private RevengStrategy createReverseEngineeringStrategy() {
+		File[] revengFileList = null;
+		if (revengFiles != null ) {
+			String[] fileNames = revengFiles.list();
+			revengFileList = new File[fileNames.length];
+			for (int i = 0; i < fileNames.length; i++) {
+				revengFileList[i] = new File(fileNames[i]);
+			}
+		}
+
+		RevengStrategy strategy =
+				RevengStrategyFactory.createReverseEngineeringStrategy(
+						reverseEngineeringStrategyClass, revengFileList);
+
+		RevengSettings qqsettings =
+				new RevengSettings(strategy).setDefaultPackageName(packageName)
+						.setDetectManyToMany( detectManyToMany )
+						.setDetectOneToOne( detectOneToOne )
+						.setDetectOptimisticLock( detectOptimisticLock );
+
+		strategy.setSettings(qqsettings);
+
+		return strategy;
+	}
+
+
+	public void setPackageName(String pkgName) {
+		packageName = pkgName;
+	}
+
+	public void setReverseStrategy(String fqn) {
+		reverseEngineeringStrategyClass = fqn;
+	}
+
+	public void setRevEngFile(Path p) {
+		revengFiles = p;
+	}
+
+	public void setPreferBasicCompositeIds(boolean b) {
+		preferBasicCompositeIds = b;
+	}
+
+	public void setDetectOneToOne(boolean b) {
+		detectOneToOne = b;
+	}
+
+	public void setDetectManyToMany(boolean b) {
+		detectManyToMany = b;
+	}
+
+	public void setDetectOptimisticLock(boolean b) {
+		detectOptimisticLock = b;
+	}
+
+	private Map<String, Object> loadCfgXmlFile() {
+		return new ConfigLoader(new BootstrapServiceRegistryBuilder().build())
+				.loadConfigXmlFile(getConfigurationFile())
+				.getConfigurationValues();
+	}
+
+	private Properties loadProperties() {
+		Properties result = new Properties();
+		if (getPropertyFile() != null) {
+			result.putAll(loadPropertiesFile());
+		}
+		if (getConfigurationFile() != null) {
+			result.putAll(loadCfgXmlFile());
+		}
+		return result;
+	}
+
+	public Object clone() throws CloneNotSupportedException {
+		JDBCConfigurationTask jct = (JDBCConfigurationTask) super.clone();
+		jct.preferBasicCompositeIds = this.preferBasicCompositeIds;
+		jct.reverseEngineeringStrategyClass = this.reverseEngineeringStrategyClass;
+		jct.packageName = this.packageName;
+		jct.revengFiles = this.revengFiles;
+		jct.detectOneToOne = this.detectOneToOne;
+		jct.detectManyToMany = this.detectManyToMany;
+		jct.detectOptimisticLock = this.detectOptimisticLock;
+		return jct;
+	}
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JPAConfigurationTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JPAConfigurationTask.java
new file mode 100644
index 000000000000..c1d7b3f752d7
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JPAConfigurationTask.java
@@ -0,0 +1,68 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.hibernate.HibernateException;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+
+import java.io.File;
+import java.util.Properties;
+
+public class JPAConfigurationTask extends ConfigurationTask {
+
+	String persistenceUnit = null;
+
+	public JPAConfigurationTask() {
+		setDescription("JPA Configuration");
+	}
+
+	protected MetadataDescriptor createMetadataDescriptor() {
+		try {
+			Properties overrides = new Properties();
+			Properties p = loadPropertiesFile();
+			if(p!=null) {
+				overrides.putAll( p );
+			}
+			return MetadataDescriptorFactory
+					.createJpaDescriptor(persistenceUnit, overrides);
+		}
+		catch(HibernateException t) {
+			Throwable cause = t.getCause();
+			if (cause != null) {
+				throw new BuildException(cause);
+			}
+			else {
+				throw new BuildException("Problems in creating a configuration for JPA. Have you remembered to add hibernate EntityManager jars to the classpath ?",t);
+			}
+		}
+
+	}
+
+	public String getPersistenceUnit() {
+		return persistenceUnit;
+	}
+
+	public void setPersistenceUnit(String persistenceUnit) {
+		this.persistenceUnit = persistenceUnit;
+	}
+
+	public void setConfigurationFile(File configurationFile) {
+		complain();
+	}
+
+	private void complain() {
+		throw new BuildException("<" + getTaskName() + "> currently only support autodiscovery from META-INF/persistence.xml. Thus setting the configurationfile attribute is not allowed");
+	}
+
+	public Object clone() throws CloneNotSupportedException {
+		JPAConfigurationTask jct = (JPAConfigurationTask) super.clone();
+		jct.persistenceUnit = this.persistenceUnit;
+		return jct;
+	}
+
+
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JavaFormatterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JavaFormatterTask.java
new file mode 100644
index 000000000000..703312645b8a
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JavaFormatterTask.java
@@ -0,0 +1,105 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileSet;
+import org.hibernate.tool.reveng.api.java.DefaultJavaPrettyPrinterStrategy;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+
+public class JavaFormatterTask extends Task {
+
+	final List<FileSet> fileSets = new ArrayList<FileSet>();
+	boolean failOnError;
+
+	public void addConfiguredFileSet(FileSet fileSet) {
+		fileSets.add(fileSet);
+	}
+
+	private Properties readConfig(File cfgfile) throws IOException {
+		try (BufferedInputStream stream = new BufferedInputStream(new FileInputStream(cfgfile))) {
+			final Properties settings = new Properties();
+			settings.load(stream);
+			return settings;
+		}
+	}
+
+
+	public void execute() throws BuildException {
+
+		File[] files = getFiles();
+
+		int failed = 0;
+
+		if(files.length>0) {
+
+			DefaultJavaPrettyPrinterStrategy formatter = new DefaultJavaPrettyPrinterStrategy();
+			for (File file : files) {
+				try {
+					boolean ok = formatter.formatFile(file);
+					if (!ok) {
+						failed++;
+						getProject().log(this, "Formatting failed - skipping " + file, Project.MSG_WARN);
+					}
+					else {
+						getProject().log(this, "Formatted " + file, Project.MSG_VERBOSE);
+					}
+				}
+				catch (RuntimeException ee) {
+					failed++;
+					if (failOnError) {
+						throw new BuildException("Java formatting failed on " + file, ee);
+					}
+					else {
+						getProject().log(this, "Java formatting failed on " + file + ", " + ee.getLocalizedMessage(), Project.MSG_ERR);
+					}
+				}
+			}
+		}
+
+		getProject().log( this, "Java formatting of " + files.length + " files completed. Skipped " + failed + " file(s).", Project.MSG_INFO );
+
+	}
+
+	private File[] getFiles() {
+
+		List<File> files = new LinkedList<File>();
+		for (FileSet fs : fileSets) {
+
+			DirectoryScanner ds = fs.getDirectoryScanner(getProject());
+
+			String[] dsFiles = ds.getIncludedFiles();
+			for (String dsFile : dsFiles) {
+				File f = new File(dsFile);
+				if (!f.isFile()) {
+					f = new File(ds.getBasedir(), dsFile);
+				}
+
+				files.add(f);
+			}
+		}
+
+		return files.toArray(new File[0]);
+	}
+
+	public Object clone() throws CloneNotSupportedException {
+		JavaFormatterTask jft = (JavaFormatterTask) super.clone();
+		jft.fileSets.addAll(this.fileSets);
+		jft.failOnError = this.failOnError;
+		return jft;
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/QueryExporterTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/QueryExporterTask.java
new file mode 100644
index 000000000000..558dc5a1bfda
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/QueryExporterTask.java
@@ -0,0 +1,104 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.internal.util.StringUtil;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class QueryExporterTask extends ExporterTask {
+
+	private String query = "";
+	private String filename;
+	List<HQL> queries = new ArrayList<HQL>();
+
+	public QueryExporterTask(HibernateToolTask parent) {
+		super( parent );
+	}
+
+	protected Exporter configureExporter(Exporter exp) {
+		Exporter exporter = super.configureExporter( exp );
+		List<String> queryStrings = new ArrayList<String>();
+		if(!StringUtil.isEmptyOrNull(query)) {
+			queryStrings.add(query);
+		}
+		for (Iterator<HQL> iter = queries.iterator(); iter.hasNext();) {
+			HQL hql = iter.next();
+			if(!StringUtil.isEmptyOrNull(hql.query)) {
+				queryStrings.add(hql.query);
+			}
+		}
+		exporter.getProperties().put(ExporterConstants.QUERY_LIST, queryStrings);
+		exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, filename);
+		return exporter;
+	}
+
+	public void validateParameters() {
+		super.validateParameters();
+		if(StringUtil.isEmptyOrNull(query) && queries.isEmpty()) {
+			throw new BuildException("Need to specify at least one query.");
+		}
+
+		for (Iterator<HQL> iter = queries.iterator(); iter.hasNext();) {
+			HQL hql = iter.next();
+			if(StringUtil.isEmptyOrNull(hql.query)) {
+				throw new BuildException("Query must not be empty");
+			}
+		}
+	}
+	protected Exporter createExporter() {
+		return ExporterFactory.createExporter(ExporterType.QUERY);
+	}
+
+	public void addText(String text) {
+		if(!StringUtil.isEmptyOrNull(text)) {
+		query += trim(text);
+		}
+	}
+
+	static private String trim(String text) {
+		return text.trim();
+	}
+
+	public static class HQL {
+		String query = "";
+		public void addText(String text) {
+			if(!StringUtil.isEmptyOrNull(text)) {
+				query += trim(text);
+			}
+		}
+	}
+
+	public HQL createHql() {
+		HQL hql = new HQL();
+		queries.add(hql);
+		return hql;
+	}
+
+	public void setDestFile(String filename) {
+		this.filename = filename;
+	}
+
+	public void execute() {
+		parent.log("Executing: [" + query + "]");
+		super.execute();
+	}
+	public String getName() {
+		return "query (Executes queries)";
+	}
+
+
+	boolean isNotEmpty(String string) {
+		return string != null && string.length() > 0;
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/util/ExceptionUtil.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/util/ExceptionUtil.java
new file mode 100644
index 000000000000..928756c07b91
--- /dev/null
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/util/ExceptionUtil.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.util;
+
+import org.hibernate.boot.MappingNotFoundException;
+import org.hibernate.boot.jaxb.Origin;
+
+public class ExceptionUtil {
+
+	public static String getProblemSolutionOrCause(Throwable re) {
+		if(re==null) return null;
+
+		if(re instanceof MappingNotFoundException) {
+			MappingNotFoundException mnf = (MappingNotFoundException)re;
+			Origin origin = mnf.getOrigin();
+			return "A " + origin.getType() + " located at " + origin.getName() + " was not found.\n" +
+				"Check the following:\n" +
+				"\n" +
+				"1) Is the spelling/casing correct ?\n" +
+				"2)	Is " + mnf.getOrigin().getName() + " available via the classpath ?\n" +
+				"3) Does it actually exist ?\n";
+		}
+
+		if(re instanceof ClassNotFoundException || re instanceof NoClassDefFoundError) {
+
+			return "A class were not found in the classpath of the Ant task.\n" +
+					"Ensure that the classpath contains the classes needed for Hibernate and your code are in the classpath.\n";
+
+		}
+
+		if(re instanceof UnsupportedClassVersionError) {
+			return "You are most likely running the ant task with a JRE that is older than the JRE required to use the classes.\n" +
+					"e.g. running with JRE 1.3 or 1.4 when using JDK 1.5 annotations is not possible.\n" +
+					"Ensure that you are using a correct JRE.";
+		}
+
+
+
+		if(re.getCause()!=re) {
+			return getProblemSolutionOrCause( re.getCause() );
+		}
+
+		return null;
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java
index 966f2d8cbe6b..5cc60e2ea302 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java
+++ b/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTask.java
@@ -32,7 +32,6 @@
 
 /**
  * An Ant task for {@code SchemaUpdate}.
- * <p>
  * <pre>
  * &lt;taskdef name="schemaupdate"
  *     classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask"
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ConfigurationTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ConfigurationTaskTest.java
new file mode 100644
index 000000000000..a1eb754561f7
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ConfigurationTaskTest.java
@@ -0,0 +1,118 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class ConfigurationTaskTest {
+
+	@TempDir
+	private File tempDir;
+
+	@Test
+	public void testDefaultDescription() {
+		ConfigurationTask task = new ConfigurationTask();
+		assertEquals("Standard Configuration", task.getDescription());
+	}
+
+	@Test
+	public void testSetConfigurationFile() {
+		ConfigurationTask task = new ConfigurationTask();
+		assertNull(task.getConfigurationFile());
+		File f = new File("/tmp/cfg.xml");
+		task.setConfigurationFile(f);
+		assertEquals(f, task.getConfigurationFile());
+	}
+
+	@Test
+	public void testSetPropertyFile() {
+		ConfigurationTask task = new ConfigurationTask();
+		assertNull(task.getPropertyFile());
+		File f = new File("/tmp/hibernate.properties");
+		task.setPropertyFile(f);
+		assertEquals(f, task.getPropertyFile());
+	}
+
+	@Test
+	public void testSetEntityResolver() {
+		ConfigurationTask task = new ConfigurationTask();
+		task.setEntityResolver("org.example.Resolver");
+		assertEquals("org.example.Resolver", task.entityResolver);
+	}
+
+	@Test
+	public void testSetNamingStrategy() {
+		ConfigurationTask task = new ConfigurationTask();
+		// Should just log a warning, not throw
+		task.setNamingStrategy("some.Strategy");
+	}
+
+	@Test
+	public void testLoadPropertiesFileNull() {
+		ConfigurationTask task = new ConfigurationTask();
+		// When propertyFile is null, loadPropertiesFile returns null
+		assertNull(task.loadPropertiesFile());
+	}
+
+	@Test
+	public void testLoadPropertiesFileValid() throws IOException {
+		ConfigurationTask task = new ConfigurationTask();
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Properties props = new Properties();
+		props.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+		props.setProperty("hibernate.connection.url", "jdbc:h2:mem:test");
+		try (FileOutputStream fos = new FileOutputStream(propsFile)) {
+			props.store(fos, null);
+		}
+		task.setPropertyFile(propsFile);
+		Properties loaded = task.loadPropertiesFile();
+		assertNotNull(loaded);
+		assertEquals("org.hibernate.dialect.H2Dialect", loaded.getProperty("hibernate.dialect"));
+		assertEquals("jdbc:h2:mem:test", loaded.getProperty("hibernate.connection.url"));
+	}
+
+	@Test
+	public void testLoadPropertiesFileNotFound() {
+		ConfigurationTask task = new ConfigurationTask();
+		task.setPropertyFile(new File("/nonexistent/hibernate.properties"));
+		assertThrows(BuildException.class, task::loadPropertiesFile);
+	}
+
+	@Test
+	public void testClone() throws CloneNotSupportedException {
+		ConfigurationTask task = new ConfigurationTask();
+		File cfg = new File("/tmp/cfg.xml");
+		File prop = new File("/tmp/hibernate.properties");
+		task.setConfigurationFile(cfg);
+		task.setPropertyFile(prop);
+		task.setEntityResolver("org.example.Resolver");
+		ConfigurationTask clone = (ConfigurationTask) task.clone();
+		assertNotNull(clone);
+		assertEquals(prop, clone.getPropertyFile());
+		assertEquals("org.example.Resolver", clone.entityResolver);
+	}
+
+	@Test
+	public void testGetFilesEmpty() {
+		ConfigurationTask task = new ConfigurationTask();
+		// With no file sets and no project, getFiles should return empty array
+		// (fileSets is empty, so loop body never executes)
+		File[] files = task.getFiles();
+		assertNotNull(files);
+		assertEquals(0, files.length);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ExporterConfigureTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ExporterConfigureTest.java
new file mode 100644
index 000000000000..e41ce409a8d7
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ExporterConfigureTest.java
@@ -0,0 +1,287 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.Project;
+import org.hibernate.boot.Metadata;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests configureExporter() and createExporter() for various ExporterTask subclasses,
+ * using a stub MetadataDescriptor to avoid Hibernate bootstrapping.
+ */
+public class ExporterConfigureTest {
+
+	private HibernateToolTask parent;
+
+	/**
+	 * Creates a ConfigurationTask with a pre-set stub MetadataDescriptor
+	 * to avoid Hibernate bootstrapping.
+	 */
+	static ConfigurationTask createStubConfigurationTask() {
+		ConfigurationTask task = new ConfigurationTask();
+		task.metadataDescriptor = new MetadataDescriptor() {
+			private final Properties props = new Properties();
+
+			@Override
+			public Metadata createMetadata() {
+				return null;
+			}
+
+			@Override
+			public Properties getProperties() {
+				return props;
+			}
+		};
+		return task;
+	}
+
+	@BeforeEach
+	void setUp() {
+		parent = new HibernateToolTask();
+		Project project = new Project();
+		project.init();
+		parent.setProject(project);
+		parent.setDestDir(new File("/tmp/dest"));
+		// Install stub configuration so getMetadataDescriptor() works
+		parent.configurationTask = createStubConfigurationTask();
+	}
+
+	@Test
+	public void testHbm2DDLExporterConfigureExporter() {
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		task.setExport(false);
+		task.setConsole(false);
+		task.setUpdate(true);
+		task.setDelimiter("GO");
+		task.setDrop(true);
+		task.setCreate(false);
+		task.setFormat(true);
+		task.setOutputFileName("schema.sql");
+		task.setHaltonerror(true);
+
+		Exporter exporter = task.createExporter();
+		assertNotNull(exporter);
+		Exporter configured = task.configureExporter(exporter);
+		assertNotNull(configured);
+		assertEquals(false, configured.getProperties().get(ExporterConstants.EXPORT_TO_DATABASE));
+		assertEquals(false, configured.getProperties().get(ExporterConstants.EXPORT_TO_CONSOLE));
+		assertEquals(true, configured.getProperties().get(ExporterConstants.SCHEMA_UPDATE));
+		assertEquals("GO", configured.getProperties().get(ExporterConstants.DELIMITER));
+		assertEquals(true, configured.getProperties().get(ExporterConstants.DROP_DATABASE));
+		assertEquals(false, configured.getProperties().get(ExporterConstants.CREATE_DATABASE));
+		assertEquals(true, configured.getProperties().get(ExporterConstants.FORMAT));
+		assertEquals("schema.sql", configured.getProperties().get(ExporterConstants.OUTPUT_FILE_NAME));
+		assertEquals(true, configured.getProperties().get(ExporterConstants.HALT_ON_ERROR));
+	}
+
+	@Test
+	public void testHbm2DDLExporterConfigureExporterNullOutputFile() {
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		// outputFileName is null by default
+
+		Exporter exporter = task.createExporter();
+		Exporter configured = task.configureExporter(exporter);
+		// When outputFileName is null, the key should be removed
+		assertNull(configured.getProperties().get(ExporterConstants.OUTPUT_FILE_NAME));
+	}
+
+	@Test
+	public void testGenericExporterCreateExporterDefault() {
+		GenericExporterTask task = new GenericExporterTask(parent);
+		// exporterClass is null -> uses ExporterType.GENERIC
+		Exporter exporter = task.createExporter();
+		assertNotNull(exporter);
+	}
+
+	@Test
+	public void testGenericExporterCreateExporterWithClass() {
+		GenericExporterTask task = new GenericExporterTask(parent);
+		// Use a known exporter class
+		task.setExporterClass(ExporterType.CFG.className());
+		Exporter exporter = task.createExporter();
+		assertNotNull(exporter);
+	}
+
+	@Test
+	public void testGenericExporterConfigureExporter() {
+		GenericExporterTask task = new GenericExporterTask(parent);
+		task.setTemplate("mytemplate.ftl");
+		task.setFilePattern("{package-name}/{class-name}.java");
+		task.setForEach("entity");
+
+		Exporter exporter = task.createExporter();
+		Exporter configured = task.configureExporter(exporter);
+		assertEquals("mytemplate.ftl", configured.getProperties().get(ExporterConstants.TEMPLATE_NAME));
+		assertEquals("{package-name}/{class-name}.java", configured.getProperties().get(ExporterConstants.FILE_PATTERN));
+		assertEquals("entity", configured.getProperties().get(ExporterConstants.FOR_EACH));
+	}
+
+	@Test
+	public void testGenericExporterConfigureExporterNulls() {
+		GenericExporterTask task = new GenericExporterTask(parent);
+		// All fields are null by default
+
+		Exporter exporter = task.createExporter();
+		Exporter configured = task.configureExporter(exporter);
+		assertNull(configured.getProperties().get(ExporterConstants.TEMPLATE_NAME));
+		assertNull(configured.getProperties().get(ExporterConstants.FILE_PATTERN));
+		assertNull(configured.getProperties().get(ExporterConstants.FOR_EACH));
+	}
+
+	@Test
+	public void testQueryExporterConfigureExporter() {
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.addText("FROM Foo");
+		task.setDestFile("output.txt");
+
+		Exporter exporter = task.createExporter();
+		Exporter configured = task.configureExporter(exporter);
+		assertNotNull(configured.getProperties().get(ExporterConstants.QUERY_LIST));
+		assertEquals("output.txt", configured.getProperties().get(ExporterConstants.OUTPUT_FILE_NAME));
+	}
+
+	@Test
+	public void testQueryExporterConfigureExporterWithHql() {
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.setDestFile("output.txt");
+		QueryExporterTask.HQL hql1 = task.createHql();
+		hql1.addText("FROM Bar");
+		QueryExporterTask.HQL hql2 = task.createHql();
+		hql2.addText("FROM Baz");
+
+		Exporter exporter = task.createExporter();
+		Exporter configured = task.configureExporter(exporter);
+		@SuppressWarnings("unchecked")
+		java.util.List<String> queries = (java.util.List<String>) configured.getProperties().get(ExporterConstants.QUERY_LIST);
+		assertNotNull(queries);
+		assertEquals(2, queries.size());
+		assertEquals("FROM Bar", queries.get(0));
+		assertEquals("FROM Baz", queries.get(1));
+	}
+
+	@Test
+	public void testQueryExporterIsNotEmpty() {
+		QueryExporterTask task = new QueryExporterTask(parent);
+		assertTrue(task.isNotEmpty("hello"));
+		assertFalse(task.isNotEmpty(""));
+		assertFalse(task.isNotEmpty(null));
+	}
+
+	@Test
+	public void testQueryExporterGetName() {
+		QueryExporterTask task = new QueryExporterTask(parent);
+		assertEquals("query (Executes queries)", task.getName());
+	}
+
+	@Test
+	public void testQueryExporterSetDestFile() {
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.setDestFile("results.csv");
+		// Verify via configureExporter
+		Exporter exporter = task.createExporter();
+		Exporter configured = task.configureExporter(exporter);
+		assertEquals("results.csv", configured.getProperties().get(ExporterConstants.OUTPUT_FILE_NAME));
+	}
+
+	@Test
+	public void testQueryExporterAddTextEmpty() {
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.setDestFile("out.txt");
+		task.addText(""); // Should be ignored
+		// The main query field should remain empty
+		Exporter exporter = task.createExporter();
+		Exporter configured = task.configureExporter(exporter);
+		@SuppressWarnings("unchecked")
+		java.util.List<String> queries = (java.util.List<String>) configured.getProperties().get(ExporterConstants.QUERY_LIST);
+		assertTrue(queries.isEmpty());
+	}
+
+	@Test
+	public void testHqlAddTextEmpty() {
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.setDestFile("out.txt");
+		QueryExporterTask.HQL hql = task.createHql();
+		hql.addText(""); // Should be ignored
+		// HQL query should remain empty
+		Exporter exporter = task.createExporter();
+		Exporter configured = task.configureExporter(exporter);
+		@SuppressWarnings("unchecked")
+		java.util.List<String> queries = (java.util.List<String>) configured.getProperties().get(ExporterConstants.QUERY_LIST);
+		// The HQL has empty query, so it's not added to queryStrings
+		assertTrue(queries.isEmpty());
+	}
+
+	@Test
+	public void testHbm2JavaExporterCreateExporter() {
+		Hbm2JavaExporterTask task = new Hbm2JavaExporterTask(parent);
+		Exporter exporter = task.createExporter();
+		assertNotNull(exporter);
+	}
+
+	@Test
+	public void testHbm2DAOExporterCreateExporter() {
+		Hbm2DAOExporterTask task = new Hbm2DAOExporterTask(parent);
+		Exporter exporter = task.createExporter();
+		assertNotNull(exporter);
+	}
+
+	@Test
+	public void testHbm2CfgXmlExporterCreateExporter() {
+		Hbm2CfgXmlExporterTask task = new Hbm2CfgXmlExporterTask(parent);
+		Exporter exporter = task.createExporter();
+		assertNotNull(exporter);
+	}
+
+	@Test
+	public void testHbm2DocExporterCreateExporter() {
+		Hbm2DocExporterTask task = new Hbm2DocExporterTask(parent);
+		Exporter exporter = task.createExporter();
+		assertNotNull(exporter);
+	}
+
+	@Test
+	public void testHbm2HbmXmlExporterCreateExporter() {
+		Hbm2HbmXmlExporterTask task = new Hbm2HbmXmlExporterTask(parent);
+		Exporter exporter = task.createExporter();
+		assertNotNull(exporter);
+	}
+
+	@Test
+	public void testHbmLintExporterCreateExporter() {
+		HbmLintExporterTask task = new HbmLintExporterTask(parent);
+		Exporter exporter = task.createExporter();
+		assertNotNull(exporter);
+	}
+
+	@Test
+	public void testExporterTaskGetTemplatePath() {
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		// With no local template path, should return parent's
+		assertNotNull(task.getTemplatePath());
+	}
+
+	@Test
+	public void testExporterTaskGetTemplatePathLocal() {
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		org.apache.tools.ant.types.Path path = new org.apache.tools.ant.types.Path(parent.getProject());
+		task.setTemplatePath(path);
+		assertEquals(path, task.getTemplatePath());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ExporterTaskNamesTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ExporterTaskNamesTest.java
new file mode 100644
index 000000000000..f7b4fdbb0634
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ExporterTaskNamesTest.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ExporterTaskNamesTest {
+
+	private final HibernateToolTask parent = new HibernateToolTask();
+
+	@Test
+	public void testHbm2CfgXmlExporterTaskName() {
+		assertEquals("hbm2cfgxml (Generates hibernate.cfg.xml)",
+				new Hbm2CfgXmlExporterTask(parent).getName());
+	}
+
+	@Test
+	public void testHbm2JavaExporterTaskName() {
+		assertEquals("hbm2java (Generates a set of .java files)",
+				new Hbm2JavaExporterTask(parent).getName());
+	}
+
+	@Test
+	public void testHbm2DAOExporterTaskName() {
+		assertEquals("hbm2dao (Generates a set of DAOs)",
+				new Hbm2DAOExporterTask(parent).getName());
+	}
+
+	@Test
+	public void testHbm2DocExporterTaskName() {
+		assertEquals("hbm2doc (Generates html schema documentation)",
+				new Hbm2DocExporterTask(parent).getName());
+	}
+
+	@Test
+	public void testHbmLintExporterTaskName() {
+		assertEquals("hbmlint (scans mapping for errors)",
+				new HbmLintExporterTask(parent).getName());
+	}
+
+	@Test
+	public void testHbm2HbmXmlExporterTaskName() {
+		assertEquals("hbm2hbmxml (Generates a set of hbm.xml files)",
+				new Hbm2HbmXmlExporterTask(parent).getName());
+	}
+
+	@Test
+	public void testHbm2JavaSetters() {
+		Hbm2JavaExporterTask task = new Hbm2JavaExporterTask(parent);
+		task.setEjb3(false);
+		task.setJdk5(false);
+		// verify defaults were true
+		Hbm2JavaExporterTask fresh = new Hbm2JavaExporterTask(parent);
+		assertEquals(true, fresh.ejb3);
+		assertEquals(true, fresh.jdk5);
+	}
+
+	@Test
+	public void testHbm2CfgXmlSetEjb3() {
+		Hbm2CfgXmlExporterTask task = new Hbm2CfgXmlExporterTask(parent);
+		task.setEjb3(true);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ExporterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ExporterTaskTest.java
new file mode 100644
index 000000000000..76e099a28241
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/ExporterTaskTest.java
@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.Path;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class ExporterTaskTest {
+
+	@Test
+	public void testGetDestdirDefault() {
+		HibernateToolTask parent = new HibernateToolTask();
+		parent.setDestDir(new File("/parent/dest"));
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		// Falls back to parent destDir
+		assertEquals(new File("/parent/dest"), task.getDestdir());
+	}
+
+	@Test
+	public void testSetDestdir() {
+		HibernateToolTask parent = new HibernateToolTask();
+		parent.setDestDir(new File("/parent/dest"));
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		File localDir = new File("/local/dest");
+		task.setDestdir(localDir);
+		assertEquals(localDir, task.getDestdir());
+	}
+
+	@Test
+	public void testValidateParametersNoDestDir() {
+		HibernateToolTask parent = new HibernateToolTask();
+		// destDir is null on parent and task
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		assertThrows(BuildException.class, task::validateParameters);
+	}
+
+	@Test
+	public void testValidateParametersWithDestDir() {
+		HibernateToolTask parent = new HibernateToolTask();
+		parent.setDestDir(new File("/tmp"));
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		// Should not throw
+		task.validateParameters();
+	}
+
+	@Test
+	public void testSetTemplatePath() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		Path path = new Path(null);
+		task.setTemplatePath(path);
+		// getTemplatePath should return the local one, not the parent's
+		assertNotNull(task);
+	}
+
+	@Test
+	public void testAddConfiguredProperty() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		Environment.Variable prop = new Environment.Variable();
+		prop.setKey("test.key");
+		prop.setValue("test.value");
+		task.addConfiguredProperty(prop);
+		assertEquals("test.value", task.properties.getProperty("test.key"));
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/GenericExporterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/GenericExporterTaskTest.java
new file mode 100644
index 000000000000..dd0dcb4a09ce
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/GenericExporterTaskTest.java
@@ -0,0 +1,65 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class GenericExporterTaskTest {
+
+	@Test
+	public void testGetNameDefault() {
+		HibernateToolTask parent = new HibernateToolTask();
+		GenericExporterTask task = new GenericExporterTask(parent);
+		assertEquals("generic exporter", task.getName());
+	}
+
+	@Test
+	public void testGetNameWithExporterClass() {
+		HibernateToolTask parent = new HibernateToolTask();
+		GenericExporterTask task = new GenericExporterTask(parent);
+		task.setExporterClass("org.example.MyExporter");
+		String name = task.getName();
+		assertTrue(name.contains("class: org.example.MyExporter"));
+	}
+
+	@Test
+	public void testGetNameWithTemplate() {
+		HibernateToolTask parent = new HibernateToolTask();
+		GenericExporterTask task = new GenericExporterTask(parent);
+		task.setTemplate("mytemplate.ftl");
+		String name = task.getName();
+		assertTrue(name.contains("template: mytemplate.ftl"));
+	}
+
+	@Test
+	public void testGetNameWithBoth() {
+		HibernateToolTask parent = new HibernateToolTask();
+		GenericExporterTask task = new GenericExporterTask(parent);
+		task.setExporterClass("org.example.MyExporter");
+		task.setTemplate("mytemplate.ftl");
+		String name = task.getName();
+		assertTrue(name.contains("class: org.example.MyExporter"));
+		assertTrue(name.contains("template: mytemplate.ftl"));
+	}
+
+	@Test
+	public void testSetFilePattern() {
+		HibernateToolTask parent = new HibernateToolTask();
+		GenericExporterTask task = new GenericExporterTask(parent);
+		task.setFilePattern("{package-name}/{class-name}.java");
+		assertEquals("{package-name}/{class-name}.java", task.filePattern);
+	}
+
+	@Test
+	public void testSetForEach() {
+		HibernateToolTask parent = new HibernateToolTask();
+		GenericExporterTask task = new GenericExporterTask(parent);
+		task.setForEach("entity");
+		assertEquals("entity", task.forEach);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2CfgXmlExporterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2CfgXmlExporterTaskTest.java
new file mode 100644
index 000000000000..9825c98998be
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2CfgXmlExporterTaskTest.java
@@ -0,0 +1,27 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Hbm2CfgXmlExporterTaskTest {
+
+	@Test
+	public void testGetName() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2CfgXmlExporterTask task = new Hbm2CfgXmlExporterTask(parent);
+		assertEquals("hbm2cfgxml (Generates hibernate.cfg.xml)", task.getName());
+	}
+
+	@Test
+	public void testSetEjb3() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2CfgXmlExporterTask task = new Hbm2CfgXmlExporterTask(parent);
+		task.setEjb3(true);
+		// Just verify no exception
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2DAOExporterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2DAOExporterTaskTest.java
new file mode 100644
index 000000000000..c2f9a4cc2852
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2DAOExporterTaskTest.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Hbm2DAOExporterTaskTest {
+
+	@Test
+	public void testGetName() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DAOExporterTask task = new Hbm2DAOExporterTask(parent);
+		assertEquals("hbm2dao (Generates a set of DAOs)", task.getName());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2DDLExporterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2DDLExporterTaskTest.java
new file mode 100644
index 000000000000..be72b3e8e78f
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2DDLExporterTaskTest.java
@@ -0,0 +1,107 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Hbm2DDLExporterTaskTest {
+
+	@Test
+	public void testGetName() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		assertEquals("hbm2ddl (Generates database schema)", task.getName());
+	}
+
+	@Test
+	public void testDefaultValues() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		assertTrue(task.exportToDatabase);
+		assertTrue(task.scriptToConsole);
+		assertFalse(task.schemaUpdate);
+		assertEquals(";", task.delimiter);
+		assertFalse(task.drop);
+		assertTrue(task.create);
+		assertFalse(task.format);
+	}
+
+	@Test
+	public void testSetExport() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		task.setExport(false);
+		assertFalse(task.exportToDatabase);
+	}
+
+	@Test
+	public void testSetUpdate() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		task.setUpdate(true);
+		assertTrue(task.schemaUpdate);
+	}
+
+	@Test
+	public void testSetConsole() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		task.setConsole(false);
+		assertFalse(task.scriptToConsole);
+	}
+
+	@Test
+	public void testSetFormat() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		task.setFormat(true);
+		assertTrue(task.format);
+	}
+
+	@Test
+	public void testSetOutputFileName() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		task.setOutputFileName("schema.sql");
+		assertEquals("schema.sql", task.outputFileName);
+	}
+
+	@Test
+	public void testSetDrop() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		task.setDrop(true);
+		assertTrue(task.drop);
+	}
+
+	@Test
+	public void testSetCreate() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		task.setCreate(false);
+		assertFalse(task.create);
+	}
+
+	@Test
+	public void testDelimiter() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		assertEquals(";", task.getDelimiter());
+		task.setDelimiter("GO");
+		assertEquals("GO", task.getDelimiter());
+	}
+
+	@Test
+	public void testSetHaltonerror() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DDLExporterTask task = new Hbm2DDLExporterTask(parent);
+		task.setHaltonerror(true);
+		// no public getter, just verify no exception
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2DocExporterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2DocExporterTaskTest.java
new file mode 100644
index 000000000000..7e653e940104
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2DocExporterTaskTest.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Hbm2DocExporterTaskTest {
+
+	@Test
+	public void testGetName() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2DocExporterTask task = new Hbm2DocExporterTask(parent);
+		assertEquals("hbm2doc (Generates html schema documentation)", task.getName());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2HbmXmlExporterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2HbmXmlExporterTaskTest.java
new file mode 100644
index 000000000000..86e7942b7821
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2HbmXmlExporterTaskTest.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class Hbm2HbmXmlExporterTaskTest {
+
+	@Test
+	public void testGetName() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2HbmXmlExporterTask task = new Hbm2HbmXmlExporterTask(parent);
+		assertEquals("hbm2hbmxml (Generates a set of hbm.xml files)", task.getName());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2JavaExporterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2JavaExporterTaskTest.java
new file mode 100644
index 000000000000..206eb8d6666b
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2JavaExporterTaskTest.java
@@ -0,0 +1,45 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Hbm2JavaExporterTaskTest {
+
+	@Test
+	public void testGetName() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2JavaExporterTask task = new Hbm2JavaExporterTask(parent);
+		assertEquals("hbm2java (Generates a set of .java files)", task.getName());
+	}
+
+	@Test
+	public void testDefaultValues() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2JavaExporterTask task = new Hbm2JavaExporterTask(parent);
+		assertTrue(task.ejb3);
+		assertTrue(task.jdk5);
+	}
+
+	@Test
+	public void testSetEjb3() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2JavaExporterTask task = new Hbm2JavaExporterTask(parent);
+		task.setEjb3(false);
+		assertFalse(task.ejb3);
+	}
+
+	@Test
+	public void testSetJdk5() {
+		HibernateToolTask parent = new HibernateToolTask();
+		Hbm2JavaExporterTask task = new Hbm2JavaExporterTask(parent);
+		task.setJdk5(false);
+		assertFalse(task.jdk5);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2JavaTestIT.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2JavaTestIT.java
new file mode 100644
index 000000000000..f1134ef7b38c
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/Hbm2JavaTestIT.java
@@ -0,0 +1,110 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Hbm2JavaTestIT extends TestTemplate {
+
+	@Test
+	public void testJpaDefault() throws Exception {
+		setHibernateToolTaskXml(
+				"""
+								<hibernatetool destdir='generated'>                         \s
+									<jdbcconfiguration propertyfile='hibernate.properties'/>\s
+									<hbm2java/>                                             \s
+								</hibernatetool>                                            \s
+						"""
+		);
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+		});
+		createProjectAndBuild();
+		assertFolderExists("generated", 1);
+		assertFileExists("generated/Person.java");
+		String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+		assertTrue(generatedPersonJavaFileContents.contains("import jakarta.persistence.Entity;"));
+		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+	}
+
+	@Test
+	public void testNoAnnotations() throws Exception {
+		setHibernateToolTaskXml(
+				"""
+								<hibernatetool destdir='generated'>                         \s
+									<jdbcconfiguration propertyfile='hibernate.properties'/>\s
+									<hbm2java ejb3='false'/>                                \s
+								</hibernatetool>                                            \s
+						"""
+		);
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+		});
+		createProjectAndBuild();
+		assertFolderExists("generated", 1);
+		assertFileExists("generated/Person.java");
+		String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+		assertFalse(generatedPersonJavaFileContents.contains("import jakarta.persistence.Entity;"));
+		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+	}
+
+	@Test
+	public void testNoGenerics() throws Exception {
+		setHibernateToolTaskXml(
+				"""
+								<hibernatetool destdir='generated'>                         \s
+									<jdbcconfiguration propertyfile='hibernate.properties'/>\s
+									<hbm2java jdk5='false'/>                                \s
+								</hibernatetool>                                            \s
+						"""
+		);
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), " +
+						"primary key (ID))",
+				"create table ITEM (ID int not null,  NAME varchar(20), OWNER_ID int not null, " +
+						"primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
+		});
+		createProjectAndBuild();
+		assertFolderExists("generated", 2);
+		assertFileExists("generated/Person.java");
+		String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+		assertFalse(generatedPersonJavaFileContents.contains("Set<Item>"));
+		assertFileExists("generated/Item.java");
+		String generatedItemJavaFileContents = getFileContents("generated/Item.java");
+		assertTrue(generatedItemJavaFileContents.contains("public class Item "));
+	}
+
+	@Test
+	public void testUseGenerics() throws Exception {
+		setHibernateToolTaskXml(
+				"""
+								<hibernatetool destdir='generated'>                         \s
+									<jdbcconfiguration propertyfile='hibernate.properties'/>\s
+									<hbm2java/>                                             \s
+								</hibernatetool>                                            \s
+						"""
+		);
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), " +
+						"primary key (ID))",
+				"create table ITEM (ID int not null,  NAME varchar(20), OWNER_ID int not null, " +
+						"primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
+		});
+		createProjectAndBuild();
+		assertFolderExists("generated", 2);
+		assertFileExists("generated/Person.java");
+		String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+		assertTrue(generatedPersonJavaFileContents.contains("Set<Item>"));
+		assertFileExists("generated/Item.java");
+		String generatedItemJavaFileContents = getFileContents("generated/Item.java");
+		assertTrue(generatedItemJavaFileContents.contains("public class Item "));
+	}
+
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/HbmLintExporterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/HbmLintExporterTaskTest.java
new file mode 100644
index 000000000000..ba734fbe2778
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/HbmLintExporterTaskTest.java
@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class HbmLintExporterTaskTest {
+
+	@Test
+	public void testGetName() {
+		HibernateToolTask parent = new HibernateToolTask();
+		HbmLintExporterTask task = new HbmLintExporterTask(parent);
+		assertEquals("hbmlint (scans mapping for errors)", task.getName());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/HibernateToolTaskExtendedTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/HibernateToolTaskExtendedTest.java
new file mode 100644
index 000000000000..757390526123
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/HibernateToolTaskExtendedTest.java
@@ -0,0 +1,160 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.PropertySet;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class HibernateToolTaskExtendedTest {
+
+	@Test
+	public void testCreateHbm2HbmXml() {
+		HibernateToolTask task = new HibernateToolTask();
+		ExporterTask gen = task.createHbm2HbmXml();
+		assertNotNull(gen);
+		assertTrue(gen instanceof Hbm2HbmXmlExporterTask);
+		assertEquals(1, task.generators.size());
+	}
+
+	@Test
+	public void testSetTemplatePath() {
+		HibernateToolTask task = new HibernateToolTask();
+		task.setTemplatePath(new org.apache.tools.ant.types.Path(null));
+		assertNotNull(task.templatePath);
+	}
+
+	@Test
+	public void testGetTemplatePathDefault() {
+		HibernateToolTask task = new HibernateToolTask();
+		task.setProject(new Project());
+		assertNotNull(task.getTemplatePath());
+	}
+
+	@Test
+	public void testSetClasspath() {
+		HibernateToolTask task = new HibernateToolTask();
+		org.apache.tools.ant.types.Path path = new org.apache.tools.ant.types.Path(null);
+		task.setClasspath(path);
+		assertEquals(path, task.classPath);
+	}
+
+	@Test
+	public void testCreateClasspath() {
+		HibernateToolTask task = new HibernateToolTask();
+		task.setProject(new Project());
+		org.apache.tools.ant.types.Path path = task.createClasspath();
+		assertNotNull(path);
+	}
+
+	@Test
+	public void testClone() throws CloneNotSupportedException {
+		HibernateToolTask task = new HibernateToolTask();
+		task.setDestDir(new File("/tmp/dest"));
+		task.properties.put("key", "value");
+
+		HibernateToolTask clone = (HibernateToolTask) task.clone();
+		assertNotNull(clone);
+		assertEquals(new File("/tmp/dest"), clone.getDestDir());
+		assertEquals("value", clone.properties.getProperty("key"));
+	}
+
+	@Test
+	public void testExecuteNoGeneratorsThrows() {
+		HibernateToolTask task = new HibernateToolTask();
+		task.setProject(new Project());
+		task.createConfiguration();
+		// No generators added
+		assertThrows(BuildException.class, task::execute);
+	}
+
+	@Test
+	public void testCreateMultipleExporters() {
+		HibernateToolTask task = new HibernateToolTask();
+		task.createHbm2DDL();
+		task.createHbm2Java();
+		task.createHbm2Doc();
+		assertEquals(3, task.generators.size());
+	}
+
+	@Test
+	public void testExecuteWithExceptionInGenerator() {
+		HibernateToolTask task = new HibernateToolTask();
+		Project project = new Project();
+		project.init();
+		task.setProject(project);
+		task.setDestDir(new File("/tmp"));
+		task.createConfiguration();
+
+		// Add a generator that throws a RuntimeException
+		task.generators.add(new ExporterTask(task) {
+			@Override
+			protected org.hibernate.tool.reveng.api.export.Exporter createExporter() {
+				throw new RuntimeException("Test failure", new IllegalStateException("nested cause"));
+			}
+
+			@Override
+			String getName() {
+				return "failing-exporter";
+			}
+
+			@Override
+			public void execute() {
+				createExporter();
+			}
+		});
+
+		BuildException ex = assertThrows(BuildException.class, task::execute);
+		assertNotNull(ex.getCause());
+	}
+
+	@Test
+	public void testExecuteWithBuildExceptionInGenerator() {
+		HibernateToolTask task = new HibernateToolTask();
+		Project project = new Project();
+		project.init();
+		task.setProject(project);
+		task.setDestDir(new File("/tmp"));
+		task.createConfiguration();
+
+		task.generators.add(new ExporterTask(task) {
+			@Override
+			protected org.hibernate.tool.reveng.api.export.Exporter createExporter() {
+				return null;
+			}
+
+			@Override
+			String getName() {
+				return "build-exception-exporter";
+			}
+
+			@Override
+			public void execute() {
+				throw new BuildException("Build failed");
+			}
+		});
+
+		BuildException ex = assertThrows(BuildException.class, task::execute);
+		assertEquals("Build failed", ex.getMessage());
+	}
+
+	@Test
+	public void testAddConfiguredPropertySet() {
+		HibernateToolTask task = new HibernateToolTask();
+		PropertySet ps = new PropertySet();
+		ps.setProject(new Project());
+		// PropertySet with no properties added
+		task.addConfiguredPropertySet(ps);
+		// Just verify no exception
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/HibernateToolTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/HibernateToolTaskTest.java
new file mode 100644
index 000000000000..07087b146d7a
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/HibernateToolTaskTest.java
@@ -0,0 +1,158 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class HibernateToolTaskTest {
+
+	@Test
+	public void testDestDir() {
+		HibernateToolTask task = new HibernateToolTask();
+		assertNull(task.getDestDir());
+		File dir = new File("/tmp/test");
+		task.setDestDir(dir);
+		assertEquals(dir, task.getDestDir());
+	}
+
+	@Test
+	public void testCreateConfiguration() {
+		HibernateToolTask task = new HibernateToolTask();
+		ConfigurationTask cfg = task.createConfiguration();
+		assertNotNull(cfg);
+	}
+
+	@Test
+	public void testCreateConfigurationTwiceThrows() {
+		HibernateToolTask task = new HibernateToolTask();
+		task.createConfiguration();
+		assertThrows(BuildException.class, task::createConfiguration);
+	}
+
+	@Test
+	public void testCreateJDBCConfiguration() {
+		HibernateToolTask task = new HibernateToolTask();
+		JDBCConfigurationTask cfg = task.createJDBCConfiguration();
+		assertNotNull(cfg);
+		assertTrue(cfg instanceof JDBCConfigurationTask);
+	}
+
+	@Test
+	public void testCreateJpaConfiguration() {
+		HibernateToolTask task = new HibernateToolTask();
+		JPAConfigurationTask cfg = task.createJpaConfiguration();
+		assertNotNull(cfg);
+	}
+
+	@Test
+	public void testCreateHbm2DDL() {
+		HibernateToolTask task = new HibernateToolTask();
+		ExporterTask gen = task.createHbm2DDL();
+		assertNotNull(gen);
+		assertTrue(gen instanceof Hbm2DDLExporterTask);
+		assertEquals(1, task.generators.size());
+	}
+
+	@Test
+	public void testCreateHbmTemplate() {
+		HibernateToolTask task = new HibernateToolTask();
+		ExporterTask gen = task.createHbmTemplate();
+		assertNotNull(gen);
+		assertTrue(gen instanceof GenericExporterTask);
+	}
+
+	@Test
+	public void testCreateHbm2CfgXml() {
+		HibernateToolTask task = new HibernateToolTask();
+		ExporterTask gen = task.createHbm2CfgXml();
+		assertNotNull(gen);
+		assertTrue(gen instanceof Hbm2CfgXmlExporterTask);
+	}
+
+	@Test
+	public void testCreateHbm2Java() {
+		HibernateToolTask task = new HibernateToolTask();
+		ExporterTask gen = task.createHbm2Java();
+		assertNotNull(gen);
+		assertTrue(gen instanceof Hbm2JavaExporterTask);
+	}
+
+	@Test
+	public void testCreateHbm2Doc() {
+		HibernateToolTask task = new HibernateToolTask();
+		ExporterTask gen = task.createHbm2Doc();
+		assertNotNull(gen);
+		assertTrue(gen instanceof Hbm2DocExporterTask);
+	}
+
+	@Test
+	public void testCreateHbm2DAO() {
+		HibernateToolTask task = new HibernateToolTask();
+		ExporterTask gen = task.createHbm2DAO();
+		assertNotNull(gen);
+		assertTrue(gen instanceof Hbm2DAOExporterTask);
+	}
+
+	@Test
+	public void testCreateQuery() {
+		HibernateToolTask task = new HibernateToolTask();
+		QueryExporterTask gen = task.createQuery();
+		assertNotNull(gen);
+		assertEquals(1, task.generators.size());
+	}
+
+	@Test
+	public void testCreateHbmLint() {
+		HibernateToolTask task = new HibernateToolTask();
+		HbmLintExporterTask gen = task.createHbmLint();
+		assertNotNull(gen);
+	}
+
+	@Test
+	public void testAddConfiguredProperty() {
+		HibernateToolTask task = new HibernateToolTask();
+		Environment.Variable prop = new Environment.Variable();
+		prop.setKey("test.key");
+		prop.setValue("test.value");
+		task.addConfiguredProperty(prop);
+		assertEquals("test.value", task.properties.getProperty("test.key"));
+	}
+
+	@Test
+	public void testAddConfiguredPropertyNullKey() {
+		HibernateToolTask task = new HibernateToolTask();
+		Environment.Variable prop = new Environment.Variable();
+		prop.setValue("value");
+		// null key should be ignored
+		task.addConfiguredProperty(prop);
+		assertTrue(task.properties.isEmpty());
+	}
+
+	@Test
+	public void testAddConfiguredPropertyNullValue() {
+		HibernateToolTask task = new HibernateToolTask();
+		Environment.Variable prop = new Environment.Variable();
+		prop.setKey("key");
+		// null value should be ignored
+		task.addConfiguredProperty(prop);
+		assertNull(task.properties.getProperty("key"));
+	}
+
+	@Test
+	public void testExecuteNoConfigurationThrows() {
+		HibernateToolTask task = new HibernateToolTask();
+		assertThrows(BuildException.class, task::execute);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JDBCConfigurationTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JDBCConfigurationTaskTest.java
new file mode 100644
index 000000000000..d63b780ede95
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JDBCConfigurationTaskTest.java
@@ -0,0 +1,95 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JDBCConfigurationTaskTest {
+
+	@Test
+	public void testDefaultDescription() {
+		JDBCConfigurationTask task = new JDBCConfigurationTask();
+		assertEquals("JDBC Configuration (for reverse engineering)", task.getDescription());
+	}
+
+	@Test
+	public void testDefaultValues() {
+		JDBCConfigurationTask task = new JDBCConfigurationTask();
+		assertTrue(task.preferBasicCompositeIds);
+		assertTrue(task.detectOneToOne);
+		assertTrue(task.detectManyToMany);
+		assertTrue(task.detectOptimisticLock);
+		assertNull(task.reverseEngineeringStrategyClass);
+		assertNull(task.packageName);
+		assertNull(task.revengFiles);
+	}
+
+	@Test
+	public void testSetPackageName() {
+		JDBCConfigurationTask task = new JDBCConfigurationTask();
+		task.setPackageName("com.example.model");
+		assertEquals("com.example.model", task.packageName);
+	}
+
+	@Test
+	public void testSetReverseStrategy() {
+		JDBCConfigurationTask task = new JDBCConfigurationTask();
+		task.setReverseStrategy("org.example.MyStrategy");
+		assertEquals("org.example.MyStrategy", task.reverseEngineeringStrategyClass);
+	}
+
+	@Test
+	public void testSetPreferBasicCompositeIds() {
+		JDBCConfigurationTask task = new JDBCConfigurationTask();
+		task.setPreferBasicCompositeIds(false);
+		assertFalse(task.preferBasicCompositeIds);
+	}
+
+	@Test
+	public void testSetDetectOneToOne() {
+		JDBCConfigurationTask task = new JDBCConfigurationTask();
+		task.setDetectOneToOne(false);
+		assertFalse(task.detectOneToOne);
+	}
+
+	@Test
+	public void testSetDetectManyToMany() {
+		JDBCConfigurationTask task = new JDBCConfigurationTask();
+		task.setDetectManyToMany(false);
+		assertFalse(task.detectManyToMany);
+	}
+
+	@Test
+	public void testSetDetectOptimisticLock() {
+		JDBCConfigurationTask task = new JDBCConfigurationTask();
+		task.setDetectOptimisticLock(false);
+		assertFalse(task.detectOptimisticLock);
+	}
+
+	@Test
+	public void testClone() throws CloneNotSupportedException {
+		JDBCConfigurationTask task = new JDBCConfigurationTask();
+		task.setPackageName("com.example");
+		task.setReverseStrategy("org.example.MyStrategy");
+		task.setPreferBasicCompositeIds(false);
+		task.setDetectOneToOne(false);
+		task.setDetectManyToMany(false);
+		task.setDetectOptimisticLock(false);
+		JDBCConfigurationTask clone = (JDBCConfigurationTask) task.clone();
+		assertNotNull(clone);
+		assertEquals("com.example", clone.packageName);
+		assertEquals("org.example.MyStrategy", clone.reverseEngineeringStrategyClass);
+		assertFalse(clone.preferBasicCompositeIds);
+		assertFalse(clone.detectOneToOne);
+		assertFalse(clone.detectManyToMany);
+		assertFalse(clone.detectOptimisticLock);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JPAConfigurationTaskExtendedTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JPAConfigurationTaskExtendedTest.java
new file mode 100644
index 000000000000..c9690fa1f57f
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JPAConfigurationTaskExtendedTest.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JPAConfigurationTaskExtendedTest {
+
+	@Test
+	public void testCreateMetadataDescriptorWithNoPersistenceUnit() {
+		JPAConfigurationTask task = new JPAConfigurationTask();
+		// With no persistence unit and no META-INF/persistence.xml, this should throw
+		BuildException ex = assertThrows(BuildException.class, task::createMetadataDescriptor);
+		assertNotNull(ex);
+	}
+
+	@Test
+	public void testCreateMetadataDescriptorWithInvalidPersistenceUnit() {
+		JPAConfigurationTask task = new JPAConfigurationTask();
+		task.setPersistenceUnit("nonExistentPU");
+		BuildException ex = assertThrows(BuildException.class, task::createMetadataDescriptor);
+		assertNotNull(ex);
+	}
+
+	@Test
+	public void testSetConfigurationFileThrowsWithMessage() {
+		JPAConfigurationTask task = new JPAConfigurationTask();
+		BuildException ex = assertThrows(BuildException.class,
+				() -> task.setConfigurationFile(new java.io.File("/tmp/cfg.xml")));
+		assertTrue(ex.getMessage().contains("autodiscovery"));
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JPAConfigurationTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JPAConfigurationTaskTest.java
new file mode 100644
index 000000000000..a8024895839f
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JPAConfigurationTaskTest.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class JPAConfigurationTaskTest {
+
+	@Test
+	public void testDefaultDescription() {
+		JPAConfigurationTask task = new JPAConfigurationTask();
+		assertEquals("JPA Configuration", task.getDescription());
+	}
+
+	@Test
+	public void testPersistenceUnit() {
+		JPAConfigurationTask task = new JPAConfigurationTask();
+		assertNull(task.getPersistenceUnit());
+		task.setPersistenceUnit("myPU");
+		assertEquals("myPU", task.getPersistenceUnit());
+	}
+
+	@Test
+	public void testSetConfigurationFileThrows() {
+		JPAConfigurationTask task = new JPAConfigurationTask();
+		assertThrows(BuildException.class, () -> task.setConfigurationFile(new File("/tmp/cfg.xml")));
+	}
+
+	@Test
+	public void testClone() throws CloneNotSupportedException {
+		JPAConfigurationTask task = new JPAConfigurationTask();
+		task.setPersistenceUnit("testPU");
+		JPAConfigurationTask clone = (JPAConfigurationTask) task.clone();
+		assertNotNull(clone);
+		assertEquals("testPU", clone.getPersistenceUnit());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JavaFormatterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JavaFormatterTaskTest.java
new file mode 100644
index 000000000000..1b48cdaa0655
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/JavaFormatterTaskTest.java
@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.types.FileSet;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.lang.reflect.Method;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class JavaFormatterTaskTest {
+
+	@TempDir
+	private File tempDir;
+
+	@Test
+	public void testAddConfiguredFileSet() {
+		JavaFormatterTask task = new JavaFormatterTask();
+		assertEquals(0, task.fileSets.size());
+		task.addConfiguredFileSet(new FileSet());
+		assertEquals(1, task.fileSets.size());
+		task.addConfiguredFileSet(new FileSet());
+		assertEquals(2, task.fileSets.size());
+	}
+
+	@Test
+	public void testClone() throws CloneNotSupportedException {
+		JavaFormatterTask task = new JavaFormatterTask();
+		task.failOnError = true;
+		task.addConfiguredFileSet(new FileSet());
+		JavaFormatterTask clone = (JavaFormatterTask) task.clone();
+		assertNotNull(clone);
+		assertEquals(true, clone.failOnError);
+		// Clone should include filesets from original
+		assertFalse(clone.fileSets.isEmpty());
+	}
+
+	@Test
+	public void testReadConfig() throws Exception {
+		JavaFormatterTask task = new JavaFormatterTask();
+		File cfgFile = new File(tempDir, "formatter.properties");
+		Properties props = new Properties();
+		props.setProperty("tabWidth", "4");
+		props.setProperty("indentStyle", "tab");
+		try (FileOutputStream fos = new FileOutputStream(cfgFile)) {
+			props.store(fos, null);
+		}
+		// readConfig is private, use reflection
+		Method readConfig = JavaFormatterTask.class.getDeclaredMethod("readConfig", File.class);
+		readConfig.setAccessible(true);
+		Properties result = (Properties) readConfig.invoke(task, cfgFile);
+		assertNotNull(result);
+		assertEquals("4", result.getProperty("tabWidth"));
+		assertEquals("tab", result.getProperty("indentStyle"));
+	}
+
+	@Test
+	public void testGetFilesEmpty() throws Exception {
+		JavaFormatterTask task = new JavaFormatterTask();
+		// getFiles is private, use reflection
+		Method getFiles = JavaFormatterTask.class.getDeclaredMethod("getFiles");
+		getFiles.setAccessible(true);
+		File[] files = (File[]) getFiles.invoke(task);
+		assertNotNull(files);
+		assertEquals(0, files.length);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/QueryExporterTaskExtendedTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/QueryExporterTaskExtendedTest.java
new file mode 100644
index 000000000000..6f1e86973364
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/QueryExporterTaskExtendedTest.java
@@ -0,0 +1,70 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class QueryExporterTaskExtendedTest {
+
+	@Test
+	public void testValidateParametersNoQueryThrows() {
+		HibernateToolTask parent = new HibernateToolTask();
+		parent.setDestDir(new File("/tmp"));
+		QueryExporterTask task = new QueryExporterTask(parent);
+		assertThrows(BuildException.class, task::validateParameters);
+	}
+
+	@Test
+	public void testValidateParametersWithQuery() {
+		HibernateToolTask parent = new HibernateToolTask();
+		parent.setDestDir(new File("/tmp"));
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.addText("FROM Foo");
+		task.validateParameters();
+	}
+
+	@Test
+	public void testValidateParametersEmptyHqlThrows() {
+		HibernateToolTask parent = new HibernateToolTask();
+		parent.setDestDir(new File("/tmp"));
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.createHql(); // empty HQL added
+		assertThrows(BuildException.class, task::validateParameters);
+	}
+
+	@Test
+	public void testValidateParametersWithHql() {
+		HibernateToolTask parent = new HibernateToolTask();
+		parent.setDestDir(new File("/tmp"));
+		QueryExporterTask task = new QueryExporterTask(parent);
+		QueryExporterTask.HQL hql = task.createHql();
+		hql.addText("FROM Bar");
+		task.validateParameters();
+	}
+
+	@Test
+	public void testMultipleHqlQueries() {
+		HibernateToolTask parent = new HibernateToolTask();
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.createHql().addText("FROM Foo");
+		task.createHql().addText("FROM Bar");
+		assertEquals(2, task.queries.size());
+	}
+
+	@Test
+	public void testAddTextAppends() {
+		HibernateToolTask parent = new HibernateToolTask();
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.addText("  SELECT  ");
+		task.addText("  * FROM foo  ");
+		// Both should be appended (trimmed)
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/QueryExporterTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/QueryExporterTaskTest.java
new file mode 100644
index 000000000000..5e485869173b
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/QueryExporterTaskTest.java
@@ -0,0 +1,84 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class QueryExporterTaskTest {
+
+	@Test
+	public void testGetName() {
+		HibernateToolTask parent = new HibernateToolTask();
+		QueryExporterTask task = new QueryExporterTask(parent);
+		assertEquals("query (Executes queries)", task.getName());
+	}
+
+	@Test
+	public void testAddText() {
+		HibernateToolTask parent = new HibernateToolTask();
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.addText("  SELECT * FROM foo  ");
+		// addText appends trimmed text; just verify no exception
+	}
+
+	@Test
+	public void testAddTextNull() {
+		HibernateToolTask parent = new HibernateToolTask();
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.addText(null);
+		// null should be a no-op
+	}
+
+	@Test
+	public void testAddTextEmpty() {
+		HibernateToolTask parent = new HibernateToolTask();
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.addText("");
+		// empty should be a no-op
+	}
+
+	@Test
+	public void testCreateHql() {
+		HibernateToolTask parent = new HibernateToolTask();
+		QueryExporterTask task = new QueryExporterTask(parent);
+		QueryExporterTask.HQL hql = task.createHql();
+		assertNotNull(hql);
+		assertEquals(1, task.queries.size());
+	}
+
+	@Test
+	public void testHqlAddText() {
+		QueryExporterTask.HQL hql = new QueryExporterTask.HQL();
+		hql.addText("  FROM Bar  ");
+	}
+
+	@Test
+	public void testHqlAddTextNull() {
+		QueryExporterTask.HQL hql = new QueryExporterTask.HQL();
+		hql.addText(null);
+	}
+
+	@Test
+	public void testIsNotEmpty() {
+		HibernateToolTask parent = new HibernateToolTask();
+		QueryExporterTask task = new QueryExporterTask(parent);
+		assertTrue(task.isNotEmpty("hello"));
+		assertFalse(task.isNotEmpty(""));
+		assertFalse(task.isNotEmpty(null));
+	}
+
+	@Test
+	public void testSetDestFile() {
+		HibernateToolTask parent = new HibernateToolTask();
+		QueryExporterTask task = new QueryExporterTask(parent);
+		task.setDestFile("output.txt");
+		// verify no exception
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/TestTemplate.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/TestTemplate.java
new file mode 100644
index 000000000000..1576361b2078
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/TestTemplate.java
@@ -0,0 +1,143 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.apache.tools.ant.DefaultLogger;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.util.Objects;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public abstract class TestTemplate {
+
+	@TempDir
+	private File projectDir;
+
+	private String hibernateToolTaskXml;
+	private String[] databaseCreationScript;
+
+	protected File getProjectDir() {
+		return projectDir;
+	}
+
+	protected void setHibernateToolTaskXml(String xml) {
+		this.hibernateToolTaskXml = xml;
+	}
+
+	protected void setDatabaseCreationScript(String[] sqls) {
+		this.databaseCreationScript = sqls;
+	}
+
+	protected String constructBuildXmlFileContents() {
+		assertNotNull(hibernateToolTaskXml);
+		return buildXmlFileContents.replace("@hibernateToolTaskXml@", hibernateToolTaskXml);
+	}
+
+	protected String getFileContents(String path) throws Exception {
+		return new String(
+				Files.readAllBytes(
+						new File(getProjectDir(), path).toPath()));
+	}
+
+	protected void createProjectAndBuild() throws Exception {
+		createBuildXmlFile();
+		createDatabase();
+		createHibernatePropertiesFile();
+		runAntBuild();
+	}
+
+	protected void assertFolderExists(String path, int amountOfChildren) {
+		File generatedOutputFolder = new File(getProjectDir(), path);
+		assertTrue(generatedOutputFolder.exists());
+		assertTrue(generatedOutputFolder.isDirectory());
+		assertEquals(amountOfChildren, Objects.requireNonNull(generatedOutputFolder.list()).length);
+	}
+
+	protected void assertFileExists(String path) {
+		File generatedPersonJavaFile = new File(getProjectDir(), path);
+		assertTrue(generatedPersonJavaFile.exists());
+		assertTrue(generatedPersonJavaFile.isFile());
+	}
+
+	private void runAntBuild() {
+		File buildXmlFile = new File(getProjectDir(), "build.xml");
+		Project project = new Project();
+		project.setBaseDir(getProjectDir());
+		project.addBuildListener(getConsoleLogger());
+		ProjectHelper.getProjectHelper().parse(project, buildXmlFile);
+		project.executeTarget(project.getDefaultTarget());
+	}
+
+	private void createBuildXmlFile() throws Exception {
+		File buildXmlFile = new File(getProjectDir(), "build.xml");
+		assertFalse(buildXmlFile.exists());
+		Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
+		assertTrue(buildXmlFile.exists());
+	}
+
+	private String constructJdbcConnectionString() {
+		return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
+	}
+
+	private void createDatabase() throws Exception {
+		File databaseFile = new File(getProjectDir(), "database/test.mv.db");
+		assertFalse(databaseFile.exists());
+		assertFalse(databaseFile.isFile());
+		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+		Statement statement = connection.createStatement();
+		for (String sql : databaseCreationScript) {
+			statement.execute(sql);
+		}
+		statement.close();
+		connection.close();
+		assertTrue(databaseFile.exists());
+		assertTrue(databaseFile.isFile());
+	}
+
+	private void createHibernatePropertiesFile() throws Exception {
+		File hibernatePropertiesFile = new File(getProjectDir(), "hibernate.properties");
+		String hibernatePropertiesFileContents =
+				"hibernate.connection.driver_class=org.h2.Driver\n" +
+				"hibernate.connection.url=" + constructJdbcConnectionString() + "\n" +
+				"hibernate.connection.username=\n" +
+				"hibernate.connection.password=\n" +
+				"hibernate.default_catalog=TEST\n" +
+				"hibernate.default_schema=PUBLIC\n";
+		Files.writeString(hibernatePropertiesFile.toPath(), hibernatePropertiesFileContents);
+		assertTrue(hibernatePropertiesFile.exists());
+	}
+
+	private DefaultLogger getConsoleLogger() {
+		DefaultLogger consoleLogger = new DefaultLogger();
+		consoleLogger.setErrorPrintStream(System.err);
+		consoleLogger.setOutputPrintStream(System.out);
+		consoleLogger.setMessageOutputLevel(Project.MSG_INFO);
+		return consoleLogger;
+	}
+
+	private static final String buildXmlFileContents =
+			"""
+					<project name='tutorial' default='reveng'>                          \s
+						<taskdef                                                        \s
+								name='hibernatetool'                                    \s
+								classname='org.hibernate.tool.ant.HibernateToolTask'/>  \s
+						<target name='reveng'>                                          \s
+					@hibernateToolTaskXml@\
+						</target>                                                       \s
+					</project>                                                          \s
+					""";
+
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/TutorialTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/TutorialTest.java
new file mode 100644
index 000000000000..77dd7d2edd8a
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/TutorialTest.java
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+
+import org.junit.jupiter.api.Test;
+
+public class TutorialTest extends TestTemplate {
+
+	@Test
+	public void testTutorial() throws Exception {
+		setHibernateToolTaskXml(
+		"""
+						<hibernatetool destdir='generated-sources'>                         \s
+							<jdbcconfiguration propertyfile='hibernate.properties'/>\s
+							<hbm2java/>                                             \s
+						</hibernatetool>                                            \s
+				"""
+		);
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+		});
+		createProjectAndBuild();
+		assertFolderExists("generated-sources", 1);
+		assertFileExists("generated-sources/Person.java");
+	}
+
+
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/util/ExceptionUtilTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/util/ExceptionUtilTest.java
new file mode 100644
index 000000000000..1e0d6624279f
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/util/ExceptionUtilTest.java
@@ -0,0 +1,79 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant.util;
+
+import org.hibernate.boot.MappingNotFoundException;
+import org.hibernate.boot.jaxb.Origin;
+import org.hibernate.boot.jaxb.SourceType;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ExceptionUtilTest {
+
+	@Test
+	public void testNull() {
+		assertNull(ExceptionUtil.getProblemSolutionOrCause(null));
+	}
+
+	@Test
+	public void testMappingNotFoundException() {
+		Origin origin = new Origin(SourceType.RESOURCE, "com/example/Foo.hbm.xml");
+		MappingNotFoundException ex = new MappingNotFoundException(origin);
+		String result = ExceptionUtil.getProblemSolutionOrCause(ex);
+		assertNotNull(result);
+		assertTrue(result.contains("com/example/Foo.hbm.xml"));
+		assertTrue(result.contains("classpath"));
+	}
+
+	@Test
+	public void testClassNotFoundException() {
+		String result = ExceptionUtil.getProblemSolutionOrCause(new ClassNotFoundException("some.Class"));
+		assertNotNull(result);
+		assertTrue(result.contains("classpath"));
+	}
+
+	@Test
+	public void testNoClassDefFoundError() {
+		String result = ExceptionUtil.getProblemSolutionOrCause(new NoClassDefFoundError("some/Class"));
+		assertNotNull(result);
+		assertTrue(result.contains("classpath"));
+	}
+
+	@Test
+	public void testUnsupportedClassVersionError() {
+		String result = ExceptionUtil.getProblemSolutionOrCause(new UnsupportedClassVersionError("bad version"));
+		assertNotNull(result);
+		assertTrue(result.contains("JRE"));
+	}
+
+	@Test
+	public void testGenericExceptionWithNoCause() {
+		RuntimeException ex = new RuntimeException("generic");
+		assertNull(ExceptionUtil.getProblemSolutionOrCause(ex));
+	}
+
+	@Test
+	public void testNestedClassNotFoundException() {
+		RuntimeException wrapper = new RuntimeException("wrapper", new ClassNotFoundException("nested"));
+		String result = ExceptionUtil.getProblemSolutionOrCause(wrapper);
+		assertNotNull(result);
+		assertTrue(result.contains("classpath"));
+	}
+
+	@Test
+	public void testSelfReferencingCause() {
+		// Simulate a cause that references itself (cause == this)
+		RuntimeException ex = new RuntimeException("self") {
+			@Override
+			public synchronized Throwable getCause() {
+				return this;
+			}
+		};
+		assertNull(ExceptionUtil.getProblemSolutionOrCause(ex));
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/enhance/EnhancementTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/enhance/EnhancementTaskTest.java
index c643e49aecbb..f00884f90a44 100644
--- a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/enhance/EnhancementTaskTest.java
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/enhance/EnhancementTaskTest.java
@@ -4,346 +4,146 @@
  */
 package org.hibernate.tool.enhance;
 
-import org.apache.tools.ant.DefaultLogger;
+import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
-import org.hibernate.bytecode.enhance.spi.EnhancementInfo;
+import org.apache.tools.ant.types.FileSet;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.Files;
-import java.util.List;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class EnhancementTaskTest {
 
 	@TempDir
-	private File projectDir;
+	private File tempDir;
 
-	@BeforeEach
-	public void beforeEach() throws Exception {
-		copyJavFiles();
-		prepareDestFolder();
-	}
+	private Project antProject;
 
-	@Test
-	public void testEnhancementDefault() throws Exception {
-		// The default settings for the enhancement task are as follows:
-		//   enableLazyInitialization = 'true'
-		//   enableDirtyTracking = 'true'
-		//   enableAssociationManagement = 'false'
-		//   enableExtendedEnhancement = 'false'
-		// The files are read from folder 'dir' which needs to be a subfolder of 'base'
-		// The property 'base' is mandatory
-		// If 'dir' is not specified, a 'fileset' element can be used (see #testEnhancementFileSet)
-		String enhanceTag =
-				"<enhance base='${basedir}/dest' dir='${basedir}/dest'/>\n";
-		Project project = createProject(enhanceTag);
-		executeCompileTarget( project );
-		executeEnhanceTarget( project );
-		// Both Bar and Baz should be enhanced
-		assertTrue(isEnhanced( "Bar" ));
-		assertTrue(isEnhanced( "Baz" ));
-		// Both Bar and Baz contain the method '$$_hibernate_getInterceptor'
-		// because of the default setting of 'enableLazyInitialization'
-		assertTrue( methodIsPresentInClass("$$_hibernate_getInterceptor", "Bar"));
-		assertTrue( methodIsPresentInClass("$$_hibernate_getInterceptor", "Baz"));
-		// Both Bar and Baz contain the method '$$_hibernate_hasDirtyAttributes'
-		// because of the default setting of 'enableDirtyTracking'
-		assertTrue( methodIsPresentInClass("$$_hibernate_hasDirtyAttributes", "Bar"));
-		assertTrue( methodIsPresentInClass("$$_hibernate_hasDirtyAttributes", "Baz"));
-		// Foo is not an entity and extended enhancement is not enabled so the class is not enhanced
-		assertFalse(isEnhanced("Foo"));
-		// Association management should not be present
-		assertFalse(isAssociationManagementPresent());
+	@BeforeEach
+	public void setUp() {
+		antProject = new Project();
+		antProject.init();
 	}
 
 	@Test
-	public void testEnhancementFileSet() throws Exception {
-		// Use the defaults settings for enhancement (see #testEnhancementDefault)
-		// The property 'base' is mandatory
-		// The files are read from the specified 'fileset' element:
-		//   - the folder specified by 'dir'
-		//   - the 'Baz.class' file is excluded
-		String enhanceTag =
-				"<enhance base='${basedir}/dest'>\n" +
-				"  <fileset dir='${basedir}/dest'>\n" +
-				"    <exclude name='Baz.class' />\n" +
-				"  </fileset>\n" +
-				"</enhance>\n";
-		Project project = createProject(enhanceTag);
-		executeCompileTarget(project);
-		executeEnhanceTarget(project);
-		// Bar is enhanced
-		assertTrue(isEnhanced( "Bar" ));
-		// Baz is not enhanced because it was excluded from the file set
-		assertFalse(isEnhanced( "Baz" ));
-		// Foo is not enhanced because it is not an entity and extended enhancement was not enabled
-		assertFalse( isEnhanced( "Foo" ) );
-		// Association management should not be present
-		assertFalse(isAssociationManagementPresent());
+	public void testExecuteNoBaseThrows() {
+		EnhancementTask task = new EnhancementTask();
+		task.setProject(antProject);
+		// base is required
+		assertThrows(BuildException.class, task::execute);
 	}
 
 	@Test
-	public void testEnhancementNoLazyInitialization() throws Exception {
-		// Change the default setting for 'enableLazyInitialization' to 'false'
-		// Otherwise use the settings of #testEnhancementDefault
-		String enhanceTag =
-				"<enhance \n" +
-				"    base='${basedir}/dest'\n" +
-				"    dir='${basedir}/dest'\n" +
-				"    enableLazyInitialization='false'/>\n";
-		Project project = createProject(enhanceTag);
-		executeCompileTarget(project);
-		executeEnhanceTarget(project);
-		// Both Bar and Baz are enhanced, Foo is not
-		assertTrue( isEnhanced( "Bar" ));
-		assertTrue( isEnhanced( "Baz" ));
-		// Foo is not enhanced because it is not an entity and extended enhancement was not enabled
-		assertFalse( isEnhanced( "Foo" ) );
-		// but $$_hibernate_getInterceptor is not present in the enhanced classes
-		// because of the 'false' value of 'enableLazyInitialization'
-		assertFalse( methodIsPresentInClass("$$_hibernate_getInterceptor", "Bar"));
-		assertFalse( methodIsPresentInClass("$$_hibernate_getInterceptor", "Baz"));
-		// Association management should not be present
-		assertFalse(isAssociationManagementPresent());
+	public void testExecuteAllFeaturesDisabled() {
+		EnhancementTask task = new EnhancementTask();
+		task.setProject(antProject);
+		task.setBase(tempDir.getAbsolutePath());
+		task.setDir(tempDir.getAbsolutePath());
+		task.setEnableLazyInitialization(false);
+		task.setEnableDirtyTracking(false);
+		task.setEnableAssociationManagement(false);
+		task.setEnableExtendedEnhancement(false);
+		// Should skip because no features are enabled
+		assertDoesNotThrow(task::execute);
 	}
 
 	@Test
-	public void testEnhancementNoDirtyTracking() throws Exception {
-		// Change the default setting for 'enableDirtyTracking' to 'false'
-		// Otherwise use the settings of #testEnhancementDefault
-		String enhanceTag =
-				"<enhance \n" +
-				"    base='${basedir}/dest'\n" +
-				"    dir='${basedir}/dest'\n" +
-				"    enableDirtyTracking='false'/>\n";
-		Project project = createProject(enhanceTag);
-		executeCompileTarget(project);
-		executeEnhanceTarget(project);
-		// Both Bar and Baz should be enhanced
-		assertTrue( isEnhanced( "Bar" ));
-		assertTrue( isEnhanced( "Baz" ));
-		// Foo is not enhanced because it is not an entity and extended enhancement was not enabled
-		assertFalse( isEnhanced( "Foo" ) );
-		// $$_hibernate_hasDirtyAttributes is not present in the enhanced classes
-		// because of the 'false' value of 'enableLazyInitialization'
-		assertFalse( methodIsPresentInClass("$$_hibernate_hasDirtyAttributes", "Bar"));
-		assertFalse( methodIsPresentInClass("$$_hibernate_hasDirtyAttributes", "Baz"));
-		// Association management should not be present
-		assertFalse(isAssociationManagementPresent());
+	public void testExecuteDirNotSubdirectoryOfBase() {
+		EnhancementTask task = new EnhancementTask();
+		task.setProject(antProject);
+		task.setBase("/some/base");
+		task.setDir("/different/dir");
+		assertThrows(BuildException.class, task::execute);
 	}
 
 	@Test
-	public void testEnhancementEnableAssociationManagement() throws Exception {
-		// Change the default setting for 'enableAssociationManagement' to 'true'
-		// Otherwise use the settings of #testEnhancementDefault
-		String enhanceTag =
-				"<enhance \n" +
-				"    base='${basedir}/dest'\n" +
-				"    dir='${basedir}/dest'\n" +
-				"    enableAssociationManagement='true'/>\n";
-		Project project = createProject(enhanceTag);
-		executeCompileTarget(project);
-		executeEnhanceTarget(project);
-		// Both Bar and Baz are enhanced, Foo is not
-		assertTrue( isEnhanced( "Bar" ));
-		assertTrue( isEnhanced( "Baz" ));
-		assertFalse( isEnhanced( "Foo" ) );
-		// Now verify that the association management is in place;
-		assertTrue(isAssociationManagementPresent());
+	public void testExecuteDirDoesNotExist() {
+		EnhancementTask task = new EnhancementTask();
+		task.setProject(antProject);
+		String base = tempDir.getAbsolutePath();
+		task.setBase(base);
+		task.setDir(base + "/nonexistent");
+		// Should skip gracefully when dir doesn't exist
+		assertDoesNotThrow(task::execute);
 	}
 
 	@Test
-	public void testEnhancementEnableExtendedEnhancement() throws Exception {
-		// Change the default setting for 'enableExtendedEnhancement' to 'true'
-		// Otherwise use the settings of #testEnhancementDefault
-		String enhanceTag =
-				"<enhance \n" +
-				"    base='${basedir}/dest'\n" +
-				"    dir='${basedir}/dest'\n" +
-				"    enableExtendedEnhancement='true'/>\n";
-		Project project = createProject(enhanceTag);
-		executeCompileTarget(project);
-		executeEnhanceTarget(project);
-		// Both Bar and Baz are enhanced because they are entities
-		assertTrue( isEnhanced( "Bar" ));
-		assertTrue( isEnhanced( "Baz" ));
-		// Though Foo is not an entity, it is enhanced because of the setting of 'enableExtendedEnhancement'
-		assertTrue( isEnhanced( "Foo" ) );
-		// No association management is in place;
-		assertFalse(isAssociationManagementPresent());
+	public void testExecuteEmptyDir() {
+		EnhancementTask task = new EnhancementTask();
+		task.setProject(antProject);
+		String base = tempDir.getAbsolutePath();
+		File classesDir = new File(tempDir, "classes");
+		classesDir.mkdirs();
+		task.setBase(base);
+		task.setDir(classesDir.getAbsolutePath());
+		// Should skip because no .class files exist
+		assertDoesNotThrow(task::execute);
 	}
 
 	@Test
-	public void testNoEnhancement() throws Exception {
-		// Setting the values of all the settings to 'false' has the effect
-		// of not executing the enhancement at all.
-		// The setting of 'enableAssociationManagement' and 'enableExtendedEnhancement' to
-		// false is not really needed in this case as that's what their default is
-		String enhanceTag =
-				"<enhance \n" +
-				"    base='${basedir}/dest'\n" +
-				"    dir='${basedir}/dest'\n" +
-				"    enableLazyInitialization='false'\n" +
-				"    enableDirtyTracking='false'\n" +
-				"    enableAssociationManagement='false'\n" +
-				"    enableExtendedEnhancement='false'/>\n";
-		Project project = createProject(enhanceTag);
-		executeCompileTarget(project);
-		executeEnhanceTarget(project);
-		// None of the classes should be enhanced
-		assertFalse( isEnhanced( "Bar" ));
-		assertFalse( isEnhanced( "Baz" ));
-		assertFalse( isEnhanced( "Foo" ) );
-		// No association management is in place;
-		assertFalse(isAssociationManagementPresent());
-	}
-
-	private boolean isAssociationManagementPresent() throws Exception {
-		// Some dynamic programming
-		ClassLoader loader = getTestClassLoader();
-		// Obtain the class objects for 'Baz' and 'Bar'
-		Class<?> bazClass = loader.loadClass( "Baz" );
-		Class<?> barClass = loader.loadClass( "Bar" );
-		// Create an instance of both 'Baz' and 'Bar'
-		Object bazObject = bazClass.getDeclaredConstructor().newInstance();
-		Object barObject = barClass.getDeclaredConstructor().newInstance();
-		// Lookup the 'bars' field of class 'Baz' (an ArrayList of 'Bar' objects)
-		Field bazBarsField = bazClass.getDeclaredField( "bars" );
-		bazBarsField.setAccessible( true );
-		// Obtain the 'bars' list of the 'Baz' object; it should be empty
-		List<?> bazBarsList = (List<?>) bazBarsField.get( bazObject );   // baz.bars
-		assertTrue(bazBarsList.isEmpty());
-		// Lookup the 'setBaz' method of class 'Bar' and invoke it on the 'Bar' object
-		Method barSetBazMethod = barClass.getDeclaredMethod( "setBaz", new Class[] { bazClass } );
-		barSetBazMethod.invoke( barObject, bazObject );                  // bar.setBaz(baz)
-		// Reobtain the 'bars' list of the 'Baz' object
-		bazBarsList = (List<?>) bazBarsField.get( bazObject );
-		// If there is association management, the 'bars' list should contain the 'Bar' object
-		return bazBarsList.contains( barObject );                        // baz.bars.contains(bar)
-	}
-
-	private Project createProject(String enhanceTag) throws Exception {
-		File buildXmlFile = createBuildXmlFile(enhanceTag);
-		Project result = new Project();
-		result.setBaseDir(projectDir);
-		result.addBuildListener(createConsoleLogger());
-		ProjectHelper.getProjectHelper().parse(result, buildXmlFile);
-		return result;
-	}
-
-	private void executeCompileTarget(Project project) {
-		// The class files should not exist
-		assertFalse(fileExists("dest/Bar.class"));
-		assertFalse(fileExists("dest/Baz.class"));
-		assertFalse(fileExists("dest/Foo.class"));
-		// Execute the 'compile' target
-		project.executeTarget( "compile" );
-		// The class files should exist now
-		assertTrue( fileExists( "dest/Bar.class" ) );
-		assertTrue( fileExists( "dest/Baz.class" ) );
-		assertTrue( fileExists( "dest/Foo.class" ) );
-	}
-
-	private void executeEnhanceTarget(Project project) throws Exception {
-		// The class files should not be enhanced at this point
-		assertFalse( isEnhanced( "Bar" ));
-		assertFalse( isEnhanced( "Baz" ));
-		assertFalse( isEnhanced( "Foo" ));
-		// Execute the 'enhance' target
-		project.executeTarget( "enhance" );
-		// The results are verified in the respective tests
-	}
-
-	private File createBuildXmlFile(String enhanceTag) throws Exception {
-		File result = new File( projectDir, "build.xml" );
-		assertFalse(result.exists());
-		Files.writeString(
-				result.toPath(),
-				BUILD_XML_TEMPLATE.replace( "@enhanceTag@", enhanceTag ) );
-		assertTrue( result.exists() );
-		assertTrue(result.isFile());
-		return result;
-	}
-
-	private DefaultLogger createConsoleLogger() {
-		DefaultLogger consoleLogger = new DefaultLogger();
-		consoleLogger.setErrorPrintStream(System.err);
-		consoleLogger.setOutputPrintStream(System.out);
-		consoleLogger.setMessageOutputLevel(Project.MSG_INFO);
-		return consoleLogger;
-	}
-
-	private boolean fileExists(String relativePath) {
-		return new File( projectDir, relativePath ).exists();
-	}
-
-	private void prepareDestFolder() {
-		File destFolder = new File(projectDir, "dest");
-		assertFalse( destFolder.exists() );
-		assertTrue( destFolder.mkdir() );
-		assertTrue( destFolder.exists() );
-		assertTrue( destFolder.isDirectory() );
-	}
-
-	private boolean isEnhanced(String className) throws Exception {
-		return getTestClassLoader().loadClass( className ).isAnnotationPresent( EnhancementInfo.class );
-	}
-
-	private boolean methodIsPresentInClass(String methodName, String className) throws Exception {
-		Class<?> classToCheck = getTestClassLoader().loadClass( className );
-		try {
-			Object m = classToCheck.getMethod( methodName, new Class[] {} );
-			return true;
-		} catch (NoSuchMethodException e) {
-			return false;
+	public void testExecuteWithClassFiles() throws IOException {
+		EnhancementTask task = new EnhancementTask();
+		task.setProject(antProject);
+		String base = tempDir.getAbsolutePath();
+		File classesDir = new File(tempDir, "com/example");
+		classesDir.mkdirs();
+		// Create a dummy .class file (won't be valid bytecode, so enhancement will fail)
+		File dummyClass = new File(classesDir, "Dummy.class");
+		try (FileOutputStream fos = new FileOutputStream(dummyClass)) {
+			fos.write(new byte[]{(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE});
 		}
+		task.setBase(base);
+		task.setDir(base);
+		task.setFailOnError(false); // Don't fail on invalid class file
+		// Should attempt enhancement but handle errors gracefully
+		assertDoesNotThrow(task::execute);
 	}
 
-	private ClassLoader getTestClassLoader() throws Exception {
-		return new URLClassLoader( new URL[] { new File(projectDir, "dest").toURI().toURL() } );
+	@Test
+	public void testFilesetAndDirConflict() {
+		EnhancementTask task = new EnhancementTask();
+		task.setProject(antProject);
+		task.setBase(tempDir.getAbsolutePath());
+		task.setDir(tempDir.getAbsolutePath());
+		FileSet fs = new FileSet();
+		fs.setProject(antProject);
+		fs.setDir(tempDir);
+		task.addFileset(fs);
+		assertThrows(BuildException.class, task::execute);
 	}
 
-	private void copyJavFiles() throws Exception {
-		File srcDir = new File(projectDir, "src");
-		srcDir.mkdir();
-		String[] javFileNames = {"Bar.jav_", "Baz.jav_", "Foo.jav_"};
-		for (String javFileName : javFileNames) {
-			copyJavFile( javFileName, srcDir );
-		}
+	@Test
+	public void testFilesetEmptySourceSet() {
+		EnhancementTask task = new EnhancementTask();
+		task.setProject(antProject);
+		task.setBase(tempDir.getAbsolutePath());
+		// dir is null, so fileset path is taken
+		File emptyDir = new File(tempDir, "empty");
+		emptyDir.mkdirs();
+		FileSet fs = new FileSet();
+		fs.setProject(antProject);
+		fs.setDir(emptyDir);
+		fs.setIncludes("**/*.class");
+		task.addFileset(fs);
+		// No .class files => skips gracefully
+		assertDoesNotThrow(task::execute);
 	}
 
-	private void copyJavFile(String javFileName, File toFolder) throws Exception {
-		URL url = getClass().getClassLoader().getResource( javFileName );
-		assert url != null;
-		File source = new File(url.toURI());
-		File destination = new File(toFolder, javFileName.replace( '_', 'a' ));
-		assertTrue(source.exists());
-		assertTrue(source.isFile());
-		Files.copy(source.toPath(), destination.toPath());
-		assertTrue(destination.exists());
-		assertTrue(destination.isFile());
+	@Test
+	public void testSetters() {
+		EnhancementTask task = new EnhancementTask();
+		task.setBase("/tmp/base");
+		task.setDir("/tmp/base/classes");
+		task.setFailOnError(true);
+		task.setEnableLazyInitialization(true);
+		task.setEnableDirtyTracking(true);
+		task.setEnableAssociationManagement(true);
+		task.setEnableExtendedEnhancement(true);
 	}
-
-	private static String BUILD_XML_TEMPLATE =
-			"<project>\n" +
-			"  <taskdef \n" +
-			"      name='enhance'\n" +
-			"      classname='org.hibernate.tool.enhance.EnhancementTask'/>\n" +
-			"  <target name='compile'>\n" +
-			"    <javac srcdir='src' destdir='dest' includeantruntime='true' />\n" +
-			"  </target>\n" +
-			"  <target name='enhance'>\n" +
-			"    @enhanceTag@\n" +
-			"  </target>\n" +
-			"</project>";
 }
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ColumnMetadataTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ColumnMetadataTest.java
new file mode 100644
index 000000000000..b1bc2a96b988
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ColumnMetadataTest.java
@@ -0,0 +1,52 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ColumnMetadataTest {
+
+	@Test
+	public void testColumnMetadata() throws Exception {
+		try (Connection conn = DriverManager.getConnection("jdbc:h2:mem:col_meta_test", "sa", "");
+			Statement stmt = conn.createStatement()) {
+			stmt.execute("CREATE TABLE COL_TEST (ID INT PRIMARY KEY, NAME VARCHAR(50) NOT NULL, PRICE DECIMAL(10,2))");
+
+			// Test VARCHAR column
+			ResultSet rs = conn.getMetaData().getColumns(null, "PUBLIC", "COL_TEST", "NAME");
+			assertTrue(rs.next());
+			ColumnMetadata nameCol = new ColumnMetadata(rs);
+			rs.close();
+
+			assertEquals("NAME", nameCol.getName());
+			assertNotNull(nameCol.getTypeName());
+			assertEquals(50, nameCol.getColumnSize());
+			assertEquals("NO", nameCol.getNullable());
+			assertTrue(nameCol.toString().contains("NAME"));
+
+			// Test DECIMAL column
+			rs = conn.getMetaData().getColumns(null, "PUBLIC", "COL_TEST", "PRICE");
+			assertTrue(rs.next());
+			ColumnMetadata priceCol = new ColumnMetadata(rs);
+			rs.close();
+
+			assertEquals("PRICE", priceCol.getName());
+			assertEquals(10, priceCol.getColumnSize());
+			assertEquals(2, priceCol.getDecimalDigits());
+			assertTrue(priceCol.getTypeCode() != 0);
+
+			stmt.execute("DROP TABLE COL_TEST");
+		}
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/DatabaseExporterTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/DatabaseExporterTest.java
new file mode 100644
index 000000000000..3c5594d9a867
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/DatabaseExporterTest.java
@@ -0,0 +1,46 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SuppressWarnings("deprecation")
+public class DatabaseExporterTest {
+
+	@Test
+	public void testExportAndRelease() throws Exception {
+		String url = "jdbc:h2:mem:db_exporter_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1";
+		Connection conn = DriverManager.getConnection(url, "sa", "");
+		SqlExceptionHelper sqlHelper = new SqlExceptionHelper(true);
+		SuppliedConnectionHelper connHelper = new SuppliedConnectionHelper(conn, sqlHelper);
+
+		DatabaseExporter exporter = new DatabaseExporter(connHelper, sqlHelper);
+		assertTrue(exporter.acceptsImportScripts());
+
+		// Execute a DDL statement
+		assertDoesNotThrow(() -> exporter.export("CREATE TABLE test_export (id INT PRIMARY KEY)"));
+
+		// Verify table was created
+		try (Statement stmt = conn.createStatement();
+			ResultSet rs = stmt.executeQuery("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'TEST_EXPORT'")) {
+			rs.next();
+			assertTrue(rs.getInt(1) > 0);
+		}
+
+		// Execute a statement that produces warnings (H2 doesn't easily produce warnings, but we test the path)
+		assertDoesNotThrow(() -> exporter.export("CREATE TABLE test_export2 (id INT PRIMARY KEY)"));
+
+		exporter.release();
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/DeprecatedExtractorsTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/DeprecatedExtractorsTest.java
new file mode 100644
index 000000000000..1464d7e18cf6
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/DeprecatedExtractorsTest.java
@@ -0,0 +1,38 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor;
+import org.hibernate.tool.schema.internal.script.SingleLineSqlScriptExtractor;
+import org.hibernate.tool.schema.internal.script.SqlScriptExtractorInitiator;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@SuppressWarnings("deprecation")
+public class DeprecatedExtractorsTest {
+
+	@Test
+	public void testSingleLineSqlCommandExtractor() {
+		SingleLineSqlCommandExtractor extractor = new SingleLineSqlCommandExtractor();
+		assertNotNull(extractor);
+		assertInstanceOf(SingleLineSqlScriptExtractor.class, extractor);
+	}
+
+	@Test
+	public void testMultipleLinesSqlCommandExtractor() {
+		MultipleLinesSqlCommandExtractor extractor = new MultipleLinesSqlCommandExtractor();
+		assertNotNull(extractor);
+		assertInstanceOf(MultiLineSqlScriptExtractor.class, extractor);
+	}
+
+	@Test
+	public void testImportSqlCommandExtractorInitiator() {
+		ImportSqlCommandExtractorInitiator initiator = new ImportSqlCommandExtractorInitiator();
+		assertNotNull(initiator);
+		assertInstanceOf(SqlScriptExtractorInitiator.class, initiator);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/FileExporterTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/FileExporterTest.java
new file mode 100644
index 000000000000..05119020e824
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/FileExporterTest.java
@@ -0,0 +1,30 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Files;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class FileExporterTest {
+
+	@Test
+	public void testExportAndRelease(@TempDir File tempDir) throws Exception {
+		File outputFile = new File(tempDir, "output.sql");
+		FileExporter exporter = new FileExporter(outputFile.getAbsolutePath());
+		assertFalse(exporter.acceptsImportScripts());
+		exporter.export("CREATE TABLE test (id INT)");
+		exporter.export("CREATE TABLE test2 (id INT)");
+		exporter.release();
+		String content = new String(Files.readAllBytes(outputFile.toPath()));
+		assertTrue(content.contains("CREATE TABLE test (id INT)"));
+		assertTrue(content.contains("CREATE TABLE test2 (id INT)"));
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ForeignKeyMetadataTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ForeignKeyMetadataTest.java
new file mode 100644
index 000000000000..34007bb806fe
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ForeignKeyMetadataTest.java
@@ -0,0 +1,138 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.PrimaryKey;
+import org.hibernate.mapping.Table;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SuppressWarnings("deprecation")
+public class ForeignKeyMetadataTest {
+
+	@Test
+	public void testConstructorAndGetters() throws Exception {
+		String url = "jdbc:h2:mem:fk_metadata_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1";
+		try (Connection conn = DriverManager.getConnection(url, "sa", "")) {
+			try (Statement stmt = conn.createStatement()) {
+				stmt.execute("CREATE TABLE parent_t (id INT PRIMARY KEY)");
+				stmt.execute("CREATE TABLE child_t (id INT PRIMARY KEY, parent_id INT, " +
+						"CONSTRAINT fk_parent FOREIGN KEY (parent_id) REFERENCES parent_t(id))");
+			}
+			try (ResultSet rs = conn.getMetaData().getImportedKeys(null, null, "CHILD_T")) {
+				assertTrue(rs.next());
+				ForeignKeyMetadata fkMeta = new ForeignKeyMetadata(rs);
+				assertEquals("FK_PARENT", fkMeta.getName());
+				assertEquals("PARENT_T", fkMeta.getReferencedTableName());
+				assertEquals("ForeignKeyMetadata(FK_PARENT)", fkMeta.toString());
+				fkMeta.addReference(rs);
+			}
+		}
+	}
+
+	@Test
+	public void testMatchesWithPrimaryKeyReference() throws Exception {
+		String url = "jdbc:h2:mem:fk_match_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1";
+		try (Connection conn = DriverManager.getConnection(url, "sa", "")) {
+			try (Statement stmt = conn.createStatement()) {
+				stmt.execute("CREATE TABLE ref_table (id INT PRIMARY KEY)");
+				stmt.execute("CREATE TABLE fk_table (id INT PRIMARY KEY, ref_id INT, " +
+						"CONSTRAINT fk_ref FOREIGN KEY (ref_id) REFERENCES ref_table(id))");
+			}
+			ForeignKeyMetadata fkMeta;
+			try (ResultSet rs = conn.getMetaData().getImportedKeys(null, null, "FK_TABLE")) {
+				assertTrue(rs.next());
+				fkMeta = new ForeignKeyMetadata(rs);
+				fkMeta.addReference(rs);
+			}
+
+			// Build a matching ForeignKey mapping object
+			Table refTable = new Table("orm", "REF_TABLE");
+			Column pkCol = new Column("ID");
+			PrimaryKey pk = new PrimaryKey(refTable);
+			pk.addColumn(pkCol);
+			refTable.setPrimaryKey(pk);
+
+			Table fkTable = new Table("orm", "FK_TABLE");
+			Column fkCol = new Column("REF_ID");
+			ForeignKey fk = new ForeignKey();
+			fk.setTable(fkTable);
+			fk.setReferencedTable(refTable);
+			fk.addColumn(fkCol);
+
+			assertTrue(fkMeta.matches(fk));
+		}
+	}
+
+	@Test
+	public void testMatchesWrongTable() throws Exception {
+		String url = "jdbc:h2:mem:fk_nomatch_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1";
+		try (Connection conn = DriverManager.getConnection(url, "sa", "")) {
+			try (Statement stmt = conn.createStatement()) {
+				stmt.execute("CREATE TABLE tbl_a (id INT PRIMARY KEY)");
+				stmt.execute("CREATE TABLE tbl_b (id INT PRIMARY KEY, a_id INT, " +
+						"CONSTRAINT fk_a FOREIGN KEY (a_id) REFERENCES tbl_a(id))");
+			}
+			ForeignKeyMetadata fkMeta;
+			try (ResultSet rs = conn.getMetaData().getImportedKeys(null, null, "TBL_B")) {
+				assertTrue(rs.next());
+				fkMeta = new ForeignKeyMetadata(rs);
+				fkMeta.addReference(rs);
+			}
+
+			// ForeignKey pointing to a different table
+			Table wrongTable = new Table("orm", "WRONG_TABLE");
+			ForeignKey fk = new ForeignKey();
+			fk.setTable(new Table("orm", "TBL_B"));
+			fk.setReferencedTable(wrongTable);
+			fk.addColumn(new Column("A_ID"));
+
+			assertFalse(fkMeta.matches(fk));
+		}
+	}
+
+	@Test
+	public void testMatchesWrongColumnCount() throws Exception {
+		String url = "jdbc:h2:mem:fk_colcount_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1";
+		try (Connection conn = DriverManager.getConnection(url, "sa", "")) {
+			try (Statement stmt = conn.createStatement()) {
+				stmt.execute("CREATE TABLE cc_parent (id INT PRIMARY KEY)");
+				stmt.execute("CREATE TABLE cc_child (id INT PRIMARY KEY, pid INT, " +
+						"CONSTRAINT fk_cc FOREIGN KEY (pid) REFERENCES cc_parent(id))");
+			}
+			ForeignKeyMetadata fkMeta;
+			try (ResultSet rs = conn.getMetaData().getImportedKeys(null, null, "CC_CHILD")) {
+				assertTrue(rs.next());
+				fkMeta = new ForeignKeyMetadata(rs);
+				fkMeta.addReference(rs);
+			}
+
+			// ForeignKey with 2 columns instead of 1
+			Table refTable = new Table("orm", "CC_PARENT");
+			PrimaryKey pk = new PrimaryKey(refTable);
+			pk.addColumn(new Column("ID"));
+			pk.addColumn(new Column("ID2"));
+			refTable.setPrimaryKey(pk);
+
+			ForeignKey fk = new ForeignKey();
+			fk.setTable(new Table("orm", "CC_CHILD"));
+			fk.setReferencedTable(refTable);
+			fk.addColumn(new Column("PID"));
+			fk.addColumn(new Column("PID2"));
+
+			assertFalse(fkMeta.matches(fk));
+		}
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ImportScriptExceptionTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ImportScriptExceptionTest.java
new file mode 100644
index 000000000000..6361abe6bbe1
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ImportScriptExceptionTest.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class ImportScriptExceptionTest {
+
+	@Test
+	public void testMessageConstructor() {
+		ImportScriptException ex = new ImportScriptException("import failed");
+		assertEquals("import failed", ex.getMessage());
+	}
+
+	@Test
+	public void testMessageAndCauseConstructor() {
+		RuntimeException cause = new RuntimeException("root cause");
+		ImportScriptException ex = new ImportScriptException("import failed", cause);
+		assertEquals("import failed", ex.getMessage());
+		assertNotNull(ex.getCause());
+		assertEquals("root cause", ex.getCause().getMessage());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/IndexMetadataTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/IndexMetadataTest.java
new file mode 100644
index 000000000000..a5fc7cb13fc6
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/IndexMetadataTest.java
@@ -0,0 +1,60 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class IndexMetadataTest {
+
+	@Test
+	public void testIndexMetadata() throws Exception {
+		try (Connection conn = DriverManager.getConnection("jdbc:h2:mem:idx_meta_test", "sa", "");
+			Statement stmt = conn.createStatement()) {
+			stmt.execute("CREATE TABLE IDX_TEST (ID INT PRIMARY KEY, NAME VARCHAR(50))");
+			stmt.execute("CREATE INDEX IDX_NAME ON IDX_TEST(NAME)");
+
+			ResultSet rs = conn.getMetaData().getIndexInfo(null, "PUBLIC", "IDX_TEST", false, true);
+			IndexMetadata idx = null;
+			while (rs.next()) {
+				String indexName = rs.getString("INDEX_NAME");
+				if ("IDX_NAME".equals(indexName)) {
+					idx = new IndexMetadata(rs);
+					break;
+				}
+			}
+			rs.close();
+
+			assertNotNull(idx);
+			assertEquals("IDX_NAME", idx.getName());
+			assertTrue(idx.toString().contains("IDX_NAME"));
+			assertEquals(0, idx.getColumns().length);
+
+			// Test addColumn
+			ResultSet colRs = conn.getMetaData().getColumns(null, "PUBLIC", "IDX_TEST", "NAME");
+			assertTrue(colRs.next());
+			ColumnMetadata col = new ColumnMetadata(colRs);
+			colRs.close();
+
+			idx.addColumn(col);
+			assertEquals(1, idx.getColumns().length);
+			assertEquals("NAME", idx.getColumns()[0].getName());
+
+			// addColumn with null should be a no-op
+			idx.addColumn(null);
+			assertEquals(1, idx.getColumns().length);
+
+			stmt.execute("DROP TABLE IDX_TEST");
+		}
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelperTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelperTest.java
new file mode 100644
index 000000000000..a61093561d8f
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelperTest.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SuppressWarnings("deprecation")
+public class ManagedProviderConnectionHelperTest {
+
+	private Properties h2Properties() {
+		Properties props = new Properties();
+		props.setProperty("hibernate.connection.driver_class", "org.h2.Driver");
+		props.setProperty("hibernate.connection.url",
+				"jdbc:h2:mem:managed_helper_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1");
+		props.setProperty("hibernate.connection.username", "sa");
+		props.setProperty("hibernate.connection.password", "");
+		props.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+		return props;
+	}
+
+	@Test
+	public void testPrepareAndGetConnection() throws SQLException {
+		ManagedProviderConnectionHelper helper = new ManagedProviderConnectionHelper(h2Properties());
+		helper.prepare(false);
+		Connection conn = helper.getConnection();
+		assertNotNull(conn);
+		helper.release();
+	}
+
+	@Test
+	public void testPrepareWithAutoCommit() throws SQLException {
+		ManagedProviderConnectionHelper helper = new ManagedProviderConnectionHelper(h2Properties());
+		helper.prepare(true);
+		Connection conn = helper.getConnection();
+		assertNotNull(conn);
+		assertTrue(conn.getAutoCommit());
+		helper.release();
+	}
+
+	@Test
+	public void testReleaseWithoutPrepare() throws SQLException {
+		ManagedProviderConnectionHelper helper = new ManagedProviderConnectionHelper(h2Properties());
+		// release without prepare should not throw (connection and serviceRegistry are null)
+		helper.release();
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTaskExportTypeTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTaskExportTypeTest.java
new file mode 100644
index 000000000000..5d66c9c86cec
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTaskExportTypeTest.java
@@ -0,0 +1,56 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.hibernate.tool.schema.Action;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SchemaExportTaskExportTypeTest {
+
+	@Test
+	public void testInterpretDropOnly() {
+		SchemaExportTask.ExportType type = SchemaExportTask.ExportType.interpret(true, false);
+		assertEquals(SchemaExportTask.ExportType.DROP, type);
+		assertTrue(type.doDrop());
+		assertFalse(type.doCreate());
+		assertEquals(Action.DROP, type.getAction());
+	}
+
+	@Test
+	public void testInterpretCreateOnly() {
+		SchemaExportTask.ExportType type = SchemaExportTask.ExportType.interpret(false, true);
+		assertEquals(SchemaExportTask.ExportType.CREATE, type);
+		assertFalse(type.doDrop());
+		assertTrue(type.doCreate());
+		assertEquals(Action.CREATE_ONLY, type.getAction());
+	}
+
+	@Test
+	public void testInterpretBoth() {
+		SchemaExportTask.ExportType type = SchemaExportTask.ExportType.interpret(false, false);
+		assertEquals(SchemaExportTask.ExportType.BOTH, type);
+		assertTrue(type.doDrop());
+		assertTrue(type.doCreate());
+		assertEquals(Action.CREATE, type.getAction());
+	}
+
+	@Test
+	public void testNoneAction() {
+		assertEquals(Action.NONE, SchemaExportTask.ExportType.NONE.getAction());
+		assertFalse(SchemaExportTask.ExportType.NONE.doCreate());
+		assertFalse(SchemaExportTask.ExportType.NONE.doDrop());
+	}
+
+	@Test
+	public void testInterpretDropTakesPrecedence() {
+		// When both drop and create are true, drop takes precedence
+		SchemaExportTask.ExportType type = SchemaExportTask.ExportType.interpret(true, true);
+		assertEquals(SchemaExportTask.ExportType.DROP, type);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTaskSettersTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTaskSettersTest.java
new file mode 100644
index 000000000000..d0488a8f37eb
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTaskSettersTest.java
@@ -0,0 +1,117 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.FileSet;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class SchemaExportTaskSettersTest {
+
+	@TempDir
+	private File tempDir;
+
+	@Test
+	public void testSetPropertiesValid() throws IOException {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setProject(new Project());
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Properties props = new Properties();
+		props.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+		try (FileOutputStream fos = new FileOutputStream(propsFile)) {
+			props.store(fos, null);
+		}
+		task.setProperties(propsFile);
+	}
+
+	@Test
+	public void testSetPropertiesNonExistent() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setProject(new Project());
+		assertThrows(BuildException.class,
+				() -> task.setProperties(new File("/nonexistent/hibernate.properties")));
+	}
+
+	@Test
+	public void testSetConfig() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setConfig(new File("/tmp/hibernate.cfg.xml"));
+	}
+
+	@Test
+	public void testSetQuiet() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setQuiet(true);
+	}
+
+	@Test
+	public void testSetText() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setText(true);
+	}
+
+	@Test
+	public void testSetDrop() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setDrop(true);
+	}
+
+	@Test
+	public void testSetCreate() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setCreate(true);
+	}
+
+	@Test
+	public void testSetDelimiter() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setDelimiter(";");
+	}
+
+	@Test
+	public void testSetOutput() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setOutput(new File("/tmp/output.sql"));
+	}
+
+	@Test
+	public void testSetHaltonerror() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setHaltonerror(true);
+	}
+
+	@Test
+	public void testSetNamingStrategyDeprecated() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setNamingStrategy("org.example.Strategy");
+	}
+
+	@Test
+	public void testSetImplicitNamingStrategy() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setImplicitNamingStrategy("org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl");
+	}
+
+	@Test
+	public void testSetPhysicalNamingStrategy() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setPhysicalNamingStrategy("org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl");
+	}
+
+	@Test
+	public void testAddFileset() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.addFileset(new FileSet());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTaskTest.java
new file mode 100644
index 000000000000..7182c4810438
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTaskTest.java
@@ -0,0 +1,105 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class SchemaExportTaskTest {
+
+	@TempDir
+	private File tempDir;
+
+	private Project antProject;
+
+	@BeforeEach
+	public void setUp() {
+		antProject = new Project();
+		antProject.setProperty("hibernate.connection.driver_class", "org.h2.Driver");
+		antProject.setProperty("hibernate.connection.url",
+				"jdbc:h2:mem:schema_export_test_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1");
+		antProject.setProperty("hibernate.connection.username", "sa");
+		antProject.setProperty("hibernate.connection.password", "");
+		antProject.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+	}
+
+	@Test
+	public void testExecuteTextOnlyCreate() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setProject(antProject);
+		task.setText(true);
+		task.setQuiet(true);
+		task.setCreate(true);
+		task.setDelimiter(";");
+		assertDoesNotThrow(task::execute);
+	}
+
+	@Test
+	public void testExecuteTextOnlyDrop() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setProject(antProject);
+		task.setText(true);
+		task.setQuiet(true);
+		task.setDrop(true);
+		task.setDelimiter(";");
+		assertDoesNotThrow(task::execute);
+	}
+
+	@Test
+	public void testExecuteWithOutputFile() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setProject(antProject);
+		task.setText(true);
+		task.setQuiet(true);
+		task.setDelimiter(";");
+		task.setCreate(true);
+		File output = new File(tempDir, "schema.sql");
+		task.setOutput(output);
+		assertDoesNotThrow(task::execute);
+	}
+
+	@Test
+	public void testExecuteExportToDatabase() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setProject(antProject);
+		task.setQuiet(true);
+		task.setCreate(true);
+		task.setDelimiter(";");
+		assertDoesNotThrow(task::execute);
+	}
+
+	@Test
+	public void testSetPropertiesNonExistent() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setProject(antProject);
+		assertThrows(BuildException.class,
+				() -> task.setProperties(new File("/nonexistent/hibernate.properties")));
+	}
+
+	@Test
+	public void testSetters() {
+		SchemaExportTask task = new SchemaExportTask();
+		task.setProject(antProject);
+		task.setConfig(new File("/tmp/hibernate.cfg.xml"));
+		task.setQuiet(true);
+		task.setText(true);
+		task.setDrop(true);
+		task.setCreate(true);
+		task.setDelimiter(";");
+		task.setHaltonerror(true);
+		task.setImplicitNamingStrategy("org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl");
+		task.setPhysicalNamingStrategy("org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl");
+		// setNamingStrategy is deprecated, just logs a warning
+		task.setNamingStrategy("ignored");
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateCommandTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateCommandTest.java
new file mode 100644
index 000000000000..fb42f2e583ef
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateCommandTest.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SchemaUpdateCommandTest {
+
+	@Test
+	public void testGetters() {
+		SchemaUpdateCommand cmd = new SchemaUpdateCommand("CREATE TABLE foo (id INT)", false);
+		assertEquals("CREATE TABLE foo (id INT)", cmd.getSql());
+		assertFalse(cmd.isQuiet());
+	}
+
+	@Test
+	public void testQuietMode() {
+		SchemaUpdateCommand cmd = new SchemaUpdateCommand("DROP TABLE bar", true);
+		assertEquals("DROP TABLE bar", cmd.getSql());
+		assertTrue(cmd.isQuiet());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTaskSettersTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTaskSettersTest.java
new file mode 100644
index 000000000000..082874c1365f
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTaskSettersTest.java
@@ -0,0 +1,118 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.FileSet;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SchemaUpdateTaskSettersTest {
+
+	@TempDir
+	private File tempDir;
+
+	@Test
+	public void testSetText() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		task.setText(false);
+	}
+
+	@Test
+	public void testSetQuiet() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		task.setQuiet(true);
+	}
+
+	@Test
+	public void testSetConfig() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		File cfg = new File("/tmp/hibernate.cfg.xml");
+		task.setConfig(cfg);
+	}
+
+	@Test
+	public void testSetPropertiesNonExistent() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		task.setProject(new Project());
+		assertThrows(BuildException.class,
+				() -> task.setProperties(new File("/nonexistent/hibernate.properties")));
+	}
+
+	@Test
+	public void testSetPropertiesValid() throws IOException {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		task.setProject(new Project());
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Properties props = new Properties();
+		props.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+		try (FileOutputStream fos = new FileOutputStream(propsFile)) {
+			props.store(fos, null);
+		}
+		task.setProperties(propsFile);
+	}
+
+	@Test
+	public void testAddFileset() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		task.addFileset(new FileSet());
+	}
+
+	@Test
+	public void testOutputFile() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		assertNull(task.getOutputFile());
+		File f = new File("/tmp/update.sql");
+		task.setOutputFile(f);
+		assertEquals(f, task.getOutputFile());
+	}
+
+	@Test
+	public void testHaltOnError() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		assertFalse(task.isHaltOnError());
+		task.setHaltOnError(true);
+		assertTrue(task.isHaltOnError());
+	}
+
+	@Test
+	public void testDelimiter() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		assertNull(task.getDelimiter());
+		task.setDelimiter(";");
+		assertEquals(";", task.getDelimiter());
+	}
+
+	@Test
+	public void testSetNamingStrategy() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		// deprecated, just logs
+		task.setNamingStrategy("ignored");
+	}
+
+	@Test
+	public void testSetImplicitNamingStrategy() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		task.setImplicitNamingStrategy("org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl");
+	}
+
+	@Test
+	public void testSetPhysicalNamingStrategy() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		task.setPhysicalNamingStrategy("org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl");
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTaskTest.java
new file mode 100644
index 000000000000..bce435424dfb
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateTaskTest.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.apache.tools.ant.Project;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SchemaUpdateTaskTest {
+
+	@TempDir
+	private File tempDir;
+
+	private Project antProject;
+
+	@BeforeEach
+	public void setUp() {
+		antProject = new Project();
+		antProject.setProperty("hibernate.connection.driver_class", "org.h2.Driver");
+		antProject.setProperty("hibernate.connection.url",
+				"jdbc:h2:mem:schema_update_test_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1");
+		antProject.setProperty("hibernate.connection.username", "sa");
+		antProject.setProperty("hibernate.connection.password", "");
+		antProject.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+	}
+
+	@Test
+	public void testExecuteTextOnly() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		task.setProject(antProject);
+		task.setText(true);
+		task.setQuiet(true);
+		File output = new File(tempDir, "update.sql");
+		task.setOutputFile(output);
+		task.setDelimiter(";");
+		assertDoesNotThrow(task::execute);
+	}
+
+	@Test
+	public void testGettersSetters() {
+		SchemaUpdateTask task = new SchemaUpdateTask();
+		task.setProject(antProject);
+
+		File output = new File(tempDir, "out.sql");
+		task.setOutputFile(output);
+		assertEquals(output, task.getOutputFile());
+
+		task.setHaltOnError(true);
+		assertTrue(task.isHaltOnError());
+		task.setHaltOnError(false);
+		assertFalse(task.isHaltOnError());
+
+		task.setDelimiter(";;");
+		assertEquals(";;", task.getDelimiter());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaValidatorCommandLineArgsTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaValidatorCommandLineArgsTest.java
new file mode 100644
index 000000000000..cd9d0bcba64e
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaValidatorCommandLineArgsTest.java
@@ -0,0 +1,109 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Method;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests SchemaValidator.CommandLineArgs via reflection since it is a private inner class.
+ */
+public class SchemaValidatorCommandLineArgsTest {
+
+	@Test
+	public void testParseEmpty() throws Exception {
+		Object args = parseArgs(new String[]{});
+		assertNull(getField(args, "propertiesFile"));
+		assertNull(getField(args, "cfgXmlFile"));
+		assertNull(getField(args, "implicitNamingStrategy"));
+		assertNull(getField(args, "physicalNamingStrategy"));
+		assertTrue(((java.util.List<?>) getField(args, "hbmXmlFiles")).isEmpty());
+		assertTrue(((java.util.List<?>) getField(args, "jarFiles")).isEmpty());
+	}
+
+	@Test
+	public void testParseProperties() throws Exception {
+		Object args = parseArgs(new String[]{"--properties=/tmp/hibernate.properties"});
+		assertEquals("/tmp/hibernate.properties", getField(args, "propertiesFile"));
+	}
+
+	@Test
+	public void testParseConfig() throws Exception {
+		Object args = parseArgs(new String[]{"--config=/tmp/hibernate.cfg.xml"});
+		assertEquals("/tmp/hibernate.cfg.xml", getField(args, "cfgXmlFile"));
+	}
+
+	@Test
+	public void testParseImplicitNaming() throws Exception {
+		Object args = parseArgs(new String[]{"--implicit-naming=org.example.MyStrategy"});
+		assertEquals("org.example.MyStrategy", getField(args, "implicitNamingStrategy"));
+	}
+
+	@Test
+	public void testParsePhysicalNaming() throws Exception {
+		Object args = parseArgs(new String[]{"--physical-naming=org.example.MyStrategy"});
+		assertEquals("org.example.MyStrategy", getField(args, "physicalNamingStrategy"));
+	}
+
+	@Test
+	public void testParseNamingDeprecated() throws Exception {
+		// --naming= is deprecated, should not set any field but also not throw
+		Object args = parseArgs(new String[]{"--naming=org.example.OldStrategy"});
+		assertNull(getField(args, "implicitNamingStrategy"));
+		assertNull(getField(args, "physicalNamingStrategy"));
+	}
+
+	@Test
+	public void testParseJarFile() throws Exception {
+		Object args = parseArgs(new String[]{"model.jar"});
+		java.util.List<?> jarFiles = (java.util.List<?>) getField(args, "jarFiles");
+		assertEquals(1, jarFiles.size());
+		assertEquals("model.jar", jarFiles.get(0));
+	}
+
+	@Test
+	public void testParseHbmFile() throws Exception {
+		Object args = parseArgs(new String[]{"Person.hbm.xml"});
+		java.util.List<?> hbmFiles = (java.util.List<?>) getField(args, "hbmXmlFiles");
+		assertEquals(1, hbmFiles.size());
+		assertEquals("Person.hbm.xml", hbmFiles.get(0));
+	}
+
+	@Test
+	public void testParseMixed() throws Exception {
+		Object args = parseArgs(new String[]{
+				"--properties=/tmp/test.properties",
+				"--config=/tmp/hibernate.cfg.xml",
+				"Person.hbm.xml",
+				"model.jar",
+				"--implicit-naming=org.example.ImplicitStrategy"
+		});
+		assertEquals("/tmp/test.properties", getField(args, "propertiesFile"));
+		assertEquals("/tmp/hibernate.cfg.xml", getField(args, "cfgXmlFile"));
+		assertEquals("org.example.ImplicitStrategy", getField(args, "implicitNamingStrategy"));
+		java.util.List<?> hbmFiles = (java.util.List<?>) getField(args, "hbmXmlFiles");
+		assertEquals(1, hbmFiles.size());
+		java.util.List<?> jarFiles = (java.util.List<?>) getField(args, "jarFiles");
+		assertEquals(1, jarFiles.size());
+	}
+
+	private Object parseArgs(String[] args) throws Exception {
+		Class<?> cmdLineArgsClass = Class.forName(SchemaValidator.class.getName() + "$CommandLineArgs");
+		Method parseMethod = cmdLineArgsClass.getDeclaredMethod("parseCommandLineArgs", String[].class);
+		parseMethod.setAccessible(true);
+		return parseMethod.invoke(null, (Object) args);
+	}
+
+	private Object getField(Object obj, String fieldName) throws Exception {
+		java.lang.reflect.Field field = obj.getClass().getDeclaredField(fieldName);
+		field.setAccessible(true);
+		return field.get(obj);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTaskSettersTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTaskSettersTest.java
new file mode 100644
index 000000000000..c3ca52757158
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTaskSettersTest.java
@@ -0,0 +1,88 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.FileSet;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class SchemaValidatorTaskSettersTest {
+
+	@TempDir
+	private File tempDir;
+
+	@Test
+	public void testSetPropertiesNonExistent() {
+		SchemaValidatorTask task = new SchemaValidatorTask();
+		task.setProject(new Project());
+		assertThrows(BuildException.class,
+				() -> task.setProperties(new File("/nonexistent/hibernate.properties")));
+	}
+
+	@Test
+	public void testSetPropertiesValid() throws IOException {
+		SchemaValidatorTask task = new SchemaValidatorTask();
+		task.setProject(new Project());
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Properties props = new Properties();
+		props.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+		try (FileOutputStream fos = new FileOutputStream(propsFile)) {
+			props.store(fos, null);
+		}
+		task.setProperties(propsFile);
+	}
+
+	@Test
+	public void testSetConfigNonExistent() {
+		SchemaValidatorTask task = new SchemaValidatorTask();
+		task.setProject(new Project());
+		assertThrows(BuildException.class,
+				() -> task.setConfig(new File("/nonexistent/hibernate.cfg.xml")));
+	}
+
+	@Test
+	public void testSetConfigValid() throws IOException {
+		SchemaValidatorTask task = new SchemaValidatorTask();
+		task.setProject(new Project());
+		File cfgFile = new File(tempDir, "hibernate.cfg.xml");
+		try (FileOutputStream fos = new FileOutputStream(cfgFile)) {
+			fos.write("<hibernate-configuration/>".getBytes());
+		}
+		task.setConfig(cfgFile);
+	}
+
+	@Test
+	public void testSetNamingStrategy() {
+		SchemaValidatorTask task = new SchemaValidatorTask();
+		task.setNamingStrategy("ignored");
+	}
+
+	@Test
+	public void testSetImplicitNamingStrategy() {
+		SchemaValidatorTask task = new SchemaValidatorTask();
+		task.setImplicitNamingStrategy("org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl");
+	}
+
+	@Test
+	public void testSetPhysicalNamingStrategy() {
+		SchemaValidatorTask task = new SchemaValidatorTask();
+		task.setPhysicalNamingStrategy("org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl");
+	}
+
+	@Test
+	public void testAddFileset() {
+		SchemaValidatorTask task = new SchemaValidatorTask();
+		task.addFileset(new FileSet());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTaskTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTaskTest.java
new file mode 100644
index 000000000000..2399d93745b4
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTaskTest.java
@@ -0,0 +1,35 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.apache.tools.ant.Project;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+public class SchemaValidatorTaskTest {
+
+	private Project antProject;
+
+	@BeforeEach
+	public void setUp() {
+		antProject = new Project();
+		antProject.setProperty("hibernate.connection.driver_class", "org.h2.Driver");
+		antProject.setProperty("hibernate.connection.url",
+				"jdbc:h2:mem:schema_validator_test_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1");
+		antProject.setProperty("hibernate.connection.username", "sa");
+		antProject.setProperty("hibernate.connection.password", "");
+		antProject.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+	}
+
+	@Test
+	public void testExecute() {
+		SchemaValidatorTask task = new SchemaValidatorTask();
+		task.setProject(antProject);
+		// With no mapping files and an empty H2 database, validation should succeed
+		assertDoesNotThrow(task::execute);
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ScriptExporterTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ScriptExporterTest.java
new file mode 100644
index 000000000000..37b6ca7879d9
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/ScriptExporterTest.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ScriptExporterTest {
+
+	@Test
+	public void testExport() throws Exception {
+		ScriptExporter exporter = new ScriptExporter();
+		assertFalse(exporter.acceptsImportScripts());
+
+		PrintStream original = System.out;
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		System.setOut(new PrintStream(baos));
+		try {
+			exporter.export("CREATE TABLE test (id INT)");
+		}
+		finally {
+			System.setOut(original);
+		}
+		assertTrue(baos.toString().contains("CREATE TABLE test (id INT)"));
+	}
+
+	@Test
+	public void testRelease() throws Exception {
+		ScriptExporter exporter = new ScriptExporter();
+		exporter.release(); // should be a no-op
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelperTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelperTest.java
new file mode 100644
index 000000000000..b6675e91222d
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionHelperTest.java
@@ -0,0 +1,84 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SuppressWarnings("deprecation")
+public class SuppliedConnectionHelperTest {
+
+	private Connection rawConnection;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		rawConnection = DriverManager.getConnection(
+				"jdbc:h2:mem:supplied_helper_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1", "sa", "");
+	}
+
+	@AfterEach
+	public void tearDown() throws Exception {
+		if (rawConnection != null && !rawConnection.isClosed()) {
+			rawConnection.close();
+		}
+	}
+
+	@Test
+	public void testPrepareNoAutoCommit() throws SQLException {
+		rawConnection.setAutoCommit(true);
+		SuppliedConnectionHelper helper = new SuppliedConnectionHelper(rawConnection, new SqlExceptionHelper(true));
+		helper.prepare(false);
+		assertSame(rawConnection, helper.getConnection());
+		helper.release();
+	}
+
+	@Test
+	public void testPrepareWithAutoCommit() throws SQLException {
+		rawConnection.setAutoCommit(false);
+		SuppliedConnectionHelper helper = new SuppliedConnectionHelper(rawConnection, new SqlExceptionHelper(true));
+		helper.prepare(true);
+		assertTrue(rawConnection.getAutoCommit());
+		helper.release();
+		// After release with toggleAutoCommit, autocommit should be restored to false
+		// But connection is set to null in release, so we can't check.
+		// Just verify no exception.
+	}
+
+	@Test
+	public void testPrepareWithAutoCommitAlreadyTrue() throws SQLException {
+		rawConnection.setAutoCommit(true);
+		SuppliedConnectionHelper helper = new SuppliedConnectionHelper(rawConnection, new SqlExceptionHelper(true));
+		helper.prepare(true);
+		// toggleAutoCommit should be false since autocommit was already true
+		assertTrue(rawConnection.getAutoCommit());
+		helper.release();
+	}
+
+	@Test
+	public void testGetConnection() throws SQLException {
+		SuppliedConnectionHelper helper = new SuppliedConnectionHelper(rawConnection, new SqlExceptionHelper(true));
+		assertSame(rawConnection, helper.getConnection());
+	}
+
+	@Test
+	public void testReleaseNullsConnection() throws SQLException {
+		SuppliedConnectionHelper helper = new SuppliedConnectionHelper(rawConnection, new SqlExceptionHelper(true));
+		helper.prepare(false);
+		assertNotNull(helper.getConnection());
+		helper.release();
+		assertNull(helper.getConnection());
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelperTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelperTest.java
new file mode 100644
index 000000000000..110350389d5a
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/SuppliedConnectionProviderConnectionHelperTest.java
@@ -0,0 +1,95 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SuppressWarnings("deprecation")
+public class SuppliedConnectionProviderConnectionHelperTest {
+
+	private Connection rawConnection;
+	private final String url = "jdbc:h2:mem:supplied_provider_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1";
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		rawConnection = DriverManager.getConnection(url, "sa", "");
+	}
+
+	@AfterEach
+	public void tearDown() throws Exception {
+		if (rawConnection != null && !rawConnection.isClosed()) {
+			rawConnection.close();
+		}
+	}
+
+	private ConnectionProvider stubProvider() {
+		return new ConnectionProvider() {
+			@Override
+			public Connection getConnection() {
+				return rawConnection;
+			}
+			@Override
+			public void closeConnection(Connection connection) throws SQLException {
+				// don't actually close — we manage lifecycle in tearDown
+			}
+			@Override
+			public boolean supportsAggressiveRelease() {
+				return false;
+			}
+			@Override
+			public boolean isUnwrappableAs(Class<?> unwrapType) {
+				return false;
+			}
+			@Override
+			public <T> T unwrap(Class<T> unwrapType) {
+				return null;
+			}
+		};
+	}
+
+	@Test
+	public void testPrepareNoAutoCommitNeeded() throws SQLException {
+		rawConnection.setAutoCommit(true);
+		SuppliedConnectionProviderConnectionHelper helper =
+				new SuppliedConnectionProviderConnectionHelper(stubProvider(), new SqlExceptionHelper(true));
+		helper.prepare(false);
+		Connection conn = helper.getConnection();
+		assertNotNull(conn);
+		assertSame(rawConnection, conn);
+		helper.release();
+	}
+
+	@Test
+	public void testPrepareWithAutoCommit() throws SQLException {
+		rawConnection.setAutoCommit(false);
+		SuppliedConnectionProviderConnectionHelper helper =
+				new SuppliedConnectionProviderConnectionHelper(stubProvider(), new SqlExceptionHelper(true));
+		helper.prepare(true);
+		Connection conn = helper.getConnection();
+		assertNotNull(conn);
+		assertTrue(conn.getAutoCommit());
+		helper.release();
+	}
+
+	@Test
+	public void testReleaseWithoutPrepare() throws SQLException {
+		SuppliedConnectionProviderConnectionHelper helper =
+				new SuppliedConnectionProviderConnectionHelper(stubProvider(), new SqlExceptionHelper(true));
+		// connection is null, should not throw
+		helper.release();
+	}
+}
diff --git a/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/TableMetadataTest.java b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/TableMetadataTest.java
new file mode 100644
index 000000000000..b3d5281a30bb
--- /dev/null
+++ b/tooling/hibernate-ant/src/test/java/org/hibernate/tool/hbm2ddl/TableMetadataTest.java
@@ -0,0 +1,113 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TableMetadataTest {
+
+	private Connection conn;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		conn = DriverManager.getConnection("jdbc:h2:mem:tbl_meta_test;DB_CLOSE_DELAY=-1", "sa", "");
+		try (Statement stmt = conn.createStatement()) {
+			stmt.execute("CREATE TABLE TBL_PARENT (ID INT PRIMARY KEY, NAME VARCHAR(50))");
+			stmt.execute("CREATE TABLE TBL_CHILD (ID INT PRIMARY KEY, PARENT_ID INT, "
+					+ "CONSTRAINT FK_PARENT FOREIGN KEY (PARENT_ID) REFERENCES TBL_PARENT(ID))");
+			stmt.execute("CREATE INDEX IDX_CHILD_PARENT ON TBL_CHILD(PARENT_ID)");
+		}
+	}
+
+	@AfterEach
+	public void tearDown() throws Exception {
+		try (Statement stmt = conn.createStatement()) {
+			stmt.execute("DROP TABLE IF EXISTS TBL_CHILD");
+			stmt.execute("DROP TABLE IF EXISTS TBL_PARENT");
+		}
+		conn.close();
+	}
+
+	private TableMetadata loadTable(String tableName, boolean extras) throws Exception {
+		DatabaseMetaData meta = conn.getMetaData();
+		ResultSet rs = meta.getTables(null, "PUBLIC", tableName, null);
+		assertTrue(rs.next());
+		TableMetadata table = new TableMetadata(rs, meta, extras);
+		rs.close();
+		return table;
+	}
+
+	@Test
+	public void testBasicProperties() throws Exception {
+		TableMetadata table = loadTable("TBL_PARENT", false);
+		assertEquals("TBL_PARENT", table.getName());
+		assertEquals("PUBLIC", table.getSchema());
+		assertTrue(table.toString().contains("TBL_PARENT"));
+	}
+
+	@Test
+	public void testColumnMetadata() throws Exception {
+		TableMetadata table = loadTable("TBL_PARENT", false);
+		assertNotNull(table.getColumnMetadata("ID"));
+		assertNotNull(table.getColumnMetadata("NAME"));
+		assertNull(table.getColumnMetadata("NONEXISTENT"));
+	}
+
+	@Test
+	public void testColumnMetadataCaseInsensitive() throws Exception {
+		TableMetadata table = loadTable("TBL_PARENT", false);
+		assertNotNull(table.getColumnMetadata("id"));
+		assertNotNull(table.getColumnMetadata("name"));
+	}
+
+	@Test
+	public void testForeignKeyMetadata() throws Exception {
+		TableMetadata table = loadTable("TBL_CHILD", true);
+		assertNotNull(table.getForeignKeyMetadata("FK_PARENT"));
+		assertNotNull(table.getForeignKeyMetadata("fk_parent"));
+		assertNull(table.getForeignKeyMetadata("NONEXISTENT"));
+	}
+
+	@Test
+	public void testIndexMetadata() throws Exception {
+		TableMetadata table = loadTable("TBL_CHILD", true);
+		assertNotNull(table.getIndexMetadata("IDX_CHILD_PARENT"));
+		assertNotNull(table.getIndexMetadata("idx_child_parent"));
+		assertNull(table.getIndexMetadata("NONEXISTENT"));
+	}
+
+	@Test
+	public void testWithoutExtras() throws Exception {
+		TableMetadata table = loadTable("TBL_CHILD", false);
+		// Without extras, foreign keys and indexes are not loaded
+		assertNull(table.getForeignKeyMetadata("FK_PARENT"));
+		assertNull(table.getIndexMetadata("IDX_CHILD_PARENT"));
+		// But columns are always loaded
+		assertNotNull(table.getColumnMetadata("ID"));
+	}
+
+	@Test
+	public void testAddColumnWithNull() throws Exception {
+		TableMetadata table = loadTable("TBL_PARENT", false);
+		// Adding a column with null COLUMN_NAME should be a no-op
+		int before = 0;
+		if (table.getColumnMetadata("ID") != null) before++;
+		if (table.getColumnMetadata("NAME") != null) before++;
+		assertEquals(2, before);
+	}
+}
diff --git a/tooling/hibernate-assistant/hibernate-assistant.gradle b/tooling/hibernate-assistant/hibernate-assistant.gradle
new file mode 100644
index 000000000000..9c080c3d396c
--- /dev/null
+++ b/tooling/hibernate-assistant/hibernate-assistant.gradle
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+
+plugins {
+    id "local.publishing-java-module"
+    id "local.publishing-group-relocation"
+}
+
+description = 'Tools to integrate Hibernate with LLMs and generative AI functionalities.'
+
+dependencies {
+    api project( ':hibernate-core' )
+
+    testImplementation project( ':hibernate-testing' )
+    testImplementation libs.jackson
+}
diff --git a/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/HibernateAssistant.java b/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/HibernateAssistant.java
new file mode 100644
index 000000000000..6e028002bfb8
--- /dev/null
+++ b/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/HibernateAssistant.java
@@ -0,0 +1,79 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.language;
+
+import org.hibernate.Incubating;
+import org.hibernate.SharedSessionContract;
+import org.hibernate.query.SelectionQuery;
+
+/**
+ * Hibernate Assistant allows interacting with an underlying LLM to help you retrieve persistent data.
+ * It leverages Hibernate ORM's mapping models, query language, cross-platform support and
+ * built-in data restrictions to make access to information stored in relational databases
+ * as easy as a natural language prompt.
+ */
+@Incubating
+public interface HibernateAssistant {
+	/**
+	 * Creates a {@link SelectionQuery} by providing the specified natural language {@code message} to the LLM
+	 * and interpreting the obtained response.
+	 *
+	 * @param message the natural language prompt
+	 * @param session Hibernate session
+	 *
+	 * @return the {@link SelectionQuery} generated by the LLM
+	 */
+	default SelectionQuery<?> createAiQuery(String message, SharedSessionContract session) {
+		return createAiQuery( message, session, null );
+	}
+
+	/**
+	 * Creates a {@link SelectionQuery} by providing the specified natural language {@code message} to the LLM
+	 * and interpreting the obtained response.
+	 *
+	 * @param message the natural language prompt
+	 * @param session Hibernate session
+	 * @param resultType The {@link Class} representing the expected query result type
+	 *
+	 * @return the {@link SelectionQuery} generated by the LLM
+	 */
+	<T> SelectionQuery<T> createAiQuery(String message, SharedSessionContract session, Class<T> resultType);
+
+	/**
+	 * Prompts the underlying LLM with the provided natural language message and tries to answer it with
+	 * data extracted from the database through the persistence model.
+	 *
+	 * @param message the natural language request
+	 * @param session Hibernate session
+	 *
+	 * @return a natural language response based on the results of the query
+	 */
+	String executeQuery(String message, SharedSessionContract session);
+
+	/**
+	 * Executes the given {@link SelectionQuery}, and provides a natural language
+	 * response by passing the resulting data back to the underlying LLM.
+	 * <p>
+	 * To directly obtain a natural language response from a natural language prompt,
+	 * you can use {@link #executeQuery(String, SharedSessionContract)} instead.
+	 * <p>
+	 * If you wish to execute the query manually and obtain the structured results yourself,
+	 * you should use {@link SelectionQuery}'s direct execution methods, e.g. {@link SelectionQuery#getResultList()}
+	 * or {@link SelectionQuery#getSingleResult()}.
+	 *
+	 * @param query the AI query to execute
+	 * @param session the session in which to execute the query
+	 *
+	 * @return a natural language response based on the results of the query
+	 */
+	String executeQuery(SelectionQuery<?> query, SharedSessionContract session);
+
+	/**
+	 * Reset the assistant's current chat context. This can be helpful when
+	 * creating a new {@link SelectionQuery} that should not rely on the context
+	 * of previous requests.
+	 */
+	void clear();
+}
diff --git a/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/internal/MetamodelJsonSerializerImpl.java b/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/internal/MetamodelJsonSerializerImpl.java
new file mode 100644
index 000000000000..ebc97cf61ea1
--- /dev/null
+++ b/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/internal/MetamodelJsonSerializerImpl.java
@@ -0,0 +1,184 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.language.internal;
+
+import org.hibernate.metamodel.model.domain.ManagedDomainType;
+import org.hibernate.tool.language.spi.MetamodelSerializer;
+import org.hibernate.type.format.StringJsonDocumentWriter;
+
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.MappedSuperclassType;
+import jakarta.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Implementation of {@link MetamodelSerializer} that represents the {@link Metamodel} as a JSON array of mapped objects.
+ */
+public class MetamodelJsonSerializerImpl implements MetamodelSerializer {
+	public static MetamodelJsonSerializerImpl INSTANCE = new MetamodelJsonSerializerImpl();
+
+	/**
+	 * Utility method that generates a JSON string representation of the mapping information
+	 * contained in the provided {@link Metamodel metamodel} instance. The representation
+	 * does not follow a strict scheme, and is more akin to natural language, as it's
+	 * mainly meant for consumption by a LLM.
+	 *
+	 * @param metamodel the metamodel instance containing information on the persistence structures
+	 *
+	 * @return the JSON representation of the provided {@link Metamodel metamodel}
+	 */
+	@Override
+	public String toString(Metamodel metamodel) {
+		final List<Map<String, Object>> entities = new ArrayList<>();
+		final List<Map<String, Object>> embeddables = new ArrayList<>();
+		final List<Map<String, Object>> mappedSupers = new ArrayList<>();
+		for ( ManagedType<?> managedType : metamodel.getManagedTypes() ) {
+			switch ( managedType.getPersistenceType() ) {
+				case ENTITY -> entities.add( getEntityTypeDescription( (EntityType<?>) managedType ) );
+				case EMBEDDABLE -> embeddables.add( getEmbeddableTypeDescription( (EmbeddableType<?>) managedType ) );
+				case MAPPED_SUPERCLASS -> mappedSupers.add( getMappedSuperclassTypeDescription( (MappedSuperclassType<?>) managedType ) );
+				default ->
+						throw new IllegalStateException( "Unexpected persistence type for managed type [" + managedType + "]" );
+			}
+		}
+		return toJson( Map.of(
+				"entities", entities,
+				"mappedSuperclasses", mappedSupers,
+				"embeddables", embeddables
+		) );
+	}
+
+	private static String toJson(Map<String, Object> map) {
+		if ( map.isEmpty() ) {
+			return "{}";
+		}
+
+		final StringJsonDocumentWriter writer = new StringJsonDocumentWriter( new StringBuilder() );
+		toJson( map, writer );
+		return writer.toString();
+	}
+
+	private static void toJson(Object value, StringJsonDocumentWriter writer) {
+		if ( value instanceof String strValue ) {
+			writer.stringValue( strValue );
+		}
+		else if ( value instanceof Boolean boolValue ) {
+			writer.booleanValue( boolValue );
+		}
+		else if ( value instanceof Number numValue ) {
+			writer.numericValue( numValue );
+		}
+		else if ( value instanceof Map<?, ?> map ) {
+			writer.startObject();
+			for ( final var entry : map.entrySet() ) {
+				writer.objectKey( entry.getKey().toString() );
+				toJson( entry.getValue(), writer );
+			}
+			writer.endObject();
+		}
+		else if ( value instanceof Collection<?> collection ) {
+			writer.startArray();
+			for ( final var item : collection ) {
+				toJson( item, writer );
+			}
+			writer.endArray();
+		}
+		else if ( value == null ) {
+			writer.nullValue();
+		}
+		else {
+			throw new IllegalArgumentException( "Unsupported value type: " + value.getClass().getName() );
+		}
+	}
+
+	private static void putIfNotNull(Map<String, Object> map, String key, Object value) {
+		if ( value != null ) {
+			map.put( key, value );
+		}
+	}
+
+	private static <T> Map<String, Object> getEntityTypeDescription(EntityType<T> entityType) {
+		final Map<String, Object> map = new HashMap<>( 5 );
+		map.put( "name", entityType.getName() );
+		map.put( "class", entityType.getJavaType().getTypeName() );
+		putIfNotNull( map, "superType", superTypeDescriptor( (ManagedDomainType<?>) entityType ) );
+		putIfNotNull( map, "identifierAttribute", identifierDescriptor( entityType ) );
+		map.put( "attributes", attributeArray( entityType.getAttributes() ) );
+		return map;
+	}
+
+	private static String superTypeDescriptor(ManagedDomainType<?> managedType) {
+		final var superType = managedType.getSuperType();
+		return superType != null ? superType.getJavaType().getTypeName() : null;
+	}
+
+	private static <T> Map<String, Object> getMappedSuperclassTypeDescription(MappedSuperclassType<T> mappedSuperclass) {
+		final Class<T> javaType = mappedSuperclass.getJavaType();
+		final Map<String, Object> map = new HashMap<>( 5 );
+		map.put( "name", javaType.getSimpleName() );
+		map.put( "class", javaType.getTypeName() );
+		putIfNotNull( map, "superType", superTypeDescriptor( (ManagedDomainType<?>) mappedSuperclass ) );
+		putIfNotNull( map, "identifierAttribute", identifierDescriptor( mappedSuperclass ) );
+		map.put( "attributes", attributeArray( mappedSuperclass.getAttributes() ) );
+		return map;
+	}
+
+	private static <T> String identifierDescriptor(IdentifiableType<T> identifiableType) {
+		final Type<?> idType = identifiableType.getIdType();
+		if ( idType != null ) {
+			final var id = identifiableType.getId( idType.getJavaType() );
+			return id.getName();
+		}
+		else {
+			return null;
+		}
+	}
+
+	private static <T> Map<String, Object> getEmbeddableTypeDescription(EmbeddableType<T> embeddableType) {
+		final Class<T> javaType = embeddableType.getJavaType();
+		final Map<String, Object> map = new HashMap<>( 4 );
+		map.put( "name", javaType.getSimpleName() );
+		map.put( "class", javaType.getTypeName() );
+		putIfNotNull( map, "superType", superTypeDescriptor( (ManagedDomainType<?>) embeddableType ) );
+		map.put( "attributes", attributeArray( embeddableType.getAttributes() ) );
+		return map;
+	}
+
+	private static <T> List<Map<String, String>> attributeArray(Set<Attribute<? super T, ?>> attributes) {
+		if ( attributes.isEmpty() ) {
+			return List.of();
+		}
+
+		return attributes.stream().map( attribute -> {
+			final String name = attribute.getName();
+			String type = attribute.getJavaType().getTypeName();
+			// add key and element types for plural attributes
+			if ( attribute instanceof PluralAttribute<?, ?, ?> pluralAttribute ) {
+				type += "<";
+				final var collectionType = pluralAttribute.getCollectionType();
+				if ( collectionType == PluralAttribute.CollectionType.MAP ) {
+					type += ( (MapAttribute<?, ?, ?>) pluralAttribute ).getKeyJavaType().getTypeName() + ",";
+				}
+				type += pluralAttribute.getElementType().getJavaType().getTypeName() + ">";
+			}
+			return Map.of(
+					"type", type,
+					"name", name
+			);
+		} ).toList();
+	}
+}
diff --git a/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/internal/ResultsJsonSerializerImpl.java b/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/internal/ResultsJsonSerializerImpl.java
new file mode 100644
index 000000000000..87864b8769c7
--- /dev/null
+++ b/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/internal/ResultsJsonSerializerImpl.java
@@ -0,0 +1,195 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.language.internal;
+
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.metamodel.mapping.CollectionPart;
+import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
+import org.hibernate.metamodel.mapping.EntityValuedModelPart;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
+import org.hibernate.metamodel.mapping.ValuedModelPart;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.query.SelectionQuery;
+import org.hibernate.query.spi.SqmQuery;
+import org.hibernate.query.sqm.SqmExpressible;
+import org.hibernate.query.sqm.tree.SqmExpressibleAccessor;
+import org.hibernate.query.sqm.tree.SqmStatement;
+import org.hibernate.query.sqm.tree.domain.SqmPath;
+import org.hibernate.query.sqm.tree.from.SqmRoot;
+import org.hibernate.query.sqm.tree.select.SqmJpaCompoundSelection;
+import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
+import org.hibernate.query.sqm.tree.select.SqmSelection;
+import org.hibernate.tool.language.spi.ResultsSerializer;
+import org.hibernate.type.descriptor.jdbc.spi.DescriptiveJsonGeneratingVisitor;
+import org.hibernate.type.format.StringJsonDocumentWriter;
+
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.Selection;
+import java.io.IOException;
+import java.util.List;
+
+import static org.hibernate.internal.util.NullnessUtil.castNonNull;
+
+/**
+ * Utility class to serialize query results into a JSON string format.
+ */
+public class ResultsJsonSerializerImpl implements ResultsSerializer {
+
+	private static final DescriptiveJsonGeneratingVisitor JSON_VISITOR = new DescriptiveJsonGeneratingVisitor();
+
+	private final SessionFactoryImplementor factory;
+
+	public ResultsJsonSerializerImpl(SessionFactoryImplementor factory) {
+		this.factory = factory;
+	}
+
+	@Override
+	public <T> String toString(List<? extends T> values, SelectionQuery<T> query) throws IOException {
+		if ( values.isEmpty() ) {
+			return "[]";
+		}
+
+		final StringBuilder sb = new StringBuilder();
+		final StringJsonDocumentWriter writer = new StringJsonDocumentWriter( sb );
+		char separator = '[';
+		for ( final T value : values ) {
+			sb.append( separator );
+			//noinspection unchecked
+			renderValue( value, (SqmQuery<? super T>) query, writer );
+			separator = ',';
+		}
+		sb.append( ']' );
+		return sb.toString();
+	}
+
+	private <T> void renderValue(T value, SqmQuery<? super T> query, StringJsonDocumentWriter writer)
+			throws IOException {
+		final SqmStatement<?> sqm = query.getSqmStatement();
+		if ( !( sqm instanceof SqmSelectStatement<?> sqmSelect ) ) {
+			throw new IllegalArgumentException( "Query is not a select statement." );
+		}
+		final List<SqmSelection<?>> selections = sqmSelect.getQuerySpec().getSelectClause().getSelections();
+		assert !selections.isEmpty();
+		if ( selections.size() == 1 ) {
+			renderValue( value, selections.get( 0 ).getSelectableNode(), writer );
+		}
+		else {
+			// wrap each result tuple in square brackets
+			writer.startArray();
+			for ( int i = 0; i < selections.size(); i++ ) {
+				final SqmSelection<?> selection = selections.get( i );
+				if ( value instanceof Object[] array ) {
+					renderValue( array[i], selection.getSelectableNode(), writer );
+				}
+				else if ( value instanceof Tuple tuple ) {
+					renderValue( tuple.get( i ), selection.getSelectableNode(), writer );
+				}
+				else {
+					renderValue( value, selection.getSelectableNode(), writer );
+				}
+			}
+			writer.endArray();
+		}
+	}
+
+	private void renderValue(Object value, Selection<?> selection, StringJsonDocumentWriter writer) throws IOException {
+		if ( selection instanceof SqmRoot<?> root ) {
+			final EntityPersister persister = factory.getMappingMetamodel()
+					.getEntityDescriptor( root.getEntityName() );
+			JSON_VISITOR.visit( persister.getEntityMappingType(), value, factory.getWrapperOptions(), writer );
+		}
+		else if ( selection instanceof SqmPath<?> path ) {
+			// extract the attribute from the path
+			final ValuedModelPart subPart = getSubPart( path.getLhs(), path.getNavigablePath().getLocalName() );
+			if ( subPart != null ) {
+				JSON_VISITOR.visit( subPart.getMappedType(), value, factory.getWrapperOptions(), writer );
+			}
+			else {
+				expressibleToString( path, value, writer );
+			}
+		}
+		else if ( selection instanceof SqmJpaCompoundSelection<?> compoundSelection ) {
+			final List<Selection<?>> compoundSelectionItems = compoundSelection.getCompoundSelectionItems();
+			assert compoundSelectionItems.size() > 1;
+			writer.startArray();
+			for ( int j = 0; j < compoundSelectionItems.size(); j++ ) {
+				renderValue( getValue( value, j ), compoundSelectionItems.get( j ), writer );
+			}
+			writer.endArray();
+		}
+		else if ( selection instanceof SqmExpressibleAccessor<?> node ) {
+			expressibleToString( node, value, writer );
+		}
+		else {
+			writer.stringValue( String.valueOf( value ) );
+		}
+	}
+
+	private static void expressibleToString(
+			SqmExpressibleAccessor<?> node,
+			Object value,
+			StringJsonDocumentWriter writer) {
+		//noinspection unchecked
+		final SqmExpressible<Object> expressible = (SqmExpressible<Object>) node.getExpressible();
+		final String result = expressible != null ?
+				expressible.getExpressibleJavaType().toString( value ) :
+				value.toString(); // best effort
+		// avoid quoting numeric and boolean values as they can be represented in JSON
+		if ( value instanceof Boolean boolValue ) {
+			writer.booleanValue( boolValue );
+		}
+		else if ( value instanceof Number numValue ) {
+			writer.numericValue( numValue );
+		}
+		else if ( result == null ) {
+			writer.nullValue();
+		}
+		else {
+			writer.stringValue( result );
+		}
+	}
+
+	private static Object getValue(Object value, int index) {
+		if ( value.getClass().isArray() ) {
+			return ( (Object[]) value )[index];
+		}
+		else if ( value instanceof Tuple tuple ) {
+			return tuple.get( index );
+		}
+		else {
+			if ( index > 0 ) {
+				throw new IllegalArgumentException( "Index out of range: " + index );
+			}
+			return value;
+		}
+	}
+
+	private ValuedModelPart getSubPart(SqmPath<?> path, String propertyName) {
+		if ( path instanceof SqmRoot<?> root ) {
+			final EntityPersister entityDescriptor = factory.getMappingMetamodel()
+					.getEntityDescriptor( root.getEntityName() );
+			return entityDescriptor.findAttributeMapping( propertyName );
+		}
+		else {
+			// try to derive the subpart from the lhs
+			final ValuedModelPart subPart = getSubPart( path.getLhs(), path.getNavigablePath().getLocalName() );
+			if ( subPart instanceof EmbeddableValuedModelPart embeddable ) {
+				return embeddable.getEmbeddableTypeDescriptor().findAttributeMapping( propertyName );
+			}
+			else if ( subPart instanceof EntityValuedModelPart entity ) {
+				return entity.getEntityMappingType().findAttributeMapping( propertyName );
+			}
+			else if ( subPart instanceof PluralAttributeMapping plural ) {
+				final CollectionPart.Nature nature = castNonNull( CollectionPart.Nature.fromNameExact( propertyName ) );
+				return switch ( nature ) {
+					case ELEMENT -> plural.getElementDescriptor();
+					case ID -> plural.getIdentifierDescriptor();
+					case INDEX -> plural.getIndexDescriptor();
+				};
+			}
+		}
+		return null;
+	}
+}
diff --git a/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/spi/MetamodelSerializer.java b/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/spi/MetamodelSerializer.java
new file mode 100644
index 000000000000..ae75ce1b0daa
--- /dev/null
+++ b/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/spi/MetamodelSerializer.java
@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.language.spi;
+
+import jakarta.persistence.metamodel.Metamodel;
+import org.hibernate.Incubating;
+
+/**
+ * Contract used to provide the LLM with a textual representation of the
+ * Hibernate metamodel, that is, the classes and mapping information
+ * that constitute the persistence layer.
+ */
+@Incubating
+public interface MetamodelSerializer {
+	/**
+	 * Utility method that generates a textual representation of the mapping information
+	 * contained in the provided {@link Metamodel metamodel} instance. The representation
+	 * does not need to follow a strict scheme, and is more akin to natural language,
+	 * as it's mainly meant for consumption by a LLM.
+	 *
+	 * @param metamodel the metamodel instance containing information on the persistence structures
+	 *
+	 * @return the textual representation of the provided {@link Metamodel metamodel}
+	 */
+	String toString(Metamodel metamodel);
+}
diff --git a/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/spi/ResultsSerializer.java b/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/spi/ResultsSerializer.java
new file mode 100644
index 000000000000..a8010a26505d
--- /dev/null
+++ b/tooling/hibernate-assistant/src/main/java/org/hibernate/tool/language/spi/ResultsSerializer.java
@@ -0,0 +1,30 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.language.spi;
+
+import org.hibernate.Incubating;
+import org.hibernate.query.SelectionQuery;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Contract used to serialize query results into a JSON string format,
+ * with special care towards Hibernate-specific complexities like
+ * laziness and circular associations.
+ */
+@Incubating
+public interface ResultsSerializer {
+	/**
+	 * Serialize the given list of {@code values}, that have been returned by the provided {@code query} into a JSON string format.
+	 *
+	 * @param values list of values returned by the query
+	 * @param query query object, used to determine the type of the values
+	 * @param <T> the type of objects returned by the query
+	 *
+	 * @return JSON string representation of the values
+	 */
+	<T> String toString(List<? extends T> values, SelectionQuery<T> query) throws IOException;
+}
diff --git a/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/MetamodelJsonSerializerTest.java b/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/MetamodelJsonSerializerTest.java
new file mode 100644
index 000000000000..eb3300d5de37
--- /dev/null
+++ b/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/MetamodelJsonSerializerTest.java
@@ -0,0 +1,290 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.language;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.tool.language.domain.Address;
+import org.hibernate.tool.language.domain.Company;
+import org.hibernate.tool.language.domain.Employee;
+import org.hibernate.tool.language.internal.MetamodelJsonSerializerImpl;
+
+import org.hibernate.testing.orm.domain.animal.AnimalDomainModel;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import jakarta.persistence.AccessType;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.Metamodel;
+import java.lang.reflect.Modifier;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Fail.fail;
+
+public class MetamodelJsonSerializerTest {
+	private static final ObjectMapper mapper = new ObjectMapper();
+
+	static {
+		mapper.enable( SerializationFeature.INDENT_OUTPUT );
+	}
+
+	private static final boolean DEBUG = false; // set to true to enable debug output of the generated JSON
+
+	@Test
+	public void testSimpleDomainModel() {
+		final Metadata metadata = new MetadataSources().addAnnotatedClass( Address.class )
+				.addAnnotatedClass( Company.class )
+				.addAnnotatedClass( Employee.class )
+				.buildMetadata();
+		try (final SessionFactory sf = metadata.buildSessionFactory()) {
+			try {
+				final JsonNode root = toJson( sf.getMetamodel() );
+
+				// Entities
+
+				final JsonNode entities = root.get( "entities" );
+				assertThat( entities.isArray() ).isTrue();
+				assertThat( entities.size() ).isEqualTo( 2 );
+
+				JsonNode companyNode = findByName( entities, Company.class.getSimpleName() );
+				assertThat( companyNode ).isNotNull();
+				assertThat( companyNode.get( "class" ).asText() ).isEqualTo( Company.class.getName() );
+				assertThat( companyNode.get( "identifierAttribute" ).asText() ).isEqualTo( "id" );
+				assertAttributes( Company.class, companyNode.get( "attributes" ), AccessType.FIELD );
+
+				JsonNode employeeNode = findByName( entities, Employee.class.getSimpleName() );
+				assertThat( employeeNode ).isNotNull();
+				assertThat( employeeNode.get( "class" ).asText() ).isEqualTo( Employee.class.getName() );
+				assertAttributes( Employee.class, employeeNode.get( "attributes" ), AccessType.PROPERTY );
+
+				// Embeddables
+
+				final JsonNode embeddables = root.get( "embeddables" );
+				assertThat( embeddables.isArray() ).isTrue();
+				assertThat( embeddables.size() ).isEqualTo( 1 );
+
+				JsonNode addressNode = findByName( embeddables, Address.class.getSimpleName() );
+				assertThat( addressNode ).isNotNull();
+				assertAttributes( Address.class, addressNode.get( "attributes" ), AccessType.FIELD );
+
+				// Mapped superclasses
+
+				final JsonNode superclasses = root.get( "mappedSuperclasses" );
+				assertThat( superclasses.isArray() ).isTrue();
+				assertThat( superclasses.isEmpty() ).isTrue();
+			}
+			catch (JsonProcessingException e) {
+				fail( "Encountered an exception during JSON processing", e );
+			}
+		}
+	}
+
+	@Test
+	public void testMappedSuperclasses() {
+		// We need entities that extend mapped-superclasses, otherwise they will just be ignored
+		final Metadata metadata = new MetadataSources().addAnnotatedClass( MappedSuperWithEmbeddedId.class )
+				.addAnnotatedClass( Entity1.class )
+				.addAnnotatedClass( MappedSuperWithoutId.class )
+				.addAnnotatedClass( Entity2.class )
+				.buildMetadata();
+		try (final SessionFactory sf = metadata.buildSessionFactory()) {
+			try {
+				final JsonNode root = toJson( sf.getMetamodel() );
+
+				final JsonNode superclasses = root.get( "mappedSuperclasses" );
+				assertThat( superclasses.isArray() ).isTrue();
+				assertThat( superclasses.size() ).isEqualTo( 2 );
+
+				JsonNode withId = findByName( superclasses, MappedSuperWithEmbeddedId.class.getSimpleName() );
+				assertThat( withId ).isNotNull();
+				assertThat( withId.get( "class" ).asText() ).isEqualTo( MappedSuperWithEmbeddedId.class.getName() );
+				assertThat( withId.get( "identifierAttribute" ).asText() ).isEqualTo( "embeddedId" );
+				assertAttributes( MappedSuperWithEmbeddedId.class, withId.get( "attributes" ), AccessType.FIELD );
+
+				JsonNode withoutId = findByName( superclasses, MappedSuperWithoutId.class.getSimpleName() );
+				assertThat( withoutId ).isNotNull();
+				assertThat( withoutId.get( "class" ).asText() ).isEqualTo( MappedSuperWithoutId.class.getName() );
+				assertThat( withoutId.has( "identifierAttribute" ) ).isFalse();
+
+				// double check entities.superClass contains the mapped superclasses
+				assertThat( root.get( "entities" )
+									.findValues( "superType" )
+									.stream()
+									.map( JsonNode::asText ) ).containsOnly(
+						MappedSuperWithEmbeddedId.class.getTypeName(),
+						MappedSuperWithoutId.class.getTypeName()
+				);
+			}
+			catch (JsonProcessingException e) {
+				fail( "Encountered an exception during JSON processing", e );
+			}
+		}
+	}
+
+	@Test
+	public void testStandardDomainModelInheritance() {
+		final Class<?>[] annotatedClasses = AnimalDomainModel.INSTANCE.getAnnotatedClasses();
+		final Metadata metadata = new MetadataSources().addAnnotatedClasses( annotatedClasses ).buildMetadata();
+		try (final SessionFactory sf = metadata.buildSessionFactory()) {
+			try {
+				final Metamodel metamodel = sf.getMetamodel();
+				final JsonNode root = toJson( metamodel );
+
+				final Set<EntityType<?>> metamodelEntities = metamodel.getEntities();
+
+				final JsonNode entities = root.get( "entities" );
+				assertThat( entities.isArray() ).isTrue();
+				assertThat( entities.size() ).isEqualTo( metamodelEntities.size() );
+
+				for ( EntityType<?> entity : metamodelEntities ) {
+					final String name = entity.getName();
+					final JsonNode entityNode = findByName( entities, name );
+					assertThat( entityNode ).isNotNull();
+					assertThat( entityNode.get( "class" ).asText() ).isEqualTo( entity.getJavaType().getTypeName() );
+					assertThat(
+							entityNode.get( "identifierAttribute" ).asText()
+					).isEqualTo( entity.getId( entity.getIdType().getJavaType() ).getName() );
+
+					final IdentifiableType<?> superType = entity.getSupertype();
+					if ( superType != null ) {
+						assertThat( entityNode.get( "superType" ).asText() )
+								.isEqualTo( superType.getJavaType().getTypeName() );
+					}
+					else {
+						assertThat( entityNode.has( "superType" ) ).isFalse();
+					}
+
+					assertAttributes( entity.getJavaType(), entityNode.get( "attributes" ), AccessType.PROPERTY );
+				}
+			}
+			catch (JsonProcessingException e) {
+				fail( "Encountered an exception during JSON processing", e );
+			}
+		}
+	}
+
+	private static JsonNode toJson(Metamodel metamodel) throws JsonProcessingException {
+		final String result = MetamodelJsonSerializerImpl.INSTANCE.toString( metamodel );
+		final JsonNode jsonNode;
+		try {
+			jsonNode = mapper.readTree( result );
+			if ( DEBUG ) {
+				System.out.println( mapper.writeValueAsString( jsonNode ) );
+			}
+			return jsonNode;
+		}
+		catch (JsonProcessingException e) {
+			if ( DEBUG ) {
+				System.out.println( result );
+			}
+			throw e;
+		}
+	}
+
+	// Helper to find node by name in a JSON array node
+	private static JsonNode findByName(JsonNode array, String name) {
+		assertThat( array.isArray() ).isTrue();
+		for ( JsonNode n : array ) {
+			if ( n.get( "name" ).asText().equals( name ) ) {
+				return n;
+			}
+		}
+		return null;
+	}
+
+	// Helper to check attributes
+	static void assertAttributes(Class<?> clazz, JsonNode attributesNode, AccessType accessType) {
+		final Set<String> jsonAttrs = attributesNode.findValues( "name" ).stream().map( JsonNode::asText ).collect(
+				Collectors.toSet() );
+		for ( MemberInfo member : getPersistentMembers( clazz, accessType ) ) {
+			final String attrName = member.name();
+			assertThat( jsonAttrs ).contains( attrName );
+			final JsonNode attrNode = findByName( attributesNode, attrName );
+			assertThat( attrNode ).isNotNull();
+			assertType( attrNode.get( "type" ).asText(), member.type() );
+		}
+	}
+
+	static void assertType(String actual, Class<?> expected) {
+		// using startsWith as plural attributes also contain the element name in brackets
+		assertThat( actual ).startsWith( expected.getTypeName() );
+	}
+
+	// Very simple helper to derive persistent members from a clazz (good enough but not be feature-complete)
+	static MemberInfo[] getPersistentMembers(Class<?> clazz, AccessType accessType) {
+		if ( accessType == AccessType.FIELD ) {
+			return Arrays.stream( clazz.getDeclaredFields() )
+					.filter( field -> !Modifier.isStatic( field.getModifiers() ) )
+					.map( field -> {
+						final String name = field.getName();
+						return new MemberInfo( name, field.getType() );
+					} )
+					.toArray( MemberInfo[]::new );
+		}
+		else {
+			return Arrays.stream( clazz.getDeclaredMethods() )
+					.filter( method -> !Modifier.isStatic( method.getModifiers() ) )
+					.filter( method -> method.getParameterCount() == 0 )
+					.filter( method -> method.getName().startsWith( "get" ) || method.getName().startsWith( "is" ) )
+					.map( method -> {
+						final String name = method.getName();
+						// Convert "getFoo" or "isFoo" to "foo"
+						final String fieldName = name.startsWith( "get" ) ?
+								name.substring( 3 ) :
+								name.substring( 2 );
+						return new MemberInfo( getJavaBeansFieldName( fieldName ), method.getReturnType() );
+					} )
+					.toArray( MemberInfo[]::new );
+		}
+	}
+
+	record MemberInfo(String name, Class<?> type) {
+	}
+
+	static String getJavaBeansFieldName(String name) {
+		if ( name.length() > 1 && Character.isUpperCase( name.charAt( 1 ) ) && Character.isUpperCase( name.charAt( 0 ) ) ) {
+			return name;
+		}
+		final char[] chars = name.toCharArray();
+		chars[0] = Character.toLowerCase( chars[0] );
+		return new String( chars );
+	}
+
+	@MappedSuperclass
+	static class MappedSuperWithEmbeddedId {
+		@EmbeddedId
+		private Address embeddedId;
+	}
+
+	@Entity
+	static class Entity1 extends MappedSuperWithEmbeddedId {
+	}
+
+	@MappedSuperclass
+	static class MappedSuperWithoutId {
+		private String createdBy;
+
+		private LocalDateTime createdAt;
+	}
+
+	@Entity
+	static class Entity2 extends MappedSuperWithoutId {
+		@Id
+		private Long id;
+	}
+}
diff --git a/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/ResultsJsonSerializerTest.java b/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/ResultsJsonSerializerTest.java
new file mode 100644
index 000000000000..137519f6e0eb
--- /dev/null
+++ b/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/ResultsJsonSerializerTest.java
@@ -0,0 +1,456 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.language;
+
+import org.hibernate.Hibernate;
+import org.hibernate.Session;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.query.SelectionQuery;
+import org.hibernate.tool.language.domain.Address;
+import org.hibernate.tool.language.domain.Company;
+import org.hibernate.tool.language.domain.Employee;
+import org.hibernate.tool.language.internal.ResultsJsonSerializerImpl;
+
+import org.hibernate.testing.orm.domain.StandardDomainModel;
+import org.hibernate.testing.orm.domain.animal.Cat;
+import org.hibernate.testing.orm.domain.animal.Human;
+import org.hibernate.testing.orm.domain.animal.Name;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.Tuple;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+@DomainModel(annotatedClasses = {
+		Address.class, Company.class, Employee.class,
+}, standardModels = {
+		StandardDomainModel.ANIMAL
+})
+@SessionFactory
+public class ResultsJsonSerializerTest {
+	private final ObjectMapper mapper = new ObjectMapper();
+
+	@Test
+	public void testEmbedded(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<Address> q = query(
+					"select address from Company where id = 1",
+					Address.class,
+					session
+			);
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+
+				final JsonNode jsonNode = getSingleValue( mapper.readTree( result ) );
+				assertThat( jsonNode.get( "city" ).textValue() ).isEqualTo( "Milan" );
+				assertThat( jsonNode.get( "street" ).textValue() ).isEqualTo( "Via Gustavo Fara" );
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testEmbeddedSubPart(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<String> q = query(
+					"select address.city from Company where id = 1",
+					String.class,
+					session
+			);
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+
+				final JsonNode jsonNode = getSingleValue( mapper.readTree( result ) );
+				assertThat( jsonNode.textValue() ).isEqualTo( "Milan" );
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testNumericFunction(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<Long> q = query( "select max(id) from Company", Long.class, session );
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+
+				final JsonNode jsonNode = getSingleValue( mapper.readTree( result ) );
+				assertThat( jsonNode.intValue() ).isEqualTo( 4 );
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testStringyFunction(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<String> q = query(
+					"select upper(name) from Company where id = 1",
+					String.class,
+					session
+			);
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+
+				final JsonNode jsonNode = getSingleValue( mapper.readTree( result ) );
+				assertThat( jsonNode.textValue() ).isEqualTo( "RED HAT" );
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testNullFunction(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<String> q = query(
+					"select lower(address.street) from Company where id = 4",
+					String.class,
+					session
+			);
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+
+				final JsonNode jsonNode = getSingleValue( mapper.readTree( result ) );
+				assertThat( jsonNode.isNull() ).isTrue();
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testCompany(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<Company> q = query( "from Company where id = 1", Company.class, session );
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+
+				final JsonNode jsonNode = getSingleValue( mapper.readTree( result ) );
+				assertThat( jsonNode.get( "id" ).intValue() ).isEqualTo( 1 );
+				assertThat( jsonNode.get( "name" ).textValue() ).isEqualTo( "Red Hat" );
+				assertThat( jsonNode.get( "employees" ).textValue() ).isEqualTo( "<uninitialized>" );
+
+				final JsonNode address = jsonNode.get( "address" );
+				assertThat( address.get( "city" ).textValue() ).isEqualTo( "Milan" );
+				assertThat( address.get( "street" ).textValue() ).isEqualTo( "Via Gustavo Fara" );
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testMultipleSelectionsArray(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<Object[]> q = query(
+					"SELECT e.firstName, e.lastName FROM Employee e JOIN e.company c WHERE c.name = 'IBM'",
+					Object[].class,
+					session
+			);
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+
+				System.out.println(result);
+
+				final JsonNode jsonNode = getSingleValue( mapper.readTree( result ) );
+				assertThat( jsonNode.isArray() ).isTrue();
+				assertThat( jsonNode.get( 0 ).asText() ).isEqualTo( "Andrea" );
+				assertThat( jsonNode.get( 1 ).asText() ).isEqualTo( "Boriero" );
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testMultipleSelectionsTuple(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<Tuple> q = query(
+					"SELECT e.firstName, e.lastName FROM Employee e where e.company.id = 1 ORDER BY e.lastName, e.firstName",
+					Tuple.class,
+					session
+			);
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+
+				System.out.println(result);
+
+				final JsonNode jsonNode = mapper.readTree( result );
+				assertThat( jsonNode.isArray() ).isTrue();
+				assertThat( jsonNode.size() ).isEqualTo( 2 );
+
+				final JsonNode first = jsonNode.get( 0 );
+				assertThat( first.isArray() ).isTrue();
+				assertThat( first.size() ).isEqualTo( 2 );
+				assertThat( first.get( 0 ).asText() ).isEqualTo( "Marco" );
+				assertThat( first.get( 1 ).asText() ).isEqualTo( "Belladelli" );
+
+				final JsonNode second = jsonNode.get( 1 );
+				assertThat( second.isArray() ).isTrue();
+				assertThat( second.size() ).isEqualTo( 2 );
+				assertThat( second.get( 0 ).asText() ).isEqualTo( "Matteo" );
+				assertThat( second.get( 1 ).asText() ).isEqualTo( "Cauzzi" );
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testCompanyFetchEmployees(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<Company> q = query(
+					"from Company c join fetch c.employees where c.id = 1",
+					Company.class,
+					session
+			);
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+
+				final JsonNode jsonNode = getSingleValue( mapper.readTree( result ) );
+				assertThat( jsonNode.get( "id" ).intValue() ).isEqualTo( 1 );
+				assertThat( jsonNode.get( "name" ).textValue() ).isEqualTo( "Red Hat" );
+
+				final JsonNode employees = jsonNode.get( "employees" );
+				assertThat( employees.isArray() ).isTrue();
+				employees.forEach( employee -> {
+					assertDoesNotThrow( () -> UUID.fromString( employee.get( "uniqueIdentifier" ).asText() ) );
+					assertThat( employee.get( "firstName" ).textValue() ).startsWith( "Ma" );
+					final JsonNode company = employee.get( "company" );
+					assertThat( company.get( "id" ).intValue() ).isEqualTo( 1 );
+					assertThat( company.properties().stream().map( Map.Entry::getKey ) )
+							.containsOnly( "id" ); // circular relationship
+				} );
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testSelectCollection(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<Employee> q = query(
+					"select c.employees from Company c where c.id = 1",
+					Employee.class,
+					session
+			);
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+				System.out.println( result );
+
+				final JsonNode jsonNode = mapper.readTree( result );
+				assertThat( jsonNode.isArray() ).isTrue();
+				assertThat( jsonNode.size() ).isEqualTo( 2 );
+
+				final JsonNode first = jsonNode.get( 0 );
+				assertThat( first.isObject() ).isTrue();
+				assertDoesNotThrow( () -> UUID.fromString( first.get( "uniqueIdentifier" ).asText() ) );
+				assertThat( first.get( "company" ).get( "name" ).textValue() ).isEqualTo( "Red Hat" );
+
+				final JsonNode second = jsonNode.get( 1 );
+				assertThat( second.isObject() ).isTrue();
+				assertDoesNotThrow( () -> UUID.fromString( second.get( "uniqueIdentifier" ).asText() ) );
+				assertThat( second.get( "company" ).get( "name" ).textValue() ).isEqualTo( "Red Hat" );
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testSelectCollectionProperty(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<String> q = query(
+					"select element(c.employees).firstName from Company c where c.id = 1",
+					String.class,
+					session
+			);
+
+			try {
+				final String result = toString( q.getResultList(), q, scope.getSessionFactory() );
+				System.out.println( result );
+
+				final JsonNode jsonNode = mapper.readTree( result );
+				assertThat( jsonNode.isArray() ).isTrue();
+				assertThat( jsonNode.size() ).isEqualTo( 2 );
+				assertThat( Set.of( jsonNode.get( 0 ).textValue(), jsonNode.get( 1 ).textValue() ) ).containsOnly(
+						"Marco",
+						"Matteo"
+				);
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@Test
+	public void testComplexInheritance(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final SelectionQuery<Human> q = query( "from Human h where h.id = 1", Human.class, session );
+
+			try {
+				final Human human = q.getSingleResult();
+
+				Hibernate.initialize( human.getFamily() );
+				assertThat( human.getFamily() ).hasSize( 1 );
+				Hibernate.initialize( human.getPets() );
+				assertThat( human.getPets() ).hasSize( 1 );
+				Hibernate.initialize( human.getNickNames() );
+				assertThat( human.getNickNames() ).hasSize( 2 );
+
+				final String result = toString( List.of( human ), q, scope.getSessionFactory() );
+
+				final JsonNode jsonNode = getSingleValue( mapper.readTree( result ) );
+				assertThat( jsonNode.get( "id" ).intValue() ).isEqualTo( 1 );
+
+				final JsonNode family = jsonNode.get( "family" );
+				assertThat( family.isArray() ).isTrue();
+				final JsonNode mapNode = getSingleValue( family );
+				assertThat( mapNode.isObject() ).isTrue();
+				assertThat( mapNode.get( "key" ).textValue() ).isEqualTo( "sister" );
+				assertThat( mapNode.get( "value" ).get( "description" ).textValue() ).isEqualTo( "Marco's sister" );
+
+				final JsonNode pets = jsonNode.get( "pets" );
+				assertThat( pets.isArray() ).isTrue();
+				assertThat( pets.size() ).isEqualTo( 1 );
+				final JsonNode cat = pets.get( 0 );
+				assertThat( cat.isObject() ).isTrue();
+				assertThat( cat.get( "id" ).intValue() ).isEqualTo( 2 );
+				assertThat( cat.get( "description" ).textValue() ).isEqualTo( "Gatta" );
+				final JsonNode owner = cat.get( "owner" );
+				assertThat( owner.get( "id" ).intValue() ).isEqualTo( 1 );
+				assertThat( owner.properties().stream().map( Map.Entry::getKey ) )
+						.containsOnly( "id" ); // circular relationship
+
+				final JsonNode nickNames = jsonNode.get( "nickNames" );
+				assertThat( nickNames.isArray() ).isTrue();
+				assertThat( nickNames.size() ).isEqualTo( 2 );
+				assertThat( Set.of( nickNames.get( 0 ).textValue(), nickNames.get( 1 ).textValue() ) ).containsOnly(
+						"Bella",
+						"Eskimo Joe"
+				);
+			}
+			catch (JsonProcessingException e) {
+				fail( "Serialization failed with exception", e );
+			}
+		} );
+	}
+
+	@BeforeAll
+	public void beforeAll(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final Company rh = new Company( 1L, "Red Hat", new Address( "Milan", "Via Gustavo Fara" ) );
+			session.persist( rh );
+			final Company ibm = new Company( 2L, "IBM", new Address( "Segrate", "Circonvallazione Idroscalo" ) );
+			session.persist( ibm );
+			session.persist( new Company( 3L, "Belladelli Giovanni", new Address( "Pegognaga", "Via Roma" ) ) );
+			session.persist( new Company( 4L, "Another Company", null ) );
+
+			session.persist( new Employee( UUID.randomUUID(), "Marco", "Belladelli", 100_000, rh ) );
+			session.persist( new Employee( UUID.randomUUID(), "Matteo", "Cauzzi", 50_000, rh ) );
+			session.persist( new Employee( UUID.randomUUID(), "Andrea", "Boriero", 200_000, ibm ) );
+
+			final Human human = human( 1L, session );
+			cat( 2L, human, session );
+		} );
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.dropData();
+	}
+
+	static <T> SelectionQuery<T> query(String hql, Class<T> resultType, SharedSessionContractImplementor session) {
+		return session.createSelectionQuery( hql, resultType );
+	}
+
+	static <T> String toString(
+			List<? extends T> values,
+			SelectionQuery<T> query,
+			SessionFactoryImplementor sessionFactory) {
+		try {
+			return new ResultsJsonSerializerImpl( sessionFactory ).toString( values, query );
+		}
+		catch (IOException e) {
+			throw new UncheckedIOException( "Error during result serialization", e );
+		}
+	}
+
+	static JsonNode getSingleValue(JsonNode jsonNode) {
+		assertThat( jsonNode.isArray() ).isTrue();
+		assertThat( jsonNode.size() ).isEqualTo( 1 );
+		return jsonNode.get( 0 );
+	}
+
+	private static Human human(Long id, Session session) {
+		final Human human = new Human();
+		human.setId( id );
+		human.setName( new Name( "Marco", 'M', "Belladelli" ) );
+		human.setBirthdate( new Date() );
+		human.setNickNames( new TreeSet<>( Set.of( "Bella", "Eskimo Joe" ) ) );
+		final Human sister = new Human();
+		sister.setId( 99L );
+		sister.setName( new Name( "Sister", 'S', "Belladelli" ) );
+		sister.setDescription( "Marco's sister" );
+		human.setFamily( Map.of( "sister", sister ) );
+		session.persist( sister );
+		session.persist( human );
+		return human;
+	}
+
+	private static Cat cat(Long id, Human owner, Session session) {
+		final Cat cat = new Cat();
+		cat.setId( id );
+		cat.setDescription( "Gatta" );
+		cat.setOwner( owner );
+		session.persist( cat );
+		return cat;
+	}
+}
diff --git a/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/domain/Address.java b/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/domain/Address.java
new file mode 100644
index 000000000000..d34c21f0bc1b
--- /dev/null
+++ b/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/domain/Address.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.language.domain;
+
+import jakarta.persistence.Embeddable;
+import java.io.Serializable;
+
+@Embeddable
+public class Address implements Serializable {
+	private String city;
+
+	private String street;
+
+	public Address() {
+	}
+
+	public Address(String city, String street) {
+		this.city = city;
+		this.street = street;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getStreet() {
+		return street;
+	}
+
+	public void setStreet(String street) {
+		this.street = street;
+	}
+}
diff --git a/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/domain/Company.java b/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/domain/Company.java
new file mode 100644
index 000000000000..69e80a62b4ef
--- /dev/null
+++ b/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/domain/Company.java
@@ -0,0 +1,63 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.language.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class Company implements Serializable {
+	@Id
+	private long id;
+
+	@Column(nullable = false)
+	private String name;
+
+	@Embedded
+	private Address address;
+
+	@OneToMany(mappedBy="company")
+	private List<Employee> employees;
+
+	public Company() {
+	}
+
+	public Company(long id, String name, Address address) {
+		this.id = id;
+		this.name = name;
+		this.address = address;
+		this.employees = new ArrayList<>();
+	}
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Address getAddress() {
+		return address;
+	}
+
+	public void setAddress(Address address) {
+		this.address = address;
+	}
+}
diff --git a/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/domain/Employee.java b/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/domain/Employee.java
new file mode 100644
index 000000000000..9fab27cc5b34
--- /dev/null
+++ b/tooling/hibernate-assistant/src/test/java/org/hibernate/tool/language/domain/Employee.java
@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.language.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import java.util.UUID;
+
+@Entity(name = "Employee")
+public class Employee {
+	private UUID uniqueIdentifier;
+
+	private String firstName;
+
+	private String lastName;
+
+	private float salary;
+
+	private Company company;
+
+	public Employee() {
+	}
+
+	public Employee(UUID uniqueIdentifier, String firstName, String lastName, float salary, Company company) {
+		this.uniqueIdentifier = uniqueIdentifier;
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.salary = salary;
+		this.company = company;
+	}
+
+	@Id
+	public UUID getUniqueIdentifier() {
+		return uniqueIdentifier;
+	}
+
+	public void setUniqueIdentifier(UUID uniqueIdentifier) {
+		this.uniqueIdentifier = uniqueIdentifier;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public float getSalary() {
+		return salary;
+	}
+
+	public void setSalary(float salary) {
+		this.salary = salary;
+	}
+
+	@ManyToOne
+	public Company getCompany() {
+		return company;
+	}
+
+	public void setCompany(Company company) {
+		this.company = company;
+	}
+}
diff --git a/tooling/hibernate-assistant/src/test/resources/hibernate.properties b/tooling/hibernate-assistant/src/test/resources/hibernate.properties
new file mode 100644
index 000000000000..bfe2323b3697
--- /dev/null
+++ b/tooling/hibernate-assistant/src/test/resources/hibernate.properties
@@ -0,0 +1,10 @@
+hibernate.dialect org.hibernate.dialect.H2Dialect
+hibernate.connection.driver_class org.h2.Driver
+#hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE
+hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
+hibernate.connection.username sa
+hibernate.connection.password 
+
+hibernate.show_sql true
+hibernate.format_sql true
+hibernate.highlight_sql true
diff --git a/tooling/hibernate-assistant/src/test/resources/log4j2.properties b/tooling/hibernate-assistant/src/test/resources/log4j2.properties
new file mode 100644
index 000000000000..941cf490645c
--- /dev/null
+++ b/tooling/hibernate-assistant/src/test/resources/log4j2.properties
@@ -0,0 +1,20 @@
+# Set to debug or trace if log4j initialization is failing
+status = warn
+
+# Console appender configuration
+appender.console.type = Console
+appender.console.name = consoleLogger
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Root logger level
+rootLogger.level = info
+
+# Root logger referring to console appender
+rootLogger.appenderRef.stdout.ref = consoleLogger
+
+logger.jdbc-bind.name=org.hibernate.orm.jdbc.bind
+logger.jdbc-bind.level=trace
+
+logger.jdbc-extract.name=org.hibernate.orm.jdbc.extract
+logger.jdbc-extract.level=trace
diff --git a/tooling/hibernate-gradle-plugin/README.adoc b/tooling/hibernate-gradle-plugin/README.adoc
index e0cc5ef84f43..da59cbc5ff75 100644
--- a/tooling/hibernate-gradle-plugin/README.adoc
+++ b/tooling/hibernate-gradle-plugin/README.adoc
@@ -8,7 +8,7 @@ A Gradle plugin for introducing Hibernate tasks and capabilities into a build.
 [source,groovy]
 ----
 plugins {
-  id 'org.hibernate.orm'
+  id("org.hibernate.orm") version "<version-to-use>"
 }
 
 // HibernateOrmSpec
@@ -53,25 +53,49 @@ To enable enhancement, reference the DSL extension:
 [source,groovy]
 ----
 hibernate {
-    enhancement
+    enhancement {
+    }
 }
 ----
 
-Enhancement has a few options to control what enhancements take place.  All the options default to `false`:
+Enhancement has a few options to control what enhancements take place. These are the defaults:
 
 [source,groovy]
 ----
 hibernate {
-  enhancement {
-    lazyInitialization = true
-    dirtyTracking = true
-    associationManagement = true
-    extendedEnhancement = false
-  }
+    enhancement {
+        enableLazyInitialization = true
+        enableDirtyTracking = true
+        enableAssociationManagement = false
+        enableExtendedEnhancement = false
+    }
 }
 ----
 
+All options are deprecated for removal.
+
 [[hbm-xml]]
 == Legacy `hbm.xml` Transformation
 
-Coming soon...
+Gradle Task Example
+```
+//build.gradle
+
+import org.hibernate.orm.tooling.gradle.misc.TransformHbmXmlTask
+
+plugins {
+    ...
+    id("org.hibernate.orm") version "6.6.40.Final" // replace version as appropriate
+}
+
+tasks.register("transformHbmXml", TransformHbmXmlTask) { 
+    source = fileTree("path/to/your/xml/mappings") {
+        include "**/*.hbm.xml"
+    }
+    it.renaming.get().prefix.set("transformed-") // Prefix to apply to the generated orm.xml files
+    it.renaming.get().suffix.set("-transformed") // Suffix to apply to the generated orm.xml files
+    it.renaming.get().extension.set("orm.xml")
+    outputDirectory = project.layout.buildDirectory.dir("generated/orm")
+}
+```
+More coming soon...
diff --git a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
index 7187d8e3929e..902dabc62067 100644
--- a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
+++ b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
@@ -19,7 +19,11 @@ plugins {
 description = "Gradle plugin for integrating Hibernate aspects into your build"
 
 dependencies {
+	// align artifacts natively when consuming through Gradle
+	api platform(project(":hibernate-platform"))
+
 	implementation project(':hibernate-core')
+	implementation project(':hibernate-reveng')
 	implementation libs.byteBuddy
 	implementation jakartaLibs.jaxbApi
 
@@ -38,17 +42,37 @@ dependencies {
 	testRuntimeOnly testLibs.junitJupiterLauncher
 }
 
+sourceSets {
+	functionalTest {
+	}
+}
+
+configurations {
+	functionalTestImplementation.extendsFrom testImplementation
+	functionalTestRuntimeOnly.extendsFrom testRuntimeOnly
+}
+
+dependencies {
+	functionalTestRuntimeOnly jdbcLibs.h2
+}
+
+tasks.named( "forbiddenApisFunctionalTest" ) {
+	enabled = false
+}
+
 gradlePlugin {
 	website = 'https://github.com/hibernate/hibernate-orm/tree/main/tooling/hibernate-gradle-plugin'
 	vcsUrl = 'https://github.com/hibernate/hibernate-orm/tree/main/tooling/hibernate-gradle-plugin'
 
+	testSourceSets sourceSets.test, sourceSets.functionalTest
+
 	plugins {
 		ormPlugin {
 			id = "org.hibernate.orm"
 			implementationClass = "org.hibernate.orm.tooling.gradle.HibernateOrmPlugin"
 			displayName = 'Gradle plugin for Hibernate ORM'
 			description = 'Applies Hibernate aspects into the build'
-			tags = ['hibernate','orm','bytecode','enhancement','bytebuddy']
+			tags = ['hibernate','orm','bytecode','enhancement','bytebuddy','reverse engineering','reveng','generation']
 		}
 	}
 }
@@ -69,29 +93,39 @@ test {
 			"--add-opens", "java.base/java.util.concurrent.atomic=ALL-UNNAMED")
 }
 
+def functionalTestTask = tasks.register("functionalTest", Test) {
+	description = "Runs the functional tests."
+	group = "verification"
+	testClassesDirs = sourceSets.functionalTest.output.classesDirs
+	classpath = sourceSets.functionalTest.runtimeClasspath
+	useJUnitPlatform()
+	systemProperty("gradle.test.version", project.property("orm.gradle.min"))
+	systemProperty("h2.version", jdbcLibs.versions.h2.get())
+	jvmArgs("--add-opens", "java.base/java.lang.invoke=ALL-UNNAMED",
+			"--add-opens", "java.base/java.util=ALL-UNNAMED",
+			"--add-opens", "java.base/java.util.concurrent.atomic=ALL-UNNAMED")
+}
+
+tasks.named("check") {
+	dependsOn functionalTestTask
+}
+
 if ( jdkVersions.test.launcher.asInt() > 21 ) {
     project.logger.lifecycle( "Skipping {} tests for JDK version {}", project.name, jdkVersions.test.launcher.asInt() )
     tasks.getByName( "test" ).enabled = false
+    tasks.getByName( "functionalTest" ).enabled = false
 }
 
 def releasePrepareTask = tasks.register("releasePrepare") {
-	group "release-prepare"
-	description "See :release:releasePrepare for details.  Here we hook in the `check` task."
+	group ="release-prepare"
+	description = "See :release:releasePrepare for details.  Here we hook in the `check` task."
 
 	dependsOn tasks.check
 }
 
-// used from the h2 CI job
-tasks.register("preVerifyRelease") {
-	group "release-prepare"
-	description "Delegates to `releasePrepare` task"
-
-	dependsOn releasePrepareTask
-}
-
 tasks.register("releaseGradlePluginPerform") {
-	group "release-perform"
-	description "An explicit task for publishing Gradle Plugins to the Plugin Portal"
+	group = "release-perform"
+	description = "An explicit task for publishing Gradle Plugins to the Plugin Portal"
 
 	dependsOn tasks.publishPlugins
 }
@@ -102,7 +136,7 @@ publishing {
 	repositories {
 		maven {
 			name = 'localPluginRepository'
-			url = "${buildDir}/local-plugin-repository"
+            url = layout.buildDirectory.dir("local-plugin-repository").get().asFile.toURI()
 		}
 	}
 }
@@ -132,29 +166,35 @@ else {
 		tasks.named( "compileTestJava", JavaCompile ).configure {
 			options.release = Math.min( jdkVersions.test.compiler.asInt(), jdkVersions.min.asInt() )
 		}
+		tasks.named( "compileFunctionalTestJava", JavaCompile ).configure {
+			options.release = Math.min( jdkVersions.test.compiler.asInt(), jdkVersions.min.asInt() )
+		}
 		// Must configure the test launcher to a version <= orm.jdk.max, because the tests invoke gradle,
 		// which inherently can only run with a JDK up to orm.jdk.max.
 		// Since we only support running Gradle with JDKs in the range of orm.jdk.min up to orm.jdk.max,
 		// we use a test java launcher for the latest available/configured JDK version
+		def testLauncher = javaToolchains.launcherFor {
+			languageVersion = jdkVersions.min
+		}
+		for ( int version = jdkVersions.min.asInt() + 1; version <= jdkVersions.max.asInt(); version++ ) {
+			testLauncher = new DefaultProvider(() -> {
+				try {
+					return javaToolchains.launcherFor {
+						languageVersion = JavaLanguageVersion.of( version )
+					}.get()
+				}
+				catch (GradleException ex) {
+					// JavaToolchainQueryService unfortunately throws an exception if a version is not found,
+					// so we have to catch the exception and return null here to allow a fallback
+					return null
+				}
+			}).orElse( testLauncher )
+		}
 		tasks.named( "test", Test ).configure {
-			def launcher = javaToolchains.launcherFor {
-				languageVersion = jdkVersions.min
-			}
-			for ( int version = jdkVersions.min.asInt() + 1; version <= jdkVersions.max.asInt(); version++ ) {
-				launcher = new DefaultProvider(() -> {
-					try {
-						return javaToolchains.launcherFor {
-							languageVersion = JavaLanguageVersion.of( version )
-						}.get()
-					}
-					catch (GradleException ex) {
-						// JavaToolchainQueryService unfortunately throws an exception if a version is not found,
-						// so we have to catch the exception and return null here to allow a fallback
-						return null
-					}
-				}).orElse( launcher )
-			}
-			javaLauncher = launcher
+			javaLauncher = testLauncher
+		}
+		tasks.named( "functionalTest", Test ).configure {
+			javaLauncher = testLauncher
 		}
 	}
 }
diff --git a/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateCfgTest.java b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateCfgTest.java
new file mode 100644
index 000000000000..5f494d290a18
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateCfgTest.java
@@ -0,0 +1,37 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+import java.nio.file.Files;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class GenerateCfgTest extends TestTemplate {
+
+	@BeforeEach
+	public void beforeEach() {
+		setGradleTaskToPerform("generateCfg");
+		setDatabaseCreationScript(new String[] {
+				"create table FOO (ID int not null, BAR varchar(20), primary key (ID))"
+		});
+	}
+
+	@Test
+	void testGenerateCfg() throws Exception {
+		createProjectAndExecuteGradleCommand();
+		File generatedSourcesFolder = new File(getProjectDir(), "app/generated-sources");
+		assertTrue(getBuildResult().getOutput().contains("Starting CFG export to directory: "));
+		File cfgFile = new File(generatedSourcesFolder, "hibernate.cfg.xml");
+		assertTrue(cfgFile.exists());
+		assertTrue(cfgFile.isFile());
+		String cfgContents = Files.readString(cfgFile.toPath());
+		assertTrue(cfgContents.contains("<mapping resource=\"Foo.hbm.xml\"/>"));
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateDaoTest.java b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateDaoTest.java
new file mode 100644
index 000000000000..34329e549ae7
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateDaoTest.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class GenerateDaoTest extends TestTemplate {
+
+	@BeforeEach
+	public void beforeEach() {
+		setGradleTaskToPerform("generateDao");
+		setDatabaseCreationScript(new String[] {
+				"create table FOO (ID int not null, BAR varchar(20), primary key (ID))"
+		});
+	}
+
+	@Test
+	void testGenerateDao() throws Exception {
+		setRevengExtensionSection(
+				"    packageName = 'foo.model'"
+		);
+		createProjectAndExecuteGradleCommand();
+		File generatedSourcesFolder = new File(getProjectDir(), "app/generated-sources");
+		assertTrue(getBuildResult().getOutput().contains("Starting DAO export to directory: "));
+		assertTrue(generatedSourcesFolder.exists());
+		assertTrue(generatedSourcesFolder.isDirectory());
+		File fooFile = new File(generatedSourcesFolder, "foo/model/FooHome.java");
+		assertTrue(fooFile.exists());
+		assertTrue(fooFile.isFile());
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateHbmTest.java b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateHbmTest.java
new file mode 100644
index 000000000000..888d3042bba1
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateHbmTest.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class GenerateHbmTest extends TestTemplate {
+
+	@BeforeEach
+	public void beforeEach() {
+		setGradleTaskToPerform("generateHbm");
+		setDatabaseCreationScript(new String[] {
+				"create table FOO (ID int not null, BAR varchar(20), primary key (ID))"
+		});
+	}
+
+	@Test
+	void testGenerateHbm() throws Exception {
+		setRevengExtensionSection(
+				"    packageName = 'foo.model'"
+		);
+		createProjectAndExecuteGradleCommand();
+		File generatedSourcesFolder = new File(getProjectDir(), "app/generated-sources");
+		assertTrue(getBuildResult().getOutput().contains("Starting HBM export to directory: "));
+		assertTrue(generatedSourcesFolder.exists());
+		assertTrue(generatedSourcesFolder.isDirectory());
+		File fooFile = new File(generatedSourcesFolder, "foo/model/Foo.hbm.xml");
+		assertTrue(fooFile.exists());
+		assertTrue(fooFile.isFile());
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateJavaTest.java b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateJavaTest.java
new file mode 100644
index 000000000000..8e6c3703025c
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/GenerateJavaTest.java
@@ -0,0 +1,135 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+import java.nio.file.Files;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class GenerateJavaTest extends TestTemplate {
+
+	@BeforeEach
+	public void beforeEach() {
+		setGradleTaskToPerform("generateJava");
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+		});
+	}
+
+	@Test
+	public void testJpaDefault() throws Exception {
+		createProjectAndExecuteGradleCommand();
+		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
+		assertTrue(generatedOutputFolder.exists());
+		assertTrue(generatedOutputFolder.isDirectory());
+		assertEquals(1, generatedOutputFolder.list().length);
+		File generatedPersonJavaFile = new File(generatedOutputFolder, "Person.java");
+		assertTrue(generatedPersonJavaFile.exists());
+		assertTrue(generatedPersonJavaFile.isFile());
+		String generatedPersonJavaFileContents = new String(
+				Files.readAllBytes(generatedPersonJavaFile.toPath()));
+		assertTrue(generatedPersonJavaFileContents.contains("import jakarta.persistence.Entity;"));
+		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+	}
+
+	@Test
+	public void testNoAnnotations() throws Exception {
+		setRevengExtensionSection(
+				"    generateAnnotations=false"
+		);
+		createProjectAndExecuteGradleCommand();
+		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
+		assertTrue(generatedOutputFolder.exists());
+		assertTrue(generatedOutputFolder.isDirectory());
+		assertEquals(1, generatedOutputFolder.list().length);
+		File generatedPersonJavaFile = new File(generatedOutputFolder, "Person.java");
+		assertTrue(generatedPersonJavaFile.exists());
+		assertTrue(generatedPersonJavaFile.isFile());
+		String generatedPersonJavaFileContents = new String(
+				Files.readAllBytes(generatedPersonJavaFile.toPath()));
+		assertFalse(generatedPersonJavaFileContents.contains("import jakarta.persistence.Entity;"));
+		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+	}
+
+	@Test
+	public void testNoGenerics() throws Exception {
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null,  NAME varchar(20), primary key (ID))",
+				"create table ITEM (ID int not null,  NAME varchar(20), OWNER_ID int not null, " +
+						"   primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
+		});
+		setRevengExtensionSection(
+				"    useGenerics=false"
+		);
+		createProjectAndExecuteGradleCommand();
+		executeGradleCommand("generateJava");
+		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
+		assertTrue(generatedOutputFolder.exists());
+		assertTrue(generatedOutputFolder.isDirectory());
+		assertEquals(2, generatedOutputFolder.list().length);
+		File generatedPersonJavaFile = new File(generatedOutputFolder, "Person.java");
+		assertTrue(generatedPersonJavaFile.exists());
+		assertTrue(generatedPersonJavaFile.isFile());
+		String generatedPersonJavaFileContents = new String(
+				Files.readAllBytes(generatedPersonJavaFile.toPath()));
+		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+		assertFalse(generatedPersonJavaFileContents.contains("Set<Item>"));
+		File generatedItemJavaFile = new File(generatedOutputFolder, "Item.java");
+		assertTrue(generatedItemJavaFile.exists());
+		assertTrue(generatedItemJavaFile.isFile());
+		String generatedItemJavaFileContents = new String(
+				Files.readAllBytes(generatedItemJavaFile.toPath()));
+		assertTrue(generatedItemJavaFileContents.contains("public class Item "));
+	}
+
+	@Test
+	public void testUseGenerics() throws Exception {
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null,  NAME varchar(20), primary key (ID))",
+				"create table ITEM (ID int not null,  NAME varchar(20), OWNER_ID int not null, " +
+						"   primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
+		});
+		createProjectAndExecuteGradleCommand();
+		executeGradleCommand("generateJava");
+		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
+		assertTrue(generatedOutputFolder.exists());
+		assertTrue(generatedOutputFolder.isDirectory());
+		assertEquals(2, generatedOutputFolder.list().length);
+		File generatedPersonJavaFile = new File(generatedOutputFolder, "Person.java");
+		assertTrue(generatedPersonJavaFile.exists());
+		assertTrue(generatedPersonJavaFile.isFile());
+		String generatedPersonJavaFileContents = new String(
+				Files.readAllBytes(generatedPersonJavaFile.toPath()));
+		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+		assertTrue(generatedPersonJavaFileContents.contains("Set<Item>"));
+		File generatedItemJavaFile = new File(generatedOutputFolder, "Item.java");
+		assertTrue(generatedItemJavaFile.exists());
+		assertTrue(generatedItemJavaFile.isFile());
+		String generatedItemJavaFileContents = new String(
+				Files.readAllBytes(generatedItemJavaFile.toPath()));
+		assertTrue(generatedItemJavaFileContents.contains("public class Item "));
+	}
+
+	@Test
+	public void testPackageName() throws Exception {
+		setRevengExtensionSection(
+				"    packageName = 'foo.model'"
+		);
+		createProjectAndExecuteGradleCommand();
+		File generatedSourcesFolder = new File(getProjectDir(), "app/generated-sources");
+		assertTrue(generatedSourcesFolder.exists());
+		assertTrue(generatedSourcesFolder.isDirectory());
+		File fooFile = new File(generatedSourcesFolder, "foo/model/Person.java");
+		assertTrue(fooFile.exists());
+		assertTrue(fooFile.isFile());
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/RevengFileTest.java b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/RevengFileTest.java
new file mode 100644
index 000000000000..61c388ad384c
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/RevengFileTest.java
@@ -0,0 +1,57 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+import java.nio.file.Files;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+
+public class RevengFileTest extends TestTemplate {
+
+	@BeforeEach
+	public void beforeEach() throws Exception {
+		setGradleTaskToPerform("generateJava");
+		setDatabaseCreationScript(new String[] {
+				"create table ALL_PERSONS (ID int not null, NAME varchar(20), primary key (ID))"
+		});
+	}
+
+	@Test
+	public void testTutorial() throws Exception {
+		setRevengExtensionSection(
+				"    revengFile = 'foo.reveng.xml'"
+		);
+		createProjectAndExecuteGradleCommand();
+		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
+		assertTrue(generatedOutputFolder.exists());
+		assertTrue(generatedOutputFolder.isDirectory());
+		assertEquals(1, generatedOutputFolder.list().length);
+		File generatedPersonJavaFile = new File(generatedOutputFolder, "Person.java");
+		assertTrue(generatedPersonJavaFile.exists());
+		assertTrue(generatedPersonJavaFile.isFile());
+	}
+
+	protected void createProject() throws Exception {
+		super.createProject();
+		createRevengFile();
+	}
+
+	private void createRevengFile() throws Exception {
+		String revengXml =
+				"<hibernate-reverse-engineering>\n" +
+				"  <table name=\"ALL_PERSONS\" class=\"Person\" />" +
+				"</hibernate-reverse-engineering>";
+		File resourcesFolder = new File(getProjectDir(), "app/src/main/resources");
+		resourcesFolder.mkdirs();
+		Files.writeString(new File(resourcesFolder, "foo.reveng.xml").toPath(), revengXml);
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/RunSqlTest.java b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/RunSqlTest.java
new file mode 100644
index 000000000000..e87827b127e2
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/RunSqlTest.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class RunSqlTest extends TestTemplate {
+
+	@BeforeEach
+	public void beforeEach() {
+		setGradleTaskToPerform("runSql");
+	}
+
+	@Test
+	void testRunSql() throws Exception {
+		setRevengExtensionSection(
+				"    sqlToRun = 'create table foo (id int not null primary key, baz varchar(256))'"
+		);
+		assertNull(getDatabaseFile());
+		createProjectAndExecuteGradleCommand();
+		assertTrue(getBuildResult().getOutput().contains("Running SQL: create table foo (id int not null primary key, baz varchar(256))"));
+		assertNotNull(getDatabaseFile());
+		assertTrue(getDatabaseFile().exists());
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/TestTemplate.java b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/TestTemplate.java
new file mode 100644
index 000000000000..195a1985f39e
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/TestTemplate.java
@@ -0,0 +1,192 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.jupiter.api.io.TempDir;
+
+import org.gradle.testkit.runner.BuildResult;
+import org.gradle.testkit.runner.GradleRunner;
+
+public class TestTemplate {
+
+	protected static final String[] GRADLE_INIT_PROJECT_ARGUMENTS = new String[] {
+			"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"};
+
+	@TempDir
+	private File projectDir;
+
+	private File gradlePropertiesFile;
+	private File gradleBuildFile;
+	private File databaseFile;
+
+	private String[] databaseCreationScript;
+	private String revengExtensionSection;
+	private String gradleTaskToPerform;
+	private BuildResult buildResult;
+
+	protected File getProjectDir() { return projectDir; }
+	protected File getGradlePropertiesFile() { return gradlePropertiesFile; }
+	protected void setGradlePropertiesFile(File f) { this.gradlePropertiesFile = f; }
+	protected File getGradleBuildFile() { return gradleBuildFile; }
+	protected void setGradleBuildFile(File f) { gradleBuildFile = f; }
+	protected File getDatabaseFile() { return databaseFile; }
+	protected void setDatabaseFile(File f) { databaseFile = f; }
+	protected String[] getDatabaseCreationScript() { return databaseCreationScript; }
+	protected void setDatabaseCreationScript(String[] script) { databaseCreationScript = script; }
+	protected String getRevengExtensionSection() { return revengExtensionSection; }
+	protected void setRevengExtensionSection(String s) { revengExtensionSection = s; }
+	protected String getGradleTaskToPerform() { return gradleTaskToPerform; }
+	protected void setGradleTaskToPerform(String command) { gradleTaskToPerform = command; }
+	protected BuildResult getBuildResult() { return buildResult; }
+
+	protected void executeGradleCommand(String ... gradleCommandLine) {
+		GradleRunner runner = GradleRunner.create();
+		String gradleVersion = System.getProperty("gradle.test.version");
+		if (gradleVersion != null) {
+			runner.withGradleVersion(gradleVersion);
+		}
+		List<String> args = new ArrayList<>(Arrays.asList(gradleCommandLine));
+		String javaHome = System.getProperty("gradle.test.java.home");
+		if (javaHome != null) {
+			args.add("-Dorg.gradle.java.home=" + javaHome);
+		}
+		runner.withArguments(args);
+		runner.forwardOutput();
+		runner.withPluginClasspath();
+		runner.withProjectDir(getProjectDir());
+		buildResult = runner.build();
+		assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
+	}
+
+	protected void createProject() throws Exception {
+		initGradleProject();
+		editGradleBuildFile();
+		editGradlePropertiesFile();
+		createDatabase();
+		createHibernatePropertiesFile();
+	}
+
+	protected void createProjectAndExecuteGradleCommand() throws Exception {
+		createProject();
+		executeGradleCommand(getGradleTaskToPerform());
+	}
+
+	protected void initGradleProject() throws Exception {
+		executeGradleCommand(GRADLE_INIT_PROJECT_ARGUMENTS);
+		setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
+		assertTrue(getGradlePropertiesFile().exists());
+		assertTrue(getGradlePropertiesFile().isFile());
+		File appDir = new File(getProjectDir(), "app");
+		assertTrue(appDir.exists());
+		assertTrue(appDir.isDirectory());
+		setGradleBuildFile(new File(appDir, "build.gradle"));
+		assertTrue(getGradleBuildFile().exists());
+		assertTrue(getGradleBuildFile().isFile());
+		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
+		assertFalse(getDatabaseFile().exists());
+	}
+
+	protected void editGradleBuildFile() throws Exception {
+		StringBuffer gradleBuildFileContents = new StringBuffer(
+				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
+		addPluginLine(gradleBuildFileContents);
+		addH2DatabaseDependencyLine(gradleBuildFileContents);
+		addRevengExtension(gradleBuildFileContents);
+		Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString());
+	}
+
+	protected void editGradlePropertiesFile() throws Exception {
+		// The reverse engineering tasks do not support the configuration cache.
+		// As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out
+		// in the gradle.properties file.
+		StringBuffer gradlePropertiesFileContents = new StringBuffer(
+				new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
+		int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
+		gradlePropertiesFileContents.insert(pos, "#");
+		Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
+	}
+
+	protected void createHibernatePropertiesFile() throws Exception {
+		File hibernatePropertiesFile = new File(getProjectDir(), "app/src/main/resources/hibernate.properties");
+		StringBuffer hibernatePropertiesFileContents = new StringBuffer();
+		hibernatePropertiesFileContents
+				.append("hibernate.connection.driver_class=org.h2.Driver").append(System.lineSeparator())
+				.append("hibernate.connection.url=").append(constructJdbcConnectionString()).append(System.lineSeparator())
+				.append("hibernate.connection.username=").append(System.lineSeparator())
+				.append("hibernate.connection.password=").append(System.lineSeparator())
+				.append("hibernate.default_catalog=TEST").append(System.lineSeparator())
+				.append("hibernate.default_schema=PUBLIC").append(System.lineSeparator());
+		Files.writeString(hibernatePropertiesFile.toPath(), hibernatePropertiesFileContents.toString());
+		assertTrue(hibernatePropertiesFile.exists());
+	}
+
+	protected void createDatabase() throws Exception {
+		String[] sqls = getDatabaseCreationScript();
+		if ((sqls != null) && (sqls.length > 0)) {
+			Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+			Statement statement = connection.createStatement();
+			for (String sql : sqls) {
+				statement.execute(sql);
+			}
+			statement.close();
+			connection.close();
+			assertTrue(getDatabaseFile().exists());
+			assertTrue(getDatabaseFile().isFile());
+		}
+	}
+
+	protected String constructH2DatabaseDependencyLine() {
+		return "    implementation 'com.h2database:h2:" + System.getProperty("h2.version") + "'";
+	}
+
+	protected String constructPluginLine() {
+		return "    id 'org.hibernate.orm'";
+	}
+
+	protected String constructJdbcConnectionString() {
+		String testFolderPath = getProjectDir().getAbsolutePath().replace('\\', '/') + "/database/test";
+		return "jdbc:h2:" + testFolderPath + ";AUTO_SERVER=TRUE";
+	}
+
+	protected void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) {
+		int pos = gradleBuildFileContents.indexOf("dependencies {");
+		pos = gradleBuildFileContents.indexOf("}", pos);
+		gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + System.lineSeparator());
+	}
+
+	protected void addPluginLine(StringBuffer gradleBuildFileContents) {
+		int pos = gradleBuildFileContents.indexOf("plugins {");
+		pos = gradleBuildFileContents.indexOf("}", pos);
+		gradleBuildFileContents.insert(pos, constructPluginLine() + System.lineSeparator());
+	}
+
+	protected void addRevengExtension(StringBuffer gradleBuildFileContents) {
+		String revengSection = getRevengExtensionSection();
+		StringBuilder extension = new StringBuilder();
+		extension.append("hibernate {").append(System.lineSeparator());
+		extension.append("  useSameVersion = false").append(System.lineSeparator());
+		extension.append("  reveng {").append(System.lineSeparator());
+		if (revengSection != null) {
+			extension.append(revengSection).append(System.lineSeparator());
+		}
+		extension.append("  }").append(System.lineSeparator());
+		extension.append("}");
+		int pos = gradleBuildFileContents.indexOf("dependencies {");
+		pos = gradleBuildFileContents.indexOf("}", pos);
+		gradleBuildFileContents.insert(pos + 1, System.lineSeparator() + System.lineSeparator() + extension);
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/TutorialTest.java b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/TutorialTest.java
new file mode 100644
index 000000000000..454026312c6f
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/functionalTest/java/org/hibernate/orm/tooling/gradle/reveng/TutorialTest.java
@@ -0,0 +1,38 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+
+public class TutorialTest extends TestTemplate {
+
+	@BeforeEach
+	public void beforeEach() {
+		setGradleTaskToPerform("generateJava");
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+		});
+	}
+
+	@Test
+	public void testTutorial() throws Exception {
+		createProjectAndExecuteGradleCommand();
+		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
+		assertTrue(generatedOutputFolder.exists());
+		assertTrue(generatedOutputFolder.isDirectory());
+		assertEquals(1, generatedOutputFolder.list().length);
+		File generatedPersonJavaFile = new File(generatedOutputFolder, "Person.java");
+		assertTrue(generatedPersonJavaFile.exists());
+		assertTrue(generatedPersonJavaFile.isFile());
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmPlugin.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmPlugin.java
index 6f9269782fc9..ab4bdf6a6fd9 100644
--- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmPlugin.java
+++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmPlugin.java
@@ -4,26 +4,41 @@
  */
 package org.hibernate.orm.tooling.gradle;
 
-import java.io.File;
 import java.lang.reflect.Method;
+import java.util.Map;
 import java.util.Set;
 
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
-import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.SourceSet;
 
 import org.hibernate.orm.tooling.gradle.enhance.EnhancementHelper;
+import org.hibernate.orm.tooling.gradle.reveng.RevengTask;
+import org.hibernate.orm.tooling.gradle.reveng.GenerateCfgTask;
+import org.hibernate.orm.tooling.gradle.reveng.GenerateDaoTask;
+import org.hibernate.orm.tooling.gradle.reveng.GenerateHbmTask;
+import org.hibernate.orm.tooling.gradle.reveng.GenerateJavaTask;
+import org.hibernate.orm.tooling.gradle.reveng.RunSqlTask;
 
 /**
  * Hibernate ORM Gradle plugin
  */
 public class HibernateOrmPlugin implements Plugin<Project> {
+
+	private static final Map<String, Class<? extends RevengTask>> REVENG_TASK_MAP = Map.of(
+			"runSql", RunSqlTask.class,
+			"generateJava", GenerateJavaTask.class,
+			"generateCfg", GenerateCfgTask.class,
+			"generateHbm", GenerateHbmTask.class,
+			"generateDao", GenerateDaoTask.class
+	);
+
 	@Override
 	public void apply(Project project) {
 		project.getPluginManager().withPlugin( "java", plugin -> {
@@ -36,16 +51,20 @@ public void apply(Project project) {
 
 			prepareEnhancement( ormDsl, project );
 			prepareHbmTransformation( ormDsl, project );
+			prepareReveng( ormDsl, project );
 
-
-			//noinspection ConstantConditions
-			project.getDependencies().add(
-					"implementation",
-					ormDsl.getUseSameVersion().map( (use) -> use
-							? "org.hibernate.orm:hibernate-core:" + HibernateVersion.version
-							: null
-					)
-			);
+			project
+					.getExtensions()
+					.getByType( JavaPluginExtension.class )
+					.getSourceSets()
+					.configureEach( sourceSet -> project.getDependencies().add(
+							sourceSet.getImplementationConfigurationName(),
+							ormDsl.getUseSameVersion().zip(ormDsl.getSourceSet(), (use, sourceSetName) ->
+									(use && sourceSetName.equals( sourceSet.getName() ))
+											? "org.hibernate.orm:hibernate-core:" + HibernateVersion.version
+											: null
+							)
+					) );
 		} );
 	}
 
@@ -63,31 +82,30 @@ private void prepareEnhancement(HibernateOrmSpec ormDsl, Project project) {
 
 			for ( String language : languages ) {
 				final String languageCompileTaskName = sourceSet.getCompileTaskName( language );
-				final Task languageCompileTask = project.getTasks().findByName( languageCompileTaskName );
-				if ( languageCompileTask == null ) {
-					continue;
-				}
-
-				FileCollection classesDirs = sourceSet.getOutput().getClassesDirs();
-				Configuration compileConfig = project
-						.getConfigurations()
-						.getByName( sourceSet.getCompileClasspathConfigurationName() );
-				Set<File> dependencyFiles = compileConfig.getFiles();
-				//noinspection Convert2Lambda
-				languageCompileTask.doLast(new Action<>() {
-					@Override
-					public void execute(Task t) {
-						try {
-							final Method getDestinationDirectory = languageCompileTask.getClass().getMethod("getDestinationDirectory");
-							final DirectoryProperty classesDirectory = (DirectoryProperty) getDestinationDirectory.invoke(languageCompileTask);
-							final ClassLoader classLoader = Helper.toClassLoader(classesDirs, dependencyFiles);
-							EnhancementHelper.enhance(classesDirectory, classLoader, ormDsl);
-						}
-						catch (Exception e) {
-							throw new RuntimeException(e);
-						}
-					}
-				});
+				project.getTasks()
+						.matching( task -> task.getName().equals( languageCompileTaskName ) )
+						.configureEach( task -> {
+							FileCollection classesDirs = sourceSet.getOutput().getClassesDirs();
+							Provider<FileCollection> dependencyFiles = project
+									.getConfigurations()
+									.named( sourceSet.getCompileClasspathConfigurationName() )
+									.map(FileCollection.class::cast);
+							//noinspection Convert2Lambda
+							task.doLast(new Action<>() {
+								@Override
+								public void execute(Task t) {
+									try {
+										final Method getDestinationDirectory = task.getClass().getMethod("getDestinationDirectory");
+										final DirectoryProperty classesDirectory = (DirectoryProperty) getDestinationDirectory.invoke(task);
+										final ClassLoader classLoader = Helper.toClassLoader(classesDirs, dependencyFiles.get().getFiles());
+										EnhancementHelper.enhance(classesDirectory, classLoader, ormDsl);
+									}
+									catch (Exception e) {
+										throw new RuntimeException(e);
+									}
+								}
+							});
+						});
 			}
 		} );
 	}
@@ -100,4 +118,13 @@ private SourceSet resolveSourceSet(String name, Project project) {
 	private void prepareHbmTransformation(HibernateOrmSpec ormDsl, Project project) {
 
 	}
+
+	@SuppressWarnings("unchecked")
+	private void prepareReveng(HibernateOrmSpec ormDsl, Project project) {
+		for ( Map.Entry<String, Class<? extends RevengTask>> entry : REVENG_TASK_MAP.entrySet() ) {
+			project.getTasks().register( entry.getKey(), entry.getValue(), task -> {
+				task.doFirst( w -> task.initialize( ormDsl.getReveng() ) );
+			} );
+		}
+	}
 }
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmSpec.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmSpec.java
index 89a6645aeeb9..217357f94378 100644
--- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmSpec.java
+++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/HibernateOrmSpec.java
@@ -15,6 +15,7 @@
 import org.gradle.api.tasks.SourceSet;
 
 import org.hibernate.orm.tooling.gradle.enhance.EnhancementSpec;
+import org.hibernate.orm.tooling.gradle.reveng.RevengSpec;
 
 import javax.inject.Inject;
 
@@ -24,6 +25,8 @@
 public abstract class HibernateOrmSpec {
 	public static final String DSL_NAME = "hibernate";
 
+	private RevengSpec revengSpec;
+
 	public HibernateOrmSpec() {
 		getUseSameVersion().convention( true );
 		getSourceSet().convention( SourceSet.MAIN_SOURCE_SET_NAME );
@@ -74,4 +77,20 @@ public void enhancement(Action<EnhancementSpec> action) {
 		action.execute( spec );
 		getEnhancement().set( spec );
 	}
+
+	/**
+	 * DSL extension for configuring reverse engineering
+	 */
+	public RevengSpec getReveng() {
+		return revengSpec;
+	}
+
+	/**
+	 * @see #getReveng()
+	 */
+	@SuppressWarnings("unused")
+	public void reveng(Action<RevengSpec> action) {
+		revengSpec = new RevengSpec();
+		action.execute( revengSpec );
+	}
 }
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementSpec.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementSpec.java
index e93510d204e1..1af4a28ab71e 100644
--- a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementSpec.java
+++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementSpec.java
@@ -10,7 +10,7 @@
 import java.util.ArrayList;
 
 /**
- * DSL extension for configuring bytecode enhancement - available as `project.hibernateOrm.enhancement`
+ * DSL extension for configuring bytecode enhancement - available as `project.hibernate.enhancement { ... }`
  */
 abstract public class EnhancementSpec {
 
@@ -25,21 +25,25 @@ public EnhancementSpec() {
 	/**
 	 * Whether lazy-initialization handling should be incorporated into the enhanced bytecode
 	 */
+	@Deprecated(forRemoval = true)
 	abstract public Property<Boolean> getEnableLazyInitialization();
 
 	/**
 	 * Whether dirty-tracking should be incorporated into the enhanced bytecode
 	 */
+	@Deprecated(forRemoval = true)
 	abstract public Property<Boolean> getEnableDirtyTracking();
 
 	/**
 	 * Whether bidirectional association-management handling should be incorporated into the enhanced bytecode
 	 */
+	@Deprecated(forRemoval = true)
 	abstract public Property<Boolean> getEnableAssociationManagement();
 
 	/**
 	 * Whether extended enhancement should be performed.
 	 */
+	@Deprecated(forRemoval = true)
 	abstract public Property<Boolean> getEnableExtendedEnhancement();
 
 	/**
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateCfgTask.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateCfgTask.java
new file mode 100644
index 000000000000..f7dbfe73c1e9
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateCfgTask.java
@@ -0,0 +1,35 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import java.io.File;
+
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.work.DisableCachingByDefault;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+@DisableCachingByDefault(because = "Reverse engineering tasks perform JDBC operations and are not cacheable")
+public class GenerateCfgTask extends RevengTask {
+
+	@TaskAction
+	public void performTask() {
+		super.perform();
+	}
+
+	void doWork() {
+		getLogger().lifecycle("Creating CFG exporter");
+		Exporter cfgExporter = ExporterFactory.createExporter(ExporterType.CFG);
+		File outputFolder = getOutputFolder();
+		cfgExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, createJdbcDescriptor());
+		cfgExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		getLogger().lifecycle("Starting CFG export to directory: " + outputFolder + "...");
+		cfgExporter.start();
+		getLogger().lifecycle("CFG export finished");
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateDaoTask.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateDaoTask.java
new file mode 100644
index 000000000000..dad0ea1e296c
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateDaoTask.java
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import java.io.File;
+
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.work.DisableCachingByDefault;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+@DisableCachingByDefault(because = "Reverse engineering tasks perform JDBC operations and are not cacheable")
+public class GenerateDaoTask extends RevengTask {
+
+	@TaskAction
+	public void performTask() {
+		super.perform();
+	}
+
+	void doWork() {
+		getLogger().lifecycle("Creating DAO exporter");
+		Exporter hbmExporter = ExporterFactory.createExporter(ExporterType.DAO);
+		File outputFolder = getOutputFolder();
+		hbmExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, createJdbcDescriptor());
+		hbmExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		String templatePath = getRevengSpec().templatePath;
+		if (templatePath != null) {
+			getLogger().lifecycle("Setting template path to: " + templatePath);
+			hbmExporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[] { templatePath });
+		}
+		getLogger().lifecycle("Starting DAO export to directory: " + outputFolder + "...");
+		hbmExporter.start();
+		getLogger().lifecycle("DAO export finished");
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateHbmTask.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateHbmTask.java
new file mode 100644
index 000000000000..359451f51f93
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateHbmTask.java
@@ -0,0 +1,43 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import java.io.File;
+
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.work.DisableCachingByDefault;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+@Deprecated(forRemoval = true)
+@DisableCachingByDefault(because = "Reverse engineering tasks perform JDBC operations and are not cacheable")
+public class GenerateHbmTask extends RevengTask {
+
+	@TaskAction
+	public void performTask() {
+		getLogger().warn( "The generateHbm task is deprecated and will be removed in a future version. "
+				+ "Use the generateJava task to generate annotated Java entities instead." );
+		super.perform();
+	}
+
+	void doWork() {
+		getLogger().lifecycle("Creating HBM exporter");
+		Exporter hbmExporter = ExporterFactory.createExporter(ExporterType.HBM);
+		File outputFolder = getOutputFolder();
+		hbmExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, createJdbcDescriptor());
+		hbmExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		String templatePath = getRevengSpec().templatePath;
+		if (templatePath != null) {
+			getLogger().lifecycle("Setting template path to: " + templatePath);
+			hbmExporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[] { templatePath });
+		}
+		getLogger().lifecycle("Starting HBM export to directory: " + outputFolder + "...");
+		hbmExporter.start();
+		getLogger().lifecycle("HBM export finished");
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateJavaTask.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateJavaTask.java
new file mode 100644
index 000000000000..dde4704a7050
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateJavaTask.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import java.io.File;
+
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.work.DisableCachingByDefault;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+@DisableCachingByDefault(because = "Reverse engineering tasks perform JDBC operations and are not cacheable")
+public class GenerateJavaTask extends RevengTask {
+
+	@TaskAction
+	public void performTask() {
+		super.perform();
+	}
+
+	void doWork() {
+		getLogger().lifecycle("Creating Java exporter");
+		Exporter pojoExporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		pojoExporter.getProperties().setProperty("ejb3", String.valueOf(getRevengSpec().generateAnnotations));
+		pojoExporter.getProperties().setProperty("jdk5", String.valueOf(getRevengSpec().useGenerics));
+		File outputFolder = getOutputFolder();
+		pojoExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, createJdbcDescriptor());
+		pojoExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		String templatePath = getRevengSpec().templatePath;
+		if (templatePath != null) {
+			getLogger().lifecycle("Setting template path to: " + templatePath);
+			pojoExporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[] { templatePath });
+		}
+		getLogger().lifecycle("Starting Java export to directory: " + outputFolder + "...");
+		pojoExporter.start();
+		getLogger().lifecycle("Java export finished");
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/RevengSpec.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/RevengSpec.java
new file mode 100644
index 000000000000..40fc222671d6
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/RevengSpec.java
@@ -0,0 +1,22 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+/**
+ * DSL extension for configuring reverse engineering - available as {@code project.hibernate.reveng { ... }}
+ */
+public class RevengSpec {
+
+	public String sqlToRun = "";
+	public String hibernateProperties = "hibernate.properties";
+	public String outputFolder = "generated-sources";
+	public String packageName = "";
+	public String revengStrategy = null;
+	public String revengFile = null;
+	public Boolean generateAnnotations = true;
+	public Boolean useGenerics = true;
+	public String templatePath = null;
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/RevengTask.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/RevengTask.java
new file mode 100644
index 000000000000..f3ad51e0dd6f
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/RevengTask.java
@@ -0,0 +1,162 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.tools.ant.BuildException;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.work.DisableCachingByDefault;
+import org.gradle.api.artifacts.ConfigurationContainer;
+import org.gradle.api.artifacts.ResolvedArtifact;
+import org.gradle.api.artifacts.ResolvedConfiguration;
+import org.gradle.api.file.SourceDirectorySet;
+import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
+import org.hibernate.tool.reveng.api.metadata.MetadataConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategyFactory;
+
+@DisableCachingByDefault(because = "Reverse engineering tasks perform JDBC operations and are not cacheable")
+public abstract class RevengTask extends DefaultTask {
+
+	@Internal
+	private RevengSpec revengSpec = null;
+
+	@Internal
+	private Properties hibernateProperties = null;
+
+	public void initialize(RevengSpec revengSpec) {
+		this.revengSpec = revengSpec;
+	}
+
+	RevengSpec getRevengSpec() {
+		return this.revengSpec;
+	}
+
+	void perform() {
+		getLogger().lifecycle("Starting Task '" + getName() + "'");
+		ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+		try {
+			Thread.currentThread().setContextClassLoader(
+					new URLClassLoader(
+							resolveProjectClassPath(),
+							oldLoader));
+			doWork();
+		}
+		finally {
+			Thread.currentThread().setContextClassLoader(oldLoader);
+			getLogger().lifecycle("Ending Task '" + getName() + "'");
+		}
+	}
+
+	URL[] resolveProjectClassPath() {
+		try {
+			ConfigurationContainer cc = getProject().getConfigurations();
+			Configuration defaultConf = cc.getByName("compileClasspath");
+			ResolvedConfiguration resolvedConf = defaultConf.getResolvedConfiguration();
+			Set<ResolvedArtifact> ras = resolvedConf.getResolvedArtifacts();
+			ResolvedArtifact[] resolvedArtifacts = ras.toArray(new ResolvedArtifact[ras.size()]);
+			URL[] urls = new URL[ras.size()];
+			for (int i = 0; i < ras.size(); i++) {
+				urls[i] = resolvedArtifacts[i].getFile().toURI().toURL();
+			}
+			return urls;
+		}
+		catch (MalformedURLException e) {
+			getLogger().error("MalformedURLException while compiling project classpath");
+			throw new BuildException(e);
+		}
+	}
+
+	Properties getHibernateProperties() {
+		if (hibernateProperties == null) {
+			loadPropertiesFile(getPropertyFile());
+		}
+		return hibernateProperties;
+	}
+
+	String getHibernateProperty(String name) {
+		return getHibernateProperties().getProperty(name);
+	}
+
+	MetadataDescriptor createJdbcDescriptor() {
+		RevengStrategy strategy = setupReverseEngineeringStrategy();
+		Properties hibernateProperties = getHibernateProperties();
+		hibernateProperties.put(MetadataConstants.PREFER_BASIC_COMPOSITE_IDS, true);
+		return MetadataDescriptorFactory.createReverseEngineeringDescriptor(strategy, hibernateProperties);
+	}
+
+	@Internal
+	File getOutputFolder() {
+		return new File(getProject().getProjectDir(), getRevengSpec().outputFolder);
+	}
+
+	RevengStrategy setupReverseEngineeringStrategy() {
+		File[] revengFiles = getRevengFiles();
+		RevengStrategy result = RevengStrategyFactory
+				.createReverseEngineeringStrategy(getRevengSpec().revengStrategy, revengFiles);
+		RevengSettings settings = new RevengSettings(result);
+		settings.setDefaultPackageName(getRevengSpec().packageName);
+		result.setSettings(settings);
+		return result;
+	}
+
+	private File getFile(String filename) {
+		SourceSetContainer ssc = getProject().getExtensions().getByType(SourceSetContainer.class);
+		SourceSet ss = ssc.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+		SourceDirectorySet sds = ss.getResources();
+		for (File f : sds.getFiles()) {
+			if (filename.equals(f.getName())) {
+				return f;
+			}
+		}
+		throw new BuildException("File '" + filename + "' could not be found");
+	}
+
+	private File getPropertyFile() {
+		return getFile(getRevengSpec().hibernateProperties);
+	}
+
+	private File[] getRevengFiles() {
+		String revengFile = getRevengSpec().revengFile;
+		if (revengFile == null) {
+			return null;
+		}
+
+		return new File[] { getFile(revengFile) };
+	}
+
+	private void loadPropertiesFile(File propertyFile) {
+		getLogger().lifecycle("Loading the properties file : " + propertyFile.getPath());
+		try (FileInputStream is = new FileInputStream(propertyFile)) {
+			hibernateProperties = new Properties();
+			hibernateProperties.load(is);
+			getLogger().lifecycle("Properties file is loaded");
+		}
+		catch (FileNotFoundException e) {
+			throw new BuildException(propertyFile + " not found.", e);
+		}
+		catch (IOException e) {
+			throw new BuildException("Problem while loading " + propertyFile, e);
+		}
+	}
+
+	abstract void doWork();
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/RunSqlTask.java b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/RunSqlTask.java
new file mode 100644
index 000000000000..27f40b10680a
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/RunSqlTask.java
@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.work.DisableCachingByDefault;
+
+@DisableCachingByDefault(because = "Reverse engineering tasks perform JDBC operations and are not cacheable")
+public class RunSqlTask extends RevengTask {
+
+	@TaskAction
+	public void performTask() {
+		super.perform();
+	}
+
+	void doWork() {
+		registerDriver();
+		runSql();
+	}
+
+	private void registerDriver() {
+		String driverClassName = getHibernateProperty("hibernate.connection.driver_class");
+		getLogger().lifecycle("Registering the database driver: " + driverClassName);
+		try {
+			Class<?> driverClass = Thread.currentThread().getContextClassLoader().loadClass(driverClassName);
+			Constructor<?> constructor = driverClass.getDeclaredConstructor();
+			DriverManager.registerDriver(createDelegatingDriver((Driver)constructor.newInstance()));
+			getLogger().lifecycle("Database driver is registered");
+		}
+		catch (Exception e) {
+			getLogger().error("Exception while registering the database driver: " + e.getMessage());
+			throw new RuntimeException(e);
+		}
+	}
+
+	private void runSql() {
+		String databaseUrl = getHibernateProperty("hibernate.connection.url");
+		String username = getHibernateProperty("hibernate.connection.username");
+		String password = getHibernateProperty("hibernate.connection.password");
+		getLogger().lifecycle("Connecting to database: " + databaseUrl);
+		try (Connection connection = DriverManager.getConnection(databaseUrl, username, password);
+				Statement statement = connection.createStatement()) {
+			getLogger().lifecycle("Running SQL: " + getRevengSpec().sqlToRun);
+			statement.execute(getRevengSpec().sqlToRun);
+		}
+		catch (SQLException e) {
+			getLogger().error("SQLException");
+			throw new RuntimeException(e);
+		}
+	}
+
+	private Driver createDelegatingDriver(Driver driver) {
+		return (Driver)Proxy.newProxyInstance(
+				DriverManager.class.getClassLoader(),
+				new Class[] { Driver.class},
+				new InvocationHandler() {
+					@Override
+					public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+						return method.invoke(driver, args);
+					}
+				});
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HbmTransformerTests.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HbmTransformerTests.java
index a1d8801f4bcd..225b321a04d6 100644
--- a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HbmTransformerTests.java
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HbmTransformerTests.java
@@ -36,7 +36,7 @@ void testSimpleTransformation(@TempDir Path projectDir) throws IOException {
 		System.out.println( "Starting execution ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
 		final GradleRunner gradleRunner = usingGradleRunner()
 				.withProjectDir( projectDir.toFile() )
-				.withArguments( "clean", "hbmTransform", "--stacktrace", "--no-build-cache", "--configuration-cache" );
+				.withArguments( "clean", "hbmTransform", "--stacktrace", "--no-build-cache", "--no-configuration-cache" );
 		final BuildResult result = gradleRunner.build();
 
 		final BuildTask transformationResult = result.task( ":hbmTransform" );
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HelperTest.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HelperTest.java
new file mode 100644
index 000000000000..28fd569496fc
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HelperTest.java
@@ -0,0 +1,35 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class HelperTest {
+
+	@Test
+	public void testDetermineClassName() {
+		File root = new File("/project/build/classes");
+		File classFile = new File("/project/build/classes/com/example/MyClass.class");
+		assertEquals("com.example.MyClass", Helper.determineClassName(root, classFile));
+	}
+
+	@Test
+	public void testDetermineClassNameDefaultPackage() {
+		File root = new File("/project/build/classes");
+		File classFile = new File("/project/build/classes/MyClass.class");
+		assertEquals("MyClass", Helper.determineClassName(root, classFile));
+	}
+
+	@Test
+	public void testDetermineClassNameDeepPackage() {
+		File root = new File("/project/build/classes");
+		File classFile = new File("/project/build/classes/com/example/deep/nested/pkg/Service.class");
+		assertEquals("com.example.deep.nested.pkg.Service", Helper.determineClassName(root, classFile));
+	}
+}
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HibernateOrmPluginTest.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HibernateOrmPluginTest.java
new file mode 100644
index 000000000000..28c6b31eb028
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/HibernateOrmPluginTest.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle;
+
+import org.gradle.testfixtures.ProjectBuilder;
+import org.gradle.api.Project;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class HibernateOrmPluginTest {
+
+	@Test
+	void testApply() {
+		// Create a test project and apply the plugin
+		Project project = ProjectBuilder.builder().build();
+		project.getPlugins().apply("java");
+		project.getPlugins().apply("org.hibernate.orm");
+
+		// Verify the result
+		assertNotNull(project.getTasks().findByName("generateJava"));
+		assertNotNull(project.getTasks().findByName("runSql"));
+		assertNotNull(project.getTasks().findByName("generateCfg"));
+		assertNotNull(project.getTasks().findByName("generateHbm"));
+		assertNotNull(project.getTasks().findByName("generateDao"));
+
+		Object extension = project.getExtensions().getByName("hibernate");
+		assertNotNull(extension);
+		assertTrue(extension instanceof HibernateOrmSpec);
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/TestsBase.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/TestsBase.java
index 2e36ceec8f4a..45099423c030 100644
--- a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/TestsBase.java
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/TestsBase.java
@@ -37,7 +37,7 @@ public void testEnhancement(Path projectDir) throws Exception {
 		System.out.println( "Starting execution ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
 		final GradleRunner gradleRunner = TestHelper.usingGradleRunner()
 				.withProjectDir( projectDir.toFile() )
-				.withArguments( compileTaskName, "--stacktrace", "--no-build-cache", "--configuration-cache" );
+				.withArguments( compileTaskName, "--stacktrace", "--no-build-cache", "--no-configuration-cache" );
 
 		final BuildResult result = gradleRunner.build();
 		final BuildTask task = result.task( ":" + compileTaskName );
@@ -64,7 +64,7 @@ public void testEnhancementUpToDate(Path projectDir) throws Exception {
 			System.out.println( "Starting first execution ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
 			final GradleRunner gradleRunner = TestHelper.usingGradleRunner()
 					.withProjectDir( projectDir.toFile() )
-					.withArguments( compileTaskName, "--stacktrace", "--no-build-cache", "--configuration-cache" );
+					.withArguments( compileTaskName, "--stacktrace", "--no-build-cache", "--no-configuration-cache" );
 
 			final BuildResult result = gradleRunner.build();
 			final BuildTask task = result.task( ":" + compileTaskName );
@@ -80,7 +80,7 @@ public void testEnhancementUpToDate(Path projectDir) throws Exception {
 			System.out.println( "Starting second execution ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
 			final GradleRunner gradleRunner = TestHelper.usingGradleRunner()
 					.withProjectDir( projectDir.toFile() )
-					.withArguments( compileTaskName, "--stacktrace", "--no-build-cache", "--configuration-cache" );
+					.withArguments( compileTaskName, "--stacktrace", "--no-build-cache", "--no-configuration-cache" );
 			final BuildResult result = gradleRunner.build();
 			final BuildTask task = result.task( ":" + compileTaskName );
 			assertThat( task ).isNotNull();
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/misc/OriginImplTest.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/misc/OriginImplTest.java
new file mode 100644
index 000000000000..b4c88d67ca3e
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/misc/OriginImplTest.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.misc;
+
+import org.hibernate.boot.jaxb.SourceType;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class OriginImplTest {
+
+	@Test
+	public void testConstructorAndGetters() {
+		File hbmFile = new File("/tmp/com/example/Person.hbm.xml");
+		OriginImpl origin = new OriginImpl(hbmFile);
+
+		assertEquals(hbmFile, origin.getHbmXmlFile());
+		assertEquals(SourceType.FILE, origin.getType());
+		assertEquals(hbmFile.getAbsolutePath(), origin.getName());
+	}
+
+	@Test
+	public void testToString() {
+		File hbmFile = new File("/tmp/Person.hbm.xml");
+		OriginImpl origin = new OriginImpl(hbmFile);
+		assertNotNull(origin.toString());
+	}
+}
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/misc/TransformHbmXmlTaskTest.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/misc/TransformHbmXmlTaskTest.java
new file mode 100644
index 000000000000..dbe3c40e0a4a
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/misc/TransformHbmXmlTaskTest.java
@@ -0,0 +1,107 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.misc;
+
+import org.gradle.api.Project;
+import org.gradle.testfixtures.ProjectBuilder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.lang.reflect.Method;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TransformHbmXmlTaskTest {
+
+	private Project project;
+	private TransformHbmXmlTask task;
+	private Method determineCopyNameMethod;
+
+	@BeforeEach
+	void setUp() throws Exception {
+		project = ProjectBuilder.builder().build();
+		task = project.getTasks().create("transformHbm", TransformHbmXmlTask.class);
+		determineCopyNameMethod = TransformHbmXmlTask.class.getDeclaredMethod("determineCopyName", File.class);
+		determineCopyNameMethod.setAccessible(true);
+	}
+
+	@Test
+	public void testDetermineCopyNameNoRenaming() throws Exception {
+		// When no renaming is defined, returns the original file name
+		File hbmFile = new File("/tmp/Person.hbm.xml");
+		String result = (String) determineCopyNameMethod.invoke(task, hbmFile);
+		assertEquals("Person.hbm.xml", result);
+	}
+
+	@Test
+	public void testDetermineCopyNameWithPrefix() throws Exception {
+		task.getRenaming().getPrefix().set("transformed-");
+		File hbmFile = new File("/tmp/Person.hbm.xml");
+		String result = (String) determineCopyNameMethod.invoke(task, hbmFile);
+		// hbmXmlFileExtension includes the leading dot (".hbm.xml"), so the code produces "."  + ".hbm.xml"
+		assertEquals("transformed-Person..hbm.xml", result);
+	}
+
+	@Test
+	public void testDetermineCopyNameWithSuffix() throws Exception {
+		task.getRenaming().getSuffix().set("-new");
+		File hbmFile = new File("/tmp/Person.hbm.xml");
+		String result = (String) determineCopyNameMethod.invoke(task, hbmFile);
+		assertEquals("Person-new..hbm.xml", result);
+	}
+
+	@Test
+	public void testDetermineCopyNameWithExtension() throws Exception {
+		task.getRenaming().getExtension().set("orm.xml");
+		File hbmFile = new File("/tmp/Person.hbm.xml");
+		String result = (String) determineCopyNameMethod.invoke(task, hbmFile);
+		assertEquals("Person.orm.xml", result);
+	}
+
+	@Test
+	public void testDetermineCopyNameWithPrefixAndSuffix() throws Exception {
+		task.getRenaming().getPrefix().set("pre-");
+		task.getRenaming().getSuffix().set("-post");
+		File hbmFile = new File("/tmp/Person.hbm.xml");
+		String result = (String) determineCopyNameMethod.invoke(task, hbmFile);
+		assertEquals("pre-Person-post..hbm.xml", result);
+	}
+
+	@Test
+	public void testDetermineCopyNameWithAll() throws Exception {
+		task.getRenaming().getPrefix().set("pre-");
+		task.getRenaming().getSuffix().set("-post");
+		task.getRenaming().getExtension().set("xml");
+		File hbmFile = new File("/tmp/Person.hbm.xml");
+		String result = (String) determineCopyNameMethod.invoke(task, hbmFile);
+		assertEquals("pre-Person-post.xml", result);
+	}
+
+	@Test
+	public void testDefaultConventions() {
+		assertEquals("H2", task.getTargetDatabaseName().get());
+		assertNotNull(task.getUnsupportedFeatures().get());
+		assertEquals(false, task.getDeleteHbmFiles().get());
+	}
+
+	@Test
+	public void testAreNoneDefinedDefault() {
+		assertTrue(task.getRenaming().areNoneDefined());
+	}
+
+	@Test
+	public void testDetermineCopyFileNoOutputDir() throws Exception {
+		Method determineCopyFileMethod = TransformHbmXmlTask.class.getDeclaredMethod(
+				"determineCopyFile", String.class, File.class);
+		determineCopyFileMethod.setAccessible(true);
+
+		File hbmFile = new File("/tmp/mappings/Person.hbm.xml");
+		File result = (File) determineCopyFileMethod.invoke(task, "Person.orm.xml", hbmFile);
+		assertEquals(new File("/tmp/mappings", "Person.orm.xml"), result);
+	}
+}
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/misc/TransformationNamingTest.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/misc/TransformationNamingTest.java
new file mode 100644
index 000000000000..8e14858d28b2
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/misc/TransformationNamingTest.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.misc;
+
+import org.gradle.api.Project;
+import org.gradle.testfixtures.ProjectBuilder;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TransformationNamingTest {
+
+	@Test
+	public void testAreNoneDefinedWhenAllAbsent() {
+		Project project = ProjectBuilder.builder().build();
+		TransformHbmXmlTask task = project.getTasks().create("t", TransformHbmXmlTask.class);
+		TransformationNaming naming = task.getRenaming();
+		assertTrue(naming.areNoneDefined());
+	}
+
+	@Test
+	public void testAreNoneDefinedWhenPrefixSet() {
+		Project project = ProjectBuilder.builder().build();
+		TransformHbmXmlTask task = project.getTasks().create("t", TransformHbmXmlTask.class);
+		TransformationNaming naming = task.getRenaming();
+		naming.getPrefix().set("pre-");
+		assertFalse(naming.areNoneDefined());
+	}
+
+	@Test
+	public void testAreNoneDefinedWhenSuffixSet() {
+		Project project = ProjectBuilder.builder().build();
+		TransformHbmXmlTask task = project.getTasks().create("t", TransformHbmXmlTask.class);
+		TransformationNaming naming = task.getRenaming();
+		naming.getSuffix().set("-suf");
+		assertFalse(naming.areNoneDefined());
+	}
+
+	@Test
+	public void testAreNoneDefinedWhenExtensionSet() {
+		Project project = ProjectBuilder.builder().build();
+		TransformHbmXmlTask task = project.getTasks().create("t", TransformHbmXmlTask.class);
+		TransformationNaming naming = task.getRenaming();
+		naming.getExtension().set("xml");
+		assertFalse(naming.areNoneDefined());
+	}
+}
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/GenerateTasksTest.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/GenerateTasksTest.java
new file mode 100644
index 000000000000..16782a30d4b7
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/GenerateTasksTest.java
@@ -0,0 +1,125 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import org.gradle.api.Project;
+import org.gradle.testfixtures.ProjectBuilder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+public class GenerateTasksTest {
+
+	private static final URL[] URLS = new URL[] {};
+	private Project project;
+
+	@BeforeEach
+	void setUp() {
+		project = ProjectBuilder.builder().build();
+	}
+
+	@Test
+	public void testGenerateJavaTaskCreation() throws Exception {
+		TestableJavaTask task = project.getTasks().create("genJava", TestableJavaTask.class);
+		assertNotNull(task);
+		RevengSpec spec = new RevengSpec();
+		task.initialize(spec);
+		assertSame(spec, task.getRevengSpec());
+	}
+
+	@Test
+	public void testGenerateDaoTaskCreation() throws Exception {
+		TestableDaoTask task = project.getTasks().create("genDao", TestableDaoTask.class);
+		assertNotNull(task);
+		RevengSpec spec = new RevengSpec();
+		task.initialize(spec);
+		assertSame(spec, task.getRevengSpec());
+	}
+
+	@Test
+	public void testGenerateCfgTaskCreation() throws Exception {
+		TestableCfgTask task = project.getTasks().create("genCfg", TestableCfgTask.class);
+		assertNotNull(task);
+		RevengSpec spec = new RevengSpec();
+		task.initialize(spec);
+		assertSame(spec, task.getRevengSpec());
+	}
+
+	@Test
+	public void testGenerateHbmTaskCreation() throws Exception {
+		TestableHbmTask task = project.getTasks().create("genHbm", TestableHbmTask.class);
+		assertNotNull(task);
+		RevengSpec spec = new RevengSpec();
+		task.initialize(spec);
+		assertSame(spec, task.getRevengSpec());
+	}
+
+	@Test
+	public void testGenerateJavaTaskPerform() {
+		TestableJavaTask task = project.getTasks().create("genJava2", TestableJavaTask.class);
+		task.perform();
+		assertNotNull(TestableJavaTask.usedClassLoader);
+	}
+
+	@Test
+	public void testGenerateDaoTaskPerform() {
+		TestableDaoTask task = project.getTasks().create("genDao2", TestableDaoTask.class);
+		task.perform();
+		assertNotNull(TestableDaoTask.usedClassLoader);
+	}
+
+	@Test
+	public void testGenerateCfgTaskPerform() {
+		TestableCfgTask task = project.getTasks().create("genCfg2", TestableCfgTask.class);
+		task.perform();
+		assertNotNull(TestableCfgTask.usedClassLoader);
+	}
+
+	@Test
+	public void testGenerateHbmTaskPerform() {
+		TestableHbmTask task = project.getTasks().create("genHbm2", TestableHbmTask.class);
+		task.perform();
+		assertNotNull(TestableHbmTask.usedClassLoader);
+	}
+
+	@Test
+	public void testRunSqlTaskCreation() {
+		RunSqlTask task = project.getTasks().create("runSql", RunSqlTask.class);
+		assertNotNull(task);
+		assertNull(task.getRevengSpec());
+	}
+
+	// Testable subclasses that override doWork() and resolveProjectClassPath()
+	// to avoid JDBC/Gradle API dependencies
+
+	public static class TestableJavaTask extends GenerateJavaTask {
+		static ClassLoader usedClassLoader;
+		void doWork() { usedClassLoader = Thread.currentThread().getContextClassLoader(); }
+		URL[] resolveProjectClassPath() { return URLS; }
+	}
+
+	public static class TestableDaoTask extends GenerateDaoTask {
+		static ClassLoader usedClassLoader;
+		void doWork() { usedClassLoader = Thread.currentThread().getContextClassLoader(); }
+		URL[] resolveProjectClassPath() { return URLS; }
+	}
+
+	public static class TestableCfgTask extends GenerateCfgTask {
+		static ClassLoader usedClassLoader;
+		void doWork() { usedClassLoader = Thread.currentThread().getContextClassLoader(); }
+		URL[] resolveProjectClassPath() { return URLS; }
+	}
+
+	public static class TestableHbmTask extends GenerateHbmTask {
+		static ClassLoader usedClassLoader;
+		void doWork() { usedClassLoader = Thread.currentThread().getContextClassLoader(); }
+		URL[] resolveProjectClassPath() { return URLS; }
+	}
+}
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/RevengSpecTest.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/RevengSpecTest.java
new file mode 100644
index 000000000000..83097850eedb
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/RevengSpecTest.java
@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+public class RevengSpecTest {
+
+	@Test
+	void testRevengSpec() {
+		Map<String, Field> fieldMap = new HashMap<String, Field>();
+		for(Field field : RevengSpec.class.getDeclaredFields()) {
+			fieldMap.put(field.getName(), field);
+		}
+		assertNotNull(fieldMap.get("sqlToRun"));
+		assertNotNull(fieldMap.get("hibernateProperties"));
+		assertNotNull(fieldMap.get("outputFolder"));
+		assertNotNull(fieldMap.get("packageName"));
+		assertNotNull(fieldMap.get("revengStrategy"));
+		assertNotNull(fieldMap.get("revengFile"));
+		assertNotNull(fieldMap.get("generateAnnotations"));
+		assertNotNull(fieldMap.get("useGenerics"));
+		assertNotNull(fieldMap.get("templatePath"));
+	}
+
+	@Test
+	void testRevengSpecDefaults() {
+		RevengSpec spec = new RevengSpec();
+		assertEquals("", spec.sqlToRun);
+		assertEquals("hibernate.properties", spec.hibernateProperties);
+		assertEquals("generated-sources", spec.outputFolder);
+		assertEquals("", spec.packageName);
+		assertNull(spec.revengStrategy);
+		assertNull(spec.revengFile);
+		assertTrue(spec.generateAnnotations);
+		assertTrue(spec.useGenerics);
+		assertNull(spec.templatePath);
+	}
+
+	@Test
+	void testRevengSpecSetValues() {
+		RevengSpec spec = new RevengSpec();
+		spec.sqlToRun = "CREATE TABLE test (id INT)";
+		spec.hibernateProperties = "custom.properties";
+		spec.outputFolder = "src/gen";
+		spec.packageName = "com.example";
+		spec.revengStrategy = "com.example.MyStrategy";
+		spec.revengFile = "reveng.xml";
+		spec.generateAnnotations = false;
+		spec.useGenerics = false;
+		spec.templatePath = "/templates";
+
+		assertEquals("CREATE TABLE test (id INT)", spec.sqlToRun);
+		assertEquals("custom.properties", spec.hibernateProperties);
+		assertEquals("src/gen", spec.outputFolder);
+		assertEquals("com.example", spec.packageName);
+		assertEquals("com.example.MyStrategy", spec.revengStrategy);
+		assertEquals("reveng.xml", spec.revengFile);
+		assertFalse(spec.generateAnnotations);
+		assertFalse(spec.useGenerics);
+		assertEquals("/templates", spec.templatePath);
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/RevengTaskTest.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/RevengTaskTest.java
new file mode 100644
index 000000000000..e8ef88e518dd
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/RevengTaskTest.java
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.reflect.Field;
+import java.net.URL;
+
+import org.gradle.api.Project;
+import org.gradle.testfixtures.ProjectBuilder;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.AbstractStrategy;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class RevengTaskTest {
+
+	private static ClassLoader USED_CLASS_LOADER;
+	private static URL[] URLS = new URL[] {};
+
+	private RevengTask revengTask = null;
+
+	private Field revengSpecField = null;
+	private RevengSpec revengSpec = null;
+
+	@BeforeEach
+	void beforeEach() throws Exception {
+		USED_CLASS_LOADER = null;
+		Project project = ProjectBuilder.builder().build();
+		revengTask = project.getTasks().create("foo", FooTask.class);
+		revengSpecField = RevengTask.class.getDeclaredField("revengSpec");
+		revengSpecField.setAccessible(true);
+		revengSpec = new RevengSpec();
+	}
+
+	@Test
+	void testInitialize() throws Exception {
+		assertNull(revengSpecField.get(revengTask));
+		revengTask.initialize(revengSpec);
+		assertSame(revengSpec, revengSpecField.get(revengTask));
+	}
+
+	@Test
+	void testGetRevengSpec() throws Exception {
+		assertNull(revengTask.getRevengSpec());
+		revengSpecField.set(revengTask, revengSpec);
+		assertSame(revengSpec, revengTask.getRevengSpec());
+	}
+
+	@Test
+	void testPerform() {
+		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+		assertNull(USED_CLASS_LOADER);
+		revengTask.perform();
+		assertNotNull(USED_CLASS_LOADER);
+		assertNotSame(contextClassLoader, USED_CLASS_LOADER);
+	}
+
+	@Test
+	void testResolveProjectClassPath() {
+		assertSame(URLS, revengTask.resolveProjectClassPath());
+	}
+
+	@Test
+	public void testSetupReverseEngineeringStrategy() throws Exception {
+		revengSpec.revengStrategy = FooStrategy.class.getName();
+		revengSpecField.set(revengTask, revengSpec);
+		RevengStrategy revengStrategy = revengTask.setupReverseEngineeringStrategy();
+		assertTrue(revengStrategy instanceof FooStrategy);
+	}
+
+	public static class FooStrategy extends AbstractStrategy {}
+
+	public static class FooTask extends RevengTask {
+		void doWork() {
+			USED_CLASS_LOADER = Thread.currentThread().getContextClassLoader();
+		}
+		URL[] resolveProjectClassPath() {
+			return URLS;
+		}
+	}
+
+}
diff --git a/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/RunSqlTaskTest.java b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/RunSqlTaskTest.java
new file mode 100644
index 000000000000..463ec5d299de
--- /dev/null
+++ b/tooling/hibernate-gradle-plugin/src/test/java/org/hibernate/orm/tooling/gradle/reveng/RunSqlTaskTest.java
@@ -0,0 +1,98 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.gradle.reveng;
+
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class RunSqlTaskTest {
+
+	@Test
+	public void testCreateDelegatingDriver() throws Exception {
+		Driver realDriver = new StubDriver();
+		Method method = RunSqlTask.class.getDeclaredMethod("createDelegatingDriver", Driver.class);
+		method.setAccessible(true);
+
+		// We need an instance but can't easily create a RunSqlTask without a Gradle project.
+		// Use ProjectBuilder like RevengTaskTest does.
+		org.gradle.api.Project project = org.gradle.testfixtures.ProjectBuilder.builder().build();
+		RunSqlTask task = project.getTasks().create("runSql", RunSqlTask.class);
+
+		Driver delegating = (Driver) method.invoke(task, realDriver);
+		assertNotNull(delegating);
+		// The proxy should delegate acceptsURL to the real driver
+		assertFalse(delegating.acceptsURL("jdbc:test:foo"));
+	}
+
+	@Test
+	public void testCreateDelegatingDriverDelegates() throws Exception {
+		StubDriver realDriver = new StubDriver();
+		org.gradle.api.Project project = org.gradle.testfixtures.ProjectBuilder.builder().build();
+		RunSqlTask task = project.getTasks().create("runSql2", RunSqlTask.class);
+
+		Method method = RunSqlTask.class.getDeclaredMethod("createDelegatingDriver", Driver.class);
+		method.setAccessible(true);
+		Driver delegating = (Driver) method.invoke(task, (Driver) realDriver);
+
+		// Verify delegation works
+		delegating.getMajorVersion();
+		assertTrue(realDriver.majorVersionCalled);
+	}
+
+	/**
+	 * Minimal Driver stub for testing delegation.
+	 */
+	static class StubDriver implements Driver {
+		boolean majorVersionCalled = false;
+
+		@Override
+		public Connection connect(String url, Properties info) throws SQLException {
+			return null;
+		}
+
+		@Override
+		public boolean acceptsURL(String url) throws SQLException {
+			return false;
+		}
+
+		@Override
+		public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
+			return new DriverPropertyInfo[0];
+		}
+
+		@Override
+		public int getMajorVersion() {
+			majorVersionCalled = true;
+			return 1;
+		}
+
+		@Override
+		public int getMinorVersion() {
+			return 0;
+		}
+
+		@Override
+		public boolean jdbcCompliant() {
+			return false;
+		}
+
+		@Override
+		public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+			throw new SQLFeatureNotSupportedException();
+		}
+	}
+}
diff --git a/tooling/hibernate-maven-plugin/hibernate-maven-plugin.gradle b/tooling/hibernate-maven-plugin/hibernate-maven-plugin.gradle
index 852f4af08c1d..ec1d7307fd40 100644
--- a/tooling/hibernate-maven-plugin/hibernate-maven-plugin.gradle
+++ b/tooling/hibernate-maven-plugin/hibernate-maven-plugin.gradle
@@ -24,20 +24,30 @@ configurations {
 
 dependencies {
     implementation project( ":hibernate-core" )
+    implementation project( ":hibernate-reveng" )
 
-    implementation "org.apache.maven:maven-plugin-api:3.9.11"
-    implementation "org.apache.maven:maven-project:2.2.1"
-    implementation "org.apache.maven.shared:file-management:3.1.0"
-
-    compileOnly "org.apache.maven.plugin-tools:maven-plugin-tools-annotations:3.15.1"
-
-    intTestImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
-    intTestImplementation 'org.apache.maven:maven-embedder:3.9.11'
-    intTestRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    intTestRuntimeOnly 'ch.qos.logback:logback-classic:1.5.18'
-    intTestRuntimeOnly 'org.apache.maven:maven-compat:3.9.11'
-    intTestRuntimeOnly 'org.apache.maven.resolver:maven-resolver-transport-http:1.9.24'
-    intTestRuntimeOnly 'org.apache.maven.resolver:maven-resolver-connector-basic:1.9.24'
+    implementation mavenLibs.mavenPlugin
+    implementation (mavenLibs.mavenCore) {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+    implementation (mavenLibs.mavenSharedFileManagement) {
+        // file-management 3.2.0 pulls in plexus-utils 4.x (via maven-parent:44) which is
+        // incompatible with Maven 3's runtime; exclude it so the 3.x version from maven-core wins
+        exclude group: 'org.codehaus.plexus', module: 'plexus-utils'
+    }
+    implementation jakartaLibs.jaxbApi
+
+    compileOnly mavenLibs.mavenPluginToolsAnnotations
+
+    intTestImplementation testLibs.junitJupiterApi
+    intTestImplementation testLibs.junitJupiterEngine
+    intTestImplementation mavenLibs.mavenEmbedder
+    intTestRuntimeOnly testLibs.junitJupiterLauncher
+    intTestRuntimeOnly testLibs.logbackClassic
+    intTestRuntimeOnly mavenLibs.mavenCompat
+    intTestRuntimeOnly mavenLibs.mavenResolverTransportHttp
+    intTestRuntimeOnly mavenLibs.mavenResolverConnectorBasic
+    intTestRuntimeOnly jdbcLibs.h2
 }
 
 tasks.register('integrationTest', Test) {
@@ -83,8 +93,11 @@ publishingExtension.publications.named("publishedArtifacts") {
 
 integrationTest {
     environment "hibernateVersion", project.version
+    environment "h2Version", jdbcLibs.versions.h2.get()
 }
 
-integrationTest.dependsOn rootProject.childProjects.'hibernate-core'.tasks.publishToMavenLocal
+integrationTest.dependsOn project(':hibernate-core').tasks.publishToMavenLocal
+integrationTest.dependsOn ':hibernate-reveng:publishToMavenLocal'
+integrationTest.dependsOn ":hibernate-platform:publishToMavenLocal"
 integrationTest.dependsOn publishToMavenLocal
 check.dependsOn integrationTest
diff --git a/tooling/hibernate-maven-plugin/src/intTest/java/org/hibernate/orm/tooling/maven/EnhancerMojoTestIT.java b/tooling/hibernate-maven-plugin/src/intTest/java/org/hibernate/orm/tooling/maven/EnhancerMojoTestIT.java
index 14f557ff3bd7..1145c50070b1 100644
--- a/tooling/hibernate-maven-plugin/src/intTest/java/org/hibernate/orm/tooling/maven/EnhancerMojoTestIT.java
+++ b/tooling/hibernate-maven-plugin/src/intTest/java/org/hibernate/orm/tooling/maven/EnhancerMojoTestIT.java
@@ -8,7 +8,9 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import org.apache.maven.cli.MavenCli;
+import org.codehaus.plexus.classworlds.ClassWorld;
 import org.hibernate.bytecode.enhance.spi.EnhancementInfo;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -28,13 +30,22 @@ public class EnhancerMojoTestIT {
 	@TempDir
 	File projectDir;
 
+	private ClassWorld classWorld;
 	private MavenCli mavenCli;
+	private URLClassLoader testClassLoader;
 
 	@BeforeEach
 	public void beforeEach() throws Exception {
 		copyJavFiles();
 		System.setProperty(MVN_HOME, projectDir.getAbsolutePath());
-		mavenCli = new MavenCli();
+		classWorld = new ClassWorld( "plexus.core", Thread.currentThread().getContextClassLoader() );
+		mavenCli = new MavenCli( classWorld );
+	}
+
+	@AfterEach
+	public void afterEach() throws Exception {
+		classWorld.close();
+		destroyTestClassLoader();
 	}
 
 	@Test
@@ -214,7 +225,7 @@ private void executeCompileGoal() {
 		assertFalse(fileExists("target/classes/Baz.class"));
 		assertFalse(fileExists("target/classes/Foo.class"));
 		// Execute the 'compile' target
-		new MavenCli().doMain(
+		mavenCli.doMain(
 				new String[]{"compile"},
 				projectDir.getAbsolutePath(),
 				null,
@@ -236,6 +247,11 @@ private void executeEnhanceGoal() throws Exception {
 				projectDir.getAbsolutePath(),
 				null,
 				null);
+		mavenCli.doMain(
+				new String[]{"dependency:copy-dependencies"},
+				projectDir.getAbsolutePath(),
+				null,
+				null);
 		// The results are verified in the respective tests
 	}
 
@@ -273,11 +289,29 @@ private void copyJavFile(String javFileName, File toFolder) throws Exception {
 	}
 
 	private ClassLoader getTestClassLoader() throws Exception {
-		return new URLClassLoader( new URL[] { new File(projectDir, "target/classes").toURI().toURL() } );
+		if ( testClassLoader == null ) {
+			testClassLoader = new URLClassLoader( new URL[] {
+					new File( projectDir, "target/classes" ).toURI().toURL(),
+					new File( projectDir, "target/dependency/geolatte-geom-1.10.jar" ).toURI().toURL(),
+			} );
+		}
+		return testClassLoader;
+	}
+
+	private void destroyTestClassLoader() throws Exception {
+		if ( testClassLoader != null ) {
+			testClassLoader.close();
+			testClassLoader = null;
+		}
 	}
 
 	private boolean isEnhanced(String className) throws Exception {
-		return getTestClassLoader().loadClass( className ).isAnnotationPresent( EnhancementInfo.class );
+		try {
+			return getTestClassLoader().loadClass( className ).isAnnotationPresent( EnhancementInfo.class );
+		}
+		finally {
+			destroyTestClassLoader();
+		}
 	}
 
 	private boolean methodIsPresentInClass(String methodName, String className) throws Exception {
@@ -288,30 +322,38 @@ private boolean methodIsPresentInClass(String methodName, String className) thro
 		} catch (NoSuchMethodException e) {
 			return false;
 		}
+		finally {
+			destroyTestClassLoader();
+		}
 	}
 
 	private boolean isAssociationManagementPresent() throws Exception {
 		// Some dynamic programming
 		ClassLoader loader = getTestClassLoader();
-		// Obtain the class objects for 'Baz' and 'Bar'
-		Class<?> bazClass = loader.loadClass( "Baz" );
-		Class<?> barClass = loader.loadClass( "Bar" );
-		// Create an instance of both 'Baz' and 'Bar'
-		Object bazObject = bazClass.getDeclaredConstructor().newInstance();
-		Object barObject = barClass.getDeclaredConstructor().newInstance();
-		// Lookup the 'bars' field of class 'Baz' (an ArrayList of 'Bar' objects)
-		Field bazBarsField = bazClass.getDeclaredField( "bars" );
-		bazBarsField.setAccessible( true );
-		// Obtain the 'bars' list of the 'Baz' object; it should be empty
-		List<?> bazBarsList = (List<?>) bazBarsField.get( bazObject );   // baz.bars
-		assertTrue(bazBarsList.isEmpty());
-		// Lookup the 'setBaz' method of class 'Bar' and invoke it on the 'Bar' object
-		Method barSetBazMethod = barClass.getDeclaredMethod( "setBaz", new Class[] { bazClass } );
-		barSetBazMethod.invoke( barObject, bazObject );                  // bar.setBaz(baz)
-		// Reobtain the 'bars' list of the 'Baz' object
-		bazBarsList = (List<?>) bazBarsField.get( bazObject );
-		// If there is association management, the 'bars' list should contain the 'Bar' object
-		return bazBarsList.contains( barObject );                        // baz.bars.contains(bar)
+		try {
+			// Obtain the class objects for 'Baz' and 'Bar'
+			Class<?> bazClass = loader.loadClass( "Baz" );
+			Class<?> barClass = loader.loadClass( "Bar" );
+			// Create an instance of both 'Baz' and 'Bar'
+			Object bazObject = bazClass.getDeclaredConstructor().newInstance();
+			Object barObject = barClass.getDeclaredConstructor().newInstance();
+			// Lookup the 'bars' field of class 'Baz' (an ArrayList of 'Bar' objects)
+			Field bazBarsField = bazClass.getDeclaredField( "bars" );
+			bazBarsField.setAccessible( true );
+			// Obtain the 'bars' list of the 'Baz' object; it should be empty
+			List<?> bazBarsList = (List<?>) bazBarsField.get( bazObject );   // baz.bars
+			assertTrue( bazBarsList.isEmpty() );
+			// Lookup the 'setBaz' method of class 'Bar' and invoke it on the 'Bar' object
+			Method barSetBazMethod = barClass.getDeclaredMethod( "setBaz", new Class[] {bazClass} );
+			barSetBazMethod.invoke( barObject, bazObject );                  // bar.setBaz(baz)
+			// Reobtain the 'bars' list of the 'Baz' object
+			bazBarsList = (List<?>) bazBarsField.get( bazObject );
+			// If there is association management, the 'bars' list should contain the 'Bar' object
+			return bazBarsList.contains( barObject );                        // baz.bars.contains(bar)
+		}
+		finally {
+			destroyTestClassLoader();
+		}
 	}
 
 	private boolean fileExists(String relativePath) {
diff --git a/tooling/hibernate-maven-plugin/src/intTest/java/org/hibernate/orm/tooling/maven/reveng/ExamplesTestIT.java b/tooling/hibernate-maven-plugin/src/intTest/java/org/hibernate/orm/tooling/maven/reveng/ExamplesTestIT.java
new file mode 100644
index 000000000000..f1a682ebf021
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/java/org/hibernate/orm/tooling/maven/reveng/ExamplesTestIT.java
@@ -0,0 +1,240 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.cli.MavenCli;
+import org.hibernate.tool.reveng.api.version.Version;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.net.URL;
+import java.nio.file.Files;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.util.Objects;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+	public class ExamplesTestIT {
+
+		public static final String MVN_HOME = "maven.multiModuleProjectDirectory";
+		private static File baseFolder;
+
+		private File projectFolder;
+
+		@TempDir
+		private File tempFolder;
+
+		private String[] databaseCreationScript = new String[] {
+				// This is the default database which can be overridden per test
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+		};
+
+		@BeforeAll
+		public static void beforeAll() throws Exception {
+			// The needed resource for this test are put in place
+			// in the 'baseFolder' (normally 'target/test-classes')
+			// by the 'build-helper-maven-plugin' execution.
+			// See the 'pom.xml'
+			baseFolder = determineBaseFolder();
+//		localRepo = new File(baseFolder.getParentFile(), "local-repo");
+		}
+
+		@Test
+		public void test5MinuteTutorial() throws Exception {
+			prepareProject("5-minute-tutorial");
+			assertNotGeneratedYet("Person.java");
+			runGenerateSources();
+			assertNumberOfGeneratedFiles(1);
+			assertGeneratedContains("Person.java", "public class Person");
+		}
+
+		@Test
+		public void testJpaDefault() throws Exception {
+			prepareProject("hbm2java/jpa-default");
+			assertNotGeneratedYet("Person.java");
+			runGenerateSources();
+			assertNumberOfGeneratedFiles(1);
+			assertGeneratedContains("Person.java","import jakarta.persistence.Entity;");
+		}
+
+		@Test
+		public void testNoAnnotations() throws Exception {
+			prepareProject("hbm2java/no-annotations");
+			assertNotGeneratedYet("Person.java");
+			runGenerateSources();
+			assertNumberOfGeneratedFiles(1);
+			assertGeneratedDoesNotContain("Person.java", "import jakarta.persistence.Entity;");
+		}
+
+		@Test
+		public void testNoGenerics() throws Exception {
+			databaseCreationScript = new String[] {
+					"create table PERSON (ID int not null,  NAME varchar(20), primary key (ID))",
+					"create table ITEM (ID int not null,  NAME varchar(20), OWNER_ID int not null, " +
+					"   primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
+			};
+			prepareProject("hbm2java/no-generics");
+			assertNotGeneratedYet("Person.java");
+			runGenerateSources();
+			assertNumberOfGeneratedFiles(2);
+			assertGeneratedDoesNotContain("Person.java", "Set<Item>");
+		}
+
+		@Test
+		public void testOutputDirectory() throws Exception {
+			System.setProperty("output.dir", "${project.basedir}/generated-classes");
+			prepareProject("hbm2java/output-directory");
+			File outputDirectory = new File(projectFolder, "generated-classes");
+			File personFile = new File(outputDirectory, "Person.java");
+			assertFalse(outputDirectory.exists());
+			assertFalse(personFile.exists());
+			runGenerateSources();
+			assertEquals(1, Objects.requireNonNull( outputDirectory.list() ).length); // 1 file is generated in 'generated-classes'
+			assertTrue(personFile.exists()); // The Person.java file should have been generated
+		}
+
+		@Test
+		public void testTemplatePath() throws Exception {
+			System.setProperty("template.dir", "${project.basedir}/templates");
+			prepareProject("hbm2java/template-path");
+			assertNotGeneratedYet("Person.java");
+			runGenerateSources();
+			assertNumberOfGeneratedFiles(1);
+			assertGeneratedContains("Person.java", "// This is just an example of a custom template");
+		}
+
+		@Test
+		public void testUseGenerics() throws Exception {
+			databaseCreationScript = new String[] {
+					"create table PERSON (ID int not null,  NAME varchar(20), primary key (ID))",
+					"create table ITEM (ID int not null,  NAME varchar(20), OWNER_ID int not null, " +
+					"   primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
+			};
+			prepareProject("hbm2java/use-generics");
+			assertNotGeneratedYet("Person.java");
+			runGenerateSources();
+			assertNumberOfGeneratedFiles(2);
+			assertGeneratedContains("Person.java", "Set<Item>");
+		}
+
+		@Test
+		public void testHbm2OrmSimpleDefault() throws Exception {
+			projectFolder = new File(baseFolder, "hbm2orm/simple-default");
+			File ormXmlFile = new File(projectFolder, "src/main/resources/simple.mapping.xml");
+			assertFalse(ormXmlFile.exists());
+			runMavenCommand( "org.hibernate.orm:hibernate-maven-plugin:" + Version.versionString() + ":transformHbm");
+			assertTrue(ormXmlFile.exists());
+			String ormXmlContents = Files.readString( ormXmlFile.toPath() );
+			assertTrue(ormXmlContents.contains("entity-mappings"));
+		}
+
+		private void prepareProject(String projectName) throws Exception {
+			projectFolder = new File(baseFolder, projectName);
+			assertTrue(projectFolder.exists());
+			System.setProperty(MVN_HOME, projectFolder.getAbsolutePath());
+			editPomFile(projectFolder);
+			createHibernatePropertiesFile(projectFolder);
+			createDatabase();
+		}
+
+		private void createHibernatePropertiesFile(File projectFolder) throws Exception {
+			File projectResourcesFolder = new File(projectFolder, "src/main/resources");
+			File hibernatePropertiesFile = new File(projectResourcesFolder, "hibernate.properties");
+			String hibernatePropertiesFileContents =
+					"hibernate.connection.driver_class=org.h2.Driver\n" +
+					"hibernate.connection.url=" + constructJdbcConnectionString() + "\n" +
+					"hibernate.connection.username=\n" +
+					"hibernate.connection.password=\n" +
+					"hibernate.default_catalog=TEST\n" +
+					"hibernate.default_schema=PUBLIC\n";
+			Files.writeString(hibernatePropertiesFile.toPath(), hibernatePropertiesFileContents);
+			assertTrue(hibernatePropertiesFile.exists());
+		}
+
+		private void runGenerateSources() {
+			new MavenCli().doMain(
+					new String[]{"generate-sources"},
+					projectFolder.getAbsolutePath(),
+					null,
+					null);
+		}
+
+		private void runMavenCommand(String command) {
+			new MavenCli().doMain(
+					new String[]{ command },
+					projectFolder.getAbsolutePath(),
+					null,
+					null);
+		}
+
+		private void assertNotGeneratedYet(String fileName) {
+			assertFalse(new File(projectFolder, "target/generated-sources/" + fileName).exists());
+		}
+
+		private void assertGeneratedContains(String fileName, String contents) throws Exception {
+			assertTrue(readGeneratedContents(fileName).contains(contents));
+		}
+
+		private void assertGeneratedDoesNotContain(String fileName, String contents) throws Exception {
+			assertFalse(readGeneratedContents(fileName).contains(contents));
+		}
+
+		private void assertNumberOfGeneratedFiles(int amount) {
+			assertEquals(
+					amount,
+					Objects.requireNonNull(
+							new File( projectFolder, "target/generated-sources" ).list() ).length);
+		}
+
+		private String readGeneratedContents(String fileName) throws Exception {
+			File generatedPersonFile = new File(projectFolder, "target/generated-sources/" + fileName);
+			assertTrue(generatedPersonFile.exists());
+			return new String(Files.readAllBytes(generatedPersonFile.toPath()));
+		}
+
+		private static File determineBaseFolder() throws Exception {
+			Class<?> thisClass = ExamplesTestIT.class;
+			URL markerUrl = thisClass.getResource( "/resource.marker" );
+			assert markerUrl != null;
+			return new File(markerUrl.toURI()).getParentFile();
+		}
+
+		private void createDatabase() throws Exception {
+			File databaseFile = new File(tempFolder, "database/test.mv.db");
+			assertFalse(databaseFile.exists());
+			assertFalse(databaseFile.isFile());
+			Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+			Statement statement = connection.createStatement();
+			for (String s : databaseCreationScript) {
+				statement.execute(s);
+			}
+			statement.close();
+			connection.close();
+			assertTrue(databaseFile.exists());
+			assertTrue(databaseFile.isFile());
+		}
+
+		private String constructJdbcConnectionString() {
+			return "jdbc:h2:" + tempFolder.getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
+		}
+
+		private void editPomFile(File projectFolder) throws Exception {
+			System.out.println("Editing pom file");
+			File pomFile = new File(projectFolder, "pom.xml");
+			assertTrue(pomFile.exists());
+			String pomFileContents = Files.readString( pomFile.toPath() );
+			pomFileContents = pomFileContents
+					.replace( "${h2.version}", System.getenv("h2Version") )
+					.replace( "${hibernate.version}", System.getenv("hibernateVersion") );
+			Files.writeString( pomFile.toPath(), pomFileContents );
+		}
+
+	}
diff --git a/tooling/hibernate-maven-plugin/src/intTest/java/org/hibernate/orm/tooling/maven/reveng/TransformHbmTestIT.java b/tooling/hibernate-maven-plugin/src/intTest/java/org/hibernate/orm/tooling/maven/reveng/TransformHbmTestIT.java
new file mode 100644
index 000000000000..63570c8450f2
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/java/org/hibernate/orm/tooling/maven/reveng/TransformHbmTestIT.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.cli.MavenCli;
+import org.hibernate.tool.reveng.api.version.Version;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TransformHbmTestIT {
+
+	public static final String MVN_HOME = "maven.multiModuleProjectDirectory";
+
+	@TempDir
+	private Path projectPath;
+
+	@Test
+	public void testSimpleHbmTransformation() throws Exception {
+		System.setProperty(MVN_HOME, projectPath.toAbsolutePath().toString());
+		writePomFile();
+		copyHbmFile();
+		runTransformHbmToOrm();
+	}
+
+	private void writePomFile() throws Exception {
+		File pomFile = new File(projectPath.toFile(), "pom.xml");
+		assertFalse(pomFile.exists());
+		Path pomPath = projectPath.resolve("pom.xml");
+		Files.writeString(pomPath, simplePomContents);
+		assertTrue(pomFile.exists());
+	}
+
+	private void copyHbmFile() throws Exception {
+		URL originUrl = getClass().getResource("simple.hbm.xml");
+		assertNotNull(originUrl);
+		Path originPath = Paths.get(Objects.requireNonNull(originUrl).toURI());
+		File destinationDir = new File(projectPath.toFile(), "src/main/resources/");
+		assertTrue(destinationDir.mkdirs());
+		File destinationFile = new File(destinationDir, "simple.hbm.xml");
+		assertFalse(destinationFile.exists());
+		Files.copy(originPath, destinationFile.toPath());
+		assertTrue(destinationFile.exists());
+	}
+
+	private void runTransformHbmToOrm() throws Exception {
+		File destinationDir = new File(projectPath.toFile(), "src/main/resources/");
+		File ormXmlFile = new File(destinationDir, "simple.mapping.xml");
+		assertFalse(ormXmlFile.exists());
+		new MavenCli().doMain(
+				new String[] {
+						"compile",
+						"org.hibernate.orm:hibernate-maven-plugin:" + Version.versionString() + ":transformHbm"
+				},
+				projectPath.toAbsolutePath().toString(),
+				null,
+				null);
+		// Check the existence of the transformed file
+		assertTrue(ormXmlFile.exists());
+		// Check if it's pretty printed
+		assertTrue(Files.readString(ormXmlFile.toPath()).contains("\n        <table name=\"Foo\"/>\n"));
+	}
+
+	private static final String simplePomContents =
+			"""
+				<project>
+					<modelVersion>4.0.0</modelVersion>
+					<groupId>org.hibernate.tool.maven.test</groupId>
+					<artifactId>simplest</artifactId>
+					<version>0.1-SNAPSHOT</version>
+				</project>
+				""";
+
+}
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/5-minute-tutorial/README.md b/tooling/hibernate-maven-plugin/src/intTest/resources/5-minute-tutorial/README.md
new file mode 100644
index 000000000000..84a3e34535a9
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/5-minute-tutorial/README.md
@@ -0,0 +1,21 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+To run this example:
+  - Have [Apache Maven](https://maven.apache.org) installed
+  - Have [H2 Sakila database](https://github.com/hibernate/sakila-h2) running
+  - Issue one of the following commands from a command-line window opened in this folder:
+    - `mvn generate-sources -Dh2.version=${h2.version} -Dproject.version=${hibernate.version}`
+  
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/5-minute-tutorial/pom.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/5-minute-tutorial/pom.xml
new file mode 100644
index 000000000000..44a3d864c273
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/5-minute-tutorial/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2018 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hibernate.tool.maven.test</groupId>
+    <artifactId>five-minute-tutorial</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate.version}</version>
+                <executions>
+                    <execution>
+                        <id>Entity generation</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>hbm2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/5-minute-tutorial/src/main/resources/hibernate.properties b/tooling/hibernate-maven-plugin/src/intTest/resources/5-minute-tutorial/src/main/resources/hibernate.properties
new file mode 100644
index 000000000000..60b2483a2f2b
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/5-minute-tutorial/src/main/resources/hibernate.properties
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:tcp://localhost/./sakila
+hibernate.connection.username=sa
+hibernate.default_catalog=SAKILA
+hibernate.default_schema=PUBLIC
+
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/Baz.jav_ b/tooling/hibernate-maven-plugin/src/intTest/resources/Baz.jav_
index 5e33d11767bb..4dc31bdc6e38 100644
--- a/tooling/hibernate-maven-plugin/src/intTest/resources/Baz.jav_
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/Baz.jav_
@@ -1,5 +1,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.OneToMany;
+import org.geolatte.geom.Circle;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -12,6 +13,8 @@ public class Baz {
     @OneToMany(mappedBy = "baz")
     private List<Bar> bars = new ArrayList<Bar>();
 
+    private Circle circle;
+
     String getFoo() {
         return foo;
     }
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/jpa-default/README.md b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/jpa-default/README.md
new file mode 100644
index 000000000000..b7b95463cd2f
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/jpa-default/README.md
@@ -0,0 +1,21 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+To run this example:
+  - Have [Apache Maven](https://maven.apache.org) installed
+  - Have [H2 Sakila database](https://github.com/hibernate/sakila-h2) running
+  - Issue the following commands from a command-line window opened in this folder:
+    `mvn generate-sources -Dh2.version=${h2.version} -Dhibernate.version=${hibernate.version}`
+  
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/jpa-default/pom.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/jpa-default/pom.xml
new file mode 100644
index 000000000000..79e2a4e37f6f
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/jpa-default/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2018 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hibernate.tool.maven.test</groupId>
+    <artifactId>hbm2java-jpa-default</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate.version}</version>
+                <executions>
+                    <execution>
+                        <id>Entity generation</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>hbm2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/jpa-default/src/main/resources/hibernate.properties b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/jpa-default/src/main/resources/hibernate.properties
new file mode 100644
index 000000000000..60b2483a2f2b
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/jpa-default/src/main/resources/hibernate.properties
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:tcp://localhost/./sakila
+hibernate.connection.username=sa
+hibernate.default_catalog=SAKILA
+hibernate.default_schema=PUBLIC
+
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-annotations/README.md b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-annotations/README.md
new file mode 100644
index 000000000000..b7b95463cd2f
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-annotations/README.md
@@ -0,0 +1,21 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+To run this example:
+  - Have [Apache Maven](https://maven.apache.org) installed
+  - Have [H2 Sakila database](https://github.com/hibernate/sakila-h2) running
+  - Issue the following commands from a command-line window opened in this folder:
+    `mvn generate-sources -Dh2.version=${h2.version} -Dhibernate.version=${hibernate.version}`
+  
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-annotations/pom.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-annotations/pom.xml
new file mode 100644
index 000000000000..39275e3295cb
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-annotations/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2018 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hibernate.tool.maven.test</groupId>
+    <artifactId>hbm2java-no-annotations</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate.version}</version>
+                <executions>
+                    <execution>
+                        <id>Entity generation</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>hbm2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <ejb3>false</ejb3>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-annotations/src/main/resources/hibernate.properties b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-annotations/src/main/resources/hibernate.properties
new file mode 100644
index 000000000000..60b2483a2f2b
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-annotations/src/main/resources/hibernate.properties
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:tcp://localhost/./sakila
+hibernate.connection.username=sa
+hibernate.default_catalog=SAKILA
+hibernate.default_schema=PUBLIC
+
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-generics/README.md b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-generics/README.md
new file mode 100644
index 000000000000..b7b95463cd2f
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-generics/README.md
@@ -0,0 +1,21 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+To run this example:
+  - Have [Apache Maven](https://maven.apache.org) installed
+  - Have [H2 Sakila database](https://github.com/hibernate/sakila-h2) running
+  - Issue the following commands from a command-line window opened in this folder:
+    `mvn generate-sources -Dh2.version=${h2.version} -Dhibernate.version=${hibernate.version}`
+  
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-generics/pom.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-generics/pom.xml
new file mode 100644
index 000000000000..3d5afb66d9a4
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-generics/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2018 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hibernate.tool.maven.test</groupId>
+    <artifactId>hbm2java-no-generics</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate.version}</version>
+                <executions>
+                    <execution>
+                        <id>Entity generation</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>hbm2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <jdk5>false</jdk5>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-generics/src/main/resources/hibernate.properties b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-generics/src/main/resources/hibernate.properties
new file mode 100644
index 000000000000..60b2483a2f2b
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/no-generics/src/main/resources/hibernate.properties
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:tcp://localhost/./sakila
+hibernate.connection.username=sa
+hibernate.default_catalog=SAKILA
+hibernate.default_schema=PUBLIC
+
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/output-directory/README.md b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/output-directory/README.md
new file mode 100644
index 000000000000..a5b85c8ec89c
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/output-directory/README.md
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+To run this example:
+  - Have [Apache Maven](https://maven.apache.org) installed
+  - Have [H2 Sakila database](https://github.com/hibernate/sakila-h2) running
+  - Issue the following command from a command-line window opened in this folder:
+```shell
+mvn generate-sources 
+  -Dh2.version=${h2.version} 
+  -Dhibernate.version=${hibernate.version}  
+  -Doutput.dir=./generated-classes
+```
+    
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/output-directory/pom.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/output-directory/pom.xml
new file mode 100644
index 000000000000..8fbb23eaf45b
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/output-directory/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2018 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hibernate.tool.maven.test</groupId>
+    <artifactId>hbm2java-jpa-default</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate.version}</version>
+                <executions>
+                    <execution>
+                        <id>Entity generation</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>hbm2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <outputDirectory>${output.dir}</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/output-directory/src/main/resources/hibernate.properties b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/output-directory/src/main/resources/hibernate.properties
new file mode 100644
index 000000000000..60b2483a2f2b
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/output-directory/src/main/resources/hibernate.properties
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:tcp://localhost/./sakila
+hibernate.connection.username=sa
+hibernate.default_catalog=SAKILA
+hibernate.default_schema=PUBLIC
+
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/README.md b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/README.md
new file mode 100644
index 000000000000..fa81c49116cd
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/README.md
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+To run this example:
+  - Have [Apache Maven](https://maven.apache.org) installed
+  - Have [H2 Sakila database](https://github.com/hibernate/sakila-h2) running
+  - Issue the following command from a command-line window opened in this folder:
+```shell
+mvn generate-sources 
+  -Dh2.version=${h2.version} 
+  -Dhibernate.version=${hibernate.version}  
+  -Dtemplate.dir=./templates
+```
+    
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/pom.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/pom.xml
new file mode 100644
index 000000000000..50c1cad65a5a
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2018 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hibernate.tool.maven.test</groupId>
+    <artifactId>hbm2java-template-path</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate.version}</version>
+                <executions>
+                    <execution>
+                        <id>Entity generation</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>hbm2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <templatePath>${template.dir}</templatePath>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/src/main/resources/hibernate.properties b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/src/main/resources/hibernate.properties
new file mode 100644
index 000000000000..60b2483a2f2b
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/src/main/resources/hibernate.properties
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:tcp://localhost/./sakila
+hibernate.connection.username=sa
+hibernate.default_catalog=SAKILA
+hibernate.default_schema=PUBLIC
+
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/templates/pojo/Pojo.ftl b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/templates/pojo/Pojo.ftl
new file mode 100644
index 000000000000..18f3de1a5a29
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/template-path/templates/pojo/Pojo.ftl
@@ -0,0 +1,18 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+// This is just an example of a custom template
+
+
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/use-generics/README.md b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/use-generics/README.md
new file mode 100644
index 000000000000..b7b95463cd2f
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/use-generics/README.md
@@ -0,0 +1,21 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+To run this example:
+  - Have [Apache Maven](https://maven.apache.org) installed
+  - Have [H2 Sakila database](https://github.com/hibernate/sakila-h2) running
+  - Issue the following commands from a command-line window opened in this folder:
+    `mvn generate-sources -Dh2.version=${h2.version} -Dhibernate.version=${hibernate.version}`
+  
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/use-generics/pom.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/use-generics/pom.xml
new file mode 100644
index 000000000000..c59fe76a5c83
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/use-generics/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2018 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hibernate.tool.maven.test</groupId>
+    <artifactId>hbm2java-use-generics</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate.version}</version>
+                <executions>
+                    <execution>
+                        <id>Entity generation</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>hbm2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/use-generics/src/main/resources/hibernate.properties b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/use-generics/src/main/resources/hibernate.properties
new file mode 100644
index 000000000000..60b2483a2f2b
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2java/use-generics/src/main/resources/hibernate.properties
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:tcp://localhost/./sakila
+hibernate.connection.username=sa
+hibernate.default_catalog=SAKILA
+hibernate.default_schema=PUBLIC
+
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/.gitignore b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/.gitignore
new file mode 100644
index 000000000000..34aa788d0e6a
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/.gitignore
@@ -0,0 +1 @@
+*.mapping.xml
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/simple-default/README.md b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/simple-default/README.md
new file mode 100644
index 000000000000..40d4212b989e
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/simple-default/README.md
@@ -0,0 +1,19 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+To run this example:
+- Have [Apache Maven](https://maven.apache.org) installed
+- Issue the following commands from a command-line window opened in this folder:
+  `mvn org.hibernate.tool:hibernate-tools-maven:${hibernate.version}:hbm2orm`
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/simple-default/pom.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/simple-default/pom.xml
new file mode 100644
index 000000000000..8f2461a63d58
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/simple-default/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2018 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hibernate.tool.maven.test</groupId>
+    <artifactId>hbm2orm-simple-default</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+ </project>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/simple-default/src/main/resources/simple.hbm.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/simple-default/src/main/resources/simple.hbm.xml
new file mode 100644
index 000000000000..c45e11bd0102
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/simple-default/src/main/resources/simple.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="org.bar.Foo">
+		<id name="id" type="long">
+			<generator class="assigned"/>
+		</id>
+		<property name="name" type="string"/>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/README.md b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/README.md
new file mode 100644
index 000000000000..0b6300de104a
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/README.md
@@ -0,0 +1,19 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+To run this example:
+- Have [Apache Maven](https://maven.apache.org) installed
+- Issue the following commands from a command-line window opened in this folder:
+  `mvn compile org.hibernate.tool:hibernate-tools-maven:${hibernate.version}:hbm2orm`
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/pom.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/pom.xml
new file mode 100644
index 000000000000..8f2461a63d58
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2018 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.hibernate.tool.maven.test</groupId>
+    <artifactId>hbm2orm-simple-default</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+ </project>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/src/main/java/org/foo/Bar.java b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/src/main/java/org/foo/Bar.java
new file mode 100644
index 000000000000..34baa13968e4
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/src/main/java/org/foo/Bar.java
@@ -0,0 +1,44 @@
+/*
+ * Hibernate Tools, Tooling for your Hibernate Projects
+ *
+ * Copyright 2016-2025 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.foo;
+
+import org.hibernate.usertype.UserType;
+
+public class Bar implements UserType<Integer> {
+
+    @Override
+    public int getSqlType() {
+        return 0;
+    }
+
+    @Override
+    public Class<Integer> returnedClass() {
+        return null;
+    }
+
+    @Override
+    public Integer deepCopy(Integer integer) {
+        return 0;
+    }
+
+    @Override
+    public boolean isMutable() {
+        return false;
+    }
+
+}
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/src/main/resources/user-type.hbm.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/src/main/resources/user-type.hbm.xml
new file mode 100644
index 000000000000..aa6eef423b2d
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/hbm2orm/with-user-type/src/main/resources/user-type.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="org.bar.Foo">
+		<id name="id" type="long">
+			<generator class="assigned"/>
+		</id>
+		<property name="name" type="org.foo.Bar"/>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/org/hibernate/orm/tooling/maven/reveng/simple.hbm.xml b/tooling/hibernate-maven-plugin/src/intTest/resources/org/hibernate/orm/tooling/maven/reveng/simple.hbm.xml
new file mode 100644
index 000000000000..c45e11bd0102
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/org/hibernate/orm/tooling/maven/reveng/simple.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="org.bar.Foo">
+		<id name="id" type="long">
+			<generator class="assigned"/>
+		</id>
+		<property name="name" type="string"/>
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/pom.xm_ b/tooling/hibernate-maven-plugin/src/intTest/resources/pom.xm_
index 6f48cc3aaa3a..33eb3209b629 100644
--- a/tooling/hibernate-maven-plugin/src/intTest/resources/pom.xm_
+++ b/tooling/hibernate-maven-plugin/src/intTest/resources/pom.xm_
@@ -16,6 +16,13 @@
       <artifactId>hibernate-core</artifactId>
       <version>${hibernate.version}</version>
     </dependency>
+    <!-- Just an arbitrary library. We need to make sure it's not included in hibernate-core because hibernate-core
+         itself is included in the Maven plugin -->
+    <dependency>
+      <groupId>org.geolatte</groupId>
+      <artifactId>geolatte-geom</artifactId>
+      <version>1.10</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/tooling/hibernate-maven-plugin/src/intTest/resources/resource.marker b/tooling/hibernate-maven-plugin/src/intTest/resources/resource.marker
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/HibernateEnhancerMojo.java b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/HibernateEnhancerMojo.java
index aa924ab9e186..bfe3c44c8051 100644
--- a/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/HibernateEnhancerMojo.java
+++ b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/HibernateEnhancerMojo.java
@@ -4,10 +4,14 @@
  */
 package org.hibernate.orm.tooling.maven;
 
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.shared.model.fileset.util.FileSetManager;
 import org.hibernate.bytecode.enhance.spi.EnhancementException;
@@ -23,11 +27,13 @@
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Maven mojo for performing build-time enhancement of entity objects.
  */
-@Mojo(name = "enhance", defaultPhase = LifecyclePhase.PROCESS_CLASSES)
+@Mojo(name = "enhance", defaultPhase = LifecyclePhase.PROCESS_CLASSES,
+		requiresDependencyResolution = ResolutionScope.COMPILE)
 public class HibernateEnhancerMojo extends AbstractMojo {
 
 	final private List<File> sourceSet = new ArrayList<File>();
@@ -89,7 +95,13 @@ public class HibernateEnhancerMojo extends AbstractMojo {
 			required = true)
 	private boolean enableExtendedEnhancement;
 
-	public void execute() {
+	/**
+	 * The Maven Project Object
+	 */
+	@Parameter(defaultValue = "${project}", readonly = true, required = true)
+	private MavenProject project;
+
+	public void execute() throws MojoExecutionException {
 		getLog().debug(STARTING_EXECUTION_OF_ENHANCE_MOJO);
 		processParameters();
 		if (enhancementIsNeeded()) {
@@ -151,24 +163,47 @@ private void addFileSetToSourceSet(FileSet fileSet) {
 				getLog().debug(SKIPPING_NON_CLASS_FILE.formatted(candidateFile));
 			}
 		}
-		getLog().debug(FILESET_PROCESSED_SUCCESFULLY);
+		getLog().debug(FILESET_PROCESSED_SUCCESSFULLY);
 	}
 
-	private ClassLoader createClassLoader() {
+	private ClassLoader createClassLoader() throws MojoExecutionException {
 		getLog().debug(CREATE_URL_CLASSLOADER_FOR_FOLDER.formatted(classesDirectory)) ;
 		List<URL> urls = new ArrayList<>();
 		try {
 			urls.add(classesDirectory.toURI().toURL());
 		}
 		catch (MalformedURLException e) {
-			getLog().error(UNEXPECTED_ERROR_WHILE_CONSTRUCTING_CLASSLOADER, e);
+			throw new MojoExecutionException(UNEXPECTED_ERROR_WHILE_CONSTRUCTING_CLASSLOADER, e);
+		}
+
+		// Add dependencies to classpath as well - all but the ones used for testing purposes
+		final Set<Artifact> artifacts = this.project.getArtifacts();
+		if (artifacts != null) {
+			boolean success = true;
+			for (var artifact : artifacts) {
+				if ( !Artifact.SCOPE_TEST.equals(artifact.getScope() ) ) {
+					try {
+						urls.add(artifact.getFile().toURI().toURL() );
+						getLog().debug(CREATE_URL_CLASSLOADER_ADD_DEPENDENCY_ARTIFACT.formatted(artifact.getId()));
+					}
+					catch (MalformedURLException e) {
+						success = false;
+						getLog().error(UNEXPECTED_ERROR_WHILE_CONSTRUCTING_CLASSLOADER_ADD_DEPENDENCY_ARTIFACT
+								.formatted(artifact.getId(), artifact.getFile().getAbsolutePath()), e);
+					}
+				}
+			}
+			if (!success) {
+				throw new MojoExecutionException(UNEXPECTED_ERROR_WHILE_CONSTRUCTING_CLASSLOADER_DEPENDENCIES);
+			}
 		}
+
 		return new URLClassLoader(
 				urls.toArray(new URL[0]),
 				Enhancer.class.getClassLoader());
 	}
 
-	private EnhancementContext createEnhancementContext() {
+	private EnhancementContext createEnhancementContext() throws MojoExecutionException {
 		getLog().debug(CREATE_ENHANCEMENT_CONTEXT) ;
 		return new EnhancementContext(
 				createClassLoader(),
@@ -178,14 +213,14 @@ private EnhancementContext createEnhancementContext() {
 				enableExtendedEnhancement);
 	}
 
-	private void createEnhancer() {
+	private void createEnhancer() throws MojoExecutionException {
 		getLog().debug(CREATE_BYTECODE_ENHANCER) ;
 		enhancer = BytecodeProviderInitiator
 				.buildDefaultBytecodeProvider()
 				.getEnhancer(createEnhancementContext());
 	}
 
-	private void discoverTypes() {
+	private void discoverTypes() throws MojoExecutionException {
 		getLog().debug(STARTING_TYPE_DISCOVERY) ;
 		for (File classFile : sourceSet) {
 			discoverTypesForClass(classFile);
@@ -193,16 +228,16 @@ private void discoverTypes() {
 		getLog().debug(ENDING_TYPE_DISCOVERY) ;
 	}
 
-	private void discoverTypesForClass(File classFile) {
+	private void discoverTypesForClass(File classFile) throws MojoExecutionException {
 		getLog().debug(TRYING_TO_DISCOVER_TYPES_FOR_CLASS_FILE.formatted(classFile));
 		try {
 			enhancer.discoverTypes(
 					determineClassName(classFile),
-					Files.readAllBytes( classFile.toPath()));
-			getLog().info(SUCCESFULLY_DISCOVERED_TYPES_FOR_CLASS_FILE.formatted(classFile));
+					Files.readAllBytes(classFile.toPath()));
+			getLog().info(SUCCESSFULLY_DISCOVERED_TYPES_FOR_CLASS_FILE.formatted(classFile));
 		}
 		catch (IOException e) {
-			getLog().error(UNABLE_TO_DISCOVER_TYPES_FOR_CLASS_FILE.formatted(classFile), e);
+			throw new MojoExecutionException(UNABLE_TO_DISCOVER_TYPES_FOR_CLASS_FILE.formatted(classFile), e);
 		}
 	}
 
@@ -216,20 +251,24 @@ private String determineClassName(File classFile) {
 				.replace(File.separatorChar, '.');
 	}
 
-	private void performEnhancement() {
+	private void performEnhancement() throws MojoExecutionException {
 		getLog().debug(STARTING_CLASS_ENHANCEMENT) ;
+		boolean success = true;
 		for (File classFile : sourceSet) {
 			long lastModified = classFile.lastModified();
-			enhanceClass(classFile);
+			success = enhanceClass(classFile) & success;
 			final boolean timestampReset = classFile.setLastModified( lastModified );
 			if ( !timestampReset ) {
 				getLog().debug(SETTING_LASTMODIFIED_FAILED_FOR_CLASS_FILE.formatted(classFile));
 			}
 		}
+		if (!success) {
+			throw new MojoExecutionException(ERROR_WHILE_ENHANCING_CLASSES);
+		}
 		getLog().debug(ENDING_CLASS_ENHANCEMENT) ;
 	}
 
-	private void enhanceClass(File classFile) {
+	private boolean enhanceClass(File classFile) throws MojoExecutionException {
 		getLog().debug(TRYING_TO_ENHANCE_CLASS_FILE.formatted(classFile));
 		try {
 			byte[] newBytes = enhancer.enhance(
@@ -237,43 +276,48 @@ private void enhanceClass(File classFile) {
 					Files.readAllBytes(classFile.toPath()));
 			if (newBytes != null) {
 				writeByteCodeToFile(newBytes, classFile);
-				getLog().info(SUCCESFULLY_ENHANCED_CLASS_FILE.formatted(classFile));
+				getLog().info(SUCCESSFULLY_ENHANCED_CLASS_FILE.formatted(classFile));
 			}
 			else {
 				getLog().info(SKIPPING_FILE.formatted(classFile));
 			}
 		}
 		catch (EnhancementException | IOException e) {
-			getLog().error(ERROR_WHILE_ENHANCING_CLASS_FILE.formatted(classFile), e);;
+			getLog().error(ERROR_WHILE_ENHANCING_CLASS_FILE.formatted(classFile), e);
+			return false;
 		}
+		return true;
 	}
 
-	private void writeByteCodeToFile(byte[] bytes, File file) {
+	private void writeByteCodeToFile(byte[] bytes, File file) throws MojoExecutionException {
 		getLog().debug(WRITING_BYTE_CODE_TO_FILE.formatted(file));
 		if (clearFile(file)) {
 			try {
-				Files.write( file.toPath(), bytes);
+				Files.write(file.toPath(), bytes);
 				getLog().debug(AMOUNT_BYTES_WRITTEN_TO_FILE.formatted(bytes.length, file));
 			}
 			catch (FileNotFoundException e) {
-				getLog().error(ERROR_OPENING_FILE_FOR_WRITING.formatted(file), e );
+				throw new MojoExecutionException(ERROR_OPENING_FILE_FOR_WRITING.formatted(file), e);
 			}
 			catch (IOException e) {
-				getLog().error(ERROR_WRITING_BYTES_TO_FILE.formatted(file), e );
+				throw new MojoExecutionException(ERROR_WRITING_BYTES_TO_FILE.formatted(file), e);
 			}
 		}
+		else {
+			throw new MojoExecutionException(UNABLE_TO_DELETE_FILE.formatted(file));
+		}
 	}
 
-	private boolean clearFile(File file) {
+	private boolean clearFile(File file) throws MojoExecutionException {
 		getLog().debug(TRYING_TO_CLEAR_FILE.formatted(file));
 		boolean success = false;
 		if ( file.delete() ) {
 			try {
 				if ( !file.createNewFile() ) {
-					getLog().error(UNABLE_TO_CREATE_FILE.formatted(file));
+					throw new MojoExecutionException(UNABLE_TO_CREATE_FILE.formatted(file));
 				}
 				else {
-					getLog().info(SUCCESFULLY_CLEARED_FILE.formatted(file));
+					getLog().info(SUCCESSFULLY_CLEARED_FILE.formatted(file));
 					success = true;
 				}
 			}
@@ -281,17 +325,14 @@ private boolean clearFile(File file) {
 				getLog().warn(PROBLEM_CLEARING_FILE.formatted(file), e);
 			}
 		}
-		else {
-			getLog().error(UNABLE_TO_DELETE_FILE.formatted(file));
-		}
 		return success;
 	}
 
 	// info messages
-	static final String SUCCESFULLY_CLEARED_FILE = "Succesfully cleared the contents of file: %s";
-	static final String SUCCESFULLY_ENHANCED_CLASS_FILE = "Succesfully enhanced class file: %s";
+	static final String SUCCESSFULLY_CLEARED_FILE = "Successfully cleared the contents of file: %s";
+	static final String SUCCESSFULLY_ENHANCED_CLASS_FILE = "Successfully enhanced class file: %s";
 	static final String SKIPPING_FILE = "Skipping file: %s";
-	static final String SUCCESFULLY_DISCOVERED_TYPES_FOR_CLASS_FILE = "Succesfully discovered types for classes in file: %s";
+	static final String SUCCESSFULLY_DISCOVERED_TYPES_FOR_CLASS_FILE = "Successfully discovered types for classes in file: %s";
 	static final String ADDED_FILE_TO_SOURCE_SET = "Added file to source set: %s";
 
 	// warning messages
@@ -304,9 +345,12 @@ private boolean clearFile(File file) {
 	static final String UNABLE_TO_DELETE_FILE = "Unable to delete file: %s";
 	static final String ERROR_WRITING_BYTES_TO_FILE = "Error writing bytes to file : %s";
 	static final String ERROR_OPENING_FILE_FOR_WRITING = "Error opening file for writing : %s";
-	static final String ERROR_WHILE_ENHANCING_CLASS_FILE = "An exception occurred while trying to class file: %s";
+	static final String ERROR_WHILE_ENHANCING_CLASS_FILE = "An exception occurred while trying to enhance the class file: %s";
+	static final String ERROR_WHILE_ENHANCING_CLASSES = "An exception occurred while trying to enhance class file. See above logs for more details.";
 	static final String UNABLE_TO_DISCOVER_TYPES_FOR_CLASS_FILE = "Unable to discover types for classes in file: %s";
 	static final String UNEXPECTED_ERROR_WHILE_CONSTRUCTING_CLASSLOADER = "An unexpected error occurred while constructing the classloader";
+	static final String UNEXPECTED_ERROR_WHILE_CONSTRUCTING_CLASSLOADER_ADD_DEPENDENCY_ARTIFACT = "Unable to resolve URL for dependency %s at %s";
+	static final String UNEXPECTED_ERROR_WHILE_CONSTRUCTING_CLASSLOADER_DEPENDENCIES = "An unexpected error occurred while constructing the classloader. See above logs for more details.";
 
 	// debug messages
 	static final String TRYING_TO_CLEAR_FILE = "Trying to clear the contents of file: %s";
@@ -326,11 +370,11 @@ private boolean clearFile(File file) {
 	static final String PROCESSING_FILE_SET = "Processing FileSet";
 	static final String USING_BASE_DIRECTORY = "Using base directory: %s";
 	static final String SKIPPING_NON_CLASS_FILE = "Skipping non '.class' file: %s";
-	static final String FILESET_PROCESSED_SUCCESFULLY = "FileSet was processed succesfully";
+	static final String FILESET_PROCESSED_SUCCESSFULLY = "FileSet was processed successfully";
 	static final String STARTING_ASSEMBLY_OF_SOURCESET = "Starting assembly of the source set";
 	static final String ENDING_ASSEMBLY_OF_SOURCESET = "Ending the assembly of the source set";
-	static final String ADDED_DEFAULT_FILESET_WITH_BASE_DIRECTORY = "Addded a default FileSet with base directory: %s";
+	static final String ADDED_DEFAULT_FILESET_WITH_BASE_DIRECTORY = "Added a default FileSet with base directory: %s";
 	static final String STARTING_EXECUTION_OF_ENHANCE_MOJO = "Starting execution of enhance mojo";
 	static final String ENDING_EXECUTION_OF_ENHANCE_MOJO = "Ending execution of enhance mojo";
-
+	static final String CREATE_URL_CLASSLOADER_ADD_DEPENDENCY_ARTIFACT = "Adding classpath entry for dependency %s";
 }
diff --git a/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/AbstractGenerationMojo.java b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/AbstractGenerationMojo.java
new file mode 100644
index 000000000000..e8218df2cd1f
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/AbstractGenerationMojo.java
@@ -0,0 +1,156 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.metadata.MetadataConstants;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategyFactory;
+
+public abstract class AbstractGenerationMojo extends AbstractMojo {
+
+	// For reveng strategy
+	/** The default package name to use when mappings for classes are created. */
+	@Parameter
+	private String packageName;
+
+	/** The name of a property file, e.g. hibernate.properties. */
+	@Parameter
+	private File revengFile;
+
+	/** The class name of the reverse engineering strategy to use.
+	 * Extend the DefaultReverseEngineeringStrategy and override the corresponding methods, e.g.
+	 * to adapt the generate class names or to provide custom type mappings. */
+	@Parameter
+	private String revengStrategy;
+
+	/** If true, tables which are pure many-to-many link tables will be mapped as such.
+	 * A pure many-to-many table is one which primary-key contains exactly two foreign-keys pointing
+	 * to other entity tables and has no other columns. */
+	@Parameter(defaultValue = "true")
+	private boolean detectManyToMany;
+
+	/** If true, a one-to-one association will be created for each foreignkey found. */
+	@Parameter(defaultValue = "true")
+	private boolean detectOneToOne;
+
+	/** If true, columns named VERSION or TIMESTAMP with appropriate types will be mapped with the appropriate
+	 * optimistic locking corresponding to &lt;version&gt; or &lt;timestamp&gt;. */
+	@Parameter(defaultValue = "true")
+	private boolean detectOptimisticLock;
+
+	/** If true, a collection will be mapped for each foreignkey. */
+	@Parameter(defaultValue = "true")
+	private boolean createCollectionForForeignKey;
+
+	/** If true, a many-to-one association will be created for each foreignkey found. */
+	@Parameter(defaultValue = "true")
+	private boolean createManyToOneForForeignKey;
+
+	// For configuration
+	/** The name of a property file, e.g. hibernate.properties. */
+	@Parameter(defaultValue = "${project.basedir}/src/main/resources/hibernate.properties")
+	private File propertyFile;
+
+	// Not exposed for now
+	private boolean preferBasicCompositeIds = true;
+
+	@Parameter(defaultValue = "${project}", readonly = true, required = true)
+	private MavenProject project;
+
+	public void execute() throws MojoFailureException {
+		ClassLoader original = Thread.currentThread().getContextClassLoader();
+		try {
+			Thread.currentThread().setContextClassLoader(createExporterClassLoader(original));
+			getLog().info("Starting " + this.getClass().getSimpleName() + "...");
+			RevengStrategy strategy = setupReverseEngineeringStrategy();
+			if (propertyFile.exists()) {
+				executeExporter(createJdbcDescriptor(strategy, loadPropertiesFile()));
+			}
+			else {
+				getLog().info("Property file '" + propertyFile + "' cannot be found, aborting...");
+			}
+			getLog().info("Finished " + this.getClass().getSimpleName() + "!");
+		}
+		finally {
+			Thread.currentThread().setContextClassLoader(original);
+		}
+	}
+
+	private RevengStrategy setupReverseEngineeringStrategy() {
+		File[] revengFiles = null;
+		if (revengFile != null) {
+			revengFiles = new File[] { revengFile };
+		}
+		RevengStrategy strategy =
+				RevengStrategyFactory.createReverseEngineeringStrategy(
+						revengStrategy,
+						revengFiles);
+		RevengSettings settings =
+				new RevengSettings(strategy)
+						.setDefaultPackageName(packageName)
+						.setDetectManyToMany(detectManyToMany)
+						.setDetectOneToOne(detectOneToOne)
+						.setDetectOptimisticLock(detectOptimisticLock)
+						.setCreateCollectionForForeignKey(createCollectionForForeignKey)
+						.setCreateManyToOneForForeignKey(createManyToOneForForeignKey);
+		strategy.setSettings(settings);
+		return strategy;
+	}
+
+	private Properties loadPropertiesFile() throws MojoFailureException {
+		try (FileInputStream is = new FileInputStream(propertyFile)) {
+			Properties result = new Properties();
+			result.load(is);
+			return result;
+		}
+		catch (FileNotFoundException e) {
+			throw new MojoFailureException(propertyFile + " not found.", e);
+		}
+		catch (IOException e) {
+			throw new MojoFailureException("Problem while loading " + propertyFile, e);
+		}
+	}
+
+	private MetadataDescriptor createJdbcDescriptor(RevengStrategy strategy, Properties properties) {
+		properties.put(MetadataConstants.PREFER_BASIC_COMPOSITE_IDS, preferBasicCompositeIds);
+		return MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(
+						strategy,
+						properties);
+	}
+
+	private ClassLoader createExporterClassLoader(ClassLoader parent) {
+		ArrayList<URL> urls = new ArrayList<URL>();
+		try {
+			for (String cpe : project.getRuntimeClasspathElements()) {
+				urls.add(new File(cpe).toURI().toURL());
+			}
+		}
+		catch (DependencyResolutionRequiredException | MalformedURLException e) {
+			throw new RuntimeException("Problem while constructing project classloader", e);
+		}
+		return new URLClassLoader(urls.toArray(new URL[0]), parent);
+	}
+
+	protected abstract void executeExporter(MetadataDescriptor metadataDescriptor) throws MojoFailureException;
+}
diff --git a/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateDaoMojo.java b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateDaoMojo.java
new file mode 100644
index 000000000000..f3c45b6786d0
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateDaoMojo.java
@@ -0,0 +1,63 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+
+import java.io.File;
+
+import static org.apache.maven.plugins.annotations.LifecyclePhase.GENERATE_SOURCES;
+
+/**
+ * Mojo to generate Data Access Objects (DAOs) from an existing database.
+ * <p>
+ * See: https://docs.jboss.org/tools/latest/en/hibernatetools/html_single/#d0e4821
+ */
+@Mojo(
+	name = "hbm2dao",
+	defaultPhase = GENERATE_SOURCES,
+	requiresDependencyResolution = ResolutionScope.RUNTIME)
+public class GenerateDaoMojo extends AbstractGenerationMojo {
+
+	/** The directory into which the DAOs will be generated. */
+	@Parameter(defaultValue = "${project.build.directory}/generated-sources/")
+	private File outputDirectory;
+
+	/** Code will contain JPA features, e.g. using annotations from jakarta.persistence
+	 * and org.hibernate.annotations. */
+	@Parameter(defaultValue = "false")
+	private boolean ejb3;
+
+	/** Code will contain JDK 5 constructs such as generics and static imports. */
+	@Parameter(defaultValue = "false")
+	private boolean jdk5;
+
+	/** A path used for looking up user-edited templates. */
+	@Parameter
+	private String templatePath;
+
+	protected void executeExporter(MetadataDescriptor metadataDescriptor) {
+		Exporter pojoExporter = ExporterFactory.createExporter(ExporterType.DAO);
+		pojoExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		pojoExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDirectory);
+		if (templatePath != null) {
+			getLog().info("Setting template path to: " + templatePath);
+			pojoExporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[] {templatePath});
+		}
+		pojoExporter.getProperties().setProperty("ejb3", String.valueOf(ejb3));
+		pojoExporter.getProperties().setProperty("jdk5", String.valueOf(jdk5));
+		getLog().info("Starting DAO export to directory: " + outputDirectory + "...");
+		pojoExporter.start();
+	}
+
+
+}
diff --git a/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateDdlMojo.java b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateDdlMojo.java
new file mode 100644
index 000000000000..ef19ad9ace07
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateDdlMojo.java
@@ -0,0 +1,85 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.hibernate.boot.Metadata;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.schema.TargetType;
+
+import java.io.File;
+import java.util.EnumSet;
+import java.util.Set;
+
+import static org.apache.maven.plugins.annotations.LifecyclePhase.GENERATE_RESOURCES;
+
+/**
+ * Mojo to generate DDL Scripts from an existing database.
+ * <p>
+ * See https://docs.jboss.org/tools/latest/en/hibernatetools/html_single/#d0e4651
+ */
+@Mojo(
+	name = "hbm2ddl",
+	defaultPhase = GENERATE_RESOURCES,
+	requiresDependencyResolution = ResolutionScope.RUNTIME)
+public class GenerateDdlMojo extends AbstractGenerationMojo {
+
+	/** The directory into which the DDLs will be generated. */
+	@Parameter(defaultValue = "${project.build.directory}/generated-resources/")
+	private File outputDirectory;
+
+	/** The default filename of the generated DDL script. */
+	@Parameter(defaultValue = "schema.ddl")
+	private String outputFileName;
+
+	/** The type of output to produce.
+	 * <ul>
+	 *   <li>DATABASE: Export to the database.</li>
+	 *   <li>SCRIPT (default): Write to a script file.</li>
+	 *   <li>STDOUT: Write to {@link System#out}.</li>
+	 * </ul> */
+	@Parameter(defaultValue = "SCRIPT")
+	private Set<TargetType> targetTypes;
+
+	/**
+	 * The DDLs statements to create.
+	 * <ul>
+	 *   <li>NONE: None - duh :P.</li>
+	 *   <li>CREATE (default): Create only.</li>
+	 *   <li>DROP: Drop only.</li>
+	 *   <li>BOTH: Drop and then create.</li>
+	 * </ul>
+	 */
+	@Parameter(defaultValue = "CREATE")
+	private SchemaExport.Action schemaExportAction;
+
+	/** Set the end of statement delimiter. */
+	@Parameter(defaultValue = ";")
+	private String delimiter;
+
+	/** Should we format the sql strings? */
+	@Parameter(defaultValue = "true")
+	private boolean format;
+
+	/** Should we stop once an error occurs? */
+	@Parameter(defaultValue = "true")
+	private boolean haltOnError;
+
+
+	@Override
+	protected void executeExporter(MetadataDescriptor metadataDescriptor) {
+		Metadata metadata = metadataDescriptor.createMetadata();
+
+		SchemaExport export = new SchemaExport();
+		export.setOutputFile(new File(outputDirectory, outputFileName).toString());
+		export.setDelimiter(delimiter);
+		export.setHaltOnError(haltOnError);
+		export.setFormat(format);
+		export.execute(EnumSet.copyOf(this.targetTypes), schemaExportAction, metadata);
+	}
+}
diff --git a/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateHbmMojo.java b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateHbmMojo.java
new file mode 100644
index 000000000000..18417e4fa151
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateHbmMojo.java
@@ -0,0 +1,62 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+
+import java.io.File;
+
+import static org.apache.maven.plugins.annotations.LifecyclePhase.GENERATE_SOURCES;
+
+/**
+ * Mojo to generate hbm.xml files from an existing database.
+ * <p>
+ * See: https://docs.jboss.org/tools/latest/en/hibernatetools/html_single/#d0e4821
+ *
+ * @deprecated Use the {@code hbm2java} goal to generate annotated Java entities instead.
+ */
+@Deprecated(forRemoval = true)
+@Mojo(
+	name = "generateHbm",
+	defaultPhase = GENERATE_SOURCES,
+	requiresDependencyResolution = ResolutionScope.RUNTIME)
+public class GenerateHbmMojo extends AbstractGenerationMojo {
+
+	/** The directory into which the DAOs will be generated. */
+	@Parameter(defaultValue = "${project.basedir}/src/main/resources")
+	private File outputDirectory;
+
+	@Parameter
+	private String templatePath;
+
+	protected void executeExporter(MetadataDescriptor metadataDescriptor) throws MojoFailureException {
+		getLog().warn( "The generateHbm goal is deprecated and will be removed in a future version. "
+				+ "Use the hbm2java goal to generate annotated Java entities instead." );
+		try {
+			Exporter hbmExporter = ExporterFactory.createExporter(ExporterType.HBM);
+			hbmExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+			hbmExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDirectory);
+			if (templatePath != null) {
+				getLog().info("Setting template path to: " + templatePath);
+				hbmExporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[] {templatePath});
+			}
+			getLog().info("Starting HBM export to directory: " + outputDirectory + "...");
+			hbmExporter.start();
+		}
+		catch (Exception e) {
+			throw new MojoFailureException( e );
+		}
+	}
+
+
+}
diff --git a/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateJavaMojo.java b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateJavaMojo.java
new file mode 100644
index 000000000000..d1e2e7ba36ce
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/GenerateJavaMojo.java
@@ -0,0 +1,65 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+
+import java.io.File;
+
+import static org.apache.maven.plugins.annotations.LifecyclePhase.GENERATE_SOURCES;
+
+/**
+ * Mojo to generate Java JPA Entities from an existing database.
+ * <p>
+ * See: https://docs.jboss.org/tools/latest/en/hibernatetools/html_single/#d0e4821
+ */
+@Mojo(
+	name = "hbm2java",
+	defaultPhase = GENERATE_SOURCES,
+	requiresDependencyResolution = ResolutionScope.RUNTIME)
+public class GenerateJavaMojo extends AbstractGenerationMojo {
+
+	/** The directory into which the JPA entities will be generated. */
+	@Parameter(defaultValue = "${project.build.directory}/generated-sources/")
+	private File outputDirectory;
+
+	/** Code will contain JPA features, e.g. using annotations from jakarta.persistence
+	 * and org.hibernate.annotations. */
+	@Parameter(defaultValue = "true")
+	private boolean ejb3;
+
+	/** Code will contain JDK 5 constructs such as generics and static imports. */
+	@Parameter(defaultValue = "true")
+	private boolean jdk5;
+
+	/** A path used for looking up user-edited templates. */
+	@Parameter
+	private String templatePath;
+
+	protected void executeExporter(MetadataDescriptor metadataDescriptor) {
+		Exporter pojoExporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		pojoExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		pojoExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDirectory);
+		if (templatePath != null) {
+			getLog().info("Setting template path to: " + templatePath);
+			pojoExporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[] {templatePath});
+		}
+		pojoExporter.getProperties().setProperty("ejb3", String.valueOf(ejb3));
+		pojoExporter.getProperties().setProperty("jdk5", String.valueOf(jdk5));
+		getLog().info("Starting POJO export to directory: " + outputDirectory + "...");
+		pojoExporter.start();
+	}
+
+
+
+
+}
diff --git a/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/TransformHbmMojo.java b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/TransformHbmMojo.java
new file mode 100644
index 000000000000..026f3758467f
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/reveng/TransformHbmMojo.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import static org.apache.maven.plugins.annotations.LifecyclePhase.GENERATE_RESOURCES;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
+
+import org.hibernate.tool.reveng.internal.export.mapping.MappingExporter;
+
+@Mojo(
+		name = "transformHbm",
+		defaultPhase = GENERATE_RESOURCES,
+		requiresDependencyResolution = ResolutionScope.RUNTIME)
+public class TransformHbmMojo extends AbstractMojo {
+
+	@Parameter(defaultValue = "${project.basedir}/src/main/resources")
+	private File inputFolder;
+
+	@Parameter(defaultValue = "true")
+	private boolean format;
+
+	@Parameter(defaultValue = "${project}", readonly = true, required = true)
+	private MavenProject project;
+
+	@Override
+	public void execute() {
+		ClassLoader original = Thread.currentThread().getContextClassLoader();
+		try {
+			Thread.currentThread().setContextClassLoader(createClassLoader(original));
+			getLog().info("Starting " + this.getClass().getSimpleName() + "...");
+			MappingExporter mappingExporter = new MappingExporter();
+			mappingExporter.setHbmFiles(getHbmFiles(inputFolder));
+			mappingExporter.setFormatResult(format);
+			mappingExporter.start();
+			getLog().info("Finished " + this.getClass().getSimpleName() + "!");
+		}
+		finally {
+			Thread.currentThread().setContextClassLoader(original);
+		}
+	}
+
+	private List<File> getHbmFiles(File f) {
+		List<File> result = new ArrayList<>();
+		if (f.isFile()) {
+			if (f.getName().endsWith("hbm.xml")) {
+				result.add(f);
+			}
+		}
+		else {
+			for (File child : Objects.requireNonNull( f.listFiles() ) ) {
+				result.addAll(getHbmFiles(child));
+			}
+		}
+		return result;
+	}
+
+	private ClassLoader createClassLoader(ClassLoader parent) {
+		ArrayList<URL> urls = new ArrayList<>();
+		try {
+			for (String cpe : project.getRuntimeClasspathElements()) {
+				urls.add(new File(cpe).toURI().toURL());
+			}
+		}
+		catch (DependencyResolutionRequiredException | MalformedURLException e) {
+			throw new RuntimeException("Problem while constructing project classloader", e);
+		}
+		return new URLClassLoader(urls.toArray(new URL[0]), parent);
+	}
+
+}
diff --git a/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/HibernateEnhancerMojoTest.java b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/HibernateEnhancerMojoTest.java
index 243812245525..8cb9a72aaa80 100644
--- a/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/HibernateEnhancerMojoTest.java
+++ b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/HibernateEnhancerMojoTest.java
@@ -21,12 +21,14 @@
 import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
 import javax.tools.JavaCompiler;
 import javax.tools.ToolProvider;
 
 import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl;
 import org.hibernate.bytecode.enhance.spi.EnhancementException;
@@ -48,6 +50,7 @@ public class HibernateEnhancerMojoTest {
 	private Field fileSetsField;
 	private Field sourceSetField;
 	private Field enhancerField;
+	private Field projectField;
 
 	private File classesDirectory;  // folder '${tempDir}/classes'
 	private File fooFolder;         // folder '${classesDirectory}/org/foo'
@@ -67,8 +70,13 @@ void beforeEach() throws Exception {
 		sourceSetField.setAccessible(true);
 		enhancerField = HibernateEnhancerMojo.class.getDeclaredField("enhancer");
 		enhancerField.setAccessible(true);
+		projectField = HibernateEnhancerMojo.class.getDeclaredField( "project");
+		projectField.setAccessible(true);
 		enhanceMojo = new HibernateEnhancerMojo();
 		enhanceMojo.setLog(createLog());
+		var project = new MavenProject();
+		project.setArtifacts( new HashSet());
+		projectField.set(enhanceMojo, project);
 		classesDirectory = new File(tempDir, "classes");
 		classesDirectory.mkdirs();
 		classesDirectoryField.set(enhanceMojo, classesDirectory);
@@ -104,7 +112,7 @@ void testAssembleSourceSet() throws Exception {
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.USING_BASE_DIRECTORY.formatted(classesDirectory)));
 		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.ADDED_FILE_TO_SOURCE_SET.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.SKIPPING_NON_CLASS_FILE.formatted(fooTxtFile)));
-		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.FILESET_PROCESSED_SUCCESFULLY));
+		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.FILESET_PROCESSED_SUCCESSFULLY ));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.ENDING_ASSEMBLY_OF_SOURCESET));
 	}
 
@@ -134,7 +142,7 @@ void testAddFileSetToSourceSet() throws Exception {
 		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.ADDED_FILE_TO_SOURCE_SET.formatted(fooClassFile)));
 		assertFalse(logMessages.contains(INFO + HibernateEnhancerMojo.ADDED_FILE_TO_SOURCE_SET.formatted(bazClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.SKIPPING_NON_CLASS_FILE.formatted(fooTxtFile)));
-		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.FILESET_PROCESSED_SUCCESFULLY));
+		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.FILESET_PROCESSED_SUCCESSFULLY ));
 	}
 
 	@Test
@@ -301,7 +309,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 		assertEquals(3, logMessages.size());
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.TRYING_TO_DISCOVER_TYPES_FOR_CLASS_FILE.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.DETERMINE_CLASS_NAME_FOR_FILE.formatted(barClassFile)));
-		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESFULLY_DISCOVERED_TYPES_FOR_CLASS_FILE.formatted(barClassFile)));
+		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESSFULLY_DISCOVERED_TYPES_FOR_CLASS_FILE.formatted(barClassFile)));
 	}
 
 	@Test
@@ -343,7 +351,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.STARTING_TYPE_DISCOVERY));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.TRYING_TO_DISCOVER_TYPES_FOR_CLASS_FILE.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.DETERMINE_CLASS_NAME_FOR_FILE.formatted(barClassFile)));
-		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESFULLY_DISCOVERED_TYPES_FOR_CLASS_FILE.formatted(barClassFile)));
+		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESSFULLY_DISCOVERED_TYPES_FOR_CLASS_FILE.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.ENDING_TYPE_DISCOVERY));
 	}
 
@@ -367,11 +375,10 @@ void testClearFile() throws Exception {
 		assertNotEquals(0, modified);
 		assertTrue(modified > 0);
 		// check log messages
-		assertEquals(4, logMessages.size());
+		assertEquals(3, logMessages.size());
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.TRYING_TO_CLEAR_FILE.formatted("foobar")));
-		assertTrue(logMessages.contains(ERROR + HibernateEnhancerMojo.UNABLE_TO_DELETE_FILE.formatted("foobar")));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.TRYING_TO_CLEAR_FILE.formatted(fooTxtFile)));
-		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESFULLY_CLEARED_FILE.formatted(fooTxtFile)));
+		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESSFULLY_CLEARED_FILE.formatted(fooTxtFile)));
 	}
 
 	@Test
@@ -394,7 +401,7 @@ void testWriteByteCodeToFile() throws Exception {
 		assertEquals(4, logMessages.size());
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.WRITING_BYTE_CODE_TO_FILE.formatted(fooTxtFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.TRYING_TO_CLEAR_FILE.formatted(fooTxtFile)));
-		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESFULLY_CLEARED_FILE.formatted(fooTxtFile)));
+		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESSFULLY_CLEARED_FILE.formatted(fooTxtFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.AMOUNT_BYTES_WRITTEN_TO_FILE.formatted(6, fooTxtFile)));
 	}
 
@@ -440,9 +447,9 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.DETERMINE_CLASS_NAME_FOR_FILE.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.WRITING_BYTE_CODE_TO_FILE.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.TRYING_TO_CLEAR_FILE.formatted(barClassFile)));
-		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESFULLY_CLEARED_FILE.formatted(barClassFile)));
+		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESSFULLY_CLEARED_FILE.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.AMOUNT_BYTES_WRITTEN_TO_FILE.formatted("foobar".length(), barClassFile)));
-		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESFULLY_ENHANCED_CLASS_FILE.formatted(barClassFile)));
+		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESSFULLY_ENHANCED_CLASS_FILE.formatted(barClassFile)));
 		// Second Run -> file is not modified
 		logMessages.clear();
 		enhanceClassMethod.invoke(enhanceMojo, barClassFile);
@@ -511,9 +518,9 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.DETERMINE_CLASS_NAME_FOR_FILE.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.WRITING_BYTE_CODE_TO_FILE.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.TRYING_TO_CLEAR_FILE.formatted(barClassFile)));
-		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESFULLY_CLEARED_FILE.formatted(barClassFile)));
+		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESSFULLY_CLEARED_FILE.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.AMOUNT_BYTES_WRITTEN_TO_FILE.formatted("foobar".length(), barClassFile)));
-		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESFULLY_ENHANCED_CLASS_FILE.formatted(barClassFile)));
+		assertTrue(logMessages.contains(INFO + HibernateEnhancerMojo.SUCCESSFULLY_ENHANCED_CLASS_FILE.formatted(barClassFile)));
 		assertTrue(logMessages.contains(DEBUG + HibernateEnhancerMojo.ENDING_CLASS_ENHANCEMENT));
 	}
 
diff --git a/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/AbstractGenerationMojoTest.java b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/AbstractGenerationMojoTest.java
new file mode 100644
index 000000000000..5ee880d0751e
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/AbstractGenerationMojoTest.java
@@ -0,0 +1,155 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.plugin.MojoFailureException;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class AbstractGenerationMojoTest {
+
+	@TempDir
+	private File tempDir;
+
+	/**
+	 * Concrete subclass for testing the abstract class.
+	 */
+	static class TestMojo extends AbstractGenerationMojo {
+		MetadataDescriptor lastDescriptor;
+
+		@Override
+		protected void executeExporter(MetadataDescriptor metadataDescriptor) throws MojoFailureException {
+			lastDescriptor = metadataDescriptor;
+		}
+	}
+
+	private void setField(Object obj, String fieldName, Object value) throws Exception {
+		Class<?> clazz = obj.getClass();
+		while (clazz != null) {
+			try {
+				Field f = clazz.getDeclaredField(fieldName);
+				f.setAccessible(true);
+				f.set(obj, value);
+				return;
+			}
+			catch (NoSuchFieldException e) {
+				clazz = clazz.getSuperclass();
+			}
+		}
+		throw new NoSuchFieldException(fieldName);
+	}
+
+	@Test
+	public void testLoadPropertiesFileValid() throws Exception {
+		TestMojo mojo = new TestMojo();
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Properties props = new Properties();
+		props.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+		props.setProperty("hibernate.connection.url", "jdbc:h2:mem:test");
+		try (FileOutputStream fos = new FileOutputStream(propsFile)) {
+			props.store(fos, null);
+		}
+		setField(mojo, "propertyFile", propsFile);
+		Method loadPropertiesFile = AbstractGenerationMojo.class.getDeclaredMethod("loadPropertiesFile");
+		loadPropertiesFile.setAccessible(true);
+		Properties loaded = (Properties) loadPropertiesFile.invoke(mojo);
+		assertNotNull(loaded);
+		assertEquals("org.hibernate.dialect.H2Dialect", loaded.getProperty("hibernate.dialect"));
+	}
+
+	@Test
+	public void testLoadPropertiesFileNotFound() throws Exception {
+		TestMojo mojo = new TestMojo();
+		setField(mojo, "propertyFile", new File("/nonexistent/hibernate.properties"));
+		Method loadPropertiesFile = AbstractGenerationMojo.class.getDeclaredMethod("loadPropertiesFile");
+		loadPropertiesFile.setAccessible(true);
+		try {
+			loadPropertiesFile.invoke(mojo);
+		}
+		catch (java.lang.reflect.InvocationTargetException e) {
+			assertNotNull(e.getCause());
+			assertEquals(MojoFailureException.class, e.getCause().getClass());
+		}
+	}
+
+	@Test
+	public void testSetupReverseEngineeringStrategy() throws Exception {
+		TestMojo mojo = new TestMojo();
+		// Set fields to exercise the method
+		setField(mojo, "packageName", "com.example.model");
+		setField(mojo, "revengFile", null);
+		setField(mojo, "revengStrategy", null);
+		setField(mojo, "detectManyToMany", true);
+		setField(mojo, "detectOneToOne", true);
+		setField(mojo, "detectOptimisticLock", true);
+		setField(mojo, "createCollectionForForeignKey", true);
+		setField(mojo, "createManyToOneForForeignKey", true);
+		Method setupStrategy = AbstractGenerationMojo.class.getDeclaredMethod("setupReverseEngineeringStrategy");
+		setupStrategy.setAccessible(true);
+		Object strategy = setupStrategy.invoke(mojo);
+		assertNotNull(strategy);
+	}
+
+	@Test
+	public void testSetupReverseEngineeringStrategyWithRevengFile() throws Exception {
+		TestMojo mojo = new TestMojo();
+		File revengFile = new File(tempDir, "hibernate.reveng.xml");
+		// Create a minimal reveng file
+		try (FileOutputStream fos = new FileOutputStream(revengFile)) {
+			fos.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<hibernate-reverse-engineering/>".getBytes());
+		}
+		setField(mojo, "packageName", "com.example");
+		setField(mojo, "revengFile", revengFile);
+		setField(mojo, "revengStrategy", null);
+		setField(mojo, "detectManyToMany", false);
+		setField(mojo, "detectOneToOne", false);
+		setField(mojo, "detectOptimisticLock", false);
+		setField(mojo, "createCollectionForForeignKey", false);
+		setField(mojo, "createManyToOneForForeignKey", false);
+		Method setupStrategy = AbstractGenerationMojo.class.getDeclaredMethod("setupReverseEngineeringStrategy");
+		setupStrategy.setAccessible(true);
+		Object strategy = setupStrategy.invoke(mojo);
+		assertNotNull(strategy);
+	}
+
+	@Test
+	public void testCreateJdbcDescriptor() throws Exception {
+		TestMojo mojo = new TestMojo();
+		setField(mojo, "packageName", "com.example");
+		setField(mojo, "revengFile", null);
+		setField(mojo, "revengStrategy", null);
+		setField(mojo, "detectManyToMany", true);
+		setField(mojo, "detectOneToOne", true);
+		setField(mojo, "detectOptimisticLock", true);
+		setField(mojo, "createCollectionForForeignKey", true);
+		setField(mojo, "createManyToOneForForeignKey", true);
+
+		// First get a strategy
+		Method setupStrategy = AbstractGenerationMojo.class.getDeclaredMethod("setupReverseEngineeringStrategy");
+		setupStrategy.setAccessible(true);
+		Object strategy = setupStrategy.invoke(mojo);
+
+		// Then create descriptor
+		Properties props = new Properties();
+		props.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+		Method createJdbcDescriptor = AbstractGenerationMojo.class.getDeclaredMethod(
+				"createJdbcDescriptor",
+				org.hibernate.tool.reveng.api.core.RevengStrategy.class,
+				Properties.class);
+		createJdbcDescriptor.setAccessible(true);
+		Object descriptor = createJdbcDescriptor.invoke(mojo, strategy, props);
+		assertNotNull(descriptor);
+	}
+}
diff --git a/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateDaoMojoTest.java b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateDaoMojoTest.java
new file mode 100644
index 000000000000..e443e7519282
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateDaoMojoTest.java
@@ -0,0 +1,117 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.project.MavenProject;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.util.Properties;
+
+public class GenerateDaoMojoTest {
+
+	private static final String CREATE_PERSON_TABLE =
+			"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))";
+	private static final String DROP_PERSON_TABLE =
+			"drop table PERSON";
+
+	@TempDir
+	private File tempDir;
+
+	private File outputDirectory;
+	private GenerateDaoMojo generateDaoMojo;
+
+	@BeforeEach
+	public void beforeEach() throws Exception {
+		createDatabase();
+		createOutputDirectory();
+		createMojo();
+	}
+
+	@AfterEach
+	public void afterEach() throws Exception {
+		dropDatabase();
+	}
+
+	@Test
+	public void testGenerateDao() throws Exception {
+		generateDaoMojo.executeExporter(createMetadataDescriptor());
+	}
+
+	@Test
+	public void testGenerateDaoWithEjb3() throws Exception {
+		Field ejb3Field = GenerateDaoMojo.class.getDeclaredField("ejb3");
+		ejb3Field.setAccessible(true);
+		ejb3Field.set(generateDaoMojo, true);
+		generateDaoMojo.executeExporter(createMetadataDescriptor());
+	}
+
+	@Test
+	public void testGenerateDaoWithJdk5() throws Exception {
+		Field jdk5Field = GenerateDaoMojo.class.getDeclaredField("jdk5");
+		jdk5Field.setAccessible(true);
+		jdk5Field.set(generateDaoMojo, true);
+		generateDaoMojo.executeExporter(createMetadataDescriptor());
+	}
+
+	private void createDatabase() throws Exception {
+		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+		Statement statement = connection.createStatement();
+		statement.execute(CREATE_PERSON_TABLE);
+		statement.close();
+		connection.close();
+	}
+
+	private void dropDatabase() throws Exception {
+		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+		Statement statement = connection.createStatement();
+		statement.execute(DROP_PERSON_TABLE);
+		statement.close();
+		connection.close();
+	}
+
+	private void createMojo() throws Exception {
+		generateDaoMojo = new GenerateDaoMojo();
+		Field projectField = AbstractGenerationMojo.class.getDeclaredField("project");
+		projectField.setAccessible(true);
+		projectField.set(generateDaoMojo, new MavenProject());
+		Field propertyFileField = AbstractGenerationMojo.class.getDeclaredField("propertyFile");
+		propertyFileField.setAccessible(true);
+		propertyFileField.set(generateDaoMojo, new File(tempDir, "hibernate.properties"));
+		Field outputDirectoryField = GenerateDaoMojo.class.getDeclaredField("outputDirectory");
+		outputDirectoryField.setAccessible(true);
+		outputDirectoryField.set(generateDaoMojo, outputDirectory);
+	}
+
+	private void createOutputDirectory() {
+		outputDirectory = new File(tempDir, "generated");
+		if (!outputDirectory.mkdir()) throw new RuntimeException("Unable to create output directory: " + outputDirectory);
+	}
+
+	private MetadataDescriptor createMetadataDescriptor() {
+		return MetadataDescriptorFactory.createReverseEngineeringDescriptor(null, createProperties());
+	}
+
+	private Properties createProperties() {
+		Properties result = new Properties();
+		result.put("hibernate.connection.url", constructJdbcConnectionString());
+		result.put("hibernate.default_catalog", "TEST");
+		result.put("hibernate.default_schema", "PUBLIC");
+		return result;
+	}
+
+	private String constructJdbcConnectionString() {
+		return "jdbc:h2:" + tempDir.getAbsolutePath() + "/database/dao_test;AUTO_SERVER=TRUE";
+	}
+}
diff --git a/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateDdlMojoTest.java b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateDdlMojoTest.java
new file mode 100644
index 000000000000..ae10072557f3
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateDdlMojoTest.java
@@ -0,0 +1,133 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.project.MavenProject;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.schema.TargetType;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.util.EnumSet;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class GenerateDdlMojoTest {
+
+	private static final String CREATE_PERSON_TABLE =
+			"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))";
+	private static final String DROP_PERSON_TABLE =
+			"drop table PERSON";
+
+	@TempDir
+	private File tempDir;
+
+	private File outputDirectory;
+	private GenerateDdlMojo generateDdlMojo;
+
+	@BeforeEach
+	public void beforeEach() throws Exception {
+		createDatabase();
+		createOutputDirectory();
+		createMojo();
+	}
+
+	@AfterEach
+	public void afterEach() throws Exception {
+		dropDatabase();
+	}
+
+	@Test
+	public void testGenerateDdl() throws Exception {
+		generateDdlMojo.executeExporter(createMetadataDescriptor());
+		File schemaFile = new File(outputDirectory, "schema.ddl");
+		assertTrue(schemaFile.exists(), "Expected schema.ddl to be generated");
+	}
+
+	private void createDatabase() throws Exception {
+		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+		Statement statement = connection.createStatement();
+		statement.execute(CREATE_PERSON_TABLE);
+		statement.close();
+		connection.close();
+	}
+
+	private void dropDatabase() throws Exception {
+		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+		Statement statement = connection.createStatement();
+		statement.execute(DROP_PERSON_TABLE);
+		statement.close();
+		connection.close();
+	}
+
+	private void createMojo() throws Exception {
+		generateDdlMojo = new GenerateDdlMojo();
+		Field projectField = AbstractGenerationMojo.class.getDeclaredField("project");
+		projectField.setAccessible(true);
+		projectField.set(generateDdlMojo, new MavenProject());
+		Field propertyFileField = AbstractGenerationMojo.class.getDeclaredField("propertyFile");
+		propertyFileField.setAccessible(true);
+		propertyFileField.set(generateDdlMojo, new File(tempDir, "hibernate.properties"));
+		// Set outputDirectory
+		Field outputDirectoryField = GenerateDdlMojo.class.getDeclaredField("outputDirectory");
+		outputDirectoryField.setAccessible(true);
+		outputDirectoryField.set(generateDdlMojo, outputDirectory);
+		// Set outputFileName
+		Field outputFileNameField = GenerateDdlMojo.class.getDeclaredField("outputFileName");
+		outputFileNameField.setAccessible(true);
+		outputFileNameField.set(generateDdlMojo, "schema.ddl");
+		// Set targetTypes
+		Field targetTypesField = GenerateDdlMojo.class.getDeclaredField("targetTypes");
+		targetTypesField.setAccessible(true);
+		targetTypesField.set(generateDdlMojo, EnumSet.of(TargetType.SCRIPT));
+		// Set schemaExportAction
+		Field schemaExportActionField = GenerateDdlMojo.class.getDeclaredField("schemaExportAction");
+		schemaExportActionField.setAccessible(true);
+		schemaExportActionField.set(generateDdlMojo, SchemaExport.Action.CREATE);
+		// Set delimiter
+		Field delimiterField = GenerateDdlMojo.class.getDeclaredField("delimiter");
+		delimiterField.setAccessible(true);
+		delimiterField.set(generateDdlMojo, ";");
+		// Set format
+		Field formatField = GenerateDdlMojo.class.getDeclaredField("format");
+		formatField.setAccessible(true);
+		formatField.set(generateDdlMojo, true);
+		// Set haltOnError
+		Field haltOnErrorField = GenerateDdlMojo.class.getDeclaredField("haltOnError");
+		haltOnErrorField.setAccessible(true);
+		haltOnErrorField.set(generateDdlMojo, true);
+	}
+
+	private void createOutputDirectory() {
+		outputDirectory = new File(tempDir, "generated");
+		if (!outputDirectory.mkdir()) throw new RuntimeException("Unable to create output directory: " + outputDirectory);
+	}
+
+	private MetadataDescriptor createMetadataDescriptor() {
+		return MetadataDescriptorFactory.createReverseEngineeringDescriptor(null, createProperties());
+	}
+
+	private Properties createProperties() {
+		Properties result = new Properties();
+		result.put("hibernate.connection.url", constructJdbcConnectionString());
+		result.put("hibernate.default_catalog", "TEST");
+		result.put("hibernate.default_schema", "PUBLIC");
+		return result;
+	}
+
+	private String constructJdbcConnectionString() {
+		return "jdbc:h2:" + tempDir.getAbsolutePath() + "/database/ddl_test;AUTO_SERVER=TRUE";
+	}
+}
diff --git a/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateHbmMojoTest.java b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateHbmMojoTest.java
new file mode 100644
index 000000000000..2d365019a87f
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateHbmMojoTest.java
@@ -0,0 +1,101 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.project.MavenProject;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.util.Properties;
+
+public class GenerateHbmMojoTest {
+
+	private static final String CREATE_PERSON_TABLE =
+			"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))";
+	private static final String DROP_PERSON_TABLE =
+			"drop table PERSON";
+
+	@TempDir
+	private File tempDir;
+
+	private File outputDirectory;
+	private GenerateHbmMojo generateHbmMojo;
+
+	@BeforeEach
+	public void beforeEach() throws Exception {
+		createDatabase();
+		createOutputDirectory();
+		createMojo();
+	}
+
+	@AfterEach
+	public void afterEach() throws Exception {
+		dropDatabase();
+	}
+
+	@Test
+	public void testGenerateHbm() throws Exception {
+		generateHbmMojo.executeExporter(createMetadataDescriptor());
+	}
+
+	private void createDatabase() throws Exception {
+		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+		Statement statement = connection.createStatement();
+		statement.execute(CREATE_PERSON_TABLE);
+		statement.close();
+		connection.close();
+	}
+
+	private void dropDatabase() throws Exception {
+		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+		Statement statement = connection.createStatement();
+		statement.execute(DROP_PERSON_TABLE);
+		statement.close();
+		connection.close();
+	}
+
+	private void createMojo() throws Exception {
+		generateHbmMojo = new GenerateHbmMojo();
+		Field projectField = AbstractGenerationMojo.class.getDeclaredField("project");
+		projectField.setAccessible(true);
+		projectField.set(generateHbmMojo, new MavenProject());
+		Field propertyFileField = AbstractGenerationMojo.class.getDeclaredField("propertyFile");
+		propertyFileField.setAccessible(true);
+		propertyFileField.set(generateHbmMojo, new File(tempDir, "hibernate.properties"));
+		Field outputDirectoryField = GenerateHbmMojo.class.getDeclaredField("outputDirectory");
+		outputDirectoryField.setAccessible(true);
+		outputDirectoryField.set(generateHbmMojo, outputDirectory);
+	}
+
+	private void createOutputDirectory() {
+		outputDirectory = new File(tempDir, "generated");
+		if (!outputDirectory.mkdir()) throw new RuntimeException("Unable to create output directory: " + outputDirectory);
+	}
+
+	private MetadataDescriptor createMetadataDescriptor() {
+		return MetadataDescriptorFactory.createReverseEngineeringDescriptor(null, createProperties());
+	}
+
+	private Properties createProperties() {
+		Properties result = new Properties();
+		result.put("hibernate.connection.url", constructJdbcConnectionString());
+		result.put("hibernate.default_catalog", "TEST");
+		result.put("hibernate.default_schema", "PUBLIC");
+		return result;
+	}
+
+	private String constructJdbcConnectionString() {
+		return "jdbc:h2:" + tempDir.getAbsolutePath() + "/database/hbm_test;AUTO_SERVER=TRUE";
+	}
+}
diff --git a/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateJavaMojoTest.java b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateJavaMojoTest.java
new file mode 100644
index 000000000000..a2f631aa51be
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/GenerateJavaMojoTest.java
@@ -0,0 +1,181 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.apache.maven.project.MavenProject;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class GenerateJavaMojoTest {
+
+	private static final String CREATE_PERSON_TABLE =
+			"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))";
+	private static final String CREATE_ITEM_TABLE =
+			"create table ITEM (ID int not null, NAME varchar(20), OWNER_ID int not null, primary key (ID), foreign key (OWNER_ID) references PERSON(ID))";
+	private static final String DROP_ITEM_TABLE =
+			"drop table ITEM";
+	private static final String DROP_PERSON_TABLE =
+			"drop table PERSON";
+
+	@TempDir
+	private File tempDir;
+
+	private File outputDirectory;
+	private GenerateJavaMojo generateJavaMojo;
+
+	@BeforeEach
+	public void beforeEach() throws Exception {
+		createDatabase();
+		createOutputDirectory();
+		createGenerateJavaMojo();
+	}
+
+	@AfterEach
+	public void afterEach() throws Exception {
+		dropDatabase();
+	}
+
+	@Test
+	public void testGenerateAnnotatedJava() throws Exception {
+		File personJavaFile = new File(outputDirectory, "Person.java");
+		// Person.java should not exist
+		assertFalse(personJavaFile.exists());
+		// Set value of field 'ejb3' to 'true' and execute mojo
+		Field ejb3Field = GenerateJavaMojo.class.getDeclaredField("ejb3");
+		ejb3Field.setAccessible(true);
+		ejb3Field.set(generateJavaMojo, true);
+		// Execute mojo
+		generateJavaMojo.executeExporter(createMetadataDescriptor());
+		// Person.java should exist
+		assertTrue(personJavaFile.exists());
+		// Person.java should be an annotated entity
+		byte[] raw = Files.readAllBytes(personJavaFile.toPath());
+		assertTrue(new String(raw).contains("import jakarta.persistence.Entity;"));
+	}
+
+	@Test
+	public void testGenerateNonAnnotatedJava() throws Exception {
+		File personJavaFile = new File(outputDirectory, "Person.java");
+		// Person.java should not exist
+		assertFalse(personJavaFile.exists());
+		// Set value of field 'ejb3' to 'false' and execute mojo
+		Field ejb3Field = GenerateJavaMojo.class.getDeclaredField("ejb3");
+		ejb3Field.setAccessible(true);
+		ejb3Field.set(generateJavaMojo, false);
+		// Execute mojo
+		generateJavaMojo.executeExporter(createMetadataDescriptor());
+		// Person.java should exist
+		assertTrue(personJavaFile.exists());
+		// Person.java should be an annotated entity
+		byte[] raw = Files.readAllBytes(personJavaFile.toPath());
+		assertFalse(new String(raw).contains("import jakarta.persistence.Entity;"));
+	}
+
+	@Test
+	public void testGenerateJavaWithGenerics() throws Exception {
+		File personJavaFile = new File(outputDirectory, "Person.java");
+		// Person.java should not exist
+		assertFalse(personJavaFile.exists());
+		// Set value of field 'jdk5' to 'true' and execute mojo
+		Field jdk5Field = GenerateJavaMojo.class.getDeclaredField("jdk5");
+		jdk5Field.setAccessible(true);
+		jdk5Field.set(generateJavaMojo, true);
+		// Execute mojo
+		generateJavaMojo.executeExporter(createMetadataDescriptor());
+		// Person.java should exist
+		assertTrue(personJavaFile.exists());
+		// Person.java should be an annotated entity
+		byte[] raw = Files.readAllBytes(personJavaFile.toPath());
+		assertTrue(new String(raw).contains("Set<Item>"));
+	}
+
+	@Test
+	public void testGenerateJavaWithoutGenerics() throws Exception {
+		File personJavaFile = new File(outputDirectory, "Person.java");
+		// Person.java should not exist
+		assertFalse(personJavaFile.exists());
+		// Set value of field 'jdk5' to 'true' and execute mojo
+		Field jdk5Field = GenerateJavaMojo.class.getDeclaredField("jdk5");
+		jdk5Field.setAccessible(true);
+		jdk5Field.set(generateJavaMojo, false);
+		// Execute mojo
+		generateJavaMojo.executeExporter(createMetadataDescriptor());
+		// Person.java should exist
+		assertTrue(personJavaFile.exists());
+		// Person.java should be an annotated entity
+		byte[] raw = Files.readAllBytes(personJavaFile.toPath());
+		assertFalse(new String(raw).contains("Set<Item>"));
+	}
+
+	private void createDatabase() throws Exception {
+		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+		Statement statement = connection.createStatement();
+		statement.execute(CREATE_PERSON_TABLE);
+		statement.execute(CREATE_ITEM_TABLE);
+		statement.close();
+		connection.close();
+	}
+
+	private void dropDatabase() throws Exception {
+		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());
+		Statement statement = connection.createStatement();
+		statement.execute(DROP_ITEM_TABLE);
+		statement.execute(DROP_PERSON_TABLE);
+		statement.close();
+		connection.close();
+	}
+
+	private void createGenerateJavaMojo() throws Exception {
+		generateJavaMojo = new GenerateJavaMojo();
+		Field projectField = AbstractGenerationMojo.class.getDeclaredField("project");
+		projectField.setAccessible(true);
+		projectField.set(generateJavaMojo, new MavenProject());
+		Field propertyFileField = AbstractGenerationMojo.class.getDeclaredField("propertyFile");
+		propertyFileField.setAccessible(true);
+		propertyFileField.set(generateJavaMojo, new File(tempDir, "hibernate.properties"));
+		Field outputDirectoryField = GenerateJavaMojo.class.getDeclaredField("outputDirectory");
+		outputDirectoryField.setAccessible(true);
+		outputDirectoryField.set(generateJavaMojo, outputDirectory);
+	}
+
+	private void createOutputDirectory() {
+		outputDirectory = new File(tempDir, "generated");
+		if (!outputDirectory.mkdir()) throw new RuntimeException("Unable to create output directory: " + outputDirectory);
+	}
+
+	private MetadataDescriptor createMetadataDescriptor() {
+		return MetadataDescriptorFactory.createReverseEngineeringDescriptor(
+				null,
+				createProperties());
+	}
+
+	private Properties createProperties() {
+		Properties result = new Properties();
+		result.put("hibernate.connection.url", constructJdbcConnectionString());
+		result.put("hibernate.default_catalog", "TEST");
+		result.put("hibernate.default_schema", "PUBLIC");
+		return result;
+	}
+
+	private String constructJdbcConnectionString() {
+		return "jdbc:h2:" + tempDir.getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
+	}
+
+}
diff --git a/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/TransformHbmMojoTest.java b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/TransformHbmMojoTest.java
new file mode 100644
index 000000000000..4cc95a44df39
--- /dev/null
+++ b/tooling/hibernate-maven-plugin/src/test/java/org/hibernate/orm/tooling/maven/reveng/TransformHbmMojoTest.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.tooling.maven.reveng;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TransformHbmMojoTest {
+
+	@TempDir
+	private File tempDir;
+
+	@Test
+	public void testGetHbmFilesSingleFile() throws Exception {
+		File hbmFile = new File(tempDir, "Person.hbm.xml");
+		assertTrue(hbmFile.createNewFile());
+
+		List<File> result = invokeGetHbmFiles(hbmFile);
+		assertEquals(1, result.size());
+		assertEquals(hbmFile, result.get(0));
+	}
+
+	@Test
+	public void testGetHbmFilesNonHbmIgnored() throws Exception {
+		File otherFile = new File(tempDir, "something.txt");
+		assertTrue(otherFile.createNewFile());
+
+		List<File> result = invokeGetHbmFiles(otherFile);
+		assertTrue(result.isEmpty());
+	}
+
+	@Test
+	public void testGetHbmFilesDirectory() throws Exception {
+		File subDir = new File(tempDir, "mappings");
+		assertTrue(subDir.mkdir());
+		File hbm1 = new File(subDir, "Person.hbm.xml");
+		File hbm2 = new File(subDir, "Address.hbm.xml");
+		File other = new File(subDir, "readme.txt");
+		assertTrue(hbm1.createNewFile());
+		assertTrue(hbm2.createNewFile());
+		assertTrue(other.createNewFile());
+
+		List<File> result = invokeGetHbmFiles(subDir);
+		assertEquals(2, result.size());
+	}
+
+	@Test
+	public void testGetHbmFilesNestedDirectories() throws Exception {
+		File level1 = new File(tempDir, "level1");
+		File level2 = new File(level1, "level2");
+		assertTrue(level2.mkdirs());
+		File hbm1 = new File(level1, "Foo.hbm.xml");
+		File hbm2 = new File(level2, "Bar.hbm.xml");
+		assertTrue(hbm1.createNewFile());
+		assertTrue(hbm2.createNewFile());
+
+		List<File> result = invokeGetHbmFiles(level1);
+		assertEquals(2, result.size());
+	}
+
+	@Test
+	public void testGetHbmFilesEmptyDirectory() throws Exception {
+		File emptyDir = new File(tempDir, "empty");
+		assertTrue(emptyDir.mkdir());
+
+		List<File> result = invokeGetHbmFiles(emptyDir);
+		assertTrue(result.isEmpty());
+	}
+
+	@SuppressWarnings("unchecked")
+	private List<File> invokeGetHbmFiles(File f) throws Exception {
+		TransformHbmMojo mojo = new TransformHbmMojo();
+		Method method = TransformHbmMojo.class.getDeclaredMethod("getHbmFiles", File.class);
+		method.setAccessible(true);
+		return (List<File>) method.invoke(mojo, f);
+	}
+}
diff --git a/tooling/hibernate-reveng/hibernate-reveng.gradle b/tooling/hibernate-reveng/hibernate-reveng.gradle
new file mode 100644
index 000000000000..24ea23cb3fc6
--- /dev/null
+++ b/tooling/hibernate-reveng/hibernate-reveng.gradle
@@ -0,0 +1,15 @@
+plugins {
+    id "local.publishing-java-module"
+}
+
+description = "Library providing functionality to perform reverse engineering Hibernate related artefacts from an existing database"
+
+dependencies {
+    implementation project( ':hibernate-core' )
+    implementation libs.commonsCollections4
+    implementation libs.eclipseJdtCore
+    implementation libs.freemarker
+    implementation libs.antlrRuntime
+    implementation jakartaLibs.jaxbApi
+    testRuntimeOnly jakartaLibs.ejb
+}
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
similarity index 100%
rename from tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
rename to tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
similarity index 100%
rename from tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
rename to tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
index 357416bb71a0..8a1792bff0c0 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java
@@ -4,15 +4,6 @@
  */
 package org.hibernate.tool.hbm2ddl;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataBuilder;
 import org.hibernate.boot.MetadataSources;
@@ -38,6 +29,15 @@
 import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator;
 import org.hibernate.tool.schema.spi.TargetDescriptor;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
 
 /**
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Target.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/Target.java
similarity index 100%
rename from tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/Target.java
rename to tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/Target.java
diff --git a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TargetTypeHelper.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/TargetTypeHelper.java
similarity index 100%
rename from tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TargetTypeHelper.java
rename to tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/TargetTypeHelper.java
index 2e5053315e51..7c0673c18089 100644
--- a/tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/TargetTypeHelper.java
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/TargetTypeHelper.java
@@ -4,10 +4,10 @@
  */
 package org.hibernate.tool.hbm2ddl;
 
-import java.util.EnumSet;
-
 import org.hibernate.tool.schema.TargetType;
 
+import java.util.EnumSet;
+
 /**
  * @author Steve Ebersole
  */
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/AssociationInfo.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/AssociationInfo.java
new file mode 100644
index 000000000000..25d310a7438b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/AssociationInfo.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+public interface AssociationInfo {
+
+		String getCascade();
+		String getFetch();
+		Boolean getUpdate();
+		Boolean getInsert();
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengDialect.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengDialect.java
new file mode 100644
index 000000000000..149f011a1c2e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengDialect.java
@@ -0,0 +1,113 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Interface for fetching metadata from databases.
+ * The dialect is configured with a ConnectionProvider but is not
+ * required to actually use any connections.
+ *
+ * The metadata methods all returns Iterator and allows for more efficient and partial reads
+ * for those databases that has "flakey" JDBC metadata implementions.
+ *
+ * @author Max Rydahl Andersen
+ *
+ */
+public interface RevengDialect {
+
+	/**
+	 * Configure the metadatadialect.
+	 * @param connectionProvider a {@link ConnectionProvider}
+	 */
+	public void configure(ConnectionProvider connectionProvider);
+
+	/**
+	 * Return iterator over the tables that mathces catalog, schema and table
+	 *
+	 * @param catalog name, or null
+	 * @param schema name, or null
+	 * @param table name, or null
+	 * @return iterator with map elements that has "TABLE_NAME", "TABLE_SCHEMA", "TABLE_CAT", "TABLE_TYPE" keys.
+	 */
+	Iterator<Map<String,Object>> getTables(String catalog, String schema, String table);
+
+	/**
+	 * Close the iterator.
+	 * @param iterator an iterator returned from one of methods on this dialect
+	 */
+	void close(Iterator<?> iterator);
+
+	/**
+	 * Return iterator over the indexes that mathces catalog, schema and table
+	 *
+	 * @param catalog name, or null
+	 * @param schema name, or null
+	 * @param table name, or null
+	 * @return iterator with map elements that has "TABLE_NAME", "TABLE_SCHEMA", "TABLE_CAT", "INDEX_NAME", "COLUMN_NAME", "NON_UNIQUE", "TYPE" keys.
+	 */
+	Iterator<Map<String, Object>> getIndexInfo(String catalog, String schema, String table);
+
+	/**
+	 * Return iterator over the columns that mathces catalog, schema and table
+	 *
+	 * @param catalog name, or null
+	 * @param schema name, or null
+	 * @param table name, or null
+	 * @param column name, or null
+	 * @return iterator with map elements that has "TABLE_NAME", "TABLE_SCHEMA", "TABLE_CAT", "DATA_TYPE", "TYPE_NAME", "COLUMN_NAME", "NULLABLE", "COLUMN_SIZE", "DECIMAL_DIGITS"
+	 */
+	Iterator<Map<String, Object>> getColumns(String catalog, String schema, String table, String column);
+
+	/**
+	 * Return iterator over the columns that mathces catalog, schema and table
+	 *
+	 * @param catalog name, or null
+	 * @param schema name, or null
+	 * @param table name, or null
+	 * @return iterator with map elements that has "TABLE_NAME", "TABLE_SCHEMA", "TABLE_CAT", "COLUMN_NAME", "KEY_SEQ", "PK_NAME"
+	 */
+	Iterator<Map<String, Object>> getPrimaryKeys(String catalog, String schema, String table);
+
+
+	/**
+	 * Return iterator over the exported foreign keys that mathces catalog, schema and table
+	 *
+	 * @param catalog name, or null
+	 * @param schema name, or null
+	 * @param table name, or null
+	 * @return iterator with map elements that has "TABLE_NAME", "TABLE_SCHEMA", "TABLE_CAT", "FKTABLE_CAT", "FKTABLE_SCHEM", "FKTABLE_NAME", "FK_NAME", "KEY_SEQ"
+	 */
+	Iterator<Map<String, Object>> getExportedKeys(String catalog, String schema, String table);
+
+	/**
+	 * Does this name need quoting
+	 *
+	 * @param name
+	 * @return
+	 */
+	boolean needQuote(String name);
+
+	/**
+	 * Close any resources this dialect might have used.
+	 */
+	void close();
+
+	/**
+	 * Use database (possible native) metadata to suggest identifier strategy.
+	 *
+	 * @param catalog name, or null
+	 * @param schema name, or null
+	 * @param table name, or null
+	 * @return iterator with map elements that has "TABLE_NAME", "TABLE_SCHEMA", "TABLE_CAT", "HIBERNATE_STRATEGY" (null if no possible to determine strategy, otherwise return hibernate identifier strategy name/classname)
+	 */
+	public Iterator<Map<String, Object>> getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table);
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengDialectFactory.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengDialectFactory.java
new file mode 100644
index 000000000000..3b82283499f4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengDialectFactory.java
@@ -0,0 +1,103 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.dialect.HSQLDialect;
+import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.OracleDialect;
+import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.internal.util.ReflectHelper;
+import org.hibernate.tool.reveng.internal.core.dialect.H2MetaDataDialect;
+import org.hibernate.tool.reveng.internal.core.dialect.HSQLMetaDataDialect;
+import org.hibernate.tool.reveng.internal.core.dialect.JDBCMetaDataDialect;
+import org.hibernate.tool.reveng.internal.core.dialect.MySQLMetaDataDialect;
+import org.hibernate.tool.reveng.internal.core.dialect.OracleMetaDataDialect;
+import org.hibernate.tool.reveng.internal.core.dialect.SQLServerMetaDataDialect;
+
+import java.lang.reflect.Constructor;
+import java.util.Properties;
+
+public class RevengDialectFactory {
+
+	private RevengDialectFactory() {}
+
+	public static RevengDialect createMetaDataDialect(Dialect dialect, Properties cfg) {
+		String property = cfg.getProperty( "hibernatetool.metadatadialect" );
+		RevengDialect mdd = fromClassName(property);
+		if(mdd==null) {
+			mdd = fromDialect(dialect);
+		}
+		if(mdd==null) {
+			mdd = fromDialectName(dialect.getClass().getName());
+		}
+		if(mdd==null) {
+			mdd = new JDBCMetaDataDialect();
+		}
+		return mdd;
+	}
+
+	public static RevengDialect fromClassName(String property) {
+		if ( property != null ) {
+			try {
+				Class<?> revengDialectClass = ReflectHelper.classForName(
+						property,
+						RevengDialectFactory.class );
+				Constructor<?> revengDialectConstructor = revengDialectClass.getConstructor();
+				return (RevengDialect)revengDialectConstructor.newInstance();
+			}
+			catch (Throwable e) {
+				throw new RuntimeException(
+						"Could not load MetaDataDialect: " + property, e );
+			}
+		}
+		else {
+			return null;
+		}
+	}
+
+	public static RevengDialect fromDialect(Dialect dialect) {
+		if(dialect!=null) {
+			if(dialect instanceof OracleDialect) {
+				return new OracleMetaDataDialect();
+			}
+			else if (dialect instanceof H2Dialect) {
+				return new H2MetaDataDialect();
+			}
+			else if (dialect instanceof MySQLDialect) {
+				return new MySQLMetaDataDialect();
+			}
+			else if (dialect instanceof HSQLDialect) {
+				return new HSQLMetaDataDialect();
+			}
+			else if (dialect instanceof SQLServerDialect) {
+				return new SQLServerMetaDataDialect();
+			}
+		}
+		return null;
+	}
+
+	public static RevengDialect fromDialectName(String dialect) {
+		if (dialect.toLowerCase().contains("oracle")) {
+			return new OracleMetaDataDialect();
+		}
+		if (dialect.toLowerCase().contains("mysql")) {
+			return new MySQLMetaDataDialect();
+		}
+		if (dialect.toLowerCase().contains("h2")) {
+			return new H2MetaDataDialect();
+		}
+		if (dialect.toLowerCase().contains("hsql")) {
+			return new HSQLMetaDataDialect();
+		}
+		if (dialect.toLowerCase().contains("sqlserver")) {
+			return new SQLServerMetaDataDialect();
+		}
+		return null;
+	}
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengSettings.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengSettings.java
new file mode 100644
index 000000000000..cb377199967b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengSettings.java
@@ -0,0 +1,98 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+public class RevengSettings {
+
+
+	final RevengStrategy rootStrategy;
+
+	private String defaultPackageName = "";
+	private boolean detectOptimisticLock = true;
+	private boolean createCollectionForForeignKey = true;
+	private boolean createManyToOneForForeignKey = true;
+	private boolean detectManyToMany = true;
+	private boolean detectOneToOne = true;
+
+
+	public RevengSettings(RevengStrategy rootStrategy) {
+		this.rootStrategy = rootStrategy;
+	}
+
+	public RevengSettings setDefaultPackageName(String defaultPackageName) {
+		if(defaultPackageName==null) {
+			this.defaultPackageName = "";
+		}
+		else {
+			this.defaultPackageName= defaultPackageName.trim();
+		}
+		return this;
+	}
+
+	/** return the default packageName. Never null, at least the empty string */
+	public String getDefaultPackageName() {
+		return defaultPackageName;
+	}
+
+	/** If true, reverse engineering strategy will try and autodetect columns for optimistc locking, e.g. VERSION and TIMESTAMP */
+	public boolean getDetectOptimsticLock() {
+		return detectOptimisticLock ;
+	}
+
+	public RevengSettings setDetectOptimisticLock(
+			boolean optimisticLockSupportEnabled) {
+		this.detectOptimisticLock = optimisticLockSupportEnabled;
+		return this;
+	}
+
+	/** if true, a collection will be mapped for each foreignkey */
+	public boolean createCollectionForForeignKey() {
+		return createCollectionForForeignKey;
+	}
+
+
+	public RevengSettings setCreateCollectionForForeignKey(
+			boolean createCollectionForForeignKey) {
+		this.createCollectionForForeignKey = createCollectionForForeignKey;
+		return this;
+	}
+
+	/** if true, a many-to-one association will be created for each foreignkey found */
+	public boolean createManyToOneForForeignKey() {
+		return createManyToOneForForeignKey;
+	}
+
+	public RevengSettings setCreateManyToOneForForeignKey(
+			boolean createManyToOneForForeignKey) {
+		this.createManyToOneForForeignKey = createManyToOneForForeignKey;
+		return this;
+	}
+
+	public RevengSettings setDetectManyToMany(boolean b) {
+		this.detectManyToMany = b;
+		return this;
+	}
+
+	public boolean getDetectManyToMany() {
+		return detectManyToMany;
+	}
+
+	public RevengSettings setDetectOneToOne(boolean b) {
+		this.detectOneToOne = b;
+		return this;
+	}
+
+	public boolean getDetectOneToOne() {
+		return detectOneToOne;
+	}
+
+	/** return the top/root strategy. Allows a lower strategy to ask another question. Be aware of possible recursive loops; e.g. do not call the root.tableToClassName in tableToClassName of a custom reversengineeringstrategy. */
+	public RevengStrategy getRootStrategy() {
+		return rootStrategy;
+	}
+
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengStrategy.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengStrategy.java
new file mode 100644
index 000000000000..dcc8ea01835e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengStrategy.java
@@ -0,0 +1,198 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.Table;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+public interface RevengStrategy {
+
+	interface SchemaSelection {
+		String getMatchCatalog();
+		String getMatchSchema();
+		String getMatchTable();
+	}
+
+	/**
+	 * Generic method used to initialize the reverse engineering strategy.
+	 *
+	 * @param settings used for this
+	 */
+	public void  setSettings(RevengSettings settings);
+
+	/**
+	 * Close any resources this strategy might have used. Called after reverse engineering has been completed.
+	 */
+	public void close();
+
+	/**
+	 *
+	 * @return a fully-qualified class name
+	 */
+	public String tableToClassName(TableIdentifier tableIdentifier);
+
+	/**
+	 * Return a property name for a Column.
+	 * @param column a columnname
+	 * @return a property name
+	 */
+	public String columnToPropertyName(TableIdentifier table, String column);
+
+	public boolean excludeTable(TableIdentifier ti);
+
+	public boolean excludeColumn(TableIdentifier identifier, String columnName);
+
+	/**
+	 * Gets the preferred Hibernate type for an SQL type.
+	 * @param table name of the table, can be null
+	 * @param columnName name of the column, can be null
+	 * @param sqlType The sql type.
+	 * @param length The length of the column.
+	 * @param precision The number of decimal digits, if applicable.
+	 * @param scale The scale, if applicable.
+	 * @param nullable The nullability of the column
+	 * @param generatedIdentifier true if for a column used in an identifier that is not "assigned", false otherwise.
+	 * @return The Preferred hibernate type name.
+	 */
+	public String columnToHibernateTypeName(TableIdentifier table, String columnName, int sqlType, int length, int precision, int scale, boolean nullable, boolean generatedIdentifier);
+
+	/**
+	 * Gets the user defined foreign keys.
+	 * @param referencedTable the table to get the foreign keys for
+	 * @return a list of ForeignKey's
+	 */
+	public List<ForeignKey> getForeignKeys(TableIdentifier referencedTable);
+
+	/**
+	 * @param identifier the table to look up for
+	 * @return the identifier strategy name wanted for a specific table, null if use what the database metadata can tell.
+	 */
+	public String getTableIdentifierStrategyName(TableIdentifier identifier);
+
+	public Properties getTableIdentifierProperties(TableIdentifier identifier);
+
+	/**
+	 * If a table does not have any primarykey columns reported, this method is called.
+	 * @return list of strings for each column name that is part of the primary key
+	 **/
+	public List<String> getPrimaryKeyColumnNames(TableIdentifier identifier);
+
+	/**
+	 * Given a class name return the name for its composite id if it will have one.
+	 *
+	 * @param className
+	 * @return
+	 */
+	public String classNameToCompositeIdName(String className);
+
+
+	/** Return explicit which column name should be used for optimistic lock */
+	public String getOptimisticLockColumnName(TableIdentifier identifier);
+
+	public boolean useColumnForOptimisticLock(TableIdentifier identifier, String column);
+
+	/**
+	 * Return list of SchemaSelctors to be used when asking {@link RevengDialect} for metadata.
+	 *
+	 * @return list of {@link SchemaSelection} instances
+	 */
+	public List<SchemaSelection> getSchemaSelections();
+
+	/**
+	 * Given a table name, return the wanted name for the identifier.
+	 * @param tableIdentifier
+	 * @return name to be used for identification
+	 */
+	public String tableToIdentifierPropertyName(TableIdentifier tableIdentifier);
+
+	/**
+	 * Given a table name, return the wanted name for a composite identifier.
+	 * @param identifier
+	 * @return
+	 */
+	public String tableToCompositeIdName(TableIdentifier identifier);
+
+	/**
+	 * Return the list of metaattributes to assign to classes created based on the given table
+	 * @param tableIdentifier
+	 * @return a Map from String to {@link MetaAttribute}
+	 */
+	public Map<String,MetaAttribute> tableToMetaAttributes(TableIdentifier tableIdentifier);
+
+	/**
+	 * Return the list of metaattributes to assign to properties created based on the given column
+	 * @param identifier the table identifier
+	 * @param column the column name
+	 * @return a Map from String to {@link MetaAttribute}
+	 */
+	public Map<String, MetaAttribute> columnToMetaAttributes(TableIdentifier identifier, String column);
+
+	/** Should this foreignkey be excluded as a oneToMany */
+	public boolean excludeForeignKeyAsCollection(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns);
+
+	/** Should this foreignkey be excluded as a many-to-one */
+	public boolean excludeForeignKeyAsManytoOne(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns);
+
+	/** is the collection lazy or not ? */
+	public boolean isForeignKeyCollectionLazy(String name, TableIdentifier foreignKeyTable, List<?> columns, TableIdentifier foreignKeyReferencedTable, List<?> referencedColumns);
+
+	/**
+	 * Return a collection role name for a Collection based on the foreignkey.
+	 * @param fromColumns list of Column instances on the fromTable. Only col.getName() should be assumed to be correct
+	 * @param referencedColumns list of Column instances on the referenced Table. Only col.getName() should be assumed to be correct
+	 * @param uniqueReference true if there is no other references to the same table
+	 * @return
+	 */
+	public String foreignKeyToCollectionName(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns, boolean uniqueReference);
+
+	/**
+	 *
+	 * @param fromColumns list of Column instances on the fromTable. Only col.getName() should be assumed to be correct
+	 * @param referencedColumns list of Column instances on the referenced Table. Only col.getName() should be assumed to be correct
+	 * @param uniqueReference true if there is no other references to the same table
+	 * @return
+	 */
+	public String foreignKeyToEntityName(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns, boolean uniqueReference);
+
+	/**
+	 * Used to rename the inverse one-to-one properties.
+	 *
+	 * @param fromColumns list of Column instances on the fromTable. Only col.getName() should be assumed to be correct
+	 * @param referencedColumns list of Column instances on the referenced Table. Only col.getName() should be assumed to be correct
+	 * @param uniqueReference true if there is no other references to the same table
+	 * @return null if use defaults or non-empty String with a specific name
+	 */
+	public String foreignKeyToInverseEntityName(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns, boolean uniqueReference);
+
+	/**
+	 * @param table
+	 * @return true if this table is considered to be a many-to-many table.
+	 */
+	public boolean isManyToManyTable(Table table);
+
+	/**
+	 *
+	 * @param fromKey the source foreign key
+	 * @param middleTable the middle (join) table identifier
+	 * @param toKey the target foreign key
+	 * @param uniqueReference true if there is no other references to the same table
+	 * @return the many-to-many name
+	 */
+	public String foreignKeyToManyToManyName(ForeignKey fromKey, TableIdentifier middleTable, ForeignKey toKey, boolean uniqueReference);
+
+	public boolean isOneToOne(ForeignKey foreignKey);
+
+	public boolean isForeignKeyCollectionInverse(String name, Table foreignKeyTable, List<?> columns, Table foreignKeyReferencedTable, List<?> referencedColumns);
+
+
+	public AssociationInfo foreignKeyToAssociationInfo(ForeignKey foreignKey);
+	public AssociationInfo foreignKeyToInverseAssociationInfo(ForeignKey foreignKey);
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengStrategyFactory.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengStrategyFactory.java
new file mode 100644
index 000000000000..cb673fc4e67e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/RevengStrategyFactory.java
@@ -0,0 +1,105 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.OverrideRepository;
+import org.hibernate.tool.reveng.internal.util.ReflectionUtil;
+import org.jboss.logging.Logger;
+
+public class RevengStrategyFactory {
+	final private static Logger log = Logger.getLogger( RevengStrategyFactory.class );
+
+	private static RevengStrategy createDefaultStrategyInstance() {
+		return new DefaultStrategy();
+	}
+
+	private static RuntimeException createExceptionBecauseOfMissingConstructors(Class<?> revengClass) {
+		return new RuntimeException("A strategy of class '" + revengClass.getName() + "' could not be created. " +
+									"No matching constructor found: '" + revengClass.getSimpleName() + "()' or " +
+									"'" + revengClass.getSimpleName() + "(" + RevengStrategy.class.getName() + ")'");
+	}
+
+	public static RevengStrategy createReverseEngineeringStrategy(
+			String revengClassName, RevengStrategy delegate) {
+		if (revengClassName == null) {
+			return delegate == null ? createDefaultStrategyInstance() : delegate;
+		}
+
+		try {
+			Class<?> revengClass = ReflectionUtil.classForName(revengClassName);
+
+			if (delegate == null) {
+				try {
+					try {
+						Constructor<?> revengConstructor = revengClass.getConstructor();
+						return (RevengStrategy) revengConstructor.newInstance();
+					}
+					catch (NoSuchMethodException e1) {
+						try {
+							Constructor<?> revengConstructor = revengClass.getConstructor(RevengStrategy.class);
+							return (RevengStrategy) revengConstructor.newInstance(createDefaultStrategyInstance());
+						}
+						catch (NoSuchMethodException e2) {
+							throw createExceptionBecauseOfMissingConstructors(revengClass);
+						}
+					}
+				}
+				catch (IllegalAccessException | InstantiationException | InvocationTargetException | IllegalArgumentException e) {
+					throw new RuntimeException("A strategy of class '" + revengClassName + "' could not be created", e);
+				}
+			}
+
+			try {
+				try {
+					Constructor<?> revengConstructor = revengClass.getConstructor(RevengStrategy.class);
+					return (RevengStrategy) revengConstructor.newInstance(delegate);
+				}
+				catch (NoSuchMethodException e1) {
+					log.warn("Delegating strategy given, but no matching constructor is available on class '" +
+							revengClassName + "'. The delegating strategy will be ignored!");
+					try {
+						Constructor<?> revengConstructor = revengClass.getConstructor();
+						return (RevengStrategy) revengConstructor.newInstance();
+					}
+					catch (NoSuchMethodException e2) {
+						throw createExceptionBecauseOfMissingConstructors(revengClass);
+					}
+				}
+			}
+			catch (IllegalAccessException | InstantiationException | InvocationTargetException | IllegalArgumentException e) {
+				throw new RuntimeException("A strategy of class '" + revengClassName + "' could not be created", e);
+			}
+		}
+		catch (ClassNotFoundException e) {
+			throw new RuntimeException("A strategy of class '" + revengClassName + "' could not be created", e);
+		}
+	}
+
+	public static RevengStrategy createReverseEngineeringStrategy( String revengClassName, File[] revengFiles) {
+		RevengStrategy result = null;
+		if (revengFiles != null && revengFiles.length > 0) {
+			OverrideRepository overrideRepository = new OverrideRepository();
+			for (File file : revengFiles) {
+				overrideRepository.addFile(file);
+			}
+			result = overrideRepository.getReverseEngineeringStrategy(createDefaultStrategyInstance());
+		}
+
+		return createReverseEngineeringStrategy(revengClassName, result);
+	}
+
+	public static RevengStrategy createReverseEngineeringStrategy(String revengClassName) {
+		return createReverseEngineeringStrategy(revengClassName, (RevengStrategy) null);
+	}
+
+	public static RevengStrategy createReverseEngineeringStrategy() {
+		return createDefaultStrategyInstance();
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/TableIdentifier.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/TableIdentifier.java
new file mode 100644
index 000000000000..8e4e45a932ae
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/core/TableIdentifier.java
@@ -0,0 +1,82 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+import org.hibernate.mapping.Table;
+
+import java.util.Objects;
+
+/**
+ * Identifier used for the full name of tables.
+ * @author max
+ *
+ */
+public class TableIdentifier {
+
+	public static TableIdentifier create(Table table) {
+		return new TableIdentifier(table.getCatalog(), table.getSchema(), table.getName() );
+	}
+
+	public static TableIdentifier create(String catalog, String schema, String name) {
+		return new TableIdentifier(catalog, schema, name);
+	}
+
+	private final String catalog;
+	private final String schema;
+	private final String name;
+
+	private TableIdentifier(String catalog, String schema, String name) {
+		this.catalog = (catalog==null?null:catalog.intern() );
+		this.schema = (schema==null?null:schema.intern() );
+		this.name = (name==null?null:name.intern() );
+	}
+
+	public String getCatalog() {
+		return catalog;
+	}
+	public String getName() {
+		return name;
+	}
+	public String getSchema() {
+		return schema;
+	}
+
+	public boolean equals(Object obj) {
+		return obj instanceof TableIdentifier
+			&& isEqualIdentifier( (TableIdentifier)obj);
+	}
+
+	private boolean isEqualIdentifier(TableIdentifier otherIdentifier) {
+		if (otherIdentifier==null) return false;
+		if (this==otherIdentifier) return true;
+
+		if (Objects.equals(this.name, otherIdentifier.name) ) {
+			if(Objects.equals(this.schema, otherIdentifier.schema) ) {
+				return Objects.equals(this.catalog, otherIdentifier.catalog);
+			}
+		}
+		return false;
+	}
+
+	public int hashCode() {
+		int result = 13;
+		result = 37 * result + ( name==null ? 0 : name.hashCode() );
+		result = 37 * result + ( schema==null ? 0 : schema.hashCode() );
+		result = 37 * result + ( catalog==null ? 0 : catalog.hashCode() );
+
+		return result;
+	}
+
+	public String toString() {
+		StringBuilder buf = new StringBuilder()
+					.append( "TableIdentifier" )
+					.append('(');
+		if ( getCatalog()!=null ) buf.append( getCatalog() ).append( "." );
+		if ( getSchema()!=null ) buf.append( getSchema() ).append( "." );
+		buf.append( getName() ).append(')');
+		return buf.toString();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ArtifactCollector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ArtifactCollector.java
new file mode 100644
index 000000000000..8488c34893a6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ArtifactCollector.java
@@ -0,0 +1,25 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.export;
+
+import java.io.File;
+import java.util.Set;
+
+public interface ArtifactCollector {
+
+	/**
+	 * Called to inform that a file has been created by the exporter.
+	 */
+	void addFile(File file, String type);
+
+	int getFileCount(String type);
+
+	File[] getFiles(String type);
+
+	Set<String> getFileTypes();
+
+	void formatFiles();
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/Exporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/Exporter.java
new file mode 100644
index 000000000000..0ef80c81fb26
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/Exporter.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.export;
+
+import java.util.Properties;
+
+/**
+ * @author max and david
+ * @author koen
+ */
+public interface Exporter {
+
+
+	public Properties getProperties();
+
+	/**
+	 * Called when exporter should start generating its output
+	 */
+	public void start();
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ExporterConstants.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ExporterConstants.java
new file mode 100644
index 000000000000..41945e00cbd2
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ExporterConstants.java
@@ -0,0 +1,27 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.export;
+
+public interface ExporterConstants {
+
+	public static final String ARTIFACT_COLLECTOR = "org.hibernate.tool.api.export.ExporterConstants.ArtifactCollector";
+	public static final String CREATE_DATABASE = "org.hibernate.tool.api.export.ExporterConstants.CreateDatabase";
+	public static final String DELIMITER = "org.hibernate.tool.api.export.ExporterConstants.Delimiter";
+	public static final String DESTINATION_FOLDER = "org.hibernate.tool.api.export.ExporterConstants.DestinationFolder";
+	public static final String DROP_DATABASE = "org.hibernate.tool.api.export.ExporterConstants.DropDatabase";
+	public static final String EXPORT_TO_CONSOLE = "org.hibernate.tool.api.export.ExporterConstants.ExportToConsole";
+	public static final String EXPORT_TO_DATABASE = "org.hibernate.tool.api.export.ExporterConstants.ExportToDatabase";
+	public static final String FILE_PATTERN = "org.hibernate.tool.api.export.ExporterConstants.FilePattern";
+	public static final String FOR_EACH = "org.hibernate.tool.api.export.ExporterConstants.ForEach";
+	public static final String FORMAT = "org.hibernate.tool.api.export.ExporterConstants.Format";
+	public static final String HALT_ON_ERROR = "org.hibernate.tool.api.export.ExporterConstants.HaltOnError";
+	public static final String METADATA_DESCRIPTOR = "org.hibernate.tool.api.export.ExporterConstants.MetadataDescriptor";
+	public static final String OUTPUT_FILE_NAME = "org.hibernate.tool.api.export.ExporterConstants.OutputFileName";
+	public static final String QUERY_LIST = "org.hibernate.tool.api.export.ExporterConstants.QueryList";
+	public static final String SCHEMA_UPDATE = "org.hibernate.tool.api.export.ExporterConstants.SchemaUpdate";
+	public static final String TEMPLATE_NAME = "org.hibernate.tool.api.export.ExporterConstants.TemplateName";
+	public static final String TEMPLATE_PATH = "org.hibernate.tool.api.export.ExporterConstants.TemplatePath";
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ExporterFactory.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ExporterFactory.java
new file mode 100644
index 000000000000..0ec7018430f1
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ExporterFactory.java
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.export;
+
+import org.hibernate.tool.reveng.internal.util.ReflectionUtil;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class ExporterFactory {
+
+	public static Exporter createExporter(String exporterClassName) {
+		Exporter result;
+		try {
+			Class<?> exporterClass = ReflectionUtil.classForName(exporterClassName);
+			Constructor<?> exporterConstructor = exporterClass.getConstructor();
+			result = (Exporter)exporterConstructor.newInstance();
+		}
+		catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | SecurityException | IllegalArgumentException | InvocationTargetException exception) {
+			throw new RuntimeException("An exporter of class '" + exporterClassName + "' could not be created", exception);
+		}
+		return result;
+	}
+
+	public static Exporter createExporter(ExporterType exporterType) {
+		return createExporter(exporterType.className());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ExporterType.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ExporterType.java
new file mode 100644
index 000000000000..d82762ae4c68
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/export/ExporterType.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.export;
+
+public enum ExporterType {
+
+	CFG ("org.hibernate.tool.reveng.internal.export.cfg.CfgExporter"),
+	DAO ("org.hibernate.tool.reveng.internal.export.dao.DaoExporter"),
+	DDL ("org.hibernate.tool.reveng.internal.export.ddl.DdlExporter"),
+	DOC ("org.hibernate.tool.reveng.internal.export.doc.DocExporter"),
+	GENERIC ("org.hibernate.tool.reveng.internal.export.common.GenericExporter"),
+	HBM ("org.hibernate.tool.reveng.internal.export.hbm.HbmExporter"),
+	HBM_LINT ("org.hibernate.tool.reveng.internal.export.lint.HbmLintExporter"),
+	JAVA ("org.hibernate.tool.reveng.internal.export.java.JavaExporter"),
+	QUERY ("org.hibernate.tool.reveng.internal.export.query.QueryExporter");
+
+	private String className;
+
+	ExporterType(String className) {
+		this.className = className;
+	}
+
+	public String className() {
+		return className;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/java/DefaultJavaPrettyPrinterStrategy.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/java/DefaultJavaPrettyPrinterStrategy.java
new file mode 100644
index 000000000000..2096bf91331a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/java/DefaultJavaPrettyPrinterStrategy.java
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.java;
+
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.ToolFactory;
+import org.eclipse.jdt.core.formatter.CodeFormatter;
+import org.eclipse.jface.text.Document;
+import org.eclipse.text.edits.TextEdit;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.Map;
+
+public class DefaultJavaPrettyPrinterStrategy {
+
+	public boolean formatFile(File file) {
+		try {
+			String source = new String( Files.readAllBytes( file.toPath() ) );
+			Map<String, String> options = JavaCore.getOptions();
+			CodeFormatter formatter = ToolFactory.createCodeFormatter( options );
+			TextEdit edit = formatter.format(
+					CodeFormatter.K_COMPILATION_UNIT | CodeFormatter.F_INCLUDE_COMMENTS,
+					source, 0, source.length(), 0, System.lineSeparator() );
+			if ( edit == null ) {
+				return false;
+			}
+			Document document = new Document( source );
+			edit.apply( document );
+			Files.write( file.toPath(), document.get().getBytes() );
+			return true;
+		}
+		catch (Exception e) {
+			throw new RuntimeException( e );
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/metadata/MetadataConstants.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/metadata/MetadataConstants.java
new file mode 100644
index 000000000000..707c47be4626
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/metadata/MetadataConstants.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.metadata;
+
+public interface MetadataConstants {
+
+	public static final String PREFER_BASIC_COMPOSITE_IDS = "org.hibernate.tool.api.metadata.MetadataConstants.PreferBasicCompositeIds";
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/metadata/MetadataDescriptor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/metadata/MetadataDescriptor.java
new file mode 100644
index 000000000000..58053f0b37d8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/metadata/MetadataDescriptor.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.metadata;
+
+import org.hibernate.boot.Metadata;
+
+import java.util.Properties;
+
+public interface MetadataDescriptor {
+
+	Metadata createMetadata();
+
+	Properties getProperties();
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/metadata/MetadataDescriptorFactory.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/metadata/MetadataDescriptorFactory.java
new file mode 100644
index 000000000000..9cf3220d1bab
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/metadata/MetadataDescriptorFactory.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.metadata;
+
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.internal.metadata.JpaMetadataDescriptor;
+import org.hibernate.tool.reveng.internal.metadata.NativeMetadataDescriptor;
+import org.hibernate.tool.reveng.internal.metadata.RevengMetadataDescriptor;
+
+import java.io.File;
+import java.util.Properties;
+
+public class MetadataDescriptorFactory {
+
+	public static MetadataDescriptor createReverseEngineeringDescriptor(
+			RevengStrategy reverseEngineeringStrategy,
+			Properties properties) {
+		return new RevengMetadataDescriptor(
+				reverseEngineeringStrategy,
+				properties);
+	}
+
+	public static MetadataDescriptor createJpaDescriptor(String persistenceUnit, Properties properties) {
+		return new JpaMetadataDescriptor(persistenceUnit, properties);
+	}
+
+	public static MetadataDescriptor createNativeDescriptor(
+			File cfgXmlFile,
+			File[] mappingFiles,
+			Properties properties) {
+		return new NativeMetadataDescriptor(
+				cfgXmlFile,
+				mappingFiles,
+				properties);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/version/Version.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/version/Version.java
new file mode 100644
index 000000000000..38c0da0b609e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/version/Version.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.version;
+
+public interface Version {
+
+	static String versionString() {
+		return org.hibernate.Version.getVersionString();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/xml/XMLPrettyPrinter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/xml/XMLPrettyPrinter.java
new file mode 100644
index 000000000000..aa95306720ac
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/xml/XMLPrettyPrinter.java
@@ -0,0 +1,52 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.xml;
+
+import org.hibernate.tool.reveng.internal.xml.XMLPrettyPrinterStrategyFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+/**
+ * @author max
+ *
+ */
+public final class XMLPrettyPrinter {
+
+	public static void prettyPrintFile(File file) throws IOException {
+		prettyPrintFile(file, null);
+	}
+
+	public static void prettyPrintFile(File file, XMLPrettyPrinterStrategy strategy) throws IOException {
+		String input = readFile(file.getAbsolutePath(), Charset.defaultCharset());
+		String output = prettyFormat(input, strategy);
+		PrintWriter writer = new PrintWriter(file);
+		writer.print(output);
+		writer.flush();
+		writer.close();
+	}
+
+	private static String readFile(String path, Charset encoding) throws IOException {
+		byte[] encoded = Files.readAllBytes(Paths.get(path));
+		return new String(encoded, encoding);
+	}
+
+	private static String prettyFormat(String input, XMLPrettyPrinterStrategy strategy) {
+		try {
+			if (strategy == null) {
+				strategy = XMLPrettyPrinterStrategyFactory.newXMLPrettyPrinterStrategy();
+			}
+			return strategy.prettyPrint(input);
+		}
+		catch (Exception e) {
+			throw new RuntimeException(e); // simple exception handling, please review it
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/xml/XMLPrettyPrinterStrategy.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/xml/XMLPrettyPrinterStrategy.java
new file mode 100644
index 000000000000..db553d460d6a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/api/xml/XMLPrettyPrinterStrategy.java
@@ -0,0 +1,10 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.xml;
+
+public interface XMLPrettyPrinterStrategy {
+
+	String prettyPrint(String xml) throws Exception;
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/AntlrSimpleHQLLexer.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/AntlrSimpleHQLLexer.java
new file mode 100644
index 000000000000..7f2e9a734ac0
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/AntlrSimpleHQLLexer.java
@@ -0,0 +1,43 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.Token;
+import org.hibernate.grammars.hql.HqlLexer;
+
+
+/**
+ * A lexer implemented on top of the Antlr grammer implemented in core.
+ *
+ * @author Max Rydahl Andersen
+ *
+ */
+public class AntlrSimpleHQLLexer implements SimpleHQLLexer {
+
+	private final HqlLexer lexer;
+	private Token token;
+
+	public AntlrSimpleHQLLexer(char[] cs) {
+		lexer = new HqlLexer(CharStreams.fromString(new String(cs)));
+	}
+
+	public int getTokenLength() {
+		if(token.getText()==null) {
+			return 0;
+		}
+		return token.getText().length();
+	}
+
+	public int getTokenOffset() {
+		return token.getCharPositionInLine();
+	}
+
+	public int nextTokenId() {
+		token = lexer.nextToken();
+		return token.getType();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/CompletionHelper.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/CompletionHelper.java
new file mode 100644
index 000000000000..c63d4aae6c1d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/CompletionHelper.java
@@ -0,0 +1,75 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author leon, max.andersen@jboss.com
+ */
+public class CompletionHelper {
+
+	private CompletionHelper() {
+	}
+
+	public static String getCanonicalPath(List<EntityNameReference> qts, String name) {
+		Map<String, String> alias2Type = new HashMap<>();
+		for ( EntityNameReference qt : qts ) {
+			alias2Type.put( qt.getAlias(), qt.getEntityName() );
+		}
+		if (qts.size() == 1) {
+			EntityNameReference visible = qts.get(0);
+			String alias = visible.getAlias();
+			if (name.equals(alias)) {
+				return visible.getEntityName();
+			}
+			else if (alias == null || alias.isEmpty() || alias.equals(visible.getEntityName())) {
+				return visible.getEntityName() + "/" + name;
+			}
+		}
+		return getCanonicalPath( new HashSet<>(), alias2Type, name);
+	}
+
+
+	private static String getCanonicalPath(Set<String> resolved, Map<String, String> alias2Type, String name) {
+		if (resolved.contains(name)) {
+			// To prevent a stack overflow
+			return name;
+		}
+		resolved.add(name);
+		String type = alias2Type.get(name);
+		if (type != null) {
+			return name.equals(type) ? name : getCanonicalPath(resolved, alias2Type, type);
+		}
+		int idx = name.lastIndexOf('.');
+		if (idx == -1) {
+			return name;
+		}
+		String baseName = name.substring(0, idx);
+		String prop = name.substring(idx + 1);
+		if (isAliasKnown(alias2Type, baseName)) {
+			return getCanonicalPath(resolved, alias2Type, baseName) + "/" + prop;
+		}
+		else {
+			return name;
+		}
+	}
+
+	private static boolean isAliasKnown(Map<String, String> alias2Type, String alias) {
+		if (alias2Type.containsKey(alias)) {
+			return true;
+		}
+		int idx = alias.lastIndexOf('.');
+		if (idx == -1) {
+			return false;
+		}
+		return isAliasKnown(alias2Type, alias.substring(0, idx));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/ConfigurationCompletion.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/ConfigurationCompletion.java
new file mode 100644
index 000000000000..64d757d8706f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/ConfigurationCompletion.java
@@ -0,0 +1,297 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.hibernate.HibernateException;
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.ToOne;
+import org.hibernate.mapping.Value;
+import org.hibernate.tool.reveng.internal.export.java.Cfg2JavaTool;
+import org.hibernate.tool.reveng.internal.export.java.EntityPOJOClass;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Objects;
+
+/**
+ * @author Max Rydahl Andersen
+ *
+ */
+public class ConfigurationCompletion {
+
+	private final Metadata metadata;
+
+	public ConfigurationCompletion(Metadata md) {
+		this.metadata = md;
+	}
+
+	public void getMatchingImports(String prefix , IHQLCompletionRequestor collector) {
+		getMatchingImports( prefix, prefix.length() , collector );
+	}
+
+	public void getMatchingImports(String prefix, int cursorPosition, IHQLCompletionRequestor collector) {
+		for ( Entry<String, String> entry : metadata.getImports().entrySet() ) {
+			String entityImport = entry.getKey();
+			String entityName = entry.getValue();
+
+			if ( entityImport.toLowerCase().startsWith( prefix.toLowerCase() ) ) {
+				HQLCompletionProposal proposal = createStartWithCompletionProposal( prefix, cursorPosition,
+						HQLCompletionProposal.ENTITY_NAME, entityImport );
+				proposal.setShortEntityName( entityImport );
+				proposal.setEntityName( entityName );
+				collector.accept( proposal );
+
+			}
+		}
+	}
+
+	public void getMatchingKeywords(String prefix, int cursorPosition, IHQLCompletionRequestor collector) {
+		findMatchingWords( cursorPosition, prefix, HQLAnalyzer.getHQLKeywords(), HQLCompletionProposal.KEYWORD, collector);
+	}
+
+	public void getMatchingFunctions(String prefix, int cursorPosition, IHQLCompletionRequestor collector) {
+		findMatchingWords( cursorPosition, prefix, HQLAnalyzer.getHQLFunctionNames(), HQLCompletionProposal.FUNCTION, collector);
+	}
+
+	public void getMatchingProperties(String path, String prefix, IHQLCompletionRequestor hcc) {
+		getMatchingProperties( path, prefix, prefix.length(), hcc );
+	}
+
+	public void getMatchingProperties(String path, String prefix, int cursorPosition, IHQLCompletionRequestor hcc) {
+		int idx = path.indexOf('/');
+		if (idx == -1) { // root name
+			PersistentClass cmd = getPersistentClass(path);
+			if (cmd == null) {
+				return;
+			}
+			addPropertiesToList(cmd, prefix, cursorPosition, hcc);
+		}
+		else {
+			String baseEntityName = path.substring(0, idx);
+			String propertyPath = path.substring(idx + 1);
+			Value value = getNextAttributeType(baseEntityName, propertyPath);
+			if (value == null) {
+				return;
+			}
+
+			// Go to the next property (get the y of x/y/z when root is x)
+			idx = propertyPath.indexOf('/');
+			if (idx == -1) {
+				path = "";
+			}
+			else {
+				path = propertyPath.substring(idx + 1);
+			}
+			if ( path.isEmpty() ) {
+				// No properties left
+				if (value instanceof Component) {
+					addPropertiesToList((Component) value, prefix, cursorPosition, hcc);
+				}
+				else if (value instanceof Collection && ((Collection)value).getElement() instanceof Component) {
+					addPropertiesToList((Component) ((Collection)value).getElement(), prefix, cursorPosition, hcc);
+				}
+				else {
+					addPropertiesToList(getPersistentClass( getReferencedEntityName( value ) ), prefix, cursorPosition, hcc);
+				}
+			}
+			else {
+				// Nested properties
+				if (value instanceof Component) {
+					// We need to find the first non-component type
+					while ( value instanceof Component && !path.isEmpty() ) {
+						value = getNextAttributeType((Component) value, path);
+						if (value != null) {
+							// Consume part of the canonical path
+							idx = path.indexOf('/');
+							if (idx != -1) {
+								path = path.substring(idx + 1);
+							}
+							else {
+								path = "";
+							}
+						}
+					}
+					if (value instanceof Component) {
+						addPropertiesToList((Component) value, prefix, cursorPosition, hcc);
+					}
+					else if (value != null) {
+						if ( !path.isEmpty() ) {
+							path = getReferencedEntityName( value ) + "/" + path;
+						}
+						else {
+							path = getReferencedEntityName( value );
+						}
+						getMatchingProperties( path, prefix, cursorPosition, hcc );
+					}
+				}
+				else {
+					// Just call the method recursively to add our new type
+					getMatchingProperties(getReferencedEntityName( value ) + "/" + path, prefix, cursorPosition, hcc);
+				}
+			}
+		}
+	}
+
+	private String getReferencedEntityName(Value value) {
+		if(value instanceof ToOne) {
+			return ((ToOne)value).getReferencedEntityName();
+		}
+		if ( value instanceof Collection collection ) {
+			Value element = collection.getElement();
+			String elementType = getReferencedEntityName( element );
+			collection.isIndexed();//TODO..list/map
+			/*IndexedCollection idxCol = (IndexedCollection) collection;
+			if(!idxCol.isList()) {
+				Value idxElement = idxCol.getIndex();
+				String indexType = getReferencedEntityName( value );
+				genericDecl = indexType + "," + elementType;
+			}*/
+			return elementType;
+		}
+
+		if(value instanceof OneToMany) {
+			return ((OneToMany)value).getReferencedEntityName();
+		}
+
+		return null;
+	}
+
+	private void addPropertiesToList(PersistentClass cmd, String prefix, int cursorPosition, IHQLCompletionRequestor hcc) {
+		if (cmd == null) {
+			return;
+		}
+		if (prefix == null) {
+			prefix = "";
+		}
+
+		// Add superclass's properties too
+		while (cmd != null){
+			EntityPOJOClass pc = new EntityPOJOClass(cmd, new Cfg2JavaTool()); // TODO: we should extract the needed functionality from this hbm2java class.
+
+			Iterator<Property> allPropertiesIterator = pc.getAllPropertiesIterator();
+			while ( allPropertiesIterator.hasNext() ) {
+				Property property = allPropertiesIterator.next();
+				String candidate = property.getName();
+				if ( prefix.isEmpty() || candidate.toLowerCase().startsWith(prefix.toLowerCase())) {
+					HQLCompletionProposal proposal = createStartWithCompletionProposal( prefix, cursorPosition, HQLCompletionProposal.PROPERTY, candidate );
+					proposal.setEntityName( cmd.getEntityName() );
+					proposal.setProperty( property );
+					proposal.setPropertyName( candidate );
+					hcc.accept( proposal);
+				}
+			}
+			cmd = cmd.getSuperclass();
+		}
+
+	}
+
+	private HQLCompletionProposal createStartWithCompletionProposal(String prefix, int cursorPosition, int kind, String candidate) {
+		HQLCompletionProposal proposal = new HQLCompletionProposal(kind, cursorPosition);
+		if(candidate.startsWith(prefix)) {
+			proposal.setCompletion( candidate.substring(prefix.length()) );
+			proposal.setSimpleName( candidate );
+			proposal.setReplaceStart( cursorPosition );
+			proposal.setReplaceEnd( cursorPosition );
+		}
+		else {
+			proposal.setCompletion( candidate );
+			proposal.setSimpleName( candidate );
+			proposal.setReplaceStart( cursorPosition  - prefix.length() );// replace prefix
+			proposal.setReplaceEnd( cursorPosition );
+		}
+		return proposal;
+	}
+
+	/** returns PersistentClass for path. Can be null if path is an imported non-mapped class */
+	private PersistentClass getPersistentClass(String path) {
+		if(path==null) return null;
+		String entityName = metadata.getImports().get( path );
+		return metadata.getEntityBinding( Objects.requireNonNullElse( entityName, path ) );
+	}
+
+	private Value getNextAttributeType(String type, String attributePath) {
+		PersistentClass cmd = getPersistentClass( type );
+		if (cmd == null) {
+			return null;
+		}
+		String attribute;
+		int idx = attributePath.indexOf('/');
+		if (idx == -1) {
+			attribute = attributePath;
+		}
+		else {
+			attribute = attributePath.substring(0, idx);
+		}
+
+		String idName = cmd.getIdentifierProperty()==null?null:cmd.getIdentifierProperty().getName();
+		if (attribute.equals(idName)) {
+			return cmd.getIdentifierProperty().getValue();
+		}
+		try {
+			Property property = cmd.getProperty( attribute );
+			return property==null?null:property.getValue();
+		}
+		catch (HibernateException he) {
+			return null;
+		}
+
+	}
+
+	private Value getNextAttributeType(Component t, String attributeName) {
+		int idx = attributeName.indexOf('/');
+		if (idx != -1) {
+			attributeName = attributeName.substring(0, idx);
+		}
+		for ( Property element : t.getProperties() ) {
+			String name = element.getName();
+			if ( attributeName.equals( name ) ) {
+				return element.getValue();
+			}
+		}
+		return null;
+	}
+
+	void addPropertiesToList(Component t, String prefix, int cursorPosition, IHQLCompletionRequestor hcc) {
+		if (t == null) {
+			return;
+		}
+		for ( Property element : t.getProperties() ) {
+			String candidate = element.getName();
+			if ( candidate.toLowerCase().startsWith( prefix.toLowerCase() ) ) {
+				HQLCompletionProposal proposal = createStartWithCompletionProposal( prefix, cursorPosition,
+						HQLCompletionProposal.PROPERTY, candidate );
+				//proposal.setEntityName( cmd.getEntityName() ); ...we don't know here..TODO: pass in the "path"
+				proposal.setPropertyName( candidate );
+				proposal.setProperty( element );
+				hcc.accept( proposal );
+			}
+		}
+	}
+
+	private void findMatchingWords(int cursorPosition, String prefix, String[] words, int kind, IHQLCompletionRequestor hcc) {
+		int i = Arrays.binarySearch(words, prefix.toLowerCase());
+		if(i<0) {
+			i = Math.abs(i+1);
+		}
+
+		for (int cnt = i; cnt < words.length; cnt++) {
+			String word = words[cnt];
+			if(word.toLowerCase().startsWith(prefix.toLowerCase())) {
+				HQLCompletionProposal proposal = createStartWithCompletionProposal( prefix, cursorPosition, kind, word );
+				hcc.accept( proposal);
+			}
+			else {
+				break;
+			}
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/EntityNameReference.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/EntityNameReference.java
new file mode 100644
index 000000000000..e43c132c6d5a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/EntityNameReference.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+/**
+ * Class that represents an alias to some entityname in a HQL statement. e.g. "Product as p" or "Product p"
+ *
+ * Should not be used by external clients.
+ *
+ * @author leon, Max Rydahl Andersen
+ */
+public class EntityNameReference {
+
+	private String alias;
+
+	private String entityName;
+
+	public EntityNameReference(String type, String alias) {
+		this.entityName = type;
+		this.alias = alias;
+	}
+
+	/**
+	 *
+	 * @return The alias, the "p" in "Product as p"
+	 */
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 *
+	 * @return the entityname, the "Product" in "Product as b"
+	 */
+	public String getEntityName() {
+		return entityName;
+	}
+
+	public String toString() {
+		return alias + ":" + entityName;
+	}
+
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLAnalyzer.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLAnalyzer.java
new file mode 100644
index 000000000000..c5d99ebd5d42
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLAnalyzer.java
@@ -0,0 +1,252 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hibernate.grammars.hql.HqlLexer;
+
+/**
+ * The HQLAnalyzer can answer certain questions about a HQL String.
+ *
+ * @author leon, max.andersen@jboss.com
+ */
+public class HQLAnalyzer {
+
+	/** Defines the HQL keywords. Based on hql.g antlr grammer in 2005 ;) */
+	private static final String[] hqlKeywords = { "between", "class", "delete",
+			"desc", "distinct", "elements", "escape", "exists", "false",
+			"fetch", "from", "full", "group", "having", "in", "indices",
+			"inner", "insert", "into", "is", "join", "left", "like", "new",
+			"not", "null", "or", "order", "outer", "properties", "right",
+			"select", "set", "some", "true", "union", "update", "versioned",
+			"where", "and", "or", "as","on", "with",
+
+			// -- SQL tokens --
+			// These aren't part of HQL, but recognized by the lexer. Could be
+			// usefull for having SQL in the editor..but for now we keep them out
+			// "case", "end", "else", "then", "when",
+
+
+			// -- EJBQL tokens --
+			"both", "empty", "leading", "member", "object", "of", "trailing",
+	};
+
+
+	/**
+	 * built-in function names. Various normal builtin functions in SQL/HQL.
+	 * Maybe sShould try and do this dynamically based on dialect or
+	 * sqlfunctionregistry
+	 */
+	private static final String[] builtInFunctions = {
+			// standard sql92 functions
+			"substring", "locate", "trim", "length", "bit_length", "coalesce",
+			"nullif", "abs", "mod", "sqrt",
+			"upper",
+			"lower",
+			"cast",
+			"extract",
+
+			// time functions mapped to ansi extract
+			"second", "minute", "hour", "day",
+			"month",
+			"year",
+
+			"str",
+
+			// misc functions - based on oracle dialect
+			"sign", "acos", "asin", "atan", "cos", "cosh", "exp", "ln", "sin",
+			"sinh", "stddev", "sqrt", "tan", "tanh", "variance",
+
+			"round", "trunc", "ceil", "floor",
+
+			"chr", "initcap", "lower", "ltrim", "rtrim", "soundex", "upper",
+			"ascii", "length", "to_char", "to_date",
+
+			"current_date", "current_time", "current_timestamp", "lastday",
+			"sysday", "systimestamp", "uid", "user",
+
+			"rowid", "rownum",
+
+			"concat", "instr", "instrb", "lpad", "replace", "rpad", "substr",
+			"substrb", "translate",
+
+			"substring", "locate", "bit_length", "coalesce",
+
+			"atan2", "log", "mod", "nvl", "nvl2", "power",
+
+			"add_months", "months_between", "next_day",
+
+			"max", "min", };
+
+	static {
+		// to allow binary search
+		Arrays.sort(builtInFunctions);
+		Arrays.sort(hqlKeywords);
+	}
+
+	protected SimpleHQLLexer getLexer(char[] chars) {
+		return new AntlrSimpleHQLLexer(chars);
+	}
+
+	/**
+	 * Returns true if the position is at a location where an entityname makes sense.
+	 * e.g. "from Pr| where x"
+	 */
+	public boolean shouldShowEntityNames(String query, int cursorPosition) {
+		return shouldShowEntityNames( query.toCharArray(), cursorPosition );
+	}
+
+	public boolean shouldShowEntityNames(char[] chars, int cursorPosition) {
+		SimpleHQLLexer lexer = getLexer( chars);
+		int tokenId;
+		boolean show = false;
+		while ((tokenId = lexer.nextTokenId()) != HqlLexer.EOF) {
+			if ((tokenId == HqlLexer.FROM ||
+				tokenId == HqlLexer.DELETE ||
+				tokenId == HqlLexer.UPDATE) &&
+				(lexer.getTokenOffset() + lexer.getTokenLength()) < cursorPosition) {
+				show = true;
+			}
+			else if (tokenId != HqlLexer.DOT && tokenId != HqlLexer.AS && tokenId != HqlLexer.COMMA && tokenId != HqlLexer.IDENTIFIER && tokenId != HqlLexer.WS) {
+				show = false;
+			}
+		}
+		return show;
+	}
+
+	public List<SubQuery> getVisibleSubQueries(char[] chars, int position) {
+		SubQueryList sqList = getSubQueries(chars, position);
+		List<SubQuery> visible = new ArrayList<>();
+		for (SubQuery sq : sqList.subQueries) {
+			if (sqList.caretDepth >= sq.depth && (sq.startOffset <= position || sq.endOffset >= position)) {
+				visible.add(sq);
+			}
+		}
+		return visible;
+	}
+
+	public List<EntityNameReference> getVisibleEntityNames(char[] chars, int position) {
+		List<SubQuery> sqs = getVisibleSubQueries(chars, position);
+		List<EntityNameReference> entityReferences = new ArrayList<>();
+		for (SubQuery sq : sqs) {
+			entityReferences.addAll(sq.getEntityNames());
+		}
+		return entityReferences;
+	}
+
+	public SubQueryList getSubQueries(char[] query, int position) {
+		SimpleHQLLexer syntax = getLexer( query );
+		int numericId;
+		List<SubQuery> subQueries = new ArrayList<>();
+		int depth = 0;
+		int caretDepth = 0;
+		Map<Integer, SubQuery> level2SubQuery = new HashMap<>();
+		SubQuery current = null;
+		while ((numericId = syntax.nextTokenId()) != HqlLexer.EOF) {
+			boolean tokenAdded = false;
+			if (numericId == HqlLexer.LEFT_PAREN) {
+				depth++;
+				if (position > syntax.getTokenOffset()) {
+					caretDepth = depth;
+				}
+			}
+			else if (numericId == HqlLexer.RIGHT_PAREN) {
+				SubQuery currentDepthQuery = level2SubQuery.get(depth);
+				// We check if we have a query on the current depth.
+				// If yes, we'll have to close it
+				if (currentDepthQuery != null && currentDepthQuery.depth == depth) {
+					currentDepthQuery.endOffset = syntax.getTokenOffset();
+					currentDepthQuery.tokenIds.add(numericId);
+					currentDepthQuery.tokenText.add(String.valueOf(query, syntax.getTokenOffset(), syntax.getTokenLength()));
+					subQueries.add(currentDepthQuery);
+					level2SubQuery.remove(depth);
+					tokenAdded = true;
+				}
+				depth--;
+				if (position > syntax.getTokenOffset()) {
+					caretDepth = depth;
+				}
+			}
+			switch (numericId) {
+				case HqlLexer.FROM:
+				case HqlLexer.UPDATE:
+				case HqlLexer.DELETE:
+				case HqlLexer.SELECT:
+					if (!level2SubQuery.containsKey(depth)) {
+						current = new SubQuery();
+						current.depth = depth;
+						current.startOffset = syntax.getTokenOffset();
+						level2SubQuery.put(depth, current);
+					}
+					if (current != null) {
+						current.tokenIds.add(numericId);
+						current.tokenText.add(String.valueOf(query, syntax.getTokenOffset(), syntax.getTokenLength()));
+						break;
+					}
+				default:
+					if (!tokenAdded) {
+						SubQuery sq = level2SubQuery.get(depth);
+						int i = depth;
+						while (sq == null && i >= 0) {
+							sq = level2SubQuery.get(i--);
+						}
+						if (sq != null) {
+							sq.tokenIds.add(numericId);
+							sq.tokenText.add(String.valueOf(query, syntax.getTokenOffset(), syntax.getTokenLength()));
+						}
+					}
+			}
+		}
+		for (SubQuery sq : level2SubQuery.values()) {
+			sq.endOffset = syntax.getTokenOffset() + syntax.getTokenLength();
+			subQueries.add(sq);
+		}
+		Collections.sort(subQueries);
+		SubQueryList sql = new SubQueryList();
+		sql.caretDepth = caretDepth;
+		sql.subQueries = subQueries;
+		return sql;
+	}
+
+
+	/** Returns reference name found from position and backwards in the array.
+	 **/
+	public static String getEntityNamePrefix(char[] chars, int position) {
+		StringBuilder buff = new StringBuilder();
+		for (int i = position - 1; i >= 0; i--) {
+			char c = chars[i];
+			if (c == '.' || Character.isJavaIdentifierPart(c)) {
+				buff.insert(0, c);
+			}
+			else {
+				break;
+			}
+		}
+		return buff.toString();
+	}
+
+	public static class SubQueryList {
+
+		int caretDepth;
+
+		public List<SubQuery> subQueries;
+	}
+
+
+	static String[] getHQLKeywords() {
+		return hqlKeywords;
+	}
+
+	static String[] getHQLFunctionNames() {
+		return builtInFunctions;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLCodeAssist.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLCodeAssist.java
new file mode 100644
index 000000000000..3d57a13e0aef
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLCodeAssist.java
@@ -0,0 +1,121 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.hibernate.boot.Metadata;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class HQLCodeAssist implements IHQLCodeAssist {
+
+	private final ConfigurationCompletion completion;
+	private final Metadata metadata;
+
+	private static final char[] charSeparators;
+
+	static {
+		charSeparators = new char[]{',', '(', ')'};
+		Arrays.sort(charSeparators);
+	}
+
+	public HQLCodeAssist(Metadata metadata) {
+		this.metadata = metadata;
+		this.completion = new ConfigurationCompletion(metadata);
+	}
+
+	public void codeComplete(String query, int position, IHQLCompletionRequestor collector) {
+
+		int prefixStart = findNearestWhiteSpace(query, position);
+		String prefix = query.substring( prefixStart, position );
+
+		boolean showEntityNames;
+		try {
+			showEntityNames = new HQLAnalyzer().shouldShowEntityNames( query, position );
+
+		if(showEntityNames) {
+			if(hasMetadata()) {
+				completion.getMatchingImports( prefix, position, collector );
+			}
+			else {
+				collector.completionFailure("Configuration not available nor open");
+			}
+		}
+		else {
+			List<EntityNameReference> visible = new HQLAnalyzer().getVisibleEntityNames( query.toCharArray(), position );
+			int dotIndex = prefix.lastIndexOf(".");
+			if (dotIndex == -1) {
+				// It's a simple path, not a dot separated one (find aliases that matches)
+				for ( EntityNameReference qt : visible ) {
+					String alias = qt.getAlias();
+					if ( alias.startsWith( prefix ) ) {
+						HQLCompletionProposal completionProposal = new HQLCompletionProposal(
+								HQLCompletionProposal.ALIAS_REF, position );
+						completionProposal.setCompletion( alias.substring( prefix.length() ) );
+						completionProposal.setReplaceStart( position );
+						completionProposal.setReplaceEnd( position );
+						completionProposal.setSimpleName( alias );
+						completionProposal.setShortEntityName( qt.getEntityName() );
+						if ( hasMetadata() ) {
+							String importedName = metadata.getImports().get( qt.getEntityName() );
+							completionProposal.setEntityName( importedName );
+						}
+						collector.accept( completionProposal );
+					}
+				}
+			}
+			else {
+				if(hasMetadata()) {
+					String path = CompletionHelper.getCanonicalPath(visible, prefix.substring(0, dotIndex));
+					String propertyPrefix = prefix.substring(dotIndex + 1);
+					completion.getMatchingProperties( path, propertyPrefix, position, collector );
+				}
+				else {
+					collector.completionFailure("Configuration not available nor open");
+				}
+			}
+
+			completion.getMatchingFunctions( prefix, position, collector );
+			completion.getMatchingKeywords( prefix, position, collector );
+
+
+		}
+		}
+		catch(SimpleLexerException sle) {
+			collector.completionFailure( "Syntax error: " + sle.getMessage() );
+		}
+
+	}
+
+	private boolean hasMetadata() {
+		return metadata!=null;
+	}
+
+	public static int findNearestWhiteSpace( CharSequence doc, int start ) {
+		boolean loop = true;
+
+		int offset;
+
+		int tmpOffset = start - 1;
+		while (loop && tmpOffset >= 0) {
+			char c = doc.charAt(tmpOffset);
+			if(isWhitespace(c)) {
+				loop = false;
+			}
+			else {
+				tmpOffset--;
+			}
+		}
+		offset = tmpOffset + 1;
+
+		return offset;
+	}
+
+	private static boolean isWhitespace(char c) {
+		return Arrays.binarySearch(charSeparators, c) >= 0
+				|| Character.isWhitespace(c);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLCompletionProposal.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLCompletionProposal.java
new file mode 100644
index 000000000000..5d9349873eaf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/HQLCompletionProposal.java
@@ -0,0 +1,204 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.hibernate.mapping.Property;
+
+
+
+public class HQLCompletionProposal {
+
+	static final char[] NO_CHAR = new char[0];
+
+	public static final int ENTITY_NAME = 1;
+	public static final int PROPERTY = 2;
+	public static final int KEYWORD = 3;
+	public static final int FUNCTION = 4;
+	public static final int ALIAS_REF = 5; // ref to an alias name, e.g. "bar" in "from Bar as bar where b|"
+
+	protected static final int FIRST_KIND = ENTITY_NAME;
+	protected static final int LAST_KIND = ALIAS_REF;
+
+	/**
+	 * kind of completion request.
+	 */
+	private int completionKind;
+
+	/**
+	 * original cursorposition in the query
+	 */
+	private int completionLocation;
+
+	/**
+	 * The actual completion.
+	 */
+	private String completion = "";
+
+	private int replaceStart = 0;
+	private int replaceEnd = 0;
+
+	/**
+	 * Relevance rating
+	 */
+	private int relevance = 1;
+
+	/** The default name for the entityname, keyword, property etc. */
+	private String simpleName = "";
+
+	/** The full related entity name, the resolved shortEntityName. Can be null */
+	private String entityName = null;
+
+	/**
+	 * A short entity name. e.g. the imported name.
+	 * e.g. "Product" instead of "org.hibernate.model.Product"
+	 * (note: a imported name can also be the long version)
+	 **/
+	private String shortEntityName = null;
+
+	/**
+	 * The propertyName, can be null.
+	 */
+	private String propertyName = null;
+
+	/**
+	 * The underlying property. Can be null.
+	 */
+	private Property property;
+
+	public String getCompletion() {
+		return completion;
+	}
+
+	public void setCompletion(String completion) {
+		this.completion = completion;
+	}
+
+	public int getCompletionKind() {
+		return completionKind;
+	}
+
+	public void setCompletionKind(int completionKind) {
+		this.completionKind = completionKind;
+	}
+
+	public int getCompletionLocation() {
+		return completionLocation;
+	}
+
+	public void setCompletionLocation(int completionLocation) {
+		this.completionLocation = completionLocation;
+	}
+
+	public int getRelevance() {
+		return relevance;
+	}
+
+	public void setRelevance(int relevance) {
+		this.relevance = relevance;
+	}
+
+	public int getReplaceEnd() {
+		return replaceEnd;
+	}
+
+	public void setReplaceEnd(int replaceEnd) {
+		this.replaceEnd = replaceEnd;
+	}
+
+	public int getReplaceStart() {
+		return replaceStart;
+	}
+
+	public void setReplaceStart(int replaceStart) {
+		this.replaceStart = replaceStart;
+	}
+
+	public HQLCompletionProposal(int kind, int cursorPosition) {
+		this.completionKind = kind;
+		this.completionLocation = cursorPosition;
+	}
+
+	public String getSimpleName() {
+		return simpleName;
+	}
+
+	public void setSimpleName(String simpleName) {
+		this.simpleName = simpleName;
+	}
+
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append('[');
+		switch(this.completionKind) {
+			case ENTITY_NAME :
+				buffer.append("ENTITY_NAME");
+				break;
+			case PROPERTY:
+				buffer.append("PROPERTY");
+				break;
+			case KEYWORD:
+				buffer.append("KEYWORD");
+				break;
+			default :
+				buffer.append("<Unknown type>");
+				break;
+
+		}
+		buffer.append("]{completion:"); //$NON-NLS-1$
+		if (this.completion != null) buffer.append(this.completion);
+		buffer.append(", simpleName:"); //$NON-NLS-1$
+		if (this.simpleName != null) buffer.append(this.simpleName);
+		buffer.append(", ["); //$NON-NLS-1$
+		buffer.append(this.replaceStart);
+		buffer.append(',');
+		buffer.append(this.replaceEnd);
+		buffer.append("], relevance="); //$NON-NLS-1$
+		buffer.append(this.relevance);
+		buffer.append('}');
+		return buffer.toString();
+	}
+
+	public String getEntityName() {
+		return entityName;
+	}
+
+	public void setEntityName(String entityName) {
+		this.entityName = entityName;
+	}
+
+	public String getShortEntityName() {
+		return shortEntityName;
+	}
+
+	public void setShortEntityName(String shortEntityName) {
+		this.shortEntityName = shortEntityName;
+	}
+
+	public String getPropertyName() {
+		return propertyName;
+	}
+
+	public void setPropertyName(String propertyName) {
+		this.propertyName = propertyName;
+	}
+
+	public void setProperty(Property element) {
+		this.property = element;
+	}
+
+	public Property getProperty() {
+		return property;
+	}
+
+
+	public int aliasRefKind() { return ALIAS_REF; }
+	public int entityNameKind() { return ENTITY_NAME; }
+	public int propertyKind() { return PROPERTY; }
+	public int keywordKind() { return KEYWORD; }
+	public int functionKind() { return FUNCTION; }
+
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/IHQLCodeAssist.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/IHQLCodeAssist.java
new file mode 100644
index 000000000000..b840647f186b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/IHQLCodeAssist.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+/**
+ * Interface for code assist on HQL strings.
+ *
+ * @author Max Rydahl Andersen
+ *
+ */
+public interface IHQLCodeAssist {
+
+	/**
+	 *
+	 * @param query the query string (full or partial)
+	 * @param position the cursor position inside the query string
+	 * @param requestor requestor on which the codeassist will call methods with information about proposals.
+	 */
+	void codeComplete(String query, int position, IHQLCompletionRequestor requestor);
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/IHQLCompletionRequestor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/IHQLCompletionRequestor.java
new file mode 100644
index 000000000000..405fa228ea36
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/IHQLCompletionRequestor.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+
+/**
+ * The interface to implement to collect completion proposals.
+ *
+ * @author Max Rydahl Andersen
+ *
+ */
+public interface IHQLCompletionRequestor {
+
+	boolean accept(HQLCompletionProposal proposal);
+
+	void completionFailure(String errorMessage);
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/SimpleHQLLexer.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/SimpleHQLLexer.java
new file mode 100644
index 000000000000..1138b540ed6f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/SimpleHQLLexer.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+/**
+ * Minimal lexer interface that allows HqlAnalyzer to work.
+ *
+ * @author Max Rydahl Andersen
+ */
+public interface SimpleHQLLexer {
+
+
+	int nextTokenId() throws SimpleLexerException;
+
+	int getTokenOffset();
+
+	int getTokenLength();
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/SimpleLexerException.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/SimpleLexerException.java
new file mode 100644
index 000000000000..df20a9665872
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/SimpleLexerException.java
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import java.io.ObjectStreamClass;
+
+/**
+ * Exception that can be thrown when the lexer encounters errors (such as syntax errors etc.)
+ *
+ * @author Max Rydahl Andersen
+ *
+ */
+public class SimpleLexerException extends RuntimeException {
+
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(SimpleLexerException.class).getSerialVersionUID();
+
+	public SimpleLexerException() {
+		super();
+	}
+
+	public SimpleLexerException(String message, Throwable cause) {
+		super( message, cause );
+	}
+
+	public SimpleLexerException(String message) {
+		super( message );
+	}
+
+	public SimpleLexerException(Throwable cause) {
+		super( cause );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/SubQuery.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/SubQuery.java
new file mode 100644
index 000000000000..3c7fd2718161
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/ide/completion/SubQuery.java
@@ -0,0 +1,157 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.hibernate.grammars.hql.HqlLexer;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+public class SubQuery implements Comparable<SubQuery> {
+
+	public int compareTo(SubQuery s) {
+		return startOffset - s.startOffset;
+	}
+
+	public boolean equals(Object s) {
+		if (!(s instanceof SubQuery)) return false;
+		return startOffset == ((SubQuery)s).startOffset;
+	}
+
+	public int hashCode() {
+		return startOffset;
+	}
+
+	List<Integer> tokenIds = new ArrayList<>();
+
+	List<String> tokenText = new ArrayList<>();
+
+	int startOffset;
+
+	int endOffset;
+
+	int depth;
+
+	public int getTokenCount() {
+		return tokenIds.size();
+	}
+
+	public int getToken(int i) {
+		return tokenIds.get(i);
+	}
+
+	public String getTokenText(int i) {
+		return tokenText.get(i);
+	}
+
+	public List<EntityNameReference> getEntityNames() {
+		boolean afterFrom = false;
+		boolean afterJoin = false;
+		StringBuffer tableNames = new StringBuffer();
+		StringBuffer joins = new StringBuffer();
+		int i = 0;
+		boolean cont = true;
+		int lastToken = HqlLexer.EOF;
+		for ( Integer typeInteger : tokenIds ) {
+			int type = typeInteger;
+			if ( !cont ) {
+				break;
+			}
+			if ( !afterFrom &&
+				(type == HqlLexer.FROM ||
+				type == HqlLexer.UPDATE ||
+				type == HqlLexer.DELETE) ) {
+				afterFrom = true;
+			}
+			else if ( afterJoin ) {
+				switch ( type ) {
+					case HqlLexer.ORDER:
+					case HqlLexer.WHERE:
+					case HqlLexer.GROUP:
+					case HqlLexer.HAVING:
+						cont = false;
+						break;
+					case HqlLexer.INNER:
+					case HqlLexer.OUTER:
+					case HqlLexer.LEFT:
+					case HqlLexer.RIGHT:
+					case HqlLexer.JOIN:
+						joins.append( "," );
+						break;
+					case HqlLexer.COMMA:
+						joins.append(
+								"," ); //TODO: we should detect this and create the list directly instead of relying on the tokenizer
+						break;
+					case HqlLexer.DOT:
+						joins.append( "." );
+						break;
+					case HqlLexer.IDENTIFIER:
+						if ( lastToken != HqlLexer.DOT ) {
+							joins.append( " " );
+						}
+						joins.append( tokenText.get( i ) );
+						break;
+				}
+			}
+			else if ( afterFrom ) {
+				switch ( type ) {
+					case HqlLexer.ORDER:
+					case HqlLexer.WHERE:
+					case HqlLexer.GROUP:
+					case HqlLexer.HAVING:
+					case HqlLexer.SET:
+						cont = false;
+						break;
+					case HqlLexer.COMMA:
+						tableNames.append(
+								"," ); //TODO: we should detect this and create the list directly instead of relying on the tokenizer
+						break;
+					case HqlLexer.DOT:
+						tableNames.append( "." );
+						break;
+					case HqlLexer.IDENTIFIER:
+						if ( lastToken != HqlLexer.DOT ) {
+							tableNames.append( " " );
+						}
+						tableNames.append( tokenText.get( i ) );
+						break;
+					case HqlLexer.JOIN:
+						tableNames.append( "," );
+						afterJoin = true;
+						break;
+					default:
+						break;
+				}
+			}
+			i++;
+			lastToken = type;
+		}
+		List<EntityNameReference> tables = new ArrayList<>();
+		addEntityReferences(tables, tableNames);
+		addEntityReferences(tables, joins);
+		return tables;
+	}
+
+	private void addEntityReferences(final List<EntityNameReference> tables, final StringBuffer tableNames) {
+		StringTokenizer tableTokenizer = new StringTokenizer(tableNames.toString(), ",");
+		while (tableTokenizer.hasMoreTokens()) {
+			String table = tableTokenizer.nextToken().trim();
+			if (table.indexOf(' ') == -1 && !table.isEmpty() ) {
+				tables.add(new EntityNameReference(table, table));
+			}
+			else {
+				StringTokenizer aliasTokenizer = new StringTokenizer(table, " ");
+				if (aliasTokenizer.countTokens() >= 2) {
+					String type = aliasTokenizer.nextToken().trim();
+					String alias = aliasTokenizer.nextToken().trim();
+					if ( !type.isEmpty() && !alias.isEmpty() ) {
+						tables.add(new EntityNameReference(type, alias));
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/RevengMetadataBuilder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/RevengMetadataBuilder.java
new file mode 100644
index 000000000000..0952a2378280
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/RevengMetadataBuilder.java
@@ -0,0 +1,141 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core;
+
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.internal.BootstrapContextImpl;
+import org.hibernate.boot.internal.InFlightMetadataCollectorImpl;
+import org.hibernate.boot.internal.MetadataBuilderImpl.MetadataBuildingOptionsImpl;
+import org.hibernate.boot.internal.MetadataBuildingContextRootImpl;
+import org.hibernate.boot.internal.MetadataImpl;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.BootstrapContext;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.boot.spi.MetadataBuildingOptions;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengDialectFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.internal.core.binder.BinderContext;
+import org.hibernate.tool.reveng.internal.core.binder.RootClassBinder;
+import org.hibernate.tool.reveng.internal.core.reader.DatabaseReader;
+import org.jboss.logging.Logger;
+
+import java.util.Properties;
+
+
+/**
+ * @author max
+ * @author koen
+ */
+public class RevengMetadataBuilder {
+
+
+	public static RevengMetadataBuilder create(
+			Properties properties,
+			RevengStrategy reverseEngineeringStrategy) {
+		return new RevengMetadataBuilder(properties, reverseEngineeringStrategy);
+	}
+
+	private static final Logger LOGGER = Logger.getLogger(RevengMetadataBuilder.class);
+
+	private final Properties properties;
+	private final MetadataBuildingContext metadataBuildingContext;
+	private final InFlightMetadataCollectorImpl metadataCollector;
+	private final RevengStrategy revengStrategy;
+	private final BinderContext binderContext;
+
+	private final StandardServiceRegistry serviceRegistry;
+
+	private RevengMetadataBuilder(
+			Properties properties,
+			RevengStrategy reverseEngineeringStrategy) {
+		this.properties = properties;
+		this.revengStrategy = reverseEngineeringStrategy;
+		this.serviceRegistry = new StandardServiceRegistryBuilder()
+				.applySettings(properties)
+				.build();
+		MetadataBuildingOptionsImpl metadataBuildingOptions =
+				new MetadataBuildingOptionsImpl(serviceRegistry);
+		BootstrapContextImpl bootstrapContext = new BootstrapContextImpl(
+				serviceRegistry,
+				metadataBuildingOptions);
+		metadataBuildingOptions.setBootstrapContext(bootstrapContext);
+		this.metadataCollector =
+				new InFlightMetadataCollectorImpl(
+						bootstrapContext,
+						metadataBuildingOptions);
+		handleTypes(bootstrapContext, metadataBuildingOptions);
+		this.metadataBuildingContext = new MetadataBuildingContextRootImpl(
+				"tools",
+				bootstrapContext,
+				metadataBuildingOptions,
+				metadataCollector,
+				null);
+		this.binderContext = BinderContext
+				.create(
+						metadataBuildingContext,
+						metadataCollector,
+						reverseEngineeringStrategy,
+						properties);
+	}
+
+	public Metadata build() {
+		Metadata result = createMetadata();
+		createPersistentClasses(readFromDatabase());
+		return result;
+	}
+
+	private MetadataImpl createMetadata() {
+		MetadataImpl result = metadataCollector.buildMetadataInstance(metadataBuildingContext);
+		result.getTypeConfiguration().scope(metadataBuildingContext);
+		return result;
+	}
+
+	private RevengMetadataCollector readFromDatabase() {
+		RevengDialect mdd = RevengDialectFactory
+				.createMetaDataDialect(
+						serviceRegistry.getService(JdbcServices.class).getDialect(),
+						properties );
+		DatabaseReader reader = DatabaseReader.create(properties,revengStrategy,mdd, serviceRegistry);
+		RevengMetadataCollector revengMetadataCollector = new RevengMetadataCollector(metadataBuildingContext);
+		reader.readDatabaseSchema(revengMetadataCollector);
+		return revengMetadataCollector;
+	}
+
+	// TODO: this naively just create an entity per table
+	// should have an opt-out option to mark some as helper tables, subclasses etc.
+	/*if(table.getPrimaryKey()==null || table.getPrimaryKey().getColumnSpan()==0) {
+		log.warn("Cannot create persistent class for " + table + " as no primary key was found.");
+		continue;
+		// TODO: just create one big embedded composite id instead.
+	}*/
+	private void createPersistentClasses(RevengMetadataCollector revengMetadataCollector) {
+		RootClassBinder rootClassBinder = RootClassBinder.create(binderContext);
+		for (Table table : metadataCollector.collectTableMappings()) {
+			if(table.getColumnSpan()==0) {
+				LOGGER.warn("Cannot create persistent class for " + table + " as no columns were found.");
+				continue;
+			}
+			if(revengStrategy.isManyToManyTable(table)) {
+				LOGGER.debug( "Ignoring " + table + " as class since rev.eng. says it is a many-to-many" );
+				continue;
+			}
+			rootClassBinder.bind(table, revengMetadataCollector);
+		}
+		metadataCollector.processSecondPasses(metadataBuildingContext);
+	}
+
+
+	private static void handleTypes(BootstrapContext bootstrapContext, MetadataBuildingOptions options) {
+		Dialect dialect = options.getServiceRegistry().getService( JdbcServices.class ).getDialect();
+		dialect.contributeTypes( () -> bootstrapContext.getTypeConfiguration(), options.getServiceRegistry() );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/RevengMetadataCollector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/RevengMetadataCollector.java
new file mode 100644
index 000000000000..b58d9fa381cf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/RevengMetadataCollector.java
@@ -0,0 +1,104 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core;
+
+import org.hibernate.boot.spi.InFlightMetadataCollector;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class RevengMetadataCollector {
+
+	private MetadataBuildingContext metadataBuildingContext = null;
+	private final Map<TableIdentifier, Table> tables;
+	private Map<String, List<ForeignKey>> oneToManyCandidates;
+	private final Map<TableIdentifier, String> suggestedIdentifierStrategies;
+
+	public RevengMetadataCollector(MetadataBuildingContext metadataBuildingContext) {
+		this();
+		this.metadataBuildingContext = metadataBuildingContext;
+	}
+
+	public RevengMetadataCollector() {
+		this.tables = new HashMap<>();
+		this.suggestedIdentifierStrategies = new HashMap<>();
+	}
+
+	public Iterator<Table> iterateTables() {
+		return tables.values().iterator();
+	}
+
+	// TableIdentifier's catalog, schema and name should be quoted
+	public Table addTable(TableIdentifier tableIdentifier) {
+		Table result;
+		String catalog = tableIdentifier.getCatalog();
+		String schema = tableIdentifier.getSchema();
+		String name = tableIdentifier.getName();
+		InFlightMetadataCollector metadataCollector = getMetadataCollector();
+		if (metadataCollector != null) {
+			result = metadataCollector.addTable(schema, catalog, name, null, false, metadataBuildingContext, false);
+		}
+		else {
+			result = createTable(catalog, schema, name);
+		}
+		if (tables.containsKey(tableIdentifier)) {
+			throw new RuntimeException(
+					"Attempt to add a double entry for table: " +
+					TableNameQualifier.qualify(catalog, schema, name));
+		}
+		tables.put(tableIdentifier, result);
+		return result;
+	}
+
+	public Table getTable(TableIdentifier tableIdentifier) {
+		return tables.get(tableIdentifier);
+	}
+
+	public Collection<Table> getTables() {
+		return tables.values();
+	}
+
+	public void setOneToManyCandidates(Map<String, List<ForeignKey>> oneToManyCandidates) {
+		this.oneToManyCandidates = oneToManyCandidates;
+	}
+
+	public Map<String, List<ForeignKey>> getOneToManyCandidates() {
+		return oneToManyCandidates;
+	}
+
+	public String getSuggestedIdentifierStrategy(String catalog, String schema, String name) {
+		return suggestedIdentifierStrategies.get(TableIdentifier.create(catalog, schema, name));
+	}
+
+	public void addSuggestedIdentifierStrategy(String catalog, String schema, String name, String idstrategy) {
+		suggestedIdentifierStrategies.put(TableIdentifier.create(catalog, schema, name), idstrategy);
+	}
+
+	private Table createTable(String catalog, String schema, String name) {
+		Table table = new Table("Hibernate Tools");
+		table.setAbstract(false);
+		table.setName(name);
+		table.setSchema(schema);
+		table.setCatalog(catalog);
+		return table;
+	}
+
+	private InFlightMetadataCollector getMetadataCollector() {
+		InFlightMetadataCollector result = null;
+		if (metadataBuildingContext != null) {
+			result = metadataBuildingContext.getMetadataCollector();
+		}
+		return result;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/AbstractBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/AbstractBinder.java
new file mode 100644
index 000000000000..609319a6f345
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/AbstractBinder.java
@@ -0,0 +1,45 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.boot.spi.InFlightMetadataCollector;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.metadata.MetadataConstants;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+
+abstract class AbstractBinder {
+
+	final BinderContext binderContext;
+
+	AbstractBinder(BinderContext binderContext) {
+		this.binderContext = binderContext;
+	}
+
+	MetadataBuildingContext getMetadataBuildingContext() {
+		return binderContext.metadataBuildingContext;
+	}
+
+	InFlightMetadataCollector getMetadataCollector() {
+		return binderContext.metadataCollector;
+	}
+
+	RevengStrategy getRevengStrategy() {
+		return binderContext.revengStrategy;
+	}
+
+	String getDefaultCatalog() {
+		return binderContext.properties.getProperty(AvailableSettings.DEFAULT_CATALOG);
+	}
+
+	String getDefaultSchema() {
+		return binderContext.properties.getProperty(AvailableSettings.DEFAULT_SCHEMA);
+	}
+
+	Boolean preferBasicCompositeIds() {
+		return (Boolean)binderContext.properties.get(MetadataConstants.PREFER_BASIC_COMPOSITE_IDS);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BasicPropertyBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BasicPropertyBinder.java
new file mode 100644
index 000000000000..0ffe96b40d6c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BasicPropertyBinder.java
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.internal.core.util.RevengUtils;
+
+class BasicPropertyBinder extends AbstractBinder {
+
+	static BasicPropertyBinder create(BinderContext binderContext) {
+		return new BasicPropertyBinder(binderContext);
+	}
+
+	private final BasicValueBinder simpleValueBinder;
+	private final PropertyBinder propertyBinder;
+
+	private BasicPropertyBinder(BinderContext binderContext) {
+		super(binderContext);
+		simpleValueBinder = BasicValueBinder.create(binderContext);
+		propertyBinder = PropertyBinder.create(binderContext);
+	}
+
+
+	Property bind(String propertyName, Table table, Column column) {
+		return propertyBinder.bind(
+				table,
+				propertyName,
+				simpleValueBinder.bind(table, column, false),
+				RevengUtils.createAssociationInfo(null, null, true, true));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BasicValueBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BasicValueBinder.java
new file mode 100644
index 000000000000..8f0d7d339202
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BasicValueBinder.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedBasicValue;
+
+class BasicValueBinder extends AbstractBinder {
+
+	static BasicValueBinder create(BinderContext binderContext) {
+		return new BasicValueBinder(binderContext);
+	}
+
+	private BasicValueBinder(BinderContext binderContext) {
+		super(binderContext);
+	}
+
+	EnhancedBasicValue bind(
+			Table table,
+			Column column,
+			boolean generatedIdentifier) {
+		EnhancedBasicValue value = new EnhancedBasicValue(getMetadataBuildingContext(), table);
+		value.addColumn(column);
+		value.setTypeName(TypeUtils.determinePreferredType(
+				getMetadataCollector(),
+				getRevengStrategy(),
+				table,
+				column,
+				generatedIdentifier));
+		if (generatedIdentifier) {
+			value.setNullValue("undefined");
+		}
+		return value;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BinderContext.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BinderContext.java
new file mode 100644
index 000000000000..dab45cbf2e76
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BinderContext.java
@@ -0,0 +1,43 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.boot.spi.InFlightMetadataCollector;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+
+import java.util.Properties;
+
+public class BinderContext {
+
+	public static BinderContext create(
+			MetadataBuildingContext metadataBuildingContext,
+			InFlightMetadataCollector metadataCollector,
+			RevengStrategy revengStrategy,
+			Properties properties) {
+		return new BinderContext(
+				metadataBuildingContext,
+				metadataCollector,
+				revengStrategy,
+				properties);
+	}
+
+	public final MetadataBuildingContext metadataBuildingContext;
+	public final InFlightMetadataCollector metadataCollector;
+	public final RevengStrategy revengStrategy;
+	public final Properties properties;
+
+	private BinderContext(
+			MetadataBuildingContext metadataBuildingContext,
+			InFlightMetadataCollector metadataCollector,
+			RevengStrategy revengStrategy,
+			Properties properties) {
+		this.metadataBuildingContext = metadataBuildingContext;
+		this.metadataCollector = metadataCollector;
+		this.revengStrategy = revengStrategy;
+		this.properties = properties;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BinderUtils.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BinderUtils.java
new file mode 100644
index 000000000000..92c1e7b8a9a2
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/BinderUtils.java
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.FetchMode;
+import org.hibernate.internal.util.collections.JoinedList;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.Fetchable;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.tool.reveng.api.core.AssociationInfo;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class BinderUtils {
+
+	public static Logger LOGGER = Logger.getLogger(BinderUtils.class.getName());
+
+	public static String makeUnique(
+			Iterator<Property> props,
+			String originalPropertyName) {
+		int cnt = 0;
+		String propertyName = originalPropertyName;
+		Set<String> uniqueNames = new HashSet<>();
+		while ( props.hasNext() ) {
+			Property element = props.next();
+			uniqueNames.add( element.getName() );
+		}
+		while( uniqueNames.contains(propertyName) ) {
+			cnt++;
+			propertyName = originalPropertyName + "_" + cnt;
+		}
+		return propertyName;
+	}
+
+	public static String makeUnique(PersistentClass clazz, String propertyName) {
+		List<Property> list = new ArrayList<>();
+		if( clazz.hasIdentifierProperty() ) {
+			list.add( clazz.getIdentifierProperty() );
+		}
+		if( clazz.isVersioned() ) {
+			list.add( clazz.getVersion() );
+		}
+	JoinedList<Property> joinedList =
+			new JoinedList<>(
+					list,
+					clazz.getProperties() );
+		return BinderUtils.makeUnique(joinedList.iterator(), propertyName);
+	}
+
+	public static String makeUnique(Component clazz, String propertyName) {
+		return BinderUtils.makeUnique(clazz.getProperties().iterator(), propertyName);
+	}
+
+	public static void checkColumnForMultipleBinding(Column column) {
+		if(column.getValue()!=null) {
+			LOGGER.log(Level.WARNING, "Binding column twice should not happen. " + column);
+// TODO enable this next line and investigate why the tests fail
+//			throw new RuntimeException("Binding column twice should not happen. " + column);
+		}
+	}
+
+	static void updateFetchMode(Fetchable value, String fetchMode) {
+		if(FetchMode.JOIN.toString().equalsIgnoreCase(fetchMode)) {
+			value.setFetchMode(FetchMode.JOIN);
+		}
+		else {
+			value.setFetchMode(FetchMode.SELECT);
+		}
+	}
+
+
+	static AssociationInfo getAssociationInfo(
+			RevengStrategy revengStrategy,
+			ForeignKey foreignKey,
+			boolean inverseProperty) {
+		if (inverseProperty) {
+			return revengStrategy.foreignKeyToInverseAssociationInfo(foreignKey);
+		}
+		else {
+			return revengStrategy.foreignKeyToAssociationInfo(foreignKey);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/CollectionBinderSecondPass.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/CollectionBinderSecondPass.java
new file mode 100644
index 000000000000..e0c461aee1c9
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/CollectionBinderSecondPass.java
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.MappingException;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.DependantValue;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Value;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.lang.reflect.Field;
+import java.util.Map;
+
+public class CollectionBinderSecondPass extends org.hibernate.boot.model.internal.CollectionSecondPass {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup( CollectionBinderSecondPass.class).getSerialVersionUID();
+
+	private final MetadataBuildingContext mdbc;
+
+	public CollectionBinderSecondPass(MetadataBuildingContext mdbc, Collection coll) {
+		super(coll);
+		this.mdbc = mdbc;
+	}
+
+@SuppressWarnings("rawtypes")
+public void secondPass(Map persistentClasses) throws MappingException {
+		bindCollectionSecondPass(getCollection(), mdbc);
+}
+
+	public void doSecondPass(Map<String, PersistentClass> persistentClasses) throws MappingException {
+		Value element = getCollection().getElement();
+		DependantValue elementDependantValue = null;
+		String oldElementForeignKeyName = null;
+		if(element instanceof DependantValue) {
+			elementDependantValue = (DependantValue)element;
+			oldElementForeignKeyName = elementDependantValue.getForeignKeyName();
+			elementDependantValue.setForeignKeyName("none"); // Workaround to avoid DependantValue to create foreignkey just because reference columns are not the same + no need to create keys already in the db!
+		}
+		Value key = getCollection().getKey();
+		DependantValue keyDependantValue = null;
+		String oldKeyForeignKeyName = null;
+		if (key instanceof DependantValue) {
+			keyDependantValue = (DependantValue)key;
+			oldKeyForeignKeyName = keyDependantValue.getForeignKeyName();
+			keyDependantValue.setForeignKeyName("none");
+		}
+		secondPass(persistentClasses);
+//    	super.doSecondPass(persistentClasses);
+		if(elementDependantValue!=null) {
+			elementDependantValue.setForeignKeyName(oldElementForeignKeyName);
+		}
+		if (keyDependantValue != null) {
+			keyDependantValue.setForeignKeyName(oldKeyForeignKeyName);
+		}
+	}
+
+	private void bindCollectionSecondPass(
+			Collection collection,
+			MetadataBuildingContext mdbc) throws MappingException {
+		if(collection.isOneToMany() ) {
+			OneToMany oneToMany = (OneToMany) collection.getElement();
+			PersistentClass persistentClass = mdbc.getMetadataCollector().getEntityBinding(oneToMany.getReferencedEntityName());
+
+			if (persistentClass==null) throw new MappingException(
+					"Association " + collection.getRole() + " references unmapped class: " + oneToMany.getReferencedEntityName()
+				);
+
+			oneToMany.setAssociatedClass(persistentClass); // Child
+		}
+	}
+
+	private Collection getCollection() {
+		try {
+			Field field = getClass().getSuperclass().getDeclaredField("collection");
+			field.setAccessible(true);
+			return (Collection)field.get(this);
+		}
+		catch (NoSuchFieldException e) {
+			// this will happen if the implementation of the superclass changes
+			throw new RuntimeException(e);
+		}
+		catch (IllegalAccessException e) {
+			// this should not happen
+			throw new RuntimeException(e);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/CollectionPropertyBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/CollectionPropertyBinder.java
new file mode 100644
index 000000000000..a82881993d51
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/CollectionPropertyBinder.java
@@ -0,0 +1,54 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.AssociationInfo;
+import org.hibernate.tool.reveng.internal.core.util.RevengUtils;
+
+class CollectionPropertyBinder extends AbstractBinder {
+
+	static CollectionPropertyBinder create(BinderContext binderContext) {
+		return new CollectionPropertyBinder(binderContext);
+	}
+
+	private final PropertyBinder propertyBinder;
+
+	private CollectionPropertyBinder(BinderContext binderContext) {
+		super(binderContext);
+		this.propertyBinder = PropertyBinder.create(binderContext);
+	}
+
+	Property bind(
+			String propertyName,
+			Table table,
+			ForeignKey fk,
+			Collection value) {
+		AssociationInfo associationInfo = determineAssociationInfo(fk);
+		BinderUtils.updateFetchMode(value, associationInfo.getFetch());
+		return propertyBinder.bind(table, propertyName, value, associationInfo);
+	}
+
+	private AssociationInfo determineAssociationInfo(
+			ForeignKey foreignKey) {
+		AssociationInfo origin = BinderUtils
+				.getAssociationInfo(getRevengStrategy(), foreignKey, true);
+		if(origin != null){
+			return RevengUtils.createAssociationInfo(
+					origin.getCascade() != null ? origin.getCascade() : "all",
+					origin.getFetch(),
+					origin.getInsert() != null ? origin.getInsert() : true,
+					origin.getUpdate() != null ? origin.getUpdate() : true
+				);
+		}
+		else {
+			return RevengUtils.createAssociationInfo(null, null, true, true);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/EntityPropertyBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/EntityPropertyBinder.java
new file mode 100644
index 000000000000..bed667493add
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/EntityPropertyBinder.java
@@ -0,0 +1,58 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+import org.hibernate.mapping.ToOne;
+import org.hibernate.tool.reveng.api.core.AssociationInfo;
+import org.hibernate.tool.reveng.internal.core.util.RevengUtils;
+
+class EntityPropertyBinder extends AbstractBinder {
+
+	static EntityPropertyBinder create(BinderContext binderContext) {
+		return new EntityPropertyBinder(binderContext);
+	}
+
+	private final PropertyBinder propertyBinder;
+
+	private EntityPropertyBinder(BinderContext binderContext) {
+		super(binderContext);
+		this.propertyBinder = PropertyBinder.create(binderContext);
+	}
+
+	Property bind(
+			String propertyName,
+			boolean mutable,
+			Table table,
+			ForeignKey fk,
+			ToOne value,
+			boolean inverseProperty) {
+		AssociationInfo associationInfo = determineAssociationInfo(fk, inverseProperty, mutable);
+		BinderUtils.updateFetchMode(value, associationInfo.getFetch());
+		return propertyBinder.bind(table, propertyName, value, associationInfo);
+	}
+
+	private AssociationInfo determineAssociationInfo(
+			ForeignKey foreignKey,
+			boolean inverseProperty,
+			boolean mutable) {
+		AssociationInfo origin = BinderUtils
+				.getAssociationInfo(getRevengStrategy(), foreignKey, inverseProperty);
+		if(origin != null){
+			return RevengUtils.createAssociationInfo(
+					origin.getCascade(),
+					origin.getFetch(),
+					origin.getInsert() != null ? origin.getInsert() : mutable,
+					origin.getUpdate() != null ? origin.getUpdate() : mutable
+				);
+		}
+		else {
+			return RevengUtils.createAssociationInfo(null, null, mutable, mutable);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/ForeignKeyBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/ForeignKeyBinder.java
new file mode 100644
index 000000000000..0e2624e4845d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/ForeignKeyBinder.java
@@ -0,0 +1,137 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class ForeignKeyBinder extends AbstractBinder {
+
+	private static final Logger LOGGER = Logger.getLogger(ForeignKeyBinder.class.getName());
+
+	static ForeignKeyBinder create(BinderContext binderContext) {
+		return new ForeignKeyBinder(binderContext);
+	}
+
+	private final OneToOneBinder oneToOneBinder;
+	private final OneToManyBinder oneToManyBinder;
+	private final ManyToOneBinder manyToOneBinder;
+
+	private ForeignKeyBinder(BinderContext binderContext) {
+		super(binderContext);
+		this.oneToOneBinder = OneToOneBinder.create(binderContext);
+		this.oneToManyBinder = OneToManyBinder.create(binderContext);
+		this.manyToOneBinder = ManyToOneBinder.create(binderContext);
+	}
+
+	void bindIncoming(
+			ForeignKey foreignKey,
+			PersistentClass persistentClass,
+			Set<Column> processed) {
+		if(excludeForeignKeyAsCollection(foreignKey)) {
+			LOGGER.log(Level.INFO, "Rev.eng excluded one-to-many or one-to-one for foreignkey " + foreignKey.getName());
+		}
+		else if (getRevengStrategy().isOneToOne(foreignKey)){
+			addOneToOne(foreignKey, persistentClass, processed, false);
+		}
+		else {
+			addOneToMany(foreignKey, persistentClass);
+		}
+	}
+
+	void bindOutgoing(
+			ForeignKey foreignKey,
+			Table table,
+			PersistentClass rc,
+			Set<Column> processedColumns,
+			boolean mutable) {
+		if(excludeForeignKeyAsManyToOne(foreignKey)) {
+			// TODO: if many-to-one is excluded should the column be marked as processed so it won't show up at all ?
+			LOGGER.log(Level.INFO, "Rev.eng excluded *-to-one for foreignkey " + foreignKey.getName());
+		}
+		else if (isOneToOne(foreignKey)){
+			addOneToOne(foreignKey, rc, processedColumns, true);
+		}
+		else {
+			addManyToOne(foreignKey, table, rc, processedColumns, mutable);
+		}
+	}
+
+	private String getForeignKeyToEntityName(ForeignKey foreignKey) {
+		return getRevengStrategy().foreignKeyToEntityName(
+				foreignKey.getName(),
+				TableIdentifier.create(foreignKey.getTable() ),
+				foreignKey.getColumns(),
+				TableIdentifier.create(foreignKey.getReferencedTable() ),
+				foreignKey.getReferencedColumns(),
+				ForeignKeyUtils.isUniqueReference(foreignKey));
+	}
+
+	private void addManyToOne(
+			ForeignKey foreignKey,
+			Table table,
+			PersistentClass rc,
+			Set<Column> processedColumns,
+			boolean mutable) {
+		Property property = manyToOneBinder.bind(
+				BinderUtils.makeUnique(rc, getForeignKeyToEntityName(foreignKey)),
+				mutable,
+				table,
+				foreignKey,
+				processedColumns);
+		rc.addProperty(property);
+	}
+
+	private void addOneToOne(
+			ForeignKey foreignKey,
+			PersistentClass rc,
+			Set<Column> processedColumns,
+			boolean outgoing) {
+		Table table = outgoing ? foreignKey.getReferencedTable() : foreignKey.getTable();
+		Property property = oneToOneBinder.bind(
+				rc,
+				table,
+				foreignKey,
+				processedColumns,
+				outgoing,
+				!outgoing);
+		rc.addProperty(property);
+	}
+
+	private void addOneToMany(ForeignKey foreignKey, PersistentClass persistentClass) {
+		persistentClass.addProperty(oneToManyBinder.bind(persistentClass, foreignKey));
+	}
+
+	private boolean excludeForeignKeyAsCollection(ForeignKey foreignKey) {
+		return getRevengStrategy().excludeForeignKeyAsCollection(
+				foreignKey.getName(),
+				TableIdentifier.create(foreignKey.getTable() ),
+				foreignKey.getColumns(),
+				TableIdentifier.create(foreignKey.getReferencedTable() ),
+				foreignKey.getReferencedColumns());
+	}
+
+	private boolean excludeForeignKeyAsManyToOne(ForeignKey foreignKey) {
+		return getRevengStrategy().excludeForeignKeyAsManytoOne(
+				foreignKey.getName(),
+				TableIdentifier.create(foreignKey.getTable() ),
+				foreignKey.getColumns(),
+				TableIdentifier.create(foreignKey.getReferencedTable()),
+				foreignKey.getReferencedColumns());
+	}
+
+	private boolean isOneToOne(ForeignKey foreignKey) {
+		return getRevengStrategy().isOneToOne(foreignKey);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/ForeignKeyUtils.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/ForeignKeyUtils.java
new file mode 100644
index 000000000000..4e86ac87226f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/ForeignKeyUtils.java
@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class ForeignKeyUtils {
+
+	public static boolean isUniqueReference(ForeignKey foreignKey) {
+		for (ForeignKey element : foreignKey.getTable().getForeignKeyCollection()) {
+			if(element!=foreignKey && element.getReferencedTable().equals(foreignKey.getReferencedTable())) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public static List<Object> findForeignKeys(Collection<ForeignKey> foreignKeys, List<Column> pkColumns) {
+		List<ForeignKey> tempList = new ArrayList<>( foreignKeys );
+		List<Object> result = new ArrayList<>();
+		Column[] myPkColumns = pkColumns.toArray( new Column[0] );
+		for (int i = 0; i < myPkColumns.length; i++) {
+			boolean foundKey = false;
+			for (ForeignKey key : tempList) {
+				List<Column> matchingColumns = columnMatches(myPkColumns, i, key);
+				if(!matchingColumns.isEmpty()) {
+					result.add(new ForeignKeyForColumns(key, matchingColumns));
+					i+=matchingColumns.size()-1;
+					foundKey=true;
+					break;
+				}
+			}
+			if(!foundKey) {
+				result.add(myPkColumns[i]);
+			}
+		}
+		return result;
+	}
+
+	private static List<Column> columnMatches(
+			Column[] pkColumns,
+			int offset,
+			ForeignKey fk) {
+		List<Column> result = new ArrayList<>();
+		int columnSpan = fk.getColumnSpan();
+		if (columnSpan <= pkColumns.length-offset) {
+			for (int i = 0; i < columnSpan; i++) {
+				Column column = pkColumns[i + offset];
+				if(column.equals(fk.getColumn(i))) {
+					result.add(column);
+				}
+				else {
+					result.clear();
+					break;
+				}
+			}
+		}
+		return result;
+	}
+
+	public static class ForeignKeyForColumns {
+		public final List<Column> columns;
+		public final ForeignKey key;
+		public ForeignKeyForColumns(ForeignKey key, List<Column> columns) {
+			this.key = key;
+			this.columns = columns;
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/ManyToOneBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/ManyToOneBinder.java
new file mode 100644
index 000000000000..e789e7ec2865
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/ManyToOneBinder.java
@@ -0,0 +1,60 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.FetchMode;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+
+import java.util.Set;
+
+class ManyToOneBinder extends AbstractBinder {
+
+	static ManyToOneBinder create(BinderContext binderContext) {
+		return new ManyToOneBinder(binderContext);
+	}
+
+	private final EntityPropertyBinder entityPropertyBinder;
+
+	private ManyToOneBinder(BinderContext binderContext) {
+		super(binderContext);
+		this.entityPropertyBinder = EntityPropertyBinder.create(binderContext);
+	}
+
+	Property bind(
+			String propertyName,
+			boolean mutable,
+			Table table,
+			ForeignKey fk,
+			Set<Column> processedColumns) {
+		ManyToOne value = new ManyToOne(getMetadataBuildingContext(), table);
+		value.setReferencedEntityName( fk.getReferencedEntityName() );
+		addColumns(value, fk, processedColumns);
+		value.setFetchMode(FetchMode.SELECT);
+		return entityPropertyBinder
+				.bind(
+						propertyName,
+						mutable,
+						table,
+						fk,
+						value,
+						false);
+	}
+
+	private void addColumns(
+			ManyToOne value,
+			ForeignKey fk,
+			Set<Column> processedColumns) {
+		for (Column fkcolumn : fk.getColumns()) {
+			BinderUtils.checkColumnForMultipleBinding(fkcolumn);
+			value.addColumn(fkcolumn);
+			processedColumns.add(fkcolumn);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/OneToManyBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/OneToManyBinder.java
new file mode 100644
index 000000000000..0a463d1b9c86
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/OneToManyBinder.java
@@ -0,0 +1,201 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.FetchMode;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.DependantValue;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.KeyValue;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class OneToManyBinder extends AbstractBinder {
+
+	static OneToManyBinder create(BinderContext binderContext) {
+		return new OneToManyBinder(binderContext);
+	}
+
+	private final CollectionPropertyBinder collectionPropertyBinder;
+
+	private OneToManyBinder(BinderContext binderContext) {
+		super(binderContext);
+		this.collectionPropertyBinder = CollectionPropertyBinder.create(binderContext);
+	}
+
+	Property bind(PersistentClass rc, ForeignKey foreignKey) {
+		Collection collection = bindCollection(rc, foreignKey);
+		getMetadataCollector().addCollectionBinding(collection);
+		return collectionPropertyBinder
+				.bind(
+						StringHelper.unqualify(collection.getRole()),
+						rc.getTable(),
+						foreignKey,
+						collection);
+	}
+
+	private Collection bindCollection(PersistentClass pc, ForeignKey foreignKey) {
+		Table table = foreignKey.getTable();
+		Collection collection = new org.hibernate.mapping.Set(getMetadataBuildingContext(), pc);
+		collection.setCollectionTable(table);
+		boolean manyToMany = getRevengStrategy().isManyToManyTable( table );
+		if(manyToMany) {
+			bindManyToMany(pc, foreignKey, collection);
+		}
+		else {
+			bindOneToMany(pc, foreignKey, collection);
+		}
+		collection.setKey(createKeyValue(table, foreignKey, getReferencedKeyValue(collection)));
+		return collection;
+	}
+
+	private KeyValue createKeyValue(Table collectionTable, ForeignKey foreignKey, KeyValue referencedKeyValue) {
+		SimpleValue keyValue = new DependantValue(getMetadataBuildingContext(), collectionTable, referencedKeyValue);
+		//keyValue.setForeignKeyName("none"); // Avoid creating the foreignkey
+		//key.setCascadeDeleteEnabled( "cascade".equals( subnode.attributeValue("on-delete") ) );
+		for (Column fkcolumn : foreignKey.getColumns()) {
+			if(fkcolumn.getSqlTypeCode()!=null) { // TODO: user defined foreign ref columns does not have a type set.
+				TypeUtils.determinePreferredType(
+						getMetadataCollector(),
+						getRevengStrategy(),
+						collectionTable,
+						fkcolumn,
+						false); // needed to ensure foreign key columns has same type as the "property" column.
+			}
+			keyValue.addColumn( fkcolumn );
+		}
+		return keyValue;
+	}
+
+	private KeyValue getReferencedKeyValue(Collection collection) {
+		String propRef = collection.getReferencedPropertyName();
+		if (propRef==null) {
+			return collection.getOwner().getIdentifier();
+		}
+		else {
+			return (KeyValue)collection.getOwner().getProperty(propRef).getValue();
+		}
+	}
+
+	private void bindManyToMany(PersistentClass pc, ForeignKey fromForeignKey, Collection collection) {
+		ForeignKey toForeignKey = getToForeignKey(fromForeignKey);
+		bindCollection( pc, fromForeignKey, toForeignKey, collection );
+		ManyToOne manyToOne = new ManyToOne(getMetadataBuildingContext(), collection.getCollectionTable());
+		manyToOne.setReferencedEntityName(getTableToClassName(toForeignKey.getReferencedTable()));
+		addColumns(manyToOne, toForeignKey);
+		collection.setElement(manyToOne);
+	}
+
+	private void addColumns(ManyToOne manyToOne, ForeignKey fk) {
+		for ( Column fkcolumn : fk.getColumns() ) {
+			if ( fkcolumn.getSqlTypeCode() != null ) {  // TODO: user defined foreign ref columns does not have a type set.
+				TypeUtils.determinePreferredType(
+						getMetadataCollector(),
+						getRevengStrategy(),
+						fk.getTable(),
+						fkcolumn,
+						false ); // needed to ensure foreign key columns has same type as the "property" column.
+			}
+			manyToOne.addColumn( fkcolumn );
+		}
+	}
+
+	private ForeignKey getToForeignKey(ForeignKey fromForeignKey) {
+		List<ForeignKey> keys = new ArrayList<>();
+		for (ForeignKey foreignKey : fromForeignKey.getTable().getForeignKeyCollection()) {
+			if(foreignKey!=fromForeignKey) {
+				keys.add(foreignKey);
+			}
+		}
+		if(keys.size()>1) {
+			throw new RuntimeException("more than one other foreign key to choose from!"); // todo: handle better ?
+		}
+		return keys.get( 0 );
+	}
+
+	private void bindOneToMany(PersistentClass pc, ForeignKey fromForeignKey, Collection collection) {
+		bindCollection(pc, fromForeignKey, null, collection);
+		OneToMany oneToMany = new OneToMany(getMetadataBuildingContext(), collection.getOwner());
+		oneToMany.setReferencedEntityName(getTableToClassName(fromForeignKey.getTable()));
+		getMetadataCollector().addSecondPass(
+				new CollectionBinderSecondPass(getMetadataBuildingContext(), collection));
+		collection.setElement(oneToMany);
+	}
+
+
+	private void bindCollection(PersistentClass pc, ForeignKey fromForeignKey, ForeignKey toForeignKey, Collection collection) {
+		ForeignKey targetKey = toForeignKey != null ? toForeignKey : fromForeignKey;
+		collection.setRole(getFullRolePath(pc, fromForeignKey, toForeignKey));
+		collection.setInverse(isCollectionInverse(targetKey));
+		collection.setLazy(isCollectionLazy(targetKey));
+		collection.setFetchMode(FetchMode.SELECT);
+	}
+
+	private boolean isCollectionLazy(ForeignKey foreignKey) {
+		return getRevengStrategy().isForeignKeyCollectionLazy(
+				foreignKey.getName(),
+				TableIdentifier.create( foreignKey.getTable()),
+				foreignKey.getColumns(),
+				TableIdentifier.create(foreignKey.getReferencedTable()),
+				foreignKey.getReferencedColumns());
+	}
+
+	private boolean isCollectionInverse(ForeignKey foreignKey) {
+		return getRevengStrategy().isForeignKeyCollectionInverse(
+				foreignKey.getName(),
+				foreignKey.getTable(),
+				foreignKey.getColumns(),
+				foreignKey.getReferencedTable(),
+				foreignKey.getReferencedColumns());
+	}
+
+	private String getTableToClassName(Table table) {
+		return getRevengStrategy().tableToClassName(TableIdentifier.create(table));
+	}
+
+	private String getFullRolePath(
+			PersistentClass pc,
+			ForeignKey fromForeignKey,
+			ForeignKey toForeignKey) {
+		String collectionRole;
+		if(toForeignKey==null) {
+			collectionRole = getForeignKeyToCollectionName(fromForeignKey);
+		}
+		else {
+			collectionRole = getForeignKeyToManyToManyName(fromForeignKey, toForeignKey);
+		}
+		collectionRole = BinderUtils.makeUnique(pc,collectionRole);
+		return StringHelper.qualify(pc.getEntityName(), collectionRole);
+	}
+
+	private String getForeignKeyToCollectionName(ForeignKey foreignKey) {
+		return getRevengStrategy().foreignKeyToCollectionName(
+				foreignKey.getName(),
+				TableIdentifier.create(foreignKey.getTable()),
+				foreignKey.getColumns(),
+				TableIdentifier.create( foreignKey.getReferencedTable()),
+				foreignKey.getReferencedColumns(),
+				ForeignKeyUtils.isUniqueReference(foreignKey));
+	}
+
+	private String getForeignKeyToManyToManyName(ForeignKey fromForeignKey, ForeignKey toForeignKey) {
+		return getRevengStrategy().foreignKeyToManyToManyName(
+				fromForeignKey,
+				TableIdentifier.create(fromForeignKey.getTable()),
+				toForeignKey,
+				ForeignKeyUtils.isUniqueReference(toForeignKey));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/OneToOneBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/OneToOneBinder.java
new file mode 100644
index 000000000000..8d403e980bb6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/OneToOneBinder.java
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.FetchMode;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.type.ForeignKeyDirection;
+
+import java.util.Set;
+
+class OneToOneBinder extends AbstractBinder {
+
+	static OneToOneBinder create(BinderContext binderContext) {
+		return new OneToOneBinder(binderContext);
+	}
+
+	private final EntityPropertyBinder entityPropertyBinder;
+
+	private OneToOneBinder(BinderContext binderContext) {
+		super(binderContext);
+		this.entityPropertyBinder = EntityPropertyBinder.create(binderContext);
+	}
+
+	Property bind(
+			PersistentClass rc,
+			Table targetTable,
+			ForeignKey fk,
+			Set<Column> processedColumns,
+			boolean constrained,
+			boolean inverseProperty) {
+		OneToOne value = new OneToOne(getMetadataBuildingContext(), targetTable, rc);
+		value.setReferencedEntityName(
+				getRevengStrategy().tableToClassName(TableIdentifier.create(targetTable)));
+		addColumns(fk, value, processedColumns);
+		value.setFetchMode(FetchMode.SELECT);
+		value.setConstrained(constrained);
+		value.setForeignKeyType(
+				constrained ?
+				ForeignKeyDirection.FROM_PARENT :
+				ForeignKeyDirection.TO_PARENT );
+		return entityPropertyBinder
+				.bind(
+						getPropertyName(fk, targetTable, inverseProperty),
+						true,
+						targetTable,
+						fk,
+						value,
+						inverseProperty);
+	}
+
+	private void addColumns(ForeignKey foreignKey, OneToOne oneToOne, Set<Column> processedColumns) {
+		for (Column fkcolumn : foreignKey.getColumns()) {
+			BinderUtils.checkColumnForMultipleBinding(fkcolumn);
+			oneToOne.addColumn(fkcolumn);
+			processedColumns.add(fkcolumn);
+		}
+
+	}
+
+	private String getPropertyName(ForeignKey foreignKey, Table table, boolean inverseProperty) {
+		if (inverseProperty) {
+			return getForeignKeyToInverseEntityName(foreignKey, table);
+		}
+		else  {
+			return getForeignKeyToTentityName(foreignKey, table);
+		}
+	}
+
+	private String getForeignKeyToTentityName(ForeignKey foreignKey, Table table) {
+		return getRevengStrategy().foreignKeyToEntityName(
+				foreignKey.getName(),
+				TableIdentifier.create(foreignKey.getReferencedTable()),
+				foreignKey.getReferencedColumns(),
+				TableIdentifier.create(table),
+				foreignKey.getColumns(),
+				ForeignKeyUtils.isUniqueReference(foreignKey));
+	}
+
+	private String getForeignKeyToInverseEntityName(ForeignKey foreignKey, Table table) {
+		return getRevengStrategy().foreignKeyToInverseEntityName(
+				foreignKey.getName(),
+				TableIdentifier.create(foreignKey.getReferencedTable()),
+				foreignKey.getReferencedColumns(),
+				TableIdentifier.create(table),
+				foreignKey.getColumns(),
+				ForeignKeyUtils.isUniqueReference(foreignKey));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/PrimaryKeyBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/PrimaryKeyBinder.java
new file mode 100644
index 000000000000..503ee053dd1e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/PrimaryKeyBinder.java
@@ -0,0 +1,322 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataCollector;
+import org.hibernate.tool.reveng.internal.core.binder.ForeignKeyUtils.ForeignKeyForColumns;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedBasicValue;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedComponent;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedValue;
+import org.hibernate.tool.reveng.internal.core.util.RevengUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class PrimaryKeyBinder extends AbstractBinder {
+
+	private static final Logger LOGGER = Logger.getLogger(PrimaryKeyBinder.class.getName());
+
+	static PrimaryKeyBinder create(BinderContext binderContext) {
+		return new PrimaryKeyBinder(binderContext);
+	}
+
+	private final BasicPropertyBinder basicPropertyBinder;
+	private final BasicValueBinder simpleValueBinder;
+	private final ManyToOneBinder manyToOneBinder;
+	private final PropertyBinder propertyBinder;
+
+
+	private PrimaryKeyBinder(BinderContext binderContext) {
+		super(binderContext);
+		this.basicPropertyBinder = BasicPropertyBinder.create(binderContext);
+		this.simpleValueBinder = BasicValueBinder.create(binderContext);
+		this.manyToOneBinder = ManyToOneBinder.create(binderContext);
+		this.propertyBinder = PropertyBinder.create(binderContext);
+	}
+
+	PrimaryKeyInfo bind(
+			Table table,
+			RootClass rc,
+			Set<Column> processed,
+			RevengMetadataCollector revengMetadataCollector) {
+		List<Column> keyColumns = getKeyColumns(table);
+		final TableIdentifier tableIdentifier = TableIdentifier.create(table);
+		PrimaryKeyInfo pki = createPrimaryKeyInfo(tableIdentifier, keyColumns);
+		EnhancedValue id = createKeyValue(rc, keyColumns, pki.suggestedStrategy, table, revengMetadataCollector, processed);
+		id.setIdentifierGeneratorProperties(pki.suggestedProperties);
+		Property property = propertyBinder.bind(
+				table,
+				BinderUtils.makeUnique(rc,getIdPropertyName(tableIdentifier, keyColumns)),
+				id,
+				RevengUtils.createAssociationInfo(null, null, true, true));
+		rc.setIdentifierProperty(property);
+		rc.setDeclaredIdentifierProperty(property);
+		rc.setIdentifier(id);
+		return pki;
+	}
+
+	void updatePrimaryKey(RootClass rc, PrimaryKeyInfo pki) {
+		EnhancedValue idValue = (EnhancedValue) rc.getIdentifierProperty().getValue();
+		Properties defaultStrategyProperties = new Properties();
+		Property constrainedOneToOne = getConstrainedOneToOne(rc);
+		if(constrainedOneToOne!=null) {
+			if(pki.suggestedStrategy==null) {
+				idValue.setIdentifierGeneratorStrategy("foreign");
+			}
+			if(pki.suggestedProperties==null) {
+				defaultStrategyProperties.setProperty("property", constrainedOneToOne.getName());
+				idValue.setIdentifierGeneratorProperties(defaultStrategyProperties);
+			}
+		}
+	}
+
+	private EnhancedValue createKeyValue(
+			PersistentClass rc,
+			List<Column> keyColumns,
+			String suggestedStrategyName,
+			Table table,
+			RevengMetadataCollector revengMetadataCollector,
+			Set<Column> processed) {
+		if (keyColumns.size()>1) {
+			LOGGER.log(Level.INFO, "id strategy for " + rc.getEntityName() + " since it has a multiple column primary key");
+			return handleCompositeKey(rc, processed, keyColumns);
+		}
+		else {
+			String tableIdentifierStrategyName =
+					getTableIdentifierStrategyName(suggestedStrategyName, revengMetadataCollector, table);
+			return handleColumnKey(table, tableIdentifierStrategyName, processed, keyColumns);
+		}
+	}
+
+	private PrimaryKeyInfo createPrimaryKeyInfo(
+			TableIdentifier tableIdentifier,
+			List<Column> keyColumns) {
+		PrimaryKeyInfo result = new PrimaryKeyInfo();
+		result.suggestedProperties = getRevengStrategy().getTableIdentifierProperties(tableIdentifier);
+		if (keyColumns.size() == 1) {
+			result.suggestedStrategy = RevengUtils.getTableIdentifierStrategyNameInRevengStrategy(
+					getRevengStrategy(),
+					tableIdentifier,
+					getDefaultCatalog(),
+					getDefaultSchema());
+		}
+		return result;
+	}
+
+	private String getTableIdentifierStrategyName(
+			String suggestedStrategy,
+			RevengMetadataCollector revengMetadataCollector,
+			Table table) {
+		if(suggestedStrategy==null) {
+			suggestedStrategy = revengMetadataCollector.getSuggestedIdentifierStrategy(
+					table.getCatalog(),
+					table.getSchema(),
+					table.getName() );
+			return suggestedStrategy == null ? "assigned" : suggestedStrategy;
+		}
+		else {
+			return suggestedStrategy;
+		}
+	}
+
+	private String getIdPropertyName(
+			TableIdentifier tableIdentifier,
+
+			List<Column> keyColumns) {
+		String result = getRevengStrategy().tableToIdentifierPropertyName(tableIdentifier);
+		if (result ==  null) {
+			if (keyColumns.size() > 1) {
+				result = "id";
+			}
+			else {
+				result = getRevengStrategy().columnToPropertyName(
+						tableIdentifier,
+						keyColumns.get(0).getName());
+			}
+		}
+		return result;
+	}
+
+	private boolean isGeneratedId(
+			List<Column> keyColumns,
+			String tableIdentifierStrategyName) {
+		boolean result = false;
+		if (keyColumns.size() == 1) {
+			result = !"assigned".equals(tableIdentifierStrategyName);
+		}
+		return result;
+	}
+
+	private List<Column> getKeyColumns(Table table) {
+		List<Column> result;
+		if (table.getPrimaryKey()!=null) {
+			result = table.getPrimaryKey().getColumns();
+		}
+		else {
+			LOGGER.log(Level.INFO, "No primary key found for " + table + ", using all properties as the identifier.");
+			result = new ArrayList<>( table.getColumns() );
+		}
+		return result;
+	}
+
+	private EnhancedBasicValue handleColumnKey(
+			Table table,
+			String tableIdentifierStrategyName,
+			Set<Column> processed,
+			List<Column> keyColumns) {
+		Column pkc = keyColumns.get(0);
+		BinderUtils.checkColumnForMultipleBinding(pkc);
+		processed.add(pkc);
+		EnhancedBasicValue result = simpleValueBinder.bind(
+				table,
+				pkc,
+				isGeneratedId(keyColumns, tableIdentifierStrategyName));
+		result.setIdentifierGeneratorStrategy(tableIdentifierStrategyName);
+		return result;
+	}
+
+	private EnhancedComponent handleCompositeKey(
+			PersistentClass rc,
+			Set<Column> processedColumns,
+			List<Column> keyColumns) {
+		EnhancedComponent result = new EnhancedComponent(getMetadataBuildingContext(), rc);
+		result.setMetaAttributes(Collections.emptyMap());
+		result.setEmbedded(false);
+		result.setComponentClassName(getCompositeIdName(rc));
+		addKeyColumns(result, rc.getTable(), getKeyColumns(rc.getTable(), keyColumns), processedColumns);
+		result.setNullValue("undefined");
+		result.setIdentifierGeneratorStrategy("assigned");
+		return result;
+	}
+
+	private static void markAsUseInEquals(Property property) {
+		Map<String, MetaAttribute> m = new HashMap<>();
+		MetaAttribute ma = new MetaAttribute("use-in-equals");
+		ma.addValue("true");
+		m.put(ma.getName(),ma);
+		property.setMetaAttributes(m);
+	}
+
+	private Property getConstrainedOneToOne(RootClass rc) {
+		for (Property property : rc.getProperties()) {
+			if( property.getValue() instanceof OneToOne oto ) {
+				if(oto.isConstrained()) {
+					return property;
+				}
+			}
+		}
+		return null;
+	}
+
+	private Property bindManyToOneProperty(
+			Component pkc,
+			ForeignKeyForColumns fkfc,
+			Table table, Set<Column>
+			processedColumns) {
+		ForeignKey foreignKey = fkfc.key;
+		Property property = manyToOneBinder.bind(
+				BinderUtils.makeUnique(pkc, getForeignKeyToEntityName(foreignKey)),
+				true,
+				table,
+				foreignKey,
+				processedColumns);
+		processedColumns.addAll(fkfc.columns);
+		return property;
+	}
+
+	private Property bindBasicProperty(
+			Component pkc,
+			Column column,
+			Table table,
+			Set<Column> processedColumns) {
+		Property result;
+		if ( processedColumns.contains(column) ) {
+			throw new RuntimeException("Binding column twice for primary key should not happen: " + column);
+		}
+		else {
+			BinderUtils.checkColumnForMultipleBinding(column);
+			result = basicPropertyBinder.bind(
+					BinderUtils.makeUnique(pkc, getColumnToPropertyName(table, column)),
+					table,
+					column);
+			processedColumns.add(column);
+		}
+		return result;
+	}
+
+	private String getForeignKeyToEntityName(ForeignKey foreignKey) {
+		return getRevengStrategy().foreignKeyToEntityName(
+				foreignKey.getName(),
+				TableIdentifier.create(foreignKey.getTable()),
+				foreignKey.getColumns(),
+				TableIdentifier.create(foreignKey.getReferencedTable()),
+				foreignKey.getReferencedColumns(),
+				true
+			);
+	}
+
+	private String getColumnToPropertyName(Table table, Column column) {
+		return getRevengStrategy().columnToPropertyName(
+				TableIdentifier.create(table),
+				column.getName());
+	}
+
+	private void addKeyColumns(
+			Component pkc,
+			Table table,
+			List<?> list,
+			Set<Column> processedColumns) {
+		for ( Object element : list ) {
+			Property property;
+			if ( element instanceof Column ) {
+				property = bindBasicProperty( pkc, (Column) element, table, processedColumns );
+			}
+			else if ( element instanceof ForeignKeyForColumns ) {
+				property = bindManyToOneProperty( pkc, (ForeignKeyForColumns) element, table, processedColumns );
+			}
+			else {
+				throw new RuntimeException( "unknown thing" );
+			}
+			markAsUseInEquals( property );
+			pkc.addProperty( property );
+		}
+	}
+
+	private List<?> getKeyColumns(Table table, List<Column> keyColumns) {
+		if (preferBasicCompositeIds() ) {
+			return new ArrayList<Object>(keyColumns);
+		}
+		else {
+			return ForeignKeyUtils.findForeignKeys(table.getForeignKeyCollection(), keyColumns);
+		}
+	}
+
+	private String getCompositeIdName(PersistentClass pc) {
+		String compositeIdName = getRevengStrategy().tableToCompositeIdName(
+				TableIdentifier.create(pc.getTable()));
+		if(compositeIdName==null) {
+			compositeIdName = getRevengStrategy().classNameToCompositeIdName(pc.getClassName());
+		}
+		return compositeIdName;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/PrimaryKeyInfo.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/PrimaryKeyInfo.java
new file mode 100644
index 000000000000..37ec44a08721
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/PrimaryKeyInfo.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import java.util.Properties;
+
+public class PrimaryKeyInfo {
+
+	public String suggestedStrategy = null;
+	public Properties suggestedProperties = null;
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/PropertyBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/PropertyBinder.java
new file mode 100644
index 000000000000..54d890952806
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/PropertyBinder.java
@@ -0,0 +1,88 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.FetchMode;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Fetchable;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+import org.hibernate.mapping.Value;
+import org.hibernate.tool.reveng.api.core.AssociationInfo;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.util.RevengUtils;
+
+import java.util.Map;
+
+class PropertyBinder extends AbstractBinder {
+
+	static PropertyBinder create(BinderContext binderContext) {
+		return new PropertyBinder(binderContext);
+	}
+
+	private PropertyBinder(BinderContext binderContext) {
+		super(binderContext);
+	}
+
+	Property bind(
+			Table table,
+			String propertyName,
+			Value value,
+			AssociationInfo associationInfo) {
+		return bindMetaAttributes(
+				createProperty(propertyName, value, associationInfo),
+				table);
+	}
+
+	private Property createProperty(
+			String propertyName,
+			Value value,
+			AssociationInfo associationInfo) {
+		Property result = new Property();
+		result.setName(propertyName);
+		result.setValue(value);
+		result.setInsertable(associationInfo.getInsert());
+		result.setUpdateable(associationInfo.getUpdate());
+		String cascade = associationInfo.getCascade();
+		cascade = cascade == null ? "none" : cascade;
+		result.setCascade(cascade);
+		boolean lazy = false;
+		if (Fetchable.class.isInstance(value)) {
+			lazy = ((Fetchable)value).getFetchMode() != FetchMode.JOIN;
+		}
+		result.setLazy(lazy);
+		result.setPropertyAccessorName("property");
+		return result;
+	}
+
+	private Property bindMetaAttributes(Property property, Table table) {
+		for (Column col : property.getColumns()) {
+			Map<String,MetaAttribute> map = getColumnToMetaAttributesInRevengStrategy(table, col.getName());
+			if(map!=null) {
+				property.setMetaAttributes(map);
+			}
+		}
+
+		return property;
+	}
+
+	private Map<String,MetaAttribute> getColumnToMetaAttributesInRevengStrategy(
+			Table table,
+			String column) {
+		Map<String,MetaAttribute> result = null;
+		TableIdentifier tableIdentifier = TableIdentifier.create(table);
+		result = getRevengStrategy().columnToMetaAttributes(tableIdentifier, column);
+		if (result == null) {
+			tableIdentifier = RevengUtils.createTableIdentifier(
+					table,
+					getDefaultCatalog(),
+					getDefaultSchema());
+			result = getRevengStrategy().columnToMetaAttributes(tableIdentifier, column);
+		}
+		return result;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/RootClassBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/RootClassBinder.java
new file mode 100644
index 000000000000..05e3c185cd33
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/RootClassBinder.java
@@ -0,0 +1,203 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.DuplicateMappingException;
+import org.hibernate.engine.OptimisticLockStyle;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataCollector;
+import org.hibernate.tool.reveng.internal.core.util.RevengUtils;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class RootClassBinder extends AbstractBinder {
+
+	private static final Logger LOGGER = Logger.getLogger(RootClassBinder.class.getName());
+
+	public static RootClassBinder create(
+			BinderContext binderContext) {
+		return new RootClassBinder(binderContext);
+	}
+
+	private final PrimaryKeyBinder primaryKeyBinder;
+	private final VersionPropertyBinder versionPropertyBinder;
+	private final ForeignKeyBinder foreignKeyBinder;
+	private final BasicPropertyBinder basicPropertyBinder;
+
+	private RootClassBinder(BinderContext binderContext) {
+		super(binderContext);
+		this.primaryKeyBinder = PrimaryKeyBinder.create(binderContext);
+		this.versionPropertyBinder = VersionPropertyBinder.create(binderContext);
+		this.foreignKeyBinder = ForeignKeyBinder.create(binderContext);
+		this.basicPropertyBinder = BasicPropertyBinder.create(binderContext);
+	}
+
+	public void bind(Table table, RevengMetadataCollector revengMetadataCollector) {
+		Set<Column> processed = new HashSet<>();
+		nullifyDefaultCatalogAndSchema(table);
+		RootClass rc = createRootClass(table);
+		addToMetadataCollector(rc, table);
+		PrimaryKeyInfo pki = bindPrimaryKey(table, rc, processed, revengMetadataCollector);
+		bindVersionProperty(table, rc, processed);
+		bindOutgoingForeignKeys(table, rc, processed);
+		bindColumnsToProperties(table, rc, processed);
+		bindIncomingForeignKeys(rc, processed, revengMetadataCollector);
+		updatePrimaryKey(rc, pki);
+	}
+
+	private PrimaryKeyInfo bindPrimaryKey(
+			Table table,
+			RootClass rc,
+			Set<Column> processed,
+			RevengMetadataCollector revengMetadataCollector) {
+		return primaryKeyBinder.bind(table, rc, processed, revengMetadataCollector);
+	}
+
+	private void updatePrimaryKey(RootClass rc, PrimaryKeyInfo pki) {
+		primaryKeyBinder.updatePrimaryKey(rc, pki);
+	}
+
+	private void addToMetadataCollector(RootClass rc, Table table) {
+		try {
+			getMetadataCollector().addEntityBinding(rc);
+			getMetadataCollector().addImport( rc.getEntityName(), rc.getEntityName() );
+		}
+		catch(DuplicateMappingException dme) {
+			// TODO: detect this and generate a "permutation" of it ?
+			PersistentClass class1 = getMetadataCollector().getEntityBinding(dme.getName());
+			Table table2 = class1.getTable();
+			throw new RuntimeException("Duplicate class name '" + rc.getEntityName() + "' generated for '" + table + "'. Same name where generated for '" + table2 + "'");
+		}
+	}
+
+	private RootClass createRootClass(Table table) {
+		RootClass rc = new RootClass(getMetadataBuildingContext());
+		TableIdentifier tableIdentifier = TableIdentifier.create(table);
+		String className = getRevengStrategy().tableToClassName( tableIdentifier );
+		LOGGER.log(Level.INFO, "Building entity " + className + " based on " + tableIdentifier);
+		rc.setEntityName( className );
+		rc.setJpaEntityName( StringHelper.unqualify( className ) );
+		rc.setClassName( className );
+		rc.setProxyInterfaceName( rc.getEntityName() ); // TODO: configurable ?
+		rc.setLazy(true);
+		rc.setMetaAttributes(getMetaAttributes(table));
+		rc.setDiscriminatorValue( rc.getEntityName() );
+		rc.setTable(table);
+		rc.setOptimisticLockStyle(OptimisticLockStyle.NONE);
+		return rc;
+	}
+
+	private void nullifyDefaultCatalogAndSchema(Table table) {
+		if (table.getCatalog() != null && table.getCatalog().equals(getDefaultCatalog())) {
+			table.setCatalog(null);
+		}
+		if (table.getSchema() != null && table.getSchema().equals(getDefaultSchema())) {
+			table.setSchema(null);
+		}
+	}
+
+	private void bindVersionProperty(
+			Table table,
+			RootClass rc,
+			Set<Column> processed) {
+		versionPropertyBinder.bind(table, rc, processed);
+	}
+
+	private void bindIncomingForeignKeys(
+			PersistentClass rc,
+			Set<Column> processed,
+			RevengMetadataCollector revengMetadataCollector) {
+		List<ForeignKey> foreignKeys = revengMetadataCollector.getOneToManyCandidates().get(rc.getEntityName());
+		if(foreignKeys!=null) {
+			for ( ForeignKey foreignKey : foreignKeys ) {
+				foreignKeyBinder.bindIncoming( foreignKey, rc, processed );
+			}
+		}
+	}
+
+
+	private void bindOutgoingForeignKeys(Table table, RootClass rc, Set<Column> processedColumns) {
+		// Iterate the outgoing foreign keys and create many-to-one's
+		for (ForeignKey foreignKey : table.getForeignKeyCollection()) {
+			boolean mutable = true;
+			if ( contains( foreignKey.getColumns().iterator(), processedColumns ) ) {
+				if ( !preferBasicCompositeIds() ) continue; //it's in the pk, so skip this one
+				mutable = false;
+			}
+			foreignKeyBinder.bindOutgoing(foreignKey, table, rc, processedColumns, mutable);
+		}
+	}
+
+	private void bindColumnsToProperties(Table table, RootClass rc, Set<Column> processedColumns) {
+		for (Column column : table.getColumns()) {
+			if ( !processedColumns.contains(column) ) {
+				BinderUtils.checkColumnForMultipleBinding(column);
+				String propertyName = getColumnToPropertyNameInRevengStrategy(table, column);
+				Property property = basicPropertyBinder.bind(
+						BinderUtils.makeUnique(rc,propertyName),
+						table,
+						column);
+				rc.addProperty(property);
+			}
+		}
+	}
+
+	private boolean contains(Iterator<Column> columnIterator, Set<Column> processedColumns) {
+		while (columnIterator.hasNext() ) {
+			Column element = columnIterator.next();
+			if(processedColumns.contains(element) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private Map<String,MetaAttribute> getMetaAttributes(Table table) {
+		Map<String,MetaAttribute> result;
+		TableIdentifier tableIdentifier = TableIdentifier.create(table);
+		result = getRevengStrategy().tableToMetaAttributes(tableIdentifier);
+		if (result == null) {
+			tableIdentifier = RevengUtils.createTableIdentifier(
+					table,
+					getDefaultCatalog(),
+					getDefaultSchema());
+			result = getRevengStrategy().tableToMetaAttributes(tableIdentifier);
+		}
+		if (result == null) {
+			result = Collections.emptyMap();
+		}
+		return result;
+	}
+
+	private String getColumnToPropertyNameInRevengStrategy(
+			Table table,
+			Column column) {
+		String result;
+		String columnName = column.getName();
+		TableIdentifier tableIdentifier = TableIdentifier.create(table);
+		result = getRevengStrategy().columnToPropertyName(tableIdentifier, columnName);
+		if (result == null) {
+			tableIdentifier = RevengUtils.createTableIdentifier(table, getDefaultCatalog(), getDefaultSchema());
+			result = getRevengStrategy().columnToPropertyName(tableIdentifier, columnName);
+		}
+		return result;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/TypeUtils.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/TypeUtils.java
new file mode 100644
index 000000000000..73463a6845a5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/TypeUtils.java
@@ -0,0 +1,120 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.boot.spi.InFlightMetadataCollector;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.util.JdbcToHibernateTypeHelper;
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+import org.hibernate.type.Type;
+
+import java.lang.reflect.Field;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class TypeUtils {
+
+	private static final Logger LOGGER = Logger.getLogger(TypeUtils.class.getName());
+
+	public static final int DEFAULT_COLUMN_LENGTH = 255;
+	public static final int DEFAULT_COLUMN_PRECISION = 19;
+	public static final int DEFAULT_COLUMN_SCALE = 2;
+
+	public static String determinePreferredType(
+			InFlightMetadataCollector metadataCollector,
+			RevengStrategy revengStrategy,
+			Table table,
+			Column column,
+			boolean generatedIdentifier) {
+
+		String location =
+				"Table: " +
+				TableNameQualifier.qualify(
+						table.getCatalog(),
+						table.getSchema(),
+						table.getQuotedName() ) +
+				" column: " +
+				column.getQuotedName();
+
+		Integer sqlTypeCode = column.getSqlTypeCode();
+		if(sqlTypeCode==null) {
+			throw new RuntimeException("sqltype is null for " + location);
+		}
+
+		String preferredHibernateType = revengStrategy.columnToHibernateTypeName(
+				TableIdentifier.create(table),
+				column.getName(),
+				sqlTypeCode,
+				column.getLength() != null ? column.getLength().intValue() : DEFAULT_COLUMN_LENGTH,
+				column.getPrecision() != null ? column.getPrecision() : DEFAULT_COLUMN_PRECISION,
+				column.getScale() != null ? column.getScale() : DEFAULT_COLUMN_SCALE,
+				column.isNullable(),
+				generatedIdentifier
+		);
+
+		Type wantedType = metadataCollector
+				.getTypeConfiguration()
+				.getBasicTypeRegistry()
+				.getRegisteredType(preferredHibernateType);
+
+		if(wantedType!=null) {
+
+			int[] wantedSqlTypes = wantedType.getSqlTypeCodes(metadataCollector);
+
+			if(wantedSqlTypes.length>1) {
+				throw new RuntimeException("The type " + preferredHibernateType + " found on " + location + " spans multiple columns. Only single column types allowed.");
+			}
+
+			int wantedSqlType = wantedSqlTypes[0];
+			if( wantedSqlType != sqlTypeCode ) {
+				LOGGER.log(
+						Level.INFO,
+						"Sql type mismatch for " + location + " between DB and wanted hibernate type. Sql type set to " + typeCodeName(
+								sqlTypeCode ) + " instead of " + typeCodeName(wantedSqlType) );
+				forceSqlTypeCode(column, wantedSqlType);
+			}
+
+		}
+
+		else {
+
+			LOGGER.log(
+					Level.INFO,
+					"No Hibernate type found for " + preferredHibernateType + ". Most likely cause is a missing UserType class.");
+
+		}
+
+
+
+		if(preferredHibernateType==null) {
+			throw new RuntimeException("Could not find javatype for " + typeCodeName( sqlTypeCode ));
+		}
+
+		return preferredHibernateType;
+	}
+
+	private static String typeCodeName(int sqlTypeCode) {
+		return sqlTypeCode + "(" + JdbcToHibernateTypeHelper.getJDBCTypeName(sqlTypeCode) + ")";
+	}
+
+	private static void forceSqlTypeCode(Column column, int sqlCode) {
+		try {
+			Field sqlCodeField = Column.class.getDeclaredField("sqlTypeCode");
+			sqlCodeField.setAccessible(true);
+			sqlCodeField.set(column, sqlCode );
+		}
+		catch (NoSuchFieldException |
+				SecurityException |
+				IllegalArgumentException |
+				IllegalAccessException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/VersionPropertyBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/VersionPropertyBinder.java
new file mode 100644
index 000000000000..f6f77a8e871c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/binder/VersionPropertyBinder.java
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.hibernate.engine.OptimisticLockStyle;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class VersionPropertyBinder extends AbstractBinder {
+
+	private final static Logger LOGGER = Logger.getLogger(VersionPropertyBinder.class.getName());
+
+	static VersionPropertyBinder create(BinderContext binderContext) {
+		return new VersionPropertyBinder(binderContext);
+	}
+
+	private final BasicPropertyBinder basicPropertyBinder;
+
+	private VersionPropertyBinder(BinderContext binderContext) {
+		super(binderContext);
+		this.basicPropertyBinder = BasicPropertyBinder.create(binderContext);
+	}
+
+	void bind(
+			Table table,
+			RootClass rc,
+			Set<Column> processed) {
+		String optimisticLockColumnName = getRevengStrategy()
+				.getOptimisticLockColumnName(TableIdentifier.create(table));
+		if(optimisticLockColumnName!=null) {
+			handleSpecifiedVersionColumn(table, optimisticLockColumnName, rc, processed);
+		}
+		else {
+			scanForAppropriateVersionColumn(table, rc, processed);
+		}
+	}
+
+	private void scanForAppropriateVersionColumn(
+			Table table,
+			RootClass rc,
+			Set<Column> processed) {
+		TableIdentifier identifier = TableIdentifier.create(table);
+		LOGGER.log(Level.INFO, "Scanning " + identifier + " for <version>/<timestamp> columns.");
+		for (Column column : table.getColumns()) {
+			boolean useIt = getRevengStrategy().useColumnForOptimisticLock(identifier, column.getName());
+			if(useIt && !processed.contains(column)) {
+				bindVersionProperty(table, column, rc, processed);
+				return;
+			}
+		}
+		LOGGER.log(Level.INFO, "No columns reported while scanning for <version>/<timestamp> columns in " + identifier);
+	}
+
+	private void handleSpecifiedVersionColumn(
+			Table table,
+			String optimisticLockColumnName,
+			RootClass rc,
+			Set<Column> processed) {
+		TableIdentifier identifier = TableIdentifier.create(table);
+		Column column = table.getColumn(new Column(optimisticLockColumnName));
+		if(column==null) {
+			LOGGER.log(Level.WARNING, "Column " + optimisticLockColumnName + " wanted for <version>/<timestamp> not found in " + identifier);
+		}
+		else {
+			bindVersionProperty(table, column, rc, processed);
+		}
+	}
+
+	private void bindVersionProperty(
+			Table table,
+			Column column,
+			RootClass rc,
+			Set<Column> processed) {
+		TableIdentifier identifier = TableIdentifier.create(table);
+		processed.add(column);
+		String propertyName = getRevengStrategy().columnToPropertyName( identifier, column.getName() );
+		Property property = basicPropertyBinder.bind(
+				BinderUtils.makeUnique(rc, propertyName),
+				table,
+				column);
+		rc.addProperty(property);
+		rc.setVersion(property);
+		rc.setOptimisticLockStyle(OptimisticLockStyle.VERSION);
+		LOGGER.log(Level.INFO, "Column " + column.getName() + " will be used for <version>/<timestamp> columns in " + identifier);
+
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/AbstractMetaDataDialect.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/AbstractMetaDataDialect.java
new file mode 100644
index 000000000000..fa1d544d8839
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/AbstractMetaDataDialect.java
@@ -0,0 +1,196 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.jboss.logging.Logger;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * abstract base class for the metadatadialects to hold the
+ * basic setup classes.
+ *
+ * @author max
+ *
+ */
+public abstract class AbstractMetaDataDialect implements RevengDialect {
+
+	protected final Logger log = Logger.getLogger(this.getClass());
+
+	private Connection connection;
+	private DatabaseMetaData metaData;
+
+	private ConnectionProvider connectionProvider = null;
+
+	public void configure(
+			ConnectionProvider connectionProvider) {
+		this.connectionProvider = connectionProvider;
+	}
+
+	public void close() {
+		metaData = null;
+		if(connection != null) {
+			try {
+				connectionProvider.closeConnection(connection);
+			}
+			catch (SQLException e) {
+				throw new RuntimeException("Problem while closing connection", e);
+			}
+			finally {
+				connection = null;
+			}
+		}
+		connectionProvider = null;
+	}
+
+	protected DatabaseMetaData getMetaData() {
+		if (metaData == null) {
+			try {
+				metaData = getConnection().getMetaData();
+			}
+			catch (SQLException e) {
+				throw new RuntimeException("Getting database metadata", e);
+			}
+		}
+		return metaData;
+	}
+
+	protected String getDatabaseStructure(String catalog, String schema) {
+		ResultSet schemaRs = null;
+		ResultSet catalogRs = null;
+		String nl = System.lineSeparator();
+		StringBuilder sb = new StringBuilder(nl);
+		// Let's give the user some feedback. The exception
+		// is probably related to incorrect schema configuration.
+		sb.append("Configured schema:").append(schema).append(nl);
+		sb.append("Configured catalog:").append(catalog ).append(nl);
+
+		try {
+			schemaRs = getMetaData().getSchemas();
+			sb.append("Available schemas:").append(nl);
+			while (schemaRs.next() ) {
+				sb.append("  ").append(schemaRs.getString("TABLE_SCHEM") ).append(nl);
+			}
+		}
+		catch (SQLException e2) {
+			log.warn("Could not get schemas", e2);
+			sb.append("  <SQLException while getting schemas>").append(nl);
+		}
+		finally {
+			try {
+				if (schemaRs != null) {
+					schemaRs.close();
+				}
+			}
+			catch (Exception ignore) {
+			}
+		}
+
+		try {
+			catalogRs = getMetaData().getCatalogs();
+			sb.append("Available catalogs:").append(nl);
+			while (catalogRs.next() ) {
+				sb.append("  ").append(catalogRs.getString("TABLE_CAT") ).append(nl);
+			}
+		}
+		catch (SQLException e2) {
+			log.warn("Could not get catalogs", e2);
+			sb.append("  <SQLException while getting catalogs>").append(nl);
+		}
+		finally {
+			try {
+				if (catalogRs != null) {
+					catalogRs.close();
+				}
+			}
+			catch (Exception ignore) {
+			}
+		}
+		return sb.toString();
+	}
+
+	protected Connection getConnection() throws SQLException {
+		if(connection==null) {
+			connection = connectionProvider.getConnection();
+		}
+		return connection;
+	}
+
+	public void close(Iterator<?> iterator) {
+		if(iterator instanceof ResultSetIterator) {
+			((ResultSetIterator)iterator).close();
+		}
+	}
+
+	public boolean needQuote(String name) {
+
+		if(name==null) return false;
+
+		// TODO: use jdbc metadata to decide on this. but for now we just handle the most typical cases.
+		if(name.indexOf('-')>0) return true;
+		if(name.indexOf(' ')>0) return true;
+		return name.indexOf( '.' ) > 0;
+	}
+
+	protected String caseForSearch(String value) throws SQLException  {
+		// TODO: handle quoted requests (just strip it ?)
+		if(needQuote(value)) {
+			if ( getMetaData().storesMixedCaseQuotedIdentifiers() ) {
+				return value;
+			}
+			else if ( getMetaData().storesUpperCaseQuotedIdentifiers() ) {
+				return toUpperCase( value );
+			}
+			else if( getMetaData().storesLowerCaseQuotedIdentifiers() ) {
+				return toLowerCase( value );
+			}
+			else {
+				return value;
+			}
+		}
+		else if ( getMetaData().storesMixedCaseQuotedIdentifiers() ) {
+			return value;
+		}
+		else if ( getMetaData().storesUpperCaseIdentifiers() ) {
+			return toUpperCase( value );
+		}
+		else if( getMetaData().storesLowerCaseIdentifiers() ) {
+			return toLowerCase( value );
+		}
+		else {
+			return value;
+		}
+	}
+
+	private String toUpperCase(String str) {
+		return str==null ? null : str.toUpperCase();
+	}
+
+	private String toLowerCase(String str) {
+		return str == null ? null : str.toLowerCase(Locale.ENGLISH);
+	}
+
+	public Iterator<Map<String, Object>> getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table) {
+		Map<String, Object> m = new HashMap<>();
+		m.put( "TABLE_CAT", catalog );
+		m.put( "TABLE_SCHEMA", schema );
+		m.put( "TABLE_NAME", table );
+		m.put( "HIBERNATE_STRATEGY", null );
+		List<Map<String, Object>> l = new ArrayList<>();
+		l.add(m);
+		return l.iterator();
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/CachedMetaDataDialect.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/CachedMetaDataDialect.java
new file mode 100644
index 000000000000..aee8debec881
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/CachedMetaDataDialect.java
@@ -0,0 +1,217 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class CachedMetaDataDialect implements RevengDialect {
+
+	RevengDialect delegate;
+	private final Map<StringKey, List<Map<String, Object>>> cachedTables = new HashMap<>();
+	private final Map<StringKey, List<Map<String, Object>>> cachedColumns = new HashMap<>();
+	private final Map<StringKey, List<Map<String, Object>>> cachedExportedKeys = new HashMap<>();
+	private final Map<StringKey, List<Map<String, Object>>> cachedPrimaryKeys = new HashMap<>();
+	private final Map<StringKey, List<Map<String, Object>>> cachedIndexInfo = new HashMap<>();
+	private final Map<StringKey, List<Map<String, Object>>> cachedPrimaryKeyStrategyName = new HashMap<>();
+
+	public CachedMetaDataDialect(RevengDialect realMetaData) {
+		this.delegate = realMetaData;
+	}
+
+	public void close() {
+		delegate.close();
+	}
+
+	public void configure(
+			ConnectionProvider connectionProvider) {
+		delegate.configure(connectionProvider);
+	}
+
+	public void close(Iterator<?> iterator) {
+		if( iterator instanceof CachedIterator ci ) {
+			if(ci.getOwner()==this) {
+				ci.store();
+				return;
+			}
+		}
+		delegate.close( iterator );
+	}
+
+
+
+	public Iterator<Map<String, Object>> getColumns(String catalog, String schema, String table, String column) {
+		StringKey sk = new StringKey(new String[] { catalog, schema, table, column });
+		List<Map<String, Object>> cached = cachedColumns.get( sk );
+		if(cached==null) {
+			cached = new ArrayList<>();
+			return new CachedIterator(this, cachedColumns, sk, cached, delegate.getColumns( catalog, schema, table, column ));
+		}
+		else {
+			return cached.iterator();
+		}
+	}
+
+	public Iterator<Map<String, Object>> getExportedKeys(String catalog, String schema, String table) {
+		StringKey sk = new StringKey(new String[] { catalog, schema, table });
+		List<Map<String, Object>> cached = cachedExportedKeys.get( sk );
+		if(cached==null) {
+			cached = new ArrayList<>();
+			return new CachedIterator(this, cachedExportedKeys, sk, cached, delegate.getExportedKeys( catalog, schema, table ));
+		}
+		else {
+			return cached.iterator();
+		}
+	}
+
+	public Iterator<Map<String, Object>> getIndexInfo(String catalog, String schema, String table) {
+		StringKey sk = new StringKey(new String[] { catalog, schema, table });
+		List<Map<String, Object>> cached = cachedIndexInfo.get( sk );
+		if(cached==null) {
+			cached = new ArrayList<>();
+			return new CachedIterator(this, cachedIndexInfo, sk, cached, delegate.getIndexInfo( catalog, schema, table ));
+		}
+		else {
+			return cached.iterator();
+		}
+	}
+
+	public Iterator<Map<String, Object>> getPrimaryKeys(String catalog, String schema, String name) {
+		StringKey sk = new StringKey(new String[] { catalog, schema, name });
+		List<Map<String, Object>> cached = cachedPrimaryKeys .get( sk );
+		if(cached==null) {
+			cached = new ArrayList<>();
+			return new CachedIterator(this, cachedPrimaryKeys, sk, cached, delegate.getPrimaryKeys( catalog, schema, name ));
+		}
+		else {
+			return cached.iterator();
+		}
+	}
+
+	public Iterator<Map<String, Object>> getTables(String catalog, String schema, String table) {
+		StringKey sk = new StringKey(new String[] { catalog, schema, table });
+		List<Map<String, Object>> cached = cachedTables.get( sk );
+		if(cached==null) {
+			cached = new ArrayList<>();
+			return new CachedIterator(this, cachedTables, sk, cached, delegate.getTables( catalog, schema, table ));
+		}
+		else {
+			return cached.iterator();
+		}
+	}
+
+	public Iterator<Map<String, Object>> getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table) {
+		StringKey sk = new StringKey(new String[] { catalog, schema, table });
+		List<Map<String, Object>> cached = cachedPrimaryKeyStrategyName.get( sk );
+		if(cached==null) {
+			cached = new ArrayList<>();
+			return new CachedIterator(this, cachedPrimaryKeyStrategyName, sk, cached, delegate.getSuggestedPrimaryKeyStrategyName( catalog, schema, table ));
+		}
+		else {
+			return cached.iterator();
+		}
+	}
+
+	public boolean needQuote(String name) {
+		return delegate.needQuote( name );
+	}
+
+	private static class StringKey {
+		String[] keys;
+
+		StringKey(String[] key) {
+			this.keys=key;
+		}
+
+		public int hashCode() {
+			if (keys == null)
+				return 0;
+
+			int result = 1;
+
+			for ( Object element : keys ) {
+				result = 31 * result + (element == null ? 0 : element.hashCode());
+			}
+
+			return result;
+		}
+
+		public boolean equals(Object obj) {
+			if (!(obj instanceof StringKey other)) return false;
+			String[] otherKeys = other.keys;
+			if(otherKeys.length!=keys.length) {
+				return false;
+			}
+
+			for (int i = otherKeys.length-1; i >= 0; i--) {
+				if(!safeEquals(otherKeys[i],(keys[i]))) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		private boolean safeEquals(Object obj1, Object obj2) {
+			if ( obj1 == null ) {
+				return obj2 == null;
+			}
+			return obj1.equals( obj2 );
+		}
+	}
+
+	private static class CachedIterator implements Iterator<Map<String, Object>> {
+
+		private List<Map<String, Object>> cache;
+		private StringKey target;
+		private Map<StringKey, List<Map<String, Object>>> destination;
+		private Iterator<Map<String, Object>> realIterator;
+		final CachedMetaDataDialect owner;
+		public CachedIterator(CachedMetaDataDialect owner, Map<StringKey, List<Map<String, Object>>> destination, StringKey sk, List<Map<String, Object>> cache, Iterator<Map<String, Object>> realIterator) {
+			this.owner = owner;
+			this.destination = destination;
+			this.target = sk;
+			this.realIterator = realIterator;
+			this.cache = cache;
+		}
+
+		public CachedMetaDataDialect getOwner() {
+			return owner;
+		}
+
+		public boolean hasNext() {
+			return realIterator.hasNext();
+		}
+
+		public Map<String, Object> next() {
+			Map<String, Object> map = realIterator.next();
+			cache.add( new HashMap<>( map )); // need to copy since MetaDataDialect might reuse it.
+			return map;
+		}
+
+		public void remove() {
+			realIterator.remove();
+		}
+
+		public void store() {
+			destination.put( target, cache );
+			if(realIterator.hasNext()) throw new IllegalStateException("CachedMetaDataDialect have not been fully initialized!");
+			cache = null;
+			target = null;
+			destination = null;
+			realIterator = null;
+		}
+	}
+
+
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/H2MetaDataDialect.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/H2MetaDataDialect.java
new file mode 100644
index 000000000000..e534b3d7cbff
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/H2MetaDataDialect.java
@@ -0,0 +1,142 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import org.hibernate.tool.reveng.internal.util.ReflectionUtil;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+
+/**
+ * MetaData dialect that work around tweaks in the H2 database.
+ *
+ * @author Max Rydahl Andersen
+ *
+ */
+public class H2MetaDataDialect extends JDBCMetaDataDialect {
+
+	private static final String SPKSQ_H2_1_X =
+			"SELECT " +
+			"  idx.TABLE_CATALOG TABLE_CAT, " +
+			"  idx.TABLE_SCHEMA TABLE_SCHEM, " +
+			"  idx.TABLE_NAME, " +
+			"  idx.COLUMN_NAME " +
+			"FROM " +
+			"  INFORMATION_SCHEMA.INDEXES idx, " +
+			"  INFORMATION_SCHEMA.COLUMNS cols " +
+			"WHERE " +
+			"  idx.TABLE_CATALOG = cols.TABLE_CATALOG AND " +
+			"  idx.TABLE_SCHEMA = cols.TABLE_SCHEMA AND " +
+			"  idx.TABLE_NAME = cols.TABLE_NAME AND " +
+			"  idx.PRIMARY_KEY = TRUE AND " +
+			"  cols.COLUMN_DEFAULT like '%NEXT VALUE FOR%' ";
+
+	private static final String SPKSQ_H2_2_X =
+			"SELECT " +
+			"  idx.TABLE_CATALOG TABLE_CAT, " +
+			"  idx.TABLE_SCHEMA TABLE_SCHEM, " +
+			"  idx.TABLE_NAME, " +
+			"  cols.COLUMN_NAME " +
+			"FROM " +
+			"  INFORMATION_SCHEMA.INDEXES idx, " +
+			"  INFORMATION_SCHEMA.INDEX_COLUMNS idx_cols, " +
+			"  INFORMATION_SCHEMA.COLUMNS cols " +
+			"WHERE                                     " +
+			"   idx.TABLE_CATALOG = cols.TABLE_CATALOG AND " +
+			"   idx.TABLE_SCHEMA = cols.TABLE_SCHEMA   AND " +
+			"   idx.TABLE_NAME = cols.TABLE_NAME AND " +
+			"   idx.INDEX_TYPE_NAME = 'PRIMARY KEY' AND " +
+			"   cols.COLUMN_NAME = idx_cols.COLUMN_NAME AND " +
+			"   cols.IS_IDENTITY = 'YES'";
+
+	private static boolean understandsCatalogName = true;
+
+	private String suggested_primary_key_strategy_query = null;
+
+	public H2MetaDataDialect() {
+		super();
+		try {
+			Class<?> constants = ReflectionUtil.classForName( "org.h2.engine.Constants" );
+			Integer build = (Integer)constants.getDeclaredField( "BUILD_ID" ).get( null );
+			if ( build < 55 ) {
+				understandsCatalogName = false;
+			}
+			suggested_primary_key_strategy_query = build > 200 ? SPKSQ_H2_2_X : SPKSQ_H2_1_X;
+		}
+		catch( Throwable e ) {
+			// ignore (probably H2 not in the classpath)
+		}
+	}
+
+	protected void putTableType(Map<String, Object> element, ResultSet tableRs) throws SQLException {
+		String tableType = tableRs.getString("TABLE_TYPE");
+		if ("BASE TABLE".equals(tableType)) {
+			tableType = "TABLE";
+		}
+		element.put("TABLE_TYPE", tableType);
+	}
+
+	protected void putTablePart(Map<String, Object> element, ResultSet tableRs) throws SQLException {
+		super.putTablePart( element, tableRs );
+		if ( !understandsCatalogName ) {
+			element.put( "TABLE_CAT", null );
+		}
+	}
+
+	protected void putExportedKeysPart(Map<String, Object> element, ResultSet rs) throws SQLException {
+		super.putExportedKeysPart( element, rs );
+		if ( !understandsCatalogName ) {
+			element.put( "PKTABLE_CAT", null );
+		}
+	}
+
+	public Iterator<Map<String, Object>> getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table) {
+			try {
+				catalog = caseForSearch( catalog );
+				schema = caseForSearch( schema );
+				table = caseForSearch( table );
+
+				log.debug("geSuggestedPrimaryKeyStrategyName(" + catalog + "." + schema + "." + table + ")");
+
+				String sql =  suggested_primary_key_strategy_query;
+				if(catalog!=null) {
+					sql += "AND idx.TABLE_CATALOG like '" + catalog + "' ";
+				}
+				if(schema!=null) {
+					sql += "AND idx.TABLE_SCHEMA like '" + schema + "' ";
+				}
+				if(table!=null) {
+					sql += "AND idx.TABLE_NAME like '" + table + "' ";
+				}
+
+				PreparedStatement statement = getConnection().prepareStatement( sql );
+
+				return new ResultSetIterator(statement, statement.executeQuery()) {
+
+					final Map<String, Object> element = new HashMap<>();
+					protected Map<String, Object> convertRow(ResultSet tableRs) throws SQLException {
+						element.clear();
+						putTablePart( element, tableRs );
+						element.put("HIBERNATE_STRATEGY", "identity");
+						return element;
+					}
+					protected Throwable handleSQLException(SQLException e) {
+						// schemaRs and catalogRs are only used for error reporting if
+						// we get an exception
+						throw new RuntimeException(
+								"Could not get list of suggested identity strategies from database. Probably a JDBC driver problem. ", e );
+					}
+				};
+			}
+			catch (SQLException e) {
+				throw new RuntimeException("Could not get list of suggested identity strategies from database. Probably a JDBC driver problem.", e);
+			}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/HSQLMetaDataDialect.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/HSQLMetaDataDialect.java
new file mode 100644
index 000000000000..ed36b18c646a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/HSQLMetaDataDialect.java
@@ -0,0 +1,97 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class HSQLMetaDataDialect extends JDBCMetaDataDialect {
+
+	private String quote(String columnName) {
+		if(columnName==null) return null;
+		if(needQuote(columnName)) {
+			if(columnName.length()>1 && columnName.charAt(0)=='\"' && columnName.charAt(columnName.length()-1)=='\"') {
+				return columnName; // avoid double quoting
+			}
+			return "\"" + columnName + "\"";
+		}
+		else {
+			return columnName;
+		}
+	}
+
+	public Iterator<Map<String, Object>> getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table) {
+			try {
+				catalog = caseForSearch( catalog );
+				schema = caseForSearch( schema );
+				table = caseForSearch( table );
+
+				//log.debug("geSuggestedPrimaryKeyStrategyName(" + catalog + "." + schema + "." + table + ")");
+
+				final String sc = schema;
+				final String cat = catalog;
+				return new ResultSetIterator(getMetaData().getTables(catalog, schema, table, new String[]{"TABLE"})) {
+
+					final Map<String, Object> element = new HashMap<>();
+					protected Map<String, Object> convertRow(ResultSet tableRs) throws SQLException{
+						String table = tableRs.getString("TABLE_NAME");
+						String fullTableName = TableNameQualifier.qualify(quote(cat), quote(sc), quote(table));
+
+						String sql ="SELECT * FROM " + fullTableName + " WHERE 0>1"; // can't use FALSE constant since it would not work with older HSQL versions. (JBIDE-5957)
+						boolean isAutoIncrement = false;
+
+						try (PreparedStatement statement = getConnection().prepareStatement( sql )) {
+							element.clear();
+							element.put( "TABLE_NAME", table );
+							element.put( "TABLE_SCHEM", sc );
+							element.put( "TABLE_CAT", null );
+
+							ResultSet rs = statement.executeQuery();
+							ResultSetMetaData rsmd = rs.getMetaData();
+							for ( int i = 0; i < rsmd.getColumnCount(); i++ ) {
+								isAutoIncrement = rsmd.isAutoIncrement( i + 1 );
+								if ( isAutoIncrement ) break;
+							}
+
+						}
+						catch (SQLException e) {
+							//log error and set HIBERNATE_STRATEGY to null
+							log.debug(
+									"Error while getting suggested primary key strategy for " + fullTableName + ". Falling back to default strategy.",
+									e );
+						}
+
+						if(isAutoIncrement) {
+							element.put("HIBERNATE_STRATEGY", "identity");
+						}
+						else {
+							element.put("HIBERNATE_STRATEGY", null);
+						}
+						return element;
+					}
+					protected Throwable handleSQLException(SQLException e) {
+						// schemaRs and catalogRs are only used for error reporting if
+						// we get an exception
+						throw new RuntimeException(
+								"Could not get list of suggested identity strategies from database. Probably a JDBC driver problem. ", e);
+					}
+				};
+			}
+			catch (SQLException e) {
+				throw new RuntimeException("Could not get list of suggested identity strategies from database. Probably a JDBC driver problem. ", e);
+			}
+		}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/JDBCMetaDataDialect.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/JDBCMetaDataDialect.java
new file mode 100644
index 000000000000..eb8d7f1fd03b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/JDBCMetaDataDialect.java
@@ -0,0 +1,215 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * MetaData dialect that uses standard JDBC for reading metadata.
+ *
+ * @author Max Rydahl Andersen
+ *
+ */
+public class JDBCMetaDataDialect extends AbstractMetaDataDialect {
+
+	public Iterator<Map<String,Object>> getTables(String xcatalog, String xschema, String xtable) {
+		try {
+			final String catalog = caseForSearch( xcatalog );
+			final String schema = caseForSearch( xschema );
+			final String table = caseForSearch( xtable );
+
+			log.debug("getTables(" + catalog + "." + schema + "." + table + ")");
+
+			ResultSet tableRs = getMetaData().getTables(catalog , schema , table, new String[] { "TABLE", "VIEW" });
+
+			return new ResultSetIterator(tableRs) {
+
+				final Map<String, Object> element = new HashMap<>();
+				protected Map<String, Object> convertRow(ResultSet tableResultSet) throws SQLException {
+					element.clear();
+					putTablePart( element, tableResultSet );
+					putTableType(element, tableResultSet);
+					element.put("REMARKS", tableResultSet.getString("REMARKS"));
+					return element;
+				}
+				protected Throwable handleSQLException(SQLException e) {
+					// schemaRs and catalogRs are only used for error reporting if
+					// we get an exception
+					String databaseStructure = getDatabaseStructure( catalog, schema );
+					throw new RuntimeException(
+							"Could not get list of tables from database. Probably a JDBC driver problem. "
+									+ databaseStructure,
+							e );
+				}
+			};
+		}
+		catch (SQLException e) {
+			// schemaRs and catalogRs are only used for error reporting if we get an exception
+			String databaseStructure = getDatabaseStructure(xcatalog,xschema);
+			throw new RuntimeException(
+					"Could not get list of tables from database. Probably a JDBC driver problem. " + databaseStructure, e);
+		}
+	}
+
+	public Iterator<Map<String, Object>> getIndexInfo(final String xcatalog, final String xschema, final String xtable) {
+		try {
+			final String catalog = caseForSearch( xcatalog );
+			final String schema = caseForSearch( xschema );
+			final String table = caseForSearch( xtable );
+
+			log.debug("getIndexInfo(" + catalog + "." + schema + "." + table + ")");
+			ResultSet tableRs = getMetaData().getIndexInfo(catalog , schema , table, false, true);
+
+			return new ResultSetIterator(tableRs) {
+
+				final Map<String, Object> element = new HashMap<>();
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					element.clear();
+					putTablePart(element, rs);
+					element.put("INDEX_NAME", rs.getString("INDEX_NAME"));
+					element.put("COLUMN_NAME", rs.getString("COLUMN_NAME"));
+					element.put("NON_UNIQUE", rs.getBoolean( "NON_UNIQUE" ) );
+					element.put("TYPE", rs.getShort( "TYPE" ) );
+					return element;
+				}
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(
+							"Exception while getting index info for " + TableNameQualifier.qualify(catalog, schema, table), e);
+				}
+			};
+		}
+		catch (SQLException e) {
+			throw new RuntimeException(
+					"Exception while getting index info for " + TableNameQualifier.qualify(xcatalog, xschema, xtable), e);
+		}
+	}
+
+	protected void putTableType(Map<String, Object> element, ResultSet tableRs) throws SQLException {
+		element.put("TABLE_TYPE", tableRs.getString("TABLE_TYPE"));
+	}
+
+	protected void putTablePart(Map<String, Object> element, ResultSet tableRs) throws SQLException {
+		element.put("TABLE_NAME", tableRs.getString("TABLE_NAME"));
+		element.put("TABLE_SCHEM", tableRs.getString("TABLE_SCHEM"));
+		element.put("TABLE_CAT", tableRs.getString("TABLE_CAT"));
+	}
+
+	public Iterator<Map<String, Object>> getColumns(final String xcatalog, final String xschema, final String xtable, String xcolumn) {
+		try {
+			final String catalog = caseForSearch( xcatalog );
+			final String schema = caseForSearch( xschema );
+			final String table = caseForSearch( xtable );
+			final String column = caseForSearch( xcolumn );
+
+			log.debug("getColumns(" + catalog + "." + schema + "." + table + "." + column + ")");
+			ResultSet tableRs = getMetaData().getColumns(catalog, schema, table, column);
+
+			return new ResultSetIterator(tableRs) {
+
+				final Map<String, Object> element = new HashMap<>();
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					element.clear();
+					putTablePart(element, rs);
+					element.put("DATA_TYPE", rs.getInt( "DATA_TYPE" ) );
+					element.put("TYPE_NAME", rs.getString("TYPE_NAME"));
+					element.put("COLUMN_NAME", rs.getString("COLUMN_NAME"));
+					element.put("NULLABLE", rs.getInt( "NULLABLE" ) );
+					element.put("COLUMN_SIZE", rs.getInt( "COLUMN_SIZE" ) );
+					element.put("DECIMAL_DIGITS", rs.getInt( "DECIMAL_DIGITS" ) );
+					element.put("REMARKS", rs.getString("REMARKS"));
+					return element;
+				}
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException("Error while reading column meta data for " + TableNameQualifier.qualify(catalog, schema, table), e);
+				}
+			};
+		}
+		catch (SQLException e) {
+			throw new RuntimeException("Error while reading column meta data for " + TableNameQualifier.qualify(xcatalog, xschema, xtable), e);
+		}
+	}
+
+	public Iterator<Map<String, Object>> getPrimaryKeys(final String xcatalog, final String xschema, final String xtable) {
+		try {
+			final String catalog = caseForSearch( xcatalog );
+			final String schema = caseForSearch( xschema );
+			final String table = caseForSearch( xtable );
+
+			log.debug("getPrimaryKeys(" + catalog + "." + schema + "." + table + ")");
+			ResultSet tableRs = getMetaData().getPrimaryKeys(catalog, schema, table);
+
+			return new ResultSetIterator(tableRs) {
+
+				final Map<String, Object> element = new HashMap<>();
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					element.clear();
+					putTablePart(element, rs);
+					element.put("COLUMN_NAME", rs.getString("COLUMN_NAME"));
+					element.put("KEY_SEQ", rs.getShort( "KEY_SEQ" ) );
+					element.put("PK_NAME", rs.getString("PK_NAME"));
+					return element;
+				}
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(
+							"Error while reading primary key meta data for " + TableNameQualifier.qualify(catalog, schema, table),
+							e);
+				}
+			};
+		}
+		catch (SQLException e) {
+			throw new RuntimeException(
+					"Error while reading primary key meta data for " + TableNameQualifier.qualify(xcatalog, xschema, xtable), e);
+		}
+	}
+
+	public Iterator<Map<String, Object>> getExportedKeys(final String xcatalog, final String xschema, final String xtable) {
+		try {
+			final String catalog = caseForSearch( xcatalog );
+			final String schema = caseForSearch( xschema );
+			final String table = caseForSearch( xtable );
+
+			log.debug("getExportedKeys(" + catalog + "." + schema + "." + table + ")");
+			ResultSet tableRs = getMetaData().getExportedKeys(catalog, schema, table);
+
+			return new ResultSetIterator(tableRs) {
+
+				final Map<String, Object> element = new HashMap<>();
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					element.clear();
+					putExportedKeysPart( element, rs );
+					return element;
+				}
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(
+							"Error while reading exported keys meta data for " + TableNameQualifier.qualify(catalog, schema, table), e);
+				}
+			};
+		}
+		catch (SQLException e) {
+			throw new RuntimeException(
+					"Error while reading exported keys meta data for " + TableNameQualifier.qualify(xcatalog, xschema, xtable), e);
+		}
+	}
+
+	protected void putExportedKeysPart(Map<String, Object> element, ResultSet rs) throws SQLException {
+		element.put( "PKTABLE_NAME", rs.getString("PKTABLE_NAME"));
+		element.put( "PKTABLE_SCHEM", rs.getString("PKTABLE_SCHEM"));
+		element.put( "PKTABLE_CAT", rs.getString("PKTABLE_CAT"));
+		element.put( "FKTABLE_CAT", rs.getString("FKTABLE_CAT"));
+		element.put( "FKTABLE_SCHEM",rs.getString("FKTABLE_SCHEM"));
+		element.put( "FKTABLE_NAME", rs.getString("FKTABLE_NAME"));
+		element.put( "FKCOLUMN_NAME", rs.getString("FKCOLUMN_NAME"));
+		element.put( "PKCOLUMN_NAME", rs.getString("PKCOLUMN_NAME"));
+		element.put( "FK_NAME", rs.getString("FK_NAME"));
+		element.put( "KEY_SEQ", rs.getShort( "KEY_SEQ" ) );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/MySQLMetaDataDialect.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/MySQLMetaDataDialect.java
new file mode 100644
index 000000000000..7addcca02fae
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/MySQLMetaDataDialect.java
@@ -0,0 +1,87 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+public class MySQLMetaDataDialect extends JDBCMetaDataDialect {
+
+	/**
+	 * Based on info from <a href="http://dev.mysql.com/doc/refman/5.0/en/show-table-status.html">...</a>
+	 * Should work on pre-mysql 5 too since it uses the "old" SHOW TABLE command instead of SELECT from infotable.
+	 */
+	public Iterator<Map<String, Object>> getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table) {
+		String sql;
+			try {
+				catalog = caseForSearch( catalog );
+				schema = caseForSearch( schema );
+				table = caseForSearch( table );
+
+				log.debug("geSuggestedPrimaryKeyStrategyName(" + catalog + "." + schema + "." + table + ")");
+
+				sql = "show table status " + (catalog==null?"":" from " + catalog + " ") + (table==null?"":" like '" + table + "' ");
+				PreparedStatement statement = getConnection().prepareStatement( sql );
+
+				final String sc = schema;
+				final String cat = catalog;
+				return new ResultSetIterator(statement, statement.executeQuery()) {
+
+					final Map<String, Object> element = new HashMap<>();
+					protected Map<String, Object> convertRow(ResultSet tableRs) throws SQLException {
+						element.clear();
+						element.put("TABLE_NAME", tableRs.getString("NAME"));
+						element.put("TABLE_SCHEM", sc);
+						element.put("TABLE_CAT", cat);
+
+						String string = tableRs.getString("AUTO_INCREMENT");
+						if(string==null) {
+							element.put("HIBERNATE_STRATEGY", null);
+						}
+						else {
+							element.put("HIBERNATE_STRATEGY", "identity");
+						}
+						return element;
+					}
+					protected Throwable handleSQLException(SQLException e) {
+						// schemaRs and catalogRs are only used for error reporting if
+						// we get an exception
+						throw new RuntimeException(
+								"Could not get list of suggested identity strategies from database. Probably a JDBC driver problem. ", e);
+					}
+				};
+			}
+			catch (SQLException e) {
+				throw new RuntimeException("Could not get list of suggested identity strategies from database. Probably a JDBC driver problem. ", e);
+			}
+		}
+
+	@Override
+	public Iterator<Map<String,Object>> getTables(
+			String xcatalog,
+			String xschema,
+			String xtable) {
+		// MySql JDBC Driver doesn't like 'null' values for the table search pattern, use '%' instead
+		return super.getTables(xcatalog, xschema, xtable != null ? xtable : "%");
+	}
+
+	public Iterator<Map<String, Object>> getColumns(
+			String xcatalog,
+			String xschema,
+			String xtable,
+			String xcolumn) {
+		// MySql JDBC Driver doesn't like 'null' values for the table and column search patterns, use '%' instead
+		return super.getColumns(
+				xcatalog,
+				xschema,
+				xtable != null ? xtable : "%",
+				xcolumn != null ? xcolumn : "%");
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/OracleMetaDataDialect.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/OracleMetaDataDialect.java
new file mode 100644
index 000000000000..0c2a583aebd9
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/OracleMetaDataDialect.java
@@ -0,0 +1,742 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Oracle Specialised MetaData dialect that uses standard JDBC and querys on the
+ * Data Dictionary for reading metadata.
+ *
+ * @author David Channon
+ * @author Eric Kershner (added preparedstatements HBX-817)
+ * @author Jacques Stadler (added HBX-1027)
+ *
+ */
+
+public class OracleMetaDataDialect extends AbstractMetaDataDialect {
+
+
+
+	public OracleMetaDataDialect() {
+		super();
+	}
+
+	/* ******* TABLE QUERIES ******* */
+	private static final String SQL_TABLE_BASE =
+			"""
+					select a.table_name, a.owner, \
+					(SELECT b.comments
+					FROM all_tab_comments b
+					WHERE a.owner = b.owner
+							AND a.table_name = b.table_name) AS comments, \
+					'TABLE' \
+					from all_tables a\s""";
+
+	private static final String SQL_TABLE_VIEW =
+		" union all select view_name, owner, NULL, 'VIEW' from all_views ";
+
+	private static final String SQL_TABLE_NONE = SQL_TABLE_BASE	+ SQL_TABLE_VIEW;
+
+	private static final String SQL_TABLE_SCHEMA = SQL_TABLE_BASE
+			+ "where a.owner like ? " + SQL_TABLE_VIEW + " where owner like ?";
+
+	private static final String SQL_TABLE_TABLE = SQL_TABLE_BASE
+			+ "where a.table_name like ?" + SQL_TABLE_VIEW + "where view_name like ?";
+
+	private static final String SQL_TABLE_SCHEMA_AND_TABLE =
+		SQL_TABLE_BASE
+			+ "where a.owner like ? and a.table_name like ?"
+	+ SQL_TABLE_VIEW
+	+ "where owner like ? and view_name like ?";
+
+	private PreparedStatement prepTableNone;
+
+	private PreparedStatement prepTableSchema;
+
+	private PreparedStatement prepTableTable;
+
+	private PreparedStatement prepTableSchemaAndTable;
+
+	/* ***************************** */
+	/* ******* INDEX QUERIES ******* */
+	/* ***************************** */
+	private static final String SQL_INDEX_BASE =
+			"""
+					SELECT a.column_name
+						,decode((SELECT b.uniqueness
+									FROM all_indexes b
+								WHERE a.table_name = b.table_name
+										AND a.table_owner = b.table_owner
+										AND a.index_name = b.index_name
+										AND b.index_type NOT LIKE 'FUNCTION-BASED%'), 'UNIQUE', 'false', 'true') AS uniqueness
+						,a.index_owner
+						,a.index_name
+						,a.table_name
+					FROM all_ind_columns a
+					\
+					WHERE 1 = 1
+					\s""";
+
+	private static final String SQL_INDEX_ORDER = " order by a.table_name, a.column_position";
+
+	private static final String SQL_INDEX_NONE = SQL_INDEX_BASE
+			+ SQL_INDEX_ORDER;
+
+	private static final String SQL_INDEX_SCHEMA = SQL_INDEX_BASE
+			+ "and a.table_owner like ? " + SQL_INDEX_ORDER;
+
+	private static final String SQL_INDEX_TABLE = SQL_INDEX_BASE
+			+ "and a.table_name like ? " + SQL_INDEX_ORDER;
+
+	private static final String SQL_INDEX_SCHEMA_AND_TABLE = SQL_INDEX_BASE
+			+ "and a.table_owner like ? and a.table_name like ? " + SQL_INDEX_ORDER;
+
+	private PreparedStatement prepIndexNone;
+
+	private PreparedStatement prepIndexSchema;
+
+	private PreparedStatement prepIndexTable;
+
+	private PreparedStatement prepIndexSchemaAndTable;
+
+	/* ****** COLUMN QUERIES ******* */
+	private static final String SQL_COLUMN_BASE =
+			"""
+					SELECT a.column_name AS COLUMN_NAME
+						,a.owner AS TABLE_SCHEM
+						,decode(a.nullable, 'N', 0, 1) AS NULLABLE
+						,decode(a.data_type, 'FLOAT', decode(a.data_precision, NULL, a.data_length, a.data_precision), 'NUMBER',
+								decode(a.data_precision, NULL, a.data_length, a.data_precision), 'VARCHAR2', a.char_length, 'VARCHAR',
+								a.char_length, 'NVARCHAR2', a.char_length, 'CHAR', a.char_length, 'NCHAR', a.char_length, a.data_length) AS COLUMN_SIZE
+						,CASE
+							WHEN a.data_type LIKE 'TIMESTAMP%' THEN
+							93
+							ELSE
+							decode(a.data_type, 'CHAR', 1, 'DATE', 91, 'FLOAT', 6, 'LONG', -1, 'NUMBER', 2, 'VARCHAR2', 12, 'BFILE', -13,
+									'BLOB', 2004, 'CLOB', 2005, 'MLSLABEL', 1111, 'NCHAR', 1, 'NCLOB', 2005, 'NVARCHAR2', 12, 'RAW', -3,
+									'ROWID', 1111, 'UROWID', 1111, 'LONG RAW', -4, 'XMLTYPE', 2005, 1111)
+						END AS DATA_TYPE
+						,a.table_name AS TABLE_NAME
+						,a.data_type AS TYPE_NAME
+						,decode(a.data_scale, NULL, 0, a.data_scale) AS DECIMAL_DIGITS
+						,(SELECT b.comments
+							FROM all_col_comments b
+							WHERE a.owner = b.owner
+								AND a.table_name = b.table_name
+								AND a.column_name = b.column_name) AS COMMENTS
+					FROM all_tab_columns a
+					""";
+
+	private static final String SQL_COLUMN_ORDER = " order by column_id ";
+
+	private static final String SQL_COLUMN_NONE = SQL_COLUMN_BASE
+			+ SQL_COLUMN_ORDER;
+
+	private static final String SQL_COLUMN_SCHEMA = SQL_COLUMN_BASE
+			+ "where a.owner like ? " + SQL_COLUMN_ORDER;
+
+	private static final String SQL_COLUMN_TABLE = SQL_COLUMN_BASE
+			+ "where a.table_name like ? " + SQL_COLUMN_ORDER;
+
+	private static final String SQL_COLUMN_COLUMN = SQL_COLUMN_BASE
+			+ "where a.column_name like ? " + SQL_COLUMN_ORDER;
+
+	private static final String SQL_COLUMN_SCHEMA_AND_TABLE = SQL_COLUMN_BASE
+			+ "where a.owner like ? and a.table_name like ? " + SQL_COLUMN_ORDER;
+
+	private static final String SQL_COLUMN_SCHEMA_AND_COLUMN = SQL_COLUMN_BASE
+			+ "where a.owner like ? and a.column_name like ? " + SQL_COLUMN_ORDER;
+
+	private static final String SQL_COLUMN_TABLE_AND_COLUMN = SQL_COLUMN_BASE
+			+ "where a.table_name like ? and a.column_name like ? "
+			+ SQL_COLUMN_ORDER;
+
+	private static final String SQL_COLUMN_SCHEMA_AND_TABLE_AND_COLUMN = SQL_COLUMN_BASE
+			+ "where a.owner like ? and a.table_name like ? and a.column_name like ? "
+			+ SQL_COLUMN_ORDER;
+
+	private PreparedStatement prepColumnNone;
+
+	private PreparedStatement prepColumnSchema;
+
+	private PreparedStatement prepColumnTable;
+
+	private PreparedStatement prepColumnColumn;
+
+	private PreparedStatement prepColumnSchemaAndTable;
+
+	private PreparedStatement prepColumnSchemaAndColumn;
+
+	private PreparedStatement prepColumnTableAndColumn;
+
+	private PreparedStatement prepColumnSchemaAndTableAndColumn;
+
+	/* ***************************** */
+	/* ******** PK QUERIES ********* */
+	/* ***************************** */
+	private static final String SQL_PK_BASE =
+			"select c.table_name, c.column_name, c.position,  c.constraint_name, "
+			+ "c.owner from all_cons_columns c join all_constraints k on "
+			+ "(k.owner = c.owner AND k.table_name = c.table_name AND k.constraint_name = c.constraint_name) "
+			+ "where  k.constraint_type = 'P' ";
+
+	private static final String SQL_PK_ORDER = " order by c.table_name, c.constraint_name, c.position desc ";
+
+	private static final String SQL_PK_NONE = SQL_PK_BASE + SQL_PK_ORDER;
+
+	private static final String SQL_PK_SCHEMA = SQL_PK_BASE
+			+ " and c.owner like ? escape '\\' " + SQL_PK_ORDER;
+
+	private static final String SQL_PK_TABLE = SQL_PK_BASE
+			+ " and c.table_name like ? escape '\\' " + SQL_PK_ORDER;
+
+	private static final String SQL_PK_SCHEMA_AND_TABLE = SQL_PK_BASE
+			+ " and c.owner like ? escape '\\' and c.table_name like ? escape '\\' " + SQL_PK_ORDER;
+
+	private PreparedStatement prepPkNone;
+
+	private PreparedStatement prepPkSchema;
+
+	private PreparedStatement prepPkTable;
+
+	private PreparedStatement prepPkSchemaAndTable;
+
+	/* ***************************** */
+	/* ******** FK QUERIES ********* */
+	/* ***************************** */
+	private static final String SQL_FK_BASE =
+			"""
+					SELECT p.table_name as p_table_name
+						,p.owner as p_owner
+						,f.owner as f_owner
+						,f.table_name as f_table_name
+						,(SELECT fc.column_name
+							FROM all_cons_columns fc
+							WHERE fc.owner = f.owner
+								AND fc.constraint_name = f.constraint_name
+								AND fc.table_name = f.table_name
+								AND fc.position = pc.position) AS fc_column_name
+						,pc.column_name as pc_column_name
+						,f.constraint_name
+						,(SELECT fc.position
+							FROM all_cons_columns fc
+							WHERE fc.owner = f.owner
+								AND fc.constraint_name = f.constraint_name
+								AND fc.table_name = f.table_name
+								AND fc.position = pc.position) AS fc_position
+					FROM all_constraints p
+					JOIN all_cons_columns pc
+						ON pc.owner = p.owner
+						AND pc.constraint_name = p.constraint_name
+						AND pc.table_name = p.table_name
+					JOIN all_constraints f
+						ON p.owner = f.r_owner
+						AND p.constraint_name = f.r_constraint_name
+					WHERE f.constraint_type = 'R'
+						AND p.constraint_type = 'P'
+					""";
+
+	private static final String SQL_FK_ORDER = " order by f.table_name, f.constraint_name, position ";
+
+	private static final String SQL_FK_NONE = SQL_FK_BASE + SQL_FK_ORDER;
+
+	private static final String SQL_FK_SCHEMA = SQL_FK_BASE
+			+ " and p.owner like ? " + SQL_FK_ORDER;
+
+	private static final String SQL_FK_TABLE = SQL_FK_BASE
+			+ " and p.table_name like ? " + SQL_FK_ORDER;
+
+	private static final String SQL_FK_SCHEMA_AND_TABLE = SQL_FK_BASE
+			+ " and p.owner like ? and p.table_name like ? " + SQL_FK_ORDER;
+
+	private PreparedStatement prepFkNone;
+
+	private PreparedStatement prepFkSchema;
+
+	private PreparedStatement prepFkTable;
+
+	private PreparedStatement prepFkSchemaAndTable;
+
+	public Iterator<Map<String,Object>> getTables(final String catalog, final String schema,
+			String table) {
+		try {
+			log.debug("getTables(" + catalog + "." + schema + "." + table + ")");
+
+			ResultSet tableRs = getTableResultSet( schema, table );
+
+			return new ResultSetIterator(null, tableRs) {
+
+				final Map<String, Object> element = new HashMap<>();
+
+
+				protected Map<String, Object> convertRow(ResultSet tableResultSet)
+						throws SQLException {
+					element.clear();
+					element.put("TABLE_NAME", tableResultSet.getString(1));
+					element.put("TABLE_SCHEM", tableResultSet.getString(2));
+					element.put("TABLE_CAT", null);
+					element.put("TABLE_TYPE", tableResultSet.getString(4));
+		element.put("REMARKS", tableResultSet.getString(3));
+					log.info( element.toString() );
+					return element;
+				}
+
+				protected Throwable handleSQLException(SQLException e) {
+					// schemaRs and catalogRs are only used for error reporting
+					// if
+					// we get an exception
+					String databaseStructure = getDatabaseStructure(catalog,
+							schema);
+					throw new RuntimeException(
+							"Could not get list of tables from database. Probably a JDBC driver problem. "
+									+ databaseStructure,
+							e);
+				}
+			};
+		}
+		catch (SQLException e) {
+			// schemaRs and catalogRs are only used for error reporting if we
+			// get an exception
+			String databaseStructure = getDatabaseStructure(catalog, schema);
+			throw new RuntimeException(
+					"Could not get list of tables from database. Probably a JDBC driver problem. "
+							+ databaseStructure,
+					e);
+		}
+	}
+
+	public Iterator<Map<String, Object>> getIndexInfo(final String catalog, final String schema,
+			final String table) {
+		try {
+			log.debug("getIndexInfo(" + catalog + "." + schema + "." + table + ")");
+
+			ResultSet indexRs;
+			indexRs = getIndexInfoResultSet( schema, table );
+
+			return new ResultSetIterator(null, indexRs) {
+
+				final Map<String, Object> element = new HashMap<>();
+
+
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					element.clear();
+					element.put("COLUMN_NAME", rs.getString(1));
+					element.put("TYPE", (short) 1 ); // CLUSTERED
+																// INDEX
+					element.put("NON_UNIQUE", Boolean.valueOf(rs.getString(2)));
+					element.put("TABLE_SCHEM", rs.getString(3));
+					element.put("INDEX_NAME", rs.getString(4));
+					element.put("TABLE_CAT", null);
+					element.put("TABLE_NAME", rs.getString(5));
+
+					return element;
+				}
+
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(
+							"Exception while getting index info for "
+									+ TableNameQualifier.qualify(catalog, schema, table),
+							e);
+				}
+			};
+		}
+		catch (SQLException e) {
+			throw new RuntimeException (
+					"Exception while getting index info for "
+							+ TableNameQualifier.qualify(catalog, schema, table) + ": " + e.getMessage(),
+					e);
+		}
+	}
+
+	public Iterator<Map<String, Object>> getColumns(final String catalog, final String schema,
+			final String table, String column) {
+
+		try {
+			log.debug("getColumns(" + catalog + "." + schema + "." + table + "." + column + ")");
+
+			ResultSet columnRs;
+			columnRs = getColumnsResultSet( schema, table, column );
+
+			return new ResultSetIterator(null, columnRs) {
+
+				final Map<String, Object> element = new HashMap<>();
+
+
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					element.clear();
+					element.put("COLUMN_NAME", rs.getString(1));
+					element.put("TABLE_SCHEM", rs.getString(2));
+					element.put("NULLABLE", rs.getInt( 3 ) );
+					element.put("COLUMN_SIZE", rs.getInt( 4 ) );
+					element.put("DATA_TYPE", rs.getInt( 5 ) );
+					element.put("TABLE_NAME", rs.getString(6));
+					element.put("TYPE_NAME", rs.getString(7));
+					element.put("DECIMAL_DIGITS", rs.getInt( 8 ) );
+					element.put("TABLE_CAT", null);
+					element.put("REMARKS", rs.getString(9));
+					return element;
+				}
+
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(
+							"Error while reading column meta data for "
+									+ TableNameQualifier.qualify(catalog, schema, table),
+							e);
+				}
+			};
+		}
+		catch (SQLException e) {
+			throw new RuntimeException(
+					"Error while reading column meta data for "
+							+ TableNameQualifier.qualify(catalog, schema, table),
+					e);
+		}
+	}
+
+	public Iterator<Map<String, Object>> getPrimaryKeys(final String catalog, final String schema,
+			final String table) {
+
+		try {
+			log.debug("getPrimaryKeys(" + catalog + "." + schema + "." + table
+					+ ")");
+
+			ResultSet pkeyRs;
+			pkeyRs = getPrimaryKeysResultSet( schema, table );
+
+			return new ResultSetIterator(null, pkeyRs) {
+
+				final Map<String, Object> element = new HashMap<>();
+
+
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					element.clear();
+					element.put("TABLE_NAME", rs.getString(1));
+					element.put("COLUMN_NAME", rs.getString(2));
+					element.put("KEY_SEQ", rs.getShort( 3 ) );
+					element.put("PK_NAME", rs.getString(4));
+					element.put("TABLE_SCHEM", rs.getString(5));
+					element.put("TABLE_CAT", null);
+					return element;
+				}
+
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(
+							"Error while reading primary key meta data for "
+									+ TableNameQualifier.qualify(catalog, schema, table),
+							e);
+				}
+			};
+		}
+		catch (SQLException e) {
+			throw new RuntimeException(
+					"Error while reading primary key meta data for "
+							+ TableNameQualifier.qualify(catalog, schema, table),
+					e);
+		}
+	}
+
+	public Iterator<Map<String, Object>> getExportedKeys(final String catalog, final String schema,
+			final String table) {
+
+		try {
+			log.debug("getExportedKeys(" + catalog + "." + schema + "." + table
+					+ ")");
+
+			ResultSet pExportRs = getExportedKeysResultSet( schema, table );
+
+			return new ResultSetIterator(null, pExportRs) {
+
+				final Map<String, Object> element = new HashMap<>();
+
+
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					element.clear();
+					element.put("PKTABLE_NAME", rs.getString(1));
+					element.put("PKTABLE_SCHEM", rs.getString(2));
+					element.put("PKTABLE_CAT", null);
+					element.put("FKTABLE_CAT", null);
+					element.put("FKTABLE_SCHEM", rs.getString(3));
+					element.put("FKTABLE_NAME", rs.getString(4));
+					element.put("FKCOLUMN_NAME", rs.getString(5));
+					element.put("PKCOLUMN_NAME", rs.getString(6));
+					element.put("FK_NAME", rs.getString(7));
+					element.put("KEY_SEQ", rs.getShort( 8 ) );
+					return element;
+				}
+
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(
+							"Error while reading exported keys meta data for "
+									+ TableNameQualifier.qualify(catalog, schema, table),
+							e);
+				}
+			};
+		}
+		catch (SQLException e) {
+			throw new RuntimeException(
+					"Error while reading exported keys meta data for "
+							+ TableNameQualifier.qualify(catalog, schema, table),
+					e);
+		}
+	}
+
+	public void close() {
+		try {
+			prepTableNone = close( prepTableNone );
+			prepTableSchema = close( prepTableSchema );
+			prepTableTable = close( prepTableTable );
+			prepTableSchemaAndTable = close( prepTableSchemaAndTable );
+			prepIndexNone = close( prepIndexNone );
+			prepIndexSchema = close( prepIndexSchema );
+			prepIndexTable = close( prepIndexTable );
+			prepIndexSchemaAndTable = close( prepIndexSchemaAndTable );
+			prepColumnNone = close( prepColumnNone );
+			prepColumnSchema = close( prepColumnSchema );
+			prepColumnTable = close( prepColumnTable );
+			prepColumnColumn = close( prepColumnColumn );
+			prepColumnSchemaAndTable = close( prepColumnSchemaAndTable );
+			prepColumnSchemaAndColumn = close( prepColumnSchemaAndColumn );
+			prepColumnTableAndColumn = close( prepColumnTableAndColumn );
+			prepColumnSchemaAndTableAndColumn = close( prepColumnSchemaAndTableAndColumn );
+			prepPkNone = close( prepPkNone );
+			prepPkSchema = close( prepPkSchema );
+			prepPkTable = close( prepPkTable );
+			prepPkSchemaAndTable = close( prepPkSchemaAndTable );
+			prepFkNone = close( prepFkNone );
+			prepFkSchema = close( prepFkSchema );
+			prepFkTable = close( prepFkTable );
+			prepFkSchemaAndTable = close( prepFkSchemaAndTable );
+		}
+		finally {
+			super.close();
+		}
+	}
+
+	private PreparedStatement close(PreparedStatement ps) {
+		try {
+			ps.close();
+		}
+		catch (SQLException e) {
+			throw new RuntimeException( "Problem while closing prepared statement", e);
+		}
+		return null;
+
+	}
+
+	private String escape(String str) {
+		return str.replace("_", "\\_");
+	}
+
+	private ResultSet getPrimaryKeysResultSet(final String schem, final String tab) throws SQLException {
+		String schema = escape(schem);
+		String table = escape(tab);
+		if(prepPkNone==null) {
+			// Prepare primary key queries
+			log.debug("Preparing primary key queries...");
+			Connection con = getConnection();
+			prepPkNone = con .prepareStatement(SQL_PK_NONE);
+			prepPkSchema = con.prepareStatement(SQL_PK_SCHEMA);
+			prepPkTable = con.prepareStatement(SQL_PK_TABLE);
+			prepPkSchemaAndTable = con
+			.prepareStatement(SQL_PK_SCHEMA_AND_TABLE);
+			log.debug("  primary key queries prepared!");
+		}
+
+		ResultSet pkeyRs;
+		prepPkSchemaAndTable.setString( 1, schema );
+		prepPkSchemaAndTable.setString( 2, table );
+		pkeyRs = prepPkSchemaAndTable.executeQuery();
+		return pkeyRs;
+	}
+
+	private ResultSet getIndexInfoResultSet(final String schema, final String table) throws SQLException {
+		if(prepIndexNone==null) {
+			//	Prepare index queries
+			log.debug("Preparing index queries...");
+			Connection con = getConnection();
+			prepIndexNone = con.prepareStatement(SQL_INDEX_NONE);
+			prepIndexSchema = con.prepareStatement(SQL_INDEX_SCHEMA);
+			prepIndexTable = con.prepareStatement(SQL_INDEX_TABLE);
+			prepIndexSchemaAndTable = con.prepareStatement(SQL_INDEX_SCHEMA_AND_TABLE);
+			log.debug("  ...index queries prepared!");
+		}
+		ResultSet indexRs;
+		if (schema == null && table == null) {
+			indexRs = prepIndexNone.executeQuery();
+		}
+		else if (schema != null) {
+			if (table == null) {
+				prepIndexSchema.setString(1, schema);
+				indexRs = prepIndexSchema.executeQuery();
+			}
+			else {
+				prepIndexSchemaAndTable.setString(1, schema);
+				prepIndexSchemaAndTable.setString(2, table);
+				indexRs = prepIndexSchemaAndTable.executeQuery();
+			}
+		}
+		else {
+			prepIndexTable.setString(1, table);
+			indexRs = prepIndexTable.executeQuery();
+		}
+		return indexRs;
+	}
+
+	private ResultSet getExportedKeysResultSet(final String schema, final String table) throws SQLException {
+		if(prepFkNone==null) {
+			//	Prepare foreign key queries
+			log.debug("Preparing foreign key queries...");
+			Connection con = getConnection();
+			prepFkNone = con .prepareStatement(SQL_FK_NONE);
+			prepFkSchema = con.prepareStatement(SQL_FK_SCHEMA);
+			prepFkTable = con.prepareStatement(SQL_FK_TABLE);
+			prepFkSchemaAndTable = con.prepareStatement(SQL_FK_SCHEMA_AND_TABLE);
+			log.debug("  foreign key queries prepared!");
+		}
+
+		ResultSet pExportRs;
+		if (schema == null && table == null) {
+			pExportRs = prepFkNone.executeQuery();
+		}
+		else if (schema != null) {
+			if (table == null) {
+				prepFkSchema.setString(1, schema);
+				pExportRs = prepFkSchema.executeQuery();
+			}
+			else {
+				prepFkSchemaAndTable.setString(1, schema);
+				prepFkSchemaAndTable.setString(2, table);
+				pExportRs = prepFkSchemaAndTable.executeQuery();
+			}
+		}
+		else {
+			prepFkTable.setString(1, table);
+			pExportRs = prepFkTable.executeQuery();
+		}
+		return pExportRs;
+	}
+	private ResultSet getColumnsResultSet(final String schema, final String table, String column) throws SQLException {
+
+		if(prepColumnNone==null) {
+			// Prepare column queries
+			log.debug("Preparing column queries...");
+			Connection con = getConnection();
+			prepColumnNone = con.prepareStatement(SQL_COLUMN_NONE);
+			prepColumnSchema = con.prepareStatement(SQL_COLUMN_SCHEMA);
+			prepColumnTable = con.prepareStatement(SQL_COLUMN_TABLE);
+			prepColumnColumn = con.prepareStatement(SQL_COLUMN_COLUMN);
+			prepColumnSchemaAndTable = con.prepareStatement(SQL_COLUMN_SCHEMA_AND_TABLE);
+			prepColumnSchemaAndColumn = con.prepareStatement(SQL_COLUMN_SCHEMA_AND_COLUMN);
+			prepColumnTableAndColumn = con.prepareStatement(SQL_COLUMN_TABLE_AND_COLUMN);
+			prepColumnSchemaAndTableAndColumn = con.prepareStatement(SQL_COLUMN_SCHEMA_AND_TABLE_AND_COLUMN);
+			log.debug("  ...column queries prepared!");
+		}
+
+		ResultSet columnRs;
+		// No parameters specified
+		if (schema == null && table == null && column == null) {
+			columnRs = prepColumnNone.executeQuery();
+		}
+		else if (schema != null) {
+			if (table == null) {
+				if (column == null) {
+					// Schema specified
+					prepColumnSchema.setString(1, schema);
+					columnRs = prepColumnSchema.executeQuery();
+				}
+				else {
+					// Schema and column specified
+					prepColumnSchemaAndColumn.setString(1, schema);
+					prepColumnSchemaAndColumn.setString(2, column);
+					columnRs = prepColumnSchemaAndColumn.executeQuery();
+				}
+			}
+			else {
+				if (column == null) {
+					// Schema and table specified
+					prepColumnSchemaAndTable.setString(1, schema);
+					prepColumnSchemaAndTable.setString(2, table);
+					columnRs = prepColumnSchemaAndTable.executeQuery();
+				}
+				else {
+					// Schema, table and column specified
+					prepColumnSchemaAndTableAndColumn.setString(1, schema);
+					prepColumnSchemaAndTableAndColumn.setString(2, table);
+					prepColumnSchemaAndTableAndColumn.setString(3, column);
+					columnRs = prepColumnSchemaAndTableAndColumn.executeQuery();
+				}
+			}
+		}
+		else {
+			if (table == null) {
+				// Column specified
+				prepColumnColumn.setString(1, column);
+				columnRs = prepColumnColumn.executeQuery();
+			}
+			else {
+				if (column == null) {
+					// Table specified
+					prepColumnTable.setString(1, table);
+					columnRs = prepColumnTable.executeQuery();
+				}
+				else {
+					// Table and column specified
+					prepColumnTableAndColumn.setString(1, table);
+					prepColumnTableAndColumn.setString(2, column);
+					columnRs = prepColumnTableAndColumn.executeQuery();
+
+				}
+			}
+		}
+		return columnRs;
+	}
+
+	private ResultSet getTableResultSet(final String schema, String table) throws SQLException {
+		ResultSet tableRs;
+		if(prepTableNone==null) {
+			// Prepare table queries
+			log.debug("Preparing table queries...");
+			Connection connection2 = getConnection();
+			prepTableNone = connection2.prepareStatement(SQL_TABLE_NONE);
+			prepTableSchema = connection2.prepareStatement(SQL_TABLE_SCHEMA);
+			prepTableTable = connection2.prepareStatement(SQL_TABLE_TABLE);
+			prepTableSchemaAndTable = connection2.prepareStatement(SQL_TABLE_SCHEMA_AND_TABLE);
+			log.debug("  ...table queries prepared!");
+		}
+		if (schema == null && table == null) {
+			tableRs = prepTableNone.executeQuery();
+		}
+		else if (schema != null) {
+			if (table == null) {
+				prepTableSchema.setString(1, schema);
+				prepTableSchema.setString(2, schema);
+				tableRs = prepTableSchema.executeQuery();
+			}
+			else {
+				prepTableSchemaAndTable.setString(1, schema);
+				prepTableSchemaAndTable.setString(2, table);
+				prepTableSchemaAndTable.setString(3, schema);
+				prepTableSchemaAndTable.setString(4, table);
+				tableRs = prepTableSchemaAndTable.executeQuery();
+			}
+		}
+		else {
+			prepTableTable.setString(1, table);
+			prepTableTable.setString(2, table);
+			tableRs = prepTableTable.executeQuery();
+		}
+		return tableRs;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/ResultSetIterator.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/ResultSetIterator.java
new file mode 100644
index 000000000000..79e8e9b2d716
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/ResultSetIterator.java
@@ -0,0 +1,98 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+
+/**
+ * Iterator over a resultset; intended usage only for metadata reading.
+ */
+public abstract class ResultSetIterator implements Iterator<Map<String, Object>> {
+
+	private final ResultSet rs;
+
+	protected boolean current = false;
+
+	protected boolean endOfRows = false;
+
+	private Statement statement = null;
+
+	protected ResultSetIterator(ResultSet resultset) {
+		this(null, resultset);
+	}
+
+	public ResultSetIterator(Statement stmt, ResultSet resultset) {
+		this.rs = resultset;
+		this.statement  = stmt;
+	}
+
+	public boolean hasNext() {
+		try {
+			advance();
+			return !endOfRows;
+		}
+		catch (SQLException e) {
+			handleSQLException( e );
+			return false;
+		}
+	}
+
+
+	public Map<String, Object> next() {
+		try {
+			advance();
+			if ( endOfRows ) {
+				throw new NoSuchElementException();
+			}
+			current = false;
+			return convertRow( rs );
+		}
+		catch (SQLException e) {
+			handleSQLException(e);
+			throw new NoSuchElementException("exception occurred " + e);
+		}
+
+	}
+
+	abstract protected Throwable handleSQLException(SQLException e);
+	abstract protected Map<String, Object> convertRow(ResultSet rs) throws SQLException;
+
+	public void remove() {
+		throw new UnsupportedOperationException(
+				"remove() not possible on ResultSet" );
+	}
+
+	protected void advance() throws SQLException {
+
+		if ( !current && !endOfRows ) {
+			if ( rs.next() ) {
+				current = true;
+				endOfRows = false;
+			}
+			else {
+				current = false;
+				endOfRows = true;
+			}
+		}
+	}
+
+	public void close() {
+		try {
+			rs.close();
+			if(statement!=null) {
+				statement.close();
+			}
+		}
+		catch (SQLException e) {
+			handleSQLException(e);
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/SQLServerMetaDataDialect.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/SQLServerMetaDataDialect.java
new file mode 100644
index 000000000000..0967150cdcdd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/dialect/SQLServerMetaDataDialect.java
@@ -0,0 +1,85 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ *
+ * @author ddukker
+ *
+ */
+public class SQLServerMetaDataDialect extends JDBCMetaDataDialect {
+
+	public Iterator<Map<String, Object>> getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table) {
+		String sql;
+			try {
+				catalog = caseForSearch( catalog );
+				schema = caseForSearch( schema );
+				table = caseForSearch( table );
+
+				log.debug("geSuggestedPrimaryKeyStrategyName(" + catalog + "." + schema + "." + table + ")");
+
+				sql = "SELECT a.TABLE_CATALOG, a.TABLE_SCHEMA, a.TABLE_NAME as table_name, c.DATA_TYPE as data_type, b.CONSTRAINT_TYPE,  OBJECTPROPERTY(OBJECT_ID(a.TABLE_NAME),'TableHasIdentity') as hasIdentity " +
+					"FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE a " +
+					"INNER JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS b on a.CONSTRAINT_NAME = b.CONSTRAINT_NAME " +
+					"INNER JOIN INFORMATION_SCHEMA.COLUMNS c on a.TABLE_CATALOG = c.TABLE_CATALOG AND a.TABLE_SCHEMA = c.TABLE_SCHEMA AND a.TABLE_NAME = c.TABLE_NAME AND a.COLUMN_NAME = c.COLUMN_NAME " +
+					"WHERE a.TABLE_NAME=? AND a.TABLE_SCHEMA=? AND a.TABLE_CATALOG=? AND b.CONSTRAINT_TYPE = 'Primary key'";
+
+				PreparedStatement statement = getConnection().prepareStatement( sql );
+				statement.setString(1, table);
+				statement.setString( 2, schema );
+				statement.setString( 3, catalog );
+
+				final String sc = schema;
+				final String cat = catalog;
+				return new ResultSetIterator(statement, statement.executeQuery()) {
+
+					final Map<String, Object> element = new HashMap<>();
+					protected Map<String, Object> convertRow(ResultSet tableRs) throws SQLException {
+						element.clear();
+						element.put("TABLE_NAME", tableRs.getString("table_name"));
+						element.put("TABLE_SCHEM", sc);
+						element.put("TABLE_CAT", cat);
+
+						String string = tableRs.getString("data_type");
+
+						boolean bool = tableRs.getBoolean("hasIdentity");
+						if(string!=null) {
+							if(string.equalsIgnoreCase("uniqueidentifier")){
+								element.put("HIBERNATE_STRATEGY", "guid");
+							}
+							else if(bool){
+								element.put("HIBERNATE_STRATEGY", "identity");
+							}
+							else{
+								element.put("HIBERNATE_STRATEGY", null);
+							}
+						}
+						else {
+							element.put("HIBERNATE_STRATEGY", null);
+						}
+						return element;
+					}
+					protected Throwable handleSQLException(SQLException e) {
+						// schemaRs and catalogRs are only used for error reporting if
+						// we get an exception
+						throw new RuntimeException(
+								"Could not get list of suggested identity strategies from database. Probably a JDBC driver problem. ", e);
+					}
+				};
+			}
+			catch (SQLException e) {
+				throw new RuntimeException(
+						"Could not get list of suggested identity strategies from database. Probably a JDBC driver problem. ", e);
+			}
+		}
+
+	}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/BasicColumnProcessor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/BasicColumnProcessor.java
new file mode 100644
index 000000000000..e91f9cfab309
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/BasicColumnProcessor.java
@@ -0,0 +1,138 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.reader;
+
+import org.hibernate.JDBCException;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.util.RevengUtils;
+import org.hibernate.tool.reveng.internal.util.JdbcToHibernateTypeHelper;
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+import org.jboss.logging.Logger;
+
+import java.sql.DatabaseMetaData;
+import java.util.Iterator;
+import java.util.Map;
+
+public class BasicColumnProcessor {
+
+	private static final Logger log = Logger.getLogger(BasicColumnProcessor.class);
+
+	public static void processBasicColumns(
+			RevengDialect metaDataDialect,
+			RevengStrategy revengStrategy,
+			String defaultSchema, String defaultCatalog,
+			Table table) {
+
+		String qualify = TableNameQualifier.qualify(table.getCatalog(), table.getSchema(), table.getName() );
+		Iterator<?> columnIterator = null;
+
+		try {
+			Map<?, ?> columnRs;
+			log.debug("Finding columns for " + qualify );
+			columnIterator = metaDataDialect.getColumns(getCatalogForDBLookup(table.getCatalog(), defaultCatalog), getSchemaForDBLookup(table.getSchema(), defaultSchema), table.getName(), null);
+			//dumpHeader(columnRs);
+			while (columnIterator.hasNext() ) {
+				//dumpRow(columnRs);
+				columnRs = (Map<?, ?>) columnIterator.next();
+				String tableName = (String) columnRs.get("TABLE_NAME");
+				int sqlType = (Integer) columnRs.get( "DATA_TYPE" );
+				//String sqlTypeName = (String) columnRs.get("TYPE_NAME");
+				String columnName = (String) columnRs.get("COLUMN_NAME");
+				String comment = (String) columnRs.get("REMARKS");
+
+				TableIdentifier ti = RevengUtils.createTableIdentifier(table, defaultCatalog, defaultSchema);
+				if(revengStrategy.excludeColumn(ti, columnName)) {
+					log.debug("Column " + ti + "." + columnName + " excluded by strategy");
+					continue;
+				}
+				if(!tableName.equals(table.getName())) {
+					log.debug("Table name " + tableName + " does not match requested " + table.getName() + ". Ignoring column " + columnName + " since it either is invalid or a duplicate" );
+					continue;
+				}
+
+				//String columnDefaultValue = columnRs.getString("COLUMN_DEF"); TODO: only read if have a way to avoid issues with clobs/lobs and similar
+				int dbNullability = (Integer) columnRs.get( "NULLABLE" );
+				boolean isNullable = dbNullability != DatabaseMetaData.columnNoNulls;
+				int size = (Integer) columnRs.get( "COLUMN_SIZE" );
+				int decimalDigits = (Integer) columnRs.get( "DECIMAL_DIGITS" );
+
+				Column column = new Column();
+				column.setName(quote(columnName, metaDataDialect));
+				Column existing = table.getColumn(column);
+				if(existing!=null) {
+					throw new RuntimeException(column + " already exists in " + qualify);
+				}
+
+				//TODO: column.setSqlType(sqlTypeName); //this does not work 'cos the precision/scale/length are not retured in TYPE_NAME
+				//column.setSqlType(sqlTypeName);
+				column.setComment(comment);
+				column.setSqlTypeCode( sqlType );
+				if(intBounds(size) ) {
+					if(JdbcToHibernateTypeHelper.typeHasLength(sqlType) ) {
+						column.setLength(size);
+					}
+					if(JdbcToHibernateTypeHelper.typeHasPrecision(sqlType) ) {
+						column.setPrecision(size);
+					}
+				}
+				if(intBounds(decimalDigits) ) {
+					if(JdbcToHibernateTypeHelper.typeHasScale(sqlType) ) {
+						column.setScale(decimalDigits);
+					}
+				}
+
+				column.setNullable(isNullable);
+
+				// columnDefaultValue is useless for Hibernate
+				// isIndexed  (available via Indexes)
+				// unique - detected when getting indexes
+				// isPk - detected when finding primary keys
+
+				table.addColumn(column);
+			}
+		}
+		finally {
+
+			if(columnIterator!=null) {
+				try {
+					metaDataDialect.close(columnIterator);
+				}
+				catch(JDBCException se) {
+					log.warn("Exception while closing iterator for column meta data",se);
+				}
+			}
+		}
+
+	}
+
+	private static String getCatalogForDBLookup(String catalog, String defaultCatalog) {
+		return catalog==null?defaultCatalog:catalog;
+	}
+
+	private static String getSchemaForDBLookup(String schema, String defaultSchema) {
+		return schema==null?defaultSchema:schema;
+	}
+
+	private static boolean intBounds(int size) {
+		return size>=0 && size!=Integer.MAX_VALUE;
+	}
+
+	private static String quote(String columnName, RevengDialect metaDataDialect) {
+		if(columnName==null) return null;
+		if(metaDataDialect.needQuote(columnName)) {
+			if(columnName.length()>1 && columnName.charAt(0)=='`' && columnName.charAt(columnName.length()-1)=='`') {
+				return columnName; // avoid double quoting
+			}
+			return "`" + columnName + "`";
+		}
+		else {
+			return columnName;
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/DatabaseReader.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/DatabaseReader.java
new file mode 100644
index 000000000000..59e47379e4d8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/DatabaseReader.java
@@ -0,0 +1,153 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.reader;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategy.SchemaSelection;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataCollector;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+public class DatabaseReader {
+
+	public static DatabaseReader create(
+			Properties properties,
+			RevengStrategy revengStrategy,
+			RevengDialect mdd,
+			ServiceRegistry serviceRegistry) {
+		ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class);
+		return new DatabaseReader(properties, mdd, connectionProvider, revengStrategy);
+	}
+
+	private final RevengStrategy revengStrategy;
+
+	private final RevengDialect metadataDialect;
+
+	private final ConnectionProvider provider;
+
+	private final Properties properties;
+
+	private DatabaseReader(
+			Properties properties,
+			RevengDialect dialect,
+			ConnectionProvider provider,
+			RevengStrategy reveng) {
+		this.metadataDialect = dialect;
+		this.provider = provider;
+		this.revengStrategy = reveng;
+		this.properties = properties;
+		if (revengStrategy == null) {
+			throw new IllegalStateException("Strategy cannot be null");
+		}
+	}
+
+	public void readDatabaseSchema(RevengMetadataCollector revengMetadataCollector) {
+		try {
+			metadataDialect.configure(provider);
+			TableCollector tableCollector = TableCollector.create(
+					metadataDialect,
+					revengStrategy,
+					revengMetadataCollector,
+					properties);
+			for ( SchemaSelection schemaSelection : getSchemaSelections() ) {
+				tableCollector.processTables( schemaSelection );
+			}
+			revengMetadataCollector.setOneToManyCandidates(resolveForeignKeys(revengMetadataCollector));
+
+		}
+		finally {
+			metadataDialect.close();
+			revengStrategy.close();
+		}
+	}
+
+	/**
+	 * Iterates the tables and find all the foreignkeys that refers to something
+	 * that is available inside the DatabaseCollector.
+	 */
+	private Map<String, List<ForeignKey>> resolveForeignKeys(RevengMetadataCollector revengMetadataCollector) {
+		List<ForeignKeysInfo> fks = new ArrayList<ForeignKeysInfo>();
+		ForeignKeyProcessor foreignKeyProcessor = ForeignKeyProcessor.create(
+				metadataDialect,
+				revengStrategy,
+				getDefaultCatalog(),
+				getDefaultSchema(),
+				revengMetadataCollector);
+		for (Table table : revengMetadataCollector.getTables()) {
+			// Done here after the basic process of collections as we might not have touched
+			// all referenced tables (this ensure the columns are the same instances
+			// througout the basic JDBC derived model.
+			// after this stage it should be "ok" to divert from keeping columns in sync as
+			// it can be required if the same
+			// column is used with different aliases in the ORM mapping.
+			ForeignKeysInfo foreignKeys = foreignKeyProcessor.processForeignKeys(table);
+			fks.add(foreignKeys);
+		}
+
+		Map<String, List<ForeignKey>> oneToManyCandidates = new HashMap<String, List<ForeignKey>>();
+		for ( ForeignKeysInfo element : fks ) {
+			Map<String, List<ForeignKey>> map = element.process( revengStrategy ); // the actual foreignkey is created
+			// here.
+			mergeMultiMap( oneToManyCandidates, map );
+		}
+		return oneToManyCandidates;
+	}
+
+	private void mergeMultiMap(Map<String, List<ForeignKey>> dest, Map<String, List<ForeignKey>> src) {
+
+		for ( Entry<String, List<ForeignKey>> element : src.entrySet() ) {
+			List<ForeignKey> existing = dest.get( element.getKey() );
+			if ( existing == null ) {
+				dest.put( element.getKey(), element.getValue() );
+			}
+			else {
+				existing.addAll( element.getValue() );
+			}
+		}
+
+	}
+
+	private List<SchemaSelection> getSchemaSelections() {
+		List<SchemaSelection> result = revengStrategy.getSchemaSelections();
+		if (result == null) {
+			result = new ArrayList<SchemaSelection>();
+			result.add(new SchemaSelection() {
+				@Override
+				public String getMatchCatalog() {
+					return getDefaultCatalog();
+				}
+				@Override
+				public String getMatchSchema() {
+					return getDefaultSchema();
+				}
+				@Override
+				public String getMatchTable() {
+					return null;
+				}
+			});
+		}
+		return result;
+	}
+
+	private String getDefaultSchema() {
+		return properties.getProperty(AvailableSettings.DEFAULT_SCHEMA);
+	}
+
+	private String getDefaultCatalog() {
+		return properties.getProperty(AvailableSettings.DEFAULT_CATALOG);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/ForeignKeyProcessor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/ForeignKeyProcessor.java
new file mode 100644
index 000000000000..7c8a51bf0ae9
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/ForeignKeyProcessor.java
@@ -0,0 +1,345 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.reader;
+
+import org.hibernate.JDBCException;
+import org.hibernate.MappingException;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataCollector;
+import org.hibernate.tool.reveng.internal.core.util.RevengUtils;
+import org.hibernate.tool.reveng.internal.util.StringUtil;
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+import org.jboss.logging.Logger;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+public class ForeignKeyProcessor {
+
+	private static final Logger log = Logger.getLogger(ForeignKeyProcessor.class);
+
+	public static ForeignKeyProcessor create(
+			RevengDialect metaDataDialect,
+			RevengStrategy revengStrategy,
+			String defaultCatalog,
+			String defaultSchema,
+			RevengMetadataCollector revengMetadataCollector) {
+		return new ForeignKeyProcessor(
+				metaDataDialect,
+				revengStrategy,
+				defaultCatalog,
+				defaultSchema,
+				revengMetadataCollector);
+	}
+
+	private final RevengDialect metaDataDialect;
+	private final RevengStrategy revengStrategy;
+	private final String defaultSchema;
+	private final String defaultCatalog;
+	private final RevengMetadataCollector revengMetadataCollector;
+
+	private ForeignKeyProcessor(
+			RevengDialect metaDataDialect,
+			RevengStrategy revengStrategy,
+			String defaultCatalog,
+			String defaultSchema,
+			RevengMetadataCollector revengMetadataCollector) {
+		this.metaDataDialect = metaDataDialect;
+		this.revengStrategy = revengStrategy;
+		this.defaultCatalog = defaultCatalog;
+		this.defaultSchema = defaultSchema;
+		this.revengMetadataCollector = revengMetadataCollector;
+	}
+
+	public ForeignKeysInfo processForeignKeys(Table referencedTable) {
+		// foreign key name to list of columns in dependent table
+		Map<String, List<Column>> dependentColumns = new HashMap<>();
+		// foreign key name to dependent table
+		Map<String, Table> dependentTables = new HashMap<>();
+		// foreign key name to list of columns in referenced table
+		Map<String, List<Column>> referencedColumns = new HashMap<>();
+		processExportedForeignKeys(referencedTable, dependentColumns, dependentTables, referencedColumns);
+		processUserForeignKeys(referencedTable, dependentColumns, dependentTables, referencedColumns);
+		return new ForeignKeysInfo(referencedTable, dependentTables, dependentColumns, referencedColumns);
+	}
+
+	private void processUserForeignKeys(
+			Table referencedTable,
+			Map<String, List<Column>> dependentColumns,
+			Map<String, Table> dependentTables,
+			Map<String, List<Column>> referencedColumns) {
+		List<ForeignKey> userForeignKeys = revengStrategy.getForeignKeys(
+				RevengUtils.createTableIdentifier(
+						referencedTable,
+						defaultCatalog,
+						defaultSchema));
+		if(userForeignKeys!=null) {
+			for ( ForeignKey userForeignKey : userForeignKeys ) {
+				processUserForeignKey(
+						userForeignKey,
+						referencedTable,
+						referencedColumns,
+						dependentColumns,
+						dependentTables );
+			}
+		}
+	}
+
+	private void processExportedForeignKeys(
+			Table referencedTable,
+			Map<String, List<Column>> dependentColumns,
+			Map<String, Table> dependentTables,
+			Map<String, List<Column>> referencedColumns) {
+		try {
+			log.debug("Calling getExportedKeys on " + referencedTable);
+			Iterator<Map<String, Object>> exportedKeyIterator = metaDataDialect.getExportedKeys(
+					getCatalogForDBLookup(referencedTable.getCatalog(), defaultCatalog),
+					getSchemaForDBLookup(referencedTable.getSchema(), defaultSchema),
+					referencedTable.getName() );
+			try {
+				while (exportedKeyIterator.hasNext() ) {
+					short bogusFkName = 0;
+					processExportedKey(
+							exportedKeyIterator.next(),
+							bogusFkName,
+							dependentColumns,
+							dependentTables,
+							referencedColumns,
+							referencedTable);
+				}
+			}
+			finally {
+				try {
+					if(exportedKeyIterator!=null) {
+						metaDataDialect.close(exportedKeyIterator);
+					}
+				}
+				catch(JDBCException se) {
+					log.warn("Exception while closing result set for foreign key meta data",se);
+				}
+			}
+		}
+		catch(JDBCException se) {
+			log.warn( "Exception while reading foreign keys for " + referencedTable + " [" + se + "]", se);
+		}
+	}
+
+	private void processExportedKey(
+			Map<String, Object> exportedKeyRs,
+			short bogusFkName,
+			Map<String, List<Column>> dependentColumns,
+			Map<String, Table> dependentTables,
+			Map<String, List<Column>> referencedColumns,
+			Table referencedTable) {
+		String fkName = determineForeignKeyName(exportedKeyRs, bogusFkName);
+		Table fkTable = determineForeignKeyTable(exportedKeyRs, fkName);
+		if (fkTable != null) {
+			log.debug("Foreign key " + fkName);
+			handleDependencies(exportedKeyRs, dependentColumns, dependentTables, fkTable, fkName);
+			handleReferences(exportedKeyRs, referencedColumns, referencedTable, fkName);
+		}
+	}
+
+	private Table determineForeignKeyTable(Map<String, Object> exportedKeyRs, String fkName) {
+		Table fkTable = getTable(
+				(String) exportedKeyRs.get("FKTABLE_CAT"),
+				(String) exportedKeyRs.get("FKTABLE_SCHEM"),
+				(String) exportedKeyRs.get("FKTABLE_NAME"));
+		if (fkTable == null) {
+			String fkCatalog = getCatalogForModel((String) exportedKeyRs.get("FKTABLE_CAT"), defaultCatalog);
+			String fkSchema = getSchemaForModel((String) exportedKeyRs.get("FKTABLE_SCHEM"), defaultSchema);
+			String fkTableName = (String) exportedKeyRs.get("FKTABLE_NAME");
+			fkTable = getTable(fkCatalog, fkSchema, fkTableName);
+			if (fkTable == null) {
+				log.debug(
+						"Foreign key " +
+						fkName +
+						" references unknown or filtered table " +
+						TableNameQualifier.qualify(fkCatalog, fkSchema, fkTableName) );
+			}
+		}
+		return fkTable;
+	}
+
+	private String determineForeignKeyName(
+			Map<String, Object> exportedKeyRs,
+			short bogusFkName) {
+		String fkName = (String) exportedKeyRs.get("FK_NAME");
+		if (fkName == null) {
+			fkName = Short.toString(bogusFkName);
+		}
+		return fkName;
+	}
+
+	private void handleReferences(
+			Map<String, Object> exportedKeyRs,
+			Map<String, List<Column>> referencedColumns,
+			Table referencedTable,
+			String fkName) {
+		List<Column> primColumns = referencedColumns.computeIfAbsent( fkName, k -> new ArrayList<>() );
+		Column refColumn = new Column((String) exportedKeyRs.get("PKCOLUMN_NAME"));
+		Column existingColumn = referencedTable.getColumn(refColumn);
+		primColumns.add( Objects.requireNonNullElse( existingColumn, refColumn ) );
+	}
+
+	private void handleDependencies(
+			Map<String, Object> exportedKeyRs,
+			Map<String, List<Column>> dependentColumns,
+			Map<String, Table> dependentTables,
+			Table fkTable,
+			String fkName) {
+		String fkColumnName = (String) exportedKeyRs.get("FKCOLUMN_NAME");
+		List<Column> depColumns =  dependentColumns.get(fkName);
+		if (depColumns == null) {
+			depColumns = new ArrayList<>();
+			dependentColumns.put(fkName,depColumns);
+			dependentTables.put(fkName, fkTable);
+		}
+		else {
+			Object previousTable = dependentTables.get(fkName);
+			if(fkTable != previousTable) {
+				throw new RuntimeException("Foreign key name (" + fkName + ") mapped to different tables! previous: " + previousTable + " current:" + fkTable);
+			}
+		}
+		Column column = new Column(fkColumnName);
+		Column existingColumn = fkTable.getColumn(column);
+		depColumns.add( Objects.requireNonNullElse( existingColumn, column ) );
+	}
+
+	private void processUserForeignKey(
+			ForeignKey element,
+			Table referencedTable,
+			Map<String, List<Column>> referencedColumns,
+			Map<String, List<Column>> dependentColumns,
+			Map<String, Table> dependentTables) {
+
+		if(!equalTable(referencedTable, element.getReferencedTable(), defaultSchema, defaultCatalog)) {
+			log.debug("Referenced table " + element.getReferencedTable().getName() + " is not " +  referencedTable + ". Ignoring userdefined foreign key " + element );
+			return; // skip non related foreign keys
+		}
+		Table deptable = determineDependentTable(dependentTables, element);
+		if(deptable==null) {
+			//	filter out stuff we don't have tables for!
+			log.debug(
+					"User defined foreign key " +
+					element.getName() +
+					" references unknown or filtered table " +
+					TableIdentifier.create(element.getTable()) );
+		}
+		else {
+			dependentTables.put(element.getName(), deptable);
+			referencedColumns.put(element.getName(), getReferencedColums(referencedTable, element) );
+			dependentColumns.put(element.getName(), getDependendColumns(deptable, element) );
+		}
+	}
+
+	private Table determineDependentTable(Map<String, Table> dependentTables, ForeignKey element) {
+		Table userfkTable = element.getTable();
+		String userfkName = element.getName();
+		Table deptable = dependentTables.get(userfkName);
+		if(deptable!=null) { // foreign key already defined!?
+			throw new MappingException("Foreign key " + userfkName + " already defined in the database!");
+		}
+		return getTable(
+				getCatalogForDBLookup(userfkTable.getCatalog(), defaultCatalog),
+				getSchemaForDBLookup(userfkTable.getSchema(), defaultSchema),
+				userfkTable.getName());
+	}
+
+	private List<Column> getDependendColumns(Table deptable, ForeignKey element) {
+		List<?> userColumns = element.getColumns();
+		List<Column> depColumns = new ArrayList<>( userColumns.size() );
+		for ( Object userColumn : userColumns ) {
+			Column jdbcColumn = (Column) userColumn;
+			Column column = new Column( jdbcColumn.getName() );
+			Column existingColumn = deptable.getColumn( column );
+			column = existingColumn == null ? column : existingColumn;
+			depColumns.add( column );
+		}
+		return depColumns;
+	}
+
+	private List<Column> getReferencedColums(Table referencedTable, ForeignKey element) {
+		List<?> userrefColumns = element.getReferencedColumns();
+		List<Column> result = new ArrayList<>( userrefColumns.size() );
+		for ( Object userrefColumn : userrefColumns ) {
+			Column jdbcColumn = (Column) userrefColumn;
+			Column column = new Column( jdbcColumn.getName() );
+			Column existingColumn = referencedTable.getColumn( column );
+			column = existingColumn == null ? column : existingColumn;
+			result.add( column );
+		}
+		return result;
+
+	}
+
+	private static String getCatalogForDBLookup(String catalog, String defaultCatalog) {
+		return catalog==null?defaultCatalog:catalog;
+	}
+
+	private static String getSchemaForDBLookup(String schema, String defaultSchema) {
+		return schema==null?defaultSchema:schema;
+	}
+
+	/** If catalog is equal to defaultCatalog then we return null so it will be null in the generated code. */
+	private static String getCatalogForModel(String catalog, String defaultCatalog) {
+		if(catalog==null) return null;
+		if(catalog.equals(defaultCatalog)) return null;
+		return catalog;
+	}
+
+	/** If catalog is equal to defaultSchema then we return null so it will be null in the generated code. */
+	private static String getSchemaForModel(String schema, String defaultSchema) {
+		if(schema==null) return null;
+		if(schema.equals(defaultSchema)) return null;
+		return schema;
+	}
+
+	private static boolean equalTable(
+			Table table1,
+			Table table2,
+			String defaultSchema,
+			String defaultCatalog) {
+		return  table1.getName().equals(table2.getName())
+				&& ( StringUtil.isEqual(
+						getSchemaForModel(table1.getSchema(), defaultSchema),
+						getSchemaForModel(table2.getSchema(), defaultSchema))
+				&& ( StringUtil.isEqual(
+						getCatalogForModel(table1.getCatalog(), defaultCatalog),
+						getCatalogForModel(table2.getCatalog(), defaultCatalog))));
+	}
+
+	private Table getTable(String catalog, String schema, String name) {
+		return revengMetadataCollector.getTable(
+				TableIdentifier.create(
+						quote(catalog),
+						quote(schema),
+						quote(name)));
+	}
+
+	private String quote(String name) {
+		if (name == null)
+			return name;
+		if (metaDataDialect.needQuote(name)) {
+			if (name.length() > 1 && name.charAt(0) == '`'
+					&& name.charAt(name.length() - 1) == '`') {
+				return name; // avoid double quoting
+			}
+			return "`" + name + "`";
+		}
+		else {
+			return name;
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/ForeignKeysInfo.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/ForeignKeysInfo.java
new file mode 100644
index 000000000000..9d08fbcaef86
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/ForeignKeysInfo.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.reader;
+
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class ForeignKeysInfo {
+
+	final Map<String, Table> dependentTables;
+	final Map<String, List<Column>> dependentColumns;
+	final Map<String, List<Column>> referencedColumns;
+	private final Table referencedTable;
+
+	public ForeignKeysInfo(
+			Table referencedTable,
+			Map<String, Table> tables,
+			Map<String, List<Column>> columns,
+			Map<String, List<Column>> refColumns) {
+		this.referencedTable = referencedTable;
+		this.dependentTables = tables;
+		this.dependentColumns = columns;
+		this.referencedColumns = refColumns;
+	}
+
+	public Map<String, List<ForeignKey>> process(RevengStrategy revengStrategy) {
+		Map<String, List<ForeignKey>> oneToManyCandidates = new HashMap<String, List<ForeignKey>>();
+		Iterator<Entry<String, Table>> iterator = dependentTables.entrySet().iterator();
+		while (iterator.hasNext() ) {
+			Entry<String, Table> entry = iterator.next();
+			String fkName = entry.getKey();
+			Table fkTable = entry.getValue();
+			List<Column> columns = dependentColumns.get(fkName);
+			List<Column> refColumns = referencedColumns.get(fkName);
+
+			String className = revengStrategy.tableToClassName(TableIdentifier.create(referencedTable) );
+
+			ForeignKey key = fkTable.createForeignKey(fkName, columns, className, null, null, refColumns);
+			key.setReferencedTable(referencedTable);
+
+			addToMultiMap(oneToManyCandidates, className, key);
+		}
+		return oneToManyCandidates;
+	}
+
+	private void addToMultiMap(Map<String, List<ForeignKey>> multimap, String key, ForeignKey item) {
+		List<ForeignKey> existing = multimap.get(key);
+		if(existing == null) {
+			existing = new ArrayList<ForeignKey>();
+			multimap.put(key, existing);
+		}
+		existing.add(item);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/IndexProcessor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/IndexProcessor.java
new file mode 100644
index 000000000000..286694a8f7f6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/IndexProcessor.java
@@ -0,0 +1,163 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.reader;
+
+import org.hibernate.JDBCException;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Index;
+import org.hibernate.mapping.Table;
+import org.hibernate.mapping.UniqueKey;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+import org.jboss.logging.Logger;
+
+import java.sql.DatabaseMetaData;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class IndexProcessor {
+
+	private static final Logger log = Logger.getLogger(IndexProcessor.class);
+
+	public static void processIndices(
+			RevengDialect metaDataDialect,
+			String  defaultSchema,
+			String defaultCatalog,
+			Table table) {
+
+		Map<String, Index> indexes = new HashMap<>(); // indexname (String) -> Index
+		Map<String, UniqueKey> uniquekeys = new HashMap<>(); // name (String) -> UniqueKey
+		Map<Column, List<UniqueKey>> uniqueColumns = new HashMap<>(); // Column -> List<Index>
+
+		Iterator<Map<String, Object>> indexIterator = null;
+		try {
+			Map<String,Object> indexRs;
+			indexIterator = metaDataDialect.getIndexInfo(getCatalogForDBLookup(table.getCatalog(), defaultCatalog), getSchemaForDBLookup(table.getSchema(), defaultSchema), table.getName());
+
+			while (indexIterator.hasNext() ) {
+				indexRs = indexIterator.next();
+				String indexName = (String) indexRs.get("INDEX_NAME");
+				String columnName = (String) indexRs.get("COLUMN_NAME");
+				boolean unique = !(Boolean) indexRs.get( "NON_UNIQUE" );
+
+				if (columnName != null || indexName != null) { // both can be non-null with statistical indexs which we don't have any use for.
+
+					if(unique) {
+						UniqueKey key = uniquekeys.get(indexName);
+						if (key==null) {
+							key = new UniqueKey();
+							key.setName(indexName);
+							key.setTable(table);
+							table.addUniqueKey(key);
+							uniquekeys.put(indexName, key);
+						}
+
+						if(indexes.containsKey(indexName) ) {
+							throw new RuntimeException("UniqueKey exists also as Index! ");
+						}
+						Column column = getColumn(metaDataDialect, table, columnName);
+						key.addColumn(column);
+
+						if ( key.getColumnSpan() == 1 ) {
+							// make list of columns that has the chance of being unique
+							List<UniqueKey> l = uniqueColumns.computeIfAbsent( column,
+									k -> new ArrayList<>() );
+							l.add(key);
+						}
+					}
+					else {
+						Index index = indexes.get(indexName);
+						if(index==null) {
+							index = new Index();
+							index.setName(indexName);
+							index.setTable(table);
+							table.addIndex(index);
+							indexes.put(indexName, index);
+						}
+
+						if(uniquekeys.containsKey(indexName) ) {
+							throw new RuntimeException("Index exists also as Unique! ");
+						}
+						Column column = getColumn(metaDataDialect, table, columnName);
+						index.addColumn(column);
+					}
+
+				}
+				else {
+					if( DatabaseMetaData.tableIndexStatistic != (Short) indexRs.get( "TYPE" ) ) {
+						log.warn("Index was not statistical, but no column name was found in " + indexName);
+					}
+
+				}
+			}
+		}
+		catch (JDBCException t) {
+			log.warn("Exception while trying to get indexinfo on " + TableNameQualifier.qualify(table.getCatalog(), table.getSchema(), table.getName() ) +  "=" + t.getMessage() );
+			// Bug #604761 Oracle getIndexInfo() needs major grants And other dbs sucks too ;)
+			// http://sourceforge.net/tracker/index.php?func=detail&aid=604761&group_id=36044&atid=415990
+		}
+		finally {
+			if (indexIterator != null) {
+				try {
+					metaDataDialect.close(indexIterator);
+				}
+				catch(JDBCException se) {
+					log.warn("Exception while trying to close resultset for index meta data",se);
+				}
+			}
+		}
+
+		// mark columns that are unique TODO: multiple columns are not unique on their own.
+		for ( Entry<Column, List<UniqueKey>> entry : uniqueColumns.entrySet() ) {
+			Column col = entry.getKey();
+			for ( UniqueKey key : entry.getValue() ) {
+				if ( key.getColumnSpan() == 1 ) {
+					col.setUnique( true );
+				}
+			}
+		}
+
+/*		for ( Entry<String, UniqueKey> stringUniqueKeyEntry : uniquekeys.entrySet() ) {
+			// if keyset has no overlaps with primary key (table.getPrimaryKey())
+			// if only key matches then mark as setNaturalId(true);
+		}
+*/	}
+
+	private static String getCatalogForDBLookup(String catalog, String defaultCatalog) {
+		return catalog==null?defaultCatalog:catalog;
+	}
+
+	private static String getSchemaForDBLookup(String schema, String defaultSchema) {
+		return schema==null?defaultSchema:schema;
+	}
+
+	private static Column getColumn(RevengDialect metaDataDialect, Table table, String columnName) {
+		Column column = new Column();
+		column.setName(quote(columnName, metaDataDialect));
+		Column existing = table.getColumn(column);
+		if(existing!=null) {
+			column = existing;
+		}
+		return column;
+	}
+
+	private static String quote(String columnName, RevengDialect metaDataDialect) {
+		if(columnName==null) return columnName;
+		if(metaDataDialect.needQuote(columnName)) {
+			if(columnName.length()>1 && columnName.charAt(0)=='`' && columnName.charAt(columnName.length()-1)=='`') {
+				return columnName; // avoid double quoting
+			}
+			return "`" + columnName + "`";
+		}
+		else {
+			return columnName;
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/PrimaryKeyProcessor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/PrimaryKeyProcessor.java
new file mode 100644
index 000000000000..57170ac9ac06
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/PrimaryKeyProcessor.java
@@ -0,0 +1,176 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.reader;
+
+import org.hibernate.JDBCException;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.PrimaryKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.sql.Alias;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataCollector;
+import org.hibernate.tool.reveng.internal.core.util.RevengUtils;
+import org.jboss.logging.Logger;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+public class PrimaryKeyProcessor {
+
+	private static final Logger log = Logger.getLogger(PrimaryKeyProcessor.class);
+
+	public static void processPrimaryKey(
+			RevengDialect metaDataDialect,
+			RevengStrategy revengStrategy,
+			String defaultSchema,
+			String defaultCatalog,
+			RevengMetadataCollector revengMetadataCollector,
+			Table table) {
+
+		List<Object[]> columns = new ArrayList<>();
+		PrimaryKey key = null;
+		Iterator<Map<String, Object>> primaryKeyIterator = null;
+		try {
+			Map<String, Object> primaryKeyRs;
+			primaryKeyIterator = metaDataDialect.getPrimaryKeys(getCatalogForDBLookup(table.getCatalog(), defaultCatalog), getSchemaForDBLookup(table.getSchema(), defaultSchema), table.getName() );
+
+			while (primaryKeyIterator.hasNext() ) {
+				primaryKeyRs = primaryKeyIterator.next();
+
+				String columnName = (String) primaryKeyRs.get("COLUMN_NAME");
+				short seq = (Short) primaryKeyRs.get("KEY_SEQ");
+				String name = (String) primaryKeyRs.get("PK_NAME");
+
+				if(key==null) {
+					key = new PrimaryKey(table);
+					key.setName(name);
+					if(table.getPrimaryKey()!=null) {
+						throw new RuntimeException(table + " already has a primary key!"); //TODO: ignore ?
+					}
+					table.setPrimaryKey(key);
+				}
+				else {
+					if( !Objects.equals( name, key.getName() ) && name != null ) {
+						throw new RuntimeException("Duplicate names found for primarykey. Existing name: " + key.getName() + " JDBC name: " + name + " on table " + table);
+					}
+				}
+
+				columns.add(new Object[] {seq, columnName});
+			}
+		}
+		finally {
+			if (primaryKeyIterator!=null) {
+				try {
+					metaDataDialect.close(primaryKeyIterator);
+				}
+				catch(JDBCException se) {
+					log.warn("Exception when closing resultset for reading primary key information",se);
+				}
+			}
+		}
+
+		columns.sort((o1, o2) -> {
+			Short left = (Short) o1[0];
+			Short right = (Short) o2[0];
+			return left.compareTo(right);
+		});
+
+		List<String> t = new ArrayList<>( columns.size() );
+		for (Object[] element : columns) {
+			t.add((String) element[1]);
+		}
+
+		if(key==null) {
+			log.warn("The JDBC driver didn't report any primary key columns in " + table.getName() + ". Asking rev.eng. strategy" );
+			List<String> userPrimaryKey = RevengUtils.getPrimaryKeyInfoInRevengStrategy(revengStrategy, table, defaultCatalog, defaultSchema);	      	if(userPrimaryKey!=null && !userPrimaryKey.isEmpty()) {
+				key = new PrimaryKey(table);
+				key.setName(new Alias(15, "PK").toAliasString( table.getName()));
+				if(table.getPrimaryKey()!=null) {
+					throw new RuntimeException(table + " already has a primary key!"); //TODO: ignore ?
+				}
+				table.setPrimaryKey(key);
+				t = new ArrayList<>( userPrimaryKey );
+			}
+			else {
+				log.warn("Rev.eng. strategy did not report any primary key columns for " + table.getName());
+			}
+		}
+
+		Iterator<Map<String, Object>> suggestedPrimaryKeyStrategyName = metaDataDialect.getSuggestedPrimaryKeyStrategyName( getCatalogForDBLookup(table.getCatalog(), defaultCatalog), getSchemaForDBLookup(table.getSchema(), defaultSchema), table.getName() );
+		try {
+			if(suggestedPrimaryKeyStrategyName.hasNext()) {
+				Map<String, Object> m = suggestedPrimaryKeyStrategyName.next();
+				String suggestion = (String) m.get( "HIBERNATE_STRATEGY" );
+				if(suggestion!=null) {
+					revengMetadataCollector.addSuggestedIdentifierStrategy(
+							transformForModelLookup(table.getCatalog(), defaultCatalog),
+							transformForModelLookup(table.getSchema(), defaultSchema),
+							table.getName(),
+							suggestion );
+				}
+			}
+		}
+		finally {
+			if(suggestedPrimaryKeyStrategyName!=null) {
+				try {
+					metaDataDialect.close(suggestedPrimaryKeyStrategyName);
+				}
+				catch(JDBCException se) {
+					log.warn("Exception while closing iterator for suggested primary key strategy name",se);
+				}
+			}
+		}
+
+		if(key!=null) {
+			for (String name : t) {
+				// should get column from table if it already exists!
+				Column col = getColumn(metaDataDialect, table, name);
+				key.addColumn(col);
+			}
+			log.debug("primary key for " + table + " -> "  + key);
+		}
+
+	}
+
+	private static String getCatalogForDBLookup(String catalog, String defaultCatalog) {
+		return catalog==null?defaultCatalog:catalog;
+	}
+
+	private static String transformForModelLookup(String id, String defaultId) {
+		return id == null || id.equals(defaultId) ? null : id;
+	}
+
+	private static String getSchemaForDBLookup(String schema, String defaultSchema) {
+		return schema==null?defaultSchema:schema;
+	}
+
+	private static Column getColumn(RevengDialect metaDataDialect, Table table, String columnName) {
+		Column column = new Column();
+		column.setName(quote(metaDataDialect, columnName));
+		Column existing = table.getColumn(column);
+		if(existing!=null) {
+			column = existing;
+		}
+		return column;
+	}
+
+	private static String quote(RevengDialect metaDataDialect, String columnName) {
+		if(columnName==null) return null;
+		if(metaDataDialect.needQuote(columnName)) {
+			if(columnName.length()>1 && columnName.charAt(0)=='`' && columnName.charAt(columnName.length()-1)=='`') {
+				return columnName; // avoid double quoting
+			}
+			return "`" + columnName + "`";
+		}
+		else {
+			return columnName;
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/TableCollector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/TableCollector.java
new file mode 100644
index 000000000000..5e4b39938f7e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/reader/TableCollector.java
@@ -0,0 +1,150 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.reader;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategy.SchemaSelection;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataCollector;
+import org.jboss.logging.Logger;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+public class TableCollector {
+
+	private static final Logger log = Logger.getLogger(TableCollector.class);
+
+	public static TableCollector create(
+			RevengDialect metaDataDialect,
+			RevengStrategy revengStrategy,
+			RevengMetadataCollector revengMetadataCollector,
+			Properties properties) {
+		return new TableCollector(
+				metaDataDialect,
+				revengStrategy,
+				revengMetadataCollector,
+				properties);
+	}
+
+	private final RevengDialect metaDataDialect;
+	private final RevengStrategy revengStrategy;
+	private final RevengMetadataCollector revengMetadataCollector;
+	private final Properties properties;
+
+	private TableCollector(
+			RevengDialect metaDataDialect,
+			RevengStrategy revengStrategy,
+			RevengMetadataCollector revengMetadataCollector,
+			Properties properties) {
+		this.metaDataDialect = metaDataDialect;
+		this.revengStrategy = revengStrategy;
+		this.revengMetadataCollector = revengMetadataCollector;
+		this.properties = properties;
+	}
+
+	public void processTables(SchemaSelection schemaSelection) {
+		Iterator<Map<String,Object>> tableIterator = null;
+		HashMap<Table, Boolean> processedTables = new HashMap<>();
+		try {
+			tableIterator = metaDataDialect.getTables(
+					StringHelper.replace(schemaSelection.getMatchCatalog(),".*", "%"),
+					StringHelper.replace(schemaSelection.getMatchSchema(),".*", "%"),
+					StringHelper.replace(schemaSelection.getMatchTable(),".*", "%"));
+			while (tableIterator.hasNext() ) {
+				processTable(tableIterator.next(), processedTables);
+			}
+		}
+		finally {
+			if (tableIterator!=null) {
+				metaDataDialect.close(tableIterator);
+			}
+		}
+	}
+
+	private void processTable(Map<String, Object> tableRs, HashMap<Table, Boolean> processedTables) {
+		TableIdentifier tableIdentifier = TableIdentifier.create(
+				quote((String) tableRs.get("TABLE_CAT")),
+				quote((String) tableRs.get("TABLE_SCHEM")),
+				quote((String) tableRs.get("TABLE_NAME")));
+		if(revengStrategy.excludeTable(tableIdentifier) ) {
+			log.debug("Table " + tableIdentifier + " excluded by strategy");
+		}
+		else if (revengMetadataCollector.getTable(tableIdentifier)!=null)	{
+			log.debug("Ignoring " + tableIdentifier + " since it has already been processed");
+		}
+		else {
+			addTable(
+					tableIdentifier,
+					(String) tableRs.get("TABLE_TYPE"),
+					(String) tableRs.get("REMARKS"),
+					processedTables);
+		}
+	}
+
+	private void addTable(
+			TableIdentifier tableIdentifier,
+			String tableType,
+			String comment,
+			HashMap<Table, Boolean> processedTables) {
+		if (isTypeToAdd(tableType)) { //||
+			log.debug("Adding table " + tableIdentifier + " of type " + tableType);
+			Table table = revengMetadataCollector.addTable(tableIdentifier);
+			table.setComment(comment);
+			BasicColumnProcessor.processBasicColumns(
+					metaDataDialect,
+					revengStrategy,
+					properties.getProperty(AvailableSettings.DEFAULT_SCHEMA),
+					properties.getProperty(AvailableSettings.DEFAULT_CATALOG),
+					table);
+			PrimaryKeyProcessor.processPrimaryKey(
+					metaDataDialect,
+					revengStrategy,
+					properties.getProperty(AvailableSettings.DEFAULT_SCHEMA),
+					properties.getProperty(AvailableSettings.DEFAULT_CATALOG),
+					revengMetadataCollector,
+					table);
+			if (tableType.equalsIgnoreCase("TABLE")) {
+				IndexProcessor.processIndices(
+						metaDataDialect,
+						properties.getProperty(AvailableSettings.DEFAULT_SCHEMA),
+						properties.getProperty(AvailableSettings.DEFAULT_CATALOG),
+						table);
+			}
+			processedTables.put(table, tableType.equalsIgnoreCase("TABLE"));
+		}
+		else {
+			log.debug("Ignoring table " + tableIdentifier + " of type " + tableType);
+		}
+	}
+
+	private boolean isTypeToAdd(String tableType) {
+		return "TABLE".equalsIgnoreCase(tableType) ||
+				"VIEW".equalsIgnoreCase(tableType) ||
+				"SYNONYM".equals(tableType);
+	}
+
+
+	private String quote(String name) {
+		if (name == null)
+			return null;
+		if (metaDataDialect.needQuote(name)) {
+			if (name.length() > 1 && name.charAt(0) == '`'
+					&& name.charAt(name.length() - 1) == '`') {
+				return name; // avoid double quoting
+			}
+			return "`" + name + "`";
+		}
+		else {
+			return name;
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/AbstractStrategy.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/AbstractStrategy.java
new file mode 100644
index 000000000000..4fba1a4d1a8d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/AbstractStrategy.java
@@ -0,0 +1,345 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.PrimaryKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.AssociationInfo;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.util.JdbcToHibernateTypeHelper;
+import org.hibernate.tool.reveng.internal.util.NameConverter;
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+import org.jboss.logging.Logger;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+public abstract class AbstractStrategy implements RevengStrategy {
+
+	static final private Logger log = Logger.getLogger(AbstractStrategy.class);
+
+	private static final Set<String> AUTO_OPTIMISTICLOCK_COLUMNS;
+
+	private RevengSettings settings = new RevengSettings(this);
+
+	static {
+		AUTO_OPTIMISTICLOCK_COLUMNS = new HashSet<>();
+		AUTO_OPTIMISTICLOCK_COLUMNS.add("version");
+		AUTO_OPTIMISTICLOCK_COLUMNS.add("timestamp");
+		AUTO_OPTIMISTICLOCK_COLUMNS.add("dbtimestamp");
+	}
+
+
+	public AbstractStrategy() {
+		super();
+	}
+
+	public String columnToPropertyName(TableIdentifier table, String columnName) {
+		String decapitalize = StringHelper.decapitalize( toUpperCamelCase(columnName) );
+
+		return keywordCheck( decapitalize );
+	}
+
+	private String keywordCheck(String possibleKeyword) {
+		if(NameConverter.isReservedJavaKeyword(possibleKeyword)) {
+			possibleKeyword = possibleKeyword + "_";
+		}
+		return possibleKeyword;
+	}
+
+	protected String toUpperCamelCase(String s) {
+		return NameConverter.toUpperCamelCase(s);
+	}
+
+	/**
+	 * Does some crude english pluralization
+	 * TODO: are the from/to names correct ?
+	 */
+	public String foreignKeyToCollectionName(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns, boolean uniqueReference) {
+		String propertyName = StringHelper.decapitalize( StringHelper.unqualify( getRoot().tableToClassName(fromTable) ) );
+		propertyName = pluralize( propertyName );
+
+		if(!uniqueReference) {
+			if(fromColumns!=null && fromColumns.size()==1) {
+				String columnName = ( (Column) fromColumns.get(0) ).getName();
+				propertyName = propertyName + "For" + toUpperCamelCase(columnName);
+			}
+			else { // composite key or no columns at all safeguard
+				propertyName = propertyName + "For" + toUpperCamelCase(keyname);
+			}
+		}
+		return propertyName;
+	}
+
+	protected String pluralize(String singular) {
+		return NameConverter.simplePluralize(singular);
+	}
+
+	public String foreignKeyToInverseEntityName(String keyname,
+												TableIdentifier fromTable, List<?> fromColumnNames,
+												TableIdentifier referencedTable, List<?> referencedColumnNames,
+												boolean uniqueReference) {
+		return foreignKeyToEntityName(keyname, fromTable, fromColumnNames, referencedTable, referencedColumnNames, uniqueReference);
+	}
+
+
+	public String foreignKeyToEntityName(String keyname, TableIdentifier fromTable, List<?> fromColumnNames, TableIdentifier referencedTable, List<?> referencedColumnNames, boolean uniqueReference) {
+		String propertyName = StringHelper.decapitalize( StringHelper.unqualify( getRoot().tableToClassName(referencedTable) ) );
+
+		if(!uniqueReference) {
+			if(fromColumnNames!=null && fromColumnNames.size()==1) {
+				String columnName = ( (Column) fromColumnNames.get(0) ).getName();
+				propertyName = propertyName + "By" + toUpperCamelCase(columnName);
+			}
+			else { // composite key or no columns at all safeguard
+				propertyName = propertyName + "By" + toUpperCamelCase(keyname);
+			}
+		}
+
+		return propertyName;
+	}
+
+	public String columnToHibernateTypeName(TableIdentifier table, String columnName, int sqlType, int length, int precision, int scale, boolean nullable, boolean generatedIdentifier) {
+		String preferredHibernateType = JdbcToHibernateTypeHelper.getPreferredHibernateType(sqlType, length, precision, scale, nullable, generatedIdentifier);
+
+		String location = "<no info>";
+		if(log.isDebugEnabled()) {
+			String info = " t:" + JdbcToHibernateTypeHelper.getJDBCTypeName( sqlType ) + " l:" + length + " p:" + precision + " s:" + scale + " n:" + nullable + " id:" + generatedIdentifier;
+			if(table!=null) {
+				location = TableNameQualifier.qualify(table.getCatalog(), table.getSchema(), table.getName() ) + "." + columnName + info;
+			}
+			else {
+
+				location += " Column: " + columnName + info;
+			}
+		}
+		if(preferredHibernateType==null) {
+			log.debug("No default type found for [" + location + "] falling back to [serializable]");
+			return "serializable";
+		}
+		else {
+			log.debug("Default type found for [" + location + "] to [" + preferredHibernateType + "]");
+			return preferredHibernateType;
+		}
+	}
+
+	public boolean excludeTable(TableIdentifier ti) {
+		return false;
+	}
+
+	public boolean excludeColumn(TableIdentifier identifier, String columnName) {
+		return false;
+	}
+
+	public String tableToClassName(TableIdentifier tableIdentifier) {
+
+		String pkgName = settings.getDefaultPackageName();
+		String className = toUpperCamelCase( tableIdentifier.getName() );
+
+		if(!pkgName.isEmpty()) {
+			return StringHelper.qualify(pkgName, className);
+		}
+		else {
+			return className;
+		}
+
+	}
+
+	public List<ForeignKey> getForeignKeys(TableIdentifier referencedTable) {
+		return Collections.emptyList();
+	}
+
+	public String getTableIdentifierStrategyName(TableIdentifier identifier) {
+		return null;
+	}
+
+	public Properties getTableIdentifierProperties(TableIdentifier identifier) {
+		return new Properties();
+	}
+
+	public List<String> getPrimaryKeyColumnNames(TableIdentifier identifier) {
+		return null;
+	}
+
+	public String classNameToCompositeIdName(String className) {
+		return className + "Id";
+	}
+
+	public void close() {
+
+	}
+
+
+
+	/** Return explicit which column name should be used for optimistic lock */
+	public String getOptimisticLockColumnName(TableIdentifier identifier) {
+		return null;
+	}
+
+	public boolean useColumnForOptimisticLock(TableIdentifier identifier, String column) {
+		if(settings.getDetectOptimsticLock()) {
+			return AUTO_OPTIMISTICLOCK_COLUMNS.contains(column.toLowerCase());
+		}
+		else {
+			return false;
+		}
+	}
+
+	public List<SchemaSelection> getSchemaSelections() {
+		return null;
+	}
+
+	public String tableToIdentifierPropertyName(TableIdentifier tableIdentifier) {
+		return null;
+	}
+
+	public String tableToCompositeIdName(TableIdentifier identifier) {
+		return null;
+	}
+
+	public boolean excludeForeignKeyAsCollection(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns) {
+		return !settings.createCollectionForForeignKey();
+	}
+
+	public boolean excludeForeignKeyAsManytoOne(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns) {
+		return !settings.createManyToOneForForeignKey();
+	}
+
+	public boolean isForeignKeyCollectionInverse(String name, Table foreignKeyTable, List<?> columns, Table foreignKeyReferencedTable, List<?> referencedColumns) {
+		if(foreignKeyTable==null) {
+			return true; // we don't know better
+		}
+		if(isManyToManyTable(foreignKeyTable)) {
+			// if the reference column is the first one then we are inverse.
+			Column column = foreignKeyTable.getColumn(0);
+			Column fkColumn = (Column) referencedColumns.get(0);
+			return fkColumn.equals(column);
+		}
+		return true;
+	}
+
+	public boolean isForeignKeyCollectionLazy(String name, TableIdentifier foreignKeyTable, List<?> columns, TableIdentifier foreignKeyReferencedTable, List<?> referencedColumns) {
+		return true;
+	}
+
+	public void setSettings(RevengSettings settings) {
+		this.settings = settings;
+	}
+
+	public boolean isOneToOne(ForeignKey foreignKey) {
+		if(settings.getDetectOneToOne()) {
+			// add support for non-PK associations
+			List<Column> fkColumns = foreignKey.getColumns();
+			List<Column> pkForeignTableColumns = Collections.emptyList();
+
+			if (foreignKey.getTable().hasPrimaryKey())
+				pkForeignTableColumns = foreignKey.getTable().getPrimaryKey().getColumns();
+
+			boolean equals = fkColumns.size() == pkForeignTableColumns.size();
+
+			Iterator<Column> columns = foreignKey.getColumns().iterator();
+			while (equals && columns.hasNext()) {
+				Column fkColumn = columns.next();
+				equals = pkForeignTableColumns.contains(fkColumn);
+			}
+
+			return equals;
+		}
+		else {
+			return false;
+		}
+	}
+
+	public boolean isManyToManyTable(Table table) {
+		if(settings.getDetectManyToMany()) {
+
+			// if the number of columns in the primary key is different
+			// than the total number of columns then it can't be a middle table
+			PrimaryKey pk = table.getPrimaryKey();
+			if ( pk==null || pk.getColumns().size() != table.getColumnSpan() )
+				return false;
+
+			List<ForeignKey> foreignKeys = new ArrayList<>();
+
+			// if we have more than 2 fk, means we have more than 2 table implied
+			// in this table --> cannot be a simple many-to-many
+			for (ForeignKey fkey : table.getForeignKeyCollection()) {
+				foreignKeys.add( fkey );
+				if(foreignKeys.size()>2) {
+					return false; // early exit if we have more than two fk.
+				}
+			}
+			if(foreignKeys.size()!=2) {
+				return false;
+			}
+
+			// tests that all columns are implied in the fks
+			Set<Column> columns = new HashSet<>(table.getColumns());
+
+			for (ForeignKey fkey : table.getForeignKeyCollection()) {
+				if (columns.isEmpty()) break;
+				fkey.getColumns().forEach(columns::remove);
+			}
+
+			return columns.isEmpty();
+
+		}
+		else {
+			return false;
+		}
+	}
+
+	protected RevengStrategy getRoot() {
+		return settings.getRootStrategy();
+	}
+
+	public String foreignKeyToManyToManyName(ForeignKey fromKey, TableIdentifier middleTable, ForeignKey toKey, boolean uniqueReference) {
+		String propertyName = StringHelper.decapitalize( StringHelper.unqualify( getRoot().tableToClassName(TableIdentifier.create( toKey.getReferencedTable()) )) );
+		propertyName = pluralize( propertyName );
+
+		if(!uniqueReference) {
+			//TODO: maybe use the middleTable name here ?
+			if(toKey.getColumns()!=null && toKey.getColumns().size()==1) {
+				String columnName = toKey.getColumns().get(0).getName();
+				propertyName = propertyName + "For" + toUpperCamelCase(columnName);
+			}
+			else { // composite key or no columns at all safeguard
+				propertyName = propertyName + "For" + toUpperCamelCase(toKey.getName());
+			}
+		}
+		return propertyName;
+	}
+
+	public Map<String,MetaAttribute> tableToMetaAttributes(TableIdentifier tableIdentifier) {
+		return null;
+	}
+
+	public Map<String, MetaAttribute> columnToMetaAttributes(TableIdentifier identifier, String column) {
+		return null;
+	}
+
+	public AssociationInfo foreignKeyToAssociationInfo(ForeignKey foreignKey) {
+		return null;
+	}
+
+	public AssociationInfo foreignKeyToInverseAssociationInfo(ForeignKey foreignKey) {
+		return null;
+	}
+
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/DefaultStrategy.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/DefaultStrategy.java
new file mode 100644
index 000000000000..f7268fa79cb5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/DefaultStrategy.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+
+public class DefaultStrategy extends AbstractStrategy implements RevengStrategy {
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/DelegatingStrategy.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/DelegatingStrategy.java
new file mode 100644
index 000000000000..877ff5020b82
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/DelegatingStrategy.java
@@ -0,0 +1,162 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.AssociationInfo;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+public class DelegatingStrategy implements RevengStrategy {
+
+	RevengStrategy delegate;
+
+	public List<ForeignKey> getForeignKeys(TableIdentifier referencedTable) {
+		return delegate==null?null:delegate.getForeignKeys(referencedTable);
+	}
+
+	public DelegatingStrategy(RevengStrategy delegate) {
+		this.delegate = delegate;
+	}
+
+	public String columnToPropertyName(TableIdentifier table, String column) {
+		return delegate==null?null:delegate.columnToPropertyName(table, column);
+	}
+
+	public boolean excludeTable(TableIdentifier ti) {
+		return delegate==null?false:delegate.excludeTable(ti);
+	}
+
+	public boolean excludeColumn(TableIdentifier identifier, String columnName) {
+		return delegate==null?false:delegate.excludeColumn(identifier, columnName);
+	}
+
+	public String foreignKeyToCollectionName(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns, boolean uniqueReference) {
+		return delegate==null?null:delegate.foreignKeyToCollectionName(keyname, fromTable, fromColumns, referencedTable, referencedColumns, uniqueReference);
+	}
+
+	public String foreignKeyToEntityName(String keyname, TableIdentifier fromTable, List<?> fromColumnNames, TableIdentifier referencedTable, List<?> referencedColumnNames, boolean uniqueReference) {
+		return delegate==null?null:delegate.foreignKeyToEntityName(keyname, fromTable, fromColumnNames, referencedTable, referencedColumnNames, uniqueReference);
+	}
+
+	public String columnToHibernateTypeName(TableIdentifier table, String columnName, int sqlType, int length, int precision, int scale, boolean nullable, boolean generatedIdentifier) {
+		return delegate==null?null:delegate.columnToHibernateTypeName(table, columnName, sqlType, length, precision, scale, nullable, generatedIdentifier);
+	}
+
+	public String tableToClassName(TableIdentifier tableIdentifier) {
+		return delegate==null?null:delegate.tableToClassName(tableIdentifier);
+	}
+
+	public String getTableIdentifierStrategyName(TableIdentifier tableIdentifier) {
+		return delegate==null?null:delegate.getTableIdentifierStrategyName(tableIdentifier);
+	}
+
+	public Properties getTableIdentifierProperties(TableIdentifier identifier) {
+		return delegate==null?null:delegate.getTableIdentifierProperties(identifier);
+	}
+
+	public List<String> getPrimaryKeyColumnNames(TableIdentifier identifier) {
+		return delegate==null?null:delegate.getPrimaryKeyColumnNames(identifier);
+	}
+
+	public String classNameToCompositeIdName(String className) {
+		return delegate==null?null:delegate.classNameToCompositeIdName(className);
+	}
+
+	public void close() {
+		if(delegate!=null) delegate.close();
+	}
+
+	public String getOptimisticLockColumnName(TableIdentifier identifier) {
+		return delegate==null?null:delegate.getOptimisticLockColumnName(identifier);
+	}
+
+	public boolean useColumnForOptimisticLock(TableIdentifier identifier, String column) {
+		return delegate==null?false:delegate.useColumnForOptimisticLock(identifier, column);
+	}
+
+	public List<SchemaSelection> getSchemaSelections() {
+		return delegate==null?null:delegate.getSchemaSelections();
+	}
+
+	public String tableToIdentifierPropertyName(TableIdentifier tableIdentifier) {
+		return delegate==null?null:delegate.tableToIdentifierPropertyName(tableIdentifier);
+	}
+
+	public String tableToCompositeIdName(TableIdentifier identifier) {
+		return delegate==null?null:delegate.tableToCompositeIdName(identifier);
+	}
+
+	public boolean excludeForeignKeyAsCollection(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns) {
+		return delegate==null?false:delegate.excludeForeignKeyAsCollection(keyname, fromTable, fromColumns, referencedTable, referencedColumns);
+	}
+
+	public boolean excludeForeignKeyAsManytoOne(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns) {
+		return delegate==null?false:delegate.excludeForeignKeyAsManytoOne(keyname, fromTable, fromColumns, referencedTable, referencedColumns);
+	}
+
+	public boolean isForeignKeyCollectionInverse(String name, Table foreignKeyTable, List<?> columns, Table foreignKeyReferencedTable, List<?> referencedColumns) {
+		return delegate==null?true:delegate.isForeignKeyCollectionInverse(name, foreignKeyTable, columns, foreignKeyReferencedTable, referencedColumns);
+	}
+
+	public boolean isForeignKeyCollectionLazy(String name, TableIdentifier foreignKeyTable, List<?> columns, TableIdentifier foreignKeyReferencedTable, List<?> referencedColumns) {
+		return delegate==null?true:delegate.isForeignKeyCollectionLazy(name, foreignKeyTable, columns, foreignKeyReferencedTable, referencedColumns);
+	}
+
+	/**
+	 * Initialize the settings.
+	 *
+	 * If subclasses need to use the Settings then it should keep its own reference, but still remember to initialize the delegates settings by calling super.setSettings(settings).
+	 *
+	 * @see RevengStrategy#setSettings
+	 */
+	public void setSettings(RevengSettings settings) {
+		if(delegate!=null) delegate.setSettings(settings);
+	}
+
+	public boolean isManyToManyTable(Table table) {
+		return delegate==null?true:delegate.isManyToManyTable( table );
+	}
+
+	public boolean isOneToOne(ForeignKey foreignKey) {
+		return delegate==null?true:delegate.isOneToOne( foreignKey );
+	}
+
+
+	public String foreignKeyToManyToManyName(ForeignKey fromKey, TableIdentifier middleTable, ForeignKey toKey, boolean uniqueReference) {
+		return delegate==null?null:delegate.foreignKeyToManyToManyName( fromKey, middleTable, toKey, uniqueReference );
+	}
+
+	public Map<String,MetaAttribute> tableToMetaAttributes(TableIdentifier tableIdentifier) {
+		return delegate==null?null:delegate.tableToMetaAttributes( tableIdentifier );
+	}
+
+	public Map<String, MetaAttribute> columnToMetaAttributes(TableIdentifier identifier, String column) {
+		return delegate==null?null:delegate.columnToMetaAttributes( identifier, column );
+	}
+
+	public AssociationInfo foreignKeyToAssociationInfo(ForeignKey foreignKey) {
+		return delegate==null?null:delegate.foreignKeyToAssociationInfo(foreignKey);
+	}
+
+	public AssociationInfo foreignKeyToInverseAssociationInfo(ForeignKey foreignKey) {
+		return delegate==null?null:delegate.foreignKeyToInverseAssociationInfo(foreignKey);
+	}
+
+	public String foreignKeyToInverseEntityName(String keyname,
+			TableIdentifier fromTable, List<?> fromColumnNames,
+			TableIdentifier referencedTable, List<?> referencedColumnNames,
+			boolean uniqueReference) {
+		return delegate==null?null:delegate.foreignKeyToInverseEntityName(keyname, fromTable, fromColumnNames, referencedTable, referencedColumnNames, uniqueReference);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/MetaAttributeHelper.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/MetaAttributeHelper.java
new file mode 100644
index 000000000000..a43fe3d7884c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/MetaAttributeHelper.java
@@ -0,0 +1,135 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.HashSetValuedHashMap;
+import org.hibernate.mapping.MetaAttribute;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+public class MetaAttributeHelper {
+
+	public static MetaAttribute toRealMetaAttribute(String name, Collection<?> values) {
+		MetaAttribute attribute = new MetaAttribute(name);
+		for (Iterator<?> iter = values.iterator(); iter.hasNext();) {
+			SimpleMetaAttribute element = (SimpleMetaAttribute) iter.next();
+			attribute.addValue(element.value);
+		}
+
+		return attribute;
+	}
+
+
+	public static MultiValuedMap<String, SimpleMetaAttribute> loadAndMergeMetaMap(
+			Element classElement,
+			MultiValuedMap<String, SimpleMetaAttribute> inheritedMeta) {
+		return MetaAttributeHelper.mergeMetaMaps(
+				loadMetaMap(classElement),
+				inheritedMeta);
+	}
+
+	public static MultiValuedMap<String, SimpleMetaAttribute> loadMetaMap(Element element) {
+		MultiValuedMap<String, SimpleMetaAttribute> result = new HashSetValuedHashMap<String, SimpleMetaAttribute>();
+		List<Element> metaAttributeList = new ArrayList<Element>();
+		ArrayList<Element> metaNodes = getChildElements(element, "meta");
+		for (Element metaNode : metaNodes) {
+			metaAttributeList.add(metaNode);
+		}
+		for (Iterator<Element> iter = metaAttributeList.iterator(); iter.hasNext();) {
+			Element metaAttribute = iter.next();
+			String attribute = metaAttribute.getAttribute("attribute");
+			String value = metaAttribute.getTextContent();
+			String inheritStr= null;
+			if (metaAttribute.hasAttribute("inherit")) {
+				inheritStr = metaAttribute.getAttribute("inherit");
+			}
+			boolean inherit = true;
+			if(inheritStr!=null) {
+				inherit = Boolean.valueOf(inheritStr).booleanValue();
+			}
+			SimpleMetaAttribute ma = new SimpleMetaAttribute(value, inherit);
+			result.put(attribute, ma);
+		}
+		return result;
+	}
+
+	/**
+	 * Merges a Multimap with inherited maps.
+	 * Values specified always overrules/replaces the inherited values.
+	 *
+	 * @param specific
+	 * @param general
+	 * @return a MultiMap with all values from local and extra values
+	 * from inherited
+	 */
+	private static MultiValuedMap<String, SimpleMetaAttribute> mergeMetaMaps(
+			MultiValuedMap<String, SimpleMetaAttribute> specific,
+			MultiValuedMap<String, SimpleMetaAttribute> general) {
+		MultiValuedMap<String, SimpleMetaAttribute> result = new HashSetValuedHashMap<String, SimpleMetaAttribute>();
+		copyMultiMap(result, specific);
+		if (general != null) {
+			for (Iterator<String> iter = general.keySet().iterator();iter.hasNext();) {
+				String key = iter.next();
+				if (!specific.containsKey(key) ) {
+					// inheriting a meta attribute only if it is inheritable
+					Collection<SimpleMetaAttribute> ml = general.get(key);
+					for (Iterator<SimpleMetaAttribute> iterator = ml.iterator(); iterator.hasNext();) {
+						SimpleMetaAttribute element = iterator.next();
+						if (element.inheritable) {
+							result.put(key, element);
+						}
+					}
+				}
+			}
+		}
+
+		return result;
+
+	}
+
+	private static void copyMultiMap(
+			MultiValuedMap<String, SimpleMetaAttribute> destination,
+			MultiValuedMap<String, SimpleMetaAttribute> specific) {
+		for (Iterator<String> keyIterator = specific.keySet().iterator(); keyIterator.hasNext(); ) {
+			String key = keyIterator.next();
+			Collection<SimpleMetaAttribute> c = specific.get(key);
+			for (Iterator<SimpleMetaAttribute> valueIterator = c.iterator(); valueIterator.hasNext(); )
+				destination.put(key, valueIterator.next() );
+		}
+	}
+
+	private static ArrayList<Element> getChildElements(Element parent, String tagName) {
+		ArrayList<Element> result = new ArrayList<Element>();
+		NodeList nodeList = parent.getChildNodes();
+		for (int i = 0; i < nodeList.getLength(); i++) {
+			Node node = nodeList.item(i);
+			if (node instanceof Element) {
+				if (tagName.equals(((Element)node).getTagName())) {
+					result.add((Element)node);
+				}
+			}
+		}
+		return result;
+	}
+
+	public static class SimpleMetaAttribute {
+		String value;
+		boolean inheritable = true;
+		public SimpleMetaAttribute(String value, boolean inherit) {
+			this.value = value;
+			this.inheritable = inherit;
+		}
+		public String toString() {
+			return value;
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/OverrideBinder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/OverrideBinder.java
new file mode 100644
index 000000000000..141c9a9a07fd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/OverrideBinder.java
@@ -0,0 +1,472 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.HashSetValuedHashMap;
+import org.hibernate.MappingException;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.AssociationInfo;
+import org.hibernate.tool.reveng.api.core.RevengStrategy.SchemaSelection;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.strategy.MetaAttributeHelper.SimpleMetaAttribute;
+import org.hibernate.tool.reveng.internal.core.util.RevengUtils;
+import org.hibernate.tool.reveng.internal.util.JdbcToHibernateTypeHelper;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+public class OverrideBinder {
+
+	public static void bindRoot(OverrideRepository repository, Document doc) {
+		Element rootElement = doc.getDocumentElement();
+		bindSchemaSelections(getChildElements(rootElement, "schema-selection"), repository);
+		bindTypeMappings(getChildElements(rootElement, "type-mapping"), repository);
+		bindTableFilters(getChildElements(rootElement, "table-filter"), repository);
+		bindTables(getChildElements(rootElement, "table"), repository);
+	}
+
+	private static void bindSchemaSelections(
+			ArrayList<Element> schemaSelections,
+			OverrideRepository repository) {
+		for (Element schemaSelection : schemaSelections) {
+			bindSchemaSelection(schemaSelection, repository);
+		}
+	}
+
+	private static void bindTypeMappings(
+			ArrayList<Element> typeMappings,
+			OverrideRepository repository) {
+		if ( !typeMappings.isEmpty() ) {
+			bindTypeMapping(typeMappings.get(0), repository);
+		}
+	}
+
+	private static void bindTableFilters(
+			ArrayList<Element> tableFilters,
+			OverrideRepository repository) {
+		for (Element element : tableFilters) {
+			TableFilter tableFilter = new TableFilter();
+			tableFilter.setMatchCatalog(getAttribute(element, "match-catalog"));
+			tableFilter.setMatchSchema(getAttribute(element, "match-schema"));
+			tableFilter.setMatchName(getAttribute(element, "match-name"));
+			tableFilter.setExclude(Boolean.valueOf(getAttribute(element, "exclude")));
+			tableFilter.setPackage(getAttribute(element, "package"));
+			MultiValuedMap<String, SimpleMetaAttribute> map =
+					MetaAttributeHelper.loadAndMergeMetaMap(
+							element,
+							new HashSetValuedHashMap<>());
+			if ( !map.isEmpty() ) {
+				tableFilter.setMetaAttributes(map);
+			}
+			else {
+				tableFilter.setMetaAttributes(null);
+			}
+			repository.addTableFilter(tableFilter);
+		}
+	}
+
+	private static void bindTables(
+			ArrayList<Element> tables,
+			OverrideRepository repository) {
+		for (Element element : tables) {
+			Table table = new Table("Hibernate Tools");
+			table.setCatalog(getAttribute(element, "catalog"));
+			table.setSchema(getAttribute(element, "schema"));
+			table.setName(getAttribute(element, "name"));
+			ArrayList<Element> primaryKeys = getChildElements(element, "primary-key");
+			if ( !primaryKeys.isEmpty() ) {
+				bindPrimaryKey(primaryKeys.get(0), table, repository);
+			}
+			bindColumns(getChildElements(element, "column"), table, repository);
+			bindForeignKeys(getChildElements(element, "foreign-key"), table, repository);
+			bindMetaAttributes(element, table, repository);
+			repository.addTable(table, getAttribute(element, "class"));
+		}
+	}
+
+	private static void bindPrimaryKey(
+			Element element,
+			Table table,
+			OverrideRepository repository) {
+		String propertyName = getAttribute(element, "property");
+		String compositeIdName = getAttribute(element, "id-class");
+		ArrayList<Element> generators = getChildElements(element, "generator");
+		if ( !generators.isEmpty() ) {
+			Element generator = generators.get(0);
+			String identifierClass = getAttribute(generator, "class");
+			Properties params = new Properties();
+			ArrayList<Element> parameterList = getChildElements(generator, "param");
+			for ( Element parameter : parameterList ) {
+				params.setProperty( getAttribute( parameter, "name" ), parameter.getTextContent() );
+			}
+			repository.addTableIdentifierStrategy(table, identifierClass, params);
+		}
+		List<String> boundColumnNames = bindColumns(getChildElements(element, "key-column"), table, repository);
+		repository.addPrimaryKeyNamesForTable(table, boundColumnNames, propertyName, compositeIdName);
+	}
+
+	private static List<String> bindColumns(
+			ArrayList<Element> columns,
+			Table table,
+			OverrideRepository repository) {
+		List<String> columnNames = new ArrayList<>();
+		for (Element element : columns) {
+			Column column = new Column();
+			column.setName(getAttribute(element, "name"));
+			String attributeValue = getAttribute(element, "jdbc-type");
+			if (StringHelper.isNotEmpty(attributeValue)) {
+				column.setSqlTypeCode( JdbcToHibernateTypeHelper.getJDBCType( attributeValue ) );
+			}
+			TableIdentifier tableIdentifier = TableIdentifier.create(table);
+			if (table.getColumn(column) != null) {
+				throw new MappingException("Column " + column.getName() + " already exists in table " + tableIdentifier );
+			}
+			MultiValuedMap<String, SimpleMetaAttribute> map =
+					MetaAttributeHelper.loadAndMergeMetaMap(
+							element,
+							new HashSetValuedHashMap<>());
+			if( !map.isEmpty() ) {
+				repository.addMetaAttributeInfo( tableIdentifier, column.getName(), map);
+			}
+			table.addColumn(column);
+			columnNames.add(column.getName());
+			repository.setTypeNameForColumn(
+					tableIdentifier,
+					column.getName(),
+					getAttribute(element, "type"));
+			repository.setPropertyNameForColumn(
+					tableIdentifier,
+					column.getName(),
+					getAttribute(element, "property"));
+			boolean excluded = Boolean.parseBoolean(element.getAttribute("exclude") );
+			if(excluded) {
+				repository.setExcludedColumn(tableIdentifier, column.getName());
+			}
+			if (element.hasAttribute("foreign-table")) {
+				String foreignTableName = element.getAttribute("foreign-table");
+				List<Column> localColumns = new ArrayList<>();
+				localColumns.add(column);
+				List<Column> foreignColumns = new ArrayList<>();
+				Table foreignTable = new Table("Hibernate Tools");
+				foreignTable.setName(foreignTableName);
+				foreignTable.setCatalog(
+						element.hasAttribute("foreign-catalog") ?
+						element.getAttribute("foreign-catalog") :
+						table.getCatalog());
+				foreignTable.setSchema(
+						element.hasAttribute("foreign-schema") ?
+						element.getAttribute("foreign-schema") :
+						table.getSchema());
+				if (element.hasAttribute("foreign-column")) {
+					String foreignColumnName = element.getAttribute("foreign-column");
+					Column foreignColumn = new Column();
+					foreignColumn.setName(foreignColumnName);
+					foreignColumns.add(foreignColumn);
+				}
+				else {
+					throw new MappingException("foreign-column is required when foreign-table is specified on " + column);
+				}
+				ForeignKey key = table.createForeignKey(
+						null,
+						localColumns,
+						foreignTableName,
+						null,
+						null,
+						foreignColumns);
+				key.setReferencedTable(foreignTable); // only possible if foreignColumns is explicitly specified (workaround on aligncolumns)
+			}
+		}
+		return columnNames;
+	}
+
+	private static void bindForeignKeys(
+			ArrayList<Element> foreignKeys,
+			Table table,
+			OverrideRepository repository) {
+		for (Element element : foreignKeys) {
+			String constraintName = getAttribute(element, "constraint-name");
+			String foreignTableName = getAttribute(element, "foreign-table");
+			if (foreignTableName != null) {
+				Table foreignTable = new Table("hibernate tools");
+				foreignTable.setName(foreignTableName);
+				foreignTable.setCatalog(
+						element.hasAttribute("foreign-catalog") ?
+						element.getAttribute("foreign-catalog") :
+						table.getCatalog());
+				foreignTable.setSchema(
+						element.hasAttribute("foreign-schema") ?
+						element.getAttribute("foreign-schema") :
+						table.getSchema());
+				List<Column> localColumns = new ArrayList<>();
+				List<Column> foreignColumns = new ArrayList<>();
+				ArrayList<Element> columnRefs = getChildElements(element, "column-ref");
+				for (Element columnRef : columnRefs) {
+					localColumns.add(new Column(columnRef.getAttribute("local-column")));
+					foreignColumns.add(new Column(columnRef.getAttribute("foreign-column")));
+				}
+				ForeignKey key = table.createForeignKey(
+						constraintName,
+						localColumns,
+						foreignTableName,
+						null,
+						null,
+						foreignColumns);
+				key.setReferencedTable(foreignTable); // only possible if foreignColumns is explicitly specified (workaround on aligncolumns)
+			}
+			if (StringHelper.isNotEmpty(constraintName)) {
+				if (!validateFkAssociations(element)) {
+					throw new IllegalArgumentException("you can't mix <many-to-one/> or <set/> with <(inverse-)one-to-one/> ");
+				}
+				if (!bindManyToOneAndCollection(element, constraintName, repository)) {
+					bindOneToOne(element, constraintName, repository);
+				}
+			}
+
+		}
+	}
+
+	private static void bindOneToOne(Element element, String constraintName,
+			OverrideRepository repository) {
+		String oneToOneProperty = null;
+		Boolean excludeOneToOne = null;
+		ArrayList<Element> oneToOnes = getChildElements(element, "one-to-one");
+		Element oneToOne = null;
+		AssociationInfo associationInfo = null;
+		if( !oneToOnes.isEmpty() ) {
+			oneToOne = oneToOnes.get(0);
+			oneToOneProperty = getAttribute(oneToOne, "property");
+			excludeOneToOne = Boolean.valueOf(oneToOne.getAttribute("exclude"));
+			associationInfo = extractAssociationInfo(oneToOne);
+		}
+
+		String inverseOneToOneProperty = null;
+		Boolean excludeInverseOneToOne = null;
+		ArrayList<Element> inverseOneToOnes = getChildElements(element, "inverse-one-to-one");
+		Element inverseOneToOne;
+		AssociationInfo inverseAssociationInfo = null;
+		if( !inverseOneToOnes.isEmpty() ) {
+			inverseOneToOne = inverseOneToOnes.get(0);
+			inverseOneToOneProperty = getAttribute(inverseOneToOne, "property");
+			excludeInverseOneToOne = Boolean.valueOf(inverseOneToOne.getAttribute("exclude"));
+			inverseAssociationInfo = extractAssociationInfo(inverseOneToOne);
+		}
+		// having oneToOne = null and inverseOneToOne != null doesn't make sense
+		// we cannot have the inverse side without the owning side in this case
+		if ( (oneToOne!=null) ) {
+			repository.addForeignKeyInfo(
+					constraintName,
+					oneToOneProperty,
+					excludeOneToOne,
+					inverseOneToOneProperty,
+					excludeInverseOneToOne,
+					associationInfo,
+					inverseAssociationInfo);
+		}
+	}
+
+	private static boolean bindManyToOneAndCollection(
+			Element element,
+			String constraintName,
+			OverrideRepository repository) {
+		String manyToOneProperty = null;
+		Boolean excludeManyToOne = null;
+		AssociationInfo associationInfo = null;
+		AssociationInfo inverseAssociationInfo = null;
+		ArrayList<Element> manyToOnes = getChildElements(element, "many-to-one");
+		Element manyToOne = null;
+		if ( !manyToOnes.isEmpty() ) {
+			manyToOne = manyToOnes.get(0);
+			manyToOneProperty = getAttribute(manyToOne, "property");
+			excludeManyToOne = Boolean.valueOf(manyToOne.getAttribute("exclude"));
+			associationInfo = extractAssociationInfo(manyToOne);
+		}
+		String collectionProperty = null;
+		Boolean excludeCollection = null;
+		ArrayList<Element> sets = getChildElements(element, "set");
+		Element set = null;
+		if ( !sets.isEmpty() ) {
+			set = sets.get(0);
+			collectionProperty = getAttribute(set, "property");
+			excludeCollection = Boolean.valueOf(set.getAttribute("exclude"));
+			inverseAssociationInfo = extractAssociationInfo(set);
+		}
+		if ( (manyToOne!=null) || (set!=null) ) {
+			repository.addForeignKeyInfo(
+					constraintName,
+					manyToOneProperty,
+					excludeManyToOne,
+					collectionProperty,
+					excludeCollection,
+					associationInfo,
+					inverseAssociationInfo);
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
+
+	private static AssociationInfo extractAssociationInfo(Element manyToOne) {
+		return RevengUtils.createAssociationInfo(
+				manyToOne.hasAttribute("cascade") ? manyToOne.getAttribute("cascade") : null,
+				manyToOne.hasAttribute("fetch") ? manyToOne.getAttribute("fetch") : null,
+				manyToOne.hasAttribute("insert") ?
+					Boolean.parseBoolean(manyToOne.getAttribute("insert")) : null,
+				manyToOne.hasAttribute("update") ?
+					Boolean.parseBoolean(manyToOne.getAttribute("update")) : null);
+	}
+
+	private static boolean validateFkAssociations(Element element){
+		ArrayList<Element> manyToOnes = getChildElements(element, "many-to-one");
+		ArrayList<Element> oneToOnes = getChildElements(element, "one-to-one");
+		ArrayList<Element> sets = getChildElements(element, "set");
+		ArrayList<Element> inverseOneToOnes = getChildElements(element, "inverse-one-to-one");
+		if ( !manyToOnes.isEmpty() &&
+			(!oneToOnes.isEmpty() || !inverseOneToOnes.isEmpty())) {
+			return false;
+		}
+		if ( !oneToOnes.isEmpty() && !sets.isEmpty() ) {
+			return false;
+		}
+		return inverseOneToOnes.isEmpty() || sets.isEmpty();
+	}
+
+	private static void bindMetaAttributes(
+			Element element,
+			Table table,
+			OverrideRepository repository) {
+		MultiValuedMap<String, SimpleMetaAttribute> map =
+				MetaAttributeHelper.loadAndMergeMetaMap(
+						element,
+						new HashSetValuedHashMap<>());
+		if( !map.isEmpty() ) {
+			repository.addMetaAttributeInfo( table, map);
+		}
+	}
+
+	private static void bindSchemaSelection(
+			Element schemaSelectionElement,
+			OverrideRepository repository) {
+		repository.addSchemaSelection(
+				new SchemaSelection() {
+					@Override
+					public String getMatchCatalog() {
+						return getAttribute(schemaSelectionElement, "match-catalog");
+					}
+					@Override
+					public String getMatchSchema() {
+						return getAttribute(schemaSelectionElement, "match-schema");
+					}
+					@Override
+					public String getMatchTable() {
+						return getAttribute(schemaSelectionElement, "match-table");
+					}
+
+				});
+	}
+
+	private static void bindTypeMapping(
+			Element typeMapping,
+			OverrideRepository repository) {
+		ArrayList<Element> sqlTypes = getChildElements(typeMapping, "sql-type");
+		for ( Element sqlType : sqlTypes ) {
+			bindSqlType( sqlType, repository );
+		}
+	}
+
+	private static void bindSqlType(Element sqlType, OverrideRepository repository) {
+		int jdbcType = JdbcToHibernateTypeHelper.getJDBCType(
+				getAttribute(sqlType, "jdbc-type"));
+		SQLTypeMapping sqlTypeMapping = new SQLTypeMapping(jdbcType);
+		sqlTypeMapping.setHibernateType(getHibernateType(sqlType));
+		sqlTypeMapping.setLength(getInteger(
+				getAttribute(sqlType, "length"),
+				SQLTypeMapping.UNKNOWN_LENGTH));
+		sqlTypeMapping.setPrecision(getInteger(
+				getAttribute(sqlType, "precision"),
+				SQLTypeMapping.UNKNOWN_PRECISION));
+		sqlTypeMapping.setScale(getInteger(
+				getAttribute(sqlType, "scale"),
+				SQLTypeMapping.UNKNOWN_SCALE));
+		String notNull = getAttribute(sqlType, "not-null");
+		if (StringHelper.isEmpty(notNull)) {
+			sqlTypeMapping.setNullable(null);
+		}
+		else {
+			sqlTypeMapping.setNullable(notNull.equals("false"));
+		}
+		if (StringHelper.isEmpty(sqlTypeMapping.getHibernateType())) {
+			throw new MappingException(
+					"No hibernate-type specified for " +
+					sqlType.getAttribute("jdbc-type") +
+					" at " +
+					sqlType.getTagName());
+		}
+		repository.addTypeMapping(sqlTypeMapping);
+	}
+
+	private static String getHibernateType(Element element) {
+		String attributeValue = getAttribute(element, "hibernate-type");
+		if(StringHelper.isEmpty(attributeValue)) {
+			ArrayList<Element> hibernateTypes = getChildElements(element, "hibernate-type");
+			if ( !hibernateTypes.isEmpty() ) {
+				Element hibernateType = hibernateTypes.get(0);
+				if (hibernateType.hasAttribute("name")) {
+					return hibernateType.getAttribute("name");
+				}
+			}
+			else {
+				return null;
+			}
+		}
+		return attributeValue;
+	}
+
+	private static int getInteger(String string, int defaultValue) {
+		if(string==null) {
+			return defaultValue;
+		}
+		else {
+			try {
+				return Integer.parseInt(string);
+			}
+			catch (NumberFormatException e) {
+				throw new RuntimeException(e);
+			}
+		}
+	}
+
+	private static ArrayList<Element> getChildElements(Element parent, String tagName) {
+		ArrayList<Element> result = new ArrayList<>();
+		NodeList nodeList = parent.getChildNodes();
+		for (int i = 0; i < nodeList.getLength(); i++) {
+			Node node = nodeList.item(i);
+			if (node instanceof Element) {
+				if (tagName.equals(((Element)node).getTagName())) {
+					result.add((Element)node);
+				}
+			}
+		}
+		return result;
+	}
+
+	private static String getAttribute(Element element, String attributeName) {
+		String result = null;
+		if (element.hasAttribute(attributeName)) {
+			result = element.getAttribute(attributeName);
+		}
+		return result;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/OverrideRepository.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/OverrideRepository.java
new file mode 100644
index 000000000000..f3f5a0a6ec99
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/OverrideRepository.java
@@ -0,0 +1,811 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.MultiValuedMap;
+import org.hibernate.MappingException;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.AssociationInfo;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategy.SchemaSelection;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.strategy.MetaAttributeHelper.SimpleMetaAttribute;
+import org.hibernate.tool.reveng.internal.util.JdbcToHibernateTypeHelper;
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+import org.jboss.logging.Logger;
+import org.w3c.dom.Document;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
+
+public class OverrideRepository  {
+
+	final private static Logger log = Logger.getLogger( OverrideRepository.class );
+
+	final private Map<TypeMappingKey, List<SQLTypeMapping>> typeMappings; // from sqltypes to list of SQLTypeMapping
+
+	final private List<TableFilter> tableFilters;
+
+	final private Map<TableIdentifier, List<ForeignKey>> foreignKeys; // key: TableIdentifier element: List of foreignkeys that references the Table
+
+	final private Map<TableColumnKey, String> typeForColumn;
+
+	final private Map<TableColumnKey, String> propertyNameForColumn;
+
+	final private Map<TableIdentifier, String> identifierStrategyForTable;
+
+	final private Map<TableIdentifier, Properties> identifierPropertiesForTable;
+
+	final private Map<TableIdentifier, List<String>> primaryKeyColumnsForTable;
+
+	final private Set<TableColumnKey> excludedColumns;
+
+	final private TableToClassName tableToClassName;
+
+	final private List<SchemaSelection> schemaSelections;
+
+	final private Map<TableIdentifier, String> propertyNameForPrimaryKey;
+
+	final private Map<TableIdentifier, String> compositeIdNameForTable;
+
+	final private Map<String, String> foreignKeyToOneName;
+
+	final private Map<String, String> foreignKeyToInverseName;
+
+	final private Map<String, Boolean> foreignKeyInverseExclude;
+
+	final private Map<String, Boolean> foreignKeyToOneExclude;
+
+	final private Map<String, AssociationInfo> foreignKeyToEntityInfo;
+	final private Map<String, AssociationInfo> foreignKeyToInverseEntityInfo;
+
+	final private Map<TableIdentifier, MultiValuedMap<String, SimpleMetaAttribute>> tableMetaAttributes; // TI -> MultiMap of SimpleMetaAttributes
+
+	final private Map<TableColumnKey, MultiValuedMap<String, SimpleMetaAttribute>> columnMetaAttributes;
+
+	//private String defaultCatalog;
+	//private String defaultSchema;
+
+	public OverrideRepository() {
+		//this.defaultCatalog = null;
+		//this.defaultSchema = null;
+		typeMappings = new HashMap<>();
+		tableFilters = new ArrayList<>();
+		foreignKeys = new HashMap<>();
+		typeForColumn = new HashMap<>();
+		propertyNameForColumn = new HashMap<>();
+		identifierStrategyForTable = new HashMap<>();
+		identifierPropertiesForTable = new HashMap<>();
+		primaryKeyColumnsForTable = new HashMap<>();
+		propertyNameForPrimaryKey = new HashMap<>();
+		tableToClassName = new TableToClassName();
+		excludedColumns = new HashSet<>();
+		schemaSelections = new ArrayList<>();
+		compositeIdNameForTable = new HashMap<>();
+		foreignKeyToOneName = new HashMap<>();
+		foreignKeyToInverseName = new HashMap<>();
+		foreignKeyInverseExclude = new HashMap<>();
+		foreignKeyToOneExclude = new HashMap<>();
+		tableMetaAttributes = new HashMap<>();
+		columnMetaAttributes = new HashMap<>();
+		foreignKeyToEntityInfo = new HashMap<>();
+		foreignKeyToInverseEntityInfo = new HashMap<>();
+	}
+
+	public void addFile(File xmlFile) {
+		log.info( "Override file: " + xmlFile.getPath() );
+		try {
+			addInputStream( xmlFile );
+		}
+		catch ( Exception e ) {
+			log.error( "Could not configure overrides from file: " + xmlFile.getPath(), e );
+			throw new MappingException( "Could not configure overrides from file: " + xmlFile.getPath(), e );
+		}
+
+	}
+
+	/**
+	 * Read override from an application resource trying different classloaders.
+	 * This method will try to load the resource first from the thread context
+	 * classloader and then from the classloader that loaded Hibernate.
+	 */
+	public OverrideRepository addResource(String path) throws MappingException {
+		log.info( "Mapping resource: " + path );
+		InputStream rsrc = Thread.currentThread().getContextClassLoader().getResourceAsStream( path );
+		if ( rsrc == null ) rsrc = OverrideRepository.class.getClassLoader().getResourceAsStream( path );
+		if ( rsrc == null ) throw new MappingException( "Resource: " + path + " not found" );
+		try {
+			return addInputStream( rsrc );
+		}
+		catch ( MappingException me ) {
+			throw new MappingException( "Error reading resource: " + path, me );
+		}
+	}
+
+	public OverrideRepository addInputStream(InputStream xmlInputStream) throws MappingException {
+		try {
+			final List<SAXParseException> errors = new ArrayList<>();
+			ErrorHandler errorHandler = new ErrorHandler() {
+				@Override
+				public void warning(SAXParseException exception) {
+					log.warn("warning while parsing xml", exception);
+				}
+				@Override
+				public void error(SAXParseException exception) {
+					errors.add(exception);
+				}
+				@Override
+				public void fatalError(SAXParseException exception) {
+					error(exception);
+				}
+			};
+			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(
+					"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl",
+					Thread.currentThread().getContextClassLoader());
+			dbf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+			dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+			DocumentBuilder db = dbf.newDocumentBuilder();
+			db.setErrorHandler(errorHandler);
+			Document document = db.parse(xmlInputStream);
+			if ( !errors.isEmpty()) throw new MappingException( "invalid override definition", errors.get( 0 ) );
+			add( document );
+			return this;
+		}
+		catch ( MappingException me ) {
+			throw me;
+		}
+		catch ( Exception e ) {
+			log.error( "Could not configure overrides from input stream", e );
+			throw new MappingException( e );
+		}
+	}
+
+	public void addInputStream(File file) throws MappingException {
+		try (InputStream xmlInputStream = new FileInputStream( file )) {
+			try {
+				addInputStream( xmlInputStream );
+			}
+			catch (Exception e) {
+				log.error( "Could not configure overrides from input stream", e );
+				throw new MappingException( e );
+			}
+		}
+		catch (IOException ioe) {
+			log.error( "could not close input stream", ioe );
+		}
+	}
+
+	private void add(Document doc) {
+		OverrideBinder.bindRoot(this, doc);
+	}
+
+	private String getPreferredHibernateType(int sqlType, int length, int precision, int scale, boolean nullable) {
+		List<SQLTypeMapping> l = typeMappings.get(new TypeMappingKey(sqlType,length) );
+
+		if(l == null) { // if no precise length match found, then try to find matching unknown length matches
+			l = typeMappings.get(new TypeMappingKey(sqlType,SQLTypeMapping.UNKNOWN_LENGTH) );
+		}
+		return scanForMatch( sqlType, length, precision, scale, nullable, l );
+	}
+
+	private String scanForMatch(int sqlType, int length, int precision, int scale, boolean nullable, List<SQLTypeMapping> l) {
+		if(l!=null) {
+			for ( SQLTypeMapping element : l ) {
+				if ( element.getJDBCType() != sqlType ) return null;
+				if ( element.match( sqlType, length, precision, scale, nullable ) ) {
+					return element.getHibernateType();
+				}
+			}
+		}
+		return null;
+	}
+
+	public void addTypeMapping(SQLTypeMapping sqltype) {
+		TypeMappingKey key = new TypeMappingKey(sqltype);
+		List<SQLTypeMapping> list = typeMappings.computeIfAbsent( key, k -> new ArrayList<>() );
+		list.add(sqltype);
+	}
+
+	static class TypeMappingKey {
+
+		int type;
+		int length;
+
+		TypeMappingKey(SQLTypeMapping mpa) {
+			type = mpa.getJDBCType();
+			length = mpa.getLength();
+		}
+
+		public TypeMappingKey(int sqlType, int length) {
+			this.type = sqlType;
+			this.length = length;
+		}
+
+		public boolean equals(Object obj) {
+			if(obj==null) return false;
+			if(!(obj instanceof TypeMappingKey other)) return false;
+
+
+			return type==other.type && length==other.length;
+		}
+
+		public int hashCode() {
+			return (type + length) % 17;
+		}
+
+		public String toString() {
+			return this.getClass() + "(type:" + type + ", length:" + length + ")";
+		}
+	}
+
+	protected String getPackageName(TableIdentifier identifier) {
+		for ( TableFilter tf : tableFilters ) {
+			String value = tf.getPackage( identifier );
+			if ( value != null ) {
+				return value;
+			}
+		}
+		return null;
+	}
+
+	protected boolean excludeTable(TableIdentifier identifier) {
+		Iterator<TableFilter> iterator = tableFilters.iterator();
+		boolean hasInclude = false;
+
+		while(iterator.hasNext() ) {
+			TableFilter tf = iterator.next();
+			Boolean value = tf.exclude(identifier);
+			if(value!=null) {
+				return value;
+			}
+			if(!tf.getExclude() ) {
+				hasInclude = true;
+			}
+		}
+
+		return hasInclude;
+	}
+
+	public void addTableFilter(TableFilter filter) {
+		tableFilters.add(filter);
+	}
+
+	public RevengStrategy getReverseEngineeringStrategy(RevengStrategy delegate) {
+		return new DelegatingStrategy(delegate) {
+
+			public boolean excludeTable(TableIdentifier ti) {
+				return OverrideRepository.this.excludeTable(ti);
+			}
+
+			public Map<String,MetaAttribute> tableToMetaAttributes(TableIdentifier tableIdentifier) {
+				return OverrideRepository.this.tableToMetaAttributes(tableIdentifier);
+			}
+
+			public Map<String, MetaAttribute> columnToMetaAttributes(TableIdentifier tableIdentifier, String column) {
+				return OverrideRepository.this.columnToMetaAttributes(tableIdentifier, column);
+			}
+
+			public boolean excludeColumn(TableIdentifier identifier, String columnName) {
+				return excludedColumns.contains(new TableColumnKey(identifier, columnName));
+			}
+
+			public String tableToCompositeIdName(TableIdentifier identifier) {
+				String result = compositeIdNameForTable.get(identifier);
+				if(result==null) {
+					return super.tableToCompositeIdName(identifier);
+				}
+				else {
+					return result;
+				}
+			}
+			public List<SchemaSelection> getSchemaSelections() {
+				if(schemaSelections.isEmpty()) {
+					return super.getSchemaSelections();
+				}
+				else {
+					return schemaSelections;
+				}
+			}
+
+			public String columnToHibernateTypeName(TableIdentifier table, String columnName, int sqlType, int length, int precision, int scale, boolean nullable, boolean generatedIdentifier) {
+				String result;
+				String location = "";
+				String info = " t:" + JdbcToHibernateTypeHelper.getJDBCTypeName( sqlType ) + " l:" + length + " p:" + precision + " s:" + scale + " n:" + nullable + " id:" + generatedIdentifier;
+				if(table!=null) {
+					location = TableNameQualifier.qualify(table.getCatalog(), table.getSchema(), table.getName() ) + "." + columnName;
+				}
+				else {
+
+					location += " Column: " + columnName + info;
+				}
+				if(table!=null && columnName!=null) {
+					result = typeForColumn.get(new TableColumnKey(table, columnName));
+					if(result!=null) {
+						log.debug("explicit column mapping found for [" + location + "] to [" + result + "]");
+						return result;
+					}
+				}
+
+				result = OverrideRepository.this.getPreferredHibernateType(sqlType, length, precision, scale, nullable);
+				if(result==null) {
+					return super.columnToHibernateTypeName(table, columnName, sqlType, length, precision, scale, nullable, generatedIdentifier);
+				}
+				else {
+					log.debug("<type-mapping> found for [" + location + info + "] to [" + result + "]");
+					return result;
+				}
+			}
+
+			public String tableToClassName(TableIdentifier tableIdentifier) {
+				String className = tableToClassName.get(tableIdentifier);
+
+				if(className!=null) {
+					if( className.contains( "." ) ) {
+						return className;
+					}
+					else {
+						String packageName = getPackageName(tableIdentifier);
+						if(packageName==null) {
+							return className;
+						}
+						else {
+							return StringHelper.qualify(packageName, className);
+						}
+					}
+				}
+
+				String packageName = getPackageName(tableIdentifier);
+				if(packageName==null) {
+					return super.tableToClassName(tableIdentifier);
+				}
+				else {
+					String string = super.tableToClassName(tableIdentifier);
+					if(string==null) return null;
+					return StringHelper.qualify(packageName, StringHelper.unqualify(string));
+				}
+			}
+
+			public List<ForeignKey> getForeignKeys(TableIdentifier referencedTable) {
+				List<ForeignKey> list = foreignKeys.get(referencedTable);
+				if(list==null) {
+					return super.getForeignKeys(referencedTable);
+				}
+				else {
+					return list;
+				}
+			}
+
+			public String columnToPropertyName(TableIdentifier table, String column) {
+				String result = propertyNameForColumn.get(new TableColumnKey(table, column));
+				if(result==null) {
+					return super.columnToPropertyName(table, column);
+				}
+				else {
+					return result;
+				}
+			}
+
+			public String tableToIdentifierPropertyName(TableIdentifier tableIdentifier) {
+				String result = propertyNameForPrimaryKey.get(tableIdentifier);
+				if(result==null) {
+					return super.tableToIdentifierPropertyName(tableIdentifier);
+				}
+				else {
+					return result;
+				}
+			}
+
+			public String getTableIdentifierStrategyName(TableIdentifier tableIdentifier) {
+				String result = identifierStrategyForTable.get(tableIdentifier);
+				if(result==null) {
+					return super.getTableIdentifierStrategyName( tableIdentifier );
+				}
+				else {
+					log.debug("tableIdentifierStrategy for " + tableIdentifier + " -> '" + result + "'");
+					return result;
+				}
+			}
+
+			public Properties getTableIdentifierProperties(TableIdentifier tableIdentifier) {
+				Properties result = identifierPropertiesForTable.get(tableIdentifier);
+				if(result==null) {
+					return super.getTableIdentifierProperties( tableIdentifier );
+				}
+				else {
+					return result;
+				}
+			}
+
+			public List<String> getPrimaryKeyColumnNames(TableIdentifier tableIdentifier) {
+				List<String> result = primaryKeyColumnsForTable.get(tableIdentifier);
+				if(result==null) {
+					return super.getPrimaryKeyColumnNames(tableIdentifier);
+				}
+				else {
+					return result;
+				}
+			}
+
+			public String foreignKeyToEntityName(String keyname, TableIdentifier fromTable, List<?> fromColumnNames, TableIdentifier referencedTable, List<?> referencedColumnNames, boolean uniqueReference) {
+				String property = foreignKeyToOneName.get(keyname);
+				if(property==null) {
+					return super.foreignKeyToEntityName(keyname, fromTable, fromColumnNames, referencedTable, referencedColumnNames, uniqueReference);
+				}
+				else {
+					return property;
+				}
+			}
+
+
+			public String foreignKeyToInverseEntityName(String keyname,
+														TableIdentifier fromTable, List<?> fromColumnNames,
+														TableIdentifier referencedTable,
+														List<?> referencedColumnNames, boolean uniqueReference) {
+
+				String property = foreignKeyToInverseName.get(keyname);
+				if(property==null) {
+					return super.foreignKeyToInverseEntityName(keyname, fromTable, fromColumnNames, referencedTable, referencedColumnNames, uniqueReference);
+				}
+				else {
+					return property;
+				}
+			}
+
+			public String foreignKeyToCollectionName(String keyname, TableIdentifier fromTable, List<?> fromColumns, TableIdentifier referencedTable, List<?> referencedColumns, boolean uniqueReference) {
+				String property = foreignKeyToInverseName.get(keyname);
+				if(property==null) {
+					return super.foreignKeyToCollectionName(keyname, fromTable, fromColumns, referencedTable, referencedColumns, uniqueReference);
+				}
+				else {
+					return property;
+				}
+			}
+
+			public boolean excludeForeignKeyAsCollection(
+					String keyname,
+					TableIdentifier fromTable,
+					List<?> fromColumns,
+					TableIdentifier referencedTable,
+					List<?> referencedColumns) {
+				Boolean bool = foreignKeyInverseExclude.get(keyname);
+				return Objects.requireNonNullElseGet(bool, () -> super.excludeForeignKeyAsCollection(keyname, fromTable, fromColumns,
+						referencedTable, referencedColumns));
+			}
+
+			public boolean excludeForeignKeyAsManytoOne(
+					String keyname,
+					TableIdentifier fromTable,
+					List<?> fromColumns, TableIdentifier
+							referencedTable,
+					List<?> referencedColumns) {
+				Boolean bool = foreignKeyToOneExclude.get(keyname);
+				return Objects.requireNonNullElseGet(bool, () -> super.excludeForeignKeyAsManytoOne(keyname, fromTable, fromColumns,
+						referencedTable, referencedColumns));
+			}
+
+
+			public AssociationInfo foreignKeyToInverseAssociationInfo(ForeignKey foreignKey) {
+				AssociationInfo fkei = foreignKeyToInverseEntityInfo.get(foreignKey.getName());
+				if(fkei!=null) {
+					return fkei;
+				}
+				else {
+					return super.foreignKeyToInverseAssociationInfo(foreignKey);
+				}
+			}
+
+			public AssociationInfo foreignKeyToAssociationInfo(ForeignKey foreignKey) {
+				AssociationInfo fkei = foreignKeyToEntityInfo.get(foreignKey.getName());
+				if(fkei!=null) {
+					return fkei;
+				}
+				else {
+					return super.foreignKeyToAssociationInfo(foreignKey);
+				}
+			}
+		};
+	}
+
+	protected Map<String, MetaAttribute> columnToMetaAttributes(TableIdentifier tableIdentifier, String column) {
+		MultiValuedMap<String, SimpleMetaAttribute> specific = columnMetaAttributes.get( new TableColumnKey(tableIdentifier, column) );
+		if(specific!=null && !specific.isEmpty()) {
+			return toMetaAttributes(specific);
+		}
+
+		return null;
+	}
+
+	// TODO: optimize
+	protected Map<String,MetaAttribute> tableToMetaAttributes(TableIdentifier identifier) {
+		MultiValuedMap<String, SimpleMetaAttribute> specific = tableMetaAttributes.get( identifier );
+		if(specific!=null && !specific.isEmpty()) {
+			return toMetaAttributes(specific);
+		}
+		MultiValuedMap<String, SimpleMetaAttribute> general = findGeneralAttributes( identifier );
+		if(general!=null && !general.isEmpty()) {
+			return toMetaAttributes(general);
+		}
+
+		return null;
+
+		/* inheritance not defined yet
+		if(specific==null) { specific = Collections.EMPTY_MAP; }
+		if(general==null) { general = Collections.EMPTY_MAP; }
+
+		MultiMap map = MetaAttributeBinder.mergeMetaMaps( specific, general );
+		*/
+		/*
+		if(map!=null && !map.isEmpty()) {
+			return toMetaAttributes(null, map);
+		}
+		else {
+			return null;
+		}
+		*/
+	}
+
+	private MultiValuedMap<String, SimpleMetaAttribute> findGeneralAttributes(TableIdentifier identifier) {
+		for ( TableFilter tf : tableFilters ) {
+			MultiValuedMap<String, SimpleMetaAttribute> value = tf.getMetaAttributes( identifier );
+			if ( value != null ) {
+				return value;
+			}
+		}
+		return null;
+	}
+
+	private Map<String, MetaAttribute> toMetaAttributes(MultiValuedMap<String, SimpleMetaAttribute> mvm) {
+		Map<String, MetaAttribute> result = new HashMap<>();
+		for (MapIterator<String, SimpleMetaAttribute> iter = mvm.mapIterator(); iter.hasNext();) {
+			String key = iter.next();
+			Collection<SimpleMetaAttribute> values = mvm.get(key);
+			result.put(key, MetaAttributeHelper.toRealMetaAttribute(key, values));
+		}
+		return result;
+	}
+
+	/**
+	 * @deprecated Use {@link #getReverseEngineeringStrategy(RevengStrategy)}
+	 *     with {@code delegate=null} to explicitly ignore the delegate.
+	 */
+	@Deprecated
+	public RevengStrategy getReverseEngineeringStrategy() {
+		return getReverseEngineeringStrategy(null);
+	}
+
+	public void addTable(Table table, String wantedClassName) {
+		for (ForeignKey fk : table.getForeignKeyCollection()) {
+			TableIdentifier identifier = TableIdentifier.create(fk.getReferencedTable());
+			List<ForeignKey> existing = foreignKeys.computeIfAbsent( identifier, k -> new ArrayList<>() );
+			existing.add( fk );
+		}
+
+		if(StringHelper.isNotEmpty(wantedClassName)) {
+			TableIdentifier tableIdentifier = TableIdentifier.create(table);
+			String className = wantedClassName;
+	/* If wantedClassName specifies a package, it is given by
+		<hibernate-reverse-engineering><table class="xxx"> config so do no more. */
+			if(!wantedClassName.contains(".")) {
+		/* Now look for the package name specified by
+		<hibernate-reverse-engineering><table-filter package="xxx"> config. */
+				String packageName = getPackageName(tableIdentifier);
+				if (packageName != null && !packageName.isBlank()) {
+					className = packageName + "." + wantedClassName;
+				}
+			}
+			tableToClassName.put(tableIdentifier, className);
+		}
+	}
+
+	static class TableColumnKey {
+		private final TableIdentifier query;
+		private final String name;
+
+		TableColumnKey(TableIdentifier query, String name){
+			this.query = query;
+			this.name = name;
+		}
+
+		@Override
+		public int hashCode() {
+			final int prime = 29;
+			int result = 1;
+			result = prime * result + ((name == null) ? 0 : name.hashCode());
+			result = prime * result + ((query == null) ? 0 : query.hashCode());
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) return true;
+			if (obj == null) return false;
+			if (getClass() != obj.getClass()) return false;
+			TableColumnKey other = (TableColumnKey) obj;
+			if (name == null) {
+				if (other.name != null)
+					return false;
+			}
+			else if (!name.equals(other.name))
+				return false;
+			if (query == null) {
+				return other.query == null;
+			}
+			else return query.equals( other.query );
+		}
+
+	}
+
+	public void setTypeNameForColumn(TableIdentifier identifier, String columnName, String type) {
+		if(StringHelper.isNotEmpty(type)) {
+			typeForColumn.put(new TableColumnKey(identifier, columnName), type);
+		}
+	}
+
+	public void setExcludedColumn(TableIdentifier tableIdentifier, String columnName) {
+		excludedColumns.add(new TableColumnKey(tableIdentifier, columnName));
+	}
+
+	public void setPropertyNameForColumn(TableIdentifier identifier, String columnName, String property) {
+		if(StringHelper.isNotEmpty(property)) {
+			propertyNameForColumn.put(new TableColumnKey(identifier, columnName), property);
+		}
+	}
+
+	public void addTableIdentifierStrategy(Table table, String identifierClass, Properties params) {
+		if(identifierClass!=null) {
+			final TableIdentifier tid = TableIdentifier.create(table);
+			identifierStrategyForTable.put(tid, identifierClass);
+			identifierPropertiesForTable.put(tid, params);
+		}
+	}
+
+	public void addPrimaryKeyNamesForTable(Table table, List<String> boundColumnNames, String propertyName, String compositeIdName) {
+		TableIdentifier tableIdentifier = TableIdentifier.create(table);
+		if(boundColumnNames!=null && !boundColumnNames.isEmpty()) {
+			primaryKeyColumnsForTable.put(tableIdentifier, boundColumnNames);
+		}
+		if(StringHelper.isNotEmpty(propertyName)) {
+			propertyNameForPrimaryKey.put(tableIdentifier, propertyName);
+		}
+		if(StringHelper.isNotEmpty(compositeIdName)) {
+			compositeIdNameForTable.put(tableIdentifier, compositeIdName);
+		}
+	}
+
+	/*public String getCatalog(String string) {
+		return string==null?defaultCatalog:string;
+	}*/
+
+	/*public String getSchema(String string) {
+		return string==null?defaultSchema:string;
+	}*/
+
+	public void addSchemaSelection(SchemaSelection schemaSelection) {
+		schemaSelections.add(schemaSelection);
+	}
+
+	/**
+	 * Both sides of the FK are important,
+	 * the owning side can generate a toOne (ManyToOne or OneToOne), we call this side foreignKeyToOne
+	 * the inverse side can generate a OneToMany OR a OneToOne (in case we have a pure bidirectional OneToOne, we call this side foreignKeyToInverse
+	 */
+	public void addForeignKeyInfo(String constraintName, String toOneProperty, Boolean excludeToOne, String inverseProperty, Boolean excludeInverse, AssociationInfo associationInfo, AssociationInfo inverseAssociationInfo) {
+		if(StringHelper.isNotEmpty(toOneProperty)) {
+			foreignKeyToOneName.put(constraintName, toOneProperty);
+		}
+		if(StringHelper.isNotEmpty(inverseProperty)) {
+			foreignKeyToInverseName.put(constraintName, inverseProperty);
+		}
+		if(excludeInverse!=null) {
+			foreignKeyInverseExclude.put(constraintName, excludeInverse);
+		}
+		if(excludeToOne!=null) {
+			foreignKeyToOneExclude.put(constraintName, excludeToOne);
+		}
+		if(associationInfo!=null) {
+			foreignKeyToEntityInfo.put(constraintName, associationInfo);
+		}
+		if(inverseAssociationInfo!=null) {
+			foreignKeyToInverseEntityInfo.put(constraintName, inverseAssociationInfo);
+		}
+
+	}
+
+	public void addMetaAttributeInfo(Table table, MultiValuedMap<String, SimpleMetaAttribute> map) {
+		if(map!=null && !map.isEmpty()) {
+			tableMetaAttributes.put(TableIdentifier.create(table), map);
+		}
+
+	}
+
+	public void addMetaAttributeInfo(
+			TableIdentifier tableIdentifier,
+			String name,
+			MultiValuedMap<String, SimpleMetaAttribute> map) {
+		if(map!=null && !map.isEmpty()) {
+			columnMetaAttributes.put(new TableColumnKey( tableIdentifier, name ), map);
+		}
+
+	}
+
+/*It is not possible to match a table on TableMapper alone because RootClassBinder.bind()
+calls nullifyDefaultCatalogAndSchema(table) before doing this TableToClassName lookup.
+So only use the table name for initial matching, and catalog or schema names when they
+are not null.
+*/
+
+	private static class TableToClassName {
+		Map<String, TableMapper> map = new HashMap<>();
+
+		private String get(TableIdentifier tableIdentifier) {
+			TableMapper mapper = map.get(tableIdentifier.getName());
+			if (mapper != null) {
+				if (mapper.catalog == null || tableIdentifier.getCatalog() == null ||
+						mapper.catalog.equals(tableIdentifier.getCatalog())){
+					if (mapper.schema == null || tableIdentifier.getSchema() == null ||
+							mapper.schema.equals(tableIdentifier.getSchema())){
+						if ( mapper.packageName.isEmpty() ) {
+							return mapper.className;
+						}
+						else {
+							return  mapper.packageName + "." + mapper.className;
+						}
+					}
+				}
+			}
+			return null;
+		}
+
+		private void put(TableIdentifier tableIdentifier, String wantedClassName) {
+			TableMapper tableMapper = new TableMapper(
+					tableIdentifier.getCatalog(),
+					tableIdentifier.getSchema(),
+					wantedClassName );
+			map.put(tableIdentifier.getName(), tableMapper);
+		}
+	}
+
+	private static class TableMapper {
+		String catalog;
+		String schema;
+		String className;
+		String packageName;
+
+		private TableMapper(String catalog, String schema, String wantedClassName) {
+			this.catalog = catalog;
+			this.schema = schema;
+			if (wantedClassName.contains(".")) {
+				int nameStartPos = wantedClassName.lastIndexOf(".");
+				this.className = wantedClassName.substring(nameStartPos+1);
+				this.packageName = wantedClassName.substring(0, nameStartPos);
+			}
+			else {
+				this.className = wantedClassName;
+				this.packageName = "";
+			}
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/SQLTypeMapping.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/SQLTypeMapping.java
new file mode 100644
index 000000000000..0cebe3a59792
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/SQLTypeMapping.java
@@ -0,0 +1,154 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import java.util.Objects;
+
+public class SQLTypeMapping implements Comparable<SQLTypeMapping> {
+
+	//static public final int UNKNOWN_TYPE = Integer.MAX_VALUE;
+	public static final int UNKNOWN_LENGTH = Integer.MAX_VALUE;
+	public static final int UNKNOWN_PRECISION = Integer.MAX_VALUE;
+	public static final int UNKNOWN_SCALE = Integer.MAX_VALUE;
+	public static final Boolean UNKNOWN_NULLABLE = null;
+
+	private final int jdbcType;
+	private int length = UNKNOWN_LENGTH;
+	private int precision = UNKNOWN_PRECISION;
+	private int scale = UNKNOWN_SCALE;
+	private Boolean nullable;
+
+	private String hibernateType;
+
+	public SQLTypeMapping(int jdbcType) {
+		this.jdbcType = jdbcType;
+	}
+
+	public SQLTypeMapping(int sqlType, int length, int precision, int scale, Boolean nullable) {
+		this.jdbcType = sqlType;
+		this.length = length;
+		this.precision = precision;
+		this.scale = scale;
+		this.nullable = nullable;
+	}
+
+	public void setLength(int length) {
+		this.length = length;
+	}
+
+	public void setHibernateType(String hibernateType) {
+		this.hibernateType = hibernateType;
+	}
+
+	public void setNullable(Boolean nullable) {
+		this.nullable = nullable;
+	}
+
+	public Boolean getNullable() {
+		return nullable;
+	}
+
+	public int getJDBCType() {
+		return jdbcType;
+	}
+
+	public String getHibernateType() {
+		return hibernateType;
+	}
+
+	public int getLength() {
+		return length;
+	}
+
+	public String toString() {
+		return getJDBCType() + " l:" + getLength() + " p:" + getPrecision() + " s:" + getScale() + " n:" + getNullable() + " ht:" + getHibernateType();
+	}
+
+	public int getPrecision() {
+		return precision;
+	}
+
+	public void setPrecision(int precision) {
+		this.precision = precision;
+	}
+
+	public int getScale() {
+		return scale;
+	}
+
+	public void setScale(int scale) {
+		this.scale = scale;
+	}
+
+	public boolean match(int matchjdbctype, int matchlength, int matchprecision, int matchscale, boolean matchnullable) {
+		if(matchjdbctype==this.jdbcType) {// this always need to be exact
+			if(matchlength==this.length || this.length == UNKNOWN_LENGTH) {
+				if(matchprecision==this.precision || this.precision == UNKNOWN_PRECISION) {
+					if(matchscale==this.scale || this.scale == UNKNOWN_SCALE ) {
+						return this.nullable == null || nullable.equals( matchnullable );
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	public int compareTo(SQLTypeMapping other) {
+		if(this.jdbcType==other.jdbcType) {
+			if(this.length==other.length) {
+				if(this.precision==other.precision) {
+					if(this.scale==other.scale) {
+						return compare(this.nullable, other.nullable);
+					}
+					else {
+						return compare(this.scale, other.scale);
+					}
+				}
+				else {
+					return compare(this.precision,other.precision);
+				}
+			}
+			else {
+				return compare(this.length,other.length);
+			}
+		}
+		else {
+			return compare(this.jdbcType,other.jdbcType);
+		}
+	}
+
+	private int compare(int value, int other) {
+		return Integer.compare( value, other );
+	}
+
+	// complete ordering of the tri-state: false, true, null (UNKNOWN_NULLABLE)
+	private int compare(Boolean value, Boolean other) {
+		if(Objects.equals(value, other)) return 0;
+		if(value == null) return 1;
+		if(other == null) return -1;
+		if(value.equals(Boolean.TRUE)) {
+			return 1;
+		}
+		else {
+			return -1;
+		}
+	}
+
+	public boolean equals(Object obj) {
+		if (getClass().isAssignableFrom(obj.getClass())) {
+			SQLTypeMapping other = getClass().cast(obj);
+			return compareTo(other)==0;
+		}
+		else {
+			return false;
+		}
+	}
+
+	public int hashCode() {
+		return (jdbcType + length + precision + scale + (nullable == null ? 1 : nullable.hashCode())) % 17;
+	}
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/TableFilter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/TableFilter.java
new file mode 100644
index 000000000000..ae3b2b2c01d0
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/TableFilter.java
@@ -0,0 +1,163 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.apache.commons.collections4.MultiValuedMap;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.strategy.MetaAttributeHelper.SimpleMetaAttribute;
+
+
+/**
+ *
+ * A tablefilter that can tell if a TableIdentifier is included or excluded.
+ * Note that all matching is case sensitive since many db's are.
+ *
+ * @author max
+ *
+ */
+public class TableFilter {
+
+	// TODO: very basic substring matching. Possibly include regex functionallity ? (jdk 1.4 dep)
+	public static class Matcher {
+
+		private static final int EQUALS = 1;
+		private static final int ENDSWITH = 2;
+		private static final int STARTSWITH = 3;
+		private static final int SUBSTRING = 4;
+		private static final int ANY = 5;
+
+		final int mode;
+		final String value;
+		final String matchValue;
+
+		Matcher(String match) {
+			matchValue = match;
+			if(".*".equals(match) ) {
+				mode = ANY;
+				value = null;
+			}
+			else if(match.length()>4 && match.startsWith(".*") && match.endsWith(".*") ) {
+				mode = SUBSTRING;
+				value = match.substring(2, match.length()-2);
+			}
+			else if(match.endsWith(".*") ) {
+				mode = STARTSWITH;
+				value = match.substring(0, match.length()-2);
+			}
+			else if (match.startsWith(".*") ){
+				mode = ENDSWITH;
+				value = match.substring(2);
+			}
+			else {
+				mode = EQUALS;
+				value = match;
+			}
+		}
+
+		boolean match(String matchEnum) {
+			switch (mode) {
+			case ANY: return true;
+			case EQUALS: return this.value.equals(matchEnum);
+			case ENDSWITH: return matchEnum.endsWith(this.value);
+			case STARTSWITH: return matchEnum.startsWith(this.value);
+			case SUBSTRING: return matchEnum.indexOf(this.value)>=0;
+			default:
+				throw new IllegalStateException();
+			}
+		}
+
+		public String toString() {
+			return matchValue;
+		}
+	}
+
+	private Boolean exclude;
+	private String packageName;
+
+	private Matcher catalogMatcher;
+	private Matcher schemaMatcher;
+	private Matcher nameMatcher;
+	private MultiValuedMap<String, SimpleMetaAttribute> metaAttributes;
+
+
+
+	public TableFilter() {
+		setMatchCatalog(".*");
+		setMatchSchema(".*");
+		setMatchName(".*");
+		setExclude(null);
+	}
+
+	public void setMatchCatalog(String matchCatalog) {
+		this.catalogMatcher = new Matcher(matchCatalog);
+	}
+
+	public void setMatchSchema(String matchSchema) {
+		this.schemaMatcher = new Matcher(matchSchema);
+	}
+
+	public void setMatchName(String matchName) {
+		this.nameMatcher = new Matcher(matchName);
+	}
+
+	/**
+	 *
+	 * @return null if filter does not affect this identifier, true/false if it does.
+	 */
+	public Boolean exclude(TableIdentifier identifier) {
+		return isRelevantFor(identifier) ? exclude : null;
+	}
+
+	public void setExclude(Boolean bool) {
+		exclude = bool;
+	}
+
+	public String getPackage(TableIdentifier identifier) {
+		return isRelevantFor(identifier) ? packageName : null;
+	}
+
+	private boolean isRelevantFor(TableIdentifier identifier) {
+		if(catalogMatcher.match(identifier.getCatalog() ) ) {
+			if(schemaMatcher.match(identifier.getSchema() ) ) {
+				if(nameMatcher.match(identifier.getName() ) ) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public void setPackage(String string) {
+		packageName = string;
+	}
+
+	public String toString() {
+		return catalogMatcher + " " + schemaMatcher + " " + nameMatcher + " " + exclude;
+	}
+
+	public String getMatchCatalog() {
+		return catalogMatcher.matchValue;
+	}
+
+	public String getMatchSchema() {
+		return schemaMatcher.matchValue;
+	}
+
+	public String getMatchName() {
+		return nameMatcher.matchValue;
+	}
+
+	public Boolean getExclude() {
+		return exclude;
+	}
+
+	public MultiValuedMap<String, SimpleMetaAttribute> getMetaAttributes(TableIdentifier identifier) {
+		return isRelevantFor(identifier) ? metaAttributes : null;
+	}
+
+	public void setMetaAttributes(MultiValuedMap<String, SimpleMetaAttribute> metaAttributes) {
+		this.metaAttributes = metaAttributes;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/TableSelectorStrategy.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/TableSelectorStrategy.java
new file mode 100644
index 000000000000..ad1c508db653
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/strategy/TableSelectorStrategy.java
@@ -0,0 +1,32 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TableSelectorStrategy extends DelegatingStrategy {
+
+	List<SchemaSelection> selections = new ArrayList<SchemaSelection>();
+
+	public TableSelectorStrategy(RevengStrategy res) {
+		super(res);
+	}
+
+	public List<SchemaSelection> getSchemaSelections() {
+		return selections;
+	}
+
+
+	public void clearSchemaSelections() {
+		selections.clear();
+	}
+
+	public void addSchemaSelection(SchemaSelection selection) {
+		selections.add(selection);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/EnhancedBasicValue.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/EnhancedBasicValue.java
new file mode 100644
index 000000000000..3055a4a191b6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/EnhancedBasicValue.java
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.util;
+
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.mapping.BasicValue;
+import org.hibernate.mapping.Table;
+
+import java.util.Properties;
+
+@SuppressWarnings("serial")
+public class EnhancedBasicValue extends BasicValue implements EnhancedValue {
+
+	private Properties idGenProps = new Properties();
+	private String genStrategy = null;
+
+	public EnhancedBasicValue(MetadataBuildingContext buildingContext, Table table) {
+		super(buildingContext, table);
+	}
+
+	@Override
+	public void setIdentifierGeneratorProperties(Properties props) {
+		idGenProps = props;
+
+	}
+
+	@Override
+	public Properties getIdentifierGeneratorProperties() {
+		return idGenProps;
+	}
+
+	@Override
+	public void setIdentifierGeneratorStrategy(String s) {
+		genStrategy = s;
+	}
+
+	@Override
+	public String getIdentifierGeneratorStrategy() {
+		return genStrategy;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/EnhancedComponent.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/EnhancedComponent.java
new file mode 100644
index 000000000000..b594944e1461
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/EnhancedComponent.java
@@ -0,0 +1,52 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.util;
+
+import org.hibernate.MappingException;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.PersistentClass;
+
+import java.util.Properties;
+
+@SuppressWarnings("serial")
+public class EnhancedComponent extends Component implements EnhancedValue {
+
+	private Properties idGenProps = new Properties();
+	private String genStrategy = null;
+
+	public EnhancedComponent(MetadataBuildingContext metadata, PersistentClass owner) throws MappingException {
+		super(metadata, owner);
+	}
+
+	@Override
+	public void setIdentifierGeneratorProperties(Properties props) {
+		idGenProps = props;
+
+	}
+
+	@Override
+	public Properties getIdentifierGeneratorProperties() {
+		return idGenProps;
+	}
+
+	@Override
+	public void setIdentifierGeneratorStrategy(String s) {
+		genStrategy = s;
+	}
+
+	@Override
+	public String getIdentifierGeneratorStrategy() {
+		return genStrategy;
+	}
+
+	@Override
+	public Class<?> getComponentClass() throws MappingException {
+		// we prevent ORM from trying to load a component class by name,
+		// since at the point when we are building these, a corresponding class is not yet created
+		// (so can't even think about it being compiled and able to load via any classloader) ...
+		return Object.class;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/EnhancedValue.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/EnhancedValue.java
new file mode 100644
index 000000000000..b85507eef378
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/EnhancedValue.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.util;
+
+import org.hibernate.mapping.KeyValue;
+
+import java.util.Properties;
+
+public interface EnhancedValue extends KeyValue {
+
+	void setIdentifierGeneratorProperties(Properties suggestedProperties);
+
+	Properties getIdentifierGeneratorProperties();
+
+	void setIdentifierGeneratorStrategy(String s);
+
+	String getIdentifierGeneratorStrategy();
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/RevengUtils.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/RevengUtils.java
new file mode 100644
index 000000000000..ad5e0a89cd3b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/core/util/RevengUtils.java
@@ -0,0 +1,99 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.util;
+
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.core.AssociationInfo;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+
+import java.util.List;
+
+public class RevengUtils {
+
+	public static List<String> getPrimaryKeyInfoInRevengStrategy(
+			RevengStrategy revengStrat,
+			Table table,
+			String defaultCatalog,
+			String defaultSchema) {
+		List<String> result = null;
+		TableIdentifier tableIdentifier = TableIdentifier.create(table);
+		result = revengStrat.getPrimaryKeyColumnNames(tableIdentifier);
+		if (result == null) {
+			String catalog = getCatalogForModel(table.getCatalog(), defaultCatalog);
+			String schema = getSchemaForModel(table.getSchema(), defaultSchema);
+			tableIdentifier = TableIdentifier.create(catalog, schema, table.getName());
+			result = revengStrat.getPrimaryKeyColumnNames(tableIdentifier);
+		}
+		return result;
+	}
+
+	public static String getTableIdentifierStrategyNameInRevengStrategy(
+			RevengStrategy revengStrat,
+			TableIdentifier tableIdentifier,
+			String defaultCatalog,
+			String defaultSchema) {
+		String result = null;
+		result = revengStrat.getTableIdentifierStrategyName(tableIdentifier);
+		if (result == null) {
+			String catalog = getCatalogForModel(tableIdentifier.getCatalog(), defaultCatalog);
+			String schema = getSchemaForModel(tableIdentifier.getSchema(), defaultSchema);
+			tableIdentifier = TableIdentifier.create(catalog, schema, tableIdentifier.getName());
+			result = revengStrat.getTableIdentifierStrategyName(tableIdentifier);
+		}
+		return result;
+	}
+
+	public static TableIdentifier createTableIdentifier(
+			Table table,
+			String defaultCatalog,
+			String defaultSchema) {
+		String tableName = table.getName();
+		String tableCatalog = getCatalogForModel(table.getCatalog(), defaultCatalog);
+		String tableSchema = getSchemaForModel(table.getSchema(), defaultSchema);
+		return TableIdentifier.create(tableCatalog, tableSchema, tableName);
+	}
+
+	public static AssociationInfo createAssociationInfo(
+			String cascade,
+			String fetch,
+			Boolean insert,
+			Boolean update) {
+		return new AssociationInfo() {
+			@Override
+			public String getCascade() {
+				return cascade;
+			}
+			@Override
+			public String getFetch() {
+				return fetch;
+			}
+			@Override
+			public Boolean getUpdate() {
+				return update;
+			}
+			@Override
+			public Boolean getInsert() {
+				return insert;
+			}
+
+		};
+	}
+
+	/** If catalog is equal to defaultCatalog then we return null so it will be null in the generated code. */
+	private static String getCatalogForModel(String catalog, String defaultCatalog) {
+		if(catalog==null) return null;
+		if(catalog.equals(defaultCatalog)) return null;
+		return catalog;
+	}
+
+	/** If catalog is equal to defaultSchema then we return null so it will be null in the generated code. */
+	private static String getSchemaForModel(String schema, String defaultSchema) {
+		if(schema==null) return null;
+		if(schema.equals(defaultSchema)) return null;
+		return schema;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/cfg/CfgExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/cfg/CfgExporter.java
new file mode 100644
index 000000000000..4b633fdc4f27
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/cfg/CfgExporter.java
@@ -0,0 +1,174 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.cfg;
+
+import org.hibernate.cfg.Environment;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Subclass;
+import org.hibernate.tool.reveng.internal.export.common.AbstractExporter;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeMap;
+
+/**
+ * @author max
+ *
+ */
+public class CfgExporter extends AbstractExporter {
+
+	private Writer output;
+	private Properties customProperties = new Properties();
+
+	public Properties getCustomProperties() {
+		return customProperties;
+	}
+
+	public void setCustomProperties(Properties customProperties) {
+		this.customProperties = customProperties;
+	}
+
+	public Writer getOutput() {
+		return output;
+	}
+
+	public void setOutput(Writer output) {
+		this.output = output;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.hibernate.tool.hbm2x.Exporter#finish()
+	 */
+	public void doStart() {
+		PrintWriter pw = null;
+		File file;
+		try  {
+		if(output==null) {
+			file = new File(getOutputDirectory(), "hibernate.cfg.xml");
+			getTemplateHelper().ensureExistence(file);
+			pw = new PrintWriter(new FileWriter(file) );
+			getArtifactCollector().addFile(file, "cfg.xml");
+		}
+		else {
+			pw = new PrintWriter(output);
+		}
+
+
+		pw.println( """
+				<?xml version="1.0" encoding="UTF-8"?>
+				<!DOCTYPE hibernate-configuration PUBLIC\r
+						"-//Hibernate/Hibernate Configuration DTD 3.0//EN"\r
+						"https://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">\r
+				<hibernate-configuration>""" );
+
+		boolean ejb3 = Boolean.parseBoolean( (String) getProperties().get( "ejb3" ) );
+
+		Map<Object, Object> props = new TreeMap<>();
+		if (getProperties() != null) {
+				props.putAll(getProperties());
+		}
+		if(customProperties!=null) {
+			props.putAll(customProperties);
+		}
+
+		String sfname = (String) props.get(Environment.SESSION_FACTORY_NAME);
+		pw.println("    <session-factory" + (sfname==null?"":" name=\"" + sfname + "\"") + ">");
+
+		Map<Object, Object> ignoredProperties = new HashMap<>();
+		ignoredProperties.put(Environment.SESSION_FACTORY_NAME, null);
+		ignoredProperties.put(Environment.HBM2DDL_AUTO, "false" );
+		ignoredProperties.put("hibernate.temp.use_jdbc_metadata_defaults", null );
+		ignoredProperties.put(Environment.TRANSACTION_COORDINATOR_STRATEGY, "org.hibernate.console.FakeTransactionManagerLookup");
+
+		Set<Entry<Object, Object>> set = props.entrySet();
+			for ( Entry<Object, Object> element : set ) {
+				String key = (String) element.getKey();
+				if ( ignoredProperties.containsKey( key ) ) {
+					Object ignoredValue = ignoredProperties.get( key );
+					if ( ignoredValue == null || element.getValue().equals( ignoredValue ) ) {
+						continue;
+					}
+				}
+				if ( key.startsWith( "hibernate." ) ) { // if not starting with hibernate. not relevant for cfg.xml
+					pw.println( "        <property name=\"" + key + "\">" + forXML(
+							element.getValue().toString() ) + "</property>" );
+				}
+			}
+
+		if(getMetadata()!=null) {
+			for ( PersistentClass element : getMetadata().getEntityBindings() ) {
+				if ( element instanceof RootClass ) {
+					dump( pw, ejb3, element );
+				}
+			}
+		}
+		pw.println("    </session-factory>\r\n" +
+				"</hibernate-configuration>");
+
+		}
+
+		catch (IOException e) {
+			throw new RuntimeException("Problems while creating hibernate.cfg.xml", e);
+		}
+		finally {
+			if(pw!=null) {
+				pw.flush();
+				pw.close();
+			}
+		}
+
+	}
+
+	private void dump(PrintWriter pw, boolean useClass, PersistentClass element) {
+		if(useClass) {
+			pw.println("<mapping class=\"" + element.getClassName() + "\"/>");
+		}
+		else {
+			pw.println("<mapping resource=\"" + getMappingFileResource(element) + "\"/>");
+		}
+
+		for ( Subclass value : element.getDirectSubclasses() ) {
+			dump( pw, useClass, value );
+		}
+
+	}
+
+	private String getMappingFileResource(PersistentClass element) {
+
+		return element.getClassName().replace('.', '/') + ".hbm.xml";
+	}
+
+	public String getName() {
+		return "cfg2cfgxml";
+	}
+
+	public static String forXML(String text) {
+		if (text == null) return null;
+		final StringBuilder result = new StringBuilder();
+		char[] chars = text.toCharArray();
+		for ( char character : chars ) {
+			if ( character == '<' ) {
+				result.append( "&lt;" );
+			}
+			else if ( character == '>' ) {
+				result.append( "&gt;" );
+			}
+			else {
+				result.append( character );
+			}
+		}
+		return result.toString();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/AbstractExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/AbstractExporter.java
new file mode 100644
index 000000000000..8569c0091f42
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/AbstractExporter.java
@@ -0,0 +1,230 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.internal.util.ReflectHelper;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.tool.reveng.api.export.ArtifactCollector;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.internal.export.hbm.Cfg2HbmTool;
+import org.hibernate.tool.reveng.internal.export.java.Cfg2JavaTool;
+import org.jboss.logging.Logger;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+/**
+ * Base exporter for the template and direct output generation.
+ * Sets up the template environment
+ *
+ * @author max and david
+ * @author koen
+ */
+public abstract class AbstractExporter implements Exporter, ExporterConstants {
+
+	protected Logger log = Logger.getLogger(this.getClass());
+
+	private TemplateHelper vh;
+	private final Properties properties = new Properties();
+	private Metadata metadata = null;
+
+	private Iterator<Entry<Object, Object>> iterator;
+
+	private final Cfg2HbmTool c2h;
+	private final Cfg2JavaTool c2j;
+
+	public AbstractExporter() {
+		c2h = new Cfg2HbmTool();
+		c2j = new Cfg2JavaTool();
+		properties.put(ARTIFACT_COLLECTOR, new DefaultArtifactCollector());
+		properties.put(TEMPLATE_PATH, new String[0]);
+	}
+
+	protected MetadataDescriptor getMetadataDescriptor() {
+		return (MetadataDescriptor)getProperties().get(METADATA_DESCRIPTOR);
+	}
+
+	public Metadata getMetadata() {
+		if (metadata == null) {
+			metadata = buildMetadata();
+		}
+		return metadata;
+	}
+
+	protected File getOutputDirectory() {
+		return (File)getProperties().get(DESTINATION_FOLDER);
+	}
+
+	public Properties getProperties() {
+		return properties;
+	}
+
+	public ArtifactCollector getArtifactCollector() {
+		return (ArtifactCollector)getProperties().get(ARTIFACT_COLLECTOR);
+	}
+
+	public String getName() {
+		return this.getClass().getName();
+	}
+
+	public Cfg2HbmTool getCfg2HbmTool() {
+		return c2h;
+	}
+
+	public Cfg2JavaTool getCfg2JavaTool() {
+		return c2j;
+	}
+
+	public void start() {
+		setTemplateHelper( new TemplateHelper() );
+		setupTemplates();
+		setupContext();
+		doStart();
+		cleanUpContext();
+		setTemplateHelper(null);
+		getArtifactCollector().formatFiles();
+	}
+
+	abstract protected void doStart();
+
+	protected void cleanUpContext() {
+		if(getProperties()!=null) {
+			iterator = getProperties().entrySet().iterator();
+			while ( iterator.hasNext() ) {
+				Entry<Object, Object> element = iterator.next();
+				String key = element.getKey().toString();
+				if(key.startsWith(ExporterSettings.PREFIX_KEY)) {
+					getTemplateHelper().removeFromContext(key.substring(ExporterSettings.PREFIX_KEY.length()));
+				}
+				getTemplateHelper().removeFromContext(key);
+			}
+		}
+		if(getOutputDirectory()!=null) {
+			getTemplateHelper().removeFromContext("outputdir");
+		}
+		String[] templatePath = (String[])getProperties().get(TEMPLATE_PATH);
+		if(templatePath!=null) {
+			getTemplateHelper().removeFromContext("template_path");
+		}
+		getTemplateHelper().removeFromContext("exporter");
+		getTemplateHelper().removeFromContext("artifacts");
+		if(getMetadata() != null) {
+			getTemplateHelper().removeFromContext("md");
+			getTemplateHelper().removeFromContext("props");
+			getTemplateHelper().removeFromContext("tables");
+		}
+		getTemplateHelper().removeFromContext("c2h");
+		getTemplateHelper().removeFromContext("c2j");
+	}
+
+	protected void setupContext() {
+		getTemplateHelper().setupContext();
+		getTemplateHelper().putInContext("exporter", this);
+		getTemplateHelper().putInContext("c2h", getCfg2HbmTool());
+		getTemplateHelper().putInContext("c2j", getCfg2JavaTool());
+		if(getOutputDirectory()!=null) {
+			getTemplateHelper().putInContext("outputdir", getOutputDirectory());
+		}
+		String[] templatePath = (String[])getProperties().get(TEMPLATE_PATH);
+		if(templatePath!=null) {
+			getTemplateHelper().putInContext("template_path", templatePath);
+		}
+		if(getProperties()!=null) {
+			iterator = getProperties().entrySet().iterator();
+			while ( iterator.hasNext() ) {
+				Entry<Object, Object> element = iterator.next();
+				String key = element.getKey().toString();
+				Object value = transformValue(element.getValue());
+				getTemplateHelper().putInContext(key, value);
+				if(key.startsWith(ExporterSettings.PREFIX_KEY)) {
+					getTemplateHelper().putInContext(key.substring(ExporterSettings.PREFIX_KEY.length()), value);
+					if(key.endsWith(".toolclass")) {
+						try {
+							Class<?> toolClass = ReflectHelper.classForName(value.toString(), this.getClass());
+							Constructor<?> toolClassConstructor = toolClass.getConstructor(new Class[] {});
+							Object object = toolClassConstructor.newInstance();
+							getTemplateHelper().putInContext(key.substring(ExporterSettings.PREFIX_KEY.length(),key.length()-".toolclass".length()), object);
+						}
+						catch (Exception e) {
+							throw new RuntimeException("Exception when instantiating tool " + element.getKey() + " with " + value,e);
+						}
+					}
+				}
+			}
+		}
+		getTemplateHelper().putInContext("artifacts", getArtifactCollector());
+		if(getMetadata() != null) {
+			getTemplateHelper().putInContext("md", metadata);
+			getTemplateHelper().putInContext("props", getProperties());
+			getTemplateHelper().putInContext("tables", metadata.collectTableMappings());
+		}
+	}
+
+	protected void setupTemplates() {
+		String[] templatePath = (String[])getProperties().get(TEMPLATE_PATH);
+		if(log.isDebugEnabled()) {
+			log.debug(getClass().getName() + " outputdir:" + getOutputDirectory() + " path: " + toString(templatePath) );
+		}
+		getTemplateHelper().init(getOutputDirectory(), templatePath);
+	}
+
+	protected void setTemplateHelper(TemplateHelper vh) {
+		this.vh = vh;
+	}
+
+	protected TemplateHelper getTemplateHelper() {
+		return vh;
+	}
+
+	protected File getFileForClassName(File baseDir, String className, String extension) {
+		String filename = StringHelper.unqualify(className) + extension;
+		String packagename = StringHelper.qualifier(className);
+		return new File(getDirForPackage(baseDir, packagename), filename);
+	}
+
+	protected Metadata buildMetadata() {
+		return getMetadataDescriptor().createMetadata();
+	}
+
+	private File getDirForPackage(File baseDir, String packageName) {
+		String p = packageName == null ? "" : packageName;
+		return new File( baseDir, p.replace('.', File.separatorChar) );
+	}
+
+	private String toString(Object[] a) {
+		if (a == null)
+			return "null";
+		if (a.length == 0)
+			return "[]";
+		StringBuilder buf = new StringBuilder();
+		for (int i = 0; i < a.length; i++) {
+			if (i == 0)
+				buf.append('[');
+			else
+				buf.append(", ");
+
+			buf.append(String.valueOf(a[i]));
+		}
+		buf.append("]");
+		return buf.toString();
+	}
+
+	private Object transformValue(Object value) {
+		if("true".equals(value)) {
+			return Boolean.TRUE;
+		}
+		if("false".equals(value)) {
+			return Boolean.FALSE;
+		}
+		return value;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ConfigurationNavigator.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ConfigurationNavigator.java
new file mode 100644
index 000000000000..51691ef68799
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ConfigurationNavigator.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.tool.reveng.internal.export.java.Cfg2JavaTool;
+import org.hibernate.tool.reveng.internal.export.java.ComponentPOJOClass;
+import org.hibernate.tool.reveng.internal.export.java.POJOClass;
+import org.jboss.logging.Logger;
+
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * @author max and david
+ */
+public class ConfigurationNavigator {
+
+	private static final Logger log = Logger.getLogger(ConfigurationNavigator.class);
+
+	public static void collectComponents(Map<String, Component> components, PersistentClass clazz) {
+		Iterator<Property> iter = new Cfg2JavaTool().getPOJOClass(clazz).getAllPropertiesIterator();
+		collectComponents( components, iter );
+	}
+
+	public static void collectComponents(Map<String, Component> components, POJOClass clazz) {
+		Iterator<Property> iter = clazz.getAllPropertiesIterator();
+		collectComponents( components, iter );
+	}
+
+	private static void collectComponents(Map<String, Component> components, Iterator<Property> iter) {
+		while(iter.hasNext()) {
+			Property property = iter.next();
+			if (!"embedded".equals(property.getPropertyAccessorName()) && // HBX-267, embedded property for <properties> should not be generated as component.
+				property.getValue() instanceof Component comp ) {
+				addComponent( components, comp );
+			}
+			else if ( property.getValue() instanceof Collection collection ) {
+				// compisite-element in collection
+				if ( collection.getElement() instanceof Component comp ) {
+					addComponent(components, comp);
+				}
+			}
+		}
+	}
+
+	private static void addComponent(Map<String, Component> components, Component comp) {
+		if(!comp.isDynamic()) {
+			Component existing = components.put(
+					comp.getComponentClassName(),
+					comp);
+			if(existing!=null) {
+				log.warn("Component " + existing.getComponentClassName() + " found more than once! Will only generate the last found.");
+			}
+		}
+		else {
+			log.debug("dynamic-component found. Ignoring it as a component, but will collect any embedded components.");
+		}
+		collectComponents(
+				components,
+				new ComponentPOJOClass(comp, new Cfg2JavaTool()).getAllPropertiesIterator());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/DefaultArtifactCollector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/DefaultArtifactCollector.java
new file mode 100644
index 000000000000..46d9bd4bfba3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/DefaultArtifactCollector.java
@@ -0,0 +1,97 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import org.hibernate.tool.reveng.api.export.ArtifactCollector;
+import org.hibernate.tool.reveng.api.xml.XMLPrettyPrinter;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Callback class that all exporters are given to allow better feedback and
+ * processing of the output afterwards.
+ *
+ * @author Max Rydahl Andersen
+ *
+ */
+public class DefaultArtifactCollector implements ArtifactCollector {
+
+	final protected Map<String, List<File>> files = new HashMap<>();
+
+	/* (non-Javadoc)
+	 * @see org.hibernate.tool.internal.export.ArtifactCollector#addFile(java.io.File, java.lang.String)
+	 */
+	@Override
+	public void addFile(File file, String type) {
+		List<File> existing = files.computeIfAbsent( type, k -> new ArrayList<>() );
+		existing.add(file);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.hibernate.tool.internal.export.ArtifactCollector#getFileCount(java.lang.String)
+	 */
+	@Override
+	public int getFileCount(String type) {
+		List<File> existing = files.get(type);
+
+		return (existing == null) ? 0 : existing.size();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.hibernate.tool.internal.export.ArtifactCollector#getFiles(java.lang.String)
+	 */
+	@Override
+	public File[] getFiles(String type) {
+		List<File> existing = files.get(type);
+
+		if (existing == null) {
+			return new File[0];
+		}
+		else {
+			return existing.toArray( new File[0] );
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.hibernate.tool.internal.export.ArtifactCollector#getFileTypes()
+	 */
+	@Override
+	public Set<String> getFileTypes() {
+		return files.keySet();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.hibernate.tool.internal.export.ArtifactCollector#formatFiles()
+	 */
+	@Override
+	public void formatFiles() {
+
+		formatXml("xml");
+		formatXml("hbm.xml");
+		formatXml("cfg.xml");
+
+	}
+
+	private void formatXml(String type) {
+		List<File> list = files.get(type);
+		if (list != null && !list.isEmpty()) {
+			for ( File xmlFile : list ) {
+				try {
+					XMLPrettyPrinter.prettyPrintFile( xmlFile );
+				}
+				catch (IOException e) {
+					throw new RuntimeException( "Could not format XML file: " + xmlFile, e );
+				}
+			}
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/DefaultValueVisitor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/DefaultValueVisitor.java
new file mode 100644
index 000000000000..f927dc636b43
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/DefaultValueVisitor.java
@@ -0,0 +1,128 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import org.hibernate.mapping.Any;
+import org.hibernate.mapping.Array;
+import org.hibernate.mapping.Bag;
+import org.hibernate.mapping.BasicValue;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.DependantValue;
+import org.hibernate.mapping.IdentifierBag;
+import org.hibernate.mapping.List;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.Map;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PrimitiveArray;
+import org.hibernate.mapping.Set;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.Value;
+import org.hibernate.mapping.ValueVisitor;
+
+/**
+ * Default ValueVisitor which throws UnsupportedOperationException on all accepts.
+ * Can be changed by passing true to the constructor.
+ *
+ * @author max
+ *
+ */
+public class DefaultValueVisitor implements ValueVisitor {
+
+	boolean throwException = true;
+
+	/**
+	 *
+	 * @param throwException if true exception will be thrown, otherwise return null in accept calls.
+	 */
+	protected DefaultValueVisitor(boolean throwException) {
+		this.throwException = throwException;
+	}
+
+	protected Object handle(Value o) {
+		if (throwException) {
+
+			throw new UnsupportedOperationException("accept on " + o);
+		}
+		else { return null; }
+	}
+
+	public Object accept(Bag o){
+
+		return handle(o);
+	}
+
+	public Object accept(IdentifierBag o){
+
+		return handle(o);
+	}
+
+	public Object accept(List o){
+
+		return handle(o);
+	}
+
+	public Object accept(PrimitiveArray o){
+
+		return handle(o);
+	}
+
+	public Object accept(Array o){
+
+		return handle(o);
+	}
+
+	public Object accept(Map o){
+
+		return handle(o);
+	}
+
+	public Object accept(OneToMany o){
+
+		return handle(o);
+	}
+
+	public Object accept(Set o){
+
+		return handle(o);
+	}
+
+	public Object accept(Any o){
+
+		return handle(o);
+	}
+
+	public Object accept(SimpleValue o){
+
+		return handle(o);
+	}
+
+	public Object accept(BasicValue o) {
+
+		return handle(o);
+
+	}
+
+	public Object accept(DependantValue o){
+
+		return handle(o);
+	}
+
+	public Object accept(Component o){
+
+		return handle(o);
+	}
+
+	public Object accept(ManyToOne o){
+
+		return handle(o);
+	}
+
+	public Object accept(OneToOne o){
+
+		return handle(o);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/EntityNameFromValueVisitor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/EntityNameFromValueVisitor.java
new file mode 100644
index 000000000000..f39757062a9f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/EntityNameFromValueVisitor.java
@@ -0,0 +1,90 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import org.hibernate.mapping.Array;
+import org.hibernate.mapping.Bag;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.IdentifierBag;
+import org.hibernate.mapping.List;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.Map;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PrimitiveArray;
+import org.hibernate.mapping.Set;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.ToOne;
+
+public class EntityNameFromValueVisitor extends DefaultValueVisitor {
+
+	public EntityNameFromValueVisitor() {
+		super( true );
+	}
+
+	public EntityNameFromValueVisitor(boolean b) {
+		super(b);
+	}
+
+	public Object accept(OneToOne o) {
+		return acceptToOne(o);
+	}
+
+	public Object accept(ManyToOne o) {
+		return acceptToOne(o);
+	}
+
+	private Object acceptToOne(ToOne value) {
+		return value.getReferencedEntityName(); // should get the cfg and lookup the persistenclass.
+	}
+
+	public Object accept(OneToMany value) {
+		return value.getAssociatedClass().getEntityName();
+	}
+
+	public Object acceptCollection(Collection c) {
+		return c.getElement().accept( this );
+	}
+
+	public Object accept(Bag o) {
+		return acceptCollection( o );
+	}
+
+	public Object accept(List o) {
+		return acceptCollection( o );
+	}
+
+	public Object accept(IdentifierBag o) {
+		return acceptCollection( o );
+	}
+
+	public Object accept(Set o) {
+		return acceptCollection( o );
+	}
+
+	public Object accept(Map o) {
+		return acceptCollection( o );
+	}
+
+	public Object accept(Array o) {
+		return acceptCollection( o );
+	}
+
+	public Object accept(PrimitiveArray o) {
+		return acceptCollection( o );
+	}
+
+	public Object accept(SimpleValue o) {
+		return null; // TODO: return o.getTypeName() ? (it is not an association)
+	}
+
+	public Object accept(Component component) {
+		if(component.isDynamic()) {
+			return null; //"java.util.Map"; (not an association)
+		}
+		return component.getComponentClassName();
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ExporterSettings.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ExporterSettings.java
new file mode 100644
index 000000000000..4ac7e4bf0177
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/ExporterSettings.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+public interface ExporterSettings {
+
+	public final String PREFIX_KEY = "hibernatetool.";
+
+	/**
+	 * if true exporters are allowed to generate EJB3 constructs
+	 */
+	public final String EJB3 = PREFIX_KEY + "ejb3";
+
+	/**
+	 * if true then exporters are allowed to generate JDK 5 constructs
+	 */
+	public final String JDK5 = PREFIX_KEY + "jdk5";
+
+	/**
+	 * the (root) output directory for an exporter
+	 */
+	public final String OUTPUT_DIRECTORY = PREFIX_KEY + "output_directory";
+
+	/**
+	 * the (root) output directory for an exporter
+	 */
+	public final String TEMPLATE_PATH = PREFIX_KEY + "template_path";
+
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/GenericExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/GenericExporter.java
new file mode 100644
index 000000000000..a291f35b99fe
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/GenericExporter.java
@@ -0,0 +1,172 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Component;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.internal.export.java.ComponentPOJOClass;
+import org.hibernate.tool.reveng.internal.export.java.POJOClass;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+
+public class GenericExporter extends AbstractExporter {
+
+	static abstract class ModelIterator {
+		abstract void process(GenericExporter ge);
+	}
+
+	static Map<String, ModelIterator> modelIterators = new HashMap<>();
+	static {
+		modelIterators.put( "configuration", new ModelIterator() {
+			void process(GenericExporter ge) {
+				TemplateProducer producer =
+						new TemplateProducer(
+								ge.getTemplateHelper(),
+								ge.getArtifactCollector());
+				producer.produce(
+						new HashMap<>(),
+						ge.getTemplateName(),
+						new File(ge.getOutputDirectory(),ge.getFilePattern()),
+						ge.getTemplateName(),
+						"Configuration");
+			}
+		});
+		modelIterators.put("entity", new ModelIterator() {
+			void process(GenericExporter ge) {
+				Iterator<?> iterator =
+						ge.getCfg2JavaTool().getPOJOIterator(
+								ge.getMetadata().getEntityBindings().iterator());
+				Map<String, Object> additionalContext = new HashMap<>();
+				while ( iterator.hasNext() ) {
+					POJOClass element = (POJOClass) iterator.next();
+					ge.exportPersistentClass( additionalContext, element );
+				}
+			}
+		});
+		modelIterators.put("component", new ModelIterator() {
+
+			void process(GenericExporter ge) {
+				Map<String, Component> components = new HashMap<>();
+
+				Iterator<?> iterator =
+						ge.getCfg2JavaTool().getPOJOIterator(
+								ge.getMetadata().getEntityBindings().iterator());
+				Map<String, Object> additionalContext = new HashMap<>();
+				while ( iterator.hasNext() ) {
+					POJOClass element = (POJOClass) iterator.next();
+					ConfigurationNavigator.collectComponents(components, element);
+				}
+
+				iterator = components.values().iterator();
+				while ( iterator.hasNext() ) {
+					Component component = (Component) iterator.next();
+					ComponentPOJOClass element = new ComponentPOJOClass(component,ge.getCfg2JavaTool());
+					ge.exportComponent( additionalContext, element );
+				}
+			}
+		});
+	}
+
+	protected String getTemplateName() {
+		return (String)getProperties().get(ExporterConstants.TEMPLATE_NAME);
+	}
+
+	protected void doStart() {
+
+		if(getFilePattern()==null) {
+			throw new RuntimeException("File pattern not set on " + this.getClass());
+		}
+		if(getTemplateName()==null) {
+			throw new RuntimeException("Template name not set on " + this.getClass());
+		}
+
+		List<ModelIterator> exporters = new ArrayList<>();
+
+		if(StringHelper.isEmpty( getForEach() )) {
+			if( getFilePattern().contains( "{class-name}" ) ) {
+				exporters.add( modelIterators.get( "entity" ) );
+				exporters.add( modelIterators.get( "component") );
+			}
+			else {
+				exporters.add( modelIterators.get( "configuration" ));
+			}
+		}
+		else {
+			StringTokenizer tokens = new StringTokenizer(getForEach(), ",");
+
+			while ( tokens.hasMoreTokens() ) {
+				String nextToken = tokens.nextToken();
+				ModelIterator modelIterator = modelIterators.get(nextToken);
+				if(modelIterator==null) {
+					throw new RuntimeException("for-each does not support [" + nextToken + "]");
+				}
+				exporters.add(modelIterator);
+			}
+		}
+
+		for ( ModelIterator mit : exporters ) {
+			mit.process( this );
+		}
+	}
+
+	protected void exportComponent(Map<String, Object> additionalContext, POJOClass element) {
+		exportPOJO(additionalContext, element);
+	}
+
+	protected void exportPersistentClass(Map<String, Object> additionalContext, POJOClass element) {
+		exportPOJO(additionalContext, element);
+	}
+
+	protected void exportPOJO(Map<String, Object> additionalContext, POJOClass element) {
+		TemplateProducer producer = new TemplateProducer(getTemplateHelper(),getArtifactCollector());
+		additionalContext.put("pojo", element);
+		additionalContext.put("clazz", element.getDecoratedObject());
+		String filename = resolveFilename( element );
+		if(filename.endsWith(".java") && filename.indexOf('$')>=0) {
+			log.warn("Filename for " + getClassNameForFile( element ) + " contains a $. Inner class generation is not supported.");
+		}
+		producer.produce(
+				additionalContext,
+				getTemplateName(),
+				new File(getOutputDirectory(),filename),
+				getTemplateName(),
+				element.toString());
+	}
+
+	protected String resolveFilename(POJOClass element) {
+		String filename = StringHelper.replace(getFilePattern(), "{class-name}", getClassNameForFile( element ));
+		String packageLocation = StringHelper.replace(getPackageNameForFile( element ),".", "/");
+		if(StringHelper.isEmpty(packageLocation)) {
+			packageLocation = "."; // done to ensure default package classes doesn't end up in the root of the filesystem when outputdir=""
+		}
+		filename = StringHelper.replace(filename, "{package-name}", packageLocation);
+		return filename;
+	}
+
+	protected String getPackageNameForFile(POJOClass element) {
+		return element.getPackageName();
+	}
+
+	protected String getClassNameForFile(POJOClass element) {
+		return element.getDeclarationName();
+	}
+
+	private String getFilePattern() {
+		return (String)getProperties().get(FILE_PATTERN);
+	}
+
+	private String getForEach() {
+		return (String)getProperties().get(FOR_EACH);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/TemplateHelper.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/TemplateHelper.java
new file mode 100644
index 000000000000..0c878fb513c5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/TemplateHelper.java
@@ -0,0 +1,231 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.Writer;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.hibernate.tool.reveng.api.version.Version;
+import org.jboss.logging.Logger;
+
+import freemarker.cache.ClassTemplateLoader;
+import freemarker.cache.FileTemplateLoader;
+import freemarker.cache.MultiTemplateLoader;
+import freemarker.cache.TemplateLoader;
+import freemarker.ext.beans.BeansWrapperBuilder;
+import freemarker.template.Configuration;
+import freemarker.template.SimpleDate;
+import freemarker.template.SimpleHash;
+import freemarker.template.Template;
+import freemarker.template.TemplateDateModel;
+import freemarker.template.TemplateModel;
+import freemarker.template.TemplateModelException;
+
+
+/**
+ *
+ * Helper and wrapper for a Template engine (currently only FreeMarker).
+ * Exposes only the essential functions to avoid too much coupling else where.
+ *
+ * @author max
+ *
+ */
+public class TemplateHelper {
+
+	static final Logger log = Logger.getLogger(TemplateHelper.class);
+
+	private File outputDirectory;
+
+	protected Configuration freeMarkerEngine;
+
+	protected SimpleHash context;
+
+	public TemplateHelper() {
+
+	}
+
+	public void init(File outputDirectory, String[] templatePaths) {
+		this.outputDirectory = outputDirectory;
+
+		context = new SimpleHash(new BeansWrapperBuilder(Configuration.VERSION_2_3_0).build());
+		freeMarkerEngine = new Configuration(Configuration.VERSION_2_3_0);
+
+		List<TemplateLoader> loaders = new ArrayList<>();
+
+		for ( String templatePath : templatePaths ) {
+			File file = new File( templatePath );
+			if ( file.exists() ) {
+				if ( file.isDirectory() ) {
+					try {
+						loaders.add( new FileTemplateLoader( file ) );
+					}
+					catch (IOException e) {
+						throw new RuntimeException( "Problems with templatepath " + file, e );
+					}
+				}
+				else if ( file.getName().endsWith( ".zip" ) || file.getName().endsWith( ".jar" ) ) {
+					final URLClassLoader classLoaderForZip;
+					try {
+						classLoaderForZip = new URLClassLoader( new URL[] {file.toURI().toURL()}, null );
+					}
+					catch (MalformedURLException e) {
+						throw new RuntimeException( "template path " + file + " is not a valid zip file", e );
+					}
+
+					loaders.add( new ClassTemplateLoader( classLoaderForZip, "/" ) );
+				}
+				else {
+					log.warn( "template path " + file + " is not a directory" );
+				}
+			}
+			else {
+				log.warn( "template path " + file + " does not exist" );
+			}
+		}
+		loaders.add(new ClassTemplateLoader(this.getClass(),"/")); // the template names are like pojo/Somewhere so have to be a rooted classpathloader
+
+		freeMarkerEngine.setTemplateLoader(new MultiTemplateLoader( loaders.toArray( new TemplateLoader[0] ) ));
+
+	}
+
+
+	public class Templates {
+
+		public void createFile(String content, String fileName) {
+			try (Writer fw = new BufferedWriter(new FileWriter(new File(getOutputDirectory(), fileName)))) {
+				fw.write(content);
+			}
+			catch(IOException io) {
+				throw new RuntimeException("Problem when writing to " + fileName, io);
+			}
+		}
+	}
+
+	public File getOutputDirectory() {
+		return outputDirectory;
+	}
+
+
+
+	public void putInContext(String key, Object value) {
+		if(value == null) throw new IllegalStateException("value must not be null for " + key);
+		Object replaced = internalPutInContext(key,value);
+		if(replaced!=null) {
+			log.warn( "Overwriting context: " + replaced + ".");
+		}
+	}
+
+	public void removeFromContext(String key) {
+		Object replaced = internalRemoveFromContext(key);
+		if(replaced==null) throw new IllegalStateException(key + " did not exist in template context.");
+	}
+
+	public void ensureExistence(File destination) {
+		// if the directory exists, make sure it is a directory
+		File dir = destination.getAbsoluteFile().getParentFile();
+		if ( dir.exists() && !dir.isDirectory() ) {
+			throw new RuntimeException("The path: " + dir.getAbsolutePath() + " exists, but is not a directory");
+		} 	// else make the directory and any non-existent parent directories
+		else if ( !dir.exists() ) {
+			if ( !dir.mkdirs() ) {
+				if(dir.getName().equals(".")) { // Workaround that Linux/JVM apparently can't handle mkdirs of File's with current dir references.
+					if(dir.getParentFile().mkdirs()) {
+						return;
+					}
+				}
+				throw new RuntimeException( "unable to create directory: " + dir.getAbsolutePath() );
+			}
+		}
+	}
+
+	protected SimpleHash getContext() {
+		return context;
+	}
+
+	public void processString(String template, Writer output) {
+
+		try {
+			Reader r = new StringReader(template);
+			Template t = new Template("unknown", r, freeMarkerEngine);
+
+			t.process(getContext(), output);
+		}
+		catch (Exception e) {
+			throw new RuntimeException("Error while processing template string", e);
+		}
+	}
+
+	public void setupContext() {
+		getContext().put("version", Version.versionString());
+		getContext().put("ctx", getContext() ); //TODO: I would like to remove this, but don't know another way to actually get the list possible "root" keys for debugging.
+		getContext().put("templates", new Templates());
+
+		getContext().put("date", new SimpleDate(new Date(), TemplateDateModel.DATETIME));
+
+	}
+
+	protected Object internalPutInContext(String key, Object value) {
+		TemplateModel model;
+		try {
+			model = getContext().get(key);
+		}
+		catch (TemplateModelException e) {
+			throw new RuntimeException("Could not get key " + key, e);
+		}
+		getContext().put(key, value);
+		return model;
+	}
+
+	protected Object internalRemoveFromContext(String key) {
+		TemplateModel model;
+		try {
+			model = getContext().get(key);
+		}
+		catch (TemplateModelException e) {
+			throw new RuntimeException("Could not get key " + key, e);
+		}
+		getContext().remove(key);
+		return model;
+	}
+
+	/** look up the template named templateName via the paths and print the content to the output */
+	public void processTemplate(String templateName, Writer output, String rootContext) {
+		if(rootContext == null) {
+			rootContext = "Unknown context";
+		}
+
+		try {
+			Template template = freeMarkerEngine.getTemplate(templateName);
+			template.process(getContext(), output);
+		}
+		catch (Exception e) {
+			throw new RuntimeException("Error while processing " + rootContext + " with template " + templateName, e);
+		}
+	}
+
+
+	public boolean templateExists(String templateName) {
+		TemplateLoader templateLoader = freeMarkerEngine.getTemplateLoader();
+
+		try {
+			return templateLoader.findTemplateSource(templateName)!=null;
+		}
+		catch (IOException e) {
+			throw new RuntimeException("templateExists for " + templateName + " failed", e);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/TemplateProducer.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/TemplateProducer.java
new file mode 100644
index 000000000000..f47b429d067c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/TemplateProducer.java
@@ -0,0 +1,93 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import org.hibernate.tool.reveng.api.export.ArtifactCollector;
+import org.jboss.logging.Logger;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Map;
+import java.util.Map.Entry;
+
+
+public class TemplateProducer {
+
+	private static final Logger log = Logger.getLogger(TemplateProducer.class);
+	private final TemplateHelper th;
+	private final ArtifactCollector ac;
+
+	public TemplateProducer(TemplateHelper th, ArtifactCollector ac) {
+		this.th = th;
+		this.ac = ac;
+	}
+
+	public void produce(Map<String,Object> additionalContext, String templateName, File destination, String identifier, String fileType, String rootContext) {
+
+		String tempResult = produceToString( additionalContext, templateName, rootContext );
+
+		if( tempResult.trim().isEmpty() ) {
+			log.warn("Generated output is empty. Skipped creation for file " + destination);
+			return;
+		}
+		try {
+			th.ensureExistence( destination );
+
+			ac.addFile(destination, fileType);
+			log.debug("Writing " + identifier + " to " + destination.getAbsolutePath() );
+			try (FileWriter fileWriter = new FileWriter(destination)) {
+				fileWriter.write(tempResult);
+			}
+		}
+		catch (Exception e) {
+			throw new RuntimeException("Error while writing result to file", e);
+		}
+
+	}
+
+
+	private String produceToString(Map<String,Object> additionalContext, String templateName, String rootContext) {
+		putInContext( th, additionalContext );
+		StringWriter tempWriter = new StringWriter();
+		BufferedWriter bw = new BufferedWriter(tempWriter);
+		// First run - writes to in-memory string
+		th.processTemplate(templateName, bw, rootContext);
+		removeFromContext( th, additionalContext );
+		try {
+			bw.flush();
+		}
+		catch (IOException e) {
+			throw new RuntimeException("Error while flushing to string",e);
+		}
+		return tempWriter.toString();
+	}
+
+	private void removeFromContext(TemplateHelper templateHelper, Map<String,Object> context) {
+		for ( Entry<String, Object> element : context.entrySet() ) {
+			templateHelper.removeFromContext( element.getKey() );
+		}
+	}
+
+	private void putInContext(TemplateHelper templateHelper, Map<String,Object> context) {
+		for ( Entry<String, Object> element : context.entrySet() ) {
+			templateHelper.putInContext( element.getKey(), element.getValue() );
+		}
+	}
+
+	public void produce(Map<String,Object> additionalContext, String templateName, File outputFile, String identifier) {
+		String fileType = outputFile.getName();
+		fileType = fileType.substring(fileType.indexOf('.')+1);
+		produce(additionalContext, templateName, outputFile, identifier, fileType, null);
+	}
+
+	public void produce(Map<String,Object> additionalContext, String templateName, File outputFile, String identifier, String rootContext) {
+		String fileType = outputFile.getName();
+		fileType = fileType.substring(fileType.indexOf('.')+1);
+		produce(additionalContext, templateName, outputFile, identifier, fileType, rootContext);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/dao/DaoExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/dao/DaoExporter.java
new file mode 100644
index 000000000000..6bb7c3251731
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/dao/DaoExporter.java
@@ -0,0 +1,51 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.dao;
+
+import org.hibernate.tool.reveng.internal.export.java.JavaExporter;
+import org.hibernate.tool.reveng.internal.export.java.POJOClass;
+
+import java.util.Map;
+
+public class DaoExporter extends JavaExporter {
+
+	private static final String DAO_DAOHOME_FTL = "dao/daohome.ftl";
+
+	private String sessionFactoryName = "SessionFactory";
+
+	public DaoExporter() {
+			super();
+	}
+
+	protected void init() {
+		super.init();
+		getProperties().put(TEMPLATE_NAME, DAO_DAOHOME_FTL);
+		getProperties().put(FILE_PATTERN, "{package-name}/{class-name}Home.java");
+	}
+
+	protected void exportComponent(Map<String, Object> additionalContext, POJOClass element) {
+		// noop - we dont want components
+	}
+
+	public String getSessionFactoryName() {
+		return sessionFactoryName;
+	}
+
+	public void setSessionFactoryName(String sessionFactoryName) {
+		this.sessionFactoryName = sessionFactoryName;
+	}
+
+	protected void setupContext() {
+		getProperties().put("sessionFactoryName", getSessionFactoryName());
+		super.setupContext();
+		getTemplateHelper().putInContext("daoHelper", new DaoHelper());
+	}
+
+	public String getName() {
+		return "hbm2dao";
+	}
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/dao/DaoHelper.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/dao/DaoHelper.java
new file mode 100644
index 000000000000..d84ee3ce7c0a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/dao/DaoHelper.java
@@ -0,0 +1,27 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.dao;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.query.NamedHqlQueryDefinition;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+public class DaoHelper {
+
+	public static Iterable<NamedHqlQueryDefinition<?>> getNamedHqlQueryDefinitions(Metadata metadata) {
+		List<NamedHqlQueryDefinition<?>> result = new ArrayList<NamedHqlQueryDefinition<?>>();
+		metadata.visitNamedHqlQueryDefinitions(new Consumer<NamedHqlQueryDefinition<?>>() {
+			@Override
+			public void accept(NamedHqlQueryDefinition<?> t) {
+				result.add(t);
+			}
+		});
+		return result;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/ddl/DdlExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/ddl/DdlExporter.java
new file mode 100644
index 000000000000..49069c9d0c26
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/ddl/DdlExporter.java
@@ -0,0 +1,166 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.ddl;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.hbm2ddl.SchemaExport.Action;
+import org.hibernate.tool.hbm2ddl.SchemaUpdate;
+import org.hibernate.tool.reveng.internal.export.common.AbstractExporter;
+import org.hibernate.tool.schema.TargetType;
+
+import java.io.File;
+import java.util.EnumSet;
+import java.util.Iterator;
+
+/**
+ * Schema Export (.ddl) code generation.
+ *
+ * @author Vitali
+ *
+ */
+public class DdlExporter extends AbstractExporter {
+
+	protected void doStart() {
+		String outputFileName = getProperties().getProperty(OUTPUT_FILE_NAME);
+		Metadata metadata = getMetadata();
+		final EnumSet<TargetType> targetTypes = EnumSet.noneOf( TargetType.class );
+		if (getExportToConsole()) targetTypes.add(TargetType.STDOUT);
+		if (getExportToDatabase()) targetTypes.add(TargetType.DATABASE);
+		if (null != outputFileName) targetTypes.add(TargetType.SCRIPT);
+		if (getSchemaUpdate()) {
+			SchemaUpdate update = new SchemaUpdate();
+			if(outputFileName == null && getDelimiter() == null && getHaltOnError() && getFormat())  {
+				update.execute(targetTypes, metadata);
+			}
+			else {
+				if (null != outputFileName) {
+					File outputFile = new File(getOutputDirectory(), outputFileName);
+					update.setOutputFile(outputFile.getPath());
+					log.debug("delimiter ='"+ getDelimiter() + "'");
+					update.setDelimiter(getDelimiter());
+					update.setFormat( getFormat() );
+				}
+
+				if (getHaltOnError()) {
+					update.setHaltOnError( getHaltOnError() );
+				}
+
+				update.execute(targetTypes, metadata);
+				if (!update.getExceptions().isEmpty()) {
+					int i = 1;
+					for (Iterator<?> iterator = update.getExceptions().iterator(); iterator
+							.hasNext(); i++) {
+						Throwable element = (Throwable) iterator.next();
+						log.warn("Error #" + i + ": ", element);
+
+					}
+					log.error(i - 1 + " errors occurred while performing Hbm2DDLExporter.");
+					if (getHaltOnError()) {
+						throw new RuntimeException(
+								"Errors while performing Hbm2DDLExporter");
+					}
+				}
+			}
+
+		}
+		else {
+			SchemaExport export = new SchemaExport();
+			if (null != outputFileName) {
+				export.setOutputFile(new File(getOutputDirectory(),
+						outputFileName).toString());
+			}
+			if (null != getDelimiter()) {
+				export.setDelimiter(getDelimiter());
+			}
+			export.setHaltOnError(getHaltOnError());
+			export.setFormat(getFormat());
+			if (getDrop() && getCreate()) {
+				export.execute(targetTypes, Action.BOTH, metadata);
+			}
+			else if (getDrop()) {
+				export.execute(targetTypes, Action.DROP, metadata);
+			}
+			else if (getCreate()) {
+				export.execute(targetTypes, Action.CREATE, metadata);
+			}
+			else {
+				export.execute(targetTypes, Action.NONE, metadata);
+			}
+		}
+
+	}
+
+	private boolean getCreate() {
+		if (!getProperties().containsKey(CREATE_DATABASE)) {
+			return true;
+		}
+		else {
+			return (boolean)getProperties().get(CREATE_DATABASE);
+		}
+	}
+
+	private String getDelimiter() {
+		if (!getProperties().containsKey(DELIMITER)) {
+			return ";";
+		}
+		return (String)getProperties().get(DELIMITER);
+	}
+
+	private boolean getDrop() {
+		if (!getProperties().containsKey(DROP_DATABASE)) {
+			return false;
+		}
+		else {
+			return (boolean)getProperties().get(DROP_DATABASE);
+		}
+	}
+
+	private boolean getExportToConsole() {
+		if (!getProperties().containsKey(EXPORT_TO_CONSOLE)) {
+			return true;
+		}
+		else {
+			return (boolean)getProperties().get(EXPORT_TO_CONSOLE);
+		}
+	}
+
+	private boolean getExportToDatabase() {
+		if (!getProperties().containsKey(EXPORT_TO_DATABASE)) {
+			return true;
+		}
+		else {
+			return (boolean)getProperties().get(EXPORT_TO_DATABASE);
+		}
+	}
+
+	private boolean getFormat() {
+		if (!getProperties().containsKey(FORMAT)) {
+			return false;
+		}
+		else {
+			return (boolean)getProperties().get(FORMAT);
+		}
+	}
+
+	private boolean getHaltOnError() {
+		if (!getProperties().containsKey(HALT_ON_ERROR)) {
+			return false;
+		}
+		else {
+			return (boolean)getProperties().get(HALT_ON_ERROR);
+		}
+	}
+
+	private boolean getSchemaUpdate() {
+		if (!getProperties().containsKey(SCHEMA_UPDATE)) {
+			return false;
+		}
+		else {
+			return (boolean)getProperties().get(SCHEMA_UPDATE);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocExporter.java
new file mode 100644
index 000000000000..13adbd0743d6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocExporter.java
@@ -0,0 +1,629 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.doc;
+
+import org.hibernate.HibernateException;
+import org.hibernate.boot.Metadata;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.internal.export.common.AbstractExporter;
+import org.hibernate.tool.reveng.internal.export.common.TemplateProducer;
+import org.hibernate.tool.reveng.internal.export.java.POJOClass;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Exporter implementation that creates Hibernate Documentation.
+ * Creates Tables and Classes Details
+ *
+ * @author Ricardo C. Moral
+ * @author <a href="mailto:abhayani@jboss.org">Amit Bhayani</a>
+ *
+ */
+public class DocExporter extends AbstractExporter {
+
+	/**
+	 * CSS Definition.
+	 */
+	private static final String FILE_CSS_DEFINITION = "doc/doc-style.css";
+
+	/**
+	 * Hibernate Image.
+	 */
+	private static final String FILE_HIBERNATE_IMAGE = "doc/hibernate_logo.gif";
+
+	/**
+	 * Extends Image.
+	 */
+	private static final String FILE_EXTENDS_IMAGE = "doc/inherit.gif";
+
+	/**
+	 * Main index page.
+	 */
+	private static final String FILE_INDEX = "doc/index.html";
+
+	/**
+	 * Template used for the index of the table documentation.
+	 */
+	private static final String FTL_TABLES_INDEX = "doc/tables/index.ftl";
+
+	/**
+	 * Template used for index of the entity documentation
+	 */
+	private static final String FTL_ENTITIES_INDEX = "doc/entities/index.ftl";
+
+	/**
+	 * Template used for the Classes Summary
+	 */
+	private static final String FTL_ENTITIES_SUMMARY = "doc/entities/summary.ftl";
+
+	/**
+	 * Template used for Class details
+	 */
+	private static final String FTL_ENTITIES_ENTITY = "doc/entities/entity.ftl";
+
+	/**
+	 * Template used to create the Package List
+	 */
+	private static final String FTL_ENTITIES_PACKAGE_LIST = "doc/entities/package-list.ftl";
+
+	/**
+	 * Template used to create the list of all Classes
+	 */
+	private static final String FTL_ENTITIES_ENTITY_LIST = "doc/entities/allEntity-list.ftl";
+
+	/**
+	 * Template used to create List of Classes specific to packages.
+	 */
+	private static final String FTL_ENTITIES_PERPACKAGE_ENTITY_LIST = "doc/entities/perPackageEntity-list.ftl";
+
+	/**
+	 * Template used to show the specific package details
+	 */
+	private static final String FTL_ENTITIES_PACKAGE_SUMMARY = "doc/entities/package-summary.ftl";
+
+	/**
+	 * Template used for the Tables Summary.
+	 */
+	private static final String FTL_TABLES_SUMMARY = "doc/tables/summary.ftl";
+
+	/**
+	 * Template used for table lists.
+	 */
+	private static final String FTL_TABLES_TABLE_LIST = "doc/tables/table-list.ftl";
+
+	/**
+	 * Template used for table lists for a specific schema.
+	 */
+	private static final String FTL_TABLES_PERSCHEMA_TABLE_LIST = "doc/tables/schema-table-list.ftl";
+
+	/**
+	 * Template used for schema lists.
+	 */
+	private static final String FTL_TABLES_SCHEMA_LIST = "doc/tables/schema-list.ftl";
+
+	/**
+	 * Template used for Schema Summary.
+	 */
+	private static final String FTL_TABLES_SCHEMA_SUMMARY = "doc/tables/schema-summary.ftl";
+
+	/**
+	 * Template used for the Table Details.
+	 */
+	private static final String FTL_TABLES_TABLE = "doc/tables/table.ftl";
+
+	/**
+	 * Doc helper.
+	 */
+	private DocHelper docHelper;
+
+	/**
+	 * Doc File Manager.
+	 */
+	private DocFileManager docFileManager;
+
+	public void doStart() {
+		generateCommmonAndAssets();
+
+		boolean graphsGenerated = generateDot();
+		generateTablesIndex();
+		generateTablesSummary(graphsGenerated);
+		generateTablesDetails();
+		generateTablesAllSchemasList();
+		generateTablesAllTablesList();
+		generateTablesSchemaTableList();
+		generateTablesSchemaDetailedInfo();
+
+		generateEntitiesIndex();
+		generatePackageSummary(graphsGenerated);
+		generateEntitiesDetails();
+		generateEntitiesAllPackagesList();
+		generateEntitiesAllEntitiesList();
+		generateEntitiesPackageEntityList();
+		generateEntitiesPackageDetailedInfo();
+
+
+	}
+
+	private boolean generateDot() {
+		String cmd = getProperties().getProperty( "dot.executable" );
+		boolean ignoreError = Boolean.parseBoolean(getProperties().getProperty("dot.ignoreerror", "false"));
+
+		if(StringHelper.isNotEmpty( cmd )) {
+			try {
+				Exporter exporter = ExporterFactory.createExporter(ExporterType.GENERIC);
+				exporter.getProperties().putAll( getProperties() );
+				exporter.getProperties().put(ARTIFACT_COLLECTOR, getArtifactCollector());
+				exporter.getProperties().put(METADATA_DESCRIPTOR, getMetadataDescriptor());
+				exporter.getProperties().put(DESTINATION_FOLDER, getOutputDirectory());
+				String[] tp = (String[])exporter.getProperties().get(TEMPLATE_PATH);
+				if (tp != null) {
+					exporter.getProperties().put(TEMPLATE_PATH, tp);
+				}
+
+				exporter.getProperties().put(TEMPLATE_NAME, "dot/entitygraph.dot.ftl");
+				exporter.getProperties().put(FILE_PATTERN, "entities/entitygraph.dot");
+				exporter.start();
+
+				exporter.getProperties().put(TEMPLATE_NAME, "dot/tablegraph.dot.ftl");
+				exporter.getProperties().put(FILE_PATTERN, "tables/tablegraph.dot");
+				exporter.start();
+
+
+				File entityGraphDot = new File(getOutputDirectory(), "entities/entitygraph.dot");
+				dotToFile( cmd, entityGraphDot.toString(), new File(getOutputDirectory(), "entities/entitygraph.png").toString());
+				dotToFile( cmd, entityGraphDot.toString(), new File(getOutputDirectory(), "entities/entitygraph.svg").toString());
+				dotToFile( cmd, entityGraphDot.toString(), new File(getOutputDirectory(), "entities/entitygraph.cmapx").toString());
+
+				File tableGraphDot = new File(getOutputDirectory(), "tables/tablegraph.dot");
+				dotToFile( cmd, tableGraphDot.toString(), new File(getOutputDirectory(), "tables/tablegraph.png").toString());
+				dotToFile( cmd, tableGraphDot.toString(), new File(getOutputDirectory(), "tables/tablegraph.svg").toString());
+				dotToFile( cmd, tableGraphDot.toString(), new File(getOutputDirectory(), "tables/tablegraph.cmapx").toString());
+
+				return true;
+
+			}
+			catch (IOException e) {
+				if(ignoreError) {
+					log.warn( "Skipping entitygraph creation since dot.executable was not found and dot.ignoreerror=false." );
+					return false;
+				}
+				else {
+					throw new HibernateException("Problem while generating DOT graph for Configuration (set dot.ignoreerror=false to ignore)", e);
+				}
+			}
+		}
+		else {
+			log.info( "Skipping entitygraph creation since dot.executable is empty or not-specified." );
+			return false;
+		}
+	}
+
+	public static final String OS_NAME = System.getProperty("os.name");
+	public static final boolean IS_LINUX = OS_NAME.startsWith("Linux");
+
+	private String escape(String fileName){
+
+		// Linux does not need " " around file names
+		if (IS_LINUX){
+			return fileName;
+		}
+
+		// Windows needs " " around file names; actually we do not
+		// need it always, only when spaces are present;
+		// but it does not hurt to usem them always
+		return "\"" + fileName + "\"";
+
+	}
+
+	private void dotToFile(String dotExeFileName, String dotFileName, String outFileName) throws IOException {
+
+		//
+		// dot.exe works by taking *.dot file and piping
+		// results into another file, for example:
+		// d:\graphviz-1.12\bin\dot.exe -Tgif c:\temp\ManualDraw.dot > c:\temp\ManualDraw.gif
+		// so we follow that model here and read stdout until EOF
+		//
+
+		final String[] cmdAsArray = new String[] {
+				escape( dotExeFileName ),
+				"-T",
+				getFormatForFile( outFileName ),
+				escape( dotFileName ),
+				"-o",
+				escape( outFileName )
+		};
+
+		StringBuilder sb = new StringBuilder();
+		for (String s : cmdAsArray) {
+			sb.append( s ).append( " " );
+		}
+
+		final String cmdAsString = sb.toString();
+
+		Process p = Runtime.getRuntime().exec(cmdAsArray);
+		//p.getErrorStream().
+		try {
+			log.debug( "Executing: " + cmdAsString );
+//			 Get the input stream and read from it
+			InputStream in = p.getErrorStream();
+			int c;
+			sb = new StringBuilder();
+			while ((c = in.read()) != -1) {
+				sb.append( (char)c );
+			}
+			log.error( sb.toString() );
+			in.close();
+			int i = p.waitFor( );
+			if(i!=0) {
+				//TODO: dump system.err
+				log.error("Error " + i + " while executing: " + cmdAsString);
+			}
+		}
+		catch(InterruptedException ie){
+			Thread.currentThread().interrupt();
+			log.error( "Error while executing: " + cmdAsString, ie );
+		}
+		catch(Exception ie){
+			log.error( "Error while executing: " + cmdAsString, ie );
+		}
+	}
+
+	private String getFormatForFile(String outFileName){
+		int idx = outFileName.lastIndexOf(".");
+		if (idx == -1 || idx == outFileName.length() - 1){
+			throw new IllegalArgumentException("Can't determine file name extention for file name " + outFileName);
+		}
+		return outFileName.substring(idx + 1);
+	}
+
+
+	protected void setupContext() {
+		if(!getProperties().contains( "jdk5" )) {
+			getProperties().setProperty( "jdk5", "true" );
+		}
+		super.setupContext();
+		Metadata metadata = getMetadata();
+		docHelper = new DocHelper( metadata, getProperties(), getCfg2JavaTool() );
+		docFileManager = new DocFileManager(docHelper, getOutputDirectory() );
+
+		getTemplateHelper().putInContext("dochelper", docHelper);
+		getTemplateHelper().putInContext("docFileManager", docFileManager);
+	}
+
+	/**
+	 * Generate common files and copy assets.
+	 */
+	public void generateCommmonAndAssets() {
+		try {
+			DocFile cssStylesDocFile = docFileManager.getCssStylesDocFile();
+
+			processTemplate( new HashMap<>( 0 ), FILE_CSS_DEFINITION, cssStylesDocFile.getFile());
+
+			DocFile hibernateLogoDocFile = docFileManager.getHibernateImageDocFile();
+
+			DocFileManager.copy(this.getClass().getClassLoader(), FILE_HIBERNATE_IMAGE,
+					hibernateLogoDocFile.getFile() );
+
+			DocFile extendsImageDocFile = docFileManager.getExtendsImageDocFile();
+
+			DocFileManager.copy(this.getClass().getClassLoader(), FILE_EXTENDS_IMAGE, extendsImageDocFile.getFile());
+
+			DocFile mainIndexDocFile = docFileManager.getMainIndexDocFile();
+
+			processTemplate( new HashMap<>( 0 ), FILE_INDEX, mainIndexDocFile.getFile() );
+		}
+		catch (IOException ioe) {
+			throw new RuntimeException("Error while copying files.", ioe);
+		}
+	}
+
+	/**
+	 * Generate the index file of the table documentation.
+	 */
+	public void generateTablesIndex() {
+		DocFile docFile = docFileManager.getTableIndexDocFile();
+
+		File file = docFile.getFile();
+
+		Map<String, Object> parameters = new HashMap<>();
+		parameters.put("docFile", docFile);
+
+		processTemplate(parameters, FTL_TABLES_INDEX, file);
+	}
+
+	/**
+	 * Generate the index file of the class documentation
+	 */
+	public void generateEntitiesIndex(){
+		DocFile docFile = docFileManager.getClassIndexDocFile();
+		File file = docFile.getFile();
+		Map<String, Object> parameters = new HashMap<>();
+		parameters.put("docFile", docFile);
+		processTemplate(parameters, FTL_ENTITIES_INDEX, file );
+	}
+
+	/**
+	 * Generate a file with an summary of all the tables.
+	 */
+	public void generateTablesSummary(boolean graphsGenerated) {
+		DocFile docFile = docFileManager.getTableSummaryDocFile();
+
+		File file = docFileManager.getTableSummaryDocFile().getFile();
+
+		Map<String, Object> parameters = new HashMap<>();
+		parameters.put("docFile", docFile);
+		parameters.put( "graphsGenerated", graphsGenerated );
+		if(graphsGenerated) {
+			StringBuffer sb = new StringBuffer();
+			String fileName = "tables/tablegraph.cmapx";
+			appendFile( sb, fileName );
+			parameters.put( "tablegrapharea", sb );
+		}
+
+		processTemplate(parameters, FTL_TABLES_SUMMARY, file);
+	}
+
+	private void appendFile(StringBuffer sb, String fileName) {
+		try (BufferedReader in = new BufferedReader(new FileReader(new File(getOutputDirectory(), fileName)))) {
+			String str;
+
+			while ((str = in.readLine()) != null) {
+				sb.append(str);
+				sb.append( System.lineSeparator() );
+			}
+		}
+		catch (IOException ignored) {}
+	}
+
+	/**
+	 * Generate summary (summaty.html) to show all the packages
+	 *
+	 */
+	public void generatePackageSummary(boolean graphsGenerated){
+		DocFile docFile = docFileManager.getClassSummaryFile();
+		File file = docFile.getFile();
+
+		Map<String, Object> parameters = new HashMap<>();
+		parameters.put("docFile", docFile);
+
+		List<String> list = docHelper.getPackages();
+		if ( !list.isEmpty() ){
+			//Remove All Classes
+			list.remove(0);
+		}
+		parameters.put("packageList", list );
+		parameters.put( "graphsGenerated", graphsGenerated );
+		if(graphsGenerated) {
+			StringBuffer sb = new StringBuffer();
+			String fileName = "entities/entitygraph.cmapx";
+			appendFile( sb, fileName );
+			parameters.put( "entitygrapharea", sb );
+		}
+
+		processTemplate(parameters, FTL_ENTITIES_SUMMARY, file);
+	}
+
+	/**
+	 * Generate one file per table with detail information.
+	 */
+	public void generateTablesDetails() {
+			Metadata metadata = getMetadata();
+		for ( Table table : metadata.collectTableMappings() ) {
+			DocFile docFile = docFileManager.getTableDocFile( table );
+			if ( docFile != null ) {
+				File file = docFile.getFile();
+
+				Map<String, Object> parameters = new HashMap<>();
+				parameters.put( "docFile", docFile );
+				parameters.put( "table", table );
+
+				processTemplate( parameters, FTL_TABLES_TABLE, file );
+			}
+		}
+	}
+
+	/**
+	 * generates one html file for each class containing detail information of class
+	 *
+	 */
+	public void generateEntitiesDetails(){
+		for ( POJOClass pcObj : docHelper.getClasses() ) {
+			pcObj.getPropertiesForMinimalConstructor();
+			DocFile docFile = docFileManager.getEntityDocFile( pcObj );
+			File file = docFile.getFile();
+
+			Map<String, Object> parameters = new HashMap<>();
+			parameters.put( "docFile", docFile );
+			parameters.put( "class", pcObj );
+			processTemplate( parameters, FTL_ENTITIES_ENTITY, file );
+		}
+	}
+
+	/**
+	 * Generates the html file containig list of packages (allpackages.html)
+	 *
+	 */
+	public void generateEntitiesAllPackagesList() {
+		DocFile docFile = docFileManager.getAllPackagesDocFile();
+
+		File file = docFile.getFile();
+
+		Map<String, Object> parameters = new HashMap<>();
+		parameters.put("docFile", docFile);
+		List<String> list = docHelper.getPackages();
+		if ( !list.isEmpty() ){
+			//Remove All Classes
+			list.remove(0);
+		}
+		parameters.put("packageList", list );
+
+		processTemplate(parameters, FTL_ENTITIES_PACKAGE_LIST, file);
+	}
+
+	/**
+	 * Generates the html file containing list of classes (allclases.html)
+	 *
+	 */
+	public void generateEntitiesAllEntitiesList() {
+		DocFile docFile = docFileManager.getAllEntitiesDocFile();
+
+		File file = docFile.getFile();
+
+		Map<String, Object> parameters = new HashMap<>();
+		parameters.put("docFile", docFile);
+		parameters.put("classList", docHelper.getClasses());
+
+		processTemplate(parameters, FTL_ENTITIES_ENTITY_LIST, file);
+	}
+
+	/**
+	 * generates the list of classes sepcific to package
+	 *
+	 */
+	public void generateEntitiesPackageEntityList() {
+
+		for ( String packageName : docHelper.getPackages() ) {
+			if ( !packageName.equals( DocHelper.DEFAULT_NO_PACKAGE ) ) {
+				DocFile docFile = docFileManager.getPackageEntityListDocFile( packageName );
+				File file = docFile.getFile();
+
+				Map<String, Object> parameters = new HashMap<>();
+				parameters.put( "docFile", docFile );
+				parameters.put( "title", packageName );
+				parameters.put( "classList", docHelper.getClasses( packageName ) );
+				processTemplate( parameters, FTL_ENTITIES_PERPACKAGE_ENTITY_LIST, file );
+
+			}
+
+		}
+	}
+
+	/**
+	 * Generates the html file containing list of classes and interfaces for given package
+	 *
+	 */
+	public void generateEntitiesPackageDetailedInfo() {
+		List<String> packageList = docHelper.getPackages();
+		if ( !packageList.isEmpty() ){
+			//Remove All Classes
+			packageList.remove(0);
+		}
+
+		for ( String packageName : packageList ) {
+			DocFile summaryDocFile = docFileManager.getPackageSummaryDocFile( packageName );
+			Map<String, Object> parameters = new HashMap<>();
+			parameters.put( "docFile", summaryDocFile );
+			parameters.put( "package", packageName );
+			parameters.put( "classList", docHelper.getClasses( packageName ) );
+
+			processTemplate( parameters, FTL_ENTITIES_PACKAGE_SUMMARY,
+					summaryDocFile.getFile() );
+		}
+	}
+
+	/**
+	 * Generate a file with a list of all the schemas in the configuration.
+	 */
+	public void generateTablesAllSchemasList() {
+		DocFile docFile = docFileManager.getAllSchemasDocFile();
+
+		File file = docFile.getFile();
+
+		Map<String, Object> parameters = new HashMap<>();
+		parameters.put("docFile", docFile);
+		parameters.put("schemaList", docHelper.getSchemas() );
+
+		processTemplate(parameters, FTL_TABLES_SCHEMA_LIST, file);
+	}
+
+	/**
+	 * Generate a file with a list of all the tables in the configuration.
+	 */
+	public void generateTablesAllTablesList() {
+		DocFile docFile = docFileManager.getAllTablesDocFile();
+
+		File file = docFile.getFile();
+
+		Map<String, Object> parameters = new HashMap<>();
+		parameters.put("docFile", docFile);
+		parameters.put("tableList", docHelper.getTables() );
+
+		processTemplate(parameters, FTL_TABLES_TABLE_LIST, file);
+	}
+
+	public void generateTablesSchemaTableList() {
+
+		for ( String schemaName : docHelper.getSchemas() ) {
+			DocFile docFile = docFileManager.getSchemaTableListDocFile( schemaName );
+
+			File file = docFile.getFile();
+
+			Map<String, Object> parameters = new HashMap<>();
+			parameters.put( "docFile", docFile );
+			parameters.put( "title", schemaName );
+			parameters.put( "tableList", docHelper.getTables( schemaName ) );
+
+			processTemplate( parameters, FTL_TABLES_PERSCHEMA_TABLE_LIST, file );
+		}
+	}
+
+	/**
+	 * Generate two files per schema. One with a summary of the tables in the
+	 * schema and another one with a list of tables.
+	 */
+	public void generateTablesSchemaDetailedInfo() {
+		for ( String schemaName : docHelper.getSchemas() ) {
+			DocFile summaryDocFile = docFileManager.getSchemaSummaryDocFile( schemaName );
+
+			Map<String, Object> parameters = new HashMap<>();
+			parameters.put( "docFile", summaryDocFile );
+			parameters.put( "schema", schemaName );
+
+			processTemplate( parameters, FTL_TABLES_SCHEMA_SUMMARY,
+					summaryDocFile.getFile() );
+
+			DocFile tableListDocFile = docFileManager.getSchemaSummaryDocFile( schemaName );
+
+			parameters = new HashMap<>();
+			parameters.put( "docFile", tableListDocFile );
+			parameters.put( "schema", schemaName );
+
+			processTemplate( parameters, FTL_TABLES_SCHEMA_SUMMARY,
+					tableListDocFile.getFile() );
+
+			//processTemplate( new HashMap(), templateName, outputFile );
+		}
+	}
+
+	/**
+	 * Run templates.
+	 *
+	 * @param parameters the parameters to pass to the templates template.
+	 * @param templateName the template to use.
+	 * @param outputFile the output file.
+	 */
+	protected void processTemplate(Map<String, Object> parameters, String templateName,
+			File outputFile) {
+
+		TemplateProducer producer = new TemplateProducer(getTemplateHelper(), getArtifactCollector() );
+		producer.produce(parameters, templateName, outputFile, templateName);
+	}
+
+	public String getName() {
+		return "hbm2doc";
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFile.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFile.java
new file mode 100644
index 000000000000..8f01c2e388bd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFile.java
@@ -0,0 +1,168 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.doc;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * Represents a documentation file.
+ *
+ * @author Ricardo C. Moral
+ */
+public class DocFile {
+
+	/**
+	 * The name of the file.
+	 */
+	final private String name;
+
+	/**
+	 * The parent folder.
+	 */
+	final private DocFolder parentFolder;
+
+	/**
+	 * The File representation.
+	 */
+	final private File file;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param pName the name of the file.
+	 * @param pFolder the parent folder.
+	 *
+	 * @throws IllegalArgumentException if one of the parameters is null.
+	 */
+	public DocFile(String pName, DocFolder pFolder) {
+		super();
+
+		if (pName == null) {
+			throw new IllegalArgumentException("The name cannot be null");
+		}
+
+		if (pFolder == null) {
+			throw new IllegalArgumentException(
+					"The parent folder cannot be null");
+		}
+
+		name = pName;
+		parentFolder = pFolder;
+
+		file = new File(parentFolder.getFile(), pName);
+	}
+
+	/**
+	 * Returns the name of the file.
+	 *
+	 * @return the name of the file.
+	 */
+	public String getName() {
+
+		return name;
+	}
+
+	/**
+	 * Return the parent DocFolder.
+	 *
+	 * @return the DocFolder.
+	 */
+	public DocFolder getFolder() {
+
+		return parentFolder;
+	}
+
+	/**
+	 * Returns the File representation.
+	 *
+	 * @return the File.
+	 */
+	public File getFile() {
+
+		return file;
+	}
+
+	/**
+	 * Returns a list with the folders from root.
+	 *
+	 * @return a list with the folders from root.
+	 */
+	public List<DocFolder> getPathFolders() {
+
+		return parentFolder.getPathFolders();
+	}
+
+	/**
+	 * Return a path-like reference to this file starting on the specified
+	 * folder. The folder must be a parent folder.
+	 *
+	 * @param folder the folder.
+	 *
+	 * @return a path-like reference string.
+	 */
+	private String buildRefFromFolder(DocFolder folder) {
+
+		StringBuffer result = new StringBuffer();
+
+		List<DocFolder> folders = getPathFolders();
+
+		int index = folders.indexOf(folder);
+
+		if (index == -1) {
+			throw new IllegalArgumentException(
+					"The specified folder is not on this file's path: "
+							+ folder);
+		}
+
+		for (index++; index < folders.size(); index++) {
+			DocFolder f = (DocFolder) folders.get(index);
+			result.append(f.getName() + '/');
+		}
+
+		result.append(getName() );
+
+		return result.toString();
+	}
+
+	/**
+	 * Return a path-like reference to the specified file.
+	 *
+	 * @param target the target file.
+	 *
+	 * @return a path-like reference string.
+	 */
+	public String buildRefTo(DocFile target) {
+
+		List<DocFolder> tgtFileFolders = target.getPathFolders();
+
+		StringBuffer ref = new StringBuffer();
+
+		DocFolder localFolder = this.parentFolder;
+		while (localFolder != null) {
+			if (tgtFileFolders.contains(localFolder) ) {
+				ref.append(target.buildRefFromFolder(localFolder) );
+				String result = ref.toString();
+				return result;
+			}
+			else {
+				ref.append("../");
+				localFolder = localFolder.getParent();
+			}
+		}
+
+		throw new IllegalArgumentException("No parent folder in common");
+	}
+
+	/**
+	 * Return a String representation of this file.
+	 *
+	 * @return a String.
+	 */
+	public String toString() {
+		return name;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFileManager.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFileManager.java
new file mode 100644
index 000000000000..cf5853306c22
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFileManager.java
@@ -0,0 +1,474 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.doc;
+
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.internal.export.java.POJOClass;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Class used to manage the files created during the documentation generation
+ * process. This manager is needed to manage references between files.
+ *
+ * @author Ricardo C. Moral
+ * @author <a href="mailto:abhayani@jboss.org">Amit Bhayani</a>
+ */
+public class DocFileManager {
+
+	/**
+	 * Root Documentation Folder.
+	 */
+	private final DocFolder rootDocFolder;
+
+	/**
+	 * The main index file for the documentation.
+	 */
+	private final DocFile mainIndexDocFile;
+
+	/**
+	 * Folder for the utility files.
+	 */
+	private final DocFolder assetsDocFolder;
+
+	/**
+	 * The Hibernate image.
+	 */
+	private final DocFile hibernateImageDocFile;
+
+	/**
+	 * The extends image.
+	 */
+	private final DocFile extendsImageDocFile;
+
+	/**
+	 * The CSS stylesheet file.
+	 */
+	private final DocFile cssStylesDocFile;
+
+	/**
+	 * Class index DocFile
+	 */
+	private final DocFile classIndexDocFile;
+
+	/**
+	 * Class Summary DocFile
+	 */
+	private final DocFile entitySummaryDocFile;
+
+	/**
+	 * All packages DocFile allpackages.html
+	 */
+	private final DocFile allPackagesDocFile;
+
+	/**
+	 * All classes DocFile allclases.html
+	 */
+	private final DocFile allEntitiesDocFile;
+
+	/**
+	 * Table index DocFile.
+	 */
+	private final DocFile tableIndexDocFile;
+
+	/**
+	 * Table summary DocFile.
+	 */
+	private final DocFile tableSummaryDocFile;
+
+	/**
+	 * All Schemas DocFile.
+	 */
+	private final DocFile allSchemasDocFile;
+
+	/**
+	 * All Tables DocFile.
+	 */
+	private final DocFile allTablesDocFile;
+
+	/**
+	 * Map with the doc files for the tables. The keys are the Table objects and
+	 * the values are the DocFile instances.
+	 */
+	private final Map<Table, DocFile> tableDocFiles = new HashMap<Table, DocFile>();
+
+	/**
+	 * Map with the DocFile for classes. The keys are the POJOClass objects and
+	 * the values are the DocFile instances.
+	 */
+	private final Map<POJOClass, DocFile> entityDocFiles = new HashMap<POJOClass, DocFile>();
+
+	/**
+	 * Map with the schema summary DocFiles keyed by Schema FQN.
+	 */
+	private final Map<String, DocFile> schemaSummaryDocFiles = new HashMap<String, DocFile>();
+
+	/**
+	 * Map with the package summary DocFiles keyed by package name
+	 */
+	private final Map<String, DocFile> packageSummaryDocFiles = new HashMap<String, DocFile>();
+
+	/**
+	 * Map with the schema table lists DocFiles keyed by Schema FQN.
+	 */
+	private final Map<String, DocFile> schemaTableListDocFiles = new HashMap<String, DocFile>();
+
+	/**
+	 * Map with package class lists DocFiles keyed by package name
+	 */
+	private final Map<String, DocFile> packageEntityListDocFile = new HashMap<String, DocFile>();
+
+	public DocFolder getRootDocFolder() {
+		return rootDocFolder;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param docHelper the doc helper.
+	 * @param pRootFolder the root folder for the documentation.
+	 */
+	public DocFileManager(DocHelper docHelper, File pRootFolder) {
+
+		super();
+
+		rootDocFolder = new DocFolder(pRootFolder);
+
+		mainIndexDocFile = new DocFile("index.html", rootDocFolder);
+
+		assetsDocFolder = new DocFolder("assets", rootDocFolder);
+
+		hibernateImageDocFile = new DocFile("hibernate_logo.gif",
+				assetsDocFolder);
+
+		extendsImageDocFile = new DocFile("inherit.gif", assetsDocFolder);
+
+		cssStylesDocFile = new DocFile("doc-style.css", assetsDocFolder);
+
+		DocFolder rootEntitiesDocFolder = new DocFolder( "entities", rootDocFolder );
+		classIndexDocFile = new DocFile("index.html", rootEntitiesDocFolder );
+		entitySummaryDocFile = new DocFile("summary.html", rootEntitiesDocFolder );
+		allPackagesDocFile = new DocFile("allpackages.html", rootEntitiesDocFolder );
+		allEntitiesDocFile = new DocFile("allentities.html", rootEntitiesDocFolder );
+
+
+		DocFolder rootTablesDocFolder = new DocFolder( "tables", rootDocFolder );
+
+		tableIndexDocFile = new DocFile("index.html", rootTablesDocFolder );
+
+		tableSummaryDocFile = new DocFile("summary.html", rootTablesDocFolder );
+
+		allSchemasDocFile = new DocFile("allschemas.html", rootTablesDocFolder );
+
+		allTablesDocFile = new DocFile("alltables.html", rootTablesDocFolder );
+
+		for ( String packageName : docHelper.getPackages() ) {
+			DocFolder packageFolder = null;
+			DocFolder theRoot = rootEntitiesDocFolder;
+			if ( !packageName.equals( DocHelper.DEFAULT_NO_PACKAGE ) ) {
+				String[] packagesArr = packageName.split( "\\." );
+
+				for ( String s : packagesArr ) {
+					packageFolder = new DocFolder( s, theRoot );
+					theRoot = packageFolder;
+				}
+
+				DocFile packageSummaryDocFile = new DocFile( "summary.html", packageFolder );
+				packageSummaryDocFiles.put( packageName, packageSummaryDocFile );
+
+				DocFile classListDocFile = new DocFile( "entities.html", packageFolder );
+				packageEntityListDocFile.put( packageName, classListDocFile );
+			}
+			else {
+				packageFolder = rootEntitiesDocFolder;
+			}
+
+			for ( POJOClass pc : docHelper.getClasses( packageName ) ) {
+				String classFileName = pc.getDeclarationName();
+				classFileName = classFileName + ".html";
+				DocFile classDocFile = new DocFile( classFileName, packageFolder );
+				entityDocFiles.put( pc, classDocFile );
+			}
+		}
+
+		for ( String schemaName : docHelper.getSchemas() ) {
+			DocFolder schemaFolder = new DocFolder( schemaName,
+					rootTablesDocFolder );
+			DocFile schemaSummaryDocFile = new DocFile( "summary.html",
+					schemaFolder );
+			schemaSummaryDocFiles.put( schemaName, schemaSummaryDocFile );
+			DocFile tableListDocFile = new DocFile( "tables.html", schemaFolder );
+			schemaTableListDocFiles.put( schemaName, tableListDocFile );
+
+			for ( Table table : docHelper.getTables( schemaName ) ) {
+				if ( table.isPhysicalTable() ) {
+					String tableFileName = table.getName() + ".html";
+
+					DocFile tableDocFile = new DocFile( tableFileName, schemaFolder );
+
+					tableDocFiles.put( table, tableDocFile );
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns the DocFolder for the helper files.
+	 *
+	 * @return the value.
+	 */
+	public DocFolder getAssetsDocFolder() {
+
+		return assetsDocFolder;
+	}
+
+	/**
+	 * Returns the DocFile for the CSS definitions.
+	 *
+	 * @return the value.
+	 */
+	public DocFile getCssStylesDocFile() {
+
+		return cssStylesDocFile;
+	}
+
+	/**
+	 * Returns the DocFile for the Hibernate Image.
+	 *
+	 * @return the value.
+	 */
+	public DocFile getHibernateImageDocFile() {
+
+		return hibernateImageDocFile;
+	}
+
+	/**
+	 * Returns the DocFile for the extends Image.
+	 *
+	 * @return the value.
+	 */
+	public DocFile getExtendsImageDocFile() {
+
+		return extendsImageDocFile;
+	}
+
+	/**
+	 * Returns the DocFile for the main index.
+	 *
+	 * @return the value.
+	 */
+	public DocFile getMainIndexDocFile() {
+
+		return mainIndexDocFile;
+	}
+
+	/**
+	 * Return the table index DocFile.
+	 *
+	 * @return the table index DocFile.
+	 */
+	public DocFile getTableIndexDocFile() {
+		return tableIndexDocFile;
+	}
+
+	/**
+	 * Returns the class index DocFile
+	 * @return class index DocFile
+	 */
+	public DocFile getClassIndexDocFile(){
+		return classIndexDocFile;
+	}
+
+	/**
+	 * Returns the summary index DocFile
+	 * @return summary index DocFile
+	 */
+	public DocFile getClassSummaryFile(){
+		return entitySummaryDocFile;
+	}
+
+	/**
+	 * Returns the DocFile responsible for generating allpackages.html
+	 * @return DocFile
+	 */
+	public DocFile getAllPackagesDocFile(){
+		return allPackagesDocFile;
+	}
+
+	/**
+	 * Returns the DocFile responsible for generating allclasses.html
+	 */
+	public DocFile getAllEntitiesDocFile(){
+		return allEntitiesDocFile;
+	}
+
+	/**
+	 * Returns the DocFile responsible to generate classes.html corresponding to packageName passed
+	 * @param packageName Package name which acts as key to get DocFile value object from packageEntityListDocFile
+	 * @return DocFile for classes.html
+	 */
+	public DocFile getPackageEntityListDocFile(String packageName){
+		return packageEntityListDocFile.get(packageName);
+
+	}
+
+	/**
+	 * Return the table summary DocFile.
+	 *
+	 * @return the table summary DocFile.
+	 */
+	public DocFile getTableSummaryDocFile() {
+		return tableSummaryDocFile;
+	}
+
+	/**
+	 * Return the all schemas DocFile.
+	 *
+	 * @return the all schemas DocFile.
+	 */
+	public DocFile getAllSchemasDocFile() {
+		return allSchemasDocFile;
+	}
+
+	/**
+	 * Return the all tables DocFile.
+	 *
+	 * @return the all tables DocFile.
+	 */
+	public DocFile getAllTablesDocFile() {
+		return allTablesDocFile;
+	}
+
+	/**
+	 * Return the DocFile for the specified Table.
+	 *
+	 * @param table the Table.
+	 *
+	 * @return the DocFile.
+	 */
+	public DocFile getTableDocFile(Table table) {
+		return tableDocFiles.get(table);
+	}
+
+
+	/**
+	 * Get the DocFile corresponding to POJOClass. But if the POJOClass is ComponentPOJO, it is created on fly
+	 * and we are not implementing .equals method hence get by getQualifiedDeclarationName.
+	 * @param pc DocFile corresponding to this POJOClass
+	 * @return DocFile
+	 */
+	public DocFile getEntityDocFileByDeclarationName(POJOClass pc){
+		DocFile df = getEntityDocFile(pc);
+		String pcQualifiedDeclarationName = pc.getQualifiedDeclarationName();
+		String pojoClassQualifiedDeclarationName ;
+		//TODO Can we implement equals method in BasicPOJO to avoid this loop?
+		if(df == null){
+			for ( POJOClass pojoClass : entityDocFiles.keySet() ) {
+				pojoClassQualifiedDeclarationName = pojoClass.getQualifiedDeclarationName();
+
+				if ( pcQualifiedDeclarationName.equals( pojoClassQualifiedDeclarationName ) ) {
+					df = entityDocFiles.get( pojoClass );
+					break;
+				}
+			}
+
+
+
+		}
+		return df;
+	}
+
+	/**
+	 * Returns the DocFile responsible to generate the .html for each classes.
+	 * @param pc The DocFile corresponding to this pc is retrieved from  entityDocFiles
+	 * @return DocFile
+	 */
+	public DocFile getEntityDocFile(POJOClass pc){
+		return entityDocFiles.get(pc);
+	}
+
+	/**
+	 * Return the summary DocFile for the specified schema FQN.
+	 *
+	 * @param schemaName the name of the schema.
+	 *
+	 * @return the DocFile.
+	 */
+	public DocFile getSchemaSummaryDocFile(String schemaName) {
+		return schemaSummaryDocFiles.get(schemaName);
+	}
+
+	/**
+	 * get DocFile responsible to generate summary.html for corresponding packageName passed
+	 * @param packageName DocFile corresponding to this packagename is retrieved from packageSummaryDocFiles
+	 * @return DocFile
+	 */
+	public DocFile getPackageSummaryDocFile(String packageName){
+		return packageSummaryDocFiles.get(packageName);
+	}
+
+	/**
+	 * Return the Table List DocFile for the specified schema FQN.
+	 *
+	 * @param schemaName the name of the schema.
+	 *
+	 * @return the DocFile.
+	 */
+	public DocFile getSchemaTableListDocFile(String schemaName) {
+		return schemaTableListDocFiles.get(schemaName);
+	}
+
+	/**
+	 * Return the relative reference between the specified files.
+	 *
+	 * @param from the origin.
+	 * @param to the target.
+	 *
+	 * @throws IllegalArgumentException if any parameter is null.
+	 */
+	public String getRef(DocFile from, DocFile to) {
+		if (from == null) {
+			throw new IllegalArgumentException("From cannot be null.");
+		}
+
+		if (to == null) {
+			throw new IllegalArgumentException("To cannot be null.");
+		}
+
+		return from.buildRefTo(to);
+	}
+
+	/**
+	 * Copy a File.
+	 *
+	 * TODO: this method ignores custom provided templatepath. Want to call freemarker to get the resourceloaders but they are hidden, so we need another way.
+	 * ..and if we use currentthread classloader you might conflict with the projects tools.jar
+	 *
+	 * @param fileName the name of the file to copy.
+	 * @param to the target file.
+	 *
+	 * @throws IOException in case of error.
+	 */
+	public static void copy(ClassLoader loader, String fileName, File to) throws IOException {
+		InputStream is = loader.getResourceAsStream( fileName );
+
+		if(is==null) {
+			throw new IllegalArgumentException("File not found: " + fileName);
+		}
+
+		try (is; FileOutputStream out = new FileOutputStream(to)) {
+			int value;
+			while ( (value = is.read() ) != -1) {
+				out.write(value);
+			}
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFolder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFolder.java
new file mode 100644
index 000000000000..1df672c3edad
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFolder.java
@@ -0,0 +1,137 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.doc;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents a documentation folder.
+ *
+ * @author Ricardo C. Moral
+ */
+public class DocFolder {
+
+	/**
+	 * The name of the folder.
+	 */
+	private String name;
+
+	/**
+	 * The parent folder.
+	 */
+	private DocFolder parent;
+
+	/**
+	 * The File instance.
+	 */
+	private final File file;
+
+	/**
+	 * Holds a list with the folders that are between this folder and root.
+	 */
+	private final List<DocFolder> pathFolders = new ArrayList<>();
+
+	/**
+	 * Constructor for the root folder.
+	 */
+	public DocFolder(File root) {
+		super();
+
+		if (root == null) {
+			throw new IllegalArgumentException("Root File cannot be null");
+		}
+
+		file = root;
+
+		pathFolders.add(this);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param pName the name of the file.
+	 * @param pParent the parent folder.
+	 */
+	public DocFolder(String pName, DocFolder pParent) {
+		super();
+
+		if (pName == null) {
+			throw new IllegalArgumentException("Name cannot be null");
+		}
+
+		if (pParent == null) {
+			throw new IllegalArgumentException("Parent folder cannot be null");
+		}
+
+		name = pName;
+		parent = pParent;
+
+		file = new File(parent.getFile(), name);
+
+		if (file.exists() ) {
+			if (!file.isDirectory() ) {
+				throw new RuntimeException("The path: "
+										+ file.getAbsolutePath()
+										+ " exists, but is not a Folder");
+			}
+		}
+		else {
+			if (!file.mkdirs() ) {
+				throw new RuntimeException("unable to create folder: "
+										+ file.getAbsolutePath() );
+			}
+		}
+		pathFolders.addAll(parent.getPathFolders() );
+		pathFolders.add(this);
+	}
+
+	/**
+	 * Return the name of this folder.
+	 *
+	 * @return the name of this folder.
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Returns the parent folder.
+	 *
+	 * @return the parent folder.
+	 */
+	public DocFolder getParent() {
+		return parent;
+	}
+
+	/**
+	 * Return the File instance.
+	 *
+	 * @return the File instance.
+	 */
+	public File getFile() {
+		return file;
+	}
+
+	/**
+	 * Returns a list with the folders from root.
+	 *
+	 * @return a list with the folders from root.
+	 */
+	public List<DocFolder> getPathFolders() {
+		return pathFolders;
+	}
+
+	/**
+	 * Return a String representation of this folder.
+	 *
+	 * @return a String.
+	 */
+	public String toString() {
+		return name;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocHelper.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocHelper.java
new file mode 100644
index 000000000000..191eeab0fe4e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocHelper.java
@@ -0,0 +1,492 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.doc;
+
+import org.hibernate.HibernateException;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+import org.hibernate.mapping.Value;
+import org.hibernate.tool.reveng.internal.export.common.ConfigurationNavigator;
+import org.hibernate.tool.reveng.internal.export.java.Cfg2JavaTool;
+import org.hibernate.tool.reveng.internal.export.java.ComponentPOJOClass;
+import org.hibernate.tool.reveng.internal.export.java.POJOClass;
+import org.hibernate.tool.reveng.internal.core.binder.TypeUtils;
+import org.hibernate.type.Type;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * This helper class is used expose hibernate mapping information to the
+ * templates.
+ *
+ * @author Ricardo C. Moral
+ * @author <a href="mailto:abhayani@jboss.org">Amit Bhayani</a>
+ */
+public final class DocHelper {
+
+	/** used to sort pojoclass according to their declaration name */
+	static final Comparator<POJOClass> POJOCLASS_COMPARATOR = Comparator.comparing( POJOClass::getDeclarationName );
+
+	/**
+	 * Used to sort properties according to their name.
+	 */
+	private static final Comparator<Property> PROPERTY_COMPARATOR = Comparator.comparing( Property::getName );
+
+	/**
+	 * Name to use if the schema is not specified.
+	 */
+	public static final String DEFAULT_NO_SCHEMA_NAME = "default";
+
+	/**
+	 * Name to use if there are no packages specified for any class
+	 */
+	public static final String DEFAULT_NO_PACKAGE = "All Entities";
+
+	/**
+	 * Map with Tables keyed by Schema FQN. The keys are Strings and the values
+	 * are Lists of Tables
+	 */
+	private final Map<String, List<Table>> tablesBySchema =
+			new HashMap<>();
+
+	/**
+	 * Map with classes keyed by package name. PackageName is String key and
+	 * values are List of POJOClass
+	 */
+	private final Map<String, List<POJOClass>> classesByPackage =
+			new HashMap<>();
+
+	/**
+	 * Lits of all POJOClass
+	 */
+	private final List<POJOClass> classes =
+			new ArrayList<>();
+
+	/**
+	 * Map where the keys are column names (tableFQN.column) and the values are
+	 * lists with the Value instances where those columns referenced.
+	 */
+	private final Map<String, List<Value>> valuesByColumn =
+			new HashMap<>();
+
+	/**
+	 * Holds intances of Property keyed by Value objects.
+	 */
+	private final Map<Value, List<Property>> propsByValue =
+			new HashMap<>();
+
+	/**
+	 * List with all the tables.
+	 */
+	private final List<Table> tables = new ArrayList<>();
+
+	/**
+	 * Map that holds the Schema FQN for each Table. The keys are Table
+	 * instances and the values are Strings with the Schema FQN for that table.
+	 */
+	private final Map<Table, String> tableSchemaNames = new HashMap<>();
+
+	private final Metadata metadata;
+
+	public DocHelper(Metadata metadata, Properties properties, Cfg2JavaTool cfg2JavaTool) {
+
+		super();
+
+		if (metadata == null) {
+			throw new IllegalArgumentException("Hibernate Configuration cannot be null");
+		}
+
+		this.metadata = metadata;
+
+		StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder();
+		builder.applySettings(properties);
+		String defaultCatalog = properties.getProperty(AvailableSettings.DEFAULT_CATALOG);
+		String defaultSchema = properties.getProperty(AvailableSettings.DEFAULT_SCHEMA);
+		if (defaultSchema == null) {
+			defaultSchema = DEFAULT_NO_SCHEMA_NAME;
+		}
+
+		for (Table table : metadata.collectTableMappings()) {
+			if (!table.isPhysicalTable()) {
+				continue;
+			}
+			tables.add(table);
+
+			StringBuilder sb = new StringBuilder();
+
+			String catalog = table.getCatalog();
+			if (catalog == null) {
+				catalog = defaultCatalog;
+			}
+			if (catalog != null) {
+				sb.append(catalog).append(".");
+			}
+
+			String schema = table.getSchema();
+			if (schema == null) {
+				schema = defaultSchema;
+			}
+
+			sb.append(schema);
+
+			String qualSchemaName = sb.toString();
+
+			tableSchemaNames.put(table, qualSchemaName);
+
+			List<Table> tableList = tablesBySchema.computeIfAbsent(qualSchemaName, k -> new ArrayList<>());
+			tableList.add(table);
+
+			for (Column column : table.getColumns()) {
+				String columnFQN = getQualifiedColumnName(table, column);
+				List<Value> values = valuesByColumn.computeIfAbsent(columnFQN, k -> new ArrayList<>());
+				values.add(column.getValue());
+			}
+		}
+
+		Map<String, Component> components = new HashMap<>();
+
+		for (PersistentClass clazz : metadata.getEntityBindings()) {
+			POJOClass pojoClazz = cfg2JavaTool.getPOJOClass(clazz);
+			ConfigurationNavigator.collectComponents(components, pojoClazz);
+
+			this.processClass(pojoClazz);
+
+			for (Property property : clazz.getProperties()) {
+				Value value = property.getValue();
+				List<Property> props = propsByValue.computeIfAbsent(value, k -> new ArrayList<>());
+				props.add(property);
+			}
+		}
+
+		for (Component component : components.values()) {
+			ComponentPOJOClass element =
+					new ComponentPOJOClass(component, cfg2JavaTool);
+			this.processClass(element);
+		}
+	}
+
+	/**
+	 * Populate classes List and classesByPackage Map
+	 */
+	private void processClass(POJOClass pojoClazz) {
+
+		classes.add(pojoClazz);
+		String packageName = pojoClazz.getPackageName();
+
+		if (packageName == null || packageName.isEmpty()) {
+			packageName = DEFAULT_NO_PACKAGE;
+		}
+
+		List<POJOClass> classList = classesByPackage.computeIfAbsent(packageName, k -> new ArrayList<>());
+		classList.add(pojoClazz);
+	}
+
+	/**
+	 * Return a Map with the tables keyed by Schema. The keys are the schema
+	 * names and the values are Lists of tables.
+	 *
+	 * @return a Map with the tables keyed by Schema Name.
+	 */
+	public Map<String, List<Table>> getTablesBySchema() {
+		return tablesBySchema;
+	}
+
+	/**
+	 * return a Map which has List of POJOClass as value keyed by package name
+	 * as String.
+	 */
+	public Map<String, List<POJOClass>> getClassesByPackage() {
+		return classesByPackage;
+	}
+
+	/**
+	 * Returns a list with all the schemas.
+	 *
+	 * @return a list with all the schemas.
+	 */
+	public List<String> getSchemas() {
+		List<String> schemas = new ArrayList<>( tablesBySchema.keySet() );
+		Collections.sort(schemas);
+		return schemas;
+	}
+
+	/**
+	 * Return a sorted List of packages
+	 */
+	public List<String> getPackages() {
+		List<String> packages = new ArrayList<>( classesByPackage.keySet() );
+		Collections.sort(packages);
+		return packages;
+	}
+
+	/**
+	 * Return the list of tables for a particular schema.
+	 *
+	 * @param schema
+	 *            the name of the schema.
+	 *
+	 * @return a list with all the tables.
+	 */
+	public List<Table> getTables(String schema) {
+		return tablesBySchema.get(schema);
+	}
+
+	/**
+	 * return a sorted List of POJOClass corresponding to packageName passed
+	 *
+	 * @param packageName
+	 *            packageName other than DEFAULT_NO_PACKAGE
+	 * @return a sorted List of POJOClass
+	 */
+	public List<POJOClass> getClasses(String packageName) {
+		List<POJOClass> clazzes = classesByPackage.get(packageName);
+		List<POJOClass> orderedClasses = new ArrayList<>( clazzes );
+		orderedClasses.sort(POJOCLASS_COMPARATOR);
+		return orderedClasses;
+	}
+
+	/**
+	 * Return all the tables.
+	 *
+	 * @return all the tables.
+	 */
+	public List<Table> getTables() {
+		return tables;
+	}
+
+	/**
+	 * Return a sorted List of all POJOClass
+	 */
+	public List<POJOClass> getClasses() {
+		List<POJOClass> orderedClasses = new ArrayList<>( classes );
+		orderedClasses.sort(POJOCLASS_COMPARATOR);
+		return orderedClasses;
+	}
+
+	/**
+	 * Returns the qualified schema name for a table. The qualified schema name
+	 * will include the catalog name if one is specified.
+	 *
+	 * @param table
+	 *            the table.
+	 *
+	 * @return the qualified schema name for the table.
+	 */
+	public String getQualifiedSchemaName(Table table) {
+
+		return (String) tableSchemaNames.get(table);
+	}
+
+	/**
+	 * Returns the qualified name of a table.
+	 *
+	 * @param table
+	 *            the table.
+	 *
+	 * @return the qualified name of the table.
+	 */
+	public String getQualifiedTableName(Table table) {
+
+		String qualifiedSchemaName = getQualifiedSchemaName(table);
+
+		return qualifiedSchemaName + '.' + table.getName();
+	}
+
+	public String getPropertyType(Property p) {
+		Value v = p.getValue();
+		Type t;
+		String propertyString = "N/D";
+		try {
+			t = v.getType();
+			propertyString = t.getReturnedClass().getName();
+
+		}
+		catch (Exception ex) {
+			// TODO we should try to get the value from value here
+			// Eat Exception??
+		}
+
+		return propertyString;
+	}
+
+	/**
+	 * Returns the qualified name of a column.
+	 *
+	 * @param table
+	 *            the table.
+	 * @param column
+	 *            the column
+	 *
+	 * @return the FQN of the column.
+	 */
+	public String getQualifiedColumnName(Table table, Column column) {
+		String qualifiedTableName = getQualifiedTableName(table);
+		return qualifiedTableName + '.' + column.getName();
+	}
+
+	/**
+	 * Get the SQL type name for a column.
+	 *
+	 * @param column
+	 *            the column.
+	 *
+	 * @return a String with the SQL type name.
+	 */
+	public String getSQLTypeName(Column column) {
+
+		try {
+			return column.getSqlType(metadata);
+		}
+		catch (HibernateException ex) {
+
+			// TODO: Fix this when we find a way to get the type or
+			// the mapping.
+
+			return "N/D";
+		}
+	}
+
+	public int getLength(Column column) {
+		return column.getLength() == null ?
+				TypeUtils.DEFAULT_COLUMN_LENGTH :
+				column.getLength().intValue();
+	}
+
+	public int getPrecision(Column column) {
+		return column.getPrecision() == null ?
+				TypeUtils.DEFAULT_COLUMN_PRECISION :
+				column.getPrecision();
+	}
+
+	public int getScale(Column column) {
+		return column.getScale() == null ?
+				TypeUtils.DEFAULT_COLUMN_SCALE :
+				column.getScale();
+	}
+
+	public Iterator<Column> getPrimaryKeyColumnIterator(Table table) {
+		return table.getPrimaryKey().getColumns().iterator();
+	}
+
+	/**
+	 * Returns the values that use the specified column.
+	 *
+	 * @param table
+	 *            the table.
+	 * @param column
+	 *            the column.
+	 *
+	 * @return a list with the values.
+	 */
+	public List<Value> getValues(Table table, Column column) {
+		String columnFQN = getQualifiedColumnName(table, column);
+		List<Value> values = valuesByColumn.get(columnFQN);
+		if (values != null) {
+			return values;
+		}
+		else {
+			return new ArrayList<>();
+		}
+	}
+
+	/**
+	 * Returns the properties that map to a column.
+	 *
+	 * @param table
+	 *            the table.
+	 * @param column
+	 *            the column.
+	 *
+	 * @return a list of properties.
+	 */
+	public List<Property> getProperties(Table table, Column column) {
+
+		List<Property> result = new ArrayList<>();
+		for (Value value : getValues(table, column)) {
+			List<Property> props = propsByValue.get(value);
+			if (props != null) {
+				result.addAll(props);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Method used in class.vm template to get the ComponentPOJO class
+	 * corresponding to Property if its of Type Component.
+	 *
+	 * @param property
+	 *            Get ComponentPOJO corresponding to this Property
+	 * @return POJOClass for Property
+	 */
+	// TODO We haven't taken into account Array?
+	public POJOClass getComponentPOJO(Property property) {
+		if (property.getValue() instanceof Component comp) {
+			return new ComponentPOJOClass(comp, new Cfg2JavaTool());
+		}
+		else {
+			return null;
+		}
+	}
+
+	public List<POJOClass> getInheritanceHierarchy(POJOClass pc) {
+		if (pc.isSubclass()) {
+			List<POJOClass> superClasses = new ArrayList<>();
+			POJOClass superClass = pc.getSuperClass();
+			while (superClass != null) {
+				superClasses.add(superClass);
+				superClass = superClass.getSuperClass();
+			}
+			return superClasses;
+		}
+		else {
+			return Collections.emptyList();
+		}
+	}
+
+	public List<Property> getOrderedProperties(POJOClass pojoClass) {
+		List<Property> orderedProperties = getAllProperties(pojoClass);
+		orderedProperties.sort(PROPERTY_COMPARATOR);
+
+		return orderedProperties;
+	}
+
+	public List<Property> getSimpleProperties(POJOClass pojoClass) {
+		List<Property> properties = getAllProperties(pojoClass);
+		if (pojoClass.hasIdentifierProperty())
+			properties.remove(pojoClass.getIdentifierProperty());
+		// TODO: do we need to also remove component id properties?
+		if (pojoClass.hasVersionProperty())
+			properties.remove(pojoClass.getVersionProperty());
+		return properties;
+	}
+
+	public List<Property> getOrderedSimpleProperties(POJOClass pojoClass) {
+		List<Property> orderedProperties = getSimpleProperties(pojoClass);
+		orderedProperties.sort(PROPERTY_COMPARATOR);
+		return orderedProperties;
+	}
+
+	private List<Property> getAllProperties(POJOClass pojoClass) {
+		List<Property> properties = new ArrayList<>();
+		for (Iterator<Property> iterator = pojoClass.getAllPropertiesIterator(); iterator.hasNext();)
+			properties.add(iterator.next());
+		return properties;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/Cfg2HbmTool.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/Cfg2HbmTool.java
new file mode 100644
index 000000000000..f5c07e2db0a1
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/Cfg2HbmTool.java
@@ -0,0 +1,461 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.hbm;
+
+import org.hibernate.FetchMode;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.query.NamedHqlQueryDefinition;
+import org.hibernate.boot.query.NamedNativeQueryDefinition;
+import org.hibernate.cfg.Environment;
+import org.hibernate.engine.OptimisticLockStyle;
+import org.hibernate.engine.spi.FilterDefinition;
+import org.hibernate.mapping.Any;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.Formula;
+import org.hibernate.mapping.JoinedSubclass;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.PersistentClassVisitor;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Selectable;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.SingleTableSubclass;
+import org.hibernate.mapping.Subclass;
+import org.hibernate.mapping.UnionSubclass;
+import org.hibernate.mapping.Value;
+import org.hibernate.persister.entity.JoinedSubclassEntityPersister;
+import org.hibernate.persister.entity.SingleTableEntityPersister;
+import org.hibernate.persister.entity.UnionSubclassEntityPersister;
+import org.hibernate.persister.spi.PersisterClassResolver;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.reveng.internal.export.common.EntityNameFromValueVisitor;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedValue;
+import org.hibernate.tool.reveng.internal.util.SkipBackRefPropertyIterator;
+import org.hibernate.tool.reveng.internal.util.ValueUtil;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.Set;
+import java.util.function.Consumer;
+
+/**
+ * @author David Channon and Max
+ */
+public class Cfg2HbmTool {
+
+	private static final class HasEntityPersisterVisitor implements PersistentClassVisitor {
+		private final String name;
+
+		private HasEntityPersisterVisitor(String name) {
+			this.name = name;
+		}
+
+		public Object accept(Subclass subclass) {
+			return bool(!SingleTableEntityPersister.class.getName().equals(name));
+		}
+
+		private Object bool(boolean b) {
+			return b;
+		}
+
+		public Object accept(JoinedSubclass subclass) {
+			return bool(!JoinedSubclassEntityPersister.class.getName().equals(name));
+		}
+
+		public Object accept(SingleTableSubclass subclass) {
+			return bool(!SingleTableEntityPersister.class.getName().equals(name));
+		}
+
+		public Object accept(UnionSubclass subclass) {
+			return bool(!UnionSubclassEntityPersister.class.getName().equals(name));
+		}
+
+		public Object accept(RootClass class1) {
+			return bool(!SingleTableEntityPersister.class.getName().equals(name));
+		}
+	}
+
+	/**
+	 * Remove any internal keys from the set, eg, any Keys that are prefixed by
+	 * 'target_' and return the filtered collection.
+	 */
+	public static Properties getFilteredIdentifierGeneratorProperties(Properties properties, Properties environmentProperties) {
+		if (properties != null){
+			Properties fProp = new Properties();
+			for (Object o : properties.keySet()) {
+				String key = (String) o;
+				if ("schema".equals(key)) {
+					String schema = properties.getProperty(key);
+					if (!isDefaultSchema(schema, environmentProperties)) {
+						fProp.put(key, schema);
+					}
+				}
+				else if ("catalog".equals(key)) {
+					String catalog = properties.getProperty(key);
+					if (!isDefaultCatalog(catalog, environmentProperties)) {
+						fProp.put(key, catalog);
+					}
+				}
+				else if (!key.startsWith("target_")) {
+					fProp.put(key, properties.get(key));
+				}
+			}
+			return fProp;
+		}
+		return null;
+	}
+
+	static private boolean isDefaultSchema(String schema, Properties properties) {
+		String defaultSchema = properties.getProperty(Environment.DEFAULT_SCHEMA);
+		return Objects.equals( defaultSchema, schema );
+	}
+
+	static private boolean isDefaultCatalog(String catalog, Properties properties) {
+		String defaultCatalog = properties.getProperty(Environment.DEFAULT_CATALOG);
+		return Objects.equals( defaultCatalog, catalog );
+	}
+
+	public String getTag(PersistentClass pc) {
+		return (String) pc.accept(HBMTagForPersistentClassVisitor.INSTANCE);
+	}
+
+	public String getTag(Property property) {
+		PersistentClass persistentClass = property.getPersistentClass();
+		if(persistentClass!=null) {
+			if(persistentClass.getVersion()==property) {
+				String typeName = ((SimpleValue)property.getValue()).getTypeName();
+				if("timestamp".equals(typeName) || "dbtimestamp".equals(typeName)) {
+					return "timestamp";
+				}
+				else {
+					return "version";
+				}
+			}
+		}
+		String toolTag = (String) property.getValue().accept(HBMTagForValueVisitor.INSTANCE);
+		if ("component".equals(toolTag) && "embedded".equals(property.getPropertyAccessorName())){
+			toolTag = "properties";
+		}
+		return toolTag;
+	}
+
+	public String getCollectionElementTag(Property property){
+		Value value = property.getValue();
+		if (isOneToMany(value)) return "one-to-many";
+		if (isManyToMany(value)) return "many-to-many";
+		if (isManyToAny(value)) return "many-to-any";
+		if (((Collection)value).getElement() instanceof Component){
+			return "composite";
+		}
+		return "element";
+	}
+
+
+	public boolean isUnsavedValue(Property property) {
+		SimpleValue sv = (SimpleValue) property.getValue();
+		return (sv.getNullValue() != null) && !"undefined".equals(sv.getNullValue());
+	}
+
+	public String getUnsavedValue(Property property) {
+		return ( (SimpleValue) property.getValue() ).getNullValue();
+	}
+
+	public boolean isIdentifierGeneratorProperties(Property property) {
+		Properties val = this.getIdentifierGeneratorProperties(property);
+		return val != null;
+	}
+
+	public Properties getIdentifierGeneratorProperties(Property property) {
+		Properties result = null;
+		SimpleValue simpleValue = (SimpleValue)property.getValue();
+		if (simpleValue instanceof EnhancedValue) {
+			Properties idGenParams = ((EnhancedValue)simpleValue).getIdentifierGeneratorProperties();
+			if (idGenParams != null) {
+				result = new Properties();
+				result.putAll(idGenParams);
+			}
+		}
+		else {
+			Map<String, Object> properties = new ValueUtil(simpleValue).getIdentifierGeneratorParameters();
+			if (properties != null) {
+				result = new Properties();
+				result.putAll(properties);
+			}
+		}
+		return result;
+	}
+
+	public Set<?> getFilteredIdentifierGeneratorKeySet(Property property, Properties props) {
+		return getFilteredIdentifierGeneratorProperties(this.getIdentifierGeneratorProperties(property), props).keySet();
+	}
+
+	public boolean isOneToMany(Property property) {
+		return isOneToMany(property.getValue());
+	}
+
+	public boolean isOneToMany(Value value) {
+		if(value instanceof Collection) {
+			return ( (Collection)value ).isOneToMany();
+		}
+		else
+			return value instanceof OneToMany;
+	}
+
+	public boolean isManyToMany(Property property) {
+		return isManyToMany(property.getValue());
+	}
+
+	public boolean isManyToMany(Value value) {
+		return	(value instanceof Collection &&
+				((Collection)value).getElement() instanceof ManyToOne);
+	}
+
+
+	public boolean isCollection(Property property) {
+		return property.getValue() instanceof Collection;
+	}
+
+	public boolean isOneToManyCollection(Property property) {
+		return isCollection(property) && ((Collection)property.getValue()).isOneToMany();
+	}
+
+	public boolean isSimpleValue(Property property) {
+		return (property.getValue() instanceof SimpleValue);
+	}
+
+	public boolean isManyToOne(Property property) {
+		return isManyToOne(property.getValue());
+	}
+
+	public boolean isManyToAny(Property property) {
+		return isManyToAny(property.getValue());
+	}
+
+	public boolean isManyToAny(Value value) {
+		return (value instanceof Collection &&
+				((Collection)value).getElement() instanceof Any);
+	}
+
+	public boolean isManyToOne(Value value) {
+		return (value instanceof ManyToOne);
+	}
+
+	public boolean isOneToOne(Property property) {
+		return (property.getValue() instanceof OneToOne);
+	}
+
+	public boolean isTemporalValue(Property property) {
+		if(property.getValue() instanceof SimpleValue) {
+			String typeName = ((SimpleValue)property.getValue()).getTypeName();
+			if("date".equals(typeName) || "java.sql.Date".equals(typeName)) {
+				return true;
+			}
+			else if ("timestamp".equals(typeName) || "java.sql.Timestamp".equals(typeName)) {
+				return true;
+			}
+			else return "time".equals(typeName) || "java.sql.Time".equals(typeName);
+		}
+		return false;
+	}
+
+	public boolean isNamedQueries(Metadata md) {
+		final ArrayList<NamedHqlQueryDefinition<?>> list = new ArrayList<>();
+		Consumer<NamedHqlQueryDefinition<?>> consumer = list::add;
+		md.visitNamedHqlQueryDefinitions(consumer);
+		return !list.isEmpty();
+	}
+
+	public boolean isNamedSQLQueries(Metadata md) {
+		final ArrayList<NamedNativeQueryDefinition<?>> list = new ArrayList<>();
+		Consumer<NamedNativeQueryDefinition<?>> consumer = list::add;
+		md.visitNamedNativeQueryDefinitions(consumer);
+		return !list.isEmpty();
+	}
+
+
+	public String getCollectionLazy(Collection value){
+		return value.isExtraLazy() ? "extra" : Boolean.toString(value.isLazy());
+	}
+
+	public boolean isFilterDefinitions(Metadata md) {
+		Map<String, FilterDefinition> filterdefs = md.getFilterDefinitions();
+		return filterdefs != null && !filterdefs.isEmpty();
+	}
+
+	public boolean isClassLevelOptimisticLockMode(PersistentClass pc) {
+		return pc.getOptimisticLockStyle() != OptimisticLockStyle.VERSION;
+	}
+
+	public String getClassLevelOptimisticLockMode(PersistentClass pc) {
+		OptimisticLockStyle oMode = pc.getOptimisticLockStyle();
+		if ( oMode == OptimisticLockStyle.DIRTY ) {
+			return "dirty";
+		}
+		else if ( oMode == OptimisticLockStyle.ALL ) {
+			return "all";
+		}
+		else if ( oMode == OptimisticLockStyle.NONE ) {
+			return "none";
+		}
+		else {
+			return "version";
+		}
+	}
+
+	public boolean hasFetchMode(Property property) {
+		String fetch = getFetchMode(property);
+		return fetch != null && !"default".equals(fetch);
+	}
+	public String getFetchMode(Property property) {
+		FetchMode fetchMode = property.getValue().getFetchMode();
+		return (fetchMode== null) ? null : fetchMode.toString().toLowerCase();
+	}
+
+
+	public Formula getFormulaForProperty(Property prop) {
+		for (Selectable selectable : prop.getValue().getSelectables()) {
+			if (selectable instanceof Formula)
+				return (Formula) selectable;
+		}
+		return null;
+	}
+
+	public String columnAttributes(Column col) {
+		return columnAttributes(col, false);
+	}
+
+	public String columnAttributes(Column column, boolean isPrimaryKeyColumn) {
+		StringBuilder sb = new StringBuilder();
+		if (column.getPrecision() != null) {
+			sb.append("precision=\"").append(column.getPrecision() ).append("\" ");
+		}
+		if (column.getScale() != null) {
+			sb.append("scale=\"").append(column.getScale() ).append("\" ");
+		}
+		else if (column.getLength() != null){
+			sb.append("length=\"").append(column.getLength() ).append("\" ");
+		}
+		if (!isPrimaryKeyColumn) {
+			if (!column.isNullable() ) {
+				sb.append("not-null=\"true\" ");
+			}
+			if (column.isUnique() ) {
+				sb.append("unique=\"true\" ");
+			}
+		}
+		if (column.getSqlType() != null) {
+			sb.append("sql-type=\""); sb.append(column.getSqlType() ); sb.append("\" ");
+		}
+		return sb.toString();
+	}
+
+	public String getClassName(PersistentClass pc) {
+		if (pc.hasPojoRepresentation() ) {
+			return pc.getClassName();
+		}
+		else {
+			// todo: return null?
+			throw new RuntimeException(pc + " does not have a pojo rep.");
+		}
+	}
+
+	public String getClassName(OneToMany om) {
+		return om.getAssociatedClass().getClassName();
+	}
+
+	public String getProxyInterfaceName(PersistentClass pc) {
+		if (pc.hasPojoRepresentation() ) {
+			return pc.getProxyInterfaceName();
+		}
+		else {
+			throw new RuntimeException(pc + " does not have a pojo rep.");
+		}
+	}
+
+	public boolean isImportData(Metadata md) {
+		return !(md.getImports().isEmpty());
+	}
+
+	public boolean needsDiscriminatorElement(PersistentClass clazz) {
+		return clazz instanceof RootClass
+			&& (clazz.getDiscriminator() != null);
+	}
+
+	public boolean needsDiscriminator(PersistentClass clazz) {
+
+		return clazz instanceof Subclass
+			&& !(clazz instanceof UnionSubclass) && !(clazz instanceof JoinedSubclass);
+	}
+
+
+	public boolean needsTable(PersistentClass clazz) {
+
+		return (Boolean) clazz.accept(new PersistentClassVisitor(){
+
+			public Object accept(Subclass subclass) {
+				return Boolean.FALSE;
+			}
+
+			public Object accept(JoinedSubclass subclass) {
+				return Boolean.TRUE;
+			}
+
+			public Object accept(SingleTableSubclass subclass) {
+				return Boolean.FALSE;
+			}
+
+			public Object accept(UnionSubclass subclass) {
+				return Boolean.TRUE;
+			}
+
+			public Object accept(RootClass class1) {
+				return Boolean.TRUE;
+			}
+		});
+	}
+
+	public boolean isSubclass(PersistentClass clazz) {
+		return clazz instanceof org.hibernate.mapping.Subclass;
+	}
+
+	public boolean isJoinedSubclass(PersistentClass clazz) {
+		return clazz instanceof JoinedSubclass;
+	}
+
+	public boolean hasCustomEntityPersister(PersistentClass clazz) {
+		ServiceRegistry sr = clazz.getServiceRegistry();
+		PersisterClassResolver pcr = sr.getService(PersisterClassResolver.class);
+		if (pcr == null) return false;
+		Class<?> entityPersisterClass = pcr.getEntityPersisterClass(clazz);
+		if(entityPersisterClass==null) return false;
+		final String name = entityPersisterClass.getName();
+		return (Boolean) clazz.accept(new HasEntityPersisterVisitor(name));
+	}
+
+	public String getHibernateTypeName(Property p) {
+		return (String) p.getValue().accept(new EntityNameFromValueVisitor());
+	}
+
+
+	public String getSafeHibernateTypeName(Property p) {
+		return (String) p.getValue().accept(new EntityNameFromValueVisitor(false));
+	}
+
+	public Iterator<?> getProperties(Component v) {
+		return new SkipBackRefPropertyIterator(v.getProperties().iterator());
+	}
+
+	public Iterator<?> getProperties(PersistentClass pc) {
+		return new SkipBackRefPropertyIterator(pc.getProperties().iterator());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HBMTagForPersistentClassVisitor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HBMTagForPersistentClassVisitor.java
new file mode 100644
index 000000000000..0bb35385dfbc
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HBMTagForPersistentClassVisitor.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.hbm;
+
+import org.hibernate.mapping.JoinedSubclass;
+import org.hibernate.mapping.PersistentClassVisitor;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.SingleTableSubclass;
+import org.hibernate.mapping.Subclass;
+import org.hibernate.mapping.UnionSubclass;
+
+/**
+ * @author max
+ *
+ */
+public class HBMTagForPersistentClassVisitor implements PersistentClassVisitor {
+
+	public static final PersistentClassVisitor INSTANCE = new HBMTagForPersistentClassVisitor();
+
+	protected HBMTagForPersistentClassVisitor() {
+
+	}
+
+	public Object accept(RootClass class1) {
+		return "class";
+	}
+
+	public Object accept(UnionSubclass subclass) {
+		return "union-subclass";
+	}
+
+	public Object accept(SingleTableSubclass subclass) {
+		return "subclass";
+	}
+
+	public Object accept(JoinedSubclass subclass) {
+		return "joined-subclass";
+	}
+
+	public Object accept(Subclass subclass) {
+		return "subclass";
+	}
+
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HBMTagForValueVisitor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HBMTagForValueVisitor.java
new file mode 100644
index 000000000000..d3248088ea6f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HBMTagForValueVisitor.java
@@ -0,0 +1,91 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.hbm;
+
+import org.hibernate.mapping.Any;
+import org.hibernate.mapping.Array;
+import org.hibernate.mapping.Bag;
+import org.hibernate.mapping.BasicValue;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.DependantValue;
+import org.hibernate.mapping.IdentifierBag;
+import org.hibernate.mapping.List;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.Map;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PrimitiveArray;
+import org.hibernate.mapping.Set;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.tool.reveng.internal.export.common.DefaultValueVisitor;
+
+public class HBMTagForValueVisitor extends DefaultValueVisitor {
+
+	public static final HBMTagForValueVisitor INSTANCE = new HBMTagForValueVisitor();
+
+	protected HBMTagForValueVisitor() {
+		super(true);
+	}
+
+	public Object accept(Bag bag) {
+		return "bag";
+	}
+
+	public Object accept(IdentifierBag bag) {
+		return "idbag";
+	}
+
+	public Object accept(List list) {
+		return "list";
+	}
+
+	public Object accept(Map map) {
+		return "map";
+	}
+
+	public Object accept(OneToMany many) {
+		return "one-to-many";
+	}
+
+	public Object accept(Set set) {
+		return "set";
+	}
+
+	public Object accept(Any any) {
+		return "any";
+	}
+
+	public Object accept(SimpleValue value) {
+		return "property";
+	}
+
+	public Object accept(BasicValue value) {
+		return "property";
+	}
+
+	public Object accept(PrimitiveArray primitiveArray) {
+		return "primitive-array";
+	}
+
+	public Object accept(Array list) {
+		return "array";
+	}
+
+	public Object accept(DependantValue value) {
+		throw new IllegalArgumentException("No tag for " + value);
+	}
+
+	public Object accept(Component component) {
+		return component.isDynamic()?"dynamic-component":"component";
+	}
+
+	public Object accept(ManyToOne mto) {
+		return "many-to-one";
+	}
+
+	public Object accept(OneToOne oto) {
+		return "one-to-one";
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HbmExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HbmExporter.java
new file mode 100644
index 000000000000..f928079318fd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HbmExporter.java
@@ -0,0 +1,76 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.hbm;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.tool.reveng.internal.export.common.GenericExporter;
+import org.hibernate.tool.reveng.internal.export.common.TemplateProducer;
+import org.hibernate.tool.reveng.internal.export.java.POJOClass;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author david and max
+ */
+public class HbmExporter extends GenericExporter {
+
+	protected HibernateMappingGlobalSettings globalSettings = new HibernateMappingGlobalSettings();
+
+	protected void setupContext() {
+		super.setupContext();
+		getTemplateHelper().putInContext("hmgs", globalSettings);
+	}
+
+	public void setGlobalSettings(HibernateMappingGlobalSettings hgs) {
+		this.globalSettings = hgs;
+	}
+
+	public void doStart() {
+		exportGeneralSettings();
+		super.doStart();
+	}
+
+	private void exportGeneralSettings() {
+		Cfg2HbmTool c2h = getCfg2HbmTool();
+		Metadata md = getMetadata();
+		if( c2h.isImportData(md) &&
+				(c2h.isNamedQueries(md)) &&
+				(c2h.isNamedSQLQueries(md)) &&
+				(c2h.isFilterDefinitions(md))) {
+			TemplateProducer producer = new TemplateProducer(getTemplateHelper(),getArtifactCollector());
+			producer.produce(new HashMap<String, Object>(), "hbm/generalhbm.hbm.ftl", new File(getOutputDirectory(),"GeneralHbmSettings.hbm.xml"), getTemplateName(), "General Settings");
+		}
+	}
+
+	protected void init() {
+		getProperties().put(TEMPLATE_NAME, "hbm/hibernate-mapping.hbm.ftl");
+		getProperties().put(FILE_PATTERN, "{package-name}/{class-name}.hbm.xml");
+	}
+
+	public HbmExporter() {
+		init();
+	}
+
+	protected String getClassNameForFile(POJOClass element) {
+		return StringHelper.unqualify(((PersistentClass)element.getDecoratedObject()).getEntityName());
+	}
+
+	protected String getPackageNameForFile(POJOClass element) {
+		return StringHelper.qualifier(((PersistentClass)element.getDecoratedObject()).getClassName());
+	}
+
+
+	protected void exportComponent(Map<String, Object> additionalContext, POJOClass element) {
+		// we don't want component's exported.
+	}
+
+	public String getName() {
+		return "hbm2hbmxml";
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HibernateMappingGlobalSettings.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HibernateMappingGlobalSettings.java
new file mode 100644
index 000000000000..a4afd3f9cfdf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/hbm/HibernateMappingGlobalSettings.java
@@ -0,0 +1,150 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.hbm;
+
+import org.hibernate.internal.util.StringHelper;
+
+/**
+ * This class replicates the global settings that can be selected
+ * within the mapping document. This is provided to allow a GUI
+ * too to choose these settings and thus the generated mapping
+ * document will include them.
+ *
+ * @author David Channon
+ */
+public class HibernateMappingGlobalSettings {
+
+	private String schemaName;
+	private String catalogName;
+	private String defaultCascade;
+	private String defaultPackage;
+	private String defaultAccess;
+	private boolean autoImport  = true;
+	private boolean defaultLazy = true;
+
+	/**
+	 */
+	public HibernateMappingGlobalSettings() {
+	}
+
+	public boolean hasNonDefaultSettings() {
+		return 	 this.hasDefaultPackage()	||
+				this.hasSchemaName() 		||
+				this.hasCatalogName()		||
+				this.hasNonDefaultCascade()||
+				this.hasNonDefaultAccess()	||
+				!this.isDefaultLazy()		||
+				!this.isAutoImport()
+		;
+	}
+
+	public boolean hasDefaultPackage() {
+		return !StringHelper.isEmpty(defaultPackage);
+	}
+
+	public boolean hasSchemaName() {
+		return !StringHelper.isEmpty(schemaName);
+	}
+
+	public boolean hasCatalogName() {
+		return !StringHelper.isEmpty(catalogName);
+	}
+
+	public boolean hasNonDefaultCascade() {
+		return !StringHelper.isEmpty(defaultCascade) ? !"none".equals(defaultCascade) ? true : false : false;
+	}
+
+	public boolean hasNonDefaultAccess() {
+		return !StringHelper.isEmpty(defaultAccess) ? !"property".equals(defaultAccess) ? true : false : false;
+	}
+
+	public String getSchemaName() {
+		return schemaName;
+	}
+
+	public String getCatalogName() {
+		return catalogName;
+	}
+
+	public String getDefaultCascade() {
+		return defaultCascade;
+	}
+
+	public String getDefaultAccess() {
+		return defaultAccess;
+	}
+
+	public String getDefaultPackage() {
+		return defaultPackage;
+	}
+
+	public boolean isDefaultLazy() {
+		return defaultLazy;
+	}
+
+	/**
+	 * Returns the autoImport.
+	 * @return boolean
+	 */
+	public boolean isAutoImport() {
+		return autoImport;
+	}
+
+	/**
+	 * Sets the schemaName.
+	 * @param schemaName The schemaName to set
+	 */
+	public void setSchemaName(String schemaName) {
+		this.schemaName = schemaName;
+	}
+
+	/**
+	 * Sets the catalogName.
+	 * @param catalogName The catalogName to set
+	 */
+	public void setCatalogName(String catalogName) {
+		this.catalogName = catalogName;
+	}
+
+	/**
+	 * Sets the defaultCascade.
+	 * @param defaultCascade The defaultCascade to set
+	 */
+	public void setDefaultCascade(String defaultCascade) {
+		this.defaultCascade = defaultCascade;
+	}
+
+	/**
+	 * sets the default access strategy
+	 * @param defaultAccess the default access strategy.
+	 */
+	public void setDefaultAccess(String defaultAccess) {
+		this.defaultAccess = defaultAccess;
+	}
+
+	/**
+	 * @param defaultPackage The defaultPackage to set.
+	 */
+	public void setDefaultPackage(String defaultPackage) {
+		this.defaultPackage = defaultPackage;
+	}
+
+	/**
+	 * Sets the autoImport.
+	 * @param autoImport The autoImport to set
+	 */
+	public void setAutoImport(boolean autoImport) {
+		this.autoImport = autoImport;
+	}
+
+	/**
+	 * Sets the defaultLazy.
+	 * @param defaultLazy The defaultLazy to set
+	 */
+	public void setDefaultLazy(boolean defaultLazy) {
+		this.defaultLazy = defaultLazy;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/BasicPOJOClass.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/BasicPOJOClass.java
new file mode 100644
index 000000000000..34e5d91837d2
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/BasicPOJOClass.java
@@ -0,0 +1,994 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Array;
+import org.hibernate.mapping.Bag;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.IdentifierBag;
+import org.hibernate.mapping.MetaAttributable;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.PrimitiveArray;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Selectable;
+import org.hibernate.mapping.Set;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.tool.reveng.internal.export.common.DefaultValueVisitor;
+import org.hibernate.tool.reveng.internal.util.NameConverter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import static org.hibernate.tool.reveng.internal.export.java.MetaAttributeConstants.CLASS_DESCRIPTION;
+import static org.hibernate.tool.reveng.internal.export.java.MetaAttributeConstants.SCOPE_CLASS;
+import static org.hibernate.tool.reveng.internal.export.java.MetaAttributeConstants.CLASS_MODIFIER;
+import static org.hibernate.tool.reveng.internal.export.java.MetaAttributeConstants.INTERFACE;
+
+/**
+ * Abstract implementation of POJOClass. To be extended by ComponentPOJO and EntityPOJO
+ * @author max
+ * @author <a href="mailto:abhayani@jboss.org">Amit Bhayani</a>
+ *
+ */
+abstract public class BasicPOJOClass implements POJOClass {
+
+	protected ImportContext importContext;
+	protected MetaAttributable meta;
+	protected final Cfg2JavaTool c2j;
+
+	public BasicPOJOClass(MetaAttributable ma, Cfg2JavaTool c2j) {
+		this.meta = ma;
+		this.c2j = c2j;
+
+		if(this.meta==null) {
+			throw new IllegalArgumentException("class Argument must be not null");
+		}
+		if(this.c2j==null) throw new IllegalArgumentException("c2j must be not null");
+	}
+
+	// called by subclasses
+	protected void init() {
+		importContext = new ImportContextImpl(getPackageName());
+
+		MetaAttribute metaAttribute = meta.getMetaAttribute("extra-import");
+		if(metaAttribute!=null) {
+			for (String element : metaAttribute.getValues()) {
+				importContext.importType(element);
+			}
+		}
+	}
+
+	protected String getPackageDeclaration(String pkgName) {
+		if (pkgName!=null && !pkgName.trim().isEmpty()) {
+			return "package " + pkgName + ";";
+		}
+		else {
+			return "// default package";
+		}
+	}
+
+	public String getPackageDeclaration() {
+		String pkgName = getPackageName();
+		return getPackageDeclaration(pkgName);
+	}
+
+	/** Return package name. Note: Does not handle inner classes */
+	public String getPackageName() {
+		String generatedClass = getGeneratedClassName();
+		return StringHelper.qualifier(generatedClass.trim());
+	}
+
+	public String getShortName() {
+		return qualifyInnerClass(StringHelper.unqualify(getMappedClassName()));
+	}
+
+	public String getQualifiedDeclarationName() {
+		String generatedName = qualifyInnerClass(getGeneratedClassName());
+		String qualifier = StringHelper.qualifier( getMappedClassName() );
+		if (!qualifier.isEmpty()) {
+			return qualifier + "." + generatedName;
+		}
+		else {
+			return generatedName;
+		}
+	}
+
+	/**
+	 * @return unqualified classname for this class (can be changed by meta attribute "generated-class")
+	 */
+	public String getDeclarationName() {
+		return qualifyInnerClass(StringHelper.unqualify( getGeneratedClassName() ));
+	}
+
+	protected String getGeneratedClassName()
+	{
+		String generatedClass = getMetaAsString(MetaAttributeConstants.GENERATED_CLASS).trim();
+		if(StringHelper.isEmpty(generatedClass) ) {
+			generatedClass = getMappedClassName();
+		}
+		// will occur for <dynamic-component>
+		return Objects.requireNonNullElse(generatedClass, "");
+	}
+
+	protected String qualifyInnerClass(String className)
+	{
+		return className.replace('$', '.');
+	}
+
+	protected abstract String getMappedClassName();
+
+	public String getMetaAsString(String attribute) {
+		MetaAttribute c = meta.getMetaAttribute( attribute );
+		return MetaAttributeHelper.getMetaAsString( c );
+	}
+
+	public boolean hasMetaAttribute(String attribute) {
+		return meta.getMetaAttribute( attribute ) != null;
+	}
+
+	public String getMetaAsString(String attribute, String seperator) {
+		return MetaAttributeHelper.getMetaAsString( meta.getMetaAttribute( attribute ), seperator );
+	}
+
+	public boolean getMetaAsBool(String attribute) {
+		return getMetaAsBool( attribute, false );
+	}
+
+	public boolean getMetaAsBool(String attribute, boolean defaultValue) {
+		return MetaAttributeHelper.getMetaAsBool( meta.getMetaAttribute( attribute ), defaultValue );
+	}
+
+	public String getClassJavaDoc(String fallback, int indent) {
+		MetaAttribute c = meta.getMetaAttribute( CLASS_DESCRIPTION );
+		if ( c == null ) {
+			return c2j.toJavaDoc( fallback, indent );
+		}
+		else {
+			return c2j.toJavaDoc( getMetaAsString( CLASS_DESCRIPTION ), indent );
+		}
+	}
+
+	public String getClassModifiers() {
+		String classModifiers = null;
+
+		// Get scope (backwards compatibility)
+		if ( meta.getMetaAttribute( SCOPE_CLASS ) != null ) {
+			classModifiers = getMetaAsString( SCOPE_CLASS ).trim();
+		}
+
+		// Get modifiers
+		if ( meta.getMetaAttribute( CLASS_MODIFIER ) != null ) {
+			classModifiers = getMetaAsString( CLASS_MODIFIER ).trim();
+		}
+		return classModifiers == null ? "public" : classModifiers;
+	}
+
+	public String getDeclarationType() {
+		boolean isInterface = isInterface();
+		if ( isInterface ) {
+			return INTERFACE;
+		}
+		else {
+			return "class";
+		}
+	}
+
+	public boolean isInterface() {
+		return getMetaAsBool( INTERFACE );
+	}
+
+	public String getExtendsDeclaration() {
+		String extendz = getExtends();
+		if ( extendz == null || extendz.trim().isEmpty()) {
+			return "";
+		}
+		else {
+			return "extends " + extendz;
+		}
+	}
+
+	public String getImplementsDeclaration() {
+		String implementz = getImplements();
+		if ( implementz == null || implementz.trim().isEmpty()) {
+			return "";
+		}
+		else {
+			return "implements " + implementz;
+		}
+	}
+
+	public String generateEquals(String thisName, String otherName, boolean useGenerics) {
+		Iterator<Property> allPropertiesIterator = getEqualsHashCodePropertiesIterator();
+		return generateEquals( thisName, otherName, allPropertiesIterator, useGenerics );
+	}
+
+	/** returns the properties that would be visible on this entity as a pojo. This does not return *all* properties since hibernate has certain properties that are only relevant in context of persistence. */
+	public abstract Iterator<Property> getAllPropertiesIterator();
+
+	protected String generateEquals(String thisName, String otherName, Iterator<Property> allPropertiesIterator, boolean useGenerics) {
+		StringBuilder buf = new StringBuilder();
+		while ( allPropertiesIterator.hasNext() ) {
+			Property property = allPropertiesIterator.next();
+			if (!buf.isEmpty()) buf.append( "\n && " );
+			String javaTypeName = c2j.getJavaTypeName( property, useGenerics, this );
+			buf.append(
+					internalgenerateEquals(
+							javaTypeName, thisName + "." + getGetterSignature( property ) + "()",
+							otherName + "." + getGetterSignature( property ) + "()")
+			);
+		}
+
+		if (buf.isEmpty()) {
+			return "false";
+		}
+		else {
+			return buf.toString();
+		}
+	}
+
+	private boolean usePropertyInEquals(Property property) {
+		boolean hasEqualsMetaAttribute = c2j.hasMetaAttribute(property, "use-in-equals");
+		boolean useInEquals = c2j.getMetaAsBool( property, "use-in-equals" );
+
+		if(property.isNaturalIdentifier()) {
+			return !hasEqualsMetaAttribute || useInEquals;
+		}
+
+		return useInEquals;
+	}
+
+	private boolean useCompareTo(String javaTypeName) {
+		// Fix for HBX-400
+		return "java.math.BigDecimal".equals(javaTypeName);
+	}
+
+
+	private String internalgenerateEquals(String typeName, String lh, String rh) {
+		if ( c2j.isPrimitive( typeName ) ) {
+			return "(" + lh + "==" + rh + ")";
+		}
+		else {
+			if(useCompareTo( typeName )) {
+				return "( (" + lh + "==" + rh + ") || ( " + lh + "!=null && " + rh + "!=null && " + lh + ".compareTo(" + rh + ")==0 ) )";
+			}
+			else {
+				if(typeName.endsWith("[]")) {
+					return "( (" + lh + "==" + rh + ") || ( " + lh + "!=null && " + rh + "!=null && " + importType("java.util.Arrays") + ".equals(" + lh + ", " + rh + ") ) )";
+				}
+				else {
+					return "( (" + lh + "==" + rh + ") || ( " + lh + "!=null && " + rh + "!=null && " + lh + ".equals(" + rh + ") ) )";
+				}
+			}
+
+		}
+	}
+
+	public String getExtraClassCode() {
+		return getMetaAsString( "class-code", "\n" );
+	}
+
+	private boolean needsEqualsHashCode(Iterator<?> iter) {
+		while ( iter.hasNext() ) {
+			Property element = (Property) iter.next();
+			if ( usePropertyInEquals( element ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public boolean needsEqualsHashCode() {
+		Iterator<Property> iter = getAllPropertiesIterator();
+		return needsEqualsHashCode( iter );
+	}
+
+	public abstract String getExtends();
+
+	public abstract String getImplements();
+
+
+	public String importType(String fqcn) {
+		return importContext.importType(fqcn);
+	}
+
+	public String generateImports() {
+		return importContext.generateImports();
+	}
+
+	public String staticImport(String fqcn, String member) {
+		return importContext.staticImport(fqcn, member);
+	}
+
+	public String generateBasicAnnotation(Property property) {
+		StringBuffer annotations = new StringBuffer( "    " );
+		if(property.getValue() instanceof SimpleValue) {
+			if (hasVersionProperty())
+				if (property.equals(getVersionProperty()))
+					buildVersionAnnotation(annotations);
+			String typeName = ((SimpleValue)property.getValue()).getTypeName();
+			if("date".equals(typeName) || "java.sql.Date".equals(typeName)) {
+				buildTemporalAnnotation( annotations, "DATE" );
+			}
+			else if ("timestamp".equals(typeName) || "java.sql.Timestamp".equals(typeName)) {
+				buildTemporalAnnotation( annotations, "TIMESTAMP" );
+			}
+			else if ("time".equals(typeName) || "java.sql.Time".equals(typeName)) {
+				buildTemporalAnnotation(annotations, "TIME");
+			} //TODO: calendar etc. ?
+
+
+		}
+
+		return annotations.toString();
+	}
+
+	private void buildTemporalAnnotation(StringBuffer annotations, String temporalTypeValue) {
+		annotations
+				.append("@")
+				.append(importType("jakarta.persistence.Temporal"))
+				.append("(")
+				.append(importType("jakarta.persistence.TemporalType"))
+				.append(".")
+				.append(temporalTypeValue)
+				.append(")");
+	}
+
+	private void buildVersionAnnotation(StringBuffer annotations) {
+		annotations
+				.append("@")
+				.append(importType("jakarta.persistence.Version"));
+	}
+
+	public String generateAnnColumnAnnotation(Property property) {
+		StringBuffer annotations = new StringBuffer( "    " );
+		boolean insertable = property.isInsertable();
+		boolean updatable = property.isUpdatable();
+		if ( property.isComposite() ) {
+			annotations.append("@").append(importType("jakarta.persistence.AttributeOverrides")).append("( {");
+			Component component = (Component) property.getValue();
+			Iterator<?> subElements = component.getProperties().iterator();
+			buildRecursiveAttributeOverride( subElements, null, annotations );
+			annotations.setLength( annotations.length() - 2 );
+			annotations.append( " } )" );
+		}
+		else {
+			if ( property.getColumnSpan() == 1 ) {
+				Selectable selectable = property.getColumns().get(0);
+				buildColumnAnnotation( selectable, annotations, insertable, updatable );
+			}
+			else {
+				annotations.append("@").append( importType("org.hibernate.annotations.Columns") ).append("( { " );
+				for (Selectable selectable : property.getColumns()) {
+					//TODO formula in multicolumns not supported by annotations
+					if ( !selectable.isFormula() ) {
+						annotations.append( "\n        " );
+						buildColumnAnnotation( selectable, annotations, insertable, updatable );
+						annotations.append( ", " );
+					}
+				}
+				annotations.setLength( annotations.length() - 2 );
+				annotations.append( " } )" );
+			}
+		}
+		return annotations.toString();
+	}
+
+	private void buildRecursiveAttributeOverride(Iterator<?> subElements, String path, StringBuffer annotations) {
+		while ( subElements.hasNext() ) {
+			Property subProperty = (Property) subElements.next();
+			if ( subProperty.isComposite() ) {
+				if ( path != null ) {
+					path = path + ".";
+				}
+				else {
+					path = "";
+				}
+				path = path + subProperty.getName();
+				Component component = (Component) subProperty.getValue();
+				buildRecursiveAttributeOverride( component.getProperties().iterator(), path, annotations );
+			}
+			else {
+				Selectable selectable = subProperty.getColumns().get(0);
+				//TODO formula in multicolumns not supported by annotations
+				if ( !selectable.isFormula() ) {
+					annotations.append( "\n        " ).append("@")
+							.append( importType("jakarta.persistence.AttributeOverride") ).append("(name=\"" );
+					if ( path != null ) {
+						annotations.append( path ).append( "." );
+					}
+					annotations.append( subProperty.getName() ).append( "\"" )
+							.append( ", column=" );
+					buildColumnAnnotation(
+							selectable, annotations, subProperty.isInsertable(), subProperty.isUpdatable()
+					);
+					annotations.append( " ), " );
+				}
+			}
+		}
+	}
+
+	private void buildColumnAnnotation(Selectable selectable, StringBuffer annotations, boolean insertable, boolean updatable) {
+		if ( selectable.isFormula() ) {
+			annotations
+					.append("@")
+					.append( importType("org.hibernate.annotations.Formula") )
+					.append("(value=\"" )
+					.append( selectable.getText() )
+					.append( "\")" );
+		}
+		else {
+			Column column = (Column) selectable;
+			annotations
+					.append("@")
+					.append(importType("jakarta.persistence.Column"))
+					.append("(name=\"")
+					.append( column.getName() )
+					.append( "\"" );
+			appendCommonColumnInfo( annotations, column, insertable, updatable );
+
+			if (column.getPrecision() != null) {
+				annotations.append( ", precision=" ).append( column.getPrecision() );
+			}
+			if (column.getScale() != null) {
+				annotations.append( ", scale=" ).append( column.getScale() );
+			}
+			else if (column.getLength() != null){
+				annotations.append( ", length=" ).append( column.getLength() );
+			}
+
+
+
+
+			//TODO support secondary table
+			annotations.append( ")" );
+		}
+	}
+
+	protected void appendCommonColumnInfo(StringBuffer annotations, Column column, boolean insertable, boolean updatable) {
+		if(column.isUnique()) {
+			annotations.append( ", unique=" ).append( column.isUnique() );
+		}
+		if(!column.isNullable()) {
+			annotations.append( ", nullable=" ).append( column.isNullable() );
+		}
+
+		if(!insertable) {
+			annotations.append( ", insertable=" ).append( "false" );
+		}
+
+		if(!updatable) {
+			annotations.append( ", updatable=" ).append( "false" );
+		}
+
+		String sqlType = column.getSqlType();
+		if ( StringHelper.isNotEmpty( sqlType ) ) {
+			annotations.append( ", columnDefinition=\"" ).append( sqlType ).append( "\"" );
+		}
+
+	}
+
+
+	public Iterator<Property> getToStringPropertiesIterator() {
+		Iterator<Property> iter = getAllPropertiesIterator();
+		return getToStringPropertiesIterator( iter );
+	}
+
+	private Iterator<Property> getToStringPropertiesIterator(Iterator<Property> iter) {
+		List<Property> properties = new ArrayList<>();
+
+		while ( iter.hasNext() ) {
+			Property element = iter.next();
+			if ( c2j.getMetaAsBool( element, "use-in-tostring" ) ) {
+				properties.add( element );
+			}
+		}
+
+		return properties.iterator();
+	}
+
+	public Iterator<Property> getEqualsHashCodePropertiesIterator() {
+		Iterator<Property> iter = getAllPropertiesIterator();
+		return getEqualsHashCodePropertiesIterator(iter);
+	}
+
+	private Iterator<Property> getEqualsHashCodePropertiesIterator(Iterator<Property> iter) {
+		List<Property> properties = new ArrayList<>();
+
+		while ( iter.hasNext() ) {
+			Property element = iter.next();
+			if ( usePropertyInEquals(element) ) {
+				properties.add( element );
+			}
+		}
+
+		return properties.iterator();
+	}
+
+	public boolean needsToString() {
+		Iterator<Property> iter = getAllPropertiesIterator();
+		return needsToString( iter );
+	}
+
+	private boolean needsToString(Iterator<Property> iter) {
+		while ( iter.hasNext() ) {
+			Property element = iter.next();
+			if ( c2j.getMetaAsBool( element, "use-in-tostring" ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public boolean hasMetaAttribute(MetaAttributable pc, String attribute) {
+		return pc.getMetaAttribute( attribute ) != null;
+	}
+
+	public boolean getMetaAttribAsBool(MetaAttributable pc, String attribute, boolean defaultValue) {
+		return MetaAttributeHelper.getMetaAsBool( pc.getMetaAttribute( attribute ), defaultValue );
+	}
+
+	public boolean hasFieldJavaDoc(Property property) {
+		return property.getMetaAttribute("field-description")!=null;
+	}
+
+	public String getFieldJavaDoc(Property property, int indent) {
+		MetaAttribute c = property.getMetaAttribute( "field-description" );
+		if ( c == null ) {
+			return c2j.toJavaDoc( "", indent );
+		}
+		else {
+			return c2j.toJavaDoc( c2j.getMetaAsString( property, "field-description" ), indent );
+		}
+	}
+
+	public String getFieldDescription(Property property){
+		MetaAttribute c = property.getMetaAttribute( "field-description" );
+		if ( c == null ) {
+			return "";
+		}
+		else {
+			return c2j.getMetaAsString( property, "field-description" );
+		}
+	}
+
+	/**
+	 * Method getGetterSignature.
+	 *
+	 * @return String
+	 */
+	public String getGetterSignature(Property p) {
+		String prefix = c2j.getJavaTypeName( p, false).equals( "boolean" ) ? "is" : "get";
+		return prefix + beanCapitalize( p.getName() );
+	}
+
+	/**
+	 * @return foo -> Foo, FOo -> FOo
+	 */
+	public String getPropertyName(Property p) {
+		return beanCapitalize( p.getName() );
+	}
+
+
+	// get the "opposite" collectionnae for a property. Currently a "hack" that just uses the same naming algorithm as in reveng, will fail on more general models!
+	public String getCollectionNameFor(Property property) {
+		String str = getPropertyName(property);
+		return NameConverter.simplePluralize(str);
+	}
+
+
+	/**
+	 * foo -> Foo
+	 * FOo -> FOo
+	 */
+	static public String beanCapitalize(String fieldname) {
+		if ( fieldname == null || fieldname.isEmpty()) {
+			return fieldname;
+		}
+
+		if ( fieldname.length() > 1 && Character.isUpperCase( fieldname.charAt( 1 ) ) ) {
+			return fieldname;
+		}
+		char[] chars = fieldname.toCharArray();
+		chars[0] = Character.toUpperCase( chars[0] );
+		return new String( chars );
+	}
+
+
+	public boolean isComponent(Property property) {
+		return property.getValue() instanceof Component;
+	}
+
+	public String generateHashCode(Property property, String result, String thisName, boolean jdk5) {
+		StringBuilder buf = new StringBuilder();
+		if ( c2j.getMetaAsBool( property, "use-in-equals" ) ) {
+			String javaTypeName = c2j.getJavaTypeName( property, jdk5, this );
+			boolean isPrimitive = c2j.isPrimitive( javaTypeName );
+			if ( isPrimitive ) {
+				buf.append( result )
+						.append( " = 37 * " )
+						.append( result )
+						.append( " + " );
+				String thisValue = thisName + "." + getGetterSignature( property ) + "()";
+				if("char".equals(javaTypeName)||"int".equals(javaTypeName)||"short".equals(javaTypeName)||"byte".equals(javaTypeName)) {
+					buf.append( thisValue );
+				}
+				else if("boolean".equals(javaTypeName)) {
+					buf.append("(").append(thisValue).append("?1:0)");
+				}
+				else {
+					buf.append( "(int) ");
+					buf.append( thisValue );
+				}
+				buf.append(";");
+			}
+			else {
+				if(javaTypeName.endsWith("[]")) {
+					if(jdk5) {
+						buf.append( result )
+								.append( " = 37 * " )
+								.append( result )
+								.append( " + " )
+								.append("( ")
+								.append(getGetterSignature(property))
+								.append("() == null ? 0 : ")
+								.append(importType("java.util.Arrays"))
+								.append(".hashCode(")
+								.append( thisName )
+								.append( "." )
+								.append( getGetterSignature( property ) )
+								.append( "())" )
+								.append( " )" )
+								.append(";");
+					}
+					else {
+						buf.append(internalGenerateArrayHashcode(property, javaTypeName, result, thisName));
+					}
+				}
+				else {
+					buf.append( result )
+							.append( " = 37 * " )
+							.append( result )
+							.append( " + " );
+					buf.append( "( " )
+							.append( getGetterSignature( property ) )
+							.append( "() == null ? 0 : " )
+							.append( thisName )
+							.append( "." )
+							.append( getGetterSignature( property ) )
+							.append( "()" )
+							.append( ".hashCode()" )
+							.append( " )" )
+							.append(";");
+				}
+			}
+		}
+		return buf.toString();
+	}
+
+
+	private String internalGenerateArrayHashcode(Property property, String javaTypeName, String result, String thisName)
+	{
+		StringBuilder buf = new StringBuilder();
+
+		String propertyHashVarName = property.getName() + "Hashcode";
+		String propertyArrayName = property.getName() + "Property";
+
+//		int propertyHash = 0;
+		buf.append( "int ")
+				.append( propertyHashVarName )
+				.append( " = 0;\n" );
+
+//		type[] proterty = getProperty();
+		buf.append( "         " )
+				.append( javaTypeName )
+				.append( " " )
+				.append( propertyArrayName )
+				.append( " = " )
+				.append( thisName )
+				.append( "." )
+				.append( getGetterSignature( property ) )
+				.append( "();\n");
+
+//		if(property != null) {
+		buf.append( "         if(" )
+				.append( propertyArrayName )
+				.append( " != null) {\n" );
+
+//		propertyHash = 1;
+		buf.append( "             " )
+				.append( propertyHashVarName )
+				.append( " = 1;\n" );
+
+//		for (int i=0; i<property.length; i++)
+		javaTypeName = javaTypeName.replaceAll("\\[]", "");
+		buf.append( "             for (int i=0; i<" )
+				.append( propertyArrayName )
+				.append( ".length; i++) {\n" );
+
+		if(javaTypeName.startsWith("long")) {
+//			int elementHash = (int)(propertyArray[i] ^ (propertyArray[i] >>> 32));
+			buf.append( "                 int elementHash = (int)(" )
+					.append( propertyArrayName )
+					.append( "[i] ^ (" )
+					.append( propertyArrayName )
+					.append( "[i] >>> 32));\n" );
+
+//			propertyHash = 37 * propertyHash + elementHash;
+			buf.append( "                 " )
+					.append( propertyHashVarName )
+					.append( " = 37 * " )
+					.append( propertyHashVarName )
+					.append( " + elementHash;\n" );
+		}
+		else if(javaTypeName.startsWith("boolean")) {
+//			propertyHash = 37 * propertyHash + (propertyArray[i] ? 1231 : 1237);
+			buf.append( "                 " )
+					.append( propertyHashVarName )
+					.append( " = 37 * " )
+					.append( propertyHashVarName )
+					.append( " + (" )
+					.append( propertyArrayName )
+					.append( "[i] ? 1231 : 1237);\n" );
+		}
+		else if(javaTypeName.startsWith("float")) {
+//			propertyHash = 37 * propertyHash + Float.floatToIntBits(propertyArray[i]);
+			buf.append( "                 " )
+					.append( propertyHashVarName )
+					.append( " = 37 * " )
+					.append( propertyHashVarName )
+					.append( " + Float.floatToIntBits(" )
+					.append( propertyArrayName )
+					.append( "[i]);\n" );
+		}
+		else if(javaTypeName.startsWith("double")) {
+//			long bits = Double.doubleToLongBits(propertyArray[i]);
+			buf.append( "                 long bits = Double.doubleToLongBits(" )
+					.append( propertyArrayName )
+					.append( "[i]);\n" );
+
+//			propertyHash = 37 * propertyHash + (int)(bits ^ (bits >>> 32));
+			buf.append( "                 " )
+					.append( propertyHashVarName )
+					.append( " = 37 * " )
+					.append( propertyHashVarName )
+					.append( " + (int)(bits ^ (bits >>> 32));\n" );
+		}
+		else if(javaTypeName.startsWith("int")
+				|| javaTypeName.startsWith("short")
+				|| javaTypeName.startsWith("char")
+				|| javaTypeName.startsWith("byte")) {
+//			propertyHash = 37 * propertyHash + propertyArray[i];
+			buf.append( "                 " )
+					.append( propertyHashVarName )
+					.append( " = 37 * " )
+					.append( propertyHashVarName )
+					.append( " + " )
+					.append( propertyArrayName )
+					.append( "[i];\n" );
+		}
+		else {// Object[]
+//			propertyHash = 37 * propertyHash + propertyArray[i].hashCode();
+			buf.append( "                 " )
+					.append( propertyHashVarName )
+					.append( " = 37 * " )
+					.append( propertyHashVarName )
+					.append( " + " )
+					.append( propertyArrayName )
+					.append( "[i].hashCode();\n" );
+		}
+
+		buf.append( "             }\n" );
+		buf.append( "         }\n\n" );
+
+//		result = 37 * result + arrayHashcode;
+		buf.append( "         " )
+				.append( result )
+				.append( " = 37 * " )
+				.append( result )
+				.append( " + " )
+				.append( propertyHashVarName )
+				.append( ";\n" );
+
+		return buf.toString();
+	}
+
+
+	public String getFieldModifiers(Property property) {
+		return getModifiers( property, "scope-field", "private" );
+	}
+
+	public String getPropertyGetModifiers(Property property) {
+		return getModifiers( property, "scope-get", "public" );
+	}
+
+	public String getPropertySetModifiers(Property property) {
+		return getModifiers( property, "scope-set", "public" );
+	}
+
+	//TODO defaultModifiers
+	private String getModifiers(Property property, String modifiername, String defaultModifiers) {
+		MetaAttribute override = property.getMetaAttribute( modifiername );
+		if ( override != null ) {
+			return MetaAttributeHelper.getMetaAsString( override );
+		}
+		else {
+			return defaultModifiers;
+		}
+	}
+
+	protected boolean isRequiredInConstructor(Property field) {
+		if(hasMetaAttribute(field, "default-value")) {
+			return false;
+		}
+		if (!isToBeGenerated(field)) {
+			return false;
+		}
+		if(field.getValue()!=null) {
+			if (!(field.isOptional() || field.getValue().isNullable()) && (field.getValueGeneratorCreator() == null )) {
+				return true;
+			}
+			else if (field.getValue() instanceof Component c) {
+				for (Property prop : c.getProperties()) {
+					if (isRequiredInConstructor(prop)) {
+						return true;
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	protected boolean isToBeGenerated(Property property) {
+		MetaAttribute genProperty = property.getMetaAttribute("gen-property");
+		if (genProperty != null ) {
+			return Boolean.valueOf(genProperty.getValue());
+		}
+		else {
+			return true;
+		}
+	}
+
+	public boolean needsMinimalConstructor() {
+		List<Property> propClosure = getPropertyClosureForMinimalConstructor();
+		if(propClosure.isEmpty()) return false; // minimal=default
+		return !propClosure.equals(getPropertyClosureForFullConstructor()); // minimal=full
+	}
+
+	public boolean needsFullConstructor() {
+		return !getPropertyClosureForFullConstructor().isEmpty();
+	}
+
+	public String getJavaTypeName(Property p, boolean useGenerics) {
+		return c2j.getJavaTypeName(p, useGenerics, this);
+	}
+
+	static private class DefaultInitializor {
+
+		private final String type;
+		private final boolean initToZero;
+
+		public DefaultInitializor(String type, boolean initToZero) {
+			this.type = type;
+			this.initToZero = initToZero;
+		}
+
+		public String getDefaultValue(String comparator, String genericDeclaration, ImportContext importContext) {
+			StringBuilder val = new StringBuilder("new " + importContext.importType(type));
+			if(genericDeclaration!=null) {
+				val.append(genericDeclaration);
+			}
+
+			val.append("(");
+			if(comparator!=null) {
+				val.append("new ");
+				val.append(importContext.importType(comparator));
+				val.append("()");
+				if(initToZero) val.append(",");
+			}
+			if(initToZero) {
+				val.append("0");
+			}
+			val.append(")");
+			return val.toString();
+		}
+
+	}
+
+	static Map<String, DefaultInitializor> defaultInitializors = new HashMap<>();
+	static {
+		defaultInitializors.put("java.util.List", new DefaultInitializor("java.util.ArrayList", true));
+		defaultInitializors.put("java.util.Map", new DefaultInitializor("java.util.HashMap", true));
+		defaultInitializors.put("java.util.Set", new DefaultInitializor("java.util.HashSet",true));
+		defaultInitializors.put("java.util.SortedSet", new DefaultInitializor("java.util.TreeSet", false));
+		defaultInitializors.put("java.util.SortedMap", new DefaultInitializor("java.util.TreeMap", false));
+	}
+
+	public boolean hasFieldInitializor(Property p, boolean useGenerics) {
+		return getFieldInitialization(p, useGenerics)!=null;
+	}
+
+	public String getFieldInitialization(Property p, boolean useGenerics) {
+		if(hasMetaAttribute(p, "default-value")) {
+			return MetaAttributeHelper.getMetaAsString( p.getMetaAttribute( "default-value" ) );
+		}
+		if(c2j.getJavaTypeName(p, false)==null) {
+			throw new IllegalArgumentException();
+		}
+		else if (p.getValue() instanceof Collection col) {
+
+			DefaultInitializor initialization = (DefaultInitializor) col.accept(new DefaultValueVisitor(true) {
+
+				public Object accept(Bag o) {
+					return new DefaultInitializor("java.util.ArrayList", true);
+				}
+
+				public Object accept(org.hibernate.mapping.List o) {
+					return new DefaultInitializor("java.util.ArrayList", true);
+				}
+
+				public Object accept(org.hibernate.mapping.Map o) {
+					if(o.isSorted()) {
+						return new DefaultInitializor("java.util.TreeMap", false);
+					}
+					else {
+						return new DefaultInitializor("java.util.HashMap", true);
+					}
+				}
+
+				public Object accept(IdentifierBag o) {
+					return new DefaultInitializor("java.util.ArrayList", true);
+				}
+
+				public Object accept(Set o) {
+					if(o.isSorted()) {
+						return new DefaultInitializor("java.util.TreeSet", false);
+					}
+					else {
+						return new DefaultInitializor("java.util.HashSet", true);
+					}
+				}
+
+
+				public Object accept(PrimitiveArray o) {
+					return null; // TODO: default init for arrays ?
+				}
+
+				public Object accept(Array o) {
+					return null;// TODO: default init for arrays ?
+				}
+
+			});
+
+			if(initialization!=null) {
+				String comparator = null;
+				String decl = null;
+
+				if(col.isSorted()) {
+					comparator = col.getComparatorClassName();
+				}
+
+				if(useGenerics) {
+					decl = c2j.getGenericCollectionDeclaration((Collection) p.getValue(), importContext);
+				}
+				return initialization.getDefaultValue(comparator, decl, this);
+			}
+			else {
+				return null;
+			}
+		}
+		else {
+			return null;
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/Cfg2JavaTool.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/Cfg2JavaTool.java
new file mode 100644
index 000000000000..2485ed1a9091
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/Cfg2JavaTool.java
@@ -0,0 +1,402 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.boot.internal.NamedHqlQueryDefinitionImpl;
+import org.hibernate.boot.query.NamedHqlQueryDefinition;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Array;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.IndexedCollection;
+import org.hibernate.mapping.MetaAttributable;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.Value;
+import org.hibernate.tool.reveng.internal.export.hbm.Cfg2HbmTool;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedValue;
+import org.hibernate.tool.reveng.internal.util.NameConverter;
+import org.hibernate.tool.reveng.internal.util.StringUtil;
+import org.hibernate.type.Type;
+import org.hibernate.type.spi.TypeConfiguration;
+import org.jboss.logging.Logger;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+/**
+ * Helper methods for javacode generation.
+ *
+ * @author max
+ */
+public class Cfg2JavaTool {
+
+	private static final Logger log = Logger.getLogger( Cfg2JavaTool.class );
+
+	public Cfg2JavaTool() {
+
+	}
+
+	public POJOClass getPOJOClass(Component comp) {
+		return new ComponentPOJOClass(comp, this);
+	}
+
+	public POJOClass getPOJOClass(PersistentClass comp) {
+		return new EntityPOJOClass(comp, this);
+	}
+
+	public String unqualify(String name) {
+		return StringHelper.unqualify( name );
+	}
+
+	/**
+	 * Returns all meta items as one large string.
+	 *
+	 */
+	public String getMetaAsString(MetaAttributable pc, String attribute) {
+		MetaAttribute c = pc.getMetaAttribute( attribute );
+
+		return MetaAttributeHelper.getMetaAsString( c );
+	}
+
+	public boolean hasMetaAttribute(MetaAttributable pc, String attribute) {
+		return pc.getMetaAttribute( attribute ) != null;
+	}
+
+	public String getMetaAsString(MetaAttributable pc, String attribute, String seperator) {
+		return MetaAttributeHelper.getMetaAsString( pc.getMetaAttribute( attribute ), seperator );
+	}
+
+	public boolean getMetaAsBool(MetaAttributable ma, String attribute) {
+		return getMetaAsBool( ma, attribute, false );
+	}
+
+	public boolean getMetaAsBool(MetaAttributable pc, String attribute, boolean defaultValue) {
+		return MetaAttributeHelper.getMetaAsBool( pc.getMetaAttribute( attribute ), defaultValue );
+	}
+
+
+
+	/**
+	 * Convert string into something that can be rendered nicely into a javadoc
+	 * comment.
+	 * Prefix each line with a star ('*').
+	 */
+	public String toJavaDoc(String string, int indent) {
+		StringBuilder result = new StringBuilder();
+
+		if ( string != null ) {
+			String[] lines = StringUtil.split( string, "\n\r\f" );
+			for ( int i = 0; i < lines.length ; i++ ) {
+				String docline = " * " + lines[i];
+				if ( i < lines.length - 1 ) docline += "\n";
+				result.append( StringUtil.leftPad( docline, docline.length() + indent ) );
+			}
+		}
+
+		return result.toString();
+	}
+
+	public String getClassModifiers(MetaAttributable pc) {
+		String classModifiers = null;
+
+		// Get scope (backwards compatibility)
+		if ( pc.getMetaAttribute( "scope-class" ) != null ) {
+			classModifiers = getMetaAsString( pc, "scope-class" ).trim();
+		}
+
+		// Get modifiers
+		if ( pc.getMetaAttribute( "class-modifier" ) != null ) {
+			classModifiers = getMetaAsString( pc, "class-modifier" ).trim();
+		}
+		return classModifiers == null ? "public" : classModifiers;
+	}
+
+
+	private String toName(Class<?> c) {
+
+		if ( c.isArray() ) {
+			Class<?> a = c.getComponentType();
+
+			return a.getName() + "[]";
+		}
+		else {
+			return c.getName();
+		}
+	}
+
+	/**
+	 * Returns the typename for a property, using generics if this is a Set type and useGenerics is set to true.
+	 */
+	public String getJavaTypeName(Property p, boolean useGenerics) {
+		return getJavaTypeName(p, useGenerics, new NoopImportContext());
+	}
+
+	public String getJavaTypeName(Property p, boolean useGenerics, ImportContext importContext) {
+		String overrideType = getMetaAsString( p, "property-type" );
+		if ( !StringHelper.isEmpty( overrideType ) ) {
+			String importType = importContext.importType(overrideType);
+			if ( useGenerics && !importType.contains("<")) {
+				if ( p.getValue() instanceof Collection ) {
+					String decl = getGenericCollectionDeclaration( (Collection) p.getValue(), importContext );
+					return importType + decl;
+				}
+			}
+			return importType;
+		}
+		else {
+			String rawType = getRawTypeName( p, useGenerics, importContext );
+			if(rawType==null) {
+				throw new IllegalStateException("getJavaTypeName *must* return a value");
+			}
+			return importContext.importType(rawType);
+		}
+	}
+
+	private static final Map<String,String> PRIMITIVES =
+			new HashMap<>();
+
+	static {
+		PRIMITIVES.put( "char", "Character" );
+		PRIMITIVES.put( "byte", "Byte" );
+		PRIMITIVES.put( "short", "Short" );
+		PRIMITIVES.put( "int", "Integer" );
+		PRIMITIVES.put( "long", "Long" );
+		PRIMITIVES.put( "boolean", "Boolean" );
+		PRIMITIVES.put( "float", "Float" );
+		PRIMITIVES.put( "double", "Double" );
+	}
+
+	static public boolean isNonPrimitiveTypeName(String typeName) {
+		return (!PRIMITIVES.containsKey( typeName ))
+			&& new TypeConfiguration()
+						.getBasicTypeRegistry()
+						.getRegisteredType(typeName) != null;
+	}
+
+	private String getRawTypeName(Property p, boolean useGenerics, ImportContext importContext) {
+		Value value = p.getValue();
+		try {
+
+			if (value instanceof Array a) { // array has a string rep.inside.
+				if ( a.isPrimitiveArray() ) {
+					return toName( value.getType().getReturnedClass() );
+				}
+				else if (a.getElementClassName()!=null){
+					return a.getElementClassName() + "[]";
+				}
+				else {
+					return getJavaTypeName(a.getElement()) + "[]";
+				}
+			}
+
+			if (value instanceof Component component) { // same for component.
+				if(component.isDynamic()) return "java.util.Map";
+				return component.getComponentClassName();
+			}
+
+			if ( useGenerics ) {
+				if ( value instanceof Collection ) {
+					String decl = getGenericCollectionDeclaration( (Collection) value, importContext );
+					return getJavaTypeName(value) + decl;
+				}
+			}
+
+			return getJavaTypeName( value);
+		}
+		catch (Exception e) {
+			//e.printStackTrace();
+			String msg = "Could not resolve type without exception for " + p + " Value: " + value;
+			if ( value != null && value.isSimpleValue() ) {
+				String typename = ( (SimpleValue) value ).getTypeName();
+				log.warn( msg + ". Falling back to typename: " + typename );
+				return typename;
+			}
+			else {
+				throw new RuntimeException( msg, e );
+			}
+		}
+	}
+
+	public String getGenericCollectionDeclaration(Collection collection, ImportContext importContext) {
+		Value element = collection.getElement();
+		String elementType = importContext.importType(getJavaTypeName(element));
+		String genericDecl = elementType;
+		if(collection.isIndexed()) {
+			IndexedCollection idxCol = (IndexedCollection) collection;
+			if(!idxCol.isList()) {
+				Value idxElement = idxCol.getIndex();
+				String indexType = importContext.importType(getJavaTypeName(idxElement));
+				genericDecl = indexType + "," + elementType;
+			}
+		}
+		return "<" + genericDecl + ">";
+	}
+
+	public Properties getFilteredIdentifierGeneratorProperties(SimpleValue simpleValue) {
+		Properties p = ((EnhancedValue)simpleValue).getIdentifierGeneratorProperties();
+		return Cfg2HbmTool.getFilteredIdentifierGeneratorProperties(p, new Properties());
+	}
+
+	private String getJavaTypeName(Value value) {
+		return (String) value.accept( new JavaTypeFromValueVisitor() );
+	}
+
+	public String asParameterList(Iterator<?> fields, boolean useGenerics, ImportContext ic) {
+		StringBuilder buf = new StringBuilder();
+		while ( fields.hasNext() ) {
+			Property field = (Property)fields.next();
+			buf.append( getJavaTypeName( field, useGenerics, ic ) )
+					.append( " " )
+					.append( keyWordCheck(field.getName()) );
+			if ( fields.hasNext() ) {
+				buf.append( ", " );
+			}
+		}
+		return buf.toString();
+	}
+
+	/**
+	 * @param fields iterator on Property elements.
+	 * @return "name, number, ..." for a property list, usable for method calls.
+	 */
+	public String asArgumentList(Iterator<?> fields) {
+		StringBuilder buf = new StringBuilder();
+		while ( fields.hasNext() ) {
+			Property field = (Property)fields.next();
+			buf.append( keyWordCheck(field.getName()) );
+			if ( fields.hasNext() ) {
+				buf.append( ", " );
+			}
+		}
+		return buf.toString();
+	}
+
+	/**
+	 * @param clazz persistent class.
+	 * @return "String name, int number, ..." for a property list, usable for method declarations.
+	 */
+	public String asNaturalIdParameterList(PersistentClass clazz) {
+		StringBuilder buf = new StringBuilder();
+		for (Property field : clazz.getRootClass().getProperties()) {
+			if ( field.isNaturalIdentifier() ) {
+				buf.append( getJavaTypeName( field, false ) )
+						.append( " " )
+						.append( field.getName() )
+						.append( ", " );
+			}
+		}
+		return buf.substring( 0, buf.length() - 2 );
+	}
+
+	public String asParameterList(List<Property> fields, boolean useGenerics, ImportContext ic) {
+		return asParameterList( fields.iterator(), useGenerics, ic );
+	}
+
+	public String asArgumentList(List<Property> fields) {
+		return asArgumentList( fields.iterator() );
+	}
+
+	public String asFinderArgumentList(Map<Object,Object> parameterTypes, ImportContext ctx) {
+		StringBuilder buf = new StringBuilder();
+		Iterator<Entry<Object,Object>> iter = parameterTypes.entrySet().iterator();
+		while ( iter.hasNext() ) {
+			Entry<Object,Object> entry = iter.next();
+			String typename = null;
+			Type type = null;
+			if(entry.getValue() instanceof String) {
+				try {
+					type = new TypeConfiguration()
+							.getBasicTypeRegistry()
+							.getRegisteredType((String) entry.getValue());
+				}
+				catch(Throwable t) {
+					typename = (String) entry.getValue();
+				}
+			}
+
+			if(type!=null) {
+				typename = type.getReturnedClass().getName();
+			}
+			buf.append( ctx.importType( typename ))
+					.append( " " )
+					.append( entry.getKey() );
+			if ( iter.hasNext() ) buf.append( ", " );
+		}
+		return buf.toString();
+	}
+
+
+
+	public boolean isPrimitive(String typeName) {
+		return PRIMITIVES.containsKey(typeName);
+	}
+
+	public boolean isComponent(Property property) {
+		return isComponent(property.getValue());
+	}
+
+	public boolean isComponent(Value value) {
+		return ( value instanceof Component );
+	}
+
+	// TODO: should consult exporter/cfg2java tool for cached POJOEntities....or maybe not since they
+	// have their own state...
+	public Iterator<POJOClass> getPOJOIterator(
+			final Iterator<PersistentClass> persistentClasses) {
+		return new Iterator<>() {
+			public POJOClass next() {
+				return getPOJOClass( persistentClasses.next() );
+			}
+
+			public boolean hasNext() {
+				return persistentClasses.hasNext();
+			}
+
+			public void remove() {
+				persistentClasses.remove();
+			}
+		};
+	}
+
+
+	public String simplePluralize(String str) {
+		return NameConverter.simplePluralize(str);
+	}
+
+	public String keyWordCheck(String possibleKeyword) {
+		if(NameConverter.isReservedJavaKeyword(possibleKeyword)) {
+			possibleKeyword = possibleKeyword + "_";
+		}
+		return possibleKeyword;
+	}
+
+	public boolean isArray(String typeName) {
+		return typeName!=null && typeName.endsWith("[]");
+	}
+
+	public Map<?, ?> getParameterTypes(NamedHqlQueryDefinition<?> query) {
+		Map<?, ?> result;
+		try {
+			Field field = NamedHqlQueryDefinitionImpl.class.getDeclaredField("parameterTypes");
+			field.setAccessible(true);
+			result = (Map<?, ?>)field.get(query);
+			if (result == null) {
+				result = new HashMap<>();
+			}
+		}
+		catch (NoSuchFieldException | IllegalAccessException e) {
+			throw new RuntimeException(e);
+		}
+		return result;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ComponentPOJOClass.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ComponentPOJOClass.java
new file mode 100644
index 000000000000..ba39031b01ca
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ComponentPOJOClass.java
@@ -0,0 +1,177 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.Property;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.hibernate.tool.reveng.internal.export.java.MetaAttributeConstants.EXTENDS;
+import static org.hibernate.tool.reveng.internal.export.java.MetaAttributeConstants.IMPLEMENTS;
+
+public class ComponentPOJOClass extends BasicPOJOClass {
+
+	private final Component clazz;
+
+	public ComponentPOJOClass(Component component, Cfg2JavaTool cfg) {
+		super(component, cfg);
+		this.clazz = component;
+		init();
+	}
+
+	protected String getMappedClassName() {
+		return clazz.getComponentClassName();
+	}
+
+	public String getExtends() {
+		String extendz = "";
+
+		if ( isInterface() ) {
+			if ( clazz.getMetaAttribute( EXTENDS ) != null ) {
+				extendz += getMetaAsString( EXTENDS, "," );
+			}
+		}
+		else if ( clazz.getMetaAttribute( EXTENDS ) != null ) {
+			extendz = getMetaAsString( EXTENDS, "," );
+		}
+
+		return extendz.isEmpty() ? null : extendz;
+	}
+
+	public String getImplements() {
+		List<String> interfaces = new ArrayList<String>();
+
+		//	implement proxy, but NOT if the proxy is the class it self!
+		// interfaces can't implement stuff
+		if ( !isInterface() ) {
+			MetaAttribute implementz = clazz.getMetaAttribute( IMPLEMENTS );
+			if ( implementz != null ) {
+				interfaces.addAll(implementz.getValues());
+			}
+			interfaces.add( Serializable.class.getName() ); // TODO: is this "nice" ? shouldn't it be a user choice ?
+		}
+
+
+		if (!interfaces.isEmpty()) {
+			StringBuilder sb = new StringBuilder();
+			for ( Iterator<String> iter = interfaces.iterator(); iter.hasNext() ; ) {
+				//sb.append(JavaTool.shortenType(iter.next().toString(), pc.getImports() ) );
+				sb.append( iter.next() );
+				if ( iter.hasNext() ) sb.append( "," );
+			}
+			return sb.toString();
+		}
+		else {
+			return null;
+		}
+	}
+
+	public Iterator<Property> getAllPropertiesIterator() {
+		return clazz.getProperties().iterator();
+	}
+
+	public boolean isComponent() {
+		return true;
+	}
+
+	public boolean hasIdentifierProperty() {
+		return false;
+	}
+
+	public boolean needsAnnTableUniqueConstraints() {
+		return false;
+	}
+
+	public String generateBasicAnnotation(Property property) {
+		return "";
+	}
+
+	public String generateAnnIdGenerator() {
+		return "";
+	}
+
+	public String generateAnnTableUniqueConstraint() {
+		return "";
+	}
+
+	public Object getDecoratedObject() {
+		return clazz;
+	}
+
+	public boolean isSubclass() {
+		return false;
+	}
+
+	public List<Property> getPropertiesForFullConstructor() {
+		List<Property> res = new ArrayList<Property>();
+
+		Iterator<Property> iter = getAllPropertiesIterator();
+		while(iter.hasNext()) {
+			res.add(iter.next());
+		}
+		return res;
+	}
+
+	public List<Property> getPropertyClosureForFullConstructor() {
+		return getPropertiesForFullConstructor();
+	}
+
+	public List<Property> getPropertyClosureForSuperclassFullConstructor() {
+		return Collections.emptyList();
+	}
+
+	public List<Property> getPropertiesForMinimalConstructor() {
+		List<Property> res = new ArrayList<Property>();
+		Iterator<Property> iter = getAllPropertiesIterator();
+		while(iter.hasNext()) {
+			Property prop = (Property)iter.next();
+			if(isRequiredInConstructor(prop)) {
+				res.add(prop);
+			}
+		}
+		return res;
+	}
+
+	public List<Property> getPropertyClosureForMinimalConstructor() {
+		return getPropertiesForMinimalConstructor();
+	}
+
+	public List<Property> getPropertyClosureForSuperclassMinimalConstructor() {
+		return Collections.emptyList();
+	}
+
+	/*
+	 * @see org.hibernate.tool.hbm2x.pojo.POJOClass#getSuperClass()
+	 */
+	public POJOClass getSuperClass() {
+		return null;
+	}
+
+	public String toString() {
+		return "Component: " + (clazz==null?"<none>":clazz.getComponentClassName());
+	}
+
+	public Property getIdentifierProperty(){
+		return null;
+	}
+
+	public boolean hasVersionProperty() {
+		return false;
+	}
+
+	/*
+	 * @see org.hibernate.tool.hbm2x.pojo.POJOClass#getVersionProperty()
+	 */
+	public Property getVersionProperty()
+	{
+		return null;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/EntityPOJOClass.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/EntityPOJOClass.java
new file mode 100644
index 000000000000..d5ef2b07b0de
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/EntityPOJOClass.java
@@ -0,0 +1,920 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.id.PersistentIdentifierGenerator;
+import org.hibernate.id.enhanced.TableGenerator;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.internal.util.collections.JoinedList;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.Formula;
+import org.hibernate.mapping.KeyValue;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Selectable;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.Subclass;
+import org.hibernate.mapping.Table;
+import org.hibernate.mapping.ToOne;
+import org.hibernate.mapping.UniqueKey;
+import org.hibernate.mapping.Value;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedBasicValue;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedValue;
+import org.hibernate.tool.reveng.internal.util.AnnotationBuilder;
+import org.hibernate.tool.reveng.internal.util.IteratorTransformer;
+import org.hibernate.tool.reveng.internal.util.SkipBackRefPropertyIterator;
+import org.hibernate.tool.reveng.internal.util.ValueUtil;
+import org.hibernate.type.ForeignKeyDirection;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import static org.hibernate.tool.reveng.internal.export.java.MetaAttributeConstants.EXTENDS;
+import static org.hibernate.tool.reveng.internal.export.java.MetaAttributeConstants.IMPLEMENTS;
+
+public class EntityPOJOClass extends BasicPOJOClass {
+
+	private final PersistentClass clazz;
+
+	public EntityPOJOClass(PersistentClass clazz, Cfg2JavaTool cfg) {
+		super(clazz, cfg);
+		this.clazz = clazz;
+		init();
+	}
+
+	protected String getMappedClassName() {
+		return clazz.getClassName();
+	}
+
+	/**
+	 * @return whatever the class (or interface) extends (null if it does not extend anything)
+	 */
+	public String getExtends() {
+		String extendz = "";
+
+		if ( isInterface() ) {
+			if ( clazz.getSuperclass() != null ) {
+				extendz = clazz.getSuperclass().getClassName();
+			}
+			if ( clazz.getMetaAttribute( EXTENDS ) != null ) {
+				if ( !extendz.isEmpty() ) {
+					extendz += ",";
+				}
+				extendz += getMetaAsString( EXTENDS, "," );
+			}
+		}
+		else if ( clazz.getSuperclass() != null ) {
+			if (!( c2j.getPOJOClass(clazz.getSuperclass()).isInterface() )) {
+				extendz = clazz.getSuperclass().getClassName();
+			}
+		}
+		else if ( clazz.getMetaAttribute( EXTENDS ) != null ) {
+			extendz = getMetaAsString( EXTENDS, "," );
+		}
+
+		return extendz.isEmpty() ? null : extendz;
+	}
+
+
+	public String getImplements() {
+		List<String> interfaces = new ArrayList<>();
+
+		//			implement proxy, but NOT if the proxy is the class it self!
+		if ( clazz.getProxyInterfaceName() != null && ( !clazz.getProxyInterfaceName().equals( clazz.getClassName() ) ) ) {
+			interfaces.add( clazz.getProxyInterfaceName() );
+		}
+
+		if ( !isInterface() ) {
+			if ( clazz.getSuperclass() != null && c2j.getPOJOClass(clazz.getSuperclass()).isInterface() ) {
+				interfaces.add( clazz.getSuperclass().getClassName() );
+			}
+			if ( clazz.getMetaAttribute( IMPLEMENTS ) != null ) {
+				interfaces.addAll( clazz.getMetaAttribute( IMPLEMENTS ).getValues() );
+			}
+			interfaces.add( Serializable.class.getName() ); // TODO: is this "nice" ? shouldn't it be a user choice ?
+		}
+
+		if (!interfaces.isEmpty()) {
+			StringBuilder sbuf = new StringBuilder();
+			for ( Iterator<String> iter = interfaces.iterator(); iter.hasNext() ; ) {
+				//sbuf.append(JavaTool.shortenType(iter.next().toString(), pc.getImports() ) );
+				sbuf.append( iter.next() );
+				if ( iter.hasNext() ) sbuf.append( "," );
+			}
+			return sbuf.toString();
+		}
+		else {
+			return null;
+		}
+	}
+
+	public Iterator<Property> getAllPropertiesIterator() {
+		return getAllPropertiesIterator(clazz);
+	}
+
+
+	public Iterator<Property> getAllPropertiesIterator(PersistentClass pc) {
+		List<Property> properties = new ArrayList<>();
+		List<List<Property>> lists = new ArrayList<>();
+		if ( pc.getSuperclass() == null ) {
+			// only include identifier for the root class.
+			if ( pc.hasIdentifierProperty() ) {
+				properties.add( pc.getIdentifierProperty() );
+			}
+			else if ( pc.hasEmbeddedIdentifier() ) {
+				Component embeddedComponent = (Component) pc.getIdentifier();
+				lists.add( embeddedComponent.getProperties() );
+			}
+			/*if(clazz.isVersioned() ) { // version is already in property set
+				properties.add(clazz.getVersion() );
+			}*/
+		}
+
+
+		//		iterators.add( pc.getPropertyIterator() );
+		// Need to skip <properties> element which are defined via "embedded" components
+		// Best if we could return an intelligent iterator, but for now we just iterate explicitly.
+		List<Property> pl = pc.getProperties();
+		for(Property element : pl)
+		{
+			if ( element.getValue() instanceof Component component
+				&& element.getPropertyAccessorName().equals( "embedded" )) {
+				properties.addAll(component.getProperties());
+			}
+			else {
+				properties.add(element);
+			}
+		}
+
+		lists.add(properties);
+
+		return new SkipBackRefPropertyIterator( new JoinedList<>( lists ).iterator() );
+	}
+
+	public boolean isComponent() {
+		return false;
+	}
+
+
+	public boolean hasIdentifierProperty() {
+		return clazz.hasIdentifierProperty() && clazz instanceof RootClass;
+	}
+
+	public Property getIdentifierProperty() {
+		return clazz.getIdentifierProperty();
+	}
+
+	public String generateAnnTableUniqueConstraint() {
+		if ( ! ( clazz instanceof Subclass ) ) {
+			Table table = clazz.getTable();
+			return generateAnnTableUniqueConstraint( table );
+		}
+		return "";
+	}
+
+	protected String generateAnnTableUniqueConstraint(Table table) {
+		List<String> cons = new ArrayList<>();
+		for (UniqueKey key : table.getUniqueKeys().values()) {
+			if (table.hasPrimaryKey() && table.getPrimaryKey().getColumns().equals(key.getColumns())) {
+				continue;
+			}
+			AnnotationBuilder constraint = AnnotationBuilder.createAnnotation( importType("jakarta.persistence.UniqueConstraint") );
+			constraint.addQuotedAttributes( "columnNames", new IteratorTransformer<>( key.getColumns().iterator() ) {
+				public String transform(Column column) {
+					return column.getName();
+				}
+			});
+			cons.add( constraint.getResult() );
+		}
+
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation( "dummyAnnotation" );
+		builder.addAttributes( "dummyAttribute", cons.iterator() );
+		String attributeAsString = builder.getAttributeAsString( "dummyAttribute" );
+		return attributeAsString==null?"":attributeAsString;
+	}
+
+
+	public String generateAnnIdGenerator() {
+		KeyValue identifier = clazz.getIdentifier();
+		String strategy;
+		Properties properties;
+		StringBuffer wholeString = new StringBuffer( "    " );
+		if ( identifier instanceof Component ) {
+
+			wholeString.append( AnnotationBuilder.createAnnotation( importType("jakarta.persistence.EmbeddedId") ).getResult());
+		}
+		else if (identifier instanceof EnhancedBasicValue enhancedBasicValue) {
+			strategy = enhancedBasicValue.getIdentifierGeneratorStrategy();
+			properties = c2j.getFilteredIdentifierGeneratorProperties(enhancedBasicValue);
+			StringBuilder idResult = new StringBuilder();
+			AnnotationBuilder builder = AnnotationBuilder.createAnnotation( importType("jakarta.persistence.Id") );
+			idResult.append(builder.getResult());
+			idResult.append(" ");
+
+			boolean isGenericGenerator = false; //TODO: how to handle generic now??
+			if ( !"assigned".equals( strategy ) ) {
+
+				if ( !"native".equals( strategy ) ) {
+					if ( "identity".equals( strategy ) ) {
+						builder.resetAnnotation( importType("jakarta.persistence.GeneratedValue") );
+						builder.addAttribute( "strategy", staticImport("jakarta.persistence.GenerationType", "IDENTITY" ) );
+						idResult.append(builder.getResult());
+					}
+					else if ( "sequence".equals( strategy ) ) {
+						String sequenceGeneratorName = null;
+						if (properties != null) {
+							sequenceGeneratorName = properties.getProperty(
+									org.hibernate.id.enhanced.SequenceStyleGenerator.SEQUENCE_PARAM, null );
+						}
+						builder.resetAnnotation( importType("jakarta.persistence.GeneratedValue") )
+								.addAttribute( "strategy", staticImport("jakarta.persistence.GenerationType", "SEQUENCE" ) )
+								.addQuotedAttribute( "generator", clazz.getClassName()+"IdGenerator" );
+						idResult.append(builder.getResult());
+
+						builder.resetAnnotation( importType("jakarta.persistence.SequenceGenerator") )
+								.addQuotedAttribute( "name", clazz.getClassName()+"IdGenerator" )
+								.addQuotedAttribute( "sequenceName", sequenceGeneratorName );
+						//	TODO HA does not support initialValue and allocationSize
+						wholeString.append( builder.getResult() );
+					}
+					else if ( TableGenerator.class.getName().equals( strategy ) ) {
+						builder.resetAnnotation( importType("jakarta.persistence.GeneratedValue") )
+								.addAttribute( "strategy", staticImport("jakarta.persistence.GenerationType", "TABLE" ) )
+								.addQuotedAttribute( "generator", clazz.getClassName()+"IdGenerator" );
+						idResult.append(builder.getResult());
+						buildAnnTableGenerator( wholeString, properties );
+					}
+					else {
+						isGenericGenerator = true;
+						builder.resetAnnotation( importType("jakarta.persistence.GeneratedValue") );
+						builder.addQuotedAttribute( "generator", clazz.getClassName()+"IdGenerator" );
+						idResult.append(builder.getResult());
+					}
+				}
+				else {
+					builder.resetAnnotation( importType("jakarta.persistence.GeneratedValue") );
+					idResult.append(builder.getResult());
+				}
+			}
+			if ( isGenericGenerator ) {
+				builder.resetAnnotation( importType("org.hibernate.annotations.GenericGenerator") )
+						.addQuotedAttribute( "name", clazz.getClassName()+"IdGenerator" )
+						.addQuotedAttribute( "strategy", strategy);
+
+				List<AnnotationBuilder> params = new ArrayList<>();
+				//wholeString.append( "parameters = {  " );
+				if ( properties != null ) {
+					Enumeration<?> propNames = properties.propertyNames();
+					while ( propNames.hasMoreElements() ) {
+
+						String propertyName = (String) propNames.nextElement();
+						AnnotationBuilder parameter = AnnotationBuilder.createAnnotation( importType("org.hibernate.annotations.Parameter") )
+								.addQuotedAttribute( "name", propertyName )
+								.addQuotedAttribute( "value", properties.getProperty( propertyName ) );
+						params.add( parameter );
+					}
+				}
+				builder.addAttributes( "parameters", params.iterator() );
+				wholeString.append(builder.getResult());
+			}
+			wholeString.append( idResult );
+		}
+		return wholeString.toString();
+	}
+
+	private void buildAnnTableGenerator(StringBuffer wholeString, Properties properties) {
+
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation( importType("jakarta.persistence.TableGenerator") );
+		builder.addQuotedAttribute( "name", clazz.getClassName()+"IdGenerator" );
+		builder.addQuotedAttribute( "table", properties.getProperty( "generatorTableName", "hibernate_sequences" ) );
+		if (propertyDoesNotHaveDefaultValue( PersistentIdentifierGenerator.CATALOG, properties ) ) {
+			builder.addQuotedAttribute( "catalog", properties.getProperty( PersistentIdentifierGenerator.CATALOG, "") );
+		}
+		if (propertyDoesNotHaveDefaultValue( PersistentIdentifierGenerator.SCHEMA, properties ) ) {
+			builder.addQuotedAttribute( "schema", properties.getProperty( PersistentIdentifierGenerator.SCHEMA, "") );
+		}
+		if (propertyDoesNotHaveDefaultValue( TableGenerator.SEGMENT_VALUE_PARAM, properties ) ) {
+			builder.addQuotedAttribute( "pkColumnValue", properties.getProperty( TableGenerator.SEGMENT_VALUE_PARAM, "") );
+		}
+		if (propertyDoesNotHaveDefaultValue( TableGenerator.INCREMENT_PARAM, properties, "50" ) ) {
+			builder.addAttribute( "allocationSize", properties.getProperty( TableGenerator.INCREMENT_PARAM, "50" ) );
+		}
+		if (propertyDoesNotHaveDefaultValue( TableGenerator.SEGMENT_COLUMN_PARAM, properties ) ) {
+			builder.addQuotedAttribute( "pkColumnName", properties.getProperty( TableGenerator.SEGMENT_COLUMN_PARAM, "") );
+		}
+		if (propertyDoesNotHaveDefaultValue( TableGenerator.VALUE_COLUMN_PARAM, properties) ) {
+			builder.addQuotedAttribute( "valueColumnName", properties.getProperty( TableGenerator.VALUE_COLUMN_PARAM, "") );
+		}
+		wholeString.append(builder.getResult()).append("\n    ");
+	}
+
+	private boolean propertyDoesNotHaveDefaultValue(String property, Properties properties) {
+		return propertyDoesNotHaveDefaultValue(property, properties, null);
+	}
+
+	private boolean propertyDoesNotHaveDefaultValue(String property, Properties properties, String defaultValue) {
+		String propertyValue = properties.getProperty(property);
+		if (defaultValue == null) {
+			return StringHelper.isNotEmpty(propertyValue);
+		}
+		else {
+			return !defaultValue.equals(propertyValue);
+		}
+	}
+
+	public String generateJoinColumnsAnnotation(Property property, Metadata md) {
+		boolean insertable = property.isInsertable();
+		boolean updatable = property.isUpdatable();
+		Value value = property.getValue();
+		int span;
+		Iterator<Selectable> selectablesIterator;
+		Iterator<Selectable> referencedSelectablesIterator = null;
+		if (value instanceof Collection collection) {
+			span = collection.getKey().getColumnSpan();
+			selectablesIterator = collection.getKey().getSelectables().iterator();
+		}
+		else {
+			span = property.getColumnSpan();
+			selectablesIterator = property.getSelectables().iterator();
+		}
+
+		if(property.getValue() instanceof ToOne) {
+			String referencedEntityName = ((ToOne)property.getValue()).getReferencedEntityName();
+			PersistentClass target = md.getEntityBinding(referencedEntityName);
+			if(target!=null) {
+				referencedSelectablesIterator = target.getKey().getSelectables().iterator();
+			}
+		}
+
+		StringBuffer annotations = new StringBuffer( "    " );
+		if ( span == 1 ) {
+			Selectable selectable = selectablesIterator.next();
+			buildJoinColumnAnnotation( selectable, null, annotations, insertable, updatable );
+		}
+		else {
+			annotations.append("@").append( importType("jakarta.persistence.JoinColumns") ).append("( { " );
+			buildArrayOfJoinColumnAnnotation(selectablesIterator, referencedSelectablesIterator, annotations, insertable, updatable );
+			annotations.append( " } )" );
+		}
+		return annotations.toString();
+	}
+
+	private void buildArrayOfJoinColumnAnnotation(
+			Iterator<Selectable> columns,
+			Iterator<Selectable> referencedColumnsIterator,
+			StringBuffer annotations,
+			boolean insertable,
+			boolean updatable
+	) {
+		while ( columns.hasNext() ) {
+			Selectable selectable = columns.next();
+			Selectable referencedColumn = null;
+			if(referencedColumnsIterator!=null) {
+				referencedColumn = referencedColumnsIterator.next();
+			}
+
+			//TODO formula in multicolumns not supported by annotations
+			if (!( selectable.isFormula() )) {
+				annotations.append( "\n        " );
+				buildJoinColumnAnnotation( selectable, referencedColumn, annotations, insertable, updatable );
+				annotations.append( ", " );
+			}
+		}
+		annotations.setLength( annotations.length() - 2 );
+	}
+
+	private void buildJoinColumnAnnotation(
+			Selectable selectable,
+			Selectable referencedColumn,
+			StringBuffer annotations,
+			boolean insertable,
+			boolean updatable) {
+		//TODO not supported by HA
+		if (!( selectable.isFormula() )) {
+			Column column = (Column) selectable;
+			annotations.append("@").append( importType("jakarta.persistence.JoinColumn") )
+					.append("(name=\"" ).append( column.getName() ).append( "\"" );
+			//TODO handle referenced column name, this is a hard one
+			if(referencedColumn!=null) {
+				annotations.append(", referencedColumnName=\"" ).append( referencedColumn.getText() ).append( "\"" );
+			}
+
+			appendCommonColumnInfo(annotations, column, insertable, updatable);
+			//TODO support secondary table
+			annotations.append( ")" );
+		}
+	}
+
+	public String[] getCascadeTypes(Property property) {
+		StringTokenizer st =  new StringTokenizer( property.getCascade(), ", ", false );
+		List<String> types = new ArrayList<>();
+		while ( st.hasMoreElements() ) {
+			String element = ( (String) st.nextElement() ).toLowerCase();
+			switch (element) {
+				case "persist" -> types.add(importType("jakarta.persistence.CascadeType") + ".PERSIST");
+				case "merge" -> types.add(importType("jakarta.persistence.CascadeType") + ".MERGE");
+				case "delete" -> types.add(importType("jakarta.persistence.CascadeType") + ".REMOVE");
+				case "refresh" -> types.add(importType("jakarta.persistence.CascadeType") + ".REFRESH");
+				case "all" -> types.add(importType("jakarta.persistence.CascadeType") + ".ALL");
+			}
+		}
+		return types.toArray(new String[0]);
+	}
+
+	public String generateManyToOneAnnotation(Property property) {
+		return AnnotationBuilder.createAnnotation(importType("jakarta.persistence.ManyToOne"))
+					.addAttribute("cascade", getCascadeTypes(property))
+					.addAttribute("fetch", getFetchType(property))
+					.getResult() + getHibernateCascadeTypeAnnotation(property);
+	}
+
+	public boolean isSharedPkBasedOneToOne(OneToOne oneToOne){
+		Iterator<Selectable> joinSelectablesIt = oneToOne.getSelectables().iterator();
+		Set<Selectable> joinSelectables = new HashSet<>();
+		while ( joinSelectablesIt.hasNext() ) {
+			joinSelectables.add( joinSelectablesIt.next() );
+		}
+
+		if (joinSelectables.isEmpty())
+			return false;
+
+		for (Selectable selectable : getIdentifierProperty().getSelectables()) {
+			if (!joinSelectables.contains(selectable))
+				return false;
+		}
+
+		return true;
+	}
+
+	public String generateOneToOneAnnotation(Property property, Metadata md) {
+		OneToOne oneToOne = (OneToOne)property.getValue();
+
+		boolean pkIsAlsoFk = isSharedPkBasedOneToOne(oneToOne);
+
+		AnnotationBuilder ab = AnnotationBuilder.createAnnotation( importType("jakarta.persistence.OneToOne") )
+				.addAttribute( "cascade", getCascadeTypes(property))
+				.addAttribute( "fetch", getFetchType(property));
+
+		if ( oneToOne.getForeignKeyType().equals(ForeignKeyDirection.TO_PARENT) ){
+			ab.addQuotedAttribute("mappedBy", getOneToOneMappedBy(md, oneToOne));
+		}
+
+		StringBuilder buffer = new StringBuilder(ab.getResult());
+		buffer.append(getHibernateCascadeTypeAnnotation(property));
+
+		if ( pkIsAlsoFk && oneToOne.getForeignKeyType().equals(ForeignKeyDirection.FROM_PARENT) ){
+			AnnotationBuilder ab1 = AnnotationBuilder.createAnnotation( importType("jakarta.persistence.PrimaryKeyJoinColumn") );
+			buffer.append(ab1.getResult());
+		}
+
+		return buffer.toString();
+	}
+
+	public String getHibernateCascadeTypeAnnotation(Property property) {
+		StringTokenizer st =  new StringTokenizer( property.getCascade(), ", ", false );
+		String cascadeType = null;
+		StringBuilder cascade = new StringBuilder();
+		while ( st.hasMoreElements() ) {
+			String element = ( (String) st.nextElement() ).toLowerCase();
+			switch (element) {
+				case "all-delete-orphan" -> {
+					if (cascadeType == null) cascadeType = importType("org.hibernate.annotations.CascadeType");
+					cascade.append(cascadeType).append(".ALL").append(", ")
+							.append(cascadeType).append(".DELETE_ORPHAN").append(", ");
+				}
+				case "delete-orphan" -> {
+					if (cascadeType == null) cascadeType = importType("org.hibernate.annotations.CascadeType");
+					cascade.append(cascadeType).append(".DELETE_ORPHAN").append(", ");
+				}
+				case "save-update" -> {
+					if (cascadeType == null) cascadeType = importType("org.hibernate.annotations.CascadeType");
+					cascade.append(cascadeType).append(".MERGE").append(", ");
+				}
+				case "replicate" -> {
+					if (cascadeType == null) cascadeType = importType("org.hibernate.annotations.CascadeType");
+					cascade.append(cascadeType).append(".REPLICATE").append(", ");
+				}
+				case "lock" -> {
+					if (cascadeType == null) cascadeType = importType("org.hibernate.annotations.CascadeType");
+					cascade.append(cascadeType).append(".LOCK").append(", ");
+				}
+				case "evict" -> {
+					if (cascadeType == null) cascadeType = importType("org.hibernate.annotations.CascadeType");
+					cascade.append(cascadeType).append(".EVICT").append(", ");
+				}
+			}
+		}
+		if ( cascade.length() >= 2 ) {
+			String hibernateCascade = importType("org.hibernate.annotations.Cascade");
+			cascade.insert(0, "@" + hibernateCascade + "( {");
+			cascade.setLength( cascade.length() - 2 );
+			cascade.append("} )");
+		}
+		return cascade.toString();
+	}
+
+	public String getFetchType(Property property) {
+		Value value = property.getValue();
+		String fetchType = importType( "jakarta.persistence.FetchType");
+		boolean lazy;
+		if ( value instanceof ToOne ) {
+			lazy = ( (ToOne) value ).isLazy();
+		}
+		else if ( value instanceof Collection ) {
+			lazy = ( (Collection) value ).isLazy();
+		}
+		else {
+			//we're not collection neither *toone so we are looking for property fetching
+			lazy = property.isLazy();
+		}
+		if ( lazy ) {
+			return fetchType + "." + "LAZY";
+		}
+		else {
+			return fetchType + "." + "EAGER";
+		}
+	}
+
+	public Object getDecoratedObject() {
+		return clazz;
+	}
+
+	public String generateCollectionAnnotation(Property property, Metadata md) {
+		StringBuffer annotation = new StringBuffer();
+		Value value = property.getValue();
+		if (value instanceof Collection collection) {
+			if ( collection.isOneToMany() ) {
+				String mappedBy = null;
+				AnnotationBuilder ab = AnnotationBuilder.createAnnotation( importType( "jakarta.persistence.OneToMany") );
+				ab.addAttribute( "cascade", getCascadeTypes( property ) );
+				ab.addAttribute( "fetch", getFetchType (property) );
+				if ( collection.isInverse() ) {
+					mappedBy = getOneToManyMappedBy( md, collection );
+					ab.addQuotedAttribute( "mappedBy", mappedBy );
+				}
+				annotation.append( ab.getResult() );
+
+				if (mappedBy == null) annotation.append("\n").append( generateJoinColumnsAnnotation(property, md) );
+			}
+			else {
+				//TODO do the @OneToMany @JoinTable
+				//TODO composite element
+				String mappedBy = null;
+				AnnotationBuilder ab = AnnotationBuilder.createAnnotation( importType( "jakarta.persistence.ManyToMany") );
+				ab.addAttribute( "cascade", getCascadeTypes( property ) );
+				ab.addAttribute( "fetch", getFetchType (property) );
+
+				if ( collection.isInverse() ) {
+					mappedBy = getManyToManyMappedBy( md, collection );
+					ab.addQuotedAttribute( "mappedBy", mappedBy );
+				}
+				annotation.append(ab.getResult());
+				if (mappedBy == null) {
+					annotation.append("\n    @");
+					annotation.append( importType( "jakarta.persistence.JoinTable") ).append( "(name=\"" );
+					Table table = collection.getCollectionTable();
+
+					annotation.append( table.getName() );
+					annotation.append( "\"" );
+					if ( StringHelper.isNotEmpty( table.getSchema() ) ) {
+						annotation.append(", schema=\"").append( table.getSchema() ).append("\"");
+					}
+					if ( StringHelper.isNotEmpty( table.getCatalog() ) ) {
+						annotation.append(", catalog=\"").append( table.getCatalog() ).append("\"");
+					}
+					String uniqueConstraint = generateAnnTableUniqueConstraint(table);
+					if (!uniqueConstraint.isEmpty()) {
+						annotation.append(", uniqueConstraints=").append(uniqueConstraint);
+					}
+					annotation.append( ", joinColumns = { ");
+					buildArrayOfJoinColumnAnnotation(
+							collection.getKey().getSelectables().iterator(),
+							null,
+							annotation,
+							property.isInsertable(),
+							property.isUpdatable()
+					);
+					annotation.append( " }");
+					annotation.append( ", inverseJoinColumns = { ");
+					buildArrayOfJoinColumnAnnotation(
+							collection.getElement().getSelectables().iterator(),
+							null,
+							annotation,
+							property.isInsertable(),
+							property.isUpdatable()
+					);
+					annotation.append( " }");
+					annotation.append(")");
+				}
+
+			}
+			String hibernateCascade = getHibernateCascadeTypeAnnotation( property );
+			if (!hibernateCascade.isEmpty()) annotation.append("\n    ").append(hibernateCascade);
+		}
+		return annotation.toString();
+	}
+
+	private String getManyToManyMappedBy(Metadata md, Collection collection) {
+		String mappedBy;
+		Iterator<Selectable> joinColumnsIt = collection.getKey().getSelectables().iterator();
+		Set<Selectable> joinColumns = new HashSet<>();
+		while ( joinColumnsIt.hasNext() ) {
+			joinColumns.add( joinColumnsIt.next() );
+		}
+		ManyToOne manyToOne = (ManyToOne) collection.getElement();
+		PersistentClass pc = md.getEntityBinding(manyToOne.getReferencedEntityName());
+		Iterator<Property> properties = pc.getProperties().iterator();
+		//TODO we should check the table too
+		boolean isOtherSide = false;
+		mappedBy = "unresolved";
+		while ( ! isOtherSide && properties.hasNext() ) {
+			Property collectionProperty = properties.next();
+			Value collectionValue = collectionProperty.getValue();
+			if (collectionValue instanceof Collection realCollectionValue) {
+				if ( ! realCollectionValue.isOneToMany() ) {
+					if ( joinColumns.size() == realCollectionValue.getElement().getColumnSpan() ) {
+						isOtherSide = true;
+						for (Selectable selectable : realCollectionValue.getElement().getSelectables()) {
+							if (!joinColumns.contains(selectable)) {
+								isOtherSide = false;
+								break;
+							}
+						}
+						if (isOtherSide) {
+							mappedBy = collectionProperty.getName();
+						}
+					}
+				}
+			}
+		}
+		return mappedBy;
+	}
+
+	private String getOneToManyMappedBy(Metadata md, Collection collection) {
+		String mappedBy;
+		Iterator<Selectable> joinColumnsIt = collection.getKey().getSelectables().iterator();
+		Set<Selectable> joinColumns = new HashSet<>();
+		while ( joinColumnsIt.hasNext() ) {
+			joinColumns.add( joinColumnsIt.next() );
+		}
+		OneToMany oneToMany = (OneToMany) collection.getElement();
+		PersistentClass pc = md.getEntityBinding(oneToMany.getReferencedEntityName());
+		Iterator<Property> properties = pc.getProperties().iterator();
+		//TODO we should check the table too
+		boolean isOtherSide = false;
+		mappedBy = "unresolved";
+		while ( ! isOtherSide && properties.hasNext() ) {
+			Property manyProperty = properties.next();
+			Value manyValue = manyProperty.getValue();
+			if (manyValue instanceof ManyToOne) {
+				if ( joinColumns.size() == manyValue.getColumnSpan() ) {
+					isOtherSide = true;
+					for (Selectable selectable : manyValue.getSelectables()) {
+						if (!joinColumns.contains(selectable)) {
+							isOtherSide = false;
+							break;
+						}
+					}
+					if (isOtherSide) {
+						mappedBy = manyProperty.getName();
+					}
+				}
+
+			}
+		}
+		return mappedBy;
+	}
+
+	private String getOneToOneMappedBy(Metadata md, OneToOne oneToOne) {
+		String mappedBy;
+		Iterator<Selectable> joinSelectablesIt = oneToOne.getSelectables().iterator();
+		Set<Selectable> joinSelectables = new HashSet<>();
+		while ( joinSelectablesIt.hasNext() ) {
+			joinSelectables.add( joinSelectablesIt.next() );
+		}
+		PersistentClass pc = md.getEntityBinding(oneToOne.getReferencedEntityName());
+		String referencedPropertyName = oneToOne.getReferencedPropertyName();
+		if ( referencedPropertyName != null )
+			return referencedPropertyName;
+
+		Iterator<Property> properties = pc.getProperties().iterator();
+		//TODO we should check the table too
+		boolean isOtherSide = false;
+		mappedBy = "unresolved";
+
+
+		while ( ! isOtherSide && properties.hasNext() ) {
+			Property oneProperty = properties.next();
+			Value manyValue = oneProperty.getValue();
+			if ((manyValue instanceof OneToOne || manyValue instanceof ManyToOne)) {
+				if ( joinSelectables.size() == manyValue.getColumnSpan() ) {
+					isOtherSide = true;
+					for (Selectable selectable : manyValue.getSelectables()) {
+						if (!joinSelectables.contains(selectable)) {
+							isOtherSide = false;
+							break;
+						}
+					}
+					if (isOtherSide) {
+						mappedBy = oneProperty.getName();
+					}
+				}
+
+			}
+		}
+		return mappedBy;
+	}
+
+	public boolean isSubclass() {
+		return clazz.getSuperclass()!=null;
+	}
+
+	public List<Property> getPropertyClosureForFullConstructor() {
+		return getPropertyClosureForFullConstructor(clazz);
+	}
+
+	protected List<Property> getPropertyClosureForFullConstructor(PersistentClass pc) {
+		List<Property> l = new ArrayList<>( getPropertyClosureForSuperclassFullConstructor( pc ) );
+		l.addAll(getPropertiesForFullConstructor( pc ));
+		return l;
+	}
+
+	public List<Property> getPropertiesForFullConstructor() {
+		return getPropertiesForFullConstructor(clazz);
+	}
+
+	protected List<Property> getPropertiesForFullConstructor(PersistentClass pc) {
+		List<Property> result = new ArrayList<>();
+
+		for ( Iterator<Property> myFields = getAllPropertiesIterator(pc); myFields.hasNext() ; ) {
+			Property field = myFields.next();
+			// TODO: if(!field.isGenerated() ) ) {
+			if(field.equals(pc.getIdentifierProperty()) && !isAssignedIdentifier(pc, field)) {
+				continue; // dont add non assigned identifiers
+			}
+			else if(field.equals(pc.getVersion())) {
+				continue; // version prop
+			}
+			else if(field.isBackRef()) {
+				continue;
+			}
+			else if(isFormula(field)) {
+				continue;
+			}
+			else if(!isToBeGenerated(field)) {
+				continue;
+			}
+			else {
+				result.add( field );
+			}
+		}
+
+		return result;
+	}
+
+	private boolean isFormula(Property field) {
+		Value value = field.getValue();
+		boolean foundFormula = false;
+
+		if(value!=null && value.getColumnSpan()>0) {
+			for (Selectable element : value.getSelectables()) {
+				if (!(element instanceof Formula)) {
+					return false;
+				}
+				else {
+					foundFormula = true;
+				}
+			}
+		}
+		else {
+			return false;
+		}
+		return foundFormula;
+	}
+
+	public List<Property> getPropertyClosureForSuperclassFullConstructor() {
+		return getPropertyClosureForSuperclassFullConstructor(clazz);
+	}
+
+	public List<Property> getPropertyClosureForSuperclassFullConstructor(PersistentClass pc) {
+		List<Property> result = new ArrayList<>();
+		if ( pc.getSuperclass() != null ) {
+			// The correct sequence is vital here, as the subclass should be
+			// able to invoke the fullconstructor based on the sequence returned
+			// by this method!
+			result.addAll( getPropertyClosureForSuperclassFullConstructor( pc.getSuperclass() ) );
+			result.addAll( getPropertiesForFullConstructor( pc.getSuperclass() ) );
+		}
+
+		return result;
+	}
+
+
+	public List<Property> getPropertyClosureForMinimalConstructor() {
+		return getPropertyClosureForMinimalConstructor(clazz);
+	}
+
+	protected List<Property> getPropertyClosureForMinimalConstructor(PersistentClass pc) {
+		List<Property> l = new ArrayList<>( getPropertyClosureForSuperclassMinConstructor( pc ) );
+		l.addAll(getPropertiesForMinimalConstructor( pc ));
+		return l;
+	}
+
+	public List<Property> getPropertiesForMinimalConstructor() {
+		return getPropertiesForMinimalConstructor(clazz);
+	}
+
+	protected List<Property> getPropertiesForMinimalConstructor(PersistentClass pc) {
+		List<Property> result = new ArrayList<>();
+
+		for ( Iterator<Property> myFields = getAllPropertiesIterator(pc); myFields.hasNext() ; ) {
+			Property property = myFields.next();
+			if(property.equals(pc.getIdentifierProperty())) {
+				if(isAssignedIdentifier(pc, property)) {
+					result.add(property);
+				}
+				else {
+					continue;
+				}
+			}
+			else if (property.equals(pc.getVersion())) {
+				continue; // the version property should not be in the result.
+			}
+			else if( isRequiredInConstructor(property) ) {
+				result.add(property);
+			}
+		}
+
+		return result;
+	}
+
+	protected boolean isAssignedIdentifier(PersistentClass pc, Property property) {
+		if(property.equals(pc.getIdentifierProperty())) {
+			if(property.getValue() instanceof EnhancedValue sv) {
+				return "assigned".equals(sv.getIdentifierGeneratorStrategy());
+			}
+			else if (property.getValue().isSimpleValue()) {
+				ValueUtil v = new ValueUtil((SimpleValue)property.getValue());
+				return "assigned".equals(v.getIdentifierGeneratorStrategy());
+			}
+		}
+		return false;
+	}
+
+	public List<Property> getPropertyClosureForSuperclassMinimalConstructor() {
+		return getPropertyClosureForSuperclassMinConstructor(clazz);
+	}
+
+	protected List<Property> getPropertyClosureForSuperclassMinConstructor(PersistentClass pc) {
+		List<Property> result = new ArrayList<>();
+		if ( pc.getSuperclass() != null ) {
+			// The correct sequence is vital here, as the subclass should be
+			// able to invoke the fullconstructor based on the sequence returned
+			// by this method!
+			result.addAll( getPropertyClosureForSuperclassMinConstructor( pc.getSuperclass() ) );
+			result.addAll( getPropertiesForMinimalConstructor( pc.getSuperclass() ) );
+		}
+
+		return result;
+	}
+
+	public POJOClass getSuperClass(){
+		if (!isSubclass())
+			return null;
+		return new EntityPOJOClass(clazz.getSuperclass(),c2j);
+	}
+
+
+	public String toString() {
+		return "Entity: " + (clazz==null?"<none>":clazz.getEntityName());
+	}
+
+	public boolean hasVersionProperty() {
+		return clazz.isVersioned() && clazz instanceof RootClass;
+	}
+
+	/*
+	 * @see org.hibernate.tool.hbm2x.pojo.POJOClass#getVersionProperty()
+	 */
+	public Property getVersionProperty()
+	{
+		return clazz.getVersion();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ImportContext.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ImportContext.java
new file mode 100644
index 000000000000..d4533e4bf032
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ImportContext.java
@@ -0,0 +1,26 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+public interface ImportContext {
+
+	/**
+	 * Add fqcn to the import list. Returns fqcn as needed in source code.
+	 * Attempts to handle fqcn with array and generics references.
+	 * <p>
+	 * e.g.
+	 * {@code java.util.Collection<org.marvel.Hulk>} imports java.util.Collection and returns Collection
+	 * {@code org.marvel.Hulk[]} imports org.marvel.Hulk and returns Hulk
+	 *
+	 *
+	 * @return import string
+	 */
+	public abstract String importType(String fqcn);
+
+	public abstract String staticImport(String fqcn, String member);
+
+	public abstract String generateImports();
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ImportContextImpl.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ImportContextImpl.java
new file mode 100644
index 000000000000..c51ee9de2e7f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ImportContextImpl.java
@@ -0,0 +1,144 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.internal.util.StringHelper;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+public class ImportContextImpl implements ImportContext {
+
+	Set<String> imports = new TreeSet<>();
+	Set<String> staticImports = new TreeSet<>();
+	Map<String, String> simpleNames = new HashMap<>();
+
+	String basePackage;
+
+	// TODO: share this somehow, redundant from Cfg2JavaTool
+	private static final Map<String, String> PRIMITIVES = new HashMap<>();
+	static {
+		PRIMITIVES.put( "char", "Character" );
+
+		PRIMITIVES.put( "byte", "Byte" );
+		PRIMITIVES.put( "short", "Short" );
+		PRIMITIVES.put( "int", "Integer" );
+		PRIMITIVES.put( "long", "Long" );
+
+		PRIMITIVES.put( "boolean", "Boolean" );
+
+		PRIMITIVES.put( "float", "Float" );
+		PRIMITIVES.put( "double", "Double" );
+
+	}
+
+	public ImportContextImpl(String basePackage) {
+		this.basePackage = basePackage;
+	}
+
+	/**
+	 * Add fqcn to the import list. Returns fqcn as needed in source code.
+	 * Attempts to handle fqcn with array and generics references.
+	 * <p>
+	 * e.g.
+	 * {@code java.util.Collection<org.marvel.Hulk>} imports java.util.Collection and returns Collection
+	 * {@code org.marvel.Hulk[]} imports org.marvel.Hulk and returns Hulk
+	 *
+	 *
+	 * @return import string
+	 */
+	public String importType(String fqcn) {
+		String result = fqcn;
+
+		String additionalTypePart = null;
+		if(fqcn.indexOf('<')>=0) {
+			additionalTypePart = result.substring(fqcn.indexOf('<'));
+			result = result.substring(0,fqcn.indexOf('<'));
+			fqcn = result;
+		}
+		else if(fqcn.indexOf('[')>=0) {
+			additionalTypePart = result.substring(fqcn.indexOf('['));
+			result = result.substring(0,fqcn.indexOf('['));
+			fqcn = result;
+		}
+
+		String pureFqcn = fqcn.replace( '$', '.' );
+
+		boolean canBeSimple = true;
+
+
+		String simpleName = StringHelper.unqualify(fqcn);
+		if(simpleNames.containsKey(simpleName)) {
+			String existingFqcn = simpleNames.get(simpleName);
+			canBeSimple = existingFqcn.equals(pureFqcn);
+		}
+		else {
+			simpleNames.put(simpleName, pureFqcn);
+			imports.add( pureFqcn );
+		}
+
+
+		if ( inSamePackage(fqcn) || (imports.contains( pureFqcn ) && canBeSimple) ) {
+			result = StringHelper.unqualify( result ); // dequalify
+		}
+		else if ( inJavaLang( fqcn ) ) {
+			result = result.substring( "java.lang.".length() );
+		}
+
+		if(additionalTypePart!=null) {
+			result = result + additionalTypePart;
+		}
+
+		result = result.replace( '$', '.' );
+		return result;
+	}
+
+	public String staticImport(String fqcn, String member) {
+		String local = fqcn + "." + member;
+		imports.add(local);
+		staticImports.add(local);
+
+		if(member.equals("*")) {
+			return "";
+		}
+		else {
+			return member;
+		}
+	}
+
+	private boolean inDefaultPackage(String className) {
+		return !className.contains(".");
+	}
+
+	private boolean isPrimitive(String className) {
+		return PRIMITIVES.containsKey( className );
+	}
+
+	private boolean inSamePackage(String className) {
+		return StringHelper.qualifier( className ).equals(basePackage);
+	}
+
+	private boolean inJavaLang(String className) {
+		return "java.lang".equals( StringHelper.qualifier( className ) );
+	}
+
+	public String generateImports() {
+		StringBuilder buf = new StringBuilder();
+		for (String next : imports) {
+			if (!(isPrimitive(next) || inDefaultPackage(next) || inJavaLang(next) || inSamePackage(next))) {
+				if (staticImports.contains(next)) {
+					buf.append("import static ").append(next).append(";\r\n");
+				}
+				else {
+					buf.append("import ").append(next).append(";\r\n");
+				}
+			}
+		}
+
+		return buf.toString();
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/JavaExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/JavaExporter.java
new file mode 100644
index 000000000000..15bac62dc937
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/JavaExporter.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.tool.reveng.internal.export.common.GenericExporter;
+
+/**
+ * @author max
+ */
+public class JavaExporter extends GenericExporter {
+
+	private static final String POJO_JAVACLASS_FTL = "pojo/Pojo.ftl";
+
+	protected void init() {
+		getProperties().put(TEMPLATE_NAME, POJO_JAVACLASS_FTL);
+		getProperties().put(FILE_PATTERN, "{package-name}/{class-name}.java");
+	}
+
+	public JavaExporter() {
+		init();
+	}
+
+	public String getName() {
+		return "hbm2java";
+	}
+
+	protected void setupContext() {
+		//TODO: this safe guard should be in the root templates instead for each variable they depend on.
+		if(!getProperties().containsKey("ejb3")) {
+			getProperties().put("ejb3", "false");
+		}
+		if(!getProperties().containsKey("jdk5")) {
+			getProperties().put("jdk5", "false");
+		}
+		super.setupContext();
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/JavaTypeFromValueVisitor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/JavaTypeFromValueVisitor.java
new file mode 100644
index 000000000000..f3d61478d698
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/JavaTypeFromValueVisitor.java
@@ -0,0 +1,103 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.HibernateException;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.Map;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.Set;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.ToOne;
+import org.hibernate.mapping.Value;
+import org.hibernate.tool.reveng.internal.export.common.DefaultValueVisitor;
+import org.hibernate.type.CustomType;
+import org.hibernate.type.Type;
+
+public class JavaTypeFromValueVisitor extends DefaultValueVisitor {
+
+
+	public JavaTypeFromValueVisitor() {
+		super( true );
+	}
+
+	// special handling for Map's to avoid initialization of comparators that depends on the keys/values which might not be generated yet.
+	public Object accept(Map o) {
+		if ( o.isSorted() ) {
+			return "java.util.SortedMap";
+		}
+		return super.accept(o);
+	}
+
+	// special handling for Set's to avoid initialization of comparators that depends on the keys/values which might not be generated yet.
+	public Object accept(Set o) {
+		if ( o.isSorted() ) {
+			return "java.util.SortedSet";
+		}
+		return super.accept(o);
+	}
+
+	public Object accept(Component value) {
+		// composite-element breaks without it.
+		return value.getComponentClassName();
+	}
+
+	public Object accept(OneToOne o) {
+		return acceptToOne(o);
+	}
+
+	public Object accept(ManyToOne o) {
+		return acceptToOne(o);
+	}
+
+	private Object acceptToOne(ToOne value) {
+		return value.getReferencedEntityName(); // should get the cfg and lookup the persistenclass.
+	}
+
+	public Object accept(OneToMany value) {
+		return value.getAssociatedClass().getClassName();
+	}
+
+	private String toName(Class<?> c) {
+
+		if ( c.isArray() ) {
+			Class<?> a = c.getComponentType();
+
+			return a.getName() + "[]";
+		}
+		else {
+			return c.getName();
+		}
+	}
+
+	protected Object handle(Value o) {
+		try {
+			// have to attempt calling gettype to decide if its custom type.
+			Type type = o.getType();
+			if(type instanceof CustomType) {
+				return toName( type.getReturnedClass() );
+			}
+		}
+		catch(HibernateException he) {
+			// ignore
+		}
+
+		if ( o.isSimpleValue() ) {
+			// this logic make us use the raw typename if it is something else than an Hibernate type. So, if user wrote long we will use long...if he meant to have a Long then he should use the java.lang.Long version.
+			String typename = ( (SimpleValue) o).getTypeName();
+			if ( !Cfg2JavaTool.isNonPrimitiveTypeName( typename ) ) {
+				String val = ( (SimpleValue) o).getTypeName();
+				if(val!=null) return val; // val can be null when type is any
+			}
+		}
+
+	return toName( o.getType().getReturnedClass() );
+
+	}
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeConstants.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeConstants.java
new file mode 100644
index 000000000000..781a3ae2d805
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeConstants.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+public interface MetaAttributeConstants {
+
+	static final String GENERATED_CLASS = "generated-class";
+	static final String INTERFACE = "interface";
+	static final String CLASS_MODIFIER = "class-modifier";
+	static final String SCOPE_CLASS = "scope-class";
+	static final String CLASS_DESCRIPTION = "class-description";
+	static final String IMPLEMENTS = "implements";
+	static final String EXTENDS = "extends";
+	static final String GEN_PROPERTY = "gen-property"; // in templates.
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeHelper.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeHelper.java
new file mode 100644
index 000000000000..a219f7686205
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeHelper.java
@@ -0,0 +1,74 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.mapping.MetaAttribute;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Helper for loading, merging  and accessing {@code <meta>} tags.
+ *
+ * @author max
+ *
+ *
+ */
+public final class MetaAttributeHelper {
+
+	private MetaAttributeHelper() {
+		//noop
+	}
+
+	/**
+	 * @param meta
+	 * @param separator
+	 */
+	public static String getMetaAsString(Collection<?> meta, String separator) {
+		if(meta==null || meta.isEmpty() ) {
+			return "";
+		}
+		StringBuffer buf = new StringBuffer();
+
+			for (Iterator<?> iter = meta.iterator(); iter.hasNext();) {
+				buf.append(iter.next() );
+				if(iter.hasNext() ) buf.append(separator);
+			}
+		return buf.toString();
+	}
+
+	public static String getMetaAsString(MetaAttribute meta, String seperator) {
+		if(meta==null) {
+			return null;
+		}
+		else {
+			return getMetaAsString(meta.getValues(),seperator);
+		}
+	}
+
+	static	boolean getMetaAsBool(Collection<?> c, boolean defaultValue) {
+			if(c==null || c.isEmpty() ) {
+				return defaultValue;
+			}
+			else {
+				return Boolean.valueOf(c.iterator().next().toString() ).booleanValue();
+			}
+		}
+
+	public static String getMetaAsString(MetaAttribute c) {
+		return c==null?"":getMetaAsString(c.getValues() );
+	}
+
+	static String getMetaAsString(Collection<?> c) {
+		return getMetaAsString(c, "");
+	}
+
+	public static boolean getMetaAsBool(MetaAttribute metaAttribute, boolean defaultValue) {
+		return getMetaAsBool(metaAttribute==null?null:metaAttribute.getValues(), defaultValue);
+	}
+
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/NoopImportContext.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/NoopImportContext.java
new file mode 100644
index 000000000000..2afba306aa2a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/NoopImportContext.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+public class NoopImportContext implements ImportContext {
+
+	public String importType(String fqcn) {
+		return fqcn;
+	}
+
+	public String staticImport(String fqcn, String member) {
+		return fqcn;
+	}
+
+	public String generateImports() {
+		return "";
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/POJOClass.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/POJOClass.java
new file mode 100644
index 000000000000..a4f86e2ad85f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/POJOClass.java
@@ -0,0 +1,112 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.mapping.Property;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Wrapper class over PersistentClass used in hbm2java and hbm2doc tool
+ * @author max
+ * @author <a href="mailto:abhayani@jboss.org">Amit Bhayani</a>
+ *
+ */
+public interface POJOClass extends ImportContext {
+
+	/**
+	 * Returns "package packagename;" where packagename is either the declared packagename,
+	 * or the one provide via meta attribute "generated-class".
+	 *
+	 * Returns "// default package" if no package declarition available.
+	 *
+	 */
+	public String getPackageDeclaration();
+
+	public String getClassModifiers();
+
+	public String getQualifiedDeclarationName();
+
+	/**
+	 * Returns the javadoc associated with the class.
+	 *
+	 * @param fallback the default text if nothing else is found
+	 * @param indent how many spaces should be added
+	 * @return
+	 */
+	public String getClassJavaDoc(String fallback, int indent);
+
+	/**
+	 *
+	 * @return declaration type "interface" or "class"
+	 */
+	public String getDeclarationType();
+
+	/**
+	 * @return unqualified classname for this class (can be changed by meta attribute "generated-class")
+	 */
+	public String getDeclarationName();
+
+	public String getImplementsDeclaration();
+	public String getImplements();
+
+	public String getExtendsDeclaration();
+	public String getExtends();
+
+	public String generateEquals(String thisName, String otherName, boolean useGenerics);
+
+	public boolean isComponent();
+
+	public String getExtraClassCode();
+
+	public boolean needsEqualsHashCode();
+
+	public boolean hasIdentifierProperty();
+
+	public String generateAnnColumnAnnotation(Property property);
+	public String generateAnnIdGenerator();
+	public String generateAnnTableUniqueConstraint();
+	public String generateBasicAnnotation(Property property);
+	public Iterator<Property> getAllPropertiesIterator();
+
+	public String getPackageName();
+	public String getShortName();
+
+	public Iterator<Property> getToStringPropertiesIterator();
+	public Iterator<Property> getEqualsHashCodePropertiesIterator();
+
+	public boolean needsToString();
+
+	public String getFieldJavaDoc(Property property, int indent);
+	public String getFieldDescription(Property property);
+
+	public Object getDecoratedObject();
+
+	public boolean isInterface();
+
+	public boolean isSubclass();
+
+	public List<Property> getPropertiesForFullConstructor();
+	public List<Property> getPropertyClosureForFullConstructor();
+	public List<Property> getPropertyClosureForSuperclassFullConstructor();
+
+	public boolean needsMinimalConstructor();
+	public boolean needsFullConstructor();
+	public List<Property> getPropertiesForMinimalConstructor();
+	public List<Property> getPropertyClosureForMinimalConstructor();
+	public List<Property> getPropertyClosureForSuperclassMinimalConstructor();
+
+	public POJOClass getSuperClass();
+
+	public String getJavaTypeName(Property p, boolean useGenerics);
+	public String getFieldInitialization(Property p, boolean useGenerics);
+
+	public Property getIdentifierProperty();
+
+	public boolean hasVersionProperty();
+	public Property getVersionProperty();
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/BadCachingDetector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/BadCachingDetector.java
new file mode 100644
index 000000000000..e7dfdc392c04
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/BadCachingDetector.java
@@ -0,0 +1,38 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Value;
+import org.hibernate.tool.reveng.internal.export.common.EntityNameFromValueVisitor;
+
+public class BadCachingDetector extends EntityModelDetector {
+
+	public String getName() {
+		return "cache";
+	}
+
+	@Override
+	protected void visitProperty(Property property, IssueCollector collector) {
+		Value value = property.getValue();
+
+		if(value instanceof Collection col) {
+			if(col.getCacheConcurrencyStrategy()!=null) { // caching is enabled
+				if (!col.getElement().isSimpleValue()) {
+					String entityName = (String) col.getElement().accept( new EntityNameFromValueVisitor() );
+
+					if(entityName!=null) {
+						PersistentClass classMapping = getMetadata().getEntityBinding(entityName);
+						if(classMapping.getCacheConcurrencyStrategy()==null) {
+							collector.reportIssue( new Issue("CACHE_COLLECTION_NONCACHABLE_TARGET", Issue.HIGH_PRIORITY, "Entity '" + classMapping.getEntityName() +"' is referenced from the cache-enabled collection '" + col.getRole() + "' without the entity being cachable"));
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/Detector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/Detector.java
new file mode 100644
index 000000000000..8ddde80f24f8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/Detector.java
@@ -0,0 +1,24 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.hibernate.boot.Metadata;
+
+public abstract class Detector {
+
+	private Metadata metadata;
+
+	public void initialize(Metadata metadata) {
+		this.metadata = metadata;
+	}
+
+	protected Metadata getMetadata() {
+		return metadata;
+	}
+
+	abstract public void visit(IssueCollector collector);
+
+	abstract public String getName();
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/EntityModelDetector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/EntityModelDetector.java
new file mode 100644
index 000000000000..51373d4a9caa
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/EntityModelDetector.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+
+public abstract class EntityModelDetector extends Detector {
+
+	public void visit(IssueCollector collector) {
+		for (PersistentClass clazz : getMetadata().getEntityBindings()) {
+			this.visit(clazz, collector);
+		}
+	}
+
+	protected void visit(PersistentClass clazz, IssueCollector collector) {
+		visitProperties(clazz, collector );
+	}
+
+	private void visitProperties(PersistentClass clazz, IssueCollector collector) {
+		if(clazz.hasIdentifierProperty()) {
+			this.visitProperty(clazz.getIdentifierProperty(), collector);
+		}
+		for (Property property : clazz.getProperties()) {
+			this.visitProperty(property, collector);
+		}
+	}
+
+	protected abstract void visitProperty(Property property, IssueCollector collector);
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/HbmLint.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/HbmLint.java
new file mode 100644
index 000000000000..9862288acd64
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/HbmLint.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.hibernate.boot.Metadata;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HbmLint implements IssueCollector {
+
+
+	final Detector[] detectors;
+
+	public HbmLint(Detector[] detectors) {
+		this.detectors = detectors;
+	}
+
+	List<Issue> results = new ArrayList<Issue>();
+
+	public void analyze(Metadata metadata) {
+		for (int i = 0; i < detectors.length; i++) {
+			detectors[i].initialize(metadata);
+			detectors[i].visit(this);
+		}
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.hibernate.tool.hbmlint.IssueCollector#reportProblem(org.hibernate.tool.hbmlint.Issue)
+	 */
+	public void reportIssue(Issue analyze) {
+		results.add(analyze);
+	}
+
+	public List<Issue> getResults() {
+		return results;
+	}
+
+	public static HbmLint createInstance() {
+		return new HbmLint(
+			new Detector[] {
+					new BadCachingDetector(),
+					new InstrumentationDetector(),
+					new ShadowedIdentifierDetector(),
+					new SchemaByMetaDataDetector()
+			});
+
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/HbmLintExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/HbmLintExporter.java
new file mode 100644
index 000000000000..2055f3f7b16d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/HbmLintExporter.java
@@ -0,0 +1,30 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.hibernate.tool.reveng.internal.export.common.GenericExporter;
+
+public class HbmLintExporter extends GenericExporter {
+
+	private static final String TEXT_REPORT_FTL = "lint/text-report.ftl";
+
+	public void start() {
+		getProperties().put(TEMPLATE_NAME, TEXT_REPORT_FTL);
+		getProperties().put(FILE_PATTERN, "hbmlint-result.txt");
+		super.start();
+	}
+	protected void setupContext() {
+		HbmLint hbmlint = HbmLint.createInstance();
+		hbmlint.analyze( getMetadata() );
+		getProperties().put("lintissues", hbmlint.getResults());
+		super.setupContext();
+	}
+
+	public String getName() {
+		return "hbmlint";
+	}
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/InstrumentationDetector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/InstrumentationDetector.java
new file mode 100644
index 000000000000..c82cd183bfb5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/InstrumentationDetector.java
@@ -0,0 +1,80 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.hibernate.MappingException;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.bytecode.spi.BytecodeProvider;
+import org.hibernate.engine.spi.Managed;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+
+public class InstrumentationDetector extends EntityModelDetector {
+
+	public String getName() {
+		return "instrument";
+	}
+
+	private boolean enhanceEnabled;
+
+	public void initialize(Metadata metadata) {
+		super.initialize(metadata);
+		if (metadata instanceof MetadataImplementor) {
+			final BytecodeProvider bytecodeProvider =
+					((MetadataImplementor)metadata).getMetadataBuildingOptions().getServiceRegistry()
+							.getService( BytecodeProvider.class );
+			if(bytecodeProvider != null
+			&& !(bytecodeProvider instanceof org.hibernate.bytecode.internal.none.BytecodeProviderImpl)) {
+				enhanceEnabled = true;
+			}
+		}
+	}
+
+	protected void visit(PersistentClass clazz, IssueCollector collector) {
+		Class<?> mappedClass;
+		try {
+			mappedClass = clazz.getMappedClass();
+		}
+		catch(MappingException me) {
+			// ignore
+			return;
+		}
+
+		if(clazz.isLazy()) {
+			try {
+				mappedClass.getConstructor();
+			}
+			catch (SecurityException e) {
+				// ignore
+			}
+			catch (NoSuchMethodException e) {
+				collector.reportIssue(new Issue("LAZY_NO_DEFAULT_CONSTRUCTOR",Issue.NORMAL_PRIORITY, "lazy='true' set for '" + clazz.getEntityName() +"', but class has no default constructor." ));
+			}
+
+		}
+		else if(enhanceEnabled){
+			Class<?>[] interfaces = mappedClass.getInterfaces();
+			boolean enhanced = false;
+			for (Class<?> intface : interfaces) {
+				if (Managed.class.isAssignableFrom(intface)) {
+					enhanced = true;
+					break;
+				}
+			}
+
+			if (!enhanced) {
+				collector.reportIssue( new Issue("LAZY_NOT_INSTRUMENTED", Issue.HIGH_PRIORITY, "'" + clazz.getEntityName() + "' has lazy='false', but its class '" + mappedClass.getName() + "' has not been instrumented with javaassist") );
+			}
+
+		}
+	}
+
+	@Override
+	protected void visitProperty(
+			Property property,
+			IssueCollector collector) {
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/Issue.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/Issue.java
new file mode 100644
index 000000000000..e96d98747b63
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/Issue.java
@@ -0,0 +1,35 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+public class Issue {
+
+	public static final int HIGH_PRIORITY = 100;
+	public static final int NORMAL_PRIORITY = 50;
+	public static final int LOW_PRIORITY = 0;
+
+	private final String type;
+	private final int priority;
+
+	private final String description;
+
+	public Issue(String type, int priority, String description) {
+		this.description = description;
+		this.priority = priority;
+		this.type = type;
+	}
+
+	public String toString() {
+		return type + ":" + description;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public int getPriority() {
+		return priority;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/IssueCollector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/IssueCollector.java
new file mode 100644
index 000000000000..2ae00db9d0a0
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/IssueCollector.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+public interface IssueCollector {
+
+	public abstract void reportIssue(Issue analyze);
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/RelationalModelDetector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/RelationalModelDetector.java
new file mode 100644
index 000000000000..f29eb741425f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/RelationalModelDetector.java
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Table;
+
+import java.util.Iterator;
+
+public abstract class RelationalModelDetector extends Detector {
+
+	public void visit(IssueCollector collector) {
+		for (Iterator<Table> iter = getMetadata().collectTableMappings().iterator(); iter.hasNext();) {
+			Table table = (Table) iter.next();
+			this.visit(table, collector);
+		}
+	}
+
+	abstract protected void visit(Table table, Column col, IssueCollector collector);
+
+	protected void visitColumns(Table table, IssueCollector collector) {
+		for (Column col : table.getColumns()) {
+			this.visit(table, col, collector );
+		}
+	}
+
+	/**
+	 * Visit the given table and collect issues.
+	 */
+	protected void visit(Table table, IssueCollector collector) {
+		visitColumns(table, collector);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/SchemaByMetaDataDetector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/SchemaByMetaDataDetector.java
new file mode 100644
index 000000000000..bedfd3a1f973
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/SchemaByMetaDataDetector.java
@@ -0,0 +1,313 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.hibernate.HibernateException;
+import org.hibernate.MappingException;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.generator.Generator;
+import org.hibernate.id.PersistentIdentifierGenerator;
+import org.hibernate.id.enhanced.SequenceStyleGenerator;
+import org.hibernate.id.enhanced.TableGenerator;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.IdentifierCollection;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Table;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengDialectFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy.SchemaSelection;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataCollector;
+import org.hibernate.tool.reveng.internal.core.reader.DatabaseReader;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.TableSelectorStrategy;
+import org.hibernate.tool.reveng.internal.util.JdbcToHibernateTypeHelper;
+import org.hibernate.tool.reveng.internal.util.TableNameQualifier;
+import org.hibernate.type.MappingContext;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeMap;
+
+public class SchemaByMetaDataDetector extends RelationalModelDetector {
+
+	public String getName() {
+		return "schema";
+	}
+
+	DatabaseReader reader;
+
+	private SequenceCollector sequenceCollector;
+
+	private TableSelectorStrategy tableSelector;
+
+	private Dialect dialect;
+
+	private MappingContext mapping;
+
+	/** current table as read from the database */
+	Table currentDbTable = null;
+
+	public void initialize(Metadata metadata) {
+		super.initialize( metadata);
+		StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder();
+		ServiceRegistry serviceRegistry = builder.build();
+
+		Properties properties = Environment.getProperties();
+		JdbcServices jdbcServices = serviceRegistry.getService(JdbcServices.class);
+		if (jdbcServices != null) {
+			dialect = jdbcServices.getDialect();
+		}
+
+		tableSelector = new TableSelectorStrategy(
+				new DefaultStrategy() );
+		RevengDialect metadataDialect = RevengDialectFactory
+				.createMetaDataDialect(
+						dialect,
+						properties );
+		reader = DatabaseReader.create(
+				properties,
+				tableSelector,
+				metadataDialect,
+				serviceRegistry);
+		ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class);
+		sequenceCollector = SequenceCollector.create(connectionProvider);
+	}
+
+	public void visit(IssueCollector collector) {
+		super.visit(collector);
+		visitGenerators(collector);
+	}
+
+	public void visitGenerators(IssueCollector collector) {
+		Iterator<?> iter = iterateGenerators();
+
+		Set<?> sequences = Collections.EMPTY_SET;
+		if(dialect.getSequenceSupport().supportsSequences()) {
+			sequences = sequenceCollector.readSequences(dialect.getQuerySequencesString());
+		}
+
+		// TODO: move this check into something that could check per class or collection instead.
+		while ( iter.hasNext() ) {
+			PersistentIdentifierGenerator generator = (PersistentIdentifierGenerator) iter.next();
+			Object key = getGeneratorKey(generator);
+			if ( !isSequence(key, sequences) && !isTable( key ) ) {
+				collector.reportIssue( new Issue( "MISSING_ID_GENERATOR", Issue.HIGH_PRIORITY, "Missing sequence or table: " + key));
+			}
+		}
+
+	}
+
+	private boolean isSequence(Object key, Set<?> sequences) {
+		if(key instanceof String) {
+			if ( sequences.contains( key ) ) {
+				return true;
+			}
+			else {
+				String[] strings = StringHelper.split(".", (String) key);
+				if(strings.length==3) {
+					return sequences.contains(strings[2]);
+				}
+				else if (strings.length==2) {
+					return sequences.contains(strings[1]);
+				}
+			}
+		}
+		return false;
+	}
+
+	private boolean isTable(Object key) throws HibernateException {
+		// BIG HACK - should probably utilize the table cache before going to the jdbcreader :(
+		if(key instanceof String) {
+			String[] strings = StringHelper.split(".", (String) key);
+			if(strings.length==1) {
+				tableSelector.clearSchemaSelections();
+				tableSelector.addSchemaSelection( createSchemaSelection(null,null, strings[0]) );
+				Collection<Table> collection = readFromDatabase();
+				return !collection.isEmpty();
+			}
+			else if(strings.length==3) {
+				tableSelector.clearSchemaSelections();
+				tableSelector.addSchemaSelection( createSchemaSelection(strings[0],strings[1], strings[2]) );
+				Collection<Table> collection = readFromDatabase();
+				return !collection.isEmpty();
+			}
+			else if (strings.length==2) {
+				tableSelector.clearSchemaSelections();
+				tableSelector.addSchemaSelection( createSchemaSelection(null,strings[0], strings[1]) );
+				Collection<Table> collection = readFromDatabase();
+				return !collection.isEmpty();
+			}
+		}
+		return false;
+	}
+
+	public void visit(Table table, IssueCollector pc) {
+
+		if ( table.isPhysicalTable() ) {
+			setSchemaSelection( table );
+
+			Collection<Table> collection = readFromDatabase();
+
+			if ( collection.isEmpty() ) {
+				pc.reportIssue( new Issue( "SCHEMA_TABLE_MISSING",
+						Issue.HIGH_PRIORITY, "Missing table "
+								+ TableNameQualifier.qualify( table.getCatalog(), table
+										.getSchema(), table.getName() ) ) );
+			}
+			else if ( collection.size() > 1 ) {
+				pc.reportIssue( new Issue( "SCHEMA_TABLE_MISSING",
+						Issue.NORMAL_PRIORITY, "Found "
+								+ collection.size()
+								+ " tables for "
+								+ TableNameQualifier.qualify( table.getCatalog(), table
+										.getSchema(), table.getName() ) ) );
+			}
+			else {
+				currentDbTable = collection.iterator().next();
+				visitColumns(table,pc);
+			}
+		}
+	}
+
+	String table(Table t) {
+		return TableNameQualifier.qualify( t.getCatalog(), t.getSchema(), t.getName() );
+	}
+
+	public void visit(
+			Table table,
+			Column col,
+			IssueCollector pc) {
+		if ( currentDbTable == null ) {
+			return;
+		}
+
+		Column dbColumn = currentDbTable
+				.getColumn( new Column( col.getName() ) );
+
+		if ( dbColumn == null ) {
+			pc.reportIssue( new Issue( "SCHEMA_COLUMN_MISSING",
+					Issue.HIGH_PRIORITY, table(table) + " is missing column: " + col.getName() ) );
+		}
+		else {
+			//TODO: this needs to be able to know if a type is truly compatible or not. Right now it requires an exact match.
+			//String sqlType = col.getSqlType( dialect, mapping );
+			int dbTypeCode = dbColumn.getSqlTypeCode();
+			int modelTypeCode = col
+								.getSqlTypeCode( mapping );
+			// TODO: sqltype name string
+			if ( !(dbTypeCode == modelTypeCode ) ) {
+				pc.reportIssue( new Issue( "SCHEMA_COLUMN_TYPE_MISMATCH",
+						Issue.NORMAL_PRIORITY, table(table) + " has a wrong column type for "
+								+ col.getName() + ", expected: "
+								+ JdbcToHibernateTypeHelper.getJDBCTypeName(modelTypeCode) + " but was " + JdbcToHibernateTypeHelper.getJDBCTypeName(dbTypeCode) + " in db") );
+			}
+		}
+	}
+
+	private void setSchemaSelection(Table table) {
+		tableSelector.clearSchemaSelections();
+		tableSelector.addSchemaSelection( createSchemaSelection(
+				table.getCatalog(),
+				table.getSchema(),
+				table.getName() ) );
+	}
+
+	/**
+	 * @return iterator over all the IdentifierGenerator's found in the entitymodel and return a list of unique IdentifierGenerators
+	 */
+	private Iterator<Generator> iterateGenerators() throws MappingException {
+
+		TreeMap<Object, Generator> generators =
+				new TreeMap<>();
+
+		for ( PersistentClass pc : getMetadata().getEntityBindings() ) {
+			if ( !pc.isInherited() ) {
+
+				Generator ig = pc.getIdentifier()
+						.createGenerator(
+								dialect,
+								(RootClass) pc
+						);
+
+				if ( ig instanceof PersistentIdentifierGenerator ) {
+					generators.put( getGeneratorKey( (PersistentIdentifierGenerator) ig ), ig );
+				}
+
+			}
+		}
+
+		for ( org.hibernate.mapping.Collection collection : getMetadata().getCollectionBindings() ) {
+			if ( collection.isIdentified() ) {
+
+				Generator ig = ((IdentifierCollection) collection).getIdentifier().createGenerator(
+						dialect,
+						null
+				);
+
+				if ( ig instanceof PersistentIdentifierGenerator ) {
+					generators.put( (getGeneratorKey( (PersistentIdentifierGenerator) ig )), ig );
+				}
+
+			}
+		}
+
+		return generators.values().iterator();
+	}
+
+	private Collection<Table> readFromDatabase() {
+		RevengMetadataCollector revengMetadataCollector = new RevengMetadataCollector();
+		reader.readDatabaseSchema(revengMetadataCollector);
+		return revengMetadataCollector.getTables();
+	}
+
+	private SchemaSelection createSchemaSelection(String matchCatalog, String matchSchema, String matchTable) {
+		return new SchemaSelection() {
+			@Override
+			public String getMatchCatalog() {
+				return matchCatalog;
+			}
+			@Override
+			public String getMatchSchema() {
+				return matchSchema;
+			}
+			@Override
+			public String getMatchTable() {
+				return matchTable;
+			}
+
+		};
+	}
+
+	private String getGeneratorKey(PersistentIdentifierGenerator ig) {
+		String result = null;
+		if  (ig instanceof SequenceStyleGenerator) {
+			result = getKeyForSequenceStyleGenerator((SequenceStyleGenerator)ig);
+		}
+		else if (ig instanceof TableGenerator) {
+			result = getKeyForTableGenerator((TableGenerator)ig);
+		}
+		return result;
+	}
+
+	private String getKeyForSequenceStyleGenerator(SequenceStyleGenerator ig) {
+		return ig.getDatabaseStructure().getPhysicalName().render();
+	}
+
+	private String getKeyForTableGenerator(TableGenerator ig) {
+		return ig.getTableName();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/SequenceCollector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/SequenceCollector.java
new file mode 100644
index 000000000000..57019229dbb8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/SequenceCollector.java
@@ -0,0 +1,60 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.jboss.logging.Logger;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashSet;
+import java.util.Set;
+
+public class SequenceCollector {
+
+	private static final Logger log = Logger.getLogger(SequenceCollector.class);
+
+	public static SequenceCollector create(ConnectionProvider provider) {
+		return new SequenceCollector(provider);
+	}
+
+	final private ConnectionProvider provider;
+
+	private SequenceCollector(ConnectionProvider provider) {
+		this.provider = provider;
+	}
+
+	public Set<String> readSequences(String sql) {
+		Set<String> sequences = new HashSet<>();
+		if (sql != null) {
+			Connection connection = null;
+			try {
+				connection = provider.getConnection();
+				try (Statement statement = connection.createStatement(); ResultSet rs = statement.executeQuery( sql )) {
+					while ( rs.next() ) {
+						sequences.add( rs.getString( "SEQUENCE_NAME" ).toLowerCase().trim() );
+					}
+				}
+			}
+			catch (SQLException e) {
+				throw new RuntimeException("Problem while reading sequences", e);
+			}
+			finally {
+				if (connection != null) {
+					try {
+						provider.closeConnection( connection );
+					}
+					catch (SQLException e) {
+						log.warn( "Problem while closing connection", e );
+					}
+				}
+			}
+		}
+		return sequences;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/ShadowedIdentifierDetector.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/ShadowedIdentifierDetector.java
new file mode 100644
index 000000000000..727d2cc22ba3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/ShadowedIdentifierDetector.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.hibernate.mapping.Property;
+
+public class ShadowedIdentifierDetector extends EntityModelDetector {
+
+	public String getName() {
+		return "shadow-id";
+	}
+
+	@Override
+	protected void visitProperty(Property property, IssueCollector collector) {
+		if(property.getName().equals("id")) {
+			if (property != property.getPersistentClass().getIdentifierProperty()) {
+				collector.reportIssue(new Issue("ID_SHADOWED", Issue.LOW_PRIORITY, property.getPersistentClass().getEntityName() + " has a normal property named 'id'. This can cause issues since HQL queries will always interpret 'id' as the identifier and not the concrete property"));
+			}
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/mapping/MappingExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/mapping/MappingExporter.java
new file mode 100644
index 000000000000..698be9e2aa88
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/mapping/MappingExporter.java
@@ -0,0 +1,174 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.mapping;
+
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import org.apache.commons.collections4.list.UnmodifiableList;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.jaxb.Origin;
+import org.hibernate.boot.jaxb.SourceType;
+import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
+import org.hibernate.boot.jaxb.hbm.transform.HbmXmlTransformer;
+import org.hibernate.boot.jaxb.hbm.transform.UnsupportedFeatureHandling;
+import org.hibernate.boot.jaxb.internal.MappingBinder;
+import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
+import org.hibernate.boot.jaxb.spi.Binding;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.cfg.JdbcSettings;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.xml.XMLPrettyPrinter;
+import org.hibernate.tool.reveng.internal.util.DummyDialect;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.Serial;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+public class MappingExporter implements Exporter {
+
+	private static final Logger LOGGER = Logger.getLogger( MappingExporter.class.getName() );
+
+	private UnmodifiableList<File> hbmXmlFiles = new UnmodifiableList<>(Collections.emptyList());
+	private boolean formatResult = true;
+
+	private final MappingBinder mappingBinder;
+	private final Marshaller marshaller;
+
+	public MappingExporter() {
+		mappingBinder = createMappingBinder();
+		marshaller = createMarshaller();
+	}
+
+	public void setHbmFiles(List<File> fileList) {
+		hbmXmlFiles = new UnmodifiableList<>( fileList );
+	}
+
+	public void setFormatResult(boolean formatResult) {
+		this.formatResult = formatResult;
+	}
+
+	@Override
+	public Properties getProperties() {
+		return null;
+	}
+
+	@Override
+	public void start() {
+		List<Binding<JaxbHbmHibernateMapping>> hbmBindings = getHbmBindings();
+		List<Binding<JaxbEntityMappingsImpl>> transformedBindings = transformBindings(hbmBindings);
+		for (int i = 0; i < hbmBindings.size(); i++) {
+			marshall(
+					transformedBindings.get(i).getRoot(),
+					((HbmXmlOrigin)hbmBindings.get(i).getOrigin()).getHbmXmlFile());
+		}
+	}
+
+	private List<Binding<JaxbEntityMappingsImpl>> transformBindings(
+			List<Binding<JaxbHbmHibernateMapping>> hbmBindings) {
+		MetadataSources metadataSources = new MetadataSources( createServiceRegistry() );
+		hbmBindings.forEach( metadataSources::addHbmXmlBinding );
+		return HbmXmlTransformer.transform(
+				hbmBindings,
+				(MetadataImplementor) metadataSources.buildMetadata(),
+				UnsupportedFeatureHandling.ERROR);
+	}
+
+	private ServiceRegistry createServiceRegistry() {
+		StandardServiceRegistryBuilder ssrb = new StandardServiceRegistryBuilder();
+		ssrb.clearSettings();
+		ssrb.applySetting(JdbcSettings.ALLOW_METADATA_ON_BOOT, false);
+		ssrb.applySetting(JdbcSettings.DIALECT, DummyDialect.class.getName());
+		return ssrb.build();
+	}
+
+	private MappingBinder createMappingBinder() {
+		return new MappingBinder(
+				MappingBinder.class.getClassLoader()::getResourceAsStream,
+				UnsupportedFeatureHandling.ERROR);
+	}
+
+	private List<Binding<JaxbHbmHibernateMapping>> getHbmBindings() {
+		List<Binding<JaxbHbmHibernateMapping>> result = new ArrayList<>();
+		hbmXmlFiles.forEach((hbmXmlFile) -> {
+			final String fullPath = hbmXmlFile.getAbsolutePath();
+			LOGGER.info("Adding file: '" + fullPath + "' to the list to be transformed.");
+			HbmXmlOrigin origin = new HbmXmlOrigin( hbmXmlFile );
+			Binding<JaxbHbmHibernateMapping> binding = bindHbmXml( origin );
+			result.add(binding);
+		});
+		return result;
+	}
+
+	private Binding<JaxbHbmHibernateMapping> bindHbmXml(HbmXmlOrigin origin) {
+		File hbmXmlFile = origin.getHbmXmlFile();
+		try ( final FileInputStream fileStream = new FileInputStream(hbmXmlFile) ) {
+			return mappingBinder.bind( fileStream, origin );
+		}
+		catch (IOException e) {
+			LOGGER.info( "Unable to open hbm.xml file `" + hbmXmlFile.getAbsolutePath() + "` for transformation");
+			return null;
+		}
+	}
+
+	private Marshaller createMarshaller() {
+		try {
+			return mappingBinder.mappingJaxbContext().createMarshaller();
+		}
+		catch (JAXBException e) {
+			throw new RuntimeException("Unable to create JAXB Marshaller", e);
+		}
+	}
+
+	private void marshall(
+			JaxbEntityMappingsImpl mappings,
+			File hbmXmlFile) {
+		File mappingXmlFile =  new File(
+				hbmXmlFile.getParentFile(),
+				hbmXmlFile.getName().replace(".hbm.xml", ".mapping.xml"));
+		LOGGER.info("Marshalling file: " + hbmXmlFile.getAbsolutePath() + " into " + mappingXmlFile.getAbsolutePath());
+		try {
+			marshaller.marshal( mappings, mappingXmlFile );
+			if (formatResult) {
+				XMLPrettyPrinter.prettyPrintFile(mappingXmlFile);
+			}
+		}
+		catch (JAXBException e) {
+			throw new RuntimeException(
+					"Unable to marshall mapping JAXB representation to file `" + mappingXmlFile.getAbsolutePath() + "`",
+					e);
+		}
+		catch (IOException e) {
+			throw new RuntimeException(
+					"Unable to format XML file `" + mappingXmlFile.getAbsolutePath() + "`",
+					e);
+		}
+	}
+
+	static class  HbmXmlOrigin extends Origin {
+
+		@Serial
+		private static final long serialVersionUID = 1L;
+
+		private final File hbmXmlFile;
+
+		public HbmXmlOrigin(File hbmXmlFile) {
+			super( SourceType.FILE, hbmXmlFile.getAbsolutePath() );
+			this.hbmXmlFile = hbmXmlFile;
+		}
+
+		public File getHbmXmlFile() {
+			return hbmXmlFile;
+		}
+
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/query/QueryExporter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/query/QueryExporter.java
new file mode 100644
index 000000000000..88f78e54b9a3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/query/QueryExporter.java
@@ -0,0 +1,93 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.query;
+
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.tool.reveng.internal.export.common.AbstractExporter;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.List;
+
+/**
+ * exporter for query execution.
+ *
+ **/
+public class QueryExporter extends AbstractExporter {
+
+	public void doStart() {
+		Session session = null;
+		SessionFactory sessionFactory = null;
+		Transaction transaction = null;
+		try {
+			sessionFactory = buildMetadata().buildSessionFactory();
+			session = sessionFactory.openSession();
+			transaction = session.beginTransaction();
+			for ( Object o : getQueryList() ) {
+				String query = (String) o;
+
+				List<Object> list = session.createQuery( query, null ).getResultList();
+
+				if ( getFileName() != null ) {
+					PrintWriter pw = null;
+					try {
+						File file = new File( getOutputDirectory(), getFileName() );
+						getTemplateHelper().ensureExistence( file );
+						pw = new PrintWriter( new FileWriter( file, true ) );
+						getArtifactCollector().addFile( file, "query-output" );
+
+						for ( Object element : list ) {
+							pw.println( element );
+						}
+
+					}
+					catch (IOException e) {
+						throw new RuntimeException( "Could not write query output", e );
+					}
+					finally {
+						if ( pw != null ) {
+							pw.flush();
+							pw.close();
+						}
+					}
+				}
+			}
+			transaction.commit();
+		}
+		catch(HibernateException he) {
+			if(transaction!=null) {
+				transaction.rollback();
+			}
+			throw new RuntimeException("Error occured while trying to execute query", he);
+		}
+		finally {
+			if(session!=null) {
+				session.close();
+			}
+			if(sessionFactory!=null) {
+				sessionFactory.close();
+			}
+
+		}
+	}
+
+	private String getFileName() {
+		return (String)getProperties().get(OUTPUT_FILE_NAME);
+	}
+
+	private List<?> getQueryList() {
+		return (List<?>)getProperties().get(QUERY_LIST);
+	}
+
+	public void setQueries(List<String> queryStrings) {
+		getProperties().put(QUERY_LIST, queryStrings);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/metadata/JpaMetadataDescriptor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/metadata/JpaMetadataDescriptor.java
new file mode 100644
index 000000000000..c84101377e9e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/metadata/JpaMetadataDescriptor.java
@@ -0,0 +1,64 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.metadata;
+
+import jakarta.persistence.EntityManagerFactory;
+import org.hibernate.HibernateException;
+import org.hibernate.boot.Metadata;
+import org.hibernate.jpa.HibernatePersistenceProvider;
+import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+
+import java.util.Properties;
+
+public class JpaMetadataDescriptor implements MetadataDescriptor {
+
+	private Properties properties = new Properties();
+	private Metadata metadata = null;
+
+	public JpaMetadataDescriptor(
+			final String persistenceUnit,
+			final Properties properties) {
+		EntityManagerFactoryBuilderImpl entityManagerFactoryBuilder =
+				createEntityManagerFactoryBuilder(persistenceUnit, properties);
+		EntityManagerFactory entityManagerFactory =
+				entityManagerFactoryBuilder.build();
+		metadata = entityManagerFactoryBuilder.getMetadata();
+		properties.putAll(entityManagerFactory.getProperties());
+	}
+
+	public Metadata createMetadata() {
+		return metadata;
+	}
+
+	public Properties getProperties() {
+		return properties;
+	}
+
+	private static class PersistenceProvider extends HibernatePersistenceProvider {
+		public EntityManagerFactoryBuilderImpl getEntityManagerFactoryBuilder(
+				String persistenceUnit,
+				Properties properties) {
+			EntityManagerFactoryBuilderImpl result = (EntityManagerFactoryBuilderImpl)getEntityManagerFactoryBuilderOrNull(
+					persistenceUnit,
+					properties);
+			if (result == null) {
+				throw new HibernateException(
+						"Persistence unit not found: '" + persistenceUnit + "'."
+					);
+			}
+			return result;
+		}
+	}
+
+	private static EntityManagerFactoryBuilderImpl createEntityManagerFactoryBuilder(
+			final String persistenceUnit,
+			final Properties properties) {
+		return new PersistenceProvider().getEntityManagerFactoryBuilder(
+				persistenceUnit,
+				properties);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/metadata/NativeMetadataDescriptor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/metadata/NativeMetadataDescriptor.java
new file mode 100644
index 000000000000..0046d8eb95ee
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/metadata/NativeMetadataDescriptor.java
@@ -0,0 +1,59 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.metadata;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.BootstrapServiceRegistry;
+import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+
+import java.io.File;
+import java.util.Properties;
+
+public class NativeMetadataDescriptor implements MetadataDescriptor {
+
+	private final Properties properties = new Properties();
+	private MetadataSources metadataSources = null;
+	private final StandardServiceRegistryBuilder ssrb;
+
+	public NativeMetadataDescriptor(
+			File cfgXmlFile,
+			File[] mappingFiles,
+			Properties properties) {
+		BootstrapServiceRegistry bsr = new BootstrapServiceRegistryBuilder().build();
+		ssrb = new StandardServiceRegistryBuilder(bsr);
+		if (cfgXmlFile != null) {
+			ssrb.configure(cfgXmlFile);
+		}
+		if (properties != null) {
+			this.properties.putAll(properties);
+		}
+		ssrb.applySettings(getProperties());
+		metadataSources = new MetadataSources(bsr);
+		if (mappingFiles != null) {
+			for (File file : mappingFiles) {
+				if (file.getName().endsWith(".jar")) {
+					metadataSources.addJar(file);
+				}
+				else {
+					metadataSources.addFile(file);
+				}
+			}
+		}
+	}
+
+	public Properties getProperties() {
+		Properties result = new Properties();
+		result.putAll(properties);
+		return result;
+	}
+
+	public Metadata createMetadata() {
+		return metadataSources.buildMetadata(ssrb.build());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/metadata/RevengMetadataDescriptor.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/metadata/RevengMetadataDescriptor.java
new file mode 100644
index 000000000000..ae6aa85b5ff0
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/metadata/RevengMetadataDescriptor.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.metadata;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.cfg.Environment;
+import org.hibernate.tool.reveng.api.metadata.MetadataConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategyFactory;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataBuilder;
+
+import java.util.Objects;
+import java.util.Properties;
+
+public class RevengMetadataDescriptor implements MetadataDescriptor {
+
+	private final RevengStrategy reverseEngineeringStrategy;
+	private final Properties properties = new Properties();
+
+	public RevengMetadataDescriptor(
+			RevengStrategy reverseEngineeringStrategy,
+			Properties properties) {
+		this.properties.putAll(Environment.getProperties());
+		if (properties != null) {
+			this.properties.putAll(properties);
+		}
+		this.reverseEngineeringStrategy = Objects.requireNonNullElseGet( reverseEngineeringStrategy,
+				RevengStrategyFactory::createReverseEngineeringStrategy );
+		this.properties.putIfAbsent( MetadataConstants.PREFER_BASIC_COMPOSITE_IDS, true );
+	}
+
+	public Properties getProperties() {
+		Properties result = new Properties();
+		result.putAll(properties);
+		return result;
+	}
+
+	public Metadata createMetadata() {
+		return RevengMetadataBuilder
+				.create(properties, reverseEngineeringStrategy)
+				.build();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/AnnotationBuilder.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/AnnotationBuilder.java
new file mode 100644
index 000000000000..49311b1ca47f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/AnnotationBuilder.java
@@ -0,0 +1,147 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map.Entry;
+
+public class AnnotationBuilder {
+
+	String annotation;
+	LinkedHashMap<String, String[]> attributes = new LinkedHashMap<>();
+
+	public static AnnotationBuilder createAnnotation(String annotation) {
+		return new AnnotationBuilder(annotation);
+	}
+
+	protected AnnotationBuilder(String annotation) {
+		this.annotation = annotation;
+	}
+
+	public AnnotationBuilder addAttribute(String name, String[] values) {
+		if(values!=null && values.length > 0) {
+			attributes.put(name, values);
+		}
+		return this;
+	}
+
+	public AnnotationBuilder addAttribute(String name, String value) {
+		if(value!=null) {
+			addAttribute(name, new String[] { value });
+		}
+		return this;
+	}
+
+
+	public AnnotationBuilder resetAnnotation(String annotationName) {
+		this.annotation = annotationName;
+		clearAttributes();
+		return this;
+	}
+
+	private void clearAttributes() {
+		attributes.clear();
+	}
+
+	public String getResult() {
+		StringBuffer b = new StringBuffer("@");
+		b.append(annotation);
+		if(attributes.isEmpty()) {
+			return b.toString();
+		}
+		else {
+			b.append("(");
+			Iterator<Entry<String, String[]>> elements = attributes.entrySet().iterator();
+			boolean addedBefore = false;
+			while ( elements.hasNext() ) {
+				Entry<String, String[]> element = elements.next();
+
+				String[] s = element.getValue();
+				if(s.length==0) {
+					addedBefore = false;
+				}
+				else {
+					if(addedBefore) {
+						b.append(", ");
+					}
+					String key = element.getKey();
+					b.append(key).append("=");
+					attributeToString( b, s );
+
+					addedBefore=true;
+				}
+			}
+			b.append( ")" );
+		}
+		return b.toString();
+	}
+
+	private void attributeToString(StringBuffer buffer, String[] values) {
+		if(values.length>1) {
+			buffer.append( "{" );
+		}
+
+		for (int i = 0; i < values.length; i++) {
+			buffer.append(values[i]);
+			if(i<values.length-1) {
+				buffer.append(", ");
+			}
+		}
+
+		if(values.length>1) {
+			buffer.append( "}" );
+		}
+
+	}
+
+	public void addQuotedAttributes(String name, Iterator<?> iterator) {
+		List<String> values = new ArrayList<>();
+		while ( iterator.hasNext() ) {
+			values.add(quote( iterator.next().toString() ));
+		}
+		addAttribute(name, values.toArray( new String[0] ));
+	}
+
+	public void addAttributes(String name, Iterator<?> iterator) {
+		List<String> values = new ArrayList<>();
+		while ( iterator.hasNext() ) {
+			String element = iterator.next().toString();
+			values.add( element );
+		}
+		addAttribute(name, values.toArray( new String[0] ));
+	}
+	private String quote(String element) {
+		return "\"" + element + "\"";
+	}
+
+	public AnnotationBuilder addQuotedAttribute(String name, String value) {
+		if(value!=null) {
+			addAttribute(name, quote(value));
+		}
+		return this;
+	}
+
+
+	public String toString() {
+		return getResult();
+	}
+
+	public String getAttributeAsString(String name) {
+		StringBuffer buffer = new StringBuffer();
+		String[] object = attributes.get( name );
+		if(object==null) {
+			return null;
+		}
+		else {
+			attributeToString( buffer, object );
+			return buffer.toString();
+		}
+	}
+
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/DummyDialect.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/DummyDialect.java
new file mode 100644
index 000000000000..8985ebd2dd6c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/DummyDialect.java
@@ -0,0 +1,25 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.hibernate.dialect.DatabaseVersion;
+import org.hibernate.dialect.Dialect;
+
+public class DummyDialect extends Dialect {
+	static final DummyDialect INSTANCE = new DummyDialect();
+	public DummyDialect() {
+		super(new DatabaseVersion() {
+			@Override
+			public int getDatabaseMajorVersion() {
+				return 0;
+			}
+			@Override
+			public int getDatabaseMinorVersion() {
+				return 0;
+			}
+		});
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/IteratorTransformer.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/IteratorTransformer.java
new file mode 100644
index 000000000000..da747f1a0c62
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/IteratorTransformer.java
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import java.util.Iterator;
+
+public abstract class IteratorTransformer<T> implements Iterator<String> {
+
+	private Iterator<T> delegate;
+
+	public IteratorTransformer(Iterator<T> delegate) {
+		this.delegate = delegate;
+	}
+
+	public boolean hasNext() {
+		return delegate.hasNext();
+	}
+
+	public String next() {
+		return transform(delegate.next());
+	}
+
+	public abstract String transform(T object);
+
+	public void remove() {
+		delegate.remove();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/JdbcToHibernateTypeHelper.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/JdbcToHibernateTypeHelper.java
new file mode 100644
index 000000000000..d24d9f84f352
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/JdbcToHibernateTypeHelper.java
@@ -0,0 +1,197 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.hibernate.MappingException;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.sql.Types;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * Utility class for mapping between sqltypes and hibernate type names.
+ *
+ * @author max (based on parts from Sql2Java from Middlegen)
+ *
+ */
+public final class JdbcToHibernateTypeHelper {
+
+	private JdbcToHibernateTypeHelper() {
+
+	}
+
+/** The Map containing the preferred conversion type values. */
+private static final Map<Integer, String[]> PREFERRED_HIBERNATETYPE_FOR_SQLTYPE = new HashMap<>();
+
+static {
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.TINYINT, new String[] { "byte", Byte.class.getName()} );
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.SMALLINT, new String[] { "short", Short.class.getName()} );
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.INTEGER, new String[] { "int", Integer.class.getName()} );
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.BIGINT, new String[] { "long", Long.class.getName()} );
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.REAL, new String[] { "float", Float.class.getName()} );
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.FLOAT, new String[] { "double", Double.class.getName()} );
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.DOUBLE, new String[] { "double", Double.class.getName()});
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.DECIMAL, new String[] { "big_decimal", "big_decimal" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.NUMERIC, new String[] { "big_decimal", "big_decimal" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.BIT, new String[] { "boolean", Boolean.class.getName()});
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.BOOLEAN, new String[] { "boolean", Boolean.class.getName()});
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.CHAR, new String[] { "char", Character.class.getName()});
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.VARCHAR, new String[] { "string", "string" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.LONGVARCHAR, new String[] { "string", "string" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.BINARY, new String[] { "binary", "binary" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.VARBINARY, new String[] { "binary", "binary" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.LONGVARBINARY, new String[] { "binary", "binary" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.DATE, new String[] { "date", "date" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.TIME, new String[] { "time", "time" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.TIMESTAMP, new String[] { "timestamp", "timestamp" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.CLOB, new String[] { "clob", "clob" });
+	PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.put( Types.BLOB, new String[] { "blob", "blob" });
+
+	//Hibernate does not have any built-in Type for these:
+	//preferredJavaTypeForSqlType.put(new Integer(Types.ARRAY), "java.sql.Array");
+	//preferredJavaTypeForSqlType.put(new Integer(Types.REF), "java.sql.Ref");
+	//preferredJavaTypeForSqlType.put(new Integer(Types.STRUCT), "java.lang.Object");
+	//preferredJavaTypeForSqlType.put(new Integer(Types.JAVA_OBJECT), "java.lang.Object");
+}
+
+/* (non-Javadoc)
+ * @see org.hibernate.cfg.JDBCTypeToHibernateTypesStrategy#getPreferredHibernateType(int, int, int, int)
+ */
+public static String getPreferredHibernateType(int sqlType, int size, int precision, int scale, boolean nullable, boolean generatedIdentifier) {
+	boolean returnNullable = nullable || generatedIdentifier;
+	if ( (sqlType == Types.DECIMAL || sqlType == Types.NUMERIC) && scale <= 0) { // <=
+		if (precision == 1) {
+			// NUMERIC(1) is a often used idiom for storing boolean thus providing it out of the box.
+			return returnNullable?Boolean.class.getName():"boolean";
+		}
+		else if (precision < 3) {
+			return returnNullable?Byte.class.getName():"byte";
+		}
+		else if (precision < 5) {
+			return returnNullable?Short.class.getName():"short";
+		}
+		else if (precision < 10) {
+			return returnNullable?Integer.class.getName():"int";
+		}
+		else if (precision < 19) {
+			return returnNullable?Long.class.getName():"long";
+		}
+		else {
+			return "big_integer";
+		}
+	}
+
+	if ( sqlType == Types.CHAR && size>1 ) {
+		return "string";
+	}
+
+	String[] result = PREFERRED_HIBERNATETYPE_FOR_SQLTYPE.get( sqlType );
+
+	if(result==null) {
+		return null;
+	}
+	else if(returnNullable) {
+		return result[1];
+	}
+	else {
+		return result[0];
+	}
+}
+
+static Map<String, Integer> jdbcTypes; // Name to value
+static Map<Integer, String> jdbcTypeValues; // value to Name
+
+public static String[] getJDBCTypes() {
+	checkTypes();
+
+	return jdbcTypes.keySet().toArray( new String[0] );
+}
+
+public static int getJDBCType(String value) {
+		checkTypes();
+
+		Integer number = jdbcTypes.get(value);
+
+		if(number==null) {
+			try {
+				return Integer.parseInt(value);
+			}
+			catch (NumberFormatException nfe) {
+				throw new MappingException("jdbc-type: " + value + " is not a known JDBC Type nor a valid number");
+			}
+		}
+		else {
+			return number;
+		}
+	}
+
+private static void checkTypes() {
+	if(jdbcTypes==null) {
+		jdbcTypes = new HashMap<>();
+		Field[] fields = Types.class.getFields();
+		for ( Field field : fields ) {
+			if ( Modifier.isStatic( field.getModifiers() ) ) {
+				try {
+					jdbcTypes.put( field.getName(), (Integer) field.get( Types.class ) );
+				}
+				catch (IllegalArgumentException | IllegalAccessException e) {
+					// ignore
+				}
+			}
+		}
+	}
+}
+
+	public static String getJDBCTypeName(int value) {
+		if(jdbcTypeValues==null) {
+			jdbcTypeValues = new HashMap<>();
+			Field[] fields = Types.class.getFields();
+			for ( Field field : fields ) {
+				if ( Modifier.isStatic( field.getModifiers() ) ) {
+					try {
+						jdbcTypeValues.put( (Integer) field.get( Types.class ), field.getName() );
+					}
+					catch (IllegalArgumentException | IllegalAccessException e) {
+						// ignore
+					}
+				}
+			}
+		}
+
+		String name = jdbcTypeValues.get( value );
+
+		if(name!=null) {
+			return name;
+		}
+		else {
+			return ""+value;
+		}
+	}
+
+	// scale is for non floating point numeric columns
+	public static boolean typeHasScale(int sqlType) {
+		return (sqlType == Types.DECIMAL || sqlType == Types.NUMERIC);
+	}
+
+	// precision is for numeric columns
+	public static boolean typeHasPrecision(int sqlType) {
+		return (sqlType == Types.DECIMAL || sqlType == Types.NUMERIC
+				|| sqlType == Types.REAL || sqlType == Types.FLOAT || sqlType == Types.DOUBLE);
+	}
+
+	public static boolean typeHasScaleAndPrecision(int sqlType) {
+		return typeHasScale(sqlType) && typeHasPrecision(sqlType);
+	}
+
+	// length is for string columns
+	public static boolean typeHasLength(int sqlType) {
+		return (sqlType == Types.CHAR || sqlType == Types.DATE
+				|| sqlType == Types.LONGVARCHAR || sqlType == Types.TIME || sqlType == Types.TIMESTAMP
+				|| sqlType == Types.VARCHAR );
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/NameConverter.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/NameConverter.java
new file mode 100644
index 000000000000..17f2eb8e9f22
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/NameConverter.java
@@ -0,0 +1,151 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import java.util.HashSet;
+import java.util.Set;
+
+final public class NameConverter {
+
+	private static final Set<String> RESERVED_KEYWORDS;
+	static {
+		RESERVED_KEYWORDS = new HashSet<>();
+
+		RESERVED_KEYWORDS.add( "abstract" );
+		RESERVED_KEYWORDS.add( "continue" );
+		RESERVED_KEYWORDS.add( "for" );
+		RESERVED_KEYWORDS.add( "new" );
+		RESERVED_KEYWORDS.add( "switch" );
+		RESERVED_KEYWORDS.add( "assert" );
+		RESERVED_KEYWORDS.add( "default" );
+		RESERVED_KEYWORDS.add( "goto" );
+		RESERVED_KEYWORDS.add( "package" );
+		RESERVED_KEYWORDS.add( "synchronized" );
+		RESERVED_KEYWORDS.add( "boolean" );
+		RESERVED_KEYWORDS.add( "do" );
+		RESERVED_KEYWORDS.add( "if" );
+		RESERVED_KEYWORDS.add( "private" );
+		RESERVED_KEYWORDS.add( "this" );
+		RESERVED_KEYWORDS.add( "break" );
+		RESERVED_KEYWORDS.add( "double" );
+		RESERVED_KEYWORDS.add( "implements" );
+		RESERVED_KEYWORDS.add( "protected" );
+		RESERVED_KEYWORDS.add( "throw" );
+		RESERVED_KEYWORDS.add( "byte" );
+		RESERVED_KEYWORDS.add( "else" );
+		RESERVED_KEYWORDS.add( "import" );
+		RESERVED_KEYWORDS.add( "public" );
+		RESERVED_KEYWORDS.add( "throws" );
+		RESERVED_KEYWORDS.add( "case" );
+		RESERVED_KEYWORDS.add( "enum" );
+		RESERVED_KEYWORDS.add( "instanceof" );
+		RESERVED_KEYWORDS.add( "return" );
+		RESERVED_KEYWORDS.add( "transient" );
+		RESERVED_KEYWORDS.add( "catch" );
+		RESERVED_KEYWORDS.add( "extends" );
+		RESERVED_KEYWORDS.add( "int" );
+		RESERVED_KEYWORDS.add( "short" );
+		RESERVED_KEYWORDS.add( "try" );
+		RESERVED_KEYWORDS.add( "char" );
+		RESERVED_KEYWORDS.add( "final" );
+		RESERVED_KEYWORDS.add( "interface" );
+		RESERVED_KEYWORDS.add( "static" );
+		RESERVED_KEYWORDS.add( "void" );
+		RESERVED_KEYWORDS.add( "class" );
+		RESERVED_KEYWORDS.add( "finally" );
+		RESERVED_KEYWORDS.add( "long" );
+		RESERVED_KEYWORDS.add( "strictfp" );
+		RESERVED_KEYWORDS.add( "volatile" );
+		RESERVED_KEYWORDS.add( "const" );
+		RESERVED_KEYWORDS.add( "float" );
+		RESERVED_KEYWORDS.add( "native" );
+		RESERVED_KEYWORDS.add( "super" );
+		RESERVED_KEYWORDS.add( "while" );
+	}
+
+	private NameConverter() {}
+
+	/**
+	 * Converts a database name (table or column) to a java name (first letter capitalised).
+	 * employee_name -> EmployeeName.
+	 * <p>
+	 * Derived from middlegen's dbnameconverter.
+	 * @param s The database name to convert.
+	 *
+	 * @return The converted database name.
+	 */
+	public static String toUpperCamelCase(String s) {
+		if (s.isEmpty()) {
+			return s;
+		}
+		StringBuilder result = new StringBuilder();
+
+		boolean capitalize = true;
+		boolean lastCapital = false;
+		boolean lastDecapitalized = false;
+		for (int i = 0; i < s.length(); i++) {
+			String c = s.substring(i, i + 1);
+			if ( "_".equals(c) || " ".equals(c) || "-".equals(c) ) {
+				capitalize = true;
+				continue;
+			}
+
+			if ( c.toUpperCase().equals(c) ) {
+				if (lastDecapitalized && !lastCapital) {
+					capitalize = true;
+				}
+				lastCapital = true;
+			}
+			else {
+				lastCapital = false;
+			}
+
+			//if(forceFirstLetter && result.length()==0) capitalize = false;
+
+			if (capitalize) {
+				result.append(c.toUpperCase());
+				capitalize = false;
+			}
+			else {
+				result.append(c.toLowerCase() );
+				lastDecapitalized = true;
+			}
+
+		}
+		return result.toString();
+	}
+
+	static public String simplePluralize(String singular) {
+		char last = singular.charAt( singular.length()-1 );
+		Character prev = singular.length() > 1 ? singular.charAt( singular.length() - 2 ) : null;
+		String vowels = "aeiouy";
+		switch (last) {
+			case 'x':
+			case 's':
+				singular += "es";
+				break;
+			case 'y':
+				if (prev != null && vowels.indexOf(prev) >= 0){
+					singular += "s";
+				}
+				else {
+					singular = singular.substring( 0, singular.length()-1 ) + "ies";
+				}
+				break;
+			case 'h':
+				if (prev != null && (prev == 'c' || prev == 's')){
+					singular += "es";
+					break;
+				}
+			default:
+				singular += "s";
+		}
+		return singular;
+	}
+
+	static public boolean isReservedJavaKeyword(String str) {
+		return RESERVED_KEYWORDS.contains(str);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/ReflectionUtil.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/ReflectionUtil.java
new file mode 100644
index 000000000000..501e9f56bc2c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/ReflectionUtil.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+public class ReflectionUtil {
+
+	public static Class<?> classForName(String name) throws ClassNotFoundException {
+		try {
+			ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+			if ( classLoader != null ) {
+				return classLoader.loadClass(name);
+			}
+		}
+		catch ( Throwable ignore ) {}
+		return Class.forName( name );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/SkipBackRefPropertyIterator.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/SkipBackRefPropertyIterator.java
new file mode 100644
index 000000000000..a021cbdb7965
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/SkipBackRefPropertyIterator.java
@@ -0,0 +1,65 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.hibernate.mapping.Property;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * Helper iterator to ignore "backrefs" properties in hibernate mapping model.
+ *
+ * @author Max Rydahl Andersen
+ *
+ */
+public class SkipBackRefPropertyIterator implements Iterator<Property> {
+
+	private final Iterator<?> delegate;
+
+	private Property backLog;
+
+	public SkipBackRefPropertyIterator(Iterator<?> iterator) {
+		delegate = iterator;
+	}
+
+	public boolean hasNext() {
+		if ( backLog!=null ) {
+			return true;
+		}
+		else if ( delegate.hasNext() ) {
+			Property nextProperty = (Property) delegate.next();
+			while ( nextProperty.isBackRef() && delegate.hasNext() ) {
+				nextProperty = (Property) delegate.next();
+			}
+			if ( !nextProperty.isBackRef() ) {
+				backLog = nextProperty;
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public Property next() {
+		if ( backLog != null ) {
+			Property p = backLog;
+			backLog = null;
+			return p;
+		}
+		Property nextProperty = (Property) delegate.next();
+		while ( nextProperty.isBackRef() && delegate.hasNext() ) {
+			nextProperty = (Property) delegate.next();
+		}
+		if ( nextProperty.isBackRef() ) {
+			throw new NoSuchElementException();
+		}
+		return nextProperty;
+	}
+
+	public void remove() {
+		throw new UnsupportedOperationException( "remove() not allowed" );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/StringUtil.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/StringUtil.java
new file mode 100644
index 000000000000..651bf6ba8613
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/StringUtil.java
@@ -0,0 +1,70 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import java.util.Objects;
+import java.util.StringTokenizer;
+
+/**
+ * max: Removed methods that dependent on anything else than common.StringUtils.
+ *
+ * <p>Common <code>String</code> manipulation routines.</p>
+ *
+ * <p>Originally from
+ * <a href="http://jakarta.apache.org/turbine/">Turbine</a> and the
+ * GenerationJavaCore library.</p>
+ *
+ * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
+ * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
+ * @author <a href="mailto:gcoladonato@yahoo.com">Greg Coladonato</a>
+ * @author <a href="mailto:bayard@generationjava.com">Henri Yandell</a>
+ * @author <a href="mailto:ed@apache.org">Ed Korthof</a>
+ * @author <a href="mailto:rand_mcneely@yahoo.com">Rand McNeely</a>
+ * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
+ * @author <a href="mailto:fredrik@westermarck.com">Fredrik Westermarck</a>
+ * @version $Id$
+ */
+public final class StringUtil {
+
+	public static String[] split(String str, String separator) {
+		StringTokenizer tok = null;
+		if (separator == null) {
+			tok = new StringTokenizer(str);
+		}
+		else {
+			tok = new StringTokenizer(str, separator);
+		}
+
+		int listSize = tok.countTokens();
+		String[] list = new String[listSize];
+		int i = 0;
+		int lastTokenBegin = 0;
+		int lastTokenEnd = 0;
+		while (tok.hasMoreTokens() ) {
+			list[i] = tok.nextToken();
+			lastTokenBegin = str.indexOf(list[i], lastTokenEnd);
+			lastTokenEnd = lastTokenBegin + list[i].length();
+			i++;
+		}
+		return list;
+	}
+
+	public static String leftPad(String str, int size) {
+		size = (size - str.length() );
+		if (size > 0) {
+			str = " ".repeat(size) + str;
+		}
+		return str;
+	}
+
+	public static boolean isEqual(String str1, String str2) {
+		return Objects.equals( str1, str2 );
+	}
+
+	public static boolean isEmptyOrNull(String string) {
+		return string == null || string.isEmpty();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/TableNameQualifier.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/TableNameQualifier.java
new file mode 100644
index 000000000000..de270fccc37d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/TableNameQualifier.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+public class TableNameQualifier {
+
+	public static String qualify(String catalog, String schema, String table) {
+		StringBuilder qualifiedName = new StringBuilder();
+		if ( catalog != null ) {
+			qualifiedName.append( catalog ).append( '.' );
+		}
+		if ( schema != null ) {
+			qualifiedName.append( schema ).append( '.' );
+		}
+		return qualifiedName.append( table ).toString();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/ValueUtil.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/ValueUtil.java
new file mode 100644
index 000000000000..b0cab728a835
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/ValueUtil.java
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.mapping.BasicValue;
+import org.hibernate.mapping.SimpleValue;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class ValueUtil extends BasicValue {
+
+	private static final long serialVersionUID = 1L;
+
+	public ValueUtil(SimpleValue sv) {
+		super(sv.getBuildingContext());
+		sv.getCustomIdGeneratorCreator();
+	}
+
+	public ValueUtil(MetadataBuildingContext buildingContext) {
+		super(buildingContext);
+	}
+
+	public Map<String, Object> getIdentifierGeneratorParameters() {
+		getBuildingContext().getMetadataCollector().getIdentifierGenerator("foo");
+		return Collections.emptyMap();
+	}
+
+	public String getIdentifierGeneratorStrategy() {
+		return null;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/AbstractXMLPrettyPrinterStrategy.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/AbstractXMLPrettyPrinterStrategy.java
new file mode 100644
index 000000000000..6ebedb8f00da
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/AbstractXMLPrettyPrinterStrategy.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.xml;
+
+import org.hibernate.tool.reveng.api.xml.XMLPrettyPrinterStrategy;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+public abstract class AbstractXMLPrettyPrinterStrategy implements XMLPrettyPrinterStrategy {
+
+	private static final Logger LOGGER = Logger.getLogger( AbstractXMLPrettyPrinterStrategy.class.getName() );
+	private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY = createDocumentBuilderFactory();
+
+	public Document newDocument(String xml, String encoding) throws SAXException, IOException, ParserConfigurationException {
+		final Document document = DOCUMENT_BUILDER_FACTORY
+				.newDocumentBuilder()
+				.parse(new InputSource(new ByteArrayInputStream(xml.getBytes(encoding))));
+		document.normalize();
+		return document;
+	}
+
+	protected void removeWhitespace(final Document document) throws XPathExpressionException {
+		XPath xPath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList) xPath.evaluate("//text()[normalize-space()='']",
+				document,
+				XPathConstants.NODESET);
+
+		for (int i = 0; i < nodeList.getLength(); ++i) {
+			Node node = nodeList.item(i);
+			node.getParentNode().removeChild(node);
+		}
+	}
+
+	private static DocumentBuilderFactory createDocumentBuilderFactory() {
+		DocumentBuilderFactory result = null;
+		try {
+			result = DocumentBuilderFactory.newInstance(
+					"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl",
+					null);
+			result.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+		}
+		catch (ParserConfigurationException e) {
+			LOGGER.severe(
+					"A ParserConfigurationException happened while setting the " +
+					"'http://apache.org/xml/features/nonvalidating/load-external-dtd' feature" +
+					"to false." );
+			throw new RuntimeException(e);
+		}
+		return result;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/DOM3LSPrettyPrinterStrategy.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/DOM3LSPrettyPrinterStrategy.java
new file mode 100644
index 000000000000..29944ea05a6f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/DOM3LSPrettyPrinterStrategy.java
@@ -0,0 +1,70 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.xml;
+
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSOutput;
+import org.w3c.dom.ls.LSSerializer;
+
+import java.io.StringWriter;
+
+public class DOM3LSPrettyPrinterStrategy extends AbstractXMLPrettyPrinterStrategy {
+	private boolean outputComments;
+
+	@Override
+	public String prettyPrint(String xml) throws Exception {
+		final Document document = newDocument(xml, "UTF-8");
+		final DOMImplementationLS domImplementationLS = getDomImplementationLS(document);
+		final LSSerializer lsSerializer = newLSSerializer(domImplementationLS);
+		final LSOutput lsOutput = newLSOutput(domImplementationLS);
+
+		final StringWriter stringWriter = new StringWriter();
+		lsOutput.setCharacterStream(stringWriter);
+		lsSerializer.write(document, lsOutput);
+		return stringWriter.toString();
+	}
+
+	protected DOMImplementationLS getDomImplementationLS(final Document document) {
+		final DOMImplementation domImplementation = document.getImplementation();
+		if (domImplementation.hasFeature("LS", "3.0") && domImplementation.hasFeature("Core", "2.0")) {
+			return (DOMImplementationLS) domImplementation.getFeature("LS", "3.0");
+		}
+		else {
+			throw new RuntimeException("DOM 3.0 LS and/or DOM 2.0 Core not supported.");
+		}
+	}
+
+	protected LSSerializer newLSSerializer(final DOMImplementationLS domImplementationLS) {
+		final LSSerializer lsSerializer = domImplementationLS.createLSSerializer();
+		final DOMConfiguration domConfiguration = lsSerializer.getDomConfig();
+		if (domConfiguration.canSetParameter("format-pretty-print", Boolean.TRUE)) {
+			lsSerializer.getDomConfig().setParameter("format-pretty-print", Boolean.TRUE);
+			if (domConfiguration.canSetParameter("comments", isOutputComments())) {
+				lsSerializer.getDomConfig().setParameter("comments", isOutputComments());
+			}
+			return lsSerializer;
+		}
+		else {
+			throw new RuntimeException("DOMConfiguration 'format-pretty-print' parameter isn't settable.");
+		}
+	}
+
+	protected LSOutput newLSOutput(DOMImplementationLS domImplementationLS) {
+		final LSOutput lsOutput = domImplementationLS.createLSOutput();
+		lsOutput.setEncoding("UTF-8");
+		return lsOutput;
+	}
+
+	public boolean isOutputComments() {
+		return outputComments;
+	}
+
+	public void setOutputComments(boolean outputComments) {
+		this.outputComments = outputComments;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/TrAXPrettyPrinterStrategy.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/TrAXPrettyPrinterStrategy.java
new file mode 100644
index 000000000000..b615b0ca407b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/TrAXPrettyPrinterStrategy.java
@@ -0,0 +1,81 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.xml;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.StringWriter;
+import java.util.logging.Logger;
+
+public class TrAXPrettyPrinterStrategy extends AbstractXMLPrettyPrinterStrategy {
+
+	private static final Logger LOGGER = Logger.getLogger( TrAXPrettyPrinterStrategy.class.getName() );
+	private static final TransformerFactory TRANSFORMER_FACTORY = TransformerFactory.newInstance(
+			"com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl",
+			null);
+
+	private int indent = 4;
+	private boolean omitXmlDeclaration;
+
+	@Override
+	public String prettyPrint(String xml) throws Exception {
+		final Document document = newDocument(xml, "UTF-8");
+		removeWhitespace(document);
+
+		final Transformer transformer = newTransformer(document);
+
+		final StringWriter stringWriter = new StringWriter();
+		transformer.transform(new DOMSource(document), new StreamResult(stringWriter));
+		return stringWriter.toString();
+	}
+
+	protected Transformer newTransformer(final Document document) throws TransformerConfigurationException {
+
+		final Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
+		transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+		transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+		transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+		transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, isOmitXmlDeclaration() ? "yes" : "no");
+		try {
+			transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", String.valueOf(getIndent()));
+		}
+		catch (IllegalArgumentException e) {
+			LOGGER.severe( "An IllegalArgumentException happened while adding the 'indent' property." );
+			throw new RuntimeException(e);
+		}
+
+		final DocumentType doctype = document.getDoctype();
+		if (doctype != null) {
+			transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, doctype.getPublicId());
+			transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, doctype.getSystemId());
+		}
+
+		return transformer;
+	}
+
+	public int getIndent() {
+		return indent;
+	}
+
+	public void setIndent(int indent) {
+		this.indent = indent;
+	}
+
+	public boolean isOmitXmlDeclaration() {
+		return omitXmlDeclaration;
+	}
+
+	public void setOmitXmlDeclaration(boolean omitXmlDeclaration) {
+		this.omitXmlDeclaration = omitXmlDeclaration;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/XMLPrettyPrinterStrategyFactory.java b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/XMLPrettyPrinterStrategyFactory.java
new file mode 100644
index 000000000000..9b6cfcf14ccb
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/xml/XMLPrettyPrinterStrategyFactory.java
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.xml;
+
+import org.hibernate.tool.reveng.api.xml.XMLPrettyPrinterStrategy;
+
+import java.lang.reflect.Constructor;
+
+public final class XMLPrettyPrinterStrategyFactory {
+	public static final String PROPERTY_STRATEGY_IMPL = "org.hibernate.tool.hbm2x.xml.XMLPrettyPrinterStrategy";
+
+	private static final XMLPrettyPrinterStrategy DEFAULT_STRATEGY = new TrAXPrettyPrinterStrategy();
+
+	private XMLPrettyPrinterStrategyFactory() {
+	}
+
+	public static XMLPrettyPrinterStrategy newXMLPrettyPrinterStrategy() {
+		XMLPrettyPrinterStrategy strategy = loadFromSystemProperty();
+		return strategy == null ? DEFAULT_STRATEGY : strategy;
+	}
+
+	@SuppressWarnings("unchecked")
+	private static XMLPrettyPrinterStrategy loadFromSystemProperty() {
+		String strategyClass = System.getProperty(PROPERTY_STRATEGY_IMPL);
+
+		if (strategyClass != null) {
+			try {
+				Class<XMLPrettyPrinterStrategy> clazz = (Class<XMLPrettyPrinterStrategy>) Class.forName(strategyClass);
+				Constructor<XMLPrettyPrinterStrategy> constructor = clazz.getConstructor();
+				return constructor.newInstance();
+			}
+			catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
+		return null;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/main/resources/dao/daohome.ftl b/tooling/hibernate-reveng/src/main/resources/dao/daohome.ftl
new file mode 100644
index 000000000000..b579cecf28d4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/dao/daohome.ftl
@@ -0,0 +1,279 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+${pojo.getPackageDeclaration()}
+// Generated ${date} by Hibernate Tools ${version}
+
+<#assign classbody>
+<#assign declarationName = pojo.importType(pojo.getDeclarationName())>/**
+ * Home object for domain model class ${declarationName}.
+ * @see ${pojo.getQualifiedDeclarationName()}
+ * @author Hibernate Tools
+ */
+<#if ejb3>
+@${pojo.importType("jakarta.ejb.Stateless")}
+</#if>
+public class ${declarationName}Home {
+
+    private static final ${pojo.importType("java.util.logging.Logger")} logger = ${pojo.importType("Logger")}.getLogger(${pojo.getDeclarationName()}Home.class.getName());
+
+<#if ejb3>
+    @${pojo.importType("jakarta.persistence.PersistenceContext")} private ${pojo.importType("jakarta.persistence.EntityManager")} entityManager;
+    
+    public void persist(${declarationName} transientInstance) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "persisting ${declarationName} instance");
+        try {
+            entityManager.persist(transientInstance);
+            logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "persist successful");
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "persist failed", re);
+            throw re;
+        }
+    }
+    
+    public void remove(${declarationName} persistentInstance) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "removing ${declarationName} instance");
+        try {
+            entityManager.remove(persistentInstance);
+            logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "remove successful");
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "remove failed", re);
+            throw re;
+        }
+    }
+    
+    public ${declarationName} merge(${declarationName} detachedInstance) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "merging ${declarationName} instance");
+        try {
+            ${declarationName} result = entityManager.merge(detachedInstance);
+            logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "merge successful");
+            return result;
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "merge failed", re);
+            throw re;
+        }
+    }
+    
+<#if clazz.identifierProperty?has_content>    
+    public ${declarationName} findById( ${pojo.getJavaTypeName(clazz.identifierProperty, jdk5)} id) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "getting ${declarationName} instance with id: " + id);
+        try {
+            ${declarationName} instance = entityManager.find(${pojo.getDeclarationName()}.class, id);
+            logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "get successful");
+            return instance;
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "get failed", re);
+            throw re;
+        }
+    }
+</#if>
+<#else>    
+    private final ${pojo.importType("org.hibernate.SessionFactory")} sessionFactory = getSessionFactory();
+    
+    protected ${pojo.importType("org.hibernate.SessionFactory")} getSessionFactory() {
+        try {
+            return (${pojo.importType("org.hibernate.SessionFactory")}) new ${pojo.importType("javax.naming.InitialContext")}().lookup("${sessionFactoryName}");
+        }
+        catch (Exception e) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "Could not locate SessionFactory in JNDI", e);
+            throw new IllegalStateException("Could not locate SessionFactory in JNDI");
+        }
+    }
+    
+    public void persist(${declarationName} transientInstance) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "persisting ${declarationName} instance");
+        try {
+            sessionFactory.getCurrentSession().persist(transientInstance);
+            logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "persist successful");
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "persist failed", re);
+            throw re;
+        }
+    }
+    
+    public void attachDirty(${declarationName} instance) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "attaching dirty ${declarationName} instance");
+        try {
+            sessionFactory.getCurrentSession().merge(instance);
+            logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "attach successful");
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "attach failed", re);
+            throw re;
+        }
+    }
+    
+    public void attachClean(${declarationName} instance) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "attaching clean ${declarationName} instance");
+        try {
+            sessionFactory.getCurrentSession().lock(instance, ${pojo.importType("org.hibernate.LockMode")}.NONE);
+            logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "attach successful");
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "attach failed", re);
+            throw re;
+        }
+    }
+    
+    public void remove(${declarationName} persistentInstance) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "removing ${declarationName} instance");
+        try {
+            sessionFactory.getCurrentSession().remove(persistentInstance);
+            logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "remove successful");
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "remove failed", re);
+            throw re;
+        }
+    }
+    
+    public ${declarationName} merge(${declarationName} detachedInstance) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "merging ${declarationName} instance");
+        try {
+            ${declarationName} result = (${declarationName}) sessionFactory.getCurrentSession()
+                    .merge(detachedInstance);
+            logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "merge successful");
+            return result;
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "merge failed", re);
+            throw re;
+        }
+    }
+    
+<#if clazz.identifierProperty?has_content>
+    public ${declarationName} findById( ${c2j.getJavaTypeName(clazz.identifierProperty, jdk5)} id) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "getting ${declarationName} instance with id: " + id);
+        try {
+            ${declarationName} instance = (${declarationName}) sessionFactory.getCurrentSession()
+                    .get("${clazz.entityName}", id);
+            if (instance==null) {
+                logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "get successful, no instance found");
+            }
+            else {
+                logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "get successful, instance found");
+            }
+            return instance;
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "get failed", re);
+            throw re;
+        }
+    }
+</#if>
+    
+<#if clazz.hasNaturalId()>
+    public ${declarationName} findByNaturalId(${c2j.asNaturalIdParameterList(clazz)}) {
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "getting ${declarationName} instance by natural id");
+        try {
+            ${pojo.importType("jakarta.persistence.criteria.CriteriaBuilder")} criteriaBuilder = sessionFactory.getCriteriaBuilder();
+            ${pojo.importType("jakarta.persistence.criteria.CriteriaQuery")}<${declarationName}> criteriaQuery = criteriaBuilder.createQuery(${declarationName}.class);
+            ${pojo.importType("jakarta.persistence.criteria.Root")}<${declarationName}> root = criteriaQuery.from(${declarationName}.class);
+            criteriaQuery.where(
+<#assign notFirst = false/>
+<#list pojo.getAllPropertiesIterator() as property>
+<#if property.isNaturalIdentifier()>
+                    <#if notFirst>,</#if>criteriaBuilder.equal(root.get("${property.name}"), ${property.name})
+<#assign notFirst = true/>
+</#if>
+</#list>
+            );
+            ${declarationName} instance = sessionFactory
+                    .getCurrentSession()
+                    .createQuery(criteriaQuery)
+                    .getSingleResult();                    
+            if (instance==null) {
+                logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "get successful, no instance found");
+            }
+            else {
+                logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "get successful, instance found");
+            }
+            return instance;
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "query failed", re);
+            throw re;
+        }
+    }
+</#if>  
+
+<#if false>
+/**  
+TODO: 
+<#if jdk5>
+    public ${pojo.importType("java.util.List")}<${declarationName}> findByExample(${declarationName} instance) {
+<#else>
+    public ${pojo.importType("java.util.List")} findByExample(${declarationName} instance) {
+</#if>
+        logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "finding ${declarationName} instance by example");
+        try {
+<#if jdk5>
+            ${pojo.importType("java.util.List")}<${declarationName}> results = (List<${declarationName}>) sessionFactory.getCurrentSession()
+<#else>
+            ${pojo.importType("java.util.List")} results = sessionFactory.getCurrentSession()
+</#if>
+                    .createCriteria("${clazz.entityName}")
+<#if jdk5>
+                    .add( ${pojo.staticImport("org.hibernate.criterion.Example", "create")}(instance) )
+<#else>
+                    .add(${pojo.importType("org.hibernate.criterion.Example")}.create(instance))
+</#if>
+            .list();
+            logger.log(${pojo.importType("java.util.logging.Level")}.INFO, "find by example successful, result size: " + results.size());
+            return results;
+        }
+        catch (RuntimeException re) {
+            logger.log(${pojo.importType("java.util.logging.Level")}.SEVERE, "find by example failed", re);
+            throw re;
+        }
+    } 
+**/ 
+</#if>   
+    
+<#list daoHelper.getNamedHqlQueryDefinitions(md) as query>
+<#assign queryName = query.registrationName>
+<#if queryName.startsWith(clazz.entityName + ".")>
+<#assign methname = c2j.unqualify(queryName)>
+<#assign params = c2j.getParameterTypes(query)>
+<#assign argList = c2j.asFinderArgumentList(params, pojo)>
+<#if jdk5 && methname.startsWith("find")>
+    public ${pojo.importType("java.util.List")}<${declarationName}> ${methname}(${argList}) {
+<#elseif methname.startsWith("count")>
+    public int ${methname}(${argList}) {
+<#else>
+    public ${pojo.importType("java.util.List")} ${methname}(${argList}) {
+</#if>
+        ${pojo.importType("org.hibernate.query.Query")} query = sessionFactory.getCurrentSession()
+                .createNamedQuery("${queryName}");
+<#if jdk5 && methname.startsWith("find")>
+        return (List<${declarationName}>) query.list();
+<#elseif methname.startsWith("count")>
+        return ( (Integer) query.uniqueResult() ).intValue();
+<#else>
+        return query.list();
+</#if>
+    }
+</#if>
+</#list></#if>
+}
+</#assign>
+
+${pojo.generateImports()}
+${classbody}
diff --git a/tooling/hibernate-reveng/src/main/resources/debug.ftl b/tooling/hibernate-reveng/src/main/resources/debug.ftl
new file mode 100644
index 000000000000..953d52779068
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/debug.ftl
@@ -0,0 +1,34 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<#macro dump var>
+   <#if var?is_hash>
+   {
+     <#list var?keys as key>
+        ${key}:< <at> dump var[key]/>,
+     </#list>
+   }
+   <#elseif var?is_sequence>
+   [
+     <#list sequence as elem>
+       < <at> dump elem/>,
+     </#list>
+   ]
+   <#else>
+     ${var}
+   </#if>
+</#macro>
+
+<@dump .vars/>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/common.ftl b/tooling/hibernate-reveng/src/main/resources/doc/common.ftl
new file mode 100644
index 000000000000..e92a68b36c7b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/common.ftl
@@ -0,0 +1,50 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#macro header selected="">
+	<div id="header">
+
+		<div id="logo">
+			<a href="http://www.hibernate.org/" target="_blank">
+				<#assign src = docFileManager.getRef(docFile, docFileManager.getHibernateImageDocFile())>
+				<img src="${src}" alt="Hibernate"/>
+			</a>
+		</div>
+
+		<#-- unfortunately whitespace is significant here in browsers.. -->
+		<ul><#--
+		 --><@headerItem id="tables" label="Tables" href=docFileManager.getRef(docFile, docFileManager.getTableIndexDocFile()) selected=selected/><#--
+		 --><@headerItem id="entities" label="Entities" href=docFileManager.getRef(docFile, docFileManager.getClassIndexDocFile()) selected=selected/><#--
+	 --></ul>
+
+		<hr/>
+
+	</div>
+</#macro>
+
+<#macro headerItem id label href selected>
+	<#-- unfortunately whitespace is significant here in browsers.. -->
+	<#if selected == id><#--
+	 --><li class="selected"><#--
+		 -->${label}<#--
+	 --></li><#--
+ --><#else><#--
+	 --><li><#--
+		 --><a href="${href}" target="_top"><#--
+			 -->${label}<#--
+		 --></a><#--
+	 --></li><#--
+ --></#if>
+</#macro>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/doc-style.css b/tooling/hibernate-reveng/src/main/resources/doc/doc-style.css
new file mode 100644
index 000000000000..b85c3504e9e4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/doc-style.css
@@ -0,0 +1,213 @@
+/*
+ * Hibernate Tools, Tooling for your Hibernate Projects
+ *
+ * Copyright 2010-2025 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Hibernate Mapping Documentation Style Sheet
+ */
+
+body
+{
+	margin: 0.5em;
+	background: white;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10pt;
+}
+
+a
+{
+    color: #003399;
+}
+
+a:active
+{
+    color: #003399;
+}
+
+a:visited
+{
+    color: #888888;
+}
+
+p, ul, hr
+{
+	margin: 0.5em 0;
+}
+* html hr /* ie6 */
+{
+	margin: 0;
+}
+
+h1
+{
+	text-align: center;
+}
+
+table
+{
+	margin: 0.5em 0;
+	width: 100%;
+	border-collapse: collapse;
+}
+* html table /* ie6 only */
+{
+	margin: 1em 0;
+}
+
+th, td
+{
+	border: solid 1px #CCCCCC;
+	padding: 3px;
+}
+
+th
+{
+	background: #F4F4F4;
+	text-align: left;
+}
+
+td a
+{
+	font-weight: bold;
+}
+
+hr
+{
+	border: none;
+	border-top: 1px solid #CCCCCC;
+}
+* html hr /* ie6 only */
+{
+	height: 1px;
+}
+
+.MainTableHeading
+{
+	font-size: 20px;
+	font-weight: bold;
+}
+
+p.MainTableHeading
+{
+	background: #F4F4F4;
+	border: solid 1px #CCCCCC;
+	padding: 3px;
+}
+
+.List p
+{
+	margin: 0 0 10px 0;
+}
+
+.ListTitleFont
+{
+	font-size: large;
+	font-weight: bold;
+	white-space: nowrap;
+}
+
+/* header */
+
+#logo
+{
+	float: right;
+	margin-bottom: 0.5em;
+}
+* html #logo /* ie6 */
+{
+	margin-bottom: 0;
+}
+
+#logo img
+{
+	display: block;
+	border: none;
+}
+
+#header ul
+{
+	list-style: none;
+	background: #F4F4F4;
+	padding: 4px;
+	margin: 0;
+}
+
+#header li
+{
+	display: inline;
+	margin-right: 3px;
+	padding: 0 3px;
+}
+
+#header li.selected
+{
+	background: silver;
+	color: white;
+	font-weight: bold;
+}
+
+#header a
+{
+	color: black;
+	font-weight: bold;
+}
+
+#header hr
+{
+	clear: right;
+}
+
+/* entity hierarchy */
+
+ul.EntityHierarchy
+{
+	border: solid 1px #CCCCCC;
+	background: #F4F4F4;
+	list-style: none;
+	padding: 5px;
+	font: bold 90% monospace;
+}
+* html ul.EntityHierarchy /* ie6 only */
+{
+	margin-left: 0;
+}
+
+.EntityHierarchy a
+{
+	font-weight: normal;
+}
+
+.EntityHierarchy ul
+{
+	margin: 0;
+	list-style: none;
+	padding-left: 0;
+}
+* html .EntityHierarchy ul /* ie6 only */
+{
+	margin-left: 0;
+}
+
+.EntityHierarchy ul.first
+{
+	padding-left: 15px;
+}
+
+.EntityHierarchy ul ul
+{
+	padding-left: 30px;
+}
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/entities/allEntity-list.ftl b/tooling/hibernate-reveng/src/main/resources/doc/entities/allEntity-list.ftl
new file mode 100644
index 000000000000..79722e59eadf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/entities/allEntity-list.ftl
@@ -0,0 +1,36 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Entity List</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body class="List">
+
+		<p class="ListTitleFont">
+			All Entities
+		</p>
+		
+		<p>
+			<#list classList as class>
+				<a href="${docFileManager.getRef(docFile, docFileManager.getEntityDocFile(class))}" target="generalFrame">${class.declarationName}</a><br/>
+			</#list>
+		</p>
+
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/entities/entity.ftl b/tooling/hibernate-reveng/src/main/resources/doc/entities/entity.ftl
new file mode 100644
index 000000000000..60664d74a265
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/entities/entity.ftl
@@ -0,0 +1,436 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#import "/doc/common.ftl" as common>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Entity Info</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body>
+
+		<@common.header/>
+
+		<h4>
+			<#if class.packageName?length gt 0>
+				${class.packageName}
+			<#else>
+				Default package
+			</#if>
+		</h4>
+		<h2>Entity ${class.getShortName()}</h2>
+		
+		<ul class="EntityHierarchy">
+			<li>
+			    <#assign superClasses=dochelper.getInheritanceHierarchy(class)>
+				<#list superClasses?reverse as superClass>
+					<#-- whitespace is significant here -->
+					<#if superClass_index gt 0><img src="${docFileManager.getRef(docFile, docFileManager.getExtendsImageDocFile())}" alt="extended by"/></#if><a href="${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(superClass))}">${superClass.qualifiedDeclarationName}</a>
+					<ul <#if superClass_index == 0>class="first"</#if>>
+						<li>
+				</#list>
+				<#-- whitespace is significant here -->
+				<#if class.subclass><img src="${docFileManager.getRef(docFile, docFileManager.getExtendsImageDocFile())}" alt="extended by"/></#if>${class.qualifiedDeclarationName}
+				<#list superClasses as superClass>
+						</li>
+					</ul>
+				</#list>
+			</li>
+		</ul>
+
+		<hr/>
+
+		<#if class.getMetaAsString("class-description")?has_content>
+			<p>
+				${class.getMetaAsString("class-description")}
+			</p>
+			<hr/>
+		</#if>
+		
+		<#if class.hasIdentifierProperty()>
+			<#assign propertyIdentifier = class.getIdentifierProperty()>
+			
+			<table id="identifier_summary">
+				<thead>
+					<tr>
+						<th class="MainTableHeading" colspan="4">
+							Identifier Summary
+						</th>
+					</tr>
+					<tr>
+						<th style="width: 14%">
+							Name
+						</th>
+						<th style="width: 14%">
+							Column
+						</th>
+						<th style="width: 14%">
+							Type
+						</th>
+						<th style="width: 58%">
+							Description
+						</th>
+					</tr>
+				</thead>
+
+				<tbody>
+					<#if dochelper.getComponentPOJO(propertyIdentifier)?exists>
+						<#assign compoclass = dochelper.getComponentPOJO(propertyIdentifier)>
+						<#list compoclass.allPropertiesIterator as property>
+							<#assign columnIterator = property.getValue().selectables.iterator()>
+							<#assign rowspan = property.getValue().getColumnSpan()>
+							<tr>
+								<td <#if (rowspan>0)>rowspan="${rowspan}"</#if>>
+									<a href="#identifier_detail_${property.name}">
+										${property.name}
+									</a>
+								</td>
+
+								<#if (rowspan > 0)>
+									<#assign column = columnIterator.next()>
+									<#if column.isFormula()>
+										<td>
+											&nbsp;
+										</td>
+									<#else>
+										<td>
+											<a href="#property_summary">
+												${column.getName()}
+											</a>
+										</td>
+									</#if>			
+								<#else>
+									<td>
+										&nbsp;
+									</td>
+								</#if>
+								
+								<td <#if (rowspan > 0)>rowspan="${rowspan}"</#if>>
+									<#if dochelper.getComponentPOJO(property)?exists>
+										<a href="${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(dochelper.getComponentPOJO(property)))}" target="generalFrame">
+											${compoclass.getJavaTypeName(property, jdk5)?html?default("&nbsp;")}
+										</a>
+									<#else>
+										${compoclass.getJavaTypeName(property, jdk5)?html?default("&nbsp;")}
+									</#if>
+								</td>
+
+								<td <#if (rowspan > 0)>rowspan="${rowspan}"</#if>>
+									<#if compoclass.hasFieldJavaDoc(property)?exists>
+										${compoclass.getFieldDescription(property)?default("&nbsp;")}
+									<#else>
+										&nbsp;
+									</#if>
+								</td>
+							</tr>
+							
+							<#if (rowspan > 1)>
+								<#list columnIterator as column>
+									<tr>
+										<td>
+											<a href="#property_summary">
+												${column.name}
+											</a>
+										</td>
+									</tr>
+								</#list>
+							</#if>
+						</#list>	
+					<#else>
+						<tr>
+							<td>
+								<a href="#identifier_detail_${propertyIdentifier.name}">
+									${propertyIdentifier.name}
+								</a>
+							</td>
+							<td>
+								Column
+							</td>
+							<td>
+								${class.getJavaTypeName(propertyIdentifier, jdk5)?html?default("&nbsp;")}
+							</td>
+							<td>
+								<#if class.hasFieldJavaDoc(propertyIdentifier)>
+									${class.getFieldDescription(propertyIdentifier)?default("&nbsp;")}
+								<#else>
+									&nbsp;
+								</#if>
+							</td>			
+						</tr>
+					</#if>
+				</tbody>
+			</table>
+		<#else>
+			<#list superClasses as superClass>
+				<#if superClass.hasIdentifierProperty()>
+					<#assign identifier = superClass.identifierProperty>
+					<#assign superClassRef = docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(superClass))>
+					<p id="identifier_summary" class="MainTableHeading">
+						Identifier Summary
+					</p>
+					<table id="identifier_inherited_from_entity_${superClass.shortName}">
+						<tr>
+							<th>
+								Identifier inherited from entity <a href="${superClassRef}">${superClass.shortName}</a>
+							</th>
+						</tr>
+						<tr>
+							<td>
+								<a href="${superClassRef}#identifier_detail_${identifier.name}">${identifier.name}</a>
+							</td>
+						</tr>
+					</table>
+				</#if>
+			</#list>
+		</#if>
+		
+		<#if class.hasVersionProperty()>
+			<#assign version = class.versionProperty>
+			
+			<table id="version_summary">
+				<thead>
+					<tr>
+						<th class="MainTableHeading" colspan="4">
+							Version Summary
+						</th>
+					</tr>
+					<tr>
+						<th style="width: 14%">
+							Name
+						</th>
+						<th style="width: 14%">
+							Column
+						</th>
+						<th style="width: 14%">
+							Type
+						</th>
+						<th style="width: 58%">
+							Description
+						</th>
+					</tr>
+				</thead>
+
+				<tbody>
+					<tr>
+						<td>
+							<a href="#version_detail_${version.name}">
+								${version.name}
+							</a>
+						</td>
+						<td>
+							Column
+						</td>
+						<td>
+							${class.getJavaTypeName(version, jdk5)?html?default("&nbsp;")}
+						</td>
+						<td>
+							<#if class.hasFieldJavaDoc(version)>
+								${class.getFieldDescription(version)?default("&nbsp;")}
+							<#else>
+								&nbsp;
+							</#if>
+						</td>			
+					</tr>
+				</tbody>
+			</table>
+		<#else>
+			<#list superClasses as superClass>
+				<#if superClass.hasVersionProperty()>
+					<#assign version = superClass.versionProperty>
+					<#assign superClassRef = docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(superClass))>
+					<p id="version_summary" class="MainTableHeading">
+						Version Summary
+					</p>
+					<table id="version_inherited_from_entity_${superClass.shortName}">
+						<tr>
+							<th>
+								Version inherited from entity <a href="${superClassRef}">${superClass.shortName}</a>
+							</th>
+						</tr>
+						<tr>
+							<td>
+								<a href="${superClassRef}#version_detail_${version.name}">${version.name}</a>
+							</td>
+						</tr>
+					</table>
+				</#if>
+			</#list>
+		</#if>
+
+		<#assign properties = dochelper.getOrderedSimpleProperties(class)>
+		<#if !properties.empty>
+			<table id="property_summary">
+				<thead>
+					<tr>
+						<th class="MainTableHeading" colspan="5">
+							Property Summary
+						</th>
+					</tr>
+					<tr>
+						<th style="width: 14%">
+							Name
+						</th>
+						<th style="width: 14%">
+							Column
+						</th>
+						<th style="width: 14%">
+							Access
+						</th>
+						<th style="width: 14%">
+							Type
+						</th>
+						<th style="width: 44%">
+							Description
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+	
+					<#list properties as property>
+						<#assign columnIterator = property.getValue().selectables.iterator()>
+						<#assign rowspan = property.getValue().getColumnSpan()>
+						<tr>
+							<td <#if (rowspan > 0)>rowspan="${rowspan}"</#if>>
+								<a href="#property_detail_${property.name}">
+									${property.name}
+								</a>
+							</td>
+	
+							<#if (rowspan > 0)>
+								<#assign column = columnIterator.next()>
+								<#if column.isFormula()>
+									<td>
+										&nbsp;
+									</td>
+								<#else>
+									<td>
+										<a href="#property_summary">
+											${column.getName()}
+										</a>
+									</td>
+								</#if>
+							<#else>
+								<td>
+									&nbsp;
+								</td>
+							</#if>
+	
+							<td <#if (rowspan > 0)>rowspan="${rowspan}"</#if>>
+								${property.getPropertyAccessorName()} (<a href="#property_summary">get</a> / <a href="#property_summary">set</a>)
+							</td>
+	
+							<td <#if (rowspan > 0)>rowspan="${rowspan}"</#if>>
+								<#if dochelper.getComponentPOJO(property)?exists>
+									<a href="${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(dochelper.getComponentPOJO(property)))}" target="generalFrame">
+										${class.getJavaTypeName(property, jdk5)?html?default("&nbsp;")}
+									</a>
+								<#else>
+									${class.getJavaTypeName(property, jdk5)?html?default("&nbsp;")}
+								</#if>
+							</td>
+	
+							<td <#if (rowspan > 0)>rowspan="${rowspan}"</#if>>
+								<#if class.hasFieldJavaDoc(property)>
+									${class.getFieldDescription(property)?default("&nbsp;")}
+								<#else>
+									&nbsp;
+								</#if>
+							</td>
+						</tr>
+						<#if (rowspan > 1)>
+							<#list columnIterator as column>
+								<tr>
+									<td>
+										<a href="#property_summary">
+											${column.name}
+										</a>
+									</td>
+								</tr>
+							</#list>
+						</#if>
+					</#list>
+	
+				</tbody>
+			</table>
+		</#if>
+
+		<#assign propertyHeader = properties.empty>
+		<#list superClasses as superClass>
+			<#assign superProperties = dochelper.getOrderedSimpleProperties(superClass)>
+			<#if !superProperties.empty>
+				<#assign superClassRef = docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(superClass))>
+				<#if propertyHeader>
+					<#assign propertyHeader = false>
+					<p id="properties_summary" class="MainTableHeading">
+						Property Summary
+					</p>
+				</#if>
+				<table id="properties_inherited_from_entity_${superClass.shortName}">
+					<tr>
+						<th>
+							Properties inherited from entity <a href="${superClassRef}">${superClass.shortName}</a>
+						</th>
+					</tr>
+					<tr>
+						<td>
+							<#list superProperties as property>
+								<a href="${superClassRef}#property_detail_${property.name}">${property.name}</a><#if property_has_next>, </#if>
+							</#list>
+						</td>
+					</tr>
+				</table>
+			</#if>
+		</#list>
+
+		<#if class.hasIdentifierProperty()>
+			<#assign identifier = class.identifierProperty>
+			<p id="identifier_detail" class="MainTableHeading">
+				Identifier Detail
+			</p>
+			<#if dochelper.getComponentPOJO(identifier)?exists>
+				<#assign identifierClass = dochelper.getComponentPOJO(identifier)>
+				<#list identifierClass.allPropertiesIterator as property>
+					<h3 id="identifier_detail_${property.name}">${property.name}</h3>
+				</#list>
+			<#else>
+				<h3 id="identifier_detail_${identifier.name}">${identifier.name}</h3>
+			</#if>
+		</#if>
+
+		<#if class.hasVersionProperty()>
+			<#assign version = class.versionProperty>
+			<p id="version_detail" class="MainTableHeading">
+				Version Detail
+			</p>
+			<#assign version = class.versionProperty>
+			<h3 id="version_detail_${version.name}">${version.name}</h3>
+		</#if>
+
+		<#assign properties = dochelper.getSimpleProperties(class)>
+		<#if !properties.empty>
+			<p id="property_detail" class="MainTableHeading">
+				Property Detail
+			</p>
+			<#list properties as property>
+				<h3 id="property_detail_${property.name}">${property.name}</h3>
+				<hr/>
+			</#list>
+		</#if>
+
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/entities/index.ftl b/tooling/hibernate-reveng/src/main/resources/doc/entities/index.ftl
new file mode 100644
index 000000000000..ba304312b232
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/entities/index.ftl
@@ -0,0 +1,38 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Entity Mapping Information</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+
+	<frameset cols="20%,80%">
+		<frameset rows="30%,70%">
+			<frame src="allpackages.html" name="packagesFrame" title="All Packages"/>
+			<frame src="allentities.html" name="entitiesFrame" title="All Entities"/>
+		</frameset>
+		<frame src="summary.html" name="generalFrame" title="Entity descriptions" scrolling="yes"/>
+		<noframes>
+			<body>
+				<h2>Frame Alert</h2>
+				<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.</p>
+			</body>
+		</noframes>
+	</frameset>
+
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/entities/package-list.ftl b/tooling/hibernate-reveng/src/main/resources/doc/entities/package-list.ftl
new file mode 100644
index 000000000000..84c2389888f4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/entities/package-list.ftl
@@ -0,0 +1,39 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Package List</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body class="List">
+
+		<p>
+			<a href="${docFileManager.getRef(docFile, docFileManager.getAllEntitiesDocFile())}" target="entitiesFrame">All Entities</a>
+		</p>
+
+		<p class="ListTitleFont">
+			Packages
+		</p>
+		<p>
+			<#list packageList as package>
+				<a href="${docFileManager.getRef(docFile, docFileManager.getPackageEntityListDocFile(package))}" target="entitiesFrame">${package}</a><br/>
+			</#list>
+		</p>
+		
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/entities/package-summary.ftl b/tooling/hibernate-reveng/src/main/resources/doc/entities/package-summary.ftl
new file mode 100644
index 000000000000..1c08d99ae930
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/entities/package-summary.ftl
@@ -0,0 +1,58 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#import "/doc/common.ftl" as common>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Entity Summary</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body>
+
+		<@common.header/>
+
+		<h2>Package ${package}</h2>
+
+		<#if (classList.size() > 0)>
+			<table>
+				<thead>
+					<tr>
+						<th class="MainTableHeading" colspan="2">
+							Entities Summary
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+					<#list classList as class>
+						<tr>
+							<td style="width: 15%">
+								<a href="${docFileManager.getRef(docFile, docFileManager.getEntityDocFile(class))}" target="generalFrame">
+									${class.declarationName}
+								</a>
+							</td>
+							<td>
+								${class.getMetaAsString("class-description")?default("&nbsp;")}
+							</td>
+						</tr>
+					</#list>
+				</tbody>
+			</table>
+		</#if>
+		
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/entities/perPackageEntity-list.ftl b/tooling/hibernate-reveng/src/main/resources/doc/entities/perPackageEntity-list.ftl
new file mode 100644
index 000000000000..0b078252d5d1
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/entities/perPackageEntity-list.ftl
@@ -0,0 +1,39 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Entity List</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body class="List">
+
+		<p class="ListTitleFont">
+			<a href="${docFileManager.getRef(docFile, docFileManager.getPackageSummaryDocFile(title))}" target="generalFrame">${title}</a>
+		</p>
+		
+		<#if (classList.size() > 0)>
+			<p>
+				Entities<br/>
+				<#list classList as class>
+					<a href="${docFileManager.getRef(docFile, docFileManager.getEntityDocFile(class))}" target="generalFrame">${class.declarationName}</a><br/>
+				</#list>
+			</p>
+		</#if>
+
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/entities/summary.ftl b/tooling/hibernate-reveng/src/main/resources/doc/entities/summary.ftl
new file mode 100644
index 000000000000..5d449ebf1cc6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/entities/summary.ftl
@@ -0,0 +1,60 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#import "/doc/common.ftl" as common>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Entity Summary</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body>
+	
+		<@common.header selected="entities"/>
+
+		<h1>Hibernate Mapping Documentation</h1>
+
+		<#if graphsGenerated>
+			<p>
+				<img src="entitygraph.png" alt="Entity Graph" usemap="#entitygraph"/>
+				<map name="entitygraph">
+					${entitygrapharea}
+				</map>
+			</p>
+		</#if>
+
+		<table>
+			<thead>
+				<tr>
+					<th class="MainTableHeading">
+						Packages
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<#list packageList as package>
+				<tr>
+					<td>
+						<a href="${docFileManager.getRef(docFile, docFileManager.getPackageSummaryDocFile(package))}" target="generalFrame">${package}</a>
+					</td>
+				</tr>
+				</#list>
+			</tbody>
+		</table>
+
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/hibernate_logo.gif b/tooling/hibernate-reveng/src/main/resources/doc/hibernate_logo.gif
new file mode 100644
index 000000000000..c17e7c2bdb70
Binary files /dev/null and b/tooling/hibernate-reveng/src/main/resources/doc/hibernate_logo.gif differ
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/index.html b/tooling/hibernate-reveng/src/main/resources/doc/index.html
new file mode 100644
index 000000000000..770748b98d6a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/index.html
@@ -0,0 +1,25 @@
+<!--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Hibernate Mapping Information</title>
+		<meta http-equiv="refresh" content="0;url=entities/index.html"/>
+	</head>
+	<body>
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/inherit.gif b/tooling/hibernate-reveng/src/main/resources/doc/inherit.gif
new file mode 100644
index 000000000000..6833399cc473
Binary files /dev/null and b/tooling/hibernate-reveng/src/main/resources/doc/inherit.gif differ
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/tables/index.ftl b/tooling/hibernate-reveng/src/main/resources/doc/tables/index.ftl
new file mode 100644
index 000000000000..b38a59f9791a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/tables/index.ftl
@@ -0,0 +1,38 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Table Mapping Information</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+
+	<frameset cols="20%,80%">
+		<frameset rows="30%,70%">
+			<frame src="allschemas.html" name="schemasFrame" title="All Schemas"/>
+			<frame src="alltables.html" name="tablesFrame" title="All Tables"/>
+		</frameset>
+		<frame src="summary.html" name="generalFrame" title="Table descriptions" scrolling="yes"/>
+		<noframes>
+			<body>
+				<h2>Frame Alert</h2>
+				<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.</p>
+			</body>
+		</noframes>
+	</frameset>
+
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/tables/schema-list.ftl b/tooling/hibernate-reveng/src/main/resources/doc/tables/schema-list.ftl
new file mode 100644
index 000000000000..58ae7f80f5db
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/tables/schema-list.ftl
@@ -0,0 +1,40 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Schema List</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body class="List">
+
+		<p>
+			<a href="${docFileManager.getRef(docFile, docFileManager.getAllTablesDocFile())}" target="tablesFrame">All Tables</a>
+		</p>
+
+		<p class="ListTitleFont">
+			Schemas
+		</p>
+
+		<p>
+			<#list schemaList as schema>
+				<a href="${docFileManager.getRef(docFile, docFileManager.getSchemaTableListDocFile(schema))}" target="tablesFrame">${schema}</a><br/>
+			</#list>
+		</p>
+
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/tables/schema-summary.ftl b/tooling/hibernate-reveng/src/main/resources/doc/tables/schema-summary.ftl
new file mode 100644
index 000000000000..8d30896f8d68
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/tables/schema-summary.ftl
@@ -0,0 +1,53 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#import "/doc/common.ftl" as common>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Table Summary</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body>
+
+		<@common.header/>
+
+		<h2>Schema ${schema}</h2>
+
+		<table>
+			<thead>
+				<tr>
+					<th class="MainTableHeading">
+						Tables
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<#list dochelper.tablesBySchema.get(schema) as table>
+					<tr>
+						<td>
+							<a href="${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}" target="generalFrame">
+								${table.name}
+							</a>
+						</td>
+					</tr>
+				</#list>
+			</tbody>
+		</table>
+
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/tables/schema-table-list.ftl b/tooling/hibernate-reveng/src/main/resources/doc/tables/schema-table-list.ftl
new file mode 100644
index 000000000000..e166698044cc
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/tables/schema-table-list.ftl
@@ -0,0 +1,36 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Table List</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body class="List">
+
+		<p class="ListTitleFont">
+			<a href="${docFileManager.getRef(docFile, docFileManager.getSchemaSummaryDocFile(title))}" target="generalFrame">${title}</a>
+		</p>
+		
+		<p>
+			<#list tableList as table>
+				<a href="${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}" target="generalFrame">${table.name}</a><br/>
+			</#list>
+		</p>
+
+	</body>
+</html>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/tables/summary.ftl b/tooling/hibernate-reveng/src/main/resources/doc/tables/summary.ftl
new file mode 100644
index 000000000000..a2f1baadcf48
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/tables/summary.ftl
@@ -0,0 +1,62 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#import "/doc/common.ftl" as common>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Table Summary</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body>
+
+		<@common.header selected="tables"/>
+
+		<h1>Hibernate Mapping Documentation</h1>
+
+		<#if graphsGenerated>
+			<p>
+				<img src="tablegraph.png" alt="Table Graph" usemap="#tablegraph"/>
+				<map name="tablegraph">
+					${tablegrapharea}
+				</map>
+			</p>
+		</#if>
+
+		<table>
+			<thead>
+				<tr>
+					<th class="MainTableHeading">
+						Schemas
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<#list dochelper.tablesBySchema.keySet() as schema>
+					<tr>
+						<td>
+							<a href="${docFileManager.getRef(docFile, docFileManager.getSchemaSummaryDocFile(schema))}" target="generalFrame">
+								${schema}
+							</a>
+						</td>
+					</tr>
+				</#list>
+			</tbody>
+		</table>
+		
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/tables/table-list.ftl b/tooling/hibernate-reveng/src/main/resources/doc/tables/table-list.ftl
new file mode 100644
index 000000000000..162375d13d29
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/tables/table-list.ftl
@@ -0,0 +1,36 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Table List</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body class="List">
+
+		<p class="ListTitleFont">
+			All Tables
+		</p>
+		
+		<p>
+			<#list tableList as table>
+				<a href="${docFileManager.getRef(docFile, docFileManager.getTableDocFile(table))}" target="generalFrame">${table.name}</a><br/>
+			</#list>
+		</p>
+
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/doc/tables/table.ftl b/tooling/hibernate-reveng/src/main/resources/doc/tables/table.ftl
new file mode 100644
index 000000000000..e268af3c9191
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/doc/tables/table.ftl
@@ -0,0 +1,308 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#import "/doc/common.ftl" as common>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+	<head>
+		<title>Hibernate Mappings - Table Info</title>
+		<link rel="stylesheet" type="text/css" href="${docFileManager.getRef(docFile, docFileManager.getCssStylesDocFile())}" title="Style"/>
+	</head>
+	<body>
+
+		<@common.header/>
+
+		<h4>Schema ${dochelper.getQualifiedSchemaName(table)}</h4>
+		<h2>Table ${table.name}</h2>
+
+		<#if table.comment?exists>
+			<p>${table.comment}</p>
+		</#if>
+
+		<table id="column_summary">
+			<thead>
+				<tr>
+					<th class="MainTableHeading" colspan="7">
+						Column Summary
+					</th>
+				</tr>
+				<tr>
+					<th style="width: 14%">
+						Name
+					</th>
+					<th style="width: 14%">
+						SqlType
+					</th>
+					<th style="width: 14%">
+						Length
+					</th>
+					<th style="width: 14%">
+						Precision
+					</th>
+					<th style="width: 14%">
+						Scale
+					</th>
+					<th style="width: 14%">
+						Nullable
+					</th>
+					<th style="width: 14%">
+						Unique
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<#list table.columns as column>
+					<tr>
+						<td>
+							<a href="#column_detail_${column.name}">
+								${column.name}
+							</a>
+						</td>
+						<td>
+							${dochelper.getSQLTypeName(column)}
+						</td>
+						<td>
+							${dochelper.getLength(column)}
+						</td>
+						<td>
+							${dochelper.getPrecision(column)}
+						</td>
+						<td>
+							${dochelper.getScale(column)}
+						</td>
+						<td>
+							${column.nullable?string}
+						</td>
+						<td>
+							${column.unique?string}
+						</td>
+					</tr>
+				</#list>
+			</tbody>
+		</table>
+
+		<#-- SHOW THE PRIMARY KEY -->
+		<table id="primary_key">
+			<thead>
+				<tr>
+					<th class="MainTableHeading" colspan="2">
+						Primary Key
+					</th>
+				</tr>
+				<tr>
+					<th style="width: 50%">
+						Name
+					</th>
+					<th style="width: 50%">
+						Columns
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<#if table.hasPrimaryKey()>
+					<tr>
+						<td>
+							<#if table.primaryKey.name?has_content>
+								${table.primaryKey.name}
+							<#else>
+								Name not specified
+							</#if>
+						</td>
+						<td>
+							<#list dochelper.getPrimaryKeyColumnIterator(table) as column>
+								<a href="#column_detail_${column.name}">
+									${column.name}
+								</a>
+							</#list>
+						</td>
+					</tr>
+				<#else>
+					<tr>
+						<td>
+							No Primary Key
+						</td>
+					</tr>
+				</#if>
+			</tbody>
+		</table>
+
+		<#-- SHOW THE FOREIGN KEYS -->
+		<#if !table.foreignKeys.isEmpty()>
+			<table id="foreign_keys">
+				<thead>
+					<tr>
+						<th class="MainTableHeading" colspan="3">
+							Foreign Keys
+						</th>
+					</tr>
+					<tr>
+						<th style="width: 33%">
+							Name
+						</th>
+						<th style="width: 33%">
+							Referenced Table
+						</th>
+						<th style="width: 33%">
+							Columns
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+					<#list table.foreignKeys.values() as foreignKey>
+						<tr>
+							<td>
+								${foreignKey.name?default("Name not specified")}
+							</td>
+							<td>
+								<a href="${docFileManager.getRef(docFile, docFileManager.getTableDocFile(foreignKey.referencedTable))}" target="generalFrame">
+									${foreignKey.referencedTable.name}
+								</a>
+							</td>
+							<td>
+								<#list foreignKey.columns as column>
+									<a href="#column_detail_${column.name}">
+										${column.name}
+									</a>
+								</#list>
+							</td>
+						</tr>
+					</#list>
+				</tbody>
+			</table>
+		</#if>
+			
+		<#-- SHOW THE UNIQUE KEYS -->
+		<#if !table.uniqueKeys.isEmpty()>
+			<table id="unique_keys">
+				<thead>
+					<tr>
+						<th class="MainTableHeading" colspan="2">
+							Unique Keys
+						</th>
+					</tr>
+					<tr>
+						<th style="width: 50%">
+							Name
+						</th>
+						<th style="width: 50%">
+							Columns
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+					<#list table.uniqueKeys.values() as uniqueKey>
+						<tr>
+							<td>
+								${uniqueKey.name?default("Name not specified")}
+							</td>
+							<td>
+								<#list uniqueKey.columns as column>
+									<a href="#column_detail_${column.name}">
+										${column.name}
+									</a>
+								</#list>
+							</td>
+						</tr>
+					</#list>
+				</tbody>
+			</table>
+		</#if>
+		
+		<#-- SHOW THE TABLE INDEXES -->
+		<#if !table.indexes.isEmpty()>
+			<table id="indexes">
+				<thead>
+					<tr>
+						<th class="MainTableHeading" colspan="2">
+							Indexes
+						</th>
+					</tr>
+					<tr>
+						<th style="width: 50%">
+							Name
+						</th>
+						<th style="width: 50%">
+							Columns
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+					<#list table.indexes.values() as index>
+						<tr>
+							<td>
+								${index.name?default("Name not specificed")}
+							</td>
+							<td>
+								<#list index.columns as column>
+									<a href="#column_detail_${column.name}">
+										${column.name}
+									</a>
+								</#list>
+							</td>
+						</tr>
+					</#list>
+				</tbody>
+			</table>
+		</#if>
+		
+		<#if !table.columns.isEmpty()>
+			<p id="column_detail" class="MainTableHeading">
+				Column Detail
+			</p>
+				
+			<#list table.columns as column>
+				<h3 id="column_detail_${column.name}">${column.name}</h3>
+				
+				<ul>
+					<li>
+						<strong>Type:</strong> ${dochelper.getSQLTypeName(column)}
+					</li>
+					<li>
+						<strong>Length:</strong> ${dochelper.getLength(column)}
+					</li>
+					<li>
+						<strong>Precision:</strong> ${dochelper.getPrecision(column)}
+					</li>
+					<li>
+						<strong>Scale:</strong> ${dochelper.getScale(column)}
+					</li>
+					<li>
+						<strong>Nullable:</strong> ${column.nullable?string}
+					</li>
+					<li>
+						<strong>Unique:</strong> ${column.unique?string}
+					</li>
+					<li>
+						<strong>Comment:</strong> ${column.comment?if_exists}
+					</li>
+				</ul>
+
+				<#--
+					<H4>Mappings:</H4>
+
+					<#list dochelper.getProperties(table, column) as property>
+						property.persistentClass.className - property.name
+					</#list>
+				-->
+
+				<hr/>
+			</#list>
+				
+		</#if>
+
+	</body>
+</html>
diff --git a/tooling/hibernate-reveng/src/main/resources/dot/entitygraph.dot.ftl b/tooling/hibernate-reveng/src/main/resources/dot/entitygraph.dot.ftl
new file mode 100644
index 000000000000..9f7e5b99386d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/dot/entitygraph.dot.ftl
@@ -0,0 +1,90 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+digraph EntityGraph {
+  compound=true;
+    bgcolor="white"; 
+    fontcolor="black"; fontname="Helvetica"; fontsize="10.0"; 
+    ranksep="equally"; 
+    label="Entity Graph"; 
+    URL="http://tools.hibernate.org";
+  edge [
+        color="lightgrey", 
+        fontcolor="black", 
+        fontname="Helvetica", 
+        fontsize="8.0",         
+        labelangle=-25.0, 
+        labeldistance=1.5
+        ];
+  node [
+       fontcolor="black",
+       fontname="Helvetica", 
+       fontsize="10.0", 
+       shape=record, 
+       fillcolor="#D4E5FE", 
+       style="solid,filled"];
+
+<#list md.entityBindings as entity>
+  /* Node ${entity.entityName} */
+  <@nodeName entity.entityName/> [ label = "<@propertyLabels name=entity.entityName properties=entity.properties/>", URL="${entity.entityName?replace(".","/")}.html" ]
+  /* Subclass edges for ${entity.entityName} */
+  <#list entity.getDirectSubclasses() as subclass>
+     <@nodeName subclass.entityName/> -> <@nodeName entity.entityName/>  [ weight="10", arrowhead="onormal"  ]
+  </#list>
+  
+  <@propertyEdges root=entity.entityName?replace(".","_dot_") properties=entity.properties/>     
+</#list>
+
+}
+
+<#macro nodeName name>${name?replace(".","_dot_")}</#macro>
+
+<#macro propertyLabels name properties>
+<@compress single_line=true>
+             { 
+                ${name?replace(".","\\.")}|
+                <#list properties as p>
+                  <#if p.value.isSimpleValue()> 
+                   ${p.name}\l
+                 </#if>
+                </#list>
+              }</@compress></#macro>
+
+<#macro dumpComponent compProperty>
+      <#assign component=compProperty.value>
+      /* Node component ${component} */
+      ${c2h.getHibernateTypeName(compProperty)?replace(".","_dot_")} [ 
+        label = "<@propertyLabels name=component.componentClassName properties=component.properties/>"
+           ]
+      <@propertyEdges root=component.componentClassName?replace(".","_dot_") properties=component.properties/>   
+</#macro>
+
+<#macro propertyEdges root properties>
+  /* Property edges/nodes for ${root} */
+  <#list properties as property>
+     <#if c2h.getSafeHibernateTypeName(property)?exists>
+     ${root} -> ${c2h.getHibernateTypeName(property)?replace(".","_dot_")} [ 
+        label="${property.name}" 
+        <#if c2j.isComponent(property)>
+        arrowtail="diamond"
+        </#if>
+        ]
+     </#if>
+     <#if c2j.isComponent(property)>
+     <@dumpComponent property/>
+     </#if>
+     
+  </#list>
+</#macro>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/dot/tablegraph.dot.ftl b/tooling/hibernate-reveng/src/main/resources/dot/tablegraph.dot.ftl
new file mode 100644
index 000000000000..45faf7d39152
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/dot/tablegraph.dot.ftl
@@ -0,0 +1,72 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+digraph TableGraph {
+  compound=true;
+    bgcolor="white"; 
+    fontcolor="black"; fontname="Helvetica"; fontsize="10.0"; 
+    ranksep="equally"; 
+    label="Table Graph"; 
+    URL="http://tools.hibernate.org";
+  edge [
+        color="lightgrey", 
+        fontcolor="black", 
+        fontname="Helvetica", 
+        fontsize="8.0",         
+        labelangle=-25.0, 
+        labeldistance=1.5
+        headport=nw,
+        tailport=se
+        ];
+  node [
+       fontcolor="black",
+       fontname="Helvetica", 
+       fontsize="10.0", 
+       shape=record, 
+       fillcolor="yellow", 
+       style="solid,filled"];
+
+/* TODO: multi schema tables */
+<#list tables as table>
+  <#if table.isPhysicalTable()>
+  /* Node ${table.name} */
+  <@nodeName table/> [ label = "<@columnLabels name=table.name columns=table.columns/>" ]  
+  
+  <@propertyEdges root=table.name?replace(".","_dot_") foreignKeys=table.foreignKeys.values()/>     
+  </#if>
+</#list>
+
+}
+
+<#macro nodeName table>${table.name?replace(".","_dot_")}</#macro>
+
+<#macro columnLabels name columns>
+<@compress single_line=true>
+             { 
+                ${name?replace(".","\\.")}|
+                <#list columns as p>
+                   <${p.name}>${p.name}\l
+                   <#if p_has_next>|</#if>
+                </#list>
+              }</@compress></#macro>
+
+<#macro propertyEdges root foreignKeys>
+  /* edges/nodes for ${root} */
+  <#list foreignKeys as fk>
+     ${root} -> <@nodeName fk.referencedTable/> [ 
+        label="${fk.name}" 
+        ]
+  </#list>
+</#macro>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/any.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/any.hbm.ftl
new file mode 100644
index 000000000000..e67e780190fc
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/any.hbm.ftl
@@ -0,0 +1,37 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#assign value = property.value>
+	<any name="${property.name}" 
+		id-type="${value.getIdentifierType()}" 
+		meta-type="${value.getMetaType()}"
+		<#if property.cascade != "none">
+        cascade="${property.cascade}"
+		</#if>
+		<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+		</#if>>
+	    	<#assign metaattributable=property>
+		<#include "meta.hbm.ftl">
+		<#if value.metaValues?exists>
+		    <#list value.metaValues.entrySet() as entry>
+              		<meta-value value="${entry.key}" class="${entry.value}"/>
+           	</#list>
+        </#if>
+        <#list property.columns as column>
+            <#include "column.hbm.ftl">
+        </#list>
+	</any>
+	
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/array.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/array.hbm.ftl
new file mode 100644
index 000000000000..4354b8cb73ab
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/array.hbm.ftl
@@ -0,0 +1,41 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#assign value = property.value>
+<#assign keyValue = value.getKey()>
+<#assign elementValue = value.getElement()>
+<#assign indexValue = value.getIndex()>
+<#assign elementTag = c2h.getCollectionElementTag(property)>
+
+<array name="${property.name}"
+	<#if value.elementClassName?exists> element-class="${value.elementClassName}"</#if>
+	<#include "collection-tableattr.hbm.ftl">
+	<#if property.cascade != "none">
+        cascade="${property.cascade}"
+	</#if>
+	<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+	</#if>
+	<#if c2h.hasFetchMode(property)> fetch="${c2h.getFetchMode(property)}"</#if>>
+ 	<#assign metaattributable=property>
+ 	<#include "meta.hbm.ftl">
+    <#include "key.hbm.ftl">
+    <list-index>
+    <#list indexValue.columns as column>
+    	<#include "column.hbm.ftl">
+    </#list>  
+    </list-index>
+    <#include "${elementTag}-element.hbm.ftl">
+</array>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/bag.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/bag.hbm.ftl
new file mode 100644
index 000000000000..ddf4699d6d5f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/bag.hbm.ftl
@@ -0,0 +1,36 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#assign value = property.value>
+<#assign keyValue = value.getKey()>
+<#assign elementValue = value.getElement()>
+<#assign elementTag = c2h.getCollectionElementTag(property)>
+
+	<bag name="${property.name}" 
+	<#include "collection-tableattr.hbm.ftl"> 
+	inverse="${value.inverse?string}"
+	lazy="${c2h.getCollectionLazy(value)}"
+	<#if property.cascade != "none">
+        cascade="${property.cascade}"
+	</#if>
+	<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+	</#if>
+	<#if c2h.hasFetchMode(property)> fetch="${c2h.getFetchMode(property)}"</#if>>
+	 <#assign metaattributable=property>
+	 	<#include "meta.hbm.ftl">
+ 		<#include "key.hbm.ftl">
+		<#include "${elementTag}-element.hbm.ftl">
+     	</bag>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/collection-tableattr.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/collection-tableattr.hbm.ftl
new file mode 100644
index 000000000000..43f77c340639
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/collection-tableattr.hbm.ftl
@@ -0,0 +1,22 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+table="${value.collectionTable.quotedName}"
+<#if value.collectionTable.catalog?exists && ((clazz.table.catalog?exists && clazz.table.catalog!=value.collectionTable.catalog) || (!clazz.table.catalog?exists && value.collectionTable.catalog?exists)) >
+catalog="${value.collectionTable.catalog}"
+</#if>
+<#if value.collectionTable.schema?exists && ((clazz.table.schema?exists && clazz.table.schema!=value.collectionTable.schema) || (!clazz.table.schema?exists && value.collectionTable.schema?exists)) >
+schema="${value.collectionTable.quotedSchema}"
+</#if>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/column.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/column.hbm.ftl
new file mode 100644
index 000000000000..55e69bdec697
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/column.hbm.ftl
@@ -0,0 +1,23 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#if column.isFormula()>
+<formula>${column.getFormula()}</formula>
+<#else>
+<column name="${column.quotedName}" ${c2h.columnAttributes(column)}<#if column.comment?exists && column.comment?trim?length!=0>>
+<comment>${column.comment}</comment>
+</column><#else>/>
+</#if>
+</#if>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/component.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/component.hbm.ftl
new file mode 100644
index 000000000000..32bdebca97b3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/component.hbm.ftl
@@ -0,0 +1,28 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<component
+    name="${property.name}"
+    class="${property.value.componentClassName}"
+    <#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+	</#if>>
+    <#assign metaattributable=property>
+	<#include "meta.hbm.ftl">
+	<#list c2h.getProperties(property.value) as property>
+		<#include "${c2h.getTag(property)}.hbm.ftl"/>
+	</#list>
+</component>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/composite-element.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/composite-element.hbm.ftl
new file mode 100644
index 000000000000..c7c50bd6e3cf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/composite-element.hbm.ftl
@@ -0,0 +1,27 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<composite-element class="${elementValue.componentClassName}">
+	<#assign metaattributable=property>
+	<#include "meta.hbm.ftl">
+	<#list elementValue.properties as property>
+		<#assign tag=c2h.getTag(property)>
+		<#if tag="component">
+			<#assign tag="nested-composite-element">
+			<#assign elementValue = property.value>
+		</#if>
+		<#include "${tag}.hbm.ftl"/>
+	</#list>
+</composite-element>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/dynamic-component.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/dynamic-component.hbm.ftl
new file mode 100644
index 000000000000..4cb099dad5ce
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/dynamic-component.hbm.ftl
@@ -0,0 +1,28 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<dynamic-component
+    name="${property.name}"
+    <#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+     </#if>
+     >
+    <#assign metaattributable=property>
+	<#include "meta.hbm.ftl">
+	<#list c2h.getProperties(property.value) as property>
+		<#include "${c2h.getTag(property)}.hbm.ftl"/>
+	</#list>
+</dynamic-component>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/element-element.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/element-element.hbm.ftl
new file mode 100644
index 000000000000..5fed01b2ca5b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/element-element.hbm.ftl
@@ -0,0 +1,20 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<element type="${elementValue.getTypeName()}">
+  <#list elementValue.columns as column>
+        <#include "column.hbm.ftl">
+  </#list>
+</element>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/filter-def.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/filter-def.hbm.ftl
new file mode 100644
index 000000000000..2572c05f4ffb
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/filter-def.hbm.ftl
@@ -0,0 +1,23 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#list md.filterDefinitions.keySet() as filterKey>
+<#assign filterDef = md.filterDefinitions.get(filterKey)>
+    <filter-def name="filterKey">
+    <#list filterDef.parameterNames as filterParaName>
+	    <filter-param name="${filterParaName}" type="${filterDef.getParameterType(filterParaName).name}" />
+    </#list>
+    </filter-def>    
+</#list>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/generalhbm.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/generalhbm.hbm.ftl
new file mode 100644
index 000000000000..72e2e18e73de
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/generalhbm.hbm.ftl
@@ -0,0 +1,41 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>	
+<!-- 
+	Auto-generated mapping file from
+	the hibernate.org cfg2hbm engine
+	for General Global Setttings
+-->
+
+<#if c2h.isImportData(md)>
+<#include "import.hbm.ftl">
+</#if>
+<#if c2h.isNamedQueries(md)>
+<#include "query.hbm.ftl"> 
+</#if>
+<#if c2h.isNamedSQLQueries(md)>
+<#include "sql-query.hbm.ftl">
+</#if>
+<#if c2h.isFilterDefinitions(md)>
+<#include "filter-def.hbm.ftl">
+</#if>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/hibernate-mapping.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/hibernate-mapping.hbm.ftl
new file mode 100644
index 000000000000..d616d0b1bb30
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/hibernate-mapping.hbm.ftl
@@ -0,0 +1,51 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- Generated ${date} by Hibernate Tools ${version} -->
+<#if hmgs?exists && hmgs.hasNonDefaultSettings()>
+<hibernate-mapping
+<#if hmgs.hasDefaultPackage()>
+ package="${hmgs.defaultPackage}"
+ </#if>
+<#if hmgs.hasSchemaName()>
+ schema="${hmgs.schemaName}"
+ </#if>
+<#if hmgs.hasCatalogName()>
+ catalog="${hmgs.catalogName}"
+</#if>
+<#if hmgs.hasNonDefaultCascade()>
+ default-cascade="${hmgs.defaultCascade}"
+ </#if>
+<#if hmgs.hasNonDefaultAccess()>
+ default-access="${hmgs.defaultAccess}"
+ </#if>
+<#if !hmgs.isDefaultLazy()>
+	default-lazy="false"
+	</#if>
+<#if !hmgs.isAutoImport()>
+	auto-import="false"
+</#if>>
+<#else>
+<hibernate-mapping>
+</#if>
+
+<#include "persistentclass.hbm.ftl"/>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/id.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/id.hbm.ftl
new file mode 100644
index 000000000000..c82dbfe6f1e5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/id.hbm.ftl
@@ -0,0 +1,89 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#if embeddedid?exists>
+   <composite-id>
+ <#list embeddedid.properties as keyproperty>
+	<#if !c2h.isManyToOne(keyproperty)>
+	   <key-property name="${keyproperty.name}" type="${keyproperty.value.typeName}">
+	   <#list keyproperty.columns as column>
+         <#include "pkcolumn.hbm.ftl">
+       </#list>
+       </key-property>
+	<#else>
+	   <key-many-to-one name="${keyproperty.name}" class="${c2j.getJavaTypeName(keyproperty, false)}">
+	   <#list keyproperty.columns as column>
+          <#include "pkcolumn.hbm.ftl">
+       </#list>
+       </key-many-to-one>
+	</#if>
+ </#list>   
+  </composite-id>   
+<#elseif !c2j.isComponent(property)>
+	<id 
+        name="${property.name}"
+        type="${property.value.typeName}"
+ <#if c2h.isUnsavedValue(property)>
+        unsaved-value="${c2h.getUnsavedValue(property)}"
+ </#if>
+ <#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+ </#if>
+    >
+    <#assign metaattributable=property>
+	<#include "meta.hbm.ftl">
+    
+ <#list property.columns as column>
+ 	    <#include "pkcolumn.hbm.ftl">
+ </#list>
+ <#if !c2h.isIdentifierGeneratorProperties(property)>
+	    <generator class="${property.value.identifierGeneratorStrategy}" />
+ <#else>
+	    <generator class="${property.value.identifierGeneratorStrategy}">
+        <#assign parameters = c2h.getIdentifierGeneratorProperties(property)>
+        <#list c2h.getFilteredIdentifierGeneratorKeySet(property, props) as paramkey>
+             <param name="${paramkey}">${parameters.get(paramkey)}</param>
+        </#list>
+		</generator>
+ </#if>
+    </id>
+<#else>
+    <composite-id
+		name="${property.name}"
+        class="${property.value.getComponentClassName()}"
+<#if c2h.isUnsavedValue(property)>
+        unsaved-value="${c2h.getUnsavedValue(property)}"
+</#if>
+<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+</#if>
+    >		
+    <#list property.value.properties as keyproperty>
+	  <#if !c2h.isManyToOne(keyproperty)>
+	        <key-property name="${keyproperty.name}" type="${keyproperty.value.typeName}">
+	        <#list keyproperty.columns as column>
+	           <#include "pkcolumn.hbm.ftl">
+	        </#list>	
+	        </key-property>
+	  <#else>
+			<key-many-to-one name="${keyproperty.name}" class="${c2j.getJavaTypeName(keyproperty, false)}">
+			<#list keyproperty.columns as column>
+                <#include "pkcolumn.hbm.ftl">
+            </#list>
+        	</key-many-to-one>
+	  </#if>
+    </#list>
+    </composite-id>	
+</#if>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/idbag.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/idbag.hbm.ftl
new file mode 100644
index 000000000000..6e75966fc045
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/idbag.hbm.ftl
@@ -0,0 +1,44 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#assign value = property.value>
+<#assign keyValue = value.getKey()>
+<#assign elementValue = value.getElement()>
+<#assign elementTag = c2h.getCollectionElementTag(property)>
+
+	<idbag name="${property.name}" 
+	<#include "collection-tableattr.hbm.ftl">
+	lazy="${c2h.getCollectionLazy(value)}"
+	<#if property.cascade != "none">
+        cascade="${property.cascade}"
+	</#if>
+	<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+	</#if>
+	<#if c2h.hasFetchMode(property)> fetch="${c2h.getFetchMode(property)}"</#if>>
+	 <#assign metaattributable=property>
+	 	<#include "meta.hbm.ftl">
+	 	<collection-id type="${value.identifier.typeName}" 
+	 		column="${value.getIdentifier().getColumns().iterator().next().getQuotedName()}">
+	 		<generator class="${value.identifier.identifierGeneratorStrategy}"/>
+	 	</collection-id>
+ 		<key> 
+        	<#list keyValue.columns as column>
+          		<#include "column.hbm.ftl">
+        	</#list>
+        	</key>
+		<#include "${elementTag}-element.hbm.ftl">
+     	</idbag>
+     	
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/import.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/import.hbm.ftl
new file mode 100644
index 000000000000..764861799786
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/import.hbm.ftl
@@ -0,0 +1,20 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#list md.imports.keySet() as importKey>
+<#assign importDef = md.imports.get(importKey)>
+<#if !importKey.equals(importDef)>
+    <import class="${importKey}" rename="${importDef}"/>
+</#if></#list>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/key.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/key.hbm.ftl
new file mode 100644
index 000000000000..74a037a4fad8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/key.hbm.ftl
@@ -0,0 +1,23 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+		<key
+		<#if property.value.referencedPropertyName?exists> 
+        property-ref="${property.value.referencedPropertyName}"
+</#if>> 
+   		<#list keyValue.columns as column>
+   			<#include "column.hbm.ftl">
+   		</#list>
+		</key>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/list.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/list.hbm.ftl
new file mode 100644
index 000000000000..470d9e26b12c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/list.hbm.ftl
@@ -0,0 +1,43 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#assign value = property.value>
+<#assign keyValue = value.getKey()>
+<#assign elementValue = value.getElement()>
+<#assign indexValue = value.getIndex()>
+<#assign elementTag = c2h.getCollectionElementTag(property)>
+
+	<list name="${property.name}" inverse="${value.inverse?string}" 
+	<#include "collection-tableattr.hbm.ftl"> 
+	lazy="${c2h.getCollectionLazy(value)}"
+	<#if property.cascade != "none">
+        cascade="${property.cascade}"
+	</#if>
+	<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+	</#if>	
+	<#if c2h.hasFetchMode(property)> fetch="${c2h.getFetchMode(property)}"</#if>>
+		<#assign metaattributable=property>
+		<#include "meta.hbm.ftl">
+		<#include "key.hbm.ftl">		
+    		<list-index>
+    			<#list indexValue.columns as column>
+    			<#include "column.hbm.ftl">
+			</#list>  
+    		</list-index>
+    		<#include "${elementTag}-element.hbm.ftl">
+	</list>
+
+
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/many-to-any-element.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/many-to-any-element.hbm.ftl
new file mode 100644
index 000000000000..b65e678a352b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/many-to-any-element.hbm.ftl
@@ -0,0 +1,26 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<many-to-any id-type="${elementValue.getIdentifierType()}" meta-type="${elementValue.getMetaType()}">
+	<#if elementValue.metaValues?exists>
+	<#list elementValue.metaValues.entrySet() as entry>
+        	<meta-value value="${entry.key}" class="${entry.value}"/>
+        </#list>
+        </#if>
+	<#list elementValue.columns as column>
+		<#include "column.hbm.ftl">
+	</#list>
+</many-to-any>
+			
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/many-to-many-element.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/many-to-many-element.hbm.ftl
new file mode 100644
index 000000000000..5ff01f15a5bf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/many-to-many-element.hbm.ftl
@@ -0,0 +1,23 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<many-to-many entity-name="${property.getValue().getElement().referencedEntityName}" <#-- lookup needed classname -->
+<#if property.value.referencedPropertyName?exists>
+        property-ref="${property.value.referencedPropertyName}"
+</#if>>
+  <#list elementValue.selectables as column>
+        <#include "column.hbm.ftl">
+  </#list>
+</many-to-many>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/many-to-one.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/many-to-one.hbm.ftl
new file mode 100644
index 000000000000..f8bda83a82e2
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/many-to-one.hbm.ftl
@@ -0,0 +1,48 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+    <many-to-one
+	    name="${property.name}"
+	    class="${c2j.getJavaTypeName(property, false)}"
+	    
+<#if property.value.referencedPropertyName?exists> 
+        property-ref="${property.value.referencedPropertyName}"
+</#if>	    
+<#if !property.updateable> 
+        update="false"
+</#if>
+<#if !property.insertable>
+        insert="false"
+</#if>
+<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+</#if>
+<#if property.cascade != "none">
+        cascade="${property.cascade}"
+</#if>
+<#assign fetchmode = c2h.getFetchMode(property)>
+<#if fetchmode != "default">
+        fetch="${fetchmode}"
+</#if>
+<#if !property.optimisticLocked>
+        optimistic-lock="false"
+</#if>
+    >
+    <#assign metaattributable=property>
+	<#include "meta.hbm.ftl">    
+<#list property.columns as column>
+        <#include "column.hbm.ftl">
+</#list>	
+   </many-to-one>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/map.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/map.hbm.ftl
new file mode 100644
index 000000000000..798c2627cfba
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/map.hbm.ftl
@@ -0,0 +1,49 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#assign value = property.value>
+<#assign keyValue = value.getKey()>
+<#assign elementValue = value.getElement()>
+<#assign indexValue = value.getIndex()>
+<#assign elementTag = c2h.getCollectionElementTag(property)>
+
+	<map name="${property.name}"
+	<#include "collection-tableattr.hbm.ftl">
+	lazy="${c2h.getCollectionLazy(value)}"
+	<#if property.cascade != "none">
+        cascade="${property.cascade}"
+	</#if>
+	<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+	</#if>
+	<#if c2h.hasFetchMode(property)> fetch="${c2h.getFetchMode(property)}"</#if>>
+		<#assign metaattributable=property><#include "meta.hbm.ftl">
+		<#-- TODO table attributes-->
+    		<#include "key.hbm.ftl">
+    		<#if c2h.isManyToOne(indexValue)>
+    		<map-key-many-to-many class="${indexValue.getReferencedEntityName()}">
+    			<#list indexValue.selectables as column>
+     			<#include "column.hbm.ftl">
+			</#list>  
+    		</map-key-many-to-many>
+    		<#else>
+    		<map-key type="${indexValue.typeName}">
+    			<#list indexValue.selectables as column>
+    			<#include "column.hbm.ftl">
+			</#list> 
+		</map-key>
+    		</#if>
+    		<#include "${elementTag}-element.hbm.ftl">
+	</map>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/meta.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/meta.hbm.ftl
new file mode 100644
index 000000000000..f5d13bcb3c7f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/meta.hbm.ftl
@@ -0,0 +1,22 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#if metaattributable.getMetaAttributes()?exists>
+<#list metaattributable.getMetaAttributes().keySet() as key>
+ <#list metaattributable.getMetaAttributes().get(key).values as value>
+  <meta attribute="${key}" inherit="false">${value}</meta>
+ </#list>
+</#list>
+</#if>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/nested-composite-element.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/nested-composite-element.hbm.ftl
new file mode 100644
index 000000000000..1e46ec4ebec7
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/nested-composite-element.hbm.ftl
@@ -0,0 +1,27 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<nested-composite-element class="${elementValue.componentClassName}" name="subcomponent">
+	<#assign metaattributable=property>
+	<#include "meta.hbm.ftl">
+	<#list elementValue.properties as property>
+		<#assign tag=c2h.getTag(property)>
+		<#if tag="component">
+			<#assign tag="nested-composite-element">
+			<#assign elementValue = property.value>
+		</#if>
+		<#include "${tag}.hbm.ftl"/>
+	</#list>
+</nested-composite-element>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/one-to-many-element.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/one-to-many-element.hbm.ftl
new file mode 100644
index 000000000000..eff8b2c1df1e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/one-to-many-element.hbm.ftl
@@ -0,0 +1,19 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<one-to-many class="${elementValue.getAssociatedClass().getClassName()}"
+	<#if !elementValue.getAssociatedClass().getClassName().equals(elementValue.getReferencedEntityName())> 
+		entity-name="${elementValue.getReferencedEntityName()}"
+	</#if>/>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/one-to-one.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/one-to-one.hbm.ftl
new file mode 100644
index 000000000000..b733bdaaa0bf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/one-to-one.hbm.ftl
@@ -0,0 +1,39 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+    <one-to-one
+	    name="${property.name}"
+	    class="${c2j.getJavaTypeName(property, false)}"
+<#if property.value.referencedPropertyName?exists> 
+        property-ref="${property.value.referencedPropertyName}"
+</#if>	
+<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+</#if>
+<#if property.cascade != "none">
+        cascade="${property.cascade}"
+</#if>
+<#if property.value.constrained>
+        constrained="true"
+</#if>
+
+<#if property.value.hasFormula()>
+<#assign formula = c2h.getFormulaForProperty(property)>
+<#if formula?exists>
+        formula="${formula.text}"
+</#if>
+</#if>
+    >
+   </one-to-one>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/persistentclass.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/persistentclass.hbm.ftl
new file mode 100644
index 000000000000..0da1552a28d5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/persistentclass.hbm.ftl
@@ -0,0 +1,161 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<${c2h.getTag(clazz)}
+    name="${c2h.getClassName(clazz)}"
+<#if !c2h.getClassName(clazz).equals(clazz.entityName)>
+    entity-name="${clazz.entityName}"
+</#if>
+<#if clazz.superclass?exists>
+    extends="${clazz.getSuperclass().className}"
+</#if>
+<#if c2h.needsTable(clazz)>
+    table="${clazz.table.quotedName}"
+</#if>
+<#if !c2h.isSubclass(clazz) && clazz.table.schema?exists>
+    schema="${clazz.table.quotedSchema}"
+</#if>
+<#if !c2h.isSubclass(clazz) && clazz.table.catalog?exists>
+    catalog="${clazz.table.catalog}"
+</#if>
+<#if !clazz.mutable>
+    mutable="false"
+</#if>
+<#if clazz.useDynamicUpdate()>
+    dynamic-update="true"
+</#if>
+<#if clazz.useDynamicInsert()>
+    dynamic-insert="true"
+</#if>
+<#if clazz.hasSelectBeforeUpdate()>
+    select-before-update="true"
+</#if>
+<#if c2h.needsDiscriminator(clazz)>
+    discriminator-value="${clazz.discriminatorValue}"
+</#if>
+<#if clazz.isExplicitPolymorphism()>
+    polymorphism="explicit"
+</#if>
+<#if clazz.isLazy() && !c2h.getClassName(clazz).equals(c2h.getProxyInterfaceName(clazz))>
+    proxy="${c2h.getProxyInterfaceName(clazz)}"
+<#elseif !clazz.isLazy()>
+    lazy="false"
+</#if>
+<#if clazz.isAbstract()?exists && clazz.isAbstract()>
+    abstract="true"
+</#if>
+<#if c2h.isClassLevelOptimisticLockMode(clazz)>
+    optimistic-lock="${c2h.getClassLevelOptimisticLockMode(clazz)}"
+</#if>
+<#if (clazz.batchSize>1)>
+    batch-size="${clazz.batchSize}"
+</#if>
+<#if clazz.where?exists>
+    where="${clazz.where}"
+</#if>
+<#if clazz.table.subselect>
+    subselect="${clazz.table.getSubselect()}"
+</#if>
+<#if c2h.hasCustomEntityPersister(clazz)>
+    persister="${clazz.getEntityPersisterClass().name}"
+</#if>
+<#if clazz.table.rowId?exists>
+    rowid="${clazz.table.rowId}"
+</#if>>
+<#assign metaattributable=clazz/>
+<#include "meta.hbm.ftl"/>
+
+<#if clazz.table.comment?exists  && clazz.table.comment?trim?length!=0>
+ <comment>${clazz.table.comment}</comment>
+</#if>
+<#-- TODO: move this to id.hbm.ftl -->
+<#if !c2h.isSubclass(clazz)>
+ <#if clazz.hasIdentifierProperty()>
+ <#assign property=clazz.getIdentifierProperty()/>
+ <#include "id.hbm.ftl"/>
+ <#elseif clazz.hasEmbeddedIdentifier()>
+ <#assign embeddedid=clazz.key/>
+ <#include "id.hbm.ftl"/>
+ <#elseif clazz.identifier?exists>
+ 	<#if c2j.isComponent(clazz.identifier)>
+ 	 	<composite-id
+ 	 	    name="${clazz.entityName}Id"
+        	class="${clazz.identifier.getComponentClassName()}"
+        	<#if clazz.identifierMapper?exists>mapped="true"</#if>>
+        	<#list clazz.identifier.properties as property>
+        		<key-property name="${property.name}">
+        		<#list property.value.selectables as column>
+         		<#include "column.hbm.ftl">
+ 			</#list>
+ 			</key-property>
+ 		</#list>
+        	</composite-id>
+ 	<#else>
+ 		 <id type="${clazz.identifier.typeName}">
+		 <#list clazz.identifier.selectables as column>
+        	<#include "column.hbm.ftl">
+ 		</#list>
+ 		</id>
+ 	</#if>
+ </#if>
+<#elseif c2h.isJoinedSubclass(clazz)>
+ <key>
+       <#list clazz.key.columns as column>
+                <#include "column.hbm.ftl">
+       </#list>
+ </key>
+</#if>
+
+<#if c2h.needsDiscriminatorElement(clazz)>
+    <discriminator type="${clazz.discriminator.typeName}">
+    	<#list clazz.discriminator.selectables as column>
+        	<#include "column.hbm.ftl">
+  	</#list>
+    </discriminator>
+</#if>
+
+
+<#-- version has to be done explicitly since Annotation's does not list version first -->
+<#if pojo.hasVersionProperty()>
+<#assign property=clazz.getVersion()/>
+<#include "${c2h.getTag(property)}.hbm.ftl"/>
+</#if>
+
+<#list c2h.getProperties(clazz) as property>
+<#if c2h.getTag(property)!="version" && c2h.getTag(property)!="timestamp">
+<#include "${c2h.getTag(property)}.hbm.ftl"/>
+</#if>
+</#list>
+
+<#list clazz.joins as join>
+ <join
+ <#if join.table.name?exists>
+     table="${join.table.name}"
+ </#if>>
+ <#if join.table.comment?exists  && join.table.comment?trim?length!=0>
+   <comment>${comment}</comment>
+ </#if>
+   <key>
+ <#list join.key.selectables as column>
+  <#include "column.hbm.ftl">
+ </#list>
+   </key>
+ <#list join.properties as property>
+  <#include "${c2h.getTag(property)}.hbm.ftl"/>
+ </#list>
+  </join>
+</#list>
+
+</${c2h.getTag(clazz)}>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/pkcolumn.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/pkcolumn.hbm.ftl
new file mode 100644
index 000000000000..65c304257b48
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/pkcolumn.hbm.ftl
@@ -0,0 +1,16 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<column name="${column.quotedName}" ${c2h.columnAttributes(column, true)}/>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/primitive-array.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/primitive-array.hbm.ftl
new file mode 100644
index 000000000000..38b08e896f59
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/primitive-array.hbm.ftl
@@ -0,0 +1,41 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#assign value = property.value>
+<#assign table = value.collectionTable.name>
+<#assign dependentValue = value.getKey()>
+
+<primitive-array name="${property.name}" table="${table}"
+<#if !property.basicPropertyAccessor>
+    access="${property.propertyAccessorName}"
+</#if>>
+ <#assign metaattributable=property>
+ <#include "meta.hbm.ftl">
+ <key>
+       <#list dependentValue.selectables as column>
+         <#include "column.hbm.ftl">
+       </#list>
+ </key>
+ <index>
+       <#list value.index.selectables as column>
+         <#include "column.hbm.ftl">   
+       </#list>
+ </index>
+ <element type="${value.getElementClass()}" >
+       <#list value.element.selectables as column>
+         <#include "column.hbm.ftl">   
+       </#list>
+ </element>
+</primitive-array>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/properties.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/properties.hbm.ftl
new file mode 100644
index 000000000000..35377bd490b1
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/properties.hbm.ftl
@@ -0,0 +1,24 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<properties
+    name="${property.name}">
+    <#assign metaattributable=property>
+	<#include "meta.hbm.ftl">
+	<#list c2h.getProperties(property.value) as property>
+		<#include "${c2h.getTag(property)}.hbm.ftl"/>
+	</#list>
+</properties>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/property.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/property.hbm.ftl
new file mode 100644
index 000000000000..190a68c7c6a2
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/property.hbm.ftl
@@ -0,0 +1,58 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+    <property
+        name="${property.name}"
+<#if !property.value.typeParameters?exists>
+	    type="${property.value.typeName}"
+</#if>        
+<#if !property.updateable>
+        update="false"
+</#if>
+<#if !property.insertable>
+        insert="false"
+</#if>
+<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+</#if>
+<#if property.lazy>
+        lazy="true"
+</#if>
+<#if !property.optimisticLocked>
+        optimistic-lock="false"
+</#if>
+<#if property.value.hasFormula()>
+<#assign formula = c2h.getFormulaForProperty(property)>
+<#if formula?has_content>
+        formula="${formula.text}"
+</#if>
+</#if>
+    >
+  <#assign metaattributable=property>
+  <#include "meta.hbm.ftl">
+  <#list property.selectables as column>
+     <#if !column.isFormula()>
+        <#include "column.hbm.ftl">
+     </#if>
+  </#list>	
+  <#if property.value.typeParameters?exists>
+  <type name="${property.value.typeName}">
+  		<#list property.value.typeParameters.entrySet() as entry>
+              		<param name="${entry.key}">${entry.value}</param>
+        </#list>  	  
+  </type>
+  </#if>
+  </property>
+
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/query.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/query.hbm.ftl
new file mode 100644
index 000000000000..86e97dea81bf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/query.hbm.ftl
@@ -0,0 +1,36 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#list md.namedQueryDefinitions as queryDef>
+    <query 
+        name="${queryDef.name}"
+<#if queryDef.flushMode?exists>
+        flush-mode="${queryDef.flushMode.toString().toLowerCase()}"
+</#if>
+<#if queryDef.isCacheable()>
+	    cacheable="${queryDef.isCacheable()?string}"
+</#if>
+<#if queryDef.cacheRegion?exists>
+	    cache-region="${queryDef.cacheRegion}"
+</#if>
+<#if queryDef.fetchSize?exists>
+        fetch-size="${queryDef.fetchSize}"
+</#if>
+<#if queryDef.timeout?exists>
+        timeout="${queryDef.timeout?c}"
+</#if>    >
+        <![CDATA[${queryDef.queryString.trim()}]]>
+    </query> 
+</#list>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/set.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/set.hbm.ftl
new file mode 100644
index 000000000000..e15106d60af4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/set.hbm.ftl
@@ -0,0 +1,37 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#assign value = property.value>
+<#assign keyValue = value.getKey()>
+<#assign elementValue = value.getElement()>
+<#assign elementTag = c2h.getCollectionElementTag(property)>
+
+	<set name="${property.name}"
+	<#include "collection-tableattr.hbm.ftl"> 
+	inverse="${value.inverse?string}"
+	lazy="${c2h.getCollectionLazy(value)}"	 		
+	<#if property.cascade != "none">
+        cascade="${property.cascade}"
+	</#if>
+	<#if !property.basicPropertyAccessor>
+        access="${property.propertyAccessorName}"
+	</#if>
+	<#if c2h.hasFetchMode(property)> fetch="${c2h.getFetchMode(property)}"</#if>
+	>
+		<#assign metaattributable=property>
+		<#include "meta.hbm.ftl">
+		<#include "key.hbm.ftl">
+		<#include "${elementTag}-element.hbm.ftl">
+	</set>
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/sql-query.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/sql-query.hbm.ftl
new file mode 100644
index 000000000000..eb2e3b87fc33
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/sql-query.hbm.ftl
@@ -0,0 +1,60 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#list md.namedNativeQueryDefinitions as queryDef>
+    <sql-query 
+        name="${queryDef.name}"
+<#if queryDef.flushMode?exists>
+        flush-mode="${queryDef.flushMode.toString().toLowerCase()}"
+</#if>
+<#if queryDef.isCacheable()>
+	    cacheable="${queryDef.isCacheable()?string}"
+</#if>
+<#if queryDef.cacheRegion?exists>
+	    cache-region="${queryDef.cacheRegion}"
+</#if>
+<#if queryDef.fetchSize?exists>
+        fetch-size="${queryDef.fetchSize}"
+</#if>
+<#if queryDef.timeout?exists>
+        timeout="${queryDef.timeout?c}"
+</#if>    
+>
+<#if queryDef.querySpaces?exists>
+<#list queryDef.querySpaces as tableName>
+	    <synchronize table="${tableName}" />
+</#list>
+</#if>
+<#if queryDef.queryReturns?exists>
+<#list queryDef.queryReturns as returnDef>
+<#assign returnTag = c2h.getNamedSQLReturnTag(returnDef)>
+	    <${returnTag}
+             alias="${returnDef.alias}"
+<#if c2h.isNamedSQLReturnRoot(returnDef)>
+             class="${returnDef.returnEntityName}"
+<#elseif c2h.isNamedSQLReturnRole(returnDef)>
+             property="${returnDef.ownerAlias}.${returnDef.ownerProperty}"
+<#elseif c2h.isNamedSQLReturnCollection(returnDef)>
+             role="${returnDef.ownerEntityName}.${returnDef.ownerProperty}"
+</#if>
+<#if returnDef.lockMode?exists>
+             lock-mode="${returnDef.lockMode.toString().toLowerCase()}"
+</#if>	    />
+</#list>     
+</#if>   
+      <![CDATA[${queryDef.queryString.trim()}]]>
+    </sql-query>
+    
+</#list>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/timestamp.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/timestamp.hbm.ftl
new file mode 100644
index 000000000000..dd28000a6b92
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/timestamp.hbm.ftl
@@ -0,0 +1,22 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+    <timestamp
+        name="${property.name}"
+<#if !property.basicPropertyAccessor>        access="${property.propertyAccessorName}"
+</#if><#list property.columns as column> <#-- always only one column, but no direct access method.-->
+        column="${column.quotedName}" 
+</#list>    />
+
diff --git a/tooling/hibernate-reveng/src/main/resources/hbm/version.hbm.ftl b/tooling/hibernate-reveng/src/main/resources/hbm/version.hbm.ftl
new file mode 100644
index 000000000000..0773fe3bd2ad
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/hbm/version.hbm.ftl
@@ -0,0 +1,25 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+    <version
+        name="${property.name}"
+        type="${property.value.typeName}"
+<#if !property.basicPropertyAccessor>        access="${property.propertyAccessorName}"
+</#if>    >
+<#list property.columns as column>
+       <#include "column.hbm.ftl">
+</#list>
+	</version>
+
diff --git a/tooling/hibernate-reveng/src/main/resources/lint/text-report.ftl b/tooling/hibernate-reveng/src/main/resources/lint/text-report.ftl
new file mode 100644
index 000000000000..c634b371a3fc
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/lint/text-report.ftl
@@ -0,0 +1,18 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#list lintissues as issue>
+${issue}
+</#list>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/Ejb3PropertyGetAnnotation.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/Ejb3PropertyGetAnnotation.ftl
new file mode 100644
index 000000000000..125012a00adb
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/Ejb3PropertyGetAnnotation.ftl
@@ -0,0 +1,37 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#if ejb3>
+<#if pojo.hasIdentifierProperty()>
+<#if property.equals(clazz.identifierProperty)>
+ ${pojo.generateAnnIdGenerator()}
+<#-- if this is the id property (getter)-->
+<#-- explicitly set the column name for this property-->
+</#if>
+</#if>
+
+<#if c2h.isOneToOne(property)>
+${pojo.generateOneToOneAnnotation(property, md)}
+<#elseif c2h.isManyToOne(property)>
+${pojo.generateManyToOneAnnotation(property)}
+<#--TODO support optional and targetEntity-->    
+${pojo.generateJoinColumnsAnnotation(property, md)}
+<#elseif c2h.isCollection(property)>
+${pojo.generateCollectionAnnotation(property, md)}
+<#else>
+${pojo.generateBasicAnnotation(property)}
+${pojo.generateAnnColumnAnnotation(property)}
+</#if>
+</#if>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/Ejb3TypeDeclaration.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/Ejb3TypeDeclaration.ftl
new file mode 100644
index 000000000000..396928ccb89b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/Ejb3TypeDeclaration.ftl
@@ -0,0 +1,32 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#if ejb3?if_exists>
+<#if pojo.isComponent()>
+@${pojo.importType("jakarta.persistence.Embeddable")}
+<#else>
+@${pojo.importType("jakarta.persistence.Entity")}
+@${pojo.importType("jakarta.persistence.Table")}(name="${clazz.table.name}"
+<#if clazz.table.schema?exists>
+    ,schema="${clazz.table.schema}"
+</#if><#if clazz.table.catalog?exists>
+    ,catalog="${clazz.table.catalog}"
+</#if>
+<#assign uniqueConstraint=pojo.generateAnnTableUniqueConstraint()>
+<#if uniqueConstraint?has_content>
+    , uniqueConstraints = ${uniqueConstraint} 
+</#if>)
+</#if>
+</#if>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/GetPropertyAnnotation.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/GetPropertyAnnotation.ftl
new file mode 100644
index 000000000000..63e0d91871f6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/GetPropertyAnnotation.ftl
@@ -0,0 +1,16 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#include "Ejb3PropertyGetAnnotation.ftl"/>
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/Pojo.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/Pojo.ftl
new file mode 100644
index 000000000000..fee889657929
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/Pojo.ftl
@@ -0,0 +1,44 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+${pojo.getPackageDeclaration()}
+// Generated ${date} by Hibernate Tools ${version}
+
+<#assign classbody>
+<#include "PojoTypeDeclaration.ftl"/> {
+
+<#if !pojo.isInterface()>
+<#include "PojoFields.ftl"/>
+
+<#include "PojoConstructors.ftl"/>
+   
+<#include "PojoPropertyAccessors.ftl"/>
+
+<#include "PojoToString.ftl"/>
+
+<#include "PojoEqualsHashcode.ftl"/>
+
+<#else>
+<#include "PojoInterfacePropertyAccessors.ftl"/>
+
+</#if>
+<#include "PojoExtraClassCode.ftl"/>
+
+}
+</#assign>
+
+${pojo.generateImports()}
+${classbody}
+
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/PojoConstructors.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/PojoConstructors.ftl
new file mode 100644
index 000000000000..5ce90a4e19cc
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/PojoConstructors.ftl
@@ -0,0 +1,41 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<#--  /** default constructor */ -->
+    public ${pojo.getDeclarationName()}() {
+    }
+
+<#if pojo.needsMinimalConstructor()>	<#-- /** minimal constructor */ -->
+    public ${pojo.getDeclarationName()}(${c2j.asParameterList(pojo.getPropertyClosureForMinimalConstructor(), jdk5, pojo)}) {
+<#if pojo.isSubclass() && !pojo.getPropertyClosureForSuperclassMinimalConstructor().isEmpty()>
+        super(${c2j.asArgumentList(pojo.getPropertyClosureForSuperclassMinimalConstructor())});        
+</#if>
+<#list pojo.getPropertiesForMinimalConstructor() as field>
+        this.${c2j.keyWordCheck(field.name)} = ${c2j.keyWordCheck(field.name)};
+</#list>
+    }
+</#if>    
+<#if pojo.needsFullConstructor()>
+<#-- /** full constructor */ -->
+    public ${pojo.getDeclarationName()}(${c2j.asParameterList(pojo.getPropertyClosureForFullConstructor(), jdk5, pojo)}) {
+<#if pojo.isSubclass() && !pojo.getPropertyClosureForSuperclassFullConstructor().isEmpty()>
+        super(${c2j.asArgumentList(pojo.getPropertyClosureForSuperclassFullConstructor())});        
+</#if>
+<#list pojo.getPropertiesForFullConstructor() as field>
+       this.${c2j.keyWordCheck(field.name)} = ${c2j.keyWordCheck(field.name)};
+</#list>
+    }
+</#if>    
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/PojoEqualsHashcode.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/PojoEqualsHashcode.ftl
new file mode 100644
index 000000000000..222343b0c6a9
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/PojoEqualsHashcode.ftl
@@ -0,0 +1,33 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#if pojo.needsEqualsHashCode() && !clazz.superclass?exists>
+<#assign classNameToCastTo><#if clazz.getProxyInterfaceName?exists>${clazz.getProxyInterfaceName()}<#else>${pojo.getDeclarationName()}</#if></#assign>
+   public boolean equals(Object other) {
+         if ( (this == other ) ) return true;
+		 if ( (other == null ) ) return false;
+		 if ( !(other instanceof ${classNameToCastTo}) ) return false;
+		 ${classNameToCastTo} castOther = ( ${classNameToCastTo} ) other; 
+         
+		 return ${pojo.generateEquals("this", "castOther", jdk5)};
+   }
+   
+   public int hashCode() {
+         int result = 17;
+         
+<#list pojo.getAllPropertiesIterator() as property>        ${pojo.generateHashCode(property, "result", "this", jdk5)}
+</#list>         return result;
+   }   
+</#if>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/PojoExtraClassCode.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/PojoExtraClassCode.ftl
new file mode 100644
index 000000000000..aa6169aa320d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/PojoExtraClassCode.ftl
@@ -0,0 +1,19 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#if pojo.hasMetaAttribute("class-code")>  // The following is extra code specified in the hbm.xml files
+${pojo.getExtraClassCode()}
+  // end of extra code specified in the hbm.xml files
+</#if>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/PojoFields.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/PojoFields.ftl
new file mode 100644
index 000000000000..c5b82d0ca6cd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/PojoFields.ftl
@@ -0,0 +1,23 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#-- // Fields -->
+
+<#list pojo.getAllPropertiesIterator() as field><#if pojo.getMetaAttribAsBool(field, "gen-property", true)><#if pojo.hasMetaAttribute(field, "field-description")>    /**
+${pojo.getFieldJavaDoc(field, 0)}
+     */
+</#if>    ${pojo.getFieldModifiers(field)} ${pojo.getJavaTypeName(field, jdk5)} ${c2j.keyWordCheck(field.name)}<#if pojo.hasFieldInitializor(field, jdk5)> = ${pojo.getFieldInitialization(field, jdk5)}</#if>;
+</#if>
+</#list>
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/PojoInterfacePropertyAccessors.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/PojoInterfacePropertyAccessors.ftl
new file mode 100644
index 000000000000..1fc7ffe5cf3f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/PojoInterfacePropertyAccessors.ftl
@@ -0,0 +1,23 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#-- if interface -->
+<#-- Property accessors for interface -->
+<#list pojo.getAllPropertiesIterator() as property><#if pojo.getMetaAttribAsBool(property, "gen-property", true)>   /**
+   ${c2j.toJavaDoc(c2j.getMetaAsString(property, "field-description"), 4)} */
+   ${pojo.getPropertyGetModifiers(property)} ${pojo.getJavaTypeName(property, jdk5)} ${pojo.getGetterSignature(property)}();
+    
+   ${pojo.getPropertySetModifiers(property)} void set${pojo.getPropertyName(property)}(${pojo.getJavaTypeName(property, jdk5)} ${property.name});
+</#if></#list>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/PojoPropertyAccessors.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/PojoPropertyAccessors.ftl
new file mode 100644
index 000000000000..2f4faa07bbd6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/PojoPropertyAccessors.ftl
@@ -0,0 +1,33 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#-- // Property accessors -->
+<#list pojo.getAllPropertiesIterator() as property>
+<#if pojo.getMetaAttribAsBool(property, "gen-property", true)>
+ <#if pojo.hasFieldJavaDoc(property)>
+    /**
+${pojo.getFieldJavaDoc(property, 4)}
+     */
+</#if>
+    <#include "GetPropertyAnnotation.ftl"/>
+    ${pojo.getPropertyGetModifiers(property)} ${pojo.getJavaTypeName(property, jdk5)} ${pojo.getGetterSignature(property)}() {
+        return this.${c2j.keyWordCheck(property.name)};
+    }
+    
+    ${pojo.getPropertySetModifiers(property)} void set${pojo.getPropertyName(property)}(${pojo.getJavaTypeName(property, jdk5)} ${c2j.keyWordCheck(property.name)}) {
+        this.${c2j.keyWordCheck(property.name)} = ${c2j.keyWordCheck(property.name)};
+    }
+</#if>
+</#list>
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/PojoToString.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/PojoToString.ftl
new file mode 100644
index 000000000000..1822bd8362bc
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/PojoToString.ftl
@@ -0,0 +1,29 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<#if pojo.needsToString()>    /**
+     * toString
+     * @return String
+     */
+     public String toString() {
+	  StringBuffer buffer = new StringBuffer();
+
+      buffer.append(getClass().getName()).append("@").append(Integer.toHexString(hashCode())).append(" [");
+<#list pojo.getToStringPropertiesIterator() as property>      buffer.append("${property.getName()}").append("='").append(${pojo.getGetterSignature(property)}()).append("' ");			
+</#list>      buffer.append("]");
+      
+      return buffer.toString();
+     }
+</#if>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/PojoTypeDeclaration.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/PojoTypeDeclaration.ftl
new file mode 100644
index 000000000000..d49f824ea66c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/PojoTypeDeclaration.ftl
@@ -0,0 +1,20 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+/**
+${pojo.getClassJavaDoc(pojo.getDeclarationName() + " generated by hbm2java", 0)}
+ */
+<#include "Ejb3TypeDeclaration.ftl"/>
+${pojo.getClassModifiers()} ${pojo.getDeclarationType()} ${pojo.getDeclarationName()} ${pojo.getExtendsDeclaration()} ${pojo.getImplementsDeclaration()}
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/main/resources/pojo/test.ftl b/tooling/hibernate-reveng/src/main/resources/pojo/test.ftl
new file mode 100644
index 000000000000..68bcfad8756c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/main/resources/pojo/test.ftl
@@ -0,0 +1,20 @@
+<#--
+~ Copyright 2010 - 2025 Red Hat, Inc.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" basis,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+/**
+${pojo.getClassJavaDoc(render.eval(ctx, pojo.getDeclarationName() + " generated by hbm2java"), 0)}
+ */
+${templates.Ejb3TypeDeclaration}
+${pojo.getClassModifiers()} ${pojo.getDeclarationType()} ${pojo.getDeclarationName()} ${pojo.getExtendsDeclaration()} ${pojo.getImplementsDeclaration()}
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportActionTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportActionTest.java
new file mode 100644
index 000000000000..dbcc82bd4c65
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportActionTest.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SchemaExportActionTest {
+
+	@Test
+	public void testActionCreate() {
+		SchemaExport.Action action = SchemaExport.Action.CREATE;
+		assertTrue(action.doCreate());
+		assertFalse(action.doDrop());
+	}
+
+	@Test
+	public void testActionDrop() {
+		SchemaExport.Action action = SchemaExport.Action.DROP;
+		assertFalse(action.doCreate());
+		assertTrue(action.doDrop());
+	}
+
+	@Test
+	public void testActionBoth() {
+		SchemaExport.Action action = SchemaExport.Action.BOTH;
+		assertTrue(action.doCreate());
+		assertTrue(action.doDrop());
+	}
+
+	@Test
+	public void testActionNone() {
+		SchemaExport.Action action = SchemaExport.Action.NONE;
+		assertFalse(action.doCreate());
+		assertFalse(action.doDrop());
+	}
+
+	@Test
+	public void testParseCommandLineOption() {
+		assertEquals(SchemaExport.Action.CREATE, SchemaExport.Action.parseCommandLineOption("create"));
+		assertEquals(SchemaExport.Action.DROP, SchemaExport.Action.parseCommandLineOption("drop"));
+		assertEquals(SchemaExport.Action.BOTH, SchemaExport.Action.parseCommandLineOption("drop-and-create"));
+		assertEquals(SchemaExport.Action.NONE, SchemaExport.Action.parseCommandLineOption("unknown"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportCommandLineTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportCommandLineTest.java
new file mode 100644
index 000000000000..af9d8d102edb
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportCommandLineTest.java
@@ -0,0 +1,180 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Method;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests the CommandLineArgs parsing in SchemaExport to cover
+ * various flags and branch combinations.
+ */
+public class SchemaExportCommandLineTest {
+
+	private Object parseArgs(String[] args) throws Exception {
+		Class<?> cmdLineArgsClass = Class.forName(SchemaExport.class.getName() + "$CommandLineArgs");
+		Method parseMethod = cmdLineArgsClass.getDeclaredMethod("parseCommandLineArgs", String[].class);
+		parseMethod.setAccessible(true);
+		return parseMethod.invoke(null, (Object) args);
+	}
+
+	private Object getField(Object obj, String fieldName) throws Exception {
+		java.lang.reflect.Field field = obj.getClass().getDeclaredField(fieldName);
+		field.setAccessible(true);
+		return field.get(obj);
+	}
+
+	@Test
+	public void testParseImportFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--import=import.sql", "test.hbm.xml"});
+		assertEquals("import.sql", getField(args, "importFile"));
+	}
+
+	@Test
+	public void testParseConfigFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--config=hibernate.cfg.xml", "test.hbm.xml"});
+		assertEquals("hibernate.cfg.xml", getField(args, "cfgXmlFile"));
+	}
+
+	@Test
+	public void testParseImplicitNamingFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--implicit-naming=com.example.MyStrategy", "test.hbm.xml"});
+		assertEquals("com.example.MyStrategy", getField(args, "implicitNamingStrategyImplName"));
+	}
+
+	@Test
+	public void testParsePhysicalNamingFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--physical-naming=com.example.MyPhysical", "test.hbm.xml"});
+		assertEquals("com.example.MyPhysical", getField(args, "physicalNamingStrategyImplName"));
+	}
+
+	@Test
+	public void testParseNamingDeprecatedFlag() throws Exception {
+		// --naming= should trigger deprecation warning but not fail
+		Object args = parseArgs(new String[]{"--naming=com.example.Old", "test.hbm.xml"});
+		assertNotNull(args);
+	}
+
+	@Test
+	public void testParseCreateFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--create", "test.hbm.xml"});
+		// --create without --action= uses Action.interpret(drop=false, create=true) -> CREATE
+		assertEquals(SchemaExport.Action.CREATE, getField(args, "action"));
+	}
+
+	@Test
+	public void testParseQuietFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--quiet", "test.hbm.xml"});
+		// --quiet disables script output
+		assertNotNull(args);
+	}
+
+	@Test
+	public void testParseJarFile() throws Exception {
+		Object args = parseArgs(new String[]{"entities.jar"});
+		@SuppressWarnings("unchecked")
+		java.util.List<String> jarFiles = (java.util.List<String>) getField(args, "jarFiles");
+		assertEquals(1, jarFiles.size());
+		assertEquals("entities.jar", jarFiles.get(0));
+	}
+
+	@Test
+	public void testParseHbmAndJarMixed() throws Exception {
+		Object args = parseArgs(new String[]{"Person.hbm.xml", "entities.jar", "Address.hbm.xml"});
+		@SuppressWarnings("unchecked")
+		java.util.List<String> hbmFiles = (java.util.List<String>) getField(args, "hbmXmlFiles");
+		@SuppressWarnings("unchecked")
+		java.util.List<String> jarFiles = (java.util.List<String>) getField(args, "jarFiles");
+		assertEquals(2, hbmFiles.size());
+		assertEquals(1, jarFiles.size());
+	}
+
+	@Test
+	public void testParseDropAndCreateWithActionWarning() throws Exception {
+		// Both --drop and --action= specified: triggers warning
+		Object args = parseArgs(new String[]{"--drop", "--action=create", "test.hbm.xml"});
+		// --action takes precedence
+		assertEquals(SchemaExport.Action.CREATE, getField(args, "action"));
+	}
+
+	@Test
+	public void testParseTextAndTargetWarning() throws Exception {
+		// Both --text and --target= specified: triggers warning
+		Object args = parseArgs(new String[]{"--text", "--target=database", "test.hbm.xml"});
+		assertNotNull(getField(args, "targetTypes"));
+	}
+
+	@Test
+	public void testParseDefaults() throws Exception {
+		Object args = parseArgs(new String[]{"test.hbm.xml"});
+		assertFalse((boolean) getField(args, "halt"));
+		assertFalse((boolean) getField(args, "format"));
+		assertFalse((boolean) getField(args, "manageNamespaces"));
+		assertNull(getField(args, "delimiter"));
+		assertNull(getField(args, "outputFile"));
+		assertNull(getField(args, "propertiesFile"));
+		assertNull(getField(args, "cfgXmlFile"));
+		assertNull(getField(args, "implicitNamingStrategyImplName"));
+		assertNull(getField(args, "physicalNamingStrategyImplName"));
+	}
+
+	@Test
+	public void testSchemaExportSetters() {
+		SchemaExport export = new SchemaExport();
+		export.setOutputFile("output.sql");
+		assertEquals("output.sql", export.outputFile);
+
+		export.setOverrideOutputFileContent();
+		assertFalse(export.append);
+
+		export.setImportFiles("import1.sql,import2.sql");
+
+		export.setDelimiter(";");
+		assertEquals(";", export.delimiter);
+
+		export.setFormat(true);
+		assertTrue(export.format);
+
+		export.setHaltOnError(true);
+		assertTrue(export.haltOnError);
+
+		export.setManageNamespaces(true);
+		assertTrue(export.manageNamespaces);
+	}
+
+	@Test
+	public void testSchemaExportTypeEnum() {
+		assertTrue(SchemaExport.Type.CREATE.doCreate());
+		assertFalse(SchemaExport.Type.CREATE.doDrop());
+
+		assertFalse(SchemaExport.Type.DROP.doCreate());
+		assertTrue(SchemaExport.Type.DROP.doDrop());
+
+		assertTrue(SchemaExport.Type.BOTH.doCreate());
+		assertTrue(SchemaExport.Type.BOTH.doDrop());
+
+		assertFalse(SchemaExport.Type.NONE.doCreate());
+		assertFalse(SchemaExport.Type.NONE.doDrop());
+	}
+
+	@Test
+	public void testActionInterpret() throws Exception {
+		// Access private interpret method via reflection
+		Method interpret = SchemaExport.Action.class.getDeclaredMethod("interpret", boolean.class, boolean.class);
+		interpret.setAccessible(true);
+
+		assertEquals(SchemaExport.Action.DROP, interpret.invoke(null, true, false));
+		assertEquals(SchemaExport.Action.CREATE, interpret.invoke(null, false, true));
+		assertEquals(SchemaExport.Action.BOTH, interpret.invoke(null, false, false));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportExecutionTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportExecutionTest.java
new file mode 100644
index 000000000000..78d1dbe5cd40
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportExecutionTest.java
@@ -0,0 +1,251 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.tool.schema.TargetType;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import org.hibernate.boot.spi.MetadataImplementor;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.EnumSet;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SchemaExportExecutionTest {
+
+	private StandardServiceRegistry serviceRegistry;
+	private Metadata metadata;
+
+	@BeforeEach
+	public void setUp() {
+		serviceRegistry = new StandardServiceRegistryBuilder()
+				.applySetting("hibernate.dialect", "org.hibernate.dialect.H2Dialect")
+				.applySetting("hibernate.connection.driver_class", "org.h2.Driver")
+				.applySetting("hibernate.connection.url", "jdbc:h2:mem:schema_export_test;DB_CLOSE_DELAY=-1")
+				.applySetting("hibernate.connection.username", "sa")
+				.applySetting("hibernate.connection.password", "")
+				.applySetting("hibernate.default_schema", "")
+				.applySetting("hibernate.default_catalog", "")
+				.build();
+		metadata = new MetadataSources(serviceRegistry)
+				.addResource("org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")
+				.buildMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		if (serviceRegistry != null) {
+			new SchemaExport().drop(EnumSet.of(TargetType.DATABASE), metadata);
+			StandardServiceRegistryBuilder.destroy(serviceRegistry);
+		}
+	}
+
+	@Test
+	public void testCreateAndDropToDatabase() {
+		SchemaExport export = new SchemaExport();
+		export.createOnly(EnumSet.of(TargetType.DATABASE), metadata);
+		assertTrue(export.getExceptions().isEmpty());
+
+		export.drop(EnumSet.of(TargetType.DATABASE), metadata);
+		assertTrue(export.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testCreateBothToDatabase() {
+		SchemaExport export = new SchemaExport();
+		export.create(EnumSet.of(TargetType.DATABASE), metadata);
+		assertTrue(export.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testExecuteWithActionNone() {
+		SchemaExport export = new SchemaExport();
+		export.execute(EnumSet.of(TargetType.DATABASE), SchemaExport.Action.NONE, metadata);
+		assertTrue(export.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testExecuteWithEmptyTargets() {
+		SchemaExport export = new SchemaExport();
+		export.execute(EnumSet.noneOf(TargetType.class), SchemaExport.Action.CREATE, metadata);
+		assertTrue(export.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testExportToScript(@TempDir File tempDir) throws Exception {
+		File scriptFile = new File(tempDir, "export.sql");
+		SchemaExport export = new SchemaExport();
+		export.setOutputFile(scriptFile.getAbsolutePath());
+		export.setDelimiter(";");
+		export.setFormat(true);
+		export.execute(EnumSet.of(TargetType.SCRIPT), SchemaExport.Action.BOTH, metadata);
+
+		assertTrue(export.getExceptions().isEmpty());
+		assertTrue(scriptFile.exists());
+		String content = Files.readString(scriptFile.toPath());
+		assertFalse(content.isEmpty());
+	}
+
+	@Test
+	public void testExportToScriptAndDatabase(@TempDir File tempDir) throws Exception {
+		File scriptFile = new File(tempDir, "export.sql");
+		SchemaExport export = new SchemaExport();
+		export.setOutputFile(scriptFile.getAbsolutePath());
+		export.setOverrideOutputFileContent();
+		export.execute(EnumSet.of(TargetType.DATABASE, TargetType.SCRIPT), SchemaExport.Action.BOTH, metadata);
+
+		assertTrue(export.getExceptions().isEmpty());
+		assertTrue(scriptFile.exists());
+	}
+
+	@Test
+	public void testExportToStdout() {
+		SchemaExport export = new SchemaExport();
+		export.execute(EnumSet.of(TargetType.STDOUT), SchemaExport.Action.BOTH, metadata);
+		assertTrue(export.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testGetExceptions() {
+		SchemaExport export = new SchemaExport();
+		assertNotNull(export.getExceptions());
+		assertTrue(export.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testSetManageNamespaces() {
+		SchemaExport export = new SchemaExport();
+		export.setManageNamespaces(true);
+		export.execute(EnumSet.of(TargetType.DATABASE), SchemaExport.Action.BOTH, metadata);
+		assertTrue(export.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testSetHaltOnError() {
+		SchemaExport export = new SchemaExport();
+		export.setHaltOnError(true);
+		export.createOnly(EnumSet.of(TargetType.DATABASE), metadata);
+		assertTrue(export.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testDropAndRecreate() {
+		SchemaExport export = new SchemaExport();
+		// First create
+		export.createOnly(EnumSet.of(TargetType.DATABASE), metadata);
+		assertTrue(export.getExceptions().isEmpty());
+		// Drop and recreate
+		export.create(EnumSet.of(TargetType.DATABASE), metadata);
+		assertTrue(export.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testSetImportFiles() {
+		SchemaExport export = new SchemaExport();
+		export.setImportFiles("nonexistent.sql");
+		export.createOnly(EnumSet.of(TargetType.DATABASE), metadata);
+		// Import file not found is not a hard error
+		assertNotNull(export.getExceptions());
+	}
+
+	@Test
+	public void testBuildMetadataFromMainArgs(@TempDir File tempDir) throws Exception {
+		// Create a properties file for H2
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Files.writeString(propsFile.toPath(),
+				"hibernate.dialect=org.hibernate.dialect.H2Dialect\n" +
+				"hibernate.connection.driver_class=org.h2.Driver\n" +
+				"hibernate.connection.url=jdbc:h2:mem:main_args_test\n" +
+				"hibernate.connection.username=sa\n" +
+				"hibernate.connection.password=\n" +
+				"hibernate.default_schema=\n" +
+				"hibernate.default_catalog=\n");
+
+		// Copy the HBM file to the temp dir
+		File hbmFile = new File(tempDir, "HelloWorld.hbm.xml");
+		try (var in = getClass().getResourceAsStream("/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")) {
+			Files.copy(in, hbmFile.toPath());
+		}
+
+		MetadataImplementor md = SchemaExport.buildMetadataFromMainArgs(new String[]{
+				"--properties=" + propsFile.getAbsolutePath(),
+				hbmFile.getAbsolutePath()
+		});
+		assertNotNull(md);
+	}
+
+	@Test
+	public void testMainWithCommandLineArgs(@TempDir File tempDir) throws Exception {
+		// Create a properties file for H2
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Files.writeString(propsFile.toPath(),
+				"hibernate.dialect=org.hibernate.dialect.H2Dialect\n" +
+				"hibernate.connection.driver_class=org.h2.Driver\n" +
+				"hibernate.connection.url=jdbc:h2:mem:main_test\n" +
+				"hibernate.connection.username=sa\n" +
+				"hibernate.connection.password=\n" +
+				"hibernate.default_schema=\n" +
+				"hibernate.default_catalog=\n");
+
+		File hbmFile = new File(tempDir, "HelloWorld.hbm.xml");
+		try (var in = getClass().getResourceAsStream("/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")) {
+			Files.copy(in, hbmFile.toPath());
+		}
+
+		File outputFile = new File(tempDir, "output.sql");
+		// This exercises CommandLineArgs.parseCommandLineArgs with various flags
+		// This exercises CommandLineArgs.parseCommandLineArgs and execute() with various flags
+		SchemaExport.main(new String[]{
+				"--properties=" + propsFile.getAbsolutePath(),
+				"--output=" + outputFile.getAbsolutePath(),
+				"--format",
+				"--delimiter=;",
+				"--action=drop-and-create",
+				"--target=script",
+				hbmFile.getAbsolutePath()
+		});
+	}
+
+	@Test
+	public void testMainWithLegacyFlags(@TempDir File tempDir) throws Exception {
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Files.writeString(propsFile.toPath(),
+				"hibernate.dialect=org.hibernate.dialect.H2Dialect\n" +
+				"hibernate.connection.driver_class=org.h2.Driver\n" +
+				"hibernate.connection.url=jdbc:h2:mem:main_legacy_test\n" +
+				"hibernate.connection.username=sa\n" +
+				"hibernate.connection.password=\n" +
+				"hibernate.default_schema=\n" +
+				"hibernate.default_catalog=\n");
+
+		File hbmFile = new File(tempDir, "HelloWorld.hbm.xml");
+		try (var in = getClass().getResourceAsStream("/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")) {
+			Files.copy(in, hbmFile.toPath());
+		}
+
+		File outputFile = new File(tempDir, "output.sql");
+		// Test legacy flags: --text (no export), --drop, --create, --quiet
+		SchemaExport.main(new String[]{
+				"--properties=" + propsFile.getAbsolutePath(),
+				"--output=" + outputFile.getAbsolutePath(),
+				"--text",
+				"--drop",
+				"--haltonerror",
+				"--schemas",
+				hbmFile.getAbsolutePath()
+		});
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTypeTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTypeTest.java
new file mode 100644
index 000000000000..1657c1d4a3a4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaExportTypeTest.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SchemaExportTypeTest {
+
+	@Test
+	public void testTypeCreate() {
+		SchemaExport.Type type = SchemaExport.Type.CREATE;
+		assertTrue(type.doCreate());
+		assertFalse(type.doDrop());
+	}
+
+	@Test
+	public void testTypeDrop() {
+		SchemaExport.Type type = SchemaExport.Type.DROP;
+		assertFalse(type.doCreate());
+		assertTrue(type.doDrop());
+	}
+
+	@Test
+	public void testTypeBoth() {
+		SchemaExport.Type type = SchemaExport.Type.BOTH;
+		assertTrue(type.doCreate());
+		assertTrue(type.doDrop());
+	}
+
+	@Test
+	public void testTypeNone() {
+		SchemaExport.Type type = SchemaExport.Type.NONE;
+		assertFalse(type.doCreate());
+		assertFalse(type.doDrop());
+	}
+
+	@Test
+	public void testSchemaExportSetters() {
+		SchemaExport export = new SchemaExport();
+		SchemaExport result = export.setOutputFile("output.sql");
+		assertNotNull(result);
+
+		result = export.setDelimiter(";");
+		assertNotNull(result);
+
+		result = export.setFormat(true);
+		assertNotNull(result);
+
+		result = export.setImportFiles("import.sql");
+		assertNotNull(result);
+
+		result = export.setOverrideOutputFileContent();
+		assertNotNull(result);
+
+		result = export.setHaltOnError(true);
+		assertNotNull(result);
+
+		result = export.setManageNamespaces(true);
+		assertNotNull(result);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateCommandLineTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateCommandLineTest.java
new file mode 100644
index 000000000000..c19d242c4dda
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateCommandLineTest.java
@@ -0,0 +1,129 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Method;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * Tests the SchemaUpdate.CommandLineArgs parsing to cover
+ * various flags and branch combinations.
+ */
+public class SchemaUpdateCommandLineTest {
+
+	private Object parseArgs(String[] args) throws Exception {
+		Class<?> cmdLineArgsClass = Class.forName(SchemaUpdate.class.getName() + "$CommandLineArgs");
+		Method parseMethod = cmdLineArgsClass.getDeclaredMethod("parseCommandLineArgs", String[].class);
+		parseMethod.setAccessible(true);
+		return parseMethod.invoke(null, (Object) args);
+	}
+
+	private Object getField(Object obj, String fieldName) throws Exception {
+		java.lang.reflect.Field field = obj.getClass().getDeclaredField(fieldName);
+		field.setAccessible(true);
+		return field.get(obj);
+	}
+
+	@Test
+	public void testParseDefaults() throws Exception {
+		Object args = parseArgs(new String[]{"test.hbm.xml"});
+		assertNull(getField(args, "propertiesFile"));
+		assertNull(getField(args, "cfgXmlFile"));
+		assertNull(getField(args, "outputFile"));
+		assertNull(getField(args, "delimiter"));
+		assertNull(getField(args, "implicitNamingStrategyImplName"));
+		assertNull(getField(args, "physicalNamingStrategyImplName"));
+	}
+
+	@Test
+	public void testParsePropertiesFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--properties=hibernate.properties", "test.hbm.xml"});
+		assertEquals("hibernate.properties", getField(args, "propertiesFile"));
+	}
+
+	@Test
+	public void testParseConfigFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--config=hibernate.cfg.xml", "test.hbm.xml"});
+		assertEquals("hibernate.cfg.xml", getField(args, "cfgXmlFile"));
+	}
+
+	@Test
+	public void testParseOutputFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--output=update.sql", "test.hbm.xml"});
+		assertEquals("update.sql", getField(args, "outputFile"));
+	}
+
+	@Test
+	public void testParseDelimiterFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--delimiter=;", "test.hbm.xml"});
+		assertEquals(";", getField(args, "delimiter"));
+	}
+
+	@Test
+	public void testParseImplicitNamingFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--implicit-naming=com.example.My", "test.hbm.xml"});
+		assertEquals("com.example.My", getField(args, "implicitNamingStrategyImplName"));
+	}
+
+	@Test
+	public void testParsePhysicalNamingFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--physical-naming=com.example.My", "test.hbm.xml"});
+		assertEquals("com.example.My", getField(args, "physicalNamingStrategyImplName"));
+	}
+
+	@Test
+	public void testParseNamingDeprecated() throws Exception {
+		Object args = parseArgs(new String[]{"--naming=com.example.Old", "test.hbm.xml"});
+		assertNotNull(args);
+	}
+
+	@Test
+	public void testParseQuietFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--quiet", "test.hbm.xml"});
+		assertNotNull(args);
+	}
+
+	@Test
+	public void testParseTextFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--text", "test.hbm.xml"});
+		assertNotNull(args);
+	}
+
+	@Test
+	public void testParseTargetFlag() throws Exception {
+		Object args = parseArgs(new String[]{"--target=database", "test.hbm.xml"});
+		assertNotNull(getField(args, "targetTypes"));
+	}
+
+	@Test
+	public void testParseTextAndTargetWarning() throws Exception {
+		Object args = parseArgs(new String[]{"--text", "--target=database", "test.hbm.xml"});
+		assertNotNull(getField(args, "targetTypes"));
+	}
+
+	@Test
+	public void testParseJarFile() throws Exception {
+		Object args = parseArgs(new String[]{"entities.jar"});
+		@SuppressWarnings("unchecked")
+		java.util.List<String> jarFiles = (java.util.List<String>) getField(args, "jarFiles");
+		assertEquals(1, jarFiles.size());
+	}
+
+	@Test
+	public void testParseMixedFiles() throws Exception {
+		Object args = parseArgs(new String[]{"Person.hbm.xml", "entities.jar"});
+		@SuppressWarnings("unchecked")
+		java.util.List<String> hbmFiles = (java.util.List<String>) getField(args, "hbmXmlFiles");
+		@SuppressWarnings("unchecked")
+		java.util.List<String> jarFiles = (java.util.List<String>) getField(args, "jarFiles");
+		assertEquals(1, hbmFiles.size());
+		assertEquals(1, jarFiles.size());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateExecutionTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateExecutionTest.java
new file mode 100644
index 000000000000..ef66569619e6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/SchemaUpdateExecutionTest.java
@@ -0,0 +1,225 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.tool.schema.TargetType;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import org.hibernate.boot.spi.MetadataImplementor;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.EnumSet;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SchemaUpdateExecutionTest {
+
+	private StandardServiceRegistry serviceRegistry;
+	private Metadata metadata;
+
+	@BeforeEach
+	public void setUp() {
+		serviceRegistry = new StandardServiceRegistryBuilder()
+				.applySetting("hibernate.dialect", "org.hibernate.dialect.H2Dialect")
+				.applySetting("hibernate.connection.driver_class", "org.h2.Driver")
+				.applySetting("hibernate.connection.url", "jdbc:h2:mem:schema_update_test;DB_CLOSE_DELAY=-1")
+				.applySetting("hibernate.connection.username", "sa")
+				.applySetting("hibernate.connection.password", "")
+				.applySetting("hibernate.default_schema", "")
+				.applySetting("hibernate.default_catalog", "")
+				.build();
+		metadata = new MetadataSources(serviceRegistry)
+				.addResource("org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")
+				.buildMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		if (serviceRegistry != null) {
+			new SchemaExport().drop(EnumSet.of(TargetType.DATABASE), metadata);
+			StandardServiceRegistryBuilder.destroy(serviceRegistry);
+		}
+	}
+
+	@Test
+	public void testUpdateToDatabase() {
+		SchemaUpdate update = new SchemaUpdate();
+		update.execute(EnumSet.of(TargetType.DATABASE), metadata);
+		assertTrue(update.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testUpdateToDatabaseTwice() {
+		SchemaUpdate update = new SchemaUpdate();
+		// First update creates the schema
+		update.execute(EnumSet.of(TargetType.DATABASE), metadata);
+		assertTrue(update.getExceptions().isEmpty());
+		// Second update should be a no-op (schema already exists)
+		update.execute(EnumSet.of(TargetType.DATABASE), metadata);
+		assertTrue(update.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testUpdateToScript(@TempDir File tempDir) throws Exception {
+		File scriptFile = new File(tempDir, "update.sql");
+		SchemaUpdate update = new SchemaUpdate();
+		update.setOutputFile(scriptFile.getAbsolutePath());
+		update.setDelimiter(";");
+		update.setFormat(true);
+		update.execute(EnumSet.of(TargetType.SCRIPT), metadata);
+
+		assertTrue(update.getExceptions().isEmpty());
+		assertTrue(scriptFile.exists());
+	}
+
+	@Test
+	public void testUpdateToScriptAndDatabase(@TempDir File tempDir) throws Exception {
+		File scriptFile = new File(tempDir, "update.sql");
+		SchemaUpdate update = new SchemaUpdate();
+		update.setOutputFile(scriptFile.getAbsolutePath());
+		update.execute(EnumSet.of(TargetType.DATABASE, TargetType.SCRIPT), metadata);
+
+		assertTrue(update.getExceptions().isEmpty());
+		assertTrue(scriptFile.exists());
+	}
+
+	@Test
+	public void testUpdateToStdout() {
+		SchemaUpdate update = new SchemaUpdate();
+		update.execute(EnumSet.of(TargetType.STDOUT), metadata);
+		assertTrue(update.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testUpdateWithEmptyTargets() {
+		SchemaUpdate update = new SchemaUpdate();
+		update.execute(EnumSet.noneOf(TargetType.class), metadata);
+		assertTrue(update.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testGetExceptions() {
+		SchemaUpdate update = new SchemaUpdate();
+		assertNotNull(update.getExceptions());
+		assertTrue(update.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testSetHaltOnError() {
+		SchemaUpdate update = new SchemaUpdate();
+		update.setHaltOnError(true);
+		update.execute(EnumSet.of(TargetType.DATABASE), metadata);
+		assertTrue(update.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testSetOverrideOutputFileContent(@TempDir File tempDir) throws Exception {
+		File scriptFile = new File(tempDir, "update.sql");
+		SchemaUpdate update = new SchemaUpdate();
+		update.setOutputFile(scriptFile.getAbsolutePath());
+		update.setOverrideOutputFileContent();
+		update.execute(EnumSet.of(TargetType.SCRIPT), metadata);
+		assertTrue(update.getExceptions().isEmpty());
+	}
+
+	@Test
+	public void testFluentApi() {
+		SchemaUpdate update = new SchemaUpdate();
+		SchemaUpdate result = update
+				.setHaltOnError(false)
+				.setFormat(true)
+				.setDelimiter(";")
+				.setOutputFile("test.sql")
+				.setOverrideOutputFileContent();
+		assertNotNull(result);
+	}
+
+	@Test
+	public void testBuildMetadataFromMainArgs(@TempDir File tempDir) throws Exception {
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Files.writeString(propsFile.toPath(),
+				"hibernate.dialect=org.hibernate.dialect.H2Dialect\n" +
+				"hibernate.connection.driver_class=org.h2.Driver\n" +
+				"hibernate.connection.url=jdbc:h2:mem:update_main_args_test\n" +
+				"hibernate.connection.username=sa\n" +
+				"hibernate.connection.password=\n" +
+				"hibernate.default_schema=\n" +
+				"hibernate.default_catalog=\n");
+
+		File hbmFile = new File(tempDir, "HelloWorld.hbm.xml");
+		try (var in = getClass().getResourceAsStream("/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")) {
+			Files.copy(in, hbmFile.toPath());
+		}
+
+		MetadataImplementor md = SchemaUpdate.buildMetadataFromMainArgs(new String[]{
+				"--properties=" + propsFile.getAbsolutePath(),
+				hbmFile.getAbsolutePath()
+		});
+		assertNotNull(md);
+	}
+
+	@Test
+	public void testMainWithCommandLineArgs(@TempDir File tempDir) throws Exception {
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Files.writeString(propsFile.toPath(),
+				"hibernate.dialect=org.hibernate.dialect.H2Dialect\n" +
+				"hibernate.connection.driver_class=org.h2.Driver\n" +
+				"hibernate.connection.url=jdbc:h2:mem:update_main_test\n" +
+				"hibernate.connection.username=sa\n" +
+				"hibernate.connection.password=\n" +
+				"hibernate.default_schema=\n" +
+				"hibernate.default_catalog=\n");
+
+		File hbmFile = new File(tempDir, "HelloWorld.hbm.xml");
+		try (var in = getClass().getResourceAsStream("/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")) {
+			Files.copy(in, hbmFile.toPath());
+		}
+
+		File outputFile = new File(tempDir, "output.sql");
+		SchemaUpdate.main(new String[]{
+				"--properties=" + propsFile.getAbsolutePath(),
+				"--output=" + outputFile.getAbsolutePath(),
+				"--delimiter=;",
+				"--target=script",
+				hbmFile.getAbsolutePath()
+		});
+		assertTrue(outputFile.exists());
+	}
+
+	@Test
+	public void testMainWithLegacyFlags(@TempDir File tempDir) throws Exception {
+		File propsFile = new File(tempDir, "hibernate.properties");
+		Files.writeString(propsFile.toPath(),
+				"hibernate.dialect=org.hibernate.dialect.H2Dialect\n" +
+				"hibernate.connection.driver_class=org.h2.Driver\n" +
+				"hibernate.connection.url=jdbc:h2:mem:update_legacy_test\n" +
+				"hibernate.connection.username=sa\n" +
+				"hibernate.connection.password=\n" +
+				"hibernate.default_schema=\n" +
+				"hibernate.default_catalog=\n");
+
+		File hbmFile = new File(tempDir, "HelloWorld.hbm.xml");
+		try (var in = getClass().getResourceAsStream("/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")) {
+			Files.copy(in, hbmFile.toPath());
+		}
+
+		// Test legacy flags: --text, --quiet
+		SchemaUpdate.main(new String[]{
+				"--properties=" + propsFile.getAbsolutePath(),
+				"--text",
+				"--quiet",
+				hbmFile.getAbsolutePath()
+		});
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/TargetTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/TargetTest.java
new file mode 100644
index 000000000000..19e1776b2cc0
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/TargetTest.java
@@ -0,0 +1,46 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TargetTest {
+
+	@Test
+	public void testExportDoExportAndDoScript() {
+		assertTrue(Target.EXPORT.doExport());
+		assertFalse(Target.EXPORT.doScript());
+	}
+
+	@Test
+	public void testScriptDoExportAndDoScript() {
+		assertFalse(Target.SCRIPT.doExport());
+		assertTrue(Target.SCRIPT.doScript());
+	}
+
+	@Test
+	public void testBothDoExportAndDoScript() {
+		assertTrue(Target.BOTH.doExport());
+		assertTrue(Target.BOTH.doScript());
+	}
+
+	@Test
+	public void testNoneDoExportAndDoScript() {
+		assertFalse(Target.NONE.doExport());
+		assertFalse(Target.NONE.doScript());
+	}
+
+	@Test
+	public void testInterpret() {
+		assertEquals(Target.BOTH, Target.interpret(true, true));
+		assertEquals(Target.SCRIPT, Target.interpret(true, false));
+		assertEquals(Target.EXPORT, Target.interpret(false, true));
+		assertEquals(Target.NONE, Target.interpret(false, false));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/TargetTypeHelperTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/TargetTypeHelperTest.java
new file mode 100644
index 000000000000..d3a61a5f5ed5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/hbm2ddl/TargetTypeHelperTest.java
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.hbm2ddl;
+
+import org.hibernate.tool.schema.TargetType;
+import org.junit.jupiter.api.Test;
+
+import java.util.EnumSet;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TargetTypeHelperTest {
+
+	@Test
+	public void testParseLegacyScriptAndExport() {
+		EnumSet<TargetType> result = TargetTypeHelper.parseLegacyCommandLineOptions(true, true, null);
+		assertTrue(result.contains(TargetType.STDOUT));
+		assertTrue(result.contains(TargetType.DATABASE));
+		assertFalse(result.contains(TargetType.SCRIPT));
+	}
+
+	@Test
+	public void testParseLegacyScriptOnly() {
+		EnumSet<TargetType> result = TargetTypeHelper.parseLegacyCommandLineOptions(true, false, null);
+		assertTrue(result.contains(TargetType.STDOUT));
+		assertFalse(result.contains(TargetType.DATABASE));
+	}
+
+	@Test
+	public void testParseLegacyExportOnly() {
+		EnumSet<TargetType> result = TargetTypeHelper.parseLegacyCommandLineOptions(false, true, null);
+		assertFalse(result.contains(TargetType.STDOUT));
+		assertTrue(result.contains(TargetType.DATABASE));
+	}
+
+	@Test
+	public void testParseLegacyWithOutputFile() {
+		EnumSet<TargetType> result = TargetTypeHelper.parseLegacyCommandLineOptions(true, true, "output.sql");
+		assertTrue(result.contains(TargetType.SCRIPT));
+		assertTrue(result.contains(TargetType.STDOUT));
+		assertTrue(result.contains(TargetType.DATABASE));
+	}
+
+	@Test
+	public void testParseLegacyQuietNoExport() {
+		EnumSet<TargetType> result = TargetTypeHelper.parseLegacyCommandLineOptions(false, false, null);
+		assertTrue(result.isEmpty());
+	}
+
+	@Test
+	public void testParseCommandLineDatabase() {
+		EnumSet<TargetType> result = TargetTypeHelper.parseCommandLineOptions("database");
+		assertEquals(1, result.size());
+		assertTrue(result.contains(TargetType.DATABASE));
+	}
+
+	@Test
+	public void testParseCommandLineStdout() {
+		EnumSet<TargetType> result = TargetTypeHelper.parseCommandLineOptions("stdout");
+		assertEquals(1, result.size());
+		assertTrue(result.contains(TargetType.STDOUT));
+	}
+
+	@Test
+	public void testParseCommandLineScript() {
+		EnumSet<TargetType> result = TargetTypeHelper.parseCommandLineOptions("script");
+		assertEquals(1, result.size());
+		assertTrue(result.contains(TargetType.SCRIPT));
+	}
+
+	@Test
+	public void testParseCommandLineMultiple() {
+		EnumSet<TargetType> result = TargetTypeHelper.parseCommandLineOptions("database,stdout,script");
+		assertEquals(3, result.size());
+		assertTrue(result.contains(TargetType.DATABASE));
+		assertTrue(result.contains(TargetType.STDOUT));
+		assertTrue(result.contains(TargetType.SCRIPT));
+	}
+
+	@Test
+	public void testParseCommandLineNone() {
+		EnumSet<TargetType> result = TargetTypeHelper.parseCommandLineOptions("none");
+		assertTrue(result.isEmpty());
+	}
+
+	@Test
+	public void testParseCommandLineInvalid() {
+		assertThrows(IllegalArgumentException.class,
+				() -> TargetTypeHelper.parseCommandLineOptions("invalid"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/RevengSettingsTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/RevengSettingsTest.java
new file mode 100644
index 000000000000..d92a9952d2de
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/RevengSettingsTest.java
@@ -0,0 +1,98 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class RevengSettingsTest {
+
+	@Test
+	public void testDefaults() {
+		RevengSettings settings = new RevengSettings(null);
+		assertEquals("", settings.getDefaultPackageName());
+		assertTrue(settings.getDetectOptimsticLock());
+		assertTrue(settings.createCollectionForForeignKey());
+		assertTrue(settings.createManyToOneForForeignKey());
+		assertTrue(settings.getDetectManyToMany());
+		assertTrue(settings.getDetectOneToOne());
+		assertNull(settings.getRootStrategy());
+	}
+
+	@Test
+	public void testSetDefaultPackageName() {
+		RevengSettings settings = new RevengSettings(null);
+		RevengSettings result = settings.setDefaultPackageName("com.example");
+		assertEquals("com.example", settings.getDefaultPackageName());
+		assertEquals(settings, result);
+	}
+
+	@Test
+	public void testSetDefaultPackageNameNull() {
+		RevengSettings settings = new RevengSettings(null);
+		settings.setDefaultPackageName("com.example");
+		settings.setDefaultPackageName(null);
+		assertEquals("", settings.getDefaultPackageName());
+	}
+
+	@Test
+	public void testSetDefaultPackageNameTrimmed() {
+		RevengSettings settings = new RevengSettings(null);
+		settings.setDefaultPackageName("  com.example  ");
+		assertEquals("com.example", settings.getDefaultPackageName());
+	}
+
+	@Test
+	public void testSetDetectOptimisticLock() {
+		RevengSettings settings = new RevengSettings(null);
+		settings.setDetectOptimisticLock(false);
+		assertFalse(settings.getDetectOptimsticLock());
+	}
+
+	@Test
+	public void testSetCreateCollectionForForeignKey() {
+		RevengSettings settings = new RevengSettings(null);
+		settings.setCreateCollectionForForeignKey(false);
+		assertFalse(settings.createCollectionForForeignKey());
+	}
+
+	@Test
+	public void testSetCreateManyToOneForForeignKey() {
+		RevengSettings settings = new RevengSettings(null);
+		settings.setCreateManyToOneForForeignKey(false);
+		assertFalse(settings.createManyToOneForForeignKey());
+	}
+
+	@Test
+	public void testSetDetectManyToMany() {
+		RevengSettings settings = new RevengSettings(null);
+		settings.setDetectManyToMany(false);
+		assertFalse(settings.getDetectManyToMany());
+	}
+
+	@Test
+	public void testSetDetectOneToOne() {
+		RevengSettings settings = new RevengSettings(null);
+		settings.setDetectOneToOne(false);
+		assertFalse(settings.getDetectOneToOne());
+	}
+
+	@Test
+	public void testFluentApi() {
+		RevengSettings settings = new RevengSettings(null);
+		RevengSettings result = settings
+				.setDefaultPackageName("com.example")
+				.setDetectOptimisticLock(false)
+				.setCreateCollectionForForeignKey(false)
+				.setCreateManyToOneForForeignKey(false)
+				.setDetectManyToMany(false)
+				.setDetectOneToOne(false);
+		assertEquals(settings, result);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/RevengStrategyFactoryTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/RevengStrategyFactoryTest.java
new file mode 100644
index 000000000000..c946ecd2ecf0
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/RevengStrategyFactoryTest.java
@@ -0,0 +1,137 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class RevengStrategyFactoryTest {
+
+	// A strategy with a no-arg constructor
+	public static class NoArgStrategy extends DefaultStrategy {
+		// Explicit no-arg constructor for reflective instantiation by RevengStrategyFactory
+		public NoArgStrategy() {
+			super();
+		}
+	}
+
+	// A strategy with a delegate constructor
+	public static class DelegateStrategy extends DefaultStrategy {
+		private final RevengStrategy delegate;
+		public DelegateStrategy(RevengStrategy delegate) {
+			this.delegate = delegate;
+		}
+		public RevengStrategy getDelegate() { return delegate; }
+	}
+
+	// A strategy with only a delegate constructor (no no-arg)
+	public static class OnlyDelegateStrategy extends DefaultStrategy {
+		public OnlyDelegateStrategy(RevengStrategy delegate) {}
+	}
+
+	// A strategy with no matching constructors
+	public static class BadStrategy extends DefaultStrategy {
+		public BadStrategy(String ignored) {}
+	}
+
+	@Test
+	public void testCreateDefault() {
+		RevengStrategy result = RevengStrategyFactory.createReverseEngineeringStrategy();
+		assertNotNull(result);
+		assertInstanceOf(DefaultStrategy.class, result);
+	}
+
+	@Test
+	public void testCreateWithNullClassName() {
+		RevengStrategy result = RevengStrategyFactory.createReverseEngineeringStrategy(null);
+		assertNotNull(result);
+		assertInstanceOf(DefaultStrategy.class, result);
+	}
+
+	@Test
+	public void testCreateWithNullClassNameAndDelegate() {
+		RevengStrategy delegate = new DefaultStrategy();
+		RevengStrategy result = RevengStrategyFactory.createReverseEngineeringStrategy(null, delegate);
+		assertSame(delegate, result);
+	}
+
+	@Test
+	public void testCreateWithNoArgConstructorNoDelegate() {
+		RevengStrategy result = RevengStrategyFactory.createReverseEngineeringStrategy(
+				NoArgStrategy.class.getName(), (RevengStrategy) null);
+		assertNotNull(result);
+		assertInstanceOf(NoArgStrategy.class, result);
+	}
+
+	@Test
+	public void testCreateWithDelegateConstructorNoDelegate() {
+		// OnlyDelegateStrategy has no no-arg constructor, so it should use the delegate constructor
+		// with a default strategy as delegate
+		RevengStrategy result = RevengStrategyFactory.createReverseEngineeringStrategy(
+				OnlyDelegateStrategy.class.getName(), (RevengStrategy) null);
+		assertNotNull(result);
+		assertInstanceOf(OnlyDelegateStrategy.class, result);
+	}
+
+	@Test
+	public void testCreateWithDelegateConstructorAndDelegate() {
+		RevengStrategy delegate = new DefaultStrategy();
+		RevengStrategy result = RevengStrategyFactory.createReverseEngineeringStrategy(
+				DelegateStrategy.class.getName(), delegate);
+		assertNotNull(result);
+		assertInstanceOf(DelegateStrategy.class, result);
+		assertSame(delegate, ((DelegateStrategy) result).getDelegate());
+	}
+
+	@Test
+	public void testCreateNoArgStrategyWithDelegate() {
+		// NoArgStrategy has no delegate constructor, so delegate is ignored
+		RevengStrategy delegate = new DefaultStrategy();
+		RevengStrategy result = RevengStrategyFactory.createReverseEngineeringStrategy(
+				NoArgStrategy.class.getName(), delegate);
+		assertNotNull(result);
+		assertInstanceOf(NoArgStrategy.class, result);
+	}
+
+	@Test
+	public void testCreateWithBadStrategyNoDelegate() {
+		assertThrows(RuntimeException.class, () ->
+				RevengStrategyFactory.createReverseEngineeringStrategy(
+						BadStrategy.class.getName(), (RevengStrategy) null));
+	}
+
+	@Test
+	public void testCreateWithBadStrategyAndDelegate() {
+		assertThrows(RuntimeException.class, () ->
+				RevengStrategyFactory.createReverseEngineeringStrategy(
+						BadStrategy.class.getName(), new DefaultStrategy()));
+	}
+
+	@Test
+	public void testCreateWithNonExistentClass() {
+		assertThrows(RuntimeException.class, () ->
+				RevengStrategyFactory.createReverseEngineeringStrategy(
+						"com.nonexistent.Strategy", (RevengStrategy) null));
+	}
+
+	@Test
+	public void testCreateWithNullRevengFiles() {
+		RevengStrategy result = RevengStrategyFactory.createReverseEngineeringStrategy(null, (java.io.File[]) null);
+		assertNotNull(result);
+		assertInstanceOf(DefaultStrategy.class, result);
+	}
+
+	@Test
+	public void testCreateWithEmptyRevengFiles() {
+		RevengStrategy result = RevengStrategyFactory.createReverseEngineeringStrategy(null, new java.io.File[0]);
+		assertNotNull(result);
+		assertInstanceOf(DefaultStrategy.class, result);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/ReverseEngineeringStrategyFactoryTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/ReverseEngineeringStrategyFactoryTest.java
new file mode 100644
index 000000000000..c19db8a3f071
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/ReverseEngineeringStrategyFactoryTest.java
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+
+public class ReverseEngineeringStrategyFactoryTest {
+
+	@Test
+	public void testCreateReverseEngineeringStrategy() {
+		RevengStrategy reverseEngineeringStrategy =
+				RevengStrategyFactory.createReverseEngineeringStrategy();
+		assertNotNull(reverseEngineeringStrategy);
+		assertEquals(
+				DefaultStrategy.class.getName(),
+				reverseEngineeringStrategy.getClass().getName());
+		reverseEngineeringStrategy =
+				RevengStrategyFactory.createReverseEngineeringStrategy(
+						TestReverseEngineeringStrategyFactory.class.getName());
+		assertNotNull(reverseEngineeringStrategy);
+		assertEquals(
+				TestReverseEngineeringStrategyFactory.class.getName(),
+				reverseEngineeringStrategy.getClass().getName());
+		reverseEngineeringStrategy =
+				RevengStrategyFactory.createReverseEngineeringStrategy(null);
+		assertEquals(
+				DefaultStrategy.class.getName(),
+				reverseEngineeringStrategy.getClass().getName());
+	}
+
+	public static class TestReverseEngineeringStrategyFactory extends DefaultStrategy {}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/TableIdentifierTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/TableIdentifierTest.java
new file mode 100644
index 000000000000..b4323512da9d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/core/TableIdentifierTest.java
@@ -0,0 +1,118 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.core;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class TableIdentifierTest {
+
+	@Test
+	public void testCreateWithAllParts() {
+		TableIdentifier id = TableIdentifier.create("MY_CAT", "MY_SCH", "MY_TABLE");
+		assertEquals("MY_CAT", id.getCatalog());
+		assertEquals("MY_SCH", id.getSchema());
+		assertEquals("MY_TABLE", id.getName());
+	}
+
+	@Test
+	public void testCreateWithNulls() {
+		TableIdentifier id = TableIdentifier.create(null, null, "MY_TABLE");
+		assertNull(id.getCatalog());
+		assertNull(id.getSchema());
+		assertEquals("MY_TABLE", id.getName());
+	}
+
+	@Test
+	public void testEqualsSameValues() {
+		TableIdentifier id1 = TableIdentifier.create("CAT", "SCH", "TAB");
+		TableIdentifier id2 = TableIdentifier.create("CAT", "SCH", "TAB");
+		assertEquals(id1, id2);
+		assertEquals(id1.hashCode(), id2.hashCode());
+	}
+
+	@Test
+	public void testEqualsDifferentCatalog() {
+		TableIdentifier id1 = TableIdentifier.create("CAT1", "SCH", "TAB");
+		TableIdentifier id2 = TableIdentifier.create("CAT2", "SCH", "TAB");
+		assertNotEquals(id1, id2);
+	}
+
+	@Test
+	public void testEqualsDifferentSchema() {
+		TableIdentifier id1 = TableIdentifier.create("CAT", "SCH1", "TAB");
+		TableIdentifier id2 = TableIdentifier.create("CAT", "SCH2", "TAB");
+		assertNotEquals(id1, id2);
+	}
+
+	@Test
+	public void testEqualsDifferentName() {
+		TableIdentifier id1 = TableIdentifier.create("CAT", "SCH", "TAB1");
+		TableIdentifier id2 = TableIdentifier.create("CAT", "SCH", "TAB2");
+		assertNotEquals(id1, id2);
+	}
+
+	@Test
+	public void testEqualsWithNulls() {
+		TableIdentifier id1 = TableIdentifier.create(null, null, "TAB");
+		TableIdentifier id2 = TableIdentifier.create(null, null, "TAB");
+		assertEquals(id1, id2);
+	}
+
+	@Test
+	public void testEqualsNullVsNonNull() {
+		TableIdentifier id1 = TableIdentifier.create(null, null, "TAB");
+		TableIdentifier id2 = TableIdentifier.create("CAT", null, "TAB");
+		assertNotEquals(id1, id2);
+	}
+
+	@Test
+	public void testEqualsNotTableIdentifier() {
+		TableIdentifier id = TableIdentifier.create("CAT", "SCH", "TAB");
+		assertFalse(id.equals("not a TableIdentifier"));
+	}
+
+	@Test
+	public void testToStringAllParts() {
+		TableIdentifier id = TableIdentifier.create("MY_CAT", "MY_SCH", "MY_TABLE");
+		assertEquals("TableIdentifier(MY_CAT.MY_SCH.MY_TABLE)", id.toString());
+	}
+
+	@Test
+	public void testToStringNoCatalog() {
+		TableIdentifier id = TableIdentifier.create(null, "MY_SCH", "MY_TABLE");
+		assertEquals("TableIdentifier(MY_SCH.MY_TABLE)", id.toString());
+	}
+
+	@Test
+	public void testToStringNoSchema() {
+		TableIdentifier id = TableIdentifier.create("MY_CAT", null, "MY_TABLE");
+		assertEquals("TableIdentifier(MY_CAT.MY_TABLE)", id.toString());
+	}
+
+	@Test
+	public void testToStringTableOnly() {
+		TableIdentifier id = TableIdentifier.create(null, null, "MY_TABLE");
+		assertEquals("TableIdentifier(MY_TABLE)", id.toString());
+	}
+
+	@Test
+	public void testHashCodeConsistency() {
+		TableIdentifier id = TableIdentifier.create("CAT", "SCH", "TAB");
+		int hash1 = id.hashCode();
+		int hash2 = id.hashCode();
+		assertEquals(hash1, hash2);
+	}
+
+	@Test
+	public void testHashCodeWithNulls() {
+		TableIdentifier id = TableIdentifier.create(null, null, null);
+		id.hashCode();
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/export/ExporterFactoryTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/export/ExporterFactoryTest.java
new file mode 100644
index 000000000000..9d0bfaf72f48
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/export/ExporterFactoryTest.java
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.export;
+
+import org.hibernate.tool.reveng.internal.export.common.AbstractExporter;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class ExporterFactoryTest {
+
+	@Test
+	public void testCreateExporter() {
+		try {
+			ExporterFactory.createExporter("foobar");
+			fail();
+		} catch(Throwable t) {
+			assertTrue(t.getMessage().contains("foobar"));
+		}
+		Exporter exporter = ExporterFactory.createExporter(
+				"org.hibernate.tool.reveng.api.export.ExporterFactoryTest$TestExporter");
+		assertNotNull(exporter);
+		assertTrue(exporter instanceof TestExporter);
+		exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		assertNotNull(exporter);
+		assertEquals(
+				ExporterType.JAVA.className(),
+				exporter.getClass().getName());
+	}
+
+	public static class TestExporter extends AbstractExporter {
+		@Override protected void doStart() {}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/export/ExporterTypeTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/export/ExporterTypeTest.java
new file mode 100644
index 000000000000..771e9a3a4579
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/export/ExporterTypeTest.java
@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.export;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ExporterTypeTest {
+
+	@Test
+	public void testExporterType() {
+		assertEquals(
+				"org.hibernate.tool.reveng.internal.export.java.JavaExporter",
+				ExporterType.JAVA.className());
+		assertEquals(
+				"org.hibernate.tool.reveng.internal.export.cfg.CfgExporter",
+				ExporterType.CFG.className());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/version/VersionTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/version/VersionTest.java
new file mode 100644
index 000000000000..9c46c797084c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/version/VersionTest.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.version;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class VersionTest {
+
+	@Test
+	public void testSomething() {
+		assertEquals( org.hibernate.Version.getVersionString(), Version.versionString() );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/xml/XMLPrettyPrinterTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/xml/XMLPrettyPrinterTest.java
new file mode 100644
index 000000000000..548db583d3d6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/api/xml/XMLPrettyPrinterTest.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.api.xml;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class XMLPrettyPrinterTest {
+
+	private static final String XML_BEFORE = "<foo><bar>foobar</bar></foo>";
+
+	private static final String XML_AFTER =
+			"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" + System.lineSeparator() +
+			"<foo>" + System.lineSeparator() +
+			"    <bar>foobar</bar>" + System.lineSeparator() +
+			"</foo>" + System.lineSeparator();
+
+	private static final String XML_COMMENT = "<!-- Just a comment! -->";
+
+	private static final String fileName = "foobarfile.xml";
+
+	@TempDir
+	private File tempDir;
+
+	private File xmlFile = null;
+
+	@BeforeEach
+	public void beforeEach() throws Exception {
+		xmlFile = new File(tempDir, fileName);
+		PrintWriter writer = new PrintWriter(xmlFile);
+		writer.print(XML_BEFORE);
+		writer.flush();
+		writer.close();
+	}
+
+	@Test
+	public void testXmlPrettyPrintDefault() throws Exception {
+		XMLPrettyPrinter.prettyPrintFile(xmlFile);
+		String result = Files.readString(xmlFile.toPath());
+		assertEquals(XML_AFTER, result);
+	}
+
+	@Test
+	public void testXmlPrettyPrintWithStrategy() throws Exception {
+		XMLPrettyPrinter.prettyPrintFile(xmlFile, new FooBarStrategy());
+		String result = Files.readString(xmlFile.toPath());
+		assertEquals(XML_AFTER + XML_COMMENT, result);
+	}
+
+	public static class FooBarStrategy implements XMLPrettyPrinterStrategy {
+		@Override
+		public String prettyPrint(String xml) throws Exception {
+			return XML_AFTER + XML_COMMENT;
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/DriverMetaData/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/DriverMetaData/TestCase.java
new file mode 100644
index 000000000000..0cf0d5addd11
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/DriverMetaData/TestCase.java
@@ -0,0 +1,128 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.cfg.DriverMetaData;
+
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Environment;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengDialectFactory;
+import org.hibernate.tool.reveng.internal.core.dialect.JDBCMetaDataDialect;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private Properties properties = null;
+	private ServiceRegistry serviceRegistry;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		properties = Environment.getProperties();
+		StandardServiceRegistryBuilder ssrb = new StandardServiceRegistryBuilder();
+		serviceRegistry = ssrb.build();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testExportedKeys() {
+		RevengDialect dialect = new JDBCMetaDataDialect();
+		StandardServiceRegistryBuilder ssrb = new StandardServiceRegistryBuilder();
+		ServiceRegistry serviceRegistry = ssrb.build();
+		ConnectionProvider connectionProvider =
+				serviceRegistry.getService(ConnectionProvider.class);
+		dialect.configure(connectionProvider);
+		String catalog = properties.getProperty(AvailableSettings.DEFAULT_CATALOG);
+		String schema = properties.getProperty(AvailableSettings.DEFAULT_SCHEMA);
+		Iterator<Map<String,Object>> tables =
+				dialect.getTables(
+						catalog,
+						schema,
+						"TAB_MASTER");
+		boolean foundMaster = false;
+		while(tables.hasNext()) {
+			Map<?,?> map = tables.next();
+			String tableName = (String) map.get("TABLE_NAME");
+			String schemaName = (String) map.get("TABLE_SCHEM");
+			String catalogName = (String) map.get("TABLE_CAT");
+			if(tableName.equals("TAB_MASTER")) {
+				foundMaster = true;
+				Iterator<?> exportedKeys =
+						dialect.getExportedKeys(
+								catalogName,
+								schemaName,
+								tableName );
+				int cnt = 0;
+				while ( exportedKeys.hasNext() ) {
+					exportedKeys.next();
+					cnt++;
+				}
+				assertEquals(1,cnt);
+			}
+		}
+		assertTrue(foundMaster);
+	}
+
+	@Test
+	public void testDataType() {
+		RevengDialect dialect = RevengDialectFactory
+				.fromDialectName(properties.getProperty(AvailableSettings.DIALECT));
+		ConnectionProvider connectionProvider =
+				serviceRegistry.getService(ConnectionProvider.class);
+		assert dialect != null;
+		dialect.configure(connectionProvider);
+		String catalog = properties.getProperty(AvailableSettings.DEFAULT_CATALOG);
+		String schema = properties.getProperty(AvailableSettings.DEFAULT_SCHEMA);
+		Iterator<?> tables =
+				dialect.getColumns(
+						catalog,
+						schema,
+						"test",
+						null );
+		while(tables.hasNext()) {
+			Map<?,?> map = (Map<?,?>) tables.next();
+			System.out.println(map);
+		}
+	}
+
+	@Test
+	public void testCaseTest() {
+		RevengDialect dialect = new JDBCMetaDataDialect();
+		ConnectionProvider connectionProvider =
+				serviceRegistry.getService(ConnectionProvider.class);
+		dialect.configure(connectionProvider);
+		String catalog = properties.getProperty(AvailableSettings.DEFAULT_CATALOG);
+		String schema = properties.getProperty(AvailableSettings.DEFAULT_SCHEMA);
+		Iterator<Map<String, Object>> tables =
+				dialect.getTables(
+						catalog,
+						schema,
+						"TAB_MASTER");
+
+		JUnitUtil.assertIteratorContainsExactly(null, tables, 1);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/JDBCMetaDataConfiguration/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/JDBCMetaDataConfiguration/TestCase.java
new file mode 100644
index 000000000000..823eb654bc93
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/JDBCMetaDataConfiguration/TestCase.java
@@ -0,0 +1,54 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.cfg.JDBCMetaDataConfiguration;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testReadFromJDBC() {
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+		assertNotNull(metadata.getEntityBinding("WithRealTimestamp"), "WithRealTimestamp");
+		assertNotNull(metadata.getEntityBinding("NoVersion"), "NoVersion");
+		assertNotNull(metadata.getEntityBinding("WithFakeTimestamp"), "WithFakeTimestamp");
+		assertNotNull(metadata.getEntityBinding("WithVersion"), "WithVersion");
+	}
+
+	@Test
+	public void testGetTable() {
+		assertNotNull(
+				HibernateUtil.getTable(
+						MetadataDescriptorFactory
+							.createReverseEngineeringDescriptor(null, null)
+							.createMetadata(),
+						JdbcUtil.toIdentifier(this, "WITH_REAL_TIMESTAMP")));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/MetaDataDialectFactoryTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/MetaDataDialectFactoryTest/TestCase.java
new file mode 100644
index 000000000000..7ef6728c51ac
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/MetaDataDialectFactoryTest/TestCase.java
@@ -0,0 +1,149 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.cfg.MetaDataDialectFactoryTest;
+
+import org.hibernate.dialect.DatabaseVersion;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.dialect.HSQLDialect;
+import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.OracleDialect;
+import org.hibernate.tool.reveng.api.core.RevengDialectFactory;
+import org.hibernate.tool.reveng.internal.core.dialect.*;
+import org.junit.jupiter.api.Test;
+
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class TestCase {
+
+	private static class NoNameDialect extends Dialect {
+		public NoNameDialect() {
+			super((DatabaseVersion)null);
+		}
+	}
+
+	private static class H2NamedDialect extends Dialect {
+		public H2NamedDialect() {
+			super((DatabaseVersion)null);
+		}
+	}
+
+	@Test
+	public void testCreateMetaDataDialect() {
+		assertSameClass(
+				"Generic metadata for dialects with no specifics",
+				JDBCMetaDataDialect.class,
+				RevengDialectFactory.createMetaDataDialect(
+						new NoNameDialect(),
+						new Properties()));
+		assertSameClass(
+				H2MetaDataDialect.class,
+				RevengDialectFactory.createMetaDataDialect(new H2NamedDialect(), new Properties()));
+		assertSameClass(
+				OracleMetaDataDialect.class,
+				RevengDialectFactory.createMetaDataDialect(
+						new OracleDialect(),
+						new Properties()));
+		assertSameClass(
+				MySQLMetaDataDialect.class,
+				RevengDialectFactory.createMetaDataDialect(
+						new MySQLDialect(),
+						new Properties()));
+		Properties p = new Properties();
+		p.setProperty(
+				"hibernatetool.metadatadialect",
+				H2MetaDataDialect.class.getCanonicalName());
+		assertSameClass(
+				"property should override specific dialect",
+				H2MetaDataDialect.class,
+				RevengDialectFactory.createMetaDataDialect(new MySQLDialect(), p));
+	}
+
+	@Test
+	public void testCreateMetaDataDialectNonExistingOverride() {
+		Properties p = new Properties();
+		p.setProperty("hibernatetool.metadatadialect", "DoesNotExists");
+		try {
+			RevengDialectFactory.createMetaDataDialect(new MySQLDialect(), p);
+			fail();
+		} catch (RuntimeException jbe) {
+			// expected
+		} catch(Exception e) {
+			fail();
+		}
+	}
+
+	@Test
+	public void testFromDialect() {
+		assertSameClass(
+				"Generic metadata for dialects with no specifics",
+				null,
+				RevengDialectFactory.fromDialect(new NoNameDialect()));
+		assertSameClass(
+				OracleMetaDataDialect.class,
+				RevengDialectFactory.fromDialect(new OracleDialect()));
+		assertSameClass(
+				MySQLMetaDataDialect.class,
+				RevengDialectFactory.fromDialect(new MySQLDialect()));
+		assertSameClass(
+				H2MetaDataDialect.class,
+				RevengDialectFactory.fromDialect(new H2Dialect()));
+		assertSameClass(
+				HSQLMetaDataDialect.class,
+				RevengDialectFactory.fromDialect(new HSQLDialect()));
+
+	}
+
+	@Test
+	public void testFromDialectName() {
+		assertSameClass(
+				null,
+				RevengDialectFactory.fromDialectName("BlahBlah"));
+		assertSameClass(
+				OracleMetaDataDialect.class,
+				RevengDialectFactory.fromDialectName("mYorAcleDialect"));
+		assertSameClass(
+				OracleMetaDataDialect.class,
+				RevengDialectFactory.fromDialectName(OracleDialect.class.getName()));
+		assertSameClass(
+				MySQLMetaDataDialect.class,
+				RevengDialectFactory.fromDialectName(MySQLDialect.class.getName()));
+		assertSameClass(
+				H2MetaDataDialect.class,
+				RevengDialectFactory.fromDialectName(H2Dialect.class.getName()));
+		assertSameClass(
+				HSQLMetaDataDialect.class,
+				RevengDialectFactory.fromDialectName(HSQLDialect.class.getName()));
+
+	}
+
+	private void assertSameClass(Class<?> clazz, Object instance) {
+		if(clazz==null) {
+			assertNull(instance);
+			return;
+		}
+		if(instance==null) {
+			assertNull(clazz.getCanonicalName());
+			return;
+		}
+		assertEquals(clazz.getCanonicalName(), instance.getClass().getName());
+	}
+
+	private void assertSameClass(String msg, Class<?> clazz, Object instance) {
+		if(clazz==null) {
+			assertNull(instance, msg);
+			return;
+		}
+		if(instance==null) {
+			assertNull(clazz.getCanonicalName(), msg);
+			return;
+		}
+		assertEquals(clazz.getCanonicalName(), instance.getClass().getName(), msg);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/reveng/NameConverterTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/reveng/NameConverterTest/TestCase.java
new file mode 100644
index 000000000000..ca8a7dc77186
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/cfg/reveng/NameConverterTest/TestCase.java
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.cfg.reveng.NameConverterTest;
+
+import org.hibernate.tool.reveng.internal.util.NameConverter;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class TestCase {
+
+	@Test
+	public void testSimplePluralizeWithSingleH() throws Exception {
+		String plural = NameConverter.simplePluralize("h");
+		assertEquals("hs", plural);
+	}
+
+	@Test
+	public void testPluralize(){
+		assertEquals("boxes", NameConverter.simplePluralize("box"));
+		assertEquals("buses", NameConverter.simplePluralize("bus"));
+		assertEquals("keys", NameConverter.simplePluralize("key"));
+		assertEquals("countries", NameConverter.simplePluralize("country"));
+		assertEquals("churches", NameConverter.simplePluralize("church"));
+		assertEquals("bushes", NameConverter.simplePluralize("bush"));
+		assertEquals("roofs", NameConverter.simplePluralize("roof"));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/CachedMetaData/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/CachedMetaData/TestCase.java
new file mode 100644
index 000000000000..6b94141783c3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/CachedMetaData/TestCase.java
@@ -0,0 +1,186 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.CachedMetaData;
+
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Environment;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.mapping.Table;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengDialectFactory;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataCollector;
+import org.hibernate.tool.reveng.internal.core.dialect.CachedMetaDataDialect;
+import org.hibernate.tool.reveng.internal.core.reader.DatabaseReader;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	public static class MockedMetaDataDialect implements RevengDialect {
+
+		RevengDialect delegate;
+		private boolean failOnDelegateAccess;
+
+		public MockedMetaDataDialect(RevengDialect realMetaData) {
+			delegate = realMetaData;
+		}
+
+		public void close() {
+			delegate.close();
+		}
+
+		public void close(Iterator<?> iterator) {
+			delegate.close( iterator );
+		}
+
+		public void configure(ConnectionProvider cp) {
+			delegate.configure(cp);
+		}
+
+		public Iterator<Map<String, Object>> getColumns(String catalog, String schema, String table, String column) {
+			if(failOnDelegateAccess) {
+				throw new IllegalStateException("delegate not accessible");
+			} else {
+				return delegate.getColumns( catalog, schema, table, column );
+			}
+		}
+
+		public Iterator<Map<String, Object>> getExportedKeys(String catalog, String schema, String table) {
+			if(failOnDelegateAccess) {
+				throw new IllegalStateException("delegate not accessible");
+			} else {
+				return delegate.getExportedKeys( catalog, schema, table );
+			}
+		}
+
+		public Iterator<Map<String, Object>> getIndexInfo(String catalog, String schema, String table) {
+			if(failOnDelegateAccess) {
+				throw new IllegalStateException("delegate not accessible");
+			} else {
+				return delegate.getIndexInfo( catalog, schema, table );
+			}
+		}
+
+		public Iterator<Map<String, Object>> getPrimaryKeys(String catalog, String schema, String name) {
+			if(failOnDelegateAccess) {
+				throw new IllegalStateException("delegate not accessible");
+			} else {
+				return delegate.getPrimaryKeys( catalog, schema, name );
+			}
+		}
+
+		public Iterator<Map<String, Object>> getTables(String catalog, String schema, String table) {
+			if(failOnDelegateAccess) {
+				throw new IllegalStateException("delegate not accessible");
+			} else {
+				return delegate.getTables( catalog, schema, table );
+			}
+		}
+
+		public boolean needQuote(String name) {
+			return delegate.needQuote( name );
+		}
+
+		public void setFailOnDelegateAccess(boolean b) {
+			failOnDelegateAccess = b;
+		}
+
+		public Iterator<Map<String, Object>> getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String name) {
+			if(failOnDelegateAccess) {
+				throw new IllegalStateException("delegate not accessible");
+			} else {
+				return delegate.getSuggestedPrimaryKeyStrategyName(catalog, schema, name);
+			}
+		}
+
+	}
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testCachedDialect() {
+		StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder();
+		ServiceRegistry serviceRegistry = builder.build();
+		Properties properties = Environment.getProperties();
+		RevengDialect realMetaData = RevengDialectFactory.createMetaDataDialect(
+				Objects.requireNonNull(serviceRegistry.getService(JdbcServices.class)).getDialect(),
+				Environment.getProperties() );
+		MockedMetaDataDialect mock = new MockedMetaDataDialect(realMetaData);
+		CachedMetaDataDialect dialect = new CachedMetaDataDialect(mock);
+		DatabaseReader reader = DatabaseReader.create(
+				properties,
+				new DefaultStrategy(),
+				dialect,
+				serviceRegistry );
+		RevengMetadataCollector dc = new RevengMetadataCollector();
+		reader.readDatabaseSchema(dc);
+		validate( dc );
+		mock.setFailOnDelegateAccess(true);
+		reader = DatabaseReader.create(
+				properties,
+				new DefaultStrategy(),
+				dialect,
+				serviceRegistry );
+		dc = new RevengMetadataCollector();
+		reader.readDatabaseSchema(dc);
+		validate(dc);
+	}
+
+	private void validate(RevengMetadataCollector dc) {
+		Iterator<Table> iterator = dc.iterateTables();
+		Table table = iterator.next();
+		Table master = null, child = null;
+		if ("MASTER".equals(table.getName())) {
+			master = table;
+			child = iterator.next();
+		} else if ("CHILD".equals(table.getName())) {
+			child = table;
+			master = iterator.next();
+		} else {
+			fail("Only tables named 'MASTER' and 'CHILD' should exist");
+		}
+		assertNotNull(child);
+		assertNotNull(master);
+
+		iterator = dc.iterateTables();
+		assertNotNull(iterator.next());
+		assertNotNull(iterator.next());
+		assertFalse(iterator.hasNext());
+
+		JUnitUtil.assertIteratorContainsExactly(
+				"should have recorded one foreignkey to child table",
+				child.getForeignKeyCollection().iterator(),
+				1);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/TestCase.java
new file mode 100644
index 000000000000..f543d35ce9e9
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/TestCase.java
@@ -0,0 +1,195 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.DdlExporterTest;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"HelloWorld.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder;
+
+	private MetadataDescriptor metadataDescriptor;
+	private File resourcesDir;
+
+	@BeforeEach
+	public void setUp() {
+		resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+	}
+
+	@Test
+	public void testDdlExportCreateToFile() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, "schema.sql");
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, false);
+		exporter.getProperties().put(ExporterConstants.CREATE_DATABASE, true);
+		exporter.getProperties().put(ExporterConstants.DROP_DATABASE, false);
+		exporter.start();
+
+		File schemaFile = new File(outputFolder, "schema.sql");
+		assertTrue(schemaFile.exists());
+		assertTrue(schemaFile.length() > 0);
+	}
+
+	@Test
+	public void testDdlExportDropToFile() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, "drop.sql");
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, false);
+		exporter.getProperties().put(ExporterConstants.CREATE_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.DROP_DATABASE, true);
+		exporter.start();
+
+		File dropFile = new File(outputFolder, "drop.sql");
+		assertTrue(dropFile.exists());
+		assertTrue(dropFile.length() > 0);
+	}
+
+	@Test
+	public void testDdlExportBothToFile() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, "both.sql");
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, false);
+		exporter.getProperties().put(ExporterConstants.CREATE_DATABASE, true);
+		exporter.getProperties().put(ExporterConstants.DROP_DATABASE, true);
+		exporter.start();
+
+		File bothFile = new File(outputFolder, "both.sql");
+		assertTrue(bothFile.exists());
+		assertTrue(bothFile.length() > 0);
+	}
+
+	@Test
+	public void testDdlExportNone() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, "none.sql");
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, false);
+		exporter.getProperties().put(ExporterConstants.CREATE_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.DROP_DATABASE, false);
+		exporter.start();
+
+		File noneFile = new File(outputFolder, "none.sql");
+		// File may or may not exist but should be empty or very small
+		assertFalse(noneFile.exists() && noneFile.length() > 0);
+	}
+
+	@Test
+	public void testDdlExportWithDelimiter() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, "delim.sql");
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, false);
+		exporter.getProperties().put(ExporterConstants.DELIMITER, "GO");
+		exporter.start();
+
+		File delimFile = new File(outputFolder, "delim.sql");
+		assertTrue(delimFile.exists());
+	}
+
+	@Test
+	public void testDdlExportFormatted() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, "formatted.sql");
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, false);
+		exporter.getProperties().put(ExporterConstants.FORMAT, true);
+		exporter.start();
+
+		File formattedFile = new File(outputFolder, "formatted.sql");
+		assertTrue(formattedFile.exists());
+		assertTrue(formattedFile.length() > 0);
+	}
+
+	@Test
+	public void testDdlExportSchemaUpdateNoTargets() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, false);
+		exporter.getProperties().put(ExporterConstants.SCHEMA_UPDATE, true);
+		exporter.getProperties().put(ExporterConstants.HALT_ON_ERROR, true);
+		exporter.getProperties().put(ExporterConstants.FORMAT, true);
+		exporter.start();
+	}
+
+	@Test
+	public void testDdlExportWithHaltOnError() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, "halt.sql");
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, false);
+		exporter.getProperties().put(ExporterConstants.HALT_ON_ERROR, true);
+		exporter.start();
+
+		File haltFile = new File(outputFolder, "halt.sql");
+		assertTrue(haltFile.exists());
+	}
+
+	@Test
+	public void testDdlExportDropOnly() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, "droponly.sql");
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, false);
+		exporter.getProperties().put(ExporterConstants.CREATE_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.DROP_DATABASE, true);
+		exporter.getProperties().put(ExporterConstants.FORMAT, true);
+		exporter.getProperties().put(ExporterConstants.HALT_ON_ERROR, true);
+		exporter.start();
+	}
+
+	@Test
+	public void testDdlExportToConsoleOnly() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DDL);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_DATABASE, false);
+		exporter.getProperties().put(ExporterConstants.EXPORT_TO_CONSOLE, true);
+		exporter.getProperties().put(ExporterConstants.CREATE_DATABASE, true);
+		exporter.getProperties().put(ExporterConstants.DROP_DATABASE, false);
+		exporter.start();
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DefaultDatabaseCollector/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DefaultDatabaseCollector/TestCase.java
new file mode 100644
index 000000000000..6128cb941304
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DefaultDatabaseCollector/TestCase.java
@@ -0,0 +1,173 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.DefaultDatabaseCollector;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Environment;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.mapping.Table;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengDialectFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategy.SchemaSelection;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataCollector;
+import org.hibernate.tool.reveng.internal.core.reader.DatabaseReader;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.OverrideRepository;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+public class TestCase {
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testReadOnlySpecificSchema() {
+		OverrideRepository or = new OverrideRepository();
+		or.addSchemaSelection(createSchemaSelection());
+		RevengStrategy res = or.getReverseEngineeringStrategy(new DefaultStrategy());
+		List<Table> tables = getTables(MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(res, null)
+				.createMetadata());
+		assertEquals(2,tables.size());
+		Table catchild = tables.get(0);
+		Table catmaster = tables.get(1);
+		if(catchild.getName().equals("cat.master")) {
+			catchild = tables.get(1);
+			catmaster = tables.get(0);
+		}
+		TableIdentifier masterid = TableIdentifier.create(catmaster);
+		TableIdentifier childid = TableIdentifier.create(catchild);
+		assertEquals(TableIdentifier.create(null, "cat.cat", "cat.child"), childid);
+		assertEquals(TableIdentifier.create(null, "cat.cat", "cat.master"), masterid);
+	}
+
+	@Test
+	public void testNeedQuote() {
+		Properties properties = Environment.getProperties();
+		StandardServiceRegistryBuilder ssrb = new StandardServiceRegistryBuilder();
+		ssrb.applySettings(properties);
+		RevengDialect realMetaData;
+		try (ServiceRegistry serviceRegistry = ssrb.build()) {
+			realMetaData = RevengDialectFactory.createMetaDataDialect(
+					Objects.requireNonNull( serviceRegistry.getService( JdbcServices.class ) ).getDialect(),
+					properties );
+		}
+		assertTrue(realMetaData.needQuote("cat.cat"), "The name must be quoted!");
+		assertTrue(realMetaData.needQuote("cat.child"), "The name must be quoted!");
+		assertTrue(realMetaData.needQuote("cat.master"), "The name must be quoted!");
+	}
+
+	/**
+	 * There are 2 solutions:
+	 * 1. DatabaseCollector#addTable()/getTable() should be called for not quoted parameters - I think it is a preferable way.
+	 * 2. DatabaseCollector#addTable()/getTable() should be called for quoted parameters - here users should
+	 * use the same quotes as JDBCReader.
+	 * Because of this there are 2 opposite methods(and they are both failed as addTable uses quoted names
+	 * but getTable uses non-quoted names )
+	 */
+	@Test
+	public void testQuotedNamesAndDefaultDatabaseCollector() {
+		Properties properties = Environment.getProperties();
+		properties.put(AvailableSettings.DEFAULT_SCHEMA, "cat.cat");
+		StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder();
+		ServiceRegistry serviceRegistry = builder.build();
+		RevengDialect realMetaData = RevengDialectFactory.createMetaDataDialect(
+				Objects.requireNonNull(serviceRegistry.getService(JdbcServices.class)).getDialect(),
+				properties);
+		DatabaseReader reader = DatabaseReader.create(
+				properties, new DefaultStrategy(),
+				realMetaData, serviceRegistry );
+		RevengMetadataCollector dc = new RevengMetadataCollector();
+		reader.readDatabaseSchema(dc);
+		String defaultCatalog = properties.getProperty(AvailableSettings.DEFAULT_CATALOG);
+		assertNotNull(getTable(dc, realMetaData, defaultCatalog, "cat.cat", "cat.child"), "The table should be found");
+		assertNotNull(getTable(dc, realMetaData, defaultCatalog, "cat.cat", "cat.master"), "The table should be found");
+		assertNull(getTable(dc, realMetaData, defaultCatalog, doubleQuote("cat.cat"), doubleQuote("cat.child")), "Quoted names should not return the table");
+		assertNull(getTable(dc, realMetaData, defaultCatalog, doubleQuote("cat.cat"), doubleQuote("cat.master")), "Quoted names should not return the table");
+		assertEquals(1, dc.getOneToManyCandidates().size(), "Foreign key 'masterref' was filtered!");
+	}
+
+	private Table getTable(
+			RevengMetadataCollector revengMetadataCollector,
+			RevengDialect metaDataDialect,
+			String catalog,
+			String schema,
+			String name) {
+		return revengMetadataCollector.getTable(
+				TableIdentifier.create(
+						quote(metaDataDialect, catalog),
+						quote(metaDataDialect, schema),
+						quote(metaDataDialect, name)));
+	}
+
+	private String quote(RevengDialect metaDataDialect, String name) {
+		if (name == null) return null;
+		if (metaDataDialect.needQuote(name)) {
+			if (name.length() > 1 && name.charAt(0) == '`'
+					&& name.charAt(name.length() - 1) == '`') {
+				return name; // avoid double quoting
+			}
+			return "`" + name + "`";
+		} else {
+			return name;
+		}
+	}
+
+	private static String doubleQuote(String name) {
+		return "\"" + name + "\"";
+	}
+
+	private List<Table> getTables(Metadata metadata) {
+		return new ArrayList<>(metadata.collectTableMappings());
+	}
+
+	private SchemaSelection createSchemaSelection() {
+		return new SchemaSelection() {
+			@Override
+			public String getMatchCatalog() {
+				return null;
+			}
+			@Override
+			public String getMatchSchema() {
+				return "cat.cat";
+			}
+			@Override
+			public String getMatchTable() {
+				return null;
+			}
+		};
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DefaultSchemaCatalog/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DefaultSchemaCatalog/TestCase.java
new file mode 100644
index 000000000000..b4886fc0e3a4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DefaultSchemaCatalog/TestCase.java
@@ -0,0 +1,129 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.DefaultSchemaCatalog;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.cfg.Environment;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategy.SchemaSelection;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.OverrideRepository;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testReadOnlySpecificSchema() {
+		OverrideRepository or = new OverrideRepository();
+		or.addSchemaSelection(createSchemaSelection("OVRTEST", null));
+		RevengStrategy res = or.getReverseEngineeringStrategy(new DefaultStrategy());
+		List<Table> tables = getTables(MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(res, null)
+				.createMetadata());
+		assertEquals(2,tables.size());
+		Table catchild = tables.get(0);
+		Table catmaster = tables.get(1);
+		if(catchild.getName().equals("CATMASTER")) {
+			catchild = tables.get(1);
+			catmaster = tables.get(0);
+		}
+		TableIdentifier masterid = TableIdentifier.create(catmaster);
+		TableIdentifier childid = TableIdentifier.create(catchild);
+		assertEquals(TableIdentifier.create(null, "OVRTEST", "CATMASTER"), masterid);
+		assertEquals(TableIdentifier.create(null, "OVRTEST", "CATCHILD"), childid);
+	}
+
+	@Test
+	public void testOverlapping() {
+		OverrideRepository or = new OverrideRepository();
+		or.addSchemaSelection(createSchemaSelection("OVRTEST", null));
+		or.addSchemaSelection(createSchemaSelection(null, "MASTER"));
+		or.addSchemaSelection(createSchemaSelection(null, "CHILD"));
+		RevengStrategy res =
+				or.getReverseEngineeringStrategy(new DefaultStrategy());
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(res, null)
+				.createMetadata();
+		Set<TableIdentifier> tables = new HashSet<>();
+		for (Table element : metadata.collectTableMappings()) {
+			boolean added = tables.add(TableIdentifier.create(element));
+			if (!added)
+				fail("duplicate table found for " + element);
+		}
+		assertEquals(4,tables.size());
+	}
+
+	@Test
+	public void testUseDefault() {
+		Properties properties = new Properties();
+		properties.setProperty(Environment.DEFAULT_SCHEMA, "OVRTEST");
+		properties.setProperty(Environment.DEFAULT_SCHEMA, "OVRTEST");
+		List<Table> tables = getTables(MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, properties)
+				.createMetadata());
+		assertEquals(2,tables.size());
+		Table catchild = tables.get(0);
+		Table catmaster = tables.get(1);
+		if(catchild.getName().equals("CATMASTER")) {
+			catchild = tables.get(1);
+			catmaster = tables.get(0);
+		}
+		TableIdentifier masterid = TableIdentifier.create(catmaster);
+		TableIdentifier childid = TableIdentifier.create(catchild);
+		assertEquals(TableIdentifier.create(null, null, "CATMASTER"), masterid, "jdbcreader has not nulled out according to default schema");
+		assertEquals(TableIdentifier.create(null, null, "CATCHILD"), childid, "jdbcreader has not nulled out according to default schema");
+	}
+
+	private List<Table> getTables(Metadata metadata) {
+		return new ArrayList<>(metadata.collectTableMappings());
+	}
+
+	private SchemaSelection createSchemaSelection(String matchSchema, String matchTable) {
+		return new SchemaSelection() {
+			@Override
+			public String getMatchCatalog() {
+				return null;
+			}
+			@Override
+			public String getMatchSchema() {
+				return matchSchema;
+			}
+			@Override
+			public String getMatchTable() {
+				return matchTable;
+			}
+		};
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DocExporterTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DocExporterTest/TestCase.java
new file mode 100644
index 000000000000..bfaacb851649
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/DocExporterTest/TestCase.java
@@ -0,0 +1,197 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.DocExporterTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.internal.export.doc.DocExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.type.descriptor.java.JdbcDateJavaType;
+import org.hibernate.type.descriptor.jdbc.DateJdbcType;
+import org.hibernate.usertype.BaseUserTypeSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
+
+import javax.xml.parsers.SAXParserFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.StringReader;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.function.BiConsumer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Customer.hbm.xml",
+			"Order.hbm.xml",
+			"LineItem.hbm.xml",
+			"Product.hbm.xml",
+			"HelloWorld.hbm.xml",
+			"UnionSubclass.hbm.xml",
+			"DependentValue.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	private boolean ignoreDot;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		DocExporter exporter = new DocExporter();
+		Properties properties = new Properties();
+		properties.put( "jdk5", "true"); // test generics
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		if(File.pathSeparator.equals(";")) { // to work around windows/jvm not seeming to respect executing just "dot"
+			properties.put("dot.executable", System.getProperties().getProperty("dot.executable","dot.exe"));
+		} else {
+			properties.put("dot.executable", System.getProperties().getProperty("dot.executable","dot"));
+		}
+		// Set to ignore dot error if dot exec not specifically set.
+		// done to avoid test failure when no dot available.
+		boolean dotSpecified = System.getProperties().containsKey("dot.executable");
+		ignoreDot =  !dotSpecified;
+		properties.setProperty("dot.ignoreerror", Boolean.toString(ignoreDot));
+		exporter.getProperties().putAll(properties);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		exporter.start();
+	}
+
+	@Test
+	public void testExporter() {
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "index.html") );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "assets/doc-style.css") );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "assets/hibernate_logo.gif") );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "tables/default/summary.html") );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "tables/default/Customer.html") );
+		assertFalse(new File(srcDir, "tables/default/UPerson.html").exists() );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "tables/CROWN/CROWN_USERS.html") );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "entities/org/hibernate/tool/hbm2x/Customer.html") );
+		assertTrue(new File(srcDir, "entities/org/hibernate/tool/hbm2x/UPerson.html").exists() );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "entities/org/hibernate/tool/hbm2x/UUser.html") );
+		if (!ignoreDot) {
+			JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "entities/entitygraph.dot"));
+			JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "entities/entitygraph.png"));
+			JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "tables/tablegraph.dot"));
+			JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "tables/tablegraph.png"));
+		}
+		checkHtml(srcDir);
+	}
+
+	@Test
+	public void testCommentIncluded() {
+		// A unique customer comment!
+		File tableFile = new File(srcDir, "tables/default/Customer.html");
+		JUnitUtil.assertIsNonEmptyFile(tableFile );
+		assertNotNull( FileUtil.findFirstString("A unique customer comment!", tableFile));
+	}
+
+	@Test
+	public void testGenericsRenderedCorrectly() {
+		// A unique customer comment!
+		File tableFile = new File(srcDir, "entities/org/hibernate/tool/hbm2x/Customer.html");
+		JUnitUtil.assertIsNonEmptyFile(tableFile);
+		assertNull(
+				FileUtil.findFirstString("List<", tableFile),
+				"Generics syntax should not occur verbatim in html");
+		assertNotNull(
+				FileUtil.findFirstString("List&lt;", tableFile),
+				"Generics syntax occur verbatim in html");
+	}
+
+	@Test
+	public void testInheritedProperties() {
+		File entityFile = new File(srcDir, "entities/org/hibernate/tool/hbm2x/UUser.html");
+		JUnitUtil.assertIsNonEmptyFile(entityFile);
+		assertNotNull(
+				FileUtil.findFirstString("firstName", entityFile),
+				"Missing inherited property");
+	}
+
+	private void checkHtml(File file) {
+		if (file.isDirectory()) {
+			for (File child : Objects.requireNonNull(file.listFiles())) {
+				checkHtml(child);
+			}
+		} else if (file.getName().endsWith(".html")) {
+			try {
+				SAXParserFactory factory = SAXParserFactory.newInstance();
+				XMLReader parser = factory.newSAXParser().getXMLReader();
+				TestHandler handler = new TestHandler();
+				parser.setErrorHandler(handler);
+				parser.setEntityResolver(new TestResolver());
+				parser.parse(new InputSource(new FileInputStream(file)));
+				assertEquals(0, handler.errors, file + "has errors ");
+				assertEquals(0, handler.warnings, file + "has warnings ");
+			} catch (Exception e) {
+				fail(e.getMessage());
+			}
+		}
+	}
+
+	private static class TestResolver implements EntityResolver {
+		@Override
+		public InputSource resolveEntity(String publicId, String systemId) {
+			return new InputSource(new StringReader(""));
+		}
+	}
+
+	private static class TestHandler implements ErrorHandler {
+		int warnings = 0;
+		int errors = 0;
+		@Override
+		public void warning(SAXParseException exception) {
+			warnings++;
+		}
+		@Override
+		public void error(SAXParseException exception) {
+			errors++;
+		}
+		@Override
+		public void fatalError(SAXParseException exception) {
+			errors++;
+		}
+	}
+
+	public static class DummyDateType extends BaseUserTypeSupport<JdbcDateJavaType> {
+		@SuppressWarnings({"unchecked" })
+		@Override
+		protected void resolve(BiConsumer resolutionConsumer) {
+			resolutionConsumer.accept(new JdbcDateJavaType(), new DateJdbcType());
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/EntityNaming/RevengStrategyEntityNaming.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/EntityNaming/RevengStrategyEntityNaming.java
new file mode 100644
index 000000000000..1366cfbd79e4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/EntityNaming/RevengStrategyEntityNaming.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.EntityNaming;
+
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.DelegatingStrategy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author Daren
+ */
+public class RevengStrategyEntityNaming extends DelegatingStrategy {
+
+private final List<SchemaSelection> schemas;
+
+public RevengStrategyEntityNaming(RevengStrategy delegate) {
+	super(delegate);
+	this.schemas = new ArrayList<>();
+	schemas.add(new SchemaSelection(){
+	@Override
+	public String getMatchCatalog() {
+		/* no h2 pattern matching on catalog*/
+		return "test1";
+	}
+
+	@Override
+	public String getMatchSchema() {
+		return "PUBLIC";
+	}
+
+	@Override
+	public String getMatchTable() {
+		return ".*";
+	}
+	});
+}
+
+public List<SchemaSelection> getSchemaSelections() {
+	return schemas;
+}
+
+	}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/EntityNaming/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/EntityNaming/TestCase.java
new file mode 100644
index 000000000000..1db28e4a68d3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/EntityNaming/TestCase.java
@@ -0,0 +1,113 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.EntityNaming;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategyFactory;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.hibernate.tool.reveng.test.utils.ResourceUtil;
+import org.jboss.logging.Logger;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Test lowercase database identifiers and specified entity package and class name.
+ * Settings: 1. Adjust hibernate.properties to clear hibernate.default_schema and
+ * hibernate.default_catalog. Setting these values fail the classname/tablename matching logic
+ * because of a call to nullifyDefaultCatalogAndSchema(table) in RootClassBinder.bind() before the
+ * TableToClassName logic.
+ * 2. Create a custom RevengStrategy (e.g. RevengStrategyEntityNaming.java) with the required
+ * SchemaSelection settings.
+ *
+ * @author Daren
+ */
+@TestInstance(Lifecycle.PER_CLASS)
+public class TestCase {
+
+	private static final Logger log = Logger.getLogger( TestCase.class );
+
+	@TempDir
+	public File outputDir = new File( "output" );
+
+	static final String packageName = "com.entity";
+
+	Properties hibernateProperties = new Properties();
+
+	@BeforeAll
+	public void setUp() {
+		JdbcUtil.createDatabase( this );
+		try {
+			hibernateProperties.load( JdbcUtil.getAlternateHibernateProperties( this ) );
+			if ( log.isInfoEnabled() ) {
+				log.info( hibernateProperties.toString() );
+			}
+		}
+		catch (IOException ex) {
+			throw new RuntimeException( "Alternate hibernate.properties does not exist!", ex );
+		}
+	}
+
+	@AfterAll
+	public void tearDown() {
+		JdbcUtil.dropDatabase( this );
+	}
+
+	@Test
+	public void testGenerateJava() throws IOException {
+		File[] revengFiles = new File[] {
+				ResourceUtil.resolveResourceFile( this.getClass(), "reveng.xml" )};
+
+		RevengStrategy reveng = RevengStrategyFactory.createReverseEngineeringStrategy(
+				null, revengFiles );
+
+		reveng = new RevengStrategyEntityNaming( reveng );
+
+		//Necessary to set the root strategy.
+		RevengSettings revengSettings
+				= new RevengSettings( reveng ).setDefaultPackageName( packageName )
+				.setDetectManyToMany( true )
+				.setDetectOneToOne( true )
+				.setDetectOptimisticLock( true );
+
+		reveng.setSettings( revengSettings );
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor( reveng, hibernateProperties );
+
+		Exporter exporter = ExporterFactory.createExporter( ExporterType.JAVA );
+		exporter.getProperties().put( ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor );
+		exporter.getProperties().put( ExporterConstants.DESTINATION_FOLDER, outputDir );
+		exporter.getProperties().setProperty( "ejb3", "true" );
+		exporter.start();
+		String packageDir = outputDir + File.separator
+							+ packageName.replace( ".", File.separator );
+		File dummy = new File( packageDir, "Dummy.java" );
+		assertTrue( dummy.exists() );
+		File order = new File( packageDir, "Order.java" );
+		assertTrue( order.exists() );
+		File orderItem = new File( packageDir, "OrderItem.java" );
+		assertTrue( orderItem.exists() );
+		String str = new String( Files.readAllBytes( orderItem.toPath() ) );
+		assertTrue( str.contains( "private Integer oiId;" ) );
+		assertTrue( str.contains( "private Order order;" ) );
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBC/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBC/TestCase.java
new file mode 100644
index 000000000000..45bf057d2fc3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBC/TestCase.java
@@ -0,0 +1,170 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.GenerateFromJDBC;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.internal.export.doc.DocExporter;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.internal.core.strategy.AbstractStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	@TempDir
+	public File outputDir = new File("output");
+
+	private MetadataDescriptor metadataDescriptor = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		AbstractStrategy configurableNamingStrategy = new DefaultStrategy();
+		configurableNamingStrategy.setSettings(new RevengSettings(configurableNamingStrategy).setDefaultPackageName("org.reveng").setCreateCollectionForForeignKey(false));
+		metadataDescriptor = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(configurableNamingStrategy, null);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testGenerateJava() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.start();
+		exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.getProperties().setProperty("ejb3", "true");
+		exporter.start();
+	}
+
+	@Test
+	public void testGenerateMappings() {
+		Exporter exporter = new HbmExporter();
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.start();
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/reveng/Child.hbm.xml"));
+		File file = new File(outputDir, "GeneralHbmSettings.hbm.xml");
+		assertFalse(file.exists(), file + " should not exist");
+		File[] files = new File[2];
+		files[0] = new File(outputDir, "org/reveng/Child.hbm.xml");
+		files[1] = new File(outputDir, "org/reveng/Master.hbm.xml");
+		Metadata metadata = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files, null)
+				.createMetadata();
+		assertNotNull(metadata.getEntityBinding("org.reveng.Child") );
+		assertNotNull(metadata.getEntityBinding("org.reveng.Master") );
+	}
+
+	@Test
+	public void testGenerateCfgXml() throws Exception {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.CFG);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.start();
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "hibernate.cfg.xml"));
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(new File(outputDir, "hibernate.cfg.xml"));
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and it has no arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-configuration/session-factory/mapping")
+				.evaluate(document, XPathConstants.NODESET);
+		Node[] elements = new Node[nodeList.getLength()];
+		for (int i = 0; i < nodeList.getLength(); i++) {
+			elements[i] = nodeList.item(i);
+		}
+		assertEquals(2, elements.length);
+		for (Node element : elements) {
+			assertNotNull(element.getAttributes().getNamedItem("resource"));
+			assertNull(element.getAttributes().getNamedItem("class"));
+		}
+	}
+
+	@Test
+	public void testGenerateAnnotationCfgXml() throws Exception {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.CFG);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.getProperties().setProperty("ejb3", "true");
+		exporter.start();
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "hibernate.cfg.xml"));
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(new File(outputDir, "hibernate.cfg.xml"));
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and it has no arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-configuration/session-factory/mapping")
+				.evaluate(document, XPathConstants.NODESET);
+		Node[] elements = new Node[nodeList.getLength()];
+		for (int i = 0; i < nodeList.getLength(); i++) {
+			elements[i] = nodeList.item(i);
+		}
+		assertEquals(2, elements.length);
+		for (Node element : elements) {
+			assertNull(element.getAttributes().getNamedItem("resource"));
+			assertNotNull(element.getAttributes().getNamedItem("class"));
+		}
+	}
+
+	@Test
+	public void testGenerateDoc() {
+		DocExporter exporter = new DocExporter();
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.start();
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "index.html"));
+	}
+
+	@Test
+	public void testPackageNames() {
+		for (PersistentClass element : metadataDescriptor
+				.createMetadata()
+				.getEntityBindings()) {
+			assertEquals("org.reveng", StringHelper.qualifier(element.getClassName()));
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBCWithJavaKeyword/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBCWithJavaKeyword/TestCase.java
new file mode 100644
index 000000000000..8273f13b6681
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBCWithJavaKeyword/TestCase.java
@@ -0,0 +1,103 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.GenerateFromJDBCWithJavaKeyword;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.AbstractStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.OverrideRepository;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author koen@hibernate.org
+ */
+public class TestCase {
+
+	@TempDir
+	public File outputDir = new File("output");
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testGenerateJava() throws Exception {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, createMetadataDescriptor());
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.start();
+		File myReturn = new File(outputDir, "org/reveng/MyReturn.java");
+		assertTrue(myReturn.exists());
+		File myReturnHistory = new File(outputDir, "org/reveng/MyReturnHistory.java");
+		assertTrue(myReturnHistory.exists());
+		JavaUtil.compile(outputDir);
+		URLClassLoader loader = new URLClassLoader(new URL[] { outputDir.toURI().toURL() } );
+		Class<?> returnClass = loader.loadClass("org.reveng.MyReturn");
+		assertNotNull(returnClass);
+		Class<?> returnHistoryClass = loader.loadClass("org.reveng.MyReturnHistory");
+		assertNotNull(returnHistoryClass);
+		Field returnField = returnHistoryClass.getDeclaredField("return_");
+		assertNotNull(returnField);
+		Method returnSetter = returnHistoryClass.getMethod("setReturn", returnClass);
+		assertNotNull(returnSetter);
+		loader.close();
+	}
+
+	private MetadataDescriptor createMetadataDescriptor() {
+		AbstractStrategy configurableNamingStrategy = new DefaultStrategy();
+		configurableNamingStrategy.setSettings(new RevengSettings(configurableNamingStrategy).setDefaultPackageName("org.reveng").setCreateCollectionForForeignKey(false));
+		OverrideRepository overrideRepository = new OverrideRepository();
+		String REVENG_XML = """
+				<!DOCTYPE hibernate-reverse-engineering                                           \s
+						SYSTEM                                                                  \s
+						'https://hibernate.org/dtd/hibernate-reverse-engineering-3.0.dtd'>      \s
+				<hibernate-reverse-engineering>                                                   \s
+				<table name='MY_RETURN_HISTORY'>                                               \s
+					<foreign-key                                                                \s
+							constraint-name='FK_MY_RETURN_HISTORY_RETURN_ID'                      \s
+							foreign-table='MY_RETURN'>                                            \s
+						<column-ref local-column='MY_RETURN_REF' foreign-column='RETURN_ID'/>   \s
+						<many-to-one property='return'/>                                        \s
+					</foreign-key>                                                              \s
+				</table>                                                                       \s
+				</hibernate-reverse-engineering>                                                  \s""";
+		InputStream inputStream = new ByteArrayInputStream(REVENG_XML.getBytes());
+		overrideRepository.addInputStream(inputStream);
+		RevengStrategy res = overrideRepository
+				.getReverseEngineeringStrategy(configurableNamingStrategy);
+		return MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(res, null);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/TestCase.java
new file mode 100644
index 000000000000..11380b72995c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/TestCase.java
@@ -0,0 +1,201 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.GenericExporterTest;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.version.Version;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Author.hbm.xml",
+			"Article.hbm.xml",
+			"HelloWorld.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private MetadataDescriptor metadataDescriptor = null;
+	private File outputDir = null;
+	private String resourcesLocation = null;
+
+	@BeforeEach
+	public void setUp() {
+		outputDir = new File(outputFolder, "src");
+		assertTrue(outputDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		resourcesLocation = '/' + getClass().getPackage().getName().replace(".", "/") + '/';
+	}
+
+	@Test
+	public void testSingleFileGeneration() {
+		Exporter ge = ExporterFactory.createExporter(ExporterType.GENERIC);
+		ge.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		ge.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		ge.getProperties().put(ExporterConstants.TEMPLATE_NAME, resourcesLocation + "generic-test.ftl");
+		ge.getProperties().put(ExporterConstants.FILE_PATTERN, "generictest.txt");
+		ge.start();
+		JUnitUtil.assertIsNonEmptyFile(new File( outputDir,"artifacts.txt"));
+		JUnitUtil.assertIsNonEmptyFile(new File( outputDir, "templates.txt"));
+		assertNull( FileUtil.findFirstString("$", new File(outputDir, "artifacts.txt")));
+		assertEquals(
+				"File for artifacts in " + Version.versionString(),
+				FileUtil.findFirstString("artifacts", new File( outputDir, "artifacts.txt")));
+	}
+
+	// Not sure about this next test... There doesn't seem to be a syntax failure anywhere
+	@Test
+	public void testFreeMarkerSyntaxFailureExpected() {
+		Exporter ge = ExporterFactory.createExporter(ExporterType.GENERIC);
+		ge.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		ge.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		ge.getProperties().put(ExporterConstants.TEMPLATE_NAME, resourcesLocation + "freemarker.ftl");
+		ge.getProperties().put(ExporterConstants.FILE_PATTERN, "{class-name}.ftltest");
+		ge.start();
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "Author.ftltest" ) );
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "Article.ftltest" ) );
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "BaseHelloWorld.ftltest" ) );
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "HelloUniverse.ftltest" ) );
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "UniversalAddress.ftltest" ) );
+	}
+
+	@Test
+	public void testClassFileGeneration() {
+		Exporter ge = ExporterFactory.createExporter(ExporterType.GENERIC);
+		ge.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		ge.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		ge.getProperties().put(ExporterConstants.TEMPLATE_NAME, resourcesLocation + "generic-class.ftl");
+		ge.getProperties().put(ExporterConstants.FILE_PATTERN, "generic{class-name}.txt");
+		ge.start();
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "genericAuthor.txt" ) );
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "genericArticle.txt" ) );
+	}
+
+	@Test
+	public void testPackageFileGeneration() {
+		Exporter ge = ExporterFactory.createExporter(ExporterType.GENERIC);
+		ge.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		ge.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		ge.getProperties().put(ExporterConstants.TEMPLATE_NAME, resourcesLocation + "generic-class.ftl");
+		ge.getProperties().put(ExporterConstants.FILE_PATTERN, "{package-name}/generic{class-name}.txt");
+		ge.start();
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/hibernate/tool/hbm2x/genericAuthor.txt"));
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/hibernate/tool/hbm2x/genericArticle.txt"));
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/hibernate/tool/hbm2x/genericArticle.txt"));
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "genericUniversalAddress.txt"));
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "genericHelloUniverse.txt"));
+	}
+
+	@Test
+	public void testForEachGeneration() {
+		Exporter ge = ExporterFactory.createExporter(ExporterType.GENERIC);
+		ge.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		ge.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		ge.getProperties().put(ExporterConstants.TEMPLATE_NAME, resourcesLocation + "generic-class.ftl");
+		ge.getProperties().put(ExporterConstants.FILE_PATTERN, "{package-name}/generic{class-name}.txt");
+		ge.getProperties().put(ExporterConstants.FOR_EACH, "entity");
+		ge.start();
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/hibernate/tool/hbm2x/genericAuthor.txt"));
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/hibernate/tool/hbm2x/genericArticle.txt"));
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "org/hibernate/tool/hbm2x/genericArticle.txt"));
+		assertFalse(
+				new File(outputDir, "genericUniversalAddress.txt" ).exists(),
+				"component file should not exist");
+		JUnitUtil.assertIsNonEmptyFile(new File(outputDir, "genericHelloUniverse.txt" ) );
+		try {
+			ge.getProperties().put(ExporterConstants.FOR_EACH, "does, not, exist");
+			ge.start();
+			fail();
+		} catch(Exception e) {
+			//e.printStackTrace();
+			//expected
+		}
+	}
+
+	@Test
+	public void testForEachWithExceptionGeneration() {
+		Exporter ge = ExporterFactory.createExporter(ExporterType.GENERIC);
+		ge.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		ge.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		ge.getProperties().put(ExporterConstants.TEMPLATE_NAME, resourcesLocation + "generic-exception.ftl");
+		ge.getProperties().put(ExporterConstants.FILE_PATTERN, "{package-name}/generic{class-name}.txt");
+		try {
+			ge.getProperties().put(ExporterConstants.FOR_EACH, "entity");
+			ge.start();
+			fail();
+		} catch(RuntimeException e) {
+			assertTrue(e.getMessage().startsWith("Error while processing Entity:"));
+		}
+		try {
+			ge.getProperties().put(ExporterConstants.FOR_EACH, "component");
+			ge.start();
+			fail();
+		} catch(RuntimeException e) {
+			assertTrue(e.getMessage().startsWith("Error while processing Component: UniversalAddress"));
+		}
+		try {
+			ge.getProperties().put(ExporterConstants.FOR_EACH, "configuration");
+			ge.start();
+			fail();
+		} catch(RuntimeException e) {
+			assertTrue(e.getMessage().startsWith("Error while processing Configuration"));
+		}
+	}
+
+	@Test
+	public void testPropertySet() throws IOException {
+		Exporter ge = ExporterFactory.createExporter(ExporterType.GENERIC);
+		Properties p = new Properties();
+		p.setProperty("proptest", "A value");
+		p.setProperty( "refproperty", "proptest=${proptest}" );
+		p.setProperty("hibernatetool.booleanProperty", "true");
+		p.setProperty("hibernatetool.myTool.toolclass", "org.hibernate.tool.reveng.internal.export.java.Cfg2JavaTool");
+		ge.getProperties().putAll(p);
+		ge.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		ge.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		ge.getProperties().put(ExporterConstants.TEMPLATE_NAME, resourcesLocation + "generic-class.ftl");
+		ge.getProperties().put(ExporterConstants.FILE_PATTERN, "{package-name}/generic{class-name}.txt");
+		ge.start();
+		Properties generated = new Properties();
+		try (FileInputStream is = new FileInputStream(new File(outputDir, "org/hibernate/tool/hbm2x/genericArticle.txt"))) {
+			generated.load(is);
+		}
+		assertEquals("true", generated.getProperty("booleanProperty"));
+		assertEquals("true", generated.getProperty("hibernatetool.booleanProperty"));
+		assertNull(generated.getProperty("booleanWasTrue"));
+		assertEquals("value", generated.getProperty("myTool.value"));
+		assertEquals("proptest=A value", generated.getProperty("refproperty"));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/HashcodeEqualsTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/HashcodeEqualsTest/TestCase.java
new file mode 100644
index 000000000000..165aaf165ea7
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/HashcodeEqualsTest/TestCase.java
@@ -0,0 +1,110 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.HashcodeEqualsTest;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.internal.export.common.DefaultArtifactCollector;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"HashEquals.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+	private DefaultArtifactCollector artifactCollector = null;
+	private MetadataDescriptor metadataDescriptor = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "output");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		artifactCollector = new DefaultArtifactCollector();
+		exporter.getProperties().put(ExporterConstants.ARTIFACT_COLLECTOR, artifactCollector);
+		exporter.start();
+	}
+
+	@Test
+	public void testJDK5FailureExpectedOnJDK4() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		exporter.getProperties().setProperty("jdk5", "true");
+		artifactCollector = new DefaultArtifactCollector();
+		exporter.getProperties().put(ExporterConstants.ARTIFACT_COLLECTOR, artifactCollector);
+		exporter.start();
+		testFileExistence();
+		testNoVelocityLeftOvers();
+		testCompilable();
+	}
+
+	@Test
+	public void testFileExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir, "org/hibernate/tool/hbm2x/HashEquals.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir, "org/hibernate/tool/hbm2x/Address.java"));
+		assertEquals(2, artifactCollector.getFileCount("java"));
+	}
+
+	@Test
+	public void testCompilable() {
+		File compiled = new File(outputFolder, "compiled");
+		assertTrue(compiled.mkdir());
+		JavaUtil.compile(srcDir, compiled);
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled, "org/hibernate/tool/hbm2x/HashEquals.class"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled, "org/hibernate/tool/hbm2x/Address.class"));
+	}
+
+	@Test
+	public void testNoVelocityLeftOvers() {
+		assertNull( FileUtil
+				.findFirstString(
+						"$",
+						new File(
+								srcDir,
+								"org/hibernate/tool/hbm2x/HashEquals.java")));
+		assertNull(FileUtil
+				.findFirstString(
+						"$",
+						new File(
+								srcDir,
+								"org/hibernate/tool/hbm2x/Address.java")));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2CfgTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2CfgTest/TestCase.java
new file mode 100644
index 000000000000..7a2eccc6150e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2CfgTest/TestCase.java
@@ -0,0 +1,145 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2CfgTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Environment;
+import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
+import org.hibernate.resource.transaction.spi.TransactionCoordinator;
+import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
+import org.hibernate.resource.transaction.spi.TransactionCoordinatorOwner;
+import org.hibernate.tool.reveng.api.export.*;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	public static class FakeTransactionManagerLookup implements TransactionCoordinatorBuilder {
+		@Override
+		public TransactionCoordinator buildTransactionCoordinator(TransactionCoordinatorOwner owner, Options options) {
+			return null;
+		}
+		@Override
+		public boolean isJta() {
+			return false;
+		}
+		@Override
+		public PhysicalConnectionHandlingMode getDefaultConnectionHandlingMode() {
+			return PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_STATEMENT;
+		}
+	}
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"HelloWorld.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	private Exporter cfgexporter;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		cfgexporter = ExporterFactory.createExporter(ExporterType.CFG);
+		cfgexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		cfgexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		cfgexporter.start();
+	}
+
+	@Test
+	public void testMagicPropertyHandling() {
+	Exporter exporter = ExporterFactory.createExporter(ExporterType.CFG);
+	Properties properties = exporter.getProperties();
+	properties.put( "hibernate.basic", "aValue" );
+	properties.put(AvailableSettings.SESSION_FACTORY_NAME, "shouldNotShowUp");
+	properties.put(AvailableSettings.HBM2DDL_AUTO, "false");
+	properties.put( "hibernate.temp.use_jdbc_metadata_defaults", "false");
+	properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+	properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+	exporter.getProperties().put(
+			ExporterConstants.METADATA_DESCRIPTOR,
+			MetadataDescriptorFactory.createNativeDescriptor(null, null, properties));
+	exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+	exporter.start();
+	File file = new File(srcDir, "hibernate.cfg.xml");
+	assertNull(
+			FileUtil.findFirstString(
+					Environment.SESSION_FACTORY_NAME, file ));
+	assertNotNull(
+			FileUtil.findFirstString( "hibernate.basic\">aValue<", file ));
+	assertNull(
+			FileUtil.findFirstString( Environment.HBM2DDL_AUTO, file ));
+	assertNull(
+			FileUtil.findFirstString("hibernate.temp.use_jdbc_metadata_defaults", file ));
+	exporter = ExporterFactory.createExporter(ExporterType.CFG);
+	properties = exporter.getProperties();
+	properties.put( Environment.HBM2DDL_AUTO, "validator");
+	properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+	properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+	exporter.getProperties().put(
+			ExporterConstants.METADATA_DESCRIPTOR,
+			MetadataDescriptorFactory.createNativeDescriptor(null, null, properties));
+	exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+	exporter.start();
+	assertNotNull(
+			FileUtil.findFirstString( Environment.HBM2DDL_AUTO, file ));
+	exporter = ExporterFactory.createExporter(ExporterType.CFG);
+	properties = exporter.getProperties();
+	properties.put( AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, FakeTransactionManagerLookup.class.getName()); // Hack for seam-gen console configurations
+	properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+	properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+	exporter.getProperties().put(
+			ExporterConstants.METADATA_DESCRIPTOR,
+			MetadataDescriptorFactory.createNativeDescriptor(null, null, properties));
+	exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+	exporter.start();
+	assertNotNull(
+			FileUtil.findFirstString( AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY, file ));
+	}
+
+	@Test
+	public void testFileExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "hibernate.cfg.xml") );
+	}
+
+	@Test
+	public void testArtifactCollection() {
+		ArtifactCollector ac = (ArtifactCollector)cfgexporter.getProperties().get(ExporterConstants.ARTIFACT_COLLECTOR);
+		assertEquals(1, ac.getFileCount("cfg.xml"));
+	}
+
+	@Test
+	public void testNoVelocityLeftOvers() {
+		assertNull(FileUtil.findFirstString("${",new File(srcDir, "hibernate.cfg.xml")));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2DaoTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2DaoTest/TestCase.java
new file mode 100644
index 000000000000..2f9300e0ca7c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2DaoTest/TestCase.java
@@ -0,0 +1,110 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2DaoTest;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Article.hbm.xml",
+			"Author.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter javaExporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		javaExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		javaExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DAO);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		exporter.getProperties().setProperty("ejb3", "false");
+		exporter.getProperties().setProperty("jdk5", "true");
+		exporter.start();
+		javaExporter.start();
+	}
+
+	@Test
+	public void testFileExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir, "org/hibernate/tool/hbm2x/ArticleHome.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir, "org/hibernate/tool/hbm2x/AuthorHome.java"));
+	}
+
+	@Test
+	public void testCompilable() throws IOException {
+		File compiled = new File(outputFolder, "compiled");
+		assertTrue(compiled.mkdir());
+		FileUtil.generateNoopComparator(srcDir);
+		JavaUtil.compile(srcDir, compiled);
+		assertTrue(new File(compiled, "org/hibernate/tool/hbm2x/Article.class").exists());
+		assertTrue(new File(compiled, "org/hibernate/tool/hbm2x/ArticleHome.class").exists());
+		assertTrue(new File(compiled, "org/hibernate/tool/hbm2x/Author.class").exists());
+		assertTrue(new File(compiled, "org/hibernate/tool/hbm2x/AuthorHome.class").exists());
+		assertTrue(new File(compiled, "comparator/NoopComparator.class").exists());
+	}
+
+	@Test
+	public void testNoVelocityLeftOvers() {
+		assertNull(FileUtil
+				.findFirstString(
+						"$",
+						new File(
+								srcDir,
+								"org/hibernate/tool/hbm2x/ArticleHome.java")));
+		assertNull(FileUtil
+				.findFirstString(
+						"$",
+						new File(
+								srcDir,
+								"org/hibernate/tool/hbm2x/AuthorHome.java")));
+	}
+
+	@Test
+	public void testNamedQueries() {
+		assertTrue(FileUtil
+				.findFirstString(
+						"findByNameAndAddress",
+						new File(
+								srcDir,
+								"org/hibernate/tool/hbm2x/AuthorHome.java") )
+				.trim().startsWith("public List" ));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2EJBDaoTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2EJBDaoTest/TestCase.java
new file mode 100755
index 000000000000..2593ef9f63af
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2EJBDaoTest/TestCase.java
@@ -0,0 +1,100 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2EJBDaoTest;
+
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Article.hbm.xml",
+			"Author.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter javaExporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		javaExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		javaExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DAO);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		exporter.getProperties().setProperty("ejb3", "true");
+		exporter.getProperties().setProperty("jdk5", "true");
+		exporter.start();
+		javaExporter.start();
+	}
+
+	@Test
+	public void testFileExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir, "org/hibernate/tool/hbm2x/ArticleHome.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir, "org/hibernate/tool/hbm2x/AuthorHome.java"));
+	}
+
+	@Test
+	public void testCompilable() throws IOException {
+		File compiled = new File(outputFolder, "compiled");
+		assertTrue(compiled.mkdir());
+		FileUtil.generateNoopComparator(srcDir);
+		JavaUtil.compile(srcDir, compiled);
+		assertTrue(new File(compiled, "org/hibernate/tool/hbm2x/Article.class").exists());
+		assertTrue(new File(compiled, "org/hibernate/tool/hbm2x/ArticleHome.class").exists());
+		assertTrue(new File(compiled, "org/hibernate/tool/hbm2x/Author.class").exists());
+		assertTrue(new File(compiled, "org/hibernate/tool/hbm2x/AuthorHome.class").exists());
+		assertTrue(new File(compiled, "comparator/NoopComparator.class").exists());
+	}
+
+	@Test
+	public void testNoVelocityLeftOvers() {
+		assertNull(FileUtil
+				.findFirstString(
+						"$",
+						new File(
+								srcDir,
+								"org/hibernate/tool/hbm2x/ArticleHome.java")));
+	assertNull(FileUtil
+				.findFirstString(
+						"$",
+						new File(
+								srcDir,
+								"org/hibernate/tool/hbm2x/AuthorHome.java")));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2HibernateDAOTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2HibernateDAOTest/TestCase.java
new file mode 100644
index 000000000000..099150bf2f38
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2HibernateDAOTest/TestCase.java
@@ -0,0 +1,112 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2HibernateDAOTest;
+
+import jakarta.persistence.Persistence;
+import org.hibernate.Version;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Article.hbm.xml",
+			"Author.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "output");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter javaExporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		javaExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		javaExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.DAO);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		exporter.getProperties().setProperty("ejb3", "false");
+		exporter.getProperties().setProperty("jdk5", "true");
+		exporter.start();
+		javaExporter.start();
+	}
+
+	@Test
+	public void testFileExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/ArticleHome.java") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/AuthorHome.java") );
+	}
+
+	@Test
+	public void testCompilable() throws IOException {
+		File compiled = new File(outputFolder, "compiled");
+		assertTrue(compiled.mkdir());
+		FileUtil.generateNoopComparator(srcDir);
+		List<String> jars = new ArrayList<>();
+		jars.add( JavaUtil.resolvePathToJarFileFor(Persistence.class)); // for jpa api
+		jars.add(JavaUtil.resolvePathToJarFileFor(Version.class)); // for hibernate core
+		JavaUtil.compile(srcDir, compiled, jars);
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/AuthorHome.class") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/Author.class") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/ArticleHome.class") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/Article.class") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"comparator/NoopComparator.class") );
+	}
+
+	@Test
+	public void testNoVelocityLeftOvers() {
+		assertNull(FileUtil.findFirstString(
+			"$",
+			new File(srcDir, "org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/ArticleHome.java")));
+		assertNull(FileUtil.findFirstString(
+				"$",
+				new File(srcDir, "org/hibernate/tool/hbm2x/Hbm2HibernateDAOTest/AuthorHome.java") ) );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaConstructorTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaConstructorTest/TestCase.java
new file mode 100644
index 000000000000..4fc37298c796
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaConstructorTest/TestCase.java
@@ -0,0 +1,156 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2JavaConstructorTest;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.internal.export.java.Cfg2JavaTool;
+import org.hibernate.tool.reveng.internal.export.java.EntityPOJOClass;
+import org.hibernate.tool.reveng.internal.export.java.POJOClass;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Constructors.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		metadata = metadataDescriptor.createMetadata();
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		exporter.start();
+	}
+
+	@Test
+	public void testCompilable() throws Exception {
+		String constructorUsageResourcePath = "/org/hibernate/tool/hbm2x/Hbm2JavaConstructorTest/ConstructorUsage.java_";
+		File constructorUsageOrigin = new File(Objects.requireNonNull(getClass().getResource(constructorUsageResourcePath)).toURI());
+		File constructorUsageDestination = new File(srcDir, "ConstructorUsage.java");
+		File targetDir = new File(outputFolder, "compilerOutput" );
+		assertTrue(targetDir.mkdir());
+		Files.copy(constructorUsageOrigin.toPath(), constructorUsageDestination.toPath());
+		JavaUtil.compile(srcDir, targetDir);
+		assertTrue(new File(targetDir, "ConstructorUsage.class").exists());
+		assertTrue(new File(targetDir, "Company.class").exists());
+		assertTrue(new File(targetDir, "BigCompany.class").exists());
+		assertTrue(new File(targetDir, "EntityAddress.class").exists());
+	}
+
+	@Test
+	public void testNoVelocityLeftOvers() {
+		assertNull( FileUtil.findFirstString(
+				"$",
+				new File(srcDir, "Company.java" ) ) );
+		assertNull(FileUtil.findFirstString(
+				"$",
+				new File(srcDir,"BigCompany.java" ) ) );
+		assertNull(FileUtil.findFirstString(
+				"$",
+				new File(srcDir,"EntityAddress.java" ) ) );
+	}
+
+	@Test
+	public void testEntityConstructorLogic() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		POJOClass company = c2j.getPOJOClass(metadata.getEntityBinding("Company"));
+		List<Property> all = company.getPropertyClosureForFullConstructor();
+		assertNoDuplicates(all);
+		assertEquals(3, all.size());
+		List<Property> superCons = company.getPropertyClosureForSuperclassFullConstructor();
+		assertEquals(0, superCons.size(), "company is a base class, should not have superclass cons");
+		List<Property> subCons = company.getPropertiesForFullConstructor();
+		assertNoDuplicates(subCons);
+		assertEquals(3, subCons.size());
+		assertNoOverlap(superCons, subCons);
+		POJOClass bigCompany = c2j.getPOJOClass(metadata.getEntityBinding("BigCompany"));
+		List<Property> bigsuperCons = bigCompany.getPropertyClosureForSuperclassFullConstructor();
+		assertNoDuplicates(bigsuperCons);
+		//assertEquals(3, bigsuperCons.size());
+		List<Property> bigsubCons = bigCompany.getPropertiesForFullConstructor();
+		assertEquals(1, bigsubCons.size());
+		assertNoOverlap(bigsuperCons, bigsubCons);
+		List<?> bigall = bigCompany.getPropertyClosureForFullConstructor();
+		assertNoDuplicates(bigall);
+		assertEquals(4, bigall.size());
+		PersistentClass classMapping = metadata.getEntityBinding("Person");
+		POJOClass person = c2j.getPOJOClass(classMapping);
+		List<Property> propertiesForMinimalConstructor = person.getPropertiesForMinimalConstructor();
+		assertEquals(2,propertiesForMinimalConstructor.size());
+		assertFalse(propertiesForMinimalConstructor.contains(classMapping.getIdentifierProperty()));
+		List<Property> propertiesForFullConstructor = person.getPropertiesForFullConstructor();
+		assertEquals(2,propertiesForFullConstructor.size());
+		assertFalse(propertiesForFullConstructor.contains(classMapping.getIdentifierProperty()));
+	}
+
+	@Test
+	public void testMinimal() {
+		POJOClass bp = new EntityPOJOClass(
+				metadata.getEntityBinding("BrandProduct"),
+				new Cfg2JavaTool());
+		List<Property> propertiesForMinimalConstructor = bp.getPropertiesForMinimalConstructor();
+		assertEquals(1,propertiesForMinimalConstructor.size());
+		List<Property> propertiesForFullConstructor = bp.getPropertiesForFullConstructor();
+		assertEquals(2, propertiesForFullConstructor.size());
+	}
+
+	private void assertNoDuplicates(List<?> bigall) {
+		Set<Object> set = new HashSet<>(bigall);
+		assertEquals(set.size(),bigall.size(), "list had duplicates!");
+	}
+
+	private void assertNoOverlap(List<?> first, List<?> second) {
+		Set<Object> set = new HashSet<>();
+		set.addAll(first);
+		set.addAll(second);
+		assertEquals(set.size(),first.size()+second.size());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaDidirectionalIndexedCollectionMappingTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaDidirectionalIndexedCollectionMappingTest/TestCase.java
new file mode 100644
index 000000000000..b1fdf9eeb3a6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaDidirectionalIndexedCollectionMappingTest/TestCase.java
@@ -0,0 +1,56 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2JavaDidirectionalIndexedCollectionMappingTest;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"GenericModel.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File( outputFolder, "resources" );
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir );
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		exporter.start();
+	}
+
+	@Test
+	public void testReflection() throws Exception {
+		assertTrue(new File(srcDir, "GenericObject.java").exists());
+		assertTrue(new File(srcDir, "GenericValue.java").exists());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/TestCase.java
new file mode 100644
index 000000000000..882a166a2d5a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/TestCase.java
@@ -0,0 +1,230 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2JavaEjb3Test;
+
+import jakarta.persistence.Persistence;
+import org.hibernate.Version;
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.internal.export.java.Cfg2JavaTool;
+import org.hibernate.tool.reveng.internal.export.java.EntityPOJOClass;
+import org.hibernate.tool.reveng.internal.export.java.POJOClass;
+import org.hibernate.tool.reveng.internal.util.AnnotationBuilder;
+import org.hibernate.tool.reveng.internal.util.IteratorTransformer;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Author.hbm.xml",
+			"Article.hbm.xml",
+			"Train.hbm.xml",
+			"Passenger.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		metadata = metadataDescriptor.createMetadata();
+		FileUtil.generateNoopComparator(srcDir);
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		exporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[0]);
+		exporter.getProperties().setProperty("ejb3", "true");
+		exporter.getProperties().setProperty("jdk5", "true");
+		exporter.start();
+	}
+
+	@Test
+	public void testFileExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Author.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Train.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Passenger.java") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/TransportationPk.java") );
+	}
+
+	@Test
+	public void testBasicComponent() {
+		assertEquals(
+				"@Embeddable",
+				FileUtil.findFirstString(
+						"@Embeddable",
+						new File(
+								srcDir,
+								"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/TransportationPk.java")));
+	}
+
+	@Test
+	public void testCompile() {
+		File compiled = new File(outputFolder, "compiled");
+		assertTrue(compiled.mkdir());
+		List<String> jars = new ArrayList<>();
+		jars.add( JavaUtil.resolvePathToJarFileFor(Persistence.class)); // for jpa api
+		jars.add(JavaUtil.resolvePathToJarFileFor(Version.class)); // for hibernate core
+		JavaUtil.compile(srcDir, compiled, jars);
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"comparator/NoopComparator.class") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.class") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Author.class") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Passenger.class") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Train.class") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				compiled,
+				"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/TransportationPk.class") );
+	}
+
+	@Test
+	public void testEqualsHashCode() {
+		PersistentClass classMapping = metadata.getEntityBinding("org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test.Passenger");
+		POJOClass clazz = new Cfg2JavaTool().getPOJOClass(classMapping);
+		assertFalse(clazz.needsEqualsHashCode());
+		classMapping = metadata.getEntityBinding("org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test.Article");
+		clazz = new Cfg2JavaTool().getPOJOClass(classMapping);
+		assertTrue(clazz.needsEqualsHashCode());
+	}
+
+	@Test
+	public void testAnnotationColumnDefaults() {
+		PersistentClass classMapping = metadata.getEntityBinding("org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test.Article");
+		Cfg2JavaTool cfg2java = new Cfg2JavaTool();
+		POJOClass clazz = cfg2java.getPOJOClass(classMapping);
+		Property p = classMapping.getProperty("content");
+		String string = clazz.generateAnnColumnAnnotation( p );
+		assertNotNull(string);
+		assertEquals(-1, string.indexOf("unique="));
+		assertTrue(string.contains("nullable="));
+		assertEquals(-1, string.indexOf("insertable="));
+		assertEquals(-1, string.indexOf("updatable="));
+		assertTrue(string.indexOf("length=10000")>0);
+		p = classMapping.getProperty("name");
+		string = clazz.generateAnnColumnAnnotation( p );
+		assertNotNull(string);
+		assertEquals(-1, string.indexOf("unique="));
+		assertTrue(string.contains("nullable="));
+		assertEquals(-1, string.indexOf("insertable="));
+		assertTrue(string.indexOf("updatable=false")>0);
+		assertTrue(string.indexOf("length=100")>0);
+		classMapping = metadata.getEntityBinding( "org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test.Train" );
+		clazz = cfg2java.getPOJOClass(classMapping);
+		p = classMapping.getProperty( "name" );
+		string = clazz.generateAnnColumnAnnotation( p );
+		assertNotNull(string);
+		assertTrue(string.indexOf("unique=true")>0);
+		assertTrue(string.contains("nullable="));
+		assertEquals(-1, string.indexOf("insertable="));
+		assertEquals(-1,string.indexOf("updatable="));
+		assertEquals(-1, string.indexOf("length="));
+	}
+
+	@Test
+	public void testEmptyCascade() {
+		PersistentClass classMapping = metadata.getEntityBinding("org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test.Article");
+		Cfg2JavaTool cfg2java = new Cfg2JavaTool();
+		EntityPOJOClass clazz = (EntityPOJOClass) cfg2java.getPOJOClass(classMapping);
+		Property property = classMapping.getProperty( "author" );
+		assertEquals(0, clazz.getCascadeTypes( property ).length);
+		assertNull(
+				FileUtil.findFirstString(
+						"cascade={}",
+						new File(
+								srcDir,
+								"org/hibernate/tool/hbm2x/Hbm2JavaEjb3Test/Article.java") ));
+	}
+
+	@Test
+	public void testAnnotationBuilder() {
+		AnnotationBuilder builder =  AnnotationBuilder.createAnnotation("SingleCleared").resetAnnotation( "Single" );
+		assertEquals("@Single", builder.getResult());
+		builder = AnnotationBuilder.createAnnotation("jakarta.persistence.OneToMany")
+					.addAttribute("willbecleared", (String)null)
+					.resetAnnotation("jakarta.persistence.OneToMany")
+					.addAttribute("cascade", new String[] { "val1", "val2"})
+					.addAttribute("fetch", "singleValue");
+		assertEquals("@jakarta.persistence.OneToMany(cascade={val1, val2}, fetch=singleValue)", builder.getResult());
+		builder = AnnotationBuilder.createAnnotation("jakarta.persistence.OneToMany");
+		builder.addAttribute("cascade", (String[])null);
+		builder.addAttribute("fetch", (String)null);
+		assertEquals("@jakarta.persistence.OneToMany", builder.getResult());
+		builder = AnnotationBuilder.createAnnotation("abc");
+		ArrayList<Object> list = new ArrayList<>();
+		list.add(42);
+		list.add("xxx");
+		builder.addQuotedAttributes( "it", list.iterator() );
+		assertEquals("@abc(it={\"42\", \"xxx\"})", builder.getResult());
+		List<String> columns = new ArrayList<>();
+		columns.add("first");
+		columns.add("second");
+		AnnotationBuilder constraint = AnnotationBuilder.createAnnotation( "UniqueConstraint" );
+		constraint.addQuotedAttributes( "columnNames", new IteratorTransformer<>(columns.iterator()) {
+			public String transform(String object) {
+				return object;
+			}
+		});
+		constraint.addAttribute( "single", "value" );
+		String attribute = constraint.getAttributeAsString("columnNames");
+		assertEquals("{\"first\", \"second\"}", attribute);
+		assertEquals("value", constraint.getAttributeAsString( "single" ));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEqualsTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEqualsTest/TestCase.java
new file mode 100644
index 000000000000..de1274b788aa
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEqualsTest/TestCase.java
@@ -0,0 +1,189 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2JavaEqualsTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	private static final String TEST_ENTITY_HBM_XML =
+			"<hibernate-mapping package='org.hibernate.tool.hbm2x.Hbm2JavaEquals'>"+
+			"  <class name='UnProxiedTestEntity'>                                 "+
+			"    <id name='id' type='int'>                                        "+
+			"      <meta attribute='use-in-equals'>true</meta>                    "+
+			"    </id>                                                            "+
+			"  </class>                                                           "+
+			"  <class name='ProxiedTestEntity' proxy='TestEntityProxy'>           "+
+			"    <id name='id' type='int'>                                        "+
+			"      <meta attribute='use-in-equals'>true</meta>                    "+
+			"    </id>                                                            "+
+			"  </class>                                                           "+
+			"</hibernate-mapping>                                                 ";
+
+	private static final String TEST_ENTITY_PROXY_JAVA =
+			"package org.hibernate.tool.hbm2x.Hbm2JavaEquals;"+ System.lineSeparator() +
+			"interface TestEntityProxy {                     "+ System.lineSeparator() +
+			"  int getId();                                  "+ System.lineSeparator() +
+			"}                                               ";
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		// create output folder
+		srcDir = new File(outputFolder, "output");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		// export class ProxiedTestEntity.java and UnProxiedTestEntity
+		File hbmXml = new File(resourcesDir, "testEntity.hbm.xml");
+		FileWriter fileWriter = new FileWriter(hbmXml);
+		fileWriter.write(TEST_ENTITY_HBM_XML);
+		fileWriter.close();
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, new File[] { hbmXml }, properties);
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		exporter.start();
+		// copy interface EntityProxy.java
+		File file = new File(srcDir, "org/hibernate/tool/hbm2x/Hbm2JavaEquals/TestEntityProxy.java");
+		FileWriter writer = new FileWriter(file);
+		writer.write(TEST_ENTITY_PROXY_JAVA);
+		writer.close();
+		// compile the source files
+		JavaUtil.compile(srcDir);
+	}
+
+	@Test
+	public void testEqualsWithoutProxy() throws Exception {
+		// load the entity class and lookup the setId method
+		URL[] urls = new URL[] { srcDir.toURI().toURL() };
+		ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+		URLClassLoader ucl = new URLClassLoader(urls, oldLoader );
+		Class<?> entityClass = ucl.loadClass("org.hibernate.tool.hbm2x.Hbm2JavaEquals.UnProxiedTestEntity");
+		Constructor<?> entityClassConstructor = entityClass.getConstructor();
+		Method setId = entityClass.getMethod("setId", int.class);
+
+		// create a first entity and check the 'normal' behavior:
+		// - 'true' when comparing against itself
+		// - 'false' when comparing against null
+		// - 'false' when comparing against an object of a different class
+		Object firstEntity = entityClassConstructor.newInstance();
+		setId.invoke(firstEntity, Integer.MAX_VALUE);
+		assertEquals(firstEntity, firstEntity);
+		assertNotNull(firstEntity);
+		assertNotEquals(new Object(), firstEntity);
+
+		// create a second entity and check the 'normal behavior
+		// - 'true' if the id property is the same
+		// - 'false' if the id property is different
+		Object secondEntity = entityClassConstructor.newInstance();
+		setId.invoke(secondEntity, Integer.MAX_VALUE);
+		assertEquals(firstEntity, secondEntity);
+		assertEquals(secondEntity, firstEntity);
+		setId.invoke(secondEntity, Integer.MIN_VALUE);
+		assertNotEquals(firstEntity, secondEntity);
+		assertNotEquals(secondEntity, firstEntity);
+
+		ucl.close();
+	}
+
+	@Test
+	public void testEqualsWithProxy() throws Exception {
+
+		// load the entity and proxy classes, lookup the setId method and create a proxy object
+		URL[] urls = new URL[] { srcDir.toURI().toURL() };
+		ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+		URLClassLoader ucl = new URLClassLoader(urls, oldLoader );
+		Class<?> entityClass = ucl.loadClass("org.hibernate.tool.hbm2x.Hbm2JavaEquals.ProxiedTestEntity");
+		Class<?> entityProxyInterface = ucl.loadClass("org.hibernate.tool.hbm2x.Hbm2JavaEquals.TestEntityProxy");
+		Constructor<?> entityClassConstructor = entityClass.getConstructor();
+		Method setId = entityClass.getMethod("setId", int.class);
+		TestEntityProxyInvocationHandler handler = new TestEntityProxyInvocationHandler();
+		Object testEntityProxy = Proxy.newProxyInstance(
+				ucl,
+				new Class[] { entityProxyInterface },
+				handler);
+
+		// create a first proxied entity and check the 'normal' behavior:
+		// - 'true' when comparing against itself
+		// - 'false' when comparing against null
+		// - 'false' when comparing against an object of a different class (that is not the proxy class)
+		Object firstEntity = entityClassConstructor.newInstance();
+		setId.invoke(firstEntity, Integer.MAX_VALUE);
+		assertEquals(firstEntity, firstEntity);
+		assertNotNull(firstEntity);
+		assertNotEquals(new Object(), firstEntity);
+
+		// create a second proxied entity and check the 'normal behavior
+		// - 'true' if the id property is the same
+		// - 'false' if the id property is different
+		Object secondEntity = entityClassConstructor.newInstance();
+		setId.invoke(secondEntity, Integer.MAX_VALUE);
+		assertEquals(firstEntity, secondEntity);
+		assertEquals(secondEntity, firstEntity);
+		setId.invoke(secondEntity, Integer.MIN_VALUE);
+		assertNotEquals(firstEntity, secondEntity);
+		assertNotEquals(secondEntity, firstEntity);
+
+		// compare both proxied entities with the proxy
+		handler.id = Integer.MAX_VALUE;
+		assertEquals(firstEntity, testEntityProxy);
+		assertNotEquals(secondEntity, testEntityProxy);
+		handler.id = Integer.MIN_VALUE;
+		assertNotEquals(firstEntity, testEntityProxy);
+		assertEquals(secondEntity, testEntityProxy);
+
+		ucl.close();
+	}
+
+	private static class TestEntityProxyInvocationHandler implements InvocationHandler {
+		public int id = 0;
+		@Override public Object invoke(
+				Object proxy,
+				Method method,
+				Object[] args) {
+			if ("getId".equals(method.getName())) {
+				return id;
+			}
+			return null;
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/TestCase.java
new file mode 100644
index 000000000000..82ad384ff659
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/TestCase.java
@@ -0,0 +1,101 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2JavaInitializationTest;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.tool.reveng.internal.export.java.Cfg2JavaTool;
+import org.hibernate.tool.reveng.internal.export.java.ImportContextImpl;
+import org.hibernate.tool.reveng.internal.export.java.POJOClass;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Author.hbm.xml",
+			"Article.hbm.xml",
+			"Train.hbm.xml",
+			"Passenger.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		metadata = HibernateUtil
+				.initializeMetadataDescriptor(
+						this,
+						HBM_XML_FILES,
+						outputFolder)
+				.createMetadata();
+	}
+
+	@Test
+	public void testFieldInitializationAndTypeNames() {
+		PersistentClass classMapping = metadata.getEntityBinding("org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest.Article");
+		Cfg2JavaTool cfg2java = new Cfg2JavaTool();
+		POJOClass clazz = cfg2java.getPOJOClass(classMapping);
+		Property p = classMapping.getProperty("AMap");
+		assertEquals("java.util.Map<java.lang.String,org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest.Article>",cfg2java.getJavaTypeName(p, true), "all types should be fully qualified when no importcontext");
+		assertEquals("Map<String,Article>",cfg2java.getJavaTypeName(p, true, clazz));
+		assertEquals("new HashMap<String,Article>(0)", clazz.getFieldInitialization(p, true));
+		assertEquals("new HashMap(0)", clazz.getFieldInitialization(p, false));
+		p = classMapping.getProperty("aList");
+		assertEquals("List<Article>",cfg2java.getJavaTypeName(p, true, clazz), "lists should not have the index visible in the declaration");
+		assertEquals("java.util.List<org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest.Article>",cfg2java.getJavaTypeName(p, true), "all types should be fully qualified when no importcontext");
+		assertEquals("new ArrayList<Article>(0)", clazz.getFieldInitialization(p, true));
+		assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false));
+		p = classMapping.getProperty("content");
+		assertEquals("\"what can I say\"",clazz.getFieldInitialization(p, false));
+		p = classMapping.getProperty("bagarticles");
+		assertEquals("java.util.List", cfg2java.getJavaTypeName( p, false ), "Should be a list via property-type");
+		assertEquals("java.util.List<org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest.Article>", cfg2java.getJavaTypeName( p, true ), "Should be a generic's list when generics=true");
+		assertEquals("List<Article>",cfg2java.getJavaTypeName(p, true, clazz));
+		assertEquals("new ArrayList<Article>(0)", clazz.getFieldInitialization(p, true));
+		assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false));
+		p = classMapping.getProperty("bagstrings");
+		assertEquals("java.util.Collection", cfg2java.getJavaTypeName( p, false ), "Bag's are just a collection");
+		assertEquals("java.util.Collection<java.lang.String>", cfg2java.getJavaTypeName( p, true ), "Should be a generic's collection when generics=true");
+		assertEquals("Collection<String>",cfg2java.getJavaTypeName(p, true, clazz));
+		assertEquals("new ArrayList<String>(0)", clazz.getFieldInitialization(p, true));
+		assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false));
+		p = classMapping.getProperty("bagstrings");
+		assertEquals("new ArrayList(0)", clazz.getFieldInitialization(p, false));
+		p = classMapping.getProperty("naturalSortedArticlesMap");
+		assertEquals("java.util.SortedMap", cfg2java.getJavaTypeName( p, false));
+		assertEquals("SortedMap<String,Article>", cfg2java.getJavaTypeName( p, true, new ImportContextImpl("") ));
+		assertEquals("new TreeMap<String,Article>()", clazz.getFieldInitialization(p, true));
+		assertEquals("new TreeMap()", clazz.getFieldInitialization(p, false));
+		p = classMapping.getProperty("sortedArticlesMap");
+		assertEquals("java.util.SortedMap", cfg2java.getJavaTypeName( p, false));
+		assertEquals("SortedMap<String,Article>", cfg2java.getJavaTypeName( p, true, new ImportContextImpl("") ));
+		assertFalse(clazz.generateImports().contains("import comparator.NoopComparator;"));
+		assertEquals("new TreeMap(new NoopComparator())", clazz.getFieldInitialization(p, false));
+		assertTrue(clazz.generateImports().contains("import comparator.NoopComparator;"));
+		assertEquals("new TreeMap<String,Article>(new NoopComparator())", clazz.getFieldInitialization(p, true));
+		p = classMapping.getProperty("sortedArticlesSet");
+		assertEquals("java.util.SortedSet", cfg2java.getJavaTypeName( p, false));
+		assertEquals("SortedSet<Article>", cfg2java.getJavaTypeName( p, true, new ImportContextImpl("") ));
+		assertEquals("new TreeSet<Article>(new NoopComparator())", clazz.getFieldInitialization(p, true));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/DummyDateType.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/DummyDateType.java
new file mode 100644
index 000000000000..3db1592f2d75
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/DummyDateType.java
@@ -0,0 +1,61 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest;
+
+import org.hibernate.HibernateException;
+import org.hibernate.usertype.UserType;
+
+import java.io.Serializable;
+import java.sql.Date;
+import java.sql.Types;
+
+public class DummyDateType implements UserType<Date> {
+
+	public int[] sqlTypes() {
+		return new int[]{Types.DATE};
+	}
+
+	public Class<Date> returnedClass() {
+		return Date.class;
+	}
+
+	public boolean equals(Date x, Date y) throws HibernateException {
+		return false;
+	}
+
+	public int hashCode(Date x) throws HibernateException {
+		return 0;
+	}
+
+	public Date deepCopy(Date value) throws HibernateException {
+		return null;
+	}
+
+	public boolean isMutable() {
+		return false;
+	}
+
+	public Serializable disassemble(Date value) throws HibernateException {
+		return null;
+	}
+
+	public Date assemble(Serializable cached, Object owner)
+			throws HibernateException {
+		return null;
+	}
+
+	public Date replace(
+			Date original,
+			Date target,
+			Object owner) throws HibernateException {
+		return null;
+	}
+
+	@Override
+	public int getSqlType() {
+		return 0;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/TestCase.java
new file mode 100644
index 000000000000..8500f71661b5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/TestCase.java
@@ -0,0 +1,503 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.SingleTableSubclass;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.internal.export.common.DefaultArtifactCollector;
+import org.hibernate.tool.reveng.internal.export.java.*;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.lang.reflect.Proxy;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Customer.hbm.xml",
+			"Order.hbm.xml",
+			"LineItem.hbm.xml",
+			"Product.hbm.xml",
+			"HelloWorld.hbm.xml",
+			"Train.hbm.xml",
+			"Passenger.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private Metadata metadata = null;
+	private MetadataDescriptor metadataDescriptor = null;
+	private File srcDir = null;
+	private DefaultArtifactCollector artifactCollector = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		metadata = metadataDescriptor.createMetadata();
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		artifactCollector = new DefaultArtifactCollector();
+		exporter.getProperties().put(ExporterConstants.ARTIFACT_COLLECTOR, artifactCollector);
+		exporter.start();
+	}
+
+	@Test
+	public void testFileExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Customer.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/LineItem.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Order.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Train.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Passenger.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Product.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"generated/BaseHelloWorld.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"HelloUniverse.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/FatherComponent.java"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/ChildComponent.java"));
+		assertEquals(15, artifactCollector.getFileCount("java"));
+	}
+
+	// TODO Re-enable this test: HBX-1248
+	@Disabled
+	@Test
+	public void testCompilable() throws Exception {
+		String helloWorldResourcePath = "/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/HelloWorld.java_";
+		File helloWorldOrigin = new File(Objects.requireNonNull(getClass().getResource(helloWorldResourcePath)).toURI());
+		File helloWorldDestination = new File(srcDir, "HelloWorld.java");
+		File targetDir = new File(outputFolder, "compilerOutput" );
+		assertTrue(targetDir.mkdir());
+		Files.copy(helloWorldOrigin.toPath(), helloWorldDestination.toPath());
+		JavaUtil.compile(srcDir, targetDir);
+		assertTrue(new File(targetDir, "HelloWorld.class").exists());
+	}
+
+	@Test
+	public void testNoFreeMarkerLeftOvers() {
+		assertNull( FileUtil.findFirstString(
+				"$",
+				new File(
+						srcDir,
+						"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Customer.java")));
+		assertNull(FileUtil.findFirstString(
+				"$",
+				new File(
+						srcDir,
+						"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/LineItem.java")));
+		assertNull(FileUtil.findFirstString(
+				"$",
+				new File(
+						srcDir,
+						"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Order.java")));
+		assertNull(FileUtil.findFirstString(
+				"$",
+				new File(
+						srcDir,
+						"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Product.java")));
+		assertNull(FileUtil.findFirstString(
+				"$",
+				new File(
+						srcDir,
+						"org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Address.java")));
+	}
+
+	@Test
+	public void testPackageName() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		PersistentClass classMapping = metadata.getEntityBinding("org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Order");
+		POJOClass pc = c2j.getPOJOClass(classMapping);
+		assertEquals( "org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest", pc.getPackageName() );
+		assertEquals( "package org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest;", pc.getPackageDeclaration() );
+		assertEquals(
+				"package generated;",
+				c2j.getPOJOClass(metadata.getEntityBinding("HelloWorld"))
+					.getPackageDeclaration(),
+				"did not honor generated-class");
+	}
+
+	@Test
+	public void testFieldNotThere() {
+		assertNull(FileUtil.findFirstString(
+				"notgenerated",
+				new File(
+						srcDir,
+						"HelloUniverse.java")));
+	}
+
+	@Test
+	public void testJavaDoc() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		assertEquals( " * test", c2j.toJavaDoc( "test", 0 ) );
+		assertEquals( "   * test", c2j.toJavaDoc( "test", 2 ) );
+		assertEquals( "   * test\n   * me", c2j.toJavaDoc( "test\nme", 2 ) );
+		PersistentClass local = metadata.getEntityBinding( "HelloWorld" );
+		POJOClass pc = c2j.getPOJOClass(local);
+		assertEquals( " * Hey there", pc.getClassJavaDoc( "fallback", 0 ) );
+		assertEquals(
+				" * Test Field Description",
+				pc.getFieldJavaDoc(local.getIdentifierProperty(), 0 ) );
+	}
+
+	@Test
+	public void testExtraCode() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		assertFalse(c2j.hasMetaAttribute(
+				metadata.getEntityBinding("HelloWorld" ), "class-code" ) );
+		PersistentClass classMapping = metadata.getEntityBinding(
+				"org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Order" );
+		assertEquals(
+				"// extra code line 1\n// extra code line 2\n{ Collator.getInstance(); }",
+				c2j.getPOJOClass(classMapping).getExtraClassCode() );
+	}
+
+	@Test
+	public void testScope() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		PersistentClass pc = metadata.getEntityBinding(
+				"org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Order" );
+		assertEquals( "public strictfp", c2j.getClassModifiers( pc ) );
+		assertEquals("public", c2j.getClassModifiers(metadata.getEntityBinding( "HelloWorld" ) ) );
+	}
+
+	@Test
+	public void testDeclarationType() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		PersistentClass pc = metadata.getEntityBinding(
+				"org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Order" );
+		assertEquals( "class", c2j.getPOJOClass(pc).getDeclarationType() );
+		assertEquals( "interface", c2j.getPOJOClass(metadata.getEntityBinding( "HelloWorld" ) ).getDeclarationType() );
+	}
+
+	@Test
+	public void testTypeName() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		PersistentClass pc = metadata.getEntityBinding(
+				"org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Order" );
+		Property property = pc.getProperty( "lineItems" );
+		assertEquals( "java.util.Collection", c2j.getJavaTypeName( property, false ) );
+	}
+
+	@Test
+	public void testUseRawTypeNullability() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool( /*true*/ );
+		PersistentClass pc = metadata.getEntityBinding(
+				"org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Product" );
+		Property property = pc.getProperty( "numberAvailable" );
+		assertFalse( property.getValue().isNullable() );
+		assertEquals(
+				"int",
+				c2j.getJavaTypeName( property, false ),
+				"typename should be used when rawtypemode");
+		property = pc.getProperty( "minStock" );
+		assertTrue( property.getValue().isNullable() );
+		assertEquals(
+				"long",
+				c2j.getJavaTypeName( property, false ),
+				"typename should be used when rawtypemode");
+		property = pc.getProperty( "otherStock" );
+		assertFalse( property.getValue().isNullable() );
+		assertEquals(
+				"java.lang.Integer",
+				c2j.getJavaTypeName( property, false ),
+				"type should still be overridden by meta attribute");
+		property = pc.getIdentifierProperty();
+		assertFalse( property.getValue().isNullable() );
+		assertEquals(
+				"long",
+				c2j.getJavaTypeName( property, false ),
+				"wrappers should be used by default");
+		pc = metadata.getEntityBinding( "org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Customer" );
+		Component identifier = (Component) pc.getIdentifier();
+		assertFalse(identifier.getProperties().iterator().next()
+				.getValue().isNullable() );
+		assertEquals( "long", c2j.getJavaTypeName( property, false ) );
+	}
+
+	@Test
+	public void testExtendsImplements() {
+		MetadataBuildingContext mdbc = createMetadataBuildingContext();
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		PersistentClass pc = metadata.getEntityBinding(
+				"org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Order" );
+		assertNull(c2j.getPOJOClass(pc).getExtends());
+		POJOClass entityPOJOClass = c2j.getPOJOClass(metadata.getEntityBinding("HelloWorld" ));
+		assertEquals( "Comparable", entityPOJOClass.getExtends() );
+		assertNull(
+				entityPOJOClass.getImplements(),
+				"should be interface which cannot have implements");
+		assertEquals(
+				"",
+				entityPOJOClass.getImplementsDeclaration(),
+				"should be interface which cannot have implements");
+		PersistentClass base = new RootClass(mdbc);
+		base.setClassName( "Base" );
+		PersistentClass sub = new SingleTableSubclass( base, mdbc );
+		sub.setClassName( "Sub" );
+		assertNull(c2j.getPOJOClass(base).getExtends());
+		assertEquals( "Base", c2j.getPOJOClass(sub).getExtends() );
+		Map<String, MetaAttribute> m = new HashMap<>();
+		MetaAttribute attribute = new MetaAttribute( "extends" );
+		attribute.addValue( "x" );
+		attribute.addValue( "y" );
+		m.put( attribute.getName(), attribute );
+		attribute = new MetaAttribute( "interface" );
+		attribute.addValue( "true" );
+		m.put( attribute.getName(), attribute );
+		sub.setMetaAttributes( m );
+		assertEquals( "Base,x,y", c2j.getPOJOClass(sub).getExtends() );
+		m = new HashMap<>();
+		attribute = new MetaAttribute( "implements" );
+		attribute.addValue( "intf" );
+		m.put( attribute.getName(), attribute );
+		base.setMetaAttributes( m );
+		assertEquals( "intf,java.io.Serializable", c2j.getPOJOClass(base).getImplements() );
+	}
+
+	@Test
+	public void testDeclarationName() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		PersistentClass pc = metadata.getEntityBinding(
+				"org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Order" );
+		PersistentClass hw = metadata.getEntityBinding( "HelloWorld" );
+		POJOClass epc = c2j.getPOJOClass(pc);
+		assertEquals( "Order", epc.getDeclarationName() );
+		epc = c2j.getPOJOClass(hw);
+		assertEquals( "BaseHelloWorld", epc.getDeclarationName() );
+	}
+
+	@Test
+	public void testAsArguments() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		PersistentClass pc = metadata.getEntityBinding(
+				"org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Order" );
+		assertEquals(
+				"java.util.Calendar orderDate, java.math.BigDecimal total, org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Customer customer, java.util.Collection lineItems",
+				c2j.asParameterList(
+						pc.getProperties().iterator(), false, new NoopImportContext() ));
+		assertEquals(
+				"orderDate, total, customer, lineItems",
+				c2j.asArgumentList( pc.getProperties().iterator() ) );
+	}
+
+	//TODO Reenable this test and make it pass (See HBX-2884)
+	@Disabled
+	@Test
+	public void testPropertiesForFullConstructor() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		PersistentClass pc = metadata.getEntityBinding( "HelloWorld" );
+		POJOClass pjc = c2j.getPOJOClass(pc);
+		List<Property> wl = pjc.getPropertiesForFullConstructor();
+		assertEquals( 3, wl.size() );
+		PersistentClass uni = metadata.getEntityBinding( "HelloUniverse" );
+		pjc = c2j.getPOJOClass(uni);
+		List<Property> local = pjc.getPropertyClosureForFullConstructor();
+		assertEquals( 6, local.size() );
+		for(int i=0;i<wl.size();i++) {
+			assertEquals(local.get( i ), wl.get( i ),  i + " position should be the same" );
+		}
+	}
+
+	@Test
+	public void testToString() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		PersistentClass pc = metadata.getEntityBinding( "HelloWorld" );
+		POJOClass pjc = c2j.getPOJOClass(pc);
+		assertTrue( pjc.needsToString() );
+		Iterator<Property> iter = pjc.getToStringPropertiesIterator();
+		// in HelloWorld.hbm.xml there're 2 Properties for toString
+		assertEquals( "id", (iter.next() ).getName() );
+		assertEquals( "hello", (iter.next() ).getName() );
+		assertFalse( iter.hasNext() );
+		pc = metadata.getEntityBinding( "org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Order" );
+		pjc = c2j.getPOJOClass(pc);
+		assertFalse( pjc.needsToString() );
+		pc = metadata.getEntityBinding( "org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Customer" );
+		Component c = (Component) pc.getProperty( "addressComponent" )
+				.getValue();
+		POJOClass cc = c2j.getPOJOClass(c);
+		assertTrue( cc.needsToString() );
+		iter = cc.getToStringPropertiesIterator();
+		// in Customer.hbm.xml there's 1 Property for toString
+		assertEquals( "city", (iter.next() ).getName() );
+		assertFalse( iter.hasNext() );
+	}
+
+	@Test
+	public void testImportOfSameName() {
+		ImportContext ic = new ImportContextImpl("foobar");
+		assertEquals("CascadeType", ic.importType("jakarta.persistence.CascadeType"));
+		assertEquals("org.hibernate.annotations.CascadeType", ic.importType("org.hibernate.annotations.CascadeType"));
+		assertFalse(ic.generateImports().contains("hibernate"), "The hibernate annotation should not be imported to avoid name clashes");
+	}
+
+	@Test
+	public void testImporter() {
+		ImportContext context = new ImportContextImpl( "org.hibernate" );
+		assertEquals("byte", context.importType("byte"));
+		assertEquals("Session", context.importType("org.hibernate.Session"));
+		assertEquals("Long", context.importType("java.lang.Long"));
+		assertEquals("org.test.Session", context.importType("org.test.Session"));
+		assertEquals("Entity", context.importType("org.test.Entity"));
+		assertEquals("org.other.test.Entity", context.importType("org.other.test.Entity"));
+		assertEquals("Collection<org.marvel.Hulk>", context.importType("java.util.Collection<org.marvel.Hulk>"));
+		assertEquals("Map<java.lang.String, org.marvel.Hulk>", context.importType("java.util.Map<java.lang.String, org.marvel.Hulk>"));
+		assertEquals("Collection<org.marvel.Hulk>[]", context.importType("java.util.Collection<org.marvel.Hulk>[]"));
+		assertEquals("Map<java.lang.String, org.marvel.Hulk>", context.importType("java.util.Map<java.lang.String, org.marvel.Hulk>"));
+		String string = context.generateImports();
+		assertFalse(string.contains("import org.hibernate.Session;"));
+		assertTrue(string.indexOf("import org.test.Entity;")>0);
+		assertFalse(string.contains("import org.other.test.Entity;"), "Entity can only be imported once");
+		assertFalse(string.contains("<"));
+		assertEquals("Outer.Entity", context.importType("org.test.Outer$Entity"));
+		assertEquals("org.other.test.Outer.Entity", context.importType("org.other.test.Outer$Entity"));
+		assertEquals("Collection<org.marvel.Outer.Hulk>", context.importType("java.util.Collection<org.marvel.Outer$Hulk>"));
+		assertEquals("Map<java.lang.String, org.marvel.Outer.Hulk>", context.importType("java.util.Map<java.lang.String, org.marvel.Outer$Hulk>"));
+		assertEquals("Collection<org.marvel.Outer.Hulk>[]", context.importType("java.util.Collection<org.marvel.Outer$Hulk>[]"));
+		assertEquals("Map<java.lang.String, org.marvel.Outer.Hulk>", context.importType("java.util.Map<java.lang.String, org.marvel.Outer$Hulk>"));
+		//assertEquals("Test.Entry", context.importType("org.hibernate.Test.Entry")); what should be the behavior for this ?
+		assertEquals("Test.Entry", context.importType("org.hibernate.Test$Entry"));
+		assertEquals("Map.Entry", context.importType("java.util.Map$Entry"));
+		assertEquals("Entry", context.importType("java.util.Map.Entry")); // we can't detect that it is the same class here unless we try and load all strings so we fall back to default class name.
+		assertEquals("List<java.util.Map.Entry>", context.importType( "java.util.List<java.util.Map$Entry>" ));
+		assertEquals("List<org.hibernate.Test.Entry>", context.importType( "java.util.List<org.hibernate.Test$Entry>" ));
+		string = context.generateImports();
+		assertTrue(string.contains("import java.util.Map"));
+		assertFalse(string.contains("import java.utilMap$"));
+		assertFalse(string.contains("$"));
+	}
+
+	@Test
+	public void testEqualsHashCode() {
+		Cfg2JavaTool c2j = new Cfg2JavaTool();
+		PersistentClass pc = metadata.getEntityBinding( "org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Customer" );
+		POJOClass pjc = c2j.getPOJOClass((Component) pc.getProperty("addressComponent").getValue());
+		assertTrue( pjc.needsEqualsHashCode() );
+		Set<String> propertySet = new HashSet<>(Arrays.asList("streetAddress1", "city", "verified"));
+		Iterator<Property> iter = pjc.getEqualsHashCodePropertiesIterator();
+		// iterating over all the properties to remove them all
+		assertTrue(propertySet.remove(iter.next().getName() ));
+		assertTrue(propertySet.remove(iter.next().getName() ));
+		assertTrue(propertySet.remove(iter.next().getName() ));
+		assertTrue(propertySet.isEmpty());
+		assertFalse( iter.hasNext() );
+	}
+
+	// TODO Re-enable this test: HBX-1249
+	@Disabled
+	@Test
+	public void testGenerics() throws Exception {
+		File genericsSource = new File(outputFolder, "genericssource");
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, genericsSource);
+		artifactCollector = new DefaultArtifactCollector();
+		exporter.getProperties().put(ExporterConstants.ARTIFACT_COLLECTOR, artifactCollector);
+		exporter.getProperties().setProperty("jdk5", "true");
+		exporter.start();
+		File genericsTarget = new File(outputFolder, "genericstarget" );
+		assertTrue(genericsTarget.mkdir());
+		String helloWorldResourcePath = "/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/HelloWorld.java_";
+		File helloWorldOrigin = new File(Objects.requireNonNull(getClass().getResource(helloWorldResourcePath)).toURI());
+		File helloWorldDestination = new File(srcDir, "HelloWorld.java");
+		Files.copy(helloWorldOrigin.toPath(), helloWorldDestination.toPath());
+		JavaUtil.compile(genericsSource, genericsTarget);
+		assertTrue(new File(genericsTarget, "HelloWorld.class").exists());
+	}
+
+	@Disabled
+	@Test
+	public void testDynamicComponent() {
+		PersistentClass classMapping =
+				metadata.getEntityBinding(
+						"org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Customer");
+		assertEquals(
+				"java.util.Map",
+				new Cfg2JavaTool().getJavaTypeName(
+						classMapping.getProperty("dynaMap"), false));
+	}
+
+	@Test
+	public void testCapitalization() {
+		assertEquals("Mail", BasicPOJOClass.beanCapitalize("Mail"));
+		assertEquals("Mail", BasicPOJOClass.beanCapitalize("mail"));
+		assertEquals("eMail", BasicPOJOClass.beanCapitalize("eMail"));
+		assertEquals("EMail", BasicPOJOClass.beanCapitalize("EMail"));
+	}
+
+	@Test
+	public void testUserTypes() {
+		PersistentClass classMapping = metadata.getEntityBinding("org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Customer");
+		Property property = classMapping.getProperty("customDate");
+		assertEquals("java.sql.Date", new Cfg2JavaTool().getJavaTypeName(property, false));
+	}
+
+	private MetadataBuildingContext createMetadataBuildingContext() {
+		return (MetadataBuildingContext)Proxy.newProxyInstance(
+				getClass().getClassLoader(),
+				new Class[] { MetadataBuildingContext.class },
+				(proxy, method, args) -> null);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/HibernateMappingExporterTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/HibernateMappingExporterTest/TestCase.java
new file mode 100644
index 000000000000..4faa588d9d28
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/HibernateMappingExporterTest/TestCase.java
@@ -0,0 +1,66 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.HibernateMappingExporterTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String FOO_HBM_XML =
+			"<hibernate-mapping>              "+
+			"	<class name='Foo' table='FOO'>"+
+			"		<id type='string'>        "+
+			"			<column name='BAR'/>  "+
+			"		</id>                     "+
+			"	</class>                      "+
+			"</hibernate-mapping>             ";
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	@Test
+	public void testStart() throws Exception {
+		File resources = new File(outputFolder, "resources");
+		assertTrue(resources.mkdir());
+		File fooHbmXmlOrigin = new File(resources, "origin.hbm.xml");
+		FileWriter writer = new FileWriter(fooHbmXmlOrigin);
+		writer.write(FOO_HBM_XML);
+		writer.close();
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, new File[] { fooHbmXmlOrigin }, properties);
+		final File srcDir = new File(outputFolder, "output");
+		assertTrue(srcDir.mkdir());
+		HbmExporter exporter = new HbmExporter();
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		final File fooHbmXml = new File(srcDir, "Foo.hbm.xml");
+		assertFalse( fooHbmXml.exists());
+		exporter.start();
+		assertTrue(fooHbmXml.exists());
+		assertTrue(fooHbmXml.delete());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/IncrementalSchemaReading/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/IncrementalSchemaReading/TestCase.java
new file mode 100644
index 000000000000..14e7f38f1547
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/IncrementalSchemaReading/TestCase.java
@@ -0,0 +1,197 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.IncrementalSchemaReading;
+
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Environment;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.mapping.Table;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.hibernate.tool.reveng.api.core.RevengDialectFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy.SchemaSelection;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.RevengMetadataCollector;
+import org.hibernate.tool.reveng.internal.core.reader.DatabaseReader;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.TableSelectorStrategy;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private Properties properties = null;
+	private String defaultSchema = null;
+	private String defaultCatalog = null;
+	private final List<String> gottenTables = new ArrayList<>();
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		properties = Environment.getProperties();
+		defaultSchema = properties.getProperty(AvailableSettings.DEFAULT_SCHEMA);
+		defaultCatalog = properties.getProperty(AvailableSettings.DEFAULT_CATALOG);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testReadSchemaIncremental() {
+		StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder();
+		builder.applySettings(properties);
+		ServiceRegistry serviceRegistry = builder.build();
+		Dialect dialect = Objects.requireNonNull(serviceRegistry.getService(JdbcServices.class)).getDialect();
+		TableSelectorStrategy tss = new TableSelectorStrategy(new DefaultStrategy());
+		RevengDialect mockedMetaDataDialect = createMockedMetaDataDialect(
+				RevengDialectFactory.createMetaDataDialect(dialect, properties));
+		DatabaseReader reader = DatabaseReader.create( properties, tss, mockedMetaDataDialect, serviceRegistry);
+
+		tss.addSchemaSelection( createSchemaSelection("CHILD") );
+
+		RevengMetadataCollector dc = new RevengMetadataCollector();
+		reader.readDatabaseSchema(dc);
+
+		assertEquals(1, gottenTables.size());
+		assertEquals("CHILD", gottenTables.get(0));
+
+		Iterator<Table> iterator = dc.iterateTables();
+		Table firstChild = iterator.next();
+		assertEquals("CHILD", firstChild.getName());
+		assertFalse(iterator.hasNext());
+
+		assertFalse(firstChild.getForeignKeyCollection().iterator().hasNext(), "should not record foreignkey to table it doesn't know about yet");
+
+		tss.clearSchemaSelections();
+		tss.addSchemaSelection( createSchemaSelection("MASTER") );
+
+		gottenTables.clear();
+		reader.readDatabaseSchema(dc);
+
+		assertEquals(1, gottenTables.size());
+		assertEquals("MASTER", gottenTables.get(0));
+
+
+		iterator = dc.iterateTables();
+		assertNotNull(iterator.next());
+		assertNotNull(iterator.next());
+		assertFalse(iterator.hasNext());
+
+		Table table = getTable(dc, mockedMetaDataDialect, defaultCatalog, defaultSchema, "CHILD" );
+		assertSame( firstChild, table );
+
+		JUnitUtil.assertIteratorContainsExactly(
+				"should have recorded one foreignkey to child table",
+				firstChild.getForeignKeyCollection().iterator(),
+				1);
+
+
+		tss.clearSchemaSelections();
+		reader.readDatabaseSchema(dc);
+
+		Table finalMaster = getTable(dc, mockedMetaDataDialect, defaultCatalog, defaultSchema, "MASTER" );
+
+		assertSame(firstChild, getTable(dc, mockedMetaDataDialect, defaultCatalog, defaultSchema, "CHILD" ));
+		JUnitUtil.assertIteratorContainsExactly(
+				null,
+				firstChild.getForeignKeyCollection().iterator(),
+				1);
+		JUnitUtil.assertIteratorContainsExactly(
+				null,
+				finalMaster.getForeignKeyCollection().iterator(),
+				0);
+	}
+
+	private Table getTable(
+			RevengMetadataCollector revengMetadataCollector,
+			RevengDialect metaDataDialect,
+			String catalog,
+			String schema,
+			String name) {
+		return revengMetadataCollector.getTable(
+				TableIdentifier.create(
+						quote(metaDataDialect, catalog),
+						quote(metaDataDialect, schema),
+						quote(metaDataDialect, name)));
+	}
+
+	private String quote(RevengDialect metaDataDialect, String name) {
+		if (name == null) return null;
+		if (metaDataDialect.needQuote(name)) {
+			if (name.length() > 1 && name.charAt(0) == '`'
+					&& name.charAt(name.length() - 1) == '`') {
+				return name; // avoid double quoting
+			}
+			return "`" + name + "`";
+		} else {
+			return name;
+		}
+	}
+
+	private SchemaSelection createSchemaSelection(String matchTable) {
+		return new SchemaSelection() {
+			@Override
+			public String getMatchCatalog() {
+				return null;
+			}
+			@Override
+			public String getMatchSchema() {
+				return null;
+			}
+			@Override
+			public String getMatchTable() {
+				return matchTable;
+			}
+		};
+	}
+
+	private RevengDialect createMockedMetaDataDialect(RevengDialect delegate) {
+		return (RevengDialect)Proxy.newProxyInstance(
+				getClass().getClassLoader(),
+				new Class[] { RevengDialect.class },
+				(proxy, method, args) -> {
+					if ("getTables".equals(method.getName())) {
+						gottenTables.add((String)args[2]);
+						return delegate.getTables(
+								(String)args[0],
+								(String)args[1],
+								args[2] == null ? "%" : (String)args[2]);
+					} else if ("getColumns".equals(method.getName())) {
+						return delegate.getColumns(
+								(String)args[0],
+								(String)args[1],
+								args[2] == null ? "%" : (String)args[2],
+								args[3] == null ? "%" : (String)args[3]);
+					} else {
+						return method.invoke(delegate, args);
+
+					}
+				});
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/JdbcHbm2JavaEjb3/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/JdbcHbm2JavaEjb3/TestCase.java
new file mode 100644
index 000000000000..dc1a2544bdd8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/JdbcHbm2JavaEjb3/TestCase.java
@@ -0,0 +1,81 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.JdbcHbm2JavaEjb3;
+
+import jakarta.persistence.Persistence;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ *
+ */
+public class TestCase {
+
+	@TempDir
+	public File outputDir = new File("output");
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(
+				ExporterConstants.METADATA_DESCRIPTOR,
+				MetadataDescriptorFactory.createReverseEngineeringDescriptor(null, null));
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[0]);
+		exporter.getProperties().setProperty("ejb3", "true");
+		exporter.getProperties().setProperty("jdk5", "true");
+		exporter.start();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testFileExistence() {
+		JUnitUtil.assertIsNonEmptyFile( new File( outputDir.getAbsolutePath() + "/Master.java") );
+	}
+
+	@Test
+	public void testUniqueConstraints() {
+		assertNull( FileUtil.findFirstString("uniqueConstraints", new File(outputDir, "Master.java")));
+		assertNotNull(FileUtil.findFirstString( "uniqueConstraints", new File(outputDir,"Uniquemaster.java") ));
+	}
+
+	@Test
+	public void testCompile() {
+		File destination = new File(outputDir, "destination");
+		assertTrue(destination.mkdir());
+		List<String> jars = new ArrayList<>();
+		jars.add( JavaUtil.resolvePathToJarFileFor(Persistence.class)); // for jpa api
+		JavaUtil.compile(outputDir, destination, jars);
+		JUnitUtil.assertIsNonEmptyFile(new File(destination, "Master.class"));
+		JUnitUtil.assertIsNonEmptyFile(new File(destination, "Uniquemaster.class"));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/TestCase.java
new file mode 100644
index 000000000000..8e6d5902713c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/TestCase.java
@@ -0,0 +1,119 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.OtherCfg2HbmTest;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Customer.hbm.xml",
+			"Order.hbm.xml",
+			"LineItem.hbm.xml",
+			"Product.hbm.xml",
+			"HelloWorld.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testFileExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "org/hibernate/tool/hbm2x/Customer.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "org/hibernate/tool/hbm2x/LineItem.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "org/hibernate/tool/hbm2x/Order.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "org/hibernate/tool/hbm2x/Product.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "HelloWorld.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(srcDir, "HelloUniverse.hbm.xml") );
+	}
+
+	@Test
+	public void testReadable() {
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		File[] hbmFiles = new File[4];
+		hbmFiles[0] = new File(srcDir, "org/hibernate/tool/hbm2x/Customer.hbm.xml");
+		hbmFiles[1] = new File(srcDir, "org/hibernate/tool/hbm2x/LineItem.hbm.xml");
+		hbmFiles[2] = new File(srcDir, "org/hibernate/tool/hbm2x/Order.hbm.xml");
+		hbmFiles[3] = new File(srcDir, "org/hibernate/tool/hbm2x/Product.hbm.xml");
+		Metadata metadata = MetadataDescriptorFactory
+				.createNativeDescriptor(null, hbmFiles, properties)
+				.createMetadata();
+		assertNotNull(metadata);
+	}
+
+	@Test
+	public void testNoVelocityLeftOvers() {
+		assertNull( FileUtil.findFirstString("$", new File(srcDir, "org/hibernate/tool/hbm2x/Customer.hbm.xml")));
+		assertNull(FileUtil.findFirstString("$", new File(srcDir, "org/hibernate/tool/hbm2x/LineItem.hbm.xml")));
+		assertNull(FileUtil.findFirstString("$", new File(srcDir, "org/hibernate/tool/hbm2x/Order.hbm.xml")));
+		assertNull(FileUtil.findFirstString("$", new File(srcDir, "org/hibernate/tool/hbm2x/Product.hbm.xml")));
+	}
+
+	@Test
+	public void testVersioning() throws Exception {
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(new File(srcDir, "org/hibernate/tool/hbm2x/Product.hbm.xml"));
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/version")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one version element");
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/PropertiesTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/PropertiesTest/TestCase.java
new file mode 100644
index 000000000000..37572280a630
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/PropertiesTest/TestCase.java
@@ -0,0 +1,124 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.PropertiesTest;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.internal.export.common.DefaultArtifactCollector;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.FileUtil;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.nio.file.Files;
+import java.util.Objects;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Josh Moore josh.moore@gmx.de
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Properties.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private DefaultArtifactCollector artifactCollector;
+	private File outputDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		artifactCollector = new DefaultArtifactCollector();
+		outputDir = new File(outputFolder, "src");
+		assertTrue(outputDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.getProperties().put(ExporterConstants.ARTIFACT_COLLECTOR, artifactCollector);
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		hbmexporter.getProperties().put(ExporterConstants.ARTIFACT_COLLECTOR, artifactCollector);
+		exporter.start();
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testNoGenerationOfEmbeddedPropertiesComponent() {
+		assertEquals(2, artifactCollector.getFileCount("java"));
+		assertEquals(2, artifactCollector.getFileCount("hbm.xml"));
+	}
+
+	@Test
+	public void testGenerationOfEmbeddedProperties() throws Exception {
+		File outputXml = new File(outputDir,  "properties/PPerson.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/properties")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one properties element");
+		Element element = (Element) nodeList.item(0);
+		assertEquals("emergencyContact", element.getAttribute( "name" ));
+		assertNotNull(
+				FileUtil.findFirstString(
+						"name",
+						new File(outputDir, "properties/PPerson.java" )));
+		assertNull(
+				FileUtil.findFirstString(
+						"emergencyContact",
+						new File(outputDir, "properties/PPerson.java" )),
+				"Embedded component/properties should not show up in .java");
+	}
+
+	@Test
+	public void testCompilable() throws Exception {
+		String propertiesUsageResourcePath = "/org/hibernate/tool/hbm2x/PropertiesTest/PropertiesUsage.java_";
+		File propertiesUsageOrigin = new File(Objects.requireNonNull(getClass().getResource(propertiesUsageResourcePath)).toURI());
+		File propertiesUsageDestination = new File(outputDir, "properties/PropertiesUsage.java");
+		File targetDir = new File(outputFolder, "target" );
+		assertTrue(targetDir.mkdir());
+		Files.copy(propertiesUsageOrigin.toPath(), propertiesUsageDestination.toPath());
+		JavaUtil.compile(outputDir, targetDir);
+		assertTrue(new File(targetDir, "properties/PCompany.class").exists());
+		assertTrue(new File(targetDir, "properties/PPerson.class").exists());
+		assertTrue(new File(targetDir, "properties/PropertiesUsage.class").exists());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/Car.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/Car.java
new file mode 100644
index 000000000000..65844c99ee28
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/Car.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.AbstractTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Paco Hern�ndez
+ */
+public class Car implements java.io.Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(Car.class).getSerialVersionUID();
+
+	private long id;
+	private String model;
+	private Set<CarPart> carParts = new HashSet<>();
+
+	/**
+	 * @return Returns the id.
+	 */
+	public long getId() {
+		return id;
+	}
+	/**
+	 * @param id The id to set.
+	 */
+	public void setId(long id) {
+		this.id = id;
+	}
+	/**
+	 * @return Returns the model.
+	 */
+	public String getModel() {
+		return model;
+	}
+	/**
+	 * @param model The model to set.
+	 */
+	public void setModel(String model) {
+		this.model = model;
+	}
+	public Set<CarPart> getCarParts() {
+		return carParts;
+	}
+	public void setCarParts(Set<CarPart> carParts) {
+		this.carParts = carParts;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/CarPart.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/CarPart.java
new file mode 100644
index 000000000000..7430c96176f9
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/CarPart.java
@@ -0,0 +1,46 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.AbstractTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+
+/**
+ * @author Paco Hern�ndez
+ */
+public abstract class CarPart implements java.io.Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(CarPart.class).getSerialVersionUID();
+
+	private long id;
+	private String partName;
+
+	/**
+	 * @return Returns the id.
+	 */
+	public long getId() {
+		return id;
+	}
+	/**
+	 * @param id The id to set.
+	 */
+	public void setId(long id) {
+		this.id = id;
+	}
+	/**
+	 * @return Returns the typeName.
+	 */
+	public String getPartName() {
+		return partName;
+	}
+	/**
+	 * @param typeName The typeName to set.
+	 */
+	public void setPartName(String typeName) {
+		this.partName = typeName;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/TestCase.java
new file mode 100644
index 000000000000..6852783d4134
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/TestCase.java
@@ -0,0 +1,114 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.AbstractTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Car.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "output");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest/Car.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest/CarPart.hbm.xml") );
+	}
+
+	@Test
+	public void testAbstractPresent() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest/CarPart.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one class element");
+		Element node = (Element)nodeList.item(0);
+		assertNotNull(node.getAttribute("abstract"), "Abstract attribute was not exported.");
+		assertEquals("true", node.getAttribute("abstract"));
+	}
+
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = new ArrayList<>(4);
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest/Car.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest/CarPart.hbm.xml"));
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[2]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/Car.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/Car.java
new file mode 100644
index 000000000000..17707fc72c6a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/Car.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.BackrefTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Paco Hern�ndez
+ */
+public class Car implements java.io.Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(Car.class).getSerialVersionUID();
+
+	private long id;
+	private String model;
+	private Set<CarPart> carParts = new HashSet<CarPart>();
+
+	/**
+	 * @return Returns the id.
+	 */
+	public long getId() {
+		return id;
+	}
+	/**
+	 * @param id The id to set.
+	 */
+	public void setId(long id) {
+		this.id = id;
+	}
+	/**
+	 * @return Returns the model.
+	 */
+	public String getModel() {
+		return model;
+	}
+	/**
+	 * @param model The model to set.
+	 */
+	public void setModel(String model) {
+		this.model = model;
+	}
+	public Set<CarPart> getCarParts() {
+		return carParts;
+	}
+	public void setCarParts(Set<CarPart> carParts) {
+		this.carParts = carParts;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/CarPart.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/CarPart.java
new file mode 100644
index 000000000000..afe50df5614f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/CarPart.java
@@ -0,0 +1,46 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.BackrefTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+
+/**
+ * @author Paco Hern�ndez
+ */
+public abstract class CarPart implements java.io.Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(CarPart.class).getSerialVersionUID();
+
+	private long id;
+	private String partName;
+
+	/**
+	 * @return Returns the id.
+	 */
+	public long getId() {
+		return id;
+	}
+	/**
+	 * @param id The id to set.
+	 */
+	public void setId(long id) {
+		this.id = id;
+	}
+	/**
+	 * @return Returns the typeName.
+	 */
+	public String getPartName() {
+		return partName;
+	}
+	/**
+	 * @param typeName The typeName to set.
+	 */
+	public void setPartName(String typeName) {
+		this.partName = typeName;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/TestCase.java
new file mode 100644
index 000000000000..90205c7c6fc6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/TestCase.java
@@ -0,0 +1,104 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.BackrefTest;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.mapping.Backref;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Car.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private Metadata metadata = null;
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		metadata = metadataDescriptor.createMetadata();
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest/Car.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest/CarPart.hbm.xml") );
+	}
+
+	@Test
+	public void testBackrefPresent() {
+		PersistentClass pc = metadata.getEntityBinding("org.hibernate.tool.hbm2x.hbm2hbmxml.BackrefTest.CarPart");
+		Iterator<Property> iterator = pc.getProperties().iterator();
+		boolean hasBackrefs = false;
+		while (iterator.hasNext() && !hasBackrefs) {
+			hasBackrefs = (iterator.next() instanceof Backref);
+		}
+		assertTrue(hasBackrefs, "Class mapping should create Backref for this testcase");
+	}
+
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = new ArrayList<>(4);
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest/Car.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest/CarPart.hbm.xml"));
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[2]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Cfg2HbmToolTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Cfg2HbmToolTest/TestCase.java
new file mode 100644
index 000000000000..653f8f3f0c4f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Cfg2HbmToolTest/TestCase.java
@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.Cfg2HbmToolTest;
+
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.mapping.JoinedSubclass;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.SingleTableSubclass;
+import org.hibernate.mapping.Subclass;
+import org.hibernate.mapping.UnionSubclass;
+import org.hibernate.tool.reveng.internal.export.hbm.Cfg2HbmTool;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Proxy;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+public class TestCase {
+
+	@Test
+	public void testNeedsTable(){
+		MetadataBuildingContext mdbc = createMetadataBuildingContext();
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		PersistentClass pc = new RootClass(mdbc);
+		assertTrue(c2h.needsTable(pc));
+		assertTrue(c2h.needsTable(new JoinedSubclass(pc, mdbc)));
+		assertTrue(c2h.needsTable(new UnionSubclass(pc, mdbc)));
+		assertFalse(c2h.needsTable(new SingleTableSubclass(pc, mdbc)));
+		assertFalse(c2h.needsTable(new Subclass(pc, mdbc)));
+	}
+
+	private MetadataBuildingContext createMetadataBuildingContext() {
+		return (MetadataBuildingContext)Proxy.newProxyInstance(
+				getClass().getClassLoader(),
+				new Class[] { MetadataBuildingContext.class },
+				(proxy, method, args) -> null);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/Fee.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/Fee.java
new file mode 100644
index 000000000000..5a5a1559c636
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/Fee.java
@@ -0,0 +1,75 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.CompositeElementTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.io.Serializable;
+
+public class Fee implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(Fee.class).getSerialVersionUID();
+
+	public Fee anotherFee;
+	public String fi;
+	public String key;
+	private FooComponent compon;
+	private int count;
+
+	public Fee() {
+	}
+
+	public String getFi() {
+		return fi;
+	}
+
+	public void setFi(String fi) {
+		this.fi = fi;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public Fee getAnotherFee() {
+		return anotherFee;
+	}
+
+	public void setAnotherFee(Fee anotherFee) {
+		this.anotherFee = anotherFee;
+	}
+
+
+	public FooComponent getCompon() {
+		return compon;
+	}
+
+	public void setCompon(FooComponent compon) {
+		this.compon = compon;
+	}
+
+	/**
+	 * Returns the count.
+	 * @return int
+	 */
+	public int getCount() {
+		return count;
+	}
+
+	/**
+	 * Sets the count.
+	 * @param count The count to set
+	 */
+	public void setCount(int count) {
+		this.count = count;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/FooComponent.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/FooComponent.java
new file mode 100644
index 000000000000..91c458a396a6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/FooComponent.java
@@ -0,0 +1,119 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.CompositeElementTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+public class FooComponent implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(FooComponent.class).getSerialVersionUID();
+
+	int count;
+	String name;
+	Date[] importantDates;
+	FooComponent subcomponent;
+	Fee fee = new Fee();
+	GlarchProxy glarch;
+
+	public boolean equals(Object that) {
+		if (that instanceof FooComponent) {
+			return count == ((FooComponent)that).count;
+		} else return false;
+	}
+
+	public int hashCode() {
+		return count;
+	}
+
+	public String toString() {
+		StringBuilder result = new StringBuilder("FooComponent: " + name + "=" + count);
+		result.append("; dates=[");
+		if ( importantDates!=null) {
+			for ( int i=0; i<importantDates.length; i++ ) {
+				result.append(i == 0 ? "" : ", ").append(importantDates[i]);
+			}
+		}
+		result.append("]");
+		if ( subcomponent!=null ) {
+			result.append(" (").append(subcomponent).append(")");
+		}
+		return result.toString();
+	}
+
+	public FooComponent() {}
+
+	FooComponent(String name, int count, Date[] dates, FooComponent subcomponent) {
+		this.name = name;
+		this.count = count;
+		this.importantDates = dates;
+		this.subcomponent = subcomponent;
+	}
+
+	FooComponent(String name, int count, Date[] dates, FooComponent subcomponent, Fee fee) {
+		this.name = name;
+		this.count = count;
+		this.importantDates = dates;
+		this.subcomponent = subcomponent;
+		this.fee = fee;
+	}
+
+	public int getCount() {
+		return count;
+	}
+	public void setCount(int count) {
+		this.count = count;
+	}
+
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Date[] getImportantDates() {
+		return importantDates;
+	}
+	public void setImportantDates(Date[] importantDates) {
+		this.importantDates = importantDates;
+	}
+
+	public FooComponent getSubcomponent() {
+		return subcomponent;
+	}
+	public void setSubcomponent(FooComponent subcomponent) {
+		this.subcomponent = subcomponent;
+	}
+
+	@SuppressWarnings("unused")
+	private String getNull() {
+		return null;
+	}
+	@SuppressWarnings("unused")
+	private void setNull(String str) throws Exception {
+		if (str!=null) throw new Exception("null component property");
+	}
+	public Fee getFee() {
+		return fee;
+	}
+
+	public void setFee(Fee fee) {
+		this.fee = fee;
+	}
+
+	public GlarchProxy getGlarch() {
+		return glarch;
+	}
+
+	public void setGlarch(GlarchProxy glarch) {
+		this.glarch = glarch;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/GlarchProxy.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/GlarchProxy.java
new file mode 100644
index 000000000000..26a2895572cb
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/GlarchProxy.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.CompositeElementTest;
+
+import java.util.List;
+import java.util.Map;
+
+public interface GlarchProxy {
+
+	int getVersion();
+	int getDerivedVersion();
+	void setVersion(int version);
+
+	String getName();
+	void setName(String name);
+
+	GlarchProxy getNext();
+	void setNext(GlarchProxy next);
+
+	short getOrder();
+	void setOrder(short order);
+
+	List<Object> getStrings();
+	void setStrings(List<Object> strings);
+
+	Map<Object, Object> getDynaBean();
+	void setDynaBean(Map<Object, Object> bean);
+
+	Map<Object, Object> getStringSets();
+	void setStringSets(Map<Object, Object> stringSets);
+
+	List<Object> getFooComponents();
+	void setFooComponents(List<Object> fooComponents);
+
+	GlarchProxy[] getProxyArray();
+	void setProxyArray(GlarchProxy[] proxyArray);
+
+	Object getAny();
+	void setAny(Object any);
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/TestCase.java
new file mode 100644
index 000000000000..a6de345caded
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/TestCase.java
@@ -0,0 +1,134 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.CompositeElementTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Glarch.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest/Fee.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest/Glarch.hbm.xml") );
+	}
+
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = new ArrayList<File>(4);
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest/Fee.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest/Glarch.hbm.xml"));
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[2]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+	@Test
+	public void testCompositeElementNode() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest/Glarch.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/list")
+				.evaluate(document, XPathConstants.NODESET);
+		Element secondList = (Element)nodeList.item(1);
+		NodeList compositeElementList = secondList.getElementsByTagName("composite-element");
+		assertEquals(1, compositeElementList.getLength(), "Expected to get one composite-element element");
+		Element compositeElement = (Element)compositeElementList.item(0);
+		NodeList compositeElementChildNodes = compositeElement.getChildNodes();
+		int amountOfProperties = 0;
+		for (int i = 0; i < compositeElementChildNodes.getLength(); i++) {
+			Node node = compositeElementChildNodes.item(i);
+			if ("property".equals(node.getNodeName())) amountOfProperties++;
+		}
+		assertEquals(2, amountOfProperties, "Expected to get two property element");
+		NodeList manyToOneList = secondList.getElementsByTagName("many-to-one");
+		assertEquals(1, manyToOneList.getLength());
+		Element manyToOneElement = (Element)manyToOneList.item(0);
+		assertEquals("fee", manyToOneElement.getAttribute("name"));
+		assertEquals("all", manyToOneElement.getAttribute("cascade"));
+		NodeList nestedCompositeElementList = compositeElement.getElementsByTagName("nested-composite-element");
+		assertEquals(1, nestedCompositeElementList.getLength());
+		Element nestedCompositeElement = (Element)nestedCompositeElementList.item(0);
+		assertEquals("subcomponent", nestedCompositeElement.getAttribute("name"));
+		assertEquals(
+				"org.hibernate.tool.hbm2x.hbm2hbmxml.CompositeElementTest.FooComponent",
+				nestedCompositeElement.getAttribute("class"));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/Fee.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/Fee.java
new file mode 100644
index 000000000000..1cfdf0fcb558
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/Fee.java
@@ -0,0 +1,75 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.DynamicComponentTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.io.Serializable;
+
+public class Fee implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(Fee.class).getSerialVersionUID();
+
+	public Fee anotherFee;
+	public String fi;
+	public String key;
+	private FooComponent compon;
+	private int count;
+
+	public Fee() {
+	}
+
+	public String getFi() {
+		return fi;
+	}
+
+	public void setFi(String fi) {
+		this.fi = fi;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public Fee getAnotherFee() {
+		return anotherFee;
+	}
+
+	public void setAnotherFee(Fee anotherFee) {
+		this.anotherFee = anotherFee;
+	}
+
+
+	public FooComponent getCompon() {
+		return compon;
+	}
+
+	public void setCompon(FooComponent compon) {
+		this.compon = compon;
+	}
+
+	/**
+	 * Returns the count.
+	 * @return int
+	 */
+	public int getCount() {
+		return count;
+	}
+
+	/**
+	 * Sets the count.
+	 * @param count The count to set
+	 */
+	public void setCount(int count) {
+		this.count = count;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/FooComponent.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/FooComponent.java
new file mode 100644
index 000000000000..fe051303ac6d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/FooComponent.java
@@ -0,0 +1,120 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.DynamicComponentTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+public class FooComponent implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(FooComponent.class).getSerialVersionUID();
+
+	int count;
+	String name;
+	Date[] importantDates;
+	FooComponent subcomponent;
+	Fee fee = new Fee();
+	GlarchProxy glarch;
+
+	public boolean equals(Object that) {
+		if (that instanceof FooComponent) {
+			return count == ((FooComponent) that).count;
+		}
+		else return false;
+	}
+
+	public int hashCode() {
+		return count;
+	}
+
+	public String toString() {
+		StringBuilder result = new StringBuilder( "FooComponent: " + name + "=" + count );
+		result.append( "; dates=[" );
+		if ( importantDates!=null) {
+			for ( int i=0; i<importantDates.length; i++ ) {
+				result.append( i == 0 ? "" : ", " ).append( importantDates[i] );
+			}
+		}
+		result.append( "]" );
+		if ( subcomponent!=null ) {
+			result.append( " (" ).append( subcomponent ).append( ")" );
+		}
+		return result.toString();
+	}
+
+	public FooComponent() {}
+
+	FooComponent(String name, int count, Date[] dates, FooComponent subcomponent) {
+		this.name = name;
+		this.count = count;
+		this.importantDates = dates;
+		this.subcomponent = subcomponent;
+	}
+
+	FooComponent(String name, int count, Date[] dates, FooComponent subcomponent, Fee fee) {
+		this.name = name;
+		this.count = count;
+		this.importantDates = dates;
+		this.subcomponent = subcomponent;
+		this.fee = fee;
+	}
+
+	public int getCount() {
+		return count;
+	}
+	public void setCount(int count) {
+		this.count = count;
+	}
+
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Date[] getImportantDates() {
+		return importantDates;
+	}
+	public void setImportantDates(Date[] importantDates) {
+		this.importantDates = importantDates;
+	}
+
+	public FooComponent getSubcomponent() {
+		return subcomponent;
+	}
+	public void setSubcomponent(FooComponent subcomponent) {
+		this.subcomponent = subcomponent;
+	}
+
+	@SuppressWarnings("unused")
+	private String getNull() {
+		return null;
+	}
+	@SuppressWarnings("unused")
+	private void setNull(String str) throws Exception {
+		if (str!=null) throw new Exception("null component property");
+	}
+	public Fee getFee() {
+		return fee;
+	}
+
+	public void setFee(Fee fee) {
+		this.fee = fee;
+	}
+
+	public GlarchProxy getGlarch() {
+		return glarch;
+	}
+
+	public void setGlarch(GlarchProxy glarch) {
+		this.glarch = glarch;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/GlarchProxy.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/GlarchProxy.java
new file mode 100644
index 000000000000..bd0cf133dbe4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/GlarchProxy.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.DynamicComponentTest;
+
+import java.util.List;
+import java.util.Map;
+
+public interface GlarchProxy {
+
+	int getVersion();
+	int getDerivedVersion();
+	void setVersion(int version);
+
+	String getName();
+	void setName(String name);
+
+	GlarchProxy getNext();
+	void setNext(GlarchProxy next);
+
+	short getOrder();
+	void setOrder(short order);
+
+	List<Object> getStrings();
+	void setStrings(List<Object> strings);
+
+	Map<Object, Object> getDynaBean();
+	void setDynaBean(Map<Object, Object> bean);
+
+	Map<Object, Object> getStringSets();
+	void setStringSets(Map<Object, Object> stringSets);
+
+	List<Object> getFooComponents();
+	void setFooComponents(List<Object> fooComponents);
+
+	GlarchProxy[] getProxyArray();
+	void setProxyArray(GlarchProxy[] proxyArray);
+
+	Object getAny();
+	void setAny(Object any);
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/TestCase.java
new file mode 100644
index 000000000000..2e2d9715c155
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/TestCase.java
@@ -0,0 +1,131 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.DynamicComponentTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Glarch.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest/Fee.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml") );
+	}
+
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = new ArrayList<>(4);
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest/Fee.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml"));
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[2]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+	@Test
+	public void testClassProxy() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one class element");
+		Element element = (Element) nodeList.item(0);
+		assertEquals("org.hibernate.tool.hbm2x.hbm2hbmxml.DynamicComponentTest.GlarchProxy", element.getAttribute("proxy"));
+	}
+
+	@Test
+	public void testDynamicComponentNode() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/dynamic-component")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one dynamic-component element");
+		Element element = (Element) nodeList.item(0);
+		assertEquals("dynaBean", element.getAttribute( "name" ));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Address.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Address.java
new file mode 100644
index 000000000000..6c38cbf55a43
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Address.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.FormulaTest;
+
+public class Address {
+
+	private AddressId addressId;
+	private String street;
+	private String city;
+	private String state;
+	private String zip;
+	private Customer customer;
+
+	public Customer getCustomer() {
+		return customer;
+	}
+	public void setCustomer(Customer customer) {
+		this.customer = customer;
+	}
+
+	public String getCity() {
+		return city;
+	}
+	public void setCity(String city) {
+		this.city = city;
+	}
+	public String getState() {
+		return state;
+	}
+	public void setState(String state) {
+		this.state = state;
+	}
+	public String getStreet() {
+		return street;
+	}
+	public void setStreet(String street) {
+		this.street = street;
+	}
+	public String getZip() {
+		return zip;
+	}
+	public void setZip(String zip) {
+		this.zip = zip;
+	}
+	public AddressId getAddressId() {
+		return addressId;
+	}
+	public void setAddressId(AddressId addressId) {
+		this.addressId = addressId;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/AddressId.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/AddressId.java
new file mode 100644
index 000000000000..c6055f687350
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/AddressId.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.FormulaTest;
+
+public class AddressId {
+	private String type;
+	private String addressId;
+
+	public AddressId(String type, String customerId) {
+		this.addressId = customerId;
+		this.type = type;
+	}
+
+	public AddressId() {}
+
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public String getAddressId() {
+		return addressId;
+	}
+	public void setAddressId(String customerId) {
+		this.addressId = customerId;
+	}
+	public boolean equals(Object other) {
+		if ( !(other instanceof AddressId add) ) return false;
+		return type.equals(add.type) && addressId.equals(add.addressId);
+	}
+	public int hashCode() {
+		return addressId.hashCode() + type.hashCode();
+	}
+
+	public String toString() {
+		return type + '#' + addressId;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Customer.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Customer.java
new file mode 100644
index 000000000000..0176073781de
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Customer.java
@@ -0,0 +1,38 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.FormulaTest;
+
+public class Customer {
+
+	private String name;
+	private String customerId;
+	private Address billingAddress;
+	private Address shippingAddress;
+
+	public Address getBillingAddress() {
+		return billingAddress;
+	}
+	public void setBillingAddress(Address billingAddress) {
+		this.billingAddress = billingAddress;
+	}
+	public String getCustomerId() {
+		return customerId;
+	}
+	public void setCustomerId(String customerId) {
+		this.customerId = customerId;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Address getShippingAddress() {
+		return shippingAddress;
+	}
+	public void setShippingAddress(Address shippingAddress) {
+		this.shippingAddress = shippingAddress;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/TestCase.java
new file mode 100644
index 000000000000..dd6fa548792b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/TestCase.java
@@ -0,0 +1,75 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.FormulaTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Customer.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	//TODO: Reenable this test: see HBX-2073
+	@Disabled
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = new ArrayList<>(4);
+		files.add(new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/FormulaTest/Customer.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/FormulaTest/BillingAddress.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/FormulaTest/ShippingAddress.hbm.xml"));
+		Properties properties = new Properties();
+		properties.setProperty(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[2]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/TestCase.java
new file mode 100644
index 000000000000..271d1a274182
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/TestCase.java
@@ -0,0 +1,592 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest;
+
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.internal.export.hbm.HibernateMappingGlobalSettings;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Initial implementation based on the Hbm2XTest class.
+ *
+ * @author David Channon
+ * @author koen
+ */
+
+// TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	/**
+	 * Testing class for cfg2hbm generating hbms.
+	 * Simulate a custom persister.
+	 * Note: Only needs to exist not work or be valid
+	 *       in any other way.
+	 *
+	 * @author David Channon
+	 */
+	public static class Persister {
+		// Empty
+	}
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Basic.hbm.xml",
+			"BasicCompositeId.hbm.xml",
+			"BasicGlobals.hbm.xml",
+			"ClassFullAttribute.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private MetadataDescriptor metadataDescriptor = null;
+	private File srcDir = null;
+	private HbmExporter hbmexporter = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	// TODO HBX-2042: Reenable when implemented in ORM 6.0
+	@Disabled
+	@Test
+	public void testAllFilesExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"GeneralHbmSettings.hbm.xml") );
+		assertFalse(new File(
+				srcDir,
+				"org/hibernate/tool/cfg2hbm/GeneralHbmSettings.hbm.xml").exists() );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml") );
+	}
+
+	// TODO HBX-2042: Reenable when implemented in ORM 6.0
+	@Disabled
+	@Test
+	public void testArtifactCollection() {
+		assertEquals(
+				5,
+				hbmexporter.getArtifactCollector().getFileCount("hbm.xml"),
+				"4 mappings + 1 global");
+	}
+
+	@Test
+	public void testGlobalSettingsGeneratedDatabase() throws Exception {
+		HibernateMappingGlobalSettings hgs = new HibernateMappingGlobalSettings();
+		hgs.setDefaultPackage("org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest");
+		hgs.setSchemaName("myschema");
+		hgs.setCatalogName("mycatalog");
+		HbmExporter gsExporter = new HbmExporter();
+		gsExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		gsExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		gsExporter.setGlobalSettings(hgs);
+		gsExporter.start();
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		Element root = document.getDocumentElement();
+		// There are 7 attributes because there are defaults defined by the DTD makes up the missing entries
+		assertEquals(7, root.getAttributes().getLength(), "Unexpected number of hibernate-mapping elements " );
+		assertEquals("org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest", root.getAttribute("package"), "Unexpected package name" );
+		assertEquals("myschema", root.getAttribute("schema"), "Unexpected schema name" );
+		assertEquals("mycatalog", root.getAttribute("catalog"), "Unexpected mycatalog name" );
+	}
+
+	@Test
+	public void testGlobalSettingsGeneratedAccessAndCascadeNonDefault()  throws Exception {
+		HibernateMappingGlobalSettings hgs = new HibernateMappingGlobalSettings();
+		hgs.setDefaultPackage("org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest");
+		hgs.setDefaultAccess("field");
+		hgs.setDefaultCascade("save-update");
+		HbmExporter gbsExporter = new HbmExporter();
+		gbsExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		gbsExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		gbsExporter.setGlobalSettings(hgs);
+		gbsExporter.start();
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		Element root = document.getDocumentElement();
+		// There are 5 attributes because there are non-defaults not set for this test
+		assertEquals(5, root.getAttributes().getLength(), "Unexpected number of hibernate-mapping elements " );
+		assertEquals("org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest", root.getAttribute("package"), "Unexpected package name" );
+		assertEquals("field", root.getAttribute("default-access"), "Unexpected access setting" );
+		assertEquals("save-update", root.getAttribute("default-cascade"), "Unexpected cascade setting" );
+	}
+
+	@Test
+	public void testMetaAttributes() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/meta")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(2, nodeList.getLength(), "Expected to get one meta element");
+		Node node = nodeList.item(0);
+		assertEquals("Basic", node.getTextContent());
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/id/meta")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one meta element");
+		node = nodeList.item(0);
+		assertEquals("basicId", node.getTextContent());
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/property/meta")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one meta element");
+		node = nodeList.item(0);
+		assertEquals("description", node.getTextContent());
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/set/meta")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one meta element");
+		node = nodeList.item(0);
+		assertEquals("anotherone", node.getTextContent());
+	}
+
+	@Test
+	public void testCollectionAttributes() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/set")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one set element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("delete, update", node.getAttribute("cascade"));
+	}
+
+	@Test
+	public void testComments() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/ClassFullAttribute.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/comment")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one comment element");
+		Node node = nodeList.item(0);
+		assertEquals("A comment for ClassFullAttribute", node.getTextContent());
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/property/column/comment")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one comment element");
+		node = nodeList.item(0);
+		assertEquals("columnd comment", node.getTextContent());
+	}
+
+	@Test
+	public void testNoComments() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/comment")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(0, nodeList.getLength(), "Expected to get no comment element");
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/property/column/comment")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(0, nodeList.getLength(), "Expected to get no comment element");
+	}
+
+	@Test
+	public void testGlobalSettingsGeneratedAccessAndCascadeDefault()  throws Exception {
+		HibernateMappingGlobalSettings hgs = new HibernateMappingGlobalSettings();
+		hgs.setDefaultPackage("org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest");
+		hgs.setDefaultAccess("property");
+		hgs.setDefaultCascade("none");
+		HbmExporter gbsExporter = new HbmExporter();
+		gbsExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		gbsExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		gbsExporter.setGlobalSettings(hgs);
+		gbsExporter.start();
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		Element root = document.getDocumentElement();
+		// There are 5 attributes because there are non-defaults not set for this test
+		assertEquals(5, root.getAttributes().getLength(), "Unexpected number of hibernate-mapping elements " );
+		assertEquals("org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest", root.getAttribute("package"), "Unexpected package name" );
+		assertEquals("property", root.getAttribute("default-access"), "Unexpected access setting" );
+		assertEquals("none", root.getAttribute("default-cascade"), "Unexpected cascade setting" );
+	}
+
+	@Test
+	public void testGlobalSettingsLazyAndAutoImportNonDefault()  throws Exception {
+		HibernateMappingGlobalSettings hgs = new HibernateMappingGlobalSettings();
+		hgs.setDefaultPackage("org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest");
+		hgs.setDefaultLazy(false);
+		hgs.setAutoImport(false);
+		HbmExporter gbsExporter = new HbmExporter();
+		gbsExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		gbsExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		gbsExporter.setGlobalSettings(hgs);
+		gbsExporter.start();
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		Element root = document.getDocumentElement();
+		// There are 5 attributes because there are non-defaults not set for this test
+		assertEquals(5, root.getAttributes().getLength(), "Unexpected number of hibernate-mapping elements " );
+		assertEquals("org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest", root.getAttribute("package"), "Unexpected package name" );
+		assertEquals("false", root.getAttribute("default-lazy"), "Unexpected access setting" );
+		assertEquals("false", root.getAttribute("auto-import"), "Unexpected cascade setting" );
+	}
+
+	@Test
+	public void testIdGeneratorHasNotArgumentParameters()  throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and it has no arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/id/generator")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one generator element");
+		Node genAtt = ( (Element)nodeList.item(0)).getAttributeNode("class");
+		assertEquals("assigned", genAtt.getTextContent(), "Unexpected generator class name" );
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/id/generator/param")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(0, nodeList.getLength(), "Expected to get no generator param elements");
+	}
+
+	@Test
+	public void testIdGeneratorHasArgumentParameters()  throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and that it does have arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/id/generator")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one generator element");
+		Node genAtt = ( (Element)nodeList.item(0)).getAttributeNode("class");
+		assertEquals("org.hibernate.id.TableHiLoGenerator", genAtt.getTextContent(), "Unexpected generator class name" );
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/id/generator/param")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(2, nodeList.getLength(), "Expected to get correct number of generator param elements" );
+		Element tableElement = (Element)nodeList.item(0);
+		Attr paramTableAtt = tableElement.getAttributeNode("name");
+		Element columnElement = (Element)nodeList.item(1);
+		Attr paramColumnAtt = columnElement.getAttributeNode("name");
+		if(paramTableAtt.getTextContent().equals("column")) {
+			// to make sure the order of the elements doesn't matter.
+			Element tempElement = tableElement;
+			Attr temp = paramTableAtt;
+			paramTableAtt = paramColumnAtt;
+			tableElement = columnElement;
+			paramColumnAtt = temp;
+			columnElement = tempElement;
+		}
+		assertEquals("table", paramTableAtt.getTextContent(), "Unexpected generator param name" );
+		assertEquals("column", paramColumnAtt.getTextContent(), "Unexpected generator param name" );
+		assertEquals("uni_table", tableElement.getTextContent(), "Unexpected param value for table" );
+		assertEquals("next_hi_value", columnElement.getTextContent(), "Unexpected param value for column" );
+	}
+
+	// TODO HBX-2042: Reenable when implemented in ORM 6.0
+	@Disabled
+	@Test
+	public void testGeneralHbmSettingsQuery()  throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"GeneralHbmSettings.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and that it does have arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/query")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(2, nodeList.getLength(), "Expected to get correct number of query elements" );
+		Attr genAtt = ( (Element)nodeList.item(0) ).getAttributeNode("name");
+		assertEquals("test_query_1", genAtt.getTextContent(), "Unexpected query name" );
+		genAtt = ( (Element)nodeList.item(0) ).getAttributeNode("flush-mode");
+		assertNull(genAtt, "Expected flush-mode value to be null");
+		genAtt = ( (Element)nodeList.item(1) ).getAttributeNode("name");
+		assertEquals("test_query_2", genAtt.getTextContent(), "Unexpected query name" );
+		genAtt = ( (Element)nodeList.item(1) ).getAttributeNode("flush-mode");
+		assertEquals("auto", genAtt.getTextContent(), "Unexpected flush-mode value" );
+		genAtt = ( (Element)nodeList.item(1) ).getAttributeNode("cacheable");
+		assertEquals("true", genAtt.getTextContent(), "Unexpected cacheable value" );
+		genAtt = ( (Element)nodeList.item(1) ).getAttributeNode("cache-region");
+		assertEquals("myregion", genAtt.getTextContent(), "Unexpected cache-region value" );
+		genAtt = ( (Element)nodeList.item(1) ).getAttributeNode("fetch-size");
+		assertEquals("10", genAtt.getTextContent(), "Unexpected fetch-size value" );
+		genAtt = ( (Element)nodeList.item(1) ).getAttributeNode("timeout");
+		assertEquals("1000", genAtt.getTextContent(), "Unexpected timeout value" );
+	}
+
+	// TODO HBX-2042: Reenable when implemented in ORM 6.0
+	@Disabled
+	@Test
+	public void testGeneralHbmSettingsSQLQueryBasic()  throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"GeneralHbmSettings.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and that it does have arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/sql-query")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(6, nodeList.getLength(), "Expected to get correct number of query elements" );
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/sql-query[@name=\"test_sqlquery_1\"]")
+				.evaluate(document, XPathConstants.NODESET);
+		Element node = (Element)nodeList.item(0);
+		assertNotNull(node, "Expected sql-query named 'test_sqlquery_1' not to be null");
+		Attr genAtt = node.getAttributeNode("flush-mode");
+		assertNull(genAtt, "Expected flush-mode value to be null");
+	}
+
+	// TODO HBX-2042: Reenable when implemented in ORM 6.0
+	@Disabled
+	@Test
+	public void testGeneralHbmSettingsSQLQueryAllAttributes()  throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"GeneralHbmSettings.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and that it does have arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/sql-query[@name=\"test_sqlquery_2\"]")
+				.evaluate(document, XPathConstants.NODESET);
+		Element node = (Element)nodeList.item(0);
+		assertNotNull(node, "Expected sql-query named 'test_sqlquery_2' not to be null");
+		Attr genAtt = node.getAttributeNode("name");
+		assertEquals("test_sqlquery_2", genAtt.getTextContent(), "Unexpected query name" );
+		genAtt = node.getAttributeNode("flush-mode");
+		assertEquals("auto", genAtt.getTextContent(), "Unexpected flush-mode value" );
+		genAtt = node.getAttributeNode("cacheable");
+		assertEquals("true", genAtt.getTextContent(), "Unexpected cacheable value" );
+		genAtt = node.getAttributeNode("cache-region");
+		assertEquals("myregion", genAtt.getTextContent(), "Unexpected cache-region value" );
+		genAtt = node.getAttributeNode("fetch-size");
+		assertEquals("10", genAtt.getTextContent(), "Unexpected fetch-size value" );
+		genAtt = node.getAttributeNode("timeout");
+		assertEquals("1000", genAtt.getTextContent(), "Unexpected timeout value" );
+		Element syncTable = (Element)node.getElementsByTagName("synchronize").item(0);
+		assertNull(syncTable, "Expected synchronize element to be null");
+	}
+
+	// TODO HBX-2042: Reenable when implemented in ORM 6.0
+	@Disabled
+	@Test
+	public void testGeneralHbmSettingsSQLQuerySynchronize()  throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"GeneralHbmSettings.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and that it does have arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/sql-query[@name=\"test_sqlquery_3\"]")
+				.evaluate(document, XPathConstants.NODESET);
+		Element node = (Element)nodeList.item(0);
+		assertNotNull(node, "Expected sql-query named 'test_sqlquery_3' not to be null");
+		Attr genAtt = node.getAttributeNode("name");
+		assertEquals("test_sqlquery_3", genAtt.getTextContent(), "Unexpected query name" );
+		Element syncTable = (Element)node.getElementsByTagName("synchronize").item(0);
+		assertNotNull(syncTable, "Expected synchronize element to not be null");
+		genAtt = syncTable.getAttributeNode("table");
+		assertEquals("mytable", genAtt.getTextContent(), "Unexpected table value for synchronize element" );
+		Element returnEl = (Element)node.getElementsByTagName("return").item(0);
+		assertNull(returnEl, "Expected return element to be null");
+	}
+
+	// TODO HBX-2042: Reenable when implemented in ORM 6.0
+	@Disabled
+	@Test
+	public void testGeneralHbmSettingsSQLQueryWithReturnRoot()  throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"GeneralHbmSettings.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and that it does have arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/sql-query[@name=\"test_sqlquery_4\"]")
+				.evaluate(document, XPathConstants.NODESET);
+		Element node = (Element)nodeList.item(0);
+		assertNotNull(node, "Expected sql-query named 'test_sqlquery_4' not to be null");
+		Attr genAtt = node.getAttributeNode("name");
+		assertEquals("test_sqlquery_4", genAtt.getTextContent(), "Unexpected query name" );
+		Element returnEl = (Element)node.getElementsByTagName("return").item(0);
+		assertNotNull(returnEl, "Expected return element to not be null");
+		genAtt = returnEl.getAttributeNode("alias");
+		assertEquals("e", genAtt.getTextContent(), "Unexpected alias value for return element" );
+		genAtt = returnEl.getAttributeNode("class");
+		assertEquals("org.hibernate.tool.hbm2x.hbm2hbmxml.BasicGlobals", genAtt.getTextContent(), "Unexpected class value for return element");
+	}
+
+	// TODO HBX-2042: Reenable when implemented in ORM 6.0
+	@Disabled
+	@Test
+	public void testGeneralHbmSettingsSQLQueryWithReturnRole()  throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"GeneralHbmSettings.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and that it does have arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/sql-query[@name=\"test_sqlquery_5\"]")
+				.evaluate(document, XPathConstants.NODESET);
+		Element node = (Element)nodeList.item(0);
+		assertNotNull(node, "Expected sql-query named 'test_sqlquery_5' not to be null");
+		Attr genAtt = node.getAttributeNode("name");
+		assertEquals("test_sqlquery_5", genAtt.getTextContent(), "Unexpected query name" );
+		Element returnEl = (Element)node.getElementsByTagName("return-join").item(0);
+		assertNotNull(returnEl, "Expected return element to not be null");
+		genAtt = returnEl.getAttributeNode("alias");
+		assertEquals("e", genAtt.getTextContent(), "Unexpected alias value for return element" );
+		genAtt = returnEl.getAttributeNode("property");
+		assertEquals("e.age", genAtt.getTextContent(), "Unexpected property role value for return element");
+	}
+
+	// TODO HBX-2042: Reenable when implemented in ORM 6.0
+	@Disabled
+	@Test
+	public void testGeneralHbmSettingsSQLQueryWithReturnCollection()  throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"GeneralHbmSettings.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder  db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		// Validate the Generator and that it does have arguments
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/sql-query[@name=\"test_sqlquery_6\"]")
+				.evaluate(document, XPathConstants.NODESET);
+		Element node = (Element)nodeList.item(0);
+		assertNotNull(node, "Expected sql-query named 'test_sqlquery_6' not to be null");
+		Attr genAtt = node.getAttributeNode("name");
+		assertEquals("test_sqlquery_6", genAtt.getTextContent(), "Unexpected query name");
+		Element returnEl = (Element)node.getElementsByTagName("load-collection").item(0);
+		assertNotNull(returnEl, "Expected return element to not be null");
+		genAtt = returnEl.getAttributeNode("alias");
+		assertEquals("e", genAtt.getTextContent(), "Unexpected alias value for return element");
+		genAtt = returnEl.getAttributeNode("role");
+		assertEquals("org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest.BasicGlobals.price", genAtt.getTextContent(), "Unexpected collection role value for return element");
+		genAtt = returnEl.getAttributeNode("lock-mode");
+		assertEquals("none", genAtt.getTextContent(), "Unexpected class lock-mode for return element");
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/Group.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/Group.java
new file mode 100644
index 000000000000..6631bc8a7aa9
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/Group.java
@@ -0,0 +1,24 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.IdBagTest;
+
+public class Group {
+	private String name;
+
+	public Group() {}
+
+	public Group(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/TestCase.java
new file mode 100644
index 000000000000..e8e127a84348
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/TestCase.java
@@ -0,0 +1,150 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.IdBagTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"UserGroup.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	private HbmExporter hbmexporter = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		assertFalse(new File(
+				srcDir,
+				"/GeneralHbmSettings.hbm.xml").exists());
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest/User.hbm.xml"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest/Group.hbm.xml"));
+	}
+
+	@Test
+	public void testArtifactCollection() {
+		assertEquals(
+				2,
+				hbmexporter.getArtifactCollector().getFileCount("hbm.xml"));
+	}
+
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = new ArrayList<>(4);
+		files.add(new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest/User.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest/Group.hbm.xml"));
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[2]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+	@Test
+	public void testIdBagAttributes() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest/User.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/idbag")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one idbag element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("`UserGroups`", node.getAttribute( "table" ));
+		assertEquals("groups", node.getAttribute( "name" ));
+		assertEquals("false", node.getAttribute( "lazy" ));
+		assertEquals("field", node.getAttribute( "access" ));
+	}
+
+	@Test
+	public void testCollectionId() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest/User.hbm.xml");
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/idbag/collection-id")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one collection-id element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("userGroupId", node.getAttribute( "column" ));
+		assertEquals("long", node.getAttribute( "type" ));
+		nodeList = node.getElementsByTagName("generator");
+		assertEquals(1, nodeList.getLength(), "Expected to get one generator element");
+		node = (Element) nodeList.item(0);
+		assertEquals("increment", node.getAttribute( "class" ));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/User.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/User.java
new file mode 100644
index 000000000000..371c880258ea
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/User.java
@@ -0,0 +1,37 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.IdBagTest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class User {
+	private String name;
+	private List<Group> groups = new ArrayList<Group>();
+
+	User() {}
+
+	public User(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+
+	void setName(String name) {
+		this.name = name;
+	}
+
+	public List<Group> getGroups() {
+		return groups;
+	}
+
+	void setGroups(List<Group> groups) {
+		this.groups = groups;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/InheritanceTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/InheritanceTest/TestCase.java
new file mode 100644
index 000000000000..7817b12ac1de
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/InheritanceTest/TestCase.java
@@ -0,0 +1,148 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.InheritanceTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * this test should be fixed to have a proper model. currently a mix of subclass/joinedsubclass is in play.
+ * @author max
+ *
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Aliens.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	private HbmExporter hbmexporter = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		assertFalse(new File(
+				srcDir,
+				"GeneralHbmSettings.hbm.xml").exists() );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Human.hbm.xml"));
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Alien.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Animal.hbm.xml") );
+	}
+
+	@Test
+	public void testArtifactCollection() {
+		assertEquals(
+				3,
+				hbmexporter.getArtifactCollector().getFileCount("hbm.xml"));
+	}
+
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = new ArrayList<>(4);
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Alien.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Human.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Animal.hbm.xml"));
+		Properties properties = new Properties();
+		properties.setProperty(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[3]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+	// TODO Re-enable this test: HBX-1247
+	@Disabled
+	@Test
+	public void testComment() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Alien.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/joined-subclass/comment")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one comment element");
+	}
+
+	@Test
+	public void testDiscriminator() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/InheritanceTest/Animal.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/discriminator")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one discriminator element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("string", node.getAttribute( "type" ));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Child.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Child.java
new file mode 100644
index 000000000000..28c88860af1c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Child.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.JoinTest;
+
+/**
+ * @author gavin
+ */
+public class Child {
+	private Long id;
+	private String name;
+	private Parent parent;
+	/**
+	 * @return Returns the id.
+	 */
+	public Long getId() {
+		return id;
+	}
+	/**
+	 * @param id The id to set.
+	 */
+	public void setId(Long id) {
+		this.id = id;
+	}
+	/**
+	 * @return Returns the name.
+	 */
+	public String getName() {
+		return name;
+	}
+	/**
+	 * @param name The name to set.
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	/**
+	 * @return Returns the parent.
+	 */
+	public Parent getParent() {
+		return parent;
+	}
+	/**
+	 * @param parent The parent to set.
+	 */
+	public void setParent(Parent parent) {
+		this.parent = parent;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Parent.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Parent.java
new file mode 100644
index 000000000000..7de432f7fe9a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Parent.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.JoinTest;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * @author gavin
+ */
+public class Parent {
+	private Long id;
+	private String name;
+	private Collection<Child> children = new HashSet<>();
+	/**
+	 * @return Returns the children.
+	 */
+	public Collection<Child> getChildren() {
+		return children;
+	}
+	/**
+	 * @param children The children to set.
+	 */
+	public void setChildren(Collection<Child> children) {
+		this.children = children;
+	}
+	/**
+	 * @return Returns the id.
+	 */
+	public Long getId() {
+		return id;
+	}
+	/**
+	 * @param id The id to set.
+	 */
+	public void setId(Long id) {
+		this.id = id;
+	}
+	/**
+	 * @return Returns the name.
+	 */
+	public String getName() {
+		return name;
+	}
+	/**
+	 * @param name The name to set.
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/TestCase.java
new file mode 100644
index 000000000000..441973aae4e6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/TestCase.java
@@ -0,0 +1,74 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.JoinTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Parent.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = new ArrayList<>(4);
+		files.add(new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/JoinTest/Parent.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"/org/hibernate/tool/hbm2x/hbm2hbmxml/JoinTest/Child.hbm.xml"));
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[2]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/Fee.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/Fee.java
new file mode 100644
index 000000000000..7b918046b33a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/Fee.java
@@ -0,0 +1,75 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.ListArrayTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.io.Serializable;
+
+public class Fee implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(Fee.class).getSerialVersionUID();
+
+	public Fee anotherFee;
+	public String fi;
+	public String key;
+	private FooComponent compon;
+	private int count;
+
+	public Fee() {
+	}
+
+	public String getFi() {
+		return fi;
+	}
+
+	public void setFi(String fi) {
+		this.fi = fi;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public Fee getAnotherFee() {
+		return anotherFee;
+	}
+
+	public void setAnotherFee(Fee anotherFee) {
+		this.anotherFee = anotherFee;
+	}
+
+
+	public FooComponent getCompon() {
+		return compon;
+	}
+
+	public void setCompon(FooComponent compon) {
+		this.compon = compon;
+	}
+
+	/**
+	 * Returns the count.
+	 * @return int
+	 */
+	public int getCount() {
+		return count;
+	}
+
+	/**
+	 * Sets the count.
+	 * @param count The count to set
+	 */
+	public void setCount(int count) {
+		this.count = count;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/FooComponent.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/FooComponent.java
new file mode 100644
index 000000000000..1829f2a73623
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/FooComponent.java
@@ -0,0 +1,121 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.ListArrayTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+public class FooComponent implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(FooComponent.class).getSerialVersionUID();
+
+	int count;
+	String name;
+	Date[] importantDates;
+	FooComponent subcomponent;
+	Fee fee = new Fee();
+	GlarchProxy glarch;
+
+	public boolean equals(Object that) {
+		if (that instanceof FooComponent fc) {
+			return count == fc.count;
+		} else {
+			return false;
+		}
+	}
+
+	public int hashCode() {
+		return count;
+	}
+
+	public String toString() {
+		StringBuilder result = new StringBuilder("FooComponent: " + name + "=" + count);
+		result.append("; dates=[");
+		if ( importantDates!=null) {
+			for ( int i=0; i<importantDates.length; i++ ) {
+				result.append(i == 0 ? "" : ", ").append(importantDates[i]);
+			}
+		}
+		result.append("]");
+		if ( subcomponent!=null ) {
+			result.append(" (").append(subcomponent).append(")");
+		}
+		return result.toString();
+	}
+
+	public FooComponent() {}
+
+	FooComponent(String name, int count, Date[] dates, FooComponent subcomponent) {
+		this.name = name;
+		this.count = count;
+		this.importantDates = dates;
+		this.subcomponent = subcomponent;
+	}
+
+	FooComponent(String name, int count, Date[] dates, FooComponent subcomponent, Fee fee) {
+		this.name = name;
+		this.count = count;
+		this.importantDates = dates;
+		this.subcomponent = subcomponent;
+		this.fee = fee;
+	}
+
+	public int getCount() {
+		return count;
+	}
+	public void setCount(int count) {
+		this.count = count;
+	}
+
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Date[] getImportantDates() {
+		return importantDates;
+	}
+	public void setImportantDates(Date[] importantDates) {
+		this.importantDates = importantDates;
+	}
+
+	public FooComponent getSubcomponent() {
+		return subcomponent;
+	}
+	public void setSubcomponent(FooComponent subcomponent) {
+		this.subcomponent = subcomponent;
+	}
+
+	@SuppressWarnings("unused")
+	private String getNull() {
+		return null;
+	}
+	@SuppressWarnings("unused")
+	private void setNull(String str) throws Exception {
+		if (str!=null) throw new Exception("null component property");
+	}
+	public Fee getFee() {
+		return fee;
+	}
+
+	public void setFee(Fee fee) {
+		this.fee = fee;
+	}
+
+	public GlarchProxy getGlarch() {
+		return glarch;
+	}
+
+	public void setGlarch(GlarchProxy glarch) {
+		this.glarch = glarch;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.java
new file mode 100644
index 000000000000..d80f9a0b4a5f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.java
@@ -0,0 +1,183 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.ListArrayTest;
+
+import org.hibernate.Session;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class Glarch implements GlarchProxy, Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(Glarch.class).getSerialVersionUID();
+
+	private int version;
+	private GlarchProxy next;
+	private short order;
+	private List<Object> strings;
+	private Map<Object,Object> stringSets;
+	private List<Object> fooComponents;
+	private GlarchProxy[] proxyArray;
+	private transient Map<Object, Object> dynaBean;
+	private String immutable;
+	private int derivedVersion;
+	private Object any;
+	private int x;
+	private String name;
+
+	public int getX() {
+		return x;
+	}
+	public void setX(int x) {
+		this.x = x;
+	}
+
+	public int getVersion() {
+		return version;
+	}
+
+	public void setVersion(int version) {
+		this.version = version;
+	}
+
+	public GlarchProxy getNext() {
+		return next;
+	}
+	public void setNext(GlarchProxy next) {
+		this.next = next;
+	}
+
+	public short getOrder() {
+		return order;
+	}
+	public void setOrder(short order) {
+		this.order = order;
+	}
+
+	public List<Object> getStrings() {
+		return strings;
+	}
+
+	public void setStrings(List<Object> strings) {
+		this.strings = strings;
+	}
+
+	public Map<Object, Object> getStringSets() {
+		return stringSets;
+	}
+
+	public void setStringSets(Map<Object, Object> stringSets) {
+		this.stringSets = stringSets;
+	}
+
+	public List<Object> getFooComponents() {
+		return fooComponents;
+	}
+
+	public void setFooComponents(List<Object> fooComponents) {
+		this.fooComponents = fooComponents;
+	}
+
+	public GlarchProxy[] getProxyArray() {
+		return proxyArray;
+	}
+	public void setProxyArray(GlarchProxy[] proxyArray) {
+		this.proxyArray = proxyArray;
+	}
+
+	public void onLoad(Session s, Serializable id) {
+		if ( ! ( ( (String) id ).length()==32 ) ) throw new RuntimeException("id problem");
+	}
+
+	public boolean onSave(Session s) {
+		dynaBean = new HashMap<>();
+		dynaBean.put("foo", "foo");
+		dynaBean.put("bar", 66);
+		immutable="never changes!";
+		return false;
+	}
+
+	public boolean onUpdate(Session s) {
+		return false;
+	}
+
+	/**
+	 * Returns the dynaBean.
+	 * @return DynaBean
+	 */
+	public Map<Object, Object> getDynaBean() {
+		return dynaBean;
+	}
+
+	/**
+	 * Sets the dynaBean.
+	 * @param dynaBean The dynaBean to set
+	 */
+	public void setDynaBean(Map<Object, Object> dynaBean) {
+		this.dynaBean = dynaBean;
+	}
+
+	/**
+	 * Returns the immutable.
+	 * @return String
+	 */
+	public String getImmutable() {
+		return immutable;
+	}
+
+	/**
+	 * Sets the immutable.
+	 * @param immutable The immutable to set
+	 */
+	public void setImmutable(String immutable) {
+		this.immutable = immutable;
+	}
+
+	/**
+	 * Returns the derivedVersion.
+	 * @return int
+	 */
+	public int getDerivedVersion() {
+		return derivedVersion;
+	}
+
+	/**
+	 * Sets the derivedVersion.
+	 * @param derivedVersion The derivedVersion to set
+	 */
+	public void setDerivedVersion(int derivedVersion) {
+		this.derivedVersion = derivedVersion;
+	}
+
+	/**
+	 * Returns the any.
+	 * @return Object
+	 */
+	public Object getAny() {
+		return any;
+	}
+
+	/**
+	 * Sets the any.
+	 * @param any The any to set
+	 */
+	public void setAny(Object any) {
+		this.any = any;
+	}
+
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/GlarchProxy.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/GlarchProxy.java
new file mode 100644
index 000000000000..6c300318be23
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/GlarchProxy.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.ListArrayTest;
+
+import java.util.List;
+import java.util.Map;
+
+public interface GlarchProxy {
+
+	int getVersion();
+	int getDerivedVersion();
+	void setVersion(int version);
+
+	String getName();
+	void setName(String name);
+
+	GlarchProxy getNext();
+	void setNext(GlarchProxy next);
+
+	short getOrder();
+	void setOrder(short order);
+
+	List<Object> getStrings();
+	void setStrings(List<Object> strings);
+
+	Map<Object, Object> getDynaBean();
+	void setDynaBean(Map<Object, Object> bean);
+
+	Map<Object, Object> getStringSets();
+	void setStringSets(Map<Object, Object> stringSets);
+
+	List<Object> getFooComponents();
+	void setFooComponents(List<Object> fooComponents);
+
+	GlarchProxy[] getProxyArray();
+	void setProxyArray(GlarchProxy[] proxyArray);
+
+	Object getAny();
+	void setAny(Object any);
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/TestCase.java
new file mode 100644
index 000000000000..a51254925cd8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/TestCase.java
@@ -0,0 +1,167 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.ListArrayTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Glarch.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest/Fee.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml") );
+	}
+
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = new ArrayList<>( 4 );
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest/Fee.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml"));
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[2]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+	@Test
+	public void testListNode() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/list")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(2, nodeList.getLength(), "Expected to get two list element");
+		Element node = (Element) nodeList.item(1); //second list
+		assertEquals("fooComponents", node.getAttribute( "name" ));
+		assertEquals("true", node.getAttribute( "lazy" ));
+		assertEquals("all", node.getAttribute( "cascade" ));
+		nodeList = node.getElementsByTagName("list-index");
+		assertEquals(1, nodeList.getLength(), "Expected to get one list-index element");
+		nodeList = ((Element) nodeList.item(0)).getElementsByTagName("column");
+		assertEquals(1, nodeList.getLength(), "Expected to get one column element");
+		node = (Element) nodeList.item(0);
+		assertEquals("tha_indecks", node.getAttribute( "name" ));
+		node = (Element)node.getParentNode().getParentNode();//list
+		nodeList = node.getElementsByTagName("composite-element");
+		assertEquals(1, nodeList.getLength(), "Expected to get one composite-element element");
+		node = (Element)nodeList.item(0);
+		int propertyCount = 0;
+		nodeList = node.getChildNodes();
+		for (int i = 0; i < nodeList.getLength(); i++) {
+			if ("property".equals(nodeList.item(i).getNodeName())) propertyCount++;
+		}
+		assertEquals(2, propertyCount, "Expected to get two property element");
+		node = (Element)node.getElementsByTagName("many-to-one").item(0);
+		assertEquals("fee", node.getAttribute( "name" ));
+		assertEquals("all", node.getAttribute( "cascade" ));
+		//TODO :assertEquals(node.attribute( "outer-join" ).getText(),"true");
+		node = (Element)node.getParentNode();//composite-element
+		node = (Element)node.getElementsByTagName("nested-composite-element").item(0);
+		assertEquals("subcomponent", node.getAttribute( "name" ));
+		assertEquals("org.hibernate.tool.hbm2x.hbm2hbmxml.ListArrayTest.FooComponent", node.getAttribute( "class" ));
+	}
+
+	@Test
+	public void testArrayNode() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/array")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one array element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("proxyArray", node.getAttribute( "name" ));
+		assertEquals("org.hibernate.tool.hbm2x.hbm2hbmxml.ListArrayTest.GlarchProxy", node.getAttribute( "element-class" ));
+		nodeList = node.getElementsByTagName("list-index");
+		assertEquals(1, nodeList.getLength(), "Expected to get one list-index element");
+		nodeList = ((Element) nodeList.item(0)).getElementsByTagName("column");
+		assertEquals(1, nodeList.getLength(), "Expected to get one column element");
+		node = (Element) nodeList.item(0);
+		assertEquals("array_indecks", node.getAttribute( "name" ));
+		node = (Element)node.getParentNode().getParentNode();//array
+		nodeList = node.getElementsByTagName("one-to-many");
+		assertEquals(1, nodeList.getLength(), "Expected to get one 'one-to-many' element");
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/Group.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/Group.java
new file mode 100644
index 000000000000..4e2eaedbb38f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/Group.java
@@ -0,0 +1,63 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.ManyToManyTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
+public class Group implements Serializable {
+
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(Group.class).getSerialVersionUID();
+
+	private String org;
+	private String name;
+	private String description;
+
+	private Set<User> users = new HashSet<User>();
+
+	public Group(String name, String org) {
+		this.org = org;
+		this.name = name;
+	}
+
+	public Group() {
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOrg() {
+		return org;
+	}
+
+	public void setOrg(String org) {
+		this.org = org;
+	}
+
+	public Set<User> getUsers() {
+		return users;
+	}
+
+	public void setUsers(Set<User> users) {
+		this.users = users;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/TestCase.java
new file mode 100644
index 000000000000..2ad10cfff7eb
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/TestCase.java
@@ -0,0 +1,183 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.ManyToManyTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"UserGroup.hbm.xml"
+	};
+
+	private static DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY;
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private HbmExporter hbmexporter = null;
+	private File srcDir = null;
+
+	@BeforeAll
+	public static void beforeAll() throws Exception {
+		DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance(
+				"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl",
+				null);
+		DOCUMENT_BUILDER_FACTORY.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+	}
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "output");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		assertFalse(new File(
+				srcDir,
+				"GeneralHbmSettings.hbm.xml")
+			.exists() );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/User.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/Group.hbm.xml") );
+	}
+
+	@Test
+	public void testArtifactCollection() {
+		assertEquals(
+				2,
+				hbmexporter.getArtifactCollector().getFileCount("hbm.xml"));
+	}
+
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = new ArrayList<>(4);
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/User.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/Group.hbm.xml"));
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[2]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+	@Test
+	public void testManyToMany() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/User.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilder db = DOCUMENT_BUILDER_FACTORY.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/set/many-to-many")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one many-to-many element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.ManyToManyTest.Group", node.getAttribute( "entity-name" ));
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/set")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one set element");
+		node = (Element) nodeList.item(0);
+		assertEquals("UserGroup", node.getAttribute( "table" ));
+	}
+
+	@Test
+	public void testCompositeId() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/Group.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilder db = DOCUMENT_BUILDER_FACTORY.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one class element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("`Group`", node.getAttribute("table"));
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/composite-id")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one composite-id element");
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/composite-id/key-property")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(2, nodeList.getLength(), "Expected to get two key-property elements");
+		node = (Element) nodeList.item(0);
+		assertEquals("name", node.getAttribute("name"));
+		node = (Element) nodeList.item(1);
+		assertEquals("org", node.getAttribute("name"));
+	}
+
+	@Test
+	public void testSetAttributes() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/Group.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilder db = DOCUMENT_BUILDER_FACTORY.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/set")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one set element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("UserGroup", node.getAttribute("table"));
+		assertEquals("users", node.getAttribute("name"));
+		assertEquals("true", node.getAttribute("inverse"));
+		assertEquals("extra", node.getAttribute("lazy"));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/User.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/User.java
new file mode 100644
index 000000000000..5dd5f1c0f959
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/User.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.ManyToManyTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
+public class User implements Serializable {
+
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(User.class).getSerialVersionUID();
+
+	private String org;
+	private String name;
+	private Set<Group> groups = new HashSet<Group>();
+
+	public User(String name, String org) {
+		this.org = org;
+		this.name = name;
+	}
+
+	public User() {
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOrg() {
+		return org;
+	}
+
+	public void setOrg(String org) {
+		this.org = org;
+	}
+
+	public Set<Group> getGroups() {
+		return groups;
+	}
+
+	public void setGroups(Set<Group> groups) {
+		this.groups = groups;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Address.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Address.java
new file mode 100644
index 000000000000..835f0d85d342
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Address.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.MapAndAnyTest;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class Address {
+	private Long id;
+	private Set<String> lines = new HashSet<String>();
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Set<String> getLines() {
+		return lines;
+	}
+
+	public void setLines(Set<String> lines) {
+		this.lines = lines;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.java
new file mode 100644
index 000000000000..894de81a8c36
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.java
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.MapAndAnyTest;
+
+public class Person {
+	private Long id;
+	private String name;
+	private Object data;
+
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Object getData() {
+		return data;
+	}
+
+	public void setData(Object data) {
+		this.data = data;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/TestCase.java
new file mode 100644
index 000000000000..5d5e4a6f0d26
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/TestCase.java
@@ -0,0 +1,215 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.MapAndAnyTest;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.mapping.Any;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.jspecify.annotations.NonNull;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Properties.hbm.xml",
+			"Person.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		metadata = metadataDescriptor.createMetadata();
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/ComplexPropertyValue.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/IntegerPropertyValue.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/StringPropertyValue.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/PropertySet.hbm.xml") );
+	}
+
+	@Test
+	public void testReadable() {
+		ArrayList<File> files = getFiles();
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files.toArray(new File[4]), properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+	private @NonNull ArrayList<File> getFiles() {
+		ArrayList<File> files = new ArrayList<>(4);
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/ComplexPropertyValue.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/IntegerPropertyValue.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/StringPropertyValue.hbm.xml"));
+		files.add(new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/PropertySet.hbm.xml"));
+		return files;
+	}
+
+	@Test
+	public void testAnyNode() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/PropertySet.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/any")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one any element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("someSpecificProperty", node.getAttribute( "name" ));
+		assertEquals("long", node.getAttribute( "id-type" ));
+		assertEquals("string", node.getAttribute( "meta-type" ));
+		assertEquals("all", node.getAttribute( "cascade" ));
+		assertEquals("field", node.getAttribute( "access" ));
+		nodeList = node.getElementsByTagName("column");
+		assertEquals(2, nodeList.getLength(), "Expected to get two column elements");
+		nodeList = node.getElementsByTagName("meta-value");
+		assertEquals(3, nodeList.getLength(), "Expected to get three meta-value elements");
+		node = (Element) nodeList.item(0);
+		String className = node.getAttribute( "class" );
+		assertNotNull(className, "Expected class attribute in meta-value");
+		if (className.indexOf("IntegerPropertyValue") > 0){
+			assertEquals("I", node.getAttribute( "value" ));
+		} else if (className.indexOf("StringPropertyValue") > 0){
+			assertEquals("S", node.getAttribute( "value" ));
+		} else {
+			assertTrue(className.indexOf("ComplexPropertyValue") > 0);
+			assertEquals("C", node.getAttribute( "value" ));
+		}
+	}
+
+	@Test
+	public void testMetaValueRead() {
+		PersistentClass pc = metadata.getEntityBinding("org.hibernate.tool.hbm2x.hbm2hbmxml.MapAndAnyTest.Person");
+		assertNotNull(pc);
+		Property prop = pc.getProperty("data");
+		assertNotNull(prop);
+		assertInstanceOf(Any.class, prop.getValue());
+		Any any = (Any) prop.getValue();
+		assertNotNull(any.getMetaValues(), "Expected to get one meta-value element");
+		assertEquals(1, any.getMetaValues().size(), "Expected to get one meta-value element");
+	}
+
+	@Test
+	public void testMapManyToAny() throws Exception {
+		File outputXml = new File(srcDir,  "org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest/PropertySet.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/map")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one any element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("generalProperties", node.getAttribute( "name" ));
+		assertEquals("T_GEN_PROPS", node.getAttribute( "table" ));
+		assertEquals("true", node.getAttribute( "lazy" ));
+		assertEquals("all", node.getAttribute( "cascade" ));
+		assertEquals("field", node.getAttribute( "access" ));
+		nodeList = node.getElementsByTagName("key");
+		assertEquals(1, nodeList.getLength(), "Expected to get one key element");
+		nodeList = node.getElementsByTagName("map-key");
+		assertEquals(1, nodeList.getLength(), "Expected to get one map-key element");
+		node = (Element) nodeList.item(0);
+		assertEquals("string", node.getAttribute( "type" ));
+		nodeList = node.getElementsByTagName("column");
+		assertEquals(1, nodeList.getLength(), "Expected to get one column element");
+		node = (Element)node.getParentNode();//map
+		nodeList = node.getElementsByTagName("many-to-any");
+		assertEquals(1, nodeList.getLength(), "Expected to get one many-to-any element");
+		node = (Element) nodeList.item(0);
+		nodeList = node.getElementsByTagName("column");
+		assertEquals(2, nodeList.getLength(), "Expected to get two column elements");
+		nodeList = node.getElementsByTagName("meta-value");
+		assertEquals(2, nodeList.getLength(), "Expected to get two meta-value elements");
+		node = (Element) nodeList.item(0);
+		String className = node.getAttribute( "class" );
+		assertNotNull(className, "Expected class attribute in meta-value");
+		if (className.indexOf("IntegerPropertyValue") > 0){
+			assertEquals("I", node.getAttribute( "value" ));
+		} else {
+			assertTrue(className.indexOf("StringPropertyValue") > 0);
+			assertEquals("S", node.getAttribute( "value" ));
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Address.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Address.java
new file mode 100644
index 000000000000..5e626257587b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Address.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.OneToOneTest;
+
+public class Address {
+
+	int id;
+
+	Person person;
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Person.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Person.java
new file mode 100644
index 000000000000..56ff0868656b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/Person.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.OneToOneTest;
+
+public class Person {
+
+	int id;
+
+	Address address;
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/TestCase.java
new file mode 100644
index 000000000000..cd95140f694c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/TestCase.java
@@ -0,0 +1,133 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.OneToOneTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"PersonAddressOneToOnePrimaryKey.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+	private HbmExporter hbmexporter = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		assertFalse(new File(
+				srcDir, "GeneralHbmSettings.hbm.xml")
+			.exists());
+		JUnitUtil.assertIsNonEmptyFile(
+				new File(
+						srcDir,
+						"org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/Person.hbm.xml"));
+		JUnitUtil.assertIsNonEmptyFile(
+				new File(
+						srcDir,
+						"/org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/Address.hbm.xml"));
+	}
+
+	@Test
+	public void testArtifactCollection() {
+		assertEquals(
+				2,
+				hbmexporter.getArtifactCollector().getFileCount("hbm.xml"));
+	}
+
+	@Test
+	public void testReadable() {
+		File personHbmXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/Person.hbm.xml");
+		File addressHbmXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/Address.hbm.xml");
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		File[] files = new File[] { personHbmXml, addressHbmXml };
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files, properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+	@Test
+	public void testOneToOne() throws Exception {
+		File xmlFile = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/Person.hbm.xml");
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(xmlFile);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/one-to-one")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one-to-one element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("address", node.getAttribute( "name" ));
+		assertEquals("false", node.getAttribute( "constrained" ));
+		xmlFile = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/OneToOneTest/Address.hbm.xml");
+		document = db.parse(xmlFile);
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/one-to-one")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one set element");
+		node = (Element) nodeList.item(0);
+		assertEquals("person", node.getAttribute( "name" ));
+		assertEquals("true", node.getAttribute( "constrained" ));
+		assertEquals("field", node.getAttribute( "access" ));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/Search.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/Search.java
new file mode 100644
index 000000000000..dc5ad004281b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/Search.java
@@ -0,0 +1,32 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.SetElementTest;
+
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+public class Search {
+	private String searchString;
+	private SortedSet<String> searchResults = new TreeSet<>();
+
+	Search() {}
+
+	public Search(String string) {
+		searchString = string;
+	}
+
+	public SortedSet<String> getSearchResults() {
+		return searchResults;
+	}
+	public void setSearchResults(SortedSet<String> searchResults) {
+		this.searchResults = searchResults;
+	}
+	public String getSearchString() {
+		return searchString;
+	}
+	public void setSearchString(String searchString) {
+		this.searchString = searchString;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/TestCase.java
new file mode 100644
index 000000000000..0aea54304f9e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/TestCase.java
@@ -0,0 +1,143 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.SetElementTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Search.hbm.xml",
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "src");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		JUnitUtil.assertIsNonEmptyFile(
+				new File(
+						srcDir,
+						"org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml"));
+	}
+
+	@Test
+	public void testReadable() {
+		File searchHbmXml =	new File(
+						srcDir,
+						"org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml");
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.put(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		File[] files = new File[] { searchHbmXml };
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files, properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+	@Test
+	public void testKey() throws Exception {
+		File outputXml =
+				new File(
+						srcDir,
+						"org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/set/key")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one key element");
+		Element node = (Element)nodeList.item(0);
+		if (!node.getAttribute("column").isEmpty()) {//implied attribute
+			assertEquals("searchString", node.getAttribute( "column" ));
+		} else {
+			node = (Element)node.getElementsByTagName("column").item(0);
+			assertEquals("searchString", node.getAttribute( "name" ));
+		}
+	}
+
+	@Test
+	public void testSetElement() throws Exception {
+		File outputXml =
+				new File(
+						srcDir,
+						"org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/set")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one set element");
+		Element node = (Element) nodeList.item(0);
+		assertEquals("searchResults", node.getAttribute( "name" ));
+		assertEquals("field", node.getAttribute( "access" ));
+		nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/set/element")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(1, nodeList.getLength(), "Expected to get one element 'element'");
+		node = (Element) nodeList.item(0);
+		assertEquals("string", node.getAttribute( "type" ));
+		nodeList = node.getElementsByTagName("column");
+		assertEquals(1, nodeList.getLength(), "Expected to get one element 'column'");
+		node = (Element) nodeList.item(0);
+		assertEquals("text", node.getAttribute( "name"));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/TypeParamsTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/TypeParamsTest/TestCase.java
new file mode 100644
index 000000000000..22e98c4a9dee
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/TypeParamsTest/TestCase.java
@@ -0,0 +1,156 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.TypeParamsTest;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.ConnectionProvider;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author Dmitry Geraskov
+ * @author koen
+ */
+//TODO Reenable this test and make it pass (See HBX-2884)
+@Disabled
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"Order.hbm.xml",
+	};
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private File srcDir = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		srcDir = new File(outputFolder, "output");
+		assertTrue(srcDir.mkdir());
+		File resourcesDir = new File(outputFolder, "resources");
+		assertTrue(resourcesDir.mkdir());
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+		Exporter hbmexporter = new HbmExporter();
+		hbmexporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hbmexporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, srcDir);
+		hbmexporter.start();
+	}
+
+	@Test
+	public void testAllFilesExistence() {
+		JUnitUtil.assertIsNonEmptyFile(
+				new File(
+						srcDir,
+						"org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml"));
+	}
+
+	@Test
+	public void testReadable() {
+		File orderHbmXml =
+				new File(
+						srcDir,
+						"org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml");
+		Properties properties = new Properties();
+		properties.setProperty(AvailableSettings.DIALECT, HibernateUtil.Dialect.class.getName());
+		properties.setProperty(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		File[] files = new File[] { orderHbmXml };
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files, properties);
+		assertNotNull(metadataDescriptor.createMetadata());
+	}
+
+	@Test
+	public void testTypeParamsElements() throws Exception {
+		File outputXml = new File(
+				srcDir,
+				"org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml");
+		JUnitUtil.assertIsNonEmptyFile(outputXml);
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document document = db.parse(outputXml);
+		XPath xpath = XPathFactory.newInstance().newXPath();
+		NodeList nodeList = (NodeList)xpath
+				.compile("//hibernate-mapping/class/property")
+				.evaluate(document, XPathConstants.NODESET);
+		assertEquals(2, nodeList.getLength(), "Expected to get one property element");
+		Element statusElement = (Element) nodeList.item(0);
+		Element nameElement = (Element) nodeList.item(1);
+		if(!statusElement.getAttribute( "name" ).equals("status")) {
+			Element temp = nameElement;
+			nameElement = statusElement;
+			statusElement = temp;
+		}
+		assertEquals("status", statusElement.getAttribute( "name" ));
+		nodeList = statusElement.getElementsByTagName("type");
+		assertEquals(1, nodeList.getLength(), "Expected to get one type element");
+		nodeList =  ((Element) nodeList.item(0)).getElementsByTagName("param");
+		assertEquals(5, nodeList.getLength(), "Expected to get 5 params elements");
+		Map<String, String> params = new HashMap<>();
+		for (int i = 0; i < nodeList.getLength(); i++) {
+			Element param = (Element) nodeList.item(i);
+			params.put(param.getAttribute( "name" ), param.getTextContent());
+		}
+		Set<String> set = params.keySet();
+		assertEquals(5, params.size(), "Expected to get 5 different params elements");
+		assertTrue(
+				set.contains("catalog"),
+				"Can't find 'catalog' param");
+		assertEquals("", params.get("catalog"));
+		assertTrue(
+				set.contains("column"),
+				"Can't find 'column' param");
+		assertEquals("STATUS", params.get("column"));
+		assertTrue(
+				set.contains("table"),
+				"Can't find 'table' param");
+		assertEquals("ORDERS", params.get("table"));
+		assertTrue(
+				set.contains("schema"),
+				"Can't find 'schema' param");
+		assertEquals("", params.get("schema"));
+		assertTrue(
+				set.contains("enumClass"),
+				"Can't find 'enumClass' param");
+		assertEquals(
+				Status.class.getName(),
+				params.get("enumClass"));
+		assertEquals(0, nameElement.getElementsByTagName("type").getLength(), "property name should not have any type element");
+		assertEquals("string", nameElement.getAttribute("type"));
+	}
+
+	enum Status {
+		ON, OFF
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/Group.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/Group.java
new file mode 100644
index 000000000000..53d11bac430a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/Group.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.query.QueryExporterTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
+public class Group implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(Group.class).getSerialVersionUID();
+
+	private String description;
+	private UserID userId;
+
+	private Set<User> users = new HashSet<>();
+
+	public Group(String name, String org) {
+		this.setUserId(new UserID(name, org));
+	}
+
+	public Group() {
+	}
+
+	public void setUserId(UserID userId) {
+		this.userId = userId;
+	}
+
+	public UserID getUserId() {
+		return userId;
+	}
+
+	public Set<User> getUsers() {
+		return users;
+	}
+
+	public void setUsers(Set<User> users) {
+		this.users = users;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/TestCase.java
new file mode 100644
index 000000000000..447aeefa153e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/TestCase.java
@@ -0,0 +1,110 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.query.QueryExporterTest;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.boot.Metadata;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.hibernate.tool.reveng.test.utils.ResourceUtil;
+import org.hibernate.tool.schema.TargetType;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class TestCase {
+
+	@TempDir
+	public File outputDir = new File("output");
+
+	private File destinationDir = null;
+	private File userGroupHbmXmlFile = null;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		JdbcUtil.createDatabase(this);
+		destinationDir = new File(outputDir, "destination");
+		assertTrue(destinationDir.mkdir());
+		File resourcesDir = new File(outputDir, "resources");
+		assertTrue(resourcesDir.mkdir());
+		String[] resources = { "UserGroup.hbm.xml" };
+		ResourceUtil.createResources(this, resources, resourcesDir);
+		userGroupHbmXmlFile = new File(resourcesDir, "UserGroup.hbm.xml");
+		SessionFactory factory = createMetadata().buildSessionFactory();
+		Session s = factory.openSession();
+		Transaction t = s.beginTransaction();
+		User user = new User("max", "jboss");
+		s.persist( user );
+		user = new User("gavin", "jboss");
+		s.persist( user );
+		s.flush();
+		t.commit();
+		s.close();
+		factory.close();
+	}
+
+	@Test
+	public void testQueryExporter() {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.QUERY);
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(
+						null,
+						new File[] { userGroupHbmXmlFile },
+						null);
+		exporter.getProperties().put(AvailableSettings.HBM2DDL_AUTO, "update");
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, destinationDir);
+		exporter.getProperties().put(ExporterConstants.OUTPUT_FILE_NAME, "queryresult.txt");
+		List<String> queries = new ArrayList<>();
+		queries.add("from java.lang.Object");
+		exporter.getProperties().put(ExporterConstants.QUERY_LIST, queries);
+		exporter.start();
+		JUnitUtil.assertIsNonEmptyFile(new File(destinationDir, "queryresult.txt"));
+	}
+
+	@AfterEach
+	public void tearDown() throws Exception {
+		SchemaExport export = new SchemaExport();
+		final EnumSet<TargetType> targetTypes = EnumSet.noneOf( TargetType.class );
+		targetTypes.add( TargetType.DATABASE );
+		export.drop(targetTypes, createMetadata());
+		if (export.getExceptions() != null && !export.getExceptions().isEmpty()){
+			fail("Schema export failed");
+		}
+		JdbcUtil.dropDatabase(this);
+	}
+
+	private Metadata createMetadata() {
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.HBM2DDL_AUTO, "update");
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(
+						null,
+						new File[] { userGroupHbmXmlFile },
+						properties);
+		return metadataDescriptor.createMetadata();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/User.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/User.java
new file mode 100644
index 000000000000..5c29bf4a75b8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/User.java
@@ -0,0 +1,45 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.query.QueryExporterTest;
+
+import java.io.ObjectStreamClass;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
+public class User implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID =
+			ObjectStreamClass.lookup(User.class).getSerialVersionUID();
+
+	private Set<Group> groups = new HashSet<>();
+	private UserID userId;
+
+	public User(String name, String org) {
+		this.setUserId(new UserID(name, org));
+	}
+
+	public User() {
+	}
+
+	public void setUserId(UserID userId) {
+		this.userId = userId;
+	}
+
+	public UserID getUserId() {
+		return userId;
+	}
+
+	public Set<Group> getGroups() {
+		return groups;
+	}
+
+	public void setGroups(Set<Group> groups) {
+		this.groups = groups;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/UserID.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/UserID.java
new file mode 100644
index 000000000000..457f819224df
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/UserID.java
@@ -0,0 +1,35 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbm2x.query.QueryExporterTest;
+
+public class UserID {
+
+	private String org;
+	private String name;
+
+	public UserID() {}
+
+	public UserID(String name, String org) {
+		this.org = org;
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOrg() {
+		return org;
+	}
+
+	public void setOrg(String org) {
+		this.org = org;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/HbmLintTest/BrokenLazy.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/HbmLintTest/BrokenLazy.java
new file mode 100644
index 000000000000..67cba38d726b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/HbmLintTest/BrokenLazy.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbmlint.HbmLintTest;
+
+public class BrokenLazy {
+
+	long id;
+
+	public BrokenLazy(long id) {
+		this.id = id;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/HbmLintTest/BrokenNonLazy.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/HbmLintTest/BrokenNonLazy.java
new file mode 100644
index 000000000000..a9bd8d8f6012
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/HbmLintTest/BrokenNonLazy.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbmlint.HbmLintTest;
+
+public class BrokenNonLazy {
+
+	long id;
+
+	public BrokenNonLazy(long id) {
+		this.id = id;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/HbmLintTest/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/HbmLintTest/TestCase.java
new file mode 100644
index 000000000000..be1ff10007c5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/HbmLintTest/TestCase.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbmlint.HbmLintTest;
+
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.internal.export.lint.*;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestCase {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"CachingSettings.hbm.xml",
+			"IdentifierIssues.hbm.xml",
+			"BrokenLazy.hbm.xml"
+	};
+
+	@TempDir
+	public File outputDir = new File("output");
+
+	private MetadataDescriptor metadataDescriptor = null;
+
+	@BeforeEach
+	public void setUp() {
+		File resourcesDir = new File(outputDir, "resources");
+		assertTrue(resourcesDir.mkdir());
+		metadataDescriptor = HibernateUtil.initializeMetadataDescriptor(this, HBM_XML_FILES, resourcesDir);
+	}
+
+	@Test
+	public void testExporter() {
+		HbmLintExporter exporter = new HbmLintExporter();
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.start();
+	}
+
+	@Test
+	public void testValidateCache() {
+		HbmLint analyzer = new HbmLint(new Detector[] { new BadCachingDetector() });
+		analyzer.analyze(metadataDescriptor.createMetadata());
+		assertEquals(1,analyzer.getResults().size());
+	}
+
+	@Test
+	public void testValidateIdentifier() {
+		HbmLint analyzer = new HbmLint(new Detector[] { new ShadowedIdentifierDetector() });
+		analyzer.analyze(metadataDescriptor.createMetadata());
+		assertEquals(1,analyzer.getResults().size());
+	}
+
+	@Test
+	public void testBytecodeRestrictions() {
+		HbmLint analyzer = new HbmLint(new Detector[] { new InstrumentationDetector() });
+		analyzer.analyze(metadataDescriptor.createMetadata());
+		assertEquals(2,analyzer.getResults().size(), analyzer.getResults().toString());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/TestCase.java
new file mode 100644
index 000000000000..87a70b88bf64
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/TestCase.java
@@ -0,0 +1,92 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.hbmlint.SchemaAnalyzer;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.id.SequenceMismatchStrategy;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.internal.export.lint.Issue;
+import org.hibernate.tool.reveng.internal.export.lint.IssueCollector;
+import org.hibernate.tool.reveng.internal.export.lint.SchemaByMetaDataDetector;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author koen
+ */
+public class TestCase {
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testSchemaAnalyzer() {
+
+		StandardServiceRegistryBuilder ssrb = new StandardServiceRegistryBuilder();
+		ssrb.applySetting(
+				AvailableSettings.SEQUENCE_INCREMENT_SIZE_MISMATCH_STRATEGY,
+				SequenceMismatchStrategy.NONE);
+		MetadataSources metadataSources = new MetadataSources(ssrb.build());
+		metadataSources.addResource("org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml");
+		Metadata metadata = metadataSources.buildMetadata();
+		SchemaByMetaDataDetector analyzer = new SchemaByMetaDataDetector();
+		analyzer.initialize( metadata );
+
+
+		for (Table table : metadata.collectTableMappings()) {
+			MockCollector mc = new MockCollector();
+
+			if (table.getName().equalsIgnoreCase("MISSING_TABLE")) {
+				analyzer.visit(table, mc);
+				assertEquals(1, mc.problems.size());
+				Issue ap = mc.problems.get(0);
+				assertTrue(ap.getDescription().contains("Missing table"));
+			} else if (table.getName().equalsIgnoreCase("CATEGORY")) {
+				analyzer.visit(table, mc);
+				assertEquals(1, mc.problems.size());
+				Issue ap = mc.problems.get(0);
+				assertTrue(ap.getDescription().contains("missing column: name"));
+			} else if (table.getName().equalsIgnoreCase("BAD_TYPE")) {
+				analyzer.visit(table, mc);
+				assertEquals(1, mc.problems.size());
+				Issue ap = mc.problems.get(0);
+				assertTrue(ap.getDescription().contains("wrong column type for name"));
+			}
+		}
+
+		MockCollector mc = new MockCollector();
+		analyzer.visitGenerators(mc);
+		assertEquals(1,mc.problems.size());
+		Issue issue = mc.problems.get( 0 );
+		assertTrue(issue.getDescription().contains("does_not_exist"));
+
+	}
+
+	static class MockCollector implements IssueCollector {
+		List<Issue> problems = new ArrayList<>();
+		public void reportIssue(Issue analyze) {
+			problems.add(analyze);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/AntlrSimpleHQLLexerTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/AntlrSimpleHQLLexerTest.java
new file mode 100644
index 000000000000..13ac4a4fcfcb
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/AntlrSimpleHQLLexerTest.java
@@ -0,0 +1,103 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.antlr.v4.runtime.Token;
+import org.hibernate.grammars.hql.HqlLexer;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class AntlrSimpleHQLLexerTest {
+
+	@Test
+	public void testLexSimpleSelect() {
+		AntlrSimpleHQLLexer lexer = new AntlrSimpleHQLLexer("from Product".toCharArray());
+
+		int firstToken = lexer.nextTokenId();
+		assertEquals(HqlLexer.FROM, firstToken);
+		assertEquals(4, lexer.getTokenLength()); // "from"
+		assertEquals(0, lexer.getTokenOffset());
+
+		int secondToken = lexer.nextTokenId();
+		assertEquals(HqlLexer.IDENTIFIER, secondToken);
+		assertEquals(7, lexer.getTokenLength()); // "Product"
+		assertEquals(5, lexer.getTokenOffset());
+	}
+
+	@Test
+	public void testLexEof() {
+		AntlrSimpleHQLLexer lexer = new AntlrSimpleHQLLexer("from".toCharArray());
+		lexer.nextTokenId(); // FROM
+		int eof = lexer.nextTokenId();
+		assertEquals(Token.EOF, eof);
+	}
+
+	@Test
+	public void testLexDottedPath() {
+		AntlrSimpleHQLLexer lexer = new AntlrSimpleHQLLexer("from com.example.Product".toCharArray());
+		assertEquals(HqlLexer.FROM, lexer.nextTokenId());
+		assertEquals(HqlLexer.IDENTIFIER, lexer.nextTokenId()); // "com"
+		assertEquals(HqlLexer.DOT, lexer.nextTokenId());
+		assertEquals(HqlLexer.IDENTIFIER, lexer.nextTokenId()); // "example"
+		assertEquals(HqlLexer.DOT, lexer.nextTokenId());
+		assertEquals(HqlLexer.IDENTIFIER, lexer.nextTokenId()); // "Product"
+	}
+
+	@Test
+	public void testLexWhereClause() {
+		AntlrSimpleHQLLexer lexer = new AntlrSimpleHQLLexer("from Product where id = 1".toCharArray());
+		assertEquals(HqlLexer.FROM, lexer.nextTokenId());
+		assertEquals(HqlLexer.IDENTIFIER, lexer.nextTokenId()); // Product
+		assertEquals(HqlLexer.WHERE, lexer.nextTokenId());
+	}
+
+	@Test
+	public void testEmptyInput() {
+		AntlrSimpleHQLLexer lexer = new AntlrSimpleHQLLexer("".toCharArray());
+		int token = lexer.nextTokenId();
+		assertEquals(Token.EOF, token);
+	}
+
+	@Test
+	public void testTokenLength() {
+		AntlrSimpleHQLLexer lexer = new AntlrSimpleHQLLexer("select".toCharArray());
+		lexer.nextTokenId();
+		assertEquals(6, lexer.getTokenLength());
+	}
+
+	@Test
+	public void testJoinQuery() {
+		AntlrSimpleHQLLexer lexer = new AntlrSimpleHQLLexer("from Product p join p.categories c".toCharArray());
+		assertEquals(HqlLexer.FROM, lexer.nextTokenId());
+		assertEquals(HqlLexer.IDENTIFIER, lexer.nextTokenId()); // Product
+		assertEquals(HqlLexer.IDENTIFIER, lexer.nextTokenId()); // p
+		assertEquals(HqlLexer.JOIN, lexer.nextTokenId());
+	}
+
+	@Test
+	public void testDeleteQuery() {
+		AntlrSimpleHQLLexer lexer = new AntlrSimpleHQLLexer("delete Product".toCharArray());
+		assertEquals(HqlLexer.DELETE, lexer.nextTokenId());
+		assertEquals(HqlLexer.IDENTIFIER, lexer.nextTokenId());
+	}
+
+	@Test
+	public void testUpdateQuery() {
+		AntlrSimpleHQLLexer lexer = new AntlrSimpleHQLLexer("update Product set name = 'x'".toCharArray());
+		assertEquals(HqlLexer.UPDATE, lexer.nextTokenId());
+		assertEquals(HqlLexer.IDENTIFIER, lexer.nextTokenId());
+		assertEquals(HqlLexer.SET, lexer.nextTokenId());
+	}
+
+	@Test
+	public void testTokenOffset() {
+		AntlrSimpleHQLLexer lexer = new AntlrSimpleHQLLexer("from Product".toCharArray());
+		lexer.nextTokenId(); // from
+		assertEquals(0, lexer.getTokenOffset());
+		lexer.nextTokenId(); // Product
+		assertEquals(5, lexer.getTokenOffset());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/CompletionHelperTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/CompletionHelperTest.java
new file mode 100644
index 000000000000..aed3401b9a34
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/CompletionHelperTest.java
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class CompletionHelperTest {
+
+	@Test
+	public void testSingleEntityMatchAlias() {
+		List<EntityNameReference> refs = new ArrayList<>();
+		refs.add(new EntityNameReference("Person", "p"));
+		assertEquals("Person", CompletionHelper.getCanonicalPath(refs, "p"));
+	}
+
+	@Test
+	public void testSingleEntityPropertyPath() {
+		List<EntityNameReference> refs = new ArrayList<>();
+		refs.add(new EntityNameReference("Person", "p"));
+		// alias "p" is not null/empty/same as entity name, so falls through to general resolution
+		// "name" is not a known alias, no dots, so returns as-is
+		assertEquals("name", CompletionHelper.getCanonicalPath(refs, "name"));
+	}
+
+	@Test
+	public void testSingleEntityNoAlias() {
+		List<EntityNameReference> refs = new ArrayList<>();
+		refs.add(new EntityNameReference("Person", null));
+		assertEquals("Person/name", CompletionHelper.getCanonicalPath(refs, "name"));
+	}
+
+	@Test
+	public void testSingleEntitySameAlias() {
+		List<EntityNameReference> refs = new ArrayList<>();
+		refs.add(new EntityNameReference("Person", "Person"));
+		assertEquals("Person/name", CompletionHelper.getCanonicalPath(refs, "name"));
+	}
+
+	@Test
+	public void testMultipleEntities() {
+		List<EntityNameReference> refs = new ArrayList<>();
+		refs.add(new EntityNameReference("Person", "p"));
+		refs.add(new EntityNameReference("Address", "a"));
+		// With multiple entities, falls through to general resolution
+		assertEquals("Person", CompletionHelper.getCanonicalPath(refs, "p"));
+	}
+
+	@Test
+	public void testDottedProperty() {
+		List<EntityNameReference> refs = new ArrayList<>();
+		refs.add(new EntityNameReference("Person", "p"));
+		refs.add(new EntityNameReference("Address", "a"));
+		assertEquals("Address/city", CompletionHelper.getCanonicalPath(refs, "a.city"));
+	}
+
+	@Test
+	public void testUnknownName() {
+		List<EntityNameReference> refs = new ArrayList<>();
+		refs.add(new EntityNameReference("Person", "p"));
+		assertEquals("unknown", CompletionHelper.getCanonicalPath(refs, "unknown"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/EntityNameReferenceTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/EntityNameReferenceTest.java
new file mode 100644
index 000000000000..91e5e32da4e9
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/EntityNameReferenceTest.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class EntityNameReferenceTest {
+
+	@Test
+	public void testConstructorAndGetters() {
+		EntityNameReference ref = new EntityNameReference("Product", "p");
+		assertEquals("Product", ref.getEntityName());
+		assertEquals("p", ref.getAlias());
+	}
+
+	@Test
+	public void testToString() {
+		EntityNameReference ref = new EntityNameReference("com.example.Order", "o");
+		assertEquals("o:com.example.Order", ref.toString());
+	}
+
+	@Test
+	public void testSameEntityAndAlias() {
+		EntityNameReference ref = new EntityNameReference("Product", "Product");
+		assertEquals("Product", ref.getEntityName());
+		assertEquals("Product", ref.getAlias());
+		assertEquals("Product:Product", ref.toString());
+	}
+
+	@Test
+	public void testNullValues() {
+		EntityNameReference ref = new EntityNameReference(null, null);
+		assertNull(ref.getEntityName());
+		assertNull(ref.getAlias());
+		assertEquals("null:null", ref.toString());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/HQLAnalyzerTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/HQLAnalyzerTest.java
new file mode 100644
index 000000000000..aaaae8809c9a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/HQLAnalyzerTest.java
@@ -0,0 +1,117 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class HQLAnalyzerTest {
+
+	private final HQLAnalyzer analyzer = new HQLAnalyzer();
+
+	@Test
+	public void testShouldShowEntityNamesAfterFrom() {
+		assertTrue(analyzer.shouldShowEntityNames("from ", 5));
+	}
+
+	@Test
+	public void testShouldShowEntityNamesAfterUpdate() {
+		assertTrue(analyzer.shouldShowEntityNames("update ", 7));
+	}
+
+	@Test
+	public void testShouldShowEntityNamesAfterDelete() {
+		assertTrue(analyzer.shouldShowEntityNames("delete ", 7));
+	}
+
+	@Test
+	public void testShouldNotShowEntityNamesInWhere() {
+		assertFalse(analyzer.shouldShowEntityNames("from Foo where ", 15));
+	}
+
+	@Test
+	public void testShouldNotShowEntityNamesInSelect() {
+		assertFalse(analyzer.shouldShowEntityNames("select ", 7));
+	}
+
+	@Test
+	public void testGetVisibleEntityNames() {
+		String query = "from Product as p where p.name = 'test'";
+		List<EntityNameReference> names = analyzer.getVisibleEntityNames(query.toCharArray(), query.length());
+		assertFalse(names.isEmpty());
+		assertEquals("p", names.get(0).getAlias());
+		assertEquals("Product", names.get(0).getEntityName());
+	}
+
+	@Test
+	public void testGetVisibleEntityNamesMultiple() {
+		String query = "from Product as p, Category as c where ";
+		List<EntityNameReference> names = analyzer.getVisibleEntityNames(query.toCharArray(), query.length());
+		assertTrue(names.size() >= 2);
+	}
+
+	@Test
+	public void testGetVisibleEntityNamesWithJoin() {
+		String query = "from Product as p join p.categories as c where ";
+		List<EntityNameReference> names = analyzer.getVisibleEntityNames(query.toCharArray(), query.length());
+		assertFalse(names.isEmpty());
+	}
+
+	@Test
+	public void testGetVisibleSubQueries() {
+		String query = "from Product as p where p.id in (select c.id from Category as c)";
+		List<SubQuery> subQueries = analyzer.getVisibleSubQueries(query.toCharArray(), query.length());
+		assertNotNull(subQueries);
+	}
+
+	@Test
+	public void testGetEntityNamePrefix() {
+		assertEquals("Pro", HQLAnalyzer.getEntityNamePrefix("from Pro".toCharArray(), 8));
+		assertEquals("", HQLAnalyzer.getEntityNamePrefix("from ".toCharArray(), 5));
+	}
+
+	@Test
+	public void testGetHQLKeywords() {
+		String[] keywords = HQLAnalyzer.getHQLKeywords();
+		assertNotNull(keywords);
+		assertTrue(keywords.length > 0);
+		// Verify known keywords are present
+		boolean foundWhere = false;
+		boolean foundFrom = false;
+		for (String keyword : keywords) {
+			if ("where".equals(keyword)) foundWhere = true;
+			if ("from".equals(keyword)) foundFrom = true;
+		}
+		assertTrue(foundWhere);
+		assertTrue(foundFrom);
+	}
+
+	@Test
+	public void testGetHQLFunctionNames() {
+		String[] functions = HQLAnalyzer.getHQLFunctionNames();
+		assertNotNull(functions);
+		assertTrue(functions.length > 0);
+	}
+
+	@Test
+	public void testShouldShowEntityNamesWithCharArray() {
+		assertTrue(analyzer.shouldShowEntityNames("from ".toCharArray(), 5));
+		assertFalse(analyzer.shouldShowEntityNames("select ".toCharArray(), 7));
+	}
+
+	@Test
+	public void testEntityNameReferenceToString() {
+		EntityNameReference ref = new EntityNameReference("Product", "p");
+		assertNotNull(ref.toString());
+		assertEquals("Product", ref.getEntityName());
+		assertEquals("p", ref.getAlias());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/HQLCodeAssistTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/HQLCodeAssistTest.java
new file mode 100644
index 000000000000..fb50c71fa7d7
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/HQLCodeAssistTest.java
@@ -0,0 +1,137 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class HQLCodeAssistTest {
+
+	private static final String[] HBM_XML_FILES = new String[] {
+			"HelloWorld.hbm.xml"
+	};
+
+	@TempDir
+	public File outputFolder;
+
+	private HQLCodeAssist codeAssist;
+	private Metadata metadata;
+
+	@BeforeEach
+	public void setUp() {
+		MetadataDescriptor metadataDescriptor = HibernateUtil
+				.initializeMetadataDescriptor(this, HBM_XML_FILES, outputFolder);
+		metadata = metadataDescriptor.createMetadata();
+		codeAssist = new HQLCodeAssist(metadata);
+	}
+
+	@Test
+	public void testEntityNameCompletionAfterFrom() {
+		List<HQLCompletionProposal> proposals = complete("from ");
+		assertTrue(hasProposalOfKind(proposals, HQLCompletionProposal.ENTITY_NAME));
+	}
+
+	@Test
+	public void testEntityNameCompletionWithPrefix() {
+		List<HQLCompletionProposal> proposals = complete("from Hello");
+		assertTrue(proposals.stream()
+				.anyMatch(p -> p.getCompletionKind() == HQLCompletionProposal.ENTITY_NAME
+						&& p.getSimpleName().startsWith("Hello")));
+	}
+
+	@Test
+	public void testKeywordCompletion() {
+		// Keywords are returned alongside other completions when not in a FROM context
+		List<HQLCompletionProposal> proposals = complete("from HelloWorld as hw where hw.id > 1 or");
+		assertTrue(hasProposalOfKind(proposals, HQLCompletionProposal.KEYWORD));
+		assertTrue(proposals.stream()
+				.anyMatch(p -> p.getCompletionKind() == HQLCompletionProposal.KEYWORD
+						&& p.getSimpleName().equals("order")));
+	}
+
+	@Test
+	public void testAliasCompletion() {
+		List<HQLCompletionProposal> proposals = complete("from HelloWorld as hw where h");
+		assertTrue(hasProposalOfKind(proposals, HQLCompletionProposal.ALIAS_REF));
+		assertTrue(proposals.stream()
+				.anyMatch(p -> p.getCompletionKind() == HQLCompletionProposal.ALIAS_REF
+						&& p.getSimpleName().equals("hw")));
+	}
+
+	@Test
+	public void testPropertyCompletion() {
+		List<HQLCompletionProposal> proposals = complete("from HelloWorld as hw where hw.");
+		assertTrue(hasProposalOfKind(proposals, HQLCompletionProposal.PROPERTY));
+	}
+
+	@Test
+	public void testFunctionCompletion() {
+		List<HQLCompletionProposal> proposals = complete("from HelloWorld where sub");
+		assertTrue(proposals.stream()
+				.anyMatch(p -> p.getCompletionKind() == HQLCompletionProposal.FUNCTION
+						&& p.getSimpleName().equals("substring")));
+	}
+
+	@Test
+	public void testNoMetadata() {
+		HQLCodeAssist noMetadataAssist = new HQLCodeAssist(null);
+		List<String> errors = new ArrayList<>();
+		noMetadataAssist.codeComplete("from ", 5, new IHQLCompletionRequestor() {
+			@Override
+			public boolean accept(HQLCompletionProposal proposal) {
+				return true;
+			}
+			@Override
+			public void completionFailure(String errorMessage) {
+				errors.add(errorMessage);
+			}
+		});
+		assertFalse(errors.isEmpty());
+	}
+
+	@Test
+	public void testFindNearestWhiteSpace() {
+		assertEquals(5, HQLCodeAssist.findNearestWhiteSpace("from Hello", 10));
+		assertEquals(0, HQLCodeAssist.findNearestWhiteSpace("Hello", 5));
+		assertEquals(6, HQLCodeAssist.findNearestWhiteSpace("from (Hello", 11));
+	}
+
+	@Test
+	public void testEmptyQuery() {
+		List<HQLCompletionProposal> proposals = complete("");
+		assertFalse(proposals.isEmpty());
+	}
+
+	private List<HQLCompletionProposal> complete(String query) {
+		List<HQLCompletionProposal> proposals = new ArrayList<>();
+		codeAssist.codeComplete(query, query.length(), new IHQLCompletionRequestor() {
+			@Override
+			public boolean accept(HQLCompletionProposal proposal) {
+				proposals.add(proposal);
+				return true;
+			}
+			@Override
+			public void completionFailure(String errorMessage) {
+			}
+		});
+		return proposals;
+	}
+
+	private boolean hasProposalOfKind(List<HQLCompletionProposal> proposals, int kind) {
+		return proposals.stream().anyMatch(p -> p.getCompletionKind() == kind);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/HQLCompletionProposalTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/HQLCompletionProposalTest.java
new file mode 100644
index 000000000000..027fc58568e5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/HQLCompletionProposalTest.java
@@ -0,0 +1,106 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class HQLCompletionProposalTest {
+
+	@Test
+	public void testConstructorDefaults() {
+		HQLCompletionProposal proposal = new HQLCompletionProposal(HQLCompletionProposal.ENTITY_NAME, 10);
+		assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.getCompletionKind());
+		assertEquals(10, proposal.getCompletionLocation());
+		assertEquals("", proposal.getCompletion());
+		assertEquals("", proposal.getSimpleName());
+		assertEquals(0, proposal.getReplaceStart());
+		assertEquals(0, proposal.getReplaceEnd());
+		assertEquals(1, proposal.getRelevance());
+		assertNull(proposal.getEntityName());
+		assertNull(proposal.getShortEntityName());
+		assertNull(proposal.getPropertyName());
+		assertNull(proposal.getProperty());
+	}
+
+	@Test
+	public void testSettersAndGetters() {
+		HQLCompletionProposal proposal = new HQLCompletionProposal(HQLCompletionProposal.KEYWORD, 0);
+		proposal.setCompletion("SELECT");
+		proposal.setSimpleName("select");
+		proposal.setReplaceStart(5);
+		proposal.setReplaceEnd(11);
+		proposal.setRelevance(100);
+		proposal.setEntityName("com.example.Person");
+		proposal.setShortEntityName("Person");
+		proposal.setPropertyName("name");
+		proposal.setCompletionKind(HQLCompletionProposal.PROPERTY);
+		proposal.setCompletionLocation(20);
+
+		assertEquals("SELECT", proposal.getCompletion());
+		assertEquals("select", proposal.getSimpleName());
+		assertEquals(5, proposal.getReplaceStart());
+		assertEquals(11, proposal.getReplaceEnd());
+		assertEquals(100, proposal.getRelevance());
+		assertEquals("com.example.Person", proposal.getEntityName());
+		assertEquals("Person", proposal.getShortEntityName());
+		assertEquals("name", proposal.getPropertyName());
+		assertEquals(HQLCompletionProposal.PROPERTY, proposal.getCompletionKind());
+		assertEquals(20, proposal.getCompletionLocation());
+	}
+
+	@Test
+	public void testToStringEntityName() {
+		HQLCompletionProposal proposal = new HQLCompletionProposal(HQLCompletionProposal.ENTITY_NAME, 5);
+		proposal.setCompletion("Person");
+		proposal.setSimpleName("Person");
+		String s = proposal.toString();
+		assertTrue(s.contains("ENTITY_NAME"));
+		assertTrue(s.contains("Person"));
+	}
+
+	@Test
+	public void testToStringProperty() {
+		HQLCompletionProposal proposal = new HQLCompletionProposal(HQLCompletionProposal.PROPERTY, 5);
+		String s = proposal.toString();
+		assertTrue(s.contains("PROPERTY"));
+	}
+
+	@Test
+	public void testToStringKeyword() {
+		HQLCompletionProposal proposal = new HQLCompletionProposal(HQLCompletionProposal.KEYWORD, 5);
+		String s = proposal.toString();
+		assertTrue(s.contains("KEYWORD"));
+	}
+
+	@Test
+	public void testToStringUnknownKind() {
+		HQLCompletionProposal proposal = new HQLCompletionProposal(99, 5);
+		String s = proposal.toString();
+		assertTrue(s.contains("<Unknown type>"));
+	}
+
+	@Test
+	public void testKindMethods() {
+		HQLCompletionProposal proposal = new HQLCompletionProposal(HQLCompletionProposal.ENTITY_NAME, 0);
+		assertEquals(HQLCompletionProposal.ALIAS_REF, proposal.aliasRefKind());
+		assertEquals(HQLCompletionProposal.ENTITY_NAME, proposal.entityNameKind());
+		assertEquals(HQLCompletionProposal.PROPERTY, proposal.propertyKind());
+		assertEquals(HQLCompletionProposal.KEYWORD, proposal.keywordKind());
+		assertEquals(HQLCompletionProposal.FUNCTION, proposal.functionKind());
+	}
+
+	@Test
+	public void testConstants() {
+		assertEquals(1, HQLCompletionProposal.ENTITY_NAME);
+		assertEquals(2, HQLCompletionProposal.PROPERTY);
+		assertEquals(3, HQLCompletionProposal.KEYWORD);
+		assertEquals(4, HQLCompletionProposal.FUNCTION);
+		assertEquals(5, HQLCompletionProposal.ALIAS_REF);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/SimpleLexerExceptionTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/SimpleLexerExceptionTest.java
new file mode 100644
index 000000000000..f1a54291061d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/SimpleLexerExceptionTest.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+public class SimpleLexerExceptionTest {
+
+	@Test
+	public void testDefaultConstructor() {
+		SimpleLexerException ex = new SimpleLexerException();
+		assertNull(ex.getMessage());
+		assertNull(ex.getCause());
+	}
+
+	@Test
+	public void testMessageConstructor() {
+		SimpleLexerException ex = new SimpleLexerException("syntax error");
+		assertEquals("syntax error", ex.getMessage());
+		assertNull(ex.getCause());
+	}
+
+	@Test
+	public void testCauseConstructor() {
+		RuntimeException cause = new RuntimeException("root cause");
+		SimpleLexerException ex = new SimpleLexerException(cause);
+		assertSame(cause, ex.getCause());
+	}
+
+	@Test
+	public void testMessageAndCauseConstructor() {
+		RuntimeException cause = new RuntimeException("root cause");
+		SimpleLexerException ex = new SimpleLexerException("syntax error", cause);
+		assertEquals("syntax error", ex.getMessage());
+		assertSame(cause, ex.getCause());
+	}
+
+	@Test
+	public void testIsRuntimeException() {
+		SimpleLexerException ex = new SimpleLexerException("test");
+		assertInstanceOf(RuntimeException.class, ex);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/SubQueryTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/SubQueryTest.java
new file mode 100644
index 000000000000..9322486958e2
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/ide/completion/SubQueryTest.java
@@ -0,0 +1,318 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.ide.completion;
+
+import org.hibernate.grammars.hql.HqlLexer;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SubQueryTest {
+
+	private SubQuery createSubQuery(int startOffset) {
+		SubQuery sq = new SubQuery();
+		sq.startOffset = startOffset;
+		return sq;
+	}
+
+	private void addToken(SubQuery sq, int tokenId, String text) {
+		sq.tokenIds.add(tokenId);
+		sq.tokenText.add(text);
+	}
+
+	@Test
+	public void testGetTokenCount() {
+		SubQuery sq = createSubQuery(0);
+		assertEquals(0, sq.getTokenCount());
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		assertEquals(1, sq.getTokenCount());
+	}
+
+	@Test
+	public void testGetTokenAndText() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		assertEquals(HqlLexer.FROM, sq.getToken(0));
+		assertEquals(HqlLexer.IDENTIFIER, sq.getToken(1));
+		assertEquals("from", sq.getTokenText(0));
+		assertEquals("Product", sq.getTokenText(1));
+	}
+
+	@Test
+	public void testCompareTo() {
+		SubQuery a = createSubQuery(10);
+		SubQuery b = createSubQuery(20);
+		assertTrue(a.compareTo(b) < 0);
+		assertTrue(b.compareTo(a) > 0);
+		assertEquals(0, a.compareTo(createSubQuery(10)));
+	}
+
+	@Test
+	public void testEqualsAndHashCode() {
+		SubQuery a = createSubQuery(5);
+		SubQuery b = createSubQuery(5);
+		SubQuery c = createSubQuery(10);
+
+		assertEquals(a, b);
+		assertEquals(a.hashCode(), b.hashCode());
+		assertNotEquals(a, c);
+		assertFalse(a.equals("not a subquery"));
+	}
+
+	@Test
+	public void testGetEntityNamesSimpleFrom() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertEquals(1, names.size());
+		assertEquals("Product", names.get(0).getEntityName());
+		assertEquals("Product", names.get(0).getAlias());
+	}
+
+	@Test
+	public void testGetEntityNamesWithAlias() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.IDENTIFIER, "p");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertEquals(1, names.size());
+		assertEquals("Product", names.get(0).getEntityName());
+		assertEquals("p", names.get(0).getAlias());
+	}
+
+	@Test
+	public void testGetEntityNamesMultipleEntities() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.IDENTIFIER, "p");
+		addToken(sq, HqlLexer.COMMA, ",");
+		addToken(sq, HqlLexer.IDENTIFIER, "Category");
+		addToken(sq, HqlLexer.IDENTIFIER, "c");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertEquals(2, names.size());
+		assertEquals("Product", names.get(0).getEntityName());
+		assertEquals("p", names.get(0).getAlias());
+		assertEquals("Category", names.get(1).getEntityName());
+		assertEquals("c", names.get(1).getAlias());
+	}
+
+	@Test
+	public void testGetEntityNamesWithWhere() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.WHERE, "where");
+		addToken(sq, HqlLexer.IDENTIFIER, "id");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertEquals(1, names.size());
+		assertEquals("Product", names.get(0).getEntityName());
+	}
+
+	@Test
+	public void testGetEntityNamesWithOrderBy() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.ORDER, "order");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertEquals(1, names.size());
+	}
+
+	@Test
+	public void testGetEntityNamesWithGroupBy() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.GROUP, "group");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertEquals(1, names.size());
+	}
+
+	@Test
+	public void testGetEntityNamesWithHaving() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.HAVING, "having");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertEquals(1, names.size());
+	}
+
+	@Test
+	public void testGetEntityNamesWithDottedName() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "com");
+		addToken(sq, HqlLexer.DOT, ".");
+		addToken(sq, HqlLexer.IDENTIFIER, "example");
+		addToken(sq, HqlLexer.DOT, ".");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertEquals(1, names.size());
+		assertEquals("com.example.Product", names.get(0).getEntityName());
+	}
+
+	@Test
+	public void testGetEntityNamesUpdate() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.UPDATE, "update");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.SET, "set");
+		addToken(sq, HqlLexer.IDENTIFIER, "name");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertEquals(1, names.size());
+		assertEquals("Product", names.get(0).getEntityName());
+	}
+
+	@Test
+	public void testGetEntityNamesDelete() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.DELETE, "delete");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.WHERE, "where");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertEquals(1, names.size());
+		assertEquals("Product", names.get(0).getEntityName());
+	}
+
+	@Test
+	public void testGetEntityNamesWithJoin() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.IDENTIFIER, "p");
+		addToken(sq, HqlLexer.JOIN, "join");
+		addToken(sq, HqlLexer.IDENTIFIER, "p");
+		addToken(sq, HqlLexer.DOT, ".");
+		addToken(sq, HqlLexer.IDENTIFIER, "categories");
+		addToken(sq, HqlLexer.IDENTIFIER, "c");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		// Product p from the from clause, plus join entries
+		assertFalse(names.isEmpty());
+	}
+
+	@Test
+	public void testGetEntityNamesWithLeftJoin() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.IDENTIFIER, "p");
+		addToken(sq, HqlLexer.JOIN, "join");
+		addToken(sq, HqlLexer.LEFT, "left");
+		addToken(sq, HqlLexer.IDENTIFIER, "Category");
+		addToken(sq, HqlLexer.IDENTIFIER, "c");
+		addToken(sq, HqlLexer.WHERE, "where");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertFalse(names.isEmpty());
+	}
+
+	@Test
+	public void testGetEntityNamesWithInnerJoin() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.JOIN, "join");
+		addToken(sq, HqlLexer.INNER, "inner");
+		addToken(sq, HqlLexer.IDENTIFIER, "Category");
+		addToken(sq, HqlLexer.ORDER, "order");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertFalse(names.isEmpty());
+	}
+
+	@Test
+	public void testGetEntityNamesEmpty() {
+		SubQuery sq = createSubQuery(0);
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertTrue(names.isEmpty());
+	}
+
+	@Test
+	public void testGetEntityNamesNoFromClause() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.IDENTIFIER, "select");
+		addToken(sq, HqlLexer.IDENTIFIER, "count");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertTrue(names.isEmpty());
+	}
+
+	@Test
+	public void testGetEntityNamesJoinWithComma() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.JOIN, "join");
+		addToken(sq, HqlLexer.IDENTIFIER, "Category");
+		addToken(sq, HqlLexer.COMMA, ",");
+		addToken(sq, HqlLexer.IDENTIFIER, "Brand");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertFalse(names.isEmpty());
+	}
+
+	@Test
+	public void testGetEntityNamesRightJoin() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.JOIN, "join");
+		addToken(sq, HqlLexer.RIGHT, "right");
+		addToken(sq, HqlLexer.IDENTIFIER, "Category");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertFalse(names.isEmpty());
+	}
+
+	@Test
+	public void testGetEntityNamesOuterJoin() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.JOIN, "join");
+		addToken(sq, HqlLexer.OUTER, "outer");
+		addToken(sq, HqlLexer.IDENTIFIER, "Category");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertFalse(names.isEmpty());
+	}
+
+	@Test
+	public void testGetEntityNamesJoinWithDottedPath() {
+		SubQuery sq = createSubQuery(0);
+		addToken(sq, HqlLexer.FROM, "from");
+		addToken(sq, HqlLexer.IDENTIFIER, "Product");
+		addToken(sq, HqlLexer.JOIN, "join");
+		addToken(sq, HqlLexer.IDENTIFIER, "com");
+		addToken(sq, HqlLexer.DOT, ".");
+		addToken(sq, HqlLexer.IDENTIFIER, "example");
+		addToken(sq, HqlLexer.DOT, ".");
+		addToken(sq, HqlLexer.IDENTIFIER, "Category");
+
+		List<EntityNameReference> names = sq.getEntityNames();
+		assertFalse(names.isEmpty());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/binder/PrimaryKeyInfoTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/binder/PrimaryKeyInfoTest.java
new file mode 100644
index 000000000000..f7e860687f1f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/binder/PrimaryKeyInfoTest.java
@@ -0,0 +1,34 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.binder;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class PrimaryKeyInfoTest {
+
+	@Test
+	public void testDefaultValues() {
+		PrimaryKeyInfo info = new PrimaryKeyInfo();
+		assertNull(info.suggestedStrategy);
+		assertNull(info.suggestedProperties);
+	}
+
+	@Test
+	public void testSetValues() {
+		PrimaryKeyInfo info = new PrimaryKeyInfo();
+		info.suggestedStrategy = "sequence";
+		Properties props = new Properties();
+		props.setProperty("sequence_name", "my_seq");
+		info.suggestedProperties = props;
+
+		assertEquals("sequence", info.suggestedStrategy);
+		assertEquals("my_seq", info.suggestedProperties.getProperty("sequence_name"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/AbstractMetaDataDialectTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/AbstractMetaDataDialectTest.java
new file mode 100644
index 000000000000..a408344497f1
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/AbstractMetaDataDialectTest.java
@@ -0,0 +1,126 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests for pure logic methods in AbstractMetaDataDialect.
+ * Uses a minimal concrete subclass to avoid needing a database connection.
+ */
+public class AbstractMetaDataDialectTest {
+
+	/**
+	 * Minimal concrete implementation that stubs out methods requiring a database.
+	 */
+	private static class TestableMetaDataDialect extends AbstractMetaDataDialect {
+		@Override
+		public Iterator<Map<String, Object>> getTables(String catalog, String schema, String table) {
+			return Collections.emptyIterator();
+		}
+
+		@Override
+		public Iterator<Map<String, Object>> getColumns(String catalog, String schema, String table, String column) {
+			return Collections.emptyIterator();
+		}
+
+		@Override
+		public Iterator<Map<String, Object>> getIndexInfo(String catalog, String schema, String table) {
+			return Collections.emptyIterator();
+		}
+
+		@Override
+		public Iterator<Map<String, Object>> getPrimaryKeys(String catalog, String schema, String table) {
+			return Collections.emptyIterator();
+		}
+
+		@Override
+		public Iterator<Map<String, Object>> getExportedKeys(String catalog, String schema, String table) {
+			return Collections.emptyIterator();
+		}
+	}
+
+	@Test
+	public void testNeedQuoteNull() {
+		TestableMetaDataDialect dialect = new TestableMetaDataDialect();
+		assertFalse(dialect.needQuote(null));
+	}
+
+	@Test
+	public void testNeedQuoteSimpleName() {
+		TestableMetaDataDialect dialect = new TestableMetaDataDialect();
+		assertFalse(dialect.needQuote("PERSON"));
+	}
+
+	@Test
+	public void testNeedQuoteWithHyphen() {
+		TestableMetaDataDialect dialect = new TestableMetaDataDialect();
+		assertTrue(dialect.needQuote("my-table"));
+	}
+
+	@Test
+	public void testNeedQuoteWithSpace() {
+		TestableMetaDataDialect dialect = new TestableMetaDataDialect();
+		assertTrue(dialect.needQuote("my table"));
+	}
+
+	@Test
+	public void testNeedQuoteWithDot() {
+		TestableMetaDataDialect dialect = new TestableMetaDataDialect();
+		assertTrue(dialect.needQuote("schema.table"));
+	}
+
+	@Test
+	public void testNeedQuoteNoSpecialChars() {
+		TestableMetaDataDialect dialect = new TestableMetaDataDialect();
+		assertFalse(dialect.needQuote("SIMPLE_NAME_123"));
+	}
+
+	@Test
+	public void testGetSuggestedPrimaryKeyStrategyName() {
+		TestableMetaDataDialect dialect = new TestableMetaDataDialect();
+		Iterator<Map<String, Object>> iter = dialect.getSuggestedPrimaryKeyStrategyName("cat", "schema", "table");
+		assertTrue(iter.hasNext());
+		Map<String, Object> result = iter.next();
+		assertEquals("cat", result.get("TABLE_CAT"));
+		assertEquals("schema", result.get("TABLE_SCHEMA"));
+		assertEquals("table", result.get("TABLE_NAME"));
+		assertNull(result.get("HIBERNATE_STRATEGY"));
+		assertFalse(iter.hasNext());
+	}
+
+	@Test
+	public void testGetSuggestedPrimaryKeyStrategyNameNulls() {
+		TestableMetaDataDialect dialect = new TestableMetaDataDialect();
+		Iterator<Map<String, Object>> iter = dialect.getSuggestedPrimaryKeyStrategyName(null, null, null);
+		assertTrue(iter.hasNext());
+		Map<String, Object> result = iter.next();
+		assertNull(result.get("TABLE_CAT"));
+		assertNull(result.get("TABLE_SCHEMA"));
+		assertNull(result.get("TABLE_NAME"));
+	}
+
+	@Test
+	public void testCloseIteratorNonResultSetIterator() {
+		TestableMetaDataDialect dialect = new TestableMetaDataDialect();
+		Iterator<String> plainIterator = Collections.<String>emptyList().iterator();
+		dialect.close(plainIterator);
+	}
+
+	@Test
+	public void testCloseNullConnectionProvider() {
+		TestableMetaDataDialect dialect = new TestableMetaDataDialect();
+		dialect.close();
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/CachedMetaDataDialectTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/CachedMetaDataDialectTest.java
new file mode 100644
index 000000000000..9dcf65cfa12b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/CachedMetaDataDialectTest.java
@@ -0,0 +1,260 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.tool.reveng.api.core.RevengDialect;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class CachedMetaDataDialectTest {
+
+	private CachedMetaDataDialect cached;
+	private StubDialect stub;
+
+	@BeforeEach
+	public void setUp() {
+		stub = new StubDialect();
+		cached = new CachedMetaDataDialect(stub);
+	}
+
+	@Test
+	public void testGetTablesReturnsDelegateResultFirstTime() {
+		stub.addTable(Map.of("TABLE_NAME", "FOO"));
+		Iterator<Map<String, Object>> iter = cached.getTables(null, "PUBLIC", "FOO");
+		assertTrue(iter.hasNext());
+		assertEquals("FOO", iter.next().get("TABLE_NAME"));
+		assertFalse(iter.hasNext());
+		cached.close(iter);
+	}
+
+	@Test
+	public void testGetTablesCachesOnSecondCall() {
+		stub.addTable(Map.of("TABLE_NAME", "BAR"));
+		// First call: hits delegate
+		Iterator<Map<String, Object>> iter1 = cached.getTables(null, "PUBLIC", "BAR");
+		iter1.next();
+		cached.close(iter1);
+		assertEquals(1, stub.getTablesCallCount);
+
+		// Second call: should return from cache, not delegate
+		Iterator<Map<String, Object>> iter2 = cached.getTables(null, "PUBLIC", "BAR");
+		assertEquals(1, stub.getTablesCallCount); // delegate NOT called again
+		assertTrue(iter2.hasNext());
+		assertEquals("BAR", iter2.next().get("TABLE_NAME"));
+	}
+
+	@Test
+	public void testGetColumnsAndCaching() {
+		stub.addColumn(Map.of("COLUMN_NAME", "ID", "DATA_TYPE", "INT"));
+		Iterator<Map<String, Object>> iter = cached.getColumns(null, "PUBLIC", "T", "%");
+		assertTrue(iter.hasNext());
+		assertEquals("ID", iter.next().get("COLUMN_NAME"));
+		cached.close(iter);
+
+		// Second call uses cache
+		Iterator<Map<String, Object>> iter2 = cached.getColumns(null, "PUBLIC", "T", "%");
+		assertEquals(1, stub.getColumnsCallCount);
+		assertTrue(iter2.hasNext());
+	}
+
+	@Test
+	public void testGetPrimaryKeysAndCaching() {
+		stub.addPrimaryKey(Map.of("COLUMN_NAME", "ID"));
+		Iterator<Map<String, Object>> iter = cached.getPrimaryKeys(null, "PUBLIC", "T");
+		assertTrue(iter.hasNext());
+		assertEquals("ID", iter.next().get("COLUMN_NAME"));
+		cached.close(iter);
+
+		Iterator<Map<String, Object>> iter2 = cached.getPrimaryKeys(null, "PUBLIC", "T");
+		assertEquals(1, stub.getPrimaryKeysCallCount);
+		assertTrue(iter2.hasNext());
+	}
+
+	@Test
+	public void testGetExportedKeysAndCaching() {
+		stub.addExportedKey(Map.of("FK_NAME", "fk_1"));
+		Iterator<Map<String, Object>> iter = cached.getExportedKeys(null, "PUBLIC", "T");
+		assertTrue(iter.hasNext());
+		iter.next(); // fully consume
+		cached.close(iter);
+
+		cached.getExportedKeys(null, "PUBLIC", "T");
+		assertEquals(1, stub.getExportedKeysCallCount);
+	}
+
+	@Test
+	public void testGetIndexInfoAndCaching() {
+		stub.addIndexInfo(Map.of("INDEX_NAME", "idx_1"));
+		Iterator<Map<String, Object>> iter = cached.getIndexInfo(null, "PUBLIC", "T");
+		assertTrue(iter.hasNext());
+		iter.next(); // fully consume
+		cached.close(iter);
+
+		cached.getIndexInfo(null, "PUBLIC", "T");
+		assertEquals(1, stub.getIndexInfoCallCount);
+	}
+
+	@Test
+	public void testGetSuggestedPrimaryKeyStrategyNameAndCaching() {
+		stub.addPkStrategy(Map.of("HIBERNATE_STRATEGY", "identity"));
+		Iterator<Map<String, Object>> iter = cached.getSuggestedPrimaryKeyStrategyName(null, "PUBLIC", "T");
+		assertTrue(iter.hasNext());
+		assertEquals("identity", iter.next().get("HIBERNATE_STRATEGY"));
+		cached.close(iter);
+
+		cached.getSuggestedPrimaryKeyStrategyName(null, "PUBLIC", "T");
+		assertEquals(1, stub.getPkStrategyCallCount);
+	}
+
+	@Test
+	public void testNeedQuoteDelegatesToDelegate() {
+		assertTrue(cached.needQuote("order"));
+		assertFalse(cached.needQuote("NORMAL"));
+	}
+
+	@Test
+	public void testCloseWithNonCachedIterator() {
+		// Closing a plain iterator delegates to the stub
+		Iterator<Map<String, Object>> plain = List.<Map<String, Object>>of().iterator();
+		cached.close(plain);
+		assertTrue(stub.closeCalled);
+	}
+
+	@Test
+	public void testDifferentKeysCacheSeparately() {
+		stub.addTable(Map.of("TABLE_NAME", "A"));
+		Iterator<Map<String, Object>> iter1 = cached.getTables(null, "PUBLIC", "A");
+		iter1.next();
+		cached.close(iter1);
+
+		// Different key - should call delegate again
+		stub.tables.clear();
+		stub.addTable(Map.of("TABLE_NAME", "B"));
+		Iterator<Map<String, Object>> iter2 = cached.getTables(null, "PUBLIC", "B");
+		assertEquals(2, stub.getTablesCallCount);
+		assertTrue(iter2.hasNext());
+		assertEquals("B", iter2.next().get("TABLE_NAME"));
+		cached.close(iter2);
+	}
+
+	@Test
+	public void testStoreThrowsIfNotFullyConsumed() {
+		stub.addTable(Map.of("TABLE_NAME", "X"));
+		stub.addTable(Map.of("TABLE_NAME", "Y"));
+		Iterator<Map<String, Object>> iter = cached.getTables(null, "PUBLIC", "%");
+		iter.next(); // consume only one of two
+		assertThrows(IllegalStateException.class, () -> cached.close(iter));
+	}
+
+	@Test
+	public void testCloseDelegatesToDelegate() {
+		cached.close();
+		assertTrue(stub.closeDialectCalled);
+	}
+
+	@Test
+	public void testConfigureDelegatesToDelegate() {
+		cached.configure(null);
+		assertTrue(stub.configureCalled);
+	}
+
+	/**
+	 * A minimal RevengDialect stub that returns pre-configured data
+	 * from in-memory lists. No database connection needed.
+	 */
+	private static class StubDialect implements RevengDialect {
+		final List<Map<String, Object>> tables = new ArrayList<>();
+		final List<Map<String, Object>> columns = new ArrayList<>();
+		final List<Map<String, Object>> primaryKeys = new ArrayList<>();
+		final List<Map<String, Object>> exportedKeys = new ArrayList<>();
+		final List<Map<String, Object>> indexInfo = new ArrayList<>();
+		final List<Map<String, Object>> pkStrategies = new ArrayList<>();
+
+		int getTablesCallCount;
+		int getColumnsCallCount;
+		int getPrimaryKeysCallCount;
+		int getExportedKeysCallCount;
+		int getIndexInfoCallCount;
+		int getPkStrategyCallCount;
+		boolean closeCalled;
+		boolean closeDialectCalled;
+		boolean configureCalled;
+
+		void addTable(Map<String, Object> row) { tables.add(new HashMap<>(row)); }
+		void addColumn(Map<String, Object> row) { columns.add(new HashMap<>(row)); }
+		void addPrimaryKey(Map<String, Object> row) { primaryKeys.add(new HashMap<>(row)); }
+		void addExportedKey(Map<String, Object> row) { exportedKeys.add(new HashMap<>(row)); }
+		void addIndexInfo(Map<String, Object> row) { indexInfo.add(new HashMap<>(row)); }
+		void addPkStrategy(Map<String, Object> row) { pkStrategies.add(new HashMap<>(row)); }
+
+		@Override
+		public void configure(ConnectionProvider connectionProvider) {
+			configureCalled = true;
+		}
+
+		@Override
+		public void close() {
+			closeDialectCalled = true;
+		}
+
+		@Override
+		public void close(Iterator<?> iterator) {
+			closeCalled = true;
+		}
+
+		@Override
+		public Iterator<Map<String, Object>> getTables(String catalog, String schema, String table) {
+			getTablesCallCount++;
+			return new ArrayList<>(tables).iterator();
+		}
+
+		@Override
+		public Iterator<Map<String, Object>> getColumns(String catalog, String schema, String table, String column) {
+			getColumnsCallCount++;
+			return new ArrayList<>(columns).iterator();
+		}
+
+		@Override
+		public Iterator<Map<String, Object>> getPrimaryKeys(String catalog, String schema, String name) {
+			getPrimaryKeysCallCount++;
+			return new ArrayList<>(primaryKeys).iterator();
+		}
+
+		@Override
+		public Iterator<Map<String, Object>> getExportedKeys(String catalog, String schema, String table) {
+			getExportedKeysCallCount++;
+			return new ArrayList<>(exportedKeys).iterator();
+		}
+
+		@Override
+		public Iterator<Map<String, Object>> getIndexInfo(String catalog, String schema, String table) {
+			getIndexInfoCallCount++;
+			return new ArrayList<>(indexInfo).iterator();
+		}
+
+		@Override
+		public Iterator<Map<String, Object>> getSuggestedPrimaryKeyStrategyName(String catalog, String schema, String table) {
+			getPkStrategyCallCount++;
+			return new ArrayList<>(pkStrategies).iterator();
+		}
+
+		@Override
+		public boolean needQuote(String name) {
+			return "order".equalsIgnoreCase(name);
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/H2MetaDataDialectTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/H2MetaDataDialectTest.java
new file mode 100644
index 000000000000..4ccadce83036
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/H2MetaDataDialectTest.java
@@ -0,0 +1,181 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Iterator;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class H2MetaDataDialectTest {
+
+	private static final String JDBC_URL = "jdbc:h2:mem:h2dialect_test;DB_CLOSE_DELAY=-1";
+
+	private H2MetaDataDialect dialect;
+	private Connection sharedConnection;
+
+	@BeforeEach
+	public void setUp() throws Exception {
+		sharedConnection = DriverManager.getConnection(JDBC_URL, "sa", "");
+
+		// Create test table
+		try (Statement stmt = sharedConnection.createStatement()) {
+			stmt.execute("CREATE TABLE IF NOT EXISTS H2_DIALECT_TEST (ID INT PRIMARY KEY AUTO_INCREMENT, NAME VARCHAR(50))");
+		}
+
+		ConnectionProvider connectionProvider = new ConnectionProvider() {
+			@Override
+			public Connection getConnection() throws SQLException {
+				return DriverManager.getConnection(JDBC_URL, "sa", "");
+			}
+			@Override
+			public void closeConnection(Connection connection) throws SQLException {
+				connection.close();
+			}
+			@Override
+			public boolean supportsAggressiveRelease() {
+				return false;
+			}
+			@Override
+			public boolean isUnwrappableAs(Class<?> unwrapType) {
+				return false;
+			}
+			@Override
+			public <T> T unwrap(Class<T> unwrapType) {
+				return null;
+			}
+		};
+
+		dialect = new H2MetaDataDialect();
+		dialect.configure(connectionProvider);
+	}
+
+	@AfterEach
+	public void tearDown() throws Exception {
+		dialect.close();
+		try (Statement stmt = sharedConnection.createStatement()) {
+			stmt.execute("DROP TABLE IF EXISTS H2_DIALECT_TEST");
+		}
+		sharedConnection.close();
+	}
+
+	@Test
+	public void testGetTables() {
+		Iterator<Map<String, Object>> tables = dialect.getTables(null, "PUBLIC", "H2_DIALECT%");
+		assertNotNull(tables);
+		assertTrue(tables.hasNext());
+		Map<String, Object> table = tables.next();
+		assertNotNull(table.get("TABLE_NAME"));
+		dialect.close(tables);
+	}
+
+	@Test
+	public void testGetColumns() {
+		Iterator<Map<String, Object>> columns = dialect.getColumns(null, "PUBLIC", "H2_DIALECT_TEST", "%");
+		assertNotNull(columns);
+		assertTrue(columns.hasNext());
+		Map<String, Object> column = columns.next();
+		assertNotNull(column.get("COLUMN_NAME"));
+		dialect.close(columns);
+	}
+
+	@Test
+	public void testGetPrimaryKeys() {
+		Iterator<Map<String, Object>> pks = dialect.getPrimaryKeys(null, "PUBLIC", "H2_DIALECT_TEST");
+		assertNotNull(pks);
+		assertTrue(pks.hasNext());
+		Map<String, Object> pk = pks.next();
+		assertNotNull(pk.get("COLUMN_NAME"));
+		dialect.close(pks);
+	}
+
+	@Test
+	public void testGetExportedKeys() {
+		Iterator<Map<String, Object>> keys = dialect.getExportedKeys(null, "PUBLIC", "H2_DIALECT_TEST");
+		assertNotNull(keys);
+		// No foreign keys expected, just verify it doesn't crash
+		assertFalse(keys.hasNext());
+		dialect.close(keys);
+	}
+
+	@Test
+	public void testGetIndexInfo() {
+		Iterator<Map<String, Object>> indexes = dialect.getIndexInfo(null, "PUBLIC", "H2_DIALECT_TEST");
+		assertNotNull(indexes);
+		// Primary key creates an index
+		dialect.close(indexes);
+	}
+
+	@Test
+	public void testGetSuggestedPrimaryKeyStrategyName() {
+		Iterator<Map<String, Object>> strategies = dialect.getSuggestedPrimaryKeyStrategyName(null, "PUBLIC", "H2_DIALECT_TEST");
+		assertNotNull(strategies);
+		dialect.close(strategies);
+	}
+
+	@Test
+	public void testNeedQuote() {
+		assertTrue(dialect.needQuote("table-name"));
+		assertTrue(dialect.needQuote("schema.table"));
+		assertTrue(dialect.needQuote("has space"));
+		assertFalse(dialect.needQuote("NORMAL_TABLE"));
+		assertFalse(dialect.needQuote(null));
+	}
+
+	@Test
+	public void testCloseWithoutQuerying() {
+		// Create a fresh dialect, configure it, and close without querying
+		H2MetaDataDialect freshDialect = new H2MetaDataDialect();
+		ConnectionProvider cp = new ConnectionProvider() {
+			@Override
+			public Connection getConnection() throws SQLException {
+				return DriverManager.getConnection(JDBC_URL, "sa", "");
+			}
+			@Override
+			public void closeConnection(Connection connection) throws SQLException {
+				connection.close();
+			}
+			@Override
+			public boolean supportsAggressiveRelease() { return false; }
+			@Override
+			public boolean isUnwrappableAs(Class<?> unwrapType) { return false; }
+			@Override
+			public <T> T unwrap(Class<T> unwrapType) { return null; }
+		};
+		freshDialect.configure(cp);
+		// Close without having called any query method — exercises the connection==null branch
+		freshDialect.close();
+	}
+
+	@Test
+	public void testCloseIterator() {
+		Iterator<Map<String, Object>> tables = dialect.getTables(null, "PUBLIC", "H2_DIALECT%");
+		assertNotNull(tables);
+		// Consume the iterator
+		while (tables.hasNext()) {
+			tables.next();
+		}
+		// close(Iterator) should close the underlying ResultSetIterator
+		dialect.close(tables);
+	}
+
+	@Test
+	public void testCloseNonResultSetIterator() {
+		// Passing a non-ResultSetIterator should be a no-op
+		Iterator<Map<String, Object>> plainIterator = java.util.Collections.<Map<String, Object>>emptyList().iterator();
+		dialect.close(plainIterator);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/ResultSetIteratorTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/ResultSetIteratorTest.java
new file mode 100644
index 000000000000..f842338e479f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/dialect/ResultSetIteratorTest.java
@@ -0,0 +1,217 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.dialect;
+
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ResultSetIteratorTest {
+
+	@Test
+	public void testIterateOverResultSet() throws Exception {
+		try (Connection conn = DriverManager.getConnection("jdbc:h2:mem:rsi_test1", "sa", "");
+			Statement stmt = conn.createStatement()) {
+			stmt.execute("CREATE TABLE RSI_TEST (ID INT, NAME VARCHAR(50))");
+			stmt.execute("INSERT INTO RSI_TEST VALUES (1, 'Alice')");
+			stmt.execute("INSERT INTO RSI_TEST VALUES (2, 'Bob')");
+
+			Statement queryStmt = conn.createStatement();
+			ResultSet rs = queryStmt.executeQuery("SELECT ID, NAME FROM RSI_TEST ORDER BY ID");
+
+			ResultSetIterator iter = new ResultSetIterator(queryStmt, rs) {
+				final Map<String, Object> row = new HashMap<>();
+				@Override
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					row.clear();
+					row.put("ID", rs.getInt("ID"));
+					row.put("NAME", rs.getString("NAME"));
+					return row;
+				}
+				@Override
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(e);
+				}
+			};
+
+			assertTrue(iter.hasNext());
+			Map<String, Object> first = iter.next();
+			assertEquals(1, first.get("ID"));
+			assertEquals("Alice", first.get("NAME"));
+
+			assertTrue(iter.hasNext());
+			Map<String, Object> second = iter.next();
+			assertEquals(2, second.get("ID"));
+			assertEquals("Bob", second.get("NAME"));
+
+			assertFalse(iter.hasNext());
+			iter.close();
+
+			stmt.execute("DROP TABLE RSI_TEST");
+		}
+	}
+
+	@Test
+	public void testEmptyResultSet() throws Exception {
+		try (Connection conn = DriverManager.getConnection("jdbc:h2:mem:rsi_test2", "sa", "");
+			Statement stmt = conn.createStatement()) {
+			stmt.execute("CREATE TABLE RSI_EMPTY (ID INT)");
+
+			Statement queryStmt = conn.createStatement();
+			ResultSet rs = queryStmt.executeQuery("SELECT ID FROM RSI_EMPTY");
+
+			ResultSetIterator iter = new ResultSetIterator(queryStmt, rs) {
+				@Override
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					Map<String, Object> row = new HashMap<>();
+					row.put("ID", rs.getInt("ID"));
+					return row;
+				}
+				@Override
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(e);
+				}
+			};
+
+			assertFalse(iter.hasNext());
+			assertThrows(NoSuchElementException.class, iter::next);
+			iter.close();
+
+			stmt.execute("DROP TABLE RSI_EMPTY");
+		}
+	}
+
+	@Test
+	public void testRemoveThrows() throws Exception {
+		try (Connection conn = DriverManager.getConnection("jdbc:h2:mem:rsi_test3", "sa", "");
+			Statement stmt = conn.createStatement()) {
+			stmt.execute("CREATE TABLE RSI_REM (ID INT)");
+
+			Statement queryStmt = conn.createStatement();
+			ResultSet rs = queryStmt.executeQuery("SELECT ID FROM RSI_REM");
+
+			ResultSetIterator iter = new ResultSetIterator(queryStmt, rs) {
+				@Override
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					return new HashMap<>();
+				}
+				@Override
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(e);
+				}
+			};
+
+			assertThrows(UnsupportedOperationException.class, iter::remove);
+			iter.close();
+
+			stmt.execute("DROP TABLE RSI_REM");
+		}
+	}
+
+	@Test
+	public void testHasNextAfterClosedResultSet() throws Exception {
+		try (Connection conn = DriverManager.getConnection("jdbc:h2:mem:rsi_test5", "sa", "");
+			Statement stmt = conn.createStatement()) {
+			stmt.execute("CREATE TABLE RSI_CLOSED (ID INT)");
+			stmt.execute("INSERT INTO RSI_CLOSED VALUES (1)");
+
+			Statement queryStmt = conn.createStatement();
+			ResultSet rs = queryStmt.executeQuery("SELECT ID FROM RSI_CLOSED");
+
+			ResultSetIterator iter = new ResultSetIterator(queryStmt, rs) {
+				@Override
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					Map<String, Object> row = new HashMap<>();
+					row.put("ID", rs.getInt("ID"));
+					return row;
+				}
+				@Override
+				protected Throwable handleSQLException(SQLException e) {
+					return e;
+				}
+			};
+
+			// Close the underlying result set to force SQLException on advance
+			rs.close();
+			assertFalse(iter.hasNext());
+
+			stmt.execute("DROP TABLE RSI_CLOSED");
+		}
+	}
+
+	@Test
+	public void testNextAfterClosedResultSet() throws Exception {
+		try (Connection conn = DriverManager.getConnection("jdbc:h2:mem:rsi_test6", "sa", "");
+			Statement stmt = conn.createStatement()) {
+			stmt.execute("CREATE TABLE RSI_CLOSED2 (ID INT)");
+			stmt.execute("INSERT INTO RSI_CLOSED2 VALUES (1)");
+
+			Statement queryStmt = conn.createStatement();
+			ResultSet rs = queryStmt.executeQuery("SELECT ID FROM RSI_CLOSED2");
+
+			ResultSetIterator iter = new ResultSetIterator(queryStmt, rs) {
+				@Override
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					Map<String, Object> row = new HashMap<>();
+					row.put("ID", rs.getInt("ID"));
+					return row;
+				}
+				@Override
+				protected Throwable handleSQLException(SQLException e) {
+					return e;
+				}
+			};
+
+			// Close result set to force SQLException on next()
+			rs.close();
+			assertThrows(NoSuchElementException.class, iter::next);
+
+			stmt.execute("DROP TABLE RSI_CLOSED2");
+		}
+	}
+
+	@Test
+	public void testConstructorWithoutStatement() throws Exception {
+		try (Connection conn = DriverManager.getConnection("jdbc:h2:mem:rsi_test4", "sa", "");
+			Statement stmt = conn.createStatement()) {
+			stmt.execute("CREATE TABLE RSI_NOSTMT (ID INT)");
+			stmt.execute("INSERT INTO RSI_NOSTMT VALUES (1)");
+
+			ResultSet rs = stmt.executeQuery("SELECT ID FROM RSI_NOSTMT");
+
+			ResultSetIterator iter = new ResultSetIterator(rs) {
+				@Override
+				protected Map<String, Object> convertRow(ResultSet rs) throws SQLException {
+					Map<String, Object> row = new HashMap<>();
+					row.put("ID", rs.getInt("ID"));
+					return row;
+				}
+				@Override
+				protected Throwable handleSQLException(SQLException e) {
+					throw new RuntimeException(e);
+				}
+			};
+
+			assertTrue(iter.hasNext());
+			iter.next();
+			assertFalse(iter.hasNext());
+			iter.close();
+
+			stmt.execute("DROP TABLE RSI_NOSTMT");
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/DefaultStrategyExtendedTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/DefaultStrategyExtendedTest.java
new file mode 100644
index 000000000000..3e9ff599142f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/DefaultStrategyExtendedTest.java
@@ -0,0 +1,202 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DefaultStrategyExtendedTest {
+
+	private RevengStrategy strategy;
+
+	@BeforeEach
+	public void setUp() {
+		strategy = new DefaultStrategy();
+		strategy.setSettings(new RevengSettings(strategy));
+	}
+
+	@Test
+	public void testExcludeTableReturnsFalse() {
+		assertFalse(strategy.excludeTable(TableIdentifier.create("cat", "sch", "ANY_TABLE")));
+	}
+
+	@Test
+	public void testExcludeColumnReturnsFalse() {
+		assertFalse(strategy.excludeColumn(TableIdentifier.create(null, null, "T"), "any_column"));
+	}
+
+	@Test
+	public void testGetForeignKeysReturnsEmpty() {
+		List<?> fks = strategy.getForeignKeys(TableIdentifier.create(null, null, "T"));
+		assertNotNull(fks);
+		assertTrue(fks.isEmpty());
+	}
+
+	@Test
+	public void testGetTableIdentifierStrategyNameReturnsNull() {
+		assertNull(strategy.getTableIdentifierStrategyName(TableIdentifier.create(null, null, "T")));
+	}
+
+	@Test
+	public void testGetTableIdentifierPropertiesReturnsEmpty() {
+		Properties props = strategy.getTableIdentifierProperties(TableIdentifier.create(null, null, "T"));
+		assertNotNull(props);
+		assertTrue(props.isEmpty());
+	}
+
+	@Test
+	public void testGetPrimaryKeyColumnNamesReturnsNull() {
+		assertNull(strategy.getPrimaryKeyColumnNames(TableIdentifier.create(null, null, "T")));
+	}
+
+	@Test
+	public void testClassNameToCompositeIdName() {
+		assertEquals("PersonId", strategy.classNameToCompositeIdName("Person"));
+		assertEquals("com.example.OrderId", strategy.classNameToCompositeIdName("com.example.Order"));
+	}
+
+	@Test
+	public void testGetOptimisticLockColumnNameReturnsNull() {
+		assertNull(strategy.getOptimisticLockColumnName(TableIdentifier.create(null, null, "T")));
+	}
+
+	@Test
+	public void testUseColumnForOptimisticLockWithDetection() {
+		RevengSettings settings = new RevengSettings(strategy).setDetectOptimisticLock(true);
+		strategy.setSettings(settings);
+
+		assertTrue(strategy.useColumnForOptimisticLock(TableIdentifier.create(null, null, "T"), "version"));
+		assertTrue(strategy.useColumnForOptimisticLock(TableIdentifier.create(null, null, "T"), "VERSION"));
+		assertTrue(strategy.useColumnForOptimisticLock(TableIdentifier.create(null, null, "T"), "timestamp"));
+		assertTrue(strategy.useColumnForOptimisticLock(TableIdentifier.create(null, null, "T"), "dbtimestamp"));
+		assertFalse(strategy.useColumnForOptimisticLock(TableIdentifier.create(null, null, "T"), "name"));
+	}
+
+	@Test
+	public void testUseColumnForOptimisticLockDisabled() {
+		RevengSettings settings = new RevengSettings(strategy).setDetectOptimisticLock(false);
+		strategy.setSettings(settings);
+
+		assertFalse(strategy.useColumnForOptimisticLock(TableIdentifier.create(null, null, "T"), "version"));
+	}
+
+	@Test
+	public void testGetSchemaSelectionsReturnsNull() {
+		assertNull(strategy.getSchemaSelections());
+	}
+
+	@Test
+	public void testTableToIdentifierPropertyNameReturnsNull() {
+		assertNull(strategy.tableToIdentifierPropertyName(TableIdentifier.create(null, null, "T")));
+	}
+
+	@Test
+	public void testTableToCompositeIdNameReturnsNull() {
+		assertNull(strategy.tableToCompositeIdName(TableIdentifier.create(null, null, "T")));
+	}
+
+	@Test
+	public void testExcludeForeignKeyAsCollection() {
+		RevengSettings settings = new RevengSettings(strategy).setCreateCollectionForForeignKey(true);
+		strategy.setSettings(settings);
+		assertFalse(strategy.excludeForeignKeyAsCollection("fk", null, null, null, null));
+
+		settings = new RevengSettings(strategy).setCreateCollectionForForeignKey(false);
+		strategy.setSettings(settings);
+		assertTrue(strategy.excludeForeignKeyAsCollection("fk", null, null, null, null));
+	}
+
+	@Test
+	public void testExcludeForeignKeyAsManytoOne() {
+		RevengSettings settings = new RevengSettings(strategy).setCreateManyToOneForForeignKey(true);
+		strategy.setSettings(settings);
+		assertFalse(strategy.excludeForeignKeyAsManytoOne("fk", null, null, null, null));
+
+		settings = new RevengSettings(strategy).setCreateManyToOneForForeignKey(false);
+		strategy.setSettings(settings);
+		assertTrue(strategy.excludeForeignKeyAsManytoOne("fk", null, null, null, null));
+	}
+
+	@Test
+	public void testIsForeignKeyCollectionLazy() {
+		assertTrue(strategy.isForeignKeyCollectionLazy("fk", null, null, null, null));
+	}
+
+	@Test
+	public void testCloseDoesNotThrow() {
+		strategy.close();
+	}
+
+	@Test
+	public void testTableToMetaAttributesReturnsNull() {
+		assertNull(strategy.tableToMetaAttributes(TableIdentifier.create(null, null, "T")));
+	}
+
+	@Test
+	public void testColumnToMetaAttributesReturnsNull() {
+		assertNull(strategy.columnToMetaAttributes(TableIdentifier.create(null, null, "T"), "col"));
+	}
+
+	@Test
+	public void testForeignKeyToAssociationInfoReturnsNull() {
+		assertNull(strategy.foreignKeyToAssociationInfo(null));
+	}
+
+	@Test
+	public void testForeignKeyToInverseAssociationInfoReturnsNull() {
+		assertNull(strategy.foreignKeyToInverseAssociationInfo(null));
+	}
+
+	@Test
+	public void testTableToClassNameWithDefaultPackage() {
+		RevengSettings settings = new RevengSettings(strategy).setDefaultPackageName("com.example");
+		strategy.setSettings(settings);
+
+		assertEquals("com.example.Person",
+				strategy.tableToClassName(TableIdentifier.create(null, null, "PERSON")));
+	}
+
+	@Test
+	public void testTableToClassNameWithEmptyPackage() {
+		RevengSettings settings = new RevengSettings(strategy).setDefaultPackageName("");
+		strategy.setSettings(settings);
+
+		assertEquals("Person",
+				strategy.tableToClassName(TableIdentifier.create(null, null, "PERSON")));
+	}
+
+	@Test
+	public void testForeignKeyToInverseEntityName() {
+		TableIdentifier from = TableIdentifier.create(null, null, "ORDER_ITEM");
+		TableIdentifier to = TableIdentifier.create(null, null, "ORDER");
+
+		assertEquals("order",
+				strategy.foreignKeyToInverseEntityName("fk", from, Collections.emptyList(), to, Collections.emptyList(), true));
+	}
+
+	@Test
+	public void testIsForeignKeyCollectionInverseNullTable() {
+		assertTrue(strategy.isForeignKeyCollectionInverse("fk", null, null, null, null));
+	}
+
+	@Test
+	public void testColumnToPropertyNameWithDigits() {
+		assertEquals("address1", strategy.columnToPropertyName(null, "ADDRESS_1"));
+		assertEquals("address2Line", strategy.columnToPropertyName(null, "ADDRESS_2_LINE"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/DefaultStrategyTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/DefaultStrategyTest.java
new file mode 100644
index 000000000000..87d48488201b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/DefaultStrategyTest.java
@@ -0,0 +1,153 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.hibernate.mapping.Column;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author max
+ * @author koen
+ *
+ */
+public class DefaultStrategyTest {
+
+	RevengStrategy rns = new DefaultStrategy();
+
+	@Test
+	public void testColumnKeepCase() {
+		assertEquals("name", rns.columnToPropertyName(null, "name") );
+		assertEquals("nameIsValid", rns.columnToPropertyName(null, "nameIsValid") );
+	}
+
+	@Test
+	public void testColumnUpperToLower() {
+		assertEquals("name", rns.columnToPropertyName(null, "NAME") );
+		assertEquals("name", rns.columnToPropertyName(null, "Name") );
+	}
+
+	@Test
+	public void testColumnRemoveChars() {
+		assertEquals("name", rns.columnToPropertyName(null, "_Name") );
+		assertEquals("name", rns.columnToPropertyName(null, "_name") );
+		assertEquals("name", rns.columnToPropertyName(null, "_name") );
+	}
+
+	@Test
+	public void testColumnToCamelCase() {
+		assertEquals("labelForField", rns.columnToPropertyName(null, "LABEL_FOR_FIELD") );
+		assertEquals("nameToMe", rns.columnToPropertyName(null, "_name-To-Me") );
+	}
+
+	@Test
+	public void testColumnChangeCamelCase() {
+		assertEquals("labelForField", rns.columnToPropertyName(null, "LabelForField") );
+	}
+
+	@Test
+	public void testTableKeepCase() {
+		assertEquals("SickPatients", rns.tableToClassName(TableIdentifier.create(null, null, "SickPatients") ) );
+	}
+
+	@Test
+	public void testTableUpperToLower() {
+		assertEquals("Patients", rns.tableToClassName(TableIdentifier.create(null, null, "PATIENTS") ) );
+		assertEquals("Patients", rns.tableToClassName(TableIdentifier.create(null, null, "patients") ) );
+	}
+
+	@Test
+	public void testTableRemoveChars() {
+		assertEquals("Patients", rns.tableToClassName(TableIdentifier.create(null, null, "_Patients") ) );
+		assertEquals("Patients", rns.tableToClassName(TableIdentifier.create(null, null, "_patients") ) );
+		assertEquals("Patients", rns.tableToClassName(TableIdentifier.create(null, null, "_patients") ) );
+		assertEquals("PatientInterventions", rns.tableToClassName(TableIdentifier.create(null, null, "_PATIENT_INTERVENTIONS") ) );
+	}
+
+	@Test
+	public void testTableToCamelCase() {
+		assertEquals("SickPatients", rns.tableToClassName(TableIdentifier.create(null, null, "Sick_Patients") ) );
+		assertEquals("SickPatients", rns.tableToClassName(TableIdentifier.create(null, null, "_Sick-Patients") ) );
+	}
+
+	@Test
+	public void testTableKeepCamelCase() {
+		assertEquals("SickPatients", rns.tableToClassName(TableIdentifier.create(null, null, "SickPatients") ) );
+	}
+
+	@Test
+	public void testBasicForeignKeyNames() {
+		assertEquals("products", rns.foreignKeyToCollectionName("something", TableIdentifier.create(null, null, "product"), null, TableIdentifier.create(null, null, "order"), null, true ) );
+		assertEquals("willies", rns.foreignKeyToCollectionName("something", TableIdentifier.create(null, null, "willy"), null, TableIdentifier.create(null, null, "order"), null, true ) );
+		assertEquals("boxes", rns.foreignKeyToCollectionName("something", TableIdentifier.create(null, null, "box"), null, TableIdentifier.create(null, null, "order"), null, true ) );
+		assertEquals("order", rns.foreignKeyToEntityName("something", TableIdentifier.create(null, null, "product"), null, TableIdentifier.create(null, null, "order"), null, true ) );
+	}
+
+	@Test
+	public void testCustomClassNameStrategyWithCollectionName() {
+
+		RevengStrategy custom = new DelegatingStrategy(new DefaultStrategy()) {
+			public String tableToClassName(TableIdentifier tableIdentifier) {
+				return super.tableToClassName( tableIdentifier ) + "Impl";
+			}
+		};
+
+		custom.setSettings( new RevengSettings(custom) );
+
+		TableIdentifier productTable = TableIdentifier.create(null, null, "product");
+		assertEquals("ProductImpl", custom.tableToClassName( productTable ));
+
+		assertEquals("productImpls", custom.foreignKeyToCollectionName("something", productTable, null, TableIdentifier.create(null, null, "order"), null, true ) );
+	}
+
+	@Test
+	public void testForeignKeyNamesToPropertyNames() {
+
+		String fkName = "something";
+		TableIdentifier fromTable = TableIdentifier.create(null, null, "company");
+		List<Column> fromColumns = new ArrayList<>();
+
+		TableIdentifier toTable = TableIdentifier.create(null, null, "address");
+		List<Column> toColumns = new ArrayList<>();
+
+		assertEquals("address", rns.foreignKeyToEntityName(fkName, fromTable, fromColumns, toTable, toColumns, true) );
+		assertEquals("companies", rns.foreignKeyToCollectionName(fkName, fromTable, fromColumns, toTable, toColumns, true) );
+
+		fkName = "billing";
+		fromColumns.clear();
+		fromColumns.add(new Column("bill_adr") );
+		assertEquals("addressByBillAdr", rns.foreignKeyToEntityName(fkName, fromTable, fromColumns, toTable, toColumns, false) );
+		assertEquals("companiesForBillAdr", rns.foreignKeyToCollectionName(fkName, fromTable, fromColumns, toTable, toColumns, false) );
+
+		fromColumns.add(new Column("bill_adrtype") );
+		assertEquals("addressByBilling", rns.foreignKeyToEntityName(fkName, fromTable, fromColumns, toTable, toColumns, false) );
+		assertEquals("companiesForBilling", rns.foreignKeyToCollectionName(fkName, fromTable, fromColumns, toTable, toColumns, false) );
+	}
+
+	@Test
+	public void testPreferredTypes() {
+		assertEquals("int",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, false, false));
+		assertEquals("java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, true, false), "because nullable it should not be int");
+		assertEquals("java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.NUMERIC,0,9,0, true, false));
+		assertEquals("java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, true, false));
+		assertEquals("serializable",rns.columnToHibernateTypeName(TableIdentifier.create(null, null, "sdf"), "bogus",-567,0,0,0, false, false));
+
+		assertEquals("string",rns.columnToHibernateTypeName(TableIdentifier.create(null, null, "sdf"), "bogus",12,0,0,0, false, false));
+	}
+
+	@Test
+	public void testReservedKeywordsHandling() {
+		assertEquals("class_", rns.columnToPropertyName(TableIdentifier.create(null, null, "blah"), "class"));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/DelegatingStrategyTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/DelegatingStrategyTest.java
new file mode 100644
index 000000000000..415e6314f3bc
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/DelegatingStrategyTest.java
@@ -0,0 +1,100 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DelegatingStrategyTest {
+
+	@Test
+	public void testNullDelegateReturnsDefaults() {
+		DelegatingStrategy strategy = new DelegatingStrategy(null);
+		TableIdentifier ti = TableIdentifier.create("cat", "sch", "PERSON");
+
+		assertNull(strategy.columnToPropertyName(ti, "name"));
+		assertFalse(strategy.excludeTable(ti));
+		assertFalse(strategy.excludeColumn(ti, "name"));
+		assertNull(strategy.tableToClassName(ti));
+		assertNull(strategy.getTableIdentifierStrategyName(ti));
+		assertNull(strategy.getTableIdentifierProperties(ti));
+		assertNull(strategy.getPrimaryKeyColumnNames(ti));
+		assertNull(strategy.classNameToCompositeIdName("Person"));
+		assertNull(strategy.getOptimisticLockColumnName(ti));
+		assertFalse(strategy.useColumnForOptimisticLock(ti, "version"));
+		assertNull(strategy.getSchemaSelections());
+		assertNull(strategy.tableToIdentifierPropertyName(ti));
+		assertNull(strategy.tableToCompositeIdName(ti));
+		assertNull(strategy.getForeignKeys(ti));
+		assertNull(strategy.tableToMetaAttributes(ti));
+		assertNull(strategy.columnToMetaAttributes(ti, "col"));
+		assertNull(strategy.foreignKeyToAssociationInfo(null));
+		assertNull(strategy.foreignKeyToInverseAssociationInfo(null));
+	}
+
+	@Test
+	public void testNullDelegateBooleanDefaults() {
+		DelegatingStrategy strategy = new DelegatingStrategy(null);
+		TableIdentifier ti = TableIdentifier.create("cat", "sch", "PERSON");
+
+		assertFalse(strategy.excludeForeignKeyAsCollection("fk", ti, Collections.emptyList(), ti, Collections.emptyList()));
+		assertFalse(strategy.excludeForeignKeyAsManytoOne("fk", ti, Collections.emptyList(), ti, Collections.emptyList()));
+		assertTrue(strategy.isForeignKeyCollectionLazy("fk", ti, Collections.emptyList(), ti, Collections.emptyList()));
+		assertTrue(strategy.isManyToManyTable(null));
+		assertTrue(strategy.isOneToOne(null));
+	}
+
+	@Test
+	public void testNullDelegateCollectionName() {
+		DelegatingStrategy strategy = new DelegatingStrategy(null);
+		TableIdentifier ti = TableIdentifier.create("cat", "sch", "PERSON");
+		assertNull(strategy.foreignKeyToCollectionName("fk", ti, Collections.emptyList(), ti, Collections.emptyList(), true));
+		assertNull(strategy.foreignKeyToEntityName("fk", ti, Collections.emptyList(), ti, Collections.emptyList(), true));
+		assertNull(strategy.foreignKeyToInverseEntityName("fk", ti, Collections.emptyList(), ti, Collections.emptyList(), true));
+	}
+
+	@Test
+	public void testNullDelegateColumnToHibernateType() {
+		DelegatingStrategy strategy = new DelegatingStrategy(null);
+		TableIdentifier ti = TableIdentifier.create("cat", "sch", "PERSON");
+		assertNull(strategy.columnToHibernateTypeName(ti, "col", 12, 255, 0, 0, true, false));
+	}
+
+	@Test
+	public void testNullDelegateForeignKeyToManyToManyName() {
+		DelegatingStrategy strategy = new DelegatingStrategy(null);
+		assertNull(strategy.foreignKeyToManyToManyName(null, null, null, true));
+	}
+
+	@Test
+	public void testNullDelegateClose() {
+		DelegatingStrategy strategy = new DelegatingStrategy(null);
+		assertDoesNotThrow(strategy::close);
+	}
+
+	@Test
+	public void testNullDelegateSetSettings() {
+		DelegatingStrategy strategy = new DelegatingStrategy(null);
+		assertDoesNotThrow(() -> strategy.setSettings(null));
+	}
+
+	@Test
+	public void testDelegatesWithRealStrategy() {
+		DefaultStrategy real = new DefaultStrategy();
+		DelegatingStrategy strategy = new DelegatingStrategy(real);
+		TableIdentifier ti = TableIdentifier.create(null, null, "PERSON");
+
+		assertEquals("Person", strategy.tableToClassName(ti));
+		assertEquals("PersonId", strategy.classNameToCompositeIdName("Person"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/MetaAttributeHelperExtendedTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/MetaAttributeHelperExtendedTest.java
new file mode 100644
index 000000000000..48dd11a4aaf7
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/MetaAttributeHelperExtendedTest.java
@@ -0,0 +1,151 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.HashSetValuedHashMap;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.tool.reveng.internal.core.strategy.MetaAttributeHelper.SimpleMetaAttribute;
+import org.junit.jupiter.api.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.ByteArrayInputStream;
+import java.util.Collection;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class MetaAttributeHelperExtendedTest {
+
+	private Element parseXml(String xml) throws Exception {
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		Document doc = db.parse(new ByteArrayInputStream(xml.getBytes()));
+		return doc.getDocumentElement();
+	}
+
+	@Test
+	public void testToRealMetaAttribute() {
+		List<SimpleMetaAttribute> values = List.of(
+				new SimpleMetaAttribute("value1", true),
+				new SimpleMetaAttribute("value2", false)
+		);
+		MetaAttribute attr = MetaAttributeHelper.toRealMetaAttribute("testAttr", values);
+		assertNotNull(attr);
+		assertEquals("testAttr", attr.getName());
+		assertTrue(attr.getValues().contains("value1"));
+		assertTrue(attr.getValues().contains("value2"));
+	}
+
+	@Test
+	public void testLoadMetaMapMultipleAttributes() throws Exception {
+		String xml = "<element>"
+				+ "  <meta attribute='scope'>public</meta>"
+				+ "  <meta attribute='description'>A test class</meta>"
+				+ "</element>";
+		MultiValuedMap<String, SimpleMetaAttribute> mm = MetaAttributeHelper.loadMetaMap(parseXml(xml));
+		assertEquals(2, mm.size());
+		assertFalse(mm.get("scope").isEmpty());
+		assertFalse(mm.get("description").isEmpty());
+	}
+
+	@Test
+	public void testLoadMetaMapInheritFalse() throws Exception {
+		String xml = "<element>"
+				+ "  <meta attribute='scope' inherit='false'>public</meta>"
+				+ "</element>";
+		MultiValuedMap<String, SimpleMetaAttribute> mm = MetaAttributeHelper.loadMetaMap(parseXml(xml));
+		SimpleMetaAttribute attr = mm.get("scope").iterator().next();
+		assertFalse(attr.inheritable);
+		assertEquals("public", attr.value);
+	}
+
+	@Test
+	public void testLoadMetaMapNoInheritAttribute() throws Exception {
+		String xml = "<element>"
+				+ "  <meta attribute='scope'>public</meta>"
+				+ "</element>";
+		MultiValuedMap<String, SimpleMetaAttribute> mm = MetaAttributeHelper.loadMetaMap(parseXml(xml));
+		SimpleMetaAttribute attr = mm.get("scope").iterator().next();
+		assertTrue(attr.inheritable);
+	}
+
+	@Test
+	public void testLoadMetaMapEmpty() throws Exception {
+		String xml = "<element></element>";
+		MultiValuedMap<String, SimpleMetaAttribute> mm = MetaAttributeHelper.loadMetaMap(parseXml(xml));
+		assertTrue(mm.isEmpty());
+	}
+
+	@Test
+	public void testLoadAndMergeMetaMapWithInheritedMeta() throws Exception {
+		String xml = "<element>"
+				+ "  <meta attribute='local'>localValue</meta>"
+				+ "</element>";
+
+		MultiValuedMap<String, SimpleMetaAttribute> inherited = new HashSetValuedHashMap<>();
+		inherited.put("inherited", new SimpleMetaAttribute("inheritedValue", true));
+		inherited.put("nonInherited", new SimpleMetaAttribute("shouldNotAppear", false));
+
+		MultiValuedMap<String, SimpleMetaAttribute> result =
+				MetaAttributeHelper.loadAndMergeMetaMap(parseXml(xml), inherited);
+
+		assertFalse(result.get("local").isEmpty());
+		assertFalse(result.get("inherited").isEmpty());
+		assertTrue(result.get("nonInherited").isEmpty());
+	}
+
+	@Test
+	public void testLoadAndMergeMetaMapLocalOverridesInherited() throws Exception {
+		String xml = "<element>"
+				+ "  <meta attribute='scope'>private</meta>"
+				+ "</element>";
+
+		MultiValuedMap<String, SimpleMetaAttribute> inherited = new HashSetValuedHashMap<>();
+		inherited.put("scope", new SimpleMetaAttribute("public", true));
+
+		MultiValuedMap<String, SimpleMetaAttribute> result =
+				MetaAttributeHelper.loadAndMergeMetaMap(parseXml(xml), inherited);
+
+		Collection<SimpleMetaAttribute> scopeValues = result.get("scope");
+		assertEquals(1, scopeValues.size());
+		assertEquals("private", scopeValues.iterator().next().value);
+	}
+
+	@Test
+	public void testLoadAndMergeMetaMapWithNullInherited() throws Exception {
+		String xml = "<element>"
+				+ "  <meta attribute='scope'>public</meta>"
+				+ "</element>";
+
+		MultiValuedMap<String, SimpleMetaAttribute> result =
+				MetaAttributeHelper.loadAndMergeMetaMap(parseXml(xml), null);
+
+		assertFalse(result.get("scope").isEmpty());
+	}
+
+	@Test
+	public void testSimpleMetaAttributeToString() {
+		SimpleMetaAttribute attr = new SimpleMetaAttribute("testValue", true);
+		assertEquals("testValue", attr.toString());
+	}
+
+	@Test
+	public void testLoadMetaMapWithNonMetaChildren() throws Exception {
+		String xml = "<element>"
+				+ "  <other>ignored</other>"
+				+ "  <meta attribute='scope'>public</meta>"
+				+ "  <another>also ignored</another>"
+				+ "</element>";
+		MultiValuedMap<String, SimpleMetaAttribute> mm = MetaAttributeHelper.loadMetaMap(parseXml(xml));
+		assertEquals(1, mm.size());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/MetaAttributeHelperTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/MetaAttributeHelperTest.java
new file mode 100644
index 000000000000..ac15604dd600
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/MetaAttributeHelperTest.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.apache.commons.collections4.MultiValuedMap;
+import org.hibernate.tool.reveng.internal.core.strategy.MetaAttributeHelper.SimpleMetaAttribute;
+import org.junit.jupiter.api.Test;
+import org.w3c.dom.Document;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.ByteArrayInputStream;
+import java.util.Collection;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class MetaAttributeHelperTest {
+
+	@Test
+	public void testLoadMetaMap() throws Exception {
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		String XML = "<element>                                         " +
+					"  <meta attribute='blah' inherit='true'>foo</meta>" +
+					"</element>                                        ";
+		Document document = db.parse(new ByteArrayInputStream( XML.getBytes()));
+		MultiValuedMap<String, SimpleMetaAttribute> mm = MetaAttributeHelper.loadMetaMap(document.getDocumentElement());
+		assertEquals(1, mm.size());
+		Collection<SimpleMetaAttribute> attributeList = mm.get("blah");
+		assertEquals(1, attributeList.size());
+		Optional<SimpleMetaAttribute> first = attributeList.stream().findFirst();
+		assertTrue(first.isPresent());
+		SimpleMetaAttribute attribute = first.get();
+		assertTrue( attribute.inheritable );
+		assertEquals("foo", attribute.value);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/OverrideRepositoryTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/OverrideRepositoryTest.java
new file mode 100644
index 000000000000..b23fa0739517
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/OverrideRepositoryTest.java
@@ -0,0 +1,505 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.sql.Types;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class OverrideRepositoryTest {
+
+	private OverrideRepository parseXml(String xml) {
+		OverrideRepository repo = new OverrideRepository();
+		repo.addInputStream(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)));
+		return repo;
+	}
+
+	private RevengStrategy createStrategy(OverrideRepository repo) {
+		RevengStrategy strategy = repo.getReverseEngineeringStrategy(new DefaultStrategy());
+		strategy.setSettings(new RevengSettings(strategy));
+		return strategy;
+	}
+
+	@Test
+	public void testEmptyRepository() {
+		OverrideRepository repo = new OverrideRepository();
+		RevengStrategy strategy = createStrategy(repo);
+		assertNotNull(strategy);
+	}
+
+	@Test
+	public void testTableFilterExclude() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table-filter match-catalog=\".*\" match-schema=\".*\" match-name=\"AUDIT.*\" exclude=\"true\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertTrue(strategy.excludeTable(TableIdentifier.create("cat", "sch", "AUDIT_LOG")));
+		assertTrue(strategy.excludeTable(TableIdentifier.create("cat", "sch", "AUDIT_TRAIL")));
+	}
+
+	@Test
+	public void testTableFilterInclude() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table-filter match-catalog=\".*\" match-schema=\".*\" match-name=\"PERSON\" exclude=\"false\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertFalse(strategy.excludeTable(TableIdentifier.create("cat", "sch", "PERSON")));
+	}
+
+	@Test
+	public void testTableFilterWithPackage() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table-filter match-catalog=\".*\" match-schema=\".*\" match-name=\".*\" package=\"com.example.model\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		String className = strategy.tableToClassName(TableIdentifier.create("cat", "sch", "PERSON"));
+		assertTrue(className.startsWith("com.example.model."));
+	}
+
+	@Test
+	public void testSchemaSelection() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<schema-selection match-catalog=\"MY_CAT\" match-schema=\"MY_SCHEMA\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		List<RevengStrategy.SchemaSelection> selections = strategy.getSchemaSelections();
+		assertNotNull(selections);
+		assertFalse(selections.isEmpty());
+	}
+
+	@Test
+	public void testTableClassName() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\" class=\"com.example.Person\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertEquals("com.example.Person", strategy.tableToClassName(TableIdentifier.create(null, null, "PERSON")));
+	}
+
+	@Test
+	public void testTableClassNameWithoutPackage() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\" class=\"PersonEntity\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertEquals("PersonEntity", strategy.tableToClassName(TableIdentifier.create(null, null, "PERSON")));
+	}
+
+	@Test
+	public void testTableClassNameWithTableFilterPackage() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table-filter match-catalog=\".*\" match-schema=\".*\" match-name=\".*\" package=\"com.example\"/>"
+				+ "<table name=\"PERSON\" class=\"PersonEntity\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertEquals("com.example.PersonEntity", strategy.tableToClassName(TableIdentifier.create("cat", "sch", "PERSON")));
+	}
+
+	@Test
+	public void testColumnPropertyName() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\">"
+				+ "  <column name=\"FIRST_NAME\" property=\"firstName\"/>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier ti = TableIdentifier.create(null, null, "PERSON");
+		assertEquals("firstName", strategy.columnToPropertyName(ti, "FIRST_NAME"));
+	}
+
+	@Test
+	public void testColumnType() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\">"
+				+ "  <column name=\"STATUS\" type=\"string\"/>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier ti = TableIdentifier.create(null, null, "PERSON");
+		assertEquals("string", strategy.columnToHibernateTypeName(ti, "STATUS", Types.VARCHAR, 255, 0, 0, true, false));
+	}
+
+	@Test
+	public void testColumnExclude() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\">"
+				+ "  <column name=\"INTERNAL\" exclude=\"true\"/>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier ti = TableIdentifier.create(null, null, "PERSON");
+		assertTrue(strategy.excludeColumn(ti, "INTERNAL"));
+		assertFalse(strategy.excludeColumn(ti, "FIRST_NAME"));
+	}
+
+	@Test
+	public void testPrimaryKeyColumns() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\">"
+				+ "  <primary-key>"
+				+ "    <key-column name=\"PERSON_ID\"/>"
+				+ "  </primary-key>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier ti = TableIdentifier.create(null, null, "PERSON");
+		List<String> pkCols = strategy.getPrimaryKeyColumnNames(ti);
+		assertNotNull(pkCols);
+		assertEquals(1, pkCols.size());
+		assertEquals("PERSON_ID", pkCols.get(0));
+	}
+
+	@Test
+	public void testPrimaryKeyPropertyName() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\">"
+				+ "  <primary-key property=\"personId\">"
+				+ "    <key-column name=\"PERSON_ID\"/>"
+				+ "  </primary-key>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier ti = TableIdentifier.create(null, null, "PERSON");
+		assertEquals("personId", strategy.tableToIdentifierPropertyName(ti));
+	}
+
+	@Test
+	public void testPrimaryKeyGeneratorClass() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\">"
+				+ "  <primary-key>"
+				+ "    <generator class=\"sequence\"/>"
+				+ "    <key-column name=\"PERSON_ID\"/>"
+				+ "  </primary-key>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier ti = TableIdentifier.create(null, null, "PERSON");
+		assertEquals("sequence", strategy.getTableIdentifierStrategyName(ti));
+	}
+
+	@Test
+	public void testTypeMapping() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<type-mapping>"
+				+ "  <sql-type jdbc-type=\"VARCHAR\" hibernate-type=\"string\"/>"
+				+ "</type-mapping>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertEquals("string", strategy.columnToHibernateTypeName(null, "col", Types.VARCHAR, 255, 0, 0, true, false));
+	}
+
+	@Test
+	public void testTypeMappingWithLength() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<type-mapping>"
+				+ "  <sql-type jdbc-type=\"VARCHAR\" length=\"1\" hibernate-type=\"character\"/>"
+				+ "  <sql-type jdbc-type=\"VARCHAR\" hibernate-type=\"string\"/>"
+				+ "</type-mapping>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertEquals("character", strategy.columnToHibernateTypeName(null, "col", Types.VARCHAR, 1, 0, 0, true, false));
+		assertEquals("string", strategy.columnToHibernateTypeName(null, "col", Types.VARCHAR, 255, 0, 0, true, false));
+	}
+
+	@Test
+	public void testForeignKeyPropertyNames() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\">"
+				+ "  <foreign-key constraint-name=\"FK_ADDR\" foreign-table=\"ADDRESS\">"
+				+ "    <column-ref local-column=\"ADDR_ID\" foreign-column=\"ID\"/>"
+				+ "    <many-to-one property=\"homeAddress\"/>"
+				+ "    <set property=\"residents\"/>"
+				+ "  </foreign-key>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier from = TableIdentifier.create(null, null, "PERSON");
+		TableIdentifier to = TableIdentifier.create(null, null, "ADDRESS");
+
+		assertEquals("homeAddress", strategy.foreignKeyToEntityName("FK_ADDR", from, Collections.emptyList(), to, Collections.emptyList(), true));
+		assertEquals("residents", strategy.foreignKeyToCollectionName("FK_ADDR", from, Collections.emptyList(), to, Collections.emptyList(), true));
+	}
+
+	@Test
+	public void testForeignKeyExclude() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\">"
+				+ "  <foreign-key constraint-name=\"FK_ADDR\" foreign-table=\"ADDRESS\">"
+				+ "    <column-ref local-column=\"ADDR_ID\" foreign-column=\"ID\"/>"
+				+ "    <many-to-one exclude=\"true\"/>"
+				+ "  </foreign-key>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier from = TableIdentifier.create(null, null, "PERSON");
+		TableIdentifier to = TableIdentifier.create(null, null, "ADDRESS");
+
+		assertTrue(strategy.excludeForeignKeyAsManytoOne("FK_ADDR", from, Collections.emptyList(), to, Collections.emptyList()));
+	}
+
+	@Test
+	public void testForeignKeyInverseExclude() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\">"
+				+ "  <foreign-key constraint-name=\"FK_ADDR\" foreign-table=\"ADDRESS\">"
+				+ "    <column-ref local-column=\"ADDR_ID\" foreign-column=\"ID\"/>"
+				+ "    <many-to-one property=\"addr\"/>"
+				+ "    <set exclude=\"true\"/>"
+				+ "  </foreign-key>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier from = TableIdentifier.create(null, null, "PERSON");
+		TableIdentifier to = TableIdentifier.create(null, null, "ADDRESS");
+
+		assertTrue(strategy.excludeForeignKeyAsCollection("FK_ADDR", from, Collections.emptyList(), to, Collections.emptyList()));
+	}
+
+	@Test
+	public void testAddTypeMappingProgrammatically() {
+		OverrideRepository repo = new OverrideRepository();
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.BIT);
+		mapping.setHibernateType("boolean");
+		repo.addTypeMapping(mapping);
+
+		RevengStrategy strategy = createStrategy(repo);
+		assertEquals("boolean", strategy.columnToHibernateTypeName(null, "col", Types.BIT, 0, 0, 0, false, false));
+	}
+
+	@Test
+	public void testAddTableFilterProgrammatically() {
+		OverrideRepository repo = new OverrideRepository();
+		TableFilter filter = new TableFilter();
+		filter.setMatchName("TMP.*");
+		filter.setExclude(Boolean.TRUE);
+		repo.addTableFilter(filter);
+
+		RevengStrategy strategy = createStrategy(repo);
+		assertTrue(strategy.excludeTable(TableIdentifier.create("cat", "sch", "TMP_DATA")));
+	}
+
+	@Test
+	public void testTypeMappingKeyEqualsAndHashCode() {
+		OverrideRepository.TypeMappingKey a = new OverrideRepository.TypeMappingKey(Types.VARCHAR, 255);
+		OverrideRepository.TypeMappingKey b = new OverrideRepository.TypeMappingKey(Types.VARCHAR, 255);
+		OverrideRepository.TypeMappingKey c = new OverrideRepository.TypeMappingKey(Types.INTEGER, 255);
+
+		assertEquals(a, b);
+		assertEquals(a.hashCode(), b.hashCode());
+		assertFalse(a.equals(c));
+		assertFalse(a.equals(null));
+		assertNotNull(a.toString());
+	}
+
+	@Test
+	public void testTableColumnKeyEqualsAndHashCode() {
+		TableIdentifier ti = TableIdentifier.create(null, null, "PERSON");
+		OverrideRepository.TableColumnKey a = new OverrideRepository.TableColumnKey(ti, "NAME");
+		OverrideRepository.TableColumnKey b = new OverrideRepository.TableColumnKey(ti, "NAME");
+		OverrideRepository.TableColumnKey c = new OverrideRepository.TableColumnKey(ti, "AGE");
+
+		assertEquals(a, b);
+		assertEquals(a.hashCode(), b.hashCode());
+		assertFalse(a.equals(c));
+		assertFalse(a.equals(null));
+		assertFalse(a.equals("string"));
+		assertTrue(a.equals(a));
+	}
+
+	@Test
+	public void testTableColumnKeyWithNulls() {
+		OverrideRepository.TableColumnKey a = new OverrideRepository.TableColumnKey(null, null);
+		OverrideRepository.TableColumnKey b = new OverrideRepository.TableColumnKey(null, null);
+		assertEquals(a, b);
+
+		TableIdentifier ti = TableIdentifier.create(null, null, "T");
+		OverrideRepository.TableColumnKey c = new OverrideRepository.TableColumnKey(ti, "C");
+		assertFalse(a.equals(c));
+		assertFalse(c.equals(a));
+	}
+
+	@Test
+	public void testCompositeIdName() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"ORDER_ITEM\">"
+				+ "  <primary-key id-class=\"OrderItemPK\">"
+				+ "    <key-column name=\"ORDER_ID\"/>"
+				+ "    <key-column name=\"ITEM_ID\"/>"
+				+ "  </primary-key>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier ti = TableIdentifier.create(null, null, "ORDER_ITEM");
+		assertEquals("OrderItemPK", strategy.tableToCompositeIdName(ti));
+	}
+
+	@Test
+	public void testMultipleTableFilters() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table-filter match-catalog=\".*\" match-schema=\".*\" match-name=\"INCLUDE_ME\" exclude=\"false\"/>"
+				+ "<table-filter match-catalog=\".*\" match-schema=\".*\" match-name=\".*\" exclude=\"true\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertFalse(strategy.excludeTable(TableIdentifier.create("cat", "sch", "INCLUDE_ME")));
+		assertTrue(strategy.excludeTable(TableIdentifier.create("cat", "sch", "OTHER")));
+	}
+
+	@Test
+	public void testTableWithCatalogAndSchema() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table catalog=\"MY_CAT\" schema=\"MY_SCH\" name=\"PERSON\" class=\"com.example.Person\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertEquals("com.example.Person",
+				strategy.tableToClassName(TableIdentifier.create("MY_CAT", "MY_SCH", "PERSON")));
+	}
+
+	@Test
+	public void testTableFilterCatalogAndSchema() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table-filter match-catalog=\"PROD\" match-schema=\"PUBLIC\" match-name=\".*\" exclude=\"true\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertTrue(strategy.excludeTable(TableIdentifier.create("PROD", "PUBLIC", "DATA")));
+		assertFalse(strategy.excludeTable(TableIdentifier.create("DEV", "PUBLIC", "DATA")));
+	}
+
+	@Test
+	public void testGetReverseEngineeringStrategyDeprecated() {
+		OverrideRepository repo = new OverrideRepository();
+		@SuppressWarnings("deprecation")
+		RevengStrategy strategy = repo.getReverseEngineeringStrategy();
+		assertNotNull(strategy);
+	}
+
+	@Test
+	public void testColumnUnchangedWhenNoOverride() {
+		OverrideRepository repo = new OverrideRepository();
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier ti = TableIdentifier.create(null, null, "PERSON");
+		assertEquals("firstName", strategy.columnToPropertyName(ti, "FIRST_NAME"));
+	}
+
+	@Test
+	public void testSchemaSelectionMatchTable() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<schema-selection match-catalog=\"MY_CAT\" match-schema=\"MY_SCHEMA\" match-table=\"PERSON\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		List<RevengStrategy.SchemaSelection> selections = strategy.getSchemaSelections();
+		assertEquals(1, selections.size());
+		assertEquals("MY_CAT", selections.get(0).getMatchCatalog());
+		assertEquals("MY_SCHEMA", selections.get(0).getMatchSchema());
+		assertEquals("PERSON", selections.get(0).getMatchTable());
+	}
+
+	@Test
+	public void testMultipleSchemaSelections() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<schema-selection match-catalog=\"CAT1\"/>"
+				+ "<schema-selection match-catalog=\"CAT2\"/>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		List<RevengStrategy.SchemaSelection> selections = strategy.getSchemaSelections();
+		assertEquals(2, selections.size());
+	}
+
+	@Test
+	public void testTypeMappingWithPrecisionAndScale() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<type-mapping>"
+				+ "  <sql-type jdbc-type=\"NUMERIC\" precision=\"10\" scale=\"2\" hibernate-type=\"java.math.BigDecimal\"/>"
+				+ "</type-mapping>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		assertEquals("java.math.BigDecimal",
+				strategy.columnToHibernateTypeName(null, "col", Types.NUMERIC, 0, 10, 2, true, false));
+	}
+
+	@Test
+	public void testPrimaryKeyWithGeneratorParams() {
+		String xml = "<hibernate-reverse-engineering>"
+				+ "<table name=\"PERSON\">"
+				+ "  <primary-key>"
+				+ "    <generator class=\"sequence\">"
+				+ "      <param name=\"sequence_name\">person_seq</param>"
+				+ "    </generator>"
+				+ "    <key-column name=\"ID\"/>"
+				+ "  </primary-key>"
+				+ "</table>"
+				+ "</hibernate-reverse-engineering>";
+		OverrideRepository repo = parseXml(xml);
+		RevengStrategy strategy = createStrategy(repo);
+
+		TableIdentifier ti = TableIdentifier.create(null, null, "PERSON");
+		assertEquals("sequence", strategy.getTableIdentifierStrategyName(ti));
+		assertNotNull(strategy.getTableIdentifierProperties(ti));
+		assertEquals("person_seq", strategy.getTableIdentifierProperties(ti).getProperty("sequence_name"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/SQLTypeMappingTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/SQLTypeMappingTest.java
new file mode 100644
index 000000000000..b8d4e6d27fa7
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/SQLTypeMappingTest.java
@@ -0,0 +1,162 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.junit.jupiter.api.Test;
+
+import java.sql.Types;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SQLTypeMappingTest {
+
+	@Test
+	public void testConstructorWithJdbcType() {
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.VARCHAR);
+		assertEquals(Types.VARCHAR, mapping.getJDBCType());
+		assertEquals(SQLTypeMapping.UNKNOWN_LENGTH, mapping.getLength());
+		assertEquals(SQLTypeMapping.UNKNOWN_PRECISION, mapping.getPrecision());
+		assertEquals(SQLTypeMapping.UNKNOWN_SCALE, mapping.getScale());
+		assertNull(mapping.getNullable());
+		assertNull(mapping.getHibernateType());
+	}
+
+	@Test
+	public void testConstructorFull() {
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.DECIMAL, 10, 5, 2, true);
+		assertEquals(Types.DECIMAL, mapping.getJDBCType());
+		assertEquals(10, mapping.getLength());
+		assertEquals(5, mapping.getPrecision());
+		assertEquals(2, mapping.getScale());
+		assertTrue(mapping.getNullable());
+	}
+
+	@Test
+	public void testSettersAndGetters() {
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.INTEGER);
+		mapping.setLength(100);
+		mapping.setPrecision(10);
+		mapping.setScale(2);
+		mapping.setNullable(false);
+		mapping.setHibernateType("int");
+
+		assertEquals(100, mapping.getLength());
+		assertEquals(10, mapping.getPrecision());
+		assertEquals(2, mapping.getScale());
+		assertFalse(mapping.getNullable());
+		assertEquals("int", mapping.getHibernateType());
+	}
+
+	@Test
+	public void testMatchExact() {
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, false);
+		assertTrue(mapping.match(Types.VARCHAR, 255, 0, 0, false));
+	}
+
+	@Test
+	public void testMatchDifferentJdbcType() {
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, false);
+		assertFalse(mapping.match(Types.INTEGER, 255, 0, 0, false));
+	}
+
+	@Test
+	public void testMatchUnknownLength() {
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.VARCHAR);
+		assertTrue(mapping.match(Types.VARCHAR, 100, 5, 3, true));
+	}
+
+	@Test
+	public void testMatchDifferentLength() {
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.VARCHAR, 255, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE, null);
+		assertFalse(mapping.match(Types.VARCHAR, 100, 0, 0, false));
+	}
+
+	@Test
+	public void testMatchNullableNull() {
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, null);
+		assertTrue(mapping.match(Types.VARCHAR, 255, 0, 0, true));
+		assertTrue(mapping.match(Types.VARCHAR, 255, 0, 0, false));
+	}
+
+	@Test
+	public void testMatchNullableMismatch() {
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, true);
+		assertFalse(mapping.match(Types.VARCHAR, 255, 0, 0, false));
+	}
+
+	@Test
+	public void testCompareToEqual() {
+		SQLTypeMapping m1 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, true);
+		SQLTypeMapping m2 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, true);
+		assertEquals(0, m1.compareTo(m2));
+	}
+
+	@Test
+	public void testCompareToDifferentJdbcType() {
+		SQLTypeMapping m1 = new SQLTypeMapping(Types.INTEGER);
+		SQLTypeMapping m2 = new SQLTypeMapping(Types.VARCHAR);
+		assertTrue(m1.compareTo(m2) != 0);
+	}
+
+	@Test
+	public void testCompareToDifferentLength() {
+		SQLTypeMapping m1 = new SQLTypeMapping(Types.VARCHAR, 100, 0, 0, null);
+		SQLTypeMapping m2 = new SQLTypeMapping(Types.VARCHAR, 200, 0, 0, null);
+		assertTrue(m1.compareTo(m2) < 0);
+	}
+
+	@Test
+	public void testCompareToDifferentNullable() {
+		SQLTypeMapping m1 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, false);
+		SQLTypeMapping m2 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, true);
+		assertTrue(m1.compareTo(m2) < 0);
+	}
+
+	@Test
+	public void testCompareToNullVsNonNull() {
+		SQLTypeMapping m1 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, null);
+		SQLTypeMapping m2 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, true);
+		assertTrue(m1.compareTo(m2) > 0);
+	}
+
+	@Test
+	public void testEqualsTrue() {
+		SQLTypeMapping m1 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, true);
+		SQLTypeMapping m2 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, true);
+		assertEquals(m1, m2);
+	}
+
+	@Test
+	public void testEqualsFalse() {
+		SQLTypeMapping m1 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, true);
+		SQLTypeMapping m2 = new SQLTypeMapping(Types.INTEGER, 255, 0, 0, true);
+		assertFalse(m1.equals(m2));
+	}
+
+	@Test
+	public void testEqualsNotSameClass() {
+		SQLTypeMapping m = new SQLTypeMapping(Types.VARCHAR);
+		assertFalse(m.equals("not a mapping"));
+	}
+
+	@Test
+	public void testHashCodeConsistent() {
+		SQLTypeMapping m1 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, true);
+		SQLTypeMapping m2 = new SQLTypeMapping(Types.VARCHAR, 255, 0, 0, true);
+		assertEquals(m1.hashCode(), m2.hashCode());
+	}
+
+	@Test
+	public void testToString() {
+		SQLTypeMapping mapping = new SQLTypeMapping(Types.VARCHAR);
+		mapping.setHibernateType("string");
+		String s = mapping.toString();
+		assertTrue(s.contains("string"));
+		assertTrue(s.contains("" + Types.VARCHAR));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/TableFilterTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/TableFilterTest.java
new file mode 100644
index 000000000000..63b5d0acc777
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/TableFilterTest.java
@@ -0,0 +1,157 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TableFilterTest {
+
+	// --- Matcher tests ---
+
+	@Test
+	public void testMatcherEquals() {
+		TableFilter.Matcher m = new TableFilter.Matcher("MY_TABLE");
+		assertTrue(m.match("MY_TABLE"));
+		assertFalse(m.match("OTHER"));
+		assertFalse(m.match("MY_TABLE_EXT"));
+	}
+
+	@Test
+	public void testMatcherAny() {
+		TableFilter.Matcher m = new TableFilter.Matcher(".*");
+		assertTrue(m.match("anything"));
+		assertTrue(m.match(""));
+	}
+
+	@Test
+	public void testMatcherStartsWith() {
+		TableFilter.Matcher m = new TableFilter.Matcher("MY_.*");
+		assertTrue(m.match("MY_TABLE"));
+		assertTrue(m.match("MY_OTHER"));
+		assertFalse(m.match("YOUR_TABLE"));
+	}
+
+	@Test
+	public void testMatcherEndsWith() {
+		TableFilter.Matcher m = new TableFilter.Matcher(".*_TABLE");
+		assertTrue(m.match("MY_TABLE"));
+		assertTrue(m.match("YOUR_TABLE"));
+		assertFalse(m.match("MY_VIEW"));
+	}
+
+	@Test
+	public void testMatcherSubstring() {
+		TableFilter.Matcher m = new TableFilter.Matcher(".*EMPL.*");
+		assertTrue(m.match("EMPLOYEE"));
+		assertTrue(m.match("MY_EMPLOYEE_TABLE"));
+		assertFalse(m.match("DEPARTMENT"));
+	}
+
+	@Test
+	public void testMatcherToString() {
+		TableFilter.Matcher m = new TableFilter.Matcher("MY_.*");
+		assertEquals("MY_.*", m.toString());
+	}
+
+	// --- TableFilter tests ---
+
+	@Test
+	public void testDefaultFilterMatchesAll() {
+		TableFilter filter = new TableFilter();
+		TableIdentifier id = TableIdentifier.create("CAT", "SCH", "TAB");
+		assertNull(filter.exclude(id));
+		assertEquals(".*", filter.getMatchCatalog());
+		assertEquals(".*", filter.getMatchSchema());
+		assertEquals(".*", filter.getMatchName());
+		assertNull(filter.getExclude());
+	}
+
+	@Test
+	public void testFilterExcludeTrue() {
+		TableFilter filter = new TableFilter();
+		filter.setExclude(true);
+		TableIdentifier id = TableIdentifier.create("CAT", "SCH", "TAB");
+		assertTrue(filter.exclude(id));
+	}
+
+	@Test
+	public void testFilterExcludeFalse() {
+		TableFilter filter = new TableFilter();
+		filter.setExclude(false);
+		TableIdentifier id = TableIdentifier.create("CAT", "SCH", "TAB");
+		assertFalse(filter.exclude(id));
+	}
+
+	@Test
+	public void testFilterNotRelevant() {
+		TableFilter filter = new TableFilter();
+		filter.setMatchName("EMPLOYEE");
+		filter.setExclude(true);
+		TableIdentifier id = TableIdentifier.create("CAT", "SCH", "DEPARTMENT");
+		assertNull(filter.exclude(id));
+	}
+
+	@Test
+	public void testFilterByCatalog() {
+		TableFilter filter = new TableFilter();
+		filter.setMatchCatalog("MY_CAT");
+		filter.setExclude(true);
+		assertTrue(filter.exclude(TableIdentifier.create("MY_CAT", "SCH", "TAB")));
+		assertNull(filter.exclude(TableIdentifier.create("OTHER", "SCH", "TAB")));
+	}
+
+	@Test
+	public void testFilterBySchema() {
+		TableFilter filter = new TableFilter();
+		filter.setMatchSchema("MY_SCH");
+		filter.setExclude(true);
+		assertTrue(filter.exclude(TableIdentifier.create("CAT", "MY_SCH", "TAB")));
+		assertNull(filter.exclude(TableIdentifier.create("CAT", "OTHER", "TAB")));
+	}
+
+	@Test
+	public void testFilterPackage() {
+		TableFilter filter = new TableFilter();
+		filter.setPackage("com.example");
+		TableIdentifier id = TableIdentifier.create("CAT", "SCH", "TAB");
+		assertEquals("com.example", filter.getPackage(id));
+	}
+
+	@Test
+	public void testFilterPackageNotRelevant() {
+		TableFilter filter = new TableFilter();
+		filter.setMatchName("EMPLOYEE");
+		filter.setPackage("com.example");
+		assertNull(filter.getPackage(TableIdentifier.create("CAT", "SCH", "DEPARTMENT")));
+	}
+
+	@Test
+	public void testFilterToString() {
+		TableFilter filter = new TableFilter();
+		String s = filter.toString();
+		assertTrue(s.contains(".*"));
+	}
+
+	@Test
+	public void testFilterWithStartsWithPattern() {
+		TableFilter filter = new TableFilter();
+		filter.setMatchName("EMP_.*");
+		filter.setExclude(true);
+		assertTrue(filter.exclude(TableIdentifier.create("CAT", "SCH", "EMP_TABLE")));
+		assertNull(filter.exclude(TableIdentifier.create("CAT", "SCH", "DEP_TABLE")));
+	}
+
+	@Test
+	public void testFilterMetaAttributes() {
+		TableFilter filter = new TableFilter();
+		assertNull(filter.getMetaAttributes(TableIdentifier.create("C", "S", "T")));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/TableSelectorStrategyTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/TableSelectorStrategyTest.java
new file mode 100644
index 000000000000..ff38e9da0473
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/strategy/TableSelectorStrategyTest.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.strategy;
+
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TableSelectorStrategyTest {
+
+	@Test
+	public void testInitiallyEmpty() {
+		TableSelectorStrategy strategy = new TableSelectorStrategy(new DefaultStrategy());
+		List<RevengStrategy.SchemaSelection> selections = strategy.getSchemaSelections();
+		assertNotNull(selections);
+		assertTrue(selections.isEmpty());
+	}
+
+	@Test
+	public void testAddSchemaSelection() {
+		TableSelectorStrategy strategy = new TableSelectorStrategy(new DefaultStrategy());
+		RevengStrategy.SchemaSelection selection = new RevengStrategy.SchemaSelection() {
+			public String getMatchCatalog() { return "MY_CAT"; }
+			public String getMatchSchema() { return "MY_SCH"; }
+			public String getMatchTable() { return "MY_TABLE"; }
+		};
+		strategy.addSchemaSelection(selection);
+
+		assertEquals(1, strategy.getSchemaSelections().size());
+		assertEquals("MY_CAT", strategy.getSchemaSelections().get(0).getMatchCatalog());
+	}
+
+	@Test
+	public void testClearSchemaSelections() {
+		TableSelectorStrategy strategy = new TableSelectorStrategy(new DefaultStrategy());
+		strategy.addSchemaSelection(new RevengStrategy.SchemaSelection() {
+			public String getMatchCatalog() { return "C"; }
+			public String getMatchSchema() { return "S"; }
+			public String getMatchTable() { return "T"; }
+		});
+		assertEquals(1, strategy.getSchemaSelections().size());
+
+		strategy.clearSchemaSelections();
+		assertTrue(strategy.getSchemaSelections().isEmpty());
+	}
+
+	@Test
+	public void testMultipleSelections() {
+		TableSelectorStrategy strategy = new TableSelectorStrategy(new DefaultStrategy());
+		for (int i = 0; i < 3; i++) {
+			final int idx = i;
+			strategy.addSchemaSelection(new RevengStrategy.SchemaSelection() {
+				public String getMatchCatalog() { return "CAT_" + idx; }
+				public String getMatchSchema() { return null; }
+				public String getMatchTable() { return null; }
+			});
+		}
+		assertEquals(3, strategy.getSchemaSelections().size());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/util/RevengUtilsTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/util/RevengUtilsTest.java
new file mode 100644
index 000000000000..d069ce97976c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/core/util/RevengUtilsTest.java
@@ -0,0 +1,32 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.core.util;
+
+import org.hibernate.tool.reveng.api.core.AssociationInfo;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class RevengUtilsTest {
+
+	@Test
+	public void testCreateAssociationInfoWithValues() {
+		AssociationInfo info = RevengUtils.createAssociationInfo("all", "lazy", Boolean.TRUE, Boolean.FALSE);
+		assertEquals("all", info.getCascade());
+		assertEquals("lazy", info.getFetch());
+		assertEquals(Boolean.TRUE, info.getInsert());
+		assertEquals(Boolean.FALSE, info.getUpdate());
+	}
+
+	@Test
+	public void testCreateAssociationInfoWithNulls() {
+		AssociationInfo info = RevengUtils.createAssociationInfo(null, null, null, null);
+		assertNull(info.getCascade());
+		assertNull(info.getFetch());
+		assertNull(info.getInsert());
+		assertNull(info.getUpdate());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/common/DefaultArtifactCollectorTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/common/DefaultArtifactCollectorTest.java
new file mode 100644
index 000000000000..2e0f545fff24
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/common/DefaultArtifactCollectorTest.java
@@ -0,0 +1,122 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DefaultArtifactCollectorTest {
+
+	private DefaultArtifactCollector collector;
+
+	@BeforeEach
+	public void setUp() {
+		collector = new DefaultArtifactCollector();
+	}
+
+	@Test
+	public void testAddFileAndGetCount() {
+		File file = new File("test.java");
+		collector.addFile(file, "java");
+		assertEquals(1, collector.getFileCount("java"));
+	}
+
+	@Test
+	public void testGetCountForUnknownType() {
+		assertEquals(0, collector.getFileCount("unknown"));
+	}
+
+	@Test
+	public void testGetFilesForUnknownType() {
+		File[] files = collector.getFiles("unknown");
+		assertEquals(0, files.length);
+	}
+
+	@Test
+	public void testAddMultipleFiles() {
+		collector.addFile(new File("a.java"), "java");
+		collector.addFile(new File("b.java"), "java");
+		collector.addFile(new File("c.xml"), "xml");
+		assertEquals(2, collector.getFileCount("java"));
+		assertEquals(1, collector.getFileCount("xml"));
+	}
+
+	@Test
+	public void testGetFiles() {
+		File f1 = new File("a.java");
+		File f2 = new File("b.java");
+		collector.addFile(f1, "java");
+		collector.addFile(f2, "java");
+		File[] files = collector.getFiles("java");
+		assertEquals(2, files.length);
+		assertEquals(f1, files[0]);
+		assertEquals(f2, files[1]);
+	}
+
+	@Test
+	public void testGetFileTypes() {
+		collector.addFile(new File("a.java"), "java");
+		collector.addFile(new File("b.xml"), "xml");
+		collector.addFile(new File("c.cfg.xml"), "cfg.xml");
+		Set<String> types = collector.getFileTypes();
+		assertEquals(3, types.size());
+		assertTrue(types.contains("java"));
+		assertTrue(types.contains("xml"));
+		assertTrue(types.contains("cfg.xml"));
+	}
+
+	@Test
+	public void testGetFileTypesEmpty() {
+		Set<String> types = collector.getFileTypes();
+		assertTrue(types.isEmpty());
+	}
+
+	@Test
+	public void testFormatFilesWithNoFiles() {
+		// Should not throw when no files are registered
+		collector.formatFiles();
+	}
+
+	@Test
+	public void testFormatFilesWithXmlFiles(@TempDir File tempDir) throws Exception {
+		File xmlFile = new File(tempDir, "test.xml");
+		java.nio.file.Files.writeString(xmlFile.toPath(),
+				"<?xml version=\"1.0\" encoding=\"UTF-8\"?><root><child>text</child></root>");
+		collector.addFile(xmlFile, "xml");
+		collector.formatFiles();
+		String content = java.nio.file.Files.readString(xmlFile.toPath());
+		assertTrue(content.contains("<root>"));
+		assertTrue(content.contains("<child>"));
+	}
+
+	@Test
+	public void testFormatFilesWithHbmXml(@TempDir File tempDir) throws Exception {
+		File hbmFile = new File(tempDir, "test.hbm.xml");
+		java.nio.file.Files.writeString(hbmFile.toPath(),
+				"<?xml version=\"1.0\" encoding=\"UTF-8\"?><hibernate-mapping><class name=\"Foo\"/></hibernate-mapping>");
+		collector.addFile(hbmFile, "hbm.xml");
+		collector.formatFiles();
+		String content = java.nio.file.Files.readString(hbmFile.toPath());
+		assertTrue(content.contains("<hibernate-mapping>"));
+	}
+
+	@Test
+	public void testFormatFilesWithCfgXml(@TempDir File tempDir) throws Exception {
+		File cfgFile = new File(tempDir, "test.cfg.xml");
+		java.nio.file.Files.writeString(cfgFile.toPath(),
+				"<?xml version=\"1.0\" encoding=\"UTF-8\"?><hibernate-configuration><session-factory/></hibernate-configuration>");
+		collector.addFile(cfgFile, "cfg.xml");
+		collector.formatFiles();
+		String content = java.nio.file.Files.readString(cfgFile.toPath());
+		assertTrue(content.contains("<hibernate-configuration>"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/common/DefaultValueVisitorTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/common/DefaultValueVisitorTest.java
new file mode 100644
index 000000000000..3ca5690c87f0
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/common/DefaultValueVisitorTest.java
@@ -0,0 +1,54 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import org.hibernate.mapping.Any;
+import org.hibernate.mapping.Array;
+import org.hibernate.mapping.Bag;
+import org.hibernate.mapping.BasicValue;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.DependantValue;
+import org.hibernate.mapping.IdentifierBag;
+import org.hibernate.mapping.List;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.Map;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PrimitiveArray;
+import org.hibernate.mapping.Set;
+import org.hibernate.mapping.SimpleValue;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class DefaultValueVisitorTest {
+
+	@Test
+	public void testThrowExceptionMode() {
+		DefaultValueVisitor visitor = new DefaultValueVisitor(true) {};
+		assertThrows(UnsupportedOperationException.class, () -> visitor.accept((SimpleValue) null));
+	}
+
+	@Test
+	public void testNoThrowMode() {
+		DefaultValueVisitor visitor = new DefaultValueVisitor(false) {};
+		assertNull(visitor.accept((SimpleValue) null));
+		assertNull(visitor.accept((ManyToOne) null));
+		assertNull(visitor.accept((OneToOne) null));
+		assertNull(visitor.accept((OneToMany) null));
+		assertNull(visitor.accept((Component) null));
+		assertNull(visitor.accept((DependantValue) null));
+		assertNull(visitor.accept((Any) null));
+		assertNull(visitor.accept((Bag) null));
+		assertNull(visitor.accept((IdentifierBag) null));
+		assertNull(visitor.accept((List) null));
+		assertNull(visitor.accept((PrimitiveArray) null));
+		assertNull(visitor.accept((Array) null));
+		assertNull(visitor.accept((Map) null));
+		assertNull(visitor.accept((Set) null));
+		assertNull(visitor.accept((BasicValue) null));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/common/TemplateHelperTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/common/TemplateHelperTest.java
new file mode 100644
index 000000000000..fbd48bc1ee59
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/common/TemplateHelperTest.java
@@ -0,0 +1,142 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.common;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.StringWriter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TemplateHelperTest {
+
+	@TempDir
+	private File tempDir;
+
+	private TemplateHelper helper;
+
+	@BeforeEach
+	public void setUp() {
+		helper = new TemplateHelper();
+		helper.init(tempDir, new String[]{tempDir.getAbsolutePath()});
+	}
+
+	@Test
+	public void testGetOutputDirectory() {
+		assertEquals(tempDir, helper.getOutputDirectory());
+	}
+
+	@Test
+	public void testPutAndRemoveFromContext() {
+		helper.putInContext("testKey", "testValue");
+		// Should not throw on remove
+		helper.removeFromContext("testKey");
+	}
+
+	@Test
+	public void testPutInContextNullValueThrows() {
+		assertThrows(IllegalStateException.class, () -> helper.putInContext("key", null));
+	}
+
+	@Test
+	public void testRemoveFromContextNonExistentThrows() {
+		assertThrows(IllegalStateException.class, () -> helper.removeFromContext("nonExistent"));
+	}
+
+	@Test
+	public void testSetupContext() {
+		helper.setupContext();
+		assertNotNull(helper.getContext());
+	}
+
+	@Test
+	public void testProcessString() {
+		helper.setupContext();
+		helper.putInContext("name", "World");
+		StringWriter output = new StringWriter();
+		helper.processString("Hello ${name}!", output);
+		assertEquals("Hello World!", output.toString());
+	}
+
+	@Test
+	public void testEnsureExistenceCreatesDir() {
+		File dest = new File(tempDir, "sub/dir/file.txt");
+		helper.ensureExistence(dest);
+		assertTrue(dest.getParentFile().exists());
+		assertTrue(dest.getParentFile().isDirectory());
+	}
+
+	@Test
+	public void testEnsureExistenceExistingDir() {
+		File dest = new File(tempDir, "existing.txt");
+		// tempDir already exists as directory - should not throw
+		helper.ensureExistence(dest);
+	}
+
+	@Test
+	public void testInitWithNonExistentPath() {
+		TemplateHelper h = new TemplateHelper();
+		// Non-existent path should just log a warning, not throw
+		h.init(tempDir, new String[]{"/nonexistent/path"});
+		assertNotNull(h.getOutputDirectory());
+	}
+
+	@Test
+	public void testInitWithFilePath() throws IOException {
+		TemplateHelper h = new TemplateHelper();
+		File regularFile = new File(tempDir, "notadir.txt");
+		try (FileOutputStream fos = new FileOutputStream(regularFile)) {
+			fos.write("test".getBytes());
+		}
+		// Regular file (not dir, not jar/zip) should just log a warning
+		h.init(tempDir, new String[]{regularFile.getAbsolutePath()});
+		assertNotNull(h.getOutputDirectory());
+	}
+
+	@Test
+	public void testTemplateExists() throws IOException {
+		// Create a template file
+		File templateFile = new File(tempDir, "test.ftl");
+		try (FileOutputStream fos = new FileOutputStream(templateFile)) {
+			fos.write("Hello ${name}".getBytes());
+		}
+		// Re-init to pick up the template
+		helper.init(tempDir, new String[]{tempDir.getAbsolutePath()});
+		assertTrue(helper.templateExists("test.ftl"));
+		assertFalse(helper.templateExists("nonexistent.ftl"));
+	}
+
+	@Test
+	public void testProcessTemplate() throws IOException {
+		File templateFile = new File(tempDir, "greeting.ftl");
+		try (FileOutputStream fos = new FileOutputStream(templateFile)) {
+			fos.write("Hi ${who}!".getBytes());
+		}
+		helper.init(tempDir, new String[]{tempDir.getAbsolutePath()});
+		helper.setupContext();
+		helper.putInContext("who", "Alice");
+		StringWriter output = new StringWriter();
+		helper.processTemplate("greeting.ftl", output, "test");
+		assertEquals("Hi Alice!", output.toString());
+	}
+
+	@Test
+	public void testTemplatesCreateFile() throws IOException {
+		helper.setupContext();
+		TemplateHelper.Templates templates = helper.new Templates();
+		templates.createFile("file content here", "output.txt");
+		File created = new File(tempDir, "output.txt");
+		assertTrue(created.exists());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/dao/DaoExporterTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/dao/DaoExporterTest.java
new file mode 100644
index 000000000000..40fab3a7a0d3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/dao/DaoExporterTest.java
@@ -0,0 +1,26 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.dao;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class DaoExporterTest {
+
+	@Test
+	public void testGetName() {
+		DaoExporter exporter = new DaoExporter();
+		assertEquals("hbm2dao", exporter.getName());
+	}
+
+	@Test
+	public void testSessionFactoryName() {
+		DaoExporter exporter = new DaoExporter();
+		assertEquals("SessionFactory", exporter.getSessionFactoryName());
+		exporter.setSessionFactoryName("CustomFactory");
+		assertEquals("CustomFactory", exporter.getSessionFactoryName());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/doc/DocFileManagerTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/doc/DocFileManagerTest.java
new file mode 100644
index 000000000000..be2e5c77cd7a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/doc/DocFileManagerTest.java
@@ -0,0 +1,48 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.doc;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DocFileManagerTest {
+
+	@Test
+	public void testCopyFile(@TempDir File tempDir) throws IOException {
+		File target = new File(tempDir, "doc-style.css");
+		DocFileManager.copy(
+				getClass().getClassLoader(),
+				"doc/doc-style.css",
+				target
+		);
+		assertTrue(target.exists());
+		assertTrue(target.length() > 0);
+	}
+
+	@Test
+	public void testCopyFileNotFound(@TempDir File tempDir) {
+		File target = new File(tempDir, "nonexistent.txt");
+		assertThrows(IllegalArgumentException.class,
+				() -> DocFileManager.copy(getClass().getClassLoader(), "nonexistent/file.txt", target));
+	}
+
+	@Test
+	public void testGetRefDelegation() {
+		DocFolder root = new DocFolder(new File("/tmp/doc"));
+		DocFile from = new DocFile("index.html", root);
+		DocFolder sub = new DocFolder("tables", root);
+		DocFile to = new DocFile("summary.html", sub);
+
+		// getRef returns from.buildRefTo(to)
+		assertEquals(from.buildRefTo(to), "tables/summary.html");
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/doc/DocFileTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/doc/DocFileTest.java
new file mode 100644
index 000000000000..a00634255c34
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/doc/DocFileTest.java
@@ -0,0 +1,105 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.doc;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class DocFileTest {
+
+	@TempDir
+	File tempDir;
+
+	@Test
+	public void testConstructor() {
+		DocFolder root = new DocFolder(tempDir);
+		DocFile file = new DocFile("index.html", root);
+		assertEquals("index.html", file.getName());
+		assertEquals(root, file.getFolder());
+		assertNotNull(file.getFile());
+		assertEquals(new File(tempDir, "index.html"), file.getFile());
+	}
+
+	@Test
+	public void testConstructorNullName() {
+		DocFolder root = new DocFolder(tempDir);
+		assertThrows(IllegalArgumentException.class, () -> new DocFile(null, root));
+	}
+
+	@Test
+	public void testConstructorNullFolder() {
+		assertThrows(IllegalArgumentException.class, () -> new DocFile("index.html", null));
+	}
+
+	@Test
+	public void testGetPathFolders() {
+		DocFolder root = new DocFolder(tempDir);
+		DocFolder sub = new DocFolder("sub", root);
+		DocFile file = new DocFile("page.html", sub);
+
+		List<DocFolder> path = file.getPathFolders();
+		assertEquals(2, path.size());
+		assertEquals(root, path.get(0));
+		assertEquals(sub, path.get(1));
+	}
+
+	@Test
+	public void testBuildRefToSameFolder() {
+		DocFolder root = new DocFolder(tempDir);
+		DocFile source = new DocFile("a.html", root);
+		DocFile target = new DocFile("b.html", root);
+
+		String ref = source.buildRefTo(target);
+		assertEquals("b.html", ref);
+	}
+
+	@Test
+	public void testBuildRefToSubFolder() {
+		DocFolder root = new DocFolder(tempDir);
+		DocFolder sub = new DocFolder("entities", root);
+		DocFile source = new DocFile("index.html", root);
+		DocFile target = new DocFile("Person.html", sub);
+
+		String ref = source.buildRefTo(target);
+		assertEquals("entities/Person.html", ref);
+	}
+
+	@Test
+	public void testBuildRefToParentFolder() {
+		DocFolder root = new DocFolder(tempDir);
+		DocFolder sub = new DocFolder("entities", root);
+		DocFile source = new DocFile("Person.html", sub);
+		DocFile target = new DocFile("index.html", root);
+
+		String ref = source.buildRefTo(target);
+		assertEquals("../index.html", ref);
+	}
+
+	@Test
+	public void testBuildRefToSiblingFolder() {
+		DocFolder root = new DocFolder(tempDir);
+		DocFolder entities = new DocFolder("entities", root);
+		DocFolder tables = new DocFolder("tables", root);
+		DocFile source = new DocFile("Person.html", entities);
+		DocFile target = new DocFile("PERSON.html", tables);
+
+		String ref = source.buildRefTo(target);
+		assertEquals("../tables/PERSON.html", ref);
+	}
+
+	@Test
+	public void testToString() {
+		DocFolder root = new DocFolder(tempDir);
+		DocFile file = new DocFile("index.html", root);
+		assertEquals("index.html", file.toString());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/doc/DocFolderTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/doc/DocFolderTest.java
new file mode 100644
index 000000000000..f63310410550
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/doc/DocFolderTest.java
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.doc;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DocFolderTest {
+
+	@TempDir
+	File tempDir;
+
+	@Test
+	public void testRootConstructor() {
+		DocFolder root = new DocFolder(tempDir);
+		assertNull(root.getName());
+		assertNull(root.getParent());
+		assertEquals(tempDir, root.getFile());
+	}
+
+	@Test
+	public void testRootConstructorNull() {
+		assertThrows(IllegalArgumentException.class, () -> new DocFolder((File) null));
+	}
+
+	@Test
+	public void testChildConstructor() {
+		DocFolder root = new DocFolder(tempDir);
+		DocFolder child = new DocFolder("entities", root);
+		assertEquals("entities", child.getName());
+		assertEquals(root, child.getParent());
+		assertTrue(child.getFile().exists());
+		assertTrue(child.getFile().isDirectory());
+	}
+
+	@Test
+	public void testChildConstructorNullName() {
+		DocFolder root = new DocFolder(tempDir);
+		assertThrows(IllegalArgumentException.class, () -> new DocFolder(null, root));
+	}
+
+	@Test
+	public void testChildConstructorNullParent() {
+		assertThrows(IllegalArgumentException.class, () -> new DocFolder("entities", null));
+	}
+
+	@Test
+	public void testGetPathFoldersRoot() {
+		DocFolder root = new DocFolder(tempDir);
+		List<DocFolder> path = root.getPathFolders();
+		assertEquals(1, path.size());
+		assertEquals(root, path.get(0));
+	}
+
+	@Test
+	public void testGetPathFoldersNested() {
+		DocFolder root = new DocFolder(tempDir);
+		DocFolder level1 = new DocFolder("l1", root);
+		DocFolder level2 = new DocFolder("l2", level1);
+
+		List<DocFolder> path = level2.getPathFolders();
+		assertEquals(3, path.size());
+		assertEquals(root, path.get(0));
+		assertEquals(level1, path.get(1));
+		assertEquals(level2, path.get(2));
+	}
+
+	@Test
+	public void testToString() {
+		DocFolder root = new DocFolder(tempDir);
+		DocFolder child = new DocFolder("entities", root);
+		assertEquals("entities", child.toString());
+	}
+
+	@Test
+	public void testExistingDirectory() {
+		// Pre-create the directory
+		File existing = new File(tempDir, "preexisting");
+		assertTrue(existing.mkdir());
+		DocFolder root = new DocFolder(tempDir);
+		DocFolder child = new DocFolder("preexisting", root);
+		assertNotNull(child);
+		assertTrue(child.getFile().isDirectory());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/Cfg2HbmToolTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/Cfg2HbmToolTest.java
new file mode 100644
index 000000000000..ba4e65cf767b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/Cfg2HbmToolTest.java
@@ -0,0 +1,273 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.hbm;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.MetadataBuildingContext;
+import org.hibernate.engine.OptimisticLockStyle;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.JoinedSubclass;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.SingleTableSubclass;
+import org.hibernate.mapping.Subclass;
+import org.hibernate.mapping.UnionSubclass;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Proxy;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Cfg2HbmToolTest {
+
+	private MetadataBuildingContext createMetadataBuildingContext() {
+		return (MetadataBuildingContext) Proxy.newProxyInstance(
+				getClass().getClassLoader(),
+				new Class[]{MetadataBuildingContext.class},
+				(proxy, method, args) -> null);
+	}
+
+	@Test
+	public void testGetFilteredIdentifierGeneratorPropertiesNull() {
+		assertNull(Cfg2HbmTool.getFilteredIdentifierGeneratorProperties(null, new Properties()));
+	}
+
+	@Test
+	public void testGetFilteredIdentifierGeneratorPropertiesEmpty() {
+		Properties result = Cfg2HbmTool.getFilteredIdentifierGeneratorProperties(new Properties(), new Properties());
+		assertNotNull(result);
+		assertTrue(result.isEmpty());
+	}
+
+	@Test
+	public void testGetFilteredIdentifierGeneratorPropertiesFiltersTarget() {
+		Properties props = new Properties();
+		props.put("target_table", "some_table");
+		props.put("sequence_name", "my_seq");
+		Properties env = new Properties();
+		Properties result = Cfg2HbmTool.getFilteredIdentifierGeneratorProperties(props, env);
+		assertFalse(result.containsKey("target_table"));
+		assertTrue(result.containsKey("sequence_name"));
+		assertEquals("my_seq", result.getProperty("sequence_name"));
+	}
+
+	@Test
+	public void testGetFilteredIdentifierGeneratorPropertiesFiltersDefaultSchema() {
+		Properties props = new Properties();
+		props.put("schema", "public");
+		Properties env = new Properties();
+		env.put("hibernate.default_schema", "public");
+		Properties result = Cfg2HbmTool.getFilteredIdentifierGeneratorProperties(props, env);
+		assertFalse(result.containsKey("schema"));
+	}
+
+	@Test
+	public void testGetFilteredIdentifierGeneratorPropertiesKeepsNonDefaultSchema() {
+		Properties props = new Properties();
+		props.put("schema", "custom");
+		Properties env = new Properties();
+		env.put("hibernate.default_schema", "public");
+		Properties result = Cfg2HbmTool.getFilteredIdentifierGeneratorProperties(props, env);
+		assertTrue(result.containsKey("schema"));
+		assertEquals("custom", result.getProperty("schema"));
+	}
+
+	@Test
+	public void testGetFilteredIdentifierGeneratorPropertiesFiltersDefaultCatalog() {
+		Properties props = new Properties();
+		props.put("catalog", "defaultCat");
+		Properties env = new Properties();
+		env.put("hibernate.default_catalog", "defaultCat");
+		Properties result = Cfg2HbmTool.getFilteredIdentifierGeneratorProperties(props, env);
+		assertFalse(result.containsKey("catalog"));
+	}
+
+	@Test
+	public void testGetFilteredIdentifierGeneratorPropertiesKeepsNonDefaultCatalog() {
+		Properties props = new Properties();
+		props.put("catalog", "customCat");
+		Properties env = new Properties();
+		env.put("hibernate.default_catalog", "defaultCat");
+		Properties result = Cfg2HbmTool.getFilteredIdentifierGeneratorProperties(props, env);
+		assertTrue(result.containsKey("catalog"));
+		assertEquals("customCat", result.getProperty("catalog"));
+	}
+
+	@Test
+	public void testGetFilteredIdentifierGeneratorPropertiesMixedKeys() {
+		Properties props = new Properties();
+		props.put("target_column", "id");
+		props.put("schema", "public");
+		props.put("catalog", "myCat");
+		props.put("sequence_name", "seq1");
+		props.put("initial_value", "1");
+		Properties env = new Properties();
+		env.put("hibernate.default_schema", "public");
+		Properties result = Cfg2HbmTool.getFilteredIdentifierGeneratorProperties(props, env);
+		assertFalse(result.containsKey("target_column"));
+		assertFalse(result.containsKey("schema"));
+		assertTrue(result.containsKey("catalog"));
+		assertTrue(result.containsKey("sequence_name"));
+		assertTrue(result.containsKey("initial_value"));
+	}
+
+	// --- Type-check methods ---
+
+	@Test
+	public void testIsJoinedSubclass() {
+		MetadataBuildingContext mdbc = createMetadataBuildingContext();
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		PersistentClass root = new RootClass(mdbc);
+		assertFalse(c2h.isJoinedSubclass(root));
+		assertTrue(c2h.isJoinedSubclass(new JoinedSubclass(root, mdbc)));
+		assertFalse(c2h.isJoinedSubclass(new SingleTableSubclass(root, mdbc)));
+	}
+
+	@Test
+	public void testIsSubclass() {
+		MetadataBuildingContext mdbc = createMetadataBuildingContext();
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		PersistentClass root = new RootClass(mdbc);
+		assertFalse(c2h.isSubclass(root));
+		assertTrue(c2h.isSubclass(new JoinedSubclass(root, mdbc)));
+		assertTrue(c2h.isSubclass(new SingleTableSubclass(root, mdbc)));
+		assertTrue(c2h.isSubclass(new UnionSubclass(root, mdbc)));
+		assertTrue(c2h.isSubclass(new Subclass(root, mdbc)));
+	}
+
+	@Test
+	public void testNeedsDiscriminator() {
+		MetadataBuildingContext mdbc = createMetadataBuildingContext();
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		PersistentClass root = new RootClass(mdbc);
+		assertFalse(c2h.needsDiscriminator(root));
+		assertTrue(c2h.needsDiscriminator(new SingleTableSubclass(root, mdbc)));
+		assertTrue(c2h.needsDiscriminator(new Subclass(root, mdbc)));
+		assertFalse(c2h.needsDiscriminator(new JoinedSubclass(root, mdbc)));
+		assertFalse(c2h.needsDiscriminator(new UnionSubclass(root, mdbc)));
+	}
+
+	@Test
+	public void testNeedsDiscriminatorElement() {
+		MetadataBuildingContext mdbc = createMetadataBuildingContext();
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		RootClass root = new RootClass(mdbc);
+		assertFalse(c2h.needsDiscriminatorElement(root)); // no discriminator set
+	}
+
+
+	@Test
+	public void testColumnAttributes() {
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		Column col = new Column("test_col");
+		col.setLength(255L);
+		String attrs = c2h.columnAttributes(col);
+		assertTrue(attrs.contains("length=\"255\""));
+	}
+
+	@Test
+	public void testColumnAttributesWithPrecisionAndScale() {
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		Column col = new Column("price");
+		col.setPrecision(10);
+		col.setScale(2);
+		String attrs = c2h.columnAttributes(col);
+		assertTrue(attrs.contains("precision=\"10\""));
+		assertTrue(attrs.contains("scale=\"2\""));
+		assertFalse(attrs.contains("length="));
+	}
+
+	@Test
+	public void testColumnAttributesNotNullAndUnique() {
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		Column col = new Column("id");
+		col.setNullable(false);
+		col.setUnique(true);
+		String attrs = c2h.columnAttributes(col, false);
+		assertTrue(attrs.contains("not-null=\"true\""));
+		assertTrue(attrs.contains("unique=\"true\""));
+		// Primary key column should suppress not-null and unique
+		String pkAttrs = c2h.columnAttributes(col, true);
+		assertFalse(pkAttrs.contains("not-null"));
+		assertFalse(pkAttrs.contains("unique"));
+	}
+
+	@Test
+	public void testColumnAttributesWithSqlType() {
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		Column col = new Column("data");
+		col.setSqlType("varchar(100)");
+		String attrs = c2h.columnAttributes(col);
+		assertTrue(attrs.contains("sql-type=\"varchar(100)\""));
+	}
+
+	@Test
+	public void testGetTagForPersistentClass() {
+		MetadataBuildingContext mdbc = createMetadataBuildingContext();
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		PersistentClass root = new RootClass(mdbc);
+		assertEquals("class", c2h.getTag(root));
+		assertEquals("joined-subclass", c2h.getTag(new JoinedSubclass(root, mdbc)));
+		assertEquals("union-subclass", c2h.getTag(new UnionSubclass(root, mdbc)));
+		assertEquals("subclass", c2h.getTag(new SingleTableSubclass(root, mdbc)));
+		assertEquals("subclass", c2h.getTag(new Subclass(root, mdbc)));
+	}
+
+	@Test
+	public void testIsClassLevelOptimisticLockMode() {
+		MetadataBuildingContext mdbc = createMetadataBuildingContext();
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		RootClass root = new RootClass(mdbc);
+		root.setOptimisticLockStyle(OptimisticLockStyle.VERSION);
+		assertFalse(c2h.isClassLevelOptimisticLockMode(root));
+		root.setOptimisticLockStyle(OptimisticLockStyle.DIRTY);
+		assertTrue(c2h.isClassLevelOptimisticLockMode(root));
+	}
+
+	@Test
+	public void testGetClassLevelOptimisticLockMode() {
+		MetadataBuildingContext mdbc = createMetadataBuildingContext();
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		RootClass root = new RootClass(mdbc);
+		assertEquals("version", c2h.getClassLevelOptimisticLockMode(root));
+		root.setOptimisticLockStyle(OptimisticLockStyle.DIRTY);
+		assertEquals("dirty", c2h.getClassLevelOptimisticLockMode(root));
+		root.setOptimisticLockStyle(OptimisticLockStyle.ALL);
+		assertEquals("all", c2h.getClassLevelOptimisticLockMode(root));
+		root.setOptimisticLockStyle(OptimisticLockStyle.NONE);
+		assertEquals("none", c2h.getClassLevelOptimisticLockMode(root));
+	}
+
+	@Test
+	public void testIsImportData() {
+		StandardServiceRegistry ssr = new StandardServiceRegistryBuilder()
+				.applySetting("hibernate.dialect", "org.hibernate.dialect.H2Dialect")
+				.applySetting("hibernate.connection.driver_class", "org.h2.Driver")
+				.applySetting("hibernate.connection.url", "jdbc:h2:mem:cfg2hbm_import_test")
+				.applySetting("hibernate.connection.username", "sa")
+				.applySetting("hibernate.connection.password", "")
+				.applySetting("hibernate.default_schema", "")
+				.applySetting("hibernate.default_catalog", "")
+				.build();
+		Metadata md = new MetadataSources(ssr)
+				.addResource("org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")
+				.buildMetadata();
+		Cfg2HbmTool c2h = new Cfg2HbmTool();
+		// Metadata with entity binding has imports
+		assertTrue(c2h.isImportData(md));
+		assertFalse(c2h.isNamedQueries(md));
+		assertFalse(c2h.isNamedSQLQueries(md));
+		assertFalse(c2h.isFilterDefinitions(md));
+		StandardServiceRegistryBuilder.destroy(ssr);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/HBMTagVisitorTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/HBMTagVisitorTest.java
new file mode 100644
index 000000000000..334152f8df18
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/HBMTagVisitorTest.java
@@ -0,0 +1,143 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.hbm;
+
+import org.hibernate.mapping.Any;
+import org.hibernate.mapping.Array;
+import org.hibernate.mapping.Bag;
+import org.hibernate.mapping.BasicValue;
+import org.hibernate.mapping.DependantValue;
+import org.hibernate.mapping.IdentifierBag;
+import org.hibernate.mapping.JoinedSubclass;
+import org.hibernate.mapping.List;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.Map;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PrimitiveArray;
+import org.hibernate.mapping.RootClass;
+import org.hibernate.mapping.Set;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.SingleTableSubclass;
+import org.hibernate.mapping.Subclass;
+import org.hibernate.mapping.UnionSubclass;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class HBMTagVisitorTest {
+
+	// --- HBMTagForValueVisitor ---
+
+	@Test
+	public void testManyToOneTag() {
+		assertEquals("many-to-one", HBMTagForValueVisitor.INSTANCE.accept((ManyToOne) null));
+	}
+
+	@Test
+	public void testOneToOneTag() {
+		assertEquals("one-to-one", HBMTagForValueVisitor.INSTANCE.accept((OneToOne) null));
+	}
+
+	@Test
+	public void testBagTag() {
+		assertEquals("bag", HBMTagForValueVisitor.INSTANCE.accept((Bag) null));
+	}
+
+	@Test
+	public void testIdentifierBagTag() {
+		assertEquals("idbag", HBMTagForValueVisitor.INSTANCE.accept((IdentifierBag) null));
+	}
+
+	@Test
+	public void testListTag() {
+		assertEquals("list", HBMTagForValueVisitor.INSTANCE.accept((List) null));
+	}
+
+	@Test
+	public void testMapTag() {
+		assertEquals("map", HBMTagForValueVisitor.INSTANCE.accept((Map) null));
+	}
+
+	@Test
+	public void testOneToManyTag() {
+		assertEquals("one-to-many", HBMTagForValueVisitor.INSTANCE.accept((OneToMany) null));
+	}
+
+	@Test
+	public void testSetTag() {
+		assertEquals("set", HBMTagForValueVisitor.INSTANCE.accept((Set) null));
+	}
+
+	@Test
+	public void testAnyTag() {
+		assertEquals("any", HBMTagForValueVisitor.INSTANCE.accept((Any) null));
+	}
+
+	@Test
+	public void testSimpleValueTag() {
+		assertEquals("property", HBMTagForValueVisitor.INSTANCE.accept((SimpleValue) null));
+	}
+
+	@Test
+	public void testBasicValueTag() {
+		assertEquals("property", HBMTagForValueVisitor.INSTANCE.accept((BasicValue) null));
+	}
+
+	@Test
+	public void testPrimitiveArrayTag() {
+		assertEquals("primitive-array", HBMTagForValueVisitor.INSTANCE.accept((PrimitiveArray) null));
+	}
+
+	@Test
+	public void testArrayTag() {
+		assertEquals("array", HBMTagForValueVisitor.INSTANCE.accept((Array) null));
+	}
+
+	@Test
+	public void testDependantValueThrows() {
+		assertThrows(IllegalArgumentException.class,
+				() -> HBMTagForValueVisitor.INSTANCE.accept((DependantValue) null));
+	}
+
+	// --- HBMTagForPersistentClassVisitor ---
+
+	@Test
+	public void testRootClassTag() {
+		assertEquals("class", HBMTagForPersistentClassVisitor.INSTANCE.accept((RootClass) null));
+	}
+
+	@Test
+	public void testUnionSubclassTag() {
+		assertEquals("union-subclass", HBMTagForPersistentClassVisitor.INSTANCE.accept((UnionSubclass) null));
+	}
+
+	@Test
+	public void testSingleTableSubclassTag() {
+		assertEquals("subclass", HBMTagForPersistentClassVisitor.INSTANCE.accept((SingleTableSubclass) null));
+	}
+
+	@Test
+	public void testJoinedSubclassTag() {
+		assertEquals("joined-subclass", HBMTagForPersistentClassVisitor.INSTANCE.accept((JoinedSubclass) null));
+	}
+
+	@Test
+	public void testSubclassTag() {
+		assertEquals("subclass", HBMTagForPersistentClassVisitor.INSTANCE.accept((Subclass) null));
+	}
+
+	@Test
+	public void testPersistentClassVisitorInstance() {
+		assertNotNull(HBMTagForPersistentClassVisitor.INSTANCE);
+	}
+
+	@Test
+	public void testValueVisitorInstance() {
+		assertNotNull(HBMTagForValueVisitor.INSTANCE);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/HbmExporterTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/HbmExporterTest.java
new file mode 100644
index 000000000000..dec3a653e54d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/HbmExporterTest.java
@@ -0,0 +1,34 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.hbm;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class HbmExporterTest {
+
+	@Test
+	public void testGetName() {
+		HbmExporter exporter = new HbmExporter();
+		assertEquals("hbm2hbmxml", exporter.getName());
+	}
+
+	@Test
+	public void testSetGlobalSettings() {
+		HbmExporter exporter = new HbmExporter();
+		HibernateMappingGlobalSettings hgs = new HibernateMappingGlobalSettings();
+		exporter.setGlobalSettings(hgs);
+		// No exception means success; field is package-private
+		assertNotNull(exporter.globalSettings);
+	}
+
+	@Test
+	public void testDefaultGlobalSettings() {
+		HbmExporter exporter = new HbmExporter();
+		assertNotNull(exporter.globalSettings);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/HibernateMappingGlobalSettingsTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/HibernateMappingGlobalSettingsTest.java
new file mode 100644
index 000000000000..5e6a39527719
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/hbm/HibernateMappingGlobalSettingsTest.java
@@ -0,0 +1,130 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.hbm;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class HibernateMappingGlobalSettingsTest {
+
+	@Test
+	public void testDefaults() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		assertNull(settings.getSchemaName());
+		assertNull(settings.getCatalogName());
+		assertNull(settings.getDefaultCascade());
+		assertNull(settings.getDefaultPackage());
+		assertNull(settings.getDefaultAccess());
+		assertTrue(settings.isAutoImport());
+		assertTrue(settings.isDefaultLazy());
+	}
+
+	@Test
+	public void testHasNonDefaultSettingsAllDefaults() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		assertFalse(settings.hasNonDefaultSettings());
+	}
+
+	@Test
+	public void testHasDefaultPackage() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		assertFalse(settings.hasDefaultPackage());
+		settings.setDefaultPackage("com.example");
+		assertTrue(settings.hasDefaultPackage());
+		assertEquals("com.example", settings.getDefaultPackage());
+	}
+
+	@Test
+	public void testHasSchemaName() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		assertFalse(settings.hasSchemaName());
+		settings.setSchemaName("MY_SCHEMA");
+		assertTrue(settings.hasSchemaName());
+		assertEquals("MY_SCHEMA", settings.getSchemaName());
+	}
+
+	@Test
+	public void testHasCatalogName() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		assertFalse(settings.hasCatalogName());
+		settings.setCatalogName("MY_CATALOG");
+		assertTrue(settings.hasCatalogName());
+		assertEquals("MY_CATALOG", settings.getCatalogName());
+	}
+
+	@Test
+	public void testHasNonDefaultCascade() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		assertFalse(settings.hasNonDefaultCascade());
+
+		settings.setDefaultCascade("none");
+		assertFalse(settings.hasNonDefaultCascade());
+
+		settings.setDefaultCascade("all");
+		assertTrue(settings.hasNonDefaultCascade());
+		assertEquals("all", settings.getDefaultCascade());
+	}
+
+	@Test
+	public void testHasNonDefaultAccess() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		assertFalse(settings.hasNonDefaultAccess());
+
+		settings.setDefaultAccess("property");
+		assertFalse(settings.hasNonDefaultAccess());
+
+		settings.setDefaultAccess("field");
+		assertTrue(settings.hasNonDefaultAccess());
+		assertEquals("field", settings.getDefaultAccess());
+	}
+
+	@Test
+	public void testAutoImport() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		assertTrue(settings.isAutoImport());
+		settings.setAutoImport(false);
+		assertFalse(settings.isAutoImport());
+	}
+
+	@Test
+	public void testDefaultLazy() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		assertTrue(settings.isDefaultLazy());
+		settings.setDefaultLazy(false);
+		assertFalse(settings.isDefaultLazy());
+	}
+
+	@Test
+	public void testHasNonDefaultSettingsWithPackage() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		settings.setDefaultPackage("com.example");
+		assertTrue(settings.hasNonDefaultSettings());
+	}
+
+	@Test
+	public void testHasNonDefaultSettingsWithSchema() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		settings.setSchemaName("SCH");
+		assertTrue(settings.hasNonDefaultSettings());
+	}
+
+	@Test
+	public void testHasNonDefaultSettingsNotLazy() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		settings.setDefaultLazy(false);
+		assertTrue(settings.hasNonDefaultSettings());
+	}
+
+	@Test
+	public void testHasNonDefaultSettingsNotAutoImport() {
+		HibernateMappingGlobalSettings settings = new HibernateMappingGlobalSettings();
+		settings.setAutoImport(false);
+		assertTrue(settings.hasNonDefaultSettings());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/BasicPOJOClassTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/BasicPOJOClassTest.java
new file mode 100644
index 000000000000..0ab37d09d023
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/BasicPOJOClassTest.java
@@ -0,0 +1,352 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.mapping.MetaAttributable;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.Property;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class BasicPOJOClassTest {
+
+	/**
+	 * Simple MetaAttributable implementation for testing.
+	 */
+	private static class SimpleMetaAttributable implements MetaAttributable {
+		private Map<String, MetaAttribute> metaAttributes = new HashMap<>();
+
+		@Override
+		public MetaAttribute getMetaAttribute(String name) {
+			return metaAttributes.get(name);
+		}
+
+		@Override
+		public Map<String, MetaAttribute> getMetaAttributes() {
+			return metaAttributes;
+		}
+
+		@Override
+		public void setMetaAttributes(Map<String, MetaAttribute> metas) {
+			this.metaAttributes = metas;
+		}
+	}
+
+	/**
+	 * Minimal concrete subclass for testing BasicPOJOClass's non-abstract methods.
+	 */
+	private static class TestablePOJOClass extends BasicPOJOClass {
+
+		private final String mappedClassName;
+
+		TestablePOJOClass(String mappedClassName, Cfg2JavaTool c2j) {
+			super(new SimpleMetaAttributable(), c2j);
+			this.mappedClassName = mappedClassName;
+			init();
+		}
+
+		TestablePOJOClass(MetaAttributable ma, String mappedClassName, Cfg2JavaTool c2j) {
+			super(ma, c2j);
+			this.mappedClassName = mappedClassName;
+			init();
+		}
+
+		@Override
+		protected String getMappedClassName() {
+			return mappedClassName;
+		}
+
+		@Override
+		public Iterator<Property> getAllPropertiesIterator() {
+			return Collections.emptyIterator();
+		}
+
+		@Override public String getExtends() { return null; }
+		@Override public String getImplements() { return null; }
+		@Override public boolean isComponent() { return false; }
+		@Override public boolean hasIdentifierProperty() { return false; }
+		@Override public String generateAnnIdGenerator() { return ""; }
+		@Override public String generateAnnTableUniqueConstraint() { return ""; }
+		@Override public Object getDecoratedObject() { return null; }
+		@Override public boolean isSubclass() { return false; }
+		@Override public List<Property> getPropertiesForFullConstructor() { return List.of(); }
+		@Override public List<Property> getPropertyClosureForFullConstructor() { return List.of(); }
+		@Override public List<Property> getPropertyClosureForSuperclassFullConstructor() { return List.of(); }
+		@Override public List<Property> getPropertiesForMinimalConstructor() { return List.of(); }
+		@Override public List<Property> getPropertyClosureForMinimalConstructor() { return List.of(); }
+		@Override public List<Property> getPropertyClosureForSuperclassMinimalConstructor() { return List.of(); }
+		@Override public POJOClass getSuperClass() { return null; }
+		@Override public Property getIdentifierProperty() { return null; }
+		@Override public boolean hasVersionProperty() { return false; }
+		@Override public Property getVersionProperty() { return null; }
+	}
+
+	// --- beanCapitalize tests ---
+
+	@Test
+	public void testBeanCapitalizeNormal() {
+		assertEquals("Name", BasicPOJOClass.beanCapitalize("name"));
+	}
+
+	@Test
+	public void testBeanCapitalizeAlreadyCapitalized() {
+		assertEquals("Name", BasicPOJOClass.beanCapitalize("Name"));
+	}
+
+	@Test
+	public void testBeanCapitalizeSecondCharUpper() {
+		// JavaBeans spec: if second char is uppercase, return unchanged
+		assertEquals("nAme", BasicPOJOClass.beanCapitalize("nAme"));
+	}
+
+	@Test
+	public void testBeanCapitalizeNull() {
+		assertEquals(null, BasicPOJOClass.beanCapitalize(null));
+	}
+
+	@Test
+	public void testBeanCapitalizeEmpty() {
+		assertEquals("", BasicPOJOClass.beanCapitalize(""));
+	}
+
+	@Test
+	public void testBeanCapitalizeSingleChar() {
+		assertEquals("A", BasicPOJOClass.beanCapitalize("a"));
+	}
+
+	// --- Package and class name tests ---
+
+	@Test
+	public void testGetPackageName() {
+		TestablePOJOClass pojo = new TestablePOJOClass("com.example.Person", new Cfg2JavaTool());
+		assertEquals("com.example", pojo.getPackageName());
+	}
+
+	@Test
+	public void testGetPackageNameNoPackage() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertEquals("", pojo.getPackageName());
+	}
+
+	@Test
+	public void testGetPackageDeclaration() {
+		TestablePOJOClass pojo = new TestablePOJOClass("com.example.Person", new Cfg2JavaTool());
+		assertEquals("package com.example;", pojo.getPackageDeclaration());
+	}
+
+	@Test
+	public void testGetPackageDeclarationNoPackage() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertEquals("// default package", pojo.getPackageDeclaration());
+	}
+
+	@Test
+	public void testGetDeclarationName() {
+		TestablePOJOClass pojo = new TestablePOJOClass("com.example.Person", new Cfg2JavaTool());
+		assertEquals("Person", pojo.getDeclarationName());
+	}
+
+	@Test
+	public void testGetShortName() {
+		TestablePOJOClass pojo = new TestablePOJOClass("com.example.Person", new Cfg2JavaTool());
+		assertEquals("Person", pojo.getShortName());
+	}
+
+	@Test
+	public void testGetQualifiedDeclarationName() {
+		TestablePOJOClass pojo = new TestablePOJOClass("com.example.Person", new Cfg2JavaTool());
+		// qualifier of mappedClassName (com.example) + generatedClassName (com.example.Person)
+		assertEquals("com.example.com.example.Person", pojo.getQualifiedDeclarationName());
+	}
+
+	@Test
+	public void testGetQualifiedDeclarationNameSimple() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertEquals("Person", pojo.getQualifiedDeclarationName());
+	}
+
+	// --- Inner class handling ---
+
+	@Test
+	public void testInnerClassDollarReplacedWithDot() {
+		TestablePOJOClass pojo = new TestablePOJOClass("com.example.Outer$Inner", new Cfg2JavaTool());
+		assertEquals("Outer.Inner", pojo.getDeclarationName());
+	}
+
+	// --- Extends / Implements declarations ---
+
+	@Test
+	public void testGetExtendsDeclarationNull() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertEquals("", pojo.getExtendsDeclaration());
+	}
+
+	@Test
+	public void testGetImplementsDeclarationNull() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertEquals("", pojo.getImplementsDeclaration());
+	}
+
+	// --- Declaration type and modifiers ---
+
+	@Test
+	public void testGetDeclarationType() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertEquals("class", pojo.getDeclarationType());
+	}
+
+	@Test
+	public void testGetClassModifiersDefault() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertEquals("public", pojo.getClassModifiers());
+	}
+
+	// --- Needs constructors ---
+
+	@Test
+	public void testNeedsFullConstructorEmpty() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertFalse(pojo.needsFullConstructor());
+	}
+
+	@Test
+	public void testNeedsMinimalConstructorEmpty() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertFalse(pojo.needsMinimalConstructor());
+	}
+
+	// --- Equals / HashCode / ToString ---
+
+	@Test
+	public void testNeedsEqualsHashCodeEmpty() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertFalse(pojo.needsEqualsHashCode());
+	}
+
+	@Test
+	public void testNeedsToStringEmpty() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertFalse(pojo.needsToString());
+	}
+
+	@Test
+	public void testGenerateEqualsNoProperties() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertEquals("false", pojo.generateEquals("this", "other", false));
+	}
+
+	// --- Import context ---
+
+	@Test
+	public void testImportType() {
+		TestablePOJOClass pojo = new TestablePOJOClass("com.example.Person", new Cfg2JavaTool());
+		String result = pojo.importType("java.util.List");
+		assertEquals("List", result);
+	}
+
+	@Test
+	public void testGenerateImports() {
+		TestablePOJOClass pojo = new TestablePOJOClass("com.example.Person", new Cfg2JavaTool());
+		pojo.importType("java.util.List");
+		String imports = pojo.generateImports();
+		assertTrue(imports.contains("import java.util.List"));
+	}
+
+	// --- Meta attribute methods ---
+
+	@Test
+	public void testHasMetaAttributeFalse() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		assertFalse(pojo.hasMetaAttribute("nonexistent"));
+	}
+
+	@Test
+	public void testGetExtraClassCodeNull() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		// No "class-code" meta attribute set, so getMetaAsString returns null
+		String code = pojo.getExtraClassCode();
+		// MetaAttributeHelper.getMetaAsString returns null when MetaAttribute is null
+		assertTrue(code == null || code.isEmpty());
+	}
+
+	// --- Constructor validation ---
+
+	@Test
+	public void testConstructorNullMeta() {
+		assertThrows(IllegalArgumentException.class,
+				() -> new TestablePOJOClass(null, "Person", new Cfg2JavaTool()));
+	}
+
+	// --- Field modifiers with Property ---
+
+	@Test
+	public void testGetFieldModifiers() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		Property p = new Property();
+		p.setName("name");
+		assertEquals("private", pojo.getFieldModifiers(p));
+	}
+
+	@Test
+	public void testGetPropertyGetModifiers() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		Property p = new Property();
+		p.setName("name");
+		assertEquals("public", pojo.getPropertyGetModifiers(p));
+	}
+
+	@Test
+	public void testGetPropertySetModifiers() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		Property p = new Property();
+		p.setName("name");
+		assertEquals("public", pojo.getPropertySetModifiers(p));
+	}
+
+	@Test
+	public void testGetFieldModifiersWithOverride() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		Property p = new Property();
+		p.setName("name");
+		MetaAttribute scopeField = new MetaAttribute("scope-field");
+		scopeField.addValue("protected");
+		p.setMetaAttributes(java.util.Map.of("scope-field", scopeField));
+		assertEquals("protected", pojo.getFieldModifiers(p));
+	}
+
+	@Test
+	public void testHasFieldJavaDoc() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		Property p = new Property();
+		p.setName("name");
+		assertFalse(pojo.hasFieldJavaDoc(p));
+	}
+
+	@Test
+	public void testGetFieldDescription() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		Property p = new Property();
+		p.setName("name");
+		assertEquals("", pojo.getFieldDescription(p));
+	}
+
+	@Test
+	public void testGetPropertyName() {
+		TestablePOJOClass pojo = new TestablePOJOClass("Person", new Cfg2JavaTool());
+		Property p = new Property();
+		p.setName("firstName");
+		assertEquals("FirstName", pojo.getPropertyName(p));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/Cfg2JavaToolTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/Cfg2JavaToolTest.java
new file mode 100644
index 000000000000..2605ddd0617a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/Cfg2JavaToolTest.java
@@ -0,0 +1,93 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Cfg2JavaToolTest {
+
+	private final Cfg2JavaTool tool = new Cfg2JavaTool();
+
+	@Test
+	public void testUnqualify() {
+		assertEquals("String", tool.unqualify("java.lang.String"));
+		assertEquals("MyClass", tool.unqualify("com.example.MyClass"));
+		assertEquals("Simple", tool.unqualify("Simple"));
+	}
+
+	@Test
+	public void testToJavaDoc() {
+		String result = tool.toJavaDoc("Hello world", 0);
+		assertTrue(result.contains("* Hello world"));
+	}
+
+	@Test
+	public void testToJavaDocMultiLine() {
+		String result = tool.toJavaDoc("Line1\nLine2", 0);
+		assertTrue(result.contains("* Line1"));
+		assertTrue(result.contains("* Line2"));
+	}
+
+	@Test
+	public void testToJavaDocNull() {
+		String result = tool.toJavaDoc(null, 0);
+		assertEquals("", result);
+	}
+
+	@Test
+	public void testToJavaDocWithIndent() {
+		String result = tool.toJavaDoc("Hello", 4);
+		assertTrue(result.contains("* Hello"));
+		assertTrue(result.length() > " * Hello".length());
+	}
+
+	@Test
+	public void testIsPrimitive() {
+		assertTrue(tool.isPrimitive("int"));
+		assertTrue(tool.isPrimitive("long"));
+		assertTrue(tool.isPrimitive("boolean"));
+		assertTrue(tool.isPrimitive("char"));
+		assertTrue(tool.isPrimitive("byte"));
+		assertTrue(tool.isPrimitive("short"));
+		assertTrue(tool.isPrimitive("float"));
+		assertTrue(tool.isPrimitive("double"));
+		assertFalse(tool.isPrimitive("String"));
+		assertFalse(tool.isPrimitive("Integer"));
+	}
+
+	@Test
+	public void testIsArray() {
+		assertTrue(tool.isArray("byte[]"));
+		assertTrue(tool.isArray("String[]"));
+		assertFalse(tool.isArray("String"));
+		assertFalse(tool.isArray(null));
+	}
+
+	@Test
+	public void testKeyWordCheck() {
+		assertEquals("class_", tool.keyWordCheck("class"));
+		assertEquals("return_", tool.keyWordCheck("return"));
+		assertEquals("public_", tool.keyWordCheck("public"));
+		assertEquals("myField", tool.keyWordCheck("myField"));
+		assertEquals("name", tool.keyWordCheck("name"));
+	}
+
+	@Test
+	public void testSimplePluralize() {
+		assertEquals("products", tool.simplePluralize("product"));
+		assertEquals("categories", tool.simplePluralize("category"));
+		assertEquals("classes", tool.simplePluralize("class"));
+	}
+
+	@Test
+	public void testIsNonPrimitiveTypeName() {
+		assertFalse(Cfg2JavaTool.isNonPrimitiveTypeName("int"));
+		assertFalse(Cfg2JavaTool.isNonPrimitiveTypeName("nonexistent_type_xyz"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/ImportContextImplTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/ImportContextImplTest.java
new file mode 100644
index 000000000000..a3e8e06173bb
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/ImportContextImplTest.java
@@ -0,0 +1,125 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ImportContextImplTest {
+
+	@Test
+	public void testImportTypeSimple() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		assertEquals("List", ctx.importType("java.util.List"));
+	}
+
+	@Test
+	public void testImportTypeSamePackage() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		assertEquals("Person", ctx.importType("com.example.Person"));
+	}
+
+	@Test
+	public void testImportTypeJavaLang() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		assertEquals("String", ctx.importType("java.lang.String"));
+	}
+
+	@Test
+	public void testImportTypePrimitive() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		assertEquals("int", ctx.importType("int"));
+	}
+
+	@Test
+	public void testImportTypeWithGenerics() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		String result = ctx.importType("java.util.List<java.lang.String>");
+		assertEquals("List<java.lang.String>", result);
+	}
+
+	@Test
+	public void testImportTypeWithArray() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		String result = ctx.importType("java.util.List[]");
+		assertEquals("List[]", result);
+	}
+
+	@Test
+	public void testImportTypeInnerClass() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		String result = ctx.importType("com.other.Outer$Inner");
+		assertEquals("Outer.Inner", result);
+	}
+
+	@Test
+	public void testImportTypeConflict() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		assertEquals("List", ctx.importType("java.util.List"));
+		assertEquals("com.other.List", ctx.importType("com.other.List"));
+	}
+
+	@Test
+	public void testImportTypeSameTwice() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		assertEquals("List", ctx.importType("java.util.List"));
+		assertEquals("List", ctx.importType("java.util.List"));
+	}
+
+	@Test
+	public void testGenerateImportsEmpty() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		assertEquals("", ctx.generateImports());
+	}
+
+	@Test
+	public void testGenerateImports() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		ctx.importType("java.util.List");
+		ctx.importType("java.util.Map");
+		String imports = ctx.generateImports();
+		assertTrue(imports.contains("import java.util.List;"));
+		assertTrue(imports.contains("import java.util.Map;"));
+	}
+
+	@Test
+	public void testGenerateImportsExcludesSamePackage() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		ctx.importType("com.example.Person");
+		assertEquals("", ctx.generateImports());
+	}
+
+	@Test
+	public void testGenerateImportsExcludesJavaLang() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		ctx.importType("java.lang.String");
+		assertEquals("", ctx.generateImports());
+	}
+
+	@Test
+	public void testGenerateImportsExcludesPrimitive() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		ctx.importType("int");
+		assertEquals("", ctx.generateImports());
+	}
+
+	@Test
+	public void testStaticImport() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		String result = ctx.staticImport("org.junit.Assert", "assertEquals");
+		assertEquals("assertEquals", result);
+		String imports = ctx.generateImports();
+		assertTrue(imports.contains("import static org.junit.Assert.assertEquals;"));
+	}
+
+	@Test
+	public void testStaticImportStar() {
+		ImportContextImpl ctx = new ImportContextImpl("com.example");
+		String result = ctx.staticImport("org.junit.Assert", "*");
+		assertEquals("", result);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeHelperJavaTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeHelperJavaTest.java
new file mode 100644
index 000000000000..deec51a46a3e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/MetaAttributeHelperJavaTest.java
@@ -0,0 +1,99 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.hibernate.mapping.MetaAttribute;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Tests for the export/java MetaAttributeHelper (different from core/strategy MetaAttributeHelper).
+ */
+public class MetaAttributeHelperJavaTest {
+
+	@Test
+	public void testGetMetaAsStringFromCollectionNull() {
+		assertEquals("", MetaAttributeHelper.getMetaAsString((java.util.Collection<?>) null, ","));
+	}
+
+	@Test
+	public void testGetMetaAsStringFromCollectionEmpty() {
+		assertEquals("", MetaAttributeHelper.getMetaAsString(Collections.emptyList(), ","));
+	}
+
+	@Test
+	public void testGetMetaAsStringFromCollectionSingle() {
+		assertEquals("value", MetaAttributeHelper.getMetaAsString(List.of("value"), ","));
+	}
+
+	@Test
+	public void testGetMetaAsStringFromCollectionMultiple() {
+		assertEquals("a,b,c", MetaAttributeHelper.getMetaAsString(Arrays.asList("a", "b", "c"), ","));
+	}
+
+	@Test
+	public void testGetMetaAsStringFromMetaAttributeNull() {
+		assertNull(MetaAttributeHelper.getMetaAsString((MetaAttribute) null, ","));
+	}
+
+	@Test
+	public void testGetMetaAsStringFromMetaAttribute() {
+		MetaAttribute attr = new MetaAttribute("test");
+		attr.addValue("hello");
+		attr.addValue("world");
+		assertEquals("hello,world", MetaAttributeHelper.getMetaAsString(attr, ","));
+	}
+
+	@Test
+	public void testGetMetaAsStringNoSeparator() {
+		MetaAttribute attr = new MetaAttribute("test");
+		attr.addValue("hello");
+		assertEquals("hello", MetaAttributeHelper.getMetaAsString(attr));
+	}
+
+	@Test
+	public void testGetMetaAsStringNullNoSeparator() {
+		assertEquals("", MetaAttributeHelper.getMetaAsString((MetaAttribute) null));
+	}
+
+	@Test
+	public void testGetMetaAsBoolNullMetaAttribute() {
+		assertTrue(MetaAttributeHelper.getMetaAsBool((MetaAttribute) null, true));
+		assertFalse(MetaAttributeHelper.getMetaAsBool((MetaAttribute) null, false));
+	}
+
+	@Test
+	public void testGetMetaAsBoolTrue() {
+		MetaAttribute attr = new MetaAttribute("test");
+		attr.addValue("true");
+		assertTrue(MetaAttributeHelper.getMetaAsBool(attr, false));
+	}
+
+	@Test
+	public void testGetMetaAsBoolFalse() {
+		MetaAttribute attr = new MetaAttribute("test");
+		attr.addValue("false");
+		assertFalse(MetaAttributeHelper.getMetaAsBool(attr, true));
+	}
+
+	@Test
+	public void testGetMetaAsBoolFromCollectionEmpty() {
+		assertTrue(MetaAttributeHelper.getMetaAsBool(Collections.emptyList(), true));
+	}
+
+	@Test
+	public void testGetMetaAsBoolFromCollectionWithValue() {
+		assertTrue(MetaAttributeHelper.getMetaAsBool(List.of("true"), false));
+		assertFalse(MetaAttributeHelper.getMetaAsBool(List.of("false"), true));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/NoopImportContextTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/NoopImportContextTest.java
new file mode 100644
index 000000000000..1dcfacb33b21
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/java/NoopImportContextTest.java
@@ -0,0 +1,32 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.java;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class NoopImportContextTest {
+
+	@Test
+	public void testImportTypeReturnsUnchanged() {
+		NoopImportContext ctx = new NoopImportContext();
+		assertEquals("java.lang.String", ctx.importType("java.lang.String"));
+		assertEquals("int", ctx.importType("int"));
+		assertEquals("com.example.MyClass", ctx.importType("com.example.MyClass"));
+	}
+
+	@Test
+	public void testStaticImportReturnsFqcn() {
+		NoopImportContext ctx = new NoopImportContext();
+		assertEquals("java.lang.Math", ctx.staticImport("java.lang.Math", "max"));
+	}
+
+	@Test
+	public void testGenerateImportsReturnsEmpty() {
+		NoopImportContext ctx = new NoopImportContext();
+		assertEquals("", ctx.generateImports());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/lint/IssueTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/lint/IssueTest.java
new file mode 100644
index 000000000000..6d7bdeabaa74
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/lint/IssueTest.java
@@ -0,0 +1,38 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.lint;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class IssueTest {
+
+	@Test
+	public void testConstructorAndGetters() {
+		Issue issue = new Issue("TABLE_WITHOUT_PK", Issue.HIGH_PRIORITY, "Table 'foo' has no primary key");
+		assertEquals("Table 'foo' has no primary key", issue.getDescription());
+		assertEquals(Issue.HIGH_PRIORITY, issue.getPriority());
+	}
+
+	@Test
+	public void testToString() {
+		Issue issue = new Issue("MISSING_INDEX", Issue.NORMAL_PRIORITY, "No index on column 'bar'");
+		assertEquals("MISSING_INDEX:No index on column 'bar'", issue.toString());
+	}
+
+	@Test
+	public void testPriorityConstants() {
+		assertEquals(100, Issue.HIGH_PRIORITY);
+		assertEquals(50, Issue.NORMAL_PRIORITY);
+		assertEquals(0, Issue.LOW_PRIORITY);
+	}
+
+	@Test
+	public void testLowPriority() {
+		Issue issue = new Issue("INFO", Issue.LOW_PRIORITY, "Minor suggestion");
+		assertEquals(Issue.LOW_PRIORITY, issue.getPriority());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/mapping/HbmToMetadataTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/mapping/HbmToMetadataTest.java
new file mode 100644
index 000000000000..b930f4a103cf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/mapping/HbmToMetadataTest.java
@@ -0,0 +1,56 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.mapping;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.JdbcSettings;
+import org.hibernate.engine.jdbc.env.JdbcMetadataOnBoot;
+import org.hibernate.tool.reveng.internal.util.DummyDialect;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Files;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class HbmToMetadataTest {
+
+	@TempDir
+	private File tempDir;
+
+	private File simpleHbmFile;
+
+	@BeforeEach
+	public void beforeEach() throws Exception {
+		simpleHbmFile = new File( tempDir, "simple.mapping.hbm" );
+		Files.writeString(simpleHbmFile.toPath(), SIMPLE_HBM_XML);
+	}
+
+	@Test
+	public void testBuildMetadata() throws Exception {
+		StandardServiceRegistryBuilder ssrb = new StandardServiceRegistryBuilder();
+		ssrb.clearSettings();
+		ssrb.applySetting( JdbcSettings.ALLOW_METADATA_ON_BOOT, JdbcMetadataOnBoot.DISALLOW );
+		ssrb.applySetting(JdbcSettings.DIALECT, DummyDialect.class.getName());
+		MetadataSources sources = new MetadataSources(ssrb.build());
+		sources.addFile(  simpleHbmFile );
+		assertNotNull(sources.buildMetadata());
+	}
+
+
+	private static final String SIMPLE_HBM_XML =
+			"""
+					<hibernate-mapping>
+						<class name="Foo">
+							<id name="id" type="long"/>
+							<property name="name" type="string"/>
+						</class>
+					</hibernate-mapping>
+				""";
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/mapping/MappingExporterTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/mapping/MappingExporterTest.java
new file mode 100644
index 000000000000..fc94cb75b07c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/mapping/MappingExporterTest.java
@@ -0,0 +1,316 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.mapping;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import org.apache.commons.collections4.list.UnmodifiableList;
+import org.hibernate.boot.jaxb.Origin;
+import org.hibernate.boot.jaxb.SourceType;
+import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
+import org.hibernate.boot.jaxb.hbm.transform.UnsupportedFeatureHandling;
+import org.hibernate.boot.jaxb.internal.MappingBinder;
+import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
+import org.hibernate.boot.jaxb.spi.Binding;
+import org.hibernate.boot.jaxb.spi.JaxbBindableMappingDescriptor;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.reveng.internal.util.DummyDialect;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.lang.reflect.*;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static org.hibernate.tool.reveng.internal.export.mapping.MappingExporter.HbmXmlOrigin;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class MappingExporterTest {
+
+	private MappingExporter mappingExporter;
+
+	@TempDir
+	private File tempDir;
+
+	@BeforeEach
+	public void beforeEach() {
+		mappingExporter = new MappingExporter();
+	}
+
+	@Test
+	public void testConstructor() throws Exception {
+		Field mappingBinderField = MappingExporter.class.getDeclaredField("mappingBinder");
+		mappingBinderField.setAccessible(true);
+		assertNotNull(mappingBinderField.get(mappingExporter));
+		Field marshallerField = MappingExporter.class.getDeclaredField("marshaller");
+		marshallerField.setAccessible(true);
+		assertNotNull(marshallerField.get(mappingExporter));
+	}
+
+	@Test
+	public void testSetHbmFiles() throws NoSuchFieldException, IllegalAccessException {
+		Field hbmFilesField = MappingExporter.class.getDeclaredField("hbmXmlFiles");
+		List<File> origin = new ArrayList<>();
+		File fooFile = new File( tempDir, "foo.bar" );
+		origin.add( fooFile );
+		assertNotNull(hbmFilesField);
+		hbmFilesField.setAccessible(true);
+		assertTrue(((List<?>)hbmFilesField.get(mappingExporter)).isEmpty());
+		mappingExporter.setHbmFiles(origin);
+		List<?> destination = (List<?>) hbmFilesField.get(mappingExporter);
+		assertEquals(1, destination.size());
+		assertTrue(destination.contains(fooFile));
+	}
+
+	@Test
+	public void testCreateServiceRegistry()
+			throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+		Method createServiceRegistryMethod = MappingExporter.class.getDeclaredMethod("createServiceRegistry");
+		assertNotNull(createServiceRegistryMethod);
+		createServiceRegistryMethod.setAccessible(true);
+		Object object = createServiceRegistryMethod.invoke(mappingExporter);
+		assertNotNull(object);
+		assertInstanceOf(ServiceRegistry.class, object);
+		try (ServiceRegistry serviceRegistry = (ServiceRegistry) object) {
+			Dialect dialect = Objects.requireNonNull(serviceRegistry.getService(JdbcServices.class)).getDialect();
+			assertInstanceOf(DummyDialect.class, dialect);
+		}
+	}
+
+	@Test
+	public void testCreateMappingBinder()
+			throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+		Method createMappingBinderMethod = MappingExporter.class.getDeclaredMethod("createMappingBinder");
+		assertNotNull(createMappingBinderMethod);
+		createMappingBinderMethod.setAccessible(true);
+		Object object = createMappingBinderMethod.invoke(mappingExporter);
+		assertNotNull(object);
+		assertInstanceOf(MappingBinder.class, object);
+		MappingBinder mappingBinder = (MappingBinder) object;
+		assertNotNull(mappingBinder);
+	}
+
+	@Test
+	public void testBindHbmXml() throws Exception{
+		Method bindMappingMethod = MappingExporter.class.getDeclaredMethod(
+				"bindHbmXml",
+				HbmXmlOrigin.class);
+		assertNotNull(bindMappingMethod);
+		bindMappingMethod.setAccessible(true);
+		File file = new File(this.tempDir, "foo.bar");
+		Files.writeString(file.toPath(), "foobar");
+		final MappingBinder mappingBinder = new TestMappingBinder(file, "barfoo");
+		Field mappingBinderField = MappingExporter.class.getDeclaredField("mappingBinder");
+		mappingBinderField.setAccessible(true);
+		mappingBinderField.set(mappingExporter, mappingBinder);
+		assertNotEquals("barfoo", Files.readString(file.toPath()));
+		Object object = bindMappingMethod.invoke(mappingExporter, new HbmXmlOrigin(file));
+		assertInstanceOf(Binding.class, object);
+		Origin origin = ((Binding<?>)object).getOrigin();
+		assertInstanceOf(HbmXmlOrigin.class, origin);
+		assertSame(file, ((HbmXmlOrigin)origin).getHbmXmlFile());
+		assertEquals("barfoo", Files.readString(file.toPath()));
+	}
+
+	@Test
+	public void testGetHbmBindings() throws Exception {
+		Method getHbmMappingsMethod = MappingExporter.class.getDeclaredMethod("getHbmBindings");
+		assertNotNull(getHbmMappingsMethod);
+		getHbmMappingsMethod.setAccessible(true);
+		Field hbmFilesField = MappingExporter.class.getDeclaredField("hbmXmlFiles");
+		hbmFilesField.setAccessible(true);
+		List<File> hbmXmlFiles = new ArrayList<>();
+		File file = new File(this.tempDir, "foo.bar");
+		Files.writeString(file.toPath(), "foobar");
+		hbmXmlFiles.add(file);
+		hbmFilesField.set(mappingExporter, new UnmodifiableList<>(hbmXmlFiles));
+		Field mappingBinderField = MappingExporter.class.getDeclaredField("mappingBinder");
+		mappingBinderField.setAccessible(true);
+		mappingBinderField.set(mappingExporter, new TestMappingBinder(file, "barfoo"));
+		Object object = getHbmMappingsMethod.invoke(mappingExporter);
+		assertInstanceOf(List.class, object);
+		assertEquals(1, ((List<?>)object).size());
+		object = ((List<?>) object).get(0);
+		assertInstanceOf(Binding.class, object);
+		Origin origin = ((Binding<?>)object).getOrigin();
+		assertInstanceOf(HbmXmlOrigin.class, origin);
+		assertSame(file, ((HbmXmlOrigin)origin).getHbmXmlFile());
+		assertEquals("barfoo", Files.readString(file.toPath()));
+	}
+
+	@Test
+	public void testCreateMarshaller() throws Exception {
+		Method createMarshallerMethod = MappingExporter.class.getDeclaredMethod("createMarshaller");
+		assertNotNull(createMarshallerMethod);
+		createMarshallerMethod.setAccessible(true);
+		final MappingBinder mappingBinder = new TestMappingBinder(new File("foo"), "foobar");
+		Field mappingBinderField = MappingExporter.class.getDeclaredField("mappingBinder");
+		mappingBinderField.setAccessible(true);
+		mappingBinderField.set(mappingExporter, mappingBinder);
+		assertSame(
+				DUMMY_MARSHALLER,
+				createMarshallerMethod.invoke(mappingExporter));
+	}
+
+	@Test
+	public void testMarshall() throws Exception {
+		Method marshallMethod = MappingExporter.class.getDeclaredMethod(
+				"marshall",
+				JaxbEntityMappingsImpl.class,
+				File.class);
+		assertNotNull(marshallMethod);
+		marshallMethod.setAccessible(true);
+		Field marshallerField = MappingExporter.class.getDeclaredField("marshaller");
+		marshallerField.setAccessible(true);
+		marshallerField.set(mappingExporter, DUMMY_MARSHALLER);
+		File hbmFile = new File(this.tempDir, "foo.hbm.xml");
+		File mappingFile = new File(this.tempDir, "foo.mapping.xml");
+		Files.writeString(mappingFile.toPath(), "<foo><bar>foobar</bar></foo>");
+		List<String> lines = Files.readAllLines(mappingFile.toPath());
+		assertEquals(1, lines.size());
+		marshallMethod.invoke(mappingExporter, null, hbmFile);
+		lines = Files.readAllLines(mappingFile.toPath());
+		assertEquals(4, lines.size());
+		Field formatResultField = MappingExporter.class.getDeclaredField("formatResult");
+		formatResultField.setAccessible(true);
+		formatResultField.set(mappingExporter, false);
+		Files.writeString(mappingFile.toPath(), "<foo><bar>foobar</bar></foo>");
+		lines = Files.readAllLines(mappingFile.toPath());
+		assertEquals(1, lines.size());
+		marshallMethod.invoke(mappingExporter, null, hbmFile);
+		lines = Files.readAllLines(mappingFile.toPath());
+		assertEquals(1, lines.size());
+	}
+
+	@Test
+	public void testTransformBindings() throws Exception {
+		FileInputStream simpleHbmXmlInputStream = null;
+		try {
+			File simpleHbmXmlFile = new File( this.tempDir, "simple.hbm.xml" );
+			Files.writeString( simpleHbmXmlFile.toPath(), SIMPLE_HBM_XML );
+			MappingBinder mappingBinder = new MappingBinder(
+					MappingBinder.class.getClassLoader()::getResourceAsStream,
+					UnsupportedFeatureHandling.ERROR );
+			simpleHbmXmlInputStream = new FileInputStream( simpleHbmXmlFile );
+			Binding<JaxbHbmHibernateMapping> hbmBinding = mappingBinder.bind(
+					simpleHbmXmlInputStream,
+					new HbmXmlOrigin( simpleHbmXmlFile ) );
+			List<Binding<JaxbHbmHibernateMapping>> bindings = new ArrayList<>();
+			bindings.add( hbmBinding );
+			Method transformBindingsMethod = MappingExporter.class.getDeclaredMethod(
+					"transformBindings",
+					List.class );
+			assertNotNull( transformBindingsMethod );
+			transformBindingsMethod.setAccessible( true );
+			List<?> transformedBindings = (List<?>) transformBindingsMethod.invoke( mappingExporter, bindings );
+			assertNotNull( transformedBindings );
+			assertEquals( 1, transformedBindings.size() );
+			Object object = transformedBindings.get( 0 );
+			assertInstanceOf( Binding.class, object );
+			Binding<?> entityBinding = (Binding<?>) object;
+			Origin origin = entityBinding.getOrigin();
+			assertInstanceOf( HbmXmlOrigin.class, origin );
+			assertSame( simpleHbmXmlFile, ((HbmXmlOrigin) origin).getHbmXmlFile() );
+			Object root = entityBinding.getRoot();
+			assertInstanceOf( JaxbEntityMappingsImpl.class, root );
+			JaxbEntityMappingsImpl entityMappings = (JaxbEntityMappingsImpl) root;
+			assertEquals( 1, entityMappings.getEntities().size() );
+			assertEquals( "Foo", entityMappings.getEntities().get( 0 ).getClazz() );
+		} finally {
+			if ( simpleHbmXmlInputStream != null ) {
+				simpleHbmXmlInputStream.close();
+			}
+		}
+	}
+
+	@Test
+	public void testStart() throws Exception {
+		File simpleHbmXmlFile = new File(this.tempDir, "simple.hbm.xml");
+		File simpleMappingXmlFile = new File(this.tempDir, "simple.mapping.xml");
+		Files.writeString(simpleHbmXmlFile.toPath(), SIMPLE_HBM_XML);
+		Field hbmFilesField = MappingExporter.class.getDeclaredField("hbmXmlFiles");
+		hbmFilesField.setAccessible(true);
+		hbmFilesField.set(
+				mappingExporter,
+				new UnmodifiableList<>(List.of(simpleHbmXmlFile)));
+		assertTrue(simpleHbmXmlFile.exists());
+		assertFalse(simpleMappingXmlFile.exists());
+		mappingExporter.start();
+		assertTrue(simpleMappingXmlFile.exists());
+		String mappingXml = Files.readString(simpleMappingXmlFile.toPath());
+		assertTrue(mappingXml.contains("entity-mappings"));
+	}
+
+	@Test
+	public void testHbmXmlOrigin() {
+		File hbmXmlFile = new File(tempDir, "foo.hbm.xml");
+		HbmXmlOrigin hxo = new HbmXmlOrigin(hbmXmlFile);
+		assertNotNull(hxo);
+		assertEquals(hbmXmlFile, hxo.getHbmXmlFile());
+		assertEquals(hbmXmlFile.getAbsolutePath(), hxo.getName());
+		assertEquals(SourceType.FILE, hxo.getType());
+	}
+
+	private static final Marshaller DUMMY_MARSHALLER = (Marshaller) Proxy.newProxyInstance(
+			MappingExporterTest.class.getClassLoader(),
+			new Class<?>[]{Marshaller.class},
+			(proxy, method, args) -> {
+				if ("marshall".equals(method.getName())) {
+					Files.writeString(((File)args[1]).toPath(), "foobar");
+				}
+				return proxy;
+			}
+
+	);
+
+	private static class TestMappingBinder extends MappingBinder {
+		private final File f;
+		private final String s;
+		public TestMappingBinder(File f, String s) {
+			super(null, null, null);
+			this.f = f;
+			this.s = s;
+		}
+		@Override public <X extends JaxbBindableMappingDescriptor> org.hibernate.boot.jaxb.spi.Binding<X> bind(InputStream is, Origin o) {
+			try {
+				Files.writeString(f.toPath(), s);
+			}
+			catch (Exception ignore) {}
+			return new Binding<>(null, new HbmXmlOrigin(f));
+		}
+		@Override public JAXBContext mappingJaxbContext() {
+			return new JAXBContext() {
+				@Override
+				public Unmarshaller createUnmarshaller() {
+					return null;
+				}
+				@Override
+				public Marshaller createMarshaller() {
+					return DUMMY_MARSHALLER;
+				}
+			};
+		}
+	}
+
+	private static final String SIMPLE_HBM_XML =
+			"""
+					<hibernate-mapping>
+						<class name="Foo">
+							<id name="id" type="long"/>
+							<property name="name" type="string"/>
+						</class>
+					</hibernate-mapping>
+				""";
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/mapping/MappingToMetadataTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/mapping/MappingToMetadataTest.java
new file mode 100644
index 000000000000..248332627125
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/export/mapping/MappingToMetadataTest.java
@@ -0,0 +1,77 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.export.mapping;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.JdbcSettings;
+import org.hibernate.engine.jdbc.env.JdbcMetadataOnBoot;
+import org.hibernate.tool.reveng.internal.util.DummyDialect;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.nio.file.Files;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class MappingToMetadataTest {
+
+	@TempDir
+	private File tempDir;
+
+	private File simpleMappingFile;
+
+	@BeforeEach
+	public void beforeEach() throws Exception {
+		simpleMappingFile = new File( tempDir, "simple.mapping.hbm" );
+		Files.writeString(simpleMappingFile.toPath(), SIMPLE_MAPPING_XML);
+	}
+
+
+	@Disabled
+	@Test
+	public void testBuildMetadata() throws Exception {
+		StandardServiceRegistryBuilder ssrb = new StandardServiceRegistryBuilder();
+		ssrb.clearSettings();
+		ssrb.applySetting( JdbcSettings.ALLOW_METADATA_ON_BOOT, JdbcMetadataOnBoot.DISALLOW );
+		ssrb.applySetting(JdbcSettings.DIALECT, DummyDialect.class.getName());
+		MetadataSources sources = new MetadataSources(ssrb.build());
+		sources.addFile(  simpleMappingFile );
+		assertNotNull(sources.buildMetadata());
+	}
+
+	private static final String SIMPLE_MAPPING_XML =
+			"""
+					<?xml version="1.0" encoding="UTF-8"?>
+					<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping">
+						<attribute-accessor>property</attribute-accessor>
+						<default-cascade>none</default-cascade>
+						<default-lazy>true</default-lazy>
+						<entity class="Foo" metadata-complete="false">
+							<table name="Foo"/>
+							<dynamic-insert>false</dynamic-insert>
+							<dynamic-update>false</dynamic-update>
+							<select-before-update>false</select-before-update>
+							<batch-size>-1</batch-size>
+							<mutable>true</mutable>
+							<optimistic-locking>VERSION</optimistic-locking>
+							<attributes>
+								<id name="id">
+									<column insertable="true" name="id" nullable="false" unique="false" updatable="false"/>
+									<java-type>org.hibernate.type.descriptor.java.LongJavaType</java-type>
+									<jdbc-type>org.hibernate.type.descriptor.jdbc.BigIntJdbcType</jdbc-type>
+								</id>
+								<basic fetch="EAGER" name="name" optimistic-lock="true" optional="true">
+									<java-type>org.hibernate.type.descriptor.java.StringJavaType</java-type>
+									<jdbc-type>org.hibernate.type.descriptor.jdbc.VarcharJdbcType</jdbc-type>
+								</basic>
+							</attributes>
+						</entity>
+					</entity-mappings>""";
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/metadata/NativeMetadataDescriptorTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/metadata/NativeMetadataDescriptorTest.java
new file mode 100644
index 000000000000..3c9f8f3773d6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/metadata/NativeMetadataDescriptorTest.java
@@ -0,0 +1,122 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.metadata;
+
+import org.hibernate.boot.Metadata;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.Properties;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class NativeMetadataDescriptorTest {
+
+	private static Properties h2Props() {
+		Properties props = new Properties();
+		props.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+		props.put("hibernate.connection.driver_class", "org.h2.Driver");
+		props.put("hibernate.connection.url", "jdbc:h2:mem:native_md_test");
+		props.put("hibernate.connection.username", "sa");
+		props.put("hibernate.connection.password", "");
+		props.put("hibernate.default_schema", "");
+		props.put("hibernate.default_catalog", "");
+		return props;
+	}
+
+	@Test
+	public void testConstructorWithProperties() {
+		NativeMetadataDescriptor descriptor = new NativeMetadataDescriptor(null, null, h2Props());
+		Properties result = descriptor.getProperties();
+		assertNotNull(result);
+		assertFalse(result.isEmpty());
+	}
+
+	@Test
+	public void testConstructorWithNullProperties() {
+		NativeMetadataDescriptor descriptor = new NativeMetadataDescriptor(null, null, null);
+		Properties result = descriptor.getProperties();
+		assertNotNull(result);
+	}
+
+	@Test
+	public void testConstructorWithMappingFiles(@TempDir File tempDir) throws IOException {
+		File hbmFile = new File(tempDir, "HelloWorld.hbm.xml");
+		try (InputStream in = getClass().getResourceAsStream(
+				"/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")) {
+			Files.copy(in, hbmFile.toPath());
+		}
+		NativeMetadataDescriptor descriptor = new NativeMetadataDescriptor(
+				null, new File[]{hbmFile}, h2Props());
+		Properties result = descriptor.getProperties();
+		assertNotNull(result);
+	}
+
+	@Test
+	public void testGetPropertiesReturnsCopy() {
+		NativeMetadataDescriptor descriptor = new NativeMetadataDescriptor(null, null, h2Props());
+		Properties result1 = descriptor.getProperties();
+		Properties result2 = descriptor.getProperties();
+		result1.put("extra.key", "value");
+		assertFalse(result2.containsKey("extra.key"));
+	}
+
+	@Test
+	public void testCreateMetadata() {
+		NativeMetadataDescriptor descriptor = new NativeMetadataDescriptor(null, null, h2Props());
+		Metadata metadata = descriptor.createMetadata();
+		assertNotNull(metadata);
+	}
+
+	@Test
+	public void testConstructorWithCfgXmlFile(@TempDir File tempDir) throws IOException {
+		File cfgFile = new File(tempDir, "hibernate.cfg.xml");
+		try (FileWriter w = new FileWriter(cfgFile)) {
+			w.write("<?xml version='1.0' encoding='utf-8'?>\n");
+			w.write("<!DOCTYPE hibernate-configuration PUBLIC\n");
+			w.write("  \"-//Hibernate/Hibernate Configuration DTD 3.0//EN\"\n");
+			w.write("  \"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd\">\n");
+			w.write("<hibernate-configuration><session-factory/></hibernate-configuration>\n");
+		}
+		NativeMetadataDescriptor descriptor = new NativeMetadataDescriptor(cfgFile, null, h2Props());
+		assertNotNull(descriptor.getProperties());
+	}
+
+	@Test
+	public void testConstructorWithJarMappingFile(@TempDir File tempDir) throws IOException {
+		File jarFile = new File(tempDir, "mappings.jar");
+		try (JarOutputStream jos = new JarOutputStream(
+				Files.newOutputStream(jarFile.toPath()))) {
+			jos.putNextEntry(new ZipEntry("META-INF/"));
+			jos.closeEntry();
+		}
+		NativeMetadataDescriptor descriptor = new NativeMetadataDescriptor(
+				null, new File[]{jarFile}, h2Props());
+		assertNotNull(descriptor.getProperties());
+	}
+
+	@Test
+	public void testCreateMetadataWithMappingFiles(@TempDir File tempDir) throws IOException {
+		File hbmFile = new File(tempDir, "HelloWorld.hbm.xml");
+		try (InputStream in = getClass().getResourceAsStream(
+				"/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml")) {
+			Files.copy(in, hbmFile.toPath());
+		}
+		NativeMetadataDescriptor descriptor = new NativeMetadataDescriptor(
+				null, new File[]{hbmFile}, h2Props());
+		Metadata metadata = descriptor.createMetadata();
+		assertNotNull(metadata);
+		assertTrue(metadata.getEntityBindings().iterator().hasNext());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/metadata/RevengMetadataDescriptorTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/metadata/RevengMetadataDescriptorTest.java
new file mode 100644
index 000000000000..95cbd703cdf4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/metadata/RevengMetadataDescriptorTest.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.metadata;
+
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.junit.jupiter.api.Test;
+
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class RevengMetadataDescriptorTest {
+
+	@Test
+	public void testConstructorWithNullProperties() {
+		RevengMetadataDescriptor descriptor = new RevengMetadataDescriptor(null, null);
+		Properties result = descriptor.getProperties();
+		assertNotNull(result);
+	}
+
+	@Test
+	public void testConstructorWithProperties() {
+		Properties props = new Properties();
+		props.put("custom.key", "custom.value");
+		RevengMetadataDescriptor descriptor = new RevengMetadataDescriptor(null, props);
+		Properties result = descriptor.getProperties();
+		assertNotNull(result);
+		assertNotNull(result.get("custom.key"));
+	}
+
+	@Test
+	public void testGetPropertiesReturnsCopy() {
+		RevengMetadataDescriptor descriptor = new RevengMetadataDescriptor(null, null);
+		Properties result1 = descriptor.getProperties();
+		Properties result2 = descriptor.getProperties();
+		result1.put("extra.key", "value");
+		assertFalse(result2.containsKey("extra.key"));
+	}
+
+	@Test
+	public void testFactoryCreateReverseEngineeringDescriptor() {
+		MetadataDescriptor descriptor = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null);
+		assertNotNull(descriptor);
+		assertNotNull(descriptor.getProperties());
+	}
+
+	@Test
+	public void testFactoryCreateNativeDescriptor() {
+		Properties props = new Properties();
+		props.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
+		props.put("hibernate.connection.driver_class", "org.h2.Driver");
+		props.put("hibernate.connection.url", "jdbc:h2:mem:factory_test");
+		props.put("hibernate.connection.username", "sa");
+		props.put("hibernate.connection.password", "");
+		props.put("hibernate.default_schema", "");
+		props.put("hibernate.default_catalog", "");
+		MetadataDescriptor descriptor = MetadataDescriptorFactory
+				.createNativeDescriptor(null, null, props);
+		assertNotNull(descriptor);
+		assertNotNull(descriptor.getProperties());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/AnnotationBuilderTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/AnnotationBuilderTest.java
new file mode 100644
index 000000000000..333fdc1e10ba
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/AnnotationBuilderTest.java
@@ -0,0 +1,143 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class AnnotationBuilderTest {
+
+	@Test
+	public void testCreateAnnotationNoAttributes() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Entity");
+		assertEquals("@Entity", builder.getResult());
+	}
+
+	@Test
+	public void testCreateAnnotationSingleAttribute() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Table");
+		builder.addAttribute("name", "\"employees\"");
+		assertEquals("@Table(name=\"employees\")", builder.getResult());
+	}
+
+	@Test
+	public void testCreateAnnotationMultipleAttributes() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Column");
+		builder.addAttribute("name", "\"first_name\"");
+		builder.addAttribute("nullable", "false");
+		assertEquals("@Column(name=\"first_name\", nullable=false)", builder.getResult());
+	}
+
+	@Test
+	public void testCreateAnnotationArrayAttribute() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("NamedQueries");
+		builder.addAttribute("value", new String[] {"@NamedQuery(name=\"q1\")", "@NamedQuery(name=\"q2\")"});
+		assertEquals("@NamedQueries(value={@NamedQuery(name=\"q1\"), @NamedQuery(name=\"q2\")})", builder.getResult());
+	}
+
+	@Test
+	public void testAddQuotedAttribute() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Table");
+		builder.addQuotedAttribute("name", "employees");
+		assertEquals("@Table(name=\"employees\")", builder.getResult());
+	}
+
+	@Test
+	public void testAddAttributeNullValueIgnored() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Entity");
+		builder.addAttribute("name", (String) null);
+		assertEquals("@Entity", builder.getResult());
+	}
+
+	@Test
+	public void testAddAttributeNullArrayIgnored() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Entity");
+		builder.addAttribute("value", (String[]) null);
+		assertEquals("@Entity", builder.getResult());
+	}
+
+	@Test
+	public void testAddAttributeEmptyArrayIgnored() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Entity");
+		builder.addAttribute("value", new String[] {});
+		assertEquals("@Entity", builder.getResult());
+	}
+
+	@Test
+	public void testAddQuotedAttributeNullIgnored() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Entity");
+		builder.addQuotedAttribute("name", null);
+		assertEquals("@Entity", builder.getResult());
+	}
+
+	@Test
+	public void testResetAnnotation() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("OldName");
+		builder.addAttribute("key", "value");
+		builder.resetAnnotation("NewName");
+		assertEquals("@NewName", builder.getResult());
+	}
+
+	@Test
+	public void testGetAttributeAsString() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Test");
+		builder.addAttribute("name", "\"hello\"");
+		assertEquals("\"hello\"", builder.getAttributeAsString("name"));
+	}
+
+	@Test
+	public void testGetAttributeAsStringArray() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Test");
+		builder.addAttribute("values", new String[] {"a", "b", "c"});
+		assertEquals("{a, b, c}", builder.getAttributeAsString("values"));
+	}
+
+	@Test
+	public void testGetAttributeAsStringNotFound() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Test");
+		assertNull(builder.getAttributeAsString("nonexistent"));
+	}
+
+	@Test
+	public void testToStringEqualsGetResult() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Entity");
+		assertEquals(builder.getResult(), builder.toString());
+	}
+
+	@Test
+	public void testAddQuotedAttributes() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Test");
+		builder.addQuotedAttributes("names", Arrays.asList("a", "b").iterator());
+		assertEquals("@Test(names={\"a\", \"b\"})", builder.getResult());
+	}
+
+	@Test
+	public void testAddAttributes() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Test");
+		builder.addAttributes("values", Arrays.asList("X.class", "Y.class").iterator());
+		assertEquals("@Test(values={X.class, Y.class})", builder.getResult());
+	}
+
+	@Test
+	public void testAddQuotedAttributesEmpty() {
+		AnnotationBuilder builder = AnnotationBuilder.createAnnotation("Test");
+		builder.addQuotedAttributes("names", Collections.emptyIterator());
+		assertEquals("@Test", builder.getResult());
+	}
+
+	@Test
+	public void testFluentApi() {
+		String result = AnnotationBuilder.createAnnotation("Column")
+				.addQuotedAttribute("name", "id")
+				.addAttribute("nullable", "false")
+				.getResult();
+		assertEquals("@Column(name=\"id\", nullable=false)", result);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/DummyDialectTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/DummyDialectTest.java
new file mode 100644
index 000000000000..9c8e7d00a28d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/DummyDialectTest.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class DummyDialectTest {
+
+	@Test
+	public void testDummyDialect() {
+		assertNotNull(DummyDialect.INSTANCE);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/IteratorTransformerTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/IteratorTransformerTest.java
new file mode 100644
index 000000000000..9de4bfdadde8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/IteratorTransformerTest.java
@@ -0,0 +1,77 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class IteratorTransformerTest {
+
+	private IteratorTransformer<Integer> createToStringTransformer(List<Integer> list) {
+		return new IteratorTransformer<>(list.iterator()) {
+			@Override
+			public String transform(Integer object) {
+				return "item-" + object;
+			}
+		};
+	}
+
+	@Test
+	public void testHasNextAndNext() {
+		List<Integer> list = Arrays.asList(1, 2, 3);
+		IteratorTransformer<Integer> transformer = createToStringTransformer(list);
+
+		assertTrue(transformer.hasNext());
+		assertEquals("item-1", transformer.next());
+		assertTrue(transformer.hasNext());
+		assertEquals("item-2", transformer.next());
+		assertTrue(transformer.hasNext());
+		assertEquals("item-3", transformer.next());
+		assertFalse(transformer.hasNext());
+	}
+
+	@Test
+	public void testEmptyIterator() {
+		IteratorTransformer<Integer> transformer = createToStringTransformer(List.of());
+		assertFalse(transformer.hasNext());
+	}
+
+	@Test
+	public void testRemove() {
+		List<Integer> list = new ArrayList<>(Arrays.asList(1, 2, 3));
+		IteratorTransformer<Integer> transformer = createToStringTransformer(list);
+		transformer.next();
+		transformer.remove();
+		assertEquals(2, list.size());
+	}
+
+	@Test
+	public void testTransformWithCustomLogic() {
+		List<String> list = Arrays.asList("hello", "world");
+		IteratorTransformer<String> transformer = new IteratorTransformer<>(list.iterator()) {
+			@Override
+			public String transform(String object) {
+				return object.toUpperCase();
+			}
+		};
+		assertEquals("HELLO", transformer.next());
+		assertEquals("WORLD", transformer.next());
+	}
+
+	@Test
+	public void testNoSuchElement() {
+		IteratorTransformer<Integer> transformer = createToStringTransformer(List.of());
+		assertThrows(NoSuchElementException.class, transformer::next);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/JdbcToHibernateTypeHelperTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/JdbcToHibernateTypeHelperTest.java
new file mode 100644
index 000000000000..c463bfeade6f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/JdbcToHibernateTypeHelperTest.java
@@ -0,0 +1,232 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.hibernate.MappingException;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Types;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JdbcToHibernateTypeHelperTest {
+
+	// --- getPreferredHibernateType ---
+
+	@Test
+	public void testGetPreferredHibernateTypeVarchar() {
+		assertEquals("string",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.VARCHAR, 255, 0, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeVarcharNullable() {
+		assertEquals("string",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.VARCHAR, 255, 0, 0, true, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeIntegerNotNullable() {
+		assertEquals("int",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.INTEGER, 0, 0, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeIntegerNullable() {
+		assertEquals(Integer.class.getName(),
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.INTEGER, 0, 0, 0, true, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeBooleanNotNullable() {
+		assertEquals("boolean",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.BOOLEAN, 0, 0, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeNumericPrecision1() {
+		assertEquals("boolean",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.NUMERIC, 0, 1, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeNumericPrecision1Nullable() {
+		assertEquals(Boolean.class.getName(),
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.NUMERIC, 0, 1, 0, true, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeNumericPrecision2() {
+		assertEquals("byte",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.NUMERIC, 0, 2, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeNumericPrecision4() {
+		assertEquals("short",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.NUMERIC, 0, 4, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeNumericPrecision9() {
+		assertEquals("int",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.NUMERIC, 0, 9, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeNumericPrecision18() {
+		assertEquals("long",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.NUMERIC, 0, 18, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeNumericPrecision19() {
+		assertEquals("big_integer",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.NUMERIC, 0, 19, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeNumericWithScale() {
+		assertEquals("big_decimal",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.DECIMAL, 0, 10, 2, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeCharSize1() {
+		assertEquals("char",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.CHAR, 1, 0, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeCharSizeGreaterThan1() {
+		assertEquals("string",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.CHAR, 50, 0, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeBlob() {
+		assertEquals("blob",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.BLOB, 0, 0, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeClob() {
+		assertEquals("clob",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.CLOB, 0, 0, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeTimestamp() {
+		assertEquals("timestamp",
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.TIMESTAMP, 0, 0, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeUnknown() {
+		assertNull(JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.ARRAY, 0, 0, 0, false, false));
+	}
+
+	@Test
+	public void testGetPreferredHibernateTypeGeneratedIdentifier() {
+		assertEquals(Integer.class.getName(),
+				JdbcToHibernateTypeHelper.getPreferredHibernateType(Types.INTEGER, 0, 0, 0, false, true));
+	}
+
+	// --- getJDBCTypes ---
+
+	@Test
+	public void testGetJDBCTypesNotEmpty() {
+		String[] types = JdbcToHibernateTypeHelper.getJDBCTypes();
+		assertNotNull(types);
+		assertTrue(types.length > 0);
+	}
+
+	@Test
+	public void testGetJDBCTypesContainsVarchar() {
+		String[] types = JdbcToHibernateTypeHelper.getJDBCTypes();
+		boolean found = false;
+		for (String type : types) {
+			if ("VARCHAR".equals(type)) {
+				found = true;
+				break;
+			}
+		}
+		assertTrue(found);
+	}
+
+	// --- getJDBCType ---
+
+	@Test
+	public void testGetJDBCTypeByName() {
+		assertEquals(Types.VARCHAR, JdbcToHibernateTypeHelper.getJDBCType("VARCHAR"));
+	}
+
+	@Test
+	public void testGetJDBCTypeByNumber() {
+		assertEquals(12, JdbcToHibernateTypeHelper.getJDBCType("12"));
+	}
+
+	@Test
+	public void testGetJDBCTypeInvalidThrows() {
+		assertThrows(MappingException.class,
+				() -> JdbcToHibernateTypeHelper.getJDBCType("NOT_A_TYPE"));
+	}
+
+	// --- getJDBCTypeName ---
+
+	@Test
+	public void testGetJDBCTypeNameKnown() {
+		assertEquals("VARCHAR", JdbcToHibernateTypeHelper.getJDBCTypeName(Types.VARCHAR));
+	}
+
+	@Test
+	public void testGetJDBCTypeNameUnknown() {
+		assertEquals("99999", JdbcToHibernateTypeHelper.getJDBCTypeName(99999));
+	}
+
+	// --- typeHasScale / typeHasPrecision / typeHasLength ---
+
+	@Test
+	public void testTypeHasScale() {
+		assertTrue(JdbcToHibernateTypeHelper.typeHasScale(Types.DECIMAL));
+		assertTrue(JdbcToHibernateTypeHelper.typeHasScale(Types.NUMERIC));
+		assertFalse(JdbcToHibernateTypeHelper.typeHasScale(Types.VARCHAR));
+		assertFalse(JdbcToHibernateTypeHelper.typeHasScale(Types.INTEGER));
+	}
+
+	@Test
+	public void testTypeHasPrecision() {
+		assertTrue(JdbcToHibernateTypeHelper.typeHasPrecision(Types.DECIMAL));
+		assertTrue(JdbcToHibernateTypeHelper.typeHasPrecision(Types.NUMERIC));
+		assertTrue(JdbcToHibernateTypeHelper.typeHasPrecision(Types.REAL));
+		assertTrue(JdbcToHibernateTypeHelper.typeHasPrecision(Types.FLOAT));
+		assertTrue(JdbcToHibernateTypeHelper.typeHasPrecision(Types.DOUBLE));
+		assertFalse(JdbcToHibernateTypeHelper.typeHasPrecision(Types.VARCHAR));
+	}
+
+	@Test
+	public void testTypeHasScaleAndPrecision() {
+		assertTrue(JdbcToHibernateTypeHelper.typeHasScaleAndPrecision(Types.DECIMAL));
+		assertFalse(JdbcToHibernateTypeHelper.typeHasScaleAndPrecision(Types.REAL));
+		assertFalse(JdbcToHibernateTypeHelper.typeHasScaleAndPrecision(Types.VARCHAR));
+	}
+
+	@Test
+	public void testTypeHasLength() {
+		assertTrue(JdbcToHibernateTypeHelper.typeHasLength(Types.VARCHAR));
+		assertTrue(JdbcToHibernateTypeHelper.typeHasLength(Types.CHAR));
+		assertTrue(JdbcToHibernateTypeHelper.typeHasLength(Types.LONGVARCHAR));
+		assertTrue(JdbcToHibernateTypeHelper.typeHasLength(Types.DATE));
+		assertTrue(JdbcToHibernateTypeHelper.typeHasLength(Types.TIME));
+		assertTrue(JdbcToHibernateTypeHelper.typeHasLength(Types.TIMESTAMP));
+		assertFalse(JdbcToHibernateTypeHelper.typeHasLength(Types.INTEGER));
+		assertFalse(JdbcToHibernateTypeHelper.typeHasLength(Types.BLOB));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/NameConverterTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/NameConverterTest.java
new file mode 100644
index 000000000000..01b4afe7ea73
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/NameConverterTest.java
@@ -0,0 +1,127 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class NameConverterTest {
+
+	// --- toUpperCamelCase ---
+
+	@Test
+	public void testToUpperCamelCaseSimple() {
+		assertEquals("EmployeeName", NameConverter.toUpperCamelCase("employee_name"));
+	}
+
+	@Test
+	public void testToUpperCamelCaseEmpty() {
+		assertEquals("", NameConverter.toUpperCamelCase(""));
+	}
+
+	@Test
+	public void testToUpperCamelCaseSingleWord() {
+		assertEquals("Employee", NameConverter.toUpperCamelCase("employee"));
+	}
+
+	@Test
+	public void testToUpperCamelCaseAllCaps() {
+		assertEquals("EmployeeName", NameConverter.toUpperCamelCase("EMPLOYEE_NAME"));
+	}
+
+	@Test
+	public void testToUpperCamelCaseWithSpaces() {
+		assertEquals("EmployeeName", NameConverter.toUpperCamelCase("employee name"));
+	}
+
+	@Test
+	public void testToUpperCamelCaseWithHyphens() {
+		assertEquals("EmployeeName", NameConverter.toUpperCamelCase("employee-name"));
+	}
+
+	@Test
+	public void testToUpperCamelCaseMultipleUnderscores() {
+		assertEquals("AbcDef", NameConverter.toUpperCamelCase("abc__def"));
+	}
+
+	@Test
+	public void testToUpperCamelCaseMixedCase() {
+		assertEquals("EmployeeName", NameConverter.toUpperCamelCase("employeeName"));
+	}
+
+	@Test
+	public void testToUpperCamelCaseSingleChar() {
+		assertEquals("A", NameConverter.toUpperCamelCase("a"));
+	}
+
+	@Test
+	public void testToUpperCamelCaseAlreadyCamelCase() {
+		assertEquals("EmployeeName", NameConverter.toUpperCamelCase("EmployeeName"));
+	}
+
+	// --- simplePluralize ---
+
+	@Test
+	public void testSimplePluralizeRegular() {
+		assertEquals("employees", NameConverter.simplePluralize("employee"));
+	}
+
+	@Test
+	public void testSimplePluralizeEndingInS() {
+		assertEquals("addresses", NameConverter.simplePluralize("address"));
+	}
+
+	@Test
+	public void testSimplePluralizeEndingInX() {
+		assertEquals("boxes", NameConverter.simplePluralize("box"));
+	}
+
+	@Test
+	public void testSimplePluralizeEndingInConsonantY() {
+		assertEquals("companies", NameConverter.simplePluralize("company"));
+	}
+
+	@Test
+	public void testSimplePluralizeEndingInVowelY() {
+		assertEquals("days", NameConverter.simplePluralize("day"));
+	}
+
+	@Test
+	public void testSimplePluralizeEndingInCh() {
+		assertEquals("watches", NameConverter.simplePluralize("watch"));
+	}
+
+	@Test
+	public void testSimplePluralizeEndingInSh() {
+		assertEquals("dishes", NameConverter.simplePluralize("dish"));
+	}
+
+	@Test
+	public void testSimplePluralizeEndingInTh() {
+		assertEquals("moths", NameConverter.simplePluralize("moth"));
+	}
+
+	// --- isReservedJavaKeyword ---
+
+	@Test
+	public void testIsReservedJavaKeywordTrue() {
+		assertTrue(NameConverter.isReservedJavaKeyword("class"));
+		assertTrue(NameConverter.isReservedJavaKeyword("int"));
+		assertTrue(NameConverter.isReservedJavaKeyword("abstract"));
+		assertTrue(NameConverter.isReservedJavaKeyword("synchronized"));
+		assertTrue(NameConverter.isReservedJavaKeyword("volatile"));
+	}
+
+	@Test
+	public void testIsReservedJavaKeywordFalse() {
+		assertFalse(NameConverter.isReservedJavaKeyword("employee"));
+		assertFalse(NameConverter.isReservedJavaKeyword("Class"));
+		assertFalse(NameConverter.isReservedJavaKeyword("INT"));
+		assertFalse(NameConverter.isReservedJavaKeyword(""));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/ReflectionUtilTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/ReflectionUtilTest.java
new file mode 100644
index 000000000000..7d6392b7e08d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/ReflectionUtilTest.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+public class ReflectionUtilTest {
+
+	@Test
+	public void testClassForName() throws Exception {
+		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+		assertNotNull(contextClassLoader);
+		try {
+			Class<?> clazz = ReflectionUtil.classForName("org.hibernate.tool.reveng.internal.util.ReflectionUtil");
+			assertSame(ReflectionUtil.class, clazz);
+			Thread.currentThread().setContextClassLoader(null);
+			clazz = ReflectionUtil.classForName("org.hibernate.tool.reveng.internal.util.ReflectionUtil");
+			assertSame(ReflectionUtil.class, clazz);
+		} finally {
+			Thread.currentThread().setContextClassLoader(contextClassLoader);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/SkipBackRefPropertyIteratorTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/SkipBackRefPropertyIteratorTest.java
new file mode 100644
index 000000000000..b4f78afb4a7e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/SkipBackRefPropertyIteratorTest.java
@@ -0,0 +1,86 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.hibernate.mapping.Property;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SkipBackRefPropertyIteratorTest {
+
+	private Property createProperty(String name, boolean backRef) {
+		Property p = new Property();
+		// backRef property names start with underscore by Hibernate convention
+		if (backRef) {
+			p.setName("_" + name + "BackRef");
+		} else {
+			p.setName(name);
+		}
+		return p;
+	}
+
+	@Test
+	public void testEmptyIterator() {
+		SkipBackRefPropertyIterator iter = new SkipBackRefPropertyIterator(Collections.emptyIterator());
+		assertFalse(iter.hasNext());
+	}
+
+	@Test
+	public void testAllNormalProperties() {
+		List<Property> props = Arrays.asList(
+				createProperty("name", false),
+				createProperty("age", false)
+		);
+		SkipBackRefPropertyIterator iter = new SkipBackRefPropertyIterator(props.iterator());
+
+		assertTrue(iter.hasNext());
+		assertEquals("name", iter.next().getName());
+		assertTrue(iter.hasNext());
+		assertEquals("age", iter.next().getName());
+		assertFalse(iter.hasNext());
+	}
+
+	@Test
+	public void testRemoveThrowsUnsupported() {
+		List<Property> props = List.of(createProperty("name", false));
+		SkipBackRefPropertyIterator iter = new SkipBackRefPropertyIterator(props.iterator());
+		assertThrows(UnsupportedOperationException.class, iter::remove);
+	}
+
+	@Test
+	public void testNextOnEmptyThrows() {
+		SkipBackRefPropertyIterator iter = new SkipBackRefPropertyIterator(Collections.emptyIterator());
+		assertThrows(NoSuchElementException.class, iter::next);
+	}
+
+	@Test
+	public void testSingleNormalProperty() {
+		List<Property> props = List.of(createProperty("id", false));
+		SkipBackRefPropertyIterator iter = new SkipBackRefPropertyIterator(props.iterator());
+		assertTrue(iter.hasNext());
+		assertEquals("id", iter.next().getName());
+		assertFalse(iter.hasNext());
+	}
+
+	@Test
+	public void testNextWithoutHasNext() {
+		List<Property> props = Arrays.asList(
+				createProperty("name", false),
+				createProperty("age", false)
+		);
+		SkipBackRefPropertyIterator iter = new SkipBackRefPropertyIterator(props.iterator());
+		assertEquals("name", iter.next().getName());
+		assertEquals("age", iter.next().getName());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/StringUtilTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/StringUtilTest.java
new file mode 100644
index 000000000000..f15444ef59b3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/StringUtilTest.java
@@ -0,0 +1,100 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class StringUtilTest {
+
+	@Test
+	public void testSplitWithSeparator() {
+		String[] result = StringUtil.split("a.b.c", ".");
+		assertArrayEquals(new String[] {"a", "b", "c"}, result);
+	}
+
+	@Test
+	public void testSplitWithNullSeparator() {
+		String[] result = StringUtil.split("hello world foo", null);
+		assertArrayEquals(new String[] {"hello", "world", "foo"}, result);
+	}
+
+	@Test
+	public void testSplitSingleToken() {
+		String[] result = StringUtil.split("hello", ".");
+		assertArrayEquals(new String[] {"hello"}, result);
+	}
+
+	@Test
+	public void testSplitWithMultiCharSeparator() {
+		String[] result = StringUtil.split("a,b;c", ",;");
+		assertArrayEquals(new String[] {"a", "b", "c"}, result);
+	}
+
+	@Test
+	public void testLeftPadShorterString() {
+		assertEquals("   hi", StringUtil.leftPad("hi", 5));
+	}
+
+	@Test
+	public void testLeftPadExactLength() {
+		assertEquals("hello", StringUtil.leftPad("hello", 5));
+	}
+
+	@Test
+	public void testLeftPadLongerString() {
+		assertEquals("hello", StringUtil.leftPad("hello", 3));
+	}
+
+	@Test
+	public void testLeftPadSingleChar() {
+		assertEquals("    x", StringUtil.leftPad("x", 5));
+	}
+
+	@Test
+	public void testIsEqualBothNull() {
+		assertTrue(StringUtil.isEqual(null, null));
+	}
+
+	@Test
+	public void testIsEqualSameString() {
+		assertTrue(StringUtil.isEqual("abc", "abc"));
+	}
+
+	@Test
+	public void testIsEqualDifferentStrings() {
+		assertFalse(StringUtil.isEqual("abc", "def"));
+	}
+
+	@Test
+	public void testIsEqualOneNull() {
+		assertFalse(StringUtil.isEqual("abc", null));
+		assertFalse(StringUtil.isEqual(null, "abc"));
+	}
+
+	@Test
+	public void testIsEmptyOrNullWithNull() {
+		assertTrue(StringUtil.isEmptyOrNull(null));
+	}
+
+	@Test
+	public void testIsEmptyOrNullWithEmpty() {
+		assertTrue(StringUtil.isEmptyOrNull(""));
+	}
+
+	@Test
+	public void testIsEmptyOrNullWithContent() {
+		assertFalse(StringUtil.isEmptyOrNull("hello"));
+	}
+
+	@Test
+	public void testIsEmptyOrNullWithWhitespace() {
+		assertFalse(StringUtil.isEmptyOrNull(" "));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/TableNameQualifierTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/TableNameQualifierTest.java
new file mode 100644
index 000000000000..aae161e9884f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/util/TableNameQualifierTest.java
@@ -0,0 +1,36 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class TableNameQualifierTest {
+
+	@Test
+	public void testQualifyAllParts() {
+		assertEquals("MY_CAT.MY_SCH.MY_TABLE",
+				TableNameQualifier.qualify("MY_CAT", "MY_SCH", "MY_TABLE"));
+	}
+
+	@Test
+	public void testQualifyNoCatalog() {
+		assertEquals("MY_SCH.MY_TABLE",
+				TableNameQualifier.qualify(null, "MY_SCH", "MY_TABLE"));
+	}
+
+	@Test
+	public void testQualifyNoSchema() {
+		assertEquals("MY_CAT.MY_TABLE",
+				TableNameQualifier.qualify("MY_CAT", null, "MY_TABLE"));
+	}
+
+	@Test
+	public void testQualifyTableOnly() {
+		assertEquals("MY_TABLE",
+				TableNameQualifier.qualify(null, null, "MY_TABLE"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/AbstractXMLPrettyPrinterStrategyTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/AbstractXMLPrettyPrinterStrategyTest.java
new file mode 100644
index 000000000000..49d511431cab
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/AbstractXMLPrettyPrinterStrategyTest.java
@@ -0,0 +1,105 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.xml;
+
+import org.junit.jupiter.api.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class AbstractXMLPrettyPrinterStrategyTest {
+
+	/**
+	 * Concrete subclass for testing.
+	 */
+	private static class TestableStrategy extends AbstractXMLPrettyPrinterStrategy {
+		@Override
+		public String prettyPrint(String xml) {
+			return xml;
+		}
+	}
+
+	private final TestableStrategy strategy = new TestableStrategy();
+
+	@Test
+	public void testNewDocumentParsesXml() throws Exception {
+		String xml = "<root><child>text</child></root>";
+		Document doc = strategy.newDocument(xml, "UTF-8");
+
+		assertNotNull(doc);
+		assertEquals("root", doc.getDocumentElement().getTagName());
+		assertEquals(1, doc.getDocumentElement().getChildNodes().getLength());
+	}
+
+	@Test
+	public void testNewDocumentWithAttributes() throws Exception {
+		String xml = "<root attr=\"value\"><child id=\"1\"/></root>";
+		Document doc = strategy.newDocument(xml, "UTF-8");
+
+		assertEquals("value", doc.getDocumentElement().getAttribute("attr"));
+	}
+
+	@Test
+	public void testNewDocumentWithMultipleChildren() throws Exception {
+		String xml = "<root><a/><b/><c/></root>";
+		Document doc = strategy.newDocument(xml, "UTF-8");
+
+		assertEquals("root", doc.getDocumentElement().getTagName());
+		NodeList children = doc.getDocumentElement().getChildNodes();
+		assertEquals(3, children.getLength());
+	}
+
+	@Test
+	public void testRemoveWhitespace() throws Exception {
+		String xml = "<root>  \n  <child>text</child>  \n  </root>";
+		Document doc = strategy.newDocument(xml, "UTF-8");
+
+		// Before removal, whitespace text nodes exist alongside the child element
+		assertTrue(doc.getDocumentElement().getChildNodes().getLength() > 1);
+
+		strategy.removeWhitespace(doc);
+
+		// After removal, only the child element remains
+		int afterCount = doc.getDocumentElement().getChildNodes().getLength();
+		assertEquals(1, afterCount);
+		assertEquals("child", doc.getDocumentElement().getChildNodes().item(0).getNodeName());
+	}
+
+	@Test
+	public void testRemoveWhitespacePreservesContent() throws Exception {
+		String xml = "<root><child>  content with spaces  </child></root>";
+		Document doc = strategy.newDocument(xml, "UTF-8");
+
+		strategy.removeWhitespace(doc);
+
+		assertEquals("  content with spaces  ",
+				doc.getDocumentElement().getFirstChild().getTextContent());
+	}
+
+	@Test
+	public void testRemoveWhitespaceNested() throws Exception {
+		String xml = "<root>\n  <parent>\n    <child>text</child>\n  </parent>\n</root>";
+		Document doc = strategy.newDocument(xml, "UTF-8");
+
+		strategy.removeWhitespace(doc);
+
+		assertEquals(1, doc.getDocumentElement().getChildNodes().getLength());
+		assertEquals("parent", doc.getDocumentElement().getFirstChild().getNodeName());
+		assertEquals(1, doc.getDocumentElement().getFirstChild().getChildNodes().getLength());
+	}
+
+	@Test
+	public void testNewDocumentWithEncoding() throws Exception {
+		String xml = "<root><item>Ünïcödë</item></root>";
+		Document doc = strategy.newDocument(xml, "UTF-8");
+
+		assertNotNull(doc);
+		assertEquals("Ünïcödë", doc.getDocumentElement().getFirstChild().getTextContent());
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/DOM3LSPrettyPrinterStrategyTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/DOM3LSPrettyPrinterStrategyTest.java
new file mode 100644
index 000000000000..97ebd5194a3d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/DOM3LSPrettyPrinterStrategyTest.java
@@ -0,0 +1,56 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.xml;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DOM3LSPrettyPrinterStrategyTest {
+
+	@Test
+	public void testPrettyPrintSimpleXml() throws Exception {
+		DOM3LSPrettyPrinterStrategy strategy = new DOM3LSPrettyPrinterStrategy();
+		String input = "<root><child>text</child></root>";
+		String result = strategy.prettyPrint(input);
+		assertTrue(result.contains("<root>"));
+		assertTrue(result.contains("<child>text</child>"));
+		assertTrue(result.contains("</root>"));
+	}
+
+	@Test
+	public void testPrettyPrintWithAttributes() throws Exception {
+		DOM3LSPrettyPrinterStrategy strategy = new DOM3LSPrettyPrinterStrategy();
+		String input = "<root attr=\"value\"><child/></root>";
+		String result = strategy.prettyPrint(input);
+		assertTrue(result.contains("attr=\"value\""));
+	}
+
+	@Test
+	public void testOutputCommentsGetterSetter() {
+		DOM3LSPrettyPrinterStrategy strategy = new DOM3LSPrettyPrinterStrategy();
+		assertFalse(strategy.isOutputComments());
+		strategy.setOutputComments(true);
+		assertTrue(strategy.isOutputComments());
+	}
+
+	@Test
+	public void testPrettyPrintWithComments() throws Exception {
+		DOM3LSPrettyPrinterStrategy strategy = new DOM3LSPrettyPrinterStrategy();
+		strategy.setOutputComments(true);
+		String input = "<root><!-- a comment --><child/></root>";
+		String result = strategy.prettyPrint(input);
+		assertTrue(result.contains("a comment"));
+	}
+
+	@Test
+	public void testPrettyPrintNestedElements() throws Exception {
+		DOM3LSPrettyPrinterStrategy strategy = new DOM3LSPrettyPrinterStrategy();
+		String input = "<root><parent><child><grandchild/></child></parent></root>";
+		String result = strategy.prettyPrint(input);
+		assertTrue(result.contains("<grandchild/>") || result.contains("<grandchild></grandchild>"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/TrAXPrettyPrinterStrategyTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/TrAXPrettyPrinterStrategyTest.java
new file mode 100644
index 000000000000..653a5f6936ba
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/TrAXPrettyPrinterStrategyTest.java
@@ -0,0 +1,68 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.xml;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TrAXPrettyPrinterStrategyTest {
+
+	@Test
+	public void testPrettyPrintSimpleXml() throws Exception {
+		TrAXPrettyPrinterStrategy strategy = new TrAXPrettyPrinterStrategy();
+		strategy.setOmitXmlDeclaration(true);
+		String input = "<root><child>text</child></root>";
+		String result = strategy.prettyPrint(input);
+		assertTrue(result.contains("<root>"));
+		assertTrue(result.contains("<child>text</child>"));
+		assertTrue(result.contains("</root>"));
+	}
+
+	@Test
+	public void testPrettyPrintWithAttributes() throws Exception {
+		TrAXPrettyPrinterStrategy strategy = new TrAXPrettyPrinterStrategy();
+		strategy.setOmitXmlDeclaration(true);
+		String input = "<root attr=\"value\"><child/></root>";
+		String result = strategy.prettyPrint(input);
+		assertTrue(result.contains("attr=\"value\""));
+	}
+
+	@Test
+	public void testIndentGetterSetter() {
+		TrAXPrettyPrinterStrategy strategy = new TrAXPrettyPrinterStrategy();
+		assertEquals(4, strategy.getIndent());
+		strategy.setIndent(2);
+		assertEquals(2, strategy.getIndent());
+	}
+
+	@Test
+	public void testOmitXmlDeclarationGetterSetter() {
+		TrAXPrettyPrinterStrategy strategy = new TrAXPrettyPrinterStrategy();
+		assertFalse(strategy.isOmitXmlDeclaration());
+		strategy.setOmitXmlDeclaration(true);
+		assertTrue(strategy.isOmitXmlDeclaration());
+	}
+
+	@Test
+	public void testPrettyPrintWithXmlDeclaration() throws Exception {
+		TrAXPrettyPrinterStrategy strategy = new TrAXPrettyPrinterStrategy();
+		strategy.setOmitXmlDeclaration(false);
+		String input = "<root><child/></root>";
+		String result = strategy.prettyPrint(input);
+		assertTrue(result.contains("<?xml"));
+	}
+
+	@Test
+	public void testPrettyPrintWithoutXmlDeclaration() throws Exception {
+		TrAXPrettyPrinterStrategy strategy = new TrAXPrettyPrinterStrategy();
+		strategy.setOmitXmlDeclaration(true);
+		String input = "<root><child/></root>";
+		String result = strategy.prettyPrint(input);
+		assertFalse(result.contains("<?xml"));
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/XMLPrettyPrinterStrategyFactoryTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/XMLPrettyPrinterStrategyFactoryTest.java
new file mode 100644
index 000000000000..cc3c5599f9b2
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/XMLPrettyPrinterStrategyFactoryTest.java
@@ -0,0 +1,61 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.xml;
+
+import org.hibernate.tool.reveng.api.xml.XMLPrettyPrinterStrategy;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class XMLPrettyPrinterStrategyFactoryTest {
+
+	@Test
+	public void testNewXMLPrettyPrinterStrategyDefault() {
+		XMLPrettyPrinterStrategy strategy = XMLPrettyPrinterStrategyFactory.newXMLPrettyPrinterStrategy();
+		assertNotNull(strategy);
+		assertInstanceOf(TrAXPrettyPrinterStrategy.class, strategy);
+	}
+
+	@Test
+	public void testNewXMLPrettyPrinterStrategyFromSystemProperty() {
+		String original = System.getProperty(XMLPrettyPrinterStrategyFactory.PROPERTY_STRATEGY_IMPL);
+		try {
+			System.setProperty(XMLPrettyPrinterStrategyFactory.PROPERTY_STRATEGY_IMPL,
+					TrAXPrettyPrinterStrategy.class.getName());
+			XMLPrettyPrinterStrategy strategy = XMLPrettyPrinterStrategyFactory.newXMLPrettyPrinterStrategy();
+			assertNotNull(strategy);
+			assertInstanceOf(TrAXPrettyPrinterStrategy.class, strategy);
+		}
+		finally {
+			if (original != null) {
+				System.setProperty(XMLPrettyPrinterStrategyFactory.PROPERTY_STRATEGY_IMPL, original);
+			}
+			else {
+				System.clearProperty(XMLPrettyPrinterStrategyFactory.PROPERTY_STRATEGY_IMPL);
+			}
+		}
+	}
+
+	@Test
+	public void testNewXMLPrettyPrinterStrategyInvalidClass() {
+		String original = System.getProperty(XMLPrettyPrinterStrategyFactory.PROPERTY_STRATEGY_IMPL);
+		try {
+			System.setProperty(XMLPrettyPrinterStrategyFactory.PROPERTY_STRATEGY_IMPL,
+					"com.nonexistent.Strategy");
+			assertThrows(RuntimeException.class,
+					XMLPrettyPrinterStrategyFactory::newXMLPrettyPrinterStrategy);
+		}
+		finally {
+			if (original != null) {
+				System.setProperty(XMLPrettyPrinterStrategyFactory.PROPERTY_STRATEGY_IMPL, original);
+			}
+			else {
+				System.clearProperty(XMLPrettyPrinterStrategyFactory.PROPERTY_STRATEGY_IMPL);
+			}
+		}
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/XMLPrettyPrinterTest.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/XMLPrettyPrinterTest.java
new file mode 100644
index 000000000000..b5a53ad96336
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/internal/xml/XMLPrettyPrinterTest.java
@@ -0,0 +1,94 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.internal.xml;
+
+import org.hibernate.tool.reveng.api.xml.XMLPrettyPrinterStrategy;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class XMLPrettyPrinterTest {
+
+	@Test
+	public void testFactoryReturnsDefaultStrategy() {
+		XMLPrettyPrinterStrategy strategy = XMLPrettyPrinterStrategyFactory.newXMLPrettyPrinterStrategy();
+		assertNotNull(strategy);
+		assertInstanceOf(TrAXPrettyPrinterStrategy.class, strategy);
+	}
+
+	@Test
+	public void testTrAXPrettyPrintSimpleXml() throws Exception {
+		TrAXPrettyPrinterStrategy strategy = new TrAXPrettyPrinterStrategy();
+		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root><child>text</child></root>";
+		String result = strategy.prettyPrint(xml);
+		assertNotNull(result);
+		assertTrue(result.contains("<root>"));
+		assertTrue(result.contains("<child>"));
+		assertTrue(result.contains("text"));
+	}
+
+	@Test
+	public void testTrAXIndentSettings() {
+		TrAXPrettyPrinterStrategy strategy = new TrAXPrettyPrinterStrategy();
+		strategy.setIndent(2);
+		assertEquals(2, strategy.getIndent());
+	}
+
+	@Test
+	public void testTrAXOmitXmlDeclaration() throws Exception {
+		TrAXPrettyPrinterStrategy strategy = new TrAXPrettyPrinterStrategy();
+		strategy.setOmitXmlDeclaration(true);
+		assertTrue(strategy.isOmitXmlDeclaration());
+
+		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root><child/></root>";
+		String result = strategy.prettyPrint(xml);
+		assertNotNull(result);
+	}
+
+	@Test
+	public void testDOM3LSPrettyPrint() throws Exception {
+		DOM3LSPrettyPrinterStrategy strategy = new DOM3LSPrettyPrinterStrategy();
+		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root><child>text</child></root>";
+		String result = strategy.prettyPrint(xml);
+		assertNotNull(result);
+		assertTrue(result.contains("<root>"));
+		assertTrue(result.contains("<child>"));
+	}
+
+	@Test
+	public void testDOM3LSOutputComments() {
+		DOM3LSPrettyPrinterStrategy strategy = new DOM3LSPrettyPrinterStrategy();
+		strategy.setOutputComments(true);
+		assertTrue(strategy.isOutputComments());
+	}
+
+	@Test
+	public void testTrAXPrettyPrintWithNestedElements() throws Exception {
+		TrAXPrettyPrinterStrategy strategy = new TrAXPrettyPrinterStrategy();
+		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+				"<root><parent><child1>a</child1><child2>b</child2></parent></root>";
+		String result = strategy.prettyPrint(xml);
+		assertNotNull(result);
+		assertTrue(result.contains("<parent>"));
+		assertTrue(result.contains("<child1>"));
+		assertTrue(result.contains("<child2>"));
+	}
+
+	@Test
+	public void testDOM3LSPrettyPrintWithComments() throws Exception {
+		DOM3LSPrettyPrinterStrategy strategy = new DOM3LSPrettyPrinterStrategy();
+		strategy.setOutputComments(true);
+		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root><!-- comment --><child/></root>";
+		String result = strategy.prettyPrint(xml);
+		assertNotNull(result);
+		assertTrue(result.contains("<root>"));
+	}
+
+	private void assertEquals(int expected, int actual) {
+		org.junit.jupiter.api.Assertions.assertEquals(expected, actual);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/issues/hbx1093/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/issues/hbx1093/TestCase.java
new file mode 100644
index 000000000000..88acd87b1973
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/issues/hbx1093/TestCase.java
@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.issues.hbx1093;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.internal.core.strategy.AbstractStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author koen
+ */
+public class TestCase {
+
+	@TempDir
+	public File outputDir = new File("output");
+
+	private MetadataDescriptor metadataDescriptor = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		AbstractStrategy c = new DefaultStrategy();
+		c.setSettings(new RevengSettings(c).setDetectManyToMany(true));
+		metadataDescriptor = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(c, null);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testGenerateJava() throws IOException {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.getProperties().setProperty("ejb3", "true");
+		exporter.start();
+		File etManyToManyComp1 = new File(outputDir, "EtManyToManyComp1.java");
+		String str = new String(Files.readAllBytes(etManyToManyComp1.toPath()));
+		assertTrue(str.contains("@JoinColumn(name=\"FK_ET_MANY_TO_MANY_COMP22_ID\""));
+		File etManyToManyComp2 = new File(outputDir, "EtManyToManyComp2.java");
+		str = new String(Files.readAllBytes(etManyToManyComp2.toPath()));
+		assertTrue(str.contains("@JoinColumn(name=\"FK_ET_MANY_TO_MANY_COMP11_ID\""));
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/issues/hbx2840/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/issues/hbx2840/TestCase.java
new file mode 100644
index 000000000000..9ba8a5601f38
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/issues/hbx2840/TestCase.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.issues.hbx2840;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+/**
+ * Test verifies that a foreign key to a table with a composite ID works.
+ */
+public class TestCase {
+
+	@TempDir
+	public File outputDir = new File( "output" );
+
+	@BeforeEach
+	void setUp() {
+		JdbcUtil.createDatabase( this );
+		Exporter exporter = ExporterFactory.createExporter( ExporterType.JAVA );
+		exporter.getProperties().put(
+				ExporterConstants.METADATA_DESCRIPTOR,
+				MetadataDescriptorFactory.createReverseEngineeringDescriptor( null, null )
+		);
+		exporter.getProperties().put( ExporterConstants.DESTINATION_FOLDER, outputDir );
+		exporter.getProperties().put( ExporterConstants.TEMPLATE_PATH, new String[0] );
+		exporter.getProperties().setProperty( "ejb3", "true" );
+		exporter.start();
+	}
+
+	@AfterEach
+	void tearDown() {
+		JdbcUtil.dropDatabase( this );
+	}
+
+	@Test
+	void testFileExistence() {
+		JUnitUtil.assertIsNonEmptyFile( new File( outputDir.getAbsolutePath() + "/Parent.java" ) );
+		JUnitUtil.assertIsNonEmptyFile( new File( outputDir.getAbsolutePath() + "/Child.java" ) );
+		JUnitUtil.assertIsNonEmptyFile( new File( outputDir.getAbsolutePath() + "/ParentId.java" ) );
+		JUnitUtil.assertIsNonEmptyFile( new File( outputDir.getAbsolutePath() + "/ChildId.java" ) );
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/AutoQuote/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/AutoQuote/TestCase.java
new file mode 100644
index 000000000000..84499d313d3e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/AutoQuote/TestCase.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.AutoQuote;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testForQuotes() {
+		Table table = HibernateUtil.getTable(metadata, "us-ers");
+		assertNotNull(table);
+		assertTrue(table.isQuoted());
+		assertEquals(2, table.getColumnSpan());
+		PersistentClass classMapping = metadata.getEntityBinding("Worklogs");
+		assertNotNull(classMapping);
+		Property property = classMapping.getProperty("usErs");
+		assertNotNull(property);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Basic/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Basic/TestCase.java
new file mode 100644
index 000000000000..2b1f7166cda3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Basic/TestCase.java
@@ -0,0 +1,91 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.Basic;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.PrimaryKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testBasic() {
+		JUnitUtil.assertIteratorContainsExactly(
+				"There should be three tables!",
+				metadata.getEntityBindings().iterator(),
+				3);
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "BASIC"));
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "BASIC"),
+				JdbcUtil.toIdentifier(this, table.getName()));
+		assertEquals(2, table.getColumnSpan());
+		Column basicColumn = table.getColumn(0);
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "A"),
+				JdbcUtil.toIdentifier(this, basicColumn.getName()));
+		PrimaryKey key = table.getPrimaryKey();
+		assertNotNull(key, "There should be a primary key!");
+		assertEquals(1, key.getColumnSpan());
+		Column column = key.getColumn(0);
+		assertTrue(column.isUnique());
+		assertSame(basicColumn, column);
+	}
+
+	@Test
+	public void testScalePrecisionLength() {
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "BASIC"));
+		Column nameCol = table.getColumn(new Column(JdbcUtil.toIdentifier(this, "NAME")));
+		assertEquals(20, nameCol.getLength().intValue());
+		assertNull(nameCol.getPrecision());
+		assertNull(nameCol.getScale());
+	}
+
+	@Test
+	public void testCompositeKeys() {
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "MULTIKEYED"));
+		PrimaryKey primaryKey = table.getPrimaryKey();
+		assertEquals(2, primaryKey.getColumnSpan());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/BasicMultiSchema/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/BasicMultiSchema/TestCase.java
new file mode 100644
index 000000000000..0fa994ba494e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/BasicMultiSchema/TestCase.java
@@ -0,0 +1,100 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.BasicMultiSchema;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.PrimaryKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+@SuppressWarnings("DuplicatedCode")
+public class TestCase {
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testBasic() {
+
+		JUnitUtil.assertIteratorContainsExactly(
+				"There should be three tables!",
+				metadata.getEntityBindings().iterator(),
+				3);
+
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "BASIC" ) );
+
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "BASIC"),
+				JdbcUtil.toIdentifier(this, table.getName()) );
+		assertEquals( 2, table.getColumnSpan() );
+
+		Column basicColumn = table.getColumn( 0 );
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "A"),
+				JdbcUtil.toIdentifier(this, basicColumn.getName() ));
+
+		PrimaryKey key = table.getPrimaryKey();
+		assertNotNull(key, "There should be a primary key!" );
+		assertEquals(1, key.getColumnSpan());
+
+		Column column = key.getColumn( 0 );
+		assertTrue( column.isUnique() );
+
+		assertSame( basicColumn, column );
+
+	}
+
+	@Test
+	public void testScalePrecisionLength() {
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "BASIC" ) );
+		Column nameCol = table.getColumn( new Column( JdbcUtil.toIdentifier(this, "NAME" ) ) );
+		assertEquals(20, nameCol.getLength().intValue());
+		assertNull(nameCol.getPrecision());
+		assertNull(nameCol.getScale());
+	}
+
+	@Test
+	public void testCompositeKeys() {
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "MULTIKEYED"));
+		PrimaryKey primaryKey = table.getPrimaryKey();
+		assertEquals( 2, primaryKey.getColumnSpan() );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/TestCase.java
new file mode 100644
index 000000000000..d70c2c15efe4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/TestCase.java
@@ -0,0 +1,230 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.CompositeId;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * @author max
+ * @author koen
+ */
+@SuppressWarnings("DuplicatedCode")
+public class TestCase {
+
+	private MetadataDescriptor metadataDescriptor = null;
+	private RevengStrategy reverseEngineeringStrategy = null;
+
+	@TempDir
+	public File outputDir = new File("output");
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		reverseEngineeringStrategy = new DefaultStrategy();
+		metadataDescriptor = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(reverseEngineeringStrategy, null);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testMultiColumnForeignKeys() {
+		Metadata metadata = metadataDescriptor.createMetadata();
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "LINE_ITEM") );
+		assertNotNull(table);
+		ForeignKey foreignKey = HibernateUtil.getForeignKey(
+				table,
+				JdbcUtil.toIdentifier(this, "TO_CUSTOMER_ORDER") );
+		assertNotNull(foreignKey);
+		assertEquals(
+				reverseEngineeringStrategy.tableToClassName(
+						TableIdentifier.create(
+								null,
+								null,
+								JdbcUtil.toIdentifier(this, "CUSTOMER_ORDER"))),
+				foreignKey.getReferencedEntityName() );
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "LINE_ITEM"),
+				foreignKey.getTable().getName() );
+		assertEquals(2,foreignKey.getColumnSpan() );
+		assertEquals("CUSTOMER_ID_REF", foreignKey.getColumn(0).getName());
+		assertEquals("ORDER_NUMBER", foreignKey.getColumn(1).getName());
+		Table tab = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "CUSTOMER_ORDER"));
+		assertEquals("CUSTOMER_ID", tab.getPrimaryKey().getColumn(0).getName());
+		assertEquals("ORDER_NUMBER", tab.getPrimaryKey().getColumn(1).getName());
+		PersistentClass lineMapping = metadata.getEntityBinding(
+				reverseEngineeringStrategy.tableToClassName(
+						TableIdentifier.create(
+								null,
+								null,
+								JdbcUtil.toIdentifier(this, "LINE_ITEM"))));
+		assertEquals(4,lineMapping.getIdentifier().getColumnSpan() );
+		Iterator<Column> columnIterator = lineMapping.getIdentifier().getColumns().iterator();
+		assertEquals("CUSTOMER_ID_REF", columnIterator.next().getName());
+		assertEquals("EXTRA_PROD_ID", columnIterator.next().getName());
+		assertEquals("ORDER_NUMBER", columnIterator.next().getName());
+	}
+
+	@Test
+	public void testPossibleKeyManyToOne() {
+		PersistentClass product = metadataDescriptor.createMetadata().getEntityBinding(
+				reverseEngineeringStrategy.tableToClassName(
+						TableIdentifier.create(
+								null,
+								null,
+								JdbcUtil.toIdentifier(this, "CUSTOMER_ORDER"))));
+		Property identifierProperty = product.getIdentifierProperty();
+		assertInstanceOf(Component.class, identifierProperty.getValue());
+		Component cmpid = (Component) identifierProperty.getValue();
+		assertEquals(2, cmpid.getPropertySpan() );
+		Iterator<?> iter = cmpid.getProperties().iterator();
+		Property id = (Property) iter.next();
+		Property extraId = (Property) iter.next();
+		assertEquals(
+				reverseEngineeringStrategy.columnToPropertyName(
+						null,
+						"CUSTOMER_ID"),
+				id.getName() );
+		assertEquals(
+				reverseEngineeringStrategy.columnToPropertyName(
+						null,
+						"ORDER_NUMBER"),
+				extraId.getName() );
+		assertFalse(id.getValue() instanceof ManyToOne);
+		assertFalse(extraId.getValue() instanceof ManyToOne);
+	}
+
+	@Test
+	public void testKeyProperty() {
+		PersistentClass product = metadataDescriptor.createMetadata().getEntityBinding(
+				reverseEngineeringStrategy.tableToClassName(
+						TableIdentifier.create(
+								null,
+								null,
+								JdbcUtil.toIdentifier(this, "PRODUCT"))));
+		Property identifierProperty = product.getIdentifierProperty();
+		assertInstanceOf(Component.class, identifierProperty.getValue());
+		Component cmpid = (Component) identifierProperty.getValue();
+		assertEquals(2, cmpid.getPropertySpan() );
+		Iterator<?> iter = cmpid.getProperties().iterator();
+		Property id = (Property)iter.next();
+		Property extraId = (Property)iter.next();
+		if ("extraId".equals(id.getName())) {
+			Property temp = id;
+			id = extraId;
+			extraId = temp;
+		}
+		assertEquals(
+				reverseEngineeringStrategy.columnToPropertyName(
+						null,
+						"PRODUCT_ID"),
+				id.getName() );
+		assertEquals(
+				reverseEngineeringStrategy.columnToPropertyName(
+						null,
+						"EXTRA_ID"),
+				extraId.getName() );
+		assertFalse(id.getValue() instanceof ManyToOne);
+		assertFalse(extraId.getValue() instanceof ManyToOne);
+	}
+
+	@Test
+	public void testGeneration() throws Exception {
+		Exporter exporter = new HbmExporter();
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		Exporter javaExp = ExporterFactory.createExporter(ExporterType.JAVA);
+		javaExp.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		javaExp.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.start();
+		javaExp.start();
+		JavaUtil.compile(outputDir);
+		URL[] urls = new URL[] { outputDir.toURI().toURL() };
+		URLClassLoader ucl = new URLClassLoader(
+				urls,
+				Thread.currentThread().getContextClassLoader());
+		File[] files = new File[6];
+		files[0] = new File(outputDir, "SimpleCustomerOrder.hbm.xml");
+		files[1] = new File(outputDir, "SimpleLineItem.hbm.xml");
+		files[2] = new File(outputDir, "Product.hbm.xml");
+		files[3] = new File(outputDir, "Customer.hbm.xml");
+		files[4] = new File(outputDir, "LineItem.hbm.xml");
+		files[5] = new File(outputDir, "CustomerOrder.hbm.xml");
+		Thread.currentThread().setContextClassLoader(ucl);
+		SessionFactory factory = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files, null)
+				.createMetadata()
+				.buildSessionFactory();
+		Session session = factory.openSession();
+		JdbcUtil.populateDatabase(this);
+		session.createQuery("from LineItem", null).getResultList();
+		List<?> list = session.createQuery("from Product", null).getResultList();
+		assertEquals(2,list.size() );
+		list = session
+				.createQuery("select li.customerOrder.id from LineItem as li", null)
+				.getResultList();
+		assertFalse(list.isEmpty());
+		Class<?> productIdClass = ucl.loadClass("ProductId");
+		Constructor<?> productIdClassConstructor = productIdClass.getConstructor();
+		Object object = productIdClassConstructor.newInstance();
+		int hash = -1;
+		try {
+			hash = object.hashCode();
+		} catch(Throwable t) {
+			fail("Hashcode on new instance should not fail " + t);
+		}
+		assertNotEquals(hash, System.identityHashCode(object), "hashcode should be different from system");
+		factory.close();
+		Thread.currentThread().setContextClassLoader(ucl.getParent() );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/ForeignKeys/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/ForeignKeys/TestCase.java
new file mode 100644
index 000000000000..d5750751aed2
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/ForeignKeys/TestCase.java
@@ -0,0 +1,118 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.ForeignKeys;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.hibernate.tool.schema.TargetType;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.EnumSet;
+import java.util.Iterator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private Metadata metadata = null;
+	private RevengStrategy reverseEngineeringStrategy = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		reverseEngineeringStrategy = new DefaultStrategy();
+		metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(reverseEngineeringStrategy, null)
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testMultiRefs() {
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "CONNECTION") );
+		ForeignKey foreignKey = HibernateUtil.getForeignKey(
+				table,
+				JdbcUtil.toIdentifier(this, "CON2MASTER") );
+		assertNotNull(foreignKey);
+		assertEquals(
+				reverseEngineeringStrategy.tableToClassName(
+						TableIdentifier.create(null, null, "MASTER")),
+				foreignKey.getReferencedEntityName() );
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "CONNECTION"),
+				foreignKey.getTable().getName() );
+		assertEquals(
+				HibernateUtil.getTable(
+						metadata,
+						JdbcUtil.toIdentifier(this, "MASTER") ),
+				foreignKey.getReferencedTable() );
+		assertNotNull(
+				HibernateUtil.getForeignKey(
+						table,
+						JdbcUtil.toIdentifier(this, "CHILDREF1") ) );
+		assertNotNull(
+				HibernateUtil.getForeignKey(
+						table,
+						JdbcUtil.toIdentifier(this, "CHILDREF2") ) );
+		assertNull(
+				HibernateUtil.getForeignKey(
+						table,
+						JdbcUtil.toIdentifier(this, "DUMMY") ) );
+		JUnitUtil.assertIteratorContainsExactly(null, table.getForeignKeyCollection().iterator(), 3);
+	}
+
+	@Test
+	public void testMasterChild() {
+		assertNotNull(HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "MASTER")));
+		Table child = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "CHILD") );
+		Iterator<?> iterator = child.getForeignKeyCollection().iterator();
+		ForeignKey fk = (ForeignKey) iterator.next();
+		assertFalse(iterator.hasNext(), "should only be one fk" );
+		assertEquals(1, fk.getColumnSpan() );
+		assertSame(
+				fk.getColumn(0),
+				child.getColumn(
+						new Column(JdbcUtil.toIdentifier(this, "MASTERREF"))));
+	}
+
+	@Test
+	public void testExport() {
+		SchemaExport schemaExport = new SchemaExport();
+		final EnumSet<TargetType> targetTypes = EnumSet.noneOf( TargetType.class );
+		targetTypes.add( TargetType.STDOUT );
+		schemaExport.create(targetTypes, metadata);
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Identity/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Identity/TestCase.java
new file mode 100644
index 000000000000..50d967162c16
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Identity/TestCase.java
@@ -0,0 +1,61 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.Identity;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedValue;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testIdentity() {
+
+		PersistentClass classMapping = metadata.getEntityBinding("Autoinc");
+		assertNotNull(classMapping);
+		assertEquals(
+				"identity",
+				((EnhancedValue)classMapping
+						.getIdentifierProperty()
+						.getValue())
+					.getIdentifierGeneratorStrategy());
+
+		classMapping = metadata.getEntityBinding("Noautoinc");
+		assertEquals(
+				"assigned",
+				((EnhancedValue)classMapping
+						.getIdentifierProperty()
+						.getValue())
+					.getIdentifierGeneratorStrategy());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Index/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Index/TestCase.java
new file mode 100644
index 000000000000..fd5936582fd6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Index/TestCase.java
@@ -0,0 +1,101 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.Index;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Index;
+import org.hibernate.mapping.Selectable;
+import org.hibernate.mapping.Table;
+import org.hibernate.mapping.UniqueKey;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Iterator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testUniqueKey() {
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "WITH_INDEX") );
+		UniqueKey uniqueKey = table.getUniqueKey(
+				JdbcUtil.toIdentifier(this, "OTHER_IDX") );
+		assertNotNull(uniqueKey);
+		assertEquals(1, uniqueKey.getColumnSpan() );
+		Column keyCol = uniqueKey.getColumn(0);
+		assertTrue(keyCol.isUnique() );
+		assertSame(keyCol, table.getColumn(keyCol) );
+	}
+
+	@Test
+	public void testWithIndex() {
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "WITH_INDEX"));
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "WITH_INDEX"),
+				JdbcUtil.toIdentifier(this, table.getName()));
+		assertNull(table.getPrimaryKey(), "there should be no pk" );
+		Iterator<Index> iterator = table.getIndexes().values().iterator();
+		int cnt=0;
+		while(iterator.hasNext() ) {
+			iterator.next();
+			cnt++;
+		}
+		assertEquals(1, cnt);
+		Index index = table.getIndex(JdbcUtil.toIdentifier(this, "MY_INDEX") );
+		assertNotNull(index, "No index ?");
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "MY_INDEX"),
+				JdbcUtil.toIdentifier(this, index.getName()));
+		assertEquals(2, index.getColumnSpan() );
+		assertSame(index.getTable(), table);
+		Iterator<Selectable> cols = index.getSelectables().iterator();
+		Column col1 = (Column)cols.next();
+		Column col2 = (Column)cols.next();
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "ONE"),
+				JdbcUtil.toIdentifier(this, col1.getName()));
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "THREE"),
+				JdbcUtil.toIdentifier(this, col2.getName()));
+		Column example = new Column();
+		example.setName(col2.getName() );
+		assertSame(
+				table.getColumn(example), col2, "column with same name should be same instance!");
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/TestCase.java
new file mode 100644
index 000000000000..13eec8b7f54d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/TestCase.java
@@ -0,0 +1,215 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.KeyPropertyCompositeId;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.ManyToOne;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * @author max
+ * @author koen
+ */
+@SuppressWarnings("DuplicatedCode")
+public class TestCase {
+
+	@TempDir
+	public File outputDir = new File("output");
+
+	private MetadataDescriptor metadataDescriptor = null;
+	private RevengStrategy reverseEngineeringStrategy = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		reverseEngineeringStrategy = new DefaultStrategy();
+		Properties properties = new Properties();
+		properties.put(MetadataConstants.PREFER_BASIC_COMPOSITE_IDS, false);
+		metadataDescriptor = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(reverseEngineeringStrategy, properties);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testMultiColumnForeignKeys() {
+		Metadata metadata = metadataDescriptor.createMetadata();
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "LINE_ITEM"));
+		assertNotNull(table);
+		ForeignKey foreignKey = HibernateUtil.getForeignKey(table, JdbcUtil.toIdentifier(this, "TO_CUSTOMER_ORDER"));
+		assertNotNull(foreignKey);
+		assertEquals(
+				reverseEngineeringStrategy.tableToClassName(
+						TableIdentifier.create(null, null, JdbcUtil.toIdentifier(this, "CUSTOMER_ORDER"))),
+				foreignKey.getReferencedEntityName());
+		assertEquals(JdbcUtil.toIdentifier(this, "LINE_ITEM"), foreignKey.getTable().getName());
+		assertEquals(2, foreignKey.getColumnSpan());
+		assertEquals("CUSTOMER_ID_REF", foreignKey.getColumn(0).getName());
+		assertEquals("ORDER_NUMBER", foreignKey.getColumn(1).getName());
+		Table tab = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "CUSTOMER_ORDER"));
+		assertEquals("CUSTOMER_ID", tab.getPrimaryKey().getColumn(0).getName());
+		assertEquals("ORDER_NUMBER", tab.getPrimaryKey().getColumn(1).getName());
+		PersistentClass lineMapping = metadata.getEntityBinding(
+				reverseEngineeringStrategy
+					.tableToClassName(TableIdentifier.create(null, null, JdbcUtil.toIdentifier(this, "LINE_ITEM"))));
+		assertEquals(4, lineMapping.getIdentifier().getColumnSpan());
+		Iterator<Column> columnIterator = lineMapping.getIdentifier().getColumns().iterator();
+		assertEquals("CUSTOMER_ID_REF", columnIterator.next().getName());
+		assertEquals("ORDER_NUMBER", columnIterator.next().getName());
+	}
+
+	@Test
+	public void testPossibleKeyManyToOne() {
+		PersistentClass product = metadataDescriptor.createMetadata().getEntityBinding(
+				reverseEngineeringStrategy
+					.tableToClassName(TableIdentifier.create(null, null, JdbcUtil.toIdentifier(this, "CUSTOMER_ORDER"))));
+		Property identifierProperty = product.getIdentifierProperty();
+		assertInstanceOf(Component.class, identifierProperty.getValue());
+		Component cmpid = (Component) identifierProperty.getValue();
+		assertEquals(2, cmpid.getPropertySpan());
+		Iterator<?> iter = cmpid.getProperties().iterator();
+		Property id = (Property) iter.next();
+		Property extraId = (Property) iter.next();
+		assertEquals(
+				reverseEngineeringStrategy.columnToPropertyName(
+						null,
+						"customer"),
+				id.getName());
+		assertEquals(
+				reverseEngineeringStrategy.columnToPropertyName(
+						null,
+						"orderNumber"),
+				extraId.getName());
+		assertInstanceOf(ManyToOne.class, id.getValue());
+		assertFalse(extraId.getValue() instanceof ManyToOne);
+	}
+
+	@Test
+	public void testKeyProperty() {
+		PersistentClass product = metadataDescriptor.createMetadata().getEntityBinding(
+				reverseEngineeringStrategy
+					.tableToClassName(TableIdentifier.create(null, null, JdbcUtil.toIdentifier(this, "PRODUCT"))));
+		Property identifierProperty = product.getIdentifierProperty();
+		assertInstanceOf(Component.class, identifierProperty.getValue());
+		Component cmpid = (Component) identifierProperty.getValue();
+		assertEquals(2, cmpid.getPropertySpan());
+		Iterator<?> iter = cmpid.getProperties().iterator();
+		Property id = (Property)iter.next();
+		Property extraId = (Property)iter.next();
+		if ("extraId".equals(id.getName())) {
+			Property temp = id;
+			id = extraId;
+			extraId = temp;
+		}
+		assertEquals(
+				reverseEngineeringStrategy.columnToPropertyName(
+						null,
+						"productId"),
+				id.getName());
+		assertEquals(
+				reverseEngineeringStrategy.columnToPropertyName(
+						null,
+						"extraId"),
+				extraId.getName());
+		assertFalse(id.getValue() instanceof ManyToOne);
+		assertFalse(extraId.getValue() instanceof ManyToOne);
+	}
+
+	@Test
+	public void testGeneration() throws Exception {
+		Exporter exporter = new HbmExporter();
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		Exporter javaExp = ExporterFactory.createExporter(ExporterType.JAVA);
+		javaExp.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		javaExp.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.start();
+		javaExp.start();
+		JavaUtil.compile(outputDir);
+		URL[] urls = new URL[] { outputDir.toURI().toURL() };
+		URLClassLoader ucl = new URLClassLoader(urls, Thread.currentThread().getContextClassLoader());
+		File[] files = new File[6];
+		files[0] = new File(outputDir, "SimpleCustomerOrder.hbm.xml");
+		files[1] = new File(outputDir, "SimpleLineItem.hbm.xml");
+		files[2] = new File(outputDir, "Product.hbm.xml");
+		files[3] = new File(outputDir, "Customer.hbm.xml");
+		files[4] = new File(outputDir, "LineItem.hbm.xml");
+		files[5] = new File(outputDir, "CustomerOrder.hbm.xml");
+		Thread.currentThread().setContextClassLoader(ucl);
+		SessionFactory factory = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files, null)
+				.createMetadata()
+				.buildSessionFactory();
+		Session session = factory.openSession();
+		JdbcUtil.populateDatabase(this);
+		session.createQuery("from LineItem", null).getResultList();
+		List<?> list = session.createQuery("from Product", null).getResultList();
+		assertEquals(2, list.size());
+		list = session
+				.createQuery("select li.id.customerOrder.id from LineItem as li", null)
+				.getResultList();
+		assertFalse(list.isEmpty());
+		Class<?> productIdClass = ucl.loadClass("ProductId");
+		Constructor<?> productIdConstructor = productIdClass.getConstructor();
+		Object object = productIdConstructor.newInstance();
+		int hash = -1;
+		try {
+			hash = object.hashCode();
+		} catch (Throwable t) {
+			fail("Hashcode on new instance should not fail " + t);
+		}
+		assertNotEquals(hash, System.identityHashCode(object), "hashcode should be different from system");
+		factory.close();
+		Thread.currentThread().setContextClassLoader(ucl.getParent());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/ManyToMany/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/ManyToMany/TestCase.java
new file mode 100644
index 000000000000..679b331c6472
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/ManyToMany/TestCase.java
@@ -0,0 +1,170 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.ManyToMany;
+
+import org.hibernate.MappingException;
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.internal.core.strategy.AbstractStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.Objects;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	@TempDir
+	public File outputDir = new File("output");
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testNoManyToManyBiDirectional() {
+
+		AbstractStrategy c = new DefaultStrategy();
+		c.setSettings(new RevengSettings(c).setDetectManyToMany(false));
+		Metadata metadata =  MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(c, null)
+				.createMetadata();
+
+		PersistentClass project = metadata.getEntityBinding("Project");
+
+		assertNotNull(project.getProperty("worksOns"));
+		//assertNotNull(project.getProperty("employee"));
+		assertEquals(3, project.getPropertyClosureSpan());
+		assertEquals("projectId", project.getIdentifierProperty().getName());
+
+		PersistentClass employee = metadata.getEntityBinding("Employee");
+
+		assertNotNull(employee.getProperty("worksOns"));
+		assertNotNull(employee.getProperty("employees"));
+		assertNotNull(employee.getProperty("employee"));
+		//assertNotNull(employee.getProperty("projects"));
+		assertEquals(6, employee.getPropertyClosureSpan());
+		assertEquals("id", employee.getIdentifierProperty().getName());
+
+		PersistentClass worksOn = metadata.getEntityBinding("WorksOn");
+
+		assertNotNull(worksOn.getProperty("project"));
+		assertNotNull(worksOn.getProperty("employee"));
+		assertEquals(2, worksOn.getPropertyClosureSpan());
+		assertEquals("id", worksOn.getIdentifierProperty().getName());
+	}
+
+	@Test
+	public void testAutoCreation() {
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+
+		assertNull(metadata.getEntityBinding( "WorksOn" ), "No middle class should be generated.");
+
+		assertNotNull(metadata.getEntityBinding( "WorksOnContext" ), "Should create worksontext since one of the foreign keys is not part of pk");
+
+		PersistentClass projectClass = metadata.getEntityBinding("Project");
+		assertNotNull( projectClass );
+
+		PersistentClass employeeClass = metadata.getEntityBinding("Employee");
+		assertNotNull( employeeClass );
+
+		try {
+			projectClass.getProperty("worksOns");
+			fail("property worksOns should not exist on " + projectClass);
+		} catch(MappingException ignored) {}
+		try {
+			employeeClass.getProperty("worksOns");
+			fail("property worksOns should not exist on " + employeeClass);
+		} catch(MappingException ignored) {}
+
+		Property property = employeeClass.getProperty( "projects" );
+		assertNotNull( property);
+		assertNotNull( projectClass.getProperty( "employees" ));
+
+	}
+
+	@Test
+	public void testFalsePositive() {
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+		assertNotNull(metadata.getEntityBinding( "NonMiddle" ), "Middle class should be generated.");
+	}
+
+	@Test
+	public void testBuildMappings() {
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+		assertNotNull(metadata);
+	}
+
+	@Test
+	public void testGenerateAndReadable() {
+
+		MetadataDescriptor metadataDescriptor = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null);
+
+		assertNotNull(metadataDescriptor.createMetadata());
+
+		HbmExporter hme = new HbmExporter();
+		hme.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hme.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		hme.start();
+
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "Employee.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "Project.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "WorksOnContext.hbm.xml") );
+
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "RightTable.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "LeftTable.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "NonMiddle.hbm.xml") ); //Must be there since it has a fkey that is not part of the pk
+
+		assertFalse(new File(outputDir, "WorksOn.hbm.xml").exists() );
+
+		assertEquals(6, Objects.requireNonNull(outputDir.listFiles()).length);
+
+		File[] files = new File[3];
+		files[0] = new File(outputDir, "Employee.hbm.xml");
+		files[1] = new File(outputDir, "Project.hbm.xml");
+		files[2] = new File(outputDir, "WorksOnContext.hbm.xml");
+
+		assertNotNull(MetadataDescriptorFactory
+				.createNativeDescriptor(null, files, null)
+				.createMetadata());
+
+	}
+
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/MetaData/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/MetaData/TestCase.java
new file mode 100644
index 000000000000..e561436e2353
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/MetaData/TestCase.java
@@ -0,0 +1,91 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.MetaData;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.PrimaryKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testBasic() {
+		JUnitUtil.assertIteratorContainsExactly(
+				"There should be three tables!",
+				metadata.getEntityBindings().iterator(),
+				3);
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "BASIC" ) );
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "BASIC"),
+				JdbcUtil.toIdentifier(this, table.getName()));
+		assertEquals( 2, table.getColumnSpan() );
+		Column basicColumn = table.getColumn( 0 );
+		assertEquals(
+				JdbcUtil.toIdentifier(this, "A"),
+				JdbcUtil.toIdentifier(this, basicColumn.getName()));
+		PrimaryKey key = table.getPrimaryKey();
+		assertNotNull(key, "There should be a primary key!" );
+		assertEquals(1, key.getColumnSpan());
+		Column column = key.getColumn( 0 );
+		assertTrue( column.isUnique() );
+		assertSame( basicColumn, column );
+	}
+
+	@Test
+	public void testScalePrecisionLength() {
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "BASIC"));
+		Column nameCol = table.getColumn(new Column( JdbcUtil.toIdentifier(this, "NAME" ) ) );
+		assertEquals(20, nameCol.getLength().intValue());
+		assertNull(nameCol.getPrecision());
+		assertNull(nameCol.getScale());
+	}
+
+	@Test
+	public void testCompositeKeys() {
+		Table table = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "MULTIKEYED"));
+		PrimaryKey primaryKey = table.getPrimaryKey();
+		assertEquals( 2, primaryKey.getColumnSpan() );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/NoPrimaryKey/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/NoPrimaryKey/TestCase.java
new file mode 100644
index 000000000000..32a2973870f9
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/NoPrimaryKey/TestCase.java
@@ -0,0 +1,39 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.NoPrimaryKey;
+
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testMe() {
+		assertNotNull(
+			MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/OneToOne/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/OneToOne/TestCase.java
new file mode 100644
index 000000000000..7d1af2ddb5ac
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/OneToOne/TestCase.java
@@ -0,0 +1,236 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.OneToOne;
+
+import jakarta.persistence.Persistence;
+import org.hibernate.MappingException;
+import org.hibernate.Version;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.mapping.OneToOne;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.internal.metadata.NativeMetadataDescriptor;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedValue;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JavaUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.hibernate.tool.reveng.test.utils.SchemaUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	@TempDir
+	public File outputDir = new File("output");
+
+	private MetadataDescriptor metadataDescriptor = null;
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		metadataDescriptor = MetadataDescriptorFactory.createReverseEngineeringDescriptor(null, null);
+		metadata = metadataDescriptor.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testOneToOneSingleColumnBiDirectional() {
+		PersistentClass person = metadata.getEntityBinding("Person");
+		Property addressProperty = person.getProperty("addressPerson");
+		assertNotNull(addressProperty);
+		assertInstanceOf(OneToOne.class, addressProperty.getValue());
+		OneToOne oto = (OneToOne) addressProperty.getValue();
+		assertEquals(1, oto.getColumnSpan());
+		assertEquals("Person", oto.getEntityName());
+		assertEquals("AddressPerson", oto.getReferencedEntityName());
+		assertEquals(2, person.getPropertyClosureSpan());
+		assertEquals("personId", person.getIdentifierProperty().getName());
+		assertFalse(oto.isConstrained());
+		PersistentClass addressPerson = metadata.getEntityBinding("AddressPerson");
+		Property personProperty = addressPerson.getProperty("person");
+		assertNotNull(personProperty);
+		assertInstanceOf(OneToOne.class, personProperty.getValue());
+		oto = (OneToOne) personProperty.getValue();
+		assertTrue(oto.isConstrained());
+		assertEquals(1, oto.getColumnSpan());
+		assertEquals("AddressPerson", oto.getEntityName());
+		assertEquals("Person", oto.getReferencedEntityName());
+		assertEquals(2, addressPerson.getPropertyClosureSpan());
+		assertEquals("addressId", addressPerson.getIdentifierProperty().getName());
+	}
+
+	@Test
+	public void testAddressWithForeignKeyGeneration() {
+		PersistentClass address = metadata.getEntityBinding("AddressPerson");
+		assertEquals("foreign", ((EnhancedValue)address.getIdentifier()).getIdentifierGeneratorStrategy());
+	}
+
+	@Test
+	public void testOneToOneMultiColumnBiDirectional() {
+		PersistentClass person = metadata.getEntityBinding("MultiPerson");
+		Property addressProperty = person.getProperty("addressMultiPerson");
+		assertNotNull(addressProperty);
+		assertInstanceOf(OneToOne.class, addressProperty.getValue());
+		OneToOne oto = (OneToOne) addressProperty.getValue();
+		assertEquals(2, oto.getColumnSpan());
+		assertEquals("MultiPerson", oto.getEntityName());
+		assertEquals("AddressMultiPerson", oto.getReferencedEntityName());
+		assertFalse(oto.isConstrained());
+		assertEquals(2, person.getPropertyClosureSpan());
+		assertEquals("id", person.getIdentifierProperty().getName(), "compositeid gives generic id name");
+		PersistentClass addressPerson = metadata.getEntityBinding("AddressMultiPerson");
+		Property personProperty = addressPerson.getProperty("multiPerson");
+		assertNotNull(personProperty);
+		assertInstanceOf(OneToOne.class, personProperty.getValue());
+		oto = (OneToOne) personProperty.getValue();
+		assertEquals(2, oto.getColumnSpan());
+		assertEquals("AddressMultiPerson", oto.getEntityName());
+		assertEquals("MultiPerson", oto.getReferencedEntityName());
+		assertEquals(2, addressPerson.getPropertyClosureSpan());
+		assertEquals("id", addressPerson.getIdentifierProperty().getName(), "compositeid gives generic id name");
+		assertTrue(oto.isConstrained());
+	}
+
+	@Test
+	public void testBuildMappings() {
+		assertNotNull(metadata);
+	}
+
+	@Test
+	public void testGenerateMappingAndReadable() throws MalformedURLException {
+		HbmExporter hme = new HbmExporter();
+		hme.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hme.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		hme.start();
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "Person.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "AddressPerson.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "AddressMultiPerson.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "MultiPerson.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "MiddleTable.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "LeftTable.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "RightTable.hbm.xml") );
+		assertEquals(7, Objects.requireNonNull(outputDir.listFiles()).length);
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[0]);
+		exporter.getProperties().setProperty("ejb3", "false");
+		exporter.getProperties().setProperty("jdk5", "false");
+		exporter.start();
+		JavaUtil.compile(outputDir);
+		URL[] urls = new URL[] { outputDir.toURI().toURL() };
+		ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+		URLClassLoader ucl = new URLClassLoader(urls, oldLoader );
+		try {
+			Thread.currentThread().setContextClassLoader(ucl);
+			StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder();
+			ServiceRegistry serviceRegistry = builder.build();
+			File[] files = new File[7];
+			files[0] = new File(outputDir, "Person.hbm.xml");
+			files[1] = new File(outputDir, "AddressPerson.hbm.xml");
+			files[2] = new File(outputDir, "AddressMultiPerson.hbm.xml");
+			files[3] = new File(outputDir, "MultiPerson.hbm.xml");
+			files[4] = new File(outputDir, "MiddleTable.hbm.xml");
+			files[5] = new File(outputDir, "LeftTable.hbm.xml");
+			files[6] = new File(outputDir, "RightTable.hbm.xml");
+			SchemaUtil.validateSchema(
+					MetadataDescriptorFactory
+						.createNativeDescriptor(null, files, null)
+						.createMetadata(),
+					serviceRegistry);
+		} finally {
+			Thread.currentThread().setContextClassLoader(oldLoader);
+		}
+	}
+
+	@Test
+	public void testGenerateAnnotatedClassesAndReadable() throws MappingException, ClassNotFoundException, MalformedURLException {
+		Exporter exporter = ExporterFactory.createExporter(ExporterType.JAVA);
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputDir);
+		exporter.getProperties().put(ExporterConstants.TEMPLATE_PATH, new String[0]);
+		exporter.getProperties().setProperty("ejb3", "true");
+		exporter.getProperties().setProperty("jdk5", "true");
+		exporter.start();
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "Person.java") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "AddressPerson.java") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "MultiPersonId.java") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "AddressMultiPerson.java") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "AddressMultiPersonId.java") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputDir, "MultiPerson.java") );
+		assertEquals(9, Objects.requireNonNull(outputDir.listFiles()).length);
+		List<String> paths = new ArrayList<>();
+		paths.add(JavaUtil.resolvePathToJarFileFor(Persistence.class)); // for jpa api
+		paths.add(JavaUtil.resolvePathToJarFileFor(Version.class)); // for hibernate core
+		JavaUtil.compile(outputDir, paths);
+		URL[] urls = new URL[] { outputDir.toURI().toURL() };
+		ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+		URLClassLoader ucl = new URLClassLoader(urls, oldLoader );
+		Class<?> personClass = ucl.loadClass("Person");
+		Class<?> multiPersonClass = ucl.loadClass("MultiPerson");
+		Class<?> addressMultiPerson = ucl.loadClass("AddressMultiPerson");
+		Class<?> addressMultiPersonId = ucl.loadClass("AddressMultiPersonId");
+		Class<?> addressPerson = ucl.loadClass("AddressPerson");
+		Class<?> multiPersonIdClass = ucl.loadClass("MultiPersonId");
+		Class<?> middleClass = ucl.loadClass("MiddleTable");
+		Class<?> rightClass = ucl.loadClass("LeftTable");
+		Class<?> leftClass = ucl.loadClass("RightTable");
+		try {
+			Thread.currentThread().setContextClassLoader(ucl);
+			StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder();
+			ServiceRegistry serviceRegistry = builder.build();
+			NativeMetadataDescriptor mds = new NativeMetadataDescriptor(null, null, null);
+			HibernateUtil.addAnnotatedClass(mds, personClass);
+			HibernateUtil.addAnnotatedClass(mds, multiPersonClass);
+			HibernateUtil.addAnnotatedClass(mds, addressMultiPerson);
+			HibernateUtil.addAnnotatedClass(mds, addressMultiPersonId);
+			HibernateUtil.addAnnotatedClass(mds, addressPerson);
+			HibernateUtil.addAnnotatedClass(mds, multiPersonIdClass);
+			HibernateUtil.addAnnotatedClass(mds, middleClass);
+			HibernateUtil.addAnnotatedClass(mds, rightClass);
+			HibernateUtil.addAnnotatedClass(mds, leftClass);
+			Metadata metadata = mds.createMetadata();
+			SchemaUtil.validateSchema(metadata, serviceRegistry);
+		} finally {
+			Thread.currentThread().setContextClassLoader(oldLoader);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/TestCase.java
new file mode 100644
index 000000000000..3692183667c3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/TestCase.java
@@ -0,0 +1,548 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.OverrideBinder;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Environment;
+import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Component;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.MetaAttribute;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.api.core.RevengStrategy.SchemaSelection;
+import org.hibernate.tool.reveng.api.core.TableIdentifier;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.OverrideRepository;
+import org.hibernate.tool.reveng.internal.core.strategy.SQLTypeMapping;
+import org.hibernate.tool.reveng.internal.core.strategy.TableFilter;
+import org.hibernate.tool.reveng.internal.core.util.EnhancedValue;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Types;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String OVERRIDE_TEST_REVENG_XML = "org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/overridetest.reveng.xml";
+	private static final String TEST_REVENG_XML = "org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/test.reveng.xml";
+	private static final String DOC_REVENG_XML = "org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/docexample.reveng.xml";
+	private static final String SCHEMA_REVENG_XML = "org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/schemaselection.reveng.xml";
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		OverrideRepository or = new OverrideRepository();
+		or.addResource(OVERRIDE_TEST_REVENG_XML);
+		RevengStrategy res = or.getReverseEngineeringStrategy(
+				new DefaultStrategy() );
+		metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(res, null)
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testReadTypeMappings() {
+		OverrideRepository or = new OverrideRepository();
+
+		or.addResource(TEST_REVENG_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(null);
+
+		assertEquals("int", repository.columnToHibernateTypeName(null, null, Types.INTEGER, 5, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE, false, false) );
+		assertEquals("long", repository.columnToHibernateTypeName(null, null, Types.INTEGER, SQLTypeMapping.UNKNOWN_LENGTH, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE, false, false) );
+		assertEquals("byte[]", repository.columnToHibernateTypeName(null, null, Types.BIGINT, SQLTypeMapping.UNKNOWN_LENGTH, 5, SQLTypeMapping.UNKNOWN_SCALE, false, false) );
+		assertEquals("java.math.BigInteger", repository.columnToHibernateTypeName(null, null, Types.BIGINT, SQLTypeMapping.UNKNOWN_LENGTH, 2, 3, false, false) );
+		assertEquals("string", repository.columnToHibernateTypeName(null, null, Types.CHAR, 1, 10, SQLTypeMapping.UNKNOWN_SCALE, false, false) );
+		//Assert.assertEquals("string", repository.jdbcToHibernateType(Types.CHAR, 1, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE) );
+
+		assertEquals("Long", repository.columnToHibernateTypeName(null, null, Types.NUMERIC, 1, 10, 0, false, false) );
+		assertEquals("java.lang.Long", repository.columnToHibernateTypeName(null, null, Types.NUMERIC, 1, 10, SQLTypeMapping.UNKNOWN_SCALE, false, false) );
+		assertEquals("java.lang.Long", repository.columnToHibernateTypeName(null, null, Types.NUMERIC, 1, 10, 43, false, false) );
+
+		// nullability
+		assertEquals("nonnull-float", repository.columnToHibernateTypeName(null, null, Types.FLOAT, SQLTypeMapping.UNKNOWN_LENGTH, SQLTypeMapping.UNKNOWN_PRECISION,17,false, false) );
+		assertEquals("null-float", repository.columnToHibernateTypeName(null, null, Types.FLOAT, SQLTypeMapping.UNKNOWN_LENGTH, SQLTypeMapping.UNKNOWN_PRECISION,17,true, false) );
+
+		assertEquals("onlynotnull", repository.columnToHibernateTypeName(null, null, Types.FLOAT, SQLTypeMapping.UNKNOWN_LENGTH, SQLTypeMapping.UNKNOWN_PRECISION,SQLTypeMapping.UNKNOWN_SCALE,false, false) );
+		assertEquals("donotcare", repository.columnToHibernateTypeName(null, null, Types.FLOAT, SQLTypeMapping.UNKNOWN_LENGTH, SQLTypeMapping.UNKNOWN_PRECISION,SQLTypeMapping.UNKNOWN_SCALE,true, false) );
+
+
+	}
+
+	@Test
+	public void testDocExample() {
+		OverrideRepository or = new OverrideRepository();
+
+		or.addResource(DOC_REVENG_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(new DefaultStrategy());
+
+		assertEquals("int", repository.columnToHibernateTypeName(null, "ID", Types.INTEGER, SQLTypeMapping.UNKNOWN_LENGTH, 10, SQLTypeMapping.UNKNOWN_SCALE, false, false) );
+		assertEquals("your.package.TrimStringUserType", repository.columnToHibernateTypeName(null, "NAME", Types.VARCHAR, 30, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE, true, false) );
+		assertEquals("char", repository.columnToHibernateTypeName(null, "INITIAL", Types.VARCHAR, 1, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE, true, false) );
+		assertEquals("java.lang.Character", repository.columnToHibernateTypeName(null, "CODE", Types.VARCHAR, 1, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE, false, false) );
+		assertEquals("big_decimal", repository.columnToHibernateTypeName(null, "SALARY", Types.NUMERIC, SQLTypeMapping.UNKNOWN_LENGTH, 15, SQLTypeMapping.UNKNOWN_SCALE, true, false) );
+		assertEquals("java.lang.Long", repository.columnToHibernateTypeName(null, "AGE", Types.NUMERIC, SQLTypeMapping.UNKNOWN_LENGTH, 3, SQLTypeMapping.UNKNOWN_SCALE, true, false) );
+
+	}
+
+	@Test
+	public void testSchemaSelection() {
+		OverrideRepository or = new OverrideRepository();
+
+		or.addResource(SCHEMA_REVENG_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(new DefaultStrategy());
+
+		List<?> schemaSelectors = repository.getSchemaSelections();
+
+		assertNotNull(schemaSelectors);
+		assertEquals(4,schemaSelectors.size());
+
+		SchemaSelection ss;
+		ss = (SchemaSelection) schemaSelectors.get(0);
+		assertNull(ss.getMatchCatalog());
+		assertNull(ss.getMatchSchema());
+		assertNull(ss.getMatchTable());
+
+		ss = (SchemaSelection) schemaSelectors.get(1);
+		assertNull(ss.getMatchCatalog());
+		assertEquals("OVRTEST",ss.getMatchSchema());
+		assertNull(ss.getMatchTable());
+
+		ss = (SchemaSelection) schemaSelectors.get(2);
+		assertEquals("UBERCATALOG",ss.getMatchCatalog());
+		assertEquals("OVRTEST",ss.getMatchSchema());
+		assertNull(ss.getMatchTable());
+
+		ss = (SchemaSelection) schemaSelectors.get(3);
+		assertEquals("PUBLIC.*",ss.getMatchCatalog());
+		assertEquals("OVRTEST",ss.getMatchSchema());
+		assertEquals(".*",ss.getMatchTable());
+
+		OverrideRepository ox = new OverrideRepository();
+		ox.addSchemaSelection(createDummySchemaSelection());
+		RevengStrategy strategy = ox.getReverseEngineeringStrategy(new DefaultStrategy());
+		Metadata md = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(strategy, null)
+				.createMetadata();
+
+		Iterator<Table> tableMappings = md.collectTableMappings().iterator();
+		Table t = tableMappings.next();
+		assertEquals("DUMMY", t.getName());
+		assertFalse(tableMappings.hasNext());
+	}
+
+	@Test
+	public void testColumnTypeMappings() {
+		OverrideRepository or = new OverrideRepository();
+
+		or.addResource(OVERRIDE_TEST_REVENG_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(null);
+
+		assertNull(repository.columnToHibernateTypeName(TableIdentifier.create(null, null, "blah"), "bogus",0,0,0,0, false, false));
+		assertNull(repository.columnToHibernateTypeName(TableIdentifier.create(null, null, "ORDERS"), "CUSTID",0,0,0,0, false, false));
+		assertEquals("string", repository.columnToHibernateTypeName(TableIdentifier.create(null, null, "ORDERS"), "NAME",0,0,0,0, false, false));
+
+		PersistentClass classMapping = metadata.getEntityBinding("Orders");
+
+		Property property = classMapping.getProperty("completed");
+		assertEquals("boolean", ((SimpleValue)property.getValue()).getTypeName(), "boolean because of not null");
+
+		property = classMapping.getProperty("verified");
+		assertEquals("java.lang.Boolean", ((SimpleValue)property.getValue()).getTypeName(),"java.lang.Boolean because of null");
+
+		classMapping = metadata.getEntityBinding("MiscTypes");
+
+		property = classMapping.getIdentifierProperty();
+
+		assertFalse(property.getValue().isNullable());
+		assertEquals("java.lang.Long", ((SimpleValue)property.getValue()).getTypeName(), "java.lang.Long because of primary key");
+	}
+
+	@Test
+	public void testColumnPropertyNameMappings() {
+		OverrideRepository or = new OverrideRepository();
+
+		or.addResource(OVERRIDE_TEST_REVENG_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(null);
+
+		assertNull(repository.columnToPropertyName(TableIdentifier.create(null, null, "blah"), "bogus"));
+		assertNull(repository.columnToPropertyName(TableIdentifier.create(null, null, "ORDERS"), "cust_id"));
+		assertEquals("orderName", repository.columnToPropertyName(TableIdentifier.create(null, null, "ORDERS"), "NAME"));
+	}
+
+	@Test
+	public void testMetaAttributeMappings() {
+		PersistentClass classMapping = metadata.getEntityBinding( "Orders" );
+		assertEquals("order table value", classMapping.getMetaAttribute( "order-meta" ).getValue());
+
+		Property property = classMapping.getProperty("orderName");
+		assertEquals("order column value", property.getMetaAttribute( "order-meta" ).getValue());
+		//TODO: test sequence of meta
+	}
+
+	@Test
+	public void testIdGenerator() {
+		OverrideRepository or = new OverrideRepository();
+
+		or.addResource(OVERRIDE_TEST_REVENG_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(null);
+
+		TableIdentifier miscTable = TableIdentifier.create(null,null, "MISC_TYPES");
+		assertEquals("sequence",repository.getTableIdentifierStrategyName(miscTable));
+		Map<?,?> props = repository.getTableIdentifierProperties(miscTable);
+		assertEquals("seq_table", props.get("table"));
+
+		assertNull(repository.getTableIdentifierStrategyName(TableIdentifier.create(null, null, "blah")));
+		assertNull(repository.getTableIdentifierProperties(TableIdentifier.create(null, null, "blah")));
+		TableIdentifier ordersTable = TableIdentifier.create(null,null, "ORDERS");
+
+		assertEquals("customOrderId", repository.tableToIdentifierPropertyName(ordersTable));
+		assertNull(repository.tableToIdentifierPropertyName(TableIdentifier.create(null, null, "blah")));
+
+		assertEquals("CustomOID", repository.tableToCompositeIdName(ordersTable));
+		assertNull(repository.tableToCompositeIdName(TableIdentifier.create(null, null, "blah")));
+
+		List<String> primaryKeyColumnNames = repository.getPrimaryKeyColumnNames(TableIdentifier.create(null, null, "blah"));
+		assertNull(primaryKeyColumnNames);
+
+		primaryKeyColumnNames = repository.getPrimaryKeyColumnNames(ordersTable);
+		assertNotNull(primaryKeyColumnNames);
+		assertEquals(2, primaryKeyColumnNames.size());
+		assertEquals("ORDERID", primaryKeyColumnNames.get(0));
+		assertEquals("CUSTID", primaryKeyColumnNames.get(1));
+		assertFalse(repository.excludeColumn(ordersTable, "CUSTID"));
+
+		// applied
+		PersistentClass classMapping = metadata.getEntityBinding("Orders");
+		EnhancedValue ev = (EnhancedValue) classMapping.getIdentifier();
+		assertEquals("CustomOID", ((Component)ev).getComponentClassName());
+
+		assertEquals(2,classMapping.getIdentifierProperty().getColumnSpan());
+
+		Property identifierProperty = classMapping.getIdentifierProperty();
+		assertEquals("customOrderId", identifierProperty.getName());
+
+		classMapping = metadata.getEntityBinding("MiscTypes");
+		ev = (EnhancedValue) classMapping.getIdentifier();
+		assertEquals("sequence", ev.getIdentifierGeneratorStrategy()); // will fail if default schema is not set since then there is no match in the override binder
+
+		assertNotNull(ev.getIdentifierGeneratorProperties());
+		assertEquals("seq_table", ev.getIdentifierGeneratorProperties().getProperty("table"));
+
+	}
+
+	@Test
+	public void testReadExcludeTables() {
+		OverrideRepository or = new OverrideRepository();
+
+		or.addResource(OVERRIDE_TEST_REVENG_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(null);
+
+		assertTrue(repository.excludeTable(TableIdentifier.create(null,null, "DoNotWantIt") ) );
+		assertFalse(repository.excludeTable(TableIdentifier.create(null,null, "NotListedThere") ) );
+		assertFalse(repository.excludeTable(TableIdentifier.create("cat","sch", "WantedTable") ) );
+		assertFalse(repository.excludeTable(TableIdentifier.create("BAD","SCHEMA", "WantedTable") ) );
+		assertTrue(repository.excludeTable(TableIdentifier.create("BAD","SCHEMA", "SomethingElse") ) );
+
+	}
+
+	@Test
+	public void testReadPackageName() {
+		OverrideRepository or = new OverrideRepository();
+
+		or.addResource(OVERRIDE_TEST_REVENG_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(new DefaultStrategy());
+
+		assertEquals("org.werd.Q", repository.tableToClassName(TableIdentifier.create("q","Werd", "Q") ) );
+		assertEquals("Notknown", repository.tableToClassName(TableIdentifier.create(null,null, "notknown") ) );
+
+		assertEquals("org.werd.MyWorld", repository.tableToClassName(TableIdentifier.create(null,"Werd", "TBL_PKG") ) );
+		assertEquals("other.MyWorld", repository.tableToClassName(TableIdentifier.create(null,"Werd", "TBL_OTHER") ) );
+
+	}
+
+	@Test
+	public void testRevEngExclude() {
+
+		assertNull( HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "DEFUNCT_TABLE") ) );
+		Table foundTable = HibernateUtil.getTable(
+				metadata,
+				JdbcUtil.toIdentifier(this, "INTHEMIDDLE") );
+		assertNotNull(foundTable);
+		Iterator<ForeignKey> fkiter = foundTable.getForeignKeyCollection().iterator();
+		ForeignKey fk1 = fkiter.next();
+		assertNotNull(fk1);
+		assertFalse(fkiter.hasNext() );
+
+
+	}
+
+	@Test
+	public void testSQLTypeMappingComparisons() {
+		SQLTypeMapping one = new SQLTypeMapping(Types.BIGINT, 5, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE,SQLTypeMapping.UNKNOWN_NULLABLE);
+		SQLTypeMapping two = new SQLTypeMapping(Types.BIGINT, SQLTypeMapping.UNKNOWN_LENGTH, 3, SQLTypeMapping.UNKNOWN_SCALE, SQLTypeMapping.UNKNOWN_NULLABLE);
+		SQLTypeMapping generic = new SQLTypeMapping(Types.BIGINT, SQLTypeMapping.UNKNOWN_LENGTH, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE, SQLTypeMapping.UNKNOWN_NULLABLE);
+		SQLTypeMapping specific = new SQLTypeMapping(Types.BIGINT, 2, 3, 4, SQLTypeMapping.UNKNOWN_NULLABLE);
+		SQLTypeMapping morespecific = new SQLTypeMapping(Types.BIGINT, 2, 3, 4, Boolean.TRUE);
+		SQLTypeMapping equalmorespecific = new SQLTypeMapping(Types.BIGINT, 2, 3, 4, Boolean.TRUE);
+
+		assertNotEquals(one, two);
+		assertNotEquals(two, one);
+		assertEquals(two, two);
+		assertEquals(one, one);
+		assertEquals(morespecific, equalmorespecific);
+
+
+		assertEquals(-1, one.compareTo(two) );
+		assertEquals(1, two.compareTo(one) );
+
+		assertEquals(1, generic.compareTo(one) );
+		assertEquals(1, generic.compareTo(two) );
+		assertEquals(1, generic.compareTo(specific) );
+
+		assertEquals(-1, specific.compareTo(one) );
+		assertEquals(-1, specific.compareTo(two) );
+		assertEquals(-1, specific.compareTo(generic) );
+		assertEquals(1, specific.compareTo(morespecific) );
+		assertEquals(-1, morespecific.compareTo(specific) );
+
+	}
+
+	@Test
+	public void testSqlTypeOverride() {
+
+		OverrideRepository or = new OverrideRepository();
+
+		SQLTypeMapping sqltype = new SQLTypeMapping(Types.BINARY);
+
+		sqltype.setLength(1);
+		sqltype.setHibernateType("boolean");
+		or.addTypeMapping(sqltype);
+
+		sqltype = new SQLTypeMapping(Types.BIT);
+
+		sqltype.setHibernateType("yes_no");
+		or.addTypeMapping(sqltype);
+
+		RevengStrategy res = or.getReverseEngineeringStrategy(null);
+		assertEquals("boolean",res.columnToHibernateTypeName(null,null, Types.BINARY, 1, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE, false, false) );
+		assertNull(res.columnToHibernateTypeName(null, null, Types.LONGVARCHAR, 1, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE, false, false));
+		assertEquals("yes_no",res.columnToHibernateTypeName(null,null, Types.BIT, SQLTypeMapping.UNKNOWN_LENGTH, SQLTypeMapping.UNKNOWN_PRECISION, SQLTypeMapping.UNKNOWN_SCALE, false, false) );
+	}
+
+	@Test
+	public void testTableExclude() {
+		TableFilter tf = new TableFilter();
+		tf.setMatchName("max");
+		tf.setExclude(Boolean.TRUE);
+		assertTrue(tf.exclude(TableIdentifier.create(null, null, "max")));
+		assertNull(tf.exclude(TableIdentifier.create(null, null, "maxnotexact") ) );
+		tf.setMatchName(".*max");
+		assertTrue(tf.exclude(TableIdentifier.create(null, null, "max")));
+		assertNull(tf.exclude(TableIdentifier.create(null, null, "maxnotending") ) );
+		assertTrue(tf.exclude(TableIdentifier.create(null, null, "endingWithmax")));
+		tf.setMatchName("max.*");
+		assertTrue(tf.exclude(TableIdentifier.create(null, null, "max")));
+		tf.setMatchName(".*max.*");
+		assertTrue(tf.exclude(TableIdentifier.create(null, null, "max")));
+		assertNull(tf.exclude(TableIdentifier.create(null, null, "notxam") ) );
+		assertTrue(tf.exclude(TableIdentifier.create(null, null, "heremaxsub")));
+	}
+
+	@Test
+	public void testColumnExclude() {
+
+		OverrideRepository or = new OverrideRepository();
+		or.addResource(OVERRIDE_TEST_REVENG_XML);
+
+		RevengStrategy reverseEngineeringStrategy = or.getReverseEngineeringStrategy(null);
+
+		assertFalse(reverseEngineeringStrategy.excludeColumn(TableIdentifier.create(null, null, "EXCOLUMNS"), "blah"));
+		assertFalse(reverseEngineeringStrategy.excludeColumn(TableIdentifier.create(null, null, "EXCOLUMNS"), "NAME"));
+		assertTrue(reverseEngineeringStrategy.excludeColumn(TableIdentifier.create(null, null, "EXCOLUMNS"), "EXCOLUMN"));
+
+		Table table = HibernateUtil.getTable(metadata, JdbcUtil.toIdentifier(this, "EXCOLUMNS"));
+		assertNotNull(table);
+
+		assertNotNull(table.getColumn(new Column("name")));
+		assertNull(table.getColumn(new Column("excolumn")));
+
+	}
+
+	@Test
+	public void testSimpleUserDefinedForeignKeys() {
+
+		Table table = HibernateUtil.getTable(metadata, JdbcUtil.toIdentifier(this, "ORDERS") );
+
+		Iterator<ForeignKey> foreignKeyIterator = table.getForeignKeyCollection().iterator();
+		ForeignKey fk = foreignKeyIterator.next();
+		assertEquals(fk.getReferencedTable().getName(), JdbcUtil.toIdentifier(this, "CUSTOMER") );
+
+		PersistentClass classMapping = metadata.getEntityBinding("Orders");
+		classMapping.getProperty("customer");
+
+		classMapping = metadata.getEntityBinding("Customer");
+		classMapping.getProperty("orderses");
+
+	}
+
+	@Test
+	public void testCompositeUserDefinedForeignKeys() {
+
+		Table table = HibernateUtil.getTable(metadata, JdbcUtil.toIdentifier(this, "CHILDREN") );
+
+		Iterator<ForeignKey> foreignKeyIterator = table.getForeignKeyCollection().iterator();
+		ForeignKey fk = foreignKeyIterator.next();
+		assertEquals(fk.getReferencedTable().getName(), JdbcUtil.toIdentifier(this, "PARENT") );
+		assertEquals(2, fk.getReferencedColumns().size());
+		assertEquals("child_to_parent", fk.getName());
+
+		PersistentClass classMapping = metadata.getEntityBinding("Children");
+		Property property = classMapping.getProperty("propertyParent");
+		assertEquals(2,property.getColumnSpan());
+
+		classMapping = metadata.getEntityBinding("Parent");
+		classMapping.getProperty("propertyChildren");
+
+	}
+
+	// TODO: HBX-2052: investigate the use of hibernate-type=SomeUserType
+	@Disabled
+	@Test
+	public void testTypes() {
+		PersistentClass classMapping = metadata.getEntityBinding("MiscTypes");
+		assertEquals(
+				"SomeUserType",
+				((SimpleValue)classMapping.getProperty("name").getValue()).getTypeName());
+		assertEquals(
+				"string",
+				((SimpleValue)classMapping.getProperty("shortname").getValue()).getTypeName());
+		assertEquals(
+				"yes_no",
+				((SimpleValue)classMapping.getProperty("flag").getValue()).getTypeName());
+	}
+
+	@Test
+	public void testTableToClass() {
+
+		RevengStrategy res = new OverrideRepository().addResource(OVERRIDE_TEST_REVENG_XML).getReverseEngineeringStrategy(new DefaultStrategy());
+
+		TableIdentifier tableIdentifier = TableIdentifier.create(null, null, "TblTest");
+		assertEquals("org.test.Test", res.tableToClassName(tableIdentifier));
+
+		tableIdentifier = TableIdentifier.create(
+				Environment
+					.getProperties()
+					.getProperty(AvailableSettings.DEFAULT_CATALOG),
+				"Werd",
+				"Testy");
+		assertEquals("org.werd.Testy", res.tableToClassName(tableIdentifier));
+
+		tableIdentifier = TableIdentifier.create(null, null, "Nothing");
+		assertEquals("Nothing", res.tableToClassName(tableIdentifier));
+
+	}
+
+	@Test
+	public void testMetaAttributes() {
+
+		RevengStrategy res = new OverrideRepository().addResource(OVERRIDE_TEST_REVENG_XML).getReverseEngineeringStrategy(new DefaultStrategy());
+
+		TableIdentifier tableIdentifier = TableIdentifier.create(null, null, "TblTest");
+		Map<String,MetaAttribute> attributes = res.tableToMetaAttributes(tableIdentifier);
+		assertNotNull(attributes);
+		assertEquals(1, attributes.size());
+		MetaAttribute ma = attributes.get("use-in-test");
+		assertEquals("use-in-test", ma.getName());
+		assertEquals("true", ma.getValue());
+
+		tableIdentifier = TableIdentifier.create(
+				Environment
+					.getProperties()
+					.getProperty(AvailableSettings.DEFAULT_CATALOG),
+				"Werd",
+				"Testy");
+		attributes = res.tableToMetaAttributes( tableIdentifier );
+		assertNotNull(attributes);
+		ma = attributes.get( "werd-meta" );
+		assertEquals("werd-meta", ma.getName());
+		assertEquals(2, ma.getValues().size());
+
+		tableIdentifier = TableIdentifier.create(null, "Werd", "MetaTable");
+		attributes = res.tableToMetaAttributes( tableIdentifier );
+		assertNotNull(attributes);
+		assertEquals(2, attributes.size());
+		ma = attributes.get("specific-werd");
+		assertEquals("specific-werd", ma.getName());
+		assertEquals("a one", ma.getValue());
+
+		ma = attributes.get( "werd-meta" );
+		assertEquals("werd-meta", ma.getName());
+		assertEquals(1, ma.getValues().size()); // as long as no inherit this should be one
+		assertEquals("value three", ma.getValue());
+
+		tableIdentifier = TableIdentifier.create(null, null, "Nothing");
+		assertNull(res.tableToMetaAttributes(tableIdentifier));
+
+		assertNull(res.columnToMetaAttributes(TableIdentifier.create(null, null, "Nothing"), "bogus"));
+		assertNull(res.columnToMetaAttributes( TableIdentifier.create(null, "Werd", "MetaTable"), "bogusColumn" ));
+		attributes = res.columnToMetaAttributes( TableIdentifier.create(null, "Werd", "MetaTable"), "MetaColumn" );
+		assertEquals(1, attributes.size());
+		ma = attributes.get("specific-column");
+		assertEquals("specific-column",ma.getName());
+		assertEquals("yes a column with meta",ma.getValue());
+
+	}
+
+	private SchemaSelection createDummySchemaSelection() {
+		return new SchemaSelection() {
+			@Override
+			public String getMatchCatalog() {
+				return null;
+			}
+			@Override
+			public String getMatchSchema() {
+				return null;
+			}
+			@Override
+			public String getMatchTable() {
+				return "DUMMY.*";
+			}
+		};
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Performance/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Performance/TestCase.java
new file mode 100644
index 000000000000..0d3abc5092db
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Performance/TestCase.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.Performance;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final int TABLECOUNT = 200;
+	private static final int COLCOUNT = 10;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testBasic() {
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+		JUnitUtil.assertIteratorContainsExactly(
+				"There should be " + TABLECOUNT + " tables!",
+				metadata.collectTableMappings().iterator(),
+				TABLECOUNT);
+		Table tab = metadata.collectTableMappings().iterator().next();
+		assertEquals(COLCOUNT+1, tab.getColumnSpan());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/Item.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/Item.java
new file mode 100644
index 000000000000..ebd595c73269
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/Item.java
@@ -0,0 +1,74 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.PersistentClasses;
+public class Item {
+
+	Integer childId;
+
+	Orders order;
+	Orders relatedorderId;
+	String name;
+
+	/**
+	 * @return Returns the id.
+	 */
+	public Integer getChildId() {
+		return childId;
+	}
+	/**
+	 * @param id The id to set.
+	 */
+	public void setChildId(Integer id) {
+		this.childId = id;
+	}
+	/**
+	 * @return Returns the name.
+	 */
+	public String getName() {
+		return name;
+	}
+	/**
+	 * @param name The name to set.
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	/**
+	 * @return Returns the order.
+	 */
+	public Orders getOrderId() {
+		return order;
+	}
+	/**
+	 * @param order The order to set.
+	 */
+	public void setOrderId(Orders order) {
+		this.order = order;
+	}
+	/**
+	 * @return Returns the order.
+	 */
+	public Orders getOrdersByOrderId() {
+		return order;
+	}
+	/**
+	 * @param order The order to set.
+	 */
+	public void setOrdersByOrderId(Orders order) {
+		this.order = order;
+	}
+	/**
+	 * @return Returns the relatedorderId.
+	 */
+	public Orders getOrdersByRelatedOrderId() {
+		return relatedorderId;
+	}
+	/**
+	 * @param relatedorderId The relatedorderId to set.
+	 */
+	public void setOrdersByRelatedOrderId(Orders relatedorderId) {
+		this.relatedorderId = relatedorderId;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/Orders.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/Orders.java
new file mode 100644
index 000000000000..aeb34457fcbf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/Orders.java
@@ -0,0 +1,79 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.PersistentClasses;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author max
+ *
+ */
+public class Orders {
+
+	Integer id;
+
+	String name;
+
+	Set<Item> items = new HashSet<>();
+	Set<Item> items_1 = new HashSet<>();
+
+
+	/**
+	 * @return Returns the id.
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * @param id
+	 *            The id to set.
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * @return Returns the name.
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name
+	 *            The name to set.
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * @return Returns the setOfItem.
+	 */
+	public Set<Item> getItemsForOrderId() {
+		return items;
+	}
+
+	/**
+	 * @param items
+	 *            The setOfItem to set.
+	 */
+	public void setItemsForOrderId(Set<Item> items) {
+		this.items = items;
+	}
+	/**
+	 * @return Returns the setOfItem_1.
+	 */
+	public Set<Item> getItemsForRelatedOrderId() {
+		return items_1;
+	}
+	/**
+	 * @param items_1 The setOfItem_1 to set.
+	 */
+	public void setItemsForRelatedOrderId(Set<Item> items_1) {
+		this.items_1 = items_1;
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/TestCase.java
new file mode 100644
index 000000000000..a8fd89b33592
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/TestCase.java
@@ -0,0 +1,169 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.PersistentClasses;
+
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.boot.Metadata;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Environment;
+import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.KeyValue;
+import org.hibernate.mapping.OneToMany;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Set;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengSettings;
+import org.hibernate.tool.reveng.internal.core.strategy.AbstractStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String PACKAGE_NAME = "org.hibernate.tool.reveng.jdbc2cfg.PersistentClasses";
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		AbstractStrategy c = new DefaultStrategy();
+		c.setSettings(new RevengSettings(c).setDefaultPackageName(PACKAGE_NAME));
+		metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(c, null)
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testCreatePersistentClasses() {
+		PersistentClass classMapping = metadata.getEntityBinding(PACKAGE_NAME + ".Orders");
+		assertNotNull(classMapping, "class not found");
+		KeyValue identifier = classMapping.getIdentifier();
+		assertNotNull(identifier);
+	}
+
+	@Test
+	public void testCreateManyToOne() {
+		PersistentClass classMapping = metadata.getEntityBinding(PACKAGE_NAME + ".Item");
+		assertNotNull(classMapping);
+		KeyValue identifier = classMapping.getIdentifier();
+		assertNotNull(identifier);
+		assertEquals(3,classMapping.getPropertyClosureSpan() );
+		Property property = classMapping.getProperty("ordersByRelatedOrderId");
+		assertNotNull(property);
+		property = classMapping.getProperty("ordersByOrderId");
+		assertNotNull(property);
+	}
+
+	@Test
+	public void testCreateOneToMany() {
+		PersistentClass orders = metadata.getEntityBinding(PACKAGE_NAME + ".Orders");
+		Property itemset = orders.getProperty("itemsForRelatedOrderId");
+		Collection col = (Collection) itemset.getValue();
+		OneToMany otm = (OneToMany) col.getElement();
+		assertEquals(PACKAGE_NAME + ".Item", otm.getReferencedEntityName());
+		assertEquals(PACKAGE_NAME + ".Item", otm.getAssociatedClass().getClassName());
+		assertEquals("ORDERS", otm.getTable().getName());
+		assertNotNull(itemset);
+		assertInstanceOf(Set.class, itemset.getValue());
+	}
+
+	@Test
+	public void testBinding() throws HibernateException {
+
+		String schemaToUse = Environment
+				.getProperties()
+				.getProperty(AvailableSettings.DEFAULT_SCHEMA);
+		PersistentClass orders = metadata.getEntityBinding(PACKAGE_NAME + ".Orders");
+		orders.getTable().setSchema(schemaToUse);
+		PersistentClass items = metadata.getEntityBinding(PACKAGE_NAME + ".Item");
+		items.getTable().setSchema(schemaToUse);
+
+		SessionFactory sf = metadata.buildSessionFactory();
+		Session session = sf.openSession();
+		Transaction t = session.beginTransaction();
+
+		Orders order = new Orders();
+		order.setId(1);
+		order.setName("Mickey");
+
+		session.merge(order);
+
+		Item item = addItem(order, 42, "item 42");
+		session.merge(item);
+		session.merge(addItem(order, 43, "x") );
+		session.merge(addItem(order, 44, "y") );
+		session.merge(addItem(order, 45, "z") );
+		session.merge(addItem(order, 46, "w") );
+
+		t.commit();
+		session.close();
+
+		session = sf.openSession();
+		t = session.beginTransaction();
+
+		Item loadeditem = (Item) session.find(PACKAGE_NAME + ".Item", 42 );
+
+		assertEquals(item.getName(),loadeditem.getName() );
+		assertEquals(item.getChildId(),loadeditem.getChildId() );
+		assertEquals(item.getOrderId().getId(),loadeditem.getOrderId().getId() );
+
+		assertTrue(loadeditem.getOrderId().getItemsForOrderId().contains(loadeditem) );
+		assertTrue(item.getOrderId().getItemsForOrderId().contains(item) );
+
+		assertEquals(5,item.getOrderId().getItemsForOrderId().size() );
+		assertEquals(5,loadeditem.getOrderId().getItemsForOrderId().size() );
+
+		t.commit();
+		session.close();
+
+		session = sf.openSession();
+		t = session.beginTransaction();
+
+		order = session.getReference(Orders.class, 1);
+		assertFalse(Hibernate.isInitialized(order) );
+		assertFalse(Hibernate.isInitialized(order.getItemsForOrderId() ) );
+
+		order = (Orders) session.createQuery("from " + PACKAGE_NAME + ".Orders", null).getSingleResult();
+
+		assertFalse(Hibernate.isInitialized(order.getItemsForOrderId() ) );
+		t.commit();
+		session.close();
+		sf.close();
+	}
+
+	private Item addItem(Orders m, int itemid, String name) {
+		Item item = new Item();
+		item.setChildId(itemid);
+		item.setOrderId(m);
+		item.setName(name);
+		item.setOrdersByRelatedOrderId(m);
+		m.getItemsForOrderId().add(item);
+		return item;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/TestCase.java
new file mode 100644
index 000000000000..c5f58bc8eebd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/TestCase.java
@@ -0,0 +1,178 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.RevEngForeignKey;
+
+import org.hibernate.MappingException;
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.SimpleValue;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.DefaultStrategy;
+import org.hibernate.tool.reveng.internal.core.strategy.OverrideRepository;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private static final String FOREIGN_KEY_TEST_XML = "org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/foreignkeytest.reveng.xml";
+	private static final String BAD_FOREIGN_KEY_XML = "org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/badforeignkeytest.reveng.xml";
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testDefaultBiDirectional() {
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+		PersistentClass project = metadata.getEntityBinding("Project");
+		assertNotNull(project.getProperty("worksOns"));
+		assertNotNull(project.getProperty("employee"));
+		assertEquals(3, project.getPropertyClosureSpan());
+		assertEquals("projectId", project.getIdentifierProperty().getName());
+		PersistentClass employee = metadata.getEntityBinding("Employee");
+		assertNotNull(employee.getProperty("worksOns"));
+		assertNotNull(employee.getProperty("employees"));
+		assertNotNull(employee.getProperty("employee"));
+		assertNotNull(employee.getProperty("projects"));
+		assertEquals(5, employee.getPropertyClosureSpan());
+		assertEquals("id", employee.getIdentifierProperty().getName());
+		PersistentClass worksOn = metadata.getEntityBinding("WorksOn");
+		assertNotNull(worksOn.getProperty("project"));
+		assertNotNull(worksOn.getProperty("employee"));
+		assertEquals(4, worksOn.getPropertyClosureSpan());
+		assertEquals("id", worksOn.getIdentifierProperty().getName());
+	}
+
+	@Test
+	public void testSetAndManyToOne() {
+		OverrideRepository or = new OverrideRepository();
+		or.addResource(FOREIGN_KEY_TEST_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(new DefaultStrategy());
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(repository, null)
+				.createMetadata();
+		PersistentClass project = metadata.getEntityBinding("Project");
+		assertNotNull(project.getProperty("worksOns"));
+		assertPropertyNotExists(project, "employee", "should be removed by reveng.xml");
+		Property property = project.getProperty("teamLead");
+		assertNotNull(property);
+		assertInstanceOf(SimpleValue.class, property.getValue());
+		assertEquals(3, project.getPropertyClosureSpan());
+		assertEquals("projectId", project.getIdentifierProperty().getName());
+		PersistentClass employee = metadata.getEntityBinding("Employee");
+		assertNotNull(employee.getProperty("worksOns"));
+		assertNotNull(employee.getProperty("manager"), "property should be renamed by reveng.xml");
+		assertPropertyNotExists( employee, "employees", "set should be excluded by reveng.xml" );
+		Property setProperty = employee.getProperty("managedProjects");
+		assertNotNull(setProperty, "should be renamed by reveng.xml");
+		assertEquals("delete, update", setProperty.getCascade());
+		assertEquals(4, employee.getPropertyClosureSpan());
+		assertEquals("id", employee.getIdentifierProperty().getName());
+		PersistentClass worksOn = metadata.getEntityBinding("WorksOn");
+		assertNotNull(worksOn.getProperty("project"));
+		assertNotNull(worksOn.getProperty("employee"));
+		assertEquals(4, worksOn.getPropertyClosureSpan());
+		assertEquals("id", worksOn.getIdentifierProperty().getName());
+	}
+
+	@Test
+	public void testOneToOne() {
+		OverrideRepository or = new OverrideRepository();
+		or.addResource(FOREIGN_KEY_TEST_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(new DefaultStrategy());
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(repository, null)
+				.createMetadata();
+		PersistentClass person = metadata.getEntityBinding("Person");
+		PersistentClass addressPerson = metadata.getEntityBinding("AddressPerson");
+		PersistentClass addressMultiPerson = metadata.getEntityBinding("AddressMultiPerson");
+		PersistentClass multiPerson = metadata.getEntityBinding("MultiPerson");
+		assertPropertyNotExists(addressPerson, "person", "should be removed by reveng.xml");
+		assertPropertyNotExists(person, "addressPerson", "should be removed by reveng.xml");
+		Property property = addressMultiPerson.getProperty("renamedOne");
+		assertNotNull(property);
+		assertEquals("delete", property.getCascade(), "Cascade should be set to delete by reveng.xml");
+		assertPropertyNotExists(multiPerson, "addressMultiPerson", "should not be there");
+		Property o2o = multiPerson.getProperty("renamedInversedOne");
+		assertNotNull(o2o);
+		assertEquals("update", o2o.getCascade());
+		assertEquals("JOIN", o2o.getValue().getFetchMode().toString());
+	}
+
+	@Test
+	public void testDuplicateForeignKeyDefinition() {
+		try {
+			OverrideRepository or = new OverrideRepository();
+			or.addResource( BAD_FOREIGN_KEY_XML );
+			RevengStrategy repository = or.getReverseEngineeringStrategy(new DefaultStrategy());
+			MetadataDescriptorFactory
+					.createReverseEngineeringDescriptor(repository, null)
+					.createMetadata();
+			fail("Should fail because foreign key is already defined in the database"); // maybe we should ignore the definition and only listen to what is overwritten ? For now, we error.
+		} catch(MappingException me) {
+			assertTrue(me.getMessage().contains("already defined"));
+		}
+	}
+
+	@Test
+	public void testManyToOneAttributeDefaults() {
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+		PersistentClass classMapping = metadata.getEntityBinding("Employee");
+		Property property = classMapping.getProperty("employee");
+		assertEquals("none", property.getCascade());
+		assertTrue(property.isUpdatable());
+		assertTrue(property.isInsertable());
+		assertEquals("SELECT", property.getValue().getFetchMode().toString());
+	}
+
+	@Test
+	public void testManyToOneAttributeOverrides() {
+		OverrideRepository or = new OverrideRepository();
+		or.addResource(FOREIGN_KEY_TEST_XML);
+		RevengStrategy repository = or.getReverseEngineeringStrategy(new DefaultStrategy());
+		Metadata metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(repository, null)
+				.createMetadata();
+		PersistentClass classMapping = metadata.getEntityBinding("Employee");
+		Property property = classMapping.getProperty("manager");
+		assertEquals("all", property.getCascade());
+		assertFalse(property.isUpdatable());
+		assertFalse(property.isInsertable());
+		assertEquals("JOIN", property.getValue().getFetchMode().toString());
+	}
+
+	private void assertPropertyNotExists(PersistentClass employee, String name, String msg) {
+		try {
+			employee.getProperty(name);
+			fail(msg);
+		} catch(MappingException ignored) {}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/SearchEscapeString/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/SearchEscapeString/TestCase.java
new file mode 100644
index 000000000000..eb0b44d79fee
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/SearchEscapeString/TestCase.java
@@ -0,0 +1,60 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.SearchEscapeString;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.test.utils.HibernateUtil;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private Metadata metadata = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		metadata = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null)
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testBasic() {
+
+		JUnitUtil.assertIteratorContainsExactly(
+				"There should be 2 tables!",
+				metadata.collectTableMappings().iterator(),
+				2);
+
+		Table table = HibernateUtil.getTable(metadata, JdbcUtil.toIdentifier(this, "B_TAB" ) );
+		Table table2 = HibernateUtil.getTable(metadata, JdbcUtil.toIdentifier(this, "B2TAB" ) );
+
+		assertNotNull(table);
+		assertNotNull(table2);
+
+		assertEquals(2, table.getColumnSpan());
+		assertEquals(2, table2.getColumnSpan());
+
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/TernarySchema/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/TernarySchema/TestCase.java
new file mode 100644
index 000000000000..0f240698329f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/TernarySchema/TestCase.java
@@ -0,0 +1,139 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.TernarySchema;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.mapping.Set;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.api.core.RevengStrategy.SchemaSelection;
+import org.hibernate.tool.reveng.internal.export.common.DefaultValueVisitor;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.internal.core.strategy.AbstractStrategy;
+import org.hibernate.tool.reveng.test.utils.JUnitUtil;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	private MetadataDescriptor metadataDescriptor = null;
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		AbstractStrategy c = new AbstractStrategy() {
+			public List<SchemaSelection> getSchemaSelections() {
+				List<SchemaSelection> selections = new ArrayList<>();
+				selections.add(createSchemaSelection("HTT"));
+				selections.add(createSchemaSelection("OTHERSCHEMA"));
+				selections.add(createSchemaSelection("THIRDSCHEMA"));
+				return selections;
+			}
+		};
+		metadataDescriptor = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(c, null);
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testTernaryModel() {
+		assertMultiSchema(metadataDescriptor.createMetadata());
+	}
+
+	@Test
+	public void testGeneration() {
+		HbmExporter hme = new HbmExporter();
+		hme.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		hme.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		hme.start();
+		JUnitUtil.assertIsNonEmptyFile( new File(outputFolder, "Role.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputFolder, "Member.hbm.xml") );
+		JUnitUtil.assertIsNonEmptyFile( new File(outputFolder, "Plainrole.hbm.xml") );
+		assertEquals(3, Objects.requireNonNull( outputFolder.listFiles() ).length);
+		File[] files = new File[3];
+		files[0] = new File(outputFolder, "Role.hbm.xml");
+		files[1] = new File(outputFolder, "Member.hbm.xml");
+		files[2] = new File(outputFolder, "Plainrole.hbm.xml");
+		assertMultiSchema(MetadataDescriptorFactory
+				.createNativeDescriptor(null, files, null)
+				.createMetadata());
+	}
+
+	private void assertMultiSchema(Metadata metadata) {
+		JUnitUtil.assertIteratorContainsExactly(
+				"There should be three entities!",
+				metadata.getEntityBindings().iterator(),
+				3);
+		final PersistentClass role = metadata.getEntityBinding("Role");
+		assertNotNull(role);
+		PersistentClass member = metadata.getEntityBinding("Member");
+		assertNotNull(member);
+		PersistentClass plainRole = metadata.getEntityBinding("Plainrole");
+		assertNotNull(plainRole);
+		Property property = role.getProperty("members");
+		assertEquals( "OTHERSCHEMA", role.getTable().getSchema() );
+		assertNotNull(property);
+		property.getValue().accept(new DefaultValueVisitor(true) {
+			public Object accept(Set o) {
+				assertEquals( "THIRDSCHEMA", o.getCollectionTable().getSchema() );
+				return null;
+			}
+		});
+		property = plainRole.getProperty("members");
+		assertEquals( "OTHERSCHEMA", role.getTable().getSchema() );
+		assertNotNull(property);
+		property.getValue().accept(new DefaultValueVisitor(true) {
+			public Object accept(Set o) {
+				// TODO Investigate the ignored test: HBX-1410
+				// For some reason the explicit schema 'HTT' is not reproduced in the many-to-many set in the hbm.xml files
+				// Need to investigate the HBM generation and to try rebuild the metadata with the schema explicitly set
+				// assertEquals("HTT", o.getCollectionTable().getSchema() );
+				return null;
+			}
+		});
+	}
+
+	private SchemaSelection createSchemaSelection(String matchSchema) {
+		return new SchemaSelection() {
+			@Override
+			public String getMatchCatalog() {
+				return null;
+			}
+			@Override
+			public String getMatchSchema() {
+				return matchSchema;
+			}
+			@Override
+			public String getMatchTable() {
+				return null;
+			}
+		};
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Versioning/TestCase.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Versioning/TestCase.java
new file mode 100644
index 000000000000..633bdca26b2b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/jdbc2cfg/Versioning/TestCase.java
@@ -0,0 +1,100 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.jdbc2cfg.Versioning;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.mapping.PersistentClass;
+import org.hibernate.mapping.Property;
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterConstants;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+import org.hibernate.tool.reveng.internal.export.hbm.HbmExporter;
+import org.hibernate.tool.reveng.test.utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * To be extended by VersioningForJDK50Test for the JPA generation part
+ * @author max
+ * @author koen
+ */
+public class TestCase {
+
+	private Metadata metadata = null;
+	private MetadataDescriptor metadataDescriptor = null;
+
+	@TempDir
+	public File outputFolder = new File("output");
+
+	@BeforeEach
+	public void setUp() {
+		JdbcUtil.createDatabase(this);
+		metadataDescriptor = MetadataDescriptorFactory
+				.createReverseEngineeringDescriptor(null, null);
+		metadata = metadataDescriptor
+				.createMetadata();
+	}
+
+	@AfterEach
+	public void tearDown() {
+		JdbcUtil.dropDatabase(this);
+	}
+
+	@Test
+	public void testVersion() {
+		PersistentClass cl = metadata.getEntityBinding("WithVersion");
+		Property version = cl.getVersion();
+		assertNotNull(version);
+		assertEquals("version", version.getName());
+		cl = metadata.getEntityBinding("NoVersion");
+		assertNotNull(cl);
+		version = cl.getVersion();
+		assertNull(version);
+	}
+
+	@Test
+	public void testGenerateMappings() {
+		Exporter exporter = new HbmExporter();
+		exporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, metadataDescriptor);
+		exporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);
+		exporter.start();
+		File[] files = new File[4];
+		files[0] = new File(outputFolder, "WithVersion.hbm.xml");
+		files[1] = new File(outputFolder, "NoVersion.hbm.xml");
+		files[2] = new File(outputFolder, "WithRealTimestamp.hbm.xml");
+		files[3] = new File(outputFolder, "WithFakeTimestamp.hbm.xml");
+		Metadata metadata = MetadataDescriptorFactory
+				.createNativeDescriptor(null, files, null)
+				.createMetadata();
+		PersistentClass cl = metadata.getEntityBinding( "WithVersion" );
+		Property version = cl.getVersion();
+		assertNotNull(version);
+		assertEquals("version", version.getName());
+		cl = metadata.getEntityBinding( "NoVersion" );
+		assertNotNull(cl);
+		version = cl.getVersion();
+		assertNull(version);
+		cl = metadata.getEntityBinding( "WithRealTimestamp" );
+		assertNotNull(cl);
+		version = cl.getVersion();
+		assertNotNull(version);
+		assertEquals("timestamp", version.getType().getName());
+		cl = metadata.getEntityBinding( "WithFakeTimestamp" );
+		assertNotNull(cl);
+		version = cl.getVersion();
+		assertNotNull(version);
+		assertEquals("integer", version.getType().getName());
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/ConnectionProvider.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/ConnectionProvider.java
new file mode 100644
index 000000000000..df76b6689c60
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/ConnectionProvider.java
@@ -0,0 +1,275 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.test.utils;
+
+import org.hibernate.engine.jdbc.connections.internal.UserSuppliedConnectionProviderImpl;
+
+import java.io.Serial;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.RowIdLifetime;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+
+public class ConnectionProvider extends UserSuppliedConnectionProviderImpl {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	private static final Connection CONNECTION = new Connection();
+	private static final DatabaseMetaData DATABASE_META_DATA = new DatabaseMetaData();
+
+	@Override public java.sql.Connection getConnection() { return CONNECTION; }
+
+	@Override public void closeConnection(java.sql.Connection conn) {}
+
+	private static class Connection implements java.sql.Connection {
+		@Override public <T> T unwrap(Class<T> iface) { return null; }
+		@Override public boolean isWrapperFor(Class<?> iface) { return false; }
+		@Override public Statement createStatement() { return null; }
+		@Override public PreparedStatement prepareStatement(String sql) { return null; }
+		@Override public CallableStatement prepareCall(String sql) { return null; }
+		@Override public String nativeSQL(String sql) { return null; }
+		@Override public void setAutoCommit(boolean autoCommit) {}
+		@Override public boolean getAutoCommit() { return false; }
+		@Override public void commit() {}
+		@Override public void rollback() {}
+		@Override public void close() {}
+		@Override public boolean isClosed() { return false; }
+		@Override public DatabaseMetaData getMetaData() { return DATABASE_META_DATA; }
+		@Override public void setReadOnly(boolean readOnly) {}
+		@Override public boolean isReadOnly() { return false; }
+		@Override public void setCatalog(String catalog) {}
+		@Override public String getCatalog() { return null; }
+		@Override public void setTransactionIsolation(int level) {}
+		@Override public int getTransactionIsolation() { return java.sql.Connection.TRANSACTION_NONE; }
+		@Override public SQLWarning getWarnings() { return null; }
+		@Override public void clearWarnings() {}
+		@Override public Statement createStatement(int resultSetType, int resultSetConcurrency) { return null; }
+		@Override public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) { return null; }
+		@Override public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) { return null; }
+		@Override public Map<String, Class<?>> getTypeMap() { return null; }
+		@Override public void setTypeMap(Map<String, Class<?>> map) {}
+		@Override public void setHoldability(int holdability) {}
+		@Override public int getHoldability() { return 0; }
+		@Override public Savepoint setSavepoint() { return null; }
+		@Override public Savepoint setSavepoint(String name) { return null; }
+		@Override public void rollback(Savepoint savepoint) {}
+		@Override public void releaseSavepoint(Savepoint savepoint) {}
+		@Override public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) { return null; }
+		@Override public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) { return null; }
+		@Override public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) { return null; }
+		@Override public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) { return null; }
+		@Override public PreparedStatement prepareStatement(String sql, int[] columnIndexes) { return null; }
+		@Override public PreparedStatement prepareStatement(String sql, String[] columnNames) { return null; }
+		@Override public Clob createClob() { return null; }
+		@Override public Blob createBlob() { return null; }
+		@Override public NClob createNClob() { return null; }
+		@Override public SQLXML createSQLXML() { return null; }
+		@Override public boolean isValid(int timeout) { return false;}
+		@Override public void setClientInfo(String name, String value) {}
+		@Override public void setClientInfo(Properties properties) {}
+		@Override public String getClientInfo(String name) { return null; }
+		@Override public Properties getClientInfo() { return null; }
+		@Override public Array createArrayOf(String typeName, Object[] elements) { return null; }
+		@Override public Struct createStruct(String typeName, Object[] attributes) { return null; }
+		@Override public void setSchema(String schema) {}
+		@Override public String getSchema() { return null; }
+		@Override public void abort(Executor executor) {}
+		@Override public void setNetworkTimeout(Executor executor, int milliseconds) {}
+		@Override public int getNetworkTimeout() { return 0; }
+	}
+
+	private static class DatabaseMetaData implements java.sql.DatabaseMetaData {
+		@Override public <T> T unwrap(Class<T> iface) { return null; }
+		@Override public boolean isWrapperFor(Class<?> iface) { return false; }
+		@Override public boolean allProceduresAreCallable() { return false; }
+		@Override public boolean allTablesAreSelectable() { return false; }
+		@Override public String getURL() { return null; }
+		@Override public String getUserName() { return null; }
+		@Override public boolean isReadOnly() { return false; }
+		@Override public boolean nullsAreSortedHigh() { return false; }
+		@Override public boolean nullsAreSortedLow() { return false; }
+		@Override public boolean nullsAreSortedAtStart() { return false; }
+		@Override public boolean nullsAreSortedAtEnd() { return false; }
+		@Override public String getDatabaseProductName() { return null; }
+		@Override public String getDatabaseProductVersion() { return ""; }
+		@Override public String getDriverName() { return null; }
+		@Override public String getDriverVersion() { return null; }
+		@Override public int getDriverMajorVersion() { return 0; }
+		@Override public int getDriverMinorVersion() { return 0; }
+		@Override public boolean usesLocalFiles() { return false; }
+		@Override public boolean usesLocalFilePerTable() { return false; }
+		@Override public boolean supportsMixedCaseIdentifiers() { return false; }
+		@Override public boolean storesUpperCaseIdentifiers() { return false; }
+		@Override public boolean storesLowerCaseIdentifiers() { return false; }
+		@Override public boolean storesMixedCaseIdentifiers() { return false; }
+		@Override public boolean supportsMixedCaseQuotedIdentifiers() { return false; }
+		@Override public boolean storesUpperCaseQuotedIdentifiers() { return false; }
+		@Override public boolean storesLowerCaseQuotedIdentifiers() { return false; }
+		@Override public boolean storesMixedCaseQuotedIdentifiers() { return false; }
+		@Override public String getIdentifierQuoteString() { return null; }
+		@Override public String getSQLKeywords() { return null; }
+		@Override public String getNumericFunctions() { return null; }
+		@Override public String getStringFunctions() { return null; }
+		@Override public String getSystemFunctions() { return null; }
+		@Override public String getTimeDateFunctions() { return null; }
+		@Override public String getSearchStringEscape() { return null; }
+		@Override public String getExtraNameCharacters() { return null; }
+		@Override public boolean supportsAlterTableWithAddColumn() { return false; }
+		@Override public boolean supportsAlterTableWithDropColumn() { return false; }
+		@Override public boolean supportsColumnAliasing() { return false; }
+		@Override public boolean nullPlusNonNullIsNull() { return false; }
+		@Override public boolean supportsConvert() { return false; }
+		@Override public boolean supportsConvert(int fromType, int toType) { return false; }
+		@Override public boolean supportsTableCorrelationNames() { return false; }
+		@Override public boolean supportsDifferentTableCorrelationNames() { return false; }
+		@Override public boolean supportsExpressionsInOrderBy() { return false; }
+		@Override public boolean supportsOrderByUnrelated() { return false; }
+		@Override public boolean supportsGroupBy() { return false; }
+		@Override public boolean supportsGroupByUnrelated() { return false; }
+		@Override public boolean supportsGroupByBeyondSelect() { return false; }
+		@Override public boolean supportsLikeEscapeClause() { return false; }
+		@Override public boolean supportsMultipleResultSets() { return false; }
+		@Override public boolean supportsMultipleTransactions() { return false; }
+		@Override public boolean supportsNonNullableColumns() { return false; }
+		@Override public boolean supportsMinimumSQLGrammar() { return false; }
+		@Override public boolean supportsCoreSQLGrammar() { return false; }
+		@Override public boolean supportsExtendedSQLGrammar() { return false; }
+		@Override public boolean supportsANSI92EntryLevelSQL() { return false; }
+		@Override public boolean supportsANSI92IntermediateSQL() { return false; }
+		@Override public boolean supportsANSI92FullSQL() { return false; }
+		@Override public boolean supportsIntegrityEnhancementFacility() { return false; }
+		@Override public boolean supportsOuterJoins() { return false; }
+		@Override public boolean supportsFullOuterJoins() { return false; }
+		@Override public boolean supportsLimitedOuterJoins() { return false; }
+		@Override public String getSchemaTerm() { return null; }
+		@Override public String getProcedureTerm() { return null; }
+		@Override public String getCatalogTerm() { return null; }
+		@Override public boolean isCatalogAtStart() { return false; }
+		@Override public String getCatalogSeparator() { return null; }
+		@Override public boolean supportsSchemasInDataManipulation() { return false; }
+		@Override public boolean supportsSchemasInProcedureCalls() { return false; }
+		@Override public boolean supportsSchemasInTableDefinitions() { return false; }
+		@Override public boolean supportsSchemasInIndexDefinitions() { return false; }
+		@Override public boolean supportsSchemasInPrivilegeDefinitions() { return false; }
+		@Override public boolean supportsCatalogsInDataManipulation() { return false; }
+		@Override public boolean supportsCatalogsInProcedureCalls() { return false; }
+		@Override public boolean supportsCatalogsInTableDefinitions() { return false; }
+		@Override public boolean supportsCatalogsInIndexDefinitions() { return false; }
+		@Override public boolean supportsCatalogsInPrivilegeDefinitions() { return false; }
+		@Override public boolean supportsPositionedDelete() { return false; }
+		@Override public boolean supportsPositionedUpdate() { return false; }
+		@Override public boolean supportsSelectForUpdate() { return false; }
+		@Override public boolean supportsStoredProcedures() { return false; }
+		@Override public boolean supportsSubqueriesInComparisons() { return false; }
+		@Override public boolean supportsSubqueriesInExists() { return false; }
+		@Override public boolean supportsSubqueriesInIns() { return false; }
+		@Override public boolean supportsSubqueriesInQuantifieds() { return false; }
+		@Override public boolean supportsCorrelatedSubqueries() { return false; }
+		@Override public boolean supportsUnion() { return false; }
+		@Override public boolean supportsUnionAll() { return false; }
+		@Override public boolean supportsOpenCursorsAcrossCommit() { return false; }
+		@Override public boolean supportsOpenCursorsAcrossRollback() { return false; }
+		@Override public boolean supportsOpenStatementsAcrossCommit() { return false; }
+		@Override public boolean supportsOpenStatementsAcrossRollback() { return false; }
+		@Override public int getMaxBinaryLiteralLength() { return 0; }
+		@Override public int getMaxCharLiteralLength() { return 0; }
+		@Override public int getMaxColumnNameLength() { return 0; }
+		@Override public int getMaxColumnsInGroupBy() { return 0; }
+		@Override public int getMaxColumnsInIndex() { return 0; }
+		@Override public int getMaxColumnsInOrderBy() { return 0; }
+		@Override public int getMaxColumnsInSelect() { return 0; }
+		@Override public int getMaxColumnsInTable() { return 0; }
+		@Override public int getMaxConnections() { return 0; }
+		@Override public int getMaxCursorNameLength() { return 0; }
+		@Override public int getMaxIndexLength() { return 0; }
+		@Override public int getMaxSchemaNameLength() { return 0; }
+		@Override public int getMaxProcedureNameLength() { return 0; }
+		@Override public int getMaxCatalogNameLength() { return 0; }
+		@Override public int getMaxRowSize() { return 0; }
+		@Override public boolean doesMaxRowSizeIncludeBlobs() { return false; }
+		@Override public int getMaxStatementLength() { return 0; }
+		@Override public int getMaxStatements() { return 0; }
+		@Override public int getMaxTableNameLength() { return 0; }
+		@Override public int getMaxTablesInSelect() { return 0; }
+		@Override public int getMaxUserNameLength() { return 0; }
+		@Override public int getDefaultTransactionIsolation() { return 0; }
+		@Override public boolean supportsTransactions() { return false; }
+		@Override public boolean supportsTransactionIsolationLevel(int level) { return false; }
+		@Override public boolean supportsDataDefinitionAndDataManipulationTransactions() { return false; }
+		@Override public boolean supportsDataManipulationTransactionsOnly() { return false; }
+		@Override public boolean dataDefinitionCausesTransactionCommit() { return false; }
+		@Override public boolean dataDefinitionIgnoredInTransactions() { return false; }
+		@Override public ResultSet getProcedures(String catalog, String schemaPattern, String procedureNamePattern) { return null; }
+		@Override public ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern, String columnNamePattern) { return null; }
+		@Override public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) { return null; }
+		@Override public ResultSet getSchemas() { return null; }
+		@Override public ResultSet getCatalogs() { return null; }
+		@Override public ResultSet getTableTypes() { return null; }
+		@Override public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) { return null; }
+		@Override public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) { return null; }
+		@Override public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern) { return null; }
+		@Override public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) { return null; }
+		@Override public ResultSet getVersionColumns(String catalog, String schema, String table) { return null; }
+		@Override public ResultSet getPrimaryKeys(String catalog, String schema, String table) { return null; }
+		@Override public ResultSet getImportedKeys(String catalog, String schema, String table) { return null; }
+		@Override public ResultSet getExportedKeys(String catalog, String schema, String table) { return null; }
+		@Override public ResultSet getCrossReference(String parentCatalog, String parentSchema, String parentTable, String foreignCatalog, String foreignSchema, String foreignTable) { return null; }
+		@Override public ResultSet getTypeInfo() { return null; }
+		@Override public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) { return null; }
+		@Override public boolean supportsResultSetType(int type) { return false; }
+		@Override public boolean supportsResultSetConcurrency(int type, int concurrency) { return false; }
+		@Override public boolean ownUpdatesAreVisible(int type) { return false; }
+		@Override public boolean ownDeletesAreVisible(int type) { return false; }
+		@Override public boolean ownInsertsAreVisible(int type) { return false; }
+		@Override public boolean othersUpdatesAreVisible(int type) { return false; }
+		@Override public boolean othersDeletesAreVisible(int type) { return false; }
+		@Override public boolean othersInsertsAreVisible(int type) { return false; }
+		@Override public boolean updatesAreDetected(int type) { return false; }
+		@Override public boolean deletesAreDetected(int type) { return false; }
+		@Override public boolean insertsAreDetected(int type) { return false; }
+		@Override public boolean supportsBatchUpdates() { return false; }
+		@Override public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) { return null; }
+		@Override public Connection getConnection() { return CONNECTION; }
+		@Override public boolean supportsSavepoints() { return false; }
+		@Override public boolean supportsNamedParameters() { return false; }
+		@Override public boolean supportsMultipleOpenResults() { return false; }
+		@Override public boolean supportsGetGeneratedKeys() { return false; }
+		@Override public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern) { return null; }
+		@Override public ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern) {return null;}
+		@Override public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, String attributeNamePattern) { return null; }
+		@Override public boolean supportsResultSetHoldability(int holdability) { return false; }
+		@Override public int getResultSetHoldability() { return 0; }
+		@Override public int getDatabaseMajorVersion() { return 0; }
+		@Override public int getDatabaseMinorVersion() { return 0; }
+		@Override public int getJDBCMajorVersion() { return 0; }
+		@Override public int getJDBCMinorVersion() { return 0; }
+		@Override public int getSQLStateType() { return DatabaseMetaData.sqlStateSQL; }
+		@Override public boolean locatorsUpdateCopy() { return false; }
+		@Override public boolean supportsStatementPooling() { return false; }
+		@Override public RowIdLifetime getRowIdLifetime() { return null; }
+		@Override public ResultSet getSchemas(String catalog, String schemaPattern) { return null; }
+		@Override public boolean supportsStoredFunctionsUsingCallSyntax() { return false; }
+		@Override public boolean autoCommitFailureClosesAllResultSets() { return false; }
+		@Override public ResultSet getClientInfoProperties() { return null; }
+		@Override public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) { return null; }
+		@Override public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern) { return null; }
+		@Override public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) { return null; }
+		@Override public boolean generatedKeyAlwaysReturned() { return false; }
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/FileUtil.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/FileUtil.java
new file mode 100644
index 000000000000..70dbb54d8164
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/FileUtil.java
@@ -0,0 +1,49 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.test.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class FileUtil {
+
+	static public String findFirstString(String string, File file) {
+		String str;
+		try (BufferedReader in = new BufferedReader(new FileReader(file))) {
+			while ( (str = in.readLine() ) != null ) {
+				if(str.contains(string)) {
+					break;
+				}
+			}
+		}
+		catch (IOException e) {
+			throw new RuntimeException("trouble with searching in " + file,e);
+		}
+		return str;
+	}
+
+	static public void generateNoopComparator(File sourceFolder) throws IOException {
+		File file = new File(sourceFolder.getAbsolutePath() + "/comparator/NoopComparator.java");
+		assertTrue(file.getParentFile().mkdirs());
+		FileWriter fileWriter = new FileWriter(file);
+		PrintWriter pw = new PrintWriter(fileWriter);
+		pw.println("package comparator;                                ");
+		pw.println("import java.util.Comparator;                       ");
+		pw.println("public class NoopComparator implements Comparator {");
+		pw.println("	public int compare(Object o1, Object o2) {     ");
+		pw.println("		return 0;                                  ");
+		pw.println("	}                                              ");
+		pw.println("}                                                  ");
+		pw.flush();
+		pw.close();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/HibernateUtil.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/HibernateUtil.java
new file mode 100644
index 000000000000..7aa2e1bfb5dd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/HibernateUtil.java
@@ -0,0 +1,81 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.test.utils;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.dialect.DatabaseVersion;
+import org.hibernate.mapping.ForeignKey;
+import org.hibernate.mapping.Table;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptor;
+import org.hibernate.tool.reveng.api.metadata.MetadataDescriptorFactory;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.Properties;
+
+public class HibernateUtil {
+
+	public static class Dialect extends org.hibernate.dialect.Dialect {
+		public Dialect() {
+			super((DatabaseVersion)null);
+		}
+	}
+
+	public static ForeignKey getForeignKey(Table table, String fkName) {
+		ForeignKey result = null;
+		for (ForeignKey fk : table.getForeignKeyCollection()) {
+			if (fk.getName().equals(fkName)) {
+				result = fk;
+				break;
+			}
+		}
+		return result;
+	}
+
+	public static Table getTable(Metadata metadata, String tabName) {
+		if (metadata != null) {
+			for (Table table : metadata.collectTableMappings()) {
+				if (table.getName().equals(tabName)) {
+					return table;
+				}
+			}
+		}
+		return null;
+	}
+
+	public static MetadataDescriptor initializeMetadataDescriptor(
+			Object test,
+			String[] hbmResourceNames,
+			File hbmFileDir) {
+		ResourceUtil.createResources(test, hbmResourceNames, hbmFileDir);
+		File[] hbmFiles = new File[hbmResourceNames.length];
+		for (int i = 0; i < hbmResourceNames.length; i++) {
+			hbmFiles[i] = new File(hbmFileDir, hbmResourceNames[i]);
+		}
+		Properties properties = new Properties();
+		properties.put(AvailableSettings.DIALECT, Dialect.class.getName());
+		properties.setProperty(AvailableSettings.CONNECTION_PROVIDER, ConnectionProvider.class.getName());
+		return MetadataDescriptorFactory.createNativeDescriptor(null, hbmFiles, properties);
+	}
+
+	public static void addAnnotatedClass(
+			MetadataDescriptor metadataDescriptor,
+			Class<?> annotatedClass) {
+		try {
+			Field metadataSourcesField = metadataDescriptor
+					.getClass()
+					.getDeclaredField("metadataSources");
+			metadataSourcesField.setAccessible(true);
+			MetadataSources metadataSources =
+					(MetadataSources)metadataSourcesField.get(metadataDescriptor);
+			metadataSources.addAnnotatedClass(annotatedClass);
+		} catch (NoSuchFieldException | IllegalAccessException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JUnitUtil.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JUnitUtil.java
new file mode 100644
index 000000000000..e89767f10ef9
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JUnitUtil.java
@@ -0,0 +1,37 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.test.utils;
+
+import org.opentest4j.AssertionFailedError;
+
+import java.io.File;
+import java.util.Iterator;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JUnitUtil {
+
+	public static void assertIteratorContainsExactly(
+			String reason,
+			Iterator<?> iterator,
+			int expectedAmountOfElements) {
+		int actualAmountOfElements = 0;
+		while (iterator.hasNext() &&
+			actualAmountOfElements <= expectedAmountOfElements) {
+			actualAmountOfElements++;
+			iterator.next();
+		}
+		if (expectedAmountOfElements != actualAmountOfElements) {
+			throw new AssertionFailedError(reason, expectedAmountOfElements, actualAmountOfElements);
+		}
+	}
+
+	public static void assertIsNonEmptyFile(File file) {
+		assertTrue(file.exists(), file + " does not exist");
+		assertTrue(file.isFile(), file + " not a file");
+		assertTrue(file.length()>0, file + " does not have any contents");
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JavaUtil.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JavaUtil.java
new file mode 100644
index 000000000000..f4ef35f7a858
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JavaUtil.java
@@ -0,0 +1,93 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.test.utils;
+
+import javax.tools.JavaCompiler;
+import javax.tools.ToolProvider;
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.security.CodeSource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class JavaUtil {
+
+	public static void compile(File folder) {
+		compile(folder, (List<String>)null);
+	}
+
+	public static void compile(File folder, List<String> classPath) {
+		compile(folder, folder, classPath);
+	}
+
+	public static void compile(File sourceFolder, File destinationFolder) {
+		compile(sourceFolder, destinationFolder, null);
+	}
+
+	public static void compile(
+			File sourceFolder,
+			File destinationFolder,
+			List<String> classPath) {
+		JavaCompiler javaCompiler = ToolProvider.getSystemJavaCompiler();
+		ArrayList<String> arguments = new ArrayList<>();
+		arguments.add("-d");
+		arguments.add(destinationFolder.getAbsolutePath());
+		arguments.add("-sourcepath");
+		arguments.add(sourceFolder.getAbsolutePath());
+		if (classPath != null && !classPath.isEmpty()) {
+			arguments.add("-cp");
+			arguments.add(convertClassPath(classPath));
+		}
+		ArrayList<String> fileNames = new ArrayList<>();
+		collectJavaFiles(sourceFolder, fileNames);
+		arguments.addAll(fileNames);
+		javaCompiler.run(
+				null,
+				null,
+				null,
+				arguments.toArray(new String[0]));
+	}
+
+	public static String resolvePathToJarFileFor(Class<?> clazz) {
+		String result = null;
+		CodeSource codeSource = clazz.getProtectionDomain().getCodeSource();
+		if (codeSource != null) {
+			URL url = codeSource.getLocation();
+			if (url != null) {
+				try {
+					result = new File(url.toURI()).getAbsolutePath();
+				}
+				catch (URISyntaxException e) {
+					throw new IllegalArgumentException( "Unexpected path to a Jar file: " + url, e );
+				}
+			}
+		}
+		return result;
+	}
+
+	private static void collectJavaFiles(File file, ArrayList<String> list) {
+		if (file.isDirectory()) {
+			for (File child : Objects.requireNonNull(file.listFiles())) {
+				collectJavaFiles(child, list);
+			}
+		} else {
+			if (file.getName().endsWith(".java")) {
+				list.add(file.getAbsolutePath());
+			}
+		}
+	}
+
+	private static String convertClassPath(List<String> paths) {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < paths.size() - 1; i++) {
+			sb.append(paths.get(i)).append(File.pathSeparator);
+		}
+		sb.append(paths.get(paths.size() - 1));
+		return sb.toString();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JdbcUtil.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JdbcUtil.java
new file mode 100644
index 000000000000..8c79d9adc344
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/JdbcUtil.java
@@ -0,0 +1,204 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.test.utils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Properties;
+
+public class JdbcUtil {
+
+	static HashMap<Object, Connection> CONNECTION_TABLE = new HashMap<>();
+
+	/**
+	 * Obtain the database connection properties.
+	 *
+	 * @param test object residing in the package of an optional alternate hibernate.properties.
+	 *             Set null for the default hibernate.properties.
+	 */
+	public static Properties getConnectionProperties(Object test) {
+		Properties properties = new Properties();
+		InputStream inputStream = null;
+		if (test != null) {
+			inputStream = getAlternateHibernateProperties(test);
+		}
+		if (inputStream == null) {
+			inputStream = Thread
+					.currentThread()
+					.getContextClassLoader()
+					.getResourceAsStream("hibernate.properties");
+		}
+		try {
+			properties.load(inputStream);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+		Properties connectionProperties = new Properties();
+		connectionProperties.put(
+				"url",
+				properties.getProperty("hibernate.connection.url"));
+		connectionProperties.put(
+				"user",
+				properties.getProperty("hibernate.connection.username"));
+		connectionProperties.put(
+				"password",
+				properties.getProperty("hibernate.connection.password"));
+		return connectionProperties;
+	}
+
+	public static InputStream getAlternateHibernateProperties(Object test) {
+		return ResourceUtil.resolveResourceLocation(
+				test.getClass(), "hibernate.properties");
+	}
+
+	/**
+	 * Create a database connection associated  with a test object.
+	 *
+	 * @param test object as key to stored connection. Test object package may also contain
+	 *             an optional hibernate.properties.
+	 */
+	public static void establishJdbcConnection(Object test) {
+		try {
+			CONNECTION_TABLE.put(test, createJdbcConnection(test));
+		} catch (SQLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static void releaseJdbcConnection(Object test) {
+		Connection connection = CONNECTION_TABLE.get(test);
+		CONNECTION_TABLE.remove(test);
+		try {
+			connection.close();
+		} catch (SQLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static void executeSql(Object test, String[] sqls) {
+		try {
+			executeSql(CONNECTION_TABLE.get(test), sqls);
+		} catch (SQLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static String toIdentifier(Object test, String string) {
+		Connection connection = CONNECTION_TABLE.get(test);
+		try {
+			DatabaseMetaData databaseMetaData = connection.getMetaData();
+			if (databaseMetaData.storesLowerCaseIdentifiers()) {
+				return string.toLowerCase();
+			} else if (databaseMetaData.storesUpperCaseIdentifiers()) {
+				return string.toUpperCase();
+			} else {
+				return string;
+			}
+		} catch (SQLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static boolean isDatabaseOnline(Object test) {
+		boolean result = false;
+		try {
+			Connection connection = createJdbcConnection(test);
+			result = connection.isValid(1);
+			connection.commit();
+			connection.close();
+		} catch (SQLException e) {
+			// this will happen when the connection cannot be created
+		}
+		return result;
+	}
+
+	/**
+	 * Establish a connection and execute create.sql.
+	 *
+	 * @param test residing in the package of create.sql and optional alternate hibernate.properties.
+	 */
+	public static void createDatabase(Object test) {
+		establishJdbcConnection(test);
+		executeSql(test, getSqls(test, "create.sql"));
+	}
+
+	/**
+	 * Using an established connection, execute data.sql.
+	 *
+	 * @param test residing in the package of data.sql resource.
+	 */
+	public static void populateDatabase(Object test) {
+		executeSql(test, getSqls(test, "data.sql"));
+	}
+
+	/**
+	 * Using an established connection, execute drop.sql.
+	 *
+	 * @param test residing in the package of drop.sql resource.
+	 */
+	public static void dropDatabase(Object test) {
+		executeSql(test, getSqls(test, "drop.sql"));
+		releaseJdbcConnection(test);
+	}
+
+	private static String[] getSqls(Object test, String scriptName) {
+		String[] result = new String[]{};
+		InputStream inputStream = ResourceUtil.resolveResourceLocation(test.getClass(), scriptName);
+		if (inputStream != null) {
+			BufferedReader bufferedReader =
+					new BufferedReader(new InputStreamReader(inputStream));
+			try {
+				String line;
+				ArrayList<String> lines = new ArrayList<>();
+				while ((line = bufferedReader.readLine()) != null) {
+					if (!line.trim().startsWith("#")) {
+						lines.add(line);
+					}
+				}
+				result = lines.toArray(new String[0]);
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Obtain a connection to a database.
+	 *
+	 * @param test object as key to stored connection. Test object package may also contain
+	 *             an optional hibernate.properties.
+	 */
+	private static Connection createJdbcConnection(Object test)
+			throws SQLException {
+		Properties connectionProperties = getConnectionProperties(test);
+		String connectionUrl = (String) connectionProperties.remove("url");
+		return DriverManager
+				.getDriver(connectionUrl)
+				.connect(connectionUrl, connectionProperties);
+	}
+
+	private static void executeSql(Connection connection, String[] sqls)
+			throws SQLException {
+		Statement statement = connection.createStatement();
+		for (String sql : sqls) {
+			statement.execute(sql);
+		}
+		if (!connection.getAutoCommit()) {
+			connection.commit();
+		}
+		statement.close();
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/ResourceUtil.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/ResourceUtil.java
new file mode 100644
index 000000000000..e7c4fd037173
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/ResourceUtil.java
@@ -0,0 +1,62 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.test.utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+
+public class ResourceUtil {
+
+	public static void createResources(Object test, String[] resources, File resourcesDir) {
+		try {
+			for (String resource : resources) {
+				try (InputStream inputStream = resolveResourceLocation(test.getClass(), resource)) {
+					File resourceFile = new File(resourcesDir, resource);
+					File parent = resourceFile.getParentFile();
+					if (!parent.exists()) {
+						if (!parent.mkdirs()) throw new AssertionError();
+					}
+					Files.copy(inputStream, resourceFile.toPath());
+				}
+			}
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static InputStream resolveResourceLocation(Class<?> testClass, String resourceName) {
+		InputStream result;
+		if (resourceName.startsWith("/")) {
+			result = testClass.getResourceAsStream(resourceName);
+		} else {
+			result = resolveRelativeResourceLocation(testClass, resourceName);
+		}
+		return result;
+	}
+
+	public static File resolveResourceFile(Class<?> testClass, String resourceName) {
+		String path = testClass.getPackage().getName().replace('.', '/');
+		URL resourceUrl = testClass.getClassLoader().getResource(path + "/"
+																+ resourceName);
+		assert resourceUrl != null;
+		return new File(resourceUrl.getFile());
+	}
+
+	private static String getRelativeResourcesRoot(Class<?> testClass) {
+		return '/' + testClass.getPackage().getName().replace('.', '/') + '/';
+	}
+
+	private static InputStream resolveRelativeResourceLocation(Class<?> testClass, String resourceName) {
+		InputStream result = testClass.getResourceAsStream(getRelativeResourcesRoot(testClass) + resourceName);
+		if (result == null && testClass.getSuperclass() != Object.class) {
+			result = resolveRelativeResourceLocation(testClass.getSuperclass(), resourceName);
+		}
+		return result;
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/SchemaUtil.java b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/SchemaUtil.java
new file mode 100644
index 000000000000..9e16e8b194e8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/java/org/hibernate/tool/reveng/test/utils/SchemaUtil.java
@@ -0,0 +1,35 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.reveng.test.utils;
+
+import org.hibernate.boot.Metadata;
+import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.service.ServiceRegistry;
+import org.hibernate.tool.schema.internal.ExceptionHandlerHaltImpl;
+import org.hibernate.tool.schema.spi.ContributableMatcher;
+import org.hibernate.tool.schema.spi.ExecutionOptions;
+import org.hibernate.tool.schema.spi.SchemaManagementTool;
+import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SchemaUtil {
+
+	public static void validateSchema(Metadata metadata, ServiceRegistry serviceRegistry) {
+		Map<String, Object> config =
+				new HashMap<>( serviceRegistry.requireService( ConfigurationService.class ).getSettings() );
+
+		final SchemaManagementTool tool = serviceRegistry.requireService( SchemaManagementTool.class );
+
+		final ExecutionOptions executionOptions = SchemaManagementToolCoordinator.buildExecutionOptions(
+				config,
+				ExceptionHandlerHaltImpl.INSTANCE
+		);
+
+		tool.getSchemaValidator( config ).doValidation( metadata, executionOptions, ContributableMatcher.ALL );
+	}
+
+}
diff --git a/tooling/hibernate-reveng/src/test/resources/hibernate.properties b/tooling/hibernate-reveng/src/test/resources/hibernate.properties
new file mode 100644
index 000000000000..ad629a198040
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/hibernate.properties
@@ -0,0 +1,25 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.dialect org.hibernate.dialect.H2Dialect
+hibernate.connection.driver_class org.h2.Driver
+hibernate.connection.username sa
+hibernate.connection.password  
+hibernate.connection.url jdbc:h2:mem:test
+
+hibernate.default_schema PUBLIC
+hibernate.default_catalog TEST
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/DriverMetaData/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/DriverMetaData/create.sql
new file mode 100644
index 000000000000..e1c930bdf0fe
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/DriverMetaData/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE TAB_MASTER ( ID CHAR NOT NULL, NAME VARCHAR(20), PRIMARY KEY (ID) )
+CREATE TABLE TAB_CHILD  ( CHILDID CHARACTER NOT NULL, MASTERREF CHAR, PRIMARY KEY (CHILDID), FOREIGN KEY (MASTERREF) REFERENCES TAB_MASTER(ID) )
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/DriverMetaData/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/DriverMetaData/drop.sql
new file mode 100644
index 000000000000..bab7257af0d6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/DriverMetaData/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE TAB_CHILD
+DROP TABLE TAB_MASTER			
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/JDBCMetaDataConfiguration/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/JDBCMetaDataConfiguration/create.sql
new file mode 100644
index 000000000000..2d2a2b74e540
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/JDBCMetaDataConfiguration/create.sql
@@ -0,0 +1,21 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE WITH_VERSION (ONE INT, TWO INT, VERSION INT, NAME VARCHAR(256), PRIMARY KEY (ONE))
+CREATE TABLE NO_VERSION (ONE INT, TWO INT, NAME VARCHAR(256), PRIMARY KEY (TWO))
+CREATE TABLE WITH_REAL_TIMESTAMP (ONE INT, TWO INT, TIMESTAMP TIMESTAMP, NAME VARCHAR(256), PRIMARY KEY (ONE))
+CREATE TABLE WITH_FAKE_TIMESTAMP (ONE INT, TWO INT, TIMESTAMP INT, NAME VARCHAR(256), PRIMARY KEY (ONE))
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/JDBCMetaDataConfiguration/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/JDBCMetaDataConfiguration/drop.sql
new file mode 100644
index 000000000000..81b82ba28c9f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/cfg/JDBCMetaDataConfiguration/drop.sql
@@ -0,0 +1,21 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE WITH_VERSION
+DROP TABLE NO_VERSION
+DROP TABLE WITH_REAL_TIMESTAMP
+DROP TABLE WITH_FAKE_TIMESTAMP
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/CachedMetaData/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/CachedMetaData/create.sql
new file mode 100644
index 000000000000..6c14fc48af70
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/CachedMetaData/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE MASTER ( ID CHAR NOT NULL, NAME VARCHAR(20), PRIMARY KEY (ID) )
+CREATE TABLE CHILD  ( CHILDID CHAR NOT NULL, MASTERREF CHAR, PRIMARY KEY (CHILDID), FOREIGN KEY (MASTERREF) REFERENCES MASTER(ID) )
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/CachedMetaData/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/CachedMetaData/drop.sql
new file mode 100644
index 000000000000..0c5cdcee9358
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/CachedMetaData/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE CHILD
+DROP TABLE MASTER
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml
new file mode 100644
index 000000000000..a7695d67bc37
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DdlExporterTest/HelloWorld.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping is a test mapping for hbm2java
+     
+-->
+
+<hibernate-mapping>
+
+    <class name="HelloWorld">
+	    <meta attribute="generated-class" inherit="false">generated.BaseHelloWorld</meta>
+	    <meta attribute="extends">Comparable</meta>
+	    <meta attribute="interface">true</meta>
+    	<meta attribute="class-description">Hey there</meta>
+    	<id name="id"
+    		length="10" type="string">
+    		<meta attribute="field-description">Test Field Description</meta>
+				<meta attribute="use-in-tostring">true</meta>
+    		<generator class="assigned"/>
+    	</id>
+		 
+		  <property name="hello" type="string" length="5">
+			  <meta attribute="use-in-tostring">true</meta>
+			</property>
+			
+			<property name="world" type="long">
+			  <meta attribute="use-in-tostring">false</meta>
+			  <meta attribute="use-in-equals">true</meta>
+			   <meta attribute="property-type">long</meta>
+			</property>
+						
+			
+		<subclass name="HelloUniverse">
+			<property name="dimension" type="string"/>
+			<component name="address" class="UniversalAddress">
+				<property name="galaxy" type="string"/>
+				<property name="planet" type="string"/>
+			</component>
+			
+			<property name="notgenerated" type="string">
+			  <meta attribute="gen-property">false</meta>
+			</property>
+			
+		</subclass>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultDatabaseCollector/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultDatabaseCollector/create.sql
new file mode 100644
index 000000000000..a5a671017700
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultDatabaseCollector/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE SCHEMA "cat.cat"
+CREATE TABLE "cat.cat"."cat.master" (ID INT NOT NULL, TT INT, CONSTRAINT MASTER_PK PRIMARY KEY (ID))
+CREATE TABLE "cat.cat"."cat.child" (CHILDID INT NOT NULL, MASTERREF INT, CONSTRAINT CHILD_PK PRIMARY KEY (CHILDID), CONSTRAINT MASTERREF_FK FOREIGN KEY (MASTERREF) references "cat.cat"."cat.master"(ID))
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultDatabaseCollector/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultDatabaseCollector/drop.sql
new file mode 100644
index 000000000000..bad935aaaf7c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultDatabaseCollector/drop.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE "cat.cat"."cat.child"
+DROP TABLE "cat.cat"."cat.master"
+DROP SCHEMA "cat.cat"
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultSchemaCatalog/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultSchemaCatalog/create.sql
new file mode 100644
index 000000000000..c003175aee1b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultSchemaCatalog/create.sql
@@ -0,0 +1,22 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE SCHEMA OVRTEST
+CREATE TABLE OVRTEST.CATMASTER ( ID CHAR NOT NULL, NAME VARCHAR(20), PRIMARY KEY (ID) )
+CREATE TABLE OVRTEST.CATCHILD  ( CHILDID CHAR NOT NULL, MASTERREF CHAR, PRIMARY KEY (CHILDID), FOREIGN KEY (MASTERREF) REFERENCES OVRTEST.CATMASTER(ID) )
+CREATE TABLE MASTER ( ID CHAR NOT NULL, NAME VARCHAR(20), PRIMARY KEY (ID) )
+CREATE TABLE CHILD  ( CHILDID CHAR NOT NULL, MASTERREF CHAR, PRIMARY KEY (CHILDID), FOREIGN KEY (MASTERREF) REFERENCES MASTER(ID) )			
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultSchemaCatalog/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultSchemaCatalog/drop.sql
new file mode 100644
index 000000000000..d9b27965069c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DefaultSchemaCatalog/drop.sql
@@ -0,0 +1,22 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE CHILD
+DROP TABLE MASTER
+DROP TABLE OVRTEST.CATCHILD
+DROP TABLE OVRTEST.CATMASTER
+DROP SCHEMA OVRTEST
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/Customer.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/Customer.hbm.xml
new file mode 100644
index 000000000000..e45c8767d52d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/Customer.hbm.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+	
+	This mapping demonstrates how to map a collection
+	<key> to one of the primary key columns of an
+	associated child class with a composite key. This
+	is very useful for legacy data!
+	
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+	<class name="Customer">
+		<comment>A unique customer comment!</comment>
+		<!--<id name="customerId"
+			length="10" type="string">
+			<generator class="assigned"/>
+			</id>-->
+
+		<composite-id>
+			<key-property name="id" type="long" />
+		</composite-id>
+
+		<property name="name" type="string" not-null="true"
+			length="100" />
+		<property name="address" type="string" not-null="true"
+			length="200" />
+
+       <property name="customDate" type="org.hibernate.tool.reveng.hbm2x.DocExporterTest.TestCase$DummyDateType" not-null="true" length="200"/>
+        
+        <property name="acl" type="byte[]">
+         <meta attribute="use-in-equals">true</meta>
+        </property>
+        
+		<component name="addressComponent" class="Address">
+			<property name="streetAddress1" type="string"
+				column="StreetAddress1" not-null="true">
+				<meta attribute="use-in-equals">true</meta>
+			</property>
+			<property name="streetAddress2" type="string"
+				column="StreetAddress2" />
+			<property name="city" type="short" column="City"
+				not-null="true">
+				<meta attribute="use-in-tostring">true</meta>
+				<meta attribute="use-in-equals">true</meta>
+				<meta attribute="property-type">short</meta>
+			</property>
+			<property name="postcode" type="string" column="postcode"
+				not-null="true" />
+			<!--    <many-to-one name="state" class="au.com.groupware.model.State" column="StateId" 
+				foreign-key="FK_Address_State" not-null="true" />  -->
+			<property name="verified" type="boolean">
+			   <meta attribute="use-in-equals">true</meta>
+			</property>
+		</component>
+
+		<list name="orders" inverse="true" cascade="save-update">
+			<key column="customerId" not-null="true" />
+			<index column="orderNumber" />
+			<one-to-many class="Order" />
+		</list>
+
+		<!--  cfg2hbm does not support composite-element
+			<set name="addressComposites">
+			<key column="ADRID"/>
+			<composite-element class="Address">
+			<property name="streetAddress1" type="string" column="StreetAddress1" not-null="true" /> 
+			<property name="streetAddress2" type="string" column="StreetAddress2" /> 
+			<property name="city" type="string" column="City" not-null="true" /> 
+			<property name="postcode" type="string" column="postcode" not-null="true" /> 
+			</composite-element>
+			</set>
+       -->
+
+		<component name="test" class="FatherComponent">
+		    <parent name="testParent"/>
+			<property name="testattrib" type="string" />
+			<component name="child" class="ChildComponent">
+				<property name="childattrib" type="string" />
+			</component>
+		</component>
+
+		<!-- hbm2hbmxml does not support dynamic-component
+		<dynamic-component name="dynaMap">
+			<property name="key1" type="string" />
+		</dynamic-component>
+		 -->
+		 
+		<array name="products" cascade="all">
+			<key column="profileId" />
+			<list-index column="sortOrder" />
+			<many-to-many class="Product" />
+		</array> 
+		
+	<!-- hbm2java can't generate a innerclass (Test$Entry) correctly. should probably skip it as a fallback.-->
+    <!-- <component name="mapEntry" class="java.util.Map$Entry">
+			<property name="value" type="string"/>
+			<property name="key" type="string"/>
+		 </component>  -->
+	</class>
+
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/DependentValue.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/DependentValue.hbm.xml
new file mode 100644
index 000000000000..b246427a67c6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/DependentValue.hbm.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+<!-- Mapping for dependentValue bug - HBX-953 -->
+    <class name="Foo" table="foo">
+        <id name="id" type="java.lang.Integer" unsaved-value="null" >
+            <column name="foo_id" sql-type="int" not-null="true" />
+            <generator class="native"/>
+        </id>
+        <list name="bars"
+              table="bar"
+              lazy="false"
+              cascade="all">
+              <key column="foo_id" not-null="true"/>
+              <list-index column="ordering" />
+              <one-to-many class="Bar" />
+        </list>
+    </class>
+    <class name="Bar" table="bar">
+        <id name="id" type="java.lang.Integer" unsaved-value="null" >
+            <column name="bar_id" sql-type="int" not-null="true" />
+            <generator class="native"/>
+        </id>
+    </class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/HelloWorld.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/HelloWorld.hbm.xml
new file mode 100644
index 000000000000..a7695d67bc37
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/HelloWorld.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping is a test mapping for hbm2java
+     
+-->
+
+<hibernate-mapping>
+
+    <class name="HelloWorld">
+	    <meta attribute="generated-class" inherit="false">generated.BaseHelloWorld</meta>
+	    <meta attribute="extends">Comparable</meta>
+	    <meta attribute="interface">true</meta>
+    	<meta attribute="class-description">Hey there</meta>
+    	<id name="id"
+    		length="10" type="string">
+    		<meta attribute="field-description">Test Field Description</meta>
+				<meta attribute="use-in-tostring">true</meta>
+    		<generator class="assigned"/>
+    	</id>
+		 
+		  <property name="hello" type="string" length="5">
+			  <meta attribute="use-in-tostring">true</meta>
+			</property>
+			
+			<property name="world" type="long">
+			  <meta attribute="use-in-tostring">false</meta>
+			  <meta attribute="use-in-equals">true</meta>
+			   <meta attribute="property-type">long</meta>
+			</property>
+						
+			
+		<subclass name="HelloUniverse">
+			<property name="dimension" type="string"/>
+			<component name="address" class="UniversalAddress">
+				<property name="galaxy" type="string"/>
+				<property name="planet" type="string"/>
+			</component>
+			
+			<property name="notgenerated" type="string">
+			  <meta attribute="gen-property">false</meta>
+			</property>
+			
+		</subclass>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/LineItem.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/LineItem.hbm.xml
new file mode 100644
index 000000000000..13285a3ff810
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/LineItem.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates 
+  
+     (1) composite keys and many-to-one associations on 
+         composite keys
+      
+     (2) use of insert="false" update="false" on an
+         association mapping, when the foreign key is
+         also part of the primary key
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+    <class name="LineItem">
+    	
+    	<composite-id name="id" 
+    		class="LineItemId">
+    		<key-property name="customerId" length="10" type="string"/>
+    		<key-property name="orderNumber" type="int"/>
+    		<key-property name="productId" length="10" type="string"/>
+    	</composite-id>
+    	
+    	<property name="quantity" type="int"/>
+    	
+    	<many-to-one name="order"
+    		insert="false"
+			update="false" 
+			not-null="true" 
+			class="Order">
+			<column name="customerId"/>
+			<column name="orderNumber"/>
+		</many-to-one>
+    	
+    	<many-to-one name="product"
+    		insert="false"
+			update="false" 
+			not-null="true"
+			column="productId"
+			class="Product"/>
+			
+    </class>
+ 	
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/Order.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/Order.hbm.xml
new file mode 100644
index 000000000000..8cbc206ad7dd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/Order.hbm.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+<!-- 
+
+     
+-->
+
+    <class name="Order" table="CustomerOrder" lazy="true">
+    	<meta attribute="class-modifier">public strictfp</meta>
+    	<meta attribute="class-code">// extra code line 1</meta>
+    	<meta attribute="class-code">// extra code line 2</meta>
+    	<meta attribute="extra-import" inherit="false">java.text.Collator</meta>
+    	<meta attribute="class-code" inherit="false">{ Collator.getInstance(); }</meta>
+    	<synchronize table="LineItem"/>
+    	<synchronize table="Product"/>
+    	
+    	<composite-id name="id" 
+    		class="OrderId">
+    		<key-property name="customerId" length="10" type="string"/>
+    		<key-property name="orderNumber" type="int"/>
+    	</composite-id>
+    	
+    	<property name="orderDate" 
+    		type="calendar_date"
+    		not-null="true"/>
+    	
+    	<property name="total" type="big_decimal"
+    		formula="( select sum(li.quantity*p.price) from LineItem li, Product p where li.productId = p.productId and li.customerId = customerId and li.orderNumber = orderNumber )"/>
+    	
+    	<many-to-one name="customer"
+    		column="customerId"
+    		insert="false"
+			update="false" 
+			not-null="true" class="Customer"/>
+			
+    	<bag name="lineItems"
+    		fetch="join" 
+    		inverse="true"
+    		cascade="save-update">
+    		<key>
+    			<column name="customerId"/>
+    			<column name="orderNumber"/>
+    		</key>
+    		<one-to-many class="LineItem"/>
+    	</bag>
+    	
+    	
+    </class>
+ 	
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/Product.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/Product.hbm.xml
new file mode 100644
index 000000000000..28078d2def81
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/Product.hbm.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+    <class name="Product">
+    	<synchronize table="LineItem"/>
+    
+    	<id name="productId"
+    		length="10"
+    		type="long">
+    		<generator class="assigned"/>
+    	</id>
+
+		<version name="version" type="long"/>    	
+		
+<!-- hbm2hbmxml does not support any 
+   	<any name="relatedObject" id-type="long">
+            <column name="objectClass"/>
+            <column name="objectID"/>
+        </any> -->
+    	
+    	<property name="description" 
+    		not-null="true" 
+    		length="200"
+    		type="string"/>
+    	<property name="price" length="3" type="big_decimal"/>
+    	<property name="numberAvailable" not-null="true" type="int"/>
+    	<property name="minStock" type="long"/>
+    	<property name="otherStock" not-null="true" type="long">
+    	  <meta attribute="property-type">java.lang.Integer</meta>
+    	</property>
+    	
+    	<property name="numberOrdered" type="int" 
+    		formula="( select sum(li.quantity) from LineItem li where li.productId = productId )"/>
+    		
+    	<primitive-array name="lapseRates" table="lapseRates">
+			<key column="lapseRateId"/>
+			<index column="indexId"/>
+			<element type="double" column="lapseRate"/>
+	 	</primitive-array>
+      
+   </class>
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/UnionSubclass.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/UnionSubclass.hbm.xml
new file mode 100644
index 000000000000..79640bef3973
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/DocExporterTest/UnionSubclass.hbm.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping is a test mapping for hbm2java
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x"> 
+    <class name="UPerson" abstract="true"> 
+        <cache usage="read-write" /> 
+        <id name="id" type="long"> 
+            <column name="PERSON_ID"> 
+                <comment>the primary key for hibernate</comment> 
+            </column> 
+            <generator class="sequence"> 
+                <param name="sequence">PERSON_SEQ</param> 
+            </generator> 
+        </id> 
+         
+        <property name="firstName" type="string"> 
+            <column name="FIRST_NAME" length="50" not-null="true"> 
+                <comment>the first name</comment> 
+            </column> 
+        </property> 
+
+        <union-subclass name="UUser" table="CROWN_USERS" schema="CROWN" lazy="false"> 
+            <comment>Table of crown users</comment> 
+            <property name="userName" type="string"> 
+                <column name="USER_NAME" length="15" not-null="true" unique="true"> 
+                    <comment>the unique user id</comment> 
+                </column> 
+            </property> 
+        </union-subclass> 
+     </class>
+</hibernate-mapping>
+
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/create.sql
new file mode 100644
index 000000000000..f9f5a47aa4ff
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/create.sql
@@ -0,0 +1,21 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE "orders" ( "ordId" INT generated by default as identity (start with 1) NOT NULL, "ordDesc" VARCHAR(10), "ordVersion" TINYINT DEFAULT 0 NOT NULL, PRIMARY KEY ("ordId"))
+CREATE TABLE "orderItems" ( "oiId" INT generated by default as identity (start with 1) NOT NULL, "oiOrdId" INT NOT NULL, "oiDesc" VARCHAR(10), "oiVersion" TINYINT DEFAULT 0 NOT NULL, PRIMARY KEY ("oiId"))
+ALTER TABLE "orderItems" ADD CONSTRAINT "orderorderitemfk" FOREIGN KEY ("oiOrdId") REFERENCES "orders" ("ordId") ON DELETE CASCADE ON UPDATE CASCADE
+CREATE TABLE "dummy" ( "duId" INT generated by default as identity (start with 1) NOT NULL, "duVersion" TINYINT DEFAULT 0 NOT NULL, PRIMARY KEY ("duId"))
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/drop.sql
new file mode 100644
index 000000000000..c003ddd62867
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/drop.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE "orderItems"
+DROP TABLE "orders"
+DROP TABLE "dummy"
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/hibernate.properties b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/hibernate.properties
new file mode 100644
index 000000000000..7da98d44bbcc
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/hibernate.properties
@@ -0,0 +1,24 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.dialect org.hibernate.dialect.H2Dialect
+hibernate.connection.driver_class org.h2.Driver
+hibernate.connection.username sa
+hibernate.connection.password
+hibernate.connection.url jdbc:h2:mem:test1;DATABASE_TO_UPPER=FALSE
+hibernate.default_schema
+hibernate.default_catalog
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/reveng.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/reveng.xml
new file mode 100644
index 000000000000..a0dc71ca9860
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/EntityNaming/reveng.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<hibernate-reverse-engineering>
+   <table-filter match-catalog="test1" match-schema="PUBLIC" match-name=".*" package="com.entity"/>
+   <table name="orderItems" class="OrderItem"/>
+   <table name="orders" class="Order"/>
+</hibernate-reverse-engineering>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBC/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBC/create.sql
new file mode 100644
index 000000000000..4f85b2de79ed
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBC/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE MASTER (ID CHAR NOT NULL, NAME VARCHAR(20), PRIMARY KEY (ID))
+CREATE TABLE CHILD  (CHILDID CHAR NOT NULL, MASTERREF CHAR, PRIMARY key (CHILDID), FOREIGN KEY (MASTERREF) REFERENCES MASTER(ID))		
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBC/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBC/drop.sql
new file mode 100644
index 000000000000..0c5cdcee9358
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBC/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE CHILD
+DROP TABLE MASTER
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBCWithJavaKeyword/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBCWithJavaKeyword/create.sql
new file mode 100644
index 000000000000..d5043b9d6e2e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBCWithJavaKeyword/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE MY_RETURN (RETURN_ID VARCHAR(20) NOT NULL, CONSTRAINT PK_MY_RETURN PRIMARY KEY (RETURN_ID))
+CREATE TABLE MY_RETURN_HISTORY (ID VARCHAR(20) NOT NULL, MY_RETURN_REF VARCHAR(20), CONSTRAINT PK_MY_RETURN_HISTORY PRIMARY KEY (ID), CONSTRAINT FK_MY_RETURN_HISTORY_ID FOREIGN KEY (MY_RETURN_REF) REFERENCES MY_RETURN(RETURN_ID))		
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBCWithJavaKeyword/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBCWithJavaKeyword/drop.sql
new file mode 100644
index 000000000000..a31956906a3c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenerateFromJDBCWithJavaKeyword/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE MY_RETURN_HISTORY
+DROP TABLE MY_RETURN				
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/Article.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/Article.hbm.xml
new file mode 100644
index 000000000000..75753c23ba15
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/Article.hbm.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+    <class name="Article">
+    
+    	<id name="articleId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100"/>
+    	</natural-id>
+    	<property name="content" type="string" not-null="true" length="10000">
+    		<meta attribute="default-value">"what can I say"</meta>
+    	</property>
+
+		<many-to-one
+		    name="author"
+            class="org.hibernate.tool.hbm2x.Author"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+            column="authorId" />
+		
+        <bag name="bagarticles"
+    		inverse="true"
+    		cascade="save-update">
+    		<meta attribute="property-type">java.util.List</meta>
+    		<key column="authorId"/>
+    		<one-to-many class="Article"/>
+    	</bag>
+    	
+    	 <bag name="bagstrings">
+    		
+    		<key column="authorId"/>
+    		
+    		<element type="string"/>
+    	</bag>
+
+    	 <map name="AMap">
+		  <key column="idx"/>
+		  <index type="string"/>
+		  <one-to-many class="Article"/>
+		</map>
+		
+		<list name="aList">
+		  <key column="idx"/>
+		  <list-index/>
+		  <one-to-many class="Article"/>		
+		</list>
+
+		<set name="sortedArticlesSet" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<one-to-many class="Article" />
+		</set>
+		
+		<map name="sortedArticlesMap" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+		<map name="naturalSortedArticlesMap" inverse="true"
+			sort="natural">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/Author.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/Author.hbm.xml
new file mode 100644
index 000000000000..9a9e99663591
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/Author.hbm.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+    <class name="Author">
+    
+    	<id name="authorId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100" unique="true"/>
+    		<property name="address" type="string" not-null="true" length="200" unique="true"/>
+		</natural-id>
+		
+    	<set name="articles"
+    		inverse="true"
+    		cascade="save-update">
+    		
+    		<key column="authorId"/>
+    		
+    		<one-to-many class="Article"/>
+    	</set>
+    	
+    	<query name="findByName">
+    		<query-param name="name" type="string"/>
+    		<query-param name="maxResults" type="int"/>
+    		<query-param name="value" type="int"/>
+    		from Author where name like :name or length(name) > :value
+    	</query>
+    	
+    	<query name="findByNameAndAddress">
+    		<query-param name="name" type="string"/>
+    		<query-param name="address" type="string"/>
+    		from Author where name like :name and address like :address
+    	</query>
+
+    	<query name="countAll">
+    		select count(*) from Author
+    	</query>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/HelloWorld.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/HelloWorld.hbm.xml
new file mode 100644
index 000000000000..a7695d67bc37
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/HelloWorld.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping is a test mapping for hbm2java
+     
+-->
+
+<hibernate-mapping>
+
+    <class name="HelloWorld">
+	    <meta attribute="generated-class" inherit="false">generated.BaseHelloWorld</meta>
+	    <meta attribute="extends">Comparable</meta>
+	    <meta attribute="interface">true</meta>
+    	<meta attribute="class-description">Hey there</meta>
+    	<id name="id"
+    		length="10" type="string">
+    		<meta attribute="field-description">Test Field Description</meta>
+				<meta attribute="use-in-tostring">true</meta>
+    		<generator class="assigned"/>
+    	</id>
+		 
+		  <property name="hello" type="string" length="5">
+			  <meta attribute="use-in-tostring">true</meta>
+			</property>
+			
+			<property name="world" type="long">
+			  <meta attribute="use-in-tostring">false</meta>
+			  <meta attribute="use-in-equals">true</meta>
+			   <meta attribute="property-type">long</meta>
+			</property>
+						
+			
+		<subclass name="HelloUniverse">
+			<property name="dimension" type="string"/>
+			<component name="address" class="UniversalAddress">
+				<property name="galaxy" type="string"/>
+				<property name="planet" type="string"/>
+			</component>
+			
+			<property name="notgenerated" type="string">
+			  <meta attribute="gen-property">false</meta>
+			</property>
+			
+		</subclass>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/freeinc.ftl b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/freeinc.ftl
new file mode 100644
index 000000000000..501617874e03
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/freeinc.ftl
@@ -0,0 +1,17 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+${cl}
+
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/freemarker.ftl b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/freemarker.ftl
new file mode 100644
index 000000000000..157aff874340
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/freemarker.ftl
@@ -0,0 +1,34 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+${pojo.getShortName()}
+${pojo.shortName}
+
+<#list [1,2,3] as cl>
+<#include "freeinc.ftl"/> 
+<#include "freeinc.ftl"/> 
+<@greet person=cl/>
+</#list>
+
+
+<#macro greet person>
+  <font size="+2">Hello ${person} ${pojo.shortName}!</font>
+</#macro>  
+
+
+<#list .data_model?keys as item>
+ ${item}
+</#list>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-class.ftl b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-class.ftl
new file mode 100644
index 000000000000..b5a44236406e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-class.ftl
@@ -0,0 +1,27 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+name=<#if item?if_exists>${item.getName()}</#if>
+pojo=${pojo.getDeclarationName()}
+unsetproperty=${unsetProperty?if_exists}
+proptest=${proptest?if_exists}
+hibernatetool.booleanProperty=${.data_model["hibernatetool.booleanProperty"]?if_exists?string}
+booleanProperty=${booleanProperty?if_exists?string}
+<#if booleanProperty?exists && !booleanProperty>booleanWasTrue=true</#if>
+myTool.value=<#if myTool?exists>${myTool.unqualify("myTool.value")}</#if>
+<#if refproperty?exists>
+<#assign inline= refproperty?interpret>
+refproperty=<@inline/>
+</#if>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-content.ftl b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-content.ftl
new file mode 100644
index 000000000000..4f76485d213e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-content.ftl
@@ -0,0 +1,16 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+File for ${item} in ${version}
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-exception.ftl b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-exception.ftl
new file mode 100644
index 000000000000..e449c1180f56
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-exception.ftl
@@ -0,0 +1,26 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+${pojo.getShortName()}
+${pojo.shortName}
+
+<#list [1,2,3] as cl>
+ <@greet person=cl/>
+</#list>
+
+
+<#macro greet person>
+  <font size="+2">Hello ${person} ${propertythatdoesnotexist}!</font>
+</#macro>  
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-test.ftl b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-test.ftl
new file mode 100644
index 000000000000..92be4c7de8d3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/generic-test.ftl
@@ -0,0 +1,20 @@
+<#--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<#list ctx?keys as item>
+<#-- ${templates.create("generictemplates/pojo/generic-content", item + ".txt")}  -->
+<#assign captured><#include "generic-content.ftl"/></#assign>
+${templates.createFile(captured, "${item}.txt")}
+</#list>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/hibernate.properties b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/hibernate.properties
new file mode 100644
index 000000000000..273d9cb8a253
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/GenericExporterTest/hibernate.properties
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.dialect org.hibernate.tools.test.util.HibernateUtil$Dialect
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/HashcodeEqualsTest/HashEquals.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/HashcodeEqualsTest/HashEquals.hbm.xml
new file mode 100644
index 000000000000..413a75fd0eaa
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/HashcodeEqualsTest/HashEquals.hbm.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+	
+	This mapping demonstrates how to map a collection
+	<key> to one of the primary key columns of an
+	associated child class with a composite key. This
+	is very useful for legacy data!
+	
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+	<class name="HashEquals">
+		<!--  Normally *bad* practice to put global use-in-equals. Only here for testing -->
+		<meta attribute="use-in-equals">true</meta>
+		<id name="id" type="string"/>
+		
+<!--  TODO: HBX-2054: Hibernate ORM cannot resolve named type 'java.lang.String[]' -->
+<!-- 		<property name="name" type="java.lang.String[]"/>  -->
+       <property name="byteArray" type="byte[]"/>
+<!--  TODO: HBX-2054: Hibernate ORM cannot resolve named type 'float[]' -->
+<!--        <property name="floatArray" type="float[]"/> -->
+<!--  TODO: HBX-2054: Hibernate ORM cannot resolve named type 'int[]' -->
+<!--        <property name="intArray" type="int[]"/> -->
+<!--  TODO: HBX-2054: Hibernate ORM cannot resolve named type 'int[]' -->
+<!--        <property name="shortArray" type="int[]"/> -->
+<!--  TODO: HBX-2054: Hibernate ORM cannot resolve named type 'boolean[]' -->
+<!--        <property name="booleanArray" type="boolean[]"/> -->
+        
+		<component name="addressComponent" class="Address">
+			<property name="streetAddress1" type="string"
+				column="StreetAddress1" not-null="true">
+				<meta attribute="use-in-equals">true</meta>
+			</property>
+			<property name="streetAddress2" type="string"
+				column="StreetAddress2" />
+			<property name="city" type="short" column="City"
+				not-null="true">
+				<meta attribute="use-in-tostring">true</meta>
+				<meta attribute="use-in-equals">true</meta>
+				<meta attribute="property-type">short</meta>
+			</property>
+<!--  TODO: HBX-2054: Hibernate ORM cannot resolve named type 'java.lang.String[]' -->
+<!-- 			<property name="postcode" type="java.lang.String[]" column="postcode"
+				not-null="true" /> -->
+			<!--    <many-to-one name="state" class="au.com.groupware.model.State" column="StateId" 
+				foreign-key="FK_Address_State" not-null="true" />  -->
+			<property name="verified" type="boolean">
+			   <meta attribute="use-in-equals">true</meta>
+			</property>
+		</component>
+
+		
+	</class>
+
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2CfgTest/HelloWorld.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2CfgTest/HelloWorld.hbm.xml
new file mode 100644
index 000000000000..a7695d67bc37
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2CfgTest/HelloWorld.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping is a test mapping for hbm2java
+     
+-->
+
+<hibernate-mapping>
+
+    <class name="HelloWorld">
+	    <meta attribute="generated-class" inherit="false">generated.BaseHelloWorld</meta>
+	    <meta attribute="extends">Comparable</meta>
+	    <meta attribute="interface">true</meta>
+    	<meta attribute="class-description">Hey there</meta>
+    	<id name="id"
+    		length="10" type="string">
+    		<meta attribute="field-description">Test Field Description</meta>
+				<meta attribute="use-in-tostring">true</meta>
+    		<generator class="assigned"/>
+    	</id>
+		 
+		  <property name="hello" type="string" length="5">
+			  <meta attribute="use-in-tostring">true</meta>
+			</property>
+			
+			<property name="world" type="long">
+			  <meta attribute="use-in-tostring">false</meta>
+			  <meta attribute="use-in-equals">true</meta>
+			   <meta attribute="property-type">long</meta>
+			</property>
+						
+			
+		<subclass name="HelloUniverse">
+			<property name="dimension" type="string"/>
+			<component name="address" class="UniversalAddress">
+				<property name="galaxy" type="string"/>
+				<property name="planet" type="string"/>
+			</component>
+			
+			<property name="notgenerated" type="string">
+			  <meta attribute="gen-property">false</meta>
+			</property>
+			
+		</subclass>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2CfgTest/hibernate.properties b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2CfgTest/hibernate.properties
new file mode 100644
index 000000000000..273d9cb8a253
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2CfgTest/hibernate.properties
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.dialect org.hibernate.tools.test.util.HibernateUtil$Dialect
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2DaoTest/Article.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2DaoTest/Article.hbm.xml
new file mode 100644
index 000000000000..75753c23ba15
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2DaoTest/Article.hbm.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+    <class name="Article">
+    
+    	<id name="articleId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100"/>
+    	</natural-id>
+    	<property name="content" type="string" not-null="true" length="10000">
+    		<meta attribute="default-value">"what can I say"</meta>
+    	</property>
+
+		<many-to-one
+		    name="author"
+            class="org.hibernate.tool.hbm2x.Author"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+            column="authorId" />
+		
+        <bag name="bagarticles"
+    		inverse="true"
+    		cascade="save-update">
+    		<meta attribute="property-type">java.util.List</meta>
+    		<key column="authorId"/>
+    		<one-to-many class="Article"/>
+    	</bag>
+    	
+    	 <bag name="bagstrings">
+    		
+    		<key column="authorId"/>
+    		
+    		<element type="string"/>
+    	</bag>
+
+    	 <map name="AMap">
+		  <key column="idx"/>
+		  <index type="string"/>
+		  <one-to-many class="Article"/>
+		</map>
+		
+		<list name="aList">
+		  <key column="idx"/>
+		  <list-index/>
+		  <one-to-many class="Article"/>		
+		</list>
+
+		<set name="sortedArticlesSet" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<one-to-many class="Article" />
+		</set>
+		
+		<map name="sortedArticlesMap" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+		<map name="naturalSortedArticlesMap" inverse="true"
+			sort="natural">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2DaoTest/Author.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2DaoTest/Author.hbm.xml
new file mode 100644
index 000000000000..9a9e99663591
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2DaoTest/Author.hbm.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+    <class name="Author">
+    
+    	<id name="authorId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100" unique="true"/>
+    		<property name="address" type="string" not-null="true" length="200" unique="true"/>
+		</natural-id>
+		
+    	<set name="articles"
+    		inverse="true"
+    		cascade="save-update">
+    		
+    		<key column="authorId"/>
+    		
+    		<one-to-many class="Article"/>
+    	</set>
+    	
+    	<query name="findByName">
+    		<query-param name="name" type="string"/>
+    		<query-param name="maxResults" type="int"/>
+    		<query-param name="value" type="int"/>
+    		from Author where name like :name or length(name) > :value
+    	</query>
+    	
+    	<query name="findByNameAndAddress">
+    		<query-param name="name" type="string"/>
+    		<query-param name="address" type="string"/>
+    		from Author where name like :name and address like :address
+    	</query>
+
+    	<query name="countAll">
+    		select count(*) from Author
+    	</query>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2EJBDaoTest/Article.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2EJBDaoTest/Article.hbm.xml
new file mode 100644
index 000000000000..75753c23ba15
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2EJBDaoTest/Article.hbm.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+    <class name="Article">
+    
+    	<id name="articleId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100"/>
+    	</natural-id>
+    	<property name="content" type="string" not-null="true" length="10000">
+    		<meta attribute="default-value">"what can I say"</meta>
+    	</property>
+
+		<many-to-one
+		    name="author"
+            class="org.hibernate.tool.hbm2x.Author"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+            column="authorId" />
+		
+        <bag name="bagarticles"
+    		inverse="true"
+    		cascade="save-update">
+    		<meta attribute="property-type">java.util.List</meta>
+    		<key column="authorId"/>
+    		<one-to-many class="Article"/>
+    	</bag>
+    	
+    	 <bag name="bagstrings">
+    		
+    		<key column="authorId"/>
+    		
+    		<element type="string"/>
+    	</bag>
+
+    	 <map name="AMap">
+		  <key column="idx"/>
+		  <index type="string"/>
+		  <one-to-many class="Article"/>
+		</map>
+		
+		<list name="aList">
+		  <key column="idx"/>
+		  <list-index/>
+		  <one-to-many class="Article"/>		
+		</list>
+
+		<set name="sortedArticlesSet" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<one-to-many class="Article" />
+		</set>
+		
+		<map name="sortedArticlesMap" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+		<map name="naturalSortedArticlesMap" inverse="true"
+			sort="natural">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2EJBDaoTest/Author.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2EJBDaoTest/Author.hbm.xml
new file mode 100644
index 000000000000..9a9e99663591
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2EJBDaoTest/Author.hbm.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+    <class name="Author">
+    
+    	<id name="authorId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100" unique="true"/>
+    		<property name="address" type="string" not-null="true" length="200" unique="true"/>
+		</natural-id>
+		
+    	<set name="articles"
+    		inverse="true"
+    		cascade="save-update">
+    		
+    		<key column="authorId"/>
+    		
+    		<one-to-many class="Article"/>
+    	</set>
+    	
+    	<query name="findByName">
+    		<query-param name="name" type="string"/>
+    		<query-param name="maxResults" type="int"/>
+    		<query-param name="value" type="int"/>
+    		from Author where name like :name or length(name) > :value
+    	</query>
+    	
+    	<query name="findByNameAndAddress">
+    		<query-param name="name" type="string"/>
+    		<query-param name="address" type="string"/>
+    		from Author where name like :name and address like :address
+    	</query>
+
+    	<query name="countAll">
+    		select count(*) from Author
+    	</query>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2HibernateDAOTest/Article.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2HibernateDAOTest/Article.hbm.xml
new file mode 100644
index 000000000000..0164a55853a8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2HibernateDAOTest/Article.hbm.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2HibernateDAOTest">
+
+    <class name="Article">
+    
+    	<id name="articleId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100"/>
+    	</natural-id>
+    	<property name="content" type="string" not-null="true" length="10000">
+    		<meta attribute="default-value">"what can I say"</meta>
+    	</property>
+
+		<many-to-one
+		    name="author"
+            class="org.hibernate.tool.hbm2x.Hbm2HibernateDAOTest.Author"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+            column="authorId" />
+		
+        <bag name="bagarticles"
+    		inverse="true"
+    		cascade="save-update">
+    		<meta attribute="property-type">java.util.List</meta>
+    		<key column="authorId"/>
+    		<one-to-many class="Article"/>
+    	</bag>
+    	
+    	 <bag name="bagstrings">
+    		
+    		<key column="authorId"/>
+    		
+    		<element type="string"/>
+    	</bag>
+
+    	 <map name="AMap">
+		  <key column="idx"/>
+		  <index type="string"/>
+		  <one-to-many class="Article"/>
+		</map>
+		
+		<list name="aList">
+		  <key column="idx"/>
+		  <list-index/>
+		  <one-to-many class="Article"/>		
+		</list>
+
+		<set name="sortedArticlesSet" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<one-to-many class="Article" />
+		</set>
+		
+		<map name="sortedArticlesMap" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+		<map name="naturalSortedArticlesMap" inverse="true"
+			sort="natural">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2HibernateDAOTest/Author.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2HibernateDAOTest/Author.hbm.xml
new file mode 100644
index 000000000000..bd95ad0f7546
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2HibernateDAOTest/Author.hbm.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2HibernateDAOTest">
+
+    <class name="Author">
+    
+    	<id name="authorId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100" unique="true"/>
+    		<property name="address" type="string" not-null="true" length="200" unique="true"/>
+		</natural-id>
+		
+    	<set name="articles"
+    		inverse="true"
+    		cascade="save-update">
+    		
+    		<key column="authorId"/>
+    		
+    		<one-to-many class="Article"/>
+    	</set>
+    	
+    	<query name="findByName">
+    		<query-param name="name" type="string"/>
+    		<query-param name="maxResults" type="int"/>
+    		<query-param name="value" type="int"/>
+    		from Author where name like :name or length(name) > :value
+    	</query>
+    	
+    	<query name="findByNameAndAddress">
+    		<query-param name="name" type="string"/>
+    		<query-param name="address" type="string"/>
+    		from Author where name like :name and address like :address
+    	</query>
+
+    	<query name="countAll">
+    		select count(*) from Author
+    	</query>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaConstructorTest/ConstructorUsage.java_ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaConstructorTest/ConstructorUsage.java_
new file mode 100644
index 000000000000..aa8fb2bc8e87
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaConstructorTest/ConstructorUsage.java_
@@ -0,0 +1,50 @@
+/*
+ * Hibernate Tools, Tooling for your Hibernate Projects
+ *
+ * Copyright 2004-2025 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class ConstructorUsage {
+
+	public void personConstructor() {		
+		Person defaultConstructor = new Person();
+		Person minimalConstructor = new Person("a name", new EntityAddress("street", "city"));
+	}
+	
+	public void employeeConstructor() {		
+		Employee defaultConstructor = new Employee();
+		Employee fullConstructor = new Employee("a name", new EntityAddress("street", "city"), 2.0);
+		Employee minimalConstructor = new Employee("a name", new EntityAddress("street", "city"));
+	}
+	
+	public void entityAddressConstructor() {		
+		EntityAddress defaultConstructor = new EntityAddress();		
+		EntityAddress allConstructor = new EntityAddress("street", "city");
+		EntityAddress minimalConstructor = new EntityAddress("street");
+	}
+	
+	public void companyConstructor() {
+		Company defaultConstructor = new Company();
+		CompanyId cid = new CompanyId(42,'a');
+		Company allConstructor = new Company(cid,"myBrand", new java.util.HashSet());
+		Company minimalConstructor = new Company(cid,"myBrand");
+	}
+	
+	public void productConstructor() {
+		BrandProduct defaultConstructor = new BrandProduct();
+		BrandProduct minimalConstructor = new BrandProduct("id");
+		BrandProduct fullConstructor = new BrandProduct("id", "a name");
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaConstructorTest/Constructors.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaConstructorTest/Constructors.hbm.xml
new file mode 100644
index 000000000000..d4ba31231071
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaConstructorTest/Constructors.hbm.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping is a test mapping for hbm2java
+     
+-->
+
+<hibernate-mapping>
+
+    <class name="Person">
+    	<id name="id" type="string">
+    		<generator class="native"/>
+    	</id>
+
+    	<property name="name" type="string" not-null="true"/>
+    	
+    	<component name="address" class="EntityAddress">
+    		<property name="street" type="string" not-null="true"/>
+    		<property name="city" type="string"/>
+    	</component>
+    	
+    	<subclass name="Employee">
+			<property name="salary" type="double"/>
+		</subclass>
+	</class>
+
+    <class name="Company">
+    	<composite-id name="id" class="CompanyId">
+    	  <key-property name="code" type="long"/>
+    	  <key-property name="subcode" type="char"/>
+    	</composite-id>
+
+    	<property name="brand" type="string" not-null="true"/>
+    	
+    	<!-- HBX-607, formula not in full constructor -->
+    	<property name="value" type="string" formula="42"/>
+    	
+    	<set name="employees">
+    	  <key>
+    	    <column name="ceo_id"/>
+    	    <column name="ceo_subid"/>
+    	  </key>
+    	  <one-to-many class="Employee"/>
+    	</set>
+    	
+    	<subclass name="BigCompany">
+		   <many-to-one name="ceo" class="Employee"/>
+    	</subclass>
+    </class>
+    
+    <class name="BrandProduct">
+		<id name="id" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		<version name="aVersion" type="long"/>
+    	<property name="name" type="string"/>      
+    </class>
+  
+    <!-- HBX-584 -->  
+    <class name="SingleFieldClass"> 
+     <id name="id" type="string"> 
+      <generator class="native"/> 
+     </id> 
+    </class> 
+  
+    
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaDidirectionalIndexedCollectionMappingTest/GenericModel.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaDidirectionalIndexedCollectionMappingTest/GenericModel.hbm.xml
new file mode 100644
index 000000000000..e90f86d890dc
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaDidirectionalIndexedCollectionMappingTest/GenericModel.hbm.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+    <class name="GenericObject" table="GENERIC_OBJECT">
+    	<id name="id" type="long">
+    	 <generator class="native"></generator>
+    	</id>
+    	
+    	<property name="name" type="string"/>
+    	
+    	 <map name="values" cascade="save-update" table="GENERIC_VALUES" lazy="false" inverse="false" fetch="join"> 
+           <key column="OWNER" not-null="true"/> 
+           <map-key type="long" column="MAP_KEY"/> 
+           <one-to-many class="GenericValue"/> 
+        </map>
+        
+    </class>
+ 	
+ 	<class name="GenericValue" table="GENERIC_VALUE">
+    	<id name="id" type="long">
+    	 <generator class="native"></generator>
+    	</id>
+    	
+    	<property name="value" type="string"/>
+    	
+		<many-to-one name="owner" class="GenericObject" column="OWNER" not-null="true" insert="false" update="false"/>        
+		
+    </class>
+ 	
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml
new file mode 100644
index 000000000000..cf72576ceee5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Article.hbm.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test">
+
+    <class name="Article">
+    
+    	<id name="articleId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100"/>
+    	</natural-id>
+    	<property name="content" type="string" not-null="true" length="10000">
+    		<meta attribute="default-value">"what can I say"</meta>
+    	</property>
+
+		<many-to-one
+		    name="author"
+            class="org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test.Author"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+            column="authorId" />
+		
+        <bag name="bagarticles"
+    		inverse="true"
+    		cascade="save-update">
+    		<meta attribute="property-type">java.util.List</meta>
+    		<key column="authorId"/>
+    		<one-to-many class="Article"/>
+    	</bag>
+    	
+    	 <bag name="bagstrings">
+    		
+    		<key column="authorId"/>
+    		
+    		<element type="string"/>
+    	</bag>
+
+    	 <map name="AMap">
+		  <key column="idx"/>
+		  <index type="string"/>
+		  <one-to-many class="Article"/>
+		</map>
+		
+		<list name="aList">
+		  <key column="idx"/>
+		  <list-index/>
+		  <one-to-many class="Article"/>		
+		</list>
+
+		<set name="sortedArticlesSet" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<one-to-many class="Article" />
+		</set>
+		
+		<map name="sortedArticlesMap" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+		<map name="naturalSortedArticlesMap" inverse="true"
+			sort="natural">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Author.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Author.hbm.xml
new file mode 100644
index 000000000000..80b46ed13f00
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Author.hbm.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test">
+
+    <class name="Author">
+    
+    	<id name="authorId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100" unique="true"/>
+    		<property name="address" type="string" not-null="true" length="200" unique="true"/>
+		</natural-id>
+		
+    	<set name="articles"
+    		inverse="true"
+    		cascade="save-update">
+    		
+    		<key column="authorId"/>
+    		
+    		<one-to-many class="Article"/>
+    	</set>
+    	
+    	<query name="findByName">
+    		<query-param name="name" type="string"/>
+    		<query-param name="maxResults" type="int"/>
+    		<query-param name="value" type="int"/>
+    		from Author where name like :name or length(name) > :value
+    	</query>
+    	
+    	<query name="findByNameAndAddress">
+    		<query-param name="name" type="string"/>
+    		<query-param name="address" type="string"/>
+    		from Author where name like :name and address like :address
+    	</query>
+
+    	<query name="countAll">
+    		select count(*) from Author
+    	</query>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Passenger.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Passenger.hbm.xml
new file mode 100644
index 000000000000..165905dae2f6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Passenger.hbm.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test">
+
+    <class name="Passenger">
+
+    	<id name="id"
+    		length="20" type="integer">
+    		<generator class="native">
+                <param name="sequence">SEQ</param>
+            </generator>
+        </id>
+
+        <property name="familyName" type="string" not-null="true" length="234"/>
+
+		<many-to-one
+		    name="currentTrain"
+            class="org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test.Train"
+            cascade="all, replicate"
+            fetch="join"
+            lazy="false"
+            update="true"
+            insert="true"
+            access="property"
+            >
+            <column name="currentTrainCity"/>
+            <column name="currentTrainLine"/>
+        </many-to-one>
+
+        <set name="usualTrains" table="USUAL_TRAIN">
+    		<key column="passengerId"/>
+    		<many-to-many class="Train">
+                <column name="trainCity"/>
+                <column name="trainLine"/>
+            </many-to-many>
+        </set>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml
new file mode 100644
index 000000000000..6908674b58bd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaEjb3Test/Train.hbm.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaEjb3Test">
+
+    <class name="Train">
+        <composite-id name="transportationId" class="TransportationPk">
+            <key-property name="city" type="string"/>
+            <key-property name="line" type="string"/>
+        </composite-id>
+
+        <property name="name" unique="true" type="string" not-null="true"/>
+
+		<set name="currentPassengers"
+    		inverse="true" cascade="persist,save-update">
+    		<key>
+                <column name="currentTrainCity"/>
+                <column name="currentTrainLine"/>
+            </key>
+            <one-to-many class="Passenger"/>
+    	</set>
+
+        <set name="usualPassengers" table="USUAL_TRAIN" inverse="true">
+    		<key>
+                <column name="trainCity"/>
+                <column name="trainLine"/>
+            </key>
+            <many-to-many class="Passenger">
+                <column name="passengerId"/>
+            </many-to-many>
+        </set>
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml
new file mode 100644
index 000000000000..37924b564598
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Article.hbm.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest">
+
+    <class name="Article">
+    
+    	<id name="articleId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100"/>
+    	</natural-id>
+    	<property name="content" type="string" not-null="true" length="10000">
+    		<meta attribute="default-value">"what can I say"</meta>
+    	</property>
+
+		<many-to-one
+		    name="author"
+            class="org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest.Author"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            access="property"
+            column="authorId" />
+		
+        <bag name="bagarticles"
+    		inverse="true"
+    		cascade="save-update">
+    		<meta attribute="property-type">java.util.List</meta>
+    		<key column="authorId"/>
+    		<one-to-many class="Article"/>
+    	</bag>
+    	
+    	 <bag name="bagstrings">
+    		
+    		<key column="authorId"/>
+    		
+    		<element type="string"/>
+    	</bag>
+
+    	 <map name="AMap">
+		  <key column="idx"/>
+		  <index type="string"/>
+		  <one-to-many class="Article"/>
+		</map>
+		
+		<list name="aList">
+		  <key column="idx"/>
+		  <list-index/>
+		  <one-to-many class="Article"/>		
+		</list>
+
+		<set name="sortedArticlesSet" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<one-to-many class="Article" />
+		</set>
+		
+		<map name="sortedArticlesMap" inverse="true"
+			sort="comparator.NoopComparator">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+		<map name="naturalSortedArticlesMap" inverse="true"
+			sort="natural">
+			<key column="idx"/>
+			<map-key type="string"/>
+			<one-to-many class="Article" />
+		</map>
+		
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Author.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Author.hbm.xml
new file mode 100644
index 000000000000..3177570ef992
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Author.hbm.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a collection
+  <key> to one of the primary key columns of an
+  associated child class with a composite key. This
+  is very useful for legacy data!
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest">
+
+    <class name="Author">
+    
+    	<id name="authorId"
+    		length="20" type="string">
+    		<generator class="assigned"/>
+    	</id>
+		
+		<natural-id>
+    		<property name="name" type="string" not-null="true" length="100" unique="true"/>
+    		<property name="address" type="string" not-null="true" length="200" unique="true"/>
+		</natural-id>
+		
+    	<set name="articles"
+    		inverse="true"
+    		cascade="save-update">
+    		
+    		<key column="authorId"/>
+    		
+    		<one-to-many class="Article"/>
+    	</set>
+    	
+    	<query name="findByName">
+    		<query-param name="name" type="string"/>
+    		<query-param name="maxResults" type="int"/>
+    		<query-param name="value" type="int"/>
+    		from Author where name like :name or length(name) > :value
+    	</query>
+    	
+    	<query name="findByNameAndAddress">
+    		<query-param name="name" type="string"/>
+    		<query-param name="address" type="string"/>
+    		from Author where name like :name and address like :address
+    	</query>
+
+    	<query name="countAll">
+    		select count(*) from Author
+    	</query>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Passenger.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Passenger.hbm.xml
new file mode 100644
index 000000000000..09ac09dc6a48
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Passenger.hbm.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest">
+
+    <class name="Passenger">
+
+    	<id name="id"
+    		length="20" type="integer">
+    		<generator class="native">
+                <param name="sequence">SEQ</param>
+            </generator>
+        </id>
+
+        <property name="familyName" type="string" not-null="true" length="234"/>
+
+		<many-to-one
+		    name="currentTrain"
+            class="org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest.Train"
+            cascade="all, replicate"
+            fetch="join"
+            lazy="false"
+            update="true"
+            insert="true"
+            access="property"
+            >
+            <column name="currentTrainCity"/>
+            <column name="currentTrainLine"/>
+        </many-to-one>
+
+        <set name="usualTrains" table="USUAL_TRAIN">
+    		<key column="passengerId"/>
+    		<many-to-many class="Train">
+                <column name="trainCity"/>
+                <column name="trainLine"/>
+            </many-to-many>
+        </set>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml
new file mode 100644
index 000000000000..874baef67b08
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaInitializationTest/Train.hbm.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.Hbm2JavaInitializationTest">
+
+    <class name="Train">
+        <composite-id name="transportationId" class="TransportationPk">
+            <key-property name="city" type="string"/>
+            <key-property name="line" type="string"/>
+        </composite-id>
+
+        <property name="name" unique="true" type="string" not-null="true"/>
+
+		<set name="currentPassengers"
+    		inverse="true" cascade="persist,save-update">
+    		<key>
+                <column name="currentTrainCity"/>
+                <column name="currentTrainLine"/>
+            </key>
+            <one-to-many class="Passenger"/>
+    	</set>
+
+        <set name="usualPassengers" table="USUAL_TRAIN" inverse="true">
+    		<key>
+                <column name="trainCity"/>
+                <column name="trainLine"/>
+            </key>
+            <many-to-many class="Passenger">
+                <column name="passengerId"/>
+            </many-to-many>
+        </set>
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Customer.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Customer.hbm.xml
new file mode 100644
index 000000000000..c9f775821049
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Customer.hbm.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+	
+	This mapping demonstrates how to map a collection
+	<key> to one of the primary key columns of an
+	associated child class with a composite key. This
+	is very useful for legacy data!
+	
+-->
+
+<hibernate-mapping package="org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest">
+
+	<class name="Customer">
+		<comment>A unique customer comment!</comment>
+		<!--<id name="customerId"
+			length="10" type="string">
+			<generator class="assigned"/>
+			</id>-->
+
+		<composite-id>
+			<key-property name="id" type="long" />
+		</composite-id>
+
+		<property name="name" type="string" not-null="true"
+			length="100" />
+		<property name="address" type="string" not-null="true"
+			length="200" />
+
+        <property name="customDate" type="org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.DummyDateType" not-null="true" length="200"/>
+        
+        <property name="acl" type="byte[]">
+         <meta attribute="use-in-equals">true</meta>
+        </property>
+        
+		<component name="addressComponent" class="Address">
+			<property name="streetAddress1" type="string"
+				column="StreetAddress1" not-null="true">
+				<meta attribute="use-in-equals">true</meta>
+			</property>
+			<property name="streetAddress2" type="string"
+				column="StreetAddress2" />
+			<property name="city" type="short" column="City"
+				not-null="true">
+				<meta attribute="use-in-tostring">true</meta>
+				<meta attribute="use-in-equals">true</meta>
+				<meta attribute="property-type">short</meta>
+			</property>
+			<property name="postcode" type="string" column="postcode"
+				not-null="true" />
+			<!--    <many-to-one name="state" class="au.com.groupware.model.State" column="StateId" 
+				foreign-key="FK_Address_State" not-null="true" />  -->
+			<property name="verified" type="boolean">
+			   <meta attribute="use-in-equals">true</meta>
+			</property>
+		</component>
+
+		<list name="orders" inverse="true" cascade="save-update">
+			<key column="customerId" not-null="true" />
+			<index column="orderNumber" />
+			<one-to-many class="Order" />
+		</list>
+
+		<!--  cfg2hbm does not support composite-element
+			<set name="addressComposites">
+			<key column="ADRID"/>
+			<composite-element class="Address">
+			<property name="streetAddress1" type="string" column="StreetAddress1" not-null="true" /> 
+			<property name="streetAddress2" type="string" column="StreetAddress2" /> 
+			<property name="city" type="string" column="City" not-null="true" /> 
+			<property name="postcode" type="string" column="postcode" not-null="true" /> 
+			</composite-element>
+			</set>
+       -->
+
+		<component name="test" class="FatherComponent">
+		    <parent name="testParent"/>
+			<property name="testattrib" type="string" />
+			<component name="child" class="ChildComponent">
+				<property name="childattrib" type="string" />
+			</component>
+		</component>
+
+		<!-- hbm2hbmxml does not support dynamic-component
+		<dynamic-component name="dynaMap">
+			<property name="key1" type="string" />
+		</dynamic-component>
+		 -->
+		 
+		<array name="products" cascade="all">
+			<key column="profileId" />
+			<list-index column="sortOrder" />
+			<many-to-many class="Product" />
+		</array> 
+		
+	<!-- hbm2java can't generate a innerclass (Test$Entry) correctly. should probably skip it as a fallback.-->
+    <!-- <component name="mapEntry" class="java.util.Map$Entry">
+			<property name="value" type="string"/>
+			<property name="key" type="string"/>
+		 </component>  -->
+	</class>
+
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/HelloWorld.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/HelloWorld.hbm.xml
new file mode 100644
index 000000000000..26c191930f37
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/HelloWorld.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping is a test mapping for hbm2java
+     
+-->
+
+<hibernate-mapping>
+
+    <class name="HelloWorld">
+	    <meta attribute="generated-class" inherit="false">generated.BaseHelloWorld</meta>
+	    <meta attribute="extends">Comparable</meta>
+	    <meta attribute="interface">true</meta>
+    	<meta attribute="class-description">Hey there</meta>
+    	<id name="id"
+    		length="10" type="string">
+    		<meta attribute="field-description">Test Field Description</meta>
+				<meta attribute="use-in-tostring">true</meta>
+    		<generator class="assigned"/>
+    	</id>
+		 
+		  <property name="hello" type="string" length="5">
+			  <meta attribute="use-in-tostring">true</meta>
+			</property>
+			
+			<property name="world" type="long">
+			  <meta attribute="use-in-tostring">false</meta>
+			  <meta attribute="use-in-equals">true</meta>
+			   <meta attribute="property-type">long</meta>
+			</property>
+						
+			
+		<subclass name="HelloUniverse">
+			<property name="dimension" type="string"/>
+			<component name="address" class="UniversalAddress">
+				<property name="galaxy" type="string"/>
+				<property name="planet" type="string"/>
+			</component>
+			
+			<property name="notgenerated" type="string">
+			  <meta attribute="gen-property">false</meta>
+			</property>
+			
+		</subclass>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/HelloWorld.java_ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/HelloWorld.java_
new file mode 100644
index 000000000000..b7f9a567609b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/HelloWorld.java_
@@ -0,0 +1,25 @@
+/*
+ * Hibernate Tools, Tooling for your Hibernate Projects
+ *
+ * Copyright 2004-2025 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @author max
+ * NOTE: this file cannot compile without the tests being run since its dependent on its output.
+ */
+public interface HelloWorld extends generated.BaseHelloWorld {
+
+}
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/LineItem.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/LineItem.hbm.xml
new file mode 100644
index 000000000000..733384e664ab
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/LineItem.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates 
+  
+     (1) composite keys and many-to-one associations on 
+         composite keys
+      
+     (2) use of insert="false" update="false" on an
+         association mapping, when the foreign key is
+         also part of the primary key
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest">
+
+    <class name="LineItem">
+    	
+    	<composite-id name="id" 
+    		class="LineItemId">
+    		<key-property name="customerId" length="10" type="string"/>
+    		<key-property name="orderNumber" type="int"/>
+    		<key-property name="productId" length="10" type="string"/>
+    	</composite-id>
+    	
+    	<property name="quantity" type="int"/>
+    	
+    	<many-to-one name="order"
+    		insert="false"
+			update="false" 
+			not-null="true" 
+			class="Order">
+			<column name="customerId"/>
+			<column name="orderNumber"/>
+		</many-to-one>
+    	
+    	<many-to-one name="product"
+    		insert="false"
+			update="false" 
+			not-null="true"
+			column="productId"
+			class="Product"/>
+			
+    </class>
+ 	
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Order.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Order.hbm.xml
new file mode 100644
index 000000000000..f4f63391748f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Order.hbm.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest">
+<!-- 
+
+     
+-->
+
+    <class name="Order" table="CustomerOrder" lazy="true">
+    	<meta attribute="class-modifier">public strictfp</meta>
+    	<meta attribute="class-code">// extra code line 1</meta>
+    	<meta attribute="class-code">// extra code line 2</meta>
+    	<meta attribute="extra-import" inherit="false">java.text.Collator</meta>
+    	<meta attribute="class-code" inherit="false">{ Collator.getInstance(); }</meta>
+    	<synchronize table="LineItem"/>
+    	<synchronize table="Product"/>
+    	
+    	<composite-id name="id" 
+    		class="OrderId">
+    		<key-property name="customerId" length="10" type="string"/>
+    		<key-property name="orderNumber" type="int"/>
+    	</composite-id>
+    	
+    	<property name="orderDate" 
+    		type="calendar_date"
+    		not-null="true"/>
+    	
+    	<property name="total" type="big_decimal"
+    		formula="( select sum(li.quantity*p.price) from LineItem li, Product p where li.productId = p.productId and li.customerId = customerId and li.orderNumber = orderNumber )"/>
+    	
+    	<many-to-one name="customer"
+    		column="customerId"
+    		insert="false"
+			update="false" 
+			not-null="true" class="Customer"/>
+			
+    	<bag name="lineItems"
+    		fetch="join" 
+    		inverse="true"
+    		cascade="save-update">
+    		<key>
+    			<column name="customerId"/>
+    			<column name="orderNumber"/>
+    		</key>
+    		<one-to-many class="LineItem"/>
+    	</bag>
+    	
+    	
+    </class>
+ 	
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Passenger.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Passenger.hbm.xml
new file mode 100644
index 000000000000..2b584de581b5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Passenger.hbm.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest">
+
+    <class name="Passenger">
+
+    	<id name="id"
+    		length="20" type="integer">
+    		<generator class="native">
+                <param name="sequence">SEQ</param>
+            </generator>
+        </id>
+
+        <property name="familyName" type="string" not-null="true" length="234"/>
+
+		<many-to-one
+		    name="currentTrain"
+            class="org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest.Train"
+            cascade="all, replicate"
+            fetch="join"
+            lazy="false"
+            update="true"
+            insert="true"
+            access="property"
+            >
+            <column name="currentTrainCity"/>
+            <column name="currentTrainLine"/>
+        </many-to-one>
+
+        <set name="usualTrains" table="USUAL_TRAIN">
+    		<key column="passengerId"/>
+    		<many-to-many class="Train">
+                <column name="trainCity"/>
+                <column name="trainLine"/>
+            </many-to-many>
+        </set>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Product.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Product.hbm.xml
new file mode 100644
index 000000000000..64575396c3a5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Product.hbm.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest">
+
+    <class name="Product">
+    	<synchronize table="LineItem"/>
+    
+    	<id name="productId"
+    		length="10"
+    		type="long">
+    		<generator class="assigned"/>
+    	</id>
+
+		<version name="version" type="long"/>    	
+		
+<!-- hbm2hbmxml does not support any 
+   	<any name="relatedObject" id-type="long">
+            <column name="objectClass"/>
+            <column name="objectID"/>
+        </any> -->
+    	
+    	<property name="description" 
+    		not-null="true" 
+    		length="200"
+    		type="string"/>
+    	<property name="price" length="3" type="big_decimal"/>
+    	<property name="numberAvailable" not-null="true" type="int"/>
+    	<property name="minStock" type="long"/>
+    	<property name="otherStock" not-null="true" type="long">
+    	  <meta attribute="property-type">java.lang.Integer</meta>
+    	</property>
+    	
+    	<property name="numberOrdered" type="int" 
+    		formula="( select sum(li.quantity) from LineItem li where li.productId = productId )"/>
+    		
+    	<primitive-array name="lapseRates" table="lapseRates">
+			<key column="lapseRateId"/>
+			<index column="indexId"/>
+			<element type="double" column="lapseRate"/>
+	 	</primitive-array>
+      
+   </class>
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Train.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Train.hbm.xml
new file mode 100644
index 000000000000..f1e4d1ec2706
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/Hbm2JavaTest/Train.hbm.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.reveng.hbm2x.Hbm2JavaTest">
+
+    <class name="Train">
+        <composite-id name="transportationId" class="TransportationPk">
+            <key-property name="city" type="string"/>
+            <key-property name="line" type="string"/>
+        </composite-id>
+
+        <property name="name" unique="true" type="string" not-null="true"/>
+
+		<set name="currentPassengers"
+    		inverse="true" cascade="persist,save-update">
+    		<key>
+                <column name="currentTrainCity"/>
+                <column name="currentTrainLine"/>
+            </key>
+            <one-to-many class="Passenger"/>
+    	</set>
+
+        <set name="usualPassengers" table="USUAL_TRAIN" inverse="true">
+    		<key>
+                <column name="trainCity"/>
+                <column name="trainLine"/>
+            </key>
+            <many-to-many class="Passenger">
+                <column name="passengerId"/>
+            </many-to-many>
+        </set>
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/IncrementalSchemaReading/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/IncrementalSchemaReading/create.sql
new file mode 100644
index 000000000000..6c14fc48af70
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/IncrementalSchemaReading/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE MASTER ( ID CHAR NOT NULL, NAME VARCHAR(20), PRIMARY KEY (ID) )
+CREATE TABLE CHILD  ( CHILDID CHAR NOT NULL, MASTERREF CHAR, PRIMARY KEY (CHILDID), FOREIGN KEY (MASTERREF) REFERENCES MASTER(ID) )
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/IncrementalSchemaReading/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/IncrementalSchemaReading/drop.sql
new file mode 100644
index 000000000000..3d430edb6c26
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/IncrementalSchemaReading/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE CHILD
+DROP TABLE MASTER			
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/JdbcHbm2JavaEjb3/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/JdbcHbm2JavaEjb3/create.sql
new file mode 100644
index 000000000000..6c86fb718cac
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/JdbcHbm2JavaEjb3/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE MASTER ( ID CHAR NOT NULL, NAME VARCHAR(20), OTHERNAME VARCHAR(20), PRIMARY KEY (ID) )
+CREATE TABLE UNIQUEMASTER ( ID CHAR NOT NULL, NAME VARCHAR(20), OTHERNAME VARCHAR(20), PRIMARY KEY (ID), CONSTRAINT O1 UNIQUE (NAME), CONSTRAINT O2 UNIQUE (OTHERNAME) )
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/JdbcHbm2JavaEjb3/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/JdbcHbm2JavaEjb3/drop.sql
new file mode 100644
index 000000000000..20e735a6c8ba
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/JdbcHbm2JavaEjb3/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE MASTER
+DROP TABLE UNIQUEMASTER
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml
new file mode 100644
index 000000000000..00f1af195e3d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/Customer.hbm.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+	
+	This mapping demonstrates how to map a collection
+	<key> to one of the primary key columns of an
+	associated child class with a composite key. This
+	is very useful for legacy data!
+	
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+	<class name="Customer">
+		<comment>A unique customer comment!</comment>
+		<!--<id name="customerId"
+			length="10" type="string">
+			<generator class="assigned"/>
+			</id>-->
+
+		<composite-id>
+			<key-property name="id" type="long" />
+		</composite-id>
+
+		<property name="name" type="string" not-null="true"
+			length="100" />
+		<property name="address" type="string" not-null="true"
+			length="200" />
+
+        <property name="customDate" type="date" not-null="true" length="200"/>
+        
+        <property name="acl" type="byte[]">
+         <meta attribute="use-in-equals">true</meta>
+        </property>
+        
+		<component name="addressComponent" class="Address">
+			<property name="streetAddress1" type="string"
+				column="StreetAddress1" not-null="true">
+				<meta attribute="use-in-equals">true</meta>
+			</property>
+			<property name="streetAddress2" type="string"
+				column="StreetAddress2" />
+			<property name="city" type="short" column="City"
+				not-null="true">
+				<meta attribute="use-in-tostring">true</meta>
+				<meta attribute="use-in-equals">true</meta>
+				<meta attribute="property-type">short</meta>
+			</property>
+			<property name="postcode" type="string" column="postcode"
+				not-null="true" />
+			<!--    <many-to-one name="state" class="au.com.groupware.model.State" column="StateId" 
+				foreign-key="FK_Address_State" not-null="true" />  -->
+			<property name="verified" type="boolean">
+			   <meta attribute="use-in-equals">true</meta>
+			</property>
+		</component>
+
+		<list name="orders" inverse="true" cascade="save-update">
+			<key column="customerId" not-null="true" />
+			<index column="orderNumber" />
+			<one-to-many class="Order" />
+		</list>
+
+		<!--  cfg2hbm does not support composite-element
+			<set name="addressComposites">
+			<key column="ADRID"/>
+			<composite-element class="Address">
+			<property name="streetAddress1" type="string" column="StreetAddress1" not-null="true" /> 
+			<property name="streetAddress2" type="string" column="StreetAddress2" /> 
+			<property name="city" type="string" column="City" not-null="true" /> 
+			<property name="postcode" type="string" column="postcode" not-null="true" /> 
+			</composite-element>
+			</set>
+       -->
+
+		<component name="test" class="FatherComponent">
+		    <parent name="testParent"/>
+			<property name="testattrib" type="string" />
+			<component name="child" class="ChildComponent">
+				<property name="childattrib" type="string" />
+			</component>
+		</component>
+
+		<!-- hbm2hbmxml does not support dynamic-component
+		<dynamic-component name="dynaMap">
+			<property name="key1" type="string" />
+		</dynamic-component>
+		 -->
+		 
+		<array name="products" cascade="all">
+			<key column="profileId" />
+			<list-index column="sortOrder" />
+			<many-to-many class="Product" />
+		</array> 
+		
+	<!-- hbm2java can't generate a innerclass (Test$Entry) correctly. should probably skip it as a fallback.-->
+    <!-- <component name="mapEntry" class="java.util.Map$Entry">
+			<property name="value" type="string"/>
+			<property name="key" type="string"/>
+		 </component>  -->
+	</class>
+
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/HelloWorld.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/HelloWorld.hbm.xml
new file mode 100644
index 000000000000..26c191930f37
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/HelloWorld.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping is a test mapping for hbm2java
+     
+-->
+
+<hibernate-mapping>
+
+    <class name="HelloWorld">
+	    <meta attribute="generated-class" inherit="false">generated.BaseHelloWorld</meta>
+	    <meta attribute="extends">Comparable</meta>
+	    <meta attribute="interface">true</meta>
+    	<meta attribute="class-description">Hey there</meta>
+    	<id name="id"
+    		length="10" type="string">
+    		<meta attribute="field-description">Test Field Description</meta>
+				<meta attribute="use-in-tostring">true</meta>
+    		<generator class="assigned"/>
+    	</id>
+		 
+		  <property name="hello" type="string" length="5">
+			  <meta attribute="use-in-tostring">true</meta>
+			</property>
+			
+			<property name="world" type="long">
+			  <meta attribute="use-in-tostring">false</meta>
+			  <meta attribute="use-in-equals">true</meta>
+			   <meta attribute="property-type">long</meta>
+			</property>
+						
+			
+		<subclass name="HelloUniverse">
+			<property name="dimension" type="string"/>
+			<component name="address" class="UniversalAddress">
+				<property name="galaxy" type="string"/>
+				<property name="planet" type="string"/>
+			</component>
+			
+			<property name="notgenerated" type="string">
+			  <meta attribute="gen-property">false</meta>
+			</property>
+			
+		</subclass>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/LineItem.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/LineItem.hbm.xml
new file mode 100644
index 000000000000..a8cd38d13bdd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/LineItem.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates 
+  
+     (1) composite keys and many-to-one associations on 
+         composite keys
+      
+     (2) use of insert="false" update="false" on an
+         association mapping, when the foreign key is
+         also part of the primary key
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+    <class name="LineItem">
+    	
+    	<composite-id name="id" 
+    		class="LineItemId">
+    		<key-property name="customerId" length="10" type="string"/>
+    		<key-property name="orderNumber" type="int"/>
+    		<key-property name="productId" length="10" type="string"/>
+    	</composite-id>
+    	
+    	<property name="quantity" type="int"/>
+    	
+    	<many-to-one name="order"
+    		insert="false"
+			update="false" 
+			not-null="true" 
+			class="Order">
+			<column name="customerId"/>
+			<column name="orderNumber"/>
+		</many-to-one>
+    	
+    	<many-to-one name="product"
+    		insert="false"
+			update="false" 
+			not-null="true"
+			column="productId"
+			class="Product"/>
+			
+    </class>
+ 	
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/Order.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/Order.hbm.xml
new file mode 100644
index 000000000000..01db0576aad2
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/Order.hbm.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+<!-- 
+
+     
+-->
+
+    <class name="Order" table="CustomerOrder" lazy="true">
+    	<meta attribute="class-modifier">public strictfp</meta>
+    	<meta attribute="class-code">// extra code line 1</meta>
+    	<meta attribute="class-code">// extra code line 2</meta>
+    	<meta attribute="extra-import" inherit="false">java.text.Collator</meta>
+    	<meta attribute="class-code" inherit="false">{ Collator.getInstance(); }</meta>
+    	<synchronize table="LineItem"/>
+    	<synchronize table="Product"/>
+    	
+    	<composite-id name="id" 
+    		class="OrderId">
+    		<key-property name="customerId" length="10" type="string"/>
+    		<key-property name="orderNumber" type="int"/>
+    	</composite-id>
+    	
+    	<property name="orderDate" 
+    		type="calendar_date"
+    		not-null="true"/>
+    	
+    	<property name="total" type="big_decimal"
+    		formula="( select sum(li.quantity*p.price) from LineItem li, Product p where li.productId = p.productId and li.customerId = customerId and li.orderNumber = orderNumber )"/>
+    	
+    	<many-to-one name="customer"
+    		column="customerId"
+    		insert="false"
+			update="false" 
+			not-null="true" class="Customer"/>
+			
+    	<bag name="lineItems"
+    		fetch="join" 
+    		inverse="true"
+    		cascade="save-update">
+    		<key>
+    			<column name="customerId"/>
+    			<column name="orderNumber"/>
+    		</key>
+    		<one-to-many class="LineItem"/>
+    	</bag>
+    	
+    	
+    </class>
+ 	
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/Product.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/Product.hbm.xml
new file mode 100644
index 000000000000..c393f8043bfd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/Product.hbm.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x">
+
+    <class name="Product">
+    	<synchronize table="LineItem"/>
+    
+    	<id name="productId"
+    		length="10"
+    		type="long">
+    		<generator class="assigned"/>
+    	</id>
+
+		<version name="version" type="long"/>    	
+		
+<!-- hbm2hbmxml does not support any 
+   	<any name="relatedObject" id-type="long">
+            <column name="objectClass"/>
+            <column name="objectID"/>
+        </any> -->
+    	
+    	<property name="description" 
+    		not-null="true" 
+    		length="200"
+    		type="string"/>
+    	<property name="price" length="3" type="big_decimal"/>
+    	<property name="numberAvailable" not-null="true" type="int"/>
+    	<property name="minStock" type="long"/>
+    	<property name="otherStock" not-null="true" type="long">
+    	  <meta attribute="property-type">java.lang.Integer</meta>
+    	</property>
+    	
+    	<property name="numberOrdered" type="int" 
+    		formula="( select sum(li.quantity) from LineItem li where li.productId = productId )"/>
+    		
+    	<primitive-array name="lapseRates" table="lapseRates">
+			<key column="lapseRateId"/>
+			<index column="indexId"/>
+			<element type="double" column="lapseRate"/>
+	 	</primitive-array>
+      
+   </class>
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/hibernate.properties b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/hibernate.properties
new file mode 100644
index 000000000000..273d9cb8a253
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/OtherCfg2HbmTest/hibernate.properties
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.dialect org.hibernate.tools.test.util.HibernateUtil$Dialect
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/PropertiesTest/Properties.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/PropertiesTest/Properties.hbm.xml
new file mode 100644
index 000000000000..76101b3cb745
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/PropertiesTest/Properties.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping is a test mapping for hbm2java
+     
+-->
+
+<hibernate-mapping package="properties">
+
+    <class name="PPerson">
+    	<id name="id" type="string">
+    		<generator class="native"/>
+    	</id>
+
+    	<property name="name" type="string" not-null="true"/>
+    	
+    	<properties name="emergencyContact" unique="true">
+    		<property name="contact" type="boolean" not-null="true"/>
+    		<many-to-one name="company" class="PCompany"/>
+    	</properties>
+    </class>
+    	
+    <class name="PCompany">
+    	<id name="id" type="string">
+    		<generator class="native"/>
+    	</id>
+
+    	<property name="brand" type="string" not-null="true"/>
+    	
+    	<set name="employees" inverse="true">
+    	  <key>
+    	    <column name="company_id"/>
+    	  </key>
+    	  <one-to-many class="PPerson"/>
+    	</set>
+    	
+<!-- 	<one-to-one name="emergencyContact" class="Person"
+		property-ref="emergencyContact">
+		<formula>'true'</formula>
+		<formula>id</formula>
+	</one-to-one> -->
+
+    </class>
+    
+</hibernate-mapping>
+
+
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/PropertiesTest/PropertiesUsage.java_ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/PropertiesTest/PropertiesUsage.java_
new file mode 100644
index 000000000000..f56690282c24
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/PropertiesTest/PropertiesUsage.java_
@@ -0,0 +1,27 @@
+/*
+ * Hibernate Tools, Tooling for your Hibernate Projects
+ *
+ * Copyright 2004-2025 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package properties;
+
+public class PropertiesUsage {
+
+	public void personName(){
+		PPerson person = new PPerson();
+		person.setName( "name" );
+		person.setContact(true);
+	}
+}
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/PropertiesTest/hibernate.properties b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/PropertiesTest/hibernate.properties
new file mode 100644
index 000000000000..273d9cb8a253
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/PropertiesTest/hibernate.properties
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.dialect org.hibernate.tools.test.util.HibernateUtil$Dialect
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/Car.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/Car.hbm.xml
new file mode 100644
index 000000000000..eac63fc382b3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/AbstractTest/Car.hbm.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.AbstractTest">
+
+	<class name="Car" lazy="false" node="car">
+		<id name="id" node="@id" type="long">
+			<generator class="increment"/>
+		</id>
+		<property name="model"  type="string" node="model"/>
+		<set name="carParts" node="." cascade="all">
+			<key column="car" not-null="true"/>
+			<one-to-many class="CarPart" node="carPart"/>
+		</set>
+	</class>
+	
+	<class name="CarPart" node="carPart" abstract="true">
+		<id name="id" node="@id" type="long">
+			<generator class="increment"/>
+		</id>
+		<property name="partName" type="string" node="partName"/>
+	</class>
+	
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/Car.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/Car.hbm.xml
new file mode 100644
index 000000000000..d809405d3514
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/BackrefTest/Car.hbm.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+	
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.BackrefTest">
+
+	<class name="Car" lazy="false" node="car">
+		<id name="id" node="@id" type="long">
+			<generator class="increment"/>
+		</id>
+		<property name="model"  type="string" node="model"/>
+		<set name="carParts" node="." cascade="all">
+			<key column="car" not-null="true"/>
+			<one-to-many class="CarPart" node="carPart"/>
+		</set>
+	</class>
+	
+	<class name="CarPart" node="carPart" abstract="true">
+		<id name="id" node="@id" type="long">
+			<generator class="increment"/>
+		</id>
+		<property name="partName" type="string" node="partName"/>
+	</class>
+	
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/Glarch.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/Glarch.hbm.xml
new file mode 100644
index 000000000000..93a3e9079e6f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/CompositeElementTest/Glarch.hbm.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-lazy="false" 
+	package="org.hibernate.tool.hbm2x.hbm2hbmxml.CompositeElementTest">
+
+    <class name="Glarch"
+    	table="`glarchez`"
+    	proxy="GlarchProxy"
+    	dynamic-update="true">
+
+        <!--cache-->
+        <id type="string" column="tha_key" length="32">
+            <generator class="uuid"/>
+        </id>
+        <version name="version"/>
+        <many-to-one name="next" column="next_" class="Glarch"/>
+        <dynamic-component name="dynaBean">
+        	<property name="foo" type="string"/>
+        	<property name="bar" type="integer"/>
+        </dynamic-component>
+        <list name="strings">
+            <key column="glarch_key"/>
+            <index column="`indx_`"/>
+            <element type="string" column="`tha_stryng`"/>
+        </list>
+        <list name="fooComponents" lazy="true" cascade="all">
+            <key column="glarch_key"/>
+            <index column="tha_indecks"/>
+            <composite-element class="FooComponent">
+                <property name="name" column="name_"/>
+                <property name="count" column="count_"/>
+                <nested-composite-element name="subcomponent" class="FooComponent">
+                    <property name="name" column="x_"/>
+                    <property name="count" column="y_"/>
+                </nested-composite-element>
+                <many-to-one name="fee" cascade="all" outer-join="true"/>
+            </composite-element>
+        </list>
+        <array name="proxyArray" element-class="GlarchProxy">
+        	<key column="array_key"/>
+        	<index column="array_indecks"/>
+        	<one-to-many class="Glarch"/>
+        </array>
+    </class>
+    
+     <class name="Fee" table="`the fees`">
+        <id type="string" name="key" column="id_" length="64" unsaved-value="null">
+            <generator class="uuid"/>
+        </id>
+        <property name="fi"/>
+        <many-to-one name="anotherFee"/>
+        <component name="compon" update="false">
+        	<property name="name"/>
+        	<property name="null" column="null_prop"/>
+        </component>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml
new file mode 100644
index 000000000000..99691ff117b0
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/DynamicComponentTest/Glarch.hbm.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-lazy="false" 
+	package="org.hibernate.tool.hbm2x.hbm2hbmxml.DynamicComponentTest">
+
+    <class name="Glarch"
+    	table="`glarchez`"
+    	proxy="GlarchProxy"
+    	dynamic-update="true">
+
+        <!--cache-->
+        <id type="string" column="tha_key" length="32">
+            <generator class="uuid"/>
+        </id>
+        <version name="version"/>
+        <many-to-one name="next" column="next_" class="Glarch"/>
+        <dynamic-component name="dynaBean">
+        	<property name="foo" type="string"/>
+        	<property name="bar" type="integer"/>
+        </dynamic-component>
+        <list name="strings">
+            <key column="glarch_key"/>
+            <index column="`indx_`"/>
+            <element type="string" column="`tha_stryng`"/>
+        </list>
+        <list name="fooComponents" lazy="true" cascade="all">
+            <key column="glarch_key"/>
+            <index column="tha_indecks"/>
+            <composite-element class="FooComponent">
+                <property name="name" column="name_"/>
+                <property name="count" column="count_"/>
+                <nested-composite-element name="subcomponent" class="FooComponent">
+                    <property name="name" column="x_"/>
+                    <property name="count" column="y_"/>
+                </nested-composite-element>
+                <many-to-one name="fee" cascade="all" outer-join="true"/>
+            </composite-element>
+        </list>
+        <array name="proxyArray" element-class="GlarchProxy">
+        	<key column="array_key"/>
+        	<index column="array_indecks"/>
+        	<one-to-many class="Glarch"/>
+        </array>
+    </class>
+    
+     <class name="Fee" table="`the fees`">
+        <id type="string" name="key" column="id_" length="64" unsaved-value="null">
+            <generator class="uuid"/>
+        </id>
+        <property name="fi"/>
+        <many-to-one name="anotherFee"/>
+        <component name="compon" update="false">
+        	<property name="name"/>
+        	<property name="null" column="null_prop"/>
+        </component>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Customer.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Customer.hbm.xml
new file mode 100644
index 000000000000..e1d1d9c410de
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/FormulaTest/Customer.hbm.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"http://hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!--
+
+	Shows how to map a one-to-many relationship in the relational
+	schema to "typed" one-to-one associations in the object model.
+	We map the Address class twice, with different entity names,
+	specifying a filtering condition in each mapping. The typed
+	associations then reference the named entities.
+
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.FormulaTest">
+
+	<class name="Customer" 
+			select-before-update="true" 
+			dynamic-update="true">
+	
+		<id name="customerId">
+			<generator class="assigned"/>
+		</id>
+	
+		<property name="name" not-null="true"/>
+		
+		<many-to-one name="billingAddress" 
+			entity-name="BillingAddress"
+			cascade="persist,save-update,delete"
+			fetch="join">
+			<column name="billingAddressId"/>
+			<formula>'BILLING'</formula>
+		</many-to-one>
+			
+		<many-to-one name="shippingAddress" 
+			entity-name="ShippingAddress"
+			cascade="persist,save-update,delete"
+			fetch="join">
+			<column name="shippingAddressId"/>
+			<formula>'SHIPPING'</formula>
+		</many-to-one>
+			
+	</class>
+	
+	<class name="Address"
+		table="Address"
+		entity-name="BillingAddress" 
+		where="type='BILLING'" 
+		check="type in ('BILLING', 'SHIPPING')"
+		select-before-update="true" 
+		dynamic-update="true">
+	
+		<composite-id name="addressId"> 
+			<key-property name="addressId"/>
+			<key-property name="type"/>
+		</composite-id>
+		
+		<property name="street" not-null="true"/>
+		<property name="city" not-null="true"/>
+		<property name="state" not-null="true"/>
+		<property name="zip" not-null="true"/>
+						
+	</class>
+
+	<class name="Address" 
+		table="Address"
+		entity-name="ShippingAddress"
+		where="type='SHIPPING'"
+		select-before-update="true" 
+		dynamic-update="true">
+	
+		<composite-id name="addressId">
+			<key-property name="addressId"/>
+			<key-property name="type"/>
+		</composite-id>
+		
+		<property name="street" not-null="true"/>
+		<property name="city" not-null="true"/>
+		<property name="state" not-null="true"/>
+		<property name="zip" not-null="true"/>
+						
+	</class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml
new file mode 100644
index 000000000000..e3eb6e6fdeb8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/Basic.hbm.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest">
+<!--
+  This mapping demonstrates basic attributes of the mapping document
+
+     (1) Simple id and properties
+     (2) Id generation with no arguments.
+-->
+    <class name="Basic" table="`bas-ic`">
+        <meta attribute="class-meta" inherit="false">Basic</meta>
+        <meta attribute="class-meta" inherit="false">Basic2</meta>
+    	<id name="basicId"
+    		length="10"
+    		type="string"
+			unsaved-value="null"
+    	>
+    	    <meta attribute="id-meta" inherit="false">basicId</meta>
+    		<generator class="org.hibernate.id.TableHiLoGenerator">
+    			<param name="table">uni_table</param>
+    			<param name="column">next_hi_value</param>
+    		</generator>
+    	</id>
+
+    	<property name="description"
+    		not-null="true"
+    		length="200"
+    		type="string">
+    		  <meta attribute="property-desc" inherit="false">description</meta>
+    		</property>
+
+    	<property name="price" length="3" type="big_decimal" />
+
+    	<property name="numberAvailable" type="int" column="`number-Available`"/>
+
+    	<set name="aSet" cascade="delete, update">
+    	 <meta attribute="set-desc">anotherone</meta>
+    	 <key/>
+    	 <one-to-many class="Basic"/>
+    	</set>
+
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml
new file mode 100644
index 000000000000..ddb03268bccd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicCompositeId.hbm.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates 
+  
+     (1) composite keys and many-to-one associations on 
+         composite keys
+      
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest">
+
+    <class name="BasicCompositeId">
+    	
+    	<composite-id
+            name="id" 
+    		class="org.hibernate.tool.cfg2hbm.BasicCompKey"
+    		unsaved-value="none"
+    		access="field"
+        >
+    		<key-property name="customerId" length="10" type="string"/>
+    		<key-property name="orderNumber" type="int"/>
+    		<key-property name="productId" length="10" type="string"/>
+    	</composite-id>
+    	
+    	<property name="quantity" type="int"/>
+    	    	
+    	<many-to-one
+            name="product"
+    		insert="false"
+			update="false" 
+			not-null="true"
+			column="productId"
+			class="ClassFullAttribute"
+			fetch="join"
+        />
+			
+    </class>
+ 	
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml
new file mode 100644
index 000000000000..c2f5fcbd1261
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/BasicGlobals.hbm.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping 
+	package="org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest"
+>
+	<import class="testImport" rename="org.import.test.testImport" />
+<!-- 
+  This mapping demonstrates basic attributes of the mapping document
+
+     (1) Global settings [Note: They do not come from this document]
+     (2) Simple id and properties
+     (3) Id generation with no arguments.
+-->
+    <class name="BasicGlobals">
+    
+    	<id name="basicId"
+    		length="10"
+    		type="string"
+			unsaved-value="null"
+    	>
+    		<generator class="assigned"/>
+    	</id>
+    	
+    	<property name="description" 
+    		not-null="true" 
+    		length="200"
+    		type="string" />
+    		
+    	<property name="price" length="3" type="big_decimal" />
+    	
+    	<property name="numberAvailable" type="int" />
+    	
+	</class>
+
+<!--  TODO: HBX-2042 - Uncomment -->
+<!--  	<query name="test_query_1"><![CDATA[from cat as c where c.age > 1]]></query> 
+	<query name="test_query_2"
+		flush-mode="auto"
+	    cacheable="true"
+	    cache-region="myregion"
+        fetch-size="10"
+        timeout="1000"	   
+	><![CDATA[from dog as d where d.age > 2]]></query> -->
+
+	<sql-query name="test_sqlquery_1"><![CDATA[from bird as {b} where {b.age} > 3]]></sql-query>
+	
+	<sql-query 
+        name="test_sqlquery_2"
+        flush-mode="auto"
+	    cacheable="true"
+	    cache-region="myregion"
+        fetch-size="10"
+        timeout="1000"
+    ><![CDATA[from snake as {s} where {s.age} > 4]]></sql-query>
+
+	<sql-query name="test_sqlquery_3">
+		<synchronize table="mytable" />
+		<![CDATA[from fish as {f} where {f.age} > 5]]>
+	</sql-query> 
+
+<!--  TODO: HBX-2042 - Uncomment -->
+<!--	<sql-query name="test_sqlquery_4">
+		<synchronize table="mytable" />
+		<return 
+             alias="e"
+             class="org.hibernate.tool.hbm2x.hbm2hbmxml.BasicGlobals"
+		/>
+		<![CDATA[from elephant as {e} where {e.age} > 50]]>
+	</sql-query> -->
+
+	<sql-query name="test_sqlquery_5">
+		<synchronize table="mytable" />
+        <return-join 
+        	alias="e"
+        	property="e.age"
+       	/>
+		<![CDATA[from elephant as {e} where {e.age} > 35]]>
+	</sql-query> 
+
+	<sql-query name="test_sqlquery_6">
+		<synchronize table="mytable" />
+        <load-collection alias="e" role="BasicGlobals.price" lock-mode="none"/>
+		<![CDATA[from elephant as {e} where {e.age} > 25]]>
+	</sql-query> 
+	
+	<filter-def name="filterit">
+	    <filter-param
+             name="idname"
+             type="string"
+	    />
+	</filter-def> 
+	
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/ClassFullAttribute.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/ClassFullAttribute.hbm.xml
new file mode 100644
index 000000000000..4b1b2b4ac01a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/Hbm2HbmXmlTest/ClassFullAttribute.hbm.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest">
+<!-- 
+  This mapping demonstrates basic attributes of the mapping document
+
+     (1) Close to full attributes included.
+-->
+    <class
+    	name="ClassFullAttribute"
+    	schema="myschema"
+    	catalog="mycatalog"
+		mutable="false"
+		dynamic-update="true"
+		dynamic-insert="true"
+		select-before-update="true"
+		lazy="false"
+		abstract="true"
+		optimistic-lock="none"
+		discriminator-value="null"
+		polymorphism="explicit"
+		batch-size="10"
+		where="archive='N'"
+		subselect="from query"
+		persister="org.hibernate.tool.hbm2x.hbm2hbmxml.Hbm2HbmXmlTest.TestCase$Persister"
+		rowid="rowid"
+    >
+        <comment>A comment for ClassFullAttribute</comment>
+    	<id name="basicId"
+    		length="10"
+    		type="string"
+			unsaved-value="null"
+    	>
+    		<generator class="org.hibernate.id.TableHiLoGenerator">
+    			<param name="table">uni_table</param>
+    			<param name="column">next_hi_value</param>
+    		</generator>
+    	</id>
+    	
+    	<property name="description" 
+    		not-null="true" 
+    		length="200"
+    		type="string" 
+            update="false"
+            insert="false"
+            access="field"
+            lazy="true"
+            optimistic-lock="false"
+    	/>
+
+    	<property name="columnDetails" 
+    		type="string" 
+    	>
+    		<column name="columnd" length="200" not-null="true" sql-type="varchar(200)" unique="true" >
+    		  <comment>columnd comment</comment>
+    		</column>
+    	</property>
+
+        <property name="columnDetails" 
+    		type="string" 
+    	>
+    		<column name="columnd" length="200" not-null="true" sql-type="varchar(200)" unique="true" >
+    		  <comment></comment><!--  empty comment -->
+    		</column>
+    	</property>
+
+    	<property name="vitualValue" 
+    		not-null="true" 
+    		length="200"
+    		type="string" 
+            formula="my virtual formula"
+    	/>
+    		
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/UserGroup.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/UserGroup.hbm.xml
new file mode 100644
index 000000000000..c1615206a08c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/IdBagTest/UserGroup.hbm.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to use an idbag to represent
+  a many-to-many association where the association table has
+  a surrogate key.
+     
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.IdBagTest">
+	
+	<class name="User" table="`Users`">
+		<id name="name"/>
+		
+		<idbag name="groups" 
+				order-by="groupName asc" 
+				table="`UserGroups`" lazy="false" access="field">
+			<collection-id column="userGroupId" 
+					type="long">
+				<generator class="increment"/>
+			</collection-id>
+			<key column="userName"/>
+			<many-to-many column="groupName" 
+					class="Group"/>
+		</idbag>
+		
+	</class>
+	
+	<class name="Group" table="`Groups`">
+		<id name="name"/>
+	</class>
+	
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/InheritanceTest/Aliens.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/InheritanceTest/Aliens.hbm.xml
new file mode 100644
index 000000000000..2b7898d2866e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/InheritanceTest/Aliens.hbm.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a many-to-many
+  association with a shared attribute in the primary keys
+  of the associated entities.
+     
+-->
+
+<hibernate-mapping 
+	package="org.hibernate.tool.hbm2x.hbm2hbmxml.InheritanceTest">
+	
+	<class name="Animal">
+		<id name="id" type="long">
+			<generator class="assigned"/>
+		</id>
+		  <discriminator type="string">
+            	<column name="HIER_TYPE" length="5" not-null="true" />
+  		  </discriminator>
+		<property name="legs" type="int"/>
+	</class>
+	
+	<subclass name="Human" extends="Animal">
+		<property name="name" type="string"/>
+	</subclass>
+	
+	<subclass name="Alien" extends="Animal">
+	  <join table="ALIEN">
+		  <comment>A comment for joined-subclass</comment>
+		  <key column="aid"/>
+		  <property name="planet" type="string"/>
+	  </join>
+	</subclass>
+		
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Parent.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Parent.hbm.xml
new file mode 100644
index 000000000000..53efbce62e3c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/JoinTest/Parent.hbm.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"http://hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to use an "inverse" join
+  to map an association table as an association with 
+  one-to-many multiplicity at the level of the object
+  model.
+     
+-->
+
+<hibernate-mapping 
+	package="org.hibernate.tool.hbm2x.hbm2hbmxml.JoinTest">
+
+	<class name="Parent">
+		<id name="id" 
+			column="parent_id">
+			<generator class="increment"/>
+		</id>
+		<property name="name"/>
+		<set name="children" 
+			table="ParentChild" 
+			cascade="all"
+			inverse="true">
+			<key column="parent_id"/>
+			<many-to-many column="child_id" 
+				class="Child"/>
+		</set>
+	</class>
+	
+	<class name="Child">
+		<id name="id" 
+			column="child_id">
+			<generator class="increment"/>
+		</id>
+		<property name="name"/>
+		<join table="ParentChild" 
+			optional="true">
+			<key column="child_id"/>
+			<many-to-one name="parent" 
+				column="parent_id" 
+				not-null="true"/>
+		</join>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml
new file mode 100644
index 000000000000..d9753a8a0b77
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ListArrayTest/Glarch.hbm.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-lazy="false" 
+	package="org.hibernate.tool.hbm2x.hbm2hbmxml.ListArrayTest">
+
+    <class name="Glarch"
+    	table="`glarchez`"
+    	proxy="GlarchProxy"
+    	dynamic-update="true">
+
+        <!--cache-->
+        <id type="string" column="tha_key" length="32">
+            <generator class="uuid"/>
+        </id>
+        <version name="version"/>
+        <many-to-one name="next" column="next_" class="Glarch"/>
+        <dynamic-component name="dynaBean">
+        	<property name="foo" type="string"/>
+        	<property name="bar" type="integer"/>
+        </dynamic-component>
+        <list name="strings">
+            <key column="glarch_key"/>
+            <index column="`indx_`"/>
+            <element type="string" column="`tha_stryng`"/>
+        </list>
+        <list name="fooComponents" lazy="true" cascade="all">
+            <key column="glarch_key"/>
+            <index column="tha_indecks"/>
+            <composite-element class="FooComponent">
+                <property name="name" column="name_"/>
+                <property name="count" column="count_"/>
+                <nested-composite-element name="subcomponent" class="FooComponent">
+                    <property name="name" column="x_"/>
+                    <property name="count" column="y_"/>
+                </nested-composite-element>
+                <many-to-one name="fee" cascade="all" outer-join="true"/>
+            </composite-element>
+        </list>
+        <array name="proxyArray" element-class="GlarchProxy">
+        	<key column="array_key"/>
+        	<index column="array_indecks"/>
+        	<one-to-many class="Glarch"/>
+        </array>
+    </class>
+    
+     <class name="Fee" table="`the fees`">
+        <id type="string" name="key" column="id_" length="64" unsaved-value="null">
+            <generator class="uuid"/>
+        </id>
+        <property name="fi"/>
+        <many-to-one name="anotherFee"/>
+        <component name="compon" update="false">
+        	<property name="name"/>
+        	<property name="null" column="null_prop"/>
+        </component>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml
new file mode 100644
index 000000000000..01130c06a2fd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/ManyToManyTest/UserGroup.hbm.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!--
+
+  This mapping demonstrates how to map a many-to-many
+  association with a shared attribute in the primary keys
+  of the associated entities.
+
+-->
+
+<hibernate-mapping
+	package="org.hibernate.tool.reveng.hbm2x.hbm2hbmxml.ManyToManyTest">
+
+	<class name="User" table="`User`">
+		<composite-id>
+			<key-property name="name"/>
+			<key-property name="org"/>
+		</composite-id>
+		<set name="groups" table="UserGroup" lazy="extra">
+			<key>
+				<column name="userName"/>
+				<column name="org"/>
+			</key>
+			<many-to-many class="Group">
+				<column name="groupName"/>
+				<formula>org</formula>
+			</many-to-many>
+		</set>
+	</class>
+
+	<class name="Group" table="`Group`">
+		<composite-id>
+			<key-property name="name"/>
+			<key-property name="org"/>
+		</composite-id>
+		<property name="description"/>
+		<set name="users" table="UserGroup" inverse="true" lazy="extra">
+			<key>
+				<column name="groupName"/>
+				<column name="org"/>
+			</key>
+			<many-to-many class="User">
+				<column name="userName"/>
+				<formula>org</formula>
+			</many-to-many>
+		</set>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.hbm.xml
new file mode 100644
index 000000000000..141659cea673
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Person.hbm.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+      "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+          "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.MapAndAnyTest">
+
+    <class name="Person" table="T_ANY_PERSON">
+        <id name="id" column="ID_">
+            <generator class="increment" />
+        </id>
+        <property name="name" />
+        <any name="data" id-type="long" cascade="none" meta-type="string">
+            <meta-value value="A" class="Address2"/>
+            <column name="DATATYPE_"/>
+            <column name="DATAID_"/>
+        </any>
+    </class>
+
+    <class name="Address" table="T_ANY_ADDRESS">
+        <id name="id" column="ID_">
+            <generator class="increment" />
+        </id>
+        <set name="lines" table="LINE">
+            <key column="ADDRESS" />
+            <element type="string" />
+        </set>
+    </class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml
new file mode 100644
index 000000000000..c9a05e049274
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/MapAndAnyTest/Properties.hbm.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.MapAndAnyTest">
+
+    <class name="PropertySet" table="T_PROP_SET">
+        <id name="id" column="ID" type="long">
+            <generator class="increment"/>
+        </id>
+        <property name="name" column="NAME" type="string"/>
+        <any name="someSpecificProperty" id-type="long" meta-type="string" cascade="all" access="field">
+            <meta-value value="I" class="IntegerPropertyValue"/>
+            <meta-value value="S" class="StringPropertyValue"/>
+            <meta-value value="C" class="ComplexPropertyValue" />
+            <column name="S_S_PROP_TYPE"/>
+            <column name="S_S_PROP_ID"/>
+        </any>
+        <map name="generalProperties" table="T_GEN_PROPS" lazy="true" cascade="all" access="field">
+            <key column="PROP_SET_ID"/>
+            <map-key type="string" column="GEN_PROP_NAME"/>
+            <many-to-any id-type="long" meta-type="string">
+                <meta-value value="I" class="IntegerPropertyValue"/>
+                <meta-value value="S" class="StringPropertyValue"/>
+                <column name="PROP_TYPE"/>
+                <column name="PROP_ID"/>
+            </many-to-any>
+        </map>
+    </class>
+
+    <class name="StringPropertyValue" table="T_CHAR_PROP">
+        <id name="id" column="ID" type="long">
+            <generator class="increment"/>
+        </id>
+        <property name="value" column="VAL" not-null="true" type="string"/>
+    </class>
+
+    <class name="IntegerPropertyValue" table="T_NUM_PROP">
+        <id name="id" column="ID" type="long">
+            <generator class="increment"/>
+        </id>
+        <property name="value" column="VAL" not-null="true" type="integer"/>
+    </class>
+
+    <class name="ComplexPropertyValue" table="T_COMPLEX_PROP">
+        <id name="id" column="ID" type="long">
+            <generator class="increment"/>
+        </id>
+        <map name="subProperties" table="T_COMPLEX_SUB_PROPS" lazy="true">
+            <key column="PROP_ID" />
+            <map-key type="string" column="SUB_PROP_NAME" />
+            <element type="string" column="SUB_PROP_VAL" />
+        </map>
+    </class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml
new file mode 100644
index 000000000000..837305efd0f3
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/OneToOneTest/PersonAddressOneToOnePrimaryKey.hbm.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping 
+	package="org.hibernate.tool.hbm2x.hbm2hbmxml.OneToOneTest">
+<class name="Person">
+    <id name="id" column="personId">
+        <generator class="native"/>
+    </id>
+    <one-to-one name="address"/>
+</class>
+
+<class name="Address">
+    <id name="id" column="personId">
+        <generator class="foreign">
+            <param name="property">person</param>
+        </generator>
+    </id>
+    <one-to-one name="person" 
+        constrained="true" access="field"/>
+</class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml
new file mode 100644
index 000000000000..f40729449dcc
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/SetElementTest/Search.hbm.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC 
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!--
+  
+-->
+
+<hibernate-mapping package="org.hibernate.tool.hbm2x.hbm2hbmxml.SetElementTest">
+	
+	<class name="Search">
+		<id name="searchString"/>
+		<set name="searchResults" sort="natural" access="field">
+			<key column="searchString"/>
+			<element column="text" type="string"/>
+		</set>
+	</class>
+	
+</hibernate-mapping>
+
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml
new file mode 100644
index 000000000000..fab37862b641
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/hbm2hbmxml/TypeParamsTest/Order.hbm.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+                                   "https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<!-- Generated 17.04.2009 10:41:19 by Hibernate Tools 3.2.4.GA -->
+<hibernate-mapping>
+ <class name="org.hibernate.tool.hbm2x.hbm2hbmxml.TypeParamsTest.Order" table="ORDERS">
+  <id name="orderId" type="long">
+   <column name="ORDERID"/>
+   <generator class="native"/>
+  </id>
+  <property generated="never" lazy="false" name="status">
+   <column name="STATUS"/>
+   <type name="org.hibernate.type.EnumType">
+    <param name="catalog"/>
+    <param name="column">STATUS</param>
+    <param name="table">ORDERS</param>
+    <param name="schema"/>
+    <param name="enumClass">org.hibernate.tool.hbm2x.hbm2hbmxml.TypeParamsTest.TestCase$Status</param>
+   </type>
+  </property>
+  <property name="name" type="string"/>
+ </class>
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/UserGroup.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/UserGroup.hbm.xml
new file mode 100644
index 000000000000..ce97a0626729
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbm2x/query/QueryExporterTest/UserGroup.hbm.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping demonstrates how to map a many-to-many
+  association with a shared attribute in the primary keys
+  of the associated entities.
+     
+-->
+
+<hibernate-mapping 
+	package="org.hibernate.tool.reveng.hbm2x.query.QueryExporterTest">
+	
+	<class name="User" table="`User`">
+		<composite-id name="userId">
+			<key-property name="name"/>
+			<key-property name="org"/>
+		</composite-id>
+		<set name="groups" table="UserGroup">
+			<key>
+				<column name="userName"/>
+				<column name="org"/>
+			</key>
+			<many-to-many class="Group">
+				<column name="groupName"/>
+				<formula>org</formula>
+			</many-to-many>
+		</set>
+	</class>
+	
+	<class name="Group" table="`Group`">
+		<composite-id name="userId">
+			<key-property name="name"/>
+			<key-property name="org"/>
+		</composite-id>
+		<property name="description"/>
+		<set name="users" table="UserGroup" inverse="true">
+			<key>
+				<column name="groupName"/>
+				<column name="org"/>
+			</key>
+			<many-to-many class="User">
+				<column name="userName"/>
+				<formula>org</formula>
+			</many-to-many>
+		</set>
+	</class>
+	
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/HbmLintTest/BrokenLazy.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/HbmLintTest/BrokenLazy.hbm.xml
new file mode 100644
index 000000000000..4c1ec0c2f60d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/HbmLintTest/BrokenLazy.hbm.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.reveng.hbmlint.HbmLintTest">
+
+    <!--  category has caching for collection but its target is not cached -->
+    <class name="BrokenLazy" lazy="true">
+    
+    	<id name="id" type="long">
+    		<generator class="native"/>
+    	</id>
+		
+	</class>
+	
+	<class name="BrokenNonLazy" lazy="false">
+	<id name="id" type="long">
+		<generator class="native" />
+	</id>
+
+	</class>
+	
+	<class name="FakeNonLazy" lazy="false">
+	<id name="id" type="long">
+		<generator class="native" />
+	</id>
+
+	</class>
+	
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/HbmLintTest/CachingSettings.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/HbmLintTest/CachingSettings.hbm.xml
new file mode 100644
index 000000000000..988336841060
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/HbmLintTest/CachingSettings.hbm.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.reveng.hbmlint.HbmLintTest">
+
+    <!--  category has caching for collection but its target is not cached -->
+    <class name="Category">
+    
+    	<id name="id" type="long">
+    		<generator class="native"/>
+    	</id>
+		
+		<set name="childCategories">
+			<cache usage="read-only"/>
+			<key column="PARENT_ID"/>
+			<one-to-many class="Category"/>
+		</set>
+    	
+	</class>
+
+     <class name="NoTable">
+        <id name="id" type="long">
+    		<generator class="native"/>
+    	</id>
+		
+     </class>
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/HbmLintTest/IdentifierIssues.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/HbmLintTest/IdentifierIssues.hbm.xml
new file mode 100644
index 000000000000..e490c46bba3a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/HbmLintTest/IdentifierIssues.hbm.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.reveng.hbmlint.HbmLintTest">
+
+    <!--  category has caching for collection but its target is not cached -->
+    <class name="IdentifierProblem">
+    
+    	<id name="name" type="long">
+    		<generator class="native"/>
+    	</id>
+		
+		<property name="id" type="string"/>
+    	
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
new file mode 100644
index 000000000000..3660586684c7
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/SchemaIssues.hbm.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.hibernate.tool.reveng.hbmlint">
+
+    <class name="Category" table="CATEGORY">    
+    	<id name="id" type="int">
+    		<generator class="enhanced-sequence">
+    			<param name="sequence_name">should_be_there</param>
+    		</generator>
+    	</id>	
+		<property name="name" type="string"/>		
+	</class>
+
+    <class name="BadType" table="BAD_TYPE">   
+    	<id name="id" type="int">
+    		<generator class="enhanced-table">
+    			<param name="table_name">does_not_exist</param>
+    		</generator>
+    	</id>		
+		<property name="name" type="text"/>		
+	</class>
+
+	<class name="MissingTable" table="MISSING_TABLE">
+		<id name="id" type="long">
+    		<generator class="enhanced-table">
+    			<param name="table_name">HILO_TABLE</param>
+    		</generator>
+    	</id>		
+	</class>	
+	
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/create.sql
new file mode 100644
index 000000000000..f82b1e39ad0e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/create.sql
@@ -0,0 +1,21 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE CATEGORY (ID INT, PARENT_ID NUMERIC(5))
+CREATE TABLE BAD_TYPE (ID INT, NAME VARCHAR(100))
+CREATE SEQUENCE SHOULD_BE_THERE START WITH 1
+CREATE TABLE HILO_TABLE (ID INT)
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/drop.sql
new file mode 100644
index 000000000000..9ffecb0652dd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/hbmlint/SchemaAnalyzer/drop.sql
@@ -0,0 +1,21 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE CATEGORY
+DROP TABLE BAD_TYPE
+DROP SEQUENCE SHOULD_BE_THERE
+DROP TABLE HILO_TABLE
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/ide/completion/HelloWorld.hbm.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/ide/completion/HelloWorld.hbm.xml
new file mode 100644
index 000000000000..a7695d67bc37
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/ide/completion/HelloWorld.hbm.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<!-- 
+
+  This mapping is a test mapping for hbm2java
+     
+-->
+
+<hibernate-mapping>
+
+    <class name="HelloWorld">
+	    <meta attribute="generated-class" inherit="false">generated.BaseHelloWorld</meta>
+	    <meta attribute="extends">Comparable</meta>
+	    <meta attribute="interface">true</meta>
+    	<meta attribute="class-description">Hey there</meta>
+    	<id name="id"
+    		length="10" type="string">
+    		<meta attribute="field-description">Test Field Description</meta>
+				<meta attribute="use-in-tostring">true</meta>
+    		<generator class="assigned"/>
+    	</id>
+		 
+		  <property name="hello" type="string" length="5">
+			  <meta attribute="use-in-tostring">true</meta>
+			</property>
+			
+			<property name="world" type="long">
+			  <meta attribute="use-in-tostring">false</meta>
+			  <meta attribute="use-in-equals">true</meta>
+			   <meta attribute="property-type">long</meta>
+			</property>
+						
+			
+		<subclass name="HelloUniverse">
+			<property name="dimension" type="string"/>
+			<component name="address" class="UniversalAddress">
+				<property name="galaxy" type="string"/>
+				<property name="planet" type="string"/>
+			</component>
+			
+			<property name="notgenerated" type="string">
+			  <meta attribute="gen-property">false</meta>
+			</property>
+			
+		</subclass>
+	</class>
+
+</hibernate-mapping>
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx1093/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx1093/create.sql
new file mode 100644
index 000000000000..b529ae94d867
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx1093/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE ET_MANY_TO_MANY_COMP1 (ET_MANY_TO_MANY_COMP1_ID NUMBER, ET_MANY_TO_MANY_COMP11_ID NUMBER, FIELD VARCHAR2(10), PRIMARY KEY (ET_MANY_TO_MANY_COMP1_ID, ET_MANY_TO_MANY_COMP11_ID))
+CREATE TABLE ET_MANY_TO_MANY_COMP2 ( ET_MANY_TO_MANY_COMP2_ID NUMBER, ET_MANY_TO_MANY_COMP22_ID NUMBER, FIELD VARCHAR2(10), PRIMARY KEY (ET_MANY_TO_MANY_COMP2_ID, ET_MANY_TO_MANY_COMP22_ID))
+CREATE TABLE ET_MANY_TO_MANY_COMP_MAPPING ( FK_ET_MANY_TO_MANY_COMP1_ID NUMBER, FK_ET_MANY_TO_MANY_COMP11_ID NUMBER, FK_ET_MANY_TO_MANY_COMP2_ID NUMBER, FK_ET_MANY_TO_MANY_COMP22_ID NUMBER, FOREIGN KEY (FK_ET_MANY_TO_MANY_COMP1_ID,FK_ET_MANY_TO_MANY_COMP11_ID) REFERENCES ET_MANY_TO_MANY_COMP1(ET_MANY_TO_MANY_COMP1_ID,ET_MANY_TO_MANY_COMP11_ID), FOREIGN KEY (FK_ET_MANY_TO_MANY_COMP2_ID, FK_ET_MANY_TO_MANY_COMP22_ID) REFERENCES ET_MANY_TO_MANY_COMP2(ET_MANY_TO_MANY_COMP2_ID, ET_MANY_TO_MANY_COMP22_ID), PRIMARY KEY (FK_ET_MANY_TO_MANY_COMP1_ID,FK_ET_MANY_TO_MANY_COMP11_ID,FK_ET_MANY_TO_MANY_COMP2_ID,FK_ET_MANY_TO_MANY_COMP22_ID) )
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx1093/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx1093/drop.sql
new file mode 100644
index 000000000000..be4c816be030
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx1093/drop.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE ET_MANY_TO_MANY_COMP_MAPPING
+DROP TABLE ET_MANY_TO_MANY_COMP2
+DROP TABLE ET_MANY_TO_MANY_COMP1
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx2840/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx2840/create.sql
new file mode 100644
index 000000000000..fdd6faec371f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx2840/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE PARENT(ID1_1 INT NOT NULL, ID1_2 INT NOT NULL, PRIMARY KEY (ID1_1, ID1_2));
+CREATE TABLE CHILD (ID2_1 INT NOT NULL, ID2_2 INT NOT NULL, PRIMARY KEY (ID2_1, ID2_2), FOREIGN KEY (ID2_1, ID2_2) REFERENCES PARENT (ID1_1, ID1_2));
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx2840/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx2840/drop.sql
new file mode 100644
index 000000000000..62e3071380f5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/issues/hbx2840/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE CHILD
+DROP TABLE PARENT
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/AutoQuote/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/AutoQuote/create.sql
new file mode 100644
index 000000000000..c3b0bc18a7bb
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/AutoQuote/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE "us-ers" ( USERID INTEGER NOT NULL, DEPARTMENT VARCHAR(3), PRIMARY KEY (USERID) )
+CREATE TABLE TYP ( INDEXID INTEGER NOT NULL, TEXT VARCHAR(10) NOT NULL, KORR INTEGER NOT NULL, PRIMARY KEY (INDEXID) )
+CREATE TABLE WORKLOGS ( INDEXID INTEGER NOT NULL, LOGGEDID INTEGER NOT NULL, USERID INTEGER NOT NULL, TYP INTEGER NOT NULL, PRIMARY KEY (INDEXID, USERID), FOREIGN KEY (USERID) REFERENCES "us-ers"(USERID), FOREIGN KEY (TYP) REFERENCES TYP(INDEXID) )
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/AutoQuote/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/AutoQuote/drop.sql
new file mode 100644
index 000000000000..e131fbeb680e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/AutoQuote/drop.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE WORKLOGS
+DROP TABLE "us-ers"
+DROP TABLE TYP
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Basic/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Basic/create.sql
new file mode 100644
index 000000000000..c59dbb583df4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Basic/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE BASIC ( A INT NOT NULL, NAME VARCHAR(20), PRIMARY KEY (A)  )
+CREATE TABLE SOMECOLUMNSNOPK ( PK VARCHAR(25) NOT NULL, B CHAR, C INT NOT NULL )
+CREATE TABLE MULTIKEYED ( ORDERID VARCHAR(10), CUSTOMERID VARCHAR(10), NAME VARCHAR(10), PRIMARY KEY(ORDERID, CUSTOMERID) )
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Basic/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Basic/drop.sql
new file mode 100644
index 000000000000..7b49d38f5b14
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Basic/drop.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE BASIC
+DROP TABLE SOMECOLUMNSNOPK
+DROP TABLE MULTIKEYED
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/BasicMultiSchema/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/BasicMultiSchema/create.sql
new file mode 100644
index 000000000000..70437b2ff453
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/BasicMultiSchema/create.sql
@@ -0,0 +1,22 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE BASIC ( A INT NOT NULL, NAME VARCHAR(20), PRIMARY KEY (A)  )
+CREATE TABLE SOMECOLUMNSNOPK ( PK VARCHAR(25) NOT NULL, B CHAR, C INT NOT NULL )
+CREATE TABLE MULTIKEYED ( ORDERID VARCHAR(10), CUSTOMERID VARCHAR(10), NAME VARCHAR(10), PRIMARY KEY(ORDERID, CUSTOMERID) )
+CREATE SCHEMA OTHERSCHEMA
+CREATE TABLE OTHERSCHEMA.BASIC ( A INT NOT NULL, NAME VARCHAR(20), PRIMARY KEY (A)  )
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/BasicMultiSchema/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/BasicMultiSchema/drop.sql
new file mode 100644
index 000000000000..751bb5901fc4
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/BasicMultiSchema/drop.sql
@@ -0,0 +1,22 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE BASIC
+DROP TABLE SOMECOLUMNSNOPK
+DROP TABLE MULTIKEYED
+DROP TABLE OTHERSCHEMA.BASIC
+DROP SCHEMA OTHERSCHEMA
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/create.sql
new file mode 100644
index 000000000000..1a429a2615f6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/create.sql
@@ -0,0 +1,29 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE SIMPLE_LINE_ITEM (LINE_ITEM_ID VARCHAR(256) NOT NULL, CUSTOMER_ORDER_ID_REF VARCHAR(256), PRODUCT_ID VARCHAR(256) NOT NULL, EXTRA_ID VARCHAR(256) NOT NULL, QUANTITY FLOAT, PRIMARY KEY (LINE_ITEM_ID))
+CREATE TABLE PRODUCT (PRODUCT_ID VARCHAR(256) NOT NULL, EXTRA_ID VARCHAR(256) NOT NULL, DESCRIPTION VARCHAR(256) NOT NULL, PRICE FLOAT, NUMBER_AVAILABLE FLOAT, PRIMARY KEY (PRODUCT_ID, EXTRA_ID))
+CREATE TABLE CUSTOMER (CUSTOMER_ID VARCHAR(256) NOT NULL, NAME VARCHAR(256) NOT NULL, ADDRESS VARCHAR(256) NOT NULL, PRIMARY KEY (CUSTOMER_ID))
+CREATE TABLE SIMPLE_CUSTOMER_ORDER (CUSTOMER_ORDER_ID VARCHAR(256) NOT NULL, CUSTOMER_ID VARCHAR(256) NOT NULL, ORDER_NUMBER FLOAT NOT NULL, ORDER_DATE DATE NOT NULL, PRIMARY KEY (CUSTOMER_ORDER_ID))
+ALTER TABLE SIMPLE_LINE_ITEM ADD CONSTRAINT TO_SIMPLE_CUSTOMER_ORDER FOREIGN KEY (CUSTOMER_ORDER_ID_REF) REFERENCES SIMPLE_CUSTOMER_ORDER(CUSTOMER_ORDER_ID)
+ALTER TABLE SIMPLE_LINE_ITEM ADD CONSTRAINT FROM_SIMPLE_TO_PRODUCT FOREIGN KEY (PRODUCT_ID, EXTRA_ID) REFERENCES PRODUCT(PRODUCT_ID, EXTRA_ID)
+ALTER TABLE SIMPLE_CUSTOMER_ORDER ADD CONSTRAINT FROM_SIMPLE_TO_CUSTOMER FOREIGN KEY (CUSTOMER_ID) REFERENCES CUSTOMER(CUSTOMER_ID)
+CREATE TABLE LINE_ITEM (CUSTOMER_ID_REF VARCHAR(256) NOT NULL, ORDER_NUMBER FLOAT NOT NULL, PRODUCT_ID VARCHAR(256) NOT NULL, EXTRA_PROD_ID VARCHAR(256) NOT NULL, QUANTITY FLOAT, PRIMARY KEY (CUSTOMER_ID_REF, ORDER_NUMBER, PRODUCT_ID, EXTRA_PROD_ID))
+CREATE TABLE CUSTOMER_ORDER (CUSTOMER_ID VARCHAR(256) NOT NULL, ORDER_NUMBER FLOAT NOT NULL, ORDER_DATE DATE, PRIMARY KEY (CUSTOMER_ID, ORDER_NUMBER))                
+ALTER TABLE LINE_ITEM ADD CONSTRAINT TO_CUSTOMER_ORDER FOREIGN KEY (CUSTOMER_ID_REF, ORDER_NUMBER) REFERENCES CUSTOMER_ORDER(CUSTOMER_ID, ORDER_NUMBER)
+ALTER TABLE LINE_ITEM ADD CONSTRAINT TO_PRODUCT FOREIGN KEY (PRODUCT_ID, EXTRA_PROD_ID) REFERENCES PRODUCT(PRODUCT_ID, EXTRA_ID)
+ALTER TABLE CUSTOMER_ORDER ADD CONSTRAINT TO_CUSTOMER FOREIGN KEY (CUSTOMER_ID) REFERENCES CUSTOMER(CUSTOMER_ID)
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/data.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/data.sql
new file mode 100644
index 000000000000..d27db37f4a90
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/data.sql
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+INSERT INTO PRODUCT (PRODUCT_ID, EXTRA_ID, DESCRIPTION, PRICE, NUMBER_AVAILABLE) VALUES ('PC', '0', 'My PC', 100.0, 23)
+INSERT INTO PRODUCT (PRODUCT_ID, EXTRA_ID, DESCRIPTION, PRICE, NUMBER_AVAILABLE) VALUES ('MS', '1', 'My Mouse', 101.0, 23)
+INSERT INTO CUSTOMER (CUSTOMER_ID, NAME, ADDRESS) VALUES ('MAX', 'Max Rydahl Andersen', 'Neuchatel')
+INSERT INTO CUSTOMER_ORDER (CUSTOMER_ID, ORDER_NUMBER, ORDER_DATE) values ('MAX', 1, null)
+INSERT INTO LINE_ITEM (CUSTOMER_ID_REF, ORDER_NUMBER, PRODUCT_ID, EXTRA_PROD_ID, QUANTITY) VALUES ('MAX', 1, 'PC', '0', 10)
+INSERT INTO LINE_ITEM (CUSTOMER_ID_REF, ORDER_NUMBER, PRODUCT_ID, EXTRA_PROD_ID, QUANTITY) VALUES ('MAX', 1, 'MS', '1', 12)
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/drop.sql
new file mode 100644
index 000000000000..d316cd8fe31f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/CompositeId/drop.sql
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE LINE_ITEM
+DROP TABLE SIMPLE_LINE_ITEM
+DROP TABLE CUSTOMER_ORDER          
+DROP TABLE SIMPLE_CUSTOMER_ORDER
+DROP TABLE PRODUCT
+DROP TABLE CUSTOMER
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ForeignKeys/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ForeignKeys/create.sql
new file mode 100644
index 000000000000..8db953246196
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ForeignKeys/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE MASTER (ID CHAR NOT NULL, NAME VARCHAR(20), PRIMARY KEY (ID))
+CREATE TABLE CHILD  (CHILDID CHARACTER NOT NULL, MASTERREF CHARACTER, PRIMARY KEY(CHILDID), FOREIGN KEY (MASTERREF) REFERENCES MASTER(ID))
+CREATE TABLE CONNECTION  (CONID INT, NAME VARCHAR(50), MASTERREF CHAR, CHILDREF1 CHARACTER, CHILDREF2 CHARACTER, PRIMARY KEY(CONID), CONSTRAINT CON2MASTER FOREIGN KEY (MASTERREF) REFERENCES MASTER(ID), CONSTRAINT CHILDREF1 FOREIGN KEY (CHILDREF1) REFERENCES CHILD(CHILDID), CONSTRAINT CHILDREF2 FOREIGN KEY (CHILDREF2) REFERENCES CHILD(CHILDID))
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ForeignKeys/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ForeignKeys/drop.sql
new file mode 100644
index 000000000000..c2b30b19434d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ForeignKeys/drop.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE CONNECTION
+DROP TABLE CHILD
+DROP TABLE MASTER				
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Identity/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Identity/create.sql
new file mode 100644
index 000000000000..3721d8f27596
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Identity/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE `autoinc` (`id` IDENTITY NOT NULL,  `data` varchar(100) default NULL,  PRIMARY KEY  (`id`))
+CREATE TABLE `noautoinc` (`id` int NOT NULL,  `data` varchar(100) default NULL,  PRIMARY KEY  (`id`))
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Identity/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Identity/drop.sql
new file mode 100644
index 000000000000..60d6e422d722
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Identity/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE `autoinc`
+DROP TABLE `noautoinc`               
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Index/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Index/create.sql
new file mode 100644
index 000000000000..8fb55c1a24ca
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Index/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE WITH_INDEX (ONE INT, TWO INT, THREE INT)
+CREATE INDEX MY_INDEX ON WITH_INDEX(ONE,THREE)
+CREATE UNIQUE INDEX OTHER_IDX on WITH_INDEX(THREE)
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Index/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Index/drop.sql
new file mode 100644
index 000000000000..252fecab011d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Index/drop.sql
@@ -0,0 +1,18 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE WITH_INDEX
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/create.sql
new file mode 100644
index 000000000000..4a284d95a0f2
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/create.sql
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE CUSTOMER (CUSTOMER_ID VARCHAR(256) NOT NULL, NAME VARCHAR(256) NOT NULL, ADDRESS VARCHAR(256) NOT NULL, PRIMARY KEY (CUSTOMER_ID))
+CREATE TABLE PRODUCT (PRODUCT_ID VARCHAR(256) NOT NULL, EXTRA_ID VARCHAR(256) NOT NULL, DESCRIPTION VARCHAR(256) NOT NULL, PRICE FLOAT, NUMBER_AVAILABLE FLOAT, PRIMARY KEY (PRODUCT_ID, EXTRA_ID))
+CREATE TABLE SIMPLE_CUSTOMER_ORDER (CUSTOMER_ORDER_ID VARCHAR(256) NOT NULL, CUSTOMER_ID VARCHAR(256) NOT NULL, ORDER_NUMBER FLOAT NOT NULL, ORDER_DATE DATE, PRIMARY KEY (CUSTOMER_ORDER_ID), FOREIGN KEY (CUSTOMER_ID) REFERENCES CUSTOMER(CUSTOMER_ID))
+CREATE TABLE SIMPLE_LINE_ITEM ( LINE_ITEM_ID VARCHAR(256) NOT NULL, CUSTOMER_ORDER_ID_REF VARCHAR(256), PRODUCT_ID VARCHAR(256) NOT NULL, EXTRA_ID VARCHAR(256) NOT NULL, QUANTITY FLOAT, PRIMARY KEY (LINE_ITEM_ID), FOREIGN KEY (PRODUCT_ID,EXTRA_ID) REFERENCES PRODUCT(PRODUCT_ID,EXTRA_ID),  FOREIGN KEY (CUSTOMER_ORDER_ID_REF) REFERENCES SIMPLE_CUSTOMER_ORDER(CUSTOMER_ORDER_ID))
+CREATE TABLE CUSTOMER_ORDER (CUSTOMER_ID VARCHAR(256) NOT NULL, ORDER_NUMBER FLOAT NOT NULL, ORDER_DATE DATE, PRIMARY KEY (CUSTOMER_ID, ORDER_NUMBER), FOREIGN KEY (CUSTOMER_ID) REFERENCES CUSTOMER(CUSTOMER_ID))
+CREATE TABLE LINE_ITEM (CUSTOMER_ID_REF VARCHAR(256) NOT NULL, ORDER_NUMBER FLOAT NOT NULL, PRODUCT_ID VARCHAR(256) NOT NULL, EXTRA_PROD_ID VARCHAR(256) NOT NULL, QUANTITY FLOAT, PRIMARY KEY (CUSTOMER_ID_REF, ORDER_NUMBER, PRODUCT_ID, EXTRA_PROD_ID), FOREIGN KEY (PRODUCT_ID,EXTRA_PROD_ID) REFERENCES PRODUCT(PRODUCT_ID,EXTRA_ID), CONSTRAINT TO_CUSTOMER_ORDER FOREIGN KEY (CUSTOMER_ID_REF, ORDER_NUMBER) REFERENCES CUSTOMER_ORDER(CUSTOMER_ID,ORDER_NUMBER))
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/data.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/data.sql
new file mode 100644
index 000000000000..cd6ac499ca72
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/data.sql
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+INSERT INTO PRODUCT (PRODUCT_ID, EXTRA_ID, DESCRIPTION, PRICE, NUMBER_AVAILABLE) VALUES('PC', '0', 'My PC', 100.0, 23)
+INSERT INTO PRODUCT (PRODUCT_ID, EXTRA_ID, DESCRIPTION, PRICE, NUMBER_AVAILABLE) VALUES('MS', '1', 'My Mouse', 101.0, 23)
+INSERT INTO CUSTOMER (CUSTOMER_ID, NAME, ADDRESS) VALUES('MAX', 'Max Rydahl Andersen', 'Neuchatel')
+INSERT INTO CUSTOMER_ORDER (CUSTOMER_ID, ORDER_NUMBER, ORDER_DATE) VALUES ('MAX', 1, null)
+INSERT INTO LINE_ITEM (CUSTOMER_ID_REF, ORDER_NUMBER, PRODUCT_ID, EXTRA_PROD_ID, QUANTITY) VALUES ('MAX', 1, 'PC', '0', 10)
+INSERT INTO LINE_ITEM (CUSTOMER_ID_REF, ORDER_NUMBER, PRODUCT_ID, EXTRA_PROD_ID, QUANTITY) VALUES ('MAX', 1, 'MS', '1', 12)
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/drop.sql
new file mode 100644
index 000000000000..db139ae79830
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/KeyPropertyCompositeId/drop.sql
@@ -0,0 +1,23 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE LINE_ITEM
+DROP TABLE CUSTOMER_ORDER          
+DROP TABLE SIMPLE_LINE_ITEM
+DROP TABLE SIMPLE_CUSTOMER_ORDER
+DROP TABLE PRODUCT
+DROP TABLE CUSTOMER
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ManyToMany/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ManyToMany/create.sql
new file mode 100644
index 000000000000..4b48e0328dd8
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ManyToMany/create.sql
@@ -0,0 +1,24 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE PROJECT (PROJECT_ID INTEGER NOT NULL, NAME VARCHAR(50), PRIMARY KEY (PROJECT_ID) )
+CREATE TABLE EMPLOYEE (ID INTEGER NOT NULL, NAME VARCHAR(50), MANAGER_ID INTEGER, PRIMARY KEY (ID), CONSTRAINT EMPLOYEE_MANAGER FOREIGN KEY (MANAGER_ID) REFERENCES EMPLOYEE(ID))
+CREATE TABLE WORKS_ON (PROJECT_ID INTEGER NOT NULL, EMPLOYEE_ID INTEGER NOT NULL, PRIMARY KEY (PROJECT_ID, EMPLOYEE_ID), CONSTRAINT WORKSON_EMPLOYEE FOREIGN KEY (EMPLOYEE_ID) REFERENCES EMPLOYEE(ID), FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) )
+CREATE TABLE WORKS_ON_CONTEXT (PROJECT_ID INTEGER NOT NULL, EMPLOYEE_ID INTEGER NOT NULL, CREATED_BY INTEGER, PRIMARY KEY (PROJECT_ID, EMPLOYEE_ID), CONSTRAINT WORKSON_CTX_EMPLOYEE FOREIGN KEY (EMPLOYEE_ID) REFERENCES EMPLOYEE(ID), FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID), FOREIGN KEY (CREATED_BY) REFERENCES EMPLOYEE(ID) )
+CREATE TABLE LEFT_TABLE ( id INTEGER NOT NULL, PRIMARY KEY (ID) )
+CREATE TABLE RIGHT_TABLE ( id INTEGER NOT NULL, PRIMARY KEY (ID) )
+CREATE TABLE NON_MIDDLE ( left_id INTEGER NOT NULL, RIGHT_ID INTEGER NOT NULL, PRIMARY KEY (LEFT_ID), CONSTRAINT FK_MIDDLE_LEFT FOREIGN KEY (LEFT_ID) REFERENCES LEFT_TABLE(ID), CONSTRAINT FK_MIDDLE_RIGHT FOREIGN KEY (RIGHT_ID) REFERENCES RIGHT_TABLE(ID))
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ManyToMany/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ManyToMany/drop.sql
new file mode 100644
index 000000000000..6e3303001d63
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/ManyToMany/drop.sql
@@ -0,0 +1,24 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE WORKS_ON_CONTEXT
+DROP TABLE WORKS_ON
+DROP TABLE EMPLOYEE
+DROP TABLE PROJECT
+DROP TABLE NON_MIDDLE
+DROP TABLE LEFT_TABLE
+DROP TABLE RIGHT_TABLE
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/MetaData/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/MetaData/create.sql
new file mode 100644
index 000000000000..b68a1dbe7f4d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/MetaData/create.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE BASIC ( A INT NOT NULL, NAME VARCHAR(20), PRIMARY KEY (A)  )
+CREATE TABLE SOMECOLUMNSNOPK ( PK VARCHAR(25) NOT NULL, B CHAR, C INT NOT NULL, A_BOOLEAN CHAR )
+CREATE TABLE MULTIKEYED ( ORDERID VARCHAR(10), CUSTOMERID VARCHAR(10), NAME VARCHAR(10), PRIMARY KEY(ORDERID, CUSTOMERID) ) 
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/MetaData/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/MetaData/drop.sql
new file mode 100644
index 000000000000..b3cbff0386a6
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/MetaData/drop.sql
@@ -0,0 +1,20 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE BASIC
+DROP TABLE SOMECOLUMNSNOPK
+DROP TABLE MULTIKEYED
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/NoPrimaryKey/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/NoPrimaryKey/create.sql
new file mode 100644
index 000000000000..c728bb8f7ffa
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/NoPrimaryKey/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE G0 ( AN_ID VARCHAR(20), CONSTRAINT C0 PRIMARY KEY (AN_ID) )
+CREATE TABLE G1 ( AN_ID VARCHAR(20), CONSTRAINT C1 FOREIGN KEY (AN_ID) REFERENCES G0(AN_ID))
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/NoPrimaryKey/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/NoPrimaryKey/drop.sql
new file mode 100644
index 000000000000..7da9b4914b39
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/NoPrimaryKey/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE G1
+DROP TABLE G0				
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OneToOne/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OneToOne/create.sql
new file mode 100644
index 000000000000..16edff4b6e3b
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OneToOne/create.sql
@@ -0,0 +1,24 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE LEFT_TABLE ( ID INT NOT NULL, PRIMARY KEY (ID) )
+CREATE TABLE RIGHT_TABLE ( ID INT NOT NULL, PRIMARY KEY (ID) )
+CREATE TABLE MIDDLE_TABLE ( LEFT_ID INT NOT NULL, RIGHT_ID INT NOT NULL, PRIMARY KEY (LEFT_ID), CONSTRAINT FK_MIDDLE_LEFT FOREIGN KEY (LEFT_ID) REFERENCES LEFT_TABLE(ID), CONSTRAINT FK_MIDDLE_RIGHT FOREIGN KEY (RIGHT_ID) REFERENCES RIGHT_TABLE(ID))
+CREATE TABLE PERSON ( PERSON_ID INT NOT NULL, NAME VARCHAR(50), PRIMARY KEY (PERSON_ID) )
+CREATE TABLE ADDRESS_PERSON ( ADDRESS_ID INT NOT NULL, NAME VARCHAR(50), PRIMARY KEY (ADDRESS_ID), CONSTRAINT FK_ADDRESS_PERSON FOREIGN KEY (ADDRESS_ID) REFERENCES PERSON(PERSON_ID))			
+CREATE TABLE MULTI_PERSON ( PERSON_ID INT NOT NULL, PERSON_COMPID INT NOT NULL, NAME VARCHAR(50), PRIMARY KEY (PERSON_ID, PERSON_COMPID) )
+CREATE TABLE ADDRESS_MULTI_PERSON ( ADDRESS_ID INT NOT NULL, ADDRESS_COMPID INT NOT NULL, NAME VARCHAR(50), PRIMARY KEY (ADDRESS_ID, ADDRESS_COMPID), CONSTRAINT ADDRESS_MULTI_PERSON FOREIGN KEY (ADDRESS_ID, ADDRESS_COMPID) REFERENCES MULTI_PERSON(PERSON_ID, PERSON_COMPID))	
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OneToOne/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OneToOne/drop.sql
new file mode 100644
index 000000000000..0acdf59f626a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OneToOne/drop.sql
@@ -0,0 +1,24 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE MIDDLE_TABLE
+DROP TABLE LEFT_TABLE
+DROP TABLE RIGHT_TABLE
+DROP TABLE ADDRESS_PERSON
+DROP TABLE PERSON
+DROP TABLE ADDRESS_MULTI_PERSON
+DROP TABLE MULTI_PERSON
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/create.sql
new file mode 100644
index 000000000000..5a3ed80a128d
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/create.sql
@@ -0,0 +1,26 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE DUMMY (ID NUMERIC(10,0) NOT NULL, PRIMARY KEY (ID) )
+CREATE TABLE DEFUNCT_TABLE ( ID NUMERIC(10,0) NOT NULL, NAME VARCHAR(20), SHORTNAME VARCHAR(5), FLAG VARCHAR(1), DUMID NUMERIC(10,0), PRIMARY KEY (ID), FOREIGN KEY (DUMID) REFERENCES DUMMY(ID))                
+CREATE TABLE MISC_TYPES ( ID NUMERIC(10,0) NOT NULL, NAME VARCHAR(20), SHORTNAME VARCHAR(5), FLAG VARCHAR(1), PRIMARY KEY (ID) )
+CREATE TABLE INTHEMIDDLE ( MISCID NUMERIC(10,0), DEFUNCTID NUMERIC(10,0), FOREIGN KEY (MISCID) REFERENCES MISC_TYPES(ID), FOREIGN KEY (DEFUNCTID) REFERENCES DEFUNCT_TABLE(ID) )
+CREATE TABLE CUSTOMER ( CUSTID VARCHAR(10), NAME VARCHAR(20) )
+CREATE TABLE ORDERS ( ORDERID VARCHAR(10), NAME VARCHAR(20),  CUSTID VARCHAR(10), COMPLETED NUMERIC(1,0) NOT NULL, VERIFIED NUMERIC(1) )
+CREATE TABLE PARENT ( ID VARCHAR(10), NAME VARCHAR(20))
+CREATE TABLE CHILDREN ( ID VARCHAR(10), PARENTID VARCHAR(10), NAME VARCHAR(20) )
+CREATE TABLE EXCOLUMNS (ID VARCHAR(12), NAME VARCHAR(20), EXCOLUMN NUMERIC(10,0) )
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/docexample.reveng.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/docexample.reveng.xml
new file mode 100644
index 000000000000..387d8ae41a08
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/docexample.reveng.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<hibernate-reverse-engineering>
+<type-mapping>
+ <sql-type jdbc-type="NUMERIC" precision="15" hibernate-type="big_decimal"/>
+ <sql-type jdbc-type="NUMERIC" not-null="true" hibernate-type="long" />
+ <sql-type jdbc-type="NUMERIC" not-null="false" hibernate-type="java.lang.Long" />
+ <sql-type jdbc-type="VARCHAR" length="1" not-null="true" hibernate-type="java.lang.Character"/>
+ <sql-type jdbc-type="VARCHAR" hibernate-type="your.package.TrimStringUserType"/>
+ <sql-type jdbc-type="VARCHAR" length="1" hibernate-type="char"/>
+</type-mapping>
+</hibernate-reverse-engineering>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/drop.sql
new file mode 100644
index 000000000000..3b14dea6b28e
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/drop.sql
@@ -0,0 +1,26 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE EXCOLUMNS
+DROP TABLE PARENT
+DROP TABLE CHILDREN
+DROP TABLE CUSTOMER
+DROP TABLE ORDERS
+DROP TABLE INTHEMIDDLE
+DROP TABLE MISC_TYPES
+DROP TABLE DEFUNCT_TABLE
+DROP TABLE DUMMY
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/overridetest.reveng.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/overridetest.reveng.xml
new file mode 100644
index 000000000000..0713df954df1
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/overridetest.reveng.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-reverse-engineering SYSTEM "https://hibernate.org/dtd/hibernate-reverse-engineering-3.0.dtd" >
+
+<hibernate-reverse-engineering>
+
+	<type-mapping>
+		<sql-type jdbc-type="VARCHAR" length='1'>
+			<hibernate-type name="yes_no"/>
+		</sql-type>
+		<sql-type jdbc-type="NUMERIC" precision='10' scale='2'
+			hibernate-type="string" />
+	</type-mapping>
+
+	<table-filter match-schema="Werd" match-name=".*" package="org.werd">
+	  <meta attribute="werd-meta">value one</meta>
+	  <meta attribute="werd-meta">value two</meta>
+	</table-filter>
+	
+	<table-filter match-name="DEFUNCT_TABLE" exclude="true" />
+	<table-filter match-name="DoNotWantIt" exclude="true" />
+	<table-filter match-name="WantedTable" />
+	<table-filter match-catalog="BAD" match-schema="SCHEMA"
+		match-name=".*" exclude="true" />
+
+	<table-filter match-catalog=".*" match-schema=".*"
+		match-name="BIN$.*" exclude="true" />
+		
+	<table-filter match-name=".*" exclude="false"/>
+	<!-- 
+		<table name="CUSTOMER" package="org.funk" class-name="MyCustomer">
+		<column name="order" property-name="orderName" />
+		</table> 
+		
+		<table name="CUSTOMER">
+		<column name="ORDER" />
+		</table>
+		
+		<table catalog="CUSTOMER" schema="WHATEVER" name="ORDER">
+		<column name="name" exclude="true">
+		<meta attribute="property-name">Name</meta>
+		</column>
+		</table>
+	-->
+
+	<!-- 
+		alter table Customer add constraint 'max' foreign key (addressid, x) references address (dfdf)
+	-->
+	<table name="ORDERS">
+	    <meta attribute="order-meta">order table value</meta>
+		<primary-key property="customOrderId" id-class="CustomOID">
+<!-- 			<column name="CUSTID" foreign-table="CUSTOMER" foreign-column="CUSTID" />			-->
+            <key-column name="ORDERID"/>
+ 			<key-column name="CUSTID"/>			
+		</primary-key>
+		<column name="NAME" property="orderName" type="string">
+		    <meta attribute="order-meta">order column value</meta>
+		</column>
+		
+		<foreign-key foreign-table="CUSTOMER">
+			<column-ref local-column="CUSTID" foreign-column="CUSTID"/>
+		</foreign-key>
+	</table>
+
+   <table name="MISC_TYPES">
+   	<primary-key>
+		<generator class="sequence">
+			<param name="table">seq_table</param>
+		</generator>
+	</primary-key>
+   </table>
+   
+    <table name="CHILDREN">
+		<foreign-key constraint-name="child_to_parent" foreign-table="PARENT">
+			<column-ref local-column="parentid" foreign-column="id" />
+			<column-ref local-column="extraparentid" foreign-column="extraid" />
+			<many-to-one property="propertyParent"/>
+			<set property="propertyChildren"/>
+		</foreign-key>
+
+	</table> 
+
+    <table name="EXCOLUMNS">
+    	<column name="EXCOLUMN" exclude="true"/>
+    </table>
+    
+    <table name="TblTest" class="org.test.Test">
+      <meta attribute="use-in-test">true</meta>
+    </table>
+ 
+ 	<table schema="Werd" name="MetaTable">
+ 	  <meta attribute="specific-werd">a one</meta>
+	  <meta attribute="werd-meta">value three</meta>
+	  <column name="MetaColumn">
+	    <meta attribute="specific-column">yes a column with meta</meta>
+	  </column>
+ 	</table>
+ 	
+    <table schema="Werd" name="TBL_PKG" class="MyWorld"/>
+    <table schema="Werd" name="TBL_OTHER" class="other.MyWorld"/>
+
+</hibernate-reverse-engineering>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/schemaselection.reveng.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/schemaselection.reveng.xml
new file mode 100644
index 000000000000..a1fb64ddc979
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/schemaselection.reveng.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-reverse-engineering SYSTEM "https://hibernate.org/dtd/hibernate-reverse-engineering-3.0.dtd" >
+
+<hibernate-reverse-engineering>
+
+ <!-- a empty one is valid and means select everything without considering schema/catalog/table -->
+ <schema-selection/>
+ 
+ <!-- Only for something matching in schema OVRTEST -->
+ <schema-selection match-schema="OVRTEST"/>
+
+ <!-- Only for something matching in catalog UBERCATALOG and schema OVRTEST -->
+ <schema-selection match-catalog="UBERCATALOG" match-schema="OVRTEST"/>
+
+ <!-- .* is valid, will be translated into % -->
+ <schema-selection match-catalog="PUBLIC.*" match-schema="OVRTEST" match-table=".*"/> 
+
+</hibernate-reverse-engineering>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/test.reveng.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/test.reveng.xml
new file mode 100644
index 000000000000..37ed5c14942c
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/OverrideBinder/test.reveng.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-reverse-engineering SYSTEM "https://hibernate.org/dtd/hibernate-reverse-engineering-3.0.dtd" >
+
+<hibernate-reverse-engineering>
+
+	<type-mapping>
+		<sql-type jdbc-type="BINARY" length="1" hibernate-type="boolean" />
+		<sql-type jdbc-type="INTEGER" length="5" hibernate-type="int" />		
+		<sql-type jdbc-type="INTEGER" hibernate-type="long" />				
+		<sql-type jdbc-type="BIGINT" precision="5" hibernate-type="byte[]" />				
+		<sql-type jdbc-type="BIGINT" hibernate-type="java.math.BigInteger" />		
+		<sql-type jdbc-type="CHAR"   hibernate-type="string" />
+   
+        <!-- start HBX-534 -->
+		<sql-type jdbc-type="NUMERIC" precision='10' scale="0" hibernate-type="Long" />
+		<sql-type jdbc-type="NUMERIC" precision='10' hibernate-type="java.lang.Long" />
+        <!-- end HBX-534 -->
+        
+        <!--  nullability -->
+        <sql-type jdbc-type="FLOAT" scale="17" not-null="true" hibernate-type="nonnull-float" />
+        <sql-type jdbc-type="FLOAT" scale="17" not-null="false" hibernate-type="null-float" />
+        <sql-type jdbc-type="FLOAT" not-null="true" hibernate-type="onlynotnull" /> 
+        <sql-type jdbc-type="FLOAT" hibernate-type="donotcare" /> 
+		
+        
+	</type-mapping>
+
+</hibernate-reverse-engineering>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Performance/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Performance/create.sql
new file mode 100644
index 000000000000..91c936752bba
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Performance/create.sql
@@ -0,0 +1,416 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+create table PERFTEST0 (ID varchar(255) not null, COL0_0 varchar(255), COL0_1 varchar(255), COL0_2 varchar(255), COL0_3 varchar(255), COL0_4 varchar(255), COL0_5 varchar(255), COL0_6 varchar(255), COL0_7 varchar(255), COL0_8 varchar(255), COL0_9 varchar(255), primary key (ID))
+create table PERFTEST1 (ID varchar(255) not null, COL1_0 varchar(255), COL1_1 varchar(255), COL1_2 varchar(255), COL1_3 varchar(255), COL1_4 varchar(255), COL1_5 varchar(255), COL1_6 varchar(255), COL1_7 varchar(255), COL1_8 varchar(255), COL1_9 varchar(255), primary key (ID))
+alter table PERFTEST1 add constraint COL1_9PERFTEST0PERFTEST1 foreign key (COL1_9) references PERFTEST0(ID)
+create table PERFTEST2 (ID varchar(255) not null, COL2_0 varchar(255), COL2_1 varchar(255), COL2_2 varchar(255), COL2_3 varchar(255), COL2_4 varchar(255), COL2_5 varchar(255), COL2_6 varchar(255), COL2_7 varchar(255), COL2_8 varchar(255), COL2_9 varchar(255), primary key (ID))
+alter table PERFTEST2 add constraint COL2_9PERFTEST1PERFTEST2 foreign key (COL2_9) references PERFTEST1(ID)
+create table PERFTEST3 (ID varchar(255) not null, COL3_0 varchar(255), COL3_1 varchar(255), COL3_2 varchar(255), COL3_3 varchar(255), COL3_4 varchar(255), COL3_5 varchar(255), COL3_6 varchar(255), COL3_7 varchar(255), COL3_8 varchar(255), COL3_9 varchar(255), primary key (ID))
+alter table PERFTEST3 add constraint COL3_9PERFTEST2PERFTEST3 foreign key (COL3_9) references PERFTEST2(ID)
+create table PERFTEST4 (ID varchar(255) not null, COL4_0 varchar(255), COL4_1 varchar(255), COL4_2 varchar(255), COL4_3 varchar(255), COL4_4 varchar(255), COL4_5 varchar(255), COL4_6 varchar(255), COL4_7 varchar(255), COL4_8 varchar(255), COL4_9 varchar(255), primary key (ID))
+alter table PERFTEST4 add constraint COL4_9PERFTEST3PERFTEST4 foreign key (COL4_9) references PERFTEST3(ID)
+create table PERFTEST5 (ID varchar(255) not null, COL5_0 varchar(255), COL5_1 varchar(255), COL5_2 varchar(255), COL5_3 varchar(255), COL5_4 varchar(255), COL5_5 varchar(255), COL5_6 varchar(255), COL5_7 varchar(255), COL5_8 varchar(255), COL5_9 varchar(255), primary key (ID))
+alter table PERFTEST5 add constraint COL5_9PERFTEST4PERFTEST5 foreign key (COL5_9) references PERFTEST4(ID)
+create table PERFTEST6 (ID varchar(255) not null, COL6_0 varchar(255), COL6_1 varchar(255), COL6_2 varchar(255), COL6_3 varchar(255), COL6_4 varchar(255), COL6_5 varchar(255), COL6_6 varchar(255), COL6_7 varchar(255), COL6_8 varchar(255), COL6_9 varchar(255), primary key (ID))
+alter table PERFTEST6 add constraint COL6_9PERFTEST5PERFTEST6 foreign key (COL6_9) references PERFTEST5(ID)
+create table PERFTEST7 (ID varchar(255) not null, COL7_0 varchar(255), COL7_1 varchar(255), COL7_2 varchar(255), COL7_3 varchar(255), COL7_4 varchar(255), COL7_5 varchar(255), COL7_6 varchar(255), COL7_7 varchar(255), COL7_8 varchar(255), COL7_9 varchar(255), primary key (ID))
+alter table PERFTEST7 add constraint COL7_9PERFTEST6PERFTEST7 foreign key (COL7_9) references PERFTEST6(ID)
+create table PERFTEST8 (ID varchar(255) not null, COL8_0 varchar(255), COL8_1 varchar(255), COL8_2 varchar(255), COL8_3 varchar(255), COL8_4 varchar(255), COL8_5 varchar(255), COL8_6 varchar(255), COL8_7 varchar(255), COL8_8 varchar(255), COL8_9 varchar(255), primary key (ID))
+alter table PERFTEST8 add constraint COL8_9PERFTEST7PERFTEST8 foreign key (COL8_9) references PERFTEST7(ID)
+create table PERFTEST9 (ID varchar(255) not null, COL9_0 varchar(255), COL9_1 varchar(255), COL9_2 varchar(255), COL9_3 varchar(255), COL9_4 varchar(255), COL9_5 varchar(255), COL9_6 varchar(255), COL9_7 varchar(255), COL9_8 varchar(255), COL9_9 varchar(255), primary key (ID))
+alter table PERFTEST9 add constraint COL9_9PERFTEST8PERFTEST9 foreign key (COL9_9) references PERFTEST8(ID)
+create table PERFTEST10 (ID varchar(255) not null, COL10_0 varchar(255), COL10_1 varchar(255), COL10_2 varchar(255), COL10_3 varchar(255), COL10_4 varchar(255), COL10_5 varchar(255), COL10_6 varchar(255), COL10_7 varchar(255), COL10_8 varchar(255), COL10_9 varchar(255), primary key (ID))
+alter table PERFTEST10 add constraint COL10_9PERFTEST9PERFTEST10 foreign key (COL10_9) references PERFTEST9(ID)
+create table PERFTEST11 (ID varchar(255) not null, COL11_0 varchar(255), COL11_1 varchar(255), COL11_2 varchar(255), COL11_3 varchar(255), COL11_4 varchar(255), COL11_5 varchar(255), COL11_6 varchar(255), COL11_7 varchar(255), COL11_8 varchar(255), COL11_9 varchar(255), primary key (ID))
+alter table PERFTEST11 add constraint COL11_9PERFTEST10PERFTEST11 foreign key (COL11_9) references PERFTEST10(ID)
+create table PERFTEST12 (ID varchar(255) not null, COL12_0 varchar(255), COL12_1 varchar(255), COL12_2 varchar(255), COL12_3 varchar(255), COL12_4 varchar(255), COL12_5 varchar(255), COL12_6 varchar(255), COL12_7 varchar(255), COL12_8 varchar(255), COL12_9 varchar(255), primary key (ID))
+alter table PERFTEST12 add constraint COL12_9PERFTEST11PERFTEST12 foreign key (COL12_9) references PERFTEST11(ID)
+create table PERFTEST13 (ID varchar(255) not null, COL13_0 varchar(255), COL13_1 varchar(255), COL13_2 varchar(255), COL13_3 varchar(255), COL13_4 varchar(255), COL13_5 varchar(255), COL13_6 varchar(255), COL13_7 varchar(255), COL13_8 varchar(255), COL13_9 varchar(255), primary key (ID))
+alter table PERFTEST13 add constraint COL13_9PERFTEST12PERFTEST13 foreign key (COL13_9) references PERFTEST12(ID)
+create table PERFTEST14 (ID varchar(255) not null, COL14_0 varchar(255), COL14_1 varchar(255), COL14_2 varchar(255), COL14_3 varchar(255), COL14_4 varchar(255), COL14_5 varchar(255), COL14_6 varchar(255), COL14_7 varchar(255), COL14_8 varchar(255), COL14_9 varchar(255), primary key (ID))
+alter table PERFTEST14 add constraint COL14_9PERFTEST13PERFTEST14 foreign key (COL14_9) references PERFTEST13(ID)
+create table PERFTEST15 (ID varchar(255) not null, COL15_0 varchar(255), COL15_1 varchar(255), COL15_2 varchar(255), COL15_3 varchar(255), COL15_4 varchar(255), COL15_5 varchar(255), COL15_6 varchar(255), COL15_7 varchar(255), COL15_8 varchar(255), COL15_9 varchar(255), primary key (ID))
+alter table PERFTEST15 add constraint COL15_9PERFTEST14PERFTEST15 foreign key (COL15_9) references PERFTEST14(ID)
+create table PERFTEST16 (ID varchar(255) not null, COL16_0 varchar(255), COL16_1 varchar(255), COL16_2 varchar(255), COL16_3 varchar(255), COL16_4 varchar(255), COL16_5 varchar(255), COL16_6 varchar(255), COL16_7 varchar(255), COL16_8 varchar(255), COL16_9 varchar(255), primary key (ID))
+alter table PERFTEST16 add constraint COL16_9PERFTEST15PERFTEST16 foreign key (COL16_9) references PERFTEST15(ID)
+create table PERFTEST17 (ID varchar(255) not null, COL17_0 varchar(255), COL17_1 varchar(255), COL17_2 varchar(255), COL17_3 varchar(255), COL17_4 varchar(255), COL17_5 varchar(255), COL17_6 varchar(255), COL17_7 varchar(255), COL17_8 varchar(255), COL17_9 varchar(255), primary key (ID))
+alter table PERFTEST17 add constraint COL17_9PERFTEST16PERFTEST17 foreign key (COL17_9) references PERFTEST16(ID)
+create table PERFTEST18 (ID varchar(255) not null, COL18_0 varchar(255), COL18_1 varchar(255), COL18_2 varchar(255), COL18_3 varchar(255), COL18_4 varchar(255), COL18_5 varchar(255), COL18_6 varchar(255), COL18_7 varchar(255), COL18_8 varchar(255), COL18_9 varchar(255), primary key (ID))
+alter table PERFTEST18 add constraint COL18_9PERFTEST17PERFTEST18 foreign key (COL18_9) references PERFTEST17(ID)
+create table PERFTEST19 (ID varchar(255) not null, COL19_0 varchar(255), COL19_1 varchar(255), COL19_2 varchar(255), COL19_3 varchar(255), COL19_4 varchar(255), COL19_5 varchar(255), COL19_6 varchar(255), COL19_7 varchar(255), COL19_8 varchar(255), COL19_9 varchar(255), primary key (ID))
+alter table PERFTEST19 add constraint COL19_9PERFTEST18PERFTEST19 foreign key (COL19_9) references PERFTEST18(ID)
+create table PERFTEST20 (ID varchar(255) not null, COL20_0 varchar(255), COL20_1 varchar(255), COL20_2 varchar(255), COL20_3 varchar(255), COL20_4 varchar(255), COL20_5 varchar(255), COL20_6 varchar(255), COL20_7 varchar(255), COL20_8 varchar(255), COL20_9 varchar(255), primary key (ID))
+alter table PERFTEST20 add constraint COL20_9PERFTEST19PERFTEST20 foreign key (COL20_9) references PERFTEST19(ID)
+create table PERFTEST21 (ID varchar(255) not null, COL21_0 varchar(255), COL21_1 varchar(255), COL21_2 varchar(255), COL21_3 varchar(255), COL21_4 varchar(255), COL21_5 varchar(255), COL21_6 varchar(255), COL21_7 varchar(255), COL21_8 varchar(255), COL21_9 varchar(255), primary key (ID))
+alter table PERFTEST21 add constraint COL21_9PERFTEST20PERFTEST21 foreign key (COL21_9) references PERFTEST20(ID)
+create table PERFTEST22 (ID varchar(255) not null, COL22_0 varchar(255), COL22_1 varchar(255), COL22_2 varchar(255), COL22_3 varchar(255), COL22_4 varchar(255), COL22_5 varchar(255), COL22_6 varchar(255), COL22_7 varchar(255), COL22_8 varchar(255), COL22_9 varchar(255), primary key (ID))
+alter table PERFTEST22 add constraint COL22_9PERFTEST21PERFTEST22 foreign key (COL22_9) references PERFTEST21(ID)
+create table PERFTEST23 (ID varchar(255) not null, COL23_0 varchar(255), COL23_1 varchar(255), COL23_2 varchar(255), COL23_3 varchar(255), COL23_4 varchar(255), COL23_5 varchar(255), COL23_6 varchar(255), COL23_7 varchar(255), COL23_8 varchar(255), COL23_9 varchar(255), primary key (ID))
+alter table PERFTEST23 add constraint COL23_9PERFTEST22PERFTEST23 foreign key (COL23_9) references PERFTEST22(ID)
+create table PERFTEST24 (ID varchar(255) not null, COL24_0 varchar(255), COL24_1 varchar(255), COL24_2 varchar(255), COL24_3 varchar(255), COL24_4 varchar(255), COL24_5 varchar(255), COL24_6 varchar(255), COL24_7 varchar(255), COL24_8 varchar(255), COL24_9 varchar(255), primary key (ID))
+alter table PERFTEST24 add constraint COL24_9PERFTEST23PERFTEST24 foreign key (COL24_9) references PERFTEST23(ID)
+create table PERFTEST25 (ID varchar(255) not null, COL25_0 varchar(255), COL25_1 varchar(255), COL25_2 varchar(255), COL25_3 varchar(255), COL25_4 varchar(255), COL25_5 varchar(255), COL25_6 varchar(255), COL25_7 varchar(255), COL25_8 varchar(255), COL25_9 varchar(255), primary key (ID))
+alter table PERFTEST25 add constraint COL25_9PERFTEST24PERFTEST25 foreign key (COL25_9) references PERFTEST24(ID)
+create table PERFTEST26 (ID varchar(255) not null, COL26_0 varchar(255), COL26_1 varchar(255), COL26_2 varchar(255), COL26_3 varchar(255), COL26_4 varchar(255), COL26_5 varchar(255), COL26_6 varchar(255), COL26_7 varchar(255), COL26_8 varchar(255), COL26_9 varchar(255), primary key (ID))
+alter table PERFTEST26 add constraint COL26_9PERFTEST25PERFTEST26 foreign key (COL26_9) references PERFTEST25(ID)
+create table PERFTEST27 (ID varchar(255) not null, COL27_0 varchar(255), COL27_1 varchar(255), COL27_2 varchar(255), COL27_3 varchar(255), COL27_4 varchar(255), COL27_5 varchar(255), COL27_6 varchar(255), COL27_7 varchar(255), COL27_8 varchar(255), COL27_9 varchar(255), primary key (ID))
+alter table PERFTEST27 add constraint COL27_9PERFTEST26PERFTEST27 foreign key (COL27_9) references PERFTEST26(ID)
+create table PERFTEST28 (ID varchar(255) not null, COL28_0 varchar(255), COL28_1 varchar(255), COL28_2 varchar(255), COL28_3 varchar(255), COL28_4 varchar(255), COL28_5 varchar(255), COL28_6 varchar(255), COL28_7 varchar(255), COL28_8 varchar(255), COL28_9 varchar(255), primary key (ID))
+alter table PERFTEST28 add constraint COL28_9PERFTEST27PERFTEST28 foreign key (COL28_9) references PERFTEST27(ID)
+create table PERFTEST29 (ID varchar(255) not null, COL29_0 varchar(255), COL29_1 varchar(255), COL29_2 varchar(255), COL29_3 varchar(255), COL29_4 varchar(255), COL29_5 varchar(255), COL29_6 varchar(255), COL29_7 varchar(255), COL29_8 varchar(255), COL29_9 varchar(255), primary key (ID))
+alter table PERFTEST29 add constraint COL29_9PERFTEST28PERFTEST29 foreign key (COL29_9) references PERFTEST28(ID)
+create table PERFTEST30 (ID varchar(255) not null, COL30_0 varchar(255), COL30_1 varchar(255), COL30_2 varchar(255), COL30_3 varchar(255), COL30_4 varchar(255), COL30_5 varchar(255), COL30_6 varchar(255), COL30_7 varchar(255), COL30_8 varchar(255), COL30_9 varchar(255), primary key (ID))
+alter table PERFTEST30 add constraint COL30_9PERFTEST29PERFTEST30 foreign key (COL30_9) references PERFTEST29(ID)
+create table PERFTEST31 (ID varchar(255) not null, COL31_0 varchar(255), COL31_1 varchar(255), COL31_2 varchar(255), COL31_3 varchar(255), COL31_4 varchar(255), COL31_5 varchar(255), COL31_6 varchar(255), COL31_7 varchar(255), COL31_8 varchar(255), COL31_9 varchar(255), primary key (ID))
+alter table PERFTEST31 add constraint COL31_9PERFTEST30PERFTEST31 foreign key (COL31_9) references PERFTEST30(ID)
+create table PERFTEST32 (ID varchar(255) not null, COL32_0 varchar(255), COL32_1 varchar(255), COL32_2 varchar(255), COL32_3 varchar(255), COL32_4 varchar(255), COL32_5 varchar(255), COL32_6 varchar(255), COL32_7 varchar(255), COL32_8 varchar(255), COL32_9 varchar(255), primary key (ID))
+alter table PERFTEST32 add constraint COL32_9PERFTEST31PERFTEST32 foreign key (COL32_9) references PERFTEST31(ID)
+create table PERFTEST33 (ID varchar(255) not null, COL33_0 varchar(255), COL33_1 varchar(255), COL33_2 varchar(255), COL33_3 varchar(255), COL33_4 varchar(255), COL33_5 varchar(255), COL33_6 varchar(255), COL33_7 varchar(255), COL33_8 varchar(255), COL33_9 varchar(255), primary key (ID))
+alter table PERFTEST33 add constraint COL33_9PERFTEST32PERFTEST33 foreign key (COL33_9) references PERFTEST32(ID)
+create table PERFTEST34 (ID varchar(255) not null, COL34_0 varchar(255), COL34_1 varchar(255), COL34_2 varchar(255), COL34_3 varchar(255), COL34_4 varchar(255), COL34_5 varchar(255), COL34_6 varchar(255), COL34_7 varchar(255), COL34_8 varchar(255), COL34_9 varchar(255), primary key (ID))
+alter table PERFTEST34 add constraint COL34_9PERFTEST33PERFTEST34 foreign key (COL34_9) references PERFTEST33(ID)
+create table PERFTEST35 (ID varchar(255) not null, COL35_0 varchar(255), COL35_1 varchar(255), COL35_2 varchar(255), COL35_3 varchar(255), COL35_4 varchar(255), COL35_5 varchar(255), COL35_6 varchar(255), COL35_7 varchar(255), COL35_8 varchar(255), COL35_9 varchar(255), primary key (ID))
+alter table PERFTEST35 add constraint COL35_9PERFTEST34PERFTEST35 foreign key (COL35_9) references PERFTEST34(ID)
+create table PERFTEST36 (ID varchar(255) not null, COL36_0 varchar(255), COL36_1 varchar(255), COL36_2 varchar(255), COL36_3 varchar(255), COL36_4 varchar(255), COL36_5 varchar(255), COL36_6 varchar(255), COL36_7 varchar(255), COL36_8 varchar(255), COL36_9 varchar(255), primary key (ID))
+alter table PERFTEST36 add constraint COL36_9PERFTEST35PERFTEST36 foreign key (COL36_9) references PERFTEST35(ID)
+create table PERFTEST37 (ID varchar(255) not null, COL37_0 varchar(255), COL37_1 varchar(255), COL37_2 varchar(255), COL37_3 varchar(255), COL37_4 varchar(255), COL37_5 varchar(255), COL37_6 varchar(255), COL37_7 varchar(255), COL37_8 varchar(255), COL37_9 varchar(255), primary key (ID))
+alter table PERFTEST37 add constraint COL37_9PERFTEST36PERFTEST37 foreign key (COL37_9) references PERFTEST36(ID)
+create table PERFTEST38 (ID varchar(255) not null, COL38_0 varchar(255), COL38_1 varchar(255), COL38_2 varchar(255), COL38_3 varchar(255), COL38_4 varchar(255), COL38_5 varchar(255), COL38_6 varchar(255), COL38_7 varchar(255), COL38_8 varchar(255), COL38_9 varchar(255), primary key (ID))
+alter table PERFTEST38 add constraint COL38_9PERFTEST37PERFTEST38 foreign key (COL38_9) references PERFTEST37(ID)
+create table PERFTEST39 (ID varchar(255) not null, COL39_0 varchar(255), COL39_1 varchar(255), COL39_2 varchar(255), COL39_3 varchar(255), COL39_4 varchar(255), COL39_5 varchar(255), COL39_6 varchar(255), COL39_7 varchar(255), COL39_8 varchar(255), COL39_9 varchar(255), primary key (ID))
+alter table PERFTEST39 add constraint COL39_9PERFTEST38PERFTEST39 foreign key (COL39_9) references PERFTEST38(ID)
+create table PERFTEST40 (ID varchar(255) not null, COL40_0 varchar(255), COL40_1 varchar(255), COL40_2 varchar(255), COL40_3 varchar(255), COL40_4 varchar(255), COL40_5 varchar(255), COL40_6 varchar(255), COL40_7 varchar(255), COL40_8 varchar(255), COL40_9 varchar(255), primary key (ID))
+alter table PERFTEST40 add constraint COL40_9PERFTEST39PERFTEST40 foreign key (COL40_9) references PERFTEST39(ID)
+create table PERFTEST41 (ID varchar(255) not null, COL41_0 varchar(255), COL41_1 varchar(255), COL41_2 varchar(255), COL41_3 varchar(255), COL41_4 varchar(255), COL41_5 varchar(255), COL41_6 varchar(255), COL41_7 varchar(255), COL41_8 varchar(255), COL41_9 varchar(255), primary key (ID))
+alter table PERFTEST41 add constraint COL41_9PERFTEST40PERFTEST41 foreign key (COL41_9) references PERFTEST40(ID)
+create table PERFTEST42 (ID varchar(255) not null, COL42_0 varchar(255), COL42_1 varchar(255), COL42_2 varchar(255), COL42_3 varchar(255), COL42_4 varchar(255), COL42_5 varchar(255), COL42_6 varchar(255), COL42_7 varchar(255), COL42_8 varchar(255), COL42_9 varchar(255), primary key (ID))
+alter table PERFTEST42 add constraint COL42_9PERFTEST41PERFTEST42 foreign key (COL42_9) references PERFTEST41(ID)
+create table PERFTEST43 (ID varchar(255) not null, COL43_0 varchar(255), COL43_1 varchar(255), COL43_2 varchar(255), COL43_3 varchar(255), COL43_4 varchar(255), COL43_5 varchar(255), COL43_6 varchar(255), COL43_7 varchar(255), COL43_8 varchar(255), COL43_9 varchar(255), primary key (ID))
+alter table PERFTEST43 add constraint COL43_9PERFTEST42PERFTEST43 foreign key (COL43_9) references PERFTEST42(ID)
+create table PERFTEST44 (ID varchar(255) not null, COL44_0 varchar(255), COL44_1 varchar(255), COL44_2 varchar(255), COL44_3 varchar(255), COL44_4 varchar(255), COL44_5 varchar(255), COL44_6 varchar(255), COL44_7 varchar(255), COL44_8 varchar(255), COL44_9 varchar(255), primary key (ID))
+alter table PERFTEST44 add constraint COL44_9PERFTEST43PERFTEST44 foreign key (COL44_9) references PERFTEST43(ID)
+create table PERFTEST45 (ID varchar(255) not null, COL45_0 varchar(255), COL45_1 varchar(255), COL45_2 varchar(255), COL45_3 varchar(255), COL45_4 varchar(255), COL45_5 varchar(255), COL45_6 varchar(255), COL45_7 varchar(255), COL45_8 varchar(255), COL45_9 varchar(255), primary key (ID))
+alter table PERFTEST45 add constraint COL45_9PERFTEST44PERFTEST45 foreign key (COL45_9) references PERFTEST44(ID)
+create table PERFTEST46 (ID varchar(255) not null, COL46_0 varchar(255), COL46_1 varchar(255), COL46_2 varchar(255), COL46_3 varchar(255), COL46_4 varchar(255), COL46_5 varchar(255), COL46_6 varchar(255), COL46_7 varchar(255), COL46_8 varchar(255), COL46_9 varchar(255), primary key (ID))
+alter table PERFTEST46 add constraint COL46_9PERFTEST45PERFTEST46 foreign key (COL46_9) references PERFTEST45(ID)
+create table PERFTEST47 (ID varchar(255) not null, COL47_0 varchar(255), COL47_1 varchar(255), COL47_2 varchar(255), COL47_3 varchar(255), COL47_4 varchar(255), COL47_5 varchar(255), COL47_6 varchar(255), COL47_7 varchar(255), COL47_8 varchar(255), COL47_9 varchar(255), primary key (ID))
+alter table PERFTEST47 add constraint COL47_9PERFTEST46PERFTEST47 foreign key (COL47_9) references PERFTEST46(ID)
+create table PERFTEST48 (ID varchar(255) not null, COL48_0 varchar(255), COL48_1 varchar(255), COL48_2 varchar(255), COL48_3 varchar(255), COL48_4 varchar(255), COL48_5 varchar(255), COL48_6 varchar(255), COL48_7 varchar(255), COL48_8 varchar(255), COL48_9 varchar(255), primary key (ID))
+alter table PERFTEST48 add constraint COL48_9PERFTEST47PERFTEST48 foreign key (COL48_9) references PERFTEST47(ID)
+create table PERFTEST49 (ID varchar(255) not null, COL49_0 varchar(255), COL49_1 varchar(255), COL49_2 varchar(255), COL49_3 varchar(255), COL49_4 varchar(255), COL49_5 varchar(255), COL49_6 varchar(255), COL49_7 varchar(255), COL49_8 varchar(255), COL49_9 varchar(255), primary key (ID))
+alter table PERFTEST49 add constraint COL49_9PERFTEST48PERFTEST49 foreign key (COL49_9) references PERFTEST48(ID)
+create table PERFTEST50 (ID varchar(255) not null, COL50_0 varchar(255), COL50_1 varchar(255), COL50_2 varchar(255), COL50_3 varchar(255), COL50_4 varchar(255), COL50_5 varchar(255), COL50_6 varchar(255), COL50_7 varchar(255), COL50_8 varchar(255), COL50_9 varchar(255), primary key (ID))
+alter table PERFTEST50 add constraint COL50_9PERFTEST49PERFTEST50 foreign key (COL50_9) references PERFTEST49(ID)
+create table PERFTEST51 (ID varchar(255) not null, COL51_0 varchar(255), COL51_1 varchar(255), COL51_2 varchar(255), COL51_3 varchar(255), COL51_4 varchar(255), COL51_5 varchar(255), COL51_6 varchar(255), COL51_7 varchar(255), COL51_8 varchar(255), COL51_9 varchar(255), primary key (ID))
+alter table PERFTEST51 add constraint COL51_9PERFTEST50PERFTEST51 foreign key (COL51_9) references PERFTEST50(ID)
+create table PERFTEST52 (ID varchar(255) not null, COL52_0 varchar(255), COL52_1 varchar(255), COL52_2 varchar(255), COL52_3 varchar(255), COL52_4 varchar(255), COL52_5 varchar(255), COL52_6 varchar(255), COL52_7 varchar(255), COL52_8 varchar(255), COL52_9 varchar(255), primary key (ID))
+alter table PERFTEST52 add constraint COL52_9PERFTEST51PERFTEST52 foreign key (COL52_9) references PERFTEST51(ID)
+create table PERFTEST53 (ID varchar(255) not null, COL53_0 varchar(255), COL53_1 varchar(255), COL53_2 varchar(255), COL53_3 varchar(255), COL53_4 varchar(255), COL53_5 varchar(255), COL53_6 varchar(255), COL53_7 varchar(255), COL53_8 varchar(255), COL53_9 varchar(255), primary key (ID))
+alter table PERFTEST53 add constraint COL53_9PERFTEST52PERFTEST53 foreign key (COL53_9) references PERFTEST52(ID)
+create table PERFTEST54 (ID varchar(255) not null, COL54_0 varchar(255), COL54_1 varchar(255), COL54_2 varchar(255), COL54_3 varchar(255), COL54_4 varchar(255), COL54_5 varchar(255), COL54_6 varchar(255), COL54_7 varchar(255), COL54_8 varchar(255), COL54_9 varchar(255), primary key (ID))
+alter table PERFTEST54 add constraint COL54_9PERFTEST53PERFTEST54 foreign key (COL54_9) references PERFTEST53(ID)
+create table PERFTEST55 (ID varchar(255) not null, COL55_0 varchar(255), COL55_1 varchar(255), COL55_2 varchar(255), COL55_3 varchar(255), COL55_4 varchar(255), COL55_5 varchar(255), COL55_6 varchar(255), COL55_7 varchar(255), COL55_8 varchar(255), COL55_9 varchar(255), primary key (ID))
+alter table PERFTEST55 add constraint COL55_9PERFTEST54PERFTEST55 foreign key (COL55_9) references PERFTEST54(ID)
+create table PERFTEST56 (ID varchar(255) not null, COL56_0 varchar(255), COL56_1 varchar(255), COL56_2 varchar(255), COL56_3 varchar(255), COL56_4 varchar(255), COL56_5 varchar(255), COL56_6 varchar(255), COL56_7 varchar(255), COL56_8 varchar(255), COL56_9 varchar(255), primary key (ID))
+alter table PERFTEST56 add constraint COL56_9PERFTEST55PERFTEST56 foreign key (COL56_9) references PERFTEST55(ID)
+create table PERFTEST57 (ID varchar(255) not null, COL57_0 varchar(255), COL57_1 varchar(255), COL57_2 varchar(255), COL57_3 varchar(255), COL57_4 varchar(255), COL57_5 varchar(255), COL57_6 varchar(255), COL57_7 varchar(255), COL57_8 varchar(255), COL57_9 varchar(255), primary key (ID))
+alter table PERFTEST57 add constraint COL57_9PERFTEST56PERFTEST57 foreign key (COL57_9) references PERFTEST56(ID)
+create table PERFTEST58 (ID varchar(255) not null, COL58_0 varchar(255), COL58_1 varchar(255), COL58_2 varchar(255), COL58_3 varchar(255), COL58_4 varchar(255), COL58_5 varchar(255), COL58_6 varchar(255), COL58_7 varchar(255), COL58_8 varchar(255), COL58_9 varchar(255), primary key (ID))
+alter table PERFTEST58 add constraint COL58_9PERFTEST57PERFTEST58 foreign key (COL58_9) references PERFTEST57(ID)
+create table PERFTEST59 (ID varchar(255) not null, COL59_0 varchar(255), COL59_1 varchar(255), COL59_2 varchar(255), COL59_3 varchar(255), COL59_4 varchar(255), COL59_5 varchar(255), COL59_6 varchar(255), COL59_7 varchar(255), COL59_8 varchar(255), COL59_9 varchar(255), primary key (ID))
+alter table PERFTEST59 add constraint COL59_9PERFTEST58PERFTEST59 foreign key (COL59_9) references PERFTEST58(ID)
+create table PERFTEST60 (ID varchar(255) not null, COL60_0 varchar(255), COL60_1 varchar(255), COL60_2 varchar(255), COL60_3 varchar(255), COL60_4 varchar(255), COL60_5 varchar(255), COL60_6 varchar(255), COL60_7 varchar(255), COL60_8 varchar(255), COL60_9 varchar(255), primary key (ID))
+alter table PERFTEST60 add constraint COL60_9PERFTEST59PERFTEST60 foreign key (COL60_9) references PERFTEST59(ID)
+create table PERFTEST61 (ID varchar(255) not null, COL61_0 varchar(255), COL61_1 varchar(255), COL61_2 varchar(255), COL61_3 varchar(255), COL61_4 varchar(255), COL61_5 varchar(255), COL61_6 varchar(255), COL61_7 varchar(255), COL61_8 varchar(255), COL61_9 varchar(255), primary key (ID))
+alter table PERFTEST61 add constraint COL61_9PERFTEST60PERFTEST61 foreign key (COL61_9) references PERFTEST60(ID)
+create table PERFTEST62 (ID varchar(255) not null, COL62_0 varchar(255), COL62_1 varchar(255), COL62_2 varchar(255), COL62_3 varchar(255), COL62_4 varchar(255), COL62_5 varchar(255), COL62_6 varchar(255), COL62_7 varchar(255), COL62_8 varchar(255), COL62_9 varchar(255), primary key (ID))
+alter table PERFTEST62 add constraint COL62_9PERFTEST61PERFTEST62 foreign key (COL62_9) references PERFTEST61(ID)
+create table PERFTEST63 (ID varchar(255) not null, COL63_0 varchar(255), COL63_1 varchar(255), COL63_2 varchar(255), COL63_3 varchar(255), COL63_4 varchar(255), COL63_5 varchar(255), COL63_6 varchar(255), COL63_7 varchar(255), COL63_8 varchar(255), COL63_9 varchar(255), primary key (ID))
+alter table PERFTEST63 add constraint COL63_9PERFTEST62PERFTEST63 foreign key (COL63_9) references PERFTEST62(ID)
+create table PERFTEST64 (ID varchar(255) not null, COL64_0 varchar(255), COL64_1 varchar(255), COL64_2 varchar(255), COL64_3 varchar(255), COL64_4 varchar(255), COL64_5 varchar(255), COL64_6 varchar(255), COL64_7 varchar(255), COL64_8 varchar(255), COL64_9 varchar(255), primary key (ID))
+alter table PERFTEST64 add constraint COL64_9PERFTEST63PERFTEST64 foreign key (COL64_9) references PERFTEST63(ID)
+create table PERFTEST65 (ID varchar(255) not null, COL65_0 varchar(255), COL65_1 varchar(255), COL65_2 varchar(255), COL65_3 varchar(255), COL65_4 varchar(255), COL65_5 varchar(255), COL65_6 varchar(255), COL65_7 varchar(255), COL65_8 varchar(255), COL65_9 varchar(255), primary key (ID))
+alter table PERFTEST65 add constraint COL65_9PERFTEST64PERFTEST65 foreign key (COL65_9) references PERFTEST64(ID)
+create table PERFTEST66 (ID varchar(255) not null, COL66_0 varchar(255), COL66_1 varchar(255), COL66_2 varchar(255), COL66_3 varchar(255), COL66_4 varchar(255), COL66_5 varchar(255), COL66_6 varchar(255), COL66_7 varchar(255), COL66_8 varchar(255), COL66_9 varchar(255), primary key (ID))
+alter table PERFTEST66 add constraint COL66_9PERFTEST65PERFTEST66 foreign key (COL66_9) references PERFTEST65(ID)
+create table PERFTEST67 (ID varchar(255) not null, COL67_0 varchar(255), COL67_1 varchar(255), COL67_2 varchar(255), COL67_3 varchar(255), COL67_4 varchar(255), COL67_5 varchar(255), COL67_6 varchar(255), COL67_7 varchar(255), COL67_8 varchar(255), COL67_9 varchar(255), primary key (ID))
+alter table PERFTEST67 add constraint COL67_9PERFTEST66PERFTEST67 foreign key (COL67_9) references PERFTEST66(ID)
+create table PERFTEST68 (ID varchar(255) not null, COL68_0 varchar(255), COL68_1 varchar(255), COL68_2 varchar(255), COL68_3 varchar(255), COL68_4 varchar(255), COL68_5 varchar(255), COL68_6 varchar(255), COL68_7 varchar(255), COL68_8 varchar(255), COL68_9 varchar(255), primary key (ID))
+alter table PERFTEST68 add constraint COL68_9PERFTEST67PERFTEST68 foreign key (COL68_9) references PERFTEST67(ID)
+create table PERFTEST69 (ID varchar(255) not null, COL69_0 varchar(255), COL69_1 varchar(255), COL69_2 varchar(255), COL69_3 varchar(255), COL69_4 varchar(255), COL69_5 varchar(255), COL69_6 varchar(255), COL69_7 varchar(255), COL69_8 varchar(255), COL69_9 varchar(255), primary key (ID))
+alter table PERFTEST69 add constraint COL69_9PERFTEST68PERFTEST69 foreign key (COL69_9) references PERFTEST68(ID)
+create table PERFTEST70 (ID varchar(255) not null, COL70_0 varchar(255), COL70_1 varchar(255), COL70_2 varchar(255), COL70_3 varchar(255), COL70_4 varchar(255), COL70_5 varchar(255), COL70_6 varchar(255), COL70_7 varchar(255), COL70_8 varchar(255), COL70_9 varchar(255), primary key (ID))
+alter table PERFTEST70 add constraint COL70_9PERFTEST69PERFTEST70 foreign key (COL70_9) references PERFTEST69(ID)
+create table PERFTEST71 (ID varchar(255) not null, COL71_0 varchar(255), COL71_1 varchar(255), COL71_2 varchar(255), COL71_3 varchar(255), COL71_4 varchar(255), COL71_5 varchar(255), COL71_6 varchar(255), COL71_7 varchar(255), COL71_8 varchar(255), COL71_9 varchar(255), primary key (ID))
+alter table PERFTEST71 add constraint COL71_9PERFTEST70PERFTEST71 foreign key (COL71_9) references PERFTEST70(ID)
+create table PERFTEST72 (ID varchar(255) not null, COL72_0 varchar(255), COL72_1 varchar(255), COL72_2 varchar(255), COL72_3 varchar(255), COL72_4 varchar(255), COL72_5 varchar(255), COL72_6 varchar(255), COL72_7 varchar(255), COL72_8 varchar(255), COL72_9 varchar(255), primary key (ID))
+alter table PERFTEST72 add constraint COL72_9PERFTEST71PERFTEST72 foreign key (COL72_9) references PERFTEST71(ID)
+create table PERFTEST73 (ID varchar(255) not null, COL73_0 varchar(255), COL73_1 varchar(255), COL73_2 varchar(255), COL73_3 varchar(255), COL73_4 varchar(255), COL73_5 varchar(255), COL73_6 varchar(255), COL73_7 varchar(255), COL73_8 varchar(255), COL73_9 varchar(255), primary key (ID))
+alter table PERFTEST73 add constraint COL73_9PERFTEST72PERFTEST73 foreign key (COL73_9) references PERFTEST72(ID)
+create table PERFTEST74 (ID varchar(255) not null, COL74_0 varchar(255), COL74_1 varchar(255), COL74_2 varchar(255), COL74_3 varchar(255), COL74_4 varchar(255), COL74_5 varchar(255), COL74_6 varchar(255), COL74_7 varchar(255), COL74_8 varchar(255), COL74_9 varchar(255), primary key (ID))
+alter table PERFTEST74 add constraint COL74_9PERFTEST73PERFTEST74 foreign key (COL74_9) references PERFTEST73(ID)
+create table PERFTEST75 (ID varchar(255) not null, COL75_0 varchar(255), COL75_1 varchar(255), COL75_2 varchar(255), COL75_3 varchar(255), COL75_4 varchar(255), COL75_5 varchar(255), COL75_6 varchar(255), COL75_7 varchar(255), COL75_8 varchar(255), COL75_9 varchar(255), primary key (ID))
+alter table PERFTEST75 add constraint COL75_9PERFTEST74PERFTEST75 foreign key (COL75_9) references PERFTEST74(ID)
+create table PERFTEST76 (ID varchar(255) not null, COL76_0 varchar(255), COL76_1 varchar(255), COL76_2 varchar(255), COL76_3 varchar(255), COL76_4 varchar(255), COL76_5 varchar(255), COL76_6 varchar(255), COL76_7 varchar(255), COL76_8 varchar(255), COL76_9 varchar(255), primary key (ID))
+alter table PERFTEST76 add constraint COL76_9PERFTEST75PERFTEST76 foreign key (COL76_9) references PERFTEST75(ID)
+create table PERFTEST77 (ID varchar(255) not null, COL77_0 varchar(255), COL77_1 varchar(255), COL77_2 varchar(255), COL77_3 varchar(255), COL77_4 varchar(255), COL77_5 varchar(255), COL77_6 varchar(255), COL77_7 varchar(255), COL77_8 varchar(255), COL77_9 varchar(255), primary key (ID))
+alter table PERFTEST77 add constraint COL77_9PERFTEST76PERFTEST77 foreign key (COL77_9) references PERFTEST76(ID)
+create table PERFTEST78 (ID varchar(255) not null, COL78_0 varchar(255), COL78_1 varchar(255), COL78_2 varchar(255), COL78_3 varchar(255), COL78_4 varchar(255), COL78_5 varchar(255), COL78_6 varchar(255), COL78_7 varchar(255), COL78_8 varchar(255), COL78_9 varchar(255), primary key (ID))
+alter table PERFTEST78 add constraint COL78_9PERFTEST77PERFTEST78 foreign key (COL78_9) references PERFTEST77(ID)
+create table PERFTEST79 (ID varchar(255) not null, COL79_0 varchar(255), COL79_1 varchar(255), COL79_2 varchar(255), COL79_3 varchar(255), COL79_4 varchar(255), COL79_5 varchar(255), COL79_6 varchar(255), COL79_7 varchar(255), COL79_8 varchar(255), COL79_9 varchar(255), primary key (ID))
+alter table PERFTEST79 add constraint COL79_9PERFTEST78PERFTEST79 foreign key (COL79_9) references PERFTEST78(ID)
+create table PERFTEST80 (ID varchar(255) not null, COL80_0 varchar(255), COL80_1 varchar(255), COL80_2 varchar(255), COL80_3 varchar(255), COL80_4 varchar(255), COL80_5 varchar(255), COL80_6 varchar(255), COL80_7 varchar(255), COL80_8 varchar(255), COL80_9 varchar(255), primary key (ID))
+alter table PERFTEST80 add constraint COL80_9PERFTEST79PERFTEST80 foreign key (COL80_9) references PERFTEST79(ID)
+create table PERFTEST81 (ID varchar(255) not null, COL81_0 varchar(255), COL81_1 varchar(255), COL81_2 varchar(255), COL81_3 varchar(255), COL81_4 varchar(255), COL81_5 varchar(255), COL81_6 varchar(255), COL81_7 varchar(255), COL81_8 varchar(255), COL81_9 varchar(255), primary key (ID))
+alter table PERFTEST81 add constraint COL81_9PERFTEST80PERFTEST81 foreign key (COL81_9) references PERFTEST80(ID)
+create table PERFTEST82 (ID varchar(255) not null, COL82_0 varchar(255), COL82_1 varchar(255), COL82_2 varchar(255), COL82_3 varchar(255), COL82_4 varchar(255), COL82_5 varchar(255), COL82_6 varchar(255), COL82_7 varchar(255), COL82_8 varchar(255), COL82_9 varchar(255), primary key (ID))
+alter table PERFTEST82 add constraint COL82_9PERFTEST81PERFTEST82 foreign key (COL82_9) references PERFTEST81(ID)
+create table PERFTEST83 (ID varchar(255) not null, COL83_0 varchar(255), COL83_1 varchar(255), COL83_2 varchar(255), COL83_3 varchar(255), COL83_4 varchar(255), COL83_5 varchar(255), COL83_6 varchar(255), COL83_7 varchar(255), COL83_8 varchar(255), COL83_9 varchar(255), primary key (ID))
+alter table PERFTEST83 add constraint COL83_9PERFTEST82PERFTEST83 foreign key (COL83_9) references PERFTEST82(ID)
+create table PERFTEST84 (ID varchar(255) not null, COL84_0 varchar(255), COL84_1 varchar(255), COL84_2 varchar(255), COL84_3 varchar(255), COL84_4 varchar(255), COL84_5 varchar(255), COL84_6 varchar(255), COL84_7 varchar(255), COL84_8 varchar(255), COL84_9 varchar(255), primary key (ID))
+alter table PERFTEST84 add constraint COL84_9PERFTEST83PERFTEST84 foreign key (COL84_9) references PERFTEST83(ID)
+create table PERFTEST85 (ID varchar(255) not null, COL85_0 varchar(255), COL85_1 varchar(255), COL85_2 varchar(255), COL85_3 varchar(255), COL85_4 varchar(255), COL85_5 varchar(255), COL85_6 varchar(255), COL85_7 varchar(255), COL85_8 varchar(255), COL85_9 varchar(255), primary key (ID))
+alter table PERFTEST85 add constraint COL85_9PERFTEST84PERFTEST85 foreign key (COL85_9) references PERFTEST84(ID)
+create table PERFTEST86 (ID varchar(255) not null, COL86_0 varchar(255), COL86_1 varchar(255), COL86_2 varchar(255), COL86_3 varchar(255), COL86_4 varchar(255), COL86_5 varchar(255), COL86_6 varchar(255), COL86_7 varchar(255), COL86_8 varchar(255), COL86_9 varchar(255), primary key (ID))
+alter table PERFTEST86 add constraint COL86_9PERFTEST85PERFTEST86 foreign key (COL86_9) references PERFTEST85(ID)
+create table PERFTEST87 (ID varchar(255) not null, COL87_0 varchar(255), COL87_1 varchar(255), COL87_2 varchar(255), COL87_3 varchar(255), COL87_4 varchar(255), COL87_5 varchar(255), COL87_6 varchar(255), COL87_7 varchar(255), COL87_8 varchar(255), COL87_9 varchar(255), primary key (ID))
+alter table PERFTEST87 add constraint COL87_9PERFTEST86PERFTEST87 foreign key (COL87_9) references PERFTEST86(ID)
+create table PERFTEST88 (ID varchar(255) not null, COL88_0 varchar(255), COL88_1 varchar(255), COL88_2 varchar(255), COL88_3 varchar(255), COL88_4 varchar(255), COL88_5 varchar(255), COL88_6 varchar(255), COL88_7 varchar(255), COL88_8 varchar(255), COL88_9 varchar(255), primary key (ID))
+alter table PERFTEST88 add constraint COL88_9PERFTEST87PERFTEST88 foreign key (COL88_9) references PERFTEST87(ID)
+create table PERFTEST89 (ID varchar(255) not null, COL89_0 varchar(255), COL89_1 varchar(255), COL89_2 varchar(255), COL89_3 varchar(255), COL89_4 varchar(255), COL89_5 varchar(255), COL89_6 varchar(255), COL89_7 varchar(255), COL89_8 varchar(255), COL89_9 varchar(255), primary key (ID))
+alter table PERFTEST89 add constraint COL89_9PERFTEST88PERFTEST89 foreign key (COL89_9) references PERFTEST88(ID)
+create table PERFTEST90 (ID varchar(255) not null, COL90_0 varchar(255), COL90_1 varchar(255), COL90_2 varchar(255), COL90_3 varchar(255), COL90_4 varchar(255), COL90_5 varchar(255), COL90_6 varchar(255), COL90_7 varchar(255), COL90_8 varchar(255), COL90_9 varchar(255), primary key (ID))
+alter table PERFTEST90 add constraint COL90_9PERFTEST89PERFTEST90 foreign key (COL90_9) references PERFTEST89(ID)
+create table PERFTEST91 (ID varchar(255) not null, COL91_0 varchar(255), COL91_1 varchar(255), COL91_2 varchar(255), COL91_3 varchar(255), COL91_4 varchar(255), COL91_5 varchar(255), COL91_6 varchar(255), COL91_7 varchar(255), COL91_8 varchar(255), COL91_9 varchar(255), primary key (ID))
+alter table PERFTEST91 add constraint COL91_9PERFTEST90PERFTEST91 foreign key (COL91_9) references PERFTEST90(ID)
+create table PERFTEST92 (ID varchar(255) not null, COL92_0 varchar(255), COL92_1 varchar(255), COL92_2 varchar(255), COL92_3 varchar(255), COL92_4 varchar(255), COL92_5 varchar(255), COL92_6 varchar(255), COL92_7 varchar(255), COL92_8 varchar(255), COL92_9 varchar(255), primary key (ID))
+alter table PERFTEST92 add constraint COL92_9PERFTEST91PERFTEST92 foreign key (COL92_9) references PERFTEST91(ID)
+create table PERFTEST93 (ID varchar(255) not null, COL93_0 varchar(255), COL93_1 varchar(255), COL93_2 varchar(255), COL93_3 varchar(255), COL93_4 varchar(255), COL93_5 varchar(255), COL93_6 varchar(255), COL93_7 varchar(255), COL93_8 varchar(255), COL93_9 varchar(255), primary key (ID))
+alter table PERFTEST93 add constraint COL93_9PERFTEST92PERFTEST93 foreign key (COL93_9) references PERFTEST92(ID)
+create table PERFTEST94 (ID varchar(255) not null, COL94_0 varchar(255), COL94_1 varchar(255), COL94_2 varchar(255), COL94_3 varchar(255), COL94_4 varchar(255), COL94_5 varchar(255), COL94_6 varchar(255), COL94_7 varchar(255), COL94_8 varchar(255), COL94_9 varchar(255), primary key (ID))
+alter table PERFTEST94 add constraint COL94_9PERFTEST93PERFTEST94 foreign key (COL94_9) references PERFTEST93(ID)
+create table PERFTEST95 (ID varchar(255) not null, COL95_0 varchar(255), COL95_1 varchar(255), COL95_2 varchar(255), COL95_3 varchar(255), COL95_4 varchar(255), COL95_5 varchar(255), COL95_6 varchar(255), COL95_7 varchar(255), COL95_8 varchar(255), COL95_9 varchar(255), primary key (ID))
+alter table PERFTEST95 add constraint COL95_9PERFTEST94PERFTEST95 foreign key (COL95_9) references PERFTEST94(ID)
+create table PERFTEST96 (ID varchar(255) not null, COL96_0 varchar(255), COL96_1 varchar(255), COL96_2 varchar(255), COL96_3 varchar(255), COL96_4 varchar(255), COL96_5 varchar(255), COL96_6 varchar(255), COL96_7 varchar(255), COL96_8 varchar(255), COL96_9 varchar(255), primary key (ID))
+alter table PERFTEST96 add constraint COL96_9PERFTEST95PERFTEST96 foreign key (COL96_9) references PERFTEST95(ID)
+create table PERFTEST97 (ID varchar(255) not null, COL97_0 varchar(255), COL97_1 varchar(255), COL97_2 varchar(255), COL97_3 varchar(255), COL97_4 varchar(255), COL97_5 varchar(255), COL97_6 varchar(255), COL97_7 varchar(255), COL97_8 varchar(255), COL97_9 varchar(255), primary key (ID))
+alter table PERFTEST97 add constraint COL97_9PERFTEST96PERFTEST97 foreign key (COL97_9) references PERFTEST96(ID)
+create table PERFTEST98 (ID varchar(255) not null, COL98_0 varchar(255), COL98_1 varchar(255), COL98_2 varchar(255), COL98_3 varchar(255), COL98_4 varchar(255), COL98_5 varchar(255), COL98_6 varchar(255), COL98_7 varchar(255), COL98_8 varchar(255), COL98_9 varchar(255), primary key (ID))
+alter table PERFTEST98 add constraint COL98_9PERFTEST97PERFTEST98 foreign key (COL98_9) references PERFTEST97(ID)
+create table PERFTEST99 (ID varchar(255) not null, COL99_0 varchar(255), COL99_1 varchar(255), COL99_2 varchar(255), COL99_3 varchar(255), COL99_4 varchar(255), COL99_5 varchar(255), COL99_6 varchar(255), COL99_7 varchar(255), COL99_8 varchar(255), COL99_9 varchar(255), primary key (ID))
+alter table PERFTEST99 add constraint COL99_9PERFTEST98PERFTEST99 foreign key (COL99_9) references PERFTEST98(ID)
+create table PERFTEST100 (ID varchar(255) not null, COL100_0 varchar(255), COL100_1 varchar(255), COL100_2 varchar(255), COL100_3 varchar(255), COL100_4 varchar(255), COL100_5 varchar(255), COL100_6 varchar(255), COL100_7 varchar(255), COL100_8 varchar(255), COL100_9 varchar(255), primary key (ID))
+alter table PERFTEST100 add constraint COL100_9PERFTEST99PERFTEST100 foreign key (COL100_9) references PERFTEST99(ID)
+create table PERFTEST101 (ID varchar(255) not null, COL101_0 varchar(255), COL101_1 varchar(255), COL101_2 varchar(255), COL101_3 varchar(255), COL101_4 varchar(255), COL101_5 varchar(255), COL101_6 varchar(255), COL101_7 varchar(255), COL101_8 varchar(255), COL101_9 varchar(255), primary key (ID))
+alter table PERFTEST101 add constraint COL101_9PERFTEST100PERFTEST101 foreign key (COL101_9) references PERFTEST100(ID)
+create table PERFTEST102 (ID varchar(255) not null, COL102_0 varchar(255), COL102_1 varchar(255), COL102_2 varchar(255), COL102_3 varchar(255), COL102_4 varchar(255), COL102_5 varchar(255), COL102_6 varchar(255), COL102_7 varchar(255), COL102_8 varchar(255), COL102_9 varchar(255), primary key (ID))
+alter table PERFTEST102 add constraint COL102_9PERFTEST101PERFTEST102 foreign key (COL102_9) references PERFTEST101(ID)
+create table PERFTEST103 (ID varchar(255) not null, COL103_0 varchar(255), COL103_1 varchar(255), COL103_2 varchar(255), COL103_3 varchar(255), COL103_4 varchar(255), COL103_5 varchar(255), COL103_6 varchar(255), COL103_7 varchar(255), COL103_8 varchar(255), COL103_9 varchar(255), primary key (ID))
+alter table PERFTEST103 add constraint COL103_9PERFTEST102PERFTEST103 foreign key (COL103_9) references PERFTEST102(ID)
+create table PERFTEST104 (ID varchar(255) not null, COL104_0 varchar(255), COL104_1 varchar(255), COL104_2 varchar(255), COL104_3 varchar(255), COL104_4 varchar(255), COL104_5 varchar(255), COL104_6 varchar(255), COL104_7 varchar(255), COL104_8 varchar(255), COL104_9 varchar(255), primary key (ID))
+alter table PERFTEST104 add constraint COL104_9PERFTEST103PERFTEST104 foreign key (COL104_9) references PERFTEST103(ID)
+create table PERFTEST105 (ID varchar(255) not null, COL105_0 varchar(255), COL105_1 varchar(255), COL105_2 varchar(255), COL105_3 varchar(255), COL105_4 varchar(255), COL105_5 varchar(255), COL105_6 varchar(255), COL105_7 varchar(255), COL105_8 varchar(255), COL105_9 varchar(255), primary key (ID))
+alter table PERFTEST105 add constraint COL105_9PERFTEST104PERFTEST105 foreign key (COL105_9) references PERFTEST104(ID)
+create table PERFTEST106 (ID varchar(255) not null, COL106_0 varchar(255), COL106_1 varchar(255), COL106_2 varchar(255), COL106_3 varchar(255), COL106_4 varchar(255), COL106_5 varchar(255), COL106_6 varchar(255), COL106_7 varchar(255), COL106_8 varchar(255), COL106_9 varchar(255), primary key (ID))
+alter table PERFTEST106 add constraint COL106_9PERFTEST105PERFTEST106 foreign key (COL106_9) references PERFTEST105(ID)
+create table PERFTEST107 (ID varchar(255) not null, COL107_0 varchar(255), COL107_1 varchar(255), COL107_2 varchar(255), COL107_3 varchar(255), COL107_4 varchar(255), COL107_5 varchar(255), COL107_6 varchar(255), COL107_7 varchar(255), COL107_8 varchar(255), COL107_9 varchar(255), primary key (ID))
+alter table PERFTEST107 add constraint COL107_9PERFTEST106PERFTEST107 foreign key (COL107_9) references PERFTEST106(ID)
+create table PERFTEST108 (ID varchar(255) not null, COL108_0 varchar(255), COL108_1 varchar(255), COL108_2 varchar(255), COL108_3 varchar(255), COL108_4 varchar(255), COL108_5 varchar(255), COL108_6 varchar(255), COL108_7 varchar(255), COL108_8 varchar(255), COL108_9 varchar(255), primary key (ID))
+alter table PERFTEST108 add constraint COL108_9PERFTEST107PERFTEST108 foreign key (COL108_9) references PERFTEST107(ID)
+create table PERFTEST109 (ID varchar(255) not null, COL109_0 varchar(255), COL109_1 varchar(255), COL109_2 varchar(255), COL109_3 varchar(255), COL109_4 varchar(255), COL109_5 varchar(255), COL109_6 varchar(255), COL109_7 varchar(255), COL109_8 varchar(255), COL109_9 varchar(255), primary key (ID))
+alter table PERFTEST109 add constraint COL109_9PERFTEST108PERFTEST109 foreign key (COL109_9) references PERFTEST108(ID)
+create table PERFTEST110 (ID varchar(255) not null, COL110_0 varchar(255), COL110_1 varchar(255), COL110_2 varchar(255), COL110_3 varchar(255), COL110_4 varchar(255), COL110_5 varchar(255), COL110_6 varchar(255), COL110_7 varchar(255), COL110_8 varchar(255), COL110_9 varchar(255), primary key (ID))
+alter table PERFTEST110 add constraint COL110_9PERFTEST109PERFTEST110 foreign key (COL110_9) references PERFTEST109(ID)
+create table PERFTEST111 (ID varchar(255) not null, COL111_0 varchar(255), COL111_1 varchar(255), COL111_2 varchar(255), COL111_3 varchar(255), COL111_4 varchar(255), COL111_5 varchar(255), COL111_6 varchar(255), COL111_7 varchar(255), COL111_8 varchar(255), COL111_9 varchar(255), primary key (ID))
+alter table PERFTEST111 add constraint COL111_9PERFTEST110PERFTEST111 foreign key (COL111_9) references PERFTEST110(ID)
+create table PERFTEST112 (ID varchar(255) not null, COL112_0 varchar(255), COL112_1 varchar(255), COL112_2 varchar(255), COL112_3 varchar(255), COL112_4 varchar(255), COL112_5 varchar(255), COL112_6 varchar(255), COL112_7 varchar(255), COL112_8 varchar(255), COL112_9 varchar(255), primary key (ID))
+alter table PERFTEST112 add constraint COL112_9PERFTEST111PERFTEST112 foreign key (COL112_9) references PERFTEST111(ID)
+create table PERFTEST113 (ID varchar(255) not null, COL113_0 varchar(255), COL113_1 varchar(255), COL113_2 varchar(255), COL113_3 varchar(255), COL113_4 varchar(255), COL113_5 varchar(255), COL113_6 varchar(255), COL113_7 varchar(255), COL113_8 varchar(255), COL113_9 varchar(255), primary key (ID))
+alter table PERFTEST113 add constraint COL113_9PERFTEST112PERFTEST113 foreign key (COL113_9) references PERFTEST112(ID)
+create table PERFTEST114 (ID varchar(255) not null, COL114_0 varchar(255), COL114_1 varchar(255), COL114_2 varchar(255), COL114_3 varchar(255), COL114_4 varchar(255), COL114_5 varchar(255), COL114_6 varchar(255), COL114_7 varchar(255), COL114_8 varchar(255), COL114_9 varchar(255), primary key (ID))
+alter table PERFTEST114 add constraint COL114_9PERFTEST113PERFTEST114 foreign key (COL114_9) references PERFTEST113(ID)
+create table PERFTEST115 (ID varchar(255) not null, COL115_0 varchar(255), COL115_1 varchar(255), COL115_2 varchar(255), COL115_3 varchar(255), COL115_4 varchar(255), COL115_5 varchar(255), COL115_6 varchar(255), COL115_7 varchar(255), COL115_8 varchar(255), COL115_9 varchar(255), primary key (ID))
+alter table PERFTEST115 add constraint COL115_9PERFTEST114PERFTEST115 foreign key (COL115_9) references PERFTEST114(ID)
+create table PERFTEST116 (ID varchar(255) not null, COL116_0 varchar(255), COL116_1 varchar(255), COL116_2 varchar(255), COL116_3 varchar(255), COL116_4 varchar(255), COL116_5 varchar(255), COL116_6 varchar(255), COL116_7 varchar(255), COL116_8 varchar(255), COL116_9 varchar(255), primary key (ID))
+alter table PERFTEST116 add constraint COL116_9PERFTEST115PERFTEST116 foreign key (COL116_9) references PERFTEST115(ID)
+create table PERFTEST117 (ID varchar(255) not null, COL117_0 varchar(255), COL117_1 varchar(255), COL117_2 varchar(255), COL117_3 varchar(255), COL117_4 varchar(255), COL117_5 varchar(255), COL117_6 varchar(255), COL117_7 varchar(255), COL117_8 varchar(255), COL117_9 varchar(255), primary key (ID))
+alter table PERFTEST117 add constraint COL117_9PERFTEST116PERFTEST117 foreign key (COL117_9) references PERFTEST116(ID)
+create table PERFTEST118 (ID varchar(255) not null, COL118_0 varchar(255), COL118_1 varchar(255), COL118_2 varchar(255), COL118_3 varchar(255), COL118_4 varchar(255), COL118_5 varchar(255), COL118_6 varchar(255), COL118_7 varchar(255), COL118_8 varchar(255), COL118_9 varchar(255), primary key (ID))
+alter table PERFTEST118 add constraint COL118_9PERFTEST117PERFTEST118 foreign key (COL118_9) references PERFTEST117(ID)
+create table PERFTEST119 (ID varchar(255) not null, COL119_0 varchar(255), COL119_1 varchar(255), COL119_2 varchar(255), COL119_3 varchar(255), COL119_4 varchar(255), COL119_5 varchar(255), COL119_6 varchar(255), COL119_7 varchar(255), COL119_8 varchar(255), COL119_9 varchar(255), primary key (ID))
+alter table PERFTEST119 add constraint COL119_9PERFTEST118PERFTEST119 foreign key (COL119_9) references PERFTEST118(ID)
+create table PERFTEST120 (ID varchar(255) not null, COL120_0 varchar(255), COL120_1 varchar(255), COL120_2 varchar(255), COL120_3 varchar(255), COL120_4 varchar(255), COL120_5 varchar(255), COL120_6 varchar(255), COL120_7 varchar(255), COL120_8 varchar(255), COL120_9 varchar(255), primary key (ID))
+alter table PERFTEST120 add constraint COL120_9PERFTEST119PERFTEST120 foreign key (COL120_9) references PERFTEST119(ID)
+create table PERFTEST121 (ID varchar(255) not null, COL121_0 varchar(255), COL121_1 varchar(255), COL121_2 varchar(255), COL121_3 varchar(255), COL121_4 varchar(255), COL121_5 varchar(255), COL121_6 varchar(255), COL121_7 varchar(255), COL121_8 varchar(255), COL121_9 varchar(255), primary key (ID))
+alter table PERFTEST121 add constraint COL121_9PERFTEST120PERFTEST121 foreign key (COL121_9) references PERFTEST120(ID)
+create table PERFTEST122 (ID varchar(255) not null, COL122_0 varchar(255), COL122_1 varchar(255), COL122_2 varchar(255), COL122_3 varchar(255), COL122_4 varchar(255), COL122_5 varchar(255), COL122_6 varchar(255), COL122_7 varchar(255), COL122_8 varchar(255), COL122_9 varchar(255), primary key (ID))
+alter table PERFTEST122 add constraint COL122_9PERFTEST121PERFTEST122 foreign key (COL122_9) references PERFTEST121(ID)
+create table PERFTEST123 (ID varchar(255) not null, COL123_0 varchar(255), COL123_1 varchar(255), COL123_2 varchar(255), COL123_3 varchar(255), COL123_4 varchar(255), COL123_5 varchar(255), COL123_6 varchar(255), COL123_7 varchar(255), COL123_8 varchar(255), COL123_9 varchar(255), primary key (ID))
+alter table PERFTEST123 add constraint COL123_9PERFTEST122PERFTEST123 foreign key (COL123_9) references PERFTEST122(ID)
+create table PERFTEST124 (ID varchar(255) not null, COL124_0 varchar(255), COL124_1 varchar(255), COL124_2 varchar(255), COL124_3 varchar(255), COL124_4 varchar(255), COL124_5 varchar(255), COL124_6 varchar(255), COL124_7 varchar(255), COL124_8 varchar(255), COL124_9 varchar(255), primary key (ID))
+alter table PERFTEST124 add constraint COL124_9PERFTEST123PERFTEST124 foreign key (COL124_9) references PERFTEST123(ID)
+create table PERFTEST125 (ID varchar(255) not null, COL125_0 varchar(255), COL125_1 varchar(255), COL125_2 varchar(255), COL125_3 varchar(255), COL125_4 varchar(255), COL125_5 varchar(255), COL125_6 varchar(255), COL125_7 varchar(255), COL125_8 varchar(255), COL125_9 varchar(255), primary key (ID))
+alter table PERFTEST125 add constraint COL125_9PERFTEST124PERFTEST125 foreign key (COL125_9) references PERFTEST124(ID)
+create table PERFTEST126 (ID varchar(255) not null, COL126_0 varchar(255), COL126_1 varchar(255), COL126_2 varchar(255), COL126_3 varchar(255), COL126_4 varchar(255), COL126_5 varchar(255), COL126_6 varchar(255), COL126_7 varchar(255), COL126_8 varchar(255), COL126_9 varchar(255), primary key (ID))
+alter table PERFTEST126 add constraint COL126_9PERFTEST125PERFTEST126 foreign key (COL126_9) references PERFTEST125(ID)
+create table PERFTEST127 (ID varchar(255) not null, COL127_0 varchar(255), COL127_1 varchar(255), COL127_2 varchar(255), COL127_3 varchar(255), COL127_4 varchar(255), COL127_5 varchar(255), COL127_6 varchar(255), COL127_7 varchar(255), COL127_8 varchar(255), COL127_9 varchar(255), primary key (ID))
+alter table PERFTEST127 add constraint COL127_9PERFTEST126PERFTEST127 foreign key (COL127_9) references PERFTEST126(ID)
+create table PERFTEST128 (ID varchar(255) not null, COL128_0 varchar(255), COL128_1 varchar(255), COL128_2 varchar(255), COL128_3 varchar(255), COL128_4 varchar(255), COL128_5 varchar(255), COL128_6 varchar(255), COL128_7 varchar(255), COL128_8 varchar(255), COL128_9 varchar(255), primary key (ID))
+alter table PERFTEST128 add constraint COL128_9PERFTEST127PERFTEST128 foreign key (COL128_9) references PERFTEST127(ID)
+create table PERFTEST129 (ID varchar(255) not null, COL129_0 varchar(255), COL129_1 varchar(255), COL129_2 varchar(255), COL129_3 varchar(255), COL129_4 varchar(255), COL129_5 varchar(255), COL129_6 varchar(255), COL129_7 varchar(255), COL129_8 varchar(255), COL129_9 varchar(255), primary key (ID))
+alter table PERFTEST129 add constraint COL129_9PERFTEST128PERFTEST129 foreign key (COL129_9) references PERFTEST128(ID)
+create table PERFTEST130 (ID varchar(255) not null, COL130_0 varchar(255), COL130_1 varchar(255), COL130_2 varchar(255), COL130_3 varchar(255), COL130_4 varchar(255), COL130_5 varchar(255), COL130_6 varchar(255), COL130_7 varchar(255), COL130_8 varchar(255), COL130_9 varchar(255), primary key (ID))
+alter table PERFTEST130 add constraint COL130_9PERFTEST129PERFTEST130 foreign key (COL130_9) references PERFTEST129(ID)
+create table PERFTEST131 (ID varchar(255) not null, COL131_0 varchar(255), COL131_1 varchar(255), COL131_2 varchar(255), COL131_3 varchar(255), COL131_4 varchar(255), COL131_5 varchar(255), COL131_6 varchar(255), COL131_7 varchar(255), COL131_8 varchar(255), COL131_9 varchar(255), primary key (ID))
+alter table PERFTEST131 add constraint COL131_9PERFTEST130PERFTEST131 foreign key (COL131_9) references PERFTEST130(ID)
+create table PERFTEST132 (ID varchar(255) not null, COL132_0 varchar(255), COL132_1 varchar(255), COL132_2 varchar(255), COL132_3 varchar(255), COL132_4 varchar(255), COL132_5 varchar(255), COL132_6 varchar(255), COL132_7 varchar(255), COL132_8 varchar(255), COL132_9 varchar(255), primary key (ID))
+alter table PERFTEST132 add constraint COL132_9PERFTEST131PERFTEST132 foreign key (COL132_9) references PERFTEST131(ID)
+create table PERFTEST133 (ID varchar(255) not null, COL133_0 varchar(255), COL133_1 varchar(255), COL133_2 varchar(255), COL133_3 varchar(255), COL133_4 varchar(255), COL133_5 varchar(255), COL133_6 varchar(255), COL133_7 varchar(255), COL133_8 varchar(255), COL133_9 varchar(255), primary key (ID))
+alter table PERFTEST133 add constraint COL133_9PERFTEST132PERFTEST133 foreign key (COL133_9) references PERFTEST132(ID)
+create table PERFTEST134 (ID varchar(255) not null, COL134_0 varchar(255), COL134_1 varchar(255), COL134_2 varchar(255), COL134_3 varchar(255), COL134_4 varchar(255), COL134_5 varchar(255), COL134_6 varchar(255), COL134_7 varchar(255), COL134_8 varchar(255), COL134_9 varchar(255), primary key (ID))
+alter table PERFTEST134 add constraint COL134_9PERFTEST133PERFTEST134 foreign key (COL134_9) references PERFTEST133(ID)
+create table PERFTEST135 (ID varchar(255) not null, COL135_0 varchar(255), COL135_1 varchar(255), COL135_2 varchar(255), COL135_3 varchar(255), COL135_4 varchar(255), COL135_5 varchar(255), COL135_6 varchar(255), COL135_7 varchar(255), COL135_8 varchar(255), COL135_9 varchar(255), primary key (ID))
+alter table PERFTEST135 add constraint COL135_9PERFTEST134PERFTEST135 foreign key (COL135_9) references PERFTEST134(ID)
+create table PERFTEST136 (ID varchar(255) not null, COL136_0 varchar(255), COL136_1 varchar(255), COL136_2 varchar(255), COL136_3 varchar(255), COL136_4 varchar(255), COL136_5 varchar(255), COL136_6 varchar(255), COL136_7 varchar(255), COL136_8 varchar(255), COL136_9 varchar(255), primary key (ID))
+alter table PERFTEST136 add constraint COL136_9PERFTEST135PERFTEST136 foreign key (COL136_9) references PERFTEST135(ID)
+create table PERFTEST137 (ID varchar(255) not null, COL137_0 varchar(255), COL137_1 varchar(255), COL137_2 varchar(255), COL137_3 varchar(255), COL137_4 varchar(255), COL137_5 varchar(255), COL137_6 varchar(255), COL137_7 varchar(255), COL137_8 varchar(255), COL137_9 varchar(255), primary key (ID))
+alter table PERFTEST137 add constraint COL137_9PERFTEST136PERFTEST137 foreign key (COL137_9) references PERFTEST136(ID)
+create table PERFTEST138 (ID varchar(255) not null, COL138_0 varchar(255), COL138_1 varchar(255), COL138_2 varchar(255), COL138_3 varchar(255), COL138_4 varchar(255), COL138_5 varchar(255), COL138_6 varchar(255), COL138_7 varchar(255), COL138_8 varchar(255), COL138_9 varchar(255), primary key (ID))
+alter table PERFTEST138 add constraint COL138_9PERFTEST137PERFTEST138 foreign key (COL138_9) references PERFTEST137(ID)
+create table PERFTEST139 (ID varchar(255) not null, COL139_0 varchar(255), COL139_1 varchar(255), COL139_2 varchar(255), COL139_3 varchar(255), COL139_4 varchar(255), COL139_5 varchar(255), COL139_6 varchar(255), COL139_7 varchar(255), COL139_8 varchar(255), COL139_9 varchar(255), primary key (ID))
+alter table PERFTEST139 add constraint COL139_9PERFTEST138PERFTEST139 foreign key (COL139_9) references PERFTEST138(ID)
+create table PERFTEST140 (ID varchar(255) not null, COL140_0 varchar(255), COL140_1 varchar(255), COL140_2 varchar(255), COL140_3 varchar(255), COL140_4 varchar(255), COL140_5 varchar(255), COL140_6 varchar(255), COL140_7 varchar(255), COL140_8 varchar(255), COL140_9 varchar(255), primary key (ID))
+alter table PERFTEST140 add constraint COL140_9PERFTEST139PERFTEST140 foreign key (COL140_9) references PERFTEST139(ID)
+create table PERFTEST141 (ID varchar(255) not null, COL141_0 varchar(255), COL141_1 varchar(255), COL141_2 varchar(255), COL141_3 varchar(255), COL141_4 varchar(255), COL141_5 varchar(255), COL141_6 varchar(255), COL141_7 varchar(255), COL141_8 varchar(255), COL141_9 varchar(255), primary key (ID))
+alter table PERFTEST141 add constraint COL141_9PERFTEST140PERFTEST141 foreign key (COL141_9) references PERFTEST140(ID)
+create table PERFTEST142 (ID varchar(255) not null, COL142_0 varchar(255), COL142_1 varchar(255), COL142_2 varchar(255), COL142_3 varchar(255), COL142_4 varchar(255), COL142_5 varchar(255), COL142_6 varchar(255), COL142_7 varchar(255), COL142_8 varchar(255), COL142_9 varchar(255), primary key (ID))
+alter table PERFTEST142 add constraint COL142_9PERFTEST141PERFTEST142 foreign key (COL142_9) references PERFTEST141(ID)
+create table PERFTEST143 (ID varchar(255) not null, COL143_0 varchar(255), COL143_1 varchar(255), COL143_2 varchar(255), COL143_3 varchar(255), COL143_4 varchar(255), COL143_5 varchar(255), COL143_6 varchar(255), COL143_7 varchar(255), COL143_8 varchar(255), COL143_9 varchar(255), primary key (ID))
+alter table PERFTEST143 add constraint COL143_9PERFTEST142PERFTEST143 foreign key (COL143_9) references PERFTEST142(ID)
+create table PERFTEST144 (ID varchar(255) not null, COL144_0 varchar(255), COL144_1 varchar(255), COL144_2 varchar(255), COL144_3 varchar(255), COL144_4 varchar(255), COL144_5 varchar(255), COL144_6 varchar(255), COL144_7 varchar(255), COL144_8 varchar(255), COL144_9 varchar(255), primary key (ID))
+alter table PERFTEST144 add constraint COL144_9PERFTEST143PERFTEST144 foreign key (COL144_9) references PERFTEST143(ID)
+create table PERFTEST145 (ID varchar(255) not null, COL145_0 varchar(255), COL145_1 varchar(255), COL145_2 varchar(255), COL145_3 varchar(255), COL145_4 varchar(255), COL145_5 varchar(255), COL145_6 varchar(255), COL145_7 varchar(255), COL145_8 varchar(255), COL145_9 varchar(255), primary key (ID))
+alter table PERFTEST145 add constraint COL145_9PERFTEST144PERFTEST145 foreign key (COL145_9) references PERFTEST144(ID)
+create table PERFTEST146 (ID varchar(255) not null, COL146_0 varchar(255), COL146_1 varchar(255), COL146_2 varchar(255), COL146_3 varchar(255), COL146_4 varchar(255), COL146_5 varchar(255), COL146_6 varchar(255), COL146_7 varchar(255), COL146_8 varchar(255), COL146_9 varchar(255), primary key (ID))
+alter table PERFTEST146 add constraint COL146_9PERFTEST145PERFTEST146 foreign key (COL146_9) references PERFTEST145(ID)
+create table PERFTEST147 (ID varchar(255) not null, COL147_0 varchar(255), COL147_1 varchar(255), COL147_2 varchar(255), COL147_3 varchar(255), COL147_4 varchar(255), COL147_5 varchar(255), COL147_6 varchar(255), COL147_7 varchar(255), COL147_8 varchar(255), COL147_9 varchar(255), primary key (ID))
+alter table PERFTEST147 add constraint COL147_9PERFTEST146PERFTEST147 foreign key (COL147_9) references PERFTEST146(ID)
+create table PERFTEST148 (ID varchar(255) not null, COL148_0 varchar(255), COL148_1 varchar(255), COL148_2 varchar(255), COL148_3 varchar(255), COL148_4 varchar(255), COL148_5 varchar(255), COL148_6 varchar(255), COL148_7 varchar(255), COL148_8 varchar(255), COL148_9 varchar(255), primary key (ID))
+alter table PERFTEST148 add constraint COL148_9PERFTEST147PERFTEST148 foreign key (COL148_9) references PERFTEST147(ID)
+create table PERFTEST149 (ID varchar(255) not null, COL149_0 varchar(255), COL149_1 varchar(255), COL149_2 varchar(255), COL149_3 varchar(255), COL149_4 varchar(255), COL149_5 varchar(255), COL149_6 varchar(255), COL149_7 varchar(255), COL149_8 varchar(255), COL149_9 varchar(255), primary key (ID))
+alter table PERFTEST149 add constraint COL149_9PERFTEST148PERFTEST149 foreign key (COL149_9) references PERFTEST148(ID)
+create table PERFTEST150 (ID varchar(255) not null, COL150_0 varchar(255), COL150_1 varchar(255), COL150_2 varchar(255), COL150_3 varchar(255), COL150_4 varchar(255), COL150_5 varchar(255), COL150_6 varchar(255), COL150_7 varchar(255), COL150_8 varchar(255), COL150_9 varchar(255), primary key (ID))
+alter table PERFTEST150 add constraint COL150_9PERFTEST149PERFTEST150 foreign key (COL150_9) references PERFTEST149(ID)
+create table PERFTEST151 (ID varchar(255) not null, COL151_0 varchar(255), COL151_1 varchar(255), COL151_2 varchar(255), COL151_3 varchar(255), COL151_4 varchar(255), COL151_5 varchar(255), COL151_6 varchar(255), COL151_7 varchar(255), COL151_8 varchar(255), COL151_9 varchar(255), primary key (ID))
+alter table PERFTEST151 add constraint COL151_9PERFTEST150PERFTEST151 foreign key (COL151_9) references PERFTEST150(ID)
+create table PERFTEST152 (ID varchar(255) not null, COL152_0 varchar(255), COL152_1 varchar(255), COL152_2 varchar(255), COL152_3 varchar(255), COL152_4 varchar(255), COL152_5 varchar(255), COL152_6 varchar(255), COL152_7 varchar(255), COL152_8 varchar(255), COL152_9 varchar(255), primary key (ID))
+alter table PERFTEST152 add constraint COL152_9PERFTEST151PERFTEST152 foreign key (COL152_9) references PERFTEST151(ID)
+create table PERFTEST153 (ID varchar(255) not null, COL153_0 varchar(255), COL153_1 varchar(255), COL153_2 varchar(255), COL153_3 varchar(255), COL153_4 varchar(255), COL153_5 varchar(255), COL153_6 varchar(255), COL153_7 varchar(255), COL153_8 varchar(255), COL153_9 varchar(255), primary key (ID))
+alter table PERFTEST153 add constraint COL153_9PERFTEST152PERFTEST153 foreign key (COL153_9) references PERFTEST152(ID)
+create table PERFTEST154 (ID varchar(255) not null, COL154_0 varchar(255), COL154_1 varchar(255), COL154_2 varchar(255), COL154_3 varchar(255), COL154_4 varchar(255), COL154_5 varchar(255), COL154_6 varchar(255), COL154_7 varchar(255), COL154_8 varchar(255), COL154_9 varchar(255), primary key (ID))
+alter table PERFTEST154 add constraint COL154_9PERFTEST153PERFTEST154 foreign key (COL154_9) references PERFTEST153(ID)
+create table PERFTEST155 (ID varchar(255) not null, COL155_0 varchar(255), COL155_1 varchar(255), COL155_2 varchar(255), COL155_3 varchar(255), COL155_4 varchar(255), COL155_5 varchar(255), COL155_6 varchar(255), COL155_7 varchar(255), COL155_8 varchar(255), COL155_9 varchar(255), primary key (ID))
+alter table PERFTEST155 add constraint COL155_9PERFTEST154PERFTEST155 foreign key (COL155_9) references PERFTEST154(ID)
+create table PERFTEST156 (ID varchar(255) not null, COL156_0 varchar(255), COL156_1 varchar(255), COL156_2 varchar(255), COL156_3 varchar(255), COL156_4 varchar(255), COL156_5 varchar(255), COL156_6 varchar(255), COL156_7 varchar(255), COL156_8 varchar(255), COL156_9 varchar(255), primary key (ID))
+alter table PERFTEST156 add constraint COL156_9PERFTEST155PERFTEST156 foreign key (COL156_9) references PERFTEST155(ID)
+create table PERFTEST157 (ID varchar(255) not null, COL157_0 varchar(255), COL157_1 varchar(255), COL157_2 varchar(255), COL157_3 varchar(255), COL157_4 varchar(255), COL157_5 varchar(255), COL157_6 varchar(255), COL157_7 varchar(255), COL157_8 varchar(255), COL157_9 varchar(255), primary key (ID))
+alter table PERFTEST157 add constraint COL157_9PERFTEST156PERFTEST157 foreign key (COL157_9) references PERFTEST156(ID)
+create table PERFTEST158 (ID varchar(255) not null, COL158_0 varchar(255), COL158_1 varchar(255), COL158_2 varchar(255), COL158_3 varchar(255), COL158_4 varchar(255), COL158_5 varchar(255), COL158_6 varchar(255), COL158_7 varchar(255), COL158_8 varchar(255), COL158_9 varchar(255), primary key (ID))
+alter table PERFTEST158 add constraint COL158_9PERFTEST157PERFTEST158 foreign key (COL158_9) references PERFTEST157(ID)
+create table PERFTEST159 (ID varchar(255) not null, COL159_0 varchar(255), COL159_1 varchar(255), COL159_2 varchar(255), COL159_3 varchar(255), COL159_4 varchar(255), COL159_5 varchar(255), COL159_6 varchar(255), COL159_7 varchar(255), COL159_8 varchar(255), COL159_9 varchar(255), primary key (ID))
+alter table PERFTEST159 add constraint COL159_9PERFTEST158PERFTEST159 foreign key (COL159_9) references PERFTEST158(ID)
+create table PERFTEST160 (ID varchar(255) not null, COL160_0 varchar(255), COL160_1 varchar(255), COL160_2 varchar(255), COL160_3 varchar(255), COL160_4 varchar(255), COL160_5 varchar(255), COL160_6 varchar(255), COL160_7 varchar(255), COL160_8 varchar(255), COL160_9 varchar(255), primary key (ID))
+alter table PERFTEST160 add constraint COL160_9PERFTEST159PERFTEST160 foreign key (COL160_9) references PERFTEST159(ID)
+create table PERFTEST161 (ID varchar(255) not null, COL161_0 varchar(255), COL161_1 varchar(255), COL161_2 varchar(255), COL161_3 varchar(255), COL161_4 varchar(255), COL161_5 varchar(255), COL161_6 varchar(255), COL161_7 varchar(255), COL161_8 varchar(255), COL161_9 varchar(255), primary key (ID))
+alter table PERFTEST161 add constraint COL161_9PERFTEST160PERFTEST161 foreign key (COL161_9) references PERFTEST160(ID)
+create table PERFTEST162 (ID varchar(255) not null, COL162_0 varchar(255), COL162_1 varchar(255), COL162_2 varchar(255), COL162_3 varchar(255), COL162_4 varchar(255), COL162_5 varchar(255), COL162_6 varchar(255), COL162_7 varchar(255), COL162_8 varchar(255), COL162_9 varchar(255), primary key (ID))
+alter table PERFTEST162 add constraint COL162_9PERFTEST161PERFTEST162 foreign key (COL162_9) references PERFTEST161(ID)
+create table PERFTEST163 (ID varchar(255) not null, COL163_0 varchar(255), COL163_1 varchar(255), COL163_2 varchar(255), COL163_3 varchar(255), COL163_4 varchar(255), COL163_5 varchar(255), COL163_6 varchar(255), COL163_7 varchar(255), COL163_8 varchar(255), COL163_9 varchar(255), primary key (ID))
+alter table PERFTEST163 add constraint COL163_9PERFTEST162PERFTEST163 foreign key (COL163_9) references PERFTEST162(ID)
+create table PERFTEST164 (ID varchar(255) not null, COL164_0 varchar(255), COL164_1 varchar(255), COL164_2 varchar(255), COL164_3 varchar(255), COL164_4 varchar(255), COL164_5 varchar(255), COL164_6 varchar(255), COL164_7 varchar(255), COL164_8 varchar(255), COL164_9 varchar(255), primary key (ID))
+alter table PERFTEST164 add constraint COL164_9PERFTEST163PERFTEST164 foreign key (COL164_9) references PERFTEST163(ID)
+create table PERFTEST165 (ID varchar(255) not null, COL165_0 varchar(255), COL165_1 varchar(255), COL165_2 varchar(255), COL165_3 varchar(255), COL165_4 varchar(255), COL165_5 varchar(255), COL165_6 varchar(255), COL165_7 varchar(255), COL165_8 varchar(255), COL165_9 varchar(255), primary key (ID))
+alter table PERFTEST165 add constraint COL165_9PERFTEST164PERFTEST165 foreign key (COL165_9) references PERFTEST164(ID)
+create table PERFTEST166 (ID varchar(255) not null, COL166_0 varchar(255), COL166_1 varchar(255), COL166_2 varchar(255), COL166_3 varchar(255), COL166_4 varchar(255), COL166_5 varchar(255), COL166_6 varchar(255), COL166_7 varchar(255), COL166_8 varchar(255), COL166_9 varchar(255), primary key (ID))
+alter table PERFTEST166 add constraint COL166_9PERFTEST165PERFTEST166 foreign key (COL166_9) references PERFTEST165(ID)
+create table PERFTEST167 (ID varchar(255) not null, COL167_0 varchar(255), COL167_1 varchar(255), COL167_2 varchar(255), COL167_3 varchar(255), COL167_4 varchar(255), COL167_5 varchar(255), COL167_6 varchar(255), COL167_7 varchar(255), COL167_8 varchar(255), COL167_9 varchar(255), primary key (ID))
+alter table PERFTEST167 add constraint COL167_9PERFTEST166PERFTEST167 foreign key (COL167_9) references PERFTEST166(ID)
+create table PERFTEST168 (ID varchar(255) not null, COL168_0 varchar(255), COL168_1 varchar(255), COL168_2 varchar(255), COL168_3 varchar(255), COL168_4 varchar(255), COL168_5 varchar(255), COL168_6 varchar(255), COL168_7 varchar(255), COL168_8 varchar(255), COL168_9 varchar(255), primary key (ID))
+alter table PERFTEST168 add constraint COL168_9PERFTEST167PERFTEST168 foreign key (COL168_9) references PERFTEST167(ID)
+create table PERFTEST169 (ID varchar(255) not null, COL169_0 varchar(255), COL169_1 varchar(255), COL169_2 varchar(255), COL169_3 varchar(255), COL169_4 varchar(255), COL169_5 varchar(255), COL169_6 varchar(255), COL169_7 varchar(255), COL169_8 varchar(255), COL169_9 varchar(255), primary key (ID))
+alter table PERFTEST169 add constraint COL169_9PERFTEST168PERFTEST169 foreign key (COL169_9) references PERFTEST168(ID)
+create table PERFTEST170 (ID varchar(255) not null, COL170_0 varchar(255), COL170_1 varchar(255), COL170_2 varchar(255), COL170_3 varchar(255), COL170_4 varchar(255), COL170_5 varchar(255), COL170_6 varchar(255), COL170_7 varchar(255), COL170_8 varchar(255), COL170_9 varchar(255), primary key (ID))
+alter table PERFTEST170 add constraint COL170_9PERFTEST169PERFTEST170 foreign key (COL170_9) references PERFTEST169(ID)
+create table PERFTEST171 (ID varchar(255) not null, COL171_0 varchar(255), COL171_1 varchar(255), COL171_2 varchar(255), COL171_3 varchar(255), COL171_4 varchar(255), COL171_5 varchar(255), COL171_6 varchar(255), COL171_7 varchar(255), COL171_8 varchar(255), COL171_9 varchar(255), primary key (ID))
+alter table PERFTEST171 add constraint COL171_9PERFTEST170PERFTEST171 foreign key (COL171_9) references PERFTEST170(ID)
+create table PERFTEST172 (ID varchar(255) not null, COL172_0 varchar(255), COL172_1 varchar(255), COL172_2 varchar(255), COL172_3 varchar(255), COL172_4 varchar(255), COL172_5 varchar(255), COL172_6 varchar(255), COL172_7 varchar(255), COL172_8 varchar(255), COL172_9 varchar(255), primary key (ID))
+alter table PERFTEST172 add constraint COL172_9PERFTEST171PERFTEST172 foreign key (COL172_9) references PERFTEST171(ID)
+create table PERFTEST173 (ID varchar(255) not null, COL173_0 varchar(255), COL173_1 varchar(255), COL173_2 varchar(255), COL173_3 varchar(255), COL173_4 varchar(255), COL173_5 varchar(255), COL173_6 varchar(255), COL173_7 varchar(255), COL173_8 varchar(255), COL173_9 varchar(255), primary key (ID))
+alter table PERFTEST173 add constraint COL173_9PERFTEST172PERFTEST173 foreign key (COL173_9) references PERFTEST172(ID)
+create table PERFTEST174 (ID varchar(255) not null, COL174_0 varchar(255), COL174_1 varchar(255), COL174_2 varchar(255), COL174_3 varchar(255), COL174_4 varchar(255), COL174_5 varchar(255), COL174_6 varchar(255), COL174_7 varchar(255), COL174_8 varchar(255), COL174_9 varchar(255), primary key (ID))
+alter table PERFTEST174 add constraint COL174_9PERFTEST173PERFTEST174 foreign key (COL174_9) references PERFTEST173(ID)
+create table PERFTEST175 (ID varchar(255) not null, COL175_0 varchar(255), COL175_1 varchar(255), COL175_2 varchar(255), COL175_3 varchar(255), COL175_4 varchar(255), COL175_5 varchar(255), COL175_6 varchar(255), COL175_7 varchar(255), COL175_8 varchar(255), COL175_9 varchar(255), primary key (ID))
+alter table PERFTEST175 add constraint COL175_9PERFTEST174PERFTEST175 foreign key (COL175_9) references PERFTEST174(ID)
+create table PERFTEST176 (ID varchar(255) not null, COL176_0 varchar(255), COL176_1 varchar(255), COL176_2 varchar(255), COL176_3 varchar(255), COL176_4 varchar(255), COL176_5 varchar(255), COL176_6 varchar(255), COL176_7 varchar(255), COL176_8 varchar(255), COL176_9 varchar(255), primary key (ID))
+alter table PERFTEST176 add constraint COL176_9PERFTEST175PERFTEST176 foreign key (COL176_9) references PERFTEST175(ID)
+create table PERFTEST177 (ID varchar(255) not null, COL177_0 varchar(255), COL177_1 varchar(255), COL177_2 varchar(255), COL177_3 varchar(255), COL177_4 varchar(255), COL177_5 varchar(255), COL177_6 varchar(255), COL177_7 varchar(255), COL177_8 varchar(255), COL177_9 varchar(255), primary key (ID))
+alter table PERFTEST177 add constraint COL177_9PERFTEST176PERFTEST177 foreign key (COL177_9) references PERFTEST176(ID)
+create table PERFTEST178 (ID varchar(255) not null, COL178_0 varchar(255), COL178_1 varchar(255), COL178_2 varchar(255), COL178_3 varchar(255), COL178_4 varchar(255), COL178_5 varchar(255), COL178_6 varchar(255), COL178_7 varchar(255), COL178_8 varchar(255), COL178_9 varchar(255), primary key (ID))
+alter table PERFTEST178 add constraint COL178_9PERFTEST177PERFTEST178 foreign key (COL178_9) references PERFTEST177(ID)
+create table PERFTEST179 (ID varchar(255) not null, COL179_0 varchar(255), COL179_1 varchar(255), COL179_2 varchar(255), COL179_3 varchar(255), COL179_4 varchar(255), COL179_5 varchar(255), COL179_6 varchar(255), COL179_7 varchar(255), COL179_8 varchar(255), COL179_9 varchar(255), primary key (ID))
+alter table PERFTEST179 add constraint COL179_9PERFTEST178PERFTEST179 foreign key (COL179_9) references PERFTEST178(ID)
+create table PERFTEST180 (ID varchar(255) not null, COL180_0 varchar(255), COL180_1 varchar(255), COL180_2 varchar(255), COL180_3 varchar(255), COL180_4 varchar(255), COL180_5 varchar(255), COL180_6 varchar(255), COL180_7 varchar(255), COL180_8 varchar(255), COL180_9 varchar(255), primary key (ID))
+alter table PERFTEST180 add constraint COL180_9PERFTEST179PERFTEST180 foreign key (COL180_9) references PERFTEST179(ID)
+create table PERFTEST181 (ID varchar(255) not null, COL181_0 varchar(255), COL181_1 varchar(255), COL181_2 varchar(255), COL181_3 varchar(255), COL181_4 varchar(255), COL181_5 varchar(255), COL181_6 varchar(255), COL181_7 varchar(255), COL181_8 varchar(255), COL181_9 varchar(255), primary key (ID))
+alter table PERFTEST181 add constraint COL181_9PERFTEST180PERFTEST181 foreign key (COL181_9) references PERFTEST180(ID)
+create table PERFTEST182 (ID varchar(255) not null, COL182_0 varchar(255), COL182_1 varchar(255), COL182_2 varchar(255), COL182_3 varchar(255), COL182_4 varchar(255), COL182_5 varchar(255), COL182_6 varchar(255), COL182_7 varchar(255), COL182_8 varchar(255), COL182_9 varchar(255), primary key (ID))
+alter table PERFTEST182 add constraint COL182_9PERFTEST181PERFTEST182 foreign key (COL182_9) references PERFTEST181(ID)
+create table PERFTEST183 (ID varchar(255) not null, COL183_0 varchar(255), COL183_1 varchar(255), COL183_2 varchar(255), COL183_3 varchar(255), COL183_4 varchar(255), COL183_5 varchar(255), COL183_6 varchar(255), COL183_7 varchar(255), COL183_8 varchar(255), COL183_9 varchar(255), primary key (ID))
+alter table PERFTEST183 add constraint COL183_9PERFTEST182PERFTEST183 foreign key (COL183_9) references PERFTEST182(ID)
+create table PERFTEST184 (ID varchar(255) not null, COL184_0 varchar(255), COL184_1 varchar(255), COL184_2 varchar(255), COL184_3 varchar(255), COL184_4 varchar(255), COL184_5 varchar(255), COL184_6 varchar(255), COL184_7 varchar(255), COL184_8 varchar(255), COL184_9 varchar(255), primary key (ID))
+alter table PERFTEST184 add constraint COL184_9PERFTEST183PERFTEST184 foreign key (COL184_9) references PERFTEST183(ID)
+create table PERFTEST185 (ID varchar(255) not null, COL185_0 varchar(255), COL185_1 varchar(255), COL185_2 varchar(255), COL185_3 varchar(255), COL185_4 varchar(255), COL185_5 varchar(255), COL185_6 varchar(255), COL185_7 varchar(255), COL185_8 varchar(255), COL185_9 varchar(255), primary key (ID))
+alter table PERFTEST185 add constraint COL185_9PERFTEST184PERFTEST185 foreign key (COL185_9) references PERFTEST184(ID)
+create table PERFTEST186 (ID varchar(255) not null, COL186_0 varchar(255), COL186_1 varchar(255), COL186_2 varchar(255), COL186_3 varchar(255), COL186_4 varchar(255), COL186_5 varchar(255), COL186_6 varchar(255), COL186_7 varchar(255), COL186_8 varchar(255), COL186_9 varchar(255), primary key (ID))
+alter table PERFTEST186 add constraint COL186_9PERFTEST185PERFTEST186 foreign key (COL186_9) references PERFTEST185(ID)
+create table PERFTEST187 (ID varchar(255) not null, COL187_0 varchar(255), COL187_1 varchar(255), COL187_2 varchar(255), COL187_3 varchar(255), COL187_4 varchar(255), COL187_5 varchar(255), COL187_6 varchar(255), COL187_7 varchar(255), COL187_8 varchar(255), COL187_9 varchar(255), primary key (ID))
+alter table PERFTEST187 add constraint COL187_9PERFTEST186PERFTEST187 foreign key (COL187_9) references PERFTEST186(ID)
+create table PERFTEST188 (ID varchar(255) not null, COL188_0 varchar(255), COL188_1 varchar(255), COL188_2 varchar(255), COL188_3 varchar(255), COL188_4 varchar(255), COL188_5 varchar(255), COL188_6 varchar(255), COL188_7 varchar(255), COL188_8 varchar(255), COL188_9 varchar(255), primary key (ID))
+alter table PERFTEST188 add constraint COL188_9PERFTEST187PERFTEST188 foreign key (COL188_9) references PERFTEST187(ID)
+create table PERFTEST189 (ID varchar(255) not null, COL189_0 varchar(255), COL189_1 varchar(255), COL189_2 varchar(255), COL189_3 varchar(255), COL189_4 varchar(255), COL189_5 varchar(255), COL189_6 varchar(255), COL189_7 varchar(255), COL189_8 varchar(255), COL189_9 varchar(255), primary key (ID))
+alter table PERFTEST189 add constraint COL189_9PERFTEST188PERFTEST189 foreign key (COL189_9) references PERFTEST188(ID)
+create table PERFTEST190 (ID varchar(255) not null, COL190_0 varchar(255), COL190_1 varchar(255), COL190_2 varchar(255), COL190_3 varchar(255), COL190_4 varchar(255), COL190_5 varchar(255), COL190_6 varchar(255), COL190_7 varchar(255), COL190_8 varchar(255), COL190_9 varchar(255), primary key (ID))
+alter table PERFTEST190 add constraint COL190_9PERFTEST189PERFTEST190 foreign key (COL190_9) references PERFTEST189(ID)
+create table PERFTEST191 (ID varchar(255) not null, COL191_0 varchar(255), COL191_1 varchar(255), COL191_2 varchar(255), COL191_3 varchar(255), COL191_4 varchar(255), COL191_5 varchar(255), COL191_6 varchar(255), COL191_7 varchar(255), COL191_8 varchar(255), COL191_9 varchar(255), primary key (ID))
+alter table PERFTEST191 add constraint COL191_9PERFTEST190PERFTEST191 foreign key (COL191_9) references PERFTEST190(ID)
+create table PERFTEST192 (ID varchar(255) not null, COL192_0 varchar(255), COL192_1 varchar(255), COL192_2 varchar(255), COL192_3 varchar(255), COL192_4 varchar(255), COL192_5 varchar(255), COL192_6 varchar(255), COL192_7 varchar(255), COL192_8 varchar(255), COL192_9 varchar(255), primary key (ID))
+alter table PERFTEST192 add constraint COL192_9PERFTEST191PERFTEST192 foreign key (COL192_9) references PERFTEST191(ID)
+create table PERFTEST193 (ID varchar(255) not null, COL193_0 varchar(255), COL193_1 varchar(255), COL193_2 varchar(255), COL193_3 varchar(255), COL193_4 varchar(255), COL193_5 varchar(255), COL193_6 varchar(255), COL193_7 varchar(255), COL193_8 varchar(255), COL193_9 varchar(255), primary key (ID))
+alter table PERFTEST193 add constraint COL193_9PERFTEST192PERFTEST193 foreign key (COL193_9) references PERFTEST192(ID)
+create table PERFTEST194 (ID varchar(255) not null, COL194_0 varchar(255), COL194_1 varchar(255), COL194_2 varchar(255), COL194_3 varchar(255), COL194_4 varchar(255), COL194_5 varchar(255), COL194_6 varchar(255), COL194_7 varchar(255), COL194_8 varchar(255), COL194_9 varchar(255), primary key (ID))
+alter table PERFTEST194 add constraint COL194_9PERFTEST193PERFTEST194 foreign key (COL194_9) references PERFTEST193(ID)
+create table PERFTEST195 (ID varchar(255) not null, COL195_0 varchar(255), COL195_1 varchar(255), COL195_2 varchar(255), COL195_3 varchar(255), COL195_4 varchar(255), COL195_5 varchar(255), COL195_6 varchar(255), COL195_7 varchar(255), COL195_8 varchar(255), COL195_9 varchar(255), primary key (ID))
+alter table PERFTEST195 add constraint COL195_9PERFTEST194PERFTEST195 foreign key (COL195_9) references PERFTEST194(ID)
+create table PERFTEST196 (ID varchar(255) not null, COL196_0 varchar(255), COL196_1 varchar(255), COL196_2 varchar(255), COL196_3 varchar(255), COL196_4 varchar(255), COL196_5 varchar(255), COL196_6 varchar(255), COL196_7 varchar(255), COL196_8 varchar(255), COL196_9 varchar(255), primary key (ID))
+alter table PERFTEST196 add constraint COL196_9PERFTEST195PERFTEST196 foreign key (COL196_9) references PERFTEST195(ID)
+create table PERFTEST197 (ID varchar(255) not null, COL197_0 varchar(255), COL197_1 varchar(255), COL197_2 varchar(255), COL197_3 varchar(255), COL197_4 varchar(255), COL197_5 varchar(255), COL197_6 varchar(255), COL197_7 varchar(255), COL197_8 varchar(255), COL197_9 varchar(255), primary key (ID))
+alter table PERFTEST197 add constraint COL197_9PERFTEST196PERFTEST197 foreign key (COL197_9) references PERFTEST196(ID)
+create table PERFTEST198 (ID varchar(255) not null, COL198_0 varchar(255), COL198_1 varchar(255), COL198_2 varchar(255), COL198_3 varchar(255), COL198_4 varchar(255), COL198_5 varchar(255), COL198_6 varchar(255), COL198_7 varchar(255), COL198_8 varchar(255), COL198_9 varchar(255), primary key (ID))
+alter table PERFTEST198 add constraint COL198_9PERFTEST197PERFTEST198 foreign key (COL198_9) references PERFTEST197(ID)
+create table PERFTEST199 (ID varchar(255) not null, COL199_0 varchar(255), COL199_1 varchar(255), COL199_2 varchar(255), COL199_3 varchar(255), COL199_4 varchar(255), COL199_5 varchar(255), COL199_6 varchar(255), COL199_7 varchar(255), COL199_8 varchar(255), COL199_9 varchar(255), primary key (ID))
+alter table PERFTEST199 add constraint COL199_9PERFTEST198PERFTEST199 foreign key (COL199_9) references PERFTEST198(ID)
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Performance/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Performance/drop.sql
new file mode 100644
index 000000000000..b1f159d48cbd
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Performance/drop.sql
@@ -0,0 +1,217 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+drop table PERFTEST199
+drop table PERFTEST198
+drop table PERFTEST197
+drop table PERFTEST196
+drop table PERFTEST195
+drop table PERFTEST194
+drop table PERFTEST193
+drop table PERFTEST192
+drop table PERFTEST191
+drop table PERFTEST190
+drop table PERFTEST189
+drop table PERFTEST188
+drop table PERFTEST187
+drop table PERFTEST186
+drop table PERFTEST185
+drop table PERFTEST184
+drop table PERFTEST183
+drop table PERFTEST182
+drop table PERFTEST181
+drop table PERFTEST180
+drop table PERFTEST179
+drop table PERFTEST178
+drop table PERFTEST177
+drop table PERFTEST176
+drop table PERFTEST175
+drop table PERFTEST174
+drop table PERFTEST173
+drop table PERFTEST172
+drop table PERFTEST171
+drop table PERFTEST170
+drop table PERFTEST169
+drop table PERFTEST168
+drop table PERFTEST167
+drop table PERFTEST166
+drop table PERFTEST165
+drop table PERFTEST164
+drop table PERFTEST163
+drop table PERFTEST162
+drop table PERFTEST161
+drop table PERFTEST160
+drop table PERFTEST159
+drop table PERFTEST158
+drop table PERFTEST157
+drop table PERFTEST156
+drop table PERFTEST155
+drop table PERFTEST154
+drop table PERFTEST153
+drop table PERFTEST152
+drop table PERFTEST151
+drop table PERFTEST150
+drop table PERFTEST149
+drop table PERFTEST148
+drop table PERFTEST147
+drop table PERFTEST146
+drop table PERFTEST145
+drop table PERFTEST144
+drop table PERFTEST143
+drop table PERFTEST142
+drop table PERFTEST141
+drop table PERFTEST140
+drop table PERFTEST139
+drop table PERFTEST138
+drop table PERFTEST137
+drop table PERFTEST136
+drop table PERFTEST135
+drop table PERFTEST134
+drop table PERFTEST133
+drop table PERFTEST132
+drop table PERFTEST131
+drop table PERFTEST130
+drop table PERFTEST129
+drop table PERFTEST128
+drop table PERFTEST127
+drop table PERFTEST126
+drop table PERFTEST125
+drop table PERFTEST124
+drop table PERFTEST123
+drop table PERFTEST122
+drop table PERFTEST121
+drop table PERFTEST120
+drop table PERFTEST119
+drop table PERFTEST118
+drop table PERFTEST117
+drop table PERFTEST116
+drop table PERFTEST115
+drop table PERFTEST114
+drop table PERFTEST113
+drop table PERFTEST112
+drop table PERFTEST111
+drop table PERFTEST110
+drop table PERFTEST109
+drop table PERFTEST108
+drop table PERFTEST107
+drop table PERFTEST106
+drop table PERFTEST105
+drop table PERFTEST104
+drop table PERFTEST103
+drop table PERFTEST102
+drop table PERFTEST101
+drop table PERFTEST100
+drop table PERFTEST99
+drop table PERFTEST98
+drop table PERFTEST97
+drop table PERFTEST96
+drop table PERFTEST95
+drop table PERFTEST94
+drop table PERFTEST93
+drop table PERFTEST92
+drop table PERFTEST91
+drop table PERFTEST90
+drop table PERFTEST89
+drop table PERFTEST88
+drop table PERFTEST87
+drop table PERFTEST86
+drop table PERFTEST85
+drop table PERFTEST84
+drop table PERFTEST83
+drop table PERFTEST82
+drop table PERFTEST81
+drop table PERFTEST80
+drop table PERFTEST79
+drop table PERFTEST78
+drop table PERFTEST77
+drop table PERFTEST76
+drop table PERFTEST75
+drop table PERFTEST74
+drop table PERFTEST73
+drop table PERFTEST72
+drop table PERFTEST71
+drop table PERFTEST70
+drop table PERFTEST69
+drop table PERFTEST68
+drop table PERFTEST67
+drop table PERFTEST66
+drop table PERFTEST65
+drop table PERFTEST64
+drop table PERFTEST63
+drop table PERFTEST62
+drop table PERFTEST61
+drop table PERFTEST60
+drop table PERFTEST59
+drop table PERFTEST58
+drop table PERFTEST57
+drop table PERFTEST56
+drop table PERFTEST55
+drop table PERFTEST54
+drop table PERFTEST53
+drop table PERFTEST52
+drop table PERFTEST51
+drop table PERFTEST50
+drop table PERFTEST49
+drop table PERFTEST48
+drop table PERFTEST47
+drop table PERFTEST46
+drop table PERFTEST45
+drop table PERFTEST44
+drop table PERFTEST43
+drop table PERFTEST42
+drop table PERFTEST41
+drop table PERFTEST40
+drop table PERFTEST39
+drop table PERFTEST38
+drop table PERFTEST37
+drop table PERFTEST36
+drop table PERFTEST35
+drop table PERFTEST34
+drop table PERFTEST33
+drop table PERFTEST32
+drop table PERFTEST31
+drop table PERFTEST30
+drop table PERFTEST29
+drop table PERFTEST28
+drop table PERFTEST27
+drop table PERFTEST26
+drop table PERFTEST25
+drop table PERFTEST24
+drop table PERFTEST23
+drop table PERFTEST22
+drop table PERFTEST21
+drop table PERFTEST20
+drop table PERFTEST19
+drop table PERFTEST18
+drop table PERFTEST17
+drop table PERFTEST16
+drop table PERFTEST15
+drop table PERFTEST14
+drop table PERFTEST13
+drop table PERFTEST12
+drop table PERFTEST11
+drop table PERFTEST10
+drop table PERFTEST9
+drop table PERFTEST8
+drop table PERFTEST7
+drop table PERFTEST6
+drop table PERFTEST5
+drop table PERFTEST4
+drop table PERFTEST3
+drop table PERFTEST2
+drop table PERFTEST1
+drop table PERFTEST0
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/create.sql
new file mode 100644
index 000000000000..c32e75109548
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE ORDERS (ID INT NOT NULL, NAME VARCHAR(20), PRIMARY KEY (ID))
+CREATE TABLE ITEM  (CHILD_ID INT NOT NULL, NAME VARCHAR(50), ORDER_ID INT, RELATED_ORDER_ID INT, PRIMARY KEY (CHILD_ID), FOREIGN KEY (ORDER_ID) REFERENCES ORDERS(ID), FOREIGN KEY (RELATED_ORDER_ID) REFERENCES ORDERS(ID) )
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/drop.sql
new file mode 100644
index 000000000000..8394b2bb9477
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/PersistentClasses/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE ITEM
+DROP TABLE ORDERS				
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/badforeignkeytest.reveng.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/badforeignkeytest.reveng.xml
new file mode 100644
index 000000000000..0271b1867661
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/badforeignkeytest.reveng.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-reverse-engineering SYSTEM "https://hibernate.org/dtd/hibernate-reverse-engineering-3.0.dtd" >
+<hibernate-reverse-engineering>
+
+	<table name="WORKS_ON">
+    <!-- defining a constraint that is already in the database -->
+     <foreign-key constraint-name="WORKSON_EMPLOYEE" foreign-table="EMPLOYEE">
+	    	<column-ref local-column="employee_id" foreign-column="id"/>
+	  </foreign-key> 
+	</table>
+
+</hibernate-reverse-engineering>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/create.sql
new file mode 100644
index 000000000000..342a7522786a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/create.sql
@@ -0,0 +1,25 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE PROJECT ( PROJECT_ID INT NOT NULL, NAME VARCHAR(50), TEAM_LEAD INT, PRIMARY KEY (PROJECT_ID) )
+CREATE TABLE EMPLOYEE ( ID INT NOT NULL, NAME VARCHAR(50), MANAGER_ID INT, PRIMARY KEY (ID), CONSTRAINT EMPLOYEE_MANAGER FOREIGN KEY (MANAGER_ID) REFERENCES EMPLOYEE(ID))
+CREATE TABLE WORKS_ON ( PROJECT_ID INT NOT NULL, EMPLOYEE_ID INT NOT NULL, START_DATE DATE, END_DATE DATE, PRIMARY KEY (PROJECT_ID, EMPLOYEE_ID), CONSTRAINT WORKSON_EMPLOYEE FOREIGN KEY (EMPLOYEE_ID) REFERENCES EMPLOYEE(ID), FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) )
+CREATE TABLE PERSON ( PERSON_ID INT NOT NULL, NAME VARCHAR(50), PRIMARY KEY (PERSON_ID) )
+CREATE TABLE ADDRESS_PERSON ( ADDRESS_ID INT NOT NULL, NAME VARCHAR(50), PRIMARY KEY (ADDRESS_ID), CONSTRAINT TO_PERSON FOREIGN KEY (ADDRESS_ID) REFERENCES PERSON(PERSON_ID))
+CREATE TABLE MULTI_PERSON ( PERSON_ID INT NOT NULL, PERSON_COMPID INT NOT NULL, NAME VARCHAR(50), PRIMARY KEY (PERSON_ID, PERSON_COMPID) )
+CREATE TABLE ADDRESS_MULTI_PERSON ( ADDRESS_ID INT NOT NULL, ADDRESS_COMPID INT NOT NULL, NAME VARCHAR(50), PRIMARY KEY (ADDRESS_ID, ADDRESS_COMPID), CONSTRAINT TO_MULTI_PERSON FOREIGN KEY (ADDRESS_ID, ADDRESS_COMPID) REFERENCES MULTI_PERSON(PERSON_ID, PERSON_COMPID))
+ALTER TABLE PROJECT ADD CONSTRAINT PROJECT_MANAGER FOREIGN KEY (TEAM_LEAD) REFERENCES EMPLOYEE(ID)
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/drop.sql
new file mode 100644
index 000000000000..75185cf5e770
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/drop.sql
@@ -0,0 +1,25 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+ALTER TABLE PROJECT DROP CONSTRAINT PROJECT_MANAGER
+DROP TABLE WORKS_ON
+DROP TABLE EMPLOYEE
+DROP TABLE PROJECT
+DROP TABLE ADDRESS_PERSON
+DROP TABLE PERSON
+DROP TABLE ADDRESS_MULTI_PERSON
+DROP TABLE MULTI_PERSON
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/foreignkeytest.reveng.xml b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/foreignkeytest.reveng.xml
new file mode 100644
index 000000000000..808f070877bf
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/RevEngForeignKey/foreignkeytest.reveng.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-reverse-engineering SYSTEM "https://hibernate.org/dtd/hibernate-reverse-engineering-3.0.dtd" >
+<hibernate-reverse-engineering>
+
+<!-- This one assumes set and many-to-one is exclude=false -->
+
+
+    <table name="EMPLOYEE">
+		<foreign-key constraint-name="EMPLOYEE_MANAGER"> 
+			<many-to-one property="manager" cascade="all" update="false" insert="false" fetch="join"/>
+			<set exclude="true"/>
+		</foreign-key>
+	</table> 
+	
+	<table name="PROJECT">
+	    <foreign-key constraint-name="PROJECT_MANAGER">
+	    	<many-to-one exclude="true"/>
+	    	<set property="managedProjects" cascade="delete, update"/>
+	    </foreign-key>
+	</table>	
+	
+	<table name="ADDRESS_PERSON">
+	    <foreign-key constraint-name="TO_PERSON">
+	    	<one-to-one exclude="true"/>
+	    	<inverse-one-to-one exclude="true"/>
+	    </foreign-key>
+	</table>
+	
+	<table name="ADDRESS_MULTI_PERSON">
+	    <foreign-key constraint-name="TO_MULTI_PERSON">
+	    	<one-to-one property="renamedOne" exclude="false" cascade="delete"/>
+	    	<inverse-one-to-one property="renamedInversedOne" exclude="false" cascade="update" fetch="join"/>
+	    </foreign-key>
+	</table>
+	
+</hibernate-reverse-engineering>
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/SearchEscapeString/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/SearchEscapeString/create.sql
new file mode 100644
index 000000000000..3b850261af31
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/SearchEscapeString/create.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE B_TAB ( A INT NOT NULL, NAME VARCHAR(20), PRIMARY KEY (A)  )
+CREATE TABLE B2TAB ( A INT NOT NULL, NAME VARCHAR(20), PRIMARY KEY (A)  )
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/SearchEscapeString/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/SearchEscapeString/drop.sql
new file mode 100644
index 000000000000..806b0a9933a1
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/SearchEscapeString/drop.sql
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE B_TAB
+DROP TABLE B2TAB
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/TernarySchema/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/TernarySchema/create.sql
new file mode 100644
index 000000000000..4054e65c06e1
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/TernarySchema/create.sql
@@ -0,0 +1,29 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE SCHEMA HTT
+CREATE SCHEMA OTHERSCHEMA 
+CREATE SCHEMA THIRDSCHEMA 
+CREATE TABLE HTT.MEMBER ( ID INT NOT NULL, NAME VARCHAR(20), PRIMARY KEY(ID))
+CREATE TABLE OTHERSCHEMA.ROLE ( ID INT NOT NULL, NAME VARCHAR(20), PRIMARY KEY(ID))
+CREATE TABLE THIRDSCHEMA.MEMBERROLE ( MEMBERID INT NOT NULL, ROLEID INT NOT NULL, PRIMARY KEY(MEMBERID, ROLEID))
+ALTER TABLE THIRDSCHEMA.MEMBERROLE ADD CONSTRAINT TOROLES FOREIGN KEY (ROLEID) REFERENCES OTHERSCHEMA.ROLE(ID)
+ALTER TABLE THIRDSCHEMA.MEMBERROLE ADD CONSTRAINT TOUSERS FOREIGN KEY (MEMBERID) REFERENCES HTT.MEMBER(ID)
+CREATE TABLE HTT.PLAINROLE ( ID INT NOT NULL, NAME VARCHAR(20), PRIMARY KEY(ID))
+CREATE TABLE HTT.PLAINMEMBERROLE ( MEMBERID INT NOT NULL, ROLEID INT NOT NULL, PRIMARY KEY(MEMBERID, ROLEID))
+ALTER TABLE HTT.PLAINMEMBERROLE ADD CONSTRAINT PLAINTOROLES FOREIGN KEY (ROLEID) REFERENCES HTT.PLAINROLE(ID)
+ALTER TABLE HTT.PLAINMEMBERROLE ADD CONSTRAINT PLAINTOMEMBERS FOREIGN KEY (MEMBERID) REFERENCES HTT.MEMBER(ID)
\ No newline at end of file
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/TernarySchema/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/TernarySchema/drop.sql
new file mode 100644
index 000000000000..f6edf44a5c8a
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/TernarySchema/drop.sql
@@ -0,0 +1,25 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE HTT.PLAINMEMBERROLE
+DROP TABLE HTT.PLAINROLE
+DROP TABLE THIRDSCHEMA.MEMBERROLE
+DROP TABLE HTT.MEMBER
+DROP TABLE OTHERSCHEMA.ROLE
+DROP SCHEMA OTHERSCHEMA
+DROP SCHEMA THIRDSCHEMA
+DROP SCHEMA HTT
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Versioning/create.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Versioning/create.sql
new file mode 100644
index 000000000000..9ad7f92aaba5
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Versioning/create.sql
@@ -0,0 +1,21 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+CREATE TABLE WITH_VERSION (ONE INT, TWO INT, VERSION INT, NAME VARCHAR(256), PRIMARY KEY (ONE))
+CREATE TABLE NO_VERSION (ONE INT, TWO INT, NAME VARCHAR(256), PRIMARY KEY (TWO))
+CREATE TABLE WITH_REAL_TIMESTAMP (ONE INT, TWO INT, DBTIMESTAMP TIMESTAMP, NAME VARCHAR(256), PRIMARY KEY (ONE))
+CREATE TABLE WITH_FAKE_TIMESTAMP (ONE INT, TWO INT, DBTIMESTAMP INT, NAME VARCHAR(256), PRIMARY KEY (ONE))
diff --git a/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Versioning/drop.sql b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Versioning/drop.sql
new file mode 100644
index 000000000000..81b82ba28c9f
--- /dev/null
+++ b/tooling/hibernate-reveng/src/test/resources/org/hibernate/tool/reveng/jdbc2cfg/Versioning/drop.sql
@@ -0,0 +1,21 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+DROP TABLE WITH_VERSION
+DROP TABLE NO_VERSION
+DROP TABLE WITH_REAL_TIMESTAMP
+DROP TABLE WITH_FAKE_TIMESTAMP
diff --git a/tooling/metamodel-generator/hibernate-processor.gradle b/tooling/metamodel-generator/hibernate-processor.gradle
index 78ce0fde9b79..8238de5eebe1 100644
--- a/tooling/metamodel-generator/hibernate-processor.gradle
+++ b/tooling/metamodel-generator/hibernate-processor.gradle
@@ -62,6 +62,11 @@ dependencies {
     jakartaDataImplementation "jakarta.data:jakarta.data-api:1.0.0"
 	jakartaDataImplementation "org.hibernate.reactive:hibernate-reactive-core:3.0.1.Final"
 	jakartaDataImplementation "io.quarkus:quarkus-hibernate-orm-panache:3.24.1"
+
+	// work-around for Gradle bug: https://github.com/gradle/gradle/issues/37146
+	quarkusOrmPanacheCompileOnly project( ':hibernate-graalvm' )
+	quarkusHrPanacheCompileOnly project( ':hibernate-graalvm' )
+	jakartaDataCompileOnly project( ':hibernate-graalvm' )
 }
 
 // The source set gets a custom configuration which extends the normal test implementation config
@@ -118,6 +123,11 @@ test.dependsOn quarkusHrPanacheTestTask
 test.dependsOn quarkusOrmPanacheTestTask
 test.dependsOn jakartaDataTestTask
 
+// work-around for Gradle bug: https://github.com/gradle/gradle/issues/37146
+tasks.quarkusHrPanacheTest.dependsOn ':hibernate-graalvm:jar'
+tasks.quarkusOrmPanacheTest.dependsOn ':hibernate-graalvm:jar'
+tasks.jakartaDataTest.dependsOn ':hibernate-graalvm:jar'
+
 tasks.sourcesJar.dependsOn ':hibernate-core:generateHqlParser'
 tasks.sourcesJar.dependsOn ':hibernate-core:generateSqlScriptParser'
 
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/BookAuthorRepository.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/BookAuthorRepository.java
index 13df42f16602..6ccbd0ced38e 100644
--- a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/BookAuthorRepository.java
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/basic/BookAuthorRepository.java
@@ -22,6 +22,7 @@
 import jakarta.data.repository.Save;
 import jakarta.data.repository.Update;
 import org.hibernate.StatelessSession;
+import org.hibernate.annotations.processing.HQL;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -222,4 +223,14 @@ public interface BookAuthorRepository {
 
 	@Query("update Author set name = :name where ssn = :id")
 	boolean updateAuthorAddress3(String id, String name);
+
+	@HQL("SELECT 1L")
+	@Nullable
+	Long one();
+
+	@Query("select count(*) filter (where true)")
+	long countBooksWithIsbn();
+
+	@Query("with foo as (select count(*) filter (where true) > 0 as bool from Book) select bool from foo")
+	boolean countBooksWithIsbn2();
 }
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/compliance/Book.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/compliance/Book.java
new file mode 100644
index 000000000000..c975228a291d
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/compliance/Book.java
@@ -0,0 +1,42 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.compliance;
+
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.NaturalId;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Entity
+@Table(name = "books")
+public class Book {
+	@Id
+	String isbn;
+
+	@NaturalId
+	@Basic(optional = false)
+	String title;
+
+	@Basic(optional = false)
+	String text;
+
+	@NaturalId
+	LocalDate publicationDate;
+
+	BigDecimal price;
+
+	int pages;
+
+	public Book(String isbn, String title, String text) {
+		this.isbn = isbn;
+		this.title = title;
+		this.text = text;
+	}
+	Book() {}
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/compliance/BookRepository.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/compliance/BookRepository.java
new file mode 100644
index 000000000000..564eb85d1de4
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/compliance/BookRepository.java
@@ -0,0 +1,34 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.compliance;
+
+import jakarta.data.Limit;
+import jakarta.data.Sort;
+import jakarta.data.repository.Find;
+import jakarta.data.repository.OrderBy;
+import jakarta.data.repository.Repository;
+import org.hibernate.StatelessSession;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.stream.Stream;
+
+@Repository(dataStore = "myds")
+public interface BookRepository {
+
+	StatelessSession session();
+
+	@Find
+	@OrderBy(value = "title", ignoreCase = true)
+	@OrderBy(value = "isbn", descending = true)
+	List<Book> byPubDate1(LocalDate publicationDate, Limit limit, Sort<?> order);
+
+	@Find
+	List<Book> byPubDate3(LocalDate publicationDate, Sort<?>... order);
+
+	@Find
+	Stream<Book> byPubDate4(LocalDate publicationDate, Sort<?> order);
+
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/compliance/ComplianceTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/compliance/ComplianceTest.java
new file mode 100644
index 000000000000..decbcca56fdf
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/compliance/ComplianceTest.java
@@ -0,0 +1,30 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.compliance;
+
+import org.hibernate.processor.HibernateProcessor;
+import org.hibernate.processor.test.util.CompilationTest;
+import org.hibernate.processor.test.util.WithClasses;
+import org.hibernate.processor.test.util.WithProcessorOption;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
+import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
+
+// HHH-20230 Sort<?> and similar are allowed by the spec, but require a compliance flag with Hibernate ORM.
+@CompilationTest
+class ComplianceTest {
+	@Test
+	@WithClasses({ Book.class, BookRepository.class })
+	@WithProcessorOption(key = HibernateProcessor.JAKARTA_DATA_SORT_COMPLIANCE, value = "true")
+	void testWildcards() {
+		System.out.println( getMetaModelSourceAsString( Book.class ) );
+		System.out.println( getMetaModelSourceAsString( Book.class, true ) );
+		System.out.println( getMetaModelSourceAsString( BookRepository.class ) );
+		assertMetamodelClassGeneratedFor( Book.class, true );
+		assertMetamodelClassGeneratedFor( Book.class );
+		assertMetamodelClassGeneratedFor( BookRepository.class );
+	}
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Entity.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Entity.java
new file mode 100644
index 000000000000..02f813f7d86d
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Entity.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.hhh20212;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+@Entity
+public class HHH20212Entity {
+	@Id
+	Long id;
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Repository.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Repository.java
new file mode 100644
index 000000000000..8dde086d9223
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Repository.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.hhh20212;
+
+import jakarta.data.repository.CrudRepository;
+import jakarta.data.repository.Find;
+import jakarta.data.repository.Repository;
+import org.hibernate.StatelessSession;
+
+@Repository
+public interface HHH20212Repository extends CrudRepository<HHH20212Entity, Long> {
+	default StatelessSession getStatelessSession() {
+		throw new UnsupportedOperationException();
+	}
+
+	@Find
+	HHH20212Entity byId(Long id);
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Test.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Test.java
new file mode 100644
index 000000000000..f44a6c1b2221
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20212/HHH20212Test.java
@@ -0,0 +1,26 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.hhh20212;
+
+import org.hibernate.StatelessSession;
+import org.hibernate.processor.test.util.CompilationTest;
+import org.hibernate.processor.test.util.WithClasses;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
+import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
+import static org.hibernate.processor.test.util.TestUtil.getMetamodelClassFor;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@CompilationTest
+class HHH20212Test {
+	@Test
+	@WithClasses({ HHH20212Entity.class, HHH20212Repository.class })
+	void test() throws Exception {
+		System.out.println( getMetaModelSourceAsString( HHH20212Repository.class ) );
+		assertMetamodelClassGeneratedFor( HHH20212Repository.class );
+		assertNotNull( getMetamodelClassFor( HHH20212Repository.class ).getDeclaredConstructor( StatelessSession.class ) );
+	}
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20221/HHH20221Entity.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20221/HHH20221Entity.java
new file mode 100644
index 000000000000..81f6636dcba8
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20221/HHH20221Entity.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.hhh20221;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+@Entity
+public class HHH20221Entity {
+	@Id
+	Long id;
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20221/HHH20221Repository.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20221/HHH20221Repository.java
new file mode 100644
index 000000000000..b495f1b83821
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20221/HHH20221Repository.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.hhh20221;
+
+import jakarta.data.repository.CrudRepository;
+import jakarta.data.repository.Find;
+import jakarta.data.repository.OrderBy;
+import jakarta.data.repository.Repository;
+import jakarta.persistence.TypedQuery;
+
+@Repository
+public interface HHH20221Repository extends CrudRepository<HHH20221Entity, Long> {
+	@Find
+	@OrderBy("id")
+	TypedQuery<HHH20221Entity> findByIdOrdered(Long id);
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20221/HHH20221Test.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20221/HHH20221Test.java
new file mode 100644
index 000000000000..84d35f1db59a
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/hhh20221/HHH20221Test.java
@@ -0,0 +1,31 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.hhh20221;
+
+import jakarta.persistence.TypedQuery;
+import org.hibernate.processor.test.util.CompilationTest;
+import org.hibernate.processor.test.util.WithClasses;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
+import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
+import static org.hibernate.processor.test.util.TestUtil.getMetamodelClassFor;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@CompilationTest
+class HHH20221Test {
+	@Test
+	@WithClasses({ HHH20221Entity.class, HHH20221Repository.class })
+	void test() throws Exception {
+		System.out.println( getMetaModelSourceAsString( HHH20221Repository.class ) );
+		assertMetamodelClassGeneratedFor( HHH20221Repository.class );
+		assertEquals(
+				TypedQuery.class,
+				getMetamodelClassFor( HHH20221Repository.class )
+						.getDeclaredMethod( "findByIdOrdered", Long.class )
+						.getReturnType()
+		);
+	}
+}
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ClassWriter.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ClassWriter.java
index 56987d856151..04f6d29890c5 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ClassWriter.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ClassWriter.java
@@ -252,7 +252,7 @@ else if ( modifiers.contains( Modifier.PROTECTED ) ) {
 		pw.println( " {" );
 	}
 
-	private static String getFullyQualifiedClassName(Metamodel entity) {
+	public static String getFullyQualifiedClassName(Metamodel entity) {
 		return entity.getElement() instanceof PackageElement packageElement
 				? packageElement.getQualifiedName().toString() + "." + getGeneratedClassName( entity )
 				: getGeneratedClassFullyQualifiedName( (TypeElement) entity.getElement(),
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Context.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Context.java
index e70d5a6e04f0..da15fe838e90 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Context.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/Context.java
@@ -92,12 +92,14 @@ public final class Context {
 	private boolean addTransactionScopedAnnotation;
 	private AccessType persistenceUnitDefaultAccessType;
 	private boolean generateJakartaDataStaticMetamodel;
+	private boolean jakartaDataSortCompliance;
 	private boolean quarkusInjection;
 	private boolean springInjection;
 	private boolean dataEventPackageAvailable;
 
 	// keep track of all classes for which model have been generated
 	private final Set<Metamodel> generatedModelClasses = new HashSet<>();
+	private final Set<String> generatedClassNames = new HashSet<>();
 
 	// keep track of which named queries have been checked
 	private final Set<String> checkedNamedQueries = new HashSet<>();
@@ -161,6 +163,14 @@ public void setGenerateJakartaDataStaticMetamodel(boolean generateJakartaDataSta
 		this.generateJakartaDataStaticMetamodel = generateJakartaDataStaticMetamodel;
 	}
 
+	public boolean getJakartaDataSortCompliance() {
+		return jakartaDataSortCompliance;
+	}
+
+	public void setJakartaDataSortCompliance(boolean jakartaDataSortCompliance) {
+		this.jakartaDataSortCompliance = jakartaDataSortCompliance;
+	}
+
 	public boolean addInjectAnnotation() {
 		return addInjectAnnotation;
 	}
@@ -368,6 +378,7 @@ public TypeElement getTypeElementForFullyQualifiedName(String qualifiedName) {
 
 	void markGenerated(Metamodel metamodel) {
 		generatedModelClasses.add( metamodel );
+		generatedClassNames.add( ClassWriter.getFullyQualifiedClassName( metamodel ));
 	}
 
 	boolean isAlreadyGenerated(Metamodel metamodel) {
@@ -583,4 +594,8 @@ public void setIndexing(boolean index) {
 	public boolean isIndexing() {
 		return indexing;
 	}
+
+	public boolean isGeneratedClass(String qualifiedName) {
+		return generatedClassNames.contains( qualifiedName );
+	}
 }
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/HibernateProcessor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/HibernateProcessor.java
index e483b07d6045..9e30a1c325d5 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/HibernateProcessor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/HibernateProcessor.java
@@ -55,6 +55,7 @@
 import static org.hibernate.processor.HibernateProcessor.FULLY_ANNOTATION_CONFIGURED_OPTION;
 import static org.hibernate.processor.HibernateProcessor.INCLUDE;
 import static org.hibernate.processor.HibernateProcessor.INDEX;
+import static org.hibernate.processor.HibernateProcessor.JAKARTA_DATA_SORT_COMPLIANCE;
 import static org.hibernate.processor.HibernateProcessor.LAZY_XML_PARSING;
 import static org.hibernate.processor.HibernateProcessor.ORM_XML_OPTION;
 import static org.hibernate.processor.HibernateProcessor.PERSISTENCE_XML_OPTION;
@@ -71,7 +72,13 @@
 import static org.hibernate.processor.util.Constants.HIB_NAMED_QUERIES;
 import static org.hibernate.processor.util.Constants.HIB_NAMED_QUERY;
 import static org.hibernate.processor.util.Constants.HQL;
+import static org.hibernate.processor.util.Constants.JD_DELETE;
+import static org.hibernate.processor.util.Constants.JD_FIND;
+import static org.hibernate.processor.util.Constants.JD_INSERT;
+import static org.hibernate.processor.util.Constants.JD_QUERY;
 import static org.hibernate.processor.util.Constants.JD_REPOSITORY;
+import static org.hibernate.processor.util.Constants.JD_SAVE;
+import static org.hibernate.processor.util.Constants.JD_UPDATE;
 import static org.hibernate.processor.util.Constants.MAPPED_SUPERCLASS;
 import static org.hibernate.processor.util.Constants.NAMED_ENTITY_GRAPH;
 import static org.hibernate.processor.util.Constants.NAMED_ENTITY_GRAPHS;
@@ -122,7 +129,8 @@
 		ADD_SUPPRESS_WARNINGS_ANNOTATION,
 		SUPPRESS_JAKARTA_DATA_METAMODEL,
 		INCLUDE, EXCLUDE,
-		INDEX
+		INDEX,
+		JAKARTA_DATA_SORT_COMPLIANCE
 })
 public class HibernateProcessor extends AbstractProcessor {
 
@@ -176,6 +184,14 @@ public class HibernateProcessor extends AbstractProcessor {
 	 */
 	public static final String SUPPRESS_JAKARTA_DATA_METAMODEL = "suppressJakartaDataMetamodel";
 
+	/**
+	 * Option to suppress rejection of Jakarta Data repository interfaces that use
+	 * {@code jakarta.data.Sort} types with a null type argument, which
+	 * the Jakarta Data specification allows.
+	 */
+	public static final String JAKARTA_DATA_SORT_COMPLIANCE = "jakartaDataSortCompliance";
+
+
 	/**
 	 * Option to include only certain types, according to a list of patterns.
 	 * The wildcard character is {@code *}, and patterns are comma-separated.
@@ -194,8 +210,9 @@ public class HibernateProcessor extends AbstractProcessor {
 
 	/**
 	 * Option to suppress creation of a filesystem-based index of entity
-	 * types and enums for use by the query validator. By default, and
-	 * index is created.
+	 * types and enums for use by the query validator. By default, the
+	 * index is created. The index is used to speed up query validation
+	 * for faster compilation times.
 	 */
 	public static final String INDEX = "index";
 
@@ -300,6 +317,8 @@ && packagePresent(quarkusOrmPanachePackage) ) {
 
 		context.setGenerateJakartaDataStaticMetamodel( !suppressJakartaData && packagePresent(jakartaDataPackage) );
 
+		context.setJakartaDataSortCompliance( parseBoolean( options.get( JAKARTA_DATA_SORT_COMPLIANCE ) ) );
+
 		final String setting = options.get( ADD_GENERATED_ANNOTATION );
 		if ( setting != null ) {
 			context.setAddGeneratedAnnotation( parseBoolean( setting ) );
@@ -377,7 +396,12 @@ else if ( context.isFullyXmlConfigured() ) {
 	private boolean included(Element element) {
 		if ( element instanceof TypeElement || element instanceof PackageElement ) {
 			final QualifiedNameable nameable = (QualifiedNameable) element;
-			return context.isIncluded( nameable.getQualifiedName().toString() );
+			String qualifiedName = nameable.getQualifiedName().toString();
+			if ( element instanceof TypeElement
+				&& context.isGeneratedClass( qualifiedName ) ) {
+				return false;
+			}
+			return context.isIncluded( qualifiedName );
 		}
 		else {
 			return false;
@@ -401,13 +425,13 @@ private void processClasses(RoundEnvironment roundEnvironment) {
 		}
 
 		for ( Element element : roundEnvironment.getRootElements() ) {
-			processElement( element, null );
+			processElement( element, null, null);
 		}
 	}
 
-	private void processElement(Element element, @Nullable Element parent) {
+	private void processElement(Element element, @Nullable Element parent, @Nullable TypeElement primaryEntity) {
 		try {
-			inspectRootElement(element, parent, null);
+			inspectRootElement(element, parent, primaryEntity);
 		}
 		catch ( ProcessLaterException processLaterException ) {
 			if ( element instanceof TypeElement typeElement ) {
@@ -473,16 +497,13 @@ else if ( element instanceof TypeElement typeElement ) {
 				}
 			}
 			else {
-				for ( Element member : typeElement.getEnclosedElements() ) {
-					if ( hasAnnotation( member, HQL, SQL, FIND ) ) {
-						context.logMessage( Diagnostic.Kind.OTHER, "Processing annotated class '" + element + "'" );
-						final AnnotationMetaEntity metaEntity =
-								AnnotationMetaEntity.create( typeElement, context,
-										parentMetadata( parent, context::getMetaEntity ),
-										primaryEntity );
-						context.addMetaAuxiliary( metaEntity.getQualifiedName(), metaEntity );
-						break;
-					}
+				if ( isImplicitRepository( typeElement ) ) {
+					context.logMessage( Diagnostic.Kind.OTHER, "Processing implicit repository class '" + element + "'" );
+					final AnnotationMetaEntity metaEntity =
+							AnnotationMetaEntity.create( typeElement, context,
+									parentMetadata( parent, context::getMetaEntity ),
+									primaryEntity );
+					context.addMetaAuxiliary( metaEntity.getQualifiedName(), metaEntity );
 				}
 				if ( enclosesEntityOrEmbeddable( element ) ) {
 					final NonManagedMetamodel metaEntity =
@@ -495,19 +516,32 @@ else if ( element instanceof TypeElement typeElement ) {
 										parentMetadata( parent, context::getDataMetaEntity ) );
 						context.addDataMetaEntity( dataMetaEntity.getQualifiedName(), dataMetaEntity );
 					}
-
 				}
 			}
 		}
 		if ( isClassRecordOrInterfaceType( element ) ) {
+			// Any repository nested in an entity gets an automatic primary entity of the enclosing entity for Quarkus Panache 2
+			TypeElement newPrimaryEntity = isEntityOrEmbeddable( element ) && element instanceof TypeElement ? (TypeElement) element : null;
 			for ( final Element child : element.getEnclosedElements() ) {
 				if ( isClassRecordOrInterfaceType( child ) ) {
-					processElement( child, element );
+					processElement( child, element, newPrimaryEntity );
 				}
 			}
 		}
 	}
 
+	private boolean isImplicitRepository(TypeElement typeElement) {
+		if ( AnnotationMetaEntity.isPanache2Repository( typeElement ) ) {
+			return true;
+		}
+		for ( Element member : typeElement.getEnclosedElements() ) {
+			if ( hasAnnotation( member, HQL, SQL, FIND, JD_QUERY, JD_FIND, JD_DELETE, JD_INSERT, JD_SAVE, JD_UPDATE ) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	private void createMetaModelClasses() {
 
 		for ( Metamodel aux : context.getMetaAuxiliaries() ) {
@@ -659,7 +693,6 @@ private void handleRootElementAnnotationMirrors(final Element element, @Nullable
 				final TypeElement typeElement = (TypeElement) element;
 				indexEntityName( typeElement );
 				indexEnumFields( typeElement );
-				indexQueryInterfaces( typeElement );
 
 				final String qualifiedName = typeElement.getQualifiedName().toString();
 				final Metamodel alreadyExistingMetaEntity =
@@ -716,14 +749,6 @@ private static boolean hasHandwrittenMetamodel(Element element) {
 						.contentEquals('_' + element.getSimpleName().toString()));
 	}
 
-	private void indexQueryInterfaces(TypeElement typeElement) {
-		for ( Element element : typeElement.getEnclosedElements() ) {
-			if( element.getKind() == ElementKind.INTERFACE ) {
-				inspectRootElement( element, typeElement, typeElement );
-			}
-		}
-	}
-
 	private void indexEntityName(TypeElement typeElement) {
 		final AnnotationMirror mirror = getAnnotationMirror( typeElement, ENTITY );
 		if ( mirror != null ) {
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ImportContextImpl.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ImportContextImpl.java
index 4fb86ab2d17b..cb82d197c2d0 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ImportContextImpl.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/ImportContextImpl.java
@@ -125,9 +125,9 @@ else if ( result.endsWith( "..." ) ) {
 	private String unqualifyName(String qualifiedName) {
 		final String sourceQualifiedName = qualifiedName.replace( '$', '.' );
 		final String simpleName = unqualify( qualifiedName );
-		boolean canBeSimple;
+		final boolean canBeSimple;
 		if ( simpleNames.containsKey( simpleName ) ) {
-			String existing = simpleNames.get( simpleName );
+			final String existing = simpleNames.get( simpleName );
 			canBeSimple = existing.equals( sourceQualifiedName );
 		}
 		else {
@@ -136,8 +136,10 @@ private String unqualifyName(String qualifiedName) {
 			imports.add( sourceQualifiedName );
 		}
 
-		if ( inSamePackage( qualifiedName ) || inJavaLang( qualifiedName )
-				|| canBeSimple && imports.contains( sourceQualifiedName ) ) {
+		if ( canBeSimple && (
+				inSamePackage( qualifiedName )
+				|| inJavaLang( qualifiedName )
+				|| imports.contains( sourceQualifiedName ) ) ) {
 			return unqualify( qualifiedName );
 		}
 		else {
@@ -223,12 +225,12 @@ private boolean isAutoImported(String next) {
 	}
 
 	public static String unqualify(String qualifiedName) {
-		int loc = qualifiedName.lastIndexOf( '.' );
-		return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( qualifiedName.lastIndexOf( '.' ) + 1 );
+		final int loc = qualifiedName.lastIndexOf( '.' );
+		return loc < 0 ? qualifiedName : qualifiedName.substring( loc + 1 );
 	}
 
 	public static String qualifier(String qualifiedName) {
-		int loc = qualifiedName.lastIndexOf( '.' );
-		return ( loc < 0 ) ? "" : qualifiedName.substring( 0, loc );
+		final int loc = qualifiedName.lastIndexOf( '.' );
+		return loc < 0 ? "" : qualifiedName.substring( 0, loc );
 	}
 }
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractAnnotatedMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractAnnotatedMethod.java
index b96773b41baa..af1395516f05 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractAnnotatedMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractAnnotatedMethod.java
@@ -64,7 +64,17 @@ String localSessionName() {
 	}
 
 	String getObjectCall() {
-		return annotationMetaEntity.isProvidedSessionAccess() ? ".getObject()" : "";
+		return annotationMetaEntity.isProvidedSessionAccess()
+			&& !sessionName.endsWith("()")
+				? ".getObject()"
+				: "";
+	}
+
+	void localSession(StringBuilder declaration) {
+		declaration.append(localSessionName());
+		if ( !isReactive() ) {
+			declaration.append(getObjectCall());
+		}
 	}
 
 	@Override
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractCriteriaMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractCriteriaMethod.java
index ceadd53f1d86..6b2a53fe1e7b 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractCriteriaMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractCriteriaMethod.java
@@ -91,22 +91,20 @@ void createQuery(StringBuilder declaration, boolean declareVariable) {
 			declaration
 					.append("var _select = ");
 		}
-		final boolean specification = isUsingSpecification();
-		if ( specification && !isReactive() ) {
+		if ( useSpecificationCreateQuery() ) {
+			declaration
+					.append("_spec.createQuery(");
+			localSession( declaration );
 			declaration
-					.append("_spec.createQuery(")
-					.append(localSessionName())
-					.append(getObjectCall())
 					.append(")");
 		}
 		else {
+			localSession( declaration );
 			declaration
-					.append(localSessionName())
-					.append(getObjectCall())
 					.append(".")
 					.append(createQueryMethod())
 					.append('(');
-			if ( specification ) {
+			if ( isUsingSpecification() ) {
 				declaration
 						.append("_spec.buildCriteria(_builder)");
 			}
@@ -148,9 +146,9 @@ void createCriteriaQuery(StringBuilder declaration) {
 
 	private void createBuilder(StringBuilder declaration) {
 		declaration
-				.append("\tvar _builder = ")
-				.append(localSessionName())
-				.append(getObjectCall())
+				.append("\tvar _builder = ");
+		localSession( declaration );
+		declaration
 				.append(".getCriteriaBuilder();\n");
 	}
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java
index 79640626bd4a..e9423b064e24 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractFinderMethod.java
@@ -71,6 +71,11 @@ public String getAttributeNameDeclarationString() {
 		throw new UnsupportedOperationException("operation not supported");
 	}
 
+	@Override
+	@Nullable String containerType() {
+		return containerType;
+	}
+
 	void comment(StringBuilder declaration) {
 		declaration
 				.append("\n/**")
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java
index 9405f757fdd6..9f5dcde4acb0 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java
@@ -94,9 +94,18 @@ public String getPropertyName() {
 
 	abstract boolean isNullable(int index);
 
+	@Nullable
+	abstract String containerType();
+
+	boolean useSpecificationCreateQuery() {
+		return isUsingSpecification()
+			&& !isReactive()
+			&& !isUnspecializedQueryType( containerType() );
+	}
+
 	boolean initiallyUnwrapped() {
 		return !isUsingEntityManager() // a TypedQuery from EntityManager is not a SelectionQuery
-			|| isUsingSpecification() && !isReactive(); // SelectionSpecification.createQuery() returns SelectionQuery
+			|| useSpecificationCreateQuery(); // SelectionSpecification.createQuery() returns SelectionQuery
 	}
 
 	List<String> parameterTypes() {
@@ -714,7 +723,6 @@ protected void executeSelect(
 			boolean mustUnwrap) {
 		if ( containerType == null ) {
 			if ( nullable ) {
-				unwrapQuery(declaration, unwrapped);
 				declaration
 						.append("\t\t\t.getSingleResultOrNull()");
 			}
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java
index 233e9f25df18..382c900f00fe 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMeta.java
@@ -156,7 +156,7 @@ private void addAuxiliaryMembersForRepeatableAnnotation(String annotationName, S
 				final List<? extends AnnotationValue> annotationValues =
 						(List<? extends AnnotationValue>) value.getValue();
 				for ( AnnotationValue annotationValue : annotationValues ) {
-					addAuxiliaryMembersForMirror( (AnnotationMirror) annotationValue.getValue(), prefix );
+					addAuxiliaryMembersForMirror( (AnnotationMirror) annotationValue.getValue(), prefix, annotationName );
 				}
 			}
 		}
@@ -165,21 +165,32 @@ private void addAuxiliaryMembersForRepeatableAnnotation(String annotationName, S
 	private void addAuxiliaryMembersForAnnotation(String annotationName, String prefix) {
 		final AnnotationMirror mirror = getAnnotationMirror( getElement(), annotationName );
 		if ( mirror != null ) {
-			addAuxiliaryMembersForMirror( mirror, prefix );
+			addAuxiliaryMembersForMirror( mirror, prefix, annotationName );
 		}
 	}
 
-	private void addAuxiliaryMembersForMirror(AnnotationMirror mirror, String prefix) {
+	private void addAuxiliaryMembersForMirror(AnnotationMirror mirror, String prefix, String annotationName) {
 		if ( !isJakartaDataStyle() ) {
-			mirror.getElementValues().forEach((key, value) -> {
-				if ( key.getSimpleName().contentEquals("name") ) {
-					final String name = value.getValue().toString();
-					if ( !name.isEmpty() ) {
-						putMember( prefix + name, auxiliaryMember( mirror, prefix, name ) );
-					}
-				}
-			});
+			final String name = defaultImplicitName( annotationName, explicitName( mirror ) );
+			putMember( prefix + name, auxiliaryMember( mirror, prefix, name ) );
+		}
+	}
+
+	private static String explicitName(AnnotationMirror mirror) {
+		for ( var entry : mirror.getElementValues().entrySet() ) {
+			if ( entry.getKey().getSimpleName().contentEquals( "name" ) ) {
+				return entry.getValue().getValue().toString();
+			}
 		}
+		return "";
+	}
+
+	private String defaultImplicitName(String annotationName, String explicitName) {
+		return explicitName.isEmpty()
+			&& ( Constants.NAMED_ENTITY_GRAPH.equals( annotationName )
+					|| Constants.NAMED_ENTITY_GRAPHS.equals( annotationName ) )
+				? getSimpleName()
+				: explicitName;
 	}
 
 	private NameMetaAttribute auxiliaryMember(AnnotationMirror mirror, String prefix, String name) {
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
index 045498027821..be290ce93bc3 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
@@ -4,10 +4,9 @@
  */
 package org.hibernate.processor.annotation;
 
-import org.antlr.v4.runtime.Token;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.AssertionFailure;
-import org.hibernate.grammars.hql.HqlLexer;
 import org.hibernate.metamodel.mapping.ordering.OrderByFragmentTranslator;
 import org.hibernate.metamodel.model.domain.EntityDomainType;
 import org.hibernate.processor.Context;
@@ -18,6 +17,7 @@
 import org.hibernate.processor.model.Metamodel;
 import org.hibernate.processor.util.AccessTypeInformation;
 import org.hibernate.processor.util.Constants;
+import org.hibernate.processor.util.StringUtil;
 import org.hibernate.processor.util.TypeUtils;
 import org.hibernate.processor.validation.ProcessorSessionFactory;
 import org.hibernate.processor.validation.Validation;
@@ -66,16 +66,20 @@
 
 import jakarta.persistence.AccessType;
 
-import static java.beans.Introspector.decapitalize;
+import static java.lang.Character.toUpperCase;
+import static org.antlr.v4.runtime.Token.DEFAULT_CHANNEL;
+import static org.hibernate.processor.util.StringUtil.decapitalize;
 import static java.lang.Boolean.FALSE;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNullElse;
 import static java.util.stream.Collectors.toList;
 import static javax.lang.model.util.ElementFilter.fieldsIn;
 import static javax.lang.model.util.ElementFilter.methodsIn;
+import static org.hibernate.grammars.hql.HqlLexer.FILTER;
 import static org.hibernate.grammars.hql.HqlLexer.FROM;
 import static org.hibernate.grammars.hql.HqlLexer.GROUP;
 import static org.hibernate.grammars.hql.HqlLexer.HAVING;
+import static org.hibernate.grammars.hql.HqlLexer.LEFT_PAREN;
 import static org.hibernate.grammars.hql.HqlLexer.ORDER;
 import static org.hibernate.grammars.hql.HqlLexer.WHERE;
 import static org.hibernate.internal.util.StringHelper.qualify;
@@ -171,7 +175,7 @@ public class AnnotationMetaEntity extends AnnotationMeta {
 	 */
 	private String sessionGetter = "entityManager";
 
-	private final Map<String,String> memberTypes = new HashMap<>();
+	private final Map<String, String> memberTypes = new HashMap<>();
 
 	/**
 	 * The primary entity type for a repository
@@ -186,12 +190,12 @@ public AnnotationMetaEntity(
 		this.element = element;
 		this.context = context;
 		this.managed = managed;
-		this.members = new LinkedHashMap<>();
-		this.quarkusInjection = context.isQuarkusInjection();
-		this.springInjection = context.isSpringInjection();
-		this.importContext = parent != null ? parent : new ImportContextImpl( getPackageName( context, element ) );
-		jakartaDataStaticModel = jakartaDataStaticMetamodel;
 		this.primaryEntity = primaryEntity;
+		members = new LinkedHashMap<>();
+		quarkusInjection = context.isQuarkusInjection();
+		springInjection = context.isSpringInjection();
+		importContext = parent != null ? parent : new ImportContextImpl( getPackageName( context, element ) );
+		jakartaDataStaticModel = jakartaDataStaticMetamodel;
 		importContext.importType(
 				getGeneratedClassFullyQualifiedName( element, getPackageName( context, element ),
 						jakartaDataStaticModel ) );
@@ -201,12 +205,12 @@ public AnnotationMetaEntity(
 	}
 
 	public static AnnotationMetaEntity create(TypeElement element, Context context, @Nullable AnnotationMetaEntity parent,
-			@Nullable TypeElement primaryEntity) {
-		return create( element,context, false, false, false, parent, primaryEntity );
+											@Nullable TypeElement primaryEntity) {
+		return create( element, context, false, false, false, parent, primaryEntity );
 	}
 
 	public static AnnotationMetaEntity create(TypeElement element, Context context, @Nullable AnnotationMetaEntity parent) {
-		return create( element,context, false, false, false, parent, null );
+		return create( element, context, false, false, false, parent, null );
 	}
 
 	public static AnnotationMetaEntity create(
@@ -227,7 +231,7 @@ public static AnnotationMetaEntity create(
 	}
 
 	public @Nullable String getMemberType(String entityType, String memberName) {
-		return memberTypes.get( qualify(entityType, memberName) );
+		return memberTypes.get( qualify( entityType, memberName ) );
 	}
 
 	public AccessTypeInformation getEntityAccessTypeInfo() {
@@ -404,8 +408,8 @@ protected void init() {
 
 		if ( repository ) {
 			final List<ExecutableElement> methodsOfClass =
-					methodsIn( context.getAllMembers(element) );
-			for ( ExecutableElement method: methodsOfClass ) {
+					methodsIn( context.getAllMembers( element ) );
+			for ( ExecutableElement method : methodsOfClass ) {
 				if ( containsAnnotation( method, HQL, SQL, JD_QUERY, FIND, JD_FIND ) ) {
 					queryMethods.add( method );
 				}
@@ -413,7 +417,7 @@ else if ( containsAnnotation( method, JD_INSERT, JD_UPDATE, JD_SAVE ) ) {
 					lifecycleMethods.add( method );
 				}
 				else if ( hasAnnotation( method, JD_DELETE ) ) {
-					if ( isDeleteLifecycle(method) ) {
+					if ( isDeleteLifecycle( method ) ) {
 						lifecycleMethods.add( method );
 					}
 					else {
@@ -422,10 +426,10 @@ else if ( hasAnnotation( method, JD_DELETE ) ) {
 				}
 				else if ( method.getEnclosingElement().getKind().isInterface()
 						&& !method.isDefault()
-						&& !method.getModifiers().contains(Modifier.PRIVATE)
-						&& !isSessionGetter(method) ) {
+						&& !method.getModifiers().contains( Modifier.PRIVATE )
+						&& !isSessionGetter( method ) ) {
 					final String companionClassName = element.getQualifiedName().toString() + '$';
-					if ( context.getElementUtils().getTypeElement(companionClassName) == null ) {
+					if ( context.getElementUtils().getTypeElement( companionClassName ) == null ) {
 						message( method, "repository method cannot be implemented (skipping whole repository)",
 								Diagnostic.Kind.WARNING );
 					}
@@ -439,7 +443,7 @@ else if ( method.getEnclosingElement().getKind().isInterface()
 				primaryEntity = primaryEntity( lifecycleMethods );
 			}
 			if ( !checkEntity( primaryEntity, hibernateRepo )
-					|| !checkEntities( lifecycleMethods, hibernateRepo ) ) {
+				|| !checkEntities( lifecycleMethods, hibernateRepo ) ) {
 				// NOTE EARLY EXIT with initialized = false
 				return;
 			}
@@ -455,7 +459,7 @@ else if ( method.getEnclosingElement().getKind().isInterface()
 			final List<VariableElement> fieldsOfClass = fieldsIn( element.getEnclosedElements() );
 			final List<ExecutableElement> methodsOfClass = methodsIn( element.getEnclosedElements() );
 			final List<ExecutableElement> gettersAndSettersOfClass = new ArrayList<>();
-			for ( ExecutableElement method: methodsOfClass ) {
+			for ( ExecutableElement method : methodsOfClass ) {
 				if ( isGetterOrSetter( method ) ) {
 					gettersAndSettersOfClass.add( method );
 				}
@@ -466,7 +470,7 @@ && containsAnnotation( method, HQL, SQL, FIND ) ) {
 			}
 
 			if ( managed && !jakartaDataStaticModel ) {
-				putMember( "class", new AnnotationMetaType(this) );
+				putMember( "class", new AnnotationMetaType( this ) );
 			}
 
 			validatePersistentMembers( fieldsOfClass );
@@ -477,7 +481,7 @@ && containsAnnotation( method, HQL, SQL, FIND ) ) {
 
 			addIdClassIfNeeded( fieldsOfClass, gettersAndSettersOfClass );
 
-			if( hasAnnotation( element, ENTITY) && isPanache2Type(element) && !jakartaDataStaticModel ) {
+			if ( hasAnnotation( element, ENTITY ) && isPanache2Type( element ) && !jakartaDataStaticModel ) {
 				addRepositoryMembers( element );
 			}
 		}
@@ -538,19 +542,28 @@ private void addRepositoryMembers(TypeElement element) {
 		Element statelessBlockingRepository = null;
 		Element managedReactiveRepository = null;
 		Element statelessReactiveRepository = null;
+		// At this point we did not yet collect nested repositories as type members, so I have to collect them here
+		// to make sure we don't clash with their names
+		List<String> nestedRepositories = new ArrayList<>();
 		for ( Element enclosedElement : element.getEnclosedElements() ) {
 			if ( enclosedElement.getKind() == ElementKind.INTERFACE ) {
-				members.put( enclosedElement.getSimpleName().toString(), new CDIAccessorMetaAttribute( this, enclosedElement ) );
-				if ( implementsInterface( (TypeElement) enclosedElement, Constants.PANACHE2_MANAGED_BLOCKING_REPOSITORY_BASE ) ) {
+				if ( !addRepositoryAccessor( element, enclosedElement, nestedRepositories ) ) {
+					continue;
+				}
+				if ( implementsInterface( (TypeElement) enclosedElement,
+						Constants.PANACHE2_MANAGED_BLOCKING_REPOSITORY_BASE ) ) {
 					managedBlockingRepository = enclosedElement;
 				}
-				else if ( implementsInterface( (TypeElement) enclosedElement, Constants.PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE ) ) {
+				else if ( implementsInterface( (TypeElement) enclosedElement,
+						Constants.PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE ) ) {
 					statelessBlockingRepository = enclosedElement;
 				}
-				else if ( implementsInterface( (TypeElement) enclosedElement, Constants.PANACHE2_MANAGED_REACTIVE_REPOSITORY_BASE ) ) {
+				else if ( implementsInterface( (TypeElement) enclosedElement,
+						Constants.PANACHE2_MANAGED_REACTIVE_REPOSITORY_BASE ) ) {
 					managedReactiveRepository = enclosedElement;
 				}
-				else if ( implementsInterface( (TypeElement) enclosedElement, Constants.PANACHE2_STATELESS_REACTIVE_REPOSITORY_BASE ) ) {
+				else if ( implementsInterface( (TypeElement) enclosedElement,
+						Constants.PANACHE2_STATELESS_REACTIVE_REPOSITORY_BASE ) ) {
 					statelessReactiveRepository = enclosedElement;
 				}
 			}
@@ -558,16 +571,40 @@ else if ( implementsInterface( (TypeElement) enclosedElement, Constants.PANACHE2
 		if ( quarkusInjection ) {
 			// FIXME: perhaps import id type?
 			TypeMirror idType = findIdType();
-			addAccessors(managedBlockingRepository, idType, "managedBlocking", PANACHE2_MANAGED_BLOCKING_REPOSITORY_BASE);
-			addAccessors(statelessBlockingRepository, idType, "statelessBlocking", PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE);
+			addAccessors( managedBlockingRepository, idType, "managedBlocking",
+					PANACHE2_MANAGED_BLOCKING_REPOSITORY_BASE, nestedRepositories );
+			addAccessors( statelessBlockingRepository, idType, "statelessBlocking",
+					PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE, nestedRepositories );
 			// Only add those if HR is in the classpath, otherwise it causes a compilation issue
-			if( context.usesQuarkusReactiveCommon() ) {
-				addAccessors(managedReactiveRepository, idType, "managedReactive", PANACHE2_MANAGED_REACTIVE_REPOSITORY_BASE);
-				addAccessors(statelessReactiveRepository, idType, "statelessReactive", PANACHE2_STATELESS_REACTIVE_REPOSITORY_BASE);
+			if ( context.usesQuarkusReactiveCommon() ) {
+				addAccessors( managedReactiveRepository, idType, "managedReactive",
+						PANACHE2_MANAGED_REACTIVE_REPOSITORY_BASE, nestedRepositories );
+				addAccessors( statelessReactiveRepository, idType, "statelessReactive",
+						PANACHE2_STATELESS_REACTIVE_REPOSITORY_BASE, nestedRepositories );
 			}
 		}
 	}
 
+	private boolean addRepositoryAccessor(TypeElement element, Element enclosedElement, List<String> nestedRepositories) {
+		String name = enclosedElement.getSimpleName().toString();
+		if ( name.endsWith( "_" ) ) {
+			message( element,
+					"Nested repositories may not have names that end with '_': "
+					+ element.getQualifiedName() + "." + enclosedElement.getSimpleName(),
+					Diagnostic.Kind.ERROR );
+			// skip it
+			return false;
+		}
+		// All nested repositories have _ suffix
+		nestedRepositories.add( name + "_");
+		// turn the name into lowercase
+		// FIXME: this is wrong for types like STEFQueries
+		String propertyName = StringUtil.decapitalize( name );
+		members.put( propertyName, new CDIAccessorMetaAttribute( this, propertyName, name ) );
+		// keep it
+		return true;
+	}
+
 	private List<MetaAttribute> getIdMemberNames(List<VariableElement> fields, List<ExecutableElement> methods) {
 		final List<MetaAttribute> components = new ArrayList<>();
 		for ( var field : fields ) {
@@ -597,7 +634,7 @@ private void checkIdMembers(List<VariableElement> fields, List<ExecutableElement
 				final TypeElement idClass = (TypeElement) declaredType.asElement();
 				if ( fields.stream().filter( this::isIdField ).count()
 					+ methods.stream().filter( this::isIdProperty ).count()
-							== 1 ) {
+					== 1 ) {
 					for ( var field : fields ) {
 						if ( isIdField( field ) ) {
 							if ( hasAnnotation( field, ONE_TO_ONE ) ) {
@@ -622,7 +659,8 @@ private void checkIdMembers(List<VariableElement> fields, List<ExecutableElement
 						if ( isIdField( field ) ) {
 							memberStream( idClass )
 									.filter( element -> element.getKind() == ElementKind.FIELD
-														&& element.getSimpleName().contentEquals( field.getSimpleName() ) )
+														&& element.getSimpleName()
+																.contentEquals( field.getSimpleName() ) )
 									.findAny()
 									.ifPresentOrElse( match -> {
 												if ( !isMatchingIdType( field, field.asType(), match.asType() ) ) {
@@ -640,9 +678,10 @@ private void checkIdMembers(List<VariableElement> fields, List<ExecutableElement
 						if ( isIdProperty( method ) ) {
 							memberStream( idClass )
 									.filter( element -> element.getKind() == ElementKind.METHOD
-														&& element.getSimpleName().contentEquals( method.getSimpleName() )
+														&& element.getSimpleName()
+																.contentEquals( method.getSimpleName() )
 														&& isMatchingIdType( method, method.getReturnType(),
-																		((ExecutableElement) element).getReturnType() ) )
+											((ExecutableElement) element).getReturnType() ) )
 									.findAny()
 									.ifPresentOrElse( match -> {
 											},
@@ -695,16 +734,55 @@ private boolean isEquivalentPrimitiveType(TypeMirror type, TypeMirror match) {
 			&& isSameType( context.getTypeUtils().boxedClass( ((PrimitiveType) type) ).asType(), match );
 	}
 
-	private void addAccessors(@Nullable Element repositoryType, @Nullable TypeMirror idType,
-							String repositoryAccessor, String repositorySuperType) {
-		TypeElement finalPrimaryEntity = primaryEntity;
+	private void addAccessors(
+			@Nullable Element repositoryType, @Nullable TypeMirror idType,
+			String repositoryAccessor, String repositorySuperType, List<String> nestedRepositories) {
+		final TypeElement finalPrimaryEntity = primaryEntity;
 		if ( repositoryType != null ) {
-			members.put( repositoryAccessor, new CDIAccessorMetaAttribute( this, repositoryAccessor,  repositoryType.getSimpleName().toString() ) );
+			addRepositoryAccessor( repositoryAccessor,
+					repositoryType.getSimpleName().toString() );
 		}
 		else if ( idType != null && finalPrimaryEntity != null ) {
-			String repositoryTypeName = "Panache"+repositoryAccessor.substring(0,1).toUpperCase()+repositoryAccessor.substring(1)+"Repository";
-			members.put( repositoryAccessor, new CDIAccessorMetaAttribute( this, repositoryAccessor,  repositoryTypeName ) );
-			members.put( repositoryAccessor + "Repository", new CDITypeMetaAttribute( this, repositoryTypeName, repositorySuperType +"<"+ finalPrimaryEntity.getSimpleName()+", "+ idType.toString()+">" ) );
+			final String repositoryTypeName =
+					panacheRepositoryTypeName( repositoryAccessor, nestedRepositories );
+			members.put( repositoryTypeName,
+					new CDITypeMetaAttribute( this, repositoryTypeName,
+							panacheRepositorySuperType( idType, repositorySuperType, finalPrimaryEntity ) ) );
+			addRepositoryAccessor( repositoryAccessor, repositoryTypeName );
+		}
+	}
+
+	private static @NonNull String panacheRepositorySuperType(
+			@NonNull TypeMirror idType, String repositorySuperType, TypeElement finalPrimaryEntity) {
+		return repositorySuperType + "<" + finalPrimaryEntity.getSimpleName() + ", " + idType + ">";
+	}
+
+	private @NonNull String panacheRepositoryTypeName(String repositoryAccessor, List<String> nestedRepositories) {
+		final String repositoryTypeName =
+				"Panache"
+						+ toUpperCase( repositoryAccessor.charAt( 0 ) )
+						+ repositoryAccessor.substring( 1 )
+						+ "Repository_";
+		// There may be a user-defined repository under our generated name if the
+		// user gives it the same name, in which case we add an underscore suffix
+		return members.containsKey( repositoryTypeName )
+			|| nestedRepositories.contains( repositoryTypeName )
+				? repositoryTypeName + "_"
+				: repositoryTypeName;
+	}
+
+	private void addRepositoryAccessor(String repositoryAccessor, String repositoryType) {
+		// Do not add an accessor if a user already has their own repository with the same accessor name
+		if ( !members.containsKey( repositoryAccessor ) ) {
+			members.put( repositoryAccessor,
+					new CDIAccessorMetaAttribute( this,
+							repositoryAccessor, repositoryType ) );
+		}
+		else {
+			message( element,
+					"Failed to generate accessor in '" + primaryEntity
+					+ "' for the generated repository under name '" + repositoryAccessor + "' since it is already defined by the user",
+					Diagnostic.Kind.WARNING );
 		}
 	}
 
@@ -713,23 +791,26 @@ else if ( idType != null && finalPrimaryEntity != null ) {
 		if ( primaryEntityForTest == null ) {
 			return null;
 		}
-		AnnotationMirror idClass = getInheritedAnnotationMirror( this.context.getElementUtils(), primaryEntityForTest, ID_CLASS );
+		final AnnotationMirror idClass =
+				getInheritedAnnotationMirror( context.getElementUtils(),
+						primaryEntityForTest, ID_CLASS );
 		if ( idClass != null ) {
-			AnnotationValue value = getAnnotationValue(idClass, "value" );
+			final AnnotationValue value = getAnnotationValue( idClass, "value" );
 			// I don't think this can have a null value
 			if ( value != null ) {
 				return (TypeMirror) value.getValue();
 			}
 		}
-		Element idMember = findIdMember();
+		final Element idMember = findIdMember();
 		if ( idMember != null ) {
-			TypeMirror typedIdMember = this.context.getTypeUtils().asMemberOf((DeclaredType) primaryEntityForTest.asType(), idMember);
-			return switch(typedIdMember.getKind()) {
+			final TypeMirror typedIdMember = context.getTypeUtils()
+					.asMemberOf( (DeclaredType) primaryEntityForTest.asType(), idMember );
+			return switch ( typedIdMember.getKind() ) {
 				case ARRAY, DECLARED, BOOLEAN, BYTE, CHAR, SHORT, INT, LONG, FLOAT, DOUBLE -> typedIdMember;
 				case EXECUTABLE -> ((ExecutableType) typedIdMember).getReturnType();
 				default -> {
 					message( element,
-							"Unhandled id member kind: "+typedIdMember+" for id "+idMember,
+							"Unhandled id member kind '" + typedIdMember + "' for id '" + idMember + "'",
 							Diagnostic.Kind.ERROR );
 					yield null;
 				}
@@ -759,29 +840,29 @@ else if ( idType != null && finalPrimaryEntity != null ) {
 	private boolean checkEntities(List<ExecutableElement> lifecycleMethods, boolean hibernateRepo) {
 		boolean foundPersistenceEntity = false;
 		VariableElement nonPersistenceParameter = null;
-		for (ExecutableElement lifecycleMethod : lifecycleMethods) {
+		for ( ExecutableElement lifecycleMethod : lifecycleMethods ) {
 			final List<? extends VariableElement> parameters = lifecycleMethod.getParameters();
 			if ( !parameters.isEmpty() ) {
-				final VariableElement parameter = parameters.get(0);
+				final VariableElement parameter = parameters.get( 0 );
 				final TypeMirror declaredType = parameter.asType();
-				final TypeMirror parameterType = parameterType(parameter);
-				final DeclaredType type = entityType(parameterType);
+				final TypeMirror parameterType = parameterType( parameter );
+				final DeclaredType type = entityType( parameterType );
 				if ( type != null ) {
 					if ( hasAnnotation( type.asElement(), ENTITY ) ) {
 						foundPersistenceEntity = true;
 					}
 					else if ( declaredType == parameterType
-							&& nonPersistenceParameter==null ) {
+							&& nonPersistenceParameter == null ) {
 						nonPersistenceParameter = parameter;
 					}
 				}
 			}
 		}
 		if ( foundPersistenceEntity && nonPersistenceParameter != null ) {
-			message(nonPersistenceParameter,
+			message( nonPersistenceParameter,
 					"parameter type '" + nonPersistenceParameter.asType()
-							+ "' is not a Jakarta Persistence entity class (skipping entire repository)",
-					hibernateRepo ? Diagnostic.Kind.ERROR : Diagnostic.Kind.WARNING);
+					+ "' is not a Jakarta Persistence entity class (skipping entire repository)",
+					hibernateRepo ? Diagnostic.Kind.ERROR : Diagnostic.Kind.WARNING );
 		}
 		return nonPersistenceParameter == null;
 	}
@@ -795,22 +876,22 @@ private void validateStatelessSessionType() {
 	}
 
 	private static @Nullable TypeElement primaryEntity(TypeElement element) {
-		for (TypeMirror typeMirror : element.getInterfaces()) {
+		for ( TypeMirror typeMirror : element.getInterfaces() ) {
 			final DeclaredType declaredType = (DeclaredType) typeMirror;
 			final TypeElement typeElement = (TypeElement) declaredType.asElement();
 			final Name name = typeElement.getQualifiedName();
 			if ( declaredType.getTypeArguments().size() == 2
-					&& (name.contentEquals(BASIC_REPOSITORY)
-						|| name.contentEquals(CRUD_REPOSITORY)
-						|| name.contentEquals(DATA_REPOSITORY)) ) {
-				final TypeMirror entityType = declaredType.getTypeArguments().get(0);
+				&& (name.contentEquals( BASIC_REPOSITORY )
+					|| name.contentEquals( CRUD_REPOSITORY )
+					|| name.contentEquals( DATA_REPOSITORY )) ) {
+				final TypeMirror entityType = declaredType.getTypeArguments().get( 0 );
 				if ( entityType.getKind() == TypeKind.DECLARED ) {
 					final DeclaredType entityDeclared = (DeclaredType) entityType;
 					return (TypeElement) entityDeclared.asElement();
 				}
 			}
 			else {
-				final TypeElement primaryEntity = primaryEntity(typeElement);
+				final TypeElement primaryEntity = primaryEntity( typeElement );
 				if ( primaryEntity != null ) {
 					return primaryEntity;
 				}
@@ -823,7 +904,7 @@ private void validateStatelessSessionType() {
 		// first see if we are a subtype of DataRepository
 		// in that case, the first type argument determines
 		// the primary entity type
-		TypeElement result = primaryEntity(element);
+		TypeElement result = primaryEntity( element );
 		if ( result != null ) {
 			return result;
 		}
@@ -832,9 +913,9 @@ private void validateStatelessSessionType() {
 		// entity type; if so, it is the primary
 		final Types types = context.getTypeUtils();
 		for ( ExecutableElement element : lifecycleMethods ) {
-			if ( element.getParameters().size()==1 ) {
-				final VariableElement param = element.getParameters().get(0);
-				final DeclaredType declaredType = entityType( parameterType(param) );
+			if ( element.getParameters().size() == 1 ) {
+				final VariableElement param = element.getParameters().get( 0 );
+				final DeclaredType declaredType = entityType( parameterType( param ) );
 				if ( declaredType != null ) {
 					if ( result == null ) {
 						result = (TypeElement) declaredType.asElement();
@@ -851,8 +932,8 @@ private void validateStatelessSessionType() {
 	}
 
 	private void addDefaultConstructor() {
-		final String sessionVariableName = getSessionVariableName(sessionType);
-		putMember("_", new DefaultConstructor(
+		final String sessionVariableName = getSessionVariableName( sessionType );
+		putMember( "_", new DefaultConstructor(
 				this,
 				getConstructorName(),
 				sessionVariableName,
@@ -860,14 +941,14 @@ private void addDefaultConstructor() {
 				sessionVariableName,
 				dataStore(),
 				context.addInjectAnnotation()
-		));
+		) );
 	}
 
 	private @Nullable String dataStore() {
 		final AnnotationMirror repo = getAnnotationMirror( element, JD_REPOSITORY );
 		if ( repo != null ) {
 			final AnnotationValue dataStoreValue = getAnnotationValue( repo, "dataStore" );
-			if (dataStoreValue != null) {
+			if ( dataStoreValue != null ) {
 				final String dataStore = dataStoreValue.getValue().toString();
 				if ( !dataStore.isEmpty() ) {
 					return dataStore;
@@ -885,33 +966,33 @@ private void setupSession() {
 				// Never make a DAO for Panache subtypes
 				if ( !isPanacheType( element ) && !isPanache2Type( element ) ) {
 					repository = true;
-					sessionType = addDaoConstructor( getter );
+					sessionType = addRepositoryConstructor( getter );
 				}
-				else if ( ! isPanache2Repository( element ) && !isPanache2Type( element ) ) {
+				else if ( !isPanache2Repository( element ) && !isPanache2Type( element ) ) {
 					// For Panache 1 subtypes, we look at the session type, but no DAO,
 					// we want static methods
-					sessionType = fullReturnType(getter);
+					sessionType = fullReturnType( getter );
 				}
 				else {
 					// For Panache 2 repositories we want a repository
 					repository = true;
-					sessionType =  setupQuarkusDaoConstructor( getter, element );
+					sessionType = setupQuarkusRepositoryConstructor( getter, element );
 				}
 			}
 			else if ( element.getKind() == ElementKind.INTERFACE
 					&& !jakartaDataRepository
-					&& ( context.usesQuarkusOrm() || context.usesQuarkusReactive() || context.usesQuarkusPanache2() ) ) {
+					&& (context.usesQuarkusOrm() || context.usesQuarkusReactive() || context.usesQuarkusPanache2()) ) {
 				// if we don't have a getter, and not a JD repository, but we're in Quarkus,
 				// we know how to find the default sessions
 				repository = true;
-				sessionType = setupQuarkusDaoConstructor( null, element );
+				sessionType = setupQuarkusRepositoryConstructor( null, element );
 			}
 			if ( !repository && jakartaDataRepository ) {
 				repository = true;
 				// Jakarta Data defaults to StatelessSession, not EntityManager
 				sessionType = HIB_STATELESS_SESSION;
 				// If it's Spring, we wrap the StatelessSession in ObjectProvider
-				sessionType = addDaoConstructor( null );
+				sessionType = addRepositoryConstructor( null );
 			}
 			if ( needsDefaultConstructor() ) {
 				addDefaultConstructor();
@@ -931,18 +1012,17 @@ private boolean needsEventBus() {
 	}
 
 	void addEventBus() {
-		putMember("_event", new EventField(this) );
+		putMember( "_event", new EventField( this ) );
 	}
 
 	/**
 	 * For usage with CDI, but outside Quarkus, Jakarta Data
-	 * repositories use {@code @PersistenceUnit} to obtain an
-	 * {@code EntityManagerFactory} via field injection. So in
-	 * that case we will need a {@link DefaultConstructor default
-	 * constructor}. We don't do this in Quarkus, because there
-	 * we can just inject the {@code StatelessSession} directly,
-	 * and so in Quarkus we don't need the default constructor
-	 * at all.
+	 * repositories use {@code @PersistenceUnit} to obtain
+	 * an {@code EntityManagerFactory} via field injection.
+	 * So here we need a {@linkplain DefaultConstructor
+	 * default constructor}. We don't need one in Quarkus,
+	 * because in Quarkus we can inject a container-managed
+	 * {@code StatelessSession} directly.
 	 */
 	boolean needsDefaultConstructor() {
 		return jakartaDataRepository
@@ -953,7 +1033,7 @@ boolean needsDefaultConstructor() {
 
 	private @Nullable ExecutableElement findSessionGetter(TypeElement type) {
 		if ( !hasAnnotation( type, ENTITY, MAPPED_SUPERCLASS, EMBEDDABLE )
-				|| isPanacheType( type ) ) {
+			|| isPanacheType( type ) ) {
 			for ( ExecutableElement method : methodsIn( type.getEnclosedElements() ) ) {
 				if ( isSessionGetter( method ) ) {
 					return method;
@@ -981,19 +1061,23 @@ boolean needsDefaultConstructor() {
 	}
 
 	public boolean isStatelessSession() {
-		return usingStatelessSession(sessionType);
+		return usingStatelessSession( sessionType );
 	}
 
 	public boolean isReactive() {
-		return usingReactiveSession(sessionType);
+		return usingReactiveSession( sessionType );
 	}
 
 	public boolean isReactiveSessionAccess() {
-		return usingReactiveSessionAccess(sessionType);
+		return usingReactiveSessionAccess( sessionType );
 	}
 
 	public boolean isProvidedSessionAccess() {
-		return sessionType.startsWith(SPRING_OBJECT_PROVIDER);
+		return isProvidedSessionAccess( sessionType );
+	}
+
+	public static boolean isProvidedSessionAccess(String sessionType) {
+		return sessionType.startsWith( SPRING_OBJECT_PROVIDER );
 	}
 
 	private boolean isPanacheType(TypeElement type) {
@@ -1013,15 +1097,14 @@ private boolean isReactivePanacheType(TypeElement type) {
 
 	private boolean isPanache2Type(TypeElement type) {
 		return implementsInterface( type, PANACHE2_ENTITY_MARKER )
-				|| isPanache2Repository( type );
+			|| isPanache2Repository( type );
 	}
 
-	private boolean isPanache2Repository(TypeElement type) {
+	public static boolean isPanache2Repository(TypeElement type) {
 		return implementsInterface( type, PANACHE2_MANAGED_BLOCKING_REPOSITORY_BASE )
-				|| implementsInterface( type, PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE )
-				|| implementsInterface( type, PANACHE2_MANAGED_REACTIVE_REPOSITORY_BASE )
-				|| implementsInterface( type, PANACHE2_STATELESS_REACTIVE_REPOSITORY_BASE )
-				;
+			|| implementsInterface( type, PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE )
+			|| implementsInterface( type, PANACHE2_MANAGED_REACTIVE_REPOSITORY_BASE )
+			|| implementsInterface( type, PANACHE2_STATELESS_REACTIVE_REPOSITORY_BASE );
 	}
 
 	/**
@@ -1029,8 +1112,8 @@ private boolean isPanache2Repository(TypeElement type) {
 	 * variable backing it, together with a constructor that initializes
 	 * it.
 	 */
-	private String addDaoConstructor(@Nullable ExecutableElement method) {
-		final String returnType = method == null ? this.sessionType : fullReturnType( method );
+	private String addRepositoryConstructor(@Nullable ExecutableElement method) {
+		final String returnType = method == null ? sessionType : fullReturnType( method );
 		final String sessionType =
 				jakartaDataRepository && springInjection
 						? SPRING_OBJECT_PROVIDER + '<' + returnType + '>'
@@ -1054,6 +1137,9 @@ private String addDaoConstructor(@Nullable ExecutableElement method) {
 							quarkusInjection
 					)
 			);
+			if ( isProvidedSessionAccess( sessionType ) ) {
+				sessionGetter = name + "()";
+			}
 		}
 		else {
 			// use this getter to get the method, do not generate an injection point for its type
@@ -1068,48 +1154,11 @@ private String addDaoConstructor(@Nullable ExecutableElement method) {
 	 * For Panache 2, we can use the element to figure out what kind of session we want since this
 	 * is for repositories
 	 */
-	private String setupQuarkusDaoConstructor(@Nullable ExecutableElement getter, @Nullable TypeElement element) {
-		boolean favorBlocking = context.usesQuarkusOrm()
-								|| (context.usesQuarkusPanache2()
-									&& element != null
-									&& (implementsInterface(element, PANACHE2_MANAGED_BLOCKING_REPOSITORY_BASE)
-										|| implementsInterface(element, PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE)));
-		if ( context.usesQuarkusPanache2()
-			&& element != null
-			&& !implementsInterface(element, PANACHE2_MANAGED_BLOCKING_REPOSITORY_BASE)
-			&& !implementsInterface(element, PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE)
-			&& !implementsInterface(element, PANACHE2_MANAGED_REACTIVE_REPOSITORY_BASE)
-			&& !implementsInterface(element, PANACHE2_STATELESS_REACTIVE_REPOSITORY_BASE)
-			// FIXME: add other default for JD repos?
-			) {
-			// look for any annotated method, see if they return a Uni
-			final List<ExecutableElement> methodsOfClass =
-					methodsIn( context.getAllMembers( element ) );
-			for ( ExecutableElement method : methodsOfClass ) {
-				// trust the first method, no need to look for them all
-				if ( containsAnnotation( method, HQL, SQL, JD_QUERY, FIND, JD_FIND ) ) {
-					favorBlocking = !isUni( method.getReturnType() );
-					break;
-				}
-			}
-		}
+	private String setupQuarkusRepositoryConstructor(@Nullable ExecutableElement getter, @Nullable TypeElement element) {
 		// FIXME: probably go in this branch if we have a getter too?
-		if ( favorBlocking ) {
-			String name;
-			String sessionType;
-			if ( getter != null ) {
-				name = getter.getSimpleName().toString();
-				sessionType = fullReturnType(getter);
-			}
-			else if(element != null
-					&& implementsInterface(element, PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE)) {
-				name = "getStatelessSession";
-				sessionType = HIB_STATELESS_SESSION;
-			}
-			else { // good default
-				name = "getSession";
-				sessionType = HIB_SESSION;
-			}
+		if ( isBlockingFavored( element ) ) {
+			final String name = quarkusSessionGetterName( getter, element );
+			final String sessionType = quarkusSessionType( getter, element );
 			putMember( name,
 					new RepositoryConstructor(
 							this,
@@ -1130,8 +1179,7 @@ && implementsInterface(element, PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE)) {
 		else {
 			importType( Constants.QUARKUS_SESSION_OPERATIONS );
 			// use this getter to get the method, do not generate an injection point for its type
-			if(element != null
-					&& implementsInterface(element, PANACHE2_STATELESS_REACTIVE_REPOSITORY_BASE)) {
+			if ( element != null && isPanache2StatelessReactiveRepository( element ) ) {
 				sessionGetter = "SessionOperations.getStatelessSession()";
 				return UNI_MUTINY_STATELESS_SESSION;
 			}
@@ -1142,13 +1190,70 @@ && implementsInterface(element, PANACHE2_STATELESS_REACTIVE_REPOSITORY_BASE)) {
 		}
 	}
 
+	private static String quarkusSessionGetterName(@Nullable ExecutableElement getter, @Nullable TypeElement element) {
+		if ( getter != null ) {
+			return getter.getSimpleName().toString();
+		}
+		else if ( element != null && isPanache2StatelessBlockingRepository( element ) ) {
+			return "getStatelessSession";
+		}
+		else { // good default
+			return "getSession";
+		}
+	}
+
+	private String quarkusSessionType(@Nullable ExecutableElement getter, @Nullable TypeElement element) {
+		if ( getter != null ) {
+			return fullReturnType( getter );
+		}
+		else if ( element != null && isPanache2StatelessBlockingRepository( element ) ) {
+			return HIB_STATELESS_SESSION;
+		}
+		else { // good default
+			return HIB_SESSION;
+		}
+	}
+
+	private boolean isBlockingFavored(@Nullable TypeElement element) {
+		if ( element != null ) {
+			if ( context.usesQuarkusPanache2()
+					&& isPanache2Repository( element ) ) {
+				return isPanache2BlockingRepository( element );
+			}
+			else {
+				// look for any annotated method, see if they return a Uni
+				for ( ExecutableElement method : methodsIn( context.getAllMembers( element ) ) ) {
+					// trust the first method, no need to look for them all
+					if ( containsAnnotation( method, HQL, SQL, JD_QUERY, FIND, JD_FIND ) ) {
+						return !isUni( method.getReturnType() );
+					}
+				}
+			}
+		}
+		return context.usesQuarkusOrm();
+	}
+
+	private static boolean isPanache2BlockingRepository(@NonNull TypeElement element) {
+		return implementsInterface( element, PANACHE2_MANAGED_BLOCKING_REPOSITORY_BASE )
+			|| implementsInterface( element, PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE );
+	}
+
+	private static boolean isPanache2StatelessReactiveRepository(@NonNull TypeElement element) {
+		return implementsInterface( element, PANACHE2_STATELESS_REACTIVE_REPOSITORY_BASE );
+	}
+
+	private static boolean isPanache2StatelessBlockingRepository(@NonNull TypeElement element) {
+		return implementsInterface( element, PANACHE2_STATELESS_BLOCKING_REPOSITORY_BASE );
+	}
+
 	/**
 	 * The session getter method doesn't have to be a JavaBeans-style
 	 * getter. It can be any method with no parameters and one of the
 	 * needed return types.
 	 */
-	private static boolean isSessionGetter(ExecutableElement method) {
+	private boolean isSessionGetter(ExecutableElement method) {
 		return method.getParameters().isEmpty()
+			&& !(jakartaDataRepository && method.isDefault()) // resource accessor methods must be abstract
 			&& isSessionGetterType( method.getReturnType() );
 	}
 
@@ -1159,17 +1264,17 @@ private static boolean isSessionGetterType(TypeMirror returnType) {
 			if ( element.getKind() == ElementKind.INTERFACE ) {
 				final TypeElement typeElement = (TypeElement) element;
 				final Name name = typeElement.getQualifiedName();
-				if ( name.contentEquals(UNI) || name.contentEquals(SPRING_OBJECT_PROVIDER) ) {
+				if ( name.contentEquals( UNI ) || name.contentEquals( SPRING_OBJECT_PROVIDER ) ) {
 					final var typeArguments = declaredType.getTypeArguments();
 					return typeArguments.size() == 1
 						&& isSessionGetterType( typeArguments.get( 0 ) );
 				}
 				else {
-					return name.contentEquals(HIB_SESSION)
-						|| name.contentEquals(HIB_STATELESS_SESSION)
-						|| name.contentEquals(MUTINY_SESSION)
-						|| name.contentEquals(MUTINY_STATELESS_SESSION)
-						|| name.contentEquals(ENTITY_MANAGER);
+					return name.contentEquals( HIB_SESSION )
+						|| name.contentEquals( HIB_STATELESS_SESSION )
+						|| name.contentEquals( MUTINY_SESSION )
+						|| name.contentEquals( MUTINY_STATELESS_SESSION )
+						|| name.contentEquals( ENTITY_MANAGER );
 				}
 			}
 			else {
@@ -1185,7 +1290,6 @@ private static boolean isSessionGetterType(TypeMirror returnType) {
 	 * Check if method respects Java Bean conventions for getter and setters.
 	 *
 	 * @param methodOfClass method element
-	 *
 	 * @return whether method respects Java Bean conventions.
 	 */
 	private boolean isGetterOrSetter(Element methodOfClass) {
@@ -1201,7 +1305,7 @@ private static boolean hasPrefix(Name methodSimpleName, String prefix) {
 		final int prefixLength = prefix.length();
 		if ( methodSimpleName.length() > prefixLength ) {
 			for ( int i = 0; i < prefixLength; i++ ) {
-				if ( methodSimpleName.charAt(i) != prefix.charAt(i) ) {
+				if ( methodSimpleName.charAt( i ) != prefix.charAt( i ) ) {
 					return false;
 				}
 			}
@@ -1216,7 +1320,7 @@ private static boolean isGetter(
 			Name methodSimpleName,
 			List<? extends TypeMirror> methodParameterTypes,
 			TypeMirror returnType) {
-		return ( hasPrefix( methodSimpleName, "get" ) || hasPrefix( methodSimpleName,"is" ) )
+		return ( hasPrefix( methodSimpleName, "get" ) || hasPrefix( methodSimpleName, "is" ) )
 			&& methodParameterTypes.isEmpty()
 			&& returnType.getKind() != TypeKind.VOID;
 	}
@@ -1225,17 +1329,17 @@ private static boolean isSetter(
 			Name methodSimpleName,
 			List<? extends TypeMirror> methodParameterTypes,
 			TypeMirror returnType) {
-		return hasPrefix( methodSimpleName, "set")
+		return hasPrefix( methodSimpleName, "set" )
 			&& methodParameterTypes.size() == 1
 			&& returnType.getKind() != TypeKind.VOID;
 	}
 
 	private void validatePersistentMembers(List<? extends Element> membersOfClass) {
 		for ( Element memberOfClass : membersOfClass ) {
-			if ( hasAnnotation(memberOfClass, MANY_TO_ONE, ONE_TO_ONE, ONE_TO_MANY, MANY_TO_MANY) ) {
-				validateAssociation(memberOfClass);
+			if ( hasAnnotation( memberOfClass, MANY_TO_ONE, ONE_TO_ONE, ONE_TO_MANY, MANY_TO_MANY ) ) {
+				validateAssociation( memberOfClass );
 			}
-			if ( hasAnnotation(memberOfClass, ORDER_BY) ) {
+			if ( hasAnnotation( memberOfClass, ORDER_BY ) ) {
 				validateOrderBy( memberOfClass );
 			}
 		}
@@ -1243,8 +1347,8 @@ private void validatePersistentMembers(List<? extends Element> membersOfClass) {
 
 	private void validateOrderBy(Element memberOfClass) {
 		final AnnotationMirror annotation =
-				castNonNull(getAnnotationMirror( memberOfClass, ORDER_BY));
-		final AnnotationValue annotationValue = getAnnotationValue(annotation);
+				castNonNull( getAnnotationMirror( memberOfClass, ORDER_BY ) );
+		final AnnotationValue annotationValue = getAnnotationValue( annotation );
 		if ( annotationValue != null ) {
 			final String fragment = annotationValue.getValue().toString();
 			if ( !fragment.isBlank() ) {
@@ -1264,8 +1368,8 @@ private void validateOrderBy(Element memberOfClass) {
 
 	private void addPersistentMembers(List<? extends Element> membersOfClass, AccessType membersKind) {
 		for ( Element memberOfClass : membersOfClass ) {
-			if ( isPersistent(memberOfClass, membersKind) ) {
-				addPersistentMember(memberOfClass);
+			if ( isPersistent( memberOfClass, membersKind ) ) {
+				addPersistentMember( memberOfClass );
 			}
 		}
 	}
@@ -1274,20 +1378,20 @@ private void addPersistentMember(Element memberOfClass) {
 		if ( jakartaDataStaticModel ) {
 			final DataAnnotationMetaAttribute dataMetaAttribute =
 					memberOfClass.asType()
-							.accept( new DataMetaAttributeGenerationVisitor(this, context), memberOfClass );
+							.accept( new DataMetaAttributeGenerationVisitor( this, context ), memberOfClass );
 			if ( dataMetaAttribute != null ) {
 				final String path = dataMetaAttribute.getPropertyName();
-				members.put('_' + path, dataMetaAttribute);
-				if ( isEmbedded(memberOfClass) ) {
-					final TypeMirror type = attributeType(memberOfClass);
+				members.put( '_' + path, dataMetaAttribute );
+				if ( isEmbedded( memberOfClass ) ) {
+					final TypeMirror type = attributeType( memberOfClass );
 					final DeclaredType declaredType = (DeclaredType) type;
 					final TypeElement typeElement = (TypeElement) declaredType.asElement();
 					for ( Element field : fieldsIn( typeElement.getEnclosedElements() ) ) {
-						addEmbeddablePersistentMember(field, path, AccessType.FIELD);
+						addEmbeddablePersistentMember( field, path, AccessType.FIELD );
 					}
 					for ( Element method : methodsIn( typeElement.getEnclosedElements() ) ) {
-						if ( isGetterOrSetter(method) ) {
-							addEmbeddablePersistentMember(method, path, AccessType.PROPERTY);
+						if ( isGetterOrSetter( method ) ) {
+							addEmbeddablePersistentMember( method, path, AccessType.PROPERTY );
 						}
 					}
 				}
@@ -1296,7 +1400,7 @@ private void addPersistentMember(Element memberOfClass) {
 		else {
 			final AnnotationMetaAttribute jpaMetaAttribute =
 					memberOfClass.asType()
-							.accept( new MetaAttributeGenerationVisitor( this, context ), memberOfClass);
+							.accept( new MetaAttributeGenerationVisitor( this, context ), memberOfClass );
 			if ( jpaMetaAttribute != null ) {
 				members.put( jpaMetaAttribute.getPropertyName(), jpaMetaAttribute );
 			}
@@ -1304,24 +1408,24 @@ private void addPersistentMember(Element memberOfClass) {
 	}
 
 	private void addEmbeddablePersistentMember(Element memberOfEmbeddable, String path, AccessType membersKind) {
-		if ( isPersistent(memberOfEmbeddable, membersKind) ) { //TODO respect AccessType of embeddable
+		if ( isPersistent( memberOfEmbeddable, membersKind ) ) { //TODO respect AccessType of embeddable
 			final DataAnnotationMetaAttribute metaAttribute =
 					memberOfEmbeddable.asType()
-							.accept( new DataMetaAttributeGenerationVisitor(this, path, context),
+							.accept( new DataMetaAttributeGenerationVisitor( this, path, context ),
 									memberOfEmbeddable );
-			if (metaAttribute != null) {
-				members.put('_' + metaAttribute.getPropertyName(),
-						metaAttribute);
+			if ( metaAttribute != null ) {
+				members.put( '_' + metaAttribute.getPropertyName(),
+						metaAttribute );
 			}
 		}
 	}
 
 	static boolean isEmbedded(Element memberOfClass) {
-		if ( hasAnnotation(memberOfClass, EMBEDDED) ) {
+		if ( hasAnnotation( memberOfClass, EMBEDDED ) ) {
 			return true;
 		}
 		else {
-			final TypeMirror type = attributeType(memberOfClass);
+			final TypeMirror type = attributeType( memberOfClass );
 			if ( type.getKind() == TypeKind.DECLARED ) {
 				final DeclaredType declaredType = (DeclaredType) type;
 				return hasAnnotation( declaredType.asElement(), EMBEDDABLE );
@@ -1333,26 +1437,26 @@ static boolean isEmbedded(Element memberOfClass) {
 	}
 
 	private void validateAssociation(Element memberOfClass) {
-		final TypeMirror type = attributeType(memberOfClass);
-		if ( hasAnnotation(memberOfClass, MANY_TO_ONE) ) {
+		final TypeMirror type = attributeType( memberOfClass );
+		if ( hasAnnotation( memberOfClass, MANY_TO_ONE ) ) {
 			final AnnotationMirror annotation =
-					castNonNull(getAnnotationMirror(memberOfClass, MANY_TO_ONE));
-			validateToOneAssociation(memberOfClass, annotation, type);
+					castNonNull( getAnnotationMirror( memberOfClass, MANY_TO_ONE ) );
+			validateToOneAssociation( memberOfClass, annotation, type );
 		}
-		else if ( hasAnnotation(memberOfClass, ONE_TO_ONE) ) {
+		else if ( hasAnnotation( memberOfClass, ONE_TO_ONE ) ) {
 			final AnnotationMirror annotation =
-					castNonNull(getAnnotationMirror(memberOfClass, ONE_TO_ONE));
-			validateToOneAssociation(memberOfClass, annotation, type);
+					castNonNull( getAnnotationMirror( memberOfClass, ONE_TO_ONE ) );
+			validateToOneAssociation( memberOfClass, annotation, type );
 		}
-		else if ( hasAnnotation(memberOfClass, ONE_TO_MANY) ) {
+		else if ( hasAnnotation( memberOfClass, ONE_TO_MANY ) ) {
 			final AnnotationMirror annotation =
-					castNonNull(getAnnotationMirror(memberOfClass, ONE_TO_MANY));
-			validateToManyAssociation(memberOfClass, annotation, type);
+					castNonNull( getAnnotationMirror( memberOfClass, ONE_TO_MANY ) );
+			validateToManyAssociation( memberOfClass, annotation, type );
 		}
-		else if ( hasAnnotation(memberOfClass, MANY_TO_MANY) ) {
+		else if ( hasAnnotation( memberOfClass, MANY_TO_MANY ) ) {
 			final AnnotationMirror annotation =
-					castNonNull(getAnnotationMirror(memberOfClass, MANY_TO_MANY));
-			validateToManyAssociation(memberOfClass, annotation, type);
+					castNonNull( getAnnotationMirror( memberOfClass, MANY_TO_MANY ) );
+			validateToManyAssociation( memberOfClass, annotation, type );
 		}
 	}
 
@@ -1364,47 +1468,48 @@ private static TypeMirror attributeType(Element memberOfClass) {
 			case FIELD:
 				return memberOfClass.asType();
 			default:
-				throw new AssertionFailure("should be a field or getter");
+				throw new AssertionFailure( "should be a field or getter" );
 		}
 	}
 
 	private void validateToOneAssociation(Element memberOfClass, AnnotationMirror annotation, TypeMirror type) {
-		final AnnotationValue target = getAnnotationValue(annotation, "targetEntity");
-		validateAssociation(memberOfClass, annotation, target == null ? type : (TypeMirror) target.getValue());
+		final AnnotationValue target = getAnnotationValue( annotation, "targetEntity" );
+		validateAssociation( memberOfClass, annotation, target == null ? type : (TypeMirror) target.getValue() );
 	}
 
 	private void validateToManyAssociation(Element memberOfClass, AnnotationMirror annotation, TypeMirror type) {
-		final AnnotationValue target = getAnnotationValue(annotation, "targetEntity");
-		validateAssociation(memberOfClass, annotation, target == null ? elementType(type) : (TypeMirror) target.getValue());
+		final AnnotationValue target = getAnnotationValue( annotation, "targetEntity" );
+		validateAssociation( memberOfClass, annotation,
+				target == null ? elementType( type ) : (TypeMirror) target.getValue() );
 	}
 
 	private void validateAssociation(Element memberOfClass, AnnotationMirror annotation, @Nullable TypeMirror typeMirror) {
 		if ( typeMirror != null ) {
 			switch ( typeMirror.getKind() ) {
 				case TYPEVAR:
-					if ( hasAnnotation(element, ENTITY) ) {
-						message(memberOfClass, "type '" + typeMirror + "' is a type variable",
-								Diagnostic.Kind.WARNING);
+					if ( hasAnnotation( element, ENTITY ) ) {
+						message( memberOfClass, "type '" + typeMirror + "' is a type variable",
+								Diagnostic.Kind.WARNING );
 					}
 					break;
 				case DECLARED:
 					final DeclaredType assocDeclaredType = (DeclaredType) typeMirror;
 					final TypeElement assocTypeElement = (TypeElement) assocDeclaredType.asElement();
-					if ( hasAnnotation(assocTypeElement, ENTITY) ) {
-						final AnnotationValue mappedBy = getAnnotationValue(annotation, "mappedBy");
+					if ( hasAnnotation( assocTypeElement, ENTITY ) ) {
+						final AnnotationValue mappedBy = getAnnotationValue( annotation, "mappedBy" );
 						if ( mappedBy != null ) {
-							validateBidirectionalMapping(memberOfClass, annotation, mappedBy, assocTypeElement);
+							validateBidirectionalMapping( memberOfClass, annotation, mappedBy, assocTypeElement );
 						}
 					}
 					else {
-						message(memberOfClass, "type '" + assocTypeElement.getSimpleName()
-										+ "' is not annotated '@Entity'",
-								Diagnostic.Kind.WARNING);
+						message( memberOfClass, "type '" + assocTypeElement.getSimpleName()
+												+ "' is not annotated '@Entity'",
+								Diagnostic.Kind.WARNING );
 					}
 					break;
 				default:
-					message(memberOfClass, "type '" + typeMirror + "' is not an entity type",
-							Diagnostic.Kind.WARNING);
+					message( memberOfClass, "type '" + typeMirror + "' is not an entity type",
+							Diagnostic.Kind.WARNING );
 			}
 		}
 	}
@@ -1413,16 +1518,16 @@ private void validateBidirectionalMapping(
 			Element memberOfClass, AnnotationMirror annotation, AnnotationValue annotationVal, TypeElement assocTypeElement) {
 		final String mappedBy = annotationVal.getValue().toString();
 		if ( mappedBy != null && !mappedBy.isEmpty()
-				// this happens for a typesafe ref, e.g. Page_BOOK
-				// TODO: we should queue it to validate it later somehow
-				&& !mappedBy.equals( "<error>" ) ) {
+			// this happens for a typesafe ref, e.g. Page_BOOK
+			// TODO: we should queue it to validate it later somehow
+			&& !mappedBy.equals( "<error>" ) ) {
 			if ( mappedBy.indexOf( '.' ) > 0 ) {
 				//we don't know how to handle paths yet
 				return;
 			}
 			for ( Element member : context.getAllMembers( assocTypeElement ) ) {
 				if ( propertyName( member ).contentEquals( mappedBy )
-						&& compatibleAccess( assocTypeElement, member ) ) {
+					&& compatibleAccess( assocTypeElement, member ) ) {
 					validateBackRef( memberOfClass, annotation, assocTypeElement, member, annotationVal );
 					return;
 				}
@@ -1436,7 +1541,7 @@ && compatibleAccess( assocTypeElement, member ) ) {
 
 	private boolean compatibleAccess(TypeElement assocTypeElement, Element member) {
 		final AccessType memberAccessType = determineAnnotationSpecifiedAccessType( member );
-		final AccessType accessType = memberAccessType == null ? getAccessType(assocTypeElement) : memberAccessType;
+		final AccessType accessType = memberAccessType == null ? getAccessType( assocTypeElement ) : memberAccessType;
 		return switch ( member.getKind() ) {
 			case FIELD -> accessType == AccessType.FIELD;
 			case METHOD -> accessType == AccessType.PROPERTY;
@@ -1454,19 +1559,19 @@ private void validateBackRef(
 		final String expectedMappingAnnotation;
 		switch ( annotation.getAnnotationType().asElement().toString() ) {
 			case ONE_TO_ONE:
-				backType = attributeType(referencedMember);
+				backType = attributeType( referencedMember );
 				expectedMappingAnnotation = ONE_TO_ONE;
 				break;
 			case ONE_TO_MANY:
-				backType = attributeType(referencedMember);
+				backType = attributeType( referencedMember );
 				expectedMappingAnnotation = MANY_TO_ONE;
 				break;
 			case MANY_TO_MANY:
-				backType = elementType( attributeType(referencedMember) );
+				backType = elementType( attributeType( referencedMember ) );
 				expectedMappingAnnotation = MANY_TO_MANY;
 				break;
 			default:
-				throw new AssertionFailure("should not have a mappedBy");
+				throw new AssertionFailure( "should not have a mappedBy" );
 		}
 		if ( backType != null ) {
 			final Element idMember = getIdMember();
@@ -1479,19 +1584,19 @@ else if ( typeUtils.isSameType( backType, element.asType() ) ) {
 				// mappedBy references a field of the same type as the entity
 				// it needs to be mapped as the appropriate sort of association
 				if ( !hasAnnotation( referencedMember, expectedMappingAnnotation ) ) {
-					message(memberOfClass, annotation, annotationVal,
+					message( memberOfClass, annotation, annotationVal,
 							"member '" + referencedMember.getSimpleName()
-									+ "' of '" + assocTypeElement.getSimpleName()
-									+ "' is not annotated '@" + unqualify(expectedMappingAnnotation) + "'",
-							Diagnostic.Kind.WARNING);
+							+ "' of '" + assocTypeElement.getSimpleName()
+							+ "' is not annotated '@" + unqualify( expectedMappingAnnotation ) + "'",
+							Diagnostic.Kind.WARNING );
 				}
 			}
 			else {
 				// mappedBy references a field which seems to be of the wrong type
 				message( memberOfClass, annotation, annotationVal,
 						"member '" + referencedMember.getSimpleName()
-								+ "' of '" + assocTypeElement.getSimpleName()
-								+ "' is not of type '" + element.getSimpleName() + "'",
+						+ "' of '" + assocTypeElement.getSimpleName()
+						+ "' is not of type '" + element.getSimpleName() + "'",
 						Diagnostic.Kind.WARNING );
 			}
 		}
@@ -1507,18 +1612,18 @@ else if ( typeUtils.isSameType( backType, element.asType() ) ) {
 	}
 
 	private boolean isPersistent(Element memberOfClass, AccessType membersKind) {
-		return ( entityAccessTypeInfo.getAccessType() == membersKind
-					|| determineAnnotationSpecifiedAccessType( memberOfClass ) != null )
+		return (entityAccessTypeInfo.getAccessType() == membersKind
+				|| determineAnnotationSpecifiedAccessType( memberOfClass ) != null)
 			&& !containsAnnotation( memberOfClass, TRANSIENT )
 			&& !memberOfClass.getModifiers().contains( Modifier.TRANSIENT )
 			&& !memberOfClass.getModifiers().contains( Modifier.STATIC )
-			&& !( memberOfClass.getKind() == ElementKind.METHOD
-				&& isSessionGetter( (ExecutableElement) memberOfClass ) );
+			&& !(memberOfClass.getKind() == ElementKind.METHOD
+					&& isSessionGetter( (ExecutableElement) memberOfClass ));
 	}
 
 	private void addLifecycleMethods(List<ExecutableElement> queryMethods) {
-		for ( ExecutableElement method : queryMethods) {
-			if ( method.getModifiers().contains(Modifier.ABSTRACT) ) {
+		for ( ExecutableElement method : queryMethods ) {
+			if ( method.getModifiers().contains( Modifier.ABSTRACT ) ) {
 				addLifecycleMethod( method );
 			}
 		}
@@ -1526,35 +1631,35 @@ private void addLifecycleMethods(List<ExecutableElement> queryMethods) {
 
 	private boolean isDeleteLifecycle(ExecutableElement method) {
 		if ( method.getParameters().size() == 1 ) {
-			final VariableElement parameter = method.getParameters().get(0);
-			final DeclaredType declaredType = entityType( parameterType(parameter) );
+			final VariableElement parameter = method.getParameters().get( 0 );
+			final DeclaredType declaredType = entityType( parameterType( parameter ) );
 			return declaredType != null
 				&& containsAnnotation( declaredType.asElement(), ENTITY );
 
-			}
+		}
 		else {
 			return false;
 		}
 	}
 
 	private void addQueryMethods(List<ExecutableElement> queryMethods) {
-		for ( ExecutableElement method : queryMethods) {
+		for ( ExecutableElement method : queryMethods ) {
 			final Set<Modifier> modifiers = method.getModifiers();
-			if ( modifiers.contains(Modifier.ABSTRACT)
-					|| modifiers.contains(Modifier.NATIVE) ) {
+			if ( modifiers.contains( Modifier.ABSTRACT )
+				|| modifiers.contains( Modifier.NATIVE ) ) {
 				addQueryMethod( method );
 			}
 		}
 	}
 
 	private void addQueryMethod(ExecutableElement method) {
-		final TypeMirror returnType = memberMethodType(method).getReturnType();
+		final TypeMirror returnType = memberMethodType( method ).getReturnType();
 		final TypeKind kind = returnType.getKind();
 		if ( kind == TypeKind.VOID || kind == TypeKind.ARRAY || kind.isPrimitive() ) {
 			addQueryMethod( method, returnType, null );
 		}
 		else if ( kind == TypeKind.DECLARED ) {
-			final DeclaredType declaredType = (DeclaredType) unUniIfPossible(method, returnType);
+			final DeclaredType declaredType = (DeclaredType) unUniIfPossible( method, returnType );
 			final TypeElement typeElement = (TypeElement) declaredType.asElement();
 			final List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
 			switch ( typeArguments.size() ) {
@@ -1574,7 +1679,7 @@ else if ( kind == TypeKind.DECLARED ) {
 					break;
 				case 1:
 					if ( validatedQueryReturnType( method, typeElement ) ) {
-						addQueryMethod( method, typeArguments.get(0), typeElement );
+						addQueryMethod( method, typeArguments.get( 0 ), typeElement );
 					}
 					break;
 				default:
@@ -1589,7 +1694,7 @@ else if ( kind == TypeKind.DECLARED ) {
 	private TypeMirror unUniIfPossible(ExecutableElement method, TypeMirror returnType) {
 		final TypeMirror result = ununi( returnType );
 		if ( repository ) {
-			if ( isReactive() )  {
+			if ( isReactive() ) {
 				if ( result == returnType ) {
 					message( method, "backed by a reactive session, must return 'Uni'", Diagnostic.Kind.ERROR );
 				}
@@ -1607,53 +1712,53 @@ private boolean validatedQueryReturnType(ExecutableElement method, TypeElement t
 		final String typeName = typeElement.getQualifiedName().toString();
 		switch ( typeName ) {
 			case JD_PAGE:
-				if ( !hasPageRequest(method) ) {
-					message(method,
+				if ( !hasPageRequest( method ) ) {
+					message( method,
 							"method with return type '" + typeName
-									+ "' has no parameter of type 'PageRequest'",
-							Diagnostic.Kind.ERROR);
+							+ "' has no parameter of type 'PageRequest'",
+							Diagnostic.Kind.ERROR );
 					return false;
 				}
 				else {
 					return true;
 				}
 			case JD_CURSORED_PAGE:
-				if ( !hasPageRequest(method) ) {
-					message(method,
+				if ( !hasPageRequest( method ) ) {
+					message( method,
 							"method with return type '" + typeName
-									+ "' has no parameter of type 'PageRequest'",
-							Diagnostic.Kind.ERROR);
+							+ "' has no parameter of type 'PageRequest'",
+							Diagnostic.Kind.ERROR );
 					return false;
 				}
-				else if ( !hasOrder(method) ) {
-					message(method,
+				else if ( !hasOrder( method ) ) {
+					message( method,
 							"method with return type '" + typeName
-									+ "' has no parameter of type 'Order' or 'Sort' and no '@OrderBy' annotation",
-							Diagnostic.Kind.ERROR);
+							+ "' has no parameter of type 'Order' or 'Sort' and no '@OrderBy' annotation",
+							Diagnostic.Kind.ERROR );
 					return false;
 				}
 				else {
 					return true;
 				}
 			case HIB_KEYED_RESULT_LIST:
-				if ( !hashKeyedPage(method) ) {
-					message(method,
+				if ( !hashKeyedPage( method ) ) {
+					message( method,
 							"method with return type '" + typeName
-									+ "' has no parameter of type 'KeyedPage'",
-							Diagnostic.Kind.ERROR);
+							+ "' has no parameter of type 'KeyedPage'",
+							Diagnostic.Kind.ERROR );
 					return false;
 				}
 				else {
 					return true;
 				}
 			default:
-				if ( isLegalGenericResultType(typeName) ) {
+				if ( isLegalGenericResultType( typeName ) ) {
 					return true;
 				}
 				else {
-					message(method,
+					message( method,
 							"incorrect return type '" + typeName + "'",
-							Diagnostic.Kind.ERROR);
+							Diagnostic.Kind.ERROR );
 					return false;
 				}
 		}
@@ -1661,34 +1766,34 @@ else if ( !hasOrder(method) ) {
 
 	private static boolean hashKeyedPage(ExecutableElement method) {
 		return method.getParameters().stream()
-				.anyMatch(param -> typeNameEquals(param.asType(), HIB_KEYED_PAGE));
+				.anyMatch( param -> typeNameEquals( param.asType(), HIB_KEYED_PAGE ) );
 	}
 
 	private static boolean hasPageRequest(ExecutableElement method) {
 		return method.getParameters().stream()
-				.anyMatch(param -> typeNameEquals(param.asType(), JD_PAGE_REQUEST));
+				.anyMatch( param -> typeNameEquals( param.asType(), JD_PAGE_REQUEST ) );
 	}
 
 	private static boolean hasOrder(ExecutableElement method) {
-		return hasAnnotation(method, JD_ORDER_BY, JD_ORDER_BY_LIST)
+		return hasAnnotation( method, JD_ORDER_BY, JD_ORDER_BY_LIST )
 			|| method.getParameters().stream()
-				.anyMatch(param -> typeNameEquals(param.asType(), JD_ORDER)
-						|| typeNameEquals(param.asType(), JD_SORT)
-						|| typeNameEqualsArray(param.asType(), JD_SORT));
+					.anyMatch( param -> typeNameEquals( param.asType(), JD_ORDER )
+										|| typeNameEquals( param.asType(), JD_SORT )
+										|| typeNameEqualsArray( param.asType(), JD_SORT ) );
 	}
 
 	private static TypeMirror ununi(TypeMirror returnType) {
 		if ( returnType.getKind() == TypeKind.DECLARED ) {
 			final DeclaredType declaredType = (DeclaredType) returnType;
 			final TypeElement typeElement = (TypeElement) declaredType.asElement();
-			if ( typeElement.getQualifiedName().contentEquals(Constants.UNI) ) {
-				return declaredType.getTypeArguments().get(0);
+			if ( typeElement.getQualifiedName().contentEquals( Constants.UNI ) ) {
+				return declaredType.getTypeArguments().get( 0 );
 			}
 		}
 		return returnType;
 	}
 
-	private static boolean isUni (TypeMirror returnType){
+	private static boolean isUni(TypeMirror returnType) {
 		if ( returnType.getKind() == TypeKind.DECLARED ) {
 			final DeclaredType declaredType = (DeclaredType) returnType;
 			final TypeElement typeElement = (TypeElement) declaredType.asElement();
@@ -1706,12 +1811,12 @@ private static boolean isLegalGenericResultType(String containerTypeName) {
 	}
 
 	private static final Set<String> LEGAL_RAW_RESULT_TYPES
-			= Set.of(LIST, QUERY, HIB_QUERY);
+			= Set.of( LIST, QUERY, HIB_QUERY );
 
 	private static final Set<String> LEGAL_GENERIC_RESULT_TYPES
-			= Set.of(LIST, STREAM, OPTIONAL,
-					TYPED_QUERY, HIB_QUERY, HIB_SELECTION_QUERY, HIB_KEYED_RESULT_LIST,
-					JD_PAGE, JD_CURSORED_PAGE);
+			= Set.of( LIST, STREAM, OPTIONAL,
+			TYPED_QUERY, HIB_QUERY, HIB_SELECTION_QUERY, HIB_KEYED_RESULT_LIST,
+			JD_PAGE, JD_CURSORED_PAGE );
 
 	private void addQueryMethod(
 			ExecutableElement method,
@@ -1740,16 +1845,16 @@ else if ( hasAnnotation( method, JD_DELETE ) ) {
 	private void addDeleteMethod(ExecutableElement method, @Nullable TypeMirror returnType) {
 		if ( returnType != null ) {
 			if ( isReactive()
-					? isLegalReactiveDeleteReturnType(returnType)
-					: isLegalDeleteReturnType(returnType) ) {
-				createCriteriaDelete(method);
+					? isLegalReactiveDeleteReturnType( returnType )
+					: isLegalDeleteReturnType( returnType ) ) {
+				createCriteriaDelete( method );
 			}
 			else {
-				message(method,
+				message( method,
 						isReactive()
 								? "must be 'Uni<Void>' or 'Uni<Integer>'"
 								: "must be 'void' or return 'int' or 'long'",
-						Diagnostic.Kind.ERROR);
+						Diagnostic.Kind.ERROR );
 			}
 		}
 	}
@@ -1789,9 +1894,9 @@ else if ( returnType == null ) {
 					Diagnostic.Kind.ERROR );
 		}
 		else {
-			final boolean returnArgument = !isVoid(returnType);
+			final boolean returnArgument = !isVoid( returnType );
 			final String operation = lifecycleOperation( method );
-			final VariableElement parameter = method.getParameters().get(0);
+			final VariableElement parameter = method.getParameters().get( 0 );
 			final TypeMirror declaredParameterType = parameter.asType();
 			final TypeMirror parameterType = parameterType( parameter );
 			final DeclaredType declaredType = entityType( parameterType );
@@ -1811,27 +1916,27 @@ else if ( returnArgument
 					&& !isSameType( returnType, declaredParameterType ) ) {
 				message( parameter,
 						"return type '" + returnType
-								+ "' disagrees with parameter type '" + parameterType + "'",
+						+ "' disagrees with parameter type '" + parameterType + "'",
 						Diagnostic.Kind.ERROR );
 			}
 			else {
-				final String entity = typeAsString(parameterType);
+				final String entity = typeAsString( parameterType );
 				final String methodName = method.getSimpleName().toString();
 				putMember(
 						methodName + '.' + entity,
 						new LifecycleMethod(
 								this, method,
 								entity,
-								typeAsString(lifecycleParameterArgument(parameterType)),
+								typeAsString( lifecycleParameterArgument( parameterType ) ),
 								methodName,
 								parameter.getSimpleName().toString(),
 								getSessionVariableName(),
 								sessionType,
 								operation,
 								context.addNonnullAnnotation(),
-								lifecycleParameterKind(parameterType),
+								lifecycleParameterKind( parameterType ),
 								returnArgument,
-								hasGeneratedId(declaredType),
+								hasGeneratedId( declaredType ),
 								element
 						)
 				);
@@ -1839,11 +1944,11 @@ else if ( returnArgument
 		}
 	}
 
-	private boolean hasGeneratedId(DeclaredType entityType)  {
+	private boolean hasGeneratedId(DeclaredType entityType) {
 		final TypeElement typeElement = (TypeElement) entityType.asElement();
-		for ( Element member : context.getAllMembers(typeElement) ) {
-			if ( hasAnnotation(member, GENERATED_VALUE)
-					&& hasAnnotation(member, ID) ) {
+		for ( Element member : context.getAllMembers( typeElement ) ) {
+			if ( hasAnnotation( member, GENERATED_VALUE )
+				&& hasAnnotation( member, ID ) ) {
 				return true;
 			}
 			//TODO: look for generator annotations
@@ -1852,13 +1957,13 @@ && hasAnnotation(member, ID) ) {
 	}
 
 	private static LifecycleMethod.ParameterKind lifecycleParameterKind(TypeMirror parameterType) {
-		switch (parameterType.getKind()) {
+		switch ( parameterType.getKind() ) {
 			case ARRAY:
 				return LifecycleMethod.ParameterKind.ARRAY;
 			case DECLARED:
 				final DeclaredType declaredType = (DeclaredType) parameterType;
 				final TypeElement typeElement = (TypeElement) declaredType.asElement();
-				return typeElement.getQualifiedName().contentEquals(LIST)
+				return typeElement.getQualifiedName().contentEquals( LIST )
 						? LifecycleMethod.ParameterKind.LIST
 						: LifecycleMethod.ParameterKind.NORMAL;
 			default:
@@ -1867,30 +1972,30 @@ private static LifecycleMethod.ParameterKind lifecycleParameterKind(TypeMirror p
 	}
 
 	private TypeMirror lifecycleParameterArgument(TypeMirror parameterType) {
-		switch (parameterType.getKind()) {
+		switch ( parameterType.getKind() ) {
 			case ARRAY:
 				final ArrayType arrayType = (ArrayType) parameterType;
 				return arrayType.getComponentType();
 			case DECLARED:
 				final DeclaredType declaredType = (DeclaredType) parameterType;
 				final TypeElement typeElement = (TypeElement) declaredType.asElement();
-				return typeElement.getQualifiedName().contentEquals(LIST)
+				return typeElement.getQualifiedName().contentEquals( LIST )
 					&& !declaredType.getTypeArguments().isEmpty()
-						? declaredType.getTypeArguments().get(0)
-						: context.getElementUtils().getTypeElement(JAVA_OBJECT).asType();
+						? declaredType.getTypeArguments().get( 0 )
+						: context.getElementUtils().getTypeElement( JAVA_OBJECT ).asType();
 			default:
 				return parameterType;
 		}
 	}
 
 	private static boolean isVoid(TypeMirror returnType) {
-		switch (returnType.getKind()) {
+		switch ( returnType.getKind() ) {
 			case VOID:
 				return true;
 			case DECLARED:
 				final DeclaredType declaredType = (DeclaredType) returnType;
 				final TypeElement typeElement = (TypeElement) declaredType.asElement();
-				return typeElement.getQualifiedName().contentEquals(VOID);
+				return typeElement.getQualifiedName().contentEquals( VOID );
 			default:
 				return false;
 		}
@@ -1906,9 +2011,9 @@ private static boolean isVoid(TypeMirror returnType) {
 			case DECLARED:
 				final DeclaredType declaredType = (DeclaredType) parameterType;
 				final TypeElement typeElement = (TypeElement) declaredType.asElement();
-				if ( typeElement.getQualifiedName().contentEquals(LIST)
-						&& !declaredType.getTypeArguments().isEmpty() ) {
-					final TypeMirror elementType = types.erasure( declaredType.getTypeArguments().get(0) );
+				if ( typeElement.getQualifiedName().contentEquals( LIST )
+					&& !declaredType.getTypeArguments().isEmpty() ) {
+					final TypeMirror elementType = types.erasure( declaredType.getTypeArguments().get( 0 ) );
 					return elementType.getKind() == TypeKind.DECLARED ? (DeclaredType) elementType : null;
 				}
 				else {
@@ -1929,8 +2034,8 @@ private static boolean isVoid(TypeMirror returnType) {
 				final DeclaredType declaredType = (DeclaredType) parameterType;
 				final List<? extends TypeMirror> typeArguments = declaredType.getTypeArguments();
 				return switch ( typeArguments.size() ) {
-					case 1 -> typeArguments.get(0);
-					case 2 -> typeArguments.get(1);
+					case 1 -> typeArguments.get( 0 );
+					case 2 -> typeArguments.get( 1 );
 					default -> null;
 				};
 			case ARRAY:
@@ -1942,20 +2047,20 @@ private static boolean isVoid(TypeMirror returnType) {
 	}
 
 	private static String lifecycleOperation(ExecutableElement method) {
-		if ( hasAnnotation(method, JD_INSERT) ) {
+		if ( hasAnnotation( method, JD_INSERT ) ) {
 			return "insert";
 		}
-		else if ( hasAnnotation(method, JD_UPDATE) ) {
+		else if ( hasAnnotation( method, JD_UPDATE ) ) {
 			return "update";
 		}
-		else if ( hasAnnotation(method, JD_DELETE) ) {
+		else if ( hasAnnotation( method, JD_DELETE ) ) {
 			return "delete";
 		}
-		else if ( hasAnnotation(method, JD_SAVE) ) {
+		else if ( hasAnnotation( method, JD_SAVE ) ) {
 			return "upsert";
 		}
 		else {
-			throw new AssertionFailure("Unrecognized lifecycle operation");
+			throw new AssertionFailure( "Unrecognized lifecycle operation" );
 		}
 	}
 
@@ -2000,24 +2105,24 @@ else if ( returnType.getKind() == TypeKind.DECLARED ) {
 			}
 			else {
 				if ( containerType != null
-						&& !containerType.getQualifiedName().contentEquals(OPTIONAL) ) {
+					&& !containerType.getQualifiedName().contentEquals( OPTIONAL ) ) {
 					// multiple results, so it has to be a criteria finder
 					createCriteriaFinder( method, declaredType, containerType.toString(), entity );
 				}
 				else {
 					for ( VariableElement parameter : method.getParameters() ) {
 						final String type = parameter.asType().toString();
-						if ( isPageParam(type) ) {
-							message( parameter, "pagination would have no effect", Diagnostic.Kind.ERROR);
+						if ( isPageParam( type ) ) {
+							message( parameter, "pagination would have no effect", Diagnostic.Kind.ERROR );
 						}
-						else if ( isOrderParam(type) ) {
-							message( parameter, "ordering would have no effect", Diagnostic.Kind.ERROR);
+						else if ( isOrderParam( type ) ) {
+							message( parameter, "ordering would have no effect", Diagnostic.Kind.ERROR );
 						}
 					}
-					final String containerTypeName = containerType==null ? null : OPTIONAL;
+					final String containerTypeName = containerType == null ? null : OPTIONAL;
 					final long parameterCount =
 							method.getParameters().stream()
-									.filter(AnnotationMetaEntity::isFinderParameterMappingToAttribute)
+									.filter( AnnotationMetaEntity::isFinderParameterMappingToAttribute )
 									.count();
 					switch ( (int) parameterCount ) {
 						case 0:
@@ -2057,7 +2162,7 @@ private void createCriteriaFinder(
 			}
 			else {
 				multivalued.add( false );
-				checkFinderParameter(entity, parameter);
+				checkFinderParameter( entity, parameter );
 			}
 		}
 		warnAboutMissingOrder( method );
@@ -2069,7 +2174,7 @@ private void createCriteriaFinder(
 						containerType,
 						paramNames,
 						paramTypes,
-						parameterNullability(method, entity),
+						parameterNullability( method, entity ),
 						multivalued,
 						paramPatterns,
 						repository,
@@ -2079,15 +2184,15 @@ private void createCriteriaFinder(
 						orderByList( method, entity ),
 						context.addNonnullAnnotation(),
 						jakartaDataRepository,
-						fullReturnType(method),
-						hasAnnotation(method, NULLABLE)
+						fullReturnType( method ),
+						hasAnnotation( method, NULLABLE )
 				)
 		);
 	}
 
 	private void checkFinderParameter(@Nullable TypeElement entityType, VariableElement parameter) {
 		final Types types = context.getTypeUtils();
-		final TypeMirror parameterType = parameterType(parameter);
+		final TypeMirror parameterType = parameterType( parameter );
 		final String typeName = parameterType.toString();
 		// TODO: we could allow restrictions even when the query returns a projection,
 		//       but this would require some sort of change to Hibernate core, perhaps
@@ -2110,8 +2215,20 @@ private void checkFinderParameter(@Nullable TypeElement entityType, VariableElem
 				if ( typeArgument == null ) {
 					missingTypeArgError( entityType, parameter, typeName );
 				}
-				else if ( !types.isSameType( typeArgument, entityType.asType() ) ) {
-					wrongTypeArgError( entityType, parameter, typeName );
+				else {
+					final TypeMirror typeArgumentOrUpperBound =
+							typeArgumentUpperBound( typeArgument );
+					if ( typeArgumentOrUpperBound == null ) {
+						if ( requireBoundedWildcard( typeName ) ) {
+							missingTypeArgError( entityType, parameter, typeName );
+						}
+						// else: allow; see HHH-20230
+					}
+					else {
+						if ( !types.isSameType( typeArgumentOrUpperBound, entityType.asType() ) ) {
+							wrongTypeArgError( entityType, parameter, typeName );
+						}
+					}
 				}
 			}
 			else {
@@ -2120,11 +2237,17 @@ else if ( !types.isSameType( typeArgument, entityType.asType() ) ) {
 		}
 	}
 
+	private static TypeMirror typeArgumentUpperBound(TypeMirror typeArgument) {
+		return typeArgument.getKind() == TypeKind.WILDCARD
+				? ((WildcardType) typeArgument).getSuperBound()
+				: typeArgument;
+	}
+
 	private void createCriteriaDelete(ExecutableElement method) {
 		final TypeElement entity = primaryEntity;
-		if ( entity == null) {
+		if ( entity == null ) {
 			message( method, "repository does not have a well-defined primary entity type",
-					Diagnostic.Kind.ERROR);
+					Diagnostic.Kind.ERROR );
 		}
 		else {
 			final String methodName = method.getSimpleName().toString();
@@ -2149,45 +2272,54 @@ private void createCriteriaDelete(ExecutableElement method) {
 							entity.getQualifiedName().toString(),
 							paramNames,
 							paramTypes,
-							parameterNullability(method, entity),
+							parameterNullability( method, entity ),
 							multivalued,
 							paramPatterns,
 							repository,
 							sessionType[0],
 							sessionType[1],
 							context.addNonnullAnnotation(),
-							jakartaDataRepository,
-							fullReturnType(method)
+							true, // @Delete queries are only defined by JD, so assume JD semantics
+							fullReturnType( method )
 					)
 			);
 		}
 	}
 
 	private void wrongTypeArgError(TypeElement entityType, VariableElement parameter, String parameterType) {
-		message(parameter, "mismatched type of " + message(parameterType, entityType),
+		message( parameter, "mismatched type of " + message( parameterType, entityType ),
 				Diagnostic.Kind.ERROR );
 	}
 
+	/**
+	 * Jakarta Data 1.0 accidentally allowed {@code Sort<?>}
+	 * which should not really be permitted.
+	 */
+	private boolean requireBoundedWildcard(String typeName) {
+		return !context.getJakartaDataSortCompliance()
+			|| !typeName.startsWith( JD_SORT );
+	}
+
 	private void missingTypeArgError(TypeElement entityType, VariableElement parameter, String parameterType) {
-		message(parameter, "missing type of " + message(parameterType, entityType),
+		message( parameter, "missing type of " + message( parameterType, entityType ),
 				Diagnostic.Kind.ERROR );
 	}
 
 	private String message(String parameterType, TypeElement entityType) {
 		final String entityTypeName = entityType.getSimpleName().toString();
-		if (parameterType.startsWith(HIB_ORDER) || parameterType.startsWith(JD_ORDER)) {
+		if ( parameterType.startsWith( HIB_ORDER ) || parameterType.startsWith( JD_ORDER ) ) {
 			return "order (should be 'Order<? super " + entityTypeName + ">')";
 		}
-		else if (parameterType.startsWith(LIST + "<" + HIB_ORDER)) {
+		else if ( parameterType.startsWith( LIST + "<" + HIB_ORDER ) ) {
 			return "order (should be 'List<Order<? super " + entityTypeName + ">>')";
 		}
-		else if (parameterType.startsWith(HIB_RESTRICTION)) {
+		else if ( parameterType.startsWith( HIB_RESTRICTION ) ) {
 			return "restriction (should be 'Restriction<? super " + entityTypeName + ">')";
 		}
-		else if (parameterType.startsWith(LIST + "<" + HIB_RESTRICTION)) {
+		else if ( parameterType.startsWith( LIST + "<" + HIB_RESTRICTION ) ) {
 			return "restriction (should be 'List<Restriction<? super " + entityTypeName + ">>')";
 		}
-		else if (parameterType.startsWith(JD_SORT)) {
+		else if ( parameterType.startsWith( JD_SORT ) ) {
 			return "sort (should be 'Sort<? super " + entityTypeName + ">')";
 		}
 		else {
@@ -2201,38 +2333,38 @@ private List<OrderBy> orderByList(ExecutableElement method, TypeElement returnTy
 			final AnnotationMirror orderByList = getAnnotationMirror( method, JD_ORDER_BY_LIST );
 			if ( orderByList != null ) {
 				final List<OrderBy> result = new ArrayList<>();
-				@SuppressWarnings("unchecked")
-				final List<AnnotationValue> list = (List<AnnotationValue>)
+				@SuppressWarnings("unchecked") final List<AnnotationValue> list = (List<AnnotationValue>)
 						castNonNull( getAnnotationValue( orderByList ) ).getValue();
 				for ( AnnotationValue element : list ) {
-					result.add( orderByExpression( castNonNull( (AnnotationMirror) element.getValue() ), entityType, method ) );
+					result.add( orderByExpression( castNonNull( (AnnotationMirror) element.getValue() ), entityType,
+							method ) );
 				}
 				return result;
 			}
 			final AnnotationMirror orderBy = getAnnotationMirror( method, JD_ORDER_BY );
 			if ( orderBy != null ) {
-				return List.of( orderByExpression(orderBy, entityType, method) );
+				return List.of( orderByExpression( orderBy, entityType, method ) );
 			}
 		}
 		return emptyList();
 	}
 
 	private OrderBy orderByExpression(AnnotationMirror orderBy, TypeElement entityType, ExecutableElement method) {
-		final String fieldName = castNonNull( getAnnotationValue(orderBy) ).getValue().toString();
-		if ( fieldName.equals("<error>") ) {
+		final String fieldName = castNonNull( getAnnotationValue( orderBy ) ).getValue().toString();
+		if ( fieldName.equals( "<error>" ) ) {
 			throw new ProcessLaterException();
 		}
-		final AnnotationValue descendingOrNull = getAnnotationValue(orderBy, "descending");
-		final AnnotationValue ignoreCaseOrNull = getAnnotationValue(orderBy, "ignoreCase");
+		final AnnotationValue descendingOrNull = getAnnotationValue( orderBy, "descending" );
+		final AnnotationValue ignoreCaseOrNull = getAnnotationValue( orderBy, "ignoreCase" );
 		final boolean descending = descendingOrNull != null && (Boolean) descendingOrNull.getValue();
 		final boolean ignoreCase = ignoreCaseOrNull != null && (Boolean) ignoreCaseOrNull.getValue();
 		final String path = fieldName
-				.replace('$', '.')
-				.replace('_', '.'); //Jakarta Data allows _ here
+				.replace( '$', '.' )
+				.replace( '_', '.' ); //Jakarta Data allows _ here
 		if ( memberMatchingPath( entityType, path ) == null ) {
 			message( method, orderBy,
 					"no matching field named '" + fieldName
-							+ "' in entity class '" + entityType.getQualifiedName() + "'",
+					+ "' in entity class '" + entityType.getQualifiedName() + "'",
 					Diagnostic.Kind.ERROR );
 		}
 		return new OrderBy( path, descending, ignoreCase );
@@ -2245,9 +2377,9 @@ private OrderBy orderByExpression(AnnotationMirror orderBy, TypeElement entityTy
 				return getTypeArgument( arrayType.getComponentType() );
 			case DECLARED:
 				final DeclaredType type = (DeclaredType) parameterType;
-				switch ( typeName(parameterType) ) {
+				switch ( typeName( parameterType ) ) {
 					case LIST:
-						for (TypeMirror arg : type.getTypeArguments()) {
+						for ( TypeMirror arg : type.getTypeArguments() ) {
 							return getTypeArgument( arg );
 						}
 						return null;
@@ -2258,7 +2390,7 @@ private OrderBy orderByExpression(AnnotationMirror orderBy, TypeElement entityTy
 						for ( TypeMirror arg : type.getTypeArguments() ) {
 							switch ( arg.getKind() ) {
 								case WILDCARD:
-									return ((WildcardType) arg).getSuperBound();
+									return arg;
 								case ARRAY:
 								case DECLARED:
 								case TYPEVAR:
@@ -2278,34 +2410,39 @@ private OrderBy orderByExpression(AnnotationMirror orderBy, TypeElement entityTy
 
 	private static boolean isFinderParameterMappingToAttribute(VariableElement parameter) {
 		final String typeName = parameter.asType().toString();
-		return !isSpecialParam(typeName)
-			|| isRangeParam(typeName);
+		return !isSpecialParam( typeName )
+			|| isRangeParam( typeName );
 	}
 
 	private String[] sessionTypeFromParameters(List<String> paramNames, List<String> paramTypes) {
-		for ( int i = 0; i < paramNames.size(); i ++ ) {
-			final String type = paramTypes.get(i);
-			if ( isSessionParameter(type) ) {
-				final String name = paramNames.get(i);
-				return new String[] { type, name };
+		for ( int i = 0; i < paramNames.size(); i++ ) {
+			final String type = paramTypes.get( i );
+			if ( isSessionParameter( type ) ) {
+				final String name = paramNames.get( i );
+				return new String[] {type, name};
 			}
 		}
-		return new String[] { getSessionType(), getSessionVariableName() };
+		return new String[] {getSessionType(), getSessionVariableName()};
 	}
 
 	@Override
 	protected String getSessionVariableName() {
-		return getSessionVariableName(sessionType);
+		return getSessionVariableName( sessionType );
 	}
 
 	private String getSessionVariableName(String sessionType) {
-		return switch (sessionType) {
-			case HIB_SESSION, HIB_STATELESS_SESSION,
-				MUTINY_SESSION, MUTINY_STATELESS_SESSION,
-				SPRING_STATELESS_SESSION_PROVIDER -> "session";
-//			case UNI_MUTINY_SESSION, UNI_MUTINY_STATELESS_SESSION -> "session";
-			default -> sessionGetter;
-		};
+		if ( isProvidedSessionAccess( sessionType) ) {
+			return sessionGetter;
+		}
+		else {
+			return switch ( sessionType ) {
+				case HIB_SESSION, HIB_STATELESS_SESSION,
+					MUTINY_SESSION, MUTINY_STATELESS_SESSION,
+					SPRING_STATELESS_SESSION_PROVIDER -> "session";
+//				case UNI_MUTINY_SESSION, UNI_MUTINY_STATELESS_SESSION -> "session";
+				default -> sessionGetter;
+			};
+		}
 	}
 
 	private static List<String> enabledFetchProfiles(ExecutableElement method) {
@@ -2320,10 +2457,11 @@ private static List<String> enabledFetchProfiles(ExecutableElement method) {
 				return emptyList();
 			}
 			else {
-				@SuppressWarnings("unchecked")
-				final List<AnnotationValue> annotationValues = (List<AnnotationValue>) enabledFetchProfiles.getValue();
-				final List<String> result = annotationValues.stream().map(AnnotationValue::toString).collect(toList());
-				if ( result.stream().anyMatch("<error>"::equals) ) {
+				@SuppressWarnings(
+						"unchecked") final List<AnnotationValue> annotationValues = (List<AnnotationValue>) enabledFetchProfiles.getValue();
+				final List<String> result = annotationValues.stream().map( AnnotationValue::toString )
+						.collect( toList() );
+				if ( result.stream().anyMatch( "<error>"::equals ) ) {
 					throw new ProcessLaterException();
 				}
 				return result;
@@ -2342,7 +2480,7 @@ private void createMultipleParameterFinder(
 		final List<@Nullable FieldType> fieldTypes = new ArrayList<>();
 		for ( VariableElement parameter : method.getParameters() ) {
 			if ( isFinderParameterMappingToAttribute( parameter ) ) {
-				final FieldType fieldType = validateFinderParameter(entity, parameter);
+				final FieldType fieldType = validateFinderParameter( entity, parameter );
 				fieldTypes.add( fieldType );
 				multivalued.add( fieldType == FieldType.MULTIVALUED );
 			}
@@ -2352,7 +2490,7 @@ private void createMultipleParameterFinder(
 		}
 		warnAboutMissingOrder( method );
 		if ( !usingStatelessSession( sessionType[0] ) // no byNaturalId() lookup API for SS
-				&& matchesNaturalKey( entity, fieldTypes ) ) {
+			&& matchesNaturalKey( entity, fieldTypes ) ) {
 			putMember( methodKey,
 					new NaturalIdFinderMethod(
 							this, method,
@@ -2361,14 +2499,14 @@ && matchesNaturalKey( entity, fieldTypes ) ) {
 							containerType,
 							paramNames,
 							paramTypes,
-							parameterNullability(method, entity),
+							parameterNullability( method, entity ),
 							repository,
 							sessionType[0],
 							sessionType[1],
 							enabledFetchProfiles( method ),
 							context.addNonnullAnnotation(),
 							jakartaDataRepository,
-							fullReturnType(method)
+							fullReturnType( method )
 					)
 			);
 		}
@@ -2382,7 +2520,7 @@ && matchesNaturalKey( entity, fieldTypes ) ) {
 							containerType,
 							paramNames,
 							paramTypes,
-							parameterNullability(method, entity),
+							parameterNullability( method, entity ),
 							multivalued,
 							paramPatterns,
 							repository,
@@ -2392,15 +2530,15 @@ && matchesNaturalKey( entity, fieldTypes ) ) {
 							orderByList( method, entity ),
 							context.addNonnullAnnotation(),
 							jakartaDataRepository,
-							fullReturnType(method),
-							hasAnnotation(method, NULLABLE)
+							fullReturnType( method ),
+							hasAnnotation( method, NULLABLE )
 					)
 			);
 		}
 	}
 
 	private void warnAboutMissingOrder(ExecutableElement method) {
-		if ( !hasAnnotation(  method, JD_ORDER_BY, JD_ORDER_BY_LIST ) ) {
+		if ( !hasAnnotation( method, JD_ORDER_BY, JD_ORDER_BY_LIST ) ) {
 			boolean hasPageRequest = false;
 			boolean hasSortOrOrder = false;
 			for ( VariableElement parameter : method.getParameters() ) {
@@ -2413,7 +2551,8 @@ private void warnAboutMissingOrder(ExecutableElement method) {
 				}
 			}
 			if ( hasPageRequest && !hasSortOrOrder ) {
-				context.message( method, "'PageRequest' with no 'Sort' or 'Order' and no '@OrderBy'", Diagnostic.Kind.MANDATORY_WARNING );
+				context.message( method, "'PageRequest' with no 'Sort' or 'Order' and no '@OrderBy'",
+						Diagnostic.Kind.MANDATORY_WARNING );
 			}
 		}
 	}
@@ -2423,7 +2562,7 @@ private void createSingleParameterFinder(
 		final String methodName = method.getSimpleName().toString();
 		final VariableElement parameter =
 				method.getParameters().stream()
-						.filter(AnnotationMetaEntity::isFinderParameterMappingToAttribute)
+						.filter( AnnotationMetaEntity::isFinderParameterMappingToAttribute )
 						.findFirst().orElseThrow();
 		final List<String> paramNames = parameterNames( method, entity );
 		final List<String> paramTypes = parameterTypes( method );
@@ -2448,8 +2587,8 @@ private void createSingleParameterFinder(
 									profiles,
 									context.addNonnullAnnotation(),
 									jakartaDataRepository,
-									fullReturnType(method),
-									hasAnnotation(method, NULLABLE)
+									fullReturnType( method ),
+									hasAnnotation( method, NULLABLE )
 							)
 					);
 					break;
@@ -2463,14 +2602,14 @@ private void createSingleParameterFinder(
 										containerType,
 										paramNames,
 										paramTypes,
-										parameterNullability(method, entity),
+										parameterNullability( method, entity ),
 										repository,
 										sessionType[0],
 										sessionType[1],
 										profiles,
 										context.addNonnullAnnotation(),
 										jakartaDataRepository,
-										fullReturnType(method)
+										fullReturnType( method )
 								)
 						);
 						break;
@@ -2486,7 +2625,7 @@ private void createSingleParameterFinder(
 									containerType,
 									paramNames,
 									paramTypes,
-									parameterNullability(method, entity),
+									parameterNullability( method, entity ),
 									parameterMultivalued( method, fieldType ),
 									parameterPatterns( method ),
 									repository,
@@ -2496,8 +2635,8 @@ private void createSingleParameterFinder(
 									orderByList( method, entity ),
 									context.addNonnullAnnotation(),
 									jakartaDataRepository,
-									fullReturnType(method),
-									hasAnnotation(method, NULLABLE)
+									fullReturnType( method ),
+									hasAnnotation( method, NULLABLE )
 							)
 					);
 					break;
@@ -2513,14 +2652,14 @@ private static List<Boolean> parameterMultivalued(ExecutableElement method, Fiel
 	}
 
 	private static FieldType pickStrategy(FieldType fieldType, String sessionType, List<String> profiles) {
-		if ( ( usingStatelessSession(sessionType) || usingReactiveSession(sessionType) )
-				&& !profiles.isEmpty() ) {
+		if ( (usingStatelessSession( sessionType ) || usingReactiveSession( sessionType ))
+			&& !profiles.isEmpty() ) {
 			// no support for passing fetch profiles i.e. IdentifierLoadAccess
 			// in SS or M.S except via Query.enableFetchProfile()
 			return FieldType.BASIC;
 		}
 		else {
-			return switch (fieldType) {
+			return switch ( fieldType ) {
 				case ID ->
 					// no byId() API for SS or M.S, only get()
 						FieldType.ID;
@@ -2534,10 +2673,10 @@ private static FieldType pickStrategy(FieldType fieldType, String sessionType, L
 	}
 
 	private boolean matchesNaturalKey(TypeElement entity, List<@Nullable FieldType> fieldTypes) {
-		return fieldTypes.stream().allMatch(type -> type == FieldType.NATURAL_ID)
+		return fieldTypes.stream().allMatch( type -> type == FieldType.NATURAL_ID )
 			&& entity.getEnclosedElements().stream()
-				.filter(member -> hasAnnotation(member, NATURAL_ID))
-				.count() == fieldTypes.size();
+						.filter( member -> hasAnnotation( member, NATURAL_ID ) )
+						.count() == fieldTypes.size();
 	}
 
 	enum FieldType {
@@ -2568,8 +2707,8 @@ enum FieldType {
 				return FieldType.MULTIVALUED;
 			}
 			else if ( containsAnnotation( param, PATTERN ) ) {
-				final AnnotationMirror mirror = getAnnotationMirror(param, PATTERN);
-				if ( mirror!=null && !typeNameEquals(param.asType(), STRING) ) {
+				final AnnotationMirror mirror = getAnnotationMirror( param, PATTERN );
+				if ( mirror != null && !typeNameEquals( param.asType(), STRING ) ) {
 					message( param, mirror,
 							"parameter annotated '@Pattern' is not of type 'String'",
 							Diagnostic.Kind.ERROR );
@@ -2609,7 +2748,7 @@ && isSameType( actualParameterType( param ),
 		else {
 			message( param,
 					"no matching field named '" + path
-						+ "' in entity class '" + entityType + "'",
+					+ "' in entity class '" + entityType + "'",
 					Diagnostic.Kind.ERROR );
 			return null;
 		}
@@ -2630,63 +2769,64 @@ private TypeMirror actualParameterType(VariableElement param) {
 	/**
 	 * Check the type of a parameter of a {@code @Find} method against the field type
 	 * in the entity class.
+	 *
 	 * @return true if the parameter is multivalued (i.e. it's an {@code in} condition)
 	 */
 	private boolean checkParameterType(TypeElement entityType, VariableElement param, TypeMirror attributeType) {
 		final Types types = context.getTypeUtils();
 //		if ( entityType.getKind() == CLASS ) { // do no checks if the entity type is a type variable
-			TypeMirror parameterType = parameterType( param );
-			if ( types.isSameType( parameterType, attributeType ) ) {
-				return false;
+		TypeMirror parameterType = parameterType( param );
+		if ( types.isSameType( parameterType, attributeType ) ) {
+			return false;
+		}
+		else {
+			if ( attributeType.getKind().isPrimitive() ) {
+				final PrimitiveType primitiveType = (PrimitiveType) attributeType;
+				attributeType = types.boxedClass( primitiveType ).asType();
 			}
-			else {
-				if ( attributeType.getKind().isPrimitive() ) {
-					final PrimitiveType primitiveType = (PrimitiveType) attributeType;
-					attributeType = types.boxedClass( primitiveType ).asType();
-				}
-				final TypeKind kind = parameterType.getKind();
-				switch (kind) {
-					case TYPEVAR:
-						final TypeVariable typeVariable = (TypeVariable) parameterType;
-						parameterType = typeVariable.getUpperBound();
-						// INTENTIONAL FALL-THROUGH
-					case DECLARED:
-						if ( types.isSameType(parameterType, attributeType) ) {
+			final TypeKind kind = parameterType.getKind();
+			switch ( kind ) {
+				case TYPEVAR:
+					final TypeVariable typeVariable = (TypeVariable) parameterType;
+					parameterType = typeVariable.getUpperBound();
+					// INTENTIONAL FALL-THROUGH
+				case DECLARED:
+					if ( types.isSameType( parameterType, attributeType ) ) {
+						return false;
+					}
+					else {
+						final TypeElement list = context.getTypeElementForFullyQualifiedName( LIST );
+						final TypeElement range = context.getTypeElementForFullyQualifiedName( HIB_RANGE );
+						if ( types.isSameType( parameterType, types.getDeclaredType( list, attributeType ) ) ) {
+							return true;
+						}
+						else if ( types.isSameType( parameterType, types.getDeclaredType( range, attributeType ) ) ) {
 							return false;
 						}
 						else {
-							final TypeElement list = context.getTypeElementForFullyQualifiedName(LIST);
-							final TypeElement range = context.getTypeElementForFullyQualifiedName(HIB_RANGE);
-							if ( types.isSameType( parameterType, types.getDeclaredType(list, attributeType) ) ) {
-								return true;
-							}
-							else if ( types.isSameType( parameterType, types.getDeclaredType(range, attributeType) ) ) {
-								return false;
-							}
-							else {
-								parameterTypeError( entityType, param, attributeType );
-								return false;
-							}
-						}
-					case ARRAY:
-						if ( !types.isSameType( parameterType, types.getArrayType(attributeType) ) ) {
 							parameterTypeError( entityType, param, attributeType );
-						}
-						return true;
-					default:
-						if ( kind.isPrimitive() ) {
-							final PrimitiveType primitiveType = (PrimitiveType) parameterType;
-							if ( !types.isSameType( types.boxedClass(primitiveType).asType(), attributeType ) ) {
-								parameterTypeError( entityType, param, attributeType );
-							}
 							return false;
 						}
-						else {
-							// probably impossible
-							return false;
+					}
+				case ARRAY:
+					if ( !types.isSameType( parameterType, types.getArrayType( attributeType ) ) ) {
+						parameterTypeError( entityType, param, attributeType );
+					}
+					return true;
+				default:
+					if ( kind.isPrimitive() ) {
+						final PrimitiveType primitiveType = (PrimitiveType) parameterType;
+						if ( !types.isSameType( types.boxedClass( primitiveType ).asType(), attributeType ) ) {
+							parameterTypeError( entityType, param, attributeType );
 						}
-				}
+						return false;
+					}
+					else {
+						// probably impossible
+						return false;
+					}
 			}
+		}
 //		}
 //		else {
 //			return false;
@@ -2694,15 +2834,15 @@ else if ( types.isSameType( parameterType, types.getDeclaredType(range, attribut
 	}
 
 	private void parameterTypeError(TypeElement entityType, VariableElement param, TypeMirror attributeType) {
-		message(param,
-				"matching field has type '" + stripAnnotations(typeAsString(attributeType))
-						+ "' in entity class '" + entityType + "'",
+		message( param,
+				"matching field has type '" + stripAnnotations( typeAsString( attributeType ) )
+				+ "' in entity class '" + entityType + "'",
 				Diagnostic.Kind.ERROR );
 	}
 
 	private String stripAnnotations(String type) {
-		if ( type.startsWith("@") ) {
-			final int index = type.lastIndexOf(' ');
+		if ( type.startsWith( "@" ) ) {
+			final int index = type.lastIndexOf( ' ' );
 			return index > 0 ? type.substring( index + 1 ) : type;
 		}
 		else {
@@ -2713,7 +2853,7 @@ private String stripAnnotations(String type) {
 	private boolean finderParameterNullable(TypeElement entity, VariableElement param) {
 		final Element member = memberMatchingPath( entity, parameterName( param ) );
 		return isNullable( param )
-			&& ( member == null || isNullable( member ) );
+			&& (member == null || isNullable( member ));
 	}
 
 	private AccessType getAccessType(TypeElement entity) {
@@ -2733,14 +2873,14 @@ private static TypeMirror memberType(Element member) {
 	}
 
 	private @Nullable Element memberMatchingPath(TypeElement entityType, String path) {
-		return memberMatchingPath( entityType, new StringTokenizer(path, ".") );
+		return memberMatchingPath( entityType, new StringTokenizer( path, "." ) );
 	}
 
 	private @Nullable Element memberMatchingPath(TypeElement entityType, StringTokenizer tokens) {
-		final AccessType accessType = getAccessType(entityType);
+		final AccessType accessType = getAccessType( entityType );
 		final String nextToken = tokens.nextToken();
-		for ( Element member : context.getAllMembers(entityType) ) {
-			if ( isIdRef(nextToken) && hasAnnotation(member, ID, EMBEDDED_ID) ) {
+		for ( Element member : context.getAllMembers( entityType ) ) {
+			if ( isIdRef( nextToken ) && hasAnnotation( member, ID, EMBEDDED_ID ) ) {
 				return member;
 			}
 			final Element match =
@@ -2753,7 +2893,7 @@ private static TypeMirror memberType(Element member) {
 	}
 
 	private static boolean isIdRef(String token) {
-		return "id(this)".equalsIgnoreCase(token); // post M4
+		return "id(this)".equalsIgnoreCase( token ); // post M4
 	}
 
 	private @Nullable Element memberMatchingPath(
@@ -2764,7 +2904,7 @@ private static boolean isIdRef(String token) {
 			String token) {
 		final Name memberName = candidate.getSimpleName();
 		final TypeMirror type = memberType( candidate, accessType, token, memberName );
-		if (type == null) {
+		if ( type == null ) {
 			return null;
 		}
 		else if ( tokens.hasMoreTokens() ) {
@@ -2788,13 +2928,13 @@ else if ( tokens.hasMoreTokens() ) {
 	private static @Nullable TypeMirror memberType(Element candidate, AccessType accessType, String token, Name memberName) {
 		final ElementKind kind = candidate.getKind();
 		if ( accessType == AccessType.FIELD && kind == ElementKind.FIELD ) {
-			return fieldMatches(token, memberName)
+			return fieldMatches( token, memberName )
 					? candidate.asType()
 					: null;
 		}
 		else if ( accessType == AccessType.PROPERTY && kind == ElementKind.METHOD ) {
 			final ExecutableElement executable = (ExecutableElement) candidate;
-			return getterMatches(token, memberName)
+			return getterMatches( token, memberName )
 					? executable.getReturnType()
 					: null;
 		}
@@ -2809,7 +2949,7 @@ private static boolean fieldMatches(String token, Name fieldName) {
 
 	private static boolean getterMatches(String token, Name methodName) {
 		if ( hasPrefix( methodName, "get" ) ) {
-			return token.equals( decapitalize( methodName.subSequence( 3, methodName.length()).toString() ) );
+			return token.equals( decapitalize( methodName.subSequence( 3, methodName.length() ).toString() ) );
 		}
 		else if ( hasPrefix( methodName, "is" ) ) {
 			return token.equals( decapitalize( methodName.subSequence( 2, methodName.length() ).toString() ) );
@@ -2831,7 +2971,7 @@ private void addQueryMethod(
 			if ( returnType != null && returnType.getKind() == TypeKind.ARRAY ) {
 				final ArrayType arrayType = (ArrayType) returnType;
 				final TypeMirror componentType = arrayType.getComponentType();
-				final TypeElement object = context.getElementUtils().getTypeElement(JAVA_OBJECT);
+				final TypeElement object = context.getElementUtils().getTypeElement( JAVA_OBJECT );
 				if ( !isSameType( object.asType(), componentType ) ) {
 					returnType = componentType;
 					containerTypeName = "[]";
@@ -2864,27 +3004,27 @@ private void addQueryMethod(
 			AnnotationValue value,
 			String queryString) {
 
-		final List<String> paramNames = parameterNames(method);
-		final List<String> paramTypes = parameterTypes(method);
+		final List<String> paramNames = parameterNames( method );
+		final List<String> paramTypes = parameterTypes( method );
 
 		// now check that the query has a parameter for every method parameter
-		checkParameters(method, returnType, paramNames, paramTypes, mirror, value, queryString);
+		checkParameters( method, returnType, paramNames, paramTypes, mirror, value, queryString );
 
 		final String[] sessionType = sessionTypeFromParameters( paramNames, paramTypes );
-		final DeclaredType resultType = resultType(method, returnType, mirror, value);
+		final DeclaredType resultType = resultType( method, returnType, mirror, value );
 		final List<OrderBy> orderBys =
 				resultType == null
 						? emptyList()
 						: orderByList( method, (TypeElement) resultType.asElement() );
 
 		final String processedQuery;
-		if (isNative) {
+		if ( isNative ) {
 			processedQuery = queryString;
-			validateSql(method, mirror, processedQuery, paramNames, value);
+			validateSql( method, mirror, processedQuery, paramNames, value );
 		}
 		else {
-			processedQuery = addFromClauseIfNecessary( queryString, implicitEntityName(resultType) );
-			validateHql(method, returnType, mirror, value, processedQuery, paramNames, paramTypes);
+			processedQuery = addFromClauseIfNecessary( queryString, implicitEntityName( resultType ) );
+			validateHql( method, returnType, mirror, value, processedQuery, paramNames, paramTypes );
 		}
 
 		final QueryMethod attribute =
@@ -2893,11 +3033,11 @@ private void addQueryMethod(
 						method.getSimpleName().toString(),
 						processedQuery,
 						returnType == null ? null : returnType.toString(),
-						returnType == null ? null : returnTypeClass(returnType),
+						returnType == null ? null : returnTypeClass( returnType ),
 						containerTypeName,
 						paramNames,
 						paramTypes,
-						isInsertUpdateDelete(queryString),
+						isInsertUpdateDelete( queryString ),
 						isNative,
 						repository,
 						sessionType[0],
@@ -2905,18 +3045,18 @@ private void addQueryMethod(
 						orderBys,
 						context.addNonnullAnnotation(),
 						jakartaDataRepository,
-						fullReturnType(method),
-						hasAnnotation(method, NULLABLE)
+						fullReturnType( method ),
+						hasAnnotation( method, NULLABLE )
 				);
 		putMember( attribute.getPropertyName() + paramTypes, attribute );
 	}
 
 	private String fullReturnType(ExecutableElement method) {
-		return typeAsString( memberMethodType(method).getReturnType() );
+		return typeAsString( memberMethodType( method ).getReturnType() );
 	}
 
 	private static String returnTypeClass(TypeMirror returnType) {
-		switch (returnType.getKind()) {
+		switch ( returnType.getKind() ) {
 			case DECLARED:
 				DeclaredType declaredType = (DeclaredType) returnType;
 				final TypeElement typeElement = (TypeElement) declaredType.asElement();
@@ -2946,13 +3086,13 @@ private static String returnTypeClass(TypeMirror returnType) {
 	}
 
 	private @Nullable String implicitEntityName(@Nullable DeclaredType resultType) {
-		if ( resultType != null && hasAnnotation(resultType.asElement(), ENTITY) ) {
+		if ( resultType != null && hasAnnotation( resultType.asElement(), ENTITY ) ) {
 			final AnnotationMirror annotation =
-					getAnnotationMirror(resultType.asElement(), ENTITY);
+					getAnnotationMirror( resultType.asElement(), ENTITY );
 			if ( annotation == null ) {
-				throw new AssertionFailure("@Entity annotation should not be missing");
+				throw new AssertionFailure( "@Entity annotation should not be missing" );
 			}
-			return entityName(resultType, annotation);
+			return entityName( resultType, annotation );
 		}
 		else if ( primaryEntity != null ) {
 			return primaryEntity.getSimpleName().toString();
@@ -2963,7 +3103,7 @@ else if ( primaryEntity != null ) {
 	}
 
 	private @Nullable TypeElement implicitEntityType(@Nullable TypeElement resultType) {
-		if ( resultType != null && hasAnnotation(resultType, ENTITY) ) {
+		if ( resultType != null && hasAnnotation( resultType, ENTITY ) ) {
 			return resultType;
 		}
 		else if ( primaryEntity != null ) {
@@ -2975,8 +3115,8 @@ else if ( primaryEntity != null ) {
 	}
 
 	private static String entityName(DeclaredType resultType, AnnotationMirror annotation) {
-		final AnnotationValue name = getAnnotationValue(annotation, "name");
-		if (name != null) {
+		final AnnotationValue name = getAnnotationValue( annotation, "name" );
+		if ( name != null ) {
 			final String explicitName = name.getValue().toString();
 			if ( !explicitName.isEmpty() ) {
 				return explicitName;
@@ -2995,23 +3135,35 @@ private static String addFromClauseIfNecessary(String hql, @Nullable String enti
 		if ( entityType == null ) {
 			return hql;
 		}
-		else if ( isInsertUpdateDelete(hql) ) {
+		else if ( isInsertUpdateDelete( hql ) ) {
 			return hql;
 		}
 		else {
-			final HqlLexer hqlLexer = HqlParseTreeBuilder.INSTANCE.buildHqlLexer( hql );
-			final List<? extends Token> allTokens = hqlLexer.getAllTokens();
-			for ( final Token token : allTokens ) {
-				switch ( token.getType() ) {
-					case FROM:
-						return hql;
-					case WHERE:
-					case HAVING:
-					case GROUP:
-					case ORDER:
-						return new StringBuilder(hql)
-								.insert(token.getStartIndex(), "from " + entityType + " ")
-								.toString();
+			final var hqlLexer = HqlParseTreeBuilder.INSTANCE.buildHqlLexer( hql );
+			final var allTokens = hqlLexer.getAllTokens();
+			int previousType = -1;
+			int previousPreviousType = -1;
+			for ( final var token : allTokens ) {
+				if ( token.getChannel() == DEFAULT_CHANNEL ) {
+					final int tokenType = token.getType();
+					switch ( tokenType ) {
+						case FROM:
+							return hql;
+						case WHERE:
+							if ( previousType == LEFT_PAREN && previousPreviousType == FILTER ) {
+								// WHERE is part of FILTER (WHERE ...), not the query's own WHERE clause
+								break;
+							}
+							// fall through
+						case HAVING:
+						case GROUP:
+						case ORDER:
+							return new StringBuilder( hql )
+									.insert( token.getStartIndex(), "from " + entityType + " " )
+									.toString();
+					}
+					previousPreviousType = previousType;
+					previousType = tokenType;
 				}
 			}
 			return hql + " from " + entityType;
@@ -3023,10 +3175,10 @@ else if ( isInsertUpdateDelete(hql) ) {
 		if ( returnType != null && returnType.getKind() == TypeKind.DECLARED ) {
 			final DeclaredType resultType = (DeclaredType) returnType;
 			if ( !resultType.getTypeArguments().isEmpty() ) {
-				message(method, mirror, value,
+				message( method, mirror, value,
 						"query result type may not be a generic type"
-								+ " (change '" + returnType +
-								"' to '" + context.getTypeUtils().erasure(returnType) + "')",
+						+ " (change '" + returnType +
+						"' to '" + context.getTypeUtils().erasure( returnType ) + "')",
 						Diagnostic.Kind.ERROR );
 			}
 			return resultType;
@@ -3038,10 +3190,10 @@ else if ( isInsertUpdateDelete(hql) ) {
 
 	private static boolean isInsertUpdateDelete(String hql) {
 		final String trimmed = hql.trim();
-		final String keyword = trimmed.length() > 6 ? trimmed.substring(0, 6) : "";
-		return keyword.equalsIgnoreCase("update")
-			|| keyword.equalsIgnoreCase("delete")
-			|| keyword.equalsIgnoreCase("insert");
+		final String keyword = trimmed.length() > 6 ? trimmed.substring( 0, 6 ) : "";
+		return keyword.equalsIgnoreCase( "update" )
+			|| keyword.equalsIgnoreCase( "delete" )
+			|| keyword.equalsIgnoreCase( "insert" );
 	}
 
 	private void validateHql(
@@ -3056,7 +3208,7 @@ private void validateHql(
 						hql,
 						returnType,
 						true,
-						new ErrorHandler( context, isLocal(method) ? method : element, mirror, value, hql ),
+						new ErrorHandler( context, isLocal( method ) ? method : element, mirror, value, hql ),
 						ProcessorSessionFactory.create( context.getProcessingEnvironment(),
 								context.getEntityNameMappings(), context.getEnumTypesByValue(), context.isIndexing() )
 				);
@@ -3068,7 +3220,7 @@ private void validateHql(
 				validateUpdateHql( method, returnType, mirror, value );
 			}
 			for ( SqmParameter<?> param : statement.getSqmParameters() ) {
-				checkParameter( param, paramNames, paramTypes, method, mirror, value);
+				checkParameter( param, paramNames, paramTypes, method, mirror, value );
 			}
 		}
 	}
@@ -3082,8 +3234,8 @@ private void validateUpdateHql(
 		if ( !isValidUpdateReturnType( returnType, method, reactive ) ) {
 			message( method, mirror, value,
 					"return type of mutation query method must be "
-							+ (!reactive ? "'int', 'long', 'boolean' or 'void'"
-								: "'Uni<Integer>', 'Uni<Boolean>' or 'Uni<Void>'"),
+					+ (!reactive ? "'int', 'long', 'boolean' or 'void'"
+							: "'Uni<Integer>', 'Uni<Boolean>' or 'Uni<Void>'"),
 					Diagnostic.Kind.ERROR );
 		}
 	}
@@ -3094,7 +3246,7 @@ private boolean isValidUpdateReturnType(@Nullable TypeMirror returnType, Executa
 		}
 		if ( reactive ) {
 			// for reactive calls, don't use the returnType param, which has been ununi-ed, we want to check the full one
-			final String returnTypeName = fullReturnType(method);
+			final String returnTypeName = fullReturnType( method );
 			return returnTypeName.equals( UNI_VOID )
 				|| returnTypeName.equals( UNI_BOOLEAN )
 				|| returnTypeName.equals( UNI_INTEGER );
@@ -3114,56 +3266,61 @@ private void validateSelectHql(
 			AnnotationMirror mirror,
 			AnnotationValue value,
 			SqmSelectStatement<?> statement) {
-		if ( returnType != null ) {
-			// HQL based queries are ensured to have a select clause by SemanticQueryBuilder
-			final JpaSelection<?> selection = castNonNull( statement.getSelection() );
-			boolean returnTypeCorrect;
-			if ( selection.isCompoundSelection() ) {
-				switch ( returnType.getKind() ) {
-					case ARRAY:
-						returnTypeCorrect = checkReturnedArrayType( (ArrayType) returnType );
-						break;
-					case DECLARED:
-						if ( !checkConstructorReturn( (DeclaredType) returnType, selection ) ) {
-							message(method, mirror, value,
-									"return type '" + returnType
-											+ "' of method has no constructor matching query selection list",
-									Diagnostic.Kind.ERROR);
-						}
-						returnTypeCorrect = true;
-						break;
-					default:
-						returnTypeCorrect = false;
-				}
-			}
-			else if ( selection instanceof JpaEntityJoin<?, ?> from ) {
-				returnTypeCorrect = checkReturnedEntity( from.getModel(), returnType );
-			}
-			else if ( selection instanceof JpaRoot<?> from ) {
-				returnTypeCorrect = checkReturnedEntity( from.getModel(), returnType );
-			}
-			else {
-				// TODO: anything more we can do here? e.g. check constructor
-				try {
-					final Class<?> javaResultType = selection.getJavaType();
-					if ( javaResultType == null ) {
-						returnTypeCorrect = true;
-					}
-					else {
-						final TypeElement typeElement = context.getTypeElementForFullyQualifiedName( javaResultType.getName() );
-						final Types types = context.getTypeUtils();
-						returnTypeCorrect = types.isAssignable( returnType, types.erasure( typeElement.asType() ) );
+		if ( returnType != null
+				&& !isReturnTypeCorrect( method, returnType, mirror, value,
+						// HQL queries are guaranteed to have a select
+						// clause by SemanticQueryBuilder
+						castNonNull( statement.getSelection() ) ) ) {
+			message( method, mirror, value,
+					"return type of query did not match return type '" + returnType + "' of method",
+					Diagnostic.Kind.ERROR );
+		}
+	}
+
+	private boolean isReturnTypeCorrect(
+			ExecutableElement method,
+			@NonNull TypeMirror returnType,
+			AnnotationMirror mirror,
+			AnnotationValue value,
+			JpaSelection<?> selection) {
+		if ( selection.isCompoundSelection() ) {
+			return switch ( returnType.getKind() ) {
+				case ARRAY -> checkReturnedArrayType( (ArrayType) returnType );
+				case DECLARED -> {
+					if ( !checkConstructorReturn( (DeclaredType) returnType, selection ) ) {
+						message( method, mirror, value,
+								"return type '" + returnType
+								+ "' of method has no constructor matching query selection list",
+								Diagnostic.Kind.ERROR );
 					}
+					yield true;
 				}
-				catch (Exception e) {
-					//ignore
-					returnTypeCorrect = true;
+				default -> false;
+			};
+		}
+		else if ( selection instanceof JpaEntityJoin<?, ?> from ) {
+			return checkReturnedEntity( from.getModel(), returnType );
+		}
+		else if ( selection instanceof JpaRoot<?> from ) {
+			return checkReturnedEntity( from.getModel(), returnType );
+		}
+		else {
+			// TODO: anything more we can do here? e.g. check constructor
+			try {
+				final Class<?> javaResultType = selection.getJavaType();
+				if ( javaResultType == null ) {
+					return true;
+				}
+				else {
+					final TypeElement typeElement =
+							context.getTypeElementForFullyQualifiedName( javaResultType.getName() );
+					final Types types = context.getTypeUtils();
+					return types.isAssignable( returnType, types.erasure( typeElement.asType() ) );
 				}
 			}
-			if ( !returnTypeCorrect ) {
-				message(method, mirror, value,
-						"return type of query did not match return type '" + returnType + "' of method",
-						Diagnostic.Kind.ERROR);
+			catch (Exception e) {
+				//ignore
+				return true;
 			}
 		}
 	}
@@ -3175,25 +3332,26 @@ private void validateSql(
 			List<String> paramNames,
 			AnnotationValue value) {
 		// for SQL queries check that there is a method parameter for every query parameter
-		ParameterParser.parse(sql, new ParameterRecognizer() {
+		ParameterParser.parse( sql, new ParameterRecognizer() {
 			int ordinalCount = 0;
+
 			@Override
 			public void ordinalParameter(int sourcePosition) {
 				ordinalCount++;
 				if ( ordinalCount > paramNames.size() ) {
-					message(method, mirror, value,
+					message( method, mirror, value,
 							"missing method parameter for query parameter " + ordinalCount
-									+ " (add a parameter to '" + method.getSimpleName() + "')",
+							+ " (add a parameter to '" + method.getSimpleName() + "')",
 							Diagnostic.Kind.ERROR );
 				}
 			}
 
 			@Override
 			public void namedParameter(String name, int sourcePosition) {
-				if ( !paramNames.contains(name) ) {
-					message(method, mirror, value,
+				if ( !paramNames.contains( name ) ) {
+					message( method, mirror, value,
 							"missing method parameter for query parameter :" + name
-									+ " (add a parameter '" + name + "' to '" + method.getSimpleName() + "')",
+							+ " (add a parameter '" + name + "' to '" + method.getSimpleName() + "')",
 							Diagnostic.Kind.ERROR );
 				}
 			}
@@ -3201,9 +3359,9 @@ public void namedParameter(String name, int sourcePosition) {
 			@Override
 			public void jpaPositionalParameter(int label, int sourcePosition) {
 				if ( label > paramNames.size() ) {
-					message(method, mirror, value,
+					message( method, mirror, value,
 							"missing method parameter for query parameter ?" + label
-									+ " (add a parameter to '" + method.getSimpleName() + "')",
+							+ " (add a parameter to '" + method.getSimpleName() + "')",
 							Diagnostic.Kind.ERROR );
 				}
 			}
@@ -3211,7 +3369,7 @@ public void jpaPositionalParameter(int label, int sourcePosition) {
 			@Override
 			public void other(char character) {
 			}
-		});
+		} );
 	}
 
 	private static boolean checkConstructorReturn(DeclaredType returnType, JpaSelection<?> selection) {
@@ -3222,9 +3380,9 @@ private static boolean checkConstructorReturn(DeclaredType returnType, JpaSelect
 		}
 		final TypeElement typeElement = (TypeElement) returnType.asElement();
 		final Name qualifiedName = typeElement.getQualifiedName();
-		if ( qualifiedName.contentEquals(TUPLE)
-				|| qualifiedName.contentEquals(LIST)
-				|| qualifiedName.contentEquals(MAP) ) {
+		if ( qualifiedName.contentEquals( TUPLE )
+			|| qualifiedName.contentEquals( LIST )
+			|| qualifiedName.contentEquals( MAP ) ) {
 			// these are exceptionally allowed
 			return true;
 		}
@@ -3247,10 +3405,10 @@ private static boolean constructorMatches(
 			List<? extends VariableElement> parameters) {
 		int itemCount = selectionItems.size();
 		if ( parameters.size() == itemCount ) {
-			for (int i = 0; i < itemCount; i++ ) {
-				final JpaSelection<?> item = selectionItems.get(i);
+			for ( int i = 0; i < itemCount; i++ ) {
+				final JpaSelection<?> item = selectionItems.get( i );
 				if ( item != null && item.getJavaType() != null ) {
-					if ( !parameterMatches( parameters.get(i), item ) ) {
+					if ( !parameterMatches( parameters.get( i ), item ) ) {
 						return false;
 					}
 				}
@@ -3272,7 +3430,7 @@ private static boolean parameterMatches(TypeMirror parameterType, Class<?> itemT
 		if ( kind == TypeKind.DECLARED ) {
 			final DeclaredType declaredType = (DeclaredType) parameterType;
 			final TypeElement paramTypeElement = (TypeElement) declaredType.asElement();
-			return paramTypeElement.getQualifiedName().contentEquals(itemTypeName);
+			return paramTypeElement.getQualifiedName().contentEquals( itemTypeName );
 		}
 		else if ( kind.isPrimitive() ) {
 			return primitiveClassMatchesKind( itemType, kind );
@@ -3280,7 +3438,8 @@ else if ( kind.isPrimitive() ) {
 		else if ( kind == TypeKind.ARRAY ) {
 			final ArrayType arrayType = (ArrayType) parameterType;
 			return itemType.isArray()
-				&& parameterMatches( arrayType.getComponentType(), itemType.getComponentType(), itemType.getComponentType().getTypeName() );
+				&& parameterMatches( arrayType.getComponentType(), itemType.getComponentType(),
+					itemType.getComponentType().getTypeName() );
 		}
 		else {
 			return false;
@@ -3292,7 +3451,7 @@ private static boolean checkReturnedArrayType(ArrayType returnType) {
 		if ( componentType.getKind() == TypeKind.DECLARED ) {
 			final DeclaredType declaredType = (DeclaredType) componentType;
 			final TypeElement typeElement = (TypeElement) declaredType.asElement();
-			return typeElement.getQualifiedName().contentEquals(JAVA_OBJECT);
+			return typeElement.getQualifiedName().contentEquals( JAVA_OBJECT );
 		}
 		else {
 			return false;
@@ -3310,22 +3469,25 @@ private boolean checkReturnedEntity(EntityDomainType<?> model, TypeMirror return
 //			}
 			return typeElement.getQualifiedName().contentEquals( model.getHibernateEntityName() );
 		}
-		return false;
+		else {
+			return false;
+		}
 	}
 
 	private void checkParameter(
 			SqmParameter<?> param, List<String> paramNames, List<String> paramTypes,
 			ExecutableElement method, AnnotationMirror mirror, AnnotationValue value) {
 		final SqmExpressible<?> expressible = param.getExpressible(); //same object as param.getAnticipatedType()
-		final String queryParamType = expressible == null ? null : expressible.getTypeName(); //getTypeName() can return "unknown"
-		if ( queryParamType!=null
-				//TODO: arguments of functions get assigned "unknown" which sucks
-				&& !"unknown".equals(queryParamType) ) {
+		final String queryParamType =
+				expressible == null ? null : expressible.getTypeName(); //getTypeName() can return "unknown"
+		if ( queryParamType != null
+			//TODO: arguments of functions get assigned "unknown" which sucks
+			&& !"unknown".equals( queryParamType ) ) {
 			if ( param.getName() != null ) {
-				checkNamedParameter(param, paramNames, paramTypes, method, mirror, value, queryParamType);
+				checkNamedParameter( param, paramNames, paramTypes, method, mirror, value, queryParamType );
 			}
 			else if ( param.getPosition() != null ) {
-				checkOrdinalParameter(param, paramNames, paramTypes, method, mirror, value, queryParamType);
+				checkOrdinalParameter( param, paramNames, paramTypes, method, mirror, value, queryParamType );
 			}
 		}
 	}
@@ -3335,27 +3497,27 @@ private void checkOrdinalParameter(
 			AnnotationMirror mirror, AnnotationValue value, String queryParamType) {
 		int position = castNonNull( param.getPosition() );
 		if ( position > paramNames.size() ) {
-			message(method, mirror, value,
+			message( method, mirror, value,
 					"missing method parameter for query parameter ?" + position
-							+ " (add a parameter of type '" + queryParamType + "' to '" + method.getSimpleName() + "')",
-					Diagnostic.Kind.ERROR);
+					+ " (add a parameter of type '" + queryParamType + "' to '" + method.getSimpleName() + "')",
+					Diagnostic.Kind.ERROR );
 		}
 		else {
-			final String argType = paramTypes.get(position - 1);
-			if ( !isLegalAssignment(param, argType, queryParamType) ) {
-				message(method, mirror, value,
+			final String argType = paramTypes.get( position - 1 );
+			if ( !isLegalAssignment( param, argType, queryParamType ) ) {
+				message( method, mirror, value,
 						"parameter matching query parameter ?" + position + " has the wrong type"
-								+ " (change the method parameter type to '" + queryParamType + "')",
-						Diagnostic.Kind.ERROR);
+						+ " (change the method parameter type to '" + queryParamType + "')",
+						Diagnostic.Kind.ERROR );
 			}
 		}
 	}
 
 	private static String stripTypeAnnotations(String argType) {
-		while ( argType.startsWith("@") ) {
-			int index = argType.indexOf(' ');
-			if (index>0) {
-				argType = argType.substring(index+1);
+		while ( argType.startsWith( "@" ) ) {
+			int index = argType.indexOf( ' ' );
+			if ( index > 0 ) {
+				argType = argType.substring( index + 1 );
 			}
 		}
 		return argType;
@@ -3367,38 +3529,38 @@ private void checkNamedParameter(
 		final String name = castNonNull( param.getName() );
 		int index = paramNames.indexOf( name );
 		if ( index < 0 ) {
-			message(method, mirror, value,
+			message( method, mirror, value,
 					"missing method parameter for query parameter :" + name
 					+ " (add a parameter '" + queryParamType + ' ' + name + "' to '" + method.getSimpleName() + "')",
-					Diagnostic.Kind.ERROR);
+					Diagnostic.Kind.ERROR );
 		}
 		else {
-			final String argType = paramTypes.get(index);
-			if ( !isLegalAssignment(param, argType, queryParamType) ) {
-				message(method, mirror, value,
+			final String argType = paramTypes.get( index );
+			if ( !isLegalAssignment( param, argType, queryParamType ) ) {
+				message( method, mirror, value,
 						"parameter matching query parameter :" + name + " has the wrong type"
-								+ " (change the method parameter type to '" + queryParamType + "')",
-						Diagnostic.Kind.ERROR);
+						+ " (change the method parameter type to '" + queryParamType + "')",
+						Diagnostic.Kind.ERROR );
 			}
 		}
 	}
 
 	private static boolean isLegalAssignment(SqmParameter<?> param, String argumentType, String queryParamType) {
-		final String argType = stripTypeAnnotations(argumentType);
+		final String argType = stripTypeAnnotations( argumentType );
 		return param.allowMultiValuedBinding()
-				? isLegalAssignment(argType, LIST + '<' + queryParamType + '>')
-					|| isLegalAssignment(argType, SET + '<' + queryParamType + '>')
-					|| isLegalAssignment(argType, COLLECTION + '<' + queryParamType + '>')
-				: isLegalAssignment(argType, queryParamType);
+				? isLegalAssignment( argType, LIST + '<' + queryParamType + '>' )
+				|| isLegalAssignment( argType, SET + '<' + queryParamType + '>' )
+				|| isLegalAssignment( argType, COLLECTION + '<' + queryParamType + '>' )
+				: isLegalAssignment( argType, queryParamType );
 	}
 
 	private static boolean isLegalAssignment(String argType, String paramType) {
-		return paramType.equals(argType)
-			|| paramType.equals(fromPrimitive(argType));
+		return paramType.equals( argType )
+			|| paramType.equals( fromPrimitive( argType ) );
 	}
 
 	private static @Nullable String fromPrimitive(String argType) {
-		return switch (argType) {
+		return switch ( argType ) {
 			case "boolean" -> Boolean.class.getName();
 			case "char" -> Character.class.getName();
 			case "int" -> Integer.class.getName();
@@ -3413,14 +3575,14 @@ private static boolean isLegalAssignment(String argType, String paramType) {
 
 	private List<Boolean> parameterNullability(ExecutableElement method, TypeElement entity) {
 		return method.getParameters().stream()
-				.map(param -> finderParameterNullable(entity, param))
-				.collect(toList());
+				.map( param -> finderParameterNullable( entity, param ) )
+				.collect( toList() );
 	}
 
 	private List<String> parameterTypes(ExecutableElement method) {
 		return method.getParameters().stream()
-				.map(param -> typeAsString(parameterType(param)))
-				.collect(toList());
+				.map( param -> typeAsString( parameterType( param ) ) )
+				.collect( toList() );
 	}
 
 	/**
@@ -3462,17 +3624,17 @@ private TypeMirror parameterType(VariableElement parameter) {
 		final ExecutableElement method =
 				(ExecutableElement) parameter.getEnclosingElement();
 		final TypeMirror type =
-				memberMethodType(method).getParameterTypes()
-						.get( method.getParameters().indexOf(parameter) );
+				memberMethodType( method ).getParameterTypes()
+						.get( method.getParameters().indexOf( parameter ) );
 		switch ( type.getKind() ) {
 			case TYPEVAR:
 				final TypeVariable typeVariable = (TypeVariable) type;
-				return context.getTypeUtils().erasure(typeVariable);
+				return context.getTypeUtils().erasure( typeVariable );
 			case DECLARED:
 				final DeclaredType declaredType = (DeclaredType) type;
 				return declaredType.getTypeArguments().stream()
-						.anyMatch(arg -> arg.getKind() == TypeKind.TYPEVAR)
-						? context.getTypeUtils().erasure(type)
+						.anyMatch( arg -> arg.getKind() == TypeKind.TYPEVAR )
+						? context.getTypeUtils().erasure( type )
 						: type;
 			default:
 				return type;
@@ -3481,34 +3643,34 @@ private TypeMirror parameterType(VariableElement parameter) {
 
 	private ExecutableType memberMethodType(ExecutableElement method) {
 		return (ExecutableType) context.getTypeUtils()
-				.asMemberOf((DeclaredType) element.asType(), method);
+				.asMemberOf( (DeclaredType) element.asType(), method );
 	}
 
 	private static List<Boolean> parameterPatterns(ExecutableElement method) {
 		return method.getParameters().stream()
-				.map(param -> hasAnnotation(param, PATTERN))
+				.map( param -> hasAnnotation( param, PATTERN ) )
 				.toList();
 	}
 
 	private List<String> parameterNames(ExecutableElement method, TypeElement entity) {
 		final String idName =
 				hasAnnotation( entity, ID_CLASS )
-					? ID_ROLE_NAME
-					// account for special @By("id(this)") hack in Jakarta Data
-					: entity.getEnclosedElements().stream()
-							.filter(member -> hasAnnotation(member, ID))
-							.map(TypeUtils::propertyName)
-							.findFirst()
-							.orElse(ID_ROLE_NAME);
+						? ID_ROLE_NAME
+						// account for special @By("id(this)") hack in Jakarta Data
+						: entity.getEnclosedElements().stream()
+								.filter( member -> hasAnnotation( member, ID ) )
+								.map( TypeUtils::propertyName )
+								.findFirst()
+								.orElse( ID_ROLE_NAME );
 		return method.getParameters().stream()
-				.map(AnnotationMetaEntity::parameterName)
-				.map(name -> isIdRef(name) ? idName : name)
+				.map( AnnotationMetaEntity::parameterName )
+				.map( name -> isIdRef( name ) ? idName : name )
 				.toList();
 	}
 
 	private static List<String> parameterNames(ExecutableElement method) {
 		return method.getParameters().stream()
-				.map(AnnotationMetaEntity::parameterName)
+				.map( AnnotationMetaEntity::parameterName )
 				.toList();
 	}
 
@@ -3517,28 +3679,28 @@ private static String parameterName(VariableElement parameter) {
 		final AnnotationMirror param = getAnnotationMirror( parameter, "jakarta.data.repository.Param" );
 		if ( by != null ) {
 			final String name =
-					castNonNull(getAnnotationValue(by))
+					castNonNull( getAnnotationValue( by ) )
 							.getValue().toString();
-			if ( name.contains("<error>") ) {
+			if ( name.contains( "<error>" ) ) {
 				throw new ProcessLaterException();
 			}
 			return name
-					.replace('$', '.')
-					.replace('_', '.');
+					.replace( '$', '.' )
+					.replace( '_', '.' );
 		}
 		else if ( param != null ) {
 			final String name =
-					castNonNull(getAnnotationValue(param))
+					castNonNull( getAnnotationValue( param ) )
 							.getValue().toString();
-			if ( name.contains("<error>") ) {
+			if ( name.contains( "<error>" ) ) {
 				throw new ProcessLaterException();
 			}
 			return name;
 		}
 		else {
 			return parameter.getSimpleName().toString()
-					.replace('$', '.')
-					.replace('_', '.');
+					.replace( '$', '.' )
+					.replace( '_', '.' );
 		}
 	}
 
@@ -3558,16 +3720,16 @@ private static boolean isNullable(Element member) {
 		for ( AnnotationMirror mirror : member.getAnnotationMirrors() ) {
 			final TypeElement annotationType = (TypeElement) mirror.getAnnotationType().asElement();
 			final Name name = annotationType.getQualifiedName();
-			if ( name.contentEquals(Constants.ID)
-				|| name.contentEquals(Constants.NOT_NULL)
-				|| name.contentEquals(Constants.NONNULL) ) {
+			if ( name.contentEquals( Constants.ID )
+				|| name.contentEquals( Constants.NOT_NULL )
+				|| name.contentEquals( Constants.NONNULL ) ) {
 				return false;
 			}
-			else if ( name.contentEquals(Constants.BASIC)
-					|| name.contentEquals(Constants.MANY_TO_ONE)
-					|| name.contentEquals(Constants.ONE_TO_ONE)) {
-				final AnnotationValue optional = getAnnotationValue(mirror, "optional");
-				if ( optional != null && optional.getValue().equals(FALSE) ) {
+			else if ( name.contentEquals( Constants.BASIC )
+					|| name.contentEquals( Constants.MANY_TO_ONE )
+					|| name.contentEquals( Constants.ONE_TO_ONE ) ) {
+				final AnnotationValue optional = getAnnotationValue( mirror, "optional" );
+				if ( optional != null && optional.getValue().equals( FALSE ) ) {
 					return false;
 				}
 			}
@@ -3582,28 +3744,28 @@ private void checkParameters(
 			AnnotationMirror mirror,
 			AnnotationValue value,
 			String hql) {
-		for (int i = 1; i <= paramNames.size(); i++) {
-			final String param = paramNames.get(i-1);
-			final String type = paramTypes.get(i-1);
+		for ( int i = 1; i <= paramNames.size(); i++ ) {
+			final String param = paramNames.get( i - 1 );
+			final String type = paramTypes.get( i - 1 );
 			if ( parameterIsMissing( hql, i, param, type ) ) {
 				message( method, mirror, value,
 						"missing query parameter for '" + param
-								+ "' (no parameter named :" + param + " or ?" + i + ")",
+						+ "' (no parameter named :" + param + " or ?" + i + ")",
 						Diagnostic.Kind.ERROR );
 			}
 		}
 		if ( returnType != null ) {
 			for ( VariableElement parameter : method.getParameters() ) {
-				checkFinderParameter( explicitEntityType(returnType), parameter );
+				checkFinderParameter( explicitEntityType( returnType ), parameter );
 			}
 		}
 	}
 
 	private @Nullable TypeElement explicitEntityType(@Nullable TypeMirror resultType) {
-		if ( resultType != null && resultType.getKind() == TypeKind.DECLARED) {
+		if ( resultType != null && resultType.getKind() == TypeKind.DECLARED ) {
 			final DeclaredType declaredType = (DeclaredType) resultType;
 			final Element typeElement = declaredType.asElement();
-			if ( hasAnnotation(typeElement, ENTITY) ) {
+			if ( hasAnnotation( typeElement, ENTITY ) ) {
 				return (TypeElement) typeElement;
 			}
 		}
@@ -3614,7 +3776,7 @@ private static boolean typeNameEquals(TypeMirror parameterType, String typeName)
 		if ( parameterType.getKind() == TypeKind.DECLARED ) {
 			final DeclaredType declaredType = (DeclaredType) parameterType;
 			final TypeElement typeElement = (TypeElement) declaredType.asElement();
-			return typeElement.getQualifiedName().contentEquals(typeName);
+			return typeElement.getQualifiedName().contentEquals( typeName );
 		}
 		else {
 			return false;
@@ -3643,31 +3805,31 @@ private static String typeName(TypeMirror parameterType) {
 	}
 
 	private static boolean parameterIsMissing(String hql, int i, String param, String type) {
-		return !hasParameter(hql, i, param) && !isSpecialParam(type);
+		return !hasParameter( hql, i, param ) && !isSpecialParam( type );
 	}
 
 	private static boolean hasParameter(String hql, int i, String param) {
-		return Pattern.compile(".*(:" + param + "|\\?" + i + ")\\b.*", Pattern.DOTALL)
-				.matcher(hql).matches();
+		return Pattern.compile( ".*(:" + param + "|\\?" + i + ")\\b.*", Pattern.DOTALL )
+				.matcher( hql ).matches();
 	}
 
 	private static boolean usingReactiveSession(String sessionType) {
-		return MUTINY_SESSION.equals(sessionType)
-			|| MUTINY_STATELESS_SESSION.equals(sessionType)
-			|| UNI_MUTINY_SESSION.equals(sessionType)
-			|| UNI_MUTINY_STATELESS_SESSION.equals(sessionType);
+		return MUTINY_SESSION.equals( sessionType )
+			|| MUTINY_STATELESS_SESSION.equals( sessionType )
+			|| UNI_MUTINY_SESSION.equals( sessionType )
+			|| UNI_MUTINY_STATELESS_SESSION.equals( sessionType );
 	}
 
 	private static boolean usingStatelessSession(String sessionType) {
-		return HIB_STATELESS_SESSION.equals(sessionType)
-			|| MUTINY_STATELESS_SESSION.equals(sessionType)
-			|| UNI_MUTINY_STATELESS_SESSION.equals(sessionType)
-			|| SPRING_STATELESS_SESSION_PROVIDER.equals(sessionType);
+		return HIB_STATELESS_SESSION.equals( sessionType )
+			|| MUTINY_STATELESS_SESSION.equals( sessionType )
+			|| UNI_MUTINY_STATELESS_SESSION.equals( sessionType )
+			|| SPRING_STATELESS_SESSION_PROVIDER.equals( sessionType );
 	}
 
 	private static boolean usingReactiveSessionAccess(String sessionType) {
-		return UNI_MUTINY_SESSION.equals(sessionType)
-			|| UNI_MUTINY_STATELESS_SESSION.equals(sessionType);
+		return UNI_MUTINY_SESSION.equals( sessionType )
+			|| UNI_MUTINY_STATELESS_SESSION.equals( sessionType );
 	}
 
 	private boolean isLocal(Element methodOrParam) {
@@ -3679,36 +3841,36 @@ private boolean isLocal(Element methodOrParam) {
 	}
 
 	public void message(Element method, String message, Diagnostic.Kind severity) {
-		if ( isLocal(method) ) {
-			context.message(method, message, severity);
+		if ( isLocal( method ) ) {
+			context.message( method, message, severity );
 		}
 		else {
-			context.message(element, messageWithLocation(method, message), severity);
+			context.message( element, messageWithLocation( method, message ), severity );
 		}
 	}
 
 	public void message(Element method, AnnotationMirror mirror, String message, Diagnostic.Kind severity) {
-		if ( isLocal(method) ) {
-			context.message(method, mirror, message, severity);
+		if ( isLocal( method ) ) {
+			context.message( method, mirror, message, severity );
 		}
 		else {
-			context.message(element, messageWithLocation(method, message), severity);
+			context.message( element, messageWithLocation( method, message ), severity );
 		}
 	}
 
 	public void message(Element method, AnnotationMirror mirror, AnnotationValue value, String message, Diagnostic.Kind severity) {
-		if ( isLocal(method) ) {
-			context.message(method, mirror, value, message, severity);
+		if ( isLocal( method ) ) {
+			context.message( method, mirror, value, message, severity );
 		}
 		else {
-			context.message(element, messageWithLocation(method, message), severity);
+			context.message( element, messageWithLocation( method, message ), severity );
 		}
 	}
 
 	private static String messageWithLocation(Element element, String message) {
 		return element.getKind() == ElementKind.PARAMETER
 				? message + " for parameter '" + element.getSimpleName()
-						+ "' of inherited member '" + element.getEnclosingElement().getSimpleName() + "'"
+				+ "' of inherited member '" + element.getEnclosingElement().getSimpleName() + "'"
 				: message + " for inherited member '" + element.getSimpleName() + "'";
 	}
 
@@ -3716,9 +3878,9 @@ private static String messageWithLocation(Element element, String message) {
 	public List<AnnotationMirror> inheritedAnnotations() {
 		if ( jakartaDataRepository ) {
 			return element.getAnnotationMirrors().stream()
-					.filter(annotationMirror -> hasAnnotation(annotationMirror.getAnnotationType().asElement(),
-							"jakarta.interceptor.InterceptorBinding"))
-					.collect(toList());
+					.filter( annotationMirror -> hasAnnotation( annotationMirror.getAnnotationType().asElement(),
+							"jakarta.interceptor.InterceptorBinding" ) )
+					.collect( toList() );
 		}
 		else {
 			return emptyList();
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CDIAccessorMetaAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CDIAccessorMetaAttribute.java
index 22babb13d35d..0378d55ce587 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CDIAccessorMetaAttribute.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CDIAccessorMetaAttribute.java
@@ -4,11 +4,9 @@
  */
 package org.hibernate.processor.annotation;
 
-import javax.lang.model.element.Element;
 
 import org.hibernate.processor.model.MetaAttribute;
 import org.hibernate.processor.model.Metamodel;
-import org.hibernate.processor.util.StringUtil;
 
 public class CDIAccessorMetaAttribute implements MetaAttribute {
 
@@ -16,15 +14,6 @@ public class CDIAccessorMetaAttribute implements MetaAttribute {
 	private String propertyName;
 	private String typeName;
 
-	public CDIAccessorMetaAttribute(AnnotationMetaEntity annotationMetaEntity, Element repositoryElement) {
-		this.annotationMetaEntity = annotationMetaEntity;
-		// turn the name into lowercase
-		String name = repositoryElement.getSimpleName().toString();
-		// FIXME: this is wrong for types like STEFQueries
-		this.propertyName = StringUtil.decapitalize( name );
-		this.typeName = name;
-	}
-
 	public CDIAccessorMetaAttribute(AnnotationMetaEntity annotationMetaEntity, String propertyName, String className) {
 		this.annotationMetaEntity = annotationMetaEntity;
 		this.propertyName = propertyName;
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CDITypeMetaAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CDITypeMetaAttribute.java
index 868fdb6c9102..a63075f881bb 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CDITypeMetaAttribute.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CDITypeMetaAttribute.java
@@ -10,9 +10,9 @@
 
 public class CDITypeMetaAttribute implements MetaAttribute {
 
-	private AnnotationMetaEntity annotationMetaEntity;
-	private String typeName;
-	private Object superTypeName;
+	private final AnnotationMetaEntity annotationMetaEntity;
+	private final String typeName;
+	private final Object superTypeName;
 
 	public CDITypeMetaAttribute(AnnotationMetaEntity annotationMetaEntity, String className, String superTypeName) {
 		this.annotationMetaEntity = annotationMetaEntity;
@@ -45,11 +45,10 @@ void closingBrace(StringBuilder declaration) {
 
 	void preamble(StringBuilder declaration) {
 		declaration
-		.append("class ")
-		.append(typeName)
+				.append("class ")
+				.append(typeName)
 				.append(" implements ")
-				.append( superTypeName );
-		declaration
+				.append( superTypeName )
 				.append(" {\n");
 	}
 
@@ -77,9 +76,10 @@ void modifiers(StringBuilder declaration) {
 		annotationMetaEntity.importType("jakarta.annotation.Generated");
 		annotationMetaEntity.importType("jakarta.enterprise.context.Dependent");
 		declaration
-		.append("\n@Dependent\n")
-		.append("@Generated(\""+HibernateProcessor.class.getName()+"\")\n");
-		declaration
+				.append( "\n@Dependent\n" )
+				.append( "@Generated(\"" )
+				.append( HibernateProcessor.class.getName() )
+				.append( "\")\n" )
 				.append("public static ");
 	}
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaDeleteMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaDeleteMethod.java
index 58d88fc997b7..49fe22213e39 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaDeleteMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaDeleteMethod.java
@@ -86,11 +86,11 @@ String specificationType() {
 
 	private void execute(StringBuilder declaration) {
 		declaration
-				.append("\t\t\t.executeUpdate()");
-		if ( isReactive() ) {
-			if ( fullReturnType.endsWith("<java.lang.Void>") ) {}
+				.append(".executeUpdate()");
+		if ( isReactive()
+				&& fullReturnType.endsWith("<java.lang.Void>") ) {
 			declaration
-					.append(".replaceWithVoid()");
+					.append( ".replaceWithVoid()" );
 		}
 	}
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DefaultConstructor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DefaultConstructor.java
index 54cd106ae92c..c874d4fba420 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DefaultConstructor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/DefaultConstructor.java
@@ -21,6 +21,13 @@
 
 /**
  * Used by the container to instantiate a Jakarta Data repository.
+ * This is a constructor with no parameters, used to instantiate
+ * a repository which then uses field injection to obtain its
+ * dependencies. By contrast, a {@link RepositoryConstructor} has
+ * a parameter which accepts the session as an argument, allowing
+ * direct instantiation or constructor injection. This class is
+ * only needed because {@code @PersistenceUnit} is incompatible
+ * with CDI-style constructor injection.
  *
  * @author Gavin King
  */
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/ErrorHandler.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/ErrorHandler.java
index 9cf9bb91549f..cebe0889bdf4 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/ErrorHandler.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/ErrorHandler.java
@@ -62,7 +62,7 @@ public void warn(int start, int end, String message) {
 	public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String message, RecognitionException e) {
 		errorCount++;
 		String prettyMessage = "illegal HQL syntax - "
-				+ prettifyAntlrError( offendingSymbol, line, charPositionInLine, message, e, queryString, false );
+				+ prettifyAntlrError( offendingSymbol, line, charPositionInLine, message, e, queryString, true );
 		context.message( element, mirror, value, prettyMessage, Diagnostic.Kind.ERROR );
 	}
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/LifecycleMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/LifecycleMethod.java
index 4736c6545406..9dc3e1ba2650 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/LifecycleMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/LifecycleMethod.java
@@ -355,7 +355,7 @@ private boolean isGeneratedIdUpsert() {
 	private void preamble(StringBuilder declaration) {
 		declaration
 				.append("\n@Override\npublic ")
-				.append(parameterTypeBopunds())
+				.append(parameterTypeBounds())
 				.append(returnType())
 				.append(' ')
 				.append(methodName)
@@ -372,7 +372,7 @@ private void preamble(StringBuilder declaration) {
 				.append(" {\n");
 	}
 
-	private String parameterTypeBopunds() {
+	private String parameterTypeBounds() {
 		if ( method.getTypeParameters().isEmpty() ) {
 			return "";
 		}
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
index 6e330a49f634..548327f5d651 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
@@ -80,6 +80,11 @@ boolean isNullable(int index) {
 		return true;
 	}
 
+	@Override
+	@Nullable String containerType() {
+		return containerType;
+	}
+
 	@Override
 	boolean singleResult() {
 		return containerType == null && !isUpdate;
@@ -129,26 +134,30 @@ void createQuery(StringBuilder declaration, boolean declareVariable) {
 					.append('\t');
 			declaration.append("var _select = ");
 		}
-		if ( isUsingSpecification() ) {
+		if ( useSpecificationCreateQuery() ) {
+			declaration
+					.append("_spec.createQuery(");
+			localSession( declaration );
+			declaration
+					.append(")");
+		}
+		else if ( isUsingSpecification() ) {
+			localSession( declaration );
+			declaration
+					.append(".createQuery(_spec.buildCriteria(");
+			localSession( declaration );
 			if ( isReactive() ) {
 				declaration
-						.append(localSessionName())
-						.append(".createQuery(_spec.buildCriteria(")
-						.append(localSessionName())
 						.append(".getFactory().getCriteriaBuilder()))\n");
 			}
 			else {
 				declaration
-						.append("_spec.createQuery(")
-						.append(localSessionName())
-						.append(getObjectCall())
-						.append(")");
+						.append(".getCriteriaBuilder()))");
 			}
 		}
 		else {
+			localSession( declaration );
 			declaration
-					.append(localSessionName())
-					.append(getObjectCall())
 					.append('.')
 					.append(createQueryMethod())
 					.append("(")
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/RepositoryConstructor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/RepositoryConstructor.java
index 20727f6cfb95..45ad7c1f53d8 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/RepositoryConstructor.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/RepositoryConstructor.java
@@ -14,7 +14,12 @@
 import static org.hibernate.processor.util.Constants.NONNULL;
 
 /**
- * A general purpose constructor which accepts the session.
+ * A general purpose constructor which accepts the session as an
+ * argument. This constructor is compatible with use via direct
+ * instantiation or CDI-style constructor injection. By contrast,
+ * {@link DefaultConstructor} is used to instantiate a repository
+ * which obtains its session using field injection. This class
+ * also takes care of adding the resource accessor method.
  *
  * @author Gavin King
  */
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/FileTimeStampChecker.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/FileTimeStampChecker.java
index 68c723826018..78f26f9c2d44 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/FileTimeStampChecker.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/FileTimeStampChecker.java
@@ -7,40 +7,32 @@
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * @author Hardy Ferentschik
  */
-public class FileTimeStampChecker implements Serializable {
+public final class FileTimeStampChecker implements Serializable {
 
-	private Map<String, Long> lastModifiedCache;
-
-	public FileTimeStampChecker() {
-		lastModifiedCache = new HashMap<String, Long>();
-	}
+	private final Map<String, Long> lastModifiedCache = new HashMap<>();
 
 	public void add(String fileName, Long lastModified) {
 		lastModifiedCache.put( fileName, lastModified );
 	}
 
 	@Override
-	public boolean equals(@Nullable Object o) {
-		if ( this == o ) {
+	public boolean equals(@Nullable Object object) {
+		if ( this == object ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		else if ( !( object instanceof FileTimeStampChecker that ) ) {
 			return false;
 		}
-
-		FileTimeStampChecker that = (FileTimeStampChecker) o;
-
-		if ( !lastModifiedCache.equals( that.lastModifiedCache ) ) {
-			return false;
+		else {
+			return Objects.equals( this.lastModifiedCache, that.lastModifiedCache );
 		}
-
-		return true;
 	}
 
 	@Override
@@ -50,10 +42,6 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		final StringBuilder sb = new StringBuilder();
-		sb.append( "FileTimeStampChecker" );
-		sb.append( "{lastModifiedCache=" ).append( lastModifiedCache );
-		sb.append( '}' );
-		return sb.toString();
+		return "FileTimeStampChecker{lastModifiedCache=" + lastModifiedCache + '}';
 	}
 }
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeUtils.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeUtils.java
index 2f98a5765939..27194a022e82 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeUtils.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/util/TypeUtils.java
@@ -39,7 +39,8 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
-import static java.beans.Introspector.decapitalize;
+import static org.hibernate.processor.util.Constants.MANY_TO_ANY;
+import static org.hibernate.processor.util.StringUtil.decapitalize;
 import static java.util.stream.Stream.concat;
 import static org.hibernate.internal.util.StringHelper.split;
 import static org.hibernate.processor.util.AccessTypeInformation.DEFAULT_ACCESS_TYPE;
@@ -572,8 +573,7 @@ && isProperty( element.getSimpleName().toString(),
 	}
 
 	public static boolean isPluralAttribute(Element element) {
-		// TODO: should MANY_TO_ANY be on this list?
-		return hasAnnotation( element, MANY_TO_MANY, ONE_TO_MANY, ELEMENT_COLLECTION );
+		return hasAnnotation( element, MANY_TO_MANY, ONE_TO_MANY, ELEMENT_COLLECTION, MANY_TO_ANY );
 	}
 
 	public static @Nullable String getFullyQualifiedClassNameOfTargetEntity(
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
index caf404ff29d3..6582598c306e 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java
@@ -10,6 +10,7 @@
 import org.hibernate.EntityNameResolver;
 import org.hibernate.MappingException;
 import org.hibernate.SessionFactoryObserver;
+import org.hibernate.temporal.TemporalTableStrategy;
 import org.hibernate.metamodel.mapping.EntityVersionMapping;
 import org.hibernate.type.TimeZoneStorageStrategy;
 import org.hibernate.boot.internal.DefaultCustomEntityDirtinessStrategy;
@@ -258,6 +259,11 @@ public ClassLoaderService getClassLoaderService() {
 		return classLoaderService;
 	}
 
+	@Override
+	public TemporalTableStrategy getTemporalTableStrategy() {
+		return TemporalTableStrategy.SINGLE_TABLE;
+	}
+
 	@Override
 	public void addObserver(SessionFactoryObserver observer) {
 	}
@@ -335,13 +341,13 @@ private EntityPersister createEntityPersister(String entityName) {
 		return result;
 	}
 
-	private CollectionPersister createCollectionPersister(String entityName) {
-		MockCollectionPersister result = collectionPersistersByName.get(entityName);
+	private CollectionPersister createCollectionPersister(String role) {
+		MockCollectionPersister result = collectionPersistersByName.get(role);
 		if (result!=null) {
 			return result;
 		}
-		result = createMockCollectionPersister(entityName);
-		collectionPersistersByName.put(entityName, result);
+		result = createMockCollectionPersister(role);
+		collectionPersistersByName.put(role, result);
 		return result;
 	}
 
@@ -860,14 +866,14 @@ else if (isEntityDefined(queryName)) {
 		}
 
 		@Override
-		public @Nullable <X> ManagedDomainType<X> findManagedType(@Nullable String typeName) {
+		public @Nullable ManagedDomainType<?> findManagedType(@Nullable String typeName) {
 			// TODO: not every ManagedDomainType is an EntityDomainType!
 			return typeName == null ? null : new MockEntityDomainType<>(new MockJavaType<>(typeName));
 		}
 
 		@Override
 		public <X> ManagedDomainType<X> findManagedType(Class<X> cls) {
-			return findManagedType( cls.getName() );
+			return cls == null ? null : new MockEntityDomainType<>(new MockJavaType<>(cls.getName()));
 		}
 
 		@Override
@@ -900,7 +906,7 @@ public JavaType<?> getJavaConstantType(String className, String fieldName) {
 		}
 
 		@Override
-		public <T> T getJavaConstant(String className, String fieldName) {
+		public <E> E getJavaConstant(String className, String fieldName, Class<E> javaTypeClass) {
 			return null;
 		}
 
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java
index 3533fe1f87ad..ed139074292c 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java
@@ -43,7 +43,9 @@
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 import javax.tools.StandardLocation;
-import java.beans.Introspector;
+
+import static org.hibernate.internal.util.StringHelper.qualifier;
+import static org.hibernate.processor.util.StringUtil.decapitalize;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
@@ -55,9 +57,7 @@
 
 import static java.util.Arrays.stream;
 import static org.hibernate.internal.util.StringHelper.qualify;
-import static org.hibernate.internal.util.StringHelper.root;
 import static org.hibernate.internal.util.StringHelper.split;
-import static org.hibernate.internal.util.StringHelper.unroot;
 import static org.hibernate.processor.util.Constants.JAVA_OBJECT;
 
 /**
@@ -115,8 +115,8 @@ MockEntityPersister createMockEntityPersister(String entityName) {
 
 	@Override
 	MockCollectionPersister createMockCollectionPersister(String role) {
-		final String entityName = root(role); //only works because entity names don't contain dots
-		final String propertyPath = unroot(role);
+		final String entityName = extractEntityNameFromRole( role );
+		final String propertyPath = role.substring( entityName.length() + 1 );
 		final TypeElement entityClass = findEntityClass(entityName);
 		final AccessType defaultAccessType = getDefaultAccessType(entityClass);
 		final Element property = findPropertyByPath(entityClass, propertyPath, defaultAccessType);
@@ -135,6 +135,16 @@ else if (isElementCollectionProperty(property)) {
 		}
 	}
 
+	private String extractEntityNameFromRole(String role) {
+		for ( String entityName : entityNameMappings.values() ) {
+			if ( role.startsWith( entityName ) ) {
+				return entityName;
+			}
+		}
+		// fragile fallback
+		return qualifier( role );
+	}
+
 	@Override
 	Type propertyType(String typeName, String propertyPath) {
 		final TypeElement type = findClassByQualifiedName(typeName);
@@ -1109,7 +1119,7 @@ private static String propertyName(Element symbol) {
 			else if (name.startsWith("is")) {
 				name = name.substring(2);
 			}
-			return Introspector.decapitalize(name);
+			return decapitalize(name);
 		}
 		else {
 			return name;
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Validation.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Validation.java
index e46d4e73cf2d..88f1be6bef3e 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Validation.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/Validation.java
@@ -13,7 +13,6 @@
 import org.hibernate.PropertyNotFoundException;
 import org.hibernate.QueryException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.grammars.hql.HqlLexer;
 import org.hibernate.grammars.hql.HqlParser;
 import org.hibernate.query.hql.internal.HqlParseTreeBuilder;
 import org.hibernate.query.hql.internal.SemanticQueryBuilder;
@@ -120,8 +119,8 @@ private static SemanticQueryBuilder<?> createSemanticQueryBuilder(
 	}
 
 	private static HqlParser.StatementContext parseAndCheckSyntax(String hql, Handler handler) {
-		final HqlLexer hqlLexer = HqlParseTreeBuilder.INSTANCE.buildHqlLexer( hql );
-		final HqlParser hqlParser = HqlParseTreeBuilder.INSTANCE.buildHqlParser( hql, hqlLexer );
+		final var hqlLexer = HqlParseTreeBuilder.INSTANCE.buildHqlLexer( hql );
+		final var hqlParser = HqlParseTreeBuilder.INSTANCE.buildHqlParser( hql, hqlLexer );
 
 		hqlParser.getInterpreter().setPredictionMode( PredictionMode.SLL );
 		hqlParser.removeErrorListeners();
@@ -131,9 +130,8 @@ private static HqlParser.StatementContext parseAndCheckSyntax(String hql, Handle
 		try {
 			return hqlParser.statement();
 		}
-		catch ( ParseCancellationException e) {
-			// reset the input token stream and parser state
-			hqlLexer.reset();
+		catch ( ParseCancellationException e ) {
+			// reset the parser state (do not reset the input token stream)
 			hqlParser.reset();
 
 			// fall back to LL(k)-based parsing
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/JpaDescriptorParser.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/JpaDescriptorParser.java
index 7a24e37c2551..c908018f5b09 100644
--- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/JpaDescriptorParser.java
+++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/xml/JpaDescriptorParser.java
@@ -8,21 +8,18 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.util.Elements;
 import javax.tools.Diagnostic;
 
 import org.hibernate.MappingException;
+import org.hibernate.boot.ResourceStreamLocator;
 import org.hibernate.boot.jaxb.Origin;
 import org.hibernate.boot.jaxb.SourceType;
 import org.hibernate.boot.jaxb.configuration.spi.JaxbPersistenceImpl;
@@ -32,14 +29,9 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityMappingsImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbMappedSuperclassImpl;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbPersistenceUnitDefaultsImpl;
-import org.hibernate.boot.jaxb.mapping.spi.JaxbPersistenceUnitMetadataImpl;
-import org.hibernate.boot.jaxb.spi.Binding;
-import org.hibernate.boot.jaxb.spi.JaxbBindableMappingDescriptor;
 import org.hibernate.processor.Context;
 import org.hibernate.processor.util.AccessTypeInformation;
 import org.hibernate.processor.util.FileTimeStampChecker;
-import org.hibernate.processor.util.TypeUtils;
 import org.hibernate.processor.util.xml.XmlParserHelper;
 
 import jakarta.persistence.AccessType;
@@ -47,13 +39,14 @@
 
 import static org.hibernate.processor.util.StringUtil.determineFullyQualifiedClassName;
 import static org.hibernate.processor.util.StringUtil.packageNameFromFullyQualifiedName;
+import static org.hibernate.processor.util.TypeUtils.determineAccessTypeForHierarchy;
 
 /**
  * Parser for JPA XML descriptors (persistence.xml and referenced mapping files).
  *
  * @author Hardy Ferentschik
  */
-public class JpaDescriptorParser {
+public final class JpaDescriptorParser {
 	private static final String DEFAULT_ORM_XML_LOCATION = "/META-INF/orm.xml";
 	private static final String SERIALIZATION_FILE_NAME = "Hibernate-Static-Metamodel-Generator.tmp";
 
@@ -62,145 +55,113 @@ public class JpaDescriptorParser {
 	private final XmlParserHelper xmlParserHelper;
 	private final ConfigurationBinder configurationBinder;
 	private final MappingBinder mappingBinder;
+	private final ResourceStreamLocator resourceStreamLocator;
 
 	public JpaDescriptorParser(Context context) {
 		this.context = context;
-		this.entityMappings = new ArrayList<>();
-		this.xmlParserHelper = new XmlParserHelper( context );
-
-		final ResourceStreamLocatorImpl resourceStreamLocator = new ResourceStreamLocatorImpl( context );
-		this.configurationBinder = new ConfigurationBinder( resourceStreamLocator );
-		this.mappingBinder = new MappingBinder( resourceStreamLocator, (Function<String,Object>) null );
+		entityMappings = new ArrayList<>();
+		xmlParserHelper = new XmlParserHelper( context );
+		resourceStreamLocator = new ResourceStreamLocatorImpl( context );
+		configurationBinder = new ConfigurationBinder( resourceStreamLocator );
+		mappingBinder = new MappingBinder( resourceStreamLocator, (Function<String, Object>) null );
 	}
 
 	public void parseMappingXml() {
-		Collection<String> mappingFileNames = determineMappingFileNames();
-
-		if ( context.doLazyXmlParsing() && mappingFilesUnchanged( mappingFileNames ) ) {
-			return;
-		}
-
-		loadEntityMappings( mappingFileNames );
-		determineDefaultAccessTypeAndMetaCompleteness();
-		determineXmlAccessTypes();
-		if ( !context.isFullyXmlConfigured() ) {
-			// need to take annotations into consideration, since they can override xml settings
-			// we have to at least determine whether any of the xml configured entities is influenced by annotations
-			determineAnnotationAccessTypes();
-		}
+		final var mappingFileNames = determineMappingFileNames();
+		if ( !context.doLazyXmlParsing() || !mappingFilesUnchanged( mappingFileNames ) ) {
+			loadEntityMappings( mappingFileNames );
+			determineDefaultAccessTypeAndMetaCompleteness();
+			determineXmlAccessTypes();
+			if ( !context.isFullyXmlConfigured() ) {
+				// Need to take annotations into consideration, since they can override XML settings.
+				// We have to at least determine whether any of the XML-configured entities are influenced by annotations.
+				determineAnnotationAccessTypes();
+			}
 
-		for ( JaxbEntityMappingsImpl mappings : entityMappings ) {
-			String defaultPackageName = mappings.getPackage();
-			parseEntities( mappings.getEntities(), defaultPackageName );
-			parseEmbeddable( mappings.getEmbeddables(), defaultPackageName );
-			parseMappedSuperClass( mappings.getMappedSuperclasses(), defaultPackageName );
+			for ( var mappings : entityMappings ) {
+				final String defaultPackageName = mappings.getPackage();
+				parseEntities( mappings.getEntities(), defaultPackageName );
+				parseEmbeddable( mappings.getEmbeddables(), defaultPackageName );
+				parseMappedSuperClass( mappings.getMappedSuperclasses(), defaultPackageName );
+			}
 		}
 	}
 
 	private Collection<String> determineMappingFileNames() {
-		Collection<String> mappingFileNames = new ArrayList<>();
-
-		JaxbPersistenceImpl persistence = getPersistence();
+		final Collection<String> mappingFileNames = new ArrayList<>();
+		final var persistence = getPersistence();
 		if ( persistence != null ) {
 			// get mapping file names from persistence.xml
-			List<JaxbPersistenceImpl.JaxbPersistenceUnitImpl> persistenceUnits = persistence.getPersistenceUnit();
-			for ( JaxbPersistenceImpl.JaxbPersistenceUnitImpl unit : persistenceUnits ) {
+			for ( var unit : persistence.getPersistenceUnit() ) {
 				mappingFileNames.addAll( unit.getMappingFiles() );
 			}
 		}
-
 		// /META-INF/orm.xml is implicit
 		mappingFileNames.add( DEFAULT_ORM_XML_LOCATION );
-
-		// not really part of the official spec, but the processor allows to specify mapping files directly as
-		// command line options
+		// not really part of the official spec, but the processor allows
+		// specifying mapping files directly as command line options
 		mappingFileNames.addAll( context.getOrmXmlFiles() );
 		return mappingFileNames;
 	}
 
 	private @Nullable JaxbPersistenceImpl getPersistence() {
-		JaxbPersistenceImpl persistence = null;
-
 		final String persistenceXmlLocation = context.getPersistenceXmlLocation();
-		final InputStream stream = xmlParserHelper.getInputStreamForResource( persistenceXmlLocation );
+		final var stream = xmlParserHelper.getInputStreamForResource( persistenceXmlLocation );
 		if ( stream == null ) {
 			return null;
 		}
-
-		try {
-			final Binding<JaxbPersistenceImpl> binding = configurationBinder.bind(
-					stream,
-					new Origin( SourceType.RESOURCE, persistenceXmlLocation )
-			);
-			persistence = binding.getRoot();
-		}
-		catch (MappingException e) {
-			throw e;
-		}
-		catch (Exception e) {
-			context.logMessage(
-					Diagnostic.Kind.WARNING, "Unable to parse persistence.xml: " + e.getMessage()
-			);
-		}
-		finally {
-			try {
-				stream.close();
+		else {
+			try (stream) {
+				final var binding =
+						configurationBinder.bind( stream,
+								new Origin( SourceType.RESOURCE, persistenceXmlLocation ) );
+				return binding.getRoot();
+			}
+			catch (MappingException e) {
+				throw e;
 			}
-			catch (IOException e) {
-				// eat it
+			catch (Exception e) {
+				context.logMessage( Diagnostic.Kind.WARNING,
+						"Unable to parse persistence.xml: " + e.getMessage() );
+				return null;
 			}
 		}
-
-		return persistence;
 	}
 
 	private void loadEntityMappings(Collection<String> mappingFileNames) {
-		final ResourceStreamLocatorImpl resourceStreamLocator = new ResourceStreamLocatorImpl( context );
-
 		for ( String mappingFile : mappingFileNames ) {
-			final InputStream inputStream = resourceStreamLocator.locateResourceStream( mappingFile );
-			if ( inputStream == null ) {
-				// todo (jpa32) : log
-				continue;
-			}
-			try {
-				final Binding<JaxbBindableMappingDescriptor> binding = mappingBinder.bind(
-						inputStream,
-						new Origin( SourceType.RESOURCE, mappingFile )
-				);
-				if ( binding != null ) {
-					entityMappings.add( (JaxbEntityMappingsImpl) binding.getRoot() );
-				}
-			}
-			catch (Exception e) {
-				context.logMessage(
-						Diagnostic.Kind.WARNING, "Unable to parse " + mappingFile + ": " + e.getMessage()
-				);
-			}
-			finally {
-				try {
-					inputStream.close();
+			final var inputStream = resourceStreamLocator.locateResourceStream( mappingFile );
+			if ( inputStream != null ) {
+				try ( inputStream ) {
+					final var binding =
+							mappingBinder.bind( inputStream,
+									new Origin( SourceType.RESOURCE, mappingFile ) );
+					if ( binding != null ) {
+						entityMappings.add( (JaxbEntityMappingsImpl) binding.getRoot() );
+					}
 				}
-				catch (IOException e) {
-					// eat it
+				catch (Exception e) {
+					context.logMessage(
+							Diagnostic.Kind.WARNING,
+							"Unable to parse " + mappingFile + ": " + e.getMessage()
+					);
 				}
 			}
+			// else todo (jpa32) : log
 		}
 	}
 
 	private boolean mappingFilesUnchanged(Collection<String> mappingFileNames) {
-		boolean mappingFilesUnchanged = false;
-		FileTimeStampChecker fileStampCheck = new FileTimeStampChecker();
+		final var fileStampCheck = new FileTimeStampChecker();
 		for ( String mappingFile : mappingFileNames ) {
 			try {
-				URL url = this.getClass().getResource( mappingFile );
-				if ( url == null ) {
-					continue;
-				}
-				File file = new File( url.toURI() );
-				context.logMessage( Diagnostic.Kind.OTHER, "Check file  " + mappingFile );
-				if ( file.exists() ) {
-					fileStampCheck.add( mappingFile, file.lastModified() );
+				final var url = JpaDescriptorParser.class.getResource( mappingFile );
+				if ( url != null ) {
+					context.logMessage( Diagnostic.Kind.OTHER, "Check file " + mappingFile );
+					final var file = new File( url.toURI() );
+					if ( file.exists() ) {
+						fileStampCheck.add( mappingFile, file.lastModified() );
+					}
 				}
 			}
 			catch (URISyntaxException e) {
@@ -209,239 +170,208 @@ private boolean mappingFilesUnchanged(Collection<String> mappingFileNames) {
 			}
 		}
 
-		FileTimeStampChecker serializedTimeStampCheck = loadTimeStampCache();
-		if ( serializedTimeStampCheck.equals( fileStampCheck ) ) {
-			context.logMessage( Diagnostic.Kind.OTHER, "XML parsing will be skipped due to unchanged xml files" );
-			mappingFilesUnchanged = true;
+		if ( loadTimeStampCache().equals( fileStampCheck ) ) {
+			context.logMessage( Diagnostic.Kind.OTHER,
+					"XML parsing will be skipped due to unchanged XML files" );
+			return true;
 		}
 		else {
 			saveTimeStampCache( fileStampCheck );
+			return false;
 		}
-
-		return mappingFilesUnchanged;
 	}
 
 	private void saveTimeStampCache(FileTimeStampChecker fileStampCheck) {
-		final File file = getSerializationTmpFile();
-		try ( final ObjectOutput out = new ObjectOutputStream( new FileOutputStream( file ) ) ) {
+		final var file = getSerializationTmpFile();
+		try ( final var out = new ObjectOutputStream( new FileOutputStream( file ) ) ) {
 			out.writeObject( fileStampCheck );
-			context.logMessage(
-					Diagnostic.Kind.OTHER, "Serialized " + fileStampCheck + " into " + file.getAbsolutePath()
-			);
+			context.logMessage( Diagnostic.Kind.OTHER,
+					"Serialized " + fileStampCheck + " into " + file.getAbsolutePath() );
 		}
 		catch (IOException e) {
-			// ignore - if the serialization failed we just have to keep parsing the xml
-			context.logMessage( Diagnostic.Kind.OTHER, "Error serializing  " + fileStampCheck );
+			// ignore - if the serialization failed, we just have to keep parsing the XML
+			context.logMessage( Diagnostic.Kind.OTHER, "Error serializing " + fileStampCheck );
 		}
 	}
 
 	private File getSerializationTmpFile() {
-		File tmpDir = new File( System.getProperty( "java.io.tmpdir" ) );
+		final var tmpDir = new File( System.getProperty( "java.io.tmpdir" ) );
 		return new File( tmpDir, SERIALIZATION_FILE_NAME );
 	}
 
 	private FileTimeStampChecker loadTimeStampCache() {
-		final File file = getSerializationTmpFile();
+		final var file = getSerializationTmpFile();
 		if ( file.exists() ) {
-			try {
-				try ( FileInputStream fileInputStream = new FileInputStream( file ) ) {
-					try ( ObjectInputStream in = new ObjectInputStream( fileInputStream ) ) {
-						return (FileTimeStampChecker) in.readObject();
-					}
-				}
+			try ( var in = new ObjectInputStream( new FileInputStream( file ) ) ) {
+				return (FileTimeStampChecker) in.readObject();
 			}
-			catch (IOException|ClassNotFoundException e) {
+			catch (IOException | ClassNotFoundException e) {
 				//handled in the outer scope
 			}
 		}
-		// ignore - if the de-serialization failed we just have to keep parsing the xml
-		context.logMessage( Diagnostic.Kind.OTHER, "Error de-serializing  " + file );
+		// ignore - if the deserialization failed, we just have to keep parsing the XML
+		context.logMessage( Diagnostic.Kind.OTHER, "Error deserializing " + file );
 		return new FileTimeStampChecker();
 	}
 
 	private void parseEntities(List<JaxbEntityImpl> entities, String defaultPackageName) {
-		for ( JaxbEntityImpl entity : entities ) {
-			String fqcn = determineFullyQualifiedClassName( defaultPackageName, entity.getClazz() );
-
-			if ( !xmlMappedTypeExists( fqcn ) ) {
-				context.logMessage(
-						Diagnostic.Kind.WARNING,
-						fqcn + " is mapped in xml, but class does not exist. Skipping meta model generation."
-				);
-				continue;
+		for ( var entity : entities ) {
+			final String entityClassName =
+					determineFullyQualifiedClassName( defaultPackageName, entity.getClazz() );
+			if ( !xmlMappedTypeExists( entityClassName ) ) {
+				context.logMessage( Diagnostic.Kind.WARNING,
+						entityClassName
+						+ " is mapped in XML, but class does not exist. Skipping meta model generation." );
 			}
-
-			XmlMetaEntity metaEntity = XmlMetaEntity.create(
-					entity, defaultPackageName, getXmlMappedType( fqcn ), context
-			);
-			if ( context.containsMetaEntity( fqcn ) ) {
-				context.logMessage(
-						Diagnostic.Kind.WARNING,
-						fqcn + " was already processed once. Skipping second occurrence."
-				);
+			else {
+				final var metaEntity =
+						XmlMetaEntity.create( entity, defaultPackageName, getXmlMappedType( entityClassName ), context );
+				if ( context.containsMetaEntity( entityClassName ) ) {
+					context.logMessage( Diagnostic.Kind.WARNING,
+							entityClassName
+							+ " was already processed once. Skipping second occurrence." );
+				}
+				context.addMetaEntity( entityClassName, metaEntity );
 			}
-			context.addMetaEntity( fqcn, metaEntity );
 		}
 	}
 
 	private void parseEmbeddable(
 			List<JaxbEmbeddableImpl> embeddables,
 			String defaultPackageName) {
-		for ( JaxbEmbeddableImpl embeddable : embeddables ) {
-			String fqcn = determineFullyQualifiedClassName( defaultPackageName, embeddable.getClazz() );
-			// we have to extract the package name from the fqcn. Maybe the entity was setting a fqcn directly
-			String pkg = packageNameFromFullyQualifiedName( fqcn );
-
-			if ( !xmlMappedTypeExists( fqcn ) ) {
-				context.logMessage(
-						Diagnostic.Kind.WARNING,
-						fqcn + " is mapped in xml, but class does not exist. Skipping meta model generation."
-				);
-				continue;
+		for ( var embeddable : embeddables ) {
+			final String embeddableClassName =
+					determineFullyQualifiedClassName( defaultPackageName, embeddable.getClazz() );
+			// We have to extract the package name from the FQCN
+			// Maybe the entity was setting a FQCN directly
+			if ( !xmlMappedTypeExists( embeddableClassName ) ) {
+				context.logMessage( Diagnostic.Kind.WARNING,
+						embeddableClassName
+						+ " is mapped in XML, but class does not exist. Skipping meta model generation." );
 			}
-
-			XmlMetaEntity metaEntity = new XmlMetaEntity( embeddable, pkg, getXmlMappedType( fqcn ), context );
-			if ( context.containsMetaEmbeddable( fqcn ) ) {
-				context.logMessage(
-						Diagnostic.Kind.WARNING,
-						fqcn + " was already processed once. Skipping second occurrence."
-				);
+			else {
+				final String pkg = packageNameFromFullyQualifiedName( embeddableClassName );
+				final var metaEntity =
+						new XmlMetaEntity( embeddable, pkg, getXmlMappedType( embeddableClassName ), context );
+				if ( context.containsMetaEmbeddable( embeddableClassName ) ) {
+					context.logMessage( Diagnostic.Kind.WARNING,
+							embeddableClassName
+							+ " was already processed once. Skipping second occurrence." );
+				}
+				context.addMetaEmbeddable( embeddableClassName, metaEntity );
 			}
-			context.addMetaEmbeddable( fqcn, metaEntity );
 		}
 	}
 
 	private void parseMappedSuperClass(
 			List<JaxbMappedSuperclassImpl> mappedSuperClasses,
 			String defaultPackageName) {
-		for ( JaxbMappedSuperclassImpl mappedSuperClass : mappedSuperClasses ) {
-			String fqcn = determineFullyQualifiedClassName(
-					defaultPackageName, mappedSuperClass.getClazz()
-			);
-			// we have to extract the package name from the fqcn. Maybe the entity was setting a fqcn directly
-			String pkg = packageNameFromFullyQualifiedName( fqcn );
-
-			if ( !xmlMappedTypeExists( fqcn ) ) {
-				context.logMessage(
-						Diagnostic.Kind.WARNING,
-						fqcn + " is mapped in xml, but class does not exist. Skipping meta model generation."
-				);
-				continue;
+		for ( var mappedSuperClass : mappedSuperClasses ) {
+			final String mappedSuperClassName =
+					determineFullyQualifiedClassName( defaultPackageName, mappedSuperClass.getClazz() );
+			// We have to extract the package name from the FQCN
+			// Maybe the entity was setting a FQCN directly
+			if ( !xmlMappedTypeExists( mappedSuperClassName ) ) {
+				context.logMessage( Diagnostic.Kind.WARNING,
+						mappedSuperClassName
+						+ " is mapped in XML, but class does not exist. Skipping meta model generation." );
 			}
-
-			XmlMetaEntity metaEntity = new XmlMetaEntity( mappedSuperClass, pkg, getXmlMappedType( fqcn ), context
-			);
-
-			if ( context.containsMetaEntity( fqcn ) ) {
-				context.logMessage(
-						Diagnostic.Kind.WARNING,
-						fqcn + " was already processed once. Skipping second occurrence."
-				);
+			else {
+				final String pkg = packageNameFromFullyQualifiedName( mappedSuperClassName );
+				final var metaEntity =
+						new XmlMetaEntity( mappedSuperClass, pkg, getXmlMappedType( mappedSuperClassName ), context );
+				if ( context.containsMetaEntity( mappedSuperClassName ) ) {
+					context.logMessage( Diagnostic.Kind.WARNING,
+							mappedSuperClassName
+							+ " was already processed once. Skipping second occurrence." );
+				}
+				context.addMetaEntity( mappedSuperClassName, metaEntity );
 			}
-			context.addMetaEntity( fqcn, metaEntity );
 		}
 	}
 
 	private boolean xmlMappedTypeExists(String fullyQualifiedClassName) {
-		Elements utils = context.getElementUtils();
-		return utils.getTypeElement( fullyQualifiedClassName ) != null;
+		return context.getElementUtils().getTypeElement( fullyQualifiedClassName ) != null;
 	}
 
 	private TypeElement getXmlMappedType(String fullyQualifiedClassName) {
-		Elements utils = context.getElementUtils();
-		return utils.getTypeElement( fullyQualifiedClassName );
+		return context.getElementUtils().getTypeElement( fullyQualifiedClassName );
 	}
 
 	private AccessType determineEntityAccessType(JaxbEntityMappingsImpl mappings) {
-		final AccessType contextAccessType = context.getPersistenceUnitDefaultAccessType();
-		final AccessType mappingsAccess = mappings.getAccess();
-		if ( mappingsAccess != null ) {
-			return mappingsAccess;
-		}
-		return contextAccessType;
+		final var mappingsAccess = mappings.getAccess();
+		return mappingsAccess != null ? mappingsAccess : context.getPersistenceUnitDefaultAccessType();
 	}
 
 	private void determineXmlAccessTypes() {
-		for ( JaxbEntityMappingsImpl mappings : entityMappings ) {
-			String fqcn;
-			String packageName = mappings.getPackage();
-			AccessType defaultAccessType = determineEntityAccessType( mappings );
-
-			for ( JaxbEntityImpl entity : mappings.getEntities() ) {
-				final String name = entity.getClazz();
-				fqcn = determineFullyQualifiedClassName( packageName, name );
-				final AccessType explicitAccessType = entity.getAccess();
-				final AccessTypeInformation accessInfo = new AccessTypeInformation( fqcn, explicitAccessType, defaultAccessType );
-				context.addAccessTypeInformation( fqcn, accessInfo );
+		for ( var mappings : entityMappings ) {
+			final String packageName = mappings.getPackage();
+			final var defaultAccessType = determineEntityAccessType( mappings );
+			for ( var entity : mappings.getEntities() ) {
+				addAccessTypeInfo( packageName, entity.getClazz(), entity.getAccess(), defaultAccessType );
 			}
-
-			for ( JaxbMappedSuperclassImpl mappedSuperClass : mappings.getMappedSuperclasses() ) {
-				final String name = mappedSuperClass.getClazz();
-				fqcn = determineFullyQualifiedClassName( packageName, name );
-				final AccessType explicitAccessType = mappedSuperClass.getAccess();
-				final AccessTypeInformation accessInfo = new AccessTypeInformation( fqcn, explicitAccessType, defaultAccessType );
-				context.addAccessTypeInformation( fqcn, accessInfo );
+			for ( var mappedSuperClass : mappings.getMappedSuperclasses() ) {
+				addAccessTypeInfo( packageName, mappedSuperClass.getClazz(), mappedSuperClass.getAccess(), defaultAccessType );
 			}
-
-			for ( JaxbEmbeddableImpl embeddable : mappings.getEmbeddables() ) {
-				final String name = embeddable.getClazz();
-				fqcn = determineFullyQualifiedClassName( packageName, name );
-				final AccessType explicitAccessType = embeddable.getAccess();
-				final AccessTypeInformation accessInfo = new AccessTypeInformation( fqcn, explicitAccessType, defaultAccessType );
-				context.addAccessTypeInformation( fqcn, accessInfo );
+			for ( var embeddable : mappings.getEmbeddables() ) {
+				addAccessTypeInfo( packageName, embeddable.getClazz(), embeddable.getAccess(), defaultAccessType );
 			}
 		}
 	}
 
-	private void determineAnnotationAccessTypes() {
-		for ( JaxbEntityMappingsImpl mappings : entityMappings ) {
-			String fqcn;
-			String packageName = mappings.getPackage();
+	private void addAccessTypeInfo(
+			String packageName, String simpleName,
+			AccessType accessType, AccessType defaultAccessType) {
+		final String className = determineFullyQualifiedClassName( packageName, simpleName );
+		context.addAccessTypeInformation( className,
+				new AccessTypeInformation( className, accessType, defaultAccessType ) );
+	}
 
-			for ( JaxbEntityImpl entity : mappings.getEntities() ) {
-				String name = entity.getClazz();
-				fqcn = determineFullyQualifiedClassName( packageName, name );
-				TypeElement element = context.getTypeElementForFullyQualifiedName( fqcn );
-				if ( element != null ) {
-					TypeUtils.determineAccessTypeForHierarchy( element, context );
-				}
+	private void determineAnnotationAccessTypes() {
+		for ( var mappings : entityMappings ) {
+			final String packageName = mappings.getPackage();
+			for ( var entity : mappings.getEntities() ) {
+				determineHierarchyAccessType( packageName, entity.getClazz() );
 			}
-
-			for ( JaxbMappedSuperclassImpl mappedSuperClass : mappings.getMappedSuperclasses() ) {
-				String name = mappedSuperClass.getClazz();
-				fqcn = determineFullyQualifiedClassName( packageName, name );
-				TypeElement element = context.getTypeElementForFullyQualifiedName( fqcn );
-				if ( element != null ) {
-					TypeUtils.determineAccessTypeForHierarchy( element, context );
-				}
+			for ( var mappedSuperClass : mappings.getMappedSuperclasses() ) {
+				determineHierarchyAccessType( packageName, mappedSuperClass.getClazz() );
 			}
 		}
 	}
 
+	private void determineHierarchyAccessType(String packageName, String simpleName) {
+		final var element =
+				context.getTypeElementForFullyQualifiedName(
+						determineFullyQualifiedClassName( packageName, simpleName ) );
+		if ( element != null ) {
+			determineAccessTypeForHierarchy( element, context );
+		}
+	}
+
 	/**
-	 * Determines the default access type as specified in the <i>persistence-unit-defaults</i> as well as whether the
-	 * xml configuration is complete and annotations should be ignored.
+	 * Determines the default access type as specified in the <i>persistence-unit-defaults</i>
+	 * as well as whether the XML configuration is complete and annotations should be ignored.
 	 * <p>
 	 * Note, the spec says:
 	 * <ul>
-	 * <li>The persistence-unit-metadata element contains metadata for the entire persistence unit. It is
-	 * undefined if this element occurs in multiple mapping files within the same persistence unit.</li>
-	 * <li>If the xml-mapping-metadata-complete subelement is specified, the complete set of mapping
-	 * metadata for the persistence unit is contained in the XML mapping files for the persistence unit, and any
-	 * persistence annotations on the classes are ignored.</li>
-	 * <li>When the xml-mapping-metadata-complete element is specified, any metadata-complete attributes specified
-	 * within the entity, mapped-superclass, and embeddable elements are ignored.<li>
+	 * <li>The persistence-unit-metadata element contains metadata for the entire persistence unit.
+	 *     It is undefined if this element occurs in multiple mapping files within the same persistence
+	 *     unit.</li>
+	 * <li>If the xml-mapping-metadata-complete sub-element is specified, the complete set of mapping
+	 *     metadata for the persistence unit is contained in the XML mapping files for the persistence
+	 *     unit, and any persistence annotations on the classes are ignored.</li>
+	 * <li>When the xml-mapping-metadata-complete element is specified, any metadata-complete attributes
+	 *     specified within the entity, mapped-superclass, and embeddable elements are ignored.<li>
 	 * </ul>
 	 */
 	private void determineDefaultAccessTypeAndMetaCompleteness() {
-		for ( JaxbEntityMappingsImpl mappings : entityMappings ) {
-			JaxbPersistenceUnitMetadataImpl meta = mappings.getPersistenceUnitMetadata();
+		for ( var mappings : entityMappings ) {
+			final var meta = mappings.getPersistenceUnitMetadata();
 			if ( meta != null ) {
 				context.mappingDocumentFullyXmlConfigured( meta.getXmlMappingMetadataComplete() != null );
-
-				JaxbPersistenceUnitDefaultsImpl persistenceUnitDefaults = meta.getPersistenceUnitDefaults();
+				final var persistenceUnitDefaults = meta.getPersistenceUnitDefaults();
 				if ( persistenceUnitDefaults != null ) {
-					final jakarta.persistence.AccessType xmlJpaAccessType = persistenceUnitDefaults.getAccess();
+					final var xmlJpaAccessType = persistenceUnitDefaults.getAccess();
 					if ( xmlJpaAccessType != null ) {
 						context.setPersistenceUnitDefaultAccessType( xmlJpaAccessType );
 					}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao.java
index 204dd0b58f1b..184b99f1c72f 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/dao/Dao.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.processor.test.dao;
 
+import jakarta.annotation.Nullable;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.TypedQuery;
 import org.hibernate.annotations.processing.Find;
@@ -122,6 +123,10 @@ class Record {
 	@HQL("from Book where isbn = :isbn")
 	Optional<Book> findByIsbnIfExists(String isbn);
 
+	@HQL("SELECT 1L")
+	@Nullable
+	Long one();
+
 	@SQL("select * from Book where isbn = :isbn")
 	Book findByIsbnNative(String isbn);
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh20183/EntityType.java
similarity index 53%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java
rename to tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh20183/EntityType.java
index d2633fd67399..8fa13951cf6f 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/State.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh20183/EntityType.java
@@ -2,39 +2,27 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.annotations.naturalid;
+package org.hibernate.processor.test.hhh20183;
+
 import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
-/**
- * @author Emmanuel Bernard
- */
 @Entity
-public class State {
+public class EntityType {
 	@Id
-	private Integer id;
+	@GeneratedValue
+	private Long id;
 	private String name;
-
-	public State() {
-	}
-
-	public State(Integer id, String name) {
+	public void setId(Long id) {
 		this.id = id;
-		this.name = name;
 	}
-
-	public Integer getId() {
+	public Long getId() {
 		return id;
 	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 	public String getName() {
 		return name;
 	}
-
 	public void setName(String name) {
 		this.name = name;
 	}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh20183/EntityTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh20183/EntityTypeTest.java
new file mode 100644
index 000000000000..1ad6d5f9edd0
--- /dev/null
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh20183/EntityTypeTest.java
@@ -0,0 +1,32 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.hhh20183;
+
+
+import org.hibernate.processor.test.util.CompilationTest;
+import org.hibernate.processor.test.util.WithClasses;
+import org.junit.jupiter.api.Test;
+
+
+import static org.hibernate.processor.test.util.TestUtil.assertAttributeTypeInMetaModelFor;
+import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
+import static org.hibernate.processor.test.util.TestUtil.getMetaModelSourceAsString;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@CompilationTest
+class EntityTypeTest {
+
+	@Test
+	@WithClasses({EntityType.class, FormType.class})
+	void testOneToMany() {
+		System.out.println( getMetaModelSourceAsString( FormType.class ) );
+		assertMetamodelClassGeneratedFor( FormType.class );
+		assertAttributeTypeInMetaModelFor( FormType.class,
+				"entityType", EntityType.class,
+				"EntityType must be qualified");
+	}
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh20183/FormType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh20183/FormType.java
new file mode 100644
index 000000000000..23a55092e480
--- /dev/null
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hhh20183/FormType.java
@@ -0,0 +1,33 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.hhh20183;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+
+@Entity
+public class FormType {
+	@Id
+	@GeneratedValue
+	private Long id;
+	@ManyToOne
+	@JoinColumn(name="entity_type_id", referencedColumnName = "id")
+	private EntityType entityType;
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Long getId() {
+		return id;
+	}
+	public EntityType getEntityType() {
+		return entityType;
+	}
+	public void setEntityType(EntityType entityType) {
+		this.entityType = entityType;
+	}
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Author.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Author.java
new file mode 100644
index 000000000000..0dc68e7302fb
--- /dev/null
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Author.java
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.hqlvalidation;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+@Entity
+class Author {
+	@Id
+	String ssn;
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/BadDao.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/BadDao.java
new file mode 100644
index 000000000000..4ef36af7f70f
--- /dev/null
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/BadDao.java
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.hqlvalidation;
+
+import org.hibernate.annotations.processing.HQL;
+
+import java.util.List;
+
+interface BadDao {
+	@HQL("select b from Book b join b.authors a where b.isb = ''")
+	List<Book> booksWithAuthors();
+
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/BadDaoTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/BadDaoTest.java
new file mode 100644
index 000000000000..9dd0d9cff11d
--- /dev/null
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/BadDaoTest.java
@@ -0,0 +1,29 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.hqlvalidation;
+
+import org.hibernate.processor.test.util.CompilationTest;
+import org.hibernate.processor.test.util.IgnoreCompilationErrors;
+import org.hibernate.processor.test.util.TestUtil;
+import org.hibernate.processor.test.util.WithClasses;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.processor.test.util.TestUtil.assertNoMetamodelClassGeneratedFor;
+
+/**
+ * @author Gavin King
+ */
+@CompilationTest
+class BadDaoTest {
+	@Test
+	@WithClasses({ Book.class, Author.class, BadDao.class })
+	@IgnoreCompilationErrors
+	void testDao() {
+		System.out.println( TestUtil.getMetaModelSourceAsString( BadDao.class ) );
+//		assertMetamodelClassGeneratedFor( Book.class );
+//		assertMetamodelClassGeneratedFor( Author.class );
+		assertNoMetamodelClassGeneratedFor( BadDao.class );
+	}
+}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Book.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Book.java
index 83459b707790..b86301e5f3c7 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Book.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/hqlvalidation/Book.java
@@ -6,10 +6,15 @@
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+
+import java.util.Set;
 
 @Entity
 public class Book {
 	@Id String isbn;
 	String title;
 	String text;
+	@ManyToMany
+	Set<Author> authors;
 }
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java
index c031fd4baaed..1d9d44dc4830 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/AuxiliaryTest.java
@@ -98,7 +98,22 @@ void test() {
 		assertPresenceOfNameFieldInMetamodelFor(
 				Book.class,
 				"GRAPH_ENTITY_GRAPH",
-				"Missing fetch profile attribute."
+				"Missing graph attribute."
+		);
+		assertPresenceOfFieldInMetamodelFor(
+				Book.class,
+				"_entityGraph",
+				"Missing graph attribute."
+		);
+		assertPresenceOfNameFieldInMetamodelFor(
+				Book.class,
+				"GRAPH_BOOK",
+				"Missing defaulted graph attribute."
+		);
+		assertPresenceOfFieldInMetamodelFor(
+				Book.class,
+				"_Book",
+				"Missing defaulted graph attribute."
 		);
 		assertPresenceOfMethodInMetamodelFor(
 				Book.class,
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Book.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Book.java
index d19d94a01ada..7e8eb70b7f7a 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Book.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/namedquery/Book.java
@@ -6,11 +6,13 @@
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import jakarta.persistence.NamedAttributeNode;
 import jakarta.persistence.NamedEntityGraph;
 import jakarta.persistence.NamedQuery;
 
 @Entity
 @NamedEntityGraph(name = "entityGraph")
+@NamedEntityGraph(attributeNodes = @NamedAttributeNode("text"))
 @NamedQuery(name="booksByTitle",
 		query = "from Book where title = ?1")
 @NamedQuery(name="booksByTitleVerbose",
diff --git a/whats-new.adoc b/whats-new.adoc
index 29670dd77177..de3753fac3ba 100644
--- a/whats-new.adoc
+++ b/whats-new.adoc
@@ -1,8 +1,8 @@
-= What's New in 7.2
+= What's New in {version}
 :toc2:
 :sectanchors:
 :toclevels: 4
-:version: 7.2
+:version: 7.4
 :docsBase: https://docs.jboss.org/hibernate/orm
 :versionDocBase: {docsBase}/{version}
 :userGuideBase: {versionDocBase}/userguide/html_single/Hibernate_User_Guide.html
@@ -12,140 +12,72 @@ Describes the new features and capabilities added to Hibernate ORM in {version}.
 
 IMPORTANT: If migrating from earlier versions, be sure to also check out the link:{migrationGuide}[Migration Guide] for discussion of impactful changes.
 
-[[embedded-table]]
-== @EmbeddedTable
-
-The Jakarta Persistence compliant way to specify the table to which an embedded value maps is tedious, at best, requiring us of multiple `@AttributeOverride` and/or `@AssociationOverride` annotations -
-
-====
-[source,java]
-----
-@Entity
-@Table(name="primary")
-@SecondaryTable(name="secondary")
-class Person {
-	...
-
-    @Embedded
-    @AttributeOverride(name="street",
-        column=@Column(table="secondary"))
-    @AttributeOverride(name="city",
-        column=@Column(table="secondary"))
-    @AttributeOverride(name="state",
-        column=@Column(table="secondary"))
-    @AttributeOverride(name="zip",
-        column=@Column(table="secondary"))
-    Address address;
-}
-----
-====
-
-Hibernate now provides the `EmbeddedTable` annotation to help make this easier -
-
-====
-[source,java]
-----
-@Entity
-@Table(name="primary")
-@SecondaryTable(name="secondary")
-class Person {
-	...
-
-    @Embedded
-    @EmbeddedTable("secondary")
-    Address address;
-}
-----
-====
-
-The annotation is only legal on top-level embedded.  Placement on nested embedded values will be ignored.
-
-[[read-only-replicas]]
-== Read-only replicas
-
-This release features experimental support for accessing data held in {versionDocBase}/introduction/html_single/#read-only-replicas[read only replicas] of the main database.
-
-[[FindMultipleOption]]
-== Introduction of FindMultipleOption
-
-Previous versions of Hibernate supported loading multiple entities of a type via the `Session#byMultipleIds` method.
-7.0 added `Session#findMultiple` methods which accepted `FindOption` configuration; but, for options specific to multiple-id loading, users still had to revert to `Session#byMultipleIds`.
-7.2 covers this gap and introduces new `FindMultipleOption` configuration -
-
-* `SessionCheckMode`
-* `OrderingMode`
-* `RemovalsMode`
-
-`Session#byMultipleIds` and `MultiIdentifierLoadAccess` have been deprecated.
-
-[[child-stateless-sessions]]
-== Child StatelessSession
-
-Creation of child `StatelessSession` is now supported, just as with child `Session`.
-This is a `StatelessSession` which shares "transactional context" with a parent `Session` or `StatelessSession`.
-Use `Session#statelessWithOptions` or `StatelessSession#statelessWithOptions` instead of `#sessionWithOptions`.
-
-====
-[source,java]
-----
-Session parent = ...;
-StatelessSession child = parent
-    .statelessWithOptions()
-    .connection()
-    ...
-    .open();
-----
-====
-
-[[vector-module-enhancements]]
-== Hibernate-Vector module enhancements
-
-Support for binary, float16 and sparse vectors were added.
-
-====
-[source, java, indent=0]
-----
-@Entity
-public class MyEntity {
-	@Id
-	UUID id;
-	@JdbcTypeCode(SqlTypes.VECTOR_BINARY)
-	@Array(length = 24) // Refers to the bit count
-	byte[] binaryVector;
-	@JdbcTypeCode(SqlTypes.VECTOR_FLOAT16)
-	@Array(length = 3)
-	float[] float16Vector;
-	@Array(length = 3)
-	SparseFloatVector sparseFloat32Vector;
-}
-----
-====
-
-The Hibernate Vector module currently ships with 3 sparse vector types:
-
-* `SparseByteVector`
-* `SparseFloatVector`
-* `SparseDoubleVector`
-
-In addition to accessing the sparse indices and values, they also implement the `List` interface to provide access
-as if it were a dense vector.
-
-Also, support for vectors in the following databases was added:
-
-* https://dev.mysql.com/doc/refman/9.4/en/vector-functions.html[MySQL 9.0+]
-* https://www.ibm.com/docs/en/db2/12.1.0?topic=list-vector-values[DB2 12.1+]
-* https://help.sap.com/docs/hana-cloud-database/sap-hana-cloud-sap-hana-database-vector-engine-guide/sap-hana-cloud-sap-hana-database-vector-engine-guide[SAP HANA Cloud QRC 4/2024+]
-* https://learn.microsoft.com/en-us/sql/t-sql/data-types/vector-data-type?view=sql-server-ver17[SQL Server 2025+]
-
-== Enhancements to SchemaManager
+[[temporal-audited]]
+== Temporal and Audited Data
 
-Two new methods were added to `SchemaManager`:
-
-- `resynchronizeGenerators()` force all sequences to catch up with data imported to their corresponding tables
-- `truncateTable()` truncates a single table and resets its corresponding primary key sequence
-
-In addition, `truncate()` now automatically resets all primary key sequences and tables backing table generators.
-
-== Regular expression support in HQL
+As an incubating feature, this release introduces the brand new and extremely powerful `StateManagement` SPI along with:
 
-The operators `like regexp` and `ilike regexp` were added to HQL, allowing {versionDocBase}/querylanguage/html_single/#like-predicate[patterns to be written as regular expressions].
\ No newline at end of file
+- The `@Temporal` annotation, for mapping temporal data and querying based on temporal effectivity, and
+- The `@Audited` annotation, for mapping data with modifications tracked in a separate audit log.
+
+Temporal data may be mapped to:
+
+- database-native temporal tables (when provided by the underlying RDBMS),
+- a single table with effectivity columns (which might be partitioned into current and historical partitions), or
+- a table holding currently effective data, and a second table holding historical data with effectivity.
+
+The mapping strategy is transparent to client code.
+
+Historical temporal data may be queried at a given effective data/time.
+
+Audited data is mapped to a regular table along with an audit log which is backward compatible with Hibernate Envers.
+
+[[reveng]]
+== Reverse Engineering
+
+The reverse engineering module, previously part of the standalone Hibernate Tools project, is now integrated directly into Hibernate ORM. It is available as plugins for Gradle, Maven, and Ant.
+
+The reverse engineering plugins can generate:
+
+- Java entity classes
+- DAO classes
+- `hbm.xml` mapping files
+- `mapping.xml` mapping files
+- `hibernate.cfg.xml` configuration files
+- DDL scripts
+- HTML documentation
+
+The process is customizable via XML configuration files and custom strategy classes.
+
+See the link:{userGuideBase}#reveng[Reverse Engineering] chapter in the User Guide for details.
+
+[[transform-hbm]]
+== HBM XML Transformation
+
+The Maven plugin now includes a `transformHbm` goal that transforms legacy `hbm.xml` mapping files into ORM `mapping.xml` files. This does not involve reverse engineering from a database -- it converts existing HBM mappings.
+
+See the link:{userGuideBase}#tooling-maven-transformhbm[HBM XML Transformation] section in the User Guide for details.
+
+[[any-join]]
+== Joins and join fetching for `@Any` and `@ManyToAny`
+
+Discriminated association mappings may now:
+
+- be used freely in HQL joins and treated joins.
+- be fetched using a join.
+
+The joining and fetching semantics for `@Any` and `@ManyToAny` are aligned with `@ManyToOne` and `@ManyToMany` respectively.
+
+Join fetching may be requested using `join fetch` in HQL, or using an `EntityGraph`.
+
+Also, the `cascade` member was added to `@Any` and `@ManyToAny` as a replacement for the deprecated `@Cascade` annotation.
+
+[[join-formula]]
+== `@OneToMany` with `@JoinFormula`
+
+Mappings combining `@OneToMany` and `@JoinFormula` now function correctly.
+
+[[post-insert-generated-pk]]
+== Database-generated columns within primary keys
+
+A database-generated column (for example, an identity column) may now form part of a composite primary key.
\ No newline at end of file